Skip to content

W
wine-cw
Commit ba9dc78e authored by Patrik Stridvall's avatar Patrik Stridvall Committed by Alexandre Julliard
Browse files
Options

Fixed mismatches between the Wine headers and the Microsoft headers.

parent 93cf466c
Hide whitespace changes
Inline Side-by-side
Showing with 34 additions and 35 deletions
dlls/gdi/freetype.c
View file @ ba9dc78e
......@@ -1152,7 +1152,7 @@ BOOL WineEngDestroyFontInstance(HFONT handle)
}
static void GetEnumStructs(Face *face, LPENUMLOGFONTEXW pelf,
LPNEWTEXTMETRICEXW pntm, LPDWORD ptype)
NEWTEXTMETRICEXW *pntm, LPDWORD ptype)
{
OUTLINETEXTMETRICW *potm;
UINT size;
......
dlls/win32s/win32s16.c
View file @ ba9dc78e
......@@ -112,7 +112,7 @@ BOOL WINAPI GetExitCodeThread16(HANDLE hthread, LPDWORD exitcode)
* VirtualQueryEx (WIN32S16.18)
*/
DWORD WINAPI VirtualQueryEx16(HANDLE handle, LPCVOID addr,
LPMEMORY_BASIC_INFORMATION info, DWORD len)
PMEMORY_BASIC_INFORMATION info, DWORD len)
{
return VirtualQueryEx(handle, addr, info, len);
}
......
graphics/x11drv/xfont.c
View file @ ba9dc78e
......@@ -1210,8 +1210,8 @@ static void XFONT_SetFontMetric(fontInfo* fi, const fontResource* fr, XFontStruc
* Retrieve font metric info (enumeration).
*/
static UINT XFONT_GetFontMetric( const fontInfo* pfi,
const LPENUMLOGFONTEXW pLF,
const LPNEWTEXTMETRICEXW pTM )
LPENUMLOGFONTEXW pLF,
NEWTEXTMETRICEXW *pTM )
{
memset( pLF, 0, sizeof(*pLF) );
memset( pTM, 0, sizeof(*pTM) );
......
include/gdi.h
View file @ ba9dc78e
......@@ -144,7 +144,7 @@ typedef struct tagDC
/* Device functions for the Wine driver interface */
typedef INT (*DEVICEFONTENUMPROC)(LPENUMLOGFONTEXW,LPNEWTEXTMETRICEXW,DWORD,
typedef INT (*DEVICEFONTENUMPROC)(LPENUMLOGFONTEXW,NEWTEXTMETRICEXW *,DWORD,
LPARAM);
typedef struct tagDC_FUNCS
......
include/winbase.h
View file @ ba9dc78e
......@@ -1516,8 +1516,8 @@ BOOL WINAPI VirtualFreeEx(HANDLE,LPVOID,SIZE_T,DWORD);
BOOL WINAPI VirtualLock(LPVOID,SIZE_T);
BOOL WINAPI VirtualProtect(LPVOID,SIZE_T,DWORD,LPDWORD);
BOOL WINAPI VirtualProtectEx(HANDLE,LPVOID,SIZE_T,DWORD,LPDWORD);
SIZE_T WINAPI VirtualQuery(LPCVOID,LPMEMORY_BASIC_INFORMATION,SIZE_T);
SIZE_T WINAPI VirtualQueryEx(HANDLE,LPCVOID,LPMEMORY_BASIC_INFORMATION,SIZE_T);
SIZE_T WINAPI VirtualQuery(LPCVOID,PMEMORY_BASIC_INFORMATION,SIZE_T);
SIZE_T WINAPI VirtualQueryEx(HANDLE,LPCVOID,PMEMORY_BASIC_INFORMATION,SIZE_T);
BOOL WINAPI VirtualUnlock(LPVOID,SIZE_T);
BOOL WINAPI WaitCommEvent(HANDLE,LPDWORD,LPOVERLAPPED);
BOOL WINAPI WaitForDebugEvent(LPDEBUG_EVENT,DWORD);
......
include/wingdi.h
View file @ ba9dc78e
......@@ -618,7 +618,7 @@ typedef struct
DWORD lsUsb[4];
DWORD lsCsbDefault[2];
DWORD lsCsbSupported[2];
} LOCALESIGNATURE, *PLOCALESIGNATUR, *LPLOCALESIGNATUREE;
} LOCALESIGNATURE, *PLOCALESIGNATURE, *LPLOCALESIGNATURE;
/* Flags for ModifyWorldTransform */
......@@ -1156,16 +1156,15 @@ typedef struct
{
NEWTEXTMETRICA ntmTm;
FONTSIGNATURE ntmFontSig;
} NEWTEXTMETRICEXA,*LPNEWTEXTMETRICEXA;
} NEWTEXTMETRICEXA;
typedef struct
{
NEWTEXTMETRICW ntmTm;
FONTSIGNATURE ntmFontSig;
} NEWTEXTMETRICEXW,*LPNEWTEXTMETRICEXW;
} NEWTEXTMETRICEXW;
DECL_WINELIB_TYPE_AW(NEWTEXTMETRICEX)
DECL_WINELIB_TYPE_AW(LPNEWTEXTMETRICEX)
typedef int (CALLBACK *OLDFONTENUMPROCA)(const LOGFONTA*,const TEXTMETRICA*,
DWORD,LPARAM);
......@@ -1177,8 +1176,8 @@ typedef OLDFONTENUMPROCA FONTENUMPROCA;
typedef OLDFONTENUMPROCW FONTENUMPROCW;
DECL_WINELIB_TYPE_AW(FONTENUMPROC)
typedef int (CALLBACK *FONTENUMPROCEXA)(LPENUMLOGFONTEXA,LPNEWTEXTMETRICEXA,DWORD,LPARAM);
typedef int (CALLBACK *FONTENUMPROCEXW)(LPENUMLOGFONTEXW,LPNEWTEXTMETRICEXW,DWORD,LPARAM);
typedef int (CALLBACK *FONTENUMPROCEXA)(LPENUMLOGFONTEXA,NEWTEXTMETRICEXA *,DWORD,LPARAM);
typedef int (CALLBACK *FONTENUMPROCEXW)(LPENUMLOGFONTEXW,NEWTEXTMETRICEXW *,DWORD,LPARAM);
DECL_WINELIB_TYPE_AW(FONTENUMPROCEX)
typedef INT (CALLBACK *GOBJENUMPROC)(LPVOID,LPARAM);
......@@ -2348,7 +2347,7 @@ typedef struct {
EMRSETROP2, *PEMRSETROP2,
EMRSETSTRETCHBLTMODE, *PEMRSETSTRETCHBLTMODE,
EMRSETTEXTALIGN, *PEMRSETTEXTALIGN,
EMRSETICMMODE, *PERMSETICMMODE,
EMRSETICMMODE, *PEMRSETICMMODE,
EMRSETLAYOUT, *PEMRSETLAYOUT;
typedef struct {
......
include/winnt.h
View file @ ba9dc78e
......@@ -631,7 +631,7 @@ typedef struct _MEMORY_BASIC_INFORMATION
DWORD State;
DWORD Protect;
DWORD Type;
} MEMORY_BASIC_INFORMATION,*LPMEMORY_BASIC_INFORMATION,*PMEMORY_BASIC_INFORMATION;
} MEMORY_BASIC_INFORMATION, *PMEMORY_BASIC_INFORMATION;
#define PAGE_NOACCESS 0x01
#define PAGE_READONLY 0x02
......@@ -2316,8 +2316,6 @@ typedef struct _IMAGE_BOUND_FORWARDER_REF
WORD Reserved;
} IMAGE_BOUND_FORWARDER_REF, *PIMAGE_BOUND_FORWARDER_REF;
#include "pshpack2.h"
typedef struct _IMAGE_BASE_RELOCATION
{
DWORD VirtualAddress;
......@@ -2325,6 +2323,8 @@ typedef struct _IMAGE_BASE_RELOCATION
/* WORD TypeOffset[1]; */
} IMAGE_BASE_RELOCATION,*PIMAGE_BASE_RELOCATION;
#include "pshpack2.h"
typedef struct _IMAGE_RELOCATION
{
union {
......@@ -2804,7 +2804,7 @@ typedef struct _GENERIC_MAPPING {
#define SID_IDENTIFIER_AUTHORITY_DEFINED
typedef struct {
BYTE Value[6];
} SID_IDENTIFIER_AUTHORITY,*PSID_IDENTIFIER_AUTHORITY,*LPSID_IDENTIFIER_AUTHORITY;
} SID_IDENTIFIER_AUTHORITY, *PSID_IDENTIFIER_AUTHORITY;
#endif /* !defined(SID_IDENTIFIER_AUTHORITY_DEFINED) */
#ifndef SID_DEFINED
......@@ -2978,7 +2978,7 @@ typedef union _LARGE_INTEGER {
#endif
} DUMMYSTRUCTNAME;
LONGLONG QuadPart;
} LARGE_INTEGER, *LPLARGE_INTEGER, *PLARGE_INTEGER;
} LARGE_INTEGER, *PLARGE_INTEGER;
typedef union _ULARGE_INTEGER {
struct {
......@@ -2991,7 +2991,7 @@ typedef union _ULARGE_INTEGER {
#endif
} DUMMYSTRUCTNAME;
ULONGLONG QuadPart;
} ULARGE_INTEGER, *LPULARGE_INTEGER, *PULARGE_INTEGER;
} ULARGE_INTEGER, *PULARGE_INTEGER;
/*
* Locally Unique Identifier
......
include/winuser.h
View file @ ba9dc78e
......@@ -101,7 +101,7 @@ typedef struct tagFILTERKEYS
DWORD iDelayMSec;
DWORD iRepeatMSec;
DWORD iBounceMSec;
} FILTERKEYS, *PFILTERKEYS, *LPFILTERKEYS;
} FILTERKEYS, *LPFILTERKEYS;
/* flags for TOGGLEKEYS dwFlags field */
#define TKF_AVAILABLE 0x00000002
......@@ -114,7 +114,7 @@ typedef struct tagTOGGLEKEYS
{
DWORD cbSize;
DWORD dwFlags;
} TOGGLEKEYS, *PTOGGLEKEYS, *LPTOGGLEKEYS;
} TOGGLEKEYS, *LPTOGGLEKEYS;
/* flags for MOUSEKEYS dwFlags field */
#define MKF_AVAILABLE 0x00000002
......@@ -135,7 +135,7 @@ typedef struct tagMOUSEKEYS
DWORD iCtrlSpeed;
DWORD dwReserved1;
DWORD dwReserved2;
} MOUSEKEYS, *PMOUSEKEYS, *LPMOUSEKEYS;
} MOUSEKEYS, *LPMOUSEKEYS;
/* flags for STICKYKEYS dwFlags field */
#define SKF_AUDIBLEFEEDBACK 0x00000040
......@@ -152,7 +152,7 @@ typedef struct tagSTICKYKEYS
{
DWORD cbSize;
DWORD dwFlags;
} STICKYKEYS, *PSTICKYKEYS, *LPSTICKYKEYS;
} STICKYKEYS, *LPSTICKYKEYS;
/* flags for ACCESSTIMEOUT dwFlags field */
#define ATF_ONOFFFEEDBACK 0x00000002
......@@ -164,7 +164,7 @@ typedef struct tagACCESSTIMEOUT
UINT cbSize;
DWORD dwFlags;
DWORD iTimeOutMSec;
} ACCESSTIMEOUT, *PACCESSTIMEOUT, *LPACCESSTIMEOUT;
} ACCESSTIMEOUT, *LPACCESSTIMEOUT;
/* flags for SERIALKEYS dwFlags field */
#define SERKF_ACTIVE 0x00000008
......
include/x11font.h
View file @ ba9dc78e
......@@ -237,7 +237,7 @@ typedef struct
FONTENUMPROCEXW lpEnumFunc;
LPARAM lpData;
LPNEWTEXTMETRICEXW lpTextMetric;
NEWTEXTMETRICEXW *lpTextMetric;
LPENUMLOGFONTEXW lpLogFont;
DWORD dwFlags;
} fontEnum32;
......
memory/virtual.c
View file @ ba9dc78e
......@@ -215,7 +215,7 @@ BOOL WINAPI VirtualProtectEx(
*/
SIZE_T WINAPI VirtualQuery(
LPCVOID addr, /* [in] Address of region */
LPMEMORY_BASIC_INFORMATION info, /* [out] Address of info buffer */
PMEMORY_BASIC_INFORMATION info, /* [out] Address of info buffer */
SIZE_T len /* [in] Size of buffer */
) {
return VirtualQueryEx( GetCurrentProcess(), addr, info, len );
......@@ -233,7 +233,7 @@ SIZE_T WINAPI VirtualQuery(
SIZE_T WINAPI VirtualQueryEx(
HANDLE process, /* [in] Handle of process */
LPCVOID addr, /* [in] Address of region */
LPMEMORY_BASIC_INFORMATION info, /* [out] Address of info buffer */
PMEMORY_BASIC_INFORMATION info, /* [out] Address of info buffer */
SIZE_T len /* [in] Size of buffer */ )
{
DWORD ret;
......
msdos/vxd.c
View file @ ba9dc78e
......@@ -1006,8 +1006,8 @@ void WINAPI VXD_Win32s( CONTEXT86 *context )
DWORD *stack = (DWORD *)W32S_APP2WINE(context->Edx);
DWORD *retv = (DWORD *)W32S_APP2WINE(stack[0]);
LPVOID base = (LPVOID) W32S_APP2WINE(stack[1]);
LPMEMORY_BASIC_INFORMATION info =
(LPMEMORY_BASIC_INFORMATION)W32S_APP2WINE(stack[2]);
PMEMORY_BASIC_INFORMATION info =
(PMEMORY_BASIC_INFORMATION)W32S_APP2WINE(stack[2]);
DWORD len = stack[3];
DWORD result;
......
objects/enhmetafile.c
View file @ ba9dc78e
......@@ -1107,7 +1107,7 @@ BOOL WINAPI PlayEnhMetaFileRecord(
case EMR_SETICMMODE:
{
PERMSETICMMODE lpSetICMMode = (PERMSETICMMODE)mr;
PEMRSETICMMODE lpSetICMMode = (PEMRSETICMMODE)mr;
SetICMMode( hdc, (INT)lpSetICMMode->iMode );
break;
}
......
objects/font.c
View file @ ba9dc78e
......@@ -278,7 +278,7 @@ static void FONT_NewTextMetricExWTo16(const NEWTEXTMETRICEXW *ptmW, LPNEWTEXTMET
memcpy(&ptm16->ntmFontSig, &ptmW->ntmFontSig, sizeof(FONTSIGNATURE));
}
static void FONT_NewTextMetricExWToA(const NEWTEXTMETRICEXW *ptmW, LPNEWTEXTMETRICEXA ptmA )
static void FONT_NewTextMetricExWToA(const NEWTEXTMETRICEXW *ptmW, NEWTEXTMETRICEXA *ptmA )
{
FONT_TextMetricWToA((LPTEXTMETRICW)ptmW, (LPTEXTMETRICA)ptmA);
ptmA->ntmTm.ntmFlags = ptmW->ntmTm.ntmFlags;
......@@ -508,7 +508,7 @@ static BOOL FONT_DeleteObject( HGDIOBJ handle, void *obj )
* Called by the device driver layer to pass font info
* down to the application.
*/
static INT FONT_EnumInstance16( LPENUMLOGFONTEXW plf, LPNEWTEXTMETRICEXW ptm,
static INT FONT_EnumInstance16( LPENUMLOGFONTEXW plf, NEWTEXTMETRICEXW *ptm,
DWORD fType, LPARAM lp )
{
fontEnum16 *pfe = (fontEnum16*)lp;
......@@ -539,7 +539,7 @@ static INT FONT_EnumInstance16( LPENUMLOGFONTEXW plf, LPNEWTEXTMETRICEXW ptm,
/***********************************************************************
* FONT_EnumInstance
*/
static INT FONT_EnumInstance( LPENUMLOGFONTEXW plf, LPNEWTEXTMETRICEXW ptm,
static INT FONT_EnumInstance( LPENUMLOGFONTEXW plf, NEWTEXTMETRICEXW *ptm,
DWORD fType, LPARAM lp )
{
fontEnum32 *pfe = (fontEnum32*)lp;
......@@ -560,7 +560,7 @@ static INT FONT_EnumInstance( LPENUMLOGFONTEXW plf, LPNEWTEXTMETRICEXW ptm,
FONT_EnumLogFontExWToA( plf, &logfont);
FONT_NewTextMetricExWToA( ptm, &tmA );
plf = (LPENUMLOGFONTEXW)&logfont;
ptm = (LPNEWTEXTMETRICEXW)&tmA;
ptm = (NEWTEXTMETRICEXW *)&tmA;
}
GDI_ReleaseObj( pfe->hdc ); /* release the GDI lock */
......
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