Re: [MinGW-dvlpr] Re: src/winsup/w32api ChangeLog include/commdlg.h ...

[<dan...@ya...>]

 --- Earnie Boyd <ear...@ya...> wrote: > I have Danny Smith
looking at it.  I merged changes between mingw's and
> cygwin's cvses with conflicts in those areas.  Obviously I resolved them
> incorrectly.  Will fix sometime tomorrow.
> 
 --- Earnie Boyd <ear...@ya...> wrote: > Hey Danny,
> 
> Please review the changes include/winbase.h include/winnt.h and
> lib/scrnsave.c.  I've merged the changes between mingw and cygwin and
> had conflicts to resolve in these files.
> 
> Thanks,
> Earnie.
> 
scrsave.c diff is only formatting
This patch cleans up winnt/winbase conflicts:

Index: w32api/include/winbase.h
ChangeLog

2001-12-04  Danny Smith  <dan...@us...>

	Cleanup merge between SourceForge and winsup CVS.
	* include/winbase.h (OSVERSIONINFO[AW], OSVERSIONINFOEX[AW]:
	Remove definitions.
	* include/winnt.h (VER_NT*): Remove duplicate defines.
	(VER_SUITE*): Group with VER_PLATFORM*, VER_NT* defines.


===================================================================
RCS file: /cvsroot/mingw/w32api/include/winbase.h,v
retrieving revision 1.6
diff -u -p -r1.6 winbase.h
--- w32api/include/winbase.h	2001/12/03 20:08:37	1.6
+++ w32api/include/winbase.h	2001/12/04 04:02:35
@@ -838,48 +838,6 @@ typedef struct _TIME_ZONE_INFORMATION {
 	SYSTEMTIME DaylightDate;
 	LONG DaylightBias;
 } TIME_ZONE_INFORMATION,*LPTIME_ZONE_INFORMATION;
-typedef struct _OSVERSIONINFOA {
-	DWORD dwOSVersionInfoSize;
-	DWORD dwMajorVersion;
-	DWORD dwMinorVersion;
-	DWORD dwBuildNumber;
-	DWORD dwPlatformId;
-	CHAR szCSDVersion[128];
-} OSVERSIONINFOA,*POSVERSIONINFOA,*LPOSVERSIONINFOA;
-typedef struct _OSVERSIONINFOW {
-	DWORD dwOSVersionInfoSize;
-	DWORD dwMajorVersion;
-	DWORD dwMinorVersion;
-	DWORD dwBuildNumber;
-	DWORD dwPlatformId;
-	WCHAR szCSDVersion[128];
-} OSVERSIONINFOW,*POSVERSIONINFOW,*LPOSVERSIONINFOW;
-typedef struct _OSVERSIONINFOEXA {
-	DWORD dwOSVersionInfoSize;
-	DWORD dwMajorVersion;
-	DWORD dwMinorVersion;
-	DWORD dwBuildNumber;
-	DWORD dwPlatformId;
-	CHAR szCSDVersion[128];
-	WORD wServicePackMajor;
-	WORD wServicePackMinor;
-	WORD wSuiteMask;
-	BYTE wProductType;
-	BYTE wReserved;
-} OSVERSIONINFOEXA,*POSVERSIONINFOEXA,*LPOSVERSIONINFOEXA;
-typedef struct _OSVERSIONINFOEXW {
-	DWORD dwOSVersionInfoSize;
-	DWORD dwMajorVersion;
-	DWORD dwMinorVersion;
-	DWORD dwBuildNumber;
-	DWORD dwPlatformId;
-	WCHAR szCSDVersion[128];
-	WORD wServicePackMajor;
-	WORD wServicePackMinor;
-	WORD wSuiteMask;
-	BYTE wProductType;
-	BYTE wReserved;
-} OSVERSIONINFOEXW,*POSVERSIONINFOEXW,*LPOSVERSIONINFOEXW;
 typedef struct _MEMORYSTATUS {
 	DWORD dwLength;
 	DWORD dwMemoryLoad;
Index: w32api/include/winnt.h
===================================================================
RCS file: /cvsroot/mingw/w32api/include/winnt.h,v
retrieving revision 1.16
diff -u -p -r1.16 winnt.h
--- w32api/include/winnt.h	2001/12/03 20:08:37	1.16
+++ w32api/include/winnt.h	2001/12/04 04:02:38
@@ -1065,6 +1065,13 @@ typedef BYTE BOOLEAN,*PBOOLEAN;
 #define VER_NT_WORKSTATION 1
 #define VER_NT_DOMAIN_CONTROLLER 2
 #define VER_NT_SERVER 3
+#define VER_SUITE_SMALLBUSINESS 1
+#define VER_SUITE_ENTERPRISE 2
+#define VER_SUITE_BACKOFFICE 4
+#define VER_SUITE_TERMINAL 16
+#define VER_SUITE_SMALLBUSINESS_RESTRICTED 32
+#define VER_SUITE_DATACENTER 128
+#define VER_SUITE_PERSONAL 512
 #define BTYPE(x) ((x)&N_BTMASK)
 #define ISPTR(x) (((x)&N_TMASK)==(IMAGE_SYM_DTYPE_POINTER<<N_BTSHFT))
 #define ISFCN(x) (((x)&N_TMASK)==(IMAGE_SYM_DTYPE_FUNCTION<<N_BTSHFT))
@@ -1086,16 +1093,6 @@ typedef BYTE BOOLEAN,*PBOOLEAN;
 #define IsReparseTagValid(x)
(!((x)&~IO_REPARSE_TAG_VALID_VALUES)&&((x)>IO_REPARSE_TAG_RESERVED_RANGE))
 #define IO_REPARSE_TAG_SYMBOLIC_LINK IO_REPARSE_TAG_RESERVED_ZERO
 #define IO_REPARSE_TAG_MOUNT_POINT 0xA0000003
-#define VER_NT_WORKSTATION 1
-#define VER_NT_DOMAIN_CONTROLLER 2
-#define VER_NT_SERVER 3
-#define VER_SUITE_SMALLBUSINESS 1
-#define VER_SUITE_ENTERPRISE 2
-#define VER_SUITE_BACKOFFICE 4
-#define VER_SUITE_TERMINAL 16
-#define VER_SUITE_SMALLBUSINESS_RESTRICTED 32
-#define VER_SUITE_DATACENTER 128
-#define VER_SUITE_PERSONAL 512
 #ifndef RC_INVOKED
 typedef DWORD ACCESS_MASK, *PACCESS_MASK;
 #ifndef _GUID_DEFINED /* also defined in basetyps.h */



http://shopping.yahoo.com.au - Yahoo! Shopping
- Get organised for Christmas early this year!