2002-10-08 Heiko Gerdau <hg@technosis.de>

	* include/oleacc.h: New file.
	* include/winuser.h (ENDSESSION_LOGOFF) Add define.
	(OBJID_*) Add defines.
	* lib/uuid.c: Add DEFINE_GUID for IID_IAccessible.
	* lib/test.c: Include oleacc.h.

diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog
index 6fa3683e6472bd7cd7041c9a804740d49de1345c..c1ab6d14029d7d1d1406c4497f247e6ce13413d3 100644 (file)
--- a/winsup/w32api/ChangeLog
+++ b/winsup/w32api/ChangeLog
@@ -1,3 +1,11 @@
+2002-10-08  Heiko Gerdau  <hg@technosis.de>
+
+       * include/oleacc.h: New file.
+       * include/winuser.h (ENDSESSION_LOGOFF) Add define.
+       (OBJID_*) Add defines.
+       * lib/uuid.c: Add DEFINE_GUID for IID_IAccessible.
+       * lib/test.c: Include oleacc.h.
+
 2002-10-06  Casper Hornstrup  <chorns@it.dk>
 
        * include/ddk: New subdir.

diff --git a/winsup/w32api/include/oleacc.h b/winsup/w32api/include/oleacc.h
new file mode 100644 (file)
index 0000000..ac4e9b1
--- /dev/null
+++ b/winsup/w32api/include/oleacc.h
@@ -0,0 +1,76 @@
+#ifndef _OLEACC_H
+#define _OLEACC_H
+
+#define DISPID_ACC_PARENT                   (-5000)
+#define DISPID_ACC_CHILDCOUNT               (-5001)
+#define DISPID_ACC_CHILD                    (-5002)
+
+#define DISPID_ACC_NAME                     (-5003)
+#define DISPID_ACC_VALUE                    (-5004)
+#define DISPID_ACC_DESCRIPTION              (-5005)
+#define DISPID_ACC_ROLE                     (-5006)
+#define DISPID_ACC_STATE                    (-5007)
+#define DISPID_ACC_HELP                     (-5008)
+#define DISPID_ACC_HELPTOPIC                (-5009)
+#define DISPID_ACC_KEYBOARDSHORTCUT         (-5010)
+#define DISPID_ACC_FOCUS                    (-5011)
+#define DISPID_ACC_SELECTION                (-5012)
+#define DISPID_ACC_DEFAULTACTION            (-5013)
+
+#define DISPID_ACC_SELECT                   (-5014)
+#define DISPID_ACC_LOCATION                 (-5015)
+#define DISPID_ACC_NAVIGATE                 (-5016)
+#define DISPID_ACC_HITTEST                  (-5017)
+#define DISPID_ACC_DODEFAULTACTION          (-5018)
+
+#define SELFLAG_NONE                    0x00000000
+#define SELFLAG_TAKEFOCUS               0x00000001
+#define SELFLAG_TAKESELECTION           0x00000002
+#define SELFLAG_EXTENDSELECTION         0x00000004
+#define SELFLAG_ADDSELECTION            0x00000008
+#define SELFLAG_REMOVESELECTION         0x00000010
+#define SELFLAG_VALID                   0x0000001F
+
+/* DEFINE_GUID(LIBID_Accessibility, 0x1ea4dbf0, 0x3c3b,0x11cf, 0x81, 0x0c, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71); */
+/* DEFINE_GUID(IID_IAccessible,     0x618736e0, 0x3c3d,0x11cf, 0x81, 0x0c, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71); */
+EXTERN_C const IID IID_IAccessible;
+#undef INTERFACE
+#define INTERFACE IAccessible
+DECLARE_INTERFACE_(IAccessible, 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(get_accParent)(THIS_ IDispatch**) PURE;
+    STDMETHOD(get_accChildCount)(THIS_ long*) PURE;
+    STDMETHOD(get_accChild)(THIS_ VARIANT, IDispatch **) PURE;
+    STDMETHOD(get_accName)(THIS_ VARIANT, BSTR*) PURE;
+    STDMETHOD(get_accValue)(THIS_ VARIANT, BSTR*) PURE;
+    STDMETHOD(get_accDescription)(THIS_ VARIANT, BSTR*) PURE;
+    STDMETHOD(get_accRole)(THIS_ VARIANT, VARIANT*) PURE;
+    STDMETHOD(get_accState)(THIS_ VARIANT, VARIANT*) PURE;
+    STDMETHOD(get_accHelp)(THIS_ VARIANT, BSTR*) PURE;
+    STDMETHOD(get_accHelpTopic)(THIS_ BSTR*, VARIANT, long*) PURE;
+    STDMETHOD(get_accKeyboardShortcut)(THIS_ VARIANT, BSTR*) PURE;
+    STDMETHOD(get_accFocus)(THIS_ VARIANT*) PURE;
+    STDMETHOD(get_accSelection)(THIS_ VARIANT*) PURE;
+    STDMETHOD(get_accDefaultAction)(THIS_ VARIANT, BSTR*) PURE;
+
+    STDMETHOD(accSelect)(THIS_ long, VARIANT) PURE;
+    STDMETHOD(accLocation)(THIS_ long*, long*, long*, long*, VARIANT) PURE;
+    STDMETHOD(accNavigate)(THIS_ long, VARIANT, VARIANT*) PURE;
+    STDMETHOD(accHitTest)(THIS_ long, long, VARIANT*) PURE;
+    STDMETHOD(accDoDefaultAction)(THIS_ VARIANT) PURE;
+
+    STDMETHOD(put_accName)(THIS_ VARIANT, BSTR) PURE;
+    STDMETHOD(put_accValue)(THIS_ VARIANT, BSTR) PURE;
+};
+typedef IAccessible* LPACCESSIBLE;
+
+
+#endif /* _OLEACC_H */

diff --git a/winsup/w32api/include/winuser.h b/winsup/w32api/include/winuser.h
index fa5815bb075c88dca18c432fff2fc2baf123ac6e..fff8388204a3ceb1fe1e5c2e39cbb57931df4ab4 100644 (file)
--- a/winsup/w32api/include/winuser.h
+++ b/winsup/w32api/include/winuser.h
@@ -1920,6 +1920,21 @@ extern "C" {
 #define INPUT_KEYBOARD 1
 #define INPUT_HARDWARE 2
 #define CURSOR_SHOWING 0x00000001
+#if(WINVER >= 0x0400)
+#define ENDSESSION_LOGOFF    0x80000000
+#endif /* WINVER >= 0x0400 */
+#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
 
 #ifndef RC_INVOKED
 typedef BOOL(CALLBACK *DLGPROC)(HWND,UINT,WPARAM,LPARAM);

diff --git a/winsup/w32api/lib/test.c b/winsup/w32api/lib/test.c
index a40a8cd7ff6187fcad16a38b605d659bfc19c7a6..271b19d8a392b85f140f2b69ba244fb03d2e28dc 100644 (file)
--- a/winsup/w32api/lib/test.c
+++ b/winsup/w32api/lib/test.c
@@ -76,6 +76,7 @@
 #include <intshcut.h>
 #include <ocidl.h>
 #include <ole2ver.h>
+#include <oleacc.h>
 #include <olectl.h>
 #include <oledlg.h>
 #include <docobj.h>

diff --git a/winsup/w32api/lib/uuid.c b/winsup/w32api/lib/uuid.c
index ea634f1d223f8835e85b3b137e7c767c7bb4e348..976bf43d60a926421ac85eccda0b44d37321e65d 100644 (file)
--- a/winsup/w32api/lib/uuid.c
+++ b/winsup/w32api/lib/uuid.c
@@ -97,6 +97,7 @@ DEFINE_GUID(GUID_YPOS,0x66504307,0xbe0f,0x101a,0x8b,0xbb,0,0xaa,0,0x30,0xc,0xab)
 DEFINE_GUID(GUID_YPOSPIXEL,0x66504303,0xbe0f,0x101a,0x8b,0xbb,0,0xaa,0,0x30,0xc,0xab);
 DEFINE_GUID(GUID_YSIZE,0x66504309,0xbe0f,0x101a,0x8b,0xbb,0,0xaa,0,0x30,0xc,0xab);
 DEFINE_GUID(GUID_YSIZEPIXEL,0x66504305,0xbe0f,0x101a,0x8b,0xbb,0,0xaa,0,0x30,0xc,0xab);
+DEFINE_GUID(IID_IAccessible,0x618736e0,0x3c3d,0x11cf,0x81,0x0c,0x00,0xaa,0x00,0x38,0x9b,0x71);
 DEFINE_GUID(IID_IActiveScript,0xbb1a2ae1,0xa4f9,0x11cf,0x8f,0x20,0,0x80,0x5f,0x2c,0xd0,0x64);
 DEFINE_GUID(IID_IActiveScriptError,0xeae1ba61,0xa4ed,0x11cf,0x8f,0x20,0,0x80,0x5f,0x2c,0xd0,0x64);
 DEFINE_GUID(IID_IActiveScriptParse,0xbb1a2ae2,0xa4f9,0x11cf,0x8f,0x20,0,0x80,0x5f,0x2c,0xd0,0x64);