Changeset 386 for trunk/Utilities/UpnpScanner

Timestamp:

Mar 21, 2015, 3:11:12 AM (9 years ago)

Author:

roman

Message:

VS2012 update, fix for AV in icon loading (high DPI)

Location:

trunk/Utilities/UpnpScanner

Files:

• MainDialog.h (modified) (1 diff)
• Release/UpnpScanner.exe (modified) (previous)
• UpnpScanner.ico (modified) (previous)
• UpnpScanner.rc (modified) (2 diffs)
• UpnpScanner.vcxproj (modified) (2 diffs)
• stdafx.h (modified) (2 diffs)

trunk/Utilities/UpnpScanner/MainDialog.h

@@ -533 +533 @@
                 m_TextEdit = GetDlgItem(IDC_TEXT);
                 m_TextEdit.SetLimitText(0);
-                SetIcon(AtlLoadIconImage(IDR_MAINFRAME, GetSystemMetrics(SM_CXICON), GetSystemMetrics(SM_CYICON), LR_DEFAULTCOLOR), TRUE);
-                #if !defined(_DEBUG)
-                        //SetIcon(AtlLoadIconImage(IDR_MAINFRAME, GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), LR_DEFAULTCOLOR), FALSE);
-                #endif // !defined(_DEBUG)
+                SetIcon(AtlLoadIconImage(IDR_MAINFRAME, LR_DEFAULTCOLOR, GetSystemMetrics(SM_CXICON), GetSystemMetrics(SM_CYICON)), TRUE);
+                SetIcon(AtlLoadIconImage(IDR_MAINFRAME, LR_DEFAULTCOLOR, GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON)), FALSE);
                 _W(CenterWindow());
                 #if _DEVELOPMENT && FALSE

trunk/Utilities/UpnpScanner/UpnpScanner.rc

@@ -100 +100 @@
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION  1, 0, 0, 260
+ FILEVERSION  1, 0, 0, 268
  PRODUCTVERSION 1,0,0,1
  FILEFLAGSMASK 0x3fL
@@ -119 +119 @@
             VALUE "CompanyName", "Roman Ryltsov"
             VALUE "FileDescription", "Alax.Info UPnP Scanner Module"
-            VALUE "FileVersion",  "1, 0, 0, 260\0"
+            VALUE "FileVersion",  "1, 0, 0, 268\0"
             VALUE "InternalName", "UpnpScanner.exe"
             VALUE "LegalCopyright", "Copyright © Alax.Info, Roman Ryltsov, 2006-2009"

trunk/Utilities/UpnpScanner/UpnpScanner.vcxproj

@@ -18 +18 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v100</PlatformToolset>
+    <PlatformToolset>v110_xp</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
     <UseOfAtl>Static</UseOfAtl>
@@ -26 +26 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v100</PlatformToolset>
+    <PlatformToolset>v110_xp</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
     <UseOfAtl>Static</UseOfAtl>

trunk/Utilities/UpnpScanner/stdafx.h

@@ -8 +8 @@
 #pragma once
 
-#define WINVER                  0x0501
-#define _WIN32_WINNT    0x0501
-#define _WIN32_IE               0x0500
+#include <winsdkver.h>
 
 #define INLINE_HRESULT_FROM_WIN32
@@ -33 +31 @@
 #define _WTL_NEW_PAGE_NOTIFY_HANDLERS
 
+#undef _SYSINFOAPI_H_
 #include <atlapp.h>
+#define _SYSINFOAPI_H_
 
 extern CAppModule _Module;