[ros-diffs] [tfaber] 74453: [0.4.5] - Merge Giannis's explorer leak fix from r74437. CORE-13155

Author: tfaber
Date: Wed May  3 11:06:04 2017
New Revision: 74453

URL: http://svn.reactos.org/svn/reactos?rev=74453&view=rev
Log:
[0.4.5]
- Merge Giannis's explorer leak fix from r74437. CORE-13155

Modified:
    branches/ros-branch-0_4_5/   (props changed)
    branches/ros-branch-0_4_5/reactos/   (props changed)
    branches/ros-branch-0_4_5/reactos/base/shell/explorer/trayntfy.cpp
    branches/ros-branch-0_4_5/rosapps/applications/cmdutils/cat/   (props changed)
    branches/ros-branch-0_4_5/rosapps/applications/imagesoft/lang/no-NO.rc   (props
changed)
    branches/ros-branch-0_4_5/rosapps/applications/net/roshttpd/   (props changed)
    branches/ros-branch-0_4_5/rosapps/applications/sysutils/gettype/   (props changed)
    branches/ros-branch-0_4_5/rosapps/applications/sysutils/logevent/   (props changed)
    branches/ros-branch-0_4_5/rosapps/applications/sysutils/screenshot/   (props changed)
    branches/ros-branch-0_4_5/rosapps/templates/old_wordpad/lang/no-NO.rc   (props
changed)

Propchange: branches/ros-branch-0_4_5/
------------------------------------------------------------------------------
--- svn:mergeinfo	(original)
+++ svn:mergeinfo	Wed May  3 11:06:04 2017
@@ -1 +1,2 @@
 /branches/colins-printing-for-freedom:67543-68405,68407-68414,68417-70595
+/trunk:74437

Propchange: branches/ros-branch-0_4_5/reactos/
------------------------------------------------------------------------------
--- svn:mergeinfo	(original)
+++ svn:mergeinfo	Wed May  3 11:06:04 2017
@@ -23,3 +23,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:74437

Modified: branches/ros-branch-0_4_5/reactos/base/shell/explorer/trayntfy.cpp
URL:
http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_5/reactos/base/s…
==============================================================================
--- branches/ros-branch-0_4_5/reactos/base/shell/explorer/trayntfy.cpp	[iso-8859-1]
(original)
+++ branches/ros-branch-0_4_5/reactos/base/shell/explorer/trayntfy.cpp	[iso-8859-1] Wed
May  3 11:06:04 2017
@@ -714,19 +714,18 @@
                 0,
                 TMT_TEXTCOLOR,
                 &textColor);
+
+            if (this->hFont != NULL)
+                DeleteObject(this->hFont);
+
+            SetFont(hFont, FALSE);
         }
         else
         {
-            NONCLIENTMETRICS ncm = { 0 };
-            ncm.cbSize = sizeof(ncm);
-            SystemParametersInfoW(SPI_GETNONCLIENTMETRICS, sizeof(ncm), &ncm,
FALSE);
-
-            hFont = CreateFontIndirectW(&ncm.lfMessageFont);
-
+            /* We don't need to set a font here, our parent will use 
+              * WM_SETFONT to set the right one when themes are not enabled. */
             textColor = RGB(0, 0, 0);
         }
-
-        SetFont(hFont, FALSE);
 
         CloseThemeData(clockTheme);
 

Propchange: branches/ros-branch-0_4_5/rosapps/applications/cmdutils/cat/
------------------------------------------------------------------------------
    (empty)

Propchange: branches/ros-branch-0_4_5/rosapps/applications/imagesoft/lang/no-NO.rc
------------------------------------------------------------------------------
    (empty)

Propchange: branches/ros-branch-0_4_5/rosapps/applications/net/roshttpd/
------------------------------------------------------------------------------
    (empty)

Propchange: branches/ros-branch-0_4_5/rosapps/applications/sysutils/gettype/
------------------------------------------------------------------------------
    (empty)

Propchange: branches/ros-branch-0_4_5/rosapps/applications/sysutils/logevent/
------------------------------------------------------------------------------
    (empty)

Propchange: branches/ros-branch-0_4_5/rosapps/applications/sysutils/screenshot/
------------------------------------------------------------------------------
    (empty)

Propchange: branches/ros-branch-0_4_5/rosapps/templates/old_wordpad/lang/no-NO.rc
------------------------------------------------------------------------------
    (empty)