Module: wine Branch: master Commit: 4b340fff6fc5ab2ac9e249a993d402e20570b8ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b340fff6fc5ab2ac9e249a993...
Author: Francois Gouget fgouget@free.fr Date: Thu Sep 27 18:50:21 2007 +0200
includes: Make headers C++ compatible.
---
include/appmgmt.h | 9 +++++++++ include/cfgmgr32.h | 9 +++++++++ include/evntrace.h | 8 ++++++++ include/icmpapi.h | 9 +++++++++ include/msiquery.h | 9 +++++++++ include/powrprof.h | 9 +++++++++ include/rpcdcep.h | 8 ++++++++ include/rpcproxy.h | 8 ++++++++ include/setupapi.h | 8 ++++++++ include/winnetwk.h | 7 +++++++ 10 files changed, 84 insertions(+), 0 deletions(-)
diff --git a/include/appmgmt.h b/include/appmgmt.h index 5cc262f..385f81a 100644 --- a/include/appmgmt.h +++ b/include/appmgmt.h @@ -39,7 +39,16 @@ typedef struct _MANAGEDAPPLICATION BOOL bInstalled; } MANAGEDAPPLICATION, *PMANAGEDAPPLICATION;
+ +#ifdef __cplusplus +extern "C" { +#endif + DWORD WINAPI CommandLineFromMsiDescriptor(WCHAR*,WCHAR*,DWORD*); DWORD WINAPI GetManagedApplications(GUID*,DWORD,DWORD,LPDWORD,PMANAGEDAPPLICATION*);
+#ifdef __cplusplus +} +#endif + #endif /* _APPMGMT_H */ diff --git a/include/cfgmgr32.h b/include/cfgmgr32.h index c5a4a25..3214c43 100644 --- a/include/cfgmgr32.h +++ b/include/cfgmgr32.h @@ -27,8 +27,17 @@ typedef DWORD CONFIGRET; #define MAX_GUID_STRING_LEN 39 #define MAX_PROFILE_LEN 80
+ +#ifdef __cplusplus +extern "C" { +#endif + CONFIGRET WINAPI CM_Get_Device_ID_ListA( PCSTR, PCHAR, ULONG, ULONG ); CONFIGRET WINAPI CM_Get_Device_ID_ListW( PCWSTR, PWCHAR, ULONG, ULONG ); #define CM_Get_Device_ID_List WINELIB_NAME_AW(CM_Get_Device_ID_List)
+#ifdef __cplusplus +} +#endif + #endif /* _CFGMGR32_H_ */ diff --git a/include/evntrace.h b/include/evntrace.h index c12b716..093696b 100644 --- a/include/evntrace.h +++ b/include/evntrace.h @@ -21,6 +21,10 @@
#include <guiddef.h>
+#ifdef __cplusplus +extern "C" { +#endif + typedef ULONG64 TRACEHANDLE, *PTRACEHANDLE;
struct _EVENT_TRACE_LOGFILEA; @@ -178,4 +182,8 @@ ULONG WINAPI RegisterTraceGuidsA(WMIDPREQUEST,PVOID,LPCGUID,ULONG,PTRACE_GUID_RE ULONG WINAPI RegisterTraceGuidsW(WMIDPREQUEST,PVOID,LPCGUID,ULONG,PTRACE_GUID_REGISTRATION,LPCWSTR,LPCWSTR,PTRACEHANDLE); #define RegisterTraceGuids WINELIB_NAME_AW(RegisterTraceGuids)
+#ifdef __cplusplus +} +#endif + #endif /* _EVNTRACE_ */ diff --git a/include/icmpapi.h b/include/icmpapi.h index 8dfde8e..102851a 100644 --- a/include/icmpapi.h +++ b/include/icmpapi.h @@ -21,6 +21,11 @@ #ifndef __WINE_ICMPAPI_H #define __WINE_ICMPAPI_H
+#ifdef __cplusplus +extern "C" { +#endif + + HANDLE WINAPI IcmpCreateFile( VOID ); @@ -41,4 +46,8 @@ DWORD WINAPI IcmpSendEcho( );
+#ifdef __cplusplus +} +#endif + #endif /* __WINE_ICMPAPI_H */ diff --git a/include/msiquery.h b/include/msiquery.h index 67205c9..1c52a76 100644 --- a/include/msiquery.h +++ b/include/msiquery.h @@ -142,6 +142,11 @@ typedef enum tagMSIDBSTATE MSIDBSTATE_WRITE = 1 } MSIDBSTATE;
+ +#ifdef __cplusplus +extern "C" { +#endif + /* view manipulation */ UINT WINAPI MsiViewFetch(MSIHANDLE,MSIHANDLE*); UINT WINAPI MsiViewExecute(MSIHANDLE,MSIHANDLE); @@ -307,4 +312,8 @@ UINT WINAPI MsiSetInstallLevel(MSIHANDLE, int);
MSIHANDLE WINAPI MsiGetLastErrorRecord(void);
+#ifdef __cplusplus +} +#endif + #endif /* __WINE_MSIQUERY_H */ diff --git a/include/powrprof.h b/include/powrprof.h index ea47b8a..5fed4ae 100644 --- a/include/powrprof.h +++ b/include/powrprof.h @@ -109,6 +109,11 @@ typedef struct _POWER_POLICY { } POWER_POLICY, *PPOWER_POLICY;
+ +#ifdef __cplusplus +extern "C" { +#endif + typedef BOOLEAN (CALLBACK* PWRSCHEMESENUMPROC)(UINT, DWORD, LPWSTR, DWORD, LPWSTR, PPOWER_POLICY, LPARAM);
NTSTATUS WINAPI CallNtPowerInformation(POWER_INFORMATION_LEVEL, PVOID, ULONG, PVOID, ULONG); @@ -132,4 +137,8 @@ BOOLEAN WINAPI WriteGlobalPwrPolicy(PGLOBAL_POWER_POLICY); BOOLEAN WINAPI WriteProcessorPwrScheme(UINT, PMACHINE_PROCESSOR_POWER_POLICY); BOOLEAN WINAPI WritePwrScheme(PUINT, LPWSTR, LPWSTR, PPOWER_POLICY);
+#ifdef __cplusplus +} +#endif + #endif /* _POWRPROF_H */ diff --git a/include/rpcdcep.h b/include/rpcdcep.h index 6c3f41f..944070f 100644 --- a/include/rpcdcep.h +++ b/include/rpcdcep.h @@ -19,6 +19,10 @@ #ifndef __WINE_RPCDCEP_H #define __WINE_RPCDCEP_H
+#ifdef __cplusplus +extern "C" { +#endif + typedef struct _RPC_VERSION { unsigned short MajorVersion; unsigned short MinorVersion; @@ -182,4 +186,8 @@ RPCRTAPI UINT RPC_ENTRY
#endif
+#ifdef __cplusplus +} +#endif + #endif /*__WINE_RPCDCEP_H */ diff --git a/include/rpcproxy.h b/include/rpcproxy.h index 1ebc5d8..eaf2a6a 100644 --- a/include/rpcproxy.h +++ b/include/rpcproxy.h @@ -33,6 +33,10 @@ #include <rpc.h> #include <rpcndr.h>
+#ifdef __cplusplus +extern "C" { +#endif + typedef struct tagCInterfaceStubVtbl *PCInterfaceStubVtblList; typedef struct tagCInterfaceProxyVtbl *PCInterfaceProxyVtblList; typedef const char *PCInterfaceName; @@ -357,4 +361,8 @@ RPCRTAPI HRESULT RPC_ENTRY
#endif
+#ifdef __cplusplus +} +#endif + #endif /*__WINE_RPCDCE_H */ diff --git a/include/setupapi.h b/include/setupapi.h index d52790d..3169807 100644 --- a/include/setupapi.h +++ b/include/setupapi.h @@ -22,6 +22,10 @@
#include <commctrl.h>
+#ifdef __cplusplus +extern "C" { +#endif + /* setupapi doesn't use the normal convention, it adds an underscore before A/W */ #ifdef __WINESRC__ # define DECL_WINELIB_SETUPAPI_TYPE_AW(type) /* nothing */ @@ -1818,6 +1822,10 @@ PSTR WINAPI UnicodeToMultiByte(PCWSTR lpUnicodeStr, UINT uCodePage); BOOL WINAPI UnmapAndCloseFile(HANDLE, HANDLE, PVOID);
+#ifdef __cplusplus +} +#endif + #undef DECL_WINELIB_SETUPAPI_TYPE_AW
#ifdef __cplusplus diff --git a/include/winnetwk.h b/include/winnetwk.h index e0b8ab8..b69c0eb 100644 --- a/include/winnetwk.h +++ b/include/winnetwk.h @@ -20,6 +20,10 @@ #ifndef _WINNETWK_H_ #define _WINNETWK_H_
+#ifdef __cplusplus +extern "C" { +#endif + /* * Network types */ @@ -401,5 +405,8 @@ UINT WINAPI WNetEnumCachedPasswords( LPSTR, WORD, BYTE, ENUMPASSWORDPROC, DWORD) DWORD WINAPI WNetGetCachedPassword( LPSTR, WORD, LPSTR, LPWORD, BYTE ); DWORD WINAPI WNetCachePassword( LPSTR, WORD, LPSTR, WORD, BYTE, WORD );
+#ifdef __cplusplus +} +#endif
#endif /* _WINNETWK_H_ */