summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--worldtime_protocol/icon_proto.icobin1078 -> 2550 bytes
-rw-r--r--worldtime_protocol/options.cpp21
-rw-r--r--worldtime_protocol/worldtimeproto_9.vcproj6
3 files changed, 15 insertions, 12 deletions
diff --git a/worldtime_protocol/icon_proto.ico b/worldtime_protocol/icon_proto.ico
index 49090ae..6ae180c 100644
--- a/worldtime_protocol/icon_proto.ico
+++ b/worldtime_protocol/icon_proto.ico
Binary files differ
diff --git a/worldtime_protocol/options.cpp b/worldtime_protocol/options.cpp
index 32d8ecb..68043d5 100644
--- a/worldtime_protocol/options.cpp
+++ b/worldtime_protocol/options.cpp
@@ -136,17 +136,20 @@ static INT_PTR CALLBACK DlgProcOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA
bool hide_proto = (DBGetContactSettingByte(NULL, "WorldTime", "HideProtocol", 0) == 1);
CheckDlgButton(hwndDlg, IDC_CHK_HIDE, hide_proto ? 1 : 0);
DBVARIANT dbv;
- if(!DBGetContactSettingTString(NULL, "WorldTime", "TimeFormat", &dbv))
+ if(!DBGetContactSettingTString(NULL, "WorldTime", "TimeFormat", &dbv)) {
_tcscpy(format_string, dbv.ptszVal);
- DBFreeVariant(&dbv);
+ DBFreeVariant(&dbv);
+ }
SetDlgItemText(hwndDlg, IDC_ED_FORMAT, format_string);
- if(!DBGetContactSettingTString(NULL, "WorldTime", "DateFormat", &dbv))
+ if(!DBGetContactSettingTString(NULL, "WorldTime", "DateFormat", &dbv)) {
_tcscpy(date_format_string, dbv.ptszVal);
- DBFreeVariant(&dbv);
+ DBFreeVariant(&dbv);
+ }
SetDlgItemText(hwndDlg, IDC_ED_DATE_FORMAT, date_format_string);
- if(!DBGetContactSettingTString(NULL, "WorldTime", "CListFormat", &dbv))
+ if(!DBGetContactSettingTString(NULL, "WorldTime", "CListFormat", &dbv)) {
_tcscpy(clist_format_string, dbv.ptszVal);
- DBFreeVariant(&dbv);
+ DBFreeVariant(&dbv);
+ }
SetDlgItemText(hwndDlg, IDC_ED_CLIST_FORMAT, clist_format_string);
if(!set_format) {
@@ -304,18 +307,18 @@ void LoadOptions() {
DBVARIANT dbv;
if(!DBGetContactSettingTString(NULL, "WorldTime", "TimeFormat", &dbv)) {
_tcsncpy(format_string, dbv.ptszVal, 512);
+ DBFreeVariant(&dbv);
} else
_tcscpy(format_string, _T("HH:mm"));
- DBFreeVariant(&dbv);
if(!DBGetContactSettingTString(NULL, "WorldTime", "DateFormat", &dbv)) {
_tcsncpy(date_format_string, dbv.ptszVal, 512);
+ DBFreeVariant(&dbv);
} else
_tcscpy(date_format_string, _T("d/M"));
- DBFreeVariant(&dbv);
if(!DBGetContactSettingTString(NULL, "WorldTime", "CListFormat", &dbv)) {
_tcsncpy(clist_format_string, dbv.ptszVal, 512);
+ DBFreeVariant(&dbv);
} else
_tcscpy(clist_format_string, _T("%n: %t %d"));
- DBFreeVariant(&dbv);
}
diff --git a/worldtime_protocol/worldtimeproto_9.vcproj b/worldtime_protocol/worldtimeproto_9.vcproj
index b4bc0fd..33ca825 100644
--- a/worldtime_protocol/worldtimeproto_9.vcproj
+++ b/worldtime_protocol/worldtimeproto_9.vcproj
@@ -199,8 +199,8 @@
</Configuration>
<Configuration
Name="Release|Win32"
- OutputDirectory=".\Release"
- IntermediateDirectory=".\Release"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="2"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
UseOfMFC="2"
@@ -263,7 +263,7 @@
<Tool
Name="VCLinkerTool"
IgnoreImportLibrary="true"
- OutputFile="../../bin/release/plugins/worldtimeproto.dll"
+ AdditionalDependencies="user32.lib gdi32.lib advapi32.lib"
LinkIncremental="1"
SuppressStartupBanner="true"
OptimizeReferences="2"