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
May 2012
----- 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
737 discussions
Start a n
N
ew thread
Piotr Caban : user32/tests: Added SetWindowPos test that incorrectly sets focus.
by Alexandre Julliard
22 May '12
22 May '12
Module: wine Branch: master Commit: 42eb57dfa7310dc6b70f771c8014d8a02485d554 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=42eb57dfa7310dc6b70f771c8…
Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri May 18 15:52:50 2012 +0200 user32/tests: Added SetWindowPos test that incorrectly sets focus. --- dlls/user32/tests/win.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 4f343da..dd5069b 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -2157,6 +2157,14 @@ static void test_SetWindowPos(HWND hwnd, HWND hwnd2) DestroyWindow(hwnd_grandchild); DestroyWindow(hwnd_child); DestroyWindow(hwnd_child2); + + hwnd_child = create_tool_window(WS_CHILD|WS_POPUP|WS_SYSMENU, hwnd2); + ok(!!hwnd_child, "Failed to create child window (%d)\n", GetLastError()); + ret = SetWindowPos(hwnd_child, NULL, 0, 0, 0, 0, SWP_NOSIZE|SWP_NOMOVE|SWP_NOACTIVATE|SWP_SHOWWINDOW); + ok(ret, "Got %d\n", ret); + flush_events( TRUE ); + todo_wine check_active_state(hwnd2, hwnd2, hwnd2); + DestroyWindow(hwnd_child); } static void test_SetMenu(HWND parent)
1
0
0
0
Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard
22 May '12
22 May '12
Module: wine Branch: master Commit: 54e8bc843461b62fa6c44b91eb028cade72731b2 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=54e8bc843461b62fa6c44b91e…
Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Tue May 22 16:09:19 2012 +0300 po: Update Lithuanian translation. --- po/lt.po | 21 +++++---------------- 1 files changed, 5 insertions(+), 16 deletions(-) diff --git a/po/lt.po b/po/lt.po index 9417381..d87a43a 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To:
http://bugs.winehq.org\n
" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2012-05-04 07:35+0300\n" +"PO-Revision-Date: 2012-05-22 16:06+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: komp_lt(a)konf.lt\n" "Language: Lithuanian\n" @@ -158,21 +158,10 @@ msgid "Cancel" msgstr "Atsisakyti" #: appwiz.rc:112 -#, fuzzy -#| msgid "Wine Gecko Installer" msgid "Wine Mono Installer" -msgstr "Wine Gecko diegimo programa" +msgstr "Wine Mono diegimo programa" #: appwiz.rc:115 -#, fuzzy -#| msgid "" -#| "Wine could not find a Gecko package which is needed for applications " -#| "embedding HTML to work correctly. Wine can automatically download and " -#| "install it for you.\n" -#| "\n" -#| "Note: it is recommended to use your distribution's packages instead. See " -#| "<a href=\"
http://wiki.winehq.org/Gecko\
">
http://wiki.winehq.org/Gecko
</a> " -#| "for details." msgid "" "Wine could not find a Mono package which is needed for .NET applications to " "work correctly. Wine can automatically download and install it for you.\n" @@ -181,11 +170,11 @@ msgid "" "href=\"
http://wiki.winehq.org/Mono\
">
http://wiki.winehq.org/Mono
</a> for " "details." msgstr "" -"Wine nepavyko rasti Gecko paketo reikalingo programoms, įterpiančioms HTML, " -"teisingai veikti. Wine gali automatiškai atsiųsti ir įdiegti šį paketą.\n" +"Wine nepavyko rasti Mono paketo reikalingo .NET programoms teisingai veikti. " +"Wine gali automatiškai atsiųsti ir įdiegti šį paketą.\n" "\n" "Pastaba: rekomenduojama naudoti distribucijos paketus. Daugiau informacijos " -"<a href=\"
http://wiki.winehq.org/Gecko\
">
http://wiki.winehq.org/Gecko
</a>." +"<a href=\"
http://wiki.winehq.org/Mono\
">
http://wiki.winehq.org/Mono
</a>." #: appwiz.rc:28 msgid "Add/Remove Programs"
1
0
0
0
Michael Stefaniuc : mshtml/tests: Check the correct variables.
by Alexandre Julliard
22 May '12
22 May '12
Module: wine Branch: master Commit: 6034d9dc684c54ad34f59d0e5a16f846cd341de7 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=6034d9dc684c54ad34f59d0e5…
Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue May 22 11:37:38 2012 +0200 mshtml/tests: Check the correct variables. --- dlls/mshtml/tests/dom.c | 2 +- dlls/mshtml/tests/htmldoc.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 4dc55db..b40fe5d 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -4414,7 +4414,7 @@ static void test_default_body(IHTMLBodyElement *body) hres = IHTMLBodyElement_get_text(body, &v); ok(hres == S_OK, "expect S_OK got 0x%08d\n", hres); ok(V_VT(&v) == VT_BSTR, "Expected VT_BSTR got %d\n", V_VT(&v)); - ok(bstr == NULL, "bstr != NULL\n"); + ok(V_BSTR(&v) == NULL, "bstr != NULL\n"); /* get_text - Invalid Text */ V_VT(&v) = VT_BSTR; diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index a486f3f..5240f2e 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -2161,8 +2161,8 @@ static HRESULT WINAPI DocumentSite_ActivateMe(IOleDocumentSite *iface, IOleDocum ok(hres == S_OK, "Could not get IOleInPlaceActiveObject: %08x\n", hres); if(activeobj) { - IOleInPlaceActiveObject_GetWindow(activeobj, &hwnd); - ok(hres == S_OK, "GetWindow failed: %08x\n", hres); + hres = IOleInPlaceActiveObject_GetWindow(activeobj, &hwnd); + ok(hres == E_FAIL, "GetWindow returned %08x, expected E_FAIL\n", hres); ok(hwnd == NULL, "hwnd=%p, expected NULL\n", hwnd); }
1
0
0
0
Michael Stefaniuc : d3dx9_36/tests: Check the correct return value.
by Alexandre Julliard
22 May '12
22 May '12
Module: wine Branch: master Commit: 7446af76f4e151d1a701ec2827dfc11b158ce814 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=7446af76f4e151d1a701ec282…
Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue May 22 11:36:20 2012 +0200 d3dx9_36/tests: Check the correct return value. --- dlls/d3dx9_36/tests/shader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/tests/shader.c b/dlls/d3dx9_36/tests/shader.c index d11a918..aa3ac12 100644 --- a/dlls/d3dx9_36/tests/shader.c +++ b/dlls/d3dx9_36/tests/shader.c @@ -480,7 +480,7 @@ static void test_setting_basic_table(IDirect3DDevice9 *device) res = ID3DXConstantTable_SetMatrix(ctable, device, "mvp", &mvp); ok(res == D3D_OK, "ID3DXConstantTable_SetMatrix failed on variable mvp: got 0x%08x\n", res); - ID3DXConstantTable_SetInt(ctable, device, "i", i + 1); + res = ID3DXConstantTable_SetInt(ctable, device, "i", i + 1); ok(res == D3D_OK, "ID3DXConstantTable_SetInt failed on variable i: got 0x%08x\n", res); /* Check that setting i again will overwrite the previous value */
1
0
0
0
Michael Stefaniuc : wininet/tests: Remove wrong check for 'len'.
by Alexandre Julliard
22 May '12
22 May '12
Module: wine Branch: master Commit: 92c97c1710c8842d4d45f02e5b1527f125f0ca9d URL:
http://source.winehq.org/git/wine.git/?a=commit;h=92c97c1710c8842d4d45f02e5…
Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue May 22 11:32:25 2012 +0200 wininet/tests: Remove wrong check for 'len'. --- dlls/wininet/tests/url.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/tests/url.c b/dlls/wininet/tests/url.c index 15fbb09..a391aa6 100644 --- a/dlls/wininet/tests/url.c +++ b/dlls/wininet/tests/url.c @@ -792,7 +792,6 @@ static void InternetCreateUrlA_test(void) ok(!ret, "Expected failure\n"); ok(GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); - ok(len == -1, "Expected len -1, got %d\n", len); /* test valid lpUrlComponents, empty szUrl * lpdwUrlLength is size of buffer required on exit, including
1
0
0
0
Michael Stefaniuc : mshtml/tests: Remove leftover code from c3d8d052.
by Alexandre Julliard
22 May '12
22 May '12
Module: wine Branch: master Commit: 2addfb73e3d783eb8fc3c3a5abc4c13f9f94c198 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=2addfb73e3d783eb8fc3c3a5a…
Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue May 22 11:24:55 2012 +0200 mshtml/tests: Remove leftover code from c3d8d052. --- dlls/mshtml/tests/dom.c | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 14d91cc..4dc55db 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -3541,9 +3541,6 @@ static void test_elem_col_item(IHTMLElementCollection *col, const char *n, test_elem_collection((IUnknown*)disp, elem_types, len); IDispatch_Release(disp); - ok(hres == S_OK, "Could not get IHTMLElementCollection interface: %08x\n", hres); - if(hres != S_OK) - goto cleanup; V_VT(&index) = VT_I4; @@ -3573,7 +3570,6 @@ static void test_elem_col_item(IHTMLElementCollection *col, const char *n, ok(hres == E_INVALIDARG, "item failed: %08x, expected E_INVALIDARG\n", hres); ok(disp == NULL, "disp != NULL\n"); -cleanup: SysFreeString(V_BSTR(&name)); }
1
0
0
0
Hans Leidekker : fusion: Get rid of some redundant buffer copying.
by Alexandre Julliard
22 May '12
22 May '12
Module: wine Branch: master Commit: 14a0486118d2424b3220ba28e4f84adfafb32749 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=14a0486118d2424b3220ba28e…
Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue May 22 10:10:22 2012 +0200 fusion: Get rid of some redundant buffer copying. --- dlls/fusion/asmenum.c | 9 ++------- 1 files changed, 2 insertions(+), 7 deletions(-) diff --git a/dlls/fusion/asmenum.c b/dlls/fusion/asmenum.c index 1d4de5b..f4da88a 100644 --- a/dlls/fusion/asmenum.c +++ b/dlls/fusion/asmenum.c @@ -398,22 +398,20 @@ static HRESULT enumerate_gac(IAssemblyEnumImpl *asmenum, IAssemblyName *pName) if (FAILED(hr)) return hr; + strcpyW(path, buf); GetNativeSystemInfo(&info); if (info.u.s.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_AMD64) { - strcpyW(path, buf); strcpyW(path + size - 1, gac_64); hr = enum_gac_assemblies(&asmenum->assemblies, pName, 0, path); if (FAILED(hr)) return hr; } - strcpyW(path, buf); strcpyW(path + size - 1, gac_32); hr = enum_gac_assemblies(&asmenum->assemblies, pName, 0, path); if (FAILED(hr)) return hr; - strcpyW(path, buf); strcpyW(path + size - 1, gac_msil); hr = enum_gac_assemblies(&asmenum->assemblies, pName, 0, path); if (FAILED(hr)) @@ -424,27 +422,24 @@ static HRESULT enumerate_gac(IAssemblyEnumImpl *asmenum, IAssemblyName *pName) if (FAILED(hr)) return hr; + strcpyW(path, buf); if (info.u.s.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_AMD64) { - strcpyW(path, buf); strcpyW(path + size - 1, gac_64); hr = enum_gac_assemblies(&asmenum->assemblies, pName, 0, path); if (FAILED(hr)) return hr; } - strcpyW(path, buf); strcpyW(path + size - 1, gac_32); hr = enum_gac_assemblies(&asmenum->assemblies, pName, 0, path); if (FAILED(hr)) return hr; - strcpyW(path, buf); strcpyW(path + size - 1, gac_msil); hr = enum_gac_assemblies(&asmenum->assemblies, pName, 0, path); if (FAILED(hr)) return hr; - strcpyW(path, buf); strcpyW(path + size - 1, gac); hr = enum_gac_assemblies(&asmenum->assemblies, pName, 0, path); if (FAILED(hr))
1
0
0
0
Hans Leidekker : fusion: Enumerate 64-bit assemblies.
by Alexandre Julliard
22 May '12
22 May '12
Module: wine Branch: master Commit: be9459a948097ddaa780745ae2374a320cabd1ed URL:
http://source.winehq.org/git/wine.git/?a=commit;h=be9459a948097ddaa780745ae…
Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue May 22 10:10:01 2012 +0200 fusion: Enumerate 64-bit assemblies. --- dlls/fusion/asmenum.c | 21 +++++++++++++++++++++ 1 files changed, 21 insertions(+), 0 deletions(-) diff --git a/dlls/fusion/asmenum.c b/dlls/fusion/asmenum.c index e4f73e8..1d4de5b 100644 --- a/dlls/fusion/asmenum.c +++ b/dlls/fusion/asmenum.c @@ -21,6 +21,8 @@ #include <stdarg.h> #define COBJMACROS +#define NONAMELESSUNION +#define NONAMELESSSTRUCT #include "windef.h" #include "winbase.h" @@ -384,8 +386,10 @@ static HRESULT enumerate_gac(IAssemblyEnumImpl *asmenum, IAssemblyName *pName) { static const WCHAR gac[] = {'\\','G','A','C',0}; static const WCHAR gac_32[] = {'\\','G','A','C','_','3','2',0}; + static const WCHAR gac_64[] = {'\\','G','A','C','_','6','4',0}; static const WCHAR gac_msil[] = {'\\','G','A','C','_','M','S','I','L',0}; WCHAR path[MAX_PATH], buf[MAX_PATH]; + SYSTEM_INFO info; HRESULT hr; DWORD size; @@ -394,6 +398,15 @@ static HRESULT enumerate_gac(IAssemblyEnumImpl *asmenum, IAssemblyName *pName) if (FAILED(hr)) return hr; + GetNativeSystemInfo(&info); + if (info.u.s.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_AMD64) + { + strcpyW(path, buf); + strcpyW(path + size - 1, gac_64); + hr = enum_gac_assemblies(&asmenum->assemblies, pName, 0, path); + if (FAILED(hr)) + return hr; + } strcpyW(path, buf); strcpyW(path + size - 1, gac_32); hr = enum_gac_assemblies(&asmenum->assemblies, pName, 0, path); @@ -411,6 +424,14 @@ static HRESULT enumerate_gac(IAssemblyEnumImpl *asmenum, IAssemblyName *pName) if (FAILED(hr)) return hr; + if (info.u.s.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_AMD64) + { + strcpyW(path, buf); + strcpyW(path + size - 1, gac_64); + hr = enum_gac_assemblies(&asmenum->assemblies, pName, 0, path); + if (FAILED(hr)) + return hr; + } strcpyW(path, buf); strcpyW(path + size - 1, gac_32); hr = enum_gac_assemblies(&asmenum->assemblies, pName, 0, path);
1
0
0
0
Nikolay Sivov : comctl32: Make it possible to use TVM_GETITEM with item from another tree.
by Alexandre Julliard
22 May '12
22 May '12
Module: wine Branch: master Commit: 95a15a3482ba47c1b84fd77a63f95d5cd784a97a URL:
http://source.winehq.org/git/wine.git/?a=commit;h=95a15a3482ba47c1b84fd77a6…
Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 22 11:31:23 2012 +0400 comctl32: Make it possible to use TVM_GETITEM with item from another tree. --- dlls/comctl32/tests/treeview.c | 13 +++++++- dlls/comctl32/treeview.c | 68 +++++++++++++++++++++------------------ 2 files changed, 49 insertions(+), 32 deletions(-) diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c index 2246c79..a669df9 100644 --- a/dlls/comctl32/tests/treeview.c +++ b/dlls/comctl32/tests/treeview.c @@ -746,8 +746,8 @@ static void test_get_set_item(void) TVITEMA tviRoot = {0}; int nBufferSize = 80; char szBuffer[80] = {0}; + HWND hTree, hTree2; DWORD ret; - HWND hTree; hTree = create_treeview_control(0); fill_tree(hTree); @@ -791,7 +791,18 @@ static void test_get_set_item(void) ok_sequence(sequences, TREEVIEW_SEQ_INDEX, test_get_set_item_seq, "test get set item", FALSE); + /* get item from a different tree */ + hTree2 = create_treeview_control(0); + + tviRoot.hItem = hRoot; + tviRoot.mask = TVIF_STATE; + tviRoot.state = 0; + ret = SendMessage( hTree2, TVM_GETITEMA, 0, (LPARAM)&tviRoot ); + expect(TRUE, ret); + ok(tviRoot.state == TVIS_FOCUSED, "got state 0x%0x\n", tviRoot.state); + DestroyWindow(hTree); + DestroyWindow(hTree2); } static void test_get_set_itemheight(void) diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index 3f4fdc6..63e3507 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -67,36 +67,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(treeview); /* internal structures */ -typedef struct _TREEITEM /* HTREEITEM is a _TREEINFO *. */ -{ - HTREEITEM parent; /* handle to parent or 0 if at root */ - HTREEITEM nextSibling; /* handle to next item in list, 0 if last */ - HTREEITEM firstChild; /* handle to first child or 0 if no child */ - - UINT callbackMask; - UINT state; - UINT stateMask; - LPWSTR pszText; - int cchTextMax; - int iImage; - int iSelectedImage; - int iExpandedImage; - int cChildren; - LPARAM lParam; - int iIntegral; /* item height multiplier (1 is normal) */ - int iLevel; /* indentation level:0=root level */ - HTREEITEM lastChild; - HTREEITEM prevSibling; /* handle to prev item in list, 0 if first */ - RECT rect; - LONG linesOffset; - LONG stateOffset; - LONG imageOffset; - LONG textOffset; - LONG textWidth; /* horizontal text extent for pszText */ - LONG visibleOrder; /* visible ordering, 0 is first visible item */ -} TREEVIEW_ITEM; - - typedef struct tagTREEVIEW_INFO { HWND hwnd; @@ -163,6 +133,35 @@ typedef struct tagTREEVIEW_INFO WCHAR szSearchParam[ MAX_PATH ]; } TREEVIEW_INFO; +typedef struct _TREEITEM /* HTREEITEM is a _TREEINFO *. */ +{ + HTREEITEM parent; /* handle to parent or 0 if at root */ + HTREEITEM nextSibling; /* handle to next item in list, 0 if last */ + HTREEITEM firstChild; /* handle to first child or 0 if no child */ + + UINT callbackMask; + UINT state; + UINT stateMask; + LPWSTR pszText; + int cchTextMax; + int iImage; + int iSelectedImage; + int iExpandedImage; + int cChildren; + LPARAM lParam; + int iIntegral; /* item height multiplier (1 is normal) */ + int iLevel; /* indentation level:0=root level */ + HTREEITEM lastChild; + HTREEITEM prevSibling; /* handle to prev item in list, 0 if first */ + RECT rect; + LONG linesOffset; + LONG stateOffset; + LONG imageOffset; + LONG textOffset; + LONG textWidth; /* horizontal text extent for pszText */ + LONG visibleOrder; /* visible ordering, 0 is first visible item */ + const TREEVIEW_INFO *infoPtr; /* tree data this item belongs to */ +} TREEVIEW_ITEM; /******** Defines that TREEVIEW_ProcessLetterKeys uses ****************/ #define KEY_DELAY 450 @@ -1012,6 +1011,7 @@ TREEVIEW_AllocateItem(const TREEVIEW_INFO *infoPtr) newItem->iImage = 0; newItem->iSelectedImage = 0; newItem->iExpandedImage = (WORD)I_IMAGENONE; + newItem->infoPtr = infoPtr; if (DPA_InsertPtr(infoPtr->items, INT_MAX, newItem) == -1) { @@ -2082,7 +2082,13 @@ TREEVIEW_GetItemT(const TREEVIEW_INFO *infoPtr, LPTVITEMEXW tvItem, BOOL isW) TREEVIEW_ITEM *item = tvItem->hItem; if (!TREEVIEW_ValidItem(infoPtr, item)) - return FALSE; + { + if (!item) return FALSE; + + TRACE("got item from different tree %p, called from %p\n", item->infoPtr, infoPtr); + infoPtr = item->infoPtr; + if (!TREEVIEW_ValidItem(infoPtr, item)) return FALSE; + } TREEVIEW_UpdateDispInfo(infoPtr, item, tvItem->mask);
1
0
0
0
Austin English : uxtheme: plf is already a pointer.
by Alexandre Julliard
22 May '12
22 May '12
Module: wine Branch: master Commit: d7ccfef25b5a128705dbfc11a717c2f4153f02c6 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=d7ccfef25b5a128705dbfc11a…
Author: Austin English <austinenglish(a)gmail.com> Date: Mon May 21 16:52:40 2012 -0700 uxtheme: plf is already a pointer. --- dlls/uxtheme/metric.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/uxtheme/metric.c b/dlls/uxtheme/metric.c index c056f28..043f836 100644 --- a/dlls/uxtheme/metric.c +++ b/dlls/uxtheme/metric.c @@ -118,7 +118,7 @@ HRESULT WINAPI GetThemeSysFont(HTHEME hTheme, int iFontID, LOGFONTW *plf) } } if(iFontID == TMT_ICONTITLEFONT) { - if(!SystemParametersInfoW(SPI_GETICONTITLELOGFONT, sizeof(LOGFONTW), &plf, 0)) + if(!SystemParametersInfoW(SPI_GETICONTITLELOGFONT, sizeof(LOGFONTW), plf, 0)) return HRESULT_FROM_WIN32(GetLastError()); } else {
1
0
0
0
← Newer
1
...
21
22
23
24
25
26
27
...
74
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
Results per page:
10
25
50
100
200