June 2015 - Wine-commits - list.winehq.org

Sebastian Lackner : winedbg: Also output system information to the terminal, not only to dialog.
by Alexandre Julliard 08 Jun '15

08 Jun '15

Module: wine Branch: master Commit: 766154975507e7c118c34a807a58432808db0dea URL: http://source.winehq.org/git/wine.git/?a=commit;h=766154975507e7c118c34a807… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sat May 30 01:25:47 2015 +0200 winedbg: Also output system information to the terminal, not only to dialog. --- programs/winedbg/tgt_active.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/winedbg/tgt_active.c b/programs/winedbg/tgt_active.c index 8cfce32..989e433 100644 --- a/programs/winedbg/tgt_active.c +++ b/programs/winedbg/tgt_active.c @@ -836,10 +836,10 @@ enum dbg_start dbg_active_auto(int argc, char* argv[]) dbg_interactiveP = TRUE; parser_handle(input); + output_system_info(); if (output != INVALID_HANDLE_VALUE) { - output_system_info(); SetEvent( event ); WaitForSingleObject( thread, INFINITE ); CloseHandle( output );

1 0

Stefan Dösinger : wined3d: Read format flags from the volume container.
by Alexandre Julliard 08 Jun '15

08 Jun '15

Module: wine Branch: master Commit: 4451bf477a56cd35b582bf0ed39f27d3818bff80 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4451bf477a56cd35b582bf0ed… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Jun 6 17:53:51 2015 +0200 wined3d: Read format flags from the volume container. --- dlls/wined3d/resource.c | 5 +++-- dlls/wined3d/volume.c | 8 ++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index 2bc1cc1..d5a0041 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -87,7 +87,8 @@ HRESULT resource_init(struct wined3d_resource *resource, struct wined3d_device * resource->type = type; resource->gl_type = gl_type; resource->format = format; - resource->format_flags = format->flags[gl_type]; + if (gl_type < WINED3D_GL_RES_TYPE_COUNT) + resource->format_flags = format->flags[gl_type]; resource->multisample_type = multisample_type; resource->multisample_quality = multisample_quality; resource->usage = usage; @@ -105,7 +106,7 @@ HRESULT resource_init(struct wined3d_resource *resource, struct wined3d_device * resource->resource_ops = resource_ops; resource->map_binding = WINED3D_LOCATION_SYSMEM; - if (pool != WINED3D_POOL_SCRATCH && type != WINED3D_RTYPE_BUFFER) + if (pool != WINED3D_POOL_SCRATCH && type != WINED3D_RTYPE_BUFFER && gl_type < WINED3D_GL_RES_TYPE_COUNT) { if ((usage & WINED3DUSAGE_RENDERTARGET) && !(resource->format_flags & WINED3DFMT_FLAG_RENDERTARGET)) { diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index 5241286..0f02f34 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -44,7 +44,7 @@ void wined3d_volume_get_pitch(const struct wined3d_volume *volume, UINT *row_pit { const struct wined3d_format *format = volume->resource.format; - if (volume->resource.format_flags & WINED3DFMT_FLAG_BLOCKS) + if (volume->container->resource.format_flags & WINED3DFMT_FLAG_BLOCKS) { /* Since compressed formats are block based, pitch means the amount of * bytes to the next row of block rather than the next row of pixels. */ @@ -89,7 +89,7 @@ void wined3d_volume_upload_data(struct wined3d_volume *volume, const struct wine if (data->buffer_object) ERR("Loading a converted volume from a PBO.\n"); - if (volume->resource.format_flags & WINED3DFMT_FLAG_BLOCKS) + if (volume->container->resource.format_flags & WINED3DFMT_FLAG_BLOCKS) ERR("Converting a block-based format.\n"); dst_row_pitch = width * format->conv_byte_count; @@ -551,7 +551,7 @@ HRESULT CDECL wined3d_volume_map(struct wined3d_volume *volume, const struct wined3d_gl_info *gl_info; BYTE *base_memory; const struct wined3d_format *format = volume->resource.format; - const unsigned int fmt_flags = volume->resource.format_flags; + const unsigned int fmt_flags = volume->container->resource.format_flags; TRACE("volume %p, map_desc %p, box %p, flags %#x.\n", volume, map_desc, box, flags); @@ -759,7 +759,7 @@ static HRESULT volume_init(struct wined3d_volume *volume, struct wined3d_texture 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, container->resource.gl_type, + if (FAILED(hr = resource_init(&volume->resource, device, WINED3D_RTYPE_VOLUME, WINED3D_GL_RES_TYPE_COUNT, format, WINED3D_MULTISAMPLE_NONE, 0, desc->usage, desc->pool, desc->width, desc->height, desc->depth, size, NULL, &wined3d_null_parent_ops, &volume_resource_ops))) {

1 0

Stefan Dösinger : wined3d: Read format flags from the surface container.
by Alexandre Julliard 08 Jun '15

08 Jun '15

Module: wine Branch: master Commit: ec25ca7832406da874ece0ae006cbe809cd04690 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec25ca7832406da874ece0ae0… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Jun 6 17:53:52 2015 +0200 wined3d: Read format flags from the surface container. --- dlls/wined3d/context.c | 8 ++++---- dlls/wined3d/surface.c | 36 +++++++++++++++++++----------------- 2 files changed, 23 insertions(+), 21 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 059503b..27ce1bf 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -128,7 +128,7 @@ static void context_attach_depth_stencil_fbo(struct wined3d_context *context, if (depth_stencil) { - DWORD format_flags = depth_stencil->resource.format_flags; + DWORD format_flags = depth_stencil->container->resource.format_flags; if (depth_stencil->current_renderbuffer) { @@ -3186,12 +3186,12 @@ static void context_setup_target(struct wined3d_context *context, struct wined3d { /* Disable blending when the alpha mask has changed and when a format doesn't support blending. */ if ((old->alpha_size && !new->alpha_size) || (!old->alpha_size && new->alpha_size) - || !(target->resource.format_flags & WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING)) + || !(target->container->resource.format_flags & WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING)) context_invalidate_state(context, STATE_RENDER(WINED3D_RS_ALPHABLENDENABLE)); /* Update sRGB writing when switching between formats that do/do not support sRGB writing */ - if ((context->current_rt->resource.format_flags & WINED3DFMT_FLAG_SRGB_WRITE) - != (target->resource.format_flags & WINED3DFMT_FLAG_SRGB_WRITE)) + if ((context->current_rt->container->resource.format_flags & WINED3DFMT_FLAG_SRGB_WRITE) + != (target->container->resource.format_flags & WINED3DFMT_FLAG_SRGB_WRITE)) context_invalidate_state(context, STATE_RENDER(WINED3D_RS_SRGBWRITEENABLE)); } diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 359db9b..f4b69e2 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -359,7 +359,7 @@ static void get_color_masks(const struct wined3d_format *format, DWORD *masks) static HRESULT surface_create_dib_section(struct wined3d_surface *surface) { const struct wined3d_format *format = surface->resource.format; - unsigned int format_flags = surface->resource.format_flags; + unsigned int format_flags = surface->container->resource.format_flags; SYSTEM_INFO sysInfo; BITMAPINFO *b_info; int extraline = 0; @@ -665,7 +665,7 @@ static HRESULT surface_private_setup(struct wined3d_surface *surface) if (pow2Width > surface->resource.width || pow2Height > surface->resource.height) { /* TODO: Add support for non power two compressed textures. */ - if (surface->resource.format_flags & (WINED3DFMT_FLAG_COMPRESSED | WINED3DFMT_FLAG_HEIGHT_SCALE)) + if (surface->container->resource.format_flags & (WINED3DFMT_FLAG_COMPRESSED | WINED3DFMT_FLAG_HEIGHT_SCALE)) { FIXME("(%p) Compressed or height scaled non-power-two textures are not supported w(%d) h(%d)\n", surface, surface->resource.width, surface->resource.height); @@ -752,7 +752,7 @@ static void surface_unmap(struct wined3d_surface *surface) if (surface->container->swapchain && surface->container->swapchain->front_buffer == surface->container) surface_load_location(surface, surface->container->resource.draw_binding); - else if (surface->resource.format_flags & (WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL)) + else if (surface->container->resource.format_flags & (WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL)) FIXME("Depth / stencil buffer locking is not implemented.\n"); } @@ -780,8 +780,8 @@ static void surface_depth_blt_fbo(const struct wined3d_device *device, TRACE("dst_surface %p, dst_location %s, dst_rect %s.\n", dst_surface, wined3d_debug_location(dst_location), wine_dbgstr_rect(dst_rect)); - src_mask = src_surface->resource.format_flags & (WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL); - dst_mask = dst_surface->resource.format_flags & (WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL); + src_mask = src_surface->container->resource.format_flags & (WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL); + dst_mask = dst_surface->container->resource.format_flags & (WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL); if (src_mask != dst_mask) { @@ -1279,7 +1279,7 @@ static void surface_download_data(struct wined3d_surface *surface, const struct surface_get_memory(surface, &data, dst_location); - if (surface->resource.format_flags & WINED3DFMT_FLAG_COMPRESSED) + if (surface->container->resource.format_flags & WINED3DFMT_FLAG_COMPRESSED) { TRACE("(%p) : Calling glGetCompressedTexImage level %d, format %#x, type %#x, data %p.\n", surface, surface->texture_level, format->glFormat, format->glType, data.addr); @@ -1568,8 +1568,8 @@ HRESULT surface_upload_from_surface(struct wined3d_surface *dst_surface, const P src_format = src_surface->resource.format; dst_format = dst_surface->resource.format; - src_fmt_flags = src_surface->resource.format_flags; - dst_fmt_flags = dst_surface->resource.format_flags; + src_fmt_flags = src_surface->container->resource.format_flags; + dst_fmt_flags = dst_surface->container->resource.format_flags; if (src_format->id != dst_format->id) { @@ -2513,7 +2513,7 @@ HRESULT CDECL wined3d_surface_map(struct wined3d_surface *surface, struct wined3d_map_desc *map_desc, const RECT *rect, DWORD flags) { const struct wined3d_format *format = surface->resource.format; - unsigned int fmt_flags = surface->resource.format_flags; + unsigned int fmt_flags = surface->container->resource.format_flags; struct wined3d_device *device = surface->resource.device; struct wined3d_context *context; const struct wined3d_gl_info *gl_info; @@ -3988,7 +3988,7 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface, } if (surface->locations & (WINED3D_LOCATION_TEXTURE_SRGB | WINED3D_LOCATION_TEXTURE_RGB) - && (surface->resource.format_flags & WINED3DFMT_FLAG_FBO_ATTACHABLE_SRGB) + && (surface->container->resource.format_flags & WINED3DFMT_FLAG_FBO_ATTACHABLE_SRGB) && fbo_blit_supported(gl_info, WINED3D_BLIT_OP_COLOR_BLIT, NULL, surface->resource.usage, surface->resource.pool, surface->resource.format, NULL, surface->resource.usage, surface->resource.pool, surface->resource.format)) @@ -4004,7 +4004,7 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface, } if (surface->locations & (WINED3D_LOCATION_RB_MULTISAMPLE | WINED3D_LOCATION_RB_RESOLVED) - && (!srgb || (surface->resource.format_flags & WINED3DFMT_FLAG_FBO_ATTACHABLE_SRGB)) + && (!srgb || (surface->container->resource.format_flags & WINED3DFMT_FLAG_FBO_ATTACHABLE_SRGB)) && fbo_blit_supported(gl_info, WINED3D_BLIT_OP_COLOR_BLIT, NULL, surface->resource.usage, surface->resource.pool, surface->resource.format, NULL, surface->resource.usage, surface->resource.pool, surface->resource.format)) @@ -4578,13 +4578,13 @@ static HRESULT surface_cpu_blt(struct wined3d_surface *dst_surface, const RECT * src_map = dst_map; src_format = dst_surface->resource.format; dst_format = src_format; - dst_fmt_flags = dst_surface->resource.format_flags; + dst_fmt_flags = dst_surface->container->resource.format_flags; src_fmt_flags = dst_fmt_flags; } else { dst_format = dst_surface->resource.format; - dst_fmt_flags = dst_surface->resource.format_flags; + dst_fmt_flags = dst_surface->container->resource.format_flags; if (src_surface) { if (dst_surface->resource.format->id != src_surface->resource.format->id) @@ -4599,7 +4599,7 @@ static HRESULT surface_cpu_blt(struct wined3d_surface *dst_surface, const RECT * } wined3d_surface_map(src_surface, &src_map, NULL, WINED3D_MAP_READONLY); src_format = src_surface->resource.format; - src_fmt_flags = src_surface->resource.format_flags; + src_fmt_flags = src_surface->container->resource.format_flags; } else { @@ -5238,9 +5238,11 @@ HRESULT CDECL wined3d_surface_blt(struct wined3d_surface *dst_surface, const REC || src_rect.bottom - src_rect.top != dst_rect.bottom - dst_rect.top); convert = src_surface && src_surface->resource.format->id != dst_surface->resource.format->id; - dst_ds_flags = dst_surface->resource.format_flags & (WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL); + dst_ds_flags = dst_surface->container->resource.format_flags + & (WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL); if (src_surface) - src_ds_flags = src_surface->resource.format_flags & (WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL); + src_ds_flags = src_surface->container->resource.format_flags + & (WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL); else src_ds_flags = 0; @@ -5457,7 +5459,7 @@ static HRESULT surface_init(struct wined3d_surface *surface, struct wined3d_text else surface->surface_ops = &surface_ops; - if (FAILED(hr = resource_init(&surface->resource, device, WINED3D_RTYPE_SURFACE, container->resource.gl_type, + if (FAILED(hr = resource_init(&surface->resource, device, WINED3D_RTYPE_SURFACE, WINED3D_GL_RES_TYPE_COUNT, format, desc->multisample_type, multisample_quality, desc->usage, desc->pool, desc->width, desc->height, 1, resource_size, NULL, &wined3d_null_parent_ops, &surface_resource_ops))) {

1 0

Stefan Dösinger : wined3d: Set the gl resource type in resource_init.
by Alexandre Julliard 08 Jun '15

08 Jun '15

Module: wine Branch: master Commit: c8d1a70804ee64cd947dd5d1437db825282a4bcc URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8d1a70804ee64cd947dd5d14… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Jun 6 17:53:53 2015 +0200 wined3d: Set the gl resource type in resource_init. --- dlls/wined3d/buffer.c | 2 +- dlls/wined3d/resource.c | 102 ++++++++++++++++++++++++++++++++--------- dlls/wined3d/surface.c | 2 +- dlls/wined3d/texture.c | 48 ++++--------------- dlls/wined3d/volume.c | 4 +- dlls/wined3d/wined3d_private.h | 2 +- 6 files changed, 95 insertions(+), 65 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c8d1a70804ee64cd947dd…

1 0

Stefan Dösinger : wined3d: Keep track of renderbuffer capabilities.
by Alexandre Julliard 08 Jun '15

08 Jun '15

Module: wine Branch: master Commit: dc7cb59c3a6790959614f52cf2eb02ea6dab79ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc7cb59c3a6790959614f52cf… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Jun 6 17:53:54 2015 +0200 wined3d: Keep track of renderbuffer capabilities. --- dlls/wined3d/arb_program_shader.c | 8 +++ dlls/wined3d/directx.c | 4 +- dlls/wined3d/glsl_shader.c | 8 +++ dlls/wined3d/resource.c | 4 +- dlls/wined3d/utils.c | 107 ++++++++++++++++++++++++++------------ dlls/wined3d/wined3d_private.h | 3 +- 6 files changed, 98 insertions(+), 36 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=dc7cb59c3a6790959614f…

1 0

Nikolay Sivov : wined3d: dst_surface can't be NULL at this point (Coverity ).
by Alexandre Julliard 08 Jun '15

08 Jun '15

Module: wine Branch: master Commit: 68fcf9d7cf4858d567ae5175fc34dce88e084524 URL: http://source.winehq.org/git/wine.git/?a=commit;h=68fcf9d7cf4858d567ae5175f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jun 8 12:02:07 2015 +0300 wined3d: dst_surface can't be NULL at this point (Coverity). --- 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 97b4797..552a079 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2049,8 +2049,8 @@ HRESULT CDECL wined3d_surface_update_overlay(struct wined3d_surface *surface, co { surface->overlay_destrect.left = 0; surface->overlay_destrect.top = 0; - surface->overlay_destrect.right = dst_surface ? dst_surface->resource.width : 0; - surface->overlay_destrect.bottom = dst_surface ? dst_surface->resource.height : 0; + surface->overlay_destrect.right = dst_surface->resource.width; + surface->overlay_destrect.bottom = dst_surface->resource.height; } if (surface->overlay_dest && (surface->overlay_dest != dst_surface || flags & WINEDDOVER_HIDE))

1 0

Nikolay Sivov : usp10: Remove dead null check that can't fail (Coverity).
by Alexandre Julliard 08 Jun '15

08 Jun '15

Module: wine Branch: master Commit: 7a02782f48c582c7353d3a716afb4b4717272079 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a02782f48c582c7353d3a716… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jun 8 11:49:21 2015 +0300 usp10: Remove dead null check that can't fail (Coverity). --- dlls/usp10/shape.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index 0291f17..e942880 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -3348,14 +3348,9 @@ rpRangeProperties = &ShapingData[psa->eScript].defaultTextRange; void SHAPE_ApplyOpenTypePositions(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, const WORD* pwGlyphs, INT cGlyphs, int *piAdvance, GOFFSET *pGoffset ) { - const TEXTRANGE_PROPERTIES *rpRangeProperties; + const TEXTRANGE_PROPERTIES *rpRangeProperties = &ShapingData[psa->eScript].defaultGPOSTextRange; int i; - rpRangeProperties = &ShapingData[psa->eScript].defaultGPOSTextRange; - - if (!rpRangeProperties) - return; - load_ot_tables(hdc, psc); if (!psc->GPOS_Table || !psc->otm)

1 0

Piotr Caban : msvcrt: Fix strtol implementation on strings not containing valid number.
by Alexandre Julliard 08 Jun '15

08 Jun '15

Module: wine Branch: master Commit: 0922865b377913a27cea568ac688787a8117d8a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0922865b377913a27cea568ac… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Jun 8 12:00:55 2015 +0200 msvcrt: Fix strtol implementation on strings not containing valid number. --- dlls/msvcrt/string.c | 10 ++++++++-- dlls/msvcrt/tests/string.c | 8 ++++++++ 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index 6f9280f..fdeb4e0 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -839,7 +839,9 @@ MSVCRT_size_t CDECL MSVCRT_strnlen(const char *s, MSVCRT_size_t maxlen) */ __int64 CDECL MSVCRT_strtoi64_l(const char *nptr, char **endptr, int base, MSVCRT__locale_t locale) { + const char *p = nptr; BOOL negative = FALSE; + BOOL got_digit = FALSE; __int64 ret = 0; TRACE("(%s %p %d %p)\n", debugstr_a(nptr), endptr, base, locale); @@ -881,6 +883,7 @@ __int64 CDECL MSVCRT_strtoi64_l(const char *nptr, char **endptr, int base, MSVCR break; v = cur-'a'+10; } + got_digit = TRUE; if(negative) v = -v; @@ -898,7 +901,7 @@ __int64 CDECL MSVCRT_strtoi64_l(const char *nptr, char **endptr, int base, MSVCR } if(endptr) - *endptr = (char*)nptr; + *endptr = (char*)(got_digit ? nptr : p); return ret; } @@ -1014,7 +1017,9 @@ MSVCRT_ulong CDECL MSVCRT_strtoul(const char* nptr, char** end, int base) */ unsigned __int64 CDECL MSVCRT_strtoui64_l(const char *nptr, char **endptr, int base, MSVCRT__locale_t locale) { + const char *p = nptr; BOOL negative = FALSE; + BOOL got_digit = FALSE; unsigned __int64 ret = 0; TRACE("(%s %p %d %p)\n", debugstr_a(nptr), endptr, base, locale); @@ -1056,6 +1061,7 @@ unsigned __int64 CDECL MSVCRT_strtoui64_l(const char *nptr, char **endptr, int b break; v = cur-'a'+10; } + got_digit = TRUE; nptr++; @@ -1067,7 +1073,7 @@ unsigned __int64 CDECL MSVCRT_strtoui64_l(const char *nptr, char **endptr, int b } if(endptr) - *endptr = (char*)nptr; + *endptr = (char*)(got_digit ? nptr : p); return negative ? -ret : ret; } diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 3893ba7..9920df0 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -1401,6 +1401,8 @@ static void test_strtok(void) static void test_strtol(void) { + static char neg[] = "-0x"; + char* e; LONG l; ULONG ul; @@ -1457,6 +1459,12 @@ static void test_strtol(void) ul = strtoul("-4294967296", NULL, 0); ok(ul == 1, "wrong value %u\n", ul); ok(errno == ERANGE, "wrong errno %d\n", errno); + + errno = 0; + l = strtol(neg, &e, 0); + ok(l == 0, "wrong value %d\n", l); + ok(errno == 0, "wrong errno %d\n", errno); + ok(e == neg, "e = %p, neg = %p\n", e, neg); } static void test_strnlen(void)

1 0

Nikolay Sivov : kernel32: Fail properly for unsupported classes in GetFileInformationByHandleEx.
by Alexandre Julliard 08 Jun '15

08 Jun '15

Module: wine Branch: master Commit: b17e4376d571347ebdbbe1ddd3e612614d3fc1e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b17e4376d571347ebdbbe1ddd… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jun 7 00:56:14 2015 +0300 kernel32: Fail properly for unsupported classes in GetFileInformationByHandleEx. --- dlls/kernel32/file.c | 10 +++++----- dlls/kernel32/tests/file.c | 29 ++++++++++++++++++++++++++++- include/winbase.h | 30 ++++++++++++++++++++++++++++++ 3 files changed, 63 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/file.c b/dlls/kernel32/file.c index a680ab2..0b208a5 100644 --- a/dlls/kernel32/file.c +++ b/dlls/kernel32/file.c @@ -897,14 +897,9 @@ BOOL WINAPI GetFileInformationByHandleEx( HANDLE handle, FILE_INFO_BY_HANDLE_CLA switch (class) { - case FileRenameInfo: - case FileDispositionInfo: - case FileAllocationInfo: - case FileEndOfFileInfo: case FileStreamInfo: case FileCompressionInfo: case FileAttributeTagInfo: - case FileIoPriorityHintInfo: case FileRemoteProtocolInfo: case FileFullDirectoryInfo: case FileFullDirectoryRestartInfo: @@ -936,6 +931,11 @@ BOOL WINAPI GetFileInformationByHandleEx( HANDLE handle, FILE_INFO_BY_HANDLE_CLA (class == FileIdBothDirectoryRestartInfo) ); break; + case FileRenameInfo: + case FileDispositionInfo: + case FileAllocationInfo: + case FileIoPriorityHintInfo: + case FileEndOfFileInfo: default: SetLastError( ERROR_INVALID_PARAMETER ); return FALSE; diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index bd85e01..9480bd4 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -3830,6 +3830,12 @@ static void test_GetFileInformationByHandleEx(void) FILE_STANDARD_INFO *standardInfo; FILE_NAME_INFO *nameInfo; LARGE_INTEGER prevWrite; + FILE_IO_PRIORITY_HINT_INFO priohintinfo; + FILE_ALLOCATION_INFO allocinfo; + FILE_DISPOSITION_INFO dispinfo; + FILE_END_OF_FILE_INFO eofinfo; + FILE_RENAME_INFO renameinfo; + struct { FILE_INFO_BY_HANDLE_CLASS handleClass; void *ptr; @@ -3952,8 +3958,29 @@ static void test_GetFileInformationByHandleEx(void) for (i = 0; i < nameInfo->FileNameLength/2; i++) ok(strPtr[i] == nameInfo->FileName[i], "Incorrect filename char %d: %c vs %c\n", i, strPtr[i], nameInfo->FileName[i]); - CloseHandle(file); + /* invalid classes */ + SetLastError(0xdeadbeef); + ret = pGetFileInformationByHandleEx(file, FileEndOfFileInfo, &eofinfo, sizeof(eofinfo)); + ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, "got %d, error %d\n", ret, GetLastError()); + + SetLastError(0xdeadbeef); + ret = pGetFileInformationByHandleEx(file, FileIoPriorityHintInfo, &priohintinfo, sizeof(priohintinfo)); + ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, "got %d, error %d\n", ret, GetLastError()); + + SetLastError(0xdeadbeef); + ret = pGetFileInformationByHandleEx(file, FileAllocationInfo, &allocinfo, sizeof(allocinfo)); + ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, "got %d, error %d\n", ret, GetLastError()); + + SetLastError(0xdeadbeef); + ret = pGetFileInformationByHandleEx(file, FileDispositionInfo, &dispinfo, sizeof(dispinfo)); + ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, "got %d, error %d\n", ret, GetLastError()); + + SetLastError(0xdeadbeef); + ret = pGetFileInformationByHandleEx(file, FileRenameInfo, &renameinfo, sizeof(renameinfo)); + ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, "got %d, error %d\n", ret, GetLastError()); + + CloseHandle(file); DeleteFileA(tempFileName); } diff --git a/include/winbase.h b/include/winbase.h index 3601051..4795d87 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -844,6 +844,36 @@ typedef struct _FILE_NAME_INFO { WCHAR FileName[1]; } FILE_NAME_INFO, *PFILE_NAME_INFO; +typedef enum _PRIORITY_HINT { + IoPriorityHintVeryLow, + IoPriorityHintLow, + IoPriorityHintNormal, + MaximumIoPriorityHintType +} PRIORITY_HINT; + +typedef struct _FILE_IO_PRIORITY_HINT_INFO { + PRIORITY_HINT PriorityHint; +} FILE_IO_PRIORITY_HINT_INFO; + +typedef struct _FILE_ALLOCATION_INFO { + LARGE_INTEGER AllocationSize; +} FILE_ALLOCATION_INFO, *PFILE_ALLOCATION_INFO; + +typedef struct _FILE_DISPOSITION_INFO { + BOOLEAN DeleteFile; +} FILE_DISPOSITION_INFO, *PFILE_DISPOSITION_INFO; + +typedef struct _FILE_END_OF_FILE_INFO { + LARGE_INTEGER EndOfFile; +} FILE_END_OF_FILE_INFO, *PFILE_END_OF_FILE_INFO; + +typedef struct _FILE_RENAME_INFO { + BOOLEAN ReplaceIfExists; + HANDLE RootDirectory; + DWORD FileNameLength; + WCHAR FileName[1]; +} FILE_RENAME_INFO, *PFILE_RENAME_INFO; + #define PIPE_ACCESS_INBOUND 1 #define PIPE_ACCESS_OUTBOUND 2 #define PIPE_ACCESS_DUPLEX 3

1 0

Nikolay Sivov : gdi32: Return GCP_USEKERNING if font has kerning pairs support.
by Alexandre Julliard 08 Jun '15

08 Jun '15

Module: wine Branch: master Commit: ce58518c6e194e3d94e8aabc974cf4689b274c03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce58518c6e194e3d94e8aabc9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jun 7 08:44:57 2015 +0300 gdi32: Return GCP_USEKERNING if font has kerning pairs support. --- dlls/gdi32/font.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 9f0de0e..63de76b 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -3032,7 +3032,6 @@ DWORD WINAPI GetFontLanguageInfo(HDC hdc) GCP_GLYPHSHAPE_MASK=FS_ARABIC, GCP_KASHIDA_MASK=0x00000000, GCP_LIGATE_MASK=0x00000000, - GCP_USEKERNING_MASK=0x00000000, GCP_REORDER_MASK=FS_HEBREW|FS_ARABIC; DWORD result=0; @@ -3058,7 +3057,7 @@ DWORD WINAPI GetFontLanguageInfo(HDC hdc) if( (fontsig.fsCsb[0]&GCP_LIGATE_MASK)!=0 ) result|=GCP_LIGATE; - if( (fontsig.fsCsb[0]&GCP_USEKERNING_MASK)!=0 ) + if( GetKerningPairsW( hdc, 0, NULL ) ) result|=GCP_USEKERNING; /* this might need a test for a HEBREW- or ARABIC_CHARSET as well */

1 0