Module: wine Branch: master Commit: c239f38db44118235f6450ea6f111d0ee1d7f38a URL: https://source.winehq.org/git/wine.git/?a=commit;h=c239f38db44118235f6450ea6...
Author: Alexandre Julliard julliard@winehq.org Date: Tue Feb 15 15:38:59 2022 +0100
api-ms-*: Forward to cfgmgr32 instead of setupapi.
Signed-off-by: Alexandre Julliard julliard@winehq.org
---
.../api-ms-win-devices-config-l1-1-0.spec | 30 +++++++++++----------- .../api-ms-win-devices-config-l1-1-1.spec | 30 +++++++++++----------- tools/make_specfiles | 1 - 3 files changed, 30 insertions(+), 31 deletions(-)
diff --git a/dlls/api-ms-win-devices-config-l1-1-0/api-ms-win-devices-config-l1-1-0.spec b/dlls/api-ms-win-devices-config-l1-1-0/api-ms-win-devices-config-l1-1-0.spec index 59004c997f7..87d0e9fd903 100644 --- a/dlls/api-ms-win-devices-config-l1-1-0/api-ms-win-devices-config-l1-1-0.spec +++ b/dlls/api-ms-win-devices-config-l1-1-0/api-ms-win-devices-config-l1-1-0.spec @@ -3,33 +3,33 @@ @ stub CM_Delete_Device_Interface_KeyW @ stub CM_Disable_DevNode @ stub CM_Enable_DevNode -@ stdcall CM_Get_Child(ptr long long) setupapi.CM_Get_Child +@ stdcall CM_Get_Child(ptr long long) cfgmgr32.CM_Get_Child @ stub CM_Get_Class_PropertyW @ stub CM_Get_Class_Property_Keys -@ stdcall CM_Get_Class_Registry_PropertyW(ptr long ptr ptr long long ptr) setupapi.CM_Get_Class_Registry_PropertyW +@ stdcall CM_Get_Class_Registry_PropertyW(ptr long ptr ptr long long ptr) cfgmgr32.CM_Get_Class_Registry_PropertyW @ stub CM_Get_Depth -@ stdcall CM_Get_DevNode_PropertyW(long ptr ptr ptr ptr long) setupapi.CM_Get_DevNode_PropertyW +@ stdcall CM_Get_DevNode_PropertyW(long ptr ptr ptr ptr long) cfgmgr32.CM_Get_DevNode_PropertyW @ stub CM_Get_DevNode_Property_Keys -@ stdcall CM_Get_DevNode_Registry_PropertyW(long long ptr ptr ptr long) setupapi.CM_Get_DevNode_Registry_PropertyW -@ stdcall CM_Get_DevNode_Status(ptr ptr long long) setupapi.CM_Get_DevNode_Status -@ stdcall CM_Get_Device_IDW(ptr ptr long long) setupapi.CM_Get_Device_IDW -@ stdcall CM_Get_Device_ID_ListW(wstr ptr long long) setupapi.CM_Get_Device_ID_ListW -@ stdcall CM_Get_Device_ID_List_SizeW(ptr wstr long) setupapi.CM_Get_Device_ID_List_SizeW -@ stdcall CM_Get_Device_ID_Size(ptr ptr long) setupapi.CM_Get_Device_ID_Size +@ stdcall CM_Get_DevNode_Registry_PropertyW(long long ptr ptr ptr long) cfgmgr32.CM_Get_DevNode_Registry_PropertyW +@ stdcall CM_Get_DevNode_Status(ptr ptr long long) cfgmgr32.CM_Get_DevNode_Status +@ stdcall CM_Get_Device_IDW(ptr ptr long long) cfgmgr32.CM_Get_Device_IDW +@ stdcall CM_Get_Device_ID_ListW(wstr ptr long long) cfgmgr32.CM_Get_Device_ID_ListW +@ stdcall CM_Get_Device_ID_List_SizeW(ptr wstr long) cfgmgr32.CM_Get_Device_ID_List_SizeW +@ stdcall CM_Get_Device_ID_Size(ptr ptr long) cfgmgr32.CM_Get_Device_ID_Size @ stub CM_Get_Device_Interface_ListW -@ stdcall CM_Get_Device_Interface_List_SizeW(ptr ptr wstr long) setupapi.CM_Get_Device_Interface_List_SizeW +@ stdcall CM_Get_Device_Interface_List_SizeW(ptr ptr wstr long) cfgmgr32.CM_Get_Device_Interface_List_SizeW @ stub CM_Get_Device_Interface_PropertyW @ stub CM_Get_Device_Interface_Property_KeysW -@ stdcall CM_Get_Parent(ptr long long) setupapi.CM_Get_Parent -@ stdcall CM_Get_Sibling(ptr long long) setupapi.CM_Get_Sibling -@ stdcall CM_Locate_DevNodeW(ptr wstr long) setupapi.CM_Locate_DevNodeW +@ stdcall CM_Get_Parent(ptr long long) cfgmgr32.CM_Get_Parent +@ stdcall CM_Get_Sibling(ptr long long) cfgmgr32.CM_Get_Sibling +@ stdcall CM_Locate_DevNodeW(ptr wstr long) cfgmgr32.CM_Locate_DevNodeW @ stub CM_Open_Class_KeyW -@ stdcall CM_Open_DevNode_Key(long long long long ptr long) setupapi.CM_Open_DevNode_Key +@ stdcall CM_Open_DevNode_Key(long long long long ptr long) cfgmgr32.CM_Open_DevNode_Key @ stub CM_Open_Device_Interface_KeyW @ stub CM_Query_And_Remove_SubTreeW @ stub CM_Register_Notification @ stub CM_Set_Class_PropertyW -@ stdcall CM_Set_Class_Registry_PropertyW(ptr long ptr long long ptr) setupapi.CM_Set_Class_Registry_PropertyW +@ stdcall CM_Set_Class_Registry_PropertyW(ptr long ptr long long ptr) cfgmgr32.CM_Set_Class_Registry_PropertyW @ stub CM_Set_DevNode_PropertyW @ stub CM_Set_DevNode_Registry_PropertyW @ stub CM_Set_Device_Interface_PropertyW diff --git a/dlls/api-ms-win-devices-config-l1-1-1/api-ms-win-devices-config-l1-1-1.spec b/dlls/api-ms-win-devices-config-l1-1-1/api-ms-win-devices-config-l1-1-1.spec index e10352eda59..46ef2754e7b 100644 --- a/dlls/api-ms-win-devices-config-l1-1-1/api-ms-win-devices-config-l1-1-1.spec +++ b/dlls/api-ms-win-devices-config-l1-1-1/api-ms-win-devices-config-l1-1-1.spec @@ -3,34 +3,34 @@ @ stub CM_Delete_Device_Interface_KeyW @ stub CM_Disable_DevNode @ stub CM_Enable_DevNode -@ stdcall CM_Get_Child(ptr long long) setupapi.CM_Get_Child +@ stdcall CM_Get_Child(ptr long long) cfgmgr32.CM_Get_Child @ stub CM_Get_Class_PropertyW @ stub CM_Get_Class_Property_Keys -@ stdcall CM_Get_Class_Registry_PropertyW(ptr long ptr ptr long long ptr) setupapi.CM_Get_Class_Registry_PropertyW +@ stdcall CM_Get_Class_Registry_PropertyW(ptr long ptr ptr long long ptr) cfgmgr32.CM_Get_Class_Registry_PropertyW @ stub CM_Get_Depth -@ stdcall CM_Get_DevNode_PropertyW(long ptr ptr ptr ptr long) setupapi.CM_Get_DevNode_PropertyW +@ stdcall CM_Get_DevNode_PropertyW(long ptr ptr ptr ptr long) cfgmgr32.CM_Get_DevNode_PropertyW @ stub CM_Get_DevNode_Property_Keys -@ stdcall CM_Get_DevNode_Registry_PropertyW(long long ptr ptr ptr long) setupapi.CM_Get_DevNode_Registry_PropertyW -@ stdcall CM_Get_DevNode_Status(ptr ptr long long) setupapi.CM_Get_DevNode_Status -@ stdcall CM_Get_Device_IDW(ptr ptr long long) setupapi.CM_Get_Device_IDW -@ stdcall CM_Get_Device_ID_ListW(wstr ptr long long) setupapi.CM_Get_Device_ID_ListW -@ stdcall CM_Get_Device_ID_List_SizeW(ptr wstr long) setupapi.CM_Get_Device_ID_List_SizeW -@ stdcall CM_Get_Device_ID_Size(ptr ptr long) setupapi.CM_Get_Device_ID_Size +@ stdcall CM_Get_DevNode_Registry_PropertyW(long long ptr ptr ptr long) cfgmgr32.CM_Get_DevNode_Registry_PropertyW +@ stdcall CM_Get_DevNode_Status(ptr ptr long long) cfgmgr32.CM_Get_DevNode_Status +@ stdcall CM_Get_Device_IDW(ptr ptr long long) cfgmgr32.CM_Get_Device_IDW +@ stdcall CM_Get_Device_ID_ListW(wstr ptr long long) cfgmgr32.CM_Get_Device_ID_ListW +@ stdcall CM_Get_Device_ID_List_SizeW(ptr wstr long) cfgmgr32.CM_Get_Device_ID_List_SizeW +@ stdcall CM_Get_Device_ID_Size(ptr ptr long) cfgmgr32.CM_Get_Device_ID_Size @ stub CM_Get_Device_Interface_ListW -@ stdcall CM_Get_Device_Interface_List_SizeW(ptr ptr wstr long) setupapi.CM_Get_Device_Interface_List_SizeW +@ stdcall CM_Get_Device_Interface_List_SizeW(ptr ptr wstr long) cfgmgr32.CM_Get_Device_Interface_List_SizeW @ stub CM_Get_Device_Interface_PropertyW @ stub CM_Get_Device_Interface_Property_KeysW -@ stdcall CM_Get_Parent(ptr long long) setupapi.CM_Get_Parent -@ stdcall CM_Get_Sibling(ptr long long) setupapi.CM_Get_Sibling -@ stdcall CM_Locate_DevNodeW(ptr wstr long) setupapi.CM_Locate_DevNodeW +@ stdcall CM_Get_Parent(ptr long long) cfgmgr32.CM_Get_Parent +@ stdcall CM_Get_Sibling(ptr long long) cfgmgr32.CM_Get_Sibling +@ stdcall CM_Locate_DevNodeW(ptr wstr long) cfgmgr32.CM_Locate_DevNodeW @ stub CM_MapCrToWin32Err @ stub CM_Open_Class_KeyW -@ stdcall CM_Open_DevNode_Key(long long long long ptr long) setupapi.CM_Open_DevNode_Key +@ stdcall CM_Open_DevNode_Key(long long long long ptr long) cfgmgr32.CM_Open_DevNode_Key @ stub CM_Open_Device_Interface_KeyW @ stub CM_Query_And_Remove_SubTreeW @ stub CM_Register_Notification @ stub CM_Set_Class_PropertyW -@ stdcall CM_Set_Class_Registry_PropertyW(ptr long ptr long long ptr) setupapi.CM_Set_Class_Registry_PropertyW +@ stdcall CM_Set_Class_Registry_PropertyW(ptr long ptr long long ptr) cfgmgr32.CM_Set_Class_Registry_PropertyW @ stub CM_Set_DevNode_PropertyW @ stub CM_Set_DevNode_Registry_PropertyW @ stub CM_Set_Device_Interface_PropertyW diff --git a/tools/make_specfiles b/tools/make_specfiles index 157337ee01a..07fb263ed65 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -101,7 +101,6 @@ my @dll_groups = "xinput9_1_0", ], [ - "setupapi", "cfgmgr32", "api-ms-win-devices-config-l1-1-0", "api-ms-win-devices-config-l1-1-1",