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
October 2011
----- 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
3 participants
783 discussions
Start a n
N
ew thread
Marcus Meissner : ole32: Mark two functions as hidden.
by Alexandre Julliard
03 Oct '11
03 Oct '11
Module: wine Branch: master Commit: da0f475d4b64d3f26b3db44393f93ccdea834996 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=da0f475d4b64d3f26b3db4439…
Author: Marcus Meissner <meissner(a)suse.de> Date: Mon Oct 3 13:28:32 2011 +0200 ole32: Mark two functions as hidden. --- dlls/ole32/compobj_private.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/compobj_private.h b/dlls/ole32/compobj_private.h index 00024ab..fc92389 100644 --- a/dlls/ole32/compobj_private.h +++ b/dlls/ole32/compobj_private.h @@ -289,8 +289,8 @@ extern HRESULT WINAPI OLE32_DllGetClassObject(REFCLSID rclsid, REFIID iid,LPVOID extern HRESULT WINAPI OLE32_DllRegisterServer(void) DECLSPEC_HIDDEN; extern HRESULT WINAPI OLE32_DllUnregisterServer(void) DECLSPEC_HIDDEN; -extern HRESULT Handler_DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv); -extern HRESULT HandlerCF_Create(REFCLSID rclsid, REFIID riid, LPVOID *ppv); +extern HRESULT Handler_DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) DECLSPEC_HIDDEN; +extern HRESULT HandlerCF_Create(REFCLSID rclsid, REFIID riid, LPVOID *ppv) DECLSPEC_HIDDEN; /* Exported non-interface Data Advise Holder functions */ HRESULT DataAdviseHolder_OnConnect(IDataAdviseHolder *iface, IDataObject *pDelegate) DECLSPEC_HIDDEN;
1
0
0
0
Marcus Meissner : winmm: Mark two functions as hidden.
by Alexandre Julliard
03 Oct '11
03 Oct '11
Module: wine Branch: master Commit: c7f8ad487d0b86a10267ffdb87bd21f732b5bcc3 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=c7f8ad487d0b86a10267ffdb8…
Author: Marcus Meissner <meissner(a)suse.de> Date: Mon Oct 3 13:29:08 2011 +0200 winmm: Mark two functions as hidden. --- dlls/winmm/winemm.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winmm/winemm.h b/dlls/winmm/winemm.h index 38f72b3..114811c 100644 --- a/dlls/winmm/winemm.h +++ b/dlls/winmm/winemm.h @@ -150,9 +150,9 @@ const char* WINMM_ErrorToString(MMRESULT error) DECLSPEC_HIDDEN; void TIME_MMTimeStop(void) DECLSPEC_HIDDEN; -MMRESULT WINMM_CheckCallback(DWORD_PTR dwCallback, DWORD fdwOpen, BOOL mixer); +MMRESULT WINMM_CheckCallback(DWORD_PTR dwCallback, DWORD fdwOpen, BOOL mixer) DECLSPEC_HIDDEN; -BOOL WINMM_InitWaveform(void); +BOOL WINMM_InitWaveform(void) DECLSPEC_HIDDEN; /* Global variables */ extern CRITICAL_SECTION WINMM_cs DECLSPEC_HIDDEN;
1
0
0
0
Marcus Meissner : winex11.drv: Mark xrenderdrv_ExtTextOut as static.
by Alexandre Julliard
03 Oct '11
03 Oct '11
Module: wine Branch: master Commit: aee645dfc0a870d3f3b4883fc287cfc2e186d61f URL:
http://source.winehq.org/git/wine.git/?a=commit;h=aee645dfc0a870d3f3b4883fc…
Author: Marcus Meissner <meissner(a)suse.de> Date: Mon Oct 3 13:28:56 2011 +0200 winex11.drv: Mark xrenderdrv_ExtTextOut as static. --- dlls/winex11.drv/xrender.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index de469e2..a985898 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -1943,8 +1943,8 @@ static inline BOOL is_dib_with_colortable( X11DRV_PDEVICE *physDev ) /*********************************************************************** * xrenderdrv_ExtTextOut */ -BOOL xrenderdrv_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, - const RECT *lprect, LPCWSTR wstr, UINT count, const INT *lpDx ) +static BOOL xrenderdrv_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, + const RECT *lprect, LPCWSTR wstr, UINT count, const INT *lpDx ) { struct xrender_physdev *physdev = get_xrender_dev( dev ); XGCValues xgcval;
1
0
0
0
Marcus Meissner : dsound: Mark enum_callback and search_callback static.
by Alexandre Julliard
03 Oct '11
03 Oct '11
Module: wine Branch: master Commit: a664424c198a348aa9178dd5ccc930531a058299 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=a664424c198a348aa9178dd5c…
Author: Marcus Meissner <meissner(a)suse.de> Date: Mon Oct 3 13:24:12 2011 +0200 dsound: Mark enum_callback and search_callback static. --- dlls/dsound/propset.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/dsound/propset.c b/dlls/dsound/propset.c index af9b26d..242b237 100644 --- a/dlls/dsound/propset.c +++ b/dlls/dsound/propset.c @@ -111,7 +111,7 @@ struct search_data { GUID *found_guid; }; -BOOL CALLBACK search_callback(GUID *guid, const WCHAR *desc, +static BOOL CALLBACK search_callback(GUID *guid, const WCHAR *desc, const WCHAR *module, void *user) { struct search_data *search = user; @@ -276,6 +276,7 @@ static HRESULT DSPROPERTY_DescriptionW( return S_OK; } +static BOOL CALLBACK enum_callback(GUID *guid, const WCHAR *desc, const WCHAR *module, void *user) {
1
0
0
0
Marcus Meissner : msdaps: Mark create_* functions as hidden.
by Alexandre Julliard
03 Oct '11
03 Oct '11
Module: wine Branch: master Commit: 22d7af02e68ada32fa9642b620fd171d86637818 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=22d7af02e68ada32fa9642b62…
Author: Marcus Meissner <meissner(a)suse.de> Date: Mon Oct 3 13:29:29 2011 +0200 msdaps: Mark create_* functions as hidden. --- dlls/msdaps/row_server.idl | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msdaps/row_server.idl b/dlls/msdaps/row_server.idl index afe9463..a59e6d8 100644 --- a/dlls/msdaps/row_server.idl +++ b/dlls/msdaps/row_server.idl @@ -229,7 +229,7 @@ coclass wine_rowset_proxy } -cpp_quote("extern HRESULT create_row_server( IUnknown*, LPVOID* );") -cpp_quote("extern HRESULT create_row_marshal( IUnknown*, LPVOID* );") -cpp_quote("extern HRESULT create_rowset_server( IUnknown*, LPVOID* );") -cpp_quote("extern HRESULT create_rowset_marshal( IUnknown*, LPVOID* );") +cpp_quote("extern HRESULT create_row_server( IUnknown*, LPVOID* ) DECLSPEC_HIDDEN;") +cpp_quote("extern HRESULT create_row_marshal( IUnknown*, LPVOID* ) DECLSPEC_HIDDEN;") +cpp_quote("extern HRESULT create_rowset_server( IUnknown*, LPVOID* ) DECLSPEC_HIDDEN;") +cpp_quote("extern HRESULT create_rowset_marshal( IUnknown*, LPVOID* ) DECLSPEC_HIDDEN;")
1
0
0
0
Marcus Meissner : vbscript: Mark some symbols as hidden.
by Alexandre Julliard
03 Oct '11
03 Oct '11
Module: wine Branch: master Commit: b77770d589c9f20a723f616fec05994461001edb URL:
http://source.winehq.org/git/wine.git/?a=commit;h=b77770d589c9f20a723f616fe…
Author: Marcus Meissner <meissner(a)suse.de> Date: Mon Oct 3 13:28:46 2011 +0200 vbscript: Mark some symbols as hidden. --- dlls/vbscript/vbscript.h | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index 491003b..9e18f47 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -115,12 +115,12 @@ struct _vbdisp_t { VARIANT props[1]; }; -HRESULT create_vbdisp(const class_desc_t*,vbdisp_t**); -HRESULT disp_get_id(IDispatch*,BSTR,vbdisp_invoke_type_t,BOOL,DISPID*); -HRESULT vbdisp_get_id(vbdisp_t*,BSTR,vbdisp_invoke_type_t,BOOL,DISPID*); -HRESULT disp_call(script_ctx_t*,IDispatch*,DISPID,DISPPARAMS*,VARIANT*); -HRESULT disp_propput(script_ctx_t*,IDispatch*,DISPID,VARIANT*); -void collect_objects(script_ctx_t*); +HRESULT create_vbdisp(const class_desc_t*,vbdisp_t**) DECLSPEC_HIDDEN; +HRESULT disp_get_id(IDispatch*,BSTR,vbdisp_invoke_type_t,BOOL,DISPID*) DECLSPEC_HIDDEN; +HRESULT vbdisp_get_id(vbdisp_t*,BSTR,vbdisp_invoke_type_t,BOOL,DISPID*) DECLSPEC_HIDDEN; +HRESULT disp_call(script_ctx_t*,IDispatch*,DISPID,DISPPARAMS*,VARIANT*) DECLSPEC_HIDDEN; +HRESULT disp_propput(script_ctx_t*,IDispatch*,DISPID,VARIANT*) DECLSPEC_HIDDEN; +void collect_objects(script_ctx_t*) DECLSPEC_HIDDEN; static inline unsigned arg_cnt(const DISPPARAMS *dp) { @@ -168,8 +168,8 @@ struct _script_ctx_t { struct list named_items; }; -HRESULT init_global(script_ctx_t*); -HRESULT init_err(script_ctx_t*); +HRESULT init_global(script_ctx_t*) DECLSPEC_HIDDEN; +HRESULT init_err(script_ctx_t*) DECLSPEC_HIDDEN; IUnknown *create_ax_site(script_ctx_t*) DECLSPEC_HIDDEN; @@ -321,9 +321,9 @@ TID_LIST LAST_tid } tid_t; -HRESULT get_typeinfo(tid_t,ITypeInfo**); +HRESULT get_typeinfo(tid_t,ITypeInfo**) DECLSPEC_HIDDEN; -HRESULT WINAPI VBScriptFactory_CreateInstance(IClassFactory*,IUnknown*,REFIID,void**); +HRESULT WINAPI VBScriptFactory_CreateInstance(IClassFactory*,IUnknown*,REFIID,void**) DECLSPEC_HIDDEN; const char *debugstr_variant(const VARIANT*) DECLSPEC_HIDDEN;
1
0
0
0
Marcus Meissner : mshtml: Mark replace_node_by_html as hidden.
by Alexandre Julliard
03 Oct '11
03 Oct '11
Module: wine Branch: master Commit: ac2f0ed02971f36cb65ee998f9c9f75ef3bb3c59 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=ac2f0ed02971f36cb65ee998f…
Author: Marcus Meissner <meissner(a)suse.de> Date: Mon Oct 3 13:28:05 2011 +0200 mshtml: Mark replace_node_by_html as hidden. --- dlls/mshtml/mshtml_private.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 7be212e..9123179 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -714,7 +714,7 @@ IHTMLStyleSheetsCollection *HTMLStyleSheetsCollection_Create(nsIDOMStyleSheetLis void detach_selection(HTMLDocumentNode*) DECLSPEC_HIDDEN; void detach_ranges(HTMLDocumentNode*) DECLSPEC_HIDDEN; HRESULT get_node_text(HTMLDOMNode*,BSTR*) DECLSPEC_HIDDEN; -HRESULT replace_node_by_html(nsIDOMHTMLDocument*,nsIDOMNode*,const WCHAR*); +HRESULT replace_node_by_html(nsIDOMHTMLDocument*,nsIDOMNode*,const WCHAR*) DECLSPEC_HIDDEN; HRESULT create_nselem(HTMLDocumentNode*,const WCHAR*,nsIDOMHTMLElement**) DECLSPEC_HIDDEN;
1
0
0
0
Marcus Meissner : mscoree: Mark cordebug_init as hidden.
by Alexandre Julliard
03 Oct '11
03 Oct '11
Module: wine Branch: master Commit: e2c5a0c23eb48ee41f9e98eaea1bff576cfa2768 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=e2c5a0c23eb48ee41f9e98eae…
Author: Marcus Meissner <meissner(a)suse.de> Date: Mon Oct 3 13:27:31 2011 +0200 mscoree: Mark cordebug_init as hidden. --- dlls/mscoree/mscoree_private.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mscoree/mscoree_private.h b/dlls/mscoree/mscoree_private.h index a253262..15396f8 100644 --- a/dlls/mscoree/mscoree_private.h +++ b/dlls/mscoree/mscoree_private.h @@ -161,6 +161,6 @@ extern HRESULT RuntimeHost_Destroy(RuntimeHost *This) DECLSPEC_HIDDEN; HRESULT WINAPI CLRMetaHost_GetRuntime(ICLRMetaHost* iface, LPCWSTR pwzVersion, REFIID iid, LPVOID *ppRuntime) DECLSPEC_HIDDEN; -extern void cordebug_init(RuntimeHost *This); +extern void cordebug_init(RuntimeHost *This) DECLSPEC_HIDDEN; #endif /* __MSCOREE_PRIVATE__ */
1
0
0
0
Marcus Meissner : dibdrv: Mark get_rop_codes as hidden.
by Alexandre Julliard
03 Oct '11
03 Oct '11
Module: wine Branch: master Commit: 9437705c2a9321daab2e3394cf177527744a2518 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=9437705c2a9321daab2e3394c…
Author: Marcus Meissner <meissner(a)suse.de> Date: Mon Oct 3 13:25:34 2011 +0200 dibdrv: Mark get_rop_codes as hidden. --- dlls/gdi32/dibdrv/dibdrv.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/dibdrv/dibdrv.h b/dlls/gdi32/dibdrv/dibdrv.h index 21549f8..5f9a31e 100644 --- a/dlls/gdi32/dibdrv/dibdrv.h +++ b/dlls/gdi32/dibdrv/dibdrv.h @@ -177,7 +177,7 @@ typedef struct DWORD octant; } bres_params; -extern void get_rop_codes(INT rop, struct rop_codes *codes); +extern void get_rop_codes(INT rop, struct rop_codes *codes) DECLSPEC_HIDDEN; extern void calc_and_xor_masks(INT rop, DWORD color, DWORD *and, DWORD *xor) DECLSPEC_HIDDEN; extern void update_brush_rop( dibdrv_physdev *pdev, INT rop ) DECLSPEC_HIDDEN; extern void reset_dash_origin(dibdrv_physdev *pdev) DECLSPEC_HIDDEN;
1
0
0
0
Nikolay Sivov : comctl32/treeview: Free checkbox imagelist when control is about to be killed.
by Alexandre Julliard
03 Oct '11
03 Oct '11
Module: wine Branch: master Commit: 1bc331f31f44a382a7f909d79da794d28c233fd7 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=1bc331f31f44a382a7f909d79…
Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Oct 1 23:29:10 2011 +0400 comctl32/treeview: Free checkbox imagelist when control is about to be killed. --- dlls/comctl32/tests/treeview.c | 22 ++++++++++++++++++---- dlls/comctl32/treeview.c | 34 ++++++++++++++++++++++++---------- 2 files changed, 42 insertions(+), 14 deletions(-) diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c index fd4a6ce..c99d480 100644 --- a/dlls/comctl32/tests/treeview.c +++ b/dlls/comctl32/tests/treeview.c @@ -658,7 +658,7 @@ static void test_get_set_bkcolor(void) static void test_get_set_imagelist(void) { - HIMAGELIST hImageList = NULL; + HIMAGELIST himl; HWND hTree; hTree = create_treeview_control(0); @@ -667,9 +667,9 @@ static void test_get_set_imagelist(void) flush_sequences(sequences, NUM_MSG_SEQUENCES); /* Test a NULL HIMAGELIST */ - SendMessage( hTree, TVM_SETIMAGELIST, TVSIL_NORMAL, (LPARAM)hImageList ); - hImageList = (HIMAGELIST)SendMessage( hTree, TVM_GETIMAGELIST, TVSIL_NORMAL, 0 ); - ok(hImageList == NULL, "NULL image list, reported as 0x%p, expected 0.\n", hImageList); + SendMessage( hTree, TVM_SETIMAGELIST, TVSIL_NORMAL, 0 ); + himl = (HIMAGELIST)SendMessage( hTree, TVM_GETIMAGELIST, TVSIL_NORMAL, 0 ); + ok(himl == NULL, "NULL image list, reported as %p, expected 0.\n", himl); /* TODO: Test an actual image list */ @@ -1607,6 +1607,7 @@ static void test_htreeitem_layout(void) static void test_TVS_CHECKBOXES(void) { + HIMAGELIST himl; TVITEMA item; HWND hTree; DWORD ret; @@ -1614,6 +1615,9 @@ static void test_TVS_CHECKBOXES(void) hTree = create_treeview_control(0); fill_tree(hTree); + himl = (HIMAGELIST)SendMessageA(hTree, TVM_GETIMAGELIST, TVSIL_STATE, 0); + ok(himl == NULL, "got %p\n", himl); + item.hItem = hRoot; item.mask = TVIF_STATE; item.state = INDEXTOSTATEIMAGEMASK(1); @@ -1632,6 +1636,8 @@ static void test_TVS_CHECKBOXES(void) /* enabling check boxes set all items to 1 state image index */ SetWindowLongA(hTree, GWL_STYLE, GetWindowLongA(hTree, GWL_STYLE) | TVS_CHECKBOXES); + himl = (HIMAGELIST)SendMessageA(hTree, TVM_GETIMAGELIST, TVSIL_STATE, 0); + ok(himl != NULL, "got %p\n", himl); item.hItem = hRoot; item.mask = TVIF_STATE; @@ -1652,8 +1658,16 @@ static void test_TVS_CHECKBOXES(void) DestroyWindow(hTree); /* the same, but initially created with TVS_CHECKBOXES */ + hTree = create_treeview_control(0); + fill_tree(hTree); + himl = (HIMAGELIST)SendMessageA(hTree, TVM_GETIMAGELIST, TVSIL_STATE, 0); + ok(himl == NULL, "got %p\n", himl); + DestroyWindow(hTree); + hTree = create_treeview_control(TVS_CHECKBOXES); fill_tree(hTree); + himl = (HIMAGELIST)SendMessageA(hTree, TVM_GETIMAGELIST, TVSIL_STATE, 0); + todo_wine ok(himl == NULL, "got %p\n", himl); item.hItem = hRoot; item.mask = TVIF_STATE; diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index 02b5a7f..c5f3bb3 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -66,6 +66,12 @@ WINE_DEFAULT_DEBUG_CHANNEL(treeview); +enum StateListType +{ + OriginInternal, + OriginUser +}; + /* internal structures */ typedef struct _TREEITEM /* HTREEITEM is a _TREEINFO *. */ @@ -156,6 +162,7 @@ typedef struct tagTREEVIEW_INFO HIMAGELIST himlState; int stateImageHeight; int stateImageWidth; + enum StateListType statehimlType; HDPA items; DWORD lastKeyPressTimestamp; @@ -1756,22 +1763,21 @@ TREEVIEW_NaturalHeight(const TREEVIEW_INFO *infoPtr) } static LRESULT -TREEVIEW_SetImageList(TREEVIEW_INFO *infoPtr, WPARAM wParam, HIMAGELIST himlNew) +TREEVIEW_SetImageList(TREEVIEW_INFO *infoPtr, UINT type, HIMAGELIST himlNew) { HIMAGELIST himlOld = 0; int oldWidth = infoPtr->normalImageWidth; int oldHeight = infoPtr->normalImageHeight; + TRACE("%u,%p\n", type, himlNew); - TRACE("%lx,%p\n", wParam, himlNew); - - switch (wParam) + switch (type) { case TVSIL_NORMAL: himlOld = infoPtr->himlNormal; infoPtr->himlNormal = himlNew; - if (himlNew != NULL) + if (himlNew) ImageList_GetIconSize(himlNew, &infoPtr->normalImageWidth, &infoPtr->normalImageHeight); else @@ -1786,9 +1792,12 @@ TREEVIEW_SetImageList(TREEVIEW_INFO *infoPtr, WPARAM wParam, HIMAGELIST himlNew) himlOld = infoPtr->himlState; infoPtr->himlState = himlNew; - if (himlNew != NULL) + if (himlNew) + { ImageList_GetIconSize(himlNew, &infoPtr->stateImageWidth, &infoPtr->stateImageHeight); + infoPtr->statehimlType = OriginUser; + } else { infoPtr->stateImageWidth = 0; @@ -1796,6 +1805,9 @@ TREEVIEW_SetImageList(TREEVIEW_INFO *infoPtr, WPARAM wParam, HIMAGELIST himlNew) } break; + + default: + ERR("unknown imagelist type %u\n", type); } if (oldWidth != infoPtr->normalImageWidth || @@ -4950,7 +4962,7 @@ TREEVIEW_MouseWheel(TREEVIEW_INFO *infoPtr, WPARAM wParam, LPARAM lParam) /* Create/Destroy *******************************************************/ static void -initialize_checkboxes(TREEVIEW_INFO *infoPtr) +TREEVIEW_InitCheckboxes(TREEVIEW_INFO *infoPtr) { RECT rc; HBITMAP hbm, hbmOld; @@ -4958,6 +4970,7 @@ initialize_checkboxes(TREEVIEW_INFO *infoPtr) int nIndex; infoPtr->himlState = ImageList_Create(16, 16, ILC_COLOR | ILC_MASK, 3, 0); + infoPtr->statehimlType = OriginInternal; hdcScreen = GetDC(0); @@ -5089,7 +5102,7 @@ TREEVIEW_Create(HWND hwnd, const CREATESTRUCTW *lpcs) hwnd, 0, 0, 0); if (infoPtr->dwStyle & TVS_CHECKBOXES) - initialize_checkboxes(infoPtr); + TREEVIEW_InitCheckboxes(infoPtr); /* Make sure actual scrollbar state is consistent with uInternalStatus */ ShowScrollBar(hwnd, SB_VERT, FALSE); @@ -5121,10 +5134,11 @@ TREEVIEW_Destroy(TREEVIEW_INFO *infoPtr) CloseThemeData (GetWindowTheme (infoPtr->hwnd)); + if (infoPtr->statehimlType == OriginInternal) + ImageList_Destroy(infoPtr->himlState); /* Deassociate treeview from the window before doing anything drastic. */ SetWindowLongPtrW(infoPtr->hwnd, 0, 0); - DeleteObject(infoPtr->hDefaultFont); DeleteObject(infoPtr->hBoldFont); DeleteObject(infoPtr->hUnderlineFont); @@ -5459,7 +5473,7 @@ TREEVIEW_StyleChanged(TREEVIEW_INFO *infoPtr, WPARAM wParam, LPARAM lParam) { if (dwNewStyle & TVS_CHECKBOXES) { - initialize_checkboxes(infoPtr); + TREEVIEW_InitCheckboxes(infoPtr); TRACE("checkboxes enabled\n"); /* set all items to state image index 1 */
1
0
0
0
← Newer
1
...
72
73
74
75
76
77
78
79
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
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
Results per page:
10
25
50
100
200