mingw-cvs Mailing List for MinGW - Minimalist GNU for Windows

Update of /cvsroot/mingw/runtime
In directory usw-pr-cvs1:/tmp/cvs-serv14307/runtime

Modified Files:
	ChangeLog 
Log Message:
	* include/malloc.h: Fix non-ANSI comment after #endif.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/mingw/runtime/ChangeLog,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** ChangeLog	2001/06/11 18:56:56	1.2
--- ChangeLog	2001/06/27 23:23:11	1.3
***************
*** 1,2 ****
--- 1,5 ----
+ 2001-06-28  Danny Smith  <dan...@us...>
+ 
+ 	* include/malloc.h: Fix non-ANSI comment after #endif.
  
  2001-06-11  Danny Smith  <dan...@ya...>

Update of /cvsroot/mingw/runtime/include
In directory usw-pr-cvs1:/tmp/cvs-serv14307/runtime/include

Modified Files:
	malloc.h 
Log Message:
	* include/malloc.h: Fix non-ANSI comment after #endif.


Index: malloc.h
===================================================================
RCS file: /cvsroot/mingw/runtime/include/malloc.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** malloc.h	2001/06/26 02:55:56	1.4
--- malloc.h	2001/06/27 23:23:12	1.5
***************
*** 71,75 ****
  #endif
  
! #endif	RC_INVOKED
  
  #endif /* Not _MALLOC_H_ */
--- 71,75 ----
  #endif
  
! #endif	/* RC_INVOKED */
  
  #endif /* Not _MALLOC_H_ */

Update of /cvsroot/mingw/w32api/include
In directory usw-pr-cvs1:/tmp/cvs-serv3933/w32api/include

Modified Files:
	wingdi.h 
Log Message:
	* include/wingdi.h (AC_SRC_OVER): Add define.
	(struct _BLENDFUNCTION): Add.


Index: wingdi.h
===================================================================
RCS file: /cvsroot/mingw/w32api/include/wingdi.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** wingdi.h	2001/06/05 01:36:43	1.1.1.1
--- wingdi.h	2001/06/27 22:40:57	1.2
***************
*** 1147,1150 ****
--- 1147,1151 ----
  #define WGL_SWAP_UNDERLAY14 0x20000000
  #define WGL_SWAP_UNDERLAY15 0x40000000
+ #define AC_SRC_OVER 0 
  
  #ifndef RC_INVOKED
***************
*** 2325,2328 ****
--- 2326,2335 ----
  	COLORREF crTransparent;
  } LAYERPLANEDESCRIPTOR,*PLAYERPLANEDESCRIPTOR,*LPLAYERPLANEDESCRIPTOR;
+ typedef struct _BLENDFUNCTION {
+     BYTE BlendOp;
+     BYTE BlendFlags;
+     BYTE SourceConstantAlpha;
+     BYTE AlphaFormat; 
+ } BLENDFUNCTION,*PBLENDFUNCTION,*LPBLENDFUNCTION; 
  typedef BOOL (CALLBACK *ABORTPROC)(HDC,int);
  typedef int (CALLBACK *MFENUMPROC)(HDC,HANDLETABLE*,METARECORD*,int,LPARAM);

Update of /cvsroot/mingw/w32api
In directory usw-pr-cvs1:/tmp/cvs-serv3933/w32api

Modified Files:
	ChangeLog 
Log Message:
	* include/wingdi.h (AC_SRC_OVER): Add define.
	(struct _BLENDFUNCTION): Add.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/mingw/w32api/ChangeLog,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** ChangeLog	2001/06/27 21:58:51	1.11
--- ChangeLog	2001/06/27 22:40:57	1.12
***************
*** 1,4 ****
--- 1,9 ----
  2001-06-28 Danny Smith <dan...@us...>
  
+ 	* include/wingdi.h (AC_SRC_OVER): Add define.
+ 	(struct _BLENDFUNCTION): Add.
+ 
+ 2001-06-28 Danny Smith <dan...@us...>
+ 
  	* include/shlobj.h:  Add BIF_* defines.
  

Update of /cvsroot/mingw/w32api
In directory usw-pr-cvs1:/tmp/cvs-serv26152/w32api

Modified Files:
	ChangeLog 
Log Message:
	* include/shlobj.h:  Add BIF_* defines.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/mingw/w32api/ChangeLog,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** ChangeLog	2001/06/27 21:38:51	1.10
--- ChangeLog	2001/06/27 21:58:51	1.11
***************
*** 1,2 ****
--- 1,6 ----
+ 2001-06-28 Danny Smith <dan...@us...>
+ 
+ 	* include/shlobj.h:  Add BIF_* defines.
+ 
  2001-06-27 Danny Smith <dan...@us...>
  

Update of /cvsroot/mingw/w32api/include
In directory usw-pr-cvs1:/tmp/cvs-serv26152/w32api/include

Modified Files:
	shlobj.h 
Log Message:
	* include/shlobj.h:  Add BIF_* defines.


Index: shlobj.h
===================================================================
RCS file: /cvsroot/mingw/w32api/include/shlobj.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** shlobj.h	2001/06/11 19:18:14	1.3
--- shlobj.h	2001/06/27 21:58:51	1.4
***************
*** 16,21 ****
--- 16,28 ----
  #define BIF_STATUSTEXT 4
  #define BIF_RETURNFSANCESTORS 8
+ #define BIF_EDITBOX 16
+ #define BIF_VALIDATE 32
+ #define BIF_NEWDIALOGSTYLE 64
+ #define BIF_BROWSEINCLUDEURLS 128
+ #define BIF_USENEWUI ( BIF_EDITBOX | BIF_NEWDIALOGSTYLE )
  #define BIF_BROWSEFORCOMPUTER 0x1000
  #define BIF_BROWSEFORPRINTER 0x2000
+ #define BIF_BROWSEINCLUDEFILES 0x4000
+ #define BIF_SHAREABLE 0x8000
  #define BFFM_INITIALIZED 1
  #define BFFM_SELCHANGED 2

Update of /cvsroot/mingw/w32api
In directory usw-pr-cvs1:/tmp/cvs-serv20413/w32api

Modified Files:
	ChangeLog 
Log Message:
	* include/winerror.h (E_PENDING): Add error code define.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/mingw/w32api/ChangeLog,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** ChangeLog	2001/06/27 09:33:30	1.9
--- ChangeLog	2001/06/27 21:38:51	1.10
***************
*** 1,4 ****
--- 1,8 ----
  2001-06-27 Danny Smith <dan...@us...>
  
+ 	* include/winerror.h (E_PENDING): Add error code define.
+ 
+ 2001-06-27 Danny Smith <dan...@us...>
+ 
  	* include/basetsd.h (#include <_mingw.h>): Add directive.
  

Update of /cvsroot/mingw/w32api/include
In directory usw-pr-cvs1:/tmp/cvs-serv20413/w32api/include

Modified Files:
	winerror.h 
Log Message:
	* include/winerror.h (E_PENDING): Add error code define.


Index: winerror.h
===================================================================
RCS file: /cvsroot/mingw/w32api/include/winerror.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** winerror.h	2001/06/05 01:36:43	1.1.1.1
--- winerror.h	2001/06/27 21:38:51	1.2
***************
*** 700,703 ****
--- 700,704 ----
  #define E_FAIL 0x80004005L
  #define E_ACCESSDENIED 0x80070005L
+ #define E_PENDING 0x8000000AL
  #define CO_E_INIT_TLS 0x80004006L
  #define CO_E_INIT_SHARED_ALLOCATOR 0x80004007L

Update of /cvsroot/mingw/w32api
In directory usw-pr-cvs1:/tmp/cvs-serv25233/w32api

Modified Files:
	ChangeLog 
Log Message:
	* include/basetsd.h (#include <_mingw.h>): Add directive.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/mingw/w32api/ChangeLog,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** ChangeLog	2001/06/26 02:00:32	1.8
--- ChangeLog	2001/06/27 09:33:30	1.9
***************
*** 1,2 ****
--- 1,7 ----
+ 2001-06-27 Danny Smith <dan...@us...>
+ 
+ 	* include/basetsd.h (#include <_mingw.h>): Add directive.
+ 
+ 
  2001-06-25 Danny Smith <dan...@us...>
  

Update of /cvsroot/mingw/w32api/include
In directory usw-pr-cvs1:/tmp/cvs-serv24209/include

Modified Files:
	basetsd.h 
Log Message:
	* include/basetsd.h (#include <_mingw.h>): Add directive.


Index: basetsd.h
===================================================================
RCS file: /cvsroot/mingw/w32api/include/basetsd.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** basetsd.h	2001/06/11 17:29:09	1.2
--- basetsd.h	2001/06/27 09:28:26	1.3
***************
*** 2,5 ****
--- 2,7 ----
  #define _BASETSD_H
  
+ #include <_mingw.h>  /* for definition of __int64 */
+ 
  #if defined(_WIN64)
  #define __int3264   __int64

Update of /cvsroot/mingw/runtime/include
In directory usw-pr-cvs1:/tmp/cvs-serv16843/runtime/include

Modified Files:
	float.h malloc.h math.h 
Log Message:
	* revert Danny Smith changes of 2001-6-26


Index: float.h
===================================================================
RCS file: /cvsroot/mingw/runtime/include/float.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** float.h	2001/06/26 02:00:32	1.3
--- float.h	2001/06/26 02:55:56	1.4
***************
*** 196,214 ****
  /*
   * IEEE recommended functions
-  * Also in math.h.  Keep in sync
   */
- #ifndef __MATH_IEEE
- #define __MATH_IEEE
- double	_chgsign	(double);  /* not ANSI */
- double	_copysign	(double, double); /* C99 */
- double	_logb		(double); /* C99 */
- double	_nextafter	(double, double); /* C99 */
- double	_scalb		(double, long); /* C99 */
  
! int	_finite		(double); /* C99 */
! int	_fpclass	(double); /* not ANSI: C99 has fpclassify */
! int	_isnan		(double); /* C99 */
! #endif /* __MATH_IEEE */
  
  
  #ifdef	__cplusplus
--- 196,210 ----
  /*
   * IEEE recommended functions
   */
  
! double	_chgsign	(double);
! double	_copysign	(double, double);
! double	_logb		(double);
! double	_nextafter	(double, double);
! double	_scalb		(double, long);
  
+ int	_finite		(double);
+ int	_fpclass	(double);
+ int	_isnan		(double);
  
  #ifdef	__cplusplus

Index: malloc.h
===================================================================
RCS file: /cvsroot/mingw/runtime/include/malloc.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** malloc.h	2001/06/26 02:00:32	1.3
--- malloc.h	2001/06/26 02:55:56	1.4
***************
*** 71,75 ****
  #endif
  
! #endif	/* RC_INVOKED */
  
  #endif /* Not _MALLOC_H_ */
--- 71,75 ----
  #endif
  
! #endif	RC_INVOKED
  
  #endif /* Not _MALLOC_H_ */

Index: math.h
===================================================================
RCS file: /cvsroot/mingw/runtime/include/math.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** math.h	2001/06/26 02:00:32	1.3
--- math.h	2001/06/26 02:55:56	1.4
***************
*** 173,195 ****
  #endif	/* Not __STRICT_ANSI__ */
  
- /*
-  * IEEE recommended functions 
-  * Also in float.h.  Keep in sync.
-  */
- 
- #ifndef __MATH_IEEE
- #define __MATH_IEEE
- double	_chgsign	(double);  /* not ANSI */
- double	_copysign	(double, double); /* C99 */
- double	_logb		(double); /* C99 */
- double	_nextafter	(double, double); /* C99 */
- double	_scalb		(double, long); /* C99 */
- 
- int	_finite		(double); /* C99 */
- int	_fpclass	(double); /* not ANSI: C99 has fpclassify */
- int	_isnan		(double); /* C99 */
- #endif /* __MATH_IEEE */
- 
- 
  #ifdef __cplusplus
  }
--- 173,176 ----

Update of /cvsroot/mingw/w32api/include
In directory usw-pr-cvs1:/tmp/cvs-serv4158/w32api/include

Modified Files:
	winbase.h 
Log Message:
	* include/winbase.h(InterlockedCompareExchange): Change args
	and return value from PVOID to LONG.
	(InterlockedExchange): Change first arg to LPLONG.
	(InterlockedCompareExchangePointer): New macro.
	(InterlockedExchangePointer): New macro.


Index: winbase.h
===================================================================
RCS file: /cvsroot/mingw/w32api/include/winbase.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** winbase.h	2001/06/05 01:36:42	1.1.1.1
--- winbase.h	2001/06/26 02:00:32	1.2
***************
*** 1311,1317 ****
  BOOL WINAPI InitializeSecurityDescriptor(PSECURITY_DESCRIPTOR,DWORD);
  BOOL WINAPI InitializeSid (PSID,PSID_IDENTIFIER_AUTHORITY,BYTE);
! PVOID WINAPI InterlockedCompareExchange(PVOID*,PVOID,PVOID);
  LONG WINAPI InterlockedDecrement(LPLONG);
! LONG WINAPI InterlockedExchange(PLONG,LONG);
  LONG WINAPI InterlockedExchangeAdd(PLONG,LONG);
  LONG WINAPI InterlockedIncrement(LPLONG);
--- 1311,1323 ----
  BOOL WINAPI InitializeSecurityDescriptor(PSECURITY_DESCRIPTOR,DWORD);
  BOOL WINAPI InitializeSid (PSID,PSID_IDENTIFIER_AUTHORITY,BYTE);
! LONG WINAPI InterlockedCompareExchange(LPLONG,LONG,LONG);
! /* PVOID WINAPI InterlockedCompareExchangePointer(PVOID*,PVOID,PVOID); */
! #define InterlockedCompareExchangePointer(d,e,c) \
!     (PVOID)InterlockedCompareExchange((LPLONG)(d),(LONG)(e),(LONG)(c))
  LONG WINAPI InterlockedDecrement(LPLONG);
! LONG WINAPI InterlockedExchange(LPLONG,LONG);
! /* PVOID WINAPI InterlockedExchangePointer(PVOID*,PVOID); */
! #define InterlockedExchangePointer(t,v) \
!     (PVOID)InterlockedExchange((LPLONG)(t),(LONG)(v)
  LONG WINAPI InterlockedExchangeAdd(PLONG,LONG);
  LONG WINAPI InterlockedIncrement(LPLONG);

Update of /cvsroot/mingw/w32api
In directory usw-pr-cvs1:/tmp/cvs-serv4158/w32api

Modified Files:
	ChangeLog 
Log Message:
	* include/winbase.h(InterlockedCompareExchange): Change args
	and return value from PVOID to LONG.
	(InterlockedExchange): Change first arg to LPLONG.
	(InterlockedCompareExchangePointer): New macro.
	(InterlockedExchangePointer): New macro.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/mingw/w32api/ChangeLog,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** ChangeLog	2001/06/19 07:15:28	1.7
--- ChangeLog	2001/06/26 02:00:32	1.8
***************
*** 1,2 ****
--- 1,10 ----
+ 2001-06-25 Danny Smith <dan...@us...>
+ 
+ 	* include/winbase.h(InterlockedCompareExchange): Change args
+ 	and return value from PVOID to LONG.
+ 	(InterlockedExchange): Change first arg to LPLONG.
+ 	(InterlockedCompareExchangePointer): New macro.
+ 	(InterlockedExchangePointer): New macro.
+ 
  2001-06-19 Danny Smith <dan...@us...>
  

Update of /cvsroot/mingw/runtime/include
In directory usw-pr-cvs1:/tmp/cvs-serv4158/runtime/include

Modified Files:
	float.h malloc.h math.h 
Log Message:
	* include/winbase.h(InterlockedCompareExchange): Change args
	and return value from PVOID to LONG.
	(InterlockedExchange): Change first arg to LPLONG.
	(InterlockedCompareExchangePointer): New macro.
	(InterlockedExchangePointer): New macro.


Index: float.h
===================================================================
RCS file: /cvsroot/mingw/runtime/include/float.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** float.h	2001/06/05 00:26:30	1.2
--- float.h	2001/06/26 02:00:32	1.3
***************
*** 196,210 ****
  /*
   * IEEE recommended functions
   */
  
! double	_chgsign	(double);
! double	_copysign	(double, double);
! double	_logb		(double);
! double	_nextafter	(double, double);
! double	_scalb		(double, long);
  
- int	_finite		(double);
- int	_fpclass	(double);
- int	_isnan		(double);
  
  #ifdef	__cplusplus
--- 196,214 ----
  /*
   * IEEE recommended functions
+  * Also in math.h.  Keep in sync
   */
+ #ifndef __MATH_IEEE
+ #define __MATH_IEEE
+ double	_chgsign	(double);  /* not ANSI */
+ double	_copysign	(double, double); /* C99 */
+ double	_logb		(double); /* C99 */
+ double	_nextafter	(double, double); /* C99 */
+ double	_scalb		(double, long); /* C99 */
  
! int	_finite		(double); /* C99 */
! int	_fpclass	(double); /* not ANSI: C99 has fpclassify */
! int	_isnan		(double); /* C99 */
! #endif /* __MATH_IEEE */
  
  
  #ifdef	__cplusplus

Index: malloc.h
===================================================================
RCS file: /cvsroot/mingw/runtime/include/malloc.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** malloc.h	2001/06/05 00:26:30	1.2
--- malloc.h	2001/06/26 02:00:32	1.3
***************
*** 71,75 ****
  #endif
  
! #endif	RC_INVOKED
  
  #endif /* Not _MALLOC_H_ */
--- 71,75 ----
  #endif
  
! #endif	/* RC_INVOKED */
  
  #endif /* Not _MALLOC_H_ */

Index: math.h
===================================================================
RCS file: /cvsroot/mingw/runtime/include/math.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** math.h	2001/06/05 00:26:30	1.2
--- math.h	2001/06/26 02:00:32	1.3
***************
*** 173,176 ****
--- 173,195 ----
  #endif	/* Not __STRICT_ANSI__ */
  
+ /*
+  * IEEE recommended functions 
+  * Also in float.h.  Keep in sync.
+  */
+ 
+ #ifndef __MATH_IEEE
+ #define __MATH_IEEE
+ double	_chgsign	(double);  /* not ANSI */
+ double	_copysign	(double, double); /* C99 */
+ double	_logb		(double); /* C99 */
+ double	_nextafter	(double, double); /* C99 */
+ double	_scalb		(double, long); /* C99 */
+ 
+ int	_finite		(double); /* C99 */
+ int	_fpclass	(double); /* not ANSI: C99 has fpclassify */
+ int	_isnan		(double); /* C99 */
+ #endif /* __MATH_IEEE */
+ 
+ 
  #ifdef __cplusplus
  }

Update of /cvsroot/mingw/w32api
In directory usw-pr-cvs1:/tmp/cvs-serv32242/w32api

Modified Files:
	ChangeLog 
Log Message:
	* lib/kernel32.def: Add LanguageGroup and UILanguage symbols.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/mingw/w32api/ChangeLog,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** ChangeLog	2001/06/11 20:06:20	1.6
--- ChangeLog	2001/06/19 07:15:28	1.7
***************
*** 1,2 ****
--- 1,6 ----
+ 2001-06-19 Danny Smith <dan...@us...>
+ 
+ 	* lib/kernel32.def: Add LanguageGroup and UILanguage symbols.
+ 	Thanks to Kevin Chase <kev...@ho...>. 
  
  2001.06.11  TAMURA Kent  <tk...@us...>

Update of /cvsroot/mingw/w32api/lib
In directory usw-pr-cvs1:/tmp/cvs-serv32242/w32api/lib

Modified Files:
	kernel32.def 
Log Message:
	* lib/kernel32.def: Add LanguageGroup and UILanguage symbols.


Index: kernel32.def
===================================================================
RCS file: /cvsroot/mingw/w32api/lib/kernel32.def,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** kernel32.def	2001/06/05 01:36:46	1.1.1.1
--- kernel32.def	2001/06/19 07:15:28	1.2
***************
*** 110,113 ****
--- 110,115 ----
  EnumDateFormatsExA@12
  EnumDateFormatsExW@12
+ EnumLanguageGroupLocalesA@16
+ EnumLanguageGroupLocalesW@16
  EnumResourceLanguagesA@20
  EnumResourceLanguagesW@20
***************
*** 118,125 ****
--- 120,131 ----
  EnumSystemCodePagesA@8
  EnumSystemCodePagesW@8
+ EnumSystemLanguageGroupsA@12
+ EnumSystemLanguageGroupsW@12
  EnumSystemLocalesA@8
  EnumSystemLocalesW@8
  EnumTimeFormatsA@12
  EnumTimeFormatsW@12
+ EnumUILanguagesA@12
+ EnumUILanguagesW@12
  EraseTape@12
  EscapeCommFunction@8
***************
*** 343,346 ****
--- 349,353 ----
  GetSystemDefaultLCID@0
  GetSystemDefaultLangID@0
+ GetSystemDefaultUILanguage@0
  GetSystemDirectoryA@8
  GetSystemDirectoryW@8
***************
*** 369,372 ****
--- 376,380 ----
  GetUserDefaultLCID@0
  GetUserDefaultLangID@0
+ GetUserDefaultUILanguage@0
  GetVDMCurrentDirectories@8
  GetVersion@0
***************
*** 444,447 ****
--- 452,456 ----
  IsProcessorFeaturePresent@4
  IsValidCodePage@4
+ IsValidLanguageGroup@8
  IsValidLocale@8
  LCMapStringA@24

Update of /cvsroot/mingw/w32api/include
In directory usw-pr-cvs1:/tmp/cvs-serv1698/include

Modified Files:
	objidl.h 
Log Message:

	* objidl.h (IMalloc::ReAlloc()): Correct declaration.
	(IMalloc::Free()): Ditto.



Index: objidl.h
===================================================================
RCS file: /cvsroot/mingw/w32api/include/objidl.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** objidl.h	2001/06/05 01:36:40	1.1.1.1
--- objidl.h	2001/06/11 20:06:20	1.2
***************
*** 483,488 ****
  	STDMETHOD_(ULONG,Release)(THIS) PURE;
  	STDMETHOD_(void*,Alloc)(THIS_ ULONG) PURE;
! 	STDMETHOD_(void,ReAlloc)(THIS_ void*) PURE;
! 	STDMETHOD_(void*,Free)(THIS_ void*) PURE;
  	STDMETHOD_(ULONG,GetSize)(THIS_ void*) PURE;
  	STDMETHOD_(int,DidAlloc)(THIS_ void*) PURE;
--- 483,488 ----
  	STDMETHOD_(ULONG,Release)(THIS) PURE;
  	STDMETHOD_(void*,Alloc)(THIS_ ULONG) PURE;
! 	STDMETHOD_(void*,ReAlloc)(THIS_ void*,ULONG) PURE;
! 	STDMETHOD_(void,Free)(THIS_ void*) PURE;
  	STDMETHOD_(ULONG,GetSize)(THIS_ void*) PURE;
  	STDMETHOD_(int,DidAlloc)(THIS_ void*) PURE;

Update of /cvsroot/mingw/w32api
In directory usw-pr-cvs1:/tmp/cvs-serv1698

Modified Files:
	ChangeLog 
Log Message:

	* objidl.h (IMalloc::ReAlloc()): Correct declaration.
	(IMalloc::Free()): Ditto.



Index: ChangeLog
===================================================================
RCS file: /cvsroot/mingw/w32api/ChangeLog,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** ChangeLog	2001/06/11 19:18:14	1.5
--- ChangeLog	2001/06/11 20:06:20	1.6
***************
*** 1,3 ****
--- 1,8 ----
  
+ 2001.06.11  TAMURA Kent  <tk...@us...>
+ 
+ 	* objidl.h (IMalloc::ReAlloc()): Correct declaration.
+ 	(IMalloc::Free()): Ditto.
+ 
  2001-06-11 Danny Smith <dan...@us...>
  

Update of /cvsroot/mingw/w32api/include
In directory usw-pr-cvs1:/tmp/cvs-serv23464/include

Modified Files:
	regstr.h shlobj.h 
Log Message:

	* include/shlobj.h (REGSTR_PATH_EXPLORER): Unicode it. 
	(REGSTR_PATH_SPECIAL_FOLDERS): Ditto.
	* include/regstr.h (REGSTR_PATH_EXPLORER): Add #ifndef guard. 



Index: regstr.h
===================================================================
RCS file: /cvsroot/mingw/w32api/include/regstr.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** regstr.h	2001/06/05 01:36:41	1.1.1.1
--- regstr.h	2001/06/11 19:18:14	1.2
***************
*** 29,33 ****
--- 29,35 ----
  #define REGSTR_PATH_RUNSERVICESONCE	TEXT("Software\\Microsoft\\Windows\\CurrentVersion\\RunServicesOnce")
  #define REGSTR_PATH_RUNSERVICES	TEXT("Software\\Microsoft\\Windows\\CurrentVersion\\RunServices")
+ #ifndef REGSTR_PATH_EXPLORER /* also in shlobj.h */
  #define REGSTR_PATH_EXPLORER	TEXT("Software\\Microsoft\\Windows\\CurrentVersion\\Explorer")
+ #endif
  #define REGSTR_PATH_DETECT	TEXT("Software\\Microsoft\\Windows\\CurrentVersion\\Detect")
  #define REGSTR_PATH_APPPATHS	TEXT("Software\\Microsoft\\Windows\\CurrentVersion\\App Paths")

Index: shlobj.h
===================================================================
RCS file: /cvsroot/mingw/w32api/include/shlobj.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** shlobj.h	2001/06/11 18:28:47	1.2
--- shlobj.h	2001/06/11 19:18:14	1.3
***************
*** 107,113 ****
  #define SHDID_NET_OTHER	17
  #ifndef REGSTR_PATH_EXPLORER
! #define REGSTR_PATH_EXPLORER	"Software\\Microsoft\\Windows\\CurrentVersion\\Explorer"
  #endif
! #define REGSTR_PATH_SPECIAL_FOLDERS	REGSTR_PATH_EXPLORER "\\Shell Folders"
  #define CSIDL_DESKTOP	0
  #define CSIDL_PROGRAMS	2
--- 107,113 ----
  #define SHDID_NET_OTHER	17
  #ifndef REGSTR_PATH_EXPLORER
! #define REGSTR_PATH_EXPLORER	TEXT("Software\\Microsoft\\Windows\\CurrentVersion\\Explorer")
  #endif
! #define REGSTR_PATH_SPECIAL_FOLDERS	REGSTR_PATH_EXPLORER TEXT("\\Shell Folders")
  #define CSIDL_DESKTOP	0
  #define CSIDL_PROGRAMS	2

Update of /cvsroot/mingw/w32api
In directory usw-pr-cvs1:/tmp/cvs-serv23464

Modified Files:
	ChangeLog 
Log Message:

	* include/shlobj.h (REGSTR_PATH_EXPLORER): Unicode it. 
	(REGSTR_PATH_SPECIAL_FOLDERS): Ditto.
	* include/regstr.h (REGSTR_PATH_EXPLORER): Add #ifndef guard. 



Index: ChangeLog
===================================================================
RCS file: /cvsroot/mingw/w32api/ChangeLog,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** ChangeLog	2001/06/11 18:28:47	1.4
--- ChangeLog	2001/06/11 19:18:14	1.5
***************
*** 1,3 ****
--- 1,9 ----
  
+ 2001-06-11 Danny Smith <dan...@us...>
+ 
+ 	* include/shlobj.h (REGSTR_PATH_EXPLORER): Unicode it. 
+ 	(REGSTR_PATH_SPECIAL_FOLDERS): Ditto.
+ 	* include/regstr.h (REGSTR_PATH_EXPLORER): Add #ifndef guard. 
+ 
  2001-06-11  Mattia Barbon  <mb...@ds...>
  

Update of /cvsroot/mingw/runtime/profile
In directory usw-pr-cvs1:/tmp/cvs-serv18763/profile

Modified Files:
	Makefile.in configure configure.in 
Log Message:

	* profile/configure.in: Make msvcrt.dll version default.
	* profile/makefile.in: Build both gcrt1.o and gcrt2.o.	
	* provile/configure: Regenerate.



Index: Makefile.in
===================================================================
RCS file: /cvsroot/mingw/runtime/profile/Makefile.in,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** Makefile.in	2001/06/04 23:26:03	1.1.1.1
--- Makefile.in	2001/06/11 18:56:56	1.2
***************
*** 66,70 ****
  LIBGMON_A = @LIBGMON_A@
  LIBGMON_OBJS = gmon.o mcount.o profil.o
! CRT0S = gcrt$(CRT_ID).o
  
  LIBS = $(LIBGMON_A)
--- 66,70 ----
  LIBGMON_A = @LIBGMON_A@
  LIBGMON_OBJS = gmon.o mcount.o profil.o
! CRT0S = gcrt1.o gcrt2.o
  
  LIBS = $(LIBGMON_A)

Index: configure
===================================================================
RCS file: /cvsroot/mingw/runtime/profile/configure,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** configure	2001/06/04 23:26:03	1.1.1.1
--- configure	2001/06/11 18:56:56	1.2
***************
*** 647,662 ****
  
  case "$target_os" in
! *mingw32msvc*)
!   CRT_ID=2
    MNO_CYGWIN=
!   RUNTIME=msvcrt
!   THREAD_DLL=mingwm
    LIBM_A=libm.a
    LIBGMON_A=libgmon.a
    ;;
  *cygwin*)
!   CRT_ID=1
    MNO_CYGWIN=-mno-cygwin
!   RUNTIME=crtdll
    THREAD_DLL=mingwc
    # Do not build libm.a when building under Cygwin winsup. Otherwise, it'll
--- 647,662 ----
  
  case "$target_os" in
! *mingw32crt*)
!   CRT_ID=1
    MNO_CYGWIN=
!   RUNTIME=crtdll
!   THREAD_DLL=mingwc
    LIBM_A=libm.a
    LIBGMON_A=libgmon.a
    ;;
  *cygwin*)
!   CRT_ID=2
    MNO_CYGWIN=-mno-cygwin
!   RUNTIME=msvcrt
    THREAD_DLL=mingwc
    # Do not build libm.a when building under Cygwin winsup. Otherwise, it'll
***************
*** 666,674 ****
    ;;
  *)
!   # Build it for CRTDLL by default.
!   CRT_ID=1
    MNO_CYGWIN=
!   RUNTIME=crtdll
!   THREAD_DLL=mingwc
    LIBM_A=libm.a
    LIBGMON_A=libgmon.a
--- 666,674 ----
    ;;
  *)
!   # Build it for MSVCRT by default.
!   CRT_ID=2
    MNO_CYGWIN=
!   RUNTIME=msvcrt
!   THREAD_DLL=mingwm
    LIBM_A=libm.a
    LIBGMON_A=libgmon.a

Index: configure.in
===================================================================
RCS file: /cvsroot/mingw/runtime/profile/configure.in,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** configure.in	2001/06/04 23:26:03	1.1.1.1
--- configure.in	2001/06/11 18:56:56	1.2
***************
*** 17,21 ****
  dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  
! AC_PREREQ(2.12)
  AC_INIT(gcrt0.c)
  
--- 17,21 ----
  dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  
! AC_PREREQ(2.13)
  AC_INIT(gcrt0.c)
  
***************
*** 37,52 ****
  
  case "$target_os" in
! *mingw32msvc*)
!   CRT_ID=2
    MNO_CYGWIN=
!   RUNTIME=msvcrt
!   THREAD_DLL=mingwm
    LIBM_A=libm.a
    LIBGMON_A=libgmon.a
    ;;
  *cygwin*)
!   CRT_ID=1
    MNO_CYGWIN=-mno-cygwin
!   RUNTIME=crtdll
    THREAD_DLL=mingwc
    # Do not build libm.a when building under Cygwin winsup. Otherwise, it'll
--- 37,52 ----
  
  case "$target_os" in
! *mingw32crt*)
!   CRT_ID=1
    MNO_CYGWIN=
!   RUNTIME=crtdll
!   THREAD_DLL=mingwc
    LIBM_A=libm.a
    LIBGMON_A=libgmon.a
    ;;
  *cygwin*)
!   CRT_ID=2
    MNO_CYGWIN=-mno-cygwin
!   RUNTIME=msvcrt
    THREAD_DLL=mingwc
    # Do not build libm.a when building under Cygwin winsup. Otherwise, it'll
***************
*** 56,64 ****
    ;;
  *)
!   # Build it for CRTDLL by default.
!   CRT_ID=1
    MNO_CYGWIN=
!   RUNTIME=crtdll
!   THREAD_DLL=mingwc
    LIBM_A=libm.a
    LIBGMON_A=libgmon.a
--- 56,64 ----
    ;;
  *)
!   # Build it for MSVCRT by default.
!   CRT_ID=2
    MNO_CYGWIN=
!   RUNTIME=msvcrt
!   THREAD_DLL=mingwm
    LIBM_A=libm.a
    LIBGMON_A=libgmon.a

Update of /cvsroot/mingw/runtime
In directory usw-pr-cvs1:/tmp/cvs-serv18763

Modified Files:
	ChangeLog 
Log Message:

	* profile/configure.in: Make msvcrt.dll version default.
	* profile/makefile.in: Build both gcrt1.o and gcrt2.o.	
	* provile/configure: Regenerate.



Index: ChangeLog
===================================================================
RCS file: /cvsroot/mingw/runtime/ChangeLog,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** ChangeLog	2001/06/04 23:26:01	1.1.1.1
--- ChangeLog	2001/06/11 18:56:56	1.2
***************
*** 1,3 ****
--- 1,17 ----
  
+ 2001-06-11  Danny Smith  <dan...@ya...>
+ 
+ 	* profile/configure.in: Make msvcrt.dll version default.
+ 	* profile/makefile.in: Build both gcrt1.o and gcrt2.o.	
+ 	* provile/configure: Regenerate.
+ 
+ 2001-06-11  Mattia Barbon  <mb...@ds...>
+ 
+ 	* include/stdio.h (swscanf): Make first arugument const. 
+ 	* include/wchar.h (swscanf): Ditto. 
+ 	* include/tchar.h (_tfopen): New _UNICODE define.
+ 	(_tgetenv): Ditto.
+ 	(_tsetlocale): Ditto.
+ 
  2001-06-04  Earnie Boyd  <ea...@us...>
  

Update of /cvsroot/mingw/w32api/include
In directory usw-pr-cvs1:/tmp/cvs-serv12413/include

Modified Files:
	shlobj.h 
Log Message:

2001-06-11  Mattia Barbon  <mb...@ds...>

	* include/shlobj.h (struct _browseinfo): UNICODE it.
	(SHBrowseForFolder): Ditto.
	(SHGetPathFromIDList): Ditto.



Index: shlobj.h
===================================================================
RCS file: /cvsroot/mingw/w32api/include/shlobj.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** shlobj.h	2001/06/05 01:36:42	1.1.1.1
--- shlobj.h	2001/06/11 18:28:47	1.2
***************
*** 234,238 ****
  typedef const ITEMIDLIST *LPCITEMIDLIST;
  typedef int (CALLBACK* BFFCALLBACK)(HWND,UINT,LPARAM,LPARAM);
! typedef struct _browseinfo {
  	HWND	hwndOwner;
  	LPCITEMIDLIST	pidlRoot;
--- 234,238 ----
  typedef const ITEMIDLIST *LPCITEMIDLIST;
  typedef int (CALLBACK* BFFCALLBACK)(HWND,UINT,LPARAM,LPARAM);
! typedef struct _browseinfoA {
  	HWND	hwndOwner;
  	LPCITEMIDLIST	pidlRoot;
***************
*** 243,247 ****
  	LPARAM	lParam;
  	int	iImage;
! } BROWSEINFO,*PBROWSEINFO,*LPBROWSEINFO;
  typedef struct _CMInvokeCommandInfo {
  	DWORD cbSize;
--- 243,257 ----
  	LPARAM	lParam;
  	int	iImage;
! } BROWSEINFOA,*PBROWSEINFOA,*LPBROWSEINFOA;
! typedef struct _browseinfoW {
! 	HWND	hwndOwner;
! 	LPCITEMIDLIST	pidlRoot;
! 	LPWSTR	pszDisplayName;
! 	LPCWSTR	lpszTitle;
! 	UINT	ulFlags;
! 	BFFCALLBACK	lpfn;
! 	LPARAM	lParam;
! 	int	iImage;
! } BROWSEINFOW,*PBROWSEINFOW,*LPBROWSEINFOW;
  typedef struct _CMInvokeCommandInfo {
  	DWORD cbSize;
***************
*** 677,681 ****
  
  void WINAPI SHAddToRecentDocs(UINT,PCVOID);
! LPITEMIDLIST WINAPI SHBrowseForFolder(PBROWSEINFO);
  void WINAPI SHChangeNotify(LONG,UINT,PCVOID,PCVOID);
  HRESULT WINAPI SHGetDataFromIDListA(LPSHELLFOLDER,LPCITEMIDLIST,int,PVOID,int);
--- 687,692 ----
  
  void WINAPI SHAddToRecentDocs(UINT,PCVOID);
! LPITEMIDLIST WINAPI SHBrowseForFolderA(PBROWSEINFOA);
! LPITEMIDLIST WINAPI SHBrowseForFolderW(PBROWSEINFOW);
  void WINAPI SHChangeNotify(LONG,UINT,PCVOID,PCVOID);
  HRESULT WINAPI SHGetDataFromIDListA(LPSHELLFOLDER,LPCITEMIDLIST,int,PVOID,int);
***************
*** 684,688 ****
  HRESULT WINAPI SHGetInstanceExplorer(LPUNKNOWN);
  HRESULT WINAPI SHGetMalloc(LPMALLOC*);
! BOOL WINAPI SHGetPathFromIDList(LPCITEMIDLIST,LPSTR);
  HRESULT WINAPI SHGetSpecialFolderLocation(HWND,int,LPITEMIDLIST*);
  HRESULT WINAPI SHLoadInProc(REFCLSID);
--- 695,700 ----
  HRESULT WINAPI SHGetInstanceExplorer(LPUNKNOWN);
  HRESULT WINAPI SHGetMalloc(LPMALLOC*);
! BOOL WINAPI SHGetPathFromIDListA(LPCITEMIDLIST,LPSTR);
! BOOL WINAPI SHGetPathFromIDListW(LPCITEMIDLIST,LPWSTR);
  HRESULT WINAPI SHGetSpecialFolderLocation(HWND,int,LPITEMIDLIST*);
  HRESULT WINAPI SHLoadInProc(REFCLSID);
***************
*** 694,698 ****
--- 706,713 ----
  typedef IShellExecuteHookW IShellExecuteHook;
  typedef IShellLinkW IShellLink;
+ typedef BROWSEINFOW BROWSEINFO,*PBROWSEINFO,*LPBROWSEINFO;
+ #define SHBrowseForFolder SHBrowseForFolderW
  #define SHGetDataFromIDList SHGetDataFromIDListW
+ #define SHGetPathFromIDList SHGetPathFromIDListW
  /* FIXME/TODO: Only valid for _WIN32_IE >= 400? */
  #define SHGetSpecialFolderPath SHGetSpecialFolderPathW
***************
*** 700,704 ****
--- 715,722 ----
  typedef IShellExecuteHookA IShellExecuteHook;
  typedef IShellLinkA IShellLink;
+ typedef BROWSEINFOA BROWSEINFO,*PBROWSEINFO,*LPBROWSEINFO;
+ #define SHBrowseForFolder SHBrowseForFolderA
  #define SHGetDataFromIDList SHGetDataFromIDListA
+ #define SHGetPathFromIDList SHGetPathFromIDListA
  /* FIXME/TODO: Only valid for _WIN32_IE >= 400? */
  #define SHGetSpecialFolderPath SHGetSpecialFolderPathA

Update of /cvsroot/mingw/w32api
In directory usw-pr-cvs1:/tmp/cvs-serv12413

Modified Files:
	ChangeLog 
Log Message:

2001-06-11  Mattia Barbon  <mb...@ds...>

	* include/shlobj.h (struct _browseinfo): UNICODE it.
	(SHBrowseForFolder): Ditto.
	(SHGetPathFromIDList): Ditto.



Index: ChangeLog
===================================================================
RCS file: /cvsroot/mingw/w32api/ChangeLog,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** ChangeLog	2001/06/11 17:29:09	1.3
--- ChangeLog	2001/06/11 18:28:47	1.4
***************
*** 1,3 ****
--- 1,9 ----
  
+ 2001-06-11  Mattia Barbon  <mb...@ds...>
+ 
+ 	* include/shlobj.h (struct _browseinfo): UNICODE it.
+ 	(SHBrowseForFolder): Ditto.
+ 	(SHGetPathFromIDList): Ditto.
+ 
  2001.06.11  Earnie Boyd  <ea...@us...>
  

Update of /cvsroot/mingw/runtime/include
In directory usw-pr-cvs1:/tmp/cvs-serv9416/include

Modified Files:
	stdio.h tchar.h wchar.h 
Log Message:

	* include/stdio.h (swscanf): Make first arugument const. 
	* include/wchar.h (swscanf): Ditto. 
	* include/tchar.h (_tfopen): New _UNICODE define.
	(_tgetenv): Ditto.
	(_tsetlocale): Ditto.



Index: stdio.h
===================================================================
RCS file: /cvsroot/mingw/runtime/include/stdio.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** stdio.h	2001/06/05 00:26:30	1.2
--- stdio.h	2001/06/11 18:14:21	1.3
***************
*** 312,316 ****
  int	fwscanf (FILE*, const wchar_t*, ...);
  int	wscanf (const wchar_t*, ...);
! int	swscanf (wchar_t*, const wchar_t*, ...);
  wint_t	fgetwc (FILE*);
  wint_t	fputwc (wchar_t, FILE*);
--- 312,316 ----
  int	fwscanf (FILE*, const wchar_t*, ...);
  int	wscanf (const wchar_t*, ...);
! int	swscanf (const wchar_t*, const wchar_t*, ...);
  wint_t	fgetwc (FILE*);
  wint_t	fputwc (wchar_t, FILE*);

Index: tchar.h
===================================================================
RCS file: /cvsroot/mingw/runtime/include/tchar.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** tchar.h	2001/06/05 00:26:30	1.2
--- tchar.h	2001/06/11 18:14:21	1.3
***************
*** 187,190 ****
--- 187,192 ----
  #define _tfindfirst _wfindfirst
  #define _tfindnext  _wfindnext
+ #define _tfopen     _wfopen
+ #define _tgetenv    _wgetenv
  #define _tmktemp    _wmktemp
  #define _topen      _wopen
***************
*** 192,195 ****
--- 194,198 ----
  #define _trename    _wrename
  #define _tsopen     _wsopen
+ #define _tsetlocale _wsetlocale
  #define _tunlink    _wunlink
  #define _tfinddata_t    _wfinddata_t
***************
*** 246,249 ****
--- 249,254 ----
  #define	_fputtchar	_fputchar
  #define	_fputts		fputs
+ #define	_tfopen		fopen
+ #define	_tgetenv	getenv
  #define	_gettc		getc
  #define	_getts		gets
***************
*** 329,332 ****
--- 334,338 ----
  #define _trename    rename
  #define _tsopen     _sopen
+ #define _tsetlocale setlocale
  #define _tunlink    _unlink
  #define _tfinddata_t    _finddata_t

Index: wchar.h
===================================================================
RCS file: /cvsroot/mingw/runtime/include/wchar.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** wchar.h	2001/06/05 00:26:30	1.2
--- wchar.h	2001/06/11 18:14:21	1.3
***************
*** 111,115 ****
  int	fwscanf (FILE*, const wchar_t*, ...);
  int	wscanf (const wchar_t*, ...);
! int	swscanf (wchar_t*, const wchar_t*, ...);
  wint_t	fgetwc (FILE*);
  wint_t	fputwc (wchar_t, FILE*);
--- 111,115 ----
  int	fwscanf (FILE*, const wchar_t*, ...);
  int	wscanf (const wchar_t*, ...);
! int	swscanf (const wchar_t*, const wchar_t*, ...);
  wint_t	fgetwc (FILE*);
  wint_t	fputwc (wchar_t, FILE*);