February 2018 - Wine-Commits

Nikolay Sivov : xmllite/tests: Use the global HeapAlloc() wrappers.
by Alexandre Julliard Feb. 8, 2018

Feb. 8, 2018

Module: wine Branch: master Commit: f826b25019e7cc6856dbaf11bd07bf45e82719f2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f826b25019e7cc6856dbaf11… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Feb 8 14:17:02 2018 +0300 xmllite/tests: Use the global HeapAlloc() wrappers. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/tests/reader.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index 0033776..3cdc177 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -30,20 +30,21 @@ #include "ole2.h" #include "xmllite.h" #include "wine/test.h" +#include "wine/heap.h" DEFINE_GUID(IID_IXmlReaderInput, 0x0b3ccc9b, 0x9214, 0x428b, 0xa2, 0xae, 0xef, 0x3a, 0xa8, 0x71, 0xaf, 0xda); static WCHAR *a2w(const char *str) { int len = MultiByteToWideChar(CP_ACP, 0, str, -1, NULL, 0); - WCHAR *ret = HeapAlloc(GetProcessHeap(), 0, len*sizeof(WCHAR)); + WCHAR *ret = heap_alloc(len * sizeof(WCHAR)); MultiByteToWideChar(CP_ACP, 0, str, -1, ret, len); return ret; } static void free_str(WCHAR *str) { - HeapFree(GetProcessHeap(), 0, str); + heap_free(str); } static int strcmp_wa(const WCHAR *str1, const char *stra) @@ -408,9 +409,7 @@ static ULONG WINAPI testinput_Release(IUnknown *iface) ref = InterlockedDecrement(&This->ref); if (ref == 0) - { - HeapFree(GetProcessHeap(), 0, This); - } + heap_free(This); return ref; } @@ -426,7 +425,7 @@ static HRESULT testinput_createinstance(void **ppObj) { testinput *input; - input = HeapAlloc(GetProcessHeap(), 0, sizeof (*input)); + input = heap_alloc(sizeof(*input)); if(!input) return E_OUTOFMEMORY; input->IUnknown_iface.lpVtbl = &testinput_vtbl;

1 0

Józef Kucia : wined3d: Introduce blend state object.
by Alexandre Julliard Feb. 8, 2018

Feb. 8, 2018

Module: wine Branch: master Commit: 350a757e37965a646128f8600a0eb2c4bca6e20f URL: https://source.winehq.org/git/wine.git/?a=commit;h=350a757e37965a646128f860… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Feb 8 15:22:44 2018 +0100 wined3d: Introduce blend state object. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 27 +++++++++++++ dlls/wined3d/device.c | 25 ++++++++++++ dlls/wined3d/state.c | 88 +++++++++++++++++++++++++++++++++++++++++- dlls/wined3d/wined3d.spec | 7 ++++ dlls/wined3d/wined3d_private.h | 18 ++++++++- include/wine/wined3d.h | 15 +++++++ 6 files changed, 178 insertions(+), 2 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=350a757e37965a646128…

1 0

Jacek Caban : mshtml: Store compat mode in dispex_data_t and use it in dispex_compat_mode when possible.
by Alexandre Julliard Feb. 8, 2018

Feb. 8, 2018

Module: wine Branch: master Commit: 728080667267a636d68cdf8ff8d1731a6e27aa0f URL: https://source.winehq.org/git/wine.git/?a=commit;h=728080667267a636d68cdf8f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 8 20:53:21 2018 +0100 mshtml: Store compat mode in dispex_data_t and use it in dispex_compat_mode when possible. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/dispex.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index ea20baf..360d915 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -64,6 +64,7 @@ typedef struct { struct dispex_data_t { dispex_static_data_t *desc; + compat_mode_t compat_mode; DWORD func_cnt; DWORD func_size; @@ -411,6 +412,7 @@ static dispex_data_t *preprocess_dispex_data(dispex_static_data_t *desc, compat_ return NULL; } data->desc = desc; + data->compat_mode = compat_mode; data->func_cnt = 0; data->func_disp_cnt = 0; data->func_size = 16; @@ -1364,7 +1366,9 @@ HRESULT remove_attribute(DispatchEx *This, DISPID id, VARIANT_BOOL *success) compat_mode_t dispex_compat_mode(DispatchEx *dispex) { - return dispex->info->desc->vtbl->get_compat_mode(dispex); + return dispex->info != dispex->info->desc->delayed_init_info + ? dispex->info->compat_mode + : dispex->info->desc->vtbl->get_compat_mode(dispex); } static dispex_data_t *ensure_dispex_info(dispex_static_data_t *desc, compat_mode_t compat_mode)

1 0

Nikolay Sivov : comctl32: Introduce Static control.
by Alexandre Julliard Feb. 8, 2018

Feb. 8, 2018

Module: wine Branch: master Commit: 31d3fcc0b20eabe40182300219eecc832f5e3afe URL: https://source.winehq.org/git/wine.git/?a=commit;h=31d3fcc0b20eabe401823002… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Feb 8 13:37:23 2018 +0300 comctl32: Introduce Static control. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/Makefile.in | 1 + dlls/comctl32/button.c | 2 +- dlls/comctl32/comctl32.h | 3 + dlls/comctl32/commctrl.c | 2 + dlls/comctl32/static.c | 812 +++++++++++++++++++++++++++++++++++++++++++++ dlls/comctl32/tests/misc.c | 3 +- dlls/user32/class.c | 1 - dlls/user32/tests/class.c | 1 + 8 files changed, 822 insertions(+), 3 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=31d3fcc0b20eabe40182…

1 0

Hans Leidekker : kerberos: Don' t fail on caller supplied credentials in kerberos_SpAcquireCredentialsHandle.
by Alexandre Julliard Feb. 8, 2018

Feb. 8, 2018

Module: wine Branch: master Commit: 574446923420a9ec23f6d73bedc216fe960b4060 URL: https://source.winehq.org/git/wine.git/?a=commit;h=574446923420a9ec23f6d73b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Feb 8 11:53:57 2018 +0100 kerberos: Don't fail on caller supplied credentials in kerberos_SpAcquireCredentialsHandle. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kerberos/krb5_ap.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/dlls/kerberos/krb5_ap.c b/dlls/kerberos/krb5_ap.c index 99673b0..78ec6d3 100644 --- a/dlls/kerberos/krb5_ap.c +++ b/dlls/kerberos/krb5_ap.c @@ -832,11 +832,7 @@ static NTSTATUS NTAPI kerberos_SpAcquireCredentialsHandle( TRACE( "(%s 0x%08x %p %p %p %p %p %p)\n", debugstr_us(principal_us), credential_use, logon_id, auth_data, get_key_fn, get_key_arg, credential, ts_expiry ); - if (auth_data) - { - FIXME( "specific credentials not supported\n" ); - return SEC_E_UNKNOWN_CREDENTIALS; - } + if (auth_data) FIXME( "specific credentials not supported\n" ); switch (credential_use) {

1 0

Dmitry Timoshkov : kerberos: Slightly simplify name_sspi_to_gss.
by Alexandre Julliard Feb. 8, 2018

Feb. 8, 2018

Module: wine Branch: master Commit: 0d44fc790492afb616727ca2f1991c9f193468c6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0d44fc790492afb616727ca2… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Feb 8 09:42:43 2018 +0800 kerberos: Slightly simplify name_sspi_to_gss. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kerberos/krb5_ap.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/kerberos/krb5_ap.c b/dlls/kerberos/krb5_ap.c index e3ede45..99673b0 100644 --- a/dlls/kerberos/krb5_ap.c +++ b/dlls/kerberos/krb5_ap.c @@ -748,10 +748,9 @@ static SECURITY_STATUS name_sspi_to_gss( const UNICODE_STRING *name_str, gss_nam gss_OID type = GSS_C_NO_OID; /* FIXME: detect the appropriate value for this ourselves? */ gss_buffer_desc buf; - buf.length = WideCharToMultiByte( CP_UNIXCP, 0, name_str->Buffer, name_str->Length / sizeof(WCHAR), NULL, 0, NULL, NULL ) + 1; + buf.length = WideCharToMultiByte( CP_UNIXCP, 0, name_str->Buffer, name_str->Length / sizeof(WCHAR), NULL, 0, NULL, NULL ); if (!(buf.value = heap_alloc( buf.length ))) return SEC_E_INSUFFICIENT_MEMORY; WideCharToMultiByte( CP_UNIXCP, 0, name_str->Buffer, name_str->Length / sizeof(WCHAR), buf.value, buf.length, NULL, NULL ); - buf.length--; ret = pgss_import_name( &minor_status, &buf, type, name ); TRACE( "gss_import_name returned %08x minor status %08x\n", ret, minor_status );

1 0

Hans Leidekker : secur32: Implement QueryContextAttributesA( SECPKG_ATTR_NEGOTIATION_INFO) in the LSA wrapper.
by Alexandre Julliard Feb. 8, 2018

Feb. 8, 2018

Module: wine Branch: master Commit: 3e4fb94d82530580bb7db42b2ce99965d7f38861 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3e4fb94d82530580bb7db42b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Feb 8 11:54:00 2018 +0100 secur32: Implement QueryContextAttributesA(SECPKG_ATTR_NEGOTIATION_INFO) in the LSA wrapper. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/lsa.c | 39 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 38 insertions(+), 1 deletion(-) diff --git a/dlls/secur32/lsa.c b/dlls/secur32/lsa.c index 511e24a..b93006a 100644 --- a/dlls/secur32/lsa.c +++ b/dlls/secur32/lsa.c @@ -554,6 +554,32 @@ static SECURITY_STATUS WINAPI lsa_QueryContextAttributesW(CtxtHandle *context, U return lsa_package->lsa_api->SpQueryContextAttributes(lsa_context, attribute, buffer); } +static SecPkgInfoA *package_infoWtoA( const SecPkgInfoW *info ) +{ + SecPkgInfoA *ret; + int size_name = WideCharToMultiByte( CP_ACP, 0, info->Name, -1, NULL, 0, NULL, NULL ); + int size_comment = WideCharToMultiByte( CP_ACP, 0, info->Comment, -1, NULL, 0, NULL, NULL ); + + if (!(ret = HeapAlloc( GetProcessHeap(), 0, sizeof(*ret) + size_name + size_comment ))) return NULL; + ret->fCapabilities = info->fCapabilities; + ret->wVersion = info->wVersion; + ret->wRPCID = info->wRPCID; + ret->cbMaxToken = info->cbMaxToken; + ret->Name = (SEC_CHAR *)(ret + 1); + WideCharToMultiByte( CP_ACP, 0, info->Name, -1, ret->Name, size_name, NULL, NULL ); + ret->Comment = ret->Name + size_name; + WideCharToMultiByte( CP_ACP, 0, info->Comment, -1, ret->Comment, size_comment, NULL, NULL ); + return ret; +} + +static SECURITY_STATUS nego_info_WtoA( const SecPkgContext_NegotiationInfoW *infoW, + SecPkgContext_NegotiationInfoA *infoA ) +{ + infoA->NegotiationState = infoW->NegotiationState; + if (!(infoA->PackageInfo = package_infoWtoA( infoW->PackageInfo ))) return SEC_E_INSUFFICIENT_MEMORY; + return SEC_E_OK; +} + static SECURITY_STATUS WINAPI lsa_QueryContextAttributesA(CtxtHandle *context, ULONG attribute, void *buffer) { TRACE("%p %d %p\n", context, attribute, buffer); @@ -565,6 +591,18 @@ static SECURITY_STATUS WINAPI lsa_QueryContextAttributesA(CtxtHandle *context, U case SECPKG_ATTR_SIZES: return lsa_QueryContextAttributesW( context, attribute, buffer ); + case SECPKG_ATTR_NEGOTIATION_INFO: + { + SecPkgContext_NegotiationInfoW infoW; + SecPkgContext_NegotiationInfoA *infoA = (SecPkgContext_NegotiationInfoA *)buffer; + SECURITY_STATUS status = lsa_QueryContextAttributesW( context, SECPKG_ATTR_NEGOTIATION_INFO, &infoW ); + + if (status != SEC_E_OK) return status; + status = nego_info_WtoA( &infoW, infoA ); + FreeContextBuffer( infoW.PackageInfo ); + return status; + } + #define X(x) case (x) : FIXME(#x" stub\n"); break X(SECPKG_ATTR_ACCESS_TOKEN); X(SECPKG_ATTR_AUTHORITY); @@ -578,7 +616,6 @@ static SECURITY_STATUS WINAPI lsa_QueryContextAttributesA(CtxtHandle *context, U X(SECPKG_ATTR_SESSION_KEY); X(SECPKG_ATTR_STREAM_SIZES); X(SECPKG_ATTR_TARGET_INFORMATION); - X(SECPKG_ATTR_NEGOTIATION_INFO); #undef X default: FIXME( "unknown attribute %u\n", attribute );

1 0

Nikolay Sivov : user32: Remove confusing comments.
by Alexandre Julliard Feb. 8, 2018

Feb. 8, 2018

Module: wine Branch: master Commit: 1ae05c04a28065aed9b045ec3f73a66dcc5c07b8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1ae05c04a28065aed9b045ec… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Feb 8 13:52:16 2018 +0300 user32: Remove confusing comments. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/button.c | 9 --------- dlls/user32/combo.c | 9 --------- dlls/user32/edit.c | 9 --------- dlls/user32/listbox.c | 9 --------- dlls/user32/scroll.c | 9 --------- dlls/user32/static.c | 9 --------- 6 files changed, 54 deletions(-) diff --git a/dlls/user32/button.c b/dlls/user32/button.c index e5cee12..52e718f 100644 --- a/dlls/user32/button.c +++ b/dlls/user32/button.c @@ -18,15 +18,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * - * NOTES - * - * This code was audited for completeness against the documented features - * of Comctl32.dll version 6.0 on Oct. 3, 2004, by Dimitrie O. Paun. - * - * Unless otherwise noted, we believe this code to be complete, as per - * the specification mentioned above. - * If you discover missing features, or bugs, please note them below. - * * TODO * Styles * - BS_NOTIFY: is it complete? diff --git a/dlls/user32/combo.c b/dlls/user32/combo.c index b69f892..ef75c76 100644 --- a/dlls/user32/combo.c +++ b/dlls/user32/combo.c @@ -17,15 +17,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * - * NOTES - * - * This code was audited for completeness against the documented features - * of Comctl32.dll version 6.0 on Oct. 4, 2004, by Dimitrie O. Paun. - * - * Unless otherwise noted, we believe this code to be complete, as per - * the specification mentioned above. - * If you discover missing features, or bugs, please note them below. - * * TODO: * - ComboBox_[GS]etMinVisible() * - CB_GETMINVISIBLE, CB_SETMINVISIBLE diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index 614a979..693c58f 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -20,15 +20,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * - * NOTES - * - * This code was audited for completeness against the documented features - * of Comctl32.dll version 6.0 on Oct. 8, 2004, by Dimitrie O. Paun. - * - * Unless otherwise noted, we believe this code to be complete, as per - * the specification mentioned above. - * If you discover missing features, or bugs, please note them below. - * * TODO: * - EDITBALLOONTIP structure * - EM_GETCUEBANNER/Edit_GetCueBannerText diff --git a/dlls/user32/listbox.c b/dlls/user32/listbox.c index 6b47f05..f6b936a 100644 --- a/dlls/user32/listbox.c +++ b/dlls/user32/listbox.c @@ -17,15 +17,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * - * NOTES - * - * This code was audited for completeness against the documented features - * of Comctl32.dll version 6.0 on Oct. 9, 2004, by Dimitrie O. Paun. - * - * Unless otherwise noted, we believe this code to be complete, as per - * the specification mentioned above. - * If you discover missing features, or bugs, please note them below. - * * TODO: * - LBS_NODATA */ diff --git a/dlls/user32/scroll.c b/dlls/user32/scroll.c index 4b572e5..1c127fb 100644 --- a/dlls/user32/scroll.c +++ b/dlls/user32/scroll.c @@ -17,15 +17,6 @@ * 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 - * - * NOTES - * - * This code was audited for completeness against the documented features - * of Comctl32.dll version 6.0 on Oct. 8, 2004, by Dimitrie O. Paun. - * - * Unless otherwise noted, we believe this code to be complete, as per - * the specification mentioned above. - * If you discover missing features, or bugs, please note them below. */ #include "config.h" diff --git a/dlls/user32/static.c b/dlls/user32/static.c index 60fcb79..11b04fc 100644 --- a/dlls/user32/static.c +++ b/dlls/user32/static.c @@ -17,15 +17,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * - * NOTES - * - * This code was audited for completeness against the documented features - * of Comctl32.dll version 6.0 on Oct. 4, 2004, by Dimitrie O. Paun. - * - * Unless otherwise noted, we believe this code to be complete, as per - * the specification mentioned above. - * If you discover missing features, or bugs, please note them below. - * * Notes: * - Windows XP introduced new behavior: The background of centered * icons and bitmaps is painted differently. This is only done if

1 0

Józef Kucia : wined3d: Simplify shader_calculate_clip_or_cull_distance_mask().
by Alexandre Julliard Feb. 8, 2018

Feb. 8, 2018

Module: wine Branch: master Commit: 87f823ad9196a8f26d1ac4272630e73aaae5cd17 URL: https://source.winehq.org/git/wine.git/?a=commit;h=87f823ad9196a8f26d1ac427… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Feb 8 15:22:47 2018 +0100 wined3d: Simplify shader_calculate_clip_or_cull_distance_mask(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/shader.c | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index c775df0..424025c 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -958,27 +958,19 @@ static HRESULT shader_record_shader_phase(struct wined3d_shader *shader, } static HRESULT shader_calculate_clip_or_cull_distance_mask( - const struct wined3d_shader_signature_element *e, DWORD *mask) + const struct wined3d_shader_signature_element *e, unsigned int *mask) { - unsigned int i; - - *mask = 0; - - /* Cull and clip distances are packed in 4 component registers. 0 and 1 are + /* Clip and cull distances are packed in 4 component registers. 0 and 1 are * the only allowed semantic indices. */ if (e->semantic_idx >= MAX_CLIP_DISTANCES / 4) { + *mask = 0; WARN("Invalid clip/cull distance index %u.\n", e->semantic_idx); return WINED3DERR_INVALIDCALL; } - for (i = 0; i < 4; ++i) - { - if (e->mask & (WINED3DSP_WRITEMASK_0 << i)) - *mask |= 1u << (4 * e->semantic_idx + i); - } - + *mask = (e->mask & WINED3DSP_WRITEMASK_ALL) << (4 * e->semantic_idx); return WINED3D_OK; } @@ -1786,7 +1778,7 @@ static HRESULT shader_get_registers_used(struct wined3d_shader *shader, const st for (i = 0; i < output_signature->element_count; ++i) { const struct wined3d_shader_signature_element *e = &output_signature->elements[i]; - DWORD mask; + unsigned int mask; reg_maps->output_registers |= 1u << e->register_idx; if (e->sysval_semantic == WINED3D_SV_CLIP_DISTANCE)

1 0

Akihiro Sagawa : gdi32/tests: Add more ABC width tests in various widths.
by Alexandre Julliard Feb. 8, 2018

Feb. 8, 2018

Module: wine Branch: master Commit: da63c2356dffbfdcfe0566d312a05202900a547d URL: https://source.winehq.org/git/wine.git/?a=commit;h=da63c2356dffbfdcfe0566d3… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sun Feb 4 21:02:09 2018 +0900 gdi32/tests: Add more ABC width tests in various widths. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/tests/font.c | 50 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 4bac19a..7a74565 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -1340,6 +1340,56 @@ static void test_GetCharABCWidths(void) "got %d, expected %d (C)\n", abc[0].abcC, abcw[0].abcC); DeleteObject(SelectObject(hdc, hfont)); + + /* test abcA == gmptGlyphOrigin.x && abcB == gmBlackBoxX + in various widths. */ + for (i = 1; i <= 2; i++) + { + UINT j; + UINT code; + + memset(&lf, 0, sizeof(lf)); + lf.lfHeight = 20; + switch(i) + { + case 1: + strcpy(lf.lfFaceName, "Tahoma"); + code = 'a'; + break; + case 2: + strcpy(lf.lfFaceName, "Times New Roman"); + lf.lfItalic = TRUE; + code = 'f'; + break; + } + if (!is_truetype_font_installed(lf.lfFaceName)) + { + skip("%s is not installed\n", lf.lfFaceName); + continue; + } + for (j = 1; j <= 80; j++) + { + GLYPHMETRICS gm; + + lf.lfWidth = j; + hfont = CreateFontIndirectA(&lf); + hfont = SelectObject(hdc, hfont); + + nb = GetGlyphOutlineA(hdc, code, GGO_METRICS, &gm, 0, NULL, &mat); + ok(nb, "GetGlyphOutlineA should have succeeded at width %d\n", i); + + ret = GetCharABCWidthsA(hdc, code, code, abc); + ok(ret, "GetCharABCWidthsA should have succeeded at width %d\n", i); + + ok(abc[0].abcA == gm.gmptGlyphOrigin.x, + "abcA(%d) and gmptGlyphOrigin.x(%d) values are different at width %d\n", + abc[0].abcA, gm.gmptGlyphOrigin.x, i); + ok(abc[0].abcB == gm.gmBlackBoxX, + "abcB(%d) and gmBlackBoxX(%d) values are different at width %d\n", + abc[0].abcB, gm.gmBlackBoxX, i); + DeleteObject(SelectObject(hdc, hfont)); + } + } ReleaseDC(NULL, hdc); trace("ABC sign test for a variety of transforms:\n");

1 0