Display correct title for edit dialog (new vs. edit)

changelog

@@ -1,3 +1,12 @@
+----------------------------                                                                                                                                                                                                                           
+    0.4.4 (2015-12-08)
+----------------------------
+
+- Add hardening measures to prevent loading DLLs from the current working directory on Windows. (CVE-2015-8359)
+- Fix CVE-2015-8378: Canceling XML export operation creates export as ".xml"
+- Auto-type and global auto-type functionality for OS X
+- Enable retina display on OS X
+
 ----------------------------
     0.4.3 (2010-03-07)
 ----------------------------

share/macx_bundle/Info.plist

@@ -7,7 +7,11 @@
     http://developer.apple.com/documentation/MacOSX/Conceptual/BPRuntimeConfig/Articles/PListKeys.html
     -->
 
+    <key>NSPrincipalClass</key>
+    <string>NSApplication</string>
 
+    <key>NSHighResolutionCapable</key>
+    <string>True</string>
 
     <key>CFBundleIconFile</key>
     <string>icon.icns</string>
@@ -16,7 +20,7 @@
     <string>APPL</string>
 
     <key>CFBundleGetInfoString</key>
-    <string>KeePassX 0.4.3</string>
+    <string>KeePassX 0.4.4</string>
 
     <key>CFBundleSignature</key>
     <string>kpsx</string>
@@ -25,10 +29,10 @@
     <string>KeePassX</string>
 
     <key>CFBundleVersion</key>
-    <string>0.4.3</string>
+    <string>0.4.4</string>
 
     <key>CFBundleShortVersionString</key>
-    <string>0.4.3</string>
+    <string>0.4.4</string>
 
     <key>CFBundleName</key>
     <string>KeePassX</string>
@@ -37,7 +41,7 @@
     <string>6.0</string>
 
     <key>CFBundleIdentifier</key>
-    <string>org.keepassx.keepassx</string>
+    <string>com.apple.application-bundle</string>
 
     <key>CFBundleDocumentTypes</key>
     <array>

src/dialogs/AboutDlg.cpp

@@ -55,11 +55,12 @@ AboutDialog::AboutDialog(QWidget* parent):QDialog(parent)
 	str+="</div><br><div style='margin-left:0px;'>";
 	str+="<b>"+tr("Thanks To")+"</b><br>";
 	str+="</div><div style='margin-left:10px;'>";
-	str+="<u>Matthias Miller</u><br>"+tr("Patches for better MacOS X support")+"<br>www.outofhanwell.com<br></div>";
+	str+="<u>Matthias Miller</u><br>"+tr("Patches for better MacOS X support")+"<br>www.outofhanwell.com<br>";
 	str+="<br>";
-	str+="<u>James Nicholls</u><br>"+tr("Main Application Icon")/*+"<br>"+tr("mailto:???")*/+"<br></div>";
+	str+="<u>James Nicholls</u><br>"+tr("Main Application Icon")/*+"<br>"+tr("mailto:???")*/+"<br>";
 	str+="<br>";
-	str+="<u>Constantin Makshin</u><br>"+tr("Various fixes and improvements")+"<br>dinosaur-rus@users.sourceforge.net<br></div>";
+	str+="<u>Constantin Makshin</u><br>"+tr("Various fixes and improvements")+"<br>dinosaur-rus@users.sourceforge.net<br>";
+	str+="</div>";
 	Edit_Thanks->setHtml(str);
 	
 	QFile gpl(DataDir+"/license.html");
@@ -80,3 +81,8 @@ void AboutDialog::paintEvent(QPaintEvent *event){
 	painter.setClipRegion(event->region());
 	painter.drawPixmap(QPoint(0,0),BannerPixmap);
 }
+
+void AboutDialog::resizeEvent(QResizeEvent* event){
+	createBanner(&BannerPixmap, getPixmap("keepassx"), QString("%1 %2").arg(APP_DISPLAY_NAME, APP_VERSION), width());
+	QDialog::resizeEvent(event);
+}

src/dialogs/AboutDlg.h

@@ -32,6 +32,7 @@ class AboutDialog : public QDialog, private Ui_AboutDlg
 	private:
 		QPixmap BannerPixmap;
 		virtual void paintEvent(QPaintEvent*);
+		virtual void resizeEvent(QResizeEvent*);
 };
 
 #endif

src/keepassx.h

@@ -26,7 +26,7 @@
 #define APP_CODE_NAME       "keepassx"
 #define APP_SHORT_FUNC      "Password Manager"
 #define APP_LONG_FUNC       "Cross Platform Password Manager"
-#define APP_VERSION         "0.4.3"
+#define APP_VERSION         "0.4.4"
 
 #define BUILTIN_ICONS 69
 

src/lib/EntryView.cpp

@@ -338,7 +338,7 @@ void KeepassEntryView::editEntry(EntryViewItem* item){
 	IEntryHandle* handle = item->EntryHandle;
 	CEntry old = handle->data();
 	
-	CEditEntryDlg dlg(db,handle,this,true);
+	CEditEntryDlg dlg(db,handle,this,false);
 	int result = dlg.exec();
 	switch(result){
 		case 0: //canceled or no changes

src/lib/FileDialogs.cpp

@@ -120,6 +120,10 @@ QString QtStandardFileDialogs::saveFileDialog(QWidget* parent,QString title,QStr
 	                                                ShowOverwriteWarning ? (QFileDialog::Option)0 : QFileDialog::DontConfirmOverwrite);
 	LastFilter=Filters.indexOf(SelectedFilter);
 		
+	//Dont't add an extension to the result if no file has been selected
+	if (filepath.isEmpty())
+		return filepath;
+	
 	//Check whether the file has an extension which fits to the selected filter
 	QFileInfo file(filepath);
 	QString filename=file.fileName();

src/lib/HelperMacX.cpp

@@ -108,9 +108,8 @@ OSType HelperMacX::getProcessSignature(pid_t pid){
 	OSErr err;
 	ProcessSerialNumber processSerialNumber;
 	ProcessInfoRec processInfoRec;
+	memset(&processInfoRec, 0, sizeof(processInfoRec));
 	processInfoRec.processInfoLength = sizeof(processInfoRec);
-	processInfoRec.processAppSpec = NULL;
-	processInfoRec.processName = NULL;
 	err = GetProcessForPID(pid, &processSerialNumber);
 	if (noErr != err) {
 		qWarning("HelperMacX::getProcessSignature: GetProcessForPID error for pid %d: %d", pid, err);

src/lib/random.h

@@ -20,6 +20,10 @@
 #ifndef RANDOM_H_
 #define RANDOM_H_
 
+#ifndef _WIN32
+#include <unistd.h> // for getpid()
+#endif
+
 #ifndef quint8
 typedef unsigned char quint8;
 #endif

src/main.cpp

@@ -24,6 +24,9 @@
 #if defined(Q_WS_X11) && defined(GLOBAL_AUTOTYPE)
 	#include "Application_X11.h"
 #endif
+#ifdef Q_WS_WIN
+	#include <Windows.h>
+#endif
 
 #include "plugins/interfaces/IFileDialog.h"
 #include "plugins/interfaces/IKdeInit.h"
@@ -49,6 +52,12 @@ IIconTheme* IconLoader=NULL;
 
 int main(int argc, char **argv)
 {
+#ifdef Q_WS_WIN
+	// Make sure Windows doesn't load DLLs from the current working directory
+	SetDllDirectoryA("");
+	SetSearchPathMode(BASE_SEARCH_PATH_ENABLE_SAFE_SEARCHMODE);
+#endif
+
 	setlocale(LC_CTYPE, "");
 	
 #if defined(Q_WS_X11) && defined(AUTOTYPE)