Menu
▾
▴
mingw-cvs — List for CVS update notification
This list is closed, nobody may subscribe to it.
| 2000 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(12) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2001 |
Jan
(13) |
Feb
(2) |
Mar
(1) |
Apr
(1) |
May
|
Jun
(38) |
Jul
(10) |
Aug
(70) |
Sep
(63) |
Oct
(61) |
Nov
(41) |
Dec
(28) |
| 2002 |
Jan
(43) |
Feb
(11) |
Mar
(9) |
Apr
(2) |
May
(97) |
Jun
(94) |
Jul
(13) |
Aug
(49) |
Sep
(41) |
Oct
(24) |
Nov
(55) |
Dec
(126) |
| 2003 |
Jan
(90) |
Feb
(75) |
Mar
(32) |
Apr
(24) |
May
(54) |
Jun
(54) |
Jul
(22) |
Aug
(4) |
Sep
(16) |
Oct
(8) |
Nov
(6) |
Dec
(13) |
| 2004 |
Jan
|
Feb
(17) |
Mar
(60) |
Apr
(21) |
May
(12) |
Jun
|
Jul
(13) |
Aug
|
Sep
(29) |
Oct
|
Nov
|
Dec
(2) |
| 2005 |
Jan
(22) |
Feb
(3) |
Mar
(2) |
Apr
(13) |
May
(82) |
Jun
(18) |
Jul
(30) |
Aug
(17) |
Sep
(3) |
Oct
(19) |
Nov
(4) |
Dec
(8) |
| 2006 |
Jan
(1) |
Feb
(6) |
Mar
(2) |
Apr
(40) |
May
|
Jun
(21) |
Jul
(1) |
Aug
(410) |
Sep
(3) |
Oct
|
Nov
(56) |
Dec
(7) |
| 2007 |
Jan
(19) |
Feb
|
Mar
(4) |
Apr
(8) |
May
(19) |
Jun
(6) |
Jul
(4) |
Aug
(6) |
Sep
|
Oct
(4) |
Nov
(3) |
Dec
(2) |
| 2008 |
Jan
(13) |
Feb
(18) |
Mar
(12) |
Apr
|
May
(2) |
Jun
|
Jul
|
Aug
(1) |
Sep
|
Oct
|
Nov
|
Dec
|
| 2009 |
Jan
|
Feb
(6) |
Mar
(8) |
Apr
(2) |
May
(2) |
Jun
|
Jul
|
Aug
(2) |
Sep
(11) |
Oct
(13) |
Nov
(17) |
Dec
(6) |
| 2010 |
Jan
(24) |
Feb
(10) |
Mar
(27) |
Apr
(20) |
May
(108) |
Jun
(8) |
Jul
(23) |
Aug
(38) |
Sep
(49) |
Oct
(17) |
Nov
(12) |
Dec
(14) |
| 2011 |
Jan
(17) |
Feb
(7) |
Mar
(28) |
Apr
(8) |
May
(20) |
Jun
(11) |
Jul
(7) |
Aug
(12) |
Sep
(4) |
Oct
(20) |
Nov
(19) |
Dec
(2) |
| 2012 |
Jan
(2) |
Feb
(6) |
Mar
(5) |
Apr
(24) |
May
(5) |
Jun
(4) |
Jul
(6) |
Aug
(18) |
Sep
(38) |
Oct
(26) |
Nov
(12) |
Dec
(6) |
| 2013 |
Jan
(19) |
Feb
(18) |
Mar
(44) |
Apr
(35) |
May
(18) |
Jun
(21) |
Jul
(10) |
Aug
(19) |
Sep
(44) |
Oct
(25) |
Nov
(1) |
Dec
(2) |
| 2014 |
Jan
(8) |
Feb
|
Mar
|
Apr
(5) |
May
(1) |
Jun
(3) |
Jul
|
Aug
(3) |
Sep
|
Oct
(4) |
Nov
(4) |
Dec
(7) |
| 2015 |
Jan
|
Feb
|
Mar
(1) |
Apr
|
May
(2) |
Jun
(4) |
Jul
(6) |
Aug
(2) |
Sep
(8) |
Oct
(2) |
Nov
(1) |
Dec
(3) |
| 2016 |
Jan
(7) |
Feb
(9) |
Mar
(5) |
Apr
(5) |
May
(9) |
Jun
(4) |
Jul
(20) |
Aug
(4) |
Sep
(7) |
Oct
(6) |
Nov
(9) |
Dec
(2) |
| 2017 |
Jan
(7) |
Feb
(7) |
Mar
(5) |
Apr
|
May
(1) |
Jun
(4) |
Jul
(12) |
Aug
(4) |
Sep
(1) |
Oct
(4) |
Nov
(11) |
Dec
(14) |
| 2018 |
Jan
(3) |
Feb
(3) |
Mar
|
Apr
|
May
|
Jun
|
Jul
(2) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| S | M | T | W | T | F | S |
|---|---|---|---|---|---|---|
|
|
1
|
2
|
3
|
4
|
5
|
6
|
|
7
|
8
|
9
|
10
|
11
|
12
(7) |
13
|
|
14
|
15
(7) |
16
(2) |
17
|
18
|
19
|
20
|
|
21
|
22
|
23
|
24
|
25
|
26
|
27
|
|
28
|
29
|
30
|
|
|
|
|
|
From: <na...@us...> - 2003-09-16 18:30:51
|
Update of /cvsroot/mingw/htdocs
In directory sc8-pr-cvs1:/tmp/cvs-serv32517
Modified Files:
ChangeLog lists.shtml mingwfaq.shtml
Log Message:
2003-09-16 Nathan Fisher <na...@us...>
* mingwfaq.shtml: Add info on C++ file sizes.
* * lists.shtml: Add forums info.
* Add List Etiquette.
* * ssi/lsidebar.html: Update Mailing List & Forums.
Index: ChangeLog
===================================================================
RCS file: /cvsroot/mingw/htdocs/ChangeLog,v
retrieving revision 1.137
retrieving revision 1.138
diff -C2 -d -r1.137 -r1.138
*** ChangeLog 21 Jul 2003 22:28:25 -0000 1.137
--- ChangeLog 16 Sep 2003 18:30:46 -0000 1.138
***************
*** 1,2 ****
--- 1,9 ----
+ 2003-09-16 Nathan Fisher <na...@us...>
+
+ * mingwfaq.shtml: Add info on C++ file sizes.
+ * lists.shtml: Add forums info.
+ Add List Etiquette.
+ * ssi/lsidebar.html: Update Mailing List & Forums.
+
2003-07-21 Earnie Boyd <ea...@us...>
Index: lists.shtml
===================================================================
RCS file: /cvsroot/mingw/htdocs/lists.shtml,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** lists.shtml 21 Jul 2003 22:28:25 -0000 1.15
--- lists.shtml 16 Sep 2003 18:30:47 -0000 1.16
***************
*** 15,19 ****
<body link="#000099" vlink="#990099" alink="#000099">
! <h1>Mailing Lists</h1>
<table class="prim" cellspacing="6" border="0">
--- 15,19 ----
<body link="#000099" vlink="#990099" alink="#000099">
! <h1>Mailing Lists and Forums</h1>
<table class="prim" cellspacing="6" border="0">
***************
*** 27,34 ****
<tr>
<td>
! <!-- ======================================================================= -->
! <!-- -->
! <!-- Main Body -->
! <!-- -->
<p>
There are several mailing lists available for the MinGW users; the
--- 27,34 ----
<tr>
<td>
! <!-- ====================================================================== -->
! <!-- -->
! <!-- Main Body -->
! <!-- -->
<p>
There are several mailing lists available for the MinGW users; the
***************
*** 39,42 ****
--- 39,54 ----
</p>
+ <h3>Mailing List Etiquette</h3>
+ <p>
+ MinGW is an open source project, as such people are dedicating their SPARE
+ time to the goals and development of the project, please keep that in mind
+ when posting. The lists are for the benefit of the MinGW community, judge
+ yourself accordingly in both posting and responding to others. Please do
+ not post any comments which slander this project or any other as they will
+ not be tolerated. Because there is a great deal of information in the lists
+ please use the search facility prior to posting a question to ensure the
+ question has not already been answered in a previous thread.
+ </p>
+
<h3> MinGW Mailing Lists </h3>
***************
*** 46,57 ****
This is the general mailing list for MinGW users. Please search the
<a href="" rel="nofollow">http://sourceforge.net/mailarchive/forum.php?forum=mingw-users">
! <strong>archives</strong></a> before posting. <a href="gmane" rel="nofollow">http://search.gmane.org/search.php?query=&email=&group=gmane.comp.gnu.mingw.user&sort=date">gmane alternative search</a>
! </p><p>
<a href="" rel="nofollow">http://lists.sourceforge.net/mailman/listinfo/mingw-msys">
<strong>MinGW-msys</strong></a>:
This is the general mailing list for MSYS users. Please search the
<a href="" rel="nofollow">http://sourceforge.net/mailarchive/forum.php?forum=mingw-msys">
! <strong>archives</strong></a> before posting. <a href="gmane" rel="nofollow">http://search.gmane.org/search.php?query=&email=&group=gmane.comp.gnu.mingw.msys&sort=date">gmane alternative search</a>
! </p><p>
<a href="" rel="nofollow">http://lists.sourceforge.net/mailman/listinfo/mingw-dvlpr">
<strong>MinGW-dvlpr</strong></a>:
--- 58,75 ----
This is the general mailing list for MinGW users. Please search the
<a href="" rel="nofollow">http://sourceforge.net/mailarchive/forum.php?forum=mingw-users">
! <strong>archives</strong></a> before posting.
! <a href="gmane" rel="nofollow">http://search.gmane.org/search.php?query=&email=&group=gmane.comp.gnu.mingw.user&sort=date">gmane alternative search</a>
! </p>
!
! <p>
<a href="" rel="nofollow">http://lists.sourceforge.net/mailman/listinfo/mingw-msys">
<strong>MinGW-msys</strong></a>:
This is the general mailing list for MSYS users. Please search the
<a href="" rel="nofollow">http://sourceforge.net/mailarchive/forum.php?forum=mingw-msys">
! <strong>archives</strong></a> before posting.
! <a href="gmane" rel="nofollow">http://search.gmane.org/search.php?query=&email=&group=gmane.comp.gnu.mingw.msys&sort=date">gmane alternative search</a>
! </p>
!
! <p>
<a href="" rel="nofollow">http://lists.sourceforge.net/mailman/listinfo/mingw-dvlpr">
<strong>MinGW-dvlpr</strong></a>:
***************
*** 59,64 ****
the developers are discussing at the
<a href="" rel="nofollow">http://sourceforge.net/mailarchive/forum.php?forum=mingw-dvlpr">
! <strong>archives</strong></a>. <a href="gmane" rel="nofollow">http://search.gmane.org/search.php?query=&email=&group=gmane.comp.gnu.mingw.devel&sort=date">gmane alternative search</a>
! </p><p>
<a href="" rel="nofollow">http://lists.sourceforge.net/mailman/listinfo/mingw-patches">
<strong>MinGW-patches</strong></a>:
--- 77,85 ----
the developers are discussing at the
<a href="" rel="nofollow">http://sourceforge.net/mailarchive/forum.php?forum=mingw-dvlpr">
! <strong>archives</strong></a>.
! <a href="gmane" rel="nofollow">http://search.gmane.org/search.php?query=&email=&group=gmane.comp.gnu.mingw.devel&sort=date">gmane alternative search</a>
! </p>
!
! <p>
<a href="" rel="nofollow">http://lists.sourceforge.net/mailman/listinfo/mingw-patches">
<strong>MinGW-patches</strong></a>:
***************
*** 66,71 ****
patches in the
<a href="" rel="nofollow">http://sourceforge.net/mailarchive/forum.php?forum=mingw-patches">
! <strong>archives</strong></a>. <a href="gmane" rel="nofollow">http://search.gmane.org/search.php?query=&email=&group=gmane.comp.gnu.mingw.patches&sort=date">gmane alternative search</a>
! </p><p>
<a href="" rel="nofollow">http://lists.sourceforge.net/mailman/listinfo/mingw-editor">
<strong>MinGW-editor</strong></a>:
--- 87,95 ----
patches in the
<a href="" rel="nofollow">http://sourceforge.net/mailarchive/forum.php?forum=mingw-patches">
! <strong>archives</strong></a>.
! <a href="gmane" rel="nofollow">http://search.gmane.org/search.php?query=&email=&group=gmane.comp.gnu.mingw.patches&sort=date">gmane alternative search</a>
! </p>
!
! <p>
<a href="" rel="nofollow">http://lists.sourceforge.net/mailman/listinfo/mingw-editor">
<strong>MinGW-editor</strong></a>:
***************
*** 74,83 ****
<a href="" rel="nofollow">http://sourceforge.net/mailarchive/forum.php?forum=mingw-editor">
<strong>archives</strong></a>.
! </p><p>
<a href="" rel="nofollow">http://lists.sourceforge.net/mailman/listinfo/mingw-cvs">
<strong>MinGW-cvs</strong></a>:
This is a notification list for cvs changes. There are no archives for this
list.
! </p><p>
<a href="" rel="nofollow">http://lists.sourceforge.net/mailman/listinfo/mingw-notify">
<strong>MinGW-notify</strong></a>:
--- 98,111 ----
<a href="" rel="nofollow">http://sourceforge.net/mailarchive/forum.php?forum=mingw-editor">
<strong>archives</strong></a>.
! </p>
!
! <p>
<a href="" rel="nofollow">http://lists.sourceforge.net/mailman/listinfo/mingw-cvs">
<strong>MinGW-cvs</strong></a>:
This is a notification list for cvs changes. There are no archives for this
list.
! </p>
!
! <p>
<a href="" rel="nofollow">http://lists.sourceforge.net/mailman/listinfo/mingw-notify">
<strong>MinGW-notify</strong></a>:
***************
*** 88,91 ****
--- 116,172 ----
or a patch, etc.
</p>
+
+ <h3>Forums</h3>
+
+ <p>
+ You are welcome to use theses forums for the benefit of discussing particulars about the referenced link. You are encouraged to encourage each other to stay On Topic. There is no guarantee that an expert is monitoring this list. However, the MinGW team will consider all questions important and will hope to direct you in some way to an answer. These forums should eventually show up in the nntp.sourceforge.net news service. The only supported clients at this time for this service are Outlook and Mozilla. The SourceForge news service is still in beta mode.
+ </p>
+
+ <ul>
+ <li>
+ <a href="http://sourceforge.net/forum/forum.php?forum_id=286532"
+ target="_blank">ADA</a>
+ </li>
+
+ <li>
+ <a href="http://sourceforge.net/forum/forum.php?forum_id=286529"
+ target="_blank">C/C++</a>
+ </li>
+
+ <li>
+ <a href="http://sourceforge.net/forum/forum.php?forum_id=286531"
+ target="_blank">Fortran</a>
+ </li>
+
+ <li>
+ <a href="http://sourceforge.net/forum/forum.php?forum_id=286644"
+ target="_blank">HowtoPPD</a>
+ </li>
+
+ <li>
+ <a href="http://sourceforge.net/forum/forum.php?forum_id=286533"
+ target="_blank">Java</a>
+ </li>
+
+ <li>
+ <a href="http://sourceforge.net/forum/forum.php?forum_id=286534"
+ target="_blank">Pascal</a>
+ </li>
+
+ <li>
+ <a href="http://sourceforge.net/forum/forum.php?forum_id=7134"
+ target="_blank">StupidTechiQuestions</a>
+ </li>
+
+ <li>
+ <a href="http://sourceforge.net/forum/forum.php?forum_id=290275"
+ target="_blank">Unix2Windows2Unix</a>
+ </li>
+
+ <li>
+ <a href="http://sourceforge.net/forum/forum.php?forum_id=286641"
+ target="_blank">Windows API</a>
+ </li>
+ </ul>
<h3> Other Lists of Interest </h3>
Index: mingwfaq.shtml
===================================================================
RCS file: /cvsroot/mingw/htdocs/mingwfaq.shtml,v
retrieving revision 1.56
retrieving revision 1.57
diff -C2 -d -r1.56 -r1.57
*** mingwfaq.shtml 17 Mar 2003 04:27:50 -0000 1.56
--- mingwfaq.shtml 16 Sep 2003 18:30:47 -0000 1.57
***************
*** 125,128 ****
--- 125,130 ----
<li><a href="#faq-languages">What Languages Are Supported?</a>
</li>
+ <li><a href="#faq-C++size">Why are C++ programs so large?</a>
+ </li>
<li><a href="#faq-configure">How do I execute configure scripts?</a>
</li>
***************
*** 139,144 ****
<li><a href="#faq-cross">How can I build a cross compiler?</a>
</li>
! <li><a href="#faq-mingw32-gcc.exe">
! What's the difference between gcc.exe and mingw32-gcc.exe?"</a>
</li>
<li><a href="#faq-Makefile">What is a Makefile and how do I create one?</a>
--- 141,145 ----
<li><a href="#faq-cross">How can I build a cross compiler?</a>
</li>
! <li><a href="#faq-mingw32-gcc.exe">What's the difference between gcc.exe and mingw32-gcc.exe?</a>
</li>
<li><a href="#faq-Makefile">What is a Makefile and how do I create one?</a>
***************
*** 314,318 ****
is released under
</li>
! <li><a href="" rel="nofollow">http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/mingw/w32api/README.w32api?rev=HEAD&content-type=text/vnd.viewcvs-markup">
copyright</a>
. The copyright agreement states
--- 315,320 ----
is released under
</li>
! <li>
! <a href="" rel="nofollow">http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/mingw/w32api/README.w32api?rev=HEAD&content-type=text/vnd.viewcvs-markup">
copyright</a>
. The copyright agreement states
***************
*** 409,412 ****
--- 411,435 ----
<hr>
+ <h3><a name="faq-C++size">
+ Why is my C++ binary so large?</a></h3>
+
+ <p>C++ programs using the Standard Template Library
+ (ie/ #include <iostream>) cause a large part of the
+ library to be statically linked into the binary. The need to
+ statically link the stdc++ into the binary is two fold. First
+ MSVCRT.dll does not contain C++ stdlib constructs. Second
+ the legal implications of generating a libstdc++.dll are
+ restricted by the licensing associated with the library. If
+ you wish to keep your file size down use strip to remove
+ debugging information and other verbatim found in the
+ binary.</p>
+ <code>
+ strip --strip-all SOMEBINARY.exe
+ </code>
+
+ <p><a href="#index">Back to index</a></p>
+
+ <hr>
+
<h3><a name="faq-configure">
How do I execute configure scripts?</a></h3>
***************
*** 757,761 ****
<br>
$(EXE): $(OBJ) # $(EXE) is dependent on all of the files in $(OBJ) to exist<br>
! $(CC) $(OBJ) $(LDFLAGS)<br>
<br>
.PHONY : clean # .PHONY ignores files named clean<br>
--- 780,784 ----
<br>
$(EXE): $(OBJ) # $(EXE) is dependent on all of the files in $(OBJ) to exist<br>
! $(CC) $(OBJ) $(LDFLAGS) -o $@<br>
<br>
.PHONY : clean # .PHONY ignores files named clean<br>
***************
*** 848,868 ****
-
-
-
-
-
<p>
! <a href=" |
|
From: <na...@us...> - 2003-09-16 18:30:51
|
Update of /cvsroot/mingw/htdocs/ssi
In directory sc8-pr-cvs1:/tmp/cvs-serv32517/ssi
Modified Files:
lsidebar.html
Log Message:
2003-09-16 Nathan Fisher <na...@us...>
* mingwfaq.shtml: Add info on C++ file sizes.
* * lists.shtml: Add forums info.
* Add List Etiquette.
* * ssi/lsidebar.html: Update Mailing List & Forums.
Index: lsidebar.html
===================================================================
RCS file: /cvsroot/mingw/htdocs/ssi/lsidebar.html,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** lsidebar.html 6 Jun 2003 19:03:13 -0000 1.28
--- lsidebar.html 16 Sep 2003 18:30:47 -0000 1.29
***************
*** 1,7 ****
<!--$Id$-->
! <!-- ================================================================== -->
! <!-- -->
! <!-- Left Sidebar -->
! <!-- -->
<table border="0">
--- 1,7 ----
<!--$Id$-->
! <!-- ======================================================================= -->
! <!-- -->
! <!-- Left Sidebar -->
! <!-- -->
<table border="0">
***************
*** 9,13 ****
<tr><td colspan="2"><a href="index.shtml">MinGW Home</a></td></tr>
<tr><td colspan="2"><a href="licensing.shtml">Licensing Terms</a></td></tr>
! <tr><td colspan="2"><a href="lists.shtml">Mailing Lists</a></td></tr>
<tr><td colspan="2"><a href="bugs.shtml">Reporting Bugs</a></td></tr>
<tr><td colspan="2"><a href="msys.shtml">MSYS</a></td></tr>
--- 9,14 ----
<tr><td colspan="2"><a href="index.shtml">MinGW Home</a></td></tr>
<tr><td colspan="2"><a href="licensing.shtml">Licensing Terms</a></td></tr>
! <tr><td colspan="2"><a href="lists.shtml">Mailing List & Forums</a>
! </td></tr>
<tr><td colspan="2"><a href="bugs.shtml">Reporting Bugs</a></td></tr>
<tr><td colspan="2"><a href="msys.shtml">MSYS</a></td></tr>
***************
*** 16,21 ****
<td><small><a href="mingwfaq.shtml">Frequently Asked Questions (FAQ)</a></small></td></tr>
<tr><td colspan="2"><a href="links.shtml">Related Sites</a></td></tr>
! <!--<tr><td colspan="2"><a href="ported.shtml">Ported Software</a></td></tr>-->
! <!--<tr><td colspan="2"><a href="who.shtml">Who are we?</a></td></tr>-->
<tr><td colspan="2"><a href="news.shtml">News</a></td></tr>
<tr><td colspan="2"><a href="history.shtml">Project History</a></td></tr>
--- 17,24 ----
<td><small><a href="mingwfaq.shtml">Frequently Asked Questions (FAQ)</a></small></td></tr>
<tr><td colspan="2"><a href="links.shtml">Related Sites</a></td></tr>
! <!--
! <tr><td colspan="2"><a href="ported.shtml">Ported Software</a></td></tr>
! <tr><td colspan="2"><a href="who.shtml">Who are we?</a></td></tr>
! -->
<tr><td colspan="2"><a href="news.shtml">News</a></td></tr>
<tr><td colspan="2"><a href="history.shtml">Project History</a></td></tr>
|
|
From: <ea...@us...> - 2003-09-15 14:23:46
|
Update of /cvsroot/mingw/runtime
In directory sc8-pr-cvs1:/tmp/cvs-serv8717
Added Files:
isascii.c iscsym.c iscsymf.c strcasecmp.c strncasecmp.c
toascii.c wcscmpi.c
Log Message:
Merge winsup changes
--- NEW FILE: isascii.c ---
/*
* isascii.c
*
* Oldnames from ANSI header ctype.h
*
* Some wrapper functions for those old name functions whose appropriate
* equivalents are not simply underscore prefixed.
*
* Contributors:
* Created by Colin Peters <co...@bi...>
*
* THIS SOFTWARE IS NOT COPYRIGHTED
*
* This source code is offered for use in the public domain. You may
* use, modify or distribute it freely.
*
* This code is distributed in the hope that it will be useful but
* WITHOUT ANY WARRANTY. ALL WARRENTIES, EXPRESS OR IMPLIED ARE HEREBY
* DISCLAMED. This includes but is not limited to warrenties of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
*
* $Revision: 1.1 $
* $Author: earnie $
* $Date: 2003/09/15 14:23:42 $
*
*/
#include <ctype.h>
int
isascii (int c)
{
return __isascii(c);
}
--- NEW FILE: iscsym.c ---
/*
* iscsym.c
*
* Oldnames from ANSI header ctype.h
*
* Some wrapper functions for those old name functions whose appropriate
* equivalents are not simply underscore prefixed.
*
* Contributors:
* Created by Colin Peters <co...@bi...>
*
* THIS SOFTWARE IS NOT COPYRIGHTED
*
* This source code is offered for use in the public domain. You may
* use, modify or distribute it freely.
*
* This code is distributed in the hope that it will be useful but
* WITHOUT ANY WARRANTY. ALL WARRENTIES, EXPRESS OR IMPLIED ARE HEREBY
* DISCLAMED. This includes but is not limited to warrenties of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
*
* $Revision: 1.1 $
* $Author: earnie $
* $Date: 2003/09/15 14:23:42 $
*
*/
#include <ctype.h>
int
iscsym (int c)
{
return __iscsym(c);
}
--- NEW FILE: iscsymf.c ---
/*
* iscsymf.c
*
* Oldnames from ANSI header ctype.h
*
* Some wrapper functions for those old name functions whose appropriate
* equivalents are not simply underscore prefixed.
*
* Contributors:
* Created by Colin Peters <co...@bi...>
*
* THIS SOFTWARE IS NOT COPYRIGHTED
*
* This source code is offered for use in the public domain. You may
* use, modify or distribute it freely.
*
* This code is distributed in the hope that it will be useful but
* WITHOUT ANY WARRANTY. ALL WARRENTIES, EXPRESS OR IMPLIED ARE HEREBY
* DISCLAMED. This includes but is not limited to warrenties of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
*
* $Revision: 1.1 $
* $Author: earnie $
* $Date: 2003/09/15 14:23:42 $
*
*/
#include <ctype.h>
int
iscsymf (int c)
{
return __iscsymf(c);
}
--- NEW FILE: strcasecmp.c ---
/*
* strcasecmp.c
*
* Oldnames from ANSI header string.h
*
* Some wrapper functions for those old name functions whose appropriate
* equivalents are not simply underscore prefixed.
*
* Contributors:
* Created by Colin Peters <co...@bi...>
*
* THIS SOFTWARE IS NOT COPYRIGHTED
*
* This source code is offered for use in the public domain. You may
* use, modify or distribute it freely.
*
* This code is distributed in the hope that it will be useful but
* WITHOUT ANY WARRANTY. ALL WARRENTIES, EXPRESS OR IMPLIED ARE HEREBY
* DISCLAMED. This includes but is not limited to warrenties of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
*
* $Revision: 1.1 $
* $Author: earnie $
* $Date: 2003/09/15 14:23:42 $
*
*/
#include <string.h>
int
strcasecmp (const char *sz1, const char *sz2)
{
return _stricmp (sz1, sz2);
}
--- NEW FILE: strncasecmp.c ---
/*
* strncasecmp.c
*
* Oldnames from ANSI header string.h
*
* Some wrapper functions for those old name functions whose appropriate
* equivalents are not simply underscore prefixed.
*
* Contributors:
* Created by Colin Peters <co...@bi...>
*
* THIS SOFTWARE IS NOT COPYRIGHTED
*
* This source code is offered for use in the public domain. You may
* use, modify or distribute it freely.
*
* This code is distributed in the hope that it will be useful but
* WITHOUT ANY WARRANTY. ALL WARRENTIES, EXPRESS OR IMPLIED ARE HEREBY
* DISCLAMED. This includes but is not limited to warrenties of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
*
* $Revision: 1.1 $
* $Author: earnie $
* $Date: 2003/09/15 14:23:42 $
*
*/
#include <string.h>
int
strncasecmp (const char *sz1, const char *sz2, size_t sizeMaxCompare)
{
return _strnicmp (sz1, sz2, sizeMaxCompare);
}
--- NEW FILE: toascii.c ---
/*
* toascii.c
*
* Oldnames from ANSI header ctype.h
*
* Some wrapper functions for those old name functions whose appropriate
* equivalents are not simply underscore prefixed.
*
* Contributors:
* Created by Colin Peters <co...@bi...>
*
* THIS SOFTWARE IS NOT COPYRIGHTED
*
* This source code is offered for use in the public domain. You may
* use, modify or distribute it freely.
*
* This code is distributed in the hope that it will be useful but
* WITHOUT ANY WARRANTY. ALL WARRENTIES, EXPRESS OR IMPLIED ARE HEREBY
* DISCLAMED. This includes but is not limited to warrenties of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
*
* $Revision: 1.1 $
* $Author: earnie $
* $Date: 2003/09/15 14:23:42 $
*
*/
#include <ctype.h>
int
toascii (int c)
{
return __toascii(c);
}
--- NEW FILE: wcscmpi.c ---
/*
* wcscmpi.c
*
* Oldnames from ANSI header string.h
*
* Some wrapper functions for those old name functions whose appropriate
* equivalents are not simply underscore prefixed.
*
* Contributors:
* Created by Colin Peters <co...@bi...>
*
* THIS SOFTWARE IS NOT COPYRIGHTED
*
* This source code is offered for use in the public domain. You may
* use, modify or distribute it freely.
*
* This code is distributed in the hope that it will be useful but
* WITHOUT ANY WARRANTY. ALL WARRENTIES, EXPRESS OR IMPLIED ARE HEREBY
* DISCLAMED. This includes but is not limited to warrenties of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
*
* $Revision: 1.1 $
* $Author: earnie $
* $Date: 2003/09/15 14:23:42 $
*
*/
#include <string.h>
int
wcscmpi (const wchar_t * ws1, const wchar_t * ws2)
{
return _wcsicmp (ws1, ws2);
}
|
|
From: <ea...@us...> - 2003-09-15 14:23:45
|
Update of /cvsroot/mingw/runtime/include
In directory sc8-pr-cvs1:/tmp/cvs-serv8717/include
Added Files:
search.h
Log Message:
Merge winsup changes
--- NEW FILE: search.h ---
/*
* search.h
*
* Functions for searching and sorting.
*
* This file is part of the Mingw32 package.
*
* Contributors:
* Created by Danny Smith <dan...@us...>
*
* THIS SOFTWARE IS NOT COPYRIGHTED
*
* This source code is offered for use in the public domain. You may
* use, modify or distribute it freely.
*
* This code is distributed in the hope that it will be useful but
* WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY
* DISCLAIMED. This includes but is not limited to warranties of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
*
*/
#ifndef _SEARCH_H_
#define _SEARCH_H_
/* All the headers include this file. */
#include <_mingw.h>
#ifndef RC_INVOKED
#ifdef __cplusplus
extern "C" {
#endif
#ifndef _SIZE_T_DEFINED
typedef unsigned int size_t;
#define _SIZE_T_DEFINED
#endif
/* bsearch and qsort are also declared in stdlib.h */
_CRTIMP void* __cdecl bsearch (const void*, const void*, size_t, size_t,
int (*)(const void*, const void*));
_CRTIMP void __cdecl qsort (void*, size_t, size_t,
int (*)(const void*, const void*));
#ifndef __STRICT_ANSI__
_CRTIMP void* __cdecl _lfind (const void*, const void*, unsigned int*,
unsigned int, int (*)(const void*, const void*));
_CRTIMP void* __cdecl _lsearch (const void*, void*, unsigned int*, unsigned int,
int (*)(const void*, const void*));
#ifndef _NO_OLDNAMES
_CRTIMP void* __cdecl lfind (const void*, const void*, unsigned int*,
unsigned int, int (*)(const void*, const void*));
_CRTIMP void* __cdecl lsearch (const void*, void*, unsigned int*, unsigned int,
int (*)(const void*, const void*));
#endif
#endif /* __STRICT_ANSI__ */
#ifdef __cplusplus
}
#endif
#endif /* RC_INVOKED */
#endif /* _SEARCH_H_ */
|
|
From: <ea...@us...> - 2003-09-15 14:18:40
|
Update of /cvsroot/mingw/runtime/mingwex/math
In directory sc8-pr-cvs1:/tmp/cvs-serv7574/mingwex/math
Modified Files:
modff.c modfl.c tgamma.c tgammaf.c tgammal.c trunc.c truncf.c
truncl.c
Log Message:
Merge winsup changes
Index: modff.c
===================================================================
RCS file: /cvsroot/mingw/runtime/mingwex/math/modff.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** modff.c 12 Aug 2002 13:06:37 -0000 1.1
--- modff.c 15 Sep 2003 14:18:35 -0000 1.2
***************
*** 10,17 ****
float int_part;
unsigned short saved_cw;
/* truncate */
asm ("fnstcw %0;" : "=m" (saved_cw)); /* save control word */
! asm ("fldcw %0;" : : "m" ((saved_cw & ~FE_ROUNDING_MASK)
! | FE_TOWARDZERO));
asm ("frndint;" : "=t" (int_part) : "0" (value)); /* round */
asm ("fldcw %0;" : : "m" (saved_cw)); /* restore saved cw */
--- 10,18 ----
float int_part;
unsigned short saved_cw;
+ unsigned short tmp_cw;
/* truncate */
asm ("fnstcw %0;" : "=m" (saved_cw)); /* save control word */
! tmp_cw = (saved_cw & ~FE_ROUNDING_MASK) | FE_TOWARDZERO;
! asm ("fldcw %0;" : : "m" (tmp_cw));
asm ("frndint;" : "=t" (int_part) : "0" (value)); /* round */
asm ("fldcw %0;" : : "m" (saved_cw)); /* restore saved cw */
Index: modfl.c
===================================================================
RCS file: /cvsroot/mingw/runtime/mingwex/math/modfl.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** modfl.c 12 Aug 2002 13:06:37 -0000 1.1
--- modfl.c 15 Sep 2003 14:18:36 -0000 1.2
***************
*** 10,17 ****
long double int_part;
unsigned short saved_cw;
/* truncate */
asm ("fnstcw %0;" : "=m" (saved_cw)); /* save control word */
! asm ("fldcw %0;" : : "m" ((saved_cw & ~FE_ROUNDING_MASK)
! | FE_TOWARDZERO));
asm ("frndint;" : "=t" (int_part) : "0" (value)); /* round */
asm ("fldcw %0;" : : "m" (saved_cw)); /* restore saved cw */
--- 10,18 ----
long double int_part;
unsigned short saved_cw;
+ unsigned short tmp_cw;
/* truncate */
asm ("fnstcw %0;" : "=m" (saved_cw)); /* save control word */
! tmp_cw = (saved_cw & ~FE_ROUNDING_MASK) | FE_TOWARDZERO;
! asm ("fldcw %0;" : : "m" (tmp_cw));
asm ("frndint;" : "=t" (int_part) : "0" (value)); /* round */
asm ("fldcw %0;" : : "m" (saved_cw)); /* restore saved cw */
Index: tgamma.c
===================================================================
RCS file: /cvsroot/mingw/runtime/mingwex/math/tgamma.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** tgamma.c 20 Dec 2002 13:35:27 -0000 1.1
--- tgamma.c 15 Sep 2003 14:18:36 -0000 1.2
***************
*** 347,351 ****
{
if( x > -1.E-9 )
! goto small;
z /= x;
x += 1.0;
--- 347,351 ----
{
if( x > -1.E-9 )
! goto Small;
z /= x;
x += 1.0;
***************
*** 355,359 ****
{
if( x < 1.e-9 )
! goto small;
z /= x;
x += 1.0;
--- 355,359 ----
{
if( x < 1.e-9 )
! goto Small;
z /= x;
x += 1.0;
***************
*** 368,372 ****
return( z * p / q );
! small:
if( x == 0.0 )
{
--- 368,372 ----
return( z * p / q );
! Small:
if( x == 0.0 )
{
Index: tgammaf.c
===================================================================
RCS file: /cvsroot/mingw/runtime/mingwex/math/tgammaf.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** tgammaf.c 20 Dec 2002 13:35:27 -0000 1.1
--- tgammaf.c 15 Sep 2003 14:18:36 -0000 1.2
***************
*** 215,219 ****
{
if( x > -1.E-4 )
! goto small;
z *=x;
x += 1.0;
--- 215,219 ----
{
if( x > -1.E-4 )
! goto Small;
z *=x;
x += 1.0;
***************
*** 223,227 ****
{
if( x < 1.e-4 )
! goto small;
z *=x;
x += 1.0;
--- 223,227 ----
{
if( x < 1.e-4 )
! goto Small;
z *=x;
x += 1.0;
***************
*** 245,249 ****
return(p);
! small:
if( x == 0.0 )
{
--- 245,249 ----
return(p);
! Small:
if( x == 0.0 )
{
Index: tgammal.c
===================================================================
RCS file: /cvsroot/mingw/runtime/mingwex/math/tgammal.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** tgammal.c 3 May 2003 13:48:47 -0000 1.2
--- tgammal.c 15 Sep 2003 14:18:36 -0000 1.3
***************
*** 457,461 ****
if( x <= 0.03125L )
! goto small;
while( x < 2.0L )
--- 457,461 ----
if( x <= 0.03125L )
! goto Small;
while( x < 2.0L )
***************
*** 473,477 ****
return( z * p / q );
! small:
if( x == 0.0L )
{
--- 473,477 ----
return( z * p / q );
! Small:
if( x == 0.0L )
{
Index: trunc.c
===================================================================
RCS file: /cvsroot/mingw/runtime/mingwex/math/trunc.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** trunc.c 12 Aug 2002 13:06:40 -0000 1.1
--- trunc.c 15 Sep 2003 14:18:36 -0000 1.2
***************
*** 6,15 ****
double retval;
unsigned short saved_cw;
! __asm__ ("fnstcw %0;": "=m" (saved_cw)); /* save FPU control word */
! __asm__ ("fldcw %0;"
! :
! : "m" ((saved_cw & ~(FE_TONEAREST | FE_DOWNWARD | FE_UPWARD
! | FE_TOWARDZERO)) | FE_TOWARDZERO)
! );
__asm__ ("frndint;" : "=t" (retval) : "0" (_x)); /* round towards zero */
__asm__ ("fldcw %0;" : : "m" (saved_cw) ); /* restore saved control word */
--- 6,14 ----
double retval;
unsigned short saved_cw;
! unsigned short tmp_cw;
! __asm__ ("fnstcw %0;" : "=m" (saved_cw)); /* save FPU control word */
! tmp_cw = (saved_cw & ~(FE_TONEAREST | FE_DOWNWARD | FE_UPWARD | FE_TOWARDZERO))
! | FE_TOWARDZERO;
! __asm__ ("fldcw %0;" : : "m" (tmp_cw));
__asm__ ("frndint;" : "=t" (retval) : "0" (_x)); /* round towards zero */
__asm__ ("fldcw %0;" : : "m" (saved_cw) ); /* restore saved control word */
Index: truncf.c
===================================================================
RCS file: /cvsroot/mingw/runtime/mingwex/math/truncf.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** truncf.c 12 Aug 2002 13:06:40 -0000 1.1
--- truncf.c 15 Sep 2003 14:18:36 -0000 1.2
***************
*** 3,15 ****
float
! truncf (float _x){
float retval;
unsigned short saved_cw;
! __asm__ ("fnstcw %0;": "=m" (saved_cw)); /* save FPU control word */
! __asm__ ("fldcw %0;"
! :
! : "m" ((saved_cw & ~(FE_TONEAREST | FE_DOWNWARD | FE_UPWARD
! | FE_TOWARDZERO)) | FE_TOWARDZERO)
! );
__asm__ ("frndint;" : "=t" (retval) : "0" (_x)); /* round towards zero */
__asm__ ("fldcw %0;" : : "m" (saved_cw) ); /* restore saved control word */
--- 3,15 ----
float
! truncf (float _x)
! {
float retval;
unsigned short saved_cw;
! unsigned short tmp_cw;
! __asm__ ("fnstcw %0;" : "=m" (saved_cw)); /* save FPU control word */
! tmp_cw = (saved_cw & ~(FE_TONEAREST | FE_DOWNWARD | FE_UPWARD | FE_TOWARDZERO))
! | FE_TOWARDZERO;
! __asm__ ("fldcw %0;" : : "m" (tmp_cw));
__asm__ ("frndint;" : "=t" (retval) : "0" (_x)); /* round towards zero */
__asm__ ("fldcw %0;" : : "m" (saved_cw) ); /* restore saved control word */
Index: truncl.c
===================================================================
RCS file: /cvsroot/mingw/runtime/mingwex/math/truncl.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** truncl.c 12 Aug 2002 13:06:40 -0000 1.1
--- truncl.c 15 Sep 2003 14:18:36 -0000 1.2
***************
*** 6,15 ****
long double retval;
unsigned short saved_cw;
! __asm__ ("fnstcw %0;": "=m" (saved_cw)); /* save FPU control word */
! __asm__ ("fldcw %0;"
! :
! : "m" ((saved_cw & ~(FE_TONEAREST | FE_DOWNWARD | FE_UPWARD
! | FE_TOWARDZERO)) | FE_TOWARDZERO)
! );
__asm__ ("frndint;" : "=t" (retval) : "0" (_x)); /* round towards zero */
__asm__ ("fldcw %0;" : : "m" (saved_cw) ); /* restore saved control word */
--- 6,14 ----
long double retval;
unsigned short saved_cw;
! unsigned short tmp_cw;
! __asm__ ("fnstcw %0;" : "=m" (saved_cw)); /* save FPU control word */
! tmp_cw = (saved_cw & ~(FE_TONEAREST | FE_DOWNWARD | FE_UPWARD | FE_TOWARDZERO))
! | FE_TOWARDZERO;
! __asm__ ("fldcw %0;" : : "m" (tmp_cw));
__asm__ ("frndint;" : "=t" (retval) : "0" (_x)); /* round towards zero */
__asm__ ("fldcw %0;" : : "m" (saved_cw) ); /* restore saved control word */
|
|
From: <ea...@us...> - 2003-09-15 14:18:40
|
Update of /cvsroot/mingw/runtime/include
In directory sc8-pr-cvs1:/tmp/cvs-serv7574/include
Modified Files:
_mingw.h dirent.h math.h process.h stdio.h stdlib.h
Log Message:
Merge winsup changes
Index: _mingw.h
===================================================================
RCS file: /cvsroot/mingw/runtime/include/_mingw.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** _mingw.h 7 May 2003 03:48:43 -0000 1.16
--- _mingw.h 15 Sep 2003 14:18:35 -0000 1.17
***************
*** 81,86 ****
# define __stdcall __attribute__((stdcall))
# endif
! # undef __int64
! # define __int64 long long
#endif /* __GNUC__ */
--- 81,102 ----
# define __stdcall __attribute__((stdcall))
# endif
! # ifndef __int64
! # define __int64 long long
! # endif
! # ifndef __int32
! # define __int32 long
! # endif
! # ifndef __int16
! # define __int16 int
! # endif
! # ifndef __int8
! # define __int8 char
! # endif
! # ifndef __small
! # define __small char
! # endif
! # ifndef __hyper
! # define __hyper long long
! # endif
#endif /* __GNUC__ */
Index: dirent.h
===================================================================
RCS file: /cvsroot/mingw/runtime/include/dirent.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** dirent.h 21 Feb 2003 21:19:51 -0000 1.5
--- dirent.h 15 Sep 2003 14:18:35 -0000 1.6
***************
*** 43,49 ****
unsigned short d_reclen; /* Always zero. */
unsigned short d_namlen; /* Length of name in d_name. */
! char* d_name; /* File name. */
! /* NOTE: The name in the dirent structure points to the name in the
! * finddata_t structure in the DIR. */
};
--- 43,47 ----
unsigned short d_reclen; /* Always zero. */
unsigned short d_namlen; /* Length of name in d_name. */
! char d_name[FILENAME_MAX]; /* File name. */
};
***************
*** 93,97 ****
unsigned short d_reclen; /* Always zero. */
unsigned short d_namlen; /* Length of name in d_name. */
! wchar_t* d_name; /* File name. */
/* NOTE: The name in the dirent structure points to the name in the * wfinddata_t structure in the _WDIR. */
};
--- 91,95 ----
unsigned short d_reclen; /* Always zero. */
unsigned short d_namlen; /* Length of name in d_name. */
! wchar_t d_name[FILENAME_MAX]; /* File name. */
/* NOTE: The name in the dirent structure points to the name in the * wfinddata_t structure in the _WDIR. */
};
Index: math.h
===================================================================
RCS file: /cvsroot/mingw/runtime/include/math.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** math.h 21 Feb 2003 21:19:51 -0000 1.14
--- math.h 15 Sep 2003 14:18:35 -0000 1.15
***************
*** 168,179 ****
_CRTIMP double __cdecl floor (double);
_CRTIMP double __cdecl fabs (double);
- #if !defined (__NO_INLINES__)
- extern __inline__ __cdecl double fabs (double x)
- {
- double res;
- __asm__ ("fabs;" : "=t" (res) : "0" (x));
- return res;
- }
- #endif
_CRTIMP double __cdecl ldexp (double, int);
_CRTIMP double __cdecl frexp (double, int*);
--- 168,171 ----
***************
*** 495,511 ****
/* 7.12.7.2 The fabs functions: Double in C89 */
! extern __inline__ float __cdecl fabsf (float x)
! {
! float res;
! __asm__ ("fabs;" : "=t" (res) : "0" (x));
! return res;
! }
!
! extern __inline__ long double __cdecl fabsl (long double x)
! {
! long double res;
! __asm__ ("fabs;" : "=t" (res) : "0" (x));
! return res;
! }
/* 7.12.7.3 */
--- 487,492 ----
/* 7.12.7.2 The fabs functions: Double in C89 */
! extern float __cdecl fabsf (float x);
! extern long double __cdecl fabsl (long double x);
/* 7.12.7.3 */
Index: process.h
===================================================================
RCS file: /cvsroot/mingw/runtime/include/process.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** process.h 21 Feb 2003 21:19:52 -0000 1.4
--- process.h 15 Sep 2003 14:18:35 -0000 1.5
***************
*** 82,92 ****
_CRTIMP int __cdecl _execl (const char*, const char*, ...);
! _CRTIMP int __cdecl _execle (const char*, const char*, ...);
_CRTIMP int __cdecl _execlp (const char*, const char*, ...);
_CRTIMP int __cdecl _execlpe (const char*, const char*, ...);
! _CRTIMP int __cdecl _execv (const char*, char* const*);
! _CRTIMP int __cdecl _execve (const char*, char* const*, char* const*);
! _CRTIMP int __cdecl _execvp (const char*, char* const*);
! _CRTIMP int __cdecl _execvpe (const char*, char* const*, char* const*);
_CRTIMP int __cdecl _spawnl (int, const char*, const char*, ...);
--- 82,92 ----
_CRTIMP int __cdecl _execl (const char*, const char*, ...);
! _CRTIMP int __cdecl _execle (const char*, const char*, ...);
_CRTIMP int __cdecl _execlp (const char*, const char*, ...);
_CRTIMP int __cdecl _execlpe (const char*, const char*, ...);
! _CRTIMP int __cdecl _execv (const char*, const char* const*);
! _CRTIMP int __cdecl _execve (const char*, const char* const*, const char* const*);
! _CRTIMP int __cdecl _execvp (const char*, const char* const*);
! _CRTIMP int __cdecl _execvpe (const char*, const char* const*, const char* const*);
_CRTIMP int __cdecl _spawnl (int, const char*, const char*, ...);
***************
*** 94,101 ****
_CRTIMP int __cdecl _spawnlp (int, const char*, const char*, ...);
_CRTIMP int __cdecl _spawnlpe (int, const char*, const char*, ...);
! _CRTIMP int __cdecl _spawnv (int, const char*, char* const*);
! _CRTIMP int __cdecl _spawnve (int, const char*, char* const*, char* const*);
! _CRTIMP int __cdecl _spawnvp (int, const char*, char* const*);
! _CRTIMP int __cdecl _spawnvpe (int, const char*, char* const*, char* const*);
/*
--- 94,102 ----
_CRTIMP int __cdecl _spawnlp (int, const char*, const char*, ...);
_CRTIMP int __cdecl _spawnlpe (int, const char*, const char*, ...);
! _CRTIMP int __cdecl _spawnv (int, const char*, const char* const*);
! _CRTIMP int __cdecl _spawnve (int, const char*, const char* const*, const char* const*);
! _CRTIMP int __cdecl _spawnvp (int, const char*, const char* const*);
! _CRTIMP int __cdecl _spawnvpe (int, const char*, const char* const*, const char* const*);
!
/*
***************
*** 133,148 ****
_CRTIMP int __cdecl execlp (const char*, const char*, ...);
_CRTIMP int __cdecl execlpe (const char*, const char*, ...);
! _CRTIMP int __cdecl execv (const char*, char* const*);
! _CRTIMP int __cdecl execve (const char*, char* const*, char* const*);
! _CRTIMP int __cdecl execvp (const char*, char* const*);
! _CRTIMP int __cdecl execvpe (const char*, char* const*, char* const*);
_CRTIMP int __cdecl spawnl (int, const char*, const char*, ...);
_CRTIMP int __cdecl spawnle (int, const char*, const char*, ...);
_CRTIMP int __cdecl spawnlp (int, const char*, const char*, ...);
_CRTIMP int __cdecl spawnlpe (int, const char*, const char*, ...);
! _CRTIMP int __cdecl spawnv (int, const char*, char* const*);
! _CRTIMP int __cdecl spawnve (int, const char*, char* const*, char* const*);
! _CRTIMP int __cdecl spawnvp (int, const char*, char* const*);
! _CRTIMP int __cdecl spawnvpe (int, const char*, char* const*, char* const*);
#endif /* Not _NO_OLDNAMES */
--- 134,149 ----
_CRTIMP int __cdecl execlp (const char*, const char*, ...);
_CRTIMP int __cdecl execlpe (const char*, const char*, ...);
! _CRTIMP int __cdecl execv (const char*, const char* const*);
! _CRTIMP int __cdecl execve (const char*, const char* const*, const char* const*);
! _CRTIMP int __cdecl execvp (const char*, const char* const*);
! _CRTIMP int __cdecl execvpe (const char*, const char* const*, const char* const*);
_CRTIMP int __cdecl spawnl (int, const char*, const char*, ...);
_CRTIMP int __cdecl spawnle (int, const char*, const char*, ...);
_CRTIMP int __cdecl spawnlp (int, const char*, const char*, ...);
_CRTIMP int __cdecl spawnlpe (int, const char*, const char*, ...);
! _CRTIMP int __cdecl spawnv (int, const char*, const char* const*);
! _CRTIMP int __cdecl spawnve (int, const char*, const char* const*, const char* const*);
! _CRTIMP int __cdecl spawnvp (int, const char*, const char* const*);
! _CRTIMP int __cdecl spawnvpe (int, const char*, const char* const*, const char* const*);
#endif /* Not _NO_OLDNAMES */
Index: stdio.h
===================================================================
RCS file: /cvsroot/mingw/runtime/include/stdio.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** stdio.h 25 Mar 2003 10:55:21 -0000 1.13
--- stdio.h 15 Sep 2003 14:18:35 -0000 1.14
***************
*** 374,378 ****
_CRTIMP int __cdecl _putws (const wchar_t*);
_CRTIMP wint_t __cdecl putwchar (wint_t);
! _CRTIMP FILE* __cdecl _wfdopen(int, const wchar_t *);
_CRTIMP FILE* __cdecl _wfopen (const wchar_t*, const wchar_t*);
_CRTIMP FILE* __cdecl _wfreopen (const wchar_t*, const wchar_t*, FILE*);
--- 374,378 ----
_CRTIMP int __cdecl _putws (const wchar_t*);
_CRTIMP wint_t __cdecl putwchar (wint_t);
! _CRTIMP FILE* __cdecl _wfdopen(int, wchar_t *);
_CRTIMP FILE* __cdecl _wfopen (const wchar_t*, const wchar_t*);
_CRTIMP FILE* __cdecl _wfreopen (const wchar_t*, const wchar_t*, FILE*);
Index: stdlib.h
===================================================================
RCS file: /cvsroot/mingw/runtime/include/stdlib.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** stdlib.h 11 Mar 2003 15:34:27 -0000 1.17
--- stdlib.h 15 Sep 2003 14:18:35 -0000 1.18
***************
*** 370,374 ****
_CRTIMP void __cdecl exit (int) _ATTRIB_NORETURN;
! /* Note: This in startup code, not imported directly from dll */
int __cdecl atexit (void (*)(void));
--- 370,374 ----
_CRTIMP void __cdecl exit (int) _ATTRIB_NORETURN;
! /* Note: This is in startup code, not imported directly from dll */
int __cdecl atexit (void (*)(void));
***************
*** 376,379 ****
--- 376,380 ----
_CRTIMP char* __cdecl getenv (const char*);
+ /* bsearch and qsort are also in non-ANSI header search.h */
_CRTIMP void* __cdecl bsearch (const void*, const void*, size_t, size_t,
int (*)(const void*, const void*));
***************
*** 409,418 ****
_CRTIMP void __cdecl _exit (int) _ATTRIB_NORETURN;
! #if !defined __NO_ISOCEXT /* extern stub in static libmingwex.a */
! /* C99 function name */
! void __cdecl _Exit(int) _ATTRIB_NORETURN; /* Declare to get noreturn attribute. */
! extern __inline__ void __cdecl _Exit(int status)
! { _exit(status); }
! #endif
/* _onexit is MS extension. Use atexit for portability. */
/* Note: This is in startup code, not imported directly from dll */
--- 410,414 ----
_CRTIMP void __cdecl _exit (int) _ATTRIB_NORETURN;
!
/* _onexit is MS extension. Use atexit for portability. */
/* Note: This is in startup code, not imported directly from dll */
***************
*** 432,436 ****
_CRTIMP char* __cdecl _fullpath (char*, const char*, size_t);
-
_CRTIMP char* __cdecl _itoa (int, char*, int);
_CRTIMP char* __cdecl _ltoa (long, char*, int);
--- 428,431 ----
***************
*** 481,484 ****
--- 476,486 ----
#if !defined __NO_ISOCEXT /* externs in static libmingwex.a */
+
+ /* C99 name for _exit */
+ void __cdecl _Exit(int) _ATTRIB_NORETURN;
+ #ifndef __STRICT_ANSI__ /* inline using non-ansi functions */
+ extern __inline__ void __cdecl _Exit(int status)
+ { _exit(status); }
+ #endif
typedef struct { long long quot, rem; } lldiv_t;
|
Update of /cvsroot/mingw/runtime In directory sc8-pr-cvs1:/tmp/cvs-serv7574 Modified Files: ChangeLog Makefile.in config.guess config.sub moldname.def.in msvcrt.def.in test_headers.c Log Message: Merge winsup changes Index: ChangeLog =================================================================== RCS file: /cvsroot/mingw/runtime/ChangeLog,v retrieving revision 1.54 retrieving revision 1.55 diff -C2 -d -r1.54 -r1.55 *** ChangeLog 7 May 2003 03:48:43 -0000 1.54 --- ChangeLog 15 Sep 2003 14:18:35 -0000 1.55 *************** *** 1,2 **** --- 1,84 ---- + 2003-07-03 Earnie Boyd <ea...@us...> + + * config.guess, config.sub: Update with versions from ftp.gnu.org. + + 2003-07-03 Danny Smith <dan...@us...> + + * mingwex/math/trunc.c (trunc): Provide lvalue for memory input constraint. + * mingwex/math/truncf.c (truncf): Likewise. + * mingwex/math/truncl.c (truncl): Likewise. + * mingwex/math/modff.c (modff): Likewise. + * mingwex/math/modfl.c (modfl): Likewise. + + 2003-07-03 Danny Smith <dan...@us...> + + * include/search.h: New file. + * include/stdlib.h: Add comment about qsort, bsearch in + search.h. + * test_headers.c: Include search.h. + * moldname.def.in (lfind, lsearch): Add. + + 2003-07-03 Danny Smith <dan...@us...> + + * include/process.h (_execv, _execvp, _spawnv, _spawnvp, _execve, + _execvpe, _spawnve, _spawnvpe, execv, execvp, spawnv, spawnvp, + execve, execvpe, spawnve, spawnvpe): Const-ify all the char params. + + 2003-07-01 Earnie Boyd <ea...@us...> + + * include/_mingw.h (small, hyper): Change to __small and __hyper to + avoid user space name conflicts. + + 2003-07-01 Earnie Boyd <ea...@us...> + + * include/_mingw.h (__int32, __int16, __int8, small, hyper): Define. + Note: Also added to w32api/include/basetyps.h. + * mingwex/math/tgamma.c, tgammaf.c, tgammal.c (small): + Rename to Small (case difference). + + 2003-06-18 Earnie Boyd <ea...@us...> + + * include/dirent.h (dirent): Make d_name and array instead of a pointer. + * mingwex/dirent.c: Modifications througout to fill d_name array. + * Makefile.in (LIBS): Add new MSVCRT libraries libmsvcr70 and + libmsvcr71, including debug versions. + (msvcr70.def, msvcr70d.def, msvcr71.def, msvcr71.def): New targets. + + 2003-06-17 Danny Smith <dan...@us...> + + * msvcrt.def.in (__badioinfo, __lc_codepage, __lc_handle, + __pioinfo, __setlc_active, _unguarded_readlc_active, _dstbias): + Mark as DATA. + Thanks to: Aaron W LaFramboise <AWL...@ao...> + + 2003-05-30 Sascha Sommer <sas...@fr...> + + * include/sys/types.h (_ssize_t, ssize_t): Add typedefs. + + 2003-05-15 Danny Smith <dan...@us...> + + * include/stdlib.h (_Exit): Move out of __STRICT_ANSI__ block, + but still protect inline definition with __STRICT_ANSI__. + + 2003-05-14 Danny Smith <dan...@us...> + + * string_old.c: Remove, splitting into... + * strcasecmp.c: New file. + * strncasecmp.c: New file. + * wscmpi.c : New file. + * ctype_old.c: Remove, splitting into... + * isascii.c: New file. + * iscsym.c: New file. + * iscsymf.c: New file. + * toascii.c: New file. + * Makefile.in (MOLD_OBJS): Adjust. + (SRCDIST_FILES): Adjust. + + 2003-05-13 Danny Smith <dan...@us...> + + * include/math.h (fabs) : Remove inline definition. + (fabsf): Likewise. + (fabsl): Likewise. + 2003-05-06 Earnie Boyd <ea...@us...> Index: Makefile.in =================================================================== RCS file: /cvsroot/mingw/runtime/Makefile.in,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** Makefile.in 7 May 2003 03:48:43 -0000 1.23 --- Makefile.in 15 Sep 2003 14:18:35 -0000 1.24 *************** *** 154,161 **** main.o crtst.o mthr_stub.o CRT_fp10.o txtmode.o \ pseudo-reloc.o pseudo-reloc-list.o - MOLD_OBJS = ctype_old.o string_old.o ! LIBS = libcrtdll.a libmsvcrt.a libmsvcrtd.a libmingw32.a \ ! libcoldname.a libmoldname.a libmoldnamed.a $(LIBM_A) libmingwthrd.a DLLS = $(THREAD_DLL_NAME) --- 154,170 ---- main.o crtst.o mthr_stub.o CRT_fp10.o txtmode.o \ pseudo-reloc.o pseudo-reloc-list.o ! MOLD_OBJS = isascii.o iscsym.o iscsymf.o toascii.o \ ! strcasecmp.o strncasecmp.o wcscmpi.o ! ! LIBS = libcrtdll.a \ ! libmsvcrt.a libmsvcrtd.a \ ! libmsvcr70.a libmsvcr70d.a \ ! libmsvcr71.a libmsvcr71d.a \ ! libmingw32.a \ ! libcoldname.a \ ! libmoldname.a libmoldnamed.a \ ! $(LIBM_A) \ ! libmingwthrd.a DLLS = $(THREAD_DLL_NAME) *************** *** 163,170 **** SRCDIST_FILES = CRT_noglob.c CRTfmode.c CRTglob.c CRTinit.c ChangeLog \ Makefile.in README TODO config.guess config.sub configure configure.in \ ! crt1.c crtdll.def crtmt.c crtst.c ctype_old.c dllcrt1.c dllmain.c \ gccmain.c init.c install-sh jamfile main.c mkinstalldirs \ moldname.def.in msvcrt.def.in \ ! mthr.c mthr_init.c mthr_stub.c readme.txt string_old.c \ CRT_fp8.c CRT_fp10.c test_headers.c txtmode.c binmode.c pseudo-reloc.c \ pseudo-reloc-list.c --- 172,181 ---- SRCDIST_FILES = CRT_noglob.c CRTfmode.c CRTglob.c CRTinit.c ChangeLog \ Makefile.in README TODO config.guess config.sub configure configure.in \ ! crt1.c crtdll.def crtmt.c crtst.c dllcrt1.c dllmain.c \ gccmain.c init.c install-sh jamfile main.c mkinstalldirs \ moldname.def.in msvcrt.def.in \ ! mthr.c mthr_init.c mthr_stub.c readme.txt \ ! isascii.c iscsym.c iscsymf.c toascii.c \ ! strcasecmp.c strncasecmp.c wcscmpi.c \ CRT_fp8.c CRT_fp10.c test_headers.c txtmode.c binmode.c pseudo-reloc.c \ pseudo-reloc-list.c *************** *** 231,235 **** $(RANLIB) $@ ! msvcrt.def msvcrtd.def: msvcrt.def.in $(CC) -DRUNTIME=$(basename $(notdir $@)) \ -D__FILENAME__=$@ \ --- 242,249 ---- $(RANLIB) $@ ! msvcrt.def msvcrtd.def \ ! msvcr70.def msvcr70d.def \ ! msvcr71.def msvcr71d.def \ ! : msvcrt.def.in $(CC) -DRUNTIME=$(basename $(notdir $@)) \ -D__FILENAME__=$@ \ Index: config.guess =================================================================== RCS file: /cvsroot/mingw/runtime/config.guess,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** config.guess 4 Jun 2001 23:26:01 -0000 1.1.1.1 --- config.guess 15 Sep 2003 14:18:35 -0000 1.2 *************** *** 1,8 **** #! /bin/sh # Attempt to guess a canonical system name. ! # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000 ! # Free Software Foundation, Inc. ! version='2000-11-16' # This file is free software; you can redistribute it and/or modify it --- 1,8 ---- #! /bin/sh [...1683 lines suppressed...] uname -m = `(uname -m) 2>/dev/null || echo unknown` --- 1375,1379 ---- information to handle your system. ! config.guess timestamp = $timestamp uname -m = `(uname -m) 2>/dev/null || echo unknown` *************** *** 1337,1341 **** # Local variables: # eval: (add-hook 'write-file-hooks 'time-stamp) ! # time-stamp-start: "version='" # time-stamp-format: "%:y-%02m-%02d" # time-stamp-end: "'" --- 1402,1406 ---- # Local variables: # eval: (add-hook 'write-file-hooks 'time-stamp) ! # time-stamp-start: "timestamp='" # time-stamp-format: "%:y-%02m-%02d" # time-stamp-end: "'" Index: config.sub =================================================================== RCS file: /cvsroot/mingw/runtime/config.sub,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** config.sub 4 Jun 2001 23:26:01 -0000 1.1.1.1 --- config.sub 15 Sep 2003 14:18:35 -0000 1.2 *************** *** 1,8 **** #! /bin/sh ! # Configuration validation subroutine script, version 1.1. ! # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000 ! # Free Software Foundation, Inc. ! version='2000-11-15' # This file is (in principle) common to ALL GNU software. --- 1,8 ---- #! /bin/sh [...994 lines suppressed...] vendor=atari ;; + -vos*) + vendor=stratus + ;; esac basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"` *************** *** 1327,1331 **** # Local variables: # eval: (add-hook 'write-file-hooks 'time-stamp) ! # time-stamp-start: "version='" # time-stamp-format: "%:y-%02m-%02d" # time-stamp-end: "'" --- 1499,1503 ---- # Local variables: # eval: (add-hook 'write-file-hooks 'time-stamp) ! # time-stamp-start: "timestamp='" # time-stamp-format: "%:y-%02m-%02d" # time-stamp-end: "'" Index: moldname.def.in =================================================================== RCS file: /cvsroot/mingw/runtime/moldname.def.in,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** moldname.def.in 12 Aug 2002 13:06:35 -0000 1.4 --- moldname.def.in 15 Sep 2003 14:18:35 -0000 1.5 *************** *** 70,73 **** --- 70,75 ---- itoa kbhit + lfind + lsearch lseek ltoa Index: msvcrt.def.in =================================================================== RCS file: /cvsroot/mingw/runtime/msvcrt.def.in,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** msvcrt.def.in 21 Feb 2003 21:19:50 -0000 1.1 --- msvcrt.def.in 15 Sep 2003 14:18:35 -0000 1.2 *************** *** 63,67 **** __argc DATA __argv DATA ! __badioinfo __crtCompareStringA __crtGetLocaleInfoW --- 63,67 ---- __argc DATA __argv DATA ! __badioinfo DATA __crtCompareStringA __crtGetLocaleInfoW *************** *** 75,80 **** __iscsym __iscsymf ! __lc_codepage ! __lc_handle __lconv_init __mb_cur_max DATA --- 75,80 ---- __iscsym __iscsymf ! __lc_codepage DATA ! __lc_handle DATA __lconv_init __mb_cur_max DATA *************** *** 107,114 **** __p__winver __p__wpgmptr ! __pioinfo __pxcptinfoptrs __set_app_type ! __setlc_active __setusermatherr __threadhandle --- 107,114 ---- __p__winver __p__wpgmptr ! __pioinfo DATA __pxcptinfoptrs __set_app_type ! __setlc_active DATA __setusermatherr __threadhandle *************** *** 116,120 **** __toascii __unDName ! __unguarded_readlc_active __wargv DATA __wgetmainargs --- 116,120 ---- __toascii __unDName ! __unguarded_readlc_active DATA __wargv DATA __wgetmainargs *************** *** 170,174 **** _cwait _daylight DATA ! _dstbias _dup _dup2 --- 170,174 ---- _cwait _daylight DATA ! _dstbias DATA _dup _dup2 Index: test_headers.c =================================================================== RCS file: /cvsroot/mingw/runtime/test_headers.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** test_headers.c 30 Aug 2002 14:47:59 -0000 1.2 --- test_headers.c 15 Sep 2003 14:18:35 -0000 1.3 *************** *** 23,26 **** --- 23,27 ---- #include <memory.h> #include <process.h> + #include <search.h> #include <setjmp.h> #include <share.h> |
|
From: <ea...@us...> - 2003-09-15 14:18:40
|
Update of /cvsroot/mingw/runtime/include/sys In directory sc8-pr-cvs1:/tmp/cvs-serv7574/include/sys Modified Files: types.h Log Message: Merge winsup changes Index: types.h =================================================================== RCS file: /cvsroot/mingw/runtime/include/sys/types.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** types.h 29 Nov 2001 04:26:33 -0000 1.3 --- types.h 15 Sep 2003 14:18:35 -0000 1.4 *************** *** 112,115 **** --- 112,124 ---- #endif /* Not _SIGSET_T_ */ + #ifndef _SSIZE_T_ + #define _SSIZE_T_ + typedef long _ssize_t; + + #ifndef _NO_OLDNAMES + typedef _ssize_t ssize_t; + #endif + #endif /* Not _SSIZE_T_ */ + #endif /* Not __STRICT_ANSI__ */ |
|
From: <ea...@us...> - 2003-09-15 14:18:40
|
Update of /cvsroot/mingw/runtime/mingwex
In directory sc8-pr-cvs1:/tmp/cvs-serv7574/mingwex
Modified Files:
dirent.c
Log Message:
Merge winsup changes
Index: dirent.c
===================================================================
RCS file: /cvsroot/mingw/runtime/mingwex/dirent.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** dirent.c 3 May 2003 13:48:47 -0000 1.2
--- dirent.c 15 Sep 2003 14:18:35 -0000 1.3
***************
*** 114,118 ****
nd->dd_dir.d_reclen = 0;
nd->dd_dir.d_namlen = 0;
! nd->dd_dir.d_name = nd->dd_dta.name;
return nd;
--- 114,118 ----
nd->dd_dir.d_reclen = 0;
nd->dd_dir.d_namlen = 0;
! memset (nd->dd_dir.d_name, 0, FILENAME_MAX);
return nd;
***************
*** 138,148 ****
}
- if (dirp->dd_dir.d_name != dirp->dd_dta.name)
- {
- /* The structure does not seem to be set up correctly. */
- errno = EINVAL;
- return (struct _tdirent *) 0;
- }
-
if (dirp->dd_stat < 0)
{
--- 138,141 ----
***************
*** 191,195 ****
* already appropriately filled in except the length of the
* file name. */
! dirp->dd_dir.d_namlen = _tcslen (dirp->dd_dir.d_name);
return &dirp->dd_dir;
}
--- 184,189 ----
* already appropriately filled in except the length of the
* file name. */
! dirp->dd_dir.d_namlen = _tcslen (dirp->dd_dta.name);
! _tcscpy (dirp->dd_dir.d_name, dirp->dd_dta.name);
return &dirp->dd_dir;
}
|
Update of /cvsroot/mingw/w32api/include
In directory sc8-pr-cvs1:/tmp/cvs-serv18099/include
Added Files:
mgmtapi.h ntldap.h powrprof.h servprov.h snmp.h vfw.h
winable.h winber.h winldap.h winsnmp.h
Log Message:
Merge winsup changes
--- NEW FILE: mgmtapi.h ---
/*
mgmtapi.h - Header file for the SNMP Management API
Written by Filip Navara <xn...@vo...>
References (2003-08-25):
http://msdn.microsoft.com/library/en-us/snmp/snmp/snmp_reference.asp
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.
*/
#ifndef _MGMTAPI_H
#define _MGMTAPI_H
#if __GNUC__ >= 3
#pragma GCC system_header
#endif
#ifndef _SNMP_H
#include <snmp.h>
#endif
#ifdef __cplusplus
extern "C" {
#endif
#define SNMP_MGMTAPI_TIMEOUT 40
#define SNMP_MGMTAPI_SELECT_FDERRORS 41
#define SNMP_MGMTAPI_TRAP_ERRORS 42
#define SNMP_MGMTAPI_TRAP_DUPINIT 43
#define SNMP_MGMTAPI_NOTRAPS 44
#define SNMP_MGMTAPI_AGAIN 45
#define SNMP_MGMTAPI_INVALID_CTL 46
#define SNMP_MGMTAPI_INVALID_SESSION 47
#define SNMP_MGMTAPI_INVALID_BUFFER 48
#define MGMCTL_SETAGENTPORT 1
#ifndef RC_INVOKED
typedef PVOID LPSNMP_MGR_SESSION;
BOOL WINSNMPAPI SnmpMgrClose(LPSNMP_MGR_SESSION);
BOOL WINSNMPAPI SnmpMgrCtl(LPSNMP_MGR_SESSION,DWORD,LPVOID,DWORD,LPVOID,DWORD,LPDWORD);
BOOL WINSNMPAPI SnmpMgrGetTrap(AsnObjectIdentifier*,AsnNetworkAddress*,AsnInteger*,AsnInteger*,AsnTimeticks*,SnmpVarBindList*);
BOOL WINSNMPAPI SnmpMgrGetTrapEx(AsnObjectIdentifier*,AsnNetworkAddress*,AsnNetworkAddress*,AsnInteger*,AsnInteger*,AsnOctetString*,AsnTimeticks*,SnmpVarBindList*);
BOOL WINSNMPAPI SnmpMgrOidToStr(AsnObjectIdentifier*,LPSTR*);
LPSNMP_MGR_SESSION WINSNMPAPI SnmpMgrOpen(LPSTR,LPSTR,INT,INT);
INT WINSNMPAPI SnmpMgrRequest(LPSNMP_MGR_SESSION,BYTE,SnmpVarBindList*,AsnInteger*,AsnInteger*);
BOOL WINSNMPAPI SnmpMgrStrToOid(LPSTR,AsnObjectIdentifier*);
BOOL WINSNMPAPI SnmpMgrTrapListen(HANDLE*);
#endif /* RC_INVOKED */
#ifdef __cplusplus
}
#endif
#endif
--- NEW FILE: ntldap.h ---
/*
ntldap.h - Header file for the Windows LDAP API Extensions
Written by Filip Navara <xn...@vo...>
References:
Lightweight Directory Access Protocol Reference
http://msdn.microsoft.com/library/en-us/netdir/ldap/ldap_reference.asp
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.
*/
#ifndef _NTLDAP_H
#define _NTLDAP_H
#if __GNUC__ >= 3
#pragma GCC system_header
#endif
#define LDAP_SERVER_ASQ_OID "1.2.840.113556.1.4.1504"
#define LDAP_SERVER_ASQ_OID_W L"1.2.840.113556.1.4.1504"
#define LDAP_SERVER_DIRSYNC_OID "1.2.840.113556.1.4.841"
#define LDAP_SERVER_DIRSYNC_OID_W L"1.2.840.113556.1.4.841"
#define LDAP_SERVER_SD_FLAGS_OID "1.2.840.113556.1.4.801"
#define LDAP_SERVER_SD_FLAGS_OID_W L"1.2.840.113556.1.4.801"
#define LDAP_SERVER_FAST_BIND_OID "1.2.840.113556.1.4.1781"
#define LDAP_SERVER_FAST_BIND_OID_W L"1.2.840.113556.1.4.1781"
#define LDAP_MATCHING_RULE_BIT_OR "1.2.840.113556.1.4.804"
#define LDAP_MATCHING_RULE_BIT_OR_W L"1.2.840.113556.1.4.804"
#define LDAP_MATCHING_RULE_BIT_AND "1.2.840.113556.1.4.803"
#define LDAP_MATCHING_RULE_BIT_AND_W L"1.2.840.113556.1.4.803"
#define LDAP_SERVER_EXTENDED_DN_OID "1.2.840.113556.1.4.529"
#define LDAP_SERVER_EXTENDED_DN_OID_W L"1.2.840.113556.1.4.529"
#define LDAP_SERVER_LAZY_COMMIT_OID "1.2.840.113556.1.4.619"
#define LDAP_SERVER_LAZY_COMMIT_OID_W L"1.2.840.113556.1.4.619"
#define LDAP_SERVER_TREE_DELETE_OID "1.2.840.113556.1.4.805"
#define LDAP_SERVER_TREE_DELETE_OID_W L"1.2.840.113556.1.4.805"
#define LDAP_SERVER_VERIFY_NAME_OID "1.2.840.113556.1.4.1338"
#define LDAP_SERVER_VERIFY_NAME_OID_W L"1.2.840.113556.1.4.1338"
#define LDAP_SERVER_SHOW_DELETED_OID "1.2.840.113556.1.4.417"
#define LDAP_SERVER_SHOW_DELETED_OID_W L"1.2.840.113556.1.4.417"
#define LDAP_SERVER_NOTIFICATION_OID "1.2.840.113556.1.4.528"
#define LDAP_SERVER_NOTIFICATION_OID_W L"1.2.840.113556.1.4.528"
#define LDAP_SERVER_DOMAIN_SCOPE_OID "1.2.840.113556.1.4.1339"
#define LDAP_SERVER_DOMAIN_SCOPE_OID_W L"1.2.840.113556.1.4.1339"
#define LDAP_CAP_ACTIVE_DIRECTORY_OID "1.2.840.113556.1.4.800"
#define LDAP_CAP_ACTIVE_DIRECTORY_OID_W L"1.2.840.113556.1.4.800"
#define LDAP_SERVER_SEARCH_OPTIONS_OID "1.2.840.113556.1.4.1340"
#define LDAP_SERVER_SEARCH_OPTIONS_OID_W L"1.2.840.113556.1.4.1340"
#define LDAP_CAP_ACTIVE_DIRECTORY_V51_OID "1.2.840.113556.1.4.1670"
#define LDAP_CAP_ACTIVE_DIRECTORY_V51_OID_W L"1.2.840.113556.1.4.1670"
#define LDAP_SERVER_PERMISSIVE_MODIFY_OID "1.2.840.113556.1.4.1413"
#define LDAP_SERVER_PERMISSIVE_MODIFY_OID_W L"1.2.840.113556.1.4.1413"
#define LDAP_SERVER_CROSSDOM_MOVE_TARGET_OID "1.2.840.113556.1.4.521"
#define LDAP_SERVER_CROSSDOM_MOVE_TARGET_OID_W L"1.2.840.113556.1.4.521"
#define SERVER_SEARCH_FLAG_DOMAIN_SCOPE 1
#define SERVER_SEARCH_FLAG_PHANTOM_ROOT 2
#endif /* _NTLDAP_H */
--- NEW FILE: powrprof.h ---
#ifndef _POWRPROF_H
#define _POWRPROF_H
#if __GNUC__ >= 3
#pragma GCC system_header
#endif
#ifdef __cplusplus
extern "C" {
#endif
#define EnableMultiBatteryDisplay 2
#define EnablePasswordLogon 4
#define EnableSysTrayBatteryMeter 1
#define EnableWakeOnRing 8
#define EnableVideoDimDisplay 16
#define NEWSCHEME (UINT)-1
#ifndef RC_INVOKED
#include <ntdef.h> /* for NTSTATUS */
typedef struct _GLOBAL_MACHINE_POWER_POLICY{
ULONG Revision;
SYSTEM_POWER_STATE LidOpenWakeAc;
SYSTEM_POWER_STATE LidOpenWakeDc;
ULONG BroadcastCapacityResolution;
} GLOBAL_MACHINE_POWER_POLICY, *PGLOBAL_MACHINE_POWER_POLICY;
typedef struct _GLOBAL_USER_POWER_POLICY{
ULONG Revision;
POWER_ACTION_POLICY PowerButtonAc;
POWER_ACTION_POLICY PowerButtonDc;
POWER_ACTION_POLICY SleepButtonAc;
POWER_ACTION_POLICY SleepButtonDc;
POWER_ACTION_POLICY LidCloseAc;
POWER_ACTION_POLICY LidCloseDc;
SYSTEM_POWER_LEVEL DischargePolicy[NUM_DISCHARGE_POLICIES];
ULONG GlobalFlags;
} GLOBAL_USER_POWER_POLICY, *PGLOBAL_USER_POWER_POLICY;
typedef struct _GLOBAL_POWER_POLICY{
GLOBAL_USER_POWER_POLICY user;
GLOBAL_MACHINE_POWER_POLICY mach;
} GLOBAL_POWER_POLICY, *PGLOBAL_POWER_POLICY;
typedef struct _MACHINE_POWER_POLICY{
ULONG Revision;
SYSTEM_POWER_STATE MinSleepAc;
SYSTEM_POWER_STATE MinSleepDc;
SYSTEM_POWER_STATE ReducedLatencySleepAc;
SYSTEM_POWER_STATE ReducedLatencySleepDc;
ULONG DozeTimeoutAc;
ULONG DozeTimeoutDc;
ULONG DozeS4TimeoutAc;
ULONG DozeS4TimeoutDc;
UCHAR MinThrottleAc;
UCHAR MinThrottleDc;
UCHAR pad1[2];
POWER_ACTION_POLICY OverThrottledAc;
POWER_ACTION_POLICY OverThrottledDc;
} MACHINE_POWER_POLICY, *PMACHINE_POWER_POLICY;
typedef struct _MACHINE_PROCESSOR_POWER_POLICY {
ULONG Revision;
PROCESSOR_POWER_POLICY ProcessorPolicyAc;
PROCESSOR_POWER_POLICY ProcessorPolicyDc;
} MACHINE_PROCESSOR_POWER_POLICY, *PMACHINE_PROCESSOR_POWER_POLICY;
typedef struct _USER_POWER_POLICY{
ULONG Revision;
POWER_ACTION_POLICY IdleAc;
POWER_ACTION_POLICY IdleDc;
ULONG IdleTimeoutAc;
ULONG IdleTimeoutDc;
UCHAR IdleSensitivityAc;
UCHAR IdleSensitivityDc;
UCHAR ThrottlePolicyAc;
UCHAR ThrottlePolicyDc;
SYSTEM_POWER_STATE MaxSleepAc;
SYSTEM_POWER_STATE MaxSleepDc;
ULONG Reserved[2];
ULONG VideoTimeoutAc;
ULONG VideoTimeoutDc;
ULONG SpindownTimeoutAc;
ULONG SpindownTimeoutDc;
BOOLEAN OptimizeForPowerAc;
BOOLEAN OptimizeForPowerDc;
UCHAR FanThrottleToleranceAc;
UCHAR FanThrottleToleranceDc;
UCHAR ForcedThrottleAc;
UCHAR ForcedThrottleDc;
} USER_POWER_POLICY, *PUSER_POWER_POLICY;
typedef struct _POWER_POLICY{
USER_POWER_POLICY user;
MACHINE_POWER_POLICY mach;
} POWER_POLICY, *PPOWER_POLICY;
typedef BOOLEAN (CALLBACK* PWRSCHEMESENUMPROC)(UINT, DWORD, LPTSTR, DWORD, LPTSTR, PPOWER_POLICY, LPARAM);
typedef BOOLEAN (CALLBACK* PFNNTINITIATEPWRACTION)(POWER_ACTION, SYSTEM_POWER_STATE, ULONG, BOOLEAN);
NTSTATUS WINAPI CallNtPowerInformation(POWER_INFORMATION_LEVEL, PVOID, ULONG, PVOID, ULONG);
BOOLEAN WINAPI CanUserWritePwrScheme(VOID);
BOOLEAN WINAPI DeletePwrScheme(UINT);
BOOLEAN WINAPI EnumPwrSchemes(PWRSCHEMESENUMPROC, LPARAM);
BOOLEAN WINAPI GetActivePwrScheme(PUINT);
BOOLEAN WINAPI GetCurrentPowerPolicies(PGLOBAL_POWER_POLICY, PPOWER_POLICY);
BOOLEAN WINAPI GetPwrCapabilities(PSYSTEM_POWER_CAPABILITIES);
BOOLEAN WINAPI GetPwrDiskSpindownRange(PUINT, PUINT);
BOOLEAN WINAPI IsAdminOverrideActive(PADMINISTRATOR_POWER_POLICY);
BOOLEAN WINAPI IsPwrHibernateAllowed(VOID);
BOOLEAN WINAPI IsPwrShutdownAllowed(VOID);
BOOLEAN WINAPI IsPwrSuspendAllowed(VOID);
BOOLEAN WINAPI ReadGlobalPwrPolicy(PGLOBAL_POWER_POLICY);
BOOLEAN WINAPI ReadProcessorPwrScheme(UINT, PMACHINE_PROCESSOR_POWER_POLICY);
BOOLEAN WINAPI ReadPwrScheme(UINT, PPOWER_POLICY);
BOOLEAN WINAPI SetActivePwrScheme(UINT, PGLOBAL_POWER_POLICY, PPOWER_POLICY);
BOOLEAN WINAPI SetSuspendState(BOOLEAN, BOOLEAN, BOOLEAN);
BOOLEAN WINAPI WriteGlobalPwrPolicy(PGLOBAL_POWER_POLICY);
BOOLEAN WINAPI WriteProcessorPwrScheme(UINT, PMACHINE_PROCESSOR_POWER_POLICY);
BOOLEAN WINAPI ValidatePowerPolicies(PGLOBAL_POWER_POLICY, PPOWER_POLICY);
BOOLEAN WINAPI WritePwrScheme(PUINT, LPTSTR, LPTSTR, PPOWER_POLICY);
#endif /* RC_INVOKED */
#ifdef __cplusplus
}
#endif
#endif /* _POWRPROF_H */
--- NEW FILE: servprov.h ---
#ifndef _SERVPROV_H
#define _SERVPROV_H
#define _OLEIDL_H
#if __GNUC__ >=3
#pragma GCC system_header
#endif
#ifdef __cplusplus
extern "C" {
#endif
EXTERN_C const IID IID_IServiceProvider;
#undef INTERFACE
#define INTERFACE IServiceProvider
DECLARE_INTERFACE_(IServiceProvider,IUnknown)
{
STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
STDMETHOD_(ULONG,AddRef)(THIS) PURE;
STDMETHOD_(ULONG,Release)(THIS) PURE;
STDMETHOD(QueryService)(THIS_ REFGUID,REFIID,void**) PURE;
};
#ifdef __cplusplus
}
#endif
#endif
--- NEW FILE: snmp.h ---
/*
snmp.h - Header file for the Windows SNMP API
Written by Filip Navara <xn...@vo...>
References (2003-08-25):
http://msdn.microsoft.com/library/en-us/snmp/snmp/snmp_reference.asp
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.
*/
#ifndef _SNMP_H
#define _SNMP_H
#if __GNUC__ >= 3
#pragma GCC system_header
#endif
#ifndef _WINDOWS_H
#include <windows.h>
#endif
#include <pshpack4.h>
#ifndef WINSNMPAPI
#define WINSNMPAPI WINAPI
#endif
#ifdef __cplusplus
extern "C" {
#endif
#define DEFAULT_SNMP_PORT_UDP 161
#define DEFAULT_SNMP_PORT_IPX 36879
#define DEFAULT_SNMPTRAP_PORT_UDP 162
#define DEFAULT_SNMPTRAP_PORT_IPX 36880
#ifndef _SNMP_ASN_DEFINED
#define _SNMP_ASN_DEFINED
#define ASN_UNIVERSAL 0x00
#define ASN_PRIMITIVE 0x00
#define ASN_CONSTRUCTOR 0x20
#define ASN_APPLICATION 0x40
#define ASN_CONTEXT 0x80
#define ASN_PRIVATE 0xC0
#define SNMP_PDU_GET (ASN_CONTEXT | ASN_CONSTRUCTOR | 0)
#define SNMP_PDU_GETNEXT (ASN_CONTEXT | ASN_CONSTRUCTOR | 1)
#define SNMP_PDU_RESPONSE (ASN_CONTEXT | ASN_CONSTRUCTOR | 2)
#define SNMP_PDU_SET (ASN_CONTEXT | ASN_CONSTRUCTOR | 3)
#define SNMP_PDU_GETBULK (ASN_CONTEXT | ASN_CONSTRUCTOR | 4)
#define SNMP_PDU_V1TRAP (ASN_CONTEXT | ASN_CONSTRUCTOR | 4)
#define SNMP_PDU_INFORM (ASN_CONTEXT | ASN_CONSTRUCTOR | 6)
#define SNMP_PDU_TRAP (ASN_CONTEXT | ASN_CONSTRUCTOR | 7)
#define SNMP_PDU_REPORT (ASN_CONTEXT | ASN_CONSTRUCTOR | 8)
#endif /* _SNMP_ASN_DEFINED */
#define ASN_INTEGER (ASN_UNIVERSAL | ASN_PRIMITIVE | 2)
#define ASN_BITS (ASN_UNIVERSAL | ASN_PRIMITIVE | 3)
#define ASN_OCTETSTRING (ASN_UNIVERSAL | ASN_PRIMITIVE | 4)
#define ASN_NULL (ASN_UNIVERSAL | ASN_PRIMITIVE | 5)
#define ASN_OBJECTIDENTIFIER (ASN_UNIVERSAL | ASN_PRIMITIVE | 6)
#define ASN_INTEGER32 ASN_INTEGER
#define ASN_SEQUENCE (ASN_UNIVERSAL | ASN_CONSTRUCTOR | 0x10)
#define ASN_SEQUENCEOF ASN_SEQUENCE
#define ASN_IPADDRESS (ASN_APPLICATION | ASN_PRIMITIVE | 0x00)
#define ASN_COUNTER32 (ASN_APPLICATION | ASN_PRIMITIVE | 0x01)
#define ASN_GAUGE32 (ASN_APPLICATION | ASN_PRIMITIVE | 0x02)
#define ASN_TIMETICKS (ASN_APPLICATION | ASN_PRIMITIVE | 0x03)
#define ASN_OPAQUE (ASN_APPLICATION | ASN_PRIMITIVE | 0x04)
#define ASN_COUNTER64 (ASN_APPLICATION | ASN_PRIMITIVE | 0x06)
#define ASN_UNSIGNED32 (ASN_APPLICATION | ASN_PRIMITIVE | 0x07)
#define SNMP_EXCEPTION_NOSUCHOBJECT (ASN_CONTEXT | ASN_PRIMITIVE | 0x00)
#define SNMP_EXCEPTION_NOSUCHINSTANCE (ASN_CONTEXT | ASN_PRIMITIVE | 0x01)
#define SNMP_EXCEPTION_ENDOFMIBVIEW (ASN_CONTEXT | ASN_PRIMITIVE | 0x02)
#define SNMP_EXTENSION_GET SNMP_PDU_GET
#define SNMP_EXTENSION_GET_NEXT SNMP_PDU_GETNEXT
#define SNMP_EXTENSION_GET_BULK SNMP_PDU_GETBULK
#define SNMP_EXTENSION_SET_TEST (ASN_PRIVATE | ASN_CONSTRUCTOR | 0x0)
#define SNMP_EXTENSION_SET_COMMIT SNMP_PDU_SET
#define SNMP_EXTENSION_SET_UNDO (ASN_PRIVATE | ASN_CONSTRUCTOR | 0x1)
#define SNMP_EXTENSION_SET_CLEANUP (ASN_PRIVATE | ASN_CONSTRUCTOR | 0x2)
#define SNMP_ERRORSTATUS_NOERROR 0
#define SNMP_ERRORSTATUS_TOOBIG 1
#define SNMP_ERRORSTATUS_NOSUCHNAME 2
#define SNMP_ERRORSTATUS_BADVALUE 3
#define SNMP_ERRORSTATUS_READONLY 4
#define SNMP_ERRORSTATUS_GENERR 5
#define SNMP_ERRORSTATUS_NOACCESS 6
#define SNMP_ERRORSTATUS_WRONGTYPE 7
#define SNMP_ERRORSTATUS_WRONGLENGTH 8
#define SNMP_ERRORSTATUS_WRONGENCODING 9
#define SNMP_ERRORSTATUS_WRONGVALUE 10
#define SNMP_ERRORSTATUS_NOCREATION 11
#define SNMP_ERRORSTATUS_INCONSISTENTVALUE 12
#define SNMP_ERRORSTATUS_RESOURCEUNAVAILABLE 13
#define SNMP_ERRORSTATUS_COMMITFAILED 14
#define SNMP_ERRORSTATUS_UNDOFAILED 15
#define SNMP_ERRORSTATUS_AUTHORIZATIONERROR 16
#define SNMP_ERRORSTATUS_NOTWRITABLE 17
#define SNMP_ERRORSTATUS_INCONSISTENTNAME 18
#define SNMP_GENERICTRAP_COLDSTART 0
#define SNMP_GENERICTRAP_WARMSTART 1
#define SNMP_GENERICTRAP_LINKDOWN 2
#define SNMP_GENERICTRAP_LINKUP 3
#define SNMP_GENERICTRAP_AUTHFAILURE 4
#define SNMP_GENERICTRAP_EGPNEIGHLOSS 5
#define SNMP_GENERICTRAP_ENTERSPECIFIC 6
#define SNMP_ACCESS_NONE 0
#define SNMP_ACCESS_NOTIFY 1
#define SNMP_ACCESS_READ_ONLY 2
#define SNMP_ACCESS_READ_WRITE 3
#define SNMP_ACCESS_READ_CREATE 4
#define SNMPAPI_ERROR FALSE
#define SNMPAPI_NOERROR TRUE
#define SNMP_LOG_SILENT 0
#define SNMP_LOG_FATAL 1
#define SNMP_LOG_ERROR 2
#define SNMP_LOG_WARNING 3
#define SNMP_LOG_TRACE 4
#define SNMP_LOG_VERBOSE 5
#define SNMP_OUTPUT_TO_CONSOLE 1
#define SNMP_OUTPUT_TO_LOGFILE 2
#define SNMP_OUTPUT_TO_EVENTLOG 4
#define SNMP_OUTPUT_TO_DEBUGGER 8
#define SNMP_MAX_OID_LEN 128
#define SNMP_MEM_ALLOC_ERROR 1
#define SNMP_BERAPI_INVALID_LENGTH 10
#define SNMP_BERAPI_INVALID_TAG 11
#define SNMP_BERAPI_OVERFLOW 12
#define SNMP_BERAPI_SHORT_BUFFER 13
#define SNMP_BERAPI_INVALID_OBJELEM 14
#define SNMP_PDUAPI_UNRECOGNIZED_PDU 20
#define SNMP_PDUAPI_INVALID_ES 21
#define SNMP_PDUAPI_INVALID_GT 22
#define SNMP_AUTHAPI_INVALID_VERSION 30
#define SNMP_AUTHAPI_INVALID_MSG_TYPE 31
#define SNMP_AUTHAPI_TRIV_AUTH_FAILED 32
#ifndef RC_INVOKED
typedef INT SNMPAPI;
typedef LONG AsnInteger32;
typedef ULONG AsnUnsigned32;
typedef ULARGE_INTEGER AsnCounter64;
typedef AsnUnsigned32 AsnCounter32;
typedef AsnUnsigned32 AsnGauge32;
typedef AsnUnsigned32 AsnTimeticks;
typedef struct {
BYTE *stream;
UINT length;
BOOL dynamic;
} AsnOctetString, AsnBits, AsnSequence, AsnImplicitSequence, AsnIPAddress, AsnNetworkAddress, AsnDisplayString, AsnOpaque;
typedef struct {
UINT idLength;
UINT *ids;
} AsnObjectIdentifier, AsnObjectName;
typedef struct {
BYTE asnType;
union {
AsnInteger32 number;
AsnUnsigned32 unsigned32;
AsnCounter64 counter64;
AsnOctetString string;
AsnBits bits;
AsnObjectIdentifier object;
AsnSequence sequence;
AsnIPAddress address;
AsnCounter32 counter;
AsnGauge32 gauge;
AsnTimeticks ticks;
AsnOpaque arbitrary;
} asnValue;
} AsnAny, AsnObjectSyntax;
typedef struct {
AsnObjectName name;
AsnObjectSyntax value;
} SnmpVarBind;
typedef struct {
SnmpVarBind *list;
UINT len;
} SnmpVarBindList;
VOID WINSNMPAPI SnmpExtensionClose(void);
BOOL WINSNMPAPI SnmpExtensionInit(DWORD,HANDLE*,AsnObjectIdentifier*);
BOOL WINSNMPAPI SnmpExtensionInitEx(AsnObjectIdentifier*);
BOOL WINSNMPAPI SnmpExtensionMonitor(LPVOID);
BOOL WINSNMPAPI SnmpExtensionQuery(BYTE,SnmpVarBindList*,AsnInteger32*,AsnInteger32*);
BOOL WINSNMPAPI SnmpExtensionQueryEx(DWORD,DWORD,SnmpVarBindList*,AsnOctetString*,AsnInteger32*,AsnInteger32*);
BOOL WINSNMPAPI SnmpExtensionTrap(AsnObjectIdentifier*,AsnInteger32*,AsnInteger32*,AsnTimeticks*,SnmpVarBindList*);
DWORD WINSNMPAPI SnmpSvcGetUptime(void);
VOID WINSNMPAPI SnmpSvcSetLogLevel(INT);
VOID WINSNMPAPI SnmpSvcSetLogType(INT);
SNMPAPI WINSNMPAPI SnmpUtilAsnAnyCpy(AsnAny*,AsnAny*);
VOID WINSNMPAPI SnmpUtilAsnAnyFree(AsnAny*);
VOID WINSNMPAPI SnmpUtilDbgPrint(INT,LPSTR,...);
LPSTR WINSNMPAPI SnmpUtilIdsToA(UINT*,UINT);
LPVOID WINSNMPAPI SnmpUtilMemAlloc(UINT);
VOID WINSNMPAPI SnmpUtilMemFree(LPVOID);
LPVOID WINSNMPAPI SnmpUtilMemReAlloc(LPVOID,UINT);
SNMPAPI WINSNMPAPI SnmpUtilOctetsCmp(AsnOctetString*,AsnOctetString*);
SNMPAPI WINSNMPAPI SnmpUtilOctetsCpy(AsnOctetString*,AsnOctetString*);
VOID WINSNMPAPI SnmpUtilOctetsFree(AsnOctetString*);
SNMPAPI WINSNMPAPI SnmpUtilOctetsNCmp(AsnOctetString*,AsnOctetString*,UINT);
SNMPAPI WINSNMPAPI SnmpUtilOidAppend(AsnObjectIdentifier*,AsnObjectIdentifier*);
SNMPAPI WINSNMPAPI SnmpUtilOidCmp(AsnObjectIdentifier*,AsnObjectIdentifier*);
SNMPAPI WINSNMPAPI SnmpUtilOidCpy(AsnObjectIdentifier*,AsnObjectIdentifier*);
VOID WINSNMPAPI SnmpUtilOidFree(AsnObjectIdentifier*);
SNMPAPI WINSNMPAPI SnmpUtilOidNCmp(AsnObjectIdentifier*,AsnObjectIdentifier*,UINT);
LPSTR WINSNMPAPI SnmpUtilOidToA(AsnObjectIdentifier*);
VOID WINSNMPAPI SnmpUtilPrintAsnAny(AsnAny*);
VOID WINSNMPAPI SnmpUtilPrintOid(AsnObjectIdentifier*);
SNMPAPI WINSNMPAPI SnmpUtilVarBindCpy( SnmpVarBind*,SnmpVarBind*);
SNMPAPI WINSNMPAPI SnmpUtilVarBindListCpy(SnmpVarBindList*,SnmpVarBindList*);
VOID WINSNMPAPI SnmpUtilVarBindFree(SnmpVarBind*);
VOID WINSNMPAPI SnmpUtilVarBindListFree(SnmpVarBindList*);
#ifndef SNMPSTRICT
#define SNMP_malloc SnmpUtilMemAlloc
#define SNMP_free SnmpUtilMemFree
#define SNMP_realloc SnmpUtilMemReAlloc
#define SNMP_DBG_malloc SnmpUtilMemAlloc
#define SNMP_DBG_free SnmpUtilMemFree
#define SNMP_DBG_realloc SnmpUtilMemReAlloc
#define SNMP_oidappend SnmpUtilOidAppend
#define SNMP_oidcmp SnmpUtilOidCmp
#define SNMP_oidcpy SnmpUtilOidCpy
#define SNMP_oidfree SnmpUtilOidFree
#define SNMP_oidncmp SnmpUtilOidNCmp
#define SNMP_printany SnmpUtilPrintAsnAny
#define SNMP_CopyVarBind SnmpUtilVarBindCpy
#define SNMP_CopyVarBindList SnmpUtilVarBindListCpy
#define SNMP_FreeVarBind SnmpUtilVarBindFree
#define SNMP_FreeVarBindList SnmpUtilVarBindListFree
#define ASN_RFC1155_IPADDRESS ASN_IPADDRESS
#define ASN_RFC1155_COUNTER ASN_COUNTER32
#define ASN_RFC1155_GAUGE ASN_GAUGE32
#define ASN_RFC1155_TIMETICKS ASN_TIMETICKS
#define ASN_RFC1155_OPAQUE ASN_OPAQUE
#define ASN_RFC1213_DISPSTRING ASN_OCTETSTRING
#define ASN_RFC1157_GETREQUEST SNMP_PDU_GET
#define ASN_RFC1157_GETNEXTREQUEST SNMP_PDU_GETNEXT
#define ASN_RFC1157_GETRESPONSE SNMP_PDU_RESPONSE
#define ASN_RFC1157_SETREQUEST SNMP_PDU_SET
#define ASN_RFC1157_TRAP SNMP_PDU_V1TRAP
#define ASN_CONTEXTSPECIFIC ASN_CONTEXT
#define ASN_PRIMATIVE ASN_PRIMITIVE
#define RFC1157VarBindList SnmpVarBindList
#define RFC1157VarBind SnmpVarBind
#define AsnInteger AsnInteger32
#define AsnCounter AsnCounter32
#define AsnGauge AsnGauge32
#endif /* SNMPSTRICT */
#endif /* RC_INVOKED */
#ifdef __cplusplus
}
#endif
#include <poppack.h>
#endif
--- NEW FILE: vfw.h ---
#ifndef _VFW_H
#define _VFW_H
#if __GNUC__ >= 3
#pragma GCC system_header
#endif
#ifndef _WINDOWS_H
#include <windows.h>
#endif
#ifndef _MMSYSTEM_H
#include <mmsystem.h>
#endif
#if !defined (_OLE2_H) && !defined (__OBJC__)
#include <ole2.h>
#endif
#define VFWAPI WINAPI
#define VFWAPIV WINAPIV
[...1091 lines suppressed...]
#define MCIWNDM_SENDSTRING MCIWNDM_SENDSTRINGA
#define MCIWNDM_GETPOSITION MCIWNDM_GETPOSITIONA
#define MCIWNDM_GETMODE MCIWNDM_GETMODEA
#define MCIWNDM_SETTIMEFORMAT MCIWNDM_SETTIMEFORMATA
#define MCIWNDM_GETTIMEFORMAT MCIWNDM_GETTIMEFORMATA
#define MCIWNDM_GETFILENAME MCIWNDM_GETFILENAMEA
#define MCIWNDM_GETDEVICE MCIWNDM_GETDEVICEA
#define MCIWNDM_GETERROR MCIWNDM_GETERRORA
#define MCIWNDM_NEW MCIWNDM_NEWA
#define MCIWNDM_RETURNSTRING MCIWNDM_RETURNSTRINGA
#define MCIWNDM_OPEN MCIWNDM_OPENA
#endif
#endif /* RC_INVOKED */
#ifdef __cplusplus
}
#endif
#include <poppack.h>
#endif /* _VFW_H */
--- NEW FILE: winable.h ---
#ifndef _WINABLE_H
#define _WINABLE_H
#if __GNUC__ >=3
#pragma GCC system_header
#endif
#ifdef __cplusplus
extern "C" {
#endif
#define OBJID_WINDOW 0x00000000
#define OBJID_SYSMENU 0xFFFFFFFF
#define OBJID_TITLEBAR 0xFFFFFFFE
#define OBJID_MENU 0xFFFFFFFD
#define OBJID_CLIENT 0xFFFFFFFC
#define OBJID_VSCROLL 0xFFFFFFFB
#define OBJID_HSCROLL 0xFFFFFFFA
#define OBJID_SIZEGRIP 0xFFFFFFF9
#define OBJID_CARET 0xFFFFFFF8
#define OBJID_CURSOR 0xFFFFFFF7
#define OBJID_ALERT 0xFFFFFFF6
#define OBJID_SOUND 0xFFFFFFF5
#ifdef __cplusplus
}
#endif
#endif /* _WINABLE_H */
--- NEW FILE: winber.h ---
/*
winber.h - Header file for the Windows LDAP Basic Encoding Rules API
Written by Filip Navara <xn...@vo...>
References:
The C LDAP Application Program Interface
http://www.watersprings.org/pub/id/draft-ietf-ldapext-ldap-c-api-05.txt
Lightweight Directory Access Protocol Reference
http://msdn.microsoft.com/library/en-us/netdir/ldap/ldap_reference.asp
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.
*/
#ifndef _WINBER_H
#define _WINBER_H
#if __GNUC__ >= 3
#pragma GCC system_header
#endif
#ifdef __cplusplus
extern "C" {
#endif
#ifndef WINBERAPI
#define WINBERAPI DECLSPEC_IMPORT
#endif
typedef struct berelement BerElement;
typedef ULONG ber_len_t;
#include <pshpack4.h>
typedef struct berval {
ber_len_t bv_len;
char *bv_val;
} BerValue, LDAP_BERVAL, *PLDAP_BERVAL, BERVAL, *PBERVAL;
#include <poppack.h>
typedef ULONG ber_tag_t;
typedef INT ber_int_t;
typedef UINT ber_uint_t;
typedef INT ber_slen_t;
#define LBER_ERROR ((ber_tag_t)-1)
#define LBER_DEFAULT ((ber_tag_t)-1)
#define LBER_USE_DER 0x01
WINBERAPI BerElement *ber_init(const BerValue*);
WINBERAPI int ber_printf(BerElement*,const char*,...);
WINBERAPI int ber_flatten(BerElement*,BerValue**);
WINBERAPI ber_tag_t ber_scanf(BerElement*,const char*,...);
WINBERAPI ber_tag_t ber_peek_tag(BerElement*,ber_len_t*);
WINBERAPI ber_tag_t ber_skip_tag(BerElement*,ber_len_t*);
WINBERAPI ber_tag_t ber_first_element(BerElement*,ber_len_t*,char**);
WINBERAPI ber_tag_t ber_next_element(BerElement*,ber_len_t*,char*);
WINBERAPI void ber_bvfree(BerValue*);
WINBERAPI void ber_bvecfree(BerValue**);
WINBERAPI void ber_free(BerElement*,int);
WINBERAPI BerValue *ber_bvdup(BerValue*);
WINBERAPI BerElement *ber_alloc_t(int);
#ifdef __cplusplus
}
#endif
#endif /* _WINBER_H */
--- NEW FILE: winldap.h ---
/*
winldap.h - Header file for the Windows LDAP API
Written by Filip Navara <xn...@vo...>
References:
The C LDAP Application Program Interface
http://www.watersprings.org/pub/id/draft-ietf-ldapext-ldap-c-api-05.txt
Lightweight Directory Access Protocol Reference
http://msdn.microsoft.com/library/en-us/netdir/ldap/ldap_reference.asp
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.
*/
#ifndef _WINLDAP_H
#define _WINLDAP_H
#if __GNUC__ >= 3
#pragma GCC system_header
#endif
#ifndef _SCHANNEL_H
#include <schannel.h>
#endif
#ifndef _WINBER_H
#include <winber.h>
#endif
#ifndef WINLDAPAPI
#define WINLDAPAPI DECLSPEC_IMPORT
#endif
#ifndef _WINLDAP_DEPRECATED
#if (( __GNUC__ == 3 && __GNUC_MINOR__ > 0 ) || __GNUC__ > 3)
#define _WINLDAP_DEPRECATED __attribute__((__deprecated__))
#else
#define _WINLDAP_DEPRECATED
#endif
#endif
#include <pshpack4.h>
#ifdef __cplusplus
extern "C" {
#endif
#define LDAP_VERSION1 1
#define LDAP_VERSION2 2
#define LDAP_VERSION3 3
#define LDAP_VERSION LDAP_VERSION2
#define LDAP_API_VERSION 2004
#define LDAP_VERSION_MIN LDAP_VERSION2
#define LDAP_VERSION_MAX LDAP_VERSION3
#define LDAP_VENDOR_NAME "Microsoft Corporation."
#define LDAP_VENDOR_NAME_W L"Microsoft Corporation."
#define LDAP_VENDOR_VERSION 510
#define LDAP_API_INFO_VERSION 1
#define LDAP_FEATURE_INFO_VERSION 1
#define LDAP_SUCCESS 0x00
#define LDAP_OPERATIONS_ERROR 0x01
#define LDAP_PROTOCOL_ERROR 0x02
#define LDAP_TIMELIMIT_EXCEEDED 0x03
#define LDAP_SIZELIMIT_EXCEEDED 0x04
#define LDAP_COMPARE_FALSE 0x05
#define LDAP_COMPARE_TRUE 0x06
#define LDAP_STRONG_AUTH_NOT_SUPPORTED 0x07
#define LDAP_STRONG_AUTH_REQUIRED 0x08
#define LDAP_REFERRAL_V2 0x09
#define LDAP_REFERRAL 0x0a
#define LDAP_ADMIN_LIMIT_EXCEEDED 0x0b
#define LDAP_UNAVAILABLE_CRIT_EXTENSION 0x0c
#define LDAP_CONFIDENTIALITY_REQUIRED 0x0d
#define LDAP_SASL_BIND_IN_PROGRESS 0x0e
#define LDAP_NO_SUCH_ATTRIBUTE 0x10
#define LDAP_UNDEFINED_TYPE 0x11
#define LDAP_INAPPROPRIATE_MATCHING 0x12
#define LDAP_CONSTRAINT_VIOLATION 0x13
#define LDAP_TYPE_OR_VALUE_EXISTS 0x14
#define LDAP_INVALID_SYNTAX 0x15
#define LDAP_NO_SUCH_OBJECT 0x20
#define LDAP_ALIAS_PROBLEM 0x21
#define LDAP_INVALID_DN_SYNTAX 0x22
#define LDAP_IS_LEAF 0x23
#define LDAP_ALIAS_DEREF_PROBLEM 0x24
#define LDAP_INAPPROPRIATE_AUTH 0x30
#define LDAP_INVALID_CREDENTIALS 0x31
#define LDAP_INSUFFICIENT_ACCESS 0x32
#define LDAP_BUSY 0x33
#define LDAP_UNAVAILABLE 0x34
#define LDAP_UNWILLING_TO_PERFORM 0x35
#define LDAP_LOOP_DETECT 0x36
#define LDAP_NAMING_VIOLATION 0x40
#define LDAP_OBJECT_CLASS_VIOLATION 0x41
#define LDAP_NOT_ALLOWED_ON_NONLEAF 0x42
#define LDAP_NOT_ALLOWED_ON_RDN 0x43
#define LDAP_ALREADY_EXISTS 0x44
#define LDAP_NO_OBJECT_CLASS_MODS 0x45
#define LDAP_RESULTS_TOO_LARGE 0x46
#define LDAP_AFFECTS_MULTIPLE_DSAS 0x47
#define LDAP_OTHER 0x50
#define LDAP_SERVER_DOWN 0x51
#define LDAP_LOCAL_ERROR 0x52
#define LDAP_ENCODING_ERROR 0x53
#define LDAP_DECODING_ERROR 0x54
#define LDAP_TIMEOUT 0x55
#define LDAP_AUTH_UNKNOWN 0x56
#define LDAP_FILTER_ERROR 0x57
#define LDAP_USER_CANCELLED 0x58
#define LDAP_PARAM_ERROR 0x59
#define LDAP_NO_MEMORY 0x5a
#define LDAP_CONNECT_ERROR 0x5b
#define LDAP_NOT_SUPPORTED 0x5c
#define LDAP_CONTROL_NOT_FOUND 0x5d
#define LDAP_NO_RESULTS_RETURNED 0x5e
#define LDAP_MORE_RESULTS_TO_RETURN 0x5f
#define LDAP_CLIENT_LOOP 0x60
#define LDAP_REFERRAL_LIMIT_EXCEEDED 0x61
#define LDAP_OPT_SUCCESS LDAP_SUCCESS
#define LDAP_AUTH_METHOD_NOT_SUPPORTED LDAP_STRONG_AUTH_NOT_SUPPORTED
#define LDAP_ATTRIBUTE_OR_VALUE_EXISTS LDAP_TYPE_OR_VALUE_EXISTS
#define LDAP_INSUFFICIENT_RIGHTS LDAP_INSUFFICIENT_ACCESS
#define LDAP_PARTIAL_RESULTS LDAP_REFERRAL_V2
#define LDAP_PORT 389
#define LDAP_SSL_PORT 636
#define LDAP_GC_PORT 3268
#define LDAP_SSL_GC_PORT 3269
#define LDAP_OPT_ON ((void*)1)
#define LDAP_OPT_OFF ((void*)0)
#define LDAP_OPT_API_INFO 0x00
#define LDAP_OPT_DESC 0x01
#define LDAP_OPT_DEREF 0x02
#define LDAP_OPT_SIZELIMIT 0x03
#define LDAP_OPT_TIMELIMIT 0x04
#define LDAP_OPT_THREAD_FN_PTRS 0x05
#define LDAP_OPT_REBIND_FN 0x06
#define LDAP_OPT_REBIND_ARG 0x07
#define LDAP_OPT_REFERRALS 0x08
#define LDAP_OPT_RESTART 0x09
#define LDAP_OPT_SSL 0x0a
#define LDAP_OPT_IO_FN_PTRS 0x0b
#define LDAP_OPT_CACHE_FN_PTRS 0x0d
#define LDAP_OPT_CACHE_STRATEGY 0x0e
#define LDAP_OPT_CACHE_ENABLE 0x0f
#define LDAP_OPT_REFERRAL_HOP_LIMIT 0x10
#define LDAP_OPT_PROTOCOL_VERSION 0x11
#define LDAP_OPT_SERVER_CONTROLS 0x12
#define LDAP_OPT_CLIENT_CONTROLS 0x13
#define LDAP_OPT_API_FEATURE_INFO 0x15
#define LDAP_OPT_HOST_NAME 0x30
#define LDAP_OPT_ERROR_NUMBER 0x31
#define LDAP_OPT_ERROR_STRING 0x32
#define LDAP_OPT_SERVER_ERROR 0x33
#define LDAP_OPT_SERVER_EXT_ERROR 0x34
#define LDAP_OPT_PING_KEEP_ALIVE 0x36
#define LDAP_OPT_PING_WAIT_TIME 0x37
#define LDAP_OPT_PING_LIMIT 0x38
#define LDAP_OPT_DNSDOMAIN_NAME 0x3b
#define LDAP_OPT_GETDSNAME_FLAGS 0x3d
#define LDAP_OPT_HOST_REACHABLE 0x3e
#define LDAP_OPT_PROMPT_CREDENTIALS 0x3f
#define LDAP_OPT_TCP_KEEPALIVE 0x40
#define LDAP_OPT_REFERRAL_CALLBACK 0x70
#define LDAP_OPT_CLIENT_CERTIFICATE 0x80
#define LDAP_OPT_SERVER_CERTIFICATE 0x81
#define LDAP_OPT_AUTO_RECONNECT 0x91
#define LDAP_OPT_SSPI_FLAGS 0x92
#define LDAP_OPT_SSL_INFO 0x93
#define LDAP_OPT_REF_DEREF_CONN_PER_MSG 0x94
#define LDAP_OPT_SIGN 0x95
#define LDAP_OPT_ENCRYPT 0x96
#define LDAP_OPT_SASL_METHOD 0x97
#define LDAP_OPT_AREC_EXCLUSIVE 0x98
#define LDAP_OPT_SECURITY_CONTEXT 0x99
#define LDAP_OPT_ROOTDSE_CACHE 0x9a
#define LDAP_OPT_VERSION LDAP_OPT_PROTOCOL_VERSION
#define LDAP_OPT_TLS LDAP_OPT_SSL
#define LDAP_OPT_TLS_INFO LDAP_OPT_SSL_INFO
#define LDAP_DEREF_NEVER 0x00
#define LDAP_DEREF_SEARCHING 0x01
#define LDAP_DEREF_FINDING 0x02
#define LDAP_DEREF_ALWAYS 0x03
#define LDAP_NO_LIMIT 0
#define LDAP_CONTROL_REFERRALS "1.2.840.113556.1.4.616"
#define LDAP_CONTROL_REFERRALS_W L"1.2.840.113556.1.4.616"
#define LDAP_CHASE_SUBORDINATE_REFERRALS 0x20U
#define LDAP_CHASE_EXTERNAL_REFERRALS 0x40U
#define LDAP_SCOPE_DEFAULT -1
#define LDAP_SCOPE_BASE 0x0000
#define LDAP_SCOPE_ONELEVEL 0x0001
#define LDAP_SCOPE_SUBTREE 0x0002
#define LDAP_MOD_ADD 0x00
#define LDAP_MOD_DELETE 0x01
#define LDAP_MOD_REPLACE 0x02
#define LDAP_MOD_BVALUES 0x80
#define LDAP_RES_BIND 0x61
#define LDAP_RES_SEARCH_ENTRY 0x64
#define LDAP_RES_SEARCH_RESULT 0x65
#define LDAP_RES_MODIFY 0x67
#define LDAP_RES_ADD 0x69
#define LDAP_RES_DELETE 0x6b
#define LDAP_RES_MODRDN 0x6d
#define LDAP_RES_COMPARE 0x6f
#define LDAP_RES_SEARCH_REFERENCE 0x73
#define LDAP_RES_EXTENDED 0x78
#define LDAP_RES_ANY (-1L)
#define LDAP_MSG_ONE 0x00
#define LDAP_MSG_ALL 0x01
#define LDAP_MSG_RECEIVED 0x02
#define LDAP_SERVER_SORT_OID "1.2.840.113556.1.4.473"
#define LDAP_SERVER_SORT_OID_W L"1.2.840.113556.1.4.473"
#define LDAP_SERVER_RESP_SORT_OID "1.2.840.113556.1.4.474"
#define LDAP_SERVER_RESP_SORT_OID_W L"1.2.840.113556.1.4.474"
#define LDAP_PAGED_RESULT_OID_STRING "1.2.840.113556.1.4.319"
#define LDAP_PAGED_RESULT_OID_STRING_W L"1.2.840.113556.1.4.319"
#define LDAP_CONTROL_VLVREQUEST "2.16.840.1.113730.3.4.9"
#define LDAP_CONTROL_VLVREQUEST_W L"2.16.840.1.113730.3.4.9"
#define LDAP_CONTROL_VLVRESPONSE "2.16.840.1.113730.3.4.10"
#define LDAP_CONTROL_VLVRESPONSE_W L"2.16.840.1.113730.3.4.10"
#define LDAP_START_TLS_OID "1.3.6.1.4.1.1466.20037"
#define LDAP_START_TLS_OID_W L"1.3.6.1.4.1.1466.20037"
#define LDAP_TTL_EXTENDED_OP_OID "1.3.6.1.4.1.1466.101.119.1"
#define LDAP_TTL_EXTENDED_OP_OID_W L"1.3.6.1.4.1.1466.101.119.1"
#define LDAP_AUTH_NONE 0x00U
#define LDAP_AUTH_SIMPLE 0x80U
#define LDAP_AUTH_SASL 0x83U
#define LDAP_AUTH_OTHERKIND 0x86U
#define LDAP_AUTH_EXTERNAL (LDAP_AUTH_OTHERKIND | 0x20U)
#define LDAP_AUTH_SICILY (LDAP_AUTH_OTHERKIND | 0x200U)
#define LDAP_AUTH_NEGOTIATE (LDAP_AUTH_OTHERKIND | 0x400U)
#define LDAP_AUTH_MSN (LDAP_AUTH_OTHERKIND | 0x800U)
#define LDAP_AUTH_NTLM (LDAP_AUTH_OTHERKIND | 0x1000U)
#define LDAP_AUTH_DIGEST (LDAP_AUTH_OTHERKIND | 0x4000U)
#define LDAP_AUTH_DPA (LDAP_AUTH_OTHERKIND | 0x2000U)
#define LDAP_AUTH_SSPI LDAP_AUTH_NEGOTIATE
#define LDAP_FILTER_AND 0xa0
#define LDAP_FILTER_OR 0xa1
#define LDAP_FILTER_NOT 0xa2
#define LDAP_FILTER_EQUALITY 0xa3
#define LDAP_FILTER_SUBSTRINGS 0xa4
#define LDAP_FILTER_GE 0xa5
#define LDAP_FILTER_LE 0xa6
#define LDAP_FILTER_APPROX 0xa8
#define LDAP_FILTER_EXTENSIBLE 0xa9
#define LDAP_FILTER_PRESENT 0x87
#define LDAP_SUBSTRING_INITIAL 0x80
#define LDAP_SUBSTRING_ANY 0x81
#define LDAP_SUBSTRING_FINAL 0x82
typedef struct ldap {
char Reserved[76];
PCHAR ld_host;
ULONG ld_version;
UCHAR ld_lberoptions;
int ld_deref;
int ld_timelimit;
int ld_sizelimit;
int ld_errno;
PCHAR ld_matched;
PCHAR ld_error;
} LDAP, *PLDAP;
typedef struct ldapmsg {
ULONG lm_msgid;
ULONG lm_msgtype;
BerElement *lm_ber;
struct ldapmsg *lm_chain;
struct ldapmsg *lm_next;
ULONG lm_time;
} LDAPMessage, *PLDAPMessage;
typedef struct l_timeval {
LONG tv_sec;
LONG tv_usec;
} LDAP_TIMEVAL, *PLDAP_TIMEVAL;
typedef struct ldapapiinfoA {
int ldapai_info_version;
int ldapai_api_version;
int ldapai_protocol_version;
char **ldapai_extensions;
char *ldapai_vendor_name;
int ldapai_vendor_version;
} LDAPAPIInfoA, *PLDAPAPIInfoA;
typedef struct ldapapiinfoW {
int ldapai_info_version;
int ldapai_api_version;
int ldapai_protocol_version;
PWCHAR *ldapai_extensions;
PWCHAR ldapai_vendor_name;
int ldapai_vendor_version;
} LDAPAPIInfoW, *PLDAPAPIInfoW;
typedef struct ldap_apifeature_infoA {
int ldapaif_info_version;
char *ldapaif_name;
int ldapaif_version;
} LDAPAPIFeatureInfoA, *PLDAPAPIFeatureInfoA;
typedef struct ldap_apifeature_infoW {
int ldapaif_info_version;
PWCHAR ldapaif_name;
int ldapaif_version;
} LDAPAPIFeatureInfoW, *PLDAPAPIFeatureInfoW;
typedef struct ldapcontrolA {
PCHAR ldctl_oid;
BerValue ldctl_value;
BOOLEAN ldctl_iscritical;
} LDAPControlA, *PLDAPControlA;
typedef struct ldapcontrolW {
PWCHAR ldctl_oid;
BerValue ldctl_value;
BOOLEAN ldctl_iscritical;
} LDAPControlW, *PLDAPControlW;
typedef union mod_vals_uA {
PCHAR *modv_strvals;
BerValue **modv_bvals;
} mod_vals_u_tA;
typedef union mod_vals_uW {
PWCHAR *modv_strvals;
BerValue **modv_bvals;
} mod_vals_u_tW;
typedef struct ldapmodA {
ULONG mod_op;
PCHAR mod_type;
mod_vals_u_tA mod_vals;
} LDAPModA, *PLDAPModA;
typedef struct ldapmodW {
ULONG mod_op;
PWCHAR mod_type;
mod_vals_u_tW mod_vals;
} LDAPModW, *PLDAPModW;
#define mod_values mod_vals.modv_strvals
#define mod_bvalues mod_vals.modv_bvals
typedef struct ldapsearch LDAPSearch, *PLDAPSearch;
typedef struct ldapsortkeyA {
PCHAR sk_attrtype;
PCHAR sk_matchruleoid;
BOOLEAN sk_reverseorder;
} LDAPSortKeyA, *PLDAPSortKeyA;
typedef struct ldapsortkeyW {
PWCHAR sk_attrtype;
PWCHAR sk_matchruleoid;
BOOLEAN sk_reverseorder;
} LDAPSortKeyW, *PLDAPSortKeyW;
typedef ULONG (__cdecl QUERYFORCONNECTION)(PLDAP,PLDAP,PWCHAR,PCHAR,ULONG,PVOID,PVOID,PLDAP*);
typedef BOOLEAN (__cdecl NOTIFYOFNEWCONNECTION)(PLDAP,PLDAP,PWCHAR,PCHAR,PLDAP,ULONG,PVOID,PVOID,ULONG);
typedef ULONG (__cdecl DEREFERENCECONNECTION)(PLDAP,PLDAP);
typedef BOOLEAN (__cdecl QUERYCLIENTCERT)(PLDAP,PSecPkgContext_IssuerListInfoEx,PCCERT_CONTEXT*);
typedef struct LdapReferralCallback {
ULONG SizeOfCallbacks;
QUERYFORCONNECTION *QueryForConnection;
NOTIFYOFNEWCONNECTION *NotifyRoutine;
DEREFERENCECONNECTION *DereferenceRoutine;
} LDAP_REFERRAL_CALLBACK, *PLDAP_REFERRAL_CALLBACK;
typedef struct ldapvlvinfo {
int ldvlv_version;
unsigned long ldvlv_before_count;
unsigned long ldvlv_after_count;
unsigned long ldvlv_offset;
unsigned long ldvlv_count;
BerValue *ldvlv_attrvalue;
BerValue *ldvlv_context;
void *ldvlv_extradata;
} LDAPVLVInfo;
/*
* Under Microsoft WinLDAP the function ldap_error is only stub.
* This macro uses LDAP structure to get error string and pass it to the user.
*/
#define ldap_perror(handle,message) printf("%s: %s\n", message, handle->ld_error);
WINLDAPAPI PLDAP ldap_initA(PCHAR,ULONG);
WINLDAPAPI PLDAP ldap_initW(PWCHAR,ULONG);
WINLDAPAPI PLDAP ldap_openA(const PCHAR,ULONG);
WINLDAPAPI PLDAP ldap_openW(const PWCHAR,ULONG);
WINLDAPAPI PLDAP cldap_openA(const PCHAR,ULONG);
WINLDAPAPI PLDAP cldap_openW(const PWCHAR,ULONG);
WINLDAPAPI ULONG ldap_connect(LDAP*,struct l_timeval*);
WINLDAPAPI PLDAP ldap_sslinitA(PCHAR,ULONG,int);
WINLDAPAPI PLDAP ldap_sslinitW(PWCHAR,ULONG,int);
WINLDAPAPI ULONG ldap_start_tls_sA(LDAP*,PLDAPControlA*,PLDAPControlA*);
WINLDAPAPI ULONG ldap_start_tls_sW(LDAP*,PLDAPControlW*,PLDAPControlW*);
WINLDAPAPI BOOLEAN ldap_stop_tls_s(LDAP*);
WINLDAPAPI ULONG ldap_get_optionA(LDAP*,int,void*);
WINLDAPAPI ULONG ldap_get_optionW(LDAP*,int,void*);
WINLDAPAPI ULONG ldap_set_optionA(LDAP*,int,const void*);
WINLDAPAPI ULONG ldap_set_optionW(LDAP*,int,const void*);
WINLDAPAPI ULONG ldap_control_freeA(LDAPControlA*);
WINLDAPAPI ULONG ldap_control_freeW(LDAPControlW*);
WINLDAPAPI ULONG ldap_controls_freeA(LDAPControlA**);
WINLDAPAPI ULONG ldap_controls_freeW(LDAPControlW**);
WINLDAPAPI ULONG ldap_free_controlsA(LDAPControlA**);
WINLDAPAPI ULONG ldap_free_controlsW(LDAPControlW**);
WINLDAPAPI ULONG ldap_sasl_bindA(LDAP*,const PCHAR, const PCHAR,const BERVAL*,PLDAPControlA*,PLDAPControlA*,int*);
WINLDAPAPI ULONG ldap_sasl_bindW(LDAP*,const PWCHAR, const PWCHAR,const BERVAL*,PLDAPControlW*,PLDAPControlW*,int*);
WINLDAPAPI ULONG ldap_sasl_bind_sA(LDAP*,const PCHAR,const PCHAR,const BERVAL*,PLDAPControlA*,PLDAPControlA*,PBERVAL*);
WINLDAPAPI ULONG ldap_sasl_bind_sW(LDAP*,const PWCHAR,const PWCHAR,const BERVAL*,PLDAPControlW*,PLDAPControlW*,PBERVAL*);
WINLDAPAPI ULONG ldap_simple_bindA(LDAP*,const PCHAR,const PCHAR);
WINLDAPAPI ULONG ldap_simple_bindW(LDAP*,const PWCHAR,const PCHAR);
WINLDAPAPI ULONG ldap_simple_bind_sA(LDAP*,const PCHAR,const PCHAR);
WINLDAPAPI ULONG ldap_simple_bind_sW(LDAP*,const PWCHAR,const PCHAR);
WINLDAPAPI ULONG ldap_bindA(LDAP*,const PCHAR,const PCHAR,ULONG) _WINLDAP_DEPRECATED;
WINLDAPAPI ULONG ldap_bindW(LDAP*,const PWCHAR,const PCHAR,ULONG) _WINLDAP_DEPRECATED;
WINLDAPAPI ULONG ldap_bind_sA(LDAP*,const PCHAR,const PCHAR,ULONG) _WINLDAP_DEPRECATED;
WINLDAPAPI ULONG ldap_bind_sW(LDAP*,const PWCHAR,const PCHAR,ULONG) _WINLDAP_DEPRECATED;
WINLDAPAPI ULONG ldap_unbind(LDAP*);
WINLDAPAPI ULONG ldap_unbind_s(LDAP*);
WINLDAPAPI ULONG ldap_search_extA(LDAP*,const PCHAR,ULONG,const PCHAR,PCHAR[],ULONG,PLDAPControlW*,PLDAPControlW*,ULONG,ULONG,ULONG*);
WINLDAPAPI ULONG ldap_search_extW(LDAP*,const PWCHAR,ULONG,const PWCHAR,PWCHAR[],ULONG,PLDAPControlW*,PLDAPControlW*,ULONG,ULONG,ULONG*);
WINLDAPAPI ULONG ldap_search_ext_sA(LDAP*,const PCHAR,ULONG,const PCHAR,PCHAR[],ULONG,PLDAPControlA*,PLDAPControlA*,struct l_timeval*,ULONG,LDAPMessage**);
WINLDAPAPI ULONG ldap_search_ext_sW(LDAP*,const PWCHAR,ULONG,const PWCHAR,PWCHAR[],ULONG,PLDAPControlW*,PLDAPControlW*,struct l_timeval*,ULONG,LDAPMessage**);
WINLDAPAPI ULONG ldap_searchA(LDAP*,const PCHAR,ULONG,const PCHAR,PCHAR[],ULONG);
WINLDAPAPI ULONG ldap_searchW(LDAP*,const PWCHAR,ULONG,const PWCHAR,PWCHAR[],ULONG);
WINLDAPAPI ULONG ldap_search_sA(LDAP*,const PCHAR,ULONG,const PCHAR,PCHAR[],ULONG,LDAPMessage**);
WINLDAPAPI ULONG ldap_search_sW(LDAP*,const PWCHAR,ULONG,const PWCHAR,PWCHAR[],ULONG,LDAPMessage**);
WINLDAPAPI ULONG ldap_search_stA(LDAP*,const PCHAR,ULONG,const PCHAR,PCHAR[],ULONG,struct l_timeval*,LDAPMessage**);
WINLDAPAPI ULONG ldap_search_stW(LDAP*,const PWCHAR,ULONG,const PWCHAR,PWCHAR[],ULONG,struct l_timeval*,LDAPMessage**);
WINLDAPAPI ULONG ldap_compare_extA(LDAP*,const PCHAR,const PCHAR,PCHAR,struct berval*,PLDAPControlA*,PLDAPControlA*,ULONG*);
WINLDAPAPI ULONG ldap_compare_extW(LDAP*,const PWCHAR,const PWCHAR,PWCHAR,struct berval*,PLDAPControlW*,PLDAPControlW*,ULONG*);
WINLDAPAPI ULONG ldap_compare_ext_sA(LDAP*,const PCHAR,const PCHAR,const PCHAR,struct berval*,PLDAPControlA*,PLDAPControlA*);
WINLDAPAPI ULONG ldap_compare_ext_sW(LDAP*,const PWCHAR,const PWCHAR,const PWCHAR,struct berval*,PLDAPControlW*,PLDAPControlW*);
WINLDAPAPI ULONG ldap_compareA(LDAP*,const PCHAR,const PCHAR,PCHAR);
WINLDAPAPI ULONG ldap_compareW(LDAP*,const PWCHAR,const PWCHAR,PWCHAR);
WINLDAPAPI ULONG ldap_compare_sA(LDAP*,const PCHAR,const PCHAR,PCHAR);
WINLDAPAPI ULONG ldap_compare_sW(LDAP*,const PWCHAR,const PWCHAR,PWCHAR);
WINLDAPAPI ULONG ldap_modify_extA(LDAP*,const PCHAR,LDAPModA*[],PLDAPControlA*,PLDAPControlA*,ULONG*);
WINLDAPAPI ULONG ldap_modify_extW(LDAP*,const PWCHAR,LDAPModW*[],PLDAPControlW*,PLDAPControlW*,ULONG*);
WINLDAPAPI ULONG ldap_modify_ext_sA(LDAP*,const PCHAR,LDAPModA*[],PLDAPControlA*,PLDAPControlA*);
WINLDAPAPI ULONG ldap_modify_ext_sW(LDAP*,const PWCHAR,LDAPModW*[],PLDAPControlW*,PLDAPControlW*);
WINLDAPAPI ULONG ldap_modifyA(LDAP*,const PCHAR,LDAPModA*[]);
WINLDAPAPI ULONG ldap_modifyW(LDAP*,const PWCHAR,LDAPModW*[]);
WINLDAPAPI ULONG ldap_modify_sA(LDAP*,const PCHAR,LDAPModA*[]);
WINLDAPAPI ULONG ldap_modify_sW(LDAP*,const PWCHAR,LDAPModW*[]);
WINLDAPAPI ULONG ldap_rename_extA(LDAP*,const PCHAR,const PCHAR,const PCHAR,INT,PLDAPControlA*,PLDAPControlA*,ULONG*);
WINLDAPAPI ULONG ldap_rename_extW(LDAP*,const PWCHAR,const PWCHAR,const PWCHAR,INT,PLDAPControlW*,PLDAPControlW*,ULONG*);
WINLDAPAPI ULONG ldap_rename_ext_sA(LDAP*,const PCHAR,const PCHAR,const PCHAR,INT,PLDAPControlA*,PLDAPControlA*);
WINLDAPAPI ULONG ldap_rename_ext_sW(LDAP*,const PWCHAR,const PWCHAR,const PWCHAR,INT,PLDAPControlW*,PLDAPControlW*);
WINLDAPAPI ULONG ldap_modrdnA(LDAP*,PCHAR,PCHAR) _WINLDAP_DEPRECATED;
WINLDAPAPI ULONG ldap_modrdnW(LDAP*,PWCHAR,PWCHAR) _WINLDAP_DEPRECATED;
WINLDAPAPI ULONG ldap_modrdn_sA(LDAP*,PCHAR,PCHAR) _WINLDAP_DEPRECATED;
WINLDAPAPI ULONG ldap_modrdn_sW(LDAP*,PWCHAR,PWCHAR) _WINLDAP_DEPRECATED;
WINLDAPAPI ULONG ldap_modrdn2A(LDAP*,PCHAR,PCHAR,INT) _WINLDAP_DEPRECATED;
WINLDAPAPI ULONG ldap_modrdn2W(LDAP*,PWCHAR,PWCHAR,INT) _WINLDAP_DEPRECATED;
WINLDAPAPI ULONG ldap_modrdn2_sA(LDAP*,PCHAR,PCHAR,INT) _WINLDAP_DEPRECATED;
WINLDAPAPI ULONG ldap_modrdn2_sW(LDAP*,PWCHAR,PWCHAR,INT) _WINLDAP_DEPRECATED;
WINLDAPAPI ULONG ldap_add_extA(LDAP*,const PCHAR,LDAPModA*[],PLDAPControlA*,PLDAPControlA*,ULONG*);
WINLDAPAPI ULONG ldap_add_extW(LDAP*,const PWCHAR,LDAPModW*[],PLDAPControlW*,PLDAPControlW*,ULONG*);
WINLDAPAPI ULONG ldap_add_ext_sA(LDAP*,const PCHAR,LDAPModA*[],PLDAPControlA*,PLDAPControlA*);
WINLDAPAPI ULONG ldap_add_ext_sW(LDAP*,const PWCHAR,LDAPModW*[],PLDAPControlW*,PLDAPControlW*);
WINLDAPAPI ULONG ldap_addA(LDAP*,const PCHAR,LDAPModA*[]);
WINLDAPAPI ULONG ldap_addW(LDAP*,const PWCHAR,LDAPModW*[]);
WINLDAPAPI ULONG ldap_add_sA(LDAP*,const PCHAR,LDAPModA*[]);
WINLDAPAPI ULONG ldap_add_sW(LDAP*,const PWCHAR,LDAPModW*[]);
WINLDAPAPI ULONG ldap_delete_extA(LDAP*,const PCHAR,PLDAPControlA*,PLDAPControlA*,ULONG*);
WINLDAPAPI ULONG ldap_delete_extW(LDAP*,const PWCHAR,PLDAPControlW*,PLDAPControlW*,ULONG*);
WINLDAPAPI ULONG ldap_delete_ext_sA(LDAP*,const PCHAR,PLDAPControlA*,PLDAPControlA*);
WINLDAPAPI ULONG ldap_delete_ext_sW(LDAP*,const PWCHAR,PLDAPControlW*,PLDAPControlW*);
WINLDAPAPI ULONG ldap_deleteA(LDAP*,const PCHAR);
WINLDAPAPI ULONG ldap_deleteW(LDAP*,const PWCHAR);
WINLDAPAPI ULONG ldap_delete_sA(LDAP*,const PCHAR);
WINLDAPAPI ULONG ldap_delete_sW(LDAP*,const PWCHAR);
WINLDAPAPI ULONG ldap_extended_operationA(LDAP*,const PCHAR,const struct berval*,PLDAPControlA*,PLDAPControlA*,ULONG*);
WINLDAPAPI ULONG ldap_extended_operationW(LDAP*,const PWCHAR,const struct berval*,PLDAPControlW*,PLDAPControlW*,ULONG*);
WINLDAPAPI ULONG ldap_extended_operation_sA(LDAP*,const PCHAR,const struct berval*,PLDAPControlA*,PLDAPControlA*,PCHAR*,struct berval**);
WINLDAPAPI ULONG ldap_extended_operation_sW(LDAP*,const PWCHAR,const struct berval*,PLDAPControlW*,PLDAPControlW*,PWCHAR*,struct berval**);
WINLDAPAPI ULONG ldap_close_extended_op(LDAP*,ULONG);
WINLDAPAPI ULONG ldap_abandon(LDAP*,ULONG);
WINLDAPAPI ULONG ldap_result(LDAP*,ULONG,ULONG,struct l_timeval*,LDAPMessage**);
WINLDAPAPI ULONG ldap_msgfree(LDAPMessage*);
WINLDAPAPI ULONG ldap_parse_resultA(LDAP*,LDAPMessage*,ULONG*,PCHAR*,PCHAR*,PCHAR**,PLDAPControlA**,BOOLEAN);
WINLDAPAPI ULONG ldap_parse_resultW(LDAP*,LDAPMessage*,ULONG*,PWCHAR*,PWCHAR*,PWCHAR**,PLDAPControlW**,BOOLEAN);
WINLDAPAPI ULONG ldap_parse_extended_resultA(LDAP,LDAPMessage*,PCHAR*,struct berval**,BOOLEAN);
WINLDAPAPI ULONG ldap_parse_extended_resultW(LDAP,LDAPMessage*,PWCHAR*,struct berval**,BOOLEAN);
WINLDAPAPI PCHAR ldap_err2stringA(ULONG);
WINLDAPAPI PWCHAR ldap_err2stringW(ULONG);
WINLDAPAPI ULONG LdapGetLastError(void);
WINLDAPAPI ULONG LdapMapErrorToWin32(ULONG);
WINLDAPAPI ULONG ldap_result2error(LDAP*,LDAPMessage*,ULONG);
WINLDAPAPI PLDAPMessage ldap_first_entry(LDAP*,LDAPMessage*);
WINLDAPAPI PLDAPMessage ldap_next_entry(LDAP*,LDAPMessage*);
WINLDAPAPI PLDAPMessage ldap_first_reference(LDAP*,LDAPMessage*);
WINLDAPAPI PLDAPMessage ldap_next_reference(LDAP*,LDAPMessage*);
WINLDAPAPI ULONG ldap_count_entries(LDAP*,LDAPMessage*);
WINLDAPAPI ULONG ldap_count_references(LDAP*,LDAPMessage*);
WINLDAPAPI PCHAR ldap_first_attributeA(LDAP*,LDAPMessage*,BerElement**);
WINLDAPAPI PWCHAR ldap_first_attributeW(LDAP*,LDAPMessage*,BerElement**);
WINLDAPAPI PCHAR ldap_next_attributeA(LDAP*,LDAPMessage*,BerElement*);
WINLDAPAPI PWCHAR ldap_next_attributeW(LDAP*,LDAPMessage*,BerElement*);
WINLDAPAPI VOID ldap_memfreeA(PCHAR);
WINLDAPAPI VOID ldap_memfreeW(PWCHAR);
WINLDAPAPI PCHAR* ldap_get_valuesA(LDAP*,LDAPMessage*,const PCHAR);
WINLDAPAPI PWCHAR* ldap_get_valuesW(LDAP*,LDAPMessage*,const PWCHAR);
WINLDAPAPI BerValue** ldap_get_values_lenA(LDAP*,LDAPMessage*,const PCHAR);
WINLDAPAPI BerValue** ldap_get_values_lenW(LDAP*,LDAPMessage*,const PWCHAR);
WINLDAPAPI ULONG ldap_count_valuesA(PCHAR*);
WINLDAPAPI ULONG ldap_count_valuesW(PWCHAR*);
WINLDAPAPI ULONG ldap_count_values_len(struct berval**);
WINLDAPAPI ULONG ldap_value_freeA(PCHAR*);
WINLDAPAPI ULONG ldap_value_freeW(PWCHAR*);
WINLDAPAPI ULONG ldap_value_free_len(struct berval**);
WINLDAPAPI PCHAR ldap_get_dnA(LDAP*,LDAPMessage*);
WINLDAPAPI PWCHAR ldap_get_dnW(LDAP*,LDAPMessage*);
WINLDAPAPI PCHAR ldap_explode_dnA(PCHAR,ULONG);
WINLDAPAPI PWCHAR ldap_explode_dnW(PWCHAR,ULONG);
WINLDAPAPI PCHAR ldap_dn2ufnA(PCHAR);
WINLDAPAPI PWCHAR ldap_dn2ufnW(PWCHAR);
WINLDAPAPI ULONG ldap_ufn2dnA(const PCHAR,PCHAR*);
WINLDAPAPI ULONG ldap_ufn2dnW(const PWCHAR,PWCHAR*);
WINLDAPAPI ULONG ldap_parse_referenceA(LDAP*,LDAPMessage*,PCHAR**);
WINLDAPAPI ULONG ldap_parse_referenceW(LDAP*,LDAPMessage*,PWCHAR**);
WINLDAPAPI ULONG ldap_check_filterA(LDAP*,PCHAR);
WINLDAPAPI ULONG ldap_check_filterW(LDAP*,PWCHAR);
WINLDAPAPI ULONG ldap_create_page_controlA(PLDAP,ULONG,struct berval*,UCHAR,PLDAPControlA*);
WINLDAPAPI ULONG ldap_create_page_controlW(PLDAP,ULONG,struct berval*,UCHAR,PLDAPControlW*);
WINLDAPAPI ULONG ldap_create_sort_controlA(PLDAP,PLDAPSortKeyA*,UCHAR,PLDAPControlA*);
WINLDAPAPI ULONG ldap_create_sort_controlW(PLDAP,PLDAPSortKeyW*,UCHAR,PLDAPControlW*);
WINLDAPAPI INT ldap_create_vlv_controlA(LDAP*,LDAPVLVInfo*,UCHAR,LDAPControlA**);
WINLDAPAPI INT ldap_create_vlv_controlW(LDAP*,LDAPVLVInfo*,UCHAR,LDAPControlW**);
WINLDAPAPI ULONG ldap_encode_sort_controlA(PLDAP,PLDAPSortKeyA*,PLDAPControlA,BOOLEAN);
WINLDAPAPI ULONG ldap_encode_sort_controlW(PLDAP,PLDAPSortKeyW*,PLDAPControlW,BOOLEAN);
WINLDAPAPI ULONG ldap_escape_filter_elementA(PCHAR,ULONG,PCHAR,ULONG);
WINLDAPAPI ULONG ldap_escape_filter_elementW(PWCHAR,ULONG,PWCHAR,ULONG);
WINLDAPAPI ULONG ldap_get_next_page(PLDAP,PLDAPSearch,ULONG,ULONG*);
WINLDAPAPI ULONG ldap_get_next_page_s(PLDAP,PLDAPSearch,struct l_timeval*,ULONG,ULONG*,LDAPMessage**);
WINLDAPAPI ULONG ldap_get_paged_count(PLDAP,PLDAPSearch,ULONG*,PLDAPMessage);
WINLDAPAPI ULONG ldap_parse_page_controlA(PLDAP,PLDAPControlA*,ULONG*,struct berval**);
WINLDAPAPI ULONG ldap_parse_page_controlW(PLDAP,PLDAPControlW*,ULONG*,struct berval**);
WINLDAPAPI ULONG ldap_parse_sort_controlA(PLDAP,PLDAPControlA*,ULONG*,PCHAR*);
WINLDAPAPI ULONG ldap_parse_sort_controlW(PLDAP,PLDAPControlW*,ULONG*,PWCHAR*);
WINLDAPAPI INT ldap_parse_vlv_controlA(LDAP*,LDAPControlA**,unsigned long*,unsigned long*,struct berval**,int*);
WINLDAPAPI INT ldap_parse_vlv_controlW(LDAP*,LDAPControlW**,unsigned long*,unsigned long*,struct berval**,int*);
WINLDAPAPI PLDAPSearch ldap_search_init_pageA(PLDAP,const PCHAR,ULONG,const PCHAR,PCHAR[],ULONG,PLDAPControlA*,PLDAPControlA*,ULONG,ULONG,PLDAPSortKeyA*);
WINLDAPAPI PLDAPSearch ldap_search_init_pageW(PLDAP,const PWCHAR,ULONG,const PWCHAR,PWCHAR[],ULONG,PLDAPControlW*,PLDAPControlW*,ULONG,ULONG,PLDAPSortKeyW*);
WINLDAPAPI ULONG ldap_search_abandon_page(PLDAP,PLDAPSearch);
WINLDAPAPI LDAP ldap_conn_from_msg(LDAP*,LDAPMessage*);
WINLDAPAPI INT LdapUnicodeToUTF8(LPCWSTR,int,LPSTR,int);
WINLDAPAPI INT LdapUTF8ToUnicode(LPCSTR,int,LPWSTR,int);
#if UNICODE
#define LDAPControl LDAPControlW
#define PLDAPControl PLDAPControlW
#define LDAPMod LDAPModW
#define PLDAPMod LDAPModW
#define LDAPSortKey LDAPSortKeyW
#define PLDAPSortKey PLDAPSortKeyW
#define LDAPAPIInfo LDAPAPIInfoW
#define PLDAPAPIInfo PLDAPAPIInfoW
#define LDAPAPIFeatureInfo LDAPAPIFeatureInfoW
#define PLDAPAPIFeatureInfo PLDAPAPIFeatureInfoW
#define cldap_open cldap_openW
#define ldap_open ldap_openW
#define ldap_bind ldap_bindW
#define ldap_bind_s ldap_bind_sW
#define ldap_simple_bind ldap_simple_bindW
#define ldap_simple_bind_s ldap_simple_bind_sW
#define ldap_sasl_bind ldap_sasl_bindW
#define ldap_sasl_bind_s ldap_sasl_bind_sW
#define ldap_init ldap_initW
#define ldap_sslinit ldap_sslinitW
#define ldap_get_option ldap_get_optionW
#define ldap_set_option ldap_set_optionW
#define ldap_start_tls_s ldap_start_tls_sW
#define ldap_add ldap_addW
#define ldap_add_ext ldap_add_extW
#define ldap_add_s ldap_add_sW
#define ldap_add_ext_s ldap_add_ext_sW
#define ldap_compare ldap_compareW
#define ldap_compare_ext ldap_compare_extW
#define ldap_compare_s ldap_compare_sW
#define ldap_compare_ext_s ldap_compare_ext_sW
#define ldap_delete ldap_deleteW
#define ldap_delete_ext ldap_delete_extW
#define ldap_delete_s ldap_delete_sW
#define ldap_delete_ext_s ldap_delete_ext_sW
#define ldap_extended_operation_s ldap_extended_operation_sW
#define ldap_extended_operation ldap_extended_operationW
#define ldap_modify ldap_modifyW
#define ldap_modify_ext ldap_modify_extW
#define ldap_modify_s ldap_modify_sW
#define ldap_modify_ext_s ldap_modify_ext_sW
#define ldap_check_filter ldap_check_filterW
#define ldap_count_values ldap_count_valuesW
#define ldap_create_page_control ldap_create_page_controlW
#define ldap_create_sort_control ldap_create_sort_controlW
#define ldap_create_vlv_control ldap_create_vlv_controlW
#define ldap_encode_sort_control ldap_encode_sort_controlW
#define ldap_escape_filter_element ldap_escape_filter_elementW
#define ldap_first_attribute ldap_first_attributeW
#define ldap_next_attribute ldap_next_attributeW
#define ldap_get_values ldap_get_valuesW
#define ldap_get_values_len ldap_get_values_lenW
#define ldap_parse_extended_result ldap_parse_extended_resultW
#define ldap_parse_page_control ldap_parse_page_controlW
#define ldap_parse_reference ldap_parse_referenceW
#define ldap_parse_result ldap_parse_resultW
#define ldap_parse_sort_control ldap_parse_sort_controlW
#define ldap_parse_vlv_control ldap_parse_vlv_controlW
#define ldap_search ldap_searchW
#define ldap_search_s ldap_search_sW
#define ldap_search_st ldap_search_stW
#define ldap_search_ext ldap_search_extW
#define ldap_search_ext_s ldap_search_ext_sW
#define ldap_search_init_page ldap_search_init_pageW
#define ldap_err2string ldap_err2stringW
#define ldap_control_free ldap_control_freeW
#define ldap_controls_free ldap_controls_freeW
#define ldap_free_controls ldap_free_controlsW
#define ldap_memfree ldap_memfreeW
#define ldap_value_free ldap_value_freeW
#define ldap_dn2ufn ldap_dn2ufnW
#define ldap_ufn2dn ldap_ufn2dnW
#define ldap_explode_dn ldap_explode_dnW
#define ldap_get_dn ldap_get_dnW
#define ldap_modrdn ldap_modrdnW
#define ldap_modrdn_s ldap_modrdn_sW
#define ldap_modrdn2 ldap_modrdn2W
#define ldap_modrdn2_s ldap_modrdn2_sW
#define ldap_rename ldap_rename_extW
#define ldap_rename_s ldap_rename_ext_sW
#define ldap_rename_ext ldap_rename_extW
#define ldap_rename_ext_s ldap_rename_ext_sW
#else
#define LDAPControl LDAPControlA
#define PLDAPControl PLDAPControlA
#define LDAPMod LDAPModA
#define PLDAPMod LDAPModA
#define LDAPSortKey LDAPSortKeyA
#define PLDAPSortKey PLDAPSortKeyA
#define LDAPAPIInfo LDAPAPIInfoA
#define PLDAPAPIInfo PLDAPAPIInfoA
#define LDAPAPIFeatureInfo LDAPAPIFeatureInfoA
#define PLDAPAPIFeatureInfo PLDAPAPIFeatureInfoA
#define cldap_open cldap_openA
#define ldap_open ldap_openA
#define ldap_bind ldap_bindA
#define ldap_bind_s ldap_bind_sA
#define ldap_simple_bind ldap_simple_bindA
#define ldap_simple_bind_s ldap_simple_bind_sA
#define ldap_sasl_bind ldap_sasl_bindA
#define ldap_sasl_bind_s ldap_sasl_bind_sA
#define ldap_init ldap_initA
#define ldap_sslinit ldap_sslinitA
#define ldap_get_option ldap_get_optionA
#define ldap_set_option ldap_set_optionA
#define ldap_start_tls_s ldap_start_tls_sA
#define ldap_add ldap_addA
#define ldap_add_ext ldap_add_extA
#define ldap_add_s ldap_add_sA
#define ldap_add_ext_s ldap_add_ext_sA
#define ldap_compare ldap_compareA
#define ldap_compare_ext ldap_compare_extA
#define ldap_compare_s ldap_compare_sA
#define ldap_compare_ext_s ldap_compare_ext_sA
#define ldap_delete ldap_deleteA
#define ldap_delete_ext ldap_delete_extA
#define ldap_delete_s ldap_delete_sA
#define ldap_delete_ext_s ldap_delete_ext_sA
#define ldap_extended_operation_s ldap_extended_operation_sA
#define ldap_extended_operation ldap_extended_operationA
#define ldap_modify ldap_modifyA
#define ldap_modify_ext ldap_modify_extA
#define ldap_modify_s ldap_modify_sA
#define ldap_modify_ext_s ldap_modify_ext_sA
#define ldap_check_filter ldap_check_filterA
#define ldap_count_values ldap_count_valuesA
#define ldap_create_page_control ldap_create_page_controlA
#define ldap_create_sort_control ldap_create_sort_controlA
#define ldap_create_vlv_control ldap_create_vlv_controlA
#define ldap_encode_sort_control ldap_encode_sort_controlA
#define ldap_escape_filter_element ldap_escape_filter_elementA
#define ldap_first_attribute ldap_first_attributeA
#define ldap_next_attribute ldap_next_attributeA
#define ldap_get_values ldap_get_valuesA
#define ldap_get_values_len ldap_get_values_lenA
#define ldap_parse_extended_result ldap_parse_extended_resultA
#define ldap_parse_page_control ldap_parse_page_controlA
#define ldap_parse_reference ldap_parse_referenceA
#define ldap_parse_result ldap_parse_resultA
#define ldap_parse_sort_control ldap_parse_sort_controlA
#define ldap_parse_vlv_control ldap_parse_vlv_controlA
#define ldap_search ldap_searchA
#define ldap_search_s ldap_search_sA
#define ldap_search_st ldap_search_stA
#define ldap_search_ext ldap_search_extA
#define ldap_search_ext_s ldap_search_ext_sA
#define ldap_search_init_page ldap_search_init_pageA
#define ldap_err2string ldap_err2stringA
#define ldap_control_free ldap_control_freeA
#define ldap_controls_free ldap_controls_freeA
#define ldap_free_controls ldap_free_controlsA
#define ldap_memfree ldap_memfreeA
#define ldap_value_free ldap_value_freeA
#define ldap_dn2ufn ldap_dn2ufnA
#define ldap_ufn2dn ldap_ufn2dnA
#define ldap_explode_dn ldap_explode_dnA
#define ldap_get_dn ldap_get_dnA
#define ldap_modrdn ldap_modrdnA
#define ldap_modrdn_s ldap_modrdn_sA
#define ldap_modrdn2 ldap_modrdn2A
#define ldap_modrdn2_s ldap_modrdn2_sA
#define ldap_rename ldap_rename_extA
#define ldap_rename_s ldap_rename_ext_sA
#define ldap_rename_ext ldap_rename_extA
#define ldap_rename_ext_s ldap_rename_ext_sA
#endif
#ifdef __cplusplus
}
#endif
#include <poppack.h>
#endif /* _WINLDAP_H */
--- NEW FILE: winsnmp.h ---
/*
winsnmp.h - Header file for the Windows SNMP API
Written by Filip Navara <xn...@vo...>
References (2003-08-25):
Windows SNMP
http://www.winsnmp.com/docs/winsnmp.doc
WinSNMP v2.0 Addendum
http://www.winsnmp.com/docs/winsnmp2.txt
WinSNMP v3.0 API Addendum
http://www.winsnmp.com/docs/winsnmp3.htm
WinSNMP Reference
http://msdn.microsoft.com/library/en-us/snmp/snmp/winsnmp_api_reference.asp
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.
*/
#ifndef _WINSNMP_H
#define _WINSNMP_H
#if __GNUC__ >= 3
#pragma GCC system_header
#endif
#ifndef _WINDOWS_H
#include <windows.h>
#endif
#include <pshpack4.h>
#ifndef WINSNMPAPI
#define WINSNMPAPI WINAPI
#endif
#ifdef __cplusplus
extern "C" {
#endif
#define MAXOBJIDSIZE 128
#define MAXOBJIDSTRSIZE 1408
#define MAXVENDORINFO 32
#ifndef _SNMP_ASN_DEFINED
#define _SNMP_ASN_DEFINED
#define ASN_UNIVERSAL 0x00
#define ASN_PRIMITIVE 0x00
#define ASN_CONSTRUCTOR 0x20
#define ASN_APPLICATION 0x40
#define ASN_CONTEXT 0x80
#define ASN_PRIVATE 0xC0
#define SNMP_PDU_GET (ASN_CONTEXT | ASN_CONSTRUCTOR | 0)
#define SNMP_PDU_GETNEXT (ASN_CONTEXT | ASN_CONSTRUCTOR | 1)
#define SNMP_PDU_RESPONSE (ASN_CONTEXT | ASN_CONSTRUCTOR | 2)
#define SNMP_PDU_SET (ASN_CONTEXT | ASN_CONSTRUCTOR | 3)
#define SNMP_PDU_GETBULK (ASN_CONTEXT | ASN_CONSTRUCTOR | 4)
#define SNMP_PDU_V1TRAP (ASN_CONTEXT | ASN_CONSTRUCTOR | 4)
#define SNMP_PDU_INFORM (ASN_CONTEXT | ASN_CONSTRUCTOR | 6)
#define SNMP_PDU_TRAP (ASN_CONTEXT | ASN_CONSTRUCTOR | 7)
#define SNMP_PDU_REPORT (ASN_CONTEXT | ASN_CONSTRUCTOR | 8)
#endif /* _SNMP_ASN_DEFINED */
#define SNMP_SYNTAX_SEQUENCE (ASN_UNIVERSAL | ASN_CONSTRUCTOR | 0x10)
#define SNMP_SYNTAX_INT (ASN_UNIVERSAL | ASN_PRIMITIVE | 0x02)
#define SNMP_SYNTAX_BITS (ASN_UNIVERSAL | ASN_PRIMITIVE | 0x03)
#define SNMP_SYNTAX_OCTETS (ASN_UNIVERSAL | ASN_PRIMITIVE | 0x04)
#define SNMP_SYNTAX_NULL (ASN_UNIVERSAL | ASN_PRIMITIVE | 0x05)
#define SNMP_SYNTAX_OID (ASN_UNIVERSAL | ASN_PRIMITIVE | 0x06)
#define SNMP_SYNTAX_IPADDR (ASN_APPLICATION | ASN_PRIMITIVE | 0x00)
#define SNMP_SYNTAX_CNTR32 (ASN_APPLICATION | ASN_PRIMITIVE | 0x01)
#define SNMP_SYNTAX_GAUGE32 (ASN_APPLICATION | ASN_PRIMITIVE | 0x02)
#define SNMP_SYNTAX_TIMETICKS (ASN_APPLICATION | ASN_PRIMITIVE | 0x03)
#define SNMP_SYNTAX_OPAQUE (ASN_APPLICATION | ASN_PRIMITIVE | 0x04)
#define SNMP_SYNTAX_NSAPADDR (ASN_APPLICATION | ASN_PRIMITIVE | 0x05)
#define SNMP_SYNTAX_CNTR64 (ASN_APPLICATION | ASN_PRIMITIVE | 0x06)
#define SNMP_SYNTAX_UINT32 (ASN_APPLICATION | ASN_PRIMITIVE | 0x07)
#define SNMP_SYNTAX_NOSUCHOBJECT (ASN_CONTEXT | ASN_PRIMITIVE | 0x00)
#define SNMP_SYNTAX_NOSUCHINSTANCE (ASN_CONTEXT | ASN_PRIMITIVE | 0x01)
#define SNMP_SYNTAX_ENDOFMIBVIEW (ASN_CONTEXT | ASN_PRIMITIVE | 0x02)
#define SNMP_SYNTAX_INT32 SNMP_SYNTAX_INT
#define SNMP_TRAP_COLDSTART 0
#define SNMP_TRAP_WARMSTART 1
#define SNMP_TRAP_LINKDOWN 2
#define SNMP_TRAP_LINKUP 3
#define SNMP_TRAP_AUTHFAIL 4
#define SNMP_TRAP_EGPNEIGHBORLOSS 5
#define SNMP_TRAP_ENTERPRISESPECIFIC 6
#define SNMP_ERROR_NOERROR 0
#define SNMP_ERROR_TOOBIG 1
#define SNMP_ERROR_NOSUCHNAME 2
#define SNMP_ERROR_BADVALUE 3
#define SNMP_ERROR_READONLY 4
#define SNMP_ERROR_GENERR 5
#define SNMP_ERROR_NOACCESS 6
#define SNMP_ERROR_WRONGTYPE 7
#define SNMP_ERROR_WRONGLENGTH 8
#define SNMP_ERROR_WRONGENCODING 9
#define SNMP_ERROR_WRONGVALUE 10
#define SNMP_ERROR_NOCREATION 11
#define SNMP_ERROR_INCONSISTENTVALUE 12
#define SNMP_ERROR_RESOURCEUNAVAILABLE 13
#define SNMP_ERROR_COMMITFAILED 14
#define SNMP_ERROR_UNDOFAILED 15
#define SNMP_ERROR_AUTHORIZATIONERROR 16
#define SNMP_ERROR_NOTWRITABLE 17
#define SNMP_ERROR_INCONSISTENTNAME 18
#define SNMP_SEC_MODEL_V1 1
#define SNMP_SEC_MODEL_V2 2
#define SNMP_SEC_MODEL_USM 3
#define SNMP_NOAUTH_NOPRIV 0
#define SNMP_AUTH_NOPRIV 1
#define SNMP_AUTH_PRIV 3
#define SNMP_USM_NO_AUTH_PROTOCOL 1
#define SNMP_USM_HMACMD5_AUTH_PROTOCOL 2
#define SNMP_USM_HMACSHA_AUTH_PROTOCOL 3
#define SNMP_USM_NO_PRIV_PROTOCOL 1
#define SNMP_USM_DES_PRIV_PROTOCOL 2
#define SNMPAPI_TRANSLATED 0
#define SNMPAPI_UNTRANSLATED_V1 1
#define SNMPAPI_UNTRANSLATED_V2 2
#define SNMPAPI_UNTRANSLATED_V3 3
#define SNMPAPI_OFF 0
#define SNMPAPI_ON 1
#define SNMPAPI_FAILURE 0
#define SNMPAPI_SUCCESS 1
#define SNMPAPI_NO_SUPPORT 0
#define SNMPAPI_V1_SUPPORT 1
#define SNMPAPI_V2_SUPPORT 2
#define SNMPAPI_M2M_SUPPORT 3
#define SNMPAPI_V3_SUPPORT 3
#define SNMPAPI_ALLOC_ERROR 2
#define SNMPAPI_CONTEXT_INVALID 3
#define SNMPAPI_CONTEXT_UNKNOWN 4
#define SNMPAPI_ENTITY_INVALID 5
#define SNMPAPI_ENTITY_UNKNOWN 6
#define SNMPAPI_INDEX_INVALID 7
#define SNMPAPI_NOOP 8
#define SNMPAPI_OID_INVALID 9
#define SNMPAPI_OPERATION_INVALID 10
#define SNMPAPI_OUTPUT_TRUNCATED 11
#define SNMPAPI_PDU_INVALID 12
#define SNMPAPI_SESSION_INVALID 13
#define SNMPAPI_SYNTAX_INVALID 14
#define SNMPAPI_VBL_INVALID 15
#define SNMPAPI_MODE_INVALID 16
#define SNMPAPI_SIZE_INVALID 17
#define SNMPAPI_NOT_INITIALIZED 18
#define SNMPAPI_MESSAGE_INVALID 19
#define SNMPAPI_HWND_INVALID 20
#define SNMPAPI_ENGINE_INVALID 30
#define SNMPAPI_ENGINE_DISCOVERY_FAILED 31
#define SNMPAPI_OTHER_ERROR 99
#define SNMPAPI_TL_NOT_INITIALIZED 100
#define SNMPAPI_TL_NOT_SUPPORTED 101
#define SNMPAPI_TL_NOT_AVAILABLE 102
#define SNMPAPI_TL_RESOURCE_ERROR 103
#define SNMPAPI_TL_UNDELIVERABLE 104
#define SNMPAPI_TL_SRC_INVALID 105
#define SNMPAPI_TL_INVALID_PARAM 106
#define SNMPAPI_TL_IN_USE 107
#define SNMPAPI_TL_TIMEOUT 108
#define SNMPAPI_TL_PDU_TOO_BIG 109
#define SNMPAPI_TL_OTHER 199
#define SNMPAPI_RPT_INVALIDMSG 200
#define SNMPAPI_RPT_INASNPARSEERR 201
#define SNMPAPI_RPT_UNKNOWNSECMODEL 202
#define SNMPAPI_RPT_UNKNOWNENGINEID 203
#define SNMPAPI_RPT_UNSUPPSECLEVEL 204
#define SNMPAPI_RPT_UNKNOWNUSERNAME 205
#define SNMPAPI_RPT_WRONGDIGEST 206
#define SNMPAPI_RPT_NOTINTIMEWINDOW 207
#d...
[truncated message content] |
Update of /cvsroot/mingw/w32api/lib In directory sc8-pr-cvs1:/tmp/cvs-serv18099/lib Added Files: igmpagnt.def mshtml-uuid.c oleacc.def powrprof.def snmpapi.def wldap32.def wsnmp32.def Log Message: Merge winsup changes --- NEW FILE: igmpagnt.def --- LIBRARY igmpagnt.dll EXPORTS SnmpExtensionClose@0 SnmpExtensionInit@12 SnmpExtensionQuery@16 SnmpExtensionTrap@20 --- NEW FILE: mshtml-uuid.c --- /* mshtml-uuid.c */ /* Generate GUIDs for MSHTML interfaces */ #define INITGUID #include <basetyps.h> DEFINE_GUID(IID_IHTMLDocument,0x626fc520,0xa41e,0x11cf,0xa7,0x31,0x0,0xa0,0xc9,0x8,0x26,0x37); DEFINE_GUID(IID_IHTMLDocument2,0x332c4425,0x26cb,0x11d0,0xb4,0x83,0x0,0xc0,0x4f,0xd9,0x1,0x19); DEFINE_GUID(IID_IHTMLElement,0x3050f1ff,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0xb); DEFINE_GUID(IID_IHTMLSelectionObject,0x3050f25a,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0xb); DEFINE_GUID(IID_IHTMLTxtRange,0x3050f220,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b); DEFINE_GUID(IID_IHTMLImgElement,0x3050f240,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b); DEFINE_GUID(IID_IHTMLBodyElement,0x3050f1d8,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b); DEFINE_GUID(IID_IHTMLFontElement,0x3050f1d9,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b); DEFINE_GUID(IID_IHTMLAnchorElement,0x3050f1da,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b); DEFINE_GUID(IID_IHTMLUListElement,0x3050f1dd,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b); DEFINE_GUID(IID_IHTMLOListElement,0x3050f1de,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b); DEFINE_GUID(IID_IHTMLLIElement,0x3050f1e0,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b); DEFINE_GUID(IID_IHTMLBRElement,0x3050f1f0,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b); DEFINE_GUID(IID_IHTMLDListElement,0x3050f1f1,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b); DEFINE_GUID(IID_IHTMLDDElement,0x3050f1f2,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b); DEFINE_GUID(IID_IHTMLDTElement,0x3050f1f3,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b); DEFINE_GUID(IID_IHTMLHRElement,0x3050f1f4,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b); DEFINE_GUID(IID_IHTMLParaElement,0x3050f1f5,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b); DEFINE_GUID(IID_IHTMLHeaderElement,0x3050f1f6,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b); DEFINE_GUID(IID_IHTMLFormElement,0x3050f1f7,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b); DEFINE_GUID(IID_IHTMLDivElement,0x3050f200,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b); DEFINE_GUID(IID_IHTMLBaseFontElement,0x3050f202,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b); DEFINE_GUID(IID_IHTMLMetaElement,0x3050f203,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b); DEFINE_GUID(IID_IHTMLBaseElement,0x3050f204,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b); DEFINE_GUID(IID_IHTMLLinkElement,0x3050f205,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b); DEFINE_GUID(IID_IHTMLIsIndexElement,0x3050f206,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b); DEFINE_GUID(IID_IHTMLNextIdElement,0x3050f207,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b); DEFINE_GUID(IID_IHTMLBlockElement,0x3050f208,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b); DEFINE_GUID(IID_IHTMLUnknownElement,0x3050f209,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b); DEFINE_GUID(IID_IHTMLPhraseElement,0x3050f20a,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b); DEFINE_GUID(IID_IHTMLCommentElement,0x3050f20c,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b); DEFINE_GUID(IID_IHTMLListElement,0x3050f20e,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b); DEFINE_GUID(IID_IHTMLOptionElement,0x3050f211,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b); DEFINE_GUID(IID_IHTMLDivPosition,0x3050f212,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b); DEFINE_GUID(IID_IHTMLDialog,0x3050f216,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b); DEFINE_GUID(IID_IHTMLTextElement,0x3050f218,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b); DEFINE_GUID(IID_IHTMLTable,0x3050f21e,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b); DEFINE_GUID(IID_IHTMLElementCollection,0x3050f21f,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b); DEFINE_GUID(IID_IHTMLTextContainer,0x3050f230,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b); DEFINE_GUID(IID_IHTMLTableCol,0x3050f23a,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b); DEFINE_GUID(IID_IHTMLTableSection,0x3050f23b,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b); DEFINE_GUID(IID_IHTMLTableRow,0x3050f23c,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b); DEFINE_GUID(IID_IHTMLTableCell,0x3050f23d,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b); DEFINE_GUID(IID_IHTMLSelectElement,0x3050f244,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b); DEFINE_GUID(IID_IHTMLObjectElement,0x3050f24f,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b); DEFINE_GUID(IID_IHTMLStyle,0x3050f25e,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b); DEFINE_GUID(IID_IHTMLEmbedElement,0x3050f25f,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b); DEFINE_GUID(IID_IHTMLAreaElement,0x3050f265,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b); DEFINE_GUID(IID_IHTMLMapElement,0x3050f266,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b); DEFINE_GUID(IID_IHTMLScriptElement,0x3050f28b,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b); DEFINE_GUID(IID_IHTMLControlRange,0x3050f29c,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b); DEFINE_GUID(IID_IHTMLInputHiddenElement,0x3050f2a4,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b); DEFINE_GUID(IID_IHTMLInputTextElement,0x3050f2a6,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b); DEFINE_GUID(IID_IHTMLTextAreaElement,0x3050f2aa,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b); DEFINE_GUID(IID_IHTMLInputFileElement,0x3050f2ad,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b); DEFINE_GUID(IID_IHTMLInputButtonElement,0x3050f2b2,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b); DEFINE_GUID(IID_IHTMLMarqueeElement,0x3050f2b5,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b); DEFINE_GUID(IID_IHTMLButtonElement,0x3050f2bb,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b); DEFINE_GUID(IID_IHTMLOptionButtonElement,0x3050f2bc,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b); DEFINE_GUID(IID_IHTMLInputImage,0x3050f2c2,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b); DEFINE_GUID(IID_IHTMLStyleSheet,0x3050f2e3,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b); DEFINE_GUID(IID_IHTMLStyleSheetRulesCollection,0x3050f2e5,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b); DEFINE_GUID(IID_IHTMLTableCaption,0x3050f2eb,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b); DEFINE_GUID(IID_IHTMLFrameBase,0x3050f311,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b); DEFINE_GUID(IID_IHTMLFrameElement,0x3050f313,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b); DEFINE_GUID(IID_IHTMLIFrameElement,0x3050f315,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b); DEFINE_GUID(IID_IHTMLFrameSetElement,0x3050f319,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b); DEFINE_GUID(IID_IHTMLTitleElement,0x3050f322,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b); DEFINE_GUID(IID_IHTMLLabelElement,0x3050f32a,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b); DEFINE_GUID(IID_IHTMLEventObj,0x3050f32d,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b); DEFINE_GUID(IID_IHTMLStyleSheetRule,0x3050f357,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b); DEFINE_GUID(IID_IHTMLScreen,0x3050f35c,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b); DEFINE_GUID(IID_IHTMLBGsound,0x3050f369,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b); DEFINE_GUID(IID_IHTMLStyleElement,0x3050f375,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b); DEFINE_GUID(IID_IHTMLFontNamesCollection,0x3050f376,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b); DEFINE_GUID(IID_IHTMLFontSizesCollection,0x3050f377,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b); DEFINE_GUID(IID_IHTMLOptionsHolder,0x3050f378,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b); DEFINE_GUID(IID_IHTMLStyleSheetsCollection,0x3050f37e,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b); DEFINE_GUID(IID_IHTMLAreasCollection,0x3050f383,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b); DEFINE_GUID(IID_IHTMLNoShowElement,0x3050f38a,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b); DEFINE_GUID(IID_IHTMLOptionElementFactory,0x3050f38c,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b); DEFINE_GUID(IID_IHTMLImageElementFactory,0x3050f38e,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b); DEFINE_GUID(IID_IHTMLRuleStyle,0x3050f3cf,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b); DEFINE_GUID(IID_IHTMLStyleFontFace,0x3050f3d5,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b); DEFINE_GUID(IID_IHTMLCurrentStyle,0x3050f3db,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b); DEFINE_GUID(IID_IHTMLSpanFlow,0x3050f3e5,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b); DEFINE_GUID(IID_IHTMLFieldSetElement,0x3050f3e7,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b); DEFINE_GUID(IID_IHTMLLegendElement,0x3050f3ea,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b); DEFINE_GUID(IID_IHTMLFiltersCollection,0x3050f3ee,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b); DEFINE_GUID(IID_IHTMLDatabinding,0x3050f3f2,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b); DEFINE_GUID(IID_IHTMLSpanElement,0x3050f3f3,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b); DEFINE_GUID(IID_IHTMLMimeTypesCollection,0x3050f3fc,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b); DEFINE_GUID(IID_IHTMLPluginsCollection,0x3050f3fd,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b); DEFINE_GUID(IID_IHTMLOpsProfile,0x3050f401,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b); DEFINE_GUID(IID_IHTMLTextRangeMetrics,0x3050f40b,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b); DEFINE_GUID(IID_IHTMLTableRowMetrics,0x3050f413,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b); DEFINE_GUID(IID_IHTMLElement2,0x3050f434,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b); DEFINE_GUID(IID_IHTMLDocument3,0x3050f485,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b); DEFINE_GUID(IID_IHTMLEventObj2,0x3050f48b,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b); DEFINE_GUID(IID_IHTMLUserDataOM,0x3050f48f,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b); DEFINE_GUID(IID_IHTMLTableRow2,0x3050f4a1,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b); DEFINE_GUID(IID_IHTMLStyle2,0x3050f4a2,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b); DEFINE_GUID(IID_IHTMLRect,0x3050f4a3,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b); DEFINE_GUID(IID_IHTMLRectCollection,0x3050f4a4,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b); DEFINE_GUID(IID_IHTMLTextRangeMetrics2,0x3050f4a6,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b); DEFINE_GUID(IID_IHTMLRuleStyle2,0x3050f4ac,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b); DEFINE_GUID(IID_IHTMLTable2,0x3050f4ad,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b); DEFINE_GUID(IID_IHTMLWindow3,0x3050f4ae,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b); DEFINE_GUID(IID_IHTMLDOMAttribute,0x3050f4b0,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b); DEFINE_GUID(IID_IHTMLDOMTextNode,0x3050f4b1,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b); DEFINE_GUID(IID_IHTMLDataTransfer,0x3050f4b3,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b); DEFINE_GUID(IID_IHTMLGenericElement,0x3050f4b7,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b); DEFINE_GUID(IID_IHTMLPersistDataOM,0x3050f4c0,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b); DEFINE_GUID(IID_IHTMLAttributeCollection,0x3050f4c3,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b); DEFINE_GUID(IID_IHTMLPersistData,0x3050f4c5,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b); DEFINE_GUID(IID_IHTMLObjectElement2,0x3050f4cd,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b); DEFINE_GUID(IID_IHTMLBookmarkCollection,0x3050f4ce,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b); DEFINE_GUID(IID_IHTMLUniqueName,0x3050f4d0,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b); DEFINE_GUID(IID_IHTMLLinkElement2,0x3050f4e5,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b); DEFINE_GUID(IID_IHTMLIFrameElement2,0x3050f4e6,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b); DEFINE_GUID(IID_IHTMLControlElement,0x3050f4e9,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b); DEFINE_GUID(IID_IHTMLFormElement2,0x3050f4f6,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b); DEFINE_GUID(IID_IHTMLDOMChildrenCollection,0x3050f5ab,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b); DEFINE_GUID(IID_IHTMLBodyElement2,0x3050f5c5,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b); DEFINE_GUID(IID_IHTMLFrameSetElement2,0x3050f5c6,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b); DEFINE_GUID(IID_IHTMLTableSection2,0x3050f5c7,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b); DEFINE_GUID(IID_IHTMLAppBehavior2,0x3050f5c9,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b); DEFINE_GUID(IID_IHTMLAppBehavior,0x3050f5ca,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b); DEFINE_GUID(IID_IHTMLInputElement,0x3050f5d2,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b); DEFINE_GUID(IID_IHTMLDOMNode,0x3050f5da,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b); DEFINE_GUID(IID_IHTMLDialog2,0x3050f5e0,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b); DEFINE_GUID(IID_IHTMLUrnCollection,0x3050f5e2,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b); DEFINE_GUID(IID_IHTMLModelessInit,0x3050f5e4,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b); DEFINE_GUID(IID_IHTMLDocumentFragment,0x3050f5e5,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b); DEFINE_GUID(IID_IHTMLAreasCollection2,0x3050f5ec,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b); DEFINE_GUID(IID_IHTMLSelectElement2,0x3050f5ed,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b); DEFINE_GUID(IID_IHTMLElementCollection2,0x3050f5ee,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b); DEFINE_GUID(IID_IHTMLFramesCollection2,0x332c4426,0x26cb,0x11d0,0xb4,0x83,0x0,0xc0,0x4f,0xd9,0x01,0x19); DEFINE_GUID(IID_IHTMLWindow2,0x332c4427,0x26cb,0x11d0,0xb4,0x83,0x0,0xc0,0x4f,0xd9,0x01,0x19); DEFINE_GUID(IID_IHTMLLocation,0x163bb1e0,0x6e00,0x11cf,0x83,0x7a,0x48,0xdc,0x04,0xc1,0x0,0x0); --- NEW FILE: oleacc.def --- LIBRARY Oleacc.dll EXPORTS AccessibleChildren@20 AccessibleObjectFromEvent@20 AccessibleObjectFromPoint@16 AccessibleObjectFromWindow@16 CreateStdAccessibleObject@16 CreateStdAccessibleProxyA@20 CreateStdAccessibleProxyW@20 GetOleaccVersionInfo@8 GetRoleTextA@12 GetRoleTextW@12 GetStateTextA@12 GetStateTextW@12 LresultFromObject@12 ObjectFromLresult@16 WindowFromAccessibleObject@8 --- NEW FILE: powrprof.def --- LIBRARY POWRPROF.dll EXPORTS CallNtPowerInformation@20 CanUserWritePwrScheme@0 DeletePwrScheme@4 EnumPwrSchemes@8 GetActivePwrScheme@4 GetCurrentPowerPolicies@8 GetPwrCapabilities@4 GetPwrDiskSpindownRange@8 IsAdminOverrideActive@4 IsPwrHibernateAllowed@0 IsPwrShutdownAllowed@0 IsPwrSuspendAllowed@0 LoadCurrentPwrScheme@16 MergeLegacyPwrScheme@16 ReadGlobalPwrPolicy@4 ReadProcessorPwrScheme@8 ReadPwrScheme@8 SetActivePwrScheme@12 SetSuspendState@12 ValidatePowerPolicies@8 WriteGlobalPwrPolicy@4 WriteProcessorPwrScheme@8 WritePwrScheme@16 --- NEW FILE: snmpapi.def --- LIBRARY snmpapi.dll EXPORTS SnmpSvcAddrIsIpx@12 SnmpSvcAddrToSocket@8 SnmpSvcBufRevAndCpy@12 SnmpSvcBufRevInPlace@8 SnmpSvcDecodeMessage@20 SnmpSvcEncodeMessage@16 SnmpSvcGenerateAuthFailTrap@4 SnmpSvcGenerateColdStartTrap@4 SnmpSvcGenerateLinkDownTrap@8 SnmpSvcGenerateLinkUpTrap@8 SnmpSvcGenerateTrap@20 SnmpSvcGenerateWarmStartTrap@4 SnmpSvcGetUptime@0 SnmpSvcInitUptime@0 SnmpSvcReleaseMessage@4 SnmpSvcReportEvent@16 SnmpSvcSetLogLevel@4 SnmpSvcSetLogType@4 SnmpUtilAnsiToUnicode@12 SnmpUtilDbgPrint SnmpUtilIdsToA@8 SnmpUtilMemAlloc@4 SnmpUtilMemFree@4 SnmpUtilMemReAlloc@8 SnmpUtilOidAppend@8 SnmpUtilOidCmp@8 SnmpUtilOidCpy@8 SnmpUtilOidFree@4 SnmpUtilOidNCmp@12 SnmpUtilOidToA@4 SnmpUtilPrintAsnAny@4 SnmpUtilPrintOid@4 SnmpUtilStrlenW@4 SnmpUtilUnicodeToAnsi@12 SnmpUtilVarBindCpy@8 SnmpUtilVarBindFree@4 SnmpUtilVarBindListCpy@8 SnmpUtilVarBindListFree@4 --- NEW FILE: wldap32.def --- ; ; wldap32.def - Import definition file for the Windows LDAP API ; ; Written by Filip Navara <xn...@vo...> ; ; 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. ; LIBRARY wldap32.dll EXPORTS ldap_abandon ldap_add ldap_get_optionW ldap_unbind ldap_set_optionW LdapGetLastError cldap_open LdapMapErrorToWin32 ldap_compare ldap_delete ldap_result2error ldap_err2string ldap_modify ldap_modrdn ldap_open ldap_first_entry ldap_next_entry cldap_openW LdapUTF8ToUnicode ldap_get_dn ldap_dn2ufn ldap_first_attribute ldap_next_attribute ldap_get_values ldap_get_values_len ldap_count_entries ldap_count_values ldap_value_free ldap_explode_dn ldap_result ldap_msgfree ldap_addW ldap_search ldap_add_s ldap_bind_s ldap_unbind_s ldap_delete_s ldap_modify_s ldap_modrdn_s ldap_search_s ldap_search_st ldap_compare_s LdapUnicodeToUTF8 ber_bvfree cldap_openA ldap_addA ldap_add_ext ldap_add_extA ldap_simple_bind ldap_simple_bind_s ldap_bind ldap_add_extW ldap_add_ext_s ldap_add_ext_sA ldap_add_ext_sW ldap_add_sA ldap_modrdn2 ldap_modrdn2_s ldap_add_sW ldap_bindA ldap_bindW ldap_bind_sA ldap_bind_sW ldap_close_extended_op ldap_compareA ldap_compareW ldap_count_values_len ldap_compare_ext ldap_value_free_len ldap_compare_extA ldap_compare_extW ldap_perror ldap_compare_ext_s ldap_compare_ext_sA ldap_compare_ext_sW ldap_compare_sA ldap_compare_sW ldap_connect ldap_control_free ldap_control_freeA ldap_control_freeW ldap_controls_free ldap_controls_freeA ldap_controls_freeW ldap_count_references ldap_count_valuesA ldap_count_valuesW ldap_create_page_control ldap_create_page_controlA ldap_create_page_controlW ldap_create_sort_control ldap_create_sort_controlA ldap_create_sort_controlW ldap_deleteA ldap_deleteW ldap_delete_ext ldap_delete_extA ldap_delete_extW ldap_delete_ext_s ldap_delete_ext_sA ldap_delete_ext_sW ldap_delete_sA ldap_delete_sW ldap_dn2ufnW ldap_encode_sort_controlA ldap_encode_sort_controlW ldap_err2stringA ldap_err2stringW ldap_escape_filter_elementA ldap_escape_filter_elementW ldap_explode_dnA ldap_explode_dnW ldap_extended_operation ldap_extended_operationA ldap_extended_operationW ldap_first_attributeA ldap_first_attributeW ldap_first_reference ldap_free_controls ldap_free_controlsA ldap_free_controlsW ldap_get_dnA ldap_get_dnW ldap_get_next_page ldap_get_next_page_s ldap_get_option ldap_get_optionA ldap_get_paged_count ldap_get_valuesA ldap_get_valuesW ldap_get_values_lenA ldap_get_values_lenW ldap_init ldap_initA ldap_initW ldap_memfreeA ldap_memfreeW ldap_modifyA ldap_modifyW ldap_modify_ext ldap_modify_extA ldap_modify_extW ldap_modify_ext_s ldap_modify_ext_sA ldap_modify_ext_sW ldap_modify_sA ldap_modify_sW ldap_modrdn2A ldap_modrdn2W ldap_modrdn2_sA ldap_modrdn2_sW ldap_modrdnA ldap_modrdnW ldap_modrdn_sA ldap_modrdn_sW ldap_next_attributeA ldap_next_attributeW ldap_next_reference ldap_openA ldap_openW ldap_parse_page_control ldap_parse_page_controlA ldap_parse_page_controlW ldap_parse_reference ldap_parse_referenceA ldap_parse_referenceW ldap_parse_result ldap_parse_resultA ldap_parse_resultW ldap_parse_sort_control ldap_parse_sort_controlA ldap_parse_sort_controlW ldap_rename_ext ldap_rename_extA ldap_rename_extW ldap_rename_ext_s ldap_rename_ext_sA ldap_rename_ext_sW ldap_searchA ldap_searchW ldap_search_abandon_page ldap_search_ext ldap_search_extA ldap_search_extW ldap_search_ext_s ldap_search_ext_sA ldap_escape_filter_element ldap_set_dbg_flags ldap_set_dbg_routine ldap_memfree ldap_startup ldap_cleanup ldap_search_ext_sW ldap_search_init_page ldap_search_init_pageA ldap_search_init_pageW ldap_search_sA ldap_search_sW ldap_search_stA ldap_search_stW ldap_set_option ldap_set_optionA ldap_simple_bindA ldap_simple_bindW ldap_simple_bind_sA ldap_simple_bind_sW ldap_sslinit ldap_sslinitA ldap_sslinitW ldap_ufn2dn ldap_ufn2dnA ldap_ufn2dnW ldap_value_freeA ldap_value_freeW ldap_check_filterA ldap_check_filterW ldap_dn2ufnA ber_init ber_free ber_bvecfree ber_bvdup ber_alloc_t ber_skip_tag ber_peek_tag ber_first_element ber_next_element ber_flatten ber_printf ber_scanf ldap_conn_from_msg ldap_sasl_bindW ldap_sasl_bind_sW ldap_sasl_bindA ldap_sasl_bind_sA ldap_parse_extended_resultW ldap_parse_extended_resultA ldap_create_vlv_controlW ldap_create_vlv_controlA ldap_parse_vlv_controlW ldap_parse_vlv_controlA ldap_start_tls_sW ldap_start_tls_sA ldap_stop_tls_s ldap_extended_operation_sW ldap_extended_operation_sA --- NEW FILE: wsnmp32.def --- LIBRARY wsnmp32.dll EXPORTS SnmpCancelMsg@8 SnmpCleanup@0 SnmpClose@4 SnmpContextToStr@8 SnmpCountVbl@4 SnmpCreatePdu@24 SnmpCreateSession@16 SnmpCreateVbl@12 SnmpDecodeMsg@24 SnmpDeleteVb@8 SnmpDuplicatePdu@8 SnmpDuplicateVbl@8 SnmpEncodeMsg@24 SnmpEntityToStr@12 SnmpFreeContext@4 SnmpFreeDescriptor@8 SnmpFreeEntity@4 SnmpFreePdu@4 SnmpFreeVbl@4 SnmpGetLastError@4 SnmpGetPduData@24 SnmpGetRetransmitMode@4 SnmpGetRetry@12 SnmpGetTimeout@12 SnmpGetTranslateMode@4 SnmpGetVb@16 SnmpGetVendorInfo@4 SnmpListen@8 SnmpOidCompare@16 SnmpOidCopy@8 SnmpOidToStr@12 SnmpOpen@8 SnmpRecvMsg@20 SnmpRegister@24 SnmpSendMsg@20 SnmpSetPduData@24 SnmpSetPort@8 SnmpSetRetransmitMode@4 SnmpSetRetry@8 SnmpSetTimeout@8 SnmpSetTranslateMode@4 SnmpSetVb@16 SnmpStartup@20 SnmpStrToContext@8 SnmpStrToEntity@8 SnmpStrToOid@8 |
Update of /cvsroot/mingw/w32api/include
In directory sc8-pr-cvs1:/tmp/cvs-serv17014/include
Modified Files:
aclapi.h basetyps.h comcat.h commctrl.h commdlg.h cplext.h
docobj.h lmaccess.h mmsystem.h mshtml.h oaidl.h objidl.h
ocidl.h oleacc.h oleauto.h olectl.h oleidl.h prsht.h
richedit.h rpcdce.h secext.h shellapi.h shlguid.h shlobj.h
shlwapi.h sspi.h unknwn.h w32api.h winbase.h wincrypt.h
wingdi.h wininet.h winioctl.h winnt.h winuser.h
Log Message:
Merge winsup changes
Index: aclapi.h
===================================================================
RCS file: /cvsroot/mingw/w32api/include/aclapi.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** aclapi.h 9 Apr 2002 21:17:17 -0000 1.2
--- aclapi.h 12 Sep 2003 13:26:50 -0000 1.3
***************
*** 1,5 ****
#ifndef _ACLAPI_H
#define _ACLAPI_H
! #if __GNUC__ >=3
#pragma GCC system_header
#endif
--- 1,5 ----
#ifndef _ACLAPI_H
#define _ACLAPI_H
! #if __GNUC__ >= 3
#pragma GCC system_header
#endif
***************
*** 54,64 ****
DWORD WINAPI SetNamedSecurityInfoW(LPWSTR,SE_OBJECT_TYPE,SECURITY_INFORMATION,PSID,PSID,PACL,PACL);
DWORD WINAPI SetSecurityInfo(HANDLE,SE_OBJECT_TYPE,SECURITY_INFORMATION,PSID,PSID,PACL,PACL);
!
! /* These are deprecated by MS and not documented in Aug 2001 PSDK
! BuildImpersonateExplicitAccessWithName[AW]
! BuildImpersonateTrustee[AW]
! GetMultipleTrustee[AW]
! GetMultipleTrusteeOperation[AW]
! */
#ifdef UNICODE
--- 54,65 ----
DWORD WINAPI SetNamedSecurityInfoW(LPWSTR,SE_OBJECT_TYPE,SECURITY_INFORMATION,PSID,PSID,PACL,PACL);
DWORD WINAPI SetSecurityInfo(HANDLE,SE_OBJECT_TYPE,SECURITY_INFORMATION,PSID,PSID,PACL,PACL);
! VOID WINAPI BuildImpersonateExplicitAccessWithNameA(PEXPLICIT_ACCESS_A,LPSTR,PTRUSTEE_A,DWORD,ACCESS_MODE,DWORD);
! VOID WINAPI BuildImpersonateExplicitAccessWithNameW(PEXPLICIT_ACCESS_W,LPWSTR,PTRUSTEE_W,DWORD,ACCESS_MODE,DWORD);
! VOID WINAPI BuildImpersonateTrusteeA(PTRUSTEE_A,PTRUSTEE_A);
! VOID WINAPI BuildImpersonateTrusteeW(PTRUSTEE_W,PTRUSTEE_W);
! PTRUSTEE_A WINAPI GetMultipleTrusteeA(PTRUSTEE_A);
! PTRUSTEE_W WINAPI GetMultipleTrusteeW(PTRUSTEE_W);
! MULTIPLE_TRUSTEE_OPERATION WINAPI GetMultipleTrusteeOperationA(PTRUSTEE_A);
! MULTIPLE_TRUSTEE_OPERATION WINAPI GetMultipleTrusteeOperationW(PTRUSTEE_W);
#ifdef UNICODE
***************
*** 79,82 ****
--- 80,87 ----
#define SetEntriesInAcl SetEntriesInAclW
#define SetNamedSecurityInfo SetNamedSecurityInfoW
+ #define BuildImpersonateExplicitAccessWithName BuildImpersonateExplicitAccessWithNameW
+ #define BuildImpersonateTrustee BuildImpersonateTrusteeW
+ #define GetMultipleTrustee GetMultipleTrusteeW
+ #define GetMultipleTrusteeOperation GetMultipleTrusteeOperationW
#else
#define BuildExplicitAccessWithName BuildExplicitAccessWithNameA
***************
*** 96,99 ****
--- 101,108 ----
#define SetEntriesInAcl SetEntriesInAclA
#define SetNamedSecurityInfo SetNamedSecurityInfoA
+ #define BuildImpersonateExplicitAccessWithName BuildImpersonateExplicitAccessWithNameA
+ #define BuildImpersonateTrustee BuildImpersonateTrusteeA
+ #define GetMultipleTrustee GetMultipleTrusteeA
+ #define GetMultipleTrusteeOperation GetMultipleTrusteeOperationA
#endif /* UNICODE */
Index: basetyps.h
===================================================================
RCS file: /cvsroot/mingw/w32api/include/basetyps.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** basetyps.h 5 Feb 2003 17:44:08 -0000 1.4
--- basetyps.h 12 Sep 2003 13:26:51 -0000 1.5
***************
*** 6,82 ****
#ifndef __OBJC__
! #ifdef __cplusplus
! #define EXTERN_C extern "C"
! #else
! #define EXTERN_C extern
! #endif /* __cplusplus */
! #define STDMETHODCALLTYPE __stdcall
! #define STDMETHODVCALLTYPE __cdecl
! #define STDAPICALLTYPE __stdcall
! #define STDAPIVCALLTYPE __cdecl
! #define STDAPI EXTERN_C HRESULT STDAPICALLTYPE
! #define STDAPI_(t) EXTERN_C t STDAPICALLTYPE
! #define STDMETHODIMP HRESULT STDMETHODCALLTYPE
! #define STDMETHODIMP_(t) t STDMETHODCALLTYPE
! #define STDAPIV EXTERN_C HRESULT STDAPIVCALLTYPE
! #define STDAPIV_(t) EXTERN_C t STDAPIVCALLTYPE
! #define STDMETHODIMPV HRESULT STDMETHODVCALLTYPE
! #define STDMETHODIMPV_(t) t STDMETHODVCALLTYPE
! #define interface struct
! #if defined(__cplusplus) && !defined(CINTERFACE)
! #define STDMETHOD(m) virtual HRESULT STDMETHODCALLTYPE m
! #define STDMETHOD_(t,m) virtual t STDMETHODCALLTYPE m
! #define PURE =0
! #define THIS_
! #define THIS void
/*
! __attribute__((com_interface)) is obsolete in __GNUC__ >= 3
! g++ vtables are now COM-compatible by default
*/
! #if defined(__GNUC__) && __GNUC__ < 3 && !defined(NOCOMATTRIBUTE)
! #define DECLARE_INTERFACE(i) interface __attribute__((com_interface)) i
! #define DECLARE_INTERFACE_(i,b) interface __attribute__((com_interface)) i : public b
! #else
! #define DECLARE_INTERFACE(i) interface i
! #define DECLARE_INTERFACE_(i,b) interface i : public b
! #endif
! #else
! #define STDMETHOD(m) HRESULT(STDMETHODCALLTYPE *m)
! #define STDMETHOD_(t,m) t(STDMETHODCALLTYPE *m)
! #define PURE
! #define THIS_ INTERFACE *,
! #define THIS INTERFACE *
! #ifndef CONST_VTABLE
! #define CONST_VTABLE
! #endif
! #define DECLARE_INTERFACE(i) \
! typedef interface i { CONST_VTABLE struct i##Vtbl *lpVtbl; } i; \
! typedef CONST_VTABLE struct i##Vtbl i##Vtbl; \
! CONST_VTABLE struct i##Vtbl
! #define DECLARE_INTERFACE_(i,b) DECLARE_INTERFACE(i)
! #endif
! #define BEGIN_INTERFACE
! #define END_INTERFACE
! #define FWD_DECL(i) typedef interface i i
! #if defined(__cplusplus) && !defined(CINTERFACE)
! #define IENUM_THIS(T)
! #define IENUM_THIS_(T)
! #else
! #define IENUM_THIS(T) T*
! #define IENUM_THIS_(T) T*,
! #endif
! #define DECLARE_ENUMERATOR_(I,T) \
! DECLARE_INTERFACE_(I,IUnknown) \
! { \
! STDMETHOD(QueryInterface)(IENUM_THIS_(I) REFIID,PVOID*) PURE; \
! STDMETHOD_(ULONG,AddRef)(IENUM_THIS(I)) PURE; \
! STDMETHOD_(ULONG,Release)(IENUM_THIS(I)) PURE; \
! STDMETHOD(Next)(IENUM_THIS_(I) ULONG,T*,ULONG*) PURE; \
! STDMETHOD(Skip)(IENUM_THIS_(I) ULONG) PURE; \
! STDMETHOD(Reset)(IENUM_THIS(I)) PURE; \
! STDMETHOD(Clone)(IENUM_THIS_(I) I**) PURE; \
! }
! #define DECLARE_ENUMERATOR(T) DECLARE_ENUMERATOR_(IEnum##T,T)
#endif /* __OBJC__ */
--- 6,100 ----
#ifndef __OBJC__
! # ifdef __cplusplus
! # define EXTERN_C extern "C"
! # else
! # define EXTERN_C extern
! # endif /* __cplusplus */
! # ifndef __int64
! # define __int64 long long
! # endif
! # ifndef __int32
! # define __int32 long
! # endif
! # ifndef __int16
! # define __int16 int
! # endif
! # ifndef __int8
! # define __int8 char
! # endif
! # ifndef __small
! # define __small char
! # endif
! # ifndef __hyper
! # define __hyper long long
! # endif
! # define STDMETHODCALLTYPE __stdcall
! # define STDMETHODVCALLTYPE __cdecl
! # define STDAPICALLTYPE __stdcall
! # define STDAPIVCALLTYPE __cdecl
! # define STDAPI EXTERN_C HRESULT STDAPICALLTYPE
! # define STDAPI_(t) EXTERN_C t STDAPICALLTYPE
! # define STDMETHODIMP HRESULT STDMETHODCALLTYPE
! # define STDMETHODIMP_(t) t STDMETHODCALLTYPE
! # define STDAPIV EXTERN_C HRESULT STDAPIVCALLTYPE
! # define STDAPIV_(t) EXTERN_C t STDAPIVCALLTYPE
! # define STDMETHODIMPV HRESULT STDMETHODVCALLTYPE
! # define STDMETHODIMPV_(t) t STDMETHODVCALLTYPE
! # define interface struct
! # if defined(__cplusplus) && !defined(CINTERFACE)
! # define STDMETHOD(m) virtual HRESULT STDMETHODCALLTYPE m
! # define STDMETHOD_(t,m) virtual t STDMETHODCALLTYPE m
! # define PURE =0
! # define THIS_
! # define THIS void
/*
! __attribute__((com_interface)) is obsolete in __GNUC__ >= 3
! g++ vtables are now COM-compatible by default
*/
! # if defined(__GNUC__) && __GNUC__ < 3 && !defined(NOCOMATTRIBUTE)
! # define DECLARE_INTERFACE(i) interface __attribute__((com_interface)) i
! # define DECLARE_INTERFACE_(i,b) interface __attribute__((com_interface)) i : public b
! # else
! # define DECLARE_INTERFACE(i) interface i
! # define DECLARE_INTERFACE_(i,b) interface i : public b
! # endif
! # else
! # define STDMETHOD(m) HRESULT(STDMETHODCALLTYPE *m)
! # define STDMETHOD_(t,m) t(STDMETHODCALLTYPE *m)
! # define PURE
! # define THIS_ INTERFACE *,
! # define THIS INTERFACE *
! # ifndef CONST_VTABLE
! # define CONST_VTABLE
! # endif
! # define DECLARE_INTERFACE(i) \
! typedef interface i { CONST_VTABLE struct i##Vtbl *lpVtbl; } i; \
! typedef CONST_VTABLE struct i##Vtbl i##Vtbl; \
! CONST_VTABLE struct i##Vtbl
! # define DECLARE_INTERFACE_(i,b) DECLARE_INTERFACE(i)
! # endif
! # define BEGIN_INTERFACE
! # define END_INTERFACE
! # define FWD_DECL(i) typedef interface i i
! # if defined(__cplusplus) && !defined(CINTERFACE)
! # define IENUM_THIS(T)
! # define IENUM_THIS_(T)
! # else
! # define IENUM_THIS(T) T*
! # define IENUM_THIS_(T) T*,
! # endif
! # define DECLARE_ENUMERATOR_(I,T) \
! DECLARE_INTERFACE_(I,IUnknown) \
! { \
! STDMETHOD(QueryInterface)(IENUM_THIS_(I) REFIID,PVOID*) PURE; \
! STDMETHOD_(ULONG,AddRef)(IENUM_THIS(I)) PURE; \
! STDMETHOD_(ULONG,Release)(IENUM_THIS(I)) PURE; \
! STDMETHOD(Next)(IENUM_THIS_(I) ULONG,T*,ULONG*) PURE; \
! STDMETHOD(Skip)(IENUM_THIS_(I) ULONG) PURE; \
! STDMETHOD(Reset)(IENUM_THIS(I)) PURE; \
! STDMETHOD(Clone)(IENUM_THIS_(I) I**) PURE; \
! }
! # define DECLARE_ENUMERATOR(T) DECLARE_ENUMERATOR_(IEnum##T,T)
#endif /* __OBJC__ */
Index: comcat.h
===================================================================
RCS file: /cvsroot/mingw/w32api/include/comcat.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** comcat.h 6 Jan 2003 19:56:40 -0000 1.2
--- comcat.h 12 Sep 2003 13:26:51 -0000 1.3
***************
*** 32,36 ****
};
#undef INTERFACE
! #ifdef COBJMACROS
#define IEnumGUID_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b)
#define IEnumGUID_AddRef(p) (p)->lpVtbl->AddRef(p)
--- 32,37 ----
};
#undef INTERFACE
! #if (!defined (__cplusplus) || defined (CINTERFACE)) \
! && defined (COBJMACROS)
#define IEnumGUID_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b)
#define IEnumGUID_AddRef(p) (p)->lpVtbl->AddRef(p)
***************
*** 104,108 ****
};
#undef INTERFACE
! #ifdef COBJMACROS
#define ICatInformation_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b)
#define ICatInformation_AddRef(p) (p)->lpVtbl->AddRef(p)
--- 105,110 ----
};
#undef INTERFACE
! #if (!defined (__cplusplus) || defined (CINTERFACE)) \
! && defined (COBJMACROS)
#define ICatInformation_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b)
#define ICatInformation_AddRef(p) (p)->lpVtbl->AddRef(p)
***************
*** 130,134 ****
};
#undef INTERFACE
! #ifdef COBJMACROS
#define ICatRegister_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b)
#define ICatRegister_AddRef(p) (p)->lpVtbl->AddRef(p)
--- 132,137 ----
};
#undef INTERFACE
! #if (!defined (__cplusplus) || defined (CINTERFACE)) \
! && defined (COBJMACROS)
#define ICatRegister_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b)
#define ICatRegister_AddRef(p) (p)->lpVtbl->AddRef(p)
***************
*** 156,160 ****
};
#undef INTERFACE
! #ifdef COBJMACROS
#define IEnumCATEGORYINFO_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b)
#define IEnumCATEGORYINFO_AddRef(p) (p)->lpVtbl->AddRef(p)
--- 159,164 ----
};
#undef INTERFACE
! #if (!defined (__cplusplus) || defined (CINTERFACE)) \
! && defined (COBJMACROS)
#define IEnumCATEGORYINFO_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b)
#define IEnumCATEGORYINFO_AddRef(p) (p)->lpVtbl->AddRef(p)
Index: commctrl.h
===================================================================
RCS file: /cvsroot/mingw/w32api/include/commctrl.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** commctrl.h 5 Feb 2003 17:44:08 -0000 1.15
--- commctrl.h 12 Sep 2003 13:26:51 -0000 1.16
***************
*** 1,5 ****
#ifndef _COMMCTRL_H
#define _COMMCTRL_H
! #if __GNUC__ >=3
#pragma GCC system_header
#endif
--- 1,5 ----
#ifndef _COMMCTRL_H
#define _COMMCTRL_H
! #if __GNUC__ >= 3
#pragma GCC system_header
[...1682 lines suppressed...]
--- 3376,3379 ----
***************
*** 2829,2833 ****
#define RB_SETBANDINFO RB_SETBANDINFOA
#endif
! #endif
#ifdef __cplusplus
--- 3382,3386 ----
#define RB_SETBANDINFO RB_SETBANDINFOA
#endif
! #endif /* RC_INVOKED */
#ifdef __cplusplus
***************
*** 2835,2837 ****
#endif
#endif
-
--- 3388,3389 ----
Index: commdlg.h
===================================================================
RCS file: /cvsroot/mingw/w32api/include/commdlg.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** commdlg.h 14 Aug 2002 21:05:43 -0000 1.7
--- commdlg.h 12 Sep 2003 13:26:51 -0000 1.8
***************
*** 93,96 ****
--- 93,97 ----
#define OFN_CREATEPROMPT 0x2000
#define OFN_ENABLEHOOK 32
+ #define OFN_ENABLESIZING 0x800000
#define OFN_ENABLETEMPLATE 64
#define OFN_ENABLETEMPLATEHANDLE 128
***************
*** 125,129 ****
--- 126,133 ----
#define FR_HIDEMATCHCASE 0x8000
#define FR_HIDEWHOLEWORD 0x10000
+ #define FR_MATCHALEFHAMZA 0x80000000
#define FR_MATCHCASE 4
+ #define FR_MATCHDIAC 0x20000000
+ #define FR_MATCHKASHIDA 0x40000000
#define FR_NOMATCHCASE 0x800
#define FR_NOUPDOWN 0x400
***************
*** 196,212 ****
#endif /* ifndef SNDMSG */
! #define CommDlg_OpenSave_GetSpec(d,s,m) (int)SNDMSG(d,CDM_GETSPEC,m,(LPARAM)s)
#define CommDlg_OpenSave_GetSpecA CommDlg_OpenSave_GetSpec
#define CommDlg_OpenSave_GetSpecW CommDlg_OpenSave_GetSpec
! #define CommDlg_OpenSave_GetFilePath(d,s,m) (int)SNDMSG(d,CDM_GETFILEPATH,m,(LPARAM)s)
#define CommDlg_OpenSave_GetFilePathA CommDlg_OpenSave_GetFilePath
#define CommDlg_OpenSave_GetFilePathW CommDlg_OpenSave_GetFilePath
! #define CommDlg_OpenSave_GetFolderPath(d,s,m) (int)SNDMSG(d,CDM_GETFOLDERPATH,m,(LPARAM)(LPSTR)s)
#define CommDlg_OpenSave_GetFolderPathA CommDlg_OpenSave_GetFolderPath
#define CommDlg_OpenSave_GetFolderPathW CommDlg_OpenSave_GetFolderPath
! #define CommDlg_OpenSave_GetFolderIDList(d,i,m) (int)SNDMSG(d,CDM_GETFOLDERIDLIST,m,(LPARAM)i)
! #define CommDlg_OpenSave_SetControlText(d,i,t) (void)SNDMSG(d,CDM_SETCONTROLTEXT,i,(LPARAM)t)
! #define CommDlg_OpenSave_HideControl(d,i) (void)SNDMSG(d,CDM_HIDECONTROL,i,0)
! #define CommDlg_OpenSave_SetDefExt(d,e) (void)SNDMSG(d,CDM_SETDEFEXT,0,(LPARAM)e)
typedef UINT (APIENTRY *__CDHOOKPROC)(HWND,UINT,WPARAM,LPARAM);
--- 200,216 ----
#endif /* ifndef SNDMSG */
! #define CommDlg_OpenSave_GetSpec(d,s,m) ((int)SNDMSG((d),CDM_GETSPEC,(m),(LPARAM)(s)))
#define CommDlg_OpenSave_GetSpecA CommDlg_OpenSave_GetSpec
#define CommDlg_OpenSave_GetSpecW CommDlg_OpenSave_GetSpec
! #define CommDlg_OpenSave_GetFilePath(d,s,m) ((int)SNDMSG((d),CDM_GETFILEPATH,(m),(LPARAM)(s)))
#define CommDlg_OpenSave_GetFilePathA CommDlg_OpenSave_GetFilePath
#define CommDlg_OpenSave_GetFilePathW CommDlg_OpenSave_GetFilePath
! #define CommDlg_OpenSave_GetFolderPath(d,s,m) ((int)SNDMSG((d),CDM_GETFOLDERPATH,(m),(LPARAM)(LPSTR)(s)))
#define CommDlg_OpenSave_GetFolderPathA CommDlg_OpenSave_GetFolderPath
#define CommDlg_OpenSave_GetFolderPathW CommDlg_OpenSave_GetFolderPath
! #define CommDlg_OpenSave_GetFolderIDList(d,i,m) ((int)SNDMSG((d),CDM_GETFOLDERIDLIST,(m),(LPARAM)(i)))
! #define CommDlg_OpenSave_SetControlText(d,i,t) ((void)SNDMSG((d),CDM_SETCONTROLTEXT,(i),(LPARAM)(t)))
! #define CommDlg_OpenSave_HideControl(d,i) ((void)SNDMSG((d),CDM_HIDECONTROL,(i),0))
! #define CommDlg_OpenSave_SetDefExt(d,e) ((void)SNDMSG((d),CDM_SETDEFEXT,0,(LPARAM)(e)))
typedef UINT (APIENTRY *__CDHOOKPROC)(HWND,UINT,WPARAM,LPARAM);
Index: cplext.h
===================================================================
RCS file: /cvsroot/mingw/w32api/include/cplext.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** cplext.h 9 Apr 2002 21:17:17 -0000 1.2
--- cplext.h 12 Sep 2003 13:26:51 -0000 1.3
***************
*** 1,5 ****
#ifndef _CPLEXT_H
#define _CPLEXT_H
! #if __GNUC__ >=3
#pragma GCC system_header
#endif
--- 1,5 ----
#ifndef _CPLEXT_H
#define _CPLEXT_H
! #if __GNUC__ >= 3
#pragma GCC system_header
#endif
***************
*** 7,10 ****
--- 7,12 ----
#define CPLPAGE_MOUSE_BUTTONS 1
#define CPLPAGE_MOUSE_PTRMOTION 2
+ #define CPLPAGE_MOUSE_WHEEL 3
#define CPLPAGE_KEYBOARD_SPEED 1
+ #define CPLPAGE_DISPLAY_BACKGROUND 1
#endif
Index: docobj.h
===================================================================
RCS file: /cvsroot/mingw/w32api/include/docobj.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** docobj.h 12 Aug 2002 12:23:47 -0000 1.1
--- docobj.h 12 Sep 2003 13:26:51 -0000 1.2
***************
*** 1,5 ****
#ifndef _DOCOBJ_H
#define _DOCOBJ_H
! #if __GNUC__ >=3
#pragma GCC system_header
#endif
--- 1,5 ----
#ifndef _DOCOBJ_H
#define _DOCOBJ_H
! #if __GNUC__ >= 3
#pragma GCC system_header
#endif
***************
*** 72,77 ****
typedef interface IOleInPlaceSite *LPOLEINPLACESITE;
! /* typedef interface IEnumOleDocumentViews *LPENUMOLEDOCUMENTVIEWS;
! in oleidl.h */
EXTERN_C const IID IID_IContinueCallback;
--- 72,76 ----
typedef interface IOleInPlaceSite *LPOLEINPLACESITE;
! typedef interface IEnumOleDocumentViews *LPENUMOLEDOCUMENTVIEWS;
EXTERN_C const IID IID_IContinueCallback;
***************
*** 102,105 ****
--- 101,106 ----
STDMETHOD(Clone)(THIS_ LPOLEINPLACESITE,IOleDocumentView**) PURE;
};
+
+ DECLARE_ENUMERATOR_(IEnumOleDocumentViews,IOleDocumentView);
EXTERN_C const IID IID_IOleDocument;
Index: lmaccess.h
===================================================================
RCS file: /cvsroot/mingw/w32api/include/lmaccess.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** lmaccess.h 26 Mar 2003 23:06:11 -0000 1.4
--- lmaccess.h 12 Sep 2003 13:26:51 -0000 1.5
***************
*** 35,38 ****
--- 35,39 ----
#define UF_WORKSTATION_TRUST_ACCOUNT 4096
#define UF_SERVER_TRUST_ACCOUNT 8192
+ #define UF_MNS_LOGON_ACCOUNT 131072
#define UF_MACHINE_ACCOUNT_MASK (UF_INTERDOMAIN_TRUST_ACCOUNT|UF_WORKSTATION_TRUST_ACCOUNT|UF_SERVER_TRUST_ACCOUNT)
#define UF_ACCOUNT_TYPE_MASK (UF_TEMP_DUPLICATE_ACCOUNT|UF_NORMAL_ACCOUNT|UF_INTERDOMAIN_TRUST_ACCOUNT|UF_WORKSTATION_TRUST_ACCOUNT|UF_SERVER_TRUST_ACCOUNT)
Index: mmsystem.h
===================================================================
RCS file: /cvsroot/mingw/w32api/include/mmsystem.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** mmsystem.h 5 Feb 2003 17:44:08 -0000 1.3
--- mmsystem.h 12 Sep 2003 13:26:51 -0000 1.4
***************
*** 23,26 ****
--- 23,29 ----
#define TIME_TICKS 32
#define MAKEFOURCC(c0,c1,c2,c3) ((DWORD)(BYTE)(c0)|((DWORD)(BYTE)(c1)<<8)|((DWORD)(BYTE)(c2)<<16)|((DWORD)(BYTE)(c3)<<24))
+ #ifndef mmioFOURCC
+ #define mmioFOURCC(c0,c1,c2,c3) MAKEFOURCC(c0,c1,c2,c3)
+ #endif
#define MM_JOY1MOVE 0x3A0
#define MM_JOY2MOVE 0x3A1
***************
*** 383,386 ****
--- 386,392 ----
#define TIME_CALLBACK_EVENT_SET 16
#define TIME_CALLBACK_EVENT_PULSE 32
+ #if (WINVER >= 0x0501)
+ #define TIME_KILL_SYNCHRONOUS 0x0100
+ #endif
#define JOYERR_NOERROR (0)
#define JOYERR_PARMS (JOYERR_BASE+5)
***************
*** 523,527 ****
#define FOURCC_MEM mmioFOURCC('M', 'E', 'M', ' ')
#define MMIO_DEFAULTBUFFER 8192
- #define mmioFOURCC(c0,c1,c2,c3) MAKEFOURCC(c0,c1,c2,c3)
#define MCIERR_INVALID_DEVICE_ID (MCIERR_BASE+1)
#define MCIERR_UNRECOGNIZED_KEYWORD (MCIERR_BASE+3)
--- 529,532 ----
Index: mshtml.h
===================================================================
RCS file: /cvsroot/mingw/w32api/include/mshtml.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** mshtml.h 12 Aug 2002 12:23:47 -0000 1.1
--- mshtml.h 12 Sep 2003 13:26:51 -0000 1.2
***************
*** 19,22 ****
--- 19,144 ----
typedef interface IHTMLStyle *LPHTMLSTYLE;
typedef interface IHTMLFiltersCollection *LPHTMLFILTERSCOLLECTION;
+ typedef interface IHTMLLinkElement *LPHTMLLINKELEMENT;
+ typedef interface IHTMLImgElement *LPHTMLIMGELEMENT;
+
+ EXTERN_C const IID IID_IHTMLLinkElement;
+ #undef INTERFACE
+ #define INTERFACE IHTMLLinkElement
+ DECLARE_INTERFACE_(IHTMLLinkElement,IDispatch)
+ {
+ STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
+ STDMETHOD_(ULONG,AddRef)(THIS) PURE;
+ STDMETHOD_(ULONG,Release)(THIS) PURE;
+ STDMETHOD(GetTypeInfoCount)(THIS_ UINT*) PURE;
+ STDMETHOD(GetTypeInfo)(THIS_ UINT,LCID,LPTYPEINFO*) PURE;
+ STDMETHOD(GetIDsOfNames)(THIS_ REFIID,LPOLESTR*,UINT,LCID,DISPID*) PURE;
+ STDMETHOD(Invoke)(THIS_ DISPID,REFIID,LCID,WORD,DISPPARAMS*,VARIANT*,EXCEPINFO*,UINT*) PURE;
+
+ STDMETHOD(put_href)(THIS_ BSTR) PURE;
+ STDMETHOD(get_href)(THIS_ BSTR*) PURE;
+ STDMETHOD(put_rel)(THIS_ BSTR) PURE;
+ STDMETHOD(get_rel)(THIS_ BSTR*) PURE;
+ STDMETHOD(put_rev)(THIS_ BSTR) PURE;
+ STDMETHOD(get_rev)(THIS_ BSTR*) PURE;
+ STDMETHOD(put_type)(THIS_ BSTR) PURE;
+ STDMETHOD(get_type)(THIS_ BSTR*) PURE;
+ STDMETHOD(get_readyState)(THIS_ BSTR*) PURE;
+ STDMETHOD(put_onreadystatechange)(THIS_ VARIANT) PURE;
+ STDMETHOD(get_onreadystatechange)(THIS_ VARIANT*) PURE;
+ STDMETHOD(put_onload)(THIS_ VARIANT) PURE;
+ STDMETHOD(get_onload)(THIS_ VARIANT*) PURE;
+ STDMETHOD(put_onerror)(THIS_ VARIANT) PURE;
+ STDMETHOD(get_onerror)(THIS_ VARIANT*) PURE;
+ STDMETHOD(get_styleSheet)(THIS_ LPHTMLSTYLESHEET*) PURE;
+ STDMETHOD(put_disabled)(THIS_ VARIANT_BOOL) PURE;
+ STDMETHOD(get_disabled)(THIS_ VARIANT_BOOL*) PURE;
+ STDMETHOD(put_media)(THIS_ BSTR) PURE;
+ STDMETHOD(get_media)(THIS_ BSTR*) PURE;
+ };
+
+ EXTERN_C const IID IID_IHTMLImgElement;
+ #undef INTERFACE
+ #define INTERFACE IHTMLImgElement
+ DECLARE_INTERFACE_(IHTMLImgElement,IDispatch)
+ {
+ STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
+ STDMETHOD_(ULONG,AddRef)(THIS) PURE;
+ STDMETHOD_(ULONG,Release)(THIS) PURE;
+ STDMETHOD(GetTypeInfoCount)(THIS_ UINT*) PURE;
+ STDMETHOD(GetTypeInfo)(THIS_ UINT,LCID,LPTYPEINFO*) PURE;
+ STDMETHOD(GetIDsOfNames)(THIS_ REFIID,LPOLESTR*,UINT,LCID,DISPID*) PURE;
+ STDMETHOD(Invoke)(THIS_ DISPID,REFIID,LCID,WORD,DISPPARAMS*,VARIANT*,EXCEPINFO*,UINT*) PURE;
+
+ STDMETHOD(put_isMap)(THIS_ VARIANT_BOOL) PURE;
+ STDMETHOD(get_isMap)(THIS_ VARIANT_BOOL*) PURE;
+ STDMETHOD(put_useMap)(THIS_ BSTR) PURE;
+ STDMETHOD(get_useMap)(THIS_ BSTR*) PURE;
+ STDMETHOD(get_mimeType)(THIS_ BSTR*) PURE;
+ STDMETHOD(get_fileSize)(THIS_ BSTR*) PURE;
+ STDMETHOD(get_fileCreatedDate)(THIS_ BSTR*) PURE;
+ STDMETHOD(get_fileModifiedDate)(THIS_ BSTR*) PURE;
+ STDMETHOD(get_fileUpdatedDate)(THIS_ BSTR*) PURE;
+ STDMETHOD(get_protocol)(THIS_ BSTR*) PURE;
+ STDMETHOD(get_href)(THIS_ BSTR*) PURE;
+ STDMETHOD(get_nameProp)(THIS_ BSTR*) PURE;
+ STDMETHOD(put_border)(THIS_ VARIANT) PURE;
+ STDMETHOD(get_border)(THIS_ VARIANT*) PURE;
+ STDMETHOD(put_vspace)(THIS_ long) PURE;
+ STDMETHOD(get_vspace)(THIS_ long*) PURE;
+ STDMETHOD(put_hspace)(THIS_ long) PURE;
+ STDMETHOD(get_hspace)(THIS_ long*) PURE;
+ STDMETHOD(put_alt)(THIS_ BSTR) PURE;
+ STDMETHOD(get_alt)(THIS_ BSTR*) PURE;
+ STDMETHOD(put_src)(THIS_ BSTR) PURE;
+ STDMETHOD(get_src)(THIS_ BSTR*) PURE;
+ STDMETHOD(put_lowsrc)(THIS_ BSTR) PURE;
+ STDMETHOD(get_lowsrc)(THIS_ BSTR*) PURE;
+ STDMETHOD(put_vrml)(THIS_ BSTR) PURE;
+ STDMETHOD(get_vrml)(THIS_ BSTR*) PURE;
+ STDMETHOD(put_dynsrc)(THIS_ BSTR) PURE;
+ STDMETHOD(get_dynsrc)(THIS_ BSTR*) PURE;
+ STDMETHOD(get_readyState)(THIS_ BSTR*) PURE;
+ STDMETHOD(get_complete)(THIS_ VARIANT_BOOL*) PURE;
+ STDMETHOD(put_loop)(THIS_ VARIANT) PURE;
+ STDMETHOD(get_loop)(THIS_ VARIANT*) PURE;
+ STDMETHOD(put_align)(THIS_ BSTR) PURE;
+ STDMETHOD(get_align)(THIS_ BSTR*) PURE;
+ STDMETHOD(put_onload)(THIS_ VARIANT) PURE;
+ STDMETHOD(get_onload)(THIS_ VARIANT*) PURE;
+ STDMETHOD(put_onerror)(THIS_ VARIANT) PURE;
+ STDMETHOD(get_onerror)(THIS_ VARIANT*) PURE;
+ STDMETHOD(put_onabort)(THIS_ VARIANT) PURE;
+ STDMETHOD(get_onabort)(THIS_ VARIANT*) PURE;
+ STDMETHOD(put_name)(THIS_ BSTR) PURE;
+ STDMETHOD(get_name)(THIS_ BSTR*) PURE;
+ STDMETHOD(put_width)(THIS_ long) PURE;
+ STDMETHOD(get_width)(THIS_ long*) PURE;
+ STDMETHOD(put_height)(THIS_ long) PURE;
+ STDMETHOD(get_height)(THIS_ long*) PURE;
+ STDMETHOD(put_start)(THIS_ BSTR) PURE;
+ STDMETHOD(get_start)(THIS_ BSTR*) PURE;
+ };
+
+ EXTERN_C const IID IID_IHTMLElementCollection;
+ #undef INTERFACE
+ #define INTERFACE IHTMLElementCollection
+ DECLARE_INTERFACE_(IHTMLElementCollection,IDispatch)
+ {
+ STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
+ STDMETHOD_(ULONG,AddRef)(THIS) PURE;
+ STDMETHOD_(ULONG,Release)(THIS) PURE;
+ STDMETHOD(GetTypeInfoCount)(THIS_ UINT*) PURE;
+ STDMETHOD(GetTypeInfo)(THIS_ UINT,LCID,LPTYPEINFO*) PURE;
+ STDMETHOD(GetIDsOfNames)(THIS_ REFIID,LPOLESTR*,UINT,LCID,DISPID*) PURE;
+ STDMETHOD(Invoke)(THIS_ DISPID,REFIID,LCID,WORD,DISPPARAMS*,VARIANT*,EXCEPINFO*,UINT*) PURE;
+
+ STDMETHOD(toString)(THIS_ BSTR*) PURE;
+ STDMETHOD(put_length)(THIS_ long) PURE;
+ STDMETHOD(get_length)(THIS_ long*) PURE;
+ STDMETHOD(get__newEnum)(THIS_ IUnknown**) PURE;
+ STDMETHOD(item)(THIS_ VARIANT,VARIANT,IDispatch**) PURE;
+ STDMETHOD(tags)(THIS_ VARIANT,IDispatch**) PURE;
+ };
+
EXTERN_C const IID IID_IHTMLDocument;
***************
*** 33,37 ****
STDMETHOD(Invoke)(THIS_ DISPID,REFIID,LCID,WORD,DISPPARAMS*,VARIANT*,EXCEPINFO*,UINT*) PURE;
! STDMETHOD(get_Script)(THIS_ IDispatch**) PURE;
};
--- 155,159 ----
STDMETHOD(Invoke)(THIS_ DISPID,REFIID,LCID,WORD,DISPPARAMS*,VARIANT*,EXCEPINFO*,UINT*) PURE;
! STDMETHOD(get_Script)(THIS_ IDispatch**) PURE;
};
***************
*** 119,123 ****
STDMETHOD(get_onhelp)(THIS_ VARIANT*) PURE;
STDMETHOD(put_onclick)(THIS_ VARIANT) PURE;
! STDMETHOD(get_onclick)(THIS_ VARIANT*) PURE;
STDMETHOD(put_ondblclick)(THIS_ VARIANT) PURE;
STDMETHOD(get_ondblclick)(THIS_ VARIANT*) PURE;
--- 241,245 ----
STDMETHOD(get_onhelp)(THIS_ VARIANT*) PURE;
STDMETHOD(put_onclick)(THIS_ VARIANT) PURE;
! STDMETHOD(get_onclick)(THIS_ VARIANT*) PURE;
STDMETHOD(put_ondblclick)(THIS_ VARIANT) PURE;
STDMETHOD(get_ondblclick)(THIS_ VARIANT*) PURE;
Index: oaidl.h
===================================================================
RCS file: /cvsroot/mingw/w32api/include/oaidl.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** oaidl.h 9 Apr 2002 21:17:17 -0000 1.5
--- oaidl.h 12 Sep 2003 13:26:51 -0000 1.6
***************
*** 80,83 ****
--- 80,84 ----
extern const IID IID_ISupportErrorInfo;
extern const IID IID_IRecordInfo;
+ extern const IID IID_ITypeMarshal;
typedef enum tagSYSKIND {
***************
*** 602,605 ****
--- 603,620 ----
STDMETHOD(RecordCreateCopy)(THIS_ PVOID,PVOID*) PURE;
STDMETHOD(RecordDestroy )(THIS_ PVOID) PURE;
+ };
+
+ EXTERN_C const IID IID_ITypeMarshal;
+ #undef INTERFACE
+ #define INTERFACE ITypeMarshal
+ DECLARE_INTERFACE_(ITypeMarshal, IUnknown)
+ {
+ STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
+ STDMETHOD_(ULONG,AddRef)(THIS) PURE;
+ STDMETHOD_(ULONG,Release)(THIS) PURE;
+ STDMETHOD(Size)(THIS_ PVOID,DWORD,PVOID,ULONG*) PURE;
+ STDMETHOD(Marshal)(THIS_ PVOID,DWORD,PVOID,ULONG,BYTE*,ULONG*) PURE;
+ STDMETHOD(Unmarshal)(THIS_ PVOID,DWORD,ULONG,BYTE*,ULONG*) PURE;
+ STDMETHOD(Free)(THIS_ PVOID) PURE;
};
Index: objidl.h
===================================================================
RCS file: /cvsroot/mingw/w32api/include/objidl.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** objidl.h 12 Aug 2002 12:21:10 -0000 1.5
--- objidl.h 12 Sep 2003 13:26:51 -0000 1.6
***************
*** 1,5 ****
#ifndef _OBJIDL_H
#define _OBJIDL_H
! #if __GNUC__ >=3
#pragma GCC system_header
#endif
--- 1,5 ----
#ifndef _OBJIDL_H
#define _OBJIDL_H
! #if __GNUC__ >= 3
#pragma GCC system_header
#endif
***************
*** 160,164 ****
HENHMETAFILE hEnhMetaFile;
HGLOBAL hGlobal;
! LPCSTR lpszFileName;
LPSTREAM pstm;
LPSTORAGE pstg;
--- 160,164 ----
HENHMETAFILE hEnhMetaFile;
HGLOBAL hGlobal;
! LPWSTR lpszFileName;
LPSTREAM pstm;
LPSTORAGE pstg;
***************
*** 302,305 ****
--- 302,306 ----
WORD wReserved3;
_ANONYMOUS_UNION union {
+ CHAR cVal;
UCHAR bVal;
short iVal;
***************
*** 409,412 ****
--- 410,418 ----
SOLE_AUTHENTICATION_INFO* aAuthInfo;
} SOLE_AUTHENTICATION_LIST;
+
+ EXTERN_C const FMTID FMTID_SummaryInformation;
+ EXTERN_C const FMTID FMTID_DocSummaryInformation;
+ EXTERN_C const FMTID FMTID_UserDefinedProperties;
+
DECLARE_ENUMERATOR(FORMATETC);
DECLARE_ENUMERATOR(HLITEM);
***************
*** 488,492 ****
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;
--- 494,498 ----
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;
***************
*** 1405,1409 ****
HRESULT STDMETHODCALLTYPE ILockBytes_WriteAt_Proxy(ILockBytes*,ULARGE_INTEGER,const void*,ULONG,ULONG*);
HRESULT STDMETHODCALLTYPE ILockBytes_WriteAt_Stub(ILockBytes*,ULARGE_INTEGER,BYTE*,ULONG,ULONG*);
! #ifdef COBJMACROS
#define IMarshal_QueryInterface(T,r,p) (T)->lpVtbl->QueryInterface(T,r,p)
#define IMarshal_AddRef(This) (This)->lpVtbl->AddRef(This)
--- 1411,1417 ----
HRESULT STDMETHODCALLTYPE ILockBytes_WriteAt_Proxy(ILockBytes*,ULARGE_INTEGER,const void*,ULONG,ULONG*);
HRESULT STDMETHODCALLTYPE ILockBytes_WriteAt_Stub(ILockBytes*,ULARGE_INTEGER,BYTE*,ULONG,ULONG*);
!
! #if (!defined (__cplusplus) || defined (CINTERFACE)) \
! && defined (COBJMACROS)
#define IMarshal_QueryInterface(T,r,p) (T)->lpVtbl->QueryInterface(T,r,p)
#define IMarshal_AddRef(This) (This)->lpVtbl->AddRef(This)
Index: ocidl.h
===================================================================
RCS file: /cvsroot/mingw/w32api/include/ocidl.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ocidl.h 11 Mar 2003 15:26:47 -0000 1.3
--- ocidl.h 12 Sep 2003 13:26:51 -0000 1.4
***************
*** 16,19 ****
--- 16,404 ----
} READYSTATE;
+ EXTERN_C const IID IID_IOleControl;
+ #undef INTERFACE
+ #define INTERFACE IOleControl
+ DECLARE_INTERFACE_(IOleControl,IUnknown)
+ {
+ STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
+ STDMETHOD_(ULONG,AddRef)(THIS) PURE;
+ STDMETHOD_(ULONG,Release)(THIS) PURE;
+ STDMETHOD(GetControlInfo)(THIS_ LPCONTROLINFO) PURE;
+ STDMETHOD(OnMnemonic)(THIS_ LPMSG) PURE;
+ STDMETHOD(OnAmbientPropertyChange)(THIS_ DISPID) PURE;
+ STDMETHOD(FreezeEvents)(THIS_ BOOL) PURE;
+ };
+
+ EXTERN_C const IID IID_IOleControlSite;
+ #undef INTERFACE
+ #define INTERFACE IOleControlSite
+ DECLARE_INTERFACE_(IOleControlSite,IUnknown)
+ {
+ STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
+ STDMETHOD_(ULONG,AddRef)(THIS) PURE;
+ STDMETHOD_(ULONG,Release)(THIS) PURE;
+ STDMETHOD(OnControlInfoChanged)(THIS) PURE;
+ STDMETHOD(LockInPlaceActive)(THIS_ BOOL) PURE;
+ STDMETHOD(GetExtendedControl)(THIS_ LPDISPATCH*) PURE;
+ STDMETHOD(TransformCoords)(THIS_ POINTL*,POINTF*,DWORD) PURE;
+ STDMETHOD(TranslateAccelerator)(THIS_ LPMSG,DWORD) PURE;
+ STDMETHOD(OnFocus)(THIS_ BOOL) PURE;
+ STDMETHOD(ShowPropertyFrame)(THIS) PURE;
+ };
+
+ EXTERN_C const IID IID_ISimpleFrameSite;
+ #undef INTERFACE
+ #define INTERFACE ISimpleFrameSite
+ DECLARE_INTERFACE_(ISimpleFrameSite,IUnknown)
+ {
+ STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
+ STDMETHOD_(ULONG,AddRef)(THIS) PURE;
+ STDMETHOD_(ULONG,Release)(THIS) PURE;
+ STDMETHOD(PreMessageFilter)(THIS_ HWND,UINT,WPARAM,LPARAM,LRESULT*,PDWORD) PURE;
+ STDMETHOD(PostMessageFilter)(THIS_ HWND,UINT,WPARAM,LPARAM,LRESULT*,DWORD) PURE;
+ };
+
+ EXTERN_C const IID IID_IErrorLog;
+ #undef INTERFACE
+ #define INTERFACE IErrorLog
+ DECLARE_INTERFACE_(IErrorLog,IUnknown)
+ {
+ STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
+ STDMETHOD_(ULONG,AddRef)(THIS) PURE;
+ STDMETHOD_(ULONG,Release)(THIS) PURE;
+ STDMETHOD(AddError)(THIS_ LPCOLESTR,LPEXCEPINFO) PURE;
+ };
+
+ EXTERN_C const IID IID_IPropertyBag;
+ #undef INTERFACE
+ #define INTERFACE IPropertyBag
+ DECLARE_INTERFACE_(IPropertyBag,IUnknown)
+ {
+ STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
+ STDMETHOD_(ULONG,AddRef)(THIS) PURE;
+ STDMETHOD_(ULONG,Release)(THIS) PURE;
+ STDMETHOD(Read)(THIS_ LPCOLESTR,LPVARIANT,LPERRORLOG) PURE;
+ STDMETHOD(Write)(THIS_ LPCOLESTR,LPVARIANT) PURE;
+ };
+
+ EXTERN_C const IID IID_IPersistPropertyBag;
+ #undef INTERFACE
+ #define INTERFACE IPersistPropertyBag
+ DECLARE_INTERFACE_(IPersistPropertyBag,IPersist)
+ {
+ STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
+ STDMETHOD_(ULONG,AddRef)(THIS) PURE;
+ STDMETHOD_(ULONG,Release)(THIS) PURE;
+ STDMETHOD(GetClassID)(THIS_ LPCLSID) PURE;
+ STDMETHOD(InitNew)(THIS) PURE;
+ STDMETHOD(Load)(THIS_ LPPROPERTYBAG,LPERRORLOG) PURE;
+ STDMETHOD(Save)(THIS_ LPPROPERTYBAG,BOOL,BOOL) PURE;
+ };
+
+ EXTERN_C const IID IID_IPersistStreamInit;
+ #undef INTERFACE
+ #define INTERFACE IPersistStreamInit
+ DECLARE_INTERFACE_(IPersistStreamInit,IPersist)
+ {
+ STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
+ STDMETHOD_(ULONG,AddRef)(THIS) PURE;
+ STDMETHOD_(ULONG,Release)(THIS) PURE;
+ STDMETHOD(GetClassID)(THIS_ LPCLSID) PURE;
+ STDMETHOD(IsDirty)(THIS) PURE;
+ STDMETHOD(Load)(THIS_ LPSTREAM) PURE;
+ STDMETHOD(Save)(THIS_ LPSTREAM,BOOL) PURE;
+ STDMETHOD(GetSizeMax)(THIS_ PULARGE_INTEGER) PURE;
+ STDMETHOD(InitNew)(THIS) PURE;
+ };
+
+ EXTERN_C const IID IID_IPersistMemory;
+ #undef INTERFACE
+ #define INTERFACE IPersistMemory
+ DECLARE_INTERFACE_(IPersistMemory,IPersist)
+ {
+ STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
+ STDMETHOD_(ULONG,AddRef)(THIS) PURE;
+ STDMETHOD_(ULONG,Release)(THIS) PURE;
+ STDMETHOD(GetClassID)(THIS_ LPCLSID) PURE;
+ STDMETHOD(IsDirty)(THIS) PURE;
+ STDMETHOD(Load)(THIS_ PVOID,ULONG) PURE;
+ STDMETHOD(Save)(THIS_ PVOID,BOOL,ULONG) PURE;
+ STDMETHOD(GetSizeMax)(THIS_ PULONG) PURE;
+ STDMETHOD(InitNew)(THIS) PURE;
+ };
+
+ EXTERN_C const IID IID_IPropertyNotifySink;
+ #undef INTERFACE
+ #define INTERFACE IPropertyNotifySink
+ DECLARE_INTERFACE_(IPropertyNotifySink,IUnknown)
+ {
+ STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
+ STDMETHOD_(ULONG,AddRef)(THIS) PURE;
+ STDMETHOD_(ULONG,Release)(THIS) PURE;
+ STDMETHOD(OnChanged)(THIS_ DISPID) PURE;
+ STDMETHOD(OnRequestEdit)(THIS_ DISPID) PURE;
+ };
+
+ EXTERN_C const IID IID_IProvideClassInfo;
+ #undef INTERFACE
+ #define INTERFACE IProvideClassInfo
+ DECLARE_INTERFACE_(IProvideClassInfo,IUnknown)
+ {
+ STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
+ STDMETHOD_(ULONG,AddRef)(THIS) PURE;
+ STDMETHOD_(ULONG,Release)(THIS) PURE;
+ STDMETHOD(GetClassInfo)(THIS_ LPTYPEINFO*) PURE;
+ };
+
+ EXTERN_C const IID IID_IProvideClassInfo2;
+ #undef INTERFACE
+ #define INTERFACE IProvideClassInfo2
+ DECLARE_INTERFACE_(IProvideClassInfo2,IProvideClassInfo)
+ {
+ STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
+ STDMETHOD_(ULONG,AddRef)(THIS) PURE;
+ STDMETHOD_(ULONG,Release)(THIS) PURE;
+ STDMETHOD(GetClassInfo)(THIS_ LPTYPEINFO*) PURE;
+ STDMETHOD(GetGUID)(THIS_ DWORD,GUID*) PURE;
+ };
+
+ EXTERN_C const IID IID_IConnectionPointContainer;
+ #undef INTERFACE
+ #define INTERFACE IConnectionPointContainer
+ DECLARE_INTERFACE_(IConnectionPointContainer,IUnknown)
+ {
+ STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
+ STDMETHOD_(ULONG,AddRef)(THIS) PURE;
+ STDMETHOD_(ULONG,Release)(THIS) PURE;
+ STDMETHOD(EnumConnectionPoints)(THIS_ LPENUMCONNECTIONPOINTS*) PURE;
+ STDMETHOD(FindConnectionPoint)(THIS_ REFIID,LPCONNECTIONPOINT*) PURE;
+ };
+
+ EXTERN_C const IID IID_IEnumConnectionPoints;
+ #undef INTERFACE
+ #define INTERFACE IEnumConnectionPoints
+ DECLARE_INTERFACE_(IEnumConnectionPoints,IUnknown)
+ {
+ STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
+ STDMETHOD_(ULONG,AddRef)(THIS) PURE;
+ STDMETHOD_(ULONG,Release)(THIS) PURE;
+ STDMETHOD(Next)(THIS_ ULONG,LPCONNECTIONPOINT*,ULONG*) PURE;
+ STDMETHOD(Skip)(THIS_ ULONG) PURE;
+ STDMETHOD(Reset)(THIS) PURE;
+ STDMETHOD(Clone)(THIS_ LPENUMCONNECTIONPOINTS*) PURE;
+ };
+
+ EXTERN_C const IID IID_IConnectionPoint;
+ #undef INTERFACE
+ #define INTERFACE IConnectionPoint
+ DECLARE_INTERFACE_(IConnectionPoint,IUnknown)
+ {
+ STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
+ STDMETHOD_(ULONG,AddRef)(THIS) PURE;
+ STDMETHOD_(ULONG,Release)(THIS) PURE;
+ STDMETHOD(GetConnectionInterface)(THIS_ IID*) PURE;
+ STDMETHOD(GetConnectionPointContainer)(THIS_ IConnectionPointContainer**) PURE;
+ STDMETHOD(Advise)(THIS_ LPUNKNOWN,PDWORD) PURE;
+ STDMETHOD(Unadvise)(THIS_ DWORD) PURE;
+ STDMETHOD(EnumConnections)(THIS_ LPENUMCONNECTIONS*) PURE;
+ };
+
+ EXTERN_C const IID IID_IEnumConnections;
+ #undef INTERFACE
+ #define INTERFACE IEnumConnections
+ DECLARE_INTERFACE_(IEnumConnections,IUnknown)
+ {
+ STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
+ STDMETHOD_(ULONG,AddRef)(THIS) PURE;
+ STDMETHOD_(ULONG,Release)(THIS) PURE;
+ STDMETHOD(Next)(THIS_ ULONG,LPCONNECTDATA,PULONG) PURE;
+ STDMETHOD(Skip)(THIS_ ULONG) PURE;
+ STDMETHOD(Reset)(THIS) PURE;
+ STDMETHOD(Clone)(THIS_ LPENUMCONNECTIONS*) PURE;
+ };
+
+ EXTERN_C const IID IID_IClassFactory2;
+ #undef INTERFACE
+ #define INTERFACE IClassFactory2
+ DECLARE_INTERFACE_(IClassFactory2,IClassFactory)
+ {
+ STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
+ STDMETHOD_(ULONG,AddRef)(THIS) PURE;
+ STDMETHOD_(ULONG,Release)(THIS) PURE;
+ STDMETHOD(CreateInstance)(THIS_ LPUNKNOWN,REFIID,PVOID*) PURE;
+ STDMETHOD(LockServer)(THIS_ BOOL) PURE;
+ STDMETHOD(GetLicInfo)(THIS_ LPLICINFO) PURE;
+ STDMETHOD(RequestLicKey)(THIS_ DWORD,BSTR*) PURE;
+ STDMETHOD(CreateInstanceLic)(THIS_ LPUNKNOWN,LPUNKNOWN,REFIID,BSTR,PVOID*) PURE;
+ };
+
+ EXTERN_C const IID IID_ISpecifyPropertyPages;
+ #undef INTERFACE
+ #define INTERFACE ISpecifyPropertyPages
+ DECLARE_INTERFACE_(ISpecifyPropertyPages,IUnknown)
+ {
+ STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
+ STDMETHOD_(ULONG,AddRef)(THIS) PURE;
+ STDMETHOD_(ULONG,Release)(THIS) PURE;
+ STDMETHOD(GetPages)(THIS_ CAUUID*) PURE;
+ };
+
+ EXTERN_C const IID IID_IPerPropertyBrowsing;
+ #undef INTERFACE
+ #define INTERFACE IPerPropertyBrowsing
+ DECLARE_INTERFACE_(IPerPropertyBrowsing,IUnknown)
+ {
+ STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
+ STDMETHOD_(ULONG,AddRef)(THIS) PURE;
+ STDMETHOD_(ULONG,Release)(THIS) PURE;
+ STDMETHOD(GetDisplayString)(THIS_ DISPID,BSTR*) PURE;
+ STDMETHOD(MapPropertyToPage)(THIS_ DISPID,LPCLSID) PURE;
+ STDMETHOD(GetPredefinedStrings)(THIS_ DISPID,CALPOLESTR*,CADWORD*) PURE;
+ STDMETHOD(GetPredefinedValue)(THIS_ DISPID,DWORD,VARIANT*) PURE;
+ };
+
+ EXTERN_C const IID IID_IPropertyPageSite;
+ #undef INTERFACE
+ #define INTERFACE IPropertyPageSite
+ DECLARE_INTERFACE_(IPropertyPageSite,IUnknown)
+ {
+ STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
+ STDMETHOD_(ULONG,AddRef)(THIS) PURE;
+ STDMETHOD_(ULONG,Release)(THIS) PURE;
+ STDMETHOD(OnStatusChange)(THIS_ DWORD) PURE;
+ STDMETHOD(GetLocaleID)(THIS_ LCID*) PURE;
+ STDMETHOD(GetPageContainer)(THIS_ LPUNKNOWN*) PURE;
+ STDMETHOD(TranslateAccelerator)(THIS_ LPMSG) PURE;
+ };
+
+ EXTERN_C const IID IID_IPropertyPage;
+ #undef INTERFACE
+ #define INTERFACE IPropertyPage
+ DECLARE_INTERFACE_(IPropertyPage,IUnknown)
+ {
+ STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
+ STDMETHOD_(ULONG,AddRef)(THIS) PURE;
+ STDMETHOD_(ULONG,Release)(THIS) PURE;
+ STDMETHOD(SetPageSite)(THIS_ LPPROPERTYPAGESITE) PURE;
+ STDMETHOD(Activate)(THIS_ HWND,LPCRECT,BOOL) PURE;
+ STDMETHOD(Deactivate)(THIS) PURE;
+ STDMETHOD(GetPageInfo)(THIS_ LPPROPPAGEINFO) PURE;
+ STDMETHOD(SetObjects)(THIS_ ULONG,LPUNKNOWN*) PURE;
+ STDMETHOD(Show)(THIS_ UINT) PURE;
+ STDMETHOD(Move)(THIS_ LPCRECT) PURE;
+ STDMETHOD(IsPageDirty)(THIS) PURE;
+ STDMETHOD(Apply)(THIS) PURE;
+ STDMETHOD(Help)(THIS_ LPCOLESTR) PURE;
+ STDMETHOD(TranslateAccelerator)(THIS_ LPMSG) PURE;
+ };
+
+ EXTERN_C const IID IID_IPropertyPage2;
+ #undef INTERFACE
+ #define INTERFACE IPropertyPage2
+ DECLARE_INTERFACE_(IPropertyPage2,IPropertyPage)
+ {
+ STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
+ STDMETHOD_(ULONG,AddRef)(THIS) PURE;
+ STDMETHOD_(ULONG,Release)(THIS) PURE;
+ STDMETHOD(SetPageSite)(THIS_ LPPROPERTYPAGESITE) PURE;
+ STDMETHOD(Activate)(THIS_ HWND,LPCRECT,BOOL) PURE;
+ STDMETHOD(Deactivate)(THIS) PURE;
+ STDMETHOD(GetPageInfo)(THIS_ LPPROPPAGEINFO) PURE;
+ STDMETHOD(SetObjects)(THIS_ ULONG,LPUNKNOWN*) PURE;
+ STDMETHOD(Show)(THIS_ UINT) PURE;
+ STDMETHOD(Move)(THIS_ LPCRECT) PURE;
+ STDMETHOD(IsPageDirty)(THIS) PURE;
+ STDMETHOD(Apply)(THIS) PURE;
+ STDMETHOD(Help)(THIS_ LPCOLESTR) PURE;
+ STDMETHOD(TranslateAccelerator)(THIS_ LPMSG) PURE;
+ STDMETHOD(EditProperty)(THIS_ DISPID) PURE;
+ };
+
+ EXTERN_C const IID IID_IFont;
+ #undef INTERFACE
+ #define INTERFACE IFont
+ DECLARE_INTERFACE_(IFont,IUnknown)
+ {
+ STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
+ STDMETHOD_(ULONG,AddRef)(THIS) PURE;
+ STDMETHOD_(ULONG,Release)(THIS) PURE;
+ STDMETHOD(get_Name)(THIS_ BSTR*) PURE;
+ STDMETHOD(put_Name)(THIS_ BSTR) PURE;
+ STDMETHOD(get_Size)(THIS_ CY*) PURE;
+ STDMETHOD(put_Size)(THIS_ CY) PURE;
+ STDMETHOD(get_Bold)(THIS_ BOOL*) PURE;
+ STDMETHOD(put_Bold)(THIS_ BOOL) PURE;
+ STDMETHOD(get_Italic)(THIS_ BOOL*) PURE;
+ STDMETHOD(put_Italic)(THIS_ BOOL) PURE;
+ STDMETHOD(get_Underline)(THIS_ BOOL*) PURE;
+ STDMETHOD(put_Underline)(THIS_ BOOL) PURE;
+ STDMETHOD(get_Strikethrough)(THIS_ BOOL*) PURE;
+ STDMETHOD(put_Strikethrough)(THIS_ BOOL) PURE;
+ STDMETHOD(get_Weight)(THIS_ short*) PURE;
+ STDMETHOD(put_Weight)(THIS_ short) PURE;
+ STDMETHOD(get_Charset)(THIS_ short*) PURE;
+ STDMETHOD(put_Charset)(THIS_ short) PURE;
+ STDMETHOD(get_hFont)(THIS_ HFONT*) PURE;
+ STDMETHOD(Clone)(THIS_ IFont**) PURE;
+ STDMETHOD(IsEqual)(THIS_ IFont*) PURE;
+ STDMETHOD(SetRatio)(THIS_ long,long) PURE;
+ STDMETHOD(QueryTextMetrics)(THIS_ LPTEXTMETRICOLE) PURE;
+ STDMETHOD(AddRefHfont)(THIS_ HFONT) PURE;
+ STDMETHOD(ReleaseHfont)(THIS_ HFONT) PURE;
+ STDMETHOD(SetHdc)(THIS_ HDC) PURE;
+ };
+
+ EXTERN_C const IID IID_IFontDisp;
+ #undef INTERFACE
+ #define INTERFACE IFontDisp
+ DECLARE_INTERFACE_(IFontDisp,IDispatch)
+ {
+ STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
+ STDMETHOD_(ULONG,AddRef)(THIS) PURE;
+ STDMETHOD_(ULONG,Release)(THIS) PURE;
+ STDMETHOD(GetTypeInfoCount)(THIS_ UINT*) PURE;
+ STDMETHOD(GetTypeInfo)(THIS_ UINT,LCID,LPTYPEINFO*) PURE;
+ STDMETHOD(GetIDsOfNames)(THIS_ REFIID,LPOLESTR*,UINT,LCID,DISPID*) PURE;
+ STDMETHOD(Invoke)(THIS_ DISPID,REFIID,LCID,WORD,DISPPARAMS*,VARIANT*,EXCEPINFO*,UINT*) PURE;
+ };
+
+ EXTERN_C const IID IID_IPicture;
+ #undef INTERFACE
+ #define INTERFACE IPicture
+ DECLARE_INTERFACE_(IPicture,IUnknown)
+ {
+ STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
+ STDMETHOD_(ULONG,AddRef)(THIS) PURE;
+ STDMETHOD_(ULONG,Release)(THIS) PURE;
+ STDMETHOD(get_Handle)(THIS_ OLE_HANDLE*) PURE;
+ STDMETHOD(get_hPal)(THIS_ OLE_HANDLE*) PURE;
+ STDMETHOD(get_Type)(THIS_ short*) PURE;
+ STDMETHOD(get_Width)(THIS_ OLE_XSIZE_HIMETRIC*) PURE;
+ STDMETHOD(get_Height)(THIS_ OLE_YSIZE_HIMETRIC*) PURE;
+ STDMETHOD(Render)(THIS_ HDC,long,long,long,long,OLE_XPOS_HIMETRIC,OLE_YPOS_HIMETRIC,OLE_XSIZE_HIMETRIC,OLE_YSIZE_HIMETRIC,LPCRECT) PURE;
+ STDMETHOD(set_hPal)(THIS_ OLE_HANDLE) PURE;
+ STDMETHOD(get_CurDC)(THIS_ HDC*) PURE;
+ STDMETHOD(SelectPicture)(THIS_ HDC,HDC*,OLE_HANDLE*) PURE;
+ STDMETHOD(get_KeepOriginalFormat)(THIS_ BOOL*) PURE;
+ STDMETHOD(put_KeepOriginalFormat)(THIS_ BOOL) PURE;
+ STDMETHOD(PictureChanged)(THIS) PURE;
+ STDMETHOD(SaveAsFile)(THIS_ LPSTREAM,BOOL,LONG*) PURE;
+ STDMETHOD(get_Attributes)(THIS_ PDWORD) PURE;
+ };
+
+ EXTERN_C const IID IID_IPictureDisp;
+ #undef INTERFACE
+ #define INTERFACE IPictureDisp
+ DECLARE_INTERFACE_(IPictureDisp,IDispatch)
+ {
+ STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
+ STDMETHOD_(ULONG,AddRef)(THIS) PURE;
+ STDMETHOD_(ULONG,Release)(THIS) PURE;
+ STDMETHOD(GetTypeInfoCount)(THIS_ UINT*) PURE;
+ STDMETHOD(GetTypeInfo)(THIS_ UINT,LCID,LPTYPEINFO*) PURE;
+ STDMETHOD(GetIDsOfNames)(THIS_ REFIID,LPOLESTR*,UINT,LCID,DISPID*) PURE;
+ STDMETHOD(Invoke)(THIS_ DISPID,REFIID,LCID,WORD,DISPPARAMS*,VARIANT*,EXCEPINFO*,UINT*) PURE;
+ };
+
EXTERN_C const IID IID_IOleInPlaceSiteEx;
#undef INTERFACE
Index: oleacc.h
===================================================================
RCS file: /cvsroot/mingw/w32api/include/oleacc.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** oleacc.h 20 Dec 2002 17:51:09 -0000 1.2
--- oleacc.h 12 Sep 2003 13:26:51 -0000 1.3
***************
*** 1,4 ****
--- 1,11 ----
#ifndef _OLEACC_H
#define _OLEACC_H
+ #if __GNUC__ >=3
+ #pragma GCC system_header
+ #endif
+
+ #ifdef __cplusplus
+ extern "C" {
+ #endif
#define DISPID_ACC_PARENT (-5000)
***************
*** 24,27 ****
--- 31,136 ----
#define DISPID_ACC_DODEFAULTACTION (-5018)
+ #define NAVDIR_DOWN 2
+ #define NAVDIR_FIRSTCHILD 7
+ #define NAVDIR_LASTCHILD 8
+ #define NAVDIR_LEFT 3
+ #define NAVDIR_NEXT 5
+ #define NAVDIR_PREVIOUS 6
+ #define NAVDIR_RIGHT 4
+ #define NAVDIR_UP 1
+
+ #define ROLE_SYSTEM_ALERT 8
+ #define ROLE_SYSTEM_ANIMATION 54
+ #define ROLE_SYSTEM_APPLICATION 14
+ #define ROLE_SYSTEM_BORDER 19
+ #define ROLE_SYSTEM_BUTTONDROPDOWN 56
+ #define ROLE_SYSTEM_BUTTONDROPDOWNGRID 58
+ #define ROLE_SYSTEM_BUTTONMENU 57
+ #define ROLE_SYSTEM_CARET 7
+ #define ROLE_SYSTEM_CELL 29
+ #define ROLE_SYSTEM_CHARACTER 32
+ #define ROLE_SYSTEM_CHART 17
+ #define ROLE_SYSTEM_CHECKBUTTON 44
+ #define ROLE_SYSTEM_CLIENT 10
+ #define ROLE_SYSTEM_CLOCK 61
+ #define ROLE_SYSTEM_COLUMN 27
+ #define ROLE_SYSTEM_COLUMNHEADER 25
+ #define ROLE_SYSTEM_COMBOBOX 46
+ #define ROLE_SYSTEM_CURSOR 6
+ #define ROLE_SYSTEM_DIAGRAM 53
+ #define ROLE_SYSTEM_DIAL 49
+ #define ROLE_SYSTEM_DIALOG 18
+ #define ROLE_SYSTEM_DOCUMENT 15
+ #define ROLE_SYSTEM_DROPLIST 47
+ #define ROLE_SYSTEM_EQUATION 55
+ #define ROLE_SYSTEM_GRAPHIC 40
+ #define ROLE_SYSTEM_GRIP 4
+ #define ROLE_SYSTEM_GROUPING 20
+ #define ROLE_SYSTEM_HELPBALLOON 31
+ #define ROLE_SYSTEM_HOTKEYFIELD 50
+ #define ROLE_SYSTEM_INDICATOR 39
+ #define ROLE_SYSTEM_LINK 30
+ #define ROLE_SYSTEM_LIST 33
+ #define ROLE_SYSTEM_LISTITEM 34
+ #define ROLE_SYSTEM_MENUBAR 2
+ #define ROLE_SYSTEM_MENUITEM 12
+ #define ROLE_SYSTEM_MENUPOPUP 11
+ #define ROLE_SYSTEM_OUTLINE 35
+ #define ROLE_SYSTEM_OUTLINEITEM 36
+ #define ROLE_SYSTEM_PAGETAB 37
+ #define ROLE_SYSTEM_PAGETABLIST 60
+ #define ROLE_SYSTEM_PANE 16
+ #define ROLE_SYSTEM_PROGRESSBAR 48
+ #define ROLE_SYSTEM_PROPERTYPAGE 38
+ #define ROLE_SYSTEM_PUSHBUTTON 43
+ #define ROLE_SYSTEM_RADIOBUTTON 45
+ #define ROLE_SYSTEM_ROW 28
+ #define ROLE_SYSTEM_ROWHEADER 26
+ #define ROLE_SYSTEM_SCROLLBAR 3
+ #define ROLE_SYSTEM_SEPARATOR 21
+ #define ROLE_SYSTEM_SLIDER 51
+ #define ROLE_SYSTEM_SOUND 5
+ #define ROLE_SYSTEM_SPINBUTTON 52
+ #define ROLE_SYSTEM_STATICTEXT 41
+ #define ROLE_SYSTEM_STATUSBAR 23
+ #define ROLE_SYSTEM_TABLE 24
+ #define ROLE_SYSTEM_TEXT 42
+ #define ROLE_SYSTEM_TITLEBAR 1
+ #define ROLE_SYSTEM_TOOLBAR 22
+ #define ROLE_SYSTEM_TOOLTIP 13
+ #define ROLE_SYSTEM_WHITESPACE 59
+ #define ROLE_SYSTEM_WINDOW 9
+
+ #define STATE_SYSTEM_UNAVAILABLE 0x00000001
+ #define STATE_SYSTEM_SELECTED 0x00000002
+ #define STATE_SYSTEM_FOCUSED 0x00000004
+ #define STATE_SYSTEM_PRESSED 0x00000008
+ #define STATE_SYSTEM_CHECKED 0x00000010
+ #define STATE_SYSTEM_MIXED 0x00000020
+ #define STATE_SYSTEM_READONLY 0x00000040
+ #define STATE_SYSTEM_HOTTRACKED 0x00000080
+ #define STATE_SYSTEM_DEFAULT 0x00000100
+ #define STATE_SYSTEM_EXPANDED 0x00000200
+ #define STATE_SYSTEM_COLLAPSED 0x00000400
+ #define STATE_SYSTEM_BUSY 0x00000800
+ #define STATE_SYSTEM_FLOATING 0x00001000
+ #define STATE_SYSTEM_MARQUEED 0x00002000
+ #define STATE_SYSTEM_ANIMATED 0x00004000
+ #define STATE_SYSTEM_INVISIBLE 0x00008000
+ #define STATE_SYSTEM_OFFSCREEN 0x00010000
+ #define STATE_SYSTEM_SIZEABLE 0x00020000
+ #define STATE_SYSTEM_MOVEABLE 0x00040000
+ #define STATE_SYSTEM_SELFVOICING 0x00080000
+ #define STATE_SYSTEM_FOCUSABLE 0x00100000
+ #define STATE_SYSTEM_SELECTABLE 0x00200000
+ #define STATE_SYSTEM_LINKED 0x00400000
+ #define STATE_SYSTEM_TRAVERSED 0x00800000
+ #define STATE_SYSTEM_MULTISELECTABLE 0x01000000
+ #define STATE_SYSTEM_EXTSELECTABLE 0x02000000
+ #define STATE_SYSTEM_ALERT_LOW 0x04000000
+ #define STATE_SYSTEM_ALERT_MEDIUM 0x08000000
+ #define STATE_SYSTEM_ALERT_HIGH 0x10000000
+ #define STATE_SYSTEM_VALID 0x1fffffff
+
typedef enum tagSELFLAG
{
***************
*** 77,80 ****
--- 186,217 ----
typedef IAccessible* LPACCESSIBLE;
+ STDAPI AccessibleChildren(IAccessible*,LONG,LONG,VARIANT*,LONG*);
+ STDAPI AccessibleObjectFromEvent(HWND,DWORD,DWORD,IAccessible*,VARIANT*);
+ STDAPI AccessibleObjectFromPoint(POINT,IAccessible**,VARIANT*);
+ STDAPI AccessibleObjectFromWindow(HWND,DWORD,REFIID,void**);
+ STDAPI CreateStdAccessibleObject(HWND,LONG,REFIID,void**);
+ STDAPI CreateStdAccessibleProxyA(HWND,LPCSTR,LONG,REFIID,void**);
+ STDAPI CreateStdAccessibleProxyW(HWND,LPCWSTR,LONG,REFIID,void**);
+ void WINAPI GetOleaccVersionInfo(DWORD*,DWORD*);
+ UINT WINAPI GetRoleTextA(DWORD,LPSTR,UINT);
+ UINT WINAPI GetRoleTextW(DWORD,LPWSTR,UINT);
+ UINT WINAPI GetStateTextA(DWORD,LPSTR,UINT);
+ UINT WINAPI GetStateTextW(DWORD,LPWSTR,UINT);
+ LRESULT WINAPI LresultFromObject(REFIID,WPARAM,LPUNKNOWN);
+ STDAPI ObjectFromLresult(LRESULT,REFIID,WPARAM,void**);
+ STDAPI WindowFromAccessibleObject(IAccessible*,HWND*);
+
+ #ifdef UNICODE
+ #define CreateStdAccessibleProxy CreateStdAccessibleProxyW
+ #define GetRoleText GetRoleTextW
+ #define GetStateText GetStateTextW
+ #else
+ #define CreateStdAccessibleProxy CreateStdAccessibleProxyA
+ #define GetRoleText GetRoleTextA
+ #define GetStateText GetStateTextA
+ #endif
+ #ifdef __cplusplus
+ }
+ #endif
#endif /* _OLEACC_H */
Index: oleauto.h
===================================================================
RCS file: /cvsroot/mingw/w32api/include/oleauto.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** oleauto.h 11 Mar 2003 15:26:47 -0000 1.6
--- oleauto.h 12 Sep 2003 13:26:51 -0000 1.7
***************
*** 191,194 ****
--- 191,195 ----
WINOLEAUTAPI VarR8FromDisp(LPDISPATCH*,LCID,double*);
WINOLEAUTAPI VarR8FromBool(VARIANT_BOOL,double*);
+ WINOLEAUTAPI VarR8FromDec(DECIMAL*,double*);
WINOLEAUTAPI VarDateFromUI1(unsigned char,DATE*);
WINOLEAUTAPI VarDateFromI2(short,DATE*);
***************
*** 227,230 ****
--- 228,232 ----
WINOLEAUTAPI VarBoolFromStr(OLECHAR*,LCID,unsigned long,VARIANT_BOOL*);
WINOLEAUTAPI VarBoolFromDisp(LPDISPATCH*,LCID,VARIANT_BOOL*);
+ WINOLEAUTAPI VarDecFromR8(double,DECIMAL*);
WINOLEAUTAPI_(ULONG) LHashValOfNameSysA(SYSKIND,LCID,const char*);
WINOLEAUTAPI_(ULONG) LHashValOfNameSys(SYSKIND,LCID,const OLECHAR*);
Index: olectl.h
===================================================================
RCS file: /cvsroot/mingw/w32api/include/olectl.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** olectl.h 11 Mar 2003 15:26:47 -0000 1.4
--- olectl.h 12 Sep 2003 13:26:51 -0000 1.5
***************
*** 358,722 ****
} DUMMYUNIONNAME;
} PICTDESC,*LPPICTDESC;
-
- EXTERN_C const IID IID_IOleControl;
- #undef INTERFACE
- #define INTERFACE IOleControl
- DECLARE_INTERFACE_(IOleControl,IUnknown)
- {
- STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
- STDMETHOD_(ULONG,AddRef)(THIS) PURE;
- STDMETHOD_(ULONG,Release)(THIS) PURE;
- STDMETHOD(GetControlInfo)(THIS_ LPCONTROLINFO) PURE;
- STDMETHOD(OnMnemonic)(THIS_ LPMSG) PURE;
- STDMETHOD(OnAmbientPropertyChange)(THIS_ DISPID) PURE;
- STDMETHOD(FreezeEvents)(THIS_ BOOL) PURE;
- };
- EXTERN_C const IID IID_IOleControlSite;
- #undef INTERFACE
- #define INTERFACE IOleControlSite
- DECLARE_INTERFACE_(IOleControlSite,IUnknown)
- {
- STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
- STDMETHOD_(ULONG,AddRef)(THIS) PURE;
- STDMETHOD_(ULONG,Release)(THIS) PURE;
- STDMETHOD(OnControlInfoChanged)(THIS) PURE;
- STDMETHOD(LockInPlaceActive)(THIS_ BOOL) PURE;
- STDMETHOD(GetExtendedControl)(THIS_ LPDISPATCH*) PURE;
- STDMETHOD(TransformCoords)(THIS_ POINTL*,POINTF*,DWORD) PURE;
- STDMETHOD(TranslateAccelerator)(THIS_ LPMSG,DWORD) PURE;
- STDMETHOD(OnFocus)(THIS_ BOOL) PURE;
- STDMETHOD(ShowPropertyFrame)(THIS) PURE;
- };
- EXTERN_C const IID IID_ISimpleFrameSite;
- #undef INTERFACE
- #define INTERFACE ISimpleFrameSite
- DECLARE_INTERFACE_(ISimpleFrameSite,IUnknown)
- {
- STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
- STDMETHOD_(ULONG,AddRef)(THIS) PURE;
- STDMETHOD_(ULONG,Release)(THIS) PURE;
- STDMETHOD(PreMessageFilter)(THIS_ HWND,UINT,WPARAM,LPARAM,LRESULT*,PDWORD) PURE;
- STDMETHOD(PostMessageFilter)(THIS_ HWND,UINT,WPARAM,LPARAM,LRESULT*,DWORD) PURE;
- };
- EXTERN_C const IID IID_IErrorLog;
- #undef INTERFACE
- #define INTERFACE IErrorLog
- DECLARE_INTERFACE_(IErrorLog,IUnknown)
- {
- STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
- STDMETHOD_(ULONG,AddRef)(THIS) PURE;
- STDMETHOD_(ULONG,Release)(THIS) PURE;
- STDMETHOD(AddError)(THIS_ LPCOLESTR,LPEXCEPINFO) PURE;
- };
- EXTERN_C const IID IID_IPropertyBag;
- #undef INTERFACE
- #define INTERFACE IPropertyBag
- DECLARE_INTERFACE_(IPropertyBag,IUnknown)
- {
- STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
- STDMETHOD_(ULONG,AddRef)(THIS) PURE;
- STDMETHOD_(ULONG,Release)(THIS) PURE;
- STDMETHOD(Read)(THIS_ LPCOLESTR,LPVARIANT,LPERRORLOG) PURE;
- STDMETHOD(Write)(THIS_ LPCOLESTR,LPVARIANT) PURE;
- };
- EXTERN_C const IID IID_IPersistPropertyBag;
- #undef INTERFACE
- #define INTERFACE IPersistPropertyBag
- DECLARE_INTERFACE_(IPersistPropertyBag,IPersist)
- {
- STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
- STDMETHOD_(ULONG,AddRef)(THIS) PURE;
- STDMETHOD_(ULONG,Release)(THIS) PURE;
- STDMETHOD(GetClassID)(THIS_ LPCLSID) PURE;
- STDMETHOD(InitNew)(THIS) PURE;
- STDMETHOD(Load)(THIS_ LPPROPERTYBAG,LPERRORLOG) PURE;
- STDMETHOD(Save)(THIS_ LPPROPERTYBAG,BOOL,BOOL) PURE;
- };
- EXTERN_C const IID IID_IPersistStreamInit;
- #undef INTERFACE
- #define INTERFACE IPersistStreamInit
- DECLARE_INTERFACE_(IPersistStreamInit,IPersist)
- {
- STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
- STDMETHOD_(ULONG,AddRef)(THIS) PURE;
- STDMETHOD_(ULONG,Release)(THIS) PURE;
- STDMETHOD(GetClassID)(THIS_ LPCLSID) PURE;
- STDMETHOD(IsDirty)(THIS) PURE;
- STDMETHOD(Load)(THIS_ LPSTREAM) PURE;
- STDMETHOD(Save)(THIS_ LPSTREAM,BOOL) PURE;
- STDMETHOD(GetSizeMax)(THIS_ PULARGE_INTEGER) PURE;
- STDMETHOD(InitNew)(THIS) PURE;
- };
- EXTERN_C const IID IID_IPersistMemory;
- #undef INTERFACE
- #define INTERFACE IPersistMemory
- DECLARE_INTERFACE_(IPersistMemory,IPersist)
- {
- STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
- STDMETHOD_(ULONG,AddRef)(THIS) PURE;
- STDMETHOD_(ULONG,Release)(THIS) PURE;
- STDMETHOD(GetClassID)(THIS_ LPCLSID) PURE;
- STDMETHOD(IsDirty)(THIS) PURE;
- STDMETHOD(Load)(THIS_ PVOID,ULONG) PURE;
- STDMETHOD(Save)(THIS_ PVOID,BOOL,ULONG) PURE;
- STDMETHOD(GetSizeMax)(THIS_ PULONG) PURE;
- STDMETHOD(InitNew)(THIS) PURE;
- };
- EXTERN_C const IID IID_IPropertyNotifySink;
- #undef INTERFACE
- #define INTERFACE IPropertyNotifySink
- DECLARE_INTERFACE_(IPropertyNotifySink,IUnknown)
- {
- STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
- STDMETHOD_(ULONG,AddRef)(THIS) PURE;
- STDMETHOD_(ULONG,Release)(THIS) PURE;
- STDMETHOD(OnChanged)(THIS_ DISPID) PURE;
- STDMETHOD(OnRequestEdit)(THIS_ DISPID) PURE;
- };
- EXTERN_C const IID IID_IProvideClassInfo;
- #undef INTERFACE
- #define INTERFACE IProvideClassInfo
- DECLARE_INTERFACE_(IProvideClassInfo,IUnknown)
- {
- STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
- STDMETHOD_(ULONG,AddRef)(THIS) PURE;
- STDMETHOD_(ULONG,Release)(THIS) PURE;
- STDMETHOD(GetClassInfo)(THIS_ LPTYPEINFO*) PURE;
- };
- EXTERN_C const IID IID_IProvideClassInfo2;
- #undef INTERFACE
- #define INTERFACE IProvideClassInfo2
- DECLARE_INTERFACE_(IProvideClassInfo2,IProvideClassInfo)
- {
- STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
- STDMETHOD_(ULONG,AddRef)(THIS) PURE;
- STDMETHOD_(ULONG,Release)(THIS) PURE;
- STDMETHOD(GetClassInfo)(THIS_ LPTYPEINFO*) PURE;
- STDMETHOD(GetGUID)(THIS_ DWORD,GUID*) PURE;
- };
- EXTERN_C const IID IID_IConnectionPointContainer;
- #undef INTERFACE
- #define INTERFACE IConnectionPointContainer
- DECLARE_INTERFACE_(IConnectionPointContainer,IUnknown)
- {
- STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
- STDMETHOD_(ULONG,AddRef)(THIS) PURE;
- STDMETHOD_(ULONG,Release)(THIS) PURE;
- STDMETHOD(EnumConnectionPoints)(THIS_ LPENUMCONNECTIONPOINTS*) PURE;
- STDMETHOD(FindConnectionPoint)(THIS_ REFIID,LPCONNECTIONPOINT*) PURE;
- };
- EXTERN_C const IID IID_IEnumConnectionPoints;
- #undef INTERFACE
- #define INTERFACE IEnumConnectionPoints
- DECLARE_INTERFACE_(IEnumConnectionPoints,IUnknown)
- {
- STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
- STDMETHOD_(ULONG,AddRef)(THIS) PURE;
- STDMETHOD_(ULONG,Release)(THIS) PURE;
- STDMETHOD(Next)(THIS_ ULONG,LPCONNECTIONPOINT*,ULONG*) PURE;
- STDMETHOD(Skip)(THIS_ ULONG) PURE;
- STDMETHOD(Reset)(THIS) PURE;
- STDMETHOD(Clone)(THIS_ LPENUMCONNECTIONPOINTS*) PURE;
- };
- EXTERN_C const IID IID_IConnectionPoint;
- #undef INTERFACE
- #define INTERFACE IConnectionPoint
- DECLARE_INTERFACE_(IConnectionPoint,IUnknown)
- {
- STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
- STDMETHOD_(ULONG,AddRef)(THIS) PURE;
- STDMETHOD_(ULONG,Release)(THIS) PURE;
- STDMETHOD(GetConnectionInterface)(THIS_ IID*) PURE;
- STDMETHOD(GetConnectionPointContainer)(THIS_ IConnectionPointContainer**) PURE;
- STDMETHOD(Advise)(THIS_ LPUNKNOWN,PDWORD) PURE;
- STDMETHOD(Unadvise)(THIS_ DWORD) PURE;
- STDMETHOD(EnumConnections)(THIS_ LPENUMCONNECTIONS*) PURE;
- };
- EXTERN_C const IID IID_IEnumConnections;
- #undef INTERFACE
- #define INTERFACE IEnumConnections
- DECLARE_INTERFACE_(IEnumConnections,IUnknown)
- {
- STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
- STDMETHOD_(ULONG,AddRef)(THIS) PURE;
- STDMETHOD_(ULONG,Release)(THIS) PURE;
- STDMETHOD(Next)(THIS_ ULONG,LPCONNECTDATA,PULONG) PURE;
- STDMETHOD(Skip)(THIS_ ULONG) PURE;
- STDMETHOD(Reset)(THIS) PURE;
- STDMETHOD(Clone)(THIS_ LPENUMCONNECTIONS*) PURE;
- };
- EXTERN_C const IID IID_IClassFactory2;
- #undef INTERFACE
- #define INTERFACE IClassFactory2
- DECLARE_INTERFACE_(IClassFactory2,IClassFactory)
- {
- STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
- STDMETHOD_(ULONG,AddRef)(THIS) PURE;
- STDMETHOD_(ULONG,Release)(THIS) PURE;
- STDMETHOD(CreateInstance)(THIS_ LPUNKNOWN,REFIID,PVOID*) PURE;
- STDMETHOD(LockServer)(THIS_ BOOL) PURE;
- STDMETHOD(GetLicInfo)(THIS_ LPLICINFO) PURE;
- STDMETHOD(RequestLicKey)(THIS_ DWORD,BSTR*) PURE;
- STDMETHOD(CreateInstanceLic)(THIS_ LPUNKNOWN,LPUNKNOWN,REFIID,BSTR,PVOID*) PURE;
- };
- EXTERN_C const IID IID_ISpecifyPropertyPages;
- #undef INTERFACE
- #define INTERFACE ISpecifyPropertyPages
- DECLARE_INTERFACE_(ISpecifyPropertyPages,IUnknown)
- {
- STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
- STDMETHOD_(ULONG,AddRef)(THIS) PURE;
- STDMETHOD_(ULONG,Release)(THIS) PURE;
- STDMETHOD(GetPages)(THIS_ CAUUID*) PURE;
- };
- EXTERN_C const IID IID_IPerPropertyBrowsing;
- #undef INTERFACE
- #define INTERFACE IPerPropertyBrowsing
- DECLARE_INTERFACE_(IPerPropertyBrowsing,IUnknown)
- {
- STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
- STDMETHOD_(ULONG,AddRef)(THIS) PURE;
- STDMETHOD_(ULONG,Release)(THIS) PURE;
- STDMETHOD(GetDisplayString)(THIS_ DISPID,BSTR*) PURE;
- STDMETHOD(MapPropertyToPage)(THIS_ DISPID,LPCLSID) PURE;
- STDMETHOD(GetPredefinedStrings)(THIS_ DISPID,CALPOLESTR*,CADWORD*) PURE;
- STDMETHOD(GetPredefinedValue)(THIS_ DISPID,DWORD,VARIANT*) PURE;
- };
- EXTERN_C const IID IID_IPropertyPageSite;
- #undef INTERFACE
- #define INTERFACE IPropertyPageSite
- DECLARE_INTERFACE_(IPropertyPageSite,IUnknown)
- {
- STDMETHOD(QueryInterface)(THIS_ ...
[truncated message content] |
Update of /cvsroot/mingw/w32api/include/ddk
In directory sc8-pr-cvs1:/tmp/cvs-serv17014/include/ddk
Modified Files:
atm.h cfg.h cfgmgr32.h ddkmapi.h hidpi.h ndis.h ndiswan.h
ntapi.h ntddcdrm.h ntdddisk.h ntddmou.h ntifs.h ntpoapi.h
scsi.h srb.h tdikrnl.h usb.h usbcamdi.h video.h winddk.h
winnt4.h
Log Message:
Merge winsup changes
Index: atm.h
===================================================================
RCS file: /cvsroot/mingw/w32api/include/ddk/atm.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** atm.h 19 Nov 2002 14:45:07 -0000 1.2
--- atm.h 12 Sep 2003 13:26:51 -0000 1.3
***************
*** 133,139 ****
--- 133,146 ----
} AAL_PARAMETERS_IE, *PAAL_PARAMETERS_IE;
+
+ /* FIXME: Should the union be anonymous in C++ too? If so,
+ can't define named types _ATM_AAL5_INFO and _ATM_AAL0_INFO
+ within anonymous union for C++. */
typedef struct _ATM_AAL_OOB_INFO
{
ATM_AAL_TYPE AalType;
+ #ifndef __cplusplus
+ _ANONYMOUS_UNION
+ #endif
union {
struct _ATM_AAL5_INFO {
***************
*** 147,154 ****
UCHAR PayLoadTypeIdentifier;
} ATM_AAL0_INFO;
! #ifdef __cplusplus
! } u;
#else
! };
#endif
} ATM_AAL_OOB_INFO, *PATM_AAL_OOB_INFO;
--- 154,161 ----
UCHAR PayLoadTypeIdentifier;
} ATM_AAL0_INFO;
! #ifndef __cplusplus
! } DUMMYUNIONNAME;
#else
! } u;
#endif
} ATM_AAL_OOB_INFO, *PATM_AAL_OOB_INFO;
Index: cfg.h
===================================================================
RCS file: /cvsroot/mingw/w32api/include/ddk/cfg.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** cfg.h 19 Nov 2002 14:45:07 -0000 1.2
--- cfg.h 12 Sep 2003 13:26:51 -0000 1.3
***************
*** 112,116 ****
PNP_VetoInsufficientPower,
PNP_VetoNonDisableable,
! PNP_VetoLegacyDriver,
} PNP_VETO_TYPE, *PPNP_VETO_TYPE;
--- 112,116 ----
PNP_VetoInsufficientPower,
PNP_VetoNonDisableable,
! PNP_VetoLegacyDriver
} PNP_VETO_TYPE, *PPNP_VETO_TYPE;
Index: cfgmgr32.h
===================================================================
RCS file: /cvsroot/mingw/w32api/include/ddk/cfgmgr32.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** cfgmgr32.h 19 Nov 2002 14:45:07 -0000 1.2
--- cfgmgr32.h 12 Sep 2003 13:26:51 -0000 1.3
***************
*** 1045,1056 ****
/* CM_Get_First_Log_Conf.ulFlags constants */
! #define BASIC_LOG_CONF 0x00000000 // Specifies the req list.
! #define FILTERED_LOG_CONF 0x00000001 // Specifies the filtered req list.
! #define ALLOC_LOG_CONF 0x00000002 // Specifies the Alloc Element.
! #define BOOT_LOG_CONF 0x00000003 // Specifies the RM Alloc Element.
! #define FORCED_LOG_CONF 0x00000004 // Specifies the Forced Log Conf
! #define OVERRIDE_LOG_CONF 0x00000005 // Specifies the Override req list.
! #define NUM_LOG_CONF 0x00000006 // Number of Log Conf type
! #define LOG_CONF_BITS 0x00000007 // The bits of the log conf type.
CMAPI
--- 1045,1056 ----
/* CM_Get_First_Log_Conf.ulFlags constants */
! #define BASIC_LOG_CONF 0x00000000 /* Specifies the req list. */
! #define FILTERED_LOG_CONF 0x00000001 /* Specifies the filtered req list. */
! #define ALLOC_LOG_CONF 0x00000002 /* Specifies the Alloc Element. */
! #define BOOT_LOG_CONF 0x00000003 /* Specifies the RM Alloc Element. */
! #define FORCED_LOG_CONF 0x00000004 /* Specifies the Forced Log Conf */
! #define OVERRIDE_LOG_CONF 0x00000005 /* Specifies the Override req list. */
! #define NUM_LOG_CONF 0x00000006 /* Number of Log Conf type */
! #define LOG_CONF_BITS 0x00000007 /* The bits of the log conf type. */
CMAPI
Index: ddkmapi.h
===================================================================
RCS file: /cvsroot/mingw/w32api/include/ddk/ddkmapi.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ddkmapi.h 19 Nov 2002 14:45:07 -0000 1.2
--- ddkmapi.h 12 Sep 2003 13:26:51 -0000 1.3
***************
*** 205,220 ****
DWORD dwFormatFourCC;
DWORD dwFormatBitCount;
! union {
DWORD dwRBitMask;
DWORD dwYBitMask;
! };
! union {
DWORD dwGBitMask;
DWORD dwUBitMask;
! };
! union {
DWORD dwBBitMask;
DWORD dwVBitMask;
! };
} DDLOCKOUT, FAR *LPDDLOCKOUT;
--- 205,220 ----
DWORD dwFormatFourCC;
DWORD dwFormatBitCount;
! _ANONYMOUS_UNION union {
DWORD dwRBitMask;
DWORD dwYBitMask;
! } DUMMYUNIONNAME;
! _ANONYMOUS_UNION union {
DWORD dwGBitMask;
DWORD dwUBitMask;
! } DUMMYUNIONNAME2;
! _ANONYMOUS_UNION union {
DWORD dwBBitMask;
DWORD dwVBitMask;
! } DUMMYUNIONNAME3;
} DDLOCKOUT, FAR *LPDDLOCKOUT;
Index: hidpi.h
===================================================================
RCS file: /cvsroot/mingw/w32api/include/ddk/hidpi.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** hidpi.h 19 Nov 2002 14:45:07 -0000 1.2
--- hidpi.h 12 Sep 2003 13:26:51 -0000 1.3
***************
*** 58,63 ****
typedef struct _HIDP_KEYBOARD_MODIFIER_STATE {
! union {
! struct {
ULONG LeftControl : 1;
ULONG LeftShift : 1;
--- 58,63 ----
typedef struct _HIDP_KEYBOARD_MODIFIER_STATE {
! _ANONYMOUS_UNION union {
! _ANONYMOUS_STRUCT struct {
ULONG LeftControl : 1;
ULONG LeftShift : 1;
***************
*** 72,78 ****
ULONG NumLock : 1;
ULONG Reserved : 21;
! };
ULONG ul;
! };
} HIDP_KEYBOARD_MODIFIER_STATE, *PHIDP_KEYBOARD_MODIFIER_STATE;
--- 72,78 ----
ULONG NumLock : 1;
ULONG Reserved : 21;
! } DUMMYSTRUCTNAME;
ULONG ul;
! } DUMMYUNIONNAME;
} HIDP_KEYBOARD_MODIFIER_STATE, *PHIDP_KEYBOARD_MODIFIER_STATE;
***************
*** 122,126 ****
BOOLEAN IsAbsolute;
ULONG Reserved[10];
! union {
struct {
USAGE UsageMin, UsageMax;
--- 122,126 ----
BOOLEAN IsAbsolute;
ULONG Reserved[10];
! _ANONYMOUS_UNION union {
struct {
USAGE UsageMin, UsageMax;
***************
*** 135,139 ****
USHORT DataIndex, Reserved4;
} NotRange;
! };
} HIDP_BUTTON_CAPS, *PHIDP_BUTTON_CAPS;
--- 135,139 ----
USHORT DataIndex, Reserved4;
} NotRange;
! } DUMMYUNIONNAME;
} HIDP_BUTTON_CAPS, *PHIDP_BUTTON_CAPS;
***************
*** 160,167 ****
USHORT DataIndex;
USHORT Reserved;
! union {
ULONG RawValue;
BOOLEAN On;
! };
} HIDP_DATA, *PHIDP_DATA;
--- 160,167 ----
USHORT DataIndex;
USHORT Reserved;
! _ANONYMOUS_UNION union {
ULONG RawValue;
BOOLEAN On;
! } DUMMYUNIONNAME;
} HIDP_DATA, *PHIDP_DATA;
***************
*** 210,214 ****
LONG LogicalMin, LogicalMax;
LONG PhysicalMin, PhysicalMax;
! union {
struct {
USAGE UsageMin, UsageMax;
--- 210,214 ----
LONG LogicalMin, LogicalMax;
LONG PhysicalMin, PhysicalMax;
! _ANONYMOUS_UNION union {
struct {
USAGE UsageMin, UsageMax;
***************
*** 223,227 ****
USHORT DataIndex, Reserved4;
} NotRange;
! };
} HIDP_VALUE_CAPS, *PHIDP_VALUE_CAPS;
--- 223,227 ----
USHORT DataIndex, Reserved4;
} NotRange;
! } DUMMYUNIONNAME;
} HIDP_VALUE_CAPS, *PHIDP_VALUE_CAPS;
***************
*** 518,522 ****
IN HIDP_REPORT_TYPE ReportType,
IN USAGE UsagePage,
! IN USHORT LinkCollection, // Optional
IN PUSAGE UsageList,
IN OUT PULONG UsageLength,
--- 518,522 ----
IN HIDP_REPORT_TYPE ReportType,
IN USAGE UsagePage,
! IN USHORT LinkCollection, /* Optional */
IN PUSAGE UsageList,
IN OUT PULONG UsageLength,
Index: ndis.h
===================================================================
RCS file: /cvsroot/mingw/w32api/include/ddk/ndis.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ndis.h 20 Dec 2002 17:51:09 -0000 1.3
--- ndis.h 12 Sep 2003 13:26:51 -0000 1.4
***************
*** 434,441 ****
typedef struct _NDIS_PACKET_OOB_DATA {
! union {
ULONGLONG TimeToSend;
ULONGLONG TimeSent;
! };
ULONGLONG TimeReceived;
UINT HeaderSize;
--- 434,441 ----
typedef struct _NDIS_PACKET_OOB_DATA {
! _ANONYMOUS_UNION union {
ULONGLONG TimeToSend;
ULONGLONG TimeSent;
! } DUMMYUNIONNAME;
ULONGLONG TimeReceived;
UINT HeaderSize;
***************
*** 760,764 ****
typedef struct _NDIS_IPSEC_PACKET_INFO {
! union {
struct {
NDIS_HANDLE OffloadHandle;
--- 760,764 ----
typedef struct _NDIS_IPSEC_PACKET_INFO {
! _ANONYMOUS_UNION union {
struct {
NDIS_HANDLE OffloadHandle;
***************
*** 771,775 ****
ULONG CryptoStatus;
} Receive;
! };
} NDIS_IPSEC_PACKET_INFO, *PNDIS_IPSEC_PACKET_INFO;
--- 771,775 ----
ULONG CryptoStatus;
} Receive;
! } DUMMYUNIONNAME;
} NDIS_IPSEC_PACKET_INFO, *PNDIS_IPSEC_PACKET_INFO;
***************
*** 801,805 ****
typedef struct _NDIS_PACKET_8021Q_INFO {
! union {
struct {
UINT32 UserPriority : 3;
--- 801,805 ----
typedef struct _NDIS_PACKET_8021Q_INFO {
! _ANONYMOUS_UNION union {
struct {
UINT32 UserPriority : 3;
***************
*** 809,813 ****
} TagHeader;
PVOID Value;
! };
} NDIS_PACKET_8021Q_INFO, *PNDIS_PACKET_8021Q_INFO;
--- 809,813 ----
} TagHeader;
PVOID Value;
! } DUMMYUNIONNAME;
} NDIS_PACKET_8021Q_INFO, *PNDIS_PACKET_8021Q_INFO;
***************
*** 989,993 ****
typedef struct _NDIS_TCP_IP_CHECKSUM_PACKET_INFO {
! union {
struct {
ULONG NdisPacketChecksumV4 : 1;
--- 989,993 ----
typedef struct _NDIS_TCP_IP_CHECKSUM_PACKET_INFO {
! _ANONYMOUS_UNION union {
struct {
ULONG NdisPacketChecksumV4 : 1;
***************
*** 1008,1012 ****
} Receive;
ULONG Value;
! };
} NDIS_TCP_IP_CHECKSUM_PACKET_INFO, *PNDIS_TCP_IP_CHECKSUM_PACKET_INFO;
--- 1008,1012 ----
} Receive;
ULONG Value;
! } DUMMYUNIONNAME;
} NDIS_TCP_IP_CHECKSUM_PACKET_INFO, *PNDIS_TCP_IP_CHECKSUM_PACKET_INFO;
***************
*** 1348,1371 ****
UCHAR MajorNdisVersion; \
UCHAR MinorNdisVersion; \
! union { \
UINT Reserved; \
UINT Flags; \
! }; \
OPEN_ADAPTER_COMPLETE_HANDLER OpenAdapterCompleteHandler; \
CLOSE_ADAPTER_COMPLETE_HANDLER CloseAdapterCompleteHandler; \
! union { \
SEND_COMPLETE_HANDLER SendCompleteHandler; \
WAN_SEND_COMPLETE_HANDLER WanSendCompleteHandler; \
! }; \
! union { \
TRANSFER_DATA_COMPLETE_HANDLER TransferDataCompleteHandler; \
WAN_TRANSFER_DATA_COMPLETE_HANDLER WanTransferDataCompleteHandler; \
! }; \
RESET_COMPLETE_HANDLER ResetCompleteHandler; \
REQUEST_COMPLETE_HANDLER RequestCompleteHandler; \
! union { \
RECEIVE_HANDLER ReceiveHandler; \
WAN_RECEIVE_HANDLER WanReceiveHandler; \
! }; \
RECEIVE_COMPLETE_HANDLER ReceiveCompleteHandler; \
STATUS_HANDLER StatusHandler; \
--- 1348,1371 ----
UCHAR MajorNdisVersion; \
UCHAR MinorNdisVersion; \
! _ANONYMOUS_UNION union { \
UINT Reserved; \
UINT Flags; \
! } DUMMYUNIONNAME; \
OPEN_ADAPTER_COMPLETE_HANDLER OpenAdapterCompleteHandler; \
CLOSE_ADAPTER_COMPLETE_HANDLER CloseAdapterCompleteHandler; \
! _ANONYMOUS_UNION union { \
SEND_COMPLETE_HANDLER SendCompleteHandler; \
WAN_SEND_COMPLETE_HANDLER WanSendCompleteHandler; \
! } DUMMYUNIONNAME2; \
! _ANONYMOUS_UNION union { \
TRANSFER_DATA_COMPLETE_HANDLER TransferDataCompleteHandler; \
WAN_TRANSFER_DATA_COMPLETE_HANDLER WanTransferDataCompleteHandler; \
! } DUMMYUNIONNAME3; \
RESET_COMPLETE_HANDLER ResetCompleteHandler; \
REQUEST_COMPLETE_HANDLER RequestCompleteHandler; \
! _ANONYMOUS_UNION union { \
RECEIVE_HANDLER ReceiveHandler; \
WAN_RECEIVE_HANDLER WanReceiveHandler; \
! } DUMMYUNIONNAME4; \
RECEIVE_COMPLETE_HANDLER ReceiveCompleteHandler; \
STATUS_HANDLER StatusHandler; \
***************
*** 1374,1378 ****
typedef struct _NDIS30_PROTOCOL_CHARACTERISTICS {
! NDIS30_PROTOCOL_CHARACTERISTICS_S;
} NDIS30_PROTOCOL_CHARACTERISTICS, *PNDIS30_PROTOCOL_CHARACTERISTICS;
--- 1374,1378 ----
typedef struct _NDIS30_PROTOCOL_CHARACTERISTICS {
! NDIS30_PROTOCOL_CHARACTERISTICS_S
} NDIS30_PROTOCOL_CHARACTERISTICS, *PNDIS30_PROTOCOL_CHARACTERISTICS;
***************
*** 1424,1428 ****
#define NDIS40_PROTOCOL_CHARACTERISTICS_S \
! NDIS30_PROTOCOL_CHARACTERISTICS_S; \
RECEIVE_PACKET_HANDLER ReceivePacketHandler; \
BIND_HANDLER BindAdapterHandler; \
--- 1424,1428 ----
#define NDIS40_PROTOCOL_CHARACTERISTICS_S \
! NDIS30_PROTOCOL_CHARACTERISTICS_S \
RECEIVE_PACKET_HANDLER ReceivePacketHandler; \
BIND_HANDLER BindAdapterHandler; \
***************
*** 1434,1438 ****
typedef struct _NDIS40_PROTOCOL_CHARACTERISTICS {
! NDIS40_PROTOCOL_CHARACTERISTICS_S;
} NDIS40_PROTOCOL_CHARACTERISTICS, *PNDIS40_PROTOCOL_CHARACTERISTICS;
--- 1434,1438 ----
typedef struct _NDIS40_PROTOCOL_CHARACTERISTICS {
! NDIS40_PROTOCOL_CHARACTERISTICS_S
} NDIS40_PROTOCOL_CHARACTERISTICS, *PNDIS40_PROTOCOL_CHARACTERISTICS;
***************
*** 1477,1481 ****
#define NDIS50_PROTOCOL_CHARACTERISTICS_S \
! NDIS40_PROTOCOL_CHARACTERISTICS_S; \
PVOID ReservedHandlers[4]; \
CO_SEND_COMPLETE_HANDLER CoSendCompleteHandler; \
--- 1477,1481 ----
#define NDIS50_PROTOCOL_CHARACTERISTICS_S \
! NDIS40_PROTOCOL_CHARACTERISTICS_S \
PVOID ReservedHandlers[4]; \
CO_SEND_COMPLETE_HANDLER CoSendCompleteHandler; \
***************
*** 1487,1491 ****
typedef struct _NDIS50_PROTOCOL_CHARACTERISTICS {
! NDIS50_PROTOCOL_CHARACTERISTICS_S;
} NDIS50_PROTOCOL_CHARACTERISTICS, *PNDIS50_PROTOCOL_CHARACTERISTICS;
--- 1487,1491 ----
typedef struct _NDIS50_PROTOCOL_CHARACTERISTICS {
! NDIS50_PROTOCOL_CHARACTERISTICS_S
} NDIS50_PROTOCOL_CHARACTERISTICS, *PNDIS50_PROTOCOL_CHARACTERISTICS;
***************
*** 1500,1504 ****
#elif defined(NDIS30)
typedef struct _NDIS_PROTOCOL_CHARACTERISTICS {
! NDIS30_PROTOCOL_CHARACTERISTICS_S;
} NDIS_PROTOCOL_CHARACTERISTICS, *PNDIS_PROTOCOL_CHARACTERISTICS;
#else
--- 1500,1504 ----
#elif defined(NDIS30)
typedef struct _NDIS_PROTOCOL_CHARACTERISTICS {
! NDIS30_PROTOCOL_CHARACTERISTICS_S
} NDIS_PROTOCOL_CHARACTERISTICS, *PNDIS_PROTOCOL_CHARACTERISTICS;
#else
***************
*** 2525,2530 ****
* IN PNDIS_SPIN_LOCK SpinLock);
*/
! #define NdisAllocateSpinLock(SpinLock) \
! KeInitializeSpinLock(&(SpinLock)->SpinLock)
/*
--- 2525,2530 ----
* IN PNDIS_SPIN_LOCK SpinLock);
*/
! #define NdisAllocateSpinLock(_SpinLock) \
! KeInitializeSpinLock(&(_SpinLock)->SpinLock)
/*
***************
*** 2533,2537 ****
* IN PNDIS_SPIN_LOCK SpinLock);
*/
! #define NdisFreeSpinLock(SpinLock)
/*
--- 2533,2537 ----
* IN PNDIS_SPIN_LOCK SpinLock);
*/
! #define NdisFreeSpinLock(_SpinLock)
/*
***************
*** 2540,2545 ****
* IN PNDIS_SPIN_LOCK SpinLock);
*/
! #define NdisAcquireSpinLock(SpinLock) \
! KeAcquireSpinLock(&(SpinLock)->SpinLock, &(SpinLock)->OldIrql)
/*
--- 2540,2545 ----
* IN PNDIS_SPIN_LOCK SpinLock);
*/
! #define NdisAcquireSpinLock(_SpinLock) \
! KeAcquireSpinLock(&(_SpinLock)->SpinLock, &(_SpinLock)->OldIrql)
/*
***************
*** 2548,2553 ****
* IN PNDIS_SPIN_LOCK SpinLock);
*/
! #define NdisReleaseSpinLock(SpinLock) \
! KeReleaseSpinLock(&(SpinLock)->SpinLock,(SpinLock)->OldIrql)
/*
--- 2548,2553 ----
* IN PNDIS_SPIN_LOCK SpinLock);
*/
! #define NdisReleaseSpinLock(_SpinLock) \
! KeReleaseSpinLock(&(_SpinLock)->SpinLock, (_SpinLock)->OldIrql)
/*
***************
*** 2556,2563 ****
* IN PNDIS_SPIN_LOCK SpinLock);
*/
! #define NdisDprAcquireSpinLock(SpinLock) \
{ \
! KeAcquireSpinLockAtDpcLevel(&(SpinLock)->SpinLock); \
! (SpinLock)->OldIrql = DISPATCH_LEVEL; \
}
--- 2556,2563 ----
* IN PNDIS_SPIN_LOCK SpinLock);
*/
! #define NdisDprAcquireSpinLock(_SpinLock) \
{ \
! KeAcquireSpinLockAtDpcLevel(&(_SpinLock)->SpinLock); \
! (_SpinLock)->OldIrql = DISPATCH_LEVEL; \
}
***************
*** 2567,2572 ****
* IN PNDIS_SPIN_LOCK SpinLock);
*/
! #define NdisDprReleaseSpinLock(SpinLock) \
! KeReleaseSpinLockFromDpcLevel(&(SpinLock)->SpinLock)
--- 2567,2572 ----
* IN PNDIS_SPIN_LOCK SpinLock);
*/
! #define NdisDprReleaseSpinLock(_SpinLock) \
! KeReleaseSpinLockFromDpcLevel(&(_SpinLock)->SpinLock)
***************
*** 3721,3736 ****
W_RECONFIGURE_HANDLER ReconfigureHandler; \
W_RESET_HANDLER ResetHandler; \
! union { \
W_SEND_HANDLER SendHandler; \
WM_SEND_HANDLER WanSendHandler; \
! } u1; \
W_SET_INFORMATION_HANDLER SetInformationHandler; \
! union { \
W_TRANSFER_DATA_HANDLER TransferDataHandler; \
WM_TRANSFER_DATA_HANDLER WanTransferDataHandler; \
! } u2;
typedef struct _NDIS30_MINIPORT_CHARACTERISTICS {
! NDIS30_MINIPORT_CHARACTERISTICS_S;
} NDIS30_MINIPORT_CHARACTERISTICS, *PSNDIS30_MINIPORT_CHARACTERISTICS;
--- 3721,3736 ----
W_RECONFIGURE_HANDLER ReconfigureHandler; \
W_RESET_HANDLER ResetHandler; \
! _ANONYMOUS_UNION union { \
W_SEND_HANDLER SendHandler; \
WM_SEND_HANDLER WanSendHandler; \
! } _UNION_NAME(u1); \
W_SET_INFORMATION_HANDLER SetInformationHandler; \
! _ANONYMOUS_UNION union { \
W_TRANSFER_DATA_HANDLER TransferDataHandler; \
WM_TRANSFER_DATA_HANDLER WanTransferDataHandler; \
! } _UNION_NAME(u2);
typedef struct _NDIS30_MINIPORT_CHARACTERISTICS {
! NDIS30_MINIPORT_CHARACTERISTICS_S
} NDIS30_MINIPORT_CHARACTERISTICS, *PSNDIS30_MINIPORT_CHARACTERISTICS;
***************
*** 3768,3772 ****
#define NDIS40_MINIPORT_CHARACTERISTICS_S \
! NDIS30_MINIPORT_CHARACTERISTICS_S; \
W_RETURN_PACKET_HANDLER ReturnPacketHandler; \
W_SEND_PACKETS_HANDLER SendPacketsHandler; \
--- 3768,3772 ----
#define NDIS40_MINIPORT_CHARACTERISTICS_S \
! NDIS30_MINIPORT_CHARACTERISTICS_S \
W_RETURN_PACKET_HANDLER ReturnPacketHandler; \
W_SEND_PACKETS_HANDLER SendPacketsHandler; \
***************
*** 3776,3780 ****
typedef struct _NDIS40_MINIPORT_CHARACTERISTICS {
! NDIS40_MINIPORT_CHARACTERISTICS_S;
} NDIS40_MINIPORT_CHARACTERISTICS, *PNDIS40_MINIPORT_CHARACTERISTICS;
--- 3776,3780 ----
typedef struct _NDIS40_MINIPORT_CHARACTERISTICS {
! NDIS40_MINIPORT_CHARACTERISTICS_S
} NDIS40_MINIPORT_CHARACTERISTICS, *PNDIS40_MINIPORT_CHARACTERISTICS;
***************
*** 3816,3820 ****
#define NDIS50_MINIPORT_CHARACTERISTICS_S \
! NDIS40_MINIPORT_CHARACTERISTICS_S Ndis40Chars; \
W_CO_CREATE_VC_HANDLER CoCreateVcHandler; \
W_CO_DELETE_VC_HANDLER CoDeleteVcHandler; \
--- 3816,3820 ----
#define NDIS50_MINIPORT_CHARACTERISTICS_S \
! NDIS40_MINIPORT_CHARACTERISTICS Ndis40Chars; \
W_CO_CREATE_VC_HANDLER CoCreateVcHandler; \
W_CO_DELETE_VC_HANDLER CoDeleteVcHandler; \
***************
*** 3827,3831 ****
#define NDIS50_MINIPORT_CHARACTERISTICS_S \
! NDIS40_MINIPORT_CHARACTERISTICS_S; \
W_CO_CREATE_VC_HANDLER CoCreateVcHandler; \
W_CO_DELETE_VC_HANDLER CoDeleteVcHandler; \
--- 3827,3831 ----
#define NDIS50_MINIPORT_CHARACTERISTICS_S \
! NDIS40_MINIPORT_CHARACTERISTICS_S \
W_CO_CREATE_VC_HANDLER CoCreateVcHandler; \
W_CO_DELETE_VC_HANDLER CoDeleteVcHandler; \
***************
*** 3838,3842 ****
typedef struct _NDIS50_MINIPORT_CHARACTERISTICS {
! NDIS50_MINIPORT_CHARACTERISTICS_S;
} NDIS50_MINIPORT_CHARACTERISTICS, *PSNDIS50_MINIPORT_CHARACTERISTICS;
--- 3838,3842 ----
typedef struct _NDIS50_MINIPORT_CHARACTERISTICS {
! NDIS50_MINIPORT_CHARACTERISTICS_S
} NDIS50_MINIPORT_CHARACTERISTICS, *PSNDIS50_MINIPORT_CHARACTERISTICS;
***************
*** 3852,3868 ****
#if defined(NDIS51)
typedef struct _NDIS_MINIPORT_CHARACTERISTICS {
! NDIS50_MINIPORT_CHARACTERISTICS_S;
} NDIS_MINIPORT_CHARACTERISTICS, *PNDIS_MINIPORT_CHARACTERISTICS;
#elif defined(NDIS50)
typedef struct _NDIS_MINIPORT_CHARACTERISTICS {
! NDIS50_MINIPORT_CHARACTERISTICS_S;
} NDIS_MINIPORT_CHARACTERISTICS, *PNDIS_MINIPORT_CHARACTERISTICS;
#elif defined(NDIS40)
typedef struct _NDIS_MINIPORT_CHARACTERISTICS {
! NDIS40_MINIPORT_CHARACTERISTICS_S;
} NDIS_MINIPORT_CHARACTERISTICS, *PNDIS_MINIPORT_CHARACTERISTICS;
#elif defined(NDIS30)
typedef struct _NDIS_MINIPORT_CHARACTERISTICS {
! NDIS30_MINIPORT_CHARACTERISTICS_S;
} NDIS_MINIPORT_CHARACTERISTICS, *PNDIS_MINIPORT_CHARACTERISTICS;
#endif /* NDIS30 */
--- 3852,3868 ----
#if defined(NDIS51)
typedef struct _NDIS_MINIPORT_CHARACTERISTICS {
! NDIS50_MINIPORT_CHARACTERISTICS_S
} NDIS_MINIPORT_CHARACTERISTICS, *PNDIS_MINIPORT_CHARACTERISTICS;
#elif defined(NDIS50)
typedef struct _NDIS_MINIPORT_CHARACTERISTICS {
! NDIS50_MINIPORT_CHARACTERISTICS_S
} NDIS_MINIPORT_CHARACTERISTICS, *PNDIS_MINIPORT_CHARACTERISTICS;
#elif defined(NDIS40)
typedef struct _NDIS_MINIPORT_CHARACTERISTICS {
! NDIS40_MINIPORT_CHARACTERISTICS_S
} NDIS_MINIPORT_CHARACTERISTICS, *PNDIS_MINIPORT_CHARACTERISTICS;
#elif defined(NDIS30)
typedef struct _NDIS_MINIPORT_CHARACTERISTICS {
! NDIS30_MINIPORT_CHARACTERISTICS_S
} NDIS_MINIPORT_CHARACTERISTICS, *PNDIS_MINIPORT_CHARACTERISTICS;
#endif /* NDIS30 */
***************
*** 3994,3998 ****
#define ETH_LENGTH_OF_ADDRESS 6
! DECLARE_UNKNOWN_STRUCT(ETH_BINDING_INFO);
DECLARE_UNKNOWN_PROTOTYPE(ETH_ADDRESS_CHANGE)
--- 3994,3998 ----
#define ETH_LENGTH_OF_ADDRESS 6
! DECLARE_UNKNOWN_STRUCT(ETH_BINDING_INFO)
DECLARE_UNKNOWN_PROTOTYPE(ETH_ADDRESS_CHANGE)
***************
*** 4183,4190 ****
typedef struct _FILTERDBS {
! union {
PETH_FILTER EthDB;
PNULL_FILTER NullDB;
! };
PTR_FILTER TrDB;
PFDDI_FILTER FddiDB;
--- 4183,4190 ----
typedef struct _FILTERDBS {
! _ANONYMOUS_UNION union {
PETH_FILTER EthDB;
PNULL_FILTER NullDB;
! } DUMMYUNIONNAME;
PTR_FILTER TrDB;
PFDDI_FILTER FddiDB;
***************
*** 4289,4298 ****
UCHAR ArcnetAddress;
UCHAR XState;
! union {
#if ARCNET
PNDIS_ARC_BUF ArcBuf;
#endif
PVOID BusInterface;
! };
PNDIS_LOG Log;
ULONG SlotNumber;
--- 4289,4298 ----
UCHAR ArcnetAddress;
UCHAR XState;
! _ANONYMOUS_UNION union {
#if ARCNET
PNDIS_ARC_BUF ArcBuf;
#endif
PVOID BusInterface;
! } DUMMYUNIONNAME;
PNDIS_LOG Log;
ULONG SlotNumber;
***************
*** 4349,4356 ****
PNDIS_PACKET *xPackets;
ULONG UserModeOpenReferences;
! union {
PVOID SavedSendHandler;
PVOID SavedWanSendHandler;
! };
PVOID SavedSendPacketsHandler;
PVOID SavedCancelSendPacketsHandler;
--- 4349,4356 ----
PNDIS_PACKET *xPackets;
ULONG UserModeOpenReferences;
! _ANONYMOUS_UNION union {
PVOID SavedSendHandler;
PVOID SavedWanSendHandler;
! } DUMMYUNIONNAME2;
PVOID SavedSendPacketsHandler;
PVOID SavedCancelSendPacketsHandler;
***************
*** 4413,4420 ****
KSPIN_LOCK Reserved5;
PNDIS_STRING RootDeviceName;
! union {
SEND_HANDLER SendHandler;
WAN_SEND_HANDLER WanSendHandler;
! };
TRANSFER_DATA_HANDLER TransferDataHandler;
SEND_COMPLETE_HANDLER SendCompleteHandler;
--- 4413,4420 ----
KSPIN_LOCK Reserved5;
PNDIS_STRING RootDeviceName;
! _ANONYMOUS_UNION union {
SEND_HANDLER SendHandler;
WAN_SEND_HANDLER WanSendHandler;
! } DUMMYUNIONNAME;
TRANSFER_DATA_HANDLER TransferDataHandler;
SEND_COMPLETE_HANDLER SendCompleteHandler;
Index: ndiswan.h
===================================================================
RCS file: /cvsroot/mingw/w32api/include/ddk/ndiswan.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ndiswan.h 19 Nov 2002 14:45:07 -0000 1.2
--- ndiswan.h 12 Sep 2003 13:26:51 -0000 1.3
***************
*** 136,140 ****
UCHAR CompType;
USHORT CompLength;
! union {
struct {
UCHAR CompOUI[3];
--- 136,140 ----
UCHAR CompType;
USHORT CompLength;
! _ANONYMOUS_UNION union {
struct {
UCHAR CompOUI[3];
***************
*** 143,149 ****
} Proprietary;
struct {
! UCHAR CompValues[32];
} Public;
! };
} NDIS_WAN_COMPRESS_INFO;
--- 143,149 ----
} Proprietary;
struct {
! UCHAR CompValues[32];
} Public;
! } DUMMYUNIONNAME;
} NDIS_WAN_COMPRESS_INFO;
Index: ntapi.h
===================================================================
RCS file: /cvsroot/mingw/w32api/include/ddk/ntapi.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ntapi.h 26 Mar 2003 23:06:14 -0000 1.3
--- ntapi.h 12 Sep 2003 13:26:51 -0000 1.4
***************
*** 27,31 ****
#define __NTAPI_H
! #if __GNUC__ >=3
#pragma GCC system_header
#endif
--- 27,31 ----
#define __NTAPI_H
! #if __GNUC__ >= 3
#pragma GCC system_header
#endif
***************
*** 120,124 ****
SystemDockInformation = 41,
SystemNotImplemented11 = 41,
! //SystemPowerInformation = 42, Conflicts with POWER_INFORMATION_LEVEL
SystemInvalidInfoClass2 = 42,
SystemProcessorSpeedInformation = 43,
--- 120,124 ----
SystemDockInformation = 41,
SystemNotImplemented11 = 41,
! /* SystemPowerInformation = 42, Conflicts with POWER_INFORMATION_LEVEL 1 */
SystemInvalidInfoClass2 = 42,
SystemProcessorSpeedInformation = 43,
***************
*** 755,760 ****
--- 755,762 ----
/* OBJECT_BASIC_INFORMATION.Attributes constants */
+ /* also in winbase.h */
#define HANDLE_FLAG_INHERIT 0x01
#define HANDLE_FLAG_PROTECT_FROM_CLOSE 0x02
+ /* end winbase.h */
#define PERMANENT 0x10
#define EXCLUSIVE 0x20
***************
*** 774,778 ****
} OBJECT_BASIC_INFORMATION, *POBJECT_BASIC_INFORMATION;
#if 0
! // FIXME: Enable later
typedef struct _OBJECT_TYPE_INFORMATION {
UNICODE_STRING Name;
--- 776,780 ----
} OBJECT_BASIC_INFORMATION, *POBJECT_BASIC_INFORMATION;
#if 0
! /* FIXME: Enable later */
typedef struct _OBJECT_TYPE_INFORMATION {
UNICODE_STRING Name;
***************
*** 1405,1413 ****
/* DefaultHardErrorMode constants */
#define SEM_FAILCRITICALERRORS 0x0001
#define SEM_NOGPFAULTERRORBOX 0x0002
#define SEM_NOALIGNMENTFAULTEXCEPT 0x0004
#define SEM_NOOPENFILEERRORBOX 0x8000
!
typedef struct _POOLED_USAGE_AND_LIMITS {
ULONG PeakPagedPoolUsage;
--- 1407,1416 ----
/* DefaultHardErrorMode constants */
+ /* also in winbase.h */
#define SEM_FAILCRITICALERRORS 0x0001
#define SEM_NOGPFAULTERRORBOX 0x0002
#define SEM_NOALIGNMENTFAULTEXCEPT 0x0004
#define SEM_NOOPENFILEERRORBOX 0x8000
! /* end winbase.h */
typedef struct _POOLED_USAGE_AND_LIMITS {
ULONG PeakPagedPoolUsage;
***************
*** 1450,1454 ****
typedef struct _PROCESS_DEVICEMAP_INFORMATION {
! union {
struct {
HANDLE DirectoryHandle;
--- 1453,1457 ----
typedef struct _PROCESS_DEVICEMAP_INFORMATION {
! _ANONYMOUS_UNION union {
struct {
HANDLE DirectoryHandle;
***************
*** 1458,1462 ****
UCHAR DriveType[32];
} Query;
! };
} PROCESS_DEVICEMAP_INFORMATION, *PPROCESS_DEVICEMAP_INFORMATION;
--- 1461,1465 ----
UCHAR DriveType[32];
} Query;
! } DUMMYUNIONNAME;
} PROCESS_DEVICEMAP_INFORMATION, *PPROCESS_DEVICEMAP_INFORMATION;
***************
*** 1950,1953 ****
--- 1953,1957 ----
LPC_ERROR_EVENT,
LPC_CONNECTION_REQUEST,
+ LPC_CONNECTION_REFUSED,
LPC_MAXIMUM
} LPC_TYPE;
Index: ntddcdrm.h
===================================================================
RCS file: /cvsroot/mingw/w32api/include/ddk/ntddcdrm.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ntddcdrm.h 19 Nov 2002 14:45:07 -0000 1.2
--- ntddcdrm.h 12 Sep 2003 13:26:51 -0000 1.3
***************
*** 221,228 ****
UCHAR BlockNumber : 3;
UCHAR Unicode : 1;
! union {
UCHAR Text[12];
WCHAR WText[6];
! };
UCHAR CRC[2];
} CDROM_TOC_CD_TEXT_DATA_BLOCK, *PCDROM_TOC_CD_TEXT_DATA_BLOCK;
--- 221,228 ----
UCHAR BlockNumber : 3;
UCHAR Unicode : 1;
! _ANONYMOUS_UNION union {
UCHAR Text[12];
WCHAR WText[6];
! } DUMMYUNIONNAME;
UCHAR CRC[2];
} CDROM_TOC_CD_TEXT_DATA_BLOCK, *PCDROM_TOC_CD_TEXT_DATA_BLOCK;
Index: ntdddisk.h
===================================================================
RCS file: /cvsroot/mingw/w32api/include/ddk/ntdddisk.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ntdddisk.h 19 Nov 2002 14:45:07 -0000 1.2
--- ntdddisk.h 12 Sep 2003 13:26:51 -0000 1.3
***************
*** 253,262 ****
ULONG SizeOfDetectInfo;
DETECTION_TYPE DetectionType;
! union {
! struct {
DISK_INT13_INFO Int13;
DISK_EX_INT13_INFO ExInt13;
! };
! };
} DISK_DETECTION_INFO, *PDISK_DETECTION_INFO;
--- 253,262 ----
ULONG SizeOfDetectInfo;
DETECTION_TYPE DetectionType;
! _ANONYMOUS_UNION union {
! _ANONYMOUS_STRUCT struct {
DISK_INT13_INFO Int13;
DISK_EX_INT13_INFO ExInt13;
! } DUMMYSTRUCTNAME;
! } DUMMYUNIONNAME;
} DISK_DETECTION_INFO, *PDISK_DETECTION_INFO;
***************
*** 303,307 ****
ULONG SizeOfPartitionInfo;
PARTITION_STYLE PartitionStyle;
! union {
struct {
ULONG Signature;
--- 303,307 ----
ULONG SizeOfPartitionInfo;
PARTITION_STYLE PartitionStyle;
! _ANONYMOUS_UNION union {
struct {
ULONG Signature;
***************
*** 311,315 ****
GUID DiskId;
} Gpt;
! };
} DISK_PARTITION_INFO, *PDISK_PARTITION_INFO;
--- 311,315 ----
GUID DiskId;
} Gpt;
! } DUMMYUNIONNAME;
} DISK_PARTITION_INFO, *PDISK_PARTITION_INFO;
***************
*** 335,342 ****
ULONG PartitionNumber;
BOOLEAN RewritePartition;
! union {
PARTITION_INFORMATION_MBR Mbr;
PARTITION_INFORMATION_GPT Gpt;
! };
} PARTITION_INFORMATION_EX, *PPARTITION_INFORMATION_EX;
--- 335,342 ----
ULONG PartitionNumber;
BOOLEAN RewritePartition;
! _ANONYMOUS_UNION union {
PARTITION_INFORMATION_MBR Mbr;
PARTITION_INFORMATION_GPT Gpt;
! } DUMMYUNIONNAME;
} PARTITION_INFORMATION_EX, *PPARTITION_INFORMATION_EX;
***************
*** 379,386 ****
typedef struct _SET_PARTITION_INFORMATION_EX {
PARTITION_STYLE PartitionStyle;
! union {
SET_PARTITION_INFORMATION_MBR Mbr;
SET_PARTITION_INFORMATION_GPT Gpt;
! };
} SET_PARTITION_INFORMATION_EX, *PSET_PARTITION_INFORMATION_EX;
--- 379,386 ----
typedef struct _SET_PARTITION_INFORMATION_EX {
PARTITION_STYLE PartitionStyle;
! _ANONYMOUS_UNION union {
SET_PARTITION_INFORMATION_MBR Mbr;
SET_PARTITION_INFORMATION_GPT Gpt;
! } DUMMYUNIONNAME;
} SET_PARTITION_INFORMATION_EX, *PSET_PARTITION_INFORMATION_EX;
***************
*** 404,408 ****
USHORT DisablePrefetchTransferLength;
BOOLEAN PrefetchScalar;
! union {
struct {
USHORT Minimum;
--- 404,408 ----
USHORT DisablePrefetchTransferLength;
BOOLEAN PrefetchScalar;
! _ANONYMOUS_UNION union {
struct {
USHORT Minimum;
***************
*** 414,418 ****
USHORT Maximum;
} BlockPrefetch;
! };
} DISK_CACHE_INFORMATION, *PDISK_CACHE_INFORMATION;
--- 414,418 ----
USHORT Maximum;
} BlockPrefetch;
! } DUMMYUNIONNAME;
} DISK_CACHE_INFORMATION, *PDISK_CACHE_INFORMATION;
Index: ntddmou.h
===================================================================
RCS file: /cvsroot/mingw/w32api/include/ddk/ntddmou.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ntddmou.h 19 Nov 2002 14:45:07 -0000 1.2
--- ntddmou.h 12 Sep 2003 13:26:51 -0000 1.3
***************
*** 77,87 ****
USHORT UnitId;
USHORT Flags;
! union {
ULONG Buttons;
! struct {
USHORT ButtonFlags;
USHORT ButtonData;
! };
! };
ULONG RawButtons;
LONG LastX;
--- 77,87 ----
USHORT UnitId;
USHORT Flags;
! _ANONYMOUS_UNION union {
ULONG Buttons;
! _ANONYMOUS_STRUCT struct {
USHORT ButtonFlags;
USHORT ButtonData;
! } DUMMYSTRUCTNAME;
! } DUMMYUNIONNAME;
ULONG RawButtons;
LONG LastX;
Index: ntifs.h
===================================================================
RCS file: /cvsroot/mingw/w32api/include/ddk/ntifs.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ntifs.h 19 Nov 2002 14:45:07 -0000 1.2
--- ntifs.h 12 Sep 2003 13:26:51 -0000 1.3
***************
*** 25,29 ****
#define _GNU_NTIFS_
! #if __GNUC__ >=3
#pragma GCC system_header
#endif
--- 25,29 ----
#define _GNU_NTIFS_
! #if __GNUC__ >= 3
#pragma GCC system_header
#endif
***************
*** 55,63 ****
extern PACL SeSystemDefaultDacl;
- #define ACCESS_ALLOWED_ACE_TYPE (0x0)
- #define ACCESS_DENIED_ACE_TYPE (0x1)
- #define SYSTEM_AUDIT_ACE_TYPE (0x2)
- #define SYSTEM_ALARM_ACE_TYPE (0x3)
-
#define ANSI_DOS_STAR ('<')
#define ANSI_DOS_QM ('>')
--- 55,58 ----
***************
*** 68,71 ****
--- 63,72 ----
#define DOS_DOT (L'"')
+ /* also in winnt.h */
+ #define ACCESS_ALLOWED_ACE_TYPE (0x0)
+ #define ACCESS_DENIED_ACE_TYPE (0x1)
+ #define SYSTEM_AUDIT_ACE_TYPE (0x2)
+ #define SYSTEM_ALARM_ACE_TYPE (0x3)
+
#define COMPRESSION_FORMAT_NONE (0x0000)
#define COMPRESSION_FORMAT_DEFAULT (0x0001)
***************
*** 86,89 ****
--- 87,91 ----
#define FILE_ACTION_ID_NOT_TUNNELLED 0x0000000A
#define FILE_ACTION_TUNNELLED_ID_COLLISION 0x0000000B
+ /* end winnt.h */
#define FILE_EA_TYPE_BINARY 0xfffe
***************
*** 100,103 ****
--- 102,106 ----
#define FILE_NEED_EA 0x00000080
+ /* also in winnt.h */
#define FILE_NOTIFY_CHANGE_FILE_NAME 0x00000001
#define FILE_NOTIFY_CHANGE_DIR_NAME 0x00000002
***************
*** 114,117 ****
--- 117,121 ----
#define FILE_NOTIFY_CHANGE_STREAM_WRITE 0x00000800
#define FILE_NOTIFY_VALID_MASK 0x00000fff
+ /* end winnt.h */
#define FILE_OPLOCK_BROKEN_TO_LEVEL_2 0x00000007
***************
*** 159,163 ****
#define FILE_PIPE_WRITE_SPACE 0x00000001
! #define FILE_STORAGE_TYPE_SPECIFIED 0x00000041 // FILE_DIRECTORY_FILE | FILE_NON_DIRECTORY_FILE
#define FILE_STORAGE_TYPE_DEFAULT (StorageTypeDefault << FILE_STORAGE_TYPE_SHIFT)
#define FILE_STORAGE_TYPE_DIRECTORY (StorageTypeDirectory << FILE_STORAGE_TYPE_SHIFT)
--- 163,167 ----
#define FILE_PIPE_WRITE_SPACE 0x00000001
! #define FILE_STORAGE_TYPE_SPECIFIED 0x00000041 /* FILE_DIRECTORY_FILE | FILE_NON_DIRECTORY_FILE */
#define FILE_STORAGE_TYPE_DEFAULT (StorageTypeDefault << FILE_STORAGE_TYPE_SHIFT)
#define FILE_STORAGE_TYPE_DIRECTORY (StorageTypeDirectory << FILE_STORAGE_TYPE_SHIFT)
***************
*** 229,237 ****
#define IO_ATTACH_DEVICE_API 0x80000000
!
#define IO_COMPLETION_QUERY_STATE 0x0001
#define IO_COMPLETION_MODIFY_STATE 0x0002
#define IO_COMPLETION_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED|SYNCHRONIZE|0x3)
!
#define IO_FILE_OBJECT_NON_PAGED_POOL_CHARGE 64
#define IO_FILE_OBJECT_PAGED_POOL_CHARGE 1024
--- 233,241 ----
#define IO_ATTACH_DEVICE_API 0x80000000
! /* also in winnt.h */
#define IO_COMPLETION_QUERY_STATE 0x0001
#define IO_COMPLETION_MODIFY_STATE 0x0002
#define IO_COMPLETION_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED|SYNCHRONIZE|0x3)
! /* end winnt.h */
#define IO_FILE_OBJECT_NON_PAGED_POOL_CHARGE 64
#define IO_FILE_OBJECT_PAGED_POOL_CHARGE 1024
***************
*** 253,260 ****
#define MAP_PROCESS 1L
#define MAP_SYSTEM 2L
-
#define MEM_DOS_LIM 0x40000000
#define MEM_IMAGE SEC_IMAGE
!
#define OB_TYPE_TYPE 1
#define OB_TYPE_DIRECTORY 2
--- 257,264 ----
#define MAP_PROCESS 1L
#define MAP_SYSTEM 2L
#define MEM_DOS_LIM 0x40000000
+ /* also in winnt.h */
#define MEM_IMAGE SEC_IMAGE
! /* end winnt.h */
#define OB_TYPE_TYPE 1
#define OB_TYPE_DIRECTORY 2
***************
*** 289,299 ****
#define PORT_ALL_ACCESS (STANDARD_RIGHTS_ALL |\
PORT_CONNECT)
!
! #define SEC_BASED 0x00200000
! #define SEC_NO_CHANGE 0x00400000
! #define SEC_FILE 0x00800000
! #define SEC_IMAGE 0x01000000
! #define SEC_COMMIT 0x08000000
! #define SEC_NOCACHE 0x10000000
#define SECURITY_WORLD_SID_AUTHORITY {0,0,0,0,0,1}
--- 293,305 ----
#define PORT_ALL_ACCESS (STANDARD_RIGHTS_ALL |\
PORT_CONNECT)
! /* also in winnt.h */
! #define SEC_BASED 0x00200000
! #define SEC_NO_CHANGE 0x00400000
! #define SEC_FILE 0x00800000
! #define SEC_IMAGE 0x01000000
! #define SEC_VLM 0x02000000
! #define SEC_RESERVE 0x04000000
! #define SEC_COMMIT 0x08000000
! #define SEC_NOCACHE 0x10000000
#define SECURITY_WORLD_SID_AUTHORITY {0,0,0,0,0,1}
***************
*** 332,335 ****
--- 338,342 ----
#define TOKEN_SOURCE_LENGTH 8
+ /* end winnt.h */
#define TOKEN_HAS_TRAVERSE_PRIVILEGE 0x01
***************
*** 379,383 ****
#define FSCTL_ALLOW_EXTENDED_DASD_IO CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 32, METHOD_NEITHER, FILE_ANY_ACCESS)
! #endif // (VER_PRODUCTBUILD >= 1381)
#if (VER_PRODUCTBUILD >= 2195)
--- 386,390 ----
#define FSCTL_ALLOW_EXTENDED_DASD_IO CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 32, METHOD_NEITHER, FILE_ANY_ACCESS)
! #endif /* (VER_PRODUCTBUILD >= 1381) */
#if (VER_PRODUCTBUILD >= 2195)
***************
*** 424,428 ****
#define FSCTL_FILE_PREFETCH CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 72, METHOD_BUFFERED, FILE_SPECIAL_ACCESS)
! #endif // (VER_PRODUCTBUILD >= 2195)
#define FSCTL_MAILSLOT_PEEK CTL_CODE(FILE_DEVICE_MAILSLOT, 0, METHOD_NEITHER, FILE_READ_DATA)
--- 431,435 ----
#define FSCTL_FILE_PREFETCH CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 72, METHOD_BUFFERED, FILE_SPECIAL_ACCESS)
! #endif /* (VER_PRODUCTBUILD >= 2195) */
#define FSCTL_MAILSLOT_PEEK CTL_CODE(FILE_DEVICE_MAILSLOT, 0, METHOD_NEITHER, FILE_READ_DATA)
***************
*** 652,656 ****
ULONG EstimatedAvailable;
ULONG GrowthSinceLastEstimate;
! #endif // (VER_PRODUCTBUILD >= 2195)
} MMSUPPORT, *PMMSUPPORT;
--- 659,663 ----
ULONG EstimatedAvailable;
ULONG GrowthSinceLastEstimate;
! #endif /* (VER_PRODUCTBUILD >= 2195) */
} MMSUPPORT, *PMMSUPPORT;
***************
*** 702,729 ****
typedef struct _EX_FAST_REF {
! union {
PVOID Object;
ULONG RefCnt : 3;
ULONG Value;
! };
} EX_FAST_REF, *PEX_FAST_REF;
typedef struct _EX_PUSH_LOCK {
! union {
! struct {
ULONG Waiting : 1;
ULONG Exclusive : 1;
ULONG Shared : 30;
! };
ULONG Value;
PVOID Ptr;
! };
} EX_PUSH_LOCK, *PEX_PUSH_LOCK;
typedef struct _EX_RUNDOWN_REF {
! union {
ULONG Count;
PVOID Ptr;
! };
} EX_RUNDOWN_REF, *PEX_RUNDOWN_REF;
--- 709,736 ----
typedef struct _EX_FAST_REF {
! _ANONYMOUS_UNION union {
PVOID Object;
ULONG RefCnt : 3;
ULONG Value;
! } DUMMYUNIONNAME;
} EX_FAST_REF, *PEX_FAST_REF;
typedef struct _EX_PUSH_LOCK {
! _ANONYMOUS_UNION union {
! _ANONYMOUS_STRUCT struct {
ULONG Waiting : 1;
ULONG Exclusive : 1;
ULONG Shared : 30;
! } DUMMYSTRUCTNAME;
ULONG Value;
PVOID Ptr;
! } DUMMYUNIONNAME;
} EX_PUSH_LOCK, *PEX_PUSH_LOCK;
typedef struct _EX_RUNDOWN_REF {
! _ANONYMOUS_UNION union {
ULONG Count;
PVOID Ptr;
! } DUMMYUNIONNAME;
} EX_RUNDOWN_REF, *PEX_RUNDOWN_REF;
***************
*** 972,976 ****
} FILE_FS_OBJECT_ID_INFORMATION, *PFILE_FS_OBJECT_ID_INFORMATION;
! #endif // (VER_PRODUCTBUILD >= 2195)
typedef struct _FILE_FS_SIZE_INFORMATION {
--- 979,983 ----
} FILE_FS_OBJECT_ID_INFORMATION, *PFILE_FS_OBJECT_ID_INFORMATION;
! #endif /* (VER_PRODUCTBUILD >= 2195) */
typedef struct _FILE_FS_SIZE_INFORMATION {
***************
*** 1037,1041 ****
} FILE_LOCK_INFO, *PFILE_LOCK_INFO;
! // raw internal file lock struct returned from FsRtlGetNextFileLock
typedef struct _FILE_SHARED_LOCK_ENTRY {
PVOID Unknown1;
--- 1044,1048 ----
} FILE_LOCK_INFO, *PFILE_LOCK_INFO;
! /* raw internal file lock struct returned from FsRtlGetNextFileLock */
typedef struct _FILE_SHARED_LOCK_ENTRY {
PVOID Unknown1;
***************
*** 1044,1048 ****
} FILE_SHARED_LOCK_ENTRY, *PFILE_SHARED_LOCK_ENTRY;
! // raw internal file lock struct returned from FsRtlGetNextFileLock
typedef struct _FILE_EXCLUSIVE_LOCK_ENTRY {
LIST_ENTRY ListEntry;
--- 1051,1055 ----
} FILE_SHARED_LOCK_ENTRY, *PFILE_SHARED_LOCK_ENTRY;
! /* raw internal file lock struct returned from FsRtlGetNextFileLock */
typedef struct _FILE_EXCLUSIVE_LOCK_ENTRY {
LIST_ENTRY ListEntry;
***************
*** 1116,1120 ****
LONGLONG FileReference;
UCHAR ObjectId[16];
! union {
struct {
UCHAR BirthVolumeId[16];
--- 1123,1127 ----
LONGLONG FileReference;
UCHAR ObjectId[16];
! _ANONYMOUS_UNION union {
struct {
UCHAR BirthVolumeId[16];
***************
*** 1123,1127 ****
} ;
UCHAR ExtendedInfo[48];
! };
} FILE_OBJECTID_INFORMATION, *PFILE_OBJECTID_INFORMATION;
--- 1130,1134 ----
} ;
UCHAR ExtendedInfo[48];
! } DUMMYUNIONNAME;
} FILE_OBJECTID_INFORMATION, *PFILE_OBJECTID_INFORMATION;
***************
*** 1276,1280 ****
UCHAR Flags2;
UCHAR Reserved;
! #endif // (VER_PRODUCTBUILD >= 1381)
PERESOURCE Resource;
PERESOURCE PagingIoResource;
--- 1283,1287 ----
UCHAR Flags2;
UCHAR Reserved;
! #endif /* (VER_PRODUCTBUILD >= 1381) */
PERESOURCE Resource;
PERESOURCE PagingIoResource;
***************
*** 1441,1449 ****
typedef struct _PRIVATE_CACHE_MAP {
! union {
CSHORT NodeTypeCode;
PRIVATE_CACHE_MAP_FLAGS Flags;
ULONG UlongFlags;
! };
ULONG ReadAheadMask;
PFILE_OBJECT FileObject;
--- 1448,1456 ----
typedef struct _PRIVATE_CACHE_MAP {
! _ANONYMOUS_UNION union {
CSHORT NodeTypeCode;
PRIVATE_CACHE_MAP_FLAGS Flags;
ULONG UlongFlags;
! } DUMMYUNIONNAME;
ULONG ReadAheadMask;
PFILE_OBJECT FileObject;
***************
*** 1677,1681 ****
PVAD_HEADER LeftLink;
PVAD_HEADER RightLink;
! ULONG Flags; // LSB = CommitCharge
PVOID ControlArea;
PVOID FirstProtoPte;
--- 1684,1688 ----
PVAD_HEADER LeftLink;
PVAD_HEADER RightLink;
! ULONG Flags; /* LSB = CommitCharge */
PVOID ControlArea;
PVOID FirstProtoPte;
***************
*** 1817,1821 ****
);
! #endif // (VER_PRODUCTBUILD >= 2195)
NTKERNELAPI
--- 1824,1828 ----
);
! #endif /* (VER_PRODUCTBUILD >= 2195) */
NTKERNELAPI
***************
*** 1998,2002 ****
);
! #endif // (VER_PRODUCTBUILD >= 2195)
NTKERNELAPI
--- 2005,2009 ----
);
! #endif /* (VER_PRODUCTBUILD >= 2195) */
NTKERNELAPI
***************
*** 2076,2081 ****
CcSetReadAheadGranularity (
IN PFILE_OBJECT FileObject,
! IN ULONG Granularity // default: PAGE_SIZE
! // allowed: 2^n * PAGE_SIZE
);
--- 2083,2088 ----
CcSetReadAheadGranularity (
IN PFILE_OBJECT FileObject,
! IN ULONG Granularity /* default: PAGE_SIZE */
! /* allowed: 2^n * PAGE_SIZE */
);
***************
*** 2122,2126 ****
);
! #endif // (VER_PRODUCTBUILD >= 2195)
NTKERNELAPI
--- 2129,2133 ----
);
! #endif /* (VER_PRODUCTBUILD >= 2195) */
NTKERNELAPI
***************
*** 2173,2177 ****
);
! #endif // (VER_PRODUCTBUILD >= 2195)
NTKERNELAPI
--- 2180,2184 ----
);
! #endif /* (VER_PRODUCTBUILD >= 2195) */
NTKERNELAPI
***************
*** 2383,2387 ****
IN PVOID Context OPTIONAL
);
! //ret: STATUS_RANGE_NOT_LOCKED
NTKERNELAPI
--- 2390,2394 ----
IN PVOID Context OPTIONAL
);
! /* ret: STATUS_RANGE_NOT_LOCKED */
NTKERNELAPI
***************
*** 2395,2399 ****
IN PVOID Context OPTIONAL
);
! //ret: STATUS_RANGE_NOT_LOCKED
NTKERNELAPI
--- 2402,2406 ----
IN PVOID Context OPTIONAL
);
! /* ret: STATUS_RANGE_NOT_LOCKED */
NTKERNELAPI
***************
*** 2410,2414 ****
IN BOOLEAN AlreadySynchronized
);
! //ret: STATUS_RANGE_NOT_LOCKED
NTKERNELAPI
--- 2417,2421 ----
IN BOOLEAN AlreadySynchronized
);
! /* ret: STATUS_RANGE_NOT_LOCKED */
NTKERNELAPI
***************
*** 2434,2438 ****
);
! #endif // (VER_PRODUCTBUILD >= 2195)
NTKERNELAPI
--- 2441,2445 ----
);
! #endif /* (VER_PRODUCTBUILD >= 2195) */
NTKERNELAPI
***************
*** 2648,2652 ****
);
! #endif // (VER_PRODUCTBUILD >= 2195)
NTKERNELAPI
--- 2655,2659 ----
);
! #endif /* (VER_PRODUCTBUILD >= 2195) */
NTKERNELAPI
***************
*** 2821,2825 ****
);
! #endif // (VER_PRODUCTBUILD >= 2195)
NTKERNELAPI
--- 2828,2832 ----
);
! #endif /* (VER_PRODUCTBUILD >= 2195) */
NTKERNELAPI
***************
*** 2841,2845 ****
);
! #endif // (VER_PRODUCTBUILD >= 2195)
NTKERNELAPI
--- 2848,2852 ----
);
! #endif /* (VER_PRODUCTBUILD >= 2195) */
NTKERNELAPI
***************
*** 2884,2888 ****
);
! #endif // (VER_PRODUCTBUILD >= 2195)
NTKERNELAPI
--- 2891,2895 ----
);
! #endif /* (VER_PRODUCTBUILD >= 2195) */
NTKERNELAPI
***************
*** 2925,2929 ****
);
! #endif // (VER_PRODUCTBUILD >= 2195)
NTKERNELAPI
--- 2932,2936 ----
);
! #endif /* (VER_PRODUCTBUILD >= 2195) */
NTKERNELAPI
***************
*** 2982,2986 ****
);
! #endif // (VER_PRODUCTBUILD >= 1381)
NTKERNELAPI
--- 2989,2993 ----
);
! #endif /* (VER_PRODUCTBUILD >= 1381) */
NTKERNELAPI
***************
*** 3051,3055 ****
);
! #endif // (VER_PRODUCTBUILD >= 1381)
NTKERNELAPI
--- 3058,3062 ----
);
! #endif /* (VER_PRODUCTBUILD >= 1381) */
NTKERNELAPI
***************
*** 3100,3110 ****
NTKERNELAPI
! VOID
NTAPI
KeInsertQueueApc (
! IN PKAPC Apc,
! IN PVOID SystemArgument1,
! IN PVOID SystemArgument2,
! UCHAR Unknown
);
--- 3107,3117 ----
NTKERNELAPI
! BOOLEAN
NTAPI
KeInsertQueueApc (
! IN PKAPC Apc,
! IN PVOID SystemArgument1,
! IN PVOID SystemArgument2,
! IN KPRIORITY PriorityBoost
);
***************
*** 3149,3153 ****
);
! #endif // (VER_PRODUCTBUILD >= 2195)
NTKERNELAPI
--- 3156,3160 ----
);
! #endif /* (VER_PRODUCTBUILD >= 2195) */
NTKERNELAPI
***************
*** 3657,3661 ****
);
! #endif // (VER_PRODUCTBUILD >= 2195)
NTSYSAPI
--- 3664,3668 ----
);
! #endif /* (VER_PRODUCTBUILD >= 2195) */
NTSYSAPI
***************
*** 3773,3777 ****
);
! #endif // (VER_PRODUCTBUILD >= 2195)
#define SeDeleteClientSecurity(C) { \
--- 3780,3784 ----
);
! #endif /* (VER_PRODUCTBUILD >= 2195) */
#define SeDeleteClientSecurity(C) { \
***************
*** 3818,3822 ****
);
! #endif // (VER_PRODUCTBUILD >= 2195)
NTKERNELAPI
--- 3825,3829 ----
);
! #endif /* (VER_PRODUCTBUILD >= 2195) */
NTKERNELAPI
***************
*** 3892,3896 ****
);
! #endif // (VER_PRODUCTBUILD >= 2195)
NTKERNELAPI
--- 3899,3903 ----
);
! #endif /* (VER_PRODUCTBUILD >= 2195) */
NTKERNELAPI
***************
*** 3914,3918 ****
);
! #endif // (VER_PRODUCTBUILD >= 2195)
#define SeQuerySubjectContextToken( SubjectContext ) \
--- 3921,3925 ----
);
! #endif /* (VER_PRODUCTBUILD >= 2195) */
#define SeQuerySubjectContextToken( SubjectContext ) \
***************
*** 3990,3994 ****
);
! #endif // (VER_PRODUCTBUILD >= 2195)
NTKERNELAPI
--- 3997,4001 ----
);
! #endif /* (VER_PRODUCTBUILD >= 2195) */
NTKERNELAPI
***************
*** 4026,4030 ****
);
! #endif // (VER_PRODUCTBUILD >= 2195)
NTSYSAPI
--- 4033,4037 ----
);
! #endif /* (VER_PRODUCTBUILD >= 2195) */
NTSYSAPI
***************
*** 4074,4078 ****
);
! #endif // (VER_PRODUCTBUILD >= 2195)
NTSYSAPI
--- 4081,4085 ----
);
! #endif /* (VER_PRODUCTBUILD >= 2195) */
NTSYSAPI
***************
*** 4199,4203 ****
);
! #endif // (VER_PRODUCTBUILD >= 2195)
NTSYSAPI
--- 4206,4210 ----
);
! #endif /* (VER_PRODUCTBUILD >= 2195) */
NTSYSAPI
***************
*** 4239,4243 ****
);
! #endif // (VER_PRODUCTBUILD >= 2195)
NTSYSAPI
--- 4246,4250 ----
);
! #endif /* (VER_PRODUCTBUILD >= 2195) */
NTSYSAPI
***************
*** 4245,4249 ****
NTAPI
ZwLoadDriver (
! // "\\Registry\\Machine\\System\\CurrentControlSet\\Services\\<DriverName>"
IN PUNICODE_STRING RegistryPath
);
--- 4252,4256 ----
NTAPI
ZwLoadDriver (
! /* "\\Registry\\Machine\\System\\CurrentControlSet\\Services\\<DriverName>" */
IN PUNICODE_STRING RegistryPath
);
***************
*** 4343,4347 ****
);
! #endif // (VER_PRODUCTBUILD >= 2195)
NTSYSAPI
--- 4350,4354 ----
);
! #endif /* (VER_PRODUCTBUILD >= 2195) */
NTSYSAPI
***************
*** 4408,4412 ****
);
! #endif // (VER_PRODUCTBUILD >= 2195)
NTSYSAPI
--- 4415,4419 ----
);
! #endif /* (VER_PRODUCTBUILD >= 2195) */
NTSYSAPI
***************
*** 4436,4444 ****
NTAPI
ZwQueryObject (
! IN HANDLE ObjectHandle,
! IN OBJECT_INFO_CLASS ObjectInformationClass,
! OUT PVOID ObjectInformation,
! IN ULONG Length,
! OUT PULONG ResultLength
);
--- 4443,4451 ----
NTAPI
ZwQueryObject (
! IN HANDLE ObjectHandle,
! IN OBJECT_INFORMATION_CLASS ObjectInformationClass,
! OUT PVOID ObjectInformation,
! IN ULONG Length,
! OUT PULONG ResultLength
);
***************
*** 4514,4518 ****
);
! #endif // (VER_PRODUCTBUILD >= 2195)
NTSYSAPI
--- 4521,4525 ----
);
! #endif /* (VER_PRODUCTBUILD >= 2195) */
NTSYSAPI
***************
*** 4551,4555 ****
);
! #endif // (VER_PRODUCTBUILD >= 2195)
NTSYSAPI
--- 4558,4562 ----
);
! #endif /* (VER_PRODUCTBUILD >= 2195) */
NTSYSAPI
***************
*** 4565,4572 ****
NTAPI
ZwSetInformationObject (
! IN HANDLE ObjectHandle,
! IN OBJECT_INFO_CLASS ObjectInformationClass,
! IN PVOID ObjectInformation,
! IN ULONG ObjectInformationLength
);
--- 4572,4579 ----
NTAPI
ZwSetInformationObject (
! IN HANDLE ObjectHandle,
! IN OBJECT_INFORMATION_CLASS ObjectInformationClass,
! IN PVOID ObjectInformation,
! IN ULONG ObjectInformationLength
);
***************
*** 4592,4596 ****
);
! #endif // (VER_PRODUCTBUILD >= 2195)
NTSYSAPI
--- 4599,4603 ----
);
! #endif /* (VER_PRODUCTBUILD >= 2195) */
NTSYSAPI
***************
*** 4624,4628 ****
);
! #endif // (VER_PRODUCTBUILD >= 2195)
NTSYSAPI
--- 4631,4635 ----
);
! #endif /* (VER_PRODUCTBUILD >= 2195) */
NTSYSAPI
***************
*** 4638,4642 ****
NTAPI
ZwUnloadDriver (
! // "\\Registry\\Machine\\System\\CurrentControlSet\\Services\\<DriverName>"
IN PUNICODE_STRING RegistryPath
);
--- 4645,4649 ----
NTAPI
ZwUnloadDriver (
! /* "\\Registry\\Machine\\System\\CurrentControlSet\\Services\\<DriverName>" */
IN PUNICODE_STRING RegistryPath
);
***************
*** 4682,4684 ****
#endif
! #endif // _NTIFS_
--- 4689,4691 ----
#endif
! #endif /* _NTIFS_ */
Index: ntpoapi.h
===================================================================
RCS file: /cvsroot/mingw/w32api/include/ddk/ntpoapi.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ntpoapi.h 26 Mar 2003 23:06:14 -0000 1.3
--- ntpoapi.h 12 Sep 2003 13:26:51 -0000 1.4
***************
*** 37,66 ****
#include "batclass.h"
- typedef enum _POWER_INFORMATION_LEVEL {
- SystemPowerPolicyAc,
- SystemPowerPolicyDc,
- VerifySystemPolicyAc,
- VerifySystemPolicyDc,
- SystemPowerCapabilities,
- SystemBatteryState,
- SystemPowerStateHandler,
- ProcessorStateHandler,
- SystemPowerPolicyCurrent,
- AdministratorPowerPolicy,
- SystemReserveHiberFile,
- ProcessorInformation,
- SystemPowerInformation,
- ProcessorStateHandler2,
- LastWakeTime,
- LastSleepTime,
- SystemExecutionState,
- SystemPowerStateNotifyHandler,
- ProcessorPowerPolicyAc,
- ProcessorPowerPolicyDc,
- VerifyProcessorPowerPolicyAc,
- VerifyProcessorPowerPolicyDc,
- ProcessorPowerPolicyCurrent
- } POWER_INFORMATION_LEVEL;
-
#define POWER_PERF_SCALE 100
#define PERF_LEVEL_TO_PERCENT(x) (((x) * 1000) / (POWER_PERF_SCALE * 10))
--- 37,40 ----
Index: scsi.h
===================================================================
RCS file: /cvsroot/mingw/w32api/include/ddk/scsi.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** scsi.h 20 Dec 2002 17:51:09 -0000 1.3
--- scsi.h 12 Sep 2003 13:26:51 -0000 1.4
***************
*** 248,251 ****
--- 248,254 ----
} PLAY_AUDIO_MSF, *PPLAY_AUDIO_MSF;
+ /* FIXME: Should the union be anonymous in C++ too? If so,
+ can't define named types _LBA and _MSF within anonymous union
+ for C++. */
struct _PLAY_CD {
UCHAR OperationCode;
***************
*** 254,258 ****
UCHAR ExpectedSectorType : 3;
UCHAR Lun : 3;
!
union {
struct _LBA {
--- 257,263 ----
UCHAR ExpectedSectorType : 3;
UCHAR Lun : 3;
! #ifndef __cplusplus
! _ANONYMOUS_UNION
! #endif
union {
struct _LBA {
***************
*** 271,278 ****
UCHAR Reserved2;
} MSF;
! #ifdef __cplusplus
! } u;
#else
! };
#endif
--- 276,283 ----
UCHAR Reserved2;
} MSF;
! #ifndef __cplusplus
! }DUMMYUNIONNAME;
#else
! }u;
#endif
***************
*** 903,914 ****
UCHAR DeviceTypeModifier : 7;
UCHAR RemovableMedia : 1;
! union {
UCHAR Versions;
! struct {
UCHAR ANSIVersion : 3;
UCHAR ECMAVersion : 3;
UCHAR ISOVersion : 2;
! };
! };
UCHAR ResponseDataFormat : 4;
UCHAR HiSupport : 1;
--- 908,919 ----
UCHAR DeviceTypeModifier : 7;
UCHAR RemovableMedia : 1;
! _ANONYMOUS_UNION union {
UCHAR Versions;
! _ANONYMOUS_STRUCT struct {
UCHAR ANSIVersion : 3;
UCHAR ECMAVersion : 3;
UCHAR ISOVersion : 2;
! } DUMMYSTRUCTNAME;
! } DUMMYUNIONNAME;
UCHAR ResponseDataFormat : 4;
UCHAR HiSupport : 1;
***************
*** 1497,1503 ****
UCHAR PSBit : 1;
UCHAR PageLength;
! union {
UCHAR Flags;
! struct {
UCHAR LogErr : 1;
UCHAR Reserved2 : 1;
--- 1502,1508 ----
UCHAR PSBit : 1;
UCHAR PageLength;
! _ANONYMOUS_UNION union {
UCHAR Flags;
! _ANONYMOUS_STRUCT struct {
UCHAR LogErr : 1;
UCHAR Reserved2 : 1;
***************
*** 1506,1511 ****
UCHAR Reserved3 : 3;
UCHAR Perf : 1;
! };
! };
UCHAR ReportMethod : 4;
UCHAR Reserved4 : 4;
--- 1511,1516 ----
UCHAR Reserved3 : 3;
UCHAR Perf : 1;
! } DUMMYSTRUCTNAME;
! } DUMMYUNIONNAME;
UCHAR ReportMethod : 4;
UCHAR Reserved4 : 4;
***************
*** 1593,1597 ****
to SCSI CDB big endians values. */
typedef union _EIGHT_BYTE {
! struct {
UCHAR Byte0;
UCHAR Byte1;
--- 1598,1602 ----
to SCSI CDB big endians values. */
typedef union _EIGHT_BYTE {
! _ANONYMOUS_STRUCT struct {
UCHAR Byte0;
UCHAR Byte1;
***************
*** 1602,1624 ****
UCHAR Byte6;
UCHAR Byte7;
! };
ULONGLONG AsULongLong;
} EIGHT_BYTE, *PEIGHT_BYTE;
typedef union _FOUR_BYTE {
! struct {
UCHAR Byte0;
UCHAR Byte1;
UCHAR Byte2;
UCHAR Byte3;
! };
ULONG AsULong;
} FOUR_BYTE, *PFOUR_BYTE;
typedef union _TWO_BYTE {
! struct {
UCHAR Byte0;
UCHAR Byte1;
! };
USHORT AsUShort;
} TWO_BYTE, *PTWO_BYTE;
--- 1607,1629 ----
UCHAR Byte6;
UCHAR Byte7;
! } DUMMYSTRUCTNAME;
ULONGLONG AsULongLong;
} EIGHT_BYTE, *PEIGHT_BYTE;
typedef union _FOUR_BYTE {
! _ANONYMOUS_STRUCT struct {
UCHAR Byte0;
UCHAR Byte1;
UCHAR Byte2;
UCHAR Byte3;
! } DUMMYSTRUCTNAME;
ULONG AsULong;
} FOUR_BYTE, *PFOUR_BYTE;
typedef union _TWO_BYTE {
! _ANONYMOUS_STRUCT struct {
UCHAR Byte0;
UCHAR Byte1;
! } DUMMYSTRUCTNAME;
USHORT AsUShort;
} TWO_BYTE, *PTWO_BYTE;
Index: srb.h
===================================================================
RCS file: /cvsroot/mingw/w32api/include/ddk/srb.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** srb.h 19 Nov 2002 14:45:07 -0000 1.2
--- srb.h 12 Sep 2003 13:26:51 -0000 1.3
***************
*** 190,197 ****
PVOID OriginalRequest;
PVOID SrbExtension;
! union {
ULONG InternalStatus;
ULONG QueueSortKey;
! };
#if defined(_WIN64)
ULONG Reserved;
--- 190,197 ----
PVOID OriginalRequest;
PVOID SrbExtension;
! _ANONYMOUS_UNION union {
ULONG InternalStatus;
ULONG QueueSortKey;
! } DUMMYUNIONNAME;
#if defined(_WIN64)
ULONG Reserved;
***************
*** 281,284 ****
--- 281,287 ----
} SCSI_NOTIFICATION_TYPE, *PSCSI_NOTIFICATION_TYPE;
+ #ifdef __GNUC__
+ __extension__ /* enums limited to range of integer */
+ #endif
typedef enum _SCSI_ADAPTER_CONTROL_TYPE {
ScsiQuerySupportedControlTypes = 0,
Index: tdikrnl.h
===================================================================
RCS file: /cvsroot/mingw/w32api/include/ddk/tdikrnl.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** tdikrnl.h 19 Nov 2002 14:45:07 -0000 1.2
--- tdikrnl.h 12 Sep 2003 13:26:51 -0000 1.3
***************
*** 859,863 ****
TDI_PNP_OP_ADD_IGNORE_BINDING,
TDI_PNP_OP_DELETE_IGNORE_BINDING,
! TDI_PNP_OP_MAX,
} TDI_PNP_OPCODE;
--- 859,863 ----
TDI_PNP_OP_ADD_IGNORE_BINDING,
TDI_PNP_OP_DELETE_IGNORE_BINDING,
! TDI_PNP_OP_MAX
} TDI_PNP_OPCODE;
***************
*** 921,951 ****
typedef struct _TDI20_CLIENT_INTERFACE_INFO {
! union {
! struct {
UCHAR MajorTdiVersion;
UCHAR MinorTdiVersion;
! };
USHORT TdiVersion;
! };
USHORT Unused;
PUNICODE_STRING ClientName;
TDI_PNP_POWER_HANDLER PnPPowerHandler;
! union {
TDI_BINDING...
[truncated message content] |
|
From: <ea...@us...> - 2003-09-12 13:27:01
|
Update of /cvsroot/mingw/w32api/lib
In directory sc8-pr-cvs1:/tmp/cvs-serv17014/lib
Modified Files:
Makefile.in gdi32.def kernel32.def mgmtapi.def ntdll.def
rpcrt4.def secur32.def shell32.c shell32.def test.c user32.def
uuid.c
Log Message:
Merge winsup changes
Index: Makefile.in
===================================================================
RCS file: /cvsroot/mingw/w32api/lib/Makefile.in,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** Makefile.in 11 Mar 2003 15:26:48 -0000 1.16
--- Makefile.in 12 Sep 2003 13:26:51 -0000 1.17
***************
*** 114,121 ****
EXTRA_LIBS=libuuid.a libscrnsave.a libscrnsavw.a libdxguid.a liblargeint.a
LIBS = $(IMPLIBS) $(EXTRA_LIBS)
! EXTRA_OBJS=uuid.o shell32.o dxguid.o scrnsave.o scrnsavw.o largeint.o \
$(UUID_OBJS) dinput.o kernel32.o
! SOURCES = scrnsave.c shell32.c uuid.c largeint.c dinput.c dxguid.c \
! res.rc test.c kernel32.c
DISTFILES = Makefile.in $(DEF_FILES) $(SOURCES)
--- 114,123 ----
EXTRA_LIBS=libuuid.a libscrnsave.a libscrnsavw.a libdxguid.a liblargeint.a
LIBS = $(IMPLIBS) $(EXTRA_LIBS)
! UUID_OBJS = uuid.o mshtml-uuid.o
! EXTRA_OBJS = shell32.o dxguid.o scrnsave.o scrnsavw.o largeint.o \
$(UUID_OBJS) dinput.o kernel32.o
! UUID_SOURCES = uuid.c mshtml-uuid.c
! SOURCES = scrnsave.c shell32.c largeint.c dinput.c $(UUID_SOURCES)\
! dxguid.c res.rc test.c kernel32.c
DISTFILES = Makefile.in $(DEF_FILES) $(SOURCES)
***************
*** 160,163 ****
--- 162,169 ----
.c.o:
$(CC) -c $(ALL_CFLAGS) -o $@ $<
+
+ libuuid.a : $(UUID_OBJS)
+ $(AR) rc $@ $(UUID_OBJS)
+ $(RANLIB) $@
lib%.a : %.def %.o
Index: gdi32.def
===================================================================
RCS file: /cvsroot/mingw/w32api/lib/gdi32.def,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** gdi32.def 11 Mar 2003 15:26:48 -0000 1.2
--- gdi32.def 12 Sep 2003 13:26:51 -0000 1.3
***************
*** 287,290 ****
--- 287,292 ----
SetColorAdjustment@8
SetColorSpace@8
+ SetDCBrushColor@8
+ SetDCPenColor@8
SetDIBColorTable@16
SetDIBits@28
Index: kernel32.def
===================================================================
RCS file: /cvsroot/mingw/w32api/lib/kernel32.def,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** kernel32.def 26 Mar 2003 23:06:15 -0000 1.8
--- kernel32.def 12 Sep 2003 13:26:51 -0000 1.9
***************
*** 391,394 ****
--- 391,396 ----
GetVolumePathNameA@12
GetVolumePathNameW@12
+ GetVolumePathNamesForVolumeNameA@16
+ GetVolumePathNamesForVolumeNameW@16
GetWindowsDirectoryA@8
GetWindowsDirectoryW@8
Index: mgmtapi.def
===================================================================
RCS file: /cvsroot/mingw/w32api/lib/mgmtapi.def,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** mgmtapi.def 5 Jun 2001 01:36:46 -0000 1.1.1.1
--- mgmtapi.def 12 Sep 2003 13:26:51 -0000 1.2
***************
*** 2,7 ****
EXPORTS
SnmpMgrClose@4
SnmpMgrGetTrap@24
! SnmpMgrMIB2Disk@8
SnmpMgrOidToStr@8
SnmpMgrOpen@16
--- 2,9 ----
EXPORTS
SnmpMgrClose@4
+ SnmpMgrCtl@28
SnmpMgrGetTrap@24
! SnmpMgrGetTrapEx@32
! ;SnmpMgrMIB2Disk@8
SnmpMgrOidToStr@8
SnmpMgrOpen@16
***************
*** 9,12 ****
SnmpMgrStrToOid@8
SnmpMgrTrapListen@4
- dbginit@8
serverTrapThread@4
--- 11,14 ----
SnmpMgrStrToOid@8
SnmpMgrTrapListen@4
serverTrapThread@4
+ ;dbginit@8
Index: ntdll.def
===================================================================
RCS file: /cvsroot/mingw/w32api/lib/ntdll.def,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ntdll.def 11 Mar 2003 15:26:51 -0000 1.4
--- ntdll.def 12 Sep 2003 13:26:51 -0000 1.5
***************
*** 6,22 ****
--- 6,57 ----
LIBRARY ntdll.dll
EXPORTS
+ CsrAllocateCaptureBuffer@8
+ CsrAllocateMessagePointer@12
+ CsrCaptureMessageBuffer@16
+ CsrCaptureMessageString@20
+ CsrCaptureTimeout@8
CsrClientCallServer@16
+ CsrClientConnectToServer@24
+ CsrFreeCaptureBuffer@4
+ CsrIdentifyAlertableThread@0
+ CsrNewThread@0
+ CsrProbeForRead@12
+ CsrProbeForWrite@12
+ CsrSetPriorityClass@8
DbgBreakPoint@0
DbgPrint
+ DbgPrintReturnControlC
+ DbgPrompt@12
+ DbgSsHandleKmApiMsg@8
+ DbgSsInitialize@16
DbgUiConnectToDbg@0
DbgUiContinue@8
DbgUiWaitStateChange@8
DbgUserBreakPoint@0
+ KiRaiseUserExceptionDispatcher@0
+ KiUserApcDispatcher@20
+ KiUserCallbackDispatcher@12
+ KiUserExceptionDispatcher@8
+ LdrAccessResource@16
+ LdrAlternateResourcesEnabled@0
LdrDisableThreadCalloutsForDll@4
+ LdrEnumResources@20
+ LdrFindEntryForAddress@8
+ LdrFindResourceDirectory_U@16
+ LdrFindResource_U@16
+ LdrFlushAlternateResourceModules@0
+ LdrGetDllHandle@16
LdrGetProcedureAddress@16
+ LdrInitializeThunk@16
+ LdrLoadAlternateResourceModule@8
LdrLoadDll@16
LdrProcessRelocationBlock@16
+ LdrQueryImageFileExecutionOptions@24
+ LdrQueryProcessModuleInformation@12
LdrShutdownProcess@0
+ LdrShutdownThread@0
+ LdrUnloadAlternateResourceModule@4
LdrUnloadDll@4
+ LdrVerifyImageMatchesChecksum@16
NlsAnsiCodePage
NlsMbCodePageTag
***************
*** 262,269 ****
--- 297,321 ----
NtWriteVirtualMemory@20
NtYieldExecution@0
+ RtlAbortRXact@4
+ RtlAbsoluteToSelfRelativeSD@12
RtlAcquirePebLock@0
RtlAcquireResourceExclusive@8
RtlAcquireResourceShared@8
RtlAddAccessAllowedAce@16
+ RtlAddAccessAllowedAceEx@20
+ RtlAddAccessAllowedObjectAce@28
+ RtlAddAccessDeniedAce@16
+ RtlAddAccessDeniedAceEx@20
+ RtlAddAccessDeniedObjectAce@28
+ RtlAddAce@20
+ RtlAddActionToRXact@24
+ RtlAddAtomToAtomTable@12
+ RtlAddAttributeActionToRXact@32
+ RtlAddAuditAccessAce@24
+ RtlAddAuditAccessAceEx@28
+ RtlAddAuditAccessObjectAce@36
+ RtlAddCompoundAce@24
+ RtlAddRange@36
+ RtlAdjustPrivilege@16
RtlAllocateAndInitializeSid@44
RtlAllocateHandle@8
***************
*** 276,308 ****
--- 328,413 ----
RtlAppendUnicodeStringToString@8
RtlAppendUnicodeToString@8
+ RtlApplyRXact@4
+ RtlApplyRXactNoFlush@4
+ RtlAreAllAccessesGranted@8
+ RtlAreAnyAccessesGranted@8
RtlAreBitsClear@12
RtlAreBitsSet@12
+ RtlAssert@16
+ RtlCallbackLpcClient@12
+ RtlCancelTimer@8
+ RtlCaptureStackBackTrace@16
RtlCharToInteger@12
+ RtlCheckForOrphanedCriticalSections@4
+ RtlCheckRegistryKey@8
RtlClearAllBits@4
RtlClearBits@12
+ RtlCompactHeap@8
RtlCompareMemory@12
RtlCompareMemoryUlong@12
RtlCompareString@12
RtlCompareUnicodeString@12
+ RtlCompressBuffer@32
+ RtlConsoleMultiByteToUnicodeN@24
+ RtlConvertExclusiveToShared@4
+ RtlConvertSharedToExclusive@4
RtlConvertSidToUnicodeString@12
+ RtlConvertToAutoInheritSecurityObject@24
+ RtlConvertUiListToApiList@12
+ RtlConvertUlongToLargeInteger@4
+ RtlConvertVariantToProperty@28
+ RtlCopyLuid@8
+ RtlCopyLuidAndAttributesArray@12
+ RtlCopyRangeList@8
+ RtlCopySecurityDescriptor@8
RtlCopySid@12
+ RtlCopySidAndAttributesArray@28
RtlCopyString@8
RtlCopyUnicodeString@8
RtlCreateAcl@12
+ RtlCreateAndSetSD@20
+ RtlCreateAtomTable@8
RtlCreateEnvironment@8
RtlCreateHeap@24
+ RtlCreateLpcServer@24
RtlCreateProcessParameters@40
+ RtlCreateQueryDebugBuffer@8
+ RtlCreateRegistryKey@8
RtlCreateSecurityDescriptor@8
+ RtlCreateTagHeap@16
+ RtlCreateTimer@28
+ RtlCreateTimerQueue@4
RtlCreateUnicodeString@8
RtlCreateUnicodeStringFromAsciiz@8
+ RtlCreateUserProcess@40
+ RtlCreateUserThread@40
+ RtlCustomCPToUnicodeN@24
+ RtlCutoverTimeToSystemTime@16
+ RtlDebugPrintTimes@0
+ RtlDecompressBuffer@24
+ RtlDecompressFragment@32
+ RtlDefaultNpAcl@4
+ RtlDelete@4
+ RtlDeleteAce@8
+ RtlDeleteAtomFromAtomTable@8
+ RtlDeleteCriticalSection@4
+ RtlDeleteElementGenericTable@8
+ RtlDeleteNoSplay@8
+ RtlDeleteOwnersRanges@8
+ RtlDeleteRange@24
RtlDeleteResource@4
+ RtlDeleteSecurityObject@4
RtlDeleteTimer@12
RtlDeleteTimerQueue@4
RtlDeleteTimerQueueEx@8
RtlDeNormalizeProcessParams@4
+ RtlDeregisterWait@4
+ RtlDeregisterWaitEx@8
+ RtlDestroyAtomTable@4
RtlDestroyEnvironment@4
RtlDestroyHandleTable@4
RtlDestroyHeap@4
RtlDestroyProcessParameters@4
+ RtlDestroyQueryDebugBuffer@4
RtlDetermineDosPathNameType_U@4
RtlDoesFileExists_U@4
***************
*** 310,316 ****
--- 415,430 ----
RtlDosSearchPath_U@24
RtlDowncaseUnicodeString@12
+ RtlEmptyAtomTable@8
+ RtlEnableEarlyCriticalSectionEventCreation@0
+ RtlEnlargedIntegerMultiply@8
+ RtlEnlargedUnsignedDivide@16
+ RtlEnlargedUnsignedMultiply@8
+ RtlEnterCriticalSection@4
+ RtlEnumerateGenericTable@8
+ RtlEnumerateGenericTableWithoutSplaying@8
RtlEnumProcessHeaps@8
RtlEqualComputerName@8
RtlEqualDomainName@8
+ RtlEqualLuid@8
RtlEqualPrefixSid@8
RtlEqualSid@8
***************
*** 319,330 ****
--- 433,455 ----
RtlEraseUnicodeString@4
RtlExpandEnvironmentStrings_U@16
+ RtlExtendedLargeIntegerDivide@16
+ RtlExtendedMagicDivide@20
+ RtlExtendHeap@16
RtlFillMemory@12
RtlFillMemoryUlong@12
RtlFindClearBits@12
RtlFindClearBitsAndSet@12
+ RtlFindLeastSignificantBit@8
RtlFindLongestRunClear@8
RtlFindLongestRunSet@8
+ RtlFindMessage@20
+ RtlFindMostSignificantBit@8
+ RtlFindNextForwardRunClear@12
+ RtlFindRange@48
RtlFindSetBits@12
RtlFindSetBitsAndClear@12
+ RtlFirstFreeAce@8
+ RtlFormatCurrentUserKeyPath@4
+ RtlFormatMessage@36
RtlFreeAnsiString@4
RtlFreeHandle@8
***************
*** 333,348 ****
--- 458,484 ----
RtlFreeSid@4
RtlFreeUnicodeString@4
+ RtlFreeUserThreadStack@8
+ RtlGenerate8dot3Name@16
RtlGetAce@12
+ RtlGetCallersAddress@8
+ RtlGetCompressionWorkSpaceSize@12
RtlGetControlSecurityDescriptor@12
RtlGetCurrentDirectory_U@8
RtlGetDaclSecurityDescriptor@16
+ RtlGetElementGenericTable@8
+ RtlGetFirstRange@12
RtlGetFullPathName_U@16
RtlGetGroupSecurityDescriptor@12
RtlGetLongestNtPathLength@0
+ RtlGetNextRange@12
RtlGetNtGlobalFlags@0
+ RtlGetNtProductType@4
RtlGetOwnerSecurityDescriptor@12
RtlGetProcessHeaps@8
RtlGetSaclSecurityDescriptor@16
+ RtlGetSecurityDescriptorRMControl@8
+ RtlGetUserInfoHeap@20
RtlGetVersion@4
+ RtlGUIDFromString@8
RtlIdentifierAuthoritySid@4
RtlImageDirectoryEntryToData@16
***************
*** 350,353 ****
--- 486,490 ----
RtlImageRvaToSection@12
RtlImageRvaToVa@16
+ RtlImpersonateLpcClient@8
RtlImpersonateSelf@4
RtlInitAnsiString@8
***************
*** 356,383 ****
--- 493,546 ----
RtlInitString@8
RtlInitUnicodeString@8
+ RtlInitializeAtomPackage@4
RtlInitializeBitMap@12
+ RtlInitializeContext@20
RtlInitializeCriticalSection@4
RtlInitializeCriticalSectionAndSpinCount@8
+ RtlInitializeGenericTable@20
RtlInitializeHandleTable@12
+ RtlInitializeRXact@12
+ RtlInitializeRangeList@4
RtlInitializeResource@4
RtlInitializeSid@12
+ RtlInsertElementGenericTable@16
RtlIntegerToChar@16
RtlIntegerToUnicodeString@12
+ RtlInvertRangeList@8
RtlIsDosDeviceName_U@4
RtlIsNameLegalDOS8Dot3@12
+ RtlIsRangeAvailable@40
RtlIsTextUnicode@12
RtlIsValidHandle@8
RtlIsValidIndexHandle@12
RtlLargeIntegerAdd@16
+ RtlLargeIntegerArithmeticShift@12
+ RtlLargeIntegerDivide@20
+ RtlLargeIntegerNegate@8
+ RtlLargeIntegerShiftLeft@12
+ RtlLargeIntegerShiftRight@12
+ RtlLargeIntegerSubtract@16
+ RtlLargeIntegerToChar@16
+ RtlLeaveCriticalSection@4
RtlLengthRequiredSid@4
RtlLengthSecurityDescriptor@4
RtlLengthSid@4
+ RtlLocalTimeToSystemTime@8
RtlLockHeap@4
+ RtlLookupAtomInAtomTable@12
+ RtlLookupElementGenericTable@8
RtlMakeSelfRelativeSD@12
+ RtlMapGenericMask@8
+ RtlMergeRangeLists@16
RtlMoveMemory@12
RtlMultiByteToUnicodeN@20
RtlMultiByteToUnicodeSize@12
+ RtlNewInstanceSecurityObject@40
+ RtlNewSecurityGrantedAccess@24
+ RtlNewSecurityObject@24
+ RtlNewSecurityObjectEx@32
RtlNormalizeProcessParams@4
RtlNtStatusToDosError@4
+ RtlNumberGenericTableElements@4
RtlNumberOfClearBits@4
RtlNumberOfSetBits@4
***************
*** 386,400 ****
--- 549,589 ----
RtlOemToUnicodeN@12
RtlOpenCurrentUser@8
+ RtlPcToFileHeader@8
+ RtlPinAtomInAtomTable@8
RtlPrefixString@12
RtlPrefixUnicodeString@12
+ RtlProtectHeap@8
RtlQueryAtomInAtomTable@24
RtlQueryEnvironmentVariable_U@12
+ RtlQueryInformationAcl@16
+ RtlQueryProcessBackTraceInformation@4
+ RtlQueryProcessDebugInformation@12
+ RtlQueryProcessHeapInformation@4
+ RtlQueryProcessLockInformation@4
+ RtlQueryRegistryValues@20
+ RtlQuerySecurityObject@20
+ RtlQueryTagHeap@20
+ RtlQueryTimeZoneInformation@4
+ RtlQueueWorkItem@12
+ RtlRaiseException@4
RtlRaiseStatus@4
RtlReAllocateHeap@16
+ RtlRealPredecessor@4
+ RtlRegisterWait@24
RtlReleasePebLock@0
RtlReleaseResource@4
+ RtlRemoteCall@28
RtlResetRtlTranslations@4
+ RtlRunDecodeUnicodeString@8
+ RtlRunEncodeUnicodeString@8
+ RtlSecondsSince1970ToTime@8
+ RtlSecondsSince1980ToTime@8
+ RtlSelfRelativeToAbsoluteSD2@8
+ RtlSelfRelativeToAbsoluteSD@44
RtlSetAllBits@4
+ RtlSetAttributesSecurityDescriptor@12
RtlSetBits@12
+ RtlSetControlSecurityDescriptor@12
+ RtlSetCriticalSectionSpinCount@8
RtlSetCurrentDirectory_U@4
RtlSetCurrentEnvironment@8
***************
*** 402,416 ****
--- 591,637 ----
RtlSetEnvironmentVariable@12
RtlSetGroupSecurityDescriptor@12
+ RtlSetInformationAcl@16
RtlSetIoCompletionCallback@12
RtlSetOwnerSecurityDescriptor@12
RtlSetSaclSecurityDescriptor@16
+ RtlSetSecurityDescriptorRMControl@8
+ RtlSetSecurityObject@20
+ RtlSetSecurityObjectEx@24
+ RtlSetThreadPoolStartFunc@8
+ RtlSetTimeZoneInformation@4
+ RtlSetTimer@28
+ RtlSetUnicodeCallouts@4
+ RtlSetUserFlagsHeap@20
+ RtlSetUserValueHeap@16
+ RtlShutdownLpcServer@4
RtlSizeHeap@12
+ RtlSplay@4
+ RtlStartRXact@4
+ RtlStringFromGUID@8
RtlSubAuthorityCountSid@4
RtlSubAuthoritySid@8
+ RtlSubtreePredecessor@4
+ RtlSubtreeSuccessor@4
+ RtlSystemTimeToLocalTime@8
+ RtlTimeFieldsToTime@8
+ RtlTimeToElapsedTimeFields@8
RtlTimeToSecondsSince1970@8
+ RtlTimeToSecondsSince1980@8
RtlTimeToTimeFields@8
+ RtlTraceDatabaseAdd@16
+ RtlTraceDatabaseCreate@20
+ RtlTraceDatabaseDestroy@4
+ RtlTraceDatabaseEnumerate@12
+ RtlTraceDatabaseFind@16
+ RtlTraceDatabaseLock@4
+ RtlTraceDatabaseUnlock@4
+ RtlTraceDatabaseValidate@4
+ RtlTryEnterCriticalSection@4
+ RtlUlongByteSwap@4
+ RtlUlonglongByteSwap@4
RtlUnicodeStringToAnsiSize@4
RtlUnicodeStringToAnsiString@12
RtlUnicodeStringToCountedOemString@12
+ RtlUnicodeStringToInteger@12
RtlUnicodeStringToOemSize@4
RtlUnicodeStringToOemString@12
***************
*** 418,422 ****
--- 639,645 ----
RtlUnicodeToMultiByteSize@12
RtlUnicodeToOemN@20
+ RtlUniform@4
RtlUnlockHeap@4
+ RtlUnwind@16
RtlUpcaseUnicodeChar@4
RtlUpcaseUnicodeString@12
***************
*** 424,427 ****
--- 647,651 ----
RtlUpcaseUnicodeStringToCountedOemString@12
RtlUpcaseUnicodeStringToOemString@12
+ RtlUpcaseUnicodeToCustomCPN@24
RtlUpcaseUnicodeToMultiByteN@20
RtlUpcaseUnicodeToOemN@20
***************
*** 429,438 ****
RtlUpperChar@4
RtlUpperString@12
RtlValidSid@4
RtlValidateHeap@12
RtlValidateProcessHeaps@0
! RtlValidSecurityDescriptor@4
RtlZeroMemory@8
RtlpUnWaitCriticalSection@4
RtlxAnsiStringToUnicodeSize@4
RtlxOemStringToUnicodeSize@4
--- 653,678 ----
RtlUpperChar@4
RtlUpperString@12
+ RtlUsageHeap@12
+ RtlUshortByteSwap@4
+ RtlValidAcl@4
+ RtlValidRelativeSecurityDescriptor@12
+ RtlValidSecurityDescriptor@4
RtlValidSid@4
RtlValidateHeap@12
RtlValidateProcessHeaps@0
! RtlVerifyVersionInfo@16
! RtlWalkFrameChain@12
! RtlWalkHeap@8
! RtlWriteRegistryValue@24
! RtlZeroHeap@8
RtlZeroMemory@8
+ RtlpNtCreateKey@24
+ RtlpNtEnumerateSubKey@16
+ RtlpNtMakeTemporaryKey@4
+ RtlpNtOpenKey@16
+ RtlpNtQueryValueKey@20
+ RtlpNtSetValueKey@16
RtlpUnWaitCriticalSection@4
+ RtlpWaitForCriticalSection@4
RtlxAnsiStringToUnicodeSize@4
RtlxOemStringToUnicodeSize@4
Index: rpcrt4.def
===================================================================
RCS file: /cvsroot/mingw/w32api/lib/rpcrt4.def,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** rpcrt4.def 5 Jun 2001 01:36:46 -0000 1.1.1.1
--- rpcrt4.def 12 Sep 2003 13:26:51 -0000 1.2
***************
*** 345,348 ****
--- 345,349 ----
UuidCreate@4
UuidCreateNil@4
+ UuidCreateSequential@4
UuidEqual@12
UuidFromStringA@8
Index: secur32.def
===================================================================
RCS file: /cvsroot/mingw/w32api/lib/secur32.def,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** secur32.def 9 Apr 2002 21:17:17 -0000 1.2
--- secur32.def 12 Sep 2003 13:26:51 -0000 1.3
***************
*** 1,7 ****
LIBRARY SECUR32.dll
EXPORTS
AcquireCredentialsHandleA@36
AcquireCredentialsHandleW@36
! AcceptSecurityContext@36
DecryptMessage@16
DeleteSecurityContext@4
--- 1,10 ----
LIBRARY SECUR32.dll
EXPORTS
+ AcceptSecurityContext@36
AcquireCredentialsHandleA@36
AcquireCredentialsHandleW@36
! ApplyControlTokenA@8
! ApplyControlTokenW@8
! CompleteAuthToken@8
DecryptMessage@16
DeleteSecurityContext@4
***************
*** 11,14 ****
--- 14,22 ----
FreeContextBuffer@4
FreeCredentialsHandle@4
+ GetComputerObjectNameA@12
+ GetComputerObjectNameW@12
+ GetUserNameExA@12
+ GetUserNameExW@12
+ ImpersonateSecurityContext@4
InitializeSecurityContextA@48
InitializeSecurityContextW@48
***************
*** 19,33 ****
LsaLookupAuthenticationPackage@12
LsaRegisterLogonProcess@12
QueryContextAttributesA@12
QueryContextAttributesW@12
QueryCredentialsAttributesA@12
QueryCredentialsAttributesW@12
- CompleteAuthToken@8
- ApplyControlTokenA@8
- ApplyControlTokenW@8
- ImpersonateSecurityContext@4
- RevertSecurityContext@4
- MakeSignature@16
- VerifySignature@16
QuerySecurityPackageInfoA@8
QuerySecurityPackageInfoW@8
--- 27,39 ----
LsaLookupAuthenticationPackage@12
LsaRegisterLogonProcess@12
+ MakeSignature@16
QueryContextAttributesA@12
QueryContextAttributesW@12
QueryCredentialsAttributesA@12
QueryCredentialsAttributesW@12
QuerySecurityPackageInfoA@8
QuerySecurityPackageInfoW@8
+ RevertSecurityContext@4
+ TranslateNameA@20
+ TranslateNameW@20
+ VerifySignature@16
Index: shell32.c
===================================================================
RCS file: /cvsroot/mingw/w32api/lib/shell32.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** shell32.c 5 Jun 2001 01:36:46 -0000 1.1.1.1
--- shell32.c 12 Sep 2003 13:26:51 -0000 1.2
***************
*** 9,12 ****
--- 9,13 ----
DEFINE_SHLGUID(CGID_Explorer,0x000214D0L,0,0);
DEFINE_SHLGUID(CGID_ShellDocView,0x000214D1L,0,0);
+ DEFINE_SHLGUID(CGID_ShellServiceObject,0x000214D2L,0,0);
DEFINE_SHLGUID(IID_INewShortcutHookA,0x000214E1L,0,0);
DEFINE_SHLGUID(IID_IShellBrowser,0x000214E2L,0,0);
***************
*** 50,51 ****
--- 51,55 ----
DEFINE_GUID(CLSID_InternetShortcut,0xFBF23B40L,0xE3F0,0x101B,0x84,0x88,0x00,0xAA,0x00,0x3E,0x56,0xF8);
DEFINE_GUID(IID_IUniformResourceLocator,0xFBF23B80L,0xE3F0,0x101B,0x84,0x88,0x00,0xAA,0x00,0x3E,0x56,0xF8);
+ DEFINE_GUID(CLSID_DragDropHelper,0x4657278AL,0x411B,0x11D2,0x83,0x9A,0x0,0xC0,0x4F,0xD9,0x18,0xD0);
+ DEFINE_GUID(IID_IDropTargetHelper,0x4657278BL,0x411B,0x11D2,0x83,0x9A,0x0,0xC0,0x4F,0xD9,0x18,0xD0);
+ DEFINE_GUID(IID_IDragSourceHelper,0xDE5BF786L,0x477A,0x11D2,0x83,0x9D,0x0,0xC0,0x4F,0xD9,0x18,0xD0);
Index: shell32.def
===================================================================
RCS file: /cvsroot/mingw/w32api/lib/shell32.def,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** shell32.def 14 Oct 2002 20:25:28 -0000 1.3
--- shell32.def 12 Sep 2003 13:26:51 -0000 1.4
***************
*** 49,52 ****
--- 49,53 ----
SHGetSpecialFolderPathA@16
SHGetSpecialFolderLocation@12
+ SHGetSetSettings@12
SHGetSettings@8
SHGetPathFromIDListW@8
Index: test.c
===================================================================
RCS file: /cvsroot/mingw/w32api/lib/test.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** test.c 11 Mar 2003 15:26:51 -0000 1.11
--- test.c 12 Sep 2003 13:26:51 -0000 1.12
***************
*** 44,47 ****
--- 44,48 ----
#include <ntsecapi.h>
#include <odbcinst.h>
+ #include <powrprof.h>
#include <psapi.h>
#include <ras.h>
***************
*** 68,73 ****
--- 69,82 ----
#include <aclapi.h>
#include <security.h>
+ #include <secext.h>
#include <schnlsp.h>
+ #include <ntldap.h>
+ #include <winber.h>
+ #include <winldap.h>
#include <shlwapi.h>
+ #include <snmp.h>
+ #include <winsnmp.h>
+ #include <mgmtapi.h>
+ #include <vfw.h>
#ifndef __OBJC__ /* problems with BOOL */
***************
*** 79,82 ****
--- 88,92 ----
#include <ole2ver.h>
#include <oleacc.h>
+ #include <winable.h>
#include <olectl.h>
#include <oledlg.h>
***************
*** 88,91 ****
--- 98,102 ----
#include <exdisp.h>
#include <mshtml.h>
+ #include <servprov.h>
#else
Index: user32.def
===================================================================
RCS file: /cvsroot/mingw/w32api/lib/user32.def,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** user32.def 26 Mar 2003 23:06:15 -0000 1.5
--- user32.def 12 Sep 2003 13:26:51 -0000 1.6
***************
*** 258,261 ****
--- 258,262 ----
GetLastActivePopup@4
GetLastInputInfo@4
+ GetLayeredWindowAttributes@16
GetListBoxInfo@4
GetMenu@4
***************
*** 410,413 ****
--- 411,415 ----
MsgWaitForMultipleObjects@20
MsgWaitForMultipleObjectsEx@20
+ NotifyWinEvent@16
OemKeyScan@4
OemToCharA@8
***************
*** 487,490 ****
--- 489,493 ----
SetKeyboardState@4
SetLastErrorEx@8
+ SetLayeredWindowAttributes@16
SetMenu@8
SetMenuContextHelpId@8
***************
*** 565,568 ****
--- 568,572 ----
UnregisterClassW@8
UnregisterHotKey@8
+ UpdateLayeredWindow@36
UpdateWindow@4
ValidateRect@8
Index: uuid.c
===================================================================
RCS file: /cvsroot/mingw/w32api/lib/uuid.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** uuid.c 19 Nov 2002 14:45:07 -0000 1.5
--- uuid.c 12 Sep 2003 13:26:51 -0000 1.6
***************
*** 7,10 ****
--- 7,15 ----
Some definitions were added by hand afterwards.
*/
+
+ /*
+ TODO: Break up into smaller units, based on declarations in headers.
+ */
+
#define INITGUID
#include <basetyps.h>
***************
*** 169,177 ****
DEFINE_GUID(IID_IFont,0xbef6e002,0xa874,0x101a,0x8b,0xba,0,0xaa,0,0x30,0xc,0xab);
DEFINE_GUID(IID_IFontDisp,0xbef6e003,0xa874,0x101a,0x8b,0xba,0,0xaa,0,0x30,0xc,0xab);
- DEFINE_GUID(IID_IHTMLDocument,0x626fc520,0xa41e,0x11cf,0xa7,0x31,0x0,0xa0,0xc9,0x8,0x26,0x37);
- DEFINE_GUID(IID_IHTMLDocument2,0x332c4425,0x26cb,0x11d0,0xb4,0x83,0x0,0xc0,0x4f,0xd9,0x1,0x19);
- DEFINE_GUID(IID_IHTMLElement,0x3050f1ff,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0xb);
- DEFINE_GUID(IID_IHTMLSelectionObject,0x3050f25a,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0xb);
- DEFINE_GUID(IID_IHTMLTxtRange,0x3050f220,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b);
DEFINE_GUID(IID_IHlink,0x79eac9c3,0xbaf9,0x11ce,0x8c,0x82,0,0xaa,0,0x4b,0xa9,0xb);
DEFINE_GUID(IID_IHlinkBrowseContext,0x79eac9c7,0xbaf9,0x11ce,0x8c,0x82,0,0xaa,0,0x4b,0xa9,0xb);
--- 174,177 ----
|
|
From: <ea...@us...> - 2003-09-12 13:26:58
|
Update of /cvsroot/mingw/w32api In directory sc8-pr-cvs1:/tmp/cvs-serv17014 Modified Files: ChangeLog Makefile.in config.guess config.sub Log Message: Merge winsup changes Index: ChangeLog =================================================================== RCS file: /cvsroot/mingw/w32api/ChangeLog,v retrieving revision 1.118 retrieving revision 1.119 diff -C2 -d -r1.118 -r1.119 *** ChangeLog 26 Mar 2003 23:06:10 -0000 1.118 --- ChangeLog 12 Sep 2003 13:26:50 -0000 1.119 *************** *** 1,2 **** --- 1,844 ---- + 2003-09-08 Justin Forest <vh...@us...> + + * include/winuser.h (PM_QS_INPUT, PM_QS_POSTMESSAGE, + PM_QS_PAINT, PM_QS_SENDMESSAGE): Add defines. + + 2003-09-08 Filip Navara <xn...@vo...> + + * include/wingdi.h (GRADIENT_FILL_RECT_H, GRADIENT_FILL_RECT_V, + GRADIENT_FILL_TRIANGLE, GRADIENT_FILL_OP_FLAG): Add defines. + + 2003-09-05 Earnie Boyd <ea...@us...> + + * include/w32api.h (_NT5, etc): Reverse the changes of 2003-07-01. + * include/winbase.h (_NT5, etc): Ditto. + + 2003-09-02 Bart Oldeman <bar...@us...> + + * lib/snmpapi.def (LIBRARY) Add library name. + Remove '\r', throughout. + * lib/wsnmp32.def: Remove '\r', throughout. + * lib/igmpagnt.def: Likewise. + + 2003-08-29 Steve Cleary <sc...@je...> + + * include/winuser.h (QS_ALLPOSTMESSAGE, QS_RAWINPUT): Add defines. + (QS_INPUT, QS_ALLINPUT, QS_ALLEVENTS): Adjust by OR'ing with + QS_RAWINPUT for _WIN32_WINNT >= 0x0501. + (MWMO_*): Add flags. + + * include/wincrypt.h (MS_ENHANCED_PROV[AW], MS_STRONG_PROV[AW], + MS_DEF_RSA_SIG_PROV[AW], MS_DEF_RSA_SCHANNEL_PROV[AW], + MS_DEF_DSS_PROV[AW], MS_DEF_DSS_DH_PROV[AW], MS_ENH_DSS_DH_PROV[AW], + MS_DEF_DH_SCHANNEL_PROV[AW], MS_SCARD_PROV[AW]): Add definitions. + + 2003-08-26 Danny Smith <dan...@us...> + + * lib/test.c: Add vfw.h to includes. + * include/mmsystem.h: Add #ifndef guard to definition of + mmioFOURCC macro. + * include/vfw.h: Protect __OBJC__ from COM declarations. + + 2003-08-26 Filip Navara <xn...@vo...> + + * include/vfw.h: New file. + + 2003-08-26 Filip Navara <xn...@vo...> + + * include/ddk/winddk.h (RTL_REGISTRY_*): Add defines. + (IoSetCompletionRoutine): Cast _CompletionRoutine arg to + PIO_COMPLETION_ROUTINE. + + 2003-08-26 Danny Smith <dan...@us...> + + * lib/test.c: Add snmp.h, winsnmp.h amd mgmtapi.h to + includes. + + 2003-08-26 Filip Navara <xn...@vo...> + + * include/snmp.h: New file. + * include/winsnmp.h: New file. + * include/mgmtapi.h: New file. + * lib/snmpapi.def: New file. + * lib/wsnmp32.def: New file. + * lib/igmpagnt.def: New file. + * lib/mgmtapi.def (SnmpMgrCtl) Add stub. + (SnmpMgrGetTrapEx): Ditto. + (SnmpMgrMIB2Disk): Remove. + (dbginit): Remove. + + 2003-08-25 Steven Edwards <Ste...@ya...> + + * include/ddk/ntifs.h: Change all C++ style comments to C. + * include/GL/gl.h: Ditto. + + 2003-08-25 Martin Fuchs <Mar...@gm...> + + * include/shlobj.h (SFGAO_GHOSTED): Correct. + (SFGAO_HIDDEN): Add define. + + 2003-08-25 Filip Navara <xn...@vo...> + + * include/commctrl.h (ILCF_*): Add defines. + (ILD_*): Ditto. + (HDS_*); Ditto. + (IPN_FIRST, IPN_LAST): Cast to UINT. + (SBN_FIRST, SBN_LAST): Add defines. + (PGN_*): Ditto. + (HDF_JUSTIFYMASK): Fix typo. + (HDM_*): Add defines. + (HICF_*): Ditto. + (I_INDENTCALLBACK,I_IMAGENONE): Ditto. + (TBSTATE_MARKED): Add define. + (TBSTYLE_EX_*): Add defines. + (TBCDRF_*): Ditto. + (IDB_HIST_SMALL_COLOR,IDB_HIST_LARGE_COLOR): Ditto. + (TB_*): Ditto. + (TBN_*): Ditto. + (TBNRF_*): Ditto. + (TTF_*): Ditto. + (TBCD_*): Ditto. + (TBDDRET_*): Ditto. + (TBIMHT_*): Ditto. + (TTM_*): Ditto. + (UDM_*): Ditto. + (TBIF_BYINDEX): Define as hex constant. + (CDIS_*): Add defines. + (CDDS_SUBITEM): Add define. + (LVIF_*): Add defines. + (LVM_*): Ditto. + (LVGIT_UNFOLDED): Add define. + (TVM_): Add defines. + (TVE_EXPANDPARTIAL): Add define. + (TVGN_LASTVISIBLE): Ditto. + (TVN_*): Add defines. + (TVNRET_*): Add defines. + (TCIF_STATE): Add define. + (NM_TOOLTIPSCREATED): Ditto. + (CCM_*): Add defines. + (INFOTIPSIZE): Add numeric value. + (ODT_LISTVIEW): Ditto. + (MCM_GETMAXTODAYWIDTH): Ditto. + (MCHT_*): Add defines. + (UDM_SETRANGE32,UDM_GETRANGE32): Define in terms of WM_USER. + (PGF_*): Add defines. + (PGM_*): Ditto. + (TBINSERTMARK): Add structure. + (LPIMAGEINFO) Add typedef. + (LPHDHITTESTINFO): Ditto. + (NMLVGETINFOTIP[AW]: Add structures. + (NMTBCUSTOMDRAW): Add structure. + (TTTOOLINFOA_V*_SIZE): Add macros. + (TTTOOLINFOW_V1_SIZE): Ditto. + (IMAGELISTDRAWPARAMS): Add new members for WXP. + (LVITEM[AW]: Ditto. + (TCITEM[AW]):Ditto. + (CCSIZEOF_STRUCT): Correct macro definition. + (ListView_*): Add new macros. + (HIMAGELIST): Correct typedef. + (HTREEITEM): Ditto. + + 2003-08-25 Danny Smith <dan...@us...> + + * commctrl.h (TC_HITTESTINFO): Remove. Add defines for + TCHITTESTINFO for backward compatibility. + (TC_ITEM[AW]): Rename to TCITEM[AW]. Add defines for backward + compatibility. + + 2003-08-24 Danny Smith <dan...@us...> + + * include/objidl.h (COBJMACROS): Define macros only + if using C interace. + * include/unknwn.h: Ditto. + * include/comcat.h: Ditto. + + 2003-08-24 Filip Navara <xn...@vo...> + + * include/prsht.h (PSH_WIZARDHASFINISH, PSH_WIZARD_LITE, + PSH_NOCONTEXTHELP): Define. + (PSH_WIZARD97): Fix definition for _WIN32_IE >= 0x500. + * include/winuser.h (DFCS_TRANSPARENT, DFCS_HOT): Define. + (LPDLGTEMPLATE[AW]): Add typedefs. + + 2003-08-22 Filip Navara <xn...@vo...> + + * include/aclapi.h (BuildImpersonateExplicitAccessWithName[AW]): + Add prototypes. + BuildImpersonateTrustee[AW]): Add prototypes. + GetMultipleTrustee[AW]): Add prototypes. + GetMultipleTrusteeOperation[AW]): Add prototypes. + + 2003-08-22 Danny Smith <dan...@us...> + + * include/winnt.h (IMAGE_SUBSYSTEM_XBOX): Add define. + + 2003-08-22 Mihai Preda <mih...@us...> + + * include/shlobj.h (IPersistFolder::GetClassID): + Correct declaration. + (CMF_*) Add missing defines. + + 2003-08-22 Danny Smith <dan...@us...> + + * include/winuser.h (DC_BUTTONS): Add define. + + 2003-08-22 Andrew Greenwood <li...@si...> + + * include/winuser.h (DC_GRADIENT): Add define. + + 2003-08-22 Martin Fuchs <Mar...@gm...> + + * include/commctrl.h (BTNS_*): Define BTNS_* as successors to the + older TBSTYLE_* constants. + + 2003-08-18 Danny Smith <dan...@us...> + + * include/commctrl.h (TB_*) Group defines together. + + 2003-08-18 Martin Fuchs <Mar...@gm...> + + * include/winuser.h (ICON_SMALL2): Define. + * include/commctrl.h (TB_SETBUTTONWIDTH, TB_SETDRAWTEXTFLAGS): + Define. + * include/shlobj.h (SHDRAGIMAGE): Define structure. + (IDragSourceHelper) Define interface. + (IDropTargetHelper): Likewise. + (IExtractIcon): Unicode it. + (ICommDlgBrowser): Use IShellView type as param in OnDefaultCommand, + OnStateChange and IncludeObject methods. + + 2003-08-17 Martin Fuchs <Mar...@gm...> + + * include/commctrl.h (TreeView_GetScrollTime, + TreeView_SetScrollTime): Define macros. + * include/winuser.h (GetShellWindow): Add prototype. + * include/objidl.h (STGMEDIUM): Correct lpszFileName type. + + 2003-08-15 Martin Fuchs <Mar...@gm...> + + * include/shguid.h (CLSID_DragDropHelper, IID_IDropTargetHelper, + IID_IDragSourceHelper): Declare. + * lib/shell32.c (CLSID_DragDropHelper, IID_IDropTargetHelper, + IID_IDragSourceHelper): Define. + + 2003-08-15 Andrew Greenwood <li...@si...> + + * include/wingdi.h (DEVMODE[AW]) Correct structure definition. + * include/ddk/ntapi.h (LPC_TYPE): Add LPC_CONNECTION_REFUSED. + * include/ddk/winddk.h (IRP_*): Add constants as anonymous enum. + + 2003-08-10 Danny Smith <dan...@us...> + + * lib/uuid.c (CGID_Explorer, CGID_ShellDocView, + CGID_ShellServiceObject): Remove definitions. + * lib/shell32.c (CGID_ShellServiceObject): Add definition. + + 2003-08-10 Danny Smith <dan...@us...> + + * include/shlobj.h (SHELLSTATE): Add structure. + (SHGetSetSettings): Add prototype. + (SHGetSettings): Add prototype. + * lib/shell32.def (SHGetSetSettings): Add stub. + + 2003-08-10 Phil Krylov <lik...@us...> + + * include/commctrl.h (HDM_ORDERTOINDEX): Add define. + (Header_OrderToIndex): Add macro. + (Header_GetOrderArray): Add macro. + + * include/commdlg.h (FR_MATCHALEFHAMZA, + FR_MATCHDIAC, FR_MATCHKASHIDA): Add defines. + + 2003-08-10 Martin Fuchs <Mar...@gm...> + + * include/commctrl.h (TVM_GETSCROLLTIME, + TVM_SETSCROLLTIME): Add defines. + + 2003-08-01 Danny Smith <dan...@us...> + + * include/shlobj.h (SHELLFLAGSTATE): Add structure. + (SHGetInstanceExplorer): Correct return type. + (SHGetFolderPath[AW]): Likewise. + Thanks to Magnus Olsen <gre...@so...> + for report. + + 2003-08-01 Danny Smith <dan...@us...> + + * lib/test.c: Include winldap.h, ntldap.h, winber.h. + + 2003-08-01 Filip Navara <xn...@vo...> + + * include/winldap.h: New file. + * include/ntldap.h: New file. + * include/winber.h: New file. + * lib/winldap32.def: New file. + + 2003-08-01 Danny Smith <dan...@us...> + + * include/ddk/atm.h: Remove stray '.'; + + 2003-08-01 Gisle Vanem <gv...@br...> + + * include/ddk/winddk.h; Remove trailing ';' from macros, + throughout. Add () around defines with cast returns, throughout. + + 2003-07-31 Martin Fuchs <Mar...@gm...> + + * include/shlobj.h (SFGAO_COMPRESSED): Add define. + (SFGAOF, SHGDNF): Add typedef's. + (SHCONTF): Extend enum. + + 2003-07-31 Danny Smith <dan...@us...> + + * include/shellapi.h: Include all structs within pshpack2.h/ + poppack.h block. + + 2003-07-26 Danny Smith <dan...@us...> + + * include/winuser.h (ASFW_ANY, LSFW_LOCK, LSFW_UNLOCK, + LWA_COLORKEY, LWA_ALPHA): Guard with _WIN32_WINNT, + _WIN32_WINDOWS, not WINVER. + (AllowSetForegroundWindow,LockSetForegroundWindow, + SetLayeredWindowAttributes): Likewise. + (GetLayeredWindowAttributes,UpdateLayeredWindow): Add prototypes. + * lib/user32.def (GetLayeredWindowAttributes,UpdateLayeredWindow): + Add stubs. + + 2003-07-26 Eric R. Krause <ekr...@us...> + + * include/objidl.h (IMalloc): Fix typo. + + 2003-07-24 Danny Smith <dan...@us...> + + * include/dkk/ntifs.h: Fix typo in guard for + #pragma GCC system_header. + + 2003-07-22 Danny Smith <dan...@us...> + + * include/objidl.h (PropVariant): Add CHAR cVal field + to union. + (FMTID_SummaryInformation, FMTID_DocSummaryInformation, + FMTID_UserDefinedProperties): Declare. + + 2003-07-22 Danny Smith <dan...@us...> + + * include/winbase.h (GetModuleHandleEx[AW]): Add prototypes. + + 2003-07-22 Danny Smith <dan...@us...> + + * include/winbase.h (DUPLICATE_CLOSE_SOURCE, + DUPLICATE_SAME_ACCESS): Remove defines. + (HANDLE_FLAG_INHERIT, HANDLE_FLAG_PROTECT_FROM_CLOSE): Sync with + ddk/ntapi.h defines. + (SEM_*) : Likewise. + * include/winnt.h (COMPRESSION_*, ACCESS_*, SYSTEM_*): Sync with + ddk/ntifs.h defines. + (FILE_*): Likewise. + (MEM_IMAGE, SEC_*): Likewise. + (DUPLICATE_CLOSE_SOURCE, DUPLICATE_SAME_ACCESS, + DUPLICATE_SAME_ATTRIBUTES): Sync with ddk/winddk.h defines. + (TOKEN_*): Sync with ddk/ntifs.h defines. + * include/ddk/ntapi.h: Add comments noting definitions in + winbase.h. + * include/ddk/ntifs.h: Add comments noting definitions in + winnt.h. + * include/ddk/winddk.h: Add comments noting definitions in + winnt.h. + + 2003-07-18 Danny Smith <dan...@us...> + + * include/winnt.h (FILE_*): Sync with ddk/winddk.h. + * include/winioctl.h (FILE_*): Sync with ddk/winddk.h. + + 2003-07-17 Pierre Humblet <pie...@ie...> + + * include/mmsystem.h (TIME_KILL_SYNCHRONOUS): Add define. + + 2003-07-17 Danny Smith <dan...@us...> + + Clean up warnings in ddk. + + * include/ddk/atm.h (_ATM_AAL_OOB_INFO): Add _ANONYMOUS_UNION, + conditional on __cplusplus. + * include/ddk/scsi.h: Add _ANONYMOUS_UNION and _ANONYMOUS_STRUCT + defines, throughout. + (_CDB): Add _ANONYMOUS_UNION, conditional on __cplusplus. + * include/ddk/cfg.h (_PNP_VETO_TYPE): Remove extra comma. + * include/ddk/cfgmgr32.h: Change C++ comment style to ISO C. + * include/ddk/ddkmapi.h (_DDLOCKOUT): Add _ANONYMOUS_UNION defines. + * include/ddk/hidpi.h: Add _ANONYMOUS_UNION and _ANONYMOUS_STRUCT + defines, throughout. + * include/ddk/ndis.h: Add _ANONYMOUS_UNION and _ANONYMOUS_STRUCT + defines, throughout. Remove trailing semicolon from *_S 'structure' + macro expansion, throughout. Remove trailing semicolon from + DECLARE_UNKNOWN_STRUCT macro expansion. + * include/ddk/ndiswan.h (_NDIS_WAN_COMPRESS_INFO): Add + _ANONYMOUS_UNION. + * include/ddk/ntapi.h (_PROCESS_DEVICEMAP_INFORMATION, + _PROCESS_SESSION_INFORMATION): Add _ANONYMOUS_UNION. + * include/ddk/ntddcdrm.h (CDROM_TOC_CD_TEXT_DATA_BLOCK): + Add _ANONYMOUS_UNION. + * include/ddk/ntdddisk.h: Add _ANONYMOUS_UNION, throughout. + * include/ddk/ntddmou.h: Add _ANONYMOUS_UNION, throughout. + * include/ddk/ntifs.h: Add _ANONYMOUS_UNION, throughout. + (ZwQueryObject): Change 2nd param to OBJECT_INFORMATION_CLASS, to + match proto in ntapi.h. + (ZwSetInformationObject): Likewise. + * include/ddk/srb.h (SCSI_REQUEST_BLOCK): Add _ANONYMOUS_UNION. + (SCSI_ADAPTER_CONTROL_TYPE): Add __extension__. + * include/ddk/tdikrnl.h (TDI20_CLIENT_INTERFACE_INFO): Add + _ANONYMOUS_UNION and _ANONYMOUS_STRUCT. + * include/ddk/usb.h (USB): Add _ANONYMOUS_UNION. + * include/ddk/usbcamdi.h (USBCAMD_CamControlFlags): Remove + last comma. + * include/ddk/video.h (STATUS_BLOCK): Add _ANONYMOUS_UNION. + * include/ddk/winddk.h (DECLARE_INTERNAL_OBJECT): Remove + trailing semicolon when expanding macro. + (GENERAL_LOOKASIDE_S): Likewise. + Add _ANONYMOUS_UNION and _ANONYMOUS_STRUCT, throughout. + Change inline to __inline, throughout. + * include/ddk/winnt4.h: Change inline to __inline, throughout. + + 2003-07-13 Casper S. Hornstrup <ch...@us...> + + * include/ddk/ntifs.h (KeInsertQueueApc): Make return type + BOOLEAN. Name parameter 4 PriorityBoost and make it of type + KPRIORITY. + * include/ddk/winddk.h (_KPCR): Put IDT field on next line. + * include/ddk/winddk.h (_IO_STATUS_BLOCK, _IRP, _OWNER_ENTRY, + _ERESOURCE, _IMAGE_INFO, _CREATE_DISK, _DISK_SIGNATURE, _KPCR_TIB): + Apply _ANONYMOUS_UNION to anonymous unions and _ANONYMOUS_STRUCT + to anonymous structs. + + 2003-07-12 Danny Smith <dan...@us...> + + * include/winnt.h (PVOID): Move to before HANDLE typedef. + + * include/winuser.h (mouse_event): Correct type of fifth param, + Thanks to: Andrew Jones <guln at users dot sourceforge dot net> + + 2003-07-11 Earnie Boyd <ea...@us...> + + * include/winnt.h (HANDLE): Define based on STRICT filter. + (THREAD_BASE_PRIORITY_MIN): Use parens around negative value. + (THREAD_BASE_PRIOIRTY_IDLE): Ditto. + + 2003-07-08 Danny Smith <dan...@us...> + + * include/commctrl.h (NMTVDISPINFO[AW]): Replace obsolete struct + names _TV_DISPINFO[AW] and typedefs. Add defines for backward + compatability. Thanks to Magnus Olsen <gre...@us...> + for report. + + 2003-07-03 Earnie Boyd <ea...@us...> + + * config.guess, config.sub: Update with new versions from ftp.gnu.org. + + 2003-07-03 Luke Dunstan <in...@us...> + + * include/commdlg.h (CommDlg_OpenSave_*): Add parentheses around + macro arguments. Thanks to Tom Bishop <tom...@us...>. + * include/winuser.h (MONITOR_DEFAULTTONULL, MONITOR_DEFAULTTOPRIMARY, + MONITOR_DEFAULTTONEAREST, MONITORINFOF_PRIMARY): Add defines. + (TPM_RECURSE): Add guard for Win98/Win2K. + Thanks to Magnus Olsen <gre...@us...>. + + 2003-07-01 Earnie Boyd <ea...@us...> + + * include/basetyps.h (small, hyper): Change to __small and __hyper to + avoid user namespace conflicts. + + 2003-07-01 Earnie Boyd <ea...@us...> + + * include/w32api.h (_NT4, _W98, _WME, _NT5, _W2000, _WXP, _W2003, + _IE3, _IE4, _IE5, _IE6): Add definitions. + * include/winbase.h (GetLongPathName[AW]): Add guard for OS >= NT5 or + >= Win98. + Change existing guards to use the above macro names as appropriate. + * include/basetyps.h (__int32, __int16, __int8, small, hyper): Define. + Note: Also added to mingw/include/_mingw.h. + + 2003-06-28 Steven Edwards <Ste...@ya...> + + * include/shlwapi.h (UrlGetLocationA, UrlGetLocationW, + PathFindSuffixArrayA, PathFindSuffixArrayW, + PathFindExtensionA, PathFindExtensionW, StrStrW + StrStrA): Change unicode-macro'd LP[C]TSTR return values to + explicit type. + + 2003-06-26 Mattia Barbon <mb...@ds...> + + * include/richedit.h (PARAFORMAT2): Add definition. + * include/richedit.h (PFA_*, PFE_*, PFM_*): Add some + missing constants. + + 2003-06-17 Danny Smith <dan...@us...> + + * include/shellapi.h (SHQUERYRBINFO): Add structure, + (SHQueryRecycleBin[AW]. SHEmptyRecycleBin[AW]):Add prototypes. + (SHERB_NOCONFIRMATION, SHERB_NOPROGRESSUI, SHERB_NOSOUND): + Add defines. Thanks to Brett Hart <brett at ncubedtech dot com> + + 2003-06-17 Danny Smith <dan...@us...> + + * include/winbase.h (GlobalCompact, GlobalFix, GlobalFlags, + GlobalUnfix, GlobalUnWire, GlobalWire, LocalCompact, + LocalFlags, LocalShrink, LockSegment, UnlockSegment): Add comment + that these are obsolete no-ops. + + 2003-06-17 Bang Jun-Young <jun...@ne...> + + * include/winbase.h (GetProcessWorkingSetSize, + GlobalCompact, LocalAlloc, LocalCompact, LocalReAlloc, + LocalShrink, SignalObjectAndWait, WriteProcessMemory): + Correct prototypes. + + 2003-06-18 Steven Edwards <Ste...@ya...> + + * include/winuser.h (TPM_RECURSE): Add define. + + 2003-06-06 Danny Smith <dan...@us...> + + * lib/test.c: #include <powrprof.h>. + + 2003-06-06 James E. Lucas <xe...@so...> + + * include/powerprof.h: New file. + * lib/powerprof.def: New file. + + 2003-06-06 Danny Smith <dan...@us...> + + * include/winnt (SLIST_HEADER): Add C90 anonymous struct + protection. + + 2003-06-05 Luke Dunstan <in...@us...> + + * include/winuser.h (WNDCLASS[AW], WNDCLASSEX[AW]): Change type of + hInstance members to HINSTANCE. + Thanks to: Brenden T. <br...@rc...> + + 2003-06-05 Bart Oldeman <bar...@us...> + + * include/lmaccess.h (UF_MNS_LOGON_ACCOUNT): Add define. + * include/wingdi.h (LPRGBTRIPLE, LPRGBQUAD): Add typedefs. + + 2003-06-02 Danny Smith <dan...@us...> + + * include/ddk/ntpoapi.h (POWER_INFORMATION_LEVEL): Remove. + * include/winnt.h (POWER_INFORMATION_LEVEL): Add. + * include/ddk/winddk.h (SINGLE_LIST_ENTRY,SLIST_HEADER): + Remove. + * include/ddk/ndis.h (NdisAllocateSpinLock): Add missing '\'. + + 2003-05-30 Mattia Barbon <mb...@ds...> + + * lib/oleacc.def: New file. + * include/winable.h: New file. + * include/oleacc.h: Add extern "C" guard. + (NAVDIR_*, ROLE_*, STATE_*): Add missing constants. + (AccessibleChildren, AccessibleObjectFromEvent, + AccessibleObjectFromPoint, AccessibleObjectFromWindow, + CreateStdAccessibleProxy[AW], GetOleaccVersionInfo, GetRoleText[AW], + GetStateText[AW], LresultFromObject, ObjectFromLresult, + WindowFromAccessibleObject): Add prototypes and UNICODE mappings. + * include/winuser.h (NotifyWinEvent): Add prototype. + (OBJID_WINDOW, OBJID_SYSMENU, OBJID_TITLEBAR, + OBJID_MENU, OBJID_CLIENT, OBJID_VSCROLL, OBJID_HSCROLL, + OBJID_SIZEGRIP, OBJID_CARET, OBJID_CURSOR, OBJID_ALERT, + OBJID_SOUND): Move from here to... + * include/winable.h (OBJID_WINDOW, OBJID_SYSMENU, OBJID_TITLEBAR, + OBJID_MENU, OBJID_CLIENT, OBJID_VSCROLL, OBJID_HSCROLL, + OBJID_SIZEGRIP, OBJID_CARET, OBJID_CURSOR, OBJID_ALERT, + OBJID_SOUND): Here, as per documentation. + * lib/test.c: Include winable.h. + * lib/user32.def (NotifyWinEvent): Add missing export. + + 2003-05-30 Bang Jun-Young <jun...@ne...> + + * include/winbase.h (HeapCompact): Correct prototype. + * include/winnt.h (SINGLE_LIST_ENTRY, SLIST_ENTRY, + SLIST_HEADER): Add. + + 2003-05-27 Andrew C. Stadt <ac...@sy...> + + * include/winuser.h (LWA_COLORKEY, LWA_ALPHA): Add defines. + + 2003-05-25 Bill C. Riemers <cy...@do...> + + * include/winuser.h (EnumDisplayDevicesW): Fix typo. + + 2003-05-23 Danny Smith <dan...@us...> + + * include/winuser.h (EnumDisplayDevices[AW]): Add prototypes. + * include/wingdi.h (DISPLAY_DEVICE): UNICODE it. + + 2003-05-23 Andrew Dunbar <hip...@us...> + + * include/wingdi.h (GCP_RESULTS[AW]) Correct type of + lpGlyphs field to LPWSTR. + + 2003-05-21 Danny Smith <dan...@us...> + + * include/wincrypt.h (PLAINTEXTKEYBLOB, OPAQUEKEYBLOB, + PUBLICKEYBLOBEX, SYMMETRICWRAPKEYBLOB) Add defines. + (PP_*): Add defines. + (CryptContextAddRef): Add prototype. + Thanks to: Shura Zam <deb...@us...> + + 2003-05-18 Manu B <ma...@us...> + + * include/commctrl.h (TVSORTCB): Rename old TV_SORTCB structure. + + 2003-05-18 Bang Jun-Young <jun...@ne...> + + * include/winbase.h (CREATE_DEFAULT_ERROR_MODE, + DEBUG_PROCESS, DEBUG_ONLY_THIS_PROCESS, CREATE_SUSPENDED, + DETACHED_PROCESS, CREATE_NEW_CONSOLE, NORMAL_PRIORITY_CLASS, + IDLE_PRIORITY_CLASS, HIGH_PRIORITY_CLASS, REALTIME_PRIORITY_CLASS, + CREATE_NEW_PROCESS_GROUP, CREATE_UNICODE_ENVIRONMENT, + CREATE_SEPARATE_WOW_VDM, CREATE_SHARED_WOW_VDM, CREATE_FORCEDOS, + CREATE_NO_WINDOW): Convert to hexadecimal form for better + readability. + (BELOW_NORMAL_PRIORITY_CLASS, ABOVE_NORMAL_PRIORITY_CLASS, + CREATE_BREAKAWAY_FROM_JOB, CREATE_WITH_USERPROFILE): Add. + + 2003-05-15 Danny Smith <dan...@us...> + + * include/ddk/ndis.h (NDIS30_MINIPORT_CHARACTERISTICS_S): + Unname anonymous unions if NONAMELESSUNION not defined. + + 2003-05-14 Bang Jun-Young <jun...@ne...> + + * include/winbase.h (GMEM_VALID_FLAGS): Add. + + 2003-05-13 Danny Smith <dan...@us...> + + * include/prsht.h (PROPSHEETHEADER[AW]: Mark + anonymous unions as GCC extension. + + 2003-05-13 Danny Smith <dan...@us...> + + * include/oleidl.h (LPENUMOLEDOCUMENTVIEWS): Remove typedef. + (IEnumOleDocumentViews): Remove commented out DECLARE_ENUMERATOR. + * include/docobj.h (LPENUMOLEDOCUMENTVIEWS): Add typedef (previously + commented out). + (IEnumOleDocumentViews): Add definition using DECLARE_ENUMERATOR. + + 2003-05-12 Earnie Boyd <ea...@us...> + + * include/commctrl.h: (MCSC_BACKGROUND, MCSC_TEXT, MCSC_TITLEBK, + MCSC_TITLETEXT, MCSC_MONTHBK, MCSCTRAILTEXT): Define. + Thanks to: Robert Wishlaw <rwishlaw @ shaw . ca> + + 2003-05-12 Danny Smith <dan...@us...> + + * include/olectl.h (IOleControl,IOleControlSite,ISimpleFrameSite, + IErrorLog,IPropertyBag,IPersistPropertyBag,IPersistStreamInit, + IPersistMemory,IPropertyNotifySink,IProvideClassInfo, + IProvideClassInfo2,IConnectionPointContainer, + IEnumConnectionPoints,IConnectionPoint,IEnumConnections, + IClassFactory2,ISpecifyPropertyPages,IPerPropertyBrowsing, + IPropertyPageSite,IPropertyPage,IPropertyPage2,IFont,IFontDisp, + IPicture,IPictureDisp): Move from here to... + * include/ocidl.h (IOleControl,IOleControlSite,ISimpleFrameSite, + IErrorLog,IPropertyBag,IPersistPropertyBag,IPersistStreamInit, + IPersistMemory,IPropertyNotifySink,IProvideClassInfo, + IProvideClassInfo2,IConnectionPointContainer, + IEnumConnectionPoints,IConnectionPoint,IEnumConnections, + IClassFactory2,ISpecifyPropertyPages,IPerPropertyBrowsing, + IPropertyPageSite,IPropertyPage,IPropertyPage2,IFont,IFontDisp, + IPicture,IPictureDisp): Here, as per documentation. + + 2003-05-12 Mattia Barbon <mb...@ds...> + + * include/oleauto.h (VarR8FromDec, VarDecFromR8): Add prototypes. + * include/winbase.h (TerminateJobObject, + AssignProcessToJobObject): Likewise. + * include/servprov.h: New header. + * lib/test.c: Include servprov.h. + + 2003-05-10 Danny Smith <dan...@us...> + + * include/shlguid.h (CGID_ShellServiceObject): Declare. + * lib/uuid.c (CGID_ShellServiceObject): Define guid. + Thanks to Chris Sutcliffe <ir0nh34d#users.sourceforge.net> + * include/winuser.h (SetLayeredWindowAttributes): Add prototype. + * lib/user32.def (SetLayeredWindowAttributes): Add stub. + * lib/uuid.c (CGID_Explorer, CGID_ShellDocView): Define guids. + + 2003-05-05 Danny Smith <dan...@us...> + + * include/commctrl.h (STATUSCLASSNAME, TOOLBARCLASSNAME, + TOOLTIPS_CLASS, TRACKBAR_CLASS, UPDOWN_CLASS, PROGRESS_CLASS, + HOTKEY_CLASS): Remove dupicate defines for UNICODE case. + + 2003-05-02 Steven Edwards <Ste...@ya...> + + * include/richedit.h (EM_FINDTEXTEXW, EM_FINDTEXTW, + EM_GETAUTOURLDETECT, EM_GETBIDIOPTIONS, EM_GETEDITSTYLE, + EM_GETIMECOLOR, EM_GETIMEOPTIONS, EM_GETPUNCTUATION, + EM_GETWORDWRAPMODE, EM_RECONVERSION, EM_SETBIDIOPTIONS, + EM_SETEDITSTYLE, EM_SETIMECOLOR, EM_SETIMEOPTIONS, + EM_SETPALETTE, EM_SETPUNCTUATION, EM_SETTEXTEX, + EM_SETWORDWRAPMODE, RICHEDIT_CLASS10A): Add defines. + + 2003-05-02 Francois Ferrand <ty...@so...> + + * include/commctrl.h (TBM_*): Add missing trackbar defines. + + 2003-05-02 Danny Smith <dan...@us...> + + * include/cplext.h (CPLPAGE_MOUSE_WHEEL, + CPLPAGE_DISPLAY_BACKGROUND): Add defines. + + 2003-04-30 Danny Smith <dan...@us...> + + * include/wingdi.h (DC_PEN, DC_BRUSH): Add defines. + (SetDCPenColor, SetDCBrushColor): Add prototypes. + * lib/gdi32.def (SetDCPenColor, SetDCBrushColor): Add stubs. + + 2003-04-26 Bang Jun-Young <jun...@ne...> + + * include/winioctl.h (DEVICE_TYPE_FROM_CTL_CODE): Add macro. + + 2003-04-26 Danny Smith <dan...@us...> + + * include/oaidl.h (ITypeMarshal): Add interface. + + 2003-04-26 Danny Smith <dan...@us...> + + * include/winioctl.h: Clean up formatting. + (RETRIEVAL_POINTERS_BUFFER): Add fields to Extents[1] struct. + (CREATE_DISK): Add _ANONYMOUS_UNION macro. + (DISK_CACHE_INFORMATION): Likewise. + (DISK_DETECTION_INFO): Likewise. + (DISK_PARTITION_INFO): Likewise. + (PARTITION_INFORMATION_EX): Likewise. + (DRIVE_LAYOUT_INFORMATION_EX): Likewise. + + 2003-04-26 Casper S. Hornstrup <ch...@us...> + + * include/winbase.h (DeleteVolumeMountPoint[AW], + FindFirstVolumeMountPoint[AW], FindNextVolumeMountPoint[AW], + FindVolumeMountPointClose, GetVolumeNameForVolumeMountPoint[AW], + GetVolumePathName[AW], GetVolumePathNamesForVolumeName[AW], + SetVolumeMountPoint[AW]): Add prototypes. + * include/winioctl.h (IOCTL_DISK_GET_PARTITION_INFO_EX, + IOCTL_DISK_SET_PARTITION_INFO_EX, + IOCTL_DISK_GET_DRIVE_LAYOUT_EX, + IOCTL_DISK_SET_DRIVE_LAYOUT_EX, IOCTL_DISK_CREATE_DISK, + IOCTL_DISK_GET_LENGTH_INFO, IOCTL_DISK_PERFORMANCE_OFF, + IOCTL_DISK_GET_DRIVE_GEOMETRY_EX, IOCTL_DISK_GROW_PARTITION, + IOCTL_DISK_GET_CACHE_INFORMATION, + IOCTL_DISK_SET_CACHE_INFORMATION, + IOCTL_DISK_DELETE_DRIVE_LAYOUT, IOCTL_DISK_UPDATE_PROPERTIES, + FSCTL_GET_VOLUME_BITMAP, FSCTL_GET_RETRIEVAL_POINTERS, + FSCTL_MOVE_FILE): Define. + (CREATE_DISK_GPT, CREATE_DISK_MBR, CREATE_DISK, + DISK_CACHE_INFORMATION, + DETECTION_TYPE, DISK_INT13_INFO, DISK_EX_INT13_INFO, + DISK_DETECTION_INFO, DISK_GEOMETRY_EX, DISK_GROW_PARTITION, + DISK_PARTITION_INFO, DISKQUOTA_USER_INFORMATION, + GET_LENGTH_INFORMATION, DISK_EXTENT, VOLUME_DISK_EXTENTS, + DRIVE_LAYOUT_INFORMATION_GPT, DRIVE_LAYOUT_INFORMATION_MBR, + PARTITION_INFORMATION_MBR, PARTITION_INFORMATION_GPT, + PARTITION_INFORMATION_EX, DRIVE_LAYOUT_INFORMATION_EX, + MOVE_FILE_DATA, + RETRIEVAL_POINTERS_BUFFER, STARTING_LCN_INPUT_BUFFER, + STARTING_VCN_INPUT_BUFFER, VOLUME_BITMAP_BUFFER): Add structs. + (PARTITION_STYLE, DISK_CACHE_RETENTION_PRIORITY): Add enums. + (MEDIA_TYPE): Add F3_120M_512, F3_640_512, F5_640_512, + F5_720_512, F3_1Pt2_512, F3_1Pt23_1024, F5_1Pt23_1024, + F3_128Mb_512, F3_230Mb_512, F8_256_128, F3_200Mb_512, + F3_240M_512, and F3_32M_512. + * lib/kernel32.def (GetVolumePathNamesForVolumeName[AW]): Add + stubs. + + 2003-04-16 Earnie Boyd <ea...@us...> + + * include/wingdi.h (DM_SPECVERSION): Define. + Thanks to Sinitsyn Valentime <val...@us...> + * include/rpcdce.h (UuidCreateSequential): Properly guard with + appropriate _WIN32_WINNT values. + + 2003-04-15 Chris January <ch...@at...> + + * include/rpcdce.h: Add declaration for UuidCreateSequential. + * lib/rpcrt4.def: Add entry for UuidCreateSequential. + + 2003-04-14 Phil Krylov <lik...@us...> + + * include/winuser.h (VK_*): Add missing defines. + + 2003-04-14 Vincent Béron <pap...@us...> + + * include/commctrl.h (NMUPDOWN, LPNMUPDOWN): Use currently + documented typedefs for struct _NM_UPDOWN. + Add defines for backward comapatibility. + * include/commdlg.h (OFN_ENABLESIZING): Add define. + * include/wininet.h (IRF_*): Add missing defines. + + 2003-04-14 Bang Jun-Young <jun...@ne...> + + * lib/ntdll.def (Csr*, Dbg*, Ki*, Ldr*, Rtl*): Add W2K exports. + + 2003-04-11 Earnie Boyd <ea...@us...> + + * include/sspi.h: Add comment for FreeCredentialsHandle. + + 2003-04-07 Marcel Telka <te...@us...> + + * include/ddk/winddk.h (KIRQL): Typedef as UCHAR, not ULONG. + + 2003-03-30 Hans E. Molin <kv...@us...> + + * include/olectl.h (OleLoadPicturePath): Correct prototype. + + 2003-03-30 Danny Smith <dan...@us...> + + * lib/uuid.c (IID_IHTML*): Move definitions to... + * lib/mshtml-uuid.c: New file. + * lib/Makefile.in: Add mshtml-uuid.o to libuuid.a + + 2003-03-30 Michael Sazonov <tr...@co...> + + * lib/uuid.c (IID_IHTML*): Add new GUID definitions. + * include/mshtml.h (IHTMLElementCollection, IHTMLLinkElement, + IHTMLImgElement): Add interface definitions. + + 2003-03-29 Danny Smith <dan...@us...> + + * include/commctrl.h (ANIMATE_CLASS,HOTKEY_CLASS,PROGRESS_CLASS, + STATUSCLASSNAME,TOOLBARCLASSNAME,TOOLTIPS_CLASS,TRACKBAR_CLASS, + UPDOWN_CLASS,WC_COMBOBOXEX,WC_HEADER,WC_IPADDRESS,WC_LISTVIEW, + WC_TABCONTROL,WC_TREEVIEW): Move UNICODE mappings out of + RC_INVOKED guard. + (WC_PAGESCROLLER,WC_NATIVEFONTCTL,WC_BUTTON,WC_STATIC,WC_EDIT, + WC_LISTBOX,WC_COMBOBOX,WC_SCROLLBAR): Add defines. + + 2003-03-28 Bang Jun-Young <jun...@ne...> + + * include/winnt.h (WAITORTIMERCALLBACKFUNC): Add typedef. + + 2003-03-27 Danny Smith <dan...@us...> + + * include/secext.h (GetComputerObjectName[AW],GetUserNameEx[AW], + TranslateName[AW]): Add prototypes. + * lib/sec32.def (GetComputerObjectName[AW],GetUserNameEx[AW], + TranslateName[AW]): Add stubs. + * lib/test.c: Include secext.h. + + 2003-03-27 Vladimir Michl <mi...@us...> + + * include/ddk/ndis.h (NdisAllocateSpinLock,NdisFreeSpinLock, + NdisAcquireSpinLock,NdisReleaseSpinLock,NdisDprAcquireSpinLock, + NdisDprReleaseSpinLock): Change macro argument from SpinLock to + _SpinLock. + + 2003-03-26 Earnie Boyd <ea...@us...> + + * include/w32api.h: Increment version to 2.4. + * Makefile.in: Ditto. + 2003-03-26 Danny Smith <dan...@us...> Index: Makefile.in =================================================================== RCS file: /cvsroot/mingw/w32api/Makefile.in,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** Makefile.in 11 Mar 2003 15:26:46 -0000 1.15 --- Makefile.in 12 Sep 2003 13:26:50 -0000 1.16 *************** *** 67,71 **** PACKAGE = w32api ! VERSION = 2.3 CYGRELEASE = 1 --- 67,71 ---- PACKAGE = w32api ! VERSION = 2.4 CYGRELEASE = 1 Index: config.guess =================================================================== RCS file: /cvsroot/mingw/w32api/config.guess,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** config.guess 30 Aug 2001 04:23:00 -0000 1.3 --- config.guess 12 Sep 2003 13:26:50 -0000 1.4 *************** *** 1,8 **** #! /bin/sh # Attempt to guess a canonical system name. ! # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 ! # Free Software Foundation, Inc. ! timestamp='2001-06-12' # This file is free software; you can redistribute it and/or modify it --- 1,8 ---- #! /bin/sh [...1250 lines suppressed...] --- 1214,1218 ---- #echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2 + eval $set_cc_for_build cat >$dummy.c <<EOF #ifdef _SEQUENT_ *************** *** 1283,1288 **** EOF ! $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy && rm -f $dummy.c $dummy && exit 0 ! rm -f $dummy.c $dummy # Apollos put the system type in the environment. --- 1329,1333 ---- EOF ! $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0 # Apollos put the system type in the environment. Index: config.sub =================================================================== RCS file: /cvsroot/mingw/w32api/config.sub,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** config.sub 30 Aug 2001 04:23:00 -0000 1.3 --- config.sub 12 Sep 2003 13:26:50 -0000 1.4 *************** *** 1,8 **** #! /bin/sh # Configuration validation subroutine script. ! # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 ! # Free Software Foundation, Inc. ! timestamp='2001-06-08' # This file is (in principle) common to ALL GNU software. --- 1,8 ---- #! /bin/sh # Configuration validation subroutine script. ! # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, ! # 2000, 2001, 2002, 2003 Free Software Foundation, Inc. ! timestamp='2003-06-17' # This file is (in principle) common to ALL GNU software. *************** *** 30,34 **** # the same distribution terms that you use for the rest of that program. ! # Please send patches to <con...@gn...>. # # Configuration subroutine to validate and canonicalize a configuration type. --- 30,35 ---- # the same distribution terms that you use for the rest of that program. ! # Please send patches to <con...@gn...>. Submit a context ! # diff and a properly formatted ChangeLog entry. # # Configuration subroutine to validate and canonicalize a configuration type. *************** *** 118,122 **** maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` case $maybe_os in ! nto-qnx* | linux-gnu* | storm-chaos* | os2-emx* | windows32-*) os=-$maybe_os basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` --- 119,123 ---- maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` case $maybe_os in ! nto-qnx* | linux-gnu* | freebsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*) os=-$maybe_os basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` *************** *** 224,247 **** # Recognize the basic CPU types without company name. # Some are omitted here because they have special meanings below. ! tahoe | i860 | ia64 | m32r | m68k | m68000 | m88k | ns32k | arc \ ! | arm | arme[lb] | arm[bl]e | armv[2345] | armv[345][lb] | strongarm | xscale \ ! | pyramid | mn10200 | mn10300 | tron | a29k \ ! | 580 | i960 | h8300 \ ! | x86 | ppcbe | mipsbe | mipsle | shbe | shle \ ! | hppa | hppa1.0 | hppa1.1 | hppa2.0 | hppa2.0w | hppa2.0n \ ! | hppa64 \ ! | alpha | alphaev[4-8] | alphaev56 | alphapca5[67] \ ! | alphaev6[78] \ ! | we32k | ns16k | clipper | i370 | sh | sh[34] \ ! | powerpc | powerpcle \ ! | 1750a | dsp16xx | pdp10 | pdp11 \ ! | mips16 | mips64 | mipsel | mips64el \ ! | mips64orion | mips64orionel | mipstx39 | mipstx39el \ ! | mips64vr4300 | mips64vr4300el | mips64vr4100 | mips64vr4100el \ ! | mips64vr5000 | miprs64vr5000el | mcore | s390 | s390x \ ! | sparc | sparclet | sparclite | sparc64 | sparcv9 | sparcv9b \ ! | v850 | c4x \ ! | thumb | d10v | d30v | fr30 | avr | openrisc | tic80 \ ! | pj | pjl | h8500 | z8k) basic_machine=$basic_machine-unknown ;; --- 225,270 ---- # Recognize the basic CPU types without company name. # Some are omitted here because they have special meanings below. ! 1750a | 580 \ ! | a29k \ ! | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ ! | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ ! | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \ ! | c4x | clipper \ ! | d10v | d30v | dlx | dsp16xx \ ! | fr30 | frv \ ! | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ ! | i370 | i860 | i960 | ia64 \ ! | ip2k \ ! | m32r | m68000 | m68k | m88k | mcore \ ! | mips | mipsbe | mipseb | mipsel | mipsle \ ! | mips16 \ ! | mips64 | mips64el \ ! | mips64vr | mips64vrel \ ! | mips64orion | mips64orionel \ ! | mips64vr4100 | mips64vr4100el \ ! | mips64vr4300 | mips64vr4300el \ ! | mips64vr5000 | mips64vr5000el \ ! | mipsisa32 | mipsisa32el \ ! | mipsisa32r2 | mipsisa32r2el \ ! | mipsisa64 | mipsisa64el \ ! | mipsisa64sb1 | mipsisa64sb1el \ ! | mipsisa64sr71k | mipsisa64sr71kel \ ! | mipstx39 | mipstx39el \ ! | mn10200 | mn10300 \ ! | msp430 \ ! | ns16k | ns32k \ ! | openrisc | or32 \ ! | pdp10 | pdp11 | pj | pjl \ ! | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ ! | pyramid \ ! | sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \ ! | sh64 | sh64le \ ! | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \ ! | strongarm \ ! | tahoe | thumb | tic4x | tic80 | tron \ ! | v850 | v850e \ ! | we32k \ ! | x86 | xscale | xstormy16 | xtensa \ ! | z8k) basic_machine=$basic_machine-unknown ;; *************** *** 266,294 **** ;; # Recognize the basic CPU types with company name. ! # FIXME: clean up the formatting here. ! vax-* | tahoe-* | i*86-* | i860-* | ia64-* | m32r-* | m68k-* | m68000-* \ ! | m88k-* | sparc-* | ns32k-* | fx80-* | arc-* | c[123]* \ ! | arm-* | armbe-* | armle-* | armv*-* | strongarm-* | xscale-* \ ! | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \ ! | power-* | none-* | 580-* | cray2-* | h8300-* | h8500-* | i960-* \ ! | xmp-* | ymp-* \ ! | x86-* | ppcbe-* | mipsbe-* | mipsle-* | shbe-* | shle-* \ ! | hppa-* | hppa1.0-* | hppa1.1-* | hppa2.0-* | hppa2.0w-* \ ! | hppa2.0n-* | hppa64-* \ ! | alpha-* | alphaev[4-8]-* | alphaev56-* | alphapca5[67]-* \ ! | alphaev6[78]-* \ ! | we32k-* | cydra-* | ns16k-* | pn-* | np1-* | xps100-* \ ! | clipper-* | orion-* \ ! | sparclite-* | pdp10-* | pdp11-* | sh-* | sh[34]-* | sh[34]eb-* \ ! | powerpc-* | powerpcle-* | sparc64-* | sparcv9-* | sparcv9b-* | sparc86x-* \ ! | mips16-* | mips64-* | mipsel-* \ ! | mips64el-* | mips64orion-* | mips64orionel-* \ ! | mips64vr4100-* | mips64vr4100el-* | mips64vr4300-* | mips64vr4300el-* \ ! | mipstx39-* | mipstx39el-* | mcore-* \ ! | f30[01]-* | f700-* | s390-* | s390x-* | sv1-* | t3e-* \ ! | [cjt]90-* \ ! | m88110-* | m680[01234]0-* | m683?2-* | m68360-* | z8k-* | d10v-* \ ! | thumb-* | v850-* | d30v-* | tic30-* | tic80-* | c30-* | fr30-* \ ! | bs2000-* | tic54x-* | c54x-* | x86_64-* | pj-* | pjl-*) ;; # Recognize the various machine names and aliases which stand --- 289,346 ---- ;; # Recognize the basic CPU types with company name. ! 580-* \ ! | a29k-* \ ! | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ ! | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ ! | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ ! | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ ! | avr-* \ ! | bs2000-* \ ! | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ ! | clipper-* | cydra-* \ ! | d10v-* | d30v-* | dlx-* \ ! | elxsi-* \ ! | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \ ! | h8300-* | h8500-* \ ! | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ ! | i*86-* | i860-* | i960-* | ia64-* \ ! | ip2k-* \ ! | m32r-* \ ! | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ ! | m88110-* | m88k-* | mcore-* \ ! | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ ! | mips16-* \ ! | mips64-* | mips64el-* \ ! | mips64vr-* | mips64vrel-* \ ! | mips64orion-* | mips64orionel-* \ ! | mips64vr4100-* | mips64vr4100el-* \ ! | mips64vr4300-* | mips64vr4300el-* \ ! | mips64vr5000-* | mips64vr5000el-* \ ! | mipsisa32-* | mipsisa32el-* \ ! | mipsisa32r2-* | mipsisa32r2el-* \ ! | mipsisa64-* | mipsisa64el-* \ ! | mipsisa64sb1-* | mipsisa64sb1el-* \ ! | mipsisa64sr71k-* | mipsisa64sr71kel-* \ ! | mipstx39-* | mipstx39el-* \ ! | msp430-* \ ! | none-* | np1-* | nv1-* | ns16k-* | ns32k-* \ ! | orion-* \ ! | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ ! | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ ! | pyramid-* \ ! | romp-* | rs6000-* \ ! | sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \ ! | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ ! | sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \ ! | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \ ! | tahoe-* | thumb-* \ ! | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ ! | tron-* \ ! | v850-* | v850e-* | vax-* \ ! | we32k-* \ ! | x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \ ! | xtensa-* \ ! | ymp-* \ ! | z8k-*) ;; # Recognize the various machine names and aliases which stand *************** *** 322,325 **** --- 374,380 ---- os=-bsd ;; + amd64) + basic_machine=x86_64-pc + ;; amdahl) basic_machine=580-amdahl *************** *** 353,356 **** --- 408,415 ---- os=-dynix ;; + c90) + basic_machine=c90-cray + os=-unicos + ;; convex-c1) basic_machine=c1-convex *************** *** 373,386 **** os=-bsd ;; ! cray | ymp) ! basic_machine=ymp-cray ! os=-unicos ! ;; ! cray2) ! basic_machine=cray2-cray ! os=-unicos ! ;; ! [cjt]90) ! basic_machine=${basic_machine}-cray os=-unicos ;; --- 432,437 ---- os=-bsd ;; ! cray | j90) ! basic_machine=j90-cray os=-unicos ;; *************** *** 391,398 **** basic_machine=cris-axis ;; - cygwin*) - basic_machine=i386-pc - os=-cygwin - ;; da30 | da30-*) basic_machine=m68k-da30 --- 442,445 ---- *************** *** 401,404 **** --- 448,459 ---- basic_machine=mips-dec ;; + decsystem10* | dec10*) + basic_machine=pdp10-dec + os=-tops10 + ;; + decsystem20* | dec20*) + basic_machine=pdp10-dec + os=-tops20 + ;; delta | 3300 | motorola-3300 | motorola-delta \ | 3300-motorola | delta-motorola) *************** *** 581,592 **** os=-mint ;; - mipsel*-linux*) - basic_machine=mipsel-unknown - os=-linux-gnu - ;; - mips*-linux*) - basic_machine=mips-unknown - os=-linux-gnu - ;; mips3*-*) basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'` --- 636,639 ---- *************** *** 603,614 **** os=-coff ;; msdos) basic_machine=i386-pc os=-msdos ;; - msys) - basic_machine=i386-pc - os=-msys - ;; mvs) basic_machine=i370-ibm --- 650,661 ---- os=-coff ;; + morphos) + basic_machine=powerpc-unknown + os=-morphos + ;; msdos) basic_machine=i386-pc os=-msdos ;; mvs) basic_machine=i370-ibm *************** *** 679,682 **** --- 726,733 ---- basic_machine=np1-gould ;; + nv1) + basic_machine=nv1-cray + os=-unicosmp + ;; nsr-tandem) basic_machine=nsr-tandem *************** *** 686,689 **** --- 737,744 ---- os=-proelf ;; + or32 | or32-*) + basic_machine=or32-unknown + os=-coff + ;; OSE68000 | ose68000) basic_machine=m68000-ericsson *************** *** 708,724 **** basic_machine=m68k-tti ;; ! pc532 | pc532-*) basic_machine=ns32k-pc532 ;; ! pentium | p5 | k5 | k6 | nexgen) basic_machine=i586-pc ;; ! pentiumpro | p6 | 6x86 | athlon) basic_machine=i686-pc ;; ! pentiumii | pentium2) basic_machine=i686-pc ;; ! pentium-* | p5-* | k5-* | k6-* | nexgen-*) basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'` ;; --- 763,782 ---- basic_machine=m68k-tti ;; ! pc532 | pc532-*) basic_machine=ns32k-pc532 ;; ! pentium | p5 | k5 | k6 | nexgen | viac3) basic_machine=i586-pc ;; ! pentiumpro | p6 | 6x86 | athlon | athlon_*) basic_machine=i686-pc ;; ! pentiumii | pentium2 | pentiumiii | pentium3) basic_machine=i686-pc ;; ! pentium4) ! basic_machine=i786-pc ! ;; ! pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*) basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'` ;; *************** *** 726,732 **** basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` ;; ! pentiumii-* | pentium2-*) basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` ;; pn) basic_machine=pn-gould --- 784,793 ---- basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` ;; ! pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*) basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` ;; + pentium4-*) + basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; pn) basic_machine=pn-gould *************** *** 735,747 **** ;; ppc) basic_machine=powerpc-unknown ! ;; ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` ;; ppcle | powerpclittle | ppc-le | powerpc-little) basic_machine=powerpcle-unknown ! ;; ppcle-* | powerpclittle-*) basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'` ;; ps2) basic_machine=i386-ibm --- 796,818 ---- ;; ppc) basic_machine=powerpc-unknown ! ;; ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` ;; ppcle | powerpclittle | ppc-le | powerpc-little) basic_machine=powerpcle-unknown ! ;; ppcle-* | powerpclittle-*) basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'` ;; + ppc64) basic_machine=powerpc64-unknown + ;; + ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + ppc64le | powerpc64little | ppc64-le | powerpc64-little) + basic_machine=powerpc64le-unknown + ;; + ppc64le-* | powerpc64little-*) + basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; ps2) basic_machine=i386-ibm *************** *** 761,768 **** --- 832,855 ---- basic_machine=romp-ibm ;; + s390 | s390-*) + basic_machine=s390-ibm + ;; + s390x | s390x-*) + basic_machine=s390x-ibm + ;; sa29200) basic_machine=a29k-amd os=-udi ;; + sb1) + basic_machine=mipsisa64sb1-unknown + ;; + sb1el) + basic_machine=mipsisa64sb1el-unknown + ;; + sei) + basic_machine=mips-sei + os=-seiux + ;; sequent) basic_machine=i386-sequent *************** *** 772,776 **** os=-hms ;; ! sparclite-wrs) basic_machine=sparclite-wrs os=-vxworks --- 859,866 ---- os=-hms ;; ! sh64) ! basic_machine=sh64-unknown ! ;; ! sparclite-wrs | simso-wrs) basic_machine=sparclite-wrs os=-vxworks *************** *** 839,843 **** ;; t3e) ! basic_machine=t3e-cray os=-unicos ;; --- 929,937 ---- ;; t3e) ! basic_machine=alphaev5-cray ! os=-unicos ! ;; ! t90) ! basic_machine=t90-cray os=-unicos ;; *************** *** 846,849 **** --- 940,951 ---- os=-coff ;; + tic55x | c55x*) + basic_machine=tic55x-unknown + os=-coff + ;; + tic6x | c6x*) + basic_machine=tic6x-unknown + os=-coff + ;; tx39) basic_machine=mipstx39-unknown *************** *** 852,855 **** --- 954,961 ---- basic_machine=mipstx39el-unknown ;; + toad1) + basic_machine=pdp10-xkl + os=-tops20 + ;; tower | tower-32) basic_machine=m68k-ncr *************** *** 876,881 **** ;; vpp*|vx|vx-*) ! basic_machine=f301-fujitsu ! ;; vxworks960) basic_machine=i960-wrs --- 982,987 ---- ;; vpp*|vx|vx-*) ! basic_machine=f301-fujitsu ! ;; vxworks960) basic_machine=i960-wrs *************** *** 898,912 **** os=-proelf ;; ! windows32) ! basic_machine=i386-pc ! os=-windows32-msvcrt ;; ! xmp) ! basic_machine=xmp-cray os=-unicos ;; - xps | xps100) - basic_machine=xps100-honeywell - ;; z8k-*-coff) basic_machine=z8k-unknown --- 1004,1014 ---- os=-proelf ;; ! xps | xps100) ! basic_machine=xps100-honeywell ;; ! ymp) ! basic_machine=ymp-cray os=-unicos ;; z8k-*-coff) basic_machine=z8k-unknown *************** *** 929,939 **** basic_machine=hppa1.1-oki ;; - mips) - if [ x$os = x-linux-gnu ]; then - basic_machine=mips-unknown - else - basic_machine=mips-mips - fi - ;; romp) basic_machine=romp-ibm --- 1031,1034 ---- *************** *** 955,965 **** basic_machine=we32k-att ;; ! sh3 | sh4) basic_machine=sh-unknown ;; sparc | sparcv9 | sparcv9b) basic_machine=sparc-sun ;; ! cydra) basic_machine=cydra-cydrome ;; --- 1050,1063 ---- basic_machine=we32k-att ;; ! sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele) basic_machine=sh-unknown ;; + sh64) + basic_machine=sh64-unknown + ;; sparc | sparcv9 | sparcv9b) basic_machine=sparc-sun ;; ! cydra) basic_machine=cydra-cydrome ;; *************** *** 976,983 **** basic_machine=powerpc-apple ;; - c4x*) - basic_machine=c4x-none - os=-coff - ;; *-unknown) # Make sure to match an already-canonicalized machine name. --- 1074,1077 ---- *************** *** 1040,1048 **** | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ | -chorusos* | -chorusrdb* \ ! | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \ ! | -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ ! | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* | -os2*) # Remember, each alternative MUST END IN *, to match a version number. ;; --- 1134,1145 ---- | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ | -chorusos* | -chorusrdb* \ ! | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \ ! | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ ! | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ ! | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ ! | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ ! | -powermax* | -dnix* | -nx6 | -nx7 | -sei*) # Remember, each alternative MUST END IN *, to match a version number. ;; *************** *** 1056,1061 **** esac ;; -nto*) ! os=-nto-qnx ;; -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \ --- 1153,1160 ---- esac ;; + -nto-qnx*) + ;; -nto*) ! os=`echo $os | sed -e 's|nto|nto-qnx|'` ;; -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \ *************** *** 1096,1099 **** --- 1195,1201 ---- os=-aos ;; + -atheos*) + os=-atheos + ;; -386bsd) os=-bsd *************** *** 1102,1107 **** os=-sysv ;; -ns2 ) ! os=-nextstep2 ;; -nsk*) --- 1204,1212 ---- os=-sysv ;; + -nova*) + os=-rtmk-nova + ;; -ns2 ) ! os=-nextstep2 ;; -nsk*) *************** *** 1142,1147 **** os=-xenix ;; ! -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) ! os=-mint ;; -none) --- 1247,1258 ---- os=-xenix ;; ! -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) ! os=-mint ! ;; ! -aros*) ! os=-aros ! ;; ! -kaos*) ! os=-kaos ;; -none) *************** *** 1176,1183 **** os=-aout ;; pdp10-*) os=-tops20 ;; ! pdp11-*) os=-none ;; --- 1287,1298 ---- os=-aout ;; + c4x-* | tic4x-*) + os=-coff + ;; + # This must come before the *-dec entry. pdp10-*) os=-tops20 ;; ! pdp11-*) os=-none ;; *************** *** 1206,1209 **** --- 1321,1327 ---- os=-elf ;; + or32-*) + os=-coff + ;; *-tti) # must be before sparc entry or we get the wrong os. os=-sysv3 *************** *** 1269,1276 **** os=-nextstep3 ;; ! *-gould) os=-sysv ;; ! *-highlevel) os=-bsd ;; --- 1387,1394 ---- os=-nextstep3 ;; ! *-gould) os=-sysv ;; ! *-highlevel) os=-bsd ;; *************** *** 1278,1285 **** os=-bsd ;; ! *-sgi) os=-irix ;; ! *-siemens) os=-sysv4 ;; --- 1396,1403 ---- os=-bsd ;; ! *-sgi) os=-irix ;; ! *-siemens) os=-sysv4 ;; *************** *** 1353,1357 **** vendor=sequent ;; ! -vxsim* | -vxworks*) vendor=wrs ;; --- 1471,1475 ---- vendor=sequent ;; ! -vxsim* | -vxworks* | -windiss*) vendor=wrs ;; *************** *** 1367,1370 **** --- 1485,1491 ---- -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) vendor=atari + ;; + -vos*) + vendor=stratus ;; esac |
|
From: <ea...@us...> - 2003-09-12 13:26:56
|
Update of /cvsroot/mingw/w32api/include/GL In directory sc8-pr-cvs1:/tmp/cvs-serv17014/include/GL Modified Files: gl.h Log Message: Merge winsup changes Index: gl.h =================================================================== RCS file: /cvsroot/mingw/w32api/include/GL/gl.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** gl.h 9 Feb 2003 14:12:01 -0000 1.2 --- gl.h 12 Sep 2003 13:26:51 -0000 1.3 *************** *** 66,74 **** /* GLAPI, part 2 */ #if !defined(GLAPI) ! # if defined(_MSC_VER) // Microsoft Visual C++ # define GLAPI __declspec(dllimport) ! # elif defined(__LCC__) && defined(__WIN32__) // LCC-Win32 # define GLAPI __stdcall ! # else // Others (e.g. MinGW, Cygwin, non-win32) # define GLAPI extern # endif --- 66,74 ---- /* GLAPI, part 2 */ #if !defined(GLAPI) ! # if defined(_MSC_VER) /* Microsoft Visual C++ */ # define GLAPI __declspec(dllimport) ! # elif defined(__LCC__) && defined(__WIN32__) /* LCC-Win32 */ # define GLAPI __stdcall ! # else /* Others (e.g. MinGW, Cygwin, non-win32) */ # define GLAPI extern # endif |