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

Alexandre Julliard : Wine release 1.9.13
by Alexandre Julliard June 24, 2016

June 24, 2016

Module: website Branch: master Commit: 0947c432f98f3d74ec401dce1caea34d7015d17a URL: http://source.winehq.org/git/website.git/?a=commit;h=0947c432f98f3d74ec401d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 24 22:33:54 2016 +0900 Wine release 1.9.13 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2016062401.xml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/news/en/2016062401.xml b/news/en/2016062401.xml new file mode 100644 index 0000000..b650b6e --- /dev/null +++ b/news/en/2016062401.xml @@ -0,0 +1,18 @@ +<news> +<date>June 24, 2016</date> +<title>Wine 1.9.13 Released</title> +<body> + The Wine development release 1.9.13 is now available. + <a href="{$root}/announce/1.9.13">What's new</a> in this release: +<ul> + <li>New version of the Gecko engine based on Firefox 47.</li> + <li>More Shader Model 5 support in Direct3D.</li> + <li>Unicode data updated to Unicode 9.0.0.</li> + <li>Improvements to GDI paths and metafiles.</li> + <li>More progress towards the Direct3D command stream.</li> + <li>Joystick support improvements on Mac OS X.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/1.9/wine-1.9.13.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Józef Kucia : d3d11: Implement d3d11_immediate_context_IAGetVertexBuffers().
by Alexandre Julliard June 24, 2016

June 24, 2016

Module: wine Branch: master Commit: 636ad1fd8434309d80a43c9fde5651f250afbc2f URL: http://source.winehq.org/git/wine.git/?a=commit;h=636ad1fd8434309d80a43c9fd… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jun 24 11:45:58 2016 +0200 d3d11: Implement d3d11_immediate_context_IAGetVertexBuffers(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 13d079e..dfdd0d2 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -1337,8 +1337,32 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_IAGetInputLayout(ID3D11Dev static void STDMETHODCALLTYPE d3d11_immediate_context_IAGetVertexBuffers(ID3D11DeviceContext *iface, UINT start_slot, UINT buffer_count, ID3D11Buffer **buffers, UINT *strides, UINT *offsets) { - FIXME("iface %p, start_slot %u, buffer_count %u, buffers %p, strides %p, offsets %p stub!\n", + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + unsigned int i; + + TRACE("iface %p, start_slot %u, buffer_count %u, buffers %p, strides %p, offsets %p.\n", iface, start_slot, buffer_count, buffers, strides, offsets); + + wined3d_mutex_lock(); + for (i = 0; i < buffer_count; ++i) + { + struct wined3d_buffer *wined3d_buffer; + struct d3d_buffer *buffer_impl; + + if (FAILED(wined3d_device_get_stream_source(device->wined3d_device, start_slot + i, + &wined3d_buffer, &offsets[i], &strides[i]))) + ERR("Failed to get vertex buffer %u.\n", start_slot + i); + + if (!wined3d_buffer) + { + buffers[i] = NULL; + continue; + } + + buffer_impl = wined3d_buffer_get_parent(wined3d_buffer); + ID3D11Buffer_AddRef(buffers[i] = &buffer_impl->ID3D11Buffer_iface); + } + wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d11_immediate_context_IAGetIndexBuffer(ID3D11DeviceContext *iface,

1 0

Józef Kucia : d3d11: Implement d3d11_immediate_context_IAGetIndexBuffer().
by Alexandre Julliard June 24, 2016

June 24, 2016

Module: wine Branch: master Commit: 9a686f666a8fba523085bdbcb587b1c94a58d3c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a686f666a8fba523085bdbcb… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jun 24 11:45:57 2016 +0200 d3d11: Implement d3d11_immediate_context_IAGetIndexBuffer(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 0fc8eb5..13d079e 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -1344,7 +1344,26 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_IAGetVertexBuffers(ID3D11D static void STDMETHODCALLTYPE d3d11_immediate_context_IAGetIndexBuffer(ID3D11DeviceContext *iface, ID3D11Buffer **buffer, DXGI_FORMAT *format, UINT *offset) { - FIXME("iface %p, buffer %p, format %p, offset %p stub!\n", iface, buffer, format, offset); + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + enum wined3d_format_id wined3d_format; + struct wined3d_buffer *wined3d_buffer; + struct d3d_buffer *buffer_impl; + + TRACE("iface %p, buffer %p, format %p, offset %p.\n", iface, buffer, format, offset); + + wined3d_mutex_lock(); + wined3d_buffer = wined3d_device_get_index_buffer(device->wined3d_device, &wined3d_format, offset); + *format = dxgi_format_from_wined3dformat(wined3d_format); + if (!wined3d_buffer) + { + wined3d_mutex_unlock(); + *buffer = NULL; + return; + } + + buffer_impl = wined3d_buffer_get_parent(wined3d_buffer); + wined3d_mutex_unlock(); + ID3D11Buffer_AddRef(*buffer = &buffer_impl->ID3D11Buffer_iface); } static void STDMETHODCALLTYPE d3d11_immediate_context_GSGetConstantBuffers(ID3D11DeviceContext *iface,

1 0

Erich E. Hoover : msvcrt: Add support for _fstat32i64.
by Alexandre Julliard June 24, 2016

June 24, 2016

Module: wine Branch: master Commit: 6afda19f489966ffcb52edf628dba81993f81038 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6afda19f489966ffcb52edf62… Author: Erich E. Hoover <erich.e.hoover(a)wine-staging.com> Date: Thu May 12 14:37:24 2016 -0600 msvcrt: Add support for _fstat32i64. Signed-off-by: Erich E. Hoover <erich.e.hoover(a)wine-staging.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-crt-filesystem-l1-1-0.spec | 2 +- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/file.c | 14 ++++++++++++++ dlls/ucrtbase/ucrtbase.spec | 2 +- 9 files changed, 22 insertions(+), 8 deletions(-) diff --git a/dlls/api-ms-win-crt-filesystem-l1-1-0/api-ms-win-crt-filesystem-l1-1-0.spec b/dlls/api-ms-win-crt-filesystem-l1-1-0/api-ms-win-crt-filesystem-l1-1-0.spec index aff4bba..dd881aa 100644 --- a/dlls/api-ms-win-crt-filesystem-l1-1-0/api-ms-win-crt-filesystem-l1-1-0.spec +++ b/dlls/api-ms-win-crt-filesystem-l1-1-0/api-ms-win-crt-filesystem-l1-1-0.spec @@ -13,7 +13,7 @@ @ cdecl _findnext64(long ptr) ucrtbase._findnext64 @ cdecl _findnext64i32(long ptr) ucrtbase._findnext64i32 @ cdecl _fstat32(long ptr) ucrtbase._fstat32 -@ stub _fstat32i64 +@ cdecl _fstat32i64(long ptr) ucrtbase._fstat32i64 @ cdecl _fstat64(long ptr) ucrtbase._fstat64 @ cdecl _fstat64i32(long ptr) ucrtbase._fstat64i32 @ cdecl _fullpath(ptr str long) ucrtbase._fullpath diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 5fae918..fa09827 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -848,7 +848,7 @@ @ cdecl _fseeki64_nolock(ptr int64 long) MSVCRT__fseeki64_nolock @ cdecl _fsopen(str str long) MSVCRT__fsopen @ cdecl _fstat32(long ptr) MSVCRT__fstat32 -@ stub _fstat32i64 +@ cdecl _fstat32i64(long ptr) MSVCRT__fstat32i64 @ cdecl _fstat64(long ptr) MSVCRT__fstat64 @ cdecl _fstat64i32(long ptr) MSVCRT__fstat64i32 @ cdecl _ftell_nolock(ptr) MSVCRT__ftell_nolock diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 38fdfe9..e0ab69a 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1195,7 +1195,7 @@ @ cdecl _fseeki64_nolock(ptr int64 long) MSVCRT__fseeki64_nolock @ cdecl _fsopen(str str long) MSVCRT__fsopen @ cdecl _fstat32(long ptr) MSVCRT__fstat32 -@ stub _fstat32i64 +@ cdecl _fstat32i64(long ptr) MSVCRT__fstat32i64 @ cdecl _fstat64(long ptr) MSVCRT__fstat64 @ cdecl _fstat64i32(long ptr) MSVCRT__fstat64i32 @ cdecl _ftell_nolock(ptr) MSVCRT__ftell_nolock diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 4ef7358..86f466b 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1195,7 +1195,7 @@ @ cdecl _fseeki64_nolock(ptr int64 long) MSVCRT__fseeki64_nolock @ cdecl _fsopen(str str long) MSVCRT__fsopen @ cdecl _fstat32(long ptr) MSVCRT__fstat32 -@ stub _fstat32i64 +@ cdecl _fstat32i64(long ptr) MSVCRT__fstat32i64 @ cdecl _fstat64(long ptr) MSVCRT__fstat64 @ cdecl _fstat64i32(long ptr) MSVCRT__fstat64i32 @ cdecl _ftell_nolock(ptr) MSVCRT__ftell_nolock diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 893c099..e498fc7 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1123,7 +1123,7 @@ @ cdecl _fseeki64_nolock(ptr int64 long) msvcr120._fseeki64_nolock @ cdecl _fsopen(str str long) msvcr120._fsopen @ cdecl _fstat32(long ptr) msvcr120._fstat32 -@ stub _fstat32i64 +@ cdecl _fstat32i64(long ptr) msvcr120._fstat32i64 @ cdecl _fstat64(long ptr) msvcr120._fstat64 @ cdecl _fstat64i32(long ptr) msvcr120._fstat64i32 @ cdecl _ftell_nolock(ptr) msvcr120._ftell_nolock diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 1c1dc1a..c0edc8f 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -514,7 +514,7 @@ @ cdecl _fseeki64_nolock(ptr int64 long) MSVCRT__fseeki64_nolock @ cdecl _fsopen(str str long) MSVCRT__fsopen @ cdecl _fstat32(long ptr) MSVCRT__fstat32 -@ stub _fstat32i64 +@ cdecl _fstat32i64(long ptr) MSVCRT__fstat32i64 @ cdecl _fstat64(long ptr) MSVCRT__fstat64 @ cdecl _fstat64i32(long ptr) MSVCRT__fstat64i32 @ cdecl _ftell_nolock(ptr) MSVCRT__ftell_nolock diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 13d1bab..bf5ab57 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -497,7 +497,7 @@ @ cdecl _fseeki64_nolock(ptr int64 long) MSVCRT__fseeki64_nolock @ cdecl _fsopen(str str long) MSVCRT__fsopen @ cdecl _fstat32(long ptr) MSVCRT__fstat32 -@ stub _fstat32i64 +@ cdecl _fstat32i64(long ptr) MSVCRT__fstat32i64 @ cdecl _fstat64(long ptr) MSVCRT__fstat64 @ cdecl _fstat64i32(long ptr) MSVCRT__fstat64i32 @ cdecl _ftell_nolock(ptr) MSVCRT__ftell_nolock diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index c4f89b1..5a2f1e6 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -1789,6 +1789,20 @@ int CDECL MSVCRT__fstat32(int fd, struct MSVCRT__stat32* buf) } /********************************************************************* + * _fstat32i64 (MSVCR80.@) + */ +int CDECL MSVCRT__fstat32i64(int fd, struct MSVCRT__stat32i64* buf) +{ + int ret; + struct MSVCRT__stat64 buf64; + + ret = MSVCRT__fstat64(fd, &buf64); + if (!ret) + msvcrt_stat64_to_stat32i64(&buf64, buf); + return ret; +} + +/********************************************************************* * _fstat64i32 (MSVCR80.@) */ int CDECL MSVCRT__fstat64i32(int fd, struct MSVCRT__stat64i32* buf) diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index ecfb612..c03a434 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -340,7 +340,7 @@ @ cdecl _fseeki64_nolock(ptr int64 long) MSVCRT__fseeki64_nolock @ cdecl _fsopen(str str long) MSVCRT__fsopen @ cdecl _fstat32(long ptr) MSVCRT__fstat32 -@ stub _fstat32i64 +@ cdecl _fstat32i64(long ptr) MSVCRT__fstat32i64 @ cdecl _fstat64(long ptr) MSVCRT__fstat64 @ cdecl _fstat64i32(long ptr) MSVCRT__fstat64i32 @ cdecl _ftell_nolock(ptr) MSVCRT__ftell_nolock

1 0

Alexandre Julliard : gdi32: Add a helper function to reverse an array of points in paths.
by Alexandre Julliard June 24, 2016

June 24, 2016

Module: wine Branch: master Commit: 57d200903568bb2812f171cc1f0950a3ba4b8437 URL: http://source.winehq.org/git/wine.git/?a=commit;h=57d200903568bb2812f171cc1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 24 13:21:47 2016 +0900 gdi32: Add a helper function to reverse an array of points in paths. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/path.c | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/dlls/gdi32/path.c b/dlls/gdi32/path.c index 9666ea3..59d46c3 100644 --- a/dlls/gdi32/path.c +++ b/dlls/gdi32/path.c @@ -276,6 +276,18 @@ static BYTE *add_points( struct gdi_path *path, const POINT *points, DWORD count return ret; } +/* reverse the order of an array of points */ +static void reverse_points( POINT *points, UINT count ) +{ + UINT i; + for (i = 0; i < count / 2; i++) + { + POINT pt = points[i]; + points[i] = points[count - i - 1]; + points[count - i - 1] = pt; + } +} + /* start a new path stroke if necessary */ static BOOL start_new_stroke( struct path_physdev *physdev ) { @@ -1570,6 +1582,7 @@ static struct gdi_path *PATH_WidenPath(DC *dc) INT i, j, numStrokes, penWidth, penWidthIn, penWidthOut, size, penStyle; struct gdi_path *flat_path, *pNewPath, **pStrokes = NULL, *pUpPath, *pDownPath; EXTLOGPEN *elp; + BYTE *type; DWORD obj_type, joint, endcap, penType; size = GetObjectW( dc->hPen, 0, NULL ); @@ -1828,18 +1841,11 @@ static struct gdi_path *PATH_WidenPath(DC *dc) } } } - for(j = 0; j < pUpPath->count; j++) { - POINT pt; - pt.x = pUpPath->points[j].x; - pt.y = pUpPath->points[j].y; - PATH_AddEntry(pNewPath, &pt, (j == 0 ? PT_MOVETO : PT_LINETO)); - } - for(j = 0; j < pDownPath->count; j++) { - POINT pt; - pt.x = pDownPath->points[pDownPath->count - j - 1].x; - pt.y = pDownPath->points[pDownPath->count - j - 1].y; - PATH_AddEntry(pNewPath, &pt, ( (j == 0 && (pStrokes[i]->flags[pStrokes[i]->count - 1] & PT_CLOSEFIGURE)) ? PT_MOVETO : PT_LINETO)); - } + type = add_points( pNewPath, pUpPath->points, pUpPath->count, PT_LINETO ); + type[0] = PT_MOVETO; + reverse_points( pDownPath->points, pDownPath->count ); + type = add_points( pNewPath, pDownPath->points, pDownPath->count, PT_LINETO ); + if (pStrokes[i]->flags[pStrokes[i]->count - 1] & PT_CLOSEFIGURE) type[0] = PT_MOVETO; free_gdi_path( pStrokes[i] ); free_gdi_path( pUpPath );

1 0

Tag wine-1.9.13 : Alexandre Julliard : Release 1.9.13
by Alexandre Julliard June 24, 2016

June 24, 2016

Module: wine Branch: refs/tags/wine-1.9.13 Tag: 40dab850e2651ea457a460db585962176de0bf75 URL: http://source.winehq.org/git/wine.git/?a=tag;h=40dab850e2651ea457a460db5859… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 24 22:31:52 2016 +0900 Release 1.9.13

1 0

Alexandre Julliard : Release 1.9.13.
by Alexandre Julliard June 24, 2016

June 24, 2016

Module: wine Branch: master Commit: af6f8ca4136ad937f8743494a8d3cea0b52d71cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=af6f8ca4136ad937f8743494a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 24 22:31:52 2016 +0900 Release 1.9.13. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 746 +++++++++++++++++++++++++++++++++++--------------------------- AUTHORS | 1 + VERSION | 2 +- configure | 18 +- 4 files changed, 430 insertions(+), 337 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=af6f8ca4136ad937f8743…

1 0

Michael Stefaniuc : comctl32: Avoid using CopyRect() on RECT structs.
by Alexandre Julliard June 24, 2016

June 24, 2016

Module: wine Branch: master Commit: 65a2e59a78cd35af8df4d0e8cde0755e696a9924 URL: http://source.winehq.org/git/wine.git/?a=commit;h=65a2e59a78cd35af8df4d0e8c… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jun 24 13:11:04 2016 +0200 comctl32: Avoid using CopyRect() on RECT structs. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/draglist.c | 2 +- dlls/comctl32/listview.c | 5 ++--- dlls/comctl32/progress.c | 2 +- dlls/comctl32/propsheet.c | 2 +- dlls/comctl32/theme_combo.c | 5 ++--- dlls/comctl32/toolbar.c | 12 ++++++------ 6 files changed, 13 insertions(+), 15 deletions(-) diff --git a/dlls/comctl32/draglist.c b/dlls/comctl32/draglist.c index 2097edb..ed52e5e 100644 --- a/dlls/comctl32/draglist.c +++ b/dlls/comctl32/draglist.c @@ -264,7 +264,7 @@ VOID WINAPI DrawInsert (HWND hwndParent, HWND hwndLB, INT nItem) RedrawWindow(hwndParent, &data->last_drag_icon_rect, NULL, RDW_INTERNALPAINT | RDW_ERASE | RDW_INVALIDATE | RDW_UPDATENOW); - CopyRect(&data->last_drag_icon_rect, &rcDragIcon); + data->last_drag_icon_rect = rcDragIcon; if (nItem >= 0) { diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 784ca7b..cfdb7de 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -3856,9 +3856,8 @@ static void LISTVIEW_MarqueeHighlight(LISTVIEW_INFO *infoPtr, const POINT *coord iterator_frameditems_absolute(&old_elems, infoPtr, &infoPtr->marqueeRect); - CopyRect(&infoPtr->marqueeRect, &rect); - - CopyRect(&infoPtr->marqueeDrawRect, &rect); + infoPtr->marqueeRect = rect; + infoPtr->marqueeDrawRect = rect; OffsetRect(&infoPtr->marqueeDrawRect, offset->x, offset->y); iterator_frameditems_absolute(&new_elems, infoPtr, &infoPtr->marqueeRect); diff --git a/dlls/comctl32/progress.c b/dlls/comctl32/progress.c index 98c803c..4638ffc 100644 --- a/dlls/comctl32/progress.c +++ b/dlls/comctl32/progress.c @@ -355,7 +355,7 @@ static LRESULT PROGRESS_Draw (PROGRESS_INFO *infoPtr, HDC hdc) DrawThemeParentBackground (infoPtr->Self, hdc, NULL); DrawThemeBackground (pdi.theme, hdc, part, 0, &pdi.rect, NULL); SelectClipRgn (hdc, NULL); - CopyRect (&pdi.rect, &cntRect); + pdi.rect = cntRect; } /* compute some drawing parameters */ diff --git a/dlls/comctl32/propsheet.c b/dlls/comctl32/propsheet.c index 3b56853..8600844 100644 --- a/dlls/comctl32/propsheet.c +++ b/dlls/comctl32/propsheet.c @@ -3219,7 +3219,7 @@ static LRESULT PROPSHEET_Paint(HWND hwnd, HDC hdcParam) if (bm.bmWidth < r.right || bm.bmHeight < r.bottom) { hbr = CreateSolidBrush(GetPixel(hdcSrc, 0, 0)); - CopyRect(&r, &rzone); + r = rzone; if (bm.bmWidth < r.right) { r.left = bm.bmWidth; diff --git a/dlls/comctl32/theme_combo.c b/dlls/comctl32/theme_combo.c index 9482a3b..3ee1d92 100644 --- a/dlls/comctl32/theme_combo.c +++ b/dlls/comctl32/theme_combo.c @@ -80,7 +80,7 @@ static void paint_text (HWND hwnd, HDC hdc, DWORD dwStyle, const COMBOBOXINFO *c /* * Give ourselves some space. */ - CopyRect (&rectEdit, &cbi->rcItem); + rectEdit = cbi->rcItem; InflateRect( &rectEdit, -1, -1 ); if(dwStyle & (CBS_OWNERDRAWFIXED | CBS_OWNERDRAWVARIABLE)) @@ -187,8 +187,7 @@ static LRESULT paint (HTHEME theme, HWND hwnd, HDC hParamDC, ULONG state) GetClientRect (hwnd, &frameRect); else { - CopyRect (&frameRect, &cbi.rcItem); - + frameRect = cbi.rcItem; InflateRect(&frameRect, EDIT_CONTROL_PADDING + COMBO_XBORDERSIZE, EDIT_CONTROL_PADDING + COMBO_YBORDERSIZE); diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index 9307fd4..3b32e91 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -876,7 +876,7 @@ TOOLBAR_DrawButton (const TOOLBAR_INFO *infoPtr, TBUTTON_INFO *btnPtr, HDC hdc, HTHEME theme = GetWindowTheme (infoPtr->hwndSelf); rc = btnPtr->rect; - CopyRect (&rcArrow, &rc); + rcArrow = rc; /* separator - doesn't send NM_CUSTOMDRAW */ if (btnPtr->fsStyle & BTNS_SEP) { @@ -929,8 +929,8 @@ TOOLBAR_DrawButton (const TOOLBAR_INFO *infoPtr, TBUTTON_INFO *btnPtr, HDC hdc, /* copy text & bitmap rects after adjusting for drop-down arrow * so that text & bitmap is centered in the rectangle not containing * the arrow */ - CopyRect(&rcText, &rc); - CopyRect(&rcBitmap, &rc); + rcText = rc; + rcBitmap = rc; /* Center the bitmap horizontally and vertically */ if (dwStyle & TBSTYLE_LIST) @@ -2648,9 +2648,9 @@ TOOLBAR_CustomizeDialogProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) lpdis->rcItem.right, lpdis->rcItem.bottom); /* calculate button and text rectangles */ - CopyRect (&rcButton, &lpdis->rcItem); + rcButton = lpdis->rcItem; InflateRect (&rcButton, -1, -1); - CopyRect (&rcText, &rcButton); + rcText = rcButton; rcButton.right = rcButton.left + custInfo->tbInfo->nBitmapWidth + 6; rcText.left = rcButton.right + 2; @@ -5550,7 +5550,7 @@ TOOLBAR_LButtonDown (TOOLBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam) RECT arrowRect; infoPtr->nOldHit = nHit; - CopyRect(&arrowRect, &btnPtr->rect); + arrowRect = btnPtr->rect; arrowRect.left = max(btnPtr->rect.left, btnPtr->rect.right - DDARROW_WIDTH); /* for EX_DRAWDDARROWS style, click must be in the drop-down arrow rect */

1 0

Józef Kucia : d3d10core/tests: Fix test table in test_create_rendertarget_view().
by Alexandre Julliard June 24, 2016

June 24, 2016

Module: wine Branch: master Commit: e201dcac87782b9edb4258a2fd06379457683a8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e201dcac87782b9edb4258a2f… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jun 24 11:46:05 2016 +0200 d3d10core/tests: Fix test table in test_create_rendertarget_view(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/device.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 1f70e22..24b7b50 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -1887,8 +1887,8 @@ static void test_create_rendertarget_view(void) {{10, 1, RGBA8_UNORM}, {FMT_UNKNOWN, TEX_2D, 0}, {RGBA8_UNORM, TEX_2D, 0}}, {{10, 1, RGBA8_UNORM}, {FMT_UNKNOWN, TEX_2D, 1}, {RGBA8_UNORM, TEX_2D, 1}}, {{10, 1, RGBA8_UNORM}, {FMT_UNKNOWN, TEX_2D, 9}, {RGBA8_UNORM, TEX_2D, 9}}, - {{ 1, 1, RGBA8_TL}, {RGBA8_UNORM, TEX_2D, 0, -1}, {RGBA8_UNORM, TEX_2D, 0}}, - {{10, 1, RGBA8_TL}, {RGBA8_UNORM, TEX_2D, 0, -1}, {RGBA8_UNORM, TEX_2D, 0}}, + {{ 1, 1, RGBA8_TL}, {RGBA8_UNORM, TEX_2D, 0}, {RGBA8_UNORM, TEX_2D, 0}}, + {{10, 1, RGBA8_TL}, {RGBA8_UNORM, TEX_2D, 0}, {RGBA8_UNORM, TEX_2D, 0}}, {{ 1, 4, RGBA8_UNORM}, {0}, {RGBA8_UNORM, TEX_2D_ARRAY, 0, 0, 4}}, {{10, 4, RGBA8_UNORM}, {0}, {RGBA8_UNORM, TEX_2D_ARRAY, 0, 0, 4}}, {{10, 4, RGBA8_UNORM}, {FMT_UNKNOWN, TEX_2D_ARRAY, 0, 0, -1}, {RGBA8_UNORM, TEX_2D_ARRAY, 0, 0, 4}},

1 0

Józef Kucia : wined3d: Introduce wined3d_unordered_access_view.
by Alexandre Julliard June 24, 2016

June 24, 2016

Module: wine Branch: master Commit: 2f47a73c37e1549100e3dd69a6e567d0b58f5314 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f47a73c37e1549100e3dd69a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jun 24 11:46:02 2016 +0200 wined3d: Introduce wined3d_unordered_access_view. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/view.c | 106 +++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/wined3d.spec | 5 ++ dlls/wined3d/wined3d_private.h | 11 +++++ include/wine/wined3d.h | 28 +++++++++++ 4 files changed, 150 insertions(+) diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index e9e62d1..e39f6f8 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -415,3 +415,109 @@ void wined3d_shader_resource_view_bind(struct wined3d_shader_resource_view *view texture = wined3d_texture_from_resource(view->resource); wined3d_texture_bind(texture, context, FALSE); } + +ULONG CDECL wined3d_unordered_access_view_incref(struct wined3d_unordered_access_view *view) +{ + ULONG refcount = InterlockedIncrement(&view->refcount); + + TRACE("%p increasing refcount to %u.\n", view, refcount); + + return refcount; +} + +static void wined3d_unordered_access_view_destroy_object(void *object) +{ + HeapFree(GetProcessHeap(), 0, object); +} + +ULONG CDECL wined3d_unordered_access_view_decref(struct wined3d_unordered_access_view *view) +{ + ULONG refcount = InterlockedDecrement(&view->refcount); + + TRACE("%p decreasing refcount to %u.\n", view, refcount); + + if (!refcount) + { + struct wined3d_device *device = view->resource->device; + + /* Call wined3d_object_destroyed() before releasing the resource, + * since releasing the resource may end up destroying the parent. */ + view->parent_ops->wined3d_object_destroyed(view->parent); + wined3d_resource_decref(view->resource); + wined3d_cs_emit_destroy_object(device->cs, wined3d_unordered_access_view_destroy_object, view); + } + + return refcount; +} + +void * CDECL wined3d_unordered_access_view_get_parent(const struct wined3d_unordered_access_view *view) +{ + TRACE("view %p.\n", view); + + return view->parent; +} + +static HRESULT wined3d_unordered_access_view_init(struct wined3d_unordered_access_view *view, + const struct wined3d_unordered_access_view_desc *desc, struct wined3d_resource *resource, + void *parent, const struct wined3d_parent_ops *parent_ops) +{ + const struct wined3d_gl_info *gl_info = &resource->device->adapter->gl_info; + + view->refcount = 1; + view->parent = parent; + view->parent_ops = parent_ops; + + view->format = wined3d_get_format(gl_info, desc->format_id); + + if (wined3d_format_is_typeless(view->format)) + { + WARN("Trying to create view for typeless format %s.\n", debug_d3dformat(view->format->id)); + return E_INVALIDARG; + } + + if (resource->type != WINED3D_RTYPE_BUFFER) + { + struct wined3d_texture *texture = texture_from_resource(resource); + unsigned int depth_or_layer_count; + + if (resource->type == WINED3D_RTYPE_TEXTURE_3D) + depth_or_layer_count = wined3d_texture_get_level_depth(texture, desc->u.texture.level_idx); + else + depth_or_layer_count = texture->layer_count; + + if (desc->u.texture.level_idx >= texture->level_count + || desc->u.texture.layer_idx >= depth_or_layer_count + || !desc->u.texture.layer_count + || desc->u.texture.layer_count > depth_or_layer_count - desc->u.texture.layer_idx) + return E_INVALIDARG; + } + wined3d_resource_incref(view->resource = resource); + + return WINED3D_OK; +} + +HRESULT CDECL wined3d_unordered_access_view_create(const struct wined3d_unordered_access_view_desc *desc, + struct wined3d_resource *resource, void *parent, const struct wined3d_parent_ops *parent_ops, + struct wined3d_unordered_access_view **view) +{ + struct wined3d_unordered_access_view *object; + HRESULT hr; + + TRACE("desc %p, resource %p, parent %p, parent_ops %p, view %p.\n", + desc, resource, parent, parent_ops, view); + + if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) + return E_OUTOFMEMORY; + + if (FAILED(hr = wined3d_unordered_access_view_init(object, desc, resource, parent, parent_ops))) + { + HeapFree(GetProcessHeap(), 0, object); + WARN("Failed to initialise view, hr %#x.\n", hr); + return hr; + } + + TRACE("Created unordered access view %p.\n", object); + *view = object; + + return WINED3D_OK; +} diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 8d1d8dc..87fdb81 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -267,6 +267,11 @@ @ cdecl wined3d_texture_update_desc(ptr long long long long long ptr long) @ cdecl wined3d_texture_update_overlay(ptr long ptr ptr long ptr long) +@ cdecl wined3d_unordered_access_view_create(ptr ptr ptr ptr ptr) +@ cdecl wined3d_unordered_access_view_decref(ptr) +@ cdecl wined3d_unordered_access_view_get_parent(ptr) +@ cdecl wined3d_unordered_access_view_incref(ptr) + @ cdecl wined3d_vertex_declaration_create(ptr ptr long ptr ptr ptr) @ cdecl wined3d_vertex_declaration_create_from_fvf(ptr long ptr ptr ptr) @ cdecl wined3d_vertex_declaration_decref(ptr) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 8fb6f4d..b82ec3d 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3145,6 +3145,17 @@ struct wined3d_shader_resource_view void wined3d_shader_resource_view_bind(struct wined3d_shader_resource_view *view, struct wined3d_context *context) DECLSPEC_HIDDEN; +struct wined3d_unordered_access_view +{ + LONG refcount; + + struct wined3d_resource *resource; + void *parent; + const struct wined3d_parent_ops *parent_ops; + + const struct wined3d_format *format; +}; + struct wined3d_swapchain_ops { void (*swapchain_present)(struct wined3d_swapchain *swapchain, diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index da102c6..1c0a61b 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -1970,6 +1970,26 @@ struct wined3d_shader_resource_view_desc } u; }; +struct wined3d_unordered_access_view_desc +{ + enum wined3d_format_id format_id; + unsigned int flags; + union + { + struct + { + unsigned int start_idx; + unsigned int count; + } buffer; + struct + { + unsigned int level_idx; + unsigned int layer_idx; + unsigned int layer_count; + } texture; + } u; +}; + struct wined3d_output_desc { WCHAR device_name[CCHDEVICENAME]; @@ -1997,6 +2017,7 @@ struct wined3d_shader_resource_view; struct wined3d_stateblock; struct wined3d_swapchain; struct wined3d_texture; +struct wined3d_unordered_access_view; struct wined3d_vertex_declaration; struct wined3d_device_parent @@ -2533,6 +2554,13 @@ HRESULT __cdecl wined3d_texture_update_overlay(struct wined3d_texture *texture, const RECT *src_rect, struct wined3d_texture *dst_texture, unsigned int dst_sub_resource_idx, const RECT *dst_rect, DWORD flags); +HRESULT __cdecl wined3d_unordered_access_view_create(const struct wined3d_unordered_access_view_desc *desc, + struct wined3d_resource *resource, void *parent, const struct wined3d_parent_ops *parent_ops, + struct wined3d_unordered_access_view **view); +ULONG __cdecl wined3d_unordered_access_view_decref(struct wined3d_unordered_access_view *view); +void * __cdecl wined3d_unordered_access_view_get_parent(const struct wined3d_unordered_access_view *view); +ULONG __cdecl wined3d_unordered_access_view_incref(struct wined3d_unordered_access_view *view); + HRESULT __cdecl wined3d_vertex_declaration_create(struct wined3d_device *device, const struct wined3d_vertex_element *elements, UINT element_count, void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_vertex_declaration **declaration);

1 0