Skip to content

W
wine-winehq
Commit 2a863f40 authored by Zebediah Figura's avatar Zebediah Figura Committed by Alexandre Julliard
Browse files
Options

opencl: Use types with consistent alignment for unixlib params structures.

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52389Signed-off-by: 's avatarZebediah Figura <zfigura@codeweavers.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent 7aaeec35
Expand all Show whitespace changes
Inline Side-by-side
Showing with 34 additions and 20 deletions
dlls/opencl/make_opencl
View file @ 2a863f40
...@@ -37,21 +37,22 @@ my %core_categories = (); ...@@ -37,21 +37,22 @@ my %core_categories = ();
my %arg_types = my %arg_types =
( (
"cl_bitfield" => [ "int64", "wine_dbgstr_longlong(%s)" ], # spec unixlib format
"double" => [ "double", "%.16e" ], "cl_bitfield" => [ "int64", "ULONGLONG", "wine_dbgstr_longlong(%s)" ],
"float" => [ "float", "%.8e" ], "double" => [ "double", "DOUBLE", "%.16e" ],
"int" => [ "long", "%d" ], "float" => [ "float", "float", "%.8e" ],
"int8_t" => [ "long", "%d" ], "int" => [ "long", "int", "%d" ],
"int16_t" => [ "long", "%d" ], "int8_t" => [ "long", "int8_t", "%d" ],
"int32_t" => [ "long", "%d" ], "int16_t" => [ "long", "int16_t", "%d" ],
"int64_t" => [ "int64", "wine_dbgstr_longlong(%s)" ], "int32_t" => [ "long", "int32_t", "%d" ],
"intptr_t" => [ "long", "%Id" ], "int64_t" => [ "int64", "LONGLONG", "wine_dbgstr_longlong(%s)" ],
"size_t" => [ "long", "%Iu" ], "intptr_t" => [ "long", "INT_PTR", "%Id" ],
"uint8_t" => [ "long", "%u" ], "size_t" => [ "long", "SIZE_T", "%Iu" ],
"uint16_t" => [ "long", "%u" ], "uint8_t" => [ "long", "uint8_t", "%u" ],
"uint32_t" => [ "long", "%u" ], "uint16_t" => [ "long", "uint16_t", "%u" ],
"uint64_t" => [ "int64", "wine_dbgstr_longlong(%s)" ], "uint32_t" => [ "long", "uint32_t", "%u" ],
"unsigned int" => [ "long", "%u" ], "uint64_t" => [ "int64", "ULONGLONG", "wine_dbgstr_longlong(%s)" ],
"unsigned int" => [ "long", "unsigned int", "%u" ],
); );
my %unsupported_extensions = my %unsupported_extensions =
...@@ -99,7 +100,7 @@ sub generate_pe_thunk($$) ...@@ -99,7 +100,7 @@ sub generate_pe_thunk($$)
} }
elsif (defined $arg_types{$ptype}) elsif (defined $arg_types{$ptype})
{ {
my $format = ${$arg_types{$ptype}}[1]; my $format = ${$arg_types{$ptype}}[2];
$trace_arg .= ", " . ($format =~ /^%/ ? $format : "%s"); $trace_arg .= ", " . ($format =~ /^%/ ? $format : "%s");
$trace_call_arg .= ", " . sprintf $format =~ /^%/ ? "%s" : $format, $pname; $trace_call_arg .= ", " . sprintf $format =~ /^%/ ? "%s" : $format, $pname;
} }
...@@ -220,10 +221,23 @@ sub get_func_params($$) ...@@ -220,10 +221,23 @@ sub get_func_params($$)
$params .= " $proto* __retval;\n" unless $proto eq "cl_int"; $params .= " $proto* __retval;\n" unless $proto eq "cl_int";
foreach my $arg (@{$func->[1]}) foreach my $arg (@{$func->[1]})
{ {
my $ptype = get_arg_type( $arg );
next unless $arg->findnodes("./name"); next unless $arg->findnodes("./name");
(my $argtext = $arg->textContent()) =~ s/ +/ /g; my $pname = get_arg_name( $arg );
$argtext =~ s/CL_CALLBACK/WINAPI/g; (my $param = $arg->textContent()) =~ s/ +/ /g;
$params .= " $argtext;\n"; $param =~ s/CL_CALLBACK/WINAPI/g;
if ($param =~ /[[*]/)
{
$params .= " $param;\n";
}
elsif (defined $arg_types{$ptype})
{
$params .= " ${$arg_types{$ptype}}[1] $pname;\n";
}
else
{
die "Unknown type %s in %s\n", $param, $name;
}
} }
return $params . "};\n"; return $params . "};\n";
} }
...@@ -398,7 +412,7 @@ sub parse_file($) ...@@ -398,7 +412,7 @@ sub parse_file($)
my $basetype = @{$type->findnodes("./type")}[0]; my $basetype = @{$type->findnodes("./type")}[0];
if ($type->textContent() =~ /[[*]/) if ($type->textContent() =~ /[[*]/)
{ {
$arg_types{$name} = ["ptr", "%p"]; $arg_types{$name} = ["ptr", $name, "%p"];
} }
elsif (defined($basetype) and defined($arg_types{$basetype->textContent})) elsif (defined($basetype) and defined($arg_types{$basetype->textContent}))
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment