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

Jacek Caban : winex11.drv: Use InitOnceExecuteOnce in has_opengl.
by Alexandre Julliard April 14, 2016

April 14, 2016

Module: wine Branch: master Commit: ef6890835d4148dfce9cc7500f3848ba6306ec22 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef6890835d4148dfce9cc7500… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 13 16:31:07 2016 +0200 winex11.drv: Use InitOnceExecuteOnce in has_opengl. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/opengl.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index ab29ce4..0f7534e 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -573,18 +573,14 @@ done: return ret; } -static BOOL has_opengl(void) -{ - static BOOL init_done = FALSE; - static void *opengl_handle; +static void *opengl_handle; +static BOOL WINAPI init_opengl( INIT_ONCE *once, void *param, void **context ) +{ char buffer[200]; int error_base, event_base; unsigned int i; - if (init_done) return (opengl_handle != NULL); - init_done = TRUE; - /* No need to load any other libraries as according to the ABI, libGL should be self-sufficient and include all dependencies */ opengl_handle = wine_dlopen(SONAME_LIBGL, RTLD_NOW|RTLD_GLOBAL, buffer, sizeof(buffer)); @@ -592,7 +588,7 @@ static BOOL has_opengl(void) { ERR( "Failed to load libGL: %s\n", buffer ); ERR( "OpenGL support is disabled.\n"); - return FALSE; + return TRUE; } for (i = 0; i < sizeof(opengl_func_names)/sizeof(opengl_func_names[0]); i++) @@ -757,7 +753,14 @@ static BOOL has_opengl(void) failed: wine_dlclose(opengl_handle, NULL, 0); opengl_handle = NULL; - return FALSE; + return TRUE; +} + +static BOOL has_opengl(void) +{ + static INIT_ONCE init_once = INIT_ONCE_STATIC_INIT; + InitOnceExecuteOnce(&init_once, init_opengl, NULL, NULL); + return opengl_handle != NULL; } static const char *debugstr_fbconfig( GLXFBConfig fbconfig )

1 0

Henri Verbeet : wined3d: Use the texture dimensions in swapchain_gdi_frontbuffer_updated().
by Alexandre Julliard April 14, 2016

April 14, 2016

Module: wine Branch: master Commit: 64767de27798c79a91e9b3a93f2e8a14aadd258f URL: http://source.winehq.org/git/wine.git/?a=commit;h=64767de27798c79a91e9b3a93… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 13 19:09:52 2016 +0200 wined3d: Use the texture dimensions in swapchain_gdi_frontbuffer_updated(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/swapchain.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index bada5fe..e5c7da6 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -682,9 +682,9 @@ static void swapchain_gdi_frontbuffer_updated(struct wined3d_swapchain *swapchai TRACE("offset %s.\n", wine_dbgstr_point(&offset)); draw_rect.left = 0; - draw_rect.right = front->resource.width; + draw_rect.right = swapchain->front_buffer->resource.width; draw_rect.top = 0; - draw_rect.bottom = front->resource.height; + draw_rect.bottom = swapchain->front_buffer->resource.height; IntersectRect(&draw_rect, &draw_rect, &swapchain->front_buffer_update); BitBlt(dst_dc, draw_rect.left - offset.x, draw_rect.top - offset.y,

1 0

Henri Verbeet : wined3d: Use the texture dimension helpers in wined3d_volume_upload_data().
by Alexandre Julliard April 14, 2016

April 14, 2016

Module: wine Branch: master Commit: d7e051902df31578af302dfbd743df199a52b575 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7e051902df31578af302dfbd… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 13 19:09:51 2016 +0200 wined3d: Use the texture dimension helpers in wined3d_volume_upload_data(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/volume.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index 02b5db6..cb60a24 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -79,9 +79,7 @@ void wined3d_volume_upload_data(struct wined3d_volume *volume, const struct wine const struct wined3d_gl_info *gl_info = context->gl_info; struct wined3d_texture *texture = volume->container; const struct wined3d_format *format = texture->resource.format; - UINT width = volume->resource.width; - UINT height = volume->resource.height; - UINT depth = volume->resource.depth; + unsigned int width, height, depth; const void *mem = data->addr; void *converted_mem = NULL; @@ -89,6 +87,10 @@ void wined3d_volume_upload_data(struct wined3d_volume *volume, const struct wine volume, context, volume->texture_level, debug_d3dformat(format->id), format->id); + width = wined3d_texture_get_level_width(texture, volume->texture_level); + height = wined3d_texture_get_level_height(texture, volume->texture_level); + depth = wined3d_texture_get_level_depth(texture, volume->texture_level); + if (format->convert) { UINT dst_row_pitch, dst_slice_pitch;

1 0

Henri Verbeet : wined3d: Avoid wined3d_texture_get_sub_resource() in surface_load_ds_location().
by Alexandre Julliard April 14, 2016

April 14, 2016

Module: wine Branch: master Commit: fca93ef017262657f56aa72796a2fd6fe447d27f URL: http://source.winehq.org/git/wine.git/?a=commit;h=fca93ef017262657f56aa7279… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 13 19:09:53 2016 +0200 wined3d: Avoid wined3d_texture_get_sub_resource() in surface_load_ds_location(). 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 b2e5081..cbaa14f 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2836,7 +2836,7 @@ static void surface_load_ds_location(struct wined3d_surface *surface, struct win /* Note that we use depth_blt here as well, rather than glCopyTexImage2D * directly on the FBO texture. That's because we need to flip. */ context_apply_fbo_state_blit(context, GL_FRAMEBUFFER, - wined3d_texture_get_sub_resource(context->swapchain->front_buffer, 0)->u.surface, + context->swapchain->front_buffer->sub_resources[0].u.surface, NULL, WINED3D_LOCATION_DRAWABLE); if (surface->texture_target == GL_TEXTURE_RECTANGLE_ARB) { @@ -2882,7 +2882,7 @@ static void surface_load_ds_location(struct wined3d_surface *surface, struct win TRACE("Copying depth texture to onscreen depth buffer.\n"); context_apply_fbo_state_blit(context, GL_FRAMEBUFFER, - wined3d_texture_get_sub_resource(context->swapchain->front_buffer, 0)->u.surface, + context->swapchain->front_buffer->sub_resources[0].u.surface, NULL, WINED3D_LOCATION_DRAWABLE); surface_depth_blt(surface, context, texture->texture_rgb.name, 0, surface->pow2Height - h, w, h, surface->texture_target);

1 0

Józef Kucia : dxgi: Do not store IDXGIOutputs in IDXGIAdapter.
by Alexandre Julliard April 14, 2016

April 14, 2016

Module: wine Branch: master Commit: b835a358819a6bd70bfc3b6f5b76c1d9d5cc55a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b835a358819a6bd70bfc3b6f5… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Apr 14 12:20:21 2016 +0200 dxgi: Do not store IDXGIOutputs in IDXGIAdapter. 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/dxgi/adapter.c | 28 +++++++++++----------------- dlls/dxgi/dxgi_private.h | 5 ++--- dlls/dxgi/factory.c | 15 +-------------- dlls/dxgi/output.c | 27 +++++++++++++++++++-------- dlls/dxgi/tests/device.c | 18 +++++++++--------- 5 files changed, 42 insertions(+), 51 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b835a358819a6bd70bfc3…

1 0

Henri Verbeet : wined3d: Store the power-of-two dimensions in the texture.
by Alexandre Julliard April 14, 2016

April 14, 2016

Module: wine Branch: master Commit: 1e0603eb58aaa3e28880bf82782619867ae441f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e0603eb58aaa3e28880bf827… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 13 19:09:54 2016 +0200 wined3d: Store the power-of-two dimensions in the texture. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 21 ++------------------- dlls/wined3d/texture.c | 18 +++++++++++------- dlls/wined3d/wined3d_private.h | 14 ++++++++++++++ 3 files changed, 27 insertions(+), 26 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index cbaa14f..de82dda 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -4501,25 +4501,6 @@ HRESULT wined3d_surface_init(struct wined3d_surface *surface, struct wined3d_tex unsigned int resource_size; HRESULT hr; - if (container->flags & WINED3D_TEXTURE_COND_NP2_EMULATED) - { - unsigned int pow2_width = 1, pow2_height = 1; - - /* Find the nearest pow2 match. */ - while (pow2_width < desc->width) - pow2_width <<= 1; - while (pow2_height < desc->height) - pow2_height <<= 1; - - surface->pow2Width = pow2_width; - surface->pow2Height = pow2_height; - } - else - { - surface->pow2Width = desc->width; - surface->pow2Height = desc->height; - } - /* Quick lockable sanity check. * TODO: remove this after surfaces, usage and lockability have been debugged properly * this function is too deep to need to care about things like this. @@ -4564,6 +4545,8 @@ HRESULT wined3d_surface_init(struct wined3d_surface *surface, struct wined3d_tex } surface->container = container; + surface->pow2Width = wined3d_texture_get_level_pow2_width(container, level); + surface->pow2Height = wined3d_texture_get_level_pow2_height(container, level); surface->texture_target = target; surface->texture_level = level; surface->texture_layer = layer; diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index e1d60cb..2ca94c0 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -899,18 +899,20 @@ HRESULT CDECL wined3d_texture_update_desc(struct wined3d_texture *texture, UINT && !gl_info->supported[ARB_TEXTURE_RECTANGLE] && !gl_info->supported[WINED3D_GL_NORMALIZED_TEXRECT]) { texture->flags |= WINED3D_TEXTURE_COND_NP2_EMULATED; - surface->pow2Width = surface->pow2Height = 1; - while (surface->pow2Width < width) - surface->pow2Width <<= 1; - while (surface->pow2Height < height) - surface->pow2Height <<= 1; + texture->pow2_width = texture->pow2_height = 1; + while (texture->pow2_width < width) + texture->pow2_width <<= 1; + while (texture->pow2_height < height) + texture->pow2_height <<= 1; } else { texture->flags &= ~WINED3D_TEXTURE_COND_NP2_EMULATED; - surface->pow2Width = width; - surface->pow2Height = height; + texture->pow2_width = width; + texture->pow2_height = height; } + surface->pow2Width = texture->pow2_width; + surface->pow2Height = texture->pow2_height; sub_resource->locations = 0; @@ -1556,6 +1558,8 @@ static HRESULT texture_init(struct wined3d_texture *texture, const struct wined3 texture->flags |= WINED3D_TEXTURE_COND_NP2_EMULATED; } } + texture->pow2_width = pow2_width; + texture->pow2_height = pow2_height; if ((pow2_width > gl_info->limits.texture_size || pow2_height > gl_info->limits.texture_size) && (desc->usage & WINED3DUSAGE_TEXTURE)) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 967f39e..d74f143 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2449,6 +2449,8 @@ struct wined3d_texture const struct wined3d_texture_ops *texture_ops; struct gl_texture texture_rgb, texture_srgb; struct wined3d_swapchain *swapchain; + unsigned int pow2_width; + unsigned int pow2_height; UINT layer_count; UINT level_count; unsigned int download_count; @@ -2521,6 +2523,18 @@ static inline unsigned int wined3d_texture_get_level_depth(const struct wined3d_ return max(1, texture->resource.depth >> level); } +static inline unsigned int wined3d_texture_get_level_pow2_width(const struct wined3d_texture *texture, + unsigned int level) +{ + return max(1, texture->pow2_width >> level); +} + +static inline unsigned int wined3d_texture_get_level_pow2_height(const struct wined3d_texture *texture, + unsigned int level) +{ + return max(1, texture->pow2_height >> level); +} + void wined3d_texture_apply_sampler_desc(struct wined3d_texture *texture, const struct wined3d_sampler_desc *sampler_desc, const struct wined3d_context *context) DECLSPEC_HIDDEN; void wined3d_texture_bind(struct wined3d_texture *texture,

1 0

Nikolay Sivov : dwrite/tests: A test for glyphBox* metrics.
by Alexandre Julliard April 14, 2016

April 14, 2016

Module: wine Branch: master Commit: 726e82dde2c04255185f3dbe9846b95630d47db0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=726e82dde2c04255185f3dbe9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Apr 14 19:10:31 2016 +0300 dwrite/tests: A test for glyphBox* metrics. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/tests/font.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 25c85e8..9687dc5 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -1551,8 +1551,13 @@ static void get_expected_font_metrics(IDWriteFontFace *fontface, DWRITE_FONT_MET hr = IDWriteFontFace_TryGetFontTable(fontface, MS_POST_TAG, (const void**)&tt_post, &size, &post_context, &exists); ok(hr == S_OK, "got 0x%08x\n", hr); - if (tt_head) + if (tt_head) { metrics->designUnitsPerEm = GET_BE_WORD(tt_head->unitsPerEm); + metrics->glyphBoxLeft = GET_BE_WORD(tt_head->xMin); + metrics->glyphBoxTop = GET_BE_WORD(tt_head->yMax); + metrics->glyphBoxRight = GET_BE_WORD(tt_head->xMax); + metrics->glyphBoxBottom = GET_BE_WORD(tt_head->yMin); + } if (tt_os2) { if (GET_BE_WORD(tt_os2->fsSelection) & OS2_FSSELECTION_USE_TYPO_METRICS) { @@ -1618,6 +1623,14 @@ static void check_font_metrics(const WCHAR *nameW, BOOL has_metrics1, const DWRI const DWRITE_FONT_METRICS1 *m1 = (const DWRITE_FONT_METRICS1*)got; ok(m1->hasTypographicMetrics == expected->hasTypographicMetrics, "font %s: hasTypographicMetrics %d, " "expected %d\n", wine_dbgstr_w(nameW), m1->hasTypographicMetrics, expected->hasTypographicMetrics); + ok(m1->glyphBoxLeft == expected->glyphBoxLeft, "font %s: glyphBoxLeft %d, expected %d\n", wine_dbgstr_w(nameW), + m1->glyphBoxLeft, expected->glyphBoxLeft); + ok(m1->glyphBoxTop == expected->glyphBoxTop, "font %s: glyphBoxTop %d, expected %d\n", wine_dbgstr_w(nameW), + m1->glyphBoxTop, expected->glyphBoxTop); + ok(m1->glyphBoxRight == expected->glyphBoxRight, "font %s: glyphBoxRight %d, expected %d\n", wine_dbgstr_w(nameW), + m1->glyphBoxRight, expected->glyphBoxRight); + ok(m1->glyphBoxBottom == expected->glyphBoxBottom, "font %s: glyphBoxBottom %d, expected %d\n", wine_dbgstr_w(nameW), + m1->glyphBoxBottom, expected->glyphBoxBottom); } }

1 0

Józef Kucia : dxgi: Store IDXGIAdapter in IDXGIDevice.
by Alexandre Julliard April 14, 2016

April 14, 2016

Module: wine Branch: master Commit: 25ad11cef766eeb6706363e299e5885d6996ae12 URL: http://source.winehq.org/git/wine.git/?a=commit;h=25ad11cef766eeb6706363e29… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Apr 14 12:20:22 2016 +0200 dxgi: Store IDXGIAdapter in IDXGIDevice. 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/dxgi/device.c | 35 ++++++++++++++++++----------------- dlls/dxgi/dxgi_private.h | 1 + 2 files changed, 19 insertions(+), 17 deletions(-) diff --git a/dlls/dxgi/device.c b/dlls/dxgi/device.c index 0c82383..f5de698 100644 --- a/dlls/dxgi/device.c +++ b/dlls/dxgi/device.c @@ -72,21 +72,23 @@ static ULONG STDMETHODCALLTYPE dxgi_device_AddRef(IWineDXGIDevice *iface) static ULONG STDMETHODCALLTYPE dxgi_device_Release(IWineDXGIDevice *iface) { - struct dxgi_device *This = impl_from_IWineDXGIDevice(iface); - ULONG refcount = InterlockedDecrement(&This->refcount); + struct dxgi_device *device = impl_from_IWineDXGIDevice(iface); + ULONG refcount = InterlockedDecrement(&device->refcount); - TRACE("%p decreasing refcount to %u\n", This, refcount); + TRACE("%p decreasing refcount to %u.\n", device, refcount); if (!refcount) { - if (This->child_layer) IUnknown_Release(This->child_layer); + if (device->child_layer) + IUnknown_Release(device->child_layer); wined3d_mutex_lock(); - wined3d_device_uninit_3d(This->wined3d_device); - wined3d_device_decref(This->wined3d_device); + wined3d_device_uninit_3d(device->wined3d_device); + wined3d_device_decref(device->wined3d_device); wined3d_mutex_unlock(); - IDXGIFactory1_Release(This->factory); - wined3d_private_store_cleanup(&This->private_store); - HeapFree(GetProcessHeap(), 0, This); + IDXGIAdapter1_Release(device->adapter); + IDXGIFactory1_Release(device->factory); + wined3d_private_store_cleanup(&device->private_store); + HeapFree(GetProcessHeap(), 0, device); } return refcount; @@ -148,16 +150,13 @@ static HRESULT STDMETHODCALLTYPE dxgi_device_GetParent(IWineDXGIDevice *iface, R static HRESULT STDMETHODCALLTYPE dxgi_device_GetAdapter(IWineDXGIDevice *iface, IDXGIAdapter **adapter) { - struct dxgi_device *This = impl_from_IWineDXGIDevice(iface); - struct wined3d_device_creation_parameters create_parameters; + struct dxgi_device *device = impl_from_IWineDXGIDevice(iface); - TRACE("iface %p, adapter %p\n", iface, adapter); + TRACE("iface %p, adapter %p.\n", iface, adapter); - wined3d_mutex_lock(); - wined3d_device_get_creation_parameters(This->wined3d_device, &create_parameters); - wined3d_mutex_unlock(); - - return IDXGIFactory1_EnumAdapters(This->factory, create_parameters.adapter_idx, adapter); + *adapter = (IDXGIAdapter *)device->adapter; + IDXGIAdapter_AddRef(*adapter); + return S_OK; } static HRESULT STDMETHODCALLTYPE dxgi_device_CreateSurface(IWineDXGIDevice *iface, @@ -457,6 +456,8 @@ HRESULT dxgi_device_init(struct dxgi_device *device, struct dxgi_device_layer *l device->factory = &dxgi_factory->IDXGIFactory1_iface; IDXGIFactory1_AddRef(device->factory); + device->adapter = &dxgi_adapter->IDXGIAdapter1_iface; + IDXGIAdapter1_AddRef(device->adapter); return S_OK; } diff --git a/dlls/dxgi/dxgi_private.h b/dlls/dxgi/dxgi_private.h index a4ed850..7c81900 100644 --- a/dlls/dxgi/dxgi_private.h +++ b/dlls/dxgi/dxgi_private.h @@ -119,6 +119,7 @@ struct dxgi_device struct wined3d_private_store private_store; struct wined3d_device *wined3d_device; IDXGIFactory1 *factory; + IDXGIAdapter1 *adapter; }; HRESULT dxgi_device_init(struct dxgi_device *device, struct dxgi_device_layer *layer,

1 0

Nikolay Sivov : wordpad: Use correct buffer size when calling SHGetFolderPathW() (Coverity).
by Alexandre Julliard April 14, 2016

April 14, 2016

Module: wine Branch: master Commit: fde563b0d49b00d277b67605d3e99436dd68327f URL: http://source.winehq.org/git/wine.git/?a=commit;h=fde563b0d49b00d277b67605d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 13 22:28:23 2016 +0300 wordpad: Use correct buffer size when calling SHGetFolderPathW() (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wordpad/registry.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/wordpad/registry.c b/programs/wordpad/registry.c index 22b5c06..bf2af5b 100644 --- a/programs/wordpad/registry.c +++ b/programs/wordpad/registry.c @@ -154,9 +154,9 @@ static void format_filelist_filename(LPWSTR file, LPWSTR out) { LPWSTR pos_basename; LPWSTR truncpos1, truncpos2; - WCHAR myDocs[MAX_STRING_LEN]; + WCHAR myDocs[MAX_PATH]; - SHGetFolderPathW(NULL, CSIDL_PERSONAL, NULL, SHGFP_TYPE_CURRENT, (LPWSTR)&myDocs); + SHGetFolderPathW(NULL, CSIDL_PERSONAL, NULL, SHGFP_TYPE_CURRENT, myDocs); pos_basename = file_basename(file); truncpos1 = NULL; truncpos2 = NULL;

1 0

Nikolay Sivov : webservices: Fix unsupported options detection (Coverity).
by Alexandre Julliard April 13, 2016

April 13, 2016

Module: wine Branch: master Commit: 1ccc52169730079414eb3e4d1a18ec1131bb6ed3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ccc52169730079414eb3e4d1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 13 19:00:40 2016 +0300 webservices: Fix unsupported options detection (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index c2c9d0b..09b370e 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -2761,7 +2761,7 @@ static HRESULT read_type_text( struct reader *reader, const WS_FIELD_DESCRIPTION static WS_READ_OPTION map_field_options( WS_TYPE type, ULONG options ) { - if (options & !(WS_FIELD_POINTER | WS_FIELD_OPTIONAL)) + if (options & ~(WS_FIELD_POINTER | WS_FIELD_OPTIONAL)) { FIXME( "options %08x not supported\n", options ); return 0;

1 0