osdir.com

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: svn commit: r1832198 - /httpd/httpd/trunk/support/win32/ApacheMonitor.c


Hi Christophe,

This compiles and ApacheMonitor works.
Tested on VC14 & 11.

Cheers,
Gregg

On 5/24/2018 1:36 PM, jailletc36@xxxxxxxxxx wrote:
Author: jailletc36
Date: Thu May 24 20:36:26 2018
New Revision: 1832198

URL: http://svn.apache.org/viewvc?rev=1832198&view=rev
Log:
Success of 'SHGetMalloc()' should be tested with the SUCCEEDED macro.

/!\   This commit is _NOT COMPILE TESTED_. (I don't have a windows build environment available)
See PR 60086.

Modified:
     httpd/httpd/trunk/support/win32/ApacheMonitor.c

Modified: httpd/httpd/trunk/support/win32/ApacheMonitor.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/support/win32/ApacheMonitor.c?rev=1832198&r1=1832197&r2=1832198&view=diff
==============================================================================
--- httpd/httpd/trunk/support/win32/ApacheMonitor.c (original)
+++ httpd/httpd/trunk/support/win32/ApacheMonitor.c Thu May 24 20:36:26 2018
@@ -912,7 +912,7 @@ LRESULT CALLBACK ConnectDlgProc(HWND hDl
                              WM_SETTEXT,
                              (WPARAM) NULL, (LPARAM) szCmp);
              }
-            if (SHGetMalloc(&pMalloc)) {
+            if (SUCCEEDED(SHGetMalloc(&pMalloc))) {
                  pMalloc->lpVtbl->Free(pMalloc, il);
                  pMalloc->lpVtbl->Release(pMalloc);
              }