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

Łukasz Wojniłowicz : Polish translation for release 1.9.14
by Jeremy Newman July 11, 2016

July 11, 2016

Module: website Branch: master Commit: f93f05fcf99c4c22f4be272baa57d7279fa5725b URL: http://source.winehq.org/git/website.git/?a=commit;h=f93f05fcf99c4c22f4be27… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Fri Jul 8 18:48:16 2016 +0200 Polish translation for release 1.9.14 Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/pl/2016070901.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/pl/2016070901.xml b/news/pl/2016070901.xml new file mode 100644 index 0000000..076a75c --- /dev/null +++ b/news/pl/2016070901.xml @@ -0,0 +1,16 @@ +<news> +<date>Lipiec 9, 2016</date> +<title>Wydano Wine 1.9.14</title> +<body> + Wydanie rozwojowe Wine 1.9.14 jest już dostępne. + <a href="{$root}/announce/1.9.14">Co nowego</a> w tym wydaniu: +<ul> + <li>Szersza obsługa Modelu Cieniowania 5 w Direct3D.</li> + <li>Szersza obsługa zapisu w Usługach Sieciowych.</li> + <li>Poprawa wydajności w GDI.</li> + <li>Postęp w strumieniu poleceń Direct3D.</li> + <li>Rozmaite poprawki błędów.</li> +</ul> +Źródło jest <a href="//dl.winehq.org/wine/source/1.9/wine-1.9.14.tar.bz2">już dostępne</a>. +Paczki binarne są w trakcie budowy i ukażą się wkrótce w przeznaczonych dla nich <a href="{$root}/download">pobieralniach</a>. +</body></news>

1 0

Łukasz Wojniłowicz : Polish translation for release 1.9.13
by Jeremy Newman July 11, 2016

July 11, 2016

Module: website Branch: master Commit: 9469b7dc32739f9ee415b18ddc618ccaf1750ea5 URL: http://source.winehq.org/git/website.git/?a=commit;h=9469b7dc32739f9ee415b1… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Fri Jul 8 18:48:15 2016 +0200 Polish translation for release 1.9.13 Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/pl/2016062401.xml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/news/pl/2016062401.xml b/news/pl/2016062401.xml new file mode 100644 index 0000000..18bdd2f --- /dev/null +++ b/news/pl/2016062401.xml @@ -0,0 +1,18 @@ +<news> +<date>Czerwiec 24, 2016</date> +<title>Wydano Wine 1.9.13</title> +<body> + Wydanie rozwojowe Wine 1.9.13 jest już dostępne. + <a href="{$root}/announce/1.9.13">Co nowego</a> w tym wydaniu: +<ul> + <li>Nowa wersja silnika Gecko oparta na Firefoksie 47.</li> + <li>Szersza obsługa Modelu Cieniowania 5 w Direct3D.</li> + <li>Uaktualniono dane Unicode do Unicode 9.0.0.</li> + <li>Ulepszenia do ścieżek GDI i plików meta.</li> + <li>Postęp w strumieniu poleceń Direct3D.</li> + <li>Ulpeszenia w obsłudze Joystick'a na Mac OS X.</li> + <li>Rozmaite poprawki błędów.</li> +</ul> +Źródło jest <a href="//dl.winehq.org/wine/source/1.9/wine-1.9.13.tar.bz2">już dostępne</a>. +Paczki binarne są w trakcie budowy i ukażą się wkrótce w przeznaczonych dla nich <a href="{$root}/download">pobieralniach</a>. +</body></news>

1 0

Henri Verbeet : d3d10: Validate offsets and size in parse_fx10_type() (AFL ).
by Alexandre Julliard July 10, 2016

July 10, 2016

Module: wine Branch: master Commit: 1bcc7ce75f64f2894de43379674bc5c53c52bb3a URL: http://source.winehq.org/git/wine.git/?a=commit;h=1bcc7ce75f64f2894de433796… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Jul 10 15:09:20 2016 +0200 d3d10: Validate offsets and size in parse_fx10_type() (AFL). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/effect.c | 40 +++++++++++++++++++++++++++++++++++----- 1 file changed, 35 insertions(+), 5 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 4736fa9..4760489 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -598,11 +598,18 @@ static D3D10_SHADER_VARIABLE_TYPE d3d10_variable_type(DWORD t, BOOL is_object) static HRESULT parse_fx10_type(const char *data, size_t data_size, DWORD offset, struct d3d10_effect_type *t) { - const char *ptr = data + offset; + const char *ptr; DWORD unknown0; DWORD typeinfo; unsigned int i; + if (offset >= data_size || !require_space(offset, 6, sizeof(DWORD), data_size)) + { + WARN("Invalid offset %#x (data size %#lx).\n", offset, (long)data_size); + return E_FAIL; + } + + ptr = data + offset; read_dword(&ptr, &offset); TRACE("Type name at offset %#x.\n", offset); @@ -631,9 +638,14 @@ static HRESULT parse_fx10_type(const char *data, size_t data_size, DWORD offset, switch (unknown0) { case 1: - t->member_count = 0; + if (!require_space(ptr - data, 1, sizeof(typeinfo), data_size)) + { + WARN("Invalid offset %#x (data size %#lx).\n", offset, (long)data_size); + return E_FAIL; + } read_dword(&ptr, &typeinfo); + t->member_count = 0; t->column_count = (typeinfo & D3D10_FX10_TYPE_COLUMN_MASK) >> D3D10_FX10_TYPE_COLUMN_SHIFT; t->row_count = (typeinfo & D3D10_FX10_TYPE_ROW_MASK) >> D3D10_FX10_TYPE_ROW_SHIFT; t->basetype = d3d10_variable_type((typeinfo & D3D10_FX10_TYPE_BASETYPE_MASK) >> D3D10_FX10_TYPE_BASETYPE_SHIFT, FALSE); @@ -651,13 +663,18 @@ static HRESULT parse_fx10_type(const char *data, size_t data_size, DWORD offset, case 2: TRACE("Type is an object.\n"); + if (!require_space(ptr - data, 1, sizeof(typeinfo), data_size)) + { + WARN("Invalid offset %#x (data size %#lx).\n", offset, (long)data_size); + return E_FAIL; + } + + read_dword(&ptr, &typeinfo); t->member_count = 0; t->column_count = 0; t->row_count = 0; - t->type_class = D3D10_SVC_OBJECT; - - read_dword(&ptr, &typeinfo); t->basetype = d3d10_variable_type(typeinfo, TRUE); + t->type_class = D3D10_SVC_OBJECT; TRACE("Type description: %#x.\n", typeinfo); TRACE("\tbasetype: %s.\n", debug_d3d10_shader_variable_type(t->basetype)); @@ -667,6 +684,12 @@ static HRESULT parse_fx10_type(const char *data, size_t data_size, DWORD offset, case 3: TRACE("Type is a structure.\n"); + if (!require_space(ptr - data, 1, sizeof(t->member_count), data_size)) + { + WARN("Invalid offset %#x (data size %#lx).\n", offset, (long)data_size); + return E_FAIL; + } + read_dword(&ptr, &t->member_count); TRACE("Member count: %u.\n", t->member_count); @@ -681,6 +704,13 @@ static HRESULT parse_fx10_type(const char *data, size_t data_size, DWORD offset, return E_OUTOFMEMORY; } + if (!require_space(ptr - data, t->member_count, 4 * sizeof(DWORD), data_size)) + { + WARN("Invalid member count %#x (data size %#lx, offset %#x).\n", + t->member_count, (long)data_size, offset); + return E_FAIL; + } + for (i = 0; i < t->member_count; ++i) { struct d3d10_effect_type_member *typem = &t->members[i];

1 0

Michael Stefaniuc : explorerframe/tests: Use EqualRect() instead of open coding it.
by Alexandre Julliard July 10, 2016

July 10, 2016

Module: wine Branch: master Commit: dc5dd6ac0af8c7baf67bd8354d0549e3d7840730 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc5dd6ac0af8c7baf67bd8354… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sat Jul 9 13:58:55 2016 +0200 explorerframe/tests: Use EqualRect() instead of open coding it. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/explorerframe/tests/nstc.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/explorerframe/tests/nstc.c b/dlls/explorerframe/tests/nstc.c index 80be883..54365b0 100644 --- a/dlls/explorerframe/tests/nstc.c +++ b/dlls/explorerframe/tests/nstc.c @@ -1603,10 +1603,8 @@ static void test_basics(void) /* The NamespaceTreeControl returns screen coordinates. */ MapWindowPoints(NULL, hwnd, (POINT*)&rc, 2); - ok(rc.left == tv_rc.left, "Differed, got %d and %d\n", rc.left, tv_rc.left); - ok(rc.top == tv_rc.top, "Differed, got %d and %d\n", rc.top, tv_rc.top); - ok(rc.right == tv_rc.right, "Differed, got %d and %d\n", rc.right, tv_rc.right); - ok(rc.bottom == tv_rc.bottom, "Differed, got %d and %d\n", rc.bottom, tv_rc.bottom); + ok(EqualRect(&rc, &tv_rc), "Differed, got %s and %s\n", wine_dbgstr_rect(&rc), + wine_dbgstr_rect(&tv_rc)); /* Save the height and compare to that of other items. Observed values: 18, 19, 21 */

1 0

Michael Stefaniuc : explorerframe/tests: The width is between the RECT left and right fields.
by Alexandre Julliard July 10, 2016

July 10, 2016

Module: wine Branch: master Commit: 2ddbadccef5ca0c57fe003c8fa004e80a653a49f URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ddbadccef5ca0c57fe003c8f… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sat Jul 9 13:58:20 2016 +0200 explorerframe/tests: The width is between the RECT left and right fields. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/explorerframe/tests/nstc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/explorerframe/tests/nstc.c b/dlls/explorerframe/tests/nstc.c index 83ee892..80be883 100644 --- a/dlls/explorerframe/tests/nstc.c +++ b/dlls/explorerframe/tests/nstc.c @@ -1584,7 +1584,7 @@ static void test_basics(void) hr = INameSpaceTreeControl_GetItemRect(pnstc, psitestdir, &rc); ok(hr == S_OK, "Got 0x%08x\n", hr); ok(rc.top != rc.bottom, "Got 0 height.\n"); - ok(rc.left != rc.bottom, "Got 0 width.\n"); + ok(rc.left != rc.right, "Got 0 width.\n"); height = 0; hwnd_tv = get_treeview_hwnd(pnstc);

1 0

Michael Stefaniuc : explorerframe: Use the proper RECT APIs.
by Alexandre Julliard July 10, 2016

July 10, 2016

Module: wine Branch: master Commit: 15c55ff7bde8c3343eccf70da7f99328f8e7d754 URL: http://source.winehq.org/git/wine.git/?a=commit;h=15c55ff7bde8c3343eccf70da… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sat Jul 9 13:56:47 2016 +0200 explorerframe: Use the proper RECT APIs. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/explorerframe/nstc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/explorerframe/nstc.c b/dlls/explorerframe/nstc.c index 87a7200..95b0a99 100644 --- a/dlls/explorerframe/nstc.c +++ b/dlls/explorerframe/nstc.c @@ -910,9 +910,9 @@ static HRESULT WINAPI NSTC2_fnInitialize(INameSpaceTreeControl2* iface, window_ex_style = nstcsFlags & NSTCS_TABSTOP ? WS_EX_CONTROLPARENT : 0; if(prc) - CopyRect(&rc, prc); + rc = *prc; else - rc.left = rc.right = rc.top = rc.bottom = 0; + SetRectEmpty(&rc); This->hwnd_main = CreateWindowExW(window_ex_style, NSTC2_CLASS_NAME, NULL, window_style, rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top,

1 0

Huw Davies : gdi32: Add back the extents test.
by Alexandre Julliard July 10, 2016

July 10, 2016

Module: wine Branch: master Commit: 622c01c5e1fb72bf4ddcc78ea90bc36ff7d540ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=622c01c5e1fb72bf4ddcc78ea… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Jul 8 15:57:36 2016 +0100 gdi32: Add back the extents test. Spotted by Sebastian Lackner. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/region.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/gdi32/region.c b/dlls/gdi32/region.c index cea2dab..db21c02 100644 --- a/dlls/gdi32/region.c +++ b/dlls/gdi32/region.c @@ -1038,7 +1038,8 @@ BOOL WINAPI PtInRegion( HRGN hrgn, INT x, INT y ) if ((obj = GDI_GetObjPtr( hrgn, OBJ_REGION ))) { - region_find_pt( obj, x, y, &ret ); + if (obj->numRects > 0 && is_in_rect( &obj->extents, x, y )) + region_find_pt( obj, x, y, &ret ); GDI_ReleaseObj( hrgn ); } return ret;

1 0

Henri Verbeet : wined3d: Synchronise WINED3D_CS_OP_CLEAR resource access.
by Alexandre Julliard July 10, 2016

July 10, 2016

Module: wine Branch: master Commit: ff584b98a7962d33c5ea85317e6816a61b16ef48 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff584b98a7962d33c5ea85317… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Jul 10 15:09:17 2016 +0200 wined3d: Synchronise WINED3D_CS_OP_CLEAR resource access. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 29 ++++++++++++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 21f783a..c456b5b 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -304,20 +304,36 @@ void wined3d_cs_emit_present(struct wined3d_cs *cs, struct wined3d_swapchain *sw static void wined3d_cs_exec_clear(struct wined3d_cs *cs, const void *data) { const struct wined3d_cs_clear *op = data; + const struct wined3d_state *state; struct wined3d_device *device; + unsigned int i; RECT draw_rect; device = cs->device; - wined3d_get_draw_rect(&device->state, &draw_rect); + state = &device->state; + wined3d_get_draw_rect(state, &draw_rect); device_clear_render_targets(device, device->adapter->gl_info.limits.buffers, &device->fb, op->rect_count, op->rects, &draw_rect, op->flags, &op->color, op->depth, op->stencil); + + if (op->flags & WINED3DCLEAR_TARGET) + { + for (i = 0; i < device->adapter->gl_info.limits.buffers; ++i) + { + if (state->fb->render_targets[i]) + wined3d_resource_release(state->fb->render_targets[i]->resource); + } + } + if (op->flags & (WINED3DCLEAR_ZBUFFER | WINED3DCLEAR_STENCIL)) + wined3d_resource_release(state->fb->depth_stencil->resource); } void wined3d_cs_emit_clear(struct wined3d_cs *cs, DWORD rect_count, const RECT *rects, DWORD flags, const struct wined3d_color *color, float depth, DWORD stencil) { + const struct wined3d_state *state = &cs->device->state; struct wined3d_cs_clear *op; + unsigned int i; op = cs->ops->require_space(cs, FIELD_OFFSET(struct wined3d_cs_clear, rects[rect_count])); op->opcode = WINED3D_CS_OP_CLEAR; @@ -328,6 +344,17 @@ void wined3d_cs_emit_clear(struct wined3d_cs *cs, DWORD rect_count, const RECT * op->rect_count = rect_count; memcpy(op->rects, rects, sizeof(*rects) * rect_count); + if (flags & WINED3DCLEAR_TARGET) + { + for (i = 0; i < cs->device->adapter->gl_info.limits.buffers; ++i) + { + if (state->fb->render_targets[i]) + wined3d_resource_acquire(state->fb->render_targets[i]->resource); + } + } + if (flags & (WINED3DCLEAR_ZBUFFER | WINED3DCLEAR_STENCIL)) + wined3d_resource_acquire(state->fb->depth_stencil->resource); + cs->ops->submit(cs); }

1 0

Henri Verbeet : wined3d: Synchronise WINED3D_CS_OP_PRESENT resource access.
by Alexandre Julliard July 10, 2016

July 10, 2016

Module: wine Branch: master Commit: 3ef2bca823da8128f4fa135ac996f2a9f5b59e52 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ef2bca823da8128f4fa135ac… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Jul 10 15:09:16 2016 +0200 wined3d: Synchronise WINED3D_CS_OP_PRESENT resource access. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 46f623a..21f783a 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -264,17 +264,25 @@ static void wined3d_cs_exec_present(struct wined3d_cs *cs, const void *data) { const struct wined3d_cs_present *op = data; struct wined3d_swapchain *swapchain; + unsigned int i; swapchain = op->swapchain; wined3d_swapchain_set_window(swapchain, op->dst_window_override); swapchain->swapchain_ops->swapchain_present(swapchain, &op->src_rect, &op->dst_rect, op->flags); + + wined3d_resource_release(&swapchain->front_buffer->resource); + for (i = 0; i < swapchain->desc.backbuffer_count; ++i) + { + wined3d_resource_release(&swapchain->back_buffers[i]->resource); + } } 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) { struct wined3d_cs_present *op; + unsigned int i; op = cs->ops->require_space(cs, sizeof(*op)); op->opcode = WINED3D_CS_OP_PRESENT; @@ -284,6 +292,12 @@ void wined3d_cs_emit_present(struct wined3d_cs *cs, struct wined3d_swapchain *sw op->dst_rect = *dst_rect; op->flags = flags; + wined3d_resource_acquire(&swapchain->front_buffer->resource); + for (i = 0; i < swapchain->desc.backbuffer_count; ++i) + { + wined3d_resource_acquire(&swapchain->back_buffers[i]->resource); + } + cs->ops->submit(cs); }

1 0

Michael Stefaniuc : wordpad: Use InflateRect() instead of open coding it.
by Alexandre Julliard July 10, 2016

July 10, 2016

Module: wine Branch: master Commit: 0a3700e051f3e9473c5daa40a5cdd951b1310b8c URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a3700e051f3e9473c5daa40a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sat Jul 9 13:53:12 2016 +0200 wordpad: Use InflateRect() instead of open coding it. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wordpad/print.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/programs/wordpad/print.c b/programs/wordpad/print.c index 6c7c4f6..d34fd66 100644 --- a/programs/wordpad/print.c +++ b/programs/wordpad/print.c @@ -381,8 +381,7 @@ static void paint_ruler(HWND hWnd, LONG EditLeftmost, BOOL NewMetrics) GetClientRect(hWnd, &drawRect); FillRect(hdc, &drawRect, hBrush); - drawRect.top += 3; - drawRect.bottom -= 3; + InflateRect(&drawRect, 0, -3); drawRect.left = EditLeftmost; drawRect.right = twips_to_pixels(printRect.right - margins.left, GetDeviceCaps(hdc, LOGPIXELSX)); FillRect(hdc, &drawRect, GetStockObject(WHITE_BRUSH));

1 0