April 2012 - Wine-Commits - list.winehq.org

Vincent Povirk : gdiplus: Add basic implementation of GdipWidenPath.
by Alexandre Julliard April 26, 2012

April 26, 2012

Module: wine Branch: master Commit: 930cdab2e9d17be1d1cb1c38f2f28dc764d98b90 URL: http://source.winehq.org/git/wine.git/?a=commit;h=930cdab2e9d17be1d1cb1c38f… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Apr 24 16:32:50 2012 -0500 gdiplus: Add basic implementation of GdipWidenPath. --- dlls/gdiplus/graphicspath.c | 172 ++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 170 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index c41278c..8096507 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -1656,12 +1656,180 @@ GpStatus WINGDIPAPI GdipWarpPath(GpPath *path, GpMatrix* matrix, return NotImplemented; } +static void add_bevel_point(const GpPointF *endpoint, const GpPointF *nextpoint, + GpPen *pen, int right_side, path_list_node_t **last_point) +{ + REAL segment_dy = nextpoint->Y-endpoint->Y; + REAL segment_dx = nextpoint->X-endpoint->X; + REAL segment_length = sqrtf(segment_dy*segment_dy + segment_dx*segment_dx); + REAL distance = pen->width/2.0; + REAL bevel_dx, bevel_dy; + + if (right_side) + { + bevel_dx = -distance * segment_dy / segment_length; + bevel_dy = distance * segment_dx / segment_length; + } + else + { + bevel_dx = distance * segment_dy / segment_length; + bevel_dy = -distance * segment_dx / segment_length; + } + + *last_point = add_path_list_node(*last_point, endpoint->X + bevel_dx, + endpoint->Y + bevel_dy, PathPointTypeLine); +} + +static void widen_joint(const GpPointF *p1, const GpPointF *p2, const GpPointF *p3, + GpPen* pen, path_list_node_t **last_point) +{ + switch (pen->join) + { + default: + case LineJoinBevel: + add_bevel_point(p2, p1, pen, 1, last_point); + add_bevel_point(p2, p3, pen, 0, last_point); + break; + } +} + +static void widen_cap(const GpPointF *endpoint, const GpPointF *nextpoint, + GpPen *pen, GpLineCap cap, GpCustomLineCap *custom, int add_first_points, + int add_last_point, path_list_node_t **last_point) +{ + switch (cap) + { + default: + case LineCapFlat: + if (add_first_points) + add_bevel_point(endpoint, nextpoint, pen, 1, last_point); + if (add_last_point) + add_bevel_point(endpoint, nextpoint, pen, 0, last_point); + break; + } +} + +static void widen_open_figure(GpPath *path, GpPen *pen, int start, int end, + path_list_node_t **last_point) +{ + int i; + + if (end <= start) + return; + + widen_cap(&path->pathdata.Points[start], &path->pathdata.Points[start+1], + pen, pen->startcap, pen->customstart, FALSE, TRUE, last_point); + + (*last_point)->type = PathPointTypeStart; + + for (i=start+1; i<end; i++) + widen_joint(&path->pathdata.Points[i-1], &path->pathdata.Points[i], + &path->pathdata.Points[i+1], pen, last_point); + + widen_cap(&path->pathdata.Points[end], &path->pathdata.Points[end-1], + pen, pen->endcap, pen->customend, TRUE, TRUE, last_point); + + for (i=end-1; i>start; i--) + widen_joint(&path->pathdata.Points[i+1], &path->pathdata.Points[i], + &path->pathdata.Points[i-1], pen, last_point); + + widen_cap(&path->pathdata.Points[start], &path->pathdata.Points[start+1], + pen, pen->startcap, pen->customstart, TRUE, FALSE, last_point); + + (*last_point)->type |= PathPointTypeCloseSubpath; +} + GpStatus WINGDIPAPI GdipWidenPath(GpPath *path, GpPen *pen, GpMatrix *matrix, REAL flatness) { - FIXME("(%p,%p,%p,%0.2f)\n", path, pen, matrix, flatness); + GpPath *flat_path=NULL; + GpStatus status; + path_list_node_t *points=NULL, *last_point=NULL; + int i, subpath_start=0, new_length; + BYTE type; - return NotImplemented; + TRACE("(%p,%p,%p,%0.2f)\n", path, pen, matrix, flatness); + + if (!path || !pen) + return InvalidParameter; + + if (path->pathdata.Count <= 1) + return OutOfMemory; + + status = GdipClonePath(path, &flat_path); + + if (status == Ok) + status = GdipFlattenPath(flat_path, matrix, flatness); + + if (status == Ok && !init_path_list(&points, 314.0, 22.0)) + status = OutOfMemory; + + if (status == Ok) + { + last_point = points; + + if (pen->endcap != LineCapFlat) + FIXME("unimplemented end cap %x\n", pen->endcap); + + if (pen->startcap != LineCapFlat) + FIXME("unimplemented start cap %x\n", pen->startcap); + + if (pen->dashcap != DashCapFlat) + FIXME("unimplemented dash cap %d\n", pen->dashcap); + + if (pen->join != LineJoinBevel) + FIXME("unimplemented line join %d\n", pen->join); + + if (pen->dash != DashStyleSolid) + FIXME("unimplemented dash style %d\n", pen->dash); + + if (pen->align != PenAlignmentCenter) + FIXME("unimplemented pen alignment %d\n", pen->align); + + for (i=0; i < flat_path->pathdata.Count; i++) + { + type = flat_path->pathdata.Types[i]; + + if ((type&PathPointTypePathTypeMask) == PathPointTypeStart) + subpath_start = i; + + if ((type&PathPointTypeCloseSubpath) == PathPointTypeCloseSubpath) + { + FIXME("closed figures unimplemented\n"); + } + else if (i == flat_path->pathdata.Count-1 || + (flat_path->pathdata.Types[i+1]&PathPointTypePathTypeMask) == PathPointTypeStart) + { + widen_open_figure(flat_path, pen, subpath_start, i, &last_point); + } + } + + new_length = path_list_count(points)-1; + + if (!lengthen_path(path, new_length)) + status = OutOfMemory; + } + + if (status == Ok) + { + path->pathdata.Count = new_length; + + last_point = points->next; + for (i = 0; i < new_length; i++) + { + path->pathdata.Points[i] = last_point->pt; + path->pathdata.Types[i] = last_point->type; + last_point = last_point->next; + } + + path->fill = FillModeWinding; + } + + free_path_list(points); + + GdipDeletePath(flat_path); + + return status; } GpStatus WINGDIPAPI GdipAddPathRectangle(GpPath *path, REAL x, REAL y,

1 0

Vincent Povirk : gdiplus: Return OutOfMemory when creating a path gradient with NULL points.
by Alexandre Julliard April 26, 2012

April 26, 2012

Module: wine Branch: master Commit: ea3e26e32ddeeba6a2afe3f3ee60b4cd8d859414 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea3e26e32ddeeba6a2afe3f3e… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Apr 24 10:22:58 2012 -0500 gdiplus: Return OutOfMemory when creating a path gradient with NULL points. --- dlls/gdiplus/brush.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c index c11dea6..8dfa18d 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -578,10 +578,10 @@ GpStatus WINGDIPAPI GdipCreatePathGradient(GDIPCONST GpPointF* points, TRACE("(%p, %d, %d, %p)\n", points, count, wrap, grad); - if(!points || !grad) + if(!grad) return InvalidParameter; - if(count <= 0) + if(!points || count <= 0) return OutOfMemory; stat = GdipCreatePath(FillModeAlternate, &path); @@ -611,10 +611,10 @@ GpStatus WINGDIPAPI GdipCreatePathGradientI(GDIPCONST GpPoint* points, TRACE("(%p, %d, %d, %p)\n", points, count, wrap, grad); - if(!points || !grad) + if(!grad) return InvalidParameter; - if(count <= 0) + if(!points || count <= 0) return OutOfMemory; stat = GdipCreatePath(FillModeAlternate, &path);

1 0

Vincent Povirk : gdiplus: Return OutOfMemory when creating a path gradient from a NULL path.
by Alexandre Julliard April 26, 2012

April 26, 2012

Module: wine Branch: master Commit: 3a3ca55ffa705c0266b27fdc2d89234a83359784 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a3ca55ffa705c0266b27fdc2… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Apr 24 10:26:12 2012 -0500 gdiplus: Return OutOfMemory when creating a path gradient from a NULL path. --- dlls/gdiplus/brush.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c index 8dfa18d..184c8de 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -647,9 +647,12 @@ GpStatus WINGDIPAPI GdipCreatePathGradientFromPath(GDIPCONST GpPath* path, TRACE("(%p, %p)\n", path, grad); - if(!path || !grad) + if(!grad) return InvalidParameter; + if (!path) + return OutOfMemory; + stat = GdipClonePath((GpPath*)path, &new_path); if (stat == Ok)

1 0

Henri Verbeet : d3d9: Properly retrieve an interface pointer in IDirect3DDevice9Impl_GetRenderTarget ().
by Alexandre Julliard April 26, 2012

April 26, 2012

Module: wine Branch: master Commit: 6a03dbf111720a52712034f6c579a45444915457 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a03dbf111720a52712034f6c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 25 21:24:18 2012 +0200 d3d9: Properly retrieve an interface pointer in IDirect3DDevice9Impl_GetRenderTarget(). --- dlls/d3d9/device.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 943c608..a88dc73 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1188,6 +1188,7 @@ static HRESULT WINAPI IDirect3DDevice9Impl_GetRenderTarget(IDirect3DDevice9Ex *i { IDirect3DDevice9Impl *This = impl_from_IDirect3DDevice9Ex(iface); struct wined3d_surface *wined3d_surface; + IDirect3DSurface9Impl *surface_impl; HRESULT hr; TRACE("iface %p, idx %u, surface %p.\n", iface, RenderTargetIndex, ppRenderTarget); @@ -1206,7 +1207,8 @@ static HRESULT WINAPI IDirect3DDevice9Impl_GetRenderTarget(IDirect3DDevice9Ex *i hr = wined3d_device_get_render_target(This->wined3d_device, RenderTargetIndex, &wined3d_surface); if (SUCCEEDED(hr)) { - *ppRenderTarget = wined3d_surface_get_parent(wined3d_surface); + surface_impl = wined3d_surface_get_parent(wined3d_surface); + *ppRenderTarget = &surface_impl->IDirect3DSurface9_iface; IDirect3DSurface9_AddRef(*ppRenderTarget); wined3d_surface_decref(wined3d_surface); }

1 0

Vincent Povirk : gdiplus: Implement GdipWidenPath for closed figures.
by Alexandre Julliard April 26, 2012

April 26, 2012

Module: wine Branch: master Commit: 7b5af23604867e3b8f1a328424dbea08b3141934 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b5af23604867e3b8f1a32842… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Apr 24 16:43:06 2012 -0500 gdiplus: Implement GdipWidenPath for closed figures. --- dlls/gdiplus/graphicspath.c | 44 ++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 43 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index 8096507..d37512e 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -1739,6 +1739,48 @@ static void widen_open_figure(GpPath *path, GpPen *pen, int start, int end, (*last_point)->type |= PathPointTypeCloseSubpath; } +static void widen_closed_figure(GpPath *path, GpPen *pen, int start, int end, + path_list_node_t **last_point) +{ + int i; + path_list_node_t *prev_point; + + if (end <= start+1) + return; + + /* left outline */ + prev_point = *last_point; + + widen_joint(&path->pathdata.Points[end], &path->pathdata.Points[start], + &path->pathdata.Points[start+1], pen, last_point); + + for (i=start+1; i<end; i++) + widen_joint(&path->pathdata.Points[i-1], &path->pathdata.Points[i], + &path->pathdata.Points[i+1], pen, last_point); + + widen_joint(&path->pathdata.Points[end-1], &path->pathdata.Points[end], + &path->pathdata.Points[start], pen, last_point); + + prev_point->next->type = PathPointTypeStart; + (*last_point)->type |= PathPointTypeCloseSubpath; + + /* right outline */ + prev_point = *last_point; + + widen_joint(&path->pathdata.Points[start], &path->pathdata.Points[end], + &path->pathdata.Points[end-1], pen, last_point); + + for (i=end-1; i>start; i--) + widen_joint(&path->pathdata.Points[i+1], &path->pathdata.Points[i], + &path->pathdata.Points[i-1], pen, last_point); + + widen_joint(&path->pathdata.Points[start+1], &path->pathdata.Points[start], + &path->pathdata.Points[end], pen, last_point); + + prev_point->next->type = PathPointTypeStart; + (*last_point)->type |= PathPointTypeCloseSubpath; +} + GpStatus WINGDIPAPI GdipWidenPath(GpPath *path, GpPen *pen, GpMatrix *matrix, REAL flatness) { @@ -1795,7 +1837,7 @@ GpStatus WINGDIPAPI GdipWidenPath(GpPath *path, GpPen *pen, GpMatrix *matrix, if ((type&PathPointTypeCloseSubpath) == PathPointTypeCloseSubpath) { - FIXME("closed figures unimplemented\n"); + widen_closed_figure(flat_path, pen, subpath_start, i, &last_point); } else if (i == flat_path->pathdata.Count-1 || (flat_path->pathdata.Types[i+1]&PathPointTypePathTypeMask) == PathPointTypeStart)

1 0

Henri Verbeet : d3d9: Properly retrieve an interface pointer in IDirect3DDevice9Impl_GetTexture( ).
by Alexandre Julliard April 26, 2012

April 26, 2012

Module: wine Branch: master Commit: 3e2d9462909558e2261000eab10936deea20a0b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e2d9462909558e2261000eab… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 25 21:24:20 2012 +0200 d3d9: Properly retrieve an interface pointer in IDirect3DDevice9Impl_GetTexture(). --- dlls/d3d9/device.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 812de68..c5dc834 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1691,6 +1691,7 @@ static HRESULT WINAPI IDirect3DDevice9Impl_GetTexture(IDirect3DDevice9Ex *iface, { IDirect3DDevice9Impl *This = impl_from_IDirect3DDevice9Ex(iface); struct wined3d_texture *wined3d_texture = NULL; + struct d3d9_texture *texture_impl; HRESULT hr; TRACE("iface %p, stage %u, texture %p.\n", iface, Stage, ppTexture); @@ -1703,7 +1704,8 @@ static HRESULT WINAPI IDirect3DDevice9Impl_GetTexture(IDirect3DDevice9Ex *iface, hr = wined3d_device_get_texture(This->wined3d_device, Stage, &wined3d_texture); if (SUCCEEDED(hr) && wined3d_texture) { - *ppTexture = wined3d_texture_get_parent(wined3d_texture); + texture_impl = wined3d_texture_get_parent(wined3d_texture); + *ppTexture = &texture_impl->IDirect3DBaseTexture9_iface; IDirect3DBaseTexture9_AddRef(*ppTexture); wined3d_texture_decref(wined3d_texture); }

1 0

Henri Verbeet : d3d9: Properly retrieve an interface pointer in IDirect3DDevice9Impl_GetDepthStencilSurface ().
by Alexandre Julliard April 26, 2012

April 26, 2012

Module: wine Branch: master Commit: e333334450eaf6f4c984e5d3fbb17f4f7a5583e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e333334450eaf6f4c984e5d3f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 25 21:24:19 2012 +0200 d3d9: Properly retrieve an interface pointer in IDirect3DDevice9Impl_GetDepthStencilSurface(). --- dlls/d3d9/device.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index a88dc73..812de68 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1244,6 +1244,7 @@ static HRESULT WINAPI IDirect3DDevice9Impl_GetDepthStencilSurface(IDirect3DDevic { IDirect3DDevice9Impl *This = impl_from_IDirect3DDevice9Ex(iface); struct wined3d_surface *wined3d_surface; + IDirect3DSurface9Impl *surface_impl; HRESULT hr; TRACE("iface %p, depth_stencil %p.\n", iface, ppZStencilSurface); @@ -1256,7 +1257,8 @@ static HRESULT WINAPI IDirect3DDevice9Impl_GetDepthStencilSurface(IDirect3DDevic hr = wined3d_device_get_depth_stencil(This->wined3d_device, &wined3d_surface); if (SUCCEEDED(hr)) { - *ppZStencilSurface = wined3d_surface_get_parent(wined3d_surface); + surface_impl = wined3d_surface_get_parent(wined3d_surface); + *ppZStencilSurface = &surface_impl->IDirect3DSurface9_iface; IDirect3DSurface9_AddRef(*ppZStencilSurface); wined3d_surface_decref(wined3d_surface); }

1 0

Hans Leidekker : msi: Avoid a crash in get_registered_local_package.
by Alexandre Julliard April 26, 2012

April 26, 2012

Module: wine Branch: master Commit: 89e95aa92c5d56fbb267189b2353401e2d848c8c URL: http://source.winehq.org/git/wine.git/?a=commit;h=89e95aa92c5d56fbb267189b2… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Apr 26 11:18:46 2012 +0200 msi: Avoid a crash in get_registered_local_package. --- dlls/msi/package.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/msi/package.c b/dlls/msi/package.c index ca836ec..2077396 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -1455,6 +1455,9 @@ static UINT get_registered_local_package( const WCHAR *product, const WCHAR *pac if (!strcmpiW( package, unsquashed )) { WCHAR *filename = msi_reg_get_val_str( props_key, INSTALLPROPERTY_LOCALPACKAGEW ); + if (!filename) + goto done; + strcpyW( localfile, filename ); msi_free( filename ); r = ERROR_SUCCESS;

1 0

Frédéric Delanoy : Add link to translated FAQ in French help page (resend)
by Jeremy Newman April 26, 2012

April 26, 2012

Module: website Branch: master Commit: adb4e5970b75d6ad958bfd7f3aa6bd8079d82ab0 URL: http://source.winehq.org/git/website.git/?a=commit;h=adb4e5970b75d6ad958bfd… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Apr 26 08:35:50 2012 +0200 Add link to translated FAQ in French help page (resend) --- templates/fr/help.template | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/fr/help.template b/templates/fr/help.template index 99569eb..aa18446 100644 --- a/templates/fr/help.template +++ b/templates/fr/help.template @@ -24,11 +24,11 @@ payant pour Wine. <tr bgcolor="#ffffff"> <td align="center" class="small"> - <a href="http://wiki.winehq.org/FAQ"><img src="{$root}/images/faq.png"><br>FAQ</a> + <a href="http://wiki.winehq.org/FAQ_fr"><img src="{$root}/images/faq.png"><br>FAQ</a> </td> <td valign="top"> Des réponses rapides à la plupart des questions sont disponibles dans la - <a href="http://wiki.winehq.org/FAQ">FAQ</a>. + <a href="http://wiki.winehq.org/FAQ_fr">FAQ</a>. C'est le premier endroit à visiter pour obtenir une réponse à vos questions. </td> </tr>

1 0

Bruno Jesus : iphlpapi/tests: Add SetTcpEntry tests.
by Alexandre Julliard April 25, 2012

April 25, 2012

Module: wine Branch: master Commit: 8dde502f0ec7da338ec2b492d1451d8ea25b2a1b URL: http://source.winehq.org/git/wine.git/?a=commit;h=8dde502f0ec7da338ec2b492d… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Wed Apr 25 01:50:21 2012 -0300 iphlpapi/tests: Add SetTcpEntry tests. --- dlls/iphlpapi/tests/iphlpapi.c | 28 +++++++++++++++++++++++++++- 1 files changed, 27 insertions(+), 1 deletions(-) diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index ec388a3..e9e4021 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -67,6 +67,7 @@ typedef DWORD (WINAPI *GetAdaptersAddressesFunc)(ULONG,ULONG,PVOID,PIP_ADAPTER_A typedef DWORD (WINAPI *NotifyAddrChangeFunc)(PHANDLE,LPOVERLAPPED); typedef BOOL (WINAPI *CancelIPChangeNotifyFunc)(LPOVERLAPPED); typedef DWORD (WINAPI *GetExtendedTcpTableFunc)(PVOID,PDWORD,BOOL,ULONG,TCP_TABLE_CLASS,ULONG); +typedef DWORD (WINAPI *SetTcpEntryFunc)(PMIB_TCPROW); static GetNumberOfInterfacesFunc gGetNumberOfInterfaces = NULL; static GetIpAddrTableFunc gGetIpAddrTable = NULL; @@ -89,6 +90,7 @@ static GetAdaptersAddressesFunc gGetAdaptersAddresses = NULL; static NotifyAddrChangeFunc gNotifyAddrChange = NULL; static CancelIPChangeNotifyFunc gCancelIPChangeNotify = NULL; static GetExtendedTcpTableFunc gGetExtendedTcpTable = NULL; +static SetTcpEntryFunc gSetTcpEntry = NULL; static void loadIPHlpApi(void) { @@ -134,6 +136,8 @@ static void loadIPHlpApi(void) hLibrary, "CancelIPChangeNotify"); gGetExtendedTcpTable = (GetExtendedTcpTableFunc)GetProcAddress( hLibrary, "GetExtendedTcpTable"); + gSetTcpEntry = (SetTcpEntryFunc)GetProcAddress( + hLibrary, "SetTcpEntry"); } } @@ -159,6 +163,7 @@ static void freeIPHlpApi(void) gNotifyAddrChange = NULL; gCancelIPChangeNotify = NULL; gGetExtendedTcpTable = NULL; + gSetTcpEntry = NULL; FreeLibrary(hLibrary); hLibrary = NULL; } @@ -651,6 +656,27 @@ static void testGetUdpTable(void) } } +static void testSetTcpEntry(void) +{ + DWORD ret; + MIB_TCPROW row; + + memset(&row, 0, sizeof(row)); + if(0) /* This test crashes in OS >= VISTA */ + { + ret = gSetTcpEntry(NULL); + ok( ret == ERROR_INVALID_PARAMETER, "got %u, expected %u\n", ret, ERROR_INVALID_PARAMETER); + } + + ret = gSetTcpEntry(&row); + todo_wine ok( ret == ERROR_INVALID_PARAMETER, "got %u, expected %u\n", ret, ERROR_INVALID_PARAMETER); + + row.dwState = MIB_TCP_STATE_DELETE_TCB; + ret = gSetTcpEntry(&row); + todo_wine ok( ret == ERROR_MR_MID_NOT_FOUND || broken(ret == ERROR_INVALID_PARAMETER), + "got %u, expected %u\n", ret, ERROR_MR_MID_NOT_FOUND); +} + /* still-to-be-tested NT4-onward functions: CreateIpForwardEntry @@ -664,7 +690,6 @@ SetIpForwardEntry SetIpNetEntry SetIpStatistics SetIpTTL -SetTcpEntry */ static void testWinNT4Functions(void) { @@ -679,6 +704,7 @@ static void testWinNT4Functions(void) testGetUdpStatistics(); testGetTcpTable(); testGetUdpTable(); + testSetTcpEntry(); } static void testGetInterfaceInfo(void)

1 0