February 2006 - Wine-commits

Roderick Colenbrander : wined3d: Added CopyRects method ( based on a patch by Oliver Stieber).
by Alexandre Julliard 07 Feb '06

07 Feb '06

Module: wine Branch: refs/heads/master Commit: c7b58749a19892972c47b54bc5557ca3eaadefc4 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c7b58749a19892972c47b54… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Tue Feb 7 16:51:39 2006 +0100 wined3d: Added CopyRects method (based on a patch by Oliver Stieber). --- dlls/wined3d/device.c | 114 ++++++++++++++++++++++++++++++++++++++ include/wine/wined3d_interface.h | 2 + 2 files changed, 116 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index f814973..aff60cf 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5449,6 +5449,119 @@ HRESULT WINAPI IWineD3DDeviceImpl_Upda return D3D_OK; } +/* Used by DirectX 8 */ +HRESULT WINAPI IWineD3DDeviceImpl_CopyRects(IWineD3DDevice *iface, + IWineD3DSurface* pSourceSurface, CONST RECT* pSourceRectsArray, UINT cRects, + IWineD3DSurface* pDestinationSurface, CONST POINT* pDestPointsArray) { + + IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; + HRESULT hr = D3D_OK; + WINED3DFORMAT srcFormat, destFormat; + UINT srcWidth, destWidth; + UINT srcHeight, destHeight; + UINT srcSize; + WINED3DSURFACE_DESC winedesc; + + TRACE("(%p) pSrcSur=%p, pSourceRects=%p, cRects=%d, pDstSur=%p, pDestPtsArr=%p\n", This, + pSourceSurface, pSourceRectsArray, cRects, pDestinationSurface, pDestPointsArray); + + + /* Check that the source texture is in D3DPOOL_SYSTEMMEM and the destination texture is in D3DPOOL_DEFAULT */ + memset(&winedesc, 0, sizeof(winedesc)); + + winedesc.Format = &srcFormat; + winedesc.Width = &srcWidth; + winedesc.Height = &srcHeight; + winedesc.Size = &srcSize; + IWineD3DSurface_GetDesc(pSourceSurface, &winedesc); + + winedesc.Format = &destFormat; + winedesc.Width = &destWidth; + winedesc.Height = &destHeight; + winedesc.Size = NULL; + IWineD3DSurface_GetDesc(pDestinationSurface, &winedesc); + + /* Check that the source and destination formats match */ + if (srcFormat != destFormat && WINED3DFMT_UNKNOWN != destFormat) { + WARN("(%p) source %p format must match the dest %p format, returning D3DERR_INVALIDCALL\n", This, pSourceSurface, pDestinationSurface); + return D3DERR_INVALIDCALL; + } else if (WINED3DFMT_UNKNOWN == destFormat) { + TRACE("(%p) : Converting destination surface from WINED3DFMT_UNKNOWN to the source format\n", This); + IWineD3DSurface_SetFormat(pDestinationSurface, srcFormat); + destFormat = srcFormat; + } + + /* Quick if complete copy ... */ + if (cRects == 0 && pSourceRectsArray == NULL && pDestPointsArray == NULL) { + + if (srcWidth == destWidth && srcHeight == destHeight) { + D3DLOCKED_RECT lrSrc; + D3DLOCKED_RECT lrDst; + IWineD3DSurface_LockRect(pSourceSurface, &lrSrc, NULL, D3DLOCK_READONLY); + IWineD3DSurface_LockRect(pDestinationSurface, &lrDst, NULL, 0L); + TRACE("Locked src and dst, Direct copy as surfaces are equal, w=%d, h=%d\n", srcWidth, srcHeight); + + memcpy(lrDst.pBits, lrSrc.pBits, srcSize); + + IWineD3DSurface_UnlockRect(pSourceSurface); + IWineD3DSurface_UnlockRect(pDestinationSurface); + TRACE("Unlocked src and dst\n"); + + } else { + + FIXME("Wanted to copy all surfaces but size not compatible, returning D3DERR_INVALIDCALL\n"); + hr = D3DERR_INVALIDCALL; + } + + } else { + + if (NULL != pSourceRectsArray && NULL != pDestPointsArray) { + + int bytesPerPixel = ((IWineD3DSurfaceImpl *) pSourceSurface)->bytesPerPixel; + unsigned int i; + + /* Copy rect by rect */ + for (i = 0; i < cRects; ++i) { + CONST RECT* r = &pSourceRectsArray[i]; + CONST POINT* p = &pDestPointsArray[i]; + int copyperline; + int j; + D3DLOCKED_RECT lrSrc; + D3DLOCKED_RECT lrDst; + RECT dest_rect; + + TRACE("Copying rect %d (%ld,%ld),(%ld,%ld) -> (%ld,%ld)\n", i, r->left, r->top, r->right, r->bottom, p->x, p->y); + if (srcFormat == WINED3DFMT_DXT1) { + copyperline = ((r->right - r->left) * bytesPerPixel) / 2; /* DXT1 is half byte per pixel */ + } else { + copyperline = ((r->right - r->left) * bytesPerPixel); + } + + IWineD3DSurface_LockRect(pSourceSurface, &lrSrc, r, D3DLOCK_READONLY); + dest_rect.left = p->x; + dest_rect.top = p->y; + dest_rect.right = p->x + (r->right - r->left); + dest_rect.bottom= p->y + (r->bottom - r->top); + IWineD3DSurface_LockRect(pDestinationSurface, &lrDst, &dest_rect, 0L); + TRACE("Locked src and dst\n"); + + /* Find where to start */ + for (j = 0; j < (r->bottom - r->top - 1); ++j) { + memcpy((char*) lrDst.pBits + (j * lrDst.Pitch), (char*) lrSrc.pBits + (j * lrSrc.Pitch), copyperline); + } + IWineD3DSurface_UnlockRect(pSourceSurface); + IWineD3DSurface_UnlockRect(pDestinationSurface); + TRACE("Unlocked src and dst\n"); + } + } else { + FIXME("Wanted to copy partial surfaces not implemented, returning D3DERR_INVALIDCALL\n"); + hr = D3DERR_INVALIDCALL; + } + } + + return hr; +} + /* Implementation details at http://developer.nvidia.com/attach/6494 and http://oss.sgi.com/projects/ogl-sample/registry/NV/evaluators.txt @@ -6568,6 +6681,7 @@ const IWineD3DDeviceVtbl IWineD3DDevice_ IWineD3DDeviceImpl_ColorFill, IWineD3DDeviceImpl_UpdateTexture, IWineD3DDeviceImpl_UpdateSurface, + IWineD3DDeviceImpl_CopyRects, IWineD3DDeviceImpl_StretchRect, IWineD3DDeviceImpl_GetRenderTargetData, IWineD3DDeviceImpl_GetFrontBufferData, diff --git a/include/wine/wined3d_interface.h b/include/wine/wined3d_interface.h index dac1d3a..6947183 100644 --- a/include/wine/wined3d_interface.h +++ b/include/wine/wined3d_interface.h @@ -421,6 +421,7 @@ DECLARE_INTERFACE_(IWineD3DDevice,IWineD STDMETHOD(ColorFill)(THIS_ struct IWineD3DSurface* pSurface, CONST D3DRECT* pRect, D3DCOLOR color) PURE; STDMETHOD(UpdateTexture)(THIS_ struct IWineD3DBaseTexture *pSourceTexture, struct IWineD3DBaseTexture *pDestinationTexture) PURE; STDMETHOD(UpdateSurface)(THIS_ struct IWineD3DSurface* pSourceSurface, CONST RECT* pSourceRect, struct IWineD3DSurface* pDestinationSurface, CONST POINT* pDestPoint) PURE; + STDMETHOD(CopyRects)(THIS_ struct IWineD3DSurface* pSourceSurface, CONST RECT* pSourceRectsArray, UINT cRects, struct IWineD3DSurface* pDestinationSurface, CONST POINT* pDestPointsArray); STDMETHOD(StretchRect)(THIS_ struct IWineD3DSurface* pSourceSurface, CONST RECT* pSourceRect, struct IWineD3DSurface* pDestinationSurface, CONST RECT* pDestRect, D3DTEXTUREFILTERTYPE Filter) PURE; STDMETHOD(GetRenderTargetData)(THIS_ struct IWineD3DSurface* pRenderTarget, struct IWineD3DSurface* pSurface) PURE; STDMETHOD(GetFrontBufferData)(THIS_ UINT iSwapChain,struct IWineD3DSurface* pSurface) PURE; @@ -558,6 +559,7 @@ DECLARE_INTERFACE_(IWineD3DDevice,IWineD #define IWineD3DDevice_ColorFill(p,a,b,c) (p)->lpVtbl->ColorFill(p,a,b,c) #define IWineD3DDevice_UpdateTexture(p,a,b) (p)->lpVtbl->UpdateTexture(p,a,b) #define IWineD3DDevice_UpdateSurface(p,a,b,c,d) (p)->lpVtbl->UpdateSurface(p,a,b,c,d) +#define IWineD3DDevice_CopyRects(p,a,b,c,d,e) (p)->lpVtbl->CopyRects(p,a,b,c,d,e) #define IWineD3DDevice_StretchRect(p,a,b,c,d,e) (p)->lpVtbl->StretchRect(p,a,b,c,d,e) #define IWineD3DDevice_GetRenderTargetData(p,a,b) (p)->lpVtbl->GetRenderTargetData(p,a,b) #define IWineD3DDevice_GetFrontBufferData(p,a,b) (p)->lpVtbl->GetFrontBufferData(p,a,b)

1 0

Roderick Colenbrander : d3d8: fbconfig fix.
by Alexandre Julliard 07 Feb '06

07 Feb '06

Module: wine Branch: refs/heads/master Commit: a874487f9544da03f5354b3e7aa00f813f68a90d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a874487f9544da03f5354b3… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Tue Feb 7 16:51:08 2006 +0100 d3d8: fbconfig fix. Right now the ActiveRender code in D3D8 requests a GLX_DEPTH_SIZE of 32 in case the direct3d color format also has a depth of 32. As verified on various linux drivers (Ati fglrx, Ati (dri) and Nvidia) the color depth needs to be 24. This patch sets the depth to 24 and it fixes bugs in 3dmark2001 and other programs. --- dlls/d3d8/device.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 6710164..25afed7 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -4667,7 +4667,7 @@ HRESULT WINAPI IDirect3DDevice8Impl_Acti break; case D3DFMT_D32: - PUSH2(GLX_DEPTH_SIZE, 32); + PUSH2(GLX_DEPTH_SIZE, 24); break; default:

1 0

Mike McCormack : kernel32: More test cases for ReadDirectoryChangesW.
by Alexandre Julliard 07 Feb '06

07 Feb '06

Module: wine Branch: refs/heads/master Commit: 7a61f086f17057a19ad3a65e2f177bbe3de136ac URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=7a61f086f17057a19ad3a65… Author: Mike McCormack <mike(a)codeweavers.com> Date: Tue Feb 7 16:50:44 2006 +0100 kernel32: More test cases for ReadDirectoryChangesW. --- dlls/kernel/tests/change.c | 174 ++++++++++++++++++++++++++++++++++++++------ 1 files changed, 150 insertions(+), 24 deletions(-) diff --git a/dlls/kernel/tests/change.c b/dlls/kernel/tests/change.c index 1b384ae..e21a875 100644 --- a/dlls/kernel/tests/change.c +++ b/dlls/kernel/tests/change.c @@ -29,9 +29,12 @@ #include <stdarg.h> #include <stdio.h> +#include "ntstatus.h" +#define WIN32_NO_STATUS #include "wine/test.h" #include <windef.h> #include <winbase.h> +#include <winternl.h> static DWORD CALLBACK NotificationThread(LPVOID arg) { @@ -316,22 +319,19 @@ static void test_ffcn(void) typedef BOOL (WINAPI *fnReadDirectoryChangesW)(HANDLE,LPVOID,DWORD,BOOL,DWORD, LPDWORD,LPOVERLAPPED,LPOVERLAPPED_COMPLETION_ROUTINE); +fnReadDirectoryChangesW pReadDirectoryChangesW; static void test_readdirectorychanges(void) { HANDLE hdir; char buffer[0x1000]; - DWORD fflags, filter = 0, r; + DWORD fflags, filter = 0, r, dwCount; OVERLAPPED ov; WCHAR path[MAX_PATH], subdir[MAX_PATH]; static const WCHAR szBoo[] = { '\\','b','o','o',0 }; static const WCHAR szHoo[] = { '\\','h','o','o',0 }; - fnReadDirectoryChangesW pReadDirectoryChangesW; - HMODULE hkernel32; + PFILE_NOTIFY_INFORMATION pfni; - hkernel32 = GetModuleHandle("kernel32"); - pReadDirectoryChangesW = (fnReadDirectoryChangesW) - GetProcAddress(hkernel32, "ReadDirectoryChangesW"); if (!pReadDirectoryChangesW) return; @@ -356,11 +356,12 @@ static void test_readdirectorychanges(vo ok(r==FALSE, "should return false\n"); fflags = FILE_FLAG_BACKUP_SEMANTICS | FILE_FLAG_OVERLAPPED; - hdir = CreateFileW(path, GENERIC_READ|SYNCHRONIZE, FILE_SHARE_READ, NULL, + hdir = CreateFileW(path, GENERIC_READ|SYNCHRONIZE|FILE_LIST_DIRECTORY, + FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, OPEN_EXISTING, fflags, NULL); ok( hdir != INVALID_HANDLE_VALUE, "failed to open directory\n"); - ov.hEvent = CreateEvent( NULL, 0, 0, NULL ); + ov.hEvent = CreateEvent( NULL, 1, 0, NULL ); SetLastError(0xd0b00b00); r = pReadDirectoryChangesW(hdir,NULL,0,FALSE,0,NULL,NULL,NULL); @@ -382,28 +383,40 @@ static void test_readdirectorychanges(vo filter |= FILE_NOTIFY_CHANGE_SECURITY; SetLastError(0xd0b00b00); + ov.Internal = 0; + ov.InternalHigh = 0; + memset( buffer, 0, sizeof buffer ); + r = pReadDirectoryChangesW(hdir,buffer,sizeof buffer,FALSE,-1,NULL,&ov,NULL); ok(GetLastError()==ERROR_INVALID_PARAMETER,"last error wrong\n"); ok(r==FALSE, "should return false\n"); - r = pReadDirectoryChangesW(hdir,NULL,0,FALSE,filter,NULL,&ov,NULL); - ok(r==TRUE, "should return true\n"); + r = pReadDirectoryChangesW(hdir,buffer,sizeof buffer,FALSE,0,NULL,&ov,NULL); + ok(GetLastError()==ERROR_INVALID_PARAMETER,"last error wrong\n"); + ok(r==FALSE, "should return false\n"); - r = WaitForSingleObject( ov.hEvent, 0 ); - ok( r == STATUS_TIMEOUT, "should timeout\n" ); + r = pReadDirectoryChangesW(hdir,buffer,sizeof buffer,FALSE,filter,NULL,&ov,NULL); + ok(r==TRUE, "should return true\n"); - r = WaitForSingleObject( hdir, 0 ); + r = WaitForSingleObject( ov.hEvent, 10 ); ok( r == STATUS_TIMEOUT, "should timeout\n" ); r = CreateDirectoryW( subdir, NULL ); ok( r == TRUE, "failed to create directory\n"); - r = WaitForSingleObject( hdir, 0 ); - ok( r == STATUS_TIMEOUT, "should timeout\n" ); - - r = WaitForSingleObject( ov.hEvent, 0 ); + r = WaitForSingleObject( ov.hEvent, INFINITE ); ok( r == WAIT_OBJECT_0, "event should be ready\n" ); + ok( ov.Internal == STATUS_SUCCESS, "ov.Internal wrong\n"); + ok( ov.InternalHigh == 0x12, "ov.InternalHigh wrong\n"); + + pfni = (PFILE_NOTIFY_INFORMATION) buffer; + ok( pfni->NextEntryOffset == 0, "offset wrong\n" ); + ok( pfni->Action == FILE_ACTION_ADDED, "action wrong\n" ); + ok( pfni->FileNameLength == 6, "len wrong\n" ); + ok( !memcmp(pfni->FileName,&szHoo[1],6), "name wrong\n" ); + + ResetEvent(ov.hEvent); SetLastError(0xd0b00b00); r = pReadDirectoryChangesW(hdir,buffer,sizeof buffer,FALSE,0,NULL,NULL,NULL); ok(GetLastError()==ERROR_INVALID_PARAMETER,"last error wrong\n"); @@ -415,22 +428,39 @@ static void test_readdirectorychanges(vo filter = FILE_NOTIFY_CHANGE_SIZE; - CloseHandle( ov.hEvent ); - ov.hEvent = NULL; - r = pReadDirectoryChangesW(hdir,NULL,0,FALSE,filter,NULL,&ov,NULL); + SetEvent(ov.hEvent); + ov.Internal = 1; + ov.InternalHigh = 1; + ov.Offset = 0; + ov.OffsetHigh = 0; + memset( buffer, 0, sizeof buffer ); + r = pReadDirectoryChangesW(hdir,buffer,sizeof buffer,FALSE,filter,NULL,&ov,NULL); ok(r==TRUE, "should return true\n"); - r = WaitForSingleObject( hdir, 0 ); + ok( ov.Internal == STATUS_PENDING, "ov.Internal wrong\n"); + ok( ov.InternalHigh == 1, "ov.InternalHigh wrong\n"); + + r = WaitForSingleObject( ov.hEvent, 0 ); ok( r == STATUS_TIMEOUT, "should timeout\n" ); r = RemoveDirectoryW( subdir ); ok( r == TRUE, "failed to remove directory\n"); - r = WaitForSingleObject( hdir, 0 ); + r = WaitForSingleObject( ov.hEvent, INFINITE ); ok( r == WAIT_OBJECT_0, "should be ready\n" ); - r = WaitForSingleObject( hdir, 0 ); - ok( r == WAIT_OBJECT_0, "should be ready\n" ); + ok( ov.Internal == STATUS_SUCCESS, "ov.Internal wrong\n"); + ok( ov.InternalHigh == 0x12, "ov.InternalHigh wrong\n"); + + r = GetOverlappedResult( hdir, &ov, &dwCount, TRUE ); + ok( r == TRUE, "getoverlappedresult failed\n"); + ok( dwCount == 0x12, "count wrong\n"); + + pfni = (PFILE_NOTIFY_INFORMATION) buffer; + ok( pfni->NextEntryOffset == 0, "offset wrong\n" ); + ok( pfni->Action == FILE_ACTION_REMOVED, "action wrong\n" ); + ok( pfni->FileNameLength == 6, "len wrong\n" ); + ok( !memcmp(pfni->FileName,&szHoo[1],6), "name wrong\n" ); CloseHandle(hdir); @@ -438,10 +468,106 @@ static void test_readdirectorychanges(vo ok( r == TRUE, "failed to remove directory\n"); } +/* show the behaviour when a null buffer is passed */ +static void test_readdirectorychanges_null(void) +{ + NTSTATUS r; + HANDLE hdir; + char buffer[0x1000]; + DWORD fflags, filter = 0; + OVERLAPPED ov; + WCHAR path[MAX_PATH], subdir[MAX_PATH]; + static const WCHAR szBoo[] = { '\\','b','o','o',0 }; + static const WCHAR szHoo[] = { '\\','h','o','o',0 }; + PFILE_NOTIFY_INFORMATION pfni; + + if (!pReadDirectoryChangesW) + return; + + r = GetTempPathW( MAX_PATH, path ); + ok( r != 0, "temp path failed\n"); + if (!r) + return; + + lstrcatW( path, szBoo ); + lstrcpyW( subdir, path ); + lstrcatW( subdir, szHoo ); + + RemoveDirectoryW( subdir ); + RemoveDirectoryW( path ); + + r = CreateDirectoryW(path, NULL); + ok( r == TRUE, "failed to create directory\n"); + + fflags = FILE_FLAG_BACKUP_SEMANTICS | FILE_FLAG_OVERLAPPED; + hdir = CreateFileW(path, GENERIC_READ|SYNCHRONIZE|FILE_LIST_DIRECTORY, + FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, + OPEN_EXISTING, fflags, NULL); + ok( hdir != INVALID_HANDLE_VALUE, "failed to open directory\n"); + + ov.hEvent = CreateEvent( NULL, 1, 0, NULL ); + + filter = FILE_NOTIFY_CHANGE_FILE_NAME; + filter |= FILE_NOTIFY_CHANGE_DIR_NAME; + + SetLastError(0xd0b00b00); + ov.Internal = 0; + ov.InternalHigh = 0; + memset( buffer, 0, sizeof buffer ); + + r = pReadDirectoryChangesW(hdir,NULL,0,FALSE,filter,NULL,&ov,NULL); + ok(r==TRUE, "should return true\n"); + + r = WaitForSingleObject( ov.hEvent, 0 ); + ok( r == STATUS_TIMEOUT, "should timeout\n" ); + + r = CreateDirectoryW( subdir, NULL ); + ok( r == TRUE, "failed to create directory\n"); + + r = WaitForSingleObject( ov.hEvent, 0 ); + ok( r == WAIT_OBJECT_0, "event should be ready\n" ); + + ok( ov.Internal == STATUS_NOTIFY_ENUM_DIR, "ov.Internal wrong\n"); + ok( ov.InternalHigh == 0, "ov.InternalHigh wrong\n"); + + ov.Internal = 0; + ov.InternalHigh = 0; + ov.Offset = 0; + ov.OffsetHigh = 0; + memset( buffer, 0, sizeof buffer ); + + r = pReadDirectoryChangesW(hdir,buffer,sizeof buffer,FALSE,filter,NULL,&ov,NULL); + ok(r==TRUE, "should return true\n"); + + r = WaitForSingleObject( ov.hEvent, 0 ); + ok( r == STATUS_TIMEOUT, "should timeout\n" ); + + r = RemoveDirectoryW( subdir ); + ok( r == TRUE, "failed to remove directory\n"); + + r = WaitForSingleObject( ov.hEvent, INFINITE ); + ok( r == WAIT_OBJECT_0, "should be ready\n" ); + + ok( ov.Internal == STATUS_NOTIFY_ENUM_DIR, "ov.Internal wrong\n"); + ok( ov.InternalHigh == 0, "ov.InternalHigh wrong\n"); + + pfni = (PFILE_NOTIFY_INFORMATION) buffer; + ok( pfni->NextEntryOffset == 0, "offset wrong\n" ); + + CloseHandle(hdir); + + r = RemoveDirectoryW( path ); + ok( r == TRUE, "failed to remove directory\n"); +} START_TEST(change) { + HMODULE hkernel32 = GetModuleHandle("kernel32"); + pReadDirectoryChangesW = (fnReadDirectoryChangesW) + GetProcAddress(hkernel32, "ReadDirectoryChangesW"); + test_FindFirstChangeNotification(); test_ffcn(); test_readdirectorychanges(); + test_readdirectorychanges_null(); }

1 0

Mike McCormack : kernel32: ReadDirectoryChangesW fixes.
by Alexandre Julliard 07 Feb '06

07 Feb '06

Module: wine Branch: refs/heads/master Commit: 0790f955897d5664997d7263fbd3e42165eda548 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0790f955897d5664997d726… Author: Mike McCormack <mike(a)codeweavers.com> Date: Tue Feb 7 16:50:36 2006 +0100 kernel32: ReadDirectoryChangesW fixes. ReadDirectoryChangesW remembers whether it's recording changes or not. Don't initialize overlapped->InternalHigh. The hEvent is cleared when ReadDirectoryChanges is called. --- dlls/kernel/change.c | 14 +++++++++++++- dlls/ntdll/directory.c | 1 + include/wine/server_protocol.h | 3 ++- server/change.c | 36 +++++++++++++++++++++++------------- server/protocol.def | 1 + server/trace.c | 1 + 6 files changed, 41 insertions(+), 15 deletions(-) diff --git a/dlls/kernel/change.c b/dlls/kernel/change.c index 235ac58..7c5eb92 100644 --- a/dlls/kernel/change.c +++ b/dlls/kernel/change.c @@ -132,6 +132,19 @@ BOOL WINAPI FindCloseChangeNotification( return CloseHandle( handle ); } +/**************************************************************************** + * ReadDirectoryChangesW (KERNEL32.@) + * + * NOTES + * + * The filter is remember from the first run and ignored on successive runs. + * + * If there's no output buffer on the first run, it's ignored successive runs + * and STATUS_NOTIFY_ENUM_DIRECTORY is returned with an empty buffer. + * + * If a NULL overlapped->hEvent is passed, the directory handle is used + * for signalling. + */ BOOL WINAPI ReadDirectoryChangesW( HANDLE handle, LPVOID buffer, DWORD len, BOOL subtree, DWORD filter, LPDWORD returned, LPOVERLAPPED overlapped, LPOVERLAPPED_COMPLETION_ROUTINE completion ) @@ -155,7 +168,6 @@ BOOL WINAPI ReadDirectoryChangesW( HANDL ios = (PIO_STATUS_BLOCK) pov; ios->Status = STATUS_PENDING; - ios->Information = 0; status = NtNotifyChangeDirectoryFile( handle, pov->hEvent, NULL, NULL, ios, buffer, len, filter, subtree ); diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index 84e01af..af29057 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -1899,6 +1899,7 @@ NtNotifyChangeDirectoryFile( HANDLE File req->handle = FileHandle; req->event = Event; req->filter = CompletionFilter; + req->want_data = (Buffer != NULL); req->io_apc = read_changes_apc; req->io_sb = IoStatusBlock; req->io_user = info; diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 8a061ed..9f9150c 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -1401,6 +1401,7 @@ struct read_directory_changes_request obj_handle_t handle; obj_handle_t event; unsigned int filter; + int want_data; void* io_apc; void* io_sb; void* io_user; @@ -4363,6 +4364,6 @@ union generic_reply struct query_symlink_reply query_symlink_reply; }; -#define SERVER_PROTOCOL_VERSION 224 +#define SERVER_PROTOCOL_VERSION 225 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/change.c b/server/change.c index d6213fe..c35a82c 100644 --- a/server/change.c +++ b/server/change.c @@ -141,6 +141,7 @@ struct dir struct event *event; unsigned int filter; /* notification filter */ int notified; /* SIGIO counter */ + int want_data; /* return change data */ long signaled; /* the file changed */ struct fd *inotify_fd; /* inotify file descriptor */ int wd; /* inotify watch descriptor */ @@ -254,6 +255,7 @@ struct object *create_dir_obj( struct fd dir->filter = 0; dir->notified = 0; dir->signaled = 0; + dir->want_data = 0; dir->inotify_fd = NULL; dir->wd = -1; grab_object( fd ); @@ -412,20 +414,23 @@ static void inotify_do_change_notify( st { struct change_record *record; - record = malloc( sizeof (*record) + ie->len - 1 ) ; - if (!record) - return; - - if( ie->mask & IN_CREATE ) - record->action = FILE_ACTION_ADDED; - else if( ie->mask & IN_DELETE ) - record->action = FILE_ACTION_REMOVED; - else - record->action = FILE_ACTION_MODIFIED; - memcpy( record->name, ie->name, ie->len ); - record->len = strlen( ie->name ); + if (dir->want_data) + { + record = malloc( sizeof (*record) + ie->len - 1 ) ; + if (!record) + return; + + if( ie->mask & IN_CREATE ) + record->action = FILE_ACTION_ADDED; + else if( ie->mask & IN_DELETE ) + record->action = FILE_ACTION_REMOVED; + else + record->action = FILE_ACTION_MODIFIED; + memcpy( record->name, ie->name, ie->len ); + record->len = strlen( ie->name ); - list_add_tail( &dir->change_records, &record->entry ); + list_add_tail( &dir->change_records, &record->entry ); + } if (!list_empty( &dir->change_q )) async_terminate_head( &dir->change_q, STATUS_ALERTED ); @@ -551,12 +556,17 @@ DECL_HANDLER(read_directory_changes) { insert_change( dir ); dir->filter = req->filter; + dir->want_data = req->want_data; } /* remove any notifications */ if (dir->signaled>0) dir->signaled--; + /* clear the event */ + if (event) + reset_event( event ); + /* setup the real notification */ #ifdef USE_INOTIFY if (!inotify_adjust_changes( dir )) diff --git a/server/protocol.def b/server/protocol.def index 2b3a587..986a595 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -1045,6 +1045,7 @@ enum char_info_mode obj_handle_t handle; /* handle to the directory */ obj_handle_t event; /* handle to the event */ unsigned int filter; /* notification filter */ + int want_data; /* flag indicating whether change data should be collected */ void* io_apc; /* APC routine to queue upon end of async */ void* io_sb; /* I/O status block (unique across all async on this handle) */ void* io_user; /* data to pass back to caller */ diff --git a/server/trace.c b/server/trace.c index e1ed879..05f4bb6 100644 --- a/server/trace.c +++ b/server/trace.c @@ -1449,6 +1449,7 @@ static void dump_read_directory_changes_ fprintf( stderr, " handle=%p,", req->handle ); fprintf( stderr, " event=%p,", req->event ); fprintf( stderr, " filter=%08x,", req->filter ); + fprintf( stderr, " want_data=%d,", req->want_data ); fprintf( stderr, " io_apc=%p,", req->io_apc ); fprintf( stderr, " io_sb=%p,", req->io_sb ); fprintf( stderr, " io_user=%p", req->io_user );

1 0

Alexandre Julliard : Include wine/port.h in files that use exceptions.
by Alexandre Julliard 07 Feb '06

07 Feb '06

Module: wine Branch: refs/heads/master Commit: be22a9684766bb9bdd5808041ae42b185921cb84 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=be22a9684766bb9bdd58080… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 7 16:31:21 2006 +0100 Include wine/port.h in files that use exceptions. --- dlls/crypt32/cert.c | 4 ++++ dlls/crypt32/encode.c | 4 ++++ dlls/ole32/rpc.c | 1 + dlls/winecrt0/stub.c | 3 +++ dlls/winmm/driver.c | 3 +++ dlls/winmm/lolvldrv.c | 3 +++ 6 files changed, 18 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index 1cdc069..346d898 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -27,6 +27,10 @@ * registering and enumerating physical stores and locations.) * - Many flags, options and whatnot are unimplemented. */ + +#include "config.h" +#include "wine/port.h" + #include <assert.h> #include <stdarg.h> #include "windef.h" diff --git a/dlls/crypt32/encode.c b/dlls/crypt32/encode.c index e97c894..b0a7196 100644 --- a/dlls/crypt32/encode.c +++ b/dlls/crypt32/encode.c @@ -30,6 +30,10 @@ * MSDN, especially: * http://msdn.microsoft.com/library/en-us/seccrypto/security/constants_for_cr… */ + +#include "config.h" +#include "wine/port.h" + #include <assert.h> #include <stdarg.h> #include <stdio.h> diff --git a/dlls/ole32/rpc.c b/dlls/ole32/rpc.c index c45df68..05becb2 100644 --- a/dlls/ole32/rpc.c +++ b/dlls/ole32/rpc.c @@ -21,6 +21,7 @@ */ #include "config.h" +#include "wine/port.h" #include <stdlib.h> #include <stdarg.h> diff --git a/dlls/winecrt0/stub.c b/dlls/winecrt0/stub.c index 474f021..8bb1732 100644 --- a/dlls/winecrt0/stub.c +++ b/dlls/winecrt0/stub.c @@ -18,6 +18,9 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#include "config.h" +#include "wine/port.h" + #include <stdarg.h> #include "windef.h" #include "winbase.h" diff --git a/dlls/winmm/driver.c b/dlls/winmm/driver.c index 7cd6759..f1a5ea0 100644 --- a/dlls/winmm/driver.c +++ b/dlls/winmm/driver.c @@ -20,6 +20,9 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#include "config.h" +#include "wine/port.h" + #include <string.h> #include <stdarg.h> #include "windef.h" diff --git a/dlls/winmm/lolvldrv.c b/dlls/winmm/lolvldrv.c index 2560240..926445a 100644 --- a/dlls/winmm/lolvldrv.c +++ b/dlls/winmm/lolvldrv.c @@ -20,6 +20,9 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#include "config.h" +#include "wine/port.h" + #include <string.h> #include <stdarg.h> #include <stdio.h>

1 0

Robert Shearman : oleaut32: Fix circular reference count in Typelib marshaler.
by Alexandre Julliard 07 Feb '06

07 Feb '06

Module: wine Branch: refs/heads/master Commit: b0218db90a8b3c81ecb6529c089acc0074cd2f9c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b0218db90a8b3c81ecb6529… Author: Robert Shearman <rob(a)codeweavers.com> Date: Tue Feb 7 16:26:23 2006 +0100 oleaut32: Fix circular reference count in Typelib marshaler. The current method of handling typelib-marshaled interfaces that derive from IDispatch is to query for an IDispatch pointer from the proxy, but this causes a circular reference count. Fix the reference counting by loading using the IRpcProxyBuffer of IDispatch without an outer unknown, so that the lifetime is controlled by the typelib-marshaled interface's proxy. The IDispatch proxy now shares the same channel as the typelib-marshaled interface, so fix up the stub side to handle this. --- dlls/oleaut32/tmarshal.c | 153 +++++++++++++++++++++++++++++----------------- 1 files changed, 95 insertions(+), 58 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=b0218db90a8b3c81ecb…

1 0

Robert Shearman : oleaut32: Handle VT_INT in serialize_param and deserialize_param.
by Alexandre Julliard 07 Feb '06

07 Feb '06

Module: wine Branch: refs/heads/master Commit: fd81d9c56e2f6368ff30e6c095050a2840558151 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=fd81d9c56e2f6368ff30e6c… Author: Robert Shearman <rob(a)codeweavers.com> Date: Tue Feb 7 16:26:02 2006 +0100 oleaut32: Handle VT_INT in serialize_param and deserialize_param. --- dlls/oleaut32/tmarshal.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/tmarshal.c b/dlls/oleaut32/tmarshal.c index 9428995..1e1cea6 100644 --- a/dlls/oleaut32/tmarshal.c +++ b/dlls/oleaut32/tmarshal.c @@ -517,6 +517,7 @@ serialize_param( return hres; case VT_BOOL: case VT_ERROR: + case VT_INT: case VT_UINT: case VT_I4: case VT_R4: @@ -841,6 +842,7 @@ deserialize_param( case VT_ERROR: case VT_BOOL: case VT_I4: + case VT_INT: case VT_UINT: case VT_R4: case VT_UI4:

1 0

Robert Shearman : oleaut32: Release interfaces when told to.
by Alexandre Julliard 07 Feb '06

07 Feb '06

Module: wine Branch: refs/heads/master Commit: ec5d73910c754ba9cadc6724d217fb6779545149 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ec5d73910c754ba9cadc672… Author: Robert Shearman <rob(a)codeweavers.com> Date: Tue Feb 7 16:25:42 2006 +0100 oleaut32: Release interfaces when told to. Make the VT_DISPATCH and VT_UNKNOWN cases of serialize_param match the TKIND_INTERFACE case below by releasing their respective interfaces as necessary. --- dlls/oleaut32/tmarshal.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/tmarshal.c b/dlls/oleaut32/tmarshal.c index 7c3bddc..9428995 100644 --- a/dlls/oleaut32/tmarshal.c +++ b/dlls/oleaut32/tmarshal.c @@ -668,11 +668,15 @@ serialize_param( if (debugout) TRACE_(olerelay)("unk(0x%lx)",*arg); if (writeit) hres = _marshal_interface(buf,&IID_IUnknown,(LPUNKNOWN)*arg); + if (dealloc) + IUnknown_Release((LPUNKNOWN)*arg); return hres; case VT_DISPATCH: if (debugout) TRACE_(olerelay)("idisp(0x%lx)",*arg); if (writeit) hres = _marshal_interface(buf,&IID_IDispatch,(LPUNKNOWN)*arg); + if (dealloc) + IUnknown_Release((LPUNKNOWN)*arg); return hres; case VT_VOID: if (debugout) TRACE_(olerelay)("<void>");

1 0

Robert Shearman : ole32: Print an error message if the apartment isn' t initialised in
by Alexandre Julliard 07 Feb '06

07 Feb '06

Module: wine Branch: refs/heads/master Commit: af7c076337afb2449e2985bea46a73fc79b72b3f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=af7c076337afb2449e2985b… Author: Robert Shearman <rob(a)codeweavers.com> Date: Tue Feb 7 16:25:25 2006 +0100 ole32: Print an error message if the apartment isn't initialised in CoCreateInstance. --- dlls/ole32/compobj.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index dcef9c6..ab44b20 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -1829,7 +1829,11 @@ HRESULT WINAPI CoCreateInstance( TRACE("(rclsid=%s, pUnkOuter=%p, dwClsContext=%08lx, riid=%s, ppv=%p)\n", debugstr_guid(rclsid), pUnkOuter, dwClsContext, debugstr_guid(iid), ppv); - if (!COM_CurrentApt()) return CO_E_NOTINITIALIZED; + if (!COM_CurrentApt()) + { + ERR("apartment not initialised\n"); + return CO_E_NOTINITIALIZED; + } /* * Sanity check

1 0

Robert Shearman : widl: Fix some warnings caused by making attributes const .
by Alexandre Julliard 07 Feb '06

07 Feb '06

Module: wine Branch: refs/heads/master Commit: 59830d69b4429b3e7a4f5941dd96114fd51fa407 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=59830d69b4429b3e7a4f594… Author: Robert Shearman <rob(a)codeweavers.com> Date: Tue Feb 7 16:25:10 2006 +0100 widl: Fix some warnings caused by making attributes const. --- tools/widl/write_msft.c | 36 ++++++++++++++++++------------------ 1 files changed, 18 insertions(+), 18 deletions(-) diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index 219e9c2..ac67500 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -1169,7 +1169,7 @@ static HRESULT add_func_desc(msft_typein int num_params = 0, num_defaults = 0; var_t *arg, *last_arg = NULL; char *namedata; - attr_t *attr; + const attr_t *attr; unsigned int funcflags = 0, callconv = 4 /* CC_STDCALL */; unsigned int funckind, invokekind = 1 /* INVOKE_FUNC */; int help_context = 0, help_string_context = 0, help_string_offset = -1; @@ -1350,7 +1350,7 @@ static HRESULT add_func_desc(msft_typein } for (arg = last_arg, i = 0; arg; arg = PREV_LINK(arg), i++) { - attr_t *attr; + const attr_t *attr; int paramflags = 0; int *paramdata = typedata + 6 + extra_attr + (num_defaults ? num_params : 0) + i * 3; int *defaultdata = num_defaults ? typedata + 6 + extra_attr + i : NULL; @@ -1476,7 +1476,7 @@ static HRESULT add_var_desc(msft_typeinf int var_type_size, var_kind = 0 /* VAR_PERINSTANCE */; int alignment; int varflags = 0; - attr_t *attr; + const attr_t *attr; char *namedata; int var_num = (typeinfo->typeinfo->cElement >> 16) & 0xffff; @@ -1637,7 +1637,7 @@ static HRESULT add_impl_type(msft_typein } static msft_typeinfo_t *create_msft_typeinfo(msft_typelib_t *typelib, enum type_kind kind, - const char *name, attr_t *attr, int idx) + const char *name, const attr_t *attr, int idx) { msft_typeinfo_t *msft_typeinfo; int nameoffset; @@ -1823,7 +1823,7 @@ static void add_interface_typeinfo(msft_ type_t *ref; msft_typeinfo_t *msft_typeinfo; int num_parents = 0, num_funcs = 0; - attr_t *attr; + const attr_t *attr; for(attr = interface->attrs; attr; attr = NEXT_LINK(attr)) if(attr->type == ATTR_DISPINTERFACE) @@ -1848,7 +1848,7 @@ static void add_interface_typeinfo(msft_ for(ref = interface->ref; ref; ref = ref->ref) { num_parents++; for(func = ref->funcs; func; func = NEXT_LINK(func)) { - attr_t *attr; + const attr_t *attr; for(attr = func->def->attrs; attr; attr = NEXT_LINK(attr)) if(attr->type == ATTR_LOCAL) break; @@ -1911,7 +1911,7 @@ static void add_typedef_typeinfo(msft_ty { msft_typeinfo_t *msft_typeinfo; int alignment; - attr_t *attrs; + const attr_t *attrs; tdef->type->typelib_idx = typelib->typelib_header.nrtypeinfos; msft_typeinfo = create_msft_typeinfo(typelib, TKIND_ALIAS, tdef->name, tdef->type->attrs, @@ -1931,7 +1931,7 @@ static void add_coclass_typeinfo(msft_ty int num_ifaces = 0, offset, i; MSFT_RefRecord *ref, *first = NULL, *first_source = NULL; int have_default = 0, have_default_source = 0; - attr_t *attr; + const attr_t *attr; msft_typeinfo = create_msft_typeinfo(typelib, TKIND_COCLASS, cls->name, cls->attrs, typelib->typelib_header.nrtypeinfos); @@ -2072,7 +2072,7 @@ static void set_name(msft_typelib_t *typ static void set_version(msft_typelib_t *typelib) { long version = MAKELONG(0,0); - attr_t *attr; + const attr_t *attr; for(attr = typelib->typelib->attrs; attr; attr = NEXT_LINK(attr)) { if(attr->type == ATTR_VERSION) { @@ -2087,7 +2087,7 @@ static void set_guid(msft_typelib_t *typ { MSFT_GuidEntry guidentry; int offset; - attr_t *attr; + const attr_t *attr; GUID guid = {0,0,0,{0,0,0,0,0,0}}; guidentry.guid = guid; @@ -2111,7 +2111,7 @@ static void set_guid(msft_typelib_t *typ static void set_doc_string(msft_typelib_t *typelib) { - attr_t *attr; + const attr_t *attr; int offset; for(attr = typelib->typelib->attrs; attr; attr = NEXT_LINK(attr)) { @@ -2127,7 +2127,7 @@ static void set_doc_string(msft_typelib_ static void set_help_file_name(msft_typelib_t *typelib) { int offset; - attr_t *attr; + const attr_t *attr; for(attr = typelib->typelib->attrs; attr; attr = NEXT_LINK(attr)) { if(attr->type == ATTR_HELPFILE) { offset = ctl2_alloc_string(typelib, attr->u.pval); @@ -2141,10 +2141,10 @@ static void set_help_file_name(msft_type static void set_help_context(msft_typelib_t *typelib) { - attr_t *attr; + const attr_t *attr; for(attr = typelib->typelib->attrs; attr; attr = NEXT_LINK(attr)) { if(attr->type == ATTR_HELPCONTEXT) { - expr_t *expr = (expr_t *)attr->u.pval; + const expr_t *expr = (expr_t *)attr->u.pval; typelib->typelib_header.helpcontext = expr->cval; } } @@ -2154,7 +2154,7 @@ static void set_help_context(msft_typeli static void set_help_string_dll(msft_typelib_t *typelib) { int offset; - attr_t *attr; + const attr_t *attr; for(attr = typelib->typelib->attrs; attr; attr = NEXT_LINK(attr)) { if(attr->type == ATTR_HELPSTRINGDLL) { offset = ctl2_alloc_string(typelib, attr->u.pval); @@ -2168,10 +2168,10 @@ static void set_help_string_dll(msft_typ static void set_help_string_context(msft_typelib_t *typelib) { - attr_t *attr; + const attr_t *attr; for(attr = typelib->typelib->attrs; attr; attr = NEXT_LINK(attr)) { if(attr->type == ATTR_HELPSTRINGCONTEXT) { - expr_t *expr = (expr_t *)attr->u.pval; + const expr_t *expr = (expr_t *)attr->u.pval; typelib->typelib_header.helpstringcontext = expr->cval; } } @@ -2186,7 +2186,7 @@ static void set_lcid(msft_typelib_t *typ static void set_lib_flags(msft_typelib_t *typelib) { - attr_t *attr; + const attr_t *attr; typelib->typelib_header.flags = 0; for(attr = typelib->typelib->attrs; attr; attr = NEXT_LINK(attr)) {

1 0