Author: ekohl
Date: Thu Mar 3 19:53:26 2011
New Revision: 50963
URL: http://svn.reactos.org/svn/reactos?rev=50963&view=rev
Log:
[SETUPAPI]
Implement CM_Register_Device_Interface[_Ex]A/W and
CM_Unregister_Device_Interface[_Ex]A/W.
Modified:
trunk/reactos/dll/win32/setupapi/cfgmgr.c
trunk/reactos/dll/win32/setupapi/setupapi.spec
Modified: trunk/reactos/dll/win32/setupapi/cfgmgr.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/cfgmgr.c?rev=50963&r1=50962&r2=50963&view=diff
==============================================================================
--- trunk/reactos/dll/win32/setupapi/cfgmgr.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/setupapi/cfgmgr.c [iso-8859-1] Thu Mar 3 19:53:26
2011
@@ -3963,6 +3963,174 @@
ulFlags,
lpDevInst,
NULL);
+ }
+ RpcExcept(EXCEPTION_EXECUTE_HANDLER)
+ {
+ ret = RpcStatusToCmStatus(RpcExceptionCode());
+ }
+ RpcEndExcept;
+
+ return ret;
+}
+
+
+/***********************************************************************
+ * CM_Register_Device_InterfaceA [SETUPAPI.@]
+ */
+CONFIGRET WINAPI CM_Register_Device_InterfaceA(
+ DEVINST dnDevInst, LPGUID InterfaceClassGuid, LPCSTR pszReference,
+ LPSTR pszDeviceInterface, PULONG pulLength, ULONG ulFlags)
+{
+ TRACE("%lx %s %s %p %p %lx\n", dnDevInst,
debugstr_guid(InterfaceClassGuid),
+ pszReference, pszDeviceInterface, pulLength, ulFlags);
+
+ return CM_Register_Device_Interface_ExA(dnDevInst, InterfaceClassGuid,
+ pszReference, pszDeviceInterface,
+ pulLength, ulFlags, NULL);
+}
+
+
+/***********************************************************************
+ * CM_Register_Device_InterfaceW [SETUPAPI.@]
+ */
+CONFIGRET WINAPI CM_Register_Device_InterfaceW(
+ DEVINST dnDevInst, LPGUID InterfaceClassGuid, LPCWSTR pszReference,
+ LPWSTR pszDeviceInterface, PULONG pulLength, ULONG ulFlags)
+{
+ TRACE("%lx %s %s %p %p %lx\n", dnDevInst,
debugstr_guid(InterfaceClassGuid),
+ debugstr_w(pszReference), pszDeviceInterface, pulLength, ulFlags);
+
+ return CM_Register_Device_Interface_ExW(dnDevInst, InterfaceClassGuid,
+ pszReference, pszDeviceInterface,
+ pulLength, ulFlags, NULL);
+}
+
+
+/***********************************************************************
+ * CM_Register_Device_Interface_ExA [SETUPAPI.@]
+ */
+CONFIGRET WINAPI CM_Register_Device_Interface_ExA(
+ DEVINST dnDevInst, LPGUID InterfaceClassGuid, LPCSTR pszReference,
+ LPSTR pszDeviceInterface, PULONG pulLength, ULONG ulFlags, HMACHINE
hMachine)
+{
+ LPWSTR pszReferenceW = NULL;
+ LPWSTR pszDeviceInterfaceW = NULL;
+ ULONG ulLength;
+ CONFIGRET ret;
+
+ TRACE("%lx %s %s %p %p %lx %lx\n", dnDevInst,
debugstr_guid(InterfaceClassGuid),
+ pszReference, pszDeviceInterface, pulLength, ulFlags, hMachine);
+
+ if (pulLength == NULL || pszDeviceInterface == NULL)
+ return CR_INVALID_POINTER;
+
+ if (pszReference != NULL)
+ {
+ if (pSetupCaptureAndConvertAnsiArg(pszReference, &pszReferenceW))
+ return CR_INVALID_DATA;
+ }
+
+ ulLength = *pulLength;
+
+ pszDeviceInterfaceW = HeapAlloc(GetProcessHeap(), 0, ulLength *
sizeof(WCHAR));
+ if (pszDeviceInterfaceW == NULL)
+ {
+ ret = CR_OUT_OF_MEMORY;
+ goto Done;
+ }
+
+ ret = CM_Register_Device_Interface_ExW(dnDevInst,
+ InterfaceClassGuid,
+ pszReferenceW,
+ pszDeviceInterfaceW,
+ &ulLength,
+ ulFlags,
+ hMachine);
+ if (ret == CR_SUCCESS)
+ {
+ if (WideCharToMultiByte(CP_ACP,
+ 0,
+ pszDeviceInterfaceW,
+ ulLength,
+ pszDeviceInterface,
+ *pulLength,
+ NULL,
+ NULL) == 0)
+ ret = CR_FAILURE;
+ }
+
+ *pulLength = ulLength;
+
+Done:
+ if (pszDeviceInterfaceW != NULL)
+ HeapFree(GetProcessHeap(), 0, pszDeviceInterfaceW);
+
+ if (pszReferenceW != NULL)
+ MyFree(pszReferenceW);
+
+ return ret;
+}
+
+
+/***********************************************************************
+ * CM_Register_Device_Interface_ExW [SETUPAPI.@]
+ */
+CONFIGRET WINAPI CM_Register_Device_Interface_ExW(
+ DEVINST dnDevInst, LPGUID InterfaceClassGuid, LPCWSTR pszReference,
+ LPWSTR pszDeviceInterface, PULONG pulLength, ULONG ulFlags, HMACHINE
hMachine)
+{
+ RPC_BINDING_HANDLE BindingHandle = NULL;
+ HSTRING_TABLE StringTable = NULL;
+ LPWSTR lpDevInst;
+ ULONG ulTransferLength;
+ CONFIGRET ret;
+
+ TRACE("%lx %s %s %p %p %lx %lx\n", dnDevInst,
debugstr_guid(InterfaceClassGuid),
+ debugstr_w(pszReference), pszDeviceInterface, pulLength, ulFlags,
hMachine);
+
+ if (dnDevInst == 0)
+ return CR_INVALID_DEVNODE;
+
+ if (InterfaceClassGuid == NULL ||
+ pszDeviceInterface == NULL ||
+ pulLength == NULL)
+ return CR_INVALID_POINTER;
+
+ if (ulFlags != 0)
+ return CR_INVALID_FLAG;
+
+ if (hMachine != NULL)
+ {
+ BindingHandle = ((PMACHINE_INFO)hMachine)->BindingHandle;
+ if (BindingHandle == NULL)
+ return CR_FAILURE;
+
+ StringTable = ((PMACHINE_INFO)hMachine)->StringTable;
+ if (StringTable == 0)
+ return CR_FAILURE;
+ }
+ else
+ {
+ if (!PnpGetLocalHandles(&BindingHandle, &StringTable))
+ return CR_FAILURE;
+ }
+
+ lpDevInst = pSetupStringTableStringFromId(StringTable, dnDevInst);
+ if (lpDevInst == NULL)
+ return CR_INVALID_DEVNODE;
+
+ ulTransferLength = *pulLength;
+
+ RpcTryExcept
+ {
+ ret = PNP_RegisterDeviceClassAssociation(BindingHandle,
+ lpDevInst,
+ InterfaceClassGuid,
+ (LPWSTR)pszReference,
+ pszDeviceInterface,
+ pulLength,
+ &ulTransferLength,
+ 0);
}
RpcExcept(EXCEPTION_EXECUTE_HANDLER)
{
@@ -4884,3 +5052,101 @@
return ret;
}
+
+
+/***********************************************************************
+ * CM_Unregister_Device_InterfaceA [SETUPAPI.@]
+ */
+CONFIGRET WINAPI CM_Unregister_Device_InterfaceA(
+ LPCSTR pszDeviceInterface, ULONG ulFlags)
+{
+ TRACE("%s %lx\n", pszDeviceInterface, ulFlags);
+
+ return CM_Unregister_Device_Interface_ExA(pszDeviceInterface,
+ ulFlags, NULL);
+}
+
+
+/***********************************************************************
+ * CM_Unregister_Device_InterfaceW [SETUPAPI.@]
+ */
+CONFIGRET WINAPI CM_Unregister_Device_InterfaceW(
+ LPCWSTR pszDeviceInterface, ULONG ulFlags)
+{
+ TRACE("%s %lx\n", debugstr_w(pszDeviceInterface), ulFlags);
+
+ return CM_Unregister_Device_Interface_ExW(pszDeviceInterface,
+ ulFlags, NULL);
+}
+
+
+/***********************************************************************
+ * CM_Unregister_Device_Interface_ExA [SETUPAPI.@]
+ */
+CONFIGRET WINAPI CM_Unregister_Device_Interface_ExA(
+ LPCSTR pszDeviceInterface, ULONG ulFlags, HMACHINE hMachine)
+{
+ LPWSTR pszDeviceInterfaceW = NULL;
+ CONFIGRET ret;
+
+ TRACE("%s %lx %lx\n", pszDeviceInterface, ulFlags, hMachine);
+
+ if (pszDeviceInterface == NULL)
+ return CR_INVALID_POINTER;
+
+ if (pSetupCaptureAndConvertAnsiArg(pszDeviceInterface,
&pszDeviceInterfaceW))
+ return CR_INVALID_DATA;
+
+ ret = CM_Unregister_Device_Interface_ExW(pszDeviceInterfaceW,
+ ulFlags, hMachine);
+
+ if (pszDeviceInterfaceW != NULL)
+ MyFree(pszDeviceInterfaceW);
+
+ return ret;
+}
+
+
+/***********************************************************************
+ * CM_Unregister_Device_Interface_ExW [SETUPAPI.@]
+ */
+CONFIGRET WINAPI CM_Unregister_Device_Interface_ExW(
+ LPCWSTR pszDeviceInterface, ULONG ulFlags, HMACHINE hMachine)
+{
+ RPC_BINDING_HANDLE BindingHandle = NULL;
+ CONFIGRET ret;
+
+ TRACE("%s %lx %lx\n", debugstr_w(pszDeviceInterface), ulFlags, hMachine);
+
+ if (pszDeviceInterface == NULL)
+ return CR_INVALID_POINTER;
+
+ if (ulFlags != 0)
+ return CR_INVALID_FLAG;
+
+ if (hMachine != NULL)
+ {
+ BindingHandle = ((PMACHINE_INFO)hMachine)->BindingHandle;
+ if (BindingHandle == NULL)
+ return CR_FAILURE;
+ }
+ else
+ {
+ if (!PnpGetLocalHandles(&BindingHandle, NULL))
+ return CR_FAILURE;
+ }
+
+ RpcTryExcept
+ {
+ ret = PNP_UnregisterDeviceClassAssociation(BindingHandle,
+ (LPWSTR)pszDeviceInterface,
+ ulFlags);
+ }
+ RpcExcept(EXCEPTION_EXECUTE_HANDLER)
+ {
+ ret = RpcStatusToCmStatus(RpcExceptionCode());
+ }
+ RpcEndExcept;
+
+ return ret;
+}
Modified: trunk/reactos/dll/win32/setupapi/setupapi.spec
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/setupapi.spec?rev=50963&r1=50962&r2=50963&view=diff
==============================================================================
--- trunk/reactos/dll/win32/setupapi/setupapi.spec [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/setupapi/setupapi.spec [iso-8859-1] Thu Mar 3
19:53:26 2011
@@ -170,10 +170,10 @@
@ stdcall CM_Reenumerate_DevNode_Ex(long long long)
@ stub CM_Register_Device_Driver
@ stub CM_Register_Device_Driver_Ex
-@ stub CM_Register_Device_InterfaceA
-@ stub CM_Register_Device_InterfaceW
-@ stub CM_Register_Device_Interface_ExA
-@ stub CM_Register_Device_Interface_ExW
+@ stdcall CM_Register_Device_InterfaceA(long ptr str str ptr long)
+@ stdcall CM_Register_Device_InterfaceW(long ptr wstr wstr ptr long)
+@ stdcall CM_Register_Device_Interface_ExA(long ptr str str ptr long long)
+@ stdcall CM_Register_Device_Interface_ExW(long ptr wstr wstr ptr long long)
@ stdcall CM_Remove_SubTree(long long)
@ stdcall CM_Remove_SubTree_Ex(long long long)
@ stdcall CM_Request_Device_EjectA(long ptr str long long)
@@ -203,10 +203,10 @@
@ stub CM_Test_Range_Available
@ stdcall CM_Uninstall_DevNode(long long)
@ stdcall CM_Uninstall_DevNode_Ex(long long long)
-@ stub CM_Unregister_Device_InterfaceA
-@ stub CM_Unregister_Device_InterfaceW
-@ stub CM_Unregister_Device_Interface_ExA
-@ stub CM_Unregister_Device_Interface_ExW
+@ stdcall CM_Unregister_Device_InterfaceA(str long)
+@ stdcall CM_Unregister_Device_InterfaceW(wstr long)
+@ stdcall CM_Unregister_Device_Interface_ExA(str long long)
+@ stdcall CM_Unregister_Device_Interface_ExW(wstr long long)
@ stdcall DoesUserHavePrivilege(wstr)
@ stub ExtensionPropSheetPageProc
@ stdcall InstallCatalog(str str ptr)
