wine-commits April 2014

wine-commits@winehq.org

2 participants
500 discussions

Henri Verbeet : d3d9/tests: Use a separate device for texture_transform_flags_test().
by Alexandre Julliard 08 Apr '14

08 Apr '14

Module: wine Branch: master Commit: 230b910a34ec9f2fd1176099b55244cc4d077642 URL: http://source.winehq.org/git/wine.git/?a=commit;h=230b910a34ec9f2fd1176099b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 8 09:21:53 2014 +0200 d3d9/tests: Use a separate device for texture_transform_flags_test(). --- dlls/d3d9/tests/visual.c | 89 +++++++++++++++++++++++++--------------------- 1 file changed, 49 insertions(+), 40 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index f50ee55..1421e31 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -4028,25 +4028,25 @@ static void projected_textures_test(IDirect3DDevice9 *device, DWORD value = 0xdeadbeef; static const float proj_quads[] = { - -1.0, -1.0, 0.1, 0.0, 0.0, 4.0, 6.0, - 0.0, -1.0, 0.1, 4.0, 0.0, 4.0, 6.0, - -1.0, 0.0, 0.1, 0.0, 4.0, 4.0, 6.0, - 0.0, 0.0, 0.1, 4.0, 4.0, 4.0, 6.0, - - 0.0, -1.0, 0.1, 0.0, 0.0, 4.0, 6.0, - 1.0, -1.0, 0.1, 4.0, 0.0, 4.0, 6.0, - 0.0, 0.0, 0.1, 0.0, 4.0, 4.0, 6.0, - 1.0, 0.0, 0.1, 4.0, 4.0, 4.0, 6.0, - - -1.0, 0.0, 0.1, 0.0, 0.0, 4.0, 6.0, - 0.0, 0.0, 0.1, 4.0, 0.0, 4.0, 6.0, - -1.0, 1.0, 0.1, 0.0, 4.0, 4.0, 6.0, - 0.0, 1.0, 0.1, 4.0, 4.0, 4.0, 6.0, - - 0.0, 0.0, 0.1, 0.0, 0.0, 4.0, 6.0, - 1.0, 0.0, 0.1, 4.0, 0.0, 4.0, 6.0, - 0.0, 1.0, 0.1, 0.0, 4.0, 4.0, 6.0, - 1.0, 1.0, 0.1, 4.0, 4.0, 4.0, 6.0, + -1.0f, -1.0f, 0.1f, 0.0f, 0.0f, 4.0f, 6.0f, + -1.0f, 0.0f, 0.1f, 0.0f, 4.0f, 4.0f, 6.0f, + 0.0f, -1.0f, 0.1f, 4.0f, 0.0f, 4.0f, 6.0f, + 0.0f, 0.0f, 0.1f, 4.0f, 4.0f, 4.0f, 6.0f, + + 0.0f, -1.0f, 0.1f, 0.0f, 0.0f, 4.0f, 6.0f, + 0.0f, 0.0f, 0.1f, 0.0f, 4.0f, 4.0f, 6.0f, + 1.0f, -1.0f, 0.1f, 4.0f, 0.0f, 4.0f, 6.0f, + 1.0f, 0.0f, 0.1f, 4.0f, 4.0f, 4.0f, 6.0f, + + -1.0f, 0.0f, 0.1f, 0.0f, 0.0f, 4.0f, 6.0f, + -1.0f, 1.0f, 0.1f, 0.0f, 4.0f, 4.0f, 6.0f, + 0.0f, 0.0f, 0.1f, 4.0f, 0.0f, 4.0f, 6.0f, + 0.0f, 1.0f, 0.1f, 4.0f, 4.0f, 4.0f, 6.0f, + + 0.0f, 0.0f, 0.1f, 0.0f, 0.0f, 4.0f, 6.0f, + 0.0f, 1.0f, 0.1f, 0.0f, 4.0f, 4.0f, 6.0f, + 1.0f, 0.0f, 0.1f, 4.0f, 0.0f, 4.0f, 6.0f, + 1.0f, 1.0f, 0.1f, 4.0f, 4.0f, 4.0f, 6.0f, }; if (tests[i].vs) @@ -4106,7 +4106,7 @@ static void projected_textures_test(IDirect3DDevice9 *device, ok(hr == D3D_OK, "IDirect3DDevice9_Present failed with %08x\n", hr); } -static void texture_transform_flags_test(IDirect3DDevice9 *device) +static void texture_transform_flags_test(void) { HRESULT hr; IDirect3D9 *d3d; @@ -4114,10 +4114,13 @@ static void texture_transform_flags_test(IDirect3DDevice9 *device) D3DCAPS9 caps; IDirect3DTexture9 *texture = NULL; IDirect3DVolumeTexture9 *volume = NULL; + IDirect3DDevice9 *device; unsigned int x, y, z; D3DLOCKED_RECT lr; D3DLOCKED_BOX lb; - DWORD color; + D3DCOLOR color; + ULONG refcount; + HWND window; UINT w, h; IDirect3DVertexDeclaration9 *decl, *decl2, *decl3, *decl4; float identity[16] = {1.0, 0.0, 0.0, 0.0, @@ -4149,14 +4152,21 @@ static void texture_transform_flags_test(IDirect3DDevice9 *device) 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}; + window = CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); + d3d = Direct3DCreate9(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + if (!(device = create_device(d3d, window, window, TRUE))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + goto done; + } + memset(&lr, 0, sizeof(lr)); memset(&lb, 0, sizeof(lb)); - IDirect3DDevice9_GetDirect3D(device, &d3d); - if(IDirect3D9_CheckDeviceFormat(d3d, 0, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, 0, - D3DRTYPE_TEXTURE, D3DFMT_A16B16G16R16) == D3D_OK) { + if (IDirect3D9_CheckDeviceFormat(d3d, 0, D3DDEVTYPE_HAL, + D3DFMT_X8R8G8B8, 0, D3DRTYPE_TEXTURE, D3DFMT_A16B16G16R16) == D3D_OK) fmt = D3DFMT_A16B16G16R16; - } - IDirect3D9_Release(d3d); hr = IDirect3DDevice9_CreateVertexDeclaration(device, decl_elements, &decl); ok(hr == D3D_OK, "IDirect3DDevice9_CreateVertexDeclaration returned %08x\n", hr); @@ -4186,7 +4196,7 @@ static void texture_transform_flags_test(IDirect3DDevice9 *device) ok(hr == D3D_OK, "IDirect3DDevice9_SetTextureStageState(D3DTSS_COLORARG1) returned %08x\n", hr); hr = IDirect3DDevice9_SetRenderState(device, D3DRS_LIGHTING, FALSE); ok(hr == D3D_OK, "IDirect3DDevice9_SetRenderState(D3DRS_LIGHTING) returned %08x\n", hr); - hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xff0000ff, 0.0, 0); + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0xff0000ff, 1.0f, 0); ok(hr == D3D_OK, "IDirect3DDevice9_Clear returned %08x\n", hr); hr = IDirect3DDevice9_GetDeviceCaps(device, &caps); @@ -4196,9 +4206,11 @@ static void texture_transform_flags_test(IDirect3DDevice9 *device) hr = IDirect3DDevice9_CreateTexture(device, w, h, 1, 0, fmt, D3DPOOL_MANAGED, &texture, NULL); ok(hr == D3D_OK, "IDirect3DDevice9_CreateTexture returned %08x\n", hr); - if(!texture) { - skip("Failed to create the test texture\n"); - return; + if (!texture) + { + skip("Failed to create the test texture.\n"); + IDirect3DDevice9_Release(device); + goto done; } /* Unfortunately there is no easy way to set up a texture coordinate passthrough @@ -4752,19 +4764,16 @@ static void texture_transform_flags_test(IDirect3DDevice9 *device) IDirect3DVolumeTexture9_Release(volume); - out: - hr = IDirect3DDevice9_SetVertexDeclaration(device, NULL); - ok(hr == D3D_OK, "IDirect3DDevice9_SetVertexDeclaration failed with %08x\n", hr); - hr = IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_DISABLE); - ok(SUCCEEDED(hr), "IDirect3DDevice9_SetTextureStageState failed (%08x)\n", hr); - hr = IDirect3DDevice9_SetTransform(device, D3DTS_TEXTURE0, (D3DMATRIX *) &identity); - ok(hr == D3D_OK, "IDirect3DDevice9_SetTransform failed with %08x\n", hr); - hr = IDirect3DDevice9_SetTexture(device, 0, NULL); - ok(hr == D3D_OK, "IDirect3DDevice9_SetTexture returned %08x\n", hr); +out: IDirect3DVertexDeclaration9_Release(decl); IDirect3DVertexDeclaration9_Release(decl2); IDirect3DVertexDeclaration9_Release(decl3); IDirect3DVertexDeclaration9_Release(decl4); + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +done: + IDirect3D9_Release(d3d); + DestroyWindow(window); } static void texdepth_test(void) @@ -16575,11 +16584,11 @@ START_TEST(visual) float_texture_test(device_ptr); g16r16_texture_test(device_ptr); pixelshader_blending_test(device_ptr); - texture_transform_flags_test(device_ptr); cleanup_device(device_ptr); device_ptr = NULL; + texture_transform_flags_test(); autogen_mipmap_test(); fixed_function_decl_test(); conditional_np2_repeat_test();

1 0

Dmitry Timoshkov : schedsvc/tests: Avoid test failures on file systems with enabled directory randomization.
by Alexandre Julliard 08 Apr '14

08 Apr '14

Module: wine Branch: master Commit: 96760c3b51857cb30cd7d4a6faa9607740d5dde2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=96760c3b51857cb30cd7d4a6f… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Apr 8 15:49:11 2014 +0900 schedsvc/tests: Avoid test failures on file systems with enabled directory randomization. --- dlls/schedsvc/tests/rpcapi.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/schedsvc/tests/rpcapi.c b/dlls/schedsvc/tests/rpcapi.c index 6c555c8..2ef50c9 100644 --- a/dlls/schedsvc/tests/rpcapi.c +++ b/dlls/schedsvc/tests/rpcapi.c @@ -405,7 +405,9 @@ START_TEST(rpcapi) ok(count == 1, "expected 1, got %u\n", count); ok(start_index == 1, "expected 1, got %u\n", start_index); ok(names != NULL, "names should not be NULL\n"); - ok(!lstrcmpW(names[0], Task1), "expected Task1, got %s\n", wine_dbgstr_w(names[0])); + /* returned name depends whether directory randomization is on */ + ok(!lstrcmpW(names[0], Task1) || !lstrcmpW(names[0], Task2), + "expected Task3, got %s\n", wine_dbgstr_w(names[0])); MIDL_user_free(names[0]); MIDL_user_free(names); @@ -465,7 +467,9 @@ START_TEST(rpcapi) ok(count == 1, "expected 1, got %u\n", count); ok(start_index == 3, "expected 3, got %u\n", start_index); ok(names != NULL, "names should not be NULL\n"); - ok(!lstrcmpW(names[0], Task3), "expected Task3, got %s\n", wine_dbgstr_w(names[0])); + /* returned name depends whether directory randomization is on */ + ok(!lstrcmpW(names[0], Task1) || !lstrcmpW(names[0], Task2) || !lstrcmpW(names[0], Task3), + "expected Task3, got %s\n", wine_dbgstr_w(names[0])); MIDL_user_free(names[0]); MIDL_user_free(names);

1 0

Dmitry Timoshkov : schedsvc/tests: Fix a couple of typos.
by Alexandre Julliard 08 Apr '14

08 Apr '14

Module: wine Branch: master Commit: 8dee40e65aaf17337182f3181689a70795fd8c43 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8dee40e65aaf17337182f3181… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Apr 8 15:49:06 2014 +0900 schedsvc/tests: Fix a couple of typos. --- dlls/schedsvc/tests/rpcapi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/schedsvc/tests/rpcapi.c b/dlls/schedsvc/tests/rpcapi.c index e1d2101..6c555c8 100644 --- a/dlls/schedsvc/tests/rpcapi.c +++ b/dlls/schedsvc/tests/rpcapi.c @@ -269,7 +269,7 @@ START_TEST(rpcapi) count = 0xdeadbeef; names = NULL; hr = SchRpcEnumFolders(Wine, 0, &start_index, 0, &count, &names); - ok(hr == S_OK, "expected S_FALSE, got %#x\n", hr); + ok(hr == S_OK, "expected S_OK, got %#x\n", hr); ok(count == 2, "expected 2, got %u\n", count); ok(start_index == 2, "expected 2, got %u\n", start_index); ok(names != NULL, "names should not be NULL\n"); @@ -381,7 +381,7 @@ START_TEST(rpcapi) count = 0xdeadbeef; names = NULL; hr = SchRpcEnumTasks(Wine, 0, &start_index, 0, &count, &names); - ok(hr == S_OK, "expected S_FALSE, got %#x\n", hr); + ok(hr == S_OK, "expected S_OK, got %#x\n", hr); ok(count == 2, "expected 2, got %u\n", count); ok(start_index == 2, "expected 2, got %u\n", start_index); ok(names != NULL, "names should not be NULL\n");

1 0

Dmitry Timoshkov : avifil32: Use correct AddRef helpers.
by Alexandre Julliard 08 Apr '14

08 Apr '14

Module: wine Branch: master Commit: 2886471db1e6f4d6b6555f150d14eebf87641136 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2886471db1e6f4d6b6555f150… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Apr 8 15:48:57 2014 +0900 avifil32: Use correct AddRef helpers. --- dlls/avifil32/wavfile.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/avifil32/wavfile.c b/dlls/avifil32/wavfile.c index 60dab03..32a6788 100644 --- a/dlls/avifil32/wavfile.c +++ b/dlls/avifil32/wavfile.c @@ -274,7 +274,7 @@ static HRESULT WINAPI IAVIFile_fnGetStream(IAVIFile *iface, IAVIStream **avis, D return AVIERR_NODATA; *avis = &This->IAVIStream_iface; - IAVIFile_AddRef(*avis); + IAVIStream_AddRef(*avis); return AVIERR_OK; } @@ -325,7 +325,7 @@ static HRESULT WINAPI IAVIFile_fnCreateStream(IAVIFile *iface, IAVIStream **avis This->ckData.cksize = 0; *avis = &This->IAVIStream_iface; - IAVIFile_AddRef(*avis); + IAVIStream_AddRef(*avis); return AVIERR_OK; }

1 0

Nikolay Sivov : msxml3: IXSLProcessor_put_output() is not a stub.
by Alexandre Julliard 08 Apr '14

08 Apr '14

Module: wine Branch: master Commit: ff0ed20c2ff81013a6560ddf5636d638f15cb632 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff0ed20c2ff81013a6560ddf5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 8 07:42:43 2014 +0400 msxml3: IXSLProcessor_put_output() is not a stub. --- dlls/msxml3/stylesheet.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/msxml3/stylesheet.c b/dlls/msxml3/stylesheet.c index e5761de..b2816ee 100644 --- a/dlls/msxml3/stylesheet.c +++ b/dlls/msxml3/stylesheet.c @@ -463,7 +463,7 @@ static HRESULT WINAPI xslprocessor_put_output( IStream *stream; HRESULT hr; - FIXME("(%p)->(%s): semi-stub\n", This, debugstr_variant(&output)); + TRACE("(%p)->(%s)\n", This, debugstr_variant(&output)); switch (V_VT(&output)) { @@ -473,8 +473,11 @@ static HRESULT WINAPI xslprocessor_put_output( break; case VT_UNKNOWN: hr = IUnknown_QueryInterface(V_UNKNOWN(&output), &IID_IStream, (void**)&stream); + if (FAILED(hr)) + WARN("failed to get IStream from output, 0x%08x\n", hr); break; default: + FIXME("output type %d not handed\n", V_VT(&output)); hr = E_FAIL; }

1 0

Nikolay Sivov : dwrite: Added partial implementation for CreateEllipsisTrimmingSign().
by Alexandre Julliard 08 Apr '14

08 Apr '14

Module: wine Branch: master Commit: 27e86cfc36f37e0f53c2224cf995e6a975119801 URL: http://source.winehq.org/git/wine.git/?a=commit;h=27e86cfc36f37e0f53c2224cf… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 8 07:42:24 2014 +0400 dwrite: Added partial implementation for CreateEllipsisTrimmingSign(). --- dlls/dwrite/dwrite_private.h | 1 + dlls/dwrite/layout.c | 108 ++++++++++++++++++++++++++++++++++++++++++ dlls/dwrite/main.c | 4 +- dlls/dwrite/tests/layout.c | 30 ++++++++++++ 4 files changed, 141 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index 5450732..0f71544 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -76,6 +76,7 @@ extern HRESULT convert_fontface_to_logfont(IDWriteFontFace*, LOGFONTW*) DECLSPEC extern HRESULT create_textformat(const WCHAR*,IDWriteFontCollection*,DWRITE_FONT_WEIGHT,DWRITE_FONT_STYLE,DWRITE_FONT_STRETCH, FLOAT,const WCHAR*,IDWriteTextFormat**) DECLSPEC_HIDDEN; extern HRESULT create_textlayout(const WCHAR*,UINT32,IDWriteTextFormat*,IDWriteTextLayout**) DECLSPEC_HIDDEN; +extern HRESULT create_trimmingsign(IDWriteInlineObject**) DECLSPEC_HIDDEN; extern HRESULT get_gdiinterop(IDWriteGdiInterop**) DECLSPEC_HIDDEN; extern HRESULT create_localizedstrings(IDWriteLocalizedStrings**) DECLSPEC_HIDDEN; extern HRESULT add_localizedstring(IDWriteLocalizedStrings*,const WCHAR*,const WCHAR*) DECLSPEC_HIDDEN; diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index ff246ff..0cc31a9 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -74,6 +74,11 @@ struct dwrite_textformat { struct dwrite_textformat_data format; }; +struct dwrite_trimmingsign { + IDWriteInlineObject IDWriteInlineObject_iface; + LONG ref; +}; + static const IDWriteTextFormatVtbl dwritetextformatvtbl; static void release_format_data(struct dwrite_textformat_data *data) @@ -99,6 +104,11 @@ static inline struct dwrite_textformat *unsafe_impl_from_IDWriteTextFormat(IDWri return iface->lpVtbl == &dwritetextformatvtbl ? impl_from_IDWriteTextFormat(iface) : NULL; } +static inline struct dwrite_trimmingsign *impl_from_IDWriteInlineObject(IDWriteInlineObject *iface) +{ + return CONTAINING_RECORD(iface, struct dwrite_trimmingsign, IDWriteInlineObject_iface); +} + static HRESULT WINAPI dwritetextlayout_QueryInterface(IDWriteTextLayout *iface, REFIID riid, void **obj) { struct dwrite_textlayout *This = impl_from_IDWriteTextLayout(iface); @@ -762,6 +772,104 @@ HRESULT create_textlayout(const WCHAR *str, UINT32 len, IDWriteTextFormat *forma return S_OK; } +static HRESULT WINAPI dwritetrimmingsign_QueryInterface(IDWriteInlineObject *iface, REFIID riid, void **obj) +{ + struct dwrite_trimmingsign *This = impl_from_IDWriteInlineObject(iface); + + TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), obj); + + if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IDWriteInlineObject)) { + *obj = iface; + IDWriteInlineObject_AddRef(iface); + return S_OK; + } + + *obj = NULL; + return E_NOINTERFACE; + +} + +static ULONG WINAPI dwritetrimmingsign_AddRef(IDWriteInlineObject *iface) +{ + struct dwrite_trimmingsign *This = impl_from_IDWriteInlineObject(iface); + ULONG ref = InterlockedIncrement(&This->ref); + TRACE("(%p)->(%d)\n", This, ref); + return ref; +} + +static ULONG WINAPI dwritetrimmingsign_Release(IDWriteInlineObject *iface) +{ + struct dwrite_trimmingsign *This = impl_from_IDWriteInlineObject(iface); + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p)->(%d)\n", This, ref); + + if (!ref) + heap_free(This); + + return ref; +} + +static HRESULT WINAPI dwritetrimmingsign_Draw(IDWriteInlineObject *iface, void *context, IDWriteTextRenderer *renderer, + FLOAT originX, FLOAT originY, BOOL is_sideways, BOOL is_rtl, IUnknown *drawing_effect) +{ + struct dwrite_trimmingsign *This = impl_from_IDWriteInlineObject(iface); + FIXME("(%p)->(%p %p %f %f %d %d %p): stub\n", This, context, renderer, originX, originY, is_sideways, is_rtl, drawing_effect); + return E_NOTIMPL; +} + +static HRESULT WINAPI dwritetrimmingsign_GetMetrics(IDWriteInlineObject *iface, DWRITE_INLINE_OBJECT_METRICS *metrics) +{ + struct dwrite_trimmingsign *This = impl_from_IDWriteInlineObject(iface); + FIXME("(%p)->(%p): stub\n", This, metrics); + return E_NOTIMPL; +} + +static HRESULT WINAPI dwritetrimmingsign_GetOverhangMetrics(IDWriteInlineObject *iface, DWRITE_OVERHANG_METRICS *overhangs) +{ + struct dwrite_trimmingsign *This = impl_from_IDWriteInlineObject(iface); + FIXME("(%p)->(%p): stub\n", This, overhangs); + return E_NOTIMPL; +} + +static HRESULT WINAPI dwritetrimmingsign_GetBreakConditions(IDWriteInlineObject *iface, DWRITE_BREAK_CONDITION *before, + DWRITE_BREAK_CONDITION *after) +{ + struct dwrite_trimmingsign *This = impl_from_IDWriteInlineObject(iface); + + TRACE("(%p)->(%p %p)\n", This, before, after); + + *before = *after = DWRITE_BREAK_CONDITION_NEUTRAL; + return S_OK; +} + +static const IDWriteInlineObjectVtbl dwritetrimmingsignvtbl = { + dwritetrimmingsign_QueryInterface, + dwritetrimmingsign_AddRef, + dwritetrimmingsign_Release, + dwritetrimmingsign_Draw, + dwritetrimmingsign_GetMetrics, + dwritetrimmingsign_GetOverhangMetrics, + dwritetrimmingsign_GetBreakConditions +}; + +HRESULT create_trimmingsign(IDWriteInlineObject **sign) +{ + struct dwrite_trimmingsign *This; + + *sign = NULL; + + This = heap_alloc(sizeof(struct dwrite_trimmingsign)); + if (!This) return E_OUTOFMEMORY; + + This->IDWriteInlineObject_iface.lpVtbl = &dwritetrimmingsignvtbl; + This->ref = 1; + + *sign = &This->IDWriteInlineObject_iface; + + return S_OK; +} + static HRESULT WINAPI dwritetextformat_QueryInterface(IDWriteTextFormat *iface, REFIID riid, void **obj) { struct dwrite_textformat *This = impl_from_IDWriteTextFormat(iface); diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index d253c42..cf3b530 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -527,8 +527,8 @@ static HRESULT WINAPI dwritefactory_CreateGdiCompatibleTextLayout(IDWriteFactory static HRESULT WINAPI dwritefactory_CreateEllipsisTrimmingSign(IDWriteFactory *iface, IDWriteTextFormat *format, IDWriteInlineObject **trimming_sign) { - FIXME("(%p %p): stub\n", format, trimming_sign); - return E_NOTIMPL; + FIXME("(%p %p): semi-stub\n", format, trimming_sign); + return create_trimmingsign(trimming_sign); } static HRESULT WINAPI dwritefactory_CreateTextAnalyzer(IDWriteFactory *iface, IDWriteTextAnalyzer **analyzer) diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index a340741..43a8f3b 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -233,6 +233,35 @@ static void test_GetLocaleName(void) IDWriteTextFormat_Release(format); } +static void test_CreateEllipsisTrimmingSign(void) +{ + DWRITE_BREAK_CONDITION before, after; + IDWriteTextFormat *format; + IDWriteInlineObject *sign; + HRESULT hr; + + hr = IDWriteFactory_CreateTextFormat(factory, tahomaW, NULL, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, + DWRITE_FONT_STRETCH_NORMAL, 10.0, enusW, &format); + ok(hr == S_OK, "got 0x%08x\n", hr); + + EXPECT_REF(format, 1); + hr = IDWriteFactory_CreateEllipsisTrimmingSign(factory, format, &sign); + ok(hr == S_OK, "got 0x%08x\n", hr); + EXPECT_REF(format, 1); + +if (0) /* crashes on native */ + hr = IDWriteInlineObject_GetBreakConditions(sign, NULL, NULL); + + before = after = DWRITE_BREAK_CONDITION_CAN_BREAK; + hr = IDWriteInlineObject_GetBreakConditions(sign, &before, &after); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(before == DWRITE_BREAK_CONDITION_NEUTRAL, "got %d\n", before); + ok(after == DWRITE_BREAK_CONDITION_NEUTRAL, "got %d\n", after); + + IDWriteInlineObject_Release(sign); + IDWriteTextFormat_Release(format); +} + START_TEST(layout) { HRESULT hr; @@ -249,6 +278,7 @@ START_TEST(layout) test_CreateGdiCompatibleTextLayout(); test_CreateTextFormat(); test_GetLocaleName(); + test_CreateEllipsisTrimmingSign(); IDWriteFactory_Release(factory); }

1 0

Nikolay Sivov : dwrite: Added GetTrimming()/SetTrimming() for text format.
by Alexandre Julliard 08 Apr '14

08 Apr '14

Module: wine Branch: master Commit: 6b560c92fcb091d73253df7ef86b009270dea19e URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b560c92fcb091d73253df7ef… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 8 07:42:06 2014 +0400 dwrite: Added GetTrimming()/SetTrimming() for text format. --- dlls/dwrite/layout.c | 31 +++++++++++++++++++++++++++---- dlls/dwrite/tests/layout.c | 16 ++++++++++++++++ 2 files changed, 43 insertions(+), 4 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 8fea3ad..ff246ff 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -53,6 +53,9 @@ struct dwrite_textformat_data { FLOAT baseline; FLOAT size; + DWRITE_TRIMMING trimming; + IDWriteInlineObject *trimmingsign; + IDWriteFontCollection *collection; }; @@ -76,6 +79,7 @@ static const IDWriteTextFormatVtbl dwritetextformatvtbl; static void release_format_data(struct dwrite_textformat_data *data) { if (data->collection) IDWriteFontCollection_Release(data->collection); + if (data->trimmingsign) IDWriteInlineObject_Release(data->trimmingsign); heap_free(data->family_name); heap_free(data->locale); } @@ -699,6 +703,8 @@ static void layout_format_from_textformat(struct dwrite_textlayout *layout, IDWr layout->format = f->format; layout->format.locale = heap_strdupW(f->format.locale); layout->format.family_name = heap_strdupW(f->format.family_name); + if (layout->format.trimmingsign) + IDWriteInlineObject_AddRef(layout->format.trimmingsign); } else { @@ -718,6 +724,7 @@ static void layout_format_from_textformat(struct dwrite_textlayout *layout, IDWr &layout->format.spacing, &layout->format.baseline ); + IDWriteTextFormat_GetTrimming(format, &layout->format.trimming, &layout->format.trimmingsign); /* locale name and length */ locale_len = IDWriteTextFormat_GetLocaleNameLength(format); @@ -849,8 +856,15 @@ static HRESULT WINAPI dwritetextformat_SetTrimming(IDWriteTextFormat *iface, DWR IDWriteInlineObject *trimming_sign) { struct dwrite_textformat *This = impl_from_IDWriteTextFormat(iface); - FIXME("(%p)->(%p %p): stub\n", This, trimming, trimming_sign); - return E_NOTIMPL; + TRACE("(%p)->(%p %p)\n", This, trimming, trimming_sign); + + This->format.trimming = *trimming; + if (This->format.trimmingsign) + IDWriteInlineObject_Release(This->format.trimmingsign); + This->format.trimmingsign = trimming_sign; + if (This->format.trimmingsign) + IDWriteInlineObject_AddRef(This->format.trimmingsign); + return S_OK; } static HRESULT WINAPI dwritetextformat_SetLineSpacing(IDWriteTextFormat *iface, DWRITE_LINE_SPACING_METHOD method, @@ -910,8 +924,13 @@ static HRESULT WINAPI dwritetextformat_GetTrimming(IDWriteTextFormat *iface, DWR IDWriteInlineObject **trimming_sign) { struct dwrite_textformat *This = impl_from_IDWriteTextFormat(iface); - FIXME("(%p)->(%p %p): stub\n", This, options, trimming_sign); - return E_NOTIMPL; + TRACE("(%p)->(%p %p)\n", This, options, trimming_sign); + + *options = This->format.trimming; + if ((*trimming_sign = This->format.trimmingsign)) + IDWriteInlineObject_AddRef(*trimming_sign); + + return S_OK; } static HRESULT WINAPI dwritetextformat_GetLineSpacing(IDWriteTextFormat *iface, DWRITE_LINE_SPACING_METHOD *method, @@ -1061,6 +1080,10 @@ HRESULT create_textformat(const WCHAR *family_name, IDWriteFontCollection *colle This->format.spacingmethod = DWRITE_LINE_SPACING_METHOD_DEFAULT; This->format.spacing = 0.0; This->format.baseline = 0.0; + This->format.trimming.granularity = DWRITE_TRIMMING_GRANULARITY_NONE; + This->format.trimming.delimiter = 0; + This->format.trimming.delimiterCount = 0; + This->format.trimmingsign = NULL; if (collection) { diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index 5699ff7..a340741 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -116,8 +116,10 @@ static void test_CreateTextFormat(void) DWRITE_TEXT_ALIGNMENT align; DWRITE_FLOW_DIRECTION flow; DWRITE_LINE_SPACING_METHOD method; + DWRITE_TRIMMING trimming; IDWriteTextFormat *format; FLOAT spacing, baseline; + IDWriteInlineObject *trimmingsign; HRESULT hr; hr = IDWriteFactory_CreateTextFormat(factory, tahomaW, NULL, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, @@ -160,6 +162,17 @@ if (0) /* crashes on native */ ok(baseline == 0.0, "got %f\n", baseline); ok(method == DWRITE_LINE_SPACING_METHOD_DEFAULT, "got %d\n", method); + trimming.granularity = DWRITE_TRIMMING_GRANULARITY_WORD; + trimming.delimiter = 10; + trimming.delimiterCount = 10; + trimmingsign = (void*)0xdeadbeef; + hr = IDWriteTextFormat_GetTrimming(format, &trimming, &trimmingsign); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(trimming.granularity == DWRITE_TRIMMING_GRANULARITY_NONE, "got %d\n", trimming.granularity); + ok(trimming.delimiter == 0, "got %d\n", trimming.delimiter); + ok(trimming.delimiterCount == 0, "got %d\n", trimming.delimiterCount); + ok(trimmingsign == NULL, "got %p\n", trimmingsign); + /* setters */ hr = IDWriteTextFormat_SetTextAlignment(format, DWRITE_TEXT_ALIGNMENT_LEADING); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -179,6 +192,9 @@ if (0) /* crashes on native */ hr = IDWriteTextFormat_SetLineSpacing(format, DWRITE_LINE_SPACING_METHOD_DEFAULT, 0.0, 0.0); ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IDWriteTextFormat_SetTrimming(format, &trimming, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + IDWriteTextFormat_Release(format); }

1 0

Michael Stefaniuc : netprofm: COM cleanup for IClassFactory.
by Alexandre Julliard 08 Apr '14

08 Apr '14

Module: wine Branch: master Commit: 0c97026ade790de2d35042d3dc2c59b88fc90339 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c97026ade790de2d35042d3d… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Apr 7 21:20:57 2014 +0200 netprofm: COM cleanup for IClassFactory. --- dlls/netprofm/main.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/netprofm/main.c b/dlls/netprofm/main.c index 4ba3cd5..d6e9537 100644 --- a/dlls/netprofm/main.c +++ b/dlls/netprofm/main.c @@ -48,13 +48,13 @@ BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) struct netprofm_cf { - const struct IClassFactoryVtbl *vtbl; + IClassFactory IClassFactory_iface; HRESULT (*create_instance)(void **); }; static inline struct netprofm_cf *impl_from_IClassFactory( IClassFactory *iface ) { - return (struct netprofm_cf *)((char *)iface - FIELD_OFFSET( struct netprofm_cf, vtbl )); + return CONTAINING_RECORD( iface, struct netprofm_cf, IClassFactory_iface ); } static HRESULT WINAPI netprofm_cf_QueryInterface( IClassFactory *iface, REFIID riid, LPVOID *ppobj ) @@ -118,7 +118,7 @@ static const struct IClassFactoryVtbl netprofm_cf_vtbl = netprofm_cf_LockServer }; -static struct netprofm_cf list_manager_cf = { &netprofm_cf_vtbl, list_manager_create }; +static struct netprofm_cf list_manager_cf = { { &netprofm_cf_vtbl }, list_manager_create }; /*********************************************************************** * DllGetClassObject (NETPROFM.@) @@ -131,7 +131,7 @@ HRESULT WINAPI DllGetClassObject( REFCLSID rclsid, REFIID iid, LPVOID *ppv ) if (IsEqualGUID( rclsid, &CLSID_NetworkListManager )) { - cf = (IClassFactory *)&list_manager_cf.vtbl; + cf = &list_manager_cf.IClassFactory_iface; } if (!cf) return CLASS_E_CLASSNOTAVAILABLE; return IClassFactory_QueryInterface( cf, iid, ppv );

1 0

Michael Stefaniuc : netprofm: COM cleanup for INetworkListManager.
by Alexandre Julliard 08 Apr '14

08 Apr '14

Module: wine Branch: master Commit: 598f473802c54e14bc3dadad3f6170007dd70fcb URL: http://source.winehq.org/git/wine.git/?a=commit;h=598f473802c54e14bc3dadad3… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Apr 7 21:18:32 2014 +0200 netprofm: COM cleanup for INetworkListManager. --- dlls/netprofm/list.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/netprofm/list.c b/dlls/netprofm/list.c index 3ea70c4..7c0b9e1 100644 --- a/dlls/netprofm/list.c +++ b/dlls/netprofm/list.c @@ -32,14 +32,14 @@ WINE_DEFAULT_DEBUG_CHANNEL(netprofm); struct list_manager { - const INetworkListManagerVtbl *vtbl; - LONG refs; + INetworkListManager INetworkListManager_iface; + LONG refs; }; static inline struct list_manager *impl_from_INetworkListManager( INetworkListManager *iface ) { - return (struct list_manager *)((char *)iface - FIELD_OFFSET( struct list_manager, vtbl )); + return CONTAINING_RECORD( iface, struct list_manager, INetworkListManager_iface ); } static ULONG WINAPI list_manager_AddRef( @@ -221,10 +221,10 @@ HRESULT list_manager_create( void **obj ) TRACE( "%p\n", obj ); if (!(mgr = HeapAlloc( GetProcessHeap(), 0, sizeof(*mgr) ))) return E_OUTOFMEMORY; - mgr->vtbl = &list_manager_vtbl; + mgr->INetworkListManager_iface.lpVtbl = &list_manager_vtbl; mgr->refs = 1; - *obj = &mgr->vtbl; + *obj = &mgr->INetworkListManager_iface; TRACE( "returning iface %p\n", *obj ); return S_OK; }

1 0

Akihiro Sagawa : user32: Emit EM_SETSEL message when choosing "Select All" from context menu.
by Alexandre Julliard 08 Apr '14

08 Apr '14

Module: wine Branch: master Commit: 6b616a0fd8f3ef29fbda46789ea62d148edc27e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b616a0fd8f3ef29fbda46789… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Tue Apr 8 01:43:53 2014 +0900 user32: Emit EM_SETSEL message when choosing "Select All" from context menu. --- dlls/user32/edit.c | 3 +-- dlls/user32/tests/edit.c | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index 1a9796f..4b29f03 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -3266,8 +3266,7 @@ static void EDIT_ContextMenuCommand(EDITSTATE *es, UINT id) SendMessageW(es->hwndSelf, WM_CLEAR, 0, 0); break; case EM_SETSEL: - EDIT_EM_SetSel(es, 0, (UINT)-1, FALSE); - EDIT_EM_ScrollCaret(es); + SendMessageW(es->hwndSelf, EM_SETSEL, 0, -1); break; default: ERR("unknown menu item, please report\n"); diff --git a/dlls/user32/tests/edit.c b/dlls/user32/tests/edit.c index 312e419..e5c05db 100644 --- a/dlls/user32/tests/edit.c +++ b/dlls/user32/tests/edit.c @@ -2325,7 +2325,7 @@ static void test_contextmenu(void) while (PeekMessageA(&msg, hwndEdit, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); ok(menu_messages.wm_command == 0, "Expected no WM_COMMAND messages, got %d\n", menu_messages.wm_command); - todo_wine ok(menu_messages.em_setsel == 1, + ok(menu_messages.em_setsel == 1, "Expected 1 EM_SETSEL message, got %d\n", menu_messages.em_setsel); DestroyWindow (hwndEdit);

1 0

← Newer
1
...
35
36
37
38
39
40
41
...
50
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 April 2014