June 2015 - Wine-Commits - list.winehq.org

Nikolay Sivov : oledb32/tests: Improve IDataSourceLocator tests a bit.
by Alexandre Julliard June 11, 2015

June 11, 2015

Module: wine Branch: master Commit: ea2387b2a7dc812796d16abb742a210211fc82cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea2387b2a7dc812796d16abb7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jun 10 01:14:45 2015 +0300 oledb32/tests: Improve IDataSourceLocator tests a bit. --- dlls/oledb32/tests/database.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/oledb32/tests/database.c b/dlls/oledb32/tests/database.c index 696ae70..5393a91 100644 --- a/dlls/oledb32/tests/database.c +++ b/dlls/oledb32/tests/database.c @@ -737,10 +737,8 @@ static void test_dslocator(void) { COMPATIBLE_LONG hwnd = 0; - /* Crashes under Window 7 - hr = IDataSourceLocator_get_hWnd(dslocator, NULL); - ok(hr == E_INVALIDARG, "got %08x\n", hr); - */ + if (0) /* Crashes under Window 7 */ + hr = IDataSourceLocator_get_hWnd(dslocator, NULL); hr = IDataSourceLocator_get_hWnd(dslocator, &hwnd); ok(hr == S_OK, "got %08x\n", hr); @@ -755,7 +753,7 @@ static void test_dslocator(void) hr = IDataSourceLocator_put_hWnd(dslocator, hwnd); ok(hr == S_OK, "got %08x\n", hr); - hwnd = 0xDEADBEEF; + hwnd = 0; hr = IDataSourceLocator_get_hWnd(dslocator, &hwnd); ok(hr == S_OK, "got %08x\n", hr); ok(hwnd == 0xDEADBEEF, "got %p\n", (HWND)hwnd);

1 0

Louis Lenders : kernel32/tests: Add tests for GetSystemTimes.
by Alexandre Julliard June 11, 2015

June 11, 2015

Module: wine Branch: master Commit: 305a73bcb5a619079a65292aa814b7a1108aaef0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=305a73bcb5a619079a65292aa… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Sun Jul 27 11:42:28 2014 -0600 kernel32/tests: Add tests for GetSystemTimes. --- dlls/kernel32/tests/time.c | 69 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 69 insertions(+) diff --git a/dlls/kernel32/tests/time.c b/dlls/kernel32/tests/time.c index 0bcde1e..febe366 100644 --- a/dlls/kernel32/tests/time.c +++ b/dlls/kernel32/tests/time.c @@ -22,9 +22,11 @@ #include "wine/test.h" #include "winbase.h" #include "winnls.h" +#include "winternl.h" static BOOL (WINAPI *pTzSpecificLocalTimeToSystemTime)(LPTIME_ZONE_INFORMATION, LPSYSTEMTIME, LPSYSTEMTIME); static BOOL (WINAPI *pSystemTimeToTzSpecificLocalTime)(LPTIME_ZONE_INFORMATION, LPSYSTEMTIME, LPSYSTEMTIME); +static BOOL (WINAPI *pGetSystemTimes)(LPFILETIME, LPFILETIME, LPFILETIME); static int (WINAPI *pGetCalendarInfoA)(LCID,CALID,CALTYPE,LPSTR,int,LPDWORD); static int (WINAPI *pGetCalendarInfoW)(LCID,CALID,CALTYPE,LPWSTR,int,LPDWORD); static DWORD (WINAPI *pGetDynamicTimeZoneInformation)(DYNAMIC_TIME_ZONE_INFORMATION*); @@ -801,11 +803,77 @@ static void test_GetSystemTimePreciseAsFileTime(void) ok(diff < 10000 && diff > 0, "GetSystemTimePreciseAsFileTime incremented by more than 1 ms\n"); } +static void test_GetSystemTimes(void) +{ + + FILETIME idletime, kerneltime, usertime; + int i; + ULARGE_INTEGER ul1, ul2, ul3; + SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION *sppi; + SYSTEM_BASIC_INFORMATION sbi; + ULONG ReturnLength; + ULARGE_INTEGER total_usertime, total_kerneltime, total_idletime; + + if (!pGetSystemTimes) + { + win_skip("GetSystemTimes not available\n"); + return; + } + + todo_wine ok( pGetSystemTimes(NULL, NULL, NULL), "GetSystemTimes failed unexpectedly\n" ); + + total_usertime.QuadPart = 0; + total_kerneltime.QuadPart = 0; + total_idletime.QuadPart = 0; + memset( &idletime, 0x11, sizeof(idletime) ); + memset( &kerneltime, 0x11, sizeof(kerneltime) ); + memset( &usertime, 0x11, sizeof(usertime) ); + todo_wine ok( pGetSystemTimes(&idletime, &kerneltime , &usertime), + "GetSystemTimes failed unexpectedly\n" ); + + ul1.LowPart = idletime.dwLowDateTime; + ul1.HighPart = idletime.dwHighDateTime; + ul2.LowPart = kerneltime.dwLowDateTime; + ul2.HighPart = kerneltime.dwHighDateTime; + ul3.LowPart = usertime.dwLowDateTime; + ul3.HighPart = usertime.dwHighDateTime; + + ok( !NtQuerySystemInformation(SystemBasicInformation, &sbi, sizeof(sbi), &ReturnLength), + "NtQuerySystemInformation failed\n" ); + ok( sizeof(sbi) == ReturnLength, "Inconsistent length %d\n", ReturnLength ); + + /* Check if we have some return values */ + trace( "Number of Processors : %d\n", sbi.NumberOfProcessors ); + ok( sbi.NumberOfProcessors > 0, "Expected more than 0 processors, got %d\n", + sbi.NumberOfProcessors ); + + sppi = HeapAlloc( GetProcessHeap(), 0, + sizeof(SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION) * sbi.NumberOfProcessors); + + ok( !NtQuerySystemInformation( SystemProcessorPerformanceInformation, sppi, + sizeof(*sppi), &ReturnLength), + "NtQuerySystemInformation failed\n" ); + + for (i = 0; i < sbi.NumberOfProcessors; i++) + { + total_usertime.QuadPart += sppi[i].UserTime.QuadPart; + total_kerneltime.QuadPart += sppi[i].KernelTime.QuadPart; + total_idletime.QuadPart += sppi[i].IdleTime.QuadPart; + } + + todo_wine ok( total_idletime.QuadPart - ul1.QuadPart < 10000000, "test idletime failed\n" ); + todo_wine ok( total_kerneltime.QuadPart - ul2.QuadPart < 10000000, "test kerneltime failed\n" ); + todo_wine ok( total_usertime.QuadPart - ul3.QuadPart < 10000000, "test usertime failed\n" ); + + HeapFree(GetProcessHeap(), 0, sppi); +} + START_TEST(time) { HMODULE hKernel = GetModuleHandleA("kernel32"); pTzSpecificLocalTimeToSystemTime = (void *)GetProcAddress(hKernel, "TzSpecificLocalTimeToSystemTime"); pSystemTimeToTzSpecificLocalTime = (void *)GetProcAddress( hKernel, "SystemTimeToTzSpecificLocalTime"); + pGetSystemTimes = (void *)GetProcAddress( hKernel, "GetSystemTimes"); pGetCalendarInfoA = (void *)GetProcAddress(hKernel, "GetCalendarInfoA"); pGetCalendarInfoW = (void *)GetProcAddress(hKernel, "GetCalendarInfoW"); pGetDynamicTimeZoneInformation = (void *)GetProcAddress(hKernel, "GetDynamicTimeZoneInformation"); @@ -817,6 +885,7 @@ START_TEST(time) test_FileTimeToSystemTime(); test_FileTimeToLocalFileTime(); test_TzSpecificLocalTimeToSystemTime(); + test_GetSystemTimes(); test_FileTimeToDosDateTime(); test_GetCalendarInfo(); test_GetDynamicTimeZoneInformation();

1 0

Michael Müller : kernel32: Forward SetFileInformationByHandle FileDispositionInfo class to ntdll.
by Alexandre Julliard June 11, 2015

June 11, 2015

Module: wine Branch: master Commit: 7fe0b56e15a278dbd3a9def388321a2771785576 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7fe0b56e15a278dbd3a9def38… Author: Michael Müller <michael(a)fds-team.de> Date: Wed Jun 10 07:56:32 2015 +0200 kernel32: Forward SetFileInformationByHandle FileDispositionInfo class to ntdll. --- dlls/kernel32/file.c | 13 ++++++++++++- dlls/kernel32/tests/file.c | 16 ++++++++++++++++ 2 files changed, 28 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/file.c b/dlls/kernel32/file.c index 9cdcd8d..bcb21c9 100644 --- a/dlls/kernel32/file.c +++ b/dlls/kernel32/file.c @@ -1046,6 +1046,9 @@ BOOL WINAPI SetEndOfFile( HANDLE hFile ) */ BOOL WINAPI SetFileInformationByHandle( HANDLE file, FILE_INFO_BY_HANDLE_CLASS class, VOID *info, DWORD size ) { + NTSTATUS status; + IO_STATUS_BLOCK io; + TRACE( "%p %u %p %u\n", file, class, info, size ); switch (class) @@ -1053,7 +1056,6 @@ BOOL WINAPI SetFileInformationByHandle( HANDLE file, FILE_INFO_BY_HANDLE_CLASS c case FileBasicInfo: case FileNameInfo: case FileRenameInfo: - case FileDispositionInfo: case FileAllocationInfo: case FileEndOfFileInfo: case FileStreamInfo: @@ -1071,6 +1073,10 @@ BOOL WINAPI SetFileInformationByHandle( HANDLE file, FILE_INFO_BY_HANDLE_CLASS c SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); return FALSE; + case FileDispositionInfo: + status = NtSetInformationFile( file, &io, info, size, FileDispositionInformation ); + break; + case FileStandardInfo: case FileCompressionInfo: case FileAttributeTagInfo: @@ -1080,6 +1086,11 @@ BOOL WINAPI SetFileInformationByHandle( HANDLE file, FILE_INFO_BY_HANDLE_CLASS c return FALSE; } + if (status != STATUS_SUCCESS) + { + SetLastError( RtlNtStatusToDosError( status ) ); + return FALSE; + } return TRUE; } diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index fb4cd9b..53d225c 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -38,6 +38,10 @@ #include "winnls.h" #include "fileapi.h" +#ifdef WINE_NO_UNICODE_MACROS +#undef DeleteFile /* needed for FILE_DISPOSITION_INFO */ +#endif + static HANDLE (WINAPI *pFindFirstFileExA)(LPCSTR,FINDEX_INFO_LEVELS,LPVOID,FINDEX_SEARCH_OPS,LPVOID,DWORD); static BOOL (WINAPI *pReplaceFileA)(LPCSTR, LPCSTR, LPCSTR, DWORD, LPVOID, LPVOID); static BOOL (WINAPI *pReplaceFileW)(LPCWSTR, LPCWSTR, LPCWSTR, DWORD, LPVOID, LPVOID); @@ -4589,6 +4593,7 @@ static void test_SetFileInformationByHandle(void) FILE_REMOTE_PROTOCOL_INFO protinfo = { 0 }; FILE_STANDARD_INFO stdinfo = { }; FILE_COMPRESSION_INFO compressinfo; + FILE_DISPOSITION_INFO dispinfo; char tempFileName[MAX_PATH]; char tempPath[MAX_PATH]; HANDLE file; @@ -4632,6 +4637,17 @@ static void test_SetFileInformationByHandle(void) ret = pSetFileInformationByHandle(file, FileRemoteProtocolInfo, &protinfo, sizeof(protinfo)); ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, "got %d, error %d\n", ret, GetLastError()); + /* test FileDispositionInfo, additional details already covered by ntdll tests */ + SetLastError(0xdeadbeef); + ret = pSetFileInformationByHandle(file, FileDispositionInfo, &dispinfo, 0); +todo_wine + ok(!ret && GetLastError() == ERROR_BAD_LENGTH, "got %d, error %d\n", ret, GetLastError()); + + dispinfo.DeleteFile = TRUE; + ret = pSetFileInformationByHandle(file, FileDispositionInfo, &dispinfo, sizeof(dispinfo)); +todo_wine + ok(ret, "setting FileDispositionInfo failed, error %d\n", GetLastError()); + CloseHandle(file); }

1 0

Michael Stefaniuc : dmstyle: Pass the object instead of the iface to helper functions.
by Alexandre Julliard June 11, 2015

June 11, 2015

Module: wine Branch: master Commit: b8149561ec573109063d233d075e758c9dd71834 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8149561ec573109063d233d0… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jun 10 23:47:41 2015 +0200 dmstyle: Pass the object instead of the iface to helper functions. --- dlls/dmstyle/style.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/dmstyle/style.c b/dlls/dmstyle/style.c index 88f3d52..73a653a 100644 --- a/dlls/dmstyle/style.c +++ b/dlls/dmstyle/style.c @@ -706,9 +706,9 @@ static HRESULT parse_part_list(DMUS_PRIVATE_CHUNK *pChunk, IStream *pStm) return S_OK; } -static HRESULT IDirectMusicStyle8Impl_IPersistStream_ParsePatternList (LPPERSISTSTREAM iface, DMUS_PRIVATE_CHUNK* pChunk, IStream* pStm) { - - ICOM_THIS_MULTI(IDirectMusicStyle8Impl, PersistStreamVtbl, iface); +static HRESULT parse_pattern_list(IDirectMusicStyle8Impl *This, DMUS_PRIVATE_CHUNK *pChunk, + IStream *pStm) +{ HRESULT hr = E_FAIL; DMUS_PRIVATE_CHUNK Chunk; DWORD ListSize[3], ListCount[3]; @@ -871,9 +871,9 @@ static HRESULT IDirectMusicStyle8Impl_IPersistStream_ParsePatternList (LPPERSIST return S_OK; } -static HRESULT IDirectMusicStyle8Impl_IPersistStream_ParseStyleForm (LPPERSISTSTREAM iface, DMUS_PRIVATE_CHUNK* pChunk, IStream* pStm) { - ICOM_THIS_MULTI(IDirectMusicStyle8Impl, PersistStreamVtbl, iface); - +static HRESULT parse_style_form(IDirectMusicStyle8Impl *This, DMUS_PRIVATE_CHUNK *pChunk, + IStream *pStm) +{ HRESULT hr = E_FAIL; DMUS_PRIVATE_CHUNK Chunk; DWORD StreamSize, StreamCount, ListSize[3], ListCount[3]; @@ -998,7 +998,7 @@ static HRESULT IDirectMusicStyle8Impl_IPersistStream_ParseStyleForm (LPPERSISTST } case DMUS_FOURCC_PATTERN_LIST: { TRACE_(dmfile)(": PATTERN list\n"); - hr = IDirectMusicStyle8Impl_IPersistStream_ParsePatternList (iface, &Chunk, pStm); + hr = parse_pattern_list(This, &Chunk, pStm); if (FAILED(hr)) return hr; break; } @@ -1043,7 +1043,7 @@ static HRESULT WINAPI IDirectMusicStyle8Impl_IPersistStream_Load (LPPERSISTSTREA switch (Chunk.fccID) { case DMUS_FOURCC_STYLE_FORM: { TRACE_(dmfile)(": Style form\n"); - hr = IDirectMusicStyle8Impl_IPersistStream_ParseStyleForm (iface, &Chunk, pStm); + hr = parse_style_form(This, &Chunk, pStm); if (FAILED(hr)) return hr; break; }

1 0

Michael Stefaniuc : dmstyle: Remove unused arguments from helper functions.
by Alexandre Julliard June 11, 2015

June 11, 2015

Module: wine Branch: master Commit: 774aad743cfe1c7f6a4c38b9a384fc35006d3d9c URL: http://source.winehq.org/git/wine.git/?a=commit;h=774aad743cfe1c7f6a4c38b9a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jun 10 23:46:30 2015 +0200 dmstyle: Remove unused arguments from helper functions. --- dlls/dmstyle/style.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/dmstyle/style.c b/dlls/dmstyle/style.c index ed40791..88f3d52 100644 --- a/dlls/dmstyle/style.c +++ b/dlls/dmstyle/style.c @@ -452,8 +452,8 @@ static HRESULT WINAPI IDirectMusicStyle8Impl_IPersistStream_IsDirty (LPPERSISTST return S_FALSE; } -static HRESULT IDirectMusicStyle8Impl_IPersistStream_LoadBand (LPPERSISTSTREAM iface, IStream* pClonedStream, IDirectMusicBand** ppBand) { - +static HRESULT load_band(IStream *pClonedStream, IDirectMusicBand **ppBand) +{ HRESULT hr = E_FAIL; IPersistStream* pPersistStream = NULL; @@ -481,8 +481,9 @@ static HRESULT IDirectMusicStyle8Impl_IPersistStream_LoadBand (LPPERSISTSTREAM i return S_OK; } -static HRESULT IDirectMusicStyle8Impl_IPersistStream_ParsePartRefList (LPPERSISTSTREAM iface, DMUS_PRIVATE_CHUNK* pChunk, IStream* pStm, LPDMUS_PRIVATE_STYLE_MOTIF pNewMotif) { - /*ICOM_THIS_MULTI(IDirectMusicStyle8Impl, PersistStreamVtbl, iface);*/ +static HRESULT parse_part_ref_list(DMUS_PRIVATE_CHUNK *pChunk, IStream *pStm, + DMUS_PRIVATE_STYLE_MOTIF *pNewMotif) +{ HRESULT hr = E_FAIL; DMUS_PRIVATE_CHUNK Chunk; DWORD ListSize[3], ListCount[3]; @@ -573,9 +574,8 @@ static HRESULT IDirectMusicStyle8Impl_IPersistStream_ParsePartRefList (LPPERSIST return S_OK; } -static HRESULT IDirectMusicStyle8Impl_IPersistStream_ParsePartList (LPPERSISTSTREAM iface, DMUS_PRIVATE_CHUNK* pChunk, IStream* pStm) { - - /*ICOM_THIS_MULTI(IDirectMusicStyle8Impl, PersistStreamVtbl, iface);*/ +static HRESULT parse_part_list(DMUS_PRIVATE_CHUNK *pChunk, IStream *pStm) +{ HRESULT hr = E_FAIL; DMUS_PRIVATE_CHUNK Chunk; DWORD ListSize[3], ListCount[3]; @@ -785,8 +785,8 @@ static HRESULT IDirectMusicStyle8Impl_IPersistStream_ParsePatternList (LPPERSIST liMove.QuadPart = 0; liMove.QuadPart -= sizeof(FOURCC) + (sizeof(FOURCC)+sizeof(DWORD)); IStream_Seek (pClonedStream, liMove, STREAM_SEEK_CUR, NULL); - - hr = IDirectMusicStyle8Impl_IPersistStream_LoadBand (iface, pClonedStream, &pBand); + + hr = load_band(pClonedStream, &pBand); if (FAILED(hr)) { ERR(": could not load track\n"); return hr; @@ -845,7 +845,7 @@ static HRESULT IDirectMusicStyle8Impl_IPersistStream_ParsePatternList (LPPERSIST } case DMUS_FOURCC_PARTREF_LIST: { TRACE_(dmfile)(": PartRef list\n"); - hr = IDirectMusicStyle8Impl_IPersistStream_ParsePartRefList (iface, &Chunk, pStm, pNewMotif); + hr = parse_part_ref_list(&Chunk, pStm, pNewMotif); if (FAILED(hr)) return hr; break; } @@ -926,8 +926,8 @@ static HRESULT IDirectMusicStyle8Impl_IPersistStream_ParseStyleForm (LPPERSISTST liMove.QuadPart = 0; liMove.QuadPart -= sizeof(FOURCC) + (sizeof(FOURCC)+sizeof(DWORD)); IStream_Seek (pClonedStream, liMove, STREAM_SEEK_CUR, NULL); - - hr = IDirectMusicStyle8Impl_IPersistStream_LoadBand (iface, pClonedStream, &pBand); + + hr = load_band(pClonedStream, &pBand); if (FAILED(hr)) { ERR(": could not load track\n"); return hr; @@ -992,7 +992,7 @@ static HRESULT IDirectMusicStyle8Impl_IPersistStream_ParseStyleForm (LPPERSISTST } case DMUS_FOURCC_PART_LIST: { TRACE_(dmfile)(": PART list\n"); - hr = IDirectMusicStyle8Impl_IPersistStream_ParsePartList (iface, &Chunk, pStm); + hr = parse_part_list(&Chunk, pStm); if (FAILED(hr)) return hr; break; }

1 0

Piotr Caban : msvcrt: Don' t use MSVCRT_fdend in msvcrt_create_io_inherit_block.
by Alexandre Julliard June 11, 2015

June 11, 2015

Module: wine Branch: master Commit: e7fc237088552965169dbd573b8dd895bac1d82a URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7fc237088552965169dbd573… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jun 10 17:48:33 2015 +0200 msvcrt: Don't use MSVCRT_fdend in msvcrt_create_io_inherit_block. --- dlls/msvcrt/file.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 161219b..36887fc 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -548,12 +548,17 @@ static int msvcrt_init_fp(MSVCRT_FILE* file, int fd, unsigned stream_flags) */ unsigned msvcrt_create_io_inherit_block(WORD *size, BYTE **block) { - int fd; + int fd, last_fd; char* wxflag_ptr; HANDLE* handle_ptr; ioinfo* fdinfo; - *size = sizeof(unsigned) + (sizeof(char) + sizeof(HANDLE)) * MSVCRT_fdend; + for (last_fd=MSVCRT_MAX_FILES-1; last_fd>=0; last_fd--) + if (get_ioinfo_nolock(last_fd)->handle != INVALID_HANDLE_VALUE) + break; + last_fd++; + + *size = sizeof(unsigned) + (sizeof(char) + sizeof(HANDLE)) * last_fd; *block = MSVCRT_calloc(*size, 1); if (!*block) { @@ -561,10 +566,10 @@ unsigned msvcrt_create_io_inherit_block(WORD *size, BYTE **block) return FALSE; } wxflag_ptr = (char*)*block + sizeof(unsigned); - handle_ptr = (HANDLE*)(wxflag_ptr + MSVCRT_fdend * sizeof(char)); + handle_ptr = (HANDLE*)(wxflag_ptr + last_fd); - *(unsigned*)*block = MSVCRT_fdend; - for (fd = 0; fd < MSVCRT_fdend; fd++) + *(unsigned*)*block = last_fd; + for (fd = 0; fd < last_fd; fd++) { /* to be inherited, we need it to be open, and that DONTINHERIT isn't set */ fdinfo = get_ioinfo(fd);

1 0

Piotr Caban : msvcrt: Fix possible deadlock in dup2 function.
by Alexandre Julliard June 11, 2015

June 11, 2015

Module: wine Branch: master Commit: 417b60568778e8916066c1de76ef73a977171d7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=417b60568778e8916066c1de7… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jun 10 17:48:23 2015 +0200 msvcrt: Fix possible deadlock in dup2 function. --- dlls/msvcrt/file.c | 231 +++++++++++++++++++++++++++++++++++------------------ 1 file changed, 154 insertions(+), 77 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 0d4a6f4..161219b 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -274,6 +274,106 @@ static inline ioinfo* get_ioinfo(int fd) return ret; } +static inline BOOL alloc_pioinfo_block(int fd) +{ + ioinfo *block; + int i; + + if(fd<0 || fd>=MSVCRT_MAX_FILES) + { + *MSVCRT__errno() = MSVCRT_ENFILE; + return FALSE; + } + + block = MSVCRT_calloc(MSVCRT_FD_BLOCK_SIZE, sizeof(ioinfo)); + if(!block) + { + WARN(":out of memory!\n"); + *MSVCRT__errno() = MSVCRT_ENOMEM; + return FALSE; + } + for(i=0; i<MSVCRT_FD_BLOCK_SIZE; i++) + block[i].handle = INVALID_HANDLE_VALUE; + if(InterlockedCompareExchangePointer((void**)&MSVCRT___pioinfo[fd/MSVCRT_FD_BLOCK_SIZE], block, NULL)) + MSVCRT_free(block); + return TRUE; +} + +static inline ioinfo* get_ioinfo_alloc_fd(int fd) +{ + ioinfo *ret, *info; + + ret = get_ioinfo(fd); + if(ret != &MSVCRT___badioinfo) + { + LOCK_FILES(); + /* locate next free slot */ + if (fd == MSVCRT_fdstart && fd == MSVCRT_fdend) + MSVCRT_fdstart = MSVCRT_fdend + 1; + else if (fd == MSVCRT_fdstart) + { + MSVCRT_fdstart++; + while (MSVCRT_fdstart < MSVCRT_fdend && + ((info = get_ioinfo_nolock(MSVCRT_fdstart))->exflag & EF_CRIT_INIT)) + { + if (TryEnterCriticalSection(&info->crit)) + { + if (info->handle == INVALID_HANDLE_VALUE) + { + LeaveCriticalSection(&info->crit); + break; + } + LeaveCriticalSection(&info->crit); + } + MSVCRT_fdstart++; + } + } + /* update last fd in use */ + if (fd >= MSVCRT_fdend) + MSVCRT_fdend = fd + 1; + TRACE("fdstart is %d, fdend is %d\n", MSVCRT_fdstart, MSVCRT_fdend); + UNLOCK_FILES(); + return ret; + } + + if(!alloc_pioinfo_block(fd)) + return &MSVCRT___badioinfo; + + ret = get_ioinfo(fd); + if(ret == &MSVCRT___badioinfo) + return ret; + + LOCK_FILES(); + /* locate next free slot */ + if (fd == MSVCRT_fdstart && fd == MSVCRT_fdend) + MSVCRT_fdstart = MSVCRT_fdend + 1; + else if (fd == MSVCRT_fdstart) + { + MSVCRT_fdstart++; + while (MSVCRT_fdstart < MSVCRT_fdend && + ((info = get_ioinfo_nolock(MSVCRT_fdstart))->exflag & EF_CRIT_INIT)) + { + if (TryEnterCriticalSection(&info->crit)) + { + if (info->handle == INVALID_HANDLE_VALUE) + { + LeaveCriticalSection(&info->crit); + break; + } + LeaveCriticalSection(&info->crit); + } + MSVCRT_fdstart++; + } + } + /* update last fd in use */ + if (fd >= MSVCRT_fdend) + MSVCRT_fdend = fd + 1; + TRACE("fdstart is %d, fdend is %d\n", MSVCRT_fdstart, MSVCRT_fdend); + UNLOCK_FILES(); + + return ret; +} + static inline void release_ioinfo(ioinfo *info) { if(info!=&MSVCRT___badioinfo && info->exflag & EF_CRIT_INIT) @@ -343,77 +443,49 @@ static void msvcrt_free_fd(int fd) UNLOCK_FILES(); } -/* INTERNAL: Allocate an fd slot from a Win32 HANDLE, starting from fd */ -/* caller must hold the files lock */ -static int msvcrt_set_fd(HANDLE hand, int flag, int fd) +static void msvcrt_set_fd(ioinfo *fdinfo, HANDLE hand, int flag) { - ioinfo *fdinfo; - - if (fd >= MSVCRT_MAX_FILES) - { - WARN(":files exhausted!\n"); - *MSVCRT__errno() = MSVCRT_ENFILE; - return -1; - } - - fdinfo = get_ioinfo_nolock(fd); - if(fdinfo == &MSVCRT___badioinfo) { - int i; - - MSVCRT___pioinfo[fd/MSVCRT_FD_BLOCK_SIZE] = MSVCRT_calloc(MSVCRT_FD_BLOCK_SIZE, sizeof(ioinfo)); - if(!MSVCRT___pioinfo[fd/MSVCRT_FD_BLOCK_SIZE]) { - WARN(":out of memory!\n"); - *MSVCRT__errno() = MSVCRT_ENOMEM; - return -1; - } - - for(i=0; i<MSVCRT_FD_BLOCK_SIZE; i++) - MSVCRT___pioinfo[fd/MSVCRT_FD_BLOCK_SIZE][i].handle = INVALID_HANDLE_VALUE; - - fdinfo = get_ioinfo_nolock(fd); - } - fdinfo->handle = hand; fdinfo->wxflag = WX_OPEN | (flag & (WX_DONTINHERIT | WX_APPEND | WX_TEXT | WX_PIPE | WX_TTY)); fdinfo->lookahead[0] = '\n'; fdinfo->lookahead[1] = '\n'; fdinfo->lookahead[2] = '\n'; - if(!(fdinfo->exflag & EF_CRIT_INIT)) - InitializeCriticalSection(&fdinfo->crit); - fdinfo->exflag = EF_CRIT_INIT; + fdinfo->exflag &= EF_CRIT_INIT; - /* locate next free slot */ - if (fd == MSVCRT_fdstart && fd == MSVCRT_fdend) - MSVCRT_fdstart = MSVCRT_fdend + 1; - else - while (MSVCRT_fdstart < MSVCRT_fdend && - get_ioinfo_nolock(MSVCRT_fdstart)->handle != INVALID_HANDLE_VALUE) - MSVCRT_fdstart++; - /* update last fd in use */ - if (fd >= MSVCRT_fdend) - MSVCRT_fdend = fd + 1; - TRACE("fdstart is %d, fdend is %d\n", MSVCRT_fdstart, MSVCRT_fdend); - - switch (fd) + switch (fdinfo-MSVCRT___pioinfo[0]) { case 0: SetStdHandle(STD_INPUT_HANDLE, hand); break; case 1: SetStdHandle(STD_OUTPUT_HANDLE, hand); break; case 2: SetStdHandle(STD_ERROR_HANDLE, hand); break; } - - return fd; } /* INTERNAL: Allocate an fd slot from a Win32 HANDLE */ static int msvcrt_alloc_fd(HANDLE hand, int flag) { - int ret; + ioinfo *info; + int fd; - LOCK_FILES(); - TRACE(":handle (%p) allocating fd (%d)\n",hand,MSVCRT_fdstart); - ret = msvcrt_set_fd(hand, flag, MSVCRT_fdstart); - UNLOCK_FILES(); - return ret; + LOCK_FILES(); + fd = MSVCRT_fdstart; + TRACE(":handle (%p) allocating fd (%d)\n", hand, fd); + + if (fd >= MSVCRT_MAX_FILES) + { + UNLOCK_FILES(); + WARN(":files exhausted!\n"); + *MSVCRT__errno() = MSVCRT_ENFILE; + return -1; + } + + info = get_ioinfo_alloc_fd(fd); + UNLOCK_FILES(); + if(info == &MSVCRT___badioinfo) + return -1; + + msvcrt_set_fd(info, hand, flag); + release_ioinfo(info); + return fd; } /* INTERNAL: Allocate a FILE* for an fd slot */ @@ -537,7 +609,12 @@ void msvcrt_init_io(void) for (i = 0; i < count; i++) { if ((*wxflag_ptr & WX_OPEN) && *handle_ptr != INVALID_HANDLE_VALUE) - msvcrt_set_fd(*handle_ptr, *wxflag_ptr, i); + { + fdinfo = get_ioinfo_alloc_fd(i); + if(fdinfo != &MSVCRT___badioinfo) + msvcrt_set_fd(fdinfo, *handle_ptr, *wxflag_ptr); + release_ioinfo(fdinfo); + } wxflag_ptr++; handle_ptr++; } @@ -546,32 +623,35 @@ void msvcrt_init_io(void) if (get_ioinfo_nolock(MSVCRT_fdstart)->handle == INVALID_HANDLE_VALUE) break; } - fdinfo = get_ioinfo_nolock(MSVCRT_STDIN_FILENO); + fdinfo = get_ioinfo_alloc_fd(MSVCRT_STDIN_FILENO); if (!(fdinfo->wxflag & WX_OPEN) || fdinfo->handle == INVALID_HANDLE_VALUE) { HANDLE h = GetStdHandle(STD_INPUT_HANDLE); DWORD type = GetFileType(h); - msvcrt_set_fd(h, WX_OPEN|WX_TEXT|((type&0xf)==FILE_TYPE_CHAR ? WX_TTY : 0) - |((type&0xf)==FILE_TYPE_PIPE ? WX_PIPE : 0), MSVCRT_STDIN_FILENO); + msvcrt_set_fd(fdinfo, h, WX_OPEN|WX_TEXT|((type&0xf)==FILE_TYPE_CHAR ? WX_TTY : 0) + |((type&0xf)==FILE_TYPE_PIPE ? WX_PIPE : 0)); } + release_ioinfo(fdinfo); - fdinfo = get_ioinfo_nolock(MSVCRT_STDOUT_FILENO); + fdinfo = get_ioinfo_alloc_fd(MSVCRT_STDOUT_FILENO); if (!(fdinfo->wxflag & WX_OPEN) || fdinfo->handle == INVALID_HANDLE_VALUE) { HANDLE h = GetStdHandle(STD_OUTPUT_HANDLE); DWORD type = GetFileType(h); - msvcrt_set_fd(h, WX_OPEN|WX_TEXT|((type&0xf)==FILE_TYPE_CHAR ? WX_TTY : 0) - |((type&0xf)==FILE_TYPE_PIPE ? WX_PIPE : 0), MSVCRT_STDOUT_FILENO); + msvcrt_set_fd(fdinfo, h, WX_OPEN|WX_TEXT|((type&0xf)==FILE_TYPE_CHAR ? WX_TTY : 0) + |((type&0xf)==FILE_TYPE_PIPE ? WX_PIPE : 0)); } + release_ioinfo(fdinfo); - fdinfo = get_ioinfo_nolock(MSVCRT_STDERR_FILENO); + fdinfo = get_ioinfo_alloc_fd(MSVCRT_STDERR_FILENO); if (!(fdinfo->wxflag & WX_OPEN) || fdinfo->handle == INVALID_HANDLE_VALUE) { HANDLE h = GetStdHandle(STD_ERROR_HANDLE); DWORD type = GetFileType(h); - msvcrt_set_fd(h, WX_OPEN|WX_TEXT|((type&0xf)==FILE_TYPE_CHAR ? WX_TTY : 0) - |((type&0xf)==FILE_TYPE_PIPE ? WX_PIPE : 0), MSVCRT_STDERR_FILENO); + msvcrt_set_fd(fdinfo, h, WX_OPEN|WX_TEXT|((type&0xf)==FILE_TYPE_CHAR ? WX_TTY : 0) + |((type&0xf)==FILE_TYPE_PIPE ? WX_PIPE : 0)); } + release_ioinfo(fdinfo); TRACE(":handles (%p)(%p)(%p)\n", get_ioinfo_nolock(MSVCRT_STDIN_FILENO)->handle, get_ioinfo_nolock(MSVCRT_STDOUT_FILENO)->handle, @@ -1010,15 +1090,19 @@ int CDECL MSVCRT__dup2(int od, int nd) if (od < nd) { info_od = get_ioinfo(od); - info_nd = get_ioinfo(nd); + info_nd = get_ioinfo_alloc_fd(nd); } else { - info_nd = get_ioinfo(nd); + info_nd = get_ioinfo_alloc_fd(nd); info_od = get_ioinfo(od); } - if (nd < MSVCRT_MAX_FILES && nd >= 0 && (info_od->wxflag & WX_OPEN)) + if (info_nd == &MSVCRT___badioinfo) + { + ret = -1; + } + else if (info_od->wxflag & WX_OPEN) { HANDLE handle; @@ -1029,17 +1113,10 @@ int CDECL MSVCRT__dup2(int od, int nd) if (info_nd->wxflag & WX_OPEN) MSVCRT__close(nd); - ret = msvcrt_set_fd(handle, wxflag, nd); - if (ret == -1) - { - CloseHandle(handle); - *MSVCRT__errno() = MSVCRT_EMFILE; - } - else - { - /* _dup2 returns 0, not nd, on success */ - ret = 0; - } + + msvcrt_set_fd(info_nd, handle, wxflag); + /* _dup2 returns 0, not nd, on success */ + ret = 0; } else {

1 0

Michael Müller : kernel32: Improve stub for SetFileInformationByHandle.
by Alexandre Julliard June 11, 2015

June 11, 2015

Module: wine Branch: master Commit: fd8fae105b68a2af131b070adea0bfcaf582ace3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd8fae105b68a2af131b070ad… Author: Michael Müller <michael(a)fds-team.de> Date: Thu Feb 26 06:08:58 2015 +0100 kernel32: Improve stub for SetFileInformationByHandle. --- dlls/kernel32/file.c | 42 ++++++++++++++++++++++++++++++++++++++++-- dlls/kernel32/tests/file.c | 4 ---- include/winbase.h | 1 + 3 files changed, 41 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/file.c b/dlls/kernel32/file.c index 0b208a5..9cdcd8d 100644 --- a/dlls/kernel32/file.c +++ b/dlls/kernel32/file.c @@ -1040,12 +1040,50 @@ BOOL WINAPI SetEndOfFile( HANDLE hFile ) return FALSE; } + +/*********************************************************************** + * SetFileInformationByHandle (KERNEL32.@) + */ BOOL WINAPI SetFileInformationByHandle( HANDLE file, FILE_INFO_BY_HANDLE_CLASS class, VOID *info, DWORD size ) { - FIXME("%p %u %p %u - stub\n", file, class, info, size); - return FALSE; + TRACE( "%p %u %p %u\n", file, class, info, size ); + + switch (class) + { + case FileBasicInfo: + case FileNameInfo: + case FileRenameInfo: + case FileDispositionInfo: + case FileAllocationInfo: + case FileEndOfFileInfo: + case FileStreamInfo: + case FileIdBothDirectoryInfo: + case FileIdBothDirectoryRestartInfo: + case FileIoPriorityHintInfo: + case FileFullDirectoryInfo: + case FileFullDirectoryRestartInfo: + case FileStorageInfo: + case FileAlignmentInfo: + case FileIdInfo: + case FileIdExtdDirectoryInfo: + case FileIdExtdDirectoryRestartInfo: + FIXME( "%p, %u, %p, %u\n", file, class, info, size ); + SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); + return FALSE; + + case FileStandardInfo: + case FileCompressionInfo: + case FileAttributeTagInfo: + case FileRemoteProtocolInfo: + default: + SetLastError( ERROR_INVALID_PARAMETER ); + return FALSE; + } + + return TRUE; } + /*********************************************************************** * SetFilePointer (KERNEL32.@) */ diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 384dd8d..fb4cd9b 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -4614,18 +4614,15 @@ static void test_SetFileInformationByHandle(void) /* invalid classes */ SetLastError(0xdeadbeef); ret = pSetFileInformationByHandle(file, FileStandardInfo, &stdinfo, sizeof(stdinfo)); -todo_wine ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, "got %d, error %d\n", ret, GetLastError()); memset(&compressinfo, 0, sizeof(compressinfo)); SetLastError(0xdeadbeef); ret = pSetFileInformationByHandle(file, FileCompressionInfo, &compressinfo, sizeof(compressinfo)); -todo_wine ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, "got %d, error %d\n", ret, GetLastError()); SetLastError(0xdeadbeef); ret = pSetFileInformationByHandle(file, FileAttributeTagInfo, &fileattrinfo, sizeof(fileattrinfo)); -todo_wine ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, "got %d, error %d\n", ret, GetLastError()); memset(&protinfo, 0, sizeof(protinfo)); @@ -4633,7 +4630,6 @@ todo_wine protinfo.StructureSize = sizeof(protinfo); SetLastError(0xdeadbeef); ret = pSetFileInformationByHandle(file, FileRemoteProtocolInfo, &protinfo, sizeof(protinfo)); -todo_wine ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, "got %d, error %d\n", ret, GetLastError()); CloseHandle(file); diff --git a/include/winbase.h b/include/winbase.h index c558b21..e20a675 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -2460,6 +2460,7 @@ WINBASEAPI VOID WINAPI SetFileApisToOEM(void); WINBASEAPI BOOL WINAPI SetFileAttributesA(LPCSTR,DWORD); WINBASEAPI BOOL WINAPI SetFileAttributesW(LPCWSTR,DWORD); #define SetFileAttributes WINELIB_NAME_AW(SetFileAttributes) +WINBASEAPI BOOL WINAPI SetFileInformationByHandle(HANDLE,FILE_INFO_BY_HANDLE_CLASS,LPVOID,DWORD); WINBASEAPI DWORD WINAPI SetFilePointer(HANDLE,LONG,LPLONG,DWORD); WINBASEAPI BOOL WINAPI SetFilePointerEx(HANDLE,LARGE_INTEGER,LARGE_INTEGER*,DWORD); WINADVAPI BOOL WINAPI SetFileSecurityA(LPCSTR,SECURITY_INFORMATION,PSECURITY_DESCRIPTOR);

1 0

Zhenbo Li : mshtml: Implement IHTMLXMLHttpRequest as a stub.
by Alexandre Julliard June 11, 2015

June 11, 2015

Module: wine Branch: master Commit: 82d090dd6d7127fa8972bd78f863109e40d14694 URL: http://source.winehq.org/git/wine.git/?a=commit;h=82d090dd6d7127fa8972bd78f… Author: Zhenbo Li <litimetal(a)gmail.com> Date: Thu Jun 11 11:38:53 2015 +0800 mshtml: Implement IHTMLXMLHttpRequest as a stub. --- dlls/mshtml/mshtml_private.h | 2 + dlls/mshtml/tests/dom.c | 8 ++ dlls/mshtml/xmlhttprequest.c | 244 ++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 252 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=82d090dd6d7127fa8972b…

1 0

Bruno Jesus : dmstyle: Don' t fake success on IDirectMusicUtils_IPersistStream_ParseReference.
by Alexandre Julliard June 11, 2015

June 11, 2015

Module: wine Branch: master Commit: 45f14218f7b04088192e4dbb4d7550b06e4935ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=45f14218f7b04088192e4dbb4… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Wed Jun 10 20:23:35 2015 -0300 dmstyle: Don't fake success on IDirectMusicUtils_IPersistStream_ParseReference. --- dlls/dmstyle/dmutils.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dmstyle/dmutils.c b/dlls/dmstyle/dmutils.c index 5008134..e551410 100644 --- a/dlls/dmstyle/dmutils.c +++ b/dlls/dmstyle/dmutils.c @@ -213,7 +213,7 @@ HRESULT IDirectMusicUtils_IPersistStream_ParseReference (LPPERSISTSTREAM iface, } TRACE("** DM Reference End of Load ***\n"); - return S_OK; + return hr; } /* FOURCC to string conversion for debug messages */

1 0