Changeset 386


Ignore:
Timestamp:
Mar 21, 2015, 3:11:12 AM (7 years ago)
Author:
roman
Message:

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

Location:
trunk/Utilities/UpnpScanner
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/Utilities/UpnpScanner/MainDialog.h

    r168 r386  
    533533                m_TextEdit = GetDlgItem(IDC_TEXT);
    534534                m_TextEdit.SetLimitText(0);
    535                 SetIcon(AtlLoadIconImage(IDR_MAINFRAME, GetSystemMetrics(SM_CXICON), GetSystemMetrics(SM_CYICON), LR_DEFAULTCOLOR), TRUE);
    536                 #if !defined(_DEBUG)
    537                         //SetIcon(AtlLoadIconImage(IDR_MAINFRAME, GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), LR_DEFAULTCOLOR), FALSE);
    538                 #endif // !defined(_DEBUG)
     535                SetIcon(AtlLoadIconImage(IDR_MAINFRAME, LR_DEFAULTCOLOR, GetSystemMetrics(SM_CXICON), GetSystemMetrics(SM_CYICON)), TRUE);
     536                SetIcon(AtlLoadIconImage(IDR_MAINFRAME, LR_DEFAULTCOLOR, GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON)), FALSE);
    539537                _W(CenterWindow());
    540538                #if _DEVELOPMENT && FALSE
  • trunk/Utilities/UpnpScanner/UpnpScanner.rc

    r168 r386  
    100100
    101101VS_VERSION_INFO VERSIONINFO
    102  FILEVERSION  1, 0, 0, 260
     102 FILEVERSION  1, 0, 0, 268
    103103 PRODUCTVERSION 1,0,0,1
    104104 FILEFLAGSMASK 0x3fL
     
    119119            VALUE "CompanyName", "Roman Ryltsov"
    120120            VALUE "FileDescription", "Alax.Info UPnP Scanner Module"
    121             VALUE "FileVersion",  "1, 0, 0, 260\0"
     121            VALUE "FileVersion",  "1, 0, 0, 268\0"
    122122            VALUE "InternalName", "UpnpScanner.exe"
    123123            VALUE "LegalCopyright", "Copyright © Alax.Info, Roman Ryltsov, 2006-2009"
  • trunk/Utilities/UpnpScanner/UpnpScanner.vcxproj

    r168 r386  
    1818  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
    1919    <ConfigurationType>Application</ConfigurationType>
    20     <PlatformToolset>v100</PlatformToolset>
     20    <PlatformToolset>v110_xp</PlatformToolset>
    2121    <UseOfMfc>false</UseOfMfc>
    2222    <UseOfAtl>Static</UseOfAtl>
     
    2626  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
    2727    <ConfigurationType>Application</ConfigurationType>
    28     <PlatformToolset>v100</PlatformToolset>
     28    <PlatformToolset>v110_xp</PlatformToolset>
    2929    <UseOfMfc>false</UseOfMfc>
    3030    <UseOfAtl>Static</UseOfAtl>
  • trunk/Utilities/UpnpScanner/stdafx.h

    r168 r386  
    88#pragma once
    99
    10 #define WINVER                  0x0501
    11 #define _WIN32_WINNT    0x0501
    12 #define _WIN32_IE               0x0500
     10#include <winsdkver.h>
    1311
    1412#define INLINE_HRESULT_FROM_WIN32
     
    3331#define _WTL_NEW_PAGE_NOTIFY_HANDLERS
    3432
     33#undef _SYSINFOAPI_H_
    3534#include <atlapp.h>
     35#define _SYSINFOAPI_H_
    3636
    3737extern CAppModule _Module;
Note: See TracChangeset for help on using the changeset viewer.