wine-commits November 2007

wine-commits@winehq.org

3 participants
757 discussions

Dmitry Timoshkov : include: Synchronize DEVMODE layout with PSDK.
by Alexandre Julliard 01 Nov '07

01 Nov '07

Module: wine Branch: master Commit: d43fdc5ab0f294d99280f8a6d002b98dc0c2dba2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d43fdc5ab0f294d99280f8a6d… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Thu Nov 1 14:22:11 2007 +0800 include: Synchronize DEVMODE layout with PSDK. --- dlls/comdlg32/printdlg.c | 26 +++++++++++++------------- dlls/comdlg32/printdlg16.c | 4 ++-- dlls/wineps.drv/driver.c | 22 +++++++++++----------- dlls/wineps.drv/init.c | 20 +++++++++++--------- dlls/wineps.drv/ps.c | 6 +++--- dlls/winspool.drv/info.c | 10 +++++----- include/wingdi.h | 38 ++++++++++++++++++++++++++------------ programs/cmdlgtst/cmdlgtst.c | 10 +++++----- 8 files changed, 76 insertions(+), 60 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d43fdc5ab0f294d99280f…

1 0

Stefan Dösinger : d3d9: Silence a FIXME.
by Alexandre Julliard 01 Nov '07

01 Nov '07

Module: wine Branch: master Commit: aa7f9f0a72408a93e44dbf57c85ae844f67e3520 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa7f9f0a72408a93e44dbf57c… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Nov 1 01:45:36 2007 +0100 d3d9: Silence a FIXME. --- dlls/d3d9/vertexbuffer.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3d9/vertexbuffer.c b/dlls/d3d9/vertexbuffer.c index 6238fdd..7716951 100644 --- a/dlls/d3d9/vertexbuffer.c +++ b/dlls/d3d9/vertexbuffer.c @@ -231,7 +231,7 @@ HRESULT WINAPI IDirect3DDevice9Impl_CreateVertexBuffer(LPDIRECT3DDEVICE9 iface, if (hrc != D3D_OK) { /* free up object */ - FIXME("(%p) call to IWineD3DDevice_CreateVertexBuffer failed\n", This); + WARN("(%p) call to IWineD3DDevice_CreateVertexBuffer failed\n", This); HeapFree(GetProcessHeap(), 0, object); } else { IUnknown_AddRef(iface);

1 0

Stefan Dösinger : wined3d: Make resource memory 32 byte aligned.
by Alexandre Julliard 01 Nov '07

01 Nov '07

Module: wine Branch: master Commit: 393ed4a070a38f093fc8920affd72cb77eb0942e URL: http://source.winehq.org/git/wine.git/?a=commit;h=393ed4a070a38f093fc8920af… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Oct 22 13:30:14 2007 +0200 wined3d: Make resource memory 32 byte aligned. --- dlls/d3d9/tests/device.c | 71 ++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/device.c | 11 +++++- dlls/wined3d/surface.c | 5 ++- dlls/wined3d/wined3d_private.h | 2 + 4 files changed, 85 insertions(+), 4 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 2402a97..4f655b6 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -1449,6 +1449,76 @@ static void test_null_stream(void) if(d3d9) IDirect3D9_Release(d3d9); } +static inline const char *debug_d3dpool(D3DPOOL pool) { + switch(pool) { + case D3DPOOL_DEFAULT: return "D3DPOOL_DEFAULT"; + case D3DPOOL_SYSTEMMEM: return "D3DPOOL_SYSTEMMEM"; + case D3DPOOL_SCRATCH: return "D3DPOOL_SCRATCH"; + case D3DPOOL_MANAGED: return "D3DPOOL_MANAGED"; + default: + return "unknown pool"; + } +} + +static void test_vertex_buffer_alignment(void) +{ + IDirect3DVertexBuffer9 *buffer = NULL; + D3DPRESENT_PARAMETERS present_parameters; + IDirect3DDevice9 *device = NULL; + IDirect3D9 *d3d9; + HWND hwnd; + HRESULT hr; + D3DPOOL pools[] = {D3DPOOL_DEFAULT, D3DPOOL_SYSTEMMEM, D3DPOOL_SCRATCH, D3DPOOL_MANAGED}; + DWORD sizes[] = {1, 4, 16, 17, 32, 33, 64, 65, 1024, 1025, 1048576, 1048577}; + unsigned int i, j; + void *data; + + d3d9 = pDirect3DCreate9( D3D_SDK_VERSION ); + ok(d3d9 != NULL, "Failed to create IDirect3D9 object\n"); + hwnd = CreateWindow( "static", "d3d9_test", WS_OVERLAPPEDWINDOW, 100, 100, 160, 160, NULL, NULL, NULL, NULL ); + ok(hwnd != NULL, "Failed to create window\n"); + if (!d3d9 || !hwnd) goto cleanup; + + ZeroMemory(&present_parameters, sizeof(present_parameters)); + present_parameters.Windowed = TRUE; + present_parameters.hDeviceWindow = hwnd; + present_parameters.SwapEffect = D3DSWAPEFFECT_DISCARD; + + hr = IDirect3D9_CreateDevice( d3d9, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL /* no NULLREF here */, hwnd, + D3DCREATE_SOFTWARE_VERTEXPROCESSING, &present_parameters, &device ); + ok(hr == D3D_OK || hr == D3DERR_NOTAVAILABLE, "IDirect3D9_CreateDevice failed with %s\n", DXGetErrorString9(hr)); + if(!device) + { + skip("Failed to create a d3d device\n"); + goto cleanup; + } + + for(i = 0; i < (sizeof(sizes) / sizeof(sizes[0])); i++) { + for(j = 0; j < (sizeof(pools) / sizeof(pools[0])); j++) { + hr = IDirect3DDevice9_CreateVertexBuffer(device, sizes[i], 0, 0, pools[j], &buffer, NULL); + if(pools[j] == D3DPOOL_SCRATCH) { + ok(hr == D3DERR_INVALIDCALL, "Creating a D3DPOOL_SCRATCH buffer returned (0x%08x)\n", hr); + } else { + ok(SUCCEEDED(hr), "IDirect3DDevice9_CreateVertexBuffer failed (0x%08x). Pool = %s, size %d\n", hr, + debug_d3dpool(pools[j]), sizes[i]); + } + if(FAILED(hr)) continue; + + hr = IDirect3DVertexBuffer9_Lock(buffer, 0, 0, (void **) &data, 0); + ok(SUCCEEDED(hr), "IDirect3DVertexBuffer9_Lock failed (0x%08x)\n", hr); + ok(((DWORD_PTR) data & 31) == 0, "Vertex buffer start address is not 32 byte aligned(size: %d, pool: %s, data: %p)\n", + sizes[i], debug_d3dpool(pools[j]), data); + hr = IDirect3DVertexBuffer9_Unlock(buffer); + ok(SUCCEEDED(hr), "IDirect3DVertexBuffer9_Unlock failed (0x%08x)\n", hr); + + if(buffer) IDirect3DVertexBuffer9_Release(buffer); + } + } + + cleanup: + if(d3d9) IDirect3D9_Release(d3d9); +} + START_TEST(device) { HMODULE d3d9_handle = LoadLibraryA( "d3d9.dll" ); @@ -1473,5 +1543,6 @@ START_TEST(device) test_depthstenciltest(); test_draw_indexed(); test_null_stream(); + test_vertex_buffer_alignment(); } } diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index db7a4e3..dd6bde8 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -101,14 +101,14 @@ static void WINAPI IWineD3DDeviceImpl_AddResource(IWineD3DDevice *iface, IWineD3 } \ WineD3DAdapterChangeGLRam(This, _size); \ } \ - object->resource.heapMemory = (0 == _size ? NULL : HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, _size + 4)); \ + object->resource.heapMemory = (0 == _size ? NULL : HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, _size + RESOURCE_ALIGNMENT)); \ if (object->resource.heapMemory == NULL && _size != 0) { \ FIXME("Out of memory!\n"); \ HeapFree(GetProcessHeap(), 0, object); \ *pp##type = NULL; \ return WINED3DERR_OUTOFVIDEOMEMORY; \ } \ - object->resource.allocatedMemory = object->resource.heapMemory; \ + object->resource.allocatedMemory = (BYTE *)(((ULONG_PTR) object->resource.heapMemory + (RESOURCE_ALIGNMENT - 1)) & ~(RESOURCE_ALIGNMENT - 1)); \ *pp##type = (IWineD3D##type *) object; \ IWineD3DDeviceImpl_AddResource(iface, (IWineD3DResource *)object) ;\ TRACE("(%p) : Created resource %p\n", This, object); \ @@ -304,6 +304,13 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateVertexBuffer(IWineD3DDevice *ifac WARN("Size 0 requested, returning WINED3DERR_INVALIDCALL\n"); *ppVertexBuffer = NULL; return WINED3DERR_INVALIDCALL; + } else if(Pool == WINED3DPOOL_SCRATCH) { + /* The d3d9 testsuit shows that this is not allowed. It doesn't make much sense + * anyway, SCRATCH vertex buffers aren't useable anywhere + */ + WARN("Vertex buffer in D3DPOOL_SCRATCH requested, returning WINED3DERR_INVALIDCALL\n"); + *ppVertexBuffer = NULL; + return WINED3DERR_INVALIDCALL; } D3DCREATERESOURCEOBJECTINSTANCE(object, VertexBuffer, WINED3DRTYPE_VERTEXBUFFER, Size) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 6637539..5b6e908 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -677,8 +677,9 @@ static void surface_prepare_system_memory(IWineD3DSurfaceImpl *This) { /* Whatever surface we have, make sure that there is memory allocated for the downloaded copy, * or a pbo to map */ - This->resource.heapMemory = HeapAlloc(GetProcessHeap() ,0 , This->resource.size + 4); - This->resource.allocatedMemory = This->resource.heapMemory; + This->resource.heapMemory = HeapAlloc(GetProcessHeap() ,0 , This->resource.size + RESOURCE_ALIGNMENT); + This->resource.allocatedMemory = + (BYTE *)(((ULONG_PTR) This->resource.heapMemory + (RESOURCE_ALIGNMENT - 1)) & ~(RESOURCE_ALIGNMENT - 1)); if(This->Flags & SFLAG_INSYSMEM) { ERR("Surface without memory or pbo has SFLAG_INSYSMEM set!\n"); } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index fdfd43f..cac31a8 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -830,6 +830,8 @@ typedef struct IWineD3DResourceImpl IWineD3DResourceClass resource; } IWineD3DResourceImpl; +/* Tests show that the start address of resources is 32 byte aligned */ +#define RESOURCE_ALIGNMENT 32 /***************************************************************************** * IWineD3DVertexBuffer implementation structure (extends IWineD3DResourceImpl)

1 0

Stefan Dösinger : wined3d: Disconnect allocatedMemory and Heap allocation.
by Alexandre Julliard 01 Nov '07

01 Nov '07

Module: wine Branch: master Commit: 4d4fce7e3313bb8d2d76993361004c5a4b4dd63b URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d4fce7e3313bb8d2d7699336… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Oct 22 13:02:03 2007 +0200 wined3d: Disconnect allocatedMemory and Heap allocation. --- dlls/wined3d/device.c | 5 +++-- dlls/wined3d/resource.c | 3 ++- dlls/wined3d/surface.c | 17 ++++++++++++----- dlls/wined3d/surface_base.c | 4 ++-- dlls/wined3d/surface_gdi.c | 10 +++++++++- dlls/wined3d/swapchain.c | 4 ++++ dlls/wined3d/wined3d_private.h | 3 ++- 7 files changed, 34 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 17aeea2..db7a4e3 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -101,13 +101,14 @@ static void WINAPI IWineD3DDeviceImpl_AddResource(IWineD3DDevice *iface, IWineD3 } \ WineD3DAdapterChangeGLRam(This, _size); \ } \ - object->resource.allocatedMemory = (0 == _size ? NULL : HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, _size + 4)); \ - if (object->resource.allocatedMemory == NULL && _size != 0) { \ + object->resource.heapMemory = (0 == _size ? NULL : HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, _size + 4)); \ + if (object->resource.heapMemory == NULL && _size != 0) { \ FIXME("Out of memory!\n"); \ HeapFree(GetProcessHeap(), 0, object); \ *pp##type = NULL; \ return WINED3DERR_OUTOFVIDEOMEMORY; \ } \ + object->resource.allocatedMemory = object->resource.heapMemory; \ *pp##type = (IWineD3D##type *) object; \ IWineD3DDeviceImpl_AddResource(iface, (IWineD3DResource *)object) ;\ TRACE("(%p) : Created resource %p\n", This, object); \ diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index 4a620f6..9faaea5 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -82,8 +82,9 @@ void IWineD3DResourceImpl_CleanUp(IWineD3DResource *iface){ } } - HeapFree(GetProcessHeap(), 0, This->resource.allocatedMemory); + HeapFree(GetProcessHeap(), 0, This->resource.heapMemory); This->resource.allocatedMemory = 0; + This->resource.heapMemory = 0; if (This->resource.wineD3DDevice != NULL) { IWineD3DDevice_ResourceReleased((IWineD3DDevice *)This->resource.wineD3DDevice, iface); diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 07501f2..6637539 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -668,15 +668,17 @@ static void surface_prepare_system_memory(IWineD3DSurfaceImpl *This) { checkGLcall("glBindBufferARB"); /* We don't need the system memory anymore and we can't even use it for PBOs */ - HeapFree(GetProcessHeap(), 0, This->resource.allocatedMemory); + HeapFree(GetProcessHeap(), 0, This->resource.heapMemory); This->resource.allocatedMemory = NULL; + This->resource.heapMemory = NULL; This->Flags |= SFLAG_PBO; LEAVE_GL(); } else if(!(This->resource.allocatedMemory || This->Flags & SFLAG_PBO)) { /* Whatever surface we have, make sure that there is memory allocated for the downloaded copy, * or a pbo to map */ - This->resource.allocatedMemory = HeapAlloc(GetProcessHeap() ,0 , This->resource.size + 4); + This->resource.heapMemory = HeapAlloc(GetProcessHeap() ,0 , This->resource.size + 4); + This->resource.allocatedMemory = This->resource.heapMemory; if(This->Flags & SFLAG_INSYSMEM) { ERR("Surface without memory or pbo has SFLAG_INSYSMEM set!\n"); } @@ -2024,8 +2026,9 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_LoadTexture(IWineD3DSurface *iface, BO #endif if (!(This->Flags & SFLAG_DONOTFREE)) { - HeapFree(GetProcessHeap(), 0, This->resource.allocatedMemory); + HeapFree(GetProcessHeap(), 0, This->resource.heapMemory); This->resource.allocatedMemory = NULL; + This->resource.heapMemory = NULL; IWineD3DSurface_ModifyLocation(iface, SFLAG_INSYSMEM, FALSE); } @@ -2257,7 +2260,8 @@ HRESULT WINAPI IWineD3DSurfaceImpl_SetMem(IWineD3DSurface *iface, void *Mem) { This->hDC = NULL; This->Flags &= ~SFLAG_DIBSECTION; } else if(!(This->Flags & SFLAG_USERPTR)) { - release = This->resource.allocatedMemory; + release = This->resource.heapMemory; + This->resource.heapMemory = NULL; } This->resource.allocatedMemory = Mem; This->Flags |= SFLAG_USERPTR | SFLAG_INSYSMEM; @@ -2277,6 +2281,8 @@ HRESULT WINAPI IWineD3DSurfaceImpl_SetMem(IWineD3DSurface *iface, void *Mem) { } else if(This->Flags & SFLAG_USERPTR) { /* Lockrect and GetDC will re-create the dib section and allocated memory */ This->resource.allocatedMemory = NULL; + /* HeapMemory should be NULL already */ + if(This->resource.heapMemory != NULL) ERR("User pointer surface has heap memory allocated\n"); This->Flags &= ~SFLAG_USERPTR; if(This->Flags & SFLAG_CLIENT) { @@ -2839,8 +2845,9 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *This, RECT * } if(!(This->Flags & SFLAG_DONOTFREE)) { - HeapFree(GetProcessHeap(), 0, This->resource.allocatedMemory); + HeapFree(GetProcessHeap(), 0, This->resource.heapMemory); This->resource.allocatedMemory = NULL; + This->resource.heapMemory = NULL; } else { This->Flags &= ~SFLAG_INSYSMEM; } diff --git a/dlls/wined3d/surface_base.c b/dlls/wined3d/surface_base.c index a9c5a07..6b9c631 100644 --- a/dlls/wined3d/surface_base.c +++ b/dlls/wined3d/surface_base.c @@ -483,7 +483,6 @@ HRESULT IWineD3DBaseSurfaceImpl_CreateDIBSection(IWineD3DSurface *iface) { IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *)iface; int extraline = 0; SYSTEM_INFO sysInfo; - void *oldmem = This->resource.allocatedMemory; BITMAPINFO* b_info; HDC ddc; DWORD *masks; @@ -609,7 +608,8 @@ HRESULT IWineD3DBaseSurfaceImpl_CreateDIBSection(IWineD3DSurface *iface) { This->Flags |= SFLAG_DIBSECTION; - HeapFree(GetProcessHeap(), 0, oldmem); + HeapFree(GetProcessHeap(), 0, This->resource.heapMemory); + This->resource.heapMemory = NULL; return WINED3D_OK; } diff --git a/dlls/wined3d/surface_gdi.c b/dlls/wined3d/surface_gdi.c index d3cb89d..a5ca3db 100644 --- a/dlls/wined3d/surface_gdi.c +++ b/dlls/wined3d/surface_gdi.c @@ -329,6 +329,13 @@ IWineGDISurfaceImpl_Flip(IWineD3DSurface *iface, tmp = This->resource.allocatedMemory; This->resource.allocatedMemory = Target->resource.allocatedMemory; Target->resource.allocatedMemory = tmp; + + if(This->resource.heapMemory) { + ERR("GDI Surface %p has heap memory allocated\n", This); + } + if(Target->resource.heapMemory) { + ERR("GDI Surface %p has heap memory allocated\n", Target); + } } /* client_memory should not be different, but just in case */ @@ -630,8 +637,9 @@ IWineGDISurfaceImpl_PrivateSetup(IWineD3DSurface *iface) /* Sysmem textures have memory already allocated - * release it, this avoids an unnecessary memcpy */ - HeapFree(GetProcessHeap(), 0, This->resource.allocatedMemory); + HeapFree(GetProcessHeap(), 0, This->resource.heapMemory); This->resource.allocatedMemory = NULL; + This->resource.heapMemory = NULL; /* We don't mind the nonpow2 stuff in GDI */ This->pow2Width = This->currentDesc.Width; diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 330f928..501c7cd 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -322,6 +322,10 @@ static HRESULT WINAPI IWineD3DSwapChainImpl_Present(IWineD3DSwapChain *iface, CO tmp = front->resource.allocatedMemory; front->resource.allocatedMemory = back->resource.allocatedMemory; back->resource.allocatedMemory = tmp; + + tmp = front->resource.heapMemory; + front->resource.heapMemory = back->resource.heapMemory; + back->resource.heapMemory = tmp; } /* Flip the PBO */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 8362aa1..fdfd43f 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -817,7 +817,8 @@ typedef struct IWineD3DResourceClass UINT size; DWORD usage; WINED3DFORMAT format; - BYTE *allocatedMemory; + BYTE *allocatedMemory; /* Pointer to the real data location */ + BYTE *heapMemory; /* Pointer to the HeapAlloced block of memory */ struct list privateData; } IWineD3DResourceClass;

1 0

Stefan Dösinger : wined3d: Allocate memory for default pool resources too.
by Alexandre Julliard 01 Nov '07

01 Nov '07

Module: wine Branch: master Commit: f1f84a36155b9deb9983f12cd466b3ede31e6a13 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1f84a36155b9deb9983f12cd… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Oct 22 12:37:21 2007 +0200 wined3d: Allocate memory for default pool resources too. --- dlls/wined3d/device.c | 11 ++--------- dlls/wined3d/surface.c | 6 ------ 2 files changed, 2 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 2f957ae..17aeea2 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -101,8 +101,8 @@ static void WINAPI IWineD3DDeviceImpl_AddResource(IWineD3DDevice *iface, IWineD3 } \ WineD3DAdapterChangeGLRam(This, _size); \ } \ - object->resource.allocatedMemory = (0 == _size ? NULL : Pool == WINED3DPOOL_DEFAULT ? NULL : HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, _size)); \ - if (object->resource.allocatedMemory == NULL && _size != 0 && Pool != WINED3DPOOL_DEFAULT) { \ + object->resource.allocatedMemory = (0 == _size ? NULL : HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, _size + 4)); \ + if (object->resource.allocatedMemory == NULL && _size != 0) { \ FIXME("Out of memory!\n"); \ HeapFree(GetProcessHeap(), 0, object); \ *pp##type = NULL; \ @@ -310,9 +310,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateVertexBuffer(IWineD3DDevice *ifac TRACE("(%p) : Size=%d, Usage=%d, FVF=%x, Pool=%d - Memory@%p, Iface@%p\n", This, Size, Usage, FVF, Pool, object->resource.allocatedMemory, object); *ppVertexBuffer = (IWineD3DVertexBuffer *)object; - if (Pool == WINED3DPOOL_DEFAULT ) { /* Allocate some system memory for now */ - object->resource.allocatedMemory = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, object->resource.size); - } object->fvf = FVF; /* Observations show that drawStridedSlow is faster on dynamic VBs than converting + @@ -398,10 +395,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateIndexBuffer(IWineD3DDevice *iface /* Allocate the storage for the device */ D3DCREATERESOURCEOBJECTINSTANCE(object,IndexBuffer,WINED3DRTYPE_INDEXBUFFER, Length) - if (Pool == WINED3DPOOL_DEFAULT ) { /* We need a local copy for drawStridedSlow */ - object->resource.allocatedMemory = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY,object->resource.size); - } - if(Pool != WINED3DPOOL_SYSTEMMEM && !(Usage & WINED3DUSAGE_DYNAMIC) && GL_SUPPORT(ARB_VERTEX_BUFFER_OBJECT)) { CreateIndexBufferVBO(This, object); } diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index afb0b78..07501f2 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3280,12 +3280,6 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_PrivateSetup(IWineD3DSurface *iface) { This->glRect.bottom = This->pow2Height; } - if(This->resource.allocatedMemory == NULL) { - /* Make sure memory exists from the start, and it is initialized properly. D3D initializes surfaces, - * gl does not, so we need to upload zeroes to init the gl texture. - */ - This->resource.allocatedMemory = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, This->resource.size + 4); - } This->Flags |= SFLAG_INSYSMEM; return WINED3D_OK;

1 0

Stefan Dösinger : wined3d: Move a part of LockRect to the base class.
by Alexandre Julliard 01 Nov '07

01 Nov '07

Module: wine Branch: master Commit: a175e7b68e87460035e64731f42de036a65cdac8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a175e7b68e87460035e64731f… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Oct 9 22:19:39 2007 +0200 wined3d: Move a part of LockRect to the base class. --- dlls/wined3d/surface.c | 80 ++++++++-------------------------------- dlls/wined3d/surface_base.c | 77 ++++++++++++++++++++++++++++++++++++++ dlls/wined3d/surface_gdi.c | 71 +---------------------------------- dlls/wined3d/wined3d_private.h | 2 +- 4 files changed, 97 insertions(+), 133 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a175e7b68e87460035e64…

1 0

Stefan Dösinger : wined3d: Reenable render target unlocking via textures.
by Alexandre Julliard 01 Nov '07

01 Nov '07

Module: wine Branch: master Commit: 2a09716c75207d7276a95c094ef3dfa9bd03c613 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a09716c75207d7276a95c094… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Nov 1 01:40:44 2007 +0100 wined3d: Reenable render target unlocking via textures. --- dlls/wined3d/surface.c | 70 ++++++++++++++++++++++++++++++++--------------- 1 files changed, 47 insertions(+), 23 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 36f3002..fab9919 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1138,10 +1138,16 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_UnlockRect(IWineD3DSurface *iface) { switch(wined3d_settings.rendertargetlock_mode) { case RTL_READTEX: case RTL_TEXTEX: -#if 0 + ENTER_GL(); + if (This->glDescription.textureName == 0) { + glGenTextures(1, &This->glDescription.textureName); + checkGLcall("glGenTextures"); + } + glBindTexture(GL_TEXTURE_2D, This->glDescription.textureName); + checkGLcall("glBindTexture(GL_TEXTURE_2D, This->glDescription.textureName);"); + LEAVE_GL(); IWineD3DSurface_LoadLocation(iface, SFLAG_INTEXTURE, NULL /* partial texture loading not supported yet */); /* drop through */ -#endif case RTL_AUTO: case RTL_READDRAW: @@ -3353,24 +3359,47 @@ struct coords { int x, y, z; }; -static inline void surface_blt_to_drawable(IWineD3DSurfaceImpl *This) { +static inline void surface_blt_to_drawable(IWineD3DSurfaceImpl *This, const RECT *rect_in) { struct coords coords[4]; - int low_coord; + RECT rect; IWineD3DDeviceImpl *device = This->resource.wineD3DDevice; + if(rect_in) { + rect = *rect_in; + } else { + rect.left = 0; + rect.top = 0; + rect.right = This->currentDesc.Width; + rect.bottom = This->currentDesc.Height; + } + ActivateContext(device, device->render_targets[0], CTXUSAGE_BLIT); ENTER_GL(); if(This->glDescription.target == GL_TEXTURE_2D) { glBindTexture(GL_TEXTURE_2D, This->glDescription.textureName); checkGLcall("GL_TEXTURE_2D, This->glDescription.textureName)"); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); + checkGLcall("glTexParameteri"); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); + checkGLcall("glTexParameteri"); + + coords[0].x = rect.left / This->pow2Width; + coords[0].z = 0; + + coords[1].x = rect.left / This->pow2Width; + coords[1].z = 0; + + coords[2].x = rect.right / This->pow2Width; + coords[2].z = 0; - coords[0].x = 0; coords[0].y = 0; coords[0].z = 0; - coords[1].x = 0; coords[1].y = 1; coords[1].z = 0; - coords[2].x = 1; coords[2].y = 1; coords[2].z = 0; - coords[3].x = 1; coords[3].y = 0; coords[3].z = 0; + coords[3].x = rect.right / This->pow2Width; + coords[3].z = 0; - low_coord = 0; + coords[0].y = rect.top / This->pow2Height; + coords[1].y = rect.bottom / This->pow2Height; + coords[2].y = rect.bottom / This->pow2Height; + coords[3].y = rect.top / This->pow2Height; } else { /* Must be a cube map */ glDisable(GL_TEXTURE_2D); @@ -3379,6 +3408,10 @@ static inline void surface_blt_to_drawable(IWineD3DSurfaceImpl *This) { checkGLcall("glEnable(GL_TEXTURE_CUBE_MAP_ARB)"); glBindTexture(GL_TEXTURE_CUBE_MAP_ARB, This->glDescription.textureName); checkGLcall("GL_TEXTURE_CUBE_MAP_ARB, This->glDescription.textureName)"); + glTexParameteri(GL_TEXTURE_CUBE_MAP_ARB, GL_TEXTURE_MAG_FILTER, GL_NEAREST); + checkGLcall("glTexParameteri"); + glTexParameteri(GL_TEXTURE_CUBE_MAP_ARB, GL_TEXTURE_MIN_FILTER, GL_NEAREST); + checkGLcall("glTexParameteri"); switch(This->glDescription.target) { case GL_TEXTURE_CUBE_MAP_POSITIVE_X: @@ -3427,29 +3460,20 @@ static inline void surface_blt_to_drawable(IWineD3DSurfaceImpl *This) { LEAVE_GL(); return; } - - low_coord = -1; - } - - if(device->render_offscreen) { - coords[0].y = coords[0].y == 1 ? low_coord : 1; - coords[1].y = coords[1].y == 1 ? low_coord : 1; - coords[2].y = coords[2].y == 1 ? low_coord : 1; - coords[3].y = coords[3].y == 1 ? low_coord : 1; } glBegin(GL_QUADS); glTexCoord3iv((GLint *) &coords[0]); - glVertex2i(0, 0); + glVertex2i(rect.left, device->render_offscreen ? rect.bottom : rect.top); glTexCoord3iv((GLint *) &coords[1]); - glVertex2i(0, This->pow2Height); + glVertex2i(0, device->render_offscreen ? rect.top : rect.bottom); glTexCoord3iv((GLint *) &coords[2]); - glVertex2i(This->pow2Width, This->pow2Height); + glVertex2i(rect.right, device->render_offscreen ? rect.top : rect.bottom); glTexCoord3iv((GLint *) &coords[3]); - glVertex2i(This->pow2Width, 0); + glVertex2i(rect.right, device->render_offscreen ? rect.bottom : rect.top); glEnd(); checkGLcall("glEnd"); @@ -3598,7 +3622,7 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_LoadLocation(IWineD3DSurface *iface, D } } else if(flag == SFLAG_INDRAWABLE) { if(This->Flags & SFLAG_INTEXTURE) { - surface_blt_to_drawable(This); + surface_blt_to_drawable(This, rect); } else { /* Activate the correct context for the render target */ ActivateContext(myDevice, iface, CTXUSAGE_BLIT);

1 0

Stefan Dösinger : wined3d: Move memory allocation into a separate function.
by Alexandre Julliard 01 Nov '07

01 Nov '07

Module: wine Branch: master Commit: 64929cfb33261682e97e19c8b29807a62f284898 URL: http://source.winehq.org/git/wine.git/?a=commit;h=64929cfb33261682e97e19c8b… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Nov 1 01:31:01 2007 +0100 wined3d: Move memory allocation into a separate function. --- dlls/wined3d/surface.c | 93 +++++++++++++++++++++++++----------------------- 1 files changed, 48 insertions(+), 45 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 50b5258..36f3002 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -37,7 +37,6 @@ HRESULT d3dfmt_convert_surface(BYTE *src, BYTE *dst, UINT pitch, UINT width, UIN static void d3dfmt_p8_init_palette(IWineD3DSurfaceImpl *This, BYTE table[256][4], BOOL colorkey); static void surface_download_data(IWineD3DSurfaceImpl *This) { - if (!(This->resource.allocatedMemory || This->Flags & SFLAG_PBO)) This->resource.allocatedMemory = HeapAlloc(GetProcessHeap(), 0, This->resource.size + 4); if (This->resource.format == WINED3DFMT_DXT1 || This->resource.format == WINED3DFMT_DXT2 || This->resource.format == WINED3DFMT_DXT3 || This->resource.format == WINED3DFMT_DXT4 || This->resource.format == WINED3DFMT_DXT5) { @@ -630,42 +629,23 @@ static void read_from_framebuffer(IWineD3DSurfaceImpl *This, CONST RECT *rect, v } } -static HRESULT WINAPI IWineD3DSurfaceImpl_LockRect(IWineD3DSurface *iface, WINED3DLOCKED_RECT* pLockedRect, CONST RECT* pRect, DWORD Flags) { - IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *)iface; - IWineD3DDeviceImpl *myDevice = This->resource.wineD3DDevice; - IWineD3DSwapChain *swapchain = NULL; - - TRACE("(%p) : rect@%p flags(%08x), output lockedRect@%p, memory@%p\n", This, pRect, Flags, pLockedRect, This->resource.allocatedMemory); - - if (This->Flags & SFLAG_LOCKED) { - WARN("Surface is already locked, returning D3DERR_INVALIDCALL\n"); - return WINED3DERR_INVALIDCALL; - } - if (!(This->Flags & SFLAG_LOCKABLE)) { - /* Note: UpdateTextures calls CopyRects which calls this routine to populate the - texture regions, and since the destination is an unlockable region we need - to tolerate this */ - TRACE("Warning: trying to lock unlockable surf@%p\n", This); - /*return WINED3DERR_INVALIDCALL; */ - } - - pLockedRect->Pitch = IWineD3DSurface_GetPitch(iface); - - /* Mark the surface locked */ - This->Flags |= SFLAG_LOCKED; - - /* Whatever surface we have, make sure that there is memory allocated for the downloaded copy, - * or a pbo to map +static void surface_prepare_system_memory(IWineD3DSurfaceImpl *This) { + /* Performance optimization: Count how often a surface is locked, if it is locked regularly do not throw away the system memory copy. + * This avoids the need to download the surface from opengl all the time. The surface is still downloaded if the opengl texture is + * changed */ - if(!(This->resource.allocatedMemory || This->Flags & SFLAG_PBO)) { - This->resource.allocatedMemory = HeapAlloc(GetProcessHeap() ,0 , This->resource.size + 4); - if(This->Flags & SFLAG_INSYSMEM) { - ERR("Surface without memory or pbo has SFLAG_INSYSMEM set!\n"); + if(!(This->Flags & SFLAG_DYNLOCK)) { + This->lockCount++; + /* MAXLOCKCOUNT is defined in wined3d_private.h */ + if(This->lockCount > MAXLOCKCOUNT) { + TRACE("Surface is locked regularly, not freeing the system memory copy any more\n"); + This->Flags |= SFLAG_DYNLOCK; } } /* Create a PBO for dynamically locked surfaces but don't do it for converted or non-pow2 surfaces. - * Also don't create a PBO for systemmem surfaces. */ + * Also don't create a PBO for systemmem surfaces. + */ if(GL_SUPPORT(ARB_PIXEL_BUFFER_OBJECT) && (This->Flags & SFLAG_DYNLOCK) && !(This->Flags & (SFLAG_PBO | SFLAG_CONVERTED | SFLAG_NONPOW2)) && (This->resource.pool != WINED3DPOOL_SYSTEMMEM)) { GLenum error; ENTER_GL(); @@ -692,8 +672,41 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_LockRect(IWineD3DSurface *iface, WINED This->resource.allocatedMemory = NULL; This->Flags |= SFLAG_PBO; LEAVE_GL(); + } else if(!(This->resource.allocatedMemory || This->Flags & SFLAG_PBO)) { + /* Whatever surface we have, make sure that there is memory allocated for the downloaded copy, + * or a pbo to map + */ + This->resource.allocatedMemory = HeapAlloc(GetProcessHeap() ,0 , This->resource.size + 4); + if(This->Flags & SFLAG_INSYSMEM) { + ERR("Surface without memory or pbo has SFLAG_INSYSMEM set!\n"); + } + } +} + +static HRESULT WINAPI IWineD3DSurfaceImpl_LockRect(IWineD3DSurface *iface, WINED3DLOCKED_RECT* pLockedRect, CONST RECT* pRect, DWORD Flags) { + IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *)iface; + IWineD3DDeviceImpl *myDevice = This->resource.wineD3DDevice; + IWineD3DSwapChain *swapchain = NULL; + + TRACE("(%p) : rect@%p flags(%08x), output lockedRect@%p, memory@%p\n", This, pRect, Flags, pLockedRect, This->resource.allocatedMemory); + + if (This->Flags & SFLAG_LOCKED) { + WARN("Surface is already locked, returning D3DERR_INVALIDCALL\n"); + return WINED3DERR_INVALIDCALL; + } + if (!(This->Flags & SFLAG_LOCKABLE)) { + /* Note: UpdateTextures calls CopyRects which calls this routine to populate the + texture regions, and since the destination is an unlockable region we need + to tolerate this */ + TRACE("Warning: trying to lock unlockable surf@%p\n", This); + /*return WINED3DERR_INVALIDCALL; */ } + pLockedRect->Pitch = IWineD3DSurface_GetPitch(iface); + + /* Mark the surface locked */ + This->Flags |= SFLAG_LOCKED; + /* Calculate the correct start address to report */ if (NULL == pRect) { This->lockedRect.left = 0; @@ -713,19 +726,6 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_LockRect(IWineD3DSurface *iface, WINED TRACE("Locking non-power 2 texture\n"); } - /* Performance optimization: Count how often a surface is locked, if it is locked regularly do not throw away the system memory copy. - * This avoids the need to download the surface from opengl all the time. The surface is still downloaded if the opengl texture is - * changed - */ - if(!(This->Flags & SFLAG_DYNLOCK)) { - This->lockCount++; - /* MAXLOCKCOUNT is defined in wined3d_private.h */ - if(This->lockCount > MAXLOCKCOUNT) { - TRACE("Surface is locked regularly, not freeing the system memory copy any more\n"); - This->Flags |= SFLAG_DYNLOCK; - } - } - if (Flags & WINED3DLOCK_DISCARD) { /* Set SFLAG_INSYSMEM, so we'll never try to download the data from the texture. */ TRACE("WINED3DLOCK_DISCARD flag passed, marking local copy as up to date\n"); @@ -734,6 +734,7 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_LockRect(IWineD3DSurface *iface, WINED if (This->Flags & SFLAG_INSYSMEM) { TRACE("Local copy is up to date, not downloading data\n"); + surface_prepare_system_memory(This); /* Makes sure memory is allocated */ goto lock_end; } @@ -3516,6 +3517,8 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_LoadLocation(IWineD3DSurface *iface, D myDevice = This->resource.wineD3DDevice; if(flag == SFLAG_INSYSMEM) { + surface_prepare_system_memory(This); + /* Download the surface to system memory */ if(This->Flags & SFLAG_INTEXTURE) { if (0 == This->glDescription.textureName) {

1 0

Stefan Dösinger : wined3d: Move texture -> drawable blits to LoadLocation.
by Alexandre Julliard 01 Nov '07

01 Nov '07

Module: wine Branch: master Commit: 948292dbc3930a95252fb5e03321f94a1f475db9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=948292dbc3930a95252fb5e03… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Nov 1 01:38:50 2007 +0100 wined3d: Move texture -> drawable blits to LoadLocation. --- dlls/wined3d/device.c | 2 +- dlls/wined3d/drawprim.c | 125 +--------------------------------------- dlls/wined3d/surface.c | 121 +++++++++++++++++++++++++++++++++++++- dlls/wined3d/wined3d_private.h | 2 - 4 files changed, 119 insertions(+), 131 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=948292dbc3930a95252fb…

1 0

Hans Leidekker : wininet: Implement and test FtpCommand{A, W}.
by Alexandre Julliard 01 Nov '07

01 Nov '07

Module: wine Branch: master Commit: 9e934ee17889a01242f1bbd5437b59158c2a8adc URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e934ee17889a01242f1bbd54… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Wed Oct 31 22:54:03 2007 +0100 wininet: Implement and test FtpCommand{A, W}. --- dlls/wininet/ftp.c | 107 +++++++++++++++++++++++++++++++++++++++++++-- dlls/wininet/tests/ftp.c | 42 +++++++++++++++++- 2 files changed, 143 insertions(+), 6 deletions(-) diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index c045217..8c0cc5d 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -4,6 +4,7 @@ * Copyright 1999 Corel Corporation * Copyright 2004 Mike McCormack for CodeWeavers * Copyright 2004 Kevin Koltzau + * Copyright 2007 Hans Leidekker * * Ulrich Czekalla * Noureddine Jemmali @@ -1863,10 +1864,34 @@ lend: BOOL WINAPI FtpCommandA( HINTERNET hConnect, BOOL fExpectResponse, DWORD dwFlags, LPCSTR lpszCommand, DWORD_PTR dwContext, HINTERNET* phFtpCommand ) { - FIXME("%p %d 0x%08x %s 0x%08lx %p\n", hConnect, fExpectResponse, dwFlags, + BOOL r; + WCHAR *cmdW; + + TRACE("%p %d 0x%08x %s 0x%08lx %p\n", hConnect, fExpectResponse, dwFlags, debugstr_a(lpszCommand), dwContext, phFtpCommand); - return TRUE; + if (fExpectResponse) + { + FIXME("data connection not supported\n"); + return FALSE; + } + + if (!lpszCommand || !lpszCommand[0]) + { + INTERNET_SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + if (!(cmdW = WININET_strdup_AtoW(lpszCommand))) + { + INTERNET_SetLastError(ERROR_OUTOFMEMORY); + return FALSE; + } + + r = FtpCommandW(hConnect, fExpectResponse, dwFlags, cmdW, dwContext, phFtpCommand); + + HeapFree(GetProcessHeap(), 0, cmdW); + return r; } /*********************************************************************** @@ -1875,10 +1900,82 @@ BOOL WINAPI FtpCommandA( HINTERNET hConnect, BOOL fExpectResponse, DWORD dwFlags BOOL WINAPI FtpCommandW( HINTERNET hConnect, BOOL fExpectResponse, DWORD dwFlags, LPCWSTR lpszCommand, DWORD_PTR dwContext, HINTERNET* phFtpCommand ) { - FIXME("%p %d 0x%08x %s 0x%08lx %p\n", hConnect, fExpectResponse, dwFlags, - debugstr_w(lpszCommand), dwContext, phFtpCommand); + BOOL r = FALSE; + LPWININETFTPSESSIONW lpwfs; + LPSTR cmd = NULL; + DWORD len, nBytesSent= 0; + INT nResCode, nRC = 0; - return TRUE; + TRACE("%p %d 0x%08x %s 0x%08lx %p\n", hConnect, fExpectResponse, dwFlags, + debugstr_w(lpszCommand), dwContext, phFtpCommand); + + if (!lpszCommand || !lpszCommand[0]) + { + INTERNET_SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + if (fExpectResponse) + { + FIXME("data connection not supported\n"); + return FALSE; + } + + lpwfs = (LPWININETFTPSESSIONW) WININET_GetObject( hConnect ); + if (!lpwfs) + { + INTERNET_SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + + if (WH_HFTPSESSION != lpwfs->hdr.htype) + { + INTERNET_SetLastError(ERROR_INTERNET_INCORRECT_HANDLE_TYPE); + goto lend; + } + + if (lpwfs->download_in_progress != NULL) + { + INTERNET_SetLastError(ERROR_FTP_TRANSFER_IN_PROGRESS); + goto lend; + } + + len = WideCharToMultiByte(CP_ACP, 0, lpszCommand, -1, NULL, 0, NULL, NULL) + strlen(szCRLF); + if ((cmd = HeapAlloc(GetProcessHeap(), 0, len ))) + WideCharToMultiByte(CP_ACP, 0, lpszCommand, -1, cmd, len, NULL, NULL); + else + { + INTERNET_SetLastError(ERROR_OUTOFMEMORY); + goto lend; + } + + strcat(cmd, szCRLF); + len--; + + TRACE("Sending (%s) len(%d)\n", cmd, len); + while ((nBytesSent < len) && (nRC != -1)) + { + nRC = send(lpwfs->sndSocket, cmd + nBytesSent, len - nBytesSent, 0); + if (nRC != -1) + { + nBytesSent += nRC; + TRACE("Sent %d bytes\n", nRC); + } + } + + if (nBytesSent) + { + nResCode = FTP_ReceiveResponse(lpwfs, lpwfs->hdr.dwContext); + if (nResCode > 0 && nResCode < 400) + r = TRUE; + else + FTP_SetResponseError(nResCode); + } + +lend: + WININET_Release( &lpwfs->hdr ); + HeapFree(GetProcessHeap(), 0, cmd); + return r; } /*********************************************************************** diff --git a/dlls/wininet/tests/ftp.c b/dlls/wininet/tests/ftp.c index fa13fdc..6d03fb8 100644 --- a/dlls/wininet/tests/ftp.c +++ b/dlls/wininet/tests/ftp.c @@ -25,7 +25,6 @@ * TODO: * Add W-function tests. * Add missing function tests: - * FtpCommand * FtpFindFirstFile * FtpGetCurrentDirectory * FtpGetFileSize @@ -652,6 +651,46 @@ static void test_renamefile(HINTERNET hFtp, HINTERNET hConnect) "Expected ERROR_INTERNET_INCORRECT_HANDLE_TYPE, got %d\n", GetLastError()); } +static void test_command(HINTERNET hFtp, HINTERNET hConnect) +{ + BOOL ret; + DWORD error; + unsigned int i; + static const struct + { + BOOL ret; + DWORD error; + const char *cmd; + } + command_test[] = + { + { FALSE, ERROR_INVALID_PARAMETER, NULL }, + { FALSE, ERROR_INVALID_PARAMETER, "" }, + { FALSE, ERROR_INTERNET_EXTENDED_ERROR, "HELO" }, + { FALSE, ERROR_INTERNET_EXTENDED_ERROR, "SIZE " }, + { FALSE, ERROR_INTERNET_EXTENDED_ERROR, " SIZE" }, + { FALSE, ERROR_INTERNET_EXTENDED_ERROR, "SIZE " }, + { FALSE, ERROR_INTERNET_EXTENDED_ERROR, "SIZE /welcome.msg /welcome.msg" }, + { FALSE, ERROR_INTERNET_EXTENDED_ERROR, "SIZE /welcome.msg" }, + { FALSE, ERROR_INTERNET_EXTENDED_ERROR, "SIZE /welcome.msg " }, + { TRUE, ERROR_SUCCESS, "SIZE\t/welcome.msg" }, + { TRUE, ERROR_SUCCESS, "SIZE /welcome.msg" }, + { FALSE, ERROR_INTERNET_EXTENDED_ERROR, "PWD /welcome.msg" }, + { TRUE, ERROR_SUCCESS, "PWD" }, + { TRUE, ERROR_SUCCESS, "PWD\r\n" } + }; + + for (i = 0; i < sizeof(command_test) / sizeof(command_test[0]); i++) + { + SetLastError(0xdeadbeef); + ret = FtpCommandA(hFtp, FALSE, FTP_TRANSFER_TYPE_ASCII, command_test[i].cmd, 0, NULL); + error = GetLastError(); + + ok(ret == command_test[i].ret, "%d: expected FtpCommandA to %s\n", i, command_test[i].ret ? "succeed" : "fail"); + ok(error == command_test[i].error, "%d: expected error %u, got %u\n", i, command_test[i].error, error); + } +} + START_TEST(ftp) { HANDLE hInternet, hFtp, hHttp; @@ -693,6 +732,7 @@ START_TEST(ftp) test_putfile(hFtp, hHttp); test_removedir(hFtp, hHttp); test_renamefile(hFtp, hHttp); + test_command(hFtp, hHttp); InternetCloseHandle(hHttp); InternetCloseHandle(hFtp);

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2007