Skip to content
Snippets Groups Projects
Commit 14da7b1c authored by Patrik Stridvall's avatar Patrik Stridvall Committed by Alexandre Julliard
Browse files

Added extern "C" if __cplusplus is defined.

parent 6ec3eaf5
No related branches found
No related tags found
No related merge requests found
Showing with 150 additions and 4 deletions
......@@ -10,6 +10,10 @@
#include "windef.h"
#ifdef __cplusplus
extern "C" {
#endif /* defined(__cplusplus) */
/* Codepage Constants
*/
......@@ -334,4 +338,8 @@ UINT WINAPI DdeGetLastError(DWORD);
UINT16 WINAPI DdeQueryConvInfo16(HCONV,DWORD,LPCONVINFO16);
UINT WINAPI DdeQueryConvInfo(HCONV,DWORD,LPCONVINFO);
#ifdef __cplusplus
} /* extern "C" */
#endif /* defined(__cplusplus) */
#endif /* __WINE__DDEML_H */
......@@ -10,6 +10,10 @@
#include "wingdi.h" /* PALETTE stuff ... */
#include "wine/obj_base.h"
#ifdef __cplusplus
extern "C" {
#endif /* defined(__cplusplus) */
#ifndef DIRECTDRAW_VERSION
#define DIRECTDRAW_VERSION 0x0500
#endif /* DIRECTDRAW_VERSION */
......@@ -1509,4 +1513,8 @@ HRESULT WINAPI DirectDrawEnumerateW(LPDDENUMCALLBACKW,LPVOID);
#define DirectDrawEnumerate WINELIB_NAME_AW(DirectDrawEnumerate)
HRESULT WINAPI DirectDrawCreateClipper(DWORD,LPDIRECTDRAWCLIPPER*,LPUNKNOWN);
#ifdef __cplusplus
} /* extern "C" */
#endif /* defined(__cplusplus) */
#endif /* __WINE_DDRAW_H */
......@@ -3,6 +3,10 @@
#include "wine/obj_base.h"
#ifdef __cplusplus
extern "C" {
#endif /* defined(__cplusplus) */
#include "pshpack1.h"
/*****************************************************************************
......@@ -585,4 +589,8 @@ ICOM_DEFINE(IDirectPlay3,IDirectPlay2)
#define IDirectPlay3_GetPlayerFlags(p,a,b) ICOM_CALL2(GetPlayerFlags,p,a,b)
#endif
#ifdef __cplusplus
} /* extern "C" */
#endif /* defined(__cplusplus) */
#endif /* __WINE_DPLAY_H */
......@@ -3,6 +3,10 @@
#include "dplay.h"
#ifdef __cplusplus
extern "C" {
#endif /* defined(__cplusplus) */
#include "pshpack1.h"
/*****************************************************************************
......@@ -148,4 +152,8 @@ ICOM_DEFINE(IDirectPlayLobby2,IDirectPlayLobby)
#define IDirectPlayLobby2_CreateCompoundAddress(p,a,b,c,d) ICOM_CALL4(CreateCompoundAddress,p,a,b,c,d)
#endif
#ifdef __cplusplus
} /* extern "C" */
#endif /* defined(__cplusplus) */
#endif /* __WINE_DPLOBBY_H */
......@@ -5,6 +5,10 @@
#include "mmsystem.h"
#include "d3d.h" /*FIXME: Need to break out d3dtypes.h */
#ifdef __cplusplus
extern "C" {
#endif /* defined(__cplusplus) */
/*****************************************************************************
* Predeclare the interfaces
*/
......@@ -481,5 +485,8 @@ ICOM_DEFINE(IDirectSound3DBuffer,IUnknown)
*/
/* FIXME: not implemented yet */
#ifdef __cplusplus
} /* extern "C" */
#endif /* defined(__cplusplus) */
#endif /* __WINE_DSOUND_H */
......@@ -8,6 +8,10 @@
#include "windef.h"
#include "winbase.h"
#ifdef __cplusplus
extern "C" {
#endif /* defined(__cplusplus) */
/***********************************************************************
* Types
*/
......@@ -812,6 +816,10 @@ BOOL WINAPI UpdateDebugInfoFileEx(
extern HANDLE IMAGEHLP_hHeap;
#ifdef __cplusplus
} /* extern "C" */
#endif /* defined(__cplusplus) */
#endif /* __WINE_IMAGEHLP_H */
......
......@@ -9,6 +9,10 @@
#include "windef.h"
#ifdef __cplusplus
extern "C" {
#endif /* defined(__cplusplus) */
#define LZERROR_BADINHANDLE -1 /* -1 */
#define LZERROR_BADOUTHANDLE -2 /* -2 */
#define LZERROR_READ -3 /* -3 */
......@@ -42,4 +46,8 @@ INT WINAPI GetExpandedNameA(LPCSTR,LPSTR);
INT WINAPI GetExpandedNameW(LPCWSTR,LPWSTR);
#define GetExpandedName WINELIB_NAME_AW(GetExpandedName)
#ifdef __cplusplus
} /* extern "C" */
#endif /* defined(__cplusplus) */
#endif /* __WINE_LZEXPAND_H */
......@@ -10,6 +10,10 @@
#include "mmsystem.h"
#include "mmreg.h"
#ifdef __cplusplus
extern "C" {
#endif /* defined(__cplusplus) */
/***********************************************************************
* Defines/Enums
*/
......@@ -977,6 +981,10 @@ PWINE_ACMDRIVER MSACM_GetDriver(HACMDRIVER hDriver);
PWINE_ACMOBJ MSACM_GetObj(HACMOBJ hObj);
HDRVR MSACM_OpenDriverProc(DRIVERPROC pfnDriverProc);
#ifdef __cplusplus
} /* extern "C" */
#endif /* defined(__cplusplus) */
#endif /* __WINE_MSACM_H */
......@@ -10,6 +10,10 @@
#include "oleidl.h"
#include "oleauto.h"
#ifdef __cplusplus
extern "C" {
#endif /* defined(__cplusplus) */
#define OLEIVERB_PRIMARY (0L)
#define OLEIVERB_SHOW (-1L)
#define OLEIVERB_OPEN (-2L)
......@@ -91,5 +95,9 @@ HRESULT WINAPI OleCreateDefaultHandler(REFCLSID clsid,
LPVOID* ppvObj);
HRESULT WINAPI CreateOleAdviseHolder (LPOLEADVISEHOLDER *ppOAHolder);
#ifdef __cplusplus
} /* extern "C" */
#endif /* defined(__cplusplus) */
#endif /* __WINE_OLE2_H */
......@@ -6,6 +6,9 @@
#include "windef.h"
#ifdef __cplusplus
extern "C" {
#endif /* defined(__cplusplus) */
/****************************************************************************
* shell 16
......@@ -208,4 +211,8 @@ DWORD WINAPI SHFree(LPVOID x);
#define CSIDL_COOKIES 0x0021
#define CSIDL_HISTORY 0x0022
#ifdef __cplusplus
} /* extern "C" */
#endif /* defined(__cplusplus) */
#endif /* __WINE_SHELL_H */
......@@ -3,6 +3,10 @@
#include "windef.h"
#ifdef __cplusplus
extern "C" {
#endif /* defined(__cplusplus) */
#include "pshpack1.h"
/******************************************
......@@ -264,6 +268,10 @@ BOOL WINAPI ShellAboutA(HWND,LPCSTR,LPCSTR,HICON);
BOOL WINAPI ShellAboutW(HWND,LPCWSTR,LPCWSTR,HICON);
#define ShellAbout WINELIB_NAME_AW(ShellAbout)
#ifdef __cplusplus
} /* extern "C" */
#endif /* defined(__cplusplus) */
#include "poppack.h"
#endif /* _WINE_SHELLAPI_H */
......@@ -18,6 +18,10 @@
#include "commctrl.h"
#include "prsht.h"
#ifdef __cplusplus
extern "C" {
#endif /* defined(__cplusplus) */
/*****************************************************************************
* Predeclare interfaces
*/
......@@ -398,4 +402,8 @@ void WINAPI SHGetSettings(LPSHELLFLAGSTATE lpsfs, DWORD dwMask, DWORD dwx);
/**********************************************************************/
#ifdef __cplusplus
} /* extern "C" */
#endif /* defined(__cplusplus) */
#endif /* __WINE_SHLOBJ_H */
......@@ -9,6 +9,10 @@
#include "windef.h"
#ifdef __cplusplus
extern "C" {
#endif /* defined(__cplusplus) */
typedef HANDLE HCALL, *LPHCALL;
typedef HANDLE HLINE, *LPHLINE;
typedef HANDLE HLINEAPP, *LPHLINEAPP;
......@@ -624,4 +628,8 @@ DWORD WINAPI phoneShutdown(HPHONEAPP);
DWORD WINAPI tapiGetLocationInfo(LPSTR,LPSTR);
DWORD WINAPI tapiRequestMakeCall(LPCSTR,LPCSTR,LPCSTR,LPCSTR);
#ifdef __cplusplus
} /* extern "C" */
#endif /* defined(__cplusplus) */
#endif /* __WINE_TAPI_H */
......@@ -10,6 +10,9 @@
#include "winbase.h"
#ifdef __cplusplus
extern "C" {
#endif /* defined(__cplusplus) */
/*****************************************************************************
* Declare the structures
......@@ -111,9 +114,12 @@ ICOM_DEFINE(IOleCacheControl,IUnknown)
#define IOleCacheControl_OnRun(p,a) ICOM_CALL1(UpdateCache,p,a)
#define IOleCacheControl_OnStop(p) ICOM_CALL (OnStop,p)
#endif
#ifdef __cplusplus
} /* extern "C" */
#endif /* defined(__cplusplus) */
#endif /* __WINE_WINE_OBJ_CONTROL_H */
......@@ -7,6 +7,10 @@
#include "wine/obj_base.h"
#ifdef __cplusplus
extern "C" {
#endif /* defined(__cplusplus) */
/*****************************************************************************
* Predeclare the interfaces
*/
......@@ -182,5 +186,8 @@ ICOM_DEFINE(IRpcStubBuffer,IUnknown)
#define IRpcStubBuffer_DebugServerRelease(p,a) ICOM_CALL1(DebugServerRelease,p,a)
#endif
#ifdef __cplusplus
} /* extern "C" */
#endif /* defined(__cplusplus) */
#endif /* __WINE_WINE_OBJ_CHANNEL_H */
......@@ -7,6 +7,10 @@
#include "wine/obj_base.h"
#ifdef __cplusplus
extern "C" {
#endif /* defined(__cplusplus) */
/*****************************************************************************
* Predeclare the interfaces
*/
......@@ -255,5 +259,8 @@ HRESULT WINAPI CoRegisterPSClsid(REFIID riid, REFCLSID rclsid);
/* FIXME: not implemented */
HRESULT WINAPI CoResumeClassObjects(void);
#ifdef __cplusplus
} /* extern "C" */
#endif /* defined(__cplusplus) */
#endif /* __WINE_WINE_OBJ_CLIENTSERVER_H */
......@@ -10,6 +10,10 @@
#include "wine/obj_base.h"
#include "wine/obj_shellview.h"
#ifdef __cplusplus
extern "C" {
#endif /* defined(__cplusplus) */
DEFINE_SHLGUID(IID_ICommDlgBrowser, 0x000214F1L, 0, 0);
typedef struct ICommDlgBrowser ICommDlgBrowser, *LPCOMMDLGBROWSER;
......@@ -40,5 +44,8 @@ ICOM_DEFINE(ICommDlgBrowser,IUnknown)
#define ICommDlgBrowser_IncludeObject(p,a,b) ICOM_CALL2(IncludeObject,p,a,b)
#endif
#ifdef __cplusplus
} /* extern "C" */
#endif /* defined(__cplusplus) */
#endif /* __WINE_WINE_OBJ_ICOMMDLGBROWSER_H */
......@@ -10,6 +10,9 @@
#include "winbase.h"
#ifdef __cplusplus
extern "C" {
#endif /* defined(__cplusplus) */
/*****************************************************************************
* Declare the structures
......@@ -144,8 +147,9 @@ ICOM_DEFINE(IEnumConnectionPoints,IUnknown)
#define IEnumConnectionPoints_Clone(p,a) ICOM_CALL1(Clone,p,a)
#endif
#ifdef __cplusplus
} /* extern "C" */
#endif /* defined(__cplusplus) */
#endif /* __WINE_WINE_OBJ_CONTROL_H */
......
......@@ -9,6 +9,10 @@
#include "winuser.h"
#include "wine/obj_base.h"
#ifdef __cplusplus
extern "C" {
#endif /* defined(__cplusplus) */
DEFINE_SHLGUID(IID_IContextMenu, 0x000214E4L, 0, 0);
DEFINE_SHLGUID(IID_IContextMenu2, 0x000214F4L, 0, 0);
typedef struct IContextMenu IContextMenu, *LPCONTEXTMENU;
......@@ -124,5 +128,8 @@ ICOM_DEFINE(IContextMenu,IUnknown)
#define IContextMenu_HandleMenuMsg(p,a,b,c) ICOM_CALL3(HandleMenuMsg,p,a,b,c)
#endif
#ifdef __cplusplus
} /* extern "C" */
#endif /* defined(__cplusplus) */
#endif /* __WINE_WINE_OBJ_ICONTEXTMENU_H */
......@@ -11,6 +11,10 @@
#include "winbase.h"
#include "wine/obj_oleaut.h" /* for DISPID */
#ifdef __cplusplus
extern "C" {
#endif /* defined(__cplusplus) */
/*****************************************************************************
* Declare the structures
*/
......@@ -463,6 +467,8 @@ ICOM_DEFINE(IProvideClassInfo2,IProvideClassInfo)
#define IProvideClassInfo2_GetGUID(p,a,b) ICOM_CALL2(GetGUID,p,a,b)
#endif
#ifdef __cplusplus
} /* extern "C" */
#endif /* defined(__cplusplus) */
#endif /* __WINE_WINE_OBJ_CONTROL_H */
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment