March 2015 - Wine-Commits - list.winehq.org

Alexandre Julliard : comctl32: Print full flag values in traces.
by Alexandre Julliard March 30, 2015

March 30, 2015

Module: wine Branch: master Commit: 9f1f5d885c233d82dfcbccbc38981fa24a680429 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f1f5d885c233d82dfcbccbc3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 30 19:47:44 2015 +0900 comctl32: Print full flag values in traces. --- dlls/comctl32/rebar.c | 2 +- dlls/comctl32/tests/toolbar.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/rebar.c b/dlls/comctl32/rebar.c index becfe20..99069a9 100644 --- a/dlls/comctl32/rebar.c +++ b/dlls/comctl32/rebar.c @@ -1396,7 +1396,7 @@ REBAR_Layout(REBAR_INFO *infoPtr) adjcx = get_rect_cx(infoPtr, &rcAdj); if (infoPtr->uNumBands == 0) { - TRACE("No bands - setting size to (0,%d), vert: %x\n", adjcx, infoPtr->dwStyle & CCS_VERT); + TRACE("No bands - setting size to (0,%d), style: %x\n", adjcx, infoPtr->dwStyle); infoPtr->calcSize.cx = adjcx; /* the calcSize.cy won't change for a 0 band rebar */ infoPtr->uNumRows = 0; diff --git a/dlls/comctl32/tests/toolbar.c b/dlls/comctl32/tests/toolbar.c index da21924..cdfe7dd 100644 --- a/dlls/comctl32/tests/toolbar.c +++ b/dlls/comctl32/tests/toolbar.c @@ -1917,7 +1917,7 @@ static void test_TB_GET_SET_EXTENDEDSTYLE(void) ok(style == TBSTYLE_EX_VERTICAL, "got style 0x%08x, expected 0x%08x\n", style, TBSTYLE_EX_VERTICAL); style = SendMessageA(hwnd, TB_GETSTYLE, 0, 0); todo_wine - ok(style == CCS_VERT, "got style 0x%08x, expected 0x%08x\n", style, CCS_VERT); + ok(style == CCS_VERT, "got style 0x%08x, expected CCS_VERT\n", style); DestroyWindow(hwnd); }

1 0

Alexandre Julliard : user32: Remove left-over freeing of the edit text with ES_PASSWORD.
by Alexandre Julliard March 30, 2015

March 30, 2015

Module: wine Branch: master Commit: 766768f033fe03ae0d5b63ab04f12203d6c26c03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=766768f033fe03ae0d5b63ab0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 30 19:07:37 2015 +0900 user32: Remove left-over freeing of the edit text with ES_PASSWORD. --- dlls/user32/edit.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index 4b29f03..67adefb 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -2194,12 +2194,9 @@ static INT EDIT_PaintText(EDITSTATE *es, HDC dc, INT x, INT y, INT line, INT col ret = (INT)LOWORD(TabbedTextOutW(dc, x, y, es->text + li + col, count, es->tabs_count, es->tabs, es->format_rect.left - es->x_offset)); } else { - LPWSTR text = es->text; - TextOutW(dc, x, y, text + li + col, count); - GetTextExtentPoint32W(dc, text + li + col, count, &size); + TextOutW(dc, x, y, es->text + li + col, count); + GetTextExtentPoint32W(dc, es->text + li + col, count, &size); ret = size.cx; - if (es->style & ES_PASSWORD) - HeapFree(GetProcessHeap(), 0, text); } if (rev) { if (es->composition_len == 0)

1 0

Austin English : include: Add initial mfapi.h.
by Alexandre Julliard March 30, 2015

March 30, 2015

Module: wine Branch: master Commit: 47ef8ebcc8b4f98ce1f2c2aca9b73cbc4130df1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=47ef8ebcc8b4f98ce1f2c2aca… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Mar 30 00:52:47 2015 -0500 include: Add initial mfapi.h. --- dlls/mfplat/main.c | 1 + include/Makefile.in | 1 + include/mfapi.h | 40 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 42 insertions(+) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 5608644..3376a2c 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -22,6 +22,7 @@ #include "windef.h" #include "winbase.h" +#include "mfapi.h" #include "mferror.h" #include "wine/debug.h" diff --git a/include/Makefile.in b/include/Makefile.in index 02d5d88..e114f9f 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -400,6 +400,7 @@ SRCDIR_INCLUDES = \ mciavi.h \ mcx.h \ mediaerr.h \ + mfapi.h \ mferror.h \ midles.h \ minmax.h \ diff --git a/include/mfapi.h b/include/mfapi.h new file mode 100644 index 0000000..929a36d --- /dev/null +++ b/include/mfapi.h @@ -0,0 +1,40 @@ +/* + * Copyright (C) 2015 Austin English + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __WINE_MFAPI_H +#define __WINE_MFAPI_H + +#define MFSTARTUP_NOSOCKET 0x1 +#define MFSTARTUP_LITE (MFSTARTUP_NOSOCKET) +#define MFSTARTUP_FULL 0 + +typedef struct _MFT_REGISTER_TYPE_INFO { + GUID major_type; + GUID sub_type; +} MFT_REGISTER_TYPE_INFO; + +typedef unsigned __int64 MFWORKITEM_KEY; + +HRESULT WINAPI MFCancelWorkItem(MFWORKITEM_KEY key); +HRESULT WINAPI MFGetTimerPeriodicity(DWORD *periodicity); +HRESULT WINAPI MFLockPlatform(void); +HRESULT WINAPI MFShutdown(void); +HRESULT WINAPI MFStartup(ULONG version, DWORD flags); +HRESULT WINAPI MFUnlockPlatform(void); + +#endif /* __WINE_MFAPI_H */

1 0

Michael Stefaniuc : winhttp/tests: Test the correct return code.
by Alexandre Julliard March 30, 2015

March 30, 2015

Module: wine Branch: master Commit: df97a0e85dffa4817ca20c697923b503a555a442 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df97a0e85dffa4817ca20c697… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Mar 30 10:13:44 2015 +0200 winhttp/tests: Test the correct return code. --- dlls/winhttp/tests/winhttp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 1423cef..ac944f2 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -3043,7 +3043,7 @@ static void test_IWinHttpRequest(void) IWinHttpRequest_Release( req ); pos.QuadPart = 0; - IStream_Seek( stream, pos, STREAM_SEEK_SET, NULL ); + hr = IStream_Seek( stream, pos, STREAM_SEEK_SET, NULL ); ok( hr == S_OK, "got %08x\n", hr ); buf[0] = 0;

1 0

Thomas Faber : wscript: Correctly use CommandLineToArgvW.
by Alexandre Julliard March 30, 2015

March 30, 2015

Module: wine Branch: master Commit: ee698506c8d35131c389ce2f4e936be065653524 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee698506c8d35131c389ce2f4… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Sun Mar 29 08:25:41 2015 +0200 wscript: Correctly use CommandLineToArgvW. --- programs/wscript/main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/wscript/main.c b/programs/wscript/main.c index d354c90..3537f9d 100644 --- a/programs/wscript/main.c +++ b/programs/wscript/main.c @@ -426,11 +426,11 @@ int WINAPI wWinMain(HINSTANCE hInst, HINSTANCE hPrevInst, LPWSTR cmdline, int cm WINE_TRACE("(%p %p %s %x)\n", hInst, hPrevInst, wine_dbgstr_w(cmdline), cmdshow); - argv = CommandLineToArgvW(cmdline, &argc); + argv = CommandLineToArgvW(GetCommandLineW(), &argc); if(!argv) return 1; - for(i=0; i<argc; i++) { + for(i=1; i<argc; i++) { if(*argv[i] == '/' || *argv[i] == '-') { if(!set_host_properties(argv[i])) return 1;

1 0

Michael Stefaniuc : d3drm/tests: Test the correct return code.
by Alexandre Julliard March 30, 2015

March 30, 2015

Module: wine Branch: master Commit: 8abed244a23ab46dc71a1aa358727ba87e36f374 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8abed244a23ab46dc71a1aa35… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Mar 30 10:19:14 2015 +0200 d3drm/tests: Test the correct return code. --- dlls/d3drm/tests/d3drm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 515aace..5fbd281 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -826,7 +826,7 @@ static void test_Face(void) ok(count == 4, "count = %u\n", count); hr = IDirect3DRMFaceArray_GetElement(array1, 1, &face); ok(hr == D3DRM_OK, "Cannot get face (hr = %x)\n", hr); - IDirect3DRMFace_GetVertices(face, &count, v2, n2); + hr = IDirect3DRMFace_GetVertices(face, &count, v2, n2); ok(hr == D3DRM_OK, "Cannot get vertices information (hr = %x)\n", hr); ok(count == 3, "Wrong number of vertices %d (must be 3)\n", count); ok(U1(v2[0]).x == U1(v1[0]).x, "Wrong component v2[0].x = %f (expected %f)\n",

1 0

Henri Verbeet : wined3d: Add support for half-integer pixel centers.
by Alexandre Julliard March 30, 2015

March 30, 2015

Module: wine Branch: master Commit: 94967c28b94318ccb58836f30eba706d24dca8f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=94967c28b94318ccb58836f30… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 30 09:17:05 2015 +0200 wined3d: Add support for half-integer pixel centers. Like in OpenGL and Direct3D 10+. --- dlls/d3d8/directx.c | 3 ++- dlls/d3d9/directx.c | 2 +- dlls/ddraw/ddraw.c | 7 ++----- dlls/ddraw/ddraw_private.h | 3 +++ dlls/ddraw/main.c | 4 ++-- dlls/wined3d/utils.c | 21 ++++++++++++++------- dlls/wined3d/wined3d_private.h | 11 +++++++++-- include/wine/wined3d.h | 1 + 8 files changed, 34 insertions(+), 18 deletions(-) diff --git a/dlls/d3d8/directx.c b/dlls/d3d8/directx.c index 75c8218..132a56f 100644 --- a/dlls/d3d8/directx.c +++ b/dlls/d3d8/directx.c @@ -402,7 +402,8 @@ static const struct IDirect3D8Vtbl d3d8_vtbl = BOOL d3d8_init(struct d3d8 *d3d8) { - DWORD flags = WINED3D_LEGACY_DEPTH_BIAS | WINED3D_VIDMEM_ACCOUNTING | WINED3D_HANDLE_RESTORE; + DWORD flags = WINED3D_LEGACY_DEPTH_BIAS | WINED3D_VIDMEM_ACCOUNTING + | WINED3D_HANDLE_RESTORE | WINED3D_PIXEL_CENTER_INTEGER; d3d8->IDirect3D8_iface.lpVtbl = &d3d8_vtbl; d3d8->refcount = 1; diff --git a/dlls/d3d9/directx.c b/dlls/d3d9/directx.c index 6059890..58c4d44 100644 --- a/dlls/d3d9/directx.c +++ b/dlls/d3d9/directx.c @@ -636,7 +636,7 @@ static const struct IDirect3D9ExVtbl d3d9_vtbl = BOOL d3d9_init(struct d3d9 *d3d9, BOOL extended) { - DWORD flags = WINED3D_PRESENT_CONVERSION | WINED3D_HANDLE_RESTORE; + DWORD flags = WINED3D_PRESENT_CONVERSION | WINED3D_HANDLE_RESTORE | WINED3D_PIXEL_CENTER_INTEGER; if (!extended) flags |= WINED3D_VIDMEM_ACCOUNTING; diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 02b2f6e..31ec6bf 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -4835,7 +4835,6 @@ static const struct wined3d_device_parent_ops ddraw_wined3d_device_parent_ops = HRESULT ddraw_init(struct ddraw *ddraw, enum wined3d_device_type device_type) { WINED3DCAPS caps; - DWORD flags; HRESULT hr; ddraw->IDirectDraw7_iface.lpVtbl = &ddraw7_vtbl; @@ -4850,11 +4849,9 @@ HRESULT ddraw_init(struct ddraw *ddraw, enum wined3d_device_type device_type) ddraw->numIfaces = 1; ddraw->ref7 = 1; - flags = WINED3D_LEGACY_DEPTH_BIAS | WINED3D_VIDMEM_ACCOUNTING - | WINED3D_RESTORE_MODE_ON_ACTIVATE | WINED3D_FOCUS_MESSAGES; - if (!(ddraw->wined3d = wined3d_create(flags))) + if (!(ddraw->wined3d = wined3d_create(DDRAW_WINED3D_FLAGS))) { - if (!(ddraw->wined3d = wined3d_create(flags | WINED3D_NO3D))) + if (!(ddraw->wined3d = wined3d_create(DDRAW_WINED3D_FLAGS | WINED3D_NO3D))) { WARN("Failed to create a wined3d object.\n"); return E_FAIL; diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 4a883b9..650b2c7 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -59,6 +59,9 @@ struct FvfToDecl #define DDRAW_STRIDE_ALIGNMENT 8 +#define DDRAW_WINED3D_FLAGS (WINED3D_LEGACY_DEPTH_BIAS | WINED3D_VIDMEM_ACCOUNTING \ + | WINED3D_RESTORE_MODE_ON_ACTIVATE | WINED3D_FOCUS_MESSAGES | WINED3D_PIXEL_CENTER_INTEGER) + enum ddraw_device_state { DDRAW_DEVICE_STATE_OK, diff --git a/dlls/ddraw/main.c b/dlls/ddraw/main.c index 021c2b9..2f5d113 100644 --- a/dlls/ddraw/main.c +++ b/dlls/ddraw/main.c @@ -405,9 +405,9 @@ HRESULT WINAPI DirectDrawEnumerateExA(LPDDENUMCALLBACKEXA callback, void *contex FIXME("flags 0x%08x not handled\n", flags & ~DDENUM_ATTACHEDSECONDARYDEVICES); TRACE("Enumerating ddraw interfaces\n"); - if (!(wined3d = wined3d_create(WINED3D_LEGACY_DEPTH_BIAS))) + if (!(wined3d = wined3d_create(DDRAW_WINED3D_FLAGS))) { - if (!(wined3d = wined3d_create(WINED3D_LEGACY_DEPTH_BIAS | WINED3D_NO3D))) + if (!(wined3d = wined3d_create(DDRAW_WINED3D_FLAGS | WINED3D_NO3D))) { WARN("Failed to create a wined3d object.\n"); return E_FAIL; diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index a772af8..468aea9 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -3155,6 +3155,8 @@ void get_modelview_matrix(const struct wined3d_context *context, const struct wi void get_projection_matrix(const struct wined3d_context *context, const struct wined3d_state *state, struct wined3d_matrix *mat) { + float center_offset; + /* There are a couple of additional things we have to take into account * here besides the projection transformation itself: * - We need to flip along the y-axis in case of offscreen rendering. @@ -3170,6 +3172,11 @@ void get_projection_matrix(const struct wined3d_context *context, const struct w * driver, but small enough to prevent it from interfering with any * anti-aliasing. */ + if (context->swapchain->device->wined3d->flags & WINED3D_PIXEL_CENTER_INTEGER) + center_offset = 63.0f / 64.0f; + else + center_offset = -1.0f / 64.0f; + if (context->last_was_rhw) { /* Transform D3D RHW coordinates to OpenGL clip coordinates. */ @@ -3178,11 +3185,11 @@ void get_projection_matrix(const struct wined3d_context *context, const struct w float w = state->viewport.width; float h = state->viewport.height; float x_scale = 2.0f / w; - float x_offset = (float)((63.0 / 64.0 - (2.0 * x) - w) / w); + float x_offset = (center_offset - (2.0f * x) - w) / w; float y_scale = context->render_offscreen ? 2.0f / h : 2.0f / -h; - float y_offset = (float)(context->render_offscreen - ? (63.0 / 64.0 - (2.0 * y) - h) / h - : (63.0 / 64.0 - (2.0 * y) - h) / -h); + float y_offset = context->render_offscreen + ? (center_offset - (2.0f * y) - h) / h + : (center_offset - (2.0f * y) - h) / -h; enum wined3d_depth_buffer_type zenable = state->fb->depth_stencil ? state->render_states[WINED3D_RS_ZENABLE] : WINED3D_ZB_FALSE; float z_scale = zenable ? 2.0f : 0.0f; @@ -3200,10 +3207,10 @@ void get_projection_matrix(const struct wined3d_context *context, const struct w else { float y_scale = context->render_offscreen ? -1.0f : 1.0f; - float x_offset = 63.0f / 64.0f * (1.0f / state->viewport.width); + float x_offset = center_offset / state->viewport.width; float y_offset = context->render_offscreen - ? 63.0f / 64.0f * (1.0f / state->viewport.height) - : -63.0f / 64.0f * (1.0f / state->viewport.height); + ? center_offset / state->viewport.height + : -center_offset / state->viewport.height; const struct wined3d_matrix projection = { 1.0f, 0.0f, 0.0f, 0.0f, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 96b8244..9287fd7 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3009,10 +3009,17 @@ static inline BOOL shader_is_scalar(const struct wined3d_shader_register *reg) static inline void shader_get_position_fixup(const struct wined3d_context *context, const struct wined3d_state *state, float *position_fixup) { + float center_offset; + + if (context->swapchain->device->wined3d->flags & WINED3D_PIXEL_CENTER_INTEGER) + center_offset = 63.0f / 64.0f; + else + center_offset = -1.0f / 64.0f; + position_fixup[0] = 1.0f; position_fixup[1] = 1.0f; - position_fixup[2] = (63.0f / 64.0f) / state->viewport.width; - position_fixup[3] = -(63.0f / 64.0f) / state->viewport.height; + position_fixup[2] = center_offset / state->viewport.width; + position_fixup[3] = -center_offset / state->viewport.height; if (context->render_offscreen) { diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 0f70848..8bc4c25 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -1247,6 +1247,7 @@ enum wined3d_display_rotation #define WINED3D_RESTORE_MODE_ON_ACTIVATE 0x00000010 #define WINED3D_FOCUS_MESSAGES 0x00000020 #define WINED3D_HANDLE_RESTORE 0x00000040 +#define WINED3D_PIXEL_CENTER_INTEGER 0x00000080 #define WINED3D_RESZ_CODE 0x7fa05000

1 0

Henri Verbeet : d2d1/tests: Add a test for ID2D1DrawingStateBlock.
by Alexandre Julliard March 30, 2015

March 30, 2015

Module: wine Branch: master Commit: 7baf2a0f5542cae3608fdb89ee35a378e0d6bb93 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7baf2a0f5542cae3608fdb89e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 30 09:17:03 2015 +0200 d2d1/tests: Add a test for ID2D1DrawingStateBlock. --- dlls/d2d1/tests/Makefile.in | 2 +- dlls/d2d1/tests/d2d1.c | 216 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 217 insertions(+), 1 deletion(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7baf2a0f5542cae3608fd…

1 0

Henri Verbeet : d2d1: Implement d2d_d3d_render_target_RestoreDrawingState( ).
by Alexandre Julliard March 30, 2015

March 30, 2015

Module: wine Branch: master Commit: 59e641aa70c280209f104656b69c6b68a1cc70bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=59e641aa70c280209f104656b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 30 09:17:02 2015 +0200 d2d1: Implement d2d_d3d_render_target_RestoreDrawingState(). --- dlls/d2d1/render_target.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index 3b15e22..da8937c 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -949,7 +949,17 @@ static void STDMETHODCALLTYPE d2d_d3d_render_target_SaveDrawingState(ID2D1Render static void STDMETHODCALLTYPE d2d_d3d_render_target_RestoreDrawingState(ID2D1RenderTarget *iface, ID2D1DrawingStateBlock *state_block) { - FIXME("iface %p, state_block %p stub!\n", iface, state_block); + struct d2d_state_block *state_block_impl = unsafe_impl_from_ID2D1DrawingStateBlock(state_block); + struct d2d_d3d_render_target *render_target = impl_from_ID2D1RenderTarget(iface); + + TRACE("iface %p, state_block %p.\n", iface, state_block); + + render_target->drawing_state = state_block_impl->drawing_state; + if (state_block_impl->text_rendering_params) + IDWriteRenderingParams_AddRef(state_block_impl->text_rendering_params); + if (render_target->text_rendering_params) + IDWriteRenderingParams_Release(render_target->text_rendering_params); + render_target->text_rendering_params = state_block_impl->text_rendering_params; } static void STDMETHODCALLTYPE d2d_d3d_render_target_PushAxisAlignedClip(ID2D1RenderTarget *iface,

1 0

Henri Verbeet : d2d1: Implement d2d_d3d_render_target_SaveDrawingState().
by Alexandre Julliard March 30, 2015

March 30, 2015

Module: wine Branch: master Commit: 3f97056424b191e079bae037a6a8353423388642 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f97056424b191e079bae037a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 30 09:17:01 2015 +0200 d2d1: Implement d2d_d3d_render_target_SaveDrawingState(). --- dlls/d2d1/d2d1_private.h | 1 + dlls/d2d1/render_target.c | 12 +++++++++++- dlls/d2d1/state_block.c | 8 ++++++++ 3 files changed, 20 insertions(+), 1 deletion(-) diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index 0e0fa9f..48465f2 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -184,5 +184,6 @@ struct d2d_state_block void d2d_state_block_init(struct d2d_state_block *state_block, const D2D1_DRAWING_STATE_DESCRIPTION *desc, IDWriteRenderingParams *text_rendering_params) DECLSPEC_HIDDEN; +struct d2d_state_block *unsafe_impl_from_ID2D1DrawingStateBlock(ID2D1DrawingStateBlock *iface) DECLSPEC_HIDDEN; #endif /* __WINE_D2D1_PRIVATE_H */ diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index c241df2..3b15e22 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -933,7 +933,17 @@ static HRESULT STDMETHODCALLTYPE d2d_d3d_render_target_Flush(ID2D1RenderTarget * static void STDMETHODCALLTYPE d2d_d3d_render_target_SaveDrawingState(ID2D1RenderTarget *iface, ID2D1DrawingStateBlock *state_block) { - FIXME("iface %p, state_block %p stub!\n", iface, state_block); + struct d2d_state_block *state_block_impl = unsafe_impl_from_ID2D1DrawingStateBlock(state_block); + struct d2d_d3d_render_target *render_target = impl_from_ID2D1RenderTarget(iface); + + TRACE("iface %p, state_block %p.\n", iface, state_block); + + state_block_impl->drawing_state = render_target->drawing_state; + if (render_target->text_rendering_params) + IDWriteRenderingParams_AddRef(render_target->text_rendering_params); + if (state_block_impl->text_rendering_params) + IDWriteRenderingParams_Release(state_block_impl->text_rendering_params); + state_block_impl->text_rendering_params = render_target->text_rendering_params; } static void STDMETHODCALLTYPE d2d_d3d_render_target_RestoreDrawingState(ID2D1RenderTarget *iface, diff --git a/dlls/d2d1/state_block.c b/dlls/d2d1/state_block.c index 28da331..83fd162 100644 --- a/dlls/d2d1/state_block.c +++ b/dlls/d2d1/state_block.c @@ -157,3 +157,11 @@ void d2d_state_block_init(struct d2d_state_block *state_block, const D2D1_DRAWIN if ((state_block->text_rendering_params = text_rendering_params)) IDWriteRenderingParams_AddRef(state_block->text_rendering_params); } + +struct d2d_state_block *unsafe_impl_from_ID2D1DrawingStateBlock(ID2D1DrawingStateBlock *iface) +{ + if (!iface) + return NULL; + assert(iface->lpVtbl == &d2d_state_block_vtbl); + return CONTAINING_RECORD(iface, struct d2d_state_block, ID2D1DrawingStateBlock_iface); +}

1 0