January 2011 - Wine-Commits

Marcus Meissner : crypt32: Handle NULL ptr leak in CryptDecodeObjectEx ( Coverity).
by Alexandre Julliard Jan. 3, 2011

Jan. 3, 2011

Module: wine Branch: master Commit: 896be411438f961503478843fc7e2ddda8c28f75 URL: http://source.winehq.org/git/wine.git/?a=commit;h=896be411438f961503478843f… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Fri Dec 31 12:50:36 2010 +0100 crypt32: Handle NULL ptr leak in CryptDecodeObjectEx (Coverity). --- dlls/crypt32/decode.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index a1431fb..dd0064d 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -5976,8 +5976,15 @@ BOOL WINAPI CryptDecodeObjectEx(DWORD dwCertEncodingType, LPCSTR lpszStructType, } SetLastError(NOERROR); - if (dwFlags & CRYPT_DECODE_ALLOC_FLAG && pvStructInfo) + if (dwFlags & CRYPT_DECODE_ALLOC_FLAG) + { + if (!pvStructInfo) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } *(BYTE **)pvStructInfo = NULL; + } decodeFunc = CRYPT_GetBuiltinDecoder(dwCertEncodingType, lpszStructType); if (!decodeFunc) {

1 0

Alexandre Julliard : configure: Output maintainer-mode rules directly from configure.
by Alexandre Julliard Jan. 3, 2011

Jan. 3, 2011

Module: wine Branch: master Commit: 5eee920441408adf9fdc961ac747bc419186e017 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5eee920441408adf9fdc961ac… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Jan 1 12:04:45 2011 +0100 configure: Output maintainer-mode rules directly from configure. --- Makefile.in | 8 -------- configure | 11 +++++++++++ configure.ac | 11 +++++++++++ 3 files changed, 22 insertions(+), 8 deletions(-) diff --git a/Makefile.in b/Makefile.in index eec29bc..b1e790e 100644 --- a/Makefile.in +++ b/Makefile.in @@ -33,14 +33,6 @@ WINAPI_CHECK_EXTRA_FLAGS = --global # Rules for re-running configure -$(srcdir)/configure: @MAINTAINER_MODE@ configure.ac aclocal.m4 - cd $(srcdir) && autoconf --warnings=all - -$(srcdir)/include/config.h.in: @MAINTAINER_MODE@ include/stamp-h.in -$(srcdir)/include/stamp-h.in: configure.ac aclocal.m4 - cd $(srcdir) && autoheader --warnings=all - @echo timestamp > $@ - config.status: configure @./config.status --recheck diff --git a/configure b/configure index 6da7a5d..c9dac48 100755 --- a/configure +++ b/configure @@ -15391,6 +15391,17 @@ ac_config_files="$ac_config_files Make.tmp:Make.vars.in:Makefile.in" +if test "x$enable_maintainer_mode" = xyes +then + wine_fn_append_rule ALL_MAKEFILE_DEPENDS "\$(srcdir)/configure: configure.ac aclocal.m4 + cd \$(srcdir) && autoconf --warnings=all + +\$(srcdir)/include/config.h.in: include/stamp-h.in +\$(srcdir)/include/stamp-h.in: configure.ac aclocal.m4 + cd \$(srcdir) && autoheader --warnings=all + @echo timestamp > \$@" +fi + if test -n "$with_wine64" then wine_fn_append_rule ALL_MAKEFILE_DEPENDS "all: fonts server $with_wine64/loader/wine $with_wine64/loader/wine-preloader diff --git a/configure.ac b/configure.ac index eb166ee..3f06551 100644 --- a/configure.ac +++ b/configure.ac @@ -2939,6 +2939,17 @@ AC_CONFIG_FILES([Make.tmp:Make.vars.in:Makefile.in]) dnl Some final makefile rules +if test "x$enable_maintainer_mode" = xyes +then + WINE_APPEND_RULE([ALL_MAKEFILE_DEPENDS], +[\$(srcdir)/configure: configure.ac aclocal.m4 + cd \$(srcdir) && autoconf --warnings=all +\$(srcdir)/include/config.h.in: include/stamp-h.in +\$(srcdir)/include/stamp-h.in: configure.ac aclocal.m4 + cd \$(srcdir) && autoheader --warnings=all + @echo timestamp > \$[@]]) +fi + if test -n "$with_wine64" then WINE_APPEND_RULE([ALL_MAKEFILE_DEPENDS],

1 0

Hwang YunSong : appwiz.cpl: Update Korean resource.
by Alexandre Julliard Jan. 3, 2011

Jan. 3, 2011

Module: wine Branch: master Commit: 99d9e2bcd38f8d3158c65797f2b1924aca1ff2fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=99d9e2bcd38f8d3158c65797f… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Sat Jan 1 15:40:01 2011 +0900 appwiz.cpl: Update Korean resource. --- dlls/appwiz.cpl/Ko.rc | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/appwiz.cpl/Ko.rc b/dlls/appwiz.cpl/Ko.rc index 711d7a3..e4b940b 100644 --- a/dlls/appwiz.cpl/Ko.rc +++ b/dlls/appwiz.cpl/Ko.rc @@ -47,6 +47,7 @@ STRINGTABLE { IDS_DOWNLOADING "다운로드중..." IDS_INSTALLING "설치하는 중..." + IDS_INVALID_SHA "다운로드한 파일의 체크섬에 문제가 있습니다..망가진 파일의 설치를 취소하는 중입니다." } IDD_MAIN DIALOG 0, 0, 320, 220

1 0

Hwang YunSong : oleview: Update Korean resource.
by Alexandre Julliard Jan. 3, 2011

Jan. 3, 2011

Module: wine Branch: master Commit: a23e520b19d3be00ae087598146d830698adbde6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a23e520b19d3be00ae0875981… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Sat Jan 1 15:41:35 2011 +0900 oleview: Update Korean resource. --- programs/oleview/Ko.rc | 194 ++++++++++++++++++++++++------------------------ 1 files changed, 98 insertions(+), 96 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a23e520b19d3be00ae087…

1 0

Alexandre Julliard : makefiles: Automatically update the EXTRASUBDIRS variable in make_makefiles.
by Alexandre Julliard Jan. 3, 2011

Jan. 3, 2011

Module: wine Branch: master Commit: 80d12c358e02760bc20d15a302aba2299cc9d6df URL: http://source.winehq.org/git/wine.git/?a=commit;h=80d12c358e02760bc20d15a30… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Jan 1 17:49:38 2011 +0100 makefiles: Automatically update the EXTRASUBDIRS variable in make_makefiles. --- Makefile.in | 5 ++- include/Makefile.in | 6 ++- tools/make_makefiles | 113 +++++++++++++++++++++++++------------------------- 3 files changed, 65 insertions(+), 59 deletions(-) diff --git a/Makefile.in b/Makefile.in index b1e790e..b1c0804 100644 --- a/Makefile.in +++ b/Makefile.in @@ -19,7 +19,10 @@ # xmlpages: compile xml source for the Wine API Guide # Sub-directories that don't have a makefile -EXTRASUBDIRS = dlls libs programs +EXTRASUBDIRS = \ + dlls \ + libs \ + programs # Destination directories for make install INSTALLDIRS = $(DESTDIR)$(bindir) diff --git a/include/Makefile.in b/include/Makefile.in index d31bd74..0257b9b 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -554,7 +554,11 @@ SRCDIR_INCLUDES = \ xmldsodid.h \ zmouse.h -EXTRASUBDIRS = ddk msvcrt msvcrt/sys wine +EXTRASUBDIRS = \ + ddk \ + msvcrt \ + msvcrt/sys \ + wine INSTALLDIRS = \ $(DESTDIR)$(includedir)/windows/ddk \ diff --git a/tools/make_makefiles b/tools/make_makefiles index 673c4cf..bee12f8 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -119,6 +119,8 @@ my @ignore_srcs = ( [ 'IDL_I_SRCS', '\.idl', '_i.c' ], [ 'IDL_P_SRCS', '\.idl', '_p.c' ], [ 'IDL_S_SRCS', '\.idl', '_s.c' ], + [ 'PUBLIC_IDL_H_SRCS', '\.idl', '.h' ], + [ 'PRIVATE_IDL_H_SRCS', '\.idl', '.h' ], ); my %exported_wine_headers = ( @@ -168,7 +170,7 @@ my %ignored_source_files = ( "programs/winetest/dist.rc" => 1, ); -my (@all_files, @makefiles, %makefiles); +my (@makefiles, %makefiles); sub dirname($) { @@ -285,7 +287,7 @@ sub replace_makefile_variable($$) return update_file("$file.in"); } -# parse the specified makefile to identify the rules file +# parse the specified makefile and load the variables sub parse_makefile($) { my $file = shift; @@ -328,28 +330,63 @@ sub parse_makefile($) } # assign source files to their respective makefile -sub assign_sources_to_makefiles() +sub assign_sources_to_makefiles(@) { - foreach my $file (@all_files) + my %subdirs; + + foreach my $file (@_) { next if defined $ignored_source_files{$file}; my $dir = dirname( $file ); + my $subdir = $dir; while ($dir && !defined $makefiles{"$dir/Makefile"}) { $dir = dirname( $dir ); } + $subdir =~ s/^$dir\/?//; + $subdirs{"$dir/ $subdir"} = 1 if $subdir; next unless $dir; die "no makefile found for $file\n" unless defined $makefiles{"$dir/Makefile"}; my $make = $makefiles{"$dir/Makefile"}; - my $basename = substr( $file, length($dir) + 1 ); - - if ($basename =~ /\.c$/) { push @{${$make}{"=C_SRCS"}}, $basename; } - elsif ($basename =~ /\.l$/) { push @{${$make}{"=LEX_SRCS"}}, $basename; } - elsif ($basename =~ /\.y$/) { push @{${$make}{"=BISON_SRCS"}}, $basename; } - elsif ($basename =~ /\.rc$/) { push @{${$make}{"=RC_SRCS"}}, $basename; } - elsif ($basename =~ /\.mc$/) { push @{${$make}{"=MC_SRCS"}}, $basename; } - elsif ($basename =~ /\.svg$/) { push @{${$make}{"=SVG_SRCS"}}, $basename; } + my $name = substr( $file, length($dir) + 1 ); + + if ($dir eq "include") + { + next if ($name =~ /\.in$/); + if ($name =~ /^wine\// && !$exported_wine_headers{$name}) + { + if ($private_idl_headers{$name}) { push @{${$make}{"=PRIVATE_IDL_H_SRCS"}}, $name; } + next; + } + if ($name =~ /stdole2\.idl$/) { push @{${$make}{"=IDL_TLB_SRCS"}}, $name; } + elsif ($private_idl_headers{$name}) { push @{${$make}{"=SRCDIR_INCLUDES"}}, $name; } + elsif ($name =~ /\.h$/) { push @{${$make}{"=SRCDIR_INCLUDES"}}, $name; } + elsif ($name =~ /\.rh$/) { push @{${$make}{"=SRCDIR_INCLUDES"}}, $name; } + elsif ($name =~ /\.inl$/) { push @{${$make}{"=SRCDIR_INCLUDES"}}, $name; } + elsif ($name =~ /\.idl$/) { push @{${$make}{"=PUBLIC_IDL_H_SRCS"}}, $name; } + else { die "unknown file $name in include dir"; } + } + else + { + if ($name =~ /\.c$/) { push @{${$make}{"=C_SRCS"}}, $name; } + elsif ($name =~ /\.l$/) { push @{${$make}{"=LEX_SRCS"}}, $name; } + elsif ($name =~ /\.y$/) { push @{${$make}{"=BISON_SRCS"}}, $name; } + elsif ($name =~ /\.rc$/) { push @{${$make}{"=RC_SRCS"}}, $name; } + elsif ($name =~ /\.mc$/) { push @{${$make}{"=MC_SRCS"}}, $name; } + elsif ($name =~ /\.svg$/) { push @{${$make}{"=SVG_SRCS"}}, $name; } + } + } + foreach my $key (keys %subdirs) + { + my ($dir, $subdir) = split " ", $key; + if ($dir eq "/") { $dir = ""; } + push @{${$makefiles{"${dir}Makefile"}}{"=EXTRASUBDIRS"}}, $subdir; } + + # add extra variables to include source list + my $make = $makefiles{"include/Makefile"}; + unshift @{${$make}{"=SRCDIR_INCLUDES"}}, "\$(PUBLIC_IDL_H_SRCS)"; + unshift @{${$make}{"=SRCDIR_INCLUDES"}}, "\$(IDL_TLB_SRCS)"; } ################################################################ @@ -439,14 +476,17 @@ sub update_makefiles(@) foreach my $file (sort @_) { - my %make = %{$makefiles{$file}}; - replace_makefile_variable( $file, "LEX_SRCS" ); replace_makefile_variable( $file, "BISON_SRCS" ); replace_makefile_variable( $file, "MC_SRCS" ); replace_makefile_variable( $file, "SVG_SRCS" ); replace_makefile_variable( $file, "C_SRCS" ); replace_makefile_variable( $file, "RC_SRCS" ); + replace_makefile_variable( $file, "PRIVATE_IDL_H_SRCS" ); + replace_makefile_variable( $file, "PUBLIC_IDL_H_SRCS" ); + replace_makefile_variable( $file, "IDL_TLB_SRCS" ); + replace_makefile_variable( $file, "SRCDIR_INCLUDES" ); + replace_makefile_variable( $file, "EXTRASUBDIRS" ); } push @lines, "dnl End of auto-generated output commands\n"; @@ -494,46 +534,6 @@ sub update_ignores(@) ################################################################ -# update include/Makefile.in - -sub update_includes() -{ - my (@h_srcs, @private_idl_srcs, @public_idl_srcs, @tlb_srcs, %subdirs); - my @includes = map { (my $ret = $_) =~ s/^include\///; $ret; } grep /^include\//, @all_files; - foreach my $incl (@includes) - { - if ($incl =~ /(.*)\//) { $subdirs{$1} = 1; } - next if ($incl =~ /\.in$/); - if ($incl =~ /^wine\// && !$exported_wine_headers{$incl}) - { - if ($private_idl_headers{$incl}) { push @private_idl_srcs, $incl; } - next; - } - if ($incl =~ /stdole2\.idl$/) { push @tlb_srcs, $incl; } - elsif ($private_idl_headers{$incl}) { push @h_srcs, $incl; } - elsif ($incl =~ /\.h$/) { push @h_srcs, $incl; } - elsif ($incl =~ /\.rh$/) { push @h_srcs, $incl; } - elsif ($incl =~ /\.inl$/) { push @h_srcs, $incl; } - elsif ($incl =~ /\.idl$/) { push @public_idl_srcs, $incl; } - else { die "unknown file $incl in include dir"; } - } - replace_in_file( "include/Makefile.in", '^PRIVATE_IDL_H_SRCS\s*=', '^INSTALLDIRS', - "PRIVATE_IDL_H_SRCS = \\\n\t", - join( " \\\n\t", sort @private_idl_srcs ), - "\n\nPUBLIC_IDL_H_SRCS = \\\n\t", - join( " \\\n\t", sort @public_idl_srcs ), - "\n\nIDL_TLB_SRCS = \\\n\t", - join( " \\\n\t", sort @tlb_srcs ), - "\n\nSRCDIR_INCLUDES = \\\n\t\$(IDL_TLB_SRCS) \\\n\t\$(PUBLIC_IDL_H_SRCS) \\\n\t", - join( " \\\n\t", sort @h_srcs ), - "\n\nEXTRASUBDIRS = ", - join( " ", sort keys %subdirs ), - "\n\nINSTALLDIRS = \\\n" ); - return map { s/(.*)\.idl$/include\/$1.h/; $_; } @public_idl_srcs, @private_idl_srcs; -} - - -################################################################ # update the main .gitignore sub update_gitignore(@) @@ -565,7 +565,7 @@ sub update_gitignore(@) die "needs to be run from a git checkout" unless -d ".git"; -(a)all_files = split /\0/, `git ls-files -c -z`; +my @all_files = split /\0/, `git ls-files -c -z`; @makefiles = map { my $ret = $_; $ret =~ s/\.in$//; $ret; } grep /Makefile.in$/, @all_files; foreach my $file (sort values %makerules, @makefiles) @@ -574,8 +574,7 @@ foreach my $file (sort values %makerules, @makefiles) $makefiles{$file} = \%make; } -assign_sources_to_makefiles(); +assign_sources_to_makefiles( @all_files ); update_makefiles( @makefiles ); -push @ignores, update_includes(); push @ignores, update_ignores( @makefiles ); update_gitignore( @ignores );

1 0

Alexandre Julliard : makefiles: Automatically add missing source variables in make_makefiles.
by Alexandre Julliard Jan. 3, 2011

Jan. 3, 2011

Module: wine Branch: master Commit: 59ee6d83abecf1b73445facf20ca0017b8b57533 URL: http://source.winehq.org/git/wine.git/?a=commit;h=59ee6d83abecf1b73445facf2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Jan 1 17:46:56 2011 +0100 makefiles: Automatically add missing source variables in make_makefiles. --- dlls/wineps.drv/Makefile.in | 2 +- programs/iexplore/Makefile.in | 2 ++ tools/make_makefiles | 8 +++++++- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/wineps.drv/Makefile.in b/dlls/wineps.drv/Makefile.in index 71d03de..e16c7c0 100644 --- a/dlls/wineps.drv/Makefile.in +++ b/dlls/wineps.drv/Makefile.in @@ -63,7 +63,7 @@ C_SRCS = \ type1afm.c \ type42.c -RC_SRCS= \ +RC_SRCS = \ wps_Bg.rc \ wps_Cs.rc \ wps_Da.rc \ diff --git a/programs/iexplore/Makefile.in b/programs/iexplore/Makefile.in index 921afac..547f8f0 100644 --- a/programs/iexplore/Makefile.in +++ b/programs/iexplore/Makefile.in @@ -8,4 +8,6 @@ C_SRCS = \ RC_SRCS = iexplore.rc +SVG_SRCS = iexplore.svg + @MAKE_PROG_RULES@ diff --git a/tools/make_makefiles b/tools/make_makefiles index 5f6ba96..673c4cf 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -241,6 +241,7 @@ sub replace_makefile_variable($$) { my ($file, $var) = @_; my $make = $makefiles{$file}; + my $replaced = 0; return unless defined ${$make}{"=$var"}; @@ -252,7 +253,7 @@ sub replace_makefile_variable($$) open OLD_FILE, "$file.in" or die "cannot open $file.in"; while (<OLD_FILE>) { - if (/^\s*($var\s+)=/) + if (/^\s*($var\s*)=/) { # try to preserve formatting my $prefix = $1; @@ -270,8 +271,13 @@ sub replace_makefile_variable($$) { print NEW_FILE "$prefix= @values\n"; } + $replaced = 1; next; } + if (/^\@MAKE/ && !$replaced) + { + print NEW_FILE "$var = \\\n\t" . join(" \\\n\t", sort @values) . "\n"; + } print NEW_FILE $_; } close OLD_FILE;

1 0

Gerald Pfeifer : include: Consolidate duplicate declarations of WNetGetLastErrorA, WNetGetLastErrorW and definition of WNetGetLastError.
by Alexandre Julliard Jan. 3, 2011

Jan. 3, 2011

Module: wine Branch: master Commit: f8ee2f620cb39c0b8d7e69d0a5c5b4f18a63678e URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8ee2f620cb39c0b8d7e69d0a… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat Jan 1 14:31:56 2011 +0100 include: Consolidate duplicate declarations of WNetGetLastErrorA, WNetGetLastErrorW and definition of WNetGetLastError. --- include/winnetwk.h | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/include/winnetwk.h b/include/winnetwk.h index b69c0eb..b5c2d93 100644 --- a/include/winnetwk.h +++ b/include/winnetwk.h @@ -312,10 +312,6 @@ DWORD WINAPI WNetGetNetworkInformationW(LPCWSTR,LPNETINFOSTRUCT); * Status codes */ -DWORD WINAPI WNetGetLastErrorA(LPDWORD,LPSTR,DWORD,LPSTR,DWORD); -DWORD WINAPI WNetGetLastErrorW(LPDWORD,LPWSTR,DWORD,LPWSTR,DWORD); -#define WNetGetLastError WINELIB_NAME_AW(WNetGetLastError) - #define WN_SUCCESS NO_ERROR #define WN_NO_ERROR NO_ERROR #define WN_NOT_SUPPORTED ERROR_NOT_SUPPORTED

1 0

Alexandre Julliard : Update copyright info for 2011.
by Alexandre Julliard Jan. 3, 2011

Jan. 3, 2011

Module: wine Branch: master Commit: 8e2becf394f2fff9a67138419a27cbec8874c81c URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e2becf394f2fff9a67138419… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Jan 1 11:57:08 2011 +0100 Update copyright info for 2011. --- LICENSE | 2 +- include/wine/wine_common_ver.rc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/LICENSE b/LICENSE index c9549e3..bcd8991 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 1993-2010 the Wine project authors (see the file AUTHORS +Copyright (c) 1993-2011 the Wine project authors (see the file AUTHORS for a complete list) Wine is free software; you can redistribute it and/or modify it under diff --git a/include/wine/wine_common_ver.rc b/include/wine/wine_common_ver.rc index 1729f97..9cd607f 100644 --- a/include/wine/wine_common_ver.rc +++ b/include/wine/wine_common_ver.rc @@ -108,7 +108,7 @@ FILESUBTYPE WINE_FILESUBTYPE VALUE "FileDescription", WINE_FILEDESCRIPTION_STR VALUE "FileVersion", WINE_FILEVERSION_STR VALUE "InternalName", WINE_FILENAME - VALUE "LegalCopyright", "Copyright (c) 1993-2010 the Wine project authors (see the file AUTHORS for a complete list)" + VALUE "LegalCopyright", "Copyright (c) 1993-2011 the Wine project authors (see the file AUTHORS for a complete list)" VALUE "OriginalFilename", WINE_FILENAME_STR VALUE "ProductName", WINE_PRODUCTNAME_STR VALUE "ProductVersion", WINE_PRODUCTVERSION_STR

1 0

Alexandre Julliard : ping: Add some missing includes.
by Alexandre Julliard Jan. 3, 2011

Jan. 3, 2011

Module: wine Branch: master Commit: fcc01c4bdb6932db8b8e08a8d3db6ec3499e9259 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fcc01c4bdb6932db8b8e08a8d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 31 19:46:13 2010 +0100 ping: Add some missing includes. --- programs/ping/ping_main.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/programs/ping/ping_main.c b/programs/ping/ping_main.c index 037fa4d..997d953 100644 --- a/programs/ping/ping_main.c +++ b/programs/ping/ping_main.c @@ -17,8 +17,15 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <unistd.h> +#include "config.h" +#include "wine/port.h" + #include <stdio.h> +#include <stdlib.h> +#ifdef HAVE_UNISTD_H +#include <unistd.h> +#endif + #include <windows.h> #include "wine/debug.h"

1 0