Nikolay Sivov : setupapi: Added CM_Get_Version().
Alexandre Julliard
julliard at winehq.org
Thu Aug 11 09:37:48 CDT 2016
Module: wine
Branch: master
Commit: af533d1eebd382d7ee72eaaef1cf7461356da9e5
URL: http://source.winehq.org/git/wine.git/?a=commit;h=af533d1eebd382d7ee72eaaef1cf7461356da9e5
Author: Nikolay Sivov <nsivov at codeweavers.com>
Date: Thu Aug 11 00:30:51 2016 +0300
setupapi: Added CM_Get_Version().
Signed-off-by: Nikolay Sivov <nsivov at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/cfgmgr32/cfgmgr32.spec | 2 +-
dlls/setupapi/misc.c | 9 +++++++++
dlls/setupapi/setupapi.spec | 2 +-
dlls/setupapi/tests/misc.c | 10 ++++++++++
include/cfgmgr32.h | 1 +
5 files changed, 22 insertions(+), 2 deletions(-)
diff --git a/dlls/cfgmgr32/cfgmgr32.spec b/dlls/cfgmgr32/cfgmgr32.spec
index 90a05ab..116180c 100644
--- a/dlls/cfgmgr32/cfgmgr32.spec
+++ b/dlls/cfgmgr32/cfgmgr32.spec
@@ -114,7 +114,7 @@
@ stub CM_Get_Res_Des_Data_Size_Ex
@ stub CM_Get_Sibling
@ stub CM_Get_Sibling_Ex
-@ stub CM_Get_Version
+@ stdcall CM_Get_Version() setupapi.CM_Get_Version
@ stub CM_Get_Version_Ex
@ stub CM_Intersect_Range_List
@ stub CM_Invert_Range_List
diff --git a/dlls/setupapi/misc.c b/dlls/setupapi/misc.c
index de73966..98a6ed7 100644
--- a/dlls/setupapi/misc.c
+++ b/dlls/setupapi/misc.c
@@ -1751,3 +1751,12 @@ BOOL WINAPI SetupLogErrorW(LPCWSTR message, LogSeverity severity)
HeapFree(GetProcessHeap(), 0, msg);
return ret;
}
+
+/***********************************************************************
+ * CM_Get_Version (SETUPAPI.@)
+ */
+WORD WINAPI CM_Get_Version(void)
+{
+ TRACE("()\n");
+ return 0x0400;
+}
diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec
index 897572d..cc873ae 100644
--- a/dlls/setupapi/setupapi.spec
+++ b/dlls/setupapi/setupapi.spec
@@ -125,7 +125,7 @@
@ stub CM_Get_Res_Des_Data_Size_Ex
@ stub CM_Get_Sibling
@ stub CM_Get_Sibling_Ex
-@ stub CM_Get_Version
+@ stdcall CM_Get_Version()
@ stub CM_Get_Version_Ex
@ stub CM_Intersect_Range_List
@ stub CM_Invert_Range_List
diff --git a/dlls/setupapi/tests/misc.c b/dlls/setupapi/tests/misc.c
index 09e0fb8..04b2171 100644
--- a/dlls/setupapi/tests/misc.c
+++ b/dlls/setupapi/tests/misc.c
@@ -29,6 +29,7 @@
#include "winuser.h"
#include "winreg.h"
#include "setupapi.h"
+#include "cfgmgr32.h"
#include "wine/test.h"
@@ -816,6 +817,14 @@ static void test_SetupLogError(void)
SetupCloseLog();
}
+static void test_CM_Get_Version(void)
+{
+ WORD ret;
+
+ ret = CM_Get_Version();
+ ok(ret == 0x0400, "got version %#x\n", ret);
+}
+
START_TEST(misc)
{
HMODULE hsetupapi = GetModuleHandleA("setupapi.dll");
@@ -849,4 +858,5 @@ START_TEST(misc)
test_defaultcallback();
test_SetupLogError();
+ test_CM_Get_Version();
}
diff --git a/include/cfgmgr32.h b/include/cfgmgr32.h
index e3966f9..7dc31e1 100644
--- a/include/cfgmgr32.h
+++ b/include/cfgmgr32.h
@@ -192,6 +192,7 @@ CMAPI CONFIGRET WINAPI CM_Get_Device_ID_List_ExW(PCWSTR,PWCHAR,ULONG,ULONG,HMACH
#define CM_Get_Device_ID_List_Ex WINELIB_NAME_AW(CM_Get_Device_ID_List_Ex)
CMAPI CONFIGRET WINAPI CM_Get_Device_ID_Size(PULONG,DEVINST,ULONG);
CMAPI CONFIGRET WINAPI CM_Get_Device_ID_Size_Ex(PULONG,DEVINST,ULONG,HMACHINE);
+CMAPI WORD WINAPI CM_Get_Version(void);
CMAPI CONFIGRET WINAPI CM_Locate_DevNodeA(PDEVINST,DEVINSTID_A,ULONG);
CMAPI CONFIGRET WINAPI CM_Locate_DevNodeW(PDEVINST,DEVINSTID_W,ULONG);
#define CM_Locate_DevNode WINELIB_NAME_AW(CM_Locate_DevNode)
More information about the wine-cvs
mailing list