November 2013 - Wine-Commits

Rico Schüller : opengl32: Fix some style issues.
by Alexandre Julliard Nov. 5, 2013

Nov. 5, 2013

Module: wine Branch: master Commit: 465673a3d6906d32119e546f568d07e47b6ff4b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=465673a3d6906d32119e546f5… Author: Rico Schüller <kgbricola(a)web.de> Date: Fri Nov 1 18:18:14 2013 +0100 opengl32: Fix some style issues. --- dlls/opengl32/make_opengl | 108 +++++++++++++++++++++----------------------- 1 files changed, 52 insertions(+), 56 deletions(-) diff --git a/dlls/opengl32/make_opengl b/dlls/opengl32/make_opengl index 9817f8c..18d5107 100755 --- a/dlls/opengl32/make_opengl +++ b/dlls/opengl32/make_opengl @@ -210,10 +210,9 @@ sub ConvertType($) ); foreach my $org (reverse sort keys %hash) { - if ($type =~ /$org/) { - my ($before, $after) = ($type =~ /^(.*)$org(.*)$/); - return "$before$hash{$org}$after"; - } + if ($type =~ /^(.*)$org(.*)$/) { + return "$1$hash{$org}$2"; + } } return $type; } @@ -229,10 +228,9 @@ sub ConvertVarName($) "far" => "farParam" ); foreach my $org (keys %hash) { - if ($type =~ /$org/) { - my ($before, $after) = ($type =~ /^(.*)$org(.*)$/); - return "$before$hash{$org}$after"; - } + if ($type =~ /^(.*)$org(.*)$/) { + return "$1$hash{$org}$2"; + } } return $type; } @@ -255,22 +253,20 @@ sub GenerateThunk($$$$) # If for opengl_norm.c, generate a nice heading otherwise Patrik won't be happy :-) # Patrik says: Well I would be even happier if a (OPENGL32.@) was added as well. Done. :-) if ($comment eq 1) { - $ret = "$ret/***********************************************************************\n"; - $ret = "$ret * $name (OPENGL32.\@)\n"; - $ret = "$ret */\n"; + $ret .= "/***********************************************************************\n"; + $ret .= " * $name (OPENGL32.\@)\n"; + $ret .= " */\n"; } - $ret = $ret . ConvertType($func_ref->[0]) . " WINAPI $name( "; + $ret .= ConvertType($func_ref->[0]) . " WINAPI $name( "; for (my $i = 0; $i < @{$func_ref->[1]}; $i++) { - ## Quick debug code :-) - ## print $func_ref->[1]->[$i]->[1] . "\n"; - my $type = $func_ref->[1]->[$i]->[0]; - my $name = ConvertVarName($func_ref->[1]->[$i]->[1]); - $ret .= ConvertType($type) . " $name"; - $call_arg .= $name; - if ($type =~ /\*/) { - $trace_arg .= "%p"; + my $type = $func_ref->[1]->[$i]->[0]; + my $name = ConvertVarName($func_ref->[1]->[$i]->[1]); + $ret .= ConvertType($type) . " $name"; + $call_arg .= $name; + if ($type =~ /\*/) { + $trace_arg .= "%p"; $trace_call_arg .= $name; - } elsif (defined $debug_conv{$type}) { + } elsif (defined $debug_conv{$type}) { if ($debug_conv{$type} =~ /(.*),(.*)/) { $trace_arg .= $1; @@ -281,40 +277,40 @@ sub GenerateThunk($$$$) $trace_arg .= $debug_conv{$type}; $trace_call_arg .= $name; } - } - else { printf "Unknown type %s\n", $type; } - if ($i+1 < @{$func_ref->[1]}) { - $ret .= ", "; - $call_arg .= ", "; - $trace_call_arg .= ", "; - $trace_arg .= ", "; - } else { - $ret .= " "; - $call_arg .= " "; - $trace_call_arg .= " "; - } + } + else { printf "Unknown type %s\n", $type; } + if ($i+1 < @{$func_ref->[1]}) { + $ret .= ", "; + $call_arg .= ", "; + $trace_call_arg .= ", "; + $trace_arg .= ", "; + } else { + $ret .= " "; + $call_arg .= " "; + $trace_call_arg .= " "; + } } $ret .= 'void ' if (!@{$func_ref->[1]}); $ret .= ") {\n"; $ret .= " const struct opengl_funcs *funcs = NtCurrentTeb()->glTable;\n"; if ($func_ref->[0] ne "void" && $gen_thread_safe) { - $ret = "$ret " . ConvertType($func_ref->[0]) . " ret_value;\n"; + $ret .= " " . ConvertType($func_ref->[0]) . " ret_value;\n"; } if ($gen_traces) { - $ret = "$ret TRACE(\"($trace_arg)\\n\""; - if ($trace_arg ne "") { - $ret .= ", $trace_call_arg"; - } - $ret = "$ret);\n"; + $ret .= " TRACE(\"($trace_arg)\\n\""; + if ($trace_arg ne "") { + $ret .= ", $trace_call_arg"; + } + $ret .= ");\n"; } if ($gen_thread_safe) { - $ret .= " ENTER_GL();\n"; + $ret .= " ENTER_GL();\n"; $ret .= " "; if ($func_ref->[0] ne "void") { $ret .= "ret_value = "; } $ret .= "funcs->$prefix.p_$name( $call_arg);\n"; - $ret .= " LEAVE_GL();\n"; + $ret .= " LEAVE_GL();\n"; if ($func_ref->[0] ne "void") { $ret .= " return ret_value;\n" } @@ -326,7 +322,7 @@ sub GenerateThunk($$$$) } $ret .= "funcs->$prefix.p_$name( $call_arg);\n"; } - $ret = "$ret}\n"; + $ret .= "}\n"; # Return this string.... return $ret; @@ -341,10 +337,10 @@ sub generate_null_func($$) $ret = "static " . ConvertType($func_ref->[0]) . " null_$name( "; for (my $i = 0; $i < @{$func_ref->[1]}; $i++) { - my $type = $func_ref->[1]->[$i]->[0]; - my $name = ConvertVarName($func_ref->[1]->[$i]->[1]); - $ret .= ConvertType($type) . " $name"; - $ret .= "," if ($i+1 < @{$func_ref->[1]}); + my $type = $func_ref->[1]->[$i]->[0]; + my $name = ConvertVarName($func_ref->[1]->[$i]->[1]); + $ret .= ConvertType($type) . " $name"; + $ret .= "," if ($i+1 < @{$func_ref->[1]}); $ret .= " "; } $ret .= 'void ' if (!@{$func_ref->[1]}); @@ -368,7 +364,7 @@ sub get_func_proto($$$) $ret .= " " . sprintf($format,$name) . "("; for (my $i = 0; $i < @{$func->[1]}; $i++) { - $ret .= ConvertType($func->[1]->[$i]->[0]); + $ret .= ConvertType($func->[1]->[$i]->[0]); $ret .= "," if ($i+1 < @{$func->[1]}); } $ret .= "void" unless @{$func->[1]}; @@ -882,14 +878,14 @@ open(SPEC, ">$spec_file"); foreach (sort keys %norm_functions) { my $args=" "; for (my $i = 0; $i < @{$norm_functions{$_}->[1]}; $i++) { - my $type = $norm_functions{$_}->[1]->[$i]->[0]; - if ($type =~ /\*/) { - $args .= "ptr "; - } elsif (defined($arg_conv{$type})) { - $args .= "$@$arg_conv{$type}[0] "; - } else { - die "No conversion for GL type $type...\n"; - } + my $type = $norm_functions{$_}->[1]->[$i]->[0]; + if ($type =~ /\*/) { + $args .= "ptr "; + } elsif (defined($arg_conv{$type})) { + $args .= "$@$arg_conv{$type}[0] "; + } else { + die "No conversion for GL type $type...\n"; + } } $args = substr($args,1,-1); print SPEC "@ stdcall $_($args)\n"; @@ -1003,7 +999,7 @@ foreach (sort keys %ext_functions) { my $func_ref = $ext_functions{$_}; print EXT " { \"$_\", \"$func_ref->[2]\", $_ }"; if ($i != $count-1) { - print EXT ","; + print EXT ","; } $i++; print EXT "\n";

1 0

Rico Schüller : opengl32: Use variables for file names .
by Alexandre Julliard Nov. 5, 2013

Nov. 5, 2013

Module: wine Branch: master Commit: 3c08b95b3ba2438c6984678cb7340eef2901df39 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c08b95b3ba2438c6984678cb… Author: Rico Schüller <kgbricola(a)web.de> Date: Fri Nov 1 18:18:05 2013 +0100 opengl32: Use variables for file names. --- dlls/opengl32/make_opengl | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/opengl32/make_opengl b/dlls/opengl32/make_opengl index fedf2a6..9817f8c 100755 --- a/dlls/opengl32/make_opengl +++ b/dlls/opengl32/make_opengl @@ -65,6 +65,8 @@ use strict; my $spec_file = "opengl32.spec"; my $norm_file = "opengl_norm.c"; my $ext_file = "opengl_ext.c"; +my $wgl_driver_file = "../../include/wine/wgl_driver.h"; +my $wgl_file = "../../include/wine/wgl.h"; # Set to 0 for removing the ENTER / LEAVE GL calls my $gen_thread_safe = 0; @@ -776,7 +778,7 @@ parse_enum_file( "enumext.spec", \%enums ); # Get the current wgl_driver.h version # my $wgl_version = 0; -open HEADER, "<../../include/wine/wgl_driver.h" or die "cannot open wgl_driver.h"; +open HEADER, "<$wgl_driver_file" or die "cannot open $wgl_driver_file"; while (<HEADER>) { next unless /^#define WINE_WGL_DRIVER_VERSION (\d+)/; @@ -788,8 +790,8 @@ close HEADER; # # Generate the wgl_driver.h file # -open HEADER, ">../../include/wine/wgl_driver.h" or die "cannot create wgl_driver.h"; -print HEADER "/* Automatically generated from http://www.opengl.org/registry/api files; DO NOT EDIT! */\n\n"; +open HEADER, ">$wgl_driver_file" or die "cannot create $wgl_driver_file"; +print HEADER "/* Automatically generated from http://www.opengl.org/registry files; DO NOT EDIT! */\n\n"; print HEADER "#ifndef __WINE_WGL_DRIVER_H\n"; print HEADER "#define __WINE_WGL_DRIVER_H\n\n"; print HEADER "#ifndef WINE_GLAPI\n"; @@ -841,8 +843,8 @@ close HEADER; # # Generate the wgl.h file # -open HEADER, ">../../include/wine/wgl.h" or die "cannot create wgl.h"; -print HEADER "/* Automatically generated from http://www.opengl.org/registry/api files; DO NOT EDIT! */\n\n"; +open HEADER, ">$wgl_file" or die "cannot create $wgl_file"; +print HEADER "/* Automatically generated from http://www.opengl.org/registry files; DO NOT EDIT! */\n\n"; print HEADER "#ifndef __WINE_WGL_H\n"; print HEADER "#define __WINE_WGL_H\n\n";

1 0

Francois Gouget : d3d9/tests: Fix a test failure on Windows XP with the default VGA driver.
by Alexandre Julliard Nov. 5, 2013

Nov. 5, 2013

Module: wine Branch: master Commit: b43608721788a6b1c7564603a18cb72dbf5e843f URL: http://source.winehq.org/git/wine.git/?a=commit;h=b43608721788a6b1c7564603a… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Nov 5 19:15:19 2013 +0100 d3d9/tests: Fix a test failure on Windows XP with the default VGA driver. --- dlls/d3d9/tests/visual.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 8d6fe02..a417078 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -216,7 +216,10 @@ static IDirect3DDevice9 *init_d3d9(void) ok(hr == D3D_OK, "Failed to get adapter identifier description\n"); trace("Driver string: \"%s\"\n", identifier.Driver); trace("Description string: \"%s\"\n", identifier.Description); - ok(identifier.Description[0] != '\0', "Empty driver description\n"); + /* Only Windows XP's default VGA driver should have an empty description */ + ok(identifier.Description[0] != '\0' || + broken(strcmp(identifier.Driver, "vga.dll") == 0), + "Empty driver description\n"); trace("Device name string: \"%s\"\n", identifier.DeviceName); ok(identifier.DeviceName[0] != '\0', "Empty device name\n"); trace("Driver version %d.%d.%d.%d\n",

1 0

Andrey Zhezherun : msvcrt: Implemented _chsize_s.
by Alexandre Julliard Nov. 5, 2013

Nov. 5, 2013

Module: wine Branch: master Commit: 3bb2c11757156223be0f8a22f3b377b060b09562 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3bb2c11757156223be0f8a22f… Author: Andrey Zhezherun <zhezherun(a)yandex.ru> Date: Tue Nov 5 09:04:19 2013 +0000 msvcrt: Implemented _chsize_s. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/file.c | 27 +++++++++++++++++++-------- dlls/msvcrt/msvcrt.spec | 2 +- include/msvcrt/io.h | 1 + 7 files changed, 25 insertions(+), 13 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 646137d..eaad8fe 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -725,7 +725,7 @@ @ cdecl -arch=i386 -norelay _chkesp() msvcrt._chkesp @ cdecl _chmod(str long) msvcrt._chmod @ cdecl _chsize(long long) msvcrt._chsize -@ stub _chsize_s +@ cdecl _chsize_s(long int64) msvcrt._chsize_s @ cdecl _clearfp() msvcrt._clearfp @ cdecl _close(long) msvcrt._close @ cdecl _commit(long) msvcrt._commit diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index a704d1a..d909719 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1073,7 +1073,7 @@ @ cdecl -arch=i386 -norelay _chkesp() msvcrt._chkesp @ cdecl _chmod(str long) msvcrt._chmod @ cdecl _chsize(long long) msvcrt._chsize -@ stub _chsize_s +@ cdecl _chsize_s(long int64) msvcrt._chsize_s @ cdecl _clearfp() msvcrt._clearfp @ cdecl _close(long) msvcrt._close @ cdecl _commit(long) msvcrt._commit diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 0a0adf6..697936c 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -389,7 +389,7 @@ @ cdecl -arch=i386 -norelay _chkesp() msvcrt._chkesp @ cdecl _chmod(str long) msvcrt._chmod @ cdecl _chsize(long long) msvcrt._chsize -@ stub _chsize_s +@ cdecl _chsize_s(long int64) msvcrt._chsize_s @ cdecl _clearfp() msvcrt._clearfp @ cdecl _close(long) msvcrt._close @ cdecl _commit(long) msvcrt._commit diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 382a52e..ca2503f 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -372,7 +372,7 @@ @ cdecl -arch=i386 -norelay _chkesp() msvcrt._chkesp @ cdecl _chmod(str long) msvcrt._chmod @ cdecl _chsize(long long) msvcrt._chsize -@ stub _chsize_s +@ cdecl _chsize_s(long int64) msvcrt._chsize_s @ cdecl _clearfp() msvcrt._clearfp @ cdecl _close(long) msvcrt._close @ cdecl _commit(long) msvcrt._commit diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 26dcae1..3796482 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -1259,15 +1259,17 @@ int CDECL MSVCRT_fseek(MSVCRT_FILE* file, MSVCRT_long offset, int whence) } /********************************************************************* - * _chsize (MSVCRT.@) + * _chsize_s (MSVCRT.@) */ -int CDECL MSVCRT__chsize(int fd, MSVCRT_long size) +int CDECL MSVCRT__chsize_s(int fd, __int64 size) { - LONG cur, pos; + __int64 cur, pos; HANDLE handle; BOOL ret = FALSE; - TRACE("(fd=%d, size=%d)\n", fd, size); + TRACE("(fd=%d, size=%s)\n", fd, wine_dbgstr_longlong(size)); + + if (!MSVCRT_CHECK_PMT(size >= 0)) return MSVCRT_EINVAL; LOCK_FILES(); @@ -1275,10 +1277,10 @@ int CDECL MSVCRT__chsize(int fd, MSVCRT_long size) if (handle != INVALID_HANDLE_VALUE) { /* save the current file pointer */ - cur = MSVCRT__lseek(fd, 0, SEEK_CUR); + cur = MSVCRT__lseeki64(fd, 0, SEEK_CUR); if (cur >= 0) { - pos = MSVCRT__lseek(fd, size, SEEK_SET); + pos = MSVCRT__lseeki64(fd, size, SEEK_SET); if (pos >= 0) { ret = SetEndOfFile(handle); @@ -1286,12 +1288,21 @@ int CDECL MSVCRT__chsize(int fd, MSVCRT_long size) } /* restore the file pointer */ - MSVCRT__lseek(fd, cur, SEEK_SET); + MSVCRT__lseeki64(fd, cur, SEEK_SET); } } UNLOCK_FILES(); - return ret ? 0 : -1; + return ret ? 0 : *MSVCRT__errno(); +} + +/********************************************************************* + * _chsize (MSVCRT.@) + */ +int CDECL MSVCRT__chsize(int fd, MSVCRT_long size) +{ + /* _chsize_s returns errno on failure but _chsize should return -1 */ + return MSVCRT__chsize_s( fd, size ) == 0 ? 0 : -1; } /********************************************************************* diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 5e57aae..a87e72f 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -356,7 +356,7 @@ @ cdecl -arch=i386 -norelay _chkesp() @ cdecl _chmod(str long) MSVCRT__chmod @ cdecl _chsize(long long) MSVCRT__chsize -# stub _chsize_s(long int64) +@ cdecl _chsize_s(long int64) MSVCRT__chsize_s # stub _chvalidator(long long) # stub _chvalidator_l(ptr long long) @ cdecl _clearfp() diff --git a/include/msvcrt/io.h b/include/msvcrt/io.h index 09b615c..b227b20 100644 --- a/include/msvcrt/io.h +++ b/include/msvcrt/io.h @@ -87,6 +87,7 @@ extern "C" { int __cdecl _access(const char*,int); int __cdecl _chmod(const char*,int); int __cdecl _chsize(int,__msvcrt_ulong); +int __cdecl _chsize_s(int,__int64); int __cdecl _close(int); int __cdecl _commit(int); int __cdecl _creat(const char*,int);

1 0

Alexandre Julliard : makefiles: Automatically update source variables in the makefile based on the makedep pragmas .
by Alexandre Julliard Nov. 5, 2013

Nov. 5, 2013

Module: wine Branch: master Commit: 27534a09c65d86bcfa713395e4aa0c16748595f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=27534a09c65d86bcfa713395e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 5 19:30:20 2013 +0100 makefiles: Automatically update source variables in the makefile based on the makedep pragmas. --- tools/make_makefiles | 72 ++++++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 64 insertions(+), 8 deletions(-) diff --git a/tools/make_makefiles b/tools/make_makefiles index 489f31b..9478c46 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -245,11 +245,18 @@ sub replace_makefile_variable($$) my ($file, $var) = @_; my $make = $makefiles{$file}; my $replaced = 0; + my @values; - return unless defined ${$make}{"=$var"}; - - my @values = @{${$make}{"=$var"}}; - ${$make}{$var} = \@values; + if (defined ${$make}{"=$var"}) + { + @values = @{${$make}{"=$var"}}; + ${$make}{$var} = \@values; + } + else + { + return unless defined ${$make}{$var}; + undef ${$make}{$var}; + } open NEW_FILE, ">$file.in.new" or die "cannot create $file.in.new"; @@ -266,7 +273,11 @@ sub replace_makefile_variable($$) $_ = <OLD_FILE>; last unless $_; } - if ($multiline) + if (!@values) + { + # nothing + } + elsif ($multiline) { print NEW_FILE "$var = \\\n\t" . join(" \\\n\t", sort @values) . "\n"; } @@ -277,7 +288,7 @@ sub replace_makefile_variable($$) $replaced = 1; next; } - if (/^\@MAKE/ && !$replaced) + if (/^\@MAKE/ && !$replaced && @values) { print NEW_FILE "$var = \\\n\t" . join(" \\\n\t", sort @values) . "\n"; } @@ -325,7 +336,6 @@ sub parse_makefile($) my @list = split(/\s+/, $2); $make{$var} = \@list; ${$make{"=flags"}}{"mc"} = 1 if $var eq "MC_SRCS"; - ${$make{"=flags"}}{"po"} = 1 if $var eq "PO_SRCS"; ${$make{"=flags"}}{"staticimplib"} = 1 if $var eq "IMPLIB_SRCS"; ${$make{"=flags"}}{"clean"} = 1 if $var =~ /IDL_[CHIPRS]_SRCS|IDL_TLB_SRCS|PROGRAMS/; next; @@ -358,6 +368,26 @@ sub parse_makefile($) return %make; } +# read pragma makedep flags from a source file +sub get_makedep_flags($) +{ + my $file = shift; + my %flags; + + open FILE, $file or die "cannot open $file"; + while (<FILE>) + { + next unless /^#\s*pragma\s+makedep\s+(.*)/; + foreach my $flag (split /\s+/, $1) + { + last if $flag eq "depend"; + $flags{$flag} = 1; + } + } + close FILE; + return %flags; +} + # assign source files to their respective makefile sub assign_sources_to_makefiles(@) { @@ -410,9 +440,29 @@ sub assign_sources_to_makefiles(@) elsif ($name =~ /\.m$/) { push @{${$make}{"=OBJC_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; } + elsif ($name =~ /\.rc$/) + { + my %flags = get_makedep_flags( $file ); + if (defined $flags{"po"}) + { + push @{${$make}{"=PO_SRCS"}}, $name; + ${${$make}{"=flags"}}{"po"} = 1; + } + push @{${$make}{"=RC_SRCS"}}, $name; + } + elsif ($name =~ /\.idl$/) + { + my %flags = get_makedep_flags( $file ); + push @{${$make}{"=IDL_C_SRCS"}}, $name if defined $flags{"client"}; + push @{${$make}{"=IDL_H_SRCS"}}, $name if defined $flags{"header"}; + push @{${$make}{"=IDL_I_SRCS"}}, $name if defined $flags{"ident"}; + push @{${$make}{"=IDL_P_SRCS"}}, $name if defined $flags{"proxy"}; + push @{${$make}{"=IDL_R_SRCS"}}, $name if defined $flags{"register"}; + push @{${$make}{"=IDL_S_SRCS"}}, $name if defined $flags{"server"}; + push @{${$make}{"=IDL_TLB_SRCS"}}, $name if defined $flags{"typelib"}; + } } } foreach my $key (keys %subdirs) @@ -522,8 +572,14 @@ sub update_makefiles(@) replace_makefile_variable( $file, "C_SRCS" ); replace_makefile_variable( $file, "OBJC_SRCS" ); replace_makefile_variable( $file, "RC_SRCS" ); + replace_makefile_variable( $file, "PO_SRCS" ); replace_makefile_variable( $file, "PRIVATE_IDL_H_SRCS" ); replace_makefile_variable( $file, "PUBLIC_IDL_H_SRCS" ); + replace_makefile_variable( $file, "IDL_C_SRCS" ); + replace_makefile_variable( $file, "IDL_I_SRCS" ); + replace_makefile_variable( $file, "IDL_P_SRCS" ); + replace_makefile_variable( $file, "IDL_R_SRCS" ); + replace_makefile_variable( $file, "IDL_S_SRCS" ); replace_makefile_variable( $file, "IDL_TLB_SRCS" ); replace_makefile_variable( $file, "XTEMPLATE_SRCS" ); replace_makefile_variable( $file, "SRCDIR_INCLUDES" );

1 0

Francois Gouget : kernel32: Avoid an unneeded abbreviation in an error message.
by Alexandre Julliard Nov. 5, 2013

Nov. 5, 2013

1 0

Alexandre Julliard : makefiles: Add makedep pragmas for rc files that contain translations.
by Alexandre Julliard Nov. 5, 2013

Nov. 5, 2013

1 0

Alexandre Julliard : makefiles: Add makedep pragmas for registration idl files.
by Alexandre Julliard Nov. 5, 2013

Nov. 5, 2013

1 0

Alexandre Julliard : makefiles: Add makedep pragmas for typelib idl files.
by Alexandre Julliard Nov. 5, 2013

Nov. 5, 2013

Module: wine Branch: master Commit: f8421142e7bd5cd26a5bf4b97dc9f9eef49154b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8421142e7bd5cd26a5bf4b97… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 5 16:33:51 2013 +0100 makefiles: Add makedep pragmas for typelib idl files. --- Make.rules.in | 2 +- dlls/gameux/gameux_tlb.idl | 2 ++ dlls/hhctrl.ocx/hhctrl_tlb.idl | 2 ++ dlls/hnetcfg/hnetcfg_tlb.idl | 2 ++ dlls/ieframe/ieframe_v1.idl | 2 ++ dlls/jscript/jsglobal.idl | 2 ++ dlls/mmcndmgr/mmcndmgr.idl | 2 ++ dlls/mshtml.tlb/mshtml_tlb.idl | 2 ++ dlls/mshtml/tests/test_tlb.idl | 2 ++ dlls/msi/msiserver.idl | 1 + dlls/msxml/msxml_tlb.idl | 2 ++ dlls/msxml2/msxml2_tlb.idl | 2 ++ dlls/msxml3/msxml3_v1.idl | 2 ++ dlls/msxml4/msxml4_tlb.idl | 2 ++ dlls/msxml6/msxml6_tlb.idl | 2 ++ dlls/oleacc/oleacc_classes.idl | 3 +++ dlls/oleaut32/tests/test_reg.idl | 1 + dlls/oleaut32/tests/test_tlb.idl | 2 ++ dlls/oleaut32/tests/tmarshal.idl | 1 + dlls/oledb32/oledb32_typelib.idl | 3 +++ dlls/pstorec/pstorec_tlb.idl | 2 ++ dlls/quartz/control_tlb.idl | 2 ++ dlls/scrrun/scrrun.idl | 3 +++ dlls/shdocvw/shdocvw_v1.idl | 2 ++ dlls/shell32/shell32_tlb.idl | 2 ++ dlls/stdole2.tlb/std_ole_v2.idl | 2 ++ dlls/stdole32.tlb/std_ole_v1.idl | 2 ++ dlls/vbscript/vbsglobal.idl | 2 ++ dlls/vbscript/vbsregexp10.idl | 2 ++ dlls/vbscript/vbsregexp55.idl | 2 ++ dlls/wbemdisp/wbemdisp_tlb.idl | 2 ++ dlls/winhttp/winhttp_tlb.idl | 2 ++ dlls/wshom.ocx/wshom.idl | 2 ++ dlls/wuapi/wuapi_tlb.idl | 2 ++ include/stdole2.idl | 2 ++ programs/wscript/ihost.idl | 2 ++ 36 files changed, 71 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f8421142e7bd5cd26a5bf…

1 0

Alexandre Julliard : makefiles: Add makedep pragmas for identifier idl files.
by Alexandre Julliard Nov. 5, 2013

Nov. 5, 2013

Module: wine Branch: master Commit: 7960e02b17b81ff65cbcd206fb62528937c77301 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7960e02b17b81ff65cbcd206f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 5 16:16:48 2013 +0100 makefiles: Add makedep pragmas for identifier idl files. --- Make.rules.in | 2 +- dlls/msi/msiserver.idl | 2 ++ dlls/mstask/mstask_local.idl | 2 ++ dlls/oleaut32/tests/test_reg.idl | 2 ++ dlls/oleaut32/tests/tmarshal.idl | 2 ++ dlls/oledb32/convert.idl | 2 ++ dlls/oledb32/tests/convert.idl | 2 ++ dlls/qmgr/qmgr_local.idl | 2 ++ dlls/qmgrprxy/qmgrprxy.idl | 1 + 9 files changed, 16 insertions(+), 1 deletions(-) diff --git a/Make.rules.in b/Make.rules.in index 62f6188..1bba206 100644 --- a/Make.rules.in +++ b/Make.rules.in @@ -101,7 +101,7 @@ $(IMPORTLIB:%=lib%.cross.a): $(MAINSPEC) $(IMPLIB_SRCS:.c=.cross.o) # Rules for dependencies DEPEND_SRCS = $(C_SRCS) $(OBJC_SRCS) $(RC_SRCS) $(MC_SRCS) $(PO_SRCS:.rc=.pot) \ - $(IDL_H_SRCS) $(IDL_C_SRCS) $(IDL_I_SRCS:.idl=_i.c) $(IDL_P_SRCS) $(IDL_S_SRCS) $(IDL_R_SRCS:.idl=_r.res) $(IDL_TLB_SRCS:.idl=.tlb) \ + $(IDL_H_SRCS) $(IDL_C_SRCS) $(IDL_I_SRCS) $(IDL_P_SRCS) $(IDL_S_SRCS) $(IDL_R_SRCS:.idl=_r.res) $(IDL_TLB_SRCS:.idl=.tlb) \ $(BISON_SRCS) $(LEX_SRCS) $(EXTRA_OBJS) depend: dummy diff --git a/dlls/msi/msiserver.idl b/dlls/msi/msiserver.idl index 669d7f2..d431db9 100644 --- a/dlls/msi/msiserver.idl +++ b/dlls/msi/msiserver.idl @@ -17,6 +17,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#pragma makedep ident + #include "msiserver_dispids.h" import "unknwn.idl"; import "wtypes.idl"; diff --git a/dlls/mstask/mstask_local.idl b/dlls/mstask/mstask_local.idl index b1a044a..5fe36f0 100644 --- a/dlls/mstask/mstask_local.idl +++ b/dlls/mstask/mstask_local.idl @@ -16,4 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#pragma makedep ident + #include "mstask.idl" diff --git a/dlls/oleaut32/tests/test_reg.idl b/dlls/oleaut32/tests/test_reg.idl index 7f73b25..54d492f 100644 --- a/dlls/oleaut32/tests/test_reg.idl +++ b/dlls/oleaut32/tests/test_reg.idl @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#pragma makedep ident + import "oaidl.idl"; /* needed by widl */ [ diff --git a/dlls/oleaut32/tests/tmarshal.idl b/dlls/oleaut32/tests/tmarshal.idl index 67e67b2..48801dc 100644 --- a/dlls/oleaut32/tests/tmarshal.idl +++ b/dlls/oleaut32/tests/tmarshal.idl @@ -17,6 +17,8 @@ * */ +#pragma makedep ident + #include "tmarshal_dispids.h" import "ocidl.idl"; diff --git a/dlls/oledb32/convert.idl b/dlls/oledb32/convert.idl index 081be3d..0eab8ae 100644 --- a/dlls/oledb32/convert.idl +++ b/dlls/oledb32/convert.idl @@ -1 +1,3 @@ +#pragma makedep ident + #include "msdadc.idl" diff --git a/dlls/oledb32/tests/convert.idl b/dlls/oledb32/tests/convert.idl index 081be3d..0eab8ae 100644 --- a/dlls/oledb32/tests/convert.idl +++ b/dlls/oledb32/tests/convert.idl @@ -1 +1,3 @@ +#pragma makedep ident + #include "msdadc.idl" diff --git a/dlls/qmgr/qmgr_local.idl b/dlls/qmgr/qmgr_local.idl index 8e1341d..4bbcf7b 100644 --- a/dlls/qmgr/qmgr_local.idl +++ b/dlls/qmgr/qmgr_local.idl @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#pragma makedep ident + #include "bits.idl" #define DO_NO_IMPORTS diff --git a/dlls/qmgrprxy/qmgrprxy.idl b/dlls/qmgrprxy/qmgrprxy.idl index a775512..7f76454 100644 --- a/dlls/qmgrprxy/qmgrprxy.idl +++ b/dlls/qmgrprxy/qmgrprxy.idl @@ -16,6 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#pragma makedep ident #pragma makedep proxy #include "bits.idl"

1 0