February 2008 - Wine-commits

Roy Shea : qmgr: Implement job lists for IBackgroundCopyManager.
by Alexandre Julliard 29 Feb '08

29 Feb '08

Module: wine Branch: master Commit: c8a0e98b719cbb072a1ee8503761d8547dfca671 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8a0e98b719cbb072a1ee8503… Author: Roy Shea <roy(a)cs.hmc.edu> Date: Thu Feb 28 19:01:29 2008 -0800 qmgr: Implement job lists for IBackgroundCopyManager. --- dlls/qmgr/qmgr.c | 20 +++++++++++++++++++- dlls/qmgr/qmgr.h | 2 ++ 2 files changed, 21 insertions(+), 1 deletions(-) diff --git a/dlls/qmgr/qmgr.c b/dlls/qmgr/qmgr.c index c6f3db1..fdfd30c 100644 --- a/dlls/qmgr/qmgr.c +++ b/dlls/qmgr/qmgr.c @@ -26,7 +26,12 @@ WINE_DEFAULT_DEBUG_CHANNEL(qmgr); /* Destructor for instances of background copy manager */ static void BackgroundCopyManagerDestructor(BackgroundCopyManagerImpl *This) { + BackgroundCopyJobImpl *job; TRACE("%p\n", This); + + LIST_FOR_EACH_ENTRY(job, &This->jobs, BackgroundCopyJobImpl, entryFromQmgr) + job->lpVtbl->Release((IBackgroundCopyJob *) job); + HeapFree(GetProcessHeap(), 0, This); } @@ -91,9 +96,21 @@ static HRESULT WINAPI BITS_IBackgroundCopyManager_CreateJob( GUID *pJobId, IBackgroundCopyJob **ppJob) { + BackgroundCopyManagerImpl * This = (BackgroundCopyManagerImpl *) iface; + BackgroundCopyJobImpl *job; + HRESULT hres; TRACE("\n"); - return BackgroundCopyJobConstructor(DisplayName, Type, pJobId, + + hres = BackgroundCopyJobConstructor(DisplayName, Type, pJobId, (LPVOID *) ppJob); + if (FAILED(hres)) + return hres; + + /* Add a reference to the job to job list */ + IBackgroundCopyJob_AddRef(*ppJob); + job = (BackgroundCopyJobImpl *) *ppJob; + list_add_head(&This->jobs, &job->entryFromQmgr); + return S_OK; } static HRESULT WINAPI BITS_IBackgroundCopyManager_GetJob( @@ -151,6 +168,7 @@ HRESULT BackgroundCopyManagerConstructor(IUnknown *pUnkOuter, LPVOID *ppObj) This->lpVtbl = &BITS_IBackgroundCopyManager_Vtbl; This->ref = 1; + list_init(&This->jobs); *ppObj = &This->lpVtbl; return S_OK; diff --git a/dlls/qmgr/qmgr.h b/dlls/qmgr/qmgr.h index ddf9eee..f5629c6 100644 --- a/dlls/qmgr/qmgr.h +++ b/dlls/qmgr/qmgr.h @@ -40,6 +40,7 @@ typedef struct GUID jobId; struct list files; BG_JOB_PROGRESS jobProgress; + struct list entryFromQmgr; } BackgroundCopyJobImpl; /* Enum background copy jobs vtbl and related data */ @@ -74,6 +75,7 @@ typedef struct { const IBackgroundCopyManagerVtbl *lpVtbl; LONG ref; + struct list jobs; } BackgroundCopyManagerImpl; typedef struct

1 0

Dmitry Timoshkov : kernel32: Add stubs for fiber local storage APIs.
by Alexandre Julliard 29 Feb '08

29 Feb '08

Module: wine Branch: master Commit: e49e8b20dbe8f4f101dae7fdeacdba4e6b4b6a84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e49e8b20dbe8f4f101dae7fde… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Fri Feb 29 17:19:43 2008 +0800 kernel32: Add stubs for fiber local storage APIs. --- dlls/kernel32/fiber.c | 48 +++++++++++++++++++++++++++++++++++++++++++ dlls/kernel32/kernel32.spec | 4 +++ include/winbase.h | 5 ++++ include/winnt.h | 1 + 4 files changed, 58 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/fiber.c b/dlls/kernel32/fiber.c index 24ea351..e95ef86 100644 --- a/dlls/kernel32/fiber.c +++ b/dlls/kernel32/fiber.c @@ -34,6 +34,9 @@ #include "winternl.h" #include "wine/exception.h" #include "wine/library.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(fiber); struct fiber_data { @@ -201,3 +204,48 @@ void WINAPI SwitchToFiber( LPVOID fiber ) siglongjmp( new_fiber->jmpbuf, 1 ); } } + +/*********************************************************************** + * FlsAlloc (KERNEL32.@) + */ +DWORD WINAPI FlsAlloc( PFLS_CALLBACK_FUNCTION callback ) +{ + FIXME( "%p: stub!\n", callback ); + + SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); + return FLS_OUT_OF_INDEXES; +} + +/*********************************************************************** + * FlsFree (KERNEL32.@) + */ +BOOL WINAPI FlsFree( DWORD index ) +{ + FIXME( "%x: stub!\n", index ); + + SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); + return FALSE; +} + +/*********************************************************************** + * FlsGetValue (KERNEL32.@) + */ +PVOID WINAPI FlsGetValue( DWORD index ) +{ + FIXME( "%x: stub!\n", index ); + + SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); + return NULL; +} + +/*********************************************************************** + * FlsSetValue (KERNEL32.@) + */ +BOOL WINAPI FlsSetValue( DWORD index, PVOID data ) +{ + + FIXME( "%x, %p: stub!\n", index, data ); + + SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); + return FALSE; +} diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 6bc867f..112efbf 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -388,6 +388,10 @@ @ stdcall FindResourceW(long wstr wstr) @ stdcall FindVolumeClose(ptr) @ stdcall FindVolumeMountPointClose(ptr) +@ stdcall FlsAlloc(ptr) +@ stdcall FlsFree(long) +@ stdcall FlsGetValue(long) +@ stdcall FlsSetValue(long ptr) @ stdcall FlushConsoleInputBuffer(long) @ stdcall FlushFileBuffers(long) @ stdcall FlushInstructionCache(long long long) diff --git a/include/winbase.h b/include/winbase.h index 0011c53..e2ee515 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -315,6 +315,7 @@ typedef struct _PROCESS_HEAP_ENTRY #define LOCKFILE_FAIL_IMMEDIATELY 1 #define LOCKFILE_EXCLUSIVE_LOCK 2 +#define FLS_OUT_OF_INDEXES ((DWORD)~0UL) #define TLS_OUT_OF_INDEXES ((DWORD)~0UL) #define SHUTDOWN_NORETRY 1 @@ -1499,6 +1500,10 @@ WINBASEAPI BOOL WINAPI FindNextVolumeMountPointW(HANDLE,LPWSTR,DWORD); #define FindNextVolumeMountPoint WINELIB_NAME_AW(FindNextVolumeMountPoint) WINBASEAPI BOOL WINAPI FindVolumeClose(HANDLE); WINBASEAPI BOOL WINAPI FindVolumeMountPointClose(HANDLE); +WINBASEAPI DWORD WINAPI FlsAlloc(PFLS_CALLBACK_FUNCTION); +WINBASEAPI BOOL WINAPI FlsFree(DWORD); +WINBASEAPI PVOID WINAPI FlsGetValue(DWORD); +WINBASEAPI BOOL WINAPI FlsSetValue(DWORD,PVOID); WINBASEAPI BOOL WINAPI FlushFileBuffers(HANDLE); WINBASEAPI BOOL WINAPI FlushInstructionCache(HANDLE,LPCVOID,SIZE_T); WINBASEAPI BOOL WINAPI FlushViewOfFile(LPCVOID,SIZE_T); diff --git a/include/winnt.h b/include/winnt.h index 4489e93..cfd1cac 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -4699,6 +4699,7 @@ typedef struct _RTL_CRITICAL_SECTION { } RTL_CRITICAL_SECTION, *PRTL_CRITICAL_SECTION; typedef VOID (NTAPI * WAITORTIMERCALLBACKFUNC) (PVOID, BOOLEAN ); +typedef VOID (NTAPI * PFLS_CALLBACK_FUNCTION) ( PVOID ); #include <pshpack8.h> typedef struct _IO_COUNTERS {

1 0

Alexandre Julliard : winex11: Get rid of direct accesses to the window structure in the drag&drop code.
by Alexandre Julliard 29 Feb '08

29 Feb '08

Module: wine Branch: master Commit: 68fa3524f8ad0a27bb4025b219f09dda476504cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=68fa3524f8ad0a27bb4025b21… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 28 20:02:31 2008 +0100 winex11: Get rid of direct accesses to the window structure in the drag&drop code. --- dlls/winex11.drv/event.c | 34 +++++++++++++--------------------- 1 files changed, 13 insertions(+), 21 deletions(-) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index 01dfc6d..30f0c57 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -44,7 +44,6 @@ #include "winuser.h" #include "wingdi.h" -#include "win.h" #include "x11drv.h" /* avoid conflict with field names in included win32 headers */ @@ -728,6 +727,7 @@ static HWND find_drop_window( HWND hQueryWnd, LPPOINT lpPt ) */ static void EVENT_DropFromOffiX( HWND hWnd, XClientMessageEvent *event ) { + struct x11drv_win_data *data; unsigned long data_length; unsigned long aux_long; unsigned char* p_data = NULL; @@ -735,7 +735,6 @@ static void EVENT_DropFromOffiX( HWND hWnd, XClientMessageEvent *event ) int x, y, dummy; BOOL bAccept; Window win, w_aux_root, w_aux_child; - WND* pWnd; HWND hScope = hWnd; win = X11DRV_get_whole_window(hWnd); @@ -746,14 +745,14 @@ static void EVENT_DropFromOffiX( HWND hWnd, XClientMessageEvent *event ) y += virtual_screen_rect.top; wine_tsx11_unlock(); - pWnd = WIN_GetPtr(hWnd); + if (!(data = X11DRV_get_win_data( hWnd ))) return; /* find out drop point and drop window */ if( x < 0 || y < 0 || - x > (pWnd->rectWindow.right - pWnd->rectWindow.left) || - y > (pWnd->rectWindow.bottom - pWnd->rectWindow.top) ) + x > (data->whole_rect.right - data->whole_rect.left) || + y > (data->whole_rect.bottom - data->whole_rect.top) ) { - bAccept = pWnd->dwExStyle & WS_EX_ACCEPTFILES; + bAccept = GetWindowLongW( hWnd, GWL_EXSTYLE ) & WS_EX_ACCEPTFILES; x = 0; y = 0; } @@ -773,7 +772,6 @@ static void EVENT_DropFromOffiX( HWND hWnd, XClientMessageEvent *event ) bAccept = FALSE; } } - WIN_ReleasePtr(pWnd); if (!bAccept) return; @@ -807,17 +805,11 @@ static void EVENT_DropFromOffiX( HWND hWnd, XClientMessageEvent *event ) if( lpDrop ) { - WND *pDropWnd = WIN_GetPtr( hScope ); lpDrop->pFiles = sizeof(DROPFILES); lpDrop->pt.x = x; lpDrop->pt.y = y; - lpDrop->fNC = - ( x < (pDropWnd->rectClient.left - pDropWnd->rectWindow.left) || - y < (pDropWnd->rectClient.top - pDropWnd->rectWindow.top) || - x > (pDropWnd->rectClient.right - pDropWnd->rectWindow.left) || - y > (pDropWnd->rectClient.bottom - pDropWnd->rectWindow.top) ); + lpDrop->fNC = FALSE; lpDrop->fWide = FALSE; - WIN_ReleasePtr(pDropWnd); p_drop = (char *)(lpDrop + 1); p = (char *)p_data; while(*p) @@ -846,6 +838,7 @@ static void EVENT_DropFromOffiX( HWND hWnd, XClientMessageEvent *event ) */ static void EVENT_DropURLs( HWND hWnd, XClientMessageEvent *event ) { + struct x11drv_win_data *win_data; unsigned long data_length; unsigned long aux_long, drop_len = 0; unsigned char *p_data = NULL; /* property data */ @@ -904,19 +897,18 @@ static void EVENT_DropURLs( HWND hWnd, XClientMessageEvent *event ) hDrop = GlobalAlloc( GMEM_SHARE, drop_len ); lpDrop = (DROPFILES *) GlobalLock( hDrop ); - if( lpDrop ) { - WND *pDropWnd = WIN_GetPtr( hWnd ); + if( lpDrop && (win_data = X11DRV_get_win_data( hWnd ))) + { lpDrop->pFiles = sizeof(DROPFILES); lpDrop->pt.x = x; lpDrop->pt.y = y; lpDrop->fNC = - ( x < (pDropWnd->rectClient.left - pDropWnd->rectWindow.left) || - y < (pDropWnd->rectClient.top - pDropWnd->rectWindow.top) || - x > (pDropWnd->rectClient.right - pDropWnd->rectWindow.left) || - y > (pDropWnd->rectClient.bottom - pDropWnd->rectWindow.top) ); + ( x < (win_data->client_rect.left - win_data->whole_rect.left) || + y < (win_data->client_rect.top - win_data->whole_rect.top) || + x > (win_data->client_rect.right - win_data->whole_rect.left) || + y > (win_data->client_rect.bottom - win_data->whole_rect.top) ); lpDrop->fWide = FALSE; p_drop = (char*)(lpDrop + 1); - WIN_ReleasePtr(pDropWnd); } /* create message content */

1 0

Stefan Dösinger : wined3d: Remove VBFLAG_LOAD.
by Alexandre Julliard 29 Feb '08

29 Feb '08

Module: wine Branch: master Commit: 8c758a62e85c68e71d7aa939833bc49d221bacf2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c758a62e85c68e71d7aa9398… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Feb 15 20:02:07 2008 +0100 wined3d: Remove VBFLAG_LOAD. --- dlls/wined3d/vertexbuffer.c | 4 ---- dlls/wined3d/wined3d_private.h | 9 ++++----- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/vertexbuffer.c b/dlls/wined3d/vertexbuffer.c index 93d3c55..b99fc43 100644 --- a/dlls/wined3d/vertexbuffer.c +++ b/dlls/wined3d/vertexbuffer.c @@ -499,10 +499,6 @@ static void WINAPI IWineD3DVertexBufferImpl_PreLoad(IWineD3DVertexBuffer *if int i, j; TRACE("(%p)->()\n", This); - if(This->Flags & VBFLAG_LOAD) { - return; /* Already doing that stuff */ - } - if(!This->vbo) { /* TODO: Make converting independent from VBOs */ if(This->Flags & VBFLAG_CREATEVBO) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 96a80fa..1071871 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -951,11 +951,10 @@ typedef struct IWineD3DVertexBufferImpl extern const IWineD3DVertexBufferVtbl IWineD3DVertexBuffer_Vtbl; -#define VBFLAG_LOAD 0x01 /* Data is written from allocatedMemory to the VBO */ -#define VBFLAG_OPTIMIZED 0x02 /* Optimize has been called for the VB */ -#define VBFLAG_DIRTY 0x04 /* Buffer data has been modified */ -#define VBFLAG_HASDESC 0x08 /* A vertex description has been found */ -#define VBFLAG_CREATEVBO 0x10 /* Attempt to create a VBO next PreLoad */ +#define VBFLAG_OPTIMIZED 0x01 /* Optimize has been called for the VB */ +#define VBFLAG_DIRTY 0x02 /* Buffer data has been modified */ +#define VBFLAG_HASDESC 0x04 /* A vertex description has been found */ +#define VBFLAG_CREATEVBO 0x08 /* Attempt to create a VBO next PreLoad */ /***************************************************************************** * IWineD3DIndexBuffer implementation structure (extends IWineD3DResourceImpl)

1 0

Jason Green : d3d9: Add tests showing the D3DUSAGE_RENDERTARGET and D3DUSAGE_AUTOGENMIPMAP are mutually exlusive .
by Alexandre Julliard 29 Feb '08

29 Feb '08

Module: wine Branch: master Commit: 438fa44d4339eafbfdff512ba47ecbad69d5d157 URL: http://source.winehq.org/git/wine.git/?a=commit;h=438fa44d4339eafbfdff512ba… Author: Jason Green <jave27(a)gmail.com> Date: Thu Feb 28 15:00:30 2008 -0500 d3d9: Add tests showing the D3DUSAGE_RENDERTARGET and D3DUSAGE_AUTOGENMIPMAP are mutually exlusive. --- dlls/d3d9/tests/texture.c | 47 ++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 46 insertions(+), 1 deletions(-) diff --git a/dlls/d3d9/tests/texture.c b/dlls/d3d9/tests/texture.c index 617ad77..0b2e406 100644 --- a/dlls/d3d9/tests/texture.c +++ b/dlls/d3d9/tests/texture.c @@ -115,19 +115,55 @@ static void test_cube_texture_from_pool(IDirect3DDevice9 *device_ptr, DWORD caps if(texture_ptr) IDirect3DCubeTexture9_Release(texture_ptr); } +static void test_cube_texture_mipmap_gen(IDirect3DDevice9 *device_ptr) +{ + IDirect3DCubeTexture9 *texture_ptr = NULL; + IDirect3D9 *d3d9; + HRESULT hr; + + hr = IDirect3DDevice9_GetDirect3D(device_ptr, &d3d9); + ok(hr == D3D_OK, "IDirect3DDevice9_GetDirect3D returned 0x%08x\n", hr); + + hr = IDirect3D9_CheckDeviceFormat(d3d9, 0, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, + D3DUSAGE_AUTOGENMIPMAP, + D3DRTYPE_CUBETEXTURE, D3DFMT_X8R8G8B8); + if(FAILED(hr)) + { + skip("No cube mipmap generation support\n"); + return; + } + + /* testing shows that autogenmipmap and rendertarget are mutually exclusive options */ + hr = IDirect3DDevice9_CreateCubeTexture(device_ptr, 64, 0, (D3DUSAGE_RENDERTARGET | + D3DUSAGE_AUTOGENMIPMAP), D3DFMT_X8R8G8B8, + D3DPOOL_MANAGED, &texture_ptr, 0); + todo_wine ok(hr == D3DERR_INVALIDCALL, "IDirect3DDevice9_CreateTexture returned 0x%08x, expected 0x%08x\n", + hr, D3DERR_INVALIDCALL); + if (texture_ptr) IDirect3DCubeTexture9_Release(texture_ptr); + texture_ptr = NULL; + + hr = IDirect3DDevice9_CreateCubeTexture(device_ptr, 64, 0, + D3DUSAGE_AUTOGENMIPMAP, D3DFMT_X8R8G8B8, + D3DPOOL_MANAGED, &texture_ptr, 0); + ok(hr == D3D_OK, "IDirect3DDevice9_CreateTexture failed (0x%08x)\n", hr); + if (texture_ptr) IDirect3DCubeTexture9_Release(texture_ptr); + texture_ptr = NULL; +} + static void test_cube_textures(IDirect3DDevice9 *device_ptr, DWORD caps) { test_cube_texture_from_pool(device_ptr, caps, D3DPOOL_DEFAULT, TRUE); test_cube_texture_from_pool(device_ptr, caps, D3DPOOL_MANAGED, TRUE); test_cube_texture_from_pool(device_ptr, caps, D3DPOOL_SYSTEMMEM, TRUE); test_cube_texture_from_pool(device_ptr, caps, D3DPOOL_SCRATCH, FALSE); + test_cube_texture_mipmap_gen(device_ptr); } static void test_mipmap_gen(IDirect3DDevice9 *device) { HRESULT hr; IDirect3D9 *d3d9; - IDirect3DTexture9 *texture; + IDirect3DTexture9 *texture = NULL; IDirect3DSurface9 *surface; DWORD levels; D3DSURFACE_DESC desc; @@ -146,6 +182,15 @@ static void test_mipmap_gen(IDirect3DDevice9 *device) return; } + /* testing shows that autogenmipmap and rendertarget are mutually exclusive options */ + hr = IDirect3DDevice9_CreateTexture(device, 64, 64, 0, (D3DUSAGE_RENDERTARGET | + D3DUSAGE_AUTOGENMIPMAP), D3DFMT_X8R8G8B8, + D3DPOOL_MANAGED, &texture, 0); + todo_wine ok(hr == D3DERR_INVALIDCALL, "IDirect3DDevice9_CreateTexture returned 0x%08x, expected 0x%08x\n", + hr, D3DERR_INVALIDCALL); + if (texture) IDirect3DTexture9_Release(texture); + texture = NULL; + hr = IDirect3DDevice9_CreateTexture(device, 64, 64, 0, D3DUSAGE_AUTOGENMIPMAP, D3DFMT_X8R8G8B8, D3DPOOL_MANAGED, &texture, 0); ok(hr == D3D_OK, "IDirect3DDevice9_CreateTexture failed(%08x)\n", hr);

1 0

Dan Hipschman : qmgr: Implement IEnumBackgroundCopyFiles_Next.
by Alexandre Julliard 29 Feb '08

29 Feb '08

Module: wine Branch: master Commit: 980e00c63b17906413fe99c54b897001d1f63630 URL: http://source.winehq.org/git/wine.git/?a=commit;h=980e00c63b17906413fe99c54… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Thu Feb 28 18:57:52 2008 -0800 qmgr: Implement IEnumBackgroundCopyFiles_Next. --- dlls/qmgr/enum_files.c | 38 +++++++++++++-- dlls/qmgr/tests/enum_files.c | 106 +++++++++++++++++++++++++++++++++++++++++- 2 files changed, 138 insertions(+), 6 deletions(-) diff --git a/dlls/qmgr/enum_files.c b/dlls/qmgr/enum_files.c index 0f0a2d8..6602f68 100644 --- a/dlls/qmgr/enum_files.c +++ b/dlls/qmgr/enum_files.c @@ -1,7 +1,7 @@ /* * Queue Manager (BITS) File Enumerator * - * Copyright 2007 Google (Roy Shea) + * Copyright 2007, 2008 Google (Roy Shea, Dan Hipschman) * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -73,15 +73,45 @@ static ULONG WINAPI BITS_IEnumBackgroundCopyFiles_Release( return ref; } -/*** IEnumBackgroundCopyFiles methods ***/ +/* Return reference to one or more files in the file enumerator */ static HRESULT WINAPI BITS_IEnumBackgroundCopyFiles_Next( IEnumBackgroundCopyFiles* iface, ULONG celt, IBackgroundCopyFile **rgelt, ULONG *pceltFetched) { - FIXME("Not implemented\n"); - return E_NOTIMPL; + EnumBackgroundCopyFilesImpl *This = (EnumBackgroundCopyFilesImpl *) iface; + ULONG fetched; + ULONG i; + IBackgroundCopyFile *file; + + /* Despite documented behavior, Windows (tested on XP) is not verifying + that the caller set pceltFetched to zero. No check here. */ + + fetched = min(celt, This->numFiles - This->indexFiles); + if (pceltFetched) + *pceltFetched = fetched; + else + { + /* We need to initialize this array if the caller doesn't request + the length because length_is will default to celt. */ + for (i = 0; i < celt; i++) + rgelt[i] = NULL; + + /* pceltFetched can only be NULL if celt is 1 */ + if (celt != 1) + return E_INVALIDARG; + } + + /* Fill in the array of objects */ + for (i = 0; i < fetched; i++) + { + file = This->files[This->indexFiles++]; + IBackgroundCopyFile_AddRef(file); + rgelt[i] = file; + } + + return fetched == celt ? S_OK : S_FALSE; } static HRESULT WINAPI BITS_IEnumBackgroundCopyFiles_Skip( diff --git a/dlls/qmgr/tests/enum_files.c b/dlls/qmgr/tests/enum_files.c index 5cddee5..452aad6 100644 --- a/dlls/qmgr/tests/enum_files.c +++ b/dlls/qmgr/tests/enum_files.c @@ -1,7 +1,7 @@ /* * Unit test suite for Enum Background Copy Files Interface * - * Copyright 2007 Google (Roy Shea) + * Copyright 2007, 2008 Google (Roy Shea, Dan Hipschman) * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -27,7 +27,7 @@ #include "bits.h" /* Globals used by many tests */ -#define NUM_FILES 2 +#define NUM_FILES 2 /* At least two. */ static const WCHAR test_remoteNameA[] = {'r','e','m','o','t','e','A', 0}; static const WCHAR test_localNameA[] = {'l','o','c','a','l','A', 0}; static const WCHAR test_remoteNameB[] = {'r','e','m','o','t','e','B', 0}; @@ -116,12 +116,114 @@ static void test_GetCount(void) ok(fileCount == test_fileCount, "Got incorrect count\n"); } +/* Test Next with a NULL pceltFetched*/ +static void test_Next_walkListNull(void) +{ + HRESULT hres; + IBackgroundCopyFile *file; + ULONG i; + + /* Fetch the available files */ + for (i = 0; i < test_fileCount; i++) + { + hres = IEnumBackgroundCopyFiles_Next(test_enumFiles, 1, &file, NULL); + ok(hres == S_OK, "Next failed: %08x\n", hres); + if(hres != S_OK) + { + skip("Unable to get file from test_enumFiles\n"); + return; + } + IBackgroundCopyFile_Release(file); + } + + /* Attempt to fetch one more than the number of available files */ + hres = IEnumBackgroundCopyFiles_Next(test_enumFiles, 1, &file, NULL); + ok(hres == S_FALSE, "Next off end of available files failed: %08x\n", hres); +} + +/* Test Next by requesting one file at a time */ +static void test_Next_walkList_1(void) +{ + HRESULT hres; + IBackgroundCopyFile *file; + ULONG fetched; + ULONG i; + + /* Fetch the available files */ + for (i = 0; i < test_fileCount; i++) + { + file = NULL; + fetched = 0; + hres = IEnumBackgroundCopyFiles_Next(test_enumFiles, 1, &file, &fetched); + ok(hres == S_OK, "Next failed: %08x\n", hres); + if(hres != S_OK) + { + skip("Unable to get file from test_enumFiles\n"); + return; + } + ok(fetched == 1, "Next returned the incorrect number of files: %08x\n", hres); + ok(file != NULL, "Next returned NULL\n"); + if (file) + IBackgroundCopyFile_Release(file); + } + + /* Attempt to fetch one more than the number of available files */ + fetched = 0; + hres = IEnumBackgroundCopyFiles_Next(test_enumFiles, 1, &file, &fetched); + ok(hres == S_FALSE, "Next off end of available files failed: %08x\n", hres); + ok(fetched == 0, "Next returned the incorrect number of files: %08x\n", hres); +} + +/* Test Next by requesting multiple files at a time */ +static void test_Next_walkList_2(void) +{ + HRESULT hres; + IBackgroundCopyFile *files[NUM_FILES]; + ULONG fetched; + ULONG i; + + for (i = 0; i < test_fileCount; i++) + files[i] = NULL; + + fetched = 0; + hres = IEnumBackgroundCopyFiles_Next(test_enumFiles, test_fileCount, files, &fetched); + ok(hres == S_OK, "Next failed: %08x\n", hres); + if(hres != S_OK) + { + skip("Unable to get file from test_enumFiles\n"); + return; + } + ok(fetched == test_fileCount, "Next returned the incorrect number of files: %08x\n", hres); + + for (i = 0; i < test_fileCount; i++) + { + ok(files[i] != NULL, "Next returned NULL\n"); + if (files[i]) + IBackgroundCopyFile_Release(files[i]); + } +} + +/* Test Next Error conditions */ +static void test_Next_errors(void) +{ + HRESULT hres; + IBackgroundCopyFile *files[NUM_FILES]; + + /* E_INVALIDARG: pceltFetched can ONLY be NULL if celt is 1 */ + hres = IEnumBackgroundCopyFiles_Next(test_enumFiles, 2, files, NULL); + ok(hres == E_INVALIDARG, "Invalid call to Next succeeded: %08x\n", hres); +} + typedef void (*test_t)(void); START_TEST(enum_files) { static const test_t tests[] = { test_GetCount, + test_Next_walkListNull, + test_Next_walkList_1, + test_Next_walkList_2, + test_Next_errors, 0 }; const test_t *test;

1 0

Roy Shea : qmgr: Implement Skip and Reset for IEnumBackgroundCopyFiles.
by Alexandre Julliard 29 Feb '08

29 Feb '08

Module: wine Branch: master Commit: 5c4776c2a343c08615249f3c898d2c7f37a969f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c4776c2a343c08615249f3c8… Author: Roy Shea <roy(a)cs.hmc.edu> Date: Thu Feb 28 18:58:32 2008 -0800 qmgr: Implement Skip and Reset for IEnumBackgroundCopyFiles. --- dlls/qmgr/enum_files.c | 18 +++++++++++--- dlls/qmgr/tests/enum_files.c | 51 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 65 insertions(+), 4 deletions(-) diff --git a/dlls/qmgr/enum_files.c b/dlls/qmgr/enum_files.c index 6602f68..082b541 100644 --- a/dlls/qmgr/enum_files.c +++ b/dlls/qmgr/enum_files.c @@ -114,19 +114,29 @@ static HRESULT WINAPI BITS_IEnumBackgroundCopyFiles_Next( return fetched == celt ? S_OK : S_FALSE; } +/* Skip over one or more files in the file enumerator */ static HRESULT WINAPI BITS_IEnumBackgroundCopyFiles_Skip( IEnumBackgroundCopyFiles* iface, ULONG celt) { - FIXME("Not implemented\n"); - return E_NOTIMPL; + EnumBackgroundCopyFilesImpl *This = (EnumBackgroundCopyFilesImpl *) iface; + + if (celt > This->numFiles - This->indexFiles) + { + This->indexFiles = This->numFiles; + return S_FALSE; + } + + This->indexFiles += celt; + return S_OK; } static HRESULT WINAPI BITS_IEnumBackgroundCopyFiles_Reset( IEnumBackgroundCopyFiles* iface) { - FIXME("Not implemented\n"); - return E_NOTIMPL; + EnumBackgroundCopyFilesImpl *This = (EnumBackgroundCopyFilesImpl *) iface; + This->indexFiles = 0; + return S_OK; } static HRESULT WINAPI BITS_IEnumBackgroundCopyFiles_Clone( diff --git a/dlls/qmgr/tests/enum_files.c b/dlls/qmgr/tests/enum_files.c index 452aad6..ff2cb16 100644 --- a/dlls/qmgr/tests/enum_files.c +++ b/dlls/qmgr/tests/enum_files.c @@ -214,6 +214,54 @@ static void test_Next_errors(void) ok(hres == E_INVALIDARG, "Invalid call to Next succeeded: %08x\n", hres); } +/* Test skipping through the files in a list */ +static void test_Skip_walkList(void) +{ + HRESULT hres; + ULONG i; + + for (i = 0; i < test_fileCount; i++) + { + hres = IEnumBackgroundCopyFiles_Skip(test_enumFiles, 1); + ok(hres == S_OK, "Skip failed: %08x\n", hres); + if(hres != S_OK) + { + skip("Unable to propely Skip files\n"); + return; + } + } + + hres = IEnumBackgroundCopyFiles_Skip(test_enumFiles, 1); + ok(hres == S_FALSE, "Skip expected end of list: %08x\n", hres); +} + +/* Test skipping off the end of the list */ +static void test_Skip_offEnd(void) +{ + HRESULT hres; + + hres = IEnumBackgroundCopyFiles_Skip(test_enumFiles, test_fileCount + 1); + ok(hres == S_FALSE, "Skip expected end of list: %08x\n", hres); +} + +/* Test resetting the file enumerator */ +static void test_Reset(void) +{ + HRESULT hres; + + hres = IEnumBackgroundCopyFiles_Skip(test_enumFiles, test_fileCount); + ok(hres == S_OK, "Skip failed: %08x\n", hres); + hres = IEnumBackgroundCopyFiles_Reset(test_enumFiles); + ok(hres == S_OK, "Reset failed: %08x\n", hres); + if(hres != S_OK) + { + skip("Unable to Reset enumerator\n"); + return; + } + hres = IEnumBackgroundCopyFiles_Skip(test_enumFiles, test_fileCount); + ok(hres == S_OK, "Reset failed: %08x\n", hres); +} + typedef void (*test_t)(void); START_TEST(enum_files) @@ -224,6 +272,9 @@ START_TEST(enum_files) test_Next_walkList_1, test_Next_walkList_2, test_Next_errors, + test_Skip_walkList, + test_Skip_offEnd, + test_Reset, 0 }; const test_t *test;

1 0

Paul Vriens : wintrust/tests: W2K and XP-SP1 don't set last error.
by Alexandre Julliard 29 Feb '08

29 Feb '08

Module: wine Branch: master Commit: 84039b26fee6c68223f4923ff1014ac9f1efeb6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=84039b26fee6c68223f4923ff… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Thu Feb 28 16:48:00 2008 +0100 wintrust/tests: W2K and XP-SP1 don't set last error. --- dlls/wintrust/tests/register.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/wintrust/tests/register.c b/dlls/wintrust/tests/register.c index bdfc9e1..81be104 100644 --- a/dlls/wintrust/tests/register.c +++ b/dlls/wintrust/tests/register.c @@ -283,8 +283,10 @@ static void test_LoadFunctionPointers(void) SetLastError(0xdeadbeef); ret = pWintrustLoadFunctionPointers(NULL, &funcs); - ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, - "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + ok(!ret, "WintrustLoadFunctionPointers succeeded\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER || + GetLastError() == 0xdeadbeef /* W2K and XP-SP1 */, + "Expected ERROR_INVALID_PARAMETER or 0xdeadbeef, got %d\n", GetLastError()); SetLastError(0xdeadbeef); funcs.cbStruct = 0;

1 0

Paul Vriens : wintrust/tests: Add a few tests.
by Alexandre Julliard 29 Feb '08

29 Feb '08

Module: wine Branch: master Commit: 484467278143313d950ecbf8b62e75baf7ee9e83 URL: http://source.winehq.org/git/wine.git/?a=commit;h=484467278143313d950ecbf8b… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Thu Feb 28 18:09:58 2008 +0100 wintrust/tests: Add a few tests. --- dlls/wintrust/tests/crypt.c | 74 ++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 73 insertions(+), 1 deletions(-) diff --git a/dlls/wintrust/tests/crypt.c b/dlls/wintrust/tests/crypt.c index 31d8b8b..216b697 100644 --- a/dlls/wintrust/tests/crypt.c +++ b/dlls/wintrust/tests/crypt.c @@ -57,6 +57,8 @@ static void test_context(void) HCATADMIN hca; static GUID dummy = { 0xdeadbeef, 0xdead, 0xbeef, { 0xde,0xad,0xbe,0xef,0xde,0xad,0xbe,0xef }}; static GUID unknown = { 0xC689AABA, 0x8E78, 0x11D0, { 0x8C,0x47,0x00,0xC0,0x4F,0xC2,0x95,0xEE }}; /* WINTRUST.DLL */ + CHAR windir[MAX_PATH], catroot[MAX_PATH], catroot2[MAX_PATH], dummydir[MAX_PATH]; + DWORD attrs; if (!pCryptCATAdminAcquireContext || !pCryptCATAdminReleaseContext) { @@ -64,6 +66,34 @@ static void test_context(void) return; } + /* When CryptCATAdminAcquireContext is successful it will create + * several directories if they don't exist: + * + * ...\system32\CatRoot\{GUID}, this directory holds the .cat files + * ...\system32\CatRoot2\{GUID} (WinXP and up), here we find the catalog database for that GUID + * + * Windows Vista uses lowercase catroot and catroot2. + * + * When passed a NULL GUID it will create the following directories although on + * WinXP and up these directories are already present when Windows is installed: + * + * ...\system32\CatRoot\{127D0A1D-4EF2-11D1-8608-00C04FC295EE} + * ...\system32\CatRoot2\{127D0A1D-4EF2-11D1-8608-00C04FC295EE} (WinXP up) + * + * TODO: Find out what this GUID is/does. + * + * On WinXp and up there is also a TimeStamp file in some of directories that + * seem to indicate the last change to the catalog database for that GUID. + * + * On Windows 2000 some files are created/updated: + * + * ...\system32\CatRoot\SYSMAST.cbk + * ...\system32\CatRoot\SYSMAST.cbd + * ...\system32\CatRoot\{GUID}\CATMAST.cbk + * ...\system32\CatRoot\{GUID}\CATMAST.cbd + * + */ + /* All NULL */ SetLastError(0xdeadbeef); ret = pCryptCATAdminAcquireContext(NULL, NULL, 0); @@ -114,7 +144,16 @@ static void test_context(void) ok(GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); - /* Correct context handle and dummy GUID */ + /* Correct context handle and dummy GUID + * + * The tests run in the past unfortunately made sure that some directories were created. + * + * FIXME: + * We don't want to mess too much with these for now so we should delete only the ones + * that shouldn't be there like the deadbeef ones. We first have to figure out if it's + * save to remove files and directories from CatRoot/CatRoot2. + */ + SetLastError(0xdeadbeef); ret = pCryptCATAdminAcquireContext(&hca, &dummy, 0); ok(ret, "Expected success\n"); @@ -123,6 +162,39 @@ static void test_context(void) "Expected ERROR_SUCCESS or 0xdeadbeef, got %d\n", GetLastError()); ok(hca != NULL, "Expected a context handle, got NULL\n"); + GetWindowsDirectoryA(windir, MAX_PATH); + lstrcpyA(catroot, windir); + lstrcatA(catroot, "\\system32\\CatRoot"); + lstrcpyA(catroot2, windir); + lstrcatA(catroot2, "\\system32\\CatRoot2"); + + attrs = GetFileAttributes(catroot); + /* On a clean Wine this will fail. When a native wintrust.dll was used in the past + * some tests will succeed. + */ + todo_wine + ok(attrs != INVALID_FILE_ATTRIBUTES, + "Expected the CatRoot directory to exist\n"); + + /* Windows creates the GUID directory in capitals */ + lstrcpyA(dummydir, catroot); + lstrcatA(dummydir, "\\{DEADBEEF-DEAD-BEEF-DEAD-BEEFDEADBEEF}"); + attrs = GetFileAttributes(dummydir); + todo_wine + ok(attrs != INVALID_FILE_ATTRIBUTES, + "Expected CatRoot\\{DEADBEEF-DEAD-BEEF-DEAD-BEEFDEADBEEF} directory to exist\n"); + + /* Only present on XP or higher. */ + attrs = GetFileAttributes(catroot2); + if (attrs != INVALID_FILE_ATTRIBUTES) + { + lstrcpyA(dummydir, catroot2); + lstrcatA(dummydir, "\\{DEADBEEF-DEAD-BEEF-DEAD-BEEFDEADBEEF}"); + attrs = GetFileAttributes(dummydir); + ok(attrs != INVALID_FILE_ATTRIBUTES, + "Expected CatRoot2\\{DEADBEEF-DEAD-BEEF-DEAD-BEEFDEADBEEF} directory to exist\n"); + } + ret = pCryptCATAdminReleaseContext(hca, 0); ok(ret, "Expected success\n");

1 0

Mikołaj Zalewski : shell32: Fixes in Polish translation.
by Alexandre Julliard 29 Feb '08

29 Feb '08

Module: wine Branch: master Commit: 83724232fd263b453437049e51a8fb933f320e3f URL: http://source.winehq.org/git/wine.git/?a=commit;h=83724232fd263b453437049e5… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Thu Feb 28 08:55:27 2008 +0100 shell32: Fixes in Polish translation. --- dlls/shell32/shell32_Pl.rc | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/shell32/shell32_Pl.rc b/dlls/shell32/shell32_Pl.rc index 63f7701..0994ed1 100644 --- a/dlls/shell32/shell32_Pl.rc +++ b/dlls/shell32/shell32_Pl.rc @@ -76,14 +76,14 @@ MENU_SHV_FILE MENU DISCARDABLE BEGIN POPUP "" BEGIN - MENUITEM "&Select" FCIDM_SHVIEW_OPEN + MENUITEM "&Wybierz" FCIDM_SHVIEW_OPEN MENUITEM "&Eksploruj", FCIDM_SHVIEW_EXPLORE MENUITEM "&Otw�rz", FCIDM_SHVIEW_OPEN MENUITEM SEPARATOR MENUITEM "&Wytnij", FCIDM_SHVIEW_CUT MENUITEM "&Kopiuj", FCIDM_SHVIEW_COPY MENUITEM SEPARATOR - MENUITEM "Utw�rz &Skr�t", FCIDM_SHVIEW_CREATELINK + MENUITEM "Utw�rz &skr�t", FCIDM_SHVIEW_CREATELINK MENUITEM "&Usu�", FCIDM_SHVIEW_DELETE MENUITEM "&Zmie� nazw�", FCIDM_SHVIEW_RENAME MENUITEM SEPARATOR @@ -178,7 +178,7 @@ STRINGTABLE DISCARDABLE IDS_CREATEFOLDER_DENIED "Nie mog� utworzy� nowego katalogu: Brak dost�pu." IDS_CREATEFOLDER_CAPTION "B��d przy tworzeniu nowego katalogu." - IDS_DELETEITEM_CAPTION "Potwierd� usuni�cia pliku" + IDS_DELETEITEM_CAPTION "Potwierd� usuni�cie pliku" IDS_DELETEFOLDER_CAPTION "Potwierd� usuni�cie katalogu" IDS_DELETEITEM_TEXT "Czy jeste� pewien, �e chcesz usun�� '%1'?" IDS_DELETEMULTIPLE_TEXT "Czy jeste� pewien, �e chcesz usun�� te %1 pliki?" @@ -229,5 +229,5 @@ STRINGTABLE DISCARDABLE IDS_COMMON_VIDEO "Documenty\\Moje wideo" IDS_CDBURN_AREA "Ustawienia lokalne\\Dane aplikacji\\Microsoft\\Nagrywanie dysk�w CD" - IDS_NEWFOLDER "New Folder" + IDS_NEWFOLDER "Nowy Folder" }

1 0