Module: wine Branch: master Commit: 86a30afeb51c07e597544f0c85bc557467218788 URL: http://source.winehq.org/git/wine.git/?a=commit;h=86a30afeb51c07e597544f0c85...
Author: André Hentschel nerv@dawncrow.de Date: Fri Oct 25 17:51:15 2013 +0200
riched20/tests: Fix txtsrv tests compilation with __WINESRC__ defined.
---
dlls/riched20/tests/Makefile.in | 1 - dlls/riched20/tests/txtsrv.c | 7 ++++--- 2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/dlls/riched20/tests/Makefile.in b/dlls/riched20/tests/Makefile.in index b98fc25..9532df8 100644 --- a/dlls/riched20/tests/Makefile.in +++ b/dlls/riched20/tests/Makefile.in @@ -1,6 +1,5 @@ TESTDLL = riched20.dll IMPORTS = ole32 oleaut32 user32 gdi32 -EXTRADEFS = -U__WINESRC__ -DWINE_STRICT_PROTOTYPES -DWINE_NO_NAMELESS_EXTENSION -DWIDL_C_INLINE_WRAPPERS
C_SRCS = \ editor.c \ diff --git a/dlls/riched20/tests/txtsrv.c b/dlls/riched20/tests/txtsrv.c index 3e88c72..566381c 100644 --- a/dlls/riched20/tests/txtsrv.c +++ b/dlls/riched20/tests/txtsrv.c @@ -30,6 +30,7 @@ #include <objbase.h> #include <richedit.h> #include <initguid.h> +#include <imm.h> #include <textserv.h> #include <wine/test.h> #include <oleauto.h> @@ -720,7 +721,7 @@ static void test_TxGetNaturalSize(void) {
/* Variables with the text metric information */ INT charwidth_caps_text[26]; - TEXTMETRIC tmInfo_text; + TEXTMETRICA tmInfo_text;
if (!init_texthost()) return; @@ -730,9 +731,9 @@ static void test_TxGetNaturalSize(void) {
/* Populate the metric strucs */ SetMapMode(hdcDraw,MM_TEXT); - GetTextMetrics(hdcDraw, &tmInfo_text); + GetTextMetricsA(hdcDraw, &tmInfo_text); SetLastError(0xdeadbeef); - ret = GetCharWidth32(hdcDraw,'A','Z',charwidth_caps_text); + ret = GetCharWidth32A(hdcDraw,'A','Z',charwidth_caps_text); if (!ret && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) { win_skip("GetCharWidth32 is not available\n"); goto cleanup;