wine-commits April 2007

wine-commits@winehq.org

4 participants
687 discussions

Lei Zhang : advapi32: Spelling fixes.
by Alexandre Julliard 07 Apr '07

07 Apr '07

Module: wine Branch: master Commit: d347ebe1968a32d62834d897ecfed647e001c06a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d347ebe1968a32d62834d897e… Author: Lei Zhang <thestig(a)google.com> Date: Fri Apr 6 16:46:59 2007 -0700 advapi32: Spelling fixes. --- dlls/advapi32/crypt.c | 4 ++-- dlls/advapi32/registry.c | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/advapi32/crypt.c b/dlls/advapi32/crypt.c index 3a2f770..1fd16c3 100644 --- a/dlls/advapi32/crypt.c +++ b/dlls/advapi32/crypt.c @@ -987,7 +987,7 @@ BOOL WINAPI CryptDuplicateKey (HCRYPTKEY hKey, DWORD *pdwReserved, DWORD dwFlags * Encrypts data. * * PARAMS - * hKey [I] Handle to the enryption key. + * hKey [I] Handle to the encryption key. * hHash [I] Handle to a hash object. * Final [I] TRUE if this is the last section to encrypt. * dwFlags [I] Can be CRYPT_OAEP. @@ -1027,7 +1027,7 @@ BOOL WINAPI CryptEncrypt (HCRYPTKEY hKey, HCRYPTHASH hHash, BOOL Final, /****************************************************************************** * CryptEnumProvidersW (ADVAPI32.@) * - * Returns the next availabe CSP. + * Returns the next available CSP. * * PARAMS * dwIndex [I] Index of the next provider to be enumerated. diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c index 28689cd..4406004 100644 --- a/dlls/advapi32/registry.c +++ b/dlls/advapi32/registry.c @@ -566,7 +566,7 @@ LONG WINAPI RegEnumKeyExA( HKEY hkey, DWORD index, LPSTR name, LPDWORD name_len, /****************************************************************************** * RegEnumKeyW [ADVAPI32.@] * - * Enumerates subkyes of the specified open reg key. + * Enumerates subkeys of the specified open reg key. * * PARAMS * hKey [I] Handle to an open key. @@ -805,7 +805,7 @@ LONG WINAPI RegQueryMultipleValuesW( HKEY hkey, PVALENTW val_list, DWORD num_val * lpcMaxValueNameLen [O] Size of the key's longest value name in TCHARS. * lpcMaxValueLen [O] Longest data component among the key's values * lpcbSecurityDescriptor [O] Size of the key's security descriptor. - * lpftLastWriteTime [O] FILETIME strucutre that is the last write time. + * lpftLastWriteTime [O] FILETIME structure that is the last write time. * * RETURNS * Success: ERROR_SUCCESS @@ -2264,7 +2264,7 @@ LONG WINAPI RegFlushKey( HKEY hkey ) /****************************************************************************** * RegConnectRegistryW [ADVAPI32.@] * - * Establishe a connection to a predefined registry key on another computer. + * Establish a connection to a predefined registry key on another computer. * * PARAMS * lpMachineName [I] Address of name of remote computer @@ -2373,7 +2373,7 @@ LONG WINAPI RegNotifyChangeKeyValue( HKEY hkey, BOOL fWatchSubTree, * * PARAMS * hToken [I] Handle of token representing the user - * dwOptions [I] Reserved, nust be 0 + * dwOptions [I] Reserved, must be 0 * samDesired [I] Desired access rights * phkResult [O] Destination for the resulting key handle *

1 0

Stefan Dösinger : wined3d: Index buffer data is unsigned.
by Alexandre Julliard 07 Apr '07

07 Apr '07

Module: wine Branch: master Commit: a9e04dd87fdf95d92f671a0728208b88bfe8167e URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9e04dd87fdf95d92f671a072… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Apr 6 14:22:14 2007 +0200 wined3d: Index buffer data is unsigned. --- dlls/wined3d/drawprim.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 089030b..9820158 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -449,8 +449,8 @@ static void drawStridedSlow(IWineD3DDevice *iface, WineDirect3DVertexStridedData unsigned int textureNo = 0; unsigned int texture_idx = 0; - const short *pIdxBufS = NULL; - const long *pIdxBufL = NULL; + const WORD *pIdxBufS = NULL; + const DWORD *pIdxBufL = NULL; LONG vx_index; float x = 0.0f, y = 0.0f, z = 0.0f; /* x,y,z coordinates */ float rhw = 0.0f; /* rhw */ @@ -458,7 +458,7 @@ static void drawStridedSlow(IWineD3DDevice *iface, WineDirect3DVertexStridedData DWORD specularColor = 0; /* Specular Color */ IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; UINT *streamOffset = This->stateBlock->streamOffset; - LONG SkipnStrides = startVertex + This->stateBlock->loadBaseVertexIndex; + DWORD SkipnStrides = startVertex + This->stateBlock->loadBaseVertexIndex; BYTE *texCoords[WINED3DDP_MAXTEXCOORD]; BYTE *diffuse = NULL, *specular = NULL, *normal = NULL, *position = NULL; @@ -475,8 +475,8 @@ static void drawStridedSlow(IWineD3DDevice *iface, WineDirect3DVertexStridedData idxData = ((IWineD3DIndexBufferImpl *) This->stateBlock->pIndexData)->resource.allocatedMemory; } - if (idxSize == 2) pIdxBufS = (const short *) idxData; - else pIdxBufL = (const long *) idxData; + if (idxSize == 2) pIdxBufS = (const WORD *) idxData; + else pIdxBufL = (const DWORD *) idxData; } /* Adding the stream offset once is cheaper than doing it every iteration. Do not modify the strided data, it is a pointer

1 0

Stefan Dösinger : wined3d: Set WINED3DCAPS3_ALPHA_FULLSCREEN_FLIP_OR_DISCARD caps3 cap.
by Alexandre Julliard 07 Apr '07

07 Apr '07

Module: wine Branch: master Commit: 0899d857574d4e80420eb16cc62a5becdcab4ae3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0899d857574d4e80420eb16cc… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Apr 6 12:36:45 2007 +0200 wined3d: Set WINED3DCAPS3_ALPHA_FULLSCREEN_FLIP_OR_DISCARD caps3 cap. --- dlls/wined3d/directx.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 6ba4c28..65dc031 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1904,7 +1904,7 @@ static HRESULT WINAPI IWineD3DImpl_GetDeviceCaps(IWineD3D *iface, UINT Adapter, *pCaps->Caps2 = WINED3DCAPS2_CANRENDERWINDOWED | WINED3DCAPS2_FULLSCREENGAMMA | WINED3DCAPS2_DYNAMICTEXTURES; - *pCaps->Caps3 = 0; + *pCaps->Caps3 = WINED3DCAPS3_ALPHA_FULLSCREEN_FLIP_OR_DISCARD; *pCaps->PresentationIntervals = WINED3DPRESENT_INTERVAL_IMMEDIATE; *pCaps->CursorCaps = 0;

1 0

Stefan Dösinger : wined3d: Add Filtering to IWineD3DSurface::Blt and handle it.
by Alexandre Julliard 07 Apr '07

07 Apr '07

Module: wine Branch: master Commit: 290f2eb146ed43857f6cd14aed295b7e40495ab7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=290f2eb146ed43857f6cd14ae… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Apr 3 12:00:15 2007 +0200 wined3d: Add Filtering to IWineD3DSurface::Blt and handle it. This is to allow StretchRect to pass the texture filter to WineD3D. DirectDraw sets the texture filter to WINED3DTEXF_NONE, simmilar to all other functions which do not need filtering. --- dlls/d3d9/device.c | 3 +- dlls/ddraw/surface.c | 3 +- dlls/wined3d/device.c | 2 +- dlls/wined3d/surface.c | 42 +++++++++++++++++++------------------ dlls/wined3d/surface_gdi.c | 8 ++++++- dlls/wined3d/swapchain.c | 2 +- dlls/wined3d/wined3d_private.h | 2 +- include/wine/wined3d_interface.h | 4 +- 8 files changed, 37 insertions(+), 29 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=290f2eb146ed43857f6cd…

1 0

Stefan Dösinger : wined3d: Add D3DDEVCAPS3_* to the wined3d caps header.
by Alexandre Julliard 07 Apr '07

07 Apr '07

Module: wine Branch: master Commit: 1c1fdbe96adf1a933faa744252927c1de50a9f2f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c1fdbe96adf1a933faa74425… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Apr 6 12:35:19 2007 +0200 wined3d: Add D3DDEVCAPS3_* to the wined3d caps header. --- include/wine/wined3d_caps.h | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/include/wine/wined3d_caps.h b/include/wine/wined3d_caps.h index 58cfb57..95b400e 100644 --- a/include/wine/wined3d_caps.h +++ b/include/wine/wined3d_caps.h @@ -19,6 +19,12 @@ #ifndef __WINE_WINED3D_CAPS_H #define __WINE_WINED3D_CAPS_H +#define WINED3DCAPS3_ALPHA_FULLSCREEN_FLIP_OR_DISCARD 0x00000020L +#define WINED3DCAPS3_LINEAR_TO_SRGB_PRESENTATION 0x00000080L +#define WINED3DCAPS3_COPY_TO_VIDMEM 0x00000100L +#define WINED3DCAPS3_COPY_TO_SYSTEMMEM 0x00000200L +#define WINED3DCAPS3_RESERVED 0x8000001FL + #define WINED3DDEVCAPS2_STREAMOFFSET 0x00000001 #define WINED3DDEVCAPS2_DMAPNPATCH 0x00000002 #define WINED3DDEVCAPS2_ADAPTIVETESSRTPATCH 0x00000004

1 0

Andrew Talbot : include: Remove superfluous semicolons.
by Alexandre Julliard 07 Apr '07

07 Apr '07

Module: wine Branch: master Commit: 2ed76bd2006d0d82dbf3a405cca365e70c101b01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ed76bd2006d0d82dbf3a405c… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Fri Apr 6 16:23:52 2007 +0100 include: Remove superfluous semicolons. --- include/setupapi.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/setupapi.h b/include/setupapi.h index b7a6b43..81d97e0 100644 --- a/include/setupapi.h +++ b/include/setupapi.h @@ -298,8 +298,8 @@ typedef struct _CABINET_INFO_W { USHORT CabinetNumber; } CABINET_INFO_W, *PCABINET_INFO_W; -DECL_WINELIB_SETUPAPI_TYPE_AW(CABINET_INFO); -DECL_WINELIB_SETUPAPI_TYPE_AW(PCABINET_INFO); +DECL_WINELIB_SETUPAPI_TYPE_AW(CABINET_INFO) +DECL_WINELIB_SETUPAPI_TYPE_AW(PCABINET_INFO) typedef struct _SP_INF_INFORMATION { DWORD InfStyle;

1 0

Chris Robinson : quartz: Add partial implementation of IReferenceClock for DSoundRenderer.
by Alexandre Julliard 07 Apr '07

07 Apr '07

Module: wine Branch: master Commit: e508f2cc9065f431f87a44f1daa5a222cae39d8a URL: http://source.winehq.org/git/wine.git/?a=commit;h=e508f2cc9065f431f87a44f1d… Author: Chris Robinson <chris.kcat(a)gmail.com> Date: Fri Apr 6 03:48:03 2007 -0700 quartz: Add partial implementation of IReferenceClock for DSoundRenderer. --- dlls/quartz/dsoundrender.c | 158 +++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 155 insertions(+), 3 deletions(-) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index d362ca0..ed2eda2 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -46,11 +46,13 @@ static const IBaseFilterVtbl DSoundRender_Vtbl; static const IPinVtbl DSoundRender_InputPin_Vtbl; static const IMemInputPinVtbl MemInputPin_Vtbl; static const IBasicAudioVtbl IBasicAudio_Vtbl; +static const IReferenceClockVtbl IReferenceClock_Vtbl; typedef struct DSoundRenderImpl { const IBaseFilterVtbl * lpVtbl; const IBasicAudioVtbl *IBasicAudio_vtbl; + const IReferenceClockVtbl *IReferenceClock_vtbl; LONG refCount; CRITICAL_SECTION csFilter; @@ -66,8 +68,13 @@ typedef struct DSoundRenderImpl LPDIRECTSOUNDBUFFER dsbuffer; DWORD buf_size; DWORD write_pos; + DWORD write_loops; BOOL init; + DWORD last_play_pos; + DWORD play_loops; + REFERENCE_TIME play_time; + long volume; long pan; } DSoundRenderImpl; @@ -188,6 +195,47 @@ getout: return hr; } +static inline HRESULT DSoundRender_GetPos(DSoundRenderImpl *This, DWORD *pPlayPos, DWORD *pWritePos, REFERENCE_TIME *pRefTime) +{ + HRESULT hr; + + EnterCriticalSection(&This->csFilter); + { + hr = IDirectSoundBuffer_GetCurrentPosition(This->dsbuffer, pPlayPos, pWritePos); + if (hr == DS_OK) + { + DWORD play_pos = *pPlayPos; + + if (play_pos < This->last_play_pos) + This->play_loops++; + This->last_play_pos = play_pos; + + /* If we're really falling behind, kick the play time back */ + if ((This->play_loops*This->buf_size)+play_pos >= + (This->write_loops*This->buf_size)+This->write_pos) + This->play_loops--; + + if (pRefTime) + { + REFERENCE_TIME play_time; + play_time = ((REFERENCE_TIME)This->play_loops*10000000) + + ((REFERENCE_TIME)play_pos*10000000/This->buf_size); + + /* Don't let time run backwards */ + if(play_time-This->play_time > 0) + This->play_time = play_time; + else + hr = S_FALSE; + + *pRefTime = This->play_time; + } + } + } + LeaveCriticalSection(&This->csFilter); + + return hr; +} + static HRESULT DSoundRender_SendSampleData(DSoundRenderImpl* This, LPBYTE data, DWORD size) { HRESULT hr; @@ -199,10 +247,10 @@ static HRESULT DSoundRender_SendSampleData(DSoundRenderImpl* This, LPBYTE data, DWORD play_pos,buf_free; do { - hr = IDirectSoundBuffer_GetCurrentPosition(This->dsbuffer, &play_pos, NULL); + hr = DSoundRender_GetPos(This, &play_pos, NULL, NULL); if (hr != DS_OK) { - ERR("Error GetCurrentPosition: %x\n", hr); + ERR("GetPos returned error: %x\n", hr); break; } if (This->write_pos <= play_pos) @@ -235,7 +283,12 @@ static HRESULT DSoundRender_SendSampleData(DSoundRenderImpl* This, LPBYTE data, size -= dwsize1 + dwsize2; data += dwsize1 + dwsize2; - This->write_pos = (This->write_pos + dwsize1 + dwsize2) % This->buf_size; + This->write_pos += dwsize1 + dwsize2; + if (This->write_pos >= This->buf_size) + { + This->write_pos -= This->buf_size; + This->write_loops++; + } } while (size && This->state == State_Running); return hr; @@ -334,6 +387,7 @@ HRESULT DSoundRender_create(IUnknown * pUnkOuter, LPVOID * ppv) pDSoundRender->lpVtbl = &DSoundRender_Vtbl; pDSoundRender->IBasicAudio_vtbl = &IBasicAudio_Vtbl; + pDSoundRender->IReferenceClock_vtbl = &IReferenceClock_Vtbl; pDSoundRender->refCount = 1; InitializeCriticalSection(&pDSoundRender->csFilter); pDSoundRender->csFilter.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": DSoundRenderImpl.csFilter"); @@ -387,6 +441,8 @@ static HRESULT WINAPI DSoundRender_QueryInterface(IBaseFilter * iface, REFIID ri *ppv = (LPVOID)This; else if (IsEqualIID(riid, &IID_IBasicAudio)) *ppv = (LPVOID)&(This->IBasicAudio_vtbl); + else if (IsEqualIID(riid, &IID_IReferenceClock)) + *ppv = (LPVOID)&(This->IReferenceClock_vtbl); if (*ppv) { @@ -895,3 +951,99 @@ static const IBasicAudioVtbl IBasicAudio_Vtbl = Basicaudio_put_Balance, Basicaudio_get_Balance }; + + +/*** IUnknown methods ***/ +static HRESULT WINAPI ReferenceClock_QueryInterface(IReferenceClock *iface, + REFIID riid, + LPVOID*ppvObj) +{ + ICOM_THIS_MULTI(DSoundRenderImpl, IReferenceClock_vtbl, iface); + + TRACE("(%p/%p)->(%s (%p), %p)\n", This, iface, debugstr_guid(riid), riid, ppvObj); + + return DSoundRender_QueryInterface((IBaseFilter*)This, riid, ppvObj); +} + +static ULONG WINAPI ReferenceClock_AddRef(IReferenceClock *iface) +{ + ICOM_THIS_MULTI(DSoundRenderImpl, IReferenceClock_vtbl, iface); + + TRACE("(%p/%p)->()\n", This, iface); + + return DSoundRender_AddRef((IBaseFilter*)This); +} + +static ULONG WINAPI ReferenceClock_Release(IReferenceClock *iface) +{ + ICOM_THIS_MULTI(DSoundRenderImpl, IReferenceClock_vtbl, iface); + + TRACE("(%p/%p)->()\n", This, iface); + + return DSoundRender_Release((IBaseFilter*)This); +} + +/*** IReferenceClock methods ***/ +static HRESULT WINAPI ReferenceClock_GetTime(IReferenceClock *iface, + REFERENCE_TIME *pTime) +{ + ICOM_THIS_MULTI(DSoundRenderImpl, IReferenceClock_vtbl, iface); + HRESULT hr = E_FAIL; + DWORD play_pos; + + TRACE("(%p/%p)->(%p)\n", This, iface, pTime); + + if (This->dsbuffer) + hr = DSoundRender_GetPos(This, &play_pos, NULL, pTime); + if (FAILED(hr)) + ERR("Could not get refreence time (%x)!\n", hr); + + return hr; +} + +static HRESULT WINAPI ReferenceClock_AdviseTime(IReferenceClock *iface, + REFERENCE_TIME rtBaseTime, + REFERENCE_TIME rtStreamTime, + HEVENT hEvent, + DWORD_PTR *pdwAdviseCookie) +{ + ICOM_THIS_MULTI(DSoundRenderImpl, IReferenceClock_vtbl, iface); + + FIXME("(%p/%p)->(%s, %s, %p, %p): stub!\n", This, iface, wine_dbgstr_longlong(rtBaseTime), wine_dbgstr_longlong(rtStreamTime), (void*)hEvent, pdwAdviseCookie); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ReferenceClock_AdvisePeriodic(IReferenceClock *iface, + REFERENCE_TIME rtBaseTime, + REFERENCE_TIME rtStreamTime, + HSEMAPHORE hSemaphore, + DWORD_PTR *pdwAdviseCookie) +{ + ICOM_THIS_MULTI(DSoundRenderImpl, IReferenceClock_vtbl, iface); + + FIXME("(%p/%p)->(%s, %s, %p, %p): stub!\n", This, iface, wine_dbgstr_longlong(rtBaseTime), wine_dbgstr_longlong(rtStreamTime), (void*)hSemaphore, pdwAdviseCookie); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ReferenceClock_Unadvise(IReferenceClock *iface, + DWORD_PTR dwAdviseCookie) +{ + ICOM_THIS_MULTI(DSoundRenderImpl, IReferenceClock_vtbl, iface); + + FIXME("(%p/%p)->(%p): stub!\n", This, iface, (void*)dwAdviseCookie); + + return S_FALSE; +} + +static const IReferenceClockVtbl IReferenceClock_Vtbl = +{ + ReferenceClock_QueryInterface, + ReferenceClock_AddRef, + ReferenceClock_Release, + ReferenceClock_GetTime, + ReferenceClock_AdviseTime, + ReferenceClock_AdvisePeriodic, + ReferenceClock_Unadvise +};

1 0

Chris Robinson : quartz: Use more precise positioning information for the DSound filter' s reference clock.
by Alexandre Julliard 07 Apr '07

07 Apr '07

Module: wine Branch: master Commit: 2994695189a0ecb9b8f813de52e689ffdd73f716 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2994695189a0ecb9b8f813de5… Author: Chris Robinson <chris.kcat(a)gmail.com> Date: Fri Apr 6 03:50:23 2007 -0700 quartz: Use more precise positioning information for the DSound filter's reference clock. --- dlls/quartz/dsoundrender.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index 96f8133..d362ca0 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -154,7 +154,8 @@ static HRESULT DSoundRender_CreateSoundBuffer(IBaseFilter * iface) memset(&buf_desc,0,sizeof(DSBUFFERDESC)); buf_desc.dwSize = sizeof(DSBUFFERDESC); - buf_desc.dwFlags = DSBCAPS_CTRLVOLUME | DSBCAPS_CTRLPAN | DSBCAPS_CTRLFREQUENCY; + buf_desc.dwFlags = DSBCAPS_CTRLVOLUME | DSBCAPS_CTRLPAN | + DSBCAPS_CTRLFREQUENCY | DSBCAPS_GETCURRENTPOSITION2; buf_desc.dwBufferBytes = This->buf_size; buf_desc.lpwfxFormat = &wav_fmt; hr = IDirectSound_CreateSoundBuffer(This->dsound, &buf_desc, &This->dsbuffer, NULL);

1 0

Alexandre Julliard : ntdll: Rely on the server to queue the final APC for asynchronous read/write.
by Alexandre Julliard 07 Apr '07

07 Apr '07

Module: wine Branch: master Commit: 7df060fc43dc4b73591dd9c300d924dbdbcfe580 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7df060fc43dc4b73591dd9c30… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 6 20:17:08 2007 +0200 ntdll: Rely on the server to queue the final APC for asynchronous read/write. --- dlls/ntdll/file.c | 9 ++------- 1 files changed, 2 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 1fb6593..65710c5 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -247,7 +247,6 @@ typedef struct async_fileio char* buffer; unsigned int already; unsigned int count; - int queue_apc_on_error; BOOL avail_mode; HANDLE event; } async_fileio; @@ -258,10 +257,6 @@ static void fileio_terminate(async_fileio *fileio, IO_STATUS_BLOCK* iosb, NTSTAT iosb->u.Status = status; iosb->Information = fileio->already; - - if (fileio->apc && (status == STATUS_SUCCESS || fileio->queue_apc_on_error)) - fileio->apc( fileio->apc_user, iosb, 0 ); - RtlFreeHeap( GetProcessHeap(), 0, fileio ); } @@ -278,6 +273,8 @@ static ULONG fileio_queue_async(async_fileio* fileio, IO_STATUS_BLOCK* iosb, req->async.callback = apc; req->async.iosb = iosb; req->async.arg = fileio; + req->async.apc = fileio->apc; + req->async.apc_arg = fileio->apc_user; req->async.event = fileio->event; req->type = do_read ? ASYNC_TYPE_READ : ASYNC_TYPE_WRITE; req->count = (fileio->count < fileio->already) ? 0 : fileio->count - fileio->already; @@ -606,7 +603,6 @@ NTSTATUS WINAPI NtReadFile(HANDLE hFile, HANDLE hEvent, fileio->apc = apc; fileio->apc_user = apc_user; fileio->buffer = buffer; - fileio->queue_apc_on_error = 1; fileio->avail_mode = (flags & FD_FLAG_AVAILABLE); fileio->event = hEvent; status = fileio_queue_async(fileio, io_status, TRUE); @@ -811,7 +807,6 @@ NTSTATUS WINAPI NtWriteFile(HANDLE hFile, HANDLE hEvent, fileio->apc = apc; fileio->apc_user = apc_user; fileio->buffer = (void*)buffer; - fileio->queue_apc_on_error = 1; fileio->event = hEvent; status = fileio_queue_async(fileio, io_status, FALSE); goto done;

1 0

Alexandre Julliard : ntdll: Reimplement NtWriteFile.
by Alexandre Julliard 07 Apr '07

07 Apr '07

Module: wine Branch: master Commit: 55f3605c37f21f6cae6d22e6ecd8f1b5790d3a8a URL: http://source.winehq.org/git/wine.git/?a=commit;h=55f3605c37f21f6cae6d22e6e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 6 16:06:16 2007 +0200 ntdll: Reimplement NtWriteFile. Always try a write() before queuing an async I/O. Handle timeout waits for synchronous I/O entirely on the client side. Queue the final APC as a proper user APC. --- dlls/ntdll/file.c | 178 +++++++++++++++++++++++++---------------------------- 1 files changed, 85 insertions(+), 93 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index b78cb48..1fb6593 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -738,8 +738,10 @@ NTSTATUS WINAPI NtWriteFile(HANDLE hFile, HANDLE hEvent, const void* buffer, ULONG length, PLARGE_INTEGER offset, PULONG key) { - int result, unix_handle, needs_close, flags; + int result, unix_handle, needs_close, flags, timeout_init_done = 0; + struct io_timeouts timeouts; NTSTATUS status; + ULONG total = 0; enum server_fd_type type; TRACE("(%p,%p,%p,%p,%p,%p,0x%08x,%p,%p)!\n", @@ -751,127 +753,117 @@ NTSTATUS WINAPI NtWriteFile(HANDLE hFile, HANDLE hEvent, &needs_close, &type, &flags ); if (status) return status; - if (type == FD_TYPE_FILE && offset) + if (type == FD_TYPE_FILE && offset && offset->QuadPart != (LONGLONG)-2 /* FILE_USE_FILE_POINTER_POSITION */ ) { - if (flags & FD_FLAG_OVERLAPPED) + /* async I/O doesn't make sense on regular files */ + while ((result = pwrite( unix_handle, buffer, length, offset->QuadPart )) == -1) { - /* async I/O doesn't make sense on regular files */ - while ((result = pwrite( unix_handle, buffer, length, offset->QuadPart )) == -1) + if (errno != EINTR) { - if (errno == EINTR) continue; - if (errno == EAGAIN || errno == ESPIPE) - { - status = STATUS_PENDING; - break; - } - result = 0; if (errno == EFAULT) status = STATUS_INVALID_USER_BUFFER; else status = FILE_GetNtStatus(); goto done; } - if (result >= 0) + } + + if (!(flags & FD_FLAG_OVERLAPPED)) /* update file pointer position */ + lseek( unix_handle, offset->QuadPart + result, SEEK_SET ); + + total = result; + status = STATUS_SUCCESS; + goto done; + } + + for (;;) + { + if ((result = write( unix_handle, (const char *)buffer + total, length - total )) >= 0) + { + total += result; + if (total == length) { - io_status->Information = result; status = STATUS_SUCCESS; - if (hEvent) NtSetEvent( hEvent, NULL ); goto done; } } else { - if (lseek( unix_handle, offset->QuadPart, SEEK_SET ) == (off_t)-1) + if (errno == EINTR) continue; + if (errno != EAGAIN) { - status = FILE_GetNtStatus(); + if (errno == EFAULT) status = STATUS_INVALID_USER_BUFFER; + else status = FILE_GetNtStatus(); goto done; } } - } - if (flags & FD_FLAG_SEND_SHUTDOWN) - { - status = STATUS_PIPE_DISCONNECTED; - goto done; - } - - if (flags & FD_FLAG_TIMEOUT) - { - if (hEvent) + if (flags & FD_FLAG_OVERLAPPED) { - /* this shouldn't happen, but check it */ - FIXME("NIY-hEvent\n"); - status = STATUS_NOT_IMPLEMENTED; - goto done; - } - status = NtCreateEvent(&hEvent, EVENT_ALL_ACCESS, NULL, 0, 0); - if (status) goto done; - } - - if (flags & (FD_FLAG_OVERLAPPED|FD_FLAG_TIMEOUT)) - { - async_fileio* fileio; + async_fileio *fileio; - if (!(fileio = RtlAllocateHeap(GetProcessHeap(), 0, sizeof(async_fileio)))) - { - if (flags & FD_FLAG_TIMEOUT) NtClose(hEvent); - status = STATUS_NO_MEMORY; - goto done; - } - fileio->handle = hFile; - fileio->already = 0; - fileio->count = length; - fileio->apc = apc; - fileio->apc_user = apc_user; - fileio->buffer = (void*)buffer; - fileio->queue_apc_on_error = 0; - fileio->avail_mode = (flags & FD_FLAG_AVAILABLE); - fileio->event = hEvent; - - io_status->u.Status = STATUS_PENDING; - status = fileio_queue_async(fileio, io_status, FALSE); - if (status != STATUS_PENDING) - { - if (flags & FD_FLAG_TIMEOUT) NtClose(hEvent); + if (!(fileio = RtlAllocateHeap(GetProcessHeap(), 0, sizeof(async_fileio)))) + { + status = STATUS_NO_MEMORY; + goto done; + } + fileio->handle = hFile; + fileio->already = total; + fileio->count = length; + fileio->apc = apc; + fileio->apc_user = apc_user; + fileio->buffer = (void*)buffer; + fileio->queue_apc_on_error = 1; + fileio->event = hEvent; + status = fileio_queue_async(fileio, io_status, FALSE); goto done; } - if (needs_close) close( unix_handle ); - if (flags & FD_FLAG_TIMEOUT) + else /* synchronous write, wait for the fd to become ready */ { - while (NtWaitForSingleObject(hEvent, TRUE, NULL) == STATUS_USER_APC) /* nothing */ ; - NtClose(hEvent); - } - else - { - LARGE_INTEGER timeout; - - /* let some APC be run, this will write as much data as possible */ - timeout.u.LowPart = timeout.u.HighPart = 0; - status = NtDelayExecution( TRUE, &timeout ); - /* the apc didn't run and therefore the completion routine now - * needs to be sent errors. - * Note that there is no race between setting this flag and - * returning errors because apc's are run only during alertable - * waits */ - if (status != STATUS_USER_APC) - fileio->queue_apc_on_error = 1; + struct pollfd pfd; + int ret, timeout; + + if (!timeout_init_done) + { + timeout_init_done = 1; + if ((status = get_io_timeouts( hFile, type, length, FALSE, &timeouts ))) + goto done; + if (hEvent) NtResetEvent( hEvent, NULL ); + } + timeout = get_next_io_timeout( &timeouts, total ); + + pfd.fd = unix_handle; + pfd.events = POLLIN; + + if (!timeout || !(ret = poll( &pfd, 1, timeout ))) + { + /* return with what we got so far */ + status = total ? STATUS_SUCCESS : STATUS_TIMEOUT; + goto done; + } + if (ret == -1 && errno != EINTR) + { + status = FILE_GetNtStatus(); + goto done; + } + /* will now restart the write */ } - return io_status->u.Status; } - /* synchronous file write */ - status = STATUS_SUCCESS; - while ((result = write( unix_handle, buffer, length )) == -1) - { - if ((errno == EAGAIN) || (errno == EINTR)) continue; - result = 0; - if (errno == EFAULT) status = STATUS_INVALID_USER_BUFFER; - else status = FILE_GetNtStatus(); - break; - } - io_status->Information = result; done: if (needs_close) close( unix_handle ); - if (status != STATUS_PENDING) io_status->u.Status = status; - if (apc && !status) apc( apc_user, io_status, 0 ); + if (status == STATUS_SUCCESS) + { + io_status->u.Status = status; + io_status->Information = total; + TRACE("= SUCCESS (%u)\n", total); + if (hEvent) NtSetEvent( hEvent, 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 && hEvent) NtResetEvent( hEvent, NULL ); + } return status; }

1 0

← Newer
1
...
49
50
51
52
53
54
55
...
69
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 April 2007