summaryrefslogtreecommitdiffstats
path: root/winsup/w32api/include
diff options
context:
space:
mode:
authorDanny Smith <dannysmith@users.sourceforge.net>2003-05-12 10:35:35 +0000
committerDanny Smith <dannysmith@users.sourceforge.net>2003-05-12 10:35:35 +0000
commite9a398893fc98633bb3373126828343fdf42997a (patch)
treefde478576b817c7a07a61b30c60572c61cf1bfbe /winsup/w32api/include
parentcc95baad414526fd2764e92f445a1b3f1d3db2ab (diff)
downloadcygnal-e9a398893fc98633bb3373126828343fdf42997a.tar.gz
cygnal-e9a398893fc98633bb3373126828343fdf42997a.tar.bz2
cygnal-e9a398893fc98633bb3373126828343fdf42997a.zip
2003-05-12 Mattia Barbon <mbarbon@dsi.unive.it>
* include/oleauto.h (VarR8FromDec, VarDecFromR8): Add prototypes. * include/winbase.h (TerminateJobObject, AssignProcessToJobObject): Likewise. * include/servprov.h: New header. * lib/test.c: Include servprov.h. Correct ChangeLog typo
Diffstat (limited to 'winsup/w32api/include')
-rw-r--r--winsup/w32api/include/oleauto.h2
-rw-r--r--winsup/w32api/include/servprov.h26
-rw-r--r--winsup/w32api/include/winbase.h2
3 files changed, 30 insertions, 0 deletions
diff --git a/winsup/w32api/include/oleauto.h b/winsup/w32api/include/oleauto.h
index 3e881cdea..d28067c7a 100644
--- a/winsup/w32api/include/oleauto.h
+++ b/winsup/w32api/include/oleauto.h
@@ -190,6 +190,7 @@ WINOLEAUTAPI VarR8FromDate(DATE,double*);
WINOLEAUTAPI VarR8FromStr(OLECHAR*,LCID,unsigned long,double*);
WINOLEAUTAPI VarR8FromDisp(LPDISPATCH*,LCID,double*);
WINOLEAUTAPI VarR8FromBool(VARIANT_BOOL,double*);
+WINOLEAUTAPI VarR8FromDec(DECIMAL*,double*);
WINOLEAUTAPI VarDateFromUI1(unsigned char,DATE*);
WINOLEAUTAPI VarDateFromI2(short,DATE*);
WINOLEAUTAPI VarDateFromI4(long,DATE*);
@@ -226,6 +227,7 @@ WINOLEAUTAPI VarBoolFromDate(DATE,VARIANT_BOOL*);
WINOLEAUTAPI VarBoolFromCy(CY,VARIANT_BOOL*);
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*);
WINOLEAUTAPI LoadTypeLib(const OLECHAR*,LPTYPELIB*);
diff --git a/winsup/w32api/include/servprov.h b/winsup/w32api/include/servprov.h
new file mode 100644
index 000000000..b12e5d7a7
--- /dev/null
+++ b/winsup/w32api/include/servprov.h
@@ -0,0 +1,26 @@
+#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
diff --git a/winsup/w32api/include/winbase.h b/winsup/w32api/include/winbase.h
index 141c8f1b8..5b4b37080 100644
--- a/winsup/w32api/include/winbase.h
+++ b/winsup/w32api/include/winbase.h
@@ -1039,6 +1039,8 @@ HANDLE WINAPI CreateIoCompletionPort(HANDLE,HANDLE,DWORD,DWORD);
#if (_WIN32_WINNT >= 0x0500)
HANDLE WINAPI CreateJobObjectA(LPSECURITY_ATTRIBUTES,LPCSTR);
HANDLE WINAPI CreateJobObjectW(LPSECURITY_ATTRIBUTES,LPCWSTR);
+BOOL WINAPI TerminateJobObject(HANDLE,UINT);
+BOOL WINAPI AssignProcessToJobObject(HANDLE,HANDLE);
#endif
HANDLE WINAPI CreateMailslotA(LPCSTR,DWORD,DWORD,LPSECURITY_ATTRIBUTES);
HANDLE WINAPI CreateMailslotW(LPCWSTR,DWORD,DWORD,LPSECURITY_ATTRIBUTES);