Module: wine Branch: master Commit: 27a537d13fa849f9b91759b44b12a31366ba14f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=27a537d13fa849f9b91759b44b... Author: Ricardo Filipe <ricardo_barbano(a)hotmail.com> Date: Thu Dec 18 09:48:16 2008 +0000 include: Add DEVNODEID and DEVINSTID definitions. --- include/cfgmgr32.h | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/include/cfgmgr32.h b/include/cfgmgr32.h index 5862fa6..635ac98 100644 --- a/include/cfgmgr32.h +++ b/include/cfgmgr32.h @@ -21,6 +21,13 @@ /* FIXME: #include <cfg.h> */ +/* cfgmgr32 doesn't use the normal convention, it adds an underscore before A/W */ +#ifdef WINE_NO_UNICODE_MACROS +# define DECL_WINELIB_CFGMGR32_TYPE_AW(type) /* nothing */ +#else +# define DECL_WINELIB_CFGMGR32_TYPE_AW(type) typedef WINELIB_NAME_AW(type##_) type; +#endif + #define CMAPI typedef DWORD CONFIGRET; @@ -97,6 +104,11 @@ typedef DWORD CONFIGRET; typedef DWORD DEVINST, *PDEVINST; typedef DWORD DEVNODE, *PDEVNODE; typedef HANDLE HMACHINE, *PHMACHINE; +typedef CHAR *DEVNODEID_A, *DEVINSTID_A; +typedef WCHAR *DEVNODEID_W, *DEVINSTID_W; + +DECL_WINELIB_CFGMGR32_TYPE_AW(DEVNODEID) +DECL_WINELIB_CFGMGR32_TYPE_AW(DEVINSTID) #ifdef __cplusplus extern "C" { @@ -122,4 +134,6 @@ CMAPI CONFIGRET WINAPI CM_Get_Device_ID_Size_Ex(PULONG,DEVINST,ULONG,HMACHINE); } #endif +#undef DECL_WINELIB_CFGMGR32_TYPE_AW + #endif /* _CFGMGR32_H_ */