? common.pro2
? ctype.h.new
? custom_defs.pro
? kdemacros.h.in
? moc
? msvc
? obj
? qeventloop_unix.cpp
? qeventloopex.cpp
? qeventloopex.h
? vc70.idb
? win.patch
? pro_files/dcop/KDE-ICE
? pro_files/dcop/dcopserver
? pro_files/dcop/dcopserver_shutdown
? pro_files/dcop/iceauth
? pro_files/dcop/tests
? sys/ctype.h
? sys/fcntl.h.new
? sys/msvc
? sys/stdlib.h
? sys/types.h.new
? tools/kde_env_custom
Index: bootstrap.cpp
===================================================================
RCS file: /home/kde/kdelibs/win/bootstrap.cpp,v
retrieving revision 1.1
diff -u -r1.1 bootstrap.cpp
--- bootstrap.cpp	16 Dec 2004 10:55:17 -0000	1.1
+++ bootstrap.cpp	23 Feb 2005 17:19:14 -0000
@@ -24,6 +24,7 @@
 #include <sys/file.h>
 #include <stdio.h>
 
+#include "qeventloopex.h"
 /**
  Actions to perform at very early stage of KDE application life on MS Windows.
  Currently not much is performed here but later, who knows...
@@ -49,6 +50,11 @@
 	osver.dwOSVersionInfoSize = sizeof(osver);
 	DWORD rc = GetVersionExA( &osver );
 
+	WSADATA	wsadata;
+	WSAStartup(MAKEWORD(2,2),&wsadata);
+
+	QEventLoopEx * pEventloopWindows = new QEventLoopEx;
+
 	//for win9x only:
 	if (osver.dwPlatformId == VER_PLATFORM_WIN32_WINDOWS) {
 		//set $HOME if not available
Index: common.pro
===================================================================
RCS file: /home/kde/kdelibs/win/common.pro,v
retrieving revision 1.2
diff -u -r1.2 common.pro
--- common.pro	11 Feb 2005 13:13:45 -0000	1.2
+++ common.pro	9 Apr 2005 12:36:52 -0000
@@ -4,7 +4,7 @@
 #
 
 # to avoid a need for using Q_WS_WIN in C source code
-DEFINES += _WINDOWS
+DEFINES += _WINDOWS WIN32_LEAN_AND_MEAN
 
 # custom definitions, options on which KDElibs do not depend
 exists( custom_defs.pro ) {
@@ -78,9 +78,15 @@
 #  !contains(CONFIG,debug) {
 #    DESTDIR = $$KDEBINDESTDIR\release-bin
 #  }
-  LIBS += $$KDELIBDESTDIR/kdecore$$KDELIB_SUFFIX \
-		$$KDELIBDESTDIR/kdeui$$KDELIB_SUFFIX \
-		$$KDELIBDESTDIR/kdefx$$KDELIB_SUFFIX
+	!contains(CONFIG,nokdecore) {
+			LIBS += $$KDELIBDESTDIR/kdecore$$KDELIB_SUFFIX
+	}
+	!contains(CONFIG,nokdeui) {
+			LIBS += $$KDELIBDESTDIR/kdeui$$KDELIB_SUFFIX
+	}
+	!contains(CONFIG,nokdefx) {
+			LIBS += $$KDELIBDESTDIR/kdefx$$KDELIB_SUFFIX
+	}
 }
 # default template is "lib"
 isEmpty( TEMPLATE ) {
@@ -163,7 +169,7 @@
 # a .cpp or .cxx extension, thus .cc files are compiled properly with msvc
 QMAKE_CXXFLAGS += /TP
 
-INCLUDEPATH	+= moc $(KDELIBS)/win
+INCLUDEPATH	+= moc $(KDELIBS)/win $(KDELIBS)
 
 contains(KW_CONFIG,release) {
 OBJECTS_DIR = obj_rel
@@ -183,4 +189,4 @@
 }
 contains(CONFIG,debug) {
 QMAKE_LFLAGS += /NODEFAULTLIB:MSVCRT /NODEFAULTLIB:MSVCR71 /NODEFAULTLIB:MSVCP71
-}
+}
\ No newline at end of file
Index: ctype.h
===================================================================
RCS file: /home/kde/kdelibs/win/ctype.h,v
retrieving revision 1.1
diff -u -r1.1 ctype.h
--- ctype.h	7 Feb 2005 11:55:00 -0000	1.1
+++ ctype.h	10 Feb 2005 17:04:02 -0000
@@ -26,7 +26,11 @@
 # include <bcc/ctype.h>
 #endif
 
-int KDE_isspace(int c) { return ((unsigned)(c + 1) <= 256) && isspace(c); }
+#ifdef __cplusplus
+inline int KDE_isspace(int c) { return ((unsigned)(c + 1) <= 256) && isspace(c); }
+#else
+#define KDE_isspace(__c) (((unsigned)(__c + 1) <= 256) && isspace(__c))
+#endif
 
 #define isspace KDE_isspace
 
Index: signal.c
===================================================================
RCS file: /home/kde/kdelibs/win/signal.c,v
retrieving revision 1.1
diff -u -r1.1 signal.c
--- signal.c	7 Feb 2005 11:55:00 -0000	1.1
+++ signal.c	12 Feb 2005 14:00:00 -0000
@@ -1,31 +1,54 @@
-/*

-   This file is part of the KDE libraries

-   Copyright (C) 2003-2004 Jaroslaw Staniek <js@iidea.pl>

-

-   This library is free software; you can redistribute it and/or

-   modify it under the terms of the GNU Library General Public

-   License version 2 as published by the Free Software Foundation.

-

-   This library is distributed in the hope that it will be useful,

-   but WITHOUT ANY WARRANTY; without even the implied warranty of

-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

-   Library General Public License for more details.

-

-   You should have received a copy of the GNU Library General Public License

-   along with this library; see the file COPYING.LIB.  If not, write to

-   the Free Software Foundation, Inc., 59 Temple Place - Suite 330,

-   Boston, MA 02111-1307, USA.

-*/

-

-KDEWIN32_EXPORT int kill(pid_t pid, int sig)

-{

-	/*! @todo win32 */

-	return 0;

-}

-

-KDEWIN32_EXPORT pid_t waitpid(pid_t p, int *a, int b)

-{

-	/*! @todo win32 */

-	return -1;

-}

-

+/*
+   This file is part of the KDE libraries
+   Copyright (C) 2003-2004 Jaroslaw Staniek <js@iidea.pl>
+
+   This library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public
+   License version 2 as published by the Free Software Foundation.
+
+   This library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public License
+   along with this library; see the file COPYING.LIB.  If not, write to
+   the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.
+*/
+
+#include <sys/types.h>
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
+#include <errno.h>
+
+KDEWIN32_EXPORT int kill(pid_t pid, int sig)
+{
+	int	ret;
+	HANDLE h = OpenProcess(PROCESS_TERMINATE,FALSE,(DWORD)pid);
+	ret = (h != NULL)?0:ESRCH;
+	if(h) 
+	{
+		TerminateProcess(h,sig);
+		CloseHandle(h);
+	}
+	return ret;
+}
+
+KDEWIN32_EXPORT pid_t waitpid(pid_t p, int *a, int b)
+{
+	int	ret;
+	HANDLE h = OpenProcess(PROCESS_TERMINATE,FALSE,(DWORD)p);
+	ret = (h != NULL)?p:-1;
+	if(h) 
+	{
+		DWORD dw;
+		WaitForSingleObject(h,INFINITE);
+		GetExitCodeProcess(h,&dw);
+		CloseHandle(h);
+	}
+	else
+		errno = ECHILD;
+	return ret;
+}
+
Index: win.pro
===================================================================
RCS file: /home/kde/kdelibs/win/win.pro,v
retrieving revision 1.4
diff -u -r1.4 win.pro
--- win.pro	8 Feb 2005 16:58:10 -0000	1.4
+++ win.pro	23 Feb 2005 16:18:56 -0000
@@ -42,6 +42,7 @@
 kde_file_win.c \
 mmap.c \
 getenv.c \
+qeventloopex.cpp \
 bootstrap.cpp
 
 #mkdir.c
Index: pro_files/dcop/dcop.pro
===================================================================
RCS file: /home/kde/kdelibs/win/pro_files/dcop/dcop.pro,v
retrieving revision 1.2
diff -u -r1.2 dcop.pro
--- pro_files/dcop/dcop.pro	7 Feb 2005 20:34:01 -0000	1.2
+++ pro_files/dcop/dcop.pro	11 Feb 2005 18:16:46 -0000
@@ -9,10 +9,11 @@
 
 system( bash kmoc )
 
+LIBS += $$KDELIBDESTDIR/kdeice$$KDELIB_SUFFIX
+
 SOURCES = \
 dcopref.cpp \
 dcopobject.cpp \
 dcopclient.cpp \
-dcopstub.cpp \
-dcopsignals.cpp
+dcopstub.cpp
 
Index: pro_files/kdeui/kdeui.pro
===================================================================
RCS file: /home/kde/kdelibs/win/pro_files/kdeui/kdeui.pro,v
retrieving revision 1.2
diff -u -r1.2 kdeui.pro
--- pro_files/kdeui/kdeui.pro	7 Feb 2005 20:34:05 -0000	1.2
+++ pro_files/kdeui/kdeui.pro	12 Feb 2005 10:53:44 -0000
@@ -125,11 +125,12 @@
 ktabbar.cpp \
 kdatetimewidget.cpp \
 ktimewidget.cpp \
-kinputdialog.cpp
+kinputdialog.cpp \
+kmessagebox.cpp
 
 #added KMessageBox::Dangerous implementation
-SOURCES += \
-kmessagebox_win.cpp
+#SOURCES += \
+#kmessagebox_win.cpp
 
 
 # generated:
Index: sys/socket.h
===================================================================
RCS file: /home/kde/kdelibs/win/sys/socket.h,v
retrieving revision 1.1
diff -u -r1.1 socket.h
--- sys/socket.h	7 Feb 2005 11:55:01 -0000	1.1
+++ sys/socket.h	11 Feb 2005 18:10:16 -0000
@@ -22,6 +22,10 @@
 
 #include <sys/time.h>
 
+#define WIN32_LEAN_AND_MEAN
+#include <winsock2.h>
+
+#if 0
 #ifdef __cplusplus
 /*extern "C" {*/
 #endif
@@ -56,4 +60,6 @@
 /*};*/
 #endif
 
+#endif
+
 #endif /* _SYS_SOCKET_H */
Index: tools/build_kdelibs_dbg
===================================================================
RCS file: /home/kde/kdelibs/win/tools/build_kdelibs_dbg,v
retrieving revision 1.3
diff -u -r1.3 build_kdelibs_dbg
--- tools/build_kdelibs_dbg	8 Mar 2005 11:50:03 -0000	1.3
+++ tools/build_kdelibs_dbg	9 Apr 2005 12:39:14 -0000
@@ -19,9 +19,12 @@
 for d in \
 win \
 libltdl \
+dcop/KDE-ICE \
 dcop \
 dcop/dcopidl \
 dcop/dcopidl2cpp \
+dcop/dcopserver \
+dcop/iceauth \
 kdefx \
 kstyles/thinkeramik/widget-engine \
 kdecore \
Index: tools/build_kdelibs_rel
===================================================================
RCS file: /home/kde/kdelibs/win/tools/build_kdelibs_rel,v
retrieving revision 1.1
diff -u -r1.1 build_kdelibs_rel
--- tools/build_kdelibs_rel	7 Feb 2005 20:35:17 -0000	1.1
+++ tools/build_kdelibs_rel	10 Apr 2005 17:22:38 -0000
@@ -14,9 +14,12 @@
 for d in \
 win \
 libltdl \
+dcop/KDE-ICE \
 dcop \
 dcop/dcopidl \
 dcop/dcopidl2cpp \
+dcop/dcopserver \
+dcop/iceauth \
 kdefx \
 kdecore \
 kdeui \
Index: tools/kdcopidl
===================================================================
RCS file: /home/kde/kdelibs/win/tools/kdcopidl,v
retrieving revision 1.1
diff -u -r1.1 kdcopidl
--- tools/kdcopidl	7 Feb 2005 11:05:31 -0000	1.1
+++ tools/kdcopidl	9 Apr 2005 11:20:44 -0000
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 # runs kdcopidl for current dir
 # or for $1 dir, (and $2, $3, $4, $5), whatever is provided
Index: tools/kmoc
===================================================================
RCS file: /home/kde/kdelibs/win/tools/kmoc,v
retrieving revision 1.1
diff -u -r1.1 kmoc
--- tools/kmoc	7 Feb 2005 11:05:31 -0000	1.1
+++ tools/kmoc	9 Apr 2005 10:44:34 -0000
@@ -7,8 +7,8 @@
 mkdir -p moc
 find . -maxdepth 1 -name \*.h | while read ; do 
 	grep Q_OBJECT $REPLY > /dev/null || continue
-	moc=moc/`echo $REPLY | sed -e "s/\\.h/\\.moc/"`
-	if [ $moc -ot $REPLY ] ; then echo mocing $REPLY... ; moc $REPLY -o moc/`echo $REPLY | sed -e "s/\\.h/\\.moc/"` ; fi
+	moc=moc/`echo $REPLY | sed -e "s/\\.h/\\.moc/" | sed -e "s/\\.\\///"`
+	if [ $moc -ot $REPLY ] ; then echo mocing $REPLY... ; moc $REPLY -o $moc ; fi
 done
 
 pwd=`pwd`
