Hope last e-mail on this topic... :o) ========================================================== ChangeLog: Juraj Hercek <juraj@syncad.com> - fixed typo error in CMYK definition in wingdi.h (COLOREF -> COLORREF) - added tags to structures in winbase.h (_OFSTRUCT, _FILETIME, ...)
Index: winbase.h =================================================================== RCS file: /home/wine/wine/include/winbase.h,v retrieving revision 1.156 diff -u -r1.156 winbase.h --- winbase.h 11 Sep 2002 02:35:18 -0000 1.156 +++ winbase.h 15 Sep 2002 23:28:24 -0000 @@ -139,7 +139,7 @@ typedef PEXCEPTION_POINTERS LPEXCEPTION_POINTERS; #define OFS_MAXPATHNAME 128 -typedef struct +typedef struct _OFSTRUCT { BYTE cBytes; BYTE fFixedDisk; @@ -202,7 +202,7 @@ #ifndef _FILETIME_ #define _FILETIME_ /* 64 bit number of 100 nanoseconds intervals since January 1, 1601 */ -typedef struct +typedef struct _FILETIME { #ifdef WORDS_BIGENDIAN DWORD dwHighDateTime; @@ -215,7 +215,7 @@ #endif /* _FILETIME_ */ /* Find* structures */ -typedef struct +typedef struct _WIN32_FIND_DATAA { DWORD dwFileAttributes; FILETIME ftCreationTime; @@ -229,7 +229,7 @@ CHAR cAlternateFileName[14]; } WIN32_FIND_DATAA, *PWIN32_FIND_DATAA, *LPWIN32_FIND_DATAA; -typedef struct +typedef struct _WIN32_FIND_DATAW { DWORD dwFileAttributes; FILETIME ftCreationTime; @@ -261,7 +261,7 @@ FindExSearchMaxSearchOp } FINDEX_SEARCH_OPS; -typedef struct +typedef struct _PROCESS_HEAP_ENTRY { LPVOID lpData; DWORD cbData; @@ -455,7 +455,7 @@ } MEMORYSTATUS, *LPMEMORYSTATUS; -typedef struct { +typedef struct _SYSTEMTIME{ WORD wYear; WORD wMonth; WORD wDayOfWeek; @@ -493,7 +493,7 @@ #define STARTF_USESTDHANDLES 0x00000100 #define STARTF_USEHOTKEY 0x00000200 -typedef struct { +typedef struct _STARTUPINFOA{ DWORD cb; /* 00: size of struct */ LPSTR lpReserved; /* 04: */ LPSTR lpDesktop; /* 08: */ @@ -514,7 +514,7 @@ HANDLE hStdError; /* 40: */ } STARTUPINFOA, *LPSTARTUPINFOA; -typedef struct { +typedef struct _STARTUPINFOW{ DWORD cb; LPWSTR lpReserved; LPWSTR lpDesktop; @@ -538,14 +538,14 @@ DECL_WINELIB_TYPE_AW(STARTUPINFO) DECL_WINELIB_TYPE_AW(LPSTARTUPINFO) -typedef struct { +typedef struct _PROCESS_INFORMATION{ HANDLE hProcess; HANDLE hThread; DWORD dwProcessId; DWORD dwThreadId; } PROCESS_INFORMATION, *PPROCESS_INFORMATION, *LPPROCESS_INFORMATION; -typedef struct { +typedef struct _TIME_ZONE_INFORMATION{ LONG Bias; WCHAR StandardName[32]; SYSTEMTIME StandardDate; @@ -612,7 +612,7 @@ #define STD_OUTPUT_HANDLE ((DWORD) -11) #define STD_ERROR_HANDLE ((DWORD) -12) -typedef struct +typedef struct _BY_HANDLE_FILE_INFORMATION { DWORD dwFileAttributes; FILETIME ftCreationTime; Index: wingdi.h =================================================================== RCS file: /home/wine/wine/include/wingdi.h,v retrieving revision 1.75 diff -u -r1.75 wingdi.h --- wingdi.h 4 Sep 2002 18:47:32 -0000 1.75 +++ wingdi.h 15 Sep 2002 23:28:25 -0000 @@ -427,7 +427,7 @@ #define GetMValue(cmyk) ((BYTE) ((cymk) >> 16)) #define GetCValue(cmyk) ((BYTE) ((cymk) >> 24)) -#define CMYK(c,m,y,k) ((COLOREF)((((BYTE)(k)|((WORD)((BYTE)(y))<<8))|(((DWORD)(BYTE)(m))<<16))|(((DWORD)(BYTE)(c))<<24))) +#define CMYK(c,m,y,k) ((COLORREF)((((BYTE)(k)|((WORD)((BYTE)(y))<<8))|(((DWORD)(BYTE)(m))<<16))|(((DWORD)(BYTE)(c))<<24))) #define ICM_OFF 1