September 2014 - Wine-Commits

Henri Verbeet : d2d1: Implement d2d_d3d_render_target_CreateMesh().
by Alexandre Julliard Sept. 16, 2014

Sept. 16, 2014

Module: wine Branch: master Commit: be415203c7e25a38d0f5a248ae1683208dd06671 URL: http://source.winehq.org/git/wine.git/?a=commit;h=be415203c7e25a38d0f5a248a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 16 10:44:12 2014 +0200 d2d1: Implement d2d_d3d_render_target_CreateMesh(). --- dlls/d2d1/Makefile.in | 1 + dlls/d2d1/d2d1_private.h | 8 ++++ dlls/d2d1/mesh.c | 100 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/d2d1/render_target.c | 14 ++++++- 4 files changed, 121 insertions(+), 2 deletions(-) diff --git a/dlls/d2d1/Makefile.in b/dlls/d2d1/Makefile.in index 60072ca..6c27e22 100644 --- a/dlls/d2d1/Makefile.in +++ b/dlls/d2d1/Makefile.in @@ -5,6 +5,7 @@ IMPORTS = d3d10_1 dxguid uuid C_SRCS = \ brush.c \ factory.c \ + mesh.c \ render_target.c \ stroke.c \ wic_render_target.c diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index 4ee4ab0..0b8cf2b 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -107,4 +107,12 @@ struct d2d_stroke_style void d2d_stroke_style_init(struct d2d_stroke_style *style, ID2D1Factory *factory, const D2D1_STROKE_STYLE_PROPERTIES *desc, const float *dashes, UINT32 dash_count) DECLSPEC_HIDDEN; +struct d2d_mesh +{ + ID2D1Mesh ID2D1Mesh_iface; + LONG refcount; +}; + +void d2d_mesh_init(struct d2d_mesh *mesh) DECLSPEC_HIDDEN; + #endif /* __WINE_D2D1_PRIVATE_H */ diff --git a/dlls/d2d1/mesh.c b/dlls/d2d1/mesh.c new file mode 100644 index 0000000..b566382 --- /dev/null +++ b/dlls/d2d1/mesh.c @@ -0,0 +1,100 @@ +/* + * Copyright 2014 Henri Verbeet for CodeWeavers + * + * 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 + */ + +#include "config.h" +#include "wine/port.h" + +#include "d2d1_private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(d2d); + +static inline struct d2d_mesh *impl_from_ID2D1Mesh(ID2D1Mesh *iface) +{ + return CONTAINING_RECORD(iface, struct d2d_mesh, ID2D1Mesh_iface); +} + +static HRESULT STDMETHODCALLTYPE d2d_mesh_QueryInterface(ID2D1Mesh *iface, REFIID iid, void **out) +{ + TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); + + if (IsEqualGUID(iid, &IID_ID2D1Mesh) + || IsEqualGUID(iid, &IID_ID2D1Resource) + || IsEqualGUID(iid, &IID_IUnknown)) + { + ID2D1Mesh_AddRef(iface); + *out = iface; + return S_OK; + } + + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); + + *out = NULL; + return E_NOINTERFACE; +} + +static ULONG STDMETHODCALLTYPE d2d_mesh_AddRef(ID2D1Mesh *iface) +{ + struct d2d_mesh *mesh = impl_from_ID2D1Mesh(iface); + ULONG refcount = InterlockedIncrement(&mesh->refcount); + + TRACE("%p increasing refcount to %u.\n", iface, refcount); + + return refcount; +} + +static ULONG STDMETHODCALLTYPE d2d_mesh_Release(ID2D1Mesh *iface) +{ + struct d2d_mesh *mesh = impl_from_ID2D1Mesh(iface); + ULONG refcount = InterlockedDecrement(&mesh->refcount); + + TRACE("%p decreasing refcount to %u.\n", iface, refcount); + + if (!refcount) + HeapFree(GetProcessHeap(), 0, mesh); + + return refcount; +} + +static void STDMETHODCALLTYPE d2d_mesh_GetFactory(ID2D1Mesh *iface, ID2D1Factory **factory) +{ + FIXME("iface %p, factory %p stub!\n", iface, factory); + + *factory = NULL; +} + +static HRESULT STDMETHODCALLTYPE d2d_mesh_Open(ID2D1Mesh *iface, ID2D1TessellationSink **sink) +{ + FIXME("iface %p, sink %p stub!\n", iface, sink); + + return E_NOTIMPL; +} + +static const struct ID2D1MeshVtbl d2d_mesh_vtbl = +{ + d2d_mesh_QueryInterface, + d2d_mesh_AddRef, + d2d_mesh_Release, + d2d_mesh_GetFactory, + d2d_mesh_Open, +}; + +void d2d_mesh_init(struct d2d_mesh *mesh) +{ + mesh->ID2D1Mesh_iface.lpVtbl = &d2d_mesh_vtbl; + mesh->refcount = 1; +} diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index 4d69697..8a55890 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -304,9 +304,19 @@ static HRESULT STDMETHODCALLTYPE d2d_d3d_render_target_CreateLayer(ID2D1RenderTa static HRESULT STDMETHODCALLTYPE d2d_d3d_render_target_CreateMesh(ID2D1RenderTarget *iface, ID2D1Mesh **mesh) { - FIXME("iface %p, mesh %p stub!\n", iface, mesh); + struct d2d_mesh *object; - return E_NOTIMPL; + TRACE("iface %p, mesh %p.\n", iface, mesh); + + if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) + return E_OUTOFMEMORY; + + d2d_mesh_init(object); + + TRACE("Created mesh %p.\n", object); + *mesh = &object->ID2D1Mesh_iface; + + return S_OK; } static void STDMETHODCALLTYPE d2d_d3d_render_target_DrawLine(ID2D1RenderTarget *iface,

1 0

Jacek Caban : oleacc: Added CAccPropServices stub implementation.
by Alexandre Julliard Sept. 16, 2014

Sept. 16, 2014

Module: wine Branch: master Commit: c5af3d912bdd406a4a37cf9543d723e905aa7390 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5af3d912bdd406a4a37cf954… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 15 21:36:59 2014 +0200 oleacc: Added CAccPropServices stub implementation. --- dlls/oleacc/Makefile.in | 1 + dlls/oleacc/main.c | 6 -- dlls/oleacc/propservice.c | 257 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/oleacc/tests/main.c | 16 +++ 4 files changed, 274 insertions(+), 6 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c5af3d912bdd406a4a37c…

1 0

Jactry Zeng : riched20: Implement ITextRange::GetStart and ITextRange:: GetEnd.
by Alexandre Julliard Sept. 16, 2014

Sept. 16, 2014

Module: wine Branch: master Commit: b56c96a619efa56dd8b224ce17ba54beb6503346 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b56c96a619efa56dd8b224ce1… Author: Jactry Zeng <wine(a)jactry.com> Date: Tue Sep 16 18:38:56 2014 +0800 riched20: Implement ITextRange::GetStart and ITextRange::GetEnd. --- dlls/riched20/richole.c | 14 +++++++--- dlls/riched20/tests/richole.c | 65 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 75 insertions(+), 4 deletions(-) diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index 963368f..dab26f3 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -638,8 +638,11 @@ static HRESULT WINAPI ITextRange_fnGetStart(ITextRange *me, LONG *pcpFirst) if (!This->reOle) return CO_E_RELEASED; - FIXME("not implemented %p\n", This); - return E_NOTIMPL; + if (!pcpFirst) + return E_INVALIDARG; + *pcpFirst = This->start; + TRACE("%d\n", *pcpFirst); + return S_OK; } static HRESULT WINAPI ITextRange_fnSetStart(ITextRange *me, LONG cpFirst) @@ -658,8 +661,11 @@ static HRESULT WINAPI ITextRange_fnGetEnd(ITextRange *me, LONG *pcpLim) if (!This->reOle) return CO_E_RELEASED; - FIXME("not implemented %p\n", This); - return E_NOTIMPL; + if (!pcpLim) + return E_INVALIDARG; + *pcpLim = This->end; + TRACE("%d\n", *pcpLim); + return S_OK; } static HRESULT WINAPI ITextRange_fnSetEnd(ITextRange *me, LONG cpLim) diff --git a/dlls/riched20/tests/richole.c b/dlls/riched20/tests/richole.c index 2e9b45a..681c5f7 100644 --- a/dlls/riched20/tests/richole.c +++ b/dlls/riched20/tests/richole.c @@ -631,6 +631,70 @@ static void test_ITextSelection_GetChar(void) release_interfaces(&w, &reOle, &txtDoc, &txtSel); } +static void test_ITextRange_GetStart_GetEnd(void) +{ + HWND w; + IRichEditOle *reOle = NULL; + ITextDocument *txtDoc = NULL; + ITextRange *txtRge = NULL; + HRESULT hres; + int first, lim, start, end; + static const CHAR test_text1[] = "TestSomeText"; + + create_interfaces(&w, &reOle, &txtDoc, NULL); + SendMessageA(w, WM_SETTEXT, 0, (LPARAM)test_text1); + + first = 1, lim = 6; + ITextDocument_Range(txtDoc, first, lim, &txtRge); + start = 0xdeadbeef; + hres = ITextRange_GetStart(txtRge, &start); + ok(hres == S_OK, "ITextRange_GetStart\n"); + ok(start == 1, "got wrong start value: %d\n", start); + end = 0xdeadbeef; + hres = ITextRange_GetEnd(txtRge, &end); + ok(hres == S_OK, "ITextRange_GetEnd\n"); + ok(end == 6, "got wrong end value: %d\n", end); + ITextRange_Release(txtRge); + + first = 6, lim = 1; + ITextDocument_Range(txtDoc, first, lim, &txtRge); + start = 0xdeadbeef; + hres = ITextRange_GetStart(txtRge, &start); + ok(hres == S_OK, "ITextRange_GetStart\n"); + ok(start == 1, "got wrong start value: %d\n", start); + end = 0xdeadbeef; + hres = ITextRange_GetEnd(txtRge, &end); + ok(hres == S_OK, "ITextRange_GetEnd\n"); + ok(end == 6, "got wrong end value: %d\n", end); + ITextRange_Release(txtRge); + + first = -1, lim = 13; + ITextDocument_Range(txtDoc, first, lim, &txtRge); + start = 0xdeadbeef; + hres = ITextRange_GetStart(txtRge, &start); + ok(hres == S_OK, "ITextRange_GetStart\n"); + ok(start == 0, "got wrong start value: %d\n", start); + end = 0xdeadbeef; + hres = ITextRange_GetEnd(txtRge, &end); + ok(hres == S_OK, "ITextRange_GetEnd\n"); + ok(end == 13, "got wrong end value: %d\n", end); + ITextRange_Release(txtRge); + + first = 13, lim = 13; + ITextDocument_Range(txtDoc, first, lim, &txtRge); + start = 0xdeadbeef; + hres = ITextRange_GetStart(txtRge, &start); + ok(hres == S_OK, "ITextRange_GetStart\n"); + ok(start == 12, "got wrong start value: %d\n", start); + end = 0xdeadbeef; + hres = ITextRange_GetEnd(txtRge, &end); + ok(hres == S_OK, "ITextRange_GetEnd\n"); + ok(end == 12, "got wrong end value: %d\n", end); + ITextRange_Release(txtRge); + + release_interfaces(&w, &reOle, &txtDoc, NULL); +} + START_TEST(richole) { /* Must explicitly LoadLibrary(). The test has no references to functions in @@ -644,4 +708,5 @@ START_TEST(richole) test_ITextSelection_GetChar(); test_ITextDocument_Range(); test_ITextRange_GetChar(); + test_ITextRange_GetStart_GetEnd(); }

1 0

Henri Verbeet : d3d10core: Implement d3d10_device_VSSetShaderResources().
by Alexandre Julliard Sept. 16, 2014

Sept. 16, 2014

Module: wine Branch: master Commit: 1e434b52d0896371138b0fcd6726ad75f3c1fc33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e434b52d0896371138b0fcd6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 16 10:44:16 2014 +0200 d3d10core: Implement d3d10_device_VSSetShaderResources(). --- dlls/d3d10core/d3d10core_private.h | 2 + dlls/d3d10core/device.c | 13 ++++++- dlls/d3d10core/view.c | 8 ++++ dlls/wined3d/cs.c | 77 ++++++++++++++++++++++++++------------ dlls/wined3d/device.c | 32 ++++++++++++++++ dlls/wined3d/wined3d.spec | 1 + dlls/wined3d/wined3d_private.h | 24 +++++++----- include/wine/wined3d.h | 2 + 8 files changed, 125 insertions(+), 34 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1e434b52d0896371138b0…

1 0

Hugh McMaster : user32: Fix spelling in a comment.
by Alexandre Julliard Sept. 15, 2014

Sept. 15, 2014

Module: wine Branch: master Commit: 0fa8ae7b5280d3acad2c3221f72d91dea9c17f12 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0fa8ae7b5280d3acad2c3221f… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Sep 15 19:24:10 2014 +1000 user32: Fix spelling in a comment. --- dlls/user32/win.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index c9660be..73cad0c 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -2602,9 +2602,9 @@ LONG WINAPI DECLSPEC_HOTPATCH SetWindowLongA( HWND hwnd, INT offset, LONG newval * SetWindowLong() alters one of a window's attributes or sets a 32-bit (long) * value in a window's extra memory. * - * The _hwnd_ parameter specifies the window. is the handle to a - * window that has extra memory. The _newval_ parameter contains the - * new attribute or extra memory value. If positive, the _offset_ + * The _hwnd_ parameter specifies the handle to a window that + * has extra memory. The _newval_ parameter contains the new + * attribute or extra memory value. If positive, the _offset_ * parameter is the byte-addressed location in the window's extra * memory to set. If negative, _offset_ specifies the window * attribute to set, and should be one of the following values: @@ -2615,7 +2615,7 @@ LONG WINAPI DECLSPEC_HOTPATCH SetWindowLongA( HWND hwnd, INT offset, LONG newval * * GWLP_WNDPROC Pointer to the window's window procedure. * - * GWLP_HINSTANCE The window's pplication instance handle. + * GWLP_HINSTANCE The window's application instance handle. * * GWLP_ID The window's identifier. *

1 0

Michael Müller : bcrypt: Add semi-stub for BCryptGetFipsAlgorithmMode.
by Alexandre Julliard Sept. 15, 2014

Sept. 15, 2014

Module: wine Branch: master Commit: f808da266b4c9192602a929a3298c0631944b8a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f808da266b4c9192602a929a3… Author: Michael Müller <michael(a)fds-team.de> Date: Sat Aug 16 00:18:06 2014 +0200 bcrypt: Add semi-stub for BCryptGetFipsAlgorithmMode. --- dlls/bcrypt/bcrypt.spec | 2 +- dlls/bcrypt/bcrypt_main.c | 11 +++++++++++ dlls/bcrypt/tests/bcrypt.c | 21 +++++++++++++++++++++ 3 files changed, 33 insertions(+), 1 deletion(-) diff --git a/dlls/bcrypt/bcrypt.spec b/dlls/bcrypt/bcrypt.spec index 3b154f5..83cdbea 100644 --- a/dlls/bcrypt/bcrypt.spec +++ b/dlls/bcrypt/bcrypt.spec @@ -27,7 +27,7 @@ @ stdcall BCryptGenRandom(ptr ptr long long) @ stub BCryptGenerateKeyPair @ stub BCryptGenerateSymmetricKey -@ stub BCryptGetFipsAlgorithmMode +@ stdcall BCryptGetFipsAlgorithmMode(ptr) @ stub BCryptGetProperty @ stub BCryptHashData @ stub BCryptImportKey diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index 5ccb9f1..35a640a 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -97,3 +97,14 @@ NTSTATUS WINAPI BCryptCloseAlgorithmProvider(BCRYPT_ALG_HANDLE algorithm, DWORD return STATUS_NOT_IMPLEMENTED; } + +NTSTATUS WINAPI BCryptGetFipsAlgorithmMode(BOOLEAN *enabled) +{ + FIXME("%p - semi-stub\n", enabled); + + if (!enabled) + return STATUS_INVALID_PARAMETER; + + *enabled = FALSE; + return STATUS_SUCCESS; +} diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index 288e745..9e659d6 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -27,6 +27,7 @@ static NTSTATUS (WINAPI *pBCryptGenRandom)(BCRYPT_ALG_HANDLE hAlgorithm, PUCHAR pbBuffer, ULONG cbBuffer, ULONG dwFlags); +static NTSTATUS (WINAPI *pBCryptGetFipsAlgorithmMode)(BOOLEAN *enabled); static BOOL Init(void) { @@ -38,6 +39,7 @@ static BOOL Init(void) } pBCryptGenRandom = (void *)GetProcAddress(hbcrypt, "BCryptGenRandom"); + pBCryptGetFipsAlgorithmMode = (void *)GetProcAddress(hbcrypt, "BCryptGetFipsAlgorithmMode"); return TRUE; } @@ -78,10 +80,29 @@ static void test_BCryptGenRandom(void) ok(memcmp(buffer, buffer + 8, 8), "Expected a random number, got 0\n"); } +static void test_BCryptGetFipsAlgorithmMode(void) +{ + NTSTATUS ret; + BOOLEAN enabled; + + if (!pBCryptGetFipsAlgorithmMode) + { + win_skip("BCryptGetFipsAlgorithmMode is not available\n"); + return; + } + + ret = pBCryptGetFipsAlgorithmMode(&enabled); + ok(ret == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got 0x%x\n", ret); + + ret = pBCryptGetFipsAlgorithmMode(NULL); + ok(ret == STATUS_INVALID_PARAMETER, "Expected STATUS_INVALID_PARAMETER, got 0x%x\n", ret); +} + START_TEST(bcrypt) { if (!Init()) return; test_BCryptGenRandom(); + test_BCryptGetFipsAlgorithmMode(); }

1 0

Hans Leidekker : rsaenh: Fix typos in SHA-384/SHA-512 OIDs.
by Alexandre Julliard Sept. 15, 2014

Sept. 15, 2014

Module: wine Branch: master Commit: 2884053a28959a5950bafabb387fc9c96f625cee URL: http://source.winehq.org/git/wine.git/?a=commit;h=2884053a28959a5950bafabb3… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Sep 15 16:37:26 2014 +0200 rsaenh: Fix typos in SHA-384/SHA-512 OIDs. --- dlls/rsaenh/rsaenh.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/rsaenh/rsaenh.c b/dlls/rsaenh/rsaenh.c index fa9071d..7123ffb 100644 --- a/dlls/rsaenh/rsaenh.c +++ b/dlls/rsaenh/rsaenh.c @@ -248,7 +248,7 @@ static const PROV_ENUMALGS_EX aProvEnumAlgsEx[5][RSAENH_MAX_ENUMALGS+1] = {CALG_AES_256, 256,256, 256,0, 8,"AES-256", 39,"Advanced Encryption Standard (AES-256)"}, {CALG_SHA, 160,160, 160,CRYPT_FLAG_SIGNING, 6,"SHA-1", 30,"Secure Hash Algorithm (SHA-1)"}, {CALG_SHA_256, 256,256, 256,CRYPT_FLAG_SIGNING, 6,"SHA-256", 30,"Secure Hash Algorithm (SHA-256)"}, - {CALG_SHA_384, 384,384, 384,CRYPT_FLAG_SIGNING, 6,"SHA-384", 30,"Secure Hash Algorithm (SHA-284)"}, + {CALG_SHA_384, 384,384, 384,CRYPT_FLAG_SIGNING, 6,"SHA-384", 30,"Secure Hash Algorithm (SHA-384)"}, {CALG_SHA_512, 512,512, 512,CRYPT_FLAG_SIGNING, 6,"SHA-512", 30,"Secure Hash Algorithm (SHA-512)"}, {CALG_MD2, 128,128, 128,CRYPT_FLAG_SIGNING, 4,"MD2", 23,"Message Digest 2 (MD2)"}, {CALG_MD4, 128,128, 128,CRYPT_FLAG_SIGNING, 4,"MD4", 23,"Message Digest 4 (MD4)"}, @@ -1483,10 +1483,10 @@ static BOOL build_hash_signature(BYTE *pbSignature, DWORD dwLen, ALG_ID aiAlgid, 0x48, 0x01, 0x65, 0x03, 0x04, 0x02, 0x01, 0x05, 0x00, 0x04, 0x20 } }, { CALG_SHA_384, 19, { 0x30, 0x41, 0x30, 0x0d, 0x06, 0x09, 0x60, 0x86, - 0x48, 0x01, 0x65, 0x03, 0x04, 0x02, 0x01, + 0x48, 0x01, 0x65, 0x03, 0x04, 0x02, 0x02, 0x05, 0x00, 0x04, 0x30 } }, - { CALG_SHA_384, 19, { 0x30, 0x51, 0x30, 0x0d, 0x06, 0x09, 0x60, 0x86, - 0x48, 0x01, 0x65, 0x03, 0x04, 0x02, 0x01, + { CALG_SHA_512, 19, { 0x30, 0x51, 0x30, 0x0d, 0x06, 0x09, 0x60, 0x86, + 0x48, 0x01, 0x65, 0x03, 0x04, 0x02, 0x03, 0x05, 0x00, 0x04, 0x40 } }, { CALG_SSL3_SHAMD5, 0, { 0 } }, { 0, 0, { 0 } }

1 0

Sebastian Lackner : glu32: Fix wrapper function for glu[Begin|End] Polygon and gluNextContour.
by Alexandre Julliard Sept. 15, 2014

Sept. 15, 2014

Module: wine Branch: master Commit: 912035f9c8b1a76741d3f2c6821a573159edf6dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=912035f9c8b1a76741d3f2c68… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sun Sep 14 07:07:13 2014 +0200 glu32: Fix wrapper function for glu[Begin|End]Polygon and gluNextContour. --- dlls/glu32/glu.c | 55 +++++++++++++++++++++++++++++++------------------------ 1 file changed, 31 insertions(+), 24 deletions(-) diff --git a/dlls/glu32/glu.c b/dlls/glu32/glu.c index 46a2336..4f0d0e2 100644 --- a/dlls/glu32/glu.c +++ b/dlls/glu32/glu.c @@ -352,30 +352,6 @@ int WINAPI wine_gluNurbsCallback(void *arg0,int arg1,void *arg2) { } /*********************************************************************** - * gluBeginPolygon (GLU32.@) - */ -extern int gluBeginPolygon(void *arg0); -int WINAPI wine_gluBeginPolygon(void *arg0) { - return gluBeginPolygon(arg0); -} - -/*********************************************************************** - * gluEndPolygon (GLU32.@) - */ -extern int gluEndPolygon(void *arg0); -int WINAPI wine_gluEndPolygon(void *arg0) { - return gluEndPolygon(arg0); -} - -/*********************************************************************** - * gluNextContour (GLU32.@) - */ -extern int gluNextContour(void *arg0,int arg1); -int WINAPI wine_gluNextContour(void *arg0,int arg1) { - return gluNextContour(arg0,arg1); -} - -/*********************************************************************** * gluGetString (GLU32.@) */ extern int gluGetString(int arg0); @@ -617,3 +593,34 @@ void WINAPI wine_gluTessNormal(void *tess, double arg1, double arg2, double arg3 wine_tess_t *wine_tess = tess; gluTessNormal(wine_tess->tess, arg1, arg2, arg3); } + +/*********************************************************************** + * gluBeginPolygon (GLU32.@) + */ +void WINAPI wine_gluBeginPolygon(void *tess) +{ + wine_tess_t *wine_tess = tess; + wine_tess->polygon_data = NULL; + gluTessBeginPolygon(wine_tess->tess, wine_tess); + gluTessBeginContour(wine_tess->tess); +} + +/*********************************************************************** + * gluEndPolygon (GLU32.@) + */ +void WINAPI wine_gluEndPolygon(void *tess) +{ + wine_tess_t *wine_tess = tess; + gluTessEndContour(wine_tess->tess); + gluTessEndPolygon(wine_tess->tess); +} + +/*********************************************************************** + * gluNextContour (GLU32.@) + */ +void WINAPI wine_gluNextContour(void *tess, int arg1) +{ + wine_tess_t *wine_tess = tess; + gluTessEndContour(wine_tess->tess); + gluTessBeginContour(wine_tess->tess); +}

1 0

Henri Verbeet : d2d1: Implement d2d_factory_CreateWicBitmapRenderTarget().
by Alexandre Julliard Sept. 15, 2014

Sept. 15, 2014

Module: wine Branch: master Commit: c8f758a099efcec3656b2ccb7ef049bf070c7014 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8f758a099efcec3656b2ccb7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Sep 15 11:03:37 2014 +0200 d2d1: Implement d2d_factory_CreateWicBitmapRenderTarget(). --- dlls/d2d1/Makefile.in | 3 +- dlls/d2d1/d2d1_private.h | 18 + dlls/d2d1/factory.c | 20 +- dlls/d2d1/wic_render_target.c | 898 ++++++++++++++++++++++++++++++++++++++++++ include/Makefile.in | 1 + include/d2d1.idl | 1 + include/d2derr.h | 26 ++ 7 files changed, 964 insertions(+), 3 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c8f758a099efcec3656b2…

1 0

Jactry Zeng : mshtml: Add IHTMLCurrentStyle:: get_textTransform implementation.
by Alexandre Julliard Sept. 15, 2014

Sept. 15, 2014

Module: wine Branch: master Commit: e777e9d1baaf84f88b1ca8327e62afa6463f9e4f URL: http://source.winehq.org/git/wine.git/?a=commit;h=e777e9d1baaf84f88b1ca8327… Author: Jactry Zeng <wine(a)jactry.com> Date: Mon Sep 15 09:51:10 2014 +0800 mshtml: Add IHTMLCurrentStyle::get_textTransform implementation. --- dlls/mshtml/htmlcurstyle.c | 4 ++-- dlls/mshtml/tests/style.c | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlcurstyle.c b/dlls/mshtml/htmlcurstyle.c index ca5d60f..5f6cb35 100644 --- a/dlls/mshtml/htmlcurstyle.c +++ b/dlls/mshtml/htmlcurstyle.c @@ -793,8 +793,8 @@ static HRESULT WINAPI HTMLCurrentStyle_get_overflowY(IHTMLCurrentStyle *iface, B static HRESULT WINAPI HTMLCurrentStyle_get_textTransform(IHTMLCurrentStyle *iface, BSTR *p) { HTMLCurrentStyle *This = impl_from_IHTMLCurrentStyle(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, p); + return get_nsstyle_attr(This->nsstyle, STYLEID_TEXT_TRANSFORM, p, 0); } static const IHTMLCurrentStyleVtbl HTMLCurrentStyleVtbl = { diff --git a/dlls/mshtml/tests/style.c b/dlls/mshtml/tests/style.c index 40552a4..d8c86b1 100644 --- a/dlls/mshtml/tests/style.c +++ b/dlls/mshtml/tests/style.c @@ -2750,6 +2750,10 @@ static void test_current_style(IHTMLCurrentStyle *current_style) ok(V_VT(&v) == VT_BSTR, "V_VT(v) = %d\n", V_VT(&v)); VariantClear(&v); + hres = IHTMLCurrentStyle_get_textTransform(current_style, &str); + ok(hres == S_OK, "get_textTransform failed: %08x\n", hres); + SysFreeString(str); + current_style2 = get_current_style2_iface((IUnknown*)current_style); b = 100;

1 0