several fixes

7 files changed, 32 insertions, 10 deletions

diff --git a/pwmanager/pwmanager/compiler.h b/pwmanager/pwmanager/compiler.h
index be08c6d..a942246 100644
--- a/pwmanager/pwmanager/compiler.h
+++ b/pwmanager/pwmanager/compiler.h
@@ -1,61 +1,69 @@
 /***************************************************************************
  *                                                                         *
  *   Derived from the linux-2.6 tree                                       *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License version 2        *
  *   as published by the Free Software Foundation.                         *
  *                                                                         *
  ***************************************************************************/
 
 #ifndef __PWMANAGER_COMPILER_H
 #define __PWMANAGER_COMPILER_H
 
+#ifdef _WIN32_
+#  define __builtin_expect(x, expected_value) (x)
+#define NOREGPARM	__attribute__((regparm(0)))
+#define REGPARM		__attribute__((regparm(3)))
+#define likely(x)	__builtin_expect(!!(x), 1)
+#define unlikely(x)	__builtin_expect(!!(x), 0)
+
+#else
 #ifdef __deprecated
 # undef __deprecated
 #endif
 #if __GNUC__ >= 3
 # if __GNUC_MINOR__ > 0
 #  define __deprecated	__attribute__((deprecated))
 # endif
 #elif __GNUC__ == 2
 # if __GNUC_MINOR__ < 96
 #  ifdef __builtin_expect
 #   undef __builtin_expect
 #  endif
 #  define __builtin_expect(x, expected_value) (x)
 # endif
 #else
 # error "Sorry, your compiler is too old/not supported."
 #endif
 
 /*
  * Allow us to mark functions as 'deprecated' and have gcc emit a nice
  * warning for each use, in hopes of speeding the functions removal.
  * Usage is:
  * 		int __deprecated foo(void)
  */
 #ifndef __deprecated
 # define __deprecated		/* unimplemented */
 #endif
 
 /* define likely() and unlikely() */
 #ifdef likely
 # undef likely
 #endif
 #ifdef unlikely
 # undef unlikely
 #endif
 #define likely(x)	__builtin_expect(!!(x), 1)
 #define unlikely(x)	__builtin_expect(!!(x), 0)
 
 #ifdef NOREGPARM
 # undef NOREGPARM
 #endif
 #define NOREGPARM	__attribute__((regparm(0)))
 #ifdef REGPARM
 # undef REGPARM
 #endif
 #define REGPARM		__attribute__((regparm(3)))
-
+#endif
 #endif // __PWMANAGER_COMPILER_H
diff --git a/pwmanager/pwmanager/pwm.h b/pwmanager/pwmanager/pwm.h
index 116bc66..6ab9d6b 100644
--- a/pwmanager/pwmanager/pwm.h
+++ b/pwmanager/pwmanager/pwm.h
@@ -112,66 +112,65 @@ public slots:
 	void open_slot(QString fn);
 	/** file/close triggered */
 	void close_slot();
 	/** file/quit triggered */
 	void quitButton_slot();
 	/** file/save triggered */
 	void save_slot();
 	/** file/saveAs triggered */
 	void saveAs_slot();
 	/** file/export/text triggered */
 	void exportToText();
 	/** file/export/gpasman triggered */
 	void exportToGpasman();
 	/** file/export/kwallet triggered */
 	void exportToKWallet();
 	/** file/import/text triggered */
 	bool importFromText();
 	/** file/import/gpasman triggered */
 	bool importFromGpasman();
 	/** file/import/kwallet triggered */
 	bool importKWallet();
 	/** file/print triggered */
 	void print_slot();
 	/** manage/add triggered */
 	//US ENH : changed code to run with older MOC
 
 	void addPwd_slot();
 	void addPwd_slot1(QString *pw, PwMDoc *_doc);
 	/** manage/edit triggered */
 	//US ENH : changed code to run with older MOC
 	void editPwd_slot();
 	void editPwd_slot1(const QString *category);
-	void editPwd_slot3(const QString *category = 0, const int *index = 0,
-			  PwMDoc *_doc = 0);
+	void editPwd_slot3(const QString *category, const int *index ,PwMDoc *_doc );
 
 	/** manage/delete triggered */
 	void deletePwd_slot();
 	/** execute the "Launcher" entry */
 	void execLauncher_slot();
 	/** open browser with URL entry */
 	void goToURL_slot();
 	/** manage/changeMasterPwd triggered */
 	void changeMasterPwd_slot();
 	/** lock current document */
 	void lockWnd_slot();
 	/** deeplock current document */
 	void deepLockWnd_slot();
 	/** window/unlock triggered */
 	void unlockWnd_slot();
 	/** find item */
 	void find_slot();
 	/** configure clicked */
 	void config_slot();
 	/** (de)activate the "change master pw" button in the menu-bar */
 	void activateMpButton(bool activate = true);
 	/** generate a new chipcard */
 	void genNewCard_slot();
 	/** completely erase the current card */
 	void eraseCard_slot();
 	/** returns the ID number of the current card */
 	void readCardId_slot();
 	/** make backup image of the current card */
 	void makeCardBackup_slot();
 	/** write backup image to current card */
 	void replayCardBackup_slot();
 
diff --git a/pwmanager/pwmanager/pwmanager.pro b/pwmanager/pwmanager/pwmanager.pro
index 7f39c76..49c1f46 100644
--- a/pwmanager/pwmanager/pwmanager.pro
+++ b/pwmanager/pwmanager/pwmanager.pro
@@ -1,65 +1,65 @@
 TEMPLATE	= app
-CONFIG		+= qt warn_on
+CONFIG		+= qt warn_off
 DESTDIR= ../../bin
 TARGET		= pwmpi
 include( ../../variables.pri )
 
 INCLUDEPATH += . ../../  ../../libkdepim ../../microkde ../../microkde/kdecore ../../microkde/kdeui ../../microkde/kutils 
 DEFINES += PWM_EMBEDDED CONFIG_PWMANAGER_GCRY DESKTOP_VERSION
 
 #enable this setting if you want debugoutput for pwmanager
 #DEFINES += CONFIG_DEBUG
 LIBS += -L../libcrypt/
 LIBS += -L../../bin/
 LIBS += -lmicrokde
 LIBS += -lmicrokdepim
 LIBS += -lzlib
 LIBS += -lkpmicrocipher
 LIBS += -lkpmicroerror
 LIBS += -lkpmicrompi
 LIBS += -lstdc++
 
 unix:{
 OBJECTS_DIR = obj/unix
 MOC_DIR = moc/unix
 
 }
 win32:{
 
 DEFINES += _WIN32_
 OBJECTS_DIR = obj/win
 MOC_DIR = moc/win
 QMAKE_LINK += /NODEFAULTLIB:LIBC
-
+QMAKE_CXXFLAGS += /TP /GX /GR /Ehsc
 }
 
 #INTERFACES = \
 #addentrywnd.ui \
 #configwnd.ui \
 #findwnd.ui \
 #getmasterpwwnd.ui \
 #pwgenwnd.ui \
 #setmasterpwwnd.ui \
 #subtbledit.ui
 
 #INTERFACES = \
 #subtbledit.ui \
 
 
 
 #HEADERS = \
 #configuration_31compat.h \
 #configuration.h \
 #configwnd.h \
 #configwndimpl.h \
 #selftest.h
 #subtbledit.h \
 #subtbleditimpl.h \
 #compressbzip2.h \
 
 HEADERS = \
 addentrywnd_emb.h \
 addentrywndimpl.h \
 base64.h \
 binentrygen.h \
 blowfish.h \
diff --git a/pwmanager/pwmanager/pwmdoc.h b/pwmanager/pwmanager/pwmdoc.h
index 635361a..55e3231 100644
--- a/pwmanager/pwmanager/pwmdoc.h
+++ b/pwmanager/pwmanager/pwmdoc.h
@@ -1,54 +1,56 @@
 /***************************************************************************
  *                                                                         *
  *   copyright (C) 2003, 2004 by Michael Buesch                            *
  *   email: mbuesch@freenet.de                                             *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License version 2        *
  *   as published by the Free Software Foundation.                         *
  *                                                                         *
  ***************************************************************************/
 
 /***************************************************************************
  * copyright (C) 2004 by Ulf Schenk
  * This file is originaly based on version 1.1 of pwmanager
  * and was modified to run on embedded devices that run microkde
  *
  * $Id$
  **************************************************************************/  
 
 #ifndef __PWMDOC_H
 #define __PWMDOC_H
-
+#ifdef _WIN32_
+#define ssize_t unsigned int
+#endif
 #define PWM_FILE_VER		(static_cast<char>(0x05))
 
 #define PWM_HASH_SHA1		(static_cast<char>(0x01))
 #define PWM_HASH_SHA256		(static_cast<char>(0x02))
 #define PWM_HASH_SHA384		(static_cast<char>(0x03))
 #define PWM_HASH_SHA512		(static_cast<char>(0x04))
 #define PWM_HASH_MD5		(static_cast<char>(0x05))
 #define PWM_HASH_RMD160		(static_cast<char>(0x06))
 #define PWM_HASH_TIGER		(static_cast<char>(0x07))
 
 #define PWM_CRYPT_BLOWFISH	(static_cast<char>(0x01))
 #define PWM_CRYPT_AES128	(static_cast<char>(0x02))
 #define PWM_CRYPT_AES192	(static_cast<char>(0x03))
 #define PWM_CRYPT_AES256	(static_cast<char>(0x04))
 #define PWM_CRYPT_3DES		(static_cast<char>(0x05))
 #define PWM_CRYPT_TWOFISH	(static_cast<char>(0x06))
 #define PWM_CRYPT_TWOFISH128	(static_cast<char>(0x07))
 
 #define PWM_COMPRESS_NONE	(static_cast<char>(0x00))
 #define PWM_COMPRESS_GZIP	(static_cast<char>(0x01))
 #define PWM_COMPRESS_BZIP2	(static_cast<char>(0x02))
 
 #define DEFAULT_MAX_ENTRIES	(~(static_cast<unsigned int>(0)))
 #define FILE_ID_HEADER  	"PWM_PASSWORD_FILE"
 
 
 #include "pwmexception.h"
 #include "pwmdocui.h"
 
 #include <qobject.h>
 #include <qtimer.h>
 #include <qdatetime.h>
diff --git a/pwmanager/pwmanager/randomizer.cpp b/pwmanager/pwmanager/randomizer.cpp
index e1085ff..da4df78 100644
--- a/pwmanager/pwmanager/randomizer.cpp
+++ b/pwmanager/pwmanager/randomizer.cpp
@@ -6,66 +6,70 @@
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License version 2        *
  *   as published by the Free Software Foundation.                         *
  *                                                                         *
  ***************************************************************************/
 
 /***************************************************************************
  * copyright (C) 2004 by Ulf Schenk
  * This file is originaly based on version 1.1 of pwmanager
  * and was modified to run on embedded devices that run microkde
  *
  * $Id$
  **************************************************************************/  
 
 #include "randomizer.h"
 #include "pwmexception.h"
 
 #include <qfile.h>
 
 #include <kapplication.h>
 
 #include <stdlib.h>
 #include <time.h>
 
 
 #ifdef PWM_EMBEDDED
 
 #ifndef Q_LONG
 #define Q_LONG long
 #endif
 
 #endif //PWM_EMBEDDED
-
-
+#ifdef _WIN32_
+int rand_r( uint * seed ) {
+  srand(*seed);
+  return rand();
+}
+#endif
 Randomizer * Randomizer::rndObj (0);
 
 Randomizer::Randomizer()
 {
 	rndDev = new QFile;
 	seed = time(0);
 
 #if 1 // set to 0 to test rand_r() fallback
 
 	// probe for /dev/urandom
 	rndDev->setName("/dev/urandom");
 	if (rndDev->exists() &&
 	    rndDev->open(IO_ReadOnly)) {
 		printDebug("Randomizer: using /dev/urandom");
 		return;
 	}
 
 	// probe for /dev/random
 	rndDev->setName("/dev/random");
 	if (rndDev->exists() &&
 	    rndDev->open(IO_ReadOnly)) {
 		printDebug("Randomizer: using /dev/random");
 		return;
 	}
 
 	// probe for EGD
 	char *fn = getenv("RANDFILE");
 	if (fn) {
 		rndDev->setName(fn);
 		if (rndDev->exists() &&
 		    rndDev->open(IO_ReadOnly)) {
 			printDebug(string("Randomizer: using $RANDFILE \"")
diff --git a/pwmanager/pwmanager/setmasterpwwndimpl.h b/pwmanager/pwmanager/setmasterpwwndimpl.h
index 3203d4d..08f3654 100644
--- a/pwmanager/pwmanager/setmasterpwwndimpl.h
+++ b/pwmanager/pwmanager/setmasterpwwndimpl.h
@@ -1,64 +1,68 @@
 /***************************************************************************
  *                                                                         *
  *   copyright (C) 2003 by Michael Buesch                                  *
  *   email: mbuesch@freenet.de                                             *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License version 2        *
  *   as published by the Free Software Foundation.                         *
  *                                                                         *
  ***************************************************************************/
 
 
 /***************************************************************************
  * copyright (C) 2004 by Ulf Schenk
  * This file is originaly based on version 1.0.1 of pwmanager
  * and was modified to run on embedded devices that run microkde
  *
  * $Id$
  **************************************************************************/  
 
 #ifndef SETMASTERPWWNDIMPL_H
 #define SETMASTERPWWNDIMPL_H
 
 #ifndef PWM_EMBEDDED
 #include "setmasterpwwnd.h"
 #else
 #include "setmasterpwwnd_emb.h"
 #endif
 
 #include <klocale.h>
 
+#ifdef _WIN32_
+#define uint32_t Q_UINT32
+#else
 #include <stdint.h>
+#endif
 #include <string>
 using std::string;
 
 class PwMKeyCard;
 
 /** set master pw wnd */
 class SetMasterPwWndImpl : public setMasterPwWnd
 {
 	Q_OBJECT
 public:
 	SetMasterPwWndImpl(QWidget* parent = 0, const char *name = 0);
 	~SetMasterPwWndImpl();
 
 	static QString string_cardNone()
 			{ return i18n("NONE"); }
 
 	/** returns the selected pw (or the key on the card) */
 	string getPw(bool *useCard);
 	/** set pointer to the keycard-access object */
 	void setPwMKeyCard(PwMKeyCard *_keyCard)
 			{ keyCard = _keyCard; }
 
 public slots:
 	/** ok button pressed */
 	void okButton_slot();
 	/** cancel button pressed */
 	void cancelButton_slot();
 	/** "generate a new card" button pressed */
 	void genCardButton_slot();
 	/** "select current card" button pressed */
 	void selCardButton_slot();
 
diff --git a/pwmanager/pwmanager/sha1.h b/pwmanager/pwmanager/sha1.h
index 29442a7..c649bae 100644
--- a/pwmanager/pwmanager/sha1.h
+++ b/pwmanager/pwmanager/sha1.h
@@ -1,59 +1,64 @@
 /***************************************************************************
  *                                                                         *
  *   copyright (C) 2003 by Michael Buesch                                  *
  *   email: mbuesch@freenet.de                                             *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License version 2        *
  *   as published by the Free Software Foundation.                         *
  *                                                                         *
  ***************************************************************************/
 
 /***************************************************************************
  * copyright (C) 2004 by Ulf Schenk
  * This file is originaly based on version 1.0.1 of pwmanager
  * and was modified to run on embedded devices that run microkde
  *
  * $Id$
  **************************************************************************/  
 
 #ifndef SHA1_H
 #define SHA1_H
-
+#ifdef _WIN32_
+#define uint32_t unsigned int
+#define uint8_t	unsigned char
+#define byte	unsigned char
+#else
 #include <stdint.h>
+typedef uint8_t		byte;
+#endif
 #include <string>
 using std::string;
 
-typedef uint8_t		byte;
 
 #define SHA1_HASH_LEN_BIT	160
 #define SHA1_HASH_LEN_BYTE	(SHA1_HASH_LEN_BIT / 8)
 
 /** sha1 hash algorithm.
   * Derived from libgcrypt-1.1.12
   */
 class Sha1
 {
 	struct SHA1_CONTEXT
 	{
 		uint32_t  h0,h1,h2,h3,h4;
 		uint32_t  nblocks;
 		byte buf[64];
 		int  count;
 	};
 
 public:
 	Sha1() { sha1_init(); }
 	static bool selfTest();
 
 	void sha1_write(const byte *inbuf, uint32_t inlen);
 	string sha1_read();
 
 protected:
 	void sha1_init();
 	void sha1_final();
 	void burn_stack (int bytes);
 	void transform(const byte *data);
 
 	/** Rotate a 32 bit integer by n bytes */
 	uint32_t rol(uint32_t x, int n)