June 2016 - Wine-Commits - list.winehq.org

Michael Stefaniuc : user32/tests: Avoid using CopyRect().
by Alexandre Julliard June 22, 2016

June 22, 2016

Module: wine Branch: master Commit: ce888709821b6f05705acbcef0b5e51e6bf78eca URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce888709821b6f05705acbcef… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jun 22 11:53:03 2016 +0200 user32/tests: Avoid using CopyRect(). Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/win.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index c135fdf..8505983 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -1078,7 +1078,7 @@ static void test_nonclient_area(HWND hwnd) if (IsRectEmpty(&rc_window) || IsRectEmpty(&rc_client) || rc_window.right > 32768 || rc_window.bottom > 32768) return; - CopyRect(&rc, &rc_client); + rc = rc_client; MapWindowPoints(hwnd, 0, (LPPOINT)&rc, 2); FixedAdjustWindowRectEx(&rc, style, menu, exstyle); @@ -1086,7 +1086,7 @@ static void test_nonclient_area(HWND hwnd) "window rect does not match: style:exstyle=0x%08x:0x%08x, menu=%d, win=%s, calc=%s\n", style, exstyle, menu, wine_dbgstr_rect(&rc_window), wine_dbgstr_rect(&rc)); - CopyRect(&rc, &rc_client); + rc = rc_client; MapWindowPoints(hwnd, 0, (LPPOINT)&rc, 2); wine_AdjustWindowRectEx(&rc, style, menu, exstyle); ok(EqualRect(&rc, &rc_window), @@ -1094,7 +1094,7 @@ static void test_nonclient_area(HWND hwnd) style, exstyle, menu, wine_dbgstr_rect(&rc_window), wine_dbgstr_rect(&rc)); - CopyRect(&rc, &rc_window); + rc = rc_window; DefWindowProcA(hwnd, WM_NCCALCSIZE, 0, (LPARAM)&rc); MapWindowPoints(0, hwnd, (LPPOINT)&rc, 2); ok(EqualRect(&rc, &rc_client), @@ -1111,11 +1111,11 @@ static void test_nonclient_area(HWND hwnd) /* and now test AdjustWindowRectEx and WM_NCCALCSIZE on synthetic data */ SetRect(&rc_client, 0, 0, 250, 150); - CopyRect(&rc_window, &rc_client); + rc_window = rc_client; MapWindowPoints(hwnd, 0, (LPPOINT)&rc_window, 2); FixedAdjustWindowRectEx(&rc_window, style, menu, exstyle); - CopyRect(&rc, &rc_window); + rc = rc_window; DefWindowProcA(hwnd, WM_NCCALCSIZE, 0, (LPARAM)&rc); MapWindowPoints(0, hwnd, (LPPOINT)&rc, 2); ok(EqualRect(&rc, &rc_client), @@ -5278,14 +5278,14 @@ static LRESULT WINAPI parentdc_window_procA(HWND hwnd, UINT msg, WPARAM wparam, { case WM_PAINT: GetClientRect(hwnd, &rc); - CopyRect(&t->client, &rc); + t->client = rc; GetWindowRect(hwnd, &rc); trace("WM_PAINT: hwnd %p, client rect %s, window rect %s\n", hwnd, wine_dbgstr_rect(&t->client), wine_dbgstr_rect(&rc)); BeginPaint(hwnd, &ps); - CopyRect(&t->paint, &ps.rcPaint); + t->paint = ps.rcPaint; GetClipBox(ps.hdc, &rc); - CopyRect(&t->clip, &rc); + t->clip = rc; trace("clip rect %s, paint rect %s\n", wine_dbgstr_rect(&rc), wine_dbgstr_rect(&ps.rcPaint)); EndPaint(hwnd, &ps);

1 0

Michael Stefaniuc : avifil32: Avoid using CopyRect().
by Alexandre Julliard June 22, 2016

June 22, 2016

Module: wine Branch: master Commit: e8a2a68f5956d0ac2a2a65c0c4751681ca8d099e URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8a2a68f5956d0ac2a2a65c0c… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jun 22 11:51:48 2016 +0200 avifil32: Avoid using CopyRect(). Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/avifil32/editstream.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/avifil32/editstream.c b/dlls/avifil32/editstream.c index 3aa8637..45a4d98 100644 --- a/dlls/avifil32/editstream.c +++ b/dlls/avifil32/editstream.c @@ -655,7 +655,7 @@ static HRESULT WINAPI IAVIEditStream_fnSetInfo(IAVIEditStream*iface, This->sInfo.dwRate = asi->dwRate; This->sInfo.dwScale = asi->dwScale; This->sInfo.dwQuality = asi->dwQuality; - CopyRect(&This->sInfo.rcFrame, &asi->rcFrame); + This->sInfo.rcFrame = asi->rcFrame; memcpy(This->sInfo.szName, asi->szName, sizeof(asi->szName)); This->sInfo.dwEditCount++;

1 0

Henri Verbeet : wined3d: Send palette destruction through the command stream.
by Alexandre Julliard June 22, 2016

June 22, 2016

Module: wine Branch: master Commit: bb6417d5afc52d84d6acf16b5d7445de40716578 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb6417d5afc52d84d6acf16b5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jun 22 10:39:04 2016 +0200 wined3d: Send palette destruction through the command stream. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/palette.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/palette.c b/dlls/wined3d/palette.c index fadcc43..ba9c42e 100644 --- a/dlls/wined3d/palette.c +++ b/dlls/wined3d/palette.c @@ -33,6 +33,11 @@ ULONG CDECL wined3d_palette_incref(struct wined3d_palette *palette) return refcount; } +static void wined3d_palette_destroy_object(void *object) +{ + HeapFree(GetProcessHeap(), 0, object); +} + ULONG CDECL wined3d_palette_decref(struct wined3d_palette *palette) { ULONG refcount = InterlockedDecrement(&palette->ref); @@ -40,7 +45,7 @@ ULONG CDECL wined3d_palette_decref(struct wined3d_palette *palette) TRACE("%p decreasing refcount to %u.\n", palette, refcount); if (!refcount) - HeapFree(GetProcessHeap(), 0, palette); + wined3d_cs_emit_destroy_object(palette->device->cs, wined3d_palette_destroy_object, palette); return refcount; }

1 0

Henri Verbeet : wined3d: Send query destruction through the command stream.
by Alexandre Julliard June 22, 2016

June 22, 2016

Module: wine Branch: master Commit: 97eb359588725f6d1c38146a606856b50588dbdf URL: http://source.winehq.org/git/wine.git/?a=commit;h=97eb359588725f6d1c38146a6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jun 22 10:39:03 2016 +0200 wined3d: Send query destruction through the command stream. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/query.c | 61 ++++++++++++++++++++++++++++------------------------ 1 file changed, 33 insertions(+), 28 deletions(-) diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index 410ce6c..c8d6b47 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -233,41 +233,46 @@ ULONG CDECL wined3d_query_incref(struct wined3d_query *query) return refcount; } -ULONG CDECL wined3d_query_decref(struct wined3d_query *query) +static void wined3d_query_destroy_object(void *object) { - ULONG refcount = InterlockedDecrement(&query->ref); + struct wined3d_query *query = object; - TRACE("%p decreasing refcount to %u.\n", query, refcount); + /* Queries are specific to the GL context that created them. Not + * deleting the query will obviously leak it, but that's still better + * than potentially deleting a different query with the same id in this + * context, and (still) leaking the actual query. */ + if (query->type == WINED3D_QUERY_TYPE_EVENT) + { + struct wined3d_event_query *event_query = query->extendedData; + if (event_query) wined3d_event_query_destroy(event_query); + } + else if (query->type == WINED3D_QUERY_TYPE_OCCLUSION) + { + struct wined3d_occlusion_query *oq = query->extendedData; - if (!refcount) + if (oq->context) context_free_occlusion_query(oq); + HeapFree(GetProcessHeap(), 0, query->extendedData); + } + else if (query->type == WINED3D_QUERY_TYPE_TIMESTAMP) { - /* Queries are specific to the GL context that created them. Not - * deleting the query will obviously leak it, but that's still better - * than potentially deleting a different query with the same id in this - * context, and (still) leaking the actual query. */ - if (query->type == WINED3D_QUERY_TYPE_EVENT) - { - struct wined3d_event_query *event_query = query->extendedData; - if (event_query) wined3d_event_query_destroy(event_query); - } - else if (query->type == WINED3D_QUERY_TYPE_OCCLUSION) - { - struct wined3d_occlusion_query *oq = query->extendedData; + struct wined3d_timestamp_query *tq = query->extendedData; - if (oq->context) context_free_occlusion_query(oq); - HeapFree(GetProcessHeap(), 0, query->extendedData); - } - else if (query->type == WINED3D_QUERY_TYPE_TIMESTAMP) - { - struct wined3d_timestamp_query *tq = query->extendedData; + if (tq->context) + context_free_timestamp_query(tq); + HeapFree(GetProcessHeap(), 0, query->extendedData); + } - if (tq->context) - context_free_timestamp_query(tq); - HeapFree(GetProcessHeap(), 0, query->extendedData); - } + HeapFree(GetProcessHeap(), 0, query); +} - HeapFree(GetProcessHeap(), 0, query); - } +ULONG CDECL wined3d_query_decref(struct wined3d_query *query) +{ + ULONG refcount = InterlockedDecrement(&query->ref); + + TRACE("%p decreasing refcount to %u.\n", query, refcount); + + if (!refcount) + wined3d_cs_emit_destroy_object(query->device->cs, wined3d_query_destroy_object, query); return refcount; }

1 0

Michael Stefaniuc : gdi32/tests: Use SetRect() instead of open coding it.
by Alexandre Julliard June 22, 2016

June 22, 2016

Module: wine Branch: master Commit: 6d21655ed9396c0813f1be942080c5a4f65965b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d21655ed9396c0813f1be942… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jun 21 14:13:43 2016 +0200 gdi32/tests: Use SetRect() instead of open coding it. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/tests/metafile.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index bcd085c..7e2e66d 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -3097,8 +3097,7 @@ static void test_SetWinMetaFileBits(void) if (!wmfDC) return; SetWindowExtEx(wmfDC, 100, 100, NULL); - rect.left = rect.top = 0; - rect.right = rect.bottom = 50; + SetRect(&rect, 0, 0, 50, 50); FillRect(wmfDC, &rect, GetStockObject(BLACK_BRUSH)); wmf = CloseMetaFile(wmfDC); ok(wmf != NULL, "Metafile creation failed\n");

1 0

Alexandre Julliard : gdi32: Start a new path stroke when the current position differs from the last.
by Alexandre Julliard June 22, 2016

June 22, 2016

Module: wine Branch: master Commit: 84ce9dfba714fbc1e9849b94c79020d583098cd1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=84ce9dfba714fbc1e9849b94c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 22 14:29:10 2016 +0900 gdi32: Start a new path stroke when the current position differs from the last. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/path.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/gdi32/path.c b/dlls/gdi32/path.c index ede3d61..0d4ad59 100644 --- a/dlls/gdi32/path.c +++ b/dlls/gdi32/path.c @@ -282,7 +282,9 @@ static BOOL start_new_stroke( struct path_physdev *physdev ) struct gdi_path *path = physdev->path; if (!path->newStroke && path->count && - !(path->flags[path->count - 1] & PT_CLOSEFIGURE)) + !(path->flags[path->count - 1] & PT_CLOSEFIGURE) && + path->points[path->count - 1].x == path->pos.x && + path->points[path->count - 1].y == path->pos.y) return TRUE; path->newStroke = FALSE; @@ -1234,11 +1236,7 @@ static BOOL pathdrv_PolyDraw( PHYSDEV dev, const POINT *pts, const BYTE *types, /* fall through */ default: /* restore original position */ - if (path->pos.x != orig_pos.x || path->pos.y != orig_pos.y) - { - path->newStroke = TRUE; - path->pos = orig_pos; - } + path->pos = orig_pos; return FALSE; }

1 0

Jacek Caban : secur32/tests: Don' t load secur32.dll function dynamically in negotiate.c.
by Alexandre Julliard June 22, 2016

June 22, 2016

Module: wine Branch: master Commit: 8a29c57fd234be6f51d322fc5d4a7ca1c9bfa38c URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a29c57fd234be6f51d322fc5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jun 21 19:12:00 2016 +0200 secur32/tests: Don't load secur32.dll function dynamically in negotiate.c. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/tests/Makefile.in | 2 +- dlls/secur32/tests/negotiate.c | 97 +++++++++++------------------------------- 2 files changed, 26 insertions(+), 73 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8a29c57fd234be6f51d32…

1 0

Alexandre Julliard : gdi32: Fix setting the path flags in PolyPolyline and PolyPolygon.
by Alexandre Julliard June 22, 2016

June 22, 2016

Module: wine Branch: master Commit: e68d68fb7d9e6e61d37f597c194e74689b767d89 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e68d68fb7d9e6e61d37f597c1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 22 14:27:28 2016 +0900 gdi32: Fix setting the path flags in PolyPolyline and PolyPolygon. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/path.c | 31 ++++++++++++++++++++++--------- 1 file changed, 22 insertions(+), 9 deletions(-) diff --git a/dlls/gdi32/path.c b/dlls/gdi32/path.c index c6b87d4..ede3d61 100644 --- a/dlls/gdi32/path.c +++ b/dlls/gdi32/path.c @@ -1298,16 +1298,24 @@ static BOOL pathdrv_Polygon( PHYSDEV dev, const POINT *pts, INT cbPoints ) static BOOL pathdrv_PolyPolygon( PHYSDEV dev, const POINT* pts, const INT* counts, UINT polygons ) { struct path_physdev *physdev = get_path_physdev( dev ); - UINT poly; + UINT poly, count; BYTE *type; - for(poly = 0; poly < polygons; poly++) { - type = add_log_points( physdev, pts, counts[poly], PT_LINETO ); - if (!type) return FALSE; + if (!polygons) return FALSE; + for (poly = count = 0; poly < polygons; poly++) + { + if (counts[poly] < 2) return FALSE; + count += counts[poly]; + } + + type = add_log_points( physdev, pts, count, PT_LINETO ); + if (!type) return FALSE; + + /* make the first point of each polyline a PT_MOVETO, and close the last one */ + for (poly = 0; poly < polygons; type += counts[poly++]) + { type[0] = PT_MOVETO; - /* win98 adds an extra line to close the figure for some reason */ - add_log_points( physdev, pts, 1, PT_LINETO | PT_CLOSEFIGURE ); - pts += counts[poly]; + type[counts[poly] - 1] = PT_LINETO | PT_CLOSEFIGURE; } return TRUE; } @@ -1322,13 +1330,18 @@ static BOOL pathdrv_PolyPolyline( PHYSDEV dev, const POINT* pts, const DWORD* co UINT poly, count; BYTE *type; - for (poly = count = 0; poly < polylines; poly++) count += counts[poly]; + if (!polylines) return FALSE; + for (poly = count = 0; poly < polylines; poly++) + { + if (counts[poly] < 2) return FALSE; + count += counts[poly]; + } type = add_log_points( physdev, pts, count, PT_LINETO ); if (!type) return FALSE; /* make the first point of each polyline a PT_MOVETO */ - for (poly = 0; poly < polylines; poly++, type += counts[poly]) *type = PT_MOVETO; + for (poly = 0; poly < polylines; type += counts[poly++]) *type = PT_MOVETO; return TRUE; }

1 0

Julian Rüger : German translation for release 1.8.3
by Jeremy Newman June 22, 2016

June 22, 2016

Module: website Branch: master Commit: 6b5343ba2560151412c55a9ce04ce5620dbc3c0a URL: http://source.winehq.org/git/website.git/?a=commit;h=6b5343ba2560151412c55a… Author: Julian Rüger <jr98(a)gmx.net> Date: Tue Jun 21 23:58:45 2016 +0200 German translation for release 1.8.3 Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/de/2016061601.xml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/news/de/2016061601.xml b/news/de/2016061601.xml new file mode 100644 index 0000000..c401ee3 --- /dev/null +++ b/news/de/2016061601.xml @@ -0,0 +1,14 @@ +<news> +<date>16. Juni 2016</date> +<title>Wine 1.8.3 freigegeben</title> +<body> + Die Wartungsversion 1.8.3 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.8.3">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Diverse Fehlerkorrekturen.</li> + <li>Viele NVidia-Karten wurden zur GPU-Beschreibungstabelle hinzugefügt.</li> + <li>Updates der National-Language-Supportdateien.</li> +</ul> +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/1.8/wine-1.8.3.tar.bz2">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Alistair Leslie-Hughes : d3dx9_24: Share the source with d3dx9_36.
by Alexandre Julliard June 21, 2016

June 21, 2016

Module: wine Branch: master Commit: 0933770741633a768236fb03294df0093ef51041 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0933770741633a768236fb032… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sun Jun 19 06:02:12 2016 +0000 d3dx9_24: Share the source with d3dx9_36. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_24/Makefile.in | 22 +- dlls/d3dx9_24/d3dx9_24.spec | 632 +++++++++++++++++++++--------------------- dlls/d3dx9_24/d3dx9_24_main.c | 2 +- tools/make_specfiles | 1 - 4 files changed, 337 insertions(+), 320 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0933770741633a768236f…

1 0