Attachment #14296 for issue #24588

View | Details | Raw Unified | Return to issue 24588
Collapse All | Expand All

Lines 1-5 Link Here

(-)oo_1.1.1_src/UnoControls/prj/d.lst.orig (+1 lines)
1	..\%__SRC%\bin\.dll %_DEST%\bin%_EXT%\.dll	1	..\%__SRC%\bin\.dll %_DEST%\bin%_EXT%\.dll
2	..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%	2	..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%
		3	..\%__SRC%\lib\lib*.a %_DEST%\lib%_EXT%
3	..\%__SRC%\lib\.sl %_DEST%\lib%_EXT%\.sl	4	..\%__SRC%\lib\.sl %_DEST%\lib%_EXT%\.sl
4	..\%__SRC%\bin\.res %_DEST%\bin%_EXT%\.res	5	..\%__SRC%\bin\.res %_DEST%\bin%_EXT%\.res
5	..\%__SRC%\lib\.dylib %_DEST%\lib%_EXT%\.dylib	6	..\%__SRC%\lib\.dylib %_DEST%\lib%_EXT%\.dylib




            if ( pJava_environment && pUno_environment )
            {
                g_unoMapping = Mapping(pUno_environment, pJava_environment);
                getCppuType((::com::sun::star::uno::Reference< XAccessible > *) 0).getDescription((typelib_TypeDescription **) & g_pTypeDescription);
            }
            
            if ( pJava_environment )

{
    if ( pWindow && pWindow->IsTopWindow() )
    {
        ::com::sun::star::uno::Reference< XAccessible > xAccessible;
    
        // Test for combo box - drop down floating windows first
        Window * pParentWindow = pWindow->GetParent();

            try 
            {
                // The parent window of a combo box floating window should have the role COMBO_BOX
                ::com::sun::star::uno::Reference< XAccessible > xParentAccessible(pParentWindow->GetAccessible());
                if ( xParentAccessible.is() )
                {
                    ::com::sun::star::uno::Reference< XAccessibleContext > xParentAC(xParentAccessible->getAccessibleContext());
                    if ( xParentAC.is() && (AccessibleRole::COMBO_BOX == xParentAC->getAccessibleRole()) )
                    {
                        // O.k. - this is a combo box floating window corresponding to the child of role LIST of the parent.

                        sal_Int32 nCount = xParentAC->getAccessibleChildCount();
                        for ( sal_Int32 n = 0; (n < nCount) && !xAccessible.is(); n++)
                        {
                            ::com::sun::star::uno::Reference< XAccessible > xChild = xParentAC->getAccessibleChild(n);
                            if ( xChild.is() )
                            {
                                ::com::sun::star::uno::Reference< XAccessibleContext > xChildAC = xChild->getAccessibleContext();
                                if ( xChildAC.is() && (AccessibleRole::LIST == xChildAC->getAccessibleRole()) )
                                {
                                    xAccessible = xChild;

Lines 2-6 Link Here

(-)oo_1.1.1_src/accessibility/prj/d.lst.orig (-1 / +1 lines)
2	..\%__SRC%\class\java_accessibility.jar %_DEST%\bin%_EXT%\java_accessibility.jar	2	..\%__SRC%\class\java_accessibility.jar %_DEST%\bin%_EXT%\java_accessibility.jar
3		3
4	..\%__SRC%\bin\.dll %_DEST%\bin%_EXT%\.dll	4	..\%__SRC%\bin\.dll %_DEST%\bin%_EXT%\.dll
5	..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%	5	..\%__SRC%\lib\lib*.a %_DEST%\lib%_EXT%
6		6

Lines 639-645 Link Here

(-)oo_1.1.1_src/automation/source/server/statemnt.cxx.orig (-2 / +2 lines)
639	{}	639	{}
640		640
641	// XStatusListener	641	// XStatusListener
642	void SAL_CALL SlotStatusListener::statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event )	642	void SAL_CALL SlotStatusListener::statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw (::com::sun::star::uno::RuntimeException)
643	{	643	{
644	// DBG_ERROR1("FeatureURL: %s", ByteString( String( Event.FeatureURL.Complete ), RTL_TEXTENCODING_UTF8 ).GetBuffer() )	644	// DBG_ERROR1("FeatureURL: %s", ByteString( String( Event.FeatureURL.Complete ), RTL_TEXTENCODING_UTF8 ).GetBuffer() )
645	// DBG_ERROR1("FeatureDescriptor: %s", ByteString( String( Event.FeatureDescriptor ), RTL_TEXTENCODING_UTF8 ).GetBuffer() )	645	// DBG_ERROR1("FeatureDescriptor: %s", ByteString( String( Event.FeatureDescriptor ), RTL_TEXTENCODING_UTF8 ).GetBuffer() )
Lines 649-655 Link Here
649	}	649	}
650		650
651	// XEventListener	651	// XEventListener
652	void SAL_CALL SlotStatusListener::disposing( const ::com::sun::star::lang::EventObject& )	652	void SAL_CALL SlotStatusListener::disposing( const ::com::sun::star::lang::EventObject& ) throw (::com::sun::star::uno::RuntimeException)
653	{	653	{
654	bDisposed = TRUE;	654	bDisposed = TRUE;
655	}	655	}

Lines 44-50 Link Here

(-)oo_1.1.1_src/berkeleydb/db-3.2.9.patch.orig
44	CC= @MAKEFILE_CC@	44	CC= @MAKEFILE_CC@
45	CCLINK= @MAKEFILE_CCLINK@	45	CCLINK= @MAKEFILE_CCLINK@
46	*** misc/db-3.2.9/dist/configure 2001-01-24 16:16:18.000000000 +0100	46	*** misc/db-3.2.9/dist/configure 2001-01-24 16:16:18.000000000 +0100




  *qnx)	   cat >> confdefs.h <<\EOF
  #define HAVE_QNX 1
***************
*** 1626,1636 ****
  	echo $ac_n "checking libtool configuration""... $ac_c" 1>&6
  echo "configure:1628: checking libtool configuration" >&5
  	echo "$ac_t""" 1>&6
! 	${CONFIG_SHELL-/bin/sh} $srcdir/ltconfig \
! 		--no-verify $srcdir/ltmain.sh \
! 		--output=./libtool $host_os \
! 		--disable-static \
! 	|| { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
  
  	SOSUFFIX=`sed -e '/^library_names_spec=/!d' -e 's/.*\.\([a-zA-Z0-9_]*\).*/\1/' ./libtool`
  	DEFAULT_LIB="\$(libso_target)"
--- 1629,1650 ----
  	echo $ac_n "checking libtool configuration""... $ac_c" 1>&6
  echo "configure:1628: checking libtool configuration" >&5
  	echo "$ac_t""" 1>&6
! 	case "$host_os" in
! 	cygwin* | mingw*)
! 		export LN_S="cp -p"; ${CONFIG_SHELL-/bin/sh} $srcdir/ltconfig \
! 			--no-verify $srcdir/ltmain.sh \
! 			--output=./libtool $host_os \
! 			--disable-static --enable-win32-dll\
! 		|| { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
! 	;;
! 	*)
! 		${CONFIG_SHELL-/bin/sh} $srcdir/ltconfig \
! 			--no-verify $srcdir/ltmain.sh \
! 			--output=./libtool $host_os \
! 			--disable-static \
! 		|| { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
! 	;;
! 	esac
  
  	SOSUFFIX=`sed -e '/^library_names_spec=/!d' -e 's/.*\.\([a-zA-Z0-9_]*\).*/\1/' ./libtool`
  	DEFAULT_LIB="\$(libso_target)"
***************
*** 1644,1650 ****
  
  	INSTALLER="\$(LIBTOOL) --mode=install cp"

  	SOFLAGS="-rpath \$(libdir)"
  	o=".lo"
  fi
--- 1658,1671 ----
  
  	INSTALLER="\$(LIBTOOL) --mode=install cp"
  	POSTLINK="\$(LIBTOOL) --mode=execute true"

      fi
    done
    IFS="$ac_save_ifs"
--- 1771,1780 ----
    for ac_dir in $ac_dummy; do 
      test -z "$ac_dir" && ac_dir=.
      if test -f $ac_dir/$ac_word; then
!       if test "$SOLARENV/$OUTPATH/bin" != $ac_dir; then
!         ac_cv_path_JAVACABS="$ac_dir/$ac_word"
!         break
!       fi

  	*)		JINCSUBDIRS="genunix";;
  	esac
  
--- 1804,1856 ----
  		echo "$ac_t""$JAVACABS" 1>&6
  	done
  	JTOPDIR=`echo "$JAVACABS" | sed -e 's://*:/:g' -e 's:/[^/]*$::'`

! 			else
! 				{ echo "configure: error: cannot find java include files (Darwin: $JFRAMEDIR/Versions/1.3.1/Headers/jni.h)" 1>&2; exit 1; }
! 			fi
! 		;;
! 		cygwin*|mingw*)
! 			if test -f "$JTOPDIR/include/jni.h"; then
! 				CPPFLAGS="$CPPFLAGS -I$JTOPDIR/include/win32 -I$JTOPDIR/include"
! 			else
! 				JTOPDIR=`echo "$JTOPDIR" | sed -e 's:/[^/]*$::'`
! 				if test -f "$JTOPDIR/include/jni.h"; then
! 					CPPFLAGS="$CPPFLAGS -I$JTOPDIR/include/win32 -I$JTOPDIR/include"
! 				else
! 					{ echo "configure: error: cannot find java include files" 1>&2; exit 1; }
! 				fi
! 			fi
! 		;;
! 		*)
! 			if test -f "$JTOPDIR/include/jni.h"; then
! 				CPPFLAGS="$CPPFLAGS -I$JTOPDIR/include"

  	esac
  
***************
*** 2134,2139 ****
--- 2190,2234 ----
    DBS_LIBS=-lpthread
  else
    echo "$ac_t""no" 1>&6
+ echo $ac_n "checking for pthread_create in -lpthreadGCE""... $ac_c" 1>&6
+ echo "configure:2101: checking for pthread_create in -lpthreadGCE" >&5
+ ac_lib_var=`echo pthreadGCE'_'pthread_create | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   ac_save_LIBS="$LIBS"
+ LIBS="-lpthreadGCE  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+ #line 2109 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+     builtin and then its argument prototype would still apply.  */
+ char pthread_create();
+ 
+ int main() {
+ pthread_create()
+ ; return 0; }
+ EOF
+ if { (eval echo configure:2120: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=no"
+ fi
+ rm -f conftest*
+ LIBS="$ac_save_LIBS"
+ 
+ fi
+ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+   echo "$ac_t""yes" 1>&6
+   DBS_LIBS=-lpthreadGCE
+ else
+   echo "$ac_t""no" 1>&6
+ fi
  fi
  
  
***************
*** 4008,4014 ****
  #line 4009 "configure"
  #include "confdefs.h"

  #if defined(__GNUC__)
  exit(0);
  #endif
--- 4103,4109 ----
  #line 4009 "configure"
  #include "confdefs.h"
  main(){

  exit(0);
  #endif
***************
*** 4624,4629 ****
--- 4719,4782 ----
  fi
  done
  
+ case "$host_os" in
+ cygwin*|mingw*)
+ for ac_func in select
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+ echo "configure:4631: checking for $ac_func" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+ #line 4636 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+ #include <assert.h>
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+     builtin and then its argument prototype would still apply.  */
+ char $ac_func();
+ 
+ int main() {
+ 
+ /* The GNU C library defines this for functions which it implements
+     to always fail with ENOSYS.  Some functions are actually named
+     something starting with __ and the normal name is an alias.  */
+ #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+ choke me
+ #else
+ $ac_func();
+ #endif
+ 
+ ; return 0; }
+ EOF
+ if { (eval echo configure:4659: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func_$ac_func=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   eval "ac_cv_func_$ac_func=no"
+ fi
+ rm -f conftest*
+ fi
+ 
+ if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
+   echo "$ac_t""yes" 1>&6
+     ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
+   cat >> confdefs.h <<EOF
+ #define $ac_tr_func 1
+ EOF
+  
+ else
+   echo "$ac_t""no" 1>&6
+ fi
+ done
+ ;;
+ *)
  for ac_func in select
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
***************
*** 4679,4684 ****
--- 4832,4839 ----
  { echo "configure: error: No select library function." 1>&2; exit 1; }
  fi
  done
+ ;;
+ esac
  
  
  echo $ac_n "checking for int type sprintf return value""... $ac_c" 1>&6
***************
*** 5375,5382 ****
  	fi
  fi

  CREATE_LIST="Makefile
      include.tcl:../test/include.tcl
      db.h:../include/db.src
--- 5530,5535 ----
*** misc/db-3.2.9/dist/configure.in	2001-01-19 18:36:43.000000000 +0100
--- misc/build/db-3.2.9/dist/configure.in	2003-07-16 19:34:25.000000000 +0200
***************

  	esac
  
*** misc/db-3.2.9/dist/ltconfig	2000-10-13 22:23:00.000000000 +0200




      # FIXME: we need at least 68020 code to build shared libraries, but
      # adding the `-m68020' flag to GCC prevents building anything better,
***************
*** 1165,1170 ****
--- 1170,1177 ----
      # then regenerate the def file from the symbol export list, so that
      # the compiled dll only exports the symbol export list.
      # Be careful not to strip the DATA tag left by newer dlltools.
+    case "$host_os" in
+    cygwin*)
      export_symbols_cmds='test -f $objdir/$soname-ltdll.c || sed -e "/^# \/\* ltdll\.c starts here \*\//,/^# \/\* ltdll.c ends here \*\// { s/^# //; p; }" -e d < $0 > $objdir/$soname-ltdll.c~
        test -f $objdir/$soname-ltdll.$objext || (cd $objdir && $CC -c $soname-ltdll.c)~
        $DLLTOOL --export-all --exclude-symbols DllMain@12,_cygwin_dll_entry@12,_cygwin_noncygwin_dll_entry@12 --output-def $objdir/$soname-def  $objdir/$soname-ltdll.$objext $libobjs $convenience~
***************
*** 1190,1204 ****
        $CC $objdir/$soname-exp -Wl,--dll -nostartfiles -Wl,-e,__cygwin_dll_entry@12 -o $lib $objdir/$soname-ltdll.$objext $libobjs $deplibs $linkopts'
  
        old_archive_from_new_cmds='$DLLTOOL --as=$AS --dllname $soname --def $objdir/$soname-def --output-lib $objdir/$libname.a' 
      ;;
  
    netbsd*)
      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then

      fi
      ;;
  
--- 1197,1248 ----
        $CC $objdir/$soname-exp -Wl,--dll -nostartfiles -Wl,-e,__cygwin_dll_entry@12 -o $lib $objdir/$soname-ltdll.$objext $libobjs $deplibs $linkopts'
  
        old_archive_from_new_cmds='$DLLTOOL --as=$AS --dllname $soname --def $objdir/$soname-def --output-lib $objdir/$libname.a' 
+      ;;
+    *)
+     export_symbols_cmds='$DLLTOOL --export-all --exclude-symbols DllMain@12 --output-def $objdir/$soname-def $libobjs $convenience~
+       sed -e "1,/EXPORTS/d" -e "s/ @ [0-9]*//" -e "s/ *;.*$//" < $objdir/$soname-def > $export_symbols'
+ 
+     # If DATA tags from a recent dlltool are present, honour them!
+    archive_expsym_cmds='echo EXPORTS > $objdir/$soname-def~
+       _lt_hint=1;
+       cat $export_symbols | while read symbol; do
+         set dummy \$symbol;
+         case \$# in
+           2) echo "	\$2 @ \$_lt_hint ; " >> $objdir/$soname-def;;
+           *) echo "     \$2 @ \$_lt_hint \$3 ; " >> $objdir/$soname-def;;
+         esac;
+ 	_lt_hint=`expr 1 + \$_lt_hint`;
+       done~
+       $CC -Wl,--base-file,$objdir/$soname-base -mdll -Wl,-e,_DllMainCRTStartup@12 -o $lib $libobjs $deplibs $linkopts~
+       $DLLTOOL --as=$AS --dllname $soname --exclude-symbols DllMain@12 --def $objdir/$soname-def --base-file $objdir/$soname-base --output-exp $objdir/$soname-exp~
+       $CC -Wl,--base-file,$objdir/$soname-base $objdir/$soname-exp -mdll -Wl,-e,_DllMainCRTStartup@12 -o $lib $libobjs $deplibs $linkopts~
+       $DLLTOOL --as=$AS --dllname $soname --exclude-symbols DllMain@12 --def $objdir/$soname-def --base-file $objdir/$soname-base --output-exp $objdir/$soname-exp~
+       $CC $objdir/$soname-exp -mdll -Wl,-e,_DllMainCRTStartup@12 -o $lib $libobjs $deplibs $linkopts'
+ 
+       old_archive_from_new_cmds='$DLLTOOL --as=$AS --dllname $soname --def $objdir/$soname-def --output-lib $objdir/$libname.a' 
+      ;;
+     esac
      ;;
  
    netbsd*)
      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then

      ;;
  
***************
*** 1329,1334 ****
--- 1373,1379 ----
      # no search path for DLLs.
      hardcode_libdir_flag_spec=' '
      allow_undefined_flag=unsupported
+     no_undefined_flag=yes
      # Tell ltmain to make .lib files, not .a files.
      libext=lib
      # FIXME: Setting linknames here is a bad hack.
***************
*** 1371,1376 ****
--- 1416,1438 ----
      hardcode_shlibpath_var=no
      ;;
  

    sco3.2v5*)
      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linkopts'
      hardcode_shlibpath_var=no
--- 1505,1511 ----
      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
      hardcode_libdir_separator=:
      ;;

      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linkopts'
      hardcode_shlibpath_var=no
***************
*** 1878,1884 ****
      library_names_spec='${libname}`echo ${release} | sed -e 's/[.]/-/g'`${versuffix}.dll $libname.lib'
    fi
    dynamic_linker='Win32 ld.exe'
!   deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
    file_magic_cmd='${OBJDUMP} -f'
    # FIXME: first we should search . and the directory the executable is in
    shlibpath_var=PATH
--- 1934,1947 ----
      library_names_spec='${libname}`echo ${release} | sed -e 's/[.]/-/g'`${versuffix}.dll $libname.lib'
    fi
    dynamic_linker='Win32 ld.exe'
!   case "$host_os" in
!   cygwin*)
!     deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
!     ;;
!   *)
!     deplibs_check_method='pass_all'
!     ;;
!   esac
    file_magic_cmd='${OBJDUMP} -f'
    # FIXME: first we should search . and the directory the executable is in
    shlibpath_var=PATH
***************
*** 1919,1924 ****
--- 1982,2008 ----
    esac
    ;;
  

    library_names_spec='${libname}${release}.so.$versuffix ${libname}${release}.so.$major ${libname}${release}.so $libname.so'
    case "$host_os" in
    irix5*)
--- 2039,2045 ----
    version_type=irix
    need_lib_prefix=no
    need_version=no

    irix5*)
***************
*** 2023,2028 ****
--- 2107,2126 ----
    shlibpath_var=LD_LIBRARY_PATH
    ;;
  

  sco3.2v5*)
    version_type=osf
    soname_spec='${libname}${release}.so$major'
--- 2155,2160 ----
*** misc/db-3.2.9/dist/ltmain.sh	2000-08-06 20:32:00.000000000 +0200




  	  esac
  	elif test "$arg" = "-lm"; then
  	  case "$host" in
! 	  *cygwin* | *-*-beos*)
*** 1086,1091 ****
--- 1091,1101 ----
  	    # These systems don't actually have math library (as such)
  	    continue
  	    ;;

  	fi
  	deplibs="$deplibs $arg"
***************
*** 1362,1368 ****
  	      compile_command="$compile_command $dir/$linklib"
  	      deplibs="$deplibs $dir/$linklib"
  	      case "$host" in
! 	      *-*-cygwin* | *-*-mingw* | *-*-os2*)
  		dllsearchdir=`cd "$dir" && pwd || echo "$dir"`
  		if test -n "$dllsearchpath"; then
  		  dllsearchpath="$dllsearchpath:$dllsearchdir"
--- 1369,1375 ----
  	      compile_command="$compile_command $dir/$linklib"
  	      deplibs="$deplibs $dir/$linklib"
  	      case "$host" in
! 	      *cygwin* | *mingw* | *-*-os2*)
  		dllsearchdir=`cd "$dir" && pwd || echo "$dir"`
  		if test -n "$dllsearchpath"; then
  		  dllsearchpath="$dllsearchpath:$dllsearchdir"
***************
*** 1569,1574 ****
--- 1576,1584 ----
        ;;
  
      *.la)
+       # See if our shared archives depend on static archives.
+       test -n "$old_archive_from_new_cmds" && build_old_libs=yes
+ 
        # Make sure we only generate libraries of the form `libNAME.la'.
        case "$outputname" in
        lib*)
***************
*** 1753,1758 ****
--- 1763,1778 ----
  	  versuffix="-$major-$age-$revision"

  	    versuffix=
  	  else
***************
*** 1792,1798 ****
  
  	dependency_libs="$deplibs"
  	case "$host" in
! 	*-*-cygwin* | *-*-mingw* | *-*-os2* | *-*-beos*)
  	  # these systems don't actually have a c library (as such)!
  	  ;;
  
--- 1821,1827 ----
  
  	dependency_libs="$deplibs"
  	case "$host" in
! 	*cygwin* | *mingw* | *-*-os2* | *-*-beos*)
  	  # these systems don't actually have a c library (as such)!
  	  ;;
  
***************
*** 1803,1808 ****
--- 1832,1842 ----
  	  # defer to whether the user wants -lc, or -lc_r

  	*)
  	  # Add libc to deplibs on all other systems.
  	  deplibs="$deplibs -lc"
***************
*** 2865,2873 ****
  "
  
  	if test "$fast_install" = yes; then
! 	  echo >> $output "\
!   program=lt-'$outputname'
    progdir=\"\$thisdir/$objdir\"
    
    if test ! -f \"\$progdir/\$program\" || \\
       { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | sed 1q\`; \\
--- 2899,2919 ----
  "
  
  	if test "$fast_install" = yes; then
! 	  case $host in
! 	  *mingw*)
! 	    echo >> $output "\
!   program=lt-'$outputname'\"$exeext\"
!   progdir=\`cygpath -m \"\$thisdir/$objdir\"\`
! "
! 	    ;;
! 	  *)
! 	    echo >> $output "\
!   program=lt-'$outputname'\"$exeext\"
    progdir=\"\$thisdir/$objdir\"
+ "
+ 	    ;;
+ 	  esac
+ 	  echo >> $output "\
    
    if test ! -f \"\$progdir/\$program\" || \\
       { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | sed 1q\`; \\
***************
*** 2898,2907 ****
      $rm \"\$progdir/\$file\"
    fi"
  	else
! 	  echo >> $output "\
!   program='$outputname'
    progdir=\"\$thisdir/$objdir\"
  "
  	fi
  
  	echo >> $output "\
--- 2944,2964 ----
      $rm \"\$progdir/\$file\"
    fi"
  	else
! 	  case $host in
! 	  *mingw*)
! 	    echo >> $output "\
!   program='$outputname'\"$exeext\"
    progdir=\"\$thisdir/$objdir\"
+   progdir=\`cygpath -m \"\$thisdir/$objdir\"\`
  "
+ 	    ;;
+ 	  *)
+ 	    echo >> $output "\
+   program='$outputname'\"$exeext\"
+   progdir=\"\$thisdir/$objdir\"
+ "
+ 	    ;;
+ 	  esac
  	fi
  
  	echo >> $output "\
***************
*** 2937,2950 ****
  	case $host in
  	  # win32 systems need to use the prog path for dll
  	  # lookup to work
! 	*-*-cygwin*)
  	  $echo >> $output "\
        exec \$progdir/\$program \${1+\"\$@\"}
  "
  	  ;;
  
  	# Backslashes separate directories on plain windows
! 	*-*-mingw | *-*-os2*)
  	  $echo >> $output "\
        exec \$progdir\\\\\$program \${1+\"\$@\"}
  "
--- 2994,3007 ----
  	case $host in
  	  # win32 systems need to use the prog path for dll
  	  # lookup to work
! 	*cygwin*)
  	  $echo >> $output "\
        exec \$progdir/\$program \${1+\"\$@\"}
  "
  	  ;;
  
  	# Backslashes separate directories on plain windows
! 	*mingw* | *-*-os2*)
  	  $echo >> $output "\
        exec \$progdir\\\\\$program \${1+\"\$@\"}
  "
--- misc/build/db-3.2.9/os/os_oflags.c.orig	2000-10-28 23:57:50.000000000 +0900

..\%__SRC%\lib\libdb_java-3.2.so %_DEST%\lib%_EXT%\libdb_java-3.2.so
..\%__SRC%\lib\libdb_cxx-3.2.so %_DEST%\lib%_EXT%\libdb_cxx-3.2.so

..\%__SRC%\lib\libdb-3.2.a %_DEST%\lib%_EXT%\libdb-3.2.a
..\%__SRC%\lib\libdb_java-3.2.a %_DEST%\lib%_EXT%\libdb_java-3.2.a
..\%__SRC%\lib\libdb_cxx-3.2.a %_DEST%\lib%_EXT%\libdb_cxx-3.2.a

..\%__SRC%\lib\libdb-3.2.dylib %_DEST%\lib%_EXT%\libdb-3.2.dylib
..\%__SRC%\lib\libdb_java-3.2.dylib %_DEST%\lib%_EXT%\libdb_java-3.2.dylib
..\%__SRC%\lib\libdb_cxx-3.2.dylib %_DEST%\lib%_EXT%\libdb_cxx-3.2.dylib

..\%__SRC%\bin\libdb*.dll %_DEST%\bin%_EXT%\*.*
..\%__SRC%\bin\libdb_java32.dll %_DEST%\bin%_EXT%\libdb_java32.dll

..\%__SRC%\bin\db.jar %_DEST%\bin%_EXT%\db.jar


Lines 29-33 Link Here

(-)oo_1.1.1_src/boost/prj/d.lst.orig (+1 lines)
29		29
30	..\%__SRC%\lib\.lib %_DEST%\lib%_EXT%\.lib	30	..\%__SRC%\lib\.lib %_DEST%\lib%_EXT%\.lib
31	..\%__SRC%\lib\.so %_DEST%\lib%_EXT%\.so	31	..\%__SRC%\lib\.so %_DEST%\lib%_EXT%\.so
		32	..\%__SRC%\lib\.a %_DEST%\lib%_EXT%\.a
32	..\%__SRC%\bin\.dll %_DEST%\bin%_EXT%\.dll	33	..\%__SRC%\bin\.dll %_DEST%\bin%_EXT%\.dll
33		34

Lines 5-10 Link Here

(-)oo_1.1.1_src/bridges/prj/build.lst.orig (+1 lines)
5	br bridges\source\remote\urp nmake - all br_rem_urp br_rem_static NULL	5	br bridges\source\remote\urp nmake - all br_rem_urp br_rem_static NULL
6	br bridges\source\remote\iiop nmake - all br_iiop br_rem_static NULL	6	br bridges\source\remote\iiop nmake - all br_iiop br_rem_static NULL
7	br bridges\source\remote\context nmake - all br_rcon br_unotypes NULL	7	br bridges\source\remote\context nmake - all br_rcon br_unotypes NULL
		8	br bridges\source\cpp_uno\mingw_intel nmake - w br_gcc3i br_unotypes NULL
8	br bridges\source\cpp_uno\msvc_win32_intel nmake - w br_msci br_unotypes NULL	9	br bridges\source\cpp_uno\msvc_win32_intel nmake - w br_msci br_unotypes NULL
9	br bridges\source\cpp_uno\gcc2_linux_intel nmake - u br_gccli br_unotypes NULL	10	br bridges\source\cpp_uno\gcc2_linux_intel nmake - u br_gccli br_unotypes NULL
10	br bridges\source\cpp_uno\gcc3_linux_intel nmake - u br_gcc3li br_unotypes NULL	11	br bridges\source\cpp_uno\gcc3_linux_intel nmake - u br_gcc3li br_unotypes NULL

Lines 23-28 Link Here

(-)oo_1.1.1_src/bridges/prj/d.lst.orig (+1 lines)
23	# ..\%__SRC%\bin\c_uno.* %_DEST%\bin%_EXT%\c_uno.*	23	# ..\%__SRC%\bin\c_uno.* %_DEST%\bin%_EXT%\c_uno.*
24	# ..\%__SRC%\lib\libc_uno.* %_DEST%\lib%_EXT%\libc_uno.*	24	# ..\%__SRC%\lib\libc_uno.* %_DEST%\lib%_EXT%\libc_uno.*
25	..\%__SRC%\bin\msci_uno.* %_DEST%\bin%_EXT%\msci_uno.*	25	..\%__SRC%\bin\msci_uno.* %_DEST%\bin%_EXT%\msci_uno.*
		26	..\%__SRC%\bin\gcc3_uno.* %_DEST%\bin%_EXT%\gcc3_uno.*
26	..\%__SRC%\lib\libgcc2_uno.* %_DEST%\lib%_EXT%\libgcc2_uno.*	27	..\%__SRC%\lib\libgcc2_uno.* %_DEST%\lib%_EXT%\libgcc2_uno.*
27	..\%__SRC%\lib\libgcc3_uno.* %_DEST%\lib%_EXT%\libgcc3_uno.*	28	..\%__SRC%\lib\libgcc3_uno.* %_DEST%\lib%_EXT%\libgcc3_uno.*
28	..\%__SRC%\lib\libsunpro5_uno.* %_DEST%\lib%_EXT%\libsunpro5_uno.*	29	..\%__SRC%\lib\libsunpro5_uno.* %_DEST%\lib%_EXT%\libsunpro5_uno.*




	// return
	typelib_TypeDescription * pReturnTypeDescr = 0;
	if (pReturnTypeRef)
    {
		TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef );
    }

	void * pUnoReturn = 0;
	void * pCppReturn = 0; // complex return ptr: if != 0 && != pUnoReturn, reconversion need

	if (pReturnTypeDescr)
	{
		if (cppu_isSimpleType( pReturnTypeDescr ))

		{
			pCppReturn = *(void **)pCppStack;
			pCppStack += sizeof(void *);

			pUnoReturn = (cppu_relatesToInterface( pReturnTypeDescr )
						  ? alloca( pReturnTypeDescr->nSize )
						  : pCppReturn); // direct way

	sal_Int32 * pTempIndizes = (sal_Int32 *)(pUnoArgs + (2 * nParams));
	// type descriptions for reconversions
	typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription **)(pUnoArgs + (3 * nParams));

	sal_Int32 nTempIndizes = 0;

	for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos )
	{
		const typelib_MethodParameter & rParam = pParams[nPos];

			// is in/inout
			else if (cppu_relatesToInterface( pParamTypeDescr ))
			{
				::uno_copyAndConvertData(
                    pUnoArgs[nPos] = alloca( pParamTypeDescr->nSize ),
                    *(void **)pCppStack, pParamTypeDescr,
                    &pThis->pBridge->aCpp2Uno );
				pTempIndizes[nTempIndizes] = nPos; // has to be reconverted
				// will be released at reconversion
				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;

		}
		pCppStack += sizeof(sal_Int32); // standard parameter length
	}

	// ExceptionHolder
	uno_Any aUnoExc; // Any will be constructed by callee
	uno_Any * pUnoExc = &aUnoExc;

	// invoke uno dispatch call
	(*pThis->pUnoI->pDispatcher)( pThis->pUnoI, pMemberTypeDescr, pUnoReturn, pUnoArgs, &pUnoExc );

	// in case an exception occured...
	if (pUnoExc)
	{
		// destruct temporary in/inout params
		while (nTempIndizes--)
		{
			sal_Int32 nIndex = pTempIndizes[nTempIndizes];

			if (pParams[nIndex].bIn) // is in/inout => was constructed
            {
				::uno_destructData( pUnoArgs[nIndex], ppTempParamTypeDescr[nTempIndizes], 0 );
            }
			TYPELIB_DANGER_RELEASE( ppTempParamTypeDescr[nTempIndizes] );
		}
		if (pReturnTypeDescr)
        {
			TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
        }

		raiseException( &aUnoExc, &pThis->pBridge->aUno2Cpp ); // has to destruct the any
		// is here for dummy
		return typelib_TypeClass_VOID;

	else // else no exception occured...
	{
		// temporary params
		while (nTempIndizes--)
		{
			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
			typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes];

			if (pParams[nIndex].bOut) // inout/out
			{
				// convert and assign
				::uno_destructData(
                    pCppArgs[nIndex], pParamTypeDescr, cpp_release );
				::uno_copyAndConvertData(
                    pCppArgs[nIndex], pUnoArgs[nIndex], pParamTypeDescr,
                    &pThis->pBridge->aUno2Cpp );
			}
			// destroy temp uno param
			::uno_destructData( pUnoArgs[nIndex], pParamTypeDescr, 0 );

			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
		}
		// return

		{
			if (pUnoReturn != pCppReturn) // needs reconversion
			{
				::uno_copyAndConvertData(
                    pCppReturn, pUnoReturn, pReturnTypeDescr,
                    &pThis->pBridge->aUno2Cpp );
				// destroy temp uno return
				::uno_destructData(
                    pUnoReturn, pReturnTypeDescr, 0 );
			}
			// complex return ptr is set to eax
			*(void **)pRegisterReturn = pCppReturn;

	sal_Int64 * pRegisterReturn /* space for register return */ )
{
	OSL_ENSURE( sizeof(sal_Int32)==sizeof(void *), "### unexpected!" );

	// pCallStack: ret adr, [ret *], this, params
	// _this_ ptr is patched cppu_XInterfaceProxy object
	cppu_cppInterfaceProxy * pThis = NULL;
	if( nVtableCall & 0x80000000 )
	{
		nVtableCall &= 0x7fffffff;
		pThis = static_cast< cppu_cppInterfaceProxy * >(
		reinterpret_cast< XInterface * >( pCallStack[2] ) );
	}
	else
    {
		pThis = static_cast< cppu_cppInterfaceProxy * >(
		reinterpret_cast< XInterface * >( pCallStack[1] ) );
    }
    
	typelib_InterfaceTypeDescription * pTypeDescr = pThis->pTypeDescr;
	
	OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
	if (nVtableCall >= pTypeDescr->nMapFunctionIndexToMemberIndex)
	{
		throw RuntimeException( OUString( RTL_CONSTASCII_USTRINGPARAM("illegal vtable index!") ),
								(XInterface *)pThis );
            (XInterface *)pCppI );
	}

	// determine called method
	OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
	sal_Int32 nMemberPos = pTypeDescr->pMapFunctionIndexToMemberIndex[nVtableCall];
	OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### illegal member index!" );

	TypeDescription aMemberDescr( pTypeDescr->ppAllMembers[nMemberPos] );

	typelib_TypeClass eRet;
	switch (aMemberDescr.get()->eTypeClass)
	{

		{
			// is GET method
			eRet = cpp2uno_call(
				pThis, aMemberDescr.get(),
				((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef,
				0, 0, // no params
				pCallStack, pRegisterReturn );

				((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef;
			aParam.bIn		= sal_True;
			aParam.bOut		= sal_False;

			eRet = cpp2uno_call(
				pThis, aMemberDescr.get(),
				0, // indicates void return
				1, &aParam,
				pCallStack, pRegisterReturn );

		// is METHOD
		switch (nVtableCall)
		{
			// standard XInterface vtable calls
		case 1: // acquire()
			pThis->acquireProxy(); // non virtual call!
			eRet = typelib_TypeClass_VOID;
			break;
		case 2: // release()
			pThis->releaseProxy(); // non virtual call!
			eRet = typelib_TypeClass_VOID;
			break;
		case 0: // queryInterface() opt

			typelib_TypeDescription * pTD = 0;
			TYPELIB_DANGER_GET( &pTD, reinterpret_cast< Type * >( pCallStack[3] )->getTypeLibType() );
			if (pTD)
            {
                XInterface * pInterface = 0;
                (*pThis->pBridge->pCppEnv->getRegisteredInterface)(
                    pThis->pBridge->pCppEnv,
                    (void **)&pInterface, pThis->oid.pData, (typelib_InterfaceTypeDescription *)pTD );

                if (pInterface)
                {
                    ::uno_any_construct(

		} // else perform queryInterface()
		default:
			eRet = cpp2uno_call(
				pThis, aMemberDescr.get(),
				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pReturnTypeRef,
				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->nParams,
				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pParams,

	default:
	{
		throw RuntimeException(
			OUString( RTL_CONSTASCII_USTRINGPARAM("no member description found!") ),
			(XInterface *)pThis );
		// is here for dummy
		eRet = typelib_TypeClass_VOID;
	}


//==================================================================================================
void SAL_CALL cppu_cppInterfaceProxy_patchVtable(
	XInterface * pThis, typelib_InterfaceTypeDescription * pTypeDescr ) throw ()
{
	static MediateClassData * s_pMediateClassData = 0;
	if (! s_pMediateClassData)

#endif
		}
	}
	*(void const **)pThis = s_pMediateClassData->get_vtable( pTypeDescr );
}

}

sal_Bool SAL_CALL component_canUnload( TimeValue * pTime )
	SAL_THROW_EXTERN_C()
{
	return CPPU_CURRENT_NAMESPACE::g_moduleCount.canUnload( &CPPU_CURRENT_NAMESPACE::g_moduleCount, pTime );
        &CPPU_CURRENT_NAMESPACE::g_moduleCount, pTime );
}
//##################################################################################################
void SAL_CALL uno_initEnvironment( uno_Environment * pCppEnv )
	SAL_THROW_EXTERN_C()
{
	CPPU_CURRENT_NAMESPACE::cppu_cppenv_initEnvironment( pCppEnv );
        pCppEnv );
}
//##################################################################################################
void SAL_CALL uno_ext_getMapping(
	uno_Mapping ** ppMapping, uno_Environment * pFrom, uno_Environment * pTo )
	SAL_THROW_EXTERN_C()
{
	CPPU_CURRENT_NAMESPACE::cppu_ext_getMapping( ppMapping, pFrom, pTo );
        ppMapping, pFrom, pTo );
}
}




 ************************************************************************/

#include <stdio.h>
#include <dlfcn.h>
#include <cxxabi.h>
#include <hash_map>


    OSL_ASSERT( 'N' == *p );
    ++p; // skip N

    while ('E' != *p && buf.getLength() < 64)
    {
        // read chars count
        long n = (*p++ - '0');

        }
        buf.appendAscii( p, n );
        p += n;
        if ('E' != *p && buf.getLength() < 64)
            buf.append( (sal_Unicode)'.' );
    }


	t_rtti_map m_rttis;
    t_rtti_map m_generatedRttis;

    void * m_hApp;

public:
    RTTI() SAL_THROW( () );
    ~RTTI() SAL_THROW( () );

};
//__________________________________________________________________________________________________
RTTI::RTTI() SAL_THROW( () )
    : m_hApp( dlopen( 0, RTLD_LAZY ) )
{
}
//__________________________________________________________________________________________________
RTTI::~RTTI() SAL_THROW( () )
{
    dlclose( m_hApp );
}

//__________________________________________________________________________________________________

        buf.append( 'E' );

        OString symName( buf.makeStringAndClear() );
        rtti = (type_info *)dlsym( m_hApp, symName.getStr() );

        if (rtti)
        {
            pair< t_rtti_map::iterator, bool > insertion(
                m_rttis.insert( t_rtti_map::value_type( unoName, rtti ) ) );
            OSL_ENSURE( insertion.second, "### inserting new rtti failed?!" );
        }
        else
        {
            // try to lookup the symbol in the generated rtti map
            t_rtti_map::const_iterator iFind( m_generatedRttis.find( unoName ) );
            if (iFind == m_generatedRttis.end())

                rtti = iFind->second;
            }
        }
    }
    else
    {
        rtti = iFind->second;
    }

    return rtti;
}

    fprintf( stderr, "> uno exception occured: %s\n", cstr.getStr() );
#endif
    void * pCppExc;
    const type_info * rtti;

    {
    // construct cpp exception object

    }
    }

	__cxa_throw( pCppExc, const_cast<type_info *>(rtti), deleteException );
}

//==================================================================================================




	sal_Int32 nParams, typelib_MethodParameter * pParams,
	void * pUnoReturn, void * pUnoArgs[], uno_Any ** ppUnoExc )
{
	// max space for: [complex ret ptr], values|ptr ...
	char * pCppStack		= (char *)alloca( sizeof(sal_Int32) + ((nParams+2) * sizeof(sal_Int64)) );
	char * pCppStackStart	= pCppStack;
  	char * pCppStackStart	= pCppStack;
	
	// return
	typelib_TypeDescription * pReturnTypeDescr = 0;

	pCppStack += sizeof( void* );

	// stack space

	OSL_ENSURE( sizeof(void *) == sizeof(sal_Int32), "### unexpected size!" );
	// args
	void ** pCppArgs  = (void **)alloca( 3 * sizeof(void *) * nParams );

		
		if (!rParam.bOut && cppu_isSimpleType( pParamTypeDescr ))
		{
			::uno_copyAndConvertData(
                pCppArgs[nPos] = pCppStack, pUnoArgs[nPos], pParamTypeDescr,
                &pThis->pBridge->aUno2Cpp );
			
			switch (pParamTypeDescr->eTypeClass)
			{

			if (! rParam.bIn) // is pure out
			{
				// cpp out is constructed mem, uno out is not!
				::uno_constructData(
					*(void **)pCppStack = pCppArgs[nPos] = alloca( pParamTypeDescr->nSize ),
					pParamTypeDescr );
				pTempIndizes[nTempIndizes] = nPos; // default constructed for cpp call

			// is in/inout
			else if (cppu_relatesToInterface( pParamTypeDescr ))
			{
				::uno_copyAndConvertData(
					*(void **)pCppStack = pCppArgs[nPos] = alloca( pParamTypeDescr->nSize ),
					pUnoArgs[nPos], pParamTypeDescr,
					&pThis->pBridge->aUno2Cpp );
				
				pTempIndizes[nTempIndizes] = nPos; // has to be reconverted
				// will be released at reconversion


	try
	{
			OSL_ENSURE( !( (pCppStack - pCppStackStart ) & 3), "UNALIGNED STACK !!! (Please DO panic)" );
			callVirtualMethod(
				pThis->pCppI, nVtableCall,
				pCppReturn, pReturnTypeDescr->eTypeClass,
				(sal_Int32 *)pCppStackStart, (pCppStack - pCppStackStart) / sizeof(sal_Int32) );
		// NO exception occured...
		*ppUnoExc = 0;
		
		// reconvert temporary params
		for ( ; nTempIndizes--; )
		{
			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
			typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes];
			
			// NO exception occured...
			*ppUnoExc = 0;
			
			// reconvert temporary params
			while (nTempIndizes--)
			{
				sal_Int32 nIndex = pTempIndizes[nTempIndizes];
				typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes];
				
				if (pParams[nIndex].bIn)
				{
					if (pParams[nIndex].bOut) // inout
					{
						::uno_destructData(
                            pUnoArgs[nIndex], pParamTypeDescr, 0 ); // destroy uno value
						::uno_copyAndConvertData(
                            pUnoArgs[nIndex], pCppArgs[nIndex], pParamTypeDescr,
                            &pThis->pBridge->aCpp2Uno );
					}
				}
				else // pure out
				{
					::uno_copyAndConvertData(
                        pUnoArgs[nIndex], pCppArgs[nIndex], pParamTypeDescr,
                        &pThis->pBridge->aCpp2Uno );
				}
				// destroy temp cpp param => cpp: every param was constructed
				::uno_destructData(
                    pCppArgs[nIndex], pParamTypeDescr, cpp_release );
				
				TYPELIB_DANGER_RELEASE( pParamTypeDescr );
			}
			// return value
			if (pCppReturn && pUnoReturn != pCppReturn)
			{
				::uno_copyAndConvertData(
                    pUnoReturn, pCppReturn, pReturnTypeDescr,
                    &pThis->pBridge->aCpp2Uno );
				::uno_destructData(
                    pCppReturn, pReturnTypeDescr, cpp_release );
			}
			// destroy temp cpp param => cpp: every param was constructed
			uno_destructData( pCppArgs[nIndex], pParamTypeDescr, cpp_release );
			
			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
		}
		// return value
		if (pCppReturn && pUnoReturn != pCppReturn)
		{
			uno_copyAndConvertData( pUnoReturn, pCppReturn, pReturnTypeDescr,
									&pThis->pBridge->aCpp2Uno );
			uno_destructData( pCppReturn, pReturnTypeDescr, cpp_release );
		}
	}
 	catch (...)
 	{
  		// fill uno exception
		fillUnoException( __cxa_get_globals()->caughtExceptions, *ppUnoExc, &pThis->pBridge->aCpp2Uno );
        
		// temporary params
		for ( ; nTempIndizes--; )
		{
			// temporary params
			while (nTempIndizes--)
			{
				sal_Int32 nIndex = pTempIndizes[nTempIndizes];
				// destroy temp cpp param => cpp: every param was constructed
				::uno_destructData(
                    pCppArgs[nIndex], ppTempParamTypeDescr[nTempIndizes], cpp_release );
				TYPELIB_DANGER_RELEASE( ppTempParamTypeDescr[nTempIndizes] );
			}
		}
		// return type
		if (pReturnTypeDescr)
        {
			TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
        }
	}
}


//==================================================================================================
void SAL_CALL cppu_unoInterfaceProxy_dispatch(
	uno_Interface * pUnoI, const typelib_TypeDescription * pMemberDescr,
	void * pReturn, void * pArgs[], uno_Any ** ppException ) throw ()
{
	// is my surrogate
	cppu_unoInterfaceProxy * pThis = static_cast< cppu_unoInterfaceProxy * >( pUnoI );
	typelib_InterfaceTypeDescription * pTypeDescr = pThis->pTypeDescr;
	
	switch (pMemberDescr->eTypeClass)

				((typelib_InterfaceAttributeTypeDescription *)pMemberDescr)->pAttributeTypeRef;
			aParam.bIn		= sal_True;
			aParam.bOut		= sal_False;
			
			typelib_TypeDescriptionReference * pReturnTypeRef = 0;
			OUString aVoidName( RTL_CONSTASCII_USTRINGPARAM("void") );
			typelib_typedescriptionreference_new(

			typelib_TypeDescription * pTD = 0;
			TYPELIB_DANGER_GET( &pTD, reinterpret_cast< Type * >( pArgs[0] )->getTypeLibType() );
			if (pTD)
            {
                uno_Interface * pInterface = 0;
                (*pThis->pBridge->pUnoEnv->getRegisteredInterface)(
                    pThis->pBridge->pUnoEnv,

Lines 1-6 Link Here

(-)oo_1.1.1_src/comphelper/prj/d.lst.orig (+1 lines)
1	..\%__SRC%\bin\.dll %_DEST%\bin%_EXT%\.dll	1	..\%__SRC%\bin\.dll %_DEST%\bin%_EXT%\.dll
2	..\%__SRC%\lib\.lib %_DEST%\lib%_EXT%\.lib	2	..\%__SRC%\lib\.lib %_DEST%\lib%_EXT%\.lib
3	..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%	3	..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%
		4	..\%__SRC%\lib\lib*.a %_DEST%\lib%_EXT%
4	..\%__SRC%\lib\.dylib %_DEST%\lib%_EXT%\.dylib	5	..\%__SRC%\lib\.dylib %_DEST%\lib%_EXT%\.dylib
5	..\%__SRC%\lib\.sl %_DEST%\lib%_EXT%\.sl	6	..\%__SRC%\lib\.sl %_DEST%\lib%_EXT%\.sl
6	..\%__SRC%\bin\.bin %_DEST%\bin%_EXT%\.bin	7	..\%__SRC%\bin\.bin %_DEST%\bin%_EXT%\.bin

Lines 272-278 Link Here

(-)oo_1.1.1_src/config_office/configure.orig (-2 / +31 lines)
272	PACKAGE_STRING=	272	PACKAGE_STRING=
273	PACKAGE_BUGREPORT=	273	PACKAGE_BUGREPORT=
274		274
275	ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS AWK SED OSVERSION PTHREAD_CFLAGS PTHREAD_LIBS ENABLE_CRASHDUMP VC_STANDARD ENABLE_DEBUG ENABLE_SYMBOLS ENABLE_RPATH USE_SHELL CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT COMPATH USE_GCC3 GNUMAKE _cc MSPDB_PATH COMEX MIDL_PATH WDEVENV_PATH CPP EGREP CXX CXXFLAGS ac_ct_CXX GXX_INCLUDE_PATH EXCEPTIONS CXXCPP STLPORT4 SOLAR_JAVA JAVAC JAVA XSLTPROC JAVA_HOME JDK XMKMF PERL TCSH DMAKE BUILD_DMAKE SYSTEM_ZLIB PKG_CONFIG GTK_CFLAGS GTK_LIBS X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS XINC XLIB PSDK_HOME BISON FLEX PATCH GNUPATCH GNUCP CYGWIN ML_EXE ASM_HOME ZIP ZIP_HOME LIBART_CFLAGS LIBART_LIBS WITH_LIBART WITH_GPC LIBSN_CFLAGS LIBSN_LIBS WITH_LIBSN WITH_MOZILLA WITH_FONTS SCPDEFS ANT ANT_HOME UPD SOURCEVERSION LOCAL_SOLENV LOCAL_SOLVER WITH_LANG WITH_DICT ENABLE_STATIC_GTK GCC_HOME WITH_MINGWIN LIBOBJS LTLIBOBJS'	275	ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS AWK SED OSVERSION PTHREAD_CFLAGS PTHREAD_LIBS ENABLE_CRASHDUMP VC_STANDARD ENABLE_DEBUG ENABLE_SYMBOLS ENABLE_RPATH USE_SHELL CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT COMPATH USE_GCC3 GNUMAKE _cc MSPDB_PATH COMEX MIDL_PATH WDEVENV_PATH CPP EGREP CXX CXXFLAGS ac_ct_CXX GXX_INCLUDE_PATH EXCEPTIONS CXXCPP STLPORT4 SOLAR_JAVA JAVAC JAVA XSLTPROC JAVA_HOME JDK XMKMF PERL TCSH DMAKE BUILD_DMAKE SYSTEM_ZLIB PKG_CONFIG GTK_CFLAGS GTK_LIBS X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS XINC XLIB PSDK_HOME BISON FLEX PATCH GNUPATCH GNUCP CYGWIN ML_EXE ASM_HOME ZIP ZIP_HOME LIBART_CFLAGS LIBART_LIBS WITH_LIBART WITH_GPC LIBSN_CFLAGS LIBSN_LIBS WITH_LIBSN WITH_MOZILLA WITH_FONTS SCPDEFS ANT ANT_HOME UPD SOURCEVERSION LOCAL_SOLENV LOCAL_SOLVER WITH_LANG WITH_DICT ENABLE_STATIC_GTK GCC_HOME WITH_MINGWIN LIBOBJS LTLIBOBJS LIB_INCLUDE_PATH'
276	ac_subst_files=''	276	ac_subst_files=''
277		277
278	# Initialize some variables set by options.	278	# Initialize some variables set by options.
Lines 3547-3553 Link Here
3547	else	3547	else
3548	echo "$as_me:$LINENO: checking the Mingwin32 C++ Compiler" >&5	3548	echo "$as_me:$LINENO: checking the Mingwin32 C++ Compiler" >&5
3549	echo $ECHO_N "checking the Mingwin32 C++ Compiler... $ECHO_C" >&6	3549	echo $ECHO_N "checking the Mingwin32 C++ Compiler... $ECHO_C" >&6
3550	if test `$CC -dumpmachine \| $AWK -F- '{ print $3 }'` = "mingw32"; then	3550	if test `$CC -dumpmachine \| $AWK -F- '{ print $1 }'` = "mingw32"; then
3551	echo "$as_me:$LINENO: result: found." >&5	3551	echo "$as_me:$LINENO: result: found." >&5
3552	echo "${ECHO_T}found." >&6	3552	echo "${ECHO_T}found." >&6
3553	else	3553	else
Lines 4491-4496 Link Here
4491	fi	4491	fi
4492	GXX_INCLUDE_PATH="$with_gxx_include_path"	4492	GXX_INCLUDE_PATH="$with_gxx_include_path"
4493		4493
		4494	if test "$_os" != "WINNT" -o "$WITH_MINGWIN" = "yes"; then
		4495	_lib_include_path=`echo "#include <stddef.h>" \| $CC -E - \| $SED -n '/.1"$.$\/stddef.h"./s//\1/p' \| sort -u \| xargs echo`
		4496	else
		4497	_lib_include_path="NO_LIB_INCLUDE"
		4498	fi
		4499	LIB_INCLUDE_PATH="$_lib_include_path"
4494		4500
4495	if test "$_os" = "SunOS"; then	4501	if test "$_os" = "SunOS"; then
4496	if test "$CC" = "cc"; then	4502	if test "$CC" = "cc"; then
Lines 8241-8246 Link Here
8241	fi	8247	fi
8242		8248
8243		8249
		8250	if test "$_os" = "WINNT" -a "$COMEX" = "10"; then
		8251	echo "$as_me:$LINENO: checking msvcp71.dll" >&5
		8252	echo $ECHO_N "checking msvcp71.dll... $ECHO_C" >&6
		8253	if test -f ../external/msvcp71/msvcp71.dll; then
		8254	echo "$as_me:$LINENO: result: found" >&5
		8255	echo "${ECHO_T}found" >&6
		8256	else
		8257	{ { echo "$as_me:$LINENO: error: The msvcp71.dll is missing in external/msvcp71/.
		8258	The dll is part of the .NET installation and can be found in a directory
		8259	similar to:
		8260	\"c:\\Program Files\\Microsoft Visual Studio .NET\\Visual C++ .NET Professional - English\\\"
		8261	Please copy the file to external/msvcp71." >&5
		8262	echo "$as_me: error: The msvcp71.dll is missing in external/msvcp71/.
		8263	The dll is part of the .NET installation and can be found in a directory
		8264	similar to:
		8265	\"c:\\Program Files\\Microsoft Visual Studio .NET\\Visual C++ .NET Professional - English\\\"
		8266	Please copy the file to external/msvcp71." >&2;}
		8267	{ (exit 1); exit 1; }; }
		8268	fi
		8269	fi
		8270
		8271
8244	WITH_GPC=NO	8272	WITH_GPC=NO
8245	WITH_LIBART=NO	8273	WITH_LIBART=NO
8246		8274
Lines 9453-9458 Link Here
9453	s,@WITH_MINGWIN@,$WITH_MINGWIN,;t t	9481	s,@WITH_MINGWIN@,$WITH_MINGWIN,;t t
9454	s,@LIBOBJS@,$LIBOBJS,;t t	9482	s,@LIBOBJS@,$LIBOBJS,;t t
9455	s,@LTLIBOBJS@,$LTLIBOBJS,;t t	9483	s,@LTLIBOBJS@,$LTLIBOBJS,;t t
		9484	s,@LIB_INCLUDE_PATH@,$LIB_INCLUDE_PATH,;t t
9456	CEOF	9485	CEOF
9457		9486
9458	_ACEOF	9487	_ACEOF

Lines 42-48 Link Here

(-)oo_1.1.1_src/config_office/set_soenv.in.orig (-15 / +72 lines)
42	my ( $outfile, $outfile_sh, $outfile_bat, $bootfile, $newline, $comment, $comment4nt, $compiler, $unsetenv, $setenv, $unset, $set, $ds, $ps, $cur_dir,	42	my ( $outfile, $outfile_sh, $outfile_bat, $bootfile, $newline, $comment, $comment4nt, $compiler, $unsetenv, $setenv, $unset, $set, $ds, $ps, $cur_dir,
43	$par_dir, $I, $L, $D, $buildenv, $answer, $tmp, $Solaris, $Linux, $FreeBSD, $NetBSD, $Tru64, $Irix, $Irix64, $Winnt, $Macosx, $MINGW,	43	$par_dir, $I, $L, $D, $buildenv, $answer, $tmp, $Solaris, $Linux, $FreeBSD, $NetBSD, $Tru64, $Irix, $Irix64, $Winnt, $Macosx, $MINGW,
44	$platform, $cygwinver, $machine_type, $empty, $no_ant, $no_stl, $no_gcc_include,	44	$platform, $cygwinver, $machine_type, $empty, $no_ant, $no_stl, $no_gcc_include,
45	$no_gxx_include, $warnfile, $Warning, $result, $unsetvars, $unsetvarssh, $unsetvarsbat, $exportvars, $win_format_var, $perl_os);	45	$no_gxx_include, $warnfile, $Warning, $result, $unsetvars, $unsetvarssh, $unsetvarsbat, $exportvars, $win_format_var, $perl_os, $comver, $mingw_format_var, %lib_include_paths, $lib_include_path);
46	#	46	#
47	#-------------------------------------------------	47	#-------------------------------------------------
48	# IIb. Declaring environment values (constants).	48	# IIb. Declaring environment values (constants).
Lines 88-94 Link Here
88	$COMP_ENV, $IENV, $ILIB, $WIN_INCLUDE, $JAVAHOME, $WIN_LIB, $PSDK_HOME, $USE_NEW_SDK, $NO_HIDS,	88	$COMP_ENV, $IENV, $ILIB, $WIN_INCLUDE, $JAVAHOME, $WIN_LIB, $PSDK_HOME, $USE_NEW_SDK, $NO_HIDS,
89	$TEMP, $COMMON_BUILD_TOOLS, $WIN_GREP, $WIN_FIND, $WIN_LS,	89	$TEMP, $COMMON_BUILD_TOOLS, $WIN_GREP, $WIN_FIND, $WIN_LS,
90	$WIN_GNUCOPY, $WIN_TOUCH, $STLPORT4, $USE_GCC3, $ENABLE_DEBUG, $ENABLE_STATIC_GTK,	90	$WIN_GNUCOPY, $WIN_TOUCH, $STLPORT4, $USE_GCC3, $ENABLE_DEBUG, $ENABLE_STATIC_GTK,
91	$PYTHONPATH, $PYTHONHOME );	91	$PYTHONPATH, $PYTHONHOME, $GXX_INCLUDE_PATH);
92	#	92	#
93	#-------------------------------------------	93	#-------------------------------------------
94	# IId. Declaring the aliases.	94	# IId. Declaring the aliases.
Lines 138-143 Link Here
138	$ENABLE_STATIC_GTK = '@ENABLE_STATIC_GTK@'; # Use static gtk libraries	138	$ENABLE_STATIC_GTK = '@ENABLE_STATIC_GTK@'; # Use static gtk libraries
139	$WRAPCMD = ""; # Wrapper (only for winnt)	139	$WRAPCMD = ""; # Wrapper (only for winnt)
140	$GLIBC = ""; # Whether the platform uses glibc	140	$GLIBC = ""; # Whether the platform uses glibc
		141	$GXX_INCLUDE_PATH = '@GXX_INCLUDE_PATH@';
		142	if ( $MINGW eq "yes" )
		143	{ chomp( $GXX_INCLUDE_PATH = qx{cygpath "$GXX_INCLUDE_PATH"} ); }
141		144
142	#	145	#
143	#--------------------------------------------------------------------	146	#--------------------------------------------------------------------
Lines 556-563 Link Here
556	{ # At the moment this implies the use of tcsh	559	{ # At the moment this implies the use of tcsh
557	print "Setting Windows NT cygwin MinGW specific values... ";	560	print "Setting Windows NT cygwin MinGW specific values... ";
558	$WRAPCMD = "guw.pl";	561	$WRAPCMD = "guw.pl";
		562	$CC = $WRAPCMD." ".$CC;
		563	$CXX = $WRAPCMD." ".$CXX;
559	$outfile = "winmingw.set";	564	$outfile = "winmingw.set";
560	$COM = "GCC";	565	$COM = "GCC";
		566	# COMPATH for MSC is differently used
		567	$COMPATH =~ s/\/bin$//i;
561	$CVER = "C300";	568	$CVER = "C300";
562	$DLLSUFFIX = "gi";	569	$DLLSUFFIX = "gi";
563	$OUTPATH = "wntgcci";	570	$OUTPATH = "wntgcci";
Lines 1010-1020 Link Here
1010	elsif ($platform eq "$Winnt")	1017	elsif ($platform eq "$Winnt")
1011	{ $SOLARINCLUDES = $I.$SOLARVER.$INC.	1018	{ $SOLARINCLUDES = $I.$SOLARVER.$INC.
1012	$I.$SOLARENV.$ds.$INPATH.$INC.	1019	$I.$SOLARENV.$ds.$INPATH.$INC.
1013	$I.$SOLARENV.$INC.	1020	$I.$SOLARENV.$INC;
1014	$I."'".$PSDK_HOME.$INCLUDE."'";
1015	# Mingw is different	1021	# Mingw is different
1016	if ( $COM eq "MSC" )	1022	if ( $COM eq "MSC" )
		1023	{ $SOLARINCLUDES .= $I."'".$PSDK_HOME.$INCLUDE."'".
		1024	$I.'$COMPATH'.$ds."include";
		1025	}
		1026	else
1017	{ $SOLARINCLUDES .= $I.'$COMPATH'.$ds."include";	1027	{ $SOLARINCLUDES .= $I.'$COMPATH'.$ds."include";
		1028	%lib_include_paths = split( / /, "@LIB_INCLUDE_PATH@" );
		1029	foreach $lib_include_path (%lib_include_paths)
		1030	{ chomp( $lib_include_path = qx{cygpath $lib_include_path} );
		1031	if ( $lib_include_path ne $COMPATH.$ds."include" )
		1032	{
		1033	$SOLARINCLUDES .= $I.$lib_include_path;
		1034	}
		1035	}
		1036	$SOLARINCLUDES .= $I.$GXX_INCLUDE_PATH.$I.$GXX_INCLUDE_PATH.$ds."mingw32".
		1037	$I."'".$PSDK_HOME.$INCLUDE."'";
1018	}	1038	}
1019	}	1039	}
1020	elsif ($platform eq "$Macosx")	1040	elsif ($platform eq "$Macosx")
Lines 1036-1055 Link Here
1036	$IENV = $cur_dir.	1056	$IENV = $cur_dir.
1037	$ps.$SOLARVER.$ds.$UPD.$ds.$INPATH.$INC.	1057	$ps.$SOLARVER.$ds.$UPD.$ds.$INPATH.$INC.
1038	$ps.$SOLARENV.$ds.$OUTPATH.$INC.	1058	$ps.$SOLARENV.$ds.$OUTPATH.$INC.
1039	$ps.$SOLARENV.$INC.	1059	$ps.$SOLARENV.$INC;
1040	$ps.'$PSDK_HOME'.$INCLUDE;
1041	# Mingw is different	1060	# Mingw is different
1042	if ( $COM eq "MSC" )	1061	if ( $COM eq "MSC" )
		1062	{ $IENV .= $ps.'$PSDK_HOME'.$INCLUDE.
		1063	$ps.'$COMPATH'.$INCLUDE;
		1064	}
		1065	else
1043	{ $IENV .= $ps.'$COMPATH'.$INCLUDE;	1066	{ $IENV .= $ps.'$COMPATH'.$INCLUDE;
		1067	%lib_include_paths = split( / /, "@LIB_INCLUDE_PATH@" );
		1068	foreach $lib_include_path (%lib_include_paths)
		1069	{ chomp( $lib_include_path = qx{cygpath $lib_include_path} );
		1070	if ( $lib_include_path ne $COMPATH.$ds."include" )
		1071	{
		1072	$IENV .= $ps.$lib_include_path;
		1073	}
		1074	}
		1075	$IENV .= $ps.$GXX_INCLUDE_PATH.$ps.$GXX_INCLUDE_PATH.$ds."mingw32".
		1076	$ps.'$PSDK_HOME'.$INCLUDE;
1044	}	1077	}
1045	$WIN_LIB = $cur_dir.$ps_STLPORT_LIB.$ps.	1078	$WIN_LIB = $cur_dir.$ps_STLPORT_LIB.$ps.
1046	$ps.$SOLARVER.$ds.$UPD.$LIB.	1079	$ps.$SOLARVER.$ds.$UPD.$LIB.
1047	$ps.$SOLARVER.$ds.$UPD.$ds.$INPATH.$LIB.	1080	$ps.$SOLARVER.$ds.$UPD.$ds.$INPATH.$LIB.
1048	$ps.$SOLARENV.$ds.$OUTPATH.$LIB.	1081	$ps.$SOLARENV.$ds.$OUTPATH.$LIB.
1049	$ps.$JAVA_HOME.$LIB.	1082	$ps.$JAVA_HOME.$LIB;
1050	$ps.'$PSDK_HOME'.$LIB;
1051	# Mingw is different	1083	# Mingw is different
1052	if ( $COM eq "MSC" )	1084	if ( $COM eq "MSC" )
		1085	{ $WIN_LIB .= $ps.'$PSDK_HOME'.$LIB.
		1086	$ps.'$COMPATH'.$LIB;
		1087	}
		1088	else
1053	{ $WIN_LIB .= $ps.'$COMPATH'.$LIB;	1089	{ $WIN_LIB .= $ps.'$COMPATH'.$LIB;
1054	}	1090	}
1055	if ( $JAVA_HOME ne "" )	1091	if ( $JAVA_HOME ne "" )
Lines 1129-1135 Link Here
1129	if ( $COM eq "MSC" ) {	1165	if ( $COM eq "MSC" ) {
1130	$PATH .= $ps.'$COMPATH'.$BIN;	1166	$PATH .= $ps.'$COMPATH'.$BIN;
1131	} else {	1167	} else {
1132	$PATH .= $ps.'$COMPATH';	1168	$PATH .= $ps.'$COMPATH'.$BIN;
1133	}	1169	}
1134	}	1170	}
1135	if ( $COM eq "MSC" ) {	1171	if ( $COM eq "MSC" ) {
Lines 1329-1339 Link Here
1329	elsif ($platform eq "$Winnt")	1365	elsif ($platform eq "$Winnt")
1330	{ $SOLARINC .= $STLPORT_stlport.	1366	{ $SOLARINC .= $STLPORT_stlport.
1331	$I.'$JAVA_HOME'.$ds."include".$ds."win32".	1367	$I.'$JAVA_HOME'.$ds."include".$ds."win32".
1332	$I.'$JAVA_HOME'.$ds."include".	1368	$I.'$JAVA_HOME'.$ds."include";
1333	$I."'".$PSDK_HOME.$INCLUDE."'";
1334	# Mingw is different	1369	# Mingw is different
1335	if ( $COM eq "MSC" )	1370	if ( $COM eq "MSC" )
		1371	{ $SOLARINC .= $I."'".$PSDK_HOME.$INCLUDE."'".
		1372	$I.'$COMPATH'.$ds."include";
		1373	}
		1374	else
1336	{ $SOLARINC .= $I.'$COMPATH'.$ds."include";	1375	{ $SOLARINC .= $I.'$COMPATH'.$ds."include";
		1376	%lib_include_paths = split( / /, "@LIB_INCLUDE_PATH@" );
		1377	foreach $lib_include_path (%lib_include_paths)
		1378	{ chomp( $lib_include_path = qx{cygpath $lib_include_path} );
		1379	if ( $lib_include_path ne $COMPATH.$ds."include" )
		1380	{
		1381	$SOLARINC .= $I.$lib_include_path;
		1382	}
		1383	}
		1384	$SOLARINC .= $I.$GXX_INCLUDE_PATH.$I.$GXX_INCLUDE_PATH.$ds."mingw32".
		1385	$I."'".$PSDK_HOME.$INCLUDE."'";
1337	}	1386	}
1338	}	1387	}
1339	elsif ($platform eq "$Macosx")	1388	elsif ($platform eq "$Macosx")
Lines 1782-1788 Link Here
1782	}	1831	}
1783	ToFile( "SYSTEM_ZLIB", "@SYSTEM_ZLIB@", "e" );	1832	ToFile( "SYSTEM_ZLIB", "@SYSTEM_ZLIB@", "e" );
1784	ToFile( "BUILD_DMAKE", "@BUILD_DMAKE@", "e" );	1833	ToFile( "BUILD_DMAKE", "@BUILD_DMAKE@", "e" );
1785	ToFile( "GXX_INCLUDE_PATH", "@GXX_INCLUDE_PATH@", "e" );	1834	ToFile( "GXX_INCLUDE_PATH", $GXX_INCLUDE_PATH, "e" );
1786	ToFile( "COMMON_BUILD_TOOLS",$COMMON_BUILD_TOOLS, "e" );	1835	ToFile( "COMMON_BUILD_TOOLS",$COMMON_BUILD_TOOLS, "e" );
1787	if ($platform ne "$Winnt")	1836	if ($platform ne "$Winnt")
1788	{ ToFile( "TEMP", $TEMP, "e" );	1837	{ ToFile( "TEMP", $TEMP, "e" );
Lines 1798-1804 Link Here
1798	# these variables marked with "j" are used with cygwin only	1847	# these variables marked with "j" are used with cygwin only
1799	ToFile( "LIB", $WIN_LIB, "j" );	1848	ToFile( "LIB", $WIN_LIB, "j" );
1800	ToFile( "IENV", $IENV, "j" );	1849	ToFile( "IENV", $IENV, "j" );
1801	ToFile( "ILIB", $ILIB, "j" );	1850	if ( $MINGW eq "yes" )
		1851	{ my ($tempstring);
		1852	$tempstring = $ILIB;
		1853	$tempstring =~ s/:/;/g;
		1854	ToFile( "ILIB", $tempstring, "e" ); }
		1855	else
		1856	{ ToFile( "ILIB", $ILIB, "j" ); }
1802	ToFile( "INCLUDE", $WIN_INCLUDE, "j" );	1857	ToFile( "INCLUDE", $WIN_INCLUDE, "j" );
1803		1858
1804	ToFile( "GREP", $WIN_GREP, "e" );	1859	ToFile( "GREP", $WIN_GREP, "e" );
Lines 1990-1995 Link Here
1990	open( OUT, ">>$bootfile" ) \|\|	2045	open( OUT, ">>$bootfile" ) \|\|
1991	die "Cannot open $bootfile: $!\n";	2046	die "Cannot open $bootfile: $!\n";
1992	print OUT "source $SRC_ROOT/$outfile\n";	2047	print OUT "source $SRC_ROOT/$outfile\n";
		2048	if ( $MINGW eq "yes" )
		2049	{ print OUT 'setenv PATH "/usr/bin:$PATH"'."\n"; }
1993	close( OUT ) \|\| print "Can't close $bootfile: $!";	2050	close( OUT ) \|\| print "Can't close $bootfile: $!";
1994	system(`cat bootstrap.1 >> bootstrap`);	2051	system(`cat bootstrap.1 >> bootstrap`);
1995	system(`cat bootstrap.2 >> bootstrap`);	2052	system(`cat bootstrap.2 >> bootstrap`);
Lines 2276-2282 Link Here
2276	foreach $d1 ( @split_var )	2333	foreach $d1 ( @split_var )
2277	{	2334	{
2278	$d1 = "-".$d1;	2335	$d1 = "-".$d1;
2279	if ( $d1 =~ /^(-\w)[\'\"]?((?:\/[\w\.~ ]+)+)[\'\"]?/ )	2336	if ( $d1 =~ /^(-\w)[\'\"]?((?:\/[-\+\w\.-~ ]+)+)[\'\"]?/ )
2280	# This regex: option -> $1, filename without quotes -> $2	2337	# This regex: option -> $1, filename without quotes -> $2
2281	{	2338	{
2282	$d1_prefix = $1;	2339	$d1_prefix = $1;
Lines 2305-2311 Link Here
2305	@split_var = split(/;/,$variable);	2362	@split_var = split(/;/,$variable);
2306	foreach $d1 ( @split_var )	2363	foreach $d1 ( @split_var )
2307	{	2364	{
2308	if ( $d1 =~ /(?:^\/[\w\.~ ]+)+/ )	2365	if ( $d1 =~ /(?:^\/[-\+\w\.~ ]+)+/ )
2309	{	2366	{
2310	if ( $d1 =~ / / )	2367	if ( $d1 =~ / / )
2311	{	2368	{

Lines 1-5 Link Here

(-)oo_1.1.1_src/configmgr/prj/d.lst.orig (+1 lines)
1	mkdir: %_DEST%\inc%_EXT%\configmgr	1	mkdir: %_DEST%\inc%_EXT%\configmgr
2	..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%	2	..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%
		3	..\%__SRC%\lib\lib*.a %_DEST%\lib%_EXT%
3	..\%__SRC%\lib\.dylib %_DEST%\lib%_EXT%\.dylib	4	..\%__SRC%\lib\.dylib %_DEST%\lib%_EXT%\.dylib
4	..\%__SRC%\lib\.sl %_DEST%\lib%_EXT%\.sl	5	..\%__SRC%\lib\.sl %_DEST%\lib%_EXT%\.sl
5	..\%__SRC%\bin\.dll %_DEST%\bin%_EXT%\.dll	6	..\%__SRC%\bin\.dll %_DEST%\bin%_EXT%\.dll




#include "utility.hxx"
#endif

#if (defined(_MSC_VER) && (_MSC_VER >= 1310))
#define TYPENAME_ON_RETURN typename
#else
#define TYPENAME_ON_RETURN
#endif

namespace configmgr
{
	namespace configuration 

        }

		template <class Access>
        TYPENAME_ON_RETURN GuardedNodeUpdate<Access>::Updater GuardedNodeUpdate<Access>::getNodeUpdater() const
        {
            return get().getNodeUpdater(this->getDataAccessor());
        }

		template <class Access>
        TYPENAME_ON_RETURN GuardedNodeUpdate<Access>::Defaulter GuardedNodeUpdate<Access>::getNodeDefaulter() const
        {
            return get().getNodeDefaulter(this->getDataAccessor());
        }

Lines 75-80 Link Here

(-)oo_1.1.1_src/configmgr/source/api2/listenercontainer.hxx.orig (-1 / +7 lines)
75		75
76	#include <osl/diagnose.h>	76	#include <osl/diagnose.h>
77		77
		78	#if (defined(_MSC_VER) && (_MSC_VER >= 1310))
		79	#define TYPENAME_ON_RETURN typename
		80	#else
		81	#define TYPENAME_ON_RETURN
		82	#endif
		83
78	namespace configmgr	84	namespace configmgr
79	{	85	{
80	namespace configapi	86	namespace configapi
Lines 155-161 Link Here
155	BasicContainerInfo() : pInterface(0), pContainer(0) {}	161	BasicContainerInfo() : pInterface(0), pContainer(0) {}
156	};	162	};
157	typedef std::vector<BasicContainerInfo> BasicContainerHelperArray;	163	typedef std::vector<BasicContainerInfo> BasicContainerHelperArray;
158	typedef BasicContainerHelperArray::size_type Index;	164	typedef TYPENAME_ON_RETURN BasicContainerHelperArray::size_type Index;
159		165
160	typedef Key_ Key;	166	typedef Key_ Key;
161	typedef typename KeyToIndex_::KeyFinder KeyFinder;	167	typedef typename KeyToIndex_::KeyFinder KeyFinder;

Lines 1-5 Link Here

(-)oo_1.1.1_src/connectivity/prj/d.lst.orig (+1 lines)
1	..\%__SRC%\bin\.dll %_DEST%\bin%_EXT%\.dll	1	..\%__SRC%\bin\.dll %_DEST%\bin%_EXT%\.dll
2	..\%__SRC%\lib\lib.so %_DEST%\lib%_EXT%\lib.so	2	..\%__SRC%\lib\lib.so %_DEST%\lib%_EXT%\lib.so
		3	..\%__SRC%\lib\lib.a %_DEST%\lib%_EXT%\lib.a
3	..\%__SRC%\lib\.dylib %_DEST%\lib%_EXT%\.dylib	4	..\%__SRC%\lib\.dylib %_DEST%\lib%_EXT%\.dylib
4	..\%__SRC%\slb\connectivity. %_DEST%\lib%_EXT%\connectivity.	5	..\%__SRC%\slb\connectivity. %_DEST%\lib%_EXT%\connectivity.
5	..\%__SRC%\lib\idbt* %_DEST%\lib%_EXT%\idbt*	6	..\%__SRC%\lib\idbt* %_DEST%\lib%_EXT%\idbt*

Lines 253-264 Link Here

(-)oo_1.1.1_src/connectivity/source/drivers/ado/ACallableStatement.cxx.orig (-2 / +2 lines)
253	}	253	}
254	// -------------------------------------------------------------------------	254	// -------------------------------------------------------------------------
255	// -----------------------------------------------------------------------------	255	// -----------------------------------------------------------------------------
256	void SAL_CALL OCallableStatement::acquire() throw(::com::sun::star::uno::RuntimeException)	256	void SAL_CALL OCallableStatement::acquire() throw()
257	{	257	{
258	OPreparedStatement::acquire();	258	OPreparedStatement::acquire();
259	}	259	}
260	// -----------------------------------------------------------------------------	260	// -----------------------------------------------------------------------------
261	void SAL_CALL OCallableStatement::release() throw(::com::sun::star::uno::RuntimeException)	261	void SAL_CALL OCallableStatement::release() throw()
262	{	262	{
263	OPreparedStatement::release();	263	OPreparedStatement::release();
264	}	264	}

Lines 315-326 Link Here

(-)oo_1.1.1_src/connectivity/source/drivers/ado/AColumn.cxx.orig (-2 / +2 lines)
315	}	315	}
316	// -----------------------------------------------------------------------------	316	// -----------------------------------------------------------------------------
317	// -----------------------------------------------------------------------------	317	// -----------------------------------------------------------------------------
318	void SAL_CALL OAdoColumn::acquire() throw(::com::sun::star::uno::RuntimeException)	318	void SAL_CALL OAdoColumn::acquire() throw()
319	{	319	{
320	OColumn_ADO::acquire();	320	OColumn_ADO::acquire();
321	}	321	}
322	// -----------------------------------------------------------------------------	322	// -----------------------------------------------------------------------------
323	void SAL_CALL OAdoColumn::release() throw(::com::sun::star::uno::RuntimeException)	323	void SAL_CALL OAdoColumn::release() throw()
324	{	324	{
325	OColumn_ADO::release();	325	OColumn_ADO::release();
326	}	326	}

Lines 223-229 Link Here

(-)oo_1.1.1_src/connectivity/source/drivers/ado/AConnection.cxx.orig (-2 / +6 lines)
223	osl_decrementInterlockedCount( &m_refCount );	223	osl_decrementInterlockedCount( &m_refCount );
224	}	224	}
225	//-----------------------------------------------------------------------------	225	//-----------------------------------------------------------------------------
226	void SAL_CALL OConnection::release() throw(RuntimeException)	226	void SAL_CALL OConnection::release() throw()
227	{	227	{
228	relase_ChildImpl();	228	relase_ChildImpl();
229	}	229	}
Lines 536-542 Link Here
536		536
537	// m_aTables.disposing();	537	// m_aTables.disposing();
538	for (OWeakRefArray::iterator i = m_aStatements.begin(); m_aStatements.end() != i; ++i)	538	for (OWeakRefArray::iterator i = m_aStatements.begin(); m_aStatements.end() != i; ++i)
539	::comphelper::disposeComponent(i->get());	539	{
		540	::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > temp = (i->get());
		541	::comphelper::disposeComponent(temp);
		542	}
		543
540	m_aStatements.clear();	544	m_aStatements.clear();
541		545
542	m_bClosed = sal_True;	546	m_bClosed = sal_True;




#endif


#ifdef __MINGW32__
enum DBTYPEENUM
    {	DBTYPE_EMPTY	= 0,
	DBTYPE_NULL	= 1,
	DBTYPE_I2	= 2,
	DBTYPE_I4	= 3,
	DBTYPE_R4	= 4,
	DBTYPE_R8	= 5,
	DBTYPE_CY	= 6,
	DBTYPE_DATE	= 7,
	DBTYPE_BSTR	= 8,
	DBTYPE_IDISPATCH	= 9,
	DBTYPE_ERROR	= 10,
	DBTYPE_BOOL	= 11,
	DBTYPE_VARIANT	= 12,
	DBTYPE_IUNKNOWN	= 13,
	DBTYPE_DECIMAL	= 14,
	DBTYPE_UI1	= 17,
	DBTYPE_ARRAY	= 0x2000,
	DBTYPE_BYREF	= 0x4000,
	DBTYPE_I1	= 16,
	DBTYPE_UI2	= 18,
	DBTYPE_UI4	= 19,
	DBTYPE_I8	= 20,
	DBTYPE_UI8	= 21,
	DBTYPE_GUID	= 72,
	DBTYPE_VECTOR	= 0x1000,
	DBTYPE_RESERVED	= 0x8000,
	DBTYPE_BYTES	= 128,
	DBTYPE_STR	= 129,
	DBTYPE_WSTR	= 130,
	DBTYPE_NUMERIC	= 131,
	DBTYPE_UDT	= 132,
	DBTYPE_DBDATE	= 133,
	DBTYPE_DBTIME	= 134,
	DBTYPE_DBTIMESTAMP	= 135
    } ;
enum DBTYPEENUM15
    {	DBTYPE_HCHAPTER	= 136
    } ;
enum DBTYPEENUM20
    {	DBTYPE_FILETIME	= 64,
	DBTYPE_PROPVARIANT	= 138,
	DBTYPE_VARNUMERIC	= 139
    } ;
#define DB_PT_UNKNOWN				0x01
#define DB_PT_PROCEDURE				0x02
#define DB_PT_FUNCTION				0x03
#define DB_REMOTE					0x01
#define DB_LOCAL_SHARED				0x02
#define DB_LOCAL_EXCLUSIVE			0x03
#define DB_COLLATION_ASC				0x01
#define DB_COLLATION_DESC			0x02
#define DB_UNSEARCHABLE				0x01
#define DB_LIKE_ONLY					0x02
#define DB_ALL_EXCEPT_LIKE			0x03
#define DB_SEARCHABLE				0x04
#else
#include <oledb.h>
#endif

using namespace dbtools;
using namespace connectivity::ado;

}
//------------------------------------------------------------------------------
sal_Int32 ODatabaseMetaDataResultSet::getResultSetConcurrency() const
	throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
{
	return ResultSetConcurrency::READ_ONLY;
}
//------------------------------------------------------------------------------
sal_Int32 ODatabaseMetaDataResultSet::getResultSetType() const
	throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
{
	return ResultSetType::FORWARD_ONLY;
}
//------------------------------------------------------------------------------
sal_Int32 ODatabaseMetaDataResultSet::getFetchDirection() const
	throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
{
	return FetchDirection::FORWARD;
}
//------------------------------------------------------------------------------
sal_Int32 ODatabaseMetaDataResultSet::getFetchSize() const
	throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
{
	sal_Int32 nValue=-1;
	if(m_pRecordSet)

}
//------------------------------------------------------------------------------
::rtl::OUString ODatabaseMetaDataResultSet::getCursorName() const
	throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
{
	return ::rtl::OUString();
}

//------------------------------------------------------------------------------
void ODatabaseMetaDataResultSet::setFetchDirection(sal_Int32 _par0)
	throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
{
}
//------------------------------------------------------------------------------
void ODatabaseMetaDataResultSet::setFetchSize(sal_Int32 _par0)
	throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
{
	if(m_pRecordSet)
		m_pRecordSet->put_CacheSize(_par0);

	m_xMetaData = pMetaData;
}
// -----------------------------------------------------------------------------
void SAL_CALL ODatabaseMetaDataResultSet::acquire() throw()
{
	ODatabaseMetaDataResultSet_BASE::acquire();
}
// -----------------------------------------------------------------------------
void SAL_CALL ODatabaseMetaDataResultSet::release() throw()
{
	ODatabaseMetaDataResultSet_BASE::release();
}

Lines 226-237 Link Here

(-)oo_1.1.1_src/connectivity/source/drivers/ado/AGroup.cxx.orig (-2 / +2 lines)
226	}	226	}
227		227
228	// -----------------------------------------------------------------------------	228	// -----------------------------------------------------------------------------
229	void SAL_CALL OAdoGroup::acquire() throw(::com::sun::star::uno::RuntimeException)	229	void SAL_CALL OAdoGroup::acquire() throw()
230	{	230	{
231	OGroup_ADO::acquire();	231	OGroup_ADO::acquire();
232	}	232	}
233	// -----------------------------------------------------------------------------	233	// -----------------------------------------------------------------------------
234	void SAL_CALL OAdoGroup::release() throw(::com::sun::star::uno::RuntimeException)	234	void SAL_CALL OAdoGroup::release() throw()
235	{	235	{
236	OGroup_ADO::release();	236	OGroup_ADO::release();
237	}	237	}

Lines 193-204 Link Here

(-)oo_1.1.1_src/connectivity/source/drivers/ado/AIndex.cxx.orig (-2 / +2 lines)
193	OIndex_ADO::setFastPropertyValue_NoBroadcast(nHandle,rValue);	193	OIndex_ADO::setFastPropertyValue_NoBroadcast(nHandle,rValue);
194	}	194	}
195	// -----------------------------------------------------------------------------	195	// -----------------------------------------------------------------------------
196	void SAL_CALL OAdoIndex::acquire() throw(::com::sun::star::uno::RuntimeException)	196	void SAL_CALL OAdoIndex::acquire() throw()
197	{	197	{
198	OIndex_ADO::acquire();	198	OIndex_ADO::acquire();
199	}	199	}
200	// -----------------------------------------------------------------------------	200	// -----------------------------------------------------------------------------
201	void SAL_CALL OAdoIndex::release() throw(::com::sun::star::uno::RuntimeException)	201	void SAL_CALL OAdoIndex::release() throw()
202	{	202	{
203	OIndex_ADO::release();	203	OIndex_ADO::release();
204	}	204	}

Lines 201-212 Link Here

(-)oo_1.1.1_src/connectivity/source/drivers/ado/AKey.cxx.orig (-2 / +2 lines)
201	}	201	}
202	// -------------------------------------------------------------------------	202	// -------------------------------------------------------------------------
203	// -----------------------------------------------------------------------------	203	// -----------------------------------------------------------------------------
204	void SAL_CALL OAdoKey::acquire() throw(::com::sun::star::uno::RuntimeException)	204	void SAL_CALL OAdoKey::acquire() throw()
205	{	205	{
206	OKey_ADO::acquire();	206	OKey_ADO::acquire();
207	}	207	}
208	// -----------------------------------------------------------------------------	208	// -----------------------------------------------------------------------------
209	void SAL_CALL OAdoKey::release() throw(::com::sun::star::uno::RuntimeException)	209	void SAL_CALL OAdoKey::release() throw()
210	{	210	{
211	OKey_ADO::release();	211	OKey_ADO::release();
212	}	212	}

Lines 535-546 Link Here

(-)oo_1.1.1_src/connectivity/source/drivers/ado/APreparedStatement.cxx.orig (-2 / +2 lines)
535	}	535	}
536	// -----------------------------------------------------------------------------	536	// -----------------------------------------------------------------------------
537	// -----------------------------------------------------------------------------	537	// -----------------------------------------------------------------------------
538	void SAL_CALL OPreparedStatement::acquire() throw(::com::sun::star::uno::RuntimeException)	538	void SAL_CALL OPreparedStatement::acquire() throw()
539	{	539	{
540	OStatement_Base::acquire();	540	OStatement_Base::acquire();
541	}	541	}
542	// -----------------------------------------------------------------------------	542	// -----------------------------------------------------------------------------
543	void SAL_CALL OPreparedStatement::release() throw(::com::sun::star::uno::RuntimeException)	543	void SAL_CALL OPreparedStatement::release() throw()
544	{	544	{
545	OStatement_Base::release();	545	OStatement_Base::release();
546	}	546	}

Lines 114-120 Link Here

(-)oo_1.1.1_src/connectivity/source/drivers/ado/AResultSet.cxx.orig (-2 / +12 lines)
114	using namespace ::comphelper;	114	using namespace ::comphelper;
115		115
116		116
		117	#ifdef __MINGW32__
		118	#else
117	#include <oledb.h>	119	#include <oledb.h>
		120	#endif
118		121
119	#define CHECK_RETURN(x) \	122	#define CHECK_RETURN(x) \
120	if(!SUCCEEDED(x)) \	123	if(!SUCCEEDED(x)) \
Lines 1026-1031 Link Here
1026	}	1029	}
1027	//------------------------------------------------------------------------------	1030	//------------------------------------------------------------------------------
1028	sal_Int32 OResultSet::getResultSetConcurrency() const	1031	sal_Int32 OResultSet::getResultSetConcurrency() const
		1032	throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
1029	{	1033	{
1030	sal_Int32 nValue=0;	1034	sal_Int32 nValue=0;
1031	LockTypeEnum eRet;	1035	LockTypeEnum eRet;
Lines 1045-1050 Link Here
1045	}	1049	}
1046	//------------------------------------------------------------------------------	1050	//------------------------------------------------------------------------------
1047	sal_Int32 OResultSet::getResultSetType() const	1051	sal_Int32 OResultSet::getResultSetType() const
		1052	throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
1048	{	1053	{
1049	sal_Int32 nValue=0;	1054	sal_Int32 nValue=0;
1050	CursorTypeEnum eRet;	1055	CursorTypeEnum eRet;
Lines 1069-1079 Link Here
1069	}	1074	}
1070	//------------------------------------------------------------------------------	1075	//------------------------------------------------------------------------------
1071	sal_Int32 OResultSet::getFetchDirection() const	1076	sal_Int32 OResultSet::getFetchDirection() const
		1077	throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
1072	{	1078	{
1073	return FetchDirection::FORWARD;	1079	return FetchDirection::FORWARD;
1074	}	1080	}
1075	//------------------------------------------------------------------------------	1081	//------------------------------------------------------------------------------
1076	sal_Int32 OResultSet::getFetchSize() const	1082	sal_Int32 OResultSet::getFetchSize() const
		1083	throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
1077	{	1084	{
1078	sal_Int32 nValue=-1;	1085	sal_Int32 nValue=-1;
1079	m_pRecordSet->get_CacheSize(&nValue);	1086	m_pRecordSet->get_CacheSize(&nValue);
Lines 1081-1096 Link Here
1081	}	1088	}
1082	//------------------------------------------------------------------------------	1089	//------------------------------------------------------------------------------
1083	::rtl::OUString OResultSet::getCursorName() const	1090	::rtl::OUString OResultSet::getCursorName() const
		1091	throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
1084	{	1092	{
1085	return ::rtl::OUString();	1093	return ::rtl::OUString();
1086	}	1094	}
1087		1095
1088	//------------------------------------------------------------------------------	1096	//------------------------------------------------------------------------------
1089	void OResultSet::setFetchDirection(sal_Int32 _par0)	1097	void OResultSet::setFetchDirection(sal_Int32 _par0)
		1098	throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
1090	{	1099	{
1091	}	1100	}
1092	//------------------------------------------------------------------------------	1101	//------------------------------------------------------------------------------
1093	void OResultSet::setFetchSize(sal_Int32 _par0)	1102	void OResultSet::setFetchSize(sal_Int32 _par0)
		1103	throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
1094	{	1104	{
1095	m_pRecordSet->put_CacheSize(_par0);	1105	m_pRecordSet->put_CacheSize(_par0);
1096	}	1106	}
Lines 1192-1203 Link Here
1192	}	1202	}
1193	}	1203	}
1194	// -----------------------------------------------------------------------------	1204	// -----------------------------------------------------------------------------
1195	void SAL_CALL OResultSet::acquire() throw(::com::sun::star::uno::RuntimeException)	1205	void SAL_CALL OResultSet::acquire() throw()
1196	{	1206	{
1197	OResultSet_BASE::acquire();	1207	OResultSet_BASE::acquire();
1198	}	1208	}
1199	// -----------------------------------------------------------------------------	1209	// -----------------------------------------------------------------------------
1200	void SAL_CALL OResultSet::release() throw(::com::sun::star::uno::RuntimeException)	1210	void SAL_CALL OResultSet::release() throw()
1201	{	1211	{
1202	OResultSet_BASE::release();	1212	OResultSet_BASE::release();
1203	}	1213	}

Lines 174-180 Link Here

(-)oo_1.1.1_src/connectivity/source/drivers/ado/AStatement.cxx.orig (-4 / +4 lines)
174	OStatement_BASE::disposing();	174	OStatement_BASE::disposing();
175	}	175	}
176	//-----------------------------------------------------------------------------	176	//-----------------------------------------------------------------------------
177	void SAL_CALL OStatement_Base::release() throw(RuntimeException)	177	void SAL_CALL OStatement_Base::release() throw()
178	{	178	{
179	relase_ChildImpl();	179	relase_ChildImpl();
180	}	180	}
Lines 871-887 Link Here
871	}	871	}
872	IMPLEMENT_SERVICE_INFO(OStatement,"com.sun.star.sdbcx.AStatement","com.sun.star.sdbc.Statement");	872	IMPLEMENT_SERVICE_INFO(OStatement,"com.sun.star.sdbcx.AStatement","com.sun.star.sdbc.Statement");
873	// -----------------------------------------------------------------------------	873	// -----------------------------------------------------------------------------
874	void SAL_CALL OStatement_Base::acquire() throw(::com::sun::star::uno::RuntimeException)	874	void SAL_CALL OStatement_Base::acquire() throw()
875	{	875	{
876	OStatement_BASE::acquire();	876	OStatement_BASE::acquire();
877	}	877	}
878	// -----------------------------------------------------------------------------	878	// -----------------------------------------------------------------------------
879	void SAL_CALL OStatement::acquire() throw(::com::sun::star::uno::RuntimeException)	879	void SAL_CALL OStatement::acquire() throw()
880	{	880	{
881	OStatement_Base::acquire();	881	OStatement_Base::acquire();
882	}	882	}
883	// -----------------------------------------------------------------------------	883	// -----------------------------------------------------------------------------
884	void SAL_CALL OStatement::release() throw(::com::sun::star::uno::RuntimeException)	884	void SAL_CALL OStatement::release() throw()
885	{	885	{
886	OStatement_Base::release();	886	OStatement_Base::release();
887	}	887	}




void SAL_CALL OAdoTable::rename( const ::rtl::OUString& newName ) throw(SQLException, ElementExistException, RuntimeException)
{
	::osl::MutexGuard aGuard(m_aMutex);
	checkDisposed(OTableDescriptor_BASE_TYPEDEF::rBHelper.bDisposed);
        
	m_aTable.put_Name(newName);
	ADOS::ThrowException(*(m_pCatalog->getConnection()->getConnection()),*this);

void SAL_CALL OAdoTable::alterColumnByName( const ::rtl::OUString& colName, const Reference< XPropertySet >& descriptor ) throw(SQLException, NoSuchElementException, RuntimeException)
{
	::osl::MutexGuard aGuard(m_aMutex);
	checkDisposed(OTableDescriptor_BASE_TYPEDEF::rBHelper.bDisposed);

	sal_Bool bError = sal_True;
	OAdoColumn* pColumn = NULL;

void SAL_CALL OAdoTable::alterColumnByIndex( sal_Int32 index, const Reference< XPropertySet >& descriptor ) throw(SQLException, ::com::sun::star::lang::IndexOutOfBoundsException, RuntimeException)
{
	::osl::MutexGuard aGuard(m_aMutex);
	checkDisposed(OTableDescriptor_BASE_TYPEDEF::rBHelper.bDisposed);
        
	Reference< XPropertySet > xOld;
	m_pColumns->getByIndex(index) >>= xOld;

	OTable_TYPEDEF::setFastPropertyValue_NoBroadcast(nHandle,rValue);
}
// -------------------------------------------------------------------------
void SAL_CALL OAdoTable::acquire() throw()
{
	OTable_TYPEDEF::acquire();
}
// -----------------------------------------------------------------------------
void SAL_CALL OAdoTable::release() throw()
{
	OTable_TYPEDEF::release();
}




}
// -----------------------------------------------------------------------------
// -----------------------------------------------------------------------------
void SAL_CALL OAdoUser::acquire() throw()
{
	OUser_TYPEDEF::acquire();
}
// -----------------------------------------------------------------------------
void SAL_CALL OAdoUser::release() throw()
{
	OUser_TYPEDEF::release();
}

sal_Int32 SAL_CALL OAdoUser::getPrivileges( const ::rtl::OUString& objName, sal_Int32 objType ) throw(SQLException, RuntimeException)
{
	::osl::MutexGuard aGuard(m_aMutex);
	checkDisposed(OUser_BASE_TYPEDEF::rBHelper.bDisposed);

	return ADOS::mapAdoRights2Sdbc(m_aUser.GetPermissions(objName, ADOS::mapObjectType2Ado(objType)));
}

sal_Int32 SAL_CALL OAdoUser::getGrantablePrivileges( const ::rtl::OUString& objName, sal_Int32 objType ) throw(SQLException, RuntimeException)
{
	::osl::MutexGuard aGuard(m_aMutex);
	checkDisposed(OUser_BASE_TYPEDEF::rBHelper.bDisposed);
    
	sal_Int32 nRights = 0;
	RightsEnum eRights = m_aUser.GetPermissions(objName, ADOS::mapObjectType2Ado(objType));

void SAL_CALL OAdoUser::grantPrivileges( const ::rtl::OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) throw(SQLException, RuntimeException)
{
	::osl::MutexGuard aGuard(m_aMutex);
	checkDisposed(OUser_BASE_TYPEDEF::rBHelper.bDisposed);
	m_aUser.SetPermissions(objName,ADOS::mapObjectType2Ado(objType),adAccessGrant,RightsEnum(ADOS::mapRights2Ado(objPrivileges)));                
	ADOS::ThrowException(*m_pCatalog->getConnection()->getConnection(),*this);
}

void SAL_CALL OAdoUser::revokePrivileges( const ::rtl::OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) throw(SQLException, RuntimeException)
{
	::osl::MutexGuard aGuard(m_aMutex);
	checkDisposed(OUser_BASE_TYPEDEF::rBHelper.bDisposed);
    m_aUser.SetPermissions(objName,ADOS::mapObjectType2Ado(objType),adAccessRevoke,RightsEnum(ADOS::mapRights2Ado(objPrivileges)));
	ADOS::ThrowException(*m_pCatalog->getConnection()->getConnection(),*this);
}

void SAL_CALL OAdoUser::changePassword( const ::rtl::OUString& objPassword, const ::rtl::OUString& newPassword ) throw(SQLException, RuntimeException)
{
	::osl::MutexGuard aGuard(m_aMutex);
	checkDisposed(OUser_BASE_TYPEDEF::rBHelper.bDisposed);
	m_aUser.ChangePassword(objPassword,newPassword);
	ADOS::ThrowException(*m_pCatalog->getConnection()->getConnection(),*this);
}

Lines 158-169 Link Here

(-)oo_1.1.1_src/connectivity/source/drivers/ado/AView.cxx.orig (-2 / +2 lines)
158	OView_ADO::getFastPropertyValue(rValue,nHandle);	158	OView_ADO::getFastPropertyValue(rValue,nHandle);
159	}	159	}
160	// -----------------------------------------------------------------------------	160	// -----------------------------------------------------------------------------
161	void SAL_CALL OAdoView::acquire() throw(::com::sun::star::uno::RuntimeException)	161	void SAL_CALL OAdoView::acquire() throw()
162	{	162	{
163	OView_ADO::acquire();	163	OView_ADO::acquire();
164	}	164	}
165	// -----------------------------------------------------------------------------	165	// -----------------------------------------------------------------------------
166	void SAL_CALL OAdoView::release() throw(::com::sun::star::uno::RuntimeException)	166	void SAL_CALL OAdoView::release() throw()
167	{	167	{
168	OView_ADO::release();	168	OView_ADO::release();
169	}	169	}




	protected:
		void dispose_ChildImpl()
		{
			::osl::MutexGuard aGuard( m_pDerivedImplementation->WEAK::rBHelper.rMutex );
			m_xParent = NULL;
		}
		void relase_ChildImpl()
		{
			::connectivity::release(m_pDerivedImplementation->m_refCount,
									m_pDerivedImplementation->WEAK::rBHelper,
									m_xParent,
									m_pDerivedImplementation);


Lines 151-157 Link Here

(-)oo_1.1.1_src/connectivity/source/inc/ado/AConnection.hxx.orig (-1 / +1 lines)
151	// OComponentHelper	151	// OComponentHelper
152	virtual void SAL_CALL disposing(void);	152	virtual void SAL_CALL disposing(void);
153	// XInterface	153	// XInterface
154	virtual void SAL_CALL release() throw(::com::sun::star::uno::RuntimeException);	154	virtual void SAL_CALL release() throw();
155		155
156	// XConnection	156	// XConnection
157	virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XStatement > SAL_CALL createStatement( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);	157	virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XStatement > SAL_CALL createStatement( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);

Lines 77-82 Link Here

(-)oo_1.1.1_src/connectivity/source/inc/ado/ATable.hxx.orig (-1 / +2 lines)
77	namespace ado	77	namespace ado
78	{	78	{
79	typedef connectivity::sdbcx::OTable OTable_TYPEDEF;	79	typedef connectivity::sdbcx::OTable OTable_TYPEDEF;
		80	typedef connectivity::sdbcx::OTableDescriptor_BASE OTableDescriptor_BASE_TYPEDEF;
80		81
81	class OAdoTable : public OTable_TYPEDEF	82	class OAdoTable : public OTable_TYPEDEF
82	{	83	{
Lines 97-103 Link Here
97	OAdoTable(sdbcx::OCollection* _pTables,sal_Bool _bCase,OCatalog* _pCatalog);	98	OAdoTable(sdbcx::OCollection* _pTables,sal_Bool _bCase,OCatalog* _pCatalog);
98		99
99		100
100	::rtl::OUString SAL_CALL getName() { return m_Name; }	101	::rtl::OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException) { return m_Name; }
101	::rtl::OUString getSchema() const { return m_SchemaName; }	102	::rtl::OUString getSchema() const { return m_SchemaName; }
102	// com::sun::star::lang::XUnoTunnel	103	// com::sun::star::lang::XUnoTunnel
103	virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException);	104	virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException);

Lines 75-80 Link Here

(-)oo_1.1.1_src/connectivity/source/inc/ado/AUser.hxx.orig (+1 lines)
75	{	75	{
76	class OCatalog;	76	class OCatalog;
77	typedef connectivity::sdbcx::OUser OUser_TYPEDEF;	77	typedef connectivity::sdbcx::OUser OUser_TYPEDEF;
		78	typedef connectivity::sdbcx::OUser_BASE OUser_BASE_TYPEDEF;
78		79
79	class OAdoUser : public OUser_TYPEDEF	80	class OAdoUser : public OUser_TYPEDEF
80	{	81	{

Lines 64-69 Link Here

(-)oo_1.1.1_src/connectivity/source/inc/ado/Aolevariant.hxx.orig (+3 lines)
64	#ifndef _SAL_TYPES_H_	64	#ifndef _SAL_TYPES_H_
65	#include <sal/types.h>	65	#include <sal/types.h>
66	#endif	66	#endif
		67	#ifdef __MINGW32__
		68	#include <windows.h>
		69	#endif
67	#include <oaidl.h>	70	#include <oaidl.h>
68	#ifndef _RTL_USTRING_HXX_	71	#ifndef _RTL_USTRING_HXX_
69	#include <rtl/ustring.hxx>	72	#include <rtl/ustring.hxx>




#endif

// Includes fuer ADO
#ifdef __MINGW32__
#define DBPROPVAL_BMK_NUMERIC							 0x00000001L
#define DBPROPVAL_BMK_KEY								 0x00000002L
#define DBPROPVAL_CL_START                                0x00000001L
#define DBPROPVAL_CL_END                                  0x00000002L
#define DBPROPVAL_CU_DML_STATEMENTS						 0x00000001L
#define DBPROPVAL_CU_TABLE_DEFINITION					 0x00000002L
#define DBPROPVAL_CU_INDEX_DEFINITION					 0x00000004L
#define DBPROPVAL_CU_PRIVILEGE_DEFINITION				 0x00000008L
#define DBPROPVAL_CD_NOTNULL								 0x00000001L
#define DBPROPVAL_CB_NULL								 0x00000001L
#define DBPROPVAL_CB_NON_NULL							 0x00000002L
#define DBPROPVAL_FU_NOT_SUPPORTED						 0x00000001L
#define DBPROPVAL_FU_COLUMN								 0x00000002L
#define DBPROPVAL_FU_TABLE								 0x00000004L
#define DBPROPVAL_FU_CATALOG								 0x00000008L
#define DBPROPVAL_GB_NOT_SUPPORTED						 0x00000001L
#define DBPROPVAL_GB_EQUALS_SELECT						 0x00000002L
#define DBPROPVAL_GB_CONTAINS_SELECT						 0x00000004L
#define DBPROPVAL_GB_NO_RELATION							 0x00000008L
#define DBPROPVAL_HT_DIFFERENT_CATALOGS					 0x00000001L
#define DBPROPVAL_HT_DIFFERENT_PROVIDERS					 0x00000002L
#define DBPROPVAL_IC_UPPER								 0x00000001L
#define DBPROPVAL_IC_LOWER								 0x00000002L
#define DBPROPVAL_IC_SENSITIVE							 0x00000004L
#define DBPROPVAL_IC_MIXED								 0x00000008L
//@@@+ deprecated
#ifdef deprecated
#define DBPROPVAL_LM_NONE								 0x00000001L
#define DBPROPVAL_LM_READ								 0x00000002L
#define DBPROPVAL_LM_INTENT								 0x00000004L
#define DBPROPVAL_LM_RITE								 0x00000008L
#endif // deprecated
//@@@- deprecated
#define DBPROPVAL_NP_OKTODO								 0x00000001L
#define DBPROPVAL_NP_ABOUTTODO							 0x00000002L
#define DBPROPVAL_NP_SYNCHAFTER							 0x00000004L
#define DBPROPVAL_NP_FAILEDTODO							 0x00000008L
#define DBPROPVAL_NP_DIDEVENT							 0x00000010L
#define DBPROPVAL_NC_END									 0x00000001L
#define DBPROPVAL_NC_HIGH								 0x00000002L
#define DBPROPVAL_NC_LOW									 0x00000004L
#define DBPROPVAL_NC_START								 0x00000008L
#define DBPROPVAL_OO_BLOB								 0x00000001L
#define DBPROPVAL_OO_IPERSIST							 0x00000002L
#define DBPROPVAL_CB_DELETE								 0x00000001L
#define DBPROPVAL_CB_PRESERVE							 0x00000002L
#define DBPROPVAL_SU_DML_STATEMENTS						 0x00000001L
#define DBPROPVAL_SU_TABLE_DEFINITION					 0x00000002L
#define DBPROPVAL_SU_INDEX_DEFINITION					 0x00000004L
#define DBPROPVAL_SU_PRIVILEGE_DEFINITION				 0x00000008L
#define DBPROPVAL_SQ_CORRELATEDSUBQUERIES				 0x00000001L
#define DBPROPVAL_SQ_COMPARISON							 0x00000002L
#define DBPROPVAL_SQ_EXISTS								 0x00000004L
#define DBPROPVAL_SQ_IN									 0x00000008L
#define DBPROPVAL_SQ_QUANTIFIED							 0x00000010L
#define DBPROPVAL_SQ_TABLE								 0x00000020L
#define DBPROPVAL_SS_ISEQUENTIALSTREAM					 0x00000001L
#define DBPROPVAL_SS_ISTREAM								 0x00000002L
#define DBPROPVAL_SS_ISTORAGE							 0x00000004L
#define DBPROPVAL_SS_ILOCKBYTES							 0x00000008L
#define DBPROPVAL_TI_CHAOS								 0x00000010L
#define DBPROPVAL_TI_READUNCOMMITTED						 0x00000100L
#define DBPROPVAL_TI_BROWSE								 0x00000100L
#define DBPROPVAL_TI_CURSORSTABILITY						 0x00001000L
#define DBPROPVAL_TI_READCOMMITTED						 0x00001000L
#define DBPROPVAL_TI_REPEATABLEREAD						 0x00010000L
#define DBPROPVAL_TI_SERIALIZABLE						 0x00100000L
#define DBPROPVAL_TI_ISOLATED							 0x00100000L
#define DBPROPVAL_TR_COMMIT_DC							 0x00000001L
#define DBPROPVAL_TR_COMMIT								 0x00000002L
#define DBPROPVAL_TR_COMMIT_NO							 0x00000004L
#define DBPROPVAL_TR_ABORT_DC							 0x00000008L
#define DBPROPVAL_TR_ABORT								 0x00000010L
#define DBPROPVAL_TR_ABORT_NO							 0x00000020L
#define DBPROPVAL_TR_DONTCARE							 0x00000040L
#define DBPROPVAL_TR_BOTH								 0x00000080L
#define DBPROPVAL_TR_NONE								 0x00000100L
#define DBPROPVAL_TR_OPTIMISTIC							 0x00000200L
#define DBPROPVAL_RT_FREETHREAD							 0x00000001L
#define DBPROPVAL_RT_APTMTTHREAD							 0x00000002L
#define DBPROPVAL_RT_SINGLETHREAD						 0x00000004L
#define DBPROPVAL_UP_CHANGE								 0x00000001L
#define DBPROPVAL_UP_DELETE								 0x00000002L
#define DBPROPVAL_UP_INSERT								 0x00000004L
#define DBPROPVAL_SQL_NONE								 0x00000000L
#define DBPROPVAL_SQL_ODBC_MINIMUM						 0x00000001L
#define DBPROPVAL_SQL_ODBC_CORE							 0x00000002L
#define DBPROPVAL_SQL_ODBC_EXTENDED						 0x00000004L
#define DBPROPVAL_SQL_ANSI89_IEF							 0x00000008L
#define DBPROPVAL_SQL_ANSI92_ENTRY						 0x00000010L
#define DBPROPVAL_SQL_FIPS_TRANSITIONAL					 0x00000020L
#define DBPROPVAL_SQL_ANSI92_INTERMEDIATE				 0x00000040L
#define DBPROPVAL_SQL_ANSI92_FULL						 0x00000080L
#define DBPROPVAL_SQL_ESCAPECLAUSES						 0x00000100L
#define DBPROPVAL_IT_BTREE                                0x00000001L
#define DBPROPVAL_IT_HASH                                 0x00000002L
#define DBPROPVAL_IT_CONTENT                              0x00000003L
#define DBPROPVAL_IT_OTHER                                0x00000004L
#define DBPROPVAL_IN_DISALLOWNULL                         0x00000001L
#define DBPROPVAL_IN_IGNORENULL                           0x00000002L
#define DBPROPVAL_IN_IGNOREANYNULL                        0x00000004L
#define DBPROPVAL_TC_NONE                                 0x00000000L
#define DBPROPVAL_TC_DML                                  0x00000001L
#define DBPROPVAL_TC_DDL_COMMIT                           0x00000002L
#define DBPROPVAL_TC_DDL_IGNORE                           0x00000004L
#define DBPROPVAL_TC_ALL                                  0x00000008L
#define DBPROPVAL_NP_OKTODO                               0x00000001L
#define DBPROPVAL_NP_ABOUTTODO                            0x00000002L
#define DBPROPVAL_NP_SYNCHAFTER                           0x00000004L
#define DBPROPVAL_OA_NOTSUPPORTED                         0x00000001L
#define DBPROPVAL_OA_ATEXECUTE                            0x00000002L
#define DBPROPVAL_OA_ATROWRELEASE                         0x00000004L
#define DBPROPVAL_MR_NOTSUPPORTED                         0x00000000L
#define DBPROPVAL_MR_SUPPORTED                            0x00000001L
#define DBPROPVAL_MR_CONCURRENT                           0x00000002L
#define DBPROPVAL_PT_GUID_NAME                            0x00000001L
#define DBPROPVAL_PT_GUID_PROPID                          0x00000002L
#define DBPROPVAL_PT_NAME                                 0x00000004L
#define DBPROPVAL_PT_GUID                                 0x00000008L
#define DBPROPVAL_PT_PROPID								 0x00000010L
#define DBPROPVAL_PT_PGUID_NAME                           0x00000020L
#define DBPROPVAL_PT_PGUID_PROPID						 0x00000040L
#define DBPROPVAL_NT_SINGLEROW                            0x00000001L
#define DBPROPVAL_NT_MULTIPLEROWS                         0x00000002L
//@@@+ V1.5
#define DBPROPVAL_ASYNCH_INITIALIZE                       0x00000001L
#define DBPROPVAL_ASYNCH_SEQUENTIALPOPULATION             0x00000002L
#define DBPROPVAL_ASYNCH_RANDOMPOPULATION                 0x00000004L
#define DBPROPVAL_OP_EQUAL                                0x00000001L
#define DBPROPVAL_OP_RELATIVE                             0x00000002L
#define DBPROPVAL_OP_STRING                               0x00000004L
#define DBPROPVAL_CO_EQUALITY                             0x00000001L
#define DBPROPVAL_CO_STRING                               0x00000002L
#define DBPROPVAL_CO_CASESENSITIVE                        0x00000004L
#define DBPROPVAL_CO_CASEINSENSITIVE                      0x00000008L
#define DBPROPVAL_CO_CONTAINS		                     0x00000010L
#define DBPROPVAL_CO_BEGINSWITH		                     0x00000020L
#define DBPROPVAL_ASYNCH_BACKGROUNDPOPULATION			0x00000008L
#define DBPROPVAL_ASYNCH_PREPOPULATE						0x00000010L
#define DBPROPVAL_ASYNCH_POPULATEONDEMAND				0x00000020L
#define DBPROPVAL_LM_NONE								 0x00000001L
#define DBPROPVAL_LM_SINGLEROW							 0x00000002L
#define DBPROPVAL_SQL_SUBMINIMUM 						 0x00000200L
#define DBPROPVAL_DST_TDP                                 0x00000001L
#define DBPROPVAL_DST_MDP                                 0x00000002L
#define DBPROPVAL_DST_TDPANDMDP                           0x00000003L
#define MDPROPVAL_AU_UNSUPPORTED                          0x00000000L
#define MDPROPVAL_AU_UNCHANGED                            0x00000001L
#define MDPROPVAL_AU_UNKNOWN                              0x00000002L
#define MDPROPVAL_MF_WITH_CALCMEMBERS                     0x00000001L
#define MDPROPVAL_MF_WITH_NAMEDSETS                       0x00000002L
#define MDPROPVAL_MF_CREATE_CALCMEMBERS                   0x00000004L
#define MDPROPVAL_MF_CREATE_NAMEDSETS                     0x00000008L
#define MDPROPVAL_MF_SCOPE_SESSION						 0x00000010L
#define MDPROPVAL_MF_SCOPE_GLOBAL                         0x00000020L
#define MDPROPVAL_MMF_COUSIN                              0x00000001L
#define MDPROPVAL_MMF_PARALLELPERIOD                      0x00000002L
#define MDPROPVAL_MMF_OPENINGPERIOD                       0x00000004L
#define MDPROPVAL_MMF_CLOSINGPERIOD                       0x00000008L
#define MDPROPVAL_MNF_MEDIAN								0x00000001L
#define MDPROPVAL_MNF_VAR								0x00000002L
#define MDPROPVAL_MNF_STDDEV								0x00000004L
#define MDPROPVAL_MNF_RANK								0x00000008L
#define MDPROPVAL_MNF_AGGREGATE							0x00000010L
#define MDPROPVAL_MNF_COVARIANCE							0x00000020L
#define MDPROPVAL_MNF_CORRELATION						0x00000040L
#define MDPROPVAL_MNF_LINREGSLOPE						0x00000080L
#define MDPROPVAL_MNF_LINREGVARIANCE						0x00000100L
#define MDPROPVAL_MNF_LINREG2							0x00000200L
#define MDPROPVAL_MNF_LINREGPOINT						0x00000400L
#define MDPROPVAL_MNF_DRILLDOWNLEVEL						0x00000800L
#define MDPROPVAL_MNF_DRILLDOWNMEMBERTOP					0x00001000L
#define MDPROPVAL_MNF_DRILLDOWNMEMBERBOTTOM				0x00002000L
#define MDPROPVAL_MNF_DRILLDOWNLEVELTOP					0x00004000L
#define MDPROPVAL_MNF_DRILLDOWNLEVELBOTTOM				0x00008000L
#define MDPROPVAL_MNF_DRILLUPMEMBER						0x00010000L
#define MDPROPVAL_MNF_DRILLUPLEVEL						0x00020000L
#define MDPROPVAL_MMF_COUSIN								0x00000001L
#define MDPROPVAL_MMF_PARALLELPERIOD						0x00000002L
#define MDPROPVAL_MMF_OPENINGPERIOD						0x00000004L
#define MDPROPVAL_MMF_CLOSINGPERIOD						0x00000008L
#define MDPROPVAL_MSF_TOPPERCENT							0x00000001L
#define MDPROPVAL_MSF_BOTTOMPERCENT						0x00000002L
#define MDPROPVAL_MSF_TOPSUM								0x00000004L
#define MDPROPVAL_MSF_BOTTOMSUM							0x00000008L
#define MDPROPVAL_MSF_PERIODSTODATE						0x00000010L
#define MDPROPVAL_MSF_LASTPERIODS						0x00000020L
#define MDPROPVAL_MSF_YTD								0x00000040L
#define MDPROPVAL_MSF_QTD								0x00000080L
#define MDPROPVAL_MSF_MTD								0x00000100L
#define MDPROPVAL_MSF_WTD								0x00000200L
#define MDPROPVAL_MSF_DRILLDOWNMEMBBER					0x00000400L
#define MDPROPVAL_MSF_DRILLDOWNLEVEL						0x00000800L
#define MDPROPVAL_MSF_DRILLDOWNMEMBERTOP					0x00001000L
#define MDPROPVAL_MSF_DRILLDOWNMEMBERBOTTOM				0x00002000L
#define MDPROPVAL_MSF_DRILLDOWNLEVELTOP					0x00004000L
#define MDPROPVAL_MSF_DRILLDOWNLEVELBOTTOM				0x00008000L
#define MDPROPVAL_MSF_DRILLUPMEMBER						0x00010000L
#define MDPROPVAL_MSF_DRILLUPLEVEL						0x00020000L
#define MDPROPVAL_MSF_TOGGLEDRILLSTATE					0x00040000L
// values for MDPROP_MDX_DESCFLAGS
#define MDPROPVAL_MD_SELF								0x00000001L
#define MDPROPVAL_MD_BEFORE								0x00000002L
#define MDPROPVAL_MD_AFTER								0x00000004L
// values for MDPROP_MDX_STRING_COMPOP
#define MDPROPVAL_MSC_LESSTHAN							0x00000001L
#define MDPROPVAL_MSC_GREATERTHAN						0x00000002L
#define MDPROPVAL_MSC_LESSTHANEQUAL						0x00000004L
#define MDPROPVAL_MSC_GREATERTHANEQUAL					0x00000008L
#define MDPROPVAL_MC_SINGLECASE							0x00000001L
#define MDPROPVAL_MC_SEARCHEDCASE						0x00000002L
#define MDPROPVAL_MOQ_OUTERREFERENCE						0x00000001L
#define MDPROPVAL_MOQ_DATASOURCE_CUBE					0x00000001L
#define MDPROPVAL_MOQ_CATALOG_CUBE						0x00000002L
#define MDPROPVAL_MOQ_SCHEMA_CUBE						0x00000004L
#define MDPROPVAL_MOQ_CUBE_DIM							0x00000008L
#define MDPROPVAL_MOQ_DIM_HIER							0x00000010L
#define MDPROPVAL_MOQ_DIMHIER_LEVEL						0x00000020L
#define MDPROPVAL_MOQ_LEVEL_MEMBER						0x00000040L
#define MDPROPVAL_MOQ_MEMBER_MEMBER						0x00000080L
#define MDPROPVAL_MOQ_DIMHIER_MEMBER						0x00000100L
#define MDPROPVAL_FS_FULL_SUPPORT						0x00000001L
#define MDPROPVAL_FS_GENERATED_COLUMN					0x00000002L
#define MDPROPVAL_FS_GENERATED_DIMENSION					0x00000003L
#define MDPROPVAL_FS_NO_SUPPORT							0x00000004L
#define MDPROPVAL_NL_NAMEDLEVELS							0x00000001L
#define MDPROPVAL_NL_NUMBEREDLEVELS						0x00000002L
#define MDPROPVAL_MJC_SINGLECUBE							0x00000001L
#define MDPROPVAL_MJC_MULTICUBES							0x00000002L
#define MDPROPVAL_MJC_IMPLICITCUBE						0x00000004L
#define MDPROPVAL_RR_NORANGEROWSET						0x00000001L
#define MDPROPVAL_RR_READONLY							0x00000002L
#define MDPROPVAL_RR_UPDATE								0x00000004L
#define MDPROPVAL_MS_MULTIPLETUPLES						0x00000001L
#define MDPROPVAL_MS_SINGLETUPLE						0x00000002L
#define MDPROPVAL_NME_ALLDIMENSIONS						0x00000000L
#define MDPROPVAL_NME_MEASURESONLY						0x00000001L
#define DBPROPVAL_AO_SEQUENTIAL							0x00000000L
#define DBPROPVAL_AO_SEQUENTIALSTORAGEOBJECTS			0x00000001L
#define DBPROPVAL_AO_RANDOM								0x00000002L
#define DBPROPVAL_BD_ROWSET								0x00000000L
#define DBPROPVAL_BD_INTRANSACTION						0x00000001L
#define DBPROPVAL_BD_XTRANSACTION						0x00000002L
#define DBPROPVAL_BD_REORGANIZATION						0x00000003L
#define BMK_DURABILITY_ROWSET							DBPROPVAL_BD_ROWSET
#define BMK_DURABILITY_INTRANSACTION						DBPROPVAL_BD_INTRANSACTION
#define BMK_DURABILITY_XTRANSACTION						DBPROPVAL_BD_XTRANSACTION
#define BMK_DURABILITY_REORGANIZATION					DBPROPVAL_BD_REORGANIZATION
#define DBPROPVAL_BO_NOLOG								0x00000000L
#define DBPROPVAL_BO_NOINDEXUPDATE						0x00000001L
#define DBPROPVAL_BO_REFINTEGRITY						0x00000002L
#if !defined(_WINBASE_)
#define OF_READ             0x00000000
#define OF_WRITE            0x00000001
#define OF_READWRITE        0x00000002
#define OF_SHARE_COMPAT     0x00000000
#define OF_SHARE_EXCLUSIVE  0x00000010
#define OF_SHARE_DENY_WRITE 0x00000020
#define OF_SHARE_DENY_READ  0x00000030
#define OF_SHARE_DENY_NONE  0x00000040
#define OF_PARSE            0x00000100
#define OF_DELETE           0x00000200
#define OF_VERIFY           0x00000400
#define OF_CANCEL           0x00000800
#define OF_CREATE           0x00001000
#define OF_PROMPT           0x00002000
#define OF_EXIST            0x00004000
#define OF_REOPEN           0x00008000
#endif // !_WINBASE_
#define DBPROPVAL_STGM_READ					OF_READ
#define DBPROPVAL_STGM_WRITE					OF_WRITE
#define DBPROPVAL_STGM_READWRITE				OF_READWRITE
#define DBPROPVAL_STGM_SHARE_DENY_NONE		OF_SHARE_DENY_NONE
#define DBPROPVAL_STGM_SHARE_DENY_READ		OF_SHARE_DENY_READ
#define DBPROPVAL_STGM_SHARE_DENY_WRITE		OF_SHARE_DENY_WRITE
#define DBPROPVAL_STGM_SHARE_EXCLUSIVE		OF_SHARE_EXCLUSIVE
#define DBPROPVAL_STGM_DIRECT				0x00010000
#define DBPROPVAL_STGM_TRANSACTED			0x00020000
#define DBPROPVAL_STGM_CREATE				OF_CREATE
#define DBPROPVAL_STGM_CONVERT				0x00040000
#define DBPROPVAL_STGM_FAILIFTHERE			0x00080000
#define DBPROPVAL_STGM_PRIORITY				0x00100000
#define DBPROPVAL_STGM_DELETEONRELEASE		0x00200000
#define DBPROPVAL_GB_COLLATE 				0x00000010L
#define DBPROPVAL_CS_UNINITIALIZED			0x00000000L
#define DBPROPVAL_CS_INITIALIZED				0x00000001L
#define DBPROPVAL_CS_COMMUNICATIONFAILURE	0x00000002L
#define DBPROPVAL_RD_RESETALL		0xffffffffL
#define DBPROPVAL_OS_RESOURCEPOOLING	0x00000001L
#define DBPROPVAL_OS_TXNENLISTMENT	0x00000002L
#define DBPROPVAL_OS_CLIENTCURSOR    0x00000004L
#define DBPROPVAL_OS_ENABLEALL		0xffffffffL
#define DBPROPVAL_BI_CROSSROWSET		0x00000001L
enum DBLITERALENUM
    {	DBLITERAL_INVALID	= 0,
	DBLITERAL_BINARY_LITERAL	= 1,
	DBLITERAL_CATALOG_NAME	= 2,
	DBLITERAL_CATALOG_SEPARATOR	= 3,
	DBLITERAL_CHAR_LITERAL	= 4,
	DBLITERAL_COLUMN_ALIAS	= 5,
	DBLITERAL_COLUMN_NAME	= 6,
	DBLITERAL_CORRELATION_NAME	= 7,
	DBLITERAL_CURSOR_NAME	= 8,
	DBLITERAL_ESCAPE_PERCENT	= 9,
	DBLITERAL_ESCAPE_UNDERSCORE	= 10,
	DBLITERAL_INDEX_NAME	= 11,
	DBLITERAL_LIKE_PERCENT	= 12,
	DBLITERAL_LIKE_UNDERSCORE	= 13,
	DBLITERAL_PROCEDURE_NAME	= 14,
	DBLITERAL_QUOTE	= 15,
	DBLITERAL_SCHEMA_NAME	= 16,
	DBLITERAL_TABLE_NAME	= 17,
	DBLITERAL_TEXT_COMMAND	= 18,
	DBLITERAL_USER_NAME	= 19,
	DBLITERAL_VIEW_NAME	= 20
    } ;
//@@@- V1.5
//@@@+ V2.0
#define DBLITERAL_QUOTE_PREFIX DBLITERAL_QUOTE

enum DBLITERALENUM20
    {	DBLITERAL_CUBE_NAME	= 21,
	DBLITERAL_DIMENSION_NAME	= 22,
	DBLITERAL_HIERARCHY_NAME	= 23,
	DBLITERAL_LEVEL_NAME	= 24,
	DBLITERAL_MEMBER_NAME	= 25,
	DBLITERAL_PROPERTY_NAME	= 26,
	DBLITERAL_SCHEMA_SEPARATOR	= 27,
	DBLITERAL_QUOTE_SUFFIX	= 28
    } ;
#else
#include <oledb.h>
#endif
//#include <objbase.h>
//#include <initguid.h>
//#include <mapinls.h>

Lines 2-8 Link Here

(-)oo_1.1.1_src/cosv/prj/d.lst.orig (-1 / +1 lines)
2	mkdir: %_DEST%\inc%_EXT%\cosv\template	2	mkdir: %_DEST%\inc%_EXT%\cosv\template
3		3
4	..\%__SRC%\lib\cosv.lib %_DEST%\lib%_EXT%\cosv.lib	4	..\%__SRC%\lib\cosv.lib %_DEST%\lib%_EXT%\cosv.lib
5	..\%__SRC%\lib\libcosv.a %_DEST%\lib%_EXT%\libcosv.a	5	..\%__SRC%\lib\libcosv.a %_DEST%\lib%_EXT%\.a
6	..\inc\cosv\.hxx %_DEST%\inc%_EXT%\cosv\.hxx	6	..\inc\cosv\.hxx %_DEST%\inc%_EXT%\cosv\.hxx
7	..\inc\cosv\.h %_DEST%\inc%_EXT%\cosv\.h	7	..\inc\cosv\.h %_DEST%\inc%_EXT%\cosv\.h
8	..\inc\cosv\template\.hxx %_DEST%\inc%_EXT%\cosv\template\.hxx	8	..\inc\cosv\template\.hxx %_DEST%\inc%_EXT%\cosv\template\.hxx

Lines 65-71 Link Here

(-)oo_1.1.1_src/cosv/source/comphelp/badcast.cxx.orig (-1 / +1 lines)
65	due to problems with WNT-STL-headers.	65	due to problems with WNT-STL-headers.
66	*/	66	*/
67		67
68	#ifdef WNT	68	#if defined(WNT) && !defined(__MINGW32__)
69		69
70	#define _NTSDK	70	#define _NTSDK
71	#include<typeinfo>	71	#include<typeinfo>

Lines 118-124 Link Here

(-)oo_1.1.1_src/cppuhelper/source/mingw.map.orig (-1 / +1 lines)
118	_ZN4cppu22createComponentContextEPKNS_17ContextEntry_InitElRKN3com3sun4star3uno9ReferenceINS6_17XComponentContextEEE;	118	_ZN4cppu22createComponentContextEPKNS_17ContextEntry_InitElRKN3com3sun4star3uno9ReferenceINS6_17XComponentContextEEE;
119	_ZN4cppu22getImplHelperInitMutexEv;	119	_ZN4cppu22getImplHelperInitMutexEv;
120	_ZN4cppu23WeakImplHelper_getTypesEPNS_10class_dataE;	120	_ZN4cppu23WeakImplHelper_getTypesEPNS_10class_dataE;
121	_ZN4cppu23bootstrapInitialContextERKN3com3sun4star3uno9ReferenceINS2_4lang22XMultiComponentFactoryEEERKNS4_INS2_8registry15XSimpleRegistryEEESE_RKN3rtl8OUStringE;	121	_ZN4cppu23bootstrapInitialContextERKN3com3sun4star3uno9ReferenceINS2_4lang22XMultiComponentFactoryEEERKNS4_INS2_8registry15XSimpleRegistryEEESE_RKN3rtl8OUStringERKNSF_9BootstrapE;
122	_ZN4cppu24OInterfaceIteratorHelper4nextEv;	122	_ZN4cppu24OInterfaceIteratorHelper4nextEv;
123	_ZN4cppu24OInterfaceIteratorHelper6removeEv;	123	_ZN4cppu24OInterfaceIteratorHelper6removeEv;
124	_ZN4cppu24OInterfaceIteratorHelperC1ERNS_25OInterfaceContainerHelperE;	124	_ZN4cppu24OInterfaceIteratorHelperC1ERNS_25OInterfaceContainerHelperE;




static bool ParseCommandArgs( LPDWORD pdwProcessId, PEXCEPTION_POINTERS* ppException, LPDWORD pdwThreadId )
{
	int		argc = __argc;
#ifdef __MINGW32__
#ifdef _UNICODE
	TCHAR	**argv = alloca((argc+1)*sizeof(WCHAR*));
	int *sizes = alloca(argc*sizeof(int));
	int argsize=0;
	char **ptr;
	int i;
	ptr=__argv;
	for (i = 0; i < argc; ++i)
	{
		sizes[i]=MultiByteToWideChar(CP_ACP, 0, *ptr, -1, NULL, 0);
		argsize+=sizes[i]+1;
		++ptr;
	}
	++argsize;
	TCHAR	*args = alloca(argsize*sizeof(WCHAR));
	ptr=__argv;
	TCHAR *cptr=args;
	for (i = 0; i < argc; ++i)
	{
		argv[i]=cptr;
		MultiByteToWideChar( CP_ACP, 0, *ptr, -1, cptr, sizes[i] );
		++ptr;
		cptr+=sizes[i];
		*cptr=0;
		++cptr;
	}
	argv[i]=cptr;
	*cptr=0;
#else
	TCHAR	**argv = __argv;
#endif
#else
	TCHAR	**argv = __targv;
#endif
	bool	bSuccess = true;

	for ( int argn = 1; bSuccess && argn < argc; argn++ )


//***************************************************************************

#ifdef __MINGW32__
int WINAPI WinMain( HINSTANCE hInstance, HINSTANCE, LPSTR lpCmdLine, int )
#else
int WINAPI _tWinMain( HINSTANCE hInstance, HINSTANCE, LPTSTR lpCmdLine, int )
#endif
{
	int exitcode = -1;


Lines 36-62 Link Here

(-)- misc/build/curl-7.9.8/lib/easy.c (-1 / +9 lines)
36		36
37	# This flag accepts an argument of the form current[:revision[:age]]. So,	37	# This flag accepts an argument of the form current[:revision[:age]]. So,
38	# passing -version-info 3:12:1 sets current to 3, revision to 12, and age to	38	# passing -version-info 3:12:1 sets current to 3, revision to 12, and age to
		39	--- misc/build/curl-7.9.8/lib/http.c.orig 2002-06-11 20:13:02.000000000 +0900
Lines 64-70 Link Here
64	/* duplicate all values in 'change' */	1050	/* duplicate all values in 'change' */
65	if(data->change.url) {	1051	if(data->change.url) {
66	outcurl->change.url = strdup(data->change.url);	1052	outcurl->change.url = strdup(data->change.url);
67	--- 314,320 ----	1053	--- 311,324 ----
		1054
		1055	outcurl->progress.flags = data->progress.flags;
		1056	outcurl->progress.callback = data->progress.callback;
		1057	! #ifndef CURL_DISABLE_HTTP
		1058	if(data->cookies)
		1059	/* If cookies are enabled in the parent handle, we enable them
		1060	in the clone as well! */
68	outcurl->cookies = Curl_cookie_init(data->cookies->filename,	1061	outcurl->cookies = Curl_cookie_init(data->cookies->filename,
69	outcurl->cookies,	1062	outcurl->cookies,
70	data->set.cookiesession);	1063	data->set.cookiesession);
Lines 73-79 Link Here
73	if(data->change.url) {	1066	if(data->change.url) {
74	outcurl->change.url = strdup(data->change.url);	1067	outcurl->change.url = strdup(data->change.url);
75	*** misc/curl-7.9.8/lib/ftp.c Thu Jun 13 11:21:08 2002	1068	*** misc/curl-7.9.8/lib/ftp.c Thu Jun 13 11:21:08 2002




    if (data->set.tunnel_thru_httpproxy) {
      /* We want "seamless" FTP operations through HTTP proxy tunnel */
      result = Curl_ConnectHTTPProxyTunnel(conn, conn->firstsocket,
--- 448,454 ----
    /* no need to duplicate them, the data struct won't change */
    ftp->user = data->state.user;
    ftp->passwd = data->state.passwd;

    if(conn->protocol & PROT_FTPS) {
      /* FTPS is simply ftp with SSL for the control channel */
      /* now, perform the SSL initialization for this socket */
--- 456,462 ----
      if(CURLE_OK != result)
        return result;
    }

    if (data->set.tunnel_thru_httpproxy) {
      /* We want "seamless" FTP operations through HTTP proxy tunnel */
      result = Curl_ConnectHTTPProxyTunnel(conn, conn->secondarysocket,
--- 1498,1504 ----
    
    if(CURLE_OK != result)
      return result;

    return CURLE_OK;
  }
  
--- 1506,1512 ----
      if(CURLE_OK != result)
        return result;
    }

  }
  
*** misc/curl-7.9.8/lib/transfer.c	Thu Jun 13 10:12:22 2002

Lines 161-167 Link Here

(-)- misc/build/curl-7.9.8/lib/transfer.c (-2 / +2 lines)
161	if (sscanf (k->p+14, " bytes %d-", &k->offset) \|\|	1185	if (sscanf (k->p+14, " bytes %d-", &k->offset) \|\|
162	***************	1186	***************
163	* 585,594 **	1187	* 585,594 **
164	--- 587,598 ----	1188	--- 591,602 ----
165	}	1189	}
166	}	1190	}
167	}	1191	}
Lines 185-191 Link Here
185	if(CHUNKE_OK < res) {	1209	if(CHUNKE_OK < res) {
186	if(CHUNKE_WRITE_ERROR == res) {	1210	if(CHUNKE_WRITE_ERROR == res) {
187	failf(data, "Failed writing data");	1211	failf(data, "Failed writing data");
188	--- 739,750 ----	1212	--- 743,754 ----
189	* the name says read, this function both reads and writes away	1213	* the name says read, this function both reads and writes away
190	* the data. The returned 'nread' holds the number of actual	1214	* the data. The returned 'nread' holds the number of actual
191	* data it wrote to the client. */	1215	* data it wrote to the client. */
Lines 199-205 Link Here
199	if(CHUNKE_WRITE_ERROR == res) {	1223	if(CHUNKE_WRITE_ERROR == res) {
200	failf(data, "Failed writing data");	1224	failf(data, "Failed writing data");
201	*** misc/curl-7.9.8/lib/url.c Tue Jun 11 17:47:01 2002	1225	*** misc/curl-7.9.8/lib/url.c Tue Jun 11 17:47:01 2002

Lines 209-215 Link Here

(-)- misc/build/curl-7.9.8/lib/url.c (-2 / +36 lines)
209	/*************************************************************	1250	/*************************************************************
210	* Detect what (if any) proxy to use	1251	* Detect what (if any) proxy to use
211	*************************************************************/	1252	*************************************************************/
212	--- 1598,1604 ----	1253	--- 1605,1611 ----
213	conn->ppath = conn->path;	1254	conn->ppath = conn->path;
214	conn->hostname = conn->name;	1255	conn->hostname = conn->name;
215		1256
Lines 226-232 Link Here
226	/*************************************************************	1267	/*************************************************************
227	* No protocol part in URL was used, add it!	1268	* No protocol part in URL was used, add it!
228	*************************************************************/	1269	*************************************************************/
229	--- 1708,1714 ----	1270	--- 1715,1721 ----
230	if(no_proxy)	1271	if(no_proxy)
231	free(no_proxy);	1272	free(no_proxy);
232	} /* if not using proxy */	1273	} /* if not using proxy */
Lines 234-236 Link Here
234	/*************************************************************	1275	/*************************************************************
235	* No protocol part in URL was used, add it!	1276	* No protocol part in URL was used, add it!
236	*************************************************************/	1277	*************************************************************/
		1278	***************
		1279	* 2264,2270 **
		1280	* Store the old value to be able to set it back later!
		1281	*************************************************************/
		1282
		1283	! #ifdef HAVE_SIGACTION
		1284	struct sigaction sigact;
		1285	sigaction(SIGALRM, NULL, &sigact);
		1286	keep_sigact = sigact;
		1287	--- 2271,2277 ----
		1288	* Store the old value to be able to set it back later!
		1289	*************************************************************/
		1290
		1291	! #if defined(HAVE_SIGACTION) && defined(SIGALRM)
		1292	struct sigaction sigact;
		1293	sigaction(SIGALRM, NULL, &sigact);
		1294	keep_sigact = sigact;
		1295	***************
		1296	* 2278,2284 **
		1297	sigaction(SIGALRM, &sigact, NULL);
		1298	#else
		1299	/* no sigaction(), revert to the much lamer signal() */
		1300	! #ifdef HAVE_SIGNAL
		1301	keep_sigact = signal(SIGALRM, alarmfunc);
		1302	#endif
		1303	#endif
		1304	--- 2285,2291 ----
		1305	sigaction(SIGALRM, &sigact, NULL);
		1306	#else
		1307	/* no sigaction(), revert to the much lamer signal() */
		1308	! #if defined(HAVE_SIGNAL) && defined(SIGALRM)
		1309	keep_sigact = signal(SIGALRM, alarmfunc);
		1310	#endif
		1311	#endif

Lines 1-5 Link Here

(-)oo_1.1.1_src/dbaccess/prj/d.lst.orig (+1 lines)
1	..\%__SRC%\bin\.dll %_DEST%\bin%_EXT%\.dll	1	..\%__SRC%\bin\.dll %_DEST%\bin%_EXT%\.dll
2	..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%	2	..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%
		3	..\%__SRC%\lib\lib*.a %_DEST%\lib%_EXT%
3	..\%__SRC%\lib\lib*.dylib %_DEST%\lib%_EXT%	4	..\%__SRC%\lib\lib*.dylib %_DEST%\lib%_EXT%
4	..\%__SRC%\lib\.sl %_DEST%\lib%_EXT%\.sl	5	..\%__SRC%\lib\.sl %_DEST%\lib%_EXT%\.sl
5	..\%__SRC%\bin\.bin %_DEST%\bin%_EXT%\.bin	6	..\%__SRC%\bin\.bin %_DEST%\bin%_EXT%\.bin

Lines 469-477 Link Here

(-)oo_1.1.1_src/dbaccess/source/ui/browser/genericcontroller.cxx.orig (-4 / +18 lines)
469	}	469	}
470		470
471	// -----------------------------------------------------------------------	471	// -----------------------------------------------------------------------
472	void OGenericUnoController::InvalidateFeature(const ::rtl::OUString& _rURLPath, const Reference< XStatusListener > & _xListener, sal_Bool _bForceBroadcast)	472	void OGenericUnoController::InvalidateFeature(const ::rtl::OUString& _rURLPath, const Reference< XStatusListener > * _pxListener, sal_Bool _bForceBroadcast)
473	{	473	{
474	ImplInvalidateFeature( m_aSupportedFeatures[_rURLPath], _xListener, _bForceBroadcast );	474	if (_pxListener == NULL)
		475	{
		476	ImplInvalidateFeature( m_aSupportedFeatures[_rURLPath], Reference< XStatusListener >(), _bForceBroadcast );
		477	}
		478	else
		479	{
		480	ImplInvalidateFeature( m_aSupportedFeatures[_rURLPath], *_pxListener, _bForceBroadcast );
		481	}
475	}	482	}
476		483
477	// -----------------------------------------------------------------------------	484	// -----------------------------------------------------------------------------
Lines 546-554 Link Here
546	}	553	}
547		554
548	// -----------------------------------------------------------------------	555	// -----------------------------------------------------------------------
549	void OGenericUnoController::InvalidateFeature(sal_uInt16 _nId, const Reference< XStatusListener > & _xListener, sal_Bool _bForceBroadcast)	556	void OGenericUnoController::InvalidateFeature(sal_uInt16 _nId, const Reference< XStatusListener > * _pxListener, sal_Bool _bForceBroadcast)
550	{	557	{
551	ImplInvalidateFeature( _nId, _xListener, _bForceBroadcast );	558	if (_pxListener == NULL)
		559	{
		560	ImplInvalidateFeature( _nId, Reference< XStatusListener >(), _bForceBroadcast );
		561	}
		562	else
		563	{
		564	ImplInvalidateFeature( _nId, *_pxListener, _bForceBroadcast );
		565	}
552	}	566	}
553		567
554	// -----------------------------------------------------------------------	568	// -----------------------------------------------------------------------




}

//---------------------------------------------------------------------------------------
void SbaXGridPeer::NotifyStatusChanged(const ::com::sun::star::util::URL& _rUrl, const Reference< ::com::sun::star::frame::XStatusListener > * pxControl)
{
	if (pxControl == NULL)
	{
		NotifyStatusChangedImpl(_rUrl, Reference< ::com::sun::star::frame::XStatusListener > ());
	}
	else
	{
		NotifyStatusChangedImpl(_rUrl, *pxControl);
	}
}

//---------------------------------------------------------------------------------------
void SbaXGridPeer::NotifyStatusChangedImpl(const ::com::sun::star::util::URL& _rUrl, const Reference< ::com::sun::star::frame::XStatusListener > & xControl)
{
	SbaGridControl* pGrid = (SbaGridControl*) GetWindow();
	if (!pGrid)

		m_aStatusListeners.addInterface(aURL,xControl);
	else
		pCont->addInterface(xControl);
	NotifyStatusChanged(aURL, &xControl);
}

//---------------------------------------------------------------------------------------

Lines 1437-1445 Link Here

(-)oo_1.1.1_src/dbaccess/source/ui/browser/unodatbr.cxx.orig (-2 / +2 lines)
1437	SbaXDataBrowserController::ColumnChanged();	1437	SbaXDataBrowserController::ColumnChanged();
1438	}	1438	}
1439	// -----------------------------------------------------------------------	1439	// -----------------------------------------------------------------------
1440	void SbaTableQueryBrowser::InvalidateFeature(sal_uInt16 nId, const Reference< ::com::sun::star::frame::XStatusListener > & xListener)	1440	void SbaTableQueryBrowser::InvalidateFeature(sal_uInt16 nId, const Reference< ::com::sun::star::frame::XStatusListener > * pxListener)
1441	{	1441	{
1442	SbaXDataBrowserController::InvalidateFeature(nId, xListener);	1442	SbaXDataBrowserController::InvalidateFeature(nId, pxListener);
1443	}	1443	}
1444		1444
1445	//------------------------------------------------------------------------------	1445	//------------------------------------------------------------------------------




		virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > getComponentWindow() const;
		// if xListener is NULL the change will be forwarded to all listeners to the given ::com::sun::star::util::URL
		// if _bForceBroadcast is sal_True, the current feature state is broadcasted no matter if it is the same as the cached state
		virtual void InvalidateFeature(const ::rtl::OUString& rURLPath, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > * pxListener = NULL, sal_Bool _bForceBroadcast = sal_False);
			
		// if there is an ::com::sun::star::util::URL translation for the id ('handle') the preceding InvalidateFeature is used.
		// if there is a toolbar slot with the given id it is updated (the new state is determined via GetState)
		// if _bForceBroadcast is sal_True, the current feature state is broadcasted no matter if it is the same as the cached state
		virtual void InvalidateFeature(sal_uInt16 nId, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > * pxListener = NULL, sal_Bool _bForceBroadcast = sal_False);

		/** InvalidateAll invalidates all features currently known
		*/

Lines 199-205 Link Here

(-)oo_1.1.1_src/dbaccess/source/ui/inc/sbagrid.hxx.orig (-1 / +4 lines)
199	protected:	199	protected:
200	virtual FmGridControl* imp_CreateControl(Window* pParent, WinBits nStyle);	200	virtual FmGridControl* imp_CreateControl(Window* pParent, WinBits nStyle);
201		201
202	void NotifyStatusChanged(const ::com::sun::star::util::URL& aUrl, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > & xControl = ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > ());	202	void NotifyStatusChanged(const ::com::sun::star::util::URL& aUrl,
		203	const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > * pxControl = NULL);
203		204
204	private:	205	private:
205	// for asny execution of XDispatch::dispatch	206	// for asny execution of XDispatch::dispatch
Lines 210-215 Link Here
210	};	211	};
211	::std::queue< DispatchArgs > m_aDispatchArgs;	212	::std::queue< DispatchArgs > m_aDispatchArgs;
212	DECL_LINK( OnDispatchEvent, void* );	213	DECL_LINK( OnDispatchEvent, void* );
		214	void NotifyStatusChangedImpl(const ::com::sun::star::util::URL& aUrl,
		215	const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > & xControl);
213		216
214	// for dynamic states of our 4 dispatchable URLs	217	// for dynamic states of our 4 dispatchable URLs
215	enum DispatchType	218	enum DispatchType

Lines 256-262 Link Here

(-)oo_1.1.1_src/dbaccess/source/ui/inc/unodatbr.hxx.orig (-1 / +1 lines)
256		256
257	virtual ToolBox* CreateToolBox(Window* pParent);	257	virtual ToolBox* CreateToolBox(Window* pParent);
258		258
259	virtual void InvalidateFeature(sal_uInt16 nId, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > & xListener = ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > ());	259	virtual void InvalidateFeature(sal_uInt16 nId, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > * pxListener = NULL);
260		260
261	virtual void addModelListeners(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > & _xGridControlModel);	261	virtual void addModelListeners(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > & _xGridControlModel);
262	virtual void removeModelListeners(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > & _xGridControlModel);	262	virtual void removeModelListeners(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > & _xGridControlModel);




..\%__SRC%\bin\spl*.dll %_DEST%\bin%_EXT%\spl*.dll
..\%__SRC%\bin\socomp.dll %_DEST%\bin%_EXT%\socomp.dll
..\%__SRC%\lib\libwrp*.so %_DEST%\lib%_EXT%\libwrp*.so
..\%__SRC%\lib\libwrp*.a %_DEST%\lib%_EXT%\libwrp*.a
..\%__SRC%\lib\libwrp*.dylib %_DEST%\lib%_EXT%\libwrp*.dylib
..\%__SRC%\lib\libspl*.so %_DEST%\lib%_EXT%\libspl*.so
..\%__SRC%\lib\libspl*.a %_DEST%\lib%_EXT%\libspl*.a
..\%__SRC%\lib\libspl*.dylib %_DEST%\lib%_EXT%\libspl*.dylib
..\%__SRC%\lib\libsocomp.so %_DEST%\lib%_EXT%\libsocomp.so
..\%__SRC%\lib\libsocomp.a %_DEST%\lib%_EXT%\libsocomp.a
..\%__SRC%\lib\libsocomp.dylib %_DEST%\lib%_EXT%\libsocomp.dylib
..\%__SRC%\bin\offacc*.dll %_DEST%\bin%_EXT%\offacc*.dll
..\%__SRC%\lib\liboffacc*.so %_DEST%\lib%_EXT%\liboffacc*.so
..\%__SRC%\lib\liboffacc*.a %_DEST%\lib%_EXT%\liboffacc*.a
..\%__SRC%\lib\liboffacc*.dylib %_DEST%\lib%_EXT%\liboffacc*.dylib

..\%__SRC%\bin\sweb %_DEST%\bin%_EXT%\sweb.bin

..\%__SRC%\bin\pkgchk %_DEST%\bin%_EXT%\pkgchk.bin
..\%__SRC%\bin\pkgchk*.dll %_DEST%\bin%_EXT%\pkgchk*.dll
..\%__SRC%\lib\libpkgchk*.so %_DEST%\lib%_EXT%\libpkgchk*.so
..\%__SRC%\lib\libpkgchk*.a %_DEST%\lib%_EXT%\libpkgchk*.a
..\%__SRC%\lib\libpkgchk*.dylib %_DEST%\lib%_EXT%\libpkgchk*.dylib

..\%__SRC%\bin\pagein %_DEST%\bin%_EXT%\pagein

Lines 6124-6130 Link Here

(-)oo_1.1.1_src/dmake/configure.orig (-1 / +1 lines)
6124		6124
6125	if test `echo $_os \| $AWK -F_ '{ print $1 }'` = "CYGWIN"; then	6125	if test `echo $_os \| $AWK -F_ '{ print $1 }'` = "CYGWIN"; then
6126	if test "$GCC" = "yes"; then	6126	if test "$GCC" = "yes"; then
6127	if test `$CC -dumpmachine \| $AWK -F- '{ print $3 }'` = "mingw32"; then	6127	if test `$CC -dumpmachine \| $AWK -F- '{ print $1 }'` = "mingw32"; then
6128	_os="MINGW"	6128	_os="MINGW"
6129	else	6129	else
6130	_os="CYGWIN"	6130	_os="CYGWIN"

Lines 118-124 Link Here

(-)oo_1.1.1_src/dmake/win95/microsft/Makefile.in.orig (-1 / +1 lines)
118		118
119	libmsft_a_SOURCES = ruletab.c	119	libmsft_a_SOURCES = ruletab.c
120		120
121	INCLUDES = -I$(top_srcdir) -I$(top_builddir) -I..	121	INCLUDES = -I$(top_srcdir) -I$(top_builddir) -I$(top_srcdir)/@OS_TYPE@/@OS_VERSION@ -I..
122	subdir = win95/microsft	122	subdir = win95/microsft
123	ACLOCAL_M4 = $(top_srcdir)/aclocal.m4	123	ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
124	mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs	124	mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs

Lines 1-4 Link Here

(-)oo_1.1.1_src/dtrans/prj/d.lst.orig (+1 lines)
1	..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%	1	..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%
		2	..\%__SRC%\lib\lib*.a %_DEST%\lib%_EXT%
2	..\%__SRC%\bin\.dll %_DEST%\bin%_EXT%\.dll	3	..\%__SRC%\bin\.dll %_DEST%\bin%_EXT%\.dll
3	..\%__SRC%\lib\.dylib %_DEST%\lib%_EXT%\.dylib	4	..\%__SRC%\lib\.dylib %_DEST%\lib%_EXT%\.dylib
4		5

Lines 70-75 Link Here

(-)oo_1.1.1_src/dtrans/source/inc/MtaOleClipb.hxx.orig (+3 lines)
70	#include <osl/mutex.hxx>	70	#include <osl/mutex.hxx>
71	#endif	71	#endif
72		72
		73	#ifdef __MINGW32__
		74	#include <windows.h>
		75	#endif
73	#include <objidl.h>	76	#include <objidl.h>
74		77
75	//--------------------------------------------------------	78	//--------------------------------------------------------




}

void SAL_CALL SourceContext::setCursor( sal_Int32 cursorId )
	throw( RuntimeException)
{
}

void SAL_CALL SourceContext::setImage( sal_Int32 imageId )
	throw( RuntimeException)
{
}


Lines 110-118 Link Here

(-)oo_1.1.1_src/dtrans/source/win32/dnd/sourcecontext.hxx.orig (-2 / +2 lines)
110	virtual sal_Int32 SAL_CALL getCurrentCursor( )	110	virtual sal_Int32 SAL_CALL getCurrentCursor( )
111	throw( RuntimeException);	111	throw( RuntimeException);
112	virtual void SAL_CALL setCursor( sal_Int32 cursorId )	112	virtual void SAL_CALL setCursor( sal_Int32 cursorId )
113	throw( IllegalArgumentException, RuntimeException);	113	throw( RuntimeException);
114	virtual void SAL_CALL setImage( sal_Int32 imageId )	114	virtual void SAL_CALL setImage( sal_Int32 imageId )
115	throw( IllegalArgumentException, RuntimeException);	115	throw( RuntimeException);
116	virtual void SAL_CALL transferablesFlavorsChanged( )	116	virtual void SAL_CALL transferablesFlavorsChanged( )
117	throw( RuntimeException);	117	throw( RuntimeException);
118		118

Lines 84-89 Link Here

(-)oo_1.1.1_src/dtrans/source/win32/dnd/target.hxx.orig (+1 lines)
84	#include <osl/mutex.hxx>	84	#include <osl/mutex.hxx>
85	#endif	85	#endif
86		86
		87	#include <windows.h>
87	#include <oleidl.h>	88	#include <oleidl.h>
88	#include "globals.hxx"	89	#include "globals.hxx"
89	#include "../../inc/DtObjFactory.hxx"	90	#include "../../inc/DtObjFactory.hxx"




#endif


#if(_MSC_VER < 1300) && !defined(__MINGW32__)
#include <olestd.h>
#endif


using namespace com::sun::star::io;
using namespace com::sun::star::lang;
using namespace com::sun::star::container;
//using CStgTransferHelper::CStgTransferException;

//------------------------------------------------------------------------
// 


		ReleaseStgMedium( &stgmedium );
	}
	catch( CStgTransferHelper::CStgTransferException& )
	{		
		ReleaseStgMedium( &stgmedium );
		throw IOException( );

Lines 105-111 Link Here

(-)oo_1.1.1_src/dtrans/source/win32/dtobj/DataFmtTransl.cxx.orig (-1 / +1 lines)
105		105
106	#include <windows.h>	106	#include <windows.h>
107		107
108	#if (_MSC_VER < 1300)	108	#if (_MSC_VER < 1300) && !defined(__MINGW32__)
109	#include <olestd.h>	109	#include <olestd.h>
110	#endif	110	#endif
111		111

Lines 76-84 Link Here

(-)oo_1.1.1_src/dtrans/source/win32/dtobj/XNotifyingDataObject.hxx.orig (-1 / +1 lines)
76	#include <com/sun/star/datatransfer/clipboard/XClipboardOwner.hpp>	76	#include <com/sun/star/datatransfer/clipboard/XClipboardOwner.hpp>
77	#endif	77	#endif
78		78
79	#include <objidl.h>
80	#include <windows.h>	79	#include <windows.h>
81	#include <comdef.h>	80	#include <comdef.h>
		81	#include <objidl.h>
82		82
83	/*--------------------------------------------------------------------------	83	/*--------------------------------------------------------------------------
84	To implement the lostOwnership mechanism cleanly we need this wrapper	84	To implement the lostOwnership mechanism cleanly we need this wrapper

Lines 95-102 Link Here

(-)oo_1.1.1_src/dtrans/source/win32/dtobj/XTDataObject.cxx.orig (-3 / +11 lines)
95	#include "FmtFilter.hxx"	95	#include "FmtFilter.hxx"
96	#endif	96	#endif
97		97
		98	#ifdef __MINGW32__
		99	#include <comdef.h>
		100	#else
98	#include <windows.h>	101	#include <windows.h>
99	#include <shlobj.h>	102	#include <shlobj.h>
		103	#endif
100		104
101	//------------------------------------------------------------------------	105	//------------------------------------------------------------------------
102	// namespace directives	106	// namespace directives
Lines 107-113 Link Here
107	using namespace com::sun::star::uno;	111	using namespace com::sun::star::uno;
108	using namespace com::sun::star::lang;	112	using namespace com::sun::star::lang;
109	using namespace rtl;	113	using namespace rtl;
110	using CStgTransferHelper::CStgTransferException;	114	//using CStgTransferHelper::CStgTransferException;
111		115
112	//------------------------------------------------------------------------	116	//------------------------------------------------------------------------
113	// a helper class that will be thrown by the function validateFormatEtc	117	// a helper class that will be thrown by the function validateFormatEtc
Lines 218-224 Link Here
218	{	222	{
219	return ex.m_hr;	223	return ex.m_hr;
220	}	224	}
221	catch( CStgTransferException& ex )	225	catch( CStgTransferHelper::CStgTransferException& ex )
222	{	226	{
223	return translateStgExceptionCode( ex.m_hr );	227	return translateStgExceptionCode( ex.m_hr );
224	}	228	}
Lines 405-411 Link Here
405	{	409	{
406	OSL_ENSURE( sal_False, "Unexpected exception" );	410	OSL_ENSURE( sal_False, "Unexpected exception" );
407	}	411	}
408	catch( CStgTransferException& ex )	412	catch( CStgTransferHelper::CStgTransferException& ex )
409	{	413	{
410	return translateStgExceptionCode( ex.m_hr );	414	return translateStgExceptionCode( ex.m_hr );
411	}	415	}
Lines 479-485 Link Here
479		483
480	WideCharToMultiByteEx(	484	WideCharToMultiByteEx(
481	GetACP( ),	485	GetACP( ),
		486	#ifdef __MINGW32__
		487	reinterpret_cast< const wchar_t * >( const_cast< const sal_Unicode * >( aUnicodeText.getStr( ) ) ),
		488	#else
482	static_cast< const sal_Unicode* >( aUnicodeText.getStr( ) ),	489	static_cast< const sal_Unicode* >( aUnicodeText.getStr( ) ),
		490	#endif
483	aUnicodeText.getLength( ),	491	aUnicodeText.getLength( ),
484	stgTransfHelper );	492	stgTransfHelper );
485		493

Lines 144-160 Link Here

(-)oo_1.1.1_src/dtrans/source/win32/misc/ImplHelper.cxx.orig (-14 / +72 lines)
144	OUString winCP;	144	OUString winCP;
145		145
146	// set an default value	146	// set an default value
		147	#ifdef __MINGW32__
		148	wchar_t wcstr[10];
		149	#else
147	sal_Unicode wcstr[10];	150	sal_Unicode wcstr[10];
		151	#endif
148		152
149	if ( LOCALE_IDEFAULTCODEPAGE == lctype )	153	if ( LOCALE_IDEFAULTCODEPAGE == lctype )
150	{	154	{
151	_itow( GetOEMCP( ), wcstr, 10 );	155	_itow( GetOEMCP( ), wcstr, 10 );
		156	#ifdef __MINGW32__
		157	winCP = OUString( reinterpret_cast< sal_Unicode * >( wcstr ), wcslen( wcstr ) );
		158	#else
152	winCP = OUString( wcstr, wcslen( wcstr ) );	159	winCP = OUString( wcstr, wcslen( wcstr ) );
		160	#endif
153	}	161	}
154	else if ( LOCALE_IDEFAULTANSICODEPAGE == lctype )	162	else if ( LOCALE_IDEFAULTANSICODEPAGE == lctype )
155	{	163	{
156	_itow( GetACP( ), wcstr, 10 );	164	_itow( GetACP( ), wcstr, 10 );
		165	#ifdef __MINGW32__
		166	winCP = OUString( reinterpret_cast< sal_Unicode * >( wcstr ), wcslen( wcstr ) );
		167	#else
157	winCP = OUString( wcstr, wcslen( wcstr ) );	168	winCP = OUString( wcstr, wcslen( wcstr ) );
		169	#endif
158	}	170	}
159	else	171	else
160	OSL_ASSERT( sal_False );	172	OSL_ASSERT( sal_False );
Lines 179-186 Link Here
179	if ( NULL != lpwchBuff.get( ) )	191	if ( NULL != lpwchBuff.get( ) )
180	{	192	{
181	len = MultiByteToWideChar(	193	len = MultiByteToWideChar(
		194	#ifdef __MINGW32__
		195	CP_ACP, 0, buff, -1, reinterpret_cast< wchar_t * >( lpwchBuff.get( ) ), len );
		196	#else
182	CP_ACP, 0, buff, -1, lpwchBuff.get( ), len );	197	CP_ACP, 0, buff, -1, lpwchBuff.get( ), len );
183		198	#endif
184	winCP = OUString( lpwchBuff.get( ), (len - 1) );	199	winCP = OUString( lpwchBuff.get( ), (len - 1) );
185	}	200	}
186	}	201	}
Lines 239-247 Link Here
239	{	254	{
240	OSL_ASSERT( IsValidCodePage( codepage ) );	255	OSL_ASSERT( IsValidCodePage( codepage ) );
241		256
		257	#ifdef __MINGW32__
		258	wchar_t cpStr[6];
		259	_itow( codepage, cpStr, 10 );
		260	return OUString( reinterpret_cast< sal_Unicode * >( cpStr ), wcslen( cpStr ) );
		261	#else
242	sal_Unicode cpStr[6];	262	sal_Unicode cpStr[6];
243	_itow( codepage, cpStr, 10 );	263	_itow( codepage, cpStr, 10 );
244	return OUString( cpStr, wcslen( cpStr ) );	264	return OUString( cpStr, wcslen( cpStr ) );
		265	#endif
245	}	266	}
246		267
247	//-------------------------------------------------------------------------	268	//-------------------------------------------------------------------------
Lines 257-267 Link Here
257		278
258	void SAL_CALL DeleteTargetDevice( DVTARGETDEVICE* ptd )	279	void SAL_CALL DeleteTargetDevice( DVTARGETDEVICE* ptd )
259	{	280	{
		281	#ifdef __MINGW32__
		282	try
		283	#else
260	__try	284	__try
		285	#endif
261	{	286	{
262	CoTaskMemFree( ptd );	287	CoTaskMemFree( ptd );
263	}	288	}
		289	#ifdef __MINGW32__
		290	catch(...)
		291	#else
264	__except( EXCEPTION_EXECUTE_HANDLER )	292	__except( EXCEPTION_EXECUTE_HANDLER )
		293	#endif
265	{	294	{
266	OSL_ENSURE( sal_False, "Error DeleteTargetDevice" );	295	OSL_ENSURE( sal_False, "Error DeleteTargetDevice" );
267	}	296	}
Lines 291-297 Link Here
291	{	320	{
292	DVTARGETDEVICE* ptdDest = NULL;	321	DVTARGETDEVICE* ptdDest = NULL;
293		322
		323	#ifdef __MINGW32__
		324	try
		325	#else
294	__try	326	__try
		327	#endif
295	{	328	{
296	if ( NULL != ptdSrc )	329	if ( NULL != ptdSrc )
297	{	330	{
Lines 299-305 Link Here
299	rtl_copyMemory( ptdDest, ptdSrc, static_cast< size_t >( ptdSrc->tdSize ) );	332	rtl_copyMemory( ptdDest, ptdSrc, static_cast< size_t >( ptdSrc->tdSize ) );
300	}	333	}
301	}	334	}
		335	#ifdef __MINGW32__
		336	catch(...)
		337	#else
302	__except( EXCEPTION_EXECUTE_HANDLER )	338	__except( EXCEPTION_EXECUTE_HANDLER )
		339	#endif
303	{	340	{
304	}	341	}
305		342
Lines 337-346 Link Here
337	{	374	{
338	sal_Bool bRet = sal_False;	375	sal_Bool bRet = sal_False;
339		376
		377	#ifdef __MINGW32__
		378	try
		379	#else
340	__try	380	__try
		381	#endif
341	{	382	{
342	if ( petcDest == petcSrc )	383	if ( petcDest != petcSrc )
343	__leave;	384	{
344		385
345	petcDest->cfFormat = petcSrc->cfFormat;	386	petcDest->cfFormat = petcSrc->cfFormat;
346		387
Lines 353-360 Link Here
353	petcDest->tymed = petcSrc->tymed;	394	petcDest->tymed = petcSrc->tymed;
354		395
355	bRet = sal_True;	396	bRet = sal_True;
		397	}
356	}	398	}
		399	#ifdef __MINGW32__
		400	catch(...)
		401	#else
357	__except( EXCEPTION_EXECUTE_HANDLER )	402	__except( EXCEPTION_EXECUTE_HANDLER )
		403	#endif
358	{	404	{
359	OSL_ENSURE( sal_False, "Error CopyFormatEtc" );	405	OSL_ENSURE( sal_False, "Error CopyFormatEtc" );
360	}	406	}
Lines 374-405 Link Here
374	{	420	{
375	sal_Int32 nMatch = FORMATETC_EXACT_MATCH;	421	sal_Int32 nMatch = FORMATETC_EXACT_MATCH;
376		422
		423	#ifdef __MINGW32__
		424	try
		425	#else
377	__try	426	__try
		427	#endif
378	{	428	{
379	if ( pFetcLhs == pFetcRhs )	429	if ( pFetcLhs != pFetcRhs )
380	__leave;
381		430
382	if ( ( pFetcLhs->cfFormat != pFetcRhs->cfFormat ) \|\|	431	if ( ( pFetcLhs->cfFormat != pFetcRhs->cfFormat ) \|\|
383	( pFetcLhs->lindex != pFetcRhs->lindex ) \|\|	432	( pFetcLhs->lindex != pFetcRhs->lindex ) \|\|
384	!CompareTargetDevice( pFetcLhs->ptd, pFetcRhs->ptd ) )	433	!CompareTargetDevice( pFetcLhs->ptd, pFetcRhs->ptd ) )
385	{	434	{
386	nMatch = FORMATETC_NO_MATCH;	435	nMatch = FORMATETC_NO_MATCH;
387	__leave;
388	}	436	}
389		437
390	if ( pFetcLhs->dwAspect == pFetcRhs->dwAspect )	438	else if ( pFetcLhs->dwAspect == pFetcRhs->dwAspect )
391	// same aspects; equal	439	// same aspects; equal
392	;	440	;
393	else if ( ( pFetcLhs->dwAspect & ~pFetcRhs->dwAspect ) != 0 )	441	else if ( ( pFetcLhs->dwAspect & ~pFetcRhs->dwAspect ) != 0 )
394	{	442	{
395	// left not subset of aspects of right; not equal	443	// left not subset of aspects of right; not equal
396	nMatch = FORMATETC_NO_MATCH;	444	nMatch = FORMATETC_NO_MATCH;
397	__leave;
398	}	445	}
399	else	446	else
400	// left subset of right	447	// left subset of right
401	nMatch = FORMATETC_PARTIAL_MATCH;	448	nMatch = FORMATETC_PARTIAL_MATCH;
402		449
		450	if ( nMatch == FORMATETC_EXACT_MATCH \|\| nMatch == FORMATETC_PARTIAL_MATCH )
		451	{
403	if ( pFetcLhs->tymed == pFetcRhs->tymed )	452	if ( pFetcLhs->tymed == pFetcRhs->tymed )
404	// same medium flags; equal	453	// same medium flags; equal
405	;	454	;
Lines 407-419 Link Here
407	{	456	{
408	// left not subset of medium flags of right; not equal	457	// left not subset of medium flags of right; not equal
409	nMatch = FORMATETC_NO_MATCH;	458	nMatch = FORMATETC_NO_MATCH;
410	__leave;
411	}	459	}
412	else	460	else
413	// left subset of right	461	// left subset of right
414	nMatch = FORMATETC_PARTIAL_MATCH;	462	nMatch = FORMATETC_PARTIAL_MATCH;
		463	}
415	}	464	}
		465	#ifdef __MINGW32__
		466	catch(...)
		467	#else
416	__except( EXCEPTION_EXECUTE_HANDLER )	468	__except( EXCEPTION_EXECUTE_HANDLER )
		469	#endif
417	{	470	{
418	OSL_ENSURE( sal_False, "Error CompareFormatEtc" );	471	OSL_ENSURE( sal_False, "Error CompareFormatEtc" );
419	nMatch = FORMATETC_NO_MATCH;	472	nMatch = FORMATETC_NO_MATCH;
Lines 431-456 Link Here
431	{	484	{
432	sal_Bool bRet = sal_False;	485	sal_Bool bRet = sal_False;
433		486
		487	#ifdef __MINGW32__
		488	try
		489	#else
434	__try	490	__try
		491	#endif
435	{	492	{
436	if ( ptdLeft == ptdRight )	493	if ( ptdLeft == ptdRight )
437	{	494	{
438	// same address of td; must be same (handles NULL case)	495	// same address of td; must be same (handles NULL case)
439	bRet = sal_True;	496	bRet = sal_True;
440	__leave;
441	}	497	}
442		498
443	// one ot the two is NULL	499	// one ot the two is NULL
444	if ( ( NULL == ptdRight ) \|\| ( NULL == ptdLeft ) )	500	else if ( ( NULL != ptdRight ) && ( NULL != ptdLeft ) )
445	__leave;
446		501
447	if ( ptdLeft->tdSize != ptdRight->tdSize )	502	if ( ptdLeft->tdSize == ptdRight->tdSize )
448	__leave;
449		503
450	if ( rtl_compareMemory( ptdLeft, ptdRight, ptdLeft->tdSize ) == 0 )	504	if ( rtl_compareMemory( ptdLeft, ptdRight, ptdLeft->tdSize ) == 0 )
451	bRet = sal_True;	505	bRet = sal_True;
452	}	506	}
		507	#ifdef __MINGW32__
		508	catch(...)
		509	#else
453	__except( EXCEPTION_EXECUTE_HANDLER )	510	__except( EXCEPTION_EXECUTE_HANDLER )
		511	#endif
454	{	512	{
455	OSL_ENSURE( sal_False, "Error CompareTargetDevice" );	513	OSL_ENSURE( sal_False, "Error CompareTargetDevice" );
456	bRet = sal_False;	514	bRet = sal_False;

Lines 699-705 Link Here

(-)oo_1.1.1_src/dtrans/source/win32/mtaole/MtaOleClipb.cxx.orig (+8 lines)
699	{	699	{
700	LRESULT lResult = 0;	700	LRESULT lResult = 0;
701		701
		702	#ifdef __MINGW32__
		703	try
		704	#else
702	__try	705	__try
		706	#endif
703	{	707	{
704	// get a connection to the class-instance via the static member	708	// get a connection to the class-instance via the static member
705	CMtaOleClipboard* pImpl = CMtaOleClipboard::s_theMtaOleClipboardInst;	709	CMtaOleClipboard* pImpl = CMtaOleClipboard::s_theMtaOleClipboardInst;
Lines 777-783 Link Here
777	break;	781	break;
778	}	782	}
779	}	783	}
		784	#ifdef __MINGW32__
		785	catch(...)
		786	#else
780	__except( EXCEPTION_EXECUTE_HANDLER )	787	__except( EXCEPTION_EXECUTE_HANDLER )
		788	#endif
781	{	789	{
782	OSL_ENSURE( sal_False, "Kernel exception in window-proc caught!" );	790	OSL_ENSURE( sal_False, "Kernel exception in window-proc caught!" );
783	}	791	}




// add mutex locking ???

DocumentHolder::DocumentHolder( const uno::Reference< lang::XMultiServiceFactory >& xFactory,EmbedDocument_Impl *pOLEInterface)
	: m_pOLEInterface(pOLEInterface),
	  m_pInterceptor(0),
	  m_xFactory( xFactory )
{
	const ::rtl::OUString aServiceName ( RTL_CONSTASCII_USTRINGPARAM ( "com.sun.star.frame.Desktop" ) );
	uno::Reference< frame::XDesktop > xDesktop( m_xFactory->createInstance( aServiceName ), uno::UNO_QUERY );

}

void SAL_CALL DocumentHolder::disposing( const com::sun::star::lang::EventObject& aSource )
		throw( uno::RuntimeException )
{
	if ( m_xDocument.is() && m_xDocument == aSource.Source )
	{

}

void SAL_CALL DocumentHolder::notifyClosing( const lang::EventObject& aSource )
		throw( uno::RuntimeException )
{
	uno::Reference< util::XCloseBroadcaster > xEventBroadcaster(
		aSource.Source, uno::UNO_QUERY );

}

void SAL_CALL DocumentHolder::notifyTermination( const lang::EventObject& aSource )
		throw( uno::RuntimeException )
{
	OSL_ENSURE( !m_xDocument.is(), "Just a disaster..." );


Lines 282-289 Link Here

(-)oo_1.1.1_src/embedserv/source/embed/ed_ipersiststr.cxx.orig (+77 lines)
282	{	282	{
283	util::URL aURL;	283	util::URL aURL;
284		284
		285	#ifdef __MINGW32__
		286	aURL.Complete = ::rtl::OUString( reinterpret_cast<const sal_Unicode * >( pFilePath ) );
		287	#else
285	USES_CONVERSION;	288	USES_CONVERSION;
286	aURL.Complete = ::rtl::OUString( OLE2CW( pFilePath ) );	289	aURL.Complete = ::rtl::OUString( OLE2CW( pFilePath ) );
		290	#endif
287		291
288	if ( aTransformer->parseSmart( aURL, ::rtl::OUString() ) )	292	if ( aTransformer->parseSmart( aURL, ::rtl::OUString() ) )
289	sDocUrl = aURL.Complete;	293	sDocUrl = aURL.Complete;
Lines 457-467 Link Here
457	CLIPFORMAT cf = RegisterClipboardFormatA( "Embedded Object" );	461	CLIPFORMAT cf = RegisterClipboardFormatA( "Embedded Object" );
458	hr = WriteFmtUserTypeStg( pStg,	462	hr = WriteFmtUserTypeStg( pStg,
459	cf, // ???	463	cf, // ???
		464	#ifdef __MINGW32__
		465	reinterpret_cast< WCHAR * >( const_cast< sal_Unicode * >( aCurType.getStr() ) ) );
		466	#else
460	( sal_Unicode* )aCurType.getStr() );	467	( sal_Unicode* )aCurType.getStr() );
		468	#endif
461		469
462	if ( hr == S_OK )	470	if ( hr == S_OK )
463	{	471	{
		472	#ifdef __MINGW32__
		473	hr = pStg->CreateStream( reinterpret_cast< const WCHAR * >( static_cast< const sal_Unicode * >( aOfficeEmbedStreamName ) ),
		474	#else
464	hr = pStg->CreateStream( aOfficeEmbedStreamName,	475	hr = pStg->CreateStream( aOfficeEmbedStreamName,
		476	#endif
465	STGM_CREATE \| ( nStreamMode & 0x73 ),	477	STGM_CREATE \| ( nStreamMode & 0x73 ),
466	0,	478	0,
467	0,	479	0,
Lines 469-475 Link Here
469		481
470	if ( hr == S_OK && m_pOwnStream )	482	if ( hr == S_OK && m_pOwnStream )
471	{	483	{
		484	#ifdef __MINGW32__
		485	hr = pStg->CreateStream( reinterpret_cast< const WCHAR * >( static_cast< const sal_Unicode * >( aExtentStreamName ) ),
		486	#else
472	hr = pStg->CreateStream( aExtentStreamName,	487	hr = pStg->CreateStream( aExtentStreamName,
		488	#endif
473	STGM_CREATE \| ( nStreamMode & 0x73 ),	489	STGM_CREATE \| ( nStreamMode & 0x73 ),
474	0,	490	0,
475	0,	491	0,
Lines 515-521 Link Here
515	if ( FAILED( hr ) ) return E_FAIL;	531	if ( FAILED( hr ) ) return E_FAIL;
516		532
517	DWORD nStreamMode = aStat.grfMode;	533	DWORD nStreamMode = aStat.grfMode;
		534	#ifdef __MINGW32__
		535	hr = pStg->OpenStream( reinterpret_cast< const WCHAR * >( static_cast< const sal_Unicode * >( aOfficeEmbedStreamName ) ),
		536	#else
518	hr = pStg->OpenStream( aOfficeEmbedStreamName,	537	hr = pStg->OpenStream( aOfficeEmbedStreamName,
		538	#endif
519	0,	539	0,
520	nStreamMode & 0x73,	540	nStreamMode & 0x73,
521	0,	541	0,
Lines 524-530 Link Here
524		544
525	if ( SUCCEEDED( hr ) )	545	if ( SUCCEEDED( hr ) )
526	{	546	{
		547	#ifdef __MINGW32__
		548	hr = pStg->OpenStream( reinterpret_cast< const WCHAR * >( static_cast< const sal_Unicode * >( aExtentStreamName ) ),
		549	#else
527	hr = pStg->OpenStream( aExtentStreamName,	550	hr = pStg->OpenStream( aExtentStreamName,
		551	#endif
528	0,	552	0,
529	nStreamMode & 0x73,	553	nStreamMode & 0x73,
530	0,	554	0,
Lines 593-600 Link Here
593	{	617	{
594	m_pOwnStream = CComPtr< IStream >();	618	m_pOwnStream = CComPtr< IStream >();
595	m_pExtStream = CComPtr< IStream >();	619	m_pExtStream = CComPtr< IStream >();
		620	#ifdef __MINGW32__
		621	hr = pStg->DestroyElement( reinterpret_cast< const wchar_t * >( static_cast< const sal_Unicode * >( aOfficeEmbedStreamName ) ) );
		622	hr = pStg->DestroyElement( reinterpret_cast< const wchar_t * >( static_cast< const sal_Unicode * >( aExtentStreamName ) ) );
		623	#else
596	hr = pStg->DestroyElement( aOfficeEmbedStreamName );	624	hr = pStg->DestroyElement( aOfficeEmbedStreamName );
597	hr = pStg->DestroyElement( aExtentStreamName );	625	hr = pStg->DestroyElement( aExtentStreamName );
		626	#endif
598		627
599	OSL_ENSURE( SUCCEEDED( hr ), "Can not destroy created stream!\n" );	628	OSL_ENSURE( SUCCEEDED( hr ), "Can not destroy created stream!\n" );
600	if ( FAILED( hr ) )	629	if ( FAILED( hr ) )
Lines 623-636 Link Here
623	if ( FAILED( hr ) ) return E_FAIL;	652	if ( FAILED( hr ) ) return E_FAIL;
624		653
625	DWORD nStreamMode = aStat.grfMode;	654	DWORD nStreamMode = aStat.grfMode;
		655	#ifdef __MINGW32__
		656	hr = pStgSave->CreateStream( reinterpret_cast< const WCHAR * >( static_cast< const sal_Unicode * >( aOfficeEmbedStreamName ) ),
		657	#else
626	hr = pStgSave->CreateStream( aOfficeEmbedStreamName,	658	hr = pStgSave->CreateStream( aOfficeEmbedStreamName,
		659	#endif
627	STGM_CREATE \| ( nStreamMode & 0x73 ),	660	STGM_CREATE \| ( nStreamMode & 0x73 ),
628	0,	661	0,
629	0,	662	0,
630	&pTargetStream );	663	&pTargetStream );
631	if ( FAILED( hr ) \|\| !pTargetStream ) return E_FAIL;	664	if ( FAILED( hr ) \|\| !pTargetStream ) return E_FAIL;
632		665
		666	#ifdef __MINGW32__
		667	hr = pStgSave->CreateStream( reinterpret_cast< const WCHAR * >( static_cast< const sal_Unicode * >( aExtentStreamName ) ),
		668	#else
633	hr = pStgSave->CreateStream( aExtentStreamName,	669	hr = pStgSave->CreateStream( aExtentStreamName,
		670	#endif
634	STGM_CREATE \| ( nStreamMode & 0x73 ),	671	STGM_CREATE \| ( nStreamMode & 0x73 ),
635	0,	672	0,
636	0,	673	0,
Lines 721-734 Link Here
721	if ( FAILED( hr ) ) return E_OUTOFMEMORY;	758	if ( FAILED( hr ) ) return E_OUTOFMEMORY;
722		759
723	DWORD nStreamMode = aStat.grfMode;	760	DWORD nStreamMode = aStat.grfMode;
		761	#ifdef __MINGW32__
		762	hr = m_pMasterStorage->OpenStream( reinterpret_cast< const WCHAR * >( static_cast< const sal_Unicode * >( aOfficeEmbedStreamName ) ),
		763	#else
724	hr = m_pMasterStorage->OpenStream( aOfficeEmbedStreamName,	764	hr = m_pMasterStorage->OpenStream( aOfficeEmbedStreamName,
		765	#endif
725	0,	766	0,
726	nStreamMode & 0x73,	767	nStreamMode & 0x73,
727	0,	768	0,
728	&m_pOwnStream );	769	&m_pOwnStream );
729	if ( FAILED( hr ) \|\| !m_pOwnStream ) return E_OUTOFMEMORY;	770	if ( FAILED( hr ) \|\| !m_pOwnStream ) return E_OUTOFMEMORY;
730		771
		772	#ifdef __MINGW32__
		773	hr = m_pMasterStorage->OpenStream( reinterpret_cast< const WCHAR * >( static_cast< const sal_Unicode * >( aExtentStreamName ) ),
		774	#else
731	hr = m_pMasterStorage->OpenStream( aExtentStreamName,	775	hr = m_pMasterStorage->OpenStream( aExtentStreamName,
		776	#endif
732	0,	777	0,
733	nStreamMode & 0x73,	778	nStreamMode & 0x73,
734	0,	779	0,
Lines 777-796 Link Here
777	CLIPFORMAT cf = RegisterClipboardFormatA( "Embedded Object" );	822	CLIPFORMAT cf = RegisterClipboardFormatA( "Embedded Object" );
778	hr = WriteFmtUserTypeStg( m_pMasterStorage,	823	hr = WriteFmtUserTypeStg( m_pMasterStorage,
779	cf, // ???	824	cf, // ???
		825	#ifdef __MINGW32__
		826	reinterpret_cast< WCHAR * >( const_cast< sal_Unicode * >( aCurType.getStr() ) ) );
		827	#else
780	( sal_Unicode* )aCurType.getStr() );	828	( sal_Unicode* )aCurType.getStr() );
		829	#endif
781	if ( FAILED( hr ) ) return E_FAIL;	830	if ( FAILED( hr ) ) return E_FAIL;
782		831
783	hr = m_pMasterStorage->SetClass( m_guid );	832	hr = m_pMasterStorage->SetClass( m_guid );
784	if ( FAILED( hr ) ) return E_FAIL;	833	if ( FAILED( hr ) ) return E_FAIL;
785		834
		835	#ifdef __MINGW32__
		836	hr = m_pMasterStorage->CreateStream( reinterpret_cast< const WCHAR * >( static_cast< const sal_Unicode * >( aOfficeEmbedStreamName ) ),
		837	#else
786	hr = m_pMasterStorage->CreateStream( aOfficeEmbedStreamName,	838	hr = m_pMasterStorage->CreateStream( aOfficeEmbedStreamName,
		839	#endif
787	STGM_CREATE \| ( nStreamMode & 0x73 ),	840	STGM_CREATE \| ( nStreamMode & 0x73 ),
788	0,	841	0,
789	0,	842	0,
790	&m_pOwnStream );	843	&m_pOwnStream );
791	if ( FAILED( hr ) \|\| !m_pOwnStream ) return E_FAIL;	844	if ( FAILED( hr ) \|\| !m_pOwnStream ) return E_FAIL;
792		845
		846	#ifdef __MINGW32__
		847	hr = m_pMasterStorage->CreateStream( reinterpret_cast< const WCHAR * >( static_cast< const sal_Unicode * >( aExtentStreamName ) ),
		848	#else
793	hr = m_pMasterStorage->CreateStream( aExtentStreamName,	849	hr = m_pMasterStorage->CreateStream( aExtentStreamName,
		850	#endif
794	STGM_CREATE \| ( nStreamMode & 0x73 ),	851	STGM_CREATE \| ( nStreamMode & 0x73 ),
795	0,	852	0,
796	0,	853	0,
Lines 815-822 Link Here
815	pszFileName ) );	872	pszFileName ) );
816	hr = S_OK;	873	hr = S_OK;
817		874
		875	#ifdef __MINGW32__
		876	m_aFileName = ::rtl::OUString( reinterpret_cast< const sal_Unicode * >( pszFileName ) );
		877	#else
818	USES_CONVERSION;	878	USES_CONVERSION;
819	m_aFileName = ::rtl::OUString( OLE2CW( pszFileName ) );	879	m_aFileName = ::rtl::OUString( OLE2CW( pszFileName ) );
		880	#endif
820	}	881	}
821	catch( uno::Exception& )	882	catch( uno::Exception& )
822	{	883	{
Lines 829-835 Link Here
829	CLIPFORMAT cf = RegisterClipboardFormatA( "Embedded Object" );	890	CLIPFORMAT cf = RegisterClipboardFormatA( "Embedded Object" );
830	hr = WriteFmtUserTypeStg( m_pMasterStorage,	891	hr = WriteFmtUserTypeStg( m_pMasterStorage,
831	cf, // ???	892	cf, // ???
		893	#ifdef __MINGW32__
		894	reinterpret_cast< WCHAR * >( const_cast< sal_Unicode * >( aCurType.getStr() ) ) );
		895	#else
832	( sal_Unicode* )aCurType.getStr() );	896	( sal_Unicode* )aCurType.getStr() );
		897	#endif
833		898
834	if ( SUCCEEDED( hr ) )	899	if ( SUCCEEDED( hr ) )
835	{	900	{
Lines 879-886 Link Here
879	if ( !m_pDocHolder->GetDocument().is() \|\| !m_xFactory.is() )	944	if ( !m_pDocHolder->GetDocument().is() \|\| !m_xFactory.is() )
880	return E_FAIL;	945	return E_FAIL;
881		946
		947	#ifdef __MINGW32__
		948	::rtl::OUString aTargetName = pszFileName ? ::rtl::OUString( reinterpret_cast< const sal_Unicode * >( pszFileName ) ) : m_aFileName;
		949	#else
882	USES_CONVERSION;	950	USES_CONVERSION;
883	::rtl::OUString aTargetName = pszFileName ? ::rtl::OUString( OLE2CW( pszFileName ) ) : m_aFileName;	951	::rtl::OUString aTargetName = pszFileName ? ::rtl::OUString( OLE2CW( pszFileName ) ) : m_aFileName;
		952	#endif
884	if ( !aTargetName.getLength() )	953	if ( !aTargetName.getLength() )
885	return E_FAIL;	954	return E_FAIL;
886		955
Lines 906-912 Link Here
906		975
907	STDMETHODIMP EmbedDocument_Impl::SaveCompleted( LPCOLESTR pszFileName )	976	STDMETHODIMP EmbedDocument_Impl::SaveCompleted( LPCOLESTR pszFileName )
908	{	977	{
		978	#ifdef __MINGW32__
		979	m_aFileName = ::rtl::OUString( reinterpret_cast< const sal_Unicode * >( pszFileName ) );
		980	#else
909	m_aFileName = ::rtl::OUString( OLE2CW( pszFileName ) );	981	m_aFileName = ::rtl::OUString( OLE2CW( pszFileName ) );
		982	#endif
910	return S_OK;	983	return S_OK;
911	}	984	}
912		985
Lines 918-924 Link Here
918	if ( FAILED( hr ) \|\| !pMalloc ) return E_FAIL;	991	if ( FAILED( hr ) \|\| !pMalloc ) return E_FAIL;
919		992
920	ppszFileName = (LPOLESTR)( pMalloc->Alloc( sizeof( sal_Unicode ) ( m_aFileName.getLength() + 1 ) ) );	993	ppszFileName = (LPOLESTR)( pMalloc->Alloc( sizeof( sal_Unicode ) ( m_aFileName.getLength() + 1 ) ) );
		994	#ifdef __MINGW32__
		995	wcsncpy( ppszFileName, reinterpret_cast< const WCHAR >( m_aFileName.getStr() ), m_aFileName.getLength() + 1 );
		996	#else
921	wcsncpy( *ppszFileName, m_aFileName.getStr(), m_aFileName.getLength() + 1 );	997	wcsncpy( *ppszFileName, m_aFileName.getStr(), m_aFileName.getLength() + 1 );
		998	#endif
922		999
923	return m_aFileName.getLength() ? S_OK : S_FALSE;	1000	return m_aFileName.getLength() ? S_OK : S_FALSE;
924	}	1001	}




#undef _DEBUG
#endif

#ifdef __MINGW32__
#include <windows.h>
#else
#include <atlbase.h>
CComModule _Module;
#include <atlcom.h>

BEGIN_OBJECT_MAP(ObjectMap)
END_OBJECT_MAP()
#endif

/////////////////////////////////////////////////////////////////////////////
// DLL Entry Point

{
    if (dwReason == DLL_PROCESS_ATTACH)
    {
#ifndef __MINGW32__
        _Module.Init(ObjectMap, hInstance, NULL);
#endif
        DisableThreadLibraryCalls(hInstance);
    }
    else if (dwReason == DLL_PROCESS_DETACH)
	{
#ifndef __MINGW32__
        _Module.Term();
#endif
	}
    return TRUE;    // ok
}







uno::Sequence< ::rtl::OUString > Interceptor::m_aInterceptedURL(IUL);






void SAL_CALL Interceptor::dispose()
	throw(::com::sun::star::uno::RuntimeException)
{
	lang::EventObject aEvt;
	aEvt.Source = static_cast< frame::XDispatch* >( this );

	DocumentHolder* pDocH)
	: m_pOLEInterface(pOLEInterface),
	  m_pDocH(pDocH),
	  m_pDisposeEventListeners(0),
	  m_pStatCL(0)
{
	m_aInterceptedURL[0] = rtl::OUString(
		RTL_CONSTASCII_USTRINGPARAM(".uno:Save"));

Lines 61-66 Link Here

(-)oo_1.1.1_src/embedserv/source/embed/register.cxx.orig (-1 / +4 lines)
61		61
62	//#include <rtl/unload.h>	62	//#include <rtl/unload.h>
63	//#include <osl/time.h>	63	//#include <osl/time.h>
		64	#ifdef __MINGW32__
		65	#define INITGUID
		66	#endif
64	#include "servprov.hxx"	67	#include "servprov.hxx"
65		68
66	#ifndef _COM_SUN_STAR_LANG_XSINGLESERVICEFACTORY_HPP_	69	#ifndef _COM_SUN_STAR_LANG_XSINGLESERVICEFACTORY_HPP_
Lines 152-158 Link Here
152	EmbedServer_getImplementationName() +	155	EmbedServer_getImplementationName() +
153	::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "/UNO/SERVICES") ) );	156	::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "/UNO/SERVICES") ) );
154		157
155	uno::Sequence< ::rtl::OUString > &rServices = EmbedServer_getSupportedServiceNames();	158	const uno::Sequence< ::rtl::OUString > &rServices = EmbedServer_getSupportedServiceNames();
156	for( sal_Int32 ind = 0; ind < rServices.getLength(); ind++ )	159	for( sal_Int32 ind = 0; ind < rServices.getLength(); ind++ )
157	xNewKey->createKey( rServices.getConstArray()[ind] );	160	xNewKey->createKey( rServices.getConstArray()[ind] );
158		161




		return a;
}

void SAL_CALL EmbedServer_Impl::acquire(  ) throw()
{
	OWeakObject::acquire();
}

void SAL_CALL EmbedServer_Impl::release(  ) throw ()
{
	OWeakObject::release();
}

Lines 62-69 Link Here

(-)oo_1.1.1_src/embedserv/source/inc/common.h.orig (-1 / +6 lines)
62	#ifndef _COMMON_H_	62	#ifndef _COMMON_H_
63	#define _COMMON_H_	63	#define _COMMON_H_
64		64
		65	#ifdef __MINGW32__
		66	#include <comdef.h>
		67	#include <tchar.h>
		68	#include <basetyps.h>
		69	#else
65	#include "stdafx.h"	70	#include "stdafx.h"
66	#include <initguid.h>	71	#include <initguid.h>
		72	#endif
67		73
68	#ifndef _RTL_USTRING_HXX_	74	#ifndef _RTL_USTRING_HXX_
69	#include <rtl/ustring.hxx>	75	#include <rtl/ustring.hxx>
Lines 114-119 Link Here
114	// {D0484DE6-AAEE-468a-991F-8D4B0737B57A}	120	// {D0484DE6-AAEE-468a-991F-8D4B0737B57A}
115	DEFINE_GUID(OID_MathServer, 0xd0484de6, 0xaaee, 0x468a, 0x99, 0x1f, 0x8d, 0x4b, 0x7, 0x37, 0xb5, 0x7a );	121	DEFINE_GUID(OID_MathServer, 0xd0484de6, 0xaaee, 0x468a, 0x99, 0x1f, 0x8d, 0x4b, 0x7, 0x37, 0xb5, 0x7a );
116		122
117
118	#endif	123	#endif
119		124




	::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > GetDocument() { return m_xDocument; }
	
// XEventListener
	virtual void SAL_CALL disposing( const com::sun::star::lang::EventObject& aSource )
		throw( ::com::sun::star::uno::RuntimeException );

// XCloseListener
	virtual void SAL_CALL queryClosing( const com::sun::star::lang::EventObject& aSource, sal_Bool bGetsOwnership )
		throw( ::com::sun::star::util::CloseVetoException );
	
	virtual void SAL_CALL notifyClosing( const com::sun::star::lang::EventObject& aSource )
		throw( ::com::sun::star::uno::RuntimeException );

// XTerminateListener
	virtual void SAL_CALL queryTermination( const com::sun::star::lang::EventObject& aSource )
		throw( ::com::sun::star::frame::TerminationVetoException );

	virtual void SAL_CALL notifyTermination( const com::sun::star::lang::EventObject& aSource )
		throw( ::com::sun::star::uno::RuntimeException );

// XModifyListener
	virtual void SAL_CALL modified( const ::com::sun::star::lang::EventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException);

Lines 217-223 Link Here

(-)oo_1.1.1_src/embedserv/source/inc/intercept.hxx.orig (-1 / +1 lines)
217	::com::sun::star::uno::Reference<	217	::com::sun::star::uno::Reference<
218	::com::sun::star::frame::XDispatchProvider > m_xMasterDispatchProvider;	218	::com::sun::star::frame::XDispatchProvider > m_xMasterDispatchProvider;
219		219
220	static ::com::sun::star::uno::Sequence<::rtl::OUString>	220	static ::com::sun::star::uno::Sequence< ::rtl::OUString >
221	m_aInterceptedURL;	221	m_aInterceptedURL;
222		222
223	cppu::OInterfaceContainerHelper* m_pDisposeEventListeners;	223	cppu::OInterfaceContainerHelper* m_pDisposeEventListeners;




class EmbedServer_Impl : public ::cppu::OWeakObject, ::com::sun::star::lang::XTypeProvider
{
public:
	EmbedServer_Impl( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > &xFactory );
	~EmbedServer_Impl();

	// XInterface
    virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) 
		throw(::com::sun::star::uno::RuntimeException);
    virtual void SAL_CALL acquire() throw ();
    virtual void SAL_CALL release() throw ();

	// XTypeProvider
    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) 

protected:

	CComPtr< EmbedProviderFactory_Impl > m_pOLEFactories[ SUPPORTED_FACTORIES_NUM ];
	::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xFactory;
};

class EmbedProviderFactory_Impl : public IClassFactory
{
public:

	EmbedProviderFactory_Impl( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xFactory, const GUID* pGuid);
	~EmbedProviderFactory_Impl();

	sal_Bool registerClass();

	GUID				m_guid;
	DWORD 				m_factoryHandle;

	::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xFactory;
};

#endif

Lines 1-3 Link Here

(-)oo_1.1.1_src/eventattacher/prj/d.lst.orig (+1 lines)
1	..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%	1	..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%
2	..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%	2	..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%
		3	..\%__SRC%\lib\lib*.a %_DEST%\lib%_EXT%
3	..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%	4	..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%

Lines 6-9 Link Here

(-)oo_1.1.1_src/expat/prj/d.lst.orig (+3 lines)
6	..\%__SRC%\lib\libexpat_xmltok.a %_DEST%\lib%_EXT%\libexpat_xmltok.a	6	..\%__SRC%\lib\libexpat_xmltok.a %_DEST%\lib%_EXT%\libexpat_xmltok.a
7	..\%__SRC%\lib\libexpat_xmlparse.a %_DEST%\lib%_EXT%\libexpat_xmlparse.a	7	..\%__SRC%\lib\libexpat_xmlparse.a %_DEST%\lib%_EXT%\libexpat_xmlparse.a
8	..\%__SRC%\lib\libascii_expat_xmlparse.a %_DEST%\lib%_EXT%\libascii_expat_xmlparse.a	8	..\%__SRC%\lib\libascii_expat_xmlparse.a %_DEST%\lib%_EXT%\libascii_expat_xmlparse.a
		9	..\%__SRC%\lib\libexpat_xmltok_static.a %_DEST%\lib%_EXT%\libexpat_xmltok_static.a
		10	..\%__SRC%\lib\libexpat_xmlparse_static.a %_DEST%\lib%_EXT%\libexpat_xmlparse_static.a
		11	..\%__SRC%\lib\libascii_expat_xmlparse_static.a %_DEST%\lib%_EXT%\libascii_expat_xmlparse_static.a
9		12

Lines 1-5 Link Here

(-)oo_1.1.1_src/extensions/prj/d.lst.orig (+1 lines)
1	..\%__SRC%\bin\.dll %_DEST%\bin%_EXT%\.dll	1	..\%__SRC%\bin\.dll %_DEST%\bin%_EXT%\.dll
2	..\%__SRC%\lib\lib.so %_DEST%\lib%_EXT%\lib.so	2	..\%__SRC%\lib\lib.so %_DEST%\lib%_EXT%\lib.so
		3	..\%__SRC%\lib\lib.a %_DEST%\lib%_EXT%\lib.a
3	..\%__SRC%\lib\lib.dylib %_DEST%\lib%_EXT%\lib.dylib	4	..\%__SRC%\lib\lib.dylib %_DEST%\lib%_EXT%\lib.dylib
4	..\%__SRC%\bin\.bin %_DEST%\bin%_EXT%\.bin	5	..\%__SRC%\bin\.bin %_DEST%\bin%_EXT%\.bin
5	..\%__SRC%\misc\.hid %_DEST%\bin%_EXT%\.hid	6	..\%__SRC%\misc\.hid %_DEST%\bin%_EXT%\.hid

Lines 4-11 Link Here

(-)oo_1.1.1_src/extensions/source/activex/msidl/so_activex.idl.orig (+4 lines)
4	// This file will be processed by the MIDL tool to	4	// This file will be processed by the MIDL tool to
5	// produce the type library (so_activex.tlb) and marshalling code.	5	// produce the type library (so_activex.tlb) and marshalling code.
6		6
		7	#ifdef __MINGW32__
		8	#import "oaidl.idl"
		9	#else
7	import "oaidl.idl";	10	import "oaidl.idl";
8	import "ocidl.idl";	11	import "ocidl.idl";
		12	#endif
9	#include "olectl.h"	13	#include "olectl.h"
10		14
11		15

Lines 65-70 Link Here

(-)oo_1.1.1_src/extensions/source/installation/office/protchk/protchk.cxx.orig (-3 / +8 lines)
65	#include <regtools.hxx>	65	#include <regtools.hxx>
66	#endif	66	#endif
67		67
		68	#ifdef __MINGW32__
		69	#define VCL_NEED_BASETSD
		70	#endif
		71
68	#include <vcl/svapp.hxx>	72	#include <vcl/svapp.hxx>
69	#include <vcl/wrkwin.hxx>	73	#include <vcl/wrkwin.hxx>
70	#include <tools/fsys.hxx>	74	#include <tools/fsys.hxx>
Lines 142-150 Link Here
142	// --- XInterface ------------------------------------------------------------	146	// --- XInterface ------------------------------------------------------------
143	virtual Any SAL_CALL queryInterface(const Type& aType)	147	virtual Any SAL_CALL queryInterface(const Type& aType)
144	throw(RuntimeException);	148	throw(RuntimeException);
145	virtual void SAL_CALL acquire() throw(RuntimeException)	149	virtual void SAL_CALL acquire() throw()
146	{ OWeakObject::acquire(); }	150	{ OWeakObject::acquire(); }
147	virtual void SAL_CALL release() throw(RuntimeException)	151	virtual void SAL_CALL release() throw()
148	{ OWeakObject::release(); }	152	{ OWeakObject::release(); }
149	// --- XProtocolHandlerCheck -------------------------------------------------	153	// --- XProtocolHandlerCheck -------------------------------------------------
150	ProtocolHandlerCheck_Impl::ProtocolHandlerCheck_Impl(	154	ProtocolHandlerCheck_Impl::ProtocolHandlerCheck_Impl(
Lines 204-209 Link Here
204	}	208	}
205		209
206	sal_Bool ProtocolHandlerCheck_Impl::isSingleSettingAvailable(void)	210	sal_Bool ProtocolHandlerCheck_Impl::isSingleSettingAvailable(void)
		211	throw(RuntimeException)
207	{	212	{
208	#ifdef WNT	213	#ifdef WNT
209	return sal_True;	214	return sal_True;
Lines 542-548 Link Here
542	reinterpret_cast< XRegistryKey* >( pRegistryKey )->createKey(	547	reinterpret_cast< XRegistryKey* >( pRegistryKey )->createKey(
543	OUString::createFromAscii( "/" PROTCHK_IMPLEMENTATION_NAME "/UNO/SERVICES" ) ) );	548	OUString::createFromAscii( "/" PROTCHK_IMPLEMENTATION_NAME "/UNO/SERVICES" ) ) );
544		549
545	Sequence< OUString >& rSNL = Protchk_getSupportedServiceNames( );	550	const Sequence< OUString >& rSNL = Protchk_getSupportedServiceNames( );
546	const OUString* pArray = rSNL.getConstArray( );	551	const OUString* pArray = rSNL.getConstArray( );
547	for ( sal_Int32 i = rSNL.getLength( ); i--; /* empty */ )	552	for ( sal_Int32 i = rSNL.getLength( ); i--; /* empty */ )
548	xNewRegKey->createKey( pArray[i] );	553	xNewRegKey->createKey( pArray[i] );

Lines 61-66 Link Here

(-)oo_1.1.1_src/extensions/source/ole/comifaces.hxx.orig (+2 lines)
61	#ifndef __COMIFACES_HXX	61	#ifndef __COMIFACES_HXX
62	#define __COMIFACES_HXX	62	#define __COMIFACES_HXX
63		63
		64	#include <ole2.h>
		65	#include <ole2ver.h>
64	#include <com/sun/star/uno/XInterface.hpp>	66	#include <com/sun/star/uno/XInterface.hpp>
65		67
66	using namespace com::sun::star::uno;	68	using namespace com::sun::star::uno;

Lines 65-70 Link Here

(-)oo_1.1.1_src/extensions/source/ole/jscriptclasses.hxx.orig (+3 lines)
65	#define STRICT	65	#define STRICT
66	#define _WIN32_WINNT 0x0400	66	#define _WIN32_WINNT 0x0400
67	#define _WIN32_DCOM	67	#define _WIN32_DCOM
		68	#ifdef __MINGW32__
		69	#else
68	#if OSL_DEBUG_LEVEL > 0	70	#if OSL_DEBUG_LEVEL > 0
69	//#define _ATL_DEBUG_INTERFACES	71	//#define _ATL_DEBUG_INTERFACES
70	#endif	72	#endif
Lines 72-77 Link Here
72	extern CComModule _Module;	74	extern CComModule _Module;
73	#include <atlcom.h>	75	#include <atlcom.h>
74	#include <tools/postsys.h>	76	#include <tools/postsys.h>
		77	#endif
75		78
76	#include "comifaces.hxx"	79	#include "comifaces.hxx"
77		80

Lines 66-74 Link Here

(-)oo_1.1.1_src/extensions/source/ole/oledll.cxx.orig (+3 lines)
66	#if defined(_MSC_VER) && (_MSC_VER >= 1300)	66	#if defined(_MSC_VER) && (_MSC_VER >= 1300)
67	#undef _DEBUG	67	#undef _DEBUG
68	#endif	68	#endif
		69	#ifdef __MINGW32__
		70	#else
69	#include <atlbase.h>	71	#include <atlbase.h>
70	CComModule _Module;	72	CComModule _Module;
71	#include <atlcom.h>	73	#include <atlcom.h>
		74	#endif
72		75
73	BEGIN_OBJECT_MAP(ObjectMap)	76	BEGIN_OBJECT_MAP(ObjectMap)
74	END_OBJECT_MAP()	77	END_OBJECT_MAP()

Lines 69-75 Link Here

(-)oo_1.1.1_src/extensions/source/ole/oleobjw.hxx.orig (+3 lines)
69	#if defined(_MSC_VER) && (_MSC_VER >= 1300)	69	#if defined(_MSC_VER) && (_MSC_VER >= 1300)
70	#undef _DEBUG	70	#undef _DEBUG
71	#endif	71	#endif
		72	#ifdef __MINGW32__
		73	#else
72	#include <atlbase.h>	74	#include <atlbase.h>
		75	#endif
73	#include <vector>	76	#include <vector>
74	#include <hash_map>	77	#include <hash_map>
75	#include <tools/postsys.h>	78	#include <tools/postsys.h>

Lines 72-80 Link Here

(-)oo_1.1.1_src/extensions/source/ole/servprov.cxx.orig (+3 lines)
72	#if defined(_MSC_VER) && (_MSC_VER >= 1300)	72	#if defined(_MSC_VER) && (_MSC_VER >= 1300)
73	#undef _DEBUG	73	#undef _DEBUG
74	#endif	74	#endif
		75	#ifdef __MINGW32__
		76	#else
75	#include <atlbase.h>	77	#include <atlbase.h>
76	extern CComModule _Module;	78	extern CComModule _Module;
77	#include <atlcom.h>	79	#include <atlcom.h>
		80	#endif
78	#include <tools/postsys.h>	81	#include <tools/postsys.h>
79		82
80		83

Lines 913-919 Link Here

(-)oo_1.1.1_src/extensions/source/scanner/scanwin.cxx.orig (+17 lines)
913	}	913	}
914		914
915	if( mxMgr.is() && mpMgr && mxListener.is() )	915	if( mxMgr.is() && mpMgr && mxListener.is() )
		916	#ifdef __MINGW32__
		917	{
		918	const REF( XInterface )& temp = REF( XInterface )( static_cast< OWeakObject* >( mpMgr ) );
		919	mxListener->disposing( com::sun::star::lang::EventObject( temp ) );
		920	}
		921	#else
916	mxListener->disposing( com::sun::star::lang::EventObject( REF( XInterface )( static_cast< OWeakObject* >( mpMgr ) ) ) );	922	mxListener->disposing( com::sun::star::lang::EventObject( REF( XInterface )( static_cast< OWeakObject* >( mpMgr ) ) ) );
		923	#endif
917		924
918	mxListener = REF( com::sun::star::lang::XEventListener )();	925	mxListener = REF( com::sun::star::lang::XEventListener )();
919	}	926	}
Lines 929-935 Link Here
929	mpImpTwain = NULL;	936	mpImpTwain = NULL;
930		937
931	if( mpMgr && mxListener.is() )	938	if( mpMgr && mxListener.is() )
		939	#ifdef __MINGW32__
		940	{
		941	const REF( XInterface )& temp = REF( XInterface )( static_cast< OWeakObject* >( mpMgr ) );
		942	mxListener->disposing( com::sun::star::lang::EventObject( temp ) );
		943	}
		944	#else
932	mxListener->disposing( com::sun::star::lang::EventObject( REF( XInterface )( static_cast< OWeakObject* >( mpMgr ) ) ) );	945	mxListener->disposing( com::sun::star::lang::EventObject( REF( XInterface )( static_cast< OWeakObject* >( mpMgr ) ) ) );
		946	#endif
933	}	947	}
934		948
935	mxListener = REF( com::sun::star::lang::XEventListener )();	949	mxListener = REF( com::sun::star::lang::XEventListener )();
Lines 965-970 Link Here
965	// -----------------------------------------------------------------------------	979	// -----------------------------------------------------------------------------
966		980
967	AWT::Size ScannerManager::getSize()	981	AWT::Size ScannerManager::getSize()
		982	throw()
968	{	983	{
969	AWT::Size aRet;	984	AWT::Size aRet;
970	HGLOBAL hDIB = (HGLOBAL)(long) mpData;	985	HGLOBAL hDIB = (HGLOBAL)(long) mpData;
Lines 992-997 Link Here
992	// -----------------------------------------------------------------------------	1007	// -----------------------------------------------------------------------------
993		1008
994	SEQ( sal_Int8 ) ScannerManager::getDIB()	1009	SEQ( sal_Int8 ) ScannerManager::getDIB()
		1010	throw()
995	{	1011	{
996	SEQ( sal_Int8 ) aRet;	1012	SEQ( sal_Int8 ) aRet;
997		1013
Lines 1055-1060 Link Here
1055	// -----------------------------------------------------------------------------	1071	// -----------------------------------------------------------------------------
1056		1072
1057	SEQ( ScannerContext ) SAL_CALL ScannerManager::getAvailableScanners()	1073	SEQ( ScannerContext ) SAL_CALL ScannerManager::getAvailableScanners()
		1074	throw()
1058	{	1075	{
1059	vos::OGuard aGuard( maProtector );	1076	vos::OGuard aGuard( maProtector );
1060	SEQ( ScannerContext ) aRet( 1 );	1077	SEQ( ScannerContext ) aRet( 1 );




@@ -131,20 +131,20 @@
 /* Many other libraries have conflicting prototypes for getopt, with
    differences in the consts, in stdlib.h.  To avoid compilation
    errors, only prototype getopt for the GNU C library.  */
-extern int getopt (int __argc, char *const *__argv, const char *__shortopts);
+extern int getopt (int ___argc, char *const *___argv, const char *__shortopts);
 # else /* not __GNU_LIBRARY__ */
 extern int getopt ();
 # endif /* __GNU_LIBRARY__ */
 
 # ifndef __need_getopt
-extern int getopt_long (int __argc, char *const *__argv, const char *__shortopts,
+extern int getopt_long (int ___argc, char *const *___argv, const char *__shortopts,
 		        const struct option *__longopts, int *__longind);
-extern int getopt_long_only (int __argc, char *const *__argv,
+extern int getopt_long_only (int ___argc, char *const *___argv,
 			     const char *__shortopts,
 		             const struct option *__longopts, int *__longind);
 
 /* Internal only.  Users should not call this directly.  */
-extern int _getopt_internal (int __argc, char *const *__argv,
+extern int _getopt_internal (int ___argc, char *const *___argv,
 			     const char *__shortopts,
 		             const struct option *__longopts, int *__longind,
 			     int __long_only);

Lines 63-68 Link Here

(-)oo_1.1.1_src/external/glibc/glibcpatch.sh.orig (+3 lines)
63		63
64	tarball="../download/glibc-2.1.3-stub.tar.gz"	64	tarball="../download/glibc-2.1.3-stub.tar.gz"
65	unziptarball="../download/glibc-2.1.3-stub.tar"	65	unziptarball="../download/glibc-2.1.3-stub.tar"
		66	fname=getopt.h
66		67
67	if test -s "$tarball"; then	68	if test -s "$tarball"; then
68	if test "$OS" = "SOLARIS"; then	69	if test "$OS" = "SOLARIS"; then
Lines 129-134 Link Here
129	cp sdfiles/$SDNAME rtufiles/$SDNAME	130	cp sdfiles/$SDNAME rtufiles/$SDNAME
130	done	131	done
131		132
		133	patch rtufiles/$fname ${fname}.patch
		134
132	echo Extraction is done. > patchinf	135	echo Extraction is done. > patchinf
133	echo Extraction is done.	136	echo Extraction is done.
134	rm -f patcherror	137	rm -f patcherror

Lines 7-9 Link Here

(-)oo_1.1.1_src/external/prj/build.lst.orig (+2 lines)
7	es external\gpc nmake - w es_gpc NULL	7	es external\gpc nmake - w es_gpc NULL
8	es external\w4w nmake - u es_w4w NULL	8	es external\w4w nmake - u es_w4w NULL
9	es external\gcc3_specific nmake - u es_gcc3 NULL	9	es external\gcc3_specific nmake - u es_gcc3 NULL
		10	es external\unicows nmake - w es_unicows NULL
		11	es external\dbghelp nmake - w es_dbghelp NULL

Lines 1-5 Link Here

(-)oo_1.1.1_src/fileaccess/prj/d.lst.orig (+1 lines)
1	..\%__SRC%\bin\.dll %_DEST%\bin%_EXT%\	1	..\%__SRC%\bin\.dll %_DEST%\bin%_EXT%\
2	..\%__SRC%\bin\.rdb %_DEST%\rdb%_EXT%\	2	..\%__SRC%\bin\.rdb %_DEST%\rdb%_EXT%\
3	..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%	3	..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%
		4	..\%__SRC%\lib\lib*.a %_DEST%\lib%_EXT%
4	..\%__SRC%\lib\.dylib %_DEST%\lib%_EXT%\	5	..\%__SRC%\lib\.dylib %_DEST%\lib%_EXT%\
5	..\source\fileacc.xml %_DEST%\xml%_EXT%\fileacc.xml	6	..\source\fileacc.xml %_DEST%\xml%_EXT%\fileacc.xml

Lines 1-5 Link Here

(-)oo_1.1.1_src/filter/prj/d.lst.orig (+1 lines)
1	..\%__SRC%\bin\.dll %_DEST%\bin%_EXT%\.dll	1	..\%__SRC%\bin\.dll %_DEST%\bin%_EXT%\.dll
2	..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%	2	..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%
		3	..\%__SRC%\lib\lib*.a %_DEST%\lib%_EXT%
3	..\%__SRC%\lib\lib*.dylib %_DEST%\lib%_EXT%	4	..\%__SRC%\lib\lib*.dylib %_DEST%\lib%_EXT%
4	..\%__SRC%\class\.jar %_DEST%\bin%_EXT%\.jar	5	..\%__SRC%\class\.jar %_DEST%\bin%_EXT%\.jar
5	..\%__SRC%\class\XSLTFilter\.jar %_DEST%\bin%_EXT%\.jar	6	..\%__SRC%\class\XSLTFilter\.jar %_DEST%\bin%_EXT%\.jar

Lines 1-5 Link Here

(-)oo_1.1.1_src/forms/prj/d.lst.orig (+1 lines)
1	..\%__SRC%\bin\.dll %_DEST%\bin%_EXT%\.dll	1	..\%__SRC%\bin\.dll %_DEST%\bin%_EXT%\.dll
2	..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%	2	..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%
		3	..\%__SRC%\lib\lib*.a %_DEST%\lib%_EXT%
3	..\%__SRC%\lib\.dylib %_DEST%\lib%_EXT%\.dylib	4	..\%__SRC%\lib\.dylib %_DEST%\lib%_EXT%\.dylib
4	..\%__SRC%\lib\.sl %_DEST%\lib%_EXT%\.sl	5	..\%__SRC%\lib\.sl %_DEST%\lib%_EXT%\.sl
5	..\%__SRC%\bin\.bin %_DEST%\bin%_EXT%\.bin	6	..\%__SRC%\bin\.bin %_DEST%\bin%_EXT%\.bin

Lines 403-409 Link Here

(-)oo_1.1.1_src/fpicker/source/win32/filepicker/FilePicker.cxx.orig (-1 / +2 lines)
403	//-----------------------------------------------------------------------------------------	403	//-----------------------------------------------------------------------------------------
404		404
405	void SAL_CALL CFilePicker::setDefaultName(const rtl::OUString& aName)	405	void SAL_CALL CFilePicker::setDefaultName(const rtl::OUString& aName)
406	throw(lang::IllegalArgumentException, uno::RuntimeException)	406	throw(uno::RuntimeException)
407	{	407	{
408	OSL_ASSERT(0 != m_pImpl.get());	408	OSL_ASSERT(0 != m_pImpl.get());
409	osl::MutexGuard aGuard(m_aMutex);	409	osl::MutexGuard aGuard(m_aMutex);
Lines 760-765 Link Here
760	//------------------------------------------------------------------------------------	760	//------------------------------------------------------------------------------------
761		761
762	void SAL_CALL CFilePicker::cancel()	762	void SAL_CALL CFilePicker::cancel()
		763	throw(uno::RuntimeException)
763	{	764	{
764	OSL_ASSERT(m_pImpl.get());	765	OSL_ASSERT(m_pImpl.get());
765		766




		throw( ::com::sun::star::uno::RuntimeException );

    virtual void SAL_CALL setDefaultName( const ::rtl::OUString& aName ) 
		throw( ::com::sun::star::uno::RuntimeException );

    virtual void SAL_CALL setDisplayDirectory( const ::rtl::OUString& aDirectory ) 
		throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException );

	// XCancellable
	//------------------------------------------------

    virtual void SAL_CALL cancel( )
		throw(::com::sun::star::uno::RuntimeException);

	//------------------------------------------------
    // XEventListener

	CFilePicker& operator=( const CFilePicker& );

private:
	::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xServiceMgr;   // to instanciate own services		
    CAsyncEventNotifier				                                               m_aAsyncEventNotifier;
	std::auto_ptr<CWinFileOpenImpl>	    										   m_pImpl;	
}; 

Lines 242-247 Link Here

(-)oo_1.1.1_src/fpicker/source/win32/folderpicker/FolderPicker.cxx.orig (+1 lines)
242	// -------------------------------------------------	242	// -------------------------------------------------
243		243
244	void SAL_CALL CFolderPicker::cancel( )	244	void SAL_CALL CFolderPicker::cancel( )
		245	throw(RuntimeException)
245	{	246	{
246	OSL_ASSERT( m_pFolderPickerImpl.get( ) );	247	OSL_ASSERT( m_pFolderPickerImpl.get( ) );
247	MutexGuard aGuard( m_aMutex );	248	MutexGuard aGuard( m_aMutex );

Lines 150-156 Link Here

(-)oo_1.1.1_src/fpicker/source/win32/folderpicker/FolderPicker.hxx.orig (-1 / +2 lines)
150	// XCancellable	150	// XCancellable
151	//------------------------------------------------	151	//------------------------------------------------
152		152
153	virtual void SAL_CALL cancel( );	153	virtual void SAL_CALL cancel( )
		154	throw(::com::sun::star::uno::RuntimeException);
154		155
155	//------------------------------------------------	156	//------------------------------------------------
156	// overwrite base class method, which is called	157	// overwrite base class method, which is called

Lines 75-80 Link Here

(-)oo_1.1.1_src/fpicker/source/win32/folderpicker/MtaFop.hxx.orig (+3 lines)
75	#endif	75	#endif
76		76
77	#include <utility>	77	#include <utility>
		78	#ifdef __MINGW32__
		79	#include <windows.h>
		80	#endif
78	#include <objidl.h>	81	#include <objidl.h>
79	#include <shlobj.h>	82	#include <shlobj.h>
80		83

Lines 5-10 Link Here

(-)oo_1.1.1_src/framework/prj/d.lst.orig (+1 lines)
5	..\%__SRC%\bin\.exe %_DEST%\bin%_EXT%\	5	..\%__SRC%\bin\.exe %_DEST%\bin%_EXT%\
6	..\%__SRC%\bin\login %_DEST%\bin%_EXT%\login.bin	6	..\%__SRC%\bin\login %_DEST%\bin%_EXT%\login.bin
7	..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%	7	..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%
		8	..\%__SRC%\lib\lib*.a %_DEST%\lib%_EXT%
8	..\%__SRC%\lib\lib*.dylib %_DEST%\lib%_EXT%	9	..\%__SRC%\lib\lib*.dylib %_DEST%\lib%_EXT%
9		10
10	..\dtd\menubar.dtd %_DEST%\bin%_EXT%\menubar.dtd	11	..\dtd\menubar.dtd %_DEST%\bin%_EXT%\menubar.dtd

Lines 2-7 Link Here

(-)oo_1.1.1_src/i18n/prj/d.lst.orig (+1 lines)
2		2
3	..\%__SRC%\bin\i18n?????.dll %_DEST%\bin%_EXT%\i18n?????.dll	3	..\%__SRC%\bin\i18n?????.dll %_DEST%\bin%_EXT%\i18n?????.dll
4	..\%__SRC%\lib\libi18n?????.so %_DEST%\lib%_EXT%\libi18n?????.so	4	..\%__SRC%\lib\libi18n?????.so %_DEST%\lib%_EXT%\libi18n?????.so
		5	..\%__SRC%\lib\libi18n?????.a %_DEST%\lib%_EXT%\libi18n?????.a
5	..\%__SRC%\lib\libi18n??????.dylib %_DEST%\lib%_EXT%\libi18n??????.dylib	6	..\%__SRC%\lib\libi18n??????.dylib %_DEST%\lib%_EXT%\libi18n??????.dylib
6		7
7	dos: sh -c "if test %OS% = MACOSX; then create-bundle %_DEST%\lib%_EXT%\*.dylib; fi"	8	dos: sh -c "if test %OS% = MACOSX; then create-bundle %_DEST%\lib%_EXT%\*.dylib; fi"

Lines 2-7 Link Here

(-)oo_1.1.1_src/i18n_simple/prj/d.lst.orig (+1 lines)
2		2
3	..\%__SRC%\bin\i18n?????.dll %_DEST%\bin%_EXT%\i18n?????.dll	3	..\%__SRC%\bin\i18n?????.dll %_DEST%\bin%_EXT%\i18n?????.dll
4	..\%__SRC%\lib\libi18n?????.so %_DEST%\lib%_EXT%\libi18n?????.so	4	..\%__SRC%\lib\libi18n?????.so %_DEST%\lib%_EXT%\libi18n?????.so
		5	..\%__SRC%\lib\libi18n?????.a %_DEST%\lib%_EXT%\libi18n?????.a
5	..\%__SRC%\lib\libi18n??????.dylib %_DEST%\lib%_EXT%\libi18n??????.dylib	6	..\%__SRC%\lib\libi18n??????.dylib %_DEST%\lib%_EXT%\libi18n??????.dylib
6		7
7	dos: sh -c "if test %OS% = MACOSX; then create-bundle %_DEST%\lib%_EXT%\*.dylib; fi"	8	dos: sh -c "if test %OS% = MACOSX; then create-bundle %_DEST%\lib%_EXT%\*.dylib; fi"





..\%__SRC%\bin\i18npool*.dll %_DEST%\bin%_EXT%\i18npool*.dll
..\%__SRC%\lib\libi18npool*.so %_DEST%\lib%_EXT%\libi18npool*.so
..\%__SRC%\lib\libi18npool*.a %_DEST%\lib%_EXT%\libi18npool*.a
..\%__SRC%\lib\libi18npool*.dylib %_DEST%\lib%_EXT%\libi18npool*.dylib
..\%__SRC%\lib\ii18npool.lib %_DEST%\lib%_EXT%\ii18npool.lib

..\%__SRC%\bin\i18nsearch*.dll %_DEST%\bin%_EXT%\i18nsearch*.dll
..\%__SRC%\lib\libi18nsearch*.so %_DEST%\lib%_EXT%\libi18nsearch*.so
..\%__SRC%\lib\libi18nsearch*.a %_DEST%\lib%_EXT%\libi18nsearch*.a
..\%__SRC%\lib\libi18nsearch*.dylib %_DEST%\lib%_EXT%\libi18nsearch*.dylib
..\%__SRC%\lib\ii18nsearch.lib %_DEST%\lib%_EXT%\ii18nsearch.lib

..\%__SRC%\bin\localedata_*.dll %_DEST%\bin%_EXT%\localedata_*.dll
..\%__SRC%\lib\liblocaledata_*.so %_DEST%\lib%_EXT%\liblocaledata_*.so
..\%__SRC%\lib\liblocaledata_*.a %_DEST%\lib%_EXT%\liblocaledata_*.a
..\%__SRC%\lib\liblocaledata_*.dylib %_DEST%\lib%_EXT%\liblocaledata_*.dylib

..\%__SRC%\bin\dict_*.dll %_DEST%\bin%_EXT%\dict_*.dll
..\%__SRC%\lib\libdict_*.so %_DEST%\lib%_EXT%\libdict_*.so
..\%__SRC%\lib\libdict_*.a %_DEST%\lib%_EXT%\libdict_*.a
..\%__SRC%\lib\libdict_*.dylib %_DEST%\lib%_EXT%\libdict_*.dylib

dos: sh -c "if test %OS% = MACOSX; then create-bundle %_DEST%\lib%_EXT%\*.dylib; fi"

Lines 10-15 Link Here

(-)oo_1.1.1_src/i18nutil/prj/d.lst.orig (+1 lines)
10	..\%__SRC%\bin\i18nutil.dll %_DEST%\bin%_EXT%\i18nutil.dll	10	..\%__SRC%\bin\i18nutil.dll %_DEST%\bin%_EXT%\i18nutil.dll
11	..\%__SRC%\lib\libi18nutil.so %_DEST%\lib%_EXT%\libi18nutil.so	11	..\%__SRC%\lib\libi18nutil.so %_DEST%\lib%_EXT%\libi18nutil.so
12	..\%__SRC%\lib\libi18nutil.dylib %_DEST%\lib%_EXT%\libi18nutil.dylib	12	..\%__SRC%\lib\libi18nutil.dylib %_DEST%\lib%_EXT%\libi18nutil.dylib
		13	..\%__SRC%\lib\libi18nutil.a %_DEST%\lib%_EXT%\libi18nutil.a
13	..\%__SRC%\lib\ii18nutil.lib %_DEST%\lib%_EXT%\ii18nutil.lib	14	..\%__SRC%\lib\ii18nutil.lib %_DEST%\lib%_EXT%\ii18nutil.lib
14		15
15	dos: sh -c "if test %OS% = MACOSX; then create-bundle %_DEST%\lib%_EXT%\*.dylib; fi"	16	dos: sh -c "if test %OS% = MACOSX; then create-bundle %_DEST%\lib%_EXT%\*.dylib; fi"

Lines 1-5 Link Here

(-)oo_1.1.1_src/icu/icu-2.2.patch.orig
1	*** misc/icu/source/configure Fri Aug 9 19:20:54 2002	1	*** misc/icu/source/configure Fri Aug 9 19:20:54 2002




   echo "$ac_t"""C compiler set to CCC ${CC}" " 1>&6
   case "${host}" in
          alpha*-*-*) U_HAVE_INTTYPES_H=0;
***************
*** 2966,2973 ****
--- 2966,2977 ----
  #endif
  #include <time.h>
  #ifndef tzname /* For SGI.  */
+ #ifdef __MINGW_IMPORT
+ __MINGW_IMPORT char *tzname[]; /* RS6000 and others reject char **tzname.  */
+ #else
  extern char *tzname[]; /* RS6000 and others reject char **tzname.  */
  #endif
+ #endif
  int main() {
  atoi(*tzname);
  ; return 0; }
***************
*** 2997,3003 ****
--- 3001,3011 ----
  #line 2998 "configure"
  #include "confdefs.h"
    #include <time.h>
+ #ifdef __MINGW_IMPORT
+   __MINGW_IMPORT char *_tzname[];
+ #else
    extern char *_tzname[];
+ #endif
    
  int main() {
    atoi(*_tzname);
*** misc/icu/source/configure.in	Fri Aug  9 19:20:56 2002




   AC_MSG_RESULT("C compiler set to CCC ${CC}" )
   case "${host}" in
          alpha*-*-*) U_HAVE_INTTYPES_H=0;
***************
*** 450,456 ****
--- 450,460 ----
  #endif
  #include <time.h>
  #ifndef tzname /* For SGI.  */
+ #ifdef __MINGW_IMPORT
+ __MINGW_IMPORT char *tzname[]; /* RS6000 and others reject char **tzname.  */
+ #else
  extern char *tzname[]; /* RS6000 and others reject char **tzname.  */
+ #endif
  #endif>>,
  changequote([, ])dnl
  [atoi(*tzname);], ac_cv_var_tzname=yes, ac_cv_var_tzname=no)])
***************
*** 461,467 ****
--- 465,475 ----
    [AC_TRY_LINK(
    changequote(<<, >>)dnl
    <<#include <time.h>
+ #ifdef __MINGW_IMPORT
+   __MINGW_IMPORT char *_tzname[];
+ #else
    extern char *_tzname[];
+ #endif
    >>,
    changequote([, ])dnl
    [atoi(*_tzname);], ac_cv_var__tzname=yes, ac_cv_var__tzname=no)])
*** misc/icu/source/icudefs.mk.in	Wed Jul 31 22:28:32 2002




  
  # Versioned target for a shared library.
  FINAL_SO_TARGET = $(SO_TARGET).$(SO_TARGET_VERSION)
***************
*** 142,148 ****
  ##  How ICU libraries are named...  ex. $(LIBICU)uc$(SO)
  # Prefix for the ICU library names
  ICUPREFIX = icu
! LIBICU = lib$(ICUPREFIX)
  
  # Force removal [for make clean]
  RMV = rm -rf
--- 146,153 ----
  ##  How ICU libraries are named...  ex. $(LIBICU)uc$(SO)
  # Prefix for the ICU library names
  ICUPREFIX = icu
! LIBPREFIX = lib
! LIBICU = $(LIBPREFIX)$(ICUPREFIX)
  
  # Force removal [for make clean]
  RMV = rm -rf
*** misc/icu/source/common/brkiter.cpp	Thu Aug  8 02:39:14 2002
--- misc/build/icu/source/common/brkiter.cpp	Tue Jul 22 10:11:48 2003
***************

  LD_SONAME = -h $(MIDDLE_SO_TARGET)
  
*** misc/icu/source/data/Makefile.in	Thu Aug 15 19:08:02 2002

Lines 1055-1061 Link Here

(-)- misc/build/icu/source/data/Makefile.in
1055	const ScriptListTable *scriptListTable = NULL;	1193	const ScriptListTable *scriptListTable = NULL;
1056	const LangSysTable *langSysTable = NULL;	1194	const LangSysTable *langSysTable = NULL;
1057	*** misc/icu/source/layout/Makefile.in Sat Jul 20 01:24:32 2002	1195	*** misc/icu/source/layout/Makefile.in Sat Jul 20 01:24:32 2002




  
  
  OBJECTS =  loengine.o \
***************
*** 176,182 ****
  
  ifneq ($(ENABLE_SHARED),)
  $(FINAL_SO_TARGET): $(OBJECTS)
! 	$(SHLIB.cc) $(LD_SONAME) -o $@ $^ $(LIBS)
  endif
  
  ifeq (,$(MAKECMDGOALS))
--- 176,182 ----
  
  ifneq ($(ENABLE_SHARED),)
  $(FINAL_SO_TARGET): $(OBJECTS)
! 	$(SHLIB.cc) $(LD_SONAME) $(LD_IMPLIB) -o $@ $^ $(LIBS)
  endif
  
  ifeq (,$(MAKECMDGOALS))
--- misc/build/icu/source/common/unicode/umachine.h.orig	2001-12-08 02:09:42.000000000 +0900

|*
|*	  Beschreibung
*************************************************************************/
#if defined( UNX ) || (defined( PM2 ) && defined( CSET )) || defined (WTC) || defined (MAC) || defined (MTW) || defined (__MINGW32__)
int main ( int argc, char ** argv)
{
#else

Lines 79-87 Link Here

(-)oo_1.1.1_src/idlc/source/astexpression.cxx.orig (+6 lines)
79	#undef MINCHAR	79	#undef MINCHAR
80	#define MINCHAR -128	80	#define MINCHAR -128
81		81
		82	#ifdef __MINGW32__
		83	#define MAXINT64 9223372036854775807LL
		84	#define MININT64 -9223372036854775807LL-1
		85	#define MAXUINT64 18446744073709551615ULL
		86	#else
82	#define MAXINT64 9223372036854775807	87	#define MAXINT64 9223372036854775807
83	#define MININT64 -9223372036854775807-1	88	#define MININT64 -9223372036854775807-1
84	#define MAXUINT64 18446744073709551615	89	#define MAXUINT64 18446744073709551615
		90	#endif
85		91
86	using namespace ::rtl;	92	using namespace ::rtl;
87		93

Lines 144-149 Link Here

(-)oo_1.1.1_src/idlc/source/parser.y.orig (+2 lines)
144	return res;	144	return res;
145	}	145	}
146		146
		147	#if defined (_MSC_VER) && (_MSC_VER < 1310)
147	void* malloc( size_t size )	148	void* malloc( size_t size )
148	{	149	{
149	return ::malloc(size);	150	return ::malloc(size);
Lines 153-158 Link Here
153	{	154	{
154	::free(memblock);	155	::free(memblock);
155	}	156	}
		157	#endif
156		158
157	};	159	};
158	#endif	160	#endif

Lines 4-9 Link Here

(-)oo_1.1.1_src/io/prj/d.lst.orig (+1 lines)
4	..\source\connector\connectr.xml %_DEST%\xml%_EXT%\connector.uno.xml	4	..\source\connector\connectr.xml %_DEST%\xml%_EXT%\connector.uno.xml
5	..\source\stm\stm.xml %_DEST%\xml%_EXT%\streams.uno.xml	5	..\source\stm\stm.xml %_DEST%\xml%_EXT%\streams.uno.xml
6	..\%__SRC%\lib\.so %_DEST%\lib%_EXT%\	6	..\%__SRC%\lib\.so %_DEST%\lib%_EXT%\
		7	..\%__SRC%\lib\.a %_DEST%\lib%_EXT%\
7	..\%__SRC%\lib\.dylib %_DEST%\lib%_EXT%\	8	..\%__SRC%\lib\.dylib %_DEST%\lib%_EXT%\
8		9
9	dos: sh -c "if test %OS% = MACOSX; then create-bundle %_DEST%\lib%_EXT%\*.dylib; fi"	10	dos: sh -c "if test %OS% = MACOSX; then create-bundle %_DEST%\lib%_EXT%\*.dylib; fi"

Lines 1-6 Link Here

(-)oo_1.1.1_src/javaunohelper/prj/d.lst.orig (+1 lines)
1	..\%__SRC%\class\juh.jar %_DEST%\bin%_EXT%\juh.jar	1	..\%__SRC%\class\juh.jar %_DEST%\bin%_EXT%\juh.jar
2	..\%__SRC%\bin\juh.dll %_DEST%\bin%_EXT%\juh.dll	2	..\%__SRC%\bin\juh.dll %_DEST%\bin%_EXT%\juh.dll
3	..\%__SRC%\lib\libjuh.so %_DEST%\lib%_EXT%\libjuh.so	3	..\%__SRC%\lib\libjuh.so %_DEST%\lib%_EXT%\libjuh.so
		4	..\%__SRC%\lib\libjuh.a %_DEST%\lib%_EXT%\libjuh.a
4	..\%__SRC%\lib\libjuh.dylib %_DEST%\lib%_EXT%\libjuh.dylib	5	..\%__SRC%\lib\libjuh.dylib %_DEST%\lib%_EXT%\libjuh.dylib
5		6
6	..\%__SRC%\bin\juh_src.zip %COMMON_DEST%\bin%_EXT%\juh_src.zip	7	..\%__SRC%\bin\juh_src.zip %COMMON_DEST%\bin%_EXT%\juh_src.zip

Lines 3-8 Link Here

(-)oo_1.1.1_src/jpeg/prj/d.lst.orig (+1 lines)
3		3
4	..\%__SRC%\slb\jpeglib.lib %_DEST%\lib%_EXT%\jpeglib.lib	4	..\%__SRC%\slb\jpeglib.lib %_DEST%\lib%_EXT%\jpeglib.lib
5	..\%__SRC%\lib\libjpeglib.a %_DEST%\lib%_EXT%\libjpeglib.a	5	..\%__SRC%\lib\libjpeglib.a %_DEST%\lib%_EXT%\libjpeglib.a
		6	..\%__SRC%\lib\libjpeglib_static.a %_DEST%\lib%_EXT%\libjpeglib_static.a
6		7
7	..\%__SRC%\inc\jerror.h %_DEST%\inc%_EXT%\external\jerror.h	8	..\%__SRC%\inc\jerror.h %_DEST%\inc%_EXT%\external\jerror.h
8	..\%__SRC%\inc\jpeglib.h %_DEST%\inc%_EXT%\external\jpeglib.h	9	..\%__SRC%\inc\jpeglib.h %_DEST%\inc%_EXT%\external\jpeglib.h

Lines 1-6 Link Here

(-)oo_1.1.1_src/jurt/prj/d.lst.orig (+1 lines)
1	..\%__SRC%\class\jurt.jar %_DEST%\bin%_EXT%\jurt.jar	1	..\%__SRC%\class\jurt.jar %_DEST%\bin%_EXT%\jurt.jar
2	..\%__SRC%\bin\jpipe.dll %_DEST%\bin%_EXT%\jpipe.dll	2	..\%__SRC%\bin\jpipe.dll %_DEST%\bin%_EXT%\jpipe.dll
3	..\%__SRC%\lib\libjpipe.so %_DEST%\lib%_EXT%\libjpipe.so	3	..\%__SRC%\lib\libjpipe.so %_DEST%\lib%_EXT%\libjpipe.so
		4	..\%__SRC%\lib\libjpipe.a %_DEST%\lib%_EXT%\libjpipe.a
4	..\%__SRC%\lib\libjpipe.dylib %_DEST%\lib%_EXT%\libjpipe.dylib	5	..\%__SRC%\lib\libjpipe.dylib %_DEST%\lib%_EXT%\libjpipe.dylib
5		6
6	..\%__SRC%\bin\jurt_src.zip %COMMON_DEST%\bin%_EXT%\jurt_src.zip	7	..\%__SRC%\bin\jurt_src.zip %COMMON_DEST%\bin%_EXT%\jurt_src.zip

Lines 5-8 Link Here

(-)oo_1.1.1_src/jvmaccess/prj/d.lst.orig (+1 lines)
5	..\%__SRC%\lib\ijvmaccess.lib %_DEST%\lib%_EXT%\ijvmaccess.lib	5	..\%__SRC%\lib\ijvmaccess.lib %_DEST%\lib%_EXT%\ijvmaccess.lib
6	..\%__SRC%\lib\libjvmaccess.so... %_DEST%\lib%_EXT%\*	6	..\%__SRC%\lib\libjvmaccess.so... %_DEST%\lib%_EXT%\*
7	..\%__SRC%\lib\libjvmaccess.dylib %_DEST%\lib%_EXT%\*	7	..\%__SRC%\lib\libjvmaccess.dylib %_DEST%\lib%_EXT%\*
		8	..\%__SRC%\lib\libjvmaccess.a %_DEST%\lib%_EXT%\
8	linklib: libjvmaccess.so...	9	linklib: libjvmaccess.so...

Lines 1-6 Link Here

(-)oo_1.1.1_src/linguistic/prj/d.lst.orig (-1 / +1 lines)
1	..\%__SRC%\bin\lng* %_DEST%\bin%_EXT%\lng*	1	..\%__SRC%\bin\lng* %_DEST%\bin%_EXT%\lng*
2	..\%__SRC%\lib\ilng* %_DEST%\lib%_EXT%\ilng*	2	..\%__SRC%\lib\ilng* %_DEST%\lib%_EXT%\ilng*
3	..\%__SRC%\lib\liblng.a %_DEST%\lib%_EXT%\liblng.a	3	..\%__SRC%\lib\liblng.a %_DEST%\lib%_EXT%\liblng.a
4	..\%__SRC%\lib\.dylib %_DEST%\lib%_EXT%\.dylib	4	..\%__SRC%\lib\.dylib %_DEST%\lib%_EXT%\.dylib
5	..\%__SRC%\lib\liblng.so %_DEST%\lib%_EXT%\liblng.so	5	..\%__SRC%\lib\liblng.so %_DEST%\lib%_EXT%\liblng.so
6		6

Lines 3-9 Link Here

(-)oo_1.1.1_src/neon/prj/d.lst.orig (-2 / +6 lines)
3	***************	3	***************
4	* 1 **	4	* 1 **
5	! dummy	5	! dummy
6	--- 1,130 ----	6	--- 1,132 ----
7	!	7	!
8	! /* Define to be the neon version string */	8	! /* Define to be the neon version string */
9	! #define NEON_VERSION "0.23.5"	9	! #define NEON_VERSION "0.23.5"
Lines 126-134 Link Here
126	! #define vsnprintf _vsnprintf	126	! #define vsnprintf _vsnprintf
127	! #define strcasecmp strcmpi	127	! #define strcasecmp strcmpi
128	! #define strncasecmp strnicmp	128	! #define strncasecmp strnicmp
129	! #define ssize_t int
130	! #define inline __inline	129	! #define inline __inline
		130	! #ifndef __MINGW32__
		131	! #define ssize_t int
131	! #define off_t _off_t	132	! #define off_t _off_t
		133	! #endif
132	!	134	!
133	! #include <io.h>	135	! #include <io.h>
134	! #define read _read	136	! #define read _read
Lines 203-205 Link Here
203	/* If we get a non-2xx response back here, we wipe the value for	205	/* If we get a non-2xx response back here, we wipe the value for
204	* each of the properties in this propstat, so the caller knows to	206	* each of the properties in this propstat, so the caller knows to
205	* look at the status instead. It's annoying, since for each prop	207	* look at the status instead. It's annoying, since for each prop
		208	--- misc/build/neon-0.23.5/src/ne_utils.h.orig 2002-08-18 21:48:48.000000000 +0900
Lines 3-5 Link Here
3	..\%__SRC%\inc\.h %_DEST%\inc%_EXT%\external\neon\.h	3	..\%__SRC%\inc\.h %_DEST%\inc%_EXT%\external\neon\.h
4	..\%__SRC%\slb\neon.lib %_DEST%\lib%_EXT%\neon.lib	4	..\%__SRC%\slb\neon.lib %_DEST%\lib%_EXT%\neon.lib
5	..\%__SRC%\lib\libneon.a %_DEST%\lib%_EXT%\libneon.a	5	..\%__SRC%\lib\libneon.a %_DEST%\lib%_EXT%\libneon.a
		6	..\%__SRC%\lib\libneon_static.a %_DEST%\lib%_EXT%\libneon_static.a

Lines 2212-2218 Link Here

(-)oo_1.1.1_src/np_sdk/mozilla-source-M16-stub.patch.orig (-2 / +2 lines)
2212	! # endif	2212	! # endif
2213	! #elif defined(XP_PC) \|\| defined(_WINDOWS) \|\| defined(WIN32) \|\| defined(_WIN32)	2213	! #elif defined(XP_PC) \|\| defined(_WINDOWS) \|\| defined(WIN32) \|\| defined(_WIN32)
2214	# include <windows.h>	2214	# include <windows.h>
2215	# if defined(_MSC_VER)	2215	! # if defined(_MSC_VER)
2216	# if defined(WIN32) \|\| defined(_WIN32)	2216	# if defined(WIN32) \|\| defined(_WIN32)
2217	# define JRI_PUBLIC_API(ResultType) _declspec(dllexport) ResultType	2217	# define JRI_PUBLIC_API(ResultType) _declspec(dllexport) ResultType
2218	- # define JRI_PUBLIC_VAR(VarType) VarType	2218	- # define JRI_PUBLIC_VAR(VarType) VarType
Lines 2243-2249 Link Here
2243	/* PC */	2243	/* PC */
2244	! #if defined(XP_PC) \|\| defined(_WINDOWS) \|\| defined(WIN32) \|\| defined(_WIN32)	2244	! #if defined(XP_PC) \|\| defined(_WINDOWS) \|\| defined(WIN32) \|\| defined(_WIN32)
2245	# include <windows.h>	2245	# include <windows.h>
2246	# if defined(_MSC_VER)	2246	! # if defined(_MSC_VER) \|\| defined(__MINGW32__)
2247	# if defined(WIN32) \|\| defined(_WIN32)	2247	# if defined(WIN32) \|\| defined(_WIN32)
2248	# define JRI_PUBLIC_API(ResultType) _declspec(dllexport) ResultType	2248	# define JRI_PUBLIC_API(ResultType) _declspec(dllexport) ResultType
2249	# define JRI_CALLBACK	2249	# define JRI_CALLBACK

Lines 5-10 Link Here

(-)oo_1.1.1_src/odk/prj/d.lst.orig (+1 lines)
5		5
6	..\%__SRC%\bin\officebean.dll %_DEST%\bin%_EXT%\officebean.dll	6	..\%__SRC%\bin\officebean.dll %_DEST%\bin%_EXT%\officebean.dll
7	..\%__SRC%\lib\libofficebean.so %_DEST%\lib%_EXT%\libofficebean.so	7	..\%__SRC%\lib\libofficebean.so %_DEST%\lib%_EXT%\libofficebean.so
		8	..\%__SRC%\lib\libofficebean.a %_DEST%\lib%_EXT%\libofficebean.a
8	..\%__SRC%\lib\officebean.dylib %_DEST%\lib%_EXT%\officebean.dylib	9	..\%__SRC%\lib\officebean.dylib %_DEST%\lib%_EXT%\officebean.dylib
9		10
10	dos: sh -c "if test %OS% = MACOSX; then create-bundle %_DEST%\lib%_EXT%\*.dylib; fi"	11	dos: sh -c "if test %OS% = MACOSX; then create-bundle %_DEST%\lib%_EXT%\*.dylib; fi"

Lines 6-11 Link Here

(-)oo_1.1.1_src/offmgr/prj/d.lst.orig (+1 lines)
6	touch: ..\%__SRC%\misc\ofa.hid %_DEST%\bin%_EXT%\ofa.hid	6	touch: ..\%__SRC%\misc\ofa.hid %_DEST%\bin%_EXT%\ofa.hid
7	..\%__SRC%\lib\_ofa.lib %_DEST%\lib%_EXT%\aofa.lib	7	..\%__SRC%\lib\_ofa.lib %_DEST%\lib%_EXT%\aofa.lib
8	..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%	8	..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%
		9	..\%__SRC%\lib\lib*.a %_DEST%\lib%_EXT%
9	..\%__SRC%\lib\.dylib %_DEST%\lib%_EXT%\.dylib	10	..\%__SRC%\lib\.dylib %_DEST%\lib%_EXT%\.dylib
10	..\%__SRC%\slb\ofa.lib %_DEST%\lib%_EXT%\xofa.lib	11	..\%__SRC%\slb\ofa.lib %_DEST%\lib%_EXT%\xofa.lib
11	..\%__SRC%\inc\class.lst %_DEST%\inc%_EXT%\class.lst	12	..\%__SRC%\inc\class.lst %_DEST%\inc%_EXT%\class.lst

Lines 1-5 Link Here

(-)oo_1.1.1_src/package/prj/d.lst.orig (+1 lines)
1	..\%__SRC%\misc\.map %_DEST%\bin%_EXT%\.map	1	..\%__SRC%\misc\.map %_DEST%\bin%_EXT%\.map
2	..\%__SRC%\bin\.dll %_DEST%\bin%_EXT%\.dll	2	..\%__SRC%\bin\.dll %_DEST%\bin%_EXT%\.dll
3	..\%__SRC%\lib\lib.so %_DEST%\lib%_EXT%\lib.so	3	..\%__SRC%\lib\lib.so %_DEST%\lib%_EXT%\lib.so
		4	..\%__SRC%\lib\lib.a %_DEST%\lib%_EXT%\lib.a
4	..\%__SRC%\lib\.dylib %_DEST%\lib%_EXT%\.dylib	5	..\%__SRC%\lib\.dylib %_DEST%\lib%_EXT%\.dylib
5	..\dtd\.dtd %_DEST%\bin%_EXT%\.*	6	..\dtd\.dtd %_DEST%\bin%_EXT%\.*

Lines 1-4 Link Here

(-)oo_1.1.1_src/padmin/prj/d.lst.orig (+1 lines)
1	..\%__SRC%\bin\.res %_DEST%\bin%_EXT%\.res	1	..\%__SRC%\bin\.res %_DEST%\bin%_EXT%\.res
2	..\%__SRC%\bin\.bin %_DEST%\bin%_EXT%\.bin	2	..\%__SRC%\bin\.bin %_DEST%\bin%_EXT%\.bin
3	..\%__SRC%\lib\lib.so %_DEST%\lib%_EXT%\lib.so	3	..\%__SRC%\lib\lib.so %_DEST%\lib%_EXT%\lib.so
		4	..\%__SRC%\lib\lib.a %_DEST%\lib%_EXT%\lib.a
4	..\%__SRC%\lib\lib.dylib %_DEST%\lib%_EXT%\lib.dylib	5	..\%__SRC%\lib\lib.dylib %_DEST%\lib%_EXT%\lib.dylib

Lines 1-6 Link Here

(-)oo_1.1.1_src/psprint/prj/d.lst.orig (+2 lines)
1	mkdir: %_DEST%\inc%_EXT%\psprint	1	mkdir: %_DEST%\inc%_EXT%\psprint
2		2
		3	..\%__SRC%\bin\.dll %_DEST%\bin%_EXT%\.dll
3	..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%	4	..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%
		5	..\%__SRC%\lib\lib*.a %_DEST%\lib%_EXT%
4	..\%__SRC%\slb\apsp.lib %_DEST%\lib%_EXT%\apsp.lib	6	..\%__SRC%\slb\apsp.lib %_DEST%\lib%_EXT%\apsp.lib
5	..\%__SRC%\lib\.dylib %_DEST%\lib%_EXT%\.dylib	7	..\%__SRC%\lib\.dylib %_DEST%\lib%_EXT%\.dylib
6		8

Lines 1-6 Link Here

(-)oo_1.1.1_src/psprint/util/libpsp_mingw.map.orig (+6 lines)
1	LIBPSPRINT_1_0 {	1	LIBPSPRINT_1_0 {
2	global:	2	global:
3	psp;	3	psp;
		4	OpenTTFont;
		5	MapChar;
		6	GetTTGlobalFontInfo;
		7	GetTTSimpleGlyphMetrics;
		8	CreateTTFromTTGlyphs;
		9	CloseTTFont;
4	local:	10	local:
5	*;	11	*;
6	};	12	};

Lines 82-91 Link Here

(-)oo_1.1.1_src/python/Python-2.2.2.patch.orig
82	#else	82	#else
83	#ifndef HAVE_GETTIMEOFDAY	83	#ifndef HAVE_GETTIMEOFDAY
84	*** misc/Python-2.2.2/Modules/posixmodule.c Fri Aug 23 18:27:40 2002	84	*** misc/Python-2.2.2/Modules/posixmodule.c Fri Aug 23 18:27:40 2002




  
***************
*** 281,288 ****
--- 293,306 ----
  static PyObject *
  convertenviron(void)
  {

  	d = PyDict_New();
  	if (d == NULL)
  		return NULL;
***************
*** 674,680 ****
  	char *pathfree = NULL;  /* this memory must be free'd */
  	int res;
  
! #ifdef MS_WIN32
  	int pathlen;
  	char pathcopy[MAX_PATH];
  #endif /* MS_WIN32 */
--- 692,698 ----
  	char *pathfree = NULL;  /* this memory must be free'd */
  	int res;
  
! #if defined(MS_WIN32) || defined (__MINGW32__)
  	int pathlen;
  	char pathcopy[MAX_PATH];
  #endif /* MS_WIN32 */
***************
*** 684,690 ****
  		return NULL;
  	pathfree = path;
  
! #ifdef MS_WIN32
  	pathlen = strlen(path);
  	/* the library call can blow up if the file name is too long! */
  	if (pathlen > MAX_PATH) {
--- 702,708 ----
  		return NULL;
  	pathfree = path;
  
! #if defined(MS_WIN32) || defined (__MINGW32__)
  	pathlen = strlen(path);
  	/* the library call can blow up if the file name is too long! */
  	if (pathlen > MAX_PATH) {
***************
*** 1224,1230 ****
  	                      Py_FileSystemDefaultEncoding, &path, &mode))
  		return NULL;
  	Py_BEGIN_ALLOW_THREADS
! #if ( defined(__WATCOMC__) || defined(_MSC_VER) || defined(PYCC_VACPP) ) && !defined(__QNX__)
  	res = mkdir(path);
  #else
  	res = mkdir(path, mode);
--- 1242,1248 ----
  	                      Py_FileSystemDefaultEncoding, &path, &mode))
  		return NULL;
  	Py_BEGIN_ALLOW_THREADS
! #if ( defined(__WATCOMC__) || defined(_MSC_VER) || defined(__MINGW32__) || defined(PYCC_VACPP) ) && !defined(__QNX__)
  	res = mkdir(path);
  #else
  	res = mkdir(path, mode);
***************
*** 3864,3870 ****
--- 3882,3892 ----
  	if (!PyArg_ParseTuple(args, ":pipe"))
  		return NULL;
  	Py_BEGIN_ALLOW_THREADS
+ #ifdef __MINGW32__
+ 	res = _pipe(fds, 1024, O_BINARY);
+ #else
  	res = pipe(fds);
+ #endif
  	Py_END_ALLOW_THREADS
  	if (res != 0)
  		return posix_error();
*** misc/Python-2.2.2/Modules/timemodule.c	Tue Mar 12 22:38:31 2002
--- misc/build/Python-2.2.2/Modules/timemodule.c	Fri Oct 10 12:42:16 2003
***************

  #endif /* USE_DYLD */
  
*** misc/Python-2.2.2/configure	Thu Oct 10 17:26:41 2002




      esac
  fi
  
--- 1705,1727 ----
      esac
      case $ac_sys_system in
      Darwin*)

!     	       OPT="$OPT -fPIC";;
! 	    sparc64*)
!     	       OPT="$OPT -fPIC";;
! 	    x86_64*)
!     	       OPT="$OPT -fPIC";;
!             *)
!     	       OPT="$OPT";;
! 	esac

      LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -compatibility_version $(VERSION) -current_version $(VERSION)';;
  esac
  
--- 3125,3133 ----
      LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -compatibility_version $(VERSION) -current_version $(VERSION)';;
    Darwin/*)
      ns_undef_sym='_environ'

  
***************
*** 3159,3164 ****
--- 3184,3190 ----
  	case $ac_sys_system in
  	hp*|HP*)   SO=.sl;;
  	CYGWIN*)   SO=.dll;;

  		fi ;;
  	Linux*) LDSHARED='$(CC) -shared';;
  	dgux*) LDSHARED="ld -G";;
--- 3227,3241 ----
  			LDSHARED="$LDSHARED -undefined suppress"
  		fi ;;
  	Darwin/*)

  	OpenUNIX*|UnixWare*)
  		if test "$GCC" = "yes"
  		then LDSHARED="$(CC) -shared"
--- 3243,3253 ----
  	OpenBSD*|FreeBSD*)
  		if [ "`$CC -dM -E - </dev/null | grep __ELF__`" != "" ]
  		then

  	OpenUNIX*|UnixWare*)
  		if test "$GCC" = "yes"
  		then LDSHARED="$(CC) -shared"
***************
*** 3228,3234 ****
  		fi;;
  	SCO_SV*) LDSHARED="$(CC) -Wl,-G,-Bexport";;
  	Monterey*) LDSHARED="cc -G -dy -Bdynamic -Bexport -L/usr/lib/ia64l64";;
! 	CYGWIN*) LDSHARED="gcc -shared -Wl,--enable-auto-image-base";;
  	*)	LDSHARED="ld";;
  	esac
  fi
--- 3255,3261 ----
  		fi;;
  	SCO_SV*) LDSHARED="$(CC) -Wl,-G,-Bexport";;
  	Monterey*) LDSHARED="cc -G -dy -Bdynamic -Bexport -L/usr/lib/ia64l64";;
! 	CYGWIN*) LDSHARED="\$(CC) -shared -Wl,--enable-auto-image-base";;
  	*)	LDSHARED="ld";;
  	esac
  fi
***************
*** 3882,3887 ****
--- 3909,3954 ----
  else
    echo "$ac_t""no" 1>&6
  
+     ac_safe=`echo "windows.h" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for windows.h""... $ac_c" 1>&6
+ echo "configure:3888: checking for windows.h" >&5
+ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+ #line 3893 "configure"
+ #include "confdefs.h"
+ #include <windows.h>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+ { (eval echo configure:3898: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+   rm -rf conftest*
+   eval "ac_cv_header_$ac_safe=yes"
+ else
+   echo "$ac_err" >&5
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   eval "ac_cv_header_$ac_safe=no"
+ fi
+ rm -f conftest*
+ fi
+ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+   echo "$ac_t""yes" 1>&6
+   cat >> confdefs.h <<\EOF
+ #define WITH_THREAD 1
+ EOF
+ 
+     cat >> confdefs.h <<\EOF
+ #define NT_THREADS 1
+ EOF
+ 
+     LIBOBJS="$LIBOBJS thread.o"
+ else
+   echo "$ac_t""no" 1>&6
+ 
      ac_safe=`echo "kernel/OS.h" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for kernel/OS.h""... $ac_c" 1>&6
  echo "configure:3888: checking for kernel/OS.h" >&5
***************
*** 4012,4017 ****
--- 4079,4129 ----
  else
    echo "$ac_t""no" 1>&6
  
+     echo $ac_n "checking for pthread_create in -lpthreadGCE""... $ac_c" 1>&6
+ echo "configure:3972: checking for pthread_create in -lpthreadGCE" >&5
+ ac_lib_var=`echo pthreadGCE'_'pthread_create | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   ac_save_LIBS="$LIBS"
+ LIBS="-lpthreadGCE  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+ #line 3980 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+     builtin and then its argument prototype would still apply.  */
+ char pthread_create();
+ 
+ int main() {
+ pthread_create()
+ ; return 0; }
+ EOF
+ if { (eval echo configure:3991: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=no"
+ fi
+ rm -f conftest*
+ LIBS="$ac_save_LIBS"
+ 
+ fi
+ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+   echo "$ac_t""yes" 1>&6
+   cat >> confdefs.h <<\EOF
+ #define WITH_THREAD 1
+ EOF
+ 
+     posix_threads=yes
+     LIBS="$LIBS -lpthreadGCE"
+     LIBOBJS="$LIBOBJS thread.o"
+ else
+   echo "$ac_t""no" 1>&6
+ 
      echo $ac_n "checking for __d6_pthread_create in -lthread""... $ac_c" 1>&6
  echo "configure:4017: checking for __d6_pthread_create in -lthread" >&5
  ac_lib_var=`echo thread'_'__d6_pthread_create | sed 'y%./+-%__p_%'`
***************
*** 4164,4174 ****
--- 4276,4290 ----
  fi
  
  fi
+ 
+ fi
  rm -f conftest*
  fi
  
  fi
  
+ fi
+ 
  
      if test "$posix_threads" = "yes"; then
        if test "$unistd_defines_pthreads" = "no"; then
***************
*** 7661,7667 ****
  
  trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15
  
! DEFS=-DHAVE_CONFIG_H
  
  # Without the "./", some shells look in PATH for config.status.
  : ${CONFIG_STATUS=./config.status}
--- 7777,7783 ----
  
  trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15
  
! 
  
  # Without the "./", some shells look in PATH for config.status.
  : ${CONFIG_STATUS=./config.status}
*** misc/Python-2.2.2/setup.py	Thu Oct 10 02:59:16 2002
--- misc/build/Python-2.2.2/setup.py	Fri Oct 10 12:42:16 2003
***************

              tcl_includes is None or tk_includes is None):
              # Something's missing, so give up
              return
*** misc/build/Python-2.2.2/pyconfig.h.in.orig	Fri Oct  4 19:16:28 2002
--- misc/build/Python-2.2.2/pyconfig.h.in	Sat Mar 20 00:51:14 2004
***************
*** 87,92 ****
--- 87,95 ----
     (as it does on SCI ODT 3.0) */
  #undef BAD_STATIC_FORWARD
  
+ /* Define this if you have Windows NT threads */
+ #undef NT_THREADS
+ 
  /* Define this if you have BeOS threads */
  #undef BEOS_THREADS
  
--- misc/build/Python-2.2.2/Python/thread_pthread.h.orig	2002-10-04 19:16:28.000000000 +0900

..\%__SRC%\lib\libpython.so.2.2.2 %_DEST%\lib%_EXT%\libpython.so.2.2.2
..\%__SRC%\lib\libpython*.dylib %_DEST%\lib%_EXT%\libpython*.dylib

#MingW ONLY !
..\%__SRC%\misc\build\python-inst\include\python22\pyconfig.h %_DEST%\inc%_EXT%\python\pyconfig.h
..\%__SRC%\misc\build\python-inst\bin\python.exe %_DEST%\bin%_EXT%\python.exe
..\%__SRC%\bin\python22.dll %_DEST%\bin%_EXT%\python22.dll
..\%__SRC%\misc\build\Python-2.2.2\libpython22.dll.a %_DEST%\lib%_EXT%\libpython.a

# WINDOWS ONLY !
..\%__SRC%\misc\build\pyconfig.h %_DEST%\inc%_EXT%\python\pyconfig.h
..\%__SRC%\misc\build\Python-2.2.2\PCBuild\python.exe %_DEST%\bin%_EXT%\python.exe

Lines 1-8 Link Here

(-)oo_1.1.1_src/pyuno/prj/d.lst.orig (+3 lines)
1	..\%__SRC%\lib\libpyuno.so %_DEST%\lib%_EXT%\libpyuno.so	1	..\%__SRC%\lib\libpyuno.so %_DEST%\lib%_EXT%\libpyuno.so
		2	..\%__SRC%\lib\libpyuno.a %_DEST%\lib%_EXT%\libpyuno.a
2	..\%__SRC%\lib\libpyuno.dylib %_DEST%\lib%_EXT%\libpyuno.dylib	3	..\%__SRC%\lib\libpyuno.dylib %_DEST%\lib%_EXT%\libpyuno.dylib
3	..\%__SRC%\lib\pyuno.so %_DEST%\lib%_EXT%\pyuno.so	4	..\%__SRC%\lib\pyuno.so %_DEST%\lib%_EXT%\pyuno.so
		5	..\%__SRC%\lib\pyuno.a %_DEST%\lib%_EXT%\pyuno.a
4	..\%__SRC%\lib\pyuno.dylib %_DEST%\lib%_EXT%\pyuno.dylib	6	..\%__SRC%\lib\pyuno.dylib %_DEST%\lib%_EXT%\pyuno.dylib
5	..\%__SRC%\lib\pythonloader.uno.so %_DEST%\lib%_EXT%\pythonloader.uno.so	7	..\%__SRC%\lib\pythonloader.uno.so %_DEST%\lib%_EXT%\pythonloader.uno.so
		8	..\%__SRC%\lib\pythonloader.uno.a %_DEST%\lib%_EXT%\pythonloader.uno.a
6	..\%__SRC%\lib\pythonloader.uno.dylib %_DEST%\lib%_EXT%\pythonloader.uno.dylib	9	..\%__SRC%\lib\pythonloader.uno.dylib %_DEST%\lib%_EXT%\pythonloader.uno.dylib
7	..\%__SRC%\lib\unohelper.py %_DEST%\lib%_EXT%\unohelper.py	10	..\%__SRC%\lib\unohelper.py %_DEST%\lib%_EXT%\unohelper.py
8	..\%__SRC%\lib\pythonloader.py %_DEST%\lib%_EXT%\pythonloader.py	11	..\%__SRC%\lib\pythonloader.py %_DEST%\lib%_EXT%\pythonloader.py

Lines 276-278 Link Here

(-)oo_1.1.1_src/readlicense_oo/prj/d.lst.orig (+1 lines)
276	..\%__SRC%\misc\99\readme99.html %_DEST%\bin%_EXT%\99\osl\README99.html	276	..\%__SRC%\misc\99\readme99.html %_DEST%\bin%_EXT%\99\osl\README99.html
277		277
278	..\%__SRC%\misc\THIRDPARTYLICENSEREADME.html %_DEST%\bin%_EXT%\THIRDPARTYLICENSEREADME.html	278	..\%__SRC%\misc\THIRDPARTYLICENSEREADME.html %_DEST%\bin%_EXT%\THIRDPARTYLICENSEREADME.html
		279	..\%__SRC%\misc\InstGuide_11_win.pdf %_DEST%\bin%_EXT%\InstGuide_11_win.pdf

Lines 4-9 Link Here

(-)oo_1.1.1_src/regexp/prj/d.lst.orig (+1 lines)
4		4
5	..\%__SRC%\bin\i18nregexp.dll %_DEST%\bin%_EXT%\i18nregexp.dll	5	..\%__SRC%\bin\i18nregexp.dll %_DEST%\bin%_EXT%\i18nregexp.dll
6	..\%__SRC%\lib\libi18nregexp.so %_DEST%\lib%_EXT%\libi18nregexp.so	6	..\%__SRC%\lib\libi18nregexp.so %_DEST%\lib%_EXT%\libi18nregexp.so
		7	..\%__SRC%\lib\libi18nregexp.a %_DEST%\lib%_EXT%\libi18nregexp.a
7	..\%__SRC%\lib\libi18nregexp.dylib %_DEST%\lib%_EXT%\libi18nregexp.dylib	8	..\%__SRC%\lib\libi18nregexp.dylib %_DEST%\lib%_EXT%\libi18nregexp.dylib
8	..\%__SRC%\lib\ii18nregexp.lib %_DEST%\lib%_EXT%\ii18nregexp.lib	9	..\%__SRC%\lib\ii18nregexp.lib %_DEST%\lib%_EXT%\ii18nregexp.lib
9		10

Lines 8-13 Link Here

(-)oo_1.1.1_src/registry/prj/d.lst.orig (+1 lines)
8	..\%__SRC%\lib\libreg.so. %_DEST%\lib%_EXT%\libreg.so.	8	..\%__SRC%\lib\libreg.so. %_DEST%\lib%_EXT%\libreg.so.
9	..\%__SRC%\lib\librgt.so %_DEST%\lib%_EXT%\librgt.so	9	..\%__SRC%\lib\librgt.so %_DEST%\lib%_EXT%\librgt.so
10	..\%__SRC%\bin\reg.dll %_DEST%\bin%_EXT%\reg.dll	10	..\%__SRC%\bin\reg.dll %_DEST%\bin%_EXT%\reg.dll
		11	..\%__SRC%\lib\libreg.a %_DEST%\lib%_EXT%\libreg.a
11	..\%__SRC%\lib\libreg.dylib %_DEST%\lib%_EXT%\libreg.dylib	12	..\%__SRC%\lib\libreg.dylib %_DEST%\lib%_EXT%\libreg.dylib
12	..\%__SRC%\lib\libreg.dylib. %_DEST%\lib%_EXT%\libreg.dylib.	13	..\%__SRC%\lib\libreg.dylib. %_DEST%\lib%_EXT%\libreg.dylib.
13		14

Lines 68-73 Link Here

(-)oo_1.1.1_src/registry/source/regimpl.cxx.orig (+3 lines)
68	#ifdef UNX	68	#ifdef UNX
69	#include <unistd.h>	69	#include <unistd.h>
70	#endif	70	#endif
		71	#ifdef __MINGW32__
		72	#include <unistd.h>
		73	#endif
71		74
72	#ifdef MACOSX	75	#ifdef MACOSX
73	// Get the store.hxx inlines non-inline, solves crashes in cppumaker	76	// Get the store.hxx inlines non-inline, solves crashes in cppumaker

Lines 431-437 Link Here

(-)oo_1.1.1_src/registry/tools/checksingleton.cxx.orig (-1 / +1 lines)
431	return bRet;	431	return bRet;
432	}	432	}
433		433
434	#if (defined UNX) \|\| (defined OS2)	434	#if (defined UNX) \|\| (defined OS2) \|\| (defined __MINGW32__)
435	int main( int argc, char * argv[] )	435	int main( int argc, char * argv[] )
436	#else	436	#else
437		437

Lines 2102-2108 Link Here

(-)oo_1.1.1_src/registry/tools/regcompare.cxx.orig (-1 / +1 lines)
2102	return nError;	2102	return nError;
2103	}	2103	}
2104		2104
2105	#if (defined UNX) \|\| (defined OS2)	2105	#if (defined UNX) \|\| (defined OS2) \|\| defined __MINGW32__
2106	int main( int argc, char * argv[] )	2106	int main( int argc, char * argv[] )
2107	#else	2107	#else
2108		2108

Lines 5-10 Link Here

(-)oo_1.1.1_src/remotebridges/prj/d.lst.orig (+1 lines)
5	..\source\dynamicloader\dynamicloader.xml %_DEST%\xml%_EXT%\dynamicloader.uno.xml	5	..\source\dynamicloader\dynamicloader.xml %_DEST%\xml%_EXT%\dynamicloader.uno.xml
6	..\source\unourl_resolver\uuresolver.xml %_DEST%\xml%_EXT%\uuresolver.uno.xml	6	..\source\unourl_resolver\uuresolver.xml %_DEST%\xml%_EXT%\uuresolver.uno.xml
7	..\%__SRC%\lib\.so %_DEST%\lib%_EXT%\	7	..\%__SRC%\lib\.so %_DEST%\lib%_EXT%\
		8	..\%__SRC%\lib\.a %_DEST%\lib%_EXT%\
8	..\%__SRC%\lib\.dylib %_DEST%\lib%_EXT%\	9	..\%__SRC%\lib\.dylib %_DEST%\lib%_EXT%\
9		10
10	dos: sh -c "if test %OS% = MACOSX; then create-bundle %_DEST%\lib%_EXT%\*.dylib; fi"	11	dos: sh -c "if test %OS% = MACOSX; then create-bundle %_DEST%\lib%_EXT%\*.dylib; fi"

Lines 80-86 Link Here

(-)oo_1.1.1_src/rsc/source/prj/gui.cxx.orig (-2 / +2 lines)
80	/* */	80	/* */
81	/* Description : Gibt die Temporaeren Dateien frei. */	81	/* Description : Gibt die Temporaeren Dateien frei. */
82	/****************************************************************/	82	/****************************************************************/
83	#if defined( UNX ) \|\| ( defined( PM2 ) && ( defined( TCPP ) \|\| defined ( GCC )) ) \|\| defined( MAC ) \|\| defined (WTC) \|\| defined (MTW)	83	#if defined( UNX ) \|\| ( defined( PM2 ) && ( defined( TCPP ) \|\| defined ( GCC )) ) \|\| defined( MAC ) \|\| defined (WTC) \|\| defined (MTW) \|\| defined(__MINGW32__)
84	void ExitProgram( void ){	84	void ExitProgram( void ){
85	#else	85	#else
86	#if defined( CSET )	86	#if defined( CSET )
Lines 105-111 Link Here
105	}	105	}
106		106
107		107
108	#if defined( UNX ) \|\| defined( MAC ) \|\| ( defined( PM2 ) && ( defined( CSET ) \|\| defined ( GCC ))) \|\| defined (WTC) \|\| defined(ICC)	108	#if defined( UNX ) \|\| defined( MAC ) \|\| ( defined( PM2 ) && ( defined( CSET ) \|\| defined ( GCC ))) \|\| defined (WTC) \|\| defined(ICC) \|\| defined(__MINGW32__)
109	int main ( int argc, char ** argv) {	109	int main ( int argc, char ** argv) {
110	#else	110	#else
111	#if defined( MTW )	111	#if defined( MTW )

Lines 302-308 Link Here

(-)oo_1.1.1_src/rsc/source/prj/start.cxx.orig (-1 / +1 lines)
302	\|* Letzte Aenderung MM 05.09.91	302	\|* Letzte Aenderung MM 05.09.91
303	\|*	303	\|*
304	*************************************************************************/	304	*************************************************************************/
305	#if defined UNX \|\| (defined PM2 && (defined CSET \|\| defined GCC )) \|\| defined WTC \|\| defined MTW \|\| defined ICC	305	#if defined UNX \|\| (defined PM2 && (defined CSET \|\| defined GCC )) \|\| defined WTC \|\| defined MTW \|\| defined ICC \|\| defined(__MINGW32__)
306	int main ( int argc, char ** argv)	306	int main ( int argc, char ** argv)
307	{	307	{
308	#else	308	#else

Lines 165-170 Link Here

(-)oo_1.1.1_src/rsc/source/tools/rsctools.cxx.orig (+2 lines)
165	return ByteString( tmpnam( NULL ) );	165	return ByteString( tmpnam( NULL ) );
166	#elif MACOSX	166	#elif MACOSX
167	return ByteString( macxp_tempnam( NULL, NULL ) );	167	return ByteString( macxp_tempnam( NULL, NULL ) );
		168	#elif defined(__MINGW32__)
		169	return ByteString( tempnam( (const char *) _P_tmpdir, NULL ) );
168	#else	170	#else
169	return ByteString( tempnam( (const char *) P_tmpdir, NULL ) );	171	return ByteString( tempnam( (const char *) P_tmpdir, NULL ) );
170	#endif	172	#endif

Lines 3-9 Link Here

(-)oo_1.1.1_src/sablot/Sablot-0.52.patch.orig (-1 / +3 lines)
3	***************	3	***************
4	* 1 **	4	* 1 **
5	! dummy	5	! dummy
6	--- 1,163 ----	6	--- 1,165 ----
7	! #*************************************************************************	7	! #*************************************************************************
8	! #	8	! #
9	! # $RCSfile: makefile.mk,v $	9	! # $RCSfile: makefile.mk,v $
Lines 78-85 Link Here
78	! .INCLUDE: settings.mk	78	! .INCLUDE: settings.mk
79	!	79	!
80	! .IF "$(GUI)"=="WNT"	80	! .IF "$(GUI)"=="WNT"
		81	! .IF "$(COM)"!="GCC"
81	! CFLAGS+=-GR	82	! CFLAGS+=-GR
82	! .ENDIF	83	! .ENDIF
		84	! .ENDIF
83	!	85	!
84	! .IF "$(OS)"=="SOLARIS"	86	! .IF "$(OS)"=="SOLARIS"
85	! CFLAGS+= -DHAVE_IEEEFP_H -DHAVE_UNISTD_H	87	! CFLAGS+= -DHAVE_IEEEFP_H -DHAVE_UNISTD_H

Lines 5-8 Link Here

(-)oo_1.1.1_src/sablot/prj/d.lst.orig (+1 lines)
5		5
6	..\%__SRC%\slb\sablot.lib %_DEST%\lib%_EXT%\sablot.lib	6	..\%__SRC%\slb\sablot.lib %_DEST%\lib%_EXT%\sablot.lib
7	..\%__SRC%\lib\libsablot.a %_DEST%\lib%_EXT%\libsablot.a	7	..\%__SRC%\lib\libsablot.a %_DEST%\lib%_EXT%\libsablot.a
		8	..\%__SRC%\lib\libsablot_static.a %_DEST%\lib%_EXT%\libsablot_static.a
8		9

Lines 99-110 Link Here

(-)oo_1.1.1_src/sal/inc/sal/config.h.orig (-1 / +5 lines)
99	#endif	99	#endif
100	#endif /* defined _MSC_VER < 1300 */	100	#endif /* defined _MSC_VER < 1300 */
101		101
		102	#endif /* defined _MSC_VER */
		103
102	/* Provide ISO C99 compatible versions of snprint and vsnprintf */	104	/* Provide ISO C99 compatible versions of snprint and vsnprintf */
		105	#ifdef __MINGW32__
		106	#define _SNPRINTF_DLLIMPORT
		107	#endif
103	#ifndef _SNPRINTF_H	108	#ifndef _SNPRINTF_H
104	#include <systools/win32/snprintf.h>	109	#include <systools/win32/snprintf.h>
105	#endif	110	#endif
106		111
107	#endif /* defined _MSC_VER */
108	#endif /* defined WIN32 */	112	#endif /* defined WIN32 */
109		113
110	/* BR: 16bit fuer Borland-Compiler */	114	/* BR: 16bit fuer Borland-Compiler */

Lines 95-101 Link Here

(-)oo_1.1.1_src/sal/inc/sal/types.h.orig (-3 / +8 lines)
95	typedef char sal_Char;	95	typedef char sal_Char;
96	typedef signed char sal_sChar;	96	typedef signed char sal_sChar;
97	typedef unsigned char sal_uChar;	97	typedef unsigned char sal_uChar;
98	#if defined(SAL_W32)	98	#if defined(SAL_W32) && !defined(__MINGW32__)
99	typedef wchar_t sal_Unicode;	99	typedef wchar_t sal_Unicode;
100	#else	100	#else
101	#define SAL_UNICODE_NOTEQUAL_WCHAR_T	101	#define SAL_UNICODE_NOTEQUAL_WCHAR_T
Lines 111-120 Link Here
111	#define SAL_MAX_ENUM 0x7fff	111	#define SAL_MAX_ENUM 0x7fff
112	#endif	112	#endif
113		113
114	#ifdef _MSC_VER	114	#if defined(_MSC_VER) \|\| defined(__MINGW32__)
115	# define SAL_DLLEXPORT __declspec(dllexport)	115	# define SAL_DLLEXPORT __declspec(dllexport)
		116	#if defined(_MSC_VER)
116	# define SAL_CALL __cdecl	117	# define SAL_CALL __cdecl
117	# define SAL_CALL_ELLIPSE __cdecl	118	# define SAL_CALL_ELLIPSE __cdecl
		119	#else
		120	# define SAL_CALL
		121	# define SAL_CALL_ELLIPSE
		122	#endif
118	#elif defined SAL_OS2	123	#elif defined SAL_OS2
119	# define SAL_DLLEXPORT	124	# define SAL_DLLEXPORT
120	# define SAL_CALL	125	# define SAL_CALL
Lines 135-141 Link Here
135	This hinders the compiler from setting a generic vtable stating that	140	This hinders the compiler from setting a generic vtable stating that
136	a pure virtual function was called and thus slightly reduces code size.	141	a pure virtual function was called and thus slightly reduces code size.
137	*/	142	*/
138	#ifdef _MSC_VER	143	#if defined(_MSC_VER) \|\| !defined(__MINGW32__)
139	#define SAL_NO_VTABLE __declspec(novtable)	144	#define SAL_NO_VTABLE __declspec(novtable)
140	#else	145	#else
141	#define SAL_NO_VTABLE	146	#define SAL_NO_VTABLE

Lines 71-76 Link Here

(-)oo_1.1.1_src/sal/inc/systools/win32/uwinapi.h.orig (+7 lines)
71	# include <windows.h>	71	# include <windows.h>
72	#endif	72	#endif
73		73
		74	#ifdef __MINGW32__
		75	#include <basetyps.h>
		76	#ifdef _UWINAPI_
		77	#define WINBASEAPI
		78	#endif
		79	#endif
		80
74	/** GetUserDomain	81	/** GetUserDomain
75		82
76	The GetUserDomain function retrieves the name of the NT domain the user is	83	The GetUserDomain function retrieves the name of the NT domain the user is

Lines 85-90 Link Here

(-)oo_1.1.1_src/sal/osl/w32/dllentry.c.orig (-1 / +88 lines)
85	extern void SAL_CALL ___rtl_memory_init (void);	85	extern void SAL_CALL ___rtl_memory_init (void);
86	extern void SAL_CALL ___rtl_memory_fini (void);	86	extern void SAL_CALL ___rtl_memory_fini (void);
87		87
		88	#ifdef __MINGW32__
		89
		90	typedef void (*func_ptr) (void);
		91	extern func_ptr __CTOR_LIST__[];
		92	extern func_ptr __DTOR_LIST__[];
		93
		94	static void do_startup(void);
		95	static void do_cleanup(void);
		96
		97	#else
		98
88	/*	99	/*
89	This is needed because DllMain is called after static constructors. A DLL's	100	This is needed because DllMain is called after static constructors. A DLL's
90	startup and shutdown sequence looks like this:	101	startup and shutdown sequence looks like this:
Lines 99-108 Link Here
99		110
100	*/	111	*/
101		112
102
103	static BOOL WINAPI _RawDllMain( HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved );	113	static BOOL WINAPI _RawDllMain( HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved );
104	extern BOOL (WINAPI *_pRawDllMain)(HANDLE, DWORD, LPVOID) = _RawDllMain;	114	extern BOOL (WINAPI *_pRawDllMain)(HANDLE, DWORD, LPVOID) = _RawDllMain;
105		115
		116	#endif
		117
106	//------------------------------------------------------------------------------	118	//------------------------------------------------------------------------------
107	// defines	119	// defines
108	//------------------------------------------------------------------------------	120	//------------------------------------------------------------------------------
Lines 179-190 Link Here
179	// DllMain	191	// DllMain
180	//------------------------------------------------------------------------------	192	//------------------------------------------------------------------------------
181		193
		194	#ifdef __MINGW32__
		195
		196	void
		197	__do_global_dtors (void)
		198	{
		199	static func_ptr *p = __DTOR_LIST__ + 1;
		200
		201	/*
		202	* Call each destructor in the destructor list until a null pointer
		203	* is encountered.
		204	*/
		205	while (*p)
		206	{
		207	(*(p)) ();
		208	p++;
		209	}
		210	}
		211
		212	void
		213	__do_global_ctors (void)
		214	{
		215	unsigned long nptrs = (unsigned long) __CTOR_LIST__[0];
		216	unsigned i;
		217
		218	/*
		219	* If the first entry in the constructor list is -1 then the list
		220	* is terminated with a null entry. Otherwise the first entry was
		221	* the number of pointers in the list.
		222	*/
		223	if (nptrs == -1)
		224	{
		225	for (nptrs = 0; __CTOR_LIST__[nptrs + 1] != 0; nptrs++)
		226	;
		227	}
		228
		229	/*
		230	* Go through the list backwards calling constructors.
		231	*/
		232	for (i = nptrs; i >= 1; i--)
		233	{
		234	__CTOR_LIST__[i] ();
		235	}
		236
		237	/*
		238	* Register the destructors for processing on exit.
		239	*/
		240	atexit (__do_global_dtors);
		241	}
		242
		243	static int initialized = 0;
		244
		245	void
		246	__main (void)
		247	{
		248	if (!initialized)
		249	{
		250	initialized = 1;
		251	do_startup();
		252	__do_global_ctors ();
		253	}
		254	}
		255
		256	static void do_startup( void )
		257	{
258	#else
182	static BOOL WINAPI _RawDllMain( HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved )	259	static BOOL WINAPI _RawDllMain( HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved )
183	{	260	{
184	switch (fdwReason)	261	switch (fdwReason)
185	{	262	{
186	case DLL_PROCESS_ATTACH:	263	case DLL_PROCESS_ATTACH:
187	{	264	{
		265	#endif
188	OSVERSIONINFO aInfo;	266	OSVERSIONINFO aInfo;
189	WSADATA wsaData;	267	WSADATA wsaData;
190	int error;	268	int error;
Lines 252-262 Link Here
252	//We disable floating point exceptions. This is the usual state at program startup	330	//We disable floating point exceptions. This is the usual state at program startup
253	//but on Windows 98 and ME this is not always the case.	331	//but on Windows 98 and ME this is not always the case.
254	_control87(_MCW_EM, _MCW_EM);	332	_control87(_MCW_EM, _MCW_EM);
		333	#ifdef __MINGW32__
		334	atexit(do_cleanup);
		335	}
255		336
		337	void do_cleanup( void )
		338	{
		339	#else
256	break;	340	break;
257	}	341	}
258		342
259	case DLL_PROCESS_DETACH:	343	case DLL_PROCESS_DETACH:
		344	#endif
260		345
261	WSACleanup( );	346	WSACleanup( );
262	if ( lpArgvW )	347	if ( lpArgvW )
Lines 271-280 Link Here
271		356
272	/* finalize memory management */	357	/* finalize memory management */
273	___rtl_memory_fini();	358	___rtl_memory_fini();
		359	#ifndef __MINGW32__
274	break;	360	break;
275	}	361	}
276		362
277	return TRUE;	363	return TRUE;
		364	#endif
278	}	365	}
279		366
280	BOOL WINAPI DllMain( HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved )	367	BOOL WINAPI DllMain( HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved )

Lines 137-147 Link Here

(-)oo_1.1.1_src/sal/osl/w32/fileimpl.cxx.orig (-2 / +50 lines)
137	//##################################################################	137	//##################################################################
138	// simply checking if this path starts with '\\'	138	// simply checking if this path starts with '\\'
139		139
		140	#ifdef __MINGW32__
		141	const wchar_t* UNC_PREFIX = L"\\\\";
		142
		143	bool is_UNC_path(const rtl::OUString& path)
		144	{
		145	return (0 == wcsncmp(UNC_PREFIX, reinterpret_cast< const wchar_t * >(path.getStr()), wcslen(UNC_PREFIX)));
		146	#else
140	const sal_Unicode* UNC_PREFIX = L"\\\\";	147	const sal_Unicode* UNC_PREFIX = L"\\\\";
141		148
142	bool is_UNC_path(const rtl::OUString& path)	149	bool is_UNC_path(const rtl::OUString& path)
143	{	150	{
144	return (0 == wcsncmp(UNC_PREFIX, path.getStr(), wcslen(UNC_PREFIX)));	151	return (0 == wcsncmp(UNC_PREFIX, path.getStr(), wcslen(UNC_PREFIX)));
		152	#endif
145	}	153	}
146		154
147	//##################################################################	155	//##################################################################
Lines 189-201 Link Here
189		197
190	if (!is_floppy_drive(p))	198	if (!is_floppy_drive(p))
191	{	199	{
		200	#ifdef __MINGW32__
		201	DWORD fattr = GetFileAttributes(reinterpret_cast< const wchar_t * >(p.getStr()));
		202	#else
192	DWORD fattr = GetFileAttributes(p.getStr());	203	DWORD fattr = GetFileAttributes(p.getStr());
193		204	#endif
194	if ((INVALID_FILE_ATTRIBUTES != fattr) &&	205	if ((INVALID_FILE_ATTRIBUTES != fattr) &&
195	(FILE_ATTRIBUTE_REPARSE_POINT & fattr))	206	(FILE_ATTRIBUTE_REPARSE_POINT & fattr))
196	{	207	{
197	WIN32_FIND_DATA find_data;	208	WIN32_FIND_DATA find_data;
		209	#ifdef __MINGW32__
		210	HANDLE h_find = FindFirstFile(reinterpret_cast< const wchar_t * >(p.getStr()), &find_data);
		211	#else
198	HANDLE h_find = FindFirstFile(p.getStr(), &find_data);	212	HANDLE h_find = FindFirstFile(p.getStr(), &find_data);
		213	#endif
199		214
200	if (IsValidHandle(h_find) &&	215	if (IsValidHandle(h_find) &&
201	(FILE_ATTRIBUTE_REPARSE_POINT & find_data.dwFileAttributes) &&	216	(FILE_ATTRIBUTE_REPARSE_POINT & find_data.dwFileAttributes) &&
Lines 285-291 Link Here
285	osl_systemPathEnsureSeparator(&p.pData);	300	osl_systemPathEnsureSeparator(&p.pData);
286		301
287	TCHAR vn[51];	302	TCHAR vn[51];
		303	#ifdef __MINGW32__
		304	if (GetVolumeNameForVolumeMountPoint(reinterpret_cast< const wchar_t * >(p.getStr()), vn, ELEMENTS_OF_ARRAY(vn)))
		305	#else
288	if (GetVolumeNameForVolumeMountPoint(p.getStr(), vn, ELEMENTS_OF_ARRAY(vn)))	306	if (GetVolumeNameForVolumeMountPoint(p.getStr(), vn, ELEMENTS_OF_ARRAY(vn)))
		307	#endif
289	{	308	{
290	TCHAR vnfloppy[51];	309	TCHAR vnfloppy[51];
291	if (is_floppy_A_present() &&	310	if (is_floppy_A_present() &&
Lines 307-318 Link Here
307	// for the drive letter alone is not sufficient	326	// for the drive letter alone is not sufficient
308	// we must compare the unique volume name with	327	// we must compare the unique volume name with
309	// that of the available floppy disks	328	// that of the available floppy disks
		329	#ifdef __MINGW32__
		330	const wchar_t* FLOPPY_DRV_LETTERS = TEXT("AaBb");
		331
		332	bool is_floppy_drive(const rtl::OUString& path)
		333	{
		334	const wchar_t* pf = reinterpret_cast< const wchar_t * >(path.getStr());
		335	const wchar_t* ps = pf + 1;
		336	#else
310	const sal_Unicode* FLOPPY_DRV_LETTERS = TEXT("AaBb");	337	const sal_Unicode* FLOPPY_DRV_LETTERS = TEXT("AaBb");
311		338
312	bool is_floppy_drive(const rtl::OUString& path)	339	bool is_floppy_drive(const rtl::OUString& path)
313	{	340	{
314	const sal_Unicode* pf = path.getStr();	341	const sal_Unicode* pf = path.getStr();
315	const sal_Unicode* ps = path.getStr() + 1;	342	const sal_Unicode* ps = path.getStr() + 1;
		343	#endif
316	return ((wcschr(FLOPPY_DRV_LETTERS, pf) && (L':' == ps)) \|\|	344	return ((wcschr(FLOPPY_DRV_LETTERS, pf) && (L':' == ps)) \|\|
317	is_floppy_volume_mount_point(path));	345	is_floppy_volume_mount_point(path));
318	}	346	}
Lines 327-333 Link Here
327	osl_systemPathEnsureSeparator(&p.pData);	355	osl_systemPathEnsureSeparator(&p.pData);
328		356
329	TCHAR vn[51];	357	TCHAR vn[51];
		358	#ifdef __MINGW32__
		359	if (GetVolumeNameForVolumeMountPoint(reinterpret_cast< const wchar_t * >(p.getStr()), vn, ELEMENTS_OF_ARRAY(vn)))
		360	#else
330	if (GetVolumeNameForVolumeMountPoint(p.getStr(), vn, ELEMENTS_OF_ARRAY(vn)))	361	if (GetVolumeNameForVolumeMountPoint(p.getStr(), vn, ELEMENTS_OF_ARRAY(vn)))
		362	#endif
331	return GetDriveType(vn);	363	return GetDriveType(vn);
332		364
333	return DRIVE_NO_ROOT_DIR;	365	return DRIVE_NO_ROOT_DIR;
Lines 342-348 Link Here
342	if (is_volume_mount_point(path))	374	if (is_volume_mount_point(path))
343	drive_type = get_volume_mount_point_drive_type(path);	375	drive_type = get_volume_mount_point_drive_type(path);
344	else	376	else
		377	#ifdef __MINGW32__
		378	drive_type = GetDriveType(reinterpret_cast< const wchar_t * >(path.getStr()));
		379	#else
345	drive_type = GetDriveType(path.getStr());	380	drive_type = GetDriveType(path.getStr());
		381	#endif
346		382
347	if (DRIVE_NO_ROOT_DIR == drive_type)	383	if (DRIVE_NO_ROOT_DIR == drive_type)
348	return MapError(ERROR_INVALID_DRIVE);	384	return MapError(ERROR_INVALID_DRIVE);
Lines 392-398 Link Here
392	void get_volume_space_information(const rtl::OUString& path, oslVolumeInfo *pInfo)	428	void get_volume_space_information(const rtl::OUString& path, oslVolumeInfo *pInfo)
393	{	429	{
394	BOOL ret = GetDiskFreeSpaceEx(	430	BOOL ret = GetDiskFreeSpaceEx(
		431	#ifdef __MINGW32__
		432	reinterpret_cast< const wchar_t * >(path.getStr()),
		433	#else
395	path.getStr(),	434	path.getStr(),
		435	#endif
396	(PULARGE_INTEGER)&pInfo->uFreeSpace,	436	(PULARGE_INTEGER)&pInfo->uFreeSpace,
397	(PULARGE_INTEGER)&pInfo->uTotalSpace,	437	(PULARGE_INTEGER)&pInfo->uTotalSpace,
398	NULL);	438	NULL);
Lines 443-449 Link Here
443	DWORD mcl;	483	DWORD mcl;
444	DWORD flags;	484	DWORD flags;
445		485
		486	#ifdef __MINGW32__
		487	if (GetVolumeInformation(reinterpret_cast<const wchar_t * >(path.getStr()), vn, MAX_PATH, &serial, &mcl, &flags, fsn, MAX_PATH))
		488	#else
446	if (GetVolumeInformation(path.getStr(), vn, MAX_PATH, &serial, &mcl, &flags, fsn, MAX_PATH))	489	if (GetVolumeInformation(path.getStr(), vn, MAX_PATH, &serial, &mcl, &flags, fsn, MAX_PATH))
		490	#endif
447	{	491	{
448	pInfo->uValidFields \|= osl_VolumeInfo_Mask_MaxNameLength;	492	pInfo->uValidFields \|= osl_VolumeInfo_Mask_MaxNameLength;
449	pInfo->uMaxNameLength = mcl;	493	pInfo->uMaxNameLength = mcl;
Lines 452-458 Link Here
452	pInfo->uMaxPathLength = MAX_PATH;	496	pInfo->uMaxPathLength = MAX_PATH;
453		497
454	pInfo->uValidFields \|= osl_VolumeInfo_Mask_FileSystemName;	498	pInfo->uValidFields \|= osl_VolumeInfo_Mask_FileSystemName;
		499	#ifdef __MINGW32__
		500	rtl_uString_newFromStr(&pInfo->ustrFileSystemName, reinterpret_cast<const sal_Unicode * >(fsn));
		501	#else
455	rtl_uString_newFromStr(&pInfo->ustrFileSystemName, fsn);	502	rtl_uString_newFromStr(&pInfo->ustrFileSystemName, fsn);
		503	#endif
456		504
457	// volumes (even NTFS) will always be considered case	505	// volumes (even NTFS) will always be considered case
458	// insensitive because the Win32 API is not able to	506	// insensitive because the Win32 API is not able to

Lines 80-85 Link Here

(-)oo_1.1.1_src/sal/osl/w32/interlck.c.orig (+22 lines)
80	#ifdef _M_IX86	80	#ifdef _M_IX86
81	#pragma warning(disable: 4035)	81	#pragma warning(disable: 4035)
82	{	82	{
		83	#ifdef __MINGW32__
		84	asm
		85	(
		86	" movl %0, %%ecx\n"
		87	" movl $1, %%eax\n"
		88	" lock xadd %%eax, (%%ecx)\n"
		89	" incl %%eax\n"
		90	::"m"(pCount)
		91	);
		92	#else
83	__asm	93	__asm
84	{	94	{
85	mov ecx, pCount	95	mov ecx, pCount
Lines 87-92 Link Here
87	lock xadd dword ptr [ecx],eax	97	lock xadd dword ptr [ecx],eax
88	inc eax	98	inc eax
89	}	99	}
		100	#endif
90	}	101	}
91	#pragma warning(default: 4035)	102	#pragma warning(default: 4035)
92	#else	103	#else
Lines 103-108 Link Here
103	#ifdef _M_IX86	114	#ifdef _M_IX86
104	#pragma warning(disable: 4035)	115	#pragma warning(disable: 4035)
105	{	116	{
		117	#ifdef __MINGW32__
		118	asm
		119	(
		120	" movl %0, %%ecx\n"
		121	" movl $-1, %%eax\n"
		122	" lock xadd %%eax, (%%ecx)\n"
		123	" decl %%eax\n"
		124	::"m"(pCount)
		125	);
		126	#else
106	__asm	127	__asm
107	{	128	{
108	mov ecx, pCount	129	mov ecx, pCount
Lines 110-115 Link Here
110	lock xadd dword ptr [ecx],eax	131	lock xadd dword ptr [ecx],eax
111	dec eax	132	dec eax
112	}	133	}
		134	#endif
113	}	135	}
114	#pragma warning(default: 4035)	136	#pragma warning(default: 4035)
115	#else	137	#else

Lines 132-149 Link Here

(-)oo_1.1.1_src/sal/osl/w32/path_helper.cxx.orig (+14 lines)
132	******************************************************************/	132	******************************************************************/
133		133
134	// is [A-Za-z]:[/\|\]\0	134	// is [A-Za-z]:[/\|\]\0
		135	#ifdef __MINGW32__
		136	const wchar_t* LDP = L":";
		137	const wchar_t* LDP_WITH_BACKSLASH = L":\\";
		138	const wchar_t* LDP_WITH_SLASH = L":/";
		139	#else
135	const sal_Unicode* LDP = L":";	140	const sal_Unicode* LDP = L":";
136	const sal_Unicode* LDP_WITH_BACKSLASH = L":\\";	141	const sal_Unicode* LDP_WITH_BACKSLASH = L":\\";
137	const sal_Unicode* LDP_WITH_SLASH = L":/";	142	const sal_Unicode* LDP_WITH_SLASH = L":/";
		143	#endif
138		144
139	// degenerated case returned by the Windows FileOpen dialog	145	// degenerated case returned by the Windows FileOpen dialog
140	// when someone enters for instance "x:filename", the Win32	146	// when someone enters for instance "x:filename", the Win32
141	// API accepts this case	147	// API accepts this case
		148	#ifdef __MINGW32__
		149	const wchar_t* LDP_WITH_DOT_BACKSLASH = L":.\\";
		150	#else
142	const sal_Unicode* LDP_WITH_DOT_BACKSLASH = L":.\\";	151	const sal_Unicode* LDP_WITH_DOT_BACKSLASH = L":.\\";
		152	#endif
143		153
144	sal_Int32 osl_systemPathIsLogicalDrivePattern(/in/ const rtl_uString* pustrPath)	154	sal_Int32 osl_systemPathIsLogicalDrivePattern(/in/ const rtl_uString* pustrPath)
145	{	155	{
		156	#ifdef __MINGW32__
		157	const wchar_t* p = reinterpret_cast< const wchar_t * >(rtl_uString_getStr(const_cast<rtl_uString*>(pustrPath)));
		158	#else
146	const sal_Unicode* p = rtl_uString_getStr(const_cast<rtl_uString*>(pustrPath));	159	const sal_Unicode* p = rtl_uString_getStr(const_cast<rtl_uString*>(pustrPath));
		160	#endif
147	if (iswalpha(*p++))	161	if (iswalpha(*p++))
148	{	162	{
149	return ((0 == wcscmp(p, LDP)) \|\|	163	return ((0 == wcscmp(p, LDP)) \|\|

Lines 66-72 Link Here

(-)oo_1.1.1_src/sal/osl/w32/signal.c.orig (+2 lines)
66	#include <osl/diagnose.h>	66	#include <osl/diagnose.h>
67	#include <osl/mutex.h>	67	#include <osl/mutex.h>
68	#include <osl/signal.h>	68	#include <osl/signal.h>
		69	#ifndef __MINGW32__
69	#include <DbgHelp.h>	70	#include <DbgHelp.h>
		71	#endif
70	#include <ErrorRep.h>	72	#include <ErrorRep.h>
71	#include <systools/win32/uwinapi.h>	73	#include <systools/win32/uwinapi.h>
72		74

Lines 1037-1043 Link Here

(-)oo_1.1.1_src/sal/osl/w32/socket.cxx.orig (+217 lines)
1037	/*****************************************************************************/	1037	/*****************************************************************************/
1038	oslSocketResult SAL_CALL osl_getLocalHostname (rtl_uString **strLocalHostname)	1038	oslSocketResult SAL_CALL osl_getLocalHostname (rtl_uString **strLocalHostname)
1039	{	1039	{
		1040	#ifdef __MINGW32__
		1041	static wchar_t LocalHostname[256] = L"";
		1042	#else
1040	static sal_Unicode LocalHostname[256] = L"";	1043	static sal_Unicode LocalHostname[256] = L"";
		1044	#endif
1041		1045
1042	if (wcslen(LocalHostname) == 0)	1046	if (wcslen(LocalHostname) == 0)
1043	{	1047	{
Lines 1059-1065 Link Here
1059	rtl_uString_release (hostName);	1063	rtl_uString_release (hostName);
1060		1064
1061	if (pAddr && pAddr->pHostName)	1065	if (pAddr && pAddr->pHostName)
		1066	#ifdef __MINGW32__
		1067	wcscpy(LocalHostname, reinterpret_cast< wchar_t * >(pAddr->pHostName->buffer));
		1068	#else
1062	wcscpy(LocalHostname, pAddr->pHostName->buffer);	1069	wcscpy(LocalHostname, pAddr->pHostName->buffer);
		1070	#endif
1063	else	1071	else
1064	memset(LocalHostname, 0, sizeof(LocalHostname));	1072	memset(LocalHostname, 0, sizeof(LocalHostname));
1065		1073
Lines 1070-1076 Link Here
1070		1078
1071	if (wcslen(LocalHostname) > 0)	1079	if (wcslen(LocalHostname) > 0)
1072	{	1080	{
		1081	#ifdef __MINGW32__
		1082	rtl_uString_newFromStr (strLocalHostname, reinterpret_cast< sal_Unicode * >(LocalHostname));
		1083	#else
1073	rtl_uString_newFromStr (strLocalHostname, LocalHostname);	1084	rtl_uString_newFromStr (strLocalHostname, LocalHostname);
		1085	#endif
1074	return osl_Socket_Ok;	1086	return osl_Socket_Ok;
1075	}	1087	}
1076		1088
Lines 1927-2137 Link Here
1927	switch(error = WSAGetLastError())	1939	switch(error = WSAGetLastError())
1928	{	1940	{
1929	case WSAENOTSOCK:	1941	case WSAENOTSOCK:
		1942	#ifdef __MINGW32__
		1943	rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSAENOTSOCK, Socket operation on non-socket. A socket created in one process is used by another process."));
		1944	#else
1930	rtl_uString_newFromStr (strError, L"WSAENOTSOCK, Socket operation on non-socket. A socket created in one process is used by another process.");	1945	rtl_uString_newFromStr (strError, L"WSAENOTSOCK, Socket operation on non-socket. A socket created in one process is used by another process.");
		1946	#endif
1931	break;	1947	break;
1932		1948
1933	case WSAEDESTADDRREQ:	1949	case WSAEDESTADDRREQ:
		1950	#ifdef __MINGW32__
		1951	rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSAEDESTADDRREQ, Destination Addr required"));
		1952	#else
1934	rtl_uString_newFromStr (strError, L"WSAEDESTADDRREQ, Destination Addr required");	1953	rtl_uString_newFromStr (strError, L"WSAEDESTADDRREQ, Destination Addr required");
		1954	#endif
1935	break;	1955	break;
1936		1956
1937	case WSAEMSGSIZE:	1957	case WSAEMSGSIZE:
		1958	#ifdef __MINGW32__
		1959	rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSAEMSGSIZE, Message too long"));
		1960	#else
1938	rtl_uString_newFromStr (strError, L"WSAEMSGSIZE, Message too long");	1961	rtl_uString_newFromStr (strError, L"WSAEMSGSIZE, Message too long");
		1962	#endif
1939	break;	1963	break;
1940		1964
1941	case WSAEPROTOTYPE:	1965	case WSAEPROTOTYPE:
		1966	#ifdef __MINGW32__
		1967	rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSAEPROTOTYPE, Protocol wrong type for socket"));
		1968	#else
1942	rtl_uString_newFromStr (strError, L"WSAEPROTOTYPE, Protocol wrong type for socket");	1969	rtl_uString_newFromStr (strError, L"WSAEPROTOTYPE, Protocol wrong type for socket");
		1970	#endif
1943	break;	1971	break;
1944		1972
1945	case WSAENOPROTOOPT:	1973	case WSAENOPROTOOPT:
		1974	#ifdef __MINGW32__
		1975	rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSAENOPROTOOPT, Protocol not available"));
		1976	#else
1946	rtl_uString_newFromStr (strError, L"WSAENOPROTOOPT, Protocol not available");	1977	rtl_uString_newFromStr (strError, L"WSAENOPROTOOPT, Protocol not available");
		1978	#endif
1947	break;	1979	break;
1948		1980
1949	case WSAEPROTONOSUPPORT:	1981	case WSAEPROTONOSUPPORT:
		1982	#ifdef __MINGW32__
		1983	rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSAEPROTONOSUPPORT, Protocol not supported"));
		1984	#else
1950	rtl_uString_newFromStr (strError, L"WSAEPROTONOSUPPORT, Protocol not supported");	1985	rtl_uString_newFromStr (strError, L"WSAEPROTONOSUPPORT, Protocol not supported");
		1986	#endif
1951	break;	1987	break;
1952		1988
1953	case WSAESOCKTNOSUPPORT:	1989	case WSAESOCKTNOSUPPORT:
		1990	#ifdef __MINGW32__
		1991	rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSAESOCKTNOSUPPORT, Socket type not supported"));
		1992	#else
1954	rtl_uString_newFromStr (strError, L"WSAESOCKTNOSUPPORT, Socket type not supported");	1993	rtl_uString_newFromStr (strError, L"WSAESOCKTNOSUPPORT, Socket type not supported");
		1994	#endif
1955	break;	1995	break;
1956		1996
1957	case WSAEOPNOTSUPP:	1997	case WSAEOPNOTSUPP:
		1998	#ifdef __MINGW32__
		1999	rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSAEOPNOTSUPP, Operation not supported on socket"));
		2000	#else
1958	rtl_uString_newFromStr (strError, L"WSAEOPNOTSUPP, Operation not supported on socket");	2001	rtl_uString_newFromStr (strError, L"WSAEOPNOTSUPP, Operation not supported on socket");
		2002	#endif
1959	break;	2003	break;
1960		2004
1961	case WSAEPFNOSUPPORT:	2005	case WSAEPFNOSUPPORT:
		2006	#ifdef __MINGW32__
		2007	rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSAEPFNOSUPPORT, Protocol family not supported"));
		2008	#else
1962	rtl_uString_newFromStr (strError, L"WSAEPFNOSUPPORT, Protocol family not supported");	2009	rtl_uString_newFromStr (strError, L"WSAEPFNOSUPPORT, Protocol family not supported");
		2010	#endif
1963	break;	2011	break;
1964		2012
1965	case WSAEAFNOSUPPORT:	2013	case WSAEAFNOSUPPORT:
		2014	#ifdef __MINGW32__
		2015	rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSEAFNOSUPPORT, Addr family not supported by protocol family"));
		2016	#else
1966	rtl_uString_newFromStr (strError, L"WSEAFNOSUPPORT, Addr family not supported by protocol family");	2017	rtl_uString_newFromStr (strError, L"WSEAFNOSUPPORT, Addr family not supported by protocol family");
		2018	#endif
1967	break;	2019	break;
1968		2020
1969	case WSAEADDRINUSE:	2021	case WSAEADDRINUSE:
		2022	#ifdef __MINGW32__
		2023	rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSAEADDRINUSE, Triggered by bind() because a process went down without closing a socket."));
		2024	#else
1970	rtl_uString_newFromStr (strError, L"WSAEADDRINUSE, Triggered by bind() because a process went down without closing a socket.");	2025	rtl_uString_newFromStr (strError, L"WSAEADDRINUSE, Triggered by bind() because a process went down without closing a socket.");
		2026	#endif
1971	break;	2027	break;
1972		2028
1973	case WSAEADDRNOTAVAIL:	2029	case WSAEADDRNOTAVAIL:
		2030	#ifdef __MINGW32__
		2031	rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSAEADDRNOTAVAIL, Can't assign requested Addr"));
		2032	#else
1974	rtl_uString_newFromStr (strError, L"WSAEADDRNOTAVAIL, Can't assign requested Addr");	2033	rtl_uString_newFromStr (strError, L"WSAEADDRNOTAVAIL, Can't assign requested Addr");
		2034	#endif
1975	break;	2035	break;
1976		2036
1977	case WSAENETDOWN:	2037	case WSAENETDOWN:
		2038	#ifdef __MINGW32__
		2039	rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSAENETDOWN, Network is down"));
		2040	#else
1978	rtl_uString_newFromStr (strError, L"WSAENETDOWN, Network is down");	2041	rtl_uString_newFromStr (strError, L"WSAENETDOWN, Network is down");
		2042	#endif
1979	break;	2043	break;
1980		2044
1981	case WSAENETUNREACH:	2045	case WSAENETUNREACH:
		2046	#ifdef __MINGW32__
		2047	rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSAENETUNREACH, Network is unreachable"));
		2048	#else
1982	rtl_uString_newFromStr (strError, L"WSAENETUNREACH, Network is unreachable");	2049	rtl_uString_newFromStr (strError, L"WSAENETUNREACH, Network is unreachable");
		2050	#endif
1983	break;	2051	break;
1984		2052
1985	case WSAENETRESET:	2053	case WSAENETRESET:
		2054	#ifdef __MINGW32__
		2055	rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSAENETRESET, Network dropped connection or reset"));
		2056	#else
1986	rtl_uString_newFromStr (strError, L"WSAENETRESET, Network dropped connection or reset");	2057	rtl_uString_newFromStr (strError, L"WSAENETRESET, Network dropped connection or reset");
		2058	#endif
1987	break;	2059	break;
1988		2060
1989	case WSAECONNABORTED:	2061	case WSAECONNABORTED:
		2062	#ifdef __MINGW32__
		2063	rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSAECONNABORTED, Software caused connection abort"));
		2064	#else
1990	rtl_uString_newFromStr (strError, L"WSAECONNABORTED, Software caused connection abort");	2065	rtl_uString_newFromStr (strError, L"WSAECONNABORTED, Software caused connection abort");
		2066	#endif
1991	break;	2067	break;
1992		2068
1993	case WSAECONNRESET:	2069	case WSAECONNRESET:
		2070	#ifdef __MINGW32__
		2071	rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSAECONNRESET, Connection reset by peer"));
		2072	#else
1994	rtl_uString_newFromStr (strError, L"WSAECONNRESET, Connection reset by peer");	2073	rtl_uString_newFromStr (strError, L"WSAECONNRESET, Connection reset by peer");
		2074	#endif
1995	break;	2075	break;
1996		2076
1997	case WSAENOBUFS:	2077	case WSAENOBUFS:
		2078	#ifdef __MINGW32__
		2079	rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSAENOBUFS, No buffer space available."));
		2080	#else
1998	rtl_uString_newFromStr (strError, L"WSAENOBUFS, No buffer space available.");	2081	rtl_uString_newFromStr (strError, L"WSAENOBUFS, No buffer space available.");
		2082	#endif
1999	break;	2083	break;
2000		2084
2001	case WSAEISCONN:	2085	case WSAEISCONN:
		2086	#ifdef __MINGW32__
		2087	rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSAEISCONN, Socket is already connected"));
		2088	#else
2002	rtl_uString_newFromStr (strError, L"WSAEISCONN, Socket is already connected");	2089	rtl_uString_newFromStr (strError, L"WSAEISCONN, Socket is already connected");
		2090	#endif
2003	break;	2091	break;
2004		2092
2005	case WSAENOTCONN:	2093	case WSAENOTCONN:
		2094	#ifdef __MINGW32__
		2095	rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSAENOTCONN, Socket is not connected"));
		2096	#else
2006	rtl_uString_newFromStr (strError, L"WSAENOTCONN, Socket is not connected");	2097	rtl_uString_newFromStr (strError, L"WSAENOTCONN, Socket is not connected");
		2098	#endif
2007	break;	2099	break;
2008		2100
2009	case WSAESHUTDOWN:	2101	case WSAESHUTDOWN:
		2102	#ifdef __MINGW32__
		2103	rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSAESHUTDOWN, Can't send after socket shutdown"));
		2104	#else
2010	rtl_uString_newFromStr (strError, L"WSAESHUTDOWN, Can't send after socket shutdown");	2105	rtl_uString_newFromStr (strError, L"WSAESHUTDOWN, Can't send after socket shutdown");
		2106	#endif
2011	break;	2107	break;
2012		2108
2013	case WSAETIMEDOUT:	2109	case WSAETIMEDOUT:
		2110	#ifdef __MINGW32__
		2111	rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSAETIMEDOUT, Connection timed out"));
		2112	#else
2014	rtl_uString_newFromStr (strError, L"WSAETIMEDOUT, Connection timed out");	2113	rtl_uString_newFromStr (strError, L"WSAETIMEDOUT, Connection timed out");
		2114	#endif
2015	break;	2115	break;
2016		2116
2017	case WSAECONNREFUSED:	2117	case WSAECONNREFUSED:
		2118	#ifdef __MINGW32__
		2119	rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSAECONNREFUSED, Connection refused"));
		2120	#else
2018	rtl_uString_newFromStr (strError, L"WSAECONNREFUSED, Connection refused");	2121	rtl_uString_newFromStr (strError, L"WSAECONNREFUSED, Connection refused");
		2122	#endif
2019	break;	2123	break;
2020		2124
2021	case WSAEHOSTDOWN:	2125	case WSAEHOSTDOWN:
		2126	#ifdef __MINGW32__
		2127	rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSAEHOSTDOWN, Networking subsystem not started"));
		2128	#else
2022	rtl_uString_newFromStr (strError, L"WSAEHOSTDOWN, Networking subsystem not started");	2129	rtl_uString_newFromStr (strError, L"WSAEHOSTDOWN, Networking subsystem not started");
		2130	#endif
2023	break;	2131	break;
2024		2132
2025	case WSAEHOSTUNREACH:	2133	case WSAEHOSTUNREACH:
		2134	#ifdef __MINGW32__
		2135	rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSAEHOSTUNREACH, No route to host"));
		2136	#else
2026	rtl_uString_newFromStr (strError, L"WSAEHOSTUNREACH, No route to host");	2137	rtl_uString_newFromStr (strError, L"WSAEHOSTUNREACH, No route to host");
		2138	#endif
2027	break;	2139	break;
2028		2140
2029	case WSAEWOULDBLOCK:	2141	case WSAEWOULDBLOCK:
		2142	#ifdef __MINGW32__
		2143	rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSAEWOULDBLOCK, Operation would block"));
		2144	#else
2030	rtl_uString_newFromStr (strError, L"WSAEWOULDBLOCK, Operation would block");	2145	rtl_uString_newFromStr (strError, L"WSAEWOULDBLOCK, Operation would block");
		2146	#endif
2031	break;	2147	break;
2032		2148
2033	case WSAEINPROGRESS:	2149	case WSAEINPROGRESS:
		2150	#ifdef __MINGW32__
		2151	rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSAEINPROGRESS, Operation now in progress"));
		2152	#else
2034	rtl_uString_newFromStr (strError, L"WSAEINPROGRESS, Operation now in progress");	2153	rtl_uString_newFromStr (strError, L"WSAEINPROGRESS, Operation now in progress");
		2154	#endif
2035	break;	2155	break;
2036		2156
2037	case WSAEALREADY:	2157	case WSAEALREADY:
		2158	#ifdef __MINGW32__
		2159	rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSAEALREADY, Operation already in progress"));
		2160	#else
2038	rtl_uString_newFromStr (strError, L"WSAEALREADY, Operation already in progress");	2161	rtl_uString_newFromStr (strError, L"WSAEALREADY, Operation already in progress");
		2162	#endif
2039	break;	2163	break;
2040		2164
2041	case WSAEINTR:	2165	case WSAEINTR:
		2166	#ifdef __MINGW32__
		2167	rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSAEALREADY, Operation was interrupted"));
		2168	#else
2042	rtl_uString_newFromStr (strError, L"WSAEALREADY, Operation was interrupted");	2169	rtl_uString_newFromStr (strError, L"WSAEALREADY, Operation was interrupted");
		2170	#endif
2043	break;	2171	break;
2044		2172
2045	case WSAEBADF:	2173	case WSAEBADF:
		2174	#ifdef __MINGW32__
		2175	rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSAEBADF, Bad file number"));
		2176	#else
2046	rtl_uString_newFromStr (strError, L"WSAEBADF, Bad file number");	2177	rtl_uString_newFromStr (strError, L"WSAEBADF, Bad file number");
		2178	#endif
2047	break;	2179	break;
2048		2180
2049	case WSAEACCES:	2181	case WSAEACCES:
		2182	#ifdef __MINGW32__
		2183	rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSAEACCES, Access is denied"));
		2184	#else
2050	rtl_uString_newFromStr (strError, L"WSAEACCES, Access is denied");	2185	rtl_uString_newFromStr (strError, L"WSAEACCES, Access is denied");
		2186	#endif
2051	break;	2187	break;
2052		2188
2053	case WSAEFAULT:	2189	case WSAEFAULT:
		2190	#ifdef __MINGW32__
		2191	rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSAEFAULT, Bad memory Addr"));
		2192	#else
2054	rtl_uString_newFromStr (strError, L"WSAEFAULT, Bad memory Addr");	2193	rtl_uString_newFromStr (strError, L"WSAEFAULT, Bad memory Addr");
		2194	#endif
2055	break;	2195	break;
2056		2196
2057	case WSAEINVAL:	2197	case WSAEINVAL:
		2198	#ifdef __MINGW32__
		2199	rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSAEINVAL, The socket has not been bound with bind() or is already connected"));
		2200	#else
2058	rtl_uString_newFromStr (strError, L"WSAEINVAL, The socket has not been bound with bind() or is already connected");	2201	rtl_uString_newFromStr (strError, L"WSAEINVAL, The socket has not been bound with bind() or is already connected");
		2202	#endif
2059	break;	2203	break;
2060		2204
2061	case WSAEMFILE:	2205	case WSAEMFILE:
		2206	#ifdef __MINGW32__
		2207	rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSAEMFILE, No more file descriptors are available"));
		2208	#else
2062	rtl_uString_newFromStr (strError, L"WSAEMFILE, No more file descriptors are available");	2209	rtl_uString_newFromStr (strError, L"WSAEMFILE, No more file descriptors are available");
		2210	#endif
2063	break;	2211	break;
2064		2212
2065	case WSAETOOMANYREFS:	2213	case WSAETOOMANYREFS:
		2214	#ifdef __MINGW32__
		2215	rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSAETOOMANYREFS, Undocumented WinSock error"));
		2216	#else
2066	rtl_uString_newFromStr (strError, L"WSAETOOMANYREFS, Undocumented WinSock error");	2217	rtl_uString_newFromStr (strError, L"WSAETOOMANYREFS, Undocumented WinSock error");
		2218	#endif
2067	break;	2219	break;
2068		2220
2069	case WSAENAMETOOLONG:	2221	case WSAENAMETOOLONG:
		2222	#ifdef __MINGW32__
		2223	rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSAENAMETOOLONG, Undocumented WinSock error"));
		2224	#else
2070	rtl_uString_newFromStr (strError, L"WSAENAMETOOLONG, Undocumented WinSock error");	2225	rtl_uString_newFromStr (strError, L"WSAENAMETOOLONG, Undocumented WinSock error");
		2226	#endif
2071	break;	2227	break;
2072		2228
2073	case WSAENOTEMPTY:	2229	case WSAENOTEMPTY:
		2230	#ifdef __MINGW32__
		2231	rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSAENOTEMPTY, Undocumented WinSock error"));
		2232	#else
2074	rtl_uString_newFromStr (strError, L"WSAENOTEMPTY, Undocumented WinSock error");	2233	rtl_uString_newFromStr (strError, L"WSAENOTEMPTY, Undocumented WinSock error");
		2234	#endif
2075	break;	2235	break;
2076		2236
2077	case WSAEPROCLIM:	2237	case WSAEPROCLIM:
		2238	#ifdef __MINGW32__
		2239	rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSAEPROCLIM, Undocumented WinSock error"));
		2240	#else
2078	rtl_uString_newFromStr (strError, L"WSAEPROCLIM, Undocumented WinSock error");	2241	rtl_uString_newFromStr (strError, L"WSAEPROCLIM, Undocumented WinSock error");
		2242	#endif
2079	break;	2243	break;
2080		2244
2081	case WSAEUSERS:	2245	case WSAEUSERS:
		2246	#ifdef __MINGW32__
		2247	rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSAEUSERS, Undocumented WinSock error"));
		2248	#else
2082	rtl_uString_newFromStr (strError, L"WSAEUSERS, Undocumented WinSock error");	2249	rtl_uString_newFromStr (strError, L"WSAEUSERS, Undocumented WinSock error");
		2250	#endif
2083	break;	2251	break;
2084		2252
2085	case WSAEDQUOT:	2253	case WSAEDQUOT:
		2254	#ifdef __MINGW32__
		2255	rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSAEDQUOT, Undocumented WinSock error"));
		2256	#else
2086	rtl_uString_newFromStr (strError, L"WSAEDQUOT, Undocumented WinSock error");	2257	rtl_uString_newFromStr (strError, L"WSAEDQUOT, Undocumented WinSock error");
		2258	#endif
2087	break;	2259	break;
2088		2260
2089	case WSAESTALE:	2261	case WSAESTALE:
		2262	#ifdef __MINGW32__
		2263	rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSAESTALE, Undocumented WinSock error"));
		2264	#else
2090	rtl_uString_newFromStr (strError, L"WSAESTALE, Undocumented WinSock error");	2265	rtl_uString_newFromStr (strError, L"WSAESTALE, Undocumented WinSock error");
		2266	#endif
2091	break;	2267	break;
2092		2268
2093	case WSAEREMOTE:	2269	case WSAEREMOTE:
		2270	#ifdef __MINGW32__
		2271	rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSAEREMOTE, Undocumented WinSock error"));
		2272	#else
2094	rtl_uString_newFromStr (strError, L"WSAEREMOTE, Undocumented WinSock error");	2273	rtl_uString_newFromStr (strError, L"WSAEREMOTE, Undocumented WinSock error");
		2274	#endif
2095	break;	2275	break;
2096		2276
2097	case WSAEDISCON:	2277	case WSAEDISCON:
		2278	#ifdef __MINGW32__
		2279	rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSAEDISCON, Circuit was gracefully terminated"));
		2280	#else
2098	rtl_uString_newFromStr (strError, L"WSAEDISCON, Circuit was gracefully terminated");	2281	rtl_uString_newFromStr (strError, L"WSAEDISCON, Circuit was gracefully terminated");
		2282	#endif
2099	break;	2283	break;
2100		2284
2101	case WSASYSNOTREADY:	2285	case WSASYSNOTREADY:
		2286	#ifdef __MINGW32__
		2287	rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSASYSNOTREADY, The underlying network subsystem is not ready for network communication"));
		2288	#else
2102	rtl_uString_newFromStr (strError, L"WSASYSNOTREADY, The underlying network subsystem is not ready for network communication");	2289	rtl_uString_newFromStr (strError, L"WSASYSNOTREADY, The underlying network subsystem is not ready for network communication");
		2290	#endif
2103	break;	2291	break;
2104		2292
2105	case WSAVERNOTSUPPORTED:	2293	case WSAVERNOTSUPPORTED:
		2294	#ifdef __MINGW32__
		2295	rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSAVERNOTSUPPORTED, The version of Windows Sockets API support requested is not provided by this particular Windows Sockets implementation"));
		2296	#else
2106	rtl_uString_newFromStr (strError, L"WSAVERNOTSUPPORTED, The version of Windows Sockets API support requested is not provided by this particular Windows Sockets implementation");	2297	rtl_uString_newFromStr (strError, L"WSAVERNOTSUPPORTED, The version of Windows Sockets API support requested is not provided by this particular Windows Sockets implementation");
		2298	#endif
2107	break;	2299	break;
2108		2300
2109	case WSANOTINITIALISED:	2301	case WSANOTINITIALISED:
		2302	#ifdef __MINGW32__
		2303	rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSANOTINITIALISED, WSAStartup() has not been called"));
		2304	#else
2110	rtl_uString_newFromStr (strError, L"WSANOTINITIALISED, WSAStartup() has not been called");	2305	rtl_uString_newFromStr (strError, L"WSANOTINITIALISED, WSAStartup() has not been called");
		2306	#endif
2111	break;	2307	break;
2112		2308
2113	case WSAHOST_NOT_FOUND:	2309	case WSAHOST_NOT_FOUND:
		2310	#ifdef __MINGW32__
		2311	rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSAHOST_NOT_FOUND, Authoritative answer host not found"));
		2312	#else
2114	rtl_uString_newFromStr (strError, L"WSAHOST_NOT_FOUND, Authoritative answer host not found");	2313	rtl_uString_newFromStr (strError, L"WSAHOST_NOT_FOUND, Authoritative answer host not found");
		2314	#endif
2115	break;	2315	break;
2116		2316
2117	case WSATRY_AGAIN:	2317	case WSATRY_AGAIN:
		2318	#ifdef __MINGW32__
		2319	rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSATRY_AGAIN, Non-authoritative answer host not found or SERVERFAIL"));
		2320	#else
2118	rtl_uString_newFromStr (strError, L"WSATRY_AGAIN, Non-authoritative answer host not found or SERVERFAIL");	2321	rtl_uString_newFromStr (strError, L"WSATRY_AGAIN, Non-authoritative answer host not found or SERVERFAIL");
		2322	#endif
2119	break;	2323	break;
2120		2324
2121	case WSANO_RECOVERY:	2325	case WSANO_RECOVERY:
		2326	#ifdef __MINGW32__
		2327	rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSANO_RECOVERY, Non recoverable errors, FORMERR, REFUSED, NOTIMP"));
		2328	#else
2122	rtl_uString_newFromStr (strError, L"WSANO_RECOVERY, Non recoverable errors, FORMERR, REFUSED, NOTIMP");	2329	rtl_uString_newFromStr (strError, L"WSANO_RECOVERY, Non recoverable errors, FORMERR, REFUSED, NOTIMP");
		2330	#endif
2123	break;	2331	break;
2124		2332
2125	case WSANO_DATA:	2333	case WSANO_DATA:
		2334	#ifdef __MINGW32__
		2335	rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSANO_DATA or WSANO_ADDRESS, Valid name, no data record of requested type"));
		2336	#else
2126	rtl_uString_newFromStr (strError, L"WSANO_DATA or WSANO_ADDRESS, Valid name, no data record of requested type");	2337	rtl_uString_newFromStr (strError, L"WSANO_DATA or WSANO_ADDRESS, Valid name, no data record of requested type");
		2338	#endif
2127	break;	2339	break;
2128		2340
2129	default:	2341	default:
2130	{	2342	{
2131	sal_Unicode message[128];	2343	sal_Unicode message[128];
2132		2344
		2345	#ifdef __MINGW32__
		2346	wsprintfW((wchar_t *)message, L"Unknown WinSock Error Number %d", error);
		2347	rtl_uString_newFromStr (strError, message);
		2348	#else
2133	wsprintfW((sal_Unicode )message, (sal_Unicode )L"Unknown WinSock Error Number %d", error);	2349	wsprintfW((sal_Unicode )message, (sal_Unicode )L"Unknown WinSock Error Number %d", error);
2134	rtl_uString_newFromStr (strError, message);	2350	rtl_uString_newFromStr (strError, message);
		2351	#endif
2135	}	2352	}
2136		2353
2137	return;	2354	return;

Lines 97-102 Link Here

(-)oo_1.1.1_src/sal/osl/w32/system.h.orig (+4 lines)
97	// at the same time without patching	97	// at the same time without patching
98	// windows.h	98	// windows.h
99	#include <windows.h>	99	#include <windows.h>
		100	#ifdef __MINGW32__
		101	#include <winsock2.h>
		102	#include <ws2tcpip.h>
		103	#endif
100	#else	104	#else
101	// winsock2.h includes windows.h	105	// winsock2.h includes windows.h
102	#include <winsock2.h>	106	#include <winsock2.h>





oslFileError MapWindowsErrorToOSLError( DWORD dwError );

#ifndef __MINGW32__
/* Allocate n number of t's on the stack 
   return a pointer to it in p */
   
#define STACK_ALLOC(p, t, n) __try {(p) = _alloca((n)*sizeof(t));} \
                             __except(EXCEPTION_EXECUTE_HANDLER) {(p) = NULL;}
#endif
                             
/* =============================== */
/* osl_gettempDirURL               */

    if (osl_File_E_None != osl_error)
        return osl_error;
   
#ifdef __MINGW32__
    tmp_name = malloc((rtl_uString_getLength(base_directory) + MAX_PATH)*sizeof(WCHAR));
#else
    /* allocate enough space on the stack */
    STACK_ALLOC(tmp_name, WCHAR, (rtl_uString_getLength(base_directory) + MAX_PATH));
#endif
    
    if (tmp_name)
    {

            b_delete_on_close,
            pHandle,
            ppustrTempFileURL);
#ifdef __MINGW32__
        free(tmp_name);
#endif
    }
    else // stack alloc failed
    {

Lines 130-136 Link Here

(-)oo_1.1.1_src/sal/rtl/source/uuid.cxx.orig (+12 lines)
130		130
131	nTime = ((sal_uInt64) val.Seconds) *((sal_uInt64)10000000) +	131	nTime = ((sal_uInt64) val.Seconds) *((sal_uInt64)10000000) +
132	((sal_uInt64) val.Nanosec) /100 +	132	((sal_uInt64) val.Nanosec) /100 +
		133	#ifdef __MINGW32__
		134	(sal_uInt64)(0x01B21DD213814000ULL);
		135	#else
133	(sal_uInt64)(0x01B21DD213814000);	136	(sal_uInt64)(0x01B21DD213814000);
		137	#endif
134		138
135	return nTime;	139	return nTime;
136	}	140	}
Lines 253-259 Link Here
253	((sal_uInt16) uuid.clock_seq_low );	257	((sal_uInt16) uuid.clock_seq_low );
254		258
255	memcpy( pNode, &( uuid.node ) , 6 );	259	memcpy( pNode, &( uuid.node ) , 6 );
		260	#ifdef __MINGW32__
		261	pTime = pTime & 0x0fffffffffffffffULL;
		262	#else
256	pTime = pTime & 0x0fffffffffffffff;	263	pTime = pTime & 0x0fffffffffffffff;
		264	#endif
257	pClockSeq = pClockSeq & 0x3fff;	265	pClockSeq = pClockSeq & 0x3fff;
258		266
259	}	267	}
Lines 266-272 Link Here
266	UUID uuid;	274	UUID uuid;
267	/* 1	275	/* 1
268	0123456789012345 */	276	0123456789012345 */
		277	#ifdef __MINGW32__
		278	nTime = ( nTime & 0x0fffffffffffffffULL ) \| 0x1000000000000000ULL;
		279	#else
269	nTime = ( nTime & 0x0fffffffffffffff ) \| 0x1000000000000000;	280	nTime = ( nTime & 0x0fffffffffffffff ) \| 0x1000000000000000;
		281	#endif
270	nClockSeq = ( nClockSeq & 0x3fff ) \| 0x8000;	282	nClockSeq = ( nClockSeq & 0x3fff ) \| 0x8000;
271		283
272	uuid.time_low = (sal_uInt32) ( nTime & 0xffffffff );	284	uuid.time_low = (sal_uInt32) ( nTime & 0xffffffff );

Lines 169-175 Link Here

(-)oo_1.1.1_src/sal/systools/win32/guistdio/guistdio.cxx.orig (+4 lines)
169		169
170	//---------------------------------------------------------------------------	170	//---------------------------------------------------------------------------
171		171
		172	#ifdef __MINGW32__
		173	int main( int argc, char **argv )
		174	#else
172	int _tmain( int argc, _TCHAR **argv )	175	int _tmain( int argc, _TCHAR **argv )
		176	#endif
173	{	177	{
174	TCHAR szTargetFileName[MAX_PATH] = TEXT("");	178	TCHAR szTargetFileName[MAX_PATH] = TEXT("");
175	STARTUPINFO aStartupInfo;	179	STARTUPINFO aStartupInfo;

Lines 61-64 Link Here

(-)oo_1.1.1_src/sal/systools/win32/uwinapi/FindFirstVolumeA.cpp.orig (-1 / +5 lines)
61		61
62	#include "macros.h"	62	#include "macros.h"
63		63
64	DEFINE_DEFAULT_THUNK( kernel32, TRYLOAD, HANDLE, WINAPI, FindFirstVolumeA, (LPSTR lpszVolumeName, DWORD cchBufferLength) )	64	#ifdef __MINGW32__
		65	DEFINE_DEFAULT_THUNK( kernel32, TRYLOAD, HANDLE, WINAPI, FindFirstVolumeA, (LPCSTR lpszVolumeName, DWORD cchBufferLength) )
		66	#else
		67	DEFINE_DEFAULT_THUNK( kernel32, TRYLOAD, HANDLE, WINAPI, FindFirstVolumeA, (LPSTR lpszVolumeName, DWORD cchBufferLength) )
		68	#endif

Lines 61-64 Link Here

(-)oo_1.1.1_src/sal/systools/win32/uwinapi/FindFirstVolumeW.cpp.orig (-1 / +5 lines)
61		61
62	#include "macros.h"	62	#include "macros.h"
63		63
64	DEFINE_DEFAULT_THUNK( kernel32, TRYLOAD, HANDLE, WINAPI, FindFirstVolumeW, (LPWSTR lpszVolumeName, DWORD cchBufferLength) )	64	#ifdef __MINGW32__
		65	DEFINE_DEFAULT_THUNK( kernel32, TRYLOAD, HANDLE, WINAPI, FindFirstVolumeW, (LPCWSTR lpszVolumeName, DWORD cchBufferLength) )
		66	#else
		67	DEFINE_DEFAULT_THUNK( kernel32, TRYLOAD, HANDLE, WINAPI, FindFirstVolumeW, (LPWSTR lpszVolumeName, DWORD cchBufferLength) )
		68	#endif

Lines 61-64 Link Here

(-)oo_1.1.1_src/sal/systools/win32/uwinapi/FindNextVolumeA.cpp.orig (-1 / +5 lines)
61		61
62	#include "macros.h"	62	#include "macros.h"
63		63
64	DEFINE_DEFAULT_THUNK( kernel32, TRYLOAD, BOOL, WINAPI, FindNextVolumeA, (HANDLE hFindVolume, LPSTR lpszVolumeName, DWORD cchBufferLength) )	64	#ifdef __MINGW32__
		65	DEFINE_DEFAULT_THUNK( kernel32, TRYLOAD, BOOL, WINAPI, FindNextVolumeA, (HANDLE hFindVolume, LPCSTR lpszVolumeName, DWORD cchBufferLength) )
		66	#else
		67	DEFINE_DEFAULT_THUNK( kernel32, TRYLOAD, BOOL, WINAPI, FindNextVolumeA, (HANDLE hFindVolume, LPSTR lpszVolumeName, DWORD cchBufferLength) )
		68	#endif

Lines 105-111 Link Here

(-)oo_1.1.1_src/sal/systools/win32/uwinapi/GetProcessId.cpp.orig (+4 lines)
105		105
106	typedef DWORD (WINAPI OBFUSCATE)( DWORD dwPTID );	106	typedef DWORD (WINAPI OBFUSCATE)( DWORD dwPTID );
107	typedef OBFUSCATE *LPOBFUSCATE;	107	typedef OBFUSCATE *LPOBFUSCATE;
		108	#ifdef __MINGW32__
		109	static OBFUSCATE Obfuscate;
		110	#else
108	OBFUSCATE Obfuscate;	111	OBFUSCATE Obfuscate;
		112	#endif
109		113
110	static DWORD WINAPI Obfuscate( DWORD dwPTID )	114	static DWORD WINAPI Obfuscate( DWORD dwPTID )
111	{	115	{







#ifdef __MINGW32__
#define IMPLEMENT_THUNK( module, resolve, rettype, calltype, func, params ) \
static void func##_Thunk(); \
EXTERN_C _declspec( dllexport ) FARPROC module##_##func##_Ptr = (FARPROC)func##_Thunk; \
EXTERN_C rettype calltype func params \
{ \
	asm("	popl	%ebp"); \
	asm("	jmp	*(%0)"::"m"(module##_##func##_Ptr)); \
} \
EXTERN_C rettype calltype func##_##resolve params; \
static rettype calltype func##_##Failure params; \
static void func##_Thunk() \
{ \
	ResolveThunk_##resolve( &module##_##func##_Ptr, #module ".dll", #func, (FARPROC)func##_##resolve, (FARPROC)func##_##Failure ); \
	asm("	movl	%ebp, %esp"); \
	asm("	popl	%ebp"); \
	asm("	jmp	*(%0)"::"m"(module##_##func##_Ptr)); \
} \
static rettype calltype func##_##Failure params \
{ \
	SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); \
	return (rettype)0; \
} \
EXTERN_C rettype calltype func##_##resolve params
#else
#define IMPLEMENT_THUNK( module, resolve, rettype, calltype, func, params ) \
EXTERN_C _declspec( dllexport ) FARPROC module##_##func##_Ptr; \
EXTERN_C rettype calltype func##_##resolve params; \

	return (rettype)0; \
} \
EXTERN_C rettype calltype func##_##resolve params
#endif



#ifdef __MINGW32__
#define DEFINE_CUSTOM_THUNK( module, resolve, rettype, calltype, func, params ) \
static void func##_Thunk(); \
EXTERN_C _declspec( dllexport ) FARPROC module##_##func##_Ptr = (FARPROC)func##_Thunk; \
static void func##_Thunk() \
{ \
	ResolveThunk_##resolve( &module##_##func##_Ptr, #module ".dll", #func ); \
	asm("	movl	%ebp, %esp"); \
	asm("	popl	%ebp"); \
	asm("	jmp	*(%0)"::"m"(module##_##func##_Ptr)); \
} \
EXTERN_C rettype calltype func params \
{ \
	asm("	popl	%ebp"); \
	asm("	jmp	*(%0)"::"m"(module##_##func##_Ptr)); \
}
#else
#define DEFINE_CUSTOM_THUNK( module, resolve, rettype, calltype, func, params ) \
EXTERN_C _declspec( dllexport ) FARPROC module##_##func##_Ptr; \
static _declspec ( naked ) void func##_Thunk() \

	_asm	jmp	[module##_##func##_Ptr] \
} \
EXTERN_C _declspec( dllexport ) FARPROC module##_##func##_Ptr = (FARPROC)func##_Thunk;
#endif


#ifdef __MINGW32__
#define DEFINE_DEFAULT_THUNK( module, resolve, rettype, calltype, func, params ) \
static void func##_Thunk(); \
EXTERN_C _declspec( dllexport ) FARPROC module##_##func##_Ptr = (FARPROC)func##_Thunk; \
static rettype calltype func##_##Failure params; \
static _declspec ( naked ) void func##_Thunk() \
{ \
	ResolveThunk_##resolve( &module##_##func##_Ptr, #module ".dll", #func, NULL, (FARPROC)func##_##Failure ); \
	asm("	movl	%ebp, %esp"); \
	asm("	popl	%ebp"); \
	asm("	jmp	*(%0)"::"m"(module##_##func##_Ptr)); \
} \
EXTERN_C _declspec( naked ) rettype calltype func params \
{ \
	asm("	popl	%ebp"); \
	asm("	jmp	*(%0)"::"m"(module##_##func##_Ptr)); \
} \
static rettype calltype func##_##Failure params \
{ \
	SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); \
	return (rettype)0; \
}
#else
#define DEFINE_DEFAULT_THUNK( module, resolve, rettype, calltype, func, params ) \
EXTERN_C _declspec( dllexport ) FARPROC module##_##func##_Ptr; \
static rettype calltype func##_##Failure params; \

	SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); \
	return (rettype)0; \
}
#endif


Lines 11-18 Link Here

(-)oo_1.1.1_src/sal/systools/win32/uwinapi/sntprintf.c.orig (-1 / +4 lines)
11	/* The non-debug versions of _vscprintf/_scprintf are just calls	11	/* The non-debug versions of _vscprintf/_scprintf are just calls
12	to _vsprintf/_sprintf with string buffer pointer set to NULL,	12	to _vsprintf/_sprintf with string buffer pointer set to NULL,
13	requires MSVCRT version 7.0 */	13	requires MSVCRT version 7.0 */
14		14	#ifdef __MINGW32__
		15	static int __cdecl _vsctprintf( const TCHAR *format, va_list ap )
		16	#else
15	static int __cdecl _vsctprintf( const _TXCHAR *format, va_list ap )	17	static int __cdecl _vsctprintf( const _TXCHAR *format, va_list ap )
		18	#endif
16	{	19	{
17	FILE *fp = _tfopen( _T("NUL"), _T("wb") );	20	FILE *fp = _tfopen( _T("NUL"), _T("wb") );
18		21




AddAtomW
AddFontResourceW
AddJobW
;AddMonitorW
AddPortW
AddPrintProcessorW
AddPrintProvidorW

AddPrinterW
AdvancedDocumentPropertiesW
AppendMenuW
BeginUpdateResourceA
BeginUpdateResourceW
BroadcastSystemMessageW
BuildCommDCBAndTimeoutsW

CreateStdAccessibleProxyW
CreateWaitableTimerW
CreateWindowExW
CryptAcquireContextW
CryptEnumProviderTypesW
CryptEnumProvidersW
CryptGetDefaultProviderW
CryptSetProviderExW
CryptSetProviderW
CryptSignHashW
CryptVerifySignatureW
DdeConnect
DdeConnectList
DdeCreateStringHandleW

DrawTextExW
DrawTextW
EnableWindow
EndUpdateResourceA
EndUpdateResourceW
EnumCalendarInfoExW
EnumCalendarInfoW

FindWindowExW
FindWindowW
FormatMessageW
;FreeContextBuffer
FreeEnvironmentStringsW
GetAltTabInfoW
GetAtomNameW

GetCalendarInfoW
;GetCharABCWidthsFloatW
GetCharABCWidthsW
GetCharWidth32W
GetCharWidthFloatW
GetCharWidthW
GetCharacterPlacementW

GetOutlineTextMetricsW
GetPrintProcessorDirectoryW
;GetPrinterDataW
;GetPrinterDriverDirectoryW24
;GetPrinterDriverW
;GetPrinterW
GetPrivateProfileIntW

RasGetEntryDialParamsW
RasGetEntryPropertiesW
RasGetErrorStringW
RasGetProjectionInfoW
RasHangUpW
RasRenameEntryW
RasSetEntryDialParamsW

TranslateAcceleratorW
UnregisterClassW
UpdateICMRegKeyW
UpdateResourceA
UpdateResourceW
VerFindFileW
VerInstallFileW

;mciSendCommandW
;mciSendStringW
;midiInGetDevCapsW
midiInGetErrorTextW
;midiOutGetDevCapsW
;midiOutGetErrorTextW
;mixerGetControlDetailsW
;mixerGetDevCapsW
;mixerGetLineControlsW
;mixerGetLineInfoW
;mmioInstallIOProcW
;mmioOpenW@
;mmioRenameW
;mmioStringToFOURCCW
sndPlaySoundW
;waveInGetDevCapsW
;waveInGetErrorTextW




;
;*************************************************************************

;AcquireCredentialsHandleW@36
AddAtomW@4
AddFontResourceW@4
AddJobW@20
AddPortW@12
AddPrintProcessorW@16
AddPrintProvidorW@12
AddPrinterDriverW@12
AddPrinterW@12
AdvancedDocumentPropertiesW@20
AppendMenuW@16
BeginUpdateResourceA@8
BeginUpdateResourceW@8
BroadcastSystemMessageW@20
BuildCommDCBAndTimeoutsW@12
BuildCommDCBW@8
CallMsgFilterW@8
CallNamedPipeW@28
CallWindowProcA@20
CallWindowProcW@20
ChangeDisplaySettingsExW@20
ChangeDisplaySettingsW@8
ChangeMenuW@20
CharLowerBuffW@8
CharLowerW@4
CharNextW@4
CharPrevW@8
CharToOemBuffW@12
CharToOemW@8
CharUpperBuffW@8
CharUpperW@4
ChooseColorW@4
ChooseFontW@4
CommConfigDialogW@12
CompareStringW@24
ConfigurePortW@12
CopyAcceleratorTableW@12
CopyEnhMetaFileW@8
CopyFileExW@24
CopyFileW@12
CopyMetaFileW@8
CreateAcceleratorTableW@8
CreateColorSpaceW@4
CreateDCW@16
CreateDialogIndirectParamW@20
CreateDialogParamW@20
CreateDirectoryExW@12
CreateDirectoryW@8
CreateEnhMetaFileW@16
CreateEventW@16
CreateFileMappingW@24
CreateFileW@28
CreateFontIndirectW@4
CreateFontW@56
CreateICW@16
CreateMDIWindowW@40
CreateMailslotW@16
CreateMetaFileW@4
CreateMutexW@12
;CreateNamedPipeW@32
CreateProcessW@40
CreateScalableFontResourceW@16
CreateSemaphoreW@16
CreateStdAccessibleProxyW@20
CreateWaitableTimerW@12
CreateWindowExW@48
CryptAcquireContextW@20
CryptEnumProviderTypesW@24
CryptEnumProvidersW@24
CryptGetDefaultProviderW@20
CryptSetProviderExW@16
CryptSetProviderW@8
CryptSignHashW@24
CryptVerifySignatureW@24
DdeConnect@16
DdeConnectList@20
DdeCreateStringHandleW@12
DdeInitializeW@16
DdeQueryConvInfo@12
DdeQueryStringW@20
DefDlgProcW@16
DefFrameProcW@20
DefMDIChildProcW@16
DefWindowProcW@16
DeleteFileW@4
DeleteMonitorW@12
DeletePortW@12
DeletePrintProcessorW@12
DeletePrintProvidorW@12
DeletePrinterDriverW@12
;DeviceCapabilitiesW@20
DialogBoxIndirectParamW@20
DialogBoxParamW@20
DispatchMessageW@4
DlgDirListComboBoxW@20
DlgDirListW@20
DlgDirSelectComboBoxExW@16
DlgDirSelectExW@16
;DocumentPropertiesW@24
DragQueryFileW@16
DrawStateW@40
DrawTextExW@24
DrawTextW@20
EnableWindow@8
EndUpdateResourceA@8
EndUpdateResourceW@8
EnumCalendarInfoExW@16
EnumCalendarInfoW@16
EnumClipboardFormats@4
EnumDateFormatsExW@12
EnumDateFormatsW@12
EnumDisplayDevicesW@16
EnumDisplaySettingsExW@16
EnumDisplaySettingsW@12
EnumFontFamiliesExW@20
EnumFontFamiliesW@16
EnumFontsW@16
EnumICMProfilesW@12
;EnumMonitorsW@24
;EnumPortsW@24
;EnumPrintProcessorDatatypesW@28
;EnumPrintProcessorsW@28
;EnumPrinterDriversW@28
;EnumPrintersW@28
EnumPropsA@8
EnumPropsExA@12
EnumPropsExW@12
EnumPropsW@8
EnumSystemCodePagesW@8
EnumSystemLocalesW@8
EnumTimeFormatsW@12
;EnumerateSecurityPackagesW@8
ExpandEnvironmentStringsW@12
ExtTextOutW@32
ExtractIconExW@20
ExtractIconW@12
FatalAppExitW@8
FillConsoleOutputCharacterW@20
FindAtomW@4
;FindExecutableW@12
FindFirstChangeNotificationW@12
FindFirstFileW@8
FindNextFileW@8
FindResourceExW@16
FindResourceW@12
FindTextW@4
FindWindowExW@16
FindWindowW@8
FormatMessageW@28
;FreeContextBuffer@4
FreeEnvironmentStringsW@4
GetAltTabInfoW@20
GetAtomNameW@12
GetCPInfo@8
GetCPInfoExW@12
GetCalendarInfoW@24
;GetCharABCWidthsFloatW@16
GetCharABCWidthsW@16
GetCharWidth32W@16
GetCharWidthFloatW@16
GetCharWidthW@16
GetCharacterPlacementW@24
GetClassInfoExW@12
GetClassInfoW@12
GetClassLongW@8
GetClassNameW@12
GetClipboardData@4
GetClipboardFormatNameW@12
GetComputerNameW@8
GetConsoleTitleW@8
GetCurrencyFormatW@24
GetCurrentDirectoryW@8
GetCurrentHwProfileW@4
GetDateFormatW@24
GetDefaultCommConfigW@12
GetDiskFreeSpaceExW@16
GetDiskFreeSpaceW@20
GetDlgItemTextW@16
GetDriveTypeW@4
GetEnhMetaFileDescriptionW@12
GetEnhMetaFileW@4
GetEnvironmentStringsW@0
GetEnvironmentVariableW@12
GetFileAttributesExW@12
GetFileAttributesW@4
GetFileTitleW@12
GetFileVersionInfoSizeW@8
GetFileVersionInfoW@16
GetFullPathNameW@16
GetGlyphOutlineW@28
GetICMProfileW@12
;GetJobW@24
GetKerningPairsW@12
GetKeyNameTextW@12
GetKeyboardLayoutNameW@4
GetLocaleInfoW@16
GetLogColorSpaceW@12
GetLogicalDriveStringsW@8
GetLongPathNameW@12
GetMenuItemInfoW@16
GetMenuStringW@20
GetMessageW@16
GetMetaFileW@4
GetModuleFileNameW@12
GetModuleHandleW@4
GetMonitorInfoW@8
GetNamedPipeHandleStateW@28
GetNumberFormatW@24
GetObjectW@12
GetOpenFileNamePreviewW@4
GetOpenFileNameW@4
GetOutlineTextMetricsW@12
GetPrintProcessorDirectoryW@24
;GetPrinterDataW@24
;GetPrinterDriverDirectoryW24
;GetPrinterDriverW@24
;GetPrinterW@20
GetPrivateProfileIntW@16
GetPrivateProfileSectionNamesW@12
GetPrivateProfileSectionW@16
GetPrivateProfileStringW@24
GetPrivateProfileStructW@20
GetProcAddress@8
GetProfileIntW@12
GetProfileSectionW@12
GetProfileStringW@20
GetPropA@8
GetPropW@8
GetRoleTextW@12
GetSaveFileNamePreviewW@4
GetSaveFileNameW@4
GetShortPathNameW@12
GetStartupInfoW@4
GetStateTextW@12
GetStringTypeExW@20
GetStringTypeW@16
GetSystemDirectoryW@8
GetSystemWindowsDirectoryW@8
GetTabbedTextExtentW@20
GetTempFileNameW@16
GetTempPathW@8
GetTextExtentExPointW@28
GetTextExtentPoint32W@16
GetTextExtentPointW@16
GetTextFaceW@12
GetTextMetricsW@8
GetTimeFormatW@24
GetUserNameW@8
GetVersionExW@4
GetVolumeInformationW@32
GetWindowLongA@8
GetWindowLongW@8
GetWindowModuleFileNameW@12
GetWindowTextLengthW@4
GetWindowTextW@12
GetWindowsDirectoryW@8
GlobalAddAtomW@4
GlobalFindAtomW@4
GlobalGetAtomNameW@12
GrayStringW@36
;InitSecurityInterfaceW@0
;InitializeSecurityContextW@48
InsertMenuItemW@16
InsertMenuW@20
IsBadStringPtrW@8
IsCharAlphaNumericW@4
IsCharAlphaW@4
IsCharLowerW@4
IsCharUpperW@4
IsClipboardFormatAvailable@4
IsDestinationReachableW@8
IsDialogMessageW@8
IsTextUnicode@12
IsValidCodePage@4
IsWindowUnicode@4
LCMapStringW@24
LoadAcceleratorsW@8
LoadBitmapW@8
LoadCursorFromFileW@4
LoadCursorW@8
LoadIconW@8
LoadImageW@24
LoadKeyboardLayoutW@8
LoadLibraryExW@12
LoadLibraryW@4
LoadMenuIndirectW@4
LoadMenuW@8
LoadStringW@16
;MCIWndCreateW@4
MapVirtualKeyExW@12
MapVirtualKeyW@8
MessageBoxExW@20
MessageBoxIndirectW@4
MessageBoxW@16
ModifyMenuW@20
MoveFileW@8
MultiByteToWideChar@24
MultinetGetConnectionPerformanceW@8
OemToCharBuffW@12
OemToCharW@8
;OleUIAddVerbMenuW@36
;OleUIBusyW@4
;OleUIChangeIconW@4
;OleUIChangeSourceW@4
;OleUIConvertW@4
;OleUIEditLinksW@4
;OleUIInsertObjectW@4
;OleUIObjectPropertiesW@4
;OleUIPasteSpecialW@4
;OleUIPromptUserW@8
;OleUIUpdateLinksW@16
OpenEventW@12
OpenFileMappingW@12
OpenMutexW@12
OpenPrinterW@12
OpenSemaphoreW@12
OpenWaitableTimerW@12
OutputDebugStringW@4
PageSetupDlgW@4
PeekConsoleInputW@16
PeekMessageW@20
PlaySoundW@12
;PolyTextOutW@12
PostMessageW@16
PostThreadMessageW@16
PrintDlgW@4
;QueryContextAttributesW@12
;QueryCredentialsAttributesW@12
QueryDosDeviceW@12
;QuerySecurityPackageInfoW@8
RasConnectionNotificationW@12
RasCreatePhonebookEntryW@8
RasDeleteEntryW@8
RasDeleteSubEntryW@12
;RasDialW@24
RasEditPhonebookEntryW@12
RasEnumConnectionsW@12
RasEnumDevicesW@12
RasEnumEntriesW@20
RasGetConnectStatusW@8
RasGetEntryDialParamsW@12
RasGetEntryPropertiesW@24
RasGetErrorStringW@12
RasGetProjectionInfoW@16
RasHangUpW@4
RasRenameEntryW@12
RasSetEntryDialParamsW@12
RasSetEntryPropertiesW@24
RasSetSubEntryPropertiesW@28
RasValidateEntryNameW@8
ReadConsoleInputW@16
ReadConsoleOutputCharacterW@20
ReadConsoleOutputW@20
ReadConsoleW@20
RegConnectRegistryW@12
RegCreateKeyExW@36
RegCreateKeyW@12
RegDeleteKeyW@8
RegDeleteValueW@8
RegEnumKeyExW@32
RegEnumKeyW@16
RegEnumValueW@32
RegLoadKeyW@12
RegOpenKeyExW@20
RegOpenKeyW@12
RegQueryInfoKeyW@48
RegQueryMultipleValuesW@20
RegQueryValueExW@24
RegQueryValueW@16
RegReplaceKeyW@16
RegSaveKeyW@12
RegSetValueExW@24
RegSetValueW@20
RegUnLoadKeyW@8
RegisterClassExW@4
RegisterClassW@4
RegisterClipboardFormatW@4
RegisterDeviceNotificationW@12
RegisterWindowMessageW@4
RemoveDirectoryW@4
RemoveFontResourceW@4
RemovePropA@8
RemovePropW@8
ReplaceTextW@4
ResetDCW@8
;ResetPrinterW@8
SHBrowseForFolderW@4
SHChangeNotify@16
SHFileOperationW@4
SHGetFileInfoW@20
SHGetNewLinkInfoW@20
SHGetPathFromIDListW@8
ScrollConsoleScreenBufferW@20
SearchPathW@24
SendDlgItemMessageW@20
SendMessageCallbackW@24
SendMessageTimeoutW@28
SendMessageW@16
SendNotifyMessageW@16
SetCalendarInfoW@16
SetClassLongW@12
SetComputerNameW@4
SetConsoleTitleW@4
SetCurrentDirectoryW@4
SetDefaultCommConfigW@12
SetDlgItemTextW@12
SetEnvironmentVariableW@8
SetFileAttributesW@8
SetICMProfileW@8
SetJobW@20
SetLocaleInfoW@12
SetMenuItemInfoW@16
SetPrinterDataW@20
SetPrinterW@16
SetPropA@12
SetPropW@12
SetVolumeLabelW@8
SetWindowLongA@12
SetWindowLongW@12
SetWindowTextW@8
SetWindowsHookExW@16
SetWindowsHookW@8
ShellAboutW@16
ShellExecuteExW@4
ShellExecuteW@24
Shell_NotifyIconW@8
StartDocPrinterW@12
StartDocW@8
SystemParametersInfoW@16
TabbedTextOutW@32
TextOutW@20
TranslateAcceleratorW@12
UnregisterClassW@8
UpdateICMRegKeyW@16
UpdateResourceA@24
UpdateResourceW@24
VerFindFileW@32
VerInstallFileW@32
VerLanguageNameW@12
VerQueryValueW@16
VkKeyScanExW@8
VkKeyScanW@4
WNetAddConnection2W@16
WNetAddConnection3W@20
WNetAddConnectionW@12
WNetCancelConnection2W@12
WNetCancelConnectionW@8
WNetConnectionDialog1W@4
WNetDisconnectDialog1W@4
WNetEnumResourceW@16
WNetGetConnectionW@12
WNetGetLastErrorW@20
WNetGetNetworkInformationW@8
WNetGetProviderNameW@12
WNetGetResourceInformationW@16
WNetGetResourceParentW@12
WNetGetUniversalNameW@16
WNetGetUserW@12
WNetOpenEnumW@20
WNetUseConnectionW@32
WaitNamedPipeW@8
WideCharToMultiByte@32
WinHelpW@16
WriteConsoleInputW@16
WriteConsoleOutputCharacterW@20
WriteConsoleOutputW@20
WriteConsoleW@20
WritePrivateProfileSectionW@12
WritePrivateProfileStringW@16
WritePrivateProfileStructW@20
WriteProfileSectionW@8
WriteProfileStringW@12
;auxGetDevCapsW@12
capCreateCaptureWindowW@32
capGetDriverDescriptionW@20
;joyGetDevCapsW@12
lstrcatW@8
lstrcmpW@8
lstrcmpiW@8
lstrcpyW@8
lstrcpynW@12
lstrlenW@4
;mciGetDeviceIDW@4
;mciGetErrorStringW@12
;mciSendCommandW@16
;mciSendStringW@16
;midiInGetDevCapsW@12
midiInGetErrorTextW@12
;midiOutGetDevCapsW@12
;mixerGetControlDetailsW@12
;mixerGetDevCapsW@12
;mixerGetLineControlsW@12
;mixerGetLineInfoW@12
;mmioInstallIOProcW@12
;mmioOpenW@@12
;mmioRenameW@16
sndPlaySoundW@8
;waveInGetDevCapsW@12
;waveInGetErrorTextW@12
;waveOutGetDevCapsW@12
;waveOutGetErrorTextW@12
wsprintfW
wvsprintfW@12

Lines 105-107 Link Here

(-)oo_1.1.1_src/sal/systools/win32/uwinapi/uwinapi_mingw.dxp.orig (+4 lines)
105	GetVolumePathNameW	105	GetVolumePathNameW
106	SetVolumeMountPointA	106	SetVolumeMountPointA
107	SetVolumeMountPointW	107	SetVolumeMountPointW
		108	snprintf
		109	snwprintf
		110	vsnprintf
		111	vsnwprintf

Lines 1-5 Link Here

(-)oo_1.1.1_src/sax/prj/d.lst.orig (+1 lines)
1	..\%__SRC%\bin\.dll %_DEST%\bin%_EXT%\.dll	1	..\%__SRC%\bin\.dll %_DEST%\bin%_EXT%\.dll
2	..\%__SRC%\lib\.so %_DEST%\lib%_EXT%\.so	2	..\%__SRC%\lib\.so %_DEST%\lib%_EXT%\.so
		3	..\%__SRC%\lib\.a %_DEST%\lib%_EXT%\.a
3	..\%__SRC%\lib\.dylib %_DEST%\lib%_EXT%\.dylib	4	..\%__SRC%\lib\.dylib %_DEST%\lib%_EXT%\.dylib
4		5
5	dos: sh -c "if test %OS% = MACOSX; then create-bundle %_DEST%\lib%_EXT%\*.dylib; fi"	6	dos: sh -c "if test %OS% = MACOSX; then create-bundle %_DEST%\lib%_EXT%\*.dylib; fi"

Lines 1-6 Link Here

(-)oo_1.1.1_src/scaddins/prj/d.lst.orig (+1 lines)
1	..\%__SRC%\bin\.dll %_DEST%\bin%_EXT%\.dll	1	..\%__SRC%\bin\.dll %_DEST%\bin%_EXT%\.dll
2	..\%__SRC%\class\.jar %_DEST%\bin%_EXT%\.jar	2	..\%__SRC%\class\.jar %_DEST%\bin%_EXT%\.jar
3	..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%	3	..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%
		4	..\%__SRC%\lib\lib*.a %_DEST%\lib%_EXT%
4	..\%__SRC%\lib\.dylib %_DEST%\lib%_EXT%\.dylib	5	..\%__SRC%\lib\.dylib %_DEST%\lib%_EXT%\.dylib
5	..\%__SRC%\lib\.sl %_DEST%\lib%_EXT%\.sl	6	..\%__SRC%\lib\.sl %_DEST%\lib%_EXT%\.sl
6	..\%__SRC%\bin\.bin %_DEST%\bin%_EXT%\.bin	7	..\%__SRC%\bin\.bin %_DEST%\bin%_EXT%\.bin

Lines 123-129 Link Here

(-)oo_1.1.1_src/scp/source/global/setupzip.scp.orig (+26 lines)
123	#ifdef UNX	123	#ifdef UNX
124	Name = STRING(CONCAT7(libicudata,UNXSUFFIX,.,ICU_MAJOR,ICU_MINOR,.,ICU_MICRO));	124	Name = STRING(CONCAT7(libicudata,UNXSUFFIX,.,ICU_MAJOR,ICU_MINOR,.,ICU_MICRO));
125	#else	125	#else
		126	#ifdef _gcc3
		127	Name = STRING(CONCAT4(icudata.,ICU_MAJOR,ICU_MINOR,.dll));
		128	#else
126	Name = STRING(CONCAT5(icudt,ICU_MAJOR,ICU_MINOR,l,.dll));	129	Name = STRING(CONCAT5(icudt,ICU_MAJOR,ICU_MINOR,l,.dll));
		130	#endif
127	#endif	131	#endif
128	Dir = GCFG_BINARY_DIR;	132	Dir = GCFG_BINARY_DIR;
129	Styles = (PACKED, SETUPZIP);	133	Styles = (PACKED, SETUPZIP);
Lines 152-158 Link Here
152	#ifdef UNX	156	#ifdef UNX
153	Name = STRING(CONCAT7(libicui18n,UNXSUFFIX,.,ICU_MAJOR,ICU_MINOR,.,ICU_MICRO));	157	Name = STRING(CONCAT7(libicui18n,UNXSUFFIX,.,ICU_MAJOR,ICU_MINOR,.,ICU_MICRO));
154	#else	158	#else
		159	#ifdef _gcc3
		160	Name = STRING(CONCAT4(icui18n.,ICU_MAJOR,ICU_MINOR,.dll));
		161	#else
155	Name = STRING(CONCAT4(icuin,ICU_MAJOR,ICU_MINOR,.dll));	162	Name = STRING(CONCAT4(icuin,ICU_MAJOR,ICU_MINOR,.dll));
		163	#endif
156	#endif	164	#endif
157	Dir = GCFG_BINARY_DIR;	165	Dir = GCFG_BINARY_DIR;
158	Styles = (PACKED, SETUPZIP);	166	Styles = (PACKED, SETUPZIP);
Lines 181-187 Link Here
181	#ifdef UNX	189	#ifdef UNX
182	Name = STRING(CONCAT7(libicule,UNXSUFFIX,.,ICU_MAJOR,ICU_MINOR,.,ICU_MICRO));	190	Name = STRING(CONCAT7(libicule,UNXSUFFIX,.,ICU_MAJOR,ICU_MINOR,.,ICU_MICRO));
183	#else	191	#else
		192	#ifdef _gcc3
		193	Name = STRING(CONCAT4(icule.,ICU_MAJOR,ICU_MINOR,.dll));
		194	#else
184	Name = STRING(CONCAT4(icule,ICU_MAJOR,ICU_MINOR,.dll));	195	Name = STRING(CONCAT4(icule,ICU_MAJOR,ICU_MINOR,.dll));
		196	#endif
185	#endif	197	#endif
186	Dir = GCFG_BINARY_DIR;	198	Dir = GCFG_BINARY_DIR;
187	Styles = (PACKED, SETUPZIP);	199	Styles = (PACKED, SETUPZIP);
Lines 210-216 Link Here
210	#ifdef UNX	222	#ifdef UNX
211	Name = STRING(CONCAT7(libicuuc,UNXSUFFIX,.,ICU_MAJOR,ICU_MINOR,.,ICU_MICRO));	223	Name = STRING(CONCAT7(libicuuc,UNXSUFFIX,.,ICU_MAJOR,ICU_MINOR,.,ICU_MICRO));
212	#else	224	#else
		225	#ifdef _gcc3
		226	Name = STRING(CONCAT4(icuuc.,ICU_MAJOR,ICU_MINOR,.dll));
		227	#else
213	Name = STRING(CONCAT4(icuuc,ICU_MAJOR,ICU_MINOR,.dll));	228	Name = STRING(CONCAT4(icuuc,ICU_MAJOR,ICU_MINOR,.dll));
		229	#endif
214	#endif	230	#endif
215	Dir = GCFG_BINARY_DIR;	231	Dir = GCFG_BINARY_DIR;
216	Styles = (PACKED, SETUPZIP);	232	Styles = (PACKED, SETUPZIP);
Lines 273-278 Link Here
273	Name = STRING(CONCAT3(stlport_,vc745,.dll));	289	Name = STRING(CONCAT3(stlport_,vc745,.dll));
274	#else	290	#else
		291	#if defined(_gcc3)
		292	Name = STRING(CONCAT3(libstlport_,gcc,.dll));
		293	#else
275	Name = STRING(CONCAT3(stlport_,vc6,.dll));	294	Name = STRING(CONCAT3(stlport_,vc6,.dll));
		295	#endif
276	#endif	296	#endif
277	#endif	297	#endif
278	End	298	End
Lines 379-384 Link Here
379		399
380	#endif	400	#endif
381		401
		402	#if defined(WNT) && defined(_gcc3)
		403
		404	STD_SETUPZIP_LIB_FILE( GID_FILE_LIB_PSP, psp )
		405
		406	#endif
		407
382	STD_SETUPZIP_LIB_FILE( GID_FILE_LIB_SET, set )	408	STD_SETUPZIP_LIB_FILE( GID_FILE_LIB_SET, set )
383	UNO_SETUPZIP_LIB_FILE( GID_FILE_LIB_UTL , utl)	409	UNO_SETUPZIP_LIB_FILE( GID_FILE_LIB_UTL , utl)
384		410

Lines 6-12 Link Here

(-)oo_1.1.1_src/scp/source/global/udk_base.scp.orig (-1 / +1 lines)
6	// Temporary solution/hack: at the moment libstdc++.so and libgcc_s.so are	6	// Temporary solution/hack: at the moment libstdc++.so and libgcc_s.so are
7	// needed for unxlngi4 environment (setup is linked against it).	7	// needed for unxlngi4 environment (setup is linked against it).
8		8
9	#if ! (defined (FREEBSD) \|\| defined(MACOSX) \|\| defined(NETBSD) )	9	#if ! (defined (FREEBSD) \|\| defined(MACOSX) \|\| defined(NETBSD) \|\| defined(WNT))
10	#if ( defined( _gcc3 ) && ( defined( C300 ) \|\| defined( C322 ) ))	10	#if ( defined( _gcc3 ) && ( defined( C300 ) \|\| defined( C322 ) ))
11		11
12	File gid_File_Lib_gcc	12	File gid_File_Lib_gcc





#endif
#endif

#if defined(WNT) && defined(_gcc3)

ScpAction SCP_COPY_MINGWM10
        Copy                    = "mingwm10.dll";
        Name                    = "mingwm10.dll";
End

#endif

Lines 1013-1020 Link Here

(-)oo_1.1.1_src/scp/source/office/files.scp.orig (+30 lines)
1013	#ifdef UNX	1013	#ifdef UNX
1014	Name = STRING(CONCAT2(libdb-3.2,UNXSUFFIX));	1014	Name = STRING(CONCAT2(libdb-3.2,UNXSUFFIX));
1015	#else	1015	#else
		1016	#ifdef _gcc3
		1017	Name = "libdb-3.2.dll";
		1018	#else
1016	Name = "libdb32.dll";	1019	Name = "libdb32.dll";
1017	#endif	1020	#endif
		1021	#endif
1018	End	1022	End
1019		1023
1020	#ifdef SOLAR_JAVA	1024	#ifdef SOLAR_JAVA
Lines 1026-1033 Link Here
1026	#ifdef UNX	1030	#ifdef UNX
1027	Name = STRING(CONCAT2(libdb_java-3.2,UNXSUFFIX));	1031	Name = STRING(CONCAT2(libdb_java-3.2,UNXSUFFIX));
1028	#else	1032	#else
		1033	#ifdef _gcc3
		1034	Name = "libdb_java-3.2.dll";
		1035	#else
1029	Name = "libdb_java32.dll";	1036	Name = "libdb_java32.dll";
1030	#endif	1037	#endif
		1038	#endif
1031	End	1039	End
1032		1040
1033	#endif	1041	#endif
Lines 1041-1046 Link Here
1041	Name = STRING(CONCAT2(libdb_cxx-3.2,UNXSUFFIX));	1049	Name = STRING(CONCAT2(libdb_cxx-3.2,UNXSUFFIX));
1042	End	1050	End
1043		1051
		1052	#else
		1053	#ifdef _gcc3
		1054
		1055	File GID_FILE_LIB_DB_CXX
		1056	TXT_FILE_BODY;
		1057	Styles = (PACKED);
		1058	Dir = GID_DIR_PROGRAM;
		1059	Name = "libdb_cxx-3.2.dll";
		1060	End
		1061
		1062	#endif
1044	#endif	1063	#endif
1045		1064
1046	#ifdef UNX	1065	#ifdef UNX
Lines 2913-2918 Link Here
2913	STD_SHELLNEW_FILE(GID_FILE_SHELLNEW_SXW_SOFFICE, soffice.sxw)	2932	STD_SHELLNEW_FILE(GID_FILE_SHELLNEW_SXW_SOFFICE, soffice.sxw)
2914		2933
2915	#endif	2934	#endif
2916		2935
		2936	#if defined(WNT) && defined(_gcc3)
		2937
		2938	File GID_FILE_LIB_MINGWM10
		2939	BIN_FILE_BODY;
		2940	Styles = (PACKED, SETUPZIP);
		2941	Dir = GCFG_BINARY_DIR;
		2942	Name = "mingwm10.dll";
		2943	End
		2944
		2945	#endif
		2946
2917	//Only for MS vc7 compiler	2947	//Only for MS vc7 compiler
2918		2948

Lines 59-65 Link Here

(-)oo_1.1.1_src/scptools/source/linker/parameterhelper.cxx.orig (-1 / +1 lines)
59	*	59	*
60	************************************************************************/	60	************************************************************************/
61		61
62	#ifdef UNX	62	#if defined(UNX) \|\| defined(__MINGW32__)
63	#include <stdlib.h>	63	#include <stdlib.h>
64	#include <stdio.h>	64	#include <stdio.h>
65	#endif	65	#endif

Lines 371-377 Link Here

(-)oo_1.1.1_src/setup2/source/custom/jvmsetup/jvmsetup.cxx.orig (+4 lines)
371	if ( bCheckReturn )	371	if ( bCheckReturn )
372	{	372	{
373	vos::OProcess::TProcessInfo aProcessInfo;	373	vos::OProcess::TProcessInfo aProcessInfo;
		374	#ifdef __MINGW32__
		375	if ( aProcess.getInfo( vos::OProcess::TData_ExitCode, &aProcessInfo ) == vos::OProcess::E_None )
		376	#else
374	if ( aProcess.getInfo( vos::OProcess::TProcessData::TData_ExitCode, &aProcessInfo ) == vos::OProcess::E_None )	377	if ( aProcess.getInfo( vos::OProcess::TProcessData::TData_ExitCode, &aProcessInfo ) == vos::OProcess::E_None )
		378	#endif
375	{	379	{
376	if ( aProcessInfo.Code == 3010 )	380	if ( aProcessInfo.Code == 3010 )
377	{	381	{

Lines 338-344 Link Here

(-)oo_1.1.1_src/setup2/source/custom/reg4msdoc/registrar.cxx.orig (+32 lines)
338	RegistryValue RegVal(	338	RegistryValue RegVal(
339	new RegistryValueImpl(	339	new RegistryValueImpl(
340	DEFAULT_VALUE_NAME,	340	DEFAULT_VALUE_NAME,
		341	#ifdef __MINGW32__
		342	m_ContextInformation.GetOpenOfficeCommandline(RegistrationContextInformation::Open)));
		343	#else
341	m_ContextInformation.GetOpenOfficeCommandline(RegistrationContextInformation::SHELL_COMMAND::Open)));	344	m_ContextInformation.GetOpenOfficeCommandline(RegistrationContextInformation::SHELL_COMMAND::Open)));
		345	#endif
342		346
343	RegKey->SetValue(RegVal);	347	RegKey->SetValue(RegVal);
344		348
Lines 352-358 Link Here
352	RegKey = RegKey->CreateSubKey(SHELL_EDIT_COMMAND);	356	RegKey = RegKey->CreateSubKey(SHELL_EDIT_COMMAND);
353	RegVal->SetName(DEFAULT_VALUE_NAME);	357	RegVal->SetName(DEFAULT_VALUE_NAME);
354	RegVal->SetValue(	358	RegVal->SetValue(
		359	#ifdef __MINGW32__
		360	m_ContextInformation.GetOpenOfficeCommandline(RegistrationContextInformation::Open));
		361	#else
355	m_ContextInformation.GetOpenOfficeCommandline(RegistrationContextInformation::SHELL_COMMAND::Open));	362	m_ContextInformation.GetOpenOfficeCommandline(RegistrationContextInformation::SHELL_COMMAND::Open));
		363	#endif
356	RegKey->SetValue(RegVal);	364	RegKey->SetValue(RegVal);
357		365
358	SaveRegisteredFor(HTML_EDITOR);	366	SaveRegisteredFor(HTML_EDITOR);
Lines 418-424 Link Here
418	}	426	}
419		427
420	RegVal->SetValue(	428	RegVal->SetValue(
		429	#ifdef __MINGW32__
		430	m_ContextInformation.GetOpenOfficeCommandline(RegistrationContextInformation::Open));
		431	#else
421	m_ContextInformation.GetOpenOfficeCommandline(RegistrationContextInformation::SHELL_COMMAND::Open));	432	m_ContextInformation.GetOpenOfficeCommandline(RegistrationContextInformation::SHELL_COMMAND::Open));
		433	#endif
422	RegKey = RegistrationRootKey->OpenSubKey(MS_IE_DEF_HTML_EDITOR_SHL_EDIT_CMD);	434	RegKey = RegistrationRootKey->OpenSubKey(MS_IE_DEF_HTML_EDITOR_SHL_EDIT_CMD);
423	RegKey->SetValue(RegVal);	435	RegKey->SetValue(RegVal);
424		436
Lines 515-521 Link Here
515	}	527	}
516		528
517	RegVal->SetValue(	529	RegVal->SetValue(
		530	#ifdef __MINGW32__
		531	m_ContextInformation.GetOpenOfficeCommandline(RegistrationContextInformation::Open));
		532	#else
518	m_ContextInformation.GetOpenOfficeCommandline(RegistrationContextInformation::SHELL_COMMAND::Open));	533	m_ContextInformation.GetOpenOfficeCommandline(RegistrationContextInformation::SHELL_COMMAND::Open));
		534	#endif
519		535
520	RegKey->SetValue(RegVal);	536	RegKey->SetValue(RegVal);
521		537
Lines 726-744 Link Here
726	RegKey->SetValue(RegVal);	742	RegKey->SetValue(RegVal);
727		743
728	RegKey = RegKey->CreateSubKey(L"command");	744	RegKey = RegKey->CreateSubKey(L"command");
		745	#ifdef __MINGW32__
		746	RegVal->SetValue(m_ContextInformation.GetOpenOfficeCommandline(RegistrationContextInformation::New));
		747	#else
729	RegVal->SetValue(m_ContextInformation.GetOpenOfficeCommandline(RegistrationContextInformation::SHELL_COMMAND::New));	748	RegVal->SetValue(m_ContextInformation.GetOpenOfficeCommandline(RegistrationContextInformation::SHELL_COMMAND::New));
		749	#endif
730	RegKey->SetValue(RegVal);	750	RegKey->SetValue(RegVal);
731		751
732	RegKey = RegKeyShell->CreateSubKey(L"open\\command");	752	RegKey = RegKeyShell->CreateSubKey(L"open\\command");
		753	#ifdef __MINGW32__
		754	RegVal->SetValue(m_ContextInformation.GetOpenOfficeCommandline(RegistrationContextInformation::Open));
		755	#else
733	RegVal->SetValue(m_ContextInformation.GetOpenOfficeCommandline(RegistrationContextInformation::SHELL_COMMAND::Open));	756	RegVal->SetValue(m_ContextInformation.GetOpenOfficeCommandline(RegistrationContextInformation::SHELL_COMMAND::Open));
		757	#endif
734	RegKey->SetValue(RegVal);	758	RegKey->SetValue(RegVal);
735		759
736	RegKey = RegKeyShell->CreateSubKey(L"print\\command");	760	RegKey = RegKeyShell->CreateSubKey(L"print\\command");
		761	#ifdef __MINGW32__
		762	RegVal->SetValue(m_ContextInformation.GetOpenOfficeCommandline(RegistrationContextInformation::Print));
		763	#else
737	RegVal->SetValue(m_ContextInformation.GetOpenOfficeCommandline(RegistrationContextInformation::SHELL_COMMAND::Print));	764	RegVal->SetValue(m_ContextInformation.GetOpenOfficeCommandline(RegistrationContextInformation::SHELL_COMMAND::Print));
		765	#endif
738	RegKey->SetValue(RegVal);	766	RegKey->SetValue(RegVal);
739		767
740	RegKey = RegKeyShell->CreateSubKey(L"printto\\command");	768	RegKey = RegKeyShell->CreateSubKey(L"printto\\command");
		769	#ifdef __MINGW32__
		770	RegVal->SetValue(m_ContextInformation.GetOpenOfficeCommandline(RegistrationContextInformation::Printto));
		771	#else
741	RegVal->SetValue(m_ContextInformation.GetOpenOfficeCommandline(RegistrationContextInformation::SHELL_COMMAND::Printto));	772	RegVal->SetValue(m_ContextInformation.GetOpenOfficeCommandline(RegistrationContextInformation::SHELL_COMMAND::Printto));
		773	#endif
742	RegKey->SetValue(RegVal);	774	RegKey->SetValue(RegVal);
743		775
744	// set the new forward key under the appropriate extension	776	// set the new forward key under the appropriate extension

Lines 20-26 Link Here

(-)oo_1.1.1_src/setup2/source/custom/reg4msdoc/registryexception.cxx.orig (-2 / +2 lines)
20		20
21	/**	21	/**
22	*/	22	*/
23	RegistryException::~RegistryException()	23	RegistryException::~RegistryException() throw()
24	{	24	{
25	if (m_ErrorMsg)	25	if (m_ErrorMsg)
26	LocalFree(m_ErrorMsg);	26	LocalFree(m_ErrorMsg);
Lines 28-34 Link Here
28		28
29	/**	29	/**
30	*/	30	*/
31	const char* RegistryException::what() const	31	const char* RegistryException::what() const throw()
32	{	32	{
33	FormatMessage(	33	FormatMessage(
34	FORMAT_MESSAGE_ALLOCATE_BUFFER \|	34	FORMAT_MESSAGE_ALLOCATE_BUFFER \|

Lines 17-23 Link Here

(-)oo_1.1.1_src/setup2/source/custom/reg4msdoc/registryexception.hxx.orig (-2 / +2 lines)
17		17
18	RegistryException(long ErrorCode);	18	RegistryException(long ErrorCode);
19		19
20	virtual ~RegistryException();	20	virtual ~RegistryException() throw();
21		21
22	/**	22	/**
23	@descr Returns a string that describes the error if	23	@descr Returns a string that describes the error if
Lines 25-31 Link Here
25	returned string is only temporary so the caller	25	returned string is only temporary so the caller
26	has to copy it if he needs the string further.	26	has to copy it if he needs the string further.
27	*/	27	*/
28	virtual const char* what() const;	28	virtual const char* what() const throw();
29		29
30	/**	30	/**
31	@descr Returns the error code.	31	@descr Returns the error code.




	else if (ERROR_NO_MORE_ITEMS != rc && ERROR_SUCCESS != rc)
		throw RegistryException(rc);
		
#if (_MSC_VER < 1300) && !defined(__MINGW32__)
	return key_names;
#else
	return (StringListPtr) key_names;

	else if (ERROR_NO_MORE_ITEMS != rc && ERROR_SUCCESS != rc)
		throw RegistryException(rc);

#if (_MSC_VER < 1300) && !defined(__MINGW32__)
	return value_names;
#else
	return (StringListPtr) value_names;


	if (ERROR_FILE_NOT_FOUND == rc)
	{
		#if (_MSC_VER < 1300) && !defined(__MINGW32__)
		return Default;
		#else
		RegistryValue regval_ptr;

Lines 1528-1534 Link Here

(-)oo_1.1.1_src/setup2/source/ui/mainevt.cxx.orig (+7 lines)
1528	aDelFile.Insert( '\'', 0 );	1528	aDelFile.Insert( '\'', 0 );
1529	aDelFile.Insert( '\'' );	1529	aDelFile.Insert( '\'' );
1530	}	1530	}
		1531	#ifdef __MINGW32__
		1532	{
		1533	String temp = aUnLoader.GetFullUni();
		1534	_StartApplication( temp, aDelFile );
		1535	}
		1536	#else
1531	_StartApplication( aUnLoader.GetFullUni(), aDelFile );	1537	_StartApplication( aUnLoader.GetFullUni(), aDelFile );
		1538	#endif
1532	bKillDelFile = FALSE;	1539	bKillDelFile = FALSE;
1533	time( &ltime );	1540	time( &ltime );
1534	if ( pFile ) fprintf( pFile, "Uninst call finished at:%s\n", ctime( &ltime ) );	1541	if ( pFile ) fprintf( pFile, "Uninst call finished at:%s\n", ctime( &ltime ) );





	while( nOffset < aTarget.GetWidth() )
	{
#if ((_MSC_VER < 1300) && !defined(__MINGW32__)) || defined(UNX)
		ULONG nThisStep = std::min ((long)nStep, aTarget.GetWidth() - nOffset);
#else
		ULONG nThisStep = min ((long)nStep, aTarget.GetWidth() - nOffset);


	while( nOffset < aTarget.GetWidth() )
	{
#if ((_MSC_VER < 1300) && !defined(__MINGW32__)) || defined(UNX)
		ULONG nThisStep = std::min ((long)nStep, aTarget.GetWidth() - nOffset);
#else
		ULONG nThisStep = min ((long)nStep, aTarget.GetWidth() - nOffset);


	while (nOffset < aTarget.GetHeight())
	{
#if ((_MSC_VER < 1300) && !defined(__MINGW32__)) || defined(UNX)
		ULONG nThisStep = std::min ((long)nStep, aTarget.GetHeight() - nOffset);
#else
		ULONG nThisStep = min ((long)nStep, aTarget.GetHeight() - nOffset);


	while (nOffset < aTarget.GetHeight())
	{
#if ((_MSC_VER < 1300) && !defined(__MINGW32__)) || defined(UNX)
		ULONG nThisStep = std::min ((long)nStep, aTarget.GetHeight() - nOffset);
#else
		ULONG nThisStep = min ((long)nStep, aTarget.GetHeight() - nOffset);


	while( nOffset != aTarget.GetWidth() )
	{
#if ((_MSC_VER < 1300) && !defined(__MINGW32__)) || defined(UNX)
		ULONG nThisStep = std::min ( (long) nStep, aTarget.GetWidth() - nOffset );
#else
		ULONG nThisStep = min ( (long) nStep, aTarget.GetWidth() - nOffset );


	while (nOffset != aTarget.GetHeight())
	{
#if ((_MSC_VER < 1300) && !defined(__MINGW32__)) || defined(UNX)
		ULONG nThisStep = std::max( std::min ((long)nStep, aTarget.GetHeight() - nOffset), 0L );
#else
		ULONG nThisStep = max( min ((long)nStep, aTarget.GetHeight() - nOffset), 0L );


	while (nOffset != aTarget.GetWidth())
	{
#if ((_MSC_VER < 1300) && !defined(__MINGW32__)) || defined(UNX)
		ULONG nThisStep = std::min ((long)nStep, aTarget.GetWidth() - nOffset);
#else
		ULONG nThisStep = min ((long)nStep, aTarget.GetWidth() - nOffset);


	while (nOffset != aTarget.GetHeight())
	{
#if ((_MSC_VER < 1300) && !defined(__MINGW32__)) || defined(UNX)
		ULONG nThisStep = std::min ((long)nStep, aTarget.GetHeight() - nOffset);
#else
		ULONG nThisStep = min ((long)nStep, aTarget.GetHeight() - nOffset);

	{
		while( nOffset != aTarget.GetWidth() )
		{
#if ((_MSC_VER < 1300) && !defined(__MINGW32__)) || defined(UNX)
			ULONG nThisStep = std::min ( (long) nStep, aTarget.GetWidth() - nOffset );
#else
			ULONG nThisStep = min ( (long) nStep, aTarget.GetWidth() - nOffset );


		while( nOffset < aTarget.GetWidth() )
		{
#if ((_MSC_VER < 1300) && !defined(__MINGW32__)) || defined(UNX)
			ULONG nThisStep = std::min ((long)nStep, aTarget.GetWidth() - nOffset);
#else
			ULONG nThisStep = min ((long)nStep, aTarget.GetWidth() - nOffset);

	{
		while (nOffset != aTarget.GetWidth())
		{
#if ((_MSC_VER < 1300) && !defined(__MINGW32__)) || defined(UNX)
			ULONG nThisStep = std::min ((long)nStep, aTarget.GetWidth() - nOffset);
#else
			ULONG nThisStep = min ((long)nStep, aTarget.GetWidth() - nOffset);


		while (nOffset < aTarget.GetWidth())
		{
#if ((_MSC_VER < 1300) && !defined(__MINGW32__)) || defined(UNX)
			ULONG nThisStep = std::min ((long)nStep, aTarget.GetWidth() - nOffset);
#else
			ULONG nThisStep = min ((long)nStep, aTarget.GetWidth() - nOffset);

	{
		while (nOffset != aTarget.GetHeight())
		{
#if ((_MSC_VER < 1300) && !defined(__MINGW32__)) || defined(UNX)
			ULONG nThisStep = std::min ((long)nStep, aTarget.GetHeight() - nOffset);
#else
			ULONG nThisStep = min ((long)nStep, aTarget.GetHeight() - nOffset);


		while (nOffset < aTarget.GetHeight())
		{
#if ((_MSC_VER < 1300) && !defined(__MINGW32__)) || defined(UNX)
			ULONG nThisStep = std::min ((long)nStep, aTarget.GetHeight() - nOffset);
#else
			ULONG nThisStep = min ((long)nStep, aTarget.GetHeight() - nOffset);

	{
		while (nOffset != aTarget.GetHeight())
		{
#if ((_MSC_VER < 1300) && !defined(__MINGW32__)) || defined(UNX)
			ULONG nThisStep = std::min ((long)nStep, aTarget.GetHeight() - nOffset);
#else
			ULONG nThisStep = min ((long)nStep, aTarget.GetHeight() - nOffset);


		while (nOffset < aTarget.GetHeight())
		{
#if ((_MSC_VER < 1300) && !defined(__MINGW32__)) || defined(UNX)
			ULONG nThisStep = std::min ((long)nStep, aTarget.GetHeight() - nOffset);
#else
			ULONG nThisStep = min ((long)nStep, aTarget.GetHeight() - nOffset);

Lines 2339-2345 Link Here

(-)oo_1.1.1_src/setup2/win/source/loader/loader.cxx.orig (+8 lines)
2339	// -----------------------------------------------------------------------------	2339	// -----------------------------------------------------------------------------
2340		2340
2341	typedef oslFileError (SAL_CALL * osl_getSystemPathFromFileURL_Func)( rtl_uString ustrURL, rtl_uString *pustrPath);	2341	typedef oslFileError (SAL_CALL * osl_getSystemPathFromFileURL_Func)( rtl_uString ustrURL, rtl_uString *pustrPath);
		2342	#ifdef __MINGW32__
		2343	typedef void (SAL_CALL * rtl_uString_newFromAscii_Func)( rtl_uString ** newStr, const sal_Char * value );
		2344	#else
2342	typedef void (SAL_CALL * rtl_uString_newFromAscii_Func)( rtl_uString ** newStr, const sal_Char * value ) SAL_THROW_EXTERN_C();	2345	typedef void (SAL_CALL * rtl_uString_newFromAscii_Func)( rtl_uString ** newStr, const sal_Char * value ) SAL_THROW_EXTERN_C();
		2346	#endif
2343		2347
2344	BOOL getSystemPathFromFileURL(char* strTempPath, char* strURL, char* strSystemPath)	2348	BOOL getSystemPathFromFileURL(char* strTempPath, char* strURL, char* strSystemPath)
2345	{	2349	{
Lines 2358-2364 Link Here
2358	return FALSE;	2362	return FALSE;
2359	}	2363	}
2360		2364
		2365	#ifdef __MINGW32__
		2366	void (SAL_CALL * rtl_uString_newFromAscii2)( rtl_uString ** newStr, const sal_Char * value ) SAL_THROW_EXTERN_C() =
		2367	#else
2361	rtl_uString_newFromAscii_Func rtl_uString_newFromAscii2 =	2368	rtl_uString_newFromAscii_Func rtl_uString_newFromAscii2 =
		2369	#endif
2362	reinterpret_cast<rtl_uString_newFromAscii_Func>(pProc);	2370	reinterpret_cast<rtl_uString_newFromAscii_Func>(pProc);
2363		2371
2364	rtl_uString* psuURL = 0;	2372	rtl_uString* psuURL = 0;

Lines 94-99 Link Here

(-)oo_1.1.1_src/setup2/win/source/system/winos.cxx.orig (-2 / +9 lines)
94	#include <imagehlp.h>	94	#include <imagehlp.h>
95		95
96	#include <psapi.h>	96	#include <psapi.h>
		97	#ifdef __MINGW32__
		98	#include <ctype.h>
		99	#endif
97	#include <tchar.h>	100	#include <tchar.h>
98	#include <tlhelp32.h>	101	#include <tlhelp32.h>
99		102
Lines 769-775 Link Here
769	lpFolderA = ALLOC( WCHAR, 16000 );	772	lpFolderA = ALLOC( WCHAR, 16000 );
770		773
771	SHGetPathFromIDListW( pidl, lpFolderA );	774	SHGetPathFromIDListW( pidl, lpFolderA );
		775	#ifdef __MINGW32__
		776	aFolder = UniString( reinterpret_cast< unsigned short int * >(lpFolderA) );
		777	#else
772	aFolder = UniString( lpFolderA );	778	aFolder = UniString( lpFolderA );
		779	#endif
773		780
774	FREE( lpFolderA );	781	FREE( lpFolderA );
775	_SHFree( pidl );	782	_SHFree( pidl );
Lines 881-887 Link Here
881	hres = CoCreateInstance( clsid_ShellLink, NULL, CLSCTX_INPROC_SERVER,	888	hres = CoCreateInstance( clsid_ShellLink, NULL, CLSCTX_INPROC_SERVER,
882	clsid_IShellLink, (void**)&psl );	889	clsid_IShellLink, (void**)&psl );
883	if( FAILED(hres) )	890	if( FAILED(hres) )
884	hres = SHCoCreateInstance( NULL, clsid_ShellLink, NULL, clsid_IShellLink, (void**)&psl );	891	hres = SHCoCreateInstance( static_cast< void * >(NULL), clsid_ShellLink, NULL, clsid_IShellLink, (void**)&psl );
885		892
886	if( SUCCEEDED(hres) )	893	if( SUCCEEDED(hres) )
887	{	894	{
Lines 1251-1257 Link Here
1251	{	1258	{
1252	aSubKey2 = aSubKey;	1259	aSubKey2 = aSubKey;
1253	aSubKey2 += '\\';	1260	aSubKey2 += '\\';
1254	aSubKey2 += szSubKey;	1261	aSubKey2 += reinterpret_cast< unsigned short int * >(szSubKey);
1255		1262
1256	lErr = Deregister( rKey, aSubKey2, bKeyOnly, rName,	1263	lErr = Deregister( rKey, aSubKey2, bKeyOnly, rName,
1257	bDeleteAllSubKeys, bUseUserSection );	1264	bDeleteAllSubKeys, bUseUserSection );

Lines 192-198 Link Here

(-)oo_1.1.1_src/sfx2/source/appl/shutdowniconw32.cxx.orig (-1 / +1 lines)
192		192
193	// -------------------------------	193	// -------------------------------
194		194
195	static void addMenuItem( HMENU hMenu, UINT id, UINT iconId, OUString& text, int& pos, int bOwnerdraw )	195	static void addMenuItem( HMENU hMenu, UINT id, UINT iconId, const OUString& text, int& pos, int bOwnerdraw )
196	{	196	{
197	MENUITEMINFOW mi;	197	MENUITEMINFOW mi;
198	memset( &mi, 0, sizeof( MENUITEMINFOW ) );	198	memset( &mi, 0, sizeof( MENUITEMINFOW ) );

Lines 139-145 Link Here

(-)oo_1.1.1_src/sfx2/source/doc/objsys.cxx.orig (-1 / +1 lines)
139	if ( pGDIMeta )	139	if ( pGDIMeta )
140	{	140	{
141	String aStr = ::rtl::OUString::createFromAscii( ".emf" );	141	String aStr = ::rtl::OUString::createFromAscii( ".emf" );
142	::utl::TempFile aTempFile( ::rtl::OUString(),	142	::utl::TempFile aTempFile( ::rtl::OUString::createFromAscii(""),
143	&aStr,	143	&aStr,
144	NULL,	144	NULL,
145	sal_False );	145	sal_False );

Lines 580-586 Link Here

(-)oo_1.1.1_src/sfx2/source/toolbox/tbxcust.cxx.orig (+4 lines)
580	return 0;	580	return 0;
581	}	581	}
582		582
		583	#if (defined(_MSC_VER) && (_MSC_VER >= 1310))
		584	template<> struct std::hash< SfxConfigManager* >
		585	#else
583	struct std::hash< SfxConfigManager* >	586	struct std::hash< SfxConfigManager* >
		587	#endif
584	{	588	{
585	size_t operator()(const SfxConfigManager* __s) const { return (size_t)__s; }	589	size_t operator()(const SfxConfigManager* __s) const { return (size_t)__s; }
586	};	590	};

Lines 655-661 Link Here

(-)oo_1.1.1_src/shell/source/tools/lngconvex/lngconvex.cxx.orig (-4 / +13 lines)
655		655
656	for (/**/ ;rct_iter != rct_iter_end; ++rct_iter)	656	for (/**/ ;rct_iter != rct_iter_end; ++rct_iter)
657	{	657	{
658	std::istringstream iss = rct_iter->m_Line;	658	std::istringstream iss(rct_iter->m_Line);
659	std::string line;	659	std::string line;
660		660
661	while (iss)	661	while (iss)
Lines 732-741 Link Here
732	rtl::OUString oustr_abs_name = GetAbsoluteDirectory(	732	rtl::OUString oustr_abs_name = GetAbsoluteDirectory(
733	module_dir, OStr2OUStr(cmdline.GetArgument("-c").c_str()));	733	module_dir, OStr2OUStr(cmdline.GetArgument("-c").c_str()));
734		734
		735	{
		736	std::ifstream temp(OUStr2OStr(oustr_abs_name).getStr());
735	ReadCtryLngFile(	737	ReadCtryLngFile(
736	std::ifstream(OUStr2OStr(oustr_abs_name).getStr()),	738	temp,
737	substitutor,	739	substitutor,
738	g_country_lng_file_countries);	740	g_country_lng_file_countries);
		741	}
739		742
740	oustr_abs_name = GetAbsoluteDirectory(	743	oustr_abs_name = GetAbsoluteDirectory(
741	module_dir, OStr2OUStr(cmdline.GetArgument("-lng").c_str()));	744	module_dir, OStr2OUStr(cmdline.GetArgument("-lng").c_str()));
Lines 765-773 Link Here
765	oustr_abs_name = GetAbsoluteDirectory(	768	oustr_abs_name = GetAbsoluteDirectory(
766	module_dir, OStr2OUStr(cmdline.GetArgument("-rch").c_str()));	769	module_dir, OStr2OUStr(cmdline.GetArgument("-rch").c_str()));
767		770
		771	{
		772	std::ifstream temp(OUStr2OStr(oustr_abs_name).getStr());
768	FileAppendRcHeader(	773	FileAppendRcHeader(
769	rc_output_file,	774	rc_output_file,
770	std::ifstream(OUStr2OStr(oustr_abs_name).getStr()));	775	temp);
		776	}
771		777
772	InflateRcTemplateAndAppendToFile(	778	InflateRcTemplateAndAppendToFile(
773	rc_output_file,	779	rc_output_file,
Lines 778-786 Link Here
778	oustr_abs_name = GetAbsoluteDirectory(	784	oustr_abs_name = GetAbsoluteDirectory(
779	module_dir, OStr2OUStr(cmdline.GetArgument("-rcf").c_str()));	785	module_dir, OStr2OUStr(cmdline.GetArgument("-rcf").c_str()));
780		786
		787	{
		788	std::ifstream temp(OUStr2OStr(oustr_abs_name).getStr());
781	FileAppendRcFooter(	789	FileAppendRcFooter(
782	rc_output_file,	790	rc_output_file,
783	std::ifstream(OUStr2OStr(oustr_abs_name).getStr()));	791	temp);
		792	}
784		793
785	}	794	}
786	catch(const std::ios::failure& ex)	795	catch(const std::ios::failure& ex)

Lines 67-72 Link Here

(-)oo_1.1.1_src/shell/source/win32/shlxthandler/classfactory.cxx.orig (-4 / +4 lines)
67	#include "classfactory.hxx"	67	#include "classfactory.hxx"
68	#endif	68	#endif
69		69
		70	#ifndef _SHLXTHDL_HXX_
		71	#include "shlxthdl.hxx"
		72	#endif
		73
70	#ifndef _INFOTIP_HXX_	74	#ifndef _INFOTIP_HXX_
71	#include "infotip.hxx"	75	#include "infotip.hxx"
72	#endif	76	#endif
Lines 79-88 Link Here
79	#include "columnprovider.hxx"	83	#include "columnprovider.hxx"
80	#endif	84	#endif
81		85
82	#ifndef _SHLXTHDL_HXX_
83	#include "shlxthdl.hxx"
84	#endif
85
86	//-----------------------------	86	//-----------------------------
87	//	87	//
88	//-----------------------------	88	//-----------------------------

Lines 62-67 Link Here

(-)oo_1.1.1_src/shell/source/win32/shlxthandler/classfactory.hxx.orig (+4 lines)
62	#ifndef _CLASSFACTORY_HXX_	62	#ifndef _CLASSFACTORY_HXX_
63	#define _CLASSFACTORY_HXX_	63	#define _CLASSFACTORY_HXX_
64		64
		65	#ifdef __MINGW32__
		66	#include <wtypes.h>
		67	#include <objbase.h>
		68	#endif
65	#include <objidl.h>	69	#include <objidl.h>
66		70
67	class CClassFactory : public IClassFactory	71	class CClassFactory : public IClassFactory

Lines 62-67 Link Here

(-)oo_1.1.1_src/shell/source/win32/shlxthandler/infotip.hxx.orig (+4 lines)
62	#ifndef _INFOTIP_HXX_	62	#ifndef _INFOTIP_HXX_
63	#define _INFOTIP_HXX_	63	#define _INFOTIP_HXX_
64		64
		65	#ifdef __MINGW32__
		66	#include <wtypes.h>
		67	#include <objbase.h>
		68	#endif
65	#include <objidl.h>	69	#include <objidl.h>
66	#include <shlobj.h>	70	#include <shlobj.h>
67	#include <string>	71	#include <string>

Lines 74-79 Link Here

(-)oo_1.1.1_src/shell/source/win32/shlxthandler/types.hxx.orig (-1 / +1 lines)
74	typedef std::pair<Characters_t, XmlTagAttributes_t> XmlTag_t;	74	typedef std::pair<Characters_t, XmlTagAttributes_t> XmlTag_t;
75	typedef std::map<Name_t, XmlTag_t> XmlTags_t;	75	typedef std::map<Name_t, XmlTag_t> XmlTags_t;
76		76
77	#define EMPTY_XML_TAG std::make_pair(std::wstring(), XmlTagAttributes_t())	77	#define EMPTY_XML_TAG std::make_pair(Characters_t(), XmlTagAttributes_t())
78		78
79	#endif	79	#endif

Lines 287-293 Link Here

(-)oo_1.1.1_src/shell/source/win32/shlxthandler/xmlprsr.cxx.orig (-2 / +2 lines)
287		287
288	while(atts[i])	288	while(atts[i])
289	{	289	{
290	xml_attribs[GetLocalName(atts[i])] = atts[i+1];	290	xml_attribs[GetLocalName(reinterpret_cast< LPCWSTR >(atts[i]))] = reinterpret_cast< LPCWSTR >(atts[i+1]);
291	i += 2; // skip to next pair	291	i += 2; // skip to next pair
292	}	292	}
293		293
Lines 322-328 Link Here
322	SaxParser* pImpl = reinterpret_cast<SaxParser*>(XML_GetUserData(parser));	322	SaxParser* pImpl = reinterpret_cast<SaxParser*>(XML_GetUserData(parser));
323		323
324	if (pImpl->m_SaxDocumentHandler)	324	if (pImpl->m_SaxDocumentHandler)
325	pImpl->m_SaxDocumentHandler->Characters(std::wstring(s, len));	325	pImpl->m_SaxDocumentHandler->Characters(std::wstring(reinterpret_cast< LPCWSTR >(s), len));
326	}	326	}
327		327
328	//---------------------------------	328	//---------------------------------

Lines 78-84 Link Here

(-)oo_1.1.1_src/shell/source/win32/shlxthandler/zipexcptn.cxx.orig (-2 / +2 lines)
78	//------------------------------------------	78	//------------------------------------------
79	/**	79	/**
80	*/	80	*/
81	RuntimeException::~RuntimeException()	81	RuntimeException::~RuntimeException() throw()
82	{	82	{
83	}	83	}
84		84
Lines 118-124 Link Here
118	//------------------------------------------	118	//------------------------------------------
119	/**	119	/**
120	*/	120	*/
121	Win32Exception::~Win32Exception()	121	Win32Exception::~Win32Exception() throw()
122	{	122	{
123	if (m_MsgBuff)	123	if (m_MsgBuff)
124	LocalFree(m_MsgBuff);	124	LocalFree(m_MsgBuff);

Lines 14-20 Link Here

(-)oo_1.1.1_src/shell/source/win32/shlxthandler/zipexcptn.hxx.orig (-2 / +2 lines)
14	{	14	{
15	public:	15	public:
16	RuntimeException(int Error);	16	RuntimeException(int Error);
17	virtual ~RuntimeException();	17	virtual ~RuntimeException() throw();
18		18
19	int GetErrorCode() const;	19	int GetErrorCode() const;
20		20
Lines 40-46 Link Here
40	{	40	{
41	public:	41	public:
42	Win32Exception(int Error);	42	Win32Exception(int Error);
43	virtual ~Win32Exception();	43	virtual ~Win32Exception() throw();
44		44
45	virtual const char* what() const throw();	45	virtual const char* what() const throw();
46		46

Lines 70-76 Link Here

(-)oo_1.1.1_src/shell/source/win32/simplemail/simplemapi.hxx.orig (+3 lines)
70		70
71	#include <windows.h>	71	#include <windows.h>
72	#include <mapi.h>	72	#include <mapi.h>
		73	#ifdef __MINGW32__
		74	#else
73	#include <mapix.h>	75	#include <mapix.h>
		76	#endif
74		77
75	//----------------------------------------------------------	78	//----------------------------------------------------------
76	// class declaration	79	// class declaration

Lines 446-452 Link Here

(-)oo_1.1.1_src/shell/source/win32/simplemail/smplmailclient.cxx.orig (+4 lines)
446	osl::FileBase::getSystemPathFromFileURL(	446	osl::FileBase::getSystemPathFromFileURL(
447	aAttachementList[i], aSysPath );	447	aAttachementList[i], aSysPath );
448		448
		449	#ifdef __MINGW32__
		450	if ( osl::FileBase::E_None != rc )
		451	#else
449	if ( osl::FileBase::RC::E_None != rc )	452	if ( osl::FileBase::RC::E_None != rc )
		453	#endif
450	throw IllegalArgumentException(	454	throw IllegalArgumentException(
451	OUString::createFromAscii( " " ),	455	OUString::createFromAscii( " " ),
452	static_cast< XSimpleMailClient* >( this ),	456	static_cast< XSimpleMailClient* >( this ),

Lines 5-10 Link Here

(-)oo_1.1.1_src/sj2/prj/d.lst.orig (+1 lines)
5		5
6	..\%__SRC%\lib\sj.lib %_DEST%\lib%_EXT%\sj.lib	6	..\%__SRC%\lib\sj.lib %_DEST%\lib%_EXT%\sj.lib
7	..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%	7	..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%
		8	..\%__SRC%\lib\lib*.a %_DEST%\lib%_EXT%
8	..\%__SRC%\lib\.dylib %_DEST%\lib%_EXT%\.dylib	9	..\%__SRC%\lib\.dylib %_DEST%\lib%_EXT%\.dylib
9	..\%__SRC%\slb\sj.lib %_DEST%\lib%_EXT%\xsj.lib	10	..\%__SRC%\slb\sj.lib %_DEST%\lib%_EXT%\xsj.lib
10	..\%__SRC%\bin\j?????_g.dll %_DEST%\bin%_EXT%\j?????_g.dll	11	..\%__SRC%\bin\j?????_g.dll %_DEST%\bin%_EXT%\j?????_g.dll

Lines 1-6 Link Here

(-)oo_1.1.1_src/so3/prj/d.lst.orig (+1 lines)
1	touch: ..\%__SRC%\misc\so3.hid %_DEST%\bin%_EXT%\so3.hid	1	touch: ..\%__SRC%\misc\so3.hid %_DEST%\bin%_EXT%\so3.hid
2	..\%__SRC%\lib\so2.lib %_DEST%\lib%_EXT%\so2.lib	2	..\%__SRC%\lib\so2.lib %_DEST%\lib%_EXT%\so2.lib
3	..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%	3	..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%
		4	..\%__SRC%\lib\lib*.a %_DEST%\lib%_EXT%
4	..\%__SRC%\lib\.dylib %_DEST%\lib%_EXT%\.dylib	5	..\%__SRC%\lib\.dylib %_DEST%\lib%_EXT%\.dylib
5	..\%__SRC%\srs\src.srs %_DEST%\res%_EXT%\so2.srs	6	..\%__SRC%\srs\src.srs %_DEST%\res%_EXT%\so2.srs
6	..\%__SRC%\bin\.tlb %_DEST%\bin%_EXT%\.tlb	7	..\%__SRC%\bin\.tlb %_DEST%\bin%_EXT%\.tlb





	OModule aOleDlgLib;
	if( !aOleDlgLib.load( String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "oledlg" ) ) ) )
		return SvInPlaceObjectRef(xRet);

#ifdef UNICODE
	OleUIInsertObjectW_Type * pInsertFct = (OleUIInsertObjectW_Type *)

								aOleDlgLib.getSymbol( String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "OleUIInsertObjectA" ) ) );
#endif
	if( !pInsertFct )
		return SvInPlaceObjectRef(xRet);

	//uTemp=pInsertFct(&io);
	//uTemp=OleUIInsertObject(&io);


	OModule aOleDlgLib;
	if( !aOleDlgLib.load( String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "oledlg" ) ) ) )
		return SvInPlaceObjectRef(xRet);

#ifdef UNICODE
	OleUIInsertObjectW_Type * pInsertFct = (OleUIInsertObjectW_Type *)

								aOleDlgLib.getSymbol( String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "OleUIInsertObjectA" ) ) );
#endif
	if( !pInsertFct )
		return SvInPlaceObjectRef(xRet);

	uTemp=pInsertFct(&io);
	//uTemp=OleUIInsertObject(&io);

				bIsInternal = TRUE;
				rTypeName = pInternalServer->GetHumanName();
				rInternalClassName = pInternalServer->GetClassName();
				return SvInPlaceObjectRef(xRet);
			}

			tType=TENANTTYPE_EMBEDDEDOBJECT;

				// so it will be inserted without actuall OLE embedding

				bIsInternal = TRUE;
				return SvInPlaceObjectRef(xRet);
			}
		}


		else
		{
			pDO->Release();
			return SvInPlaceObjectRef(xRet);
		}



			else
			{
				pDO->Release();
				return SvInPlaceObjectRef(xRet);
			}
			xRet = new SvOutPlaceObject();
			xRet->DoInitNew( pIStorage );

Lines 841-847 Link Here

(-)oo_1.1.1_src/so3/source/misc/factory.cxx.orig (-1 / +1 lines)
841	#ifdef WNT	841	#ifdef WNT
842	if( !Find( GetAutoConvertTo( pStor->GetClassName() ) ) )	842	if( !Find( GetAutoConvertTo( pStor->GetClassName() ) ) )
843	{	843	{
844	return SvOutPlaceObject::CreateFromData( xTrans, pStor );	844	return SvObjectRef(SvOutPlaceObject::CreateFromData( xTrans, pStor ));
845	}	845	}
846	#endif	846	#endif
847	return SvObjectRef();	847	return SvObjectRef();

Lines 68-73 Link Here

(-)oo_1.1.1_src/so3/source/ole/helpers.cxx.orig (+2 lines)
68		68
69	#define ARRAYSIZE(a) (sizeof(a)/sizeof(a[0]))	69	#define ARRAYSIZE(a) (sizeof(a)/sizeof(a[0]))
70		70
		71	static BOOL GetFileTimes(LPTSTR pszFileName, FILETIME *pft);
		72
71	/*	73	/*
72	* StarObject_MetafilePictIconFree	74	* StarObject_MetafilePictIconFree
73	*	75	*

Lines 159-164 Link Here

(-)oo_1.1.1_src/so3/source/ole/soole.h.orig (-1 / +127 lines)
159	#endif //OLECHAR	159	#endif //OLECHAR
160	#endif //_WIN32	160	#endif //_WIN32
161		161
		162	#endif //_OLE2_H_
		163
		164	#if defined(_OLE2_H_) \|\| defined(__MINGW32__) //May not include ole2.h at all times.
162		165
163	//Useful macros.	166	//Useful macros.
164	#define SETFormatEtc(fe, cf, asp, td, med, li) \	167	#define SETFormatEtc(fe, cf, asp, td, med, li) \
Lines 501-506 Link Here
501		504
502	#endif	505	#endif
503		506
504	BOOL GetFileTimes(LPTSTR, FILETIME *);	507	// BOOL GetFileTimes(LPTSTR, FILETIME *);
		508
		509	#ifdef __MINGW32__
		510
		511	typedef
		512	enum tagOLEMISC
		513	{ OLEMISC_RECOMPOSEONRESIZE = 0x1,
		514	OLEMISC_ONLYICONIC = 0x2,
		515	OLEMISC_INSERTNOTREPLACE = 0x4,
		516	OLEMISC_STATIC = 0x8,
		517	OLEMISC_CANTLINKINSIDE = 0x10,
		518	OLEMISC_CANLINKBYOLE1 = 0x20,
		519	OLEMISC_ISLINKOBJECT = 0x40,
		520	OLEMISC_INSIDEOUT = 0x80,
		521	OLEMISC_ACTIVATEWHENVISIBLE = 0x100,
		522	OLEMISC_RENDERINGISDEVICEINDEPENDENT = 0x200,
		523	OLEMISC_INVISIBLEATRUNTIME = 0x400,
		524	OLEMISC_ALWAYSRUN = 0x800,
		525	OLEMISC_ACTSLIKEBUTTON = 0x1000,
		526	OLEMISC_ACTSLIKELABEL = 0x2000,
		527	OLEMISC_NOUIACTIVATE = 0x4000,
		528	OLEMISC_ALIGNABLE = 0x8000,
		529	OLEMISC_SIMPLEFRAME = 0x10000,
		530	OLEMISC_SETCLIENTSITEFIRST = 0x20000,
		531	OLEMISC_IMEMODE = 0x40000,
		532	OLEMISC_IGNOREACTIVATEWHENVISIBLE = 0x80000,
		533	OLEMISC_WANTSTOMENUMERGE = 0x100000,
		534	OLEMISC_SUPPORTSMULTILEVELUNDO = 0x200000
		535	} OLEMISC;
		536
		537	typedef interface IOleLink IOleLink;
		538
		539	typedef /* [unique] / IOleLink LPOLELINK;
		540
		541	typedef
		542	enum tagOLEUPDATE
		543	{ OLEUPDATE_ALWAYS = 1,
		544	OLEUPDATE_ONCALL = 3
		545	} OLEUPDATE;
		546
		547	typedef OLEUPDATE *LPOLEUPDATE;
		548
		549	typedef OLEUPDATE *POLEUPDATE;
		550
		551	typedef
		552	enum tagOLELINKBIND
		553	{ OLELINKBIND_EVENIFCLASSDIFF = 1
		554	} OLELINKBIND;
		555
		556
		557	EXTERN_C const IID IID_IOleLink;
		558
		559	MIDL_INTERFACE("0000011d-0000-0000-C000-000000000046")
		560	IOleLink : public IUnknown
		561	{
		562	public:
		563	virtual HRESULT STDMETHODCALLTYPE SetUpdateOptions(
		564	/* [in] */ DWORD dwUpdateOpt) = 0;
		565
		566	virtual HRESULT STDMETHODCALLTYPE GetUpdateOptions(
		567	/* [out] / DWORD pdwUpdateOpt) = 0;
		568
		569	virtual HRESULT STDMETHODCALLTYPE SetSourceMoniker(
		570	/* [unique][in] / IMoniker pmk,
		571	/* [in] */ REFCLSID rclsid) = 0;
572
573	virtual HRESULT STDMETHODCALLTYPE GetSourceMoniker(
574	/* [out] / IMoniker *ppmk) = 0;
575
576	virtual HRESULT STDMETHODCALLTYPE SetSourceDisplayName(
577	/* [in] */ LPCOLESTR pszStatusText) = 0;
578
579	virtual HRESULT STDMETHODCALLTYPE GetSourceDisplayName(
580	/* [out] / LPOLESTR ppszDisplayName) = 0;
581
582	virtual HRESULT STDMETHODCALLTYPE BindToSource(
583	/* [in] */ DWORD bindflags,
584	/* [unique][in] / IBindCtx pbc) = 0;
585
586	virtual HRESULT STDMETHODCALLTYPE BindIfRunning( void) = 0;
587
588	virtual HRESULT STDMETHODCALLTYPE GetBoundSource(
589	/* [out] / IUnknown *ppunk) = 0;
590
591	virtual HRESULT STDMETHODCALLTYPE UnbindSource( void) = 0;
592
593	virtual HRESULT STDMETHODCALLTYPE Update(
594	/* [unique][in] / IBindCtx pbc) = 0;
595
596	};
597
598	typedef
599	enum tagOLERENDER
600	{ OLERENDER_NONE = 0,
601	OLERENDER_DRAW = 1,
602	OLERENDER_FORMAT = 2,
603	OLERENDER_ASIS = 3
604	} OLERENDER;
605
606	typedef OLERENDER *LPOLERENDER;
607
608	typedef struct tagOBJECTDESCRIPTOR
609	{
610	ULONG cbSize;
611	CLSID clsid;
612	DWORD dwDrawAspect;
613	SIZEL sizel;
614	POINTL pointl;
615	DWORD dwStatus;
616	DWORD dwFullUserTypeName;
617	DWORD dwSrcOfCopy;
618	} OBJECTDESCRIPTOR;
619
620	typedef struct tagOBJECTDESCRIPTOR *POBJECTDESCRIPTOR;
621
622	typedef struct tagOBJECTDESCRIPTOR *LPOBJECTDESCRIPTOR;
623
624	typedef struct tagOBJECTDESCRIPTOR LINKSRCDESCRIPTOR;
625
626	typedef struct tagOBJECTDESCRIPTOR *PLINKSRCDESCRIPTOR;
627
628	typedef struct tagOBJECTDESCRIPTOR *LPLINKSRCDESCRIPTOR;
629
630	#endif
505		631
506	#endif //_StarObject_H_	632	#endif //_StarObject_H_

Lines 628-634 Link Here

(-)oo_1.1.1_src/soltools/ldump/ldump.cxx.orig (-1 / +1 lines)
628	*********************************************************************/	628	*********************************************************************/
629		629
630		630
631	usage()	631	int usage()
632	{	632	{
633	LibDump::DumpError(99);	633	LibDump::DumpError(99);
634	exit(0);	634	exit(0);

Lines 270-279 Link Here

(-)oo_1.1.1_src/stlport/STLport-4.5.patch.orig
270	CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -g	270	CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -g
271	CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -g -fPIC	271	CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -g -fPIC
272	*** misc/STLport-4.5/stlport/config/stl_gcc.h Tue Sep 4 19:10:16 2001	272	*** misc/STLport-4.5/stlport/config/stl_gcc.h Tue Sep 4 19:10:16 2001




  
  
  # if defined(__BEOS__) && defined(__INTEL__)
--- 117,139 ----
  #  define _STLP_NATIVE_CPP_C_HEADER(header) <../g++/##header##>
  #  define _STLP_NATIVE_OLD_STREAMS_HEADER(header) <../g++/##header##>
  #  define _STLP_NATIVE_CPP_RUNTIME_HEADER(header) <../g++/##header##>

  
  # elif (__GNUC_MINOR__ < 8)
  
--- 262,286 ----
  
  # if (__GNUC__ >= 3)
  

  # define _STLP_MUTEX_INITIALIZER
  # endif
  
--- misc/build/STLport-4.5/src/gcc-3.0-mingw.mak.orig	2003-12-14 22:00:00.000000000 +0900


..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*
..\%__SRC%\lib\*.so %_DEST%\lib%_EXT%\*
..\%__SRC%\lib\*.a %_DEST%\lib%_EXT%\*
..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib

..\%__SRC%\bin\*.rdb %_DEST%\rdb%_EXT%\*

Lines 40-45 Link Here

(-)oo_1.1.1_src/svtools/prj/d.lst.orig (+2 lines)
40	..\%__SRC%\misc\svt?????.map %_DEST%\bin%_EXT%\svt?????.map	40	..\%__SRC%\misc\svt?????.map %_DEST%\bin%_EXT%\svt?????.map
41	..\%__SRC%\lib\libsvt?????.so %_DEST%\lib%_EXT%\*	41	..\%__SRC%\lib\libsvt?????.so %_DEST%\lib%_EXT%\*
42	..\%__SRC%\lib\libsvl?????.so %_DEST%\lib%_EXT%\*	42	..\%__SRC%\lib\libsvl?????.so %_DEST%\lib%_EXT%\*
		43	..\%__SRC%\lib\libsvt?????.a %_DEST%\lib%_EXT%\*
		44	..\%__SRC%\lib\libsvl?????.a %_DEST%\lib%_EXT%\*
43	..\%__SRC%\lib\libsv.dylib %_DEST%\lib%_EXT%\	45	..\%__SRC%\lib\libsv.dylib %_DEST%\lib%_EXT%\
44	..\%__SRC%\misc\svtools.hid %_DEST%\bin%_EXT%\svtools.hid	46	..\%__SRC%\misc\svtools.hid %_DEST%\bin%_EXT%\svtools.hid
45	..\%__SRC%\inc\svtools\proped.hxx %_DEST%\inc%_EXT%\svtools\proped.hxx	47	..\%__SRC%\inc\svtools\proped.hxx %_DEST%\inc%_EXT%\svtools\proped.hxx

Lines 59-69 Link Here

(-)oo_1.1.1_src/svtools/source/filter.vcl/jpeg/jpeg.cxx.orig (-5 / +5 lines)
59	*	59	*
60	************************************************************************/	60	************************************************************************/
61		61
62	extern "C"
63	{
64	#include "jpeg.h"
65	}
66
67	#define _JPEGPRIVATE	62	#define _JPEGPRIVATE
68		63
69	#include <tools/new.hxx>	64	#include <tools/new.hxx>
Lines 72-77 Link Here
72	#include "FilterConfigItem.hxx"	67	#include "FilterConfigItem.hxx"
73	#include "filter.hxx"	68	#include "filter.hxx"
74		69
		70	extern "C"
		71	{
		72	#include "jpeg.h"
		73	}
		74
75	// -----------	75	// -----------
76	// - Defines -	76	// - Defines -
77	// -----------	77	// -----------





	bool bRet = false;

//	OLECHAR sz[100];
//	BSTR aBStr = SysAllocString( sz );
	BSTR aBStr;
//	if( aBStr != NULL )
//	{
		HRESULT hResult = VarBstrFromDec( &maDec, nLANGID, 0, &aBStr );
		bRet = ( hResult == S_OK );
		if( bRet )

					i++;
				}
			}
#ifdef __MINGW32__
			rString = String(reinterpret_cast< sal_Unicode * >(aBStr));
#else
			rString = aBStr;
#endif
		}

		SysFreeString( aBStr );
//	}
	return bRet;
#else
	return false;

Lines 68-74 Link Here

(-)oo_1.1.1_src/svtools/source/sbx/sbxdec.hxx.orig (+2 lines)
68	#include <tools/prewin.h>	68	#include <tools/prewin.h>
69	} // close extern "C" {	69	} // close extern "C" {
70		70
		71	#ifndef __MINGW32__
71	#include <comutil.h>	72	#include <comutil.h>
		73	#endif
72	#include <oleauto.h>	74	#include <oleauto.h>
73		75
74	extern "C" { // reopen extern "C" {	76	extern "C" { // reopen extern "C" {

Lines 240-246 Link Here

(-)oo_1.1.1_src/svtools/source/svdde/ddedata.cxx.orig (+4 lines)
240	TCHAR szName[ 256 ];	240	TCHAR szName[ 256 ];
241		241
242	if( GetClipboardFormatName( nFmt, szName, sizeof(szName) ) )	242	if( GetClipboardFormatName( nFmt, szName, sizeof(szName) ) )
		243	#ifdef __MINGW32__
		244	nFmt = SotExchange::RegisterFormatName( String(reinterpret_cast< unsigned short int * >(szName)) );
		245	#else
243	nFmt = SotExchange::RegisterFormatName( String(szName) );	246	nFmt = SotExchange::RegisterFormatName( String(szName) );
		247	#endif
244	}	248	}
245	#endif	249	#endif
246	#if defined(PM2)	250	#if defined(PM2)

Lines 136-142 Link Here

(-)oo_1.1.1_src/svtools/source/svdde/ddeinf.cxx.orig (+12 lines)
136	p++ = '\|'; p = 0;	136	p++ = '\|'; p = 0;
137	DdeQueryString( hDdeInst, aInf.hszTopic, p, sizeof(buf)/sizeof(TCHAR)-lstrlen( buf ),	137	DdeQueryString( hDdeInst, aInf.hszTopic, p, sizeof(buf)/sizeof(TCHAR)-lstrlen( buf ),
138	CP_WINUNICODE );	138	CP_WINUNICODE );
		139	#ifdef __MINGW32__
		140	aServices.Insert( new String( reinterpret_cast< unsigned short int * >(buf) ) );
		141	#else
139	aServices.Insert( new String( buf ) );	142	aServices.Insert( new String( buf ) );
		143	#endif
140	}	144	}
141	}	145	}
142	DdeDisconnectList( hConvList );	146	DdeDisconnectList( hConvList );
Lines 164-174 Link Here
164		168
165	DdeTopicList::DdeTopicList( const String& rService )	169	DdeTopicList::DdeTopicList( const String& rService )
166	{	170	{
		171	#ifdef __MINGW32__
		172	DdeConnection aSys( rService, String( reinterpret_cast< unsigned short int * >(SZDDESYS_TOPIC) ) );
		173	#else
167	DdeConnection aSys( rService, String( SZDDESYS_TOPIC ) );	174	DdeConnection aSys( rService, String( SZDDESYS_TOPIC ) );
		175	#endif
168		176
169	if ( !aSys.GetError() )	177	if ( !aSys.GetError() )
170	{	178	{
		179	#ifdef __MINGW32__
		180	DdeRequest aReq( aSys, String( reinterpret_cast< unsigned short int * >(SZDDESYS_ITEM_TOPICS) ), 500 );
		181	#else
171	DdeRequest aReq( aSys, String( SZDDESYS_ITEM_TOPICS ), 500 );	182	DdeRequest aReq( aSys, String( SZDDESYS_ITEM_TOPICS ), 500 );
		183	#endif
172	aReq.SetDataHdl( LINK( this, DdeTopicList, Data ) );	184	aReq.SetDataHdl( LINK( this, DdeTopicList, Data ) );
173	aReq.Execute();	185	aReq.Execute();
174	}	186	}

Lines 147-153 Link Here

(-)oo_1.1.1_src/svtools/source/svdde/ddesvr.cxx.orig (+50 lines)
147	while( STRING_NOTFOUND != n )	147	while( STRING_NOTFOUND != n )
148	{	148	{
149	String s( sTopics.GetToken( 0, '\t', n ));	149	String s( sTopics.GetToken( 0, '\t', n ));
		150	#ifdef __MINGW32__
		151	if( s == reinterpret_cast< unsigned short int * >(chTopicBuf) )
		152	#else
150	if( s == chTopicBuf )	153	if( s == chTopicBuf )
		154	#endif
151	++nTopics;	155	++nTopics;
152	}	156	}
153	}	157	}
Lines 201-207 Link Here
201	{	205	{
202	String s( sTopics.GetToken( 0, '\t', n ));	206	String s( sTopics.GetToken( 0, '\t', n ));
203	s.EraseAllChars( '\n' ).EraseAllChars( '\r' );	207	s.EraseAllChars( '\n' ).EraseAllChars( '\r' );
		208	#ifdef __MINGW32__
		209	if( !hText1 \|\| s == reinterpret_cast< unsigned short int * >(chTopicBuf) )
		210	#else
204	if( !hText1 \|\| s == chTopicBuf )	211	if( !hText1 \|\| s == chTopicBuf )
		212	#endif
205	{	213	{
206	DdeString aDStr( pInst->hDdeInstSvr, s );	214	DdeString aDStr( pInst->hDdeInstSvr, s );
207	pTopic = FindTopic( *pService, (HSZ)aDStr );	215	pTopic = FindTopic( *pService, (HSZ)aDStr );
Lines 303-308 Link Here
303	String aRes; // darf erst am Ende freigegeben werden!!	311	String aRes; // darf erst am Ende freigegeben werden!!
304	if ( pTopic->IsSystemTopic() )	312	if ( pTopic->IsSystemTopic() )
305	{	313	{
		314	#ifdef __MINGW32__
		315	if ( pTopic->aItem == reinterpret_cast< const unsigned short int * >(SZDDESYS_ITEM_TOPICS) )
		316	aRes = pService->Topics();
		317	else if ( pTopic->aItem == reinterpret_cast< const unsigned short int * >(SZDDESYS_ITEM_SYSITEMS) )
		318	aRes = pService->SysItems();
		319	else if ( pTopic->aItem == reinterpret_cast< const unsigned short int * >(SZDDESYS_ITEM_STATUS) )
		320	aRes = pService->Status();
		321	else if ( pTopic->aItem == reinterpret_cast< const unsigned short int * >(SZDDESYS_ITEM_FORMATS) )
		322	aRes = pService->Formats();
		323	else if ( pTopic->aItem == reinterpret_cast< const unsigned short int * >(SZDDESYS_ITEM_HELP) )
		324	#else
306	if ( pTopic->aItem == SZDDESYS_ITEM_TOPICS )	325	if ( pTopic->aItem == SZDDESYS_ITEM_TOPICS )
307	aRes = pService->Topics();	326	aRes = pService->Topics();
308	else if ( pTopic->aItem == SZDDESYS_ITEM_SYSITEMS )	327	else if ( pTopic->aItem == SZDDESYS_ITEM_SYSITEMS )
Lines 312-317 Link Here
312	else if ( pTopic->aItem == SZDDESYS_ITEM_FORMATS )	331	else if ( pTopic->aItem == SZDDESYS_ITEM_FORMATS )
313	aRes = pService->Formats();	332	aRes = pService->Formats();
314	else if ( pTopic->aItem == SZDDESYS_ITEM_HELP )	333	else if ( pTopic->aItem == SZDDESYS_ITEM_HELP )
		334	#endif
315	aRes = pService->GetHelp();	335	aRes = pService->GetHelp();
316	else	336	else
317	aRes = pService->SysTopicGet( pTopic->aItem );	337	aRes = pService->SysTopicGet( pTopic->aItem );
Lines 455-461 Link Here
455	// dann befragen wir doch mal unsere Ableitung:	475	// dann befragen wir doch mal unsere Ableitung:
456	TCHAR chBuf[250];	476	TCHAR chBuf[250];
457	DdeQueryString(pInst->hDdeInstSvr,hTopic,chBuf,sizeof(chBuf)/sizeof(TCHAR),CP_WINUNICODE );	477	DdeQueryString(pInst->hDdeInstSvr,hTopic,chBuf,sizeof(chBuf)/sizeof(TCHAR),CP_WINUNICODE );
		478	#ifdef __MINGW32__
		479	bWeiter = rService.MakeTopic( reinterpret_cast< const unsigned short int * >(chBuf) );
		480	#else
458	bWeiter = rService.MakeTopic( chBuf );	481	bWeiter = rService.MakeTopic( chBuf );
		482	#endif
459	// dann muessen wir noch mal suchen	483	// dann muessen wir noch mal suchen
460	} while( bWeiter );	484	} while( bWeiter );
461		485
Lines 485-491 Link Here
485	// dann befragen wir doch mal unsere Ableitung:	509	// dann befragen wir doch mal unsere Ableitung:
486	TCHAR chBuf[250];	510	TCHAR chBuf[250];
487	DdeQueryString(pInst->hDdeInstSvr,hItem,chBuf,sizeof(chBuf)/sizeof(TCHAR),CP_WINUNICODE );	511	DdeQueryString(pInst->hDdeInstSvr,hItem,chBuf,sizeof(chBuf)/sizeof(TCHAR),CP_WINUNICODE );
		512	#ifdef __MINGW32__
		513	bWeiter = rTopic.MakeItem( reinterpret_cast< unsigned short int * >(chBuf) );
		514	#else
488	bWeiter = rTopic.MakeItem( chBuf );	515	bWeiter = rTopic.MakeItem( chBuf );
		516	#endif
489	// dann muessen wir noch mal suchen	517	// dann muessen wir noch mal suchen
490	} while( bWeiter );	518	} while( bWeiter );
491		519
Lines 526-537 Link Here
526	nStatus = DMLERR_SYS_ERROR;	554	nStatus = DMLERR_SYS_ERROR;
527		555
528	AddFormat( FORMAT_STRING );	556	AddFormat( FORMAT_STRING );
		557	#ifdef __MINGW32__
		558	pSysTopic = new DdeTopic( reinterpret_cast< const unsigned short int * >(SZDDESYS_TOPIC) );
		559	pSysTopic->AddItem( DdeItem( reinterpret_cast< const unsigned short int * >(SZDDESYS_ITEM_TOPICS) ) );
		560	pSysTopic->AddItem( DdeItem( reinterpret_cast< const unsigned short int * >(SZDDESYS_ITEM_SYSITEMS) ) );
		561	pSysTopic->AddItem( DdeItem( reinterpret_cast< const unsigned short int * >(SZDDESYS_ITEM_STATUS) ) );
		562	pSysTopic->AddItem( DdeItem( reinterpret_cast< const unsigned short int * >(SZDDESYS_ITEM_FORMATS) ) );
		563	pSysTopic->AddItem( DdeItem( reinterpret_cast< const unsigned short int * >(SZDDESYS_ITEM_HELP) ) );
		564	#else
529	pSysTopic = new DdeTopic( SZDDESYS_TOPIC );	565	pSysTopic = new DdeTopic( SZDDESYS_TOPIC );
530	pSysTopic->AddItem( DdeItem( SZDDESYS_ITEM_TOPICS ) );	566	pSysTopic->AddItem( DdeItem( SZDDESYS_ITEM_TOPICS ) );
531	pSysTopic->AddItem( DdeItem( SZDDESYS_ITEM_SYSITEMS ) );	567	pSysTopic->AddItem( DdeItem( SZDDESYS_ITEM_SYSITEMS ) );
532	pSysTopic->AddItem( DdeItem( SZDDESYS_ITEM_STATUS ) );	568	pSysTopic->AddItem( DdeItem( SZDDESYS_ITEM_STATUS ) );
533	pSysTopic->AddItem( DdeItem( SZDDESYS_ITEM_FORMATS ) );	569	pSysTopic->AddItem( DdeItem( SZDDESYS_ITEM_FORMATS ) );
534	pSysTopic->AddItem( DdeItem( SZDDESYS_ITEM_HELP ) );	570	pSysTopic->AddItem( DdeItem( SZDDESYS_ITEM_HELP ) );
		571	#endif
535	AddTopic( *pSysTopic );	572	AddTopic( *pSysTopic );
536	}	573	}
537		574
Lines 683-689 Link Here
683		720
684	BOOL DdeTopic::IsSystemTopic()	721	BOOL DdeTopic::IsSystemTopic()
685	{	722	{
		723	#ifdef __MINGW32__
		724	return BOOL (GetName() == reinterpret_cast< const unsigned short int * >(SZDDESYS_TOPIC));
		725	#else
686	return BOOL (GetName() == SZDDESYS_TOPIC);	726	return BOOL (GetName() == SZDDESYS_TOPIC);
		727	#endif
687	}	728	}
688		729
689	// --- DdeTopic::AddItem() -----------------------------------------	730	// --- DdeTopic::AddItem() -----------------------------------------
Lines 1049-1056 Link Here
1049	{	1090	{
1050	String s;	1091	String s;
1051	long f;	1092	long f;
		1093	#ifdef __MINGW32__
		1094	unsigned short int buf[128];
		1095	const unsigned short int * p;
		1096	#else
1052	TCHAR buf[128];	1097	TCHAR buf[128];
1053	LPCTSTR p;	1098	LPCTSTR p;
		1099	#endif
1054	short n = 0;	1100	short n = 0;
1055		1101
1056	for ( f = aFormats.First(); f; f = aFormats.Next(), n++ )	1102	for ( f = aFormats.First(); f; f = aFormats.Next(), n++ )
Lines 1087-1094 Link Here
1087	p= String::CreateFromAscii("PRIVATE").GetBuffer();	1133	p= String::CreateFromAscii("PRIVATE").GetBuffer();
1088	#else	1134	#else
1089	default:	1135	default:
		1136	#ifdef __MINGW32__
		1137	GetClipboardFormatName( (UINT)f, reinterpret_cast< LPTSTR >(buf), sizeof(buf) / sizeof(TCHAR) );
		1138	#else
1090	GetClipboardFormatName( (UINT)f, buf, sizeof(buf) / sizeof(TCHAR) );	1139	GetClipboardFormatName( (UINT)f, buf, sizeof(buf) / sizeof(TCHAR) );
1091	#endif	1140	#endif
		1141	#endif
1092	}	1142	}
1093	s += String( p );	1143	s += String( p );
1094	}	1144	}

Lines 120-126 Link Here

(-)oo_1.1.1_src/sw/source/core/sw3io/sw3field.cxx.orig (-1 / +1 lines)
120	#include "poolfmt.hxx" // fuer InSetExpField	120	#include "poolfmt.hxx" // fuer InSetExpField
121	#include "poolfmt.hrc" // fuer InSetExpField	121	#include "poolfmt.hrc" // fuer InSetExpField
122		122
123	#if !defined(UNX) && !defined(MSC) && !defined(PPC) && !defined(CSET) && !defined(__MWERKS__) && !defined(WTC)	123	#if !defined(UNX) && !defined(MSC) && !defined(PPC) && !defined(CSET) && !defined(__MWERKS__) && !defined(WTC) && !defined(__MINGW32__)
124		124
125	#define FIELDFNTAB_SIZE 37	125	#define FIELDFNTAB_SIZE 37
126	#if FIELDFNTAB_SIZE != RES_FIELDS_END - RES_FIELDS_BEGIN	126	#if FIELDFNTAB_SIZE != RES_FIELDS_END - RES_FIELDS_BEGIN

Lines 259-265 Link Here

(-)oo_1.1.1_src/sw/source/filter/html/css1atr.cxx.orig (-1 / +1 lines)
259	* diese Section und die dazugeherigen Tabellen muessen in folgenden Files	259	* diese Section und die dazugeherigen Tabellen muessen in folgenden Files
260	* gepflegt werden: rtf\rtfatr.cxx, sw6\sw6atr.cxx, w4w\w4watr.cxx	260	* gepflegt werden: rtf\rtfatr.cxx, sw6\sw6atr.cxx, w4w\w4watr.cxx
261	*/	261	*/
262	#if !defined(UNX) && !defined(MSC) && !defined(PPC) && !defined(CSET) && !defined(__MWERKS__) && !defined(WTC)	262	#if !defined(UNX) && !defined(MSC) && !defined(PPC) && !defined(CSET) && !defined(__MWERKS__) && !defined(WTC) && !defined(__MINGW32__)
263		263
264	#define ATTRFNTAB_SIZE 130	264	#define ATTRFNTAB_SIZE 130
265	#if ATTRFNTAB_SIZE != POOLATTR_END - POOLATTR_BEGIN	265	#if ATTRFNTAB_SIZE != POOLATTR_END - POOLATTR_BEGIN

Lines 257-263 Link Here

(-)oo_1.1.1_src/sw/source/filter/html/htmlatr.cxx.orig (-1 / +1 lines)
257	* diese Section und die dazugeherigen Tabellen muessen in folgenden Files	257	* diese Section und die dazugeherigen Tabellen muessen in folgenden Files
258	* gepflegt werden: rtf\rtfatr.cxx, sw6\sw6atr.cxx, w4w\w4watr.cxx	258	* gepflegt werden: rtf\rtfatr.cxx, sw6\sw6atr.cxx, w4w\w4watr.cxx
259	*/	259	*/
260	#if !defined(UNX) && !defined(MSC) && !defined(PPC) && !defined(CSET) && !defined(__MWERKS__) && !defined(WTC)	260	#if !defined(UNX) && !defined(MSC) && !defined(PPC) && !defined(CSET) && !defined(__MWERKS__) && !defined(WTC) && !defined(__MINGW32__)
261		261
262	#define ATTRFNTAB_SIZE 130	262	#define ATTRFNTAB_SIZE 130
263	#if ATTRFNTAB_SIZE != POOLATTR_END - POOLATTR_BEGIN	263	#if ATTRFNTAB_SIZE != POOLATTR_END - POOLATTR_BEGIN

Lines 374-380 Link Here

(-)oo_1.1.1_src/sw/source/filter/rtf/rtfatr.cxx.orig (-1 / +1 lines)
374	* diese Section und die dazugeherigen Tabellen muessen in folgenden Files	374	* diese Section und die dazugeherigen Tabellen muessen in folgenden Files
375	* gepflegt werden: rtf\rtfatr.cxx, sw6\sw6atr.cxx, w4w\w4watr.cxx	375	* gepflegt werden: rtf\rtfatr.cxx, sw6\sw6atr.cxx, w4w\w4watr.cxx
376	*/	376	*/
377	#if !defined(UNX) && !defined(MSC) && !defined(PPC) && !defined(CSET) && !defined(__MWERKS__) && !defined(WTC)	377	#if !defined(UNX) && !defined(MSC) && !defined(PPC) && !defined(CSET) && !defined(__MWERKS__) && !defined(WTC) && !defined(__MINGW32__)
378		378
379	#define ATTRFNTAB_SIZE 130	379	#define ATTRFNTAB_SIZE 130
380	#if ATTRFNTAB_SIZE != POOLATTR_END - POOLATTR_BEGIN	380	#if ATTRFNTAB_SIZE != POOLATTR_END - POOLATTR_BEGIN

Lines 219-225 Link Here

(-)oo_1.1.1_src/sw/source/filter/w4w/w4watr.cxx.orig (-1 / +1 lines)
219	* gepflegt werden: rtf\rtfatr.cxx, sw6\sw6atr.cxx, w4w\w4watr.cxx	219	* gepflegt werden: rtf\rtfatr.cxx, sw6\sw6atr.cxx, w4w\w4watr.cxx
220	*/	220	*/
221		221
222	#if !defined(MSC) && !defined(UNX) && !defined(PPC) && !defined(CSET) && !defined(__MWERKS__) && !defined(WTC)	222	#if !defined(MSC) && !defined(UNX) && !defined(PPC) && !defined(CSET) && !defined(__MWERKS__) && !defined(WTC) && !defined(__MINGW32__)
223		223
224	#define ATTRFNTAB_SIZE 130	224	#define ATTRFNTAB_SIZE 130
225	#if ATTRFNTAB_SIZE != POOLATTR_END - POOLATTR_BEGIN	225	#if ATTRFNTAB_SIZE != POOLATTR_END - POOLATTR_BEGIN

Lines 355-361 Link Here

(-)oo_1.1.1_src/sw/source/filter/ww8/ww8atr.cxx.orig (-1 / +1 lines)
355	* gepflegt werden: rtf\rtfatr.cxx, sw6\sw6atr.cxx, w4w\w4watr.cxx	355	* gepflegt werden: rtf\rtfatr.cxx, sw6\sw6atr.cxx, w4w\w4watr.cxx
356	*/	356	*/
357		357
358	#if !defined(MSC) && !defined(UNX) && !defined(PPC) && !defined(CSET) && !defined(__MWERKS__) && !defined(WTC)	358	#if !defined(MSC) && !defined(UNX) && !defined(PPC) && !defined(CSET) && !defined(__MWERKS__) && !defined(WTC) && !defined(__MINGW32__)
359		359
360	#define ATTRFNTAB_SIZE 130	360	#define ATTRFNTAB_SIZE 130
361	#if ATTRFNTAB_SIZE != POOLATTR_END - POOLATTR_BEGIN	361	#if ATTRFNTAB_SIZE != POOLATTR_END - POOLATTR_BEGIN

Lines 1-2 Link Here

(-)oo_1.1.1_src/testtools/prj/d.lst.orig (+1 lines)
1	..\%__SRC%\bin\.dll %_DEST%\bin%_EXT%\	1	..\%__SRC%\bin\.dll %_DEST%\bin%_EXT%\
2	..\%__SRC%\lib\.so %_DEST%\lib%_EXT%\	2	..\%__SRC%\lib\.so %_DEST%\lib%_EXT%\
		3	..\%__SRC%\lib\.a %_DEST%\lib%_EXT%\

Lines 101-107 Link Here

(-)oo_1.1.1_src/tools/inc/solar.h.orig (-1 / +1 lines)
101	typedef char INT8;	101	typedef char INT8;
102	typedef unsigned char UINT8;	102	typedef unsigned char UINT8;
103	#else	103	#else
104	#if !defined(_MSC_VER) \|\| defined(_MSC_VER) && (_MSC_VER < 1200) \|\| (_MSC_VER >= 1200 ) && !defined(VCL_NEED_BASETSD )	104	#if !defined(__MINGW32__) && !defined(_MSC_VER) \|\| defined(_MSC_VER) && (_MSC_VER < 1200) \|\| ( (_MSC_VER >= 1200 ) \|\| defined(__MINGW32__) ) && !defined(VCL_NEED_BASETSD )
105	typedef void INT64;	105	typedef void INT64;
106	typedef void UINT64;	106	typedef void UINT64;
107	typedef long INT32;	107	typedef long INT32;




        DIR      *pDir = opendir( (char*) aPathName.GetBuffer() );
        if ( pDir )
        {
#ifdef __MINGW32__
#ifndef BOOTSTRAP
                String temp(CMP_LOWER( aName ), osl_getThreadTextEncoding());
#else
                String temp(CMP_LOWER( aName ), gsl_getSystemTextEncoding());
#endif
                WildCard aWildeKarte( temp );		
#else
#ifndef BOOTSTRAP
                WildCard aWildeKarte( String(CMP_LOWER( aName ), osl_getThreadTextEncoding()) );
#else
                WildCard aWildeKarte( String(CMP_LOWER( aName ), gsl_getSystemTextEncoding()) );
#endif
#endif
                for ( dirent* pEntry = readdir( pDir );
                          pEntry;
                          pEntry = readdir( pDir ) )

            /* Prefix can have 5 chars, leaving 3 for numbers.
               26 ** 3 == 17576
             */
#if (defined (MSC) || defined (BLC) || defined(ICC) || defined(__MINGW32__)) && ( defined (WIN) || defined (WNT))
            static unsigned long u = GetTickCount();
#else
            static unsigned long u = clock();

            ( aNewName += '.' ) += aExt;
        operator+=( DirEntry(String(aNewName, osl_getThreadTextEncoding())) );
        if ( FSYS_KIND_ALL == eKind && CMP_LOWER(aName) == aOldName )
#ifdef __MINGW32__
	{
		ByteString temp(GetName(), osl_getThreadTextEncoding());
	        if ( FSYS_KIND_ALL == eKind && CMP_LOWER(temp) == aOldName )
         	   return TRUE;
	}
#else
        if ( FSYS_KIND_ALL == eKind && CMP_LOWER(ByteString(GetName(), osl_getThreadTextEncoding())) == aOldName )
            return TRUE;
#endif

        // kann der gek"urzte Name direkt verwendet werden?
        if ( !Exists() && (ERRCODE_NONE == CreateEntry_Impl( *this, eKind )) )

Lines 112-118 Link Here

(-)oo_1.1.1_src/tools/symbol/symbol.cxx.orig (+8 lines)
112		112
113	pMap[nSize] = '\0';	113	pMap[nSize] = '\0';
114	#else	114	#else
		115	#ifdef __MINGW32__
		116	SvFileStream aMap( String( *(argv+1), gsl_getSystemTextEncoding()), STREAM_READ ); // gcc bug??
		117	#else
115	SvFileStream aMap( String( argv[1], gsl_getSystemTextEncoding()), STREAM_READ );	118	SvFileStream aMap( String( argv[1], gsl_getSystemTextEncoding()), STREAM_READ );
		119	#endif
116		120
117	nSize = aMap.Seek( STREAM_SEEK_TO_END );	121	nSize = aMap.Seek( STREAM_SEEK_TO_END );
118	if( aMap.GetError() )	122	if( aMap.GetError() )
Lines 159-165 Link Here
159	if( n != nLines )	163	if( n != nLines )
160	return Error( 5, "n", n );	164	return Error( 5, "n", n );
161		165
		166	#ifdef __MINGW32__
		167	SvFileStream aLeak( String( *(argv+2), gsl_getSystemTextEncoding()), STREAM_READ );
		168	#else
162	SvFileStream aLeak( String( argv[2], gsl_getSystemTextEncoding()), STREAM_READ );	169	SvFileStream aLeak( String( argv[2], gsl_getSystemTextEncoding()), STREAM_READ );
		170	#endif
163	ByteString aLine;	171	ByteString aLine;
164		172
165	aLeak.ReadLine( aLine );	173	aLeak.ReadLine( aLine );

Lines 18-23 Link Here

(-)oo_1.1.1_src/ucb/prj/d.lst.orig (+1 lines)
18		18
19	..\%__SRC%\bin\ucp.dll %_DEST%\bin%_EXT%\ucp.dll	19	..\%__SRC%\bin\ucp.dll %_DEST%\bin%_EXT%\ucp.dll
20	..\%__SRC%\lib\libucp.so %_DEST%\lib%_EXT%\libucp.so	20	..\%__SRC%\lib\libucp.so %_DEST%\lib%_EXT%\libucp.so
		21	..\%__SRC%\lib\libucp.a %_DEST%\lib%_EXT%\libucp.a
21	..\%__SRC%\lib\libucp.dylib %_DEST%\lib%_EXT%\libucp.dylib	22	..\%__SRC%\lib\libucp.dylib %_DEST%\lib%_EXT%\libucp.dylib
22	..\%__SRC%\misc\ucp.map %_DEST%\bin%_EXT%\ucp.map	23	..\%__SRC%\misc\ucp.map %_DEST%\bin%_EXT%\ucp.map
23	..\%__SRC%\misc\ucp.sym %_DEST%\bin%_EXT%\ucp.sym	24	..\%__SRC%\misc\ucp.sym %_DEST%\bin%_EXT%\ucp.sym

Lines 76-81 Link Here

(-)oo_1.1.1_src/ucb/source/inc/regexpmap.tpt.orig (-9 / +15 lines)
76	#include "regexp.hxx"	76	#include "regexp.hxx"
77	#endif	77	#endif
78		78
		79	#if defined(_MSC_VER) && (_MSC_VER >= 1310)
		80	#define TYPENAME_ON_RETURN_TYPE typename
		81	#else
		82	#define TYPENAME_ON_RETURN_TYPE
		83	#endif
		84
79	namespace unnamed_ucb_regexpmap {} using namespace unnamed_ucb_regexpmap;	85	namespace unnamed_ucb_regexpmap {} using namespace unnamed_ucb_regexpmap;
80	// unnamed namespaces don't work well yet...	86	// unnamed namespaces don't work well yet...
81		87
Lines 112-118 Link Here
112	{	118	{
113	public:	119	public:
114	typedef RegexpMapImpl< Val > MapImpl;	120	typedef RegexpMapImpl< Val > MapImpl;
115	typedef List< Val >::iterator ListIterator;	121	typedef TYPENAME_ON_RETURN_TYPE List< Val >::iterator ListIterator;
116	// Solaris needs these for the ctor...	122	// Solaris needs these for the ctor...
117		123
118	inline RegexpMapIterImpl();	124	inline RegexpMapIterImpl();
Lines 128-134 Link Here
128		134
129	int getList() const { return m_nList; }	135	int getList() const { return m_nList; }
130		136
131	List< Val >::iterator const & getIndex() const { return m_aIndex; }	137	TYPENAME_ON_RETURN_TYPE List< Val >::iterator const & getIndex() const { return m_aIndex; }
132		138
133	void next();	139	void next();
134		140
Lines 136-142 Link Here
136		142
137	private:	143	private:
138	mutable RegexpMapEntry< Val > m_aEntry;	144	mutable RegexpMapEntry< Val > m_aEntry;
139	List< Val >::iterator m_aIndex;	145	TYPENAME_ON_RETURN_TYPE List< Val >::iterator m_aIndex;
140	RegexpMapImpl< Val > * m_pMap;	146	RegexpMapImpl< Val > * m_pMap;
141	int m_nList;	147	int m_nList;
142	mutable bool m_bEntrySet;	148	mutable bool m_bEntrySet;
Lines 474-480 Link Here
474		480
475	//============================================================================	481	//============================================================================
476	template< typename Val >	482	template< typename Val >
477	RegexpMap< Val >::iterator RegexpMap< Val >::find(rtl::OUString const & rKey,	483	TYPENAME_ON_RETURN_TYPE RegexpMap< Val >::iterator RegexpMap< Val >::find(rtl::OUString const & rKey,
478	rtl::OUString * pReverse)	484	rtl::OUString * pReverse)
479	{	485	{
480	Regexp aRegexp(Regexp::parse(rKey));	486	Regexp aRegexp(Regexp::parse(rKey));
Lines 523-536 Link Here
523		529
524	//============================================================================	530	//============================================================================
525	template< typename Val >	531	template< typename Val >
526	RegexpMap< Val >::iterator RegexpMap< Val >::begin()	532	TYPENAME_ON_RETURN_TYPE RegexpMap< Val >::iterator RegexpMap< Val >::begin()
527	{	533	{
528	return RegexpMapIter< Val >(new RegexpMapIterImpl< Val >(m_pImpl, true));	534	return RegexpMapIter< Val >(new RegexpMapIterImpl< Val >(m_pImpl, true));
529	}	535	}
530		536
531	//============================================================================	537	//============================================================================
532	template< typename Val >	538	template< typename Val >
533	RegexpMap< Val >::const_iterator RegexpMap< Val >::begin() const	539	TYPENAME_ON_RETURN_TYPE RegexpMap< Val >::const_iterator RegexpMap< Val >::begin() const
534	{	540	{
535	return RegexpMapConstIter< Val >(new RegexpMapIterImpl< Val >(m_pImpl,	541	return RegexpMapConstIter< Val >(new RegexpMapIterImpl< Val >(m_pImpl,
536	true));	542	true));
Lines 538-551 Link Here
538		544
539	//============================================================================	545	//============================================================================
540	template< typename Val >	546	template< typename Val >
541	RegexpMap< Val >::iterator RegexpMap< Val >::end()	547	TYPENAME_ON_RETURN_TYPE RegexpMap< Val >::iterator RegexpMap< Val >::end()
542	{	548	{
543	return RegexpMapIter< Val >(new RegexpMapIterImpl< Val >(m_pImpl, false));	549	return RegexpMapIter< Val >(new RegexpMapIterImpl< Val >(m_pImpl, false));
544	}	550	}
545		551
546	//============================================================================	552	//============================================================================
547	template< typename Val >	553	template< typename Val >
548	RegexpMap< Val >::const_iterator RegexpMap< Val >::end() const	554	TYPENAME_ON_RETURN_TYPE RegexpMap< Val >::const_iterator RegexpMap< Val >::end() const
549	{	555	{
550	return RegexpMapConstIter< Val >(new RegexpMapIterImpl< Val >(m_pImpl,	556	return RegexpMapConstIter< Val >(new RegexpMapIterImpl< Val >(m_pImpl,
551	false));	557	false));
Lines 563-569 Link Here
563		569
564	//============================================================================	570	//============================================================================
565	template< typename Val >	571	template< typename Val >
566	RegexpMap< Val >::size_type RegexpMap< Val >::size() const	572	TYPENAME_ON_RETURN_TYPE RegexpMap< Val >::size_type RegexpMap< Val >::size() const
567	{	573	{
568	return (m_pImpl->m_pDefault ? 1 : 0)	574	return (m_pImpl->m_pDefault ? 1 : 0)
569	+ m_pImpl->m_aList[Regexp::KIND_PREFIX].size()	575	+ m_pImpl->m_aList[Regexp::KIND_PREFIX].size()

Lines 1-5 Link Here

(-)oo_1.1.1_src/ucbhelper/prj/d.lst.orig (+1 lines)
1	..\%__SRC%\bin\.dll %_DEST%\bin%_EXT%\.dll	1	..\%__SRC%\bin\.dll %_DEST%\bin%_EXT%\.dll
2	..\%__SRC%\lib\lib.so %_DEST%\lib%_EXT%\lib.so	2	..\%__SRC%\lib\lib.so %_DEST%\lib%_EXT%\lib.so
		3	..\%__SRC%\lib\lib.a %_DEST%\lib%_EXT%\lib.a
3	..\%__SRC%\lib\lib.dylib %_DEST%\lib%_EXT%\lib.dylib	4	..\%__SRC%\lib\lib.dylib %_DEST%\lib%_EXT%\lib.dylib
4	..\%__SRC%\lib\.lib %_DEST%\lib%_EXT%\.lib	5	..\%__SRC%\lib\.lib %_DEST%\lib%_EXT%\.lib
5	..\%__SRC%\misc\.map %_DEST%\bin%_EXT%\.map	6	..\%__SRC%\misc\.map %_DEST%\bin%_EXT%\.map

Lines 3-9 Link Here

(-)oo_1.1.1_src/udm/prj/d.lst.orig (-1 / +1 lines)
3	mkdir: %_DEST%\inc%_EXT%\udm\xml	3	mkdir: %_DEST%\inc%_EXT%\udm\xml
4		4
5	..\%__SRC%\lib\udm.lib %_DEST%\lib%_EXT%\udm.lib	5	..\%__SRC%\lib\udm.lib %_DEST%\lib%_EXT%\udm.lib
6	..\%__SRC%\lib\libudm.a %_DEST%\lib%_EXT%\libudm.a	6	..\%__SRC%\lib\libudm.a %_DEST%\lib%_EXT%\.a
7	..\inc\udm\.hxx %_DEST%\inc%_EXT%\udm\.hxx	7	..\inc\udm\.hxx %_DEST%\inc%_EXT%\udm\.hxx
8	..\inc\udm\html\.hxx %_DEST%\inc%_EXT%\udm\html\.hxx	8	..\inc\udm\html\.hxx %_DEST%\inc%_EXT%\udm\html\.hxx
9	..\inc\udm\xml\.hxx %_DEST%\inc%_EXT%\udm\xml\.hxx	9	..\inc\udm\xml\.hxx %_DEST%\inc%_EXT%\udm\xml\.hxx

Lines 1-6 Link Here

(-)oo_1.1.1_src/unotools/prj/d.lst.orig (+1 lines)
1	..\%__SRC%\bin\.dll %_DEST%\bin%_EXT%\.dll	1	..\%__SRC%\bin\.dll %_DEST%\bin%_EXT%\.dll
2	..\%__SRC%\lib\.lib %_DEST%\lib%_EXT%\.lib	2	..\%__SRC%\lib\.lib %_DEST%\lib%_EXT%\.lib
3	..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%	3	..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%
		4	..\%__SRC%\lib\lib*.a %_DEST%\lib%_EXT%
4	..\%__SRC%\lib\.dylib %_DEST%\lib%_EXT%\.dylib	5	..\%__SRC%\lib\.dylib %_DEST%\lib%_EXT%\.dylib
5	..\%__SRC%\lib\.sl %_DEST%\lib%_EXT%\.sl	6	..\%__SRC%\lib\.sl %_DEST%\lib%_EXT%\.sl
6	..\%__SRC%\bin\.bin %_DEST%\bin%_EXT%\.bin	7	..\%__SRC%\bin\.bin %_DEST%\bin%_EXT%\.bin

Lines 1274-1279 Link Here

(-)oo_1.1.1_src/unzip/inc/unzip.h.orig (+2 lines)
1274	#endif	1274	#endif
1275		1275
1276	#ifndef UNX	1276	#ifndef UNX
		1277	#ifndef __MINGW32__
1277	typedef void UnzipCallBack ( long nBytesWritten );	1278	typedef void UnzipCallBack ( long nBytesWritten );
1278	extern UnzipCallBack *pCallBack;	1279	extern UnzipCallBack *pCallBack;
1279	#endif	1280	#endif
		1281	#endif

Lines 3-8 Link Here

(-)oo_1.1.1_src/unzip/prj/d.lst.orig (+1 lines)
3	..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%	3	..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%
4	..\%__SRC%\lib\.dylib %_DEST%\lib%_EXT%\.dylib	4	..\%__SRC%\lib\.dylib %_DEST%\lib%_EXT%\.dylib
5	..\%__SRC%\lib\.a %_DEST%\lib%_EXT%\.a	5	..\%__SRC%\lib\.a %_DEST%\lib%_EXT%\.a
		6	..\%__SRC%\slb\libsvunzip_static.a %_DEST%\lib%_EXT%\libunzipdll_static.a
6	..\inc\svunzip.h %_DEST%\inc%_EXT%\svunzip.h	7	..\inc\svunzip.h %_DEST%\inc%_EXT%\svunzip.h
7		8
8	dos: sh -c "if test %OS% = MACOSX; then create-bundle %_DEST%\lib%_EXT%\*.dylib; fi"	9	dos: sh -c "if test %OS% = MACOSX; then create-bundle %_DEST%\lib%_EXT%\*.dylib; fi"

Lines 39-45 Link Here

(-)oo_1.1.1_src/unzip/source/mapname.c.orig (-1 / +1 lines)
39	#endif	39	#endif
40		40
41	#ifndef NO_MKDIR	41	#ifndef NO_MKDIR
42	# if (defined(DOS_OS2) && !defined(__GO32__))	42	# if (defined(DOS_OS2) && !defined(__GO32__)) \|\| defined(__MINGW32__)
43	# if (_MSC_VER >= 600) /* have special MSC mkdir prototype */	43	# if (_MSC_VER >= 600) /* have special MSC mkdir prototype */
44	# include <direct.h>	44	# include <direct.h>
45	# else /* own prototype because dir.h conflicts? */	45	# else /* own prototype because dir.h conflicts? */

Lines 14-19 Link Here

(-)oo_1.1.1_src/vcl/prj/d.lst.orig (+1 lines)
14	..\%__SRC%\bin\getstyle-gnome %_DEST%\bin%_EXT%\getstyle-gnome	14	..\%__SRC%\bin\getstyle-gnome %_DEST%\bin%_EXT%\getstyle-gnome
15	..\%__SRC%\bin\msgbox-gnome %_DEST%\bin%_EXT%\msgbox-gnome	15	..\%__SRC%\bin\msgbox-gnome %_DEST%\bin%_EXT%\msgbox-gnome
16	..\%__SRC%\lib\libvcl.so %_DEST%\lib%_EXT%\libvcl.so	16	..\%__SRC%\lib\libvcl.so %_DEST%\lib%_EXT%\libvcl.so
		17	..\%__SRC%\lib\libvcl.a %_DEST%\lib%_EXT%\libvcl.a
17	..\%__SRC%\lib\.dylib %_DEST%\lib%_EXT%\.dylib	18	..\%__SRC%\lib\.dylib %_DEST%\lib%_EXT%\.dylib
18	..\%__SRC%\lib\app16.lib %_DEST%\lib%_EXT%\app16.lib	19	..\%__SRC%\lib\app16.lib %_DEST%\lib%_EXT%\app16.lib
19	..\%__SRC%\lib\gdi16.lib %_DEST%\lib%_EXT%\gdi16.lib	20	..\%__SRC%\lib\gdi16.lib %_DEST%\lib%_EXT%\gdi16.lib




                        nMnemonicWidth = ::abs((int)(lc_x1 - lc_x2));

                        Point       aTempPos = LogicToPixel( aPos );
#if (_MSC_VER < 1300) && !defined(__MINGW32__)
                        nMnemonicX = mnOutOffX + aTempPos.X() + ImplLogicWidthToDevicePixel( std::min( lc_x1, lc_x2 ) );
#else
                        nMnemonicX = mnOutOffX + aTempPos.X() + ImplLogicWidthToDevicePixel( min( lc_x1, lc_x2 ) );

            nMnemonicWidth = ::abs((int)(lc_x1 - lc_x2));

            Point aTempPos = LogicToPixel( aPos );
#if (_MSC_VER < 1300) && !defined(__MINGW32__)
            nMnemonicX = mnOutOffX + aTempPos.X() + ImplLogicWidthToDevicePixel( std::min(lc_x1, lc_x2) );
#else
            nMnemonicX = mnOutOffX + aTempPos.X() + ImplLogicWidthToDevicePixel( min(lc_x1, lc_x2) );

            long lc_x2 = pCaretXArray[ 2*(nMnemonicPos - nIndex)+1 ];
            nMnemonicWidth = ::abs((int)(lc_x1 - lc_x2));

#if (_MSC_VER < 1300) && !defined(__MINGW32__)
            Point aTempPos( std::min(lc_x1,lc_x2), GetFontMetric().GetAscent() );
            if( bInvalidPos )  // #106952#, place behind the (last) character
                aTempPos = Point( std::max(lc_x1,lc_x2), GetFontMetric().GetAscent() );

    long nXOffset = 0;
    if( nBase != nIndex )
    {
#if (_MSC_VER < 1300) && !defined(__MINGW32__)
        xub_StrLen nStart = std::min( nBase, nIndex );
        xub_StrLen nOfsLen = std::max( nBase, nIndex ) - nStart;
#else

    long nXOffset = 0;
    if( nBase != nIndex )
    {
#if (_MSC_VER < 1300) && !defined(__MINGW32__)
        xub_StrLen nStart = std::min( nBase, nIndex );
        xub_StrLen nOfsLen = std::max( nBase, nIndex ) - nStart;
#else

Lines 819-830 Link Here

(-)oo_1.1.1_src/vcl/win/source/app/salinst.cxx.orig (+16 lines)
819	{	819	{
820	int bDef = TRUE;	820	int bDef = TRUE;
821	LRESULT nRet = 0;	821	LRESULT nRet = 0;
		822	#ifdef __MINGW32__
		823	try
		824	#else
822	__try	825	__try
		826	#endif
823	{	827	{
824	nRet = SalComWndProc( hWnd, nMsg, wParam, lParam, bDef );	828	nRet = SalComWndProc( hWnd, nMsg, wParam, lParam, bDef );
825	}	829	}
826	// #112221# exception should not be caught in user32	830	// #112221# exception should not be caught in user32
		831	#ifdef __MINGW32__
		832	catch(...)
		833	#else
827	__except(UnhandledExceptionFilter(GetExceptionInformation()))	834	__except(UnhandledExceptionFilter(GetExceptionInformation()))
		835	#endif
828	{	836	{
829	}	837	}
830	if ( bDef )	838	if ( bDef )
Lines 839-850 Link Here
839	{	847	{
840	int bDef = TRUE;	848	int bDef = TRUE;
841	LRESULT nRet = 0;	849	LRESULT nRet = 0;
		850	#ifdef __MINGW32__
		851	try
		852	#else
842	__try	853	__try
		854	#endif
843	{	855	{
844	nRet = SalComWndProc( hWnd, nMsg, wParam, lParam, bDef );	856	nRet = SalComWndProc( hWnd, nMsg, wParam, lParam, bDef );
845	}	857	}
846	// #112221# exception should not be caught in user32	858	// #112221# exception should not be caught in user32
		859	#ifdef __MINGW32__
		860	catch(...)
		861	#else
847	__except(UnhandledExceptionFilter(GetExceptionInformation()))	862	__except(UnhandledExceptionFilter(GetExceptionInformation()))
		863	#endif
848	{	864	{
849	}	865	}
850	if ( bDef )	866	if ( bDef )

Lines 124-130 Link Here

(-)oo_1.1.1_src/vcl/win/source/app/salshl.cxx.orig (-1 / +1 lines)
124	if ( nReason == DLL_PROCESS_ATTACH )	124	if ( nReason == DLL_PROCESS_ATTACH )
125	aSalShlData.mhInst = hInst;	125	aSalShlData.mhInst = hInst;
126		126
127	#if !defined ( __BORLANDC__ )	127	#if !defined ( __BORLANDC__ ) && !defined ( __MINGW32__ )
128	#ifdef ICC	128	#ifdef ICC
129	if ( _CRT_init() == -1 )	129	if ( _CRT_init() == -1 )
130	#else	130	#else

Lines 478-484 Link Here

(-)oo_1.1.1_src/vcl/win/source/gdi/salgdi3.cxx.orig (-2 / +22 lines)
478	void ImplSalLogFontToFontW( HDC hDC, const LOGFONTW& rLogFont, Font& rFont,	478	void ImplSalLogFontToFontW( HDC hDC, const LOGFONTW& rLogFont, Font& rFont,
479	BOOL bReplaceFont )	479	BOOL bReplaceFont )
480	{	480	{
		481	#ifdef __MINGW32__
		482	XubString aFontName( reinterpret_cast< const unsigned short int * >(rLogFont.lfFaceName) );
		483	#else
481	XubString aFontName( rLogFont.lfFaceName );	484	XubString aFontName( rLogFont.lfFaceName );
		485	#endif
482	if ( aFontName.Len() )	486	if ( aFontName.Len() )
483	{	487	{
484	if ( bReplaceFont )	488	if ( bReplaceFont )
Lines 904-910 Link Here
904	{	908	{
905	wchar_t aFaceName[LF_FACESIZE+60];	909	wchar_t aFaceName[LF_FACESIZE+60];
906	if ( GetTextFaceW( maGraphicsData.mhDC, sizeof( aFaceName ) / sizeof( wchar_t ), aFaceName ) )	910	if ( GetTextFaceW( maGraphicsData.mhDC, sizeof( aFaceName ) / sizeof( wchar_t ), aFaceName ) )
		911	#ifdef __MINGW32__
		912	pMetric->maName = reinterpret_cast< const unsigned short int * >(aFaceName);
		913	#else
907	pMetric->maName = aFaceName;	914	pMetric->maName = aFaceName;
		915	#endif
908		916
909	TEXTMETRICW aWinMetric;	917	TEXTMETRICW aWinMetric;
910	if ( GetTextMetricsW( maGraphicsData.mhDC, &aWinMetric ) )	918	if ( GetTextMetricsW( maGraphicsData.mhDC, &aWinMetric ) )
Lines 1451-1457 Link Here
1451	pInfo->mbCourier = ImplSalWICompareAscii( pLogFont->elfLogFont.lfFaceName, "Courier" ) == 0;	1459	pInfo->mbCourier = ImplSalWICompareAscii( pLogFont->elfLogFont.lfFaceName, "Courier" ) == 0;
1452	else	1460	else
1453	pInfo->mbCourier = FALSE;	1461	pInfo->mbCourier = FALSE;
		1462	#ifdef __MINGW32__
		1463	XubString aName( reinterpret_cast< const unsigned short int * >(pLogFont->elfLogFont.lfFaceName) );
		1464	#else
1454	XubString aName( pLogFont->elfLogFont.lfFaceName );	1465	XubString aName( pLogFont->elfLogFont.lfFaceName );
		1466	#endif
1455	pInfo->mpName = &aName;	1467	pInfo->mpName = &aName;
1456	memcpy( pInfo->mpLogFontW->lfFaceName, pLogFont->elfLogFont.lfFaceName, (aName.Len()+1)*sizeof( wchar_t ) );	1468	memcpy( pInfo->mpLogFontW->lfFaceName, pLogFont->elfLogFont.lfFaceName, (aName.Len()+1)*sizeof( wchar_t ) );
1457	pInfo->mpLogFontW->lfCharSet = pLogFont->elfLogFont.lfCharSet;	1469	pInfo->mpLogFontW->lfCharSet = pLogFont->elfLogFont.lfCharSet;
Lines 1477-1483 Link Here
1477	ImplLogMetricToDevFontDataW( &(pLogFont->elfLogFont), &(pMetric->ntmTm), nFontType, pData );	1489	ImplLogMetricToDevFontDataW( &(pLogFont->elfLogFont), &(pMetric->ntmTm), nFontType, pData );
1478		1490
1479	// Test if Stylename is correct	1491	// Test if Stylename is correct
1480	const wchar_t* pStyleName = pLogFont->elfStyle;	1492	#ifdef __MINGW32__
		1493	const wchar_t* pStyleName = reinterpret_cast< const wchar_t* >(pLogFont->elfStyle);
		1494	#else
		1495	const wchar_t* pStyleName = reinterpret_cast< const unsigned short int * >(pLogFont->elfStyle);
		1496	#endif
1481	const wchar_t* pTemp = pStyleName;	1497	const wchar_t* pTemp = pStyleName;
1482	const wchar_t* pEnd = pTemp + sizeof( pLogFont->elfStyle )/sizeof( wchar_t );	1498	const wchar_t* pEnd = pTemp + sizeof( pLogFont->elfStyle )/sizeof( wchar_t );
1483	while ( *pTemp && (pTemp < pEnd) )	1499	while ( *pTemp && (pTemp < pEnd) )
Lines 1490-1496 Link Here
1490	pTemp++;	1506	pTemp++;
1491	}	1507	}
1492	if ( pStyleName && (pTemp < pEnd) )	1508	if ( pStyleName && (pTemp < pEnd) )
		1509	#ifdef __MINGW32__
		1510	pData->maStyleName = reinterpret_cast< const unsigned short int * >(pStyleName);
		1511	#else
1493	pData->maStyleName = pStyleName;	1512	pData->maStyleName = pStyleName;
		1513	#endif
1494	pData->mpSysData = (void*)(pLogFont->elfLogFont.lfCharSet);	1514	pData->mpSysData = (void*)(pLogFont->elfLogFont.lfCharSet);
1495	BOOL bAdd = TRUE;	1515	BOOL bAdd = TRUE;
1496		1516
Lines 1637-1643 Link Here
1637	char aResourceName[512];	1657	char aResourceName[512];
1638	int nMaxLen = sizeof(aResourceName)/sizeof(*aResourceName) - 16;	1658	int nMaxLen = sizeof(aResourceName)/sizeof(*aResourceName) - 16;
1639	int nLen = ::GetTempPathA( nMaxLen, aResourceName );	1659	int nLen = ::GetTempPathA( nMaxLen, aResourceName );
1640	#if (_MSC_VER < 1300)	1660	#if (_MSC_VER < 1300) && !defined(__MINGW32__)
1641	::strncpy( aResourceName + nLen, aFileName, std::max( 0, nMaxLen - nLen ));	1661	::strncpy( aResourceName + nLen, aFileName, std::max( 0, nMaxLen - nLen ));
1642	#else	1662	#else
1643	::strncpy( aResourceName + nLen, aFileName, max( 0, nMaxLen - nLen ));	1663	::strncpy( aResourceName + nLen, aFileName, max( 0, nMaxLen - nLen ));

Lines 100-108 Link Here

(-)oo_1.1.1_src/vcl/win/source/gdi/salogl.cxx.orig (+6 lines)
100	// ----------	100	// ----------
101		101
102	#define INIT_OGLFNC_WGL( FncName ) static OGLFnc##FncName pImplOpenWGLFnc##FncName = NULL;	102	#define INIT_OGLFNC_WGL( FncName ) static OGLFnc##FncName pImplOpenWGLFnc##FncName = NULL;
		103	#ifdef __MINGW32__
		104	#define GET_OGLFNC_WGL( FncName ) \
		105	pImplOpenWGLFnc##FncName = (OGLFnc##FncName) GetProcAddress( hImplOGLLib, "wgl" #FncName ); \
		106	if( !pImplOpenWGLFnc##FncName ) bRet = FALSE;
		107	#else
103	#define GET_OGLFNC_WGL( FncName ) \	108	#define GET_OGLFNC_WGL( FncName ) \
104	pImplOpenWGLFnc##FncName = (OGLFnc##FncName##) GetProcAddress( hImplOGLLib, "wgl" #FncName ); \	109	pImplOpenWGLFnc##FncName = (OGLFnc##FncName##) GetProcAddress( hImplOGLLib, "wgl" #FncName ); \
105	if( !pImplOpenWGLFnc##FncName ) bRet = FALSE;	110	if( !pImplOpenWGLFnc##FncName ) bRet = FALSE;
		111	#endif
106		112
107	// -----------------	113	// -----------------
108	// - Statics init. -	114	// - Statics init. -

Lines 721-727 Link Here

(-)oo_1.1.1_src/vcl/win/source/gdi/winlayout.cxx.orig (-1 / +1 lines)
721	Point aPos = GetDrawPosition( Point( mnBaseAdv, 0 ) );	721	Point aPos = GetDrawPosition( Point( mnBaseAdv, 0 ) );
722		722
723	// #108267#, limit the number of glyphs to avoid paint errors	723	// #108267#, limit the number of glyphs to avoid paint errors
724	#if (_MSC_VER < 1300)	724	#if (_MSC_VER < 1300) && !defined(__MINGW32__)
725	UINT limitedGlyphCount = std::min( 8192, mnGlyphCount );	725	UINT limitedGlyphCount = std::min( 8192, mnGlyphCount );
726	#else	726	#else
727	UINT limitedGlyphCount = min( 8192, mnGlyphCount );	727	UINT limitedGlyphCount = min( 8192, mnGlyphCount );

Lines 2706-2712 Link Here

(-)oo_1.1.1_src/vcl/win/source/window/salframe.cxx.orig (-1 / +17 lines)
2706		2706
2707	StyleSettings aStyleSettings = rSettings.GetStyleSettings();	2707	StyleSettings aStyleSettings = rSettings.GetStyleSettings();
2708	BOOL bCompBorder = (aStyleSettings.GetOptions() & (STYLE_OPTION_MACSTYLE \| STYLE_OPTION_UNIXSTYLE)) == 0;	2708	BOOL bCompBorder = (aStyleSettings.GetOptions() & (STYLE_OPTION_MACSTYLE \| STYLE_OPTION_UNIXSTYLE)) == 0;
2709	#if (_MSC_VER < 1300)	2709	#if (_MSC_VER < 1300) && !defined(__MINGW32__)
2710	aStyleSettings.SetScrollBarSize( std::min( GetSystemMetrics( SM_CXVSCROLL ), 20 ) ); // #99956# do not allow huge scrollbars, most of the UI is not scaled anymore	2710	aStyleSettings.SetScrollBarSize( std::min( GetSystemMetrics( SM_CXVSCROLL ), 20 ) ); // #99956# do not allow huge scrollbars, most of the UI is not scaled anymore
2711	aStyleSettings.SetSpinSize( std::min( GetSystemMetrics( SM_CXVSCROLL ), 20 ) );	2711	aStyleSettings.SetSpinSize( std::min( GetSystemMetrics( SM_CXVSCROLL ), 20 ) );
2712	#else	2712	#else
Lines 5289-5300 Link Here
5289	{	5289	{
5290	int bDef = TRUE;	5290	int bDef = TRUE;
5291	LRESULT nRet = 0;	5291	LRESULT nRet = 0;
		5292	#ifdef __MINGW32__
		5293	try
		5294	#else
5292	__try	5295	__try
		5296	#endif
5293	{	5297	{
5294	nRet = SalFrameWndProc( hWnd, nMsg, wParam, lParam, bDef );	5298	nRet = SalFrameWndProc( hWnd, nMsg, wParam, lParam, bDef );
5295	}	5299	}
5296	// #112221# exception should not be caught in user32	5300	// #112221# exception should not be caught in user32
		5301	#ifdef __MINGW32__
		5302	catch(...)
		5303	#else
5297	__except(UnhandledExceptionFilter(GetExceptionInformation()))	5304	__except(UnhandledExceptionFilter(GetExceptionInformation()))
		5305	#endif
5298	{	5306	{
5299	}	5307	}
5300	if ( bDef )	5308	if ( bDef )
Lines 5306-5317 Link Here
5306	{	5314	{
5307	int bDef = TRUE;	5315	int bDef = TRUE;
5308	LRESULT nRet = 0;	5316	LRESULT nRet = 0;
		5317	#ifdef __MINGW32__
		5318	try
		5319	#else
5309	__try	5320	__try
		5321	#endif
5310	{	5322	{
5311	nRet = SalFrameWndProc( hWnd, nMsg, wParam, lParam, bDef );	5323	nRet = SalFrameWndProc( hWnd, nMsg, wParam, lParam, bDef );
5312	}	5324	}
5313	// #112221# exception should not be caught in user32	5325	// #112221# exception should not be caught in user32
		5326	#ifdef __MINGW32__
		5327	catch(...)
		5328	#else
5314	__except(UnhandledExceptionFilter(GetExceptionInformation())) // #112221#	5329	__except(UnhandledExceptionFilter(GetExceptionInformation())) // #112221#
		5330	#endif
5315	{	5331	{
5316	}	5332	}
5317	if ( bDef )	5333	if ( bDef )

Lines 80-86 Link Here

(-)oo_1.1.1_src/vos/inc/vos/signal.hxx.orig (-2 / +2 lines)
80	{	80	{
81	#endif	81	#endif
82		82
83	#if defined ( _USE_NAMESPACE ) && !defined ( WNT )	83	#if defined ( _USE_NAMESPACE ) && !(defined ( WNT ) && !defined(__MINGW32__))
84	oslSignalAction SAL_CALL _cpp_OSignalHandler_Function(void* pthis, oslSignalInfo* pInfo);	84	oslSignalAction SAL_CALL _cpp_OSignalHandler_Function(void* pthis, oslSignalInfo* pInfo);
85	#endif	85	#endif
86		86
Lines 133-139 Link Here
133	protected:	133	protected:
134	oslSignalHandler m_hHandler;	134	oslSignalHandler m_hHandler;
135		135
136	#if defined ( _USE_NAMESPACE ) && defined ( WNT )	136	#if defined ( _USE_NAMESPACE ) && (defined ( WNT ) && !defined(__MINGW32__))
137	friend oslSignalAction SAL_CALL ::_OSignalHandler_Function(void* pthis, oslSignalInfo* pInfo);	137	friend oslSignalAction SAL_CALL ::_OSignalHandler_Function(void* pthis, oslSignalInfo* pInfo);
138	#elif defined ( _USE_NAMESPACE )	138	#elif defined ( _USE_NAMESPACE )
139	friend oslSignalAction SAL_CALL _cpp_OSignalHandler_Function(void* pthis, oslSignalInfo* pInfo);	139	friend oslSignalAction SAL_CALL _cpp_OSignalHandler_Function(void* pthis, oslSignalInfo* pInfo);

Lines 64-70 Link Here

(-)oo_1.1.1_src/vos/source/signal.cxx.orig (-1 / +1 lines)
64	#include <vos/object.hxx>	64	#include <vos/object.hxx>
65	#include <vos/signal.hxx>	65	#include <vos/signal.hxx>
66		66
67	#if defined ( _USE_NAMESPACE ) && !defined ( WNT )	67	#if defined ( _USE_NAMESPACE ) && !(defined ( WNT ) && !defined(__MINGW32__))
68		68
69	oslSignalAction SAL_CALL _OSignalHandler_Function(void* pthis, oslSignalInfo* pInfo)	69	oslSignalAction SAL_CALL _OSignalHandler_Function(void* pthis, oslSignalInfo* pInfo)
70	{	70	{

Lines 68-74 Link Here

(-)oo_1.1.1_src/vos/source/thread.cxx.orig (-1 / +1 lines)
68		68
69		69
70		70
71	#if defined ( _USE_NAMESPACE ) && !defined ( WNT )	71	#if defined ( _USE_NAMESPACE ) && !(defined ( WNT ) && !defined(GCC))
72		72
73	void _OThread_WorkerFunction(void* pthis)	73	void _OThread_WorkerFunction(void* pthis)
74	{	74	{

Lines 65-71 Link Here

(-)oo_1.1.1_src/xml2cmp/source/support/badcast.cxx.orig (-1 / +1 lines)
65	due to problems with WNT-STL-headers.	65	due to problems with WNT-STL-headers.
66	*/	66	*/
67		67
68	#ifdef WNT	68	#if defined(WNT) && !defined(__MINGW32__)
69		69
70	#define _NTSDK	70	#define _NTSDK
71	#include<typeinfo>	71	#include<typeinfo>





		Get_Attribute(sAttrValue, sAttrName);

		unsigned i = 0;
		for ( ; i < nSize; ++i )
		{
			if ( i_rAttrNames[i] == sAttrName )
            {

{
	char * pResult = &sWord[0];

	char * pSet = pResult;
	for ( ;
		  *text != i_cEnd;
		  ++text )
	{


	if (i_bReverseName)
	{
        const int nMaxLen = 1000;
        if (strlen(pResult) < nMaxLen)
        {
    		char * sBreak = strrchr(pResult,'.');

Lines 1-5 Link Here

(-)oo_1.1.1_src/xmlhelp/prj/d.lst.orig (+1 lines)
1	..\%__SRC%\bin\.dll %_DEST%\bin%_EXT%\.*	1	..\%__SRC%\bin\.dll %_DEST%\bin%_EXT%\.*
2	..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%	2	..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%
		3	..\%__SRC%\lib\lib*.a %_DEST%\lib%_EXT%
3	..\%__SRC%\lib\.dylib %_DEST%\lib%_EXT%\.*	4	..\%__SRC%\lib\.dylib %_DEST%\lib%_EXT%\.*
4	..\%__SRC%\class\.jar %_DEST%\bin%_EXT%\.*	5	..\%__SRC%\class\.jar %_DEST%\bin%_EXT%\.*
5	..\%__SRC%\misc\helpserver.sh %_DEST%\bin%_EXT%\helpserver	6	..\%__SRC%\misc\helpserver.sh %_DEST%\bin%_EXT%\helpserver

Lines 3-9 Link Here

(-)oo_1.1.1_src/xmloff/prj/d.lst.orig (-1 / +1 lines)
3	..\%__SRC%\misc\.map %_DEST%\bin%_EXT%\.map	3	..\%__SRC%\misc\.map %_DEST%\bin%_EXT%\.map
4	..\%__SRC%\lib\ixo.lib %_DEST%\lib%_EXT%\ixo.lib	4	..\%__SRC%\lib\ixo.lib %_DEST%\lib%_EXT%\ixo.lib
5	..\%__SRC%\lib\xol.lib %_DEST%\lib%_EXT%\xol.lib	5	..\%__SRC%\lib\xol.lib %_DEST%\lib%_EXT%\xol.lib
6	..\%__SRC%\lib\libxol.a %_DEST%\lib%_EXT%\libxol.a	6	..\%__SRC%\lib\lib.a %_DEST%\lib%_EXT%\lib.a
7	..\%__SRC%\bin\.dll %_DEST%\bin%_EXT%\.dll	7	..\%__SRC%\bin\.dll %_DEST%\bin%_EXT%\.dll
8	..\%__SRC%\lib\lib.so %_DEST%\lib%_EXT%\lib.so	8	..\%__SRC%\lib\lib.so %_DEST%\lib%_EXT%\lib.so
9	..\dtd\. %_DEST%\bin%_EXT%\.	9	..\dtd\. %_DEST%\bin%_EXT%\.

Lines 2-7 Link Here

(-)oo_1.1.1_src/xmlscript/prj/d.lst.orig (+1 lines)
2	..\%__SRC%\bin\.dll %_DEST%\bin%_EXT%\.dll	2	..\%__SRC%\bin\.dll %_DEST%\bin%_EXT%\.dll
3	..\%__SRC%\lib\.lib %_DEST%\lib%_EXT%\.lib	3	..\%__SRC%\lib\.lib %_DEST%\lib%_EXT%\.lib
4	..\%__SRC%\lib\lib.so %_DEST%\lib%_EXT%\lib.so	4	..\%__SRC%\lib\lib.so %_DEST%\lib%_EXT%\lib.so
		5	..\%__SRC%\lib\lib.a %_DEST%\lib%_EXT%\lib.a
5	..\%__SRC%\lib\.dylib %_DEST%\lib%_EXT%\.dylib	6	..\%__SRC%\lib\.dylib %_DEST%\lib%_EXT%\.dylib
6		7
7	..\inc\xmlscript\xml_helper.hxx %_DEST%\inc%_EXT%\xmlscript\xml_helper.hxx	8	..\inc\xmlscript\xml_helper.hxx %_DEST%\inc%_EXT%\xmlscript\xml_helper.hxx

Lines 5-10 Link Here

(-)oo_1.1.1_src/zlib/prj/d.lst.orig (+1 lines)
5	..\%__SRC%\inc\zconf.h %_DEST%\inc%_EXT%\external\zconf.h	5	..\%__SRC%\inc\zconf.h %_DEST%\inc%_EXT%\external\zconf.h
6		6
7	..\%__SRC%\lib\libzlib.a %_DEST%\lib%_EXT%\libzlib.a	7	..\%__SRC%\lib\libzlib.a %_DEST%\lib%_EXT%\libzlib.a
		8	..\%__SRC%\lib\libzlib_static.a %_DEST%\lib%_EXT%\libzlib_static.a
8	..\%__SRC%\slb\zlib.lib %_DEST%\lib%_EXT%\zlib.lib	9	..\%__SRC%\slb\zlib.lib %_DEST%\lib%_EXT%\zlib.lib
9	..\%__SRC%\slb\zlib.lin %_DEST%\lib%_EXT%\zlib.lin	10	..\%__SRC%\slb\zlib.lin %_DEST%\lib%_EXT%\zlib.lin
10		11

Return to issue 24588

Lines 1-6 Link Here

(-)oo_1.1.1_src/comphelper/prj/d.lst.orig (+1 lines)
1	..\%__SRC%\bin\.dll %_DEST%\bin%_EXT%\.dll	1	..\%__SRC%\bin\.dll %_DEST%\bin%_EXT%\.dll
2	..\%__SRC%\lib\.lib %_DEST%\lib%_EXT%\.lib	2	..\%__SRC%\lib\.lib %_DEST%\lib%_EXT%\.lib
3	..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%	3	..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%
		4	..\%__SRC%\lib\lib*.a %_DEST%\lib%_EXT%
4	..\%__SRC%\lib\.dylib %_DEST%\lib%_EXT%\.dylib	5	..\%__SRC%\lib\.dylib %_DEST%\lib%_EXT%\.dylib
5	..\%__SRC%\lib\.sl %_DEST%\lib%_EXT%\.sl	6	..\%__SRC%\lib\.sl %_DEST%\lib%_EXT%\.sl
6	..\%__SRC%\bin\.bin %_DEST%\bin%_EXT%\.bin	7	..\%__SRC%\bin\.bin %_DEST%\bin%_EXT%\.bin

Lines 1-5 Link Here

(-)oo_1.1.1_src/connectivity/prj/d.lst.orig (+1 lines)
1	..\%__SRC%\bin\.dll %_DEST%\bin%_EXT%\.dll	1	..\%__SRC%\bin\.dll %_DEST%\bin%_EXT%\.dll
2	..\%__SRC%\lib\lib.so %_DEST%\lib%_EXT%\lib.so	2	..\%__SRC%\lib\lib.so %_DEST%\lib%_EXT%\lib.so
		3	..\%__SRC%\lib\lib.a %_DEST%\lib%_EXT%\lib.a
3	..\%__SRC%\lib\.dylib %_DEST%\lib%_EXT%\.dylib	4	..\%__SRC%\lib\.dylib %_DEST%\lib%_EXT%\.dylib
4	..\%__SRC%\slb\connectivity. %_DEST%\lib%_EXT%\connectivity.	5	..\%__SRC%\slb\connectivity. %_DEST%\lib%_EXT%\connectivity.
5	..\%__SRC%\lib\idbt* %_DEST%\lib%_EXT%\idbt*	6	..\%__SRC%\lib\idbt* %_DEST%\lib%_EXT%\idbt*

Lines 199-205 Link Here

(-)oo_1.1.1_src/accessibility/bridge/source/java/WindowsAccessBridgeAdapter.cxx.orig (-6 / +6 lines)
199	if ( pJava_environment && pUno_environment )	199	if ( pJava_environment && pUno_environment )
200	{	200	{
201	g_unoMapping = Mapping(pUno_environment, pJava_environment);	201	g_unoMapping = Mapping(pUno_environment, pJava_environment);
202	getCppuType((Reference< XAccessible > ) 0).getDescription((typelib_TypeDescription *) & g_pTypeDescription);	202	getCppuType((::com::sun::star::uno::Reference< XAccessible > ) 0).getDescription((typelib_TypeDescription *) & g_pTypeDescription);
203	}	203	}
204		204
205	if ( pJava_environment )	205	if ( pJava_environment )
Lines 268-274 Link Here
268	{	268	{
269	if ( pWindow && pWindow->IsTopWindow() )	269	if ( pWindow && pWindow->IsTopWindow() )
270	{	270	{
271	Reference< XAccessible > xAccessible;	271	::com::sun::star::uno::Reference< XAccessible > xAccessible;
272		272
273	// Test for combo box - drop down floating windows first	273	// Test for combo box - drop down floating windows first
274	Window * pParentWindow = pWindow->GetParent();	274	Window * pParentWindow = pWindow->GetParent();
Lines 278-287 Link Here
278	try	278	try
279	{	279	{
280	// The parent window of a combo box floating window should have the role COMBO_BOX	280	// The parent window of a combo box floating window should have the role COMBO_BOX
281	Reference< XAccessible > xParentAccessible(pParentWindow->GetAccessible());	281	::com::sun::star::uno::Reference< XAccessible > xParentAccessible(pParentWindow->GetAccessible());
282	if ( xParentAccessible.is() )	282	if ( xParentAccessible.is() )
283	{	283	{
284	Reference< XAccessibleContext > xParentAC(xParentAccessible->getAccessibleContext());	284	::com::sun::star::uno::Reference< XAccessibleContext > xParentAC(xParentAccessible->getAccessibleContext());
285	if ( xParentAC.is() && (AccessibleRole::COMBO_BOX == xParentAC->getAccessibleRole()) )	285	if ( xParentAC.is() && (AccessibleRole::COMBO_BOX == xParentAC->getAccessibleRole()) )
286	{	286	{
287	// O.k. - this is a combo box floating window corresponding to the child of role LIST of the parent.	287	// O.k. - this is a combo box floating window corresponding to the child of role LIST of the parent.
Lines 289-298 Link Here
289	sal_Int32 nCount = xParentAC->getAccessibleChildCount();	289	sal_Int32 nCount = xParentAC->getAccessibleChildCount();
290	for ( sal_Int32 n = 0; (n < nCount) && !xAccessible.is(); n++)	290	for ( sal_Int32 n = 0; (n < nCount) && !xAccessible.is(); n++)
291	{	291	{
292	Reference< XAccessible > xChild = xParentAC->getAccessibleChild(n);	292	::com::sun::star::uno::Reference< XAccessible > xChild = xParentAC->getAccessibleChild(n);
293	if ( xChild.is() )	293	if ( xChild.is() )
294	{	294	{
295	Reference< XAccessibleContext > xChildAC = xChild->getAccessibleContext();	295	::com::sun::star::uno::Reference< XAccessibleContext > xChildAC = xChild->getAccessibleContext();
296	if ( xChildAC.is() && (AccessibleRole::LIST == xChildAC->getAccessibleRole()) )	296	if ( xChildAC.is() && (AccessibleRole::LIST == xChildAC->getAccessibleRole()) )
297	{	297	{
298	xAccessible = xChild;	298	xAccessible = xChild;

Lines 58-63 Link Here

(-)- misc/build/db-3.2.9/dist/configure (-7 / +181 lines)
58	*qnx) cat >> confdefs.h <<\EOF	58	*qnx) cat >> confdefs.h <<\EOF
59	#define HAVE_QNX 1	59	#define HAVE_QNX 1
60	***************	60	***************
		61	* 1626,1636 **
		62	echo $ac_n "checking libtool configuration""... $ac_c" 1>&6
		63	echo "configure:1628: checking libtool configuration" >&5
		64	echo "$ac_t""" 1>&6
		65	! ${CONFIG_SHELL-/bin/sh} $srcdir/ltconfig \
		66	! --no-verify $srcdir/ltmain.sh \
		67	! --output=./libtool $host_os \
		68	! --disable-static \
		69	! \|\| { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
		70
		71	SOSUFFIX=`sed -e '/^library_names_spec=/!d' -e 's/.\.\([a-zA-Z0-9_]\).*/\1/' ./libtool`
		72	DEFAULT_LIB="\$(libso_target)"
		73	--- 1629,1650 ----
		74	echo $ac_n "checking libtool configuration""... $ac_c" 1>&6
		75	echo "configure:1628: checking libtool configuration" >&5
		76	echo "$ac_t""" 1>&6
		77	! case "$host_os" in
		78	! cygwin* \| mingw*)
		79	! export LN_S="cp -p"; ${CONFIG_SHELL-/bin/sh} $srcdir/ltconfig \
		80	! --no-verify $srcdir/ltmain.sh \
		81	! --output=./libtool $host_os \
		82	! --disable-static --enable-win32-dll\
		83	! \|\| { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
		84	! ;;
		85	! *)
		86	! ${CONFIG_SHELL-/bin/sh} $srcdir/ltconfig \
		87	! --no-verify $srcdir/ltmain.sh \
		88	! --output=./libtool $host_os \
		89	! --disable-static \
		90	! \|\| { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
		91	! ;;
		92	! esac
		93
		94	SOSUFFIX=`sed -e '/^library_names_spec=/!d' -e 's/.\.\([a-zA-Z0-9_]\).*/\1/' ./libtool`
		95	DEFAULT_LIB="\$(libso_target)"
		96	***************
61	* 1644,1650 **	97	* 1644,1650 **
62		98
63	INSTALLER="\$(LIBTOOL) --mode=install cp"	99	INSTALLER="\$(LIBTOOL) --mode=install cp"
Lines 66-72 Link Here
66	SOFLAGS="-rpath \$(libdir)"	102	SOFLAGS="-rpath \$(libdir)"
67	o=".lo"	103	o=".lo"
68	fi	104	fi
69	--- 1647,1660 ----	105	--- 1658,1671 ----
70		106
71	INSTALLER="\$(LIBTOOL) --mode=install cp"	107	INSTALLER="\$(LIBTOOL) --mode=install cp"
72	POSTLINK="\$(LIBTOOL) --mode=execute true"	108	POSTLINK="\$(LIBTOOL) --mode=execute true"
Lines 91-101 Link Here
91	fi	127	fi
92	done	128	done
93	IFS="$ac_save_ifs"	129	IFS="$ac_save_ifs"
94	--- 1760,1769 ----	130	--- 1771,1780 ----
95	for ac_dir in $ac_dummy; do	131	for ac_dir in $ac_dummy; do
96	test -z "$ac_dir" && ac_dir=.	132	test -z "$ac_dir" && ac_dir=.
97	if test -f $ac_dir/$ac_word; then	133	if test -f $ac_dir/$ac_word; then
98	! if test $SOLARENV/$OUTPATH/bin != $ac_dir; then	134	! if test "$SOLARENV/$OUTPATH/bin" != $ac_dir; then
99	! ac_cv_path_JAVACABS="$ac_dir/$ac_word"	135	! ac_cv_path_JAVACABS="$ac_dir/$ac_word"
100	! break	136	! break
101	! fi	137	! fi
Lines 124-130 Link Here
124	*) JINCSUBDIRS="genunix";;	160	*) JINCSUBDIRS="genunix";;
125	esac	161	esac
126		162
127	--- 1793,1833 ----	163	--- 1804,1856 ----
128	echo "$ac_t""$JAVACABS" 1>&6	164	echo "$ac_t""$JAVACABS" 1>&6
129	done	165	done
130	JTOPDIR=`echo "$JAVACABS" \| sed -e 's://:/:g' -e 's:/[^/]$::'`	166	JTOPDIR=`echo "$JAVACABS" \| sed -e 's://:/:g' -e 's:/[^/]$::'`
Lines 142-148 Link Here
142	! else	178	! else
143	! { echo "configure: error: cannot find java include files (Darwin: $JFRAMEDIR/Versions/1.3.1/Headers/jni.h)" 1>&2; exit 1; }	179	! { echo "configure: error: cannot find java include files (Darwin: $JFRAMEDIR/Versions/1.3.1/Headers/jni.h)" 1>&2; exit 1; }
144	! fi	180	! fi
145	! ;;	181	! ;;
		182	! cygwin\|mingw)
		183	! if test -f "$JTOPDIR/include/jni.h"; then
		184	! CPPFLAGS="$CPPFLAGS -I$JTOPDIR/include/win32 -I$JTOPDIR/include"
		185	! else
		186	! JTOPDIR=`echo "$JTOPDIR" \| sed -e 's:/[^/]*$::'`
		187	! if test -f "$JTOPDIR/include/jni.h"; then
		188	! CPPFLAGS="$CPPFLAGS -I$JTOPDIR/include/win32 -I$JTOPDIR/include"
		189	! else
		190	! { echo "configure: error: cannot find java include files" 1>&2; exit 1; }
		191	! fi
		192	! fi
		193	! ;;
146	! *)	194	! *)
147	! if test -f "$JTOPDIR/include/jni.h"; then	195	! if test -f "$JTOPDIR/include/jni.h"; then
148	! CPPFLAGS="$CPPFLAGS -I$JTOPDIR/include"	196	! CPPFLAGS="$CPPFLAGS -I$JTOPDIR/include"
Lines 167-172 Link Here
167	esac	215	esac
168		216
169	***************	217	***************
		218	* 2134,2139 **
		219	--- 2190,2234 ----
		220	DBS_LIBS=-lpthread
		221	else
		222	echo "$ac_t""no" 1>&6
		223	+ echo $ac_n "checking for pthread_create in -lpthreadGCE""... $ac_c" 1>&6
		224	+ echo "configure:2101: checking for pthread_create in -lpthreadGCE" >&5
		225	+ ac_lib_var=`echo pthreadGCE'_'pthread_create \| sed 'y%./+-%__p_%'`
		226	+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
		227	+ echo $ac_n "(cached) $ac_c" 1>&6
		228	+ else
		229	+ ac_save_LIBS="$LIBS"
		230	+ LIBS="-lpthreadGCE $LIBS"
		231	+ cat > conftest.$ac_ext <<EOF
		232	+ #line 2109 "configure"
		233	+ #include "confdefs.h"
		234	+ /* Override any gcc2 internal prototype to avoid an error. */
		235	+ /* We use char because int might match the return type of a gcc2
		236	+ builtin and then its argument prototype would still apply. */
		237	+ char pthread_create();
		238	+
		239	+ int main() {
		240	+ pthread_create()
		241	+ ; return 0; }
		242	+ EOF
		243	+ if { (eval echo configure:2120: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
		244	+ rm -rf conftest*
		245	+ eval "ac_cv_lib_$ac_lib_var=yes"
		246	+ else
		247	+ echo "configure: failed program was:" >&5
		248	+ cat conftest.$ac_ext >&5
		249	+ rm -rf conftest*
		250	+ eval "ac_cv_lib_$ac_lib_var=no"
		251	+ fi
		252	+ rm -f conftest*
		253	+ LIBS="$ac_save_LIBS"
		254	+
		255	+ fi
		256	+ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
		257	+ echo "$ac_t""yes" 1>&6
		258	+ DBS_LIBS=-lpthreadGCE
		259	+ else
		260	+ echo "$ac_t""no" 1>&6
		261	+ fi
		262	fi
		263
		264
		265	***************
170	* 4008,4014 **	266	* 4008,4014 **
171	#line 4009 "configure"	267	#line 4009 "configure"
172	#include "confdefs.h"	268	#include "confdefs.h"
Lines 175-181 Link Here
175	#if defined(__GNUC__)	271	#if defined(__GNUC__)
176	exit(0);	272	exit(0);
177	#endif	273	#endif
178	--- 4041,4047 ----	274	--- 4103,4109 ----
179	#line 4009 "configure"	275	#line 4009 "configure"
180	#include "confdefs.h"	276	#include "confdefs.h"
181	main(){	277	main(){
Lines 184-189 Link Here
184	exit(0);	280	exit(0);
185	#endif	281	#endif
186	***************	282	***************
		283	* 4624,4629 **
		284	--- 4719,4782 ----
		285	fi
		286	done
		287
		288	+ case "$host_os" in
		289	+ cygwin\|mingw)
		290	+ for ac_func in select
		291	+ do
		292	+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
		293	+ echo "configure:4631: checking for $ac_func" >&5
		294	+ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
		295	+ echo $ac_n "(cached) $ac_c" 1>&6
		296	+ else
		297	+ cat > conftest.$ac_ext <<EOF
		298	+ #line 4636 "configure"
		299	+ #include "confdefs.h"
		300	+ /* System header to define __stub macros and hopefully few prototypes,
		301	+ which can conflict with char $ac_func(); below. */
		302	+ #include <assert.h>
		303	+ /* Override any gcc2 internal prototype to avoid an error. */
		304	+ /* We use char because int might match the return type of a gcc2
		305	+ builtin and then its argument prototype would still apply. */
		306	+ char $ac_func();
		307	+
		308	+ int main() {
		309	+
		310	+ /* The GNU C library defines this for functions which it implements
		311	+ to always fail with ENOSYS. Some functions are actually named
		312	+ something starting with __ and the normal name is an alias. */
		313	+ #if defined (__stub_$ac_func) \|\| defined (__stub___$ac_func)
		314	+ choke me
		315	+ #else
		316	+ $ac_func();
		317	+ #endif
		318	+
		319	+ ; return 0; }
		320	+ EOF
		321	+ if { (eval echo configure:4659: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
		322	+ rm -rf conftest*
		323	+ eval "ac_cv_func_$ac_func=yes"
		324	+ else
		325	+ echo "configure: failed program was:" >&5
		326	+ cat conftest.$ac_ext >&5
		327	+ rm -rf conftest*
		328	+ eval "ac_cv_func_$ac_func=no"
		329	+ fi
		330	+ rm -f conftest*
		331	+ fi
		332	+
		333	+ if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
		334	+ echo "$ac_t""yes" 1>&6
		335	+ ac_tr_func=HAVE_`echo $ac_func \| tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
		336	+ cat >> confdefs.h <<EOF
		337	+ #define $ac_tr_func 1
		338	+ EOF
		339	+
		340	+ else
		341	+ echo "$ac_t""no" 1>&6
		342	+ fi
		343	+ done
		344	+ ;;
		345	+ *)
		346	for ac_func in select
347	do
348	echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
349	***************
350	* 4679,4684 **
351	--- 4832,4839 ----
352	{ echo "configure: error: No select library function." 1>&2; exit 1; }
353	fi
354	done
355	+ ;;
356	+ esac
357
358
359	echo $ac_n "checking for int type sprintf return value""... $ac_c" 1>&6
360	***************
187	* 5375,5382 **	361	* 5375,5382 **
188	fi	362	fi
189	fi	363	fi
Lines 193-199 Link Here
193	CREATE_LIST="Makefile	367	CREATE_LIST="Makefile
194	include.tcl:../test/include.tcl	368	include.tcl:../test/include.tcl
195	db.h:../include/db.src	369	db.h:../include/db.src
196	--- 5408,5413 ----	370	--- 5530,5535 ----
197	*** misc/db-3.2.9/dist/configure.in 2001-01-19 18:36:43.000000000 +0100	371	*** misc/db-3.2.9/dist/configure.in 2001-01-19 18:36:43.000000000 +0100
198	--- misc/build/db-3.2.9/dist/configure.in 2003-07-16 19:34:25.000000000 +0200	372	--- misc/build/db-3.2.9/dist/configure.in 2003-07-16 19:34:25.000000000 +0200
199	***************	373	***************
Lines 207-213 Link Here
207	esac	381	esac
208		382
209	*** misc/db-3.2.9/dist/ltconfig 2000-10-13 22:23:00.000000000 +0200	383	*** misc/db-3.2.9/dist/ltconfig 2000-10-13 22:23:00.000000000 +0200

Lines 223-229 Link Here

(-)- misc/build/db-3.2.9/dist/ltconfig (-8 / +86 lines)
223	# FIXME: we need at least 68020 code to build shared libraries, but	397	# FIXME: we need at least 68020 code to build shared libraries, but
224	# adding the `-m68020' flag to GCC prevents building anything better,	398	# adding the `-m68020' flag to GCC prevents building anything better,
225	***************	399	***************
226	* 1194,1204 **	400	* 1165,1170 **
		401	--- 1170,1177 ----
		402	# then regenerate the def file from the symbol export list, so that
		403	# the compiled dll only exports the symbol export list.
		404	# Be careful not to strip the DATA tag left by newer dlltools.
		405	+ case "$host_os" in
		406	+ cygwin*)
		407	export_symbols_cmds='test -f $objdir/$soname-ltdll.c \|\| sed -e "/^# \/\* ltdll\.c starts here \\//,/^# \/\ ltdll.c ends here \*\// { s/^# //; p; }" -e d < $0 > $objdir/$soname-ltdll.c~
		408	test -f $objdir/$soname-ltdll.$objext \|\| (cd $objdir && $CC -c $soname-ltdll.c)~
		409	$DLLTOOL --export-all --exclude-symbols DllMain@12,_cygwin_dll_entry@12,_cygwin_noncygwin_dll_entry@12 --output-def $objdir/$soname-def $objdir/$soname-ltdll.$objext $libobjs $convenience~
		410	***************
		411	* 1190,1204 **
		412	$CC $objdir/$soname-exp -Wl,--dll -nostartfiles -Wl,-e,__cygwin_dll_entry@12 -o $lib $objdir/$soname-ltdll.$objext $libobjs $deplibs $linkopts'
		413
		414	old_archive_from_new_cmds='$DLLTOOL --as=$AS --dllname $soname --def $objdir/$soname-def --output-lib $objdir/$libname.a'
		415	;;
227		416
228	netbsd*)	417	netbsd*)
229	if echo __ELF__ \| $CC -E - \| grep __ELF__ >/dev/null; then	418	if echo __ELF__ \| $CC -E - \| grep __ELF__ >/dev/null; then
Lines 235-241 Link Here
235	fi	424	fi
236	;;	425	;;
237		426
238	--- 1199,1221 ----	427	--- 1197,1248 ----
		428	$CC $objdir/$soname-exp -Wl,--dll -nostartfiles -Wl,-e,__cygwin_dll_entry@12 -o $lib $objdir/$soname-ltdll.$objext $libobjs $deplibs $linkopts'
		429
		430	old_archive_from_new_cmds='$DLLTOOL --as=$AS --dllname $soname --def $objdir/$soname-def --output-lib $objdir/$libname.a'
		431	+ ;;
		432	+ *)
		433	+ export_symbols_cmds='$DLLTOOL --export-all --exclude-symbols DllMain@12 --output-def $objdir/$soname-def $libobjs $convenience~
		434	+ sed -e "1,/EXPORTS/d" -e "s/ @ [0-9]//" -e "s/ ;.*$//" < $objdir/$soname-def > $export_symbols'
		435	+
		436	+ # If DATA tags from a recent dlltool are present, honour them!
		437	+ archive_expsym_cmds='echo EXPORTS > $objdir/$soname-def~
		438	+ _lt_hint=1;
		439	+ cat $export_symbols \| while read symbol; do
		440	+ set dummy \$symbol;
		441	+ case \$# in
		442	+ 2) echo " \$2 @ \$_lt_hint ; " >> $objdir/$soname-def;;
		443	+ *) echo " \$2 @ \$_lt_hint \$3 ; " >> $objdir/$soname-def;;
		444	+ esac;
		445	+ _lt_hint=`expr 1 + \$_lt_hint`;
		446	+ done~
		447	+ $CC -Wl,--base-file,$objdir/$soname-base -mdll -Wl,-e,_DllMainCRTStartup@12 -o $lib $libobjs $deplibs $linkopts~
		448	+ $DLLTOOL --as=$AS --dllname $soname --exclude-symbols DllMain@12 --def $objdir/$soname-def --base-file $objdir/$soname-base --output-exp $objdir/$soname-exp~
		449	+ $CC -Wl,--base-file,$objdir/$soname-base $objdir/$soname-exp -mdll -Wl,-e,_DllMainCRTStartup@12 -o $lib $libobjs $deplibs $linkopts~
		450	+ $DLLTOOL --as=$AS --dllname $soname --exclude-symbols DllMain@12 --def $objdir/$soname-def --base-file $objdir/$soname-base --output-exp $objdir/$soname-exp~
		451	+ $CC $objdir/$soname-exp -mdll -Wl,-e,_DllMainCRTStartup@12 -o $lib $libobjs $deplibs $linkopts'
		452	+
		453	+ old_archive_from_new_cmds='$DLLTOOL --as=$AS --dllname $soname --def $objdir/$soname-def --output-lib $objdir/$libname.a'
		454	+ ;;
		455	+ esac
		456	;;
239		457
240	netbsd*)	458	netbsd*)
241	if echo __ELF__ \| $CC -E - \| grep __ELF__ >/dev/null; then	459	if echo __ELF__ \| $CC -E - \| grep __ELF__ >/dev/null; then
Lines 260-267 Link Here
260	;;	478	;;
261		479
262	***************	480	***************
		481	* 1329,1334 **
		482	--- 1373,1379 ----
		483	# no search path for DLLs.
		484	hardcode_libdir_flag_spec=' '
		485	allow_undefined_flag=unsupported
		486	+ no_undefined_flag=yes
		487	# Tell ltmain to make .lib files, not .a files.
		488	libext=lib
		489	# FIXME: Setting linknames here is a bad hack.
		490	***************
263	* 1371,1376 **	491	* 1371,1376 **
264	--- 1388,1410 ----	492	--- 1416,1438 ----
265	hardcode_shlibpath_var=no	493	hardcode_shlibpath_var=no
266	;;	494	;;
267		495
Lines 300-306 Link Here
300	sco3.2v5*)	528	sco3.2v5*)
301	archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linkopts'	529	archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linkopts'
302	hardcode_shlibpath_var=no	530	hardcode_shlibpath_var=no
303	--- 1477,1483 ----	531	--- 1505,1511 ----
304	hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'	532	hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
305	hardcode_libdir_separator=:	533	hardcode_libdir_separator=:
306	;;	534	;;
Lines 309-316 Link Here
309	archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linkopts'	537	archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linkopts'
310	hardcode_shlibpath_var=no	538	hardcode_shlibpath_var=no
311	***************	539	***************
		540	* 1878,1884 **
		541	library_names_spec='${libname}`echo ${release} \| sed -e 's/[.]/-/g'`${versuffix}.dll $libname.lib'
		542	fi
		543	dynamic_linker='Win32 ld.exe'
		544	! deplibs_check_method='file_magic file format pei-i386(.architecture: i386)?'
		545	file_magic_cmd='${OBJDUMP} -f'
		546	# FIXME: first we should search . and the directory the executable is in
		547	shlibpath_var=PATH
		548	--- 1934,1947 ----
		549	library_names_spec='${libname}`echo ${release} \| sed -e 's/[.]/-/g'`${versuffix}.dll $libname.lib'
		550	fi
		551	dynamic_linker='Win32 ld.exe'
		552	! case "$host_os" in
		553	! cygwin*)
		554	! deplibs_check_method='file_magic file format pei-i386(.architecture: i386)?'
		555	! ;;
		556	! *)
		557	! deplibs_check_method='pass_all'
		558	! ;;
		559	! esac
		560	file_magic_cmd='${OBJDUMP} -f'
		561	# FIXME: first we should search . and the directory the executable is in
		562	shlibpath_var=PATH
		563	***************
312	* 1919,1924 **	564	* 1919,1924 **
313	--- 1947,1973 ----	565	--- 1982,2008 ----
314	esac	566	esac
315	;;	567	;;
316		568
Lines 347-353 Link Here
347	library_names_spec='${libname}${release}.so.$versuffix ${libname}${release}.so.$major ${libname}${release}.so $libname.so'	599	library_names_spec='${libname}${release}.so.$versuffix ${libname}${release}.so.$major ${libname}${release}.so $libname.so'
348	case "$host_os" in	600	case "$host_os" in
349	irix5*)	601	irix5*)
350	--- 2004,2010 ----	602	--- 2039,2045 ----
351	version_type=irix	603	version_type=irix
352	need_lib_prefix=no	604	need_lib_prefix=no
353	need_version=no	605	need_version=no
Lines 357-363 Link Here
357	irix5*)	609	irix5*)
358	***************	610	***************
359	* 2023,2028 **	611	* 2023,2028 **
360	--- 2072,2091 ----	612	--- 2107,2126 ----
361	shlibpath_var=LD_LIBRARY_PATH	613	shlibpath_var=LD_LIBRARY_PATH
362	;;	614	;;
363		615
Lines 394-405 Link Here
394	sco3.2v5*)	646	sco3.2v5*)
395	version_type=osf	647	version_type=osf
396	soname_spec='${libname}${release}.so$major'	648	soname_spec='${libname}${release}.so$major'
397	--- 2120,2125 ----	649	--- 2155,2160 ----
398	*** misc/db-3.2.9/dist/ltmain.sh 2000-08-06 20:32:00.000000000 +0200	650	*** misc/db-3.2.9/dist/ltmain.sh 2000-08-06 20:32:00.000000000 +0200

Lines 411-419 Link Here

(-)oo_1.1.1_src/berkeleydb/prj/d.lst.orig (-5 / +151 lines)
411	esac	730	esac
412	elif test "$arg" = "-lm"; then	731	elif test "$arg" = "-lm"; then
413	case "$host" in	732	case "$host" in
414	***************	733	! cygwin \| --beos*)
415	* 1086,1091 **
416	--- 1091,1101 ----
417	# These systems don't actually have math library (as such)	734	# These systems don't actually have math library (as such)
418	continue	735	continue
419	;;	736	;;
Lines 426-431 Link Here
426	fi	743	fi
427	deplibs="$deplibs $arg"	744	deplibs="$deplibs $arg"
428	***************	745	***************
		746	* 1362,1368 **
		747	compile_command="$compile_command $dir/$linklib"
		748	deplibs="$deplibs $dir/$linklib"
		749	case "$host" in
		750	! --cygwin* \| --mingw* \| --os2*)
		751	dllsearchdir=`cd "$dir" && pwd \|\| echo "$dir"`
		752	if test -n "$dllsearchpath"; then
		753	dllsearchpath="$dllsearchpath:$dllsearchdir"
		754	--- 1369,1375 ----
		755	compile_command="$compile_command $dir/$linklib"
		756	deplibs="$deplibs $dir/$linklib"
		757	case "$host" in
		758	! cygwin \| mingw \| --os2*)
		759	dllsearchdir=`cd "$dir" && pwd \|\| echo "$dir"`
		760	if test -n "$dllsearchpath"; then
		761	dllsearchpath="$dllsearchpath:$dllsearchdir"
		762	***************
		763	* 1569,1574 **
		764	--- 1576,1584 ----
		765	;;
		766
		767	*.la)
		768	+ # See if our shared archives depend on static archives.
		769	+ test -n "$old_archive_from_new_cmds" && build_old_libs=yes
		770	+
		771	# Make sure we only generate libraries of the form `libNAME.la'.
		772	case "$outputname" in
		773	lib*)
		774	***************
429	* 1753,1758 **	775	* 1753,1758 **
430	--- 1763,1778 ----	776	--- 1763,1778 ----
431	versuffix="-$major-$age-$revision"	777	versuffix="-$major-$age-$revision"
Lines 471-476 Link Here
471	versuffix=	817	versuffix=
472	else	818	else
473	***************	819	***************
		820	* 1792,1798 **
		821
		822	dependency_libs="$deplibs"
		823	case "$host" in
		824	! --cygwin* \| --mingw* \| --os2* \| --beos*)
		825	# these systems don't actually have a c library (as such)!
		826	;;
		827
		828	--- 1821,1827 ----
		829
		830	dependency_libs="$deplibs"
		831	case "$host" in
		832	! cygwin \| mingw \| --os2* \| --beos*)
		833	# these systems don't actually have a c library (as such)!
		834	;;
		835
		836	***************
474	* 1803,1808 **	837	* 1803,1808 **
475	--- 1832,1842 ----	838	--- 1832,1842 ----
476	# defer to whether the user wants -lc, or -lc_r	839	# defer to whether the user wants -lc, or -lc_r
Lines 484-486 Link Here
484	*)	847	*)
485	# Add libc to deplibs on all other systems.	848	# Add libc to deplibs on all other systems.
486	deplibs="$deplibs -lc"	849	deplibs="$deplibs -lc"
		850	***************
		851	* 2865,2873 **
		852	"
		853
		854	if test "$fast_install" = yes; then
		855	! echo >> $output "\
		856	! program=lt-'$outputname'
		857	progdir=\"\$thisdir/$objdir\"
		858
		859	if test ! -f \"\$progdir/\$program\" \|\| \\
		860	{ file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null \| sed 1q\`; \\
		861	--- 2899,2919 ----
		862	"
		863
		864	if test "$fast_install" = yes; then
		865	! case $host in
		866	! mingw)
		867	! echo >> $output "\
		868	! program=lt-'$outputname'\"$exeext\"
		869	! progdir=\`cygpath -m \"\$thisdir/$objdir\"\`
		870	! "
		871	! ;;
		872	! *)
		873	! echo >> $output "\
		874	! program=lt-'$outputname'\"$exeext\"
		875	progdir=\"\$thisdir/$objdir\"
		876	+ "
		877	+ ;;
		878	+ esac
		879	+ echo >> $output "\
		880
		881	if test ! -f \"\$progdir/\$program\" \|\| \\
		882	{ file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null \| sed 1q\`; \\
		883	***************
		884	* 2898,2907 **
		885	$rm \"\$progdir/\$file\"
		886	fi"
		887	else
		888	! echo >> $output "\
		889	! program='$outputname'
		890	progdir=\"\$thisdir/$objdir\"
		891	"
		892	fi
		893
		894	echo >> $output "\
		895	--- 2944,2964 ----
		896	$rm \"\$progdir/\$file\"
		897	fi"
		898	else
		899	! case $host in
		900	! mingw)
		901	! echo >> $output "\
		902	! program='$outputname'\"$exeext\"
		903	progdir=\"\$thisdir/$objdir\"
		904	+ progdir=\`cygpath -m \"\$thisdir/$objdir\"\`
		905	"
		906	+ ;;
		907	+ *)
		908	+ echo >> $output "\
		909	+ program='$outputname'\"$exeext\"
		910	+ progdir=\"\$thisdir/$objdir\"
		911	+ "
		912	+ ;;
		913	+ esac
914	fi
915
916	echo >> $output "\
917	***************
918	* 2937,2950 **
919	case $host in
920	# win32 systems need to use the prog path for dll
921	# lookup to work
922	! --cygwin*)
923	$echo >> $output "\
924	exec \$progdir/\$program \${1+\"\$@\"}
925	"
926	;;
927
928	# Backslashes separate directories on plain windows
929	! --mingw \| --os2*)
930	$echo >> $output "\
931	exec \$progdir\\\\\$program \${1+\"\$@\"}
932	"
933	--- 2994,3007 ----
934	case $host in
935	# win32 systems need to use the prog path for dll
936	# lookup to work
937	! cygwin)
938	$echo >> $output "\
939	exec \$progdir/\$program \${1+\"\$@\"}
940	"
941	;;
942
943	# Backslashes separate directories on plain windows
944	! mingw \| --os2*)
945	$echo >> $output "\
946	exec \$progdir\\\\\$program \${1+\"\$@\"}
947	"
948	--- misc/build/db-3.2.9/os/os_oflags.c.orig 2000-10-28 23:57:50.000000000 +0900
Lines 11-22 Link Here
11	..\%__SRC%\lib\libdb_java-3.2.so %_DEST%\lib%_EXT%\libdb_java-3.2.so	11	..\%__SRC%\lib\libdb_java-3.2.so %_DEST%\lib%_EXT%\libdb_java-3.2.so
12	..\%__SRC%\lib\libdb_cxx-3.2.so %_DEST%\lib%_EXT%\libdb_cxx-3.2.so	12	..\%__SRC%\lib\libdb_cxx-3.2.so %_DEST%\lib%_EXT%\libdb_cxx-3.2.so
13		13
		14	..\%__SRC%\lib\libdb-3.2.a %_DEST%\lib%_EXT%\libdb-3.2.a
		15	..\%__SRC%\lib\libdb_java-3.2.a %_DEST%\lib%_EXT%\libdb_java-3.2.a
		16	..\%__SRC%\lib\libdb_cxx-3.2.a %_DEST%\lib%_EXT%\libdb_cxx-3.2.a
		17
14	..\%__SRC%\lib\libdb-3.2.dylib %_DEST%\lib%_EXT%\libdb-3.2.dylib	18	..\%__SRC%\lib\libdb-3.2.dylib %_DEST%\lib%_EXT%\libdb-3.2.dylib
15	..\%__SRC%\lib\libdb_java-3.2.dylib %_DEST%\lib%_EXT%\libdb_java-3.2.dylib	19	..\%__SRC%\lib\libdb_java-3.2.dylib %_DEST%\lib%_EXT%\libdb_java-3.2.dylib
16	..\%__SRC%\lib\libdb_cxx-3.2.dylib %_DEST%\lib%_EXT%\libdb_cxx-3.2.dylib	20	..\%__SRC%\lib\libdb_cxx-3.2.dylib %_DEST%\lib%_EXT%\libdb_cxx-3.2.dylib
17		21
18	..\%__SRC%\bin\libdb32.dll %_DEST%\bin%_EXT%\libdb32.dll	22	..\%__SRC%\bin\libdb.dll %_DEST%\bin%_EXT%\.*
19	..\%__SRC%\bin\libdb_java32.dll %_DEST%\bin%_EXT%\libdb_java32.dll
20		23
21	..\%__SRC%\bin\db.jar %_DEST%\bin%_EXT%\db.jar	24	..\%__SRC%\bin\db.jar %_DEST%\bin%_EXT%\db.jar
22		25

Lines 99-109 Link Here

(-)oo_1.1.1_src/bridges/source/cpp_uno/mingw_intel/cpp2uno.cxx.orig (-56 / +66 lines)
99	// return	99	// return
100	typelib_TypeDescription * pReturnTypeDescr = 0;	100	typelib_TypeDescription * pReturnTypeDescr = 0;
101	if (pReturnTypeRef)	101	if (pReturnTypeRef)
		102	{
102	TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef );	103	TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef );
103		104	}
		105
104	void * pUnoReturn = 0;	106	void * pUnoReturn = 0;
105	void * pCppReturn = 0; // complex return ptr: if != 0 && != pUnoReturn, reconversion need	107	void * pCppReturn = 0; // complex return ptr: if != 0 && != pUnoReturn, reconversion need
106		108
107	if (pReturnTypeDescr)	109	if (pReturnTypeDescr)
108	{	110	{
109	if (cppu_isSimpleType( pReturnTypeDescr ))	111	if (cppu_isSimpleType( pReturnTypeDescr ))
Lines 114-120 Link Here
114	{	116	{
115	pCppReturn = (void *)pCppStack;	117	pCppReturn = (void *)pCppStack;
116	pCppStack += sizeof(void *);	118	pCppStack += sizeof(void *);
117		119
118	pUnoReturn = (cppu_relatesToInterface( pReturnTypeDescr )	120	pUnoReturn = (cppu_relatesToInterface( pReturnTypeDescr )
119	? alloca( pReturnTypeDescr->nSize )	121	? alloca( pReturnTypeDescr->nSize )
120	: pCppReturn); // direct way	122	: pCppReturn); // direct way
Lines 132-140 Link Here
132	sal_Int32 * pTempIndizes = (sal_Int32 )(pUnoArgs + (2 nParams));	134	sal_Int32 * pTempIndizes = (sal_Int32 )(pUnoArgs + (2 nParams));
133	// type descriptions for reconversions	135	// type descriptions for reconversions
134	typelib_TypeDescription ppTempParamTypeDescr = (typelib_TypeDescription )(pUnoArgs + (3 * nParams));	136	typelib_TypeDescription ppTempParamTypeDescr = (typelib_TypeDescription )(pUnoArgs + (3 * nParams));
135		137
136	sal_Int32 nTempIndizes = 0;	138	sal_Int32 nTempIndizes = 0;
137		139
138	for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos )	140	for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos )
139	{	141	{
140	const typelib_MethodParameter & rParam = pParams[nPos];	142	const typelib_MethodParameter & rParam = pParams[nPos];
Lines 170-178 Link Here
170	// is in/inout	172	// is in/inout
171	else if (cppu_relatesToInterface( pParamTypeDescr ))	173	else if (cppu_relatesToInterface( pParamTypeDescr ))
172	{	174	{
173	uno_copyAndConvertData( pUnoArgs[nPos] = alloca( pParamTypeDescr->nSize ),	175	::uno_copyAndConvertData(
174	(void *)pCppStack, pParamTypeDescr,	176	pUnoArgs[nPos] = alloca( pParamTypeDescr->nSize ),
175	&pThis->pBridge->aCpp2Uno );	177	(void *)pCppStack, pParamTypeDescr,
		178	&pThis->pBridge->aCpp2Uno );
176	pTempIndizes[nTempIndizes] = nPos; // has to be reconverted	179	pTempIndizes[nTempIndizes] = nPos; // has to be reconverted
177	// will be released at reconversion	180	// will be released at reconversion
178	ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;	181	ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
Lines 186-214 Link Here
186	}	189	}
187	pCppStack += sizeof(sal_Int32); // standard parameter length	190	pCppStack += sizeof(sal_Int32); // standard parameter length
188	}	191	}
189		192
190	// ExceptionHolder	193	// ExceptionHolder
191	uno_Any aUnoExc; // Any will be constructed by callee	194	uno_Any aUnoExc; // Any will be constructed by callee
192	uno_Any * pUnoExc = &aUnoExc;	195	uno_Any * pUnoExc = &aUnoExc;
193		196
194	// invoke uno dispatch call	197	// invoke uno dispatch call
195	(*pThis->pUnoI->pDispatcher)( pThis->pUnoI, pMemberTypeDescr, pUnoReturn, pUnoArgs, &pUnoExc );	198	(*pThis->pUnoI->pDispatcher)( pThis->pUnoI, pMemberTypeDescr, pUnoReturn, pUnoArgs, &pUnoExc );
196		199
197	// in case an exception occured...	200	// in case an exception occured...
198	if (pUnoExc)	201	if (pUnoExc)
199	{	202	{
200	// destruct temporary in/inout params	203	// destruct temporary in/inout params
201	for ( ; nTempIndizes--; )	204	while (nTempIndizes--)
202	{	205	{
203	sal_Int32 nIndex = pTempIndizes[nTempIndizes];	206	sal_Int32 nIndex = pTempIndizes[nTempIndizes];
204		207
205	if (pParams[nIndex].bIn) // is in/inout => was constructed	208	if (pParams[nIndex].bIn) // is in/inout => was constructed
206	uno_destructData( pUnoArgs[nIndex], ppTempParamTypeDescr[nTempIndizes], 0 );	209	{
		210	::uno_destructData( pUnoArgs[nIndex], ppTempParamTypeDescr[nTempIndizes], 0 );
		211	}
207	TYPELIB_DANGER_RELEASE( ppTempParamTypeDescr[nTempIndizes] );	212	TYPELIB_DANGER_RELEASE( ppTempParamTypeDescr[nTempIndizes] );
208	}	213	}
209	if (pReturnTypeDescr)	214	if (pReturnTypeDescr)
		215	{
210	TYPELIB_DANGER_RELEASE( pReturnTypeDescr );	216	TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
211		217	}
		218
212	raiseException( &aUnoExc, &pThis->pBridge->aUno2Cpp ); // has to destruct the any	219	raiseException( &aUnoExc, &pThis->pBridge->aUno2Cpp ); // has to destruct the any
213	// is here for dummy	220	// is here for dummy
214	return typelib_TypeClass_VOID;	221	return typelib_TypeClass_VOID;
Lines 216-236 Link Here
216	else // else no exception occured...	223	else // else no exception occured...
217	{	224	{
218	// temporary params	225	// temporary params
219	for ( ; nTempIndizes--; )	226	while (nTempIndizes--)
220	{	227	{
221	sal_Int32 nIndex = pTempIndizes[nTempIndizes];	228	sal_Int32 nIndex = pTempIndizes[nTempIndizes];
222	typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes];	229	typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes];
223		230
224	if (pParams[nIndex].bOut) // inout/out	231	if (pParams[nIndex].bOut) // inout/out
225	{	232	{
226	// convert and assign	233	// convert and assign
227	uno_destructData( pCppArgs[nIndex], pParamTypeDescr, cpp_release );	234	::uno_destructData(
228	uno_copyAndConvertData( pCppArgs[nIndex], pUnoArgs[nIndex], pParamTypeDescr,	235	pCppArgs[nIndex], pParamTypeDescr, cpp_release );
229	&pThis->pBridge->aUno2Cpp );	236	::uno_copyAndConvertData(
		237	pCppArgs[nIndex], pUnoArgs[nIndex], pParamTypeDescr,
		238	&pThis->pBridge->aUno2Cpp );
230	}	239	}
231	// destroy temp uno param	240	// destroy temp uno param
232	uno_destructData( pUnoArgs[nIndex], pParamTypeDescr, 0 );	241	::uno_destructData( pUnoArgs[nIndex], pParamTypeDescr, 0 );
233		242
234	TYPELIB_DANGER_RELEASE( pParamTypeDescr );	243	TYPELIB_DANGER_RELEASE( pParamTypeDescr );
235	}	244	}
236	// return	245	// return
Lines 238-247 Link Here
238	{	247	{
239	if (pUnoReturn != pCppReturn) // needs reconversion	248	if (pUnoReturn != pCppReturn) // needs reconversion
240	{	249	{
241	uno_copyAndConvertData( pCppReturn, pUnoReturn, pReturnTypeDescr,	250	::uno_copyAndConvertData(
242	&pThis->pBridge->aUno2Cpp );	251	pCppReturn, pUnoReturn, pReturnTypeDescr,
		252	&pThis->pBridge->aUno2Cpp );
243	// destroy temp uno return	253	// destroy temp uno return
244	uno_destructData( pUnoReturn, pReturnTypeDescr, 0 );	254	::uno_destructData(
		255	pUnoReturn, pReturnTypeDescr, 0 );
245	}	256	}
246	// complex return ptr is set to eax	257	// complex return ptr is set to eax
247	(void *)pRegisterReturn = pCppReturn;	258	(void *)pRegisterReturn = pCppReturn;
Lines 265-301 Link Here
265	sal_Int64 * pRegisterReturn /* space for register return */ )	276	sal_Int64 * pRegisterReturn /* space for register return */ )
266	{	277	{
267	OSL_ENSURE( sizeof(sal_Int32)==sizeof(void *), "### unexpected!" );	278	OSL_ENSURE( sizeof(sal_Int32)==sizeof(void *), "### unexpected!" );
268		279
269	// pCallStack: ret adr, [ret *], this, params	280	// pCallStack: ret adr, [ret *], this, params
270	// _this_ ptr is patched cppu_XInterfaceProxy object	281	// _this_ ptr is patched cppu_XInterfaceProxy object
271	cppu_cppInterfaceProxy * pCppI = NULL;	282	cppu_cppInterfaceProxy * pThis = NULL;
272	if( nVtableCall & 0x80000000 )	283	if( nVtableCall & 0x80000000 )
273	{	284	{
274	nVtableCall &= 0x7fffffff;	285	nVtableCall &= 0x7fffffff;
275	pCppI = (cppu_cppInterfaceProxy )(XInterface )*(pCallStack +2);	286	pThis = static_cast< cppu_cppInterfaceProxy * >(
		287	reinterpret_cast< XInterface * >( pCallStack[2] ) );
276	}	288	}
277	else	289	else
278	{	290	{
279	pCppI = (cppu_cppInterfaceProxy )(XInterface )*(pCallStack +1);	291	pThis = static_cast< cppu_cppInterfaceProxy * >(
		292	reinterpret_cast< XInterface * >( pCallStack[1] ) );
280	}	293	}
281		294
282	typelib_InterfaceTypeDescription * pTypeDescr = pCppI->pTypeDescr;	295	typelib_InterfaceTypeDescription * pTypeDescr = pThis->pTypeDescr;
283		296
284	OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );	297	OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
285	if (nVtableCall >= pTypeDescr->nMapFunctionIndexToMemberIndex)	298	if (nVtableCall >= pTypeDescr->nMapFunctionIndexToMemberIndex)
286	{	299	{
287	throw RuntimeException(	300	throw RuntimeException( OUString( RTL_CONSTASCII_USTRINGPARAM("illegal vtable index!") ),
288	OUString::createFromAscii("illegal vtable index!"),	301	(XInterface *)pThis );
289	(XInterface *)pCppI );
290	}	302	}
291		303
292	// determine called method	304	// determine called method
293	OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );	305	OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
294	sal_Int32 nMemberPos = pTypeDescr->pMapFunctionIndexToMemberIndex[nVtableCall];	306	sal_Int32 nMemberPos = pTypeDescr->pMapFunctionIndexToMemberIndex[nVtableCall];
295	OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### illegal member index!" );	307	OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### illegal member index!" );
296		308
297	TypeDescription aMemberDescr( pTypeDescr->ppAllMembers[nMemberPos] );	309	TypeDescription aMemberDescr( pTypeDescr->ppAllMembers[nMemberPos] );
298		310
299	typelib_TypeClass eRet;	311	typelib_TypeClass eRet;
300	switch (aMemberDescr.get()->eTypeClass)	312	switch (aMemberDescr.get()->eTypeClass)
301	{	313	{
Lines 305-311 Link Here
305	{	317	{
306	// is GET method	318	// is GET method
307	eRet = cpp2uno_call(	319	eRet = cpp2uno_call(
308	pCppI, aMemberDescr.get(),	320	pThis, aMemberDescr.get(),
309	((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef,	321	((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef,
310	0, 0, // no params	322	0, 0, // no params
311	pCallStack, pRegisterReturn );	323	pCallStack, pRegisterReturn );
Lines 318-326 Link Here
318	((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef;	330	((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef;
319	aParam.bIn = sal_True;	331	aParam.bIn = sal_True;
320	aParam.bOut = sal_False;	332	aParam.bOut = sal_False;
321		333
322	eRet = cpp2uno_call(	334	eRet = cpp2uno_call(
323	pCppI, aMemberDescr.get(),	335	pThis, aMemberDescr.get(),
324	0, // indicates void return	336	0, // indicates void return
325	1, &aParam,	337	1, &aParam,
326	pCallStack, pRegisterReturn );	338	pCallStack, pRegisterReturn );
Lines 332-343 Link Here
332	// is METHOD	344	// is METHOD
333	switch (nVtableCall)	345	switch (nVtableCall)
334	{	346	{
		347	// standard XInterface vtable calls
335	case 1: // acquire()	348	case 1: // acquire()
336	pCppI->acquireProxy(); // non virtual call!	349	pThis->acquireProxy(); // non virtual call!
337	eRet = typelib_TypeClass_VOID;	350	eRet = typelib_TypeClass_VOID;
338	break;	351	break;
339	case 2: // release()	352	case 2: // release()
340	pCppI->releaseProxy(); // non virtual call!	353	pThis->releaseProxy(); // non virtual call!
341	eRet = typelib_TypeClass_VOID;	354	eRet = typelib_TypeClass_VOID;
342	break;	355	break;
343	case 0: // queryInterface() opt	356	case 0: // queryInterface() opt
Lines 345-356 Link Here
345	typelib_TypeDescription * pTD = 0;	358	typelib_TypeDescription * pTD = 0;
346	TYPELIB_DANGER_GET( &pTD, reinterpret_cast< Type * >( pCallStack[3] )->getTypeLibType() );	359	TYPELIB_DANGER_GET( &pTD, reinterpret_cast< Type * >( pCallStack[3] )->getTypeLibType() );
347	if (pTD)	360	if (pTD)
348	{	361	{
349	XInterface * pInterface = 0;	362	XInterface * pInterface = 0;
350	(*pCppI->pBridge->pCppEnv->getRegisteredInterface)(	363	(*pThis->pBridge->pCppEnv->getRegisteredInterface)(
351	pCppI->pBridge->pCppEnv,	364	pThis->pBridge->pCppEnv,
352	(void *)&pInterface, pCppI->oid.pData, (typelib_InterfaceTypeDescription )pTD );	365	(void *)&pInterface, pThis->oid.pData, (typelib_InterfaceTypeDescription )pTD );
353		366
354	if (pInterface)	367	if (pInterface)
355	{	368	{
356	::uno_any_construct(	369	::uno_any_construct(
Lines 367-373 Link Here
367	} // else perform queryInterface()	380	} // else perform queryInterface()
368	default:	381	default:
369	eRet = cpp2uno_call(	382	eRet = cpp2uno_call(
370	pCppI, aMemberDescr.get(),	383	pThis, aMemberDescr.get(),
371	((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pReturnTypeRef,	384	((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pReturnTypeRef,
372	((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->nParams,	385	((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->nParams,
373	((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pParams,	386	((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pParams,
Lines 378-385 Link Here
378	default:	391	default:
379	{	392	{
380	throw RuntimeException(	393	throw RuntimeException(
381	OUString::createFromAscii("no member description found!"),	394	OUString( RTL_CONSTASCII_USTRINGPARAM("no member description found!") ),
382	(XInterface *)pCppI );	395	(XInterface *)pThis );
383	// is here for dummy	396	// is here for dummy
384	eRet = typelib_TypeClass_VOID;	397	eRet = typelib_TypeClass_VOID;
385	}	398	}
Lines 546-552 Link Here
546		559
547	//==================================================================================================	560	//==================================================================================================
548	void SAL_CALL cppu_cppInterfaceProxy_patchVtable(	561	void SAL_CALL cppu_cppInterfaceProxy_patchVtable(
549	XInterface * pCppI, typelib_InterfaceTypeDescription * pTypeDescr ) throw ()	562	XInterface * pThis, typelib_InterfaceTypeDescription * pTypeDescr ) throw ()
550	{	563	{
551	static MediateClassData * s_pMediateClassData = 0;	564	static MediateClassData * s_pMediateClassData = 0;
552	if (! s_pMediateClassData)	565	if (! s_pMediateClassData)
Lines 562-568 Link Here
562	#endif	575	#endif
563	}	576	}
564	}	577	}
565	(void const *)pCppI = s_pMediateClassData->get_vtable( pTypeDescr );	578	(void const *)pThis = s_pMediateClassData->get_vtable( pTypeDescr );
566	}	579	}
567		580
568	}	581	}
Lines 573-594 Link Here
573	sal_Bool SAL_CALL component_canUnload( TimeValue * pTime )	586	sal_Bool SAL_CALL component_canUnload( TimeValue * pTime )
574	SAL_THROW_EXTERN_C()	587	SAL_THROW_EXTERN_C()
575	{	588	{
576	return CPPU_CURRENT_NAMESPACE::g_moduleCount.canUnload(	589	return CPPU_CURRENT_NAMESPACE::g_moduleCount.canUnload( &CPPU_CURRENT_NAMESPACE::g_moduleCount, pTime );
577	&CPPU_CURRENT_NAMESPACE::g_moduleCount, pTime );
578	}	590	}
579	//##################################################################################################	591	//##################################################################################################
580	void SAL_CALL uno_initEnvironment( uno_Environment * pCppEnv )	592	void SAL_CALL uno_initEnvironment( uno_Environment * pCppEnv )
581	SAL_THROW_EXTERN_C()	593	SAL_THROW_EXTERN_C()
582	{	594	{
583	CPPU_CURRENT_NAMESPACE::cppu_cppenv_initEnvironment(	595	CPPU_CURRENT_NAMESPACE::cppu_cppenv_initEnvironment( pCppEnv );
584	pCppEnv );
585	}	596	}
586	//##################################################################################################	597	//##################################################################################################
587	void SAL_CALL uno_ext_getMapping(	598	void SAL_CALL uno_ext_getMapping(
588	uno_Mapping ** ppMapping, uno_Environment * pFrom, uno_Environment * pTo )	599	uno_Mapping ** ppMapping, uno_Environment * pFrom, uno_Environment * pTo )
589	SAL_THROW_EXTERN_C()	600	SAL_THROW_EXTERN_C()
590	{	601	{
591	CPPU_CURRENT_NAMESPACE::cppu_ext_getMapping(	602	CPPU_CURRENT_NAMESPACE::cppu_ext_getMapping( ppMapping, pFrom, pTo );
592	ppMapping, pFrom, pTo );
593	}	603	}
594	}	604	}

Lines 164-173 Link Here

(-)oo_1.1.1_src/bridges/source/cpp_uno/mingw_intel/uno2cpp.cxx.orig (-52 / +65 lines)
164	sal_Int32 nParams, typelib_MethodParameter * pParams,	164	sal_Int32 nParams, typelib_MethodParameter * pParams,
165	void * pUnoReturn, void * pUnoArgs[], uno_Any ** ppUnoExc )	165	void * pUnoReturn, void * pUnoArgs[], uno_Any ** ppUnoExc )
166	{	166	{
167	// max space for: [complex ret ptr], values\|ptr ...	167	// max space for: [complex ret ptr], values\|ptr ...
168	char * pCppStack =	168	char * pCppStack = (char )alloca( sizeof(sal_Int32) + ((nParams+2) sizeof(sal_Int64)) );
169	(char )alloca( sizeof(sal_Int32) + ((nParams+2) sizeof(sal_Int64)) );	169	char * pCppStackStart = pCppStack;
170	char * pCppStackStart = pCppStack;
171		170
172	// return	171	// return
173	typelib_TypeDescription * pReturnTypeDescr = 0;	172	typelib_TypeDescription * pReturnTypeDescr = 0;
Lines 196-201 Link Here
196	pCppStack += sizeof( void* );	195	pCppStack += sizeof( void* );
197		196
198	// stack space	197	// stack space
		198
199	OSL_ENSURE( sizeof(void *) == sizeof(sal_Int32), "### unexpected size!" );	199	OSL_ENSURE( sizeof(void *) == sizeof(sal_Int32), "### unexpected size!" );
200	// args	200	// args
201	void pCppArgs = (void )alloca( 3 * sizeof(void ) nParams );	201	void pCppArgs = (void )alloca( 3 * sizeof(void ) nParams );
Lines 214-221 Link Here
214		214
215	if (!rParam.bOut && cppu_isSimpleType( pParamTypeDescr ))	215	if (!rParam.bOut && cppu_isSimpleType( pParamTypeDescr ))
216	{	216	{
217	uno_copyAndConvertData( pCppArgs[nPos] = pCppStack, pUnoArgs[nPos], pParamTypeDescr,	217	::uno_copyAndConvertData(
218	&pThis->pBridge->aUno2Cpp );	218	pCppArgs[nPos] = pCppStack, pUnoArgs[nPos], pParamTypeDescr,
		219	&pThis->pBridge->aUno2Cpp );
219		220
220	switch (pParamTypeDescr->eTypeClass)	221	switch (pParamTypeDescr->eTypeClass)
221	{	222	{
Lines 232-238 Link Here
232	if (! rParam.bIn) // is pure out	233	if (! rParam.bIn) // is pure out
233	{	234	{
234	// cpp out is constructed mem, uno out is not!	235	// cpp out is constructed mem, uno out is not!
235	uno_constructData(	236	::uno_constructData(
236	(void *)pCppStack = pCppArgs[nPos] = alloca( pParamTypeDescr->nSize ),	237	(void *)pCppStack = pCppArgs[nPos] = alloca( pParamTypeDescr->nSize ),
237	pParamTypeDescr );	238	pParamTypeDescr );
238	pTempIndizes[nTempIndizes] = nPos; // default constructed for cpp call	239	pTempIndizes[nTempIndizes] = nPos; // default constructed for cpp call
Lines 242-250 Link Here
242	// is in/inout	243	// is in/inout
243	else if (cppu_relatesToInterface( pParamTypeDescr ))	244	else if (cppu_relatesToInterface( pParamTypeDescr ))
244	{	245	{
245	uno_copyAndConvertData(	246	::uno_copyAndConvertData(
246	(void *)pCppStack = pCppArgs[nPos] = alloca( pParamTypeDescr->nSize ),	247	(void *)pCppStack = pCppArgs[nPos] = alloca( pParamTypeDescr->nSize ),
247	pUnoArgs[nPos], pParamTypeDescr, &pThis->pBridge->aUno2Cpp );	248	pUnoArgs[nPos], pParamTypeDescr,
		249	&pThis->pBridge->aUno2Cpp );
248		250
249	pTempIndizes[nTempIndizes] = nPos; // has to be reconverted	251	pTempIndizes[nTempIndizes] = nPos; // has to be reconverted
250	// will be released at reconversion	252	// will be released at reconversion
Lines 262-335 Link Here
262		264
263	try	265	try
264	{	266	{
265	OSL_ENSURE( !( (pCppStack - pCppStackStart ) & 3), "UNALIGNED STACK !!! (Please DO panic)" );	267	OSL_ENSURE( !( (pCppStack - pCppStackStart ) & 3), "UNALIGNED STACK !!! (Please DO panic)" );
266	callVirtualMethod(	268	callVirtualMethod(
267	pThis->pCppI, nVtableCall,	269	pThis->pCppI, nVtableCall,
268	pCppReturn, pReturnTypeDescr->eTypeClass,	270	pCppReturn, pReturnTypeDescr->eTypeClass,
269	(sal_Int32 *)pCppStackStart, (pCppStack - pCppStackStart) / sizeof(sal_Int32) );	271	(sal_Int32 *)pCppStackStart, (pCppStack - pCppStackStart) / sizeof(sal_Int32) );
270	// NO exception occured...
271	*ppUnoExc = 0;
272
273	// reconvert temporary params
274	for ( ; nTempIndizes--; )
275	{
276	sal_Int32 nIndex = pTempIndizes[nTempIndizes];
277	typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes];
278		272
279	if (pParams[nIndex].bIn)	273	// NO exception occured...
		274	*ppUnoExc = 0;
		275
		276	// reconvert temporary params
		277	while (nTempIndizes--)
280	{	278	{
281	if (pParams[nIndex].bOut) // inout	279	sal_Int32 nIndex = pTempIndizes[nTempIndizes];
		280	typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes];
		281
		282	if (pParams[nIndex].bIn)
282	{	283	{
283	uno_destructData( pUnoArgs[nIndex], pParamTypeDescr, 0 ); // destroy uno value	284	if (pParams[nIndex].bOut) // inout
284	uno_copyAndConvertData( pUnoArgs[nIndex], pCppArgs[nIndex], pParamTypeDescr,	285	{
285	&pThis->pBridge->aCpp2Uno );	286	::uno_destructData(
		287	pUnoArgs[nIndex], pParamTypeDescr, 0 ); // destroy uno value
		288	::uno_copyAndConvertData(
		289	pUnoArgs[nIndex], pCppArgs[nIndex], pParamTypeDescr,
		290	&pThis->pBridge->aCpp2Uno );
		291	}
286	}	292	}
		293	else // pure out
		294	{
		295	::uno_copyAndConvertData(
		296	pUnoArgs[nIndex], pCppArgs[nIndex], pParamTypeDescr,
		297	&pThis->pBridge->aCpp2Uno );
		298	}
		299	// destroy temp cpp param => cpp: every param was constructed
		300	::uno_destructData(
		301	pCppArgs[nIndex], pParamTypeDescr, cpp_release );
		302
		303	TYPELIB_DANGER_RELEASE( pParamTypeDescr );
287	}	304	}
288	else // pure out	305	// return value
		306	if (pCppReturn && pUnoReturn != pCppReturn)
289	{	307	{
290	uno_copyAndConvertData( pUnoArgs[nIndex], pCppArgs[nIndex], pParamTypeDescr,	308	::uno_copyAndConvertData(
291	&pThis->pBridge->aCpp2Uno );	309	pUnoReturn, pCppReturn, pReturnTypeDescr,
		310	&pThis->pBridge->aCpp2Uno );
		311	::uno_destructData(
		312	pCppReturn, pReturnTypeDescr, cpp_release );
292	}	313	}
293	// destroy temp cpp param => cpp: every param was constructed
294	uno_destructData( pCppArgs[nIndex], pParamTypeDescr, cpp_release );
295
296	TYPELIB_DANGER_RELEASE( pParamTypeDescr );
297	}
298	// return value
299	if (pCppReturn && pUnoReturn != pCppReturn)
300	{
301	uno_copyAndConvertData( pUnoReturn, pCppReturn, pReturnTypeDescr,
302	&pThis->pBridge->aCpp2Uno );
303	uno_destructData( pCppReturn, pReturnTypeDescr, cpp_release );
304	}
305	}	314	}
306	catch (...)	315	catch (...)
307	{	316	{
308	// fill uno exception	317	// fill uno exception
309	fillUnoException( __cxa_get_globals()->caughtExceptions, *ppUnoExc, &pThis->pBridge->aCpp2Uno );	318	fillUnoException( __cxa_get_globals()->caughtExceptions, *ppUnoExc, &pThis->pBridge->aCpp2Uno );
310		319
311	// temporary params
312	for ( ; nTempIndizes--; )
313	{	320	{
314	sal_Int32 nIndex = pTempIndizes[nTempIndizes];	321	// temporary params
315	// destroy temp cpp param => cpp: every param was constructed	322	while (nTempIndizes--)
316	uno_destructData( pCppArgs[nIndex], ppTempParamTypeDescr[nTempIndizes], cpp_release );	323	{
317	TYPELIB_DANGER_RELEASE( ppTempParamTypeDescr[nTempIndizes] );	324	sal_Int32 nIndex = pTempIndizes[nTempIndizes];
		325	// destroy temp cpp param => cpp: every param was constructed
		326	::uno_destructData(
		327	pCppArgs[nIndex], ppTempParamTypeDescr[nTempIndizes], cpp_release );
		328	TYPELIB_DANGER_RELEASE( ppTempParamTypeDescr[nTempIndizes] );
		329	}
318	}	330	}
319	// return type	331	// return type
320	if (pReturnTypeDescr)	332	if (pReturnTypeDescr)
		333	{
321	TYPELIB_DANGER_RELEASE( pReturnTypeDescr );	334	TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
		335	}
322	}	336	}
323	}	337	}
324		338
325
326	//==================================================================================================	339	//==================================================================================================
327	void SAL_CALL cppu_unoInterfaceProxy_dispatch(	340	void SAL_CALL cppu_unoInterfaceProxy_dispatch(
328	uno_Interface * pUnoI, const typelib_TypeDescription * pMemberDescr,	341	uno_Interface * pUnoI, const typelib_TypeDescription * pMemberDescr,
329	void * pReturn, void * pArgs[], uno_Any ** ppException ) throw ()	342	void * pReturn, void * pArgs[], uno_Any ** ppException ) throw ()
330	{	343	{
331	// is my surrogate	344	// is my surrogate
332	cppu_unoInterfaceProxy * pThis = (cppu_unoInterfaceProxy *)pUnoI;	345	cppu_unoInterfaceProxy * pThis = static_cast< cppu_unoInterfaceProxy * >( pUnoI );
333	typelib_InterfaceTypeDescription * pTypeDescr = pThis->pTypeDescr;	346	typelib_InterfaceTypeDescription * pTypeDescr = pThis->pTypeDescr;
334		347
335	switch (pMemberDescr->eTypeClass)	348	switch (pMemberDescr->eTypeClass)
Lines 360-366 Link Here
360	((typelib_InterfaceAttributeTypeDescription *)pMemberDescr)->pAttributeTypeRef;	373	((typelib_InterfaceAttributeTypeDescription *)pMemberDescr)->pAttributeTypeRef;
361	aParam.bIn = sal_True;	374	aParam.bIn = sal_True;
362	aParam.bOut = sal_False;	375	aParam.bOut = sal_False;
363		376
364	typelib_TypeDescriptionReference * pReturnTypeRef = 0;	377	typelib_TypeDescriptionReference * pReturnTypeRef = 0;
365	OUString aVoidName( RTL_CONSTASCII_USTRINGPARAM("void") );	378	OUString aVoidName( RTL_CONSTASCII_USTRINGPARAM("void") );
366	typelib_typedescriptionreference_new(	379	typelib_typedescriptionreference_new(
Lines 403-409 Link Here
403	typelib_TypeDescription * pTD = 0;	416	typelib_TypeDescription * pTD = 0;
404	TYPELIB_DANGER_GET( &pTD, reinterpret_cast< Type * >( pArgs[0] )->getTypeLibType() );	417	TYPELIB_DANGER_GET( &pTD, reinterpret_cast< Type * >( pArgs[0] )->getTypeLibType() );
405	if (pTD)	418	if (pTD)
406	{	419	{
407	uno_Interface * pInterface = 0;	420	uno_Interface * pInterface = 0;
408	(*pThis->pBridge->pUnoEnv->getRegisteredInterface)(	421	(*pThis->pBridge->pUnoEnv->getRegisteredInterface)(
409	pThis->pBridge->pUnoEnv,	422	pThis->pBridge->pUnoEnv,

Lines 72-77 Link Here

(-)oo_1.1.1_src/configmgr/source/api2/apinodeupdate.hxx.orig (-2 / +8 lines)
72	#include "utility.hxx"	72	#include "utility.hxx"
73	#endif	73	#endif
74		74
		75	#if (defined(_MSC_VER) && (_MSC_VER >= 1310))
		76	#define TYPENAME_ON_RETURN typename
		77	#else
		78	#define TYPENAME_ON_RETURN
		79	#endif
		80
75	namespace configmgr	81	namespace configmgr
76	{	82	{
77	namespace configuration	83	namespace configuration
Lines 207-219 Link Here
207	}	213	}
208		214
209	template <class Access>	215	template <class Access>
210	GuardedNodeUpdate<Access>::Updater GuardedNodeUpdate<Access>::getNodeUpdater() const	216	TYPENAME_ON_RETURN GuardedNodeUpdate<Access>::Updater GuardedNodeUpdate<Access>::getNodeUpdater() const
211	{	217	{
212	return get().getNodeUpdater(this->getDataAccessor());	218	return get().getNodeUpdater(this->getDataAccessor());
213	}	219	}
214		220
215	template <class Access>	221	template <class Access>
216	GuardedNodeUpdate<Access>::Defaulter GuardedNodeUpdate<Access>::getNodeDefaulter() const	222	TYPENAME_ON_RETURN GuardedNodeUpdate<Access>::Defaulter GuardedNodeUpdate<Access>::getNodeDefaulter() const
217	{	223	{
218	return get().getNodeDefaulter(this->getDataAccessor());	224	return get().getNodeDefaulter(this->getDataAccessor());
219	}	225	}

Lines 225-231 Link Here

(-)oo_1.1.1_src/connectivity/source/drivers/ado/ATable.cxx.orig (-5 / +5 lines)
225	void SAL_CALL OAdoTable::rename( const ::rtl::OUString& newName ) throw(SQLException, ElementExistException, RuntimeException)	225	void SAL_CALL OAdoTable::rename( const ::rtl::OUString& newName ) throw(SQLException, ElementExistException, RuntimeException)
226	{	226	{
227	::osl::MutexGuard aGuard(m_aMutex);	227	::osl::MutexGuard aGuard(m_aMutex);
228	checkDisposed(rBHelper.bDisposed);	228	checkDisposed(OTableDescriptor_BASE_TYPEDEF::rBHelper.bDisposed);
229		229
230	m_aTable.put_Name(newName);	230	m_aTable.put_Name(newName);
231	ADOS::ThrowException((m_pCatalog->getConnection()->getConnection()),this);	231	ADOS::ThrowException((m_pCatalog->getConnection()->getConnection()),this);
Lines 237-243 Link Here
237	void SAL_CALL OAdoTable::alterColumnByName( const ::rtl::OUString& colName, const Reference< XPropertySet >& descriptor ) throw(SQLException, NoSuchElementException, RuntimeException)	237	void SAL_CALL OAdoTable::alterColumnByName( const ::rtl::OUString& colName, const Reference< XPropertySet >& descriptor ) throw(SQLException, NoSuchElementException, RuntimeException)
238	{	238	{
239	::osl::MutexGuard aGuard(m_aMutex);	239	::osl::MutexGuard aGuard(m_aMutex);
240	checkDisposed(rBHelper.bDisposed);	240	checkDisposed(OTableDescriptor_BASE_TYPEDEF::rBHelper.bDisposed);
241		241
242	sal_Bool bError = sal_True;	242	sal_Bool bError = sal_True;
243	OAdoColumn* pColumn = NULL;	243	OAdoColumn* pColumn = NULL;
Lines 257-263 Link Here
257	void SAL_CALL OAdoTable::alterColumnByIndex( sal_Int32 index, const Reference< XPropertySet >& descriptor ) throw(SQLException, ::com::sun::star::lang::IndexOutOfBoundsException, RuntimeException)	257	void SAL_CALL OAdoTable::alterColumnByIndex( sal_Int32 index, const Reference< XPropertySet >& descriptor ) throw(SQLException, ::com::sun::star::lang::IndexOutOfBoundsException, RuntimeException)
258	{	258	{
259	::osl::MutexGuard aGuard(m_aMutex);	259	::osl::MutexGuard aGuard(m_aMutex);
260	checkDisposed(rBHelper.bDisposed);	260	checkDisposed(OTableDescriptor_BASE_TYPEDEF::rBHelper.bDisposed);
261		261
262	Reference< XPropertySet > xOld;	262	Reference< XPropertySet > xOld;
263	m_pColumns->getByIndex(index) >>= xOld;	263	m_pColumns->getByIndex(index) >>= xOld;
Lines 297-308 Link Here
297	OTable_TYPEDEF::setFastPropertyValue_NoBroadcast(nHandle,rValue);	297	OTable_TYPEDEF::setFastPropertyValue_NoBroadcast(nHandle,rValue);
298	}	298	}
299	// -------------------------------------------------------------------------	299	// -------------------------------------------------------------------------
300	void SAL_CALL OAdoTable::acquire() throw(::com::sun::star::uno::RuntimeException)	300	void SAL_CALL OAdoTable::acquire() throw()
301	{	301	{
302	OTable_TYPEDEF::acquire();	302	OTable_TYPEDEF::acquire();
303	}	303	}
304	// -----------------------------------------------------------------------------	304	// -----------------------------------------------------------------------------
305	void SAL_CALL OAdoTable::release() throw(::com::sun::star::uno::RuntimeException)	305	void SAL_CALL OAdoTable::release() throw()
306	{	306	{
307	OTable_TYPEDEF::release();	307	OTable_TYPEDEF::release();
308	}	308	}

Lines 1775-1781 Link Here

(-)oo_1.1.1_src/crashrep/source/win32/soreport.cpp.orig (+38 lines)
1775	static bool ParseCommandArgs( LPDWORD pdwProcessId, PEXCEPTION_POINTERS* ppException, LPDWORD pdwThreadId )	1775	static bool ParseCommandArgs( LPDWORD pdwProcessId, PEXCEPTION_POINTERS* ppException, LPDWORD pdwThreadId )
1776	{	1776	{
1777	int argc = __argc;	1777	int argc = __argc;
		1778	#ifdef __MINGW32__
		1779	#ifdef _UNICODE
		1780	TCHAR *argv = alloca((argc+1)sizeof(WCHAR*));
		1781	int sizes = alloca(argcsizeof(int));
		1782	int argsize=0;
		1783	char **ptr;
		1784	int i;
		1785	ptr=__argv;
		1786	for (i = 0; i < argc; ++i)
		1787	{
		1788	sizes[i]=MultiByteToWideChar(CP_ACP, 0, *ptr, -1, NULL, 0);
		1789	argsize+=sizes[i]+1;
		1790	++ptr;
		1791	}
		1792	++argsize;
		1793	TCHAR args = alloca(argsizesizeof(WCHAR));
		1794	ptr=__argv;
		1795	TCHAR *cptr=args;
		1796	for (i = 0; i < argc; ++i)
		1797	{
		1798	argv[i]=cptr;
		1799	MultiByteToWideChar( CP_ACP, 0, *ptr, -1, cptr, sizes[i] );
		1800	++ptr;
		1801	cptr+=sizes[i];
		1802	*cptr=0;
		1803	++cptr;
		1804	}
		1805	argv[i]=cptr;
		1806	*cptr=0;
		1807	#else
		1808	TCHAR **argv = __argv;
		1809	#endif
		1810	#else
1778	TCHAR **argv = __targv;	1811	TCHAR **argv = __targv;
		1812	#endif
1779	bool bSuccess = true;	1813	bool bSuccess = true;
1780		1814
1781	for ( int argn = 1; bSuccess && argn < argc; argn++ )	1815	for ( int argn = 1; bSuccess && argn < argc; argn++ )
Lines 2477-2483 Link Here
2477		2511
2478	//***************************************************************************	2512	//***************************************************************************
2479		2513
		2514	#ifdef __MINGW32__
		2515	int WINAPI WinMain( HINSTANCE hInstance, HINSTANCE, LPSTR lpCmdLine, int )
		2516	#else
2480	int WINAPI _tWinMain( HINSTANCE hInstance, HINSTANCE, LPTSTR lpCmdLine, int )	2517	int WINAPI _tWinMain( HINSTANCE hInstance, HINSTANCE, LPTSTR lpCmdLine, int )
		2518	#endif
2481	{	2519	{
2482	int exitcode = -1;	2520	int exitcode = -1;
2483		2521

Lines 83-89 Link Here

(-)- misc/build/curl-7.9.8/lib/ftp.c (-4 / +4 lines)
83	if (data->set.tunnel_thru_httpproxy) {	1093	if (data->set.tunnel_thru_httpproxy) {
84	/* We want "seamless" FTP operations through HTTP proxy tunnel */	1094	/* We want "seamless" FTP operations through HTTP proxy tunnel */
85	result = Curl_ConnectHTTPProxyTunnel(conn, conn->firstsocket,	1095	result = Curl_ConnectHTTPProxyTunnel(conn, conn->firstsocket,
86	--- 441,447 ----	1096	--- 448,454 ----
87	/* no need to duplicate them, the data struct won't change */	1097	/* no need to duplicate them, the data struct won't change */
88	ftp->user = data->state.user;	1098	ftp->user = data->state.user;
89	ftp->passwd = data->state.passwd;	1099	ftp->passwd = data->state.passwd;
Lines 100-106 Link Here
100	if(conn->protocol & PROT_FTPS) {	1110	if(conn->protocol & PROT_FTPS) {
101	/* FTPS is simply ftp with SSL for the control channel */	1111	/* FTPS is simply ftp with SSL for the control channel */
102	/* now, perform the SSL initialization for this socket */	1112	/* now, perform the SSL initialization for this socket */
103	--- 449,455 ----	1113	--- 456,462 ----
104	if(CURLE_OK != result)	1114	if(CURLE_OK != result)
105	return result;	1115	return result;
106	}	1116	}
Lines 117-123 Link Here
117	if (data->set.tunnel_thru_httpproxy) {	1127	if (data->set.tunnel_thru_httpproxy) {
118	/* We want "seamless" FTP operations through HTTP proxy tunnel */	1128	/* We want "seamless" FTP operations through HTTP proxy tunnel */
119	result = Curl_ConnectHTTPProxyTunnel(conn, conn->secondarysocket,	1129	result = Curl_ConnectHTTPProxyTunnel(conn, conn->secondarysocket,
120	--- 1491,1497 ----	1130	--- 1498,1504 ----
121		1131
122	if(CURLE_OK != result)	1132	if(CURLE_OK != result)
123	return result;	1133	return result;
Lines 134-140 Link Here
134	return CURLE_OK;	1144	return CURLE_OK;
135	}	1145	}
136		1146
137	--- 1499,1505 ----	1147	--- 1506,1512 ----
138	if(CURLE_OK != result)	1148	if(CURLE_OK != result)
139	return result;	1149	return result;
140	}	1150	}
Lines 143-152 Link Here
143	}	1153	}
144		1154
145	*** misc/curl-7.9.8/lib/transfer.c Thu Jun 13 10:12:22 2002	1155	*** misc/curl-7.9.8/lib/transfer.c Thu Jun 13 10:12:22 2002

Lines 334-345 Link Here

(-)oo_1.1.1_src/dbaccess/source/ui/inc/genericcontroller.hxx.orig (-2 / +2 lines)
334	virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > getComponentWindow() const;	334	virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > getComponentWindow() const;
335	// if xListener is NULL the change will be forwarded to all listeners to the given ::com::sun::star::util::URL	335	// if xListener is NULL the change will be forwarded to all listeners to the given ::com::sun::star::util::URL
336	// if _bForceBroadcast is sal_True, the current feature state is broadcasted no matter if it is the same as the cached state	336	// if _bForceBroadcast is sal_True, the current feature state is broadcasted no matter if it is the same as the cached state
337	virtual void InvalidateFeature(const ::rtl::OUString& rURLPath, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > & xListener = ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > (), sal_Bool _bForceBroadcast = sal_False);	337	virtual void InvalidateFeature(const ::rtl::OUString& rURLPath, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > * pxListener = NULL, sal_Bool _bForceBroadcast = sal_False);
338		338
339	// if there is an ::com::sun::star::util::URL translation for the id ('handle') the preceding InvalidateFeature is used.	339	// if there is an ::com::sun::star::util::URL translation for the id ('handle') the preceding InvalidateFeature is used.
340	// if there is a toolbar slot with the given id it is updated (the new state is determined via GetState)	340	// if there is a toolbar slot with the given id it is updated (the new state is determined via GetState)
341	// if _bForceBroadcast is sal_True, the current feature state is broadcasted no matter if it is the same as the cached state	341	// if _bForceBroadcast is sal_True, the current feature state is broadcasted no matter if it is the same as the cached state
342	virtual void InvalidateFeature(sal_uInt16 nId, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > & xListener = ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > (), sal_Bool _bForceBroadcast = sal_False);	342	virtual void InvalidateFeature(sal_uInt16 nId, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > * pxListener = NULL, sal_Bool _bForceBroadcast = sal_False);
343		343
344	/** InvalidateAll invalidates all features currently known	344	/** InvalidateAll invalidates all features currently known
345	*/	345	*/

Lines 22-34 Link Here

(-)oo_1.1.1_src/desktop/prj/d.lst.orig (+5 lines)
22	..\%__SRC%\bin\spl.dll %_DEST%\bin%_EXT%\spl.dll	22	..\%__SRC%\bin\spl.dll %_DEST%\bin%_EXT%\spl.dll
23	..\%__SRC%\bin\socomp.dll %_DEST%\bin%_EXT%\socomp.dll	23	..\%__SRC%\bin\socomp.dll %_DEST%\bin%_EXT%\socomp.dll
24	..\%__SRC%\lib\libwrp.so %_DEST%\lib%_EXT%\libwrp.so	24	..\%__SRC%\lib\libwrp.so %_DEST%\lib%_EXT%\libwrp.so
		25	..\%__SRC%\lib\libwrp.a %_DEST%\lib%_EXT%\libwrp.a
25	..\%__SRC%\lib\libwrp.dylib %_DEST%\lib%_EXT%\libwrp.dylib	26	..\%__SRC%\lib\libwrp.dylib %_DEST%\lib%_EXT%\libwrp.dylib
26	..\%__SRC%\lib\libspl.so %_DEST%\lib%_EXT%\libspl.so	27	..\%__SRC%\lib\libspl.so %_DEST%\lib%_EXT%\libspl.so
		28	..\%__SRC%\lib\libspl.a %_DEST%\lib%_EXT%\libspl.a
27	..\%__SRC%\lib\libspl.dylib %_DEST%\lib%_EXT%\libspl.dylib	29	..\%__SRC%\lib\libspl.dylib %_DEST%\lib%_EXT%\libspl.dylib
28	..\%__SRC%\lib\libsocomp.so %_DEST%\lib%_EXT%\libsocomp.so	30	..\%__SRC%\lib\libsocomp.so %_DEST%\lib%_EXT%\libsocomp.so
		31	..\%__SRC%\lib\libsocomp.a %_DEST%\lib%_EXT%\libsocomp.a
29	..\%__SRC%\lib\libsocomp.dylib %_DEST%\lib%_EXT%\libsocomp.dylib	32	..\%__SRC%\lib\libsocomp.dylib %_DEST%\lib%_EXT%\libsocomp.dylib
30	..\%__SRC%\bin\offacc.dll %_DEST%\bin%_EXT%\offacc.dll	33	..\%__SRC%\bin\offacc.dll %_DEST%\bin%_EXT%\offacc.dll
31	..\%__SRC%\lib\liboffacc.so %_DEST%\lib%_EXT%\liboffacc.so	34	..\%__SRC%\lib\liboffacc.so %_DEST%\lib%_EXT%\liboffacc.so
		35	..\%__SRC%\lib\liboffacc.a %_DEST%\lib%_EXT%\liboffacc.a
32	..\%__SRC%\lib\liboffacc.dylib %_DEST%\lib%_EXT%\liboffacc.dylib	36	..\%__SRC%\lib\liboffacc.dylib %_DEST%\lib%_EXT%\liboffacc.dylib
33		37
34	..\%__SRC%\bin\sweb %_DEST%\bin%_EXT%\sweb.bin	38	..\%__SRC%\bin\sweb %_DEST%\bin%_EXT%\sweb.bin
Lines 38-43 Link Here
38	..\%__SRC%\bin\pkgchk %_DEST%\bin%_EXT%\pkgchk.bin	42	..\%__SRC%\bin\pkgchk %_DEST%\bin%_EXT%\pkgchk.bin
39	..\%__SRC%\bin\pkgchk.dll %_DEST%\bin%_EXT%\pkgchk.dll	43	..\%__SRC%\bin\pkgchk.dll %_DEST%\bin%_EXT%\pkgchk.dll
40	..\%__SRC%\lib\libpkgchk.so %_DEST%\lib%_EXT%\libpkgchk.so	44	..\%__SRC%\lib\libpkgchk.so %_DEST%\lib%_EXT%\libpkgchk.so
		45	..\%__SRC%\lib\libpkgchk.a %_DEST%\lib%_EXT%\libpkgchk.a
41	..\%__SRC%\lib\libpkgchk.dylib %_DEST%\lib%_EXT%\libpkgchk.dylib	46	..\%__SRC%\lib\libpkgchk.dylib %_DEST%\lib%_EXT%\libpkgchk.dylib
42		47
43	..\%__SRC%\bin\pagein %_DEST%\bin%_EXT%\pagein	48	..\%__SRC%\bin\pagein %_DEST%\bin%_EXT%\pagein

Lines 111-122 Link Here

(-)oo_1.1.1_src/dtrans/source/win32/dnd/sourcecontext.cxx.orig (-2 / +2 lines)
111	}	111	}
112		112
113	void SAL_CALL SourceContext::setCursor( sal_Int32 cursorId )	113	void SAL_CALL SourceContext::setCursor( sal_Int32 cursorId )
114	throw( IllegalArgumentException, RuntimeException)	114	throw( RuntimeException)
115	{	115	{
116	}	116	}
117		117
118	void SAL_CALL SourceContext::setImage( sal_Int32 imageId )	118	void SAL_CALL SourceContext::setImage( sal_Int32 imageId )
119	throw( IllegalArgumentException, RuntimeException)	119	throw( RuntimeException)
120	{	120	{
121	}	121	}
122		122

Lines 130-138 Link Here

(-)oo_1.1.1_src/embedserv/source/embed/docholder.cxx.orig (-3 / +6 lines)
130	// add mutex locking ???	130	// add mutex locking ???
131		131
132	DocumentHolder::DocumentHolder( const uno::Reference< lang::XMultiServiceFactory >& xFactory,EmbedDocument_Impl *pOLEInterface)	132	DocumentHolder::DocumentHolder( const uno::Reference< lang::XMultiServiceFactory >& xFactory,EmbedDocument_Impl *pOLEInterface)
133	: m_xFactory( xFactory ),	133	: m_pOLEInterface(pOLEInterface),
134	m_pOLEInterface(pOLEInterface),	134	m_pInterceptor(0),
135	m_pInterceptor(0)	135	m_xFactory( xFactory )
136	{	136	{
137	const ::rtl::OUString aServiceName ( RTL_CONSTASCII_USTRINGPARAM ( "com.sun.star.frame.Desktop" ) );	137	const ::rtl::OUString aServiceName ( RTL_CONSTASCII_USTRINGPARAM ( "com.sun.star.frame.Desktop" ) );
138	uno::Reference< frame::XDesktop > xDesktop( m_xFactory->createInstance( aServiceName ), uno::UNO_QUERY );	138	uno::Reference< frame::XDesktop > xDesktop( m_xFactory->createInstance( aServiceName ), uno::UNO_QUERY );
Lines 599-604 Link Here
599	}	599	}
600		600
601	void SAL_CALL DocumentHolder::disposing( const com::sun::star::lang::EventObject& aSource )	601	void SAL_CALL DocumentHolder::disposing( const com::sun::star::lang::EventObject& aSource )
		602	throw( uno::RuntimeException )
602	{	603	{
603	if ( m_xDocument.is() && m_xDocument == aSource.Source )	604	if ( m_xDocument.is() && m_xDocument == aSource.Source )
604	{	605	{
Lines 620-625 Link Here
620	}	621	}
621		622
622	void SAL_CALL DocumentHolder::notifyClosing( const lang::EventObject& aSource )	623	void SAL_CALL DocumentHolder::notifyClosing( const lang::EventObject& aSource )
		624	throw( uno::RuntimeException )
623	{	625	{
624	uno::Reference< util::XCloseBroadcaster > xEventBroadcaster(	626	uno::Reference< util::XCloseBroadcaster > xEventBroadcaster(
625	aSource.Source, uno::UNO_QUERY );	627	aSource.Source, uno::UNO_QUERY );
Lines 644-649 Link Here
644	}	646	}
645		647
646	void SAL_CALL DocumentHolder::notifyTermination( const lang::EventObject& aSource )	648	void SAL_CALL DocumentHolder::notifyTermination( const lang::EventObject& aSource )
		649	throw( uno::RuntimeException )
647	{	650	{
648	OSL_ENSURE( !m_xDocument.is(), "Just a disaster..." );	651	OSL_ENSURE( !m_xDocument.is(), "Just a disaster..." );
649		652

Lines 77-83 Link Here

(-)oo_1.1.1_src/embedserv/source/embed/intercept.cxx.orig (-3 / +4 lines)
77		77
78		78
79		79
80	uno::Sequence<::rtl::OUString> Interceptor::m_aInterceptedURL(IUL);	80	uno::Sequence< ::rtl::OUString > Interceptor::m_aInterceptedURL(IUL);
81		81
82		82
83		83
Lines 144-149 Link Here
144		144
145		145
146	void SAL_CALL Interceptor::dispose()	146	void SAL_CALL Interceptor::dispose()
		147	throw(::com::sun::star::uno::RuntimeException)
147	{	148	{
148	lang::EventObject aEvt;	149	lang::EventObject aEvt;
149	aEvt.Source = static_cast< frame::XDispatch* >( this );	150	aEvt.Source = static_cast< frame::XDispatch* >( this );
Lines 167-174 Link Here
167	DocumentHolder* pDocH)	168	DocumentHolder* pDocH)
168	: m_pOLEInterface(pOLEInterface),	169	: m_pOLEInterface(pOLEInterface),
169	m_pDocH(pDocH),	170	m_pDocH(pDocH),
170	m_pStatCL(0),	171	m_pDisposeEventListeners(0),
171	m_pDisposeEventListeners(0)	172	m_pStatCL(0)
172	{	173	{
173	m_aInterceptedURL[0] = rtl::OUString(	174	m_aInterceptedURL[0] = rtl::OUString(
174	RTL_CONSTASCII_USTRINGPARAM(".uno:Save"));	175	RTL_CONSTASCII_USTRINGPARAM(".uno:Save"));

Lines 188-199 Link Here

(-)oo_1.1.1_src/embedserv/source/embed/servprov.cxx.orig (-2 / +2 lines)
188	return a;	188	return a;
189	}	189	}
190		190
191	void SAL_CALL EmbedServer_Impl::acquire( ) throw(uno::RuntimeException)	191	void SAL_CALL EmbedServer_Impl::acquire( ) throw()
192	{	192	{
193	OWeakObject::acquire();	193	OWeakObject::acquire();
194	}	194	}
195		195
196	void SAL_CALL EmbedServer_Impl::release( ) throw (uno::RuntimeException)	196	void SAL_CALL EmbedServer_Impl::release( ) throw ()
197	{	197	{
198	OWeakObject::release();	198	OWeakObject::release();
199	}	199	}

Lines 139-157 Link Here

(-)oo_1.1.1_src/embedserv/source/inc/docholder.hxx.orig (-3 / +6 lines)
139	::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > GetDocument() { return m_xDocument; }	139	::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > GetDocument() { return m_xDocument; }
140		140
141	// XEventListener	141	// XEventListener
142	virtual void SAL_CALL disposing( const com::sun::star::lang::EventObject& aSource );	142	virtual void SAL_CALL disposing( const com::sun::star::lang::EventObject& aSource )
		143	throw( ::com::sun::star::uno::RuntimeException );
143		144
144	// XCloseListener	145	// XCloseListener
145	virtual void SAL_CALL queryClosing( const com::sun::star::lang::EventObject& aSource, sal_Bool bGetsOwnership )	146	virtual void SAL_CALL queryClosing( const com::sun::star::lang::EventObject& aSource, sal_Bool bGetsOwnership )
146	throw( ::com::sun::star::util::CloseVetoException );	147	throw( ::com::sun::star::util::CloseVetoException );
147		148
148	virtual void SAL_CALL notifyClosing( const com::sun::star::lang::EventObject& aSource );	149	virtual void SAL_CALL notifyClosing( const com::sun::star::lang::EventObject& aSource )
		150	throw( ::com::sun::star::uno::RuntimeException );
149		151
150	// XTerminateListener	152	// XTerminateListener
151	virtual void SAL_CALL queryTermination( const com::sun::star::lang::EventObject& aSource )	153	virtual void SAL_CALL queryTermination( const com::sun::star::lang::EventObject& aSource )
152	throw( ::com::sun::star::frame::TerminationVetoException );	154	throw( ::com::sun::star::frame::TerminationVetoException );
153		155
154	virtual void SAL_CALL notifyTermination( const com::sun::star::lang::EventObject& aSource );	156	virtual void SAL_CALL notifyTermination( const com::sun::star::lang::EventObject& aSource )
		157	throw( ::com::sun::star::uno::RuntimeException );
155		158
156	// XModifyListener	159	// XModifyListener
157	virtual void SAL_CALL modified( const ::com::sun::star::lang::EventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException);	160	virtual void SAL_CALL modified( const ::com::sun::star::lang::EventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException);

Lines 92-105 Link Here

(-)oo_1.1.1_src/embedserv/source/inc/servprov.hxx.orig (-6 / +6 lines)
92	class EmbedServer_Impl : public ::cppu::OWeakObject, ::com::sun::star::lang::XTypeProvider	92	class EmbedServer_Impl : public ::cppu::OWeakObject, ::com::sun::star::lang::XTypeProvider
93	{	93	{
94	public:	94	public:
95	EmbedServer_Impl( const ::com::sun::star::uno::Reference<::com::sun::star::lang::XMultiServiceFactory> &xFactory );	95	EmbedServer_Impl( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > &xFactory );
96	~EmbedServer_Impl();	96	~EmbedServer_Impl();
97		97
98	// XInterface	98	// XInterface
99	virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType )	99	virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType )
100	throw(::com::sun::star::uno::RuntimeException);	100	throw(::com::sun::star::uno::RuntimeException);
101	virtual void SAL_CALL acquire() throw (::com::sun::star::uno::RuntimeException);	101	virtual void SAL_CALL acquire() throw ();
102	virtual void SAL_CALL release() throw (::com::sun::star::uno::RuntimeException);	102	virtual void SAL_CALL release() throw ();
103		103
104	// XTypeProvider	104	// XTypeProvider
105	virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( )	105	virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( )
Lines 110-123 Link Here
110	protected:	110	protected:
111		111
112	CComPtr< EmbedProviderFactory_Impl > m_pOLEFactories[ SUPPORTED_FACTORIES_NUM ];	112	CComPtr< EmbedProviderFactory_Impl > m_pOLEFactories[ SUPPORTED_FACTORIES_NUM ];
113	::com::sun::star::uno::Reference<::com::sun::star::lang::XMultiServiceFactory> m_xFactory;	113	::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xFactory;
114	};	114	};
115		115
116	class EmbedProviderFactory_Impl : public IClassFactory	116	class EmbedProviderFactory_Impl : public IClassFactory
117	{	117	{
118	public:	118	public:
119		119
120	EmbedProviderFactory_Impl( const ::com::sun::star::uno::Reference<::com::sun::star::lang::XMultiServiceFactory>& xFactory, const GUID* pGuid);	120	EmbedProviderFactory_Impl( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xFactory, const GUID* pGuid);
121	~EmbedProviderFactory_Impl();	121	~EmbedProviderFactory_Impl();
122		122
123	sal_Bool registerClass();	123	sal_Bool registerClass();
Lines 138-144 Link Here
138	GUID m_guid;	138	GUID m_guid;
139	DWORD m_factoryHandle;	139	DWORD m_factoryHandle;
140		140
141	::com::sun::star::uno::Reference<::com::sun::star::lang::XMultiServiceFactory> m_xFactory;	141	::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xFactory;
142	};	142	};
143		143
144	#endif	144	#endif

Line 0 Link Here

(-)oo_1.1.1_src/external/glibc/getopt.h.patch.orig (+25 lines)
	1	@@ -131,20 +131,20 @@
	2	/* Many other libraries have conflicting prototypes for getopt, with
	3	differences in the consts, in stdlib.h. To avoid compilation
	4	errors, only prototype getopt for the GNU C library. */
	5	-extern int getopt (int __argc, char const __argv, const char *__shortopts);
	6	+extern int getopt (int ___argc, char const ___argv, const char *__shortopts);
	7	# else /* not __GNU_LIBRARY__ */
	8	extern int getopt ();
	9	# endif /* __GNU_LIBRARY__ */
	10
	11	# ifndef __need_getopt
	12	-extern int getopt_long (int __argc, char const __argv, const char *__shortopts,
	13	+extern int getopt_long (int ___argc, char const ___argv, const char *__shortopts,
	14	const struct option __longopts, int __longind);
	15	-extern int getopt_long_only (int __argc, char const __argv,
	16	+extern int getopt_long_only (int ___argc, char const ___argv,
	17	const char *__shortopts,
	18	const struct option __longopts, int __longind);
	19
	20	/* Internal only. Users should not call this directly. */
	21	-extern int _getopt_internal (int __argc, char const __argv,
	22	+extern int _getopt_internal (int ___argc, char const ___argv,
	23	const char *__shortopts,
	24	const struct option __longopts, int __longind,
	25	int __long_only);

Lines 48-53 Link Here

(-)oo_1.1.1_src/external/prj/d.lst.orig (+6 lines)
48	..\%__SRC%\slo\PluginNew.* %_DEST%\lib%_EXT%\*	48	..\%__SRC%\slo\PluginNew.* %_DEST%\lib%_EXT%\*
49	..\%__SRC%\slb\gnu_getopt.lib %_DEST%\lib%_EXT%\gnu_getopt.lib	49	..\%__SRC%\slb\gnu_getopt.lib %_DEST%\lib%_EXT%\gnu_getopt.lib
50	..\%__SRC%\lib\libgnu_getopt.a %_DEST%\lib%_EXT%\libgnu_getopt.a	50	..\%__SRC%\lib\libgnu_getopt.a %_DEST%\lib%_EXT%\libgnu_getopt.a
		51	..\%__SRC%\lib\libgnu_getopt_static.a %_DEST%\lib%_EXT%\libgnu_getopt_static.a
51	..\%__SRC%\slb\zlib.lib %_DEST%\lib%_EXT%\zlib.lib	52	..\%__SRC%\slb\zlib.lib %_DEST%\lib%_EXT%\zlib.lib
52	..\%__SRC%\lib\libzlib.a %_DEST%\lib%_EXT%\libzlib.a	53	..\%__SRC%\lib\libzlib.a %_DEST%\lib%_EXT%\libzlib.a
53	..\%__SRC%\lib\libfreetype.a %_DEST%\lib%_EXT%\libfreetype.a	54	..\%__SRC%\lib\libfreetype.a %_DEST%\lib%_EXT%\libfreetype.a
Lines 66-74 Link Here
66		67
67	..\%__SRC%\slb\gpc.lib %_DEST%\lib%_EXT%\gpc.lib	68	..\%__SRC%\slb\gpc.lib %_DEST%\lib%_EXT%\gpc.lib
68	..\%__SRC%\lib\libgpc.a %_DEST%\lib%_EXT%\libgpc.a	69	..\%__SRC%\lib\libgpc.a %_DEST%\lib%_EXT%\libgpc.a
		70	..\%__SRC%\lib\libgpc_static.a %_DEST%\lib%_EXT%\libgpc_static.a
69		71
70	..\%__SRC%\lib\libautorec. %_DEST%\lib%_EXT%\lib.	72	..\%__SRC%\lib\libautorec. %_DEST%\lib%_EXT%\lib.
71		73
		74	..\mingwm10\mingwm10.dll %_DEST%\bin%_EXT%\mingwm10.dll
		75	..\%__SRC%\lib\libdbghelp. %_DEST%\lib%_EXT%\lib.
		76	..\%__SRC%\lib\libunicows. %_DEST%\lib%_EXT%\lib.
		77
72	..\freetype\freetype-2.0.2\include\ft2build.h %_DEST%\inc%_EXT%\external\ft2build.h	78	..\freetype\freetype-2.0.2\include\ft2build.h %_DEST%\inc%_EXT%\external\ft2build.h
73	..\freetype\freetype-2.0.2\include\freetype\* %_DEST%\inc%_EXT%\external\freetype\*	79	..\freetype\freetype-2.0.2\include\freetype\* %_DEST%\inc%_EXT%\external\freetype\*
74	..\freetype\freetype-2.0.2\include\freetype\config\* %_DEST%\inc%_EXT%\external\freetype\config\*	80	..\freetype\freetype-2.0.2\include\freetype\config\* %_DEST%\inc%_EXT%\external\freetype\config\*

Lines 5-24 Link Here

(-)oo_1.1.1_src/i18npool/prj/d.lst.orig (+4 lines)
5		5
6	..\%__SRC%\bin\i18npool.dll %_DEST%\bin%_EXT%\i18npool.dll	6	..\%__SRC%\bin\i18npool.dll %_DEST%\bin%_EXT%\i18npool.dll
7	..\%__SRC%\lib\libi18npool.so %_DEST%\lib%_EXT%\libi18npool.so	7	..\%__SRC%\lib\libi18npool.so %_DEST%\lib%_EXT%\libi18npool.so
		8	..\%__SRC%\lib\libi18npool.a %_DEST%\lib%_EXT%\libi18npool.a
8	..\%__SRC%\lib\libi18npool.dylib %_DEST%\lib%_EXT%\libi18npool.dylib	9	..\%__SRC%\lib\libi18npool.dylib %_DEST%\lib%_EXT%\libi18npool.dylib
9	..\%__SRC%\lib\ii18npool.lib %_DEST%\lib%_EXT%\ii18npool.lib	10	..\%__SRC%\lib\ii18npool.lib %_DEST%\lib%_EXT%\ii18npool.lib
10		11
11	..\%__SRC%\bin\i18nsearch.dll %_DEST%\bin%_EXT%\i18nsearch.dll	12	..\%__SRC%\bin\i18nsearch.dll %_DEST%\bin%_EXT%\i18nsearch.dll
12	..\%__SRC%\lib\libi18nsearch.so %_DEST%\lib%_EXT%\libi18nsearch.so	13	..\%__SRC%\lib\libi18nsearch.so %_DEST%\lib%_EXT%\libi18nsearch.so
		14	..\%__SRC%\lib\libi18nsearch.a %_DEST%\lib%_EXT%\libi18nsearch.a
13	..\%__SRC%\lib\libi18nsearch.dylib %_DEST%\lib%_EXT%\libi18nsearch.dylib	15	..\%__SRC%\lib\libi18nsearch.dylib %_DEST%\lib%_EXT%\libi18nsearch.dylib
14	..\%__SRC%\lib\ii18nsearch.lib %_DEST%\lib%_EXT%\ii18nsearch.lib	16	..\%__SRC%\lib\ii18nsearch.lib %_DEST%\lib%_EXT%\ii18nsearch.lib
15		17
16	..\%__SRC%\bin\localedata_.dll %_DEST%\bin%_EXT%\localedata_.dll	18	..\%__SRC%\bin\localedata_.dll %_DEST%\bin%_EXT%\localedata_.dll
17	..\%__SRC%\lib\liblocaledata_.so %_DEST%\lib%_EXT%\liblocaledata_.so	19	..\%__SRC%\lib\liblocaledata_.so %_DEST%\lib%_EXT%\liblocaledata_.so
		20	..\%__SRC%\lib\liblocaledata_.a %_DEST%\lib%_EXT%\liblocaledata_.a
18	..\%__SRC%\lib\liblocaledata_.dylib %_DEST%\lib%_EXT%\liblocaledata_.dylib	21	..\%__SRC%\lib\liblocaledata_.dylib %_DEST%\lib%_EXT%\liblocaledata_.dylib
19		22
20	..\%__SRC%\bin\dict_.dll %_DEST%\bin%_EXT%\dict_.dll	23	..\%__SRC%\bin\dict_.dll %_DEST%\bin%_EXT%\dict_.dll
21	..\%__SRC%\lib\libdict_.so %_DEST%\lib%_EXT%\libdict_.so	24	..\%__SRC%\lib\libdict_.so %_DEST%\lib%_EXT%\libdict_.so
		25	..\%__SRC%\lib\libdict_.a %_DEST%\lib%_EXT%\libdict_.a
22	..\%__SRC%\lib\libdict_.dylib %_DEST%\lib%_EXT%\libdict_.dylib	26	..\%__SRC%\lib\libdict_.dylib %_DEST%\lib%_EXT%\libdict_.dylib
23		27
24	dos: sh -c "if test %OS% = MACOSX; then create-bundle %_DEST%\lib%_EXT%\*.dylib; fi"	28	dos: sh -c "if test %OS% = MACOSX; then create-bundle %_DEST%\lib%_EXT%\*.dylib; fi"

Lines 17-24 Link Here

(-)- misc/build/icu/source/configure (+29 lines)
17	echo "$ac_t"""C compiler set to CCC ${CC}" " 1>&6	34	echo "$ac_t"""C compiler set to CCC ${CC}" " 1>&6
18	case "${host}" in	35	case "${host}" in
19	alpha--*) U_HAVE_INTTYPES_H=0;	36	alpha--*) U_HAVE_INTTYPES_H=0;
		37	***************
		38	* 2966,2973 **
		39	--- 2966,2977 ----
		40	#endif
		41	#include <time.h>
		42	#ifndef tzname /* For SGI. */
		43	+ #ifdef __MINGW_IMPORT
		44	+ __MINGW_IMPORT char tzname[]; / RS6000 and others reject char *tzname. /
		45	+ #else
		46	extern char tzname[]; / RS6000 and others reject char *tzname. /
		47	#endif
		48	+ #endif
		49	int main() {
		50	atoi(*tzname);
		51	; return 0; }
		52	***************
		53	* 2997,3003 **
		54	--- 3001,3011 ----
		55	#line 2998 "configure"
		56	#include "confdefs.h"
		57	#include <time.h>
		58	+ #ifdef __MINGW_IMPORT
		59	+ __MINGW_IMPORT char *_tzname[];
		60	+ #else
		61	extern char *_tzname[];
		62	+ #endif
		63
		64	int main() {
		65	atoi(*_tzname);
20	*** misc/icu/source/configure.in Fri Aug 9 19:20:56 2002	66	*** misc/icu/source/configure.in Fri Aug 9 19:20:56 2002

Lines 36-43 Link Here

(-)- misc/build/icu/source/configure.in (+28 lines)
36	AC_MSG_RESULT("C compiler set to CCC ${CC}" )	99	AC_MSG_RESULT("C compiler set to CCC ${CC}" )
37	case "${host}" in	100	case "${host}" in
38	alpha--*) U_HAVE_INTTYPES_H=0;	101	alpha--*) U_HAVE_INTTYPES_H=0;
		102	***************
		103	* 450,456 **
		104	--- 450,460 ----
		105	#endif
		106	#include <time.h>
		107	#ifndef tzname /* For SGI. */
		108	+ #ifdef __MINGW_IMPORT
		109	+ __MINGW_IMPORT char tzname[]; / RS6000 and others reject char *tzname. /
		110	+ #else
		111	extern char tzname[]; / RS6000 and others reject char *tzname. /
		112	+ #endif
		113	#endif>>,
		114	changequote([, ])dnl
		115	[atoi(*tzname);], ac_cv_var_tzname=yes, ac_cv_var_tzname=no)])
		116	***************
		117	* 461,467 **
		118	--- 465,475 ----
		119	[AC_TRY_LINK(
		120	changequote(<<, >>)dnl
		121	<<#include <time.h>
		122	+ #ifdef __MINGW_IMPORT
		123	+ __MINGW_IMPORT char *_tzname[];
		124	+ #else
		125	extern char *_tzname[];
		126	+ #endif
		127	>>,
		128	changequote([, ])dnl
		129	[atoi(*_tzname);], ac_cv_var__tzname=yes, ac_cv_var__tzname=no)])
39	*** misc/icu/source/icudefs.mk.in Wed Jul 31 22:28:32 2002	130	*** misc/icu/source/icudefs.mk.in Wed Jul 31 22:28:32 2002

Lines 52-57 Link Here

(-)- misc/build/icu/source/icudefs.mk.in (+18 lines)
52		143
53	# Versioned target for a shared library.	144	# Versioned target for a shared library.
54	FINAL_SO_TARGET = $(SO_TARGET).$(SO_TARGET_VERSION)	145	FINAL_SO_TARGET = $(SO_TARGET).$(SO_TARGET_VERSION)
		146	***************
		147	* 142,148 **
		148	## How ICU libraries are named... ex. $(LIBICU)uc$(SO)
		149	# Prefix for the ICU library names
		150	ICUPREFIX = icu
		151	! LIBICU = lib$(ICUPREFIX)
		152
		153	# Force removal [for make clean]
		154	RMV = rm -rf
		155	--- 146,153 ----
		156	## How ICU libraries are named... ex. $(LIBICU)uc$(SO)
		157	# Prefix for the ICU library names
		158	ICUPREFIX = icu
		159	! LIBPREFIX = lib
		160	! LIBICU = $(LIBPREFIX)$(ICUPREFIX)
		161
		162	# Force removal [for make clean]
		163	RMV = rm -rf
55	*** misc/icu/source/common/brkiter.cpp Thu Aug 8 02:39:14 2002	164	*** misc/icu/source/common/brkiter.cpp Thu Aug 8 02:39:14 2002
56	--- misc/build/icu/source/common/brkiter.cpp Tue Jul 22 10:11:48 2003	165	--- misc/build/icu/source/common/brkiter.cpp Tue Jul 22 10:11:48 2003
57	***************	166	***************
Lines 257-263 Link Here
257	LD_SONAME = -h $(MIDDLE_SO_TARGET)	366	LD_SONAME = -h $(MIDDLE_SO_TARGET)
258		367
259	*** misc/icu/source/data/Makefile.in Thu Aug 15 19:08:02 2002	368	*** misc/icu/source/data/Makefile.in Thu Aug 15 19:08:02 2002

Lines 1073-1078 Link Here

(-)oo_1.1.1_src/idl/source/prj/svidl.cxx.orig (-1 / +19 lines)
1073		1211
1074		1212
1075	OBJECTS = loengine.o \	1213	OBJECTS = loengine.o \
		1214	***************
		1215	* 176,182 **
		1216
		1217	ifneq ($(ENABLE_SHARED),)
		1218	$(FINAL_SO_TARGET): $(OBJECTS)
		1219	! $(SHLIB.cc) $(LD_SONAME) -o $@ $^ $(LIBS)
		1220	endif
		1221
		1222	ifeq (,$(MAKECMDGOALS))
		1223	--- 176,182 ----
		1224
		1225	ifneq ($(ENABLE_SHARED),)
		1226	$(FINAL_SO_TARGET): $(OBJECTS)
		1227	! $(SHLIB.cc) $(LD_SONAME) $(LD_IMPLIB) -o $@ $^ $(LIBS)
		1228	endif
		1229
		1230	ifeq (,$(MAKECMDGOALS))
		1231	--- misc/build/icu/source/common/unicode/umachine.h.orig 2001-12-08 02:09:42.000000000 +0900
Lines 141-147 Link Here
141	\|*	141	\|*
142	\|* Beschreibung	142	\|* Beschreibung
143	*************************************************************************/	143	*************************************************************************/
144	#if defined( UNX ) \|\| (defined( PM2 ) && defined( CSET )) \|\| defined (WTC) \|\| defined (MAC) \|\| defined (MTW)	144	#if defined( UNX ) \|\| (defined( PM2 ) && defined( CSET )) \|\| defined (WTC) \|\| defined (MAC) \|\| defined (MTW) \|\| defined (__MINGW32__)
145	int main ( int argc, char ** argv)	145	int main ( int argc, char ** argv)
146	{	146	{
147	#else	147	#else

Lines 97-103 Link Here

(-)- misc/build/Python-2.2.2/Modules/posixmodule.c (-1 / +66 lines)
97		124
98	***************	125	***************
99	* 281,288 **	126	* 281,288 **
100	--- 284,297 ----	127	--- 293,306 ----
101	static PyObject *	128	static PyObject *
102	convertenviron(void)	129	convertenviron(void)
103	{	130	{
Lines 112-117 Link Here
112	d = PyDict_New();	139	d = PyDict_New();
113	if (d == NULL)	140	if (d == NULL)
114	return NULL;	141	return NULL;
		142	***************
		143	* 674,680 **
		144	char pathfree = NULL; / this memory must be free'd */
		145	int res;
		146
		147	! #ifdef MS_WIN32
		148	int pathlen;
		149	char pathcopy[MAX_PATH];
		150	#endif /* MS_WIN32 */
		151	--- 692,698 ----
		152	char pathfree = NULL; / this memory must be free'd */
		153	int res;
		154
		155	! #if defined(MS_WIN32) \|\| defined (__MINGW32__)
		156	int pathlen;
		157	char pathcopy[MAX_PATH];
		158	#endif /* MS_WIN32 */
		159	***************
		160	* 684,690 **
		161	return NULL;
		162	pathfree = path;
		163
		164	! #ifdef MS_WIN32
		165	pathlen = strlen(path);
		166	/* the library call can blow up if the file name is too long! */
		167	if (pathlen > MAX_PATH) {
		168	--- 702,708 ----
		169	return NULL;
		170	pathfree = path;
		171
		172	! #if defined(MS_WIN32) \|\| defined (__MINGW32__)
		173	pathlen = strlen(path);
		174	/* the library call can blow up if the file name is too long! */
		175	if (pathlen > MAX_PATH) {
		176	***************
		177	* 1224,1230 **
		178	Py_FileSystemDefaultEncoding, &path, &mode))
		179	return NULL;
		180	Py_BEGIN_ALLOW_THREADS
		181	! #if ( defined(__WATCOMC__) \|\| defined(_MSC_VER) \|\| defined(PYCC_VACPP) ) && !defined(__QNX__)
		182	res = mkdir(path);
		183	#else
		184	res = mkdir(path, mode);
		185	--- 1242,1248 ----
		186	Py_FileSystemDefaultEncoding, &path, &mode))
		187	return NULL;
		188	Py_BEGIN_ALLOW_THREADS
		189	! #if ( defined(__WATCOMC__) \|\| defined(_MSC_VER) \|\| defined(__MINGW32__) \|\| defined(PYCC_VACPP) ) && !defined(__QNX__)
		190	res = mkdir(path);
		191	#else
		192	res = mkdir(path, mode);
		193	***************
		194	* 3864,3870 **
		195	--- 3882,3892 ----
		196	if (!PyArg_ParseTuple(args, ":pipe"))
		197	return NULL;
		198	Py_BEGIN_ALLOW_THREADS
		199	+ #ifdef __MINGW32__
		200	+ res = _pipe(fds, 1024, O_BINARY);
		201	+ #else
		202	res = pipe(fds);
		203	+ #endif
		204	Py_END_ALLOW_THREADS
		205	if (res != 0)
206	return posix_error();
115	*** misc/Python-2.2.2/Modules/timemodule.c Tue Mar 12 22:38:31 2002	207	*** misc/Python-2.2.2/Modules/timemodule.c Tue Mar 12 22:38:31 2002
116	--- misc/build/Python-2.2.2/Modules/timemodule.c Fri Oct 10 12:42:16 2003	208	--- misc/build/Python-2.2.2/Modules/timemodule.c Fri Oct 10 12:42:16 2003
117	***************	209	***************
Lines 1714-1725 Link Here
1714	#endif /* USE_DYLD */	1806	#endif /* USE_DYLD */
1715		1807
1716	*** misc/Python-2.2.2/configure Thu Oct 10 17:26:41 2002	1808	*** misc/Python-2.2.2/configure Thu Oct 10 17:26:41 2002

Lines 1736-1742 Link Here

(-)oo_1.1.1_src/python/prj/d.lst.orig (-7 / +183 lines)
1736	esac	1870	esac
1737	fi	1871	fi
1738		1872
1739	--- 1699,1721 ----	1873	--- 1705,1727 ----
1740	esac	1874	esac
1741	case $ac_sys_system in	1875	case $ac_sys_system in
1742	Darwin*)	1876	Darwin*)
Lines 1751-1758 Link Here
1751	! OPT="$OPT -fPIC";;	1885	! OPT="$OPT -fPIC";;
1752	! sparc64*)	1886	! sparc64*)
1753	! OPT="$OPT -fPIC";;	1887	! OPT="$OPT -fPIC";;
1754	! x86_64*)	1888	! x86_64*)
1755	! OPT="$OPT -fPIC";;	1889	! OPT="$OPT -fPIC";;
1756	! *)	1890	! *)
1757	! OPT="$OPT";;	1891	! OPT="$OPT";;
1758	! esac	1892	! esac
Lines 1771-1777 Link Here
1771	LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -compatibility_version $(VERSION) -current_version $(VERSION)';;	1905	LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -compatibility_version $(VERSION) -current_version $(VERSION)';;
1772	esac	1906	esac
1773		1907
1774	--- 3117,3125 ----	1908	--- 3125,3133 ----
1775	LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -compatibility_version $(VERSION) -current_version $(VERSION)';;	1909	LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -compatibility_version $(VERSION) -current_version $(VERSION)';;
1776	Darwin/*)	1910	Darwin/*)
1777	ns_undef_sym='_environ'	1911	ns_undef_sym='_environ'
Lines 1783-1789 Link Here
1783		1917
1784	***************	1918	***************
1785	* 3159,3164 **	1919	* 3159,3164 **
1786	--- 3176,3182 ----	1920	--- 3184,3190 ----
1787	case $ac_sys_system in	1921	case $ac_sys_system in
1788	hp\|HP) SO=.sl;;	1922	hp\|HP) SO=.sl;;
1789	CYGWIN*) SO=.dll;;	1923	CYGWIN*) SO=.dll;;
Lines 1807-1813 Link Here
1807	fi ;;	1941	fi ;;
1808	Linux*) LDSHARED='$(CC) -shared';;	1942	Linux*) LDSHARED='$(CC) -shared';;
1809	dgux*) LDSHARED="ld -G";;	1943	dgux*) LDSHARED="ld -G";;
1810	--- 3219,3233 ----	1944	--- 3227,3241 ----
1811	LDSHARED="$LDSHARED -undefined suppress"	1945	LDSHARED="$LDSHARED -undefined suppress"
1812	fi ;;	1946	fi ;;
1813	Darwin/*)	1947	Darwin/*)
Lines 1836-1842 Link Here
1836	OpenUNIX\|UnixWare)	1970	OpenUNIX\|UnixWare)
1837	if test "$GCC" = "yes"	1971	if test "$GCC" = "yes"
1838	then LDSHARED="$(CC) -shared"	1972	then LDSHARED="$(CC) -shared"
1839	--- 3235,3245 ----	1973	--- 3243,3253 ----
1840	OpenBSD\|FreeBSD)	1974	OpenBSD\|FreeBSD)
1841	if [ "`$CC -dM -E - </dev/null \| grep __ELF__`" != "" ]	1975	if [ "`$CC -dM -E - </dev/null \| grep __ELF__`" != "" ]
1842	then	1976	then
Lines 1848-1853 Link Here
1848	OpenUNIX\|UnixWare)	1982	OpenUNIX\|UnixWare)
1849	if test "$GCC" = "yes"	1983	if test "$GCC" = "yes"
1850	then LDSHARED="$(CC) -shared"	1984	then LDSHARED="$(CC) -shared"
		1985	***************
		1986	* 3228,3234 **
		1987	fi;;
		1988	SCO_SV*) LDSHARED="$(CC) -Wl,-G,-Bexport";;
		1989	Monterey*) LDSHARED="cc -G -dy -Bdynamic -Bexport -L/usr/lib/ia64l64";;
		1990	! CYGWIN*) LDSHARED="gcc -shared -Wl,--enable-auto-image-base";;
		1991	*) LDSHARED="ld";;
		1992	esac
		1993	fi
		1994	--- 3255,3261 ----
		1995	fi;;
		1996	SCO_SV*) LDSHARED="$(CC) -Wl,-G,-Bexport";;
		1997	Monterey*) LDSHARED="cc -G -dy -Bdynamic -Bexport -L/usr/lib/ia64l64";;
		1998	! CYGWIN*) LDSHARED="\$(CC) -shared -Wl,--enable-auto-image-base";;
		1999	*) LDSHARED="ld";;
		2000	esac
		2001	fi
		2002	***************
		2003	* 3882,3887 **
		2004	--- 3909,3954 ----
		2005	else
		2006	echo "$ac_t""no" 1>&6
		2007
		2008	+ ac_safe=`echo "windows.h" \| sed 'y%./+-%__p_%'`
		2009	+ echo $ac_n "checking for windows.h""... $ac_c" 1>&6
		2010	+ echo "configure:3888: checking for windows.h" >&5
		2011	+ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
		2012	+ echo $ac_n "(cached) $ac_c" 1>&6
		2013	+ else
		2014	+ cat > conftest.$ac_ext <<EOF
		2015	+ #line 3893 "configure"
		2016	+ #include "confdefs.h"
		2017	+ #include <windows.h>
		2018	+ EOF
		2019	+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
		2020	+ { (eval echo configure:3898: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
		2021	+ ac_err=`grep -v '^ *+' conftest.out \| grep -v "^conftest.${ac_ext}\$"`
		2022	+ if test -z "$ac_err"; then
		2023	+ rm -rf conftest*
		2024	+ eval "ac_cv_header_$ac_safe=yes"
		2025	+ else
		2026	+ echo "$ac_err" >&5
		2027	+ echo "configure: failed program was:" >&5
		2028	+ cat conftest.$ac_ext >&5
		2029	+ rm -rf conftest*
		2030	+ eval "ac_cv_header_$ac_safe=no"
		2031	+ fi
		2032	+ rm -f conftest*
		2033	+ fi
		2034	+ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
		2035	+ echo "$ac_t""yes" 1>&6
		2036	+ cat >> confdefs.h <<\EOF
		2037	+ #define WITH_THREAD 1
		2038	+ EOF
		2039	+
		2040	+ cat >> confdefs.h <<\EOF
		2041	+ #define NT_THREADS 1
		2042	+ EOF
		2043	+
		2044	+ LIBOBJS="$LIBOBJS thread.o"
		2045	+ else
		2046	+ echo "$ac_t""no" 1>&6
		2047	+
		2048	ac_safe=`echo "kernel/OS.h" \| sed 'y%./+-%__p_%'`
2049	echo $ac_n "checking for kernel/OS.h""... $ac_c" 1>&6
2050	echo "configure:3888: checking for kernel/OS.h" >&5
2051	***************
2052	* 4012,4017 **
2053	--- 4079,4129 ----
2054	else
2055	echo "$ac_t""no" 1>&6
2056
2057	+ echo $ac_n "checking for pthread_create in -lpthreadGCE""... $ac_c" 1>&6
2058	+ echo "configure:3972: checking for pthread_create in -lpthreadGCE" >&5
2059	+ ac_lib_var=`echo pthreadGCE'_'pthread_create \| sed 'y%./+-%__p_%'`
2060	+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
2061	+ echo $ac_n "(cached) $ac_c" 1>&6
2062	+ else
2063	+ ac_save_LIBS="$LIBS"
2064	+ LIBS="-lpthreadGCE $LIBS"
2065	+ cat > conftest.$ac_ext <<EOF
2066	+ #line 3980 "configure"
2067	+ #include "confdefs.h"
2068	+ /* Override any gcc2 internal prototype to avoid an error. */
2069	+ /* We use char because int might match the return type of a gcc2
2070	+ builtin and then its argument prototype would still apply. */
2071	+ char pthread_create();
2072	+
2073	+ int main() {
2074	+ pthread_create()
2075	+ ; return 0; }
2076	+ EOF
2077	+ if { (eval echo configure:3991: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2078	+ rm -rf conftest*
2079	+ eval "ac_cv_lib_$ac_lib_var=yes"
2080	+ else
2081	+ echo "configure: failed program was:" >&5
2082	+ cat conftest.$ac_ext >&5
2083	+ rm -rf conftest*
2084	+ eval "ac_cv_lib_$ac_lib_var=no"
2085	+ fi
2086	+ rm -f conftest*
2087	+ LIBS="$ac_save_LIBS"
2088	+
2089	+ fi
2090	+ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
2091	+ echo "$ac_t""yes" 1>&6
2092	+ cat >> confdefs.h <<\EOF
2093	+ #define WITH_THREAD 1
2094	+ EOF
2095	+
2096	+ posix_threads=yes
2097	+ LIBS="$LIBS -lpthreadGCE"
2098	+ LIBOBJS="$LIBOBJS thread.o"
2099	+ else
2100	+ echo "$ac_t""no" 1>&6
2101	+
2102	echo $ac_n "checking for __d6_pthread_create in -lthread""... $ac_c" 1>&6
2103	echo "configure:4017: checking for __d6_pthread_create in -lthread" >&5
2104	ac_lib_var=`echo thread'_'__d6_pthread_create \| sed 'y%./+-%__p_%'`
2105	***************
2106	* 4164,4174 **
2107	--- 4276,4290 ----
2108	fi
2109
2110	fi
2111	+
2112	+ fi
2113	rm -f conftest*
2114	fi
2115
2116	fi
2117
2118	+ fi
2119	+
2120
2121	if test "$posix_threads" = "yes"; then
2122	if test "$unistd_defines_pthreads" = "no"; then
2123	***************
2124	* 7661,7667 **
2125
2126	trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15
2127
2128	! DEFS=-DHAVE_CONFIG_H
2129
2130	# Without the "./", some shells look in PATH for config.status.
2131	: ${CONFIG_STATUS=./config.status}
2132	--- 7777,7783 ----
2133
2134	trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15
2135
2136	!
2137
2138	# Without the "./", some shells look in PATH for config.status.
2139	: ${CONFIG_STATUS=./config.status}
1851	*** misc/Python-2.2.2/setup.py Thu Oct 10 02:59:16 2002	2140	*** misc/Python-2.2.2/setup.py Thu Oct 10 02:59:16 2002
1852	--- misc/build/Python-2.2.2/setup.py Fri Oct 10 12:42:16 2003	2141	--- misc/build/Python-2.2.2/setup.py Fri Oct 10 12:42:16 2003
1853	***************	2142	***************
Lines 1867-1869 Link Here
1867	tcl_includes is None or tk_includes is None):	2156	tcl_includes is None or tk_includes is None):
1868	# Something's missing, so give up	2157	# Something's missing, so give up
1869	return	2158	return
		2159	*** misc/build/Python-2.2.2/pyconfig.h.in.orig Fri Oct 4 19:16:28 2002
		2160	--- misc/build/Python-2.2.2/pyconfig.h.in Sat Mar 20 00:51:14 2004
		2161	***************
		2162	* 87,92 **
		2163	--- 87,95 ----
		2164	(as it does on SCI ODT 3.0) */
		2165	#undef BAD_STATIC_FORWARD
		2166
		2167	+ /* Define this if you have Windows NT threads */
		2168	+ #undef NT_THREADS
		2169	+
		2170	/* Define this if you have BeOS threads */
		2171	#undef BEOS_THREADS
		2172
		2173	--- misc/build/Python-2.2.2/Python/thread_pthread.h.orig 2002-10-04 19:16:28.000000000 +0900
Lines 53-58 Link Here
53	..\%__SRC%\lib\libpython.so.2.2.2 %_DEST%\lib%_EXT%\libpython.so.2.2.2	53	..\%__SRC%\lib\libpython.so.2.2.2 %_DEST%\lib%_EXT%\libpython.so.2.2.2
54	..\%__SRC%\lib\libpython.dylib %_DEST%\lib%_EXT%\libpython.dylib	54	..\%__SRC%\lib\libpython.dylib %_DEST%\lib%_EXT%\libpython.dylib
55		55
		56	#MingW ONLY !
		57	..\%__SRC%\misc\build\python-inst\include\python22\pyconfig.h %_DEST%\inc%_EXT%\python\pyconfig.h
		58	..\%__SRC%\misc\build\python-inst\bin\python.exe %_DEST%\bin%_EXT%\python.exe
		59	..\%__SRC%\bin\python22.dll %_DEST%\bin%_EXT%\python22.dll
		60	..\%__SRC%\misc\build\Python-2.2.2\libpython22.dll.a %_DEST%\lib%_EXT%\libpython.a
		61
56	# WINDOWS ONLY !	62	# WINDOWS ONLY !
57	..\%__SRC%\misc\build\pyconfig.h %_DEST%\inc%_EXT%\python\pyconfig.h	63	..\%__SRC%\misc\build\pyconfig.h %_DEST%\inc%_EXT%\python\pyconfig.h
58	..\%__SRC%\misc\build\Python-2.2.2\PCBuild\python.exe %_DEST%\bin%_EXT%\python.exe	64	..\%__SRC%\misc\build\Python-2.2.2\PCBuild\python.exe %_DEST%\bin%_EXT%\python.exe

Lines 87-97 Link Here

(-)oo_1.1.1_src/sal/osl/w32/tempfile.c.orig (+9 lines)
87		87
88	oslFileError MapWindowsErrorToOSLError( DWORD dwError );	88	oslFileError MapWindowsErrorToOSLError( DWORD dwError );
89		89
		90	#ifndef __MINGW32__
90	/* Allocate n number of t's on the stack	91	/* Allocate n number of t's on the stack
91	return a pointer to it in p */	92	return a pointer to it in p */
92		93
93	#define STACK_ALLOC(p, t, n) __try {(p) = _alloca((n)*sizeof(t));} \	94	#define STACK_ALLOC(p, t, n) __try {(p) = _alloca((n)*sizeof(t));} \
94	__except(EXCEPTION_EXECUTE_HANDLER) {(p) = NULL;}	95	__except(EXCEPTION_EXECUTE_HANDLER) {(p) = NULL;}
		96	#endif
95		97
96	/* =============================== */	98	/* =============================== */
97	/* osl_gettempDirURL */	99	/* osl_gettempDirURL */
Lines 319-326 Link Here
319	if (osl_File_E_None != osl_error)	321	if (osl_File_E_None != osl_error)
320	return osl_error;	322	return osl_error;
321		323
		324	#ifdef __MINGW32__
		325	tmp_name = malloc((rtl_uString_getLength(base_directory) + MAX_PATH)*sizeof(WCHAR));
		326	#else
322	/* allocate enough space on the stack */	327	/* allocate enough space on the stack */
323	STACK_ALLOC(tmp_name, WCHAR, (rtl_uString_getLength(base_directory) + MAX_PATH));	328	STACK_ALLOC(tmp_name, WCHAR, (rtl_uString_getLength(base_directory) + MAX_PATH));
		329	#endif
324		330
325	if (tmp_name)	331	if (tmp_name)
326	{	332	{
Lines 330-335 Link Here
330	b_delete_on_close,	336	b_delete_on_close,
331	pHandle,	337	pHandle,
332	ppustrTempFileURL);	338	ppustrTempFileURL);
		339	#ifdef __MINGW32__
		340	free(tmp_name);
		341	#endif
333	}	342	}
334	else // stack alloc failed	343	else // stack alloc failed
335	{	344	{

Lines 132-137 Link Here

(-)oo_1.1.1_src/sal/systools/win32/uwinapi/macros.h.orig (-1 / +68 lines)
132		132
133		133
134		134
		135	#ifdef __MINGW32__
		136	#define IMPLEMENT_THUNK( module, resolve, rettype, calltype, func, params ) \
		137	static void func##_Thunk(); \
		138	EXTERN_C _declspec( dllexport ) FARPROC module##_##func##_Ptr = (FARPROC)func##_Thunk; \
		139	EXTERN_C rettype calltype func params \
		140	{ \
		141	asm(" popl %ebp"); \
		142	asm(" jmp *(%0)"::"m"(module##_##func##_Ptr)); \
		143	} \
		144	EXTERN_C rettype calltype func##_##resolve params; \
		145	static rettype calltype func##_##Failure params; \
		146	static void func##_Thunk() \
		147	{ \
		148	ResolveThunk_##resolve( &module##_##func##_Ptr, #module ".dll", #func, (FARPROC)func##_##resolve, (FARPROC)func##_##Failure ); \
		149	asm(" movl %ebp, %esp"); \
		150	asm(" popl %ebp"); \
		151	asm(" jmp *(%0)"::"m"(module##_##func##_Ptr)); \
		152	} \
		153	static rettype calltype func##_##Failure params \
		154	{ \
		155	SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); \
		156	return (rettype)0; \
		157	} \
		158	EXTERN_C rettype calltype func##_##resolve params
		159	#else
135	#define IMPLEMENT_THUNK( module, resolve, rettype, calltype, func, params ) \	160	#define IMPLEMENT_THUNK( module, resolve, rettype, calltype, func, params ) \
136	EXTERN_C _declspec( dllexport ) FARPROC module##_##func##_Ptr; \	161	EXTERN_C _declspec( dllexport ) FARPROC module##_##func##_Ptr; \
137	EXTERN_C rettype calltype func##_##resolve params; \	162	EXTERN_C rettype calltype func##_##resolve params; \
Lines 152-160 Link Here
152	return (rettype)0; \	177	return (rettype)0; \
153	} \	178	} \
154	EXTERN_C rettype calltype func##_##resolve params	179	EXTERN_C rettype calltype func##_##resolve params
		180	#endif
155		181
156		182
157		183
		184	#ifdef __MINGW32__
		185	#define DEFINE_CUSTOM_THUNK( module, resolve, rettype, calltype, func, params ) \
		186	static void func##_Thunk(); \
		187	EXTERN_C _declspec( dllexport ) FARPROC module##_##func##_Ptr = (FARPROC)func##_Thunk; \
		188	static void func##_Thunk() \
		189	{ \
		190	ResolveThunk_##resolve( &module##_##func##_Ptr, #module ".dll", #func ); \
		191	asm(" movl %ebp, %esp"); \
		192	asm(" popl %ebp"); \
		193	asm(" jmp *(%0)"::"m"(module##_##func##_Ptr)); \
		194	} \
		195	EXTERN_C rettype calltype func params \
		196	{ \
		197	asm(" popl %ebp"); \
		198	asm(" jmp *(%0)"::"m"(module##_##func##_Ptr)); \
		199	}
		200	#else
158	#define DEFINE_CUSTOM_THUNK( module, resolve, rettype, calltype, func, params ) \	201	#define DEFINE_CUSTOM_THUNK( module, resolve, rettype, calltype, func, params ) \
159	EXTERN_C _declspec( dllexport ) FARPROC module##_##func##_Ptr; \	202	EXTERN_C _declspec( dllexport ) FARPROC module##_##func##_Ptr; \
160	static _declspec ( naked ) void func##_Thunk() \	203	static _declspec ( naked ) void func##_Thunk() \
Lines 167-175 Link Here
167	_asm jmp [module##_##func##_Ptr] \	210	_asm jmp [module##_##func##_Ptr] \
168	} \	211	} \
169	EXTERN_C _declspec( dllexport ) FARPROC module##_##func##_Ptr = (FARPROC)func##_Thunk;	212	EXTERN_C _declspec( dllexport ) FARPROC module##_##func##_Ptr = (FARPROC)func##_Thunk;
		213	#endif
170		214
171		215
172		216	#ifdef __MINGW32__
		217	#define DEFINE_DEFAULT_THUNK( module, resolve, rettype, calltype, func, params ) \
		218	static void func##_Thunk(); \
		219	EXTERN_C _declspec( dllexport ) FARPROC module##_##func##_Ptr = (FARPROC)func##_Thunk; \
		220	static rettype calltype func##_##Failure params; \
		221	static _declspec ( naked ) void func##_Thunk() \
		222	{ \
		223	ResolveThunk_##resolve( &module##_##func##_Ptr, #module ".dll", #func, NULL, (FARPROC)func##_##Failure ); \
		224	asm(" movl %ebp, %esp"); \
		225	asm(" popl %ebp"); \
		226	asm(" jmp *(%0)"::"m"(module##_##func##_Ptr)); \
		227	} \
		228	EXTERN_C _declspec( naked ) rettype calltype func params \
		229	{ \
		230	asm(" popl %ebp"); \
		231	asm(" jmp *(%0)"::"m"(module##_##func##_Ptr)); \
		232	} \
		233	static rettype calltype func##_##Failure params \
		234	{ \
		235	SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); \
		236	return (rettype)0; \
		237	}
		238	#else
173	#define DEFINE_DEFAULT_THUNK( module, resolve, rettype, calltype, func, params ) \	239	#define DEFINE_DEFAULT_THUNK( module, resolve, rettype, calltype, func, params ) \
174	EXTERN_C _declspec( dllexport ) FARPROC module##_##func##_Ptr; \	240	EXTERN_C _declspec( dllexport ) FARPROC module##_##func##_Ptr; \
175	static rettype calltype func##_##Failure params; \	241	static rettype calltype func##_##Failure params; \
Lines 188-191 Link Here
188	SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); \	254	SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); \
189	return (rettype)0; \	255	return (rettype)0; \
190	}	256	}
		257	#endif
191		258

Lines 91-97 Link Here

(-)oo_1.1.1_src/sal/systools/win32/uwinapi/unicows.dxp.orig (-7 / +17 lines)
91	AddAtomW	91	AddAtomW
92	AddFontResourceW	92	AddFontResourceW
93	AddJobW	93	AddJobW
94	;AddMonitorW
95	AddPortW	94	AddPortW
96	AddPrintProcessorW	95	AddPrintProcessorW
97	AddPrintProvidorW	96	AddPrintProvidorW
Lines 99-104 Link Here
99	AddPrinterW	98	AddPrinterW
100	AdvancedDocumentPropertiesW	99	AdvancedDocumentPropertiesW
101	AppendMenuW	100	AppendMenuW
		101	BeginUpdateResourceA
102	BeginUpdateResourceW	102	BeginUpdateResourceW
103	BroadcastSystemMessageW	103	BroadcastSystemMessageW
104	BuildCommDCBAndTimeoutsW	104	BuildCommDCBAndTimeoutsW
Lines 153-158 Link Here
153	CreateStdAccessibleProxyW	153	CreateStdAccessibleProxyW
154	CreateWaitableTimerW	154	CreateWaitableTimerW
155	CreateWindowExW	155	CreateWindowExW
		156	CryptAcquireContextW
		157	CryptEnumProviderTypesW
		158	CryptEnumProvidersW
		159	CryptGetDefaultProviderW
		160	CryptSetProviderExW
		161	CryptSetProviderW
		162	CryptSignHashW
		163	CryptVerifySignatureW
156	DdeConnect	164	DdeConnect
157	DdeConnectList	165	DdeConnectList
158	DdeCreateStringHandleW	166	DdeCreateStringHandleW
Lines 183-188 Link Here
183	DrawTextExW	191	DrawTextExW
184	DrawTextW	192	DrawTextW
185	EnableWindow	193	EnableWindow
		194	EndUpdateResourceA
186	EndUpdateResourceW	195	EndUpdateResourceW
187	EnumCalendarInfoExW	196	EnumCalendarInfoExW
188	EnumCalendarInfoW	197	EnumCalendarInfoW
Lines 227-233 Link Here
227	FindWindowExW	236	FindWindowExW
228	FindWindowW	237	FindWindowW
229	FormatMessageW	238	FormatMessageW
230	;FreeContextBufferW	239	;FreeContextBuffer
231	FreeEnvironmentStringsW	240	FreeEnvironmentStringsW
232	GetAltTabInfoW	241	GetAltTabInfoW
233	GetAtomNameW	242	GetAtomNameW
Lines 236-241 Link Here
236	GetCalendarInfoW	245	GetCalendarInfoW
237	;GetCharABCWidthsFloatW	246	;GetCharABCWidthsFloatW
238	GetCharABCWidthsW	247	GetCharABCWidthsW
		248	GetCharWidth32W
239	GetCharWidthFloatW	249	GetCharWidthFloatW
240	GetCharWidthW	250	GetCharWidthW
241	GetCharacterPlacementW	251	GetCharacterPlacementW
Lines 291-297 Link Here
291	GetOutlineTextMetricsW	301	GetOutlineTextMetricsW
292	GetPrintProcessorDirectoryW	302	GetPrintProcessorDirectoryW
293	;GetPrinterDataW	303	;GetPrinterDataW
294	;GetPrinterDriverDirectoryW	304	;GetPrinterDriverDirectoryW24
295	;GetPrinterDriverW	305	;GetPrinterDriverW
296	;GetPrinterW	306	;GetPrinterW
297	GetPrivateProfileIntW	307	GetPrivateProfileIntW
Lines 420-425 Link Here
420	RasGetEntryDialParamsW	430	RasGetEntryDialParamsW
421	RasGetEntryPropertiesW	431	RasGetEntryPropertiesW
422	RasGetErrorStringW	432	RasGetErrorStringW
		433	RasGetProjectionInfoW
423	RasHangUpW	434	RasHangUpW
424	RasRenameEntryW	435	RasRenameEntryW
425	RasSetEntryDialParamsW	436	RasSetEntryDialParamsW
Lines 510-515 Link Here
510	TranslateAcceleratorW	521	TranslateAcceleratorW
511	UnregisterClassW	522	UnregisterClassW
512	UpdateICMRegKeyW	523	UpdateICMRegKeyW
		524	UpdateResourceA
513	UpdateResourceW	525	UpdateResourceW
514	VerFindFileW	526	VerFindFileW
515	VerInstallFileW	527	VerInstallFileW
Lines 562-578 Link Here
562	;mciSendCommandW	574	;mciSendCommandW
563	;mciSendStringW	575	;mciSendStringW
564	;midiInGetDevCapsW	576	;midiInGetDevCapsW
565	;midiInGetErrorTextW	577	midiInGetErrorTextW
566	;midiOutGetDevCapsW	578	;midiOutGetDevCapsW
567	;midiOutGetErrorTextW
568	;mixerGetControlDetailsW	579	;mixerGetControlDetailsW
569	;mixerGetDevCapsW	580	;mixerGetDevCapsW
570	;mixerGetLineControlsW	581	;mixerGetLineControlsW
571	;mixerGetLineInfoW	582	;mixerGetLineInfoW
572	;mmioInstallIOProcW	583	;mmioInstallIOProcW
573	;mmioOpenW	584	;mmioOpenW@
574	;mmioRenameW	585	;mmioRenameW
575	;mmioStringToFOURCCW
576	sndPlaySoundW	586	sndPlaySoundW
577	;waveInGetDevCapsW	587	;waveInGetDevCapsW
578	;waveInGetErrorTextW	588	;waveInGetErrorTextW