[prev in list] [next in list] [prev in thread] [next in thread] 

List:       nsis-commits
Subject:    [NSIS-commits] SF.net SVN: nsis:[7220] NSIS/trunk/Contrib/Makensisw
From:       anders_k--- via NSIS-commits <nsis-commits () lists ! sourceforge ! net>
Date:       2020-08-16 16:19:46
Message-ID: 1597594786.554038.29733 () sfp-scm-7 ! v30 ! lw ! sourceforge ! com
[Download RAW message or body]

Revision: 7220
          http://sourceforge.net/p/nsis/code/7220
Author:   anders_k
Date:     2020-08-16 16:19:46 +0000 (Sun, 16 Aug 2020)
Log Message:
-----------
Destroy the header font

Modified Paths:
--------------
    NSIS/trunk/Contrib/Makensisw/makensisw.cpp
    NSIS/trunk/Contrib/Makensisw/utils.h
    NSIS/trunk/Contrib/Makensisw/wndspy.cpp

Modified: NSIS/trunk/Contrib/Makensisw/makensisw.cpp
===================================================================
--- NSIS/trunk/Contrib/Makensisw/makensisw.cpp	2020-08-16 15:50:58 UTC (rev 7219)
+++ NSIS/trunk/Contrib/Makensisw/makensisw.cpp	2020-08-16 16:19:46 UTC (rev 7220)
@@ -687,7 +687,7 @@
         }
         case IDM_WNDSPY:
         {
-          extern int ShowWndSpy(HWND hOwner);
+          extern INT_PTR ShowWndSpy(HWND hOwner);
           return ShowWndSpy(g_sdata.hwnd);
         }
         case IDM_GUIDGEN:
@@ -943,6 +943,7 @@
       }
       break;
     case WM_DESTROY:
+      DeleteObject(dd.hHeaderFont);
       DeleteObject(dd.hFont);
       DeleteObject(dd.hBoldFont);
       break;

Modified: NSIS/trunk/Contrib/Makensisw/utils.h
===================================================================
--- NSIS/trunk/Contrib/Makensisw/utils.h	2020-08-16 15:50:58 UTC (rev 7219)
+++ NSIS/trunk/Contrib/Makensisw/utils.h	2020-08-16 16:19:46 UTC (rev 7220)
@@ -32,6 +32,14 @@
 #endif
 #define COUNTOF(a) (sizeof(a)/sizeof(a[0]))
 
+#if defined(_MSC_VER) && _MSC_VER >= 1200
+EXTERN_C IMAGE_DOS_HEADER __ImageBase;
+#define HINST_THISCOMPONENT ( (HINSTANCE) &__ImageBase )
+#define HINST_APPLICATION HINST_THISCOMPONENT
+#else
+#define HINST_APPLICATION ( (HINSTANCE) GetModuleHandle(NULL) )
+#endif
+
 #define MRU_LIST_SIZE 5
 #define MRU_DISPLAY_LENGTH 40
 #define SYMSETNAME_MAXLEN 40

Modified: NSIS/trunk/Contrib/Makensisw/wndspy.cpp
===================================================================
--- NSIS/trunk/Contrib/Makensisw/wndspy.cpp	2020-08-16 15:50:58 UTC (rev 7219)
+++ NSIS/trunk/Contrib/Makensisw/wndspy.cpp	2020-08-16 16:19:46 UTC (rev 7220)
@@ -380,7 +380,7 @@
   int m_AC; // Canonical "active" DPI_AWARENESS_CONTEXT
 };
 
-int ShowWndSpy(HWND hOwner)
+INT_PTR ShowWndSpy(HWND hOwner)
 {
   InitializeDpiApi();
   ScopedThreadDpiAwarenessContext::List aclist;
@@ -387,5 +387,5 @@
   ScopedThreadDpiAwarenessContext stdac(aclist << DPI::ac_pm2 << DPI::ac_system);
   DIALOGDATA dd;
   dd.DialogAwarenessContext = stdac.GetCanonicalActiveAwarenessContext();
-  return DialogBoxParam(GetModuleHandle(NULL), MAKEINTRESOURCE(DLG_WNDSPY), hOwner, \
SpyDlgProc, (LPARAM) &dd); +  return DialogBoxParam(HINST_APPLICATION, \
MAKEINTRESOURCE(DLG_WNDSPY), hOwner, SpyDlgProc, (LPARAM) &dd);  }

This was sent by the SourceForge.net collaborative development platform, the world's \
largest Open Source development site.



_______________________________________________
NSIS-commits mailing list
NSIS-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/nsis-commits


[prev in list] [next in list] [prev in thread] [next in thread]