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

Michael Stefaniuc : mshtml/tests: Actually test the return of IHTMLTable_get_width().
by Alexandre Julliard March 25, 2015

March 25, 2015

Module: wine Branch: master Commit: 0cce9200d95b62fd2a3bba5168ff1c4528820ef4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0cce9200d95b62fd2a3bba516… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Mar 25 11:49:12 2015 +0100 mshtml/tests: Actually test the return of IHTMLTable_get_width(). --- dlls/mshtml/tests/dom.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 29356d7..c8ab19d 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -6823,7 +6823,7 @@ static void test_table_elem(IHTMLElement *elem) hres = IHTMLTable_put_width(table, v); ok(hres == S_OK, "put_width = %08x\n", hres); VariantClear(&v); - IHTMLTable_get_width(table, &v); + hres = IHTMLTable_get_width(table, &v); ok(hres == S_OK, "get_width = %08x\n", hres); ok(!strcmp_wa(V_BSTR(&v), "11"), "Expected 11, got %s\n", wine_dbgstr_w(V_BSTR(&v))); VariantClear(&v); @@ -6833,7 +6833,7 @@ static void test_table_elem(IHTMLElement *elem) hres = IHTMLTable_put_width(table, v); ok(hres == S_OK, "put_width = %08x\n", hres); VariantClear(&v); - IHTMLTable_get_width(table, &v); + hres = IHTMLTable_get_width(table, &v); ok(hres == S_OK, "get_width = %08x\n", hres); ok(!strcmp_wa(V_BSTR(&v), "11"), "Expected 11, got %s\n", wine_dbgstr_w(V_BSTR(&v))); VariantClear(&v); @@ -6843,7 +6843,7 @@ static void test_table_elem(IHTMLElement *elem) hres = IHTMLTable_put_width(table, v); ok(hres == S_OK, "put_width = %08x\n", hres); VariantClear(&v); - IHTMLTable_get_width(table, &v); + hres = IHTMLTable_get_width(table, &v); ok(hres == S_OK, "get_width = %08x\n", hres); ok(!strcmp_wa(V_BSTR(&v), "40.2%"), "Expected 40.2%%, got %s\n", wine_dbgstr_w(V_BSTR(&v))); VariantClear(&v); @@ -6852,7 +6852,7 @@ static void test_table_elem(IHTMLElement *elem) V_I4(&v) = 11; hres = IHTMLTable_put_width(table, v); ok(hres == S_OK, "put_width = %08x\n", hres); - IHTMLTable_get_width(table, &v); + hres = IHTMLTable_get_width(table, &v); ok(hres == S_OK, "get_width = %08x\n", hres); ok(!strcmp_wa(V_BSTR(&v), "11"), "Expected 11, got %s\n", wine_dbgstr_w(V_BSTR(&v))); VariantClear(&v); @@ -6861,7 +6861,7 @@ static void test_table_elem(IHTMLElement *elem) V_R8(&v) = 11.9; hres = IHTMLTable_put_width(table, v); ok(hres == S_OK, "put_width = %08x\n", hres); - IHTMLTable_get_width(table, &v); + hres = IHTMLTable_get_width(table, &v); ok(hres == S_OK, "get_width = %08x\n", hres); ok(!strcmp_wa(V_BSTR(&v), "11"), "Expected 11, got %s\n", wine_dbgstr_w(V_BSTR(&v))); VariantClear(&v);

1 0

Piotr Caban : msvcrt/tests: Use NAN and INFINITY definitions from port.h in printf tests.
by Alexandre Julliard March 25, 2015

March 25, 2015

Module: wine Branch: master Commit: 248bd63b53a2fd407794c253d414e2eabeed9631 URL: http://source.winehq.org/git/wine.git/?a=commit;h=248bd63b53a2fd407794c253d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Mar 25 14:22:16 2015 +0100 msvcrt/tests: Use NAN and INFINITY definitions from port.h in printf tests. --- dlls/msvcrt/tests/printf.c | 55 +++++++++++++++++++++++++++++++++++----------- 1 file changed, 42 insertions(+), 13 deletions(-) diff --git a/dlls/msvcrt/tests/printf.c b/dlls/msvcrt/tests/printf.c index 0606c25..7f734ea 100644 --- a/dlls/msvcrt/tests/printf.c +++ b/dlls/msvcrt/tests/printf.c @@ -27,7 +27,6 @@ #include <stdio.h> #include <errno.h> -#include <math.h> #include "windef.h" #include "winbase.h" @@ -35,6 +34,27 @@ #include "wine/test.h" +static inline float __port_infinity(void) +{ + static const unsigned __inf_bytes = 0x7f800000; + return *(const float *)&__inf_bytes; +} +#define INFINITY __port_infinity() + +static inline float __port_nan(void) +{ + static const unsigned __nan_bytes = 0x7fc00000; + return *(const float *)&__nan_bytes; +} +#define NAN __port_nan() + +static inline float __port_ind(void) +{ + static const unsigned __ind_bytes = 0xffc00000; + return *(const float *)&__ind_bytes; +} +#define IND __port_ind() + static int (__cdecl *p__vscprintf)(const char *format, __ms_va_list valist); static int (__cdecl *p__vscwprintf)(const wchar_t *format, __ms_va_list valist); static int (__cdecl *p__vsnwprintf_s)(wchar_t *str, size_t sizeOfBuffer, @@ -82,7 +102,7 @@ static void test_sprintf( void ) { char buffer[100]; const char *format; - double pnumber=789456123, inf, nan; + double pnumber=789456123; int x, r; WCHAR wide[] = { 'w','i','d','e',0}; @@ -675,38 +695,47 @@ static void test_sprintf( void ) r = sprintf(buffer, format, 0x12345); ok(!strcmp(buffer,"2345"), "failed \"%s\"\n", buffer); - nan = 0.0; - inf = 1.0/nan; - nan = sqrt(-1); format = "%lf"; - r = sprintf(buffer, format, nan); + r = sprintf(buffer, format, IND); ok(r==9, "r = %d\n", r); ok(!strcmp(buffer, "-1.#IND00"), "failed: \"%s\"\n", buffer); - r = sprintf(buffer, format, inf); + r = sprintf(buffer, format, NAN); + ok(r==8, "r = %d\n", r); + ok(!strcmp(buffer, "1.#QNAN0"), "failed: \"%s\"\n", buffer); + r = sprintf(buffer, format, INFINITY); ok(r==8, "r = %d\n", r); ok(!strcmp(buffer, "1.#INF00"), "failed: \"%s\"\n", buffer); format = "%le"; - r = sprintf(buffer, format, nan); + r = sprintf(buffer, format, IND); ok(r==14, "r = %d\n", r); ok(!strcmp(buffer, "-1.#IND00e+000"), "failed: \"%s\"\n", buffer); - r = sprintf(buffer, format, inf); + r = sprintf(buffer, format, NAN); + ok(r==13, "r = %d\n", r); + ok(!strcmp(buffer, "1.#QNAN0e+000"), "failed: \"%s\"\n", buffer); + r = sprintf(buffer, format, INFINITY); ok(r==13, "r = %d\n", r); ok(!strcmp(buffer, "1.#INF00e+000"), "failed: \"%s\"\n", buffer); format = "%lg"; - r = sprintf(buffer, format, nan); + r = sprintf(buffer, format, IND); ok(r==7, "r = %d\n", r); ok(!strcmp(buffer, "-1.#IND"), "failed: \"%s\"\n", buffer); - r = sprintf(buffer, format, inf); + r = sprintf(buffer, format, NAN); + ok(r==7, "r = %d\n", r); + ok(!strcmp(buffer, "1.#QNAN"), "failed: \"%s\"\n", buffer); + r = sprintf(buffer, format, INFINITY); ok(r==6, "r = %d\n", r); ok(!strcmp(buffer, "1.#INF"), "failed: \"%s\"\n", buffer); format = "%010.2lf"; - r = sprintf(buffer, format, nan); + r = sprintf(buffer, format, IND); ok(r==10, "r = %d\n", r); ok(!strcmp(buffer, "-000001.#J"), "failed: \"%s\"\n", buffer); - r = sprintf(buffer, format, inf); + r = sprintf(buffer, format, NAN); + ok(r==10, "r = %d\n", r); + ok(!strcmp(buffer, "0000001.#R"), "failed: \"%s\"\n", buffer); + r = sprintf(buffer, format, INFINITY); ok(r==10, "r = %d\n", r); ok(!strcmp(buffer, "0000001.#J"), "failed: \"%s\"\n", buffer); }

1 0

Hans Leidekker : msi: Fall back to the database summary information stream in MSI_OpenPackageW.
by Alexandre Julliard March 25, 2015

March 25, 2015

Module: wine Branch: master Commit: 052b3a748e144093ec7043e68333fbc2e85fcdd7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=052b3a748e144093ec7043e68… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Mar 25 14:31:47 2015 +0100 msi: Fall back to the database summary information stream in MSI_OpenPackageW. --- dlls/msi/msipriv.h | 1 + dlls/msi/package.c | 18 +++++++++++++----- dlls/msi/suminfo.c | 4 ++-- 3 files changed, 16 insertions(+), 7 deletions(-) diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index a953d28..b67698a 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -952,6 +952,7 @@ extern UINT msi_spawn_error_dialog( MSIPACKAGE*, LPWSTR, LPWSTR ) DECLSPEC_HIDDE /* summary information */ extern UINT msi_get_suminfo( IStorage *stg, UINT uiUpdateCount, MSISUMMARYINFO **si ) DECLSPEC_HIDDEN; +extern UINT msi_get_db_suminfo( MSIDATABASE *db, UINT uiUpdateCount, MSISUMMARYINFO **si ) DECLSPEC_HIDDEN; extern LPWSTR msi_suminfo_dup_string( MSISUMMARYINFO *si, UINT uiProperty ) DECLSPEC_HIDDEN; extern INT msi_suminfo_get_int32( MSISUMMARYINFO *si, UINT uiProperty ) DECLSPEC_HIDDEN; extern LPWSTR msi_get_suminfo_product( IStorage *stg ) DECLSPEC_HIDDEN; diff --git a/dlls/msi/package.c b/dlls/msi/package.c index de50703..6fbbbf5 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -1488,8 +1488,12 @@ static WCHAR *get_package_code( MSIDATABASE *db ) r = msi_get_suminfo( db->storage, 0, &si ); if (r != ERROR_SUCCESS) { - WARN("failed to load summary info %u\n", r); - return NULL; + r = msi_get_db_suminfo( db, 0, &si ); + if (r != ERROR_SUCCESS) + { + WARN("failed to load summary info %u\n", r); + return NULL; + } } ret = msi_suminfo_dup_string( si, PID_REVNUMBER ); msiobj_release( &si->hdr ); @@ -1638,9 +1642,13 @@ UINT MSI_OpenPackageW(LPCWSTR szPackage, MSIPACKAGE **pPackage) r = msi_get_suminfo( db->storage, 0, &si ); if (r != ERROR_SUCCESS) { - WARN("failed to load summary info\n"); - msiobj_release( &package->hdr ); - return ERROR_INSTALL_PACKAGE_INVALID; + r = msi_get_db_suminfo( db, 0, &si ); + if (r != ERROR_SUCCESS) + { + WARN("failed to load summary info\n"); + msiobj_release( &package->hdr ); + return ERROR_INSTALL_PACKAGE_INVALID; + } } r = parse_suminfo( si, package ); msiobj_release( &si->hdr ); diff --git a/dlls/msi/suminfo.c b/dlls/msi/suminfo.c index 97544d5..bb5e935 100644 --- a/dlls/msi/suminfo.c +++ b/dlls/msi/suminfo.c @@ -469,7 +469,7 @@ UINT msi_get_suminfo( IStorage *stg, UINT uiUpdateCount, MSISUMMARYINFO **ret ) return ERROR_SUCCESS; } -static UINT get_db_suminfo( MSIDATABASE *db, UINT uiUpdateCount, MSISUMMARYINFO **ret ) +UINT msi_get_db_suminfo( MSIDATABASE *db, UINT uiUpdateCount, MSISUMMARYINFO **ret ) { IStream *stm; MSISUMMARYINFO *si; @@ -547,7 +547,7 @@ UINT WINAPI MsiGetSummaryInformationW( MSIHANDLE hDatabase, ret = msi_get_suminfo( db->storage, uiUpdateCount, &si ); if (ret != ERROR_SUCCESS) - ret = get_db_suminfo( db, uiUpdateCount, &si ); + ret = msi_get_db_suminfo( db, uiUpdateCount, &si ); if (ret != ERROR_SUCCESS) { if ((si = create_suminfo( db->storage, uiUpdateCount )))

1 0

Hans Leidekker : msi: Avoid allocating a database handle only to retrieve the summary information.
by Alexandre Julliard March 25, 2015

March 25, 2015

Module: wine Branch: master Commit: cd73576ec0f7f7a7f810bf3fd6e17b6625d6d2f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd73576ec0f7f7a7f810bf3fd… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Mar 25 14:32:17 2015 +0100 msi: Avoid allocating a database handle only to retrieve the summary information. --- dlls/msi/msipriv.h | 1 + dlls/msi/package.c | 70 +-------------------------- dlls/msi/suminfo.c | 140 ++++++++++++++++++++++++++++++++++++++--------------- 3 files changed, 102 insertions(+), 109 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cd73576ec0f7f7a7f810b…

1 0

Michael Müller : netprofm/tests: Add tests for ConnectionPointContainer::FindConnectionPoint.
by Alexandre Julliard March 25, 2015

March 25, 2015

Module: wine Branch: master Commit: d07f76e39affdbe29f8733ffb1087d400b305a53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d07f76e39affdbe29f8733ffb… Author: Michael Müller <michael(a)fds-team.de> Date: Wed Mar 25 12:03:48 2015 +0100 netprofm/tests: Add tests for ConnectionPointContainer::FindConnectionPoint. The refcounting is also tested because some apps depend on that. --- dlls/netprofm/tests/list.c | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/dlls/netprofm/tests/list.c b/dlls/netprofm/tests/list.c index ce4891a..06a8086 100644 --- a/dlls/netprofm/tests/list.c +++ b/dlls/netprofm/tests/list.c @@ -27,12 +27,15 @@ static void test_INetworkListManager( void ) { - IConnectionPointContainer *cpc; + IConnectionPointContainer *cpc, *cpc2; INetworkListManager *mgr; INetworkCostManager *cost_mgr; NLM_CONNECTIVITY connectivity; VARIANT_BOOL connected; + IConnectionPoint *pt; HRESULT hr; + ULONG ref1, ref2; + IID iid; hr = CoCreateInstance( &CLSID_NetworkListManager, NULL, CLSCTX_INPROC_SERVER, &IID_INetworkListManager, (void **)&mgr ); @@ -78,8 +81,31 @@ static void test_INetworkListManager( void ) hr = INetworkListManager_QueryInterface( mgr, &IID_IConnectionPointContainer, (void**)&cpc ); ok( hr == S_OK, "got %08x\n", hr ); + + ref1 = IConnectionPointContainer_AddRef( cpc ); + + hr = IConnectionPointContainer_FindConnectionPoint( cpc, &IID_INetworkListManagerEvents, &pt ); + ok( hr == S_OK, "got %08x\n", hr ); + + ref2 = IConnectionPointContainer_AddRef( cpc ); + ok( ref2 == ref1 + 2, "Expected refcount %d, got %d\n", ref1 + 2, ref2 ); + + IConnectionPointContainer_Release( cpc ); IConnectionPointContainer_Release( cpc ); + hr = IConnectionPoint_GetConnectionPointContainer( pt, &cpc2 ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( cpc2 == cpc, "Expected cpc2 == %p, but got %p\n", cpc, cpc2 ); + IConnectionPointContainer_Release( cpc2 ); + + memset( &iid, 0, sizeof(iid) ); + hr = IConnectionPoint_GetConnectionInterface( pt, &iid ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( !memcmp( &iid, &IID_INetworkListManagerEvents, sizeof(iid) ), + "Expected iid to be IID_INetworkListManagerEvents\n" ); + + IConnectionPoint_Release( pt ); + IConnectionPointContainer_Release( cpc ); INetworkListManager_Release( mgr ); }

1 0

Piotr Caban : msvcrt/tests: Add atan, tanh and exp tests on invalid arguments.
by Alexandre Julliard March 25, 2015

March 25, 2015

Module: wine Branch: master Commit: 6de6e42a36d0bce0fa88b54b28a95bdb802d3237 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6de6e42a36d0bce0fa88b54b2… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Mar 25 13:13:57 2015 +0100 msvcrt/tests: Add atan, tanh and exp tests on invalid arguments. --- dlls/msvcrt/tests/misc.c | 64 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) diff --git a/dlls/msvcrt/tests/misc.c b/dlls/msvcrt/tests/misc.c index a4c5c8c..ab14e04 100644 --- a/dlls/msvcrt/tests/misc.c +++ b/dlls/msvcrt/tests/misc.c @@ -21,8 +21,29 @@ #include "wine/test.h" #include <errno.h> #include <stdio.h> +#include <math.h> #include "msvcrt.h" +static inline float __port_infinity(void) +{ + static const unsigned __inf_bytes = 0x7f800000; + return *(const float *)&__inf_bytes; +} +#define INFINITY __port_infinity() + +static inline float __port_nan(void) +{ + static const unsigned __nan_bytes = 0x7fc00000; + return *(const float *)&__nan_bytes; +} +#define NAN __port_nan() + +static inline BOOL almost_equal(double d1, double d2) { + if(d1-d2>-1e-30 && d1-d2<1e-30) + return TRUE; + return FALSE; +} + static int (__cdecl *prand_s)(unsigned int *); static int (__cdecl *pI10_OUTPUT)(long double, int, int, void*); static int (__cdecl *pstrerror_s)(char *, MSVCRT_size_t, int); @@ -34,6 +55,9 @@ static void (__cdecl *p__invalid_parameter)(const wchar_t*, const wchar_t*, const wchar_t*, unsigned int, uintptr_t); static void (__cdecl *p_qsort_s)(void*, MSVCRT_size_t, MSVCRT_size_t, int (__cdecl*)(void*, const void*, const void*), void*); +static double (__cdecl *p_atan)(double); +static double (__cdecl *p_exp)(double); +static double (__cdecl *p_tanh)(double); static void init(void) { @@ -48,6 +72,9 @@ static void init(void) p_set_errno = (void *)GetProcAddress(hmod, "_set_errno"); p__invalid_parameter = (void *)GetProcAddress(hmod, "_invalid_parameter"); p_qsort_s = (void *)GetProcAddress(hmod, "qsort_s"); + p_atan = (void *)GetProcAddress(hmod, "atan"); + p_exp = (void *)GetProcAddress(hmod, "exp"); + p_tanh = (void *)GetProcAddress(hmod, "tanh"); } static void test_rand_s(void) @@ -477,6 +504,42 @@ static void test_qsort_s(void) ok(tab[i] == i, "data sorted incorrectly on position %d: %d\n", i, tab[i]); } +static void test_math_functions(void) +{ + double ret; + + errno = 0xdeadbeef; + p_atan(NAN); + ok(errno == EDOM, "errno = %d\n", errno); + + errno = 0xdeadbeef; + ret = p_atan(INFINITY); + ok(almost_equal(ret, 1.57079632679489661923), "ret = %lf\n", ret); + ok(errno == 0xdeadbeef, "errno = %d\n", errno); + + errno = 0xdeadbeef; + ret = p_atan(-INFINITY); + ok(almost_equal(ret, -1.57079632679489661923), "ret = %lf\n", ret); + ok(errno == 0xdeadbeef, "errno = %d\n", errno); + + errno = 0xdeadbeef; + p_tanh(NAN); + ok(errno == EDOM, "errno = %d\n", errno); + + errno = 0xdeadbeef; + ret = p_tanh(INFINITY); + ok(almost_equal(ret, 1.0), "ret = %lf\n", ret); + ok(errno == 0xdeadbeef, "errno = %d\n", errno); + + errno = 0xdeadbeef; + p_exp(NAN); + ok(errno == EDOM, "errno = %d\n", errno); + + errno = 0xdeadbeef; + p_exp(INFINITY); + ok(errno == 0xdeadbeef, "errno = %d\n", errno); +} + START_TEST(misc) { int arg_c; @@ -504,4 +567,5 @@ START_TEST(misc) test__popen(arg_v[0]); test__invalid_parameter(); test_qsort_s(); + test_math_functions(); }

1 0

Huw Davies : ole32: Implement QueryGetData().
by Alexandre Julliard March 25, 2015

March 25, 2015

Module: wine Branch: master Commit: b0deb315a06d135ba6f15c182380e4d23858fd16 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0deb315a06d135ba6f15c182… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Mar 25 08:37:41 2015 +0000 ole32: Implement QueryGetData(). --- dlls/ole32/datacache.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/ole32/datacache.c b/dlls/ole32/datacache.c index 35b27de..1076a37 100644 --- a/dlls/ole32/datacache.c +++ b/dlls/ole32/datacache.c @@ -1026,12 +1026,15 @@ static HRESULT WINAPI DataCache_GetDataHere( return E_NOTIMPL; } -static HRESULT WINAPI DataCache_QueryGetData( - IDataObject* iface, - LPFORMATETC pformatetc) +static HRESULT WINAPI DataCache_QueryGetData( IDataObject *iface, FORMATETC *fmt ) { - FIXME("stub\n"); - return E_NOTIMPL; + DataCache *This = impl_from_IDataObject( iface ); + DataCacheEntry *cache_entry; + + TRACE( "(%p)->(%s)\n", iface, debugstr_formatetc( fmt ) ); + cache_entry = DataCache_GetEntryForFormatEtc( This, fmt ); + + return cache_entry ? S_OK : S_FALSE; } /************************************************************************

1 0

Henri Verbeet : d2d1: Implement d2d_state_block_GetDescription().
by Alexandre Julliard March 25, 2015

March 25, 2015

Module: wine Branch: master Commit: 95f5dc72a2ba0ad1e1ddf194eda1a0e461bb70fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=95f5dc72a2ba0ad1e1ddf194e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 25 10:05:30 2015 +0100 d2d1: Implement d2d_state_block_GetDescription(). --- dlls/d2d1/d2d1_private.h | 1 + dlls/d2d1/state_block.c | 22 ++++++++++++++++------ 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index 89d2377..bbceb7f 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -175,6 +175,7 @@ struct d2d_state_block ID2D1DrawingStateBlock ID2D1DrawingStateBlock_iface; LONG refcount; + D2D1_DRAWING_STATE_DESCRIPTION drawing_state; IDWriteRenderingParams *text_rendering_params; }; diff --git a/dlls/d2d1/state_block.c b/dlls/d2d1/state_block.c index 978c7df..e893264 100644 --- a/dlls/d2d1/state_block.c +++ b/dlls/d2d1/state_block.c @@ -84,7 +84,11 @@ static void STDMETHODCALLTYPE d2d_state_block_GetFactory(ID2D1DrawingStateBlock static void STDMETHODCALLTYPE d2d_state_block_GetDescription(ID2D1DrawingStateBlock *iface, D2D1_DRAWING_STATE_DESCRIPTION *desc) { - FIXME("iface %p, desc %p stub!\n", iface, desc); + struct d2d_state_block *state_block = impl_from_ID2D1DrawingStateBlock(iface); + + TRACE("iface %p, desc %p.\n", iface, desc); + + *desc = state_block->drawing_state; } static void STDMETHODCALLTYPE d2d_state_block_SetDescription(ID2D1DrawingStateBlock *iface, @@ -133,13 +137,19 @@ static const struct ID2D1DrawingStateBlockVtbl d2d_state_block_vtbl = void d2d_state_block_init(struct d2d_state_block *state_block, const D2D1_DRAWING_STATE_DESCRIPTION *desc, IDWriteRenderingParams *text_rendering_params) { - FIXME("Ignoring state block properties.\n"); + static const D2D1_MATRIX_3X2_F identity = + { + 1.0f, 0.0f, + 0.0f, 1.0f, + 0.0f, 0.0f, + }; state_block->ID2D1DrawingStateBlock_iface.lpVtbl = &d2d_state_block_vtbl; state_block->refcount = 1; - if (text_rendering_params) - { - state_block->text_rendering_params = text_rendering_params; + if (desc) + state_block->drawing_state = *desc; + else + state_block->drawing_state.transform = identity; + if ((state_block->text_rendering_params = text_rendering_params)) IDWriteRenderingParams_AddRef(state_block->text_rendering_params); - } }

1 0

Henri Verbeet : d2d1: Implement d2d_state_block_SetDescription().
by Alexandre Julliard March 25, 2015

March 25, 2015

Module: wine Branch: master Commit: 1b93c01048e2394194cc088ab1fd0efb9f5fbf4a URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b93c01048e2394194cc088ab… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 25 10:05:31 2015 +0100 d2d1: Implement d2d_state_block_SetDescription(). --- dlls/d2d1/state_block.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/d2d1/state_block.c b/dlls/d2d1/state_block.c index e893264..28da331 100644 --- a/dlls/d2d1/state_block.c +++ b/dlls/d2d1/state_block.c @@ -94,7 +94,11 @@ static void STDMETHODCALLTYPE d2d_state_block_GetDescription(ID2D1DrawingStateBl static void STDMETHODCALLTYPE d2d_state_block_SetDescription(ID2D1DrawingStateBlock *iface, const D2D1_DRAWING_STATE_DESCRIPTION *desc) { - FIXME("iface %p, desc %p stub!\n", iface, desc); + struct d2d_state_block *state_block = impl_from_ID2D1DrawingStateBlock(iface); + + TRACE("iface %p, desc %p.\n", iface, desc); + + state_block->drawing_state = *desc; } static void STDMETHODCALLTYPE d2d_state_block_SetTextRenderingParams(ID2D1DrawingStateBlock *iface,

1 0

Huw Davies : ole32: Separate metafile loading into a helper function.
by Alexandre Julliard March 25, 2015

March 25, 2015

Module: wine Branch: master Commit: 547fd746bb863fe4ee1599bce03abeb00d832fe6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=547fd746bb863fe4ee1599bce… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Mar 25 08:37:37 2015 +0000 ole32: Separate metafile loading into a helper function. --- dlls/ole32/datacache.c | 197 ++++++++++++++++++++++--------------------------- 1 file changed, 89 insertions(+), 108 deletions(-) diff --git a/dlls/ole32/datacache.c b/dlls/ole32/datacache.c index f791f80..a2b7e57 100644 --- a/dlls/ole32/datacache.c +++ b/dlls/ole32/datacache.c @@ -507,6 +507,80 @@ static HRESULT DataCacheEntry_OpenPresStream(DataCacheEntry *cache_entry, IStrea return hr; } + +static HRESULT load_mf_pict( DataCacheEntry *cache_entry, IStream *stm ) +{ + HRESULT hr; + STATSTG stat; + ULARGE_INTEGER current_pos; + void *bits; + METAFILEPICT *mfpict; + HGLOBAL hmfpict; + PresentationDataHeader header; + CLIPFORMAT clipformat; + static const LARGE_INTEGER offset_zero; + ULONG read; + + if (cache_entry->stream_type != pres_stream) + { + FIXME( "Unimplemented for stream type %d\n", cache_entry->stream_type ); + return E_FAIL; + } + + hr = IStream_Stat( stm, &stat, STATFLAG_NONAME ); + if (FAILED( hr )) return hr; + + hr = read_clipformat( stm, &clipformat ); + if (FAILED( hr )) return hr; + + hr = IStream_Read( stm, &header, sizeof(header), &read ); + if (hr != S_OK || read != sizeof(header)) return E_FAIL; + + hr = IStream_Seek( stm, offset_zero, STREAM_SEEK_CUR, &current_pos ); + if (FAILED( hr )) return hr; + + stat.cbSize.QuadPart -= current_pos.QuadPart; + + hmfpict = GlobalAlloc( GMEM_MOVEABLE, sizeof(METAFILEPICT) ); + if (!hmfpict) return E_OUTOFMEMORY; + mfpict = GlobalLock( hmfpict ); + + bits = HeapAlloc( GetProcessHeap(), 0, stat.cbSize.u.LowPart); + if (!bits) + { + GlobalFree( hmfpict ); + return E_OUTOFMEMORY; + } + + hr = IStream_Read( stm, bits, stat.cbSize.u.LowPart, &read ); + if (hr != S_OK || read != stat.cbSize.u.LowPart) hr = E_FAIL; + + if (SUCCEEDED( hr )) + { + /* FIXME: get this from the stream */ + mfpict->mm = MM_ANISOTROPIC; + mfpict->xExt = header.dwObjectExtentX; + mfpict->yExt = header.dwObjectExtentY; + mfpict->hMF = SetMetaFileBitsEx( stat.cbSize.u.LowPart, bits ); + if (!mfpict->hMF) + hr = E_FAIL; + } + + GlobalUnlock( hmfpict ); + if (SUCCEEDED( hr )) + { + cache_entry->data_cf = cache_entry->fmtetc.cfFormat; + cache_entry->stgmedium.tymed = TYMED_MFPICT; + cache_entry->stgmedium.u.hMetaFilePict = hmfpict; + } + else + GlobalFree( hmfpict ); + + HeapFree( GetProcessHeap(), 0, bits ); + + return hr; +} + /************************************************************************ * DataCacheEntry_LoadData * @@ -522,118 +596,25 @@ static HRESULT DataCacheEntry_OpenPresStream(DataCacheEntry *cache_entry, IStrea */ static HRESULT DataCacheEntry_LoadData(DataCacheEntry *cache_entry) { - IStream* presStream = NULL; - HRESULT hres; - ULARGE_INTEGER current_pos; - STATSTG streamInfo; - void* metafileBits; - METAFILEPICT *mfpict; - HGLOBAL hmfpict; - PresentationDataHeader header; - CLIPFORMAT clipformat; - static const LARGE_INTEGER offset_zero; - - /* - * Open the presentation stream. - */ - hres = DataCacheEntry_OpenPresStream(cache_entry, &presStream); - - if (FAILED(hres)) - return hres; - - /* - * Get the size of the stream. - */ - hres = IStream_Stat(presStream, - &streamInfo, - STATFLAG_NONAME); - if (FAILED(hres)) - { - IStream_Release(presStream); - return hres; - } - - /* - * Read the header. - */ - - hres = read_clipformat(presStream, &clipformat); - if (FAILED(hres)) - { - IStream_Release(presStream); - return hres; - } - - hres = IStream_Read( - presStream, - &header, - sizeof(PresentationDataHeader), - NULL); - if (hres != S_OK) - { - IStream_Release(presStream); - return E_FAIL; - } - - hres = IStream_Seek(presStream, offset_zero, STREAM_SEEK_CUR, &current_pos); - - streamInfo.cbSize.QuadPart -= current_pos.QuadPart; - - hmfpict = GlobalAlloc(GMEM_MOVEABLE, sizeof(METAFILEPICT)); - if (!hmfpict) - { - IStream_Release(presStream); - return E_OUTOFMEMORY; - } - mfpict = GlobalLock(hmfpict); + HRESULT hr; + IStream *stm; - /* - * Allocate a buffer for the metafile bits. - */ - metafileBits = HeapAlloc(GetProcessHeap(), - 0, - streamInfo.cbSize.u.LowPart); + hr = DataCacheEntry_OpenPresStream( cache_entry, &stm ); + if (FAILED(hr)) return hr; - /* - * Read the metafile bits. - */ - hres = IStream_Read( - presStream, - metafileBits, - streamInfo.cbSize.u.LowPart, - NULL); - - /* - * Create a metafile with those bits. - */ - if (SUCCEEDED(hres)) - { - /* FIXME: get this from the stream */ - mfpict->mm = MM_ANISOTROPIC; - mfpict->xExt = header.dwObjectExtentX; - mfpict->yExt = header.dwObjectExtentY; - mfpict->hMF = SetMetaFileBitsEx(streamInfo.cbSize.u.LowPart, metafileBits); - if (!mfpict->hMF) - hres = E_FAIL; - } - - GlobalUnlock(hmfpict); - if (SUCCEEDED(hres)) - { - cache_entry->data_cf = cache_entry->fmtetc.cfFormat; - cache_entry->stgmedium.tymed = TYMED_MFPICT; - cache_entry->stgmedium.u.hMetaFilePict = hmfpict; - } - else - GlobalFree(hmfpict); + switch (cache_entry->fmtetc.cfFormat) + { + case CF_METAFILEPICT: + hr = load_mf_pict( cache_entry, stm ); + break; - /* - * Cleanup. - */ - HeapFree(GetProcessHeap(), 0, metafileBits); - IStream_Release(presStream); + default: + FIXME( "Unimplemented clip format %x\n", cache_entry->fmtetc.cfFormat ); + hr = E_NOTIMPL; + } - return hres; + IStream_Release( stm ); + return hr; } static HRESULT DataCacheEntry_CreateStream(DataCacheEntry *cache_entry,

1 0