2010-06-29  Ozkan Sezer  <sezeroz@gmail.com>

	* lib32/cfgmgr32.def: Fix @<n> suffix for CM_Add_ID[A|W] as 12,
	CM_Query_And_Remove_SubTree_Ex[A|W] as 24.
	* lib32/setupapi.def: Fix @<n> suffix for CM_Add_ID[A|W] as 12,
	CM_Get_Device_ID_List_Size_Ex[A|W] as 16.


git-svn-id: svn+ssh://svn.code.sf.net/p/mingw-w64/code/trunk@2723 4407c894-4637-0410-b4f5-ada5f102cad1
diff --git a/mingw-w64-crt/ChangeLog b/mingw-w64-crt/ChangeLog
index be1da38..17628fb 100644
--- a/mingw-w64-crt/ChangeLog
+++ b/mingw-w64-crt/ChangeLog
@@ -1,5 +1,9 @@
 2010-06-29  Ozkan Sezer  <sezeroz@gmail.com>
 
+	* lib32/cfgmgr32.def: Fix @<n> suffix for CM_Add_ID[A|W] as 12,
+	CM_Query_And_Remove_SubTree_Ex[A|W] as 24.
+	* lib32/setupapi.def: Fix @<n> suffix for CM_Add_ID[A|W] as 12,
+	CM_Get_Device_ID_List_Size_Ex[A|W] as 16.
 	* lib32/hal.def: Fix @<n> suffix for HalFreeCommonBuffer as 24.
 	* lib32/dxapi.def: Enabled DxApi and DxApiGetVersion exports.
 	* lib32/videoprt.def: Fix several @<n> suffixes.
diff --git a/mingw-w64-crt/lib32/cfgmgr32.def b/mingw-w64-crt/lib32/cfgmgr32.def
index d849e1a..eeea95d 100644
--- a/mingw-w64-crt/lib32/cfgmgr32.def
+++ b/mingw-w64-crt/lib32/cfgmgr32.def
@@ -8,8 +8,8 @@
 ;CMP_WaitServicesAvailable
 CM_Add_Empty_Log_Conf@16
 CM_Add_Empty_Log_Conf_Ex@20
-CM_Add_IDA@16
-CM_Add_IDW@16
+CM_Add_IDA@12
+CM_Add_IDW@12
 CM_Add_ID_ExA@16
 CM_Add_ID_ExW@16
 ;CM_Add_Range
@@ -150,8 +150,8 @@
 ;CM_Open_DevNode_Key_Ex
 CM_Query_And_Remove_SubTreeA@20
 CM_Query_And_Remove_SubTreeW@20
-CM_Query_And_Remove_SubTree_ExA@0
-CM_Query_And_Remove_SubTree_ExW@0
+CM_Query_And_Remove_SubTree_ExA@24
+CM_Query_And_Remove_SubTree_ExW@24
 ;CM_Query_Arbitrator_Free_Data
 ;CM_Query_Arbitrator_Free_Data_Ex
 ;CM_Query_Arbitrator_Free_Size
diff --git a/mingw-w64-crt/lib32/setupapi.def b/mingw-w64-crt/lib32/setupapi.def
index a48cfc1..809d58e 100644
--- a/mingw-w64-crt/lib32/setupapi.def
+++ b/mingw-w64-crt/lib32/setupapi.def
@@ -5,12 +5,13 @@
 AddTagToGroupOrderListEntry@12
 AppendStringToMultiSz@24
 AssertFail@12
+CMP_WaitNoPendingInstallEvents@4
 CM_Add_Empty_Log_Conf@16
 CM_Add_Empty_Log_Conf_Ex@20
-CM_Add_IDA@16
+CM_Add_IDA@12
+CM_Add_IDW@12
 CM_Add_ID_ExA@16
 CM_Add_ID_ExW@16
-CM_Add_IDW@16
 CM_Add_Res_Des@24
 CM_Add_Res_Des_Ex@28
 CM_Connect_MachineA@8
@@ -19,9 +20,9 @@
 CM_Enumerate_Classes@12
 CM_Enumerate_Classes_Ex@16
 CM_Enumerate_EnumeratorsA@16
+CM_Enumerate_EnumeratorsW@16
 CM_Enumerate_Enumerators_ExA@20
 CM_Enumerate_Enumerators_ExW@20
-CM_Enumerate_EnumeratorsW@16
 CM_Free_Log_Conf@8
 CM_Free_Log_Conf_Ex@12
 CM_Free_Log_Conf_Handle@4
@@ -33,22 +34,22 @@
 CM_Get_Child_Ex@16
 CM_Get_Depth@12
 CM_Get_Depth_Ex@16
-CM_Get_Device_IDA@16
-CM_Get_Device_ID_ExA@20
-CM_Get_Device_ID_ExW@20
-CM_Get_Device_IDW@16
-CM_Get_Device_ID_ListA@16
-CM_Get_Device_ID_List_ExA@20
-CM_Get_Device_ID_List_ExW@20
-CM_Get_Device_ID_ListW@16
-CM_Get_Device_ID_List_SizeA@12
-CM_Get_Device_ID_List_Size_ExA@20
-CM_Get_Device_ID_List_Size_ExW@20
-CM_Get_Device_ID_List_SizeW@12
-CM_Get_Device_ID_Size@12
-CM_Get_Device_ID_Size_Ex@16
 CM_Get_DevNode_Status@16
 CM_Get_DevNode_Status_Ex@20
+CM_Get_Device_IDA@16
+CM_Get_Device_IDW@16
+CM_Get_Device_ID_ExA@20
+CM_Get_Device_ID_ExW@20
+CM_Get_Device_ID_ListA@16
+CM_Get_Device_ID_ListW@16
+CM_Get_Device_ID_List_ExA@20
+CM_Get_Device_ID_List_ExW@20
+CM_Get_Device_ID_List_SizeA@12
+CM_Get_Device_ID_List_SizeW@12
+CM_Get_Device_ID_List_Size_ExA@16
+CM_Get_Device_ID_List_Size_ExW@16
+CM_Get_Device_ID_Size@12
+CM_Get_Device_ID_Size_Ex@16
 CM_Get_First_Log_Conf@12
 CM_Get_First_Log_Conf_Ex@16
 CM_Get_Log_Conf_Priority@12
@@ -71,9 +72,9 @@
 CM_Get_Version@0
 CM_Get_Version_Ex@4
 CM_Locate_DevNodeA@12
+CM_Locate_DevNodeW@12
 CM_Locate_DevNode_ExA@16
 CM_Locate_DevNode_ExW@16
-CM_Locate_DevNodeW@12
 CM_Modify_Res_Des@24
 CM_Modify_Res_Des_Ex@28
 CM_Query_And_Remove_SubTreeA@20
@@ -87,7 +88,6 @@
 CM_Request_Device_EjectW@20
 CM_Request_Device_Eject_ExA@24
 CM_Request_Device_Eject_ExW@24
-CMP_WaitNoPendingInstallEvents@4
 CaptureAndConvertAnsiArg@8
 CaptureStringArg@8
 CenterWindowRelativeToParent@4