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

Henri Verbeet : wined3d: Use the texture dimension helpers in surface_get_drawable_size().
by Alexandre Julliard 18 Apr '16

18 Apr '16

Module: wine Branch: master Commit: 38d35c29cef71a17960f5842ef11871a6f116b5f URL: http://source.winehq.org/git/wine.git/?a=commit;h=38d35c29cef71a17960f5842e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Apr 17 19:07:51 2016 +0200 wined3d: Use the texture dimension helpers in surface_get_drawable_size(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index e5bc4d4..cba70a4 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -122,8 +122,8 @@ void surface_get_drawable_size(const struct wined3d_surface *surface, const stru /* The drawable size of an FBO target is the OpenGL texture size, * which is the power of two size. */ rt = context->current_rt.texture->sub_resources[context->current_rt.sub_resource_idx].u.surface; - *width = rt->pow2Width; - *height = rt->pow2Height; + *width = wined3d_texture_get_level_pow2_width(rt->container, rt->texture_level); + *height = wined3d_texture_get_level_pow2_height(rt->container, rt->texture_level); } }

1 0

Henri Verbeet : wined3d: Use the texture dimension helpers in draw_textured_quad().
by Alexandre Julliard 18 Apr '16

18 Apr '16

Module: wine Branch: master Commit: 2f386e7e490ac88edb503044252ad4559358974e URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f386e7e490ac88edb5030442… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Apr 17 19:07:52 2016 +0200 wined3d: Use the texture dimension helpers in draw_textured_quad(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index cba70a4..dd3a27e 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -289,7 +289,9 @@ void draw_textured_quad(const struct wined3d_surface *src_surface, struct wined3 struct wined3d_texture *texture = src_surface->container; struct blt_info info; - surface_get_blt_info(src_surface->texture_target, src_rect, src_surface->pow2Width, src_surface->pow2Height, &info); + surface_get_blt_info(src_surface->texture_target, src_rect, + wined3d_texture_get_level_pow2_width(texture, src_surface->texture_level), + wined3d_texture_get_level_pow2_height(texture, src_surface->texture_level), &info); gl_info->gl_ops.gl.p_glEnable(info.bind_target); checkGLcall("glEnable(bind_target)");

1 0

Henri Verbeet : wined3d: Use the texture dimension helpers in surface_download_data().
by Alexandre Julliard 18 Apr '16

18 Apr '16

Module: wine Branch: master Commit: fe0342e64685ebf69343c3e219fb88039a5b4e2b URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe0342e64685ebf69343c3e21… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Apr 17 19:07:53 2016 +0200 wined3d: Use the texture dimension helpers in surface_download_data(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index dd3a27e..741bfa3 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -991,7 +991,9 @@ static void surface_download_data(struct wined3d_surface *surface, const struct { wined3d_texture_get_pitch(texture, surface->texture_level, &dst_row_pitch, &dst_slice_pitch); wined3d_format_calculate_pitch(format, texture->resource.device->surface_alignment, - surface->pow2Width, surface->pow2Height, &src_row_pitch, &src_slice_pitch); + wined3d_texture_get_level_pow2_width(texture, surface->texture_level), + wined3d_texture_get_level_pow2_height(texture, surface->texture_level), + &src_row_pitch, &src_slice_pitch); mem = HeapAlloc(GetProcessHeap(), 0, src_slice_pitch); } else

1 0

Łukasz Wojniłowicz : Polish translation for release 1.9.8
by Jeremy Newman 18 Apr '16

18 Apr '16

Module: website Branch: master Commit: 8aa8525faf9c0ec534ac92ff76aa2be0c16617ac URL: http://source.winehq.org/git/website.git/?a=commit;h=8aa8525faf9c0ec534ac92… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Sat Apr 16 17:15:39 2016 +0200 Polish translation for release 1.9.8 Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/pl/2016041601.xml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/news/pl/2016041601.xml b/news/pl/2016041601.xml new file mode 100644 index 0000000..beb9ec2 --- /dev/null +++ b/news/pl/2016041601.xml @@ -0,0 +1,18 @@ +<news> +<date>Kwiecień 16, 2016</date> +<title>Wydano Wine 1.9.8</title> +<body> + Wydanie rozwojowe Wine 1.9.8 jest już dostępne. + <a href="{$root}/announce/1.9.8">Co nowego</a> w tym wydaniu: +<ul> + <li>Więcej pracy w obszarze strumienia poleceń WineD3D.</li> + <li>Poprawkowe wydanie silnika Mono.</li> + <li>Szersza obsługa czytnika Usług Sieciowych.</li> + <li>Szersza obsługa Modelu Cieniowania 5.</li> + <li>Obsługa gradientów w metaplikach.</li> + <li>Ulepszono formatowanie tabeli w WinHelp.</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.8.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.8.2
by Jeremy Newman 18 Apr '16

18 Apr '16

Module: website Branch: master Commit: dd3b343447b3f10f5d2aec2b44c288b5e1b4b6ab URL: http://source.winehq.org/git/website.git/?a=commit;h=dd3b343447b3f10f5d2aec… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Sat Apr 16 17:15:38 2016 +0200 Polish translation for release 1.8.2 Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/pl/2016041201.xml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/news/pl/2016041201.xml b/news/pl/2016041201.xml new file mode 100644 index 0000000..375cdaa --- /dev/null +++ b/news/pl/2016041201.xml @@ -0,0 +1,13 @@ +<news> +<date>Kwiecień 12, 2016</date> +<title>Wydano Wine 1.8.2</title> +<body> + Poprawione wydanie Wine 1.8.2 jest już dostępne. + <a href="{$root}/announce/1.8.2">Co nowego</a> w tym wydaniu: +<ul> + <li>Rozmaite poprawki błędów.</li> + <li>Małe uaktualnienie tłumaczenia.</li> +</ul> +Źródło jest <a href="//dl.winehq.org/wine/source/1.8/wine-1.8.2.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

Alexandre Julliard : Wine release 1.9.8
by Alexandre Julliard 15 Apr '16

15 Apr '16

Module: website Branch: master Commit: aac42259f7deb00913d2d06650ac85d01cb908b1 URL: http://source.winehq.org/git/website.git/?a=commit;h=aac42259f7deb00913d2d0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Apr 16 00:00:32 2016 +0900 Wine release 1.9.8 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2016041601.xml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/news/en/2016041601.xml b/news/en/2016041601.xml new file mode 100644 index 0000000..cacd424 --- /dev/null +++ b/news/en/2016041601.xml @@ -0,0 +1,18 @@ +<news> +<date>April 16, 2016</date> +<title>Wine 1.9.8 Released</title> +<body> + The Wine development release 1.9.8 is now available. + <a href="{$root}/announce/1.9.8">What's new</a> in this release: +<ul> + <li>More work towards the WineD3D command stream.</li> + <li>Bug fix update of the Mono engine.</li> + <li>More WebServices reader support.</li> + <li>Still more Shader Model 5 support.</li> + <li>Support for gradients in metafiles.</li> + <li>Improved table formatting in WinHelp.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/1.9/wine-1.9.8.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

Henri Verbeet : wined3d: Check texture usage/pool in volumetexture_init().
by Alexandre Julliard 15 Apr '16

15 Apr '16

Module: wine Branch: master Commit: 5eedb704f18d555b0252f31053ac6859a1ff16a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5eedb704f18d555b0252f3105… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 14 19:32:49 2016 +0200 wined3d: Check texture usage/pool in volumetexture_init(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 7 +++++++ dlls/wined3d/volume.c | 9 --------- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 52b026b..0f29367 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1850,6 +1850,13 @@ static HRESULT volumetexture_init(struct wined3d_texture *texture, const struct } } + if (desc->usage & WINED3DUSAGE_DYNAMIC && (desc->pool == WINED3D_POOL_MANAGED + || desc->pool == WINED3D_POOL_SCRATCH)) + { + WARN("Attempted to create a DYNAMIC texture in pool %s.\n", debug_d3dpool(desc->pool)); + return WINED3DERR_INVALIDCALL; + } + if (!gl_info->supported[ARB_TEXTURE_NON_POWER_OF_TWO]) { UINT pow2_w, pow2_h, pow2_d; diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index cb60a24..643969c 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -441,15 +441,6 @@ HRESULT wined3d_volume_init(struct wined3d_volume *volume, struct wined3d_textur HRESULT hr; UINT size; - /* TODO: Write tests for other resources and move this check - * to resource_init, if applicable. */ - if (desc->usage & WINED3DUSAGE_DYNAMIC - && (desc->pool == WINED3D_POOL_MANAGED || desc->pool == WINED3D_POOL_SCRATCH)) - { - WARN("Attempted to create a DYNAMIC texture in pool %s.\n", debug_d3dpool(desc->pool)); - return WINED3DERR_INVALIDCALL; - } - size = wined3d_format_calculate_size(format, device->surface_alignment, desc->width, desc->height, desc->depth); if (FAILED(hr = resource_init(&volume->resource, device, WINED3D_RTYPE_VOLUME, format,

1 0

Stefan Dösinger : wined3d: Explicitly pass a wined3d_state structure to context_apply_draw_state().
by Alexandre Julliard 15 Apr '16

15 Apr '16

Module: wine Branch: master Commit: aad6fb4a424d3ae1952da1633073ff9a9b3abf82 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aad6fb4a424d3ae1952da1633… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Apr 14 19:32:50 2016 +0200 wined3d: Explicitly pass a wined3d_state structure to context_apply_draw_state(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 4 ++-- dlls/wined3d/drawprim.c | 2 +- dlls/wined3d/wined3d_private.h | 3 ++- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index d683327..3cd7c8c 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -3318,9 +3318,9 @@ static void context_bind_shader_resources(struct wined3d_context *context, const } /* Context activation is done by the caller. */ -BOOL context_apply_draw_state(struct wined3d_context *context, struct wined3d_device *device) +BOOL context_apply_draw_state(struct wined3d_context *context, + const struct wined3d_device *device, const struct wined3d_state *state) { - const struct wined3d_state *state = &device->state; const struct StateEntry *state_table = context->state_table; const struct wined3d_fb_state *fb = state->fb; unsigned int i; diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 6857b0d..bd62b68 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -488,7 +488,7 @@ void draw_primitive(struct wined3d_device *device, const struct wined3d_state *s wined3d_surface_prepare(ds, context, location); } - if (!context_apply_draw_state(context, device)) + if (!context_apply_draw_state(context, device, state)) { context_release(context); WARN("Unable to apply draw state, skipping draw.\n"); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 7c3ea65..0f55d79 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1582,7 +1582,8 @@ void context_alloc_occlusion_query(struct wined3d_context *context, void context_apply_blit_state(struct wined3d_context *context, const struct wined3d_device *device) DECLSPEC_HIDDEN; BOOL context_apply_clear_state(struct wined3d_context *context, const struct wined3d_state *state, UINT rt_count, const struct wined3d_fb_state *fb) DECLSPEC_HIDDEN; -BOOL context_apply_draw_state(struct wined3d_context *context, struct wined3d_device *device) DECLSPEC_HIDDEN; +BOOL context_apply_draw_state(struct wined3d_context *context, + const struct wined3d_device *device, const struct wined3d_state *state) DECLSPEC_HIDDEN; void context_apply_fbo_state_blit(struct wined3d_context *context, GLenum target, struct wined3d_surface *render_target, struct wined3d_surface *depth_stencil, DWORD location) DECLSPEC_HIDDEN; void context_active_texture(struct wined3d_context *context, const struct wined3d_gl_info *gl_info,

1 0

Dmitry Timoshkov : windowscodecs: Allocate correct amount of memory for PNG image data.
by Alexandre Julliard 15 Apr '16

15 Apr '16

Module: wine Branch: master Commit: 2f74d91d87b20d6f3e131b1afcedb646329ab1af URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f74d91d87b20d6f3e131b1af… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Apr 14 18:47:50 2016 +0200 windowscodecs: Allocate correct amount of memory for PNG image data. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/pngformat.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/windowscodecs/pngformat.c b/dlls/windowscodecs/pngformat.c index cd9165b..3eb4d0e 100644 --- a/dlls/windowscodecs/pngformat.c +++ b/dlls/windowscodecs/pngformat.c @@ -664,7 +664,7 @@ static HRESULT WINAPI PngDecoder_Initialize(IWICBitmapDecoder *iface, IStream *p /* read the image data */ This->width = ppng_get_image_width(This->png_ptr, This->info_ptr); This->height = ppng_get_image_height(This->png_ptr, This->info_ptr); - This->stride = This->width * This->bpp; + This->stride = (This->width * This->bpp + 7) / 8; image_size = This->stride * This->height; This->image_bits = HeapAlloc(GetProcessHeap(), 0, image_size);

1 0

Michael Müller : compobj.dll16: Fix implementation of StringFromGUID2.
by Alexandre Julliard 15 Apr '16

15 Apr '16

Module: wine Branch: master Commit: 7e1d1aa573c438aa3bf80595723167b1ff0a31a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e1d1aa573c438aa3bf805957… Author: Michael Müller <michael(a)fds-team.de> Date: Thu Apr 14 21:01:03 2016 +0200 compobj.dll16: Fix implementation of StringFromGUID2. Signed-off-by: Michael Müller <michael(a)fds-team.de> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/compobj.dll16/compobj.c | 10 ++++++++-- dlls/compobj.dll16/compobj.dll16.spec | 2 +- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/compobj.dll16/compobj.c b/dlls/compobj.dll16/compobj.c index 6261c13..b934a06 100644 --- a/dlls/compobj.dll16/compobj.c +++ b/dlls/compobj.dll16/compobj.c @@ -54,6 +54,7 @@ typedef LPCSTR LPCOLESTR16; #define STDMETHOD16(m) HRESULT (STDMETHOD16CALLTYPE *m) #define STDMETHOD16_(t,m) t (STDMETHOD16CALLTYPE *m) +#define CHARS_IN_GUID 39 /*********************************************************************** * IMalloc16 interface @@ -689,9 +690,14 @@ HRESULT WINAPI CLSIDFromProgID16(LPCOLESTR16 progid, LPCLSID riid) /****************************************************************************** * StringFromGUID2 [COMPOBJ.76] */ -INT WINAPI StringFromGUID216(REFGUID id, LPOLESTR str, INT cmax) +INT16 WINAPI StringFromGUID216(REFGUID id, LPOLESTR16 str, INT16 cmax) { - return StringFromGUID2( id, str, cmax ); + static const char format[] = "{%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X}"; + if (!id || cmax < CHARS_IN_GUID) return 0; + sprintf( str, format, id->Data1, id->Data2, id->Data3, + id->Data4[0], id->Data4[1], id->Data4[2], id->Data4[3], + id->Data4[4], id->Data4[5], id->Data4[6], id->Data4[7] ); + return CHARS_IN_GUID; } diff --git a/dlls/compobj.dll16/compobj.dll16.spec b/dlls/compobj.dll16/compobj.dll16.spec index d3022ae..03cf925 100644 --- a/dlls/compobj.dll16/compobj.dll16.spec +++ b/dlls/compobj.dll16/compobj.dll16.spec @@ -72,7 +72,7 @@ 72 stub _IID_IEXTERNALCONNECTION 73 pascal CoCreateGuid(ptr) CoCreateGuid16 75 stub FNASSERT -76 pascal StringFromGUID2(ptr ptr word) StringFromGUID216 +76 pascal -ret16 StringFromGUID2(ptr ptr word) StringFromGUID216 77 stub COGETCLASSEXT 78 stub OLE1CLASSFROMCLSID2 79 stub CLSIDFROMOLE1CLASS

1 0