--- oo_1.1.1_src/UnoControls/prj/d.lst.orig 2004-01-29 00:49:10.000000000 +0900 +++ oo_1.1.1_src/UnoControls/prj/d.lst 2004-03-29 12:17:36.000000000 +0900 @@ -1,5 +1,6 @@ ..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*.dll ..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT% +..\%__SRC%\lib\lib*.a %_DEST%\lib%_EXT% ..\%__SRC%\lib\*.sl %_DEST%\lib%_EXT%\*.sl ..\%__SRC%\bin\*.res %_DEST%\bin%_EXT%\*.res ..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib --- oo_1.1.1_src/accessibility/bridge/source/java/WindowsAccessBridgeAdapter.cxx.orig 2003-06-12 17:03:46.000000000 +0900 +++ oo_1.1.1_src/accessibility/bridge/source/java/WindowsAccessBridgeAdapter.cxx 2004-03-29 12:17:36.000000000 +0900 @@ -199,7 +199,7 @@ if ( pJava_environment && pUno_environment ) { g_unoMapping = Mapping(pUno_environment, pJava_environment); - getCppuType((Reference< XAccessible > *) 0).getDescription((typelib_TypeDescription **) & g_pTypeDescription); + getCppuType((::com::sun::star::uno::Reference< XAccessible > *) 0).getDescription((typelib_TypeDescription **) & g_pTypeDescription); } if ( pJava_environment ) @@ -268,7 +268,7 @@ { if ( pWindow && pWindow->IsTopWindow() ) { - Reference< XAccessible > xAccessible; + ::com::sun::star::uno::Reference< XAccessible > xAccessible; // Test for combo box - drop down floating windows first Window * pParentWindow = pWindow->GetParent(); @@ -278,10 +278,10 @@ try { // The parent window of a combo box floating window should have the role COMBO_BOX - Reference< XAccessible > xParentAccessible(pParentWindow->GetAccessible()); + ::com::sun::star::uno::Reference< XAccessible > xParentAccessible(pParentWindow->GetAccessible()); if ( xParentAccessible.is() ) { - Reference< XAccessibleContext > xParentAC(xParentAccessible->getAccessibleContext()); + ::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. @@ -289,10 +289,10 @@ sal_Int32 nCount = xParentAC->getAccessibleChildCount(); for ( sal_Int32 n = 0; (n < nCount) && !xAccessible.is(); n++) { - Reference< XAccessible > xChild = xParentAC->getAccessibleChild(n); + ::com::sun::star::uno::Reference< XAccessible > xChild = xParentAC->getAccessibleChild(n); if ( xChild.is() ) { - Reference< XAccessibleContext > xChildAC = xChild->getAccessibleContext(); + ::com::sun::star::uno::Reference< XAccessibleContext > xChildAC = xChild->getAccessibleContext(); if ( xChildAC.is() && (AccessibleRole::LIST == xChildAC->getAccessibleRole()) ) { xAccessible = xChild; --- oo_1.1.1_src/accessibility/prj/d.lst.orig 2003-05-28 00:46:12.000000000 +0900 +++ oo_1.1.1_src/accessibility/prj/d.lst 2004-03-29 12:17:36.000000000 +0900 @@ -2,5 +2,5 @@ ..\%__SRC%\class\java_accessibility.jar %_DEST%\bin%_EXT%\java_accessibility.jar ..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*.dll -..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT% +..\%__SRC%\lib\lib*.a %_DEST%\lib%_EXT% --- oo_1.1.1_src/automation/source/server/statemnt.cxx.orig 2003-06-10 20:29:44.000000000 +0900 +++ oo_1.1.1_src/automation/source/server/statemnt.cxx 2004-03-29 12:17:36.000000000 +0900 @@ -639,7 +639,7 @@ {} // XStatusListener -void SAL_CALL SlotStatusListener::statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) +void SAL_CALL SlotStatusListener::statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw (::com::sun::star::uno::RuntimeException) { // DBG_ERROR1("FeatureURL: %s", ByteString( String( Event.FeatureURL.Complete ), RTL_TEXTENCODING_UTF8 ).GetBuffer() ) // DBG_ERROR1("FeatureDescriptor: %s", ByteString( String( Event.FeatureDescriptor ), RTL_TEXTENCODING_UTF8 ).GetBuffer() ) @@ -649,7 +649,7 @@ } // XEventListener -void SAL_CALL SlotStatusListener::disposing( const ::com::sun::star::lang::EventObject& ) +void SAL_CALL SlotStatusListener::disposing( const ::com::sun::star::lang::EventObject& ) throw (::com::sun::star::uno::RuntimeException) { bDisposed = TRUE; } --- oo_1.1.1_src/berkeleydb/db-3.2.9.patch.orig 2004-01-09 22:44:30.000000000 +0900 +++ oo_1.1.1_src/berkeleydb/db-3.2.9.patch 2004-03-29 12:17:36.000000000 +0900 @@ -44,7 +44,7 @@ CC= @MAKEFILE_CC@ CCLINK= @MAKEFILE_CCLINK@ *** misc/db-3.2.9/dist/configure 2001-01-24 16:16:18.000000000 +0100 ---- misc/build/db-3.2.9/dist/configure 2003-07-16 19:34:25.000000000 +0200 +--- misc/build/db-3.2.9/dist/configure Wed Mar 17 23:47:10 2004 *************** *** 995,1000 **** --- 995,1003 ---- @@ -58,6 +58,42 @@ *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" @@ -66,7 +102,7 @@ SOFLAGS="-rpath \$(libdir)" o=".lo" fi ---- 1647,1660 ---- +--- 1658,1671 ---- INSTALLER="\$(LIBTOOL) --mode=install cp" POSTLINK="\$(LIBTOOL) --mode=execute true" @@ -91,11 +127,11 @@ fi done IFS="$ac_save_ifs" ---- 1760,1769 ---- +--- 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 +! if test "$SOLARENV/$OUTPATH/bin" != $ac_dir; then ! ac_cv_path_JAVACABS="$ac_dir/$ac_word" ! break ! fi @@ -124,7 +160,7 @@ *) JINCSUBDIRS="genunix";; esac ---- 1793,1833 ---- +--- 1804,1856 ---- echo "$ac_t""$JAVACABS" 1>&6 done JTOPDIR=`echo "$JAVACABS" | sed -e 's://*:/:g' -e 's:/[^/]*$::'` @@ -142,7 +178,19 @@ ! 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" @@ -167,6 +215,54 @@ 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 <&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" @@ -175,7 +271,7 @@ #if defined(__GNUC__) exit(0); #endif ---- 4041,4047 ---- +--- 4103,4109 ---- #line 4009 "configure" #include "confdefs.h" main(){ @@ -184,6 +280,84 @@ 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 < ++ /* 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 <&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 @@ -193,7 +367,7 @@ CREATE_LIST="Makefile include.tcl:../test/include.tcl db.h:../include/db.src ---- 5408,5413 ---- +--- 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 *************** @@ -207,7 +381,7 @@ esac *** misc/db-3.2.9/dist/ltconfig 2000-10-13 22:23:00.000000000 +0200 ---- misc/build/db-3.2.9/dist/ltconfig 2003-07-16 19:35:54.000000000 +0200 +--- misc/build/db-3.2.9/dist/ltconfig Wed Mar 17 23:47:10 2004 *************** *** 678,683 **** --- 678,688 ---- @@ -223,7 +397,22 @@ # FIXME: we need at least 68020 code to build shared libraries, but # adding the `-m68020' flag to GCC prevents building anything better, *************** -*** 1194,1204 **** +*** 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 @@ -235,7 +424,36 @@ fi ;; ---- 1199,1221 ---- +--- 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 @@ -260,8 +478,18 @@ ;; *************** +*** 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 **** ---- 1388,1410 ---- +--- 1416,1438 ---- hardcode_shlibpath_var=no ;; @@ -300,7 +528,7 @@ sco3.2v5*) archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linkopts' hardcode_shlibpath_var=no ---- 1477,1483 ---- +--- 1505,1511 ---- hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' hardcode_libdir_separator=: ;; @@ -309,8 +537,32 @@ 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 **** ---- 1947,1973 ---- +--- 1982,2008 ---- esac ;; @@ -347,7 +599,7 @@ library_names_spec='${libname}${release}.so.$versuffix ${libname}${release}.so.$major ${libname}${release}.so $libname.so' case "$host_os" in irix5*) ---- 2004,2010 ---- +--- 2039,2045 ---- version_type=irix need_lib_prefix=no need_version=no @@ -357,7 +609,7 @@ irix5*) *************** *** 2023,2028 **** ---- 2072,2091 ---- +--- 2107,2126 ---- shlibpath_var=LD_LIBRARY_PATH ;; @@ -394,12 +646,79 @@ sco3.2v5*) version_type=osf soname_spec='${libname}${release}.so$major' ---- 2120,2125 ---- +--- 2155,2160 ---- *** misc/db-3.2.9/dist/ltmain.sh 2000-08-06 20:32:00.000000000 +0200 ---- misc/build/db-3.2.9/dist/ltmain.sh 2003-07-16 19:34:25.000000000 +0200 +--- misc/build/db-3.2.9/dist/ltmain.sh Wed Mar 17 23:47:10 2004 *************** -*** 1079,1084 **** ---- 1079,1089 ---- +*** 622,628 **** + link) + modename="$modename: link" + case "$host" in +! *-*-cygwin* | *-*-mingw* | *-*-os2*) + # It is impossible to link a dll without this setting, and + # we shouldn't force the makefile maintainer to figure out + # which system we are compiling for in order to pass an extra +--- 622,628 ---- + link) + modename="$modename: link" + case "$host" in +! *cygwin* | *-*-os2*) + # It is impossible to link a dll without this setting, and + # we shouldn't force the makefile maintainer to figure out + # which system we are compiling for in order to pass an extra +*************** +*** 880,888 **** + esac + done + +- # See if our shared archives depend on static archives. +- test -n "$old_archive_from_new_cmds" && build_old_libs=yes +- + # Go through the arguments, transforming them on the way. + while test $# -gt 0; do + arg="$1" +--- 880,885 ---- +*************** +*** 1061,1067 **** + *) lib_search_path="$lib_search_path $dir";; + esac + case "$host" in +! *-*-cygwin* | *-*-mingw* | *-*-os2*) + dllsearchdir=`cd "$dir" && pwd || echo "$dir"` + case ":$dllsearchpath:" in + ::) dllsearchpath="$dllsearchdir";; +--- 1058,1064 ---- + *) lib_search_path="$lib_search_path $dir";; + esac + case "$host" in +! *cygwin* | *mingw* | *-*-os2*) + dllsearchdir=`cd "$dir" && pwd || echo "$dir"` + case ":$dllsearchpath:" in + ::) dllsearchpath="$dllsearchdir";; +*************** +*** 1075,1091 **** + -l*) + if test "$arg" = "-lc"; then + case "$host" in +! *-*-cygwin* | *-*-mingw* | *-*-os2* | *-*-beos*) + # These systems don't actually have c library (as such) + continue + ;; + esac + elif test "$arg" = "-lm"; then + case "$host" in +! *-*-cygwin* | *-*-beos*) + # These systems don't actually have math library (as such) + continue + ;; + esac + fi + deplibs="$deplibs $arg" +--- 1072,1098 ---- + -l*) + if test "$arg" = "-lc"; then + case "$host" in +! *cygwin* | *mingw* | *-*-os2* | *-*-beos*) # These systems don't actually have c library (as such) continue ;; @@ -411,9 +730,7 @@ esac elif test "$arg" = "-lm"; then case "$host" in -*************** -*** 1086,1091 **** ---- 1091,1101 ---- +! *cygwin* | *-*-beos*) # These systems don't actually have math library (as such) continue ;; @@ -426,6 +743,35 @@ 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" @@ -471,6 +817,23 @@ 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 @@ -484,3 +847,195 @@ *) # 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 ++++ misc/build/db-3.2.9/os/os_oflags.c 2003-11-01 17:18:30.000000000 +0900 +@@ -75,17 +75,42 @@ + #ifndef S_IRUSR + #ifdef DB_WIN32 + #define S_IRUSR S_IREAD /* R for owner */ +-#define S_IWUSR S_IWRITE /* W for owner */ +-#define S_IRGRP 0 /* R for group */ +-#define S_IWGRP 0 /* W for group */ +-#define S_IROTH 0 /* R for other */ +-#define S_IWOTH 0 /* W for other */ + #else + #define S_IRUSR 0000400 /* R for owner */ ++#endif /* DB_WIN32 */ ++#endif ++#ifndef S_IWUSR ++#ifdef DB_WIN32 ++#define S_IWUSR S_IWRITE /* W for owner */ ++#else + #define S_IWUSR 0000200 /* W for owner */ ++#endif /* DB_WIN32 */ ++#endif ++#ifndef S_IRGRP ++#ifdef DB_WIN32 ++#define S_IRGRP 0 /* R for group */ ++#else + #define S_IRGRP 0000040 /* R for group */ ++#endif /* DB_WIN32 */ ++#endif ++#ifndef S_IWGRP ++#ifdef DB_WIN32 ++#define S_IWGRP 0 /* W for group */ ++#else + #define S_IWGRP 0000020 /* W for group */ ++#endif /* DB_WIN32 */ ++#endif ++#ifndef S_IROTH ++#ifdef DB_WIN32 ++#define S_IROTH 0 /* R for other */ ++#else + #define S_IROTH 0000004 /* R for other */ ++#endif /* DB_WIN32 */ ++#endif ++#ifndef S_IWOTH ++#ifdef DB_WIN32 ++#define S_IWOTH 0 /* W for other */ ++#else + #define S_IWOTH 0000002 /* W for other */ + #endif /* DB_WIN32 */ + #endif +--- misc/build/db-3.2.9/os/os_fsync.c.orig 2000-04-07 05:33:30.000000000 +0900 ++++ misc/build/db-3.2.9/os/os_fsync.c 2003-11-02 01:32:04.000000000 +0900 +@@ -22,6 +22,12 @@ + #include "db_int.h" + #include "os_jump.h" + ++#ifdef __MINGW32__ ++#include ++ ++#define fsync(fd) _commit(fd) ++#endif ++ + #ifdef HAVE_VXWORKS + #include "ioLib.h" + +--- misc/build/db-3.2.9/os/os_sleep.c.orig 2000-04-07 23:43:26.000000000 +0900 ++++ misc/build/db-3.2.9/os/os_sleep.c 2003-11-02 01:04:42.000000000 +0900 +@@ -38,6 +38,10 @@ + #include + #endif + ++#ifdef __MINGW32__ ++#include ++#endif ++ + #include "db_int.h" + #include "os_jump.h" + +@@ -68,10 +72,15 @@ + */ + t.tv_sec = secs; + t.tv_usec = usecs; ++#ifdef __MINGW32__ ++ Sleep(secs * 1000 + usecs / 1000); ++ return (0); ++#else + ret = select(0, NULL, NULL, NULL, &t) == -1 ? __os_get_errno() : 0; + + if (ret != 0) + __db_err(dbenv, "select: %s", strerror(ret)); + + return (ret); ++#endif + } --- oo_1.1.1_src/berkeleydb/prj/d.lst.orig 2003-07-17 02:13:20.000000000 +0900 +++ oo_1.1.1_src/berkeleydb/prj/d.lst 2004-03-29 12:17:36.000000000 +0900 @@ -11,12 +11,15 @@ ..\%__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\libdb32.dll %_DEST%\bin%_EXT%\libdb32.dll -..\%__SRC%\bin\libdb_java32.dll %_DEST%\bin%_EXT%\libdb_java32.dll +..\%__SRC%\bin\libdb*.dll %_DEST%\bin%_EXT%\*.* ..\%__SRC%\bin\db.jar %_DEST%\bin%_EXT%\db.jar --- oo_1.1.1_src/boost/prj/d.lst.orig 2003-06-12 20:10:36.000000000 +0900 +++ oo_1.1.1_src/boost/prj/d.lst 2004-03-29 12:17:36.000000000 +0900 @@ -29,5 +29,6 @@ ..\%__SRC%\lib\*.lib %_DEST%\lib%_EXT%\*.lib ..\%__SRC%\lib\*.so %_DEST%\lib%_EXT%\*.so +..\%__SRC%\lib\*.a %_DEST%\lib%_EXT%\*.a ..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*.dll --- oo_1.1.1_src/bridges/prj/build.lst.orig 2004-01-28 20:53:02.000000000 +0900 +++ oo_1.1.1_src/bridges/prj/build.lst 2004-03-29 12:17:36.000000000 +0900 @@ -5,6 +5,7 @@ br bridges\source\remote\urp nmake - all br_rem_urp br_rem_static NULL br bridges\source\remote\iiop nmake - all br_iiop br_rem_static NULL br bridges\source\remote\context nmake - all br_rcon br_unotypes NULL +br bridges\source\cpp_uno\mingw_intel nmake - w br_gcc3i br_unotypes NULL br bridges\source\cpp_uno\msvc_win32_intel nmake - w br_msci br_unotypes NULL br bridges\source\cpp_uno\gcc2_linux_intel nmake - u br_gccli br_unotypes NULL br bridges\source\cpp_uno\gcc3_linux_intel nmake - u br_gcc3li br_unotypes NULL --- oo_1.1.1_src/bridges/prj/d.lst.orig 2002-12-06 19:26:04.000000000 +0900 +++ oo_1.1.1_src/bridges/prj/d.lst 2004-03-29 12:17:36.000000000 +0900 @@ -23,6 +23,7 @@ # ..\%__SRC%\bin\c_uno.* %_DEST%\bin%_EXT%\c_uno.* # ..\%__SRC%\lib\libc_uno.* %_DEST%\lib%_EXT%\libc_uno.* ..\%__SRC%\bin\msci_uno.* %_DEST%\bin%_EXT%\msci_uno.* +..\%__SRC%\bin\gcc3_uno.* %_DEST%\bin%_EXT%\gcc3_uno.* ..\%__SRC%\lib\libgcc2_uno.* %_DEST%\lib%_EXT%\libgcc2_uno.* ..\%__SRC%\lib\libgcc3_uno.* %_DEST%\lib%_EXT%\libgcc3_uno.* ..\%__SRC%\lib\libsunpro5_uno.* %_DEST%\lib%_EXT%\libsunpro5_uno.* --- oo_1.1.1_src/bridges/source/cpp_uno/mingw_intel/cpp2uno.cxx.orig 2001-10-26 16:22:58.000000000 +0900 +++ oo_1.1.1_src/bridges/source/cpp_uno/mingw_intel/cpp2uno.cxx 2004-03-29 12:17:36.000000000 +0900 @@ -99,11 +99,13 @@ // 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 )) @@ -114,7 +116,7 @@ { pCppReturn = *(void **)pCppStack; pCppStack += sizeof(void *); - + pUnoReturn = (cppu_relatesToInterface( pReturnTypeDescr ) ? alloca( pReturnTypeDescr->nSize ) : pCppReturn); // direct way @@ -132,9 +134,9 @@ sal_Int32 * pTempIndizes = (sal_Int32 *)(pUnoArgs + (2 * nParams)); // type descriptions for reconversions typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription **)(pUnoArgs + (3 * nParams)); - - sal_Int32 nTempIndizes = 0; - + + sal_Int32 nTempIndizes = 0; + for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos ) { const typelib_MethodParameter & rParam = pParams[nPos]; @@ -170,9 +172,10 @@ // is in/inout else if (cppu_relatesToInterface( pParamTypeDescr )) { - uno_copyAndConvertData( pUnoArgs[nPos] = alloca( pParamTypeDescr->nSize ), - *(void **)pCppStack, pParamTypeDescr, - &pThis->pBridge->aCpp2Uno ); + ::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; @@ -186,29 +189,33 @@ } 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 - for ( ; nTempIndizes--; ) + while (nTempIndizes--) { sal_Int32 nIndex = pTempIndizes[nTempIndizes]; - + if (pParams[nIndex].bIn) // is in/inout => was constructed - uno_destructData( pUnoArgs[nIndex], ppTempParamTypeDescr[nTempIndizes], 0 ); + { + ::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; @@ -216,21 +223,23 @@ else // else no exception occured... { // temporary params - for ( ; nTempIndizes--; ) + 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 ); + ::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 ); - + ::uno_destructData( pUnoArgs[nIndex], pParamTypeDescr, 0 ); + TYPELIB_DANGER_RELEASE( pParamTypeDescr ); } // return @@ -238,10 +247,12 @@ { if (pUnoReturn != pCppReturn) // needs reconversion { - uno_copyAndConvertData( pCppReturn, pUnoReturn, pReturnTypeDescr, - &pThis->pBridge->aUno2Cpp ); + ::uno_copyAndConvertData( + pCppReturn, pUnoReturn, pReturnTypeDescr, + &pThis->pBridge->aUno2Cpp ); // destroy temp uno return - uno_destructData( pUnoReturn, pReturnTypeDescr, 0 ); + ::uno_destructData( + pUnoReturn, pReturnTypeDescr, 0 ); } // complex return ptr is set to eax *(void **)pRegisterReturn = pCppReturn; @@ -265,37 +276,38 @@ 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 * pCppI = NULL; + cppu_cppInterfaceProxy * pThis = NULL; if( nVtableCall & 0x80000000 ) { nVtableCall &= 0x7fffffff; - pCppI = (cppu_cppInterfaceProxy *)(XInterface *)*(pCallStack +2); + pThis = static_cast< cppu_cppInterfaceProxy * >( + reinterpret_cast< XInterface * >( pCallStack[2] ) ); } else { - pCppI = (cppu_cppInterfaceProxy *)(XInterface *)*(pCallStack +1); + pThis = static_cast< cppu_cppInterfaceProxy * >( + reinterpret_cast< XInterface * >( pCallStack[1] ) ); } - typelib_InterfaceTypeDescription * pTypeDescr = pCppI->pTypeDescr; + typelib_InterfaceTypeDescription * pTypeDescr = pThis->pTypeDescr; OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" ); if (nVtableCall >= pTypeDescr->nMapFunctionIndexToMemberIndex) { - throw RuntimeException( - OUString::createFromAscii("illegal vtable index!"), - (XInterface *)pCppI ); + throw RuntimeException( OUString( RTL_CONSTASCII_USTRINGPARAM("illegal vtable index!") ), + (XInterface *)pThis ); } - + // 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) { @@ -305,7 +317,7 @@ { // is GET method eRet = cpp2uno_call( - pCppI, aMemberDescr.get(), + pThis, aMemberDescr.get(), ((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef, 0, 0, // no params pCallStack, pRegisterReturn ); @@ -318,9 +330,9 @@ ((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef; aParam.bIn = sal_True; aParam.bOut = sal_False; - + eRet = cpp2uno_call( - pCppI, aMemberDescr.get(), + pThis, aMemberDescr.get(), 0, // indicates void return 1, &aParam, pCallStack, pRegisterReturn ); @@ -332,12 +344,13 @@ // is METHOD switch (nVtableCall) { + // standard XInterface vtable calls case 1: // acquire() - pCppI->acquireProxy(); // non virtual call! + pThis->acquireProxy(); // non virtual call! eRet = typelib_TypeClass_VOID; break; case 2: // release() - pCppI->releaseProxy(); // non virtual call! + pThis->releaseProxy(); // non virtual call! eRet = typelib_TypeClass_VOID; break; case 0: // queryInterface() opt @@ -345,12 +358,12 @@ typelib_TypeDescription * pTD = 0; TYPELIB_DANGER_GET( &pTD, reinterpret_cast< Type * >( pCallStack[3] )->getTypeLibType() ); if (pTD) - { + { XInterface * pInterface = 0; - (*pCppI->pBridge->pCppEnv->getRegisteredInterface)( - pCppI->pBridge->pCppEnv, - (void **)&pInterface, pCppI->oid.pData, (typelib_InterfaceTypeDescription *)pTD ); - + (*pThis->pBridge->pCppEnv->getRegisteredInterface)( + pThis->pBridge->pCppEnv, + (void **)&pInterface, pThis->oid.pData, (typelib_InterfaceTypeDescription *)pTD ); + if (pInterface) { ::uno_any_construct( @@ -367,7 +380,7 @@ } // else perform queryInterface() default: eRet = cpp2uno_call( - pCppI, aMemberDescr.get(), + pThis, aMemberDescr.get(), ((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pReturnTypeRef, ((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->nParams, ((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pParams, @@ -378,8 +391,8 @@ default: { throw RuntimeException( - OUString::createFromAscii("no member description found!"), - (XInterface *)pCppI ); + OUString( RTL_CONSTASCII_USTRINGPARAM("no member description found!") ), + (XInterface *)pThis ); // is here for dummy eRet = typelib_TypeClass_VOID; } @@ -546,7 +559,7 @@ //================================================================================================== void SAL_CALL cppu_cppInterfaceProxy_patchVtable( - XInterface * pCppI, typelib_InterfaceTypeDescription * pTypeDescr ) throw () + XInterface * pThis, typelib_InterfaceTypeDescription * pTypeDescr ) throw () { static MediateClassData * s_pMediateClassData = 0; if (! s_pMediateClassData) @@ -562,7 +575,7 @@ #endif } } - *(void const **)pCppI = s_pMediateClassData->get_vtable( pTypeDescr ); + *(void const **)pThis = s_pMediateClassData->get_vtable( pTypeDescr ); } } @@ -573,22 +586,19 @@ 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 ); + return CPPU_CURRENT_NAMESPACE::g_moduleCount.canUnload( &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 ); + CPPU_CURRENT_NAMESPACE::cppu_cppenv_initEnvironment( 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 ); + CPPU_CURRENT_NAMESPACE::cppu_ext_getMapping( ppMapping, pFrom, pTo ); } } --- oo_1.1.1_src/bridges/source/cpp_uno/mingw_intel/except.cxx.orig 2003-04-16 01:26:08.000000000 +0900 +++ oo_1.1.1_src/bridges/source/cpp_uno/mingw_intel/except.cxx 2004-03-29 12:17:36.000000000 +0900 @@ -60,7 +60,6 @@ ************************************************************************/ #include -#include #include #include @@ -103,7 +102,7 @@ OSL_ASSERT( 'N' == *p ); ++p; // skip N - while ('E' != *p) + while ('E' != *p && buf.getLength() < 64) { // read chars count long n = (*p++ - '0'); @@ -114,7 +113,7 @@ } buf.appendAscii( p, n ); p += n; - if ('E' != *p) + if ('E' != *p && buf.getLength() < 64) buf.append( (sal_Unicode)'.' ); } @@ -137,8 +136,6 @@ t_rtti_map m_rttis; t_rtti_map m_generatedRttis; - void * m_hApp; - public: RTTI() SAL_THROW( () ); ~RTTI() SAL_THROW( () ); @@ -147,13 +144,11 @@ }; //__________________________________________________________________________________________________ RTTI::RTTI() SAL_THROW( () ) - : m_hApp( dlopen( 0, RTLD_LAZY ) ) { } //__________________________________________________________________________________________________ RTTI::~RTTI() SAL_THROW( () ) { - dlclose( m_hApp ); } //__________________________________________________________________________________________________ @@ -182,16 +177,6 @@ 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()) @@ -226,11 +211,6 @@ rtti = iFind->second; } } - } - else - { - rtti = iFind->second; - } return rtti; } @@ -261,7 +241,7 @@ fprintf( stderr, "> uno exception occured: %s\n", cstr.getStr() ); #endif void * pCppExc; - type_info * rtti; + const type_info * rtti; { // construct cpp exception object @@ -308,7 +288,7 @@ } } - __cxa_throw( pCppExc, rtti, deleteException ); + __cxa_throw( pCppExc, const_cast(rtti), deleteException ); } //================================================================================================== --- oo_1.1.1_src/bridges/source/cpp_uno/mingw_intel/uno2cpp.cxx.orig 2003-04-01 19:40:20.000000000 +0900 +++ oo_1.1.1_src/bridges/source/cpp_uno/mingw_intel/uno2cpp.cxx 2004-03-29 12:17:36.000000000 +0900 @@ -164,10 +164,9 @@ 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; + // max space for: [complex ret ptr], values|ptr ... + char * pCppStack = (char *)alloca( sizeof(sal_Int32) + ((nParams+2) * sizeof(sal_Int64)) ); + char * pCppStackStart = pCppStack; // return typelib_TypeDescription * pReturnTypeDescr = 0; @@ -196,6 +195,7 @@ pCppStack += sizeof( void* ); // stack space + OSL_ENSURE( sizeof(void *) == sizeof(sal_Int32), "### unexpected size!" ); // args void ** pCppArgs = (void **)alloca( 3 * sizeof(void *) * nParams ); @@ -214,8 +214,9 @@ if (!rParam.bOut && cppu_isSimpleType( pParamTypeDescr )) { - uno_copyAndConvertData( pCppArgs[nPos] = pCppStack, pUnoArgs[nPos], pParamTypeDescr, - &pThis->pBridge->aUno2Cpp ); + ::uno_copyAndConvertData( + pCppArgs[nPos] = pCppStack, pUnoArgs[nPos], pParamTypeDescr, + &pThis->pBridge->aUno2Cpp ); switch (pParamTypeDescr->eTypeClass) { @@ -232,7 +233,7 @@ if (! rParam.bIn) // is pure out { // cpp out is constructed mem, uno out is not! - uno_constructData( + ::uno_constructData( *(void **)pCppStack = pCppArgs[nPos] = alloca( pParamTypeDescr->nSize ), pParamTypeDescr ); pTempIndizes[nTempIndizes] = nPos; // default constructed for cpp call @@ -242,9 +243,10 @@ // is in/inout else if (cppu_relatesToInterface( pParamTypeDescr )) { - uno_copyAndConvertData( + ::uno_copyAndConvertData( *(void **)pCppStack = pCppArgs[nPos] = alloca( pParamTypeDescr->nSize ), - pUnoArgs[nPos], pParamTypeDescr, &pThis->pBridge->aUno2Cpp ); + pUnoArgs[nPos], pParamTypeDescr, + &pThis->pBridge->aUno2Cpp ); pTempIndizes[nTempIndizes] = nPos; // has to be reconverted // will be released at reconversion @@ -262,74 +264,85 @@ 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]; + 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) ); - if (pParams[nIndex].bIn) + // NO exception occured... + *ppUnoExc = 0; + + // reconvert temporary params + while (nTempIndizes--) { - if (pParams[nIndex].bOut) // inout + sal_Int32 nIndex = pTempIndizes[nTempIndizes]; + typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes]; + + if (pParams[nIndex].bIn) { - uno_destructData( pUnoArgs[nIndex], pParamTypeDescr, 0 ); // destroy uno value - uno_copyAndConvertData( pUnoArgs[nIndex], pCppArgs[nIndex], pParamTypeDescr, - &pThis->pBridge->aCpp2Uno ); + 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 ); } - else // pure out + // return value + if (pCppReturn && pUnoReturn != pCppReturn) { - uno_copyAndConvertData( pUnoArgs[nIndex], pCppArgs[nIndex], pParamTypeDescr, - &pThis->pBridge->aCpp2Uno ); + ::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--; ) { - 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] ); + // 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 = (cppu_unoInterfaceProxy *)pUnoI; + cppu_unoInterfaceProxy * pThis = static_cast< cppu_unoInterfaceProxy * >( pUnoI ); typelib_InterfaceTypeDescription * pTypeDescr = pThis->pTypeDescr; switch (pMemberDescr->eTypeClass) @@ -360,7 +373,7 @@ ((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( @@ -403,7 +416,7 @@ 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, --- oo_1.1.1_src/comphelper/prj/d.lst.orig 2004-01-28 20:29:10.000000000 +0900 +++ oo_1.1.1_src/comphelper/prj/d.lst 2004-03-29 12:17:36.000000000 +0900 @@ -1,6 +1,7 @@ ..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*.dll ..\%__SRC%\lib\*.lib %_DEST%\lib%_EXT%\*.lib ..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT% +..\%__SRC%\lib\lib*.a %_DEST%\lib%_EXT% ..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib ..\%__SRC%\lib\*.sl %_DEST%\lib%_EXT%\*.sl ..\%__SRC%\bin\*.bin %_DEST%\bin%_EXT%\*.bin --- oo_1.1.1_src/config_office/configure.orig 2004-02-19 19:59:10.000000000 +0900 +++ oo_1.1.1_src/config_office/configure 2004-03-29 12:17:36.000000000 +0900 @@ -272,7 +272,7 @@ PACKAGE_STRING= PACKAGE_BUGREPORT= -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' +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' ac_subst_files='' # Initialize some variables set by options. @@ -3547,7 +3547,7 @@ else echo "$as_me:$LINENO: checking the Mingwin32 C++ Compiler" >&5 echo $ECHO_N "checking the Mingwin32 C++ Compiler... $ECHO_C" >&6 - if test `$CC -dumpmachine | $AWK -F- '{ print $3 }'` = "mingw32"; then + if test `$CC -dumpmachine | $AWK -F- '{ print $1 }'` = "mingw32"; then echo "$as_me:$LINENO: result: found." >&5 echo "${ECHO_T}found." >&6 else @@ -4491,6 +4491,12 @@ fi GXX_INCLUDE_PATH="$with_gxx_include_path" +if test "$_os" != "WINNT" -o "$WITH_MINGWIN" = "yes"; then + _lib_include_path=`echo "#include " | $CC -E - | $SED -n '/.*1*"\(.*\)\/stddef.h".*/s//\1/p' | sort -u | xargs echo` +else + _lib_include_path="NO_LIB_INCLUDE" +fi +LIB_INCLUDE_PATH="$_lib_include_path" if test "$_os" = "SunOS"; then if test "$CC" = "cc"; then @@ -8241,6 +8247,28 @@ fi +if test "$_os" = "WINNT" -a "$COMEX" = "10"; then + echo "$as_me:$LINENO: checking msvcp71.dll" >&5 +echo $ECHO_N "checking msvcp71.dll... $ECHO_C" >&6 + if test -f ../external/msvcp71/msvcp71.dll; then + echo "$as_me:$LINENO: result: found" >&5 +echo "${ECHO_T}found" >&6 + else + { { echo "$as_me:$LINENO: error: The msvcp71.dll is missing in external/msvcp71/. +The dll is part of the .NET installation and can be found in a directory +similar to: +\"c:\\Program Files\\Microsoft Visual Studio .NET\\Visual C++ .NET Professional - English\\\" +Please copy the file to external/msvcp71." >&5 +echo "$as_me: error: The msvcp71.dll is missing in external/msvcp71/. +The dll is part of the .NET installation and can be found in a directory +similar to: +\"c:\\Program Files\\Microsoft Visual Studio .NET\\Visual C++ .NET Professional - English\\\" +Please copy the file to external/msvcp71." >&2;} + { (exit 1); exit 1; }; } + fi +fi + + WITH_GPC=NO WITH_LIBART=NO @@ -9453,6 +9481,7 @@ s,@WITH_MINGWIN@,$WITH_MINGWIN,;t t s,@LIBOBJS@,$LIBOBJS,;t t s,@LTLIBOBJS@,$LTLIBOBJS,;t t +s,@LIB_INCLUDE_PATH@,$LIB_INCLUDE_PATH,;t t CEOF _ACEOF --- oo_1.1.1_src/config_office/set_soenv.in.orig 2004-02-13 23:20:18.000000000 +0900 +++ oo_1.1.1_src/config_office/set_soenv.in 2004-03-29 12:17:36.000000000 +0900 @@ -42,7 +42,7 @@ my ( $outfile, $outfile_sh, $outfile_bat, $bootfile, $newline, $comment, $comment4nt, $compiler, $unsetenv, $setenv, $unset, $set, $ds, $ps, $cur_dir, $par_dir, $I, $L, $D, $buildenv, $answer, $tmp, $Solaris, $Linux, $FreeBSD, $NetBSD, $Tru64, $Irix, $Irix64, $Winnt, $Macosx, $MINGW, $platform, $cygwinver, $machine_type, $empty, $no_ant, $no_stl, $no_gcc_include, - $no_gxx_include, $warnfile, $Warning, $result, $unsetvars, $unsetvarssh, $unsetvarsbat, $exportvars, $win_format_var, $perl_os); + $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); # #------------------------------------------------- # IIb. Declaring environment values (constants). @@ -88,7 +88,7 @@ $COMP_ENV, $IENV, $ILIB, $WIN_INCLUDE, $JAVAHOME, $WIN_LIB, $PSDK_HOME, $USE_NEW_SDK, $NO_HIDS, $TEMP, $COMMON_BUILD_TOOLS, $WIN_GREP, $WIN_FIND, $WIN_LS, $WIN_GNUCOPY, $WIN_TOUCH, $STLPORT4, $USE_GCC3, $ENABLE_DEBUG, $ENABLE_STATIC_GTK, - $PYTHONPATH, $PYTHONHOME ); + $PYTHONPATH, $PYTHONHOME, $GXX_INCLUDE_PATH); # #------------------------------------------- # IId. Declaring the aliases. @@ -138,6 +138,9 @@ $ENABLE_STATIC_GTK = '@ENABLE_STATIC_GTK@'; # Use static gtk libraries $WRAPCMD = ""; # Wrapper (only for winnt) $GLIBC = ""; # Whether the platform uses glibc +$GXX_INCLUDE_PATH = '@GXX_INCLUDE_PATH@'; +if ( $MINGW eq "yes" ) +{ chomp( $GXX_INCLUDE_PATH = qx{cygpath "$GXX_INCLUDE_PATH"} ); } # #-------------------------------------------------------------------- @@ -556,8 +559,12 @@ { # At the moment this implies the use of tcsh print "Setting Windows NT cygwin MinGW specific values... "; $WRAPCMD = "guw.pl"; + $CC = $WRAPCMD." ".$CC; + $CXX = $WRAPCMD." ".$CXX; $outfile = "winmingw.set"; $COM = "GCC"; + # COMPATH for MSC is differently used + $COMPATH =~ s/\/bin$//i; $CVER = "C300"; $DLLSUFFIX = "gi"; $OUTPATH = "wntgcci"; @@ -1010,11 +1017,24 @@ elsif ($platform eq "$Winnt") { $SOLARINCLUDES = $I.$SOLARVER.$INC. $I.$SOLARENV.$ds.$INPATH.$INC. - $I.$SOLARENV.$INC. - $I."'".$PSDK_HOME.$INCLUDE."'"; + $I.$SOLARENV.$INC; # Mingw is different if ( $COM eq "MSC" ) + { $SOLARINCLUDES .= $I."'".$PSDK_HOME.$INCLUDE."'". + $I.'$COMPATH'.$ds."include"; + } + else { $SOLARINCLUDES .= $I.'$COMPATH'.$ds."include"; + %lib_include_paths = split( / /, "@LIB_INCLUDE_PATH@" ); + foreach $lib_include_path (%lib_include_paths) + { chomp( $lib_include_path = qx{cygpath $lib_include_path} ); + if ( $lib_include_path ne $COMPATH.$ds."include" ) + { + $SOLARINCLUDES .= $I.$lib_include_path; + } + } + $SOLARINCLUDES .= $I.$GXX_INCLUDE_PATH.$I.$GXX_INCLUDE_PATH.$ds."mingw32". + $I."'".$PSDK_HOME.$INCLUDE."'"; } } elsif ($platform eq "$Macosx") @@ -1036,20 +1056,36 @@ $IENV = $cur_dir. $ps.$SOLARVER.$ds.$UPD.$ds.$INPATH.$INC. $ps.$SOLARENV.$ds.$OUTPATH.$INC. - $ps.$SOLARENV.$INC. - $ps.'$PSDK_HOME'.$INCLUDE; + $ps.$SOLARENV.$INC; # Mingw is different if ( $COM eq "MSC" ) + { $IENV .= $ps.'$PSDK_HOME'.$INCLUDE. + $ps.'$COMPATH'.$INCLUDE; + } + else { $IENV .= $ps.'$COMPATH'.$INCLUDE; + %lib_include_paths = split( / /, "@LIB_INCLUDE_PATH@" ); + foreach $lib_include_path (%lib_include_paths) + { chomp( $lib_include_path = qx{cygpath $lib_include_path} ); + if ( $lib_include_path ne $COMPATH.$ds."include" ) + { + $IENV .= $ps.$lib_include_path; + } + } + $IENV .= $ps.$GXX_INCLUDE_PATH.$ps.$GXX_INCLUDE_PATH.$ds."mingw32". + $ps.'$PSDK_HOME'.$INCLUDE; } $WIN_LIB = $cur_dir.$ps_STLPORT_LIB.$ps. $ps.$SOLARVER.$ds.$UPD.$LIB. $ps.$SOLARVER.$ds.$UPD.$ds.$INPATH.$LIB. $ps.$SOLARENV.$ds.$OUTPATH.$LIB. - $ps.$JAVA_HOME.$LIB. - $ps.'$PSDK_HOME'.$LIB; + $ps.$JAVA_HOME.$LIB; # Mingw is different if ( $COM eq "MSC" ) + { $WIN_LIB .= $ps.'$PSDK_HOME'.$LIB. + $ps.'$COMPATH'.$LIB; + } + else { $WIN_LIB .= $ps.'$COMPATH'.$LIB; } if ( $JAVA_HOME ne "" ) @@ -1129,7 +1165,7 @@ if ( $COM eq "MSC" ) { $PATH .= $ps.'$COMPATH'.$BIN; } else { - $PATH .= $ps.'$COMPATH'; + $PATH .= $ps.'$COMPATH'.$BIN; } } if ( $COM eq "MSC" ) { @@ -1329,11 +1365,24 @@ elsif ($platform eq "$Winnt") { $SOLARINC .= $STLPORT_stlport. $I.'$JAVA_HOME'.$ds."include".$ds."win32". - $I.'$JAVA_HOME'.$ds."include". - $I."'".$PSDK_HOME.$INCLUDE."'"; + $I.'$JAVA_HOME'.$ds."include"; # Mingw is different if ( $COM eq "MSC" ) + { $SOLARINC .= $I."'".$PSDK_HOME.$INCLUDE."'". + $I.'$COMPATH'.$ds."include"; + } + else { $SOLARINC .= $I.'$COMPATH'.$ds."include"; + %lib_include_paths = split( / /, "@LIB_INCLUDE_PATH@" ); + foreach $lib_include_path (%lib_include_paths) + { chomp( $lib_include_path = qx{cygpath $lib_include_path} ); + if ( $lib_include_path ne $COMPATH.$ds."include" ) + { + $SOLARINC .= $I.$lib_include_path; + } + } + $SOLARINC .= $I.$GXX_INCLUDE_PATH.$I.$GXX_INCLUDE_PATH.$ds."mingw32". + $I."'".$PSDK_HOME.$INCLUDE."'"; } } elsif ($platform eq "$Macosx") @@ -1782,7 +1831,7 @@ } ToFile( "SYSTEM_ZLIB", "@SYSTEM_ZLIB@", "e" ); ToFile( "BUILD_DMAKE", "@BUILD_DMAKE@", "e" ); -ToFile( "GXX_INCLUDE_PATH", "@GXX_INCLUDE_PATH@", "e" ); +ToFile( "GXX_INCLUDE_PATH", $GXX_INCLUDE_PATH, "e" ); ToFile( "COMMON_BUILD_TOOLS",$COMMON_BUILD_TOOLS, "e" ); if ($platform ne "$Winnt") { ToFile( "TEMP", $TEMP, "e" ); @@ -1798,7 +1847,13 @@ # these variables marked with "j" are used with cygwin only ToFile( "LIB", $WIN_LIB, "j" ); ToFile( "IENV", $IENV, "j" ); - ToFile( "ILIB", $ILIB, "j" ); + if ( $MINGW eq "yes" ) + { my ($tempstring); + $tempstring = $ILIB; + $tempstring =~ s/:/;/g; + ToFile( "ILIB", $tempstring, "e" ); } + else + { ToFile( "ILIB", $ILIB, "j" ); } ToFile( "INCLUDE", $WIN_INCLUDE, "j" ); ToFile( "GREP", $WIN_GREP, "e" ); @@ -1990,6 +2045,8 @@ open( OUT, ">>$bootfile" ) || die "Cannot open $bootfile: $!\n"; print OUT "source $SRC_ROOT/$outfile\n"; +if ( $MINGW eq "yes" ) +{ print OUT 'setenv PATH "/usr/bin:$PATH"'."\n"; } close( OUT ) || print "Can't close $bootfile: $!"; system(`cat bootstrap.1 >> bootstrap`); system(`cat bootstrap.2 >> bootstrap`); @@ -2276,7 +2333,7 @@ foreach $d1 ( @split_var ) { $d1 = "-".$d1; - if ( $d1 =~ /^(-\w)[\'\"]?((?:\/[\w\.~ ]+)+)[\'\"]?/ ) + if ( $d1 =~ /^(-\w)[\'\"]?((?:\/[-\+\w\.-~ ]+)+)[\'\"]?/ ) # This regex: option -> $1, filename without quotes -> $2 { $d1_prefix = $1; @@ -2305,7 +2362,7 @@ @split_var = split(/;/,$variable); foreach $d1 ( @split_var ) { - if ( $d1 =~ /(?:^\/[\w\.~ ]+)+/ ) + if ( $d1 =~ /(?:^\/[-\+\w\.~ ]+)+/ ) { if ( $d1 =~ / / ) { --- oo_1.1.1_src/configmgr/prj/d.lst.orig 2004-01-28 20:12:06.000000000 +0900 +++ oo_1.1.1_src/configmgr/prj/d.lst 2004-03-29 12:17:36.000000000 +0900 @@ -1,5 +1,6 @@ mkdir: %_DEST%\inc%_EXT%\configmgr ..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT% +..\%__SRC%\lib\lib*.a %_DEST%\lib%_EXT% ..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib ..\%__SRC%\lib\*.sl %_DEST%\lib%_EXT%\*.sl ..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*.dll --- oo_1.1.1_src/configmgr/source/api2/apinodeupdate.hxx.orig 2003-03-20 01:18:30.000000000 +0900 +++ oo_1.1.1_src/configmgr/source/api2/apinodeupdate.hxx 2004-03-29 12:17:36.000000000 +0900 @@ -72,6 +72,12 @@ #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 @@ -207,13 +213,13 @@ } template - GuardedNodeUpdate::Updater GuardedNodeUpdate::getNodeUpdater() const + TYPENAME_ON_RETURN GuardedNodeUpdate::Updater GuardedNodeUpdate::getNodeUpdater() const { return get().getNodeUpdater(this->getDataAccessor()); } template - GuardedNodeUpdate::Defaulter GuardedNodeUpdate::getNodeDefaulter() const + TYPENAME_ON_RETURN GuardedNodeUpdate::Defaulter GuardedNodeUpdate::getNodeDefaulter() const { return get().getNodeDefaulter(this->getDataAccessor()); } --- oo_1.1.1_src/configmgr/source/api2/listenercontainer.hxx.orig 2003-03-20 01:18:34.000000000 +0900 +++ oo_1.1.1_src/configmgr/source/api2/listenercontainer.hxx 2004-03-29 12:17:36.000000000 +0900 @@ -75,6 +75,12 @@ #include +#if (defined(_MSC_VER) && (_MSC_VER >= 1310)) +#define TYPENAME_ON_RETURN typename +#else +#define TYPENAME_ON_RETURN +#endif + namespace configmgr { namespace configapi @@ -155,7 +161,7 @@ BasicContainerInfo() : pInterface(0), pContainer(0) {} }; typedef std::vector BasicContainerHelperArray; - typedef BasicContainerHelperArray::size_type Index; + typedef TYPENAME_ON_RETURN BasicContainerHelperArray::size_type Index; typedef Key_ Key; typedef typename KeyToIndex_::KeyFinder KeyFinder; --- oo_1.1.1_src/connectivity/prj/d.lst.orig 2004-01-28 20:44:06.000000000 +0900 +++ oo_1.1.1_src/connectivity/prj/d.lst 2004-03-29 12:17:38.000000000 +0900 @@ -1,5 +1,6 @@ ..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*.dll ..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%\lib*.so +..\%__SRC%\lib\lib*.a %_DEST%\lib%_EXT%\lib*.a ..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib ..\%__SRC%\slb\connectivity*.* %_DEST%\lib%_EXT%\connectivity*.* ..\%__SRC%\lib\idbt* %_DEST%\lib%_EXT%\idbt* --- oo_1.1.1_src/connectivity/source/drivers/ado/ACallableStatement.cxx.orig 2001-08-30 22:21:00.000000000 +0900 +++ oo_1.1.1_src/connectivity/source/drivers/ado/ACallableStatement.cxx 2004-03-29 12:17:38.000000000 +0900 @@ -253,12 +253,12 @@ } // ------------------------------------------------------------------------- // ----------------------------------------------------------------------------- -void SAL_CALL OCallableStatement::acquire() throw(::com::sun::star::uno::RuntimeException) +void SAL_CALL OCallableStatement::acquire() throw() { OPreparedStatement::acquire(); } // ----------------------------------------------------------------------------- -void SAL_CALL OCallableStatement::release() throw(::com::sun::star::uno::RuntimeException) +void SAL_CALL OCallableStatement::release() throw() { OPreparedStatement::release(); } --- oo_1.1.1_src/connectivity/source/drivers/ado/AColumn.cxx.orig 2003-04-16 02:36:12.000000000 +0900 +++ oo_1.1.1_src/connectivity/source/drivers/ado/AColumn.cxx 2004-03-29 12:17:36.000000000 +0900 @@ -315,12 +315,12 @@ } // ----------------------------------------------------------------------------- // ----------------------------------------------------------------------------- -void SAL_CALL OAdoColumn::acquire() throw(::com::sun::star::uno::RuntimeException) +void SAL_CALL OAdoColumn::acquire() throw() { OColumn_ADO::acquire(); } // ----------------------------------------------------------------------------- -void SAL_CALL OAdoColumn::release() throw(::com::sun::star::uno::RuntimeException) +void SAL_CALL OAdoColumn::release() throw() { OColumn_ADO::release(); } --- oo_1.1.1_src/connectivity/source/drivers/ado/AConnection.cxx.orig 2002-11-29 21:24:20.000000000 +0900 +++ oo_1.1.1_src/connectivity/source/drivers/ado/AConnection.cxx 2004-03-29 12:17:38.000000000 +0900 @@ -223,7 +223,7 @@ osl_decrementInterlockedCount( &m_refCount ); } //----------------------------------------------------------------------------- -void SAL_CALL OConnection::release() throw(RuntimeException) +void SAL_CALL OConnection::release() throw() { relase_ChildImpl(); } @@ -536,7 +536,11 @@ // m_aTables.disposing(); for (OWeakRefArray::iterator i = m_aStatements.begin(); m_aStatements.end() != i; ++i) - ::comphelper::disposeComponent(i->get()); + { + ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > temp = (i->get()); + ::comphelper::disposeComponent(temp); + } + m_aStatements.clear(); m_bClosed = sal_True; --- oo_1.1.1_src/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx.orig 2003-06-06 19:50:16.000000000 +0900 +++ oo_1.1.1_src/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx 2004-03-29 12:17:38.000000000 +0900 @@ -107,7 +107,66 @@ #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 +#endif using namespace dbtools; using namespace connectivity::ado; @@ -711,21 +770,25 @@ } //------------------------------------------------------------------------------ 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) @@ -734,16 +797,19 @@ } //------------------------------------------------------------------------------ ::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); @@ -1234,12 +1300,12 @@ m_xMetaData = pMetaData; } // ----------------------------------------------------------------------------- -void SAL_CALL ODatabaseMetaDataResultSet::acquire() throw(::com::sun::star::uno::RuntimeException) +void SAL_CALL ODatabaseMetaDataResultSet::acquire() throw() { ODatabaseMetaDataResultSet_BASE::acquire(); } // ----------------------------------------------------------------------------- -void SAL_CALL ODatabaseMetaDataResultSet::release() throw(::com::sun::star::uno::RuntimeException) +void SAL_CALL ODatabaseMetaDataResultSet::release() throw() { ODatabaseMetaDataResultSet_BASE::release(); } --- oo_1.1.1_src/connectivity/source/drivers/ado/AGroup.cxx.orig 2002-01-19 01:33:02.000000000 +0900 +++ oo_1.1.1_src/connectivity/source/drivers/ado/AGroup.cxx 2004-03-29 12:17:36.000000000 +0900 @@ -226,12 +226,12 @@ } // ----------------------------------------------------------------------------- -void SAL_CALL OAdoGroup::acquire() throw(::com::sun::star::uno::RuntimeException) +void SAL_CALL OAdoGroup::acquire() throw() { OGroup_ADO::acquire(); } // ----------------------------------------------------------------------------- -void SAL_CALL OAdoGroup::release() throw(::com::sun::star::uno::RuntimeException) +void SAL_CALL OAdoGroup::release() throw() { OGroup_ADO::release(); } --- oo_1.1.1_src/connectivity/source/drivers/ado/AIndex.cxx.orig 2002-11-29 21:24:20.000000000 +0900 +++ oo_1.1.1_src/connectivity/source/drivers/ado/AIndex.cxx 2004-03-29 12:17:36.000000000 +0900 @@ -193,12 +193,12 @@ OIndex_ADO::setFastPropertyValue_NoBroadcast(nHandle,rValue); } // ----------------------------------------------------------------------------- -void SAL_CALL OAdoIndex::acquire() throw(::com::sun::star::uno::RuntimeException) +void SAL_CALL OAdoIndex::acquire() throw() { OIndex_ADO::acquire(); } // ----------------------------------------------------------------------------- -void SAL_CALL OAdoIndex::release() throw(::com::sun::star::uno::RuntimeException) +void SAL_CALL OAdoIndex::release() throw() { OIndex_ADO::release(); } --- oo_1.1.1_src/connectivity/source/drivers/ado/AKey.cxx.orig 2002-07-11 15:56:38.000000000 +0900 +++ oo_1.1.1_src/connectivity/source/drivers/ado/AKey.cxx 2004-03-29 12:17:36.000000000 +0900 @@ -201,12 +201,12 @@ } // ------------------------------------------------------------------------- // ----------------------------------------------------------------------------- -void SAL_CALL OAdoKey::acquire() throw(::com::sun::star::uno::RuntimeException) +void SAL_CALL OAdoKey::acquire() throw() { OKey_ADO::acquire(); } // ----------------------------------------------------------------------------- -void SAL_CALL OAdoKey::release() throw(::com::sun::star::uno::RuntimeException) +void SAL_CALL OAdoKey::release() throw() { OKey_ADO::release(); } --- oo_1.1.1_src/connectivity/source/drivers/ado/APreparedStatement.cxx.orig 2003-05-22 19:49:26.000000000 +0900 +++ oo_1.1.1_src/connectivity/source/drivers/ado/APreparedStatement.cxx 2004-03-29 12:17:38.000000000 +0900 @@ -535,12 +535,12 @@ } // ----------------------------------------------------------------------------- // ----------------------------------------------------------------------------- -void SAL_CALL OPreparedStatement::acquire() throw(::com::sun::star::uno::RuntimeException) +void SAL_CALL OPreparedStatement::acquire() throw() { OStatement_Base::acquire(); } // ----------------------------------------------------------------------------- -void SAL_CALL OPreparedStatement::release() throw(::com::sun::star::uno::RuntimeException) +void SAL_CALL OPreparedStatement::release() throw() { OStatement_Base::release(); } --- oo_1.1.1_src/connectivity/source/drivers/ado/AResultSet.cxx.orig 2002-07-05 18:41:10.000000000 +0900 +++ oo_1.1.1_src/connectivity/source/drivers/ado/AResultSet.cxx 2004-03-29 12:17:38.000000000 +0900 @@ -114,7 +114,10 @@ using namespace ::comphelper; +#ifdef __MINGW32__ +#else #include +#endif #define CHECK_RETURN(x) \ if(!SUCCEEDED(x)) \ @@ -1026,6 +1029,7 @@ } //------------------------------------------------------------------------------ sal_Int32 OResultSet::getResultSetConcurrency() const + throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) { sal_Int32 nValue=0; LockTypeEnum eRet; @@ -1045,6 +1049,7 @@ } //------------------------------------------------------------------------------ sal_Int32 OResultSet::getResultSetType() const + throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) { sal_Int32 nValue=0; CursorTypeEnum eRet; @@ -1069,11 +1074,13 @@ } //------------------------------------------------------------------------------ sal_Int32 OResultSet::getFetchDirection() const + throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) { return FetchDirection::FORWARD; } //------------------------------------------------------------------------------ sal_Int32 OResultSet::getFetchSize() const + throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) { sal_Int32 nValue=-1; m_pRecordSet->get_CacheSize(&nValue); @@ -1081,16 +1088,19 @@ } //------------------------------------------------------------------------------ ::rtl::OUString OResultSet::getCursorName() const + throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) { return ::rtl::OUString(); } //------------------------------------------------------------------------------ void OResultSet::setFetchDirection(sal_Int32 _par0) + throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) { } //------------------------------------------------------------------------------ void OResultSet::setFetchSize(sal_Int32 _par0) + throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) { m_pRecordSet->put_CacheSize(_par0); } @@ -1192,12 +1202,12 @@ } } // ----------------------------------------------------------------------------- -void SAL_CALL OResultSet::acquire() throw(::com::sun::star::uno::RuntimeException) +void SAL_CALL OResultSet::acquire() throw() { OResultSet_BASE::acquire(); } // ----------------------------------------------------------------------------- -void SAL_CALL OResultSet::release() throw(::com::sun::star::uno::RuntimeException) +void SAL_CALL OResultSet::release() throw() { OResultSet_BASE::release(); } --- oo_1.1.1_src/connectivity/source/drivers/ado/AStatement.cxx.orig 2003-03-20 01:38:22.000000000 +0900 +++ oo_1.1.1_src/connectivity/source/drivers/ado/AStatement.cxx 2004-03-29 12:17:38.000000000 +0900 @@ -174,7 +174,7 @@ OStatement_BASE::disposing(); } //----------------------------------------------------------------------------- -void SAL_CALL OStatement_Base::release() throw(RuntimeException) +void SAL_CALL OStatement_Base::release() throw() { relase_ChildImpl(); } @@ -871,17 +871,17 @@ } IMPLEMENT_SERVICE_INFO(OStatement,"com.sun.star.sdbcx.AStatement","com.sun.star.sdbc.Statement"); // ----------------------------------------------------------------------------- -void SAL_CALL OStatement_Base::acquire() throw(::com::sun::star::uno::RuntimeException) +void SAL_CALL OStatement_Base::acquire() throw() { OStatement_BASE::acquire(); } // ----------------------------------------------------------------------------- -void SAL_CALL OStatement::acquire() throw(::com::sun::star::uno::RuntimeException) +void SAL_CALL OStatement::acquire() throw() { OStatement_Base::acquire(); } // ----------------------------------------------------------------------------- -void SAL_CALL OStatement::release() throw(::com::sun::star::uno::RuntimeException) +void SAL_CALL OStatement::release() throw() { OStatement_Base::release(); } --- oo_1.1.1_src/connectivity/source/drivers/ado/ATable.cxx.orig 2002-11-29 21:24:20.000000000 +0900 +++ oo_1.1.1_src/connectivity/source/drivers/ado/ATable.cxx 2004-03-29 12:17:36.000000000 +0900 @@ -225,7 +225,7 @@ void SAL_CALL OAdoTable::rename( const ::rtl::OUString& newName ) throw(SQLException, ElementExistException, RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); - checkDisposed(rBHelper.bDisposed); + checkDisposed(OTableDescriptor_BASE_TYPEDEF::rBHelper.bDisposed); m_aTable.put_Name(newName); ADOS::ThrowException(*(m_pCatalog->getConnection()->getConnection()),*this); @@ -237,7 +237,7 @@ void SAL_CALL OAdoTable::alterColumnByName( const ::rtl::OUString& colName, const Reference< XPropertySet >& descriptor ) throw(SQLException, NoSuchElementException, RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); - checkDisposed(rBHelper.bDisposed); + checkDisposed(OTableDescriptor_BASE_TYPEDEF::rBHelper.bDisposed); sal_Bool bError = sal_True; OAdoColumn* pColumn = NULL; @@ -257,7 +257,7 @@ 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(rBHelper.bDisposed); + checkDisposed(OTableDescriptor_BASE_TYPEDEF::rBHelper.bDisposed); Reference< XPropertySet > xOld; m_pColumns->getByIndex(index) >>= xOld; @@ -297,12 +297,12 @@ OTable_TYPEDEF::setFastPropertyValue_NoBroadcast(nHandle,rValue); } // ------------------------------------------------------------------------- -void SAL_CALL OAdoTable::acquire() throw(::com::sun::star::uno::RuntimeException) +void SAL_CALL OAdoTable::acquire() throw() { OTable_TYPEDEF::acquire(); } // ----------------------------------------------------------------------------- -void SAL_CALL OAdoTable::release() throw(::com::sun::star::uno::RuntimeException) +void SAL_CALL OAdoTable::release() throw() { OTable_TYPEDEF::release(); } --- oo_1.1.1_src/connectivity/source/drivers/ado/AUser.cxx.orig 2001-11-09 16:05:38.000000000 +0900 +++ oo_1.1.1_src/connectivity/source/drivers/ado/AUser.cxx 2004-03-29 12:17:36.000000000 +0900 @@ -214,12 +214,12 @@ } // ----------------------------------------------------------------------------- // ----------------------------------------------------------------------------- -void SAL_CALL OAdoUser::acquire() throw(RuntimeException) +void SAL_CALL OAdoUser::acquire() throw() { OUser_TYPEDEF::acquire(); } // ----------------------------------------------------------------------------- -void SAL_CALL OAdoUser::release() throw(RuntimeException) +void SAL_CALL OAdoUser::release() throw() { OUser_TYPEDEF::release(); } @@ -227,7 +227,7 @@ sal_Int32 SAL_CALL OAdoUser::getPrivileges( const ::rtl::OUString& objName, sal_Int32 objType ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); - checkDisposed(OUser_TYPEDEF::rBHelper.bDisposed); + checkDisposed(OUser_BASE_TYPEDEF::rBHelper.bDisposed); return ADOS::mapAdoRights2Sdbc(m_aUser.GetPermissions(objName, ADOS::mapObjectType2Ado(objType))); } @@ -235,7 +235,7 @@ sal_Int32 SAL_CALL OAdoUser::getGrantablePrivileges( const ::rtl::OUString& objName, sal_Int32 objType ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); - checkDisposed(OUser_TYPEDEF::rBHelper.bDisposed); + checkDisposed(OUser_BASE_TYPEDEF::rBHelper.bDisposed); sal_Int32 nRights = 0; RightsEnum eRights = m_aUser.GetPermissions(objName, ADOS::mapObjectType2Ado(objType)); @@ -248,7 +248,7 @@ 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_TYPEDEF::rBHelper.bDisposed); + 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); } @@ -256,7 +256,7 @@ 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_TYPEDEF::rBHelper.bDisposed); + 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); } @@ -265,7 +265,7 @@ void SAL_CALL OAdoUser::changePassword( const ::rtl::OUString& objPassword, const ::rtl::OUString& newPassword ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); - checkDisposed(OUser_TYPEDEF::rBHelper.bDisposed); + checkDisposed(OUser_BASE_TYPEDEF::rBHelper.bDisposed); m_aUser.ChangePassword(objPassword,newPassword); ADOS::ThrowException(*m_pCatalog->getConnection()->getConnection(),*this); } --- oo_1.1.1_src/connectivity/source/drivers/ado/AView.cxx.orig 2001-11-15 19:50:24.000000000 +0900 +++ oo_1.1.1_src/connectivity/source/drivers/ado/AView.cxx 2004-03-29 12:17:36.000000000 +0900 @@ -158,12 +158,12 @@ OView_ADO::getFastPropertyValue(rValue,nHandle); } // ----------------------------------------------------------------------------- -void SAL_CALL OAdoView::acquire() throw(::com::sun::star::uno::RuntimeException) +void SAL_CALL OAdoView::acquire() throw() { OView_ADO::acquire(); } // ----------------------------------------------------------------------------- -void SAL_CALL OAdoView::release() throw(::com::sun::star::uno::RuntimeException) +void SAL_CALL OAdoView::release() throw() { OView_ADO::release(); } --- oo_1.1.1_src/connectivity/source/inc/OSubComponent.hxx.orig 2002-07-05 16:03:02.000000000 +0900 +++ oo_1.1.1_src/connectivity/source/inc/OSubComponent.hxx 2004-03-29 12:17:36.000000000 +0900 @@ -109,13 +109,13 @@ protected: void dispose_ChildImpl() { - ::osl::MutexGuard aGuard( m_pDerivedImplementation->rBHelper.rMutex ); + ::osl::MutexGuard aGuard( m_pDerivedImplementation->WEAK::rBHelper.rMutex ); m_xParent = NULL; } void relase_ChildImpl() { ::connectivity::release(m_pDerivedImplementation->m_refCount, - m_pDerivedImplementation->rBHelper, + m_pDerivedImplementation->WEAK::rBHelper, m_xParent, m_pDerivedImplementation); --- oo_1.1.1_src/connectivity/source/inc/ado/AConnection.hxx.orig 2002-11-29 21:22:56.000000000 +0900 +++ oo_1.1.1_src/connectivity/source/inc/ado/AConnection.hxx 2004-03-29 12:17:36.000000000 +0900 @@ -151,7 +151,7 @@ // OComponentHelper virtual void SAL_CALL disposing(void); // XInterface - virtual void SAL_CALL release() throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL release() throw(); // XConnection 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); --- oo_1.1.1_src/connectivity/source/inc/ado/ATable.hxx.orig 2001-10-18 03:13:32.000000000 +0900 +++ oo_1.1.1_src/connectivity/source/inc/ado/ATable.hxx 2004-03-29 12:17:36.000000000 +0900 @@ -77,6 +77,7 @@ namespace ado { typedef connectivity::sdbcx::OTable OTable_TYPEDEF; + typedef connectivity::sdbcx::OTableDescriptor_BASE OTableDescriptor_BASE_TYPEDEF; class OAdoTable : public OTable_TYPEDEF { @@ -97,7 +98,7 @@ OAdoTable(sdbcx::OCollection* _pTables,sal_Bool _bCase,OCatalog* _pCatalog); - ::rtl::OUString SAL_CALL getName() { return m_Name; } + ::rtl::OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException) { return m_Name; } ::rtl::OUString getSchema() const { return m_SchemaName; } // com::sun::star::lang::XUnoTunnel virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException); --- oo_1.1.1_src/connectivity/source/inc/ado/AUser.hxx.orig 2001-10-18 03:13:32.000000000 +0900 +++ oo_1.1.1_src/connectivity/source/inc/ado/AUser.hxx 2004-03-29 12:17:36.000000000 +0900 @@ -75,6 +75,7 @@ { class OCatalog; typedef connectivity::sdbcx::OUser OUser_TYPEDEF; + typedef connectivity::sdbcx::OUser_BASE OUser_BASE_TYPEDEF; class OAdoUser : public OUser_TYPEDEF { --- oo_1.1.1_src/connectivity/source/inc/ado/Aolevariant.hxx.orig 2002-01-19 01:23:14.000000000 +0900 +++ oo_1.1.1_src/connectivity/source/inc/ado/Aolevariant.hxx 2004-03-29 12:17:36.000000000 +0900 @@ -64,6 +64,9 @@ #ifndef _SAL_TYPES_H_ #include #endif +#ifdef __MINGW32__ +#include +#endif #include #ifndef _RTL_USTRING_HXX_ #include --- oo_1.1.1_src/connectivity/source/inc/ado/Awrapado.hxx.orig 2003-05-22 19:51:14.000000000 +0900 +++ oo_1.1.1_src/connectivity/source/inc/ado/Awrapado.hxx 2004-03-29 12:17:36.000000000 +0900 @@ -66,7 +66,340 @@ #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 +#endif //#include //#include //#include --- oo_1.1.1_src/cosv/prj/d.lst.orig 2002-03-22 21:42:24.000000000 +0900 +++ oo_1.1.1_src/cosv/prj/d.lst 2004-03-29 12:17:38.000000000 +0900 @@ -2,7 +2,7 @@ mkdir: %_DEST%\inc%_EXT%\cosv\template ..\%__SRC%\lib\cosv.lib %_DEST%\lib%_EXT%\cosv.lib -..\%__SRC%\lib\libcosv.a %_DEST%\lib%_EXT%\libcosv.a +..\%__SRC%\lib\libcosv*.a %_DEST%\lib%_EXT%\*.a ..\inc\cosv\*.hxx %_DEST%\inc%_EXT%\cosv\*.hxx ..\inc\cosv\*.h %_DEST%\inc%_EXT%\cosv\*.h ..\inc\cosv\template\*.hxx %_DEST%\inc%_EXT%\cosv\template\*.hxx --- oo_1.1.1_src/cosv/source/comphelp/badcast.cxx.orig 2002-05-14 17:08:46.000000000 +0900 +++ oo_1.1.1_src/cosv/source/comphelp/badcast.cxx 2004-03-29 12:17:38.000000000 +0900 @@ -65,7 +65,7 @@ due to problems with WNT-STL-headers. */ -#ifdef WNT +#if defined(WNT) && !defined(__MINGW32__) #define _NTSDK #include --- oo_1.1.1_src/cppuhelper/source/mingw.map.orig 2003-03-20 02:23:34.000000000 +0900 +++ oo_1.1.1_src/cppuhelper/source/mingw.map 2004-03-29 12:17:38.000000000 +0900 @@ -118,7 +118,7 @@ _ZN4cppu22createComponentContextEPKNS_17ContextEntry_InitElRKN3com3sun4star3uno9ReferenceINS6_17XComponentContextEEE; _ZN4cppu22getImplHelperInitMutexEv; _ZN4cppu23WeakImplHelper_getTypesEPNS_10class_dataE; -_ZN4cppu23bootstrapInitialContextERKN3com3sun4star3uno9ReferenceINS2_4lang22XMultiComponentFactoryEEERKNS4_INS2_8registry15XSimpleRegistryEEESE_RKN3rtl8OUStringE; +_ZN4cppu23bootstrapInitialContextERKN3com3sun4star3uno9ReferenceINS2_4lang22XMultiComponentFactoryEEERKNS4_INS2_8registry15XSimpleRegistryEEESE_RKN3rtl8OUStringERKNSF_9BootstrapE; _ZN4cppu24OInterfaceIteratorHelper4nextEv; _ZN4cppu24OInterfaceIteratorHelper6removeEv; _ZN4cppu24OInterfaceIteratorHelperC1ERNS_25OInterfaceContainerHelperE; --- oo_1.1.1_src/crashrep/source/win32/soreport.cpp.orig 2004-01-10 01:26:26.000000000 +0900 +++ oo_1.1.1_src/crashrep/source/win32/soreport.cpp 2004-03-29 12:17:38.000000000 +0900 @@ -1775,7 +1775,41 @@ 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++ ) @@ -2477,7 +2511,11 @@ //*************************************************************************** +#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; --- oo_1.1.1_src/curl/unx1-curl-7.9.8.patch.orig 2003-03-20 02:37:52.000000000 +0900 +++ oo_1.1.1_src/curl/unx1-curl-7.9.8.patch 2004-03-29 12:17:38.000000000 +0900 @@ -36,27 +36,1013 @@ # This flag accepts an argument of the form current[:revision[:age]]. So, # passing -version-info 3:12:1 sets current to 3, revision to 12, and age to +--- misc/build/curl-7.9.8/lib/http.c.orig 2002-06-11 20:13:02.000000000 +0900 ++++ misc/build/curl-7.9.8/lib/http.c 2003-11-16 19:39:10.000000000 +0900 +@@ -36,7 +36,11 @@ + #include + + #if defined(WIN32) && !defined(__GNUC__) || defined(__MINGW32__) ++#ifdef HAVE_WINSOCK2_H ++#include ++#else + #include ++#endif + #include + #include + #else +--- misc/build/curl-7.9.8/lib/file.c.orig 2002-06-11 20:13:02.000000000 +0900 ++++ misc/build/curl-7.9.8/lib/file.c 2003-11-16 19:39:08.000000000 +0900 +@@ -36,7 +36,11 @@ + #include + + #if defined(WIN32) && !defined(__GNUC__) || defined(__MINGW32__) ++#ifdef HAVE_WINSOCK2_H ++#include ++#else + #include ++#endif + #include + #include + #include +--- misc/build/curl-7.9.8/lib/speedcheck.c.orig 2002-03-19 16:54:56.000000000 +0900 ++++ misc/build/curl-7.9.8/lib/speedcheck.c 2003-11-16 19:38:58.000000000 +0900 +@@ -26,8 +26,12 @@ + #include + #include + #if defined(__MINGW32__) ++#ifdef HAVE_WINSOCK2_H ++#include ++#else + #include + #endif ++#endif + + #include + #include "urldata.h" +--- misc/build/curl-7.9.8/lib/dict.c.orig 2002-03-19 16:54:56.000000000 +0900 ++++ misc/build/curl-7.9.8/lib/dict.c 2003-11-16 19:38:56.000000000 +0900 +@@ -35,7 +35,11 @@ + #include + + #if defined(WIN32) && !defined(__GNUC__) || defined(__MINGW32__) ++#ifdef HAVE_WINSOCK2_H ++#include ++#else + #include ++#endif + #include + #include + #else +--- misc/build/curl-7.9.8/lib/progress.c.orig 2002-06-03 21:46:04.000000000 +0900 ++++ misc/build/curl-7.9.8/lib/progress.c 2003-11-16 19:39:06.000000000 +0900 +@@ -27,8 +27,12 @@ + + #if defined(WIN32) && !defined(__GNUC__) || defined(__MINGW32__) + #if defined(__MINGW32__) ++#ifdef HAVE_WINSOCK2_H ++#include ++#else + #include + #endif ++#endif + #include + #endif + +--- misc/build/curl-7.9.8/lib/memdebug.c.orig 2002-05-22 19:04:18.000000000 +0900 ++++ misc/build/curl-7.9.8/lib/memdebug.c 2003-11-16 19:39:04.000000000 +0900 +@@ -27,7 +27,11 @@ + #include + + #if defined(WIN32) && !defined(__GNUC__) || defined(__MINGW32__) ++#ifdef HAVE_WINSOCK2_H ++#include ++#else + #include ++#endif + #else /* some kind of unix */ + #ifdef HAVE_SYS_SOCKET_H + #include +--- misc/build/curl-7.9.8/lib/timeval.h.orig 2002-03-19 16:54:56.000000000 +0900 ++++ misc/build/curl-7.9.8/lib/timeval.h 2003-11-16 19:41:06.000000000 +0900 +@@ -27,7 +27,11 @@ + + #if defined(WIN32) && !defined(__GNUC__) || defined(__MINGW32__) + #include ++#ifdef HAVE_WINSOCK2_H ++#include ++#else + #include ++#endif + #else + #include + #endif +--- misc/build/curl-7.9.8/lib/sendf.c.orig 2002-05-06 22:33:40.000000000 +0900 ++++ misc/build/curl-7.9.8/lib/sendf.c 2003-11-16 19:39:02.000000000 +0900 +@@ -40,8 +40,12 @@ + #include + #endif + #if defined(WIN32) && !defined(__GNUC__) || defined(__MINGW32__) ++#ifdef HAVE_WINSOCK2_H ++#include ++#else + #include + #endif ++#endif + + #include + #include "urldata.h" +--- misc/build/curl-7.9.8/lib/config.h.in.orig 2002-06-12 00:19:26.000000000 +0900 ++++ misc/build/curl-7.9.8/lib/config.h.in 2003-11-04 00:57:06.000000000 +0900 +@@ -423,3 +423,9 @@ + + /* Define to `int' if does not define. */ + #undef ssize_t ++ ++/* Define if you have the header file. */ ++#undef HAVE_WINSOCK2_H ++ ++/* Define if you have the header file. */ ++#undef HAVE_WS2TCPIP_H +--- misc/build/curl-7.9.8/lib/hostip.c.orig 2002-06-12 00:10:38.000000000 +0900 ++++ misc/build/curl-7.9.8/lib/hostip.c 2003-11-16 19:39:22.000000000 +0900 +@@ -29,7 +29,14 @@ + #define _REENTRANT + + #if defined(WIN32) && !defined(__GNUC__) || defined(__MINGW32__) ++#ifdef HAVE_WS2TCPIP_H ++#include ++#endif ++#ifdef HAVE_WINSOCK2_H ++#include ++#else + #include ++#endif + #else + #ifdef HAVE_SYS_TYPES_H + #include +--- misc/build/curl-7.9.8/lib/connect.c.orig 2002-06-12 18:48:26.000000000 +0900 ++++ misc/build/curl-7.9.8/lib/connect.c 2003-11-16 19:39:28.000000000 +0900 +@@ -63,13 +63,21 @@ + #define FALSE 0 + #endif + +-#ifdef WIN32 ++#if defined(WIN32) || defined(__MINGW32__) + #define HAVE_IOCTLSOCKET + #include ++#ifdef HAVE_WS2TCPIP_H ++#include ++#endif ++#ifdef HAVE_WINSOCK2_H ++#include ++#else + #include ++#endif + #define EINPROGRESS WSAEINPROGRESS + #define EWOULDBLOCK WSAEWOULDBLOCK + #define EISCONN WSAEISCONN ++#define ECONNREFUSED WSAECONNREFUSED + #endif + + #include "urldata.h" +@@ -84,7 +92,7 @@ + static + int geterrno(void) + { +-#ifdef WIN32 ++#if defined(WIN32) || defined(__MINGW32__) + return (int)GetLastError(); + #else + return errno; +--- misc/build/curl-7.9.8/src/main.c.orig 2002-06-12 00:10:40.000000000 +0900 ++++ misc/build/curl-7.9.8/src/main.c 2003-11-16 19:39:12.000000000 +0900 +@@ -46,8 +46,12 @@ + #define CURLseparator "--_curl_--" + + #if defined(WIN32)&&!defined(__CYGWIN32__) ++#ifdef HAVE_WINSOCK2_H ++#include ++#else + #include + #endif ++#endif + + #include "version.h" + +--- misc/build/curl-7.9.8/include/curl/multi.h.orig 2002-03-19 19:34:34.000000000 +0900 ++++ misc/build/curl-7.9.8/include/curl/multi.h 2003-11-16 19:41:08.000000000 +0900 +@@ -51,8 +51,12 @@ + #include + #endif + #if defined(WIN32) && !defined(__GNUC__) || defined(__MINGW32__) ++#ifdef HAVE_WINSOCK2_H ++#include ++#else + #include + #endif ++#endif + + #include + +--- misc/build/curl-7.9.8/configure.orig 2002-06-12 00:16:54.000000000 +0900 ++++ misc/build/curl-7.9.8/configure 2003-11-16 19:10:12.000000000 +0900 +@@ -8026,7 +8028,9 @@ + #include "confdefs.h" + /* is AF_INET6 available? */ + #include ++#if HAVE_SYS_SOCKET_H + #include ++#endif + main() + { + if (socket(AF_INET6, SOCK_STREAM, 0) < 0) +@@ -8079,14 +8083,40 @@ + #line 8079 "configure" + #include "confdefs.h" + ++#if HAVE_NETDB_H + #include ++#endif + #include ++#if HAVE_SYS_SOCKET_H + #include ++#endif ++#if HAVE_WINSOCK2_H ++#include ++#endif ++#if HAVE_WS2TCPIP_H ++#include ++#endif ++ ++#ifdef __WIN32__ ++void cleanup(void) {WSACleanup();} ++#endif + + void main(void) { + struct addrinfo hints, *ai; + int error; + ++#ifdef __WIN32__ ++ WORD wVersionRequested; ++ WSADATA wsaData; ++ int err; ++ wVersionRequested = MAKEWORD( 2, 0 ); ++ err = WSAStartup( wVersionRequested, &wsaData ); ++ if ( err != 0 ) { ++ exit(1); ++ } ++ atexit(cleanup); ++#endif ++ + memset(&hints, 0, sizeof(hints)); + hints.ai_family = AF_UNSPEC; + hints.ai_socktype = SOCK_STREAM; +@@ -8160,8 +8190,13 @@ + #endif + /* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +-char gethostbyname (); +-char (*f) (); ++#ifdef __MINGW32__ ++#define __STDCALL__ __attribute__((__stdcall__)) ++#else ++#define __STDCALL__ ++#endif ++__STDCALL__ char gethostbyname (const char *); ++__STDCALL__ char (*f) (const char *); + + int + main () +@@ -8222,11 +8257,16 @@ + #endif + /* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +-char gethostbyname (); ++#ifdef __MINGW32__ ++#define __STDCALL__ __attribute__((__stdcall__)) ++#else ++#define __STDCALL__ ++#endif ++__STDCALL__ char gethostbyname (const char *); + int + main () + { +-gethostbyname (); ++gethostbyname ("dummy"); + ; + return 0; + } +@@ -8283,8 +8323,13 @@ + #endif + /* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +-char gethostbyname (); +-char (*f) (); ++#ifdef __MINGW32__ ++#define __STDCALL__ __attribute__((__stdcall__)) ++#else ++#define __STDCALL__ ++#endif ++__STDCALL__ char gethostbyname (const char *); ++__STDCALL__ char (*f) (const char *); + + int + main () +@@ -8345,11 +8390,16 @@ + #endif + /* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +-char gethostbyname (); ++#ifdef __MINGW32__ ++#define __STDCALL__ __attribute__((__stdcall__)) ++#else ++#define __STDCALL__ ++#endif ++__STDCALL__ char gethostbyname (const char *); + int + main () + { +-gethostbyname (); ++gethostbyname ("dummy"); + ; + return 0; + } +@@ -8398,11 +8448,17 @@ + cat >conftest.$ac_ext <<_ACEOF + #line 8399 "configure" + #include "confdefs.h" ++#ifdef __MINGW32__ ++#define __STDCALL__ __attribute__((__stdcall__)) ++#else ++#define __STDCALL__ ++#endif ++__STDCALL__ char gethostbyname (const char *); + + int + main () + { +-gethostbyname(); ++gethostbyname("dummy"); + ; + return 0; + } +@@ -8635,8 +8691,13 @@ + #endif + /* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +-char connect (); +-char (*f) (); ++#ifdef __MINGW32__ ++#define __STDCALL__ __attribute__((__stdcall__)) ++#else ++#define __STDCALL__ ++#endif ++__STDCALL__ char connect (int, struct a *, int); ++__STDCALL__ char (*f) (int, struct a *, int); + + int + main () +@@ -8697,11 +8758,17 @@ + #endif + /* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +-char connect (); ++#ifdef __MINGW32__ ++#define __STDCALL__ __attribute__((__stdcall__)) ++#else ++#define __STDCALL__ ++#endif ++__STDCALL__ char connect (int, int *, int); + int + main () + { +-connect (); ++int n; ++connect (n, &n, n); + ; + return 0; + } +@@ -8757,8 +8824,13 @@ + #endif + /* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +-char gethostname (); +-char (*f) (); ++#ifdef __MINGW32__ ++#define __STDCALL__ __attribute__((__stdcall__)) ++#else ++#define __STDCALL__ ++#endif ++__STDCALL__ char gethostname (char *, int); ++__STDCALL__ char (*f) (char *, int); + + int + main () +@@ -8799,7 +8871,10 @@ + echo "$as_me:8799: result: $ac_cv_func_gethostname" >&5 + echo "${ECHO_T}$ac_cv_func_gethostname" >&6 + if test $ac_cv_func_gethostname = yes; then +- : ++ cat >>confdefs.h <&5 +@@ -8853,6 +8928,7 @@ + echo "${ECHO_T}$ac_cv_lib_ucb_gethostname" >&6 + if test $ac_cv_lib_ucb_gethostname = yes; then + cat >>confdefs.h < + #include ++#if HAVE_NETDB_H + #include ++#endif + #undef NULL + #define NULL (void *)0 + +@@ -10720,7 +10798,9 @@ + + #include + #include ++#if HAVE_NETDB_H + #include ++#endif + #undef NULL + #define NULL (void *)0 + +@@ -10773,7 +10853,9 @@ + #include "confdefs.h" + + #include ++#if HAVE_NETDB_H + #include ++#endif + #undef NULL + #define NULL (void *)0 + +@@ -10821,7 +10903,9 @@ + #include "confdefs.h" + + #include ++#if HAVE_NETDB_H + #include ++#endif + #undef NULL + #define NULL (void *)0 + +@@ -10956,7 +11040,9 @@ + #include "confdefs.h" + + #include ++#if HAVE_NETDB_H + #include ++#endif + int + main () + { +@@ -11006,7 +11092,9 @@ + + #define _REENTRANT + #include ++#if HAVE_NETDB_H + #include ++#endif + int + main () + { +@@ -11059,7 +11147,9 @@ + #include "confdefs.h" + + #include ++#if HAVE_NETDB_H + #include ++#endif + int + main () + { +@@ -11111,7 +11201,9 @@ + #include "confdefs.h" + + #include ++#if HAVE_NETDB_H + #include ++#endif + int + main () + { +@@ -11241,7 +11333,10 @@ + #line 11241 "configure" + #include "confdefs.h" + ++#if HAVE_ARPA_INET_H + #include ++#endif ++ + _ACEOF + if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + egrep "inet_ntoa_r" >/dev/null 2>&1; then +@@ -11263,7 +11358,9 @@ + #include "confdefs.h" + + #define _REENTRANT ++#if HAVE_ARPA_INET_H + #include ++#endif + _ACEOF + if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + egrep "inet_ntoa_r" >/dev/null 2>&1; then +@@ -11634,7 +11731,8 @@ + fcntl.h \ + dlfcn.h \ + alloca.h \ +- winsock.h \ ++ winsock2.h \ ++ ws2tcpip.h \ + time.h \ + io.h \ + pwd.h \ +@@ -12092,7 +12190,15 @@ + #line 12092 "configure" + #include "confdefs.h" + #include ++#if HAVE_SYS_SOCKET_H + #include ++#endif ++#if HAVE_WINSOCK2_H ++#include ++#endif ++#if HAVE_WS2TCPIP_H ++#include ++#endif + + int + main () +@@ -12147,7 +12253,12 @@ + #include "confdefs.h" + + #include ++#if HAVE_SYS_SOCKET_H + #include ++#endif ++#if HAVE_WINSOCK2_H ++#include ++#endif + + int getpeername (int, $arg2 *, $t *); + +@@ -12212,8 +12323,15 @@ + #line 12212 "configure" + #include "confdefs.h" + #include ++#if HAVE_SYS_SOCKET_H + #include ++#endif ++#if HAVE_WINSOCK2_H ++#include ++#endif ++#if HAVE_ARPA_INET_H + #include ++#endif + + int + main () +@@ -12267,8 +12385,15 @@ + #include "confdefs.h" + + #include ++#if HAVE_SYS_SOCKET_H + #include ++#endif ++#if HAVE_WINSOCK2_H ++#include ++#endif ++#if HAVE_ARPA_INET_H + #include ++#endif + + int + main () +@@ -12374,9 +12499,368 @@ + #define RETSIGTYPE $ac_cv_type_signal + EOF + +-for ac_func in socket \ +- select \ +- strdup \ ++echo "$as_me:8621: checking for socket" >&5 ++echo $ECHO_N "checking for socket... $ECHO_C" >&6 ++if test "${ac_cv_func_socket+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ cat >conftest.$ac_ext <<_ACEOF ++#line 8627 "configure" ++#include "confdefs.h" ++/* System header to define __stub macros and hopefully few prototypes, ++ which can conflict with char socket (); below. */ ++#include ++/* Override any gcc2 internal prototype to avoid an error. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++/* We use char because int might match the return type of a gcc2 ++ builtin and then its argument prototype would still apply. */ ++#ifdef __MINGW32__ ++#define __STDCALL__ __attribute__((__stdcall__)) ++#else ++#define __STDCALL__ ++#endif ++__STDCALL__ char socket (int, int, int); ++__STDCALL__ char (*f) (int, int, int); ++ ++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_socket) || defined (__stub___socket) ++choke me ++#else ++f = socket; ++#endif ++ ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (eval echo "$as_me:8658: \"$ac_link\"") >&5 ++ (eval $ac_link) 2>&5 ++ ac_status=$? ++ echo "$as_me:8661: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -s conftest$ac_exeext' ++ { (eval echo "$as_me:8664: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:8667: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_cv_func_socket=yes ++else ++ echo "$as_me: failed program was:" >&5 ++cat conftest.$ac_ext >&5 ++ac_cv_func_socket=no ++fi ++rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext ++fi ++echo "$as_me:8677: result: $ac_cv_func_socket" >&5 ++echo "${ECHO_T}$ac_cv_func_socket" >&6 ++if test "$ac_cv_func_socket" = yes; then ++ cat >>confdefs.h <&5 ++echo $ECHO_N "checking for select... $ECHO_C" >&6 ++if test "${ac_cv_func_select+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ cat >conftest.$ac_ext <<_ACEOF ++#line 8627 "configure" ++#include "confdefs.h" ++/* System header to define __stub macros and hopefully few prototypes, ++ which can conflict with char select (); below. */ ++#include ++/* Override any gcc2 internal prototype to avoid an error. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++/* We use char because int might match the return type of a gcc2 ++ builtin and then its argument prototype would still apply. */ ++#ifdef __MINGW32__ ++#define __STDCALL__ __attribute__((__stdcall__)) ++#else ++#define __STDCALL__ ++#endif ++__STDCALL__ char select (int, int *, int *, int *, int *); ++__STDCALL__ char (*f) (int, int *, int *, int *, int *); ++ ++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_select) || defined (__stub___select) ++choke me ++#else ++f = select; ++#endif ++ ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (eval echo "$as_me:8658: \"$ac_link\"") >&5 ++ (eval $ac_link) 2>&5 ++ ac_status=$? ++ echo "$as_me:8661: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -s conftest$ac_exeext' ++ { (eval echo "$as_me:8664: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:8667: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_cv_func_select=yes ++else ++ echo "$as_me: failed program was:" >&5 ++cat conftest.$ac_ext >&5 ++ac_cv_func_select=no ++fi ++rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext ++fi ++echo "$as_me:8677: result: $ac_cv_func_select" >&5 ++echo "${ECHO_T}$ac_cv_func_select" >&6 ++if test "$ac_cv_func_select" = yes; then ++ cat >>confdefs.h <&5 ++echo $ECHO_N "checking for gethostbyaddr... $ECHO_C" >&6 ++if test "${ac_cv_func_gethostbyaddr+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ cat >conftest.$ac_ext <<_ACEOF ++#line 8627 "configure" ++#include "confdefs.h" ++/* System header to define __stub macros and hopefully few prototypes, ++ which can conflict with char gethostbyaddr (); below. */ ++#include ++/* Override any gcc2 internal prototype to avoid an error. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++/* We use char because int might match the return type of a gcc2 ++ builtin and then its argument prototype would still apply. */ ++#ifdef __MINGW32__ ++#define __STDCALL__ __attribute__((__stdcall__)) ++#else ++#define __STDCALL__ ++#endif ++__STDCALL__ char gethostbyaddr (const char *, int, int); ++__STDCALL__ char (*f) (const char *, int, int); ++ ++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_gethostbyaddr) || defined (__stub___gethostbyaddr) ++choke me ++#else ++f = gethostbyaddr; ++#endif ++ ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (eval echo "$as_me:8658: \"$ac_link\"") >&5 ++ (eval $ac_link) 2>&5 ++ ac_status=$? ++ echo "$as_me:8661: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -s conftest$ac_exeext' ++ { (eval echo "$as_me:8664: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:8667: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_cv_func_gethostbyaddr=yes ++else ++ echo "$as_me: failed program was:" >&5 ++cat conftest.$ac_ext >&5 ++ac_cv_func_gethostbyaddr=no ++fi ++rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext ++fi ++echo "$as_me:8677: result: $ac_cv_func_gethostbyaddr" >&5 ++echo "${ECHO_T}$ac_cv_func_gethostbyaddr" >&6 ++if test "$ac_cv_func_gethostbyaddr" = yes; then ++ cat >>confdefs.h <&5 ++echo $ECHO_N "checking for inet_addr... $ECHO_C" >&6 ++if test "${ac_cv_func_inet_addr+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ cat >conftest.$ac_ext <<_ACEOF ++#line 8627 "configure" ++#include "confdefs.h" ++/* System header to define __stub macros and hopefully few prototypes, ++ which can conflict with char inet_addr (); below. */ ++#include ++/* Override any gcc2 internal prototype to avoid an error. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++/* We use char because int might match the return type of a gcc2 ++ builtin and then its argument prototype would still apply. */ ++#ifdef __MINGW32__ ++#define __STDCALL__ __attribute__((__stdcall__)) ++#else ++#define __STDCALL__ ++#endif ++__STDCALL__ char inet_addr (const char *); ++__STDCALL__ char (*f) (const char *); ++ ++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_inet_addr) || defined (__stub___inet_addr) ++choke me ++#else ++f = inet_addr; ++#endif ++ ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (eval echo "$as_me:8658: \"$ac_link\"") >&5 ++ (eval $ac_link) 2>&5 ++ ac_status=$? ++ echo "$as_me:8661: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -s conftest$ac_exeext' ++ { (eval echo "$as_me:8664: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:8667: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_cv_func_inet_addr=yes ++else ++ echo "$as_me: failed program was:" >&5 ++cat conftest.$ac_ext >&5 ++ac_cv_func_inet_addr=no ++fi ++rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext ++fi ++echo "$as_me:8677: result: $ac_cv_func_inet_addr" >&5 ++echo "${ECHO_T}$ac_cv_func_inet_addr" >&6 ++if test "$ac_cv_func_inet_addr" = yes; then ++ cat >>confdefs.h <&5 ++echo $ECHO_N "checking for closesocket... $ECHO_C" >&6 ++if test "${ac_cv_func_closesocket+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ cat >conftest.$ac_ext <<_ACEOF ++#line 8627 "configure" ++#include "confdefs.h" ++/* System header to define __stub macros and hopefully few prototypes, ++ which can conflict with char closesocket (); below. */ ++#include ++/* Override any gcc2 internal prototype to avoid an error. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++/* We use char because int might match the return type of a gcc2 ++ builtin and then its argument prototype would still apply. */ ++#ifdef __MINGW32__ ++#define __STDCALL__ __attribute__((__stdcall__)) ++#else ++#define __STDCALL__ ++#endif ++__STDCALL__ char closesocket (int); ++__STDCALL__ char (*f) (int); ++ ++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_closesocket) || defined (__stub___closesocket) ++choke me ++#else ++f = closesocket; ++#endif ++ ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (eval echo "$as_me:8658: \"$ac_link\"") >&5 ++ (eval $ac_link) 2>&5 ++ ac_status=$? ++ echo "$as_me:8661: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -s conftest$ac_exeext' ++ { (eval echo "$as_me:8664: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:8667: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_cv_func_closesocket=yes ++else ++ echo "$as_me: failed program was:" >&5 ++cat conftest.$ac_ext >&5 ++ac_cv_func_closesocket=no ++fi ++rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext ++fi ++echo "$as_me:8677: result: $ac_cv_func_closesocket" >&5 ++echo "${ECHO_T}$ac_cv_func_closesocket" >&6 ++if test "$ac_cv_func_closesocket" = yes; then ++ cat >>confdefs.h <progress.flags = data->progress.flags; - outcurl->progress.callback = data->progress.callback; -! - if(data->cookies) - /* If cookies are enabled in the parent handle, we enable them - in the clone as well! */ ---- 307,313 ---- + #if defined(WIN32) && !defined(__GNUC__) || defined(__MINGW32__) ++ #ifdef HAVE_WINSOCK2_H ++ #include ++ #else + #include ++ #endif + #include + #include + #else +*************** +*** 307,320 **** outcurl->progress.flags = data->progress.flags; outcurl->progress.callback = data->progress.callback; -! #ifndef CURL_DISABLE_HTTP +! if(data->cookies) /* If cookies are enabled in the parent handle, we enable them in the clone as well! */ -*************** -*** 314,320 **** outcurl->cookies = Curl_cookie_init(data->cookies->filename, outcurl->cookies, data->set.cookiesession); @@ -64,7 +1050,14 @@ /* duplicate all values in 'change' */ if(data->change.url) { outcurl->change.url = strdup(data->change.url); ---- 314,320 ---- +--- 311,324 ---- + + outcurl->progress.flags = data->progress.flags; + outcurl->progress.callback = data->progress.callback; +! #ifndef CURL_DISABLE_HTTP + if(data->cookies) + /* If cookies are enabled in the parent handle, we enable them + in the clone as well! */ outcurl->cookies = Curl_cookie_init(data->cookies->filename, outcurl->cookies, data->set.cookiesession); @@ -73,7 +1066,24 @@ if(data->change.url) { outcurl->change.url = strdup(data->change.url); *** misc/curl-7.9.8/lib/ftp.c Thu Jun 13 11:21:08 2002 ---- misc/build/curl-7.9.8/lib/ftp.c Fri Nov 8 10:46:02 2002 +--- misc/build/curl-7.9.8/lib/ftp.c Thu Mar 18 06:41:14 2004 +*************** +*** 40,46 **** +--- 40,53 ---- + #endif + + #if defined(WIN32) && !defined(__GNUC__) || defined(__MINGW32__) ++ #ifdef HAVE_WS2TCPIP_H ++ #include ++ #endif ++ #ifdef HAVE_WINSOCK2_H ++ #include ++ #else + #include ++ #endif + #else /* some kind of unix */ + #ifdef HAVE_SYS_SOCKET_H + #include *************** *** 441,447 **** /* no need to duplicate them, the data struct won't change */ @@ -83,7 +1093,7 @@ if (data->set.tunnel_thru_httpproxy) { /* We want "seamless" FTP operations through HTTP proxy tunnel */ result = Curl_ConnectHTTPProxyTunnel(conn, conn->firstsocket, ---- 441,447 ---- +--- 448,454 ---- /* no need to duplicate them, the data struct won't change */ ftp->user = data->state.user; ftp->passwd = data->state.passwd; @@ -100,7 +1110,7 @@ if(conn->protocol & PROT_FTPS) { /* FTPS is simply ftp with SSL for the control channel */ /* now, perform the SSL initialization for this socket */ ---- 449,455 ---- +--- 456,462 ---- if(CURLE_OK != result) return result; } @@ -117,7 +1127,7 @@ if (data->set.tunnel_thru_httpproxy) { /* We want "seamless" FTP operations through HTTP proxy tunnel */ result = Curl_ConnectHTTPProxyTunnel(conn, conn->secondarysocket, ---- 1491,1497 ---- +--- 1498,1504 ---- if(CURLE_OK != result) return result; @@ -134,7 +1144,7 @@ return CURLE_OK; } ---- 1499,1505 ---- +--- 1506,1512 ---- if(CURLE_OK != result) return result; } @@ -143,10 +1153,24 @@ } *** misc/curl-7.9.8/lib/transfer.c Thu Jun 13 10:12:22 2002 ---- misc/build/curl-7.9.8/lib/transfer.c Fri Nov 8 10:50:34 2002 +--- misc/build/curl-7.9.8/lib/transfer.c Thu Mar 18 06:41:14 2004 +*************** +*** 37,43 **** +--- 37,47 ---- + #include "strequal.h" + + #if defined(WIN32) && !defined(__GNUC__) || defined(__MINGW32__) ++ #ifdef HAVE_WINSOCK2_H ++ #include ++ #else + #include ++ #endif + #include + #include + #else *************** *** 568,577 **** ---- 568,579 ---- +--- 572,583 ---- * with the previously mentioned size. There can be any amount * of chunks, and a chunk-data set to zero signals the * end-of-chunks. */ @@ -161,7 +1185,7 @@ if (sscanf (k->p+14, " bytes %d-", &k->offset) || *************** *** 585,594 **** ---- 587,598 ---- +--- 591,602 ---- } } } @@ -185,7 +1209,7 @@ if(CHUNKE_OK < res) { if(CHUNKE_WRITE_ERROR == res) { failf(data, "Failed writing data"); ---- 739,750 ---- +--- 743,754 ---- * the name says read, this function both reads and writes away * the data. The returned 'nread' holds the number of actual * data it wrote to the client. */ @@ -199,7 +1223,24 @@ if(CHUNKE_WRITE_ERROR == res) { failf(data, "Failed writing data"); *** misc/curl-7.9.8/lib/url.c Tue Jun 11 17:47:01 2002 ---- misc/build/curl-7.9.8/lib/url.c Fri Nov 8 10:43:55 2002 +--- misc/build/curl-7.9.8/lib/url.c Thu Mar 18 06:41:14 2004 +*************** +*** 36,42 **** +--- 36,49 ---- + #include + + #if defined(WIN32) && !defined(__GNUC__) || defined(__MINGW32__) ++ #ifdef HAVE_WS2TCPIP_H ++ #include ++ #endif ++ #ifdef HAVE_WINSOCK2_H ++ #include ++ #else + #include ++ #endif + #include + #include + #else *************** *** 1598,1604 **** conn->ppath = conn->path; @@ -209,7 +1250,7 @@ /************************************************************* * Detect what (if any) proxy to use *************************************************************/ ---- 1598,1604 ---- +--- 1605,1611 ---- conn->ppath = conn->path; conn->hostname = conn->name; @@ -226,7 +1267,7 @@ /************************************************************* * No protocol part in URL was used, add it! *************************************************************/ ---- 1708,1714 ---- +--- 1715,1721 ---- if(no_proxy) free(no_proxy); } /* if not using proxy */ @@ -234,3 +1275,37 @@ /************************************************************* * No protocol part in URL was used, add it! *************************************************************/ +*************** +*** 2264,2270 **** + * Store the old value to be able to set it back later! + *************************************************************/ + +! #ifdef HAVE_SIGACTION + struct sigaction sigact; + sigaction(SIGALRM, NULL, &sigact); + keep_sigact = sigact; +--- 2271,2277 ---- + * Store the old value to be able to set it back later! + *************************************************************/ + +! #if defined(HAVE_SIGACTION) && defined(SIGALRM) + struct sigaction sigact; + sigaction(SIGALRM, NULL, &sigact); + keep_sigact = sigact; +*************** +*** 2278,2284 **** + sigaction(SIGALRM, &sigact, NULL); + #else + /* no sigaction(), revert to the much lamer signal() */ +! #ifdef HAVE_SIGNAL + keep_sigact = signal(SIGALRM, alarmfunc); + #endif + #endif +--- 2285,2291 ---- + sigaction(SIGALRM, &sigact, NULL); + #else + /* no sigaction(), revert to the much lamer signal() */ +! #if defined(HAVE_SIGNAL) && defined(SIGALRM) + keep_sigact = signal(SIGALRM, alarmfunc); + #endif + #endif --- oo_1.1.1_src/dbaccess/prj/d.lst.orig 2004-01-28 20:42:48.000000000 +0900 +++ oo_1.1.1_src/dbaccess/prj/d.lst 2004-03-29 12:17:38.000000000 +0900 @@ -1,5 +1,6 @@ ..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*.dll ..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT% +..\%__SRC%\lib\lib*.a %_DEST%\lib%_EXT% ..\%__SRC%\lib\lib*.dylib %_DEST%\lib%_EXT% ..\%__SRC%\lib\*.sl %_DEST%\lib%_EXT%\*.sl ..\%__SRC%\bin\*.bin %_DEST%\bin%_EXT%\*.bin --- oo_1.1.1_src/dbaccess/source/ui/browser/genericcontroller.cxx.orig 2003-04-16 01:03:18.000000000 +0900 +++ oo_1.1.1_src/dbaccess/source/ui/browser/genericcontroller.cxx 2004-03-29 12:17:38.000000000 +0900 @@ -469,9 +469,16 @@ } // ----------------------------------------------------------------------- -void OGenericUnoController::InvalidateFeature(const ::rtl::OUString& _rURLPath, const Reference< XStatusListener > & _xListener, sal_Bool _bForceBroadcast) +void OGenericUnoController::InvalidateFeature(const ::rtl::OUString& _rURLPath, const Reference< XStatusListener > * _pxListener, sal_Bool _bForceBroadcast) { - ImplInvalidateFeature( m_aSupportedFeatures[_rURLPath], _xListener, _bForceBroadcast ); + if (_pxListener == NULL) + { + ImplInvalidateFeature( m_aSupportedFeatures[_rURLPath], Reference< XStatusListener >(), _bForceBroadcast ); + } + else + { + ImplInvalidateFeature( m_aSupportedFeatures[_rURLPath], *_pxListener, _bForceBroadcast ); + } } // ----------------------------------------------------------------------------- @@ -546,9 +553,16 @@ } // ----------------------------------------------------------------------- -void OGenericUnoController::InvalidateFeature(sal_uInt16 _nId, const Reference< XStatusListener > & _xListener, sal_Bool _bForceBroadcast) +void OGenericUnoController::InvalidateFeature(sal_uInt16 _nId, const Reference< XStatusListener > * _pxListener, sal_Bool _bForceBroadcast) { - ImplInvalidateFeature( _nId, _xListener, _bForceBroadcast ); + if (_pxListener == NULL) + { + ImplInvalidateFeature( _nId, Reference< XStatusListener >(), _bForceBroadcast ); + } + else + { + ImplInvalidateFeature( _nId, *_pxListener, _bForceBroadcast ); + } } // ----------------------------------------------------------------------- --- oo_1.1.1_src/dbaccess/source/ui/browser/sbagrid.cxx.orig 2004-01-10 01:39:20.000000000 +0900 +++ oo_1.1.1_src/dbaccess/source/ui/browser/sbagrid.cxx 2004-03-29 12:17:38.000000000 +0900 @@ -634,7 +634,20 @@ } //--------------------------------------------------------------------------------------- -void SbaXGridPeer::NotifyStatusChanged(const ::com::sun::star::util::URL& _rUrl, const Reference< ::com::sun::star::frame::XStatusListener > & xControl) +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) @@ -833,7 +846,7 @@ m_aStatusListeners.addInterface(aURL,xControl); else pCont->addInterface(xControl); - NotifyStatusChanged(aURL, xControl); + NotifyStatusChanged(aURL, &xControl); } //--------------------------------------------------------------------------------------- --- oo_1.1.1_src/dbaccess/source/ui/browser/unodatbr.cxx.orig 2004-01-10 01:39:26.000000000 +0900 +++ oo_1.1.1_src/dbaccess/source/ui/browser/unodatbr.cxx 2004-03-29 12:17:38.000000000 +0900 @@ -1437,9 +1437,9 @@ SbaXDataBrowserController::ColumnChanged(); } // ----------------------------------------------------------------------- -void SbaTableQueryBrowser::InvalidateFeature(sal_uInt16 nId, const Reference< ::com::sun::star::frame::XStatusListener > & xListener) +void SbaTableQueryBrowser::InvalidateFeature(sal_uInt16 nId, const Reference< ::com::sun::star::frame::XStatusListener > * pxListener) { - SbaXDataBrowserController::InvalidateFeature(nId, xListener); + SbaXDataBrowserController::InvalidateFeature(nId, pxListener); } //------------------------------------------------------------------------------ --- oo_1.1.1_src/dbaccess/source/ui/inc/genericcontroller.hxx.orig 2003-03-20 02:52:40.000000000 +0900 +++ oo_1.1.1_src/dbaccess/source/ui/inc/genericcontroller.hxx 2004-03-29 12:17:38.000000000 +0900 @@ -334,12 +334,12 @@ 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 > & xListener = ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > (), sal_Bool _bForceBroadcast = sal_False); + 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 > & xListener = ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > (), sal_Bool _bForceBroadcast = sal_False); + 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 */ --- oo_1.1.1_src/dbaccess/source/ui/inc/sbagrid.hxx.orig 2003-03-20 02:52:42.000000000 +0900 +++ oo_1.1.1_src/dbaccess/source/ui/inc/sbagrid.hxx 2004-03-29 12:17:38.000000000 +0900 @@ -199,7 +199,8 @@ protected: virtual FmGridControl* imp_CreateControl(Window* pParent, WinBits nStyle); - 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 > ()); + void NotifyStatusChanged(const ::com::sun::star::util::URL& aUrl, + const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > * pxControl = NULL); private: // for asny execution of XDispatch::dispatch @@ -210,6 +211,8 @@ }; ::std::queue< DispatchArgs > m_aDispatchArgs; DECL_LINK( OnDispatchEvent, void* ); + void NotifyStatusChangedImpl(const ::com::sun::star::util::URL& aUrl, + const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > & xControl); // for dynamic states of our 4 dispatchable URLs enum DispatchType --- oo_1.1.1_src/dbaccess/source/ui/inc/unodatbr.hxx.orig 2003-04-29 00:48:54.000000000 +0900 +++ oo_1.1.1_src/dbaccess/source/ui/inc/unodatbr.hxx 2004-03-29 12:17:38.000000000 +0900 @@ -256,7 +256,7 @@ virtual ToolBox* CreateToolBox(Window* pParent); - 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 > ()); + virtual void InvalidateFeature(sal_uInt16 nId, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > * pxListener = NULL); virtual void addModelListeners(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > & _xGridControlModel); virtual void removeModelListeners(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > & _xGridControlModel); --- oo_1.1.1_src/desktop/prj/d.lst.orig 2004-01-28 22:06:18.000000000 +0900 +++ oo_1.1.1_src/desktop/prj/d.lst 2004-03-29 12:17:38.000000000 +0900 @@ -22,13 +22,17 @@ ..\%__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 @@ -38,6 +42,7 @@ ..\%__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 --- oo_1.1.1_src/dmake/configure.orig 2004-02-13 23:07:34.000000000 +0900 +++ oo_1.1.1_src/dmake/configure 2004-03-29 12:17:38.000000000 +0900 @@ -6124,7 +6124,7 @@ if test `echo $_os | $AWK -F_ '{ print $1 }'` = "CYGWIN"; then if test "$GCC" = "yes"; then - if test `$CC -dumpmachine | $AWK -F- '{ print $3 }'` = "mingw32"; then + if test `$CC -dumpmachine | $AWK -F- '{ print $1 }'` = "mingw32"; then _os="MINGW" else _os="CYGWIN" --- oo_1.1.1_src/dmake/win95/microsft/Makefile.in.orig 2004-02-13 23:11:54.000000000 +0900 +++ oo_1.1.1_src/dmake/win95/microsft/Makefile.in 2004-03-29 12:17:38.000000000 +0900 @@ -118,7 +118,7 @@ libmsft_a_SOURCES = ruletab.c -INCLUDES = -I$(top_srcdir) -I$(top_builddir) -I.. +INCLUDES = -I$(top_srcdir) -I$(top_builddir) -I$(top_srcdir)/@OS_TYPE@/@OS_VERSION@ -I.. subdir = win95/microsft ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --- oo_1.1.1_src/dtrans/prj/d.lst.orig 2004-01-28 20:57:20.000000000 +0900 +++ oo_1.1.1_src/dtrans/prj/d.lst 2004-03-29 12:17:38.000000000 +0900 @@ -1,4 +1,5 @@ ..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT% +..\%__SRC%\lib\lib*.a %_DEST%\lib%_EXT% ..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*.dll ..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib --- oo_1.1.1_src/dtrans/source/inc/MtaOleClipb.hxx.orig 2001-08-24 16:09:46.000000000 +0900 +++ oo_1.1.1_src/dtrans/source/inc/MtaOleClipb.hxx 2004-03-29 12:17:38.000000000 +0900 @@ -70,6 +70,9 @@ #include #endif +#ifdef __MINGW32__ +#include +#endif #include //-------------------------------------------------------- --- oo_1.1.1_src/dtrans/source/win32/dnd/sourcecontext.cxx.orig 2003-04-16 02:10:36.000000000 +0900 +++ oo_1.1.1_src/dtrans/source/win32/dnd/sourcecontext.cxx 2004-03-29 12:17:38.000000000 +0900 @@ -111,12 +111,12 @@ } void SAL_CALL SourceContext::setCursor( sal_Int32 cursorId ) - throw( IllegalArgumentException, RuntimeException) + throw( RuntimeException) { } void SAL_CALL SourceContext::setImage( sal_Int32 imageId ) - throw( IllegalArgumentException, RuntimeException) + throw( RuntimeException) { } --- oo_1.1.1_src/dtrans/source/win32/dnd/sourcecontext.hxx.orig 2001-02-09 02:12:56.000000000 +0900 +++ oo_1.1.1_src/dtrans/source/win32/dnd/sourcecontext.hxx 2004-03-29 12:17:38.000000000 +0900 @@ -110,9 +110,9 @@ virtual sal_Int32 SAL_CALL getCurrentCursor( ) throw( RuntimeException); virtual void SAL_CALL setCursor( sal_Int32 cursorId ) - throw( IllegalArgumentException, RuntimeException); + throw( RuntimeException); virtual void SAL_CALL setImage( sal_Int32 imageId ) - throw( IllegalArgumentException, RuntimeException); + throw( RuntimeException); virtual void SAL_CALL transferablesFlavorsChanged( ) throw( RuntimeException); --- oo_1.1.1_src/dtrans/source/win32/dnd/target.hxx.orig 2003-04-16 02:10:58.000000000 +0900 +++ oo_1.1.1_src/dtrans/source/win32/dnd/target.hxx 2004-03-29 12:17:38.000000000 +0900 @@ -84,6 +84,7 @@ #include #endif +#include #include #include "globals.hxx" #include "../../inc/DtObjFactory.hxx" --- oo_1.1.1_src/dtrans/source/win32/dtobj/DOTransferable.cxx.orig 2003-04-24 23:55:08.000000000 +0900 +++ oo_1.1.1_src/dtrans/source/win32/dtobj/DOTransferable.cxx 2004-03-29 12:17:38.000000000 +0900 @@ -108,7 +108,7 @@ #endif -#if(_MSC_VER < 1300) +#if(_MSC_VER < 1300) && !defined(__MINGW32__) #include #endif @@ -129,7 +129,7 @@ using namespace com::sun::star::io; using namespace com::sun::star::lang; using namespace com::sun::star::container; -using CStgTransferHelper::CStgTransferException; +//using CStgTransferHelper::CStgTransferException; //------------------------------------------------------------------------ // @@ -421,7 +421,7 @@ ReleaseStgMedium( &stgmedium ); } - catch( CStgTransferException& ) + catch( CStgTransferHelper::CStgTransferException& ) { ReleaseStgMedium( &stgmedium ); throw IOException( ); --- oo_1.1.1_src/dtrans/source/win32/dtobj/DataFmtTransl.cxx.orig 2002-08-14 23:46:46.000000000 +0900 +++ oo_1.1.1_src/dtrans/source/win32/dtobj/DataFmtTransl.cxx 2004-03-29 12:17:38.000000000 +0900 @@ -105,7 +105,7 @@ #include -#if (_MSC_VER < 1300) +#if (_MSC_VER < 1300) && !defined(__MINGW32__) #include #endif --- oo_1.1.1_src/dtrans/source/win32/dtobj/XNotifyingDataObject.hxx.orig 2001-03-17 01:31:48.000000000 +0900 +++ oo_1.1.1_src/dtrans/source/win32/dtobj/XNotifyingDataObject.hxx 2004-03-29 12:17:38.000000000 +0900 @@ -76,9 +76,9 @@ #include #endif -#include #include #include +#include /*-------------------------------------------------------------------------- To implement the lostOwnership mechanism cleanly we need this wrapper --- oo_1.1.1_src/dtrans/source/win32/dtobj/XTDataObject.cxx.orig 2003-04-16 02:11:18.000000000 +0900 +++ oo_1.1.1_src/dtrans/source/win32/dtobj/XTDataObject.cxx 2004-03-29 12:17:38.000000000 +0900 @@ -95,8 +95,12 @@ #include "FmtFilter.hxx" #endif +#ifdef __MINGW32__ +#include +#else #include #include +#endif //------------------------------------------------------------------------ // namespace directives @@ -107,7 +111,7 @@ using namespace com::sun::star::uno; using namespace com::sun::star::lang; using namespace rtl; -using CStgTransferHelper::CStgTransferException; +//using CStgTransferHelper::CStgTransferException; //------------------------------------------------------------------------ // a helper class that will be thrown by the function validateFormatEtc @@ -218,7 +222,7 @@ { return ex.m_hr; } - catch( CStgTransferException& ex ) + catch( CStgTransferHelper::CStgTransferException& ex ) { return translateStgExceptionCode( ex.m_hr ); } @@ -405,7 +409,7 @@ { OSL_ENSURE( sal_False, "Unexpected exception" ); } - catch( CStgTransferException& ex ) + catch( CStgTransferHelper::CStgTransferException& ex ) { return translateStgExceptionCode( ex.m_hr ); } @@ -479,7 +483,11 @@ WideCharToMultiByteEx( GetACP( ), +#ifdef __MINGW32__ + reinterpret_cast< const wchar_t * >( const_cast< const sal_Unicode * >( aUnicodeText.getStr( ) ) ), +#else static_cast< const sal_Unicode* >( aUnicodeText.getStr( ) ), +#endif aUnicodeText.getLength( ), stgTransfHelper ); --- oo_1.1.1_src/dtrans/source/win32/misc/ImplHelper.cxx.orig 2002-08-14 23:48:26.000000000 +0900 +++ oo_1.1.1_src/dtrans/source/win32/misc/ImplHelper.cxx 2004-03-29 12:17:38.000000000 +0900 @@ -144,17 +144,29 @@ OUString winCP; // set an default value +#ifdef __MINGW32__ + wchar_t wcstr[10]; +#else sal_Unicode wcstr[10]; +#endif if ( LOCALE_IDEFAULTCODEPAGE == lctype ) { _itow( GetOEMCP( ), wcstr, 10 ); +#ifdef __MINGW32__ + winCP = OUString( reinterpret_cast< sal_Unicode * >( wcstr ), wcslen( wcstr ) ); +#else winCP = OUString( wcstr, wcslen( wcstr ) ); +#endif } else if ( LOCALE_IDEFAULTANSICODEPAGE == lctype ) { _itow( GetACP( ), wcstr, 10 ); +#ifdef __MINGW32__ + winCP = OUString( reinterpret_cast< sal_Unicode * >( wcstr ), wcslen( wcstr ) ); +#else winCP = OUString( wcstr, wcslen( wcstr ) ); +#endif } else OSL_ASSERT( sal_False ); @@ -179,8 +191,11 @@ if ( NULL != lpwchBuff.get( ) ) { len = MultiByteToWideChar( +#ifdef __MINGW32__ + CP_ACP, 0, buff, -1, reinterpret_cast< wchar_t * >( lpwchBuff.get( ) ), len ); +#else CP_ACP, 0, buff, -1, lpwchBuff.get( ), len ); - +#endif winCP = OUString( lpwchBuff.get( ), (len - 1) ); } } @@ -239,9 +254,15 @@ { OSL_ASSERT( IsValidCodePage( codepage ) ); +#ifdef __MINGW32__ + wchar_t cpStr[6]; + _itow( codepage, cpStr, 10 ); + return OUString( reinterpret_cast< sal_Unicode * >( cpStr ), wcslen( cpStr ) ); +#else sal_Unicode cpStr[6]; _itow( codepage, cpStr, 10 ); return OUString( cpStr, wcslen( cpStr ) ); +#endif } //------------------------------------------------------------------------- @@ -257,11 +278,19 @@ void SAL_CALL DeleteTargetDevice( DVTARGETDEVICE* ptd ) { +#ifdef __MINGW32__ + try +#else __try +#endif { CoTaskMemFree( ptd ); } +#ifdef __MINGW32__ + catch(...) +#else __except( EXCEPTION_EXECUTE_HANDLER ) +#endif { OSL_ENSURE( sal_False, "Error DeleteTargetDevice" ); } @@ -291,7 +320,11 @@ { DVTARGETDEVICE* ptdDest = NULL; +#ifdef __MINGW32__ + try +#else __try +#endif { if ( NULL != ptdSrc ) { @@ -299,7 +332,11 @@ rtl_copyMemory( ptdDest, ptdSrc, static_cast< size_t >( ptdSrc->tdSize ) ); } } +#ifdef __MINGW32__ + catch(...) +#else __except( EXCEPTION_EXECUTE_HANDLER ) +#endif { } @@ -337,10 +374,14 @@ { sal_Bool bRet = sal_False; +#ifdef __MINGW32__ + try +#else __try +#endif { - if ( petcDest == petcSrc ) - __leave; + if ( petcDest != petcSrc ) + { petcDest->cfFormat = petcSrc->cfFormat; @@ -353,8 +394,13 @@ petcDest->tymed = petcSrc->tymed; bRet = sal_True; + } } +#ifdef __MINGW32__ + catch(...) +#else __except( EXCEPTION_EXECUTE_HANDLER ) +#endif { OSL_ENSURE( sal_False, "Error CopyFormatEtc" ); } @@ -374,32 +420,35 @@ { sal_Int32 nMatch = FORMATETC_EXACT_MATCH; +#ifdef __MINGW32__ + try +#else __try +#endif { - if ( pFetcLhs == pFetcRhs ) - __leave; + if ( pFetcLhs != pFetcRhs ) if ( ( pFetcLhs->cfFormat != pFetcRhs->cfFormat ) || ( pFetcLhs->lindex != pFetcRhs->lindex ) || !CompareTargetDevice( pFetcLhs->ptd, pFetcRhs->ptd ) ) { nMatch = FORMATETC_NO_MATCH; - __leave; } - if ( pFetcLhs->dwAspect == pFetcRhs->dwAspect ) + else if ( pFetcLhs->dwAspect == pFetcRhs->dwAspect ) // same aspects; equal ; else if ( ( pFetcLhs->dwAspect & ~pFetcRhs->dwAspect ) != 0 ) { // left not subset of aspects of right; not equal nMatch = FORMATETC_NO_MATCH; - __leave; } else // left subset of right nMatch = FORMATETC_PARTIAL_MATCH; + if ( nMatch == FORMATETC_EXACT_MATCH || nMatch == FORMATETC_PARTIAL_MATCH ) + { if ( pFetcLhs->tymed == pFetcRhs->tymed ) // same medium flags; equal ; @@ -407,13 +456,17 @@ { // left not subset of medium flags of right; not equal nMatch = FORMATETC_NO_MATCH; - __leave; } else // left subset of right nMatch = FORMATETC_PARTIAL_MATCH; + } } +#ifdef __MINGW32__ + catch(...) +#else __except( EXCEPTION_EXECUTE_HANDLER ) +#endif { OSL_ENSURE( sal_False, "Error CompareFormatEtc" ); nMatch = FORMATETC_NO_MATCH; @@ -431,26 +484,31 @@ { sal_Bool bRet = sal_False; +#ifdef __MINGW32__ + try +#else __try +#endif { if ( ptdLeft == ptdRight ) { // same address of td; must be same (handles NULL case) bRet = sal_True; - __leave; } // one ot the two is NULL - if ( ( NULL == ptdRight ) || ( NULL == ptdLeft ) ) - __leave; + else if ( ( NULL != ptdRight ) && ( NULL != ptdLeft ) ) - if ( ptdLeft->tdSize != ptdRight->tdSize ) - __leave; + if ( ptdLeft->tdSize == ptdRight->tdSize ) if ( rtl_compareMemory( ptdLeft, ptdRight, ptdLeft->tdSize ) == 0 ) bRet = sal_True; } +#ifdef __MINGW32__ + catch(...) +#else __except( EXCEPTION_EXECUTE_HANDLER ) +#endif { OSL_ENSURE( sal_False, "Error CompareTargetDevice" ); bRet = sal_False; --- oo_1.1.1_src/dtrans/source/win32/mtaole/MtaOleClipb.cxx.orig 2003-05-22 19:23:18.000000000 +0900 +++ oo_1.1.1_src/dtrans/source/win32/mtaole/MtaOleClipb.cxx 2004-03-29 12:17:38.000000000 +0900 @@ -699,7 +699,11 @@ { LRESULT lResult = 0; +#ifdef __MINGW32__ + try +#else __try +#endif { // get a connection to the class-instance via the static member CMtaOleClipboard* pImpl = CMtaOleClipboard::s_theMtaOleClipboardInst; @@ -777,7 +781,11 @@ break; } } +#ifdef __MINGW32__ + catch(...) +#else __except( EXCEPTION_EXECUTE_HANDLER ) +#endif { OSL_ENSURE( sal_False, "Kernel exception in window-proc caught!" ); } --- oo_1.1.1_src/embedserv/source/embed/docholder.cxx.orig 2003-06-16 20:36:08.000000000 +0900 +++ oo_1.1.1_src/embedserv/source/embed/docholder.cxx 2004-03-29 12:17:38.000000000 +0900 @@ -130,9 +130,9 @@ // add mutex locking ??? DocumentHolder::DocumentHolder( const uno::Reference< lang::XMultiServiceFactory >& xFactory,EmbedDocument_Impl *pOLEInterface) - : m_xFactory( xFactory ), - m_pOLEInterface(pOLEInterface), - m_pInterceptor(0) + : 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 ); @@ -599,6 +599,7 @@ } void SAL_CALL DocumentHolder::disposing( const com::sun::star::lang::EventObject& aSource ) + throw( uno::RuntimeException ) { if ( m_xDocument.is() && m_xDocument == aSource.Source ) { @@ -620,6 +621,7 @@ } void SAL_CALL DocumentHolder::notifyClosing( const lang::EventObject& aSource ) + throw( uno::RuntimeException ) { uno::Reference< util::XCloseBroadcaster > xEventBroadcaster( aSource.Source, uno::UNO_QUERY ); @@ -644,6 +646,7 @@ } void SAL_CALL DocumentHolder::notifyTermination( const lang::EventObject& aSource ) + throw( uno::RuntimeException ) { OSL_ENSURE( !m_xDocument.is(), "Just a disaster..." ); --- oo_1.1.1_src/embedserv/source/embed/ed_ipersiststr.cxx.orig 2003-04-24 22:54:32.000000000 +0900 +++ oo_1.1.1_src/embedserv/source/embed/ed_ipersiststr.cxx 2004-03-29 12:17:38.000000000 +0900 @@ -282,8 +282,12 @@ { util::URL aURL; +#ifdef __MINGW32__ + aURL.Complete = ::rtl::OUString( reinterpret_cast( pFilePath ) ); +#else USES_CONVERSION; aURL.Complete = ::rtl::OUString( OLE2CW( pFilePath ) ); +#endif if ( aTransformer->parseSmart( aURL, ::rtl::OUString() ) ) sDocUrl = aURL.Complete; @@ -457,11 +461,19 @@ CLIPFORMAT cf = RegisterClipboardFormatA( "Embedded Object" ); hr = WriteFmtUserTypeStg( pStg, cf, // ??? +#ifdef __MINGW32__ + reinterpret_cast< WCHAR * >( const_cast< sal_Unicode * >( aCurType.getStr() ) ) ); +#else ( sal_Unicode* )aCurType.getStr() ); +#endif if ( hr == S_OK ) { +#ifdef __MINGW32__ + hr = pStg->CreateStream( reinterpret_cast< const WCHAR * >( static_cast< const sal_Unicode * >( aOfficeEmbedStreamName ) ), +#else hr = pStg->CreateStream( aOfficeEmbedStreamName, +#endif STGM_CREATE | ( nStreamMode & 0x73 ), 0, 0, @@ -469,7 +481,11 @@ if ( hr == S_OK && m_pOwnStream ) { +#ifdef __MINGW32__ + hr = pStg->CreateStream( reinterpret_cast< const WCHAR * >( static_cast< const sal_Unicode * >( aExtentStreamName ) ), +#else hr = pStg->CreateStream( aExtentStreamName, +#endif STGM_CREATE | ( nStreamMode & 0x73 ), 0, 0, @@ -515,7 +531,11 @@ if ( FAILED( hr ) ) return E_FAIL; DWORD nStreamMode = aStat.grfMode; +#ifdef __MINGW32__ + hr = pStg->OpenStream( reinterpret_cast< const WCHAR * >( static_cast< const sal_Unicode * >( aOfficeEmbedStreamName ) ), +#else hr = pStg->OpenStream( aOfficeEmbedStreamName, +#endif 0, nStreamMode & 0x73, 0, @@ -524,7 +544,11 @@ if ( SUCCEEDED( hr ) ) { +#ifdef __MINGW32__ + hr = pStg->OpenStream( reinterpret_cast< const WCHAR * >( static_cast< const sal_Unicode * >( aExtentStreamName ) ), +#else hr = pStg->OpenStream( aExtentStreamName, +#endif 0, nStreamMode & 0x73, 0, @@ -593,8 +617,13 @@ { m_pOwnStream = CComPtr< IStream >(); m_pExtStream = CComPtr< IStream >(); +#ifdef __MINGW32__ + hr = pStg->DestroyElement( reinterpret_cast< const wchar_t * >( static_cast< const sal_Unicode * >( aOfficeEmbedStreamName ) ) ); + hr = pStg->DestroyElement( reinterpret_cast< const wchar_t * >( static_cast< const sal_Unicode * >( aExtentStreamName ) ) ); +#else hr = pStg->DestroyElement( aOfficeEmbedStreamName ); hr = pStg->DestroyElement( aExtentStreamName ); +#endif OSL_ENSURE( SUCCEEDED( hr ), "Can not destroy created stream!\n" ); if ( FAILED( hr ) ) @@ -623,14 +652,22 @@ if ( FAILED( hr ) ) return E_FAIL; DWORD nStreamMode = aStat.grfMode; +#ifdef __MINGW32__ + hr = pStgSave->CreateStream( reinterpret_cast< const WCHAR * >( static_cast< const sal_Unicode * >( aOfficeEmbedStreamName ) ), +#else hr = pStgSave->CreateStream( aOfficeEmbedStreamName, +#endif STGM_CREATE | ( nStreamMode & 0x73 ), 0, 0, &pTargetStream ); if ( FAILED( hr ) || !pTargetStream ) return E_FAIL; +#ifdef __MINGW32__ + hr = pStgSave->CreateStream( reinterpret_cast< const WCHAR * >( static_cast< const sal_Unicode * >( aExtentStreamName ) ), +#else hr = pStgSave->CreateStream( aExtentStreamName, +#endif STGM_CREATE | ( nStreamMode & 0x73 ), 0, 0, @@ -721,14 +758,22 @@ if ( FAILED( hr ) ) return E_OUTOFMEMORY; DWORD nStreamMode = aStat.grfMode; +#ifdef __MINGW32__ + hr = m_pMasterStorage->OpenStream( reinterpret_cast< const WCHAR * >( static_cast< const sal_Unicode * >( aOfficeEmbedStreamName ) ), +#else hr = m_pMasterStorage->OpenStream( aOfficeEmbedStreamName, +#endif 0, nStreamMode & 0x73, 0, &m_pOwnStream ); if ( FAILED( hr ) || !m_pOwnStream ) return E_OUTOFMEMORY; +#ifdef __MINGW32__ + hr = m_pMasterStorage->OpenStream( reinterpret_cast< const WCHAR * >( static_cast< const sal_Unicode * >( aExtentStreamName ) ), +#else hr = m_pMasterStorage->OpenStream( aExtentStreamName, +#endif 0, nStreamMode & 0x73, 0, @@ -777,20 +822,32 @@ CLIPFORMAT cf = RegisterClipboardFormatA( "Embedded Object" ); hr = WriteFmtUserTypeStg( m_pMasterStorage, cf, // ??? +#ifdef __MINGW32__ + reinterpret_cast< WCHAR * >( const_cast< sal_Unicode * >( aCurType.getStr() ) ) ); +#else ( sal_Unicode* )aCurType.getStr() ); +#endif if ( FAILED( hr ) ) return E_FAIL; hr = m_pMasterStorage->SetClass( m_guid ); if ( FAILED( hr ) ) return E_FAIL; +#ifdef __MINGW32__ + hr = m_pMasterStorage->CreateStream( reinterpret_cast< const WCHAR * >( static_cast< const sal_Unicode * >( aOfficeEmbedStreamName ) ), +#else hr = m_pMasterStorage->CreateStream( aOfficeEmbedStreamName, +#endif STGM_CREATE | ( nStreamMode & 0x73 ), 0, 0, &m_pOwnStream ); if ( FAILED( hr ) || !m_pOwnStream ) return E_FAIL; +#ifdef __MINGW32__ + hr = m_pMasterStorage->CreateStream( reinterpret_cast< const WCHAR * >( static_cast< const sal_Unicode * >( aExtentStreamName ) ), +#else hr = m_pMasterStorage->CreateStream( aExtentStreamName, +#endif STGM_CREATE | ( nStreamMode & 0x73 ), 0, 0, @@ -815,8 +872,12 @@ pszFileName ) ); hr = S_OK; +#ifdef __MINGW32__ + m_aFileName = ::rtl::OUString( reinterpret_cast< const sal_Unicode * >( pszFileName ) ); +#else USES_CONVERSION; m_aFileName = ::rtl::OUString( OLE2CW( pszFileName ) ); +#endif } catch( uno::Exception& ) { @@ -829,7 +890,11 @@ CLIPFORMAT cf = RegisterClipboardFormatA( "Embedded Object" ); hr = WriteFmtUserTypeStg( m_pMasterStorage, cf, // ??? +#ifdef __MINGW32__ + reinterpret_cast< WCHAR * >( const_cast< sal_Unicode * >( aCurType.getStr() ) ) ); +#else ( sal_Unicode* )aCurType.getStr() ); +#endif if ( SUCCEEDED( hr ) ) { @@ -879,8 +944,12 @@ if ( !m_pDocHolder->GetDocument().is() || !m_xFactory.is() ) return E_FAIL; +#ifdef __MINGW32__ + ::rtl::OUString aTargetName = pszFileName ? ::rtl::OUString( reinterpret_cast< const sal_Unicode * >( pszFileName ) ) : m_aFileName; +#else USES_CONVERSION; ::rtl::OUString aTargetName = pszFileName ? ::rtl::OUString( OLE2CW( pszFileName ) ) : m_aFileName; +#endif if ( !aTargetName.getLength() ) return E_FAIL; @@ -906,7 +975,11 @@ STDMETHODIMP EmbedDocument_Impl::SaveCompleted( LPCOLESTR pszFileName ) { +#ifdef __MINGW32__ + m_aFileName = ::rtl::OUString( reinterpret_cast< const sal_Unicode * >( pszFileName ) ); +#else m_aFileName = ::rtl::OUString( OLE2CW( pszFileName ) ); +#endif return S_OK; } @@ -918,7 +991,11 @@ if ( FAILED( hr ) || !pMalloc ) return E_FAIL; *ppszFileName = (LPOLESTR)( pMalloc->Alloc( sizeof( sal_Unicode ) * ( m_aFileName.getLength() + 1 ) ) ); +#ifdef __MINGW32__ + wcsncpy( *ppszFileName, reinterpret_cast< const WCHAR * >( m_aFileName.getStr() ), m_aFileName.getLength() + 1 ); +#else wcsncpy( *ppszFileName, m_aFileName.getStr(), m_aFileName.getLength() + 1 ); +#endif return m_aFileName.getLength() ? S_OK : S_FALSE; } --- oo_1.1.1_src/embedserv/source/embed/esdll.cxx.orig 2003-04-10 23:55:58.000000000 +0900 +++ oo_1.1.1_src/embedserv/source/embed/esdll.cxx 2004-03-29 12:17:38.000000000 +0900 @@ -66,12 +66,16 @@ #undef _DEBUG #endif +#ifdef __MINGW32__ +#include +#else #include CComModule _Module; #include BEGIN_OBJECT_MAP(ObjectMap) END_OBJECT_MAP() +#endif ///////////////////////////////////////////////////////////////////////////// // DLL Entry Point @@ -81,12 +85,16 @@ { 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 } --- oo_1.1.1_src/embedserv/source/embed/intercept.cxx.orig 2003-04-04 21:12:36.000000000 +0900 +++ oo_1.1.1_src/embedserv/source/embed/intercept.cxx 2004-03-29 12:17:38.000000000 +0900 @@ -77,7 +77,7 @@ -uno::Sequence<::rtl::OUString> Interceptor::m_aInterceptedURL(IUL); +uno::Sequence< ::rtl::OUString > Interceptor::m_aInterceptedURL(IUL); @@ -144,6 +144,7 @@ void SAL_CALL Interceptor::dispose() + throw(::com::sun::star::uno::RuntimeException) { lang::EventObject aEvt; aEvt.Source = static_cast< frame::XDispatch* >( this ); @@ -167,8 +168,8 @@ DocumentHolder* pDocH) : m_pOLEInterface(pOLEInterface), m_pDocH(pDocH), - m_pStatCL(0), - m_pDisposeEventListeners(0) + m_pDisposeEventListeners(0), + m_pStatCL(0) { m_aInterceptedURL[0] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(".uno:Save")); --- oo_1.1.1_src/embedserv/source/embed/register.cxx.orig 2003-04-24 22:54:42.000000000 +0900 +++ oo_1.1.1_src/embedserv/source/embed/register.cxx 2004-03-29 12:17:38.000000000 +0900 @@ -61,6 +61,9 @@ //#include //#include +#ifdef __MINGW32__ +#define INITGUID +#endif #include "servprov.hxx" #ifndef _COM_SUN_STAR_LANG_XSINGLESERVICEFACTORY_HPP_ @@ -152,7 +155,7 @@ EmbedServer_getImplementationName() + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "/UNO/SERVICES") ) ); - uno::Sequence< ::rtl::OUString > &rServices = EmbedServer_getSupportedServiceNames(); + const uno::Sequence< ::rtl::OUString > &rServices = EmbedServer_getSupportedServiceNames(); for( sal_Int32 ind = 0; ind < rServices.getLength(); ind++ ) xNewKey->createKey( rServices.getConstArray()[ind] ); --- oo_1.1.1_src/embedserv/source/embed/servprov.cxx.orig 2004-01-10 02:00:22.000000000 +0900 +++ oo_1.1.1_src/embedserv/source/embed/servprov.cxx 2004-03-29 12:17:38.000000000 +0900 @@ -188,12 +188,12 @@ return a; } -void SAL_CALL EmbedServer_Impl::acquire( ) throw(uno::RuntimeException) +void SAL_CALL EmbedServer_Impl::acquire( ) throw() { OWeakObject::acquire(); } -void SAL_CALL EmbedServer_Impl::release( ) throw (uno::RuntimeException) +void SAL_CALL EmbedServer_Impl::release( ) throw () { OWeakObject::release(); } --- oo_1.1.1_src/embedserv/source/inc/common.h.orig 2003-03-25 17:24:24.000000000 +0900 +++ oo_1.1.1_src/embedserv/source/inc/common.h 2004-03-29 12:17:38.000000000 +0900 @@ -62,8 +62,14 @@ #ifndef _COMMON_H_ #define _COMMON_H_ +#ifdef __MINGW32__ +#include +#include +#include +#else #include "stdafx.h" #include +#endif #ifndef _RTL_USTRING_HXX_ #include @@ -114,6 +120,5 @@ // {D0484DE6-AAEE-468a-991F-8D4B0737B57A} DEFINE_GUID(OID_MathServer, 0xd0484de6, 0xaaee, 0x468a, 0x99, 0x1f, 0x8d, 0x4b, 0x7, 0x37, 0xb5, 0x7a ); - #endif --- oo_1.1.1_src/embedserv/source/inc/docholder.hxx.orig 2003-04-24 22:54:52.000000000 +0900 +++ oo_1.1.1_src/embedserv/source/inc/docholder.hxx 2004-03-29 12:17:38.000000000 +0900 @@ -139,19 +139,22 @@ ::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 ); + 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 ); + 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 ); + 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); --- oo_1.1.1_src/embedserv/source/inc/intercept.hxx.orig 2003-04-04 20:41:06.000000000 +0900 +++ oo_1.1.1_src/embedserv/source/inc/intercept.hxx 2004-03-29 12:17:38.000000000 +0900 @@ -217,7 +217,7 @@ ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider > m_xMasterDispatchProvider; - static ::com::sun::star::uno::Sequence<::rtl::OUString> + static ::com::sun::star::uno::Sequence< ::rtl::OUString > m_aInterceptedURL; cppu::OInterfaceContainerHelper* m_pDisposeEventListeners; --- oo_1.1.1_src/embedserv/source/inc/servprov.hxx.orig 2003-04-10 23:55:58.000000000 +0900 +++ oo_1.1.1_src/embedserv/source/inc/servprov.hxx 2004-03-29 12:17:38.000000000 +0900 @@ -92,14 +92,14 @@ 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( 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 (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL release() 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( ) @@ -110,14 +110,14 @@ protected: CComPtr< EmbedProviderFactory_Impl > m_pOLEFactories[ SUPPORTED_FACTORIES_NUM ]; - ::com::sun::star::uno::Reference<::com::sun::star::lang::XMultiServiceFactory> m_xFactory; + ::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( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xFactory, const GUID* pGuid); ~EmbedProviderFactory_Impl(); sal_Bool registerClass(); @@ -138,7 +138,7 @@ GUID m_guid; DWORD m_factoryHandle; - ::com::sun::star::uno::Reference<::com::sun::star::lang::XMultiServiceFactory> m_xFactory; + ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xFactory; }; #endif --- oo_1.1.1_src/eventattacher/prj/d.lst.orig 2003-05-28 00:47:46.000000000 +0900 +++ oo_1.1.1_src/eventattacher/prj/d.lst 2004-03-29 12:17:38.000000000 +0900 @@ -1,3 +1,4 @@ ..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT% ..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT% +..\%__SRC%\lib\lib*.a %_DEST%\lib%_EXT% ..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT% --- oo_1.1.1_src/expat/prj/d.lst.orig 2002-09-30 14:27:06.000000000 +0900 +++ oo_1.1.1_src/expat/prj/d.lst 2004-03-29 12:17:38.000000000 +0900 @@ -6,4 +6,7 @@ ..\%__SRC%\lib\libexpat_xmltok.a %_DEST%\lib%_EXT%\libexpat_xmltok.a ..\%__SRC%\lib\libexpat_xmlparse.a %_DEST%\lib%_EXT%\libexpat_xmlparse.a ..\%__SRC%\lib\libascii_expat_xmlparse.a %_DEST%\lib%_EXT%\libascii_expat_xmlparse.a +..\%__SRC%\lib\libexpat_xmltok_static.a %_DEST%\lib%_EXT%\libexpat_xmltok_static.a +..\%__SRC%\lib\libexpat_xmlparse_static.a %_DEST%\lib%_EXT%\libexpat_xmlparse_static.a +..\%__SRC%\lib\libascii_expat_xmlparse_static.a %_DEST%\lib%_EXT%\libascii_expat_xmlparse_static.a --- oo_1.1.1_src/extensions/prj/d.lst.orig 2004-01-28 21:04:34.000000000 +0900 +++ oo_1.1.1_src/extensions/prj/d.lst 2004-03-29 12:17:38.000000000 +0900 @@ -1,5 +1,6 @@ ..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*.dll ..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%\lib*.so +..\%__SRC%\lib\lib*.a %_DEST%\lib%_EXT%\lib*.a ..\%__SRC%\lib\lib*.dylib %_DEST%\lib%_EXT%\lib*.dylib ..\%__SRC%\bin\*.bin %_DEST%\bin%_EXT%\*.bin ..\%__SRC%\misc\*.hid %_DEST%\bin%_EXT%\*.hid --- oo_1.1.1_src/extensions/source/activex/msidl/so_activex.idl.orig 2002-08-26 16:39:12.000000000 +0900 +++ oo_1.1.1_src/extensions/source/activex/msidl/so_activex.idl 2004-03-29 12:17:38.000000000 +0900 @@ -4,8 +4,12 @@ // This file will be processed by the MIDL tool to // produce the type library (so_activex.tlb) and marshalling code. +#ifdef __MINGW32__ +#import "oaidl.idl" +#else import "oaidl.idl"; import "ocidl.idl"; +#endif #include "olectl.h" --- oo_1.1.1_src/extensions/source/installation/office/protchk/protchk.cxx.orig 2001-05-16 20:48:32.000000000 +0900 +++ oo_1.1.1_src/extensions/source/installation/office/protchk/protchk.cxx 2004-03-29 12:17:38.000000000 +0900 @@ -65,6 +65,10 @@ #include #endif +#ifdef __MINGW32__ +#define VCL_NEED_BASETSD +#endif + #include #include #include @@ -142,9 +146,9 @@ // --- XInterface ------------------------------------------------------------ virtual Any SAL_CALL queryInterface(const Type& aType) throw(RuntimeException); - virtual void SAL_CALL acquire() throw(RuntimeException) + virtual void SAL_CALL acquire() throw() { OWeakObject::acquire(); } - virtual void SAL_CALL release() throw(RuntimeException) + virtual void SAL_CALL release() throw() { OWeakObject::release(); } // --- XProtocolHandlerCheck ------------------------------------------------- ProtocolHandlerCheck_Impl::ProtocolHandlerCheck_Impl( @@ -204,6 +208,7 @@ } sal_Bool ProtocolHandlerCheck_Impl::isSingleSettingAvailable(void) + throw(RuntimeException) { #ifdef WNT return sal_True; @@ -542,7 +547,7 @@ reinterpret_cast< XRegistryKey* >( pRegistryKey )->createKey( OUString::createFromAscii( "/" PROTCHK_IMPLEMENTATION_NAME "/UNO/SERVICES" ) ) ); - Sequence< OUString >& rSNL = Protchk_getSupportedServiceNames( ); + const Sequence< OUString >& rSNL = Protchk_getSupportedServiceNames( ); const OUString* pArray = rSNL.getConstArray( ); for ( sal_Int32 i = rSNL.getLength( ); i--; /* empty */ ) xNewRegKey->createKey( pArray[i] ); --- oo_1.1.1_src/extensions/source/ole/comifaces.hxx.orig 2000-09-19 01:16:40.000000000 +0900 +++ oo_1.1.1_src/extensions/source/ole/comifaces.hxx 2004-03-29 12:17:38.000000000 +0900 @@ -61,6 +61,8 @@ #ifndef __COMIFACES_HXX #define __COMIFACES_HXX +#include +#include #include using namespace com::sun::star::uno; --- oo_1.1.1_src/extensions/source/ole/jscriptclasses.hxx.orig 2003-04-16 01:16:30.000000000 +0900 +++ oo_1.1.1_src/extensions/source/ole/jscriptclasses.hxx 2004-03-29 12:17:38.000000000 +0900 @@ -65,6 +65,8 @@ #define STRICT #define _WIN32_WINNT 0x0400 #define _WIN32_DCOM +#ifdef __MINGW32__ +#else #if OSL_DEBUG_LEVEL > 0 //#define _ATL_DEBUG_INTERFACES #endif @@ -72,6 +74,7 @@ extern CComModule _Module; #include #include +#endif #include "comifaces.hxx" --- oo_1.1.1_src/extensions/source/ole/oledll.cxx.orig 2003-04-01 02:22:14.000000000 +0900 +++ oo_1.1.1_src/extensions/source/ole/oledll.cxx 2004-03-29 12:17:38.000000000 +0900 @@ -66,9 +66,12 @@ #if defined(_MSC_VER) && (_MSC_VER >= 1300) #undef _DEBUG #endif +#ifdef __MINGW32__ +#else #include CComModule _Module; #include +#endif BEGIN_OBJECT_MAP(ObjectMap) END_OBJECT_MAP() --- oo_1.1.1_src/extensions/source/ole/oleobjw.hxx.orig 2004-01-20 19:10:28.000000000 +0900 +++ oo_1.1.1_src/extensions/source/ole/oleobjw.hxx 2004-03-29 12:17:38.000000000 +0900 @@ -69,7 +69,10 @@ #if defined(_MSC_VER) && (_MSC_VER >= 1300) #undef _DEBUG #endif +#ifdef __MINGW32__ +#else #include +#endif #include #include #include --- oo_1.1.1_src/extensions/source/ole/servprov.cxx.orig 2004-01-20 19:10:48.000000000 +0900 +++ oo_1.1.1_src/extensions/source/ole/servprov.cxx 2004-03-29 12:17:38.000000000 +0900 @@ -72,9 +72,12 @@ #if defined(_MSC_VER) && (_MSC_VER >= 1300) #undef _DEBUG #endif +#ifdef __MINGW32__ +#else #include extern CComModule _Module; #include +#endif #include --- oo_1.1.1_src/extensions/source/scanner/scanwin.cxx.orig 2003-04-09 00:40:32.000000000 +0900 +++ oo_1.1.1_src/extensions/source/scanner/scanwin.cxx 2004-03-29 12:17:38.000000000 +0900 @@ -913,7 +913,14 @@ } if( mxMgr.is() && mpMgr && mxListener.is() ) +#ifdef __MINGW32__ + { + const REF( XInterface )& temp = REF( XInterface )( static_cast< OWeakObject* >( mpMgr ) ); + mxListener->disposing( com::sun::star::lang::EventObject( temp ) ); + } +#else mxListener->disposing( com::sun::star::lang::EventObject( REF( XInterface )( static_cast< OWeakObject* >( mpMgr ) ) ) ); +#endif mxListener = REF( com::sun::star::lang::XEventListener )(); } @@ -929,7 +936,14 @@ mpImpTwain = NULL; if( mpMgr && mxListener.is() ) +#ifdef __MINGW32__ + { + const REF( XInterface )& temp = REF( XInterface )( static_cast< OWeakObject* >( mpMgr ) ); + mxListener->disposing( com::sun::star::lang::EventObject( temp ) ); + } +#else mxListener->disposing( com::sun::star::lang::EventObject( REF( XInterface )( static_cast< OWeakObject* >( mpMgr ) ) ) ); +#endif } mxListener = REF( com::sun::star::lang::XEventListener )(); @@ -965,6 +979,7 @@ // ----------------------------------------------------------------------------- AWT::Size ScannerManager::getSize() + throw() { AWT::Size aRet; HGLOBAL hDIB = (HGLOBAL)(long) mpData; @@ -992,6 +1007,7 @@ // ----------------------------------------------------------------------------- SEQ( sal_Int8 ) ScannerManager::getDIB() + throw() { SEQ( sal_Int8 ) aRet; @@ -1055,6 +1071,7 @@ // ----------------------------------------------------------------------------- SEQ( ScannerContext ) SAL_CALL ScannerManager::getAvailableScanners() + throw() { vos::OGuard aGuard( maProtector ); SEQ( ScannerContext ) aRet( 1 ); --- oo_1.1.1_src/external/glibc/getopt.h.patch.orig 2004-03-13 22:01:54.000000000 +0900 +++ oo_1.1.1_src/external/glibc/getopt.h.patch 2004-01-25 21:54:22.000000000 +0900 @@ -0,0 +1,25 @@ +@@ -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); --- oo_1.1.1_src/external/glibc/glibcpatch.sh.orig 2000-10-19 05:19:52.000000000 +0900 +++ oo_1.1.1_src/external/glibc/glibcpatch.sh 2004-03-29 12:17:38.000000000 +0900 @@ -63,6 +63,7 @@ tarball="../download/glibc-2.1.3-stub.tar.gz" unziptarball="../download/glibc-2.1.3-stub.tar" +fname=getopt.h if test -s "$tarball"; then if test "$OS" = "SOLARIS"; then @@ -129,6 +130,8 @@ cp sdfiles/$SDNAME rtufiles/$SDNAME done + patch rtufiles/$fname ${fname}.patch + echo Extraction is done. > patchinf echo Extraction is done. rm -f patcherror --- oo_1.1.1_src/external/prj/build.lst.orig 2003-06-18 21:44:12.000000000 +0900 +++ oo_1.1.1_src/external/prj/build.lst 2004-03-29 12:17:38.000000000 +0900 @@ -7,3 +7,4 @@ es external\gpc nmake - w es_gpc NULL es external\w4w nmake - u es_w4w NULL es external\gcc3_specific nmake - u es_gcc3 NULL +es external\dbghelp nmake - w es_dbghelp NULL --- oo_1.1.1_src/external/prj/d.lst.orig 2003-08-19 19:50:56.000000000 +0900 +++ oo_1.1.1_src/external/prj/d.lst 2004-03-29 12:17:38.000000000 +0900 @@ -48,6 +48,7 @@ ..\%__SRC%\slo\PluginNew.* %_DEST%\lib%_EXT%\* ..\%__SRC%\slb\gnu_getopt.lib %_DEST%\lib%_EXT%\gnu_getopt.lib ..\%__SRC%\lib\libgnu_getopt.a %_DEST%\lib%_EXT%\libgnu_getopt.a +..\%__SRC%\lib\libgnu_getopt_static.a %_DEST%\lib%_EXT%\libgnu_getopt_static.a ..\%__SRC%\slb\zlib.lib %_DEST%\lib%_EXT%\zlib.lib ..\%__SRC%\lib\libzlib.a %_DEST%\lib%_EXT%\libzlib.a ..\%__SRC%\lib\libfreetype.a %_DEST%\lib%_EXT%\libfreetype.a @@ -66,9 +67,14 @@ ..\%__SRC%\slb\gpc.lib %_DEST%\lib%_EXT%\gpc.lib ..\%__SRC%\lib\libgpc.a %_DEST%\lib%_EXT%\libgpc.a +..\%__SRC%\lib\libgpc_static.a %_DEST%\lib%_EXT%\libgpc_static.a ..\%__SRC%\lib\libautorec*.* %_DEST%\lib%_EXT%\lib*.* +..\mingwm10\mingwm10.dll %_DEST%\bin%_EXT%\mingwm10.dll +..\%__SRC%\lib\libdbghelp*.* %_DEST%\lib%_EXT%\lib*.* +..\%__SRC%\lib\libunicows*.* %_DEST%\lib%_EXT%\lib*.* + ..\freetype\freetype-2.0.2\include\ft2build.h %_DEST%\inc%_EXT%\external\ft2build.h ..\freetype\freetype-2.0.2\include\freetype\* %_DEST%\inc%_EXT%\external\freetype\* ..\freetype\freetype-2.0.2\include\freetype\config\* %_DEST%\inc%_EXT%\external\freetype\config\* --- oo_1.1.1_src/fileaccess/prj/d.lst.orig 2004-01-29 01:30:24.000000000 +0900 +++ oo_1.1.1_src/fileaccess/prj/d.lst 2004-03-29 12:17:38.000000000 +0900 @@ -1,5 +1,6 @@ ..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\* ..\%__SRC%\bin\*.rdb %_DEST%\rdb%_EXT%\* ..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT% +..\%__SRC%\lib\lib*.a %_DEST%\lib%_EXT% ..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\* ..\source\fileacc.xml %_DEST%\xml%_EXT%\fileacc.xml --- oo_1.1.1_src/filter/prj/d.lst.orig 2003-07-17 03:01:16.000000000 +0900 +++ oo_1.1.1_src/filter/prj/d.lst 2004-03-29 12:17:38.000000000 +0900 @@ -1,5 +1,6 @@ ..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*.dll ..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT% +..\%__SRC%\lib\lib*.a %_DEST%\lib%_EXT% ..\%__SRC%\lib\lib*.dylib %_DEST%\lib%_EXT% ..\%__SRC%\class\*.jar %_DEST%\bin%_EXT%\*.jar ..\%__SRC%\class\XSLTFilter\*.jar %_DEST%\bin%_EXT%\*.jar --- oo_1.1.1_src/forms/prj/d.lst.orig 2003-05-28 00:55:40.000000000 +0900 +++ oo_1.1.1_src/forms/prj/d.lst 2004-03-29 12:17:38.000000000 +0900 @@ -1,5 +1,6 @@ ..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*.dll ..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT% +..\%__SRC%\lib\lib*.a %_DEST%\lib%_EXT% ..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib ..\%__SRC%\lib\*.sl %_DEST%\lib%_EXT%\*.sl ..\%__SRC%\bin\*.bin %_DEST%\bin%_EXT%\*.bin --- oo_1.1.1_src/fpicker/source/win32/filepicker/FilePicker.cxx.orig 2003-03-26 03:04:56.000000000 +0900 +++ oo_1.1.1_src/fpicker/source/win32/filepicker/FilePicker.cxx 2004-03-29 12:17:38.000000000 +0900 @@ -403,7 +403,7 @@ //----------------------------------------------------------------------------------------- void SAL_CALL CFilePicker::setDefaultName(const rtl::OUString& aName) - throw(lang::IllegalArgumentException, uno::RuntimeException) + throw(uno::RuntimeException) { OSL_ASSERT(0 != m_pImpl.get()); osl::MutexGuard aGuard(m_aMutex); @@ -760,6 +760,7 @@ //------------------------------------------------------------------------------------ void SAL_CALL CFilePicker::cancel() + throw(uno::RuntimeException) { OSL_ASSERT(m_pImpl.get()); --- oo_1.1.1_src/fpicker/source/win32/filepicker/FilePicker.hxx.orig 2002-11-26 18:22:00.000000000 +0900 +++ oo_1.1.1_src/fpicker/source/win32/filepicker/FilePicker.hxx 2004-03-29 12:17:38.000000000 +0900 @@ -183,7 +183,7 @@ throw( ::com::sun::star::uno::RuntimeException ); virtual void SAL_CALL setDefaultName( const ::rtl::OUString& aName ) - throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException ); + 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 ); @@ -262,7 +262,8 @@ // XCancellable //------------------------------------------------ - virtual void SAL_CALL cancel( ); + virtual void SAL_CALL cancel( ) + throw(::com::sun::star::uno::RuntimeException); //------------------------------------------------ // XEventListener @@ -305,7 +306,7 @@ CFilePicker& operator=( const CFilePicker& ); private: - ::com::sun::star::uno::Reference<::com::sun::star::lang::XMultiServiceFactory> m_xServiceMgr; // to instanciate own services + ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xServiceMgr; // to instanciate own services CAsyncEventNotifier m_aAsyncEventNotifier; std::auto_ptr m_pImpl; }; --- oo_1.1.1_src/fpicker/source/win32/folderpicker/FolderPicker.cxx.orig 2001-10-09 17:07:04.000000000 +0900 +++ oo_1.1.1_src/fpicker/source/win32/folderpicker/FolderPicker.cxx 2004-03-29 12:17:38.000000000 +0900 @@ -242,6 +242,7 @@ // ------------------------------------------------- void SAL_CALL CFolderPicker::cancel( ) + throw(RuntimeException) { OSL_ASSERT( m_pFolderPickerImpl.get( ) ); MutexGuard aGuard( m_aMutex ); --- oo_1.1.1_src/fpicker/source/win32/folderpicker/FolderPicker.hxx.orig 2001-10-09 17:07:04.000000000 +0900 +++ oo_1.1.1_src/fpicker/source/win32/folderpicker/FolderPicker.hxx 2004-03-29 12:17:38.000000000 +0900 @@ -150,7 +150,8 @@ // XCancellable //------------------------------------------------ - virtual void SAL_CALL cancel( ); + virtual void SAL_CALL cancel( ) + throw(::com::sun::star::uno::RuntimeException); //------------------------------------------------ // overwrite base class method, which is called --- oo_1.1.1_src/fpicker/source/win32/folderpicker/MtaFop.hxx.orig 2002-03-27 19:41:14.000000000 +0900 +++ oo_1.1.1_src/fpicker/source/win32/folderpicker/MtaFop.hxx 2004-03-29 12:17:38.000000000 +0900 @@ -75,6 +75,9 @@ #endif #include +#ifdef __MINGW32__ +#include +#endif #include #include --- oo_1.1.1_src/framework/prj/d.lst.orig 2004-01-28 22:01:52.000000000 +0900 +++ oo_1.1.1_src/framework/prj/d.lst 2004-03-29 12:17:38.000000000 +0900 @@ -5,6 +5,7 @@ ..\%__SRC%\bin\*.exe %_DEST%\bin%_EXT%\* ..\%__SRC%\bin\login %_DEST%\bin%_EXT%\login.bin ..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT% +..\%__SRC%\lib\lib*.a %_DEST%\lib%_EXT% ..\%__SRC%\lib\lib*.dylib %_DEST%\lib%_EXT% ..\dtd\menubar.dtd %_DEST%\bin%_EXT%\menubar.dtd --- oo_1.1.1_src/i18n/prj/d.lst.orig 2004-01-28 20:37:16.000000000 +0900 +++ oo_1.1.1_src/i18n/prj/d.lst 2004-03-29 12:17:38.000000000 +0900 @@ -2,6 +2,7 @@ ..\%__SRC%\bin\i18n?????.dll %_DEST%\bin%_EXT%\i18n?????.dll ..\%__SRC%\lib\libi18n?????.so %_DEST%\lib%_EXT%\libi18n?????.so +..\%__SRC%\lib\libi18n?????.a %_DEST%\lib%_EXT%\libi18n?????.a ..\%__SRC%\lib\libi18n??????.dylib %_DEST%\lib%_EXT%\libi18n??????.dylib dos: sh -c "if test %OS% = MACOSX; then create-bundle %_DEST%\lib%_EXT%\*.dylib; fi" --- oo_1.1.1_src/i18n_simple/prj/d.lst.orig 2004-01-28 20:37:16.000000000 +0900 +++ oo_1.1.1_src/i18n_simple/prj/d.lst 2004-03-29 12:17:38.000000000 +0900 @@ -2,6 +2,7 @@ ..\%__SRC%\bin\i18n?????.dll %_DEST%\bin%_EXT%\i18n?????.dll ..\%__SRC%\lib\libi18n?????.so %_DEST%\lib%_EXT%\libi18n?????.so +..\%__SRC%\lib\libi18n?????.a %_DEST%\lib%_EXT%\libi18n?????.a ..\%__SRC%\lib\libi18n??????.dylib %_DEST%\lib%_EXT%\libi18n??????.dylib dos: sh -c "if test %OS% = MACOSX; then create-bundle %_DEST%\lib%_EXT%\*.dylib; fi" --- oo_1.1.1_src/i18npool/prj/d.lst.orig 2004-01-29 00:03:10.000000000 +0900 +++ oo_1.1.1_src/i18npool/prj/d.lst 2004-03-29 12:17:38.000000000 +0900 @@ -5,20 +5,24 @@ ..\%__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" --- oo_1.1.1_src/i18nutil/prj/d.lst.orig 2004-01-28 19:55:38.000000000 +0900 +++ oo_1.1.1_src/i18nutil/prj/d.lst 2004-03-29 12:17:38.000000000 +0900 @@ -10,6 +10,7 @@ ..\%__SRC%\bin\i18nutil*.dll %_DEST%\bin%_EXT%\i18nutil*.dll ..\%__SRC%\lib\libi18nutil*.so %_DEST%\lib%_EXT%\libi18nutil*.so ..\%__SRC%\lib\libi18nutil*.dylib %_DEST%\lib%_EXT%\libi18nutil*.dylib +..\%__SRC%\lib\libi18nutil*.a %_DEST%\lib%_EXT%\libi18nutil*.a ..\%__SRC%\lib\ii18nutil.lib %_DEST%\lib%_EXT%\ii18nutil.lib dos: sh -c "if test %OS% = MACOSX; then create-bundle %_DEST%\lib%_EXT%\*.dylib; fi" --- oo_1.1.1_src/icu/icu-2.2.patch.orig 2003-08-15 20:32:16.000000000 +0900 +++ oo_1.1.1_src/icu/icu-2.2.patch 2004-03-29 12:17:38.000000000 +0900 @@ -1,5 +1,22 @@ *** misc/icu/source/configure Fri Aug 9 19:20:54 2002 ---- misc/build/icu/source/configure Tue Jul 22 10:11:48 2003 +--- misc/build/icu/source/configure Tue Mar 16 07:11:26 2004 +*************** +*** 1989,1995 **** + else + ac_func_search_save_LIBS="$LIBS" + ac_cv_search_pthread_mutex_destroy="no" +! for i in pthread pthreads c_r cma; do + LIBS="-l$i $ac_func_search_save_LIBS" + cat > conftest.$ac_ext < conftest.$ac_ext <&6 case "${host}" in alpha*-*-*) U_HAVE_INTTYPES_H=0; +*************** +*** 2966,2973 **** +--- 2966,2977 ---- + #endif + #include + #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 ++ #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 ---- misc/build/icu/source/configure.in Tue Jul 22 10:11:48 2003 +--- misc/build/icu/source/configure.in Tue Mar 16 23:56:40 2004 +*************** +*** 232,238 **** + dnl (but that was checked above). + dnl FreeBSD users may need libpthread if they do not have libc_r. + +! AC_SEARCH_LIBS_FIRST(pthread_mutex_destroy, pthread pthreads c_r cma) + + if test "$ac_cv_search_pthread_mutex_destroy" != no; then + ICU_USE_THREADS=1 +--- 232,238 ---- + dnl (but that was checked above). + dnl FreeBSD users may need libpthread if they do not have libc_r. + +! AC_SEARCH_LIBS_FIRST(pthread_mutex_destroy, pthread pthreads c_r cma pthreadGCE) + + if test "$ac_cv_search_pthread_mutex_destroy" != no; then + ICU_USE_THREADS=1 *************** *** 288,294 **** else @@ -36,8 +99,36 @@ AC_MSG_RESULT("C compiler set to CCC ${CC}" ) case "${host}" in alpha*-*-*) U_HAVE_INTTYPES_H=0; +*************** +*** 450,456 **** +--- 450,460 ---- + #endif + #include + #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 ++ #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 ---- misc/build/icu/source/icudefs.mk.in Tue Jul 22 10:11:49 2003 +--- misc/build/icu/source/icudefs.mk.in Tue Mar 16 07:11:26 2004 *************** *** 133,139 **** --- 133,143 ---- @@ -52,6 +143,24 @@ # 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 *************** @@ -257,7 +366,36 @@ LD_SONAME = -h $(MIDDLE_SO_TARGET) *** misc/icu/source/data/Makefile.in Thu Aug 15 19:08:02 2002 ---- misc/build/icu/source/data/Makefile.in Tue Jul 22 10:11:49 2003 +--- misc/build/icu/source/data/Makefile.in Tue Mar 16 07:11:26 2004 +*************** +*** 17,29 **** + subdir = data + + #lib icu data for link +! LIB_ICUDATA_NAME=lib$(ICUDATA_NAME) + + # sanity! + ICUDT=$(ICUDATA_PLATFORM_NAME)_ + + top_builddir_from_tmp = $(patsubst ..%,../..%,$(top_builddir)) +! CURDIR=$(shell pwd) + PKGDATA = $(top_builddir)/tools/pkgdata/pkgdata -O $(top_builddir)/data/icupkg.inc -d $(CURDIR)/out + PKGDATA_VERSIONING = -r $(SO_TARGET_VERSION) + +--- 17,29 ---- + subdir = data + + #lib icu data for link +! LIB_ICUDATA_NAME=$(LIBPREFIX)$(ICUDATA_NAME) + + # sanity! + ICUDT=$(ICUDATA_PLATFORM_NAME)_ + + top_builddir_from_tmp = $(patsubst ..%,../..%,$(top_builddir)) +! CURDIR=. + PKGDATA = $(top_builddir)/tools/pkgdata/pkgdata -O $(top_builddir)/data/icupkg.inc -d $(CURDIR)/out + PKGDATA_VERSIONING = -r $(SO_TARGET_VERSION) + *************** *** 127,133 **** @@ -1055,7 +1193,7 @@ const ScriptListTable *scriptListTable = NULL; const LangSysTable *langSysTable = NULL; *** misc/icu/source/layout/Makefile.in Sat Jul 20 01:24:32 2002 ---- misc/build/icu/source/layout/Makefile.in Tue Jul 22 10:11:49 2003 +--- misc/build/icu/source/layout/Makefile.in Tue Mar 16 07:11:26 2004 *************** *** 38,44 **** @@ -1073,6 +1211,389 @@ 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 ++++ misc/build/icu/source/common/unicode/umachine.h 2003-10-11 13:40:02.000000000 +0900 +@@ -41,7 +41,9 @@ + /* which are contained in the platform-specific file platform.h */ + /*==========================================================================*/ + +-#if defined(WIN32) || defined(_WIN32) || defined(WIN64) || defined(_WIN64) ++#if defined(__MINGW32__) ++# include "unicode/platform.h" ++#elif defined(WIN32) || defined(_WIN32) || defined(WIN64) || defined(_WIN64) + # include "unicode/pwin32.h" + #elif defined(__OS2__) + # include "unicode/pos2.h" +--- misc/build/icu/source/common/unicode/platform.h.in.orig 2002-07-31 05:54:42.000000000 +0900 ++++ misc/build/icu/source/common/unicode/platform.h.in 2003-10-11 20:33:00.000000000 +0900 +@@ -235,14 +235,18 @@ + /* Symbol import-export control */ + /*===========================================================================*/ + +-#define U_EXPORT ++/* cygwin needs to export/import data */ ++#ifdef U_CYGWIN ++#define U_EXPORT __declspec(dllexport) + /* U_CALLCONV is releated to U_EXPORT2 */ + #define U_EXPORT2 + +-/* cygwin needs to export/import data */ +-#ifdef U_CYGWIN + #define U_IMPORT __declspec(dllimport) + #else ++#define U_EXPORT ++/* U_CALLCONV is releated to U_EXPORT2 */ ++#define U_EXPORT2 ++ + #define U_IMPORT + #endif + +--- misc/build/icu/source/common/hash.h.orig 2002-07-12 09:23:48.000000000 +0900 ++++ misc/build/icu/source/common/hash.h 2003-10-12 10:42:36.000000000 +0900 +@@ -46,7 +46,12 @@ + * Non-virtual destructor; make this virtual if Hashtable is subclassed + * in the future. + */ +- ~Hashtable(); ++ inline ~Hashtable() { ++ if (hash != 0) { ++ uhash_close(hash); ++ hash = 0; ++ } ++ } + + UObjectDeleter *setValueDeleter(UObjectDeleter *fn); + +@@ -124,12 +129,14 @@ + } + } + ++#if 0 + inline Hashtable::~Hashtable() { + if (hash != 0) { + uhash_close(hash); + hash = 0; + } + } ++#endif + + inline UObjectDeleter *Hashtable::setValueDeleter(UObjectDeleter *fn) { + return uhash_setValueDeleter(hash, fn); +--- misc/build/icu/source/common/unicode/unifunct.h.orig 2002-08-09 09:07:16.000000000 +0900 ++++ misc/build/icu/source/common/unicode/unifunct.h 2003-10-12 10:45:12.000000000 +0900 +@@ -31,7 +31,7 @@ + /** + * Destructor + */ +- virtual ~UnicodeFunctor(); ++ virtual inline ~UnicodeFunctor() {} + + /** + * Return a copy of this object. All UnicodeFunctor objects +@@ -123,7 +123,7 @@ + }; + + inline UnicodeFunctor::UnicodeFunctor() {} +-inline UnicodeFunctor::~UnicodeFunctor() {} ++// inline UnicodeFunctor::~UnicodeFunctor() {} + + U_NAMESPACE_END + +--- misc/build/icu/source/common/unicode/unifilt.h.orig 2002-06-29 09:01:30.000000000 +0900 ++++ misc/build/icu/source/common/unicode/unifilt.h 2003-10-12 10:44:54.000000000 +0900 +@@ -54,7 +54,7 @@ + * Destructor + * @stable + */ +- virtual ~UnicodeFilter(); ++ virtual inline ~UnicodeFilter() {} + + /** + * Returns true for characters that are in the selected +@@ -130,7 +130,7 @@ + }; + + inline UnicodeFilter::UnicodeFilter() {} +-inline UnicodeFilter::~UnicodeFilter() {} ++//inline UnicodeFilter::~UnicodeFilter() {} + + U_NAMESPACE_END + +--- misc/build/icu/source/common/unicode/putil.h.orig 2002-07-03 21:05:04.000000000 +0900 ++++ misc/build/icu/source/common/unicode/putil.h 2003-10-12 17:36:56.000000000 +0900 +@@ -237,7 +237,7 @@ + # define U_PATH_SEP_CHAR ';' + # define U_FILE_SEP_STRING ":" + # define U_PATH_SEP_STRING ";" +-#elif defined(WIN32) || defined(OS2) ++#elif (defined(WIN32) || defined(OS2)) && (!defined(U_CYGWIN)) + # define U_FILE_SEP_CHAR '\\' + # define U_PATH_SEP_CHAR ';' + # define U_FILE_SEP_STRING "\\" +--- misc/build/icu/source/tools/pkgdata/pkgdata.c.orig 2002-08-01 05:28:28.000000000 +0900 ++++ misc/build/icu/source/tools/pkgdata/pkgdata.c 2003-10-12 19:26:56.000000000 +0900 +@@ -51,17 +51,17 @@ + } modes[] = + { + { "files", 0, pkg_mode_files, "Uses raw data files (no effect). Installation copies all files to the target location." }, +-#ifdef WIN32 ++#if defined(WIN32) && ! defined(U_CYGWIN) + { "dll", "library", pkg_mode_windows, "Generates one common data file and one shared library, .dll"}, + { "common", "archive", pkg_mode_windows, "Generates just the common file, .dat"}, + { "static", "static", pkg_mode_windows, "Generates one statically linked library, " LIB_PREFIX "" UDATA_LIB_SUFFIX } +-#else /*#ifdef WIN32*/ ++#else /*#if defined(WIN32) && ! defined(U_CYGWIN)*/ + #ifdef UDATA_SO_SUFFIX + { "dll", "library", pkg_mode_dll, "Generates one shared library, " UDATA_SO_SUFFIX }, + #endif + { "common", "archive", pkg_mode_common, "Generates one common data file, .dat" }, + { "static", "static", pkg_mode_static, "Generates one statically linked library, " LIB_PREFIX "" UDATA_LIB_SUFFIX } +-#endif /*#ifdef WIN32*/ ++#endif /*#if defined(WIN32) && ! defined(U_CYGWIN)*/ + }; + + static UOption options[]={ +@@ -88,7 +88,7 @@ + + const char options_help[][160]={ + "Set the data name", +-#ifdef WIN32 ++#if defined(WIN32) && ! defined(U_CYGWIN) + "R:icupath for release version or D:icupath for debug version, where icupath is the directory where ICU is located", + #else + "Specify options for the builder. (Autdetected if icu-config is available)", +@@ -251,7 +251,7 @@ + o.cShortName = csname; + } + +-#ifdef WIN32 /* format is R:pathtoICU or D:pathtoICU */ ++#if defined(WIN32) && ! defined(U_CYGWIN) /* format is R:pathtoICU or D:pathtoICU */ + { + char *pathstuff = (char *)options[1].value; + if(options[1].value[uprv_strlen(options[1].value)-1] == '\\') { +@@ -387,7 +387,7 @@ + } + + /*getcwd(pwd, 1024);*/ +-#ifdef WIN32 ++#if defined(WIN32) && ! defined(U_CYGWIN) + sprintf(cmd, "%s %s%s -f \"%s\" %s %s %s %s", + make, + o->install ? "INSTALLTO=" : "", +--- misc/build/icu/source/tools/pkgdata/makefile.h.orig 2002-08-07 04:06:32.000000000 +0900 ++++ misc/build/icu/source/tools/pkgdata/makefile.h 2003-10-12 19:52:08.000000000 +0900 +@@ -41,9 +41,9 @@ + + + +-#ifdef WIN32 ++#if defined(WIN32) && ! defined(U_CYGWIN) + extern void pkg_mode_windows(UPKGOptions *o, FileStream *makefile, UErrorCode *status); +-#else /*#ifdef WIN32*/ ++#else /*#if defined(WIN32) && ! defined(U_CYGWIN)*/ + /** + * Write stanzas for generating .o (and .c) files for each data file in 'o->filePaths'. + * @param o Package options struct +@@ -58,7 +58,7 @@ + extern void pkg_mode_static(UPKGOptions* o, FileStream *stream, UErrorCode *status); + #endif /*#ifdef UDATA_SO_SUFFIX*/ + extern void pkg_mode_common(UPKGOptions* o, FileStream *stream, UErrorCode *status); +-#endif /*#ifdef WIN32*/ ++#endif /*#if defined(WIN32) && ! defined(U_CYGWIN)*/ + + extern void pkg_mode_files(UPKGOptions* o, FileStream *stream, UErrorCode *status); + +--- misc/build/icu/source/tools/pkgdata/pkgtypes.h.orig 2002-04-02 11:50:30.000000000 +0900 ++++ misc/build/icu/source/tools/pkgdata/pkgtypes.h 2003-10-12 19:52:04.000000000 +0900 +@@ -126,7 +126,7 @@ + + /* set up common defines for library naming */ + +-#ifdef WIN32 ++#if defined(WIN32) && ! defined(U_CYGWIN) + # ifndef UDATA_SO_SUFFIX + # define UDATA_SO_SUFFIX ".DLL" + # endif +--- misc/build/icu/source/tools/pkgdata/sttcmode.c.orig 2002-08-07 04:06:32.000000000 +0900 ++++ misc/build/icu/source/tools/pkgdata/sttcmode.c 2003-10-12 20:57:40.000000000 +0900 +@@ -104,7 +104,7 @@ + } + + +-#ifndef WIN32 ++#if !defined(WIN32) || defined(U_CYGWIN) + + + #include "makefile.h" +--- misc/build/icu/source/extra/uconv/Makefile.in.orig 2002-08-01 05:28:30.000000000 +0900 ++++ misc/build/icu/source/extra/uconv/Makefile.in 2003-10-12 21:56:08.000000000 +0900 +@@ -133,7 +133,7 @@ + @$(MKINSTALLDIRS) $(RESDIR) + @-$(RMV) $@ + @for file in $(RESFILES); do \ +- echo `pwd`/$$file >> $@; \ ++ echo $$file >> $@; \ + done; + + # no install for static mode +--- misc/build/icu/source/common/Makefile.in.orig 2002-08-13 05:30:14.000000000 +0900 ++++ misc/build/icu/source/common/Makefile.in 2003-10-12 23:03:30.000000000 +0900 +@@ -142,7 +142,7 @@ + + ifneq ($(ENABLE_SHARED),) + $(FINAL_SO_TARGET): $(OBJECTS) +- $(SHLIB.cc) $(LD_SONAME) -o $@ $^ $(LIBS) ++ $(SHLIB.cc) $(LD_SONAME) $(LD_IMPLIB) -o $@ $^ $(LIBS) + + ifeq ($(OS390BATCH),1) + $(BATCH_TARGET): $(OBJECTS) +--- misc/build/icu/source/extra/ustdio/Makefile.in.orig 2002-08-14 09:38:40.000000000 +0900 ++++ misc/build/icu/source/extra/ustdio/Makefile.in 2003-10-12 23:03:06.000000000 +0900 +@@ -121,7 +121,7 @@ + + ifneq ($(ENABLE_SHARED),) + $(FINAL_SO_TARGET): $(OBJECTS) +- $(SHLIB.cc) $(LD_SONAME) -o $@ $^ $(LIBS) ++ $(SHLIB.cc) $(LD_SONAME) $(LD_IMPLIB) -o $@ $^ $(LIBS) + + ifeq ($(OS390BATCH),1) + $(BATCH_TARGET): $(OBJECTS) +--- misc/build/icu/source/i18n/Makefile.in.orig 2002-08-14 09:38:40.000000000 +0900 ++++ misc/build/icu/source/i18n/Makefile.in 2003-10-12 23:01:26.000000000 +0900 +@@ -134,7 +134,7 @@ + + ifneq ($(ENABLE_SHARED),) + $(FINAL_SO_TARGET): $(OBJECTS) +- $(SHLIB.cc) $(LD_SONAME) -o $@ $^ $(LIBS) ++ $(SHLIB.cc) $(LD_SONAME) $(LD_IMPLIB) -o $@ $^ $(LIBS) + + ifeq ($(OS390BATCH),1) + $(BATCH_TARGET):$(OBJECTS) +--- misc/build/icu/source/tools/ctestfw/Makefile.in.orig 2002-07-20 06:45:32.000000000 +0900 ++++ misc/build/icu/source/tools/ctestfw/Makefile.in 2003-10-12 22:58:30.000000000 +0900 +@@ -100,7 +100,7 @@ + + ifneq ($(ENABLE_SHARED),) + $(FINAL_SO_TARGET): $(OBJECTS) +- $(SHLIB.cc) $(LD_SONAME) -o $@ $^ $(LIBS) ++ $(SHLIB.cc) $(LD_SONAME) $(LD_IMPLIB) -o $@ $^ $(LIBS) + endif + + ifeq (,$(MAKECMDGOALS)) +--- misc/build/icu/source/tools/toolutil/Makefile.in.orig 2002-05-14 08:50:12.000000000 +0900 ++++ misc/build/icu/source/tools/toolutil/Makefile.in 2003-10-12 22:57:56.000000000 +0900 +@@ -98,7 +98,7 @@ + + ifneq ($(ENABLE_SHARED),) + $(FINAL_SO_TARGET): $(OBJECTS) +- $(SHLIB.cc) $(LD_SONAME) -o $@ $^ $(LIBS) ++ $(SHLIB.cc) $(LD_SONAME) $(LD_IMPLIB) -o $@ $^ $(LIBS) + endif + + ifeq (,$(MAKECMDGOALS)) +--- misc/build/icu/source/stubdata/Makefile.in.orig 2002-05-22 07:41:42.000000000 +0900 ++++ misc/build/icu/source/stubdata/Makefile.in 2004-01-17 11:55:50.000000000 +0900 +@@ -25,11 +25,11 @@ + ## Target information + + ifneq ($(ENABLE_STATIC),) +-TARGET = lib$(ICUPREFIX)data$(ICULIBSUFFIX).a ++TARGET = $(LIBICU)data$(ICULIBSUFFIX).a + endif + + ifneq ($(ENABLE_SHARED),) +-SO_TARGET = lib$(ICUPREFIX)data$(ICULIBSUFFIX)$(STUB_SUFFIX).$(SO) ++SO_TARGET = $(LIBICU)data$(ICULIBSUFFIX)$(STUB_SUFFIX).$(SO) + ALL_SO_TARGETS = $(SO_TARGET) $(MIDDLE_SO_TARGET) $(FINAL_SO_TARGET) $(BATCH_STUB_TARGET) + endif + +@@ -110,7 +110,7 @@ + + ifneq ($(ENABLE_SHARED),) + $(FINAL_SO_TARGET): $(OBJECTS) +- $(SHLIB.c) $(LD_SONAME) -o $@ $^ $(LIBS) ++ $(SHLIB.c) $(LD_SONAME) $(LD_IMPLIB) -o $@ $^ $(LIBS) + + ifeq ($(OS390BATCH),1) + $(BATCH_STUB_TARGET): $(OBJECTS) +--- misc/build/icu/source/config/mh-cygwin.orig 2002-03-20 03:13:48.000000000 +0900 ++++ misc/build/icu/source/config/mh-cygwin 2004-01-17 13:34:10.000000000 +0900 +@@ -26,8 +26,19 @@ + LD_RPATH= + LD_RPATH_PRE= -Wl,-rpath, + ++## Versioned target for a shared library. ++FINAL_SO_TARGET = $(SO_TARGET:.dll=).$(SO_TARGET_VERSION_MAJOR).$(SO) ++MIDDLE_SO_TARGET = $(SO_TARGET:.dll=).$(SO_TARGET_VERSION_MAJOR).$(SO) ++ ++### How ICU libraries are named... ex. $(LIBICU)uc$(SO) ++## Prefix for the ICU library names ++LIBPREFIX = ++LIBICU = $(ICUPREFIX) ++ + ## Compiler switch to embed a library name +-LD_SONAME = -Wl,-soname -Wl,$(MIDDLE_SO_TARGET) ++LD_SONAME = -Wl,-E,--export-all-symbols,-Bdynamic,-soname,$(MIDDLE_SO_TARGET) ++IMPLIB_TARGET = lib$(SO_TARGET:.dll=.a) ++LD_IMPLIB = -Wl,--out-implib,$(IMPLIB_TARGET) + + ## Shared object suffix + SO = dll +@@ -63,10 +74,8 @@ + + ## Versioned libraries rules + +-%.$(SO).$(SO_TARGET_VERSION_MAJOR): %.$(SO).$(SO_TARGET_VERSION) +- $(RM) $@ && cp $< $@ +-%.$(SO): %.$(SO).$(SO_TARGET_VERSION_MAJOR) +- $(RM) $@ && cp $*.$(SO).$(SO_TARGET_VERSION) $@ ++%.$(SO): %.$(SO_TARGET_VERSION_MAJOR).$(SO) ++ $(RM) $@ && cp $*.$(SO_TARGET_VERSION_MAJOR).$(SO) $@ + + ## Bind internal references + +--- misc/build/icu/source/tools/pkgdata/dllmode.c.orig 2002-08-07 04:06:30.000000000 +0900 ++++ misc/build/icu/source/tools/pkgdata/dllmode.c 2004-01-17 13:38:36.000000000 +0900 +@@ -39,7 +39,7 @@ + return; + } + +- uprv_strcpy(tmp, LIB_PREFIX "$(NAME)" UDATA_SO_SUFFIX); ++ uprv_strcpy(tmp, "$(LIBPREFIX)$(NAME)" UDATA_SO_SUFFIX); + + /* We should be the only item. So we don't care about the order. */ + o->outFiles = pkg_appendToList(o->outFiles, &tail, uprv_strdup(tmp)); +@@ -175,8 +175,11 @@ + "# \t-ls -l $@\n\n"); + #endif + +- T_FileStream_writeLine(makefile, "$(TARGETDIR)/$(FINAL_SO_TARGET): $(OBJECTS) $(LISTFILES) $(DLL_DEPS)\n" +- "\t$(SHLIB.c) -o $@ $(OBJECTS) $(DLL_LDFLAGS)\n" ++ T_FileStream_writeLine(makefile, "ifneq ($(IMPLIB_TARGET),)\n" ++ "IMPLIB_LDFLAGS = -Wl,--out-implib,$(TARGETDIR)/$(IMPLIB_TARGET)\n" ++ "endif\n\n" ++ "$(TARGETDIR)/$(FINAL_SO_TARGET): $(OBJECTS) $(LISTFILES) $(DLL_DEPS)\n" ++ "\t$(SHLIB.c) -o $@ $(OBJECTS) $(DLL_LDFLAGS) $(IMPLIB_LDFLAGS)\n" + "\t-ls -l $@\n\n"); + #endif + *** misc/icu/source/layout/OpenTypeLayoutEngine.h Wed Aug 14 02:17:50 2002 --- misc/build/icu/source/layout/OpenTypeLayoutEngine.h Tue Jul 22 10:11:49 2003 *************** --- oo_1.1.1_src/idl/source/prj/svidl.cxx.orig 2000-09-19 01:30:42.000000000 +0900 +++ oo_1.1.1_src/idl/source/prj/svidl.cxx 2004-03-29 12:17:38.000000000 +0900 @@ -141,7 +141,7 @@ |* |* Beschreibung *************************************************************************/ -#if defined( UNX ) || (defined( PM2 ) && defined( CSET )) || defined (WTC) || defined (MAC) || defined (MTW) +#if defined( UNX ) || (defined( PM2 ) && defined( CSET )) || defined (WTC) || defined (MAC) || defined (MTW) || defined (__MINGW32__) int main ( int argc, char ** argv) { #else --- oo_1.1.1_src/idlc/source/astexpression.cxx.orig 2001-03-15 21:30:44.000000000 +0900 +++ oo_1.1.1_src/idlc/source/astexpression.cxx 2004-03-29 12:17:38.000000000 +0900 @@ -79,9 +79,15 @@ #undef MINCHAR #define MINCHAR -128 +#ifdef __MINGW32__ +#define MAXINT64 9223372036854775807LL +#define MININT64 -9223372036854775807LL-1 +#define MAXUINT64 18446744073709551615ULL +#else #define MAXINT64 9223372036854775807 #define MININT64 -9223372036854775807-1 #define MAXUINT64 18446744073709551615 +#endif using namespace ::rtl; --- oo_1.1.1_src/idlc/source/parser.y.orig 2003-03-26 21:11:10.000000000 +0900 +++ oo_1.1.1_src/idlc/source/parser.y 2004-03-29 12:17:38.000000000 +0900 @@ -144,6 +144,7 @@ return res; } +#if defined (_MSC_VER) && (_MSC_VER < 1310) void* malloc( size_t size ) { return ::malloc(size); @@ -153,6 +154,7 @@ { ::free(memblock); } +#endif }; #endif --- oo_1.1.1_src/io/prj/d.lst.orig 2004-01-28 19:20:06.000000000 +0900 +++ oo_1.1.1_src/io/prj/d.lst 2004-03-29 12:17:38.000000000 +0900 @@ -4,6 +4,7 @@ ..\source\connector\connectr.xml %_DEST%\xml%_EXT%\connector.uno.xml ..\source\stm\stm.xml %_DEST%\xml%_EXT%\streams.uno.xml ..\%__SRC%\lib\*.so %_DEST%\lib%_EXT%\* +..\%__SRC%\lib\*.a %_DEST%\lib%_EXT%\* ..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\* dos: sh -c "if test %OS% = MACOSX; then create-bundle %_DEST%\lib%_EXT%\*.dylib; fi" --- oo_1.1.1_src/javaunohelper/prj/d.lst.orig 2003-03-26 21:23:48.000000000 +0900 +++ oo_1.1.1_src/javaunohelper/prj/d.lst 2004-03-29 12:17:38.000000000 +0900 @@ -1,6 +1,7 @@ ..\%__SRC%\class\juh.jar %_DEST%\bin%_EXT%\juh.jar ..\%__SRC%\bin\juh*.dll %_DEST%\bin%_EXT%\juh*.dll ..\%__SRC%\lib\libjuh*.so %_DEST%\lib%_EXT%\libjuh*.so +..\%__SRC%\lib\libjuh*.a %_DEST%\lib%_EXT%\libjuh*.a ..\%__SRC%\lib\libjuh*.dylib %_DEST%\lib%_EXT%\libjuh*.dylib ..\%__SRC%\bin\juh_src.zip %COMMON_DEST%\bin%_EXT%\juh_src.zip --- oo_1.1.1_src/jpeg/prj/d.lst.orig 2002-08-19 23:55:56.000000000 +0900 +++ oo_1.1.1_src/jpeg/prj/d.lst 2004-03-29 12:17:38.000000000 +0900 @@ -3,6 +3,7 @@ ..\%__SRC%\slb\jpeglib.lib %_DEST%\lib%_EXT%\jpeglib.lib ..\%__SRC%\lib\libjpeglib.a %_DEST%\lib%_EXT%\libjpeglib.a +..\%__SRC%\lib\libjpeglib_static.a %_DEST%\lib%_EXT%\libjpeglib_static.a ..\%__SRC%\inc\jerror.h %_DEST%\inc%_EXT%\external\jerror.h ..\%__SRC%\inc\jpeglib.h %_DEST%\inc%_EXT%\external\jpeglib.h --- oo_1.1.1_src/jurt/prj/d.lst.orig 2004-01-28 20:45:12.000000000 +0900 +++ oo_1.1.1_src/jurt/prj/d.lst 2004-03-29 12:17:38.000000000 +0900 @@ -1,6 +1,7 @@ ..\%__SRC%\class\jurt.jar %_DEST%\bin%_EXT%\jurt.jar ..\%__SRC%\bin\jpipe*.dll %_DEST%\bin%_EXT%\jpipe*.dll ..\%__SRC%\lib\libjpipe*.so %_DEST%\lib%_EXT%\libjpipe*.so +..\%__SRC%\lib\libjpipe*.a %_DEST%\lib%_EXT%\libjpipe*.a ..\%__SRC%\lib\libjpipe*.dylib %_DEST%\lib%_EXT%\libjpipe*.dylib ..\%__SRC%\bin\jurt_src.zip %COMMON_DEST%\bin%_EXT%\jurt_src.zip --- oo_1.1.1_src/jvmaccess/prj/d.lst.orig 2003-07-17 02:25:26.000000000 +0900 +++ oo_1.1.1_src/jvmaccess/prj/d.lst 2004-03-29 12:17:38.000000000 +0900 @@ -5,4 +5,5 @@ ..\%__SRC%\lib\ijvmaccess.lib %_DEST%\lib%_EXT%\ijvmaccess.lib ..\%__SRC%\lib\libjvmaccess*.so.*.*.* %_DEST%\lib%_EXT%\* ..\%__SRC%\lib\libjvmaccess*.dylib* %_DEST%\lib%_EXT%\* +..\%__SRC%\lib\libjvmaccess*.a %_DEST%\lib%_EXT%\* linklib: libjvmaccess*.so.*.*.* --- oo_1.1.1_src/linguistic/prj/d.lst.orig 2004-01-28 20:56:34.000000000 +0900 +++ oo_1.1.1_src/linguistic/prj/d.lst 2004-03-29 12:17:38.000000000 +0900 @@ -1,6 +1,6 @@ ..\%__SRC%\bin\lng* %_DEST%\bin%_EXT%\lng* ..\%__SRC%\lib\ilng* %_DEST%\lib%_EXT%\ilng* -..\%__SRC%\lib\liblng.a %_DEST%\lib%_EXT%\liblng.a +..\%__SRC%\lib\liblng*.a %_DEST%\lib%_EXT%\liblng*.a ..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib ..\%__SRC%\lib\liblng*.so %_DEST%\lib%_EXT%\liblng*.so --- oo_1.1.1_src/neon/neon.patch.orig 2002-10-24 20:50:58.000000000 +0900 +++ oo_1.1.1_src/neon/neon.patch 2004-03-29 12:17:38.000000000 +0900 @@ -3,7 +3,7 @@ *************** *** 1 **** ! dummy ---- 1,130 ---- +--- 1,132 ---- ! ! /* Define to be the neon version string */ ! #define NEON_VERSION "0.23.5" @@ -126,9 +126,11 @@ ! #define vsnprintf _vsnprintf ! #define strcasecmp strcmpi ! #define strncasecmp strnicmp -! #define ssize_t int ! #define inline __inline +! #ifndef __MINGW32__ +! #define ssize_t int ! #define off_t _off_t +! #endif ! ! #include ! #define read _read @@ -203,3 +205,14 @@ /* If we get a non-2xx response back here, we wipe the value for * each of the properties in this propstat, so the caller knows to * look at the status instead. It's annoying, since for each prop +--- misc/build/neon-0.23.5/src/ne_utils.h.orig 2002-08-18 21:48:48.000000000 +0900 ++++ misc/build/neon-0.23.5/src/ne_utils.h 2004-01-04 01:40:58.000000000 +0900 +@@ -58,7 +58,7 @@ + #define ne_vsnprintf vsnprintf + #endif + +-#ifndef WIN32 ++#if !defined(WIN32) || defined(__MINGW32__) + #undef min + #define min(a,b) ((a)<(b)?(a):(b)) + #endif --- oo_1.1.1_src/neon/prj/d.lst.orig 2002-01-23 22:33:44.000000000 +0900 +++ oo_1.1.1_src/neon/prj/d.lst 2004-03-29 12:17:38.000000000 +0900 @@ -3,3 +3,4 @@ ..\%__SRC%\inc\*.h %_DEST%\inc%_EXT%\external\neon\*.h ..\%__SRC%\slb\neon.lib %_DEST%\lib%_EXT%\neon.lib ..\%__SRC%\lib\libneon.a %_DEST%\lib%_EXT%\libneon.a +..\%__SRC%\lib\libneon_static.a %_DEST%\lib%_EXT%\libneon_static.a --- oo_1.1.1_src/np_sdk/mozilla-source-M16-stub.patch.orig 2002-10-21 23:27:08.000000000 +0900 +++ oo_1.1.1_src/np_sdk/mozilla-source-M16-stub.patch 2004-03-29 12:17:38.000000000 +0900 @@ -2212,7 +2212,7 @@ ! # endif ! #elif defined(XP_PC) || defined(_WINDOWS) || defined(WIN32) || defined(_WIN32) # include - # if defined(_MSC_VER) +! # if defined(_MSC_VER) # if defined(WIN32) || defined(_WIN32) # define JRI_PUBLIC_API(ResultType) _declspec(dllexport) ResultType - # define JRI_PUBLIC_VAR(VarType) VarType @@ -2243,7 +2243,7 @@ /* PC */ ! #if defined(XP_PC) || defined(_WINDOWS) || defined(WIN32) || defined(_WIN32) # include - # if defined(_MSC_VER) +! # if defined(_MSC_VER) || defined(__MINGW32__) # if defined(WIN32) || defined(_WIN32) # define JRI_PUBLIC_API(ResultType) _declspec(dllexport) ResultType # define JRI_CALLBACK --- oo_1.1.1_src/odk/prj/d.lst.orig 2004-01-28 21:59:22.000000000 +0900 +++ oo_1.1.1_src/odk/prj/d.lst 2004-03-29 12:17:38.000000000 +0900 @@ -5,6 +5,7 @@ ..\%__SRC%\bin\officebean.dll %_DEST%\bin%_EXT%\officebean.dll ..\%__SRC%\lib\libofficebean.so %_DEST%\lib%_EXT%\libofficebean.so +..\%__SRC%\lib\libofficebean.a %_DEST%\lib%_EXT%\libofficebean.a ..\%__SRC%\lib\*officebean.dylib %_DEST%\lib%_EXT%\*officebean.dylib dos: sh -c "if test %OS% = MACOSX; then create-bundle %_DEST%\lib%_EXT%\*.dylib; fi" --- oo_1.1.1_src/offmgr/prj/d.lst.orig 2004-01-10 03:10:08.000000000 +0900 +++ oo_1.1.1_src/offmgr/prj/d.lst 2004-03-29 12:17:38.000000000 +0900 @@ -6,6 +6,7 @@ touch: ..\%__SRC%\misc\ofa.hid %_DEST%\bin%_EXT%\ofa.hid ..\%__SRC%\lib\_ofa.lib %_DEST%\lib%_EXT%\aofa.lib ..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT% +..\%__SRC%\lib\lib*.a %_DEST%\lib%_EXT% ..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib ..\%__SRC%\slb\ofa.lib %_DEST%\lib%_EXT%\xofa.lib ..\%__SRC%\inc\class.lst %_DEST%\inc%_EXT%\class.lst --- oo_1.1.1_src/package/prj/d.lst.orig 2003-05-28 00:54:30.000000000 +0900 +++ oo_1.1.1_src/package/prj/d.lst 2004-03-29 12:17:38.000000000 +0900 @@ -1,5 +1,6 @@ ..\%__SRC%\misc\*.map %_DEST%\bin%_EXT%\*.map ..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*.dll ..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%\lib*.so +..\%__SRC%\lib\lib*.a %_DEST%\lib%_EXT%\lib*.a ..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib ..\dtd\*.dtd %_DEST%\bin%_EXT%\*.* --- oo_1.1.1_src/padmin/prj/d.lst.orig 2002-08-28 21:39:28.000000000 +0900 +++ oo_1.1.1_src/padmin/prj/d.lst 2004-03-29 12:17:38.000000000 +0900 @@ -1,4 +1,5 @@ ..\%__SRC%\bin\*.res %_DEST%\bin%_EXT%\*.res ..\%__SRC%\bin\*.bin %_DEST%\bin%_EXT%\*.bin ..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%\lib*.so +..\%__SRC%\lib\lib*.a %_DEST%\lib%_EXT%\lib*.a ..\%__SRC%\lib\lib*.dylib %_DEST%\lib%_EXT%\lib*.dylib --- oo_1.1.1_src/psprint/prj/d.lst.orig 2003-06-02 18:17:12.000000000 +0900 +++ oo_1.1.1_src/psprint/prj/d.lst 2004-03-29 12:17:38.000000000 +0900 @@ -1,6 +1,8 @@ mkdir: %_DEST%\inc%_EXT%\psprint +..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*.dll ..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT% +..\%__SRC%\lib\lib*.a %_DEST%\lib%_EXT% ..\%__SRC%\slb\apsp.lib %_DEST%\lib%_EXT%\apsp.lib ..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib --- oo_1.1.1_src/psprint/util/libpsp_mingw.map.orig 2001-05-28 23:48:40.000000000 +0900 +++ oo_1.1.1_src/psprint/util/libpsp_mingw.map 2004-03-29 12:17:38.000000000 +0900 @@ -1,6 +1,12 @@ LIBPSPRINT_1_0 { global: *psp*; + OpenTTFont; + MapChar; + GetTTGlobalFontInfo; + GetTTSimpleGlyphMetrics; + CreateTTFromTTGlyphs; + CloseTTFont; local: *; }; --- oo_1.1.1_src/python/Python-2.2.2.patch.orig 2004-01-28 21:02:14.000000000 +0900 +++ oo_1.1.1_src/python/Python-2.2.2.patch 2004-03-29 12:17:38.000000000 +0900 @@ -82,10 +82,37 @@ #else #ifndef HAVE_GETTIMEOFDAY *** misc/Python-2.2.2/Modules/posixmodule.c Fri Aug 23 18:27:40 2002 ---- misc/build/Python-2.2.2/Modules/posixmodule.c Fri Oct 10 12:42:16 2003 +--- misc/build/Python-2.2.2/Modules/posixmodule.c Sat Mar 20 00:33:20 2004 +*************** +*** 48,53 **** +--- 48,61 ---- + + /* Various compilers have only certain posix functions */ + /* XXX Gosh I wish these were all moved into pyconfig.h */ ++ #ifdef __MINGW32__ ++ #define HAVE_EXECV 1 ++ #define HAVE_GETCWD 1 ++ #define HAVE_OPENDIR 1 ++ #define HAVE_PIPE 1 ++ #define HAVE_POPEN 1 ++ #define HAVE_SYSTEM 1 ++ #else + #if defined(PYCC_VACPP) && defined(PYOS_OS2) + #include + #else +*************** +*** 104,109 **** +--- 112,118 ---- + #endif /* __BORLANDC__ */ + #endif /* ! __WATCOMC__ || __QNX__ */ + #endif /* ! __IBMC__ */ ++ #endif /* ! __MINGW32__ */ + + #ifndef _MSC_VER + *************** *** 271,276 **** ---- 271,279 ---- +--- 280,288 ---- # define STRUCT_STAT struct stat #endif @@ -97,7 +124,7 @@ *************** *** 281,288 **** ---- 284,297 ---- +--- 293,306 ---- static PyObject * convertenviron(void) { @@ -112,6 +139,71 @@ 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 *************** @@ -1714,12 +1806,54 @@ #endif /* USE_DYLD */ *** misc/Python-2.2.2/configure Thu Oct 10 17:26:41 2002 ---- misc/build/Python-2.2.2/configure Fri Oct 10 12:44:57 2003 +--- misc/build/Python-2.2.2/configure Sat Mar 20 00:31:00 2004 *************** -*** 1454,1459 **** ---- 1454,1462 ---- +*** 665,670 **** +--- 665,676 ---- + fi + echo "$ac_t""$MACHDEP" 1>&6 + ++ case $MACHDEP in ++ cygwin*) ++ VERSION=`echo $VERSION|tr -d .` ++ ;; ++ esac ++ + # checks for alternative programs + echo $ac_n "checking for --without-gcc""... $ac_c" 1>&6 + echo "configure:671: checking for --without-gcc" >&5 +*************** +*** 1380,1386 **** + echo "configure:1381: checking LIBRARY" >&5 + if test -z "$LIBRARY" + then +! LIBRARY='libpython$(VERSION).a' + fi + echo "$ac_t""$LIBRARY" 1>&6 + +--- 1386,1392 ---- + echo "configure:1381: checking LIBRARY" >&5 + if test -z "$LIBRARY" + then +! LIBRARY='libpython$(VERSION).a' + fi + echo "$ac_t""$LIBRARY" 1>&6 + +*************** +*** 1452,1459 **** + ;; + cygwin*) LDLIBRARY='libpython$(VERSION).dll.a' - DLLLIBRARY='libpython$(VERSION).dll' +! DLLLIBRARY='libpython$(VERSION).dll' + ;; + esac + + # MacOSX framework builds need more magic. LDLIBRARY is the dynamic +--- 1458,1468 ---- + ;; + cygwin*) + LDLIBRARY='libpython$(VERSION).dll.a' +! DLLLIBRARY='python$(VERSION).dll' ;; + darwin*) + LDLIBRARY='libpython$(VERSION).dylib' @@ -1736,7 +1870,7 @@ esac fi ---- 1699,1721 ---- +--- 1705,1727 ---- esac case $ac_sys_system in Darwin*) @@ -1751,8 +1885,8 @@ ! OPT="$OPT -fPIC";; ! sparc64*) ! OPT="$OPT -fPIC";; -! x86_64*) -! OPT="$OPT -fPIC";; +! x86_64*) +! OPT="$OPT -fPIC";; ! *) ! OPT="$OPT";; ! esac @@ -1771,7 +1905,7 @@ LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -compatibility_version $(VERSION) -current_version $(VERSION)';; esac ---- 3117,3125 ---- +--- 3125,3133 ---- LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -compatibility_version $(VERSION) -current_version $(VERSION)';; Darwin/*) ns_undef_sym='_environ' @@ -1783,7 +1917,7 @@ *************** *** 3159,3164 **** ---- 3176,3182 ---- +--- 3184,3190 ---- case $ac_sys_system in hp*|HP*) SO=.sl;; CYGWIN*) SO=.dll;; @@ -1807,7 +1941,7 @@ fi ;; Linux*) LDSHARED='$(CC) -shared';; dgux*) LDSHARED="ld -G";; ---- 3219,3233 ---- +--- 3227,3241 ---- LDSHARED="$LDSHARED -undefined suppress" fi ;; Darwin/*) @@ -1836,7 +1970,7 @@ OpenUNIX*|UnixWare*) if test "$GCC" = "yes" then LDSHARED="$(CC) -shared" ---- 3235,3245 ---- +--- 3243,3253 ---- OpenBSD*|FreeBSD*) if [ "`$CC -dM -E - &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 ++ 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 <&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 *************** @@ -1867,3 +2156,226 @@ 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 ++++ misc/build/Python-2.2.2/Python/thread_pthread.h 2003-10-15 22:32:48.000000000 +0900 +@@ -176,8 +176,10 @@ + * thread. This causes the new thread to start with all signals + * blocked. + */ ++#ifndef __MINGW32__ + sigfillset(&newmask); + SET_THREAD_SIGMASK(SIG_BLOCK, &newmask, &oldmask); ++#endif + + success = pthread_create(&th, + #if defined(PY_PTHREAD_D4) +@@ -204,7 +206,9 @@ + ); + + /* Restore signal mask for original thread */ ++#ifndef __MINGW32__ + SET_THREAD_SIGMASK(SIG_SETMASK, &oldmask, NULL); ++#endif + + #if defined(THREAD_STACK_SIZE) || defined(PTHREAD_SYSTEM_SCHED_SUPPORTED) + pthread_attr_destroy(&attrs); +--- misc/build/Python-2.2.2/Include/osdefs.h.orig 2001-03-02 15:10:18.000000000 +0900 ++++ misc/build/Python-2.2.2/Include/osdefs.h 2003-10-26 11:04:14.000000000 +0900 +@@ -16,7 +16,7 @@ + + /* Mod by chrish: QNX has WATCOM, but isn't DOS */ + #if !defined(__QNX__) +-#if defined(MS_WINDOWS) || defined(__BORLANDC__) || defined(__WATCOMC__) || defined(__DJGPP__) || defined(PYOS_OS2) ++#if defined(MS_WINDOWS) || defined(__BORLANDC__) || defined(__WATCOMC__) || defined(__DJGPP__) || defined(PYOS_OS2) || defined(__MINGW32__) + #define SEP '\\' + #define ALTSEP '/' + #define MAXPATHLEN 256 +--- misc/build/Python-2.2.2/Modules/getpath.c.orig 2002-09-13 23:40:50.000000000 +0900 ++++ misc/build/Python-2.2.2/Modules/getpath.c 2003-10-26 23:59:50.000000000 +0900 +@@ -10,6 +10,10 @@ + #include + #endif + ++#ifdef __MINGW32__ ++#include ++#endif ++ + /* Search in some common locations for the associated Python libraries. + * + * Two directories must be found, the platform independent directory +@@ -195,13 +199,17 @@ + joinpath(char *buffer, char *stuff) + { + size_t n, k; ++#ifndef __MINGW32__ + if (stuff[0] == SEP) + n = 0; + else { ++#endif + n = strlen(buffer); + if (n > 0 && buffer[n-1] != SEP && n < MAXPATHLEN) + buffer[n++] = SEP; ++#ifndef __MINGW32__ + } ++#endif + k = strlen(stuff); + if (n + k > MAXPATHLEN) + k = MAXPATHLEN - n; +@@ -214,13 +222,21 @@ + static void + copy_absolute(char *path, char *p) + { ++#ifdef __MINGW32__ ++ if (strlen(path) > 2 && path[1] == ':' && path[2] == SEP) ++#else + if (p[0] == SEP) ++#endif + strcpy(path, p); + else { ++#ifdef __MINGW32__ ++ GetFullPathName(path, MAXPATHLEN, path, NULL); ++#else + getcwd(path, MAXPATHLEN); + if (p[0] == '.' && p[1] == SEP) + p += 2; + joinpath(path, p); ++#endif + } + } + +@@ -230,8 +246,13 @@ + { + char buffer[MAXPATHLEN + 1]; + ++#ifdef __MINGW32__ ++ if (strlen(path) > 2 && path[1] == ':' && path[2] == SEP) ++ return; ++#else + if (path[0] == SEP) + return; ++#endif + copy_absolute(buffer, path); + strcpy(path, buffer); + } +@@ -502,7 +523,11 @@ + prefixsz = strlen(prefix) + 1; + + while (1) { ++#ifdef __MINGW32__ ++ char *delim = strchr(defpath, ':'); ++#else + char *delim = strchr(defpath, DELIM); ++#endif + + if (defpath[0] != SEP) + /* Paths are relative to prefix */ +@@ -542,7 +567,11 @@ + */ + defpath = pythonpath; + while (1) { ++#ifdef __MINGW32__ ++ char *delim = strchr(defpath, ':'); ++#else + char *delim = strchr(defpath, DELIM); ++#endif + + if (defpath[0] != SEP) { + strcat(buf, prefix); +@@ -552,7 +581,12 @@ + if (delim) { + size_t len = delim - defpath + 1; + size_t end = strlen(buf) + len; ++#ifdef __MINGW32__ ++ strncat(buf, defpath, len-1); ++ *(buf + end-1) = DELIM; ++#else + strncat(buf, defpath, len); ++#endif + *(buf + end) = '\0'; + } + else { +--- misc/build/Python-2.2.2/Modules/config.c.in.orig 2001-08-30 09:12:32.000000000 +0900 ++++ misc/build/Python-2.2.2/Modules/config.c.in 2003-10-26 20:06:10.000000000 +0900 +@@ -39,6 +39,9 @@ + {"__builtin__", NULL}, + {"sys", NULL}, + {"exceptions", NULL}, ++#ifdef __MINGW32__ ++ {"mingw32", NULL}, ++#endif + + #ifdef WITH_CYCLE_GC + /* This lives in gcmodule.c */ +--- misc/build/Python-2.2.2/Lib/os.py.orig 2002-09-07 13:49:10.000000000 +0900 ++++ misc/build/Python-2.2.2/Lib/os.py 2003-10-26 22:07:10.000000000 +0900 +@@ -37,7 +37,25 @@ + except AttributeError: + return [n for n in dir(module) if n[0] != '_'] + +-if 'posix' in _names: ++if 'mingw32' in _names: ++ name = 'posix' ++ linesep = '\r\n' ++ curdir = '.'; pardir = '..'; sep = '\\'; pathsep = ';' ++ defpath = '.' ++ from posix import * ++ try: ++ from posix import _exit ++ except ImportError: ++ pass ++ import ntpath ++ path = ntpath ++ del ntpath ++ ++ import posix ++ __all__.extend(_get_exports_list(posix)) ++ del posix ++ ++elif 'posix' in _names: + name = 'posix' + linesep = '\n' + curdir = '.'; pardir = '..'; sep = '/'; pathsep = ':' +--- misc/build/Python-2.2.2/Lib/site.py.orig 2002-10-06 12:52:44.000000000 +0900 ++++ misc/build/Python-2.2.2/Lib/site.py 2003-10-26 23:29:36.000000000 +0900 +@@ -165,7 +165,7 @@ + prefixes.append(sys.exec_prefix) + for prefix in prefixes: + if prefix: +- if os.sep == '/': ++ if os.name == "posix": + sitedirs = [os.path.join(prefix, + "lib", + "python" + sys.version[:3], +--- misc/build/Python-2.2.2/Lib/distutils/spawn.py.orig 2001-12-07 05:51:36.000000000 +0900 ++++ misc/build/Python-2.2.2/Lib/distutils/spawn.py 2003-10-27 06:03:52.000000000 +0900 +@@ -34,9 +34,10 @@ + Raise DistutilsExecError if running the program fails in any way; just + return on success. + """ +- if os.name == 'posix': ++ from os import _exists ++ if _exists("fork"): + _spawn_posix(cmd, search_path, verbose, dry_run) +- elif os.name == 'nt': ++ elif _exists("spawnv"): + _spawn_nt(cmd, search_path, verbose, dry_run) + else: + raise DistutilsPlatformError, \ +--- misc/build/Python-2.2.2/Python/fileblocks.c.orig 2003-11-02 16:29:14.000000000 +0900 ++++ misc/build/Python-2.2.2/Python/fileblocks.c 2003-11-02 16:46:58.000000000 +0900 +@@ -1 +0,0 @@ +-dummy --- oo_1.1.1_src/python/prj/d.lst.orig 2003-07-17 02:34:28.000000000 +0900 +++ oo_1.1.1_src/python/prj/d.lst 2004-03-29 12:17:38.000000000 +0900 @@ -53,6 +53,12 @@ ..\%__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 --- oo_1.1.1_src/pyuno/prj/d.lst.orig 2003-08-15 21:36:14.000000000 +0900 +++ oo_1.1.1_src/pyuno/prj/d.lst 2004-03-29 12:17:38.000000000 +0900 @@ -1,8 +1,11 @@ ..\%__SRC%\lib\libpyuno.so %_DEST%\lib%_EXT%\libpyuno.so +..\%__SRC%\lib\libpyuno.a %_DEST%\lib%_EXT%\libpyuno.a ..\%__SRC%\lib\libpyuno.dylib %_DEST%\lib%_EXT%\libpyuno.dylib ..\%__SRC%\lib\pyuno.so %_DEST%\lib%_EXT%\pyuno.so +..\%__SRC%\lib\pyuno.a %_DEST%\lib%_EXT%\pyuno.a ..\%__SRC%\lib\pyuno.dylib %_DEST%\lib%_EXT%\pyuno.dylib ..\%__SRC%\lib\pythonloader.uno.so %_DEST%\lib%_EXT%\pythonloader.uno.so +..\%__SRC%\lib\pythonloader.uno.a %_DEST%\lib%_EXT%\pythonloader.uno.a ..\%__SRC%\lib\pythonloader.uno.dylib %_DEST%\lib%_EXT%\pythonloader.uno.dylib ..\%__SRC%\lib\unohelper.py %_DEST%\lib%_EXT%\unohelper.py ..\%__SRC%\lib\pythonloader.py %_DEST%\lib%_EXT%\pythonloader.py --- oo_1.1.1_src/readlicense_oo/prj/d.lst.orig 2004-01-10 03:10:10.000000000 +0900 +++ oo_1.1.1_src/readlicense_oo/prj/d.lst 2004-03-29 12:17:38.000000000 +0900 @@ -276,3 +276,4 @@ ..\%__SRC%\misc\99\readme99.html %_DEST%\bin%_EXT%\99\osl\README99.html ..\%__SRC%\misc\THIRDPARTYLICENSEREADME.html %_DEST%\bin%_EXT%\THIRDPARTYLICENSEREADME.html +..\%__SRC%\misc\InstGuide_11_win.pdf %_DEST%\bin%_EXT%\InstGuide_11_win.pdf --- oo_1.1.1_src/regexp/prj/d.lst.orig 2004-01-29 00:53:52.000000000 +0900 +++ oo_1.1.1_src/regexp/prj/d.lst 2004-03-29 12:17:38.000000000 +0900 @@ -4,6 +4,7 @@ ..\%__SRC%\bin\i18nregexp*.dll %_DEST%\bin%_EXT%\i18nregexp*.dll ..\%__SRC%\lib\libi18nregexp*.so %_DEST%\lib%_EXT%\libi18nregexp*.so +..\%__SRC%\lib\libi18nregexp*.a %_DEST%\lib%_EXT%\libi18nregexp*.a ..\%__SRC%\lib\libi18nregexp*.dylib %_DEST%\lib%_EXT%\libi18nregexp*.dylib ..\%__SRC%\lib\ii18nregexp.lib %_DEST%\lib%_EXT%\ii18nregexp.lib --- oo_1.1.1_src/registry/prj/d.lst.orig 2002-08-13 20:48:08.000000000 +0900 +++ oo_1.1.1_src/registry/prj/d.lst 2004-03-29 12:17:38.000000000 +0900 @@ -8,6 +8,7 @@ ..\%__SRC%\lib\libreg*.so.* %_DEST%\lib%_EXT%\libreg*.so.* ..\%__SRC%\lib\librgt*.so %_DEST%\lib%_EXT%\librgt*.so ..\%__SRC%\bin\reg*.dll %_DEST%\bin%_EXT%\reg*.dll +..\%__SRC%\lib\libreg*.a %_DEST%\lib%_EXT%\libreg*.a ..\%__SRC%\lib\libreg*.dylib %_DEST%\lib%_EXT%\libreg*.dylib ..\%__SRC%\lib\libreg*.dylib.* %_DEST%\lib%_EXT%\libreg*.dylib.* --- oo_1.1.1_src/registry/source/regimpl.cxx.orig 2003-08-15 20:35:26.000000000 +0900 +++ oo_1.1.1_src/registry/source/regimpl.cxx 2004-03-29 12:17:38.000000000 +0900 @@ -68,6 +68,9 @@ #ifdef UNX #include #endif +#ifdef __MINGW32__ +#include +#endif #ifdef MACOSX // Get the store.hxx inlines non-inline, solves crashes in cppumaker --- oo_1.1.1_src/registry/tools/checksingleton.cxx.orig 2003-03-27 00:37:48.000000000 +0900 +++ oo_1.1.1_src/registry/tools/checksingleton.cxx 2004-03-29 12:17:38.000000000 +0900 @@ -431,7 +431,7 @@ return bRet; } -#if (defined UNX) || (defined OS2) +#if (defined UNX) || (defined OS2) || (defined __MINGW32__) int main( int argc, char * argv[] ) #else --- oo_1.1.1_src/registry/tools/regcompare.cxx.orig 2002-11-27 23:19:38.000000000 +0900 +++ oo_1.1.1_src/registry/tools/regcompare.cxx 2004-03-29 12:17:38.000000000 +0900 @@ -2102,7 +2102,7 @@ return nError; } -#if (defined UNX) || (defined OS2) +#if (defined UNX) || (defined OS2) || defined __MINGW32__ int main( int argc, char * argv[] ) #else --- oo_1.1.1_src/remotebridges/prj/d.lst.orig 2004-01-29 00:12:52.000000000 +0900 +++ oo_1.1.1_src/remotebridges/prj/d.lst 2004-03-29 12:17:38.000000000 +0900 @@ -5,6 +5,7 @@ ..\source\dynamicloader\dynamicloader.xml %_DEST%\xml%_EXT%\dynamicloader.uno.xml ..\source\unourl_resolver\uuresolver.xml %_DEST%\xml%_EXT%\uuresolver.uno.xml ..\%__SRC%\lib\*.so %_DEST%\lib%_EXT%\* +..\%__SRC%\lib\*.a %_DEST%\lib%_EXT%\* ..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\* dos: sh -c "if test %OS% = MACOSX; then create-bundle %_DEST%\lib%_EXT%\*.dylib; fi" --- oo_1.1.1_src/rsc/source/prj/gui.cxx.orig 2003-04-16 00:55:14.000000000 +0900 +++ oo_1.1.1_src/rsc/source/prj/gui.cxx 2004-03-29 12:17:38.000000000 +0900 @@ -80,7 +80,7 @@ /* */ /* Description : Gibt die Temporaeren Dateien frei. */ /****************************************************************/ -#if defined( UNX ) || ( defined( PM2 ) && ( defined( TCPP ) || defined ( GCC )) ) || defined( MAC ) || defined (WTC) || defined (MTW) +#if defined( UNX ) || ( defined( PM2 ) && ( defined( TCPP ) || defined ( GCC )) ) || defined( MAC ) || defined (WTC) || defined (MTW) || defined(__MINGW32__) void ExitProgram( void ){ #else #if defined( CSET ) @@ -105,7 +105,7 @@ } -#if defined( UNX ) || defined( MAC ) || ( defined( PM2 ) && ( defined( CSET ) || defined ( GCC ))) || defined (WTC) || defined(ICC) +#if defined( UNX ) || defined( MAC ) || ( defined( PM2 ) && ( defined( CSET ) || defined ( GCC ))) || defined (WTC) || defined(ICC) || defined(__MINGW32__) int main ( int argc, char ** argv) { #else #if defined( MTW ) --- oo_1.1.1_src/rsc/source/prj/start.cxx.orig 2001-11-05 23:44:06.000000000 +0900 +++ oo_1.1.1_src/rsc/source/prj/start.cxx 2004-03-29 12:17:38.000000000 +0900 @@ -302,7 +302,7 @@ |* Letzte Aenderung MM 05.09.91 |* *************************************************************************/ -#if defined UNX || (defined PM2 && (defined CSET || defined GCC )) || defined WTC || defined MTW || defined ICC +#if defined UNX || (defined PM2 && (defined CSET || defined GCC )) || defined WTC || defined MTW || defined ICC || defined(__MINGW32__) int main ( int argc, char ** argv) { #else --- oo_1.1.1_src/rsc/source/tools/rsctools.cxx.orig 2002-08-16 01:18:44.000000000 +0900 +++ oo_1.1.1_src/rsc/source/tools/rsctools.cxx 2004-03-29 12:17:38.000000000 +0900 @@ -165,6 +165,8 @@ return ByteString( tmpnam( NULL ) ); #elif MACOSX return ByteString( macxp_tempnam( NULL, NULL ) ); +#elif defined(__MINGW32__) + return ByteString( tempnam( (const char *) _P_tmpdir, NULL ) ); #else return ByteString( tempnam( (const char *) P_tmpdir, NULL ) ); #endif --- oo_1.1.1_src/sablot/Sablot-0.52.patch.orig 2003-08-05 18:41:12.000000000 +0900 +++ oo_1.1.1_src/sablot/Sablot-0.52.patch 2004-03-29 12:17:38.000000000 +0900 @@ -3,7 +3,7 @@ *************** *** 1 **** ! dummy ---- 1,163 ---- +--- 1,165 ---- ! #************************************************************************* ! # ! # $RCSfile: makefile.mk,v $ @@ -78,8 +78,10 @@ ! .INCLUDE: settings.mk ! ! .IF "$(GUI)"=="WNT" +! .IF "$(COM)"!="GCC" ! CFLAGS+=-GR ! .ENDIF +! .ENDIF ! ! .IF "$(OS)"=="SOLARIS" ! CFLAGS+= -DHAVE_IEEEFP_H -DHAVE_UNISTD_H --- oo_1.1.1_src/sablot/prj/d.lst.orig 2001-08-21 20:00:28.000000000 +0900 +++ oo_1.1.1_src/sablot/prj/d.lst 2004-03-29 12:17:38.000000000 +0900 @@ -5,4 +5,5 @@ ..\%__SRC%\slb\sablot.lib %_DEST%\lib%_EXT%\sablot.lib ..\%__SRC%\lib\libsablot.a %_DEST%\lib%_EXT%\libsablot.a +..\%__SRC%\lib\libsablot_static.a %_DEST%\lib%_EXT%\libsablot_static.a --- oo_1.1.1_src/sal/inc/sal/config.h.orig 2003-06-12 18:46:08.000000000 +0900 +++ oo_1.1.1_src/sal/inc/sal/config.h 2004-03-29 12:17:38.000000000 +0900 @@ -99,12 +99,16 @@ #endif #endif /* defined _MSC_VER < 1300 */ +#endif /* defined _MSC_VER */ + /* Provide ISO C99 compatible versions of snprint and vsnprintf */ +#ifdef __MINGW32__ +#define _SNPRINTF_DLLIMPORT +#endif #ifndef _SNPRINTF_H #include #endif -#endif /* defined _MSC_VER */ #endif /* defined WIN32 */ /* BR: 16bit fuer Borland-Compiler */ --- oo_1.1.1_src/sal/inc/sal/types.h.orig 2003-03-27 01:45:58.000000000 +0900 +++ oo_1.1.1_src/sal/inc/sal/types.h 2004-03-29 12:17:38.000000000 +0900 @@ -95,7 +95,7 @@ typedef char sal_Char; typedef signed char sal_sChar; typedef unsigned char sal_uChar; -#if defined(SAL_W32) +#if defined(SAL_W32) && !defined(__MINGW32__) typedef wchar_t sal_Unicode; #else #define SAL_UNICODE_NOTEQUAL_WCHAR_T @@ -111,10 +111,15 @@ #define SAL_MAX_ENUM 0x7fff #endif -#ifdef _MSC_VER +#if defined(_MSC_VER) || defined(__MINGW32__) # define SAL_DLLEXPORT __declspec(dllexport) +#if defined(_MSC_VER) # define SAL_CALL __cdecl # define SAL_CALL_ELLIPSE __cdecl +#else +# define SAL_CALL +# define SAL_CALL_ELLIPSE +#endif #elif defined SAL_OS2 # define SAL_DLLEXPORT # define SAL_CALL @@ -135,7 +140,7 @@ This hinders the compiler from setting a generic vtable stating that a pure virtual function was called and thus slightly reduces code size. */ -#ifdef _MSC_VER +#if defined(_MSC_VER) || !defined(__MINGW32__) #define SAL_NO_VTABLE __declspec(novtable) #else #define SAL_NO_VTABLE --- oo_1.1.1_src/sal/inc/systools/win32/uwinapi.h.orig 2003-03-27 01:46:00.000000000 +0900 +++ oo_1.1.1_src/sal/inc/systools/win32/uwinapi.h 2004-03-29 12:17:38.000000000 +0900 @@ -71,6 +71,13 @@ # include #endif +#ifdef __MINGW32__ +#include +#ifdef _UWINAPI_ +#define WINBASEAPI +#endif +#endif + /** GetUserDomain The GetUserDomain function retrieves the name of the NT domain the user is --- oo_1.1.1_src/sal/osl/w32/dllentry.c.orig 2004-01-10 03:31:48.000000000 +0900 +++ oo_1.1.1_src/sal/osl/w32/dllentry.c 2004-03-29 12:17:36.000000000 +0900 @@ -85,6 +85,17 @@ extern void SAL_CALL ___rtl_memory_init (void); extern void SAL_CALL ___rtl_memory_fini (void); +#ifdef __MINGW32__ + +typedef void (*func_ptr) (void); +extern func_ptr __CTOR_LIST__[]; +extern func_ptr __DTOR_LIST__[]; + +static void do_startup(void); +static void do_cleanup(void); + +#else + /* This is needed because DllMain is called after static constructors. A DLL's startup and shutdown sequence looks like this: @@ -99,10 +110,11 @@ */ - static BOOL WINAPI _RawDllMain( HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved ); extern BOOL (WINAPI *_pRawDllMain)(HANDLE, DWORD, LPVOID) = _RawDllMain; +#endif + //------------------------------------------------------------------------------ // defines //------------------------------------------------------------------------------ @@ -179,12 +191,78 @@ // DllMain //------------------------------------------------------------------------------ +#ifdef __MINGW32__ + +void +__do_global_dtors (void) +{ + static func_ptr *p = __DTOR_LIST__ + 1; + + /* + * Call each destructor in the destructor list until a null pointer + * is encountered. + */ + while (*p) + { + (*(p)) (); + p++; + } +} + +void +__do_global_ctors (void) +{ + unsigned long nptrs = (unsigned long) __CTOR_LIST__[0]; + unsigned i; + + /* + * If the first entry in the constructor list is -1 then the list + * is terminated with a null entry. Otherwise the first entry was + * the number of pointers in the list. + */ + if (nptrs == -1) + { + for (nptrs = 0; __CTOR_LIST__[nptrs + 1] != 0; nptrs++) + ; + } + + /* + * Go through the list backwards calling constructors. + */ + for (i = nptrs; i >= 1; i--) + { + __CTOR_LIST__[i] (); + } + + /* + * Register the destructors for processing on exit. + */ + atexit (__do_global_dtors); +} + +static int initialized = 0; + +void +__main (void) +{ + if (!initialized) + { + initialized = 1; + do_startup(); + __do_global_ctors (); + } +} + +static void do_startup( void ) +{ +#else static BOOL WINAPI _RawDllMain( HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved ) { switch (fdwReason) { case DLL_PROCESS_ATTACH: { +#endif OSVERSIONINFO aInfo; WSADATA wsaData; int error; @@ -252,11 +330,18 @@ //We disable floating point exceptions. This is the usual state at program startup //but on Windows 98 and ME this is not always the case. _control87(_MCW_EM, _MCW_EM); +#ifdef __MINGW32__ + atexit(do_cleanup); +} +void do_cleanup( void ) +{ +#else break; } case DLL_PROCESS_DETACH: +#endif WSACleanup( ); if ( lpArgvW ) @@ -271,10 +356,12 @@ /* finalize memory management */ ___rtl_memory_fini(); +#ifndef __MINGW32__ break; } return TRUE; +#endif } BOOL WINAPI DllMain( HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved ) --- oo_1.1.1_src/sal/osl/w32/fileimpl.cxx.orig 2003-05-13 21:28:36.000000000 +0900 +++ oo_1.1.1_src/sal/osl/w32/fileimpl.cxx 2004-03-29 12:17:38.000000000 +0900 @@ -137,11 +137,19 @@ //################################################################## // simply checking if this path starts with '\\' +#ifdef __MINGW32__ + const wchar_t* UNC_PREFIX = L"\\\\"; + + bool is_UNC_path(const rtl::OUString& path) + { + return (0 == wcsncmp(UNC_PREFIX, reinterpret_cast< const wchar_t * >(path.getStr()), wcslen(UNC_PREFIX))); +#else const sal_Unicode* UNC_PREFIX = L"\\\\"; bool is_UNC_path(const rtl::OUString& path) - { + { return (0 == wcsncmp(UNC_PREFIX, path.getStr(), wcslen(UNC_PREFIX))); +#endif } //################################################################## @@ -189,13 +197,20 @@ if (!is_floppy_drive(p)) { +#ifdef __MINGW32__ + DWORD fattr = GetFileAttributes(reinterpret_cast< const wchar_t * >(p.getStr())); +#else DWORD fattr = GetFileAttributes(p.getStr()); - +#endif if ((INVALID_FILE_ATTRIBUTES != fattr) && (FILE_ATTRIBUTE_REPARSE_POINT & fattr)) { WIN32_FIND_DATA find_data; +#ifdef __MINGW32__ + HANDLE h_find = FindFirstFile(reinterpret_cast< const wchar_t * >(p.getStr()), &find_data); +#else HANDLE h_find = FindFirstFile(p.getStr(), &find_data); +#endif if (IsValidHandle(h_find) && (FILE_ATTRIBUTE_REPARSE_POINT & find_data.dwFileAttributes) && @@ -285,7 +300,11 @@ osl_systemPathEnsureSeparator(&p.pData); TCHAR vn[51]; +#ifdef __MINGW32__ + if (GetVolumeNameForVolumeMountPoint(reinterpret_cast< const wchar_t * >(p.getStr()), vn, ELEMENTS_OF_ARRAY(vn))) +#else if (GetVolumeNameForVolumeMountPoint(p.getStr(), vn, ELEMENTS_OF_ARRAY(vn))) +#endif { TCHAR vnfloppy[51]; if (is_floppy_A_present() && @@ -307,12 +326,21 @@ // for the drive letter alone is not sufficient // we must compare the unique volume name with // that of the available floppy disks +#ifdef __MINGW32__ + const wchar_t* FLOPPY_DRV_LETTERS = TEXT("AaBb"); + + bool is_floppy_drive(const rtl::OUString& path) + { + const wchar_t* pf = reinterpret_cast< const wchar_t * >(path.getStr()); + const wchar_t* ps = pf + 1; +#else const sal_Unicode* FLOPPY_DRV_LETTERS = TEXT("AaBb"); bool is_floppy_drive(const rtl::OUString& path) { const sal_Unicode* pf = path.getStr(); const sal_Unicode* ps = path.getStr() + 1; +#endif return ((wcschr(FLOPPY_DRV_LETTERS, *pf) && (L':' == *ps)) || is_floppy_volume_mount_point(path)); } @@ -327,7 +355,11 @@ osl_systemPathEnsureSeparator(&p.pData); TCHAR vn[51]; +#ifdef __MINGW32__ + if (GetVolumeNameForVolumeMountPoint(reinterpret_cast< const wchar_t * >(p.getStr()), vn, ELEMENTS_OF_ARRAY(vn))) +#else if (GetVolumeNameForVolumeMountPoint(p.getStr(), vn, ELEMENTS_OF_ARRAY(vn))) +#endif return GetDriveType(vn); return DRIVE_NO_ROOT_DIR; @@ -342,7 +374,11 @@ if (is_volume_mount_point(path)) drive_type = get_volume_mount_point_drive_type(path); else +#ifdef __MINGW32__ + drive_type = GetDriveType(reinterpret_cast< const wchar_t * >(path.getStr())); +#else drive_type = GetDriveType(path.getStr()); +#endif if (DRIVE_NO_ROOT_DIR == drive_type) return MapError(ERROR_INVALID_DRIVE); @@ -392,7 +428,11 @@ void get_volume_space_information(const rtl::OUString& path, oslVolumeInfo *pInfo) { BOOL ret = GetDiskFreeSpaceEx( +#ifdef __MINGW32__ + reinterpret_cast< const wchar_t * >(path.getStr()), +#else path.getStr(), +#endif (PULARGE_INTEGER)&pInfo->uFreeSpace, (PULARGE_INTEGER)&pInfo->uTotalSpace, NULL); @@ -443,7 +483,11 @@ DWORD mcl; DWORD flags; +#ifdef __MINGW32__ + if (GetVolumeInformation(reinterpret_cast(path.getStr()), vn, MAX_PATH, &serial, &mcl, &flags, fsn, MAX_PATH)) +#else if (GetVolumeInformation(path.getStr(), vn, MAX_PATH, &serial, &mcl, &flags, fsn, MAX_PATH)) +#endif { pInfo->uValidFields |= osl_VolumeInfo_Mask_MaxNameLength; pInfo->uMaxNameLength = mcl; @@ -452,7 +496,11 @@ pInfo->uMaxPathLength = MAX_PATH; pInfo->uValidFields |= osl_VolumeInfo_Mask_FileSystemName; +#ifdef __MINGW32__ + rtl_uString_newFromStr(&pInfo->ustrFileSystemName, reinterpret_cast(fsn)); +#else rtl_uString_newFromStr(&pInfo->ustrFileSystemName, fsn); +#endif // volumes (even NTFS) will always be considered case // insensitive because the Win32 API is not able to --- oo_1.1.1_src/sal/osl/w32/interlck.c.orig 2000-09-29 23:25:54.000000000 +0900 +++ oo_1.1.1_src/sal/osl/w32/interlck.c 2004-03-29 12:17:38.000000000 +0900 @@ -80,6 +80,16 @@ #ifdef _M_IX86 #pragma warning(disable: 4035) { +#ifdef __MINGW32__ + asm + ( + " movl %0, %%ecx\n" + " movl $1, %%eax\n" + " lock xadd %%eax, (%%ecx)\n" + " incl %%eax\n" + ::"m"(pCount) + ); +#else __asm { mov ecx, pCount @@ -87,6 +97,7 @@ lock xadd dword ptr [ecx],eax inc eax } +#endif } #pragma warning(default: 4035) #else @@ -103,6 +114,16 @@ #ifdef _M_IX86 #pragma warning(disable: 4035) { +#ifdef __MINGW32__ + asm + ( + " movl %0, %%ecx\n" + " movl $-1, %%eax\n" + " lock xadd %%eax, (%%ecx)\n" + " decl %%eax\n" + ::"m"(pCount) + ); +#else __asm { mov ecx, pCount @@ -110,6 +131,7 @@ lock xadd dword ptr [ecx],eax dec eax } +#endif } #pragma warning(default: 4035) #else --- oo_1.1.1_src/sal/osl/w32/path_helper.cxx.orig 2003-04-09 00:50:32.000000000 +0900 +++ oo_1.1.1_src/sal/osl/w32/path_helper.cxx 2004-03-29 12:17:38.000000000 +0900 @@ -132,18 +132,32 @@ ******************************************************************/ // is [A-Za-z]:[/|\]\0 +#ifdef __MINGW32__ +const wchar_t* LDP = L":"; +const wchar_t* LDP_WITH_BACKSLASH = L":\\"; +const wchar_t* LDP_WITH_SLASH = L":/"; +#else const sal_Unicode* LDP = L":"; const sal_Unicode* LDP_WITH_BACKSLASH = L":\\"; const sal_Unicode* LDP_WITH_SLASH = L":/"; +#endif // degenerated case returned by the Windows FileOpen dialog // when someone enters for instance "x:filename", the Win32 // API accepts this case +#ifdef __MINGW32__ +const wchar_t* LDP_WITH_DOT_BACKSLASH = L":.\\"; +#else const sal_Unicode* LDP_WITH_DOT_BACKSLASH = L":.\\"; +#endif sal_Int32 osl_systemPathIsLogicalDrivePattern(/*in*/ const rtl_uString* pustrPath) { +#ifdef __MINGW32__ + const wchar_t* p = reinterpret_cast< const wchar_t * >(rtl_uString_getStr(const_cast(pustrPath))); +#else const sal_Unicode* p = rtl_uString_getStr(const_cast(pustrPath)); +#endif if (iswalpha(*p++)) { return ((0 == wcscmp(p, LDP)) || --- oo_1.1.1_src/sal/osl/w32/signal.c.orig 2003-04-17 23:26:12.000000000 +0900 +++ oo_1.1.1_src/sal/osl/w32/signal.c 2004-03-29 12:17:38.000000000 +0900 @@ -66,7 +66,9 @@ #include #include #include +#ifndef __MINGW32__ #include +#endif #include #include --- oo_1.1.1_src/sal/osl/w32/socket.cxx.orig 2003-04-16 02:45:26.000000000 +0900 +++ oo_1.1.1_src/sal/osl/w32/socket.cxx 2004-03-29 12:17:38.000000000 +0900 @@ -1037,7 +1037,11 @@ /*****************************************************************************/ oslSocketResult SAL_CALL osl_getLocalHostname (rtl_uString **strLocalHostname) { +#ifdef __MINGW32__ + static wchar_t LocalHostname[256] = L""; +#else static sal_Unicode LocalHostname[256] = L""; +#endif if (wcslen(LocalHostname) == 0) { @@ -1059,7 +1063,11 @@ rtl_uString_release (hostName); if (pAddr && pAddr->pHostName) +#ifdef __MINGW32__ + wcscpy(LocalHostname, reinterpret_cast< wchar_t * >(pAddr->pHostName->buffer)); +#else wcscpy(LocalHostname, pAddr->pHostName->buffer); +#endif else memset(LocalHostname, 0, sizeof(LocalHostname)); @@ -1070,7 +1078,11 @@ if (wcslen(LocalHostname) > 0) { +#ifdef __MINGW32__ + rtl_uString_newFromStr (strLocalHostname, reinterpret_cast< sal_Unicode * >(LocalHostname)); +#else rtl_uString_newFromStr (strLocalHostname, LocalHostname); +#endif return osl_Socket_Ok; } @@ -1927,211 +1939,416 @@ switch(error = WSAGetLastError()) { case WSAENOTSOCK: +#ifdef __MINGW32__ + 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.")); +#else rtl_uString_newFromStr (strError, L"WSAENOTSOCK, Socket operation on non-socket. A socket created in one process is used by another process."); +#endif break; case WSAEDESTADDRREQ: +#ifdef __MINGW32__ + rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSAEDESTADDRREQ, Destination Addr required")); +#else rtl_uString_newFromStr (strError, L"WSAEDESTADDRREQ, Destination Addr required"); +#endif break; case WSAEMSGSIZE: +#ifdef __MINGW32__ + rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSAEMSGSIZE, Message too long")); +#else rtl_uString_newFromStr (strError, L"WSAEMSGSIZE, Message too long"); +#endif break; case WSAEPROTOTYPE: +#ifdef __MINGW32__ + rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSAEPROTOTYPE, Protocol wrong type for socket")); +#else rtl_uString_newFromStr (strError, L"WSAEPROTOTYPE, Protocol wrong type for socket"); +#endif break; case WSAENOPROTOOPT: +#ifdef __MINGW32__ + rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSAENOPROTOOPT, Protocol not available")); +#else rtl_uString_newFromStr (strError, L"WSAENOPROTOOPT, Protocol not available"); +#endif break; case WSAEPROTONOSUPPORT: +#ifdef __MINGW32__ + rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSAEPROTONOSUPPORT, Protocol not supported")); +#else rtl_uString_newFromStr (strError, L"WSAEPROTONOSUPPORT, Protocol not supported"); +#endif break; case WSAESOCKTNOSUPPORT: +#ifdef __MINGW32__ + rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSAESOCKTNOSUPPORT, Socket type not supported")); +#else rtl_uString_newFromStr (strError, L"WSAESOCKTNOSUPPORT, Socket type not supported"); +#endif break; case WSAEOPNOTSUPP: +#ifdef __MINGW32__ + rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSAEOPNOTSUPP, Operation not supported on socket")); +#else rtl_uString_newFromStr (strError, L"WSAEOPNOTSUPP, Operation not supported on socket"); +#endif break; case WSAEPFNOSUPPORT: +#ifdef __MINGW32__ + rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSAEPFNOSUPPORT, Protocol family not supported")); +#else rtl_uString_newFromStr (strError, L"WSAEPFNOSUPPORT, Protocol family not supported"); +#endif break; case WSAEAFNOSUPPORT: +#ifdef __MINGW32__ + rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSEAFNOSUPPORT, Addr family not supported by protocol family")); +#else rtl_uString_newFromStr (strError, L"WSEAFNOSUPPORT, Addr family not supported by protocol family"); +#endif break; case WSAEADDRINUSE: +#ifdef __MINGW32__ + rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSAEADDRINUSE, Triggered by bind() because a process went down without closing a socket.")); +#else rtl_uString_newFromStr (strError, L"WSAEADDRINUSE, Triggered by bind() because a process went down without closing a socket."); +#endif break; case WSAEADDRNOTAVAIL: +#ifdef __MINGW32__ + rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSAEADDRNOTAVAIL, Can't assign requested Addr")); +#else rtl_uString_newFromStr (strError, L"WSAEADDRNOTAVAIL, Can't assign requested Addr"); +#endif break; case WSAENETDOWN: +#ifdef __MINGW32__ + rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSAENETDOWN, Network is down")); +#else rtl_uString_newFromStr (strError, L"WSAENETDOWN, Network is down"); +#endif break; case WSAENETUNREACH: +#ifdef __MINGW32__ + rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSAENETUNREACH, Network is unreachable")); +#else rtl_uString_newFromStr (strError, L"WSAENETUNREACH, Network is unreachable"); +#endif break; case WSAENETRESET: +#ifdef __MINGW32__ + rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSAENETRESET, Network dropped connection or reset")); +#else rtl_uString_newFromStr (strError, L"WSAENETRESET, Network dropped connection or reset"); +#endif break; case WSAECONNABORTED: +#ifdef __MINGW32__ + rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSAECONNABORTED, Software caused connection abort")); +#else rtl_uString_newFromStr (strError, L"WSAECONNABORTED, Software caused connection abort"); +#endif break; case WSAECONNRESET: +#ifdef __MINGW32__ + rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSAECONNRESET, Connection reset by peer")); +#else rtl_uString_newFromStr (strError, L"WSAECONNRESET, Connection reset by peer"); +#endif break; case WSAENOBUFS: +#ifdef __MINGW32__ + rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSAENOBUFS, No buffer space available.")); +#else rtl_uString_newFromStr (strError, L"WSAENOBUFS, No buffer space available."); +#endif break; case WSAEISCONN: +#ifdef __MINGW32__ + rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSAEISCONN, Socket is already connected")); +#else rtl_uString_newFromStr (strError, L"WSAEISCONN, Socket is already connected"); +#endif break; case WSAENOTCONN: +#ifdef __MINGW32__ + rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSAENOTCONN, Socket is not connected")); +#else rtl_uString_newFromStr (strError, L"WSAENOTCONN, Socket is not connected"); +#endif break; case WSAESHUTDOWN: +#ifdef __MINGW32__ + rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSAESHUTDOWN, Can't send after socket shutdown")); +#else rtl_uString_newFromStr (strError, L"WSAESHUTDOWN, Can't send after socket shutdown"); +#endif break; case WSAETIMEDOUT: +#ifdef __MINGW32__ + rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSAETIMEDOUT, Connection timed out")); +#else rtl_uString_newFromStr (strError, L"WSAETIMEDOUT, Connection timed out"); +#endif break; case WSAECONNREFUSED: +#ifdef __MINGW32__ + rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSAECONNREFUSED, Connection refused")); +#else rtl_uString_newFromStr (strError, L"WSAECONNREFUSED, Connection refused"); +#endif break; case WSAEHOSTDOWN: +#ifdef __MINGW32__ + rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSAEHOSTDOWN, Networking subsystem not started")); +#else rtl_uString_newFromStr (strError, L"WSAEHOSTDOWN, Networking subsystem not started"); +#endif break; case WSAEHOSTUNREACH: +#ifdef __MINGW32__ + rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSAEHOSTUNREACH, No route to host")); +#else rtl_uString_newFromStr (strError, L"WSAEHOSTUNREACH, No route to host"); +#endif break; case WSAEWOULDBLOCK: +#ifdef __MINGW32__ + rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSAEWOULDBLOCK, Operation would block")); +#else rtl_uString_newFromStr (strError, L"WSAEWOULDBLOCK, Operation would block"); +#endif break; case WSAEINPROGRESS: +#ifdef __MINGW32__ + rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSAEINPROGRESS, Operation now in progress")); +#else rtl_uString_newFromStr (strError, L"WSAEINPROGRESS, Operation now in progress"); +#endif break; case WSAEALREADY: +#ifdef __MINGW32__ + rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSAEALREADY, Operation already in progress")); +#else rtl_uString_newFromStr (strError, L"WSAEALREADY, Operation already in progress"); +#endif break; case WSAEINTR: +#ifdef __MINGW32__ + rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSAEALREADY, Operation was interrupted")); +#else rtl_uString_newFromStr (strError, L"WSAEALREADY, Operation was interrupted"); +#endif break; case WSAEBADF: +#ifdef __MINGW32__ + rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSAEBADF, Bad file number")); +#else rtl_uString_newFromStr (strError, L"WSAEBADF, Bad file number"); +#endif break; case WSAEACCES: +#ifdef __MINGW32__ + rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSAEACCES, Access is denied")); +#else rtl_uString_newFromStr (strError, L"WSAEACCES, Access is denied"); +#endif break; case WSAEFAULT: +#ifdef __MINGW32__ + rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSAEFAULT, Bad memory Addr")); +#else rtl_uString_newFromStr (strError, L"WSAEFAULT, Bad memory Addr"); +#endif break; case WSAEINVAL: +#ifdef __MINGW32__ + rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSAEINVAL, The socket has not been bound with bind() or is already connected")); +#else rtl_uString_newFromStr (strError, L"WSAEINVAL, The socket has not been bound with bind() or is already connected"); +#endif break; case WSAEMFILE: +#ifdef __MINGW32__ + rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSAEMFILE, No more file descriptors are available")); +#else rtl_uString_newFromStr (strError, L"WSAEMFILE, No more file descriptors are available"); +#endif break; case WSAETOOMANYREFS: +#ifdef __MINGW32__ + rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSAETOOMANYREFS, Undocumented WinSock error")); +#else rtl_uString_newFromStr (strError, L"WSAETOOMANYREFS, Undocumented WinSock error"); +#endif break; case WSAENAMETOOLONG: +#ifdef __MINGW32__ + rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSAENAMETOOLONG, Undocumented WinSock error")); +#else rtl_uString_newFromStr (strError, L"WSAENAMETOOLONG, Undocumented WinSock error"); +#endif break; case WSAENOTEMPTY: +#ifdef __MINGW32__ + rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSAENOTEMPTY, Undocumented WinSock error")); +#else rtl_uString_newFromStr (strError, L"WSAENOTEMPTY, Undocumented WinSock error"); +#endif break; case WSAEPROCLIM: +#ifdef __MINGW32__ + rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSAEPROCLIM, Undocumented WinSock error")); +#else rtl_uString_newFromStr (strError, L"WSAEPROCLIM, Undocumented WinSock error"); +#endif break; case WSAEUSERS: +#ifdef __MINGW32__ + rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSAEUSERS, Undocumented WinSock error")); +#else rtl_uString_newFromStr (strError, L"WSAEUSERS, Undocumented WinSock error"); +#endif break; case WSAEDQUOT: +#ifdef __MINGW32__ + rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSAEDQUOT, Undocumented WinSock error")); +#else rtl_uString_newFromStr (strError, L"WSAEDQUOT, Undocumented WinSock error"); +#endif break; case WSAESTALE: +#ifdef __MINGW32__ + rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSAESTALE, Undocumented WinSock error")); +#else rtl_uString_newFromStr (strError, L"WSAESTALE, Undocumented WinSock error"); +#endif break; case WSAEREMOTE: +#ifdef __MINGW32__ + rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSAEREMOTE, Undocumented WinSock error")); +#else rtl_uString_newFromStr (strError, L"WSAEREMOTE, Undocumented WinSock error"); +#endif break; case WSAEDISCON: +#ifdef __MINGW32__ + rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSAEDISCON, Circuit was gracefully terminated")); +#else rtl_uString_newFromStr (strError, L"WSAEDISCON, Circuit was gracefully terminated"); +#endif break; case WSASYSNOTREADY: +#ifdef __MINGW32__ + rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSASYSNOTREADY, The underlying network subsystem is not ready for network communication")); +#else rtl_uString_newFromStr (strError, L"WSASYSNOTREADY, The underlying network subsystem is not ready for network communication"); +#endif break; case WSAVERNOTSUPPORTED: +#ifdef __MINGW32__ + 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")); +#else rtl_uString_newFromStr (strError, L"WSAVERNOTSUPPORTED, The version of Windows Sockets API support requested is not provided by this particular Windows Sockets implementation"); +#endif break; case WSANOTINITIALISED: +#ifdef __MINGW32__ + rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSANOTINITIALISED, WSAStartup() has not been called")); +#else rtl_uString_newFromStr (strError, L"WSANOTINITIALISED, WSAStartup() has not been called"); +#endif break; case WSAHOST_NOT_FOUND: +#ifdef __MINGW32__ + rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSAHOST_NOT_FOUND, Authoritative answer host not found")); +#else rtl_uString_newFromStr (strError, L"WSAHOST_NOT_FOUND, Authoritative answer host not found"); +#endif break; case WSATRY_AGAIN: +#ifdef __MINGW32__ + rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSATRY_AGAIN, Non-authoritative answer host not found or SERVERFAIL")); +#else rtl_uString_newFromStr (strError, L"WSATRY_AGAIN, Non-authoritative answer host not found or SERVERFAIL"); +#endif break; case WSANO_RECOVERY: +#ifdef __MINGW32__ + rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSANO_RECOVERY, Non recoverable errors, FORMERR, REFUSED, NOTIMP")); +#else rtl_uString_newFromStr (strError, L"WSANO_RECOVERY, Non recoverable errors, FORMERR, REFUSED, NOTIMP"); +#endif break; case WSANO_DATA: +#ifdef __MINGW32__ + rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSANO_DATA or WSANO_ADDRESS, Valid name, no data record of requested type")); +#else rtl_uString_newFromStr (strError, L"WSANO_DATA or WSANO_ADDRESS, Valid name, no data record of requested type"); +#endif break; default: { sal_Unicode message[128]; +#ifdef __MINGW32__ + wsprintfW((wchar_t *)message, L"Unknown WinSock Error Number %d", error); + rtl_uString_newFromStr (strError, message); +#else wsprintfW((sal_Unicode *)message, (sal_Unicode *)L"Unknown WinSock Error Number %d", error); rtl_uString_newFromStr (strError, message); +#endif } return; --- oo_1.1.1_src/sal/osl/w32/system.h.orig 2003-04-16 02:45:36.000000000 +0900 +++ oo_1.1.1_src/sal/osl/w32/system.h 2004-03-29 12:17:38.000000000 +0900 @@ -97,6 +97,10 @@ // at the same time without patching // windows.h #include +#ifdef __MINGW32__ + #include + #include +#endif #else // winsock2.h includes windows.h #include --- oo_1.1.1_src/sal/osl/w32/tempfile.c.orig 2002-11-14 17:36:50.000000000 +0900 +++ oo_1.1.1_src/sal/osl/w32/tempfile.c 2004-03-29 12:17:38.000000000 +0900 @@ -87,11 +87,13 @@ 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 */ @@ -319,8 +321,12 @@ 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) { @@ -330,6 +336,9 @@ b_delete_on_close, pHandle, ppustrTempFileURL); +#ifdef __MINGW32__ + free(tmp_name); +#endif } else // stack alloc failed { --- oo_1.1.1_src/sal/rtl/source/uuid.cxx.orig 2002-11-14 19:40:14.000000000 +0900 +++ oo_1.1.1_src/sal/rtl/source/uuid.cxx 2004-03-29 12:17:38.000000000 +0900 @@ -130,7 +130,11 @@ nTime = ((sal_uInt64) val.Seconds) *((sal_uInt64)10000000) + ((sal_uInt64) val.Nanosec) /100 + +#ifdef __MINGW32__ + (sal_uInt64)(0x01B21DD213814000ULL); +#else (sal_uInt64)(0x01B21DD213814000); +#endif return nTime; } @@ -253,7 +257,11 @@ ((sal_uInt16) uuid.clock_seq_low ); memcpy( pNode, &( uuid.node ) , 6 ); +#ifdef __MINGW32__ + *pTime = *pTime & 0x0fffffffffffffffULL; +#else *pTime = *pTime & 0x0fffffffffffffff; +#endif *pClockSeq = *pClockSeq & 0x3fff; } @@ -266,7 +274,11 @@ UUID uuid; /* 1 0123456789012345 */ +#ifdef __MINGW32__ + nTime = ( nTime & 0x0fffffffffffffffULL ) | 0x1000000000000000ULL; +#else nTime = ( nTime & 0x0fffffffffffffff ) | 0x1000000000000000; +#endif nClockSeq = ( nClockSeq & 0x3fff ) | 0x8000; uuid.time_low = (sal_uInt32) ( nTime & 0xffffffff ); --- oo_1.1.1_src/sal/systools/win32/guistdio/guistdio.cxx.orig 2003-05-29 00:56:48.000000000 +0900 +++ oo_1.1.1_src/sal/systools/win32/guistdio/guistdio.cxx 2004-03-29 12:17:38.000000000 +0900 @@ -169,7 +169,11 @@ //--------------------------------------------------------------------------- +#ifdef __MINGW32__ +int main( int argc, char **argv ) +#else int _tmain( int argc, _TCHAR **argv ) +#endif { TCHAR szTargetFileName[MAX_PATH] = TEXT(""); STARTUPINFO aStartupInfo; --- oo_1.1.1_src/sal/systools/win32/uwinapi/DllMain.cpp.orig 2003-04-11 23:24:36.000000000 +0900 +++ oo_1.1.1_src/sal/systools/win32/uwinapi/DllMain.cpp 2004-08-29 20:03:18.000000000 +0900 @@ -150,7 +150,100 @@ return hModuleUnicows; } -extern "C" FARPROC _PfnLoadUnicows = (FARPROC)LoadUnicowsLibrary; +extern "C" { +FARPROC _PfnLoadUnicows = (FARPROC)LoadUnicowsLibrary; +} + +#ifdef __MINGW32__ + +extern "C" { + +typedef void (*func_ptr) (void); +extern func_ptr __CTOR_LIST__[]; +extern func_ptr __DTOR_LIST__[]; + +static void do_startup(void); +static void do_cleanup(void); + +HMODULE hModuleUnicowsDLL; + +void +__do_global_dtors (void) +{ + static func_ptr *p = __DTOR_LIST__ + 1; + + /* + * Call each destructor in the destructor list until a null pointer + * is encountered. + */ + while (*p) + { + (*(p)) (); + p++; + } +} + +void +__do_global_ctors (void) +{ + unsigned long nptrs = (unsigned long) __CTOR_LIST__[0]; + unsigned i; + + /* + * If the first entry in the constructor list is -1 then the list + * is terminated with a null entry. Otherwise the first entry was + * the number of pointers in the list. + */ + if (nptrs == static_cast(-1)) + { + for (nptrs = 0; __CTOR_LIST__[nptrs + 1] != 0; nptrs++) + ; + } + + /* + * Go through the list backwards calling constructors. + */ + for (i = nptrs; i >= 1; i--) + { + __CTOR_LIST__[i] (); + } + + /* + * Register the destructors for processing on exit. + */ + atexit (__do_global_dtors); +} + +static int initialized = 0; + +void +__main (void) +{ + if (!initialized) + { + initialized = 1; + do_startup(); + __do_global_ctors (); + } +} + +static void do_startup( void ) +{ + if (((LONG)GetVersion()&0x800000ff) == 0x80000004) + { + hModuleUnicowsDLL = LoadUnicowsLibrary(); + if (hModuleUnicowsDLL) + atexit(do_cleanup); + } +} + +void do_cleanup( void ) +{ + FreeLibrary(hModuleUnicowsDLL); +} +} + +#endif extern "C" BOOL WINAPI DllMain( HMODULE hModule, DWORD dwReason, LPVOID lpReserved ) { --- oo_1.1.1_src/sal/systools/win32/uwinapi/FindFirstVolumeA.cpp.orig 2003-04-09 00:51:24.000000000 +0900 +++ oo_1.1.1_src/sal/systools/win32/uwinapi/FindFirstVolumeA.cpp 2004-03-29 12:17:38.000000000 +0900 @@ -61,4 +61,8 @@ #include "macros.h" -DEFINE_DEFAULT_THUNK( kernel32, TRYLOAD, HANDLE, WINAPI, FindFirstVolumeA, (LPSTR lpszVolumeName, DWORD cchBufferLength) ) \ No newline at end of file +#ifdef __MINGW32__ +DEFINE_DEFAULT_THUNK( kernel32, TRYLOAD, HANDLE, WINAPI, FindFirstVolumeA, (LPCSTR lpszVolumeName, DWORD cchBufferLength) ) +#else +DEFINE_DEFAULT_THUNK( kernel32, TRYLOAD, HANDLE, WINAPI, FindFirstVolumeA, (LPSTR lpszVolumeName, DWORD cchBufferLength) ) +#endif --- oo_1.1.1_src/sal/systools/win32/uwinapi/FindFirstVolumeW.cpp.orig 2003-04-09 00:51:50.000000000 +0900 +++ oo_1.1.1_src/sal/systools/win32/uwinapi/FindFirstVolumeW.cpp 2004-03-29 12:17:38.000000000 +0900 @@ -61,4 +61,8 @@ #include "macros.h" -DEFINE_DEFAULT_THUNK( kernel32, TRYLOAD, HANDLE, WINAPI, FindFirstVolumeW, (LPWSTR lpszVolumeName, DWORD cchBufferLength) ) \ No newline at end of file +#ifdef __MINGW32__ +DEFINE_DEFAULT_THUNK( kernel32, TRYLOAD, HANDLE, WINAPI, FindFirstVolumeW, (LPCWSTR lpszVolumeName, DWORD cchBufferLength) ) +#else +DEFINE_DEFAULT_THUNK( kernel32, TRYLOAD, HANDLE, WINAPI, FindFirstVolumeW, (LPWSTR lpszVolumeName, DWORD cchBufferLength) ) +#endif --- oo_1.1.1_src/sal/systools/win32/uwinapi/FindNextVolumeA.cpp.orig 2003-04-09 00:52:00.000000000 +0900 +++ oo_1.1.1_src/sal/systools/win32/uwinapi/FindNextVolumeA.cpp 2004-03-29 12:17:38.000000000 +0900 @@ -61,4 +61,8 @@ #include "macros.h" -DEFINE_DEFAULT_THUNK( kernel32, TRYLOAD, BOOL, WINAPI, FindNextVolumeA, (HANDLE hFindVolume, LPSTR lpszVolumeName, DWORD cchBufferLength) ) \ No newline at end of file +#ifdef __MINGW32__ +DEFINE_DEFAULT_THUNK( kernel32, TRYLOAD, BOOL, WINAPI, FindNextVolumeA, (HANDLE hFindVolume, LPCSTR lpszVolumeName, DWORD cchBufferLength) ) +#else +DEFINE_DEFAULT_THUNK( kernel32, TRYLOAD, BOOL, WINAPI, FindNextVolumeA, (HANDLE hFindVolume, LPSTR lpszVolumeName, DWORD cchBufferLength) ) +#endif --- oo_1.1.1_src/sal/systools/win32/uwinapi/GetProcessId.cpp.orig 2003-03-27 01:46:48.000000000 +0900 +++ oo_1.1.1_src/sal/systools/win32/uwinapi/GetProcessId.cpp 2004-03-29 12:17:38.000000000 +0900 @@ -105,7 +105,11 @@ typedef DWORD (WINAPI OBFUSCATE)( DWORD dwPTID ); typedef OBFUSCATE *LPOBFUSCATE; +#ifdef __MINGW32__ +static OBFUSCATE Obfuscate; +#else OBFUSCATE Obfuscate; +#endif static DWORD WINAPI Obfuscate( DWORD dwPTID ) { --- oo_1.1.1_src/sal/systools/win32/uwinapi/ResolveThunk.cpp.orig 2002-08-26 22:43:22.000000000 +0900 +++ oo_1.1.1_src/sal/systools/win32/uwinapi/ResolveThunk.cpp 2004-08-29 23:45:26.000000000 +0900 @@ -95,4 +95,511 @@ *lppfn = lpfnEmulate ? lpfnEmulate : lpfnFailure; } +#ifdef __MINGW32__ +extern "C" { +extern HMODULE hModuleUnicowsDLL; +} + +EXTERN_C void WINAPI ResolveThunk_UNICOWS( FARPROC *lppfn, LPCSTR lpLibFileName, LPCSTR lpFuncName, FARPROC lpfnFailure ) +{ + FARPROC lpfnResult = (((LONG)GetVersion()&0x800000ff) == 0x80000004) ? GetProcAddress( hModuleUnicowsDLL, lpFuncName ) : GetProcAddress( LoadLibraryA( lpLibFileName ), lpFuncName ); + + if ( !lpfnResult ) + lpfnResult = lpfnFailure; + + *lppfn = lpfnResult; +} + +static void GetProcAddress_Thunk(); +EXTERN_C _declspec( dllexport ) FARPROC kernel32_GetProcAddress_Ptr = (FARPROC)GetProcAddress_Thunk; +static FARPROC WINAPI GetProcAddress_Failure (HINSTANCE,LPCSTR); +static void GetProcAddress_Thunk() +{ + ResolveThunk_UNICOWS( &kernel32_GetProcAddress_Ptr, "kernel32.dll", "GetProcAddress", (FARPROC)GetProcAddress_Failure ); + asm(" movl %ebp, %esp"); + asm(" popl %ebp"); + asm(" jmp *(%0)"::"m"(kernel32_GetProcAddress_Ptr)); +} +EXTERN_C FARPROC WINAPI Internal_GetProcAddress (HINSTANCE,LPCSTR) +{ + asm(" popl %ebp"); + asm(" jmp *(%0)"::"m"(kernel32_GetProcAddress_Ptr)); +} +static FARPROC WINAPI GetProcAddress_Failure (HINSTANCE,LPCSTR) +{ + SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); + return (FARPROC)0; +} + +#define DEFINE_UNICOWS_THUNK( module, 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 void func##_Thunk() \ +{ \ + ResolveThunk_UNICOWS( &module##_##func##_Ptr, #module ".dll", #func, (FARPROC)func##_##Failure ); \ + 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)); \ +} \ +static rettype calltype func##_##Failure params \ +{ \ + SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); \ + return (rettype)0; \ +} + +DEFINE_UNICOWS_THUNK( kernel32, ATOM, WINAPI, AddAtomW, (LPCWSTR) ) +DEFINE_UNICOWS_THUNK( gdi32, int, WINAPI, AddFontResourceW, (LPCWSTR) ) +DEFINE_UNICOWS_THUNK( winspool, BOOL, WINAPI, AddJobW, (HANDLE,DWORD,PBYTE,DWORD,PDWORD) ) +DEFINE_UNICOWS_THUNK( winspool, BOOL, WINAPI, AddPortW, (LPWSTR,HWND,LPWSTR) ) +DEFINE_UNICOWS_THUNK( winspool, BOOL, WINAPI, AddPrintProcessorW, (LPWSTR,LPWSTR,LPWSTR,LPWSTR) ) +DEFINE_UNICOWS_THUNK( winspool, BOOL, WINAPI, AddPrintProvidorW, (LPWSTR,DWORD,PBYTE) ) +DEFINE_UNICOWS_THUNK( winspool, BOOL, WINAPI, AddPrinterDriverW, (LPWSTR,DWORD,PBYTE) ) +DEFINE_UNICOWS_THUNK( winspool, HANDLE, WINAPI, AddPrinterW, (LPWSTR,DWORD,PBYTE) ) +DEFINE_UNICOWS_THUNK( winspool, LONG, WINAPI, AdvancedDocumentPropertiesW, (HWND,HANDLE,LPWSTR,PDEVMODE,PDEVMODEW) ) +DEFINE_UNICOWS_THUNK( user32, BOOL, WINAPI, AppendMenuW, (HMENU,UINT,UINT_PTR,LPCWSTR) ) +DEFINE_UNICOWS_THUNK( kernel32, HANDLE, WINAPI, BeginUpdateResourceW, (LPCWSTR,BOOL) ) +DEFINE_UNICOWS_THUNK( user32, long, WINAPI, BroadcastSystemMessageW, (DWORD,LPDWORD,UINT,WPARAM,LPARAM) ) +DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, BuildCommDCBAndTimeoutsW, (LPCWSTR,LPDCB,LPCOMMTIMEOUTS) ) +DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, BuildCommDCBW, (LPCWSTR,LPDCB) ) +DEFINE_UNICOWS_THUNK( user32, BOOL, WINAPI, CallMsgFilterW, (LPMSG,int) ) +DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, CallNamedPipeW, (LPCWSTR,PVOID,DWORD,PVOID,DWORD,PDWORD,DWORD) ) +DEFINE_UNICOWS_THUNK( user32, LRESULT, WINAPI, CallWindowProcA, (WNDPROC,HWND,UINT,WPARAM,LPARAM) ) +DEFINE_UNICOWS_THUNK( user32, LRESULT, WINAPI, CallWindowProcW, (WNDPROC,HWND,UINT,WPARAM,LPARAM) ) +DEFINE_UNICOWS_THUNK( user32, LONG, WINAPI, ChangeDisplaySettingsExW, (LPCWSTR,LPDEVMODEW,HWND,DWORD,LPVOID) ) +DEFINE_UNICOWS_THUNK( user32, LONG, WINAPI, ChangeDisplaySettingsW, (PDEVMODEW,DWORD) ) +DEFINE_UNICOWS_THUNK( user32, BOOL, WINAPI, ChangeMenuW, (HMENU,UINT,LPCWSTR,UINT,UINT) ) +DEFINE_UNICOWS_THUNK( user32, DWORD, WINAPI, CharLowerBuffW, (LPWSTR,DWORD) ) +DEFINE_UNICOWS_THUNK( user32, LPWSTR, WINAPI, CharLowerW, (LPWSTR) ) +DEFINE_UNICOWS_THUNK( user32, LPWSTR, WINAPI, CharNextW, (LPCWSTR) ) +DEFINE_UNICOWS_THUNK( user32, LPWSTR, WINAPI, CharPrevW, (LPCWSTR,LPCWSTR) ) +DEFINE_UNICOWS_THUNK( user32, BOOL, WINAPI, CharToOemBuffW, (LPCWSTR,LPSTR,DWORD) ) +DEFINE_UNICOWS_THUNK( user32, BOOL, WINAPI, CharToOemW, (LPCWSTR,LPSTR) ) +DEFINE_UNICOWS_THUNK( user32, DWORD, WINAPI, CharUpperBuffW, (LPWSTR,DWORD) ) +DEFINE_UNICOWS_THUNK( user32, LPWSTR, WINAPI, CharUpperW, (LPWSTR) ) +DEFINE_UNICOWS_THUNK( comdlg32, BOOL, WINAPI, ChooseColorW, (LPCHOOSECOLORW) ) +DEFINE_UNICOWS_THUNK( comdlg32, BOOL, WINAPI, ChooseFontW, (LPCHOOSEFONTW) ) +DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, CommConfigDialogW, (LPCWSTR,HWND,LPCOMMCONFIG) ) +DEFINE_UNICOWS_THUNK( kernel32, int, WINAPI, CompareStringW, (LCID,DWORD,LPCWSTR,int,LPCWSTR,int) ) +DEFINE_UNICOWS_THUNK( winspool, BOOL, WINAPI, ConfigurePortW, (LPWSTR,HWND,LPWSTR) ) +DEFINE_UNICOWS_THUNK( user32, int, WINAPI, CopyAcceleratorTableW, (HACCEL,LPACCEL,int) ) +DEFINE_UNICOWS_THUNK( gdi32, HENHMETAFILE, WINAPI, CopyEnhMetaFileW, (HENHMETAFILE,LPCWSTR) ) +//DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, CopyFileExW, (LPCWSTR,LPCWSTR,LPPROGRESS_ROUTINE,LPVOID,LPBOOL,DWORD) ) +DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, CopyFileW, (LPCWSTR,LPCWSTR,BOOL) ) +DEFINE_UNICOWS_THUNK( gdi32, HMETAFILE, WINAPI, CopyMetaFileW, (HMETAFILE,LPCWSTR) ) +DEFINE_UNICOWS_THUNK( user32, HACCEL, WINAPI, CreateAcceleratorTableW, (LPACCEL,int) ) +DEFINE_UNICOWS_THUNK( gdi32, HCOLORSPACE, WINAPI, CreateColorSpaceW, (LPLOGCOLORSPACEW) ) +DEFINE_UNICOWS_THUNK( gdi32, HDC, WINAPI, CreateDCW, (LPCWSTR,LPCWSTR,LPCWSTR,const DEVMODEW*) ) +DEFINE_UNICOWS_THUNK( user32, HWND, WINAPI, CreateDialogIndirectParamW, (HINSTANCE,LPCDLGTEMPLATE,HWND,DLGPROC,LPARAM) ) +DEFINE_UNICOWS_THUNK( user32, HWND, WINAPI, CreateDialogParamW, (HINSTANCE,LPCWSTR,HWND,DLGPROC,LPARAM) ) +DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, CreateDirectoryExW, (LPCWSTR,LPCWSTR,LPSECURITY_ATTRIBUTES) ) +DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, CreateDirectoryW, (LPCWSTR,LPSECURITY_ATTRIBUTES) ) +DEFINE_UNICOWS_THUNK( gdi32, HDC, WINAPI, CreateEnhMetaFileW, (HDC,LPCWSTR,LPCRECT,LPCWSTR) ) +DEFINE_UNICOWS_THUNK( kernel32, HANDLE, WINAPI, CreateEventW, (LPSECURITY_ATTRIBUTES,BOOL,BOOL,LPCWSTR) ) +DEFINE_UNICOWS_THUNK( kernel32, HANDLE, WINAPI, CreateFileMappingW, (HANDLE,LPSECURITY_ATTRIBUTES,DWORD,DWORD,DWORD,LPCWSTR) ) +DEFINE_UNICOWS_THUNK( kernel32, HANDLE, WINAPI, CreateFileW, (LPCWSTR,DWORD,DWORD,LPSECURITY_ATTRIBUTES,DWORD,DWORD,HANDLE) ) +DEFINE_UNICOWS_THUNK( gdi32, HFONT, WINAPI, CreateFontIndirectW, (const LOGFONTW*) ) +DEFINE_UNICOWS_THUNK( gdi32, HFONT, WINAPI, CreateFontW, (int,int,int,int,int,DWORD,DWORD,DWORD,DWORD,DWORD,DWORD,DWORD,DWORD,LPCWSTR) ) +DEFINE_UNICOWS_THUNK( gdi32, HDC, WINAPI, CreateICW, (LPCWSTR,LPCWSTR,LPCWSTR,const DEVMODEW*) ) +DEFINE_UNICOWS_THUNK( user32, HWND, WINAPI, CreateMDIWindowW, (LPCWSTR,LPCWSTR,DWORD,int,int,int,int,HWND,HINSTANCE,LPARAM) ) +DEFINE_UNICOWS_THUNK( kernel32, HANDLE, WINAPI, CreateMailslotW, (LPCWSTR,DWORD,DWORD,LPSECURITY_ATTRIBUTES) ) +DEFINE_UNICOWS_THUNK( gdi32, HDC, WINAPI, CreateMetaFileW, (LPCWSTR) ) +DEFINE_UNICOWS_THUNK( kernel32, HANDLE, WINAPI, CreateMutexW, (LPSECURITY_ATTRIBUTES,BOOL,LPCWSTR) ) +DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, CreateProcessW, (LPCWSTR,LPWSTR,LPSECURITY_ATTRIBUTES,LPSECURITY_ATTRIBUTES,BOOL,DWORD,PVOID,LPCWSTR,LPSTARTUPINFOW,LPPROCESS_INFORMATION) ) +DEFINE_UNICOWS_THUNK( gdi32, BOOL, WINAPI, CreateScalableFontResourceW, (DWORD,LPCWSTR,LPCWSTR,LPCWSTR) ) +DEFINE_UNICOWS_THUNK( kernel32, HANDLE, WINAPI, CreateSemaphoreW, (LPSECURITY_ATTRIBUTES,LONG,LONG,LPCWSTR) ) +DEFINE_UNICOWS_THUNK( oeacc, HRESULT, STDAPICALLTYPE, CreateStdAccessibleProxyW, (HWND, LPCWSTR, LONG, REFIID, void**) ) +DEFINE_UNICOWS_THUNK( kernel32, HANDLE, WINAPI, CreateWaitableTimerW, (LPSECURITY_ATTRIBUTES,BOOL,LPCWSTR) ) +DEFINE_UNICOWS_THUNK( user32, HWND, WINAPI, CreateWindowExW, (DWORD,LPCWSTR,LPCWSTR,DWORD,int,int,int,int,HWND,HMENU,HINSTANCE,LPVOID) ) +DEFINE_UNICOWS_THUNK( user32, HCONV, WINAPI, DdeConnect, (DWORD,HSZ,HSZ,PCONVCONTEXT) ) +DEFINE_UNICOWS_THUNK( user32, HCONVLIST, WINAPI, DdeConnectList, (DWORD,HSZ,HSZ,HCONVLIST,PCONVCONTEXT) ) +DEFINE_UNICOWS_THUNK( user32, HSZ, WINAPI, DdeCreateStringHandleW, (DWORD,LPWSTR,int) ) +DEFINE_UNICOWS_THUNK( user32, UINT, WINAPI, DdeInitializeW, (PDWORD,PFNCALLBACK,DWORD,DWORD) ) +DEFINE_UNICOWS_THUNK( user32, UINT, WINAPI, DdeQueryConvInfo, (HCONV,DWORD,PCONVINFO) ) +DEFINE_UNICOWS_THUNK( user32, DWORD, WINAPI, DdeQueryStringW, (DWORD,HSZ,LPWSTR,DWORD,int) ) +DEFINE_UNICOWS_THUNK( user32, LRESULT, WINAPI, DefDlgProcW, (HWND,UINT,WPARAM,LPARAM) ) +DEFINE_UNICOWS_THUNK( user32, LRESULT, WINAPI, DefFrameProcW, (HWND,HWND,UINT,WPARAM,LPARAM) ) +DEFINE_UNICOWS_THUNK( user32, LRESULT, WINAPI, DefMDIChildProcW, (HWND,UINT,WPARAM,LPARAM) ) +DEFINE_UNICOWS_THUNK( user32, LRESULT, WINAPI, DefWindowProcW, (HWND,UINT,WPARAM,LPARAM) ) +DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, DeleteFileW, (LPCWSTR) ) +DEFINE_UNICOWS_THUNK( winspool, BOOL, WINAPI, DeleteMonitorW, (LPWSTR,LPWSTR,LPWSTR) ) +DEFINE_UNICOWS_THUNK( winspool, BOOL, WINAPI, DeletePortW, (LPWSTR,HWND,LPWSTR) ) +DEFINE_UNICOWS_THUNK( winspool, BOOL, WINAPI, DeletePrintProcessorW, (LPWSTR,LPWSTR,LPWSTR) ) +DEFINE_UNICOWS_THUNK( winspool, BOOL, WINAPI, DeletePrintProvidorW, (LPWSTR,LPWSTR,LPWSTR) ) +DEFINE_UNICOWS_THUNK( winspool, BOOL, WINAPI, DeletePrinterDriverW, (LPWSTR,LPWSTR,LPWSTR) ) +DEFINE_UNICOWS_THUNK( user32, int, WINAPI, DialogBoxIndirectParamW, (HINSTANCE,LPCDLGTEMPLATE,HWND,DLGPROC,LPARAM) ) +DEFINE_UNICOWS_THUNK( user32, int, WINAPI, DialogBoxParamW, (HINSTANCE,LPCWSTR,HWND,DLGPROC,LPARAM) ) +DEFINE_UNICOWS_THUNK( user32, LONG, WINAPI, DispatchMessageW, (const MSG*) ) +DEFINE_UNICOWS_THUNK( user32, int, WINAPI, DlgDirListComboBoxW, (HWND,LPWSTR,int,int,UINT) ) +DEFINE_UNICOWS_THUNK( user32, int, WINAPI, DlgDirListW, (HWND,LPWSTR,int,int,UINT) ) +DEFINE_UNICOWS_THUNK( user32, BOOL, WINAPI, DlgDirSelectComboBoxExW, (HWND,LPWSTR,int,int) ) +DEFINE_UNICOWS_THUNK( user32, BOOL, WINAPI, DlgDirSelectExW, (HWND,LPWSTR,int,int) ) +DEFINE_UNICOWS_THUNK( shell32, UINT, WINAPI, DragQueryFileW, (HDROP,UINT,LPWSTR,UINT) ) +//DEFINE_UNICOWS_THUNK( user32, BOOL, WINAPI, DrawStateW, (HDC,HBRUSH,DRAWSTATEPROC,LPARAM,WPARAM,int,int,int,int,UINT) ) +DEFINE_UNICOWS_THUNK( user32, int, WINAPI, DrawTextExW, (HDC,LPWSTR,int,LPRECT,UINT,LPDRAWTEXTPARAMS) ) +DEFINE_UNICOWS_THUNK( user32, int, WINAPI, DrawTextW, (HDC,LPCWSTR,int,LPRECT,UINT) ) +DEFINE_UNICOWS_THUNK( user32, BOOL, WINAPI, EnableWindow, (HWND,BOOL) ) +DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, EndUpdateResourceW, (HANDLE,BOOL) ) +DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, EnumCalendarInfoExW, (CALINFO_ENUMPROCEXW,LCID,CALID,CALTYPE) ) +DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, EnumCalendarInfoW, (CALINFO_ENUMPROCW,LCID,CALID,CALTYPE) ) +DEFINE_UNICOWS_THUNK( user32, UINT, WINAPI, EnumClipboardFormats, (UINT) ) +DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, EnumDateFormatsExW, (DATEFMT_ENUMPROCEXW,LCID,DWORD) ) +DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, EnumDateFormatsW, (DATEFMT_ENUMPROCW,LCID,DWORD) ) +DEFINE_UNICOWS_THUNK( user32, BOOL, WINAPI, EnumDisplayDevicesW, (LPCWSTR,DWORD,PDISPLAY_DEVICEW,DWORD) ) +DEFINE_UNICOWS_THUNK( user32, BOOL, WINAPI, EnumDisplaySettingsExW, (LPCWSTR,DWORD,LPDEVMODEW,DWORD) ) +DEFINE_UNICOWS_THUNK( user32, BOOL, WINAPI, EnumDisplaySettingsW, (LPCWSTR,DWORD,PDEVMODEW) ) +DEFINE_UNICOWS_THUNK( gdi32, int, WINAPI, EnumFontFamiliesExW, (HDC,PLOGFONTW,FONTENUMPROCW,LPARAM,DWORD) ) +DEFINE_UNICOWS_THUNK( gdi32, int, WINAPI, EnumFontFamiliesW, (HDC,LPCWSTR,FONTENUMPROCW,LPARAM) ) +DEFINE_UNICOWS_THUNK( gdi32, int, WINAPI, EnumFontsW, (HDC,LPCWSTR,FONTENUMPROCW,LPARAM) ) +DEFINE_UNICOWS_THUNK( gdi32, int, WINAPI, EnumICMProfilesW, (HDC,ICMENUMPROCW,LPARAM) ) +DEFINE_UNICOWS_THUNK( user32, int, WINAPI, EnumPropsA, (HWND,PROPENUMPROCA) ) +DEFINE_UNICOWS_THUNK( user32, int, WINAPI, EnumPropsExA, (HWND,PROPENUMPROCEXA,LPARAM) ) +DEFINE_UNICOWS_THUNK( user32, int, WINAPI, EnumPropsExW, (HWND,PROPENUMPROCEXW,LPARAM) ) +DEFINE_UNICOWS_THUNK( user32, int, WINAPI, EnumPropsW, (HWND,PROPENUMPROCW) ) +DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, EnumSystemCodePagesW, (CODEPAGE_ENUMPROCW,DWORD) ) +DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, EnumSystemLocalesW, (LOCALE_ENUMPROCW,DWORD) ) +DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, EnumTimeFormatsW, (TIMEFMT_ENUMPROCW,LCID,DWORD) ) +DEFINE_UNICOWS_THUNK( kernel32, DWORD, WINAPI, ExpandEnvironmentStringsW, (LPCWSTR,LPWSTR,DWORD) ) +DEFINE_UNICOWS_THUNK( gdi32, BOOL, WINAPI, ExtTextOutW, (HDC,int,int,UINT,LPCRECT,LPCWSTR,UINT,const INT*) ) +DEFINE_UNICOWS_THUNK( shell32, UINT, WINAPI, ExtractIconExW, (LPCWSTR,int,HICON*,HICON*,UINT) ) +DEFINE_UNICOWS_THUNK( shell32, HICON, WINAPI, ExtractIconW, (HINSTANCE,LPCWSTR,UINT) ) +DEFINE_UNICOWS_THUNK( kernel32, void, WINAPI, FatalAppExitW, (UINT,LPCWSTR) ) +DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, FillConsoleOutputCharacterW, (HANDLE,WCHAR,DWORD,COORD,PDWORD) ) +DEFINE_UNICOWS_THUNK( kernel32, ATOM, WINAPI, FindAtomW, (LPCWSTR) ) +DEFINE_UNICOWS_THUNK( kernel32, HANDLE, WINAPI, FindFirstChangeNotificationW, (LPCWSTR,BOOL,DWORD) ) +DEFINE_UNICOWS_THUNK( kernel32, HANDLE, WINAPI, FindFirstFileW, (LPCWSTR,LPWIN32_FIND_DATAW) ) +DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, FindNextFileW, (HANDLE,LPWIN32_FIND_DATAW) ) +DEFINE_UNICOWS_THUNK( kernel32, HRSRC, WINAPI, FindResourceExW, (HINSTANCE,LPCWSTR,LPCWSTR,WORD) ) +DEFINE_UNICOWS_THUNK( kernel32, HRSRC, WINAPI, FindResourceW, (HINSTANCE,LPCWSTR,LPCWSTR) ) +DEFINE_UNICOWS_THUNK( comdlg32, HWND, WINAPI, FindTextW, (LPFINDREPLACEW) ) +DEFINE_UNICOWS_THUNK( user32, HWND, WINAPI, FindWindowExW, (HWND,HWND,LPCWSTR,LPCWSTR) ) +DEFINE_UNICOWS_THUNK( user32, HWND, WINAPI, FindWindowW, (LPCWSTR,LPCWSTR) ) +DEFINE_UNICOWS_THUNK( kernel32, DWORD, WINAPI, FormatMessageW, (DWORD,PCVOID,DWORD,DWORD,LPWSTR,DWORD,va_list*) ) +DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, FreeEnvironmentStringsW, (LPWSTR) ) +DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, FtpCreateDirectoryW, (HANDLE,LPCWSTR) ) +DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, FtpDeleteFileW, (HANDLE,LPCWSTR) ) +DEFINE_UNICOWS_THUNK( kernel32, HANDLE, WINAPI, FtpFindFirstFileW, (HANDLE,LPCWSTR,LPWIN32_FIND_DATA,DWORD,DWORD) ) +DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, FtpGetCurrentDirectoryW, (HANDLE,LPWSTR,PDWORD) ) +DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, FtpRemoveDirectoryW, (HANDLE,LPCWSTR) ) +DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, FtpSetCurrentDirectoryW, (HANDLE,LPCWSTR) ) +DEFINE_UNICOWS_THUNK( user32, BOOL, WINAPI, GetAltTabInfoW, (HWND,int,PALTTABINFO,LPWSTR,UINT) ) +DEFINE_UNICOWS_THUNK( kernel32, UINT, WINAPI, GetAtomNameW, (ATOM,LPWSTR,int) ) +DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, GetCPInfo, (UINT,LPCPINFO) ) +DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, GetCPInfoExA, (UINT,DWORD,LPCPINFOEXA) ) +DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, GetCPInfoExW, (UINT,DWORD,LPCPINFOEXW) ) +DEFINE_UNICOWS_THUNK( kernel32, int, WINAPI, GetCalendarInfoW, (LCID,CALID,CALTYPE,LPWSTR,int,LPDWORD) ) +DEFINE_UNICOWS_THUNK( gdi32, BOOL, WINAPI, GetCharABCWidthsW, (HDC,UINT,UINT,LPABC) ) +DEFINE_UNICOWS_THUNK( gdi32, BOOL, WINAPI, GetCharWidthFloatW, (HDC,UINT,UINT,PFLOAT) ) +DEFINE_UNICOWS_THUNK( gdi32, BOOL, WINAPI, GetCharWidthW, (HDC,UINT,UINT,LPINT) ) +DEFINE_UNICOWS_THUNK( gdi32, DWORD, WINAPI, GetCharacterPlacementW, (HDC,LPCWSTR,int,int,LPGCP_RESULTSW,DWORD) ) +DEFINE_UNICOWS_THUNK( user32, BOOL, WINAPI, GetClassInfoExW, (HINSTANCE,LPCWSTR,LPWNDCLASSEXW) ) +DEFINE_UNICOWS_THUNK( user32, BOOL, WINAPI, GetClassInfoW, (HINSTANCE,LPCWSTR,LPWNDCLASSW) ) +DEFINE_UNICOWS_THUNK( user32, DWORD, WINAPI, GetClassLongW, (HWND,int) ) +DEFINE_UNICOWS_THUNK( user32, int, WINAPI, GetClassNameW, (HWND,LPWSTR,int) ) +DEFINE_UNICOWS_THUNK( user32, HANDLE, WINAPI, GetClipboardData, (UINT) ) +DEFINE_UNICOWS_THUNK( user32, int, WINAPI, GetClipboardFormatNameW, (UINT,LPWSTR,int) ) +DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, GetComputerNameW, (LPWSTR,PDWORD) ) +DEFINE_UNICOWS_THUNK( kernel32, DWORD, WINAPI, GetConsoleTitleW, (LPWSTR,DWORD) ) +DEFINE_UNICOWS_THUNK( kernel32, int, WINAPI, GetCurrencyFormatW, (LCID,DWORD,LPCWSTR,const CURRENCYFMTW*,LPWSTR,int) ) +DEFINE_UNICOWS_THUNK( kernel32, DWORD, WINAPI, GetCurrentDirectoryW, (DWORD,LPWSTR) ) +DEFINE_UNICOWS_THUNK( advapi32, BOOL, WINAPI, GetCurrentHwProfileW, (LPHW_PROFILE_INFOW) ) +DEFINE_UNICOWS_THUNK( kernel32, int, WINAPI, GetDateFormatW, (LCID,DWORD,const SYSTEMTIME*,LPCWSTR,LPWSTR,int) ) +DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, GetDefaultCommConfigW, (LPCWSTR,LPCOMMCONFIG,PDWORD) ) +//DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, GetDiskFreeSpaceExW, (LPCWSTR,PULARGE_INTEGER,PULARGE_INTEGER,PULARGE_INTEGER) ) +DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, GetDiskFreeSpaceW, (LPCWSTR,PDWORD,PDWORD,PDWORD,PDWORD) ) +DEFINE_UNICOWS_THUNK( user32, UINT, WINAPI, GetDlgItemTextW, (HWND,int,LPWSTR,int) ) +DEFINE_UNICOWS_THUNK( kernel32, UINT, WINAPI, GetDriveTypeW, (LPCWSTR) ) +DEFINE_UNICOWS_THUNK( gdi32, UINT, WINAPI, GetEnhMetaFileDescriptionW, (HENHMETAFILE,UINT,LPWSTR) ) +DEFINE_UNICOWS_THUNK( gdi32, HENHMETAFILE, WINAPI, GetEnhMetaFileW, (LPCWSTR) ) +DEFINE_UNICOWS_THUNK( kernel32, LPWSTR, WINAPI, GetEnvironmentStringsW, (void) ) +DEFINE_UNICOWS_THUNK( kernel32, DWORD, WINAPI, GetEnvironmentVariableW, (LPCWSTR,LPWSTR,DWORD) ) +DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, GetFileAttributesExW, (LPCWSTR,GET_FILEEX_INFO_LEVELS,PVOID) ) +DEFINE_UNICOWS_THUNK( kernel32, DWORD, WINAPI, GetFileAttributesW, (LPCWSTR) ) +DEFINE_UNICOWS_THUNK( comdlg32, short, WINAPI, GetFileTitleW, (LPCWSTR,LPWSTR,WORD) ) +DEFINE_UNICOWS_THUNK( version, DWORD, WINAPI, GetFileVersionInfoSizeW, (LPWSTR,PDWORD) ) +DEFINE_UNICOWS_THUNK( version, BOOL, WINAPI, GetFileVersionInfoW, (LPWSTR,DWORD,DWORD,PVOID) ) +DEFINE_UNICOWS_THUNK( kernel32, DWORD, WINAPI, GetFullPathNameW, (LPCWSTR,DWORD,LPWSTR,LPWSTR*) ) +DEFINE_UNICOWS_THUNK( gdi32, DWORD, WINAPI, GetGlyphOutlineW, (HDC,UINT,UINT,LPGLYPHMETRICS,DWORD,PVOID,const MAT2*) ) +DEFINE_UNICOWS_THUNK( gdi32, BOOL, WINAPI, GetICMProfileW, (HDC,DWORD,LPWSTR) ) +DEFINE_UNICOWS_THUNK( gdi32, DWORD, WINAPI, GetKerningPairsW, (HDC,DWORD,LPKERNINGPAIR) ) +DEFINE_UNICOWS_THUNK( user32, int, WINAPI, GetKeyNameTextW, (LONG,LPWSTR,int) ) +DEFINE_UNICOWS_THUNK( user32, BOOL, WINAPI, GetKeyboardLayoutNameW, (LPWSTR) ) +DEFINE_UNICOWS_THUNK( kernel32, int, WINAPI, GetLocaleInfoW, (LCID,LCTYPE,LPWSTR,int) ) +DEFINE_UNICOWS_THUNK( gdi32, BOOL, WINAPI, GetLogColorSpaceW, (HCOLORSPACE,LPLOGCOLORSPACEW,DWORD) ) +//DEFINE_UNICOWS_THUNK( kernel32, DWORD, WINAPI, GetLogicalDriveStringsW, (DWORD,LPWSTR) ) +//DEFINE_UNICOWS_THUNK( kernel32, DWORD, WINAPI, GetLongPathNameW, (LPCWSTR,LPWSTR,DWORD) ) +DEFINE_UNICOWS_THUNK( user32, BOOL, WINAPI, GetMenuItemInfoW, (HMENU,UINT,BOOL,LPMENUITEMINFOW) ) +DEFINE_UNICOWS_THUNK( user32, int, WINAPI, GetMenuStringW, (HMENU,UINT,LPWSTR,int,UINT) ) +DEFINE_UNICOWS_THUNK( user32, BOOL, WINAPI, GetMessageW, (LPMSG,HWND,UINT,UINT) ) +DEFINE_UNICOWS_THUNK( gdi32, HMETAFILE, WINAPI, GetMetaFileW, (LPCWSTR) ) +DEFINE_UNICOWS_THUNK( kernel32, DWORD, WINAPI, GetModuleFileNameW, (HINSTANCE,LPWSTR,DWORD) ) +DEFINE_UNICOWS_THUNK( kernel32, HMODULE, WINAPI, GetModuleHandleW, (LPCWSTR) ) +DEFINE_UNICOWS_THUNK( user32, BOOL, WINAPI, GetMonitorInfoW, (HMONITOR,LPMONITORINFO) ) +DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, GetNamedPipeHandleStateW, (HANDLE,PDWORD,PDWORD,PDWORD,PDWORD,LPWSTR,DWORD) ) +DEFINE_UNICOWS_THUNK( kernel32, int, WINAPI, GetNumberFormatW, (LCID,DWORD,LPCWSTR,const NUMBERFMTW*,LPWSTR,int) ) +DEFINE_UNICOWS_THUNK( gdi32, int, WINAPI, GetObjectW, (HGDIOBJ,int,PVOID) ) +DEFINE_UNICOWS_THUNK( msvfw32, BOOL, WINAPI, GetOpenFileNamePreviewW, (LPOPENFILENAMEW) ) +DEFINE_UNICOWS_THUNK( comdlg32, BOOL, WINAPI, GetOpenFileNameW, (LPOPENFILENAMEW) ) +DEFINE_UNICOWS_THUNK( gdi32, UINT, WINAPI, GetOutlineTextMetricsW, (HDC,UINT,LPOUTLINETEXTMETRICW) ) +DEFINE_UNICOWS_THUNK( winspool, DWORD, WINAPI, GetPrintProcessorDirectoryW, (LPWSTR,LPWSTR,DWORD,PBYTE,DWORD,PDWORD) ) +DEFINE_UNICOWS_THUNK( kernel32, UINT, WINAPI, GetPrivateProfileIntW, (LPCWSTR,LPCWSTR,INT,LPCWSTR) ) +DEFINE_UNICOWS_THUNK( kernel32, DWORD, WINAPI, GetPrivateProfileSectionNamesW, (LPWSTR,DWORD,LPCWSTR) ) +DEFINE_UNICOWS_THUNK( kernel32, DWORD, WINAPI, GetPrivateProfileSectionW, (LPCWSTR,LPWSTR,DWORD,LPCWSTR) ) +DEFINE_UNICOWS_THUNK( kernel32, DWORD, WINAPI, GetPrivateProfileStringW, (LPCWSTR,LPCWSTR,LPCWSTR,LPWSTR,DWORD,LPCWSTR) ) +DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, GetPrivateProfileStructW, (LPCWSTR,LPCWSTR,LPVOID,UINT,LPCWSTR) ) +DEFINE_UNICOWS_THUNK( kernel32, UINT, WINAPI, GetProfileIntW, (LPCWSTR,LPCWSTR,INT) ) +DEFINE_UNICOWS_THUNK( kernel32, DWORD, WINAPI, GetProfileSectionW, (LPCWSTR,LPWSTR,DWORD) ) +DEFINE_UNICOWS_THUNK( kernel32, DWORD, WINAPI, GetProfileStringW, (LPCWSTR,LPCWSTR,LPCWSTR,LPWSTR,DWORD) ) +DEFINE_UNICOWS_THUNK( user32, HANDLE, WINAPI, GetPropA, (HWND,LPCSTR) ) +DEFINE_UNICOWS_THUNK( user32, HANDLE, WINAPI, GetPropW, (HWND,LPCWSTR) ) +DEFINE_UNICOWS_THUNK( oleacc, UINT, WINAPI, GetRoleTextW, (DWORD,LPWSTR,UINT) ) +DEFINE_UNICOWS_THUNK( msvfw32, BOOL, WINAPI, GetSaveFileNamePreviewW, (LPOPENFILENAMEW) ) +DEFINE_UNICOWS_THUNK( comdlg32, BOOL, WINAPI, GetSaveFileNameW, (LPOPENFILENAMEW) ) +DEFINE_UNICOWS_THUNK( kernel32, DWORD, WINAPI, GetShortPathNameW, (LPCWSTR,LPWSTR,DWORD) ) +DEFINE_UNICOWS_THUNK( kernel32, VOID, WINAPI, GetStartupInfoW, (LPSTARTUPINFOW) ) +DEFINE_UNICOWS_THUNK( oleacc, UINT, WINAPI, GetStateTextW, (DWORD,LPWSTR,UINT) ) +DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, GetStringTypeExW, (LCID,DWORD,LPCWSTR,int,LPWORD) ) +DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, GetStringTypeW, (DWORD,LPCWSTR,int,LPWORD) ) +DEFINE_UNICOWS_THUNK( kernel32, UINT, WINAPI, GetSystemDirectoryW, (LPWSTR,UINT) ) +DEFINE_UNICOWS_THUNK( kernel32, UINT, WINAPI, GetSystemWindowsDirectoryW, (LPWSTR,UINT) ) +DEFINE_UNICOWS_THUNK( user32, DWORD, WINAPI, GetTabbedTextExtentW, (HDC,LPCWSTR,int,int,LPINT) ) +DEFINE_UNICOWS_THUNK( kernel32, UINT, WINAPI, GetTempFileNameW, (LPCWSTR,LPCWSTR,UINT,LPWSTR) ) +DEFINE_UNICOWS_THUNK( kernel32, DWORD, WINAPI, GetTempPathW, (DWORD,LPWSTR) ) +DEFINE_UNICOWS_THUNK( gdi32, BOOL, WINAPI, GetTextExtentExPointW, ( HDC,LPCWSTR,int,int,LPINT,LPINT,LPSIZE ) ) +DEFINE_UNICOWS_THUNK( gdi32, BOOL, WINAPI, GetTextExtentPoint32W, ( HDC,LPCWSTR,int,LPSIZE) ) +DEFINE_UNICOWS_THUNK( gdi32, BOOL, WINAPI, GetTextExtentPointW, (HDC,LPCWSTR,int,LPSIZE) ) +DEFINE_UNICOWS_THUNK( gdi32, int, WINAPI, GetTextFaceW, (HDC,int,LPWSTR) ) +DEFINE_UNICOWS_THUNK( gdi32, BOOL, WINAPI, GetTextMetricsW, (HDC,LPTEXTMETRICW) ) +DEFINE_UNICOWS_THUNK( kernel32, int, WINAPI, GetTimeFormatW, (LCID,DWORD,const SYSTEMTIME*,LPCWSTR,LPWSTR,int) ) +DEFINE_UNICOWS_THUNK( advapi32, BOOL, WINAPI, GetUserNameW, (LPWSTR,PDWORD) ) +DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, GetVersionExW, (LPOSVERSIONINFOW) ) +DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, GetVolumeInformationW, (LPCWSTR,LPWSTR,DWORD,PDWORD,PDWORD,PDWORD,LPWSTR,DWORD) ) +DEFINE_UNICOWS_THUNK( user32, LONG, WINAPI, GetWindowLongA, (HWND,int) ) +DEFINE_UNICOWS_THUNK( user32, LONG, WINAPI, GetWindowLongW, (HWND,int) ) +DEFINE_UNICOWS_THUNK( user32, UINT, WINAPI, GetWindowModuleFileNameW, (HWND,LPWSTR,UINT) ) +DEFINE_UNICOWS_THUNK( user32, int, WINAPI, GetWindowTextLengthW, (HWND) ) +DEFINE_UNICOWS_THUNK( user32, int, WINAPI, GetWindowTextW, (HWND,LPWSTR,int) ) +DEFINE_UNICOWS_THUNK( kernel32, UINT, WINAPI, GetWindowsDirectoryW, (LPWSTR,UINT) ) +DEFINE_UNICOWS_THUNK( kernel32, ATOM, WINAPI, GlobalAddAtomW, ( LPCWSTR) ) +DEFINE_UNICOWS_THUNK( kernel32, ATOM, WINAPI, GlobalFindAtomW, (LPCWSTR) ) +DEFINE_UNICOWS_THUNK( kernel32, UINT, WINAPI, GlobalGetAtomNameW, (ATOM,LPWSTR,int) ) +DEFINE_UNICOWS_THUNK( kernel32, HANDLE, WINAPI, GopherFindFirstFileW, (HANDLE,LPCWSTR,LPCWSTR,LPVOID,DWORD,DWORD) ) +DEFINE_UNICOWS_THUNK( user32, BOOL, WINAPI, GrayStringW, (HDC,HBRUSH,GRAYSTRINGPROC,LPARAM,int,int,int,int,int) ) +DEFINE_UNICOWS_THUNK( user32, HANDLE, WINAPI, ImageList_LoadImageW, (HINSTANCE,LPCWSTR,int,int,COLORREF,UINT,UINT) ) +DEFINE_UNICOWS_THUNK( user32, BOOL, WINAPI, InsertMenuItemW, (HMENU,UINT,BOOL,LPCMENUITEMINFOW) ) +DEFINE_UNICOWS_THUNK( user32, BOOL, WINAPI, InsertMenuW, (HMENU,UINT,UINT,UINT,LPCWSTR) ) +DEFINE_UNICOWS_THUNK( user32, BOOL, WINAPI, InternetFindNextFileW, (HANDLE,PVOID) ) +DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, IsBadStringPtrW, (LPCWSTR,UINT) ) +DEFINE_UNICOWS_THUNK( user32, BOOL, WINAPI, IsCharAlphaNumericW, (WCHAR) ) +DEFINE_UNICOWS_THUNK( user32, BOOL, WINAPI, IsCharAlphaW, (WCHAR) ) +DEFINE_UNICOWS_THUNK( user32, BOOL, WINAPI, IsCharLowerW, (WCHAR) ) +DEFINE_UNICOWS_THUNK( user32, BOOL, WINAPI, IsCharUpperW, (WCHAR) ) +DEFINE_UNICOWS_THUNK( user32, BOOL, WINAPI, IsClipboardFormatAvailable, (UINT) ) +DEFINE_UNICOWS_THUNK( sensapi, BOOL, APIENTRY, IsDestinationReachableW, (LPCWSTR,LPVOID) ) +DEFINE_UNICOWS_THUNK( user32, BOOL, WINAPI, IsDialogMessageW, (HWND,LPMSG) ) +DEFINE_UNICOWS_THUNK( advapi32, BOOL, WINAPI, IsTextUnicode, (PCVOID,int,LPINT) ) +DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, IsValidCodePage, (UINT) ) +DEFINE_UNICOWS_THUNK( user32, BOOL, WINAPI, IsWindowUnicode, (HWND) ) +DEFINE_UNICOWS_THUNK( kernel32, int, WINAPI, LCMapStringW, (LCID,DWORD,LPCWSTR,int,LPWSTR,int) ) +DEFINE_UNICOWS_THUNK( user32, HACCEL, WINAPI, LoadAcceleratorsW, (HINSTANCE,LPCWSTR) ) +DEFINE_UNICOWS_THUNK( user32, HBITMAP, WINAPI, LoadBitmapW, (HINSTANCE,LPCWSTR) ) +DEFINE_UNICOWS_THUNK( user32, HCURSOR, WINAPI, LoadCursorFromFileW, (LPCWSTR) ) +DEFINE_UNICOWS_THUNK( user32, HCURSOR, WINAPI, LoadCursorW, (HINSTANCE,LPCWSTR) ) +DEFINE_UNICOWS_THUNK( user32, HICON, WINAPI, LoadIconW, (HINSTANCE,LPCWSTR) ) +DEFINE_UNICOWS_THUNK( user32, HANDLE, WINAPI, LoadImageW, (HINSTANCE,LPCWSTR,UINT,int,int,UINT) ) +DEFINE_UNICOWS_THUNK( user32, HKL, WINAPI, LoadKeyboardLayoutW, (LPCWSTR,UINT) ) +DEFINE_UNICOWS_THUNK( kernel32, HINSTANCE, WINAPI, LoadLibraryExW, (LPCWSTR,HANDLE,DWORD) ) +DEFINE_UNICOWS_THUNK( kernel32, HINSTANCE, WINAPI, LoadLibraryW, (LPCWSTR) ) +DEFINE_UNICOWS_THUNK( user32, HMENU, WINAPI, LoadMenuIndirectW, (const MENUTEMPLATE*) ) +DEFINE_UNICOWS_THUNK( user32, HMENU, WINAPI, LoadMenuW, (HINSTANCE,LPCWSTR) ) +DEFINE_UNICOWS_THUNK( user32, int, WINAPI, LoadStringW, (HINSTANCE,UINT,LPWSTR,int) ) +DEFINE_UNICOWS_THUNK( user32, HINSTANCE, WINAPI, MLLoadLibraryW, (LPCWSTR,HANDLE,DWORD,LPCWSTR,BOOL) ) +DEFINE_UNICOWS_THUNK( user32, UINT, WINAPI, MapVirtualKeyExW, (UINT,UINT,HKL) ) +DEFINE_UNICOWS_THUNK( user32, UINT, WINAPI, MapVirtualKeyW, (UINT,UINT) ) +DEFINE_UNICOWS_THUNK( user32, int, WINAPI, MessageBoxExW, (HWND,LPCWSTR,LPCWSTR,UINT,WORD) ) +DEFINE_UNICOWS_THUNK( user32, int, WINAPI, MessageBoxIndirectW, (CONST MSGBOXPARAMSW*) ) +DEFINE_UNICOWS_THUNK( user32, int, WINAPI, MessageBoxW, (HWND,LPCWSTR,LPCWSTR,UINT) ) +DEFINE_UNICOWS_THUNK( user32, BOOL, WINAPI, ModifyMenuW, (HMENU,UINT,UINT,UINT,LPCWSTR) ) +DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, MoveFileW, (LPCWSTR,LPCWSTR) ) +DEFINE_UNICOWS_THUNK( kernel32, int, WINAPI, MultiByteToWideChar, (UINT,DWORD,LPCSTR,int,LPWSTR,int) ) +DEFINE_UNICOWS_THUNK( mpr, DWORD, APIENTRY, MultinetGetConnectionPerformanceW, (LPNETRESOURCEW,LPNETCONNECTINFOSTRUCT) ) +DEFINE_UNICOWS_THUNK( user32, BOOL, WINAPI, OemToCharBuffW, (LPCSTR,LPWSTR,DWORD) ) +DEFINE_UNICOWS_THUNK( user32, BOOL, WINAPI, OemToCharW, (LPCSTR,LPWSTR) ) +DEFINE_UNICOWS_THUNK( kernel32, HANDLE, WINAPI, OpenEventW, (DWORD,BOOL,LPCWSTR) ) +DEFINE_UNICOWS_THUNK( kernel32, HANDLE, WINAPI, OpenFileMappingW, (DWORD,BOOL,LPCWSTR) ) +DEFINE_UNICOWS_THUNK( kernel32, HANDLE, WINAPI, OpenMutexW, (DWORD,BOOL,LPCWSTR) ) +DEFINE_UNICOWS_THUNK( winspool, BOOL, WINAPI, OpenPrinterW, (LPWSTR,PHANDLE,LPPRINTER_DEFAULTSW) ) +DEFINE_UNICOWS_THUNK( kernel32, HANDLE, WINAPI, OpenSemaphoreW, (DWORD,BOOL,LPCWSTR) ) +DEFINE_UNICOWS_THUNK( kernel32, HANDLE, WINAPI, OpenWaitableTimerW, (DWORD,BOOL,LPCWSTR) ) +DEFINE_UNICOWS_THUNK( kernel32, void, WINAPI, OutputDebugStringW, (LPCWSTR) ) +DEFINE_UNICOWS_THUNK( comdlg32, BOOL, WINAPI, PageSetupDlgW, (LPPAGESETUPDLGW) ) +DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, PeekConsoleInputW, (HANDLE,PINPUT_RECORD,DWORD,PDWORD) ) +DEFINE_UNICOWS_THUNK( user32, BOOL, WINAPI, PeekMessageW, (LPMSG,HWND,UINT,UINT,UINT) ) +DEFINE_UNICOWS_THUNK( winmm, BOOL, WINAPI, PlaySoundW, (LPCWSTR,HMODULE,DWORD) ) +DEFINE_UNICOWS_THUNK( gdi32, BOOL, WINAPI, PolyTextOutW, (HDC,const POLYTEXTW*,int) ) +DEFINE_UNICOWS_THUNK( user32, BOOL, WINAPI, PostMessageW, (HWND,UINT,WPARAM,LPARAM) ) +DEFINE_UNICOWS_THUNK( user32, BOOL, WINAPI, PostThreadMessageW, (DWORD,UINT,WPARAM,LPARAM) ) +DEFINE_UNICOWS_THUNK( comdlg32, BOOL, WINAPI, PrintDlgW, (LPPRINTDLGW) ) +DEFINE_UNICOWS_THUNK( comdlg32, DWORD, WINAPI, PrinterMessageBoxW, (HANDLE,DWORD,HWND,LPWSTR,LPWSTR,DWORD) ) +DEFINE_UNICOWS_THUNK( kernel32, DWORD, WINAPI, QueryDosDeviceW, (LPCWSTR,LPWSTR,DWORD) ) +DEFINE_UNICOWS_THUNK( rasapi32, DWORD, APIENTRY, RasConnectionNotificationW, (HANDLE, HANDLE, DWORD) ) +DEFINE_UNICOWS_THUNK( rasapi32, DWORD, APIENTRY, RasCreatePhonebookEntryW, (HWND, LPCWSTR) ) +DEFINE_UNICOWS_THUNK( rasapi32, DWORD, APIENTRY, RasDeleteEntryW, (LPCWSTR, LPCWSTR) ) +DEFINE_UNICOWS_THUNK( rasapi32, DWORD, APIENTRY, RasDeleteSubEntryW, (LPCWSTR, LPCWSTR, DWORD) ) +DEFINE_UNICOWS_THUNK( rasapi32, DWORD, APIENTRY, RasEditPhonebookEntryW, (HWND, LPCWSTR, LPCWSTR) ) +DEFINE_UNICOWS_THUNK( rasapi32, DWORD, APIENTRY, RasEnumConnectionsW, (LPVOID, LPDWORD, LPDWORD) ) +DEFINE_UNICOWS_THUNK( rasapi32, DWORD, APIENTRY, RasEnumDevicesW, (LPVOID, LPDWORD, LPDWORD) ) +DEFINE_UNICOWS_THUNK( rasapi32, DWORD, APIENTRY, RasEnumEntriesW, (LPCWSTR, LPCWSTR, LPVOID, LPDWORD, LPDWORD) ) +DEFINE_UNICOWS_THUNK( rasapi32, DWORD, APIENTRY, RasGetConnectStatusW, (HANDLE, LPVOID) ) +DEFINE_UNICOWS_THUNK( rasapi32, DWORD, APIENTRY, RasGetEntryDialParamsW, (LPCWSTR, LPVOID, LPBOOL) ) +DEFINE_UNICOWS_THUNK( rasapi32, DWORD, APIENTRY, RasGetEntryPropertiesW, (LPCWSTR, LPCWSTR, LPVOID, LPDWORD, LPBYTE, LPDWORD) ) +DEFINE_UNICOWS_THUNK( rasapi32, DWORD, APIENTRY, RasGetErrorStringW, (UINT, LPWSTR, DWORD) ) +DEFINE_UNICOWS_THUNK( rasapi32, DWORD, APIENTRY, RasHangUpW, (HANDLE) ) +DEFINE_UNICOWS_THUNK( rasapi32, DWORD, APIENTRY, RasRenameEntryW, (LPCWSTR, LPCWSTR, LPCWSTR) ) +DEFINE_UNICOWS_THUNK( rasapi32, DWORD, APIENTRY, RasSetEntryDialParamsW, (LPCWSTR, LPVOID, BOOL) ) +DEFINE_UNICOWS_THUNK( rasapi32, DWORD, APIENTRY, RasSetEntryPropertiesW, (LPCWSTR, LPCWSTR, LPVOID, DWORD, LPBYTE, DWORD) ) +DEFINE_UNICOWS_THUNK( rasapi32, DWORD, APIENTRY, RasSetSubEntryPropertiesW, (LPCWSTR, LPCWSTR, DWORD, LPVOID, DWORD, LPBYTE, DWORD) ) +DEFINE_UNICOWS_THUNK( rasapi32, DWORD, APIENTRY, RasValidateEntryNameW, (LPCWSTR, LPCWSTR) ) +DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, ReadConsoleInputW, (HANDLE,PINPUT_RECORD,DWORD,PDWORD) ) +DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, ReadConsoleOutputCharacterW, (HANDLE,LPWSTR,DWORD,COORD,PDWORD) ) +DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, ReadConsoleOutputW, (HANDLE,PCHAR_INFO,COORD,COORD,PSMALL_RECT) ) +DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, ReadConsoleW, (HANDLE,PVOID,DWORD,PDWORD,PVOID) ) +DEFINE_UNICOWS_THUNK( advapi32, LONG, WINAPI, RegConnectRegistryW, (LPCWSTR,HKEY,PHKEY) ) +DEFINE_UNICOWS_THUNK( advapi32, LONG, WINAPI, RegCreateKeyExW, (HKEY,LPCWSTR,DWORD,LPWSTR,DWORD,REGSAM,LPSECURITY_ATTRIBUTES,PHKEY,PDWORD) ) +DEFINE_UNICOWS_THUNK( advapi32, LONG, WINAPI, RegCreateKeyW, (HKEY,LPCWSTR,PHKEY) ) +DEFINE_UNICOWS_THUNK( advapi32, LONG, WINAPI, RegDeleteKeyW, (HKEY,LPCWSTR) ) +DEFINE_UNICOWS_THUNK( advapi32, LONG, WINAPI, RegDeleteValueW, (HKEY,LPCWSTR) ) +DEFINE_UNICOWS_THUNK( advapi32, LONG, WINAPI, RegEnumKeyExW, (HKEY,DWORD,LPWSTR,PDWORD,PDWORD,LPWSTR,PDWORD,PFILETIME) ) +DEFINE_UNICOWS_THUNK( advapi32, LONG, WINAPI, RegEnumKeyW, (HKEY,DWORD,LPWSTR,DWORD) ) +DEFINE_UNICOWS_THUNK( advapi32, LONG, WINAPI, RegEnumValueW, (HKEY,DWORD,LPWSTR,PDWORD,PDWORD,PDWORD,LPBYTE,PDWORD) ) +DEFINE_UNICOWS_THUNK( advapi32, LONG, WINAPI, RegLoadKeyW, (HKEY,LPCWSTR,LPCWSTR) ) +DEFINE_UNICOWS_THUNK( advapi32, LONG, WINAPI, RegOpenKeyExW, (HKEY,LPCWSTR,DWORD,REGSAM,PHKEY) ) +DEFINE_UNICOWS_THUNK( advapi32, LONG, WINAPI, RegOpenKeyW, (HKEY,LPCWSTR,PHKEY) ) +DEFINE_UNICOWS_THUNK( advapi32, LONG, WINAPI, RegQueryInfoKeyW, (HKEY,LPWSTR,PDWORD,PDWORD,PDWORD,PDWORD,PDWORD,PDWORD,PDWORD,PDWORD,PDWORD,PFILETIME) ) +DEFINE_UNICOWS_THUNK( advapi32, LONG, WINAPI, RegQueryMultipleValuesW, (HKEY,PVALENTW,DWORD,LPWSTR,LPDWORD) ) +DEFINE_UNICOWS_THUNK( advapi32, LONG, WINAPI, RegQueryValueExW, (HKEY,LPCWSTR,LPDWORD,LPDWORD,LPBYTE,LPDWORD) ) +DEFINE_UNICOWS_THUNK( advapi32, LONG, WINAPI, RegQueryValueW, (HKEY,LPCWSTR,LPWSTR,PLONG) ) +DEFINE_UNICOWS_THUNK( advapi32, LONG, WINAPI, RegReplaceKeyW, (HKEY,LPCWSTR,LPCWSTR,LPCWSTR) ) +DEFINE_UNICOWS_THUNK( advapi32, LONG, WINAPI, RegSaveKeyW, (HKEY,LPCWSTR,LPSECURITY_ATTRIBUTES) ) +DEFINE_UNICOWS_THUNK( advapi32, LONG, WINAPI, RegSetValueExW, (HKEY,LPCWSTR,DWORD,DWORD,const BYTE*,DWORD) ) +DEFINE_UNICOWS_THUNK( advapi32, LONG, WINAPI, RegSetValueW, (HKEY,LPCWSTR,DWORD,LPCWSTR,DWORD) ) +DEFINE_UNICOWS_THUNK( advapi32, LONG, WINAPI, RegUnLoadKeyW, (HKEY,LPCWSTR) ) +DEFINE_UNICOWS_THUNK( user32, ATOM, WINAPI, RegisterClassExW, (CONST WNDCLASSEXW*) ) +DEFINE_UNICOWS_THUNK( user32, ATOM, WINAPI, RegisterClassW, (CONST WNDCLASSW*) ) +DEFINE_UNICOWS_THUNK( user32, UINT, WINAPI, RegisterClipboardFormatW, (LPCWSTR) ) +DEFINE_UNICOWS_THUNK( user32, HDEVNOTIFY, WINAPI, RegisterDeviceNotificationW, (HANDLE,LPVOID,DWORD) ) +DEFINE_UNICOWS_THUNK( user32, UINT, WINAPI, RegisterWindowMessageW, (LPCWSTR) ) +DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, RemoveDirectoryW, (LPCWSTR) ) +DEFINE_UNICOWS_THUNK( gdi32, BOOL, WINAPI, RemoveFontResourceW, (LPCWSTR) ) +DEFINE_UNICOWS_THUNK( user32, HANDLE, WINAPI, RemovePropA, (HWND,LPCSTR) ) +DEFINE_UNICOWS_THUNK( user32, HANDLE, WINAPI, RemovePropW, (HWND,LPCWSTR) ) +DEFINE_UNICOWS_THUNK( comdlg32, HWND, WINAPI, ReplaceTextW, (LPFINDREPLACEW) ) +DEFINE_UNICOWS_THUNK( gdi32, HDC, WINAPI, ResetDCW, (HDC,const DEVMODEW*) ) +DEFINE_UNICOWS_THUNK( shell32, LPVOID, WINAPI, SHBrowseForFolderW, (LPVOID) ) +DEFINE_UNICOWS_THUNK( shell32, void, WINAPI, SHChangeNotify, (LONG,UINT,PCVOID,PCVOID) ) +DEFINE_UNICOWS_THUNK( shell32, INT, WINAPI, SHCreateDirectoryExW, (HWND,LPCWSTR,LPSECURITY_ATTRIBUTES) ) +DEFINE_UNICOWS_THUNK( shell32, int, WINAPI, SHFileOperationW, (LPSHFILEOPSTRUCTW) ) +DEFINE_UNICOWS_THUNK( shell32, DWORD, WINAPI, SHGetFileInfoW, (LPCWSTR,DWORD,SHFILEINFOW*,UINT,UINT) ) +DEFINE_UNICOWS_THUNK( shell32, BOOL, WINAPI, SHGetNewLinkInfoW, (LPCWSTR,DWORD,SHFILEINFOW*,UINT,UINT) ) +DEFINE_UNICOWS_THUNK( shell32, BOOL, WINAPI, SHGetPathFromIDListW, (LPVOID,LPWSTR) ) +DEFINE_UNICOWS_THUNK( shell32, int, __stdcall, SQLGetPrivateProfileStringW, (LPCWSTR,LPCWSTR,LPCWSTR,LPWSTR,int,LPCWSTR) ) +DEFINE_UNICOWS_THUNK( shell32, BOOL, __stdcall, SQLWritePrivateProfileStringW, (LPCWSTR,LPCWSTR,LPCWSTR,LPCWSTR) ) +DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, ScrollConsoleScreenBufferW, (HANDLE,const SMALL_RECT*,const SMALL_RECT*,COORD,const CHAR_INFO*) ) +DEFINE_UNICOWS_THUNK( kernel32, DWORD, WINAPI, SearchPathW, (LPCWSTR,LPCWSTR,LPCWSTR,DWORD,LPWSTR,LPWSTR*) ) +DEFINE_UNICOWS_THUNK( user32, LONG, WINAPI, SendDlgItemMessageW, (HWND,int,UINT,WPARAM,LPARAM) ) +DEFINE_UNICOWS_THUNK( user32, BOOL, WINAPI, SendMessageCallbackW, (HWND,UINT,WPARAM,LPARAM,SENDASYNCPROC,DWORD) ) +DEFINE_UNICOWS_THUNK( user32, LRESULT, WINAPI, SendMessageTimeoutW, (HWND,UINT,WPARAM,LPARAM,UINT,UINT,PDWORD) ) +DEFINE_UNICOWS_THUNK( user32, LRESULT, WINAPI, SendMessageW, (HWND,UINT,WPARAM,LPARAM) ) +DEFINE_UNICOWS_THUNK( user32, BOOL, WINAPI, SendNotifyMessageW, (HWND,UINT,WPARAM,LPARAM) ) +DEFINE_UNICOWS_THUNK( kernel32, int, WINAPI, SetCalendarInfoW, (LCID,CALID,CALTYPE,LPCWSTR) ) +DEFINE_UNICOWS_THUNK( user32, DWORD, WINAPI, SetClassLongW, (HWND,int,LONG) ) +DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, SetComputerNameW, (LPCWSTR) ) +DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, SetConsoleTitleW, (LPCWSTR) ) +DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, SetCurrentDirectoryW, (LPCWSTR) ) +DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, SetDefaultCommConfigW, (LPCWSTR,LPCOMMCONFIG,DWORD) ) +DEFINE_UNICOWS_THUNK( user32, BOOL, WINAPI, SetDlgItemTextW, (HWND,int,LPCWSTR) ) +DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, SetEnvironmentVariableW, (LPCWSTR,LPCWSTR) ) +DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, SetFileAttributesW, (LPCWSTR,DWORD) ) +DEFINE_UNICOWS_THUNK( gdi32, BOOL, WINAPI, SetICMProfileW, (HDC,LPWSTR) ) +DEFINE_UNICOWS_THUNK( winspool, BOOL, WINAPI, SetJobW, (HANDLE,DWORD,DWORD,PBYTE,DWORD) ) +DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, SetLocaleInfoW, (LCID,LCTYPE,LPCWSTR) ) +DEFINE_UNICOWS_THUNK( user32, BOOL, WINAPI, SetMenuItemInfoW, ( HMENU,UINT,BOOL,LPCMENUITEMINFOW) ) +DEFINE_UNICOWS_THUNK( winspool, BOOL, WINAPI, SetPrinterDataW, (HANDLE,LPWSTR,DWORD,PBYTE,DWORD) ) +DEFINE_UNICOWS_THUNK( winspool, BOOL, WINAPI, SetPrinterW, (HANDLE,DWORD,PBYTE,DWORD) ) +DEFINE_UNICOWS_THUNK( user32, BOOL, WINAPI, SetPropA, (HWND,LPCSTR,HANDLE) ) +DEFINE_UNICOWS_THUNK( user32, BOOL, WINAPI, SetPropW, (HWND,LPCWSTR,HANDLE) ) +DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, SetVolumeLabelW, (LPCWSTR,LPCWSTR) ) +DEFINE_UNICOWS_THUNK( user32, LONG, WINAPI, SetWindowLongA, (HWND,int,LONG) ) +DEFINE_UNICOWS_THUNK( user32, LONG, WINAPI, SetWindowLongW, (HWND,int,LONG) ) +DEFINE_UNICOWS_THUNK( user32, BOOL, WINAPI, SetWindowTextW, (HWND,LPCWSTR) ) +DEFINE_UNICOWS_THUNK( user32, HHOOK, WINAPI, SetWindowsHookExW, (int,HOOKPROC,HINSTANCE,DWORD) ) +DEFINE_UNICOWS_THUNK( user32, HHOOK, WINAPI, SetWindowsHookW, (int,HOOKPROC) ) +DEFINE_UNICOWS_THUNK( shell32, int, WINAPI, ShellAboutW, (HWND,LPCWSTR,LPCWSTR,HICON) ) +DEFINE_UNICOWS_THUNK( shell32, BOOL, WINAPI, ShellExecuteExW, (LPSHELLEXECUTEINFOW) ) +DEFINE_UNICOWS_THUNK( shell32, HINSTANCE, WINAPI, ShellExecuteW, (HWND,LPCWSTR,LPCWSTR,LPCWSTR,LPCWSTR,INT) ) +DEFINE_UNICOWS_THUNK( shell32, BOOL, WINAPI, Shell_NotifyIconW, (DWORD,PNOTIFYICONDATAW) ) +DEFINE_UNICOWS_THUNK( winspool, DWORD, WINAPI, StartDocPrinterW, (HANDLE,DWORD,PBYTE) ) +DEFINE_UNICOWS_THUNK( gdi32, int, WINAPI, StartDocW, (HDC,const DOCINFOW*) ) +DEFINE_UNICOWS_THUNK( user32, BOOL, WINAPI, SystemParametersInfoW, (UINT,UINT,PVOID,UINT) ) +DEFINE_UNICOWS_THUNK( user32, LONG, WINAPI, TabbedTextOutW, (HDC,int,int,LPCWSTR,int,int,LPINT,int) ) +DEFINE_UNICOWS_THUNK( gdi32, BOOL, WINAPI, TextOutW, (HDC,int,int,LPCWSTR,int) ) +DEFINE_UNICOWS_THUNK( user32, int, WINAPI, TranslateAcceleratorW, (HWND,HACCEL,LPMSG) ) +DEFINE_UNICOWS_THUNK( user32, BOOL, WINAPI, UnregisterClassW, (LPCWSTR,HINSTANCE) ) +DEFINE_UNICOWS_THUNK( gdi32, BOOL, WINAPI, UpdateICMRegKeyW, (DWORD,DWORD,LPWSTR,UINT) ) +DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, UpdateResourceW, (HANDLE,LPCWSTR,LPCWSTR,WORD,PVOID,DWORD) ) +DEFINE_UNICOWS_THUNK( version, DWORD, WINAPI, VerFindFileW, (DWORD,LPWSTR,LPWSTR,LPWSTR,LPWSTR,PUINT,LPWSTR,PUINT) ) +DEFINE_UNICOWS_THUNK( version, DWORD, WINAPI, VerInstallFileW, (DWORD,LPWSTR,LPWSTR,LPWSTR,LPWSTR,LPWSTR,LPWSTR,PUINT) ) +DEFINE_UNICOWS_THUNK( kernel32, DWORD, WINAPI, VerLanguageNameW, (DWORD,LPWSTR,DWORD) ) +DEFINE_UNICOWS_THUNK( version, BOOL, WINAPI, VerQueryValueW, (const LPVOID,LPWSTR,LPVOID*,PUINT) ) +DEFINE_UNICOWS_THUNK( user32, SHORT, WINAPI, VkKeyScanExW, (WCHAR,HKL) ) +DEFINE_UNICOWS_THUNK( user32, SHORT, WINAPI, VkKeyScanW, (WCHAR) ) +DEFINE_UNICOWS_THUNK( user32, DWORD, WINAPI, SetupDecompressOrCopyFileW, (PCWSTR,PCWSTR,PUINT) ) +DEFINE_UNICOWS_THUNK( mpr, DWORD, APIENTRY, WNetAddConnection2W, (LPNETRESOURCEW,LPCWSTR,LPCWSTR,DWORD) ) +DEFINE_UNICOWS_THUNK( mpr, DWORD, APIENTRY, WNetAddConnection3W, (HWND,LPNETRESOURCEW,LPCWSTR,LPCWSTR,DWORD) ) +DEFINE_UNICOWS_THUNK( mpr, DWORD, APIENTRY, WNetAddConnectionW, (LPCWSTR,LPCWSTR,LPCWSTR) ) +DEFINE_UNICOWS_THUNK( mpr, DWORD, APIENTRY, WNetCancelConnection2W, (LPCWSTR,DWORD,BOOL) ) +DEFINE_UNICOWS_THUNK( mpr, DWORD, APIENTRY, WNetCancelConnectionW, (LPCWSTR,BOOL) ) +DEFINE_UNICOWS_THUNK( mpr, DWORD, APIENTRY, WNetConnectionDialog1W, (LPCONNECTDLGSTRUCTW) ) +DEFINE_UNICOWS_THUNK( mpr, DWORD, APIENTRY, WNetDisconnectDialog1W, (LPDISCDLGSTRUCTW) ) +DEFINE_UNICOWS_THUNK( mpr, DWORD, APIENTRY, WNetEnumResourceW, (HANDLE,PDWORD,PVOID,PDWORD) ) +DEFINE_UNICOWS_THUNK( mpr, DWORD, APIENTRY, WNetGetConnectionW, (LPCWSTR,LPWSTR,PDWORD) ) +DEFINE_UNICOWS_THUNK( mpr, DWORD, APIENTRY, WNetGetLastErrorW, (PDWORD,LPWSTR,DWORD,LPWSTR,DWORD) ) +DEFINE_UNICOWS_THUNK( mpr, DWORD, APIENTRY, WNetGetNetworkInformationW, (LPCWSTR,LPNETINFOSTRUCT) ) +DEFINE_UNICOWS_THUNK( mpr, DWORD, APIENTRY, WNetGetProviderNameW, (DWORD,LPWSTR,PDWORD) ) +DEFINE_UNICOWS_THUNK( mpr, DWORD, APIENTRY, WNetGetResourceInformationW, (LPNETRESOURCEA,LPVOID,LPDWORD,LPWSTR*) ) +DEFINE_UNICOWS_THUNK( mpr, DWORD, APIENTRY, WNetGetResourceParentW, (LPNETRESOURCEW,LPVOID,LPDWORD) ) +DEFINE_UNICOWS_THUNK( mpr, DWORD, APIENTRY, WNetGetUniversalNameW, (LPCWSTR,DWORD,PVOID,PDWORD) ) +DEFINE_UNICOWS_THUNK( mpr, DWORD, APIENTRY, WNetGetUserW, (LPCWSTR,LPWSTR,PDWORD) ) +DEFINE_UNICOWS_THUNK( mpr, DWORD, APIENTRY, WNetOpenEnumW, (DWORD,DWORD,DWORD,LPNETRESOURCEW,LPHANDLE) ) +DEFINE_UNICOWS_THUNK( mpr, DWORD, APIENTRY, WNetUseConnectionW, (HWND,LPNETRESOURCEW,LPCWSTR,LPCWSTR,DWORD,LPWSTR,PDWORD,PDWORD) ) +DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, WaitNamedPipeW, (LPCWSTR,DWORD) ) +DEFINE_UNICOWS_THUNK( kernel32, int, WINAPI, WideCharToMultiByte, (UINT,DWORD,LPCWSTR,int,LPSTR,int,LPCSTR,LPBOOL) ) +DEFINE_UNICOWS_THUNK( user32, BOOL, WINAPI, WinHelpW, (HWND,LPCWSTR,UINT,DWORD) ) +DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, WriteConsoleInputW, (HANDLE,const INPUT_RECORD*,DWORD,PDWORD) ) +DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, WriteConsoleOutputCharacterW, (HANDLE,LPCWSTR,DWORD,COORD,PDWORD) ) +DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, WriteConsoleOutputW, (HANDLE,const CHAR_INFO*,COORD,COORD,PSMALL_RECT) ) +DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, WriteConsoleW, (HANDLE,PCVOID,DWORD,PDWORD,PVOID) ) +DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, WritePrivateProfileSectionW, (LPCWSTR,LPCWSTR,LPCWSTR) ) +DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, WritePrivateProfileStringW, (LPCWSTR,LPCWSTR,LPCWSTR,LPCWSTR) ) +DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, WritePrivateProfileStructW, (LPCWSTR,LPCWSTR,LPVOID,UINT,LPCWSTR) ) +DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, WriteProfileSectionW, (LPCWSTR,LPCWSTR) ) +DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, WriteProfileStringW, (LPCWSTR,LPCWSTR,LPCWSTR) ) +DEFINE_UNICOWS_THUNK( avicap32, HWND, WINAPI, capCreateCaptureWindowW, (LPCWSTR, DWORD, int, int, int, int, HWND, int) ) +DEFINE_UNICOWS_THUNK( avicap32, BOOL, WINAPI, capGetDriverDescriptionW, (UINT, LPWSTR, int, LPWSTR, int) ) +DEFINE_UNICOWS_THUNK( kernel32, LPWSTR, WINAPI, lstrcatW, (LPWSTR,LPCWSTR) ) +DEFINE_UNICOWS_THUNK( kernel32, int, WINAPI, lstrcmpW, (LPCWSTR,LPCWSTR) ) +DEFINE_UNICOWS_THUNK( kernel32, int, WINAPI, lstrcmpiW, ( LPCWSTR,LPCWSTR) ) +DEFINE_UNICOWS_THUNK( kernel32, LPWSTR, WINAPI, lstrcpyW, (LPWSTR,LPCWSTR) ) +DEFINE_UNICOWS_THUNK( kernel32, LPWSTR, WINAPI, lstrcpynW, (LPWSTR,LPCWSTR,int) ) +DEFINE_UNICOWS_THUNK( kernel32, int, WINAPI, lstrlenW, (LPCWSTR) ) +DEFINE_UNICOWS_THUNK( winmm, BOOL, WINAPI, sndPlaySoundW, (LPCWSTR,UINT) ) +DEFINE_UNICOWS_THUNK( winmm, PROC, WINAPI, wglGetProcAddress, (LPCSTR) ) +DEFINE_UNICOWS_THUNK( user32, int, WINAPIV, wsprintfW, (LPWSTR,LPCWSTR,...) ) +DEFINE_UNICOWS_THUNK( user32, int, WINAPI, wvsprintfW, (LPWSTR,LPCWSTR,va_list arglist) ) +#endif --- oo_1.1.1_src/sal/systools/win32/uwinapi/macros.h.orig 2003-06-12 18:47:18.000000000 +0900 +++ oo_1.1.1_src/sal/systools/win32/uwinapi/macros.h 2004-03-29 12:17:38.000000000 +0900 @@ -132,6 +132,31 @@ +#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; \ @@ -152,9 +177,27 @@ 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() \ @@ -167,9 +210,32 @@ _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; \ @@ -188,4 +254,5 @@ SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); \ return (rettype)0; \ } +#endif --- oo_1.1.1_src/sal/systools/win32/uwinapi/sntprintf.c.orig 2002-12-11 01:16:44.000000000 +0900 +++ oo_1.1.1_src/sal/systools/win32/uwinapi/sntprintf.c 2004-03-29 12:17:38.000000000 +0900 @@ -11,8 +11,11 @@ /* The non-debug versions of _vscprintf/_scprintf are just calls to _vsprintf/_sprintf with string buffer pointer set to NULL, requires MSVCRT version 7.0 */ - +#ifdef __MINGW32__ +static int __cdecl _vsctprintf( const TCHAR *format, va_list ap ) +#else static int __cdecl _vsctprintf( const _TXCHAR *format, va_list ap ) +#endif { FILE *fp = _tfopen( _T("NUL"), _T("wb") ); --- oo_1.1.1_src/sal/systools/win32/uwinapi/unicows_mingw.dxp.orig 2003-03-27 01:46:50.000000000 +0900 +++ oo_1.1.1_src/sal/systools/win32/uwinapi/unicows_mingw.dxp 2004-03-29 12:17:38.000000000 +0900 @@ -87,496 +87,493 @@ ; ;************************************************************************* -;AcquireCredentialsHandleW -AddAtomW -AddFontResourceW -AddJobW -;AddMonitorW -AddPortW -AddPrintProcessorW -AddPrintProvidorW -AddPrinterDriverW -AddPrinterW -AdvancedDocumentPropertiesW -AppendMenuW -BeginUpdateResourceW -BroadcastSystemMessageW -BuildCommDCBAndTimeoutsW -BuildCommDCBW -CallMsgFilterW -CallNamedPipeW -CallWindowProcA -CallWindowProcW -ChangeDisplaySettingsExW -ChangeDisplaySettingsW -ChangeMenuW -CharLowerBuffW -CharLowerW -CharNextW -CharPrevW -CharToOemBuffW -CharToOemW -CharUpperBuffW -CharUpperW -ChooseColorW -ChooseFontW -CommConfigDialogW -CompareStringW -ConfigurePortW -CopyAcceleratorTableW -CopyEnhMetaFileW -CopyFileExW -CopyFileW -CopyMetaFileW -CreateAcceleratorTableW -CreateColorSpaceW -CreateDCW -CreateDialogIndirectParamW -CreateDialogParamW -CreateDirectoryExW -CreateDirectoryW -CreateEnhMetaFileW -CreateEventW -CreateFileMappingW -CreateFileW -CreateFontIndirectW -CreateFontW -CreateICW -CreateMDIWindowW -CreateMailslotW -CreateMetaFileW -CreateMutexW -;CreateNamedPipeW -CreateProcessW -CreateScalableFontResourceW -CreateSemaphoreW -CreateStdAccessibleProxyW -CreateWaitableTimerW -CreateWindowExW -DdeConnect -DdeConnectList -DdeCreateStringHandleW -DdeInitializeW -DdeQueryConvInfo -DdeQueryStringW -DefDlgProcW -DefFrameProcW -DefMDIChildProcW -DefWindowProcW -DeleteFileW -DeleteMonitorW -DeletePortW -DeletePrintProcessorW -DeletePrintProvidorW -DeletePrinterDriverW -;DeviceCapabilitiesW -DialogBoxIndirectParamW -DialogBoxParamW -DispatchMessageW -DlgDirListComboBoxW -DlgDirListW -DlgDirSelectComboBoxExW -DlgDirSelectExW -;DocumentPropertiesW -DragQueryFileW -DrawStateW -DrawTextExW -DrawTextW -EnableWindow -EndUpdateResourceW -EnumCalendarInfoExW -EnumCalendarInfoW -EnumClipboardFormats -EnumDateFormatsExW -EnumDateFormatsW -EnumDisplayDevicesW -EnumDisplaySettingsExW -EnumDisplaySettingsW -EnumFontFamiliesExW -EnumFontFamiliesW -EnumFontsW -EnumICMProfilesW -;EnumMonitorsW -;EnumPortsW -;EnumPrintProcessorDatatypesW -;EnumPrintProcessorsW -;EnumPrinterDriversW -;EnumPrintersW -EnumPropsA -EnumPropsExA -EnumPropsExW -EnumPropsW -EnumSystemCodePagesW -EnumSystemLocalesW -EnumTimeFormatsW -;EnumerateSecurityPackagesW -ExpandEnvironmentStringsW -ExtTextOutW -ExtractIconExW -ExtractIconW -FatalAppExitW -FillConsoleOutputCharacterW -FindAtomW -;FindExecutableW -FindFirstChangeNotificationW -FindFirstFileW -FindNextFileW -FindResourceExW -FindResourceW -FindTextW -FindWindowExW -FindWindowW -FormatMessageW -;FreeContextBufferW -FreeEnvironmentStringsW -GetAltTabInfoW -GetAtomNameW -GetCPInfo -GetCPInfoExW -GetCalendarInfoW -;GetCharABCWidthsFloatW -GetCharABCWidthsW -GetCharWidthFloatW -GetCharWidthW -GetCharacterPlacementW -GetClassInfoExW -GetClassInfoW -GetClassLongW -GetClassNameW -GetClipboardData -GetClipboardFormatNameW -GetComputerNameW -GetConsoleTitleW -GetCurrencyFormatW -GetCurrentDirectoryW -GetCurrentHwProfileW -GetDateFormatW -GetDefaultCommConfigW -GetDiskFreeSpaceExW -GetDiskFreeSpaceW -GetDlgItemTextW -GetDriveTypeW -GetEnhMetaFileDescriptionW -GetEnhMetaFileW -GetEnvironmentStringsW -GetEnvironmentVariableW -GetFileAttributesExW -GetFileAttributesW -GetFileTitleW -GetFileVersionInfoSizeW -GetFileVersionInfoW -GetFullPathNameW -GetGlyphOutlineW -GetICMProfileW -;GetJobW -GetKerningPairsW -GetKeyNameTextW -GetKeyboardLayoutNameW -GetLocaleInfoW -GetLogColorSpaceW -GetLogicalDriveStringsW -GetLongPathNameW -GetMenuItemInfoW -GetMenuStringW -GetMessageW -GetMetaFileW -GetModuleFileNameW -GetModuleHandleW -GetMonitorInfoW -GetNamedPipeHandleStateW -GetNumberFormatW -GetObjectW -GetOpenFileNamePreviewW -GetOpenFileNameW -GetOutlineTextMetricsW -GetPrintProcessorDirectoryW -;GetPrinterDataW -;GetPrinterDriverDirectoryW -;GetPrinterDriverW -;GetPrinterW -GetPrivateProfileIntW -GetPrivateProfileSectionNamesW -GetPrivateProfileSectionW -GetPrivateProfileStringW -GetPrivateProfileStructW -GetProcAddress -GetProfileIntW -GetProfileSectionW -GetProfileStringW -GetPropA -GetPropW -GetRoleTextW -GetSaveFileNamePreviewW -GetSaveFileNameW -GetShortPathNameW -GetStartupInfoW -GetStateTextW -GetStringTypeExW -GetStringTypeW -GetSystemDirectoryW -GetSystemWindowsDirectoryW -GetTabbedTextExtentW -GetTempFileNameW -GetTempPathW -GetTextExtentExPointW -GetTextExtentPoint32W -GetTextExtentPointW -GetTextFaceW -GetTextMetricsW -GetTimeFormatW -GetUserNameW -GetVersionExW -GetVolumeInformationW -GetWindowLongA -GetWindowLongW -GetWindowModuleFileNameW -GetWindowTextLengthW -GetWindowTextW -GetWindowsDirectoryW -GlobalAddAtomW -GlobalFindAtomW -GlobalGetAtomNameW -GrayStringW -;InitSecurityInterfaceW -;InitializeSecurityContextW -InsertMenuItemW -InsertMenuW -IsBadStringPtrW -IsCharAlphaNumericW -IsCharAlphaW -IsCharLowerW -IsCharUpperW -IsClipboardFormatAvailable -IsDestinationReachableW -IsDialogMessageW -IsTextUnicode -IsValidCodePage -IsWindowUnicode -LCMapStringW -LoadAcceleratorsW -LoadBitmapW -LoadCursorFromFileW -LoadCursorW -LoadIconW -LoadImageW -LoadKeyboardLayoutW -LoadLibraryExW -LoadLibraryW -LoadMenuIndirectW -LoadMenuW -LoadStringW -;MCIWndCreateW -MapVirtualKeyExW -MapVirtualKeyW -MessageBoxExW -MessageBoxIndirectW -MessageBoxW -ModifyMenuW -MoveFileW -MultiByteToWideChar -MultinetGetConnectionPerformanceW -OemToCharBuffW -OemToCharW -;OleUIAddVerbMenuW -;OleUIBusyW -;OleUIChangeIconW -;OleUIChangeSourceW -;OleUIConvertW -;OleUIEditLinksW -;OleUIInsertObjectW -;OleUIObjectPropertiesW -;OleUIPasteSpecialW -;OleUIPromptUserW -;OleUIUpdateLinksW -OpenEventW -OpenFileMappingW -OpenMutexW -OpenPrinterW -OpenSemaphoreW -OpenWaitableTimerW -OutputDebugStringW -PageSetupDlgW -PeekConsoleInputW -PeekMessageW -PlaySoundW -;PolyTextOutW -PostMessageW -PostThreadMessageW -PrintDlgW -;QueryContextAttributesW -;QueryCredentialsAttributesW -QueryDosDeviceW -;QuerySecurityPackageInfoW -RasConnectionNotificationW -RasCreatePhonebookEntryW -RasDeleteEntryW -RasDeleteSubEntryW -;RasDialW -RasEditPhonebookEntryW -RasEnumConnectionsW -RasEnumDevicesW -RasEnumEntriesW -RasGetConnectStatusW -RasGetEntryDialParamsW -RasGetEntryPropertiesW -RasGetErrorStringW -RasHangUpW -RasRenameEntryW -RasSetEntryDialParamsW -RasSetEntryPropertiesW -RasSetSubEntryPropertiesW -RasValidateEntryNameW -ReadConsoleInputW -ReadConsoleOutputCharacterW -ReadConsoleOutputW -ReadConsoleW -RegConnectRegistryW -RegCreateKeyExW -RegCreateKeyW -RegDeleteKeyW -RegDeleteValueW -RegEnumKeyExW -RegEnumKeyW -RegEnumValueW -RegLoadKeyW -RegOpenKeyExW -RegOpenKeyW -RegQueryInfoKeyW -RegQueryMultipleValuesW -RegQueryValueExW -RegQueryValueW -RegReplaceKeyW -RegSaveKeyW -RegSetValueExW -RegSetValueW -RegUnLoadKeyW -RegisterClassExW -RegisterClassW -RegisterClipboardFormatW -RegisterDeviceNotificationW -RegisterWindowMessageW -RemoveDirectoryW -RemoveFontResourceW -RemovePropA -RemovePropW -ReplaceTextW -ResetDCW -;ResetPrinterW -SHBrowseForFolderW -SHChangeNotify -SHFileOperationW -SHGetFileInfoW -SHGetNewLinkInfoW -SHGetPathFromIDListW -ScrollConsoleScreenBufferW -SearchPathW -SendDlgItemMessageW -SendMessageCallbackW -SendMessageTimeoutW -SendMessageW -SendNotifyMessageW -SetCalendarInfoW -SetClassLongW -SetComputerNameW -SetConsoleTitleW -SetCurrentDirectoryW -SetDefaultCommConfigW -SetDlgItemTextW -SetEnvironmentVariableW -SetFileAttributesW -SetICMProfileW -SetJobW -SetLocaleInfoW -SetMenuItemInfoW -SetPrinterDataW -SetPrinterW -SetPropA -SetPropW -SetVolumeLabelW -SetWindowLongA -SetWindowLongW -SetWindowTextW -SetWindowsHookExW -SetWindowsHookW -ShellAboutW -ShellExecuteExW -ShellExecuteW -Shell_NotifyIconW -StartDocPrinterW -StartDocW -SystemParametersInfoW -TabbedTextOutW -TextOutW -TranslateAcceleratorW -UnregisterClassW -UpdateICMRegKeyW -UpdateResourceW -VerFindFileW -VerInstallFileW -VerLanguageNameW -VerQueryValueW -VkKeyScanExW -VkKeyScanW -WNetAddConnection2W -WNetAddConnection3W -WNetAddConnectionW -WNetCancelConnection2W -WNetCancelConnectionW -WNetConnectionDialog1W -WNetDisconnectDialog1W -WNetEnumResourceW -WNetGetConnectionW -WNetGetLastErrorW -WNetGetNetworkInformationW -WNetGetProviderNameW -WNetGetResourceInformationW -WNetGetResourceParentW -WNetGetUniversalNameW -WNetGetUserW -WNetOpenEnumW -WNetUseConnectionW -WaitNamedPipeW -WideCharToMultiByte -WinHelpW -WriteConsoleInputW -WriteConsoleOutputCharacterW -WriteConsoleOutputW -WriteConsoleW -WritePrivateProfileSectionW -WritePrivateProfileStringW -WritePrivateProfileStructW -WriteProfileSectionW -WriteProfileStringW -;auxGetDevCapsW -capCreateCaptureWindowW -capGetDriverDescriptionW -;joyGetDevCapsW -lstrcatW -lstrcmpW -lstrcmpiW -lstrcpyW -lstrcpynW -lstrlenW -;mciGetDeviceIDW -;mciGetErrorStringW -;mciSendCommandW -;mciSendStringW -;midiInGetDevCapsW -;midiInGetErrorTextW -;midiOutGetDevCapsW -;midiOutGetErrorTextW -;mixerGetControlDetailsW -;mixerGetDevCapsW -;mixerGetLineControlsW -;mixerGetLineInfoW -;mmioInstallIOProcW -;mmioOpenW -;mmioRenameW -;mmioStringToFOURCCW -sndPlaySoundW -;waveInGetDevCapsW -;waveInGetErrorTextW -;waveOutGetDevCapsW -;waveOutGetErrorTextW +;AcquireCredentialsHandleW@36 +AddAtomW@4 +AddFontResourceW@4 +AddJobW@20 +AddPortW@12 +AddPrintProcessorW@16 +AddPrintProvidorW@12 +AddPrinterDriverW@12 +AddPrinterW@12 +AdvancedDocumentPropertiesW@20 +AppendMenuW@16 +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 +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 +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 +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=Internal_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 +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 +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 +wvsprintfW@12 --- oo_1.1.1_src/sal/systools/win32/uwinapi/uwinapi_mingw.dxp.orig 2003-04-09 00:54:18.000000000 +0900 +++ oo_1.1.1_src/sal/systools/win32/uwinapi/uwinapi_mingw.dxp 2004-07-25 11:01:52.000000000 +0900 @@ -60,48 +60,52 @@ ; ;************************************************************************* -DllGetVersion -CommandLineToArgvW -CopyFileExA -CopyFileExW -CreateToolhelp32Snapshot -DrawStateW -EnumProcesses -GetDiskFreeSpaceExA -GetDiskFreeSpaceExW -GetLogicalDriveStringsW -GetLongPathNameA -GetLongPathNameW -GetModuleFileNameExA -GetModuleFileNameExW -GetProcessId -GetUserDomainA -GetUserDomainW +DllGetVersion@4 +CommandLineToArgvW@8 +CopyFileExA@24 +CopyFileExW@24 +CreateToolhelp32Snapshot@8 +DrawStateW@40 +EnumProcesses@12 +GetDiskFreeSpaceExA@16 +GetDiskFreeSpaceExW@16 +GetLogicalDriveStringsW@8 +GetLongPathNameA@12 +GetLongPathNameW@12 +GetModuleFileNameExA@16 +GetModuleFileNameExW@16 +GetProcessId@4 +GetUserDomainA@8 +GetUserDomainW@8 Module32First Module32FirstW Module32Next Module32NextW -MoveFileExA -MoveFileExW -Process32First -Process32FirstW -Process32Next -Process32NextW -FindFirstVolumeA -FindFirstVolumeW -FindNextVolumeA -FindNextVolumeW -FindVolumeClose -FindFirstVolumeMountPointA -FindFirstVolumeMountPointW -FindNextVolumeMountPointA -FindNextVolumeMountPointW -FindVolumeMountPointClose -GetVolumeNameForVolumeMountPointA -GetVolumeNameForVolumeMountPointW -DeleteVolumeMountPointA -DeleteVolumeMountPointW -GetVolumePathNameA -GetVolumePathNameW -SetVolumeMountPointA -SetVolumeMountPointW +MoveFileExA@12 +MoveFileExW@12 +Process32First@8 +Process32FirstW@8 +Process32Next@8 +Process32NextW@8 +FindFirstVolumeA@8 +FindFirstVolumeW@8 +FindNextVolumeA@12 +FindNextVolumeW@12 +FindVolumeClose@4 +FindFirstVolumeMountPointA@12 +FindFirstVolumeMountPointW@12 +FindNextVolumeMountPointA@12 +FindNextVolumeMountPointW@12 +FindVolumeMountPointClose@4 +GetVolumeNameForVolumeMountPointA@12 +GetVolumeNameForVolumeMountPointW@12 +DeleteVolumeMountPointA@4 +DeleteVolumeMountPointW@4 +GetVolumePathNameA@12 +GetVolumePathNameW@12 +SetVolumeMountPointA@8 +SetVolumeMountPointW@8 +snprintf +snwprintf +vsnprintf +vsnwprintf --- oo_1.1.1_src/sax/prj/d.lst.orig 2004-01-28 19:03:44.000000000 +0900 +++ oo_1.1.1_src/sax/prj/d.lst 2004-03-29 12:17:38.000000000 +0900 @@ -1,5 +1,6 @@ ..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*.dll ..\%__SRC%\lib\*.so %_DEST%\lib%_EXT%\*.so +..\%__SRC%\lib\*.a %_DEST%\lib%_EXT%\*.a ..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib dos: sh -c "if test %OS% = MACOSX; then create-bundle %_DEST%\lib%_EXT%\*.dylib; fi" --- oo_1.1.1_src/scaddins/prj/d.lst.orig 2003-05-28 00:44:44.000000000 +0900 +++ oo_1.1.1_src/scaddins/prj/d.lst 2004-03-29 12:17:38.000000000 +0900 @@ -1,6 +1,7 @@ ..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*.dll ..\%__SRC%\class\*.jar %_DEST%\bin%_EXT%\*.jar ..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT% +..\%__SRC%\lib\lib*.a %_DEST%\lib%_EXT% ..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib ..\%__SRC%\lib\*.sl %_DEST%\lib%_EXT%\*.sl ..\%__SRC%\bin\*.bin %_DEST%\bin%_EXT%\*.bin --- oo_1.1.1_src/scp/source/global/setupzip.scp.orig 2004-01-29 02:18:14.000000000 +0900 +++ oo_1.1.1_src/scp/source/global/setupzip.scp 2004-03-29 12:17:38.000000000 +0900 @@ -123,7 +123,11 @@ #ifdef UNX Name = STRING(CONCAT7(libicudata,UNXSUFFIX,.,ICU_MAJOR,ICU_MINOR,.,ICU_MICRO)); #else + #ifdef _gcc3 + Name = STRING(CONCAT4(icudata.,ICU_MAJOR,ICU_MINOR,.dll)); + #else Name = STRING(CONCAT5(icudt,ICU_MAJOR,ICU_MINOR,l,.dll)); + #endif #endif Dir = GCFG_BINARY_DIR; Styles = (PACKED, SETUPZIP); @@ -152,7 +156,11 @@ #ifdef UNX Name = STRING(CONCAT7(libicui18n,UNXSUFFIX,.,ICU_MAJOR,ICU_MINOR,.,ICU_MICRO)); #else + #ifdef _gcc3 + Name = STRING(CONCAT4(icui18n.,ICU_MAJOR,ICU_MINOR,.dll)); + #else Name = STRING(CONCAT4(icuin,ICU_MAJOR,ICU_MINOR,.dll)); + #endif #endif Dir = GCFG_BINARY_DIR; Styles = (PACKED, SETUPZIP); @@ -181,7 +189,11 @@ #ifdef UNX Name = STRING(CONCAT7(libicule,UNXSUFFIX,.,ICU_MAJOR,ICU_MINOR,.,ICU_MICRO)); #else + #ifdef _gcc3 + Name = STRING(CONCAT4(icule.,ICU_MAJOR,ICU_MINOR,.dll)); + #else Name = STRING(CONCAT4(icule,ICU_MAJOR,ICU_MINOR,.dll)); + #endif #endif Dir = GCFG_BINARY_DIR; Styles = (PACKED, SETUPZIP); @@ -210,7 +222,11 @@ #ifdef UNX Name = STRING(CONCAT7(libicuuc,UNXSUFFIX,.,ICU_MAJOR,ICU_MINOR,.,ICU_MICRO)); #else + #ifdef _gcc3 + Name = STRING(CONCAT4(icuuc.,ICU_MAJOR,ICU_MINOR,.dll)); + #else Name = STRING(CONCAT4(icuuc,ICU_MAJOR,ICU_MINOR,.dll)); + #endif #endif Dir = GCFG_BINARY_DIR; Styles = (PACKED, SETUPZIP); @@ -273,6 +289,10 @@ Name = STRING(CONCAT3(stlport_,vc745,.dll)); #else + #if defined(_gcc3) + Name = STRING(CONCAT3(libstlport_,gcc,.dll)); + #else Name = STRING(CONCAT3(stlport_,vc6,.dll)); + #endif #endif #endif End @@ -379,6 +399,12 @@ #endif +#if defined(WNT) && defined(_gcc3) + +STD_SETUPZIP_LIB_FILE( GID_FILE_LIB_PSP, psp ) + +#endif + STD_SETUPZIP_LIB_FILE( GID_FILE_LIB_SET, set ) UNO_SETUPZIP_LIB_FILE( GID_FILE_LIB_UTL , utl) --- oo_1.1.1_src/scp/source/global/udk_base.scp.orig 2004-01-29 02:18:34.000000000 +0900 +++ oo_1.1.1_src/scp/source/global/udk_base.scp 2004-03-29 12:17:38.000000000 +0900 @@ -6,7 +6,7 @@ // Temporary solution/hack: at the moment libstdc++.so and libgcc_s.so are // needed for unxlngi4 environment (setup is linked against it). -#if ! (defined (FREEBSD) || defined(MACOSX) || defined(NETBSD) ) +#if ! (defined (FREEBSD) || defined(MACOSX) || defined(NETBSD) || defined(WNT)) #if ( defined( _gcc3 ) && ( defined( C300 ) || defined( C322 ) )) File gid_File_Lib_gcc --- oo_1.1.1_src/scp/source/office/config.scp.orig 2004-01-10 03:36:50.000000000 +0900 +++ oo_1.1.1_src/scp/source/office/config.scp 2004-03-29 12:17:38.000000000 +0900 @@ -50,3 +50,12 @@ #endif #endif + +#if defined(WNT) && defined(_gcc3) + +ScpAction SCP_COPY_MINGWM10 + Copy = "mingwm10.dll"; + Name = "mingwm10.dll"; +End + +#endif --- oo_1.1.1_src/scp/source/office/files.scp.orig 2004-02-11 05:05:46.000000000 +0900 +++ oo_1.1.1_src/scp/source/office/files.scp 2004-03-29 12:17:38.000000000 +0900 @@ -1013,8 +1013,12 @@ #ifdef UNX Name = STRING(CONCAT2(libdb-3.2,UNXSUFFIX)); #else + #ifdef _gcc3 + Name = "libdb-3.2.dll"; + #else Name = "libdb32.dll"; #endif + #endif End #ifdef SOLAR_JAVA @@ -1026,8 +1030,12 @@ #ifdef UNX Name = STRING(CONCAT2(libdb_java-3.2,UNXSUFFIX)); #else + #ifdef _gcc3 + Name = "libdb_java-3.2.dll"; + #else Name = "libdb_java32.dll"; #endif + #endif End #endif @@ -1041,6 +1049,17 @@ Name = STRING(CONCAT2(libdb_cxx-3.2,UNXSUFFIX)); End +#else +#ifdef _gcc3 + +File GID_FILE_LIB_DB_CXX + TXT_FILE_BODY; + Styles = (PACKED); + Dir = GID_DIR_PROGRAM; + Name = "libdb_cxx-3.2.dll"; +End + +#endif #endif #ifdef UNX @@ -2913,6 +2932,17 @@ STD_SHELLNEW_FILE(GID_FILE_SHELLNEW_SXW_SOFFICE, soffice.sxw) #endif +#if defined(WNT) && defined(_gcc3) + +File GID_FILE_LIB_MINGWM10 + BIN_FILE_BODY; + Styles = (PACKED, SETUPZIP); + Dir = GCFG_BINARY_DIR; + Name = "mingwm10.dll"; +End + +#endif + //Only for MS vc7 compiler --- oo_1.1.1_src/scptools/source/linker/parameterhelper.cxx.orig 2003-03-27 19:22:20.000000000 +0900 +++ oo_1.1.1_src/scptools/source/linker/parameterhelper.cxx 2004-03-29 12:17:38.000000000 +0900 @@ -59,7 +59,7 @@ * ************************************************************************/ -#ifdef UNX +#if defined(UNX) || defined(__MINGW32__) #include #include #endif --- oo_1.1.1_src/setup2/source/custom/jvmsetup/jvmsetup.cxx.orig 2004-02-10 22:29:28.000000000 +0900 +++ oo_1.1.1_src/setup2/source/custom/jvmsetup/jvmsetup.cxx 2004-03-29 12:17:40.000000000 +0900 @@ -371,7 +371,11 @@ if ( bCheckReturn ) { vos::OProcess::TProcessInfo aProcessInfo; +#ifdef __MINGW32__ + if ( aProcess.getInfo( vos::OProcess::TData_ExitCode, &aProcessInfo ) == vos::OProcess::E_None ) +#else if ( aProcess.getInfo( vos::OProcess::TProcessData::TData_ExitCode, &aProcessInfo ) == vos::OProcess::E_None ) +#endif { if ( aProcessInfo.Code == 3010 ) { --- oo_1.1.1_src/setup2/source/custom/reg4msdoc/registrar.cxx.orig 2004-01-10 03:52:36.000000000 +0900 +++ oo_1.1.1_src/setup2/source/custom/reg4msdoc/registrar.cxx 2004-03-29 12:17:40.000000000 +0900 @@ -338,7 +338,11 @@ RegistryValue RegVal( new RegistryValueImpl( DEFAULT_VALUE_NAME, +#ifdef __MINGW32__ + m_ContextInformation.GetOpenOfficeCommandline(RegistrationContextInformation::Open))); +#else m_ContextInformation.GetOpenOfficeCommandline(RegistrationContextInformation::SHELL_COMMAND::Open))); +#endif RegKey->SetValue(RegVal); @@ -352,7 +356,11 @@ RegKey = RegKey->CreateSubKey(SHELL_EDIT_COMMAND); RegVal->SetName(DEFAULT_VALUE_NAME); RegVal->SetValue( +#ifdef __MINGW32__ + m_ContextInformation.GetOpenOfficeCommandline(RegistrationContextInformation::Open)); +#else m_ContextInformation.GetOpenOfficeCommandline(RegistrationContextInformation::SHELL_COMMAND::Open)); +#endif RegKey->SetValue(RegVal); SaveRegisteredFor(HTML_EDITOR); @@ -418,7 +426,11 @@ } RegVal->SetValue( +#ifdef __MINGW32__ + m_ContextInformation.GetOpenOfficeCommandline(RegistrationContextInformation::Open)); +#else m_ContextInformation.GetOpenOfficeCommandline(RegistrationContextInformation::SHELL_COMMAND::Open)); +#endif RegKey = RegistrationRootKey->OpenSubKey(MS_IE_DEF_HTML_EDITOR_SHL_EDIT_CMD); RegKey->SetValue(RegVal); @@ -515,7 +527,11 @@ } RegVal->SetValue( +#ifdef __MINGW32__ + m_ContextInformation.GetOpenOfficeCommandline(RegistrationContextInformation::Open)); +#else m_ContextInformation.GetOpenOfficeCommandline(RegistrationContextInformation::SHELL_COMMAND::Open)); +#endif RegKey->SetValue(RegVal); @@ -726,19 +742,35 @@ RegKey->SetValue(RegVal); RegKey = RegKey->CreateSubKey(L"command"); +#ifdef __MINGW32__ + RegVal->SetValue(m_ContextInformation.GetOpenOfficeCommandline(RegistrationContextInformation::New)); +#else RegVal->SetValue(m_ContextInformation.GetOpenOfficeCommandline(RegistrationContextInformation::SHELL_COMMAND::New)); +#endif RegKey->SetValue(RegVal); RegKey = RegKeyShell->CreateSubKey(L"open\\command"); +#ifdef __MINGW32__ + RegVal->SetValue(m_ContextInformation.GetOpenOfficeCommandline(RegistrationContextInformation::Open)); +#else RegVal->SetValue(m_ContextInformation.GetOpenOfficeCommandline(RegistrationContextInformation::SHELL_COMMAND::Open)); +#endif RegKey->SetValue(RegVal); RegKey = RegKeyShell->CreateSubKey(L"print\\command"); +#ifdef __MINGW32__ + RegVal->SetValue(m_ContextInformation.GetOpenOfficeCommandline(RegistrationContextInformation::Print)); +#else RegVal->SetValue(m_ContextInformation.GetOpenOfficeCommandline(RegistrationContextInformation::SHELL_COMMAND::Print)); +#endif RegKey->SetValue(RegVal); RegKey = RegKeyShell->CreateSubKey(L"printto\\command"); +#ifdef __MINGW32__ + RegVal->SetValue(m_ContextInformation.GetOpenOfficeCommandline(RegistrationContextInformation::Printto)); +#else RegVal->SetValue(m_ContextInformation.GetOpenOfficeCommandline(RegistrationContextInformation::SHELL_COMMAND::Printto)); +#endif RegKey->SetValue(RegVal); // set the new forward key under the appropriate extension --- oo_1.1.1_src/setup2/source/custom/reg4msdoc/registryexception.cxx.orig 2002-06-17 17:38:48.000000000 +0900 +++ oo_1.1.1_src/setup2/source/custom/reg4msdoc/registryexception.cxx 2004-03-29 12:17:40.000000000 +0900 @@ -20,7 +20,7 @@ /** */ -RegistryException::~RegistryException() +RegistryException::~RegistryException() throw() { if (m_ErrorMsg) LocalFree(m_ErrorMsg); @@ -28,7 +28,7 @@ /** */ -const char* RegistryException::what() const +const char* RegistryException::what() const throw() { FormatMessage( FORMAT_MESSAGE_ALLOCATE_BUFFER | --- oo_1.1.1_src/setup2/source/custom/reg4msdoc/registryexception.hxx.orig 2002-06-17 17:38:48.000000000 +0900 +++ oo_1.1.1_src/setup2/source/custom/reg4msdoc/registryexception.hxx 2004-03-29 12:17:40.000000000 +0900 @@ -17,7 +17,7 @@ RegistryException(long ErrorCode); - virtual ~RegistryException(); + virtual ~RegistryException() throw(); /** @descr Returns a string that describes the error if @@ -25,7 +25,7 @@ returned string is only temporary so the caller has to copy it if he needs the string further. */ - virtual const char* what() const; + virtual const char* what() const throw(); /** @descr Returns the error code. --- oo_1.1.1_src/setup2/source/custom/reg4msdoc/registrywnt.cxx.orig 2003-03-27 20:08:22.000000000 +0900 +++ oo_1.1.1_src/setup2/source/custom/reg4msdoc/registrywnt.cxx 2004-03-29 12:17:40.000000000 +0900 @@ -213,7 +213,7 @@ else if (ERROR_NO_MORE_ITEMS != rc && ERROR_SUCCESS != rc) throw RegistryException(rc); -#if (_MSC_VER < 1300) +#if (_MSC_VER < 1300) && !defined(__MINGW32__) return key_names; #else return (StringListPtr) key_names; @@ -254,7 +254,7 @@ else if (ERROR_NO_MORE_ITEMS != rc && ERROR_SUCCESS != rc) throw RegistryException(rc); -#if (_MSC_VER < 1300) +#if (_MSC_VER < 1300) && !defined(__MINGW32__) return value_names; #else return (StringListPtr) value_names; @@ -334,7 +334,7 @@ if (ERROR_FILE_NOT_FOUND == rc) { - #if (_MSC_VER < 1300) + #if (_MSC_VER < 1300) && !defined(__MINGW32__) return Default; #else RegistryValue regval_ptr; --- oo_1.1.1_src/setup2/source/ui/mainevt.cxx.orig 2004-02-10 22:30:06.000000000 +0900 +++ oo_1.1.1_src/setup2/source/ui/mainevt.cxx 2004-03-29 12:17:40.000000000 +0900 @@ -1528,7 +1528,14 @@ aDelFile.Insert( '\'', 0 ); aDelFile.Insert( '\'' ); } +#ifdef __MINGW32__ + { + String temp = aUnLoader.GetFullUni(); + _StartApplication( temp, aDelFile ); + } +#else _StartApplication( aUnLoader.GetFullUni(), aDelFile ); +#endif bKillDelFile = FALSE; time( <ime ); if ( pFile ) fprintf( pFile, "Uninst call finished at:%s\n", ctime( <ime ) ); --- oo_1.1.1_src/setup2/source/uibase/fader.cxx.orig 2003-03-27 20:09:52.000000000 +0900 +++ oo_1.1.1_src/setup2/source/uibase/fader.cxx 2004-03-29 12:17:40.000000000 +0900 @@ -406,7 +406,7 @@ while( nOffset < aTarget.GetWidth() ) { -#if (_MSC_VER < 1300) || defined(UNX) +#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); @@ -466,7 +466,7 @@ while( nOffset < aTarget.GetWidth() ) { -#if (_MSC_VER < 1300) || defined(UNX) +#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); @@ -529,7 +529,7 @@ while (nOffset < aTarget.GetHeight()) { -#if (_MSC_VER < 1300) || defined(UNX) +#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); @@ -589,7 +589,7 @@ while (nOffset < aTarget.GetHeight()) { -#if (_MSC_VER < 1300) || defined(UNX) +#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); @@ -650,7 +650,7 @@ while( nOffset != aTarget.GetWidth() ) { -#if (_MSC_VER < 1300) || defined(UNX) +#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 ); @@ -732,7 +732,7 @@ while (nOffset != aTarget.GetHeight()) { -#if (_MSC_VER < 1300) || defined(UNX) +#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 ); @@ -815,7 +815,7 @@ while (nOffset != aTarget.GetWidth()) { -#if (_MSC_VER < 1300) || defined(UNX) +#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); @@ -900,7 +900,7 @@ while (nOffset != aTarget.GetHeight()) { -#if (_MSC_VER < 1300) || defined(UNX) +#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); @@ -1087,7 +1087,7 @@ { while( nOffset != aTarget.GetWidth() ) { -#if (_MSC_VER < 1300) || defined(UNX) +#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 ); @@ -1118,7 +1118,7 @@ while( nOffset < aTarget.GetWidth() ) { -#if (_MSC_VER < 1300) || defined(UNX) +#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); @@ -1167,7 +1167,7 @@ { while (nOffset != aTarget.GetWidth()) { -#if (_MSC_VER < 1300) || defined(UNX) +#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); @@ -1196,7 +1196,7 @@ while (nOffset < aTarget.GetWidth()) { -#if (_MSC_VER < 1300) || defined(UNX) +#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); @@ -1244,7 +1244,7 @@ { while (nOffset != aTarget.GetHeight()) { -#if (_MSC_VER < 1300) || defined(UNX) +#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); @@ -1274,7 +1274,7 @@ while (nOffset < aTarget.GetHeight()) { -#if (_MSC_VER < 1300) || defined(UNX) +#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); @@ -1322,7 +1322,7 @@ { while (nOffset != aTarget.GetHeight()) { -#if (_MSC_VER < 1300) || defined(UNX) +#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); @@ -1354,7 +1354,7 @@ while (nOffset < aTarget.GetHeight()) { -#if (_MSC_VER < 1300) || defined(UNX) +#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); --- oo_1.1.1_src/setup2/win/source/loader/loader.cxx.orig 2004-01-15 23:07:24.000000000 +0900 +++ oo_1.1.1_src/setup2/win/source/loader/loader.cxx 2004-03-29 12:17:40.000000000 +0900 @@ -2339,7 +2339,11 @@ // ----------------------------------------------------------------------------- typedef oslFileError (SAL_CALL * osl_getSystemPathFromFileURL_Func)( rtl_uString *ustrURL, rtl_uString **pustrPath); +#ifdef __MINGW32__ +typedef void (SAL_CALL * rtl_uString_newFromAscii_Func)( rtl_uString ** newStr, const sal_Char * value ); +#else typedef void (SAL_CALL * rtl_uString_newFromAscii_Func)( rtl_uString ** newStr, const sal_Char * value ) SAL_THROW_EXTERN_C(); +#endif BOOL getSystemPathFromFileURL(char* strTempPath, char* strURL, char* strSystemPath) { @@ -2358,7 +2362,11 @@ return FALSE; } +#ifdef __MINGW32__ + void (SAL_CALL * rtl_uString_newFromAscii2)( rtl_uString ** newStr, const sal_Char * value ) SAL_THROW_EXTERN_C() = +#else rtl_uString_newFromAscii_Func rtl_uString_newFromAscii2 = +#endif reinterpret_cast(pProc); rtl_uString* psuURL = 0; --- oo_1.1.1_src/setup2/win/source/system/winos.cxx.orig 2004-01-24 02:33:48.000000000 +0900 +++ oo_1.1.1_src/setup2/win/source/system/winos.cxx 2004-03-29 12:17:38.000000000 +0900 @@ -94,6 +94,9 @@ #include #include +#ifdef __MINGW32__ +#include +#endif #include #include @@ -769,7 +772,11 @@ lpFolderA = ALLOC( WCHAR, 16000 ); SHGetPathFromIDListW( pidl, lpFolderA ); +#ifdef __MINGW32__ + aFolder = UniString( reinterpret_cast< unsigned short int * >(lpFolderA) ); +#else aFolder = UniString( lpFolderA ); +#endif FREE( lpFolderA ); _SHFree( pidl ); @@ -881,7 +888,7 @@ hres = CoCreateInstance( clsid_ShellLink, NULL, CLSCTX_INPROC_SERVER, clsid_IShellLink, (void**)&psl ); if( FAILED(hres) ) - hres = SHCoCreateInstance( NULL, clsid_ShellLink, NULL, clsid_IShellLink, (void**)&psl ); + hres = SHCoCreateInstance( static_cast< void * >(NULL), clsid_ShellLink, NULL, clsid_IShellLink, (void**)&psl ); if( SUCCEEDED(hres) ) { @@ -1251,7 +1258,7 @@ { aSubKey2 = aSubKey; aSubKey2 += '\\'; - aSubKey2 += szSubKey; + aSubKey2 += reinterpret_cast< unsigned short int * >(szSubKey); lErr = Deregister( rKey, aSubKey2, bKeyOnly, rName, bDeleteAllSubKeys, bUseUserSection ); --- oo_1.1.1_src/sfx2/source/appl/shutdowniconw32.cxx.orig 2003-05-28 22:24:54.000000000 +0900 +++ oo_1.1.1_src/sfx2/source/appl/shutdowniconw32.cxx 2004-03-29 12:17:40.000000000 +0900 @@ -192,7 +192,7 @@ // ------------------------------- -static void addMenuItem( HMENU hMenu, UINT id, UINT iconId, OUString& text, int& pos, int bOwnerdraw ) +static void addMenuItem( HMENU hMenu, UINT id, UINT iconId, const OUString& text, int& pos, int bOwnerdraw ) { MENUITEMINFOW mi; memset( &mi, 0, sizeof( MENUITEMINFOW ) ); --- oo_1.1.1_src/sfx2/source/doc/objsys.cxx.orig 2003-04-05 04:24:06.000000000 +0900 +++ oo_1.1.1_src/sfx2/source/doc/objsys.cxx 2004-03-29 12:17:40.000000000 +0900 @@ -139,7 +139,7 @@ if ( pGDIMeta ) { String aStr = ::rtl::OUString::createFromAscii( ".emf" ); - ::utl::TempFile aTempFile( ::rtl::OUString(), + ::utl::TempFile aTempFile( ::rtl::OUString::createFromAscii(""), &aStr, NULL, sal_False ); --- oo_1.1.1_src/sfx2/source/toolbox/tbxcust.cxx.orig 2003-05-15 19:54:28.000000000 +0900 +++ oo_1.1.1_src/sfx2/source/toolbox/tbxcust.cxx 2004-03-29 12:17:40.000000000 +0900 @@ -580,7 +580,11 @@ return 0; } +#if (defined(_MSC_VER) && (_MSC_VER >= 1310)) +template<> struct std::hash< SfxConfigManager* > +#else struct std::hash< SfxConfigManager* > +#endif { size_t operator()(const SfxConfigManager* __s) const { return (size_t)__s; } }; --- oo_1.1.1_src/shell/source/tools/lngconvex/lngconvex.cxx.orig 2003-06-20 19:36:54.000000000 +0900 +++ oo_1.1.1_src/shell/source/tools/lngconvex/lngconvex.cxx 2004-03-29 12:17:40.000000000 +0900 @@ -655,7 +655,7 @@ for (/**/ ;rct_iter != rct_iter_end; ++rct_iter) { - std::istringstream iss = rct_iter->m_Line; + std::istringstream iss(rct_iter->m_Line); std::string line; while (iss) @@ -732,10 +732,13 @@ rtl::OUString oustr_abs_name = GetAbsoluteDirectory( module_dir, OStr2OUStr(cmdline.GetArgument("-c").c_str())); + { + std::ifstream temp(OUStr2OStr(oustr_abs_name).getStr()); ReadCtryLngFile( - std::ifstream(OUStr2OStr(oustr_abs_name).getStr()), + temp, substitutor, g_country_lng_file_countries); + } oustr_abs_name = GetAbsoluteDirectory( module_dir, OStr2OUStr(cmdline.GetArgument("-lng").c_str())); @@ -765,9 +768,12 @@ oustr_abs_name = GetAbsoluteDirectory( module_dir, OStr2OUStr(cmdline.GetArgument("-rch").c_str())); + { + std::ifstream temp(OUStr2OStr(oustr_abs_name).getStr()); FileAppendRcHeader( rc_output_file, - std::ifstream(OUStr2OStr(oustr_abs_name).getStr())); + temp); + } InflateRcTemplateAndAppendToFile( rc_output_file, @@ -778,9 +784,12 @@ oustr_abs_name = GetAbsoluteDirectory( module_dir, OStr2OUStr(cmdline.GetArgument("-rcf").c_str())); + { + std::ifstream temp(OUStr2OStr(oustr_abs_name).getStr()); FileAppendRcFooter( rc_output_file, - std::ifstream(OUStr2OStr(oustr_abs_name).getStr())); + temp); + } } catch(const std::ios::failure& ex) --- oo_1.1.1_src/shell/source/win32/shlxthandler/classfactory.cxx.orig 2002-08-26 19:53:56.000000000 +0900 +++ oo_1.1.1_src/shell/source/win32/shlxthandler/classfactory.cxx 2004-03-29 12:17:40.000000000 +0900 @@ -67,6 +67,10 @@ #include "classfactory.hxx" #endif +#ifndef _SHLXTHDL_HXX_ +#include "shlxthdl.hxx" +#endif + #ifndef _INFOTIP_HXX_ #include "infotip.hxx" #endif @@ -79,10 +83,6 @@ #include "columnprovider.hxx" #endif -#ifndef _SHLXTHDL_HXX_ -#include "shlxthdl.hxx" -#endif - //----------------------------- // //----------------------------- --- oo_1.1.1_src/shell/source/win32/shlxthandler/classfactory.hxx.orig 2002-08-26 19:53:44.000000000 +0900 +++ oo_1.1.1_src/shell/source/win32/shlxthandler/classfactory.hxx 2004-03-29 12:17:40.000000000 +0900 @@ -62,6 +62,10 @@ #ifndef _CLASSFACTORY_HXX_ #define _CLASSFACTORY_HXX_ +#ifdef __MINGW32__ +#include +#include +#endif #include class CClassFactory : public IClassFactory --- oo_1.1.1_src/shell/source/win32/shlxthandler/infotip.hxx.orig 2002-08-26 19:53:40.000000000 +0900 +++ oo_1.1.1_src/shell/source/win32/shlxthandler/infotip.hxx 2004-03-29 12:17:40.000000000 +0900 @@ -62,6 +62,10 @@ #ifndef _INFOTIP_HXX_ #define _INFOTIP_HXX_ +#ifdef __MINGW32__ +#include +#include +#endif #include #include #include --- oo_1.1.1_src/shell/source/win32/shlxthandler/types.hxx.orig 2002-08-26 19:53:40.000000000 +0900 +++ oo_1.1.1_src/shell/source/win32/shlxthandler/types.hxx 2004-03-29 12:17:40.000000000 +0900 @@ -74,6 +74,6 @@ typedef std::pair XmlTag_t; typedef std::map XmlTags_t; -#define EMPTY_XML_TAG std::make_pair(std::wstring(), XmlTagAttributes_t()) +#define EMPTY_XML_TAG std::make_pair(Characters_t(), XmlTagAttributes_t()) #endif --- oo_1.1.1_src/shell/source/win32/shlxthandler/xmlprsr.cxx.orig 2002-08-26 19:53:56.000000000 +0900 +++ oo_1.1.1_src/shell/source/win32/shlxthandler/xmlprsr.cxx 2004-03-29 12:17:40.000000000 +0900 @@ -287,7 +287,7 @@ while(atts[i]) { - xml_attribs[GetLocalName(atts[i])] = atts[i+1]; + xml_attribs[GetLocalName(reinterpret_cast< LPCWSTR >(atts[i]))] = reinterpret_cast< LPCWSTR >(atts[i+1]); i += 2; // skip to next pair } @@ -322,7 +322,7 @@ SaxParser* pImpl = reinterpret_cast(XML_GetUserData(parser)); if (pImpl->m_SaxDocumentHandler) - pImpl->m_SaxDocumentHandler->Characters(std::wstring(s, len)); + pImpl->m_SaxDocumentHandler->Characters(std::wstring(reinterpret_cast< LPCWSTR >(s), len)); } //--------------------------------- --- oo_1.1.1_src/shell/source/win32/shlxthandler/zipexcptn.cxx.orig 2002-08-26 19:54:02.000000000 +0900 +++ oo_1.1.1_src/shell/source/win32/shlxthandler/zipexcptn.cxx 2004-03-29 12:17:40.000000000 +0900 @@ -78,7 +78,7 @@ //------------------------------------------ /** */ -RuntimeException::~RuntimeException() +RuntimeException::~RuntimeException() throw() { } @@ -118,7 +118,7 @@ //------------------------------------------ /** */ -Win32Exception::~Win32Exception() +Win32Exception::~Win32Exception() throw() { if (m_MsgBuff) LocalFree(m_MsgBuff); --- oo_1.1.1_src/shell/source/win32/shlxthandler/zipexcptn.hxx.orig 2002-08-26 19:53:44.000000000 +0900 +++ oo_1.1.1_src/shell/source/win32/shlxthandler/zipexcptn.hxx 2004-03-29 12:17:40.000000000 +0900 @@ -14,7 +14,7 @@ { public: RuntimeException(int Error); - virtual ~RuntimeException(); + virtual ~RuntimeException() throw(); int GetErrorCode() const; @@ -40,7 +40,7 @@ { public: Win32Exception(int Error); - virtual ~Win32Exception(); + virtual ~Win32Exception() throw(); virtual const char* what() const throw(); --- oo_1.1.1_src/shell/source/win32/simplemail/simplemapi.hxx.orig 2001-05-14 17:09:22.000000000 +0900 +++ oo_1.1.1_src/shell/source/win32/simplemail/simplemapi.hxx 2004-03-29 12:17:40.000000000 +0900 @@ -70,7 +70,10 @@ #include #include +#ifdef __MINGW32__ +#else #include +#endif //---------------------------------------------------------- // class declaration --- oo_1.1.1_src/shell/source/win32/simplemail/smplmailclient.cxx.orig 2003-03-27 20:16:20.000000000 +0900 +++ oo_1.1.1_src/shell/source/win32/simplemail/smplmailclient.cxx 2004-03-29 12:17:40.000000000 +0900 @@ -446,7 +446,11 @@ osl::FileBase::getSystemPathFromFileURL( aAttachementList[i], aSysPath ); +#ifdef __MINGW32__ + if ( osl::FileBase::E_None != rc ) +#else if ( osl::FileBase::RC::E_None != rc ) +#endif throw IllegalArgumentException( OUString::createFromAscii( " " ), static_cast< XSimpleMailClient* >( this ), --- oo_1.1.1_src/sj2/prj/d.lst.orig 2004-01-28 20:46:34.000000000 +0900 +++ oo_1.1.1_src/sj2/prj/d.lst 2004-03-29 12:17:40.000000000 +0900 @@ -5,6 +5,7 @@ ..\%__SRC%\lib\sj.lib %_DEST%\lib%_EXT%\sj.lib ..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT% +..\%__SRC%\lib\lib*.a %_DEST%\lib%_EXT% ..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib ..\%__SRC%\slb\sj.lib %_DEST%\lib%_EXT%\xsj.lib ..\%__SRC%\bin\j?????_g.dll %_DEST%\bin%_EXT%\j?????_g.dll --- oo_1.1.1_src/so3/prj/d.lst.orig 2004-01-29 01:31:08.000000000 +0900 +++ oo_1.1.1_src/so3/prj/d.lst 2004-03-29 12:17:40.000000000 +0900 @@ -1,6 +1,7 @@ touch: ..\%__SRC%\misc\so3.hid %_DEST%\bin%_EXT%\so3.hid ..\%__SRC%\lib\so2.lib %_DEST%\lib%_EXT%\so2.lib ..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT% +..\%__SRC%\lib\lib*.a %_DEST%\lib%_EXT% ..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib ..\%__SRC%\srs\src.srs %_DEST%\res%_EXT%\so2.srs ..\%__SRC%\bin\*.tlb %_DEST%\bin%_EXT%\*.tlb --- oo_1.1.1_src/so3/source/inplace/outplace.cxx.orig 2004-02-20 01:24:12.000000000 +0900 +++ oo_1.1.1_src/so3/source/inplace/outplace.cxx 2004-03-29 12:17:40.000000000 +0900 @@ -714,7 +714,7 @@ OModule aOleDlgLib; if( !aOleDlgLib.load( String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "oledlg" ) ) ) ) - return xRet; + return SvInPlaceObjectRef(xRet); #ifdef UNICODE OleUIInsertObjectW_Type * pInsertFct = (OleUIInsertObjectW_Type *) @@ -724,7 +724,7 @@ aOleDlgLib.getSymbol( String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "OleUIInsertObjectA" ) ) ); #endif if( !pInsertFct ) - return xRet; + return SvInPlaceObjectRef(xRet); //uTemp=pInsertFct(&io); //uTemp=OleUIInsertObject(&io); @@ -866,7 +866,7 @@ OModule aOleDlgLib; if( !aOleDlgLib.load( String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "oledlg" ) ) ) ) - return xRet; + return SvInPlaceObjectRef(xRet); #ifdef UNICODE OleUIInsertObjectW_Type * pInsertFct = (OleUIInsertObjectW_Type *) @@ -876,7 +876,7 @@ aOleDlgLib.getSymbol( String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "OleUIInsertObjectA" ) ) ); #endif if( !pInsertFct ) - return xRet; + return SvInPlaceObjectRef(xRet); uTemp=pInsertFct(&io); //uTemp=OleUIInsertObject(&io); @@ -901,7 +901,7 @@ bIsInternal = TRUE; rTypeName = pInternalServer->GetHumanName(); rInternalClassName = pInternalServer->GetClassName(); - return xRet; + return SvInPlaceObjectRef(xRet); } tType=TENANTTYPE_EMBEDDEDOBJECT; @@ -930,7 +930,7 @@ // so it will be inserted without actuall OLE embedding bIsInternal = TRUE; - return xRet; + return SvInPlaceObjectRef(xRet); } } @@ -1003,7 +1003,7 @@ else { pDO->Release(); - return xRet; + return SvInPlaceObjectRef(xRet); } @@ -1075,7 +1075,7 @@ else { pDO->Release(); - return xRet; + return SvInPlaceObjectRef(xRet); } xRet = new SvOutPlaceObject(); xRet->DoInitNew( pIStorage ); --- oo_1.1.1_src/so3/source/misc/factory.cxx.orig 2003-04-24 22:59:42.000000000 +0900 +++ oo_1.1.1_src/so3/source/misc/factory.cxx 2004-03-29 12:17:40.000000000 +0900 @@ -841,7 +841,7 @@ #ifdef WNT if( !Find( GetAutoConvertTo( pStor->GetClassName() ) ) ) { - return SvOutPlaceObject::CreateFromData( xTrans, pStor ); + return SvObjectRef(SvOutPlaceObject::CreateFromData( xTrans, pStor )); } #endif return SvObjectRef(); --- oo_1.1.1_src/so3/source/ole/helpers.cxx.orig 2003-03-27 20:28:18.000000000 +0900 +++ oo_1.1.1_src/so3/source/ole/helpers.cxx 2004-03-29 12:17:40.000000000 +0900 @@ -68,6 +68,8 @@ #define ARRAYSIZE(a) (sizeof(a)/sizeof(a[0])) +static BOOL GetFileTimes(LPTSTR pszFileName, FILETIME *pft); + /* * StarObject_MetafilePictIconFree * --- oo_1.1.1_src/so3/source/ole/soole.h.orig 2000-09-19 01:54:26.000000000 +0900 +++ oo_1.1.1_src/so3/source/ole/soole.h 2004-03-29 12:17:40.000000000 +0900 @@ -159,6 +159,9 @@ #endif //OLECHAR #endif //_WIN32 +#endif //_OLE2_H_ + +#if defined(_OLE2_H_) || defined(__MINGW32__) //May not include ole2.h at all times. //Useful macros. #define SETFormatEtc(fe, cf, asp, td, med, li) \ @@ -501,6 +504,129 @@ #endif -BOOL GetFileTimes(LPTSTR, FILETIME *); +// BOOL GetFileTimes(LPTSTR, FILETIME *); + +#ifdef __MINGW32__ + +typedef +enum tagOLEMISC + { OLEMISC_RECOMPOSEONRESIZE = 0x1, + OLEMISC_ONLYICONIC = 0x2, + OLEMISC_INSERTNOTREPLACE = 0x4, + OLEMISC_STATIC = 0x8, + OLEMISC_CANTLINKINSIDE = 0x10, + OLEMISC_CANLINKBYOLE1 = 0x20, + OLEMISC_ISLINKOBJECT = 0x40, + OLEMISC_INSIDEOUT = 0x80, + OLEMISC_ACTIVATEWHENVISIBLE = 0x100, + OLEMISC_RENDERINGISDEVICEINDEPENDENT = 0x200, + OLEMISC_INVISIBLEATRUNTIME = 0x400, + OLEMISC_ALWAYSRUN = 0x800, + OLEMISC_ACTSLIKEBUTTON = 0x1000, + OLEMISC_ACTSLIKELABEL = 0x2000, + OLEMISC_NOUIACTIVATE = 0x4000, + OLEMISC_ALIGNABLE = 0x8000, + OLEMISC_SIMPLEFRAME = 0x10000, + OLEMISC_SETCLIENTSITEFIRST = 0x20000, + OLEMISC_IMEMODE = 0x40000, + OLEMISC_IGNOREACTIVATEWHENVISIBLE = 0x80000, + OLEMISC_WANTSTOMENUMERGE = 0x100000, + OLEMISC_SUPPORTSMULTILEVELUNDO = 0x200000 + } OLEMISC; + +typedef interface IOleLink IOleLink; + +typedef /* [unique] */ IOleLink *LPOLELINK; + +typedef +enum tagOLEUPDATE + { OLEUPDATE_ALWAYS = 1, + OLEUPDATE_ONCALL = 3 + } OLEUPDATE; + +typedef OLEUPDATE *LPOLEUPDATE; + +typedef OLEUPDATE *POLEUPDATE; + +typedef +enum tagOLELINKBIND + { OLELINKBIND_EVENIFCLASSDIFF = 1 + } OLELINKBIND; + + +EXTERN_C const IID IID_IOleLink; + + MIDL_INTERFACE("0000011d-0000-0000-C000-000000000046") + IOleLink : public IUnknown + { + public: + virtual HRESULT STDMETHODCALLTYPE SetUpdateOptions( + /* [in] */ DWORD dwUpdateOpt) = 0; + + virtual HRESULT STDMETHODCALLTYPE GetUpdateOptions( + /* [out] */ DWORD *pdwUpdateOpt) = 0; + + virtual HRESULT STDMETHODCALLTYPE SetSourceMoniker( + /* [unique][in] */ IMoniker *pmk, + /* [in] */ REFCLSID rclsid) = 0; + + virtual HRESULT STDMETHODCALLTYPE GetSourceMoniker( + /* [out] */ IMoniker **ppmk) = 0; + + virtual HRESULT STDMETHODCALLTYPE SetSourceDisplayName( + /* [in] */ LPCOLESTR pszStatusText) = 0; + + virtual HRESULT STDMETHODCALLTYPE GetSourceDisplayName( + /* [out] */ LPOLESTR *ppszDisplayName) = 0; + + virtual HRESULT STDMETHODCALLTYPE BindToSource( + /* [in] */ DWORD bindflags, + /* [unique][in] */ IBindCtx *pbc) = 0; + + virtual HRESULT STDMETHODCALLTYPE BindIfRunning( void) = 0; + + virtual HRESULT STDMETHODCALLTYPE GetBoundSource( + /* [out] */ IUnknown **ppunk) = 0; + + virtual HRESULT STDMETHODCALLTYPE UnbindSource( void) = 0; + + virtual HRESULT STDMETHODCALLTYPE Update( + /* [unique][in] */ IBindCtx *pbc) = 0; + + }; + +typedef +enum tagOLERENDER + { OLERENDER_NONE = 0, + OLERENDER_DRAW = 1, + OLERENDER_FORMAT = 2, + OLERENDER_ASIS = 3 + } OLERENDER; + +typedef OLERENDER *LPOLERENDER; + +typedef struct tagOBJECTDESCRIPTOR + { + ULONG cbSize; + CLSID clsid; + DWORD dwDrawAspect; + SIZEL sizel; + POINTL pointl; + DWORD dwStatus; + DWORD dwFullUserTypeName; + DWORD dwSrcOfCopy; + } OBJECTDESCRIPTOR; + +typedef struct tagOBJECTDESCRIPTOR *POBJECTDESCRIPTOR; + +typedef struct tagOBJECTDESCRIPTOR *LPOBJECTDESCRIPTOR; + +typedef struct tagOBJECTDESCRIPTOR LINKSRCDESCRIPTOR; + +typedef struct tagOBJECTDESCRIPTOR *PLINKSRCDESCRIPTOR; + +typedef struct tagOBJECTDESCRIPTOR *LPLINKSRCDESCRIPTOR; + +#endif #endif //_StarObject_H_ --- oo_1.1.1_src/soltools/ldump/ldump.cxx.orig 2003-03-18 21:47:36.000000000 +0900 +++ oo_1.1.1_src/soltools/ldump/ldump.cxx 2004-03-29 12:17:40.000000000 +0900 @@ -628,7 +628,7 @@ *********************************************************************/ -usage() +int usage() { LibDump::DumpError(99); exit(0); --- oo_1.1.1_src/stlport/STLport-4.5.patch.orig 2004-01-28 19:51:44.000000000 +0900 +++ oo_1.1.1_src/stlport/STLport-4.5.patch 2004-03-29 12:17:40.000000000 +0900 @@ -270,10 +270,49 @@ CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -g CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -g -fPIC *** misc/STLport-4.5/stlport/config/stl_gcc.h Tue Sep 4 19:10:16 2001 ---- misc/build/STLport-4.5/stlport/config/stl_gcc.h Thu Oct 16 09:49:57 2003 +--- misc/build/STLport-4.5/stlport/config/stl_gcc.h Tue Mar 16 07:32:58 2004 +*************** +*** 51,59 **** + # define _STLP_CLASS_EXPORT_DECLSPEC __attribute__((dllexport)) + # define _STLP_CALL + + # if defined (_STLP_USE_DYNAMIC_LIB) + # define _STLP_USE_DECLSPEC 1 +! # define _STLP_USE_TEMPLATE_EXPORT 1 + # endif + + # endif +--- 51,77 ---- + # define _STLP_CLASS_EXPORT_DECLSPEC __attribute__((dllexport)) + # define _STLP_CALL + ++ # if !defined (_STLP_NO_OWN_IOSTREAMS) ++ ++ # if ( defined (__DLL) || defined (_DLL) || defined (_WINDLL) || defined (_RTLDLL) \ ++ || defined(_AFXDLL) || defined (_STLP_USE_DYNAMIC_LIB) ) \ ++ && ! defined (_STLP_USE_STATIC_LIB) ++ # undef _STLP_USE_DECLSPEC ++ # define _STLP_USE_DECLSPEC 1 ++ # endif ++ ++ # ifndef _STLP_IMPORT_TEMPLATE_KEYWORD ++ # define _STLP_IMPORT_TEMPLATE_KEYWORD extern ++ # endif ++ # define _STLP_EXPORT_TEMPLATE_KEYWORD ++ ++ # endif /* _STLP_OWN_IOSTREAMS */ ++ + # if defined (_STLP_USE_DYNAMIC_LIB) + # define _STLP_USE_DECLSPEC 1 +! // # define _STLP_USE_TEMPLATE_EXPORT 1 +! /* Using dynamic library in MinGW requires _STLP_NO_CUSTOM_IO */ +! # define _STLP_NO_CUSTOM_IO + # endif + + # endif *************** *** 75,80 **** ---- 75,82 ---- +--- 93,100 ---- # define __unix @@ -291,7 +330,7 @@ # if defined(__BEOS__) && defined(__INTEL__) ---- 99,121 ---- +--- 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##> @@ -325,7 +364,7 @@ # elif (__GNUC_MINOR__ < 8) ---- 244,268 ---- +--- 262,286 ---- # if (__GNUC__ >= 3) @@ -404,3 +443,104 @@ # 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 ++++ misc/build/STLport-4.5/src/gcc-3.0-mingw.mak 2003-12-14 22:11:36.000000000 +0900 +@@ -1 +1,96 @@ +-dummy ++# ++# Note : this makefile is for gcc-3 ! ++# ++ ++# ++# compiler ++# take these from the OOo build environment ++CC*= gcc ++CXX*= g++ ++ ++# ++# Basename for libraries ++# ++LIB_BASENAME = libstlport_gcc ++ ++# ++# guts for common stuff ++# ++# ++LINK=ar crv ++DYN_LINK=$(CXX) --fexceptions -shared -o ++ ++OBJEXT=o ++DYNEXT=dll ++STEXT=a ++RM=rm -rf ++PATH_SEP=/ ++MKDIR=mkdir -p ++COMP=MINGW32 ++STATIC_SUFFIX=_static ++ ++ ++all: all_dynamic debug_dynamic all_static debug_static ++ ++include common_macros.mak ++ ++# those are defined "Unix way" in common_macros.mak; redefine them here ++RELEASE_DYNLIB=$(RELEASE_NAME).$(DYNEXT) ++DEBUG_DYNLIB=$(DEBUG_NAME).$(DYNEXT) ++STLDEBUG_DYNLIB=$(STLDEBUG_NAME).$(DYNEXT) ++ ++RELEASE_DYNLIB_SONAME=$(RELEASE_DYNLIB) ++DEBUG_DYNLIB_SONAME=$(DEBUG_DYNLIB) ++STLDEBUG_DYNLIB_SONAME=$(STLDEBUG_DYNLIB) ++ ++ALL_DYNAMIC_LIBS=$(OUTDIR)$(PATH_SEP)$(RELEASE_DYNLIB) $(OUTDIR)$(PATH_SEP)$(STLDEBUG_DYNLIB) ++DEBUG_DYNAMIC_LIBS=$(OUTDIR)$(PATH_SEP)$(RELEASE_DYNLIB) $(OUTDIR)$(PATH_SEP)$(STLDEBUG_DYNLIB) ++ ++RESFILE=$(RELEASE_OBJDIR_dynamic)$(PATH_SEP)stlport.o ++RESFILE_debug=$(DEBUG_OBJDIR_dynamic)$(PATH_SEP)stlport.o ++RESFILE_stldebug=$(STLDEBUG_OBJDIR_dynamic)$(PATH_SEP)stlport.o ++ ++WARNING_FLAGS= -Wall -W -Wno-sign-compare -Wno-unused -Wno-uninitialized ++ ++CXXFLAGS_COMMON = -D_MT -fexceptions -I${STLPORT_DIR} -DGXX_INCLUDE_PATH=${GXX_INCLUDE_PATH} ${WARNING_FLAGS} ++ ++CXXFLAGS_RELEASE_static = $(CXXFLAGS_COMMON) -O2 ++CXXFLAGS_RELEASE_dynamic = $(CXXFLAGS_COMMON) -shared -O2 -D_STLP_USE_DYNAMIC_LIB -D_STLP_DLLEXPORT_NEEDS_PREDECLARATION ++ ++CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -g ++CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -shared -g -D_STLP_USE_DYNAMIC_LIB -D_STLP_DLLEXPORT_NEEDS_PREDECLARATION ++ ++CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static) -D_STLP_DEBUG ++CXXFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic) -D_STLP_DEBUG ++ ++LDFLAGS_RELEASE_static = ++LDFLAGS_RELEASE_dynamic = ${CXXFLAGS_RELEASE_dynamic} -enable-runtime-pseudo-reloc -lmingwthrd -Wl,-Map,${OUTDIR}/${RELEASE_NAME}.map -Wl,--export-all-symbols -Wl,-d -Wl,--out-implib,${OUTDIR}/${RELEASE_NAME}.a ++ ++LDFLAGS_DEBUG_static = ++LDFLAGS_DEBUG_dynamic = ${CXXFLAGS_DEBUG_dynamic} -enable-runtime-pseudo-reloc -lmingwthrd -Wl,-Map,${OUTDIR}/${DEBUG_NAME}.map -Wl,--export-all-symbols -Wl,-d -Wl,--out-implib,${OUTDIR}/${DEBUG_NAME}.a ++ ++LDFLAGS_STLDEBUG_static = ++LDFLAGS_STLDEBUG_dynamic = ${CXXFLAGS_STLDEBUG_dynamic} -enable-runtime-pseudo-reloc -lmingwthrd -Wl,-Map,${OUTDIR}/${STLDEBUG_NAME}.map -Wl,--export-all-symbols -Wl,--out-implib,${OUTDIR}/${STLDEBUG_NAME}.a ++ ++ ++include common_percent_rules.mak ++include common_rules.mak ++ ++ ++ ++${RESFILE}: stlport.rc ++ windres -O coff --define COMP=${COMP} --define BUILD= -o $(RELEASE_OBJDIR_dynamic)$(PATH_SEP)stlport.o stlport.rc ++ ++${RESFILE_debug}: stlport.rc ++ windres -O coff --define COMP=${COMP} --define BUILD=_DEBUG -o $(DEBUG_OBJDIR_dynamic)$(PATH_SEP)stlport.o stlport.rc ++ ++${RESFILE_stldebug}: stlport.rc ++ windres -O coff --define COMP=${COMP} --define BUILD=_STLDEBUG -o $(STLDEBUG_OBJDIR_dynamic)$(PATH_SEP)stlport.o stlport.rc ++ ++#install: all ++# cp -p $(LIB_TARGET) ${D_LIB_TARGET} ../lib ++ ++#%.s: %.cpp ++# $(CXX) $(CXXFLAGS) -O4 -S -pto $< -o $@ ++ ++ + --- oo_1.1.1_src/stoc/prj/d.lst.orig 2004-01-29 00:16:12.000000000 +0900 +++ oo_1.1.1_src/stoc/prj/d.lst 2004-03-29 12:17:40.000000000 +0900 @@ -2,6 +2,7 @@ ..\%__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%\* --- oo_1.1.1_src/svtools/prj/d.lst.orig 2004-01-29 02:07:06.000000000 +0900 +++ oo_1.1.1_src/svtools/prj/d.lst 2004-03-29 12:17:40.000000000 +0900 @@ -40,6 +40,8 @@ ..\%__SRC%\misc\svt?????.map %_DEST%\bin%_EXT%\svt?????.map ..\%__SRC%\lib\libsvt?????.so %_DEST%\lib%_EXT%\* ..\%__SRC%\lib\libsvl?????.so %_DEST%\lib%_EXT%\* +..\%__SRC%\lib\libsvt?????.a %_DEST%\lib%_EXT%\* +..\%__SRC%\lib\libsvl?????.a %_DEST%\lib%_EXT%\* ..\%__SRC%\lib\libsv*.dylib %_DEST%\lib%_EXT%\* ..\%__SRC%\misc\svtools.hid %_DEST%\bin%_EXT%\svtools.hid ..\%__SRC%\inc\svtools\proped.hxx %_DEST%\inc%_EXT%\svtools\proped.hxx --- oo_1.1.1_src/svtools/source/filter.vcl/jpeg/jpeg.cxx.orig 2002-08-20 00:02:56.000000000 +0900 +++ oo_1.1.1_src/svtools/source/filter.vcl/jpeg/jpeg.cxx 2004-03-29 12:17:40.000000000 +0900 @@ -59,11 +59,6 @@ * ************************************************************************/ -extern "C" -{ - #include "jpeg.h" -} - #define _JPEGPRIVATE #include @@ -72,6 +67,11 @@ #include "FilterConfigItem.hxx" #include "filter.hxx" +extern "C" +{ + #include "jpeg.h" +} + // ----------- // - Defines - // ----------- --- oo_1.1.1_src/svtools/source/sbx/sbxdec.cxx.orig 2004-01-20 20:00:38.000000000 +0900 +++ oo_1.1.1_src/svtools/source/sbx/sbxdec.cxx 2004-03-29 12:17:36.000000000 +0900 @@ -416,10 +416,11 @@ bool bRet = false; - OLECHAR sz[100]; - BSTR aBStr = SysAllocString( sz ); - if( aBStr != NULL ) - { +// 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 ) @@ -442,11 +443,15 @@ i++; } } +#ifdef __MINGW32__ + rString = String(reinterpret_cast< sal_Unicode * >(aBStr)); +#else rString = aBStr; +#endif } SysFreeString( aBStr ); - } +// } return bRet; #else return false; --- oo_1.1.1_src/svtools/source/sbx/sbxdec.hxx.orig 2004-01-20 20:01:00.000000000 +0900 +++ oo_1.1.1_src/svtools/source/sbx/sbxdec.hxx 2004-03-29 12:17:36.000000000 +0900 @@ -68,7 +68,9 @@ #include } // close extern "C" { +#ifndef __MINGW32__ #include +#endif #include extern "C" { // reopen extern "C" { --- oo_1.1.1_src/svtools/source/svdde/ddedata.cxx.orig 2001-03-09 06:14:02.000000000 +0900 +++ oo_1.1.1_src/svtools/source/svdde/ddedata.cxx 2004-03-29 12:17:40.000000000 +0900 @@ -240,7 +240,11 @@ TCHAR szName[ 256 ]; if( GetClipboardFormatName( nFmt, szName, sizeof(szName) ) ) +#ifdef __MINGW32__ + nFmt = SotExchange::RegisterFormatName( String(reinterpret_cast< unsigned short int * >(szName)) ); +#else nFmt = SotExchange::RegisterFormatName( String(szName) ); +#endif } #endif #if defined(PM2) --- oo_1.1.1_src/svtools/source/svdde/ddeinf.cxx.orig 2000-09-19 01:59:06.000000000 +0900 +++ oo_1.1.1_src/svtools/source/svdde/ddeinf.cxx 2004-03-29 12:17:40.000000000 +0900 @@ -136,7 +136,11 @@ *p++ = '|'; *p = 0; DdeQueryString( hDdeInst, aInf.hszTopic, p, sizeof(buf)/sizeof(TCHAR)-lstrlen( buf ), CP_WINUNICODE ); +#ifdef __MINGW32__ + aServices.Insert( new String( reinterpret_cast< unsigned short int * >(buf) ) ); +#else aServices.Insert( new String( buf ) ); +#endif } } DdeDisconnectList( hConvList ); @@ -164,11 +168,19 @@ DdeTopicList::DdeTopicList( const String& rService ) { +#ifdef __MINGW32__ + DdeConnection aSys( rService, String( reinterpret_cast< unsigned short int * >(SZDDESYS_TOPIC) ) ); +#else DdeConnection aSys( rService, String( SZDDESYS_TOPIC ) ); +#endif if ( !aSys.GetError() ) { +#ifdef __MINGW32__ + DdeRequest aReq( aSys, String( reinterpret_cast< unsigned short int * >(SZDDESYS_ITEM_TOPICS) ), 500 ); +#else DdeRequest aReq( aSys, String( SZDDESYS_ITEM_TOPICS ), 500 ); +#endif aReq.SetDataHdl( LINK( this, DdeTopicList, Data ) ); aReq.Execute(); } --- oo_1.1.1_src/svtools/source/svdde/ddesvr.cxx.orig 2001-09-05 02:05:08.000000000 +0900 +++ oo_1.1.1_src/svtools/source/svdde/ddesvr.cxx 2004-03-29 12:17:40.000000000 +0900 @@ -147,7 +147,11 @@ while( STRING_NOTFOUND != n ) { String s( sTopics.GetToken( 0, '\t', n )); +#ifdef __MINGW32__ + if( s == reinterpret_cast< unsigned short int * >(chTopicBuf) ) +#else if( s == chTopicBuf ) +#endif ++nTopics; } } @@ -201,7 +205,11 @@ { String s( sTopics.GetToken( 0, '\t', n )); s.EraseAllChars( '\n' ).EraseAllChars( '\r' ); +#ifdef __MINGW32__ + if( !hText1 || s == reinterpret_cast< unsigned short int * >(chTopicBuf) ) +#else if( !hText1 || s == chTopicBuf ) +#endif { DdeString aDStr( pInst->hDdeInstSvr, s ); pTopic = FindTopic( *pService, (HSZ)aDStr ); @@ -303,6 +311,17 @@ String aRes; // darf erst am Ende freigegeben werden!! if ( pTopic->IsSystemTopic() ) { +#ifdef __MINGW32__ + if ( pTopic->aItem == reinterpret_cast< const unsigned short int * >(SZDDESYS_ITEM_TOPICS) ) + aRes = pService->Topics(); + else if ( pTopic->aItem == reinterpret_cast< const unsigned short int * >(SZDDESYS_ITEM_SYSITEMS) ) + aRes = pService->SysItems(); + else if ( pTopic->aItem == reinterpret_cast< const unsigned short int * >(SZDDESYS_ITEM_STATUS) ) + aRes = pService->Status(); + else if ( pTopic->aItem == reinterpret_cast< const unsigned short int * >(SZDDESYS_ITEM_FORMATS) ) + aRes = pService->Formats(); + else if ( pTopic->aItem == reinterpret_cast< const unsigned short int * >(SZDDESYS_ITEM_HELP) ) +#else if ( pTopic->aItem == SZDDESYS_ITEM_TOPICS ) aRes = pService->Topics(); else if ( pTopic->aItem == SZDDESYS_ITEM_SYSITEMS ) @@ -312,6 +331,7 @@ else if ( pTopic->aItem == SZDDESYS_ITEM_FORMATS ) aRes = pService->Formats(); else if ( pTopic->aItem == SZDDESYS_ITEM_HELP ) +#endif aRes = pService->GetHelp(); else aRes = pService->SysTopicGet( pTopic->aItem ); @@ -455,7 +475,11 @@ // dann befragen wir doch mal unsere Ableitung: TCHAR chBuf[250]; DdeQueryString(pInst->hDdeInstSvr,hTopic,chBuf,sizeof(chBuf)/sizeof(TCHAR),CP_WINUNICODE ); +#ifdef __MINGW32__ + bWeiter = rService.MakeTopic( reinterpret_cast< const unsigned short int * >(chBuf) ); +#else bWeiter = rService.MakeTopic( chBuf ); +#endif // dann muessen wir noch mal suchen } while( bWeiter ); @@ -485,7 +509,11 @@ // dann befragen wir doch mal unsere Ableitung: TCHAR chBuf[250]; DdeQueryString(pInst->hDdeInstSvr,hItem,chBuf,sizeof(chBuf)/sizeof(TCHAR),CP_WINUNICODE ); +#ifdef __MINGW32__ + bWeiter = rTopic.MakeItem( reinterpret_cast< unsigned short int * >(chBuf) ); +#else bWeiter = rTopic.MakeItem( chBuf ); +#endif // dann muessen wir noch mal suchen } while( bWeiter ); @@ -526,12 +554,21 @@ nStatus = DMLERR_SYS_ERROR; AddFormat( FORMAT_STRING ); +#ifdef __MINGW32__ + pSysTopic = new DdeTopic( reinterpret_cast< const unsigned short int * >(SZDDESYS_TOPIC) ); + pSysTopic->AddItem( DdeItem( reinterpret_cast< const unsigned short int * >(SZDDESYS_ITEM_TOPICS) ) ); + pSysTopic->AddItem( DdeItem( reinterpret_cast< const unsigned short int * >(SZDDESYS_ITEM_SYSITEMS) ) ); + pSysTopic->AddItem( DdeItem( reinterpret_cast< const unsigned short int * >(SZDDESYS_ITEM_STATUS) ) ); + pSysTopic->AddItem( DdeItem( reinterpret_cast< const unsigned short int * >(SZDDESYS_ITEM_FORMATS) ) ); + pSysTopic->AddItem( DdeItem( reinterpret_cast< const unsigned short int * >(SZDDESYS_ITEM_HELP) ) ); +#else pSysTopic = new DdeTopic( SZDDESYS_TOPIC ); pSysTopic->AddItem( DdeItem( SZDDESYS_ITEM_TOPICS ) ); pSysTopic->AddItem( DdeItem( SZDDESYS_ITEM_SYSITEMS ) ); pSysTopic->AddItem( DdeItem( SZDDESYS_ITEM_STATUS ) ); pSysTopic->AddItem( DdeItem( SZDDESYS_ITEM_FORMATS ) ); pSysTopic->AddItem( DdeItem( SZDDESYS_ITEM_HELP ) ); +#endif AddTopic( *pSysTopic ); } @@ -683,7 +720,11 @@ BOOL DdeTopic::IsSystemTopic() { +#ifdef __MINGW32__ + return BOOL (GetName() == reinterpret_cast< const unsigned short int * >(SZDDESYS_TOPIC)); +#else return BOOL (GetName() == SZDDESYS_TOPIC); +#endif } // --- DdeTopic::AddItem() ----------------------------------------- @@ -1049,8 +1090,13 @@ { String s; long f; +#ifdef __MINGW32__ + unsigned short int buf[128]; + const unsigned short int * p; +#else TCHAR buf[128]; LPCTSTR p; +#endif short n = 0; for ( f = aFormats.First(); f; f = aFormats.Next(), n++ ) @@ -1087,8 +1133,12 @@ p= String::CreateFromAscii("PRIVATE").GetBuffer(); #else default: +#ifdef __MINGW32__ + GetClipboardFormatName( (UINT)f, reinterpret_cast< LPTSTR >(buf), sizeof(buf) / sizeof(TCHAR) ); +#else GetClipboardFormatName( (UINT)f, buf, sizeof(buf) / sizeof(TCHAR) ); #endif +#endif } s += String( p ); } --- oo_1.1.1_src/sw/source/core/sw3io/sw3field.cxx.orig 2003-07-01 00:51:36.000000000 +0900 +++ oo_1.1.1_src/sw/source/core/sw3io/sw3field.cxx 2004-03-29 12:17:40.000000000 +0900 @@ -120,7 +120,7 @@ #include "poolfmt.hxx" // fuer InSetExpField #include "poolfmt.hrc" // fuer InSetExpField -#if !defined(UNX) && !defined(MSC) && !defined(PPC) && !defined(CSET) && !defined(__MWERKS__) && !defined(WTC) +#if !defined(UNX) && !defined(MSC) && !defined(PPC) && !defined(CSET) && !defined(__MWERKS__) && !defined(WTC) && !defined(__MINGW32__) #define FIELDFNTAB_SIZE 37 #if FIELDFNTAB_SIZE != RES_FIELDS_END - RES_FIELDS_BEGIN --- oo_1.1.1_src/sw/source/filter/html/css1atr.cxx.orig 2003-04-17 23:53:20.000000000 +0900 +++ oo_1.1.1_src/sw/source/filter/html/css1atr.cxx 2004-03-29 12:17:40.000000000 +0900 @@ -259,7 +259,7 @@ * diese Section und die dazugeherigen Tabellen muessen in folgenden Files * gepflegt werden: rtf\rtfatr.cxx, sw6\sw6atr.cxx, w4w\w4watr.cxx */ -#if !defined(UNX) && !defined(MSC) && !defined(PPC) && !defined(CSET) && !defined(__MWERKS__) && !defined(WTC) +#if !defined(UNX) && !defined(MSC) && !defined(PPC) && !defined(CSET) && !defined(__MWERKS__) && !defined(WTC) && !defined(__MINGW32__) #define ATTRFNTAB_SIZE 130 #if ATTRFNTAB_SIZE != POOLATTR_END - POOLATTR_BEGIN --- oo_1.1.1_src/sw/source/filter/html/htmlatr.cxx.orig 2003-04-17 23:53:44.000000000 +0900 +++ oo_1.1.1_src/sw/source/filter/html/htmlatr.cxx 2004-03-29 12:17:40.000000000 +0900 @@ -257,7 +257,7 @@ * diese Section und die dazugeherigen Tabellen muessen in folgenden Files * gepflegt werden: rtf\rtfatr.cxx, sw6\sw6atr.cxx, w4w\w4watr.cxx */ -#if !defined(UNX) && !defined(MSC) && !defined(PPC) && !defined(CSET) && !defined(__MWERKS__) && !defined(WTC) +#if !defined(UNX) && !defined(MSC) && !defined(PPC) && !defined(CSET) && !defined(__MWERKS__) && !defined(WTC) && !defined(__MINGW32__) #define ATTRFNTAB_SIZE 130 #if ATTRFNTAB_SIZE != POOLATTR_END - POOLATTR_BEGIN --- oo_1.1.1_src/sw/source/filter/rtf/rtfatr.cxx.orig 2003-05-19 21:24:46.000000000 +0900 +++ oo_1.1.1_src/sw/source/filter/rtf/rtfatr.cxx 2004-03-29 12:17:40.000000000 +0900 @@ -374,7 +374,7 @@ * diese Section und die dazugeherigen Tabellen muessen in folgenden Files * gepflegt werden: rtf\rtfatr.cxx, sw6\sw6atr.cxx, w4w\w4watr.cxx */ -#if !defined(UNX) && !defined(MSC) && !defined(PPC) && !defined(CSET) && !defined(__MWERKS__) && !defined(WTC) +#if !defined(UNX) && !defined(MSC) && !defined(PPC) && !defined(CSET) && !defined(__MWERKS__) && !defined(WTC) && !defined(__MINGW32__) #define ATTRFNTAB_SIZE 130 #if ATTRFNTAB_SIZE != POOLATTR_END - POOLATTR_BEGIN --- oo_1.1.1_src/sw/source/filter/w4w/w4watr.cxx.orig 2003-04-18 00:01:30.000000000 +0900 +++ oo_1.1.1_src/sw/source/filter/w4w/w4watr.cxx 2004-03-29 12:17:40.000000000 +0900 @@ -219,7 +219,7 @@ * gepflegt werden: rtf\rtfatr.cxx, sw6\sw6atr.cxx, w4w\w4watr.cxx */ -#if !defined(MSC) && !defined(UNX) && !defined(PPC) && !defined(CSET) && !defined(__MWERKS__) && !defined(WTC) +#if !defined(MSC) && !defined(UNX) && !defined(PPC) && !defined(CSET) && !defined(__MWERKS__) && !defined(WTC) && !defined(__MINGW32__) #define ATTRFNTAB_SIZE 130 #if ATTRFNTAB_SIZE != POOLATTR_END - POOLATTR_BEGIN --- oo_1.1.1_src/sw/source/filter/ww8/ww8atr.cxx.orig 2004-01-15 23:22:48.000000000 +0900 +++ oo_1.1.1_src/sw/source/filter/ww8/ww8atr.cxx 2004-03-29 12:17:40.000000000 +0900 @@ -355,7 +355,7 @@ * gepflegt werden: rtf\rtfatr.cxx, sw6\sw6atr.cxx, w4w\w4watr.cxx */ -#if !defined(MSC) && !defined(UNX) && !defined(PPC) && !defined(CSET) && !defined(__MWERKS__) && !defined(WTC) +#if !defined(MSC) && !defined(UNX) && !defined(PPC) && !defined(CSET) && !defined(__MWERKS__) && !defined(WTC) && !defined(__MINGW32__) #define ATTRFNTAB_SIZE 130 #if ATTRFNTAB_SIZE != POOLATTR_END - POOLATTR_BEGIN --- oo_1.1.1_src/testtools/prj/d.lst.orig 2004-01-29 00:13:54.000000000 +0900 +++ oo_1.1.1_src/testtools/prj/d.lst 2004-03-29 12:17:40.000000000 +0900 @@ -1,2 +1,3 @@ ..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\* ..\%__SRC%\lib\*.so %_DEST%\lib%_EXT%\* +..\%__SRC%\lib\*.a %_DEST%\lib%_EXT%\* --- oo_1.1.1_src/tools/inc/solar.h.orig 2003-06-12 19:30:28.000000000 +0900 +++ oo_1.1.1_src/tools/inc/solar.h 2004-03-29 12:17:40.000000000 +0900 @@ -101,7 +101,7 @@ typedef char INT8; typedef unsigned char UINT8; #else -#if !defined(_MSC_VER) || defined(_MSC_VER) && (_MSC_VER < 1200) || (_MSC_VER >= 1200 ) && !defined(VCL_NEED_BASETSD ) +#if !defined(__MINGW32__) && !defined(_MSC_VER) || defined(_MSC_VER) && (_MSC_VER < 1200) || ( (_MSC_VER >= 1200 ) || defined(__MINGW32__) ) && !defined(VCL_NEED_BASETSD ) typedef void INT64; typedef void UINT64; typedef long INT32; --- oo_1.1.1_src/tools/source/fsys/dirent.cxx.orig 2003-05-02 23:56:16.000000000 +0900 +++ oo_1.1.1_src/tools/source/fsys/dirent.cxx 2004-03-29 12:17:36.000000000 +0900 @@ -1223,11 +1223,20 @@ 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 ) ) @@ -2313,7 +2322,7 @@ /* Prefix can have 5 chars, leaving 3 for numbers. 26 ** 3 == 17576 */ -#if (defined (MSC) || defined (BLC) || defined(ICC) ) && ( defined (WIN) || defined (WNT)) +#if (defined (MSC) || defined (BLC) || defined(ICC) || defined(__MINGW32__)) && ( defined (WIN) || defined (WNT)) static unsigned long u = GetTickCount(); #else static unsigned long u = clock(); @@ -2896,8 +2905,16 @@ ( 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 )) ) --- oo_1.1.1_src/tools/symbol/symbol.cxx.orig 2000-09-19 02:03:10.000000000 +0900 +++ oo_1.1.1_src/tools/symbol/symbol.cxx 2004-03-29 12:17:40.000000000 +0900 @@ -112,7 +112,11 @@ pMap[nSize] = '\0'; #else +#ifdef __MINGW32__ + SvFileStream aMap( String( *(argv+1), gsl_getSystemTextEncoding()), STREAM_READ ); // gcc bug?? +#else SvFileStream aMap( String( argv[1], gsl_getSystemTextEncoding()), STREAM_READ ); +#endif nSize = aMap.Seek( STREAM_SEEK_TO_END ); if( aMap.GetError() ) @@ -159,7 +163,11 @@ if( n != nLines ) return Error( 5, "n", n ); +#ifdef __MINGW32__ + SvFileStream aLeak( String( *(argv+2), gsl_getSystemTextEncoding()), STREAM_READ ); +#else SvFileStream aLeak( String( argv[2], gsl_getSystemTextEncoding()), STREAM_READ ); +#endif ByteString aLine; aLeak.ReadLine( aLine ); --- oo_1.1.1_src/ucb/prj/d.lst.orig 2004-01-28 19:12:30.000000000 +0900 +++ oo_1.1.1_src/ucb/prj/d.lst 2004-03-29 12:17:40.000000000 +0900 @@ -18,6 +18,7 @@ ..\%__SRC%\bin\ucp*.dll %_DEST%\bin%_EXT%\ucp*.dll ..\%__SRC%\lib\libucp*.so %_DEST%\lib%_EXT%\libucp*.so +..\%__SRC%\lib\libucp*.a %_DEST%\lib%_EXT%\libucp*.a ..\%__SRC%\lib\libucp*.dylib %_DEST%\lib%_EXT%\libucp*.dylib ..\%__SRC%\misc\ucp*.map %_DEST%\bin%_EXT%\ucp*.map ..\%__SRC%\misc\ucp*.sym %_DEST%\bin%_EXT%\ucp*.sym --- oo_1.1.1_src/ucb/source/inc/regexpmap.tpt.orig 2000-10-16 23:53:08.000000000 +0900 +++ oo_1.1.1_src/ucb/source/inc/regexpmap.tpt 2004-03-29 12:17:40.000000000 +0900 @@ -76,6 +76,12 @@ #include "regexp.hxx" #endif +#if defined(_MSC_VER) && (_MSC_VER >= 1310) +#define TYPENAME_ON_RETURN_TYPE typename +#else +#define TYPENAME_ON_RETURN_TYPE +#endif + namespace unnamed_ucb_regexpmap {} using namespace unnamed_ucb_regexpmap; // unnamed namespaces don't work well yet... @@ -112,7 +118,7 @@ { public: typedef RegexpMapImpl< Val > MapImpl; - typedef List< Val >::iterator ListIterator; + typedef TYPENAME_ON_RETURN_TYPE List< Val >::iterator ListIterator; // Solaris needs these for the ctor... inline RegexpMapIterImpl(); @@ -128,7 +134,7 @@ int getList() const { return m_nList; } - List< Val >::iterator const & getIndex() const { return m_aIndex; } + TYPENAME_ON_RETURN_TYPE List< Val >::iterator const & getIndex() const { return m_aIndex; } void next(); @@ -136,7 +142,7 @@ private: mutable RegexpMapEntry< Val > m_aEntry; - List< Val >::iterator m_aIndex; + TYPENAME_ON_RETURN_TYPE List< Val >::iterator m_aIndex; RegexpMapImpl< Val > * m_pMap; int m_nList; mutable bool m_bEntrySet; @@ -474,7 +480,7 @@ //============================================================================ template< typename Val > -RegexpMap< Val >::iterator RegexpMap< Val >::find(rtl::OUString const & rKey, +TYPENAME_ON_RETURN_TYPE RegexpMap< Val >::iterator RegexpMap< Val >::find(rtl::OUString const & rKey, rtl::OUString * pReverse) { Regexp aRegexp(Regexp::parse(rKey)); @@ -523,14 +529,14 @@ //============================================================================ template< typename Val > -RegexpMap< Val >::iterator RegexpMap< Val >::begin() +TYPENAME_ON_RETURN_TYPE RegexpMap< Val >::iterator RegexpMap< Val >::begin() { return RegexpMapIter< Val >(new RegexpMapIterImpl< Val >(m_pImpl, true)); } //============================================================================ template< typename Val > -RegexpMap< Val >::const_iterator RegexpMap< Val >::begin() const +TYPENAME_ON_RETURN_TYPE RegexpMap< Val >::const_iterator RegexpMap< Val >::begin() const { return RegexpMapConstIter< Val >(new RegexpMapIterImpl< Val >(m_pImpl, true)); @@ -538,14 +544,14 @@ //============================================================================ template< typename Val > -RegexpMap< Val >::iterator RegexpMap< Val >::end() +TYPENAME_ON_RETURN_TYPE RegexpMap< Val >::iterator RegexpMap< Val >::end() { return RegexpMapIter< Val >(new RegexpMapIterImpl< Val >(m_pImpl, false)); } //============================================================================ template< typename Val > -RegexpMap< Val >::const_iterator RegexpMap< Val >::end() const +TYPENAME_ON_RETURN_TYPE RegexpMap< Val >::const_iterator RegexpMap< Val >::end() const { return RegexpMapConstIter< Val >(new RegexpMapIterImpl< Val >(m_pImpl, false)); @@ -563,7 +569,7 @@ //============================================================================ template< typename Val > -RegexpMap< Val >::size_type RegexpMap< Val >::size() const +TYPENAME_ON_RETURN_TYPE RegexpMap< Val >::size_type RegexpMap< Val >::size() const { return (m_pImpl->m_pDefault ? 1 : 0) + m_pImpl->m_aList[Regexp::KIND_PREFIX].size() --- oo_1.1.1_src/ucbhelper/prj/d.lst.orig 2004-01-28 20:41:14.000000000 +0900 +++ oo_1.1.1_src/ucbhelper/prj/d.lst 2004-03-29 12:17:40.000000000 +0900 @@ -1,5 +1,6 @@ ..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*.dll ..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%\lib*.so +..\%__SRC%\lib\lib*.a %_DEST%\lib%_EXT%\lib*.a ..\%__SRC%\lib\lib*.dylib %_DEST%\lib%_EXT%\lib*.dylib ..\%__SRC%\lib\*.lib %_DEST%\lib%_EXT%\*.lib ..\%__SRC%\misc\*.map %_DEST%\bin%_EXT%\*.map --- oo_1.1.1_src/udm/prj/d.lst.orig 2002-03-22 21:42:56.000000000 +0900 +++ oo_1.1.1_src/udm/prj/d.lst 2004-03-29 12:17:40.000000000 +0900 @@ -3,7 +3,7 @@ mkdir: %_DEST%\inc%_EXT%\udm\xml ..\%__SRC%\lib\udm.lib %_DEST%\lib%_EXT%\udm.lib -..\%__SRC%\lib\libudm.a %_DEST%\lib%_EXT%\libudm.a +..\%__SRC%\lib\libudm*.a %_DEST%\lib%_EXT%\*.a ..\inc\udm\*.hxx %_DEST%\inc%_EXT%\udm\*.hxx ..\inc\udm\html\*.hxx %_DEST%\inc%_EXT%\udm\html\*.hxx ..\inc\udm\xml\*.hxx %_DEST%\inc%_EXT%\udm\xml\*.hxx --- oo_1.1.1_src/unotools/prj/d.lst.orig 2004-01-29 00:11:46.000000000 +0900 +++ oo_1.1.1_src/unotools/prj/d.lst 2004-03-29 12:17:40.000000000 +0900 @@ -1,6 +1,7 @@ ..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*.dll ..\%__SRC%\lib\*.lib %_DEST%\lib%_EXT%\*.lib ..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT% +..\%__SRC%\lib\lib*.a %_DEST%\lib%_EXT% ..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib ..\%__SRC%\lib\*.sl %_DEST%\lib%_EXT%\*.sl ..\%__SRC%\bin\*.bin %_DEST%\bin%_EXT%\*.bin --- oo_1.1.1_src/unzip/inc/unzip.h.orig 2003-04-29 02:02:32.000000000 +0900 +++ oo_1.1.1_src/unzip/inc/unzip.h 2004-03-29 12:17:40.000000000 +0900 @@ -1274,6 +1274,8 @@ #endif #ifndef UNX +#ifndef __MINGW32__ typedef void UnzipCallBack ( long nBytesWritten ); extern UnzipCallBack *pCallBack; #endif +#endif --- oo_1.1.1_src/unzip/prj/d.lst.orig 2004-01-29 01:02:36.000000000 +0900 +++ oo_1.1.1_src/unzip/prj/d.lst 2004-03-29 12:17:40.000000000 +0900 @@ -3,6 +3,7 @@ ..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT% ..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib ..\%__SRC%\lib\*.a %_DEST%\lib%_EXT%\*.a +..\%__SRC%\slb\libsvunzip_static.a %_DEST%\lib%_EXT%\libunzipdll_static.a ..\inc\svunzip.h %_DEST%\inc%_EXT%\svunzip.h dos: sh -c "if test %OS% = MACOSX; then create-bundle %_DEST%\lib%_EXT%\*.dylib; fi" --- oo_1.1.1_src/unzip/source/mapname.c.orig 2000-12-12 03:36:58.000000000 +0900 +++ oo_1.1.1_src/unzip/source/mapname.c 2004-03-29 12:17:40.000000000 +0900 @@ -39,7 +39,7 @@ #endif #ifndef NO_MKDIR -# if (defined(DOS_OS2) && !defined(__GO32__)) +# if (defined(DOS_OS2) && !defined(__GO32__)) || defined(__MINGW32__) # if (_MSC_VER >= 600) /* have special MSC mkdir prototype */ # include # else /* own prototype because dir.h conflicts? */ --- oo_1.1.1_src/vcl/prj/d.lst.orig 2004-01-29 00:22:00.000000000 +0900 +++ oo_1.1.1_src/vcl/prj/d.lst 2004-03-29 12:17:40.000000000 +0900 @@ -14,6 +14,7 @@ ..\%__SRC%\bin\getstyle-gnome %_DEST%\bin%_EXT%\getstyle-gnome ..\%__SRC%\bin\msgbox-gnome %_DEST%\bin%_EXT%\msgbox-gnome ..\%__SRC%\lib\libvcl*.so %_DEST%\lib%_EXT%\libvcl*.so +..\%__SRC%\lib\libvcl*.a %_DEST%\lib%_EXT%\libvcl*.a ..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib ..\%__SRC%\lib\app16.lib %_DEST%\lib%_EXT%\app16.lib ..\%__SRC%\lib\gdi16.lib %_DEST%\lib%_EXT%\gdi16.lib --- oo_1.1.1_src/vcl/source/gdi/outdev3.cxx.orig 2004-02-13 23:03:38.000000000 +0900 +++ oo_1.1.1_src/vcl/source/gdi/outdev3.cxx 2004-03-29 12:17:40.000000000 +0900 @@ -6184,7 +6184,7 @@ nMnemonicWidth = ::abs((int)(lc_x1 - lc_x2)); Point aTempPos = LogicToPixel( aPos ); -#if (_MSC_VER < 1300) +#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 ) ); @@ -6258,7 +6258,7 @@ nMnemonicWidth = ::abs((int)(lc_x1 - lc_x2)); Point aTempPos = LogicToPixel( aPos ); -#if (_MSC_VER < 1300) +#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) ); @@ -6614,7 +6614,7 @@ long lc_x2 = pCaretXArray[ 2*(nMnemonicPos - nIndex)+1 ]; nMnemonicWidth = ::abs((int)(lc_x1 - lc_x2)); -#if (_MSC_VER < 1300) +#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() ); @@ -7101,7 +7101,7 @@ long nXOffset = 0; if( nBase != nIndex ) { -#if (_MSC_VER < 1300) +#if (_MSC_VER < 1300) && !defined(__MINGW32__) xub_StrLen nStart = std::min( nBase, nIndex ); xub_StrLen nOfsLen = std::max( nBase, nIndex ) - nStart; #else @@ -7309,7 +7309,7 @@ long nXOffset = 0; if( nBase != nIndex ) { -#if (_MSC_VER < 1300) +#if (_MSC_VER < 1300) && !defined(__MINGW32__) xub_StrLen nStart = std::min( nBase, nIndex ); xub_StrLen nOfsLen = std::max( nBase, nIndex ) - nStart; #else --- oo_1.1.1_src/vcl/win/source/app/salinst.cxx.orig 2004-01-15 21:55:06.000000000 +0900 +++ oo_1.1.1_src/vcl/win/source/app/salinst.cxx 2004-03-29 12:17:36.000000000 +0900 @@ -819,12 +819,20 @@ { int bDef = TRUE; LRESULT nRet = 0; +#ifdef __MINGW32__ + try +#else __try +#endif { nRet = SalComWndProc( hWnd, nMsg, wParam, lParam, bDef ); } // #112221# exception should not be caught in user32 +#ifdef __MINGW32__ + catch(...) +#else __except(UnhandledExceptionFilter(GetExceptionInformation())) +#endif { } if ( bDef ) @@ -839,12 +847,20 @@ { int bDef = TRUE; LRESULT nRet = 0; +#ifdef __MINGW32__ + try +#else __try +#endif { nRet = SalComWndProc( hWnd, nMsg, wParam, lParam, bDef ); } // #112221# exception should not be caught in user32 +#ifdef __MINGW32__ + catch(...) +#else __except(UnhandledExceptionFilter(GetExceptionInformation())) +#endif { } if ( bDef ) --- oo_1.1.1_src/vcl/win/source/app/salshl.cxx.orig 2001-11-09 23:33:28.000000000 +0900 +++ oo_1.1.1_src/vcl/win/source/app/salshl.cxx 2004-03-29 12:17:40.000000000 +0900 @@ -124,7 +124,7 @@ if ( nReason == DLL_PROCESS_ATTACH ) aSalShlData.mhInst = hInst; -#if !defined ( __BORLANDC__ ) +#if !defined ( __BORLANDC__ ) && !defined ( __MINGW32__ ) #ifdef ICC if ( _CRT_init() == -1 ) #else --- oo_1.1.1_src/vcl/win/source/gdi/salgdi3.cxx.orig 2004-01-27 02:28:36.000000000 +0900 +++ oo_1.1.1_src/vcl/win/source/gdi/salgdi3.cxx 2004-03-29 12:17:40.000000000 +0900 @@ -478,7 +478,11 @@ void ImplSalLogFontToFontW( HDC hDC, const LOGFONTW& rLogFont, Font& rFont, BOOL bReplaceFont ) { +#ifdef __MINGW32__ + XubString aFontName( reinterpret_cast< const unsigned short int * >(rLogFont.lfFaceName) ); +#else XubString aFontName( rLogFont.lfFaceName ); +#endif if ( aFontName.Len() ) { if ( bReplaceFont ) @@ -904,7 +908,11 @@ { wchar_t aFaceName[LF_FACESIZE+60]; if ( GetTextFaceW( maGraphicsData.mhDC, sizeof( aFaceName ) / sizeof( wchar_t ), aFaceName ) ) +#ifdef __MINGW32__ + pMetric->maName = reinterpret_cast< const unsigned short int * >(aFaceName); +#else pMetric->maName = aFaceName; +#endif TEXTMETRICW aWinMetric; if ( GetTextMetricsW( maGraphicsData.mhDC, &aWinMetric ) ) @@ -1451,7 +1459,11 @@ pInfo->mbCourier = ImplSalWICompareAscii( pLogFont->elfLogFont.lfFaceName, "Courier" ) == 0; else pInfo->mbCourier = FALSE; +#ifdef __MINGW32__ + XubString aName( reinterpret_cast< const unsigned short int * >(pLogFont->elfLogFont.lfFaceName) ); +#else XubString aName( pLogFont->elfLogFont.lfFaceName ); +#endif pInfo->mpName = &aName; memcpy( pInfo->mpLogFontW->lfFaceName, pLogFont->elfLogFont.lfFaceName, (aName.Len()+1)*sizeof( wchar_t ) ); pInfo->mpLogFontW->lfCharSet = pLogFont->elfLogFont.lfCharSet; @@ -1477,7 +1489,11 @@ ImplLogMetricToDevFontDataW( &(pLogFont->elfLogFont), &(pMetric->ntmTm), nFontType, pData ); // Test if Stylename is correct - const wchar_t* pStyleName = pLogFont->elfStyle; +#ifdef __MINGW32__ + const wchar_t* pStyleName = reinterpret_cast< const wchar_t* >(pLogFont->elfStyle); +#else + const wchar_t* pStyleName = reinterpret_cast< const unsigned short int * >(pLogFont->elfStyle); +#endif const wchar_t* pTemp = pStyleName; const wchar_t* pEnd = pTemp + sizeof( pLogFont->elfStyle )/sizeof( wchar_t ); while ( *pTemp && (pTemp < pEnd) ) @@ -1490,7 +1506,11 @@ pTemp++; } if ( pStyleName && (pTemp < pEnd) ) +#ifdef __MINGW32__ + pData->maStyleName = reinterpret_cast< const unsigned short int * >(pStyleName); +#else pData->maStyleName = pStyleName; +#endif pData->mpSysData = (void*)(pLogFont->elfLogFont.lfCharSet); BOOL bAdd = TRUE; @@ -1637,7 +1657,7 @@ char aResourceName[512]; int nMaxLen = sizeof(aResourceName)/sizeof(*aResourceName) - 16; int nLen = ::GetTempPathA( nMaxLen, aResourceName ); -#if (_MSC_VER < 1300) +#if (_MSC_VER < 1300) && !defined(__MINGW32__) ::strncpy( aResourceName + nLen, aFileName, std::max( 0, nMaxLen - nLen )); #else ::strncpy( aResourceName + nLen, aFileName, max( 0, nMaxLen - nLen )); --- oo_1.1.1_src/vcl/win/source/gdi/salogl.cxx.orig 2001-02-03 00:18:28.000000000 +0900 +++ oo_1.1.1_src/vcl/win/source/gdi/salogl.cxx 2004-03-29 12:17:40.000000000 +0900 @@ -100,9 +100,15 @@ // ---------- #define INIT_OGLFNC_WGL( FncName ) static OGLFnc##FncName pImplOpenWGLFnc##FncName = NULL; +#ifdef __MINGW32__ +#define GET_OGLFNC_WGL( FncName ) \ +pImplOpenWGLFnc##FncName = (OGLFnc##FncName) GetProcAddress( hImplOGLLib, "wgl" #FncName ); \ +if( !pImplOpenWGLFnc##FncName ) bRet = FALSE; +#else #define GET_OGLFNC_WGL( FncName ) \ pImplOpenWGLFnc##FncName = (OGLFnc##FncName##) GetProcAddress( hImplOGLLib, "wgl" #FncName ); \ if( !pImplOpenWGLFnc##FncName ) bRet = FALSE; +#endif // ----------------- // - Statics init. - --- oo_1.1.1_src/vcl/win/source/gdi/winlayout.cxx.orig 2004-01-15 21:55:42.000000000 +0900 +++ oo_1.1.1_src/vcl/win/source/gdi/winlayout.cxx 2004-03-29 12:17:40.000000000 +0900 @@ -721,7 +721,7 @@ Point aPos = GetDrawPosition( Point( mnBaseAdv, 0 ) ); // #108267#, limit the number of glyphs to avoid paint errors -#if (_MSC_VER < 1300) +#if (_MSC_VER < 1300) && !defined(__MINGW32__) UINT limitedGlyphCount = std::min( 8192, mnGlyphCount ); #else UINT limitedGlyphCount = min( 8192, mnGlyphCount ); --- oo_1.1.1_src/vcl/win/source/window/salframe.cxx.orig 2004-01-15 23:21:12.000000000 +0900 +++ oo_1.1.1_src/vcl/win/source/window/salframe.cxx 2004-03-29 12:17:36.000000000 +0900 @@ -2706,7 +2706,7 @@ StyleSettings aStyleSettings = rSettings.GetStyleSettings(); BOOL bCompBorder = (aStyleSettings.GetOptions() & (STYLE_OPTION_MACSTYLE | STYLE_OPTION_UNIXSTYLE)) == 0; -#if (_MSC_VER < 1300) +#if (_MSC_VER < 1300) && !defined(__MINGW32__) aStyleSettings.SetScrollBarSize( std::min( GetSystemMetrics( SM_CXVSCROLL ), 20 ) ); // #99956# do not allow huge scrollbars, most of the UI is not scaled anymore aStyleSettings.SetSpinSize( std::min( GetSystemMetrics( SM_CXVSCROLL ), 20 ) ); #else @@ -5289,12 +5289,20 @@ { int bDef = TRUE; LRESULT nRet = 0; +#ifdef __MINGW32__ + try +#else __try +#endif { nRet = SalFrameWndProc( hWnd, nMsg, wParam, lParam, bDef ); } // #112221# exception should not be caught in user32 +#ifdef __MINGW32__ + catch(...) +#else __except(UnhandledExceptionFilter(GetExceptionInformation())) +#endif { } if ( bDef ) @@ -5306,12 +5314,20 @@ { int bDef = TRUE; LRESULT nRet = 0; +#ifdef __MINGW32__ + try +#else __try +#endif { nRet = SalFrameWndProc( hWnd, nMsg, wParam, lParam, bDef ); } // #112221# exception should not be caught in user32 +#ifdef __MINGW32__ + catch(...) +#else __except(UnhandledExceptionFilter(GetExceptionInformation())) // #112221# +#endif { } if ( bDef ) --- oo_1.1.1_src/vos/inc/vos/signal.hxx.orig 2000-09-19 00:18:14.000000000 +0900 +++ oo_1.1.1_src/vos/inc/vos/signal.hxx 2004-03-29 12:17:40.000000000 +0900 @@ -80,7 +80,7 @@ { #endif -#if defined ( _USE_NAMESPACE ) && !defined ( WNT ) +#if defined ( _USE_NAMESPACE ) && !(defined ( WNT ) && !defined(__MINGW32__)) oslSignalAction SAL_CALL _cpp_OSignalHandler_Function(void* pthis, oslSignalInfo* pInfo); #endif @@ -133,7 +133,7 @@ protected: oslSignalHandler m_hHandler; -#if defined ( _USE_NAMESPACE ) && defined ( WNT ) +#if defined ( _USE_NAMESPACE ) && (defined ( WNT ) && !defined(__MINGW32__)) friend oslSignalAction SAL_CALL ::_OSignalHandler_Function(void* pthis, oslSignalInfo* pInfo); #elif defined ( _USE_NAMESPACE ) friend oslSignalAction SAL_CALL _cpp_OSignalHandler_Function(void* pthis, oslSignalInfo* pInfo); --- oo_1.1.1_src/vos/source/signal.cxx.orig 2000-09-19 00:18:18.000000000 +0900 +++ oo_1.1.1_src/vos/source/signal.cxx 2004-03-29 12:17:40.000000000 +0900 @@ -64,7 +64,7 @@ #include #include -#if defined ( _USE_NAMESPACE ) && !defined ( WNT ) +#if defined ( _USE_NAMESPACE ) && !(defined ( WNT ) && !defined(__MINGW32__)) oslSignalAction SAL_CALL _OSignalHandler_Function(void* pthis, oslSignalInfo* pInfo) { --- oo_1.1.1_src/vos/source/thread.cxx.orig 2001-06-09 01:00:20.000000000 +0900 +++ oo_1.1.1_src/vos/source/thread.cxx 2004-03-29 12:17:40.000000000 +0900 @@ -68,7 +68,7 @@ -#if defined ( _USE_NAMESPACE ) && !defined ( WNT ) +#if defined ( _USE_NAMESPACE ) && !(defined ( WNT ) && !defined(GCC)) void _OThread_WorkerFunction(void* pthis) { --- oo_1.1.1_src/xml2cmp/source/support/badcast.cxx.orig 2002-12-11 23:36:26.000000000 +0900 +++ oo_1.1.1_src/xml2cmp/source/support/badcast.cxx 2004-03-29 12:17:40.000000000 +0900 @@ -65,7 +65,7 @@ due to problems with WNT-STL-headers. */ -#ifdef WNT +#if defined(WNT) && !defined(__MINGW32__) #define _NTSDK #include --- oo_1.1.1_src/xml2cmp/source/xcd/parse.cxx.orig 2003-04-16 03:43:40.000000000 +0900 +++ oo_1.1.1_src/xml2cmp/source/xcd/parse.cxx 2004-03-29 12:17:40.000000000 +0900 @@ -274,7 +274,8 @@ Get_Attribute(sAttrValue, sAttrName); - for ( unsigned i = 0; i < nSize; ++i ) + unsigned i = 0; + for ( ; i < nSize; ++i ) { if ( i_rAttrNames[i] == sAttrName ) { @@ -366,7 +367,8 @@ { char * pResult = &sWord[0]; - for ( char * pSet = pResult; + char * pSet = pResult; + for ( ; *text != i_cEnd; ++text ) { @@ -383,7 +385,7 @@ if (i_bReverseName) { - const nMaxLen = 1000; + const int nMaxLen = 1000; if (strlen(pResult) < nMaxLen) { char * sBreak = strrchr(pResult,'.'); --- oo_1.1.1_src/xmlhelp/prj/d.lst.orig 2003-05-28 00:54:02.000000000 +0900 +++ oo_1.1.1_src/xmlhelp/prj/d.lst 2004-03-29 12:17:40.000000000 +0900 @@ -1,5 +1,6 @@ ..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*.* ..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT% +..\%__SRC%\lib\lib*.a %_DEST%\lib%_EXT% ..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.* ..\%__SRC%\class\*.jar %_DEST%\bin%_EXT%\*.* ..\%__SRC%\misc\helpserver.sh %_DEST%\bin%_EXT%\helpserver --- oo_1.1.1_src/xmloff/prj/d.lst.orig 2004-01-28 20:39:46.000000000 +0900 +++ oo_1.1.1_src/xmloff/prj/d.lst 2004-03-29 12:17:40.000000000 +0900 @@ -3,7 +3,7 @@ ..\%__SRC%\misc\*.map %_DEST%\bin%_EXT%\*.map ..\%__SRC%\lib\ixo.lib %_DEST%\lib%_EXT%\ixo.lib ..\%__SRC%\lib\xol.lib %_DEST%\lib%_EXT%\xol.lib -..\%__SRC%\lib\libxol.a %_DEST%\lib%_EXT%\libxol.a +..\%__SRC%\lib\lib*.a %_DEST%\lib%_EXT%\lib*.a ..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*.dll ..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%\lib*.so ..\dtd\*.* %_DEST%\bin%_EXT%\*.* --- oo_1.1.1_src/xmlscript/prj/d.lst.orig 2004-01-28 21:24:42.000000000 +0900 +++ oo_1.1.1_src/xmlscript/prj/d.lst 2004-03-29 12:17:40.000000000 +0900 @@ -2,6 +2,7 @@ ..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*.dll ..\%__SRC%\lib\*.lib %_DEST%\lib%_EXT%\*.lib ..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%\lib*.so +..\%__SRC%\lib\lib*.a %_DEST%\lib%_EXT%\lib*.a ..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib ..\inc\xmlscript\xml_helper.hxx %_DEST%\inc%_EXT%\xmlscript\xml_helper.hxx --- oo_1.1.1_src/zlib/prj/d.lst.orig 2002-08-26 19:00:28.000000000 +0900 +++ oo_1.1.1_src/zlib/prj/d.lst 2004-03-29 12:17:40.000000000 +0900 @@ -5,6 +5,7 @@ ..\%__SRC%\inc\zconf.h %_DEST%\inc%_EXT%\external\zconf.h ..\%__SRC%\lib\libzlib.a %_DEST%\lib%_EXT%\libzlib.a +..\%__SRC%\lib\libzlib_static.a %_DEST%\lib%_EXT%\libzlib_static.a ..\%__SRC%\slb\zlib.lib %_DEST%\lib%_EXT%\zlib.lib ..\%__SRC%\slb\zlib.lin %_DEST%\lib%_EXT%\zlib.lin