wine-commits October 2014

wine-commits@winehq.org

2 participants
397 discussions

Nikolay Sivov : dwrite: Initial implementation of GetGlyphs().
by Alexandre Julliard 06 Oct '14

06 Oct '14

Module: wine Branch: master Commit: 1843972e0e223a98e0c815e7e5f6be668d15a347 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1843972e0e223a98e0c815e7e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Oct 5 17:07:46 2014 +0400 dwrite: Initial implementation of GetGlyphs(). --- dlls/dwrite/Makefile.in | 3 +- dlls/dwrite/analyzer.c | 116 ++++++++++++++++++++++++++++++++-- dlls/dwrite/dwrite_private.h | 32 ++++++++++ dlls/dwrite/shape.c | 147 +++++++++++++++++++++++++++++++++++++++++++ dlls/dwrite/tests/analyzer.c | 112 ++++++++++++++++++++++++++------- 5 files changed, 382 insertions(+), 28 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1843972e0e223a98e0c81…

1 0

Henri Verbeet : wined3d: Don't check for color-keying for WINED3D_CT_P8.
by Alexandre Julliard 06 Oct '14

06 Oct '14

Module: wine Branch: master Commit: fd342cce3eb780567ee3c9278e097bc7a1575d77 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd342cce3eb780567ee3c9278… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Oct 6 08:24:21 2014 +0200 wined3d: Don't check for color-keying for WINED3D_CT_P8. We don't support p8 color keying either way. --- dlls/wined3d/surface.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index f2be4c9..ee51f6b 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1588,7 +1588,6 @@ static void surface_upload_data(struct wined3d_surface *surface, const struct wi static void d3dfmt_get_conv(const struct wined3d_texture *texture, BOOL need_alpha_ck, struct wined3d_format *format, enum wined3d_conversion_type *conversion_type) { - BOOL colorkey_active = need_alpha_ck && (texture->color_key_flags & WINEDDSD_CKSRCBLT); const struct wined3d_device *device = texture->resource.device; const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; const struct wined3d_format *dst_format; @@ -1614,7 +1613,7 @@ static void d3dfmt_get_conv(const struct wined3d_texture *texture, BOOL need_alp *conversion_type = WINED3D_CT_NONE; dst_format_id = format->id; - if (colorkey_active) + if (need_alpha_ck && (texture->color_key_flags & WINEDDSD_CKSRCBLT)) { for (i = 0; i < sizeof(color_key_info) / sizeof(*color_key_info); ++i) { @@ -1632,8 +1631,8 @@ static void d3dfmt_get_conv(const struct wined3d_texture *texture, BOOL need_alp /* FIXME: This should check if the blitter backend can do P8 conversion, * instead of checking for ARB_fragment_program. */ if (texture->resource.format->id == WINED3DFMT_P8_UINT - && (!(gl_info->supported[ARB_FRAGMENT_PROGRAM] && texture->swapchain - && texture == texture->swapchain->front_buffer) || colorkey_active)) + && !(gl_info->supported[ARB_FRAGMENT_PROGRAM] && texture->swapchain + && texture == texture->swapchain->front_buffer)) { *conversion_type = WINED3D_CT_P8; dst_format_id = WINED3DFMT_B8G8R8A8_UNORM;

1 0

Henri Verbeet : wined3d: Print a FIXME for any unhandled format in d3dfmt_get_conv().
by Alexandre Julliard 06 Oct '14

06 Oct '14

Module: wine Branch: master Commit: c5bf229287b820b26f8fe9d7f5cbd7ec0b369f9d URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5bf229287b820b26f8fe9d7f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Oct 6 08:24:20 2014 +0200 wined3d: Print a FIXME for any unhandled format in d3dfmt_get_conv(). --- dlls/wined3d/surface.c | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 9d41fef..f2be4c9 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1625,24 +1625,18 @@ static void d3dfmt_get_conv(const struct wined3d_texture *texture, BOOL need_alp dst_format_id = color_key_info[i].dst_format; break; } - } - if (texture->resource.format->id == WINED3DFMT_P8_UINT) - { - /* FIXME: This should check if the blitter backend can do P8 - * conversion, instead of checking for ARB_fragment_program. */ - if (!((gl_info->supported[ARB_FRAGMENT_PROGRAM] && texture->swapchain - && texture == texture->swapchain->front_buffer)) || colorkey_active) - { - *conversion_type = WINED3D_CT_P8; - dst_format_id = WINED3DFMT_B8G8R8A8_UNORM; - } + FIXME("Color-keying not supported with format %s.\n", debug_d3dformat(texture->resource.format->id)); } - else if (texture->resource.format->id == WINED3DFMT_B2G3R3_UNORM && colorkey_active) + + /* FIXME: This should check if the blitter backend can do P8 conversion, + * instead of checking for ARB_fragment_program. */ + if (texture->resource.format->id == WINED3DFMT_P8_UINT + && (!(gl_info->supported[ARB_FRAGMENT_PROGRAM] && texture->swapchain + && texture == texture->swapchain->front_buffer) || colorkey_active)) { - /* This texture format will never be used... So do not care about - * color-keying up until the point in time it will be needed. */ - FIXME("Color-keying not supported with WINED3DFMT_B2G3R3_UNORM.\n"); + *conversion_type = WINED3D_CT_P8; + dst_format_id = WINED3DFMT_B8G8R8A8_UNORM; } if (*conversion_type != WINED3D_CT_NONE)

1 0

Henri Verbeet : wined3d: Don' t abuse conv_byte_count for color-key conversions.
by Alexandre Julliard 06 Oct '14

06 Oct '14

Module: wine Branch: master Commit: dffcc36dd4c0da91de692aa93c4a1ffb953d4e37 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dffcc36dd4c0da91de692aa93… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Oct 6 08:24:19 2014 +0200 wined3d: Don't abuse conv_byte_count for color-key conversions. --- dlls/wined3d/surface.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 41dc2ac..9d41fef 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1653,7 +1653,7 @@ static void d3dfmt_get_conv(const struct wined3d_texture *texture, BOOL need_alp format->rtInternal = dst_format->rtInternal; format->glFormat = dst_format->glFormat; format->glType = dst_format->glType; - format->conv_byte_count = dst_format->byte_count; + format->byte_count = dst_format->byte_count; } } @@ -4611,8 +4611,8 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface, /* This code is entered for texture formats which need a fixup. */ UINT height = surface->resource.height; - /* Stick to the alignment for the converted surface too, makes it easier to load the surface */ - dst_pitch = width * format.conv_byte_count; + format.byte_count = format.conv_byte_count; + dst_pitch = wined3d_format_calculate_pitch(&format, width); dst_pitch = (dst_pitch + device->surface_alignment - 1) & ~(device->surface_alignment - 1); if (!(mem = HeapAlloc(GetProcessHeap(), 0, dst_pitch * height))) @@ -4623,7 +4623,6 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface, } format.convert(data.addr, mem, src_pitch, src_pitch * height, dst_pitch, dst_pitch * height, width, height, 1); - format.byte_count = format.conv_byte_count; src_pitch = dst_pitch; data.addr = mem; } @@ -4632,8 +4631,7 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface, /* This code is only entered for color keying fixups */ UINT height = surface->resource.height; - /* Stick to the alignment for the converted surface too, makes it easier to load the surface */ - dst_pitch = width * format.conv_byte_count; + dst_pitch = wined3d_format_calculate_pitch(&format, width); dst_pitch = (dst_pitch + device->surface_alignment - 1) & ~(device->surface_alignment - 1); if (!(mem = HeapAlloc(GetProcessHeap(), 0, dst_pitch * height))) @@ -4644,7 +4642,6 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface, } d3dfmt_convert_surface(data.addr, mem, src_pitch, width, height, dst_pitch, convert, surface); - format.byte_count = format.conv_byte_count; src_pitch = dst_pitch; data.addr = mem; }

1 0

Henri Verbeet : wined3d: Just use glGammaInternal/ rtInternal from the destination format in d3dfmt_get_conv().
by Alexandre Julliard 06 Oct '14

06 Oct '14

Module: wine Branch: master Commit: b0ce89d81015fe23ecc4584e1e2dea17960e5c33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0ce89d81015fe23ecc4584e1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Oct 6 08:24:18 2014 +0200 wined3d: Just use glGammaInternal/rtInternal from the destination format in d3dfmt_get_conv(). Using glGammaInternal or rtInternal should do the right thing in principle, although in practice they should never get used either way. --- 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 a8e0f51..41dc2ac 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1649,8 +1649,8 @@ static void d3dfmt_get_conv(const struct wined3d_texture *texture, BOOL need_alp { dst_format = wined3d_get_format(gl_info, dst_format_id); format->glInternal = dst_format->glInternal; - format->glGammaInternal = format->glInternal; - format->rtInternal = format->glInternal; + format->glGammaInternal = dst_format->glGammaInternal; + format->rtInternal = dst_format->rtInternal; format->glFormat = dst_format->glFormat; format->glType = dst_format->glType; format->conv_byte_count = dst_format->byte_count;

1 0

Henri Verbeet : d2d1: Implement d2d_d3d_render_target_DrawTextLayout().
by Alexandre Julliard 06 Oct '14

06 Oct '14

Module: wine Branch: master Commit: 0d962da9d3c7a5b3b6509da66c1a05926c7554b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d962da9d3c7a5b3b6509da66… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Oct 6 08:24:17 2014 +0200 d2d1: Implement d2d_d3d_render_target_DrawTextLayout(). --- dlls/d2d1/d2d1_private.h | 5 ++ dlls/d2d1/factory.c | 1 + dlls/d2d1/render_target.c | 138 +++++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 143 insertions(+), 1 deletion(-) diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index 7c7956b..2d1fea2 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -24,6 +24,10 @@ #include <limits.h> #define COBJMACROS #include "d2d1.h" +#ifdef D2D1_INIT_GUID +#include "initguid.h" +#endif +#include "dwrite.h" struct d2d_clip_stack { @@ -35,6 +39,7 @@ struct d2d_clip_stack struct d2d_d3d_render_target { ID2D1RenderTarget ID2D1RenderTarget_iface; + IDWriteTextRenderer IDWriteTextRenderer_iface; LONG refcount; ID3D10Device *device; diff --git a/dlls/d2d1/factory.c b/dlls/d2d1/factory.c index 7919210..27370c1 100644 --- a/dlls/d2d1/factory.c +++ b/dlls/d2d1/factory.c @@ -19,6 +19,7 @@ #include "config.h" #include "wine/port.h" +#define D2D1_INIT_GUID #include "d2d1_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d2d); diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index 4a69fce..f730e64 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -26,6 +26,12 @@ WINE_DEFAULT_DEBUG_CHANNEL(d2d); #define INITIAL_CLIP_STACK_SIZE 4 +struct d2d_draw_text_layout_ctx +{ + ID2D1Brush *brush; + D2D1_DRAW_TEXT_OPTIONS options; +}; + static void d2d_point_transform(D2D1_POINT_2F *dst, const D2D1_MATRIX_3X2_F *matrix, float x, float y) { dst->x = x * matrix->_11 + y * matrix->_21 + matrix->_31; @@ -503,8 +509,19 @@ static void STDMETHODCALLTYPE d2d_d3d_render_target_DrawText(ID2D1RenderTarget * static void STDMETHODCALLTYPE d2d_d3d_render_target_DrawTextLayout(ID2D1RenderTarget *iface, D2D1_POINT_2F origin, IDWriteTextLayout *layout, ID2D1Brush *brush, D2D1_DRAW_TEXT_OPTIONS options) { - FIXME("iface %p, origin {%.8e, %.8e}, layout %p, brush %p, options %#x stub!\n", + struct d2d_d3d_render_target *render_target = impl_from_ID2D1RenderTarget(iface); + struct d2d_draw_text_layout_ctx ctx; + HRESULT hr; + + TRACE("iface %p, origin {%.8e, %.8e}, layout %p, brush %p, options %#x.\n", iface, origin.x, origin.y, layout, brush, options); + + ctx.brush = brush; + ctx.options = options; + + if (FAILED(hr = IDWriteTextLayout_Draw(layout, + &ctx, &render_target->IDWriteTextRenderer_iface, origin.x, origin.y))) + FIXME("Failed to draw text layout, hr %#x.\n", hr); } static void STDMETHODCALLTYPE d2d_d3d_render_target_DrawGlyphRun(ID2D1RenderTarget *iface, @@ -883,6 +900,124 @@ static const struct ID2D1RenderTargetVtbl d2d_d3d_render_target_vtbl = d2d_d3d_render_target_IsSupported, }; +static inline struct d2d_d3d_render_target *impl_from_IDWriteTextRenderer(IDWriteTextRenderer *iface) +{ + return CONTAINING_RECORD(iface, struct d2d_d3d_render_target, IDWriteTextRenderer_iface); +} + +HRESULT STDMETHODCALLTYPE d2d_text_renderer_QueryInterface(IDWriteTextRenderer *iface, REFIID iid, void **out) +{ + TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); + + if (IsEqualGUID(iid, &IID_IDWriteTextRenderer) + || IsEqualGUID(iid, &IID_IDWritePixelSnapping) + || IsEqualGUID(iid, &IID_IUnknown)) + { + IDWriteTextRenderer_AddRef(iface); + *out = iface; + return S_OK; + } + + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); + + *out = NULL; + return E_NOINTERFACE; +} + +ULONG STDMETHODCALLTYPE d2d_text_renderer_AddRef(IDWriteTextRenderer *iface) +{ + struct d2d_d3d_render_target *render_target = impl_from_IDWriteTextRenderer(iface); + + TRACE("iface %p.\n", iface); + + return d2d_d3d_render_target_AddRef(&render_target->ID2D1RenderTarget_iface); +} + +ULONG STDMETHODCALLTYPE d2d_text_renderer_Release(IDWriteTextRenderer *iface) +{ + struct d2d_d3d_render_target *render_target = impl_from_IDWriteTextRenderer(iface); + + TRACE("iface %p.\n", iface); + + return d2d_d3d_render_target_Release(&render_target->ID2D1RenderTarget_iface); +} + +HRESULT STDMETHODCALLTYPE d2d_text_renderer_IsPixelSnappingDisabled(IDWriteTextRenderer *iface, + void *ctx, BOOL *disabled) +{ + FIXME("iface %p, ctx %p, disabled %p stub!\n", iface, ctx, disabled); + + return E_NOTIMPL; +} + +HRESULT STDMETHODCALLTYPE d2d_text_renderer_GetCurrentTransform(IDWriteTextRenderer *iface, + void *ctx, DWRITE_MATRIX *transform) +{ + FIXME("iface %p, ctx %p, transform %p stub!\n", iface, ctx, transform); + + return E_NOTIMPL; +} + +HRESULT STDMETHODCALLTYPE d2d_text_renderer_GetPixelsPerDip(IDWriteTextRenderer *iface, void *ctx, float *ppd) +{ + FIXME("iface %p, ctx %p, ppd %p stub!\n", iface, ctx, ppd); + + return E_NOTIMPL; +} + +HRESULT STDMETHODCALLTYPE d2d_text_renderer_DrawGlyphRun(IDWriteTextRenderer *iface, void *ctx, + float baseline_origin_x, float baseline_origin_y, DWRITE_MEASURING_MODE measuring_mode, + const DWRITE_GLYPH_RUN *glyph_run, const DWRITE_GLYPH_RUN_DESCRIPTION *desc, IUnknown *effect) +{ + FIXME("iface %p, ctx %p, baseline_origin_x %.8e, baseline_origin_y %.8e, " + "measuring_mode %#x, glyph_run %p, desc %p, effect %p stub!\n", + iface, ctx, baseline_origin_x, baseline_origin_y, + measuring_mode, glyph_run, desc, effect); + + return E_NOTIMPL; +} + +HRESULT STDMETHODCALLTYPE d2d_text_renderer_DrawUnderline(IDWriteTextRenderer *iface, void *ctx, + float baseline_origin_x, float baseline_origin_y, const DWRITE_UNDERLINE *underline, IUnknown *effect) +{ + FIXME("iface %p, ctx %p, baseline_origin_x %.8e, baseline_origin_y %.8e, underline %p, effect %p stub!\n", + iface, ctx, baseline_origin_x, baseline_origin_y, underline, effect); + + return E_NOTIMPL; +} + +HRESULT STDMETHODCALLTYPE d2d_text_renderer_DrawStrikethrough(IDWriteTextRenderer *iface, void *ctx, + float baseline_origin_x, float baseline_origin_y, const DWRITE_STRIKETHROUGH *strikethrough, IUnknown *effect) +{ + FIXME("iface %p, ctx %p, baseline_origin_x %.8e, baseline_origin_y %.8e, strikethrough %p, effect %p stub!\n", + iface, ctx, baseline_origin_x, baseline_origin_y, strikethrough, effect); + + return E_NOTIMPL; +} + +HRESULT STDMETHODCALLTYPE d2d_text_renderer_DrawInlineObject(IDWriteTextRenderer *iface, void *ctx, + float origin_x, float origin_y, IDWriteInlineObject *object, BOOL is_sideways, BOOL is_rtl, IUnknown *effect) +{ + FIXME("iface %p, ctx %p, origin_x %.8e, origin_y %.8e, object %p, is_sideways %#x, is_rtl %#x, effect %p stub!\n", + iface, ctx, origin_x, origin_y, object, is_sideways, is_rtl, effect); + + return E_NOTIMPL; +} + +static const struct IDWriteTextRendererVtbl d2d_text_renderer_vtbl = +{ + d2d_text_renderer_QueryInterface, + d2d_text_renderer_AddRef, + d2d_text_renderer_Release, + d2d_text_renderer_IsPixelSnappingDisabled, + d2d_text_renderer_GetCurrentTransform, + d2d_text_renderer_GetPixelsPerDip, + d2d_text_renderer_DrawGlyphRun, + d2d_text_renderer_DrawUnderline, + d2d_text_renderer_DrawStrikethrough, + d2d_text_renderer_DrawInlineObject, +}; + HRESULT d2d_d3d_render_target_init(struct d2d_d3d_render_target *render_target, ID2D1Factory *factory, IDXGISurface *surface, const D2D1_RENDER_TARGET_PROPERTIES *desc) { @@ -967,6 +1102,7 @@ HRESULT d2d_d3d_render_target_init(struct d2d_d3d_render_target *render_target, FIXME("Ignoring render target properties.\n"); render_target->ID2D1RenderTarget_iface.lpVtbl = &d2d_d3d_render_target_vtbl; + render_target->IDWriteTextRenderer_iface.lpVtbl = &d2d_text_renderer_vtbl; render_target->refcount = 1; if (FAILED(hr = IDXGISurface_GetDevice(surface, &IID_ID3D10Device, (void **)&render_target->device)))

1 0

Nikolay Sivov : gameux: Use CLSIDFromString() instead of shell32 equivalent.
by Alexandre Julliard 06 Oct '14

06 Oct '14

Module: wine Branch: master Commit: febb3974b51188ce03a129ada12c6a9dd934da8c URL: http://source.winehq.org/git/wine.git/?a=commit;h=febb3974b51188ce03a129ada… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 14 22:53:29 2014 +0400 gameux: Use CLSIDFromString() instead of shell32 equivalent. --- dlls/gameux/gameexplorer.c | 5 +---- dlls/gameux/tests/gameexplorer.c | 5 +---- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/dlls/gameux/gameexplorer.c b/dlls/gameux/gameexplorer.c index 1690bd7..6bdb2e4 100644 --- a/dlls/gameux/gameexplorer.c +++ b/dlls/gameux/gameexplorer.c @@ -35,9 +35,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(gameux); -/* function from Shell32, not defined in header */ -extern BOOL WINAPI GUIDFromStringW(LPCWSTR psz, LPGUID pguid); - /******************************************************************************* * GameUX helper functions */ @@ -780,7 +777,7 @@ HRESULT GAMEUX_FindGameInstanceId( if(lstrcmpW(lpValue, sGDFBinaryPath)==0) { /* key found, let's copy instance id and exit */ - hr = (GUIDFromStringW(lpName, pInstanceId) ? S_OK : E_FAIL); + hr = CLSIDFromString(lpName, pInstanceId); found = TRUE; } HeapFree(GetProcessHeap(), 0, lpValue); diff --git a/dlls/gameux/tests/gameexplorer.c b/dlls/gameux/tests/gameexplorer.c index 5ed780c..1f25f71 100644 --- a/dlls/gameux/tests/gameexplorer.c +++ b/dlls/gameux/tests/gameexplorer.c @@ -33,9 +33,6 @@ #include "wine/test.h" -/* function from Shell32, not defined in header */ -extern BOOL WINAPI GUIDFromStringW(LPCWSTR psz, LPGUID pguid); - /******************************************************************************* * Pointers used instead of direct calls. These procedures are not available on * older system, which causes problem while loading test binary. @@ -476,7 +473,7 @@ static void _findGameInstanceId(int line, if(lstrcmpW(lpValue, sGDFBinaryPath)==0) { /* key found, let's copy instance id and exit */ - hr = (GUIDFromStringW(lpName, pInstanceId) ? S_OK : E_FAIL); + hr = CLSIDFromString(lpName, pInstanceId); ok(SUCCEEDED(hr), "cannot convert subkey to guid: %s\n", wine_dbgstr_w(lpName));

1 0

Nikolay Sivov : gameux: Cleanup failure handling when processing main definition element, use better naming.
by Alexandre Julliard 06 Oct '14

06 Oct '14

Module: wine Branch: master Commit: d721eee1ddbd4fc56947573b83c8642d73688e85 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d721eee1ddbd4fc56947573b8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 14 22:39:54 2014 +0400 gameux: Cleanup failure handling when processing main definition element, use better naming. --- dlls/gameux/gameexplorer.c | 77 ++++++++++++++++++++-------------------------- 1 file changed, 34 insertions(+), 43 deletions(-) diff --git a/dlls/gameux/gameexplorer.c b/dlls/gameux/gameexplorer.c index cbe3e8d..1690bd7 100644 --- a/dlls/gameux/gameexplorer.c +++ b/dlls/gameux/gameexplorer.c @@ -325,67 +325,58 @@ static HRESULT GAMEUX_ProcessGameDefinitionElement( * GameData [O] structure where data loaded from * XML element will be stored in */ -static HRESULT GAMEUX_ParseGameDefinition( - IXMLDOMElement *gdElement, - struct GAMEUX_GAME_DATA *GameData) +static HRESULT GAMEUX_ParseGameDefinition(IXMLDOMElement *gamedef, struct GAMEUX_GAME_DATA *game_data) { - static const WCHAR sGameId[] = {'g','a','m','e','I','D',0}; - - HRESULT hr = S_OK; - BSTR bstrAttribute; - VARIANT variant; - IXMLDOMNodeList *childrenList; - IXMLDOMNode *nextNode; - IXMLDOMElement *nextElement; + static const WCHAR gameidW[] = {'g','a','m','e','I','D',0}; + IXMLDOMNodeList *props; + VARIANT var; + HRESULT hr; + BSTR attr; - TRACE("(%p, %p)\n", gdElement, GameData); + TRACE("(%p, %p)\n", gamedef, game_data); - bstrAttribute = SysAllocString(sGameId); - if(!bstrAttribute) - hr = E_OUTOFMEMORY; + attr = SysAllocString(gameidW); + if (!attr) + return E_OUTOFMEMORY; - hr = IXMLDOMElement_getAttribute(gdElement, bstrAttribute, &variant); + hr = IXMLDOMElement_getAttribute(gamedef, attr, &var); + SysFreeString(attr); - if(SUCCEEDED(hr)) + if (SUCCEEDED(hr)) { - hr = ( GUIDFromStringW(V_BSTR(&variant), &GameData->guidApplicationId)==TRUE ? S_OK : E_FAIL); - - SysFreeString(V_BSTR(&variant)); + hr = CLSIDFromString(V_BSTR(&var), &game_data->guidApplicationId); + VariantClear(&var); } - SysFreeString(bstrAttribute); + if (SUCCEEDED(hr)) + hr = IXMLDOMElement_get_childNodes(gamedef, &props); - /* browse subnodes */ - if(SUCCEEDED(hr)) - hr = IXMLDOMElement_get_childNodes(gdElement, &childrenList); + if (FAILED(hr)) + return hr; - if(SUCCEEDED(hr)) + do { - do + IXMLDOMNode *prop; + + hr = IXMLDOMNodeList_nextNode(props, &prop); + if (hr == S_OK) { - hr = IXMLDOMNodeList_nextNode(childrenList, &nextNode); + IXMLDOMElement *element; - if(hr == S_OK) + hr = IXMLDOMNode_QueryInterface(prop, &IID_IXMLDOMElement, (void**)&element); + if (hr == S_OK) { - hr = IXMLDOMNode_QueryInterface(nextNode, &IID_IXMLDOMElement, - (LPVOID*)&nextElement); - - if(SUCCEEDED(hr)) - { - hr = GAMEUX_ProcessGameDefinitionElement(nextElement, GameData); - IXMLDOMElement_Release(nextElement); - } - - IXMLDOMNode_Release(nextNode); + hr = GAMEUX_ProcessGameDefinitionElement(element, game_data); + IXMLDOMElement_Release(element); } - } - while(hr == S_OK); - hr = S_OK; - IXMLDOMNodeList_Release(childrenList); + IXMLDOMNode_Release(prop); + } } + while (hr == S_OK); + IXMLDOMNodeList_Release(props); - return hr; + return FAILED(hr) ? hr : S_OK; } struct parse_gdf_thread_param

1 0

Nikolay Sivov : include: Added GetLocaleInfoEx() definition.
by Alexandre Julliard 06 Oct '14

06 Oct '14

Module: wine Branch: master Commit: 52e4c5a802cd24dd8d569336d323488f5f8fcd51 URL: http://source.winehq.org/git/wine.git/?a=commit;h=52e4c5a802cd24dd8d569336d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Oct 5 08:13:47 2014 +0400 include: Added GetLocaleInfoEx() definition. --- include/winnls.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/winnls.h b/include/winnls.h index 13274be..58344b4 100644 --- a/include/winnls.h +++ b/include/winnls.h @@ -835,6 +835,7 @@ WINBASEAPI INT WINAPI GetGeoInfoW(GEOID,GEOTYPE,LPWSTR,INT,LANGID); WINBASEAPI INT WINAPI GetLocaleInfoA(LCID,LCTYPE,LPSTR,INT); WINBASEAPI INT WINAPI GetLocaleInfoW(LCID,LCTYPE,LPWSTR,INT); #define GetLocaleInfo WINELIB_NAME_AW(GetLocaleInfo) +WINBASEAPI INT WINAPI GetLocaleInfoEx(LPCWSTR,LCTYPE,LPWSTR,INT); WINBASEAPI INT WINAPI GetNumberFormatA(LCID,DWORD,LPCSTR,const NUMBERFMTA*,LPSTR,INT); WINBASEAPI INT WINAPI GetNumberFormatW(LCID,DWORD,LPCWSTR,const NUMBERFMTW*,LPWSTR,INT); #define GetNumberFormat WINELIB_NAME_AW(GetNumberFormat)

1 0

Nikolay Sivov : kernel32/nls: Added support for LOCALE_SOPENTYPELANGUAGETAG.
by Alexandre Julliard 06 Oct '14

06 Oct '14

1 0

← Newer
1
...
31
32
33
34
35
36
37
...
40
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2014