Author: akhaldi Date: Tue Aug 2 17:21:30 2016 New Revision: 72094
URL: http://svn.reactos.org/svn/reactos?rev=72094&view=rev Log: [0.4.2] * Merge the browseui disc names fix by Christoph in r72092. CORE-11458
Modified: branches/ros-branch-0_4_2/reactos/ (props changed) branches/ros-branch-0_4_2/reactos/dll/win32/browseui/explorerband.cpp
Propchange: branches/ros-branch-0_4_2/reactos/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Aug 2 17:21:30 2016 @@ -20,4 +20,4 @@ /branches/usb-bringup:51335,51337,51341-51343,51348,51350,51353,51355,51365-51369,51372,51384-54388,54396-54398,54736-54737,54752-54754,54756-54760,54762,54764-54765,54767-54768,54772,54774-54777,54781,54787,54790-54792,54797-54798,54806,54808,54834-54838,54843,54850,54852,54856,54858-54859 /branches/usb-bringup-trunk:55019-55543,55548-55554,55556-55567 /branches/wlan-bringup:54809-54998 -/trunk/reactos:72020-72022,72026,72028,72030,72032-72034,72036,72063,72067 +/trunk/reactos:72020-72022,72026,72028,72030,72032-72034,72036,72063,72067,72092
Modified: branches/ros-branch-0_4_2/reactos/dll/win32/browseui/explorerband.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_2/reactos/dll/win... ============================================================================== --- branches/ros-branch-0_4_2/reactos/dll/win32/browseui/explorerband.cpp [iso-8859-1] (original) +++ branches/ros-branch-0_4_2/reactos/dll/win32/browseui/explorerband.cpp [iso-8859-1] Tue Aug 2 17:21:30 2016 @@ -350,7 +350,7 @@
/* Get the name of the node */ WCHAR wszDisplayName[MAX_PATH]; - if (!ILGetDisplayNameEx(psfParent, pEltRelative, wszDisplayName, ILGDN_INFOLDER)) + if (!ILGetDisplayNameEx(psfParent, pElt, wszDisplayName, ILGDN_INFOLDER)) { ERR("Failed to get node name\n"); return NULL;