Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-07-23 20:58:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

[INCLUDE/WINE]

Browse source 
- Update Wine-specific headers to Wine-1.3.
- Remove unneeded 16 bit header, and add a bit of stuff into another legacy header.
- Indicate in config.h that there is a freetype library present.

svn path=/trunk/; revision=48388
This commit is contained in:
Aleksey Bragin 2010-07-31 22:39:22 +00:00
parent 9746a25057
commit 071e036cb8
5 changed files with 46 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
reactos/include/reactos/wine/config.h
View file

@ -99,37 +99,43 @@
#define HAVE_FPCLASS 1
/* Define if FreeType 2 is installed */
/* #undef HAVE_FREETYPE */
#define HAVE_FREETYPE 1
/* Define to 1 if you have the <freetype/freetype.h> header file. */
/* #undef HAVE_FREETYPE_FREETYPE_H */
#define HAVE_FREETYPE_FREETYPE_H 1
/* Define to 1 if you have the <freetype/ftglyph.h> header file. */
/* #undef HAVE_FREETYPE_FTGLYPH_H */
#define HAVE_FREETYPE_FTGLYPH_H 1
/* Define to 1 if you have the <freetype/ftlcdfil.h> header file. */
#define HAVE_FREETYPE_FTLCDFIL_H 1
/* Define to 1 if you have the <freetype/ftmodapi.h> header file. */
#define HAVE_FREETYPE_FTMODAPI_H 1
/* Define to 1 if you have the <freetype/ftnames.h> header file. */
/* #undef HAVE_FREETYPE_FTNAMES_H */
/* Define to 1 if you have the <freetype/ftoutln.h> header file. */
/* #undef HAVE_FREETYPE_FTOUTLN_H */
#define HAVE_FREETYPE_FTOUTLN_H 1
/* Define to 1 if you have the <freetype/ftsnames.h> header file. */
/* #undef HAVE_FREETYPE_FTSNAMES_H */
#define HAVE_FREETYPE_FTSNAMES_H 1
/* Define if you have the <freetype/fttrigon.h> header file. */
/* #undef HAVE_FREETYPE_FTTRIGON_H */
#define HAVE_FREETYPE_FTTRIGON_H 1
/* Define to 1 if you have the <freetype/ftwinfnt.h> header file. */
/* #undef HAVE_FREETYPE_FTWINFNT_H */
#define HAVE_FREETYPE_FTWINFNT_H 1
/* Define to 1 if you have the <freetype/internal/sfnt.h> header file. */
/* #undef HAVE_FREETYPE_INTERNAL_SFNT_H */
/* Define to 1 if you have the <freetype/ttnameid.h> header file. */
/* #undef HAVE_FREETYPE_TTNAMEID_H */
#define HAVE_FREETYPE_TTNAMEID_H 1
/* Define to 1 if you have the <freetype/tttables.h> header file. */
/* #undef HAVE_FREETYPE_TTTABLES_H */
#define HAVE_FREETYPE_TTTABLES_H 1
/* Define to 1 if the system has the type `fsblkcnt_t'. */
/* #undef HAVE_FSBLKCNT_T */
@ -144,7 +150,13 @@
/* #undef HAVE_FSTATVFS */
/* Define to 1 if you have the <ft2build.h> header file. */
/* #undef HAVE_FT2BUILD_H */
#define HAVE_FT2BUILD_H 1
/* Define to 1 if you have the `FT_Load_Sfnt_Table' function. */
/* #undef HAVE_FT_LOAD_SFNT_TABLE */
/* Define to 1 if the system has the type `FT_TrueTypeEngineType'. */
#define HAVE_FT_TRUETYPEENGINETYPE 1
/* Define to 1 if you have the `ftruncate' function. */
#define HAVE_FTRUNCATE 1

5
reactos/include/reactos/wine/test.h
View file

@ -237,8 +237,7 @@ static tls_data* get_tls_data(void)
data=TlsGetValue(tls_index);
if (!data)
{
data=HeapAlloc(GetProcessHeap(), 0, sizeof(tls_data));
data->todo_level = 0;
data=HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(tls_data));
data->str_pos = data->strings;
TlsSetValue(tls_index,data);
}
@ -593,6 +592,8 @@ int main( int argc, char **argv )
if (GetEnvironmentVariableA( "WINETEST_INTERACTIVE", p, sizeof(p) )) winetest_interactive = atoi(p);
if (GetEnvironmentVariableA( "WINETEST_REPORT_SUCCESS", p, sizeof(p) )) report_success = atoi(p);
if (!winetest_interactive) SetErrorMode( SEM_FAILCRITICALERRORS | SEM_NOGPFAULTERRORBOX );
if (!argv[1])
{
if (winetest_testlist[0].name && !winetest_testlist[1].name) /* only one test */

4
reactos/include/reactos/wine/windef16.h
View file

@ -28,7 +28,9 @@
#endif
#include <windef.h>
#include <winbase.h>
#include <wine/exception.h>
#ifndef _NTNDK_
#include <exception.h> // ROS Hack
#endif
/* Standard data types */
typedef unsigned short BOOL16;

18
reactos/include/reactos/wine/wingdi16.h
View file

@ -27,6 +27,24 @@
#include <pshpack1.h>
typedef struct
{
INT16 lfHeight;
INT16 lfWidth;
INT16 lfEscapement;
INT16 lfOrientation;
INT16 lfWeight;
BYTE lfItalic;
BYTE lfUnderline;
BYTE lfStrikeOut;
BYTE lfCharSet;
BYTE lfOutPrecision;
BYTE lfClipPrecision;
BYTE lfQuality;
BYTE lfPitchAndFamily;
CHAR lfFaceName[LF_FACESIZE];
} LOGFONT16, *LPLOGFONT16;
typedef struct
{
INT16 mm;

26
reactos/include/reactos/wine/winuser16.h
View file

@ -1,26 +0,0 @@
/*
* Copyright (C) the Wine project
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* 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 Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#ifndef __WINE_WINE_WINUSER16_H
#define __WINE_WINE_WINUSER16_H
#ifndef CB_SETITEMDATA16
#define CB_SETITEMDATA16 (WM_USER+17)
#endif
#endif /* __WINE_WINE_WINUSER16_H */