Index: abi/src/af/util/win/ut_path.cpp
===================================================================
RCS file: /cvsroot/abi/src/af/util/win/ut_path.cpp,v
retrieving revision 1.9
diff -u -3 -r1.9 ut_path.cpp
--- abi/src/af/util/win/ut_path.cpp	24 Jul 2003 22:14:03 -0000	1.9
+++ abi/src/af/util/win/ut_path.cpp	31 Aug 2003 20:12:07 -0000
@@ -20,6 +20,7 @@
 
 #include "ut_path.h"
 #include "ut_assert.h"
+#include "ut_debugmsg.h"
 #include <string.h>
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -59,8 +60,10 @@
 
 	if( _stat( filename , &buf ) != -1 ) 
 	{
+		UT_DEBUGMSG(("UT_isRegularFile(%s) { _stat(...) succeeded, returning ( st_mode<%X> & _S_IFREG<%X> )!= 0  <%X>\n", filename, buf.st_mode, _S_IFREG, (( buf.st_mode & _S_IFREG ) != 0) ));
 		return ( buf.st_mode & _S_IFREG ) != 0;
 	}
+	UT_DEBUGMSG(("UT_isRegularFile(%s) { _stat(...) failed, returning false. }\n", filename));
 	return false;
 }
 
Index: abi/src/af/util/xp/ut_types.h
===================================================================
RCS file: /cvsroot/abi/src/af/util/xp/ut_types.h,v
retrieving revision 1.89
diff -u -3 -r1.89 ut_types.h
--- abi/src/af/util/xp/ut_types.h	30 Jun 2003 21:45:14 -0000	1.89
+++ abi/src/af/util/xp/ut_types.h	31 Aug 2003 20:12:07 -0000
@@ -72,7 +72,7 @@
 #define UT_CONFIDENCE_POOR     85
 #define UT_CONFIDENCE_ZILCH     0
 
-#if defined(WIN32) && !defined(__MINGW32__)
+#if defined(WIN32) /* && !defined(__MINGW32__) */
   #define ABI_PLUGIN_EXPORT __declspec(dllexport)
   #ifndef ABI_DLL
      /* we are building AbiWord and wish for its parts to be used by plugins */
Index: abi/src/config/abi_rules.mk
===================================================================
RCS file: /cvsroot/abi/src/config/abi_rules.mk,v
retrieving revision 1.41
diff -u -3 -r1.41 abi_rules.mk
--- abi/src/config/abi_rules.mk	22 Jun 2003 11:19:53 -0000	1.41
+++ abi/src/config/abi_rules.mk	31 Aug 2003 20:12:11 -0000
@@ -217,10 +217,17 @@
 $(PLUGIN): $(OBJS)
 	@$(MAKE_OBJDIR)
 	@rm -f $@
-ifeq ($(OS_NAME), WIN32)
+ifeq ($(ABI_FE), Win32)
+ifeq ($(OS_NAME), MINGW32)
+	dllwrap --dllname=$(PLUGINDIR)/lib$(LIBRARY_NAME).dll \
+	--implib=$(PLUGINDIR)/lib$(LIBRARY_NAME)dll.a \
+	--driver-name=g++  \
+	$(OBJS) $(EXTRA_LIBS) $(OS_LIBS)
+else
 	@$(LINK_DLL) -MAP $(DLLBASE) $(OS_LIBS) \
-     $(shell echo $(EXTRA_LIBS) | $(TRANSFORM_TO_DOS_PATH) ) \
-     $(shell echo $(OBJS) | $(TRANSFORM_TO_DOS_PATH) )
+	$(shell echo $(EXTRA_LIBS) | $(TRANSFORM_TO_DOS_PATH) ) \
+	$(shell echo $(OBJS) | $(TRANSFORM_TO_DOS_PATH) )
+endif
 else
 	$(MKSHLIB) -o $@ $(OBJS) $(EXTRA_LIBS) $(OS_LIBS)
 endif
Index: abi/src/text/ptbl/xp/pd_Document.cpp
===================================================================
RCS file: /cvsroot/abi/src/text/ptbl/xp/pd_Document.cpp,v
retrieving revision 1.255
diff -u -3 -r1.255 pd_Document.cpp
--- abi/src/text/ptbl/xp/pd_Document.cpp	3 Aug 2003 15:42:36 -0000	1.255
+++ abi/src/text/ptbl/xp/pd_Document.cpp	31 Aug 2003 20:12:31 -0000
@@ -389,7 +389,7 @@
 
 	if ( !UT_isRegularFile(szFilename) )
 	{
-	  UT_DEBUGMSG (("PD_Document::readFromFile -- file is not plain file\n"));
+	  UT_DEBUGMSG (("PD_Document::readFromFile -- file (%s) is not plain file\n",szFilename));
 	  return UT_INVALIDFILENAME;
 	}
 
Index: abi/src/wp/ap/xp/ap_Args.cpp
===================================================================
RCS file: /cvsroot/abi/src/wp/ap/xp/ap_Args.cpp,v
retrieving revision 1.25
diff -u -3 -r1.25 ap_Args.cpp
--- abi/src/wp/ap/xp/ap_Args.cpp	3 Aug 2003 15:42:40 -0000	1.25
+++ abi/src/wp/ap/xp/ap_Args.cpp	31 Aug 2003 20:12:47 -0000
@@ -153,7 +153,10 @@
 		if (m_expProps)
 			conv->setExpProps (m_expProps);
 		while ((m_sFile = poptGetArg (poptcon)) != NULL)
+		{
+			UT_DEBUGMSG(("Converting file (%s) to type (%s)\n", m_sFile, m_sTo));
 			conv->convertTo(m_sFile, m_sTo);
+		}
 		delete conv;
 		return false;
 	}