reactos/wine
1
0
Fork 0
mirror of https://github.com/reactos/wine.git synced 2025-03-03 02:05:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
André Hentschel 2013-10-25 17:51:15 +02:00 committed by Alexandre Julliard
parent 27fb62621a
commit 86a30afeb5
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dlls/riched20/tests/Makefile.in
View File

@ -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 \

7
dlls/riched20/tests/txtsrv.c
View File

@ -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;