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
September 2018
----- 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
670 discussions
Start a n
N
ew thread
Gabriel Ivăncescu : comctl32/listbox: Update the size in SetColumnWidth before calling UpdatePage.
by Alexandre Julliard
07 Sep '18
07 Sep '18
Module: wine Branch: master Commit: bb116577a3d28e9063102fb6484e6947913002ad URL:
https://source.winehq.org/git/wine.git/?a=commit;h=bb116577a3d28e9063102fb6…
Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Sep 5 18:51:50 2018 +0300 comctl32/listbox: Update the size in SetColumnWidth before calling UpdatePage. Some applications don't forward WM_SIZE from DefWindowProc to the control, but instead only send a LB_SETCOLUMNWIDTH message, even when the column width doesn't change (but the listbox size does). Wine-Bug:
https://bugs.winehq.org/show_bug.cgi?id=22440
Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/listbox.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/dlls/comctl32/listbox.c b/dlls/comctl32/listbox.c index 252844e..2137ef8 100644 --- a/dlls/comctl32/listbox.c +++ b/dlls/comctl32/listbox.c @@ -1257,12 +1257,19 @@ static LRESULT LISTBOX_SetHorizontalExtent( LB_DESCR *descr, INT extent ) /*********************************************************************** * LISTBOX_SetColumnWidth */ -static LRESULT LISTBOX_SetColumnWidth( LB_DESCR *descr, INT width) +static LRESULT LISTBOX_SetColumnWidth( LB_DESCR *descr, INT column_width) { - if (width == descr->column_width) return LB_OKAY; - TRACE("[%p]: new column width = %d\n", descr->self, width ); - descr->column_width = width; - LISTBOX_UpdatePage( descr ); + RECT rect; + + TRACE("[%p]: new column width = %d\n", descr->self, column_width); + + GetClientRect(descr->self, &rect); + descr->width = rect.right - rect.left; + descr->height = rect.bottom - rect.top; + descr->column_width = column_width; + + LISTBOX_UpdatePage(descr); + LISTBOX_UpdateScroll(descr); return LB_OKAY; }
1
0
0
0
Nikolay Sivov : opcservices: Fix a typo.
by Alexandre Julliard
07 Sep '18
07 Sep '18
Module: wine Branch: master Commit: ce11b1bf62a80d55a5a487a4f2e399c2f6d36d8c URL:
https://source.winehq.org/git/wine.git/?a=commit;h=ce11b1bf62a80d55a5a487a4…
Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Sep 7 13:56:14 2018 +0300 opcservices: Fix a typo. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opcservices/package.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/opcservices/package.c b/dlls/opcservices/package.c index 370b42e..2c2ef7c 100644 --- a/dlls/opcservices/package.c +++ b/dlls/opcservices/package.c @@ -352,7 +352,7 @@ static HRESULT WINAPI opc_part_set_PartExists(IOpcPartSet *iface, IOpcPartUri *n return E_NOTIMPL; } -static HRESULT WINAPI opc_part_set_GtEnumerator(IOpcPartSet *iface, IOpcPartEnumerator **enumerator) +static HRESULT WINAPI opc_part_set_GetEnumerator(IOpcPartSet *iface, IOpcPartEnumerator **enumerator) { FIXME("iface %p, enumerator %p stub!\n", iface, enumerator); @@ -368,7 +368,7 @@ static const IOpcPartSetVtbl opc_part_set_vtbl = opc_part_set_CreatePart, opc_part_set_DeletePart, opc_part_set_PartExists, - opc_part_set_GtEnumerator, + opc_part_set_GetEnumerator, }; static HRESULT WINAPI opc_relationship_QueryInterface(IOpcRelationship *iface, REFIID iid, void **out)
1
0
0
0
Nikolay Sivov : opcservices: Fix argument handling in CreatePackageRootUri ().
by Alexandre Julliard
07 Sep '18
07 Sep '18
Module: wine Branch: master Commit: 5a6cb3818d997facda046d2eed331f3c7790d913 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=5a6cb3818d997facda046d2e…
Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Sep 7 13:56:13 2018 +0300 opcservices: Fix argument handling in CreatePackageRootUri(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opcservices/factory.c | 3 +++ dlls/opcservices/tests/opcservices.c | 21 +++++++++++++++++---- dlls/opcservices/uri.c | 2 ++ 3 files changed, 22 insertions(+), 4 deletions(-) diff --git a/dlls/opcservices/factory.c b/dlls/opcservices/factory.c index 2ecd5ad..9036141 100644 --- a/dlls/opcservices/factory.c +++ b/dlls/opcservices/factory.c @@ -312,6 +312,9 @@ static HRESULT WINAPI opc_factory_CreatePackageRootUri(IOpcFactory *iface, IOpcU { TRACE("iface %p, uri %p.\n", iface, uri); + if (!uri) + return E_POINTER; + return opc_root_uri_create(uri); } diff --git a/dlls/opcservices/tests/opcservices.c b/dlls/opcservices/tests/opcservices.c index 63932fe..84a8c12 100644 --- a/dlls/opcservices/tests/opcservices.c +++ b/dlls/opcservices/tests/opcservices.c @@ -41,16 +41,18 @@ static void test_package(void) static const WCHAR typeW[] = {'t','y','p','e','/','s','u','b','t','y','p','e',0}; static const WCHAR targetW[] = {'t','a','r','g','e','t',0}; static const WCHAR uriW[] = {'/','u','r','i',0}; + static const WCHAR rootW[] = {'/',0}; IOpcRelationshipSet *relset, *relset2; IOpcPartSet *partset, *partset2; IOpcRelationship *rel; IOpcPartUri *part_uri; IOpcFactory *factory; IOpcPackage *package; - IOpcUri *source_uri; IUri *target_uri; IOpcPart *part; + IOpcUri *uri; HRESULT hr; + BSTR str; BOOL ret; factory = create_factory(); @@ -93,11 +95,11 @@ static void test_package(void) hr = IOpcRelationshipSet_CreateRelationship(relset, NULL, typeW, target_uri, OPC_URI_TARGET_MODE_INTERNAL, &rel); ok(SUCCEEDED(hr), "Failed to create relationship, hr %#x.\n", hr); - hr = IOpcRelationship_GetSourceUri(rel, &source_uri); + hr = IOpcRelationship_GetSourceUri(rel, &uri); ok(SUCCEEDED(hr), "Failed to get source uri, hr %#x.\n", hr); - ok(source_uri == (IOpcUri *)part_uri, "Unexpected source uri.\n"); + ok(uri == (IOpcUri *)part_uri, "Unexpected source uri.\n"); - IOpcUri_Release(source_uri); + IOpcUri_Release(uri); IOpcRelationship_Release(rel); IUri_Release(target_uri); @@ -126,6 +128,17 @@ todo_wine { IOpcPackage_Release(package); + /* Root uri */ + hr = IOpcFactory_CreatePackageRootUri(factory, NULL); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + hr = IOpcFactory_CreatePackageRootUri(factory, &uri); + ok(SUCCEEDED(hr), "Failed to create root uri, hr %#x.\n", hr); + hr = IOpcUri_GetRawUri(uri, &str); + ok(SUCCEEDED(hr), "Failed to get raw uri, hr %#x.\n", hr); + ok(!lstrcmpW(str, rootW), "Unexpected uri %s.\n", wine_dbgstr_w(str)); + SysFreeString(str); + IOpcUri_Release(uri); + IOpcFactory_Release(factory); } diff --git a/dlls/opcservices/uri.c b/dlls/opcservices/uri.c index 0c5afa9..e461eba 100644 --- a/dlls/opcservices/uri.c +++ b/dlls/opcservices/uri.c @@ -552,6 +552,8 @@ HRESULT opc_root_uri_create(IOpcUri **out) HRESULT hr; IUri *uri; + *out = NULL; + if (!(obj = heap_alloc_zero(sizeof(*obj)))) return E_OUTOFMEMORY;
1
0
0
0
Nikolay Sivov : opcservices: Implement relationships parts uri support.
by Alexandre Julliard
07 Sep '18
07 Sep '18
Module: wine Branch: master Commit: 390847214b938dad1068d997e1b7cc70218f4131 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=390847214b938dad1068d997…
Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Sep 7 13:56:12 2018 +0300 opcservices: Implement relationships parts uri support. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opcservices/Makefile.in | 2 +- dlls/opcservices/factory.c | 19 ++-- dlls/opcservices/opc_private.h | 15 ++- dlls/opcservices/tests/opcservices.c | 167 ++++++++++++++++++++++++++++++++ dlls/opcservices/uri.c | 179 +++++++++++++++++++++++++++++------ include/opcbase.idl | 2 + 6 files changed, 347 insertions(+), 37 deletions(-) Diff:
https://source.winehq.org/git/wine.git/?a=commitdiff;h=390847214b938dad1068…
1
0
0
0
André Hentschel : ntdll: Bump Win 10 version to 17134.
by Alexandre Julliard
07 Sep '18
07 Sep '18
Module: wine Branch: master Commit: 6a3d2cb2f369c3809f8a8d1ceaaa6bb5b5978d1c URL:
https://source.winehq.org/git/wine.git/?a=commit;h=6a3d2cb2f369c3809f8a8d1c…
Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Sep 7 12:50:49 2018 +0200 ntdll: Bump Win 10 version to 17134. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/version.c | 2 +- programs/winecfg/appdefaults.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/version.c b/dlls/ntdll/version.c index 1674261..9c9f2cc 100644 --- a/dlls/ntdll/version.c +++ b/dlls/ntdll/version.c @@ -185,7 +185,7 @@ static const RTL_OSVERSIONINFOEXW VersionData[NB_WINDOWS_VERSIONS] = }, /* WIN10 */ { - sizeof(RTL_OSVERSIONINFOEXW), 10, 0, 0x3AD7, VER_PLATFORM_WIN32_NT, + sizeof(RTL_OSVERSIONINFOEXW), 10, 0, 0x42EE, VER_PLATFORM_WIN32_NT, {0}, 0, 0, VER_SUITE_SINGLEUSERTS, VER_NT_WORKSTATION, 0 }, diff --git a/programs/winecfg/appdefaults.c b/programs/winecfg/appdefaults.c index d598fd4..6c4e6a4 100644 --- a/programs/winecfg/appdefaults.c +++ b/programs/winecfg/appdefaults.c @@ -48,7 +48,7 @@ static const struct const char *szProductType; } win_versions[] = { - { "win10", "Windows 10", 10, 0, 0x3AD7,VER_PLATFORM_WIN32_NT, "", 0, 0, "WinNT"}, + { "win10", "Windows 10", 10, 0, 0x42EE,VER_PLATFORM_WIN32_NT, "", 0, 0, "WinNT"}, { "win81", "Windows 8.1", 6, 3, 0x2580,VER_PLATFORM_WIN32_NT, "", 0, 0, "WinNT"}, { "win8", "Windows 8", 6, 2, 0x23F0,VER_PLATFORM_WIN32_NT, "", 0, 0, "WinNT"}, { "win2008r2", "Windows 2008 R2", 6, 1, 0x1DB1,VER_PLATFORM_WIN32_NT, "Service Pack 1", 1, 0, "ServerNT"},
1
0
0
0
Jactry Zeng : riched20: Handle NULL in ITextServices::{TxGetHScroll, TxGetVScroll}.
by Alexandre Julliard
07 Sep '18
07 Sep '18
Module: wine Branch: master Commit: 563bfdfc18605f4c1c43964378cf21d416426ab8 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=563bfdfc18605f4c1c439643…
Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Fri Sep 7 16:01:26 2018 +0800 riched20: Handle NULL in ITextServices::{TxGetHScroll, TxGetVScroll}. Wine-Bug:
https://bugs.winehq.org/show_bug.cgi?id=43488
Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/tests/txtsrv.c | 20 ++++++++++++++++++++ dlls/riched20/txtsrv.c | 30 ++++++++++++++++++++---------- 2 files changed, 40 insertions(+), 10 deletions(-) diff --git a/dlls/riched20/tests/txtsrv.c b/dlls/riched20/tests/txtsrv.c index 4dee5fd..a8cf6ff 100644 --- a/dlls/riched20/tests/txtsrv.c +++ b/dlls/riched20/tests/txtsrv.c @@ -990,6 +990,25 @@ static void test_default_format(void) ITextHost_Release(host); } +static void test_TxGetScroll(void) +{ + ITextServices *txtserv; + ITextHost *host; + HRESULT ret; + + if (!init_texthost(&txtserv, &host)) + return; + + ret = ITextServices_TxGetHScroll(txtserv, NULL, NULL, NULL, NULL, NULL); + ok(ret == S_OK, "ITextSerHices_GetVScroll failed: 0x%08x.\n", ret); + + ret = ITextServices_TxGetVScroll(txtserv, NULL, NULL, NULL, NULL, NULL); + ok(ret == S_OK, "ITextServices_GetVScroll failed: 0x%08x.\n", ret); + + ITextServices_Release(txtserv); + ITextHost_Release(host); +} + START_TEST( txtsrv ) { ITextServices *txtserv; @@ -1021,6 +1040,7 @@ START_TEST( txtsrv ) test_TxDraw(); test_QueryInterface(); test_default_format(); + test_TxGetScroll(); } if (wrapperCodeMem) VirtualFree(wrapperCodeMem, 0, MEM_RELEASE); } diff --git a/dlls/riched20/txtsrv.c b/dlls/riched20/txtsrv.c index eb61e4e..ee65621 100644 --- a/dlls/riched20/txtsrv.c +++ b/dlls/riched20/txtsrv.c @@ -182,11 +182,16 @@ DECLSPEC_HIDDEN HRESULT WINAPI fnTextSrv_TxGetHScroll(ITextServices *iface, LONG { ITextServicesImpl *This = impl_from_ITextServices(iface); - *plMin = This->editor->horz_si.nMin; - *plMax = This->editor->horz_si.nMax; - *plPos = This->editor->horz_si.nPos; - *plPage = This->editor->horz_si.nPage; - *pfEnabled = (This->editor->styleFlags & WS_HSCROLL) != 0; + if (plMin) + *plMin = This->editor->horz_si.nMin; + if (plMax) + *plMax = This->editor->horz_si.nMax; + if (plPos) + *plPos = This->editor->horz_si.nPos; + if (plPage) + *plPage = This->editor->horz_si.nPage; + if (pfEnabled) + *pfEnabled = (This->editor->styleFlags & WS_HSCROLL) != 0; return S_OK; } @@ -195,11 +200,16 @@ DECLSPEC_HIDDEN HRESULT WINAPI fnTextSrv_TxGetVScroll(ITextServices *iface, LONG { ITextServicesImpl *This = impl_from_ITextServices(iface); - *plMin = This->editor->vert_si.nMin; - *plMax = This->editor->vert_si.nMax; - *plPos = This->editor->vert_si.nPos; - *plPage = This->editor->vert_si.nPage; - *pfEnabled = (This->editor->styleFlags & WS_VSCROLL) != 0; + if (plMin) + *plMin = This->editor->vert_si.nMin; + if (plMax) + *plMax = This->editor->vert_si.nMax; + if (plPos) + *plPos = This->editor->vert_si.nPos; + if (plPage) + *plPage = This->editor->vert_si.nPage; + if (pfEnabled) + *pfEnabled = (This->editor->styleFlags & WS_VSCROLL) != 0; return S_OK; }
1
0
0
0
Gabriel Ivăncescu : shell32/autocomplete: Fix handling of Backspace and Delete.
by Alexandre Julliard
07 Sep '18
07 Sep '18
Module: wine Branch: master Commit: 0c049b6791e731c443317ce40d83e4a22b4f55a9 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=0c049b6791e731c443317ce4…
Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Sep 6 21:26:12 2018 +0300 shell32/autocomplete: Fix handling of Backspace and Delete. Wine-Bug:
https://bugs.winehq.org/show_bug.cgi?id=22255
Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/autocomplete.c | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/dlls/shell32/autocomplete.c b/dlls/shell32/autocomplete.c index b2c388e..4ec7387 100644 --- a/dlls/shell32/autocomplete.c +++ b/dlls/shell32/autocomplete.c @@ -199,19 +199,7 @@ static LRESULT APIENTRY ACEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, ShowWindow(This->hwndListBox, SW_HIDE); return CallWindowProcW(This->wpOrigEditProc, hwnd, uMsg, wParam, lParam); } - if (This->options & ACO_AUTOAPPEND) { - DWORD b; - SendMessageW(hwnd, EM_GETSEL, (WPARAM)&b, 0); - if (b>1) { - hwndText[b-1] = '\0'; - } else { - hwndText[0] = '\0'; - SetWindowTextW(hwnd, hwndText); - } - } break; - default: - ; } SendMessageW(This->hwndListBox, LB_RESETCONTENT, 0, 0);
1
0
0
0
Gabriel Ivăncescu : shell32/autocomplete: Revamp pwzsRegKeyPath handling so it can deal with arbitrary sizes and make it more robust.
by Alexandre Julliard
07 Sep '18
07 Sep '18
Module: wine Branch: master Commit: 2964b975ac4fedce1c05bf984d0784b14fd95a78 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=2964b975ac4fedce1c05bf98…
Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Sep 6 21:26:11 2018 +0300 shell32/autocomplete: Revamp pwzsRegKeyPath handling so it can deal with arbitrary sizes and make it more robust. Handle heap_alloc failure, reg strings without a \ character at all, try harder to find the reg path (if only value fails the lookup), and read the registry value with any size. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/autocomplete.c | 81 +++++++++++++++++++++++++++------------------ 1 file changed, 49 insertions(+), 32 deletions(-) diff --git a/dlls/shell32/autocomplete.c b/dlls/shell32/autocomplete.c index cf8da50..b2c388e 100644 --- a/dlls/shell32/autocomplete.c +++ b/dlls/shell32/autocomplete.c @@ -486,40 +486,57 @@ static HRESULT WINAPI IAutoComplete2_fnInit( if (This->options & ACO_AUTOSUGGEST) create_listbox(This); - if (pwzsRegKeyPath) { - WCHAR *key; - WCHAR result[MAX_PATH]; - WCHAR *value; - HKEY hKey = 0; - LONG res; - LONG len; - - /* pwszRegKeyPath contains the key as well as the value, so we split */ - key = heap_alloc((lstrlenW(pwzsRegKeyPath)+1)*sizeof(WCHAR)); - strcpyW(key, pwzsRegKeyPath); - value = strrchrW(key, '\\'); - *value = 0; - value++; - /* Now value contains the value and buffer the key */ - res = RegOpenKeyExW(HKEY_CURRENT_USER, key, 0, KEY_READ, &hKey); - if (res != ERROR_SUCCESS) { - /* if the key is not found, MSDN states we must seek in HKEY_LOCAL_MACHINE */ - res = RegOpenKeyExW(HKEY_LOCAL_MACHINE, key, 0, KEY_READ, &hKey); - } - if (res == ERROR_SUCCESS) { - res = RegQueryValueW(hKey, value, result, &len); - if (res == ERROR_SUCCESS) { - This->quickComplete = heap_alloc(len*sizeof(WCHAR)); - strcpyW(This->quickComplete, result); - } - RegCloseKey(hKey); - } - heap_free(key); + if (pwzsRegKeyPath) + { + static const HKEY roots[] = { HKEY_CURRENT_USER, HKEY_LOCAL_MACHINE }; + WCHAR *key, *value; + DWORD type, sz; + BYTE *qc; + HKEY hKey; + LSTATUS res; + size_t len; + UINT i; + + /* pwszRegKeyPath contains the key as well as the value, so split it */ + value = strrchrW(pwzsRegKeyPath, '\\'); + len = value - pwzsRegKeyPath; + + if (value && (key = heap_alloc((len+1) * sizeof(*key))) != NULL) + { + memcpy(key, pwzsRegKeyPath, len * sizeof(*key)); + key[len] = '\0'; + value++; + + for (i = 0; i < ARRAY_SIZE(roots); i++) + { + if (RegOpenKeyExW(roots[i], key, 0, KEY_READ, &hKey) != ERROR_SUCCESS) + continue; + sz = MAX_PATH * sizeof(WCHAR); + + while ((qc = heap_alloc(sz)) != NULL) + { + res = RegQueryValueExW(hKey, value, NULL, &type, qc, &sz); + if (res == ERROR_SUCCESS && type == REG_SZ) + { + This->quickComplete = heap_realloc(qc, sz); + i = ARRAY_SIZE(roots); + break; + } + heap_free(qc); + if (res != ERROR_MORE_DATA || type != REG_SZ) + break; + } + RegCloseKey(hKey); + } + heap_free(key); + } } - if ((pwszQuickComplete) && (!This->quickComplete)) { - This->quickComplete = heap_alloc((lstrlenW(pwszQuickComplete)+1)*sizeof(WCHAR)); - lstrcpyW(This->quickComplete, pwszQuickComplete); + if (!This->quickComplete && pwszQuickComplete) + { + size_t len = strlenW(pwszQuickComplete)+1; + if ((This->quickComplete = heap_alloc(len * sizeof(WCHAR))) != NULL) + memcpy(This->quickComplete, pwszQuickComplete, len * sizeof(WCHAR)); } return S_OK;
1
0
0
0
Gijs Vermeulen : msvcp110: Export _Xtime_diff_to_millis2.
by Alexandre Julliard
06 Sep '18
06 Sep '18
Module: wine Branch: master Commit: c5bb1084844ce94a841e218dc0b64e7d8ed13f34 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=c5bb1084844ce94a841e218d…
Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Thu Sep 6 20:41:53 2018 +0200 msvcp110: Export _Xtime_diff_to_millis2. Wine-Bug:
https://bugs.winehq.org/show_bug.cgi?id=45785
Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp110/msvcp110.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcp110/msvcp110.spec b/dlls/msvcp110/msvcp110.spec index 7bd35fa..8be2e17 100644 --- a/dlls/msvcp110/msvcp110.spec +++ b/dlls/msvcp110/msvcp110.spec @@ -3892,7 +3892,7 @@ @ stub _Xp_sqrtx @ stub _Xp_subx @ stub _Xtime_diff_to_millis -@ stub _Xtime_diff_to_millis2 +@ cdecl _Xtime_diff_to_millis2(ptr ptr) @ cdecl _Xtime_get_ticks() @ stub __Wcrtomb_lk # extern _Zero
1
0
0
0
Gijs Vermeulen : msvcp110: Export xtime_get.
by Alexandre Julliard
06 Sep '18
06 Sep '18
Module: wine Branch: master Commit: 31b671f341786f8f7fb4639819b87dfedba30cdb URL:
https://source.winehq.org/git/wine.git/?a=commit;h=31b671f341786f8f7fb46398…
Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Thu Sep 6 20:41:52 2018 +0200 msvcp110: Export xtime_get. Wine-Bug:
https://bugs.winehq.org/show_bug.cgi?id=45784
Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp110/msvcp110.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcp110/msvcp110.spec b/dlls/msvcp110/msvcp110.spec index 0837526..7bd35fa 100644 --- a/dlls/msvcp110/msvcp110.spec +++ b/dlls/msvcp110/msvcp110.spec @@ -3899,4 +3899,4 @@ @ cdecl towctrans(long long) @ cdecl wctrans(str) @ cdecl wctype(str) -@ stub xtime_get +@ cdecl xtime_get(ptr long)
1
0
0
0
← Newer
1
...
57
58
59
60
61
62
63
...
67
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
Results per page:
10
25
50
100
200