wine-commits March 2008

wine-commits@winehq.org

4 participants
1001 discussions

Rob Shearman : wininet: If we receive an error from InitializeSecurityContext in HTTP_DoAuthorization then set pAuthInfo- >finished so that we don't carry on using the security context.
by Alexandre Julliard 15 Mar '08

15 Mar '08

Module: wine Branch: master Commit: db5745c0016d0898e0adc7df40164098b4fb4387 URL: http://source.winehq.org/git/wine.git/?a=commit;h=db5745c0016d0898e0adc7df4… Author: Rob Shearman <rob(a)codeweavers.com> Date: Fri Mar 14 18:09:20 2008 +0000 wininet: If we receive an error from InitializeSecurityContext in HTTP_DoAuthorization then set pAuthInfo->finished so that we don't carry on using the security context. --- dlls/wininet/http.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index f2fa994..d02217a 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -599,6 +599,7 @@ static BOOL HTTP_DoAuthorization( LPWININETHTTPREQW lpwhr, LPCWSTR pszAuthValue, else { ERR("InitializeSecurityContextW returned error 0x%08x\n", sec_status); + pAuthInfo->finished = TRUE; HeapFree(GetProcessHeap(), 0, out.pvBuffer); return FALSE; }

1 0

Rob Shearman : wininet: Assume that if we're connected to an HTTP/1. 1 server then connections can be kept alive by default.
by Alexandre Julliard 15 Mar '08

15 Mar '08

Module: wine Branch: master Commit: e74514b1383c099fec95086b07ad1eb89028485a URL: http://source.winehq.org/git/wine.git/?a=commit;h=e74514b1383c099fec95086b0… Author: Rob Shearman <rob(a)codeweavers.com> Date: Fri Mar 14 18:10:08 2008 +0000 wininet: Assume that if we're connected to an HTTP/1.1 server then connections can be kept alive by default. So don't close the connection in this case in HTTP_FinishedReading. --- dlls/wininet/http.c | 19 ++++++++++++++----- 1 files changed, 14 insertions(+), 5 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index da5d2da..f2fa994 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -3864,16 +3864,25 @@ static BOOL HTTP_ProcessHeader(LPWININETHTTPREQW lpwhr, LPCWSTR field, LPCWSTR v */ BOOL HTTP_FinishedReading(LPWININETHTTPREQW lpwhr) { - WCHAR szConnectionResponse[20]; - DWORD dwBufferSize = sizeof(szConnectionResponse); + WCHAR szVersion[10]; + DWORD dwBufferSize = sizeof(szVersion); TRACE("\n"); - if (!HTTP_HttpQueryInfoW(lpwhr, HTTP_QUERY_CONNECTION, szConnectionResponse, + /* as per RFC 2068, S8.1.2.1, if the client is HTTP/1.1 then assume that + * the connection is keep-alive by default */ + if (!HTTP_HttpQueryInfoW(lpwhr, HTTP_QUERY_VERSION, szVersion, &dwBufferSize, NULL) || - strcmpiW(szConnectionResponse, szKeepAlive)) + strcmpiW(szVersion, g_szHttp1_1)) { - HTTPREQ_CloseConnection(&lpwhr->hdr); + WCHAR szConnectionResponse[20]; + dwBufferSize = sizeof(szConnectionResponse); + if (!HTTP_HttpQueryInfoW(lpwhr, HTTP_QUERY_CONNECTION, szConnectionResponse, + &dwBufferSize, NULL) || + strcmpiW(szConnectionResponse, szKeepAlive)) + { + HTTPREQ_CloseConnection(&lpwhr->hdr); + } } /* FIXME: store data in the URL cache here */

1 0

Rob Shearman : oleaut32: Fix the return type of TLB_ReadTypeLib.
by Alexandre Julliard 15 Mar '08

15 Mar '08

Module: wine Branch: master Commit: a35dfc451058bacf433a570c7e7e857157f150dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=a35dfc451058bacf433a570c7… Author: Rob Shearman <rob(a)codeweavers.com> Date: Fri Mar 14 18:08:57 2008 +0000 oleaut32: Fix the return type of TLB_ReadTypeLib. --- dlls/oleaut32/typelib.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 70f8a0d..59b4d96 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -237,7 +237,7 @@ static WCHAR *get_lcid_subkey( LCID lcid, SYSKIND syskind, WCHAR *buffer ) return buffer; } -static int TLB_ReadTypeLib(LPCWSTR pszFileName, LPWSTR pszPath, UINT cchPath, ITypeLib2 **ppTypeLib); +static HRESULT TLB_ReadTypeLib(LPCWSTR pszFileName, LPWSTR pszPath, UINT cchPath, ITypeLib2 **ppTypeLib); /**************************************************************************** @@ -2407,7 +2407,7 @@ static HRESULT TLB_Mapping_Open(LPCWSTR path, LPVOID *ppBase, DWORD *pdwTLBLengt */ #define MSFT_SIGNATURE 0x5446534D /* "MSFT" */ #define SLTG_SIGNATURE 0x47544c53 /* "SLTG" */ -static int TLB_ReadTypeLib(LPCWSTR pszFileName, LPWSTR pszPath, UINT cchPath, ITypeLib2 **ppTypeLib) +static HRESULT TLB_ReadTypeLib(LPCWSTR pszFileName, LPWSTR pszPath, UINT cchPath, ITypeLib2 **ppTypeLib) { ITypeLibImpl *entry; HRESULT ret;

1 0

Rob Shearman : ole32: CreatePointerMoniker is implemented.
by Alexandre Julliard 15 Mar '08

15 Mar '08

Module: wine Branch: master Commit: 0b168e66f681bc7a6d9f507e8cc1c3cdd4134de1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b168e66f681bc7a6d9f507e8… Author: Rob Shearman <rob(a)codeweavers.com> Date: Fri Mar 14 18:08:28 2008 +0000 ole32: CreatePointerMoniker is implemented. --- dlls/ole32/pointermoniker.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/pointermoniker.c b/dlls/ole32/pointermoniker.c index 3944f07..859bb9e 100644 --- a/dlls/ole32/pointermoniker.c +++ b/dlls/ole32/pointermoniker.c @@ -567,7 +567,7 @@ HRESULT WINAPI CreatePointerMoniker(LPUNKNOWN punk, LPMONIKER *ppmk) { PointerMonikerImpl *This; - FIXME("(%p, %p): stub\n", punk, ppmk); + TRACE("(%p, %p)\n", punk, ppmk); if (!ppmk) return E_INVALIDARG;

1 0

Maarten Lankhorst : quartz: Fix IFilterGraph RemoveFilter to stop the filter before removing it.
by Alexandre Julliard 15 Mar '08

15 Mar '08

Module: wine Branch: master Commit: 14ba79ec621bf60855016297cded61cc865daf5a URL: http://source.winehq.org/git/wine.git/?a=commit;h=14ba79ec621bf60855016297c… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Thu Mar 13 22:00:57 2008 -0700 quartz: Fix IFilterGraph RemoveFilter to stop the filter before removing it. Also checks for VFW_E_NOT_STOPPED that is allowed to cause a disconnection to fail. --- dlls/quartz/filtergraph.c | 23 +++++++++++++++++++++-- 1 files changed, 21 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 7f92562..762e3e2 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -448,12 +448,31 @@ static HRESULT WINAPI FilterGraph2_RemoveFilter(IFilterGraph2 *iface, if (This->ppFiltersInGraph[i] == pFilter) { IEnumPins *penumpins; + IBaseFilter_Stop(pFilter); hr = IBaseFilter_EnumPins(pFilter, &penumpins); if (SUCCEEDED(hr)) { IPin *ppin; while(IEnumPins_Next(penumpins, 1, &ppin, NULL) == S_OK) { - IPin_Disconnect(ppin); - IPin_Release(ppin); + IPin *victim = NULL; + HRESULT h; + IPin_ConnectedTo(ppin, &victim); + if (victim) + { + h = IPin_Disconnect(victim); + TRACE("Disconnect other side: %08x\n", h); + if (h == VFW_E_NOT_STOPPED) + { + PIN_INFO pinfo; + IPin_QueryPinInfo(victim, &pinfo); + IBaseFilter_Stop(pinfo.pFilter); + IBaseFilter_Release(pinfo.pFilter); + h = IPin_Disconnect(victim); + TRACE("Disconnect retry: %08x\n", h); + } + IPin_Release(victim); + } + h = IPin_Disconnect(ppin); + TRACE("Disconnect 2: %08x\n", h); } IEnumPins_Release(penumpins); }

1 0

Maarten Lankhorst : quartz: Destroy the filtergraph better in releasing.
by Alexandre Julliard 15 Mar '08

15 Mar '08

Module: wine Branch: master Commit: d47bdbfbf166884a1fd93fd97a628dd418a18e97 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d47bdbfbf166884a1fd93fd97… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Thu Mar 13 21:47:14 2008 -0700 quartz: Destroy the filtergraph better in releasing. RemoveFilter is better at removing a filter from a filtergraph then some method there. --- dlls/quartz/filtergraph.c | 10 ++++------ 1 files changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 747f88d..7f92562 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -282,15 +282,13 @@ static ULONG WINAPI FilterGraphInner_Release(IUnknown * iface) { if (ref == 0) { int i; + IMediaControl_Stop((IMediaControl*)&(This->IMediaControl_vtbl)); if (This->refClock) IReferenceClock_Release(This->refClock); - for (i = 0; i < This->nFilters; i++) - { - IBaseFilter_SetSyncSource(This->ppFiltersInGraph[i], NULL); - IBaseFilter_Release(This->ppFiltersInGraph[i]); - CoTaskMemFree(This->pFilterNames[i]); - } + while (This->nFilters) + IFilterGraph2_RemoveFilter((IFilterGraph2*)This, This->ppFiltersInGraph[0]); + for (i = 0; i < This->nItfCacheEntries; i++) { if (This->ItfCacheEntries[i].iface)

1 0

Alexandre Julliard : kernel32: Implemented ReadFileScatter and WriteFileGather.
by Alexandre Julliard 15 Mar '08

15 Mar '08

Module: wine Branch: master Commit: 5c5b997dc2294496739c26603256dabc7c1abd42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c5b997dc2294496739c26603… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 14 20:32:53 2008 +0100 kernel32: Implemented ReadFileScatter and WriteFileGather. --- dlls/kernel32/file.c | 48 +++++++++++++++++++++++++++++++++++++++++++ dlls/kernel32/kernel32.spec | 4 +- include/winbase.h | 2 + 3 files changed, 52 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/file.c b/dlls/kernel32/file.c index 0498dc7..e6e5210 100644 --- a/dlls/kernel32/file.c +++ b/dlls/kernel32/file.c @@ -390,6 +390,30 @@ BOOL WINAPI ReadFileEx(HANDLE hFile, LPVOID buffer, DWORD bytesToRead, /*********************************************************************** + * ReadFileScatter (KERNEL32.@) + */ +BOOL WINAPI ReadFileScatter( HANDLE file, FILE_SEGMENT_ELEMENT *segments, DWORD count, + LPDWORD reserved, LPOVERLAPPED overlapped ) +{ + PIO_STATUS_BLOCK io_status; + LARGE_INTEGER offset; + NTSTATUS status; + + TRACE( "(%p %p %u %p)\n", file, segments, count, overlapped ); + + offset.u.LowPart = overlapped->u.s.Offset; + offset.u.HighPart = overlapped->u.s.OffsetHigh; + io_status = (PIO_STATUS_BLOCK)overlapped; + io_status->u.Status = STATUS_PENDING; + io_status->Information = 0; + + status = NtReadFileScatter( file, NULL, NULL, NULL, io_status, segments, count, &offset, NULL ); + if (status) SetLastError( RtlNtStatusToDosError(status) ); + return !status; +} + + +/*********************************************************************** * ReadFile (KERNEL32.@) */ BOOL WINAPI ReadFile( HANDLE hFile, LPVOID buffer, DWORD bytesToRead, @@ -478,6 +502,30 @@ BOOL WINAPI WriteFileEx(HANDLE hFile, LPCVOID buffer, DWORD bytesToWrite, /*********************************************************************** + * WriteFileGather (KERNEL32.@) + */ +BOOL WINAPI WriteFileGather( HANDLE file, FILE_SEGMENT_ELEMENT *segments, DWORD count, + LPDWORD reserved, LPOVERLAPPED overlapped ) +{ + PIO_STATUS_BLOCK io_status; + LARGE_INTEGER offset; + NTSTATUS status; + + TRACE( "%p %p %u %p\n", file, segments, count, overlapped ); + + offset.u.LowPart = overlapped->u.s.Offset; + offset.u.HighPart = overlapped->u.s.OffsetHigh; + io_status = (PIO_STATUS_BLOCK)overlapped; + io_status->u.Status = STATUS_PENDING; + io_status->Information = 0; + + status = NtWriteFileGather( file, NULL, NULL, NULL, io_status, segments, count, &offset, NULL ); + if (status) SetLastError( RtlNtStatusToDosError(status) ); + return !status; +} + + +/*********************************************************************** * WriteFile (KERNEL32.@) */ BOOL WINAPI WriteFile( HANDLE hFile, LPCVOID buffer, DWORD bytesToWrite, diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 112efbf..2f591c2 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -880,7 +880,7 @@ @ stdcall ReadDirectoryChangesW(long ptr long long long ptr ptr ptr) @ stdcall ReadFile(long ptr long ptr ptr) @ stdcall ReadFileEx(long ptr long ptr ptr) -@ stub ReadFileScatter +@ stdcall ReadFileScatter(long ptr long ptr ptr) @ stdcall ReadProcessMemory(long ptr ptr long ptr) @ stdcall RegisterApplicationRestart(wstr long) @ stub RegisterConsoleIME @@ -1143,7 +1143,7 @@ @ stdcall WriteConsoleW(long ptr long ptr ptr) @ stdcall WriteFile(long ptr long ptr ptr) @ stdcall WriteFileEx(long ptr long ptr ptr) -@ stub WriteFileGather +@ stdcall WriteFileGather(long ptr long ptr ptr) @ stdcall WritePrivateProfileSectionA(str str str) @ stdcall WritePrivateProfileSectionW(wstr wstr wstr) @ stdcall WritePrivateProfileStringA(str str str str) diff --git a/include/winbase.h b/include/winbase.h index f3130a0..7a0cce0 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -1936,6 +1936,7 @@ WINADVAPI BOOL WINAPI ReadEventLogW(HANDLE,DWORD,DWORD,LPVOID,DWORD,DWOR WINBASEAPI BOOL WINAPI ReadDirectoryChangesW(HANDLE,LPVOID,DWORD,BOOL,DWORD,LPDWORD,LPOVERLAPPED,LPOVERLAPPED_COMPLETION_ROUTINE); WINBASEAPI BOOL WINAPI ReadFile(HANDLE,LPVOID,DWORD,LPDWORD,LPOVERLAPPED); WINBASEAPI BOOL WINAPI ReadFileEx(HANDLE,LPVOID,DWORD,LPOVERLAPPED,LPOVERLAPPED_COMPLETION_ROUTINE); +WINBASEAPI BOOL WINAPI ReadFileScatter(HANDLE,FILE_SEGMENT_ELEMENT*,DWORD,LPDWORD,LPOVERLAPPED); WINBASEAPI BOOL WINAPI ReadProcessMemory(HANDLE,LPCVOID,LPVOID,SIZE_T,SIZE_T*); WINADVAPI HANDLE WINAPI RegisterEventSourceA(LPCSTR,LPCSTR); WINADVAPI HANDLE WINAPI RegisterEventSourceW(LPCWSTR,LPCWSTR); @@ -2098,6 +2099,7 @@ WINBASEAPI BOOL WINAPI WaitNamedPipeW(LPCWSTR,DWORD); WINBASEAPI UINT WINAPI WinExec(LPCSTR,UINT); WINBASEAPI BOOL WINAPI WriteFile(HANDLE,LPCVOID,DWORD,LPDWORD,LPOVERLAPPED); WINBASEAPI BOOL WINAPI WriteFileEx(HANDLE,LPCVOID,DWORD,LPOVERLAPPED,LPOVERLAPPED_COMPLETION_ROUTINE); +WINBASEAPI BOOL WINAPI WriteFileGather(HANDLE,FILE_SEGMENT_ELEMENT*,DWORD,LPDWORD,LPOVERLAPPED); WINBASEAPI BOOL WINAPI WritePrivateProfileSectionA(LPCSTR,LPCSTR,LPCSTR); WINBASEAPI BOOL WINAPI WritePrivateProfileSectionW(LPCWSTR,LPCWSTR,LPCWSTR); #define WritePrivateProfileSection WINELIB_NAME_AW(WritePrivateProfileSection)

1 0

Alexandre Julliard : kernel32: Propagate the FILE_FLAG_NO_BUFFERING CreateFile flag to ntdll.
by Alexandre Julliard 15 Mar '08

15 Mar '08

Module: wine Branch: master Commit: db1b9a9f62dd4ec0e5be017aef91f6cf8c002b87 URL: http://source.winehq.org/git/wine.git/?a=commit;h=db1b9a9f62dd4ec0e5be017ae… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 14 20:30:53 2008 +0100 kernel32: Propagate the FILE_FLAG_NO_BUFFERING CreateFile flag to ntdll. --- dlls/kernel32/file.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/file.c b/dlls/kernel32/file.c index 8c6f404..0498dc7 100644 --- a/dlls/kernel32/file.c +++ b/dlls/kernel32/file.c @@ -1385,6 +1385,8 @@ HANDLE WINAPI CreateFileW( LPCWSTR filename, DWORD access, DWORD sharing, options |= FILE_DELETE_ON_CLOSE; access |= DELETE; } + if (attributes & FILE_FLAG_NO_BUFFERING) + options |= FILE_NO_INTERMEDIATE_BUFFERING; if (!(attributes & FILE_FLAG_OVERLAPPED)) options |= FILE_SYNCHRONOUS_IO_ALERT; if (attributes & FILE_FLAG_RANDOM_ACCESS)

1 0

Alexandre Julliard : ntdll: Implemented NtWriteFileGather.
by Alexandre Julliard 15 Mar '08

15 Mar '08

Module: wine Branch: master Commit: 2d6366fc299cdfe0005b6c34f0cb7a1d95257341 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d6366fc299cdfe0005b6c34f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 14 20:30:12 2008 +0100 ntdll: Implemented NtWriteFileGather. --- dlls/ntdll/file.c | 89 +++++++++++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/ntdll.spec | 4 +- include/winternl.h | 2 +- 3 files changed, 92 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 3b67832..ce94917 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -1037,6 +1037,95 @@ err: } +/****************************************************************************** + * NtWriteFileGather [NTDLL.@] + * ZwWriteFileGather [NTDLL.@] + */ +NTSTATUS WINAPI NtWriteFileGather( HANDLE file, HANDLE event, PIO_APC_ROUTINE apc, void *apc_user, + PIO_STATUS_BLOCK io_status, FILE_SEGMENT_ELEMENT *segments, + ULONG length, PLARGE_INTEGER offset, PULONG key ) +{ + size_t page_size = getpagesize(); + int result, unix_handle, needs_close; + unsigned int options; + NTSTATUS status; + ULONG pos = 0, total = 0; + enum server_fd_type type; + ULONG_PTR cvalue = apc ? 0 : (ULONG_PTR)apc_user; + + TRACE( "(%p,%p,%p,%p,%p,%p,0x%08x,%p,%p),partial stub!\n", + file, event, apc, apc_user, io_status, segments, length, offset, key); + + if (length % page_size) return STATUS_INVALID_PARAMETER; + if (!io_status) return STATUS_ACCESS_VIOLATION; + + status = server_get_unix_fd( file, FILE_WRITE_DATA, &unix_handle, + &needs_close, &type, &options ); + if (status) return status; + + if ((type != FD_TYPE_FILE) || + (options & (FILE_SYNCHRONOUS_IO_ALERT | FILE_SYNCHRONOUS_IO_NONALERT)) || + !(options & FILE_NO_INTERMEDIATE_BUFFERING)) + { + status = STATUS_INVALID_PARAMETER; + goto error; + } + + while (length) + { + if (offset && offset->QuadPart != (LONGLONG)-2 /* FILE_USE_FILE_POINTER_POSITION */) + result = pwrite( unix_handle, (char *)segments->Buffer + pos, + page_size - pos, offset->QuadPart + total ); + else + result = write( unix_handle, (char *)segments->Buffer + pos, page_size - pos ); + + if (result == -1) + { + if (errno == EINTR) continue; + if (errno == EFAULT) + { + status = STATUS_INVALID_USER_BUFFER; + goto error; + } + status = FILE_GetNtStatus(); + break; + } + if (!result) + { + status = STATUS_DISK_FULL; + break; + } + total += result; + length -= result; + if ((pos += result) == page_size) + { + pos = 0; + segments++; + } + } + + if (cvalue) NTDLL_AddCompletion( file, cvalue, status, total ); + + error: + if (needs_close) close( unix_handle ); + if (status == STATUS_SUCCESS) + { + io_status->u.Status = status; + io_status->Information = total; + TRACE("= SUCCESS (%u)\n", total); + if (event) NtSetEvent( event, NULL ); + if (apc) NtQueueApcThread( GetCurrentThread(), (PNTAPCFUNC)apc, + (ULONG_PTR)apc_user, (ULONG_PTR)io_status, 0 ); + } + else + { + TRACE("= 0x%08x\n", status); + if (status != STATUS_PENDING && event) NtResetEvent( event, NULL ); + } + return status; +} + + struct async_ioctl { HANDLE handle; /* handle to the device */ diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index ebb65f4..0c9bfd4 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -375,7 +375,7 @@ @ stub NtWaitHighEventPair @ stub NtWaitLowEventPair @ stdcall NtWriteFile(long long ptr ptr ptr ptr long ptr ptr) -@ stub NtWriteFileGather +@ stdcall NtWriteFileGather(long long ptr ptr ptr ptr long ptr ptr) @ stub NtWriteRequestData @ stdcall NtWriteVirtualMemory(long ptr ptr long ptr) @ stdcall NtYieldExecution() @@ -1218,7 +1218,7 @@ @ stub ZwWaitHighEventPair @ stub ZwWaitLowEventPair @ stdcall ZwWriteFile(long long ptr ptr ptr ptr long ptr ptr) NtWriteFile -# @ stub ZwWriteFileGather +@ stdcall ZwWriteFileGather(long long ptr ptr ptr ptr long ptr ptr) NtWriteFileGather @ stub ZwWriteRequestData @ stdcall ZwWriteVirtualMemory(long ptr ptr long ptr) NtWriteVirtualMemory @ stdcall ZwYieldExecution() NtYieldExecution diff --git a/include/winternl.h b/include/winternl.h index 5b54295..eafbbed 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2057,7 +2057,7 @@ NTSYSAPI NTSTATUS WINAPI NtWaitForMultipleObjects(ULONG,const HANDLE*,BOOLEAN,B NTSYSAPI NTSTATUS WINAPI NtWaitHighEventPair(HANDLE); NTSYSAPI NTSTATUS WINAPI NtWaitLowEventPair(HANDLE); NTSYSAPI NTSTATUS WINAPI NtWriteFile(HANDLE,HANDLE,PIO_APC_ROUTINE,PVOID,PIO_STATUS_BLOCK,const void*,ULONG,PLARGE_INTEGER,PULONG); -NTSYSAPI NTSTATUS WINAPI NtWriteFileGather(HANDLE,HANDLE,PIO_APC_ROUTINE,PVOID,PIO_STATUS_BLOCK,FILE_SEGMENT_ELEMENT,ULONG,PLARGE_INTEGER,PULONG); +NTSYSAPI NTSTATUS WINAPI NtWriteFileGather(HANDLE,HANDLE,PIO_APC_ROUTINE,PVOID,PIO_STATUS_BLOCK,FILE_SEGMENT_ELEMENT*,ULONG,PLARGE_INTEGER,PULONG); NTSYSAPI NTSTATUS WINAPI NtWriteRequestData(HANDLE,PLPC_MESSAGE,ULONG,PVOID,ULONG,PULONG); NTSYSAPI NTSTATUS WINAPI NtWriteVirtualMemory(HANDLE,void*,const void*,SIZE_T,SIZE_T*); NTSYSAPI NTSTATUS WINAPI NtYieldExecution(void);

1 0

Alexandre Julliard : ntdll: Implemented NtReadFileScatter.
by Alexandre Julliard 15 Mar '08

15 Mar '08

Module: wine Branch: master Commit: 81e4a0f6f30a6196de4a36496461be257b6d9885 URL: http://source.winehq.org/git/wine.git/?a=commit;h=81e4a0f6f30a6196de4a36496… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 14 20:29:00 2008 +0100 ntdll: Implemented NtReadFileScatter. --- dlls/ntdll/file.c | 85 +++++++++++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/ntdll.spec | 8 ++-- include/winternl.h | 2 +- 3 files changed, 90 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index c7b944b..3b67832 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -715,6 +715,91 @@ err: return status; } + +/****************************************************************************** + * NtReadFileScatter [NTDLL.@] + * ZwReadFileScatter [NTDLL.@] + */ +NTSTATUS WINAPI NtReadFileScatter( HANDLE file, HANDLE event, PIO_APC_ROUTINE apc, void *apc_user, + PIO_STATUS_BLOCK io_status, FILE_SEGMENT_ELEMENT *segments, + ULONG length, PLARGE_INTEGER offset, PULONG key ) +{ + size_t page_size = getpagesize(); + int result, unix_handle, needs_close; + unsigned int options; + NTSTATUS status; + ULONG pos = 0, total = 0; + enum server_fd_type type; + ULONG_PTR cvalue = apc ? 0 : (ULONG_PTR)apc_user; + + TRACE( "(%p,%p,%p,%p,%p,%p,0x%08x,%p,%p),partial stub!\n", + file, event, apc, apc_user, io_status, segments, length, offset, key); + + if (length % page_size) return STATUS_INVALID_PARAMETER; + if (!io_status) return STATUS_ACCESS_VIOLATION; + + status = server_get_unix_fd( file, FILE_READ_DATA, &unix_handle, + &needs_close, &type, &options ); + if (status) return status; + + if ((type != FD_TYPE_FILE) || + (options & (FILE_SYNCHRONOUS_IO_ALERT | FILE_SYNCHRONOUS_IO_NONALERT)) || + !(options & FILE_NO_INTERMEDIATE_BUFFERING)) + { + status = STATUS_INVALID_PARAMETER; + goto error; + } + + while (length) + { + if (offset && offset->QuadPart != (LONGLONG)-2 /* FILE_USE_FILE_POINTER_POSITION */) + result = pread( unix_handle, (char *)segments->Buffer + pos, + page_size - pos, offset->QuadPart + total ); + else + result = read( unix_handle, (char *)segments->Buffer + pos, page_size - pos ); + + if (result == -1) + { + if (errno == EINTR) continue; + status = FILE_GetNtStatus(); + break; + } + if (!result) + { + status = STATUS_END_OF_FILE; + break; + } + total += result; + length -= result; + if ((pos += result) == page_size) + { + pos = 0; + segments++; + } + } + + if (cvalue) NTDLL_AddCompletion( file, cvalue, status, total ); + + error: + if (needs_close) close( unix_handle ); + if (status == STATUS_SUCCESS) + { + io_status->u.Status = status; + io_status->Information = total; + TRACE("= SUCCESS (%u)\n", total); + if (event) NtSetEvent( event, NULL ); + if (apc) NtQueueApcThread( GetCurrentThread(), (PNTAPCFUNC)apc, + (ULONG_PTR)apc_user, (ULONG_PTR)io_status, 0 ); + } + else + { + TRACE("= 0x%08x\n", status); + if (status != STATUS_PENDING && event) NtResetEvent( event, NULL ); + } + return status; +} + + /*********************************************************************** * FILE_AsyncWriteService (INTERNAL) */ diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 9385153..ebb65f4 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -275,8 +275,8 @@ @ stdcall NtQueueApcThread(long ptr long long long) @ stdcall NtRaiseException(ptr ptr long) @ stub NtRaiseHardError -@ stdcall NtReadFile(long long long long long long long long long) -@ stub NtReadFileScatter +@ stdcall NtReadFile(long long ptr ptr ptr ptr long ptr ptr) +@ stdcall NtReadFileScatter(long long ptr ptr ptr ptr long ptr ptr) @ stub NtReadRequestData @ stdcall NtReadVirtualMemory(long ptr ptr long ptr) @ stub NtRegisterNewDevice @@ -1118,8 +1118,8 @@ @ stdcall ZwQueueApcThread(long ptr long long long) NtQueueApcThread @ stdcall ZwRaiseException(ptr ptr long) NtRaiseException @ stub ZwRaiseHardError -@ stdcall ZwReadFile(long long long long long long long long long) NtReadFile -# @ stub ZwReadFileScatter +@ stdcall ZwReadFile(long long ptr ptr ptr ptr long ptr ptr) NtReadFile +@ stdcall ZwReadFileScatter(long long ptr ptr ptr ptr long ptr ptr) NtReadFileScatter @ stub ZwReadRequestData @ stdcall ZwReadVirtualMemory(long ptr ptr long ptr) NtReadVirtualMemory @ stub ZwRegisterNewDevice diff --git a/include/winternl.h b/include/winternl.h index d8d6469..5b54295 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -1987,7 +1987,7 @@ NTSYSAPI NTSTATUS WINAPI NtQueryVolumeInformationFile(HANDLE,PIO_STATUS_BLOCK,P NTSYSAPI NTSTATUS WINAPI NtRaiseException(PEXCEPTION_RECORD,PCONTEXT,BOOL); NTSYSAPI NTSTATUS WINAPI NtRaiseHardError(NTSTATUS,ULONG,PUNICODE_STRING,PVOID*,HARDERROR_RESPONSE_OPTION,PHARDERROR_RESPONSE); NTSYSAPI NTSTATUS WINAPI NtReadFile(HANDLE,HANDLE,PIO_APC_ROUTINE,PVOID,PIO_STATUS_BLOCK,PVOID,ULONG,PLARGE_INTEGER,PULONG); -NTSYSAPI NTSTATUS WINAPI NtReadFileScatter(HANDLE,HANDLE,PIO_APC_ROUTINE,PVOID,PIO_STATUS_BLOCK,FILE_SEGMENT_ELEMENT,ULONG,PLARGE_INTEGER,PULONG); +NTSYSAPI NTSTATUS WINAPI NtReadFileScatter(HANDLE,HANDLE,PIO_APC_ROUTINE,PVOID,PIO_STATUS_BLOCK,FILE_SEGMENT_ELEMENT*,ULONG,PLARGE_INTEGER,PULONG); NTSYSAPI NTSTATUS WINAPI NtReadRequestData(HANDLE,PLPC_MESSAGE,ULONG,PVOID,ULONG,PULONG); NTSYSAPI NTSTATUS WINAPI NtReadVirtualMemory(HANDLE,const void*,void*,SIZE_T,SIZE_T*); NTSYSAPI NTSTATUS WINAPI NtRegisterThreadTerminatePort(HANDLE);

1 0

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 March 2008