September 2008 - Wine-commits

Juan Lang : include: Add definition of CRYPTUI_DISABLE_ISSUERSTATEMENT.
by Alexandre Julliard 30 Sep '08

30 Sep '08

Module: wine Branch: master Commit: a64b7b0c126ef80b0c487db3906388c6cc632ff6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a64b7b0c126ef80b0c487db39… Author: Juan Lang <juan.lang(a)gmail.com> Date: Sat Sep 27 11:26:29 2008 -0700 include: Add definition of CRYPTUI_DISABLE_ISSUERSTATEMENT. --- include/cryptuiapi.h | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/include/cryptuiapi.h b/include/cryptuiapi.h index f2efe8f..2670b78 100644 --- a/include/cryptuiapi.h +++ b/include/cryptuiapi.h @@ -88,6 +88,7 @@ typedef struct tagCRYPTUI_INITDIALOG_STRUCT #define CRYPTUI_ENABLE_REVOCATION_CHECK_CHAIN 0x00008000 #define CRYPTUI_ENABLE_REVOCATION_CHECK_CHAIN_EXCLUDE_ROOT CRYPTUI_ENABLE_REVOCATION_CHECKING #define CRYPTUI_DISABLE_HTMLLINK 0x00010000 +#define CRYPTUI_DISABLE_ISSUERSTATEMENT 0x00020000 typedef struct tagCRYPTUI_VIEWCERTIFICATE_STRUCTA {

1 0

Rob Shearman : msvcmaker: Generate .h files from . idl files specified in IDL_H_SRCS makefile rules.
by Alexandre Julliard 30 Sep '08

30 Sep '08

Module: wine Branch: master Commit: 0b334e04df76e468d2bf99dfb7d672666c7657cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b334e04df76e468d2bf99dfb… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Thu Sep 25 16:44:07 2008 +0100 msvcmaker: Generate .h files from .idl files specified in IDL_H_SRCS makefile rules. --- tools/winapi/msvcmaker | 40 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 40 insertions(+), 0 deletions(-) diff --git a/tools/winapi/msvcmaker b/tools/winapi/msvcmaker index cc55837..120540f 100755 --- a/tools/winapi/msvcmaker +++ b/tools/winapi/msvcmaker @@ -238,6 +238,11 @@ MAKEFILE_IN: foreach my $makefile_in_file (@makefile_in_files) { $resource_files = [sort(@{$vars{RC_SRCS}})]; } + my $idl_h_files = []; + if(exists($vars{IDL_H_SRCS})) { + $idl_h_files = [sort(@{$vars{IDL_H_SRCS}})]; + } + my $project = $module; $project =~ s/\.(?:dll|exe|lib)$//; $project =~ y/./_/; @@ -271,6 +276,7 @@ MAKEFILE_IN: foreach my $makefile_in_file (@makefile_in_files) { ($source_files, my $local_source_files) = filter_files($source_files, "$dir2/"); ($header_files, my $local_header_files) = filter_files($header_files, "$dir2/"); ($resource_files, my $local_resource_files) = filter_files($resource_files, "$dir2/"); + ($idl_h_files, my $local_idl_h_files) = filter_files($idl_h_files, "$dir2/"); $modules{$module}{wine} = 1; $modules{$module}{winetest} = 0; @@ -282,6 +288,7 @@ MAKEFILE_IN: foreach my $makefile_in_file (@makefile_in_files) { $modules{$module}{header_files} = $local_header_files; $modules{$module}{resource_files} = $local_resource_files; $modules{$module}{imports} = []; + $modules{$module}{idl_h_files} = $local_idl_h_files; } } @@ -295,6 +302,7 @@ MAKEFILE_IN: foreach my $makefile_in_file (@makefile_in_files) { $modules{$module}{header_files} = $header_files; $modules{$module}{resource_files} = $resource_files; $modules{$module}{imports} = [@imports]; + $modules{$module}{idl_h_files} = $idl_h_files; } $wine_test_dsp_files{"wineruntests.dsp"}{files} = ["runtests.c"]; @@ -322,6 +330,7 @@ foreach my $dsp_file (keys(%wine_test_dsp_files)) { my $source_files = []; my $header_files = []; my $resource_files = []; + my $idl_h_files = []; my @tests = (); @@ -368,6 +377,7 @@ foreach my $dsp_file (keys(%wine_test_dsp_files)) { $modules{$module}{header_files} = $header_files; $modules{$module}{resource_files} = $resource_files; $modules{$module}{imports} = [@imports]; + $modules{$module}{idl_h_files} = []; $modules{$module}{tests} = [@tests]; } @@ -433,6 +443,7 @@ sub _generate_dsp($$) { my @source_files = @{$modules{$module}{source_files}}; my @header_files = @{$modules{$module}{header_files}}; my @resource_files = @{$modules{$module}{resource_files}}; + my @idl_h_files = @{$modules{$module}{idl_h_files}}; if ($project !~ /^wine(?:build|runtests|test)?$/ && $project !~ /^(?:gdi32)_.+?$/ && @@ -850,6 +861,35 @@ sub _generate_dsp($$) { print OUT "# End Source File\r\n"; } + + foreach my $idl_h_file (@idl_h_files) { + $idl_h_file =~ s%/%\\%g; + if($idl_h_file !~ /^\./) { + $idl_h_file = ".\\$idl_h_file"; + } + + print OUT "# Begin Source File\r\n"; + print OUT "\r\n"; + + print OUT "SOURCE=$idl_h_file\r\n"; + + my $basename = $idl_h_file; + $basename =~ s/\.idl$//; + + print OUT "# PROP Ignore_Default_Tool 1\r\n"; + print OUT "# Begin Custom Build\r\n"; + print OUT "InputPath=$idl_h_file\r\n"; + print OUT "\r\n"; + print OUT "BuildCmds= \\\r\n"; + print OUT "\tmidl /nologo /I $wine_include_dir /client none /server none /notlb $idl_h_file /h $basename.h\r\n"; + print OUT "\r\n"; + print OUT "\"$basename.h\" : \$(SOURCE) \"\$(INTDIR)\" \"\$(OUTDIR)\"\r\n"; + print OUT " \$(BuildCmds)\r\n"; + print OUT "# End Custom Build\r\n"; + + print OUT "# End Source File\r\n"; + } + print OUT "# End Group\r\n"; print OUT "# Begin Group \"Header Files\"\r\n";

1 0

Rob Shearman : msvcmaker: Generate include project and make every wine module depend on it.
by Alexandre Julliard 30 Sep '08

30 Sep '08

Module: wine Branch: master Commit: f32ec6430bb6fd30c0362660319e76dc0278878f URL: http://source.winehq.org/git/wine.git/?a=commit;h=f32ec6430bb6fd30c03626603… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Thu Sep 25 16:44:13 2008 +0100 msvcmaker: Generate include project and make every wine module depend on it. The include project generates .h files from .idl files so that they can be used when compiling the modules. --- tools/winapi/msvcmaker | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/tools/winapi/msvcmaker b/tools/winapi/msvcmaker index 120540f..7309f1e 100755 --- a/tools/winapi/msvcmaker +++ b/tools/winapi/msvcmaker @@ -158,6 +158,8 @@ MAKEFILE_IN: foreach my $makefile_in_file (@makefile_in_files) { if($module eq "none") { if($makefile_in_file eq "tools/winebuild/Makefile.in") { $module = "winebuild.exe"; + } elsif ($makefile_in_file eq "include/Makefile.in") { + $module = "include.lib"; } else { next MAKEFILE_IN; } @@ -1004,7 +1006,7 @@ sub _generate_wine_dsw($) { } elsif($project =~ /^(?:gdi32)_.+?$/) { @dependencies = (); } else { - @dependencies = ("wine", "winebuild"); + @dependencies = ("wine", "include", "winebuild"); } if($project =~ /^gdi32$/) {

1 0

Rob Shearman : msvcmaker: Update the HAVE_* defines for headers in the generated config.h file.
by Alexandre Julliard 30 Sep '08

30 Sep '08

Module: wine Branch: master Commit: efe81dd8eddab7de673a912040f6df58da8a72cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=efe81dd8eddab7de673a91204… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Thu Sep 25 16:43:36 2008 +0100 msvcmaker: Update the HAVE_* defines for headers in the generated config.h file. Update list of headers present in the MSVC build environment. fcntl.h isn't detected by configure and so isn't needed. --- tools/winapi/msvcmaker | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/winapi/msvcmaker b/tools/winapi/msvcmaker index 7a74829..fdf744a 100755 --- a/tools/winapi/msvcmaker +++ b/tools/winapi/msvcmaker @@ -1126,7 +1126,7 @@ sub _generate_config_h($) { print OUT "#define __WINE_CONFIG_H\n"; print OUT "\n"; - my @headers = qw(direct.h fcntl.h io.h string.h process.h); + my @headers = qw(direct.h float.h memory.h io.h stdlib.h string.h process.h sys/stat.h sys/types.h); foreach my $header (@headers) { $header =~ y/\.\//__/; push @defines, "HAVE_\U$header\E 1";

1 0

Rob Shearman : msvcmaker: Remove the defining of __ASM_SHORT and __ASM_STRING in the generated config .h file.
by Alexandre Julliard 30 Sep '08

30 Sep '08

Module: wine Branch: master Commit: 1ab076626d18d63fe293ae45ea3f96fa894c7454 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ab076626d18d63fe293ae45e… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Thu Sep 25 16:43:42 2008 +0100 msvcmaker: Remove the defining of __ASM_SHORT and __ASM_STRING in the generated config.h file. These defines aren't needed. Move the X_DISPLAY_MISSING and __ASM_* defines to after the PACKAGE_* defines to match config.h.in. --- tools/winapi/msvcmaker | 30 +++++++++++------------------- 1 files changed, 11 insertions(+), 19 deletions(-) diff --git a/tools/winapi/msvcmaker b/tools/winapi/msvcmaker index fdf744a..2681117 100755 --- a/tools/winapi/msvcmaker +++ b/tools/winapi/msvcmaker @@ -1157,25 +1157,6 @@ sub _generate_config_h($) { print OUT "\n"; } - print OUT "#define X_DISPLAY_MISSING 1\n"; - print OUT "\n"; - - print OUT "/* Define to a macro to generate an assembly function directive */\n"; - print OUT "#define __ASM_FUNC(name) \"\"\n"; - print OUT "\n"; - - print OUT "/* Define to a macro to generate an assembly name from a C symbol */\n"; - print OUT "#define __ASM_NAME(name) name\n"; - print OUT "\n"; - - print OUT "/* Define to the assembler keyword used to specify a word value */\n"; - print OUT "#define __ASM_SHORT \".short\"\n"; - print OUT "\n"; - - print OUT "/* Define to the assembler keyword used to specify an ASCII string */\n"; - print OUT "#define __ASM_STRING \".string\"\n"; - print OUT "\n"; - print OUT "/* Define to the address where bug reports for this package should be sent. */\n"; print OUT "#define PACKAGE_BUGREPORT \"\"\n"; print OUT "\n"; @@ -1196,5 +1177,16 @@ sub _generate_config_h($) { print OUT "#define PACKAGE_VERSION \"YYYYMMDD\"\n"; print OUT "\n"; + print OUT "#define X_DISPLAY_MISSING 1\n"; + print OUT "\n"; + + print OUT "/* Define to a macro to generate an assembly function directive */\n"; + print OUT "#define __ASM_FUNC(name) \"\"\n"; + print OUT "\n"; + + print OUT "/* Define to a macro to generate an assembly name from a C symbol */\n"; + print OUT "#define __ASM_NAME(name) name\n"; + print OUT "\n"; + close(OUT); }

1 0

Rob Shearman : msvcmaker: Update the function list for which HAVE_* defines are written into config. h.
by Alexandre Julliard 30 Sep '08

30 Sep '08

Module: wine Branch: master Commit: e713f4bf4f96b1315bcf5c0de82fe6fec35e05fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=e713f4bf4f96b1315bcf5c0de… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Thu Sep 25 16:43:49 2008 +0100 msvcmaker: Update the function list for which HAVE_* defines are written into config.h. Remove all functions for which the HAVE_ define is not used anywhere. Add _strdup, _strtoi64 _strtoui64, chsize, strdup and vsnprintf which are all present in MSVC headers. --- tools/winapi/msvcmaker | 10 +++------- 1 files changed, 3 insertions(+), 7 deletions(-) diff --git a/tools/winapi/msvcmaker b/tools/winapi/msvcmaker index 2681117..afc2281 100755 --- a/tools/winapi/msvcmaker +++ b/tools/winapi/msvcmaker @@ -1133,13 +1133,9 @@ sub _generate_config_h($) { } my @functions = qw( - _alldiv _allmul _allrem _aulldiv _aullrem - _access _chdir _close _lseek _mkdir _open _pclose _popen _read _rmdir _write _stat - _snprintf _spawnvp _stricmp _strnicmp _vsnprintf _wcsicmp - ecvt fcvt gcvt - memmove spawnvp - strerror - wcslen + _pclose _popen _snprintf _spawnvp _stricmp _strnicmp _strdup + _strtoi64 _strtoui64 _vsnprintf + chsize memmove strdup spawnvp strerror vsnprintf ); foreach my $function (@functions) { push @defines, "HAVE_\U$function\E 1";

1 0

Rob Shearman : msvcmaker: Add support for building wine.lib.
by Alexandre Julliard 30 Sep '08

30 Sep '08

Module: wine Branch: master Commit: 5376d37f55881e34d7a49f565e0f5d0ca37afe4e URL: http://source.winehq.org/git/wine.git/?a=commit;h=5376d37f55881e34d7a49f565… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Thu Sep 25 16:43:55 2008 +0100 msvcmaker: Add support for building wine.lib. --- tools/winapi/msvcmaker | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/tools/winapi/msvcmaker b/tools/winapi/msvcmaker index afc2281..1ab4aaf 100755 --- a/tools/winapi/msvcmaker +++ b/tools/winapi/msvcmaker @@ -215,6 +215,10 @@ MAKEFILE_IN: foreach my $makefile_in_file (@makefile_in_files) { close(IN); + if (!$module && $makefile_in_file eq "libs/wine/Makefile.in") { + $module = "wine.lib"; + } + next if !$module; my $c_srcs = []; @@ -640,6 +644,10 @@ sub _generate_dsp($$) { push @defines2, "__WINETEST_OUTPUT_DIR=\\\"$output_dir2\\\""; push @defines2, qw(__i386__ _X86_); + if ($project eq "wine") { + push @defines2, "WINE_UNICODE_API="; + } + if ($project =~ /_test$/) { push @includes, "$msvc_wine_dir\\$output_dir"; } @@ -779,6 +787,10 @@ sub _generate_dsp($$) { print OUT "SOURCE=$source_file\r\n"; + if ($project eq "wine" && $source_file eq ".\\config.c") { + print OUT "# ADD CPP /D BINDIR=\\\"\\\" /D DLLDIR=\\\"\\\" /D LIB_TO_BINDIR=\\\"\\\" /D LIB_TO_DLLDIR=\\\"\\\" /D BIN_TO_DLLDIR=\\\"\\\" /D LIB_TO_DATADIR=\\\"\\\" /D BIN_TO_DATADIR=\\\"\\\"\r\n"; + } + if($source_file =~ /^(.*?)\.spec$/) { my $basename = $1;

1 0

Rob Shearman : msvcmaker: Fix invocation of winebuild to generate compatible .def files.
by Alexandre Julliard 30 Sep '08

30 Sep '08

Module: wine Branch: master Commit: e842164cb8bc805a840a6482f3511dd334782f82 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e842164cb8bc805a840a6482f… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Thu Sep 25 16:44:01 2008 +0100 msvcmaker: Fix invocation of winebuild to generate compatible .def files. --- tools/winapi/msvcmaker | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/winapi/msvcmaker b/tools/winapi/msvcmaker index 1ab4aaf..cc55837 100755 --- a/tools/winapi/msvcmaker +++ b/tools/winapi/msvcmaker @@ -803,7 +803,7 @@ sub _generate_dsp($$) { print OUT "InputPath=$spec_file\r\n"; print OUT "\r\n"; print OUT "BuildCmds= \\\r\n"; - print OUT "\t..\\..\\tools\\winebuild\\$output_dir\\winebuild.exe -w --def -o $def_file --export $spec_file\r\n"; + print OUT "\t..\\..\\tools\\winebuild\\$output_dir\\winebuild.exe -w --def -k -o $def_file --export $spec_file\r\n"; print OUT "\r\n"; print OUT "\"$def_file\" : \$(SOURCE) \"\$(INTDIR)\" \"\$(OUTDIR)\"\r\n"; print OUT " \$(BuildCmds)\r\n";

1 0

Rob Shearman : msvcmaker: Add HAVE_* defines for some types present in the MSVC build environment.
by Alexandre Julliard 30 Sep '08

30 Sep '08

Module: wine Branch: master Commit: c71d16c3e99e79635d836877fa0f27c5222d1904 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c71d16c3e99e79635d836877f… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Thu Sep 25 16:43:29 2008 +0100 msvcmaker: Add HAVE_* defines for some types present in the MSVC build environment. --- tools/winapi/msvcmaker | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/tools/winapi/msvcmaker b/tools/winapi/msvcmaker index 05bb715..7a74829 100755 --- a/tools/winapi/msvcmaker +++ b/tools/winapi/msvcmaker @@ -1145,6 +1145,13 @@ sub _generate_config_h($) { push @defines, "HAVE_\U$function\E 1"; } + my @types = qw( + long_long off_t size_t + ); + foreach my $type (@types) { + push @defines, "HAVE_\U$type\E 1"; + } + foreach my $define (sort(@defines)) { print OUT "#define $define\n"; print OUT "\n";

1 0

Rob Shearman : msvcmaker: Factor out some common settings.
by Alexandre Julliard 30 Sep '08

30 Sep '08

Module: wine Branch: master Commit: fb4355cb5ba5823d3bc9fd686fea7ed4f207ebd8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb4355cb5ba5823d3bc9fd686… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Thu Sep 25 16:43:23 2008 +0100 msvcmaker: Factor out some common settings. Factor out writing of common compiler settings and setting of common defines. Factor out the writing of HAVE_* defines in include/config.h and sort the resulting defines before writing. --- tools/winapi/msvcmaker | 30 +++++++++++++++--------------- 1 files changed, 15 insertions(+), 15 deletions(-) diff --git a/tools/winapi/msvcmaker b/tools/winapi/msvcmaker index 36fecb4..05bb715 100755 --- a/tools/winapi/msvcmaker +++ b/tools/winapi/msvcmaker @@ -576,23 +576,24 @@ sub _generate_dsp($$) { print OUT "# PROP Ignore_Export_Lib 0\r\n" if $dll; print OUT "# PROP Target_Dir \"\"\r\n"; - my @defines; + print OUT "# ADD BASE CPP /nologo "; + my @defines = qw(WINVER=0x0600 _WIN32_WINNT=0x0600 _WIN32_IE=0x0700 WIN32); if($debug) { if($lib || $exe) { - print OUT "# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od"; - @defines = (qw(WINVER=0x0600 _WIN32_WINNT=0x0600 _WIN32_IE=0x0700 WIN32 _DEBUG _MBCS _LIB)); + push @defines, qw(_DEBUG _MBCS _LIB); } else { - print OUT "# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od"; - @defines = (qw(WINVER=0x0600 _WIN32_WINNT=0x0600 _WIN32_IE=0x0700 WIN32 _DEBUG _WINDOWS _MBCS _USRDLL), ("\U${project}\E_EXPORTS")); + print OUT "/MDd "; + push @defines, (qw(_DEBUG _WINDOWS _MBCS _USRDLL), ("\U${project}\E_EXPORTS")); } + print OUT "/W3 /Gm /GX /Zi /Od"; } else { if($lib || $exe) { - print OUT "# ADD BASE CPP /nologo /W3 /GX /O2"; - @defines = (qw(WINVER=0x0600 _WIN32_WINNT=0x0600 _WIN32_IE=0x0700 WIN32 NDEBUG _MBCS _LIB)); + push @defines, qw(NDEBUG _MBCS _LIB); } else { - print OUT "# ADD BASE CPP /nologo /MD /W3 /GX /O2"; - @defines = (qw(WINVER=0x0600 _WIN32_WINNT=0x0600 _WIN32_IE=0x0700 WIN32 NDEBUG _WINDOWS _MBCS _USRDLL), ("\U${project}\E_EXPORTS")); + print OUT "/MD "; + push @defines, (qw(NDEBUG _WINDOWS _MBCS _USRDLL), ("\U${project}\E_EXPORTS")); } + print OUT "/W3 /GX /O2"; } foreach my $define (@defines) { @@ -1120,6 +1121,7 @@ if ($options->wine) { sub _generate_config_h($) { local *OUT = shift; + my @defines; print OUT "#define __WINE_CONFIG_H\n"; print OUT "\n"; @@ -1127,8 +1129,7 @@ sub _generate_config_h($) { my @headers = qw(direct.h fcntl.h io.h string.h process.h); foreach my $header (@headers) { $header =~ y/\.\//__/; - print OUT "#define HAVE_\U$header\E\n"; - print OUT "\n"; + push @defines, "HAVE_\U$header\E 1"; } my @functions = qw( @@ -1141,12 +1142,11 @@ sub _generate_config_h($) { wcslen ); foreach my $function (@functions) { - print OUT "#define HAVE_\U$function\E 1\n"; - print OUT "\n"; + push @defines, "HAVE_\U$function\E 1"; } - if(0) { - print OUT "#define NEED_STDCALL_DECORATION 1\n"; + foreach my $define (sort(@defines)) { + print OUT "#define $define\n"; print OUT "\n"; }

1 0