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

Henri Verbeet : d3d9/tests: Use a separate device for float_texture_test() .
by Alexandre Julliard April 8, 2014

April 8, 2014

Module: wine Branch: master Commit: 1abd58edea2e136d14da0503bcf144f5d63dbf47 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1abd58edea2e136d14da0503b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 8 09:21:56 2014 +0200 d3d9/tests: Use a separate device for float_texture_test(). --- dlls/d3d9/tests/visual.c | 71 ++++++++++++++++++++++++++++------------------ 1 file changed, 44 insertions(+), 27 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 4275b04..41ef190 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -3791,37 +3791,48 @@ static void release_buffer_test(IDirect3DDevice9 *device) IDirect3DVertexBuffer9_Release(vb); } -static void float_texture_test(IDirect3DDevice9 *device) +static void float_texture_test(void) { - IDirect3D9 *d3d = NULL; - HRESULT hr; - IDirect3DTexture9 *texture = NULL; + IDirect3DTexture9 *texture; + IDirect3DDevice9 *device; D3DLOCKED_RECT lr; + IDirect3D9 *d3d; + ULONG refcount; float *data; DWORD color; - float quad[] = { - -1.0, -1.0, 0.1, 0.0, 0.0, - -1.0, 1.0, 0.1, 0.0, 1.0, - 1.0, -1.0, 0.1, 1.0, 0.0, - 1.0, 1.0, 0.1, 1.0, 1.0, + HWND window; + HRESULT hr; + + static const float quad[] = + { + -1.0f, -1.0f, 0.1f, 0.0f, 0.0f, + -1.0f, 1.0f, 0.1f, 0.0f, 1.0f, + 1.0f, -1.0f, 0.1f, 1.0f, 0.0f, + 1.0f, 1.0f, 0.1f, 1.0f, 1.0f, }; - memset(&lr, 0, sizeof(lr)); - IDirect3DDevice9_GetDirect3D(device, &d3d); - if(IDirect3D9_CheckDeviceFormat(d3d, 0, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, 0, - D3DRTYPE_TEXTURE, D3DFMT_R32F) != D3D_OK) { - skip("D3DFMT_R32F textures not supported\n"); - goto out; + 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; } - hr = IDirect3DDevice9_CreateTexture(device, 1, 1, 1, 0, D3DFMT_R32F, - D3DPOOL_MANAGED, &texture, NULL); - ok(hr == D3D_OK, "IDirect3DDevice9_CreateTexture failed with %08x\n", hr); - if(!texture) { - skip("Failed to create R32F texture\n"); - goto out; + if (IDirect3D9_CheckDeviceFormat(d3d, 0, D3DDEVTYPE_HAL, + D3DFMT_X8R8G8B8, 0, D3DRTYPE_TEXTURE, D3DFMT_R32F) != D3D_OK) + { + skip("D3DFMT_R32F textures not supported\n"); + IDirect3DDevice9_Release(device); + goto done; } + hr = IDirect3DDevice9_CreateTexture(device, 1, 1, 1, 0, D3DFMT_R32F, D3DPOOL_MANAGED, &texture, NULL); + ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); + + memset(&lr, 0, sizeof(lr)); hr = IDirect3DTexture9_LockRect(texture, 0, &lr, NULL, 0); ok(hr == D3D_OK, "IDirect3DTexture9_LockRect failed with %08x\n", hr); data = lr.pBits; @@ -3829,9 +3840,14 @@ static void float_texture_test(IDirect3DDevice9 *device) hr = IDirect3DTexture9_UnlockRect(texture, 0); ok(hr == D3D_OK, "IDirect3DTexture9_UnlockRect failed with %08x\n", hr); - hr = IDirect3DDevice9_SetTexture(device, 0, (IDirect3DBaseTexture9 *) texture); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_LIGHTING, FALSE); + ok(SUCCEEDED(hr), "Failed to disable lighting, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetTexture(device, 0, (IDirect3DBaseTexture9 *)texture); ok(hr == D3D_OK, "IDirect3DDevice9_SetTexture failed with %08x\n", hr); + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0xff0000ff, 1.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + hr = IDirect3DDevice9_BeginScene(device); ok(hr == D3D_OK, "IDirect3DDevice9_BeginScene failed with %08x\n", hr); if(SUCCEEDED(hr)) @@ -3845,8 +3861,6 @@ static void float_texture_test(IDirect3DDevice9 *device) hr = IDirect3DDevice9_EndScene(device); ok(hr == D3D_OK, "IDirect3DDevice9_EndScene failed with %08x\n", hr); } - hr = IDirect3DDevice9_SetTexture(device, 0, NULL); - ok(hr == D3D_OK, "IDirect3DDevice9_SetTexture failed with %08x\n", hr); color = getPixelColor(device, 240, 320); ok(color == 0x0000ffff, "R32F with value 0.0 has color %08x, expected 0x0000ffff\n", color); @@ -3854,9 +3868,12 @@ static void float_texture_test(IDirect3DDevice9 *device) hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); ok(hr == D3D_OK, "IDirect3DDevice9_Present failed with %08x\n", hr); -out: - if(texture) IDirect3DTexture9_Release(texture); + IDirect3DTexture9_Release(texture); + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +done: IDirect3D9_Release(d3d); + DestroyWindow(window); } static void g16r16_texture_test(void) @@ -16606,11 +16623,11 @@ START_TEST(visual) shademode_test(device_ptr); srgbtexture_test(device_ptr); release_buffer_test(device_ptr); - float_texture_test(device_ptr); cleanup_device(device_ptr); device_ptr = NULL; + float_texture_test(); g16r16_texture_test(); pixelshader_blending_test(); texture_transform_flags_test();

1 0

Henri Verbeet : d3d9/tests: Use a separate device for release_buffer_test( ).
by Alexandre Julliard April 8, 2014

April 8, 2014

Module: wine Branch: master Commit: 813ae272b062ffa98cceac6f40f035cd19379c6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=813ae272b062ffa98cceac6f4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 8 09:21:57 2014 +0200 d3d9/tests: Use a separate device for release_buffer_test(). --- dlls/d3d9/tests/visual.c | 77 +++++++++++++++++++++++++++------------------- 1 file changed, 46 insertions(+), 31 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 41ef190..bd2edba 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -3706,46 +3706,54 @@ static void maxmip_test(IDirect3DDevice9 *device) IDirect3DTexture9_Release(texture); } -static void release_buffer_test(IDirect3DDevice9 *device) +static void release_buffer_test(void) { - IDirect3DVertexBuffer9 *vb = NULL; - IDirect3DIndexBuffer9 *ib = NULL; + IDirect3DVertexBuffer9 *vb; + IDirect3DIndexBuffer9 *ib; + IDirect3DDevice9 *device; + IDirect3D9 *d3d; + D3DCOLOR color; + ULONG refcount; + HWND window; HRESULT hr; BYTE *data; LONG ref; - static const struct vertex quad[] = { - {-1.0, -1.0, 0.1, 0xffff0000}, - {-1.0, 1.0, 0.1, 0xffff0000}, - { 1.0, 1.0, 0.1, 0xffff0000}, + static const short indices[] = {3, 4, 5}; + static const struct vertex quad[] = + { + {-1.0f, -1.0f, 0.1f, 0xffff0000}, + {-1.0f, 1.0f, 0.1f, 0xffff0000}, + { 1.0f, 1.0f, 0.1f, 0xffff0000}, - {-1.0, -1.0, 0.1, 0xff00ff00}, - {-1.0, 1.0, 0.1, 0xff00ff00}, - { 1.0, 1.0, 0.1, 0xff00ff00} + {-1.0f, -1.0f, 0.1f, 0xff00ff00}, + {-1.0f, 1.0f, 0.1f, 0xff00ff00}, + { 1.0f, 1.0f, 0.1f, 0xff00ff00}, }; - short indices[] = {3, 4, 5}; - /* Index and vertex buffers should always be creatable */ - hr = IDirect3DDevice9_CreateVertexBuffer(device, sizeof(quad), 0, D3DFVF_XYZ | D3DFVF_DIFFUSE, - D3DPOOL_MANAGED, &vb, NULL); - ok(hr == D3D_OK, "CreateVertexBuffer failed with %08x\n", hr); - if(!vb) { - skip("Failed to create a vertex buffer\n"); - return; - } - hr = IDirect3DDevice9_CreateIndexBuffer(device, sizeof(indices), 0, D3DFMT_INDEX16, D3DPOOL_DEFAULT, &ib, NULL); - ok(hr == D3D_OK, "IDirect3DDevice9_CreateIndexBuffer failed with %08x\n", hr); - if(!ib) { - skip("Failed to create an index buffer\n"); - return; + 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; } + /* Index and vertex buffers should always be creatable */ + hr = IDirect3DDevice9_CreateVertexBuffer(device, sizeof(quad), 0, + D3DFVF_XYZ | D3DFVF_DIFFUSE, D3DPOOL_MANAGED, &vb, NULL); + ok(SUCCEEDED(hr), "Failed to create vertex buffer, hr %#x.\n", hr); hr = IDirect3DVertexBuffer9_Lock(vb, 0, sizeof(quad), (void **) &data, 0); ok(hr == D3D_OK, "IDirect3DVertexBuffer9_Lock failed with %08x\n", hr); memcpy(data, quad, sizeof(quad)); hr = IDirect3DVertexBuffer9_Unlock(vb); ok(hr == D3D_OK, "IDirect3DVertexBuffer9_Unlock failed with %08x\n", hr); + hr = IDirect3DDevice9_CreateIndexBuffer(device, sizeof(indices), 0, + D3DFMT_INDEX16, D3DPOOL_DEFAULT, &ib, NULL); + ok(SUCCEEDED(hr), "Failed to create index buffer, hr %#x.\n", hr); hr = IDirect3DIndexBuffer9_Lock(ib, 0, sizeof(indices), (void **) &data, 0); ok(hr == D3D_OK, "IDirect3DIndexBuffer9_Lock failed with %08x\n", hr); memcpy(data, indices, sizeof(indices)); @@ -3758,12 +3766,14 @@ static void release_buffer_test(IDirect3DDevice9 *device) ok(hr == D3D_OK, "IDirect3DDevice9_SetStreamSource failed with %08x\n", hr); hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ | D3DFVF_DIFFUSE); ok(hr == D3D_OK, "IDirect3DDevice9_SetFVF failed with %08x\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_LIGHTING, FALSE); + ok(SUCCEEDED(hr), "Failed to disable lighting, hr %#x.\n", hr); /* Now destroy the bound index buffer and draw again */ ref = IDirect3DIndexBuffer9_Release(ib); ok(ref == 0, "Index Buffer reference count is %08d\n", ref); - 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 failed with %08x\n", hr); hr = IDirect3DDevice9_BeginScene(device); @@ -3779,16 +3789,21 @@ static void release_buffer_test(IDirect3DDevice9 *device) ok(hr == D3D_OK, "IDirect3DDevice9_EndScene failed with %08x\n", hr); } + color = getPixelColor(device, 160, 120); + ok(color_match(color, D3DCOLOR_ARGB(0x00, 0x00, 0xff, 0x00), 1), "Got unexpected color 0x%08x.\n", color); + color = getPixelColor(device, 480, 360); + ok(color_match(color, D3DCOLOR_ARGB(0x00, 0x00, 0x00, 0xff), 1), "Got unexpected color 0x%08x.\n", color); + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); ok(hr == D3D_OK, "IDirect3DDevice9_Present failed with %08x\n", hr); - hr = IDirect3DDevice9_SetIndices(device, NULL); - ok(hr == D3D_OK, "IDirect3DIndexBuffer9_Unlock failed with %08x\n", hr); - hr = IDirect3DDevice9_SetStreamSource(device, 0, NULL, 0, 0); - ok(hr == D3D_OK, "IDirect3DIndexBuffer9_Unlock failed with %08x\n", hr); - /* Index buffer was already destroyed as part of the test */ IDirect3DVertexBuffer9_Release(vb); + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +done: + IDirect3D9_Release(d3d); + DestroyWindow(window); } static void float_texture_test(void) @@ -16622,11 +16637,11 @@ START_TEST(visual) alpha_test(device_ptr); shademode_test(device_ptr); srgbtexture_test(device_ptr); - release_buffer_test(device_ptr); cleanup_device(device_ptr); device_ptr = NULL; + release_buffer_test(); float_texture_test(); g16r16_texture_test(); pixelshader_blending_test();

1 0

Michael Stefaniuc : netprofm: COM cleanup for INetworkListManager.
by Alexandre Julliard April 8, 2014

April 8, 2014

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

Michael Stefaniuc : netprofm: COM cleanup for IClassFactory.
by Alexandre Julliard April 8, 2014

April 8, 2014

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

Nikolay Sivov : dwrite: Added GetTrimming()/SetTrimming() for text format.
by Alexandre Julliard April 8, 2014

April 8, 2014

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

Nikolay Sivov : dwrite: Added partial implementation for CreateEllipsisTrimmingSign().
by Alexandre Julliard April 8, 2014

April 8, 2014

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

Marcus Meissner : comctl32: Process GetKeyState return correctly (Coverity ).
by Alexandre Julliard April 8, 2014

April 8, 2014

Module: wine Branch: master Commit: 318169a86ff58e29f9b076dafb149abf794bb1c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=318169a86ff58e29f9b076daf… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Apr 6 20:23:56 2014 +0200 comctl32: Process GetKeyState return correctly (Coverity). --- dlls/comctl32/listview.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index bc9a04c..c5b5670 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -3677,8 +3677,8 @@ static void LISTVIEW_SetSelection(LISTVIEW_INFO *infoPtr, INT nItem) static BOOL LISTVIEW_KeySelection(LISTVIEW_INFO *infoPtr, INT nItem, BOOL space) { /* FIXME: pass in the state */ - WORD wShift = HIWORD(GetKeyState(VK_SHIFT)); - WORD wCtrl = HIWORD(GetKeyState(VK_CONTROL)); + WORD wShift = GetKeyState(VK_SHIFT) & 0x8000; + WORD wCtrl = GetKeyState(VK_CONTROL) & 0x8000; BOOL bResult = FALSE; TRACE("nItem=%d, wShift=%d, wCtrl=%d\n", nItem, wShift, wCtrl);

1 0

Dmitry Timoshkov : taskschd: Implement IRegisteredTask::get_Name.
by Alexandre Julliard April 8, 2014

April 8, 2014

Module: wine Branch: master Commit: d79cce769a81c1c49f5df42f1ab34264cdb55ee3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d79cce769a81c1c49f5df42f1… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Apr 8 15:49:28 2014 +0900 taskschd: Implement IRegisteredTask::get_Name. --- dlls/taskschd/regtask.c | 19 +++++++++++++++++-- dlls/taskschd/tests/scheduler.c | 11 +++++------ 2 files changed, 22 insertions(+), 8 deletions(-) diff --git a/dlls/taskschd/regtask.c b/dlls/taskschd/regtask.c index bf50f4f..817ba36 100644 --- a/dlls/taskschd/regtask.c +++ b/dlls/taskschd/regtask.c @@ -117,8 +117,23 @@ static HRESULT WINAPI regtask_Invoke(IRegisteredTask *iface, DISPID dispid, REFI static HRESULT WINAPI regtask_get_Name(IRegisteredTask *iface, BSTR *name) { - FIXME("%p,%p: stub\n", iface, name); - return E_NOTIMPL; + RegisteredTask *regtask = impl_from_IRegisteredTask(iface); + const WCHAR *p_name; + + TRACE("%p,%p\n", iface, name); + + if (!name) return E_POINTER; + + p_name = strrchrW(regtask->path, '\\'); + if (!p_name) + p_name = regtask->path; + else + if (p_name[1] != 0) p_name++; + + *name = SysAllocString(p_name); + if (!*name) return E_OUTOFMEMORY; + + return S_OK; } static HRESULT WINAPI regtask_get_Path(IRegisteredTask *iface, BSTR *path) diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index e0944fc..d24e1ca 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -805,22 +805,21 @@ todo_wine } hr = IRegisteredTask_get_Name(task1, NULL); -todo_wine ok(hr == E_POINTER, "expected E_POINTER, got %#x\n", hr); hr = IRegisteredTask_get_Name(task1, &bstr); -todo_wine ok(hr == S_OK, "get_Name error %#x\n", hr); + ok(!lstrcmpW(bstr, Task1), "expected Task1, got %s\n", wine_dbgstr_w(bstr)); + SysFreeString(bstr); + hr = IRegisteredTask_get_Path(task1, &bstr); +todo_wine + ok(hr == S_OK, "get_Path error %#x\n", hr); /* FIXME: Remove once implemented */ if (hr != S_OK) { ITaskFolder_DeleteTask(root, Wine_Task1, 0); goto failed; } - ok(!lstrcmpW(bstr, Task1), "expected Task1, got %s\n", wine_dbgstr_w(bstr)); - SysFreeString(bstr); - hr = IRegisteredTask_get_Path(task1, &bstr); - ok(hr == S_OK, "get_Path error %#x\n", hr); ok(!lstrcmpW(bstr, Wine_Task1), "expected \\Wine\\Task1, got %s\n", wine_dbgstr_w(bstr)); SysFreeString(bstr); hr = IRegisteredTask_get_State(task1, &state);

1 0

Dmitry Timoshkov : taskschd: Implement ITaskFolder::DeleteTask.
by Alexandre Julliard April 8, 2014

April 8, 2014

Module: wine Branch: master Commit: 04c3680d1150e89b85f2e1c073c55ffd27b8c4fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=04c3680d1150e89b85f2e1c07… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Apr 8 15:49:17 2014 +0900 taskschd: Implement ITaskFolder::DeleteTask. --- dlls/taskschd/folder.c | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/dlls/taskschd/folder.c b/dlls/taskschd/folder.c index 14f1430..d9b201e 100644 --- a/dlls/taskschd/folder.c +++ b/dlls/taskschd/folder.c @@ -283,8 +283,23 @@ static HRESULT WINAPI TaskFolder_GetTasks(ITaskFolder *iface, LONG flags, IRegis static HRESULT WINAPI TaskFolder_DeleteTask(ITaskFolder *iface, BSTR name, LONG flags) { - FIXME("%p,%s,%x: stub\n", iface, debugstr_w(name), flags); - return E_NOTIMPL; + TaskFolder *folder = impl_from_ITaskFolder(iface); + WCHAR *folder_path; + HRESULT hr; + + TRACE("%p,%s,%x\n", iface, debugstr_w(name), flags); + + if (!name || !*name) return E_ACCESSDENIED; + + if (flags) + FIXME("unsupported flags %x\n", flags); + + folder_path = get_full_path(folder->path, name); + if (!folder_path) return E_OUTOFMEMORY; + + hr = SchRpcDelete(folder_path, 0); + heap_free(folder_path); + return hr; } static HRESULT WINAPI TaskFolder_RegisterTask(ITaskFolder *iface, BSTR name, BSTR xml, LONG flags,

1 0

Dmitry Timoshkov : schedsvc/tests: Fix a couple of typos.
by Alexandre Julliard April 8, 2014

April 8, 2014

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