April 2019 - Wine-Commits - list.winehq.org

Alexandre Julliard : configure: Add --with-mingw option and print a notice when not found.
by Alexandre Julliard April 4, 2019

April 4, 2019

Module: wine Branch: master Commit: a3cf86a18446e9d7df4e045b83d3aa3d9193512a URL: https://source.winehq.org/git/wine.git/?a=commit;h=a3cf86a18446e9d7df4e045b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 4 11:13:17 2019 +0200 configure: Add --with-mingw option and print a notice when not found. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 27 ++++++++++++++++++++++++--- configure.ac | 11 +++++++++-- 2 files changed, 33 insertions(+), 5 deletions(-) diff --git a/configure b/configure index e1d666c..c7ce13c 100755 --- a/configure +++ b/configure @@ -853,6 +853,7 @@ with_hal with_jpeg with_krb5 with_ldap +with_mingw with_mpg123 with_netapi with_openal @@ -2522,6 +2523,7 @@ Optional Packages: --without-jpeg do not use JPEG --without-krb5 do not use krb5 (Kerberos) --without-ldap do not use LDAP + --without-mingw do not use the MinGW cross-compiler --without-mpg123 do not use the mpg123 library --without-netapi do not use the Samba NetAPI library --without-openal do not use OpenAL @@ -3945,6 +3947,12 @@ if test "${with_ldap+set}" = set; then : fi +# Check whether --with-mingw was given. +if test "${with_mingw+set}" = set; then : + withval=$with_mingw; +fi + + # Check whether --with-mpg123 was given. if test "${with_mpg123+set}" = set; then : withval=$with_mpg123; @@ -5504,6 +5512,7 @@ case $host in ;; *-mingw32*|*-cygwin*) enable_win16=${enable_win16:-no} + with_mingw=${with_mingw:-no} CFLAGS="$CFLAGS -D_WIN32" ;; esac @@ -9592,9 +9601,10 @@ test "$ac_cv_header_linux_joystick_h" = "yes" -o "$ac_cv_header_IOKit_hid_IOHIDL CROSSTARGET="" -if test "x$enable_tests" != xno -a "$LIBEXT" != "dll" +if test "x$with_mingw" != xno then - case "$host_cpu" in + case "x$with_mingw" in + x|xyes) case "$host_cpu" in aarch64*) ac_prefix_list="aarch64-w64-mingw32-clang aarch64-w64-mingw32-gcc" ;; arm*) @@ -9651,7 +9661,9 @@ fi test -n "$CROSSCC" && break done test -n "$CROSSCC" || CROSSCC="false" - + ;; + *) CROSSCC=$with_mingw ;; + esac if test "$CROSSCC" != "false" then ac_save_CC="$CC" @@ -9692,6 +9704,15 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi fi +if test "x$CROSSTARGET" = "x"; then : + case "x$with_mingw" in + x) as_fn_append wine_notices "|MinGW compiler not found, cross-compiling PE files won't be supported." ;; + xno) ;; + *) as_fn_error $? "MinGW compiler not found, cross-compiling PE files won't be supported. +This is an error since --with-mingw was requested." "$LINENO" 5 ;; +esac + +fi if test "$ac_cv_header_pthread_h" = "yes" diff --git a/configure.ac b/configure.ac index 4fa77dc..233fabd 100644 --- a/configure.ac +++ b/configure.ac @@ -61,6 +61,7 @@ AC_ARG_WITH(jpeg, AS_HELP_STRING([--without-jpeg],[do not use JPEG])) AC_ARG_WITH(krb5, AS_HELP_STRING([--without-krb5],[do not use krb5 (Kerberos)])) AC_ARG_WITH(ldap, AS_HELP_STRING([--without-ldap],[do not use LDAP]), [if test "x$withval" = "xno"; then ac_cv_header_ldap_h=no; ac_cv_header_lber_h=no; fi]) +AC_ARG_WITH(mingw, AS_HELP_STRING([--without-mingw],[do not use the MinGW cross-compiler])) AC_ARG_WITH(mpg123, AS_HELP_STRING([--without-mpg123],[do not use the mpg123 library])) AC_ARG_WITH(netapi, AS_HELP_STRING([--without-netapi],[do not use the Samba NetAPI library])) AC_ARG_WITH(openal, AS_HELP_STRING([--without-openal],[do not use OpenAL]), @@ -140,6 +141,7 @@ case $host in ;; *-mingw32*|*-cygwin*) enable_win16=${enable_win16:-no} + with_mingw=${with_mingw:-no} CFLAGS="$CFLAGS -D_WIN32" ;; esac @@ -991,9 +993,12 @@ test "$ac_cv_header_linux_joystick_h" = "yes" -o "$ac_cv_header_IOKit_hid_IOHIDL dnl Check for cross compiler to build test programs AC_SUBST(CROSSTARGET,"") -if test "x$enable_tests" != xno -a "$LIBEXT" != "dll" +if test "x$with_mingw" != xno then - WINE_CHECK_MINGW_PROG(CROSSCC,false) + case "x$with_mingw" in + x|xyes) WINE_CHECK_MINGW_PROG(CROSSCC,false) ;; + *) CROSSCC=$with_mingw ;; + esac if test "$CROSSCC" != "false" then ac_save_CC="$CC" @@ -1016,6 +1021,8 @@ then AC_SUBST(CROSSCFLAGS,${CROSSCFLAGS:-$CFLAGS}) fi fi +WINE_NOTICE_WITH(mingw,[test "x$CROSSTARGET" = "x"], + [MinGW compiler not found, cross-compiling PE files won't be supported.]) dnl **** Check for pthread ****

1 0

Alexandre Julliard : configure: Remove some obsolete checks.
by Alexandre Julliard April 4, 2019

April 4, 2019

Module: wine Branch: master Commit: 8d20ad28c327fbfa60b7353d0c6808fa30c5759b URL: https://source.winehq.org/git/wine.git/?a=commit;h=8d20ad28c327fbfa60b7353d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 3 15:50:48 2019 +0200 configure: Remove some obsolete checks. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 90 +++-------------------------------------------------- configure.ac | 39 ++--------------------- include/config.h.in | 48 ---------------------------- 3 files changed, 7 insertions(+), 170 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8d20ad28c327fbfa60b7…

1 0

Alexandre Julliard : configure: Also build msvcrt for Windows.
by Alexandre Julliard April 4, 2019

April 4, 2019

Module: wine Branch: master Commit: 5646582e5bf3e93206de575d231c1eaa3f7c3389 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5646582e5bf3e93206de575d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 4 11:01:39 2019 +0200 configure: Also build msvcrt for Windows. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 - configure.ac | 1 - 2 files changed, 2 deletions(-) diff --git a/configure b/configure index 200f612..e1d666c 100755 --- a/configure +++ b/configure @@ -8151,7 +8151,6 @@ fi DLLEXT="" enable_iphlpapi=${enable_iphlpapi:-no} enable_kernel32=${enable_kernel32:-no} - enable_msvcrt=${enable_msvcrt:-no} enable_ntdll=${enable_ntdll:-no} enable_ws2_32=${enable_ws2_32:-no} enable_loader=${enable_loader:-no} diff --git a/configure.ac b/configure.ac index b1839a4..4fa77dc 100644 --- a/configure.ac +++ b/configure.ac @@ -720,7 +720,6 @@ case $host_os in dnl Disable modules that can't be used on Windows enable_iphlpapi=${enable_iphlpapi:-no} enable_kernel32=${enable_kernel32:-no} - enable_msvcrt=${enable_msvcrt:-no} enable_ntdll=${enable_ntdll:-no} enable_ws2_32=${enable_ws2_32:-no} enable_loader=${enable_loader:-no}

1 0

Alexandre Julliard : winedump: Avoid using mmap().
by Alexandre Julliard April 4, 2019

April 4, 2019

Module: wine Branch: master Commit: 82c44208b42583e0d1b3a34742da3d2d4c35b175 URL: https://source.winehq.org/git/wine.git/?a=commit;h=82c44208b42583e0d1b3a347… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 3 15:49:04 2019 +0200 winedump: Avoid using mmap(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winedump/dump.c | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) diff --git a/tools/winedump/dump.c b/tools/winedump/dump.c index f608075..85bc681 100644 --- a/tools/winedump/dump.c +++ b/tools/winedump/dump.c @@ -34,9 +34,6 @@ #ifdef HAVE_SYS_STAT_H # include <sys/stat.h> #endif -#ifdef HAVE_SYS_MMAN_H -#include <sys/mman.h> -#endif #include <fcntl.h> #include "windef.h" @@ -260,13 +257,8 @@ BOOL dump_analysis(const char *name, file_dumper fn, enum FileSig wanted_sig) if (fstat(fd, &s) < 0) fatal("Can't get size"); dump_total_len = s.st_size; -#ifdef HAVE_MMAP - if ((dump_base = mmap(NULL, dump_total_len, PROT_READ, MAP_PRIVATE, fd, 0)) == (void *)-1) -#endif - { - if (!(dump_base = malloc( dump_total_len ))) fatal( "Out of memory" ); - if ((unsigned long)read( fd, dump_base, dump_total_len ) != dump_total_len) fatal( "Cannot read file" ); - } + if (!(dump_base = malloc( dump_total_len ))) fatal( "Out of memory" ); + if ((unsigned long)read( fd, dump_base, dump_total_len ) != dump_total_len) fatal( "Cannot read file" ); printf("Contents of %s: %ld bytes\n\n", name, dump_total_len); @@ -286,12 +278,7 @@ BOOL dump_analysis(const char *name, file_dumper fn, enum FileSig wanted_sig) } if (ret) printf("Done dumping %s\n", name); -#ifdef HAVE_MMAP - if (munmap(dump_base, dump_total_len) == -1) -#endif - { - free( dump_base ); - } + free( dump_base ); close(fd); return ret;

1 0

Gijs Vermeulen : mssign32: Implement SignerFreeSignerContext.
by Alexandre Julliard April 4, 2019

April 4, 2019

Module: wine Branch: master Commit: e71bb692f3ea33fee32c6d68946098a5e1d89444 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e71bb692f3ea33fee32c6d68… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Thu Apr 4 02:55:43 2019 +0200 mssign32: Implement SignerFreeSignerContext. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46903 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mssign32/mssign32.spec | 2 +- dlls/mssign32/mssign32_main.c | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/mssign32/mssign32.spec b/dlls/mssign32/mssign32.spec index c7b3cef..f25e23e 100644 --- a/dlls/mssign32/mssign32.spec +++ b/dlls/mssign32/mssign32.spec @@ -22,7 +22,7 @@ @ stub SignerAddTimeStampResponse @ stub SignerAddTimeStampResponseEx @ stub SignerCreateTimeStampRequest -@ stub SignerFreeSignerContext +@ stdcall SignerFreeSignerContext(ptr) @ stub SignerSign @ stdcall SignerSignEx(long ptr ptr ptr ptr wstr ptr ptr ptr) @ stub SignerTimeStamp diff --git a/dlls/mssign32/mssign32_main.c b/dlls/mssign32/mssign32_main.c index 2a5365e..8b0720e 100644 --- a/dlls/mssign32/mssign32_main.c +++ b/dlls/mssign32/mssign32_main.c @@ -27,6 +27,7 @@ #include "wincrypt.h" #include "wine/debug.h" +#include "wine/heap.h" #include "mssign32_private.h" @@ -84,3 +85,9 @@ HRESULT WINAPI SignerSignEx(DWORD flags, SIGNER_SUBJECT_INFO *subject_info, SIGN wine_dbgstr_w(http_time_stamp), request, sip_data, signer_cert); return E_NOTIMPL; } + +HRESULT WINAPI SignerFreeSignerContext(SIGNER_CONTEXT *signer_context) +{ + heap_free(signer_context); + return S_OK; +}

1 0

Alexandre Julliard : ntdll: Define IsBadStringPtr to handle exceptions in debug traces.
by Alexandre Julliard April 4, 2019

April 4, 2019

Module: wine Branch: master Commit: bb83b68832553ed74f47c07a90ace0ed68d4e04f URL: https://source.winehq.org/git/wine.git/?a=commit;h=bb83b68832553ed74f47c07a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 4 09:39:14 2019 +0200 ntdll: Define IsBadStringPtr to handle exceptions in debug traces. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/exception.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ include/wine/debug.h | 6 ------ 2 files changed, 44 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/exception.c b/dlls/ntdll/exception.c index 59177b7..8286c9d 100644 --- a/dlls/ntdll/exception.c +++ b/dlls/ntdll/exception.c @@ -346,3 +346,47 @@ void __wine_spec_unimplemented_stub( const char *module, const char *function ) record.ExceptionInformation[1] = (ULONG_PTR)function; for (;;) RtlRaiseException( &record ); } + + +/************************************************************* + * IsBadStringPtrA + * + * IsBadStringPtrA replacement for ntdll, to catch exception in debug traces. + */ +BOOL WINAPI IsBadStringPtrA( LPCSTR str, UINT_PTR max ) +{ + if (!str) return TRUE; + __TRY + { + volatile const char *p = str; + while (p != str + max) if (!*p++) break; + } + __EXCEPT_PAGE_FAULT + { + return TRUE; + } + __ENDTRY + return FALSE; +} + + +/************************************************************* + * IsBadStringPtrW + * + * IsBadStringPtrW replacement for ntdll, to catch exception in debug traces. + */ +BOOL WINAPI IsBadStringPtrW( LPCWSTR str, UINT_PTR max ) +{ + if (!str) return TRUE; + __TRY + { + volatile const WCHAR *p = str; + while (p != str + max) if (!*p++) break; + } + __EXCEPT_PAGE_FAULT + { + return TRUE; + } + __ENDTRY + return FALSE; +} diff --git a/include/wine/debug.h b/include/wine/debug.h index c7eb185..bb72827 100644 --- a/include/wine/debug.h +++ b/include/wine/debug.h @@ -24,9 +24,7 @@ #include <stdarg.h> #include <stdio.h> #include <windef.h> -#ifndef _NTSYSTEM_ #include <winbase.h> -#endif #ifndef GUID_DEFINED #include <guiddef.h> #endif @@ -227,9 +225,7 @@ static inline const char *wine_dbgstr_an( const char *str, int n ) if (!str) return "(null)"; if (!((ULONG_PTR)str >> 16)) return wine_dbg_sprintf( "#%04x", LOWORD(str) ); -#ifndef _NTSYSTEM_ if (IsBadStringPtrA( str, n )) return "(invalid)"; -#endif if (n == -1) for (n = 0; str[n]; n++) ; *dst++ = '"'; while (n-- > 0 && dst <= buffer + sizeof(buffer) - 9) @@ -271,9 +267,7 @@ static inline const char *wine_dbgstr_wn( const WCHAR *str, int n ) if (!str) return "(null)"; if (!((ULONG_PTR)str >> 16)) return wine_dbg_sprintf( "#%04x", LOWORD(str) ); -#ifndef _NTSYSTEM_ if (IsBadStringPtrW( str, n )) return "(invalid)"; -#endif if (n == -1) for (n = 0; str[n]; n++) ; *dst++ = 'L'; *dst++ = '"';

1 0

Alistair Leslie-Hughes : winecrt0: Correct compile error with older gcc.
by Alexandre Julliard April 4, 2019

April 4, 2019

Module: wine Branch: master Commit: ab7d86552d19d3ecb0b6f060653fa5af498aa3f9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ab7d86552d19d3ecb0b6f060… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Apr 3 22:51:27 2019 +0000 winecrt0: Correct compile error with older gcc. Using gcc version 4.8.4. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winecrt0/debug.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/winecrt0/debug.c b/dlls/winecrt0/debug.c index d7c170c..69a3ea7 100644 --- a/dlls/winecrt0/debug.c +++ b/dlls/winecrt0/debug.c @@ -24,6 +24,7 @@ #include "wine/port.h" #include <stdio.h> +#include <stdarg.h> #include "windef.h" #include "winbase.h" #include "wine/debug.h"

1 0

Alexandre Julliard : winebuild: Avoid using mmap().
by Alexandre Julliard April 4, 2019

April 4, 2019

Module: wine Branch: master Commit: 015f31fd5d11839cf5e8739514af075b11041d8f URL: https://source.winehq.org/git/wine.git/?a=commit;h=015f31fd5d11839cf5e87395… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 3 15:48:57 2019 +0200 winebuild: Avoid using mmap(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winebuild/utils.c | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/tools/winebuild/utils.c b/tools/winebuild/utils.c index a1cc9aa..d4f8845 100644 --- a/tools/winebuild/utils.c +++ b/tools/winebuild/utils.c @@ -33,9 +33,6 @@ #ifdef HAVE_SYS_STAT_H # include <sys/stat.h> #endif -#ifdef HAVE_SYS_MMAN_H -#include <sys/mman.h> -#endif #include "build.h" @@ -540,18 +537,13 @@ void init_input_buffer( const char *file ) { int fd; struct stat st; + unsigned char *buffer; if ((fd = open( file, O_RDONLY | O_BINARY )) == -1) fatal_perror( "Cannot open %s", file ); if ((fstat( fd, &st ) == -1)) fatal_perror( "Cannot stat %s", file ); if (!st.st_size) fatal_error( "%s is an empty file\n", file ); -#ifdef HAVE_MMAP - if ((input_buffer = mmap( NULL, st.st_size, PROT_READ, MAP_PRIVATE, fd, 0 )) == (void*)-1) -#endif - { - unsigned char *buffer = xmalloc( st.st_size ); - if (read( fd, buffer, st.st_size ) != st.st_size) fatal_error( "Cannot read %s\n", file ); - input_buffer = buffer; - } + input_buffer = buffer = xmalloc( st.st_size ); + if (read( fd, buffer, st.st_size ) != st.st_size) fatal_error( "Cannot read %s\n", file ); close( fd ); input_buffer_filename = xstrdup( file ); input_buffer_size = st.st_size;

1 0

Alexandre Julliard : libport: Add stubs for libwine functions that don' t make sense on Windows.
by Alexandre Julliard April 4, 2019

April 4, 2019

Module: wine Branch: master Commit: 69da21f1203851c5ce3936a2cd35e175588d2353 URL: https://source.winehq.org/git/wine.git/?a=commit;h=69da21f1203851c5ce3936a2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 3 15:01:31 2019 +0200 libport: Add stubs for libwine functions that don't make sense on Windows. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/port/Makefile.in | 1 + libs/port/stubs.c | 81 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 82 insertions(+) diff --git a/libs/port/Makefile.in b/libs/port/Makefile.in index 18cbf79..a2e96d1 100644 --- a/libs/port/Makefile.in +++ b/libs/port/Makefile.in @@ -103,6 +103,7 @@ C_SRCS = \ statvfs.c \ string.c \ strnlen.c \ + stubs.c \ symlink.c \ usleep.c \ utf8.c \ diff --git a/libs/port/stubs.c b/libs/port/stubs.c new file mode 100644 index 0000000..4d10535 --- /dev/null +++ b/libs/port/stubs.c @@ -0,0 +1,81 @@ +/* + * Win32 libwine stubs + * + * Copyright 2019 Alexandre Julliard + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifdef _WIN32 + +#include "config.h" + +#include <stdlib.h> +#include "windef.h" + +int __wine_main_argc = 0; +char **__wine_main_argv = NULL; +WCHAR **__wine_main_wargv = NULL; + +const char *wine_get_config_dir(void) +{ + const char *ret = getenv( "WINEPREFIX" ); + if (!ret) ret = getenv( "USERPROFILE" ); + return ret; +} + +const char *wine_get_data_dir(void) +{ + return NULL; +} + +const char *wine_get_build_dir(void) +{ + return NULL; +} + +const char *wine_get_user_name(void) +{ + return getenv( "USERNAME" ); +} + +const char *wine_dll_enum_load_path( unsigned int index ) +{ + return NULL; +} + +void *wine_dlopen( const char *filename, int flag, char *error, size_t errorsize ) +{ + if (error) + { + static const char msg[] = "no dlopen support on Windows"; + size_t len = min( errorsize, sizeof(msg) ); + memcpy( error, msg, len ); + error[len - 1] = 0; + } + return NULL; +} + +void *wine_dlsym( void *handle, const char *symbol, char *error, size_t errorsize ) +{ + return NULL; +} + +int wine_dlclose( void *handle, char *error, size_t errorsize ) +{ + return 0; +} + +#endif /* _WIN32 */

1 0

Alexandre Julliard : libwine: Remove some conditional code that was only needed for Windows.
by Alexandre Julliard April 4, 2019

April 4, 2019

Module: wine Branch: master Commit: 44dc9d7383ccbf0500428681ec20dea3499cd398 URL: https://source.winehq.org/git/wine.git/?a=commit;h=44dc9d7383ccbf0500428681… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 3 15:49:15 2019 +0200 libwine: Remove some conditional code that was only needed for Windows. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/wine/config.c | 13 +------------ libs/wine/ldt.c | 2 +- libs/wine/loader.c | 39 --------------------------------------- libs/wine/mmap.c | 10 ---------- 4 files changed, 2 insertions(+), 62 deletions(-) diff --git a/libs/wine/config.c b/libs/wine/config.c index b1f526c..3c9110b 100644 --- a/libs/wine/config.c +++ b/libs/wine/config.c @@ -246,11 +246,9 @@ static void init_server_dir( dev_t dev, ino_t ino ) #ifdef __ANDROID__ /* there's no /tmp dir on Android */ root = build_path( config_dir, ".wineserver" ); -#elif defined(HAVE_GETUID) +#else root = xmalloc( sizeof(server_root_prefix) + 12 ); sprintf( root, "%s-%u", server_root_prefix, getuid() ); -#else - root = xstrdup( server_root_prefix ); #endif server_dir = xmalloc( strlen(root) + sizeof(server_dir_prefix) + 2*sizeof(dev) + 2*sizeof(ino) + 2 ); @@ -285,8 +283,6 @@ static void init_paths(void) const char *home = getenv( "HOME" ); const char *user = NULL; const char *prefix = getenv( "WINEPREFIX" ); - -#ifdef HAVE_GETPWUID char uid_str[32]; struct passwd *pwd = getpwuid( getuid() ); @@ -300,10 +296,6 @@ static void init_paths(void) sprintf( uid_str, "%lu", (unsigned long)getuid() ); user = uid_str; } -#else /* HAVE_GETPWUID */ - if (!(user = getenv( "USER" ))) - fatal_error( "cannot determine your user name, set the USER environment variable\n" ); -#endif /* HAVE_GETPWUID */ user_name = xstrdup( user ); /* build config_dir */ @@ -335,10 +327,7 @@ static void init_paths(void) } } if (!S_ISDIR(st.st_mode)) fatal_error( "%s is not a directory\n", config_dir ); -#ifdef HAVE_GETUID if (st.st_uid != getuid()) fatal_error( "%s is not owned by you\n", config_dir ); -#endif - init_server_dir( st.st_dev, st.st_ino ); } diff --git a/libs/wine/ldt.c b/libs/wine/ldt.c index 4ecd48a..d3ff821 100644 --- a/libs/wine/ldt.c +++ b/libs/wine/ldt.c @@ -33,7 +33,7 @@ #include "winbase.h" #include "wine/library.h" -#if defined(__i386__) && !defined(__MINGW32__) && !defined(_MSC_VER) +#ifdef __i386__ #ifdef __linux__ diff --git a/libs/wine/loader.c b/libs/wine/loader.c index 8f40ea0..649aa22 100644 --- a/libs/wine/loader.c +++ b/libs/wine/loader.c @@ -382,7 +382,6 @@ static void fixup_resources( IMAGE_RESOURCE_DIRECTORY *dir, BYTE *root, int delt /* map a builtin dll in memory and fixup RVAs */ static void *map_dll( const IMAGE_NT_HEADERS *nt_descr ) { -#ifdef HAVE_MMAP IMAGE_DATA_DIRECTORY *dir; IMAGE_DOS_HEADER *dos; IMAGE_NT_HEADERS *nt; @@ -504,9 +503,6 @@ static void *map_dll( const IMAGE_NT_HEADERS *nt_descr ) fixup_exports( exports, addr, delta ); } return addr; -#else /* HAVE_MMAP */ - return NULL; -#endif /* HAVE_MMAP */ } @@ -673,7 +669,6 @@ int wine_dll_get_owner( const char *name, char *buffer, int size, int *exists ) */ static void set_max_limit( int limit ) { -#ifdef HAVE_SETRLIMIT struct rlimit rlimit; if (!getrlimit( limit, &rlimit )) @@ -692,7 +687,6 @@ static void set_max_limit( int limit ) #endif } } -#endif } @@ -1017,7 +1011,6 @@ void wine_init( int argc, char *argv[], char *error, int error_size ) */ void *wine_dlopen( const char *filename, int flag, char *error, size_t errorsize ) { -#ifdef HAVE_DLOPEN void *ret; const char *s; @@ -1068,16 +1061,6 @@ void *wine_dlopen( const char *filename, int flag, char *error, size_t errorsize } dlerror(); return ret; -#else - if (error) - { - static const char msg[] = "dlopen interface not detected by configure"; - size_t len = min( errorsize, sizeof(msg) ); - memcpy( error, msg, len ); - error[len - 1] = 0; - } - return NULL; -#endif } /*********************************************************************** @@ -1085,7 +1068,6 @@ void *wine_dlopen( const char *filename, int flag, char *error, size_t errorsize */ void *wine_dlsym( void *handle, const char *symbol, char *error, size_t errorsize ) { -#ifdef HAVE_DLOPEN void *ret; const char *s; dlerror(); dlerror(); @@ -1104,16 +1086,6 @@ void *wine_dlsym( void *handle, const char *symbol, char *error, size_t errorsiz } dlerror(); return ret; -#else - if (error) - { - static const char msg[] = "dlopen interface not detected by configure"; - size_t len = min( errorsize, sizeof(msg) ); - memcpy( error, msg, len ); - error[len - 1] = 0; - } - return NULL; -#endif } /*********************************************************************** @@ -1121,7 +1093,6 @@ void *wine_dlsym( void *handle, const char *symbol, char *error, size_t errorsiz */ int wine_dlclose( void *handle, char *error, size_t errorsize ) { -#ifdef HAVE_DLOPEN int ret; const char *s; dlerror(); dlerror(); @@ -1140,14 +1111,4 @@ int wine_dlclose( void *handle, char *error, size_t errorsize ) } dlerror(); return ret; -#else - if (error) - { - static const char msg[] = "dlopen interface not detected by configure"; - size_t len = min( errorsize, sizeof(msg) ); - memcpy( error, msg, len ); - error[len - 1] = 0; - } - return 1; -#endif } diff --git a/libs/wine/mmap.c b/libs/wine/mmap.c index caa227f..f2b5adc 100644 --- a/libs/wine/mmap.c +++ b/libs/wine/mmap.c @@ -45,8 +45,6 @@ #include "wine/library.h" #include "wine/list.h" -#ifdef HAVE_MMAP - struct reserved_area { struct list entry; @@ -684,11 +682,3 @@ int wine_mmap_enum_reserved_areas( int (*enum_func)(void *base, size_t size, voi } return ret; } - -#else /* HAVE_MMAP */ - -void mmap_init(void) -{ -} - -#endif

1 0