September 2009 - Wine-commits

Henri Verbeet : wined3d: Rename IWineD3DDevice::SetIndices() to IWineD3DDevice::SetIndexBuffer().
by Alexandre Julliard 25 Sep '09

25 Sep '09

Module: wine Branch: master Commit: 60e32659a74fb0e2c54e85f8e93a568c91ad8a41 URL: http://source.winehq.org/git/wine.git/?a=commit;h=60e32659a74fb0e2c54e85f8e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Sep 25 13:31:45 2009 +0200 wined3d: Rename IWineD3DDevice::SetIndices() to IWineD3DDevice::SetIndexBuffer(). --- dlls/d3d10core/device.c | 2 +- dlls/d3d8/device.c | 2 +- dlls/d3d9/device.c | 4 ++-- dlls/ddraw/device.c | 4 ++-- dlls/ddraw/surface.c | 2 +- dlls/wined3d/device.c | 8 +++++--- dlls/wined3d/stateblock.c | 7 ++++--- include/wine/wined3d.idl | 2 +- 8 files changed, 17 insertions(+), 14 deletions(-) diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index b646d99..8e44bcc 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -215,7 +215,7 @@ static void STDMETHODCALLTYPE d3d10_device_IASetIndexBuffer(ID3D10Device *iface, TRACE("iface %p, buffer %p, format %s, offset %u.\n", iface, buffer, debug_dxgi_format(format), offset); - IWineD3DDevice_SetIndices(This->wined3d_device, buffer ? ((struct d3d10_buffer *)buffer)->wined3d_buffer : NULL, + IWineD3DDevice_SetIndexBuffer(This->wined3d_device, buffer ? ((struct d3d10_buffer *)buffer)->wined3d_buffer : NULL, wined3dformat_from_dxgi_format(format)); if (offset) FIXME("offset %u not supported.\n", offset); } diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 4686f9a..1076b4e 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -2060,7 +2060,7 @@ static HRESULT WINAPI IDirect3DDevice8Impl_SetIndices(LPDIRECT3DDEVICE8 iface, I */ wined3d_mutex_lock(); IWineD3DDevice_SetBaseVertexIndex(This->WineD3DDevice, baseVertexIndex); - hr = IWineD3DDevice_SetIndices(This->WineD3DDevice, + hr = IWineD3DDevice_SetIndexBuffer(This->WineD3DDevice, ib ? ib->wineD3DIndexBuffer : NULL, ib ? ib->format : WINED3DFMT_UNKNOWN); wined3d_mutex_unlock(); diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 819e855..2ab4c4b 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -508,7 +508,7 @@ static HRESULT WINAPI IDirect3DDevice9Impl_Reset(LPDIRECT3DDEVICE9EX iface, D3 * below fails, the device is considered "lost", and _Reset and _Release are the only allowed calls */ wined3d_mutex_lock(); - IWineD3DDevice_SetIndices(This->WineD3DDevice, NULL, WINED3DFMT_UNKNOWN); + IWineD3DDevice_SetIndexBuffer(This->WineD3DDevice, NULL, WINED3DFMT_UNKNOWN); for(i = 0; i < 16; i++) { IWineD3DDevice_SetStreamSource(This->WineD3DDevice, i, NULL, 0, 0); } @@ -1934,7 +1934,7 @@ static HRESULT WINAPI IDirect3DDevice9Impl_SetIndices(LPDIRECT3DDEVICE9EX ifac TRACE("(%p) Relay\n", This); wined3d_mutex_lock(); - hr = IWineD3DDevice_SetIndices(This->WineD3DDevice, + hr = IWineD3DDevice_SetIndexBuffer(This->WineD3DDevice, ib ? ib->wineD3DIndexBuffer : NULL, ib ? ib->format : WINED3DFMT_UNKNOWN); wined3d_mutex_unlock(); diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 5a1b75d..5bf174d 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -316,7 +316,7 @@ IDirect3DDeviceImpl_7_Release(IDirect3DDevice7 *iface) EnterCriticalSection(&ddraw_cs); /* Free the index buffer. */ - IWineD3DDevice_SetIndices(This->wineD3DDevice, NULL, WINED3DFMT_UNKNOWN); + IWineD3DDevice_SetIndexBuffer(This->wineD3DDevice, NULL, WINED3DFMT_UNKNOWN); IWineD3DBuffer_GetParent(This->indexbuffer, (IUnknown **) &IndexBufferParent); IParent_Release(IndexBufferParent); /* Once for the getParent */ @@ -4266,7 +4266,7 @@ IDirect3DDeviceImpl_7_DrawIndexedPrimitiveVB(IDirect3DDevice7 *iface, /* Set the index stream */ IWineD3DDevice_SetBaseVertexIndex(This->wineD3DDevice, StartVertex); - hr = IWineD3DDevice_SetIndices(This->wineD3DDevice, This->indexbuffer, + hr = IWineD3DDevice_SetIndexBuffer(This->wineD3DDevice, This->indexbuffer, WINED3DFMT_R16_UINT); /* Set the vertex stream source */ diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 24246c7..a3f39ef 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -317,7 +317,7 @@ IDirectDrawSurfaceImpl_Release(IDirectDrawSurface7 *iface) TRACE("(%p) Destroying the render target, uninitializing D3D\n", This); /* Unset any index buffer, just to be sure */ - IWineD3DDevice_SetIndices(ddraw->wineD3DDevice, NULL, WINED3DFMT_UNKNOWN); + IWineD3DDevice_SetIndexBuffer(ddraw->wineD3DDevice, NULL, WINED3DFMT_UNKNOWN); IWineD3DDevice_SetDepthStencilSurface(ddraw->wineD3DDevice, NULL); IWineD3DDevice_SetVertexDeclaration(ddraw->wineD3DDevice, NULL); for(i = 0; i < ddraw->numConvertedDecls; i++) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index bda39e1..736d91f 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3064,8 +3064,10 @@ static HRESULT WINAPI IWineD3DDeviceImpl_GetMaterial(IWineD3DDevice *iface, WINE /***** * Get / Set Indices *****/ -static HRESULT WINAPI IWineD3DDeviceImpl_SetIndices(IWineD3DDevice *iface, IWineD3DBuffer* pIndexData, WINED3DFORMAT fmt) { - IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; +static HRESULT WINAPI IWineD3DDeviceImpl_SetIndexBuffer(IWineD3DDevice *iface, + IWineD3DBuffer *pIndexData, WINED3DFORMAT fmt) +{ + IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; IWineD3DBuffer *oldIdxs; TRACE("(%p) : Setting to %p\n", This, pIndexData); @@ -7393,7 +7395,7 @@ const IWineD3DDeviceVtbl IWineD3DDevice_Vtbl = IWineD3DDeviceImpl_GetDepthStencilSurface, IWineD3DDeviceImpl_SetGammaRamp, IWineD3DDeviceImpl_GetGammaRamp, - IWineD3DDeviceImpl_SetIndices, + IWineD3DDeviceImpl_SetIndexBuffer, IWineD3DDeviceImpl_GetIndices, IWineD3DDeviceImpl_SetBaseVertexIndex, IWineD3DDeviceImpl_GetBaseVertexIndex, diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 239b777..feb9808 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -842,8 +842,9 @@ should really perform a delta so that only the changes get updated*/ This->wineD3DDevice->updateStateBlock->gl_primitive_type = This->gl_primitive_type; } - if (This->changed.indices) { - IWineD3DDevice_SetIndices(pDevice, This->pIndexData, This->IndexFmt); + if (This->changed.indices) + { + IWineD3DDevice_SetIndexBuffer(pDevice, This->pIndexData, This->IndexFmt); IWineD3DDevice_SetBaseVertexIndex(pDevice, This->baseVertexIndex); } @@ -1025,7 +1026,7 @@ should really perform a delta so that only the changes get updated*/ IWineD3DDevice_SetTransform(pDevice, i, &This->transforms[i]); } This->wineD3DDevice->updateStateBlock->gl_primitive_type = This->gl_primitive_type; - IWineD3DDevice_SetIndices(pDevice, This->pIndexData, This->IndexFmt); + IWineD3DDevice_SetIndexBuffer(pDevice, This->pIndexData, This->IndexFmt); IWineD3DDevice_SetBaseVertexIndex(pDevice, This->baseVertexIndex); IWineD3DDevice_SetVertexDeclaration(pDevice, This->vertexDecl); IWineD3DDevice_SetMaterial(pDevice, &This->material); diff --git a/include/wine/wined3d.idl b/include/wine/wined3d.idl index 8c3e3c4..854ce37 100644 --- a/include/wine/wined3d.idl +++ b/include/wine/wined3d.idl @@ -3118,7 +3118,7 @@ interface IWineD3DDevice : IWineD3DBase [in] UINT swapchain_idx, [out] WINED3DGAMMARAMP *ramp ); - HRESULT SetIndices( + HRESULT SetIndexBuffer( [in] IWineD3DBuffer *index_buffer, [in] WINED3DFORMAT format );

1 0

Henri Verbeet : wined3d: Move common shader fields to IWineD3DBaseShaderClass.
by Alexandre Julliard 25 Sep '09

25 Sep '09

Module: wine Branch: master Commit: f88c6e5ce5952ff348af608ace2f497d8d572f75 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f88c6e5ce5952ff348af608ac… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Sep 25 13:31:44 2009 +0200 wined3d: Move common shader fields to IWineD3DBaseShaderClass. --- dlls/wined3d/arb_program_shader.c | 32 +++++++++++++++------------- dlls/wined3d/baseshader.c | 8 +++++- dlls/wined3d/glsl_shader.c | 40 ++++++++++++++++++++++++------------- dlls/wined3d/pixelshader.c | 9 ++----- dlls/wined3d/vertexshader.c | 9 ++----- dlls/wined3d/wined3d_private.h | 21 +++++------------- 6 files changed, 61 insertions(+), 58 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f88c6e5ce5952ff348af6…

1 0

Henri Verbeet : wined3d: Remove SetFunction() from the public shader interface.
by Alexandre Julliard 25 Sep '09

25 Sep '09

Module: wine Branch: master Commit: 77086e8e84d951e19f888283819088f6183b7f15 URL: http://source.winehq.org/git/wine.git/?a=commit;h=77086e8e84d951e19f8882838… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Sep 25 13:31:43 2009 +0200 wined3d: Remove SetFunction() from the public shader interface. --- dlls/wined3d/pixelshader.c | 67 ++++++++++++++++---------------- dlls/wined3d/vertexshader.c | 88 ++++++++++++++++++++++-------------------- include/wine/wined3d.idl | 4 -- 3 files changed, 80 insertions(+), 79 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=77086e8e84d951e19f888…

1 0

Henri Verbeet : wined3d: Move some common shader functions to the IWineD3DBaseShader interface.
by Alexandre Julliard 25 Sep '09

25 Sep '09

Module: wine Branch: master Commit: d76c7a8521f7088e0e2f963bc1e95ac0c732f36d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d76c7a8521f7088e0e2f963bc… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Sep 25 13:31:42 2009 +0200 wined3d: Move some common shader functions to the IWineD3DBaseShader interface. --- dlls/wined3d/pixelshader.c | 2 +- dlls/wined3d/vertexshader.c | 2 +- include/wine/wined3d.idl | 21 +++++++-------------- 3 files changed, 9 insertions(+), 16 deletions(-) diff --git a/dlls/wined3d/pixelshader.c b/dlls/wined3d/pixelshader.c index 89d7a13..74e1559 100644 --- a/dlls/wined3d/pixelshader.c +++ b/dlls/wined3d/pixelshader.c @@ -354,9 +354,9 @@ static const IWineD3DPixelShaderVtbl IWineD3DPixelShader_Vtbl = IWineD3DPixelShaderImpl_GetParent, /*** IWineD3DBaseShader methods ***/ IWineD3DPixelShaderImpl_SetFunction, - /*** IWineD3DPixelShader methods ***/ IWineD3DPixelShaderImpl_GetDevice, IWineD3DPixelShaderImpl_GetFunction + /*** IWineD3DPixelShader methods ***/ }; void find_ps_compile_args(IWineD3DPixelShaderImpl *shader, IWineD3DStateBlockImpl *stateblock, struct ps_compile_args *args) { diff --git a/dlls/wined3d/vertexshader.c b/dlls/wined3d/vertexshader.c index 0a5bf40..1a6a884 100644 --- a/dlls/wined3d/vertexshader.c +++ b/dlls/wined3d/vertexshader.c @@ -343,9 +343,9 @@ static const IWineD3DVertexShaderVtbl IWineD3DVertexShader_Vtbl = IWineD3DVertexShaderImpl_GetParent, /*** IWineD3DBaseShader methods ***/ IWineD3DVertexShaderImpl_SetFunction, - /*** IWineD3DVertexShader methods ***/ IWineD3DVertexShaderImpl_GetDevice, IWineD3DVertexShaderImpl_GetFunction, + /*** IWineD3DVertexShader methods ***/ IWIneD3DVertexShaderImpl_SetLocalConstantsF }; diff --git a/include/wine/wined3d.idl b/include/wine/wined3d.idl index e39a880..55f87ea 100644 --- a/include/wine/wined3d.idl +++ b/include/wine/wined3d.idl @@ -2838,6 +2838,13 @@ interface IWineD3DBaseShader : IWineD3DBase [in] const DWORD *function, [in] const struct wined3d_shader_signature *output_signature ); + HRESULT GetDevice( + [out] IWineD3DDevice **device + ); + HRESULT GetFunction( + [out] void *data, + [in, out] UINT *data_size + ); } [ @@ -2847,13 +2854,6 @@ interface IWineD3DBaseShader : IWineD3DBase ] interface IWineD3DVertexShader : IWineD3DBaseShader { - HRESULT GetDevice( - [out] IWineD3DDevice **device - ); - HRESULT GetFunction( - [out] void *data, - [in, out] UINT *data_size - ); HRESULT SetLocalConstantsF( [in] UINT start_idx, [in] const float *src_data, @@ -2868,13 +2868,6 @@ interface IWineD3DVertexShader : IWineD3DBaseShader ] interface IWineD3DPixelShader : IWineD3DBaseShader { - HRESULT GetDevice( - [out] IWineD3DDevice **device - ); - HRESULT GetFunction( - [out] void *data, - [in, out] UINT *data_size - ); } [

1 0

Henri Verbeet : d3d8: Set the vertex declaration' s shader handle in vertexdeclaration_init().
by Alexandre Julliard 25 Sep '09

25 Sep '09

Module: wine Branch: master Commit: 27723affc9d6c2b611bd9684ad21c10ba657dfe8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=27723affc9d6c2b611bd9684a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Sep 25 13:31:41 2009 +0200 d3d8: Set the vertex declaration's shader handle in vertexdeclaration_init(). --- dlls/d3d8/d3d8_private.h | 2 +- dlls/d3d8/vertexdeclaration.c | 3 ++- dlls/d3d8/vertexshader.c | 4 +--- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/d3d8/d3d8_private.h b/dlls/d3d8/d3d8_private.h index 8adc9e3..2218f31 100644 --- a/dlls/d3d8/d3d8_private.h +++ b/dlls/d3d8/d3d8_private.h @@ -542,7 +542,7 @@ typedef struct { } IDirect3DVertexDeclaration8Impl; HRESULT vertexdeclaration_init(IDirect3DVertexDeclaration8Impl *declaration, - IDirect3DDevice8Impl *device, const DWORD *elements) DECLSPEC_HIDDEN; + IDirect3DDevice8Impl *device, const DWORD *elements, DWORD shader_handle) DECLSPEC_HIDDEN; HRESULT vertexdeclaration_init_fvf(IDirect3DVertexDeclaration8Impl *declaration, IDirect3DDevice8Impl *device, DWORD fvf) DECLSPEC_HIDDEN; diff --git a/dlls/d3d8/vertexdeclaration.c b/dlls/d3d8/vertexdeclaration.c index fad58fb..1387a8c 100644 --- a/dlls/d3d8/vertexdeclaration.c +++ b/dlls/d3d8/vertexdeclaration.c @@ -376,7 +376,7 @@ static const struct wined3d_parent_ops d3d8_vertexdeclaration_wined3d_parent_ops }; HRESULT vertexdeclaration_init(IDirect3DVertexDeclaration8Impl *declaration, - IDirect3DDevice8Impl *device, const DWORD *elements) + IDirect3DDevice8Impl *device, const DWORD *elements, DWORD shader_handle) { WINED3DVERTEXELEMENT *wined3d_elements; UINT wined3d_element_count; @@ -384,6 +384,7 @@ HRESULT vertexdeclaration_init(IDirect3DVertexDeclaration8Impl *declaration, declaration->lpVtbl = &Direct3DVertexDeclaration8_Vtbl; declaration->ref_count = 1; + declaration->shader_handle = shader_handle; wined3d_element_count = convert_to_wined3d_declaration(elements, &declaration->elements_size, &wined3d_elements); declaration->elements = HeapAlloc(GetProcessHeap(), 0, declaration->elements_size); diff --git a/dlls/d3d8/vertexshader.c b/dlls/d3d8/vertexshader.c index aacf15c..92bd1fe 100644 --- a/dlls/d3d8/vertexshader.c +++ b/dlls/d3d8/vertexshader.c @@ -113,7 +113,7 @@ static HRESULT vertexshader_create_vertexdeclaration(IDirect3DDevice8Impl *devic return D3DERR_OUTOFVIDEOMEMORY; } - hr = vertexdeclaration_init(object, device, declaration); + hr = vertexdeclaration_init(object, device, declaration, shader_handle); if (FAILED(hr)) { WARN("Failed to initialize vertex declaration, hr %#x.\n", hr); @@ -121,8 +121,6 @@ static HRESULT vertexshader_create_vertexdeclaration(IDirect3DDevice8Impl *devic return hr; } - object->shader_handle = shader_handle; - TRACE("Created vertex declaration %p.\n", object); *decl_ptr = (IDirect3DVertexDeclaration8 *)object;

1 0

Alexandre Julliard : comctl32/tests: Use UDM_GET/SETPOS instead of UDM_GET/ SETPOS32 for compatibility with old versions.
by Alexandre Julliard 25 Sep '09

25 Sep '09

Module: wine Branch: master Commit: d0aaae9987342fd75bd7ee742626227c9d0a9a48 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0aaae9987342fd75bd7ee742… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 25 15:13:55 2009 +0200 comctl32/tests: Use UDM_GET/SETPOS instead of UDM_GET/SETPOS32 for compatibility with old versions. --- dlls/comctl32/tests/updown.c | 12 +++++------- 1 files changed, 5 insertions(+), 7 deletions(-) diff --git a/dlls/comctl32/tests/updown.c b/dlls/comctl32/tests/updown.c index 104d3c8..8797b9f 100644 --- a/dlls/comctl32/tests/updown.c +++ b/dlls/comctl32/tests/updown.c @@ -513,7 +513,7 @@ static void test_updown_base(void) /* switch base with buddy attached */ updown = create_updown_control(UDS_SETBUDDYINT); - r = SendMessage(updown, UDM_SETPOS32, 0, 10); + r = SendMessage(updown, UDM_SETPOS, 0, 10); expect(50, r); GetWindowTextA(edit, text, sizeof(text)/sizeof(CHAR)); @@ -587,7 +587,6 @@ static void test_UDS_SETBUDDYINT(void) HWND updown; DWORD style, ret; CHAR text[10]; - BOOL b; /* cleanup buddy */ text[0] = '\0'; @@ -619,7 +618,7 @@ static void test_UDS_SETBUDDYINT(void) /* set edit text directly, check position */ strcpy(text, "10"); SetWindowTextA(edit, text); - ret = SendMessageA(updown, UDM_GETPOS32, 0, 0); + ret = SendMessageA(updown, UDM_GETPOS, 0, 0); expect(10, ret); strcpy(text, "11"); SetWindowTextA(edit, text); @@ -629,10 +628,9 @@ static void test_UDS_SETBUDDYINT(void) /* set to invalid value */ strcpy(text, "21st"); SetWindowTextA(edit, text); - b = FALSE; - ret = SendMessageA(updown, UDM_GETPOS32, 0, (LPARAM)&b); - expect(11, ret); - expect(TRUE, b); + ret = SendMessageA(updown, UDM_GETPOS, 0, 0); + expect(11, LOWORD(ret)); + expect(TRUE, HIWORD(ret)); /* set style back */ style = GetWindowLongA(updown, GWL_STYLE); SetWindowLongA(updown, GWL_STYLE, style | UDS_SETBUDDYINT);

1 0

Alexandre Julliard : comctl32/tests: Fix some rebar tests on older comctl32 versions.
by Alexandre Julliard 25 Sep '09

25 Sep '09

Module: wine Branch: master Commit: ae2b8a6e9701a8606d092db14edd87acf859f295 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae2b8a6e9701a8606d092db14… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 25 15:13:25 2009 +0200 comctl32/tests: Fix some rebar tests on older comctl32 versions. --- dlls/comctl32/tests/rebar.c | 30 ++++++++++++++++++------------ 1 files changed, 18 insertions(+), 12 deletions(-) diff --git a/dlls/comctl32/tests/rebar.c b/dlls/comctl32/tests/rebar.c index 2af9ab1..6f26388 100644 --- a/dlls/comctl32/tests/rebar.c +++ b/dlls/comctl32/tests/rebar.c @@ -739,7 +739,7 @@ static void expect_band_content(UINT uBand, INT fStyle, COLORREF clrFore, COLORREF clrBack, LPCSTR lpText, int iImage, HWND hwndChild, INT cxMinChild, INT cyMinChild, INT cx, HBITMAP hbmBack, INT wID, INT cyChild, INT cyMaxChild, INT cyIntegral, INT cxIdeal, LPARAM lParam, - INT cxHeader) + INT cxHeader, INT cxHeader_broken) { CHAR buf[MAX_PATH] = "abc"; REBARBANDINFOA rb; @@ -769,7 +769,8 @@ static void expect_band_content(UINT uBand, INT fStyle, COLORREF clrFore, expect_eq(rb.cyIntegral, cyIntegral, int, "%x"); expect_eq(rb.cxIdeal, cxIdeal, int, "%d"); expect_eq(rb.lParam, lParam, LPARAM, "%ld"); - expect_eq(rb.cxHeader, cxHeader, int, "%d"); + ok( rb.cxHeader == cxHeader || broken(rb.cxHeader == cxHeader_broken), + "expected %d for %d\n", cxHeader, rb.cxHeader ); } static void bandinfo_test(void) @@ -781,8 +782,13 @@ static void bandinfo_test(void) rebuild_rebar(&hRebar); rb.cbSize = REBARBANDINFOA_V6_SIZE; rb.fMask = 0; - ok(SendMessageA(hRebar, RB_INSERTBANDA, 0, (LPARAM)&rb), "RB_INSERTBAND failed\n"); - expect_band_content(0, 0, 0, GetSysColor(COLOR_3DFACE), "", -1, NULL, 0, 0, 0, NULL, 0, 0xdddddddd, 0xdddddddd, 0xdddddddd, 0, 0, 0); + if (!SendMessageA(hRebar, RB_INSERTBANDA, 0, (LPARAM)&rb)) + { + win_skip( "V6 info not supported\n" ); + DestroyWindow(hRebar); + return; + } + expect_band_content(0, 0, 0, GetSysColor(COLOR_3DFACE), "", -1, NULL, 0, 0, 0, NULL, 0, 0xdddddddd, 0xdddddddd, 0xdddddddd, 0, 0, 0, -1); rb.fMask = RBBIM_CHILDSIZE; rb.cxMinChild = 15; @@ -791,37 +797,37 @@ static void bandinfo_test(void) rb.cyMaxChild = 20; rb.cyIntegral = 10; ok(SendMessageA(hRebar, RB_SETBANDINFOA, 0, (LPARAM)&rb), "RB_SETBANDINFO failed\n"); - expect_band_content(0, 0, 0, GetSysColor(COLOR_3DFACE), "", -1, NULL, 15, 20, 0, NULL, 0, 0xdddddddd, 0xdddddddd, 0xdddddddd, 0, 0, 0); + expect_band_content(0, 0, 0, GetSysColor(COLOR_3DFACE), "", -1, NULL, 15, 20, 0, NULL, 0, 0xdddddddd, 0xdddddddd, 0xdddddddd, 0, 0, 0, -1); rb.fMask = RBBIM_TEXT; rb.lpText = szABC; ok(SendMessageA(hRebar, RB_SETBANDINFOA, 0, (LPARAM)&rb), "RB_SETBANDINFO failed\n"); - expect_band_content(0, 0, 0, GetSysColor(COLOR_3DFACE), "ABC", -1, NULL, 15, 20, 0, NULL, 0, 0xdddddddd, 0xdddddddd, 0xdddddddd, 0, 0, 35); + expect_band_content(0, 0, 0, GetSysColor(COLOR_3DFACE), "ABC", -1, NULL, 15, 20, 0, NULL, 0, 0xdddddddd, 0xdddddddd, 0xdddddddd, 0, 0, 35, -1); rb.cbSize = REBARBANDINFOA_V6_SIZE; rb.fMask = 0; ok(SendMessageA(hRebar, RB_INSERTBANDA, 1, (LPARAM)&rb), "RB_INSERTBAND failed\n"); - expect_band_content(1, 0, 0, GetSysColor(COLOR_3DFACE), "", -1, NULL, 0, 0, 0, NULL, 0, 0xdddddddd, 0xdddddddd, 0xdddddddd, 0, 0, 9); - expect_band_content(0, 0, 0, GetSysColor(COLOR_3DFACE), "ABC", -1, NULL, 15, 20, 0, NULL, 0, 0xdddddddd, 0xdddddddd, 0xdddddddd, 0, 0, 40); + expect_band_content(1, 0, 0, GetSysColor(COLOR_3DFACE), "", -1, NULL, 0, 0, 0, NULL, 0, 0xdddddddd, 0xdddddddd, 0xdddddddd, 0, 0, 9, -1); + expect_band_content(0, 0, 0, GetSysColor(COLOR_3DFACE), "ABC", -1, NULL, 15, 20, 0, NULL, 0, 0xdddddddd, 0xdddddddd, 0xdddddddd, 0, 0, 40, -1); rb.fMask = RBBIM_HEADERSIZE; rb.cxHeader = 50; ok(SendMessageA(hRebar, RB_SETBANDINFOA, 0, (LPARAM)&rb), "RB_SETBANDINFO failed\n"); - expect_band_content(0, 0x40000000, 0, GetSysColor(COLOR_3DFACE), "ABC", -1, NULL, 15, 20, 0, NULL, 0, 0xdddddddd, 0xdddddddd, 0xdddddddd, 0, 0, 50); + expect_band_content(0, 0x40000000, 0, GetSysColor(COLOR_3DFACE), "ABC", -1, NULL, 15, 20, 0, NULL, 0, 0xdddddddd, 0xdddddddd, 0xdddddddd, 0, 0, 50, -1); rb.cxHeader = 5; ok(SendMessageA(hRebar, RB_SETBANDINFOA, 0, (LPARAM)&rb), "RB_SETBANDINFO failed\n"); - expect_band_content(0, 0x40000000, 0, GetSysColor(COLOR_3DFACE), "ABC", -1, NULL, 15, 20, 0, NULL, 0, 0xdddddddd, 0xdddddddd, 0xdddddddd, 0, 0, 5); + expect_band_content(0, 0x40000000, 0, GetSysColor(COLOR_3DFACE), "ABC", -1, NULL, 15, 20, 0, NULL, 0, 0xdddddddd, 0xdddddddd, 0xdddddddd, 0, 0, 5, -1); rb.fMask = RBBIM_TEXT; rb.lpText = szABCD; ok(SendMessageA(hRebar, RB_SETBANDINFOA, 0, (LPARAM)&rb), "RB_SETBANDINFO failed\n"); - expect_band_content(0, 0x40000000, 0, GetSysColor(COLOR_3DFACE), "ABCD", -1, NULL, 15, 20, 0, NULL, 0, 0xdddddddd, 0xdddddddd, 0xdddddddd, 0, 0, 5); + expect_band_content(0, 0x40000000, 0, GetSysColor(COLOR_3DFACE), "ABCD", -1, NULL, 15, 20, 0, NULL, 0, 0xdddddddd, 0xdddddddd, 0xdddddddd, 0, 0, 5, -1); rb.fMask = RBBIM_STYLE | RBBIM_TEXT; rb.fStyle = RBBS_VARIABLEHEIGHT; rb.lpText = szABC; ok(SendMessageA(hRebar, RB_SETBANDINFOA, 0, (LPARAM)&rb), "RB_SETBANDINFO failed\n"); - expect_band_content(0, RBBS_VARIABLEHEIGHT, 0, GetSysColor(COLOR_3DFACE), "ABC", -1, NULL, 15, 20, 0, NULL, 0, 20, 0x7fffffff, 0, 0, 0, 40); + expect_band_content(0, RBBS_VARIABLEHEIGHT, 0, GetSysColor(COLOR_3DFACE), "ABC", -1, NULL, 15, 20, 0, NULL, 0, 20, 0x7fffffff, 0, 0, 0, 40, 5); DestroyWindow(hRebar); }

1 0

Hans Leidekker : wininet: Add some URL cache tests and make them pass.
by Alexandre Julliard 25 Sep '09

25 Sep '09

Module: wine Branch: master Commit: 09f1ace55574f6e8cbaa4cbfd4d46d2d4f1a6130 URL: http://source.winehq.org/git/wine.git/?a=commit;h=09f1ace55574f6e8cbaa4cbfd… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Sep 25 12:01:35 2009 +0200 wininet: Add some URL cache tests and make them pass. --- dlls/wininet/tests/urlcache.c | 45 ++++++++++++++++++++++++++++++++++++++-- dlls/wininet/urlcache.c | 22 ++++++++++++++++++++ 2 files changed, 64 insertions(+), 3 deletions(-) diff --git a/dlls/wininet/tests/urlcache.c b/dlls/wininet/tests/urlcache.c index 4ab090b..65e433c 100644 --- a/dlls/wininet/tests/urlcache.c +++ b/dlls/wininet/tests/urlcache.c @@ -30,11 +30,13 @@ #include "wine/test.h" #define TEST_URL "http://urlcachetest.winehq.org/index.html" +#define TEST_URL1 "Visited: user(a)http://urlcachetest.winehq.org/index.html" static BOOL (WINAPI *pDeleteUrlCacheEntryA)(LPCSTR); static BOOL (WINAPI *pUnlockUrlCacheEntryFileA)(LPCSTR,DWORD); static char filenameA[MAX_PATH + 1]; +static char filenameA1[MAX_PATH + 1]; static void check_cache_entry_infoA(const char *returnedfrom, LPINTERNET_CACHE_ENTRY_INFO lpCacheEntryInfo) { @@ -100,7 +102,15 @@ static void test_GetUrlCacheEntryInfoExA(void) SetLastError(0xdeadbeef); ret = GetUrlCacheEntryInfoEx(NULL, NULL, NULL, NULL, NULL, NULL, 0); ok(!ret, "GetUrlCacheEntryInfoEx with NULL URL and NULL args should have failed\n"); - ok(GetLastError() == ERROR_INVALID_PARAMETER, "GetUrlCacheEntryInfoEx with NULL URL and NULL args should have set last error to ERROR_INVALID_PARAMETER instead of %d\n", GetLastError()); + ok(GetLastError() == ERROR_INVALID_PARAMETER, + "GetUrlCacheEntryInfoEx with NULL URL and NULL args should have set last error to ERROR_INVALID_PARAMETER instead of %d\n", GetLastError()); + + cbCacheEntryInfo = sizeof(INTERNET_CACHE_ENTRY_INFO); + SetLastError(0xdeadbeef); + ret = GetUrlCacheEntryInfoEx("", NULL, &cbCacheEntryInfo, NULL, NULL, NULL, 0); + ok(!ret, "GetUrlCacheEntryInfoEx with zero-length buffer should fail\n"); + ok(GetLastError() == ERROR_FILE_NOT_FOUND, + "GetUrlCacheEntryInfoEx should have set last error to ERROR_FILE_NOT_FOUND instead of %d\n", GetLastError()); ret = GetUrlCacheEntryInfoEx(TEST_URL, NULL, NULL, NULL, NULL, NULL, 0); ok(ret, "GetUrlCacheEntryInfoEx with NULL args failed with error %d\n", GetLastError()); @@ -109,9 +119,17 @@ static void test_GetUrlCacheEntryInfoExA(void) SetLastError(0xdeadbeef); ret = GetUrlCacheEntryInfoEx(TEST_URL, NULL, &cbCacheEntryInfo, NULL, NULL, NULL, 0); ok(!ret, "GetUrlCacheEntryInfoEx with zero-length buffer should fail\n"); - ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "GetUrlCacheEntryInfoEx should have set last error to ERROR_INSUFFICIENT_BUFFER instead of %d\n", GetLastError()); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, + "GetUrlCacheEntryInfoEx should have set last error to ERROR_INSUFFICIENT_BUFFER instead of %d\n", GetLastError()); lpCacheEntryInfo = HeapAlloc(GetProcessHeap(), 0, cbCacheEntryInfo); + + SetLastError(0xdeadbeef); + ret = GetUrlCacheEntryInfoEx(TEST_URL, lpCacheEntryInfo, &cbCacheEntryInfo, NULL, NULL, NULL, 0x200); + ok(!ret, "GetUrlCacheEntryInfoEx succeeded\n"); + ok(GetLastError() == ERROR_FILE_NOT_FOUND, + "GetUrlCacheEntryInfoEx should have set last error to ERROR_FILE_NOT_FOUND instead of %d\n", GetLastError()); + ret = GetUrlCacheEntryInfoEx(TEST_URL, lpCacheEntryInfo, &cbCacheEntryInfo, NULL, NULL, NULL, 0); ok(ret, "GetUrlCacheEntryInfoEx failed with error %d\n", GetLastError()); @@ -166,6 +184,11 @@ static void test_urlcacheA(void) ret = CreateUrlCacheEntry(TEST_URL, 0, "html", filenameA, 0); ok(ret, "CreateUrlCacheEntry failed with error %d\n", GetLastError()); + ret = CreateUrlCacheEntry(TEST_URL, 0, "html", filenameA1, 0); + ok(ret, "CreateUrlCacheEntry failed with error %d\n", GetLastError()); + + ok(lstrcmpiA(filenameA, filenameA1), "expected a different file name\n"); + hFile = CreateFileA(filenameA, GENERIC_WRITE, FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); ok(hFile != INVALID_HANDLE_VALUE, "CreateFileA failed with error %d\n", GetLastError()); @@ -175,6 +198,12 @@ static void test_urlcacheA(void) CloseHandle(hFile); + ret = CommitUrlCacheEntry(TEST_URL1, NULL, filetime_zero, filetime_zero, NORMAL_CACHE_ENTRY|URLHISTORY_CACHE_ENTRY, NULL, 0, NULL, NULL); + ok(ret, "CommitUrlCacheEntry failed with error %d\n", GetLastError()); + + ret = CommitUrlCacheEntry(TEST_URL1, NULL, filetime_zero, filetime_zero, NORMAL_CACHE_ENTRY|URLHISTORY_CACHE_ENTRY, NULL, 0, NULL, NULL); + ok(ret, "CommitUrlCacheEntry failed with error %d\n", GetLastError()); + ret = CommitUrlCacheEntry(TEST_URL, filenameA, filetime_zero, filetime_zero, NORMAL_CACHE_ENTRY, NULL, 0, "html", NULL); ok(ret, "CommitUrlCacheEntry failed with error %d\n", GetLastError()); @@ -182,7 +211,8 @@ static void test_urlcacheA(void) SetLastError(0xdeadbeef); ret = RetrieveUrlCacheEntryFile(TEST_URL, NULL, &cbCacheEntryInfo, 0); ok(!ret, "RetrieveUrlCacheEntryFile should have failed\n"); - ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "RetrieveUrlCacheEntryFile should have set last error to ERROR_INSUFFICIENT_BUFFER instead of %d\n", GetLastError()); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, + "RetrieveUrlCacheEntryFile should have set last error to ERROR_INSUFFICIENT_BUFFER instead of %d\n", GetLastError()); lpCacheEntryInfo = HeapAlloc(GetProcessHeap(), 0, cbCacheEntryInfo); ret = RetrieveUrlCacheEntryFile(TEST_URL, lpCacheEntryInfo, &cbCacheEntryInfo, 0); @@ -192,6 +222,13 @@ static void test_urlcacheA(void) HeapFree(GetProcessHeap(), 0, lpCacheEntryInfo); + cbCacheEntryInfo = 0; + SetLastError(0xdeadbeef); + ret = RetrieveUrlCacheEntryFile(TEST_URL1, NULL, &cbCacheEntryInfo, 0); + ok(!ret, "RetrieveUrlCacheEntryFile should have failed\n"); + ok(GetLastError() == ERROR_INVALID_DATA, + "RetrieveUrlCacheEntryFile should have set last error to ERROR_INVALID_DATA instead of %d\n", GetLastError()); + if (pUnlockUrlCacheEntryFileA) { ret = pUnlockUrlCacheEntryFileA(TEST_URL, 0); @@ -208,6 +245,8 @@ static void test_urlcacheA(void) { ret = pDeleteUrlCacheEntryA(TEST_URL); ok(ret, "DeleteUrlCacheEntryA failed with error %d\n", GetLastError()); + ret = pDeleteUrlCacheEntryA(TEST_URL1); + ok(ret, "DeleteUrlCacheEntryA failed with error %d\n", GetLastError()); } SetLastError(0xdeadbeef); diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index 45527dd..37d7b25 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -1479,7 +1479,11 @@ BOOL WINAPI GetUrlCacheEntryInfoExA( return FALSE; } if (dwFlags != 0) + { FIXME("Undocumented flag(s): %x\n", dwFlags); + SetLastError(ERROR_FILE_NOT_FOUND); + return FALSE; + } return GetUrlCacheEntryInfoA(lpszUrl, lpCacheEntryInfo, lpdwCacheEntryInfoBufSize); } @@ -1679,7 +1683,11 @@ BOOL WINAPI GetUrlCacheEntryInfoExW( return FALSE; } if (dwFlags != 0) + { FIXME("Undocumented flag(s): %x\n", dwFlags); + SetLastError(ERROR_FILE_NOT_FOUND); + return FALSE; + } return GetUrlCacheEntryInfoW(lpszUrl, lpCacheEntryInfo, lpdwCacheEntryInfoBufSize); } @@ -1866,6 +1874,13 @@ BOOL WINAPI RetrieveUrlCacheEntryFileA( } pUrlEntry = (URL_CACHEFILE_ENTRY *)pEntry; + if (!pUrlEntry->dwOffsetLocalName) + { + URLCacheContainer_UnlockIndex(pContainer, pHeader); + SetLastError(ERROR_INVALID_DATA); + return FALSE; + } + TRACE("Found URL: %s\n", (LPSTR)pUrlEntry + pUrlEntry->dwOffsetUrl); TRACE("Header info: %s\n", (LPBYTE)pUrlEntry + pUrlEntry->dwOffsetHeaderInfo); @@ -1955,6 +1970,13 @@ BOOL WINAPI RetrieveUrlCacheEntryFileW( } pUrlEntry = (URL_CACHEFILE_ENTRY *)pEntry; + if (!pUrlEntry->dwOffsetLocalName) + { + URLCacheContainer_UnlockIndex(pContainer, pHeader); + SetLastError(ERROR_INVALID_DATA); + return FALSE; + } + TRACE("Found URL: %s\n", (LPSTR)pUrlEntry + pUrlEntry->dwOffsetUrl); TRACE("Header info: %s\n", (LPBYTE)pUrlEntry + pUrlEntry->dwOffsetHeaderInfo);

1 0

Hans Leidekker : wininet: Consistently set last error before testing it.
by Alexandre Julliard 25 Sep '09

25 Sep '09

Module: wine Branch: master Commit: d590a20f6d77b9b23113b116f15e644e17d7b848 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d590a20f6d77b9b23113b116f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Sep 25 12:01:10 2009 +0200 wininet: Consistently set last error before testing it. --- dlls/wininet/tests/urlcache.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/tests/urlcache.c b/dlls/wininet/tests/urlcache.c index a87d9bd..4ab090b 100644 --- a/dlls/wininet/tests/urlcache.c +++ b/dlls/wininet/tests/urlcache.c @@ -54,6 +54,7 @@ static void test_find_url_cache_entriesA(void) LPINTERNET_CACHE_ENTRY_INFO lpCacheEntryInfo; cbCacheEntryInfo = 0; + SetLastError(0xdeadbeef); hEnumHandle = FindFirstUrlCacheEntry(NULL, NULL, &cbCacheEntryInfo); ok(!hEnumHandle, "FindFirstUrlCacheEntry should have failed\n"); ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "FindFirstUrlCacheEntry should have set last error to ERROR_INSUFFICIENT_BUFFER instead of %d\n", GetLastError()); @@ -68,6 +69,7 @@ static void test_find_url_cache_entriesA(void) found = TRUE; break; } + SetLastError(0xdeadbeef); cbCacheEntryInfo = cbCacheEntryInfoSaved; ret = FindNextUrlCacheEntry(hEnumHandle, lpCacheEntryInfo, &cbCacheEntryInfo); if (!ret) @@ -95,6 +97,7 @@ static void test_GetUrlCacheEntryInfoExA(void) DWORD cbCacheEntryInfo; LPINTERNET_CACHE_ENTRY_INFO lpCacheEntryInfo; + SetLastError(0xdeadbeef); ret = GetUrlCacheEntryInfoEx(NULL, NULL, NULL, NULL, NULL, NULL, 0); ok(!ret, "GetUrlCacheEntryInfoEx with NULL URL and NULL args should have failed\n"); ok(GetLastError() == ERROR_INVALID_PARAMETER, "GetUrlCacheEntryInfoEx with NULL URL and NULL args should have set last error to ERROR_INVALID_PARAMETER instead of %d\n", GetLastError()); @@ -103,6 +106,7 @@ static void test_GetUrlCacheEntryInfoExA(void) ok(ret, "GetUrlCacheEntryInfoEx with NULL args failed with error %d\n", GetLastError()); cbCacheEntryInfo = 0; + SetLastError(0xdeadbeef); ret = GetUrlCacheEntryInfoEx(TEST_URL, NULL, &cbCacheEntryInfo, NULL, NULL, NULL, 0); ok(!ret, "GetUrlCacheEntryInfoEx with zero-length buffer should fail\n"); ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "GetUrlCacheEntryInfoEx should have set last error to ERROR_INSUFFICIENT_BUFFER instead of %d\n", GetLastError()); @@ -175,6 +179,7 @@ static void test_urlcacheA(void) ok(ret, "CommitUrlCacheEntry failed with error %d\n", GetLastError()); cbCacheEntryInfo = 0; + SetLastError(0xdeadbeef); ret = RetrieveUrlCacheEntryFile(TEST_URL, NULL, &cbCacheEntryInfo, 0); ok(!ret, "RetrieveUrlCacheEntryFile should have failed\n"); ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "RetrieveUrlCacheEntryFile should have set last error to ERROR_INSUFFICIENT_BUFFER instead of %d\n", GetLastError()); @@ -205,6 +210,7 @@ static void test_urlcacheA(void) ok(ret, "DeleteUrlCacheEntryA failed with error %d\n", GetLastError()); } + SetLastError(0xdeadbeef); ret = DeleteFile(filenameA); todo_wine ok(!ret && GetLastError() == ERROR_FILE_NOT_FOUND, "local file should no longer exist\n"); @@ -214,6 +220,8 @@ static void test_FindCloseUrlCache(void) { BOOL r; DWORD err; + + SetLastError(0xdeadbeef); r = FindCloseUrlCache(NULL); err = GetLastError(); ok(0 == r, "expected 0, got %d\n", r);

1 0

Hans Leidekker : wininet: Try harder to find a unique cache file name.
by Alexandre Julliard 25 Sep '09

25 Sep '09

Module: wine Branch: master Commit: 784b58a28063595c2e866c010cf4092d17719f57 URL: http://source.winehq.org/git/wine.git/?a=commit;h=784b58a28063595c2e866c010… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Sep 25 12:00:11 2009 +0200 wininet: Try harder to find a unique cache file name. --- dlls/wininet/urlcache.c | 17 ++++++++++++++++- 1 files changed, 16 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index 0b29a6e..45527dd 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -2203,7 +2203,11 @@ BOOL WINAPI CreateUrlCacheEntryW( BOOL bFound = FALSE; int count; DWORD error; + HANDLE hFile; + FILETIME ft; + static const WCHAR szWWW[] = {'w','w','w',0}; + static const WCHAR fmt[] = {'%','0','8','X','%','s',0}; TRACE("(%s, 0x%08x, %s, %p, 0x%08x)\n", debugstr_w(lpszUrlName), @@ -2306,7 +2310,6 @@ BOOL WINAPI CreateUrlCacheEntryW( for (i = 0; i < 255; i++) { static const WCHAR szFormat[] = {'[','%','u',']','%','s',0}; - HANDLE hFile; WCHAR *p; wsprintfW(lpszFileNameNoPath + countnoextension, szFormat, i, szExtension); @@ -2334,6 +2337,18 @@ BOOL WINAPI CreateUrlCacheEntryW( } } + GetSystemTimeAsFileTime(&ft); + wsprintfW(lpszFileNameNoPath + countnoextension, fmt, ft.dwLowDateTime, szExtension); + + TRACE("Trying: %s\n", debugstr_w(lpszFileName)); + hFile = CreateFileW(lpszFileName, GENERIC_READ, 0, NULL, CREATE_NEW, 0, NULL); + if (hFile != INVALID_HANDLE_VALUE) + { + CloseHandle(hFile); + return TRUE; + } + + WARN("Could not find a unique filename\n"); return FALSE; }

1 0