October 2009 - Wine-commits

Huw Davies : include: Add rowchg.idl.
by Alexandre Julliard 29 Oct '09

29 Oct '09

Module: wine Branch: master Commit: d1f95617474d77867ccc84c5846d0b295f101a9b URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1f95617474d77867ccc84c58… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Oct 28 13:49:02 2009 +0000 include: Add rowchg.idl. --- include/Makefile.in | 1 + include/oledb.idl | 1 + include/rowchg.idl | 30 ++++++++++++++++++++++++++++++ tools/make_makefiles | 1 + 4 files changed, 33 insertions(+), 0 deletions(-) diff --git a/include/Makefile.in b/include/Makefile.in index c32137f..eb2cabe 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -396,6 +396,7 @@ SRCDIR_INCLUDES = \ richedit.h \ rmxfguid.h \ row.idl \ + rowchg.idl \ rpc.h \ rpcasync.h \ rpcdce.h \ diff --git a/include/oledb.idl b/include/oledb.idl index 1aeacd7..b525b56 100644 --- a/include/oledb.idl +++ b/include/oledb.idl @@ -57,6 +57,7 @@ typedef DWORD DBHASHVALUE; #include "sesprp.idl" #include "opnrst.idl" #include "row.idl" +#include "rowchg.idl" #include "binres.idl" #include "crtrow.idl" diff --git a/include/rowchg.idl b/include/rowchg.idl new file mode 100644 index 0000000..7bfa506 --- /dev/null +++ b/include/rowchg.idl @@ -0,0 +1,30 @@ +/* + * Copyright (C) 2009 Huw Davies + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +[ + local, + object, + uuid(0c733ab5-2a1c-11ce-ade5-00aa0044773d), + pointer_default(unique) +] +interface IRowChange : IUnknown +{ + [local] + HRESULT SetColumns([in] DBORDINAL cColumns, + [in, out, size_is(cColumns), annotation("__in_ecount(cColumns)")] DBCOLUMNACCESS rgColumns[]); +} diff --git a/tools/make_makefiles b/tools/make_makefiles index f707564..828e6b0 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -126,6 +126,7 @@ my %private_idl_headers = ( "dyngraph.idl" => 1, "opnrst.idl" => 1, "row.idl" => 1, + "rowchg.idl" => 1, "rstbas.idl" => 1, "rstinf.idl" => 1, "rstloc.idl" => 1,

1 0

Vincent Povirk : ole32: Move the low-level functionality of WriteProperty to a new function.
by Alexandre Julliard 29 Oct '09

29 Oct '09

Module: wine Branch: master Commit: e71c696b510fc60f1a18491a8e9c03f0a139cb6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=e71c696b510fc60f1a18491a8… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Oct 28 11:41:50 2009 -0500 ole32: Move the low-level functionality of WriteProperty to a new function. --- dlls/ole32/storage32.c | 37 +++++++++++++++++++++++++++---------- dlls/ole32/storage32.h | 5 +++++ 2 files changed, 32 insertions(+), 10 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 4ff9f89..86c174b 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -3072,6 +3072,32 @@ HRESULT StorageImpl_ReadRawDirEntry(StorageImpl *This, ULONG index, BYTE *buffer } /****************************************************************************** + * StorageImpl_WriteRawDirEntry + * + * This method will write the raw data from a directory entry in the file. + * + * buffer must be PROPSET_BLOCK_SIZE bytes long. + */ +HRESULT StorageImpl_WriteRawDirEntry(StorageImpl *This, ULONG index, const BYTE *buffer) +{ + ULARGE_INTEGER offset; + HRESULT hr; + ULONG bytesRead; + + offset.u.HighPart = 0; + offset.u.LowPart = index * PROPSET_BLOCK_SIZE; + + hr = BlockChainStream_WriteAt( + This->rootBlockChain, + offset, + PROPSET_BLOCK_SIZE, + buffer, + &bytesRead); + + return hr; +} + +/****************************************************************************** * Storage32Impl_ReadProperty * * This method will read the specified property from the property chain. @@ -3171,12 +3197,7 @@ BOOL StorageImpl_WriteProperty( const StgProperty* buffer) { BYTE currentProperty[PROPSET_BLOCK_SIZE]; - ULARGE_INTEGER offsetInPropSet; HRESULT writeRes; - ULONG bytesWritten; - - offsetInPropSet.u.HighPart = 0; - offsetInPropSet.u.LowPart = index * PROPSET_BLOCK_SIZE; memset(currentProperty, 0, PROPSET_BLOCK_SIZE); @@ -3242,11 +3263,7 @@ BOOL StorageImpl_WriteProperty( OFFSET_PS_SIZE, buffer->size.u.LowPart); - writeRes = BlockChainStream_WriteAt(This->rootBlockChain, - offsetInPropSet, - PROPSET_BLOCK_SIZE, - currentProperty, - &bytesWritten); + writeRes = StorageImpl_WriteRawDirEntry(This, index, currentProperty); return SUCCEEDED(writeRes) ? TRUE : FALSE; } diff --git a/dlls/ole32/storage32.h b/dlls/ole32/storage32.h index 281948e..bbc6a5d 100644 --- a/dlls/ole32/storage32.h +++ b/dlls/ole32/storage32.h @@ -295,6 +295,11 @@ HRESULT StorageImpl_ReadRawDirEntry( ULONG index, BYTE *buffer); +HRESULT StorageImpl_WriteRawDirEntry( + StorageImpl *This, + ULONG index, + const BYTE *buffer); + BOOL StorageImpl_ReadProperty( StorageImpl* This, ULONG index,

1 0

Henri Verbeet : wined3d: Get rid of the GL_SUPPORT macro.
by Alexandre Julliard 29 Oct '09

29 Oct '09

Module: wine Branch: master Commit: 111307dfbae2216549a9e47af2221121d55e8893 URL: http://source.winehq.org/git/wine.git/?a=commit;h=111307dfbae2216549a9e47af… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 29 10:37:11 2009 +0100 wined3d: Get rid of the GL_SUPPORT macro. --- dlls/wined3d/arb_program_shader.c | 71 +++++++++----- dlls/wined3d/basetexture.c | 6 +- dlls/wined3d/buffer.c | 8 +- dlls/wined3d/context.c | 66 ++++++++----- dlls/wined3d/device.c | 54 +++++++---- dlls/wined3d/directx.c | 171 +++++++++++++++++++++++----------- dlls/wined3d/drawprim.c | 29 ++++-- dlls/wined3d/gl_compat.c | 15 ++- dlls/wined3d/glsl_shader.c | 19 +++- dlls/wined3d/nvidia_texture_shader.c | 33 ++++--- dlls/wined3d/query.c | 16 ++- dlls/wined3d/state.c | 166 +++++++++++++++++++++------------ dlls/wined3d/surface.c | 85 +++++++++++------ dlls/wined3d/swapchain.c | 4 +- dlls/wined3d/utils.c | 52 ++++++----- dlls/wined3d/volume.c | 4 +- dlls/wined3d/volumetexture.c | 6 +- dlls/wined3d/wined3d_private.h | 1 - 18 files changed, 514 insertions(+), 292 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=111307dfbae2216549a9e…

1 0

Henri Verbeet : wined3d: Don' t depend on uninitialized data in the CreateSurface() thunks (Valgrind).
by Alexandre Julliard 29 Oct '09

29 Oct '09

Module: wine Branch: master Commit: 052d955567864a7e0c9c51d726abb6ff6ebb0b95 URL: http://source.winehq.org/git/wine.git/?a=commit;h=052d955567864a7e0c9c51d72… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 29 10:37:13 2009 +0100 wined3d: Don't depend on uninitialized data in the CreateSurface() thunks (Valgrind). Perhaps IDirectDraw7_CreateSurface() should also always set "pSurface7" to NULL on failure, but at least for our internal functions that's a silly thing to rely on. --- dlls/ddraw/ddraw_thunks.c | 62 ++++++++++++++++++++------------------------ 1 files changed, 28 insertions(+), 34 deletions(-) diff --git a/dlls/ddraw/ddraw_thunks.c b/dlls/ddraw/ddraw_thunks.c index 8c79cbf..278d720 100644 --- a/dlls/ddraw/ddraw_thunks.c +++ b/dlls/ddraw/ddraw_thunks.c @@ -347,20 +347,18 @@ IDirectDrawImpl_CreateSurface(LPDIRECTDRAW This, LPDDSURFACEDESC pSDesc, * since the data layout is the same */ hr = IDirectDraw7_CreateSurface((IDirectDraw7 *)ddraw_from_ddraw1(This), (LPDDSURFACEDESC2)pSDesc, &pSurface7, pUnkOuter); - - /* This coercion is safe, since the IDirectDrawSurface3 vtable has the - * IDirectDrawSurface vtable layout at the beginning */ - *ppSurface = pSurface7 ? - (IDirectDrawSurface *)&((IDirectDrawSurfaceImpl *)pSurface7)->IDirectDrawSurface3_vtbl : NULL; - - impl = (IDirectDrawSurfaceImpl *)pSurface7; - if(SUCCEEDED(hr) && impl) + if (FAILED(hr)) { - set_surf_version(impl, 1); - IDirectDraw7_Release((IDirectDraw7 *)ddraw_from_ddraw1(This)); - impl->ifaceToRelease = NULL; + *ppSurface = NULL; + return hr; } + impl = (IDirectDrawSurfaceImpl *)pSurface7; + *ppSurface = (IDirectDrawSurface *)&impl->IDirectDrawSurface3_vtbl; + set_surf_version(impl, 1); + IDirectDraw7_Release((IDirectDraw7 *)ddraw_from_ddraw1(This)); + impl->ifaceToRelease = NULL; + return hr; } @@ -375,20 +373,18 @@ IDirectDraw2Impl_CreateSurface(LPDIRECTDRAW2 This, LPDDSURFACEDESC pSDesc, hr = IDirectDraw7_CreateSurface((IDirectDraw7 *)ddraw_from_ddraw2(This), (LPDDSURFACEDESC2)pSDesc, &pSurface7, pUnkOuter); - - /* This coercion is safe, since the IDirectDrawSurface3 vtable has the - * IDirectDrawSurface vtable layout at the beginning */ - *ppSurface = pSurface7 ? - (IDirectDrawSurface *)&((IDirectDrawSurfaceImpl *)pSurface7)->IDirectDrawSurface3_vtbl : NULL; - - impl = (IDirectDrawSurfaceImpl *)pSurface7; - if(SUCCEEDED(hr) && impl) + if (FAILED(hr)) { - set_surf_version(impl, 2); - IDirectDraw7_Release((IDirectDraw7 *)ddraw_from_ddraw2(This)); - impl->ifaceToRelease = NULL; + *ppSurface = NULL; + return hr; } + impl = (IDirectDrawSurfaceImpl *)pSurface7; + *ppSurface = (IDirectDrawSurface *)&impl->IDirectDrawSurface3_vtbl; + set_surf_version(impl, 2); + IDirectDraw7_Release((IDirectDraw7 *)ddraw_from_ddraw2(This)); + impl->ifaceToRelease = NULL; + return hr; } @@ -403,21 +399,19 @@ IDirectDraw3Impl_CreateSurface(LPDIRECTDRAW3 This, LPDDSURFACEDESC pSDesc, hr = IDirectDraw7_CreateSurface((IDirectDraw7 *)ddraw_from_ddraw3(This), (LPDDSURFACEDESC2)pSDesc, &pSurface7, pUnkOuter); - - /* This coercion is safe, since the IDirectDrawSurface3 vtable has the - * IDirectDrawSurface vtable layout at the beginning */ - *ppSurface = pSurface7 ? - (IDirectDrawSurface *)&((IDirectDrawSurfaceImpl *)pSurface7)->IDirectDrawSurface3_vtbl : NULL; - - impl = (IDirectDrawSurfaceImpl *)pSurface7; - if(SUCCEEDED(hr) && impl) + if (FAILED(hr)) { - set_surf_version(impl, 3); - IDirectDraw7_Release((IDirectDraw7 *)ddraw_from_ddraw3(This)); - IDirectDraw3_AddRef(This); - impl->ifaceToRelease = (IUnknown *) This; + *ppSurface = NULL; + return hr; } + impl = (IDirectDrawSurfaceImpl *)pSurface7; + *ppSurface = (IDirectDrawSurface *)&impl->IDirectDrawSurface3_vtbl; + set_surf_version(impl, 3); + IDirectDraw7_Release((IDirectDraw7 *)ddraw_from_ddraw3(This)); + IDirectDraw3_AddRef(This); + impl->ifaceToRelease = (IUnknown *) This; + return hr; }

1 0

Henri Verbeet : wined3d: directly pass gl_info to stream_info_element_from_strided().
by Alexandre Julliard 29 Oct '09

29 Oct '09

Module: wine Branch: master Commit: be8026adf648305a958eb55c8647d3a6a2302f07 URL: http://source.winehq.org/git/wine.git/?a=commit;h=be8026adf648305a958eb55c8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 29 10:37:12 2009 +0100 wined3d: directly pass gl_info to stream_info_element_from_strided(). --- dlls/wined3d/device.c | 18 +++++++++--------- dlls/wined3d/state.c | 2 +- dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 3929348..a1b8944 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -321,10 +321,10 @@ void device_stream_info_from_declaration(IWineD3DDeviceImpl *This, } } -static void stream_info_element_from_strided(IWineD3DDeviceImpl *This, +static void stream_info_element_from_strided(const struct wined3d_gl_info *gl_info, const struct WineDirect3DStridedData *strided, struct wined3d_stream_info_element *e) { - const struct GlPixelFormatDesc *format_desc = getFormatDescEntry(strided->format, &This->adapter->gl_info); + const struct GlPixelFormatDesc *format_desc = getFormatDescEntry(strided->format, gl_info); e->format_desc = format_desc; e->stride = strided->dwStride; e->data = strided->lpData; @@ -332,7 +332,7 @@ static void stream_info_element_from_strided(IWineD3DDeviceImpl *This, e->buffer_object = 0; } -void device_stream_info_from_strided(IWineD3DDeviceImpl *This, +void device_stream_info_from_strided(const struct wined3d_gl_info *gl_info, const struct WineDirect3DVertexStridedData *strided, struct wined3d_stream_info *stream_info) { unsigned int i; @@ -340,18 +340,18 @@ void device_stream_info_from_strided(IWineD3DDeviceImpl *This, memset(stream_info, 0, sizeof(*stream_info)); if (strided->position.lpData) - stream_info_element_from_strided(This, &strided->position, &stream_info->elements[WINED3D_FFP_POSITION]); + stream_info_element_from_strided(gl_info, &strided->position, &stream_info->elements[WINED3D_FFP_POSITION]); if (strided->normal.lpData) - stream_info_element_from_strided(This, &strided->normal, &stream_info->elements[WINED3D_FFP_NORMAL]); + stream_info_element_from_strided(gl_info, &strided->normal, &stream_info->elements[WINED3D_FFP_NORMAL]); if (strided->diffuse.lpData) - stream_info_element_from_strided(This, &strided->diffuse, &stream_info->elements[WINED3D_FFP_DIFFUSE]); + stream_info_element_from_strided(gl_info, &strided->diffuse, &stream_info->elements[WINED3D_FFP_DIFFUSE]); if (strided->specular.lpData) - stream_info_element_from_strided(This, &strided->specular, &stream_info->elements[WINED3D_FFP_SPECULAR]); + stream_info_element_from_strided(gl_info, &strided->specular, &stream_info->elements[WINED3D_FFP_SPECULAR]); for (i = 0; i < WINED3DDP_MAXTEXCOORD; ++i) { if (strided->texCoords[i].lpData) - stream_info_element_from_strided(This, &strided->texCoords[i], + stream_info_element_from_strided(gl_info, &strided->texCoords[i], &stream_info->elements[WINED3D_FFP_TEXCOORD0 + i]); } @@ -361,7 +361,7 @@ void device_stream_info_from_strided(IWineD3DDeviceImpl *This, { if (!stream_info->elements[i].format_desc) continue; - if (!This->adapter->gl_info.supported[EXT_VERTEX_ARRAY_BGRA] + if (!gl_info->supported[EXT_VERTEX_ARRAY_BGRA] && stream_info->elements[i].format_desc->format == WINED3DFMT_B8G8R8A8_UNORM) { stream_info->swizzle_map |= 1 << i; diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index e7b64d9..94fe19e 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -4484,7 +4484,7 @@ static void streamsrc(DWORD state, IWineD3DStateBlockImpl *stateblock, struct wi if(device->up_strided) { /* Note: this is a ddraw fixed-function code path */ TRACE("================ Strided Input ===================\n"); - device_stream_info_from_strided(device, device->up_strided, dataLocations); + device_stream_info_from_strided(context->gl_info, device->up_strided, dataLocations); if(TRACE_ON(d3d)) { drawPrimitiveTraceDataLocations(dataLocations); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index d1400aa..3af2703 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1591,7 +1591,7 @@ void device_resource_add(IWineD3DDeviceImpl *This, IWineD3DResource *resource) D void device_resource_released(IWineD3DDeviceImpl *This, IWineD3DResource *resource) DECLSPEC_HIDDEN; void device_stream_info_from_declaration(IWineD3DDeviceImpl *This, BOOL use_vshader, struct wined3d_stream_info *stream_info, BOOL *fixup) DECLSPEC_HIDDEN; -void device_stream_info_from_strided(IWineD3DDeviceImpl *This, +void device_stream_info_from_strided(const struct wined3d_gl_info *gl_info, const struct WineDirect3DVertexStridedData *strided, struct wined3d_stream_info *stream_info) DECLSPEC_HIDDEN; HRESULT IWineD3DDeviceImpl_ClearSurface(IWineD3DDeviceImpl *This, IWineD3DSurfaceImpl *target, DWORD Count, const WINED3DRECT *pRects, DWORD Flags, WINED3DCOLOR Color, float Z, DWORD Stencil) DECLSPEC_HIDDEN;

1 0

Austin English : configure: preloader is Linux specific, don' t build it elsewhere.
by Alexandre Julliard 29 Oct '09

29 Oct '09

Module: wine Branch: master Commit: 5e18596fc58e972ea350b96555f1c4e0287a0147 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e18596fc58e972ea350b9655… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Oct 28 19:51:17 2009 -0500 configure: preloader is Linux specific, don't build it elsewhere. --- configure | 2 +- configure.ac | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 937d1ae..2e5c038 100755 --- a/configure +++ b/configure @@ -12059,7 +12059,7 @@ test -z "$with_wine64" || MAIN_BINARY="wine32" case $host_cpu in *i[3456789]86*) case $host_os in - linux* | k*bsd*-gnu) + linux*) EXTRA_BINARIES="wine-preloader" ;; esac diff --git a/configure.ac b/configure.ac index a6daf78..f6ac893 100644 --- a/configure.ac +++ b/configure.ac @@ -1659,7 +1659,7 @@ test -z "$with_wine64" || MAIN_BINARY="wine32" case $host_cpu in *i[[3456789]]86*) case $host_os in - linux* | k*bsd*-gnu) + linux*) AC_SUBST(EXTRA_BINARIES,"wine-preloader") ;; esac ;;

1 0

Hans Leidekker : ws2_32: Avoid accessing uninitialized memory in GetAddrInfoW.
by Alexandre Julliard 29 Oct '09

29 Oct '09

Module: wine Branch: master Commit: 140eede67d595e8df034a2265f3c2670b3d69422 URL: http://source.winehq.org/git/wine.git/?a=commit;h=140eede67d595e8df034a2265… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Oct 29 11:11:38 2009 +0100 ws2_32: Avoid accessing uninitialized memory in GetAddrInfoW. Found by valgrind. --- dlls/ws2_32/socket.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 7cf4b96..df9c37d 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -3962,6 +3962,8 @@ int WINAPI GetAddrInfoW(LPCWSTR nodename, LPCWSTR servname, const ADDRINFOW *hin char *nodenameA, *servnameA = NULL; struct WS_addrinfo *resA, *hintsA = NULL; + if (!nodename) return WSAHOST_NOT_FOUND; + len = WideCharToMultiByte(CP_ACP, 0, nodename, -1, NULL, 0, NULL, NULL); if (!(nodenameA = HeapAlloc(GetProcessHeap(), 0, len))) return EAI_MEMORY; WideCharToMultiByte(CP_ACP, 0, nodename, -1, nodenameA, len, NULL, NULL);

1 0

Hans Leidekker : ws2_32: Add a test for GetAddrInfoW.
by Alexandre Julliard 29 Oct '09

29 Oct '09

Module: wine Branch: master Commit: ebe6dabe2789dd9b3214c730b686befcd54895f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ebe6dabe2789dd9b3214c730b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Oct 29 11:12:00 2009 +0100 ws2_32: Add a test for GetAddrInfoW. --- dlls/ws2_32/tests/sock.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 56ae78f..518ab4a 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -2764,6 +2764,7 @@ static void test_WSASendTo(void) static void test_GetAddrInfoW(void) { static const WCHAR port[] = {'8','0',0}; + static const WCHAR empty[] = {0}; static const WCHAR localhost[] = {'l','o','c','a','l','h','o','s','t',0}; int ret; @@ -2780,6 +2781,15 @@ static void test_GetAddrInfoW(void) ret = pGetAddrInfoW(NULL, NULL, NULL, &result); ok(ret == WSAHOST_NOT_FOUND, "got %d expected WSAHOST_NOT_FOUND\n", ret); + result = NULL; + ret = pGetAddrInfoW(empty, NULL, NULL, &result); + todo_wine + { + ok(!ret, "GetAddrInfoW failed with %d\n", WSAGetLastError()); + ok(result != NULL, "GetAddrInfoW failed\n"); + } + pFreeAddrInfoW(result); + ret = pGetAddrInfoW(localhost, NULL, NULL, &result); ok(!ret, "GetAddrInfoW failed with %d\n", WSAGetLastError()); pFreeAddrInfoW(result);

1 0

Paul Vriens : advapi32/tests: Add some GetOldestEventLogRecord tests.
by Alexandre Julliard 29 Oct '09

29 Oct '09

Module: wine Branch: master Commit: 1fe325fd1336016ae59ace9cc36aa784eb17f15f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1fe325fd1336016ae59ace9cc… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Thu Oct 29 09:22:42 2009 +0100 advapi32/tests: Add some GetOldestEventLogRecord tests. --- dlls/advapi32/tests/eventlog.c | 39 +++++++++++++++++++++++++++++++++++++++ 1 files changed, 39 insertions(+), 0 deletions(-) diff --git a/dlls/advapi32/tests/eventlog.c b/dlls/advapi32/tests/eventlog.c index d394012..dab24f0 100644 --- a/dlls/advapi32/tests/eventlog.c +++ b/dlls/advapi32/tests/eventlog.c @@ -182,6 +182,44 @@ static void test_count(void) CloseEventLog(handle); } +static void test_oldest(void) +{ + HANDLE handle; + BOOL ret; + DWORD oldest; + + SetLastError(0xdeadbeef); + ret = GetOldestEventLogRecord(NULL, NULL); + ok(!ret, "Expected failure\n"); + todo_wine + ok(GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + + SetLastError(0xdeadbeef); + oldest = 0xdeadbeef; + ret = GetOldestEventLogRecord(NULL, &oldest); + todo_wine + { + ok(!ret, "Expected failure\n"); + ok(GetLastError() == ERROR_INVALID_HANDLE, "Expected ERROR_INVALID_HANDLE, got %d\n", GetLastError()); + ok(oldest == 0xdeadbeef, "Expected oldest to stay unchanged\n"); + } + + handle = OpenEventLogA(NULL, "Application"); + + SetLastError(0xdeadbeef); + ret = GetOldestEventLogRecord(handle, NULL); + ok(!ret, "Expected failure\n"); + todo_wine + ok(GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + + oldest = 0xdeadbeef; + ret = GetOldestEventLogRecord(handle, &oldest); + ok(ret, "Expected succes\n"); + ok(oldest != 0xdeadbeef, "Expected the number of the oldest record\n"); + + CloseEventLog(handle); +} + START_TEST(eventlog) { SetLastError(0xdeadbeef); @@ -198,4 +236,5 @@ START_TEST(eventlog) test_open_close(); test_info(); test_count(); + test_oldest(); }

1 0

Paul Vriens : advapi32: Add some input parameter checks to GetOldestEventLogRecord.
by Alexandre Julliard 29 Oct '09

29 Oct '09

Module: wine Branch: master Commit: 78452960bc0ee057b74a8e48ffd2c5cc527e295d URL: http://source.winehq.org/git/wine.git/?a=commit;h=78452960bc0ee057b74a8e48f… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Thu Oct 29 09:25:07 2009 +0100 advapi32: Add some input parameter checks to GetOldestEventLogRecord. --- dlls/advapi32/eventlog.c | 13 ++++++++++++- dlls/advapi32/tests/eventlog.c | 5 ----- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/dlls/advapi32/eventlog.c b/dlls/advapi32/eventlog.c index 6812cdd..8ce255a 100644 --- a/dlls/advapi32/eventlog.c +++ b/dlls/advapi32/eventlog.c @@ -300,7 +300,18 @@ BOOL WINAPI GetOldestEventLogRecord( HANDLE hEventLog, PDWORD OldestRecord ) { FIXME("(%p,%p) stub\n", hEventLog, OldestRecord); - if (!OldestRecord) return FALSE; + if (!OldestRecord) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + if (!hEventLog) + { + SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + *OldestRecord = 0; return TRUE; diff --git a/dlls/advapi32/tests/eventlog.c b/dlls/advapi32/tests/eventlog.c index dab24f0..9dc1d97 100644 --- a/dlls/advapi32/tests/eventlog.c +++ b/dlls/advapi32/tests/eventlog.c @@ -191,25 +191,20 @@ static void test_oldest(void) SetLastError(0xdeadbeef); ret = GetOldestEventLogRecord(NULL, NULL); ok(!ret, "Expected failure\n"); - todo_wine ok(GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); SetLastError(0xdeadbeef); oldest = 0xdeadbeef; ret = GetOldestEventLogRecord(NULL, &oldest); - todo_wine - { ok(!ret, "Expected failure\n"); ok(GetLastError() == ERROR_INVALID_HANDLE, "Expected ERROR_INVALID_HANDLE, got %d\n", GetLastError()); ok(oldest == 0xdeadbeef, "Expected oldest to stay unchanged\n"); - } handle = OpenEventLogA(NULL, "Application"); SetLastError(0xdeadbeef); ret = GetOldestEventLogRecord(handle, NULL); ok(!ret, "Expected failure\n"); - todo_wine ok(GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); oldest = 0xdeadbeef;

1 0