diff options
-rw-r--r-- | tipper/common.h | 11 | ||||
-rw-r--r-- | tipper/options.cpp | 4 | ||||
-rw-r--r-- | tipper/popwin.cpp | 16 | ||||
-rw-r--r-- | tipper/subst.cpp | 12 | ||||
-rw-r--r-- | tipper/tipper.cpp | 4 | ||||
-rw-r--r-- | tipper/tipper_9.vcproj | 188 |
6 files changed, 115 insertions, 120 deletions
diff --git a/tipper/common.h b/tipper/common.h index d6986e5..91beb49 100644 --- a/tipper/common.h +++ b/tipper/common.h @@ -23,21 +23,16 @@ #define _WIN32_IE 0x0600 // Change this to the appropriate value to target other versions of IE.
#endif
-#if defined( UNICODE ) && !defined( _UNICODE )
-#define _UNICODE
-#endif
+#define MIRANDA_VER 0x0600 // for tabbed options
-#include <tchar.h>
+#include <m_stdhdr.h>
#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers
// Windows Header Files:
#include <windows.h>
#include <process.h>
#include <commctrl.h>
-#include <malloc.h>
-#include <stdlib.h>
-
-#define MIRANDA_VER 0x0600 // for tabbed options
+#include <stddef.h>
#include <win2k.h>
#include <newpluginapi.h>
diff --git a/tipper/options.cpp b/tipper/options.cpp index 41271e5..f4ad1af 100644 --- a/tipper/options.cpp +++ b/tipper/options.cpp @@ -1162,8 +1162,8 @@ static INT_PTR CALLBACK DlgProcOptLayout(HWND hwndDlg, UINT msg, WPARAM wParam, int OptInit(WPARAM wParam, LPARAM lParam) {
OPTIONSDIALOGPAGE odp = { 0 };
-#define OPTIONPAGE_OLD_SIZE2 60
- DWORD mirVir = (DWORD)CallService(MS_SYSTEM_GETVERSION, 0, 0);
+
+ DWORD mirVir = (DWORD)CallService(MS_SYSTEM_GETVERSION, 0, 0);
odp.cbSize = (mirVir >= 0x00060000 ? sizeof(odp) : OPTIONPAGE_OLD_SIZE2);
//odp.cbSize = sizeof(odp);
diff --git a/tipper/popwin.cpp b/tipper/popwin.cpp index 5d19bde..e1a6486 100644 --- a/tipper/popwin.cpp +++ b/tipper/popwin.cpp @@ -140,7 +140,7 @@ LRESULT CALLBACK PopupWindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lPa //MessageBox(0, swzText, _T("tip"), MB_OK);
TCHAR buff[2048], *swzText = pwd->clcit.text;
- int buff_pos, i = 0, size = _tcslen(pwd->clcit.text);
+ int buff_pos, i = 0, size = (int)_tcslen(pwd->clcit.text);
bool top_message = false;
while(i < size && swzText[i] != _T('<')) {
@@ -477,7 +477,7 @@ LRESULT CALLBACK PopupWindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lPa SetTextColor(ps.hdc, options.title_col);
tr.top = r.top + options.padding; tr.bottom = tr.top + pwd->tb_height - options.padding;
- DrawText(ps.hdc, pwd->swzTitle, _tcslen(pwd->swzTitle), &tr, DT_VCENTER | DT_LEFT | DT_END_ELLIPSIS | DT_SINGLELINE | DT_NOPREFIX);
+ DrawText(ps.hdc, pwd->swzTitle, (int)_tcslen(pwd->swzTitle), &tr, DT_VCENTER | DT_LEFT | DT_END_ELLIPSIS | DT_SINGLELINE | DT_NOPREFIX);
}
// values
@@ -524,7 +524,7 @@ LRESULT CALLBACK PopupWindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lPa tr.top += options.text_padding;
tr.bottom = tr.top + row_height;
SetTextColor(ps.hdc, options.label_col);
- DrawText(ps.hdc, pwd->rows[i].swzLabel, _tcslen(pwd->rows[i].swzLabel), &tr, options.label_valign | ((options.label_halign == DT_RIGHT && !pwd->rows[i].value_newline) ? DT_RIGHT : DT_LEFT) | DT_END_ELLIPSIS | DT_SINGLELINE | DT_NOPREFIX);
+ DrawText(ps.hdc, pwd->rows[i].swzLabel, (int)_tcslen(pwd->rows[i].swzLabel), &tr, options.label_valign | ((options.label_halign == DT_RIGHT && !pwd->rows[i].value_newline) ? DT_RIGHT : DT_LEFT) | DT_END_ELLIPSIS | DT_SINGLELINE | DT_NOPREFIX);
if(pwd->rows[i].value_newline)
tr.top = tr.bottom;
} else
@@ -551,7 +551,7 @@ LRESULT CALLBACK PopupWindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lPa if(pwd->rows[i].value_height) {
if(pwd->rows[i].value_newline || !pwd->rows[i].label_height) tr.top += options.text_padding;
tr.bottom = tr.top + row_height;
- DrawText(ps.hdc, pwd->rows[i].swzValue, _tcslen(pwd->rows[i].swzValue), &tr, options.value_valign | options.value_halign | DT_WORDBREAK | DT_WORD_ELLIPSIS | DT_END_ELLIPSIS | DT_NOPREFIX);
+ DrawText(ps.hdc, pwd->rows[i].swzValue, (int)_tcslen(pwd->rows[i].swzValue), &tr, options.value_valign | options.value_halign | DT_WORDBREAK | DT_WORD_ELLIPSIS | DT_END_ELLIPSIS | DT_NOPREFIX);
}
}
@@ -714,7 +714,7 @@ LRESULT CALLBACK PopupWindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lPa // titlebar height
if(!pwd->text_tip && pwd->swzTitle && options.title_layout != PTL_NOTITLE) {
if(hFontTitle) SelectObject(hdc, (HGDIOBJ)hFontTitle);
- GetTextExtentPoint32(hdc, pwd->swzTitle, _tcslen(pwd->swzTitle), &size);
+ GetTextExtentPoint32(hdc, pwd->swzTitle, (int)_tcslen(pwd->swzTitle), &size);
width += options.padding + size.cx;
if(options.title_layout != PTL_NOICON) {
pwd->tb_height = options.padding + max(size.cy, 16);
@@ -760,7 +760,7 @@ LRESULT CALLBACK PopupWindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lPa for(i = 0; i < pwd->row_count; i++) {
if(pwd->rows[i].swzLabel && pwd->rows[i].value_newline == false) {
if(hFontLabels) SelectObject(hdc, (HGDIOBJ)hFontLabels);
- GetTextExtentPoint32(hdc, pwd->rows[i].swzLabel, _tcslen(pwd->rows[i].swzLabel), &size);
+ GetTextExtentPoint32(hdc, pwd->rows[i].swzLabel, (int)_tcslen(pwd->rows[i].swzLabel), &size);
if(size.cx > pwd->label_width)
pwd->label_width = size.cx;
}
@@ -769,7 +769,7 @@ LRESULT CALLBACK PopupWindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lPa for(i = 0; i < pwd->row_count; i++) {
if(hFontLabels) SelectObject(hdc, (HGDIOBJ)hFontLabels);
if(pwd->rows[i].swzLabel)
- GetTextExtentPoint32(hdc, pwd->rows[i].swzLabel, _tcslen(pwd->rows[i].swzLabel), &size);
+ GetTextExtentPoint32(hdc, pwd->rows[i].swzLabel, (int)_tcslen(pwd->rows[i].swzLabel), &size);
else
size.cy = size.cx = 0;
@@ -787,7 +787,7 @@ LRESULT CALLBACK PopupWindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lPa smr.right -= options.padding;
if(!pwd->rows[i].value_newline) smr.right -= pwd->label_width + options.padding;
if(pwd->rows[i].swzValue)
- DrawText(hdc, pwd->rows[i].swzValue, _tcslen(pwd->rows[i].swzValue), &smr, DT_CALCRECT | DT_VCENTER | DT_LEFT | DT_WORDBREAK | DT_WORD_ELLIPSIS | DT_END_ELLIPSIS | DT_NOPREFIX);
+ DrawText(hdc, pwd->rows[i].swzValue, (int)_tcslen(pwd->rows[i].swzValue), &smr, DT_CALCRECT | DT_VCENTER | DT_LEFT | DT_WORDBREAK | DT_WORD_ELLIPSIS | DT_END_ELLIPSIS | DT_NOPREFIX);
// save so we don't have to recalculate
pwd->rows[i].value_height = smr.bottom;
diff --git a/tipper/subst.cpp b/tipper/subst.cpp index 266e8dd..efd71b4 100644 --- a/tipper/subst.cpp +++ b/tipper/subst.cpp @@ -10,7 +10,7 @@ void StripBBCodesInPlace(TCHAR *text) { if(text == 0) return;
int read = 0, write = 0;
- int len = _tcslen(text);
+ int len = (int)_tcslen(text);
while(read <= len) { // copy terminating null too
while(read <= len && text[read] != _T('[')) {
@@ -150,7 +150,7 @@ TCHAR *GetLastMessageText(HANDLE hContact) { mir_free( buf );
}
else {
- unsigned int msglen = strlen((char *)dbei.pBlob) + 1;
+ unsigned int msglen = (unsigned)strlen((char *)dbei.pBlob) + 1;
// does blob contain unicode message?
if(msglen < dbei.cbBlob)
@@ -292,7 +292,7 @@ bool GetSubstText(HANDLE hContact, const DisplaySubst &ds, TCHAR *buff, int buff }
bool GetRawSubstText(HANDLE hContact, char *raw_spec, TCHAR *buff, int bufflen) {
- int len = strlen(raw_spec);
+ int len = (int)strlen(raw_spec);
for(int i = 0; i < len; i++) {
if(raw_spec[i] == '/') {
raw_spec[i] = 0;
@@ -319,7 +319,7 @@ bool ApplySubst(HANDLE hContact, const TCHAR *source, TCHAR *dest, int dest_len) // pass to variables plugin if available
TCHAR *var_src = variables_parsedup((TCHAR *)source, 0, hContact);
//TCHAR *var_src = wcsdup(source); // disable variables
- int source_len = _tcslen(var_src);
+ int source_len = (int)_tcslen(var_src);
int si = 0, di = 0, v = 0;
TCHAR vname[LABEL_LEN];
@@ -402,11 +402,11 @@ bool ApplySubst(HANDLE hContact, const TCHAR *source, TCHAR *dest, int dest_len) }
if(subst) {
- int rep_len = _tcslen(rep);
+ int rep_len = (int)_tcslen(rep);
_tcsncpy(&dest[di], rep, min(rep_len, dest_len - di));
di += rep_len - 1; // -1 because we inc at bottom of loop
} else if(alt_subst) {
- int alt_len = _tcslen(alt);
+ int alt_len = (int)_tcslen(alt);
_tcsncpy(&dest[di], alt, min(alt_len, dest_len - di));
di += alt_len - 1; // -1 because we inc at bottom of loop
} else
diff --git a/tipper/tipper.cpp b/tipper/tipper.cpp index 15acb3d..100ecf9 100644 --- a/tipper/tipper.cpp +++ b/tipper/tipper.cpp @@ -137,7 +137,7 @@ int ModulesLoaded(WPARAM wParam, LPARAM lParam) { update.szComponentName = pluginInfo.shortName;
update.pbVersion = (BYTE *)CreateVersionString(pluginInfo.version, szVersion);
- update.cpbVersion = strlen((char *)update.pbVersion);
+ update.cpbVersion = (int)strlen((char *)update.pbVersion);
update.szBetaChangelogURL = "https://server.scottellis.com.au/wsvn/mim_plugs/tipper/?op=log&rev=0&sc=0&isdir=1";
update.szUpdateURL = UPDATER_AUTOREGISTER;
@@ -155,7 +155,7 @@ int ModulesLoaded(WPARAM wParam, LPARAM lParam) { #endif
update.pbBetaVersionPrefix = (BYTE *)"Tipper version ";
- update.cpbBetaVersionPrefix = strlen((char *)update.pbBetaVersionPrefix);
+ update.cpbBetaVersionPrefix = (int)strlen((char *)update.pbBetaVersionPrefix);
CallService(MS_UPDATE_REGISTER, 0, (WPARAM)&update);
}
diff --git a/tipper/tipper_9.vcproj b/tipper/tipper_9.vcproj index 7b2ade7..d1b79ca 100644 --- a/tipper/tipper_9.vcproj +++ b/tipper/tipper_9.vcproj @@ -97,9 +97,9 @@ />
</Configuration>
<Configuration
- Name="Release|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)/Plugins"
- IntermediateDirectory="$(SolutionDir)$(ConfigurationName)/Obj/$(ProjectName)"
+ Name="Debug|x64"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="2"
CharacterSet="1"
>
@@ -117,22 +117,17 @@ />
<Tool
Name="VCMIDLTool"
+ TargetEnvironment="3"
/>
<Tool
Name="VCCLCompilerTool"
- Optimization="3"
- InlineFunctionExpansion="1"
- EnableIntrinsicFunctions="true"
- FavorSizeOrSpeed="2"
- WholeProgramOptimization="true"
+ Optimization="0"
AdditionalIncludeDirectories="../../include"
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;TIPPER_EXPORTS;_UNICODE;UNICODE;MICROSOFT_LAYER_FOR_UNICODE=1"
- StringPooling="true"
- ExceptionHandling="0"
- RuntimeLibrary="2"
- BufferSecurityCheck="false"
- FloatingPointModel="2"
- RuntimeTypeInfo="false"
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;TIPPER_EXPORTS;_UNICODE;UNICODE;MICROSOFT_LAYER_FOR_UNICODE=1"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
PrecompiledHeaderThrough="common.h"
WarningLevel="3"
DebugInformationFormat="3"
@@ -150,16 +145,12 @@ <Tool
Name="VCLinkerTool"
AdditionalDependencies="comctl32.lib ws2_32.lib"
- LinkIncremental="1"
- IgnoreDefaultLibraryNames="Kernel32.lib Advapi32.lib User32.lib Gdi32.lib Shell32.lib Comdlg32.lib Version.lib Mpr.lib Rasapi32.lib Winmm.lib Winspool.lib Vfw32.lib Secur32.lib Oleacc.lib Oledlg.lib Sensapi.lib"
+ LinkIncremental="2"
GenerateDebugInformation="true"
SubSystem="2"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- LinkTimeCodeGeneration="1"
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
- TargetMachine="1"
+ TargetMachine="17"
/>
<Tool
Name="VCALinkTool"
@@ -184,7 +175,7 @@ />
</Configuration>
<Configuration
- Name="Debug Unicode|Win32"
+ Name="Release|Win32"
OutputDirectory="$(SolutionDir)$(ConfigurationName)/Plugins"
IntermediateDirectory="$(SolutionDir)$(ConfigurationName)/Obj/$(ProjectName)"
ConfigurationType="2"
@@ -207,16 +198,22 @@ />
<Tool
Name="VCCLCompilerTool"
- Optimization="0"
+ Optimization="3"
+ InlineFunctionExpansion="1"
+ EnableIntrinsicFunctions="true"
+ FavorSizeOrSpeed="2"
+ WholeProgramOptimization="true"
AdditionalIncludeDirectories="../../include"
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;TIPPER_EXPORTS;_UNICODE;UNICODE;MICROSOFT_LAYER_FOR_UNICODE=1"
- MinimalRebuild="true"
- BasicRuntimeChecks="3"
- RuntimeLibrary="3"
- BufferSecurityCheck="true"
+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;TIPPER_EXPORTS;_UNICODE;UNICODE;MICROSOFT_LAYER_FOR_UNICODE=1"
+ StringPooling="true"
+ ExceptionHandling="0"
+ RuntimeLibrary="2"
+ BufferSecurityCheck="false"
+ FloatingPointModel="2"
+ RuntimeTypeInfo="false"
PrecompiledHeaderThrough="common.h"
WarningLevel="3"
- DebugInformationFormat="4"
+ DebugInformationFormat="3"
DisableSpecificWarnings="4996"
/>
<Tool
@@ -230,11 +227,14 @@ />
<Tool
Name="VCLinkerTool"
- IgnoreImportLibrary="true"
AdditionalDependencies="comctl32.lib ws2_32.lib"
- LinkIncremental="2"
+ LinkIncremental="1"
+ IgnoreDefaultLibraryNames="Kernel32.lib Advapi32.lib User32.lib Gdi32.lib Shell32.lib Comdlg32.lib Version.lib Mpr.lib Rasapi32.lib Winmm.lib Winspool.lib Vfw32.lib Secur32.lib Oleacc.lib Oledlg.lib Sensapi.lib"
GenerateDebugInformation="true"
SubSystem="2"
+ OptimizeReferences="2"
+ EnableCOMDATFolding="2"
+ LinkTimeCodeGeneration="1"
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
TargetMachine="1"
@@ -262,9 +262,9 @@ />
</Configuration>
<Configuration
- Name="Release Unicode|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)/Plugins"
- IntermediateDirectory="$(SolutionDir)$(ConfigurationName)/Obj/$(ProjectName)"
+ Name="Release|x64"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="2"
CharacterSet="1"
>
@@ -282,6 +282,7 @@ />
<Tool
Name="VCMIDLTool"
+ TargetEnvironment="3"
/>
<Tool
Name="VCCLCompilerTool"
@@ -296,7 +297,6 @@ ExceptionHandling="0"
RuntimeLibrary="2"
BufferSecurityCheck="false"
- EnableFunctionLevelLinking="true"
FloatingPointModel="2"
RuntimeTypeInfo="false"
PrecompiledHeaderThrough="common.h"
@@ -315,18 +315,17 @@ />
<Tool
Name="VCLinkerTool"
- IgnoreImportLibrary="true"
AdditionalDependencies="comctl32.lib ws2_32.lib"
+ LinkIncremental="1"
IgnoreDefaultLibraryNames="Kernel32.lib Advapi32.lib User32.lib Gdi32.lib Shell32.lib Comdlg32.lib Version.lib Mpr.lib Rasapi32.lib Winmm.lib Winspool.lib Vfw32.lib Secur32.lib Oleacc.lib Oledlg.lib Sensapi.lib"
GenerateDebugInformation="true"
- GenerateMapFile="true"
SubSystem="2"
OptimizeReferences="2"
EnableCOMDATFolding="2"
LinkTimeCodeGeneration="1"
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
- TargetMachine="1"
+ TargetMachine="17"
/>
<Tool
Name="VCALinkTool"
@@ -351,9 +350,9 @@ />
</Configuration>
<Configuration
- Name="Debug|x64"
- OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
- IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+ Name="Debug Unicode|Win32"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)/Plugins"
+ IntermediateDirectory="$(SolutionDir)$(ConfigurationName)/Obj/$(ProjectName)"
ConfigurationType="2"
CharacterSet="1"
>
@@ -371,7 +370,6 @@ />
<Tool
Name="VCMIDLTool"
- TargetEnvironment="3"
/>
<Tool
Name="VCCLCompilerTool"
@@ -384,7 +382,7 @@ BufferSecurityCheck="true"
PrecompiledHeaderThrough="common.h"
WarningLevel="3"
- DebugInformationFormat="3"
+ DebugInformationFormat="4"
DisableSpecificWarnings="4996"
/>
<Tool
@@ -398,13 +396,14 @@ />
<Tool
Name="VCLinkerTool"
+ IgnoreImportLibrary="true"
AdditionalDependencies="comctl32.lib ws2_32.lib"
LinkIncremental="2"
GenerateDebugInformation="true"
SubSystem="2"
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
- TargetMachine="17"
+ TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
@@ -429,7 +428,7 @@ />
</Configuration>
<Configuration
- Name="Release|x64"
+ Name="Debug Unicode|x64"
OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="2"
@@ -453,19 +452,13 @@ />
<Tool
Name="VCCLCompilerTool"
- Optimization="3"
- InlineFunctionExpansion="1"
- EnableIntrinsicFunctions="true"
- FavorSizeOrSpeed="2"
- WholeProgramOptimization="true"
- AdditionalIncludeDirectories="../../include"
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;TIPPER_EXPORTS;_UNICODE;UNICODE;MICROSOFT_LAYER_FOR_UNICODE=1"
- StringPooling="true"
- ExceptionHandling="0"
- RuntimeLibrary="2"
- BufferSecurityCheck="false"
- FloatingPointModel="2"
- RuntimeTypeInfo="false"
+ Optimization="0"
+ AdditionalIncludeDirectories="../../../include"
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;TIPPER_EXPORTS;_UNICODE;UNICODE;MICROSOFT_LAYER_FOR_UNICODE=1"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
PrecompiledHeaderThrough="common.h"
WarningLevel="3"
DebugInformationFormat="3"
@@ -482,14 +475,11 @@ />
<Tool
Name="VCLinkerTool"
+ IgnoreImportLibrary="true"
AdditionalDependencies="comctl32.lib ws2_32.lib"
- LinkIncremental="1"
- IgnoreDefaultLibraryNames="Kernel32.lib Advapi32.lib User32.lib Gdi32.lib Shell32.lib Comdlg32.lib Version.lib Mpr.lib Rasapi32.lib Winmm.lib Winspool.lib Vfw32.lib Secur32.lib Oleacc.lib Oledlg.lib Sensapi.lib"
+ LinkIncremental="2"
GenerateDebugInformation="true"
SubSystem="2"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- LinkTimeCodeGeneration="1"
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
TargetMachine="17"
@@ -517,9 +507,9 @@ />
</Configuration>
<Configuration
- Name="Debug Unicode|x64"
- OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
- IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+ Name="Release Unicode|Win32"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)/Plugins"
+ IntermediateDirectory="$(SolutionDir)$(ConfigurationName)/Obj/$(ProjectName)"
ConfigurationType="2"
CharacterSet="1"
>
@@ -537,17 +527,23 @@ />
<Tool
Name="VCMIDLTool"
- TargetEnvironment="3"
/>
<Tool
Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="../../../include"
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;TIPPER_EXPORTS;_UNICODE;UNICODE;MICROSOFT_LAYER_FOR_UNICODE=1"
- MinimalRebuild="true"
- BasicRuntimeChecks="3"
- RuntimeLibrary="3"
- BufferSecurityCheck="true"
+ Optimization="3"
+ InlineFunctionExpansion="1"
+ EnableIntrinsicFunctions="true"
+ FavorSizeOrSpeed="2"
+ WholeProgramOptimization="true"
+ AdditionalIncludeDirectories="../../include"
+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;TIPPER_EXPORTS;_UNICODE;UNICODE;MICROSOFT_LAYER_FOR_UNICODE=1"
+ StringPooling="true"
+ ExceptionHandling="0"
+ RuntimeLibrary="2"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="true"
+ FloatingPointModel="2"
+ RuntimeTypeInfo="false"
PrecompiledHeaderThrough="common.h"
WarningLevel="3"
DebugInformationFormat="3"
@@ -566,12 +562,16 @@ Name="VCLinkerTool"
IgnoreImportLibrary="true"
AdditionalDependencies="comctl32.lib ws2_32.lib"
- LinkIncremental="2"
+ IgnoreDefaultLibraryNames="Kernel32.lib Advapi32.lib User32.lib Gdi32.lib Shell32.lib Comdlg32.lib Version.lib Mpr.lib Rasapi32.lib Winmm.lib Winspool.lib Vfw32.lib Secur32.lib Oleacc.lib Oledlg.lib Sensapi.lib"
GenerateDebugInformation="true"
+ GenerateMapFile="true"
SubSystem="2"
+ OptimizeReferences="2"
+ EnableCOMDATFolding="2"
+ LinkTimeCodeGeneration="1"
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
- TargetMachine="17"
+ TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
@@ -726,7 +726,7 @@ />
</FileConfiguration>
<FileConfiguration
- Name="Release|Win32"
+ Name="Debug|x64"
>
<Tool
Name="VCCLCompilerTool"
@@ -734,7 +734,7 @@ />
</FileConfiguration>
<FileConfiguration
- Name="Debug Unicode|Win32"
+ Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
@@ -742,7 +742,7 @@ />
</FileConfiguration>
<FileConfiguration
- Name="Release Unicode|Win32"
+ Name="Release|x64"
>
<Tool
Name="VCCLCompilerTool"
@@ -750,7 +750,7 @@ />
</FileConfiguration>
<FileConfiguration
- Name="Debug|x64"
+ Name="Debug Unicode|Win32"
>
<Tool
Name="VCCLCompilerTool"
@@ -758,7 +758,7 @@ />
</FileConfiguration>
<FileConfiguration
- Name="Release|x64"
+ Name="Debug Unicode|x64"
>
<Tool
Name="VCCLCompilerTool"
@@ -766,7 +766,7 @@ />
</FileConfiguration>
<FileConfiguration
- Name="Debug Unicode|x64"
+ Name="Release Unicode|Win32"
>
<Tool
Name="VCCLCompilerTool"
@@ -850,7 +850,7 @@ />
</FileConfiguration>
<FileConfiguration
- Name="Release|Win32"
+ Name="Debug|x64"
ExcludedFromBuild="true"
>
<Tool
@@ -858,7 +858,7 @@ />
</FileConfiguration>
<FileConfiguration
- Name="Debug Unicode|Win32"
+ Name="Release|Win32"
ExcludedFromBuild="true"
>
<Tool
@@ -866,7 +866,7 @@ />
</FileConfiguration>
<FileConfiguration
- Name="Release Unicode|Win32"
+ Name="Release|x64"
ExcludedFromBuild="true"
>
<Tool
@@ -874,7 +874,7 @@ />
</FileConfiguration>
<FileConfiguration
- Name="Debug|x64"
+ Name="Debug Unicode|Win32"
ExcludedFromBuild="true"
>
<Tool
@@ -882,7 +882,7 @@ />
</FileConfiguration>
<FileConfiguration
- Name="Release|x64"
+ Name="Debug Unicode|x64"
ExcludedFromBuild="true"
>
<Tool
@@ -890,7 +890,7 @@ />
</FileConfiguration>
<FileConfiguration
- Name="Debug Unicode|x64"
+ Name="Release Unicode|Win32"
ExcludedFromBuild="true"
>
<Tool
@@ -918,7 +918,7 @@ />
</FileConfiguration>
<FileConfiguration
- Name="Release|Win32"
+ Name="Debug|x64"
ExcludedFromBuild="true"
>
<Tool
@@ -926,7 +926,7 @@ />
</FileConfiguration>
<FileConfiguration
- Name="Debug Unicode|Win32"
+ Name="Release|Win32"
ExcludedFromBuild="true"
>
<Tool
@@ -934,7 +934,7 @@ />
</FileConfiguration>
<FileConfiguration
- Name="Release Unicode|Win32"
+ Name="Release|x64"
ExcludedFromBuild="true"
>
<Tool
@@ -942,7 +942,7 @@ />
</FileConfiguration>
<FileConfiguration
- Name="Debug|x64"
+ Name="Debug Unicode|Win32"
ExcludedFromBuild="true"
>
<Tool
@@ -950,7 +950,7 @@ />
</FileConfiguration>
<FileConfiguration
- Name="Release|x64"
+ Name="Debug Unicode|x64"
ExcludedFromBuild="true"
>
<Tool
@@ -958,7 +958,7 @@ />
</FileConfiguration>
<FileConfiguration
- Name="Debug Unicode|x64"
+ Name="Release Unicode|Win32"
ExcludedFromBuild="true"
>
<Tool
|