wine-commits July 2016

wine-commits@winehq.org

2 participants
680 discussions

Huw Davies : gdi32: Pass a DC pointer to get_gdi_flat_path().
by Alexandre Julliard 29 Jul '16

29 Jul '16

Module: wine Branch: master Commit: 67520ebaf57c76a6b69820a93c902c804843ea7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=67520ebaf57c76a6b69820a93… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Jul 29 15:09:26 2016 +0100 gdi32: Pass a DC pointer to get_gdi_flat_path(). Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/dibdrv/graphics.c | 3 ++- dlls/gdi32/enhmfdrv/graphics.c | 3 ++- dlls/gdi32/gdi_private.h | 2 +- dlls/gdi32/path.c | 8 ++------ 4 files changed, 7 insertions(+), 9 deletions(-) diff --git a/dlls/gdi32/dibdrv/graphics.c b/dlls/gdi32/dibdrv/graphics.c index 3ea39a1..e6d65e1 100644 --- a/dlls/gdi32/dibdrv/graphics.c +++ b/dlls/gdi32/dibdrv/graphics.c @@ -408,6 +408,7 @@ static BOOL draw_arc( PHYSDEV dev, INT left, INT top, INT right, INT bottom, /* helper for path stroking and filling functions */ static BOOL stroke_and_fill_path( dibdrv_physdev *dev, BOOL stroke, BOOL fill ) { + DC *dc = get_physdev_dc( &dev->dev ); struct gdi_path *path; POINT *points; BYTE *types; @@ -417,7 +418,7 @@ static BOOL stroke_and_fill_path( dibdrv_physdev *dev, BOOL stroke, BOOL fill ) if (dev->brush.style == BS_NULL) fill = FALSE; - if (!(path = get_gdi_flat_path( dev->dev.hdc, fill ? &interior : NULL ))) return FALSE; + if (!(path = get_gdi_flat_path( dc, fill ? &interior : NULL ))) return FALSE; if (!(total = get_gdi_path_data( path, &points, &types ))) goto done; if (stroke && dev->pen_uses_region) outline = CreateRectRgn( 0, 0, 0, 0 ); diff --git a/dlls/gdi32/enhmfdrv/graphics.c b/dlls/gdi32/enhmfdrv/graphics.c index f74e86b..7aaff9d 100644 --- a/dlls/gdi32/enhmfdrv/graphics.c +++ b/dlls/gdi32/enhmfdrv/graphics.c @@ -99,6 +99,7 @@ static void get_points_bounds( RECTL *bounds, const POINT *pts, UINT count, HDC /* helper for path stroke and fill functions */ static BOOL emfdrv_stroke_and_fill_path( PHYSDEV dev, INT type ) { + DC *dc = get_physdev_dc( dev ); EMRSTROKEANDFILLPATH emr; struct gdi_path *path; POINT *points; @@ -107,7 +108,7 @@ static BOOL emfdrv_stroke_and_fill_path( PHYSDEV dev, INT type ) emr.emr.iType = type; emr.emr.nSize = sizeof(emr); - if ((path = get_gdi_flat_path( dev->hdc, NULL ))) + if ((path = get_gdi_flat_path( dc, NULL ))) { int count = get_gdi_path_data( path, &points, &flags ); get_points_bounds( &emr.rclBounds, points, count, 0 ); diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 5bad7b7..3df3a2c 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -334,7 +334,7 @@ typedef struct /* path.c */ extern void free_gdi_path( struct gdi_path *path ) DECLSPEC_HIDDEN; -extern struct gdi_path *get_gdi_flat_path( HDC hdc, HRGN *rgn ) DECLSPEC_HIDDEN; +extern struct gdi_path *get_gdi_flat_path( DC *dc, HRGN *rgn ) DECLSPEC_HIDDEN; extern int get_gdi_path_data( struct gdi_path *path, POINT **points, BYTE **flags ) DECLSPEC_HIDDEN; extern BOOL PATH_SavePath( DC *dst, DC *src ) DECLSPEC_HIDDEN; extern BOOL PATH_RestorePath( DC *dst, DC *src ) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/path.c b/dlls/gdi32/path.c index 2126dab..c03208f 100644 --- a/dlls/gdi32/path.c +++ b/dlls/gdi32/path.c @@ -536,24 +536,20 @@ static BOOL PATH_DoArcPart(struct gdi_path *pPath, FLOAT_POINT corners[], /* retrieve a flattened path in device coordinates, and optionally its region */ /* the DC path is deleted; the returned data must be freed by caller using free_gdi_path() */ /* helper for stroke_and_fill_path in the DIB driver */ -struct gdi_path *get_gdi_flat_path( HDC hdc, HRGN *rgn ) +struct gdi_path *get_gdi_flat_path( DC *dc, HRGN *rgn ) { - DC *dc = get_dc_ptr( hdc ); struct gdi_path *ret = NULL; - if (!dc) return NULL; - if (dc->path) { ret = PATH_FlattenPath( dc->path ); free_gdi_path( dc->path ); dc->path = NULL; - if (ret && rgn) *rgn = path_to_region( ret, GetPolyFillMode( hdc ) ); + if (ret && rgn) *rgn = path_to_region( ret, dc->polyFillMode ); } else SetLastError( ERROR_CAN_NOT_COMPLETE ); - release_dc_ptr( dc ); return ret; }

1 0

Huw Davies : gdi32: Don't call GetObjectW() unless necessary.
by Alexandre Julliard 29 Jul '16

29 Jul '16

Module: wine Branch: master Commit: 0c1e42235aa8c6e2df939e8d7d673d16469d78d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c1e42235aa8c6e2df939e8d7… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Jul 29 13:13:07 2016 +0100 gdi32: Don't call GetObjectW() unless necessary. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 2faefe8..02efc8a 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -681,13 +681,15 @@ static void update_font_code_page( DC *dc, HANDLE font ) { CHARSETINFO csi; int charset = get_text_charset_info( dc, NULL, 0 ); - LOGFONTW lf; - GetObjectW( font, sizeof(lf), &lf ); + if (charset == ANSI_CHARSET && get_associated_charset_info() & ASSOC_CHARSET_ANSI) + { + LOGFONTW lf; - if (charset == ANSI_CHARSET && !(lf.lfClipPrecision & CLIP_DFA_DISABLE) && - get_associated_charset_info() & ASSOC_CHARSET_ANSI) - charset = DEFAULT_CHARSET; + GetObjectW( font, sizeof(lf), &lf ); + if (!(lf.lfClipPrecision & CLIP_DFA_DISABLE)) + charset = DEFAULT_CHARSET; + } /* Hmm, nicely designed api this one! */ if (TranslateCharsetInfo( ULongToPtr(charset), &csi, TCI_SRCCHARSET) )

1 0

Huw Davies : gdi32: Add an internal version of GetTextCharsetInfo() that takes a DC pointer.
by Alexandre Julliard 29 Jul '16

29 Jul '16

Module: wine Branch: master Commit: 41f763ea879045464b02d45c048852e7e13cea93 URL: http://source.winehq.org/git/wine.git/?a=commit;h=41f763ea879045464b02d45c0… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Jul 29 13:13:06 2016 +0100 gdi32: Add an internal version of GetTextCharsetInfo() that takes a DC pointer. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 57 ++++++++++++++++++++++++++++++++++--------------------- 1 file changed, 35 insertions(+), 22 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index b42aaa6..2faefe8 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -407,6 +407,40 @@ DWORD WINAPI GdiGetCodePage( HDC hdc ) } /*********************************************************************** + * get_text_charset_info + * + * Internal version of GetTextCharsetInfo() that takes a DC pointer. + */ +static UINT get_text_charset_info(DC *dc, FONTSIGNATURE *fs, DWORD flags) +{ + UINT ret = DEFAULT_CHARSET; + PHYSDEV dev; + + dev = GET_DC_PHYSDEV( dc, pGetTextCharsetInfo ); + ret = dev->funcs->pGetTextCharsetInfo( dev, fs, flags ); + + if (ret == DEFAULT_CHARSET && fs) + memset(fs, 0, sizeof(FONTSIGNATURE)); + return ret; +} + +/*********************************************************************** + * GetTextCharsetInfo (GDI32.@) + */ +UINT WINAPI GetTextCharsetInfo(HDC hdc, FONTSIGNATURE *fs, DWORD flags) +{ + UINT ret = DEFAULT_CHARSET; + DC *dc = get_dc_ptr(hdc); + + if (dc) + { + ret = get_text_charset_info( dc, fs, flags ); + release_dc_ptr( dc ); + } + return ret; +} + +/*********************************************************************** * FONT_mbtowc * * Returns a Unicode translation of str using the charset of the @@ -646,7 +680,7 @@ static DWORD get_associated_charset_info(void) static void update_font_code_page( DC *dc, HANDLE font ) { CHARSETINFO csi; - int charset = GetTextCharsetInfo( dc->hSelf, NULL, 0 ); + int charset = get_text_charset_info( dc, NULL, 0 ); LOGFONTW lf; GetObjectW( font, sizeof(lf), &lf ); @@ -3689,27 +3723,6 @@ UINT WINAPI GetTextCharset(HDC hdc) } /*********************************************************************** - * GetTextCharsetInfo (GDI32.@) - */ -UINT WINAPI GetTextCharsetInfo(HDC hdc, LPFONTSIGNATURE fs, DWORD flags) -{ - UINT ret = DEFAULT_CHARSET; - DC *dc = get_dc_ptr(hdc); - PHYSDEV dev; - - if (dc) - { - dev = GET_DC_PHYSDEV( dc, pGetTextCharsetInfo ); - ret = dev->funcs->pGetTextCharsetInfo( dev, fs, flags ); - release_dc_ptr( dc ); - } - - if (ret == DEFAULT_CHARSET && fs) - memset(fs, 0, sizeof(FONTSIGNATURE)); - return ret; -} - -/*********************************************************************** * GdiGetCharDimensions (GDI32.@) * * Gets the average width of the characters in the English alphabet.

1 0

Huw Davies : gdi32: Use a buffer on the stack if the number of points is small.
by Alexandre Julliard 29 Jul '16

29 Jul '16

Module: wine Branch: master Commit: 22202eae59f95bc370c37da8bb385e019f712a6f URL: http://source.winehq.org/git/wine.git/?a=commit;h=22202eae59f95bc370c37da8b… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Jul 29 13:13:05 2016 +0100 gdi32: Use a buffer on the stack if the number of points is small. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/dibdrv/graphics.c | 35 +++++++++++++++++++++++------------ 1 file changed, 23 insertions(+), 12 deletions(-) diff --git a/dlls/gdi32/dibdrv/graphics.c b/dlls/gdi32/dibdrv/graphics.c index 08e777d..3ea39a1 100644 --- a/dlls/gdi32/dibdrv/graphics.c +++ b/dlls/gdi32/dibdrv/graphics.c @@ -1239,7 +1239,8 @@ BOOL dibdrv_PolyPolygon( PHYSDEV dev, const POINT *pt, const INT *counts, DWORD DC *dc = get_physdev_dc( dev ); DWORD total, i, pos; BOOL ret = TRUE; - POINT *points; + POINT pt_buf[32]; + POINT *points = pt_buf; HRGN outline = 0, interior = 0; for (i = total = 0; i < polygons; i++) @@ -1248,16 +1249,19 @@ BOOL dibdrv_PolyPolygon( PHYSDEV dev, const POINT *pt, const INT *counts, DWORD total += counts[i]; } - points = HeapAlloc( GetProcessHeap(), 0, total * sizeof(*pt) ); - if (!points) return FALSE; + if (total > sizeof(pt_buf) / sizeof(pt_buf[0])) + { + points = HeapAlloc( GetProcessHeap(), 0, total * sizeof(*pt) ); + if (!points) return FALSE; + } memcpy( points, pt, total * sizeof(*pt) ); lp_to_dp( dc, points, total ); if (pdev->brush.style != BS_NULL && !(interior = CreatePolyPolygonRgn( points, counts, polygons, dc->polyFillMode ))) { - HeapFree( GetProcessHeap(), 0, points ); - return FALSE; + ret = FALSE; + goto done; } if (pdev->pen_uses_region) outline = CreateRectRgn( 0, 0, 0, 0 ); @@ -1289,7 +1293,9 @@ BOOL dibdrv_PolyPolygon( PHYSDEV dev, const POINT *pt, const INT *counts, DWORD if (ret) ret = pen_region( pdev, outline ); DeleteObject( outline ); } - HeapFree( GetProcessHeap(), 0, points ); + +done: + if (points != pt_buf) HeapFree( GetProcessHeap(), 0, points ); return ret; } @@ -1301,7 +1307,8 @@ BOOL dibdrv_PolyPolyline( PHYSDEV dev, const POINT* pt, const DWORD* counts, DWO dibdrv_physdev *pdev = get_dibdrv_pdev(dev); DC *dc = get_physdev_dc( dev ); DWORD total, pos, i; - POINT *points; + POINT pt_buf[32]; + POINT *points = pt_buf; BOOL ret = TRUE; HRGN outline = 0; @@ -1311,15 +1318,18 @@ BOOL dibdrv_PolyPolyline( PHYSDEV dev, const POINT* pt, const DWORD* counts, DWO total += counts[i]; } - points = HeapAlloc( GetProcessHeap(), 0, total * sizeof(*pt) ); - if (!points) return FALSE; + if (total > sizeof(pt_buf) / sizeof(pt_buf[0])) + { + points = HeapAlloc( GetProcessHeap(), 0, total * sizeof(*pt) ); + if (!points) return FALSE; + } memcpy( points, pt, total * sizeof(*pt) ); lp_to_dp( dc, points, total ); if (pdev->pen_uses_region && !(outline = CreateRectRgn( 0, 0, 0, 0 ))) { - HeapFree( GetProcessHeap(), 0, points ); - return FALSE; + ret = FALSE; + goto done; } for (i = pos = 0; i < polylines; i++) @@ -1336,7 +1346,8 @@ BOOL dibdrv_PolyPolyline( PHYSDEV dev, const POINT* pt, const DWORD* counts, DWO DeleteObject( outline ); } - HeapFree( GetProcessHeap(), 0, points ); +done: + if (points != pt_buf) HeapFree( GetProcessHeap(), 0, points ); return ret; }

1 0

Michael Stefaniuc : comctl32: Avoid using memset on RECTs.
by Alexandre Julliard 29 Jul '16

29 Jul '16

Module: wine Branch: master Commit: 2ea72e87174f6db962ab079e37b8269a72952477 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ea72e87174f6db962ab079e3… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jul 29 15:39:57 2016 +0200 comctl32: Avoid using memset on RECTs. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/status.c | 4 ++-- dlls/comctl32/tab.c | 10 ++-------- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/dlls/comctl32/status.c b/dlls/comctl32/status.c index 738c33b..08ca158 100644 --- a/dlls/comctl32/status.c +++ b/dlls/comctl32/status.c @@ -127,8 +127,8 @@ STATUSBAR_ComputeHeight(STATUS_INFO *infoPtr) * textHeight pixels large */ HDC hdc = GetDC(infoPtr->Self); RECT r; - memset (&r, 0, sizeof (r)); - r.bottom = max(infoPtr->minHeight, tm.tmHeight); + + SetRect(&r, 0, 0, 0, max(infoPtr->minHeight, tm.tmHeight)); if (SUCCEEDED(GetThemeBackgroundExtent(theme, hdc, SP_PANE, 0, &r, &r))) { height = r.bottom - r.top; diff --git a/dlls/comctl32/tab.c b/dlls/comctl32/tab.c index 0ed9152..f8a5493 100644 --- a/dlls/comctl32/tab.c +++ b/dlls/comctl32/tab.c @@ -371,14 +371,8 @@ static BOOL TAB_InternalGetItemRect( (itemIndex < infoPtr->leftmostVisible))) { TRACE("Not Visible\n"); - /* need to initialize these to empty rects */ - if (itemRect) - { - memset(itemRect,0,sizeof(RECT)); - itemRect->bottom = infoPtr->tabHeight; - } - if (selectedRect) - memset(selectedRect,0,sizeof(RECT)); + SetRect(itemRect, 0, 0, 0, infoPtr->tabHeight); + SetRectEmpty(selectedRect); return FALSE; }

1 0

Piotr Caban : ntdll: Keep drive letter size in RtlGetFullPathName_U when full path is specified.
by Alexandre Julliard 29 Jul '16

29 Jul '16

Module: wine Branch: master Commit: f333bf47a8077ecf634163c8a67dc2502ca8295c URL: http://source.winehq.org/git/wine.git/?a=commit;h=f333bf47a8077ecf634163c8a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jul 28 14:24:05 2016 +0200 ntdll: Keep drive letter size in RtlGetFullPathName_U when full path is specified. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/path.c | 2 +- dlls/ntdll/tests/path.c | 9 +++++---- dlls/shell32/tests/shelllink.c | 2 +- programs/cmd/tests/test_builtins.cmd.exp | 2 +- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/path.c b/dlls/ntdll/path.c index ae0646a..ac4807f 100644 --- a/dlls/ntdll/path.c +++ b/dlls/ntdll/path.c @@ -625,7 +625,7 @@ static ULONG get_full_path_helper(LPCWSTR name, LPWSTR buffer, ULONG size) case ABSOLUTE_DRIVE_PATH: /* c:\foo */ reqsize = sizeof(WCHAR); - tmp[0] = toupperW(name[0]); + tmp[0] = name[0]; ins_str = tmp; dep = 1; mark = 3; diff --git a/dlls/ntdll/tests/path.c b/dlls/ntdll/tests/path.c index cc7259e..c19189d 100644 --- a/dlls/ntdll/tests/path.c +++ b/dlls/ntdll/tests/path.c @@ -265,7 +265,7 @@ static void test_RtlGetFullPathName_U(void) { "c:/test/ .... .. ", "c:\\test\\", NULL}, { "c:/test/..", "c:\\", NULL}, { "c:/test/.. ", "c:\\test\\", NULL}, - { "c:/TEST", "c:\\test", "test"}, + { "c:/TEST", "c:\\TEST", "TEST"}, { "c:/test/file", "c:\\test\\file", "file"}, { "c:/test./file", "c:\\test\\file", "file"}, { "c:/test.. /file", "c:\\test.. \\file","file"}, @@ -279,6 +279,7 @@ static void test_RtlGetFullPathName_U(void) { "c:///test\\..\\file\\..\\//", "c:\\", NULL}, { "c:/test../file", "c:\\test.\\file", "file", "c:\\test..\\file", "file"}, /* vista */ + { "c:\\test", "c:\\test", "test"}, { NULL, NULL, NULL} }; @@ -325,14 +326,14 @@ static void test_RtlGetFullPathName_U(void) "Wrong result %d/%d for \"%s\"\n", ret, len, test->path ); ok(pRtlUnicodeToMultiByteN(rbufferA,MAX_PATH,&reslen,rbufferW,(lstrlenW(rbufferW) + 1) * sizeof(WCHAR)) == STATUS_SUCCESS, "RtlUnicodeToMultiByteN failed\n"); - ok(!lstrcmpiA(rbufferA,test->rname) || (test->alt_rname && !lstrcmpiA(rbufferA,test->alt_rname)), + ok(!lstrcmpA(rbufferA,test->rname) || (test->alt_rname && !lstrcmpA(rbufferA,test->alt_rname)), "Got \"%s\" expected \"%s\"\n",rbufferA,test->rname); if (file_part) { ok(pRtlUnicodeToMultiByteN(rfileA,MAX_PATH,&reslen,file_part,(lstrlenW(file_part) + 1) * sizeof(WCHAR)) == STATUS_SUCCESS, "RtlUnicodeToMultiByteN failed\n"); - ok((test->rfile && !lstrcmpiA(rfileA,test->rfile)) || - (test->alt_rfile && !lstrcmpiA(rfileA,test->alt_rfile)), + ok((test->rfile && !lstrcmpA(rfileA,test->rfile)) || + (test->alt_rfile && !lstrcmpA(rfileA,test->alt_rfile)), "Got \"%s\" expected \"%s\"\n",rfileA,test->rfile); } else diff --git a/dlls/shell32/tests/shelllink.c b/dlls/shell32/tests/shelllink.c index f7c091e..8af3c97 100644 --- a/dlls/shell32/tests/shelllink.c +++ b/dlls/shell32/tests/shelllink.c @@ -248,7 +248,7 @@ static void test_get_set(void) strcpy(buffer,"garbage"); r = IShellLinkA_GetPath(sl, buffer, sizeof(buffer), NULL, SLGP_RAWPATH); ok(r==S_OK, "GetPath failed (0x%08x)\n", r); - ok(!strcmp(buffer, "C:\\nonexistent\\file") || + todo_wine ok(!strcmp(buffer, "C:\\nonexistent\\file") || broken(!strcmp(buffer, "C:\\\"c:\\nonexistent\\file\"")), /* NT4 */ "case doesn't match\n"); diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 82b13f7..67e75e0 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -980,7 +980,7 @@ a d a C r foo bar baz -@todo_wine@c:\ +c:\ ------ skip option c no output

1 0

Henri Verbeet : wined3d: Issue queries through the command stream.
by Alexandre Julliard 29 Jul '16

29 Jul '16

Module: wine Branch: master Commit: 7cda73e81864c52457d4d65f71f0140af30597d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7cda73e81864c52457d4d65f7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jul 29 12:34:34 2016 +0200 wined3d: Issue queries through the command stream. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 29 +++++++++++++++++++++++++++++ dlls/wined3d/query.c | 2 +- dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 31 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index a898c2c..b52e887 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -54,6 +54,7 @@ enum wined3d_cs_op WINED3D_CS_OP_SET_MATERIAL, WINED3D_CS_OP_RESET_STATE, WINED3D_CS_OP_DESTROY_OBJECT, + WINED3D_CS_OP_QUERY_ISSUE, }; struct wined3d_cs_present @@ -267,6 +268,13 @@ struct wined3d_cs_destroy_object void *object; }; +struct wined3d_cs_query_issue +{ + enum wined3d_cs_op opcode; + struct wined3d_query *query; + DWORD flags; +}; + static void wined3d_cs_exec_present(struct wined3d_cs *cs, const void *data) { const struct wined3d_cs_present *op = data; @@ -1215,6 +1223,26 @@ void wined3d_cs_emit_destroy_object(struct wined3d_cs *cs, void (*callback)(void cs->ops->submit(cs); } +static void wined3d_cs_exec_query_issue(struct wined3d_cs *cs, const void *data) +{ + const struct wined3d_cs_query_issue *op = data; + struct wined3d_query *query = op->query; + + query->query_ops->query_issue(query, op->flags); +} + +void wined3d_cs_emit_query_issue(struct wined3d_cs *cs, struct wined3d_query *query, DWORD flags) +{ + struct wined3d_cs_query_issue *op; + + op = cs->ops->require_space(cs, sizeof(*op)); + op->opcode = WINED3D_CS_OP_QUERY_ISSUE; + op->query = query; + op->flags = flags; + + cs->ops->submit(cs); +} + static void (* const wined3d_cs_op_handlers[])(struct wined3d_cs *cs, const void *data) = { /* WINED3D_CS_OP_PRESENT */ wined3d_cs_exec_present, @@ -1245,6 +1273,7 @@ static void (* const wined3d_cs_op_handlers[])(struct wined3d_cs *cs, const void /* WINED3D_CS_OP_SET_MATERIAL */ wined3d_cs_exec_set_material, /* WINED3D_CS_OP_RESET_STATE */ wined3d_cs_exec_reset_state, /* WINED3D_CS_OP_DESTROY_OBJECT */ wined3d_cs_exec_destroy_object, + /* WINED3D_CS_OP_QUERY_ISSUE */ wined3d_cs_exec_query_issue, }; static void *wined3d_cs_st_require_space(struct wined3d_cs *cs, size_t size) diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index 9843558..97675ad 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -350,7 +350,7 @@ HRESULT CDECL wined3d_query_issue(struct wined3d_query *query, DWORD flags) { TRACE("query %p, flags %#x.\n", query, flags); - query->query_ops->query_issue(query, flags); + wined3d_cs_emit_query_issue(query->device->cs, query, flags); if (flags & WINED3DISSUE_BEGIN) query->state = QUERY_BUILDING; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index e3b0a56..e933909 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3041,6 +3041,7 @@ void wined3d_cs_emit_draw(struct wined3d_cs *cs, int base_vertex_idx, unsigned i unsigned int start_instance, unsigned int instance_count, BOOL indexed) DECLSPEC_HIDDEN; void wined3d_cs_emit_present(struct wined3d_cs *cs, struct wined3d_swapchain *swapchain, const RECT *src_rect, const RECT *dst_rect, HWND dst_window_override, DWORD flags) DECLSPEC_HIDDEN; +void wined3d_cs_emit_query_issue(struct wined3d_cs *cs, struct wined3d_query *query, DWORD flags) DECLSPEC_HIDDEN; void wined3d_cs_emit_reset_state(struct wined3d_cs *cs) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_clip_plane(struct wined3d_cs *cs, UINT plane_idx, const struct wined3d_vec4 *plane) DECLSPEC_HIDDEN;

1 0

Henri Verbeet : wined3d: Use the context' s gl_info in wined3d_timestamp_query_ops_issue().
by Alexandre Julliard 29 Jul '16

29 Jul '16

Module: wine Branch: master Commit: 18d60012e8c32e4ef918952eab5a9e96590e6963 URL: http://source.winehq.org/git/wine.git/?a=commit;h=18d60012e8c32e4ef918952ea… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jul 29 12:34:33 2016 +0200 wined3d: Use the context's gl_info in wined3d_timestamp_query_ops_issue(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/query.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index 55e63e9..9843558 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -567,8 +567,7 @@ static BOOL wined3d_timestamp_query_ops_poll(struct wined3d_query *query) static void wined3d_timestamp_query_ops_issue(struct wined3d_query *query, DWORD flags) { struct wined3d_timestamp_query *tq = wined3d_timestamp_query_from_query(query); - struct wined3d_device *device = query->device; - const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; + const struct wined3d_gl_info *gl_info; struct wined3d_context *context; TRACE("query %p, flags %#x.\n", query, flags); @@ -582,6 +581,7 @@ static void wined3d_timestamp_query_ops_issue(struct wined3d_query *query, DWORD if (tq->context) context_free_timestamp_query(tq); context = context_acquire(query->device, NULL); + gl_info = context->gl_info; context_alloc_timestamp_query(context, tq); GL_EXTCALL(glQueryCounter(tq->id, GL_TIMESTAMP)); checkGLcall("glQueryCounter()");

1 0

Henri Verbeet : wined3d: Upload only a single sub-resource in wined3d_texture_upload_data().
by Alexandre Julliard 29 Jul '16

29 Jul '16

Module: wine Branch: master Commit: d72ff80a4661f07a0be244abc94864e6f1f2a2c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d72ff80a4661f07a0be244abc… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jul 29 12:34:32 2016 +0200 wined3d: Upload only a single sub-resource in wined3d_texture_upload_data(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 73 +++++++++++++++++++++++++------------------------- 1 file changed, 36 insertions(+), 37 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 0c1fa05..4a9ed42 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1426,40 +1426,12 @@ HRESULT CDECL wined3d_texture_add_dirty_region(struct wined3d_texture *texture, return WINED3D_OK; } -static HRESULT wined3d_texture_upload_data(struct wined3d_texture *texture, - const struct wined3d_sub_resource_data *data) +static void wined3d_texture_upload_data(struct wined3d_texture *texture, unsigned int sub_resource_idx, + const struct wined3d_context *context, const struct wined3d_const_bo_address *data, + unsigned int row_pitch, unsigned int slice_pitch) { - unsigned int sub_count = texture->level_count * texture->layer_count; - struct wined3d_context *context; - unsigned int i; - - for (i = 0; i < sub_count; ++i) - { - if (!data[i].data) - { - WARN("Invalid sub-resource data specified for sub-resource %u.\n", i); - return E_INVALIDARG; - } - } - - context = context_acquire(texture->resource.device, NULL); - - wined3d_texture_prepare_texture(texture, context, FALSE); - wined3d_texture_bind_and_dirtify(texture, context, FALSE); - - for (i = 0; i < sub_count; ++i) - { - const struct wined3d_const_bo_address addr = {0, data[i].data}; - - texture->texture_ops->texture_upload_data(texture, i, context, - &addr, data[i].row_pitch, data[i].slice_pitch); - wined3d_texture_validate_location(texture, i, WINED3D_LOCATION_TEXTURE_RGB); - wined3d_texture_invalidate_location(texture, i, ~WINED3D_LOCATION_TEXTURE_RGB); - } - - context_release(context); - - return WINED3D_OK; + texture->texture_ops->texture_upload_data(texture, sub_resource_idx, + context, data, row_pitch, slice_pitch); } static void texture2d_upload_data(struct wined3d_texture *texture, unsigned int sub_resource_idx, @@ -2783,11 +2755,38 @@ HRESULT CDECL wined3d_texture_create(struct wined3d_device *device, const struct /* FIXME: We'd like to avoid ever allocating system memory for the texture * in this case. */ - if (data && FAILED(hr = wined3d_texture_upload_data(object, data))) + if (data) { - wined3d_texture_cleanup_sync(object); - HeapFree(GetProcessHeap(), 0, object); - return hr; + unsigned int sub_count = level_count * layer_count; + struct wined3d_context *context; + unsigned int i; + + for (i = 0; i < sub_count; ++i) + { + if (!data[i].data) + { + WARN("Invalid sub-resource data specified for sub-resource %u.\n", i); + wined3d_texture_cleanup_sync(object); + HeapFree(GetProcessHeap(), 0, object); + return E_INVALIDARG; + } + } + + context = context_acquire(device, NULL); + + wined3d_texture_prepare_texture(object, context, FALSE); + wined3d_texture_bind_and_dirtify(object, context, FALSE); + + for (i = 0; i < sub_count; ++i) + { + const struct wined3d_const_bo_address addr = {0, data[i].data}; + + wined3d_texture_upload_data(object, i, context, &addr, data[i].row_pitch, data[i].slice_pitch); + wined3d_texture_validate_location(object, i, WINED3D_LOCATION_TEXTURE_RGB); + wined3d_texture_invalidate_location(object, i, ~WINED3D_LOCATION_TEXTURE_RGB); + } + + context_release(context); } TRACE("Created texture %p.\n", object);

1 0

Henri Verbeet : wined3d: Pass a wined3d_const_bo_address structure to wined3d_texture_ops.texture_upload_data ().
by Alexandre Julliard 29 Jul '16

29 Jul '16

Module: wine Branch: master Commit: 90cff7284a04b0f5d6505dc3d906a152532ba26e URL: http://source.winehq.org/git/wine.git/?a=commit;h=90cff7284a04b0f5d6505dc3d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jul 29 12:34:31 2016 +0200 wined3d: Pass a wined3d_const_bo_address structure to wined3d_texture_ops.texture_upload_data(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 31 ++++++++++++++----------------- dlls/wined3d/wined3d_private.h | 3 ++- 2 files changed, 16 insertions(+), 18 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 9feb108..0c1fa05 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1449,7 +1449,10 @@ static HRESULT wined3d_texture_upload_data(struct wined3d_texture *texture, for (i = 0; i < sub_count; ++i) { - texture->texture_ops->texture_upload_data(texture, i, context, &data[i]); + const struct wined3d_const_bo_address addr = {0, data[i].data}; + + texture->texture_ops->texture_upload_data(texture, i, context, + &addr, data[i].row_pitch, data[i].slice_pitch); wined3d_texture_validate_location(texture, i, WINED3D_LOCATION_TEXTURE_RGB); wined3d_texture_invalidate_location(texture, i, ~WINED3D_LOCATION_TEXTURE_RGB); } @@ -1460,10 +1463,10 @@ static HRESULT wined3d_texture_upload_data(struct wined3d_texture *texture, } static void texture2d_upload_data(struct wined3d_texture *texture, unsigned int sub_resource_idx, - const struct wined3d_context *context, const struct wined3d_sub_resource_data *data) + const struct wined3d_context *context, const struct wined3d_const_bo_address *data, + unsigned int row_pitch, unsigned int slice_pitch) { static const POINT dst_point = {0, 0}; - struct wined3d_const_bo_address addr; unsigned int texture_level; RECT src_rect; @@ -1471,11 +1474,8 @@ static void texture2d_upload_data(struct wined3d_texture *texture, unsigned int SetRect(&src_rect, 0, 0, wined3d_texture_get_level_width(texture, texture_level), wined3d_texture_get_level_height(texture, texture_level)); - addr.buffer_object = 0; - addr.addr = data->data; - wined3d_surface_upload_data(texture->sub_resources[sub_resource_idx].u.surface, context->gl_info, - texture->resource.format, &src_rect, data->row_pitch, &dst_point, FALSE, &addr); + texture->resource.format, &src_rect, row_pitch, &dst_point, FALSE, data); } static BOOL texture2d_load_location(struct wined3d_texture *texture, unsigned int sub_resource_idx, @@ -2101,19 +2101,16 @@ static HRESULT texture_init(struct wined3d_texture *texture, const struct wined3 } static void texture3d_upload_data(struct wined3d_texture *texture, unsigned int sub_resource_idx, - const struct wined3d_context *context, const struct wined3d_sub_resource_data *data) + const struct wined3d_context *context, const struct wined3d_const_bo_address *data, + unsigned int row_pitch, unsigned int slice_pitch) { - struct wined3d_const_bo_address addr; - unsigned int row_pitch, slice_pitch; - - wined3d_texture_get_pitch(texture, sub_resource_idx, &row_pitch, &slice_pitch); - if (row_pitch != data->row_pitch || slice_pitch != data->slice_pitch) - FIXME("Ignoring row/slice pitch (%u/%u).\n", data->row_pitch, data->slice_pitch); + unsigned int dst_row_pitch, dst_slice_pitch; - addr.buffer_object = 0; - addr.addr = data->data; + wined3d_texture_get_pitch(texture, sub_resource_idx, &dst_row_pitch, &dst_slice_pitch); + if (row_pitch != dst_row_pitch || slice_pitch != dst_slice_pitch) + FIXME("Ignoring row/slice pitch (%u/%u).\n", row_pitch, slice_pitch); - wined3d_volume_upload_data(texture, sub_resource_idx, context, &addr); + wined3d_volume_upload_data(texture, sub_resource_idx, context, data); } /* Context activation is done by the caller. */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index e5793d3..e3b0a56 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2614,7 +2614,8 @@ struct gl_texture struct wined3d_texture_ops { void (*texture_upload_data)(struct wined3d_texture *texture, unsigned int sub_resource_idx, - const struct wined3d_context *context, const struct wined3d_sub_resource_data *data); + const struct wined3d_context *context, const struct wined3d_const_bo_address *data, + unsigned int row_pitch, unsigned int slice_pitch); BOOL (*texture_load_location)(struct wined3d_texture *texture, unsigned int sub_resource_idx, struct wined3d_context *context, DWORD location); void (*texture_prepare_texture)(struct wined3d_texture *texture,

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits July 2016