[PATCH v2 0/2] MR10303: SDK compliance (2)
This serie ensures a couple of Wine include files are properly defined when included from C++ code. It mainly adds a extern "C" { ... } around the various definitions. The list of modified files has been determined by: - checking Wine headers without extern "C" instruction, while SDK one has it, - not all files matching that criteria have been patched (eg DDK files have been left out) - some files have been patched even if their current content doesn't require it (ie no variable nor extern function definition), esp. when their SDK equivalent has a lot of such definitions (so that the c++ guard is not forgotten when the header file is updated), - search criteria is also not 100% accurate (eg missing EXTERN_C macro). Been triggered by bcrypt.h failing to be used in C++ code (didn't test for the others). -- v2: include: Don't use C++ keywords. include: Add missing extern "C" wrappers. https://gitlab.winehq.org/wine/wine/-/merge_requests/10303
From: Eric Pouech <epouech@codeweavers.com> Signed-off-by: Eric Pouech <epouech@codeweavers.com> --- include/bcrypt.h | 8 ++++++++ include/memoryapi.h | 13 +++++++++++++ include/roerrorapi.h | 8 ++++++++ 3 files changed, 29 insertions(+) diff --git a/include/bcrypt.h b/include/bcrypt.h index b0cdf6e27a3..bf22f6dfb9b 100644 --- a/include/bcrypt.h +++ b/include/bcrypt.h @@ -44,6 +44,10 @@ typedef LONG NTSTATUS; #define BCRYPT_SUCCESS(st) ((NTSTATUS)(st) >= 0) #endif +#ifdef __cplusplus +extern "C" { +#endif + #if defined(_MSC_VER) || defined(__MINGW32__) #define BCRYPT_ALGORITHM_NAME L"AlgorithmName" #define BCRYPT_AUTH_TAG_LENGTH L"AuthTagLength" @@ -604,4 +608,8 @@ NTSTATUS WINAPI BCryptSetProperty(BCRYPT_HANDLE, LPCWSTR, PUCHAR, ULONG, ULONG); NTSTATUS WINAPI BCryptSignHash(BCRYPT_KEY_HANDLE, void *, PUCHAR, ULONG, PUCHAR, ULONG, ULONG *, ULONG); NTSTATUS WINAPI BCryptVerifySignature(BCRYPT_KEY_HANDLE, void *, UCHAR *, ULONG, UCHAR *, ULONG, ULONG); +#ifdef __cplusplus +} +#endif + #endif /* __WINE_BCRYPT_H */ diff --git a/include/memoryapi.h b/include/memoryapi.h index 2cfcdd5a273..79c01aaed23 100644 --- a/include/memoryapi.h +++ b/include/memoryapi.h @@ -14,6 +14,13 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#ifndef _MEMORY_API_H_ +#define _MEMORY_API_H_ + +#ifdef __cplusplus +extern "C" { +#endif + typedef enum WIN32_MEMORY_INFORMATION_CLASS { MemoryRegionInfo @@ -44,3 +51,9 @@ typedef struct WIN32_MEMORY_REGION_INFORMATION WINBASEAPI HANDLE WINAPI CreateFileMapping2(HANDLE,LPSECURITY_ATTRIBUTES,ULONG,ULONG,ULONG,ULONG64,const WCHAR*,MEM_EXTENDED_PARAMETER*,ULONG); WINBASEAPI DWORD WINAPI DiscardVirtualMemory(void *addr, SIZE_T size); WINBASEAPI BOOL WINAPI QueryVirtualMemoryInformation(HANDLE process,const void *addr, WIN32_MEMORY_INFORMATION_CLASS info_class, void *info, SIZE_T size, SIZE_T *ret_size); + +#ifdef __cplusplus +} +#endif + +#endif /* _MEMORY_API_H_ */ diff --git a/include/roerrorapi.h b/include/roerrorapi.h index 0bab6651d2b..f154c679418 100644 --- a/include/roerrorapi.h +++ b/include/roerrorapi.h @@ -23,6 +23,10 @@ #include <restrictederrorinfo.h> #include <rpc.h> +#ifdef __cplusplus +extern "C" { +#endif + typedef enum { RO_ERROR_REPORTING_NONE = 0x0, @@ -42,4 +46,8 @@ HRESULT WINAPI RoReportUnhandledError(IRestrictedErrorInfo *info); HRESULT WINAPI RoSetErrorReportingFlags(UINT32 flags); HRESULT WINAPI SetRestrictedErrorInfo(IRestrictedErrorInfo *info); +#ifdef __cplusplus +} +#endif + #endif /* _ROERROR_H */ -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/10303
From: Eric Pouech <epouech@codeweavers.com> Signed-off-by: Eric Pouech <epouech@codeweavers.com> --- include/cfgmgr32.h | 76 +++++++++++++++++++++++----------------------- 1 file changed, 38 insertions(+), 38 deletions(-) diff --git a/include/cfgmgr32.h b/include/cfgmgr32.h index 43a2157f1cf..88adf285b1e 100644 --- a/include/cfgmgr32.h +++ b/include/cfgmgr32.h @@ -360,8 +360,8 @@ CMAPI CONFIGRET WINAPI CM_Create_DevNodeA( DEVINST *node, DEVINSTID_A instance_i CMAPI CONFIGRET WINAPI CM_Create_DevNodeW( DEVINST *node, DEVINSTID_W instance_id, DEVINST parent, ULONG flags ); #define CM_Create_DevNode WINELIB_NAME_AW(CM_Create_DevNode) CMAPI CONFIGRET WINAPI CM_Create_Range_List( RANGE_LIST *ranges, ULONG flags ); -CMAPI CONFIGRET WINAPI CM_Delete_Class_Key( GUID *class, ULONG flags ); -CMAPI CONFIGRET WINAPI CM_Delete_Class_Key_Ex( GUID *class, ULONG flags, HMACHINE machine ); +CMAPI CONFIGRET WINAPI CM_Delete_Class_Key( GUID *class_, ULONG flags ); +CMAPI CONFIGRET WINAPI CM_Delete_Class_Key_Ex( GUID *class_, ULONG flags, HMACHINE machine ); CMAPI CONFIGRET WINAPI CM_Delete_Device_Interface_Key_ExA( const char *iface, ULONG flags, HMACHINE machine ); CMAPI CONFIGRET WINAPI CM_Delete_Device_Interface_Key_ExW( const WCHAR *iface, ULONG flags, HMACHINE machine ); #define CM_Delete_Device_Interface_Key_Ex WINELIB_NAME_AW(CM_Delete_Device_Interface_Key_Ex) @@ -379,8 +379,8 @@ CMAPI CONFIGRET WINAPI CM_Disconnect_Machine( HMACHINE machine ); CMAPI CONFIGRET WINAPI CM_Dup_Range_List( RANGE_LIST old_ranges, RANGE_LIST new_ranges, ULONG flags ); CMAPI CONFIGRET WINAPI CM_Enable_DevNode( DEVINST node, ULONG flags ); CMAPI CONFIGRET WINAPI CM_Enable_DevNode_Ex( DEVINST node, ULONG flags, HMACHINE machine ); -CMAPI CONFIGRET WINAPI CM_Enumerate_Classes( ULONG index, GUID *class, ULONG flags ); -CMAPI CONFIGRET WINAPI CM_Enumerate_Classes_Ex( ULONG index, GUID *class, ULONG flags, HMACHINE machine ); +CMAPI CONFIGRET WINAPI CM_Enumerate_Classes( ULONG index, GUID *class_, ULONG flags ); +CMAPI CONFIGRET WINAPI CM_Enumerate_Classes_Ex( ULONG index, GUID *class_, ULONG flags, HMACHINE machine ); CMAPI CONFIGRET WINAPI CM_Enumerate_Enumerators_ExA( ULONG index, char *buffer, ULONG *len, ULONG flags, HMACHINE machine ); CMAPI CONFIGRET WINAPI CM_Enumerate_Enumerators_ExW( ULONG index, WCHAR *buffer, ULONG *len, ULONG flags, HMACHINE machine ); #define CM_Enumerate_Enumerators_Ex WINELIB_NAME_AW(CM_Enumerate_Enumerators_Ex) @@ -399,24 +399,24 @@ CMAPI CONFIGRET WINAPI CM_Free_Res_Des_Handle( RES_DES desc ); CMAPI CONFIGRET WINAPI CM_Free_Resource_Conflict_Handle( CONFLICT_LIST conflicts ); CMAPI CONFIGRET WINAPI CM_Get_Child( DEVINST *child, DEVINST node, ULONG flags ); CMAPI CONFIGRET WINAPI CM_Get_Child_Ex( DEVINST *child, DEVINST node, ULONG flags, HMACHINE machine ); -CMAPI CONFIGRET WINAPI CM_Get_Class_Key_Name_ExA( GUID *class, char *name, ULONG *len, ULONG flags, HMACHINE machine ); -CMAPI CONFIGRET WINAPI CM_Get_Class_Key_Name_ExW( GUID *class, WCHAR *name, ULONG *len, ULONG flags, HMACHINE machine ); +CMAPI CONFIGRET WINAPI CM_Get_Class_Key_Name_ExA( GUID *class_, char *name, ULONG *len, ULONG flags, HMACHINE machine ); +CMAPI CONFIGRET WINAPI CM_Get_Class_Key_Name_ExW( GUID *class_, WCHAR *name, ULONG *len, ULONG flags, HMACHINE machine ); #define CM_Get_Class_Key_Name_Ex WINELIB_NAME_AW(CM_Get_Class_Key_Name_Ex) -CMAPI CONFIGRET WINAPI CM_Get_Class_Key_NameA( GUID *class, char *name, ULONG *len, ULONG flags ); -CMAPI CONFIGRET WINAPI CM_Get_Class_Key_NameW( GUID *class, WCHAR *name, ULONG *len, ULONG flags ); +CMAPI CONFIGRET WINAPI CM_Get_Class_Key_NameA( GUID *class_, char *name, ULONG *len, ULONG flags ); +CMAPI CONFIGRET WINAPI CM_Get_Class_Key_NameW( GUID *class_, WCHAR *name, ULONG *len, ULONG flags ); #define CM_Get_Class_Key_Name WINELIB_NAME_AW(CM_Get_Class_Key_Name) -CMAPI CONFIGRET WINAPI CM_Get_Class_Name_ExA( GUID *class, char *buffer, ULONG *len, ULONG flags, HMACHINE machine ); -CMAPI CONFIGRET WINAPI CM_Get_Class_Name_ExW( GUID *class, WCHAR *buffer, ULONG *len, ULONG flags, HMACHINE machine ); +CMAPI CONFIGRET WINAPI CM_Get_Class_Name_ExA( GUID *class_, char *buffer, ULONG *len, ULONG flags, HMACHINE machine ); +CMAPI CONFIGRET WINAPI CM_Get_Class_Name_ExW( GUID *class_, WCHAR *buffer, ULONG *len, ULONG flags, HMACHINE machine ); #define CM_Get_Class_Name_Ex WINELIB_NAME_AW(CM_Get_Class_Name_Ex) -CMAPI CONFIGRET WINAPI CM_Get_Class_NameA( GUID *class, char *buffer, ULONG *len, ULONG flags ); -CMAPI CONFIGRET WINAPI CM_Get_Class_NameW( GUID *class, WCHAR *buffer, ULONG *len, ULONG flags ); +CMAPI CONFIGRET WINAPI CM_Get_Class_NameA( GUID *class_, char *buffer, ULONG *len, ULONG flags ); +CMAPI CONFIGRET WINAPI CM_Get_Class_NameW( GUID *class_, WCHAR *buffer, ULONG *len, ULONG flags ); #define CM_Get_Class_Name WINELIB_NAME_AW(CM_Get_Class_Name) -CMAPI CONFIGRET WINAPI CM_Get_Class_Property_ExW( const GUID *class, const DEVPROPKEY *key, DEVPROPTYPE *type, BYTE *buffer, ULONG *size, ULONG flags, HMACHINE machine ); -CMAPI CONFIGRET WINAPI CM_Get_Class_Property_Keys( const GUID *class, DEVPROPKEY *keys, ULONG *count, ULONG flags ); -CMAPI CONFIGRET WINAPI CM_Get_Class_Property_Keys_Ex( const GUID *class, DEVPROPKEY *keys, ULONG *count, ULONG flags, HMACHINE machine ); -CMAPI CONFIGRET WINAPI CM_Get_Class_PropertyW( const GUID *class, const DEVPROPKEY *key, DEVPROPTYPE *type, BYTE *buffer, ULONG *size, ULONG flags ); -CMAPI CONFIGRET WINAPI CM_Get_Class_Registry_PropertyA( GUID *class, ULONG property, ULONG *type, void *buffer, ULONG *len, ULONG flags, HMACHINE machine ); -CMAPI CONFIGRET WINAPI CM_Get_Class_Registry_PropertyW( GUID *class, ULONG property, ULONG *type, void *buffer, ULONG *len, ULONG flags, HMACHINE machine ); +CMAPI CONFIGRET WINAPI CM_Get_Class_Property_ExW( const GUID *class_, const DEVPROPKEY *key, DEVPROPTYPE *type, BYTE *buffer, ULONG *size, ULONG flags, HMACHINE machine ); +CMAPI CONFIGRET WINAPI CM_Get_Class_Property_Keys( const GUID *class_, DEVPROPKEY *keys, ULONG *count, ULONG flags ); +CMAPI CONFIGRET WINAPI CM_Get_Class_Property_Keys_Ex( const GUID *class_, DEVPROPKEY *keys, ULONG *count, ULONG flags, HMACHINE machine ); +CMAPI CONFIGRET WINAPI CM_Get_Class_PropertyW( const GUID *class_, const DEVPROPKEY *key, DEVPROPTYPE *type, BYTE *buffer, ULONG *size, ULONG flags ); +CMAPI CONFIGRET WINAPI CM_Get_Class_Registry_PropertyA( GUID *class_, ULONG property, ULONG *type, void *buffer, ULONG *len, ULONG flags, HMACHINE machine ); +CMAPI CONFIGRET WINAPI CM_Get_Class_Registry_PropertyW( GUID *class_, ULONG property, ULONG *type, void *buffer, ULONG *len, ULONG flags, HMACHINE machine ); #define CM_Get_Class_Registry_Property WINELIB_NAME_AW(CM_Get_Class_Registry_Property) CMAPI CONFIGRET WINAPI CM_Get_Depth( ULONG *depth, DEVINST node, ULONG flags ); CMAPI CONFIGRET WINAPI CM_Get_Depth_Ex( ULONG *depth, DEVINST node, ULONG flags, HMACHINE machine ); @@ -446,17 +446,17 @@ CMAPI CONFIGRET WINAPI CM_Get_Device_Interface_Alias_ExW( const WCHAR *iface, GU CMAPI CONFIGRET WINAPI CM_Get_Device_Interface_AliasA( const char *iface, GUID *alias_guid, char *alias_iface, ULONG *len, ULONG flags ); CMAPI CONFIGRET WINAPI CM_Get_Device_Interface_AliasW( const WCHAR *iface, GUID *alias_guid, WCHAR *alias_iface, ULONG *len, ULONG flags ); #define CM_Get_Device_Interface_Alias WINELIB_NAME_AW(CM_Get_Device_Interface_Alias) -CMAPI CONFIGRET WINAPI CM_Get_Device_Interface_List_ExA( GUID *class, DEVINSTID_A instance_id, char *buffer, ULONG len, ULONG flags, HMACHINE machine ); -CMAPI CONFIGRET WINAPI CM_Get_Device_Interface_List_ExW( GUID *class, DEVINSTID_W instance_id, WCHAR *buffer, ULONG len, ULONG flags, HMACHINE machine ); +CMAPI CONFIGRET WINAPI CM_Get_Device_Interface_List_ExA( GUID *class_, DEVINSTID_A instance_id, char *buffer, ULONG len, ULONG flags, HMACHINE machine ); +CMAPI CONFIGRET WINAPI CM_Get_Device_Interface_List_ExW( GUID *class_, DEVINSTID_W instance_id, WCHAR *buffer, ULONG len, ULONG flags, HMACHINE machine ); #define CM_Get_Device_Interface_List_Ex WINELIB_NAME_AW(CM_Get_Device_Interface_List_Ex) -CMAPI CONFIGRET WINAPI CM_Get_Device_Interface_List_Size_ExA( ULONG *len, GUID *class, DEVINSTID_A instance_id, ULONG flags, HMACHINE machine ); -CMAPI CONFIGRET WINAPI CM_Get_Device_Interface_List_Size_ExW( ULONG *len, GUID *class, DEVINSTID_W instance_id, ULONG flags, HMACHINE machine ); +CMAPI CONFIGRET WINAPI CM_Get_Device_Interface_List_Size_ExA( ULONG *len, GUID *class_, DEVINSTID_A instance_id, ULONG flags, HMACHINE machine ); +CMAPI CONFIGRET WINAPI CM_Get_Device_Interface_List_Size_ExW( ULONG *len, GUID *class_, DEVINSTID_W instance_id, ULONG flags, HMACHINE machine ); #define CM_Get_Device_Interface_List_Size_Ex WINELIB_NAME_AW(CM_Get_Device_Interface_List_Size_Ex) -CMAPI CONFIGRET WINAPI CM_Get_Device_Interface_List_SizeA( ULONG *len, GUID *class, DEVINSTID_A instance_id, ULONG flags ); -CMAPI CONFIGRET WINAPI CM_Get_Device_Interface_List_SizeW( ULONG *len, GUID *class, DEVINSTID_W instance_id, ULONG flags ); +CMAPI CONFIGRET WINAPI CM_Get_Device_Interface_List_SizeA( ULONG *len, GUID *class_, DEVINSTID_A instance_id, ULONG flags ); +CMAPI CONFIGRET WINAPI CM_Get_Device_Interface_List_SizeW( ULONG *len, GUID *class_, DEVINSTID_W instance_id, ULONG flags ); #define CM_Get_Device_Interface_List_Size WINELIB_NAME_AW(CM_Get_Device_Interface_List_Size) -CMAPI CONFIGRET WINAPI CM_Get_Device_Interface_ListA( GUID *class, DEVINSTID_A instance_id, char *buffer, ULONG len, ULONG flags ); -CMAPI CONFIGRET WINAPI CM_Get_Device_Interface_ListW( GUID *class, DEVINSTID_W instance_id, WCHAR *buffer, ULONG len, ULONG flags ); +CMAPI CONFIGRET WINAPI CM_Get_Device_Interface_ListA( GUID *class_, DEVINSTID_A instance_id, char *buffer, ULONG len, ULONG flags ); +CMAPI CONFIGRET WINAPI CM_Get_Device_Interface_ListW( GUID *class_, DEVINSTID_W instance_id, WCHAR *buffer, ULONG len, ULONG flags ); #define CM_Get_Device_Interface_List WINELIB_NAME_AW(CM_Get_Device_Interface_List) CMAPI CONFIGRET WINAPI CM_Get_Device_Interface_Property_ExW( const WCHAR *iface, const DEVPROPKEY *key, DEVPROPTYPE *type, BYTE *buffer, ULONG *size, ULONG flags, HMACHINE machine ); CMAPI CONFIGRET WINAPI CM_Get_Device_Interface_Property_Keys_ExW( const WCHAR *iface, DEVPROPKEY *keys, ULONG *count, ULONG flags, HMACHINE machine ); @@ -535,11 +535,11 @@ CMAPI CONFIGRET WINAPI CM_Modify_Res_Des_Ex( RES_DES *new_desc, RES_DES old_desc CMAPI CONFIGRET WINAPI CM_Move_DevNode( DEVINST node_src, DEVINST node_dst, ULONG flags ); CMAPI CONFIGRET WINAPI CM_Move_DevNode_Ex( DEVINST node_src, DEVINST node_dst, ULONG flags, HMACHINE machine ); CMAPI CONFIGRET WINAPI CM_Next_Range( RANGE_ELEMENT *element, DWORDLONG *start, DWORDLONG *end, ULONG flags ); -CMAPI CONFIGRET WINAPI CM_Open_Class_Key_ExA( GUID *class, const char *name, REGSAM access, REGDISPOSITION disposition, HKEY *hkey, ULONG flags, HMACHINE machine ); -CMAPI CONFIGRET WINAPI CM_Open_Class_Key_ExW( GUID *class, const WCHAR *name, REGSAM access, REGDISPOSITION disposition, HKEY *hkey, ULONG flags, HMACHINE machine ); +CMAPI CONFIGRET WINAPI CM_Open_Class_Key_ExA( GUID *class_, const char *name, REGSAM access, REGDISPOSITION disposition, HKEY *hkey, ULONG flags, HMACHINE machine ); +CMAPI CONFIGRET WINAPI CM_Open_Class_Key_ExW( GUID *class_, const WCHAR *name, REGSAM access, REGDISPOSITION disposition, HKEY *hkey, ULONG flags, HMACHINE machine ); #define CM_Open_Class_Key_Ex WINELIB_NAME_AW(CM_Open_Class_Key_Ex) -CMAPI CONFIGRET WINAPI CM_Open_Class_KeyA( GUID *class, const char *name, REGSAM access, REGDISPOSITION disposition, HKEY *hkey, ULONG flags ); -CMAPI CONFIGRET WINAPI CM_Open_Class_KeyW( GUID *class, const WCHAR *name, REGSAM access, REGDISPOSITION disposition, HKEY *hkey, ULONG flags ); +CMAPI CONFIGRET WINAPI CM_Open_Class_KeyA( GUID *class_, const char *name, REGSAM access, REGDISPOSITION disposition, HKEY *hkey, ULONG flags ); +CMAPI CONFIGRET WINAPI CM_Open_Class_KeyW( GUID *class_, const WCHAR *name, REGSAM access, REGDISPOSITION disposition, HKEY *hkey, ULONG flags ); #define CM_Open_Class_Key WINELIB_NAME_AW(CM_Open_Class_Key) CMAPI CONFIGRET WINAPI CM_Open_Device_Interface_Key_ExA( const char *iface, REGSAM access, REGDISPOSITION disposition, HKEY *hkey, ULONG flags, HMACHINE machine ); CMAPI CONFIGRET WINAPI CM_Open_Device_Interface_Key_ExW( const WCHAR *iface, REGSAM access, REGDISPOSITION disposition, HKEY *hkey, ULONG flags, HMACHINE machine ); @@ -566,11 +566,11 @@ CMAPI CONFIGRET WINAPI CM_Reenumerate_DevNode( DEVINST node, ULONG flags ); CMAPI CONFIGRET WINAPI CM_Reenumerate_DevNode_Ex( DEVINST node, ULONG flags, HMACHINE machine ); CMAPI CONFIGRET WINAPI CM_Register_Device_Driver( DEVINST node, ULONG flags ); CMAPI CONFIGRET WINAPI CM_Register_Device_Driver_Ex( DEVINST node, ULONG flags, HMACHINE machine ); -CMAPI CONFIGRET WINAPI CM_Register_Device_Interface_ExA( DEVINST node, GUID *class, const char *reference, char *iface, ULONG *len, ULONG flags, HMACHINE machine ); -CMAPI CONFIGRET WINAPI CM_Register_Device_Interface_ExW( DEVINST node, GUID *class, const WCHAR *reference, WCHAR *iface, ULONG *len, ULONG flags, HMACHINE machine ); +CMAPI CONFIGRET WINAPI CM_Register_Device_Interface_ExA( DEVINST node, GUID *class_, const char *reference, char *iface, ULONG *len, ULONG flags, HMACHINE machine ); +CMAPI CONFIGRET WINAPI CM_Register_Device_Interface_ExW( DEVINST node, GUID *class_, const WCHAR *reference, WCHAR *iface, ULONG *len, ULONG flags, HMACHINE machine ); #define CM_Register_Device_Interface_Ex WINELIB_NAME_AW(CM_Register_Device_Interface_Ex) -CMAPI CONFIGRET WINAPI CM_Register_Device_InterfaceA( DEVINST node, GUID *class, const char *reference, char *iface, ULONG *len, ULONG flags ); -CMAPI CONFIGRET WINAPI CM_Register_Device_InterfaceW( DEVINST node, GUID *class, const WCHAR *reference, WCHAR *iface, ULONG *len, ULONG flags ); +CMAPI CONFIGRET WINAPI CM_Register_Device_InterfaceA( DEVINST node, GUID *class_, const char *reference, char *iface, ULONG *len, ULONG flags ); +CMAPI CONFIGRET WINAPI CM_Register_Device_InterfaceW( DEVINST node, GUID *class_, const WCHAR *reference, WCHAR *iface, ULONG *len, ULONG flags ); #define CM_Register_Device_Interface WINELIB_NAME_AW(CM_Register_Device_Interface) CMAPI CONFIGRET WINAPI CM_Register_Notification( CM_NOTIFY_FILTER *filter, void *context, PCM_NOTIFY_CALLBACK callback, HCMNOTIFICATION *notify ); CMAPI CONFIGRET WINAPI CM_Remove_SubTree( DEVINST ancestor, ULONG flags ); @@ -585,10 +585,10 @@ CMAPI CONFIGRET WINAPI CM_Request_Eject_PC(void); CMAPI CONFIGRET WINAPI CM_Request_Eject_PC_Ex( HMACHINE machine ); CMAPI CONFIGRET WINAPI CM_Run_Detection( ULONG flags ); CMAPI CONFIGRET WINAPI CM_Run_Detection_Ex( ULONG flags, HMACHINE machine ); -CMAPI CONFIGRET WINAPI CM_Set_Class_Property_ExW( const GUID *class, const DEVPROPKEY *key, DEVPROPTYPE type, const BYTE *buffer, ULONG size, ULONG flags, HMACHINE machine ); -CMAPI CONFIGRET WINAPI CM_Set_Class_PropertyW( const GUID *class, const DEVPROPKEY *key, DEVPROPTYPE type, const BYTE *buffer, ULONG size, ULONG flags ); -CMAPI CONFIGRET WINAPI CM_Set_Class_Registry_PropertyA( GUID *class, ULONG property, const void *buffer, ULONG len, ULONG flags, HMACHINE machine ); -CMAPI CONFIGRET WINAPI CM_Set_Class_Registry_PropertyW( GUID *class, ULONG property, const void *buffer, ULONG len, ULONG flags, HMACHINE machine ); +CMAPI CONFIGRET WINAPI CM_Set_Class_Property_ExW( const GUID *class_, const DEVPROPKEY *key, DEVPROPTYPE type, const BYTE *buffer, ULONG size, ULONG flags, HMACHINE machine ); +CMAPI CONFIGRET WINAPI CM_Set_Class_PropertyW( const GUID *class_, const DEVPROPKEY *key, DEVPROPTYPE type, const BYTE *buffer, ULONG size, ULONG flags ); +CMAPI CONFIGRET WINAPI CM_Set_Class_Registry_PropertyA( GUID *class_, ULONG property, const void *buffer, ULONG len, ULONG flags, HMACHINE machine ); +CMAPI CONFIGRET WINAPI CM_Set_Class_Registry_PropertyW( GUID *class_, ULONG property, const void *buffer, ULONG len, ULONG flags, HMACHINE machine ); #define CM_Set_Class_Registry_Property WINELIB_NAME_AW(CM_Set_Class_Registry_Property) CMAPI CONFIGRET WINAPI CM_Set_Device_Interface_Property_ExW( const WCHAR *iface, const DEVPROPKEY *key, DEVPROPTYPE type, const BYTE *buffer, ULONG size, ULONG flags, HMACHINE machine ); CMAPI CONFIGRET WINAPI CM_Set_Device_Interface_PropertyW( const WCHAR *iface, const DEVPROPKEY *key, DEVPROPTYPE type, const BYTE *buffer, ULONG size, ULONG flags ); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/10303
This merge request was approved by Jacek Caban. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/10303
participants (3)
-
Eric Pouech -
eric pouech (＠epo)
-
Jacek Caban (＠jacek)