July 2016 - Wine-commits - list.winehq.org

Huw Davies : gdi32: Use POINT and SIZE to hold positions and extents.
by Alexandre Julliard 27 Jul '16

27 Jul '16

Module: wine Branch: master Commit: 6a8cfea99bebd381d4938305cb498d22c84a993f URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a8cfea99bebd381d4938305c… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jul 27 09:59:25 2016 +0100 gdi32: Use POINT and SIZE to hold positions and extents. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/brush.c | 10 ++-- dlls/gdi32/clipping.c | 4 +- dlls/gdi32/dc.c | 86 +++++++++++---------------- dlls/gdi32/font.c | 2 +- dlls/gdi32/gdi_private.h | 18 ++---- dlls/gdi32/mapping.c | 152 +++++++++++++++++++++-------------------------- dlls/gdi32/painting.c | 51 ++++++++-------- dlls/gdi32/path.c | 3 +- dlls/gdi32/tests/brush.c | 19 ++++++ 9 files changed, 159 insertions(+), 186 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6a8cfea99bebd381d4938…

1 0

Huw Davies : gdi32: Avoid unnecessary calls to get_dc_ptr().
by Alexandre Julliard 27 Jul '16

27 Jul '16

Module: wine Branch: master Commit: 36a0bb0f5296fa5412e40fc3e1e4a854550e448b URL: http://source.winehq.org/git/wine.git/?a=commit;h=36a0bb0f5296fa5412e40fc3e… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jul 27 09:59:26 2016 +0100 gdi32: Avoid unnecessary calls to get_dc_ptr(). Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/dibdrv/bitblt.c | 19 ++++--------------- dlls/gdi32/gdi_private.h | 7 +++++++ 2 files changed, 11 insertions(+), 15 deletions(-) diff --git a/dlls/gdi32/dibdrv/bitblt.c b/dlls/gdi32/dibdrv/bitblt.c index 71ef272..12e4cd8 100644 --- a/dlls/gdi32/dibdrv/bitblt.c +++ b/dlls/gdi32/dibdrv/bitblt.c @@ -1390,18 +1390,12 @@ COLORREF get_pixel_bitmapinfo( const BITMAPINFO *info, void *bits, struct bitblt BOOL dibdrv_StretchBlt( PHYSDEV dst_dev, struct bitblt_coords *dst, PHYSDEV src_dev, struct bitblt_coords *src, DWORD rop ) { - BOOL ret; - DC *dc_dst = get_dc_ptr( dst_dev->hdc ); - - if (!dc_dst) return FALSE; + DC *dc_dst = get_physdev_dc( dst_dev ); if (dst->width == 1 && src->width > 1) src->width--; if (dst->height == 1 && src->height > 1) src->height--; - ret = dc_dst->nulldrv.funcs->pStretchBlt( &dc_dst->nulldrv, dst, - src_dev, src, rop ); - release_dc_ptr( dc_dst ); - return ret; + return dc_dst->nulldrv.funcs->pStretchBlt( &dc_dst->nulldrv, dst, src_dev, src, rop ); } /*********************************************************************** @@ -1410,14 +1404,9 @@ BOOL dibdrv_StretchBlt( PHYSDEV dst_dev, struct bitblt_coords *dst, BOOL dibdrv_AlphaBlend( PHYSDEV dst_dev, struct bitblt_coords *dst, PHYSDEV src_dev, struct bitblt_coords *src, BLENDFUNCTION blend ) { - BOOL ret; - DC *dc_dst = get_dc_ptr( dst_dev->hdc ); + DC *dc_dst = get_physdev_dc( dst_dev ); - if (!dc_dst) return FALSE; - - ret = dc_dst->nulldrv.funcs->pAlphaBlend( &dc_dst->nulldrv, dst, src_dev, src, blend ); - release_dc_ptr( dc_dst ); - return ret; + return dc_dst->nulldrv.funcs->pAlphaBlend( &dc_dst->nulldrv, dst, src_dev, src, blend ); } /*********************************************************************** diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 47cdf66..a837215 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -469,6 +469,13 @@ static inline DC *get_nulldrv_dc( PHYSDEV dev ) return CONTAINING_RECORD( dev, DC, nulldrv ); } +static inline DC *get_physdev_dc( PHYSDEV dev ) +{ + while (dev->funcs != &null_driver) + dev = dev->next; + return get_nulldrv_dc( dev ); +} + /* Undocumented value for DIB's iUsage: Indicates a mono DIB w/o pal entries */ #define DIB_PAL_MONO 2

1 0

Huw Davies : gdi32: Pass a DC pointer to get_device_rect() to avoid accesses via the handle.
by Alexandre Julliard 27 Jul '16

27 Jul '16

Module: wine Branch: master Commit: 7fa6dfecc9980bbc2c67ee1ae39a80d149c72bd8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7fa6dfecc9980bbc2c67ee1ae… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jul 27 09:59:27 2016 +0100 gdi32: Pass a DC pointer to get_device_rect() to avoid accesses via the handle. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/dibdrv/graphics.c | 47 ++++++++++++++++++++++++-------------------- 1 file changed, 26 insertions(+), 21 deletions(-) diff --git a/dlls/gdi32/dibdrv/graphics.c b/dlls/gdi32/dibdrv/graphics.c index 64f6d15..f0880cf 100644 --- a/dlls/gdi32/dibdrv/graphics.c +++ b/dlls/gdi32/dibdrv/graphics.c @@ -92,7 +92,7 @@ static BOOL pen_region( dibdrv_physdev *pdev, HRGN region ) return brush_rect( pdev, &pdev->pen_brush, NULL, region ); } -static RECT get_device_rect( HDC hdc, int left, int top, int right, int bottom, BOOL rtl_correction ) +static RECT get_device_rect( DC *dc, int left, int top, int right, int bottom, BOOL rtl_correction ) { RECT rect; @@ -100,21 +100,22 @@ static RECT get_device_rect( HDC hdc, int left, int top, int right, int bottom, rect.top = top; rect.right = right; rect.bottom = bottom; - if (rtl_correction && GetLayout( hdc ) & LAYOUT_RTL) + if (rtl_correction && dc->layout & LAYOUT_RTL) { /* shift the rectangle so that the right border is included after mirroring */ /* it would be more correct to do this after LPtoDP but that's not what Windows does */ rect.left--; rect.right--; } - LPtoDP( hdc, (POINT *)&rect, 2 ); + lp_to_dp( dc, (POINT *)&rect, 2 ); order_rect( &rect ); return rect; } -static BOOL get_pen_device_rect( dibdrv_physdev *dev, RECT *rect, int left, int top, int right, int bottom ) +static BOOL get_pen_device_rect( DC *dc, dibdrv_physdev *dev, RECT *rect, + int left, int top, int right, int bottom ) { - *rect = get_device_rect( dev->dev.hdc, left, top, right, bottom, TRUE ); + *rect = get_device_rect( dc, left, top, right, bottom, TRUE ); if (rect->left == rect->right || rect->top == rect->bottom) return FALSE; if (dev->pen_style == PS_INSIDEFRAME) @@ -234,7 +235,7 @@ static int find_intersection( const POINT *points, int x, int y, int count ) return 2 * count + i; } -static int get_arc_points( PHYSDEV dev, const RECT *rect, POINT start, POINT end, POINT *points ) +static int get_arc_points( int arc_dir, const RECT *rect, POINT start, POINT end, POINT *points ) { int i, pos, count, start_pos, end_pos; int width = rect->right - rect->left; @@ -246,7 +247,7 @@ static int get_arc_points( PHYSDEV dev, const RECT *rect, POINT start, POINT end points[i].x -= width / 2; points[i].y -= height / 2; } - if (GetArcDirection( dev->hdc ) != AD_CLOCKWISE) + if (arc_dir != AD_CLOCKWISE) { start.y = -start.y; end.y = -end.y; @@ -256,7 +257,7 @@ static int get_arc_points( PHYSDEV dev, const RECT *rect, POINT start, POINT end if (end_pos <= start_pos) end_pos += 4 * count; pos = count; - if (GetArcDirection( dev->hdc ) == AD_CLOCKWISE) + if (arc_dir == AD_CLOCKWISE) { for (i = start_pos; i < end_pos; i++, pos++) { @@ -316,13 +317,14 @@ static BOOL draw_arc( PHYSDEV dev, INT left, INT top, INT right, INT bottom, INT start_x, INT start_y, INT end_x, INT end_y, INT extra_lines ) { dibdrv_physdev *pdev = get_dibdrv_pdev( dev ); + DC *dc = get_physdev_dc( dev ); RECT rect; POINT pt[2], *points; int width, height, count; BOOL ret = TRUE; HRGN outline = 0, interior = 0; - if (!get_pen_device_rect( pdev, &rect, left, top, right, bottom )) return TRUE; + if (!get_pen_device_rect( dc, pdev, &rect, left, top, right, bottom )) return TRUE; width = rect.right - rect.left; height = rect.bottom - rect.top; @@ -331,7 +333,7 @@ static BOOL draw_arc( PHYSDEV dev, INT left, INT top, INT right, INT bottom, pt[0].y = start_y; pt[1].x = end_x; pt[1].y = end_y; - LPtoDP( dev->hdc, pt, 2 ); + lp_to_dp( dc, pt, 2 ); /* make them relative to the ellipse center */ pt[0].x -= rect.left + width / 2; pt[0].y -= rect.top + height / 2; @@ -343,11 +345,11 @@ static BOOL draw_arc( PHYSDEV dev, INT left, INT top, INT right, INT bottom, if (extra_lines == -1) { - GetCurrentPositionEx( dev->hdc, points ); - LPtoDP( dev->hdc, points, 1 ); - count = 1 + get_arc_points( dev, &rect, pt[0], pt[1], points + 1 ); + points[0] = dc->cur_pos; + lp_to_dp( dc, points, 1 ); + count = 1 + get_arc_points( dc->ArcDirection, &rect, pt[0], pt[1], points + 1 ); } - else count = get_arc_points( dev, &rect, pt[0], pt[1], points ); + else count = get_arc_points( dc->ArcDirection, &rect, pt[0], pt[1], points ); if (extra_lines == 2) { @@ -1199,6 +1201,7 @@ BOOL dibdrv_PaintRgn( PHYSDEV dev, HRGN rgn ) const WINEREGION *region; int i; RECT rect, bounds; + DC *dc = get_physdev_dc( dev ); TRACE("%p, %p\n", dev, rgn); @@ -1209,7 +1212,7 @@ BOOL dibdrv_PaintRgn( PHYSDEV dev, HRGN rgn ) for(i = 0; i < region->numRects; i++) { - rect = get_device_rect( dev->hdc, region->rects[i].left, region->rects[i].top, + rect = get_device_rect( dc, region->rects[i].left, region->rects[i].top, region->rects[i].right, region->rects[i].bottom, FALSE ); add_bounds_rect( &bounds, &rect ); brush_rect( pdev, &pdev->brush, &rect, pdev->clip ); @@ -1355,6 +1358,7 @@ BOOL dibdrv_Polyline( PHYSDEV dev, const POINT* pt, INT count ) BOOL dibdrv_Rectangle( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) { dibdrv_physdev *pdev = get_dibdrv_pdev(dev); + DC *dc = get_physdev_dc( dev ); RECT rect; POINT pts[4]; BOOL ret; @@ -1362,7 +1366,7 @@ BOOL dibdrv_Rectangle( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) TRACE("(%p, %d, %d, %d, %d)\n", dev, left, top, right, bottom); - if (GetGraphicsMode( dev->hdc ) == GM_ADVANCED) + if (dc->GraphicsMode == GM_ADVANCED) { pts[0].x = pts[3].x = left; pts[0].y = pts[1].y = top; @@ -1371,7 +1375,7 @@ BOOL dibdrv_Rectangle( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) return dibdrv_Polygon( dev, pts, 4 ); } - if (!get_pen_device_rect( pdev, &rect, left, top, right, bottom )) return TRUE; + if (!get_pen_device_rect( dc, pdev, &rect, left, top, right, bottom )) return TRUE; if (pdev->pen_uses_region && !(outline = CreateRectRgn( 0, 0, 0, 0 ))) return FALSE; @@ -1379,7 +1383,7 @@ BOOL dibdrv_Rectangle( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) rect.bottom--; reset_dash_origin(pdev); - if (GetArcDirection( dev->hdc ) == AD_CLOCKWISE) + if (dc->ArcDirection == AD_CLOCKWISE) { /* 4 pts going clockwise starting from bottom-right */ pts[0].x = pts[3].x = rect.right; @@ -1430,18 +1434,19 @@ BOOL dibdrv_RoundRect( PHYSDEV dev, INT left, INT top, INT right, INT bottom, INT ellipse_width, INT ellipse_height ) { dibdrv_physdev *pdev = get_dibdrv_pdev( dev ); + DC *dc = get_physdev_dc( dev ); RECT rect; POINT pt[2], *points; int i, end, count; BOOL ret = TRUE; HRGN outline = 0, interior = 0; - if (!get_pen_device_rect( pdev, &rect, left, top, right, bottom )) return TRUE; + if (!get_pen_device_rect( dc, pdev, &rect, left, top, right, bottom )) return TRUE; pt[0].x = pt[0].y = 0; pt[1].x = ellipse_width; pt[1].y = ellipse_height; - LPtoDP( dev->hdc, pt, 2 ); + lp_to_dp( dc, pt, 2 ); ellipse_width = min( rect.right - rect.left, abs( pt[1].x - pt[0].x )); ellipse_height = min( rect.bottom - rect.top, abs( pt[1].y - pt[0].y )); if (ellipse_width <= 2|| ellipse_height <= 2) @@ -1475,7 +1480,7 @@ BOOL dibdrv_RoundRect( PHYSDEV dev, INT left, INT top, INT right, INT bottom, count = ellipse_first_quadrant( ellipse_width, ellipse_height, points ); - if (GetArcDirection( dev->hdc ) == AD_CLOCKWISE) + if (dc->ArcDirection == AD_CLOCKWISE) { for (i = 0; i < count; i++) {

1 0

Huw Davies : gdi32: Use lp_to_dp() instead of LPtoDP() in the dib driver.
by Alexandre Julliard 27 Jul '16

27 Jul '16

Module: wine Branch: master Commit: 9efe66a83abeaddccb9e861eb2a7d50cedba1cf9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9efe66a83abeaddccb9e861eb… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jul 27 09:59:28 2016 +0100 gdi32: Use lp_to_dp() instead of LPtoDP() in the dib driver. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/dibdrv/bitblt.c | 3 ++- dlls/gdi32/dibdrv/graphics.c | 19 ++++++++++++------- dlls/gdi32/dibdrv/objects.c | 7 ++++--- 3 files changed, 18 insertions(+), 11 deletions(-) diff --git a/dlls/gdi32/dibdrv/bitblt.c b/dlls/gdi32/dibdrv/bitblt.c index 12e4cd8..41311fa 100644 --- a/dlls/gdi32/dibdrv/bitblt.c +++ b/dlls/gdi32/dibdrv/bitblt.c @@ -1416,6 +1416,7 @@ BOOL dibdrv_GradientFill( PHYSDEV dev, TRIVERTEX *vert_array, ULONG nvert, void *grad_array, ULONG ngrad, ULONG mode ) { dibdrv_physdev *pdev = get_dibdrv_pdev( dev ); + DC *dc = get_physdev_dc( dev ); const GRADIENT_TRIANGLE *tri = grad_array; const GRADIENT_RECT *rect = grad_array; unsigned int i; @@ -1430,7 +1431,7 @@ BOOL dibdrv_GradientFill( PHYSDEV dev, TRIVERTEX *vert_array, ULONG nvert, pts[i].x = vert_array[i].x; pts[i].y = vert_array[i].y; } - LPtoDP( dev->hdc, pts, nvert ); + lp_to_dp( dc, pts, nvert ); switch (mode) { diff --git a/dlls/gdi32/dibdrv/graphics.c b/dlls/gdi32/dibdrv/graphics.c index f0880cf..6a99544 100644 --- a/dlls/gdi32/dibdrv/graphics.c +++ b/dlls/gdi32/dibdrv/graphics.c @@ -1097,6 +1097,7 @@ COLORREF dibdrv_GetNearestColor( PHYSDEV dev, COLORREF color ) COLORREF dibdrv_GetPixel( PHYSDEV dev, INT x, INT y ) { dibdrv_physdev *pdev = get_dibdrv_pdev( dev ); + DC *dc = get_physdev_dc( dev ); POINT pt; DWORD pixel; @@ -1104,7 +1105,7 @@ COLORREF dibdrv_GetPixel( PHYSDEV dev, INT x, INT y ) pt.x = x; pt.y = y; - LPtoDP( dev->hdc, &pt, 1 ); + lp_to_dp( dc, &pt, 1 ); if (pt.x < 0 || pt.x >= pdev->dib.rect.right - pdev->dib.rect.left || pt.y < 0 || pt.y >= pdev->dib.rect.bottom - pdev->dib.rect.top) @@ -1120,15 +1121,16 @@ COLORREF dibdrv_GetPixel( PHYSDEV dev, INT x, INT y ) BOOL dibdrv_LineTo( PHYSDEV dev, INT x, INT y ) { dibdrv_physdev *pdev = get_dibdrv_pdev(dev); + DC *dc = get_physdev_dc( dev ); POINT pts[2]; HRGN region = 0; BOOL ret; - GetCurrentPositionEx(dev->hdc, pts); + pts[0] = dc->cur_pos; pts[1].x = x; pts[1].y = y; - LPtoDP(dev->hdc, pts, 2); + lp_to_dp(dc, pts, 2); if (pdev->pen_uses_region && !(region = CreateRectRgn( 0, 0, 0, 0 ))) return FALSE; @@ -1229,6 +1231,7 @@ BOOL dibdrv_PaintRgn( PHYSDEV dev, HRGN rgn ) BOOL dibdrv_PolyPolygon( PHYSDEV dev, const POINT *pt, const INT *counts, DWORD polygons ) { dibdrv_physdev *pdev = get_dibdrv_pdev(dev); + DC *dc = get_physdev_dc( dev ); DWORD total, i, pos; BOOL ret = TRUE; POINT *points; @@ -1243,10 +1246,10 @@ BOOL dibdrv_PolyPolygon( PHYSDEV dev, const POINT *pt, const INT *counts, DWORD points = HeapAlloc( GetProcessHeap(), 0, total * sizeof(*pt) ); if (!points) return FALSE; memcpy( points, pt, total * sizeof(*pt) ); - LPtoDP( dev->hdc, points, total ); + lp_to_dp( dc, points, total ); if (pdev->brush.style != BS_NULL && - !(interior = CreatePolyPolygonRgn( points, counts, polygons, GetPolyFillMode( dev->hdc )))) + !(interior = CreatePolyPolygonRgn( points, counts, polygons, dc->polyFillMode ))) { HeapFree( GetProcessHeap(), 0, points ); return FALSE; @@ -1291,6 +1294,7 @@ BOOL dibdrv_PolyPolygon( PHYSDEV dev, const POINT *pt, const INT *counts, DWORD BOOL dibdrv_PolyPolyline( PHYSDEV dev, const POINT* pt, const DWORD* counts, DWORD polylines ) { dibdrv_physdev *pdev = get_dibdrv_pdev(dev); + DC *dc = get_physdev_dc( dev ); DWORD total, pos, i; POINT *points; BOOL ret = TRUE; @@ -1305,7 +1309,7 @@ BOOL dibdrv_PolyPolyline( PHYSDEV dev, const POINT* pt, const DWORD* counts, DWO points = HeapAlloc( GetProcessHeap(), 0, total * sizeof(*pt) ); if (!points) return FALSE; memcpy( points, pt, total * sizeof(*pt) ); - LPtoDP( dev->hdc, points, total ); + lp_to_dp( dc, points, total ); if (pdev->pen_uses_region && !(outline = CreateRectRgn( 0, 0, 0, 0 ))) { @@ -1555,6 +1559,7 @@ BOOL dibdrv_Pie( PHYSDEV dev, INT left, INT top, INT right, INT bottom, COLORREF dibdrv_SetPixel( PHYSDEV dev, INT x, INT y, COLORREF color ) { dibdrv_physdev *pdev = get_dibdrv_pdev( dev ); + DC *dc = get_physdev_dc( dev ); struct clipped_rects clipped_rects; RECT rect; POINT pt; @@ -1564,7 +1569,7 @@ COLORREF dibdrv_SetPixel( PHYSDEV dev, INT x, INT y, COLORREF color ) pt.x = x; pt.y = y; - LPtoDP( dev->hdc, &pt, 1 ); + lp_to_dp( dc, &pt, 1 ); rect.left = pt.x; rect.top = pt.y; rect.right = rect.left + 1; diff --git a/dlls/gdi32/dibdrv/objects.c b/dlls/gdi32/dibdrv/objects.c index a14c062..53ea889 100644 --- a/dlls/gdi32/dibdrv/objects.c +++ b/dlls/gdi32/dibdrv/objects.c @@ -1726,14 +1726,14 @@ static inline void scale_dash_pattern( dash_pattern *pattern, DWORD scale, DWORD } } -static inline int get_pen_device_width( dibdrv_physdev *pdev, int width ) +static inline int get_pen_device_width( DC *dc, int width ) { POINT pts[2]; if (!width) return 1; pts[0].x = pts[0].y = pts[1].y = 0; pts[1].x = width; - LPtoDP( pdev->dev.hdc, pts, 2 ); + lp_to_dp( dc, pts, 2 ); width = floor( hypot( pts[1].x - pts[0].x, pts[1].y - pts[0].y )); return max( width, 1 ); } @@ -2113,6 +2113,7 @@ HBRUSH dibdrv_SelectBrush( PHYSDEV dev, HBRUSH hbrush, const struct brush_patter HPEN dibdrv_SelectPen( PHYSDEV dev, HPEN hpen, const struct brush_pattern *pattern ) { dibdrv_physdev *pdev = get_dibdrv_pdev(dev); + DC *dc = get_physdev_dc( dev ); LOGPEN logpen; LOGBRUSH logbrush; EXTLOGPEN *elp = NULL; @@ -2147,7 +2148,7 @@ HPEN dibdrv_SelectPen( PHYSDEV dev, HPEN hpen, const struct brush_pattern *patte pdev->pen_join = logpen.lopnStyle & PS_JOIN_MASK; pdev->pen_endcap = logpen.lopnStyle & PS_ENDCAP_MASK; - pdev->pen_width = get_pen_device_width( pdev, logpen.lopnWidth.x ); + pdev->pen_width = get_pen_device_width( dc, logpen.lopnWidth.x ); if (hpen == GetStockObject( DC_PEN )) logbrush.lbColor = GetDCPenColor( dev->hdc );

1 0

Alexandre Julliard : ntdll: Implement the SectionImageInformation class of NtQuerySection.
by Alexandre Julliard 26 Jul '16

26 Jul '16

Module: wine Branch: master Commit: 6f0979b9830a303f41ac953013d2805f4b63eccd URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f0979b9830a303f41ac95301… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 26 19:38:50 2016 +0900 ntdll: Implement the SectionImageInformation class of NtQuerySection. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/loader.c | 67 +++++++++++++++++++++++++++++++++++++ dlls/kernel32/tests/virtual.c | 11 ++++++ dlls/ntdll/virtual.c | 62 ++++++++++++++++++++++++++-------- include/wine/server_protocol.h | 29 +++++++++++++--- server/mapping.c | 76 +++++++++++++++++++++++++++--------------- server/protocol.def | 26 +++++++++++++-- server/request.h | 8 ++--- server/trace.c | 24 +++++++++++-- 8 files changed, 249 insertions(+), 54 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6f0979b9830a303f41ac9…

1 0

Michael Stefaniuc : dmusic: Use debugstr_guid to trace some GUIDs.
by Alexandre Julliard 26 Jul '16

26 Jul '16

Module: wine Branch: master Commit: 253bffafba6ceea8b2da87875fdcbdc0c5a51108 URL: http://source.winehq.org/git/wine.git/?a=commit;h=253bffafba6ceea8b2da87875… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jul 26 10:42:02 2016 +0200 dmusic: Use debugstr_guid to trace some GUIDs. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmusic/clock.c | 2 +- dlls/dmusic/dmusic.c | 2 +- dlls/dmusic/port.c | 9 ++++++--- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/dmusic/clock.c b/dlls/dmusic/clock.c index 46a035f..7fd1d8f 100644 --- a/dlls/dmusic/clock.c +++ b/dlls/dmusic/clock.c @@ -123,7 +123,7 @@ HRESULT DMUSIC_CreateReferenceClockImpl(LPCGUID riid, LPVOID* ret_iface, LPUNKNO IReferenceClockImpl* clock; HRESULT hr; - TRACE("(%p,%p,%p)\n", riid, ret_iface, unkouter); + TRACE("(%s, %p, %p)\n", debugstr_guid(riid), ret_iface, unkouter); clock = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IReferenceClockImpl)); if (!clock) { diff --git a/dlls/dmusic/dmusic.c b/dlls/dmusic/dmusic.c index 09a7f53..67900b3 100644 --- a/dlls/dmusic/dmusic.c +++ b/dlls/dmusic/dmusic.c @@ -405,7 +405,7 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicImpl(LPCGUID riid, LPVOID* ret_iface, LPU IDirectMusic8Impl *dmusic; HRESULT ret; - TRACE("(%p,%p,%p)\n", riid, ret_iface, unkouter); + TRACE("(%s, %p, %p)\n", debugstr_guid(riid), ret_iface, unkouter); *ret_iface = NULL; if (unkouter) diff --git a/dlls/dmusic/port.c b/dlls/dmusic/port.c index f886d52..d919c10 100644 --- a/dlls/dmusic/port.c +++ b/dlls/dmusic/port.c @@ -678,7 +678,8 @@ HRESULT DMUSIC_CreateSynthPortImpl(LPCGUID guid, LPVOID *object, LPUNKNOWN unkou HRESULT hr = E_FAIL; int i; - TRACE("(%p,%p,%p,%p,%p,%d)\n", guid, object, unkouter, port_params, port_caps, device); + TRACE("(%s, %p, %p, %p, %p, %d)\n", debugstr_guid(guid), object, unkouter, port_params, + port_caps, device); *object = NULL; @@ -762,14 +763,16 @@ HRESULT DMUSIC_CreateSynthPortImpl(LPCGUID guid, LPVOID *object, LPUNKNOWN unkou HRESULT DMUSIC_CreateMidiOutPortImpl(LPCGUID guid, LPVOID *object, LPUNKNOWN unkouter, LPDMUS_PORTPARAMS port_params, LPDMUS_PORTCAPS port_caps, DWORD device) { - TRACE("(%p,%p,%p,%p,%p,%d): stub\n", guid, object, unkouter, port_params, port_caps, device); + TRACE("(%s, %p, %p, %p, %p, %d): stub\n", debugstr_guid(guid), object, unkouter, port_params, + port_caps, device); return E_NOTIMPL; } HRESULT DMUSIC_CreateMidiInPortImpl(LPCGUID guid, LPVOID *object, LPUNKNOWN unkouter, LPDMUS_PORTPARAMS port_params, LPDMUS_PORTCAPS port_caps, DWORD device) { - TRACE("(%p,%p,%p,%p,%p,%d): stub\n", guid, object, unkouter, port_params, port_caps, device); + TRACE("(%s, %p, %p, %p, %p, %d): stub\n", debugstr_guid(guid), object, unkouter, port_params, + port_caps, device); return E_NOTIMPL; }

1 0

Michael Stefaniuc : dmime: Use debugstr_guid() to trace a REFIID.
by Alexandre Julliard 26 Jul '16

26 Jul '16

Module: wine Branch: master Commit: 07cee87e8f42b36d3494715fd75991cd83e32708 URL: http://source.winehq.org/git/wine.git/?a=commit;h=07cee87e8f42b36d3494715fd… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jul 26 10:43:03 2016 +0200 dmime: Use debugstr_guid() to trace a REFIID. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmime/performance.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dmime/performance.c b/dlls/dmime/performance.c index 8b5d3e2..d1befcf 100644 --- a/dlls/dmime/performance.c +++ b/dlls/dmime/performance.c @@ -1198,7 +1198,7 @@ HRESULT WINAPI create_dmperformance(REFIID lpcGUID, void **ppobj) { IDirectMusicPerformance8Impl *obj; - TRACE("(%p,%p)\n", lpcGUID, ppobj); + TRACE("(%s, %p)\n", debugstr_guid(lpcGUID), ppobj); obj = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicPerformance8Impl)); if (NULL == obj) {

1 0

Andrey Gusev : riched20: Use debugstr_guid() in TRACE() messages.
by Alexandre Julliard 26 Jul '16

26 Jul '16

Module: wine Branch: master Commit: c43aebd79b8f29c1f3e3fb11ffaa999952d4dc3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=c43aebd79b8f29c1f3e3fb11f… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Fri Jul 22 13:03:31 2016 +0300 riched20: Use debugstr_guid() in TRACE() messages. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/richole.c | 36 +++++++++++++++++++----------------- 1 file changed, 19 insertions(+), 17 deletions(-) diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index a2f23c9..77e7b57 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -1603,7 +1603,7 @@ static HRESULT WINAPI ITextRange_fnGetIDsOfNames(ITextRange *me, REFIID riid, LP ITypeInfo *ti; HRESULT hr; - TRACE("(%p)->(%p,%p,%u,%d,%p)\n", This, riid, rgszNames, cNames, lcid, + TRACE("(%p)->(%s, %p, %u, %d, %p)\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); hr = get_typeinfo(ITextRange_tid, &ti); @@ -1621,8 +1621,8 @@ static HRESULT WINAPI ITextRange_fnInvoke(ITextRange *me, DISPID dispIdMember, R ITypeInfo *ti; HRESULT hr; - TRACE("(%p)->(%d,%p,%d,%u,%p,%p,%p,%p)\n", This, dispIdMember, riid, lcid, - wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); + TRACE("(%p)->(%d, %s, %d, %u, %p, %p, %p, %p)\n", This, dispIdMember, debugstr_guid(riid), + lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); hr = get_typeinfo(ITextRange_tid, &ti); if (SUCCEEDED(hr)) @@ -2601,8 +2601,8 @@ static HRESULT WINAPI TextFont_GetIDsOfNames(ITextFont *iface, REFIID riid, ITypeInfo *ti; HRESULT hr; - TRACE("(%p)->(%p,%p,%u,%d,%p)\n", This, riid, rgszNames, cNames, lcid, - rgDispId); + TRACE("(%p)->(%s, %p, %u, %d, %p)\n", This, debugstr_guid(riid), + rgszNames, cNames, lcid, rgDispId); hr = get_typeinfo(ITextFont_tid, &ti); if (SUCCEEDED(hr)) @@ -2625,8 +2625,8 @@ static HRESULT WINAPI TextFont_Invoke( ITypeInfo *ti; HRESULT hr; - TRACE("(%p)->(%d,%p,%d,%u,%p,%p,%p,%p)\n", This, dispIdMember, riid, lcid, - wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); + TRACE("(%p)->(%d, %s, %d, %u, %p, %p, %p, %p)\n", This, dispIdMember, debugstr_guid(riid), + lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); hr = get_typeinfo(ITextFont_tid, &ti); if (SUCCEEDED(hr)) @@ -3383,8 +3383,8 @@ static HRESULT WINAPI TextPara_GetIDsOfNames(ITextPara *iface, REFIID riid, ITypeInfo *ti; HRESULT hr; - TRACE("(%p)->(%p,%p,%u,%d,%p)\n", This, riid, rgszNames, cNames, lcid, - rgDispId); + TRACE("(%p)->(%s, %p, %u, %d, %p)\n", This, debugstr_guid(riid), rgszNames, + cNames, lcid, rgDispId); hr = get_typeinfo(ITextPara_tid, &ti); if (SUCCEEDED(hr)) @@ -3407,8 +3407,9 @@ static HRESULT WINAPI TextPara_Invoke( ITypeInfo *ti; HRESULT hr; - TRACE("(%p)->(%d,%p,%d,%u,%p,%p,%p,%p)\n", This, dispIdMember, riid, lcid, - wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); + TRACE("(%p)->(%d, %s, %d, %u, %p, %p, %p, %p)\n", This, dispIdMember, + debugstr_guid(riid), lcid, wFlags, pDispParams, pVarResult, + pExcepInfo, puArgErr); hr = get_typeinfo(ITextPara_tid, &ti); if (SUCCEEDED(hr)) @@ -3884,8 +3885,8 @@ ITextDocument_fnGetIDsOfNames(ITextDocument* me, REFIID riid, ITypeInfo *ti; HRESULT hr; - TRACE("(%p)->(%p,%p,%u,%d,%p)\n", This, riid, rgszNames, cNames, lcid, - rgDispId); + TRACE("(%p)->(%s, %p, %u, %d, %p)\n", This, debugstr_guid(riid), + rgszNames, cNames, lcid, rgDispId); hr = get_typeinfo(ITextDocument_tid, &ti); if (SUCCEEDED(hr)) @@ -3902,8 +3903,9 @@ ITextDocument_fnInvoke(ITextDocument* me, DISPID dispIdMember, ITypeInfo *ti; HRESULT hr; - TRACE("(%p)->(%d,%p,%d,%u,%p,%p,%p,%p)\n", This, dispIdMember, riid, lcid, - wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); + TRACE("(%p)->(%d, %s, %d, %u, %p, %p, %p, %p)\n", This, dispIdMember, + debugstr_guid(riid), lcid, wFlags, pDispParams, pVarResult, + pExcepInfo, puArgErr); hr = get_typeinfo(ITextDocument_tid, &ti); if (SUCCEEDED(hr)) @@ -4218,7 +4220,7 @@ static HRESULT WINAPI ITextSelection_fnGetIDsOfNames(ITextSelection *me, REFIID ITypeInfo *ti; HRESULT hr; - TRACE("(%p)->(%p,%p,%u,%d,%p)\n", This, riid, rgszNames, cNames, lcid, + TRACE("(%p)->(%s, %p, %u, %d, %p)\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); hr = get_typeinfo(ITextSelection_tid, &ti); @@ -4242,7 +4244,7 @@ static HRESULT WINAPI ITextSelection_fnInvoke( ITypeInfo *ti; HRESULT hr; - TRACE("(%p)->(%d,%p,%d,%u,%p,%p,%p,%p)\n", This, dispIdMember, riid, lcid, + TRACE("(%p)->(%d, %s, %d, %u, %p, %p, %p, %p)\n", This, dispIdMember, debugstr_guid(riid), lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); hr = get_typeinfo(ITextSelection_tid, &ti);

1 0

Alistair Leslie-Hughes : include/icftypes.idl: Add more typedefs.
by Alexandre Julliard 26 Jul '16

26 Jul '16

Module: wine Branch: master Commit: 77a0623a37e7887b4cf777ad503f2777350a6c04 URL: http://source.winehq.org/git/wine.git/?a=commit;h=77a0623a37e7887b4cf777ad5… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Jul 22 07:46:44 2016 +0000 include/icftypes.idl: Add more typedefs. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/icftypes.idl | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/include/icftypes.idl b/include/icftypes.idl index 9cc0b6a..4b44fde 100644 --- a/include/icftypes.idl +++ b/include/icftypes.idl @@ -29,6 +29,14 @@ typedef enum NET_FW_PROFILE_TYPE_ NET_FW_PROFILE_TYPE_MAX } NET_FW_PROFILE_TYPE; +typedef enum NET_FW_PROFILE_TYPE2_ +{ + NET_FW_PROFILE2_DOMAIN = 0x0001, + NET_FW_PROFILE2_PRIVATE = 0x0002, + NET_FW_PROFILE2_PUBLIC = 0x0004, + NET_FW_PROFILE2_ALL = 0x7FFFFFFF +} NET_FW_PROFILE_TYPE2; + typedef enum NET_FW_IP_VERSION_ { NET_FW_IP_VERSION_V4, @@ -67,3 +75,24 @@ typedef enum NET_FW_IP_PROTOCOL_ NET_FW_IP_PROTOCOL_TCP = 6, NET_FW_IP_PROTOCOL_UDP = 17 } NET_FW_IP_PROTOCOL; + +typedef enum NET_FW_RULE_DIRECTION_ +{ + NET_FW_RULE_DIR_IN = 1, + NET_FW_RULE_DIR_OUT, + NET_FW_RULE_DIR_MAX +} NET_FW_RULE_DIRECTION; + +typedef enum NET_FW_ACTION_ +{ + NET_FW_ACTION_BLOCK, + NET_FW_ACTION_ALLOW, + NET_FW_ACTION_MAX +} NET_FW_ACTION; + +typedef enum NET_FW_MODIFY_STATE_ +{ + NET_FW_MODIFY_STATE_OK, + NET_FW_MODIFY_STATE_GP_OVERRIDE, + NET_FW_MODIFY_STATE_INBOUND_BLOCKED +} NET_FW_MODIFY_STATE;

1 0

Alistair Leslie-Hughes : include/netfw.idl: Add INetFwRule, INetFwRules, INetFwServiceRestriction, INetFwPolicy2 interfaces.
by Alexandre Julliard 26 Jul '16

26 Jul '16

Module: wine Branch: master Commit: 45c2911a260903860b83fdb4efcc745b6b44930b URL: http://source.winehq.org/git/wine.git/?a=commit;h=45c2911a260903860b83fdb4e… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Jul 22 07:46:58 2016 +0000 include/netfw.idl: Add INetFwRule, INetFwRules, INetFwServiceRestriction, INetFwPolicy2 interfaces. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/netfw.idl | 227 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 227 insertions(+) diff --git a/include/netfw.idl b/include/netfw.idl index 9158f8d..cf03b82 100644 --- a/include/netfw.idl +++ b/include/netfw.idl @@ -333,6 +333,149 @@ interface INetFwAuthorizedApplications : IDispatch } [ + local, + object, + uuid(af230d27-baba-4e42-aced-f524f22cfce2), + dual +] +interface INetFwRule : IDispatch +{ + [id(1), propget] + HRESULT Name( [out, retval] BSTR *name ); + [id(1), propput] + HRESULT Name( [in] BSTR name ); + + [id(2), propget] + HRESULT Description( [out, retval] BSTR* desc ); + [id(2), propput] + HRESULT Description( [in] BSTR desc ); + + [id(3), propget] + HRESULT ApplicationName( [out, retval] BSTR *imagename ); + [id(3), propput] + HRESULT ApplicationName( [in] BSTR imagename ); + + [id(4), propget] + HRESULT ServiceName( [out, retval] BSTR *service ); + [id(4), propput] + HRESULT ServiceName( [in] BSTR service ); + + [id(5), propget] + HRESULT Protocol( [out, retval] long* protocol ); + [id(5), propput] + HRESULT Protocol( [in] long protocol ); + + [id(6), propget] + HRESULT LocalPorts( [out, retval] BSTR* ports ); + [id(6), propput] + HRESULT LocalPorts( [in] BSTR ports ); + + [id(7), propget] + HRESULT RemotePorts( [out, retval] BSTR *ports ); + [id(7), propput] + HRESULT RemotePorts( [in] BSTR ports ); + + [id(8), propget] + HRESULT LocalAddresses([out, retval] BSTR* address ); + [id(8), propput] + HRESULT LocalAddresses([in] BSTR address); + + [id(9), propget] + HRESULT RemoteAddresses( [out, retval] BSTR* address ); + [id(9), propput] + HRESULT RemoteAddresses( [in] BSTR address ); + + [id(10), propget] + HRESULT IcmpTypesAndCodes( [out, retval] BSTR *codes ); + [id(10), propput] + HRESULT IcmpTypesAndCodes( [in] BSTR codes ); + + [id(11), propget] + HRESULT Direction( [out, retval] NET_FW_RULE_DIRECTION* dir ); + [id(11), propput] + HRESULT Direction( [in] NET_FW_RULE_DIRECTION dir ); + + [id(12), propget] + HRESULT Interfaces( [out, retval] VARIANT* interfaces ); + [id(12), propput] + HRESULT Interfaces( [in] VARIANT interfaces ); + + [id(13), propget] + HRESULT InterfaceTypes( [out, retval] BSTR* types ); + [id(13), propput] + HRESULT InterfaceTypes( [in] BSTR types ); + + [id(14), propget] + HRESULT Enabled( [out, retval] VARIANT_BOOL* enabled ); + [id(14), propput] + HRESULT Enabled( [in] VARIANT_BOOL enabled ); + + [id(15), propget] + HRESULT Grouping( [out, retval] BSTR* context ); + [id(15), propput] + HRESULT Grouping( [in] BSTR context ); + + [id(16), propget] + HRESULT Profiles( [out, retval] long* profiles ); + [id(16), propput] + HRESULT Profiles( [in] long profiles ); + + [id(17), propget] + HRESULT EdgeTraversal( [out, retval] VARIANT_BOOL* enabled ); + [id(17), propput] + HRESULT EdgeTraversal( [in] VARIANT_BOOL enabled ); + + [id(18), propget] + HRESULT Action( [out, retval] NET_FW_ACTION* action ); + [id(18), propput] + HRESULT Action( [in] NET_FW_ACTION action ); +} + +[ + local, + object, + uuid(9c4c6277-5027-441e-afae-ca1f542da009), + dual +] +interface INetFwRules : IDispatch +{ + [id(1), propget] + HRESULT Count( [out, retval] long* count ); + + [id(2)] + HRESULT Add( [in] INetFwRule* rule ); + + [id(3)] + HRESULT Remove( [in] BSTR name ); + + [id(4)] + HRESULT Item( [in] BSTR name, [out, retval] INetFwRule** rule ); + + [id(DISPID_NEWENUM), propget, restricted] + HRESULT _NewEnum( [out, retval] IUnknown** newEnum ); +} + +[ + local, + object, + uuid(8267bbe3-f890-491c-b7b6-2db1ef0e5d2b), + dual +] +interface INetFwServiceRestriction : IDispatch +{ + [id(1)] + HRESULT RestrictService( [in] BSTR serviceName, [in] BSTR appName, + [in] VARIANT_BOOL restrictService, [in] VARIANT_BOOL serviceSidRestricted ); + + [id(2)] + HRESULT ServiceRestricted( [in] BSTR serviceName, [in] BSTR appName, + [out, retval] VARIANT_BOOL* serviceRestricted ); + + [id(3), propget] + HRESULT Rules( [out, retval] INetFwRules** rules ); +} + +[ object, uuid(174A0DDA-E9F9-449D-993B-21AB667CA456), dual @@ -398,6 +541,81 @@ interface INetFwPolicy : IDispatch } [ + local, + object, + uuid(98325047-c671-4174-8d81-defcd3f03186), + dual +] +interface INetFwPolicy2 : IDispatch +{ + [id(1), propget] + HRESULT CurrentProfileTypes( [out, retval] long *profile ); + + [id(2), propget] + HRESULT FirewallEnabled( [in] NET_FW_PROFILE_TYPE2 profileType, [out, retval] VARIANT_BOOL* enabled ); + + [id(2), propput] + HRESULT FirewallEnabled( [in] NET_FW_PROFILE_TYPE2 profileType, [in] VARIANT_BOOL enabled ); + + [id(3), propget] + HRESULT ExcludedInterfaces( [in] NET_FW_PROFILE_TYPE2 profileType, [out, retval] VARIANT *interfaces ); + + [id(3), propput] + HRESULT ExcludedInterfaces( [in] NET_FW_PROFILE_TYPE2 profileType, [in] VARIANT interfaces ); + + [id(4), propget] + HRESULT BlockAllInboundTraffic( [in] NET_FW_PROFILE_TYPE2 profileType, [out, retval] VARIANT_BOOL* block ); + + [id(4), propput] + HRESULT BlockAllInboundTraffic( [in] NET_FW_PROFILE_TYPE2 profileType, [in] VARIANT_BOOL block ); + + [id(5), propget] + HRESULT NotificationsDisabled( [in] NET_FW_PROFILE_TYPE2 profileType, [out, retval] VARIANT_BOOL* disabled ); + [id(5), propput] + HRESULT NotificationsDisabled( [in] NET_FW_PROFILE_TYPE2 profileType, [in] VARIANT_BOOL disabled ); + + [id(6), propget] + HRESULT UnicastResponsesToMulticastBroadcastDisabled( [in] NET_FW_PROFILE_TYPE2 profileType, + [out, retval] VARIANT_BOOL* disabled ); + [id(6), propput] + HRESULT UnicastResponsesToMulticastBroadcastDisabled( [in] NET_FW_PROFILE_TYPE2 profileType, + [in] VARIANT_BOOL disabled ); + + [id(7), propget] + HRESULT Rules( [out, retval] INetFwRules** rules ); + + [id(8), propget] + HRESULT ServiceRestriction( [out, retval] INetFwServiceRestriction **ServiceRestriction ); + + [id(9)] + HRESULT EnableRuleGroup( [in] long profileTypesBitmask, [in] BSTR group, [in] VARIANT_BOOL enable ); + + [id(10)] + HRESULT IsRuleGroupEnabled( [in] long profileTypesBitmask, [in] BSTR group, [out, retval] VARIANT_BOOL *enabled ); + + [id(11)] + HRESULT RestoreLocalFirewallDefaults(); + + [id(12), propget] + HRESULT DefaultInboundAction( [in] NET_FW_PROFILE_TYPE2 profileType, [out, retval] NET_FW_ACTION* action ); + + [id(12), propput] + HRESULT DefaultInboundAction( [in] NET_FW_PROFILE_TYPE2 profileType, [in] NET_FW_ACTION action ); + + [id(13), propget] + HRESULT DefaultOutboundAction( [in] NET_FW_PROFILE_TYPE2 profileType, [out, retval] NET_FW_ACTION* action ); + + [id(13), propput] + HRESULT DefaultOutboundAction( [in] NET_FW_PROFILE_TYPE2 profileType, [in] NET_FW_ACTION action ); + + [id(14), propget] + HRESULT IsRuleGroupCurrentlyEnabled( [in] BSTR group, [out, retval] VARIANT_BOOL* enabled ); + + [id(15), propget] + HRESULT LocalPolicyModifyState( [out, retval] NET_FW_MODIFY_STATE* modifyState ); +} + +[ object, uuid(F7898AF5-CAC4-4632-A2EC-DA06E5111AF2), dual @@ -442,6 +660,7 @@ library NetFwPublicTypeLib interface INetFwAuthorizedApplications; interface INetFwProfile; interface INetFwPolicy; + interface INetFwPolicy2; interface INetFwMgr; [ @@ -467,4 +686,12 @@ library NetFwPublicTypeLib { [default] interface INetFwMgr; } + + [ + uuid(e2b3c97f-6ae1-41ac-817a-f6f92166d7dd) + ] + coclass NetFwPolicy2 + { + [default] interface INetFwPolicy2; + } }

1 0