made pwm compile on windows. now the cryptolibs are still missing

10 files changed, 50 insertions, 12 deletions

diff --git a/pwmanager/pwmanager/blowfish.h b/pwmanager/pwmanager/blowfish.h
index c05de77..5129eab 100644
--- a/pwmanager/pwmanager/blowfish.h
+++ b/pwmanager/pwmanager/blowfish.h
@@ -19,26 +19,35 @@
  *
  * $Id$
  **************************************************************************/  
 
 #ifndef BLOWFISH_H
 #define BLOWFISH_H
 
 #include "pwmexception.h"
-
+#ifndef _WIN32_
 #include <stdint.h>
+#else
+
+#endif
 #include <string>
 using std::string;
 
 #define BLOWFISH_BLOCKSIZE	8
 #define BLOWFISH_ROUNDS		16
 #define CIPHER_ALGO_BLOWFISH	4	/* blowfish 128 bit key */
 
+#ifndef _WIN32_
 typedef uint8_t		byte;
+#else
+#define  uint8_t Q_UINT8
+#define  byte Q_UINT8
+#define  uint32_t Q_UINT32
+#endif
 
 /** blowfish encryption algorithm.
   * Derived from libgcrypt-1.1.12
   */
 class Blowfish
 {
 	struct BLOWFISH_context
 	{
diff --git a/pwmanager/pwmanager/gpasmanfile.cpp b/pwmanager/pwmanager/gpasmanfile.cpp
index f80bc13..ae34c83 100644
--- a/pwmanager/pwmanager/gpasmanfile.cpp
+++ b/pwmanager/pwmanager/gpasmanfile.cpp
@@ -39,17 +39,24 @@
  * $Id$
  **************************************************************************/  
 
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <stdio.h>
 #include <fcntl.h>
 #include <stdlib.h>
+#ifndef _WIN32_
 #include <unistd.h>
+#else
+#include <io.h>
+#define S_IRUSR  _S_IREAD 
+#define S_IWUSR  _S_IWRITE 
+#define creat  _creat 
+#endif
 #include <string.h>
 #include <errno.h>
 
 #include "gpasmanfile.h"
 #include "globalstuff.h"
 
 #define SAVE_BUFFER_LENGTH 1024
 #define LOAD_BUFFER_LENGTH 2048
@@ -57,22 +64,25 @@
 #ifndef S_IAMB
 #define S_IAMB 00777
 #endif
 
 // enable/disable debug output
 //#define GPASMANFILE_DEBUG
 #undef GPASMANFILE_DEBUG
 
-
+#ifndef _WIN32_
 #if defined(PWM_DEBUG) && defined(GPASMANFILE_DEBUG)
 # define DBG(msg,x...)	do { fprintf(stderr, msg "\n" , ##x); } while (0)
 #else
 # define DBG(msg,x...)	do { } while (0)
 #endif
+#else
+# define DBG
+#endif
 
 #ifdef BIG_ENDIAN_HOST
 # define WORDS_BIGENDIAN
 #else
 # undef WORDS_BIGENDIAN
 #endif
 
 
@@ -405,25 +415,25 @@ int GpasmanFile::check_file(const char *filename)
 	}
 
 	if (((naamstat.st_mode & S_IAMB) | (S_IRUSR | S_IWUSR)) != (S_IRUSR |
 								    S_IWUSR)) {
 		DBG("%s perms are bad, they are: %ld, should be -rw------",
 		    filename, (naamstat.st_mode & (S_IREAD | S_IWRITE)));
 		return (-1);
 	}
-
+#ifndef _WIN32_
 	if (!S_ISREG(naamstat.st_mode)) {
 		lstat(filename, &naamstat);
 		if (S_ISLNK(naamstat.st_mode)) {
 			DBG("%s is a symlink", filename);
 			return (-2);
 		}
 	}
-
+#endif
 	return (1);
 }
 
 int GpasmanFile::file_exists(const char *tfile)
 {
 	struct stat naamstat;
 
 	if ((stat(tfile, &naamstat) == -1) && (errno == ENOENT)) {
diff --git a/pwmanager/pwmanager/htmlgen.cpp b/pwmanager/pwmanager/htmlgen.cpp
index 166b987..bee8198 100644
--- a/pwmanager/pwmanager/htmlgen.cpp
+++ b/pwmanager/pwmanager/htmlgen.cpp
@@ -55,17 +55,17 @@ HtmlGen::~HtmlGen()
 }
 
 QString HtmlGen::escapeHtmlText(const QString &str)
 {
 	QString ret;
 	unsigned int len = str.length(), i;
 	char c;
 	for (i = 0; i < len; ++i) {
-		c = str[i];
+		c = str.at(i);
 		switch (c) {
 		case '<':
 			ret.append("&lt;");
 			break;
 		case '>':
 			ret.append("&gt;");
 			break;
 		case '&':
diff --git a/pwmanager/pwmanager/ipc.cpp b/pwmanager/pwmanager/ipc.cpp
index b1d2c68..643b022 100644
--- a/pwmanager/pwmanager/ipc.cpp
+++ b/pwmanager/pwmanager/ipc.cpp
@@ -16,19 +16,19 @@
  *
  * $Id$
  **************************************************************************/  
 
 #include "ipc.h"
 #include "pwmexception.h"
 
 #include <qsocketnotifier.h>
-
+#ifndef _WIN32_
 #include <sys/socket.h>
-
+#endif
 #ifndef PWM_EMBEDDED
 #include <sys/types.h>
 #include <stdio.h>
 #else
 #include <qsocket.h>
 #endif
 
 #define END_OF_LINE		'\n'
@@ -67,20 +67,21 @@ Ipc::Ipc()
 		this, SLOT(receiveData(int)));
 	host = true;
 }
 #else
 Ipc::Ipc()
  : notifier (0)
  , rdBuf (0)
 {
+#ifndef _WIN32_
 	if (socketpair(AF_LOCAL, SOCK_STREAM, 0, sock)) {
 	  qDebug("Ipc: socketpair() failed");
 	}
-
+#endif
 	QSocket* qsock = new QSocket();
 	qsock->setSocket(sock[0]);
 
 	rdBufSize = INIT_LINEBUF_LEN;
 	rdBuf = (char *)(malloc(rdBufSize));
 	if (!rdBuf) {
 		close(sock[0]);
 		close(sock[1]);
diff --git a/pwmanager/pwmanager/ipc.h b/pwmanager/pwmanager/ipc.h
index e5a496d..7bfca02 100644
--- a/pwmanager/pwmanager/ipc.h
+++ b/pwmanager/pwmanager/ipc.h
@@ -16,18 +16,21 @@
  *
  * $Id$
  **************************************************************************/  
 
 #ifndef __PWM_IPC_H
 #define __PWM_IPC_H
 
 #include <qobject.h>
+#ifndef _WIN32_
 #include <unistd.h>
-
+#else
+#include <io.h>
+#endif
 #ifndef PWM_EMBEDDED
 #include <stdio.h>
 #else
 #include <qsocket.h>
 #endif
 
 class QSocketNotifier;
 
diff --git a/pwmanager/pwmanager/libgcryptif.h b/pwmanager/pwmanager/libgcryptif.h
index dffd55b..1a7b658 100644
--- a/pwmanager/pwmanager/libgcryptif.h
+++ b/pwmanager/pwmanager/libgcryptif.h
@@ -26,18 +26,23 @@
 
 #include "pwmexception.h"
 
 //#undef CONFIG_PWMANAGER_GCRY // for debugging only.
 #ifdef CONFIG_PWMANAGER_GCRY
 
 #include <stddef.h>
 #include <sys/types.h>
+#ifndef _WIN32_
 #include <stdint.h>
-
+#else
+#define  uint8_t Q_UINT8
+#define  byte Q_UINT8
+#define  uint32_t Q_UINT32
+#endif
 #define STRING2KEY_SALTLEN	8
 
 /** interface class for the libgcrypt cipher and hash algorithms
   * NOTE: Always allocate 1024 extra bytes for the inBuf (for padding)
   */
 class LibGCryptIf
 {
 protected:
diff --git a/pwmanager/pwmanager/pwm.cpp b/pwmanager/pwmanager/pwm.cpp
index d92c90d..1ab2b71 100644
--- a/pwmanager/pwmanager/pwm.cpp
+++ b/pwmanager/pwmanager/pwm.cpp
@@ -1405,16 +1405,17 @@ void PwM::syncHowTo_slot()
     KApplication::showFile( "KDE-Pim/Pi Synchronization HowTo", "kdepim/SyncHowto.txt" );
 }
 
 
 void PwM::createAboutData_slot()
 {
   QString version;
 #include <../version>
+;
     QMessageBox::about( this, "About PwManager/Pi",
                         "PwManager/Platform-independent\n"
                         "(PWM/Pi) " +version + " - " +
 #ifdef DESKTOP_VERSION
                         "Desktop Edition\n"
 #else
                         "PDA-Edition\n"
                         "for: Zaurus 5500 / 7x0 / 8x0\n"
diff --git a/pwmanager/pwmanager/pwmanager.pro b/pwmanager/pwmanager/pwmanager.pro
index 80b2519..fbc0554 100644
--- a/pwmanager/pwmanager/pwmanager.pro
+++ b/pwmanager/pwmanager/pwmanager.pro
@@ -1,15 +1,15 @@
 TEMPLATE	= app
 CONFIG		+= qt warn_off
 DESTDIR= ../../bin
 TARGET		= pwmpi
 include( ../../variables.pri )
 
-INCLUDEPATH += . ../../  ../../libkdepim ../../microkde ../../microkde/kdecore ../../microkde/kdeui ../../microkde/kutils 
+INCLUDEPATH += . ../../  ../../libkdepim ../../microkde ../../microkde/kdecore ../../microkde/kdeui ../../microkde/kutils ../libcrypt/crypt ../libcrypt/error ../libcrypt/zlib
 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
diff --git a/pwmanager/pwmanager/pwmdoc.cpp b/pwmanager/pwmanager/pwmdoc.cpp
index 86b6273..129bf7b 100644
--- a/pwmanager/pwmanager/pwmdoc.cpp
+++ b/pwmanager/pwmanager/pwmdoc.cpp
@@ -50,19 +50,20 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <errno.h>
 #include <string.h>
 //US#include <iostream>
 #include <algorithm>
 #include <sys/types.h>
 #include <sys/stat.h>
+#ifndef _WIN32_
 #include <unistd.h>
 #include <stdint.h>
-
+#endif
 
 #ifdef PWM_EMBEDDED
 #ifndef Q_LONG
 #define Q_LONG long
 #endif
 
 #ifndef Q_ULONG
 #define Q_ULONG unsigned long
@@ -500,20 +501,22 @@ PwMerror PwMDoc::saveDoc(char compress, const QString *file)
 	} else if (e != e_success) {
 		printDebug("PwMDoc::saveDoc(): encrypt() failed");
 		f.close();
 		ret = e_enc;
 		goto out_moveback;
 	}
 	unsetDocStatFlag(DOC_STAT_DISK_DIRTY);
 	f.close();
+#ifndef _WIN32_
 	if (chmod(filename.latin1(),
 		  conf()->confGlobFilePermissions())) {
 		printWarn(string("chmod failed: ") + strerror(errno));
 	}
+#endif
 	openDocList.edit(this, getTitle().latin1());
 	if (wasDeepLocked) {
 	  /* Do _not_ save the data with the deepLock()
 	   * call, because this will recurse
 	   * into saveDoc()
 	   */
 	  deepLock(true, false);
 	  /* We don't check return value here, because
@@ -2213,20 +2216,22 @@ bool PwMDoc::execLauncher(const QString &category, unsigned int entryIndex)
 	if (!findCategory(category, &cat))
 		return false;
 
 	return execLauncher(cat, entryIndex);
 }
 
 bool PwMDoc::execLauncher(unsigned int category, unsigned int entryIndex)
 {
+#ifndef _WIN32_
 	if (geteuid() == 0) {
 		rootAlertMsgBox();
 		return false;
 	}
+#endif
 	QString command(dti.dta[category].d[entryIndex].launcher.c_str());
 	bool wasLocked = isLocked(category, entryIndex);
 
 	if (command.find("$p") != -1) {
 		/* the user requested the password to be included
 		 * into the command. We have to ask for the password,
 		 * if it's locked. We do that by unlocking the entry
 		 */
@@ -2265,20 +2270,22 @@ bool PwMDoc::goToURL(const QString &category, unsigned int entryIndex)
 	if (!findCategory(category, &cat))
 		return false;
 
 	return goToURL(cat, entryIndex);
 }
 
 bool PwMDoc::goToURL(unsigned int category, unsigned int entryIndex)
 {
+#ifndef _WIN32_
 	if (geteuid() == 0) {
 		rootAlertMsgBox();
 		return false;
 	}
+#endif
 	QString url(dti.dta[category].d[entryIndex].url.c_str());
 	if (url.isEmpty())
 		return false;
 
 	QString customBrowser(conf()->confGlobBrowserCommand());
 	if (!customBrowser.isEmpty()) {
 		browserProc.clearArguments();
 		browserProc << customBrowser << url;
diff --git a/pwmanager/pwmanager/spinforsignal.h b/pwmanager/pwmanager/spinforsignal.h
index ec6103b..f3cabee 100644
--- a/pwmanager/pwmanager/spinforsignal.h
+++ b/pwmanager/pwmanager/spinforsignal.h
@@ -17,17 +17,19 @@
  * $Id$
  **************************************************************************/  
 
 #ifndef SPINFORSIGNAL_H
 #define SPINFORSIGNAL_H
 
 #include <qobject.h>
 
+#ifndef _WIN32_
 #include <stdint.h>
+#endif
 #include <string>
 using std::string;
 
 /** non-ui-blocking spin for a QT-signal */
 class SpinForSignal : public QObject
 {
 	Q_OBJECT
 public: