Commit 86a30afe authored by André Hentschel's avatar André Hentschel Committed by Alexandre Julliard

riched20/tests: Fix txtsrv tests compilation with __WINESRC__ defined.

parent 27fb6262
TESTDLL = riched20.dll TESTDLL = riched20.dll
IMPORTS = ole32 oleaut32 user32 gdi32 IMPORTS = ole32 oleaut32 user32 gdi32
EXTRADEFS = -U__WINESRC__ -DWINE_STRICT_PROTOTYPES -DWINE_NO_NAMELESS_EXTENSION -DWIDL_C_INLINE_WRAPPERS
C_SRCS = \ C_SRCS = \
editor.c \ editor.c \
......
...@@ -30,6 +30,7 @@ ...@@ -30,6 +30,7 @@
#include <objbase.h> #include <objbase.h>
#include <richedit.h> #include <richedit.h>
#include <initguid.h> #include <initguid.h>
#include <imm.h>
#include <textserv.h> #include <textserv.h>
#include <wine/test.h> #include <wine/test.h>
#include <oleauto.h> #include <oleauto.h>
...@@ -720,7 +721,7 @@ static void test_TxGetNaturalSize(void) { ...@@ -720,7 +721,7 @@ static void test_TxGetNaturalSize(void) {
/* Variables with the text metric information */ /* Variables with the text metric information */
INT charwidth_caps_text[26]; INT charwidth_caps_text[26];
TEXTMETRIC tmInfo_text; TEXTMETRICA tmInfo_text;
if (!init_texthost()) if (!init_texthost())
return; return;
...@@ -730,9 +731,9 @@ static void test_TxGetNaturalSize(void) { ...@@ -730,9 +731,9 @@ static void test_TxGetNaturalSize(void) {
/* Populate the metric strucs */ /* Populate the metric strucs */
SetMapMode(hdcDraw,MM_TEXT); SetMapMode(hdcDraw,MM_TEXT);
GetTextMetrics(hdcDraw, &tmInfo_text); GetTextMetricsA(hdcDraw, &tmInfo_text);
SetLastError(0xdeadbeef); 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) { if (!ret && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) {
win_skip("GetCharWidth32 is not available\n"); win_skip("GetCharWidth32 is not available\n");
goto cleanup; goto cleanup;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment