Author: ekohl
Date: Mon May 16 23:12:12 2011
New Revision: 51802
URL: http://svn.reactos.org/svn/reactos?rev=51802&view=rev
Log:
[SETUPAPI]
- Add stubs CM_Get_Class_Registry_PropertyA/W.
- Move CMP_RegisterNotification, CMP_UnregisterNotification and
CMP_WaitNoPendingInstallEvents.
- Remove stubs TPWriteProfileString and suErrorToIds because they are part of
setupx.dll (16 bit DLL).
Modified:
trunk/reactos/dll/win32/setupapi/cfgmgr.c
trunk/reactos/dll/win32/setupapi/setupapi.spec
trunk/reactos/dll/win32/setupapi/stubs.c
Modified: trunk/reactos/dll/win32/setupapi/cfgmgr.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/cfgmgr.c?rev=51802&r1=51801&r2=51802&view=diff
==============================================================================
--- trunk/reactos/dll/win32/setupapi/cfgmgr.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/setupapi/cfgmgr.c [iso-8859-1] Mon May 16 23:12:12
2011
@@ -84,25 +84,6 @@
/***********************************************************************
- * CMP_WaitNoPendingInstallEvents [SETUPAPI.@]
- */
-DWORD WINAPI CMP_WaitNoPendingInstallEvents(
- DWORD dwTimeout)
-{
- HANDLE hEvent;
- DWORD ret;
-
- hEvent = OpenEventW(SYNCHRONIZE, FALSE,
L"Global\\PnP_No_Pending_Install_Events");
- if (hEvent == NULL)
- return WAIT_FAILED;
-
- ret = WaitForSingleObject(hEvent, dwTimeout);
- CloseHandle(hEvent);
- return ret;
-}
-
-
-/***********************************************************************
* CMP_Init_Detection [SETUPAPI.@]
*/
CONFIGRET WINAPI CMP_Init_Detection(
@@ -130,6 +111,22 @@
RpcEndExcept;
return ret;
+}
+
+
+/***********************************************************************
+ * CMP_RegisterNotification [SETUPAPI.@]
+ */
+CONFIGRET
+WINAPI
+CMP_RegisterNotification(IN HANDLE hRecipient,
+ IN LPVOID lpvNotificationFilter,
+ IN DWORD dwFlags,
+ OUT PULONG pluhDevNotify)
+{
+ FIXME("Stub %p %p %lu %p\n", hRecipient, lpvNotificationFilter, dwFlags,
pluhDevNotify);
+ SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
+ return CR_FAILURE;
}
@@ -180,6 +177,37 @@
/***********************************************************************
+ * CMP_UnregisterNotification [SETUPAPI.@]
+ */
+CONFIGRET
+WINAPI
+CMP_UnregisterNotification(IN HDEVNOTIFY handle)
+{
+ FIXME("Stub %p\n", handle);
+ return CR_SUCCESS;
+}
+
+
+/***********************************************************************
+ * CMP_WaitNoPendingInstallEvents [SETUPAPI.@]
+ */
+DWORD WINAPI CMP_WaitNoPendingInstallEvents(
+ DWORD dwTimeout)
+{
+ HANDLE hEvent;
+ DWORD ret;
+
+ hEvent = OpenEventW(SYNCHRONIZE, FALSE,
L"Global\\PnP_No_Pending_Install_Events");
+ if (hEvent == NULL)
+ return WAIT_FAILED;
+
+ ret = WaitForSingleObject(hEvent, dwTimeout);
+ CloseHandle(hEvent);
+ return ret;
+}
+
+
+/***********************************************************************
* CMP_WaitServicesAvailable [SETUPAPI.@]
*/
CONFIGRET
@@ -1546,6 +1574,44 @@
RpcEndExcept;
return ret;
+}
+
+
+/***********************************************************************
+ * CM_Get_Class_Registry_PropertyA [SETUPAPI.@]
+ */
+CONFIGRET WINAPI CM_Get_Class_Registry_PropertyA(
+ LPGUID ClassGuid, ULONG ulProperty, PULONG pulRegDataType,
+ PVOID Buffer, PULONG pulLength, ULONG ulFlags, HMACHINE hMachine)
+{
+ FIXME("\n");
+ return CR_CALL_NOT_IMPLEMENTED;
+}
+
+
+/***********************************************************************
+ * CM_Get_Class_Registry_PropertyW [SETUPAPI.@]
+ */
+CONFIGRET WINAPI CM_Get_Class_Registry_PropertyW(
+ LPGUID ClassGuid, ULONG ulProperty, PULONG pulRegDataType,
+ PVOID Buffer, PULONG pulLength, ULONG ulFlags, HMACHINE hMachine)
+{
+ FIXME("\n");
+
+#if 0
+ if (ClassGuid == NULL ||
+ pulLength == NULL)
+ return 3;
+
+ if (ulFlags != 0)
+ return CR_INVALID_FLAG;
+
+ if (pSetupStringFromGuid(ClassGuid, ebp_6c, 0x27) != 0)
+ return 1F;
+#endif
+
+
+ return CR_CALL_NOT_IMPLEMENTED;
}
Modified: trunk/reactos/dll/win32/setupapi/setupapi.spec
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/setupapi.spec?rev=51802&r1=51801&r2=51802&view=diff
==============================================================================
--- trunk/reactos/dll/win32/setupapi/setupapi.spec [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/setupapi/setupapi.spec [iso-8859-1] Mon May 16
23:12:12 2011
@@ -62,8 +62,8 @@
@ stdcall CM_Get_Class_NameW(ptr wstr ptr long)
@ stdcall CM_Get_Class_Name_ExA(ptr str ptr long long)
@ stdcall CM_Get_Class_Name_ExW(ptr wstr ptr long long)
-@ stub CM_Get_Class_Registry_PropertyA
-@ stub CM_Get_Class_Registry_PropertyW
+@ stdcall CM_Get_Class_Registry_PropertyA(ptr long ptr ptr ptr long ptr)
+@ stdcall CM_Get_Class_Registry_PropertyW(ptr long ptr ptr ptr long ptr)
@ stdcall CM_Get_Depth(ptr long long)
@ stdcall CM_Get_Depth_Ex(ptr long long long)
@ stub CM_Get_DevNode_Custom_PropertyA
Modified: trunk/reactos/dll/win32/setupapi/stubs.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/stubs.c?rev=51802&r1=51801&r2=51802&view=diff
==============================================================================
--- trunk/reactos/dll/win32/setupapi/stubs.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/setupapi/stubs.c [iso-8859-1] Mon May 16 23:12:12
2011
@@ -21,25 +21,6 @@
#include "setupapi_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(setupapi);
-
-/***********************************************************************
- * TPWriteProfileString (SETUPX.62)
- */
-BOOL WINAPI TPWriteProfileString16( LPCSTR section, LPCSTR entry, LPCSTR
string )
-{
- FIXME( "%s %s %s: stub\n", debugstr_a(section), debugstr_a(entry),
debugstr_a(string) );
- return TRUE;
-}
-
-
-/***********************************************************************
- * suErrorToIds (SETUPX.61)
- */
-DWORD WINAPI suErrorToIds16( WORD w1, WORD w2 )
-{
- FIXME( "%x %x: stub\n", w1, w2 );
- return 0;
-}
/***********************************************************************
* pSetupRegistryDelnode(SETUPAPI.@)
@@ -159,35 +140,6 @@
}
-/***********************************************************************
- * CMP_RegisterNotification(SETUPAPI.@)
- */
-CONFIGRET
-WINAPI
-CMP_RegisterNotification(
- IN HANDLE hRecipient,
- IN LPVOID lpvNotificationFilter,
- IN DWORD dwFlags,
- OUT PULONG pluhDevNotify)
-{
- FIXME ("Stub %p %p %lu %p\n", hRecipient, lpvNotificationFilter, dwFlags,
pluhDevNotify);
- SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
- return CR_FAILURE;
-}
-
-
-/***********************************************************************
- * CMP_UnregisterNotification(SETUPAPI.@)
- */
-CONFIGRET
-WINAPI
-CMP_UnregisterNotification(IN HDEVNOTIFY handle)
-{
- FIXME ("Stub %p\n", handle);
- return CR_SUCCESS;
-}
-
-
WINSETUPAPI BOOL WINAPI SetupDiGetDeviceInterfaceAlias(IN HDEVINFO
DeviceInfoSet, IN PSP_DEVICE_INTERFACE_DATA DeviceInterfaceData, IN CONST GUID
*AliasInterfaceClassGuid, OUT PSP_DEVICE_INTERFACE_DATA
AliasDeviceInterfaceData)
{
FIXME("%p %p %p %p %p stub\n", DeviceInfoSet, DeviceInterfaceData,
AliasInterfaceClassGuid, AliasDeviceInterfaceData);
