wine-commits October 2012

wine-commits@winehq.org

2 participants
960 discussions

Daniel Lehman : gdi32: Use HandleToULong inline function to convert handle to index instead of casting .
by Alexandre Julliard 12 Oct '12

12 Oct '12

Module: wine Branch: master Commit: ea6e0a833b86cbc1b0b518263d529dc4c32f9bcc URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea6e0a833b86cbc1b0b518263… Author: Daniel Lehman <dlehman(a)esri.com> Date: Mon Apr 16 14:53:43 2012 -0700 gdi32: Use HandleToULong inline function to convert handle to index instead of casting. --- dlls/gdi32/gdiobj.c | 4 ++-- dlls/gdi32/tests/gdiobj.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 46 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/gdiobj.c b/dlls/gdi32/gdiobj.c index 14ac692..06279dd 100644 --- a/dlls/gdi32/gdiobj.c +++ b/dlls/gdi32/gdiobj.c @@ -699,7 +699,7 @@ void *free_gdi_handle( HGDIOBJ handle ) GDIOBJHDR *object = NULL; int i; - i = ((ULONG_PTR)handle >> 2) - FIRST_LARGE_HANDLE; + i = (HandleToULong(handle) >> 2) - FIRST_LARGE_HANDLE; if (i >= 0 && i < MAX_LARGE_HANDLES) { EnterCriticalSection( &gdi_section ); @@ -732,7 +732,7 @@ void *GDI_GetObjPtr( HGDIOBJ handle, WORD type ) EnterCriticalSection( &gdi_section ); - i = ((UINT_PTR)handle >> 2) - FIRST_LARGE_HANDLE; + i = (HandleToULong(handle) >> 2) - FIRST_LARGE_HANDLE; if (i >= 0 && i < MAX_LARGE_HANDLES) { ptr = large_handles[i]; diff --git a/dlls/gdi32/tests/gdiobj.c b/dlls/gdi32/tests/gdiobj.c index c854311..3b9f734 100644 --- a/dlls/gdi32/tests/gdiobj.c +++ b/dlls/gdi32/tests/gdiobj.c @@ -319,10 +319,54 @@ static void test_region(void) DeleteObject(hrgn); } +static void test_handles_on_win64(void) +{ + int i; + BOOL ret; + DWORD type; + HRGN hrgn, hrgn_test; + + static const struct + { + ULONG high; + ULONG low; + BOOL ret; + } cases[] = + { + { 0x00000000, 0x00000000, TRUE }, + { 0x00000000, 0x0000ffe0, FALSE }, /* just over MAX_LARGE_HANDLES */ + { 0x00000000, 0x0000ffb0, FALSE }, /* just under MAX_LARGE_HANDLES */ + { 0xffffffff, 0xffff0000, FALSE }, + { 0xffffffff, 0x00000000, TRUE }, + { 0xdeadbeef, 0x00000000, TRUE }, + { 0xcccccccc, 0xcccccccc, FALSE } + }; + + if (sizeof(void*) != 8) + return; + + for (i = 0; i < sizeof(cases)/sizeof(cases[0]); i++) + { + hrgn = CreateRectRgn(10, 10, 20, 20); + hrgn_test = (HRGN)(ULONG_PTR)((ULONG_PTR)hrgn | ((ULONGLONG)cases[i].high << 32) | cases[i].low); + type = GetObjectType( hrgn_test ); + if (cases[i].ret) + ok( type == OBJ_REGION, "wrong type %u\n", type ); + else + ok( type == 0, "wrong type %u\n", type ); + ret = DeleteObject(hrgn_test); + ok( cases[i].ret == ret, "DeleteObject should return %s (%p)\n", + cases[i].ret ? "TRUE" : "FALSE", hrgn_test); + /* actually free it if above is expected to fail */ + if (!ret) DeleteObject(hrgn); + } +} + START_TEST(gdiobj) { test_gdi_objects(); test_thread_objects(); test_GetCurrentObject(); test_region(); + test_handles_on_win64(); }

1 0

Alexandre Julliard : setupapi: Fix buffer overflow in load_fake_dll.
by Alexandre Julliard 12 Oct '12

12 Oct '12

Module: wine Branch: master Commit: 8418115edfc785242c16ba1eca5c5a14f6e663b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8418115edfc785242c16ba1ec… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 12 11:21:14 2012 +0200 setupapi: Fix buffer overflow in load_fake_dll. Found by Daniel Lehman. --- dlls/setupapi/fakedll.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/setupapi/fakedll.c b/dlls/setupapi/fakedll.c index 645b7e8..7393e40 100644 --- a/dlls/setupapi/fakedll.c +++ b/dlls/setupapi/fakedll.c @@ -394,13 +394,13 @@ static void *load_fake_dll( const WCHAR *name, SIZE_T *size ) if ((p = strrchrW( name, '\\' ))) name = p + 1; i = 0; - if (build_dir) maxlen = strlen(build_dir) + sizeof("/programs/") + strlenW(name); + len = strlenW( name ); + if (build_dir) maxlen = strlen(build_dir) + sizeof("/programs/") + len; while ((path = wine_dll_enum_load_path( i++ ))) maxlen = max( maxlen, strlen(path) ); - maxlen += sizeof("/fakedlls") + strlenW(name) + 2; + maxlen += sizeof("/fakedlls") + len + sizeof(".fake"); if (!(file = HeapAlloc( GetProcessHeap(), 0, maxlen ))) return NULL; - len = strlenW( name ); pos = maxlen - len - sizeof(".fake"); if (!dll_name_WtoA( file + pos, name, len )) goto done; file[--pos] = '/';

1 0

Daniel Lehman : msvcp90: In codecvt<wchar_t>::do_out, copy local buffer to *to_next.
by Alexandre Julliard 12 Oct '12

12 Oct '12

Module: wine Branch: master Commit: 8ed96ab041259d94f569e0a579b97e35fe75e05e URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ed96ab041259d94f569e0a57… Author: Daniel Lehman <dlehman(a)esri.com> Date: Thu Sep 27 14:54:02 2012 -0700 msvcp90: In codecvt<wchar_t>::do_out, copy local buffer to *to_next. --- dlls/msvcp90/locale.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 26f1fba..e5b9d6a 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -3273,6 +3273,7 @@ int __thiscall codecvt_wchar_do_out(const codecvt_wchar *this, int *state, } (*from_next)++; + memcpy_s(*to_next, to_end-*to_next, buf, size); (*to_next) += size; } }

1 0

Daniel Lehman : msvcp90: Fix parsing in num_get<>::_Getifld.
by Alexandre Julliard 12 Oct '12

12 Oct '12

Module: wine Branch: master Commit: c65bd5cad2f0be3633a55de8a2eaa1833c149aec URL: http://source.winehq.org/git/wine.git/?a=commit;h=c65bd5cad2f0be3633a55de8a… Author: Daniel Lehman <dlehman(a)esri.com> Date: Thu Sep 13 10:36:53 2012 -0700 msvcp90: Fix parsing in num_get<>::_Getifld. --- dlls/msvcp90/locale.c | 152 +++++---- dlls/msvcp90/tests/Makefile.in | 1 + dlls/msvcp90/tests/ios.c | 718 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 810 insertions(+), 61 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c65bd5cad2f0be3633a55…

1 0

Erich Hoover : ws2_32: Silence error when binding to loopback adapter.
by Alexandre Julliard 12 Oct '12

12 Oct '12

Module: wine Branch: master Commit: 9f1b1bef5cd174f957dacb73856f4019d90b862e URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f1b1bef5cd174f957dacb738… Author: Erich Hoover <ehoover(a)mines.edu> Date: Thu Oct 11 14:08:23 2012 -0600 ws2_32: Silence error when binding to loopback adapter. --- dlls/ws2_32/socket.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index f978350..792ab1c 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2146,13 +2146,14 @@ static BOOL interface_bind( SOCKET s, int fd, struct sockaddr *addr ) { struct sockaddr_in *in_sock = (struct sockaddr_in *) addr; unsigned int sock_type = 0, optlen = sizeof(sock_type); + in_addr_t bind_addr = in_sock->sin_addr.s_addr; PIP_ADAPTER_INFO adapters = NULL, adapter; BOOL ret = FALSE; DWORD adap_size; int enable = 1; - if (in_sock->sin_addr.s_addr == htonl(WS_INADDR_ANY)) - return FALSE; /* Not binding to specific interface, uses default route */ + if (bind_addr == htonl(WS_INADDR_ANY) || bind_addr == htonl(WS_INADDR_LOOPBACK)) + return FALSE; /* Not binding to a network adapter, special interface binding unnecessary. */ if (getsockopt(fd, SOL_SOCKET, SO_TYPE, &sock_type, &optlen) == -1 || sock_type != SOCK_DGRAM) return FALSE; /* Special interface binding is only necessary for UDP datagrams. */ if (GetAdaptersInfo(NULL, &adap_size) != ERROR_BUFFER_OVERFLOW) @@ -2165,7 +2166,7 @@ static BOOL interface_bind( SOCKET s, int fd, struct sockaddr *addr ) { in_addr_t adapter_addr = (in_addr_t) inet_addr(adapter->IpAddressList.IpAddress.String); - if (in_sock->sin_addr.s_addr == adapter_addr) + if (bind_addr == adapter_addr) { #if defined(IP_BOUND_IF) /* IP_BOUND_IF sets both the incoming and outgoing restriction at once */

1 0

Francois Gouget : testbot/build: Rename BuildSingleTest.pl to Build. pl for consistency with the type of the corresponding tasks.
by Alexandre Julliard 11 Oct '12

11 Oct '12

Module: tools Branch: master Commit: 5dcd11dc45b623f6d1e8bf74e7cda4228da7842d URL: http://source.winehq.org/git/tools.git/?a=commit;h=5dcd11dc45b623f6d1e8bf74… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Oct 11 17:11:46 2012 +0200 testbot/build: Rename BuildSingleTest.pl to Build.pl for consistency with the type of the corresponding tasks. --- testbot/bin/WineRunBuild.pl | 8 ++-- testbot/bin/build/{BuildSingleTest.pl => Build.pl} | 30 ++++++++++---------- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl index 56161da..868b378 100755 --- a/testbot/bin/WineRunBuild.pl +++ b/testbot/bin/WineRunBuild.pl @@ -86,7 +86,7 @@ sub ProcessRawlog while (defined($Line = <RAWLOG>)) { chomp($Line); - if ($Line =~ m/^BuildSingleTest: (.*)$/) + if ($Line =~ m/^Build: (.*)$/) { if ($1 eq "ok") { @@ -241,7 +241,7 @@ if (defined($ErrMessage)) $FullErrFileName, $Job, $Step, $Task; } my $Script = "#!/bin/sh\n"; -$Script .= "$BinDir/build/BuildSingleTest.pl $FileName " . $Step->FileType . +$Script .= "$BinDir/build/Build.pl $FileName " . $Step->FileType . " $BaseName 32"; if ($Run64) { @@ -251,14 +251,14 @@ $Script .= "\n"; $ErrMessage = $VM->RunScriptInGuestTimeout("", $Script, $Task->Timeout); if (defined($ErrMessage)) { - $VM->CopyFileFromGuestToHost("$LogDir/BuildSingleTest.log", + $VM->CopyFileFromGuestToHost("$LogDir/Build.log", $FullRawlogFileName); ProcessRawlog($FullRawlogFileName, $FullLogFileName, $FullErrFileName); FatalError "Failure running script in VM: $ErrMessage\n", $FullErrFileName, $Job, $Step, $Task; } -$ErrMessage = $VM->CopyFileFromGuestToHost("$LogDir/BuildSingleTest.log", +$ErrMessage = $VM->CopyFileFromGuestToHost("$LogDir/Build.log", $FullRawlogFileName); if (defined($ErrMessage)) { diff --git a/testbot/bin/build/BuildSingleTest.pl b/testbot/bin/build/Build.pl similarity index 91% rename from testbot/bin/build/BuildSingleTest.pl rename to testbot/bin/build/Build.pl index 8d06614..a37537e 100755 --- a/testbot/bin/build/BuildSingleTest.pl +++ b/testbot/bin/build/Build.pl @@ -36,7 +36,7 @@ use WineTestBot::Config; sub InfoMsg { my $oldumask = umask(002); - if (open LOGFILE, ">>$LogDir/BuildSingleTest.log") + if (open LOGFILE, ">>$LogDir/Build.log") { print LOGFILE @_; close LOGFILE; @@ -47,9 +47,9 @@ sub InfoMsg sub LogMsg { my $oldumask = umask(002); - if (open LOGFILE, ">>$LogDir/BuildSingleTest.log") + if (open LOGFILE, ">>$LogDir/Build.log") { - print LOGFILE "BuildSingleTest: ", @_; + print LOGFILE "Build: ", @_; close LOGFILE; } umask($oldumask); @@ -109,7 +109,7 @@ sub ApplyPatch InfoMsg "Applying patch\n"; system("git apply --verbose --directory=$DataDir/wine-git $PatchFile " . - ">> $LogDir/BuildSingleTest.log 2>&1"); + ">> $LogDir/Build.log 2>&1"); if ($? != 0) { LogMsg "Patch failed to apply\n"; @@ -121,7 +121,7 @@ sub ApplyPatch InfoMsg "Running autoconf\n"; system("( cd $DataDir/wine-git && set -x && " . " autoconf --output configure configure.ac " . - ") >>$LogDir/BuildSingleTest.log 2>&1"); + ") >>$LogDir/Build.log 2>&1"); if ($? != 0) { LogMsg "Autoconf failed\n"; @@ -172,7 +172,7 @@ sub BuildTestExecutable my $Host = ($Bits == 64 ? "x86_64-w64-mingw32" : "i686-pc-mingw32"); system("( cd $DataDir/build-mingw$Bits && set -x && " . " ../wine-git/configure --host=$Host --with-wine-tools=../build-native --without-x --without-freetype " . - ") >>$LogDir/BuildSingleTest.log 2>&1"); + ") >>$LogDir/Build.log 2>&1"); if ($? != 0) { LogMsg "Reconfigure of $Bits-bit crossbuild failed\n"; @@ -185,7 +185,7 @@ sub BuildTestExecutable InfoMsg "Recreating include/Makefile\n"; system("( cd $DataDir/build-mingw$Bits && set -x && " . " ./config.status --file include/Makefile:Make.vars.in:include/Makefile.in " . - ") >>$LogDir/BuildSingleTest.log 2>&1"); + ") >>$LogDir/Build.log 2>&1"); if ($? != 0) { LogMsg "Recreation of include/Makefile failed\n"; @@ -194,7 +194,7 @@ sub BuildTestExecutable system("( cd $DataDir/build-mingw$Bits && set -x && " . " make -j$ncpus include " . - ") >> $LogDir/BuildSingleTest.log 2>&1"); + ") >> $LogDir/Build.log 2>&1"); if ($? != 0) { LogMsg "Make in include dir failed\n"; @@ -207,7 +207,7 @@ sub BuildTestExecutable InfoMsg "Rebuilding $BaseName import lib\n"; system("( cd $DataDir/build-mingw$Bits && set -x && " . " ./config.status --file $PatchType/$BaseName/Makefile:Make.vars.in:$PatchType/$BaseName/Makefile.in " . - ") >>$LogDir/BuildSingleTest.log 2>&1"); + ") >>$LogDir/Build.log 2>&1"); if ($? != 0) { LogMsg "Unable to regenerate $PatchType/$BaseName/Makefile\n"; @@ -216,7 +216,7 @@ sub BuildTestExecutable { system("( cd $DataDir/build-mingw$Bits && set -x && " . " make -j$ncpus -C $PatchType/$BaseName lib$BaseName.a " . - ") >>$LogDir/BuildSingleTest.log 2>&1"); + ") >>$LogDir/Build.log 2>&1"); if ($? != 0) { InfoMsg "Make of import library failed\n"; @@ -229,7 +229,7 @@ sub BuildTestExecutable InfoMsg "Recreating tests/Makefile\n"; system("( cd $DataDir/build-mingw$Bits && set -x && " . " ./config.status --file $PatchType/$BaseName/tests/Makefile:Make.vars.in:$PatchType/$BaseName/tests/Makefile.in " . - ") >>$LogDir/BuildSingleTest.log 2>&1"); + ") >>$LogDir/Build.log 2>&1"); if ($? != 0) { LogMsg "Recreation of tests/Makefile failed\n"; @@ -242,7 +242,7 @@ sub BuildTestExecutable InfoMsg "Making build dependencies\n"; system("( cd $DataDir/build-mingw$Bits && set -x && " . " make -j$ncpus __builddeps__ " . - ") >>$LogDir/BuildSingleTest.log 2>&1"); + ") >>$LogDir/Build.log 2>&1"); if ($? != 0) { LogMsg "Making build dependencies failed\n"; @@ -262,7 +262,7 @@ sub BuildTestExecutable InfoMsg "Making test executable\n"; system("( cd $DataDir/build-mingw$Bits && set -x && " . " make -j$ncpus -C $TestsDir " . - ") >>$LogDir/BuildSingleTest.log 2>&1"); + ") >>$LogDir/Build.log 2>&1"); if ($? != 0) { LogMsg "Make failed\n"; @@ -281,12 +281,12 @@ $ENV{PATH} = "/usr/lib/ccache:/usr/bin:/bin"; delete $ENV{ENV}; # Start with clean logfile -unlink("$LogDir/BuildSingleTest.log"); +unlink("$LogDir/Build.log"); my ($PatchFile, $PatchType, $BaseName, $BitIndicators) = @ARGV; if (! $PatchFile || ! $PatchType || ! $BaseName || !$BitIndicators) { - FatalError "Usage: BuildSingleTest.pl <patchfile> <patchtype> <basename> <bits>\n"; + FatalError "Usage: Build.pl <patchfile> <patchtype> <basename> <bits>\n"; } # Untaint parameters

1 0

Francois Gouget : testbot/build: Move the build VM's scripts to the bin/ build directory.
by Alexandre Julliard 11 Oct '12

11 Oct '12

Module: tools Branch: master Commit: 1e48d99a79ccad889e917ef7a4a63509a749f330 URL: http://source.winehq.org/git/tools.git/?a=commit;h=1e48d99a79ccad889e917ef7… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Oct 11 17:11:11 2012 +0200 testbot/build: Move the build VM's scripts to the bin/build directory. --- testbot/bin/WineRunBuild.pl | 4 ++-- testbot/bin/WineRunReconfig.pl | 10 +++++----- testbot/bin/{ => build}/BuildSingleTest.pl | 4 ++-- testbot/bin/{ => build}/Reconfig.pl | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl index 2699351..56161da 100755 --- a/testbot/bin/WineRunBuild.pl +++ b/testbot/bin/WineRunBuild.pl @@ -1,7 +1,7 @@ #!/usr/bin/perl -Tw # # Communicates with the build machine to have it perform the 'build' task. -# See the bin/BuildSingleTest.pl script. +# See the bin/build/Build.pl script. # # Copyright 2009 Ge van Geldorp # @@ -241,7 +241,7 @@ if (defined($ErrMessage)) $FullErrFileName, $Job, $Step, $Task; } my $Script = "#!/bin/sh\n"; -$Script .= "$BinDir/BuildSingleTest.pl $FileName " . $Step->FileType . +$Script .= "$BinDir/build/BuildSingleTest.pl $FileName " . $Step->FileType . " $BaseName 32"; if ($Run64) { diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index 4aacd81..ae102e9 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -1,7 +1,7 @@ #!/usr/bin/perl -Tw # # Communicates with the build machine to have it perform the 'reconfig' task. -# See the bin/Reconfig.pl script. +# See the bin/build/Reconfig.pl script. # # Copyright 2009 Ge van Geldorp # @@ -194,7 +194,7 @@ if (defined($ErrMessage)) FatalError "Can't set VM status to running: $ErrMessage\n", $FullErrFileName, $Job, $Step, $Task; } -my $Script = "#!/bin/sh\n$BinDir/Reconfig.pl\n"; +my $Script = "#!/bin/sh\n$BinDir/build/Reconfig.pl\n"; $ErrMessage = $VM->RunScriptInGuestTimeout("", $Script, $Task->Timeout); if (defined($ErrMessage)) { @@ -212,10 +212,10 @@ if (defined($ErrMessage)) FatalError "Can't copy log from VM: $ErrMessage\n", $FullErrFileName, $Job, $Step, $Task; } -my $ReconfigSucceeded = ProcessRawlog($FullRawlogFileName, $FullLogFileName, - $FullErrFileName); +my $Success = ProcessRawlog($FullRawlogFileName, $FullLogFileName, + $FullErrFileName); -if ($ReconfigSucceeded) +if ($Success) { $ErrMessage = $VM->RemoveSnapshot($VM->IdleSnapshot); if (defined($ErrMessage)) diff --git a/testbot/bin/BuildSingleTest.pl b/testbot/bin/build/BuildSingleTest.pl similarity index 99% rename from testbot/bin/BuildSingleTest.pl rename to testbot/bin/build/BuildSingleTest.pl index 07787d4..8d06614 100755 --- a/testbot/bin/BuildSingleTest.pl +++ b/testbot/bin/build/BuildSingleTest.pl @@ -29,7 +29,7 @@ sub BEGIN $0 =~ m=^(.*)/[^/]*$=; $Dir = $1; } -use lib "$Dir/../lib"; +use lib "$Dir/../../lib"; use WineTestBot::Config; @@ -258,7 +258,7 @@ sub BuildTestExecutable } $TestExecutable .= "_test.exe"; unlink("$DataDir/build-mingw${Bits}/$TestExecutable"); - + InfoMsg "Making test executable\n"; system("( cd $DataDir/build-mingw$Bits && set -x && " . " make -j$ncpus -C $TestsDir " . diff --git a/testbot/bin/Reconfig.pl b/testbot/bin/build/Reconfig.pl similarity index 99% rename from testbot/bin/Reconfig.pl rename to testbot/bin/build/Reconfig.pl index f049e8a..c3f8eb4 100755 --- a/testbot/bin/Reconfig.pl +++ b/testbot/bin/build/Reconfig.pl @@ -29,7 +29,7 @@ sub BEGIN $0 =~ m=^(.*)/[^/]*$=; $Dir = $1; } -use lib "$Dir/../lib"; +use lib "$Dir/../../lib"; use WineTestBot::Config;

1 0

Matteo Bruni : d3dcompiler: Add some checks to function definitions.
by Alexandre Julliard 11 Oct '12

11 Oct '12

Module: wine Branch: master Commit: 69922c671a5a092cdf68ab4a6c863ccd136c88c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=69922c671a5a092cdf68ab4a6… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Oct 11 19:48:49 2012 +0200 d3dcompiler: Add some checks to function definitions. --- dlls/d3dcompiler_43/d3dcompiler_private.h | 1 + dlls/d3dcompiler_43/hlsl.y | 55 +++++++++++++++++++++++++++++ dlls/d3dcompiler_43/utils.c | 2 +- 3 files changed, 57 insertions(+), 1 deletions(-) diff --git a/dlls/d3dcompiler_43/d3dcompiler_private.h b/dlls/d3dcompiler_43/d3dcompiler_private.h index a6c27d0..c8a92f1 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_private.h +++ b/dlls/d3dcompiler_43/d3dcompiler_private.h @@ -1109,6 +1109,7 @@ struct hlsl_type *clone_hlsl_type(struct hlsl_type *old) DECLSPEC_HIDDEN; struct hlsl_type *get_type(struct hlsl_scope *scope, const char *name, BOOL recursive) DECLSPEC_HIDDEN; BOOL find_function(const char *name) DECLSPEC_HIDDEN; unsigned int components_count_type(struct hlsl_type *type) DECLSPEC_HIDDEN; +BOOL compare_hlsl_types(const struct hlsl_type *t1, const struct hlsl_type *t2) DECLSPEC_HIDDEN; BOOL compatible_data_types(struct hlsl_type *s1, struct hlsl_type *s2) DECLSPEC_HIDDEN; struct hlsl_ir_expr *new_expr(enum hlsl_ir_expr_op op, struct hlsl_ir_node **operands, struct source_location *loc) DECLSPEC_HIDDEN; diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index d327102..6200b96 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -808,6 +808,29 @@ static BOOL add_typedef(DWORD modifiers, struct hlsl_type *orig_type, struct lis return TRUE; } +static const struct hlsl_ir_function_decl *get_overloaded_func(struct wine_rb_tree *funcs, char *name, + struct list *params, BOOL exact_signature) +{ + struct hlsl_ir_function *func; + struct wine_rb_entry *entry; + + entry = wine_rb_get(funcs, name); + if (entry) + { + func = WINE_RB_ENTRY_VALUE(entry, struct hlsl_ir_function, entry); + + entry = wine_rb_get(&func->overloads, params); + if (!entry) + { + if (!exact_signature) + FIXME("No exact match, search for a compatible overloaded function (if any).\n"); + return NULL; + } + return WINE_RB_ENTRY_VALUE(entry, struct hlsl_ir_function_decl, entry); + } + return NULL; +} + %} %locations @@ -1000,6 +1023,38 @@ hlsl_prog: /* empty */ } | hlsl_prog func_declaration { + const struct hlsl_ir_function_decl *decl; + + decl = get_overloaded_func(&hlsl_ctx.functions, $2.name, $2.decl->parameters, TRUE); + if (decl && !decl->func->intrinsic) + { + if (decl->body && $2.decl->body) + { + hlsl_report_message($2.decl->node.loc.file, $2.decl->node.loc.line, + $2.decl->node.loc.col, HLSL_LEVEL_ERROR, + "redefinition of function %s", debugstr_a($2.name)); + return 1; + } + else if (!compare_hlsl_types(decl->node.data_type, $2.decl->node.data_type)) + { + hlsl_report_message($2.decl->node.loc.file, $2.decl->node.loc.line, + $2.decl->node.loc.col, HLSL_LEVEL_ERROR, + "redefining function %s with a different return type", + debugstr_a($2.name)); + hlsl_report_message(decl->node.loc.file, decl->node.loc.line, decl->node.loc.col, HLSL_LEVEL_NOTE, + "%s previously declared here", + debugstr_a($2.name)); + return 1; + } + } + + if ($2.decl->node.data_type->base_type == HLSL_TYPE_VOID && $2.decl->semantic) + { + hlsl_report_message($2.decl->node.loc.file, $2.decl->node.loc.line, + $2.decl->node.loc.col, HLSL_LEVEL_ERROR, + "void function with a semantic"); + } + TRACE("Adding function '%s' to the function list.\n", $2.name); add_function_decl(&hlsl_ctx.functions, $2.name, $2.decl, FALSE); } diff --git a/dlls/d3dcompiler_43/utils.c b/dlls/d3dcompiler_43/utils.c index e5f3f74..830965d 100644 --- a/dlls/d3dcompiler_43/utils.c +++ b/dlls/d3dcompiler_43/utils.c @@ -907,7 +907,7 @@ unsigned int components_count_type(struct hlsl_type *type) return count; } -static BOOL compare_hlsl_types(const struct hlsl_type *t1, const struct hlsl_type *t2) +BOOL compare_hlsl_types(const struct hlsl_type *t1, const struct hlsl_type *t2) { if (t1 == t2) return TRUE;

1 0

Matteo Bruni : d3dcompiler: Properly support function overloads.
by Alexandre Julliard 11 Oct '12

11 Oct '12

Module: wine Branch: master Commit: 6897f9aa3565d9e6fb1d074e13f09edeb0aa3e9e URL: http://source.winehq.org/git/wine.git/?a=commit;h=6897f9aa3565d9e6fb1d074e1… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Oct 11 19:48:48 2012 +0200 d3dcompiler: Properly support function overloads. --- dlls/d3dcompiler_43/d3dcompiler_private.h | 28 ++++- dlls/d3dcompiler_43/hlsl.y | 47 ++++--- dlls/d3dcompiler_43/utils.c | 184 ++++++++++++++++++++++++++-- 3 files changed, 220 insertions(+), 39 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6897f9aa3565d9e6fb1d0…

1 0

Matteo Bruni : d3dcompiler: Allow multiple input/output modifiers.
by Alexandre Julliard 11 Oct '12

11 Oct '12

Module: wine Branch: master Commit: deb00c946088c6780d8e47704e3ff053b00b9bc0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=deb00c946088c6780d8e47704… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Oct 11 19:48:47 2012 +0200 d3dcompiler: Allow multiple input/output modifiers. --- dlls/d3dcompiler_43/hlsl.y | 22 +++++++++++++++++----- 1 files changed, 17 insertions(+), 5 deletions(-) diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index a7d4c68..738ab3a 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -991,6 +991,7 @@ static BOOL add_typedef(DWORD modifiers, struct hlsl_type *orig_type, struct lis %type <list> expr_statement %type <unary_op> unary_op %type <assign_op> assign_op +%type <modifiers> input_mods %type <modifiers> input_mod %% @@ -1225,20 +1226,31 @@ param_list: parameter } } -parameter: input_mod var_modifiers type any_identifier semantic +parameter: input_mods var_modifiers type any_identifier semantic { - $$.modifiers = $1; + $$.modifiers = $1 ? $1 : HLSL_MODIFIER_IN; $$.modifiers |= $2; $$.type = $3; $$.name = $4; $$.semantic = $5; } -input_mod: /* Empty */ +input_mods: /* Empty */ { - $$ = HLSL_MODIFIER_IN; + $$ = 0; + } + | input_mods input_mod + { + if ($1 & $2) + { + hlsl_report_message(hlsl_ctx.source_file, @2.first_line, @2.first_column, + HLSL_LEVEL_ERROR, "duplicate input-output modifiers"); + return 1; + } + $$ = $1 | $2; } - | KW_IN + +input_mod: KW_IN { $$ = HLSL_MODIFIER_IN; }

1 0

← Newer
1
...
57
58
59
60
61
62
63
...
96
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2012