October 2012 - Wine-Commits

Vincas Miliūnas : kernel32/tests: Added tests of FileIdBothDirectoryInfo for GetFileInformationByHandleEx.
by Alexandre Julliard Oct. 12, 2012

Oct. 12, 2012

Module: wine Branch: master Commit: 9cec60bb1e6d81706dd81180f4284e18183ea603 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9cec60bb1e6d81706dd81180f… Author: Vincas Miliūnas <vincas.miliunas(a)gmail.com> Date: Fri Oct 12 13:34:54 2012 +0300 kernel32/tests: Added tests of FileIdBothDirectoryInfo for GetFileInformationByHandleEx. --- dlls/kernel32/tests/file.c | 80 ++++++++++++++++++++++++++++++++++++++++++++ include/winbase.h | 43 +++++++++++++++++++++++ 2 files changed, 123 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index c046371..71ad774 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -39,6 +39,7 @@ static BOOL (WINAPI *pReplaceFileW)(LPCWSTR, LPCWSTR, LPCWSTR, DWORD, LPVOID, LP static UINT (WINAPI *pGetSystemWindowsDirectoryA)(LPSTR, UINT); static BOOL (WINAPI *pGetVolumeNameForVolumeMountPointA)(LPCSTR, LPSTR, DWORD); static DWORD (WINAPI *pQueueUserAPC)(PAPCFUNC pfnAPC, HANDLE hThread, ULONG_PTR dwData); +static BOOL (WINAPI *pGetFileInformationByHandleEx)(HANDLE, FILE_INFO_BY_HANDLE_CLASS, LPVOID, DWORD); /* keep filename and filenameW the same */ static const char filename[] = "testfile.xxx"; @@ -73,6 +74,7 @@ static void InitFunctionPointers(void) pGetSystemWindowsDirectoryA=(void*)GetProcAddress(hkernel32, "GetSystemWindowsDirectoryA"); pGetVolumeNameForVolumeMountPointA = (void *) GetProcAddress(hkernel32, "GetVolumeNameForVolumeMountPointA"); pQueueUserAPC = (void *) GetProcAddress(hkernel32, "QueueUserAPC"); + pGetFileInformationByHandleEx = (void *) GetProcAddress(hkernel32, "GetFileInformationByHandleEx"); } static void test__hread( void ) @@ -3258,6 +3260,83 @@ static void test_CreatFile(void) DeleteFile(file_name); } +static void test_GetFileInformationByHandleEx(void) +{ + int i; + char tempPath[MAX_PATH], tempFileName[MAX_PATH], buffer[1024]; + BOOL ret; + DWORD ret2; + HANDLE directory; + FILE_ID_BOTH_DIR_INFO *bothDirInfo; + struct { + FILE_INFO_BY_HANDLE_CLASS handleClass; + void *ptr; + DWORD size; + DWORD errorCode; + } checks[] = { + {0xdeadbeef, NULL, 0, ERROR_INVALID_PARAMETER}, + {FileIdBothDirectoryInfo, NULL, 0, ERROR_BAD_LENGTH}, + {FileIdBothDirectoryInfo, NULL, sizeof(buffer), ERROR_NOACCESS}, + {FileIdBothDirectoryInfo, buffer, 0, ERROR_BAD_LENGTH}}; + + if (!pGetFileInformationByHandleEx) + { + win_skip("GetFileInformationByHandleEx is missing.\n"); + return; + } + + ret2 = GetTempPathA(sizeof(tempPath), tempPath); + ok(ret2, "GetFileInformationByHandleEx: GetTempPathA failed, got error %u.\n", GetLastError()); + + /* ensure the existence of a file in the temp folder */ + ret2 = GetTempFileNameA(tempPath, "abc", 0, tempFileName); + ok(ret2, "GetFileInformationByHandleEx: GetTempFileNameA failed, got error %u.\n", GetLastError()); + ok(GetFileAttributesA(tempFileName) != INVALID_FILE_ATTRIBUTES, "GetFileInformationByHandleEx: " + "GetFileAttributesA failed to find the temp file, got error %u.\n", GetLastError()); + + directory = CreateFileA(tempPath, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, + NULL, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, NULL); + ok(directory != INVALID_HANDLE_VALUE, "GetFileInformationByHandleEx: failed to open the temp folder, " + "got error %u.\n", GetLastError()); + + for (i = 0; i < sizeof(checks) / sizeof(checks[0]); i += 1) + { + SetLastError(0xdeadbeef); + ret = pGetFileInformationByHandleEx(directory, checks[i].handleClass, checks[i].ptr, checks[i].size); + todo_wine + ok(!ret && GetLastError() == checks[i].errorCode, "GetFileInformationByHandleEx: expected error %u, " + "got %u.\n", checks[i].errorCode, GetLastError()); + } + + while (TRUE) + { + memset(buffer, 0xff, sizeof(buffer)); + ret = pGetFileInformationByHandleEx(directory, FileIdBothDirectoryInfo, buffer, sizeof(buffer)); + if (!ret && GetLastError() == ERROR_NO_MORE_FILES) + break; + todo_wine + ok(ret, "GetFileInformationByHandleEx: failed to query for FileIdBothDirectoryInfo, got error %u.\n", GetLastError()); + if (!ret) + break; + bothDirInfo = (FILE_ID_BOTH_DIR_INFO *)buffer; + while (TRUE) + { + todo_wine + ok(bothDirInfo->FileAttributes != 0xffffffff, "GetFileInformationByHandleEx: returned invalid file attributes.\n"); + todo_wine + ok(bothDirInfo->FileId.u.LowPart != 0xffffffff, "GetFileInformationByHandleEx: returned invalid file id.\n"); + todo_wine + ok(bothDirInfo->FileNameLength != 0xffffffff, "GetFileInformationByHandleEx: returned invalid file name length.\n"); + if (!bothDirInfo->NextEntryOffset) + break; + bothDirInfo = (FILE_ID_BOTH_DIR_INFO *)(((char *)bothDirInfo) + bothDirInfo->NextEntryOffset); + } + } + + CloseHandle(directory); + DeleteFile(tempFileName); +} + START_TEST(file) { InitFunctionPointers(); @@ -3297,4 +3376,5 @@ START_TEST(file) test_RemoveDirectory(); test_ReplaceFileA(); test_ReplaceFileW(); + test_GetFileInformationByHandleEx(); } diff --git a/include/winbase.h b/include/winbase.h index c1e62a3..2e97048 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -740,6 +740,49 @@ typedef struct _BY_HANDLE_FILE_INFORMATION DWORD nFileIndexLow; } BY_HANDLE_FILE_INFORMATION, *PBY_HANDLE_FILE_INFORMATION, *LPBY_HANDLE_FILE_INFORMATION ; +typedef enum _FILE_INFO_BY_HANDLE_CLASS { + FileBasicInfo, + FileStandardInfo, + FileNameInfo, + FileRenameInfo, + FileDispositionInfo, + FileAllocationInfo, + FileEndOfFileInfo, + FileStreamInfo, + FileCompressionInfo, + FileAttributeTagInfo, + FileIdBothDirectoryInfo, + FileIdBothDirectoryRestartInfo, + FileIoPriorityHintInfo, + FileRemoteProtocolInfo, + FileFullDirectoryInfo, + FileFullDirectoryRestartInfo, + FileStorageInfo, + FileAlignmentInfo, + FileIdInfo, + FileIdExtdDirectoryInfo, + FileIdExtdDirectoryRestartInfo, + MaximumFileInfoByHandlesClass +} FILE_INFO_BY_HANDLE_CLASS, *PFILE_INFO_BY_HANDLE_CLASS; + +typedef struct _FILE_ID_BOTH_DIR_INFO { + DWORD NextEntryOffset; + DWORD FileIndex; + LARGE_INTEGER CreationTime; + LARGE_INTEGER LastAccessTime; + LARGE_INTEGER LastWriteTime; + LARGE_INTEGER ChangeTime; + LARGE_INTEGER EndOfFile; + LARGE_INTEGER AllocationSize; + DWORD FileAttributes; + DWORD FileNameLength; + DWORD EaSize; + CCHAR ShortNameLength; + WCHAR ShortName[12]; + LARGE_INTEGER FileId; + WCHAR FileName[1]; +} FILE_ID_BOTH_DIR_INFO, *PFILE_ID_BOTH_DIR_INFO; + #define PIPE_ACCESS_INBOUND 1 #define PIPE_ACCESS_OUTBOUND 2 #define PIPE_ACCESS_DUPLEX 3

1 0

Vincas Miliūnas : kernel32: Added implementation of FileIdBothDirectoryInfo for GetFileInformationByHandleEx .
by Alexandre Julliard Oct. 12, 2012

Oct. 12, 2012

Module: wine Branch: master Commit: 6314cf0295ae64705aeeb24ba162c2136c6ea436 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6314cf0295ae64705aeeb24ba… Author: Vincas Miliūnas <vincas.miliunas(a)gmail.com> Date: Wed Oct 10 19:37:57 2012 +0300 kernel32: Added implementation of FileIdBothDirectoryInfo for GetFileInformationByHandleEx. --- dlls/kernel32/file.c | 53 +++++++++++++++++++++++++++++++++++++++++++ dlls/kernel32/kernel32.spec | 1 + dlls/kernel32/tests/file.c | 5 ---- dlls/ntdll/directory.c | 1 + 4 files changed, 55 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/file.c b/dlls/kernel32/file.c index 717ae9b..cac1e98 100644 --- a/dlls/kernel32/file.c +++ b/dlls/kernel32/file.c @@ -864,6 +864,59 @@ BOOL WINAPI GetFileInformationByHandle( HANDLE hFile, BY_HANDLE_FILE_INFORMATION /*********************************************************************** +* GetFileInformationByHandleEx (KERNEL32.@) +*/ +BOOL WINAPI GetFileInformationByHandleEx( HANDLE handle, FILE_INFO_BY_HANDLE_CLASS class, + LPVOID info, DWORD size ) +{ + NTSTATUS status; + IO_STATUS_BLOCK io; + + switch (class) + { + case FileBasicInfo: + case FileStandardInfo: + case FileNameInfo: + case FileRenameInfo: + case FileDispositionInfo: + case FileAllocationInfo: + case FileEndOfFileInfo: + case FileStreamInfo: + case FileCompressionInfo: + case FileAttributeTagInfo: + case FileIoPriorityHintInfo: + case FileRemoteProtocolInfo: + case FileFullDirectoryInfo: + case FileFullDirectoryRestartInfo: + case FileStorageInfo: + case FileAlignmentInfo: + case FileIdInfo: + case FileIdExtdDirectoryInfo: + case FileIdExtdDirectoryRestartInfo: + FIXME( "%p, %u, %p, %u\n", handle, class, info, size ); + SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); + return FALSE; + + case FileIdBothDirectoryRestartInfo: + case FileIdBothDirectoryInfo: + status = NtQueryDirectoryFile( handle, NULL, NULL, NULL, &io, info, size, + FileIdBothDirectoryInformation, FALSE, NULL, + (class == FileIdBothDirectoryRestartInfo) ); + if (status != STATUS_SUCCESS) + { + SetLastError( RtlNtStatusToDosError( status ) ); + return FALSE; + } + return TRUE; + + default: + SetLastError( ERROR_INVALID_PARAMETER ); + return FALSE; + } +} + + +/*********************************************************************** * GetFileSize (KERNEL32.@) * * Retrieve the size of a file. diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index f9f8685..57f7aff 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -533,6 +533,7 @@ @ stdcall GetFileAttributesExW(wstr long ptr) @ stdcall GetFileAttributesW(wstr) @ stdcall GetFileInformationByHandle(long ptr) +@ stdcall GetFileInformationByHandleEx(long long ptr long) @ stdcall GetFileSize(long ptr) @ stdcall GetFileSizeEx(long ptr) @ stdcall GetFileTime(long ptr ptr ptr) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 71ad774..41fca60 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -3303,7 +3303,6 @@ static void test_GetFileInformationByHandleEx(void) { SetLastError(0xdeadbeef); ret = pGetFileInformationByHandleEx(directory, checks[i].handleClass, checks[i].ptr, checks[i].size); - todo_wine ok(!ret && GetLastError() == checks[i].errorCode, "GetFileInformationByHandleEx: expected error %u, " "got %u.\n", checks[i].errorCode, GetLastError()); } @@ -3314,18 +3313,14 @@ static void test_GetFileInformationByHandleEx(void) ret = pGetFileInformationByHandleEx(directory, FileIdBothDirectoryInfo, buffer, sizeof(buffer)); if (!ret && GetLastError() == ERROR_NO_MORE_FILES) break; - todo_wine ok(ret, "GetFileInformationByHandleEx: failed to query for FileIdBothDirectoryInfo, got error %u.\n", GetLastError()); if (!ret) break; bothDirInfo = (FILE_ID_BOTH_DIR_INFO *)buffer; while (TRUE) { - todo_wine ok(bothDirInfo->FileAttributes != 0xffffffff, "GetFileInformationByHandleEx: returned invalid file attributes.\n"); - todo_wine ok(bothDirInfo->FileId.u.LowPart != 0xffffffff, "GetFileInformationByHandleEx: returned invalid file id.\n"); - todo_wine ok(bothDirInfo->FileNameLength != 0xffffffff, "GetFileInformationByHandleEx: returned invalid file name length.\n"); if (!bothDirInfo->NextEntryOffset) break; diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index 28b0ab3..cd2ee90 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -2042,6 +2042,7 @@ NTSTATUS WINAPI NtQueryDirectoryFile( HANDLE handle, HANDLE event, case FileIdBothDirectoryInformation: case FileIdFullDirectoryInformation: if (length < dir_info_size( info_class, 1 )) return io->u.Status = STATUS_INFO_LENGTH_MISMATCH; + if (!buffer) return io->u.Status = STATUS_ACCESS_VIOLATION; break; default: FIXME( "Unsupported file info class %d\n", info_class );

1 0

Christian Costa : amstream: Display new ref in AddRef and Release.
by Alexandre Julliard Oct. 12, 2012

Oct. 12, 2012

Module: wine Branch: master Commit: 9bdf98171830ec6ba7b431f20c60dd3605598aed URL: http://source.winehq.org/git/wine.git/?a=commit;h=9bdf98171830ec6ba7b431f20… Author: Christian Costa <titan.costa(a)gmail.com> Date: Fri Oct 12 07:15:50 2012 +0200 amstream: Display new ref in AddRef and Release. --- dlls/amstream/mediastreamfilter.c | 15 ++++++++++----- 1 files changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/amstream/mediastreamfilter.c b/dlls/amstream/mediastreamfilter.c index ee9d970..9d38b72 100644 --- a/dlls/amstream/mediastreamfilter.c +++ b/dlls/amstream/mediastreamfilter.c @@ -133,17 +133,22 @@ static HRESULT WINAPI MediaStreamFilterImpl_QueryInterface(IMediaStreamFilter *i static ULONG WINAPI MediaStreamFilterImpl_AddRef(IMediaStreamFilter *iface) { - return BaseFilterImpl_AddRef((IBaseFilter*)iface); + IMediaStreamFilterImpl *This = impl_from_IMediaStreamFilter(iface); + ULONG ref = BaseFilterImpl_AddRef(&This->filter.IBaseFilter_iface); + + TRACE("(%p)->(): new ref = %u\n", iface, ref); + + return ref; } static ULONG WINAPI MediaStreamFilterImpl_Release(IMediaStreamFilter *iface) { IMediaStreamFilterImpl *This = impl_from_IMediaStreamFilter(iface); - ULONG refCount = BaseFilterImpl_Release((IBaseFilter*)iface); + ULONG ref = BaseFilterImpl_Release(&This->filter.IBaseFilter_iface); - TRACE("(%p)->() Release from %d\n", iface, refCount + 1); + TRACE("(%p)->(): new ref = %u\n", iface, ref); - if (!refCount) + if (!ref) { int i; for (i = 0; i < This->nb_streams; i++) @@ -154,7 +159,7 @@ static ULONG WINAPI MediaStreamFilterImpl_Release(IMediaStreamFilter *iface) HeapFree(GetProcessHeap(), 0, This); } - return refCount; + return ref; } /*** IPersist methods ***/

1 0

Jacek Caban : jscript: Removed SysFreeString calls missed in previous patch .
by Alexandre Julliard Oct. 12, 2012

Oct. 12, 2012

Module: wine Branch: master Commit: ec8a57b6de23fe3a1fab0293e99b3da807cc95a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec8a57b6de23fe3a1fab0293e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 12 11:48:18 2012 +0200 jscript: Removed SysFreeString calls missed in previous patch. --- dlls/jscript/date.c | 9 ++------- 1 files changed, 2 insertions(+), 7 deletions(-) diff --git a/dlls/jscript/date.c b/dlls/jscript/date.c index ebf1454..f192824 100644 --- a/dlls/jscript/date.c +++ b/dlls/jscript/date.c @@ -714,18 +714,13 @@ static inline HRESULT create_utc_string(script_ctx_t *ctx, vdisp_t *jsthis, jsva day = date_from_time(date->time); date_str = jsstr_alloc_buf(len); - if(!date_str) { - SysFreeString(week); - SysFreeString(month); + if(!date_str) return E_OUTOFMEMORY; - } + sprintfW(date_str->str, formatAD?formatADW:formatBCW, week, day, month, year, (int)hour_from_time(date->time), (int)min_from_time(date->time), (int)sec_from_time(date->time)); - SysFreeString(week); - SysFreeString(month); - *r = jsval_string(date_str); } return S_OK;

1 0

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

Oct. 12, 2012

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 Oct. 11, 2012

Oct. 11, 2012

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 Oct. 11, 2012

Oct. 11, 2012

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: Allow multiple input/output modifiers.
by Alexandre Julliard Oct. 11, 2012

Oct. 11, 2012

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

Matteo Bruni : d3dcompiler: Properly support function overloads.
by Alexandre Julliard Oct. 11, 2012

Oct. 11, 2012

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: Add some checks to function definitions.
by Alexandre Julliard Oct. 11, 2012

Oct. 11, 2012

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