diff options
author | (no author) <(no author)@4f64403b-2f21-0410-a795-97e2b3489a10> | 2009-03-31 05:16:22 +0000 |
---|---|---|
committer | (no author) <(no author)@4f64403b-2f21-0410-a795-97e2b3489a10> | 2009-03-31 05:16:22 +0000 |
commit | f8840b16acaa5cb11a4440ea62a96731a24f4d6e (patch) | |
tree | f0e38ae1106bf095e1129231693ef4b79c94de3a | |
parent | 8f7401d0d32b864e7c1efbe696fb60d010f001bb (diff) |
x64 port
git-svn-id: https://server.scottellis.com.au/svn/mim_plugs@448 4f64403b-2f21-0410-a795-97e2b3489a10
-rw-r--r-- | yapp/popup_history_dlg.cpp | 2 | ||||
-rw-r--r-- | yapp/popups2.cpp | 4 | ||||
-rw-r--r-- | yapp/popups2_9.vcproj | 208 | ||||
-rw-r--r-- | yapp/popwin.cpp | 16 | ||||
-rw-r--r-- | yapp/services.cpp | 2 | ||||
-rw-r--r-- | yapp/str_utils.cpp | 4 |
6 files changed, 118 insertions, 118 deletions
diff --git a/yapp/popup_history_dlg.cpp b/yapp/popup_history_dlg.cpp index 2ab979b..b5673c7 100644 --- a/yapp/popup_history_dlg.cpp +++ b/yapp/popup_history_dlg.cpp @@ -496,7 +496,7 @@ void CopyPopupDataToClipboard(HWND hList, int selection) if (found)
{
EmptyClipboard();
- int len = _tcslen(buffer);
+ int len = (int)_tcslen(buffer);
HANDLE hData = GlobalAlloc(GMEM_MOVEABLE, (len + 2) * sizeof(TCHAR));
clipboard = (TCHAR *) GlobalLock(hData);
diff --git a/yapp/popups2.cpp b/yapp/popups2.cpp index 8f12292..80c057a 100644 --- a/yapp/popups2.cpp +++ b/yapp/popups2.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/yapp/?op=log&rev=0&sc=0&isdir=1";
update.szUpdateURL = UPDATER_AUTOREGISTER;
@@ -150,7 +150,7 @@ int ModulesLoaded(WPARAM wParam, LPARAM lParam) { update.szBetaVersionURL = "http://www.scottellis.com.au/miranda_plugins/ver_yapp.html";
update.pbBetaVersionPrefix = (BYTE *)"YAPP version ";
- update.cpbBetaVersionPrefix = strlen((char *)update.pbBetaVersionPrefix);
+ update.cpbBetaVersionPrefix = (int)strlen((char *)update.pbBetaVersionPrefix);
CallService(MS_UPDATE_REGISTER, 0, (WPARAM)&update);
}
diff --git a/yapp/popups2_9.vcproj b/yapp/popups2_9.vcproj index e8ab620..ed177cf 100644 --- a/yapp/popups2_9.vcproj +++ b/yapp/popups2_9.vcproj @@ -96,9 +96,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"
>
@@ -116,22 +116,17 @@ />
<Tool
Name="VCMIDLTool"
+ TargetEnvironment="3"
/>
<Tool
Name="VCCLCompilerTool"
- Optimization="3"
- InlineFunctionExpansion="1"
- EnableIntrinsicFunctions="true"
- FavorSizeOrSpeed="2"
- WholeProgramOptimization="true"
+ Optimization="0"
AdditionalIncludeDirectories="./docs;../../include"
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;POPUPS2_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;POPUPS2_EXPORTS;_UNICODE;UNICODE"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
PrecompiledHeaderThrough="common.h"
WarningLevel="3"
DebugInformationFormat="3"
@@ -149,16 +144,12 @@ <Tool
Name="VCLinkerTool"
AdditionalDependencies="comctl32.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"
@@ -183,7 +174,7 @@ />
</Configuration>
<Configuration
- Name="Debug Unicode|Win32"
+ Name="Release|Win32"
OutputDirectory="$(SolutionDir)$(ConfigurationName)/Plugins"
IntermediateDirectory="$(SolutionDir)$(ConfigurationName)/Obj/$(ProjectName)"
ConfigurationType="2"
@@ -206,16 +197,22 @@ />
<Tool
Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="./docs;../../../include"
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;POPUPS2_EXPORTS;_UNICODE;UNICODE"
- MinimalRebuild="true"
- BasicRuntimeChecks="3"
- RuntimeLibrary="3"
- BufferSecurityCheck="true"
+ Optimization="3"
+ InlineFunctionExpansion="1"
+ EnableIntrinsicFunctions="true"
+ FavorSizeOrSpeed="2"
+ WholeProgramOptimization="true"
+ AdditionalIncludeDirectories="./docs;../../include"
+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;POPUPS2_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
@@ -229,11 +226,14 @@ />
<Tool
Name="VCLinkerTool"
- IgnoreImportLibrary="true"
- AdditionalDependencies="unicows.lib comctl32.lib"
- LinkIncremental="2"
+ AdditionalDependencies="comctl32.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"
SubSystem="2"
+ OptimizeReferences="2"
+ EnableCOMDATFolding="2"
+ LinkTimeCodeGeneration="1"
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
TargetMachine="1"
@@ -261,9 +261,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"
>
@@ -281,11 +281,13 @@ />
<Tool
Name="VCMIDLTool"
+ TargetEnvironment="3"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="3"
InlineFunctionExpansion="1"
+ EnableIntrinsicFunctions="true"
FavorSizeOrSpeed="2"
WholeProgramOptimization="true"
AdditionalIncludeDirectories="./docs;../../include"
@@ -312,18 +314,17 @@ />
<Tool
Name="VCLinkerTool"
- IgnoreImportLibrary="true"
AdditionalDependencies="comctl32.lib"
- 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="1"
+ IgnoreDefaultLibraryNames=""
GenerateDebugInformation="true"
- GenerateMapFile="true"
SubSystem="2"
OptimizeReferences="2"
EnableCOMDATFolding="2"
LinkTimeCodeGeneration="1"
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
- TargetMachine="1"
+ TargetMachine="17"
/>
<Tool
Name="VCALinkTool"
@@ -348,9 +349,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"
>
@@ -368,12 +369,11 @@ />
<Tool
Name="VCMIDLTool"
- TargetEnvironment="3"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="./docs;../../include"
+ AdditionalIncludeDirectories="./docs;../../../include"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;POPUPS2_EXPORTS;_UNICODE;UNICODE"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -381,7 +381,7 @@ BufferSecurityCheck="true"
PrecompiledHeaderThrough="common.h"
WarningLevel="3"
- DebugInformationFormat="3"
+ DebugInformationFormat="4"
DisableSpecificWarnings="4996"
/>
<Tool
@@ -395,13 +395,14 @@ />
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="comctl32.lib"
+ IgnoreImportLibrary="true"
+ AdditionalDependencies="unicows.lib comctl32.lib"
LinkIncremental="2"
GenerateDebugInformation="true"
SubSystem="2"
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
- TargetMachine="17"
+ TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
@@ -426,7 +427,7 @@ />
</Configuration>
<Configuration
- Name="Release|x64"
+ Name="Debug Unicode|x64"
OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="2"
@@ -450,19 +451,13 @@ />
<Tool
Name="VCCLCompilerTool"
- Optimization="3"
- InlineFunctionExpansion="1"
- EnableIntrinsicFunctions="true"
- FavorSizeOrSpeed="2"
- WholeProgramOptimization="true"
- AdditionalIncludeDirectories="./docs;../../include"
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;POPUPS2_EXPORTS;_UNICODE;UNICODE;MICROSOFT_LAYER_FOR_UNICODE=1"
- StringPooling="true"
- ExceptionHandling="0"
- RuntimeLibrary="2"
- BufferSecurityCheck="false"
- FloatingPointModel="2"
- RuntimeTypeInfo="false"
+ Optimization="0"
+ AdditionalIncludeDirectories="./docs;../../../include"
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;POPUPS2_EXPORTS;_UNICODE;UNICODE"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
PrecompiledHeaderThrough="common.h"
WarningLevel="3"
DebugInformationFormat="3"
@@ -479,14 +474,11 @@ />
<Tool
Name="VCLinkerTool"
+ IgnoreImportLibrary="true"
AdditionalDependencies="comctl32.lib"
- LinkIncremental="1"
- IgnoreDefaultLibraryNames=""
+ LinkIncremental="2"
GenerateDebugInformation="true"
SubSystem="2"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- LinkTimeCodeGeneration="1"
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
TargetMachine="17"
@@ -514,9 +506,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"
>
@@ -534,17 +526,21 @@ />
<Tool
Name="VCMIDLTool"
- TargetEnvironment="3"
/>
<Tool
Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="./docs;../../../include"
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;POPUPS2_EXPORTS;_UNICODE;UNICODE"
- MinimalRebuild="true"
- BasicRuntimeChecks="3"
- RuntimeLibrary="3"
- BufferSecurityCheck="true"
+ Optimization="3"
+ InlineFunctionExpansion="1"
+ FavorSizeOrSpeed="2"
+ WholeProgramOptimization="true"
+ AdditionalIncludeDirectories="./docs;../../include"
+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;POPUPS2_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="3"
@@ -563,12 +559,16 @@ Name="VCLinkerTool"
IgnoreImportLibrary="true"
AdditionalDependencies="comctl32.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"
@@ -701,7 +701,7 @@ />
</FileConfiguration>
<FileConfiguration
- Name="Release|Win32"
+ Name="Debug|x64"
>
<Tool
Name="VCCLCompilerTool"
@@ -709,7 +709,7 @@ />
</FileConfiguration>
<FileConfiguration
- Name="Debug Unicode|Win32"
+ Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
@@ -717,7 +717,7 @@ />
</FileConfiguration>
<FileConfiguration
- Name="Release Unicode|Win32"
+ Name="Release|x64"
>
<Tool
Name="VCCLCompilerTool"
@@ -725,7 +725,7 @@ />
</FileConfiguration>
<FileConfiguration
- Name="Debug|x64"
+ Name="Debug Unicode|Win32"
>
<Tool
Name="VCCLCompilerTool"
@@ -733,7 +733,7 @@ />
</FileConfiguration>
<FileConfiguration
- Name="Release|x64"
+ Name="Debug Unicode|x64"
>
<Tool
Name="VCCLCompilerTool"
@@ -741,7 +741,7 @@ />
</FileConfiguration>
<FileConfiguration
- Name="Debug Unicode|x64"
+ Name="Release Unicode|Win32"
>
<Tool
Name="VCCLCompilerTool"
@@ -785,7 +785,7 @@ />
</FileConfiguration>
<FileConfiguration
- Name="Release|Win32"
+ Name="Debug|x64"
>
<Tool
Name="VCCLCompilerTool"
@@ -793,7 +793,7 @@ />
</FileConfiguration>
<FileConfiguration
- Name="Debug Unicode|Win32"
+ Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
@@ -801,7 +801,7 @@ />
</FileConfiguration>
<FileConfiguration
- Name="Release Unicode|Win32"
+ Name="Release|x64"
>
<Tool
Name="VCCLCompilerTool"
@@ -809,7 +809,7 @@ />
</FileConfiguration>
<FileConfiguration
- Name="Debug|x64"
+ Name="Debug Unicode|Win32"
>
<Tool
Name="VCCLCompilerTool"
@@ -817,7 +817,7 @@ />
</FileConfiguration>
<FileConfiguration
- Name="Release|x64"
+ Name="Debug Unicode|x64"
>
<Tool
Name="VCCLCompilerTool"
@@ -825,7 +825,7 @@ />
</FileConfiguration>
<FileConfiguration
- Name="Debug Unicode|x64"
+ Name="Release Unicode|Win32"
>
<Tool
Name="VCCLCompilerTool"
@@ -921,7 +921,7 @@ />
</FileConfiguration>
<FileConfiguration
- Name="Release|Win32"
+ Name="Debug|x64"
ExcludedFromBuild="true"
>
<Tool
@@ -929,7 +929,7 @@ />
</FileConfiguration>
<FileConfiguration
- Name="Debug Unicode|Win32"
+ Name="Release|Win32"
ExcludedFromBuild="true"
>
<Tool
@@ -937,7 +937,7 @@ />
</FileConfiguration>
<FileConfiguration
- Name="Release Unicode|Win32"
+ Name="Release|x64"
ExcludedFromBuild="true"
>
<Tool
@@ -945,7 +945,7 @@ />
</FileConfiguration>
<FileConfiguration
- Name="Debug|x64"
+ Name="Debug Unicode|Win32"
ExcludedFromBuild="true"
>
<Tool
@@ -953,7 +953,7 @@ />
</FileConfiguration>
<FileConfiguration
- Name="Release|x64"
+ Name="Debug Unicode|x64"
ExcludedFromBuild="true"
>
<Tool
@@ -961,7 +961,7 @@ />
</FileConfiguration>
<FileConfiguration
- Name="Debug Unicode|x64"
+ Name="Release Unicode|Win32"
ExcludedFromBuild="true"
>
<Tool
@@ -993,7 +993,7 @@ />
</FileConfiguration>
<FileConfiguration
- Name="Release|Win32"
+ Name="Debug|x64"
ExcludedFromBuild="true"
>
<Tool
@@ -1001,7 +1001,7 @@ />
</FileConfiguration>
<FileConfiguration
- Name="Debug Unicode|Win32"
+ Name="Release|Win32"
ExcludedFromBuild="true"
>
<Tool
@@ -1009,7 +1009,7 @@ />
</FileConfiguration>
<FileConfiguration
- Name="Release Unicode|Win32"
+ Name="Release|x64"
ExcludedFromBuild="true"
>
<Tool
@@ -1017,7 +1017,7 @@ />
</FileConfiguration>
<FileConfiguration
- Name="Debug|x64"
+ Name="Debug Unicode|Win32"
ExcludedFromBuild="true"
>
<Tool
@@ -1025,7 +1025,7 @@ />
</FileConfiguration>
<FileConfiguration
- Name="Release|x64"
+ Name="Debug Unicode|x64"
ExcludedFromBuild="true"
>
<Tool
@@ -1033,7 +1033,7 @@ />
</FileConfiguration>
<FileConfiguration
- Name="Debug Unicode|x64"
+ Name="Release Unicode|Win32"
ExcludedFromBuild="true"
>
<Tool
diff --git a/yapp/popwin.cpp b/yapp/popwin.cpp index 1b0aa3e..8ef25fd 100644 --- a/yapp/popwin.cpp +++ b/yapp/popwin.cpp @@ -409,7 +409,7 @@ LRESULT CALLBACK PopupWindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lPa if(pwd->custom_col) SetTextColor(ps.hdc, pd->colorText);
else SetTextColor(ps.hdc, colTime);
if(hFontTime) SelectObject(hdc, (HGDIOBJ)hFontTime);
- DrawText(ps.hdc, pwd->tbuff, _tcslen(pwd->tbuff), &avr, DT_VCENTER | DT_CENTER | DT_LEFT | DT_SINGLELINE | DT_NOPREFIX);
+ DrawText(ps.hdc, pwd->tbuff, (int)_tcslen(pwd->tbuff), &avr, DT_VCENTER | DT_CENTER | DT_LEFT | DT_SINGLELINE | DT_NOPREFIX);
avr.top = avr.bottom + options.av_padding;
}
@@ -457,12 +457,12 @@ LRESULT CALLBACK PopupWindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lPa case PT_LEFT:
ttr.left = textxmin; ttr.right = ttr.left + pwd->time_width;
textxmin += pwd->time_width + options.padding;
- DrawText(ps.hdc, pwd->tbuff, _tcslen(pwd->tbuff), &ttr, DT_VCENTER | DT_LEFT | DT_SINGLELINE | DT_NOPREFIX);
+ DrawText(ps.hdc, pwd->tbuff, (int)_tcslen(pwd->tbuff), &ttr, DT_VCENTER | DT_LEFT | DT_SINGLELINE | DT_NOPREFIX);
break;
case PT_RIGHT:
ttr.right = textxmax; ttr.left = ttr.right - pwd->time_width;
textxmax -= pwd->time_width + options.padding;
- DrawText(ps.hdc, pwd->tbuff, _tcslen(pwd->tbuff), &ttr, DT_VCENTER | DT_LEFT | DT_SINGLELINE | DT_NOPREFIX);
+ DrawText(ps.hdc, pwd->tbuff, (int)_tcslen(pwd->tbuff), &ttr, DT_VCENTER | DT_LEFT | DT_SINGLELINE | DT_NOPREFIX);
break;
default:
break;
@@ -478,7 +478,7 @@ LRESULT CALLBACK PopupWindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lPa if(pwd->custom_col) SetTextColor(ps.hdc, pd->colorText);
else SetTextColor(ps.hdc, colFirstLine);
- DrawTextW(ps.hdc, pd->pwzTitle, wcslen(pd->pwzTitle), &tr, DT_VCENTER | DT_LEFT | DT_END_ELLIPSIS | DT_SINGLELINE | DT_NOPREFIX);
+ DrawTextW(ps.hdc, pd->pwzTitle, (int)wcslen(pd->pwzTitle), &tr, DT_VCENTER | DT_LEFT | DT_END_ELLIPSIS | DT_SINGLELINE | DT_NOPREFIX);
// title underline
RECT tur;
@@ -489,7 +489,7 @@ LRESULT CALLBACK PopupWindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lPa FillRect(ps.hdc, &tur, pwd->underlineBrush);
// second line(s)
- int len_second = wcslen(pd->pwzText);
+ int len_second = (int)wcslen(pd->pwzText);
if(len_second) {
if(hFontSecondLine) SelectObject(ps.hdc, (HGDIOBJ)hFontSecondLine);
if(!pwd->custom_col)
@@ -593,14 +593,14 @@ LRESULT CALLBACK PopupWindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lPa if(options.time_layout != PT_NONE) {
SIZE size_t;
if(hFontTime) SelectObject(hdc, (HGDIOBJ)hFontTime);
- GetTextExtentPoint32(hdc, pwd->tbuff, _tcslen(pwd->tbuff), &size_t);
+ GetTextExtentPoint32(hdc, pwd->tbuff, (int)_tcslen(pwd->tbuff), &size_t);
pwd->time_height = size_t.cy;
pwd->time_width = size_t.cx;
}
// titlebar height
if(hFontFirstLine) SelectObject(hdc, (HGDIOBJ)hFontFirstLine);
- GetTextExtentPoint32W(hdc, pd->pwzTitle, wcslen(pd->pwzTitle), &size);
+ GetTextExtentPoint32W(hdc, pd->pwzTitle, (int)wcslen(pd->pwzTitle), &size);
pwd->tb_height = size.cy;
if(options.time_layout == PT_LEFT || options.time_layout == PT_RIGHT) {
if(pwd->tb_height < pwd->time_height) pwd->tb_height = pwd->time_height;
@@ -624,7 +624,7 @@ LRESULT CALLBACK PopupWindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lPa }
// text height
- int len_second = wcslen(pd->pwzText);
+ int len_second = (int)wcslen(pd->pwzText);
if(len_second) {
RECT r;
r.left = r.top = 0;
diff --git a/yapp/services.cpp b/yapp/services.cpp index 1864728..0278e2f 100644 --- a/yapp/services.cpp +++ b/yapp/services.cpp @@ -16,7 +16,7 @@ void StripBBCodesInPlace(wchar_t *text) { return;
int read = 0, write = 0;
- int len = wcslen(text);
+ int len = (int)wcslen(text);
while(read <= len) { // copy terminating null too
while(read <= len && text[read] != L'[') {
diff --git a/yapp/str_utils.cpp b/yapp/str_utils.cpp index d9e3575..c2636ac 100644 --- a/yapp/str_utils.cpp +++ b/yapp/str_utils.cpp @@ -203,7 +203,7 @@ char *t2u(const TCHAR *ts) { }
void trimW(wchar_t *str) {
- int len = wcslen(str), pos;
+ int len = (int)wcslen(str), pos;
// trim whitespace (e.g. from OTR detection)
for(pos = len - 1; pos >= 0; pos--) {
if(str[pos] == L' ' || str[pos] == L'\t' || str[pos] == L'\r' || str[pos] == L'\n') str[pos] = 0;
@@ -216,7 +216,7 @@ void trimW(wchar_t *str) { }
void trimA(char *str) {
- int len = strlen(str), pos;
+ int len = (int)strlen(str), pos;
// trim whitespace (e.g. from OTR detection)
for(pos = len - 1; pos >= 0; pos--) {
if(str[pos] == ' ' || str[pos] == '\t' || str[pos] == '\r' || str[pos] == '\n') str[pos] = 0;
|