Menu
▾
▴
[MinGW-cvs] CVS: w32api/include commctrl.h,1.6,1.7 ntsecapi.h,1.1.1.1,1.2 objbase.h,1.4,1.5 rapi.h,1.1.1.1,1.2 rpc.h,1.1.1.1,1.2 rpcdce.h,1.1.1.1,1.2 rpcdcep.h,1.2,1.3 rpcndr.h,1.1.1.1,1.2 rpcnsip.h,1.1.1.1,1.2 rpcproxy.h,1.3,1.4 windef.h,1.2,1.3 wingdi.h,1.5,1.6 winnt.h,1.19,1.20 winsvc.h,1.1.1.1,1.2
|
From: Earnie B. <ea...@us...> - 2002-01-25 00:59:20
|
Update of /cvsroot/mingw/w32api/include
In directory usw-pr-cvs1:/tmp/cvs-serv29011/include
Modified Files:
commctrl.h ntsecapi.h objbase.h rapi.h rpc.h rpcdce.h
rpcdcep.h rpcndr.h rpcnsip.h rpcproxy.h windef.h wingdi.h
winnt.h winsvc.h
Log Message:
Merge Cygwin differences
Index: commctrl.h
===================================================================
RCS file: /cvsroot/mingw/w32api/include/commctrl.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** commctrl.h 2001/12/11 20:38:04 1.6
--- commctrl.h 2002/01/25 00:59:16 1.7
***************
*** 195,198 ****
--- 195,199 ----
#if (_WIN32_IE >= 0x0300)
#define HDM_GETITEMRECT (HDM_FIRST+7)
+ #define HDM_GETORDERARRAY (HDM_FIRST+17)
#define HDM_SETORDERARRAY (HDM_FIRST+18)
#endif
***************
*** 222,225 ****
--- 223,230 ----
#define HDN_TRACKA (HDN_FIRST-8)
#define HDN_TRACKW (HDN_FIRST-28)
+ #if _WIN32_IE >= 0x0300
+ #define HDN_ENDDRAG (HDN_FIRST-11)
+ #define HDN_BEGINDRAG (HDN_FIRST-10)
+ #endif
#define CMB_MASKED 2
#define TBSTATE_CHECKED 1
***************
*** 591,594 ****
--- 596,601 ----
#define LVS_EX_TRACKSELECT 8
#define LVS_EX_TWOCLICKACTIVATE 128
+ #define LVSICF_NOINVALIDATEALL 0x00000001
+ #define LVSICF_NOSCROLL 0x00000002
#if( _WIN32_IE >= 0x0400 )
#define LVS_EX_FLATSB 0x00000100
***************
*** 1306,1310 ****
} IMAGEINFO;
DECLARE_HANDLE(HIMAGELIST);
! typedef struct _HD_ITEMA {
UINT mask;
int cxy;
--- 1313,1317 ----
} IMAGEINFO;
DECLARE_HANDLE(HIMAGELIST);
! typedef struct _HDITEMA {
UINT mask;
int cxy;
***************
*** 1322,1327 ****
LPVOID pvFilter;
#endif
! } HD_ITEMA;
! typedef struct _HD_ITEMW {
UINT mask;
int cxy;
--- 1329,1334 ----
LPVOID pvFilter;
#endif
! } HDITEMA, * LPHDITEMA;
! typedef struct _HDITEMW {
UINT mask;
int cxy;
***************
*** 1339,1347 ****
LPVOID pvFilter;
#endif
! } HD_ITEMW;
typedef struct _HD_LAYOUT {
RECT *prc;
WINDOWPOS *pwpos;
! } HD_LAYOUT;
typedef struct _HD_HITTESTINFO {
POINT pt;
--- 1346,1359 ----
LPVOID pvFilter;
#endif
! } HDITEMW, * LPHDITEMW;
! /* for backward compatability */
! #define HD_ITEMA HDITEMA
! #define HD_ITEMW HDITEMW
! #define HD_ITEM HDITEM
typedef struct _HD_LAYOUT {
RECT *prc;
WINDOWPOS *pwpos;
! } HDLAYOUT, *LPHDLAYOUT;
! #define HD_LAYOUT HDLAYOUT /* backward compatability */
typedef struct _HD_HITTESTINFO {
POINT pt;
***************
*** 1595,1599 ****
#define LV_COLUMNW LVCOLUMNW
typedef int(CALLBACK *PFNLVCOMPARE)(LPARAM,LPARAM,LPARAM);
! typedef struct _NM_LISTVIEW {
NMHDR hdr;
int iItem;
--- 1607,1611 ----
#define LV_COLUMNW LVCOLUMNW
typedef int(CALLBACK *PFNLVCOMPARE)(LPARAM,LPARAM,LPARAM);
! typedef struct tagNMLISTVIEW {
NMHDR hdr;
int iItem;
***************
*** 1604,1608 ****
POINT ptAction;
LPARAM lParam;
! } NM_LISTVIEW,*LPNM_LISTVIEW;
typedef struct tagNMLVDISPINFOA {
NMHDR hdr;
--- 1616,1624 ----
POINT ptAction;
LPARAM lParam;
! } NMLISTVIEW, *LPNMLISTVIEW;
! /* for backward compatability */
! #define _NM_LISTVIEW tagNMLISTVIEW
! #define NM_LISTVIEW NMLISTVIEW
! #define LPNM_LISTVIEW LPNMLISTVIEW
typedef struct tagNMLVDISPINFOA {
NMHDR hdr;
***************
*** 1930,1934 ****
DWORD dwRop;
} IMAGELISTDRAWPARAMS,*LPIMAGELISTDRAWPARAMS;
! #elif (_WIN32_IE >= 0x0400)
typedef struct tagNMREBARCHILDSIZE {
NMHDR hdr;
--- 1946,1951 ----
DWORD dwRop;
} IMAGELISTDRAWPARAMS,*LPIMAGELISTDRAWPARAMS;
! #endif /* (_WIN32_IE >= 0x0300) */
! #if (_WIN32_IE >= 0x0400)
typedef struct tagNMREBARCHILDSIZE {
NMHDR hdr;
***************
*** 2251,2255 ****
#define WC_TABCONTROL WC_TABCONTROLW
#define WC_TREEVIEW WC_TREEVIEWW
! typedef HD_ITEMW HD_ITEM;
typedef TOOLINFOW TOOLINFO,*PTOOLINFO,*LPTOOLINFO;
typedef TTHITTESTINFOW TTHITTESTINFO,*LPHITTESTINFO;
--- 2268,2272 ----
#define WC_TABCONTROL WC_TABCONTROLW
#define WC_TREEVIEW WC_TREEVIEWW
! typedef HDITEMW HDITEM;
typedef TOOLINFOW TOOLINFO,*PTOOLINFO,*LPTOOLINFO;
typedef TTHITTESTINFOW TTHITTESTINFO,*LPHITTESTINFO;
***************
*** 2392,2396 ****
#define WC_TABCONTROL WC_TABCONTROLA
#define WC_TREEVIEW WC_TREEVIEWA
! typedef HD_ITEMA HD_ITEM;
typedef TOOLINFOA TOOLINFO,*PTOOLINFO,*LPTOOLINFO;
typedef TTHITTESTINFOA TTHITTESTINFO,*LPHITTESTINFO;
--- 2409,2413 ----
#define WC_TABCONTROL WC_TABCONTROLA
#define WC_TREEVIEW WC_TREEVIEWA
! typedef HDITEMA HDITEM;
typedef TOOLINFOA TOOLINFO,*PTOOLINFO,*LPTOOLINFO;
typedef TTHITTESTINFOA TTHITTESTINFO,*LPHITTESTINFO;
Index: ntsecapi.h
===================================================================
RCS file: /cvsroot/mingw/w32api/include/ntsecapi.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** ntsecapi.h 2001/06/05 01:36:39 1.1.1.1
--- ntsecapi.h 2002/01/25 00:59:16 1.2
***************
*** 596,600 ****
typedef NTSTATUS (*PSAM_PASSWORD_NOTIFICATION_ROUTINE)(PUNICODE_STRING,
ULONG,PUNICODE_STRING);
! typedef BOOLEAN (*PSAM_INIT_NOTIFICATION_ROUTINE)();
typedef BOOLEAN (*PSAM_PASSWORD_FILTER_ROUTINE)(PUNICODE_STRING,PUNICODE_STRING,
PUNICODE_STRING,BOOLEAN);
--- 596,600 ----
typedef NTSTATUS (*PSAM_PASSWORD_NOTIFICATION_ROUTINE)(PUNICODE_STRING,
ULONG,PUNICODE_STRING);
! typedef BOOLEAN (*PSAM_INIT_NOTIFICATION_ROUTINE)(void);
typedef BOOLEAN (*PSAM_PASSWORD_FILTER_ROUTINE)(PUNICODE_STRING,PUNICODE_STRING,
PUNICODE_STRING,BOOLEAN);
Index: objbase.h
===================================================================
RCS file: /cvsroot/mingw/w32api/include/objbase.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** objbase.h 2002/01/17 20:32:50 1.4
--- objbase.h 2002/01/25 00:59:16 1.5
***************
*** 164,169 ****
WINOLEAPI CoCopyProxy(IUnknown*,IUnknown**);
WINOLEAPI CoQueryClientBlanket(DWORD*,DWORD*,OLECHAR**, DWORD*,DWORD*,RPC_AUTHZ_HANDLE*,DWORD*);
! WINOLEAPI CoImpersonateClient();
! WINOLEAPI CoRevertToSelf();
WINOLEAPI CoQueryAuthenticationServices(DWORD*, SOLE_AUTHENTICATION_SERVICE**);
WINOLEAPI CoSwitchCallContext(IUnknown*,IUnknown**);
--- 164,169 ----
WINOLEAPI CoCopyProxy(IUnknown*,IUnknown**);
WINOLEAPI CoQueryClientBlanket(DWORD*,DWORD*,OLECHAR**, DWORD*,DWORD*,RPC_AUTHZ_HANDLE*,DWORD*);
! WINOLEAPI CoImpersonateClient(void);
! WINOLEAPI CoRevertToSelf(void);
WINOLEAPI CoQueryAuthenticationServices(DWORD*, SOLE_AUTHENTICATION_SERVICE**);
WINOLEAPI CoSwitchCallContext(IUnknown*,IUnknown**);
Index: rapi.h
===================================================================
RCS file: /cvsroot/mingw/w32api/include/rapi.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** rapi.h 2001/06/05 01:36:41 1.1.1.1
--- rapi.h 2002/01/25 00:59:16 1.2
***************
*** 36,44 ****
} RAPIINIT;
! STDAPI CeRapiInit ();
STDAPI CeRapiInitEx (RAPIINIT*);
STDAPI_(BOOL) CeCreateProcess (LPCWSTR, LPCWSTR, LPSECURITY_ATTRIBUTES, LPSECURITY_ATTRIBUTES,
BOOL, DWORD, LPVOID, LPWSTR, LPSTARTUPINFO, LPPROCESS_INFORMATION);
! STDAPI CeRapiUninit ();
STDAPI_(BOOL) CeWriteFile (HANDLE, LPCVOID, DWORD, LPDWORD, LPOVERLAPPED);
--- 36,44 ----
} RAPIINIT;
! STDAPI CeRapiInit (void);
STDAPI CeRapiInitEx (RAPIINIT*);
STDAPI_(BOOL) CeCreateProcess (LPCWSTR, LPCWSTR, LPSECURITY_ATTRIBUTES, LPSECURITY_ATTRIBUTES,
BOOL, DWORD, LPVOID, LPWSTR, LPSTARTUPINFO, LPPROCESS_INFORMATION);
! STDAPI CeRapiUninit (void);
STDAPI_(BOOL) CeWriteFile (HANDLE, LPCVOID, DWORD, LPDWORD, LPOVERLAPPED);
Index: rpc.h
===================================================================
RCS file: /cvsroot/mingw/w32api/include/rpc.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** rpc.h 2001/06/05 01:36:41 1.1.1.1
--- rpc.h 2002/01/25 00:59:16 1.2
***************
*** 47,51 ****
RPC_STATUS RPC_ENTRY RpcImpersonateClient(RPC_BINDING_HANDLE);
! RPC_STATUS RPC_ENTRY RpcRevertToSelf();
long RPC_ENTRY I_RpcMapWin32Status(RPC_STATUS);
#ifdef __cplusplus
--- 47,51 ----
RPC_STATUS RPC_ENTRY RpcImpersonateClient(RPC_BINDING_HANDLE);
! RPC_STATUS RPC_ENTRY RpcRevertToSelf(void);
long RPC_ENTRY I_RpcMapWin32Status(RPC_STATUS);
#ifdef __cplusplus
Index: rpcdce.h
===================================================================
RCS file: /cvsroot/mingw/w32api/include/rpcdce.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** rpcdce.h 2001/06/05 01:36:41 1.1.1.1
--- rpcdce.h 2002/01/25 00:59:16 1.2
***************
*** 361,365 ****
RPC_STATUS RPC_ENTRY RpcBindingServerFromClient(RPC_BINDING_HANDLE,RPC_BINDING_HANDLE*);
DECLSPEC_NORETURN void RPC_ENTRY RpcRaiseException(RPC_STATUS);
! RPC_STATUS RPC_ENTRY RpcTestCancel();
RPC_STATUS RPC_ENTRY RpcCancelThread(void*);
RPC_STATUS RPC_ENTRY UuidCreate(UUID*);
--- 361,365 ----
RPC_STATUS RPC_ENTRY RpcBindingServerFromClient(RPC_BINDING_HANDLE,RPC_BINDING_HANDLE*);
DECLSPEC_NORETURN void RPC_ENTRY RpcRaiseException(RPC_STATUS);
! RPC_STATUS RPC_ENTRY RpcTestCancel(void);
RPC_STATUS RPC_ENTRY RpcCancelThread(void*);
RPC_STATUS RPC_ENTRY UuidCreate(UUID*);
Index: rpcdcep.h
===================================================================
RCS file: /cvsroot/mingw/w32api/include/rpcdcep.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** rpcdcep.h 2001/11/05 00:27:06 1.2
--- rpcdcep.h 2002/01/25 00:59:16 1.3
***************
*** 110,115 ****
long __stdcall I_RpcAsyncSendReceive(RPC_MESSAGE*,void*);
long __stdcall I_RpcGetThreadWindowHandle(void**);
! long __stdcall I_RpcServerThreadPauseListening();
! long __stdcall I_RpcServerThreadContinueListening();
long __stdcall I_RpcServerUnregisterEndpointA(unsigned char*,unsigned char*);
long __stdcall I_RpcServerUnregisterEndpointW(unsigned short*,unsigned short*);
--- 110,115 ----
long __stdcall I_RpcAsyncSendReceive(RPC_MESSAGE*,void*);
long __stdcall I_RpcGetThreadWindowHandle(void**);
! long __stdcall I_RpcServerThreadPauseListening(void);
! long __stdcall I_RpcServerThreadContinueListening(void);
long __stdcall I_RpcServerUnregisterEndpointA(unsigned char*,unsigned char*);
long __stdcall I_RpcServerUnregisterEndpointW(unsigned short*,unsigned short*);
Index: rpcndr.h
===================================================================
RCS file: /cvsroot/mingw/w32api/include/rpcndr.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** rpcndr.h 2001/06/05 01:36:41 1.1.1.1
--- rpcndr.h 2002/01/25 00:59:16 1.2
***************
*** 250,254 ****
} MIDL_FORMAT_STRING;
typedef void(__RPC_API *STUB_THUNK)(PMIDL_STUB_MESSAGE);
! typedef long(__RPC_API *SERVER_ROUTINE)();
typedef struct _MIDL_SERVER_INFO_ {
PMIDL_STUB_DESC pStubDesc;
--- 250,254 ----
} MIDL_FORMAT_STRING;
typedef void(__RPC_API *STUB_THUNK)(PMIDL_STUB_MESSAGE);
! typedef long(__RPC_API *SERVER_ROUTINE)(void);
typedef struct _MIDL_SERVER_INFO_ {
PMIDL_STUB_DESC pStubDesc;
Index: rpcnsip.h
===================================================================
RCS file: /cvsroot/mingw/w32api/include/rpcnsip.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** rpcnsip.h 2001/06/05 01:36:41 1.1.1.1
--- rpcnsip.h 2002/01/25 00:59:16 1.2
***************
*** 13,19 ****
void RPC_ENTRY I_RpcNsRaiseException(IN PRPC_MESSAGE,IN RPC_STATUS);
RPC_STATUS RPC_ENTRY I_RpcReBindBuffer(IN PRPC_MESSAGE);
! RPC_STATUS RPC_ENTRY I_NsServerBindSearch();
! RPC_STATUS RPC_ENTRY I_NsClientBindSearch();
! void RPC_ENTRY I_NsClientBindDone();
#ifdef __cplusplus
}
--- 13,19 ----
void RPC_ENTRY I_RpcNsRaiseException(IN PRPC_MESSAGE,IN RPC_STATUS);
RPC_STATUS RPC_ENTRY I_RpcReBindBuffer(IN PRPC_MESSAGE);
! RPC_STATUS RPC_ENTRY I_NsServerBindSearch(void);
! RPC_STATUS RPC_ENTRY I_NsClientBindSearch(void);
! void RPC_ENTRY I_NsClientBindDone(void);
#ifdef __cplusplus
}
Index: rpcproxy.h
===================================================================
RCS file: /cvsroot/mingw/w32api/include/rpcproxy.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** rpcproxy.h 2001/11/05 00:50:48 1.3
--- rpcproxy.h 2002/01/25 00:59:16 1.4
***************
*** 33,41 ****
return TRUE; \
} \
! HRESULT STDAPICALLTYPE DllRegisterServer() \
{\
return NdrDllRegisterProxy(hProxyDll, pProxyFileList, pClsID); \
}\
! HRESULT STDAPICALLTYPE DllUnregisterServer()\
{\
return NdrDllUnregisterProxy(hProxyDll, pProxyFileList, pClsID);\
--- 33,41 ----
return TRUE; \
} \
! HRESULT STDAPICALLTYPE DllRegisterServer(void) \
{\
return NdrDllRegisterProxy(hProxyDll, pProxyFileList, pClsID); \
}\
! HRESULT STDAPICALLTYPE DllUnregisterServer(void)\
{\
return NdrDllUnregisterProxy(hProxyDll, pProxyFileList, pClsID);\
***************
*** 65,69 ****
#define DLLGETCLASSOBJECTROUTINE(pPFlist, pClsid,pFactory) HRESULT STDAPICALLTYPE DllGetClassObject(REFCLSID rclsid,REFIID riid,void **ppv) \
{ return NdrDllGetClassObject(rclsid,riid,ppv,pPFlist,pClsid,pFactory ); }
! #define DLLCANUNLOADNOW(pFactory) HRESULT STDAPICALLTYPE DllCanUnloadNow() \
{ return NdrDllCanUnloadNow( pFactory ); }
#define DLLDUMMYPURECALL void __cdecl _purecall(void) { }
--- 65,69 ----
#define DLLGETCLASSOBJECTROUTINE(pPFlist, pClsid,pFactory) HRESULT STDAPICALLTYPE DllGetClassObject(REFCLSID rclsid,REFIID riid,void **ppv) \
{ return NdrDllGetClassObject(rclsid,riid,ppv,pPFlist,pClsid,pFactory ); }
! #define DLLCANUNLOADNOW(pFactory) HRESULT STDAPICALLTYPE DllCanUnloadNow(void) \
{ return NdrDllCanUnloadNow( pFactory ); }
#define DLLDUMMYPURECALL void __cdecl _purecall(void) { }
Index: windef.h
===================================================================
RCS file: /cvsroot/mingw/w32api/include/windef.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** windef.h 2001/11/05 00:27:06 1.2
--- windef.h 2002/01/25 00:59:16 1.3
***************
*** 201,207 ****
typedef HICON HCURSOR;
typedef DWORD COLORREF;
! typedef int (WINAPI *FARPROC)();
! typedef int (WINAPI *NEARPROC)();
! typedef int (WINAPI *PROC)();
typedef struct tagRECT {
LONG left;
--- 201,207 ----
typedef HICON HCURSOR;
typedef DWORD COLORREF;
! typedef int (WINAPI *FARPROC)(void);
! typedef int (WINAPI *NEARPROC)(void);
! typedef int (WINAPI *PROC)(void);
typedef struct tagRECT {
LONG left;
Index: wingdi.h
===================================================================
RCS file: /cvsroot/mingw/w32api/include/wingdi.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** wingdi.h 2002/01/17 21:09:53 1.5
--- wingdi.h 2002/01/25 00:59:16 1.6
***************
*** 2018,2021 ****
--- 2018,2023 ----
char Buffer[1];
} RGNDATA,*LPRGNDATA;
+ /* for GetRandomRgn */
+ #define SYSRGN 4
typedef struct tagGCP_RESULTSA {
DWORD lStructSize;
***************
*** 2548,2551 ****
--- 2550,2554 ----
int WINAPI GetPolyFillMode(HDC);
BOOL WINAPI GetRasterizerCaps(LPRASTERIZER_STATUS,UINT);
+ int WINAPI GetRandomRgn (HDC,HRGN,INT);
DWORD WINAPI GetRegionData(HRGN,DWORD,LPRGNDATA);
int WINAPI GetRgnBox(HRGN,LPRECT);
Index: winnt.h
===================================================================
RCS file: /cvsroot/mingw/w32api/include/winnt.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** winnt.h 2002/01/14 23:03:56 1.19
--- winnt.h 2002/01/25 00:59:16 1.20
***************
*** 221,224 ****
--- 221,225 ----
#define FILE_ATTRIBUTE_NOT_CONTENT_INDEXED 0x2000
#define FILE_ATTRIBUTE_ENCRYPTED 0x4000
+ #define INVALID_FILE_ATTRIBUTES ((DWORD)-1)
#define FILE_NOTIFY_CHANGE_FILE_NAME 1
#define FILE_NOTIFY_CHANGE_DIR_NAME 2
***************
*** 620,627 ****
#define PAGE_NOACCESS 1
#define PAGE_NOCACHE 512
! #define MEM_COMMIT 4096
! #define MEM_FREE 65536
! #define MEM_RESERVE 8192
#define MEM_IMAGE 16777216
#define MEM_MAPPED 262144
#define MEM_PRIVATE 131072
--- 621,636 ----
#define PAGE_NOACCESS 1
#define PAGE_NOCACHE 512
! #define MEM_COMMIT 0x1000
! #define MEM_RESERVE 0x2000
! #define MEM_DECOMMIT 0x4000
! #define MEM_RELEASE 0x8000
! #define MEM_FREE 0x10000
! #define MEM_PRIVATE 0x20000
! #define MEM_MAPPED 0x40000
! #define MEM_RESET 0x80000
! #define MEM_TOP_DOWN 0x100000
! #define MEM_4MB_PAGES 0x80000000
#define MEM_IMAGE 16777216
+ <<<<<<< winnt.h
#define MEM_MAPPED 262144
#define MEM_PRIVATE 131072
***************
*** 632,635 ****
--- 641,646 ----
#define MEM_TOP_DOWN 0x100000 /* NT */
#define MEM_WRITE_WATCH 0x200000 /* 98/Me */
+ =======
+ >>>>>>> 1.42
#define SEC_FILE 0x800000
#define SEC_IMAGE 0x1000000
Index: winsvc.h
===================================================================
RCS file: /cvsroot/mingw/w32api/include/winsvc.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** winsvc.h 2001/06/05 01:36:45 1.1.1.1
--- winsvc.h 2002/01/25 00:59:16 1.2
***************
*** 28,31 ****
--- 28,36 ----
#define SERVICE_ACCEPT_PAUSE_CONTINUE 2
#define SERVICE_ACCEPT_SHUTDOWN 4
+ #define SERVICE_ACCEPT_PARAMCHANGE 8
+ #define SERVICE_ACCEPT_NETBINDCHANGE 16
+ #define SERVICE_ACCEPT_HARDWAREPROFILECHANGE 32
+ #define SERVICE_ACCEPT_POWEREVENT 64
+ #define SERVICE_ACCEPT_SESSIONCHANGE 128
#define SERVICE_CONTROL_STOP 1
#define SERVICE_CONTROL_PAUSE 2
***************
*** 33,36 ****
--- 38,50 ----
#define SERVICE_CONTROL_INTERROGATE 4
#define SERVICE_CONTROL_SHUTDOWN 5
+ #define SERVICE_CONTROL_PARAMCHANGE 6
+ #define SERVICE_CONTROL_NETBINDADD 7
+ #define SERVICE_CONTROL_NETBINDREMOVE 8
+ #define SERVICE_CONTROL_NETBINDENABLE 9
+ #define SERVICE_CONTROL_NETBINDDISABLE 10
+ #define SERVICE_CONTROL_DEVICEEVENT 11
+ #define SERVICE_CONTROL_HARDWAREPROFILECHANGE 12
+ #define SERVICE_CONTROL_POWEREVENT 13
+ #define SERVICE_CONTROL_SESSIONCHANGE 14
#define SERVICE_ACTIVE 1
#define SERVICE_INACTIVE 2
***************
*** 46,50 ****
#define SERVICE_USER_DEFINED_CONTROL 256
#define SERVICE_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED|SERVICE_QUERY_CONFIG|SERVICE_CHANGE_CONFIG|SERVICE_QUERY_STATUS|SERVICE_ENUMERATE_DEPENDENTS|SERVICE_START|SERVICE_STOP|SERVICE_PAUSE_CONTINUE|SERVICE_INTERROGATE|SERVICE_USER_DEFINED_CONTROL)
!
typedef struct _SERVICE_STATUS {
--- 60,66 ----
#define SERVICE_USER_DEFINED_CONTROL 256
#define SERVICE_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED|SERVICE_QUERY_CONFIG|SERVICE_CHANGE_CONFIG|SERVICE_QUERY_STATUS|SERVICE_ENUMERATE_DEPENDENTS|SERVICE_START|SERVICE_STOP|SERVICE_PAUSE_CONTINUE|SERVICE_INTERROGATE|SERVICE_USER_DEFINED_CONTROL)
! #define SERVICE_RUNS_IN_SYSTEM_PROCESS 1
! #define SERVICE_CONFIG_DESCRIPTION 1
! #define SERVICE_CONFIG_FAILURE_ACTIONS 2
typedef struct _SERVICE_STATUS {
***************
*** 57,60 ****
--- 73,93 ----
DWORD dwWaitHint;
} SERVICE_STATUS,*LPSERVICE_STATUS;
+ typedef struct _SERVICE_STATUS_PROCESS {
+ DWORD dwServiceType;
+ DWORD dwCurrentState;
+ DWORD dwControlsAccepted;
+ DWORD dwWin32ExitCode;
+ DWORD dwServiceSpecificExitCode;
+ DWORD dwCheckPoint;
+ DWORD dwWaitHint;
+ DWORD dwProcessId;
+ DWORD dwServiceFlags;
+ } SERVICE_STATUS_PROCESS, *LPSERVICE_STATUS_PROCESS;
+ typedef enum _SC_STATUS_TYPE {
+ SC_STATUS_PROCESS_INFO = 0
+ } SC_STATUS_TYPE;
+ typedef enum _SC_ENUM_TYPE {
+ SC_ENUM_PROCESS_INFO = 0
+ } SC_ENUM_TYPE;
typedef struct _ENUM_SERVICE_STATUSA {
LPSTR lpServiceName;
***************
*** 67,70 ****
--- 100,113 ----
SERVICE_STATUS ServiceStatus;
} ENUM_SERVICE_STATUSW,*LPENUM_SERVICE_STATUSW;
+ typedef struct _ENUM_SERVICE_STATUS_PROCESSA {
+ LPSTR lpServiceName;
+ LPSTR lpDisplayName;
+ SERVICE_STATUS_PROCESS ServiceStatusProcess;
+ } ENUM_SERVICE_STATUS_PROCESSA,*LPENUM_SERVICE_STATUS_PROCESSA;
+ typedef struct _ENUM_SERVICE_STATUS_PROCESSW {
+ LPWSTR lpServiceName;
+ LPWSTR lpDisplayName;
+ SERVICE_STATUS_PROCESS ServiceStatusProcess;
+ } ENUM_SERVICE_STATUS_PROCESSW,*LPENUM_SERVICE_STATUS_PROCESSW;
typedef struct _QUERY_SERVICE_CONFIGA {
DWORD dwServiceType;
***************
*** 114,120 ****
--- 157,196 ----
typedef DWORD SERVICE_STATUS_HANDLE;
typedef VOID(WINAPI *LPHANDLER_FUNCTION)(DWORD);
+ typedef DWORD (WINAPI *LPHANDLER_FUNCTION_EX)(DWORD,DWORD,LPVOID,LPVOID);
+ typedef struct _SERVICE_DESCRIPTIONA {
+ LPSTR lpDescription;
+ } SERVICE_DESCRIPTIONA,*LPSERVICE_DESCRIPTIONA;
+ typedef struct _SERVICE_DESCRIPTIONW {
+ LPWSTR lpDescription;
+ } SERVICE_DESCRIPTIONW,*LPSERVICE_DESCRIPTIONW;
+ typedef enum _SC_ACTION_TYPE {
+ SC_ACTION_NONE = 0,
+ SC_ACTION_RESTART = 1,
+ SC_ACTION_REBOOT = 2,
+ SC_ACTION_RUN_COMMAND = 3
+ } SC_ACTION_TYPE;
+ typedef struct _SC_ACTION {
+ SC_ACTION_TYPE Type;
+ DWORD Delay;
+ } SC_ACTION,*LPSC_ACTION;
+ typedef struct _SERVICE_FAILURE_ACTIONSA {
+ DWORD dwResetPeriod;
+ LPSTR lpRebootMsg;
+ LPSTR lpCommand;
+ DWORD cActions;
+ SC_ACTION * lpsaActions;
+ } SERVICE_FAILURE_ACTIONSA,*LPSERVICE_FAILURE_ACTIONSA;
+ typedef struct _SERVICE_FAILURE_ACTIONSW {
+ DWORD dwResetPeriod;
+ LPWSTR lpRebootMsg;
+ LPWSTR lpCommand;
+ DWORD cActions;
+ SC_ACTION * lpsaActions;
+ } SERVICE_FAILURE_ACTIONSW,*LPSERVICE_FAILURE_ACTIONSW;
BOOL WINAPI ChangeServiceConfigA(SC_HANDLE,DWORD,DWORD,DWORD,LPCSTR,LPCSTR,LPDWORD,LPCSTR,LPCSTR,LPCSTR,LPCSTR);
BOOL WINAPI ChangeServiceConfigW(SC_HANDLE,DWORD,DWORD,DWORD,LPCWSTR,LPCWSTR,LPDWORD,LPCWSTR,LPCWSTR,LPCWSTR,LPCWSTR);
+ BOOL WINAPI ChangeServiceConfig2A(SC_HANDLE,DWORD,LPVOID);
+ BOOL WINAPI ChangeServiceConfig2W(SC_HANDLE,DWORD,LPVOID);
BOOL WINAPI CloseServiceHandle(SC_HANDLE);
BOOL WINAPI ControlService(SC_HANDLE,DWORD,LPSERVICE_STATUS);
***************
*** 126,129 ****
--- 202,207 ----
BOOL WINAPI EnumServicesStatusA(SC_HANDLE,DWORD,DWORD,LPENUM_SERVICE_STATUSA,DWORD,PDWORD,PDWORD,PDWORD);
BOOL WINAPI EnumServicesStatusW(SC_HANDLE,DWORD,DWORD,LPENUM_SERVICE_STATUSW,DWORD,PDWORD,PDWORD,PDWORD);
+ BOOL WINAPI EnumServicesStatusExA(SC_HANDLE,SC_ENUM_TYPE,DWORD,DWORD,LPBYTE,DWORD,LPDWORD,LPDWORD,LPDWORD,LPCSTR);
+ BOOL WINAPI EnumServicesStatusExW(SC_HANDLE,SC_ENUM_TYPE,DWORD,DWORD,LPBYTE,DWORD,LPDWORD,LPDWORD,LPDWORD,LPCWSTR);
BOOL WINAPI GetServiceDisplayNameA(SC_HANDLE,LPCSTR,LPSTR,PDWORD);
BOOL WINAPI GetServiceDisplayNameW(SC_HANDLE,LPCWSTR,LPWSTR,PDWORD);
***************
*** 138,147 ****
--- 216,230 ----
BOOL WINAPI QueryServiceConfigA(SC_HANDLE,LPQUERY_SERVICE_CONFIGA,DWORD,PDWORD);
BOOL WINAPI QueryServiceConfigW(SC_HANDLE,LPQUERY_SERVICE_CONFIGW,DWORD,PDWORD);
+ BOOL WINAPI QueryServiceConfig2A(SC_HANDLE,DWORD,LPBYTE,DWORD,LPDWORD);
+ BOOL WINAPI QueryServiceConfig2W(SC_HANDLE,DWORD,LPBYTE,DWORD,LPDWORD);
BOOL WINAPI QueryServiceLockStatusA(SC_HANDLE,LPQUERY_SERVICE_LOCK_STATUSA,DWORD,PDWORD);
BOOL WINAPI QueryServiceLockStatusW(SC_HANDLE,LPQUERY_SERVICE_LOCK_STATUSW,DWORD,PDWORD);
BOOL WINAPI QueryServiceObjectSecurity(SC_HANDLE,SECURITY_INFORMATION,PSECURITY_DESCRIPTOR,DWORD,LPDWORD);
BOOL WINAPI QueryServiceStatus(SC_HANDLE,LPSERVICE_STATUS);
+ BOOL WINAPI QueryServiceStatusEx(SC_HANDLE,SC_STATUS_TYPE,LPBYTE,DWORD,LPDWORD);
SERVICE_STATUS_HANDLE WINAPI RegisterServiceCtrlHandlerA(LPCSTR,LPHANDLER_FUNCTION);
SERVICE_STATUS_HANDLE WINAPI RegisterServiceCtrlHandlerW(LPCWSTR,LPHANDLER_FUNCTION);
+ SERVICE_STATUS_HANDLE WINAPI RegisterServiceCtrlHandlerExA(LPCSTR,LPHANDLER_FUNCTION_EX,LPVOID);
+ SERVICE_STATUS_HANDLE WINAPI RegisterServiceCtrlHandlerExW(LPCWSTR,LPHANDLER_FUNCTION_EX,LPVOID);
BOOL WINAPI SetServiceObjectSecurity(SC_HANDLE,SECURITY_INFORMATION,PSECURITY_DESCRIPTOR);
BOOL WINAPI SetServiceStatus(SERVICE_STATUS_HANDLE,LPSERVICE_STATUS);
***************
*** 154,168 ****
--- 237,259 ----
#ifdef UNICODE
typedef ENUM_SERVICE_STATUSW ENUM_SERVICE_STATUS,*LPENUM_SERVICE_STATUS;
+ typedef ENUM_SERVICE_STATUS_PROCESSW ENUM_SERVICE_STATUS_PROCESS;
+ typedef LPENUM_SERVICE_STATUS_PROCESSW LPENUM_SERVICE_STATUS_PROCESS;
typedef QUERY_SERVICE_CONFIGW QUERY_SERVICE_CONFIG,*LPQUERY_SERVICE_CONFIG;
typedef QUERY_SERVICE_LOCK_STATUSW QUERY_SERVICE_LOCK_STATUS,*LPQUERY_SERVICE_LOCK_STATUS;
typedef SERVICE_TABLE_ENTRYW SERVICE_TABLE_ENTRY,*LPSERVICE_TABLE_ENTRY;
typedef LPSERVICE_MAIN_FUNCTIONW LPSERVICE_MAIN_FUNCTION;
+ typedef SERVICE_DESCRIPTIONW SERVICE_DESCRIPTION;
+ typedef LPSERVICE_DESCRIPTIONW LPSERVICE_DESCRIPTION;
+ typedef SERVICE_FAILURE_ACTIONSW SERVICE_FAILURE_ACTIONS;
+ typedef LPSERVICE_FAILURE_ACTIONSW LPSERVICE_FAILURE_ACTIONS;
#define SERVICES_ACTIVE_DATABASE SERVICES_ACTIVE_DATABASEW
#define SERVICES_FAILED_DATABASE SERVICES_FAILED_DATABASEW
#define SC_GROUP_IDENTIFIER SC_GROUP_IDENTIFIERW
#define ChangeServiceConfig ChangeServiceConfigW
+ #define ChangeServiceConfig2 ChangeServiceConfig2W
#define CreateService CreateServiceW
#define EnumDependentServices EnumDependentServicesW
#define EnumServicesStatus EnumServicesStatusW
+ #define EnumServicesStatusEx EnumServicesStatusExW
#define GetServiceDisplayName GetServiceDisplayNameW
#define GetServiceKeyName GetServiceKeyNameW
***************
*** 170,190 ****
--- 261,291 ----
#define OpenService OpenServiceW
#define QueryServiceConfig QueryServiceConfigW
+ #define QueryServiceConfig2 QueryServiceConfig2W
#define QueryServiceLockStatus QueryServiceLockStatusW
#define RegisterServiceCtrlHandler RegisterServiceCtrlHandlerW
+ #define RegisterServiceCtrlHandlerEx RegisterServiceCtrlHandlerExW
#define StartService StartServiceW
#define StartServiceCtrlDispatcher StartServiceCtrlDispatcherW
#else
typedef ENUM_SERVICE_STATUSA ENUM_SERVICE_STATUS,*LPENUM_SERVICE_STATUS;
+ typedef ENUM_SERVICE_STATUS_PROCESSA ENUM_SERVICE_STATUS_PROCESS;
+ typedef LPENUM_SERVICE_STATUS_PROCESSA LPENUM_SERVICE_STATUS_PROCESS;
typedef QUERY_SERVICE_CONFIGA QUERY_SERVICE_CONFIG,*LPQUERY_SERVICE_CONFIG;
typedef QUERY_SERVICE_LOCK_STATUSA QUERY_SERVICE_LOCK_STATUS,*LPQUERY_SERVICE_LOCK_STATUS;
typedef SERVICE_TABLE_ENTRYA SERVICE_TABLE_ENTRY,*LPSERVICE_TABLE_ENTRY;
typedef LPSERVICE_MAIN_FUNCTIONA LPSERVICE_MAIN_FUNCTION;
+ typedef SERVICE_DESCRIPTIONA SERVICE_DESCRIPTION;
+ typedef LPSERVICE_DESCRIPTIONA LPSERVICE_DESCRIPTION;
+ typedef SERVICE_FAILURE_ACTIONSA SERVICE_FAILURE_ACTIONS;
+ typedef LPSERVICE_FAILURE_ACTIONSA LPSERVICE_FAILURE_ACTIONS;
#define SERVICES_ACTIVE_DATABASE SERVICES_ACTIVE_DATABASEA
#define SERVICES_FAILED_DATABASE SERVICES_FAILED_DATABASEA
#define SC_GROUP_IDENTIFIER SC_GROUP_IDENTIFIERA
#define ChangeServiceConfig ChangeServiceConfigA
+ #define ChangeServiceConfig2 ChangeServiceConfig2A
#define CreateService CreateServiceA
#define EnumDependentServices EnumDependentServicesA
#define EnumServicesStatus EnumServicesStatusA
+ #define EnumServicesStatusEx EnumServicesStatusExA
#define GetServiceDisplayName GetServiceDisplayNameA
#define GetServiceKeyName GetServiceKeyNameA
***************
*** 192,197 ****
--- 293,300 ----
#define OpenService OpenServiceA
#define QueryServiceConfig QueryServiceConfigA
+ #define QueryServiceConfig2 QueryServiceConfig2A
#define QueryServiceLockStatus QueryServiceLockStatusA
#define RegisterServiceCtrlHandler RegisterServiceCtrlHandlerA
+ #define RegisterServiceCtrlHandlerEx RegisterServiceCtrlHandlerExA
#define StartService StartServiceA
#define StartServiceCtrlDispatcher StartServiceCtrlDispatcherA
|