winehq.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2025
February
January
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
January
2003
December
November
October
September
August
July
June
May
April
March
February
January
2002
December
November
October
September
August
July
June
May
April
March
February
January
2001
December
November
October
September
August
July
June
May
April
March
February
List overview
wine-commits
February 2013
----- 2025 -----
February 2025
January 2025
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
January 2004
----- 2003 -----
December 2003
November 2003
October 2003
September 2003
August 2003
July 2003
June 2003
May 2003
April 2003
March 2003
February 2003
January 2003
----- 2002 -----
December 2002
November 2002
October 2002
September 2002
August 2002
July 2002
June 2002
May 2002
April 2002
March 2002
February 2002
January 2002
----- 2001 -----
December 2001
November 2001
October 2001
September 2001
August 2001
July 2001
June 2001
May 2001
April 2001
March 2001
February 2001
wine-commits@winehq.org
2 participants
459 discussions
Start a n
N
ew thread
Ken Thomases : winemac: Implement SysCommand() to prevent Alt keypresses from activating system menu.
by Alexandre Julliard
07 Feb '13
07 Feb '13
Module: wine Branch: master Commit: 5f06bf80db714c1c355018cf7e3bd0e5eaa73ebe URL:
http://source.winehq.org/git/wine.git/?a=commit;h=5f06bf80db714c1c355018cf7…
Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Feb 6 19:32:18 2013 -0600 winemac: Implement SysCommand() to prevent Alt keypresses from activating system menu. --- dlls/winemac.drv/window.c | 30 ++++++++++++++++++++++++++++++ dlls/winemac.drv/winemac.drv.spec | 1 + 2 files changed, 31 insertions(+), 0 deletions(-) diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index 9d63912..7a7eda7 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -1041,6 +1041,36 @@ done: /*********************************************************************** + * SysCommand (MACDRV.@) + * + * Perform WM_SYSCOMMAND handling. + */ +LRESULT CDECL macdrv_SysCommand(HWND hwnd, WPARAM wparam, LPARAM lparam) +{ + struct macdrv_win_data *data; + LRESULT ret = -1; + + TRACE("%p, %x, %lx\n", hwnd, (unsigned)wparam, lparam); + + if (!(data = get_win_data(hwnd))) goto done; + if (!data->cocoa_window || !data->on_screen) goto done; + + /* prevent a simple ALT press+release from activating the system menu, + as that can get confusing */ + if ((wparam & 0xfff0) == SC_KEYMENU && !(WCHAR)lparam && !GetMenu(hwnd) && + (GetWindowLongW(hwnd, GWL_STYLE) & WS_SYSMENU)) + { + TRACE("ignoring SC_KEYMENU wp %lx lp %lx\n", wparam, lparam); + ret = 0; + } + +done: + release_win_data(data); + return ret; +} + + +/*********************************************************************** * UpdateLayeredWindow (MACDRV.@) */ BOOL CDECL macdrv_UpdateLayeredWindow(HWND hwnd, const UPDATELAYEREDWINDOWINFO *info, diff --git a/dlls/winemac.drv/winemac.drv.spec b/dlls/winemac.drv/winemac.drv.spec index 30df9d6..57b1e5a 100644 --- a/dlls/winemac.drv/winemac.drv.spec +++ b/dlls/winemac.drv/winemac.drv.spec @@ -24,6 +24,7 @@ @ cdecl SetWindowStyle(ptr long ptr) macdrv_SetWindowStyle @ cdecl SetWindowText(long wstr) macdrv_SetWindowText @ cdecl ShowWindow(long long ptr long) macdrv_ShowWindow +@ cdecl SysCommand(long long long) macdrv_SysCommand @ cdecl ToUnicodeEx(long long ptr ptr long long long) macdrv_ToUnicodeEx @ cdecl UpdateLayeredWindow(long ptr ptr) macdrv_UpdateLayeredWindow @ cdecl VkKeyScanEx(long long) macdrv_VkKeyScanEx
1
0
0
0
Michael Stefaniuc : usp10: Let C look like C.
by Alexandre Julliard
07 Feb '13
07 Feb '13
Module: wine Branch: master Commit: 9f6f8bfc0088f5b466d51067489cc29355924bb8 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=9f6f8bfc0088f5b466d510674…
Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Feb 6 23:15:38 2013 +0100 usp10: Let C look like C. --- dlls/usp10/usp10.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 41a7f32..a08b047 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -1878,7 +1878,7 @@ HRESULT WINAPI ScriptStringAnalyse(HDC hdc, const void *pString, int cString, hr = ScriptItemize(pString, cString, num_items, &sControl, &sState, analysis->pItem, &analysis->numItems); - if FAILED(hr) + if (FAILED(hr)) { if (hr == E_OUTOFMEMORY) hr = E_INVALIDARG;
1
0
0
0
Michael Stefaniuc : riched20: Let C look like C.
by Alexandre Julliard
07 Feb '13
07 Feb '13
Module: wine Branch: master Commit: 6c1b292f0b781c08041867f2508df5df164f61c6 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=6c1b292f0b781c08041867f25…
Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Feb 6 23:14:05 2013 +0100 riched20: Let C look like C. --- dlls/riched20/txtsrv.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/riched20/txtsrv.c b/dlls/riched20/txtsrv.c index e9cc5e1..0e78c53 100644 --- a/dlls/riched20/txtsrv.c +++ b/dlls/riched20/txtsrv.c @@ -77,7 +77,7 @@ static HRESULT WINAPI ITextServicesImpl_QueryInterface(IUnknown *iface, REFIID r if (IsEqualIID(riid, &IID_IUnknown)) *ppv = &This->IUnknown_inner; - else if IsEqualIID(riid, &IID_ITextServices) + else if (IsEqualIID(riid, &IID_ITextServices)) *ppv = &This->ITextServices_iface; else { *ppv = NULL;
1
0
0
0
Michael Stefaniuc : d3drm: Let C look like C.
by Alexandre Julliard
07 Feb '13
07 Feb '13
Module: wine Branch: master Commit: 9affa153fdc96dbeb36f502049a01e8cb1da9803 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=9affa153fdc96dbeb36f50204…
Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Feb 6 23:10:01 2013 +0100 d3drm: Let C look like C. --- dlls/d3drm/texture.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3drm/texture.c b/dlls/d3drm/texture.c index f72dcaa..6ff4345 100644 --- a/dlls/d3drm/texture.c +++ b/dlls/d3drm/texture.c @@ -62,7 +62,7 @@ static HRESULT WINAPI IDirect3DRMTexture2Impl_QueryInterface(IDirect3DRMTexture2 { *object = &This->IDirect3DRMTexture2_iface; } - else if IsEqualGUID(riid, &IID_IDirect3DRMTexture3) + else if (IsEqualGUID(riid, &IID_IDirect3DRMTexture3)) { *object = &This->IDirect3DRMTexture3_iface; } @@ -431,7 +431,7 @@ static HRESULT WINAPI IDirect3DRMTexture3Impl_QueryInterface(IDirect3DRMTexture3 { *object = &This->IDirect3DRMTexture2_iface; } - else if IsEqualGUID(riid, &IID_IDirect3DRMTexture3) + else if (IsEqualGUID(riid, &IID_IDirect3DRMTexture3)) { *object = &This->IDirect3DRMTexture3_iface; }
1
0
0
0
Michael Stefaniuc : qedit: Let C look like C.
by Alexandre Julliard
07 Feb '13
07 Feb '13
Module: wine Branch: master Commit: 2f67eb99ef0395e5905e6b4d928b372316765f4d URL:
http://source.winehq.org/git/wine.git/?a=commit;h=2f67eb99ef0395e5905e6b4d9…
Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Feb 6 23:13:12 2013 +0100 qedit: Let C look like C. --- dlls/qedit/mediadet.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/qedit/mediadet.c b/dlls/qedit/mediadet.c index fea3aa4..7e90c31 100644 --- a/dlls/qedit/mediadet.c +++ b/dlls/qedit/mediadet.c @@ -79,7 +79,7 @@ static HRESULT WINAPI MediaDet_inner_QueryInterface(IUnknown *iface, REFIID riid *ppv = NULL; if (IsEqualIID(riid, &IID_IUnknown)) *ppv = &This->IUnknown_inner; - else if IsEqualIID(riid, &IID_IMediaDet) + else if (IsEqualIID(riid, &IID_IMediaDet)) *ppv = &This->IMediaDet_iface; else WARN("(%p, %s,%p): not found\n", This, debugstr_guid(riid), ppv);
1
0
0
0
Michael Stefaniuc : iphlpapi: Let C look like C.
by Alexandre Julliard
07 Feb '13
07 Feb '13
Module: wine Branch: master Commit: 1cc6710aee05c646684323ee266455947a10ddfb URL:
http://source.winehq.org/git/wine.git/?a=commit;h=1cc6710aee05c646684323ee2…
Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Feb 6 23:13:02 2013 +0100 iphlpapi: Let C look like C. --- dlls/iphlpapi/ipstats.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/iphlpapi/ipstats.c b/dlls/iphlpapi/ipstats.c index f8191ba..966d24e 100644 --- a/dlls/iphlpapi/ipstats.c +++ b/dlls/iphlpapi/ipstats.c @@ -693,7 +693,7 @@ DWORD WINAPI GetIcmpStatisticsEx(PMIB_ICMP_EX stats, DWORD family) } ret = GetIcmpStatistics(&ipv4stats); - if SUCCEEDED(ret) + if (SUCCEEDED(ret)) { stats->icmpInStats.dwMsgs = ipv4stats.stats.icmpInStats.dwMsgs; stats->icmpInStats.dwErrors = ipv4stats.stats.icmpInStats.dwErrors;
1
0
0
0
Michael Stefaniuc : gphoto2.ds: Let C look like C.
by Alexandre Julliard
07 Feb '13
07 Feb '13
Module: wine Branch: master Commit: f59d0ac743184a9f584cba405951361a575b9d20 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=f59d0ac743184a9f584cba405…
Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Feb 6 23:11:23 2013 +0100 gphoto2.ds: Let C look like C. --- dlls/gphoto2.ds/ui.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gphoto2.ds/ui.c b/dlls/gphoto2.ds/ui.c index df79875..0b21f2e 100644 --- a/dlls/gphoto2.ds/ui.c +++ b/dlls/gphoto2.ds/ui.c @@ -175,7 +175,7 @@ static INT_PTR CALLBACK DialogProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lP } break; case WM_COMMAND: - switch LOWORD(wParam) + switch (LOWORD(wParam)) { case IDC_SKIP: on_disable_dialog_clicked(hwnd);
1
0
0
0
Michael Stefaniuc : krnl386.exe16: Let C look like C.
by Alexandre Julliard
07 Feb '13
07 Feb '13
Module: wine Branch: master Commit: 68c447d87efe40c37ac668860dac2b334961cf63 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=68c447d87efe40c37ac668860…
Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Feb 6 23:08:42 2013 +0100 krnl386.exe16: Let C look like C. --- dlls/krnl386.exe16/int10.c | 10 +++++----- dlls/krnl386.exe16/int16.c | 2 +- dlls/krnl386.exe16/int67.c | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/krnl386.exe16/int10.c b/dlls/krnl386.exe16/int10.c index 0edfbd7..dfba761 100644 --- a/dlls/krnl386.exe16/int10.c +++ b/dlls/krnl386.exe16/int10.c @@ -1123,7 +1123,7 @@ void WINAPI DOSVM_Int10Handler( CONTEXT *context ) break; case 0x0b: - switch BH_reg(context) { + switch (BH_reg(context)) { case 0x00: /* SET BACKGROUND/BORDER COLOR */ /* In text modes, this sets only the border... */ /* According to the interrupt list and one of my books. */ @@ -1192,7 +1192,7 @@ void WINAPI DOSVM_Int10Handler( CONTEXT *context ) break; case 0x10: - switch AL_reg(context) { + switch (AL_reg(context)) { case 0x00: /* SET SINGLE PALETTE REGISTER - A.C. */ TRACE("Set Single Palette Register - Reg 0x0%x Value 0x0%x\n", BL_reg(context),BH_reg(context)); @@ -1291,7 +1291,7 @@ void WINAPI DOSVM_Int10Handler( CONTEXT *context ) case 0x11: /* TEXT MODE CHARGEN */ /* Note that second subfunction is *almost* identical. */ /* See INTERRUPT.A for details. */ - switch AL_reg(context) { + switch (AL_reg(context)) { case 0x00: /* LOAD USER SPECIFIED PATTERNS */ case 0x10: FIXME("Load User Specified Patterns - Not Supported\n"); @@ -1339,7 +1339,7 @@ void WINAPI DOSVM_Int10Handler( CONTEXT *context ) break; case 0x12: /* ALTERNATE FUNCTION SELECT */ - switch BL_reg(context) { + switch (BL_reg(context)) { case 0x10: /* GET EGA INFO */ TRACE("EGA info requested\n"); SET_BH( context, 0x00 ); /* Color screen */ @@ -1385,7 +1385,7 @@ void WINAPI DOSVM_Int10Handler( CONTEXT *context ) break; case 0x1a: - switch AL_reg(context) { + switch (AL_reg(context)) { case 0x00: /* GET DISPLAY COMBINATION CODE */ TRACE("Get Display Combination Code\n"); SET_AL( context, 0x1a ); /* Function supported */ diff --git a/dlls/krnl386.exe16/int16.c b/dlls/krnl386.exe16/int16.c index 47e9d8e..f567ee7 100644 --- a/dlls/krnl386.exe16/int16.c +++ b/dlls/krnl386.exe16/int16.c @@ -52,7 +52,7 @@ void WINAPI DOSVM_Int16Handler( CONTEXT *context ) BIOSDATA *data = NULL; BYTE ascii, scan; - switch AH_reg(context) { + switch (AH_reg(context)) { case 0x00: /* Get Keystroke */ /* Returns: AH = Scan code diff --git a/dlls/krnl386.exe16/int67.c b/dlls/krnl386.exe16/int67.c index 3137bc9..019d379 100644 --- a/dlls/krnl386.exe16/int67.c +++ b/dlls/krnl386.exe16/int67.c @@ -149,7 +149,7 @@ static void EMS_access_name( CONTEXT *context ) return; } - switch AL_reg(context) { + switch (AL_reg(context)) { case 0x00: /* get name */ ptr = PTR_REAL_TO_LIN(context->SegEs, DI_reg(context)); memcpy(ptr, EMS_record->handle[hindex].name, 8); @@ -326,7 +326,7 @@ static void EMS_restore_context( CONTEXT *context ) */ void WINAPI DOSVM_Int67Handler( CONTEXT *context ) { - switch AH_reg(context) { + switch (AH_reg(context)) { case 0x40: /* EMS - GET MANAGER STATUS */ SET_AH( context, 0 ); /* status: ok */ @@ -465,7 +465,7 @@ void EMS_Ioctl_Handler( CONTEXT *context ) { assert(AH_reg(context) == 0x44); - switch AL_reg(context) { + switch (AL_reg(context)) { case 0x00: /* IOCTL - GET DEVICE INFORMATION */ RESET_CFLAG(context); /* operation was successful */ SET_DX( context, 0x4080 ); /* bit 14 (support ioctl read) and
1
0
0
0
Daniel Jelinski : comctl32/listview: Do not touch icon spacing if set explicitly.
by Alexandre Julliard
07 Feb '13
07 Feb '13
Module: wine Branch: master Commit: f9c3a612af058429ce92aff3bdd9b942efe0f998 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=f9c3a612af058429ce92aff3b…
Author: Daniel Jelinski <djelinski1(a)gmail.com> Date: Mon Feb 4 20:49:55 2013 +0100 comctl32/listview: Do not touch icon spacing if set explicitly. --- dlls/comctl32/listview.c | 10 ++++++++-- dlls/comctl32/tests/listview.c | 17 +++++++++++++++++ 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 96863f9..bc8997a 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -55,7 +55,6 @@ * -- LVA_SNAPTOGRID not implemented * -- LISTVIEW_ApproximateViewRect partially implemented * -- LISTVIEW_SetColumnWidth ignores header images & bitmap - * -- LISTVIEW_SetIconSpacing is incomplete * -- LISTVIEW_StyleChanged doesn't handle some changes too well * * Speedups @@ -290,6 +289,7 @@ typedef struct tagLISTVIEW_INFO HIMAGELIST himlSmall; HIMAGELIST himlState; SIZE iconSize; + BOOL autoSpacing; SIZE iconSpacing; SIZE iconStateSize; POINT currIconPos; /* this is the position next icon will be placed */ @@ -8594,11 +8594,15 @@ static DWORD LISTVIEW_SetIconSpacing(LISTVIEW_INFO *infoPtr, INT cx, INT cy) /* set to defaults, if instructed to */ if (cx == -1 && cy == -1) { + infoPtr->autoSpacing = TRUE; 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; } + else + infoPtr->autoSpacing = FALSE; + /* if 0 then keep width */ if (cx != 0) infoPtr->iconSpacing.cx = cx; @@ -8660,7 +8664,8 @@ 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, -1, -1); + if (infoPtr->autoSpacing) + LISTVIEW_SetIconSpacing(infoPtr, -1, -1); break; case LVSIL_SMALL: @@ -9374,6 +9379,7 @@ static LRESULT LISTVIEW_NCCreate(HWND hwnd, const CREATESTRUCTW *lpcs) infoPtr->bRedraw = TRUE; infoPtr->bNoItemMetrics = TRUE; infoPtr->bDoChangeNotify = TRUE; + infoPtr->autoSpacing = TRUE; infoPtr->iconSpacing.cx = GetSystemMetrics(SM_CXICONSPACING) - GetSystemMetrics(SM_CXICON); infoPtr->iconSpacing.cy = GetSystemMetrics(SM_CYICONSPACING) - GetSystemMetrics(SM_CYICON); infoPtr->nEditLabelItem = -1; diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index c46fe42..98ca495 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -4643,6 +4643,23 @@ static void test_getitemspacing(void) SendMessage(hwnd, LVM_SETIMAGELIST, LVSIL_NORMAL, (LPARAM)himl40); ret = SendMessage(hwnd, LVM_GETITEMSPACING, FALSE, 0); + /* set size returned */ + expect(100, LOWORD(ret)); + expect(100, HIWORD(ret)); + + /* spacing = 0 - keep previous value */ + ret = SendMessage(hwnd, LVM_SETICONSPACING, 0, MAKELPARAM(0, -1)); + expect(100, LOWORD(ret)); + expect(100, HIWORD(ret)); + + ret = SendMessage(hwnd, LVM_GETITEMSPACING, FALSE, 0); + expect(100, LOWORD(ret)); + expect(0xFFFF, HIWORD(ret)); + + ret = SendMessage(hwnd, LVM_SETICONSPACING, 0, -1); + expect(100, LOWORD(ret)); + expect(0xFFFF, HIWORD(ret)); + ret = SendMessage(hwnd, LVM_GETITEMSPACING, FALSE, 0); /* spacing + icon size returned */ expect(cx + 40, LOWORD(ret)); expect(cy + 40, HIWORD(ret));
1
0
0
0
Hans Leidekker : wbemprox: Trace the qualifier value in IWbemClassObject:: GetNames.
by Alexandre Julliard
06 Feb '13
06 Feb '13
Module: wine Branch: master Commit: 0fb34587283e39bcb0d7ad7e9f6f102f8e41d7d5 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=0fb34587283e39bcb0d7ad7e9…
Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Feb 6 13:54:06 2013 +0100 wbemprox: Trace the qualifier value in IWbemClassObject::GetNames. --- dlls/wbemprox/class.c | 3 ++- dlls/wbemprox/wbemprox_private.h | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 1 deletions(-) diff --git a/dlls/wbemprox/class.c b/dlls/wbemprox/class.c index 62cf332..d516efb 100644 --- a/dlls/wbemprox/class.c +++ b/dlls/wbemprox/class.c @@ -474,7 +474,8 @@ static HRESULT WINAPI class_object_GetNames( struct class_object *co = impl_from_IWbemClassObject( iface ); struct enum_class_object *ec = impl_from_IEnumWbemClassObject( co->iter ); - TRACE("%p, %s, %08x, %p, %p\n", iface, debugstr_w(wszQualifierName), lFlags, pQualifierVal, pNames); + TRACE("%p, %s, %08x, %s, %p\n", iface, debugstr_w(wszQualifierName), lFlags, + debugstr_variant(pQualifierVal), pNames); if (wszQualifierName || pQualifierVal) { diff --git a/dlls/wbemprox/wbemprox_private.h b/dlls/wbemprox/wbemprox_private.h index f1d4119..efdde76 100644 --- a/dlls/wbemprox/wbemprox_private.h +++ b/dlls/wbemprox/wbemprox_private.h @@ -16,6 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "wine/debug.h" #include "wine/list.h" #include "wine/unicode.h" @@ -239,6 +240,37 @@ static inline WCHAR *heap_strdupW( const WCHAR *src ) return dst; } +static inline const char *debugstr_variant( const VARIANT *v ) +{ + if (!v) return "(null)"; + switch (V_VT(v)) + { + case VT_EMPTY: + return "{VT_EMPTY}"; + case VT_NULL: + return "{VT_NULL}"; + case VT_I4: + return wine_dbg_sprintf( "{VT_I4: %d}", V_I4(v) ); + case VT_R8: + return wine_dbg_sprintf( "{VT_R8: %lf}", V_R8(v) ); + case VT_BSTR: + return wine_dbg_sprintf( "{VT_BSTR: %s}", debugstr_w(V_BSTR(v)) ); + case VT_DISPATCH: + return wine_dbg_sprintf( "{VT_DISPATCH: %p}", V_DISPATCH(v) ); + case VT_BOOL: + return wine_dbg_sprintf( "{VT_BOOL: %x}", V_BOOL(v) ); + case VT_UNKNOWN: + return wine_dbg_sprintf( "{VT_UNKNOWN: %p}", V_UNKNOWN(v) ); + case VT_UINT: + return wine_dbg_sprintf( "{VT_UINT: %u}", V_UINT(v) ); + case VT_BSTR|VT_BYREF: + return wine_dbg_sprintf( "{VT_BSTR|VT_BYREF: ptr %p, data %s}", + V_BSTRREF(v), V_BSTRREF(v) ? debugstr_w( *V_BSTRREF(v) ) : NULL ); + default: + return wine_dbg_sprintf( "{vt %d}", V_VT(v) ); + } +} + static const WCHAR class_processW[] = {'W','i','n','3','2','_','P','r','o','c','e','s','s',0}; static const WCHAR class_serviceW[] = {'W','i','n','3','2','_','S','e','r','v','i','c','e',0}; static const WCHAR class_stdregprovW[] = {'S','t','d','R','e','g','P','r','o','v',0};
1
0
0
0
← Newer
1
...
37
38
39
40
41
42
43
...
46
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
Results per page:
10
25
50
100
200