ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

setupapi: Added CM_Get_Version(). 

Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Nikolay Sivov 2016-08-11 00:30:51 +03:00 committed by Alexandre Julliard
parent 8be1357bd5
commit af533d1eeb
5 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/cfgmgr32/cfgmgr32.spec
View File

@ -114,7 +114,7 @@
@ stub CM_Get_Res_Des_Data_Size_Ex @ stub CM_Get_Res_Des_Data_Size_Ex
@ stub CM_Get_Sibling @ stub CM_Get_Sibling
@ stub CM_Get_Sibling_Ex @ stub CM_Get_Sibling_Ex
@ stub CM_Get_Version @ stdcall CM_Get_Version() setupapi.CM_Get_Version
@ stub CM_Get_Version_Ex @ stub CM_Get_Version_Ex
@ stub CM_Intersect_Range_List @ stub CM_Intersect_Range_List
@ stub CM_Invert_Range_List @ stub CM_Invert_Range_List

9
dlls/setupapi/misc.c
View File

@ -1751,3 +1751,12 @@ BOOL WINAPI SetupLogErrorW(LPCWSTR message, LogSeverity severity)
HeapFree(GetProcessHeap(), 0, msg); HeapFree(GetProcessHeap(), 0, msg);
return ret; return ret;
} }
/***********************************************************************
* CM_Get_Version (SETUPAPI.@)
*/
WORD WINAPI CM_Get_Version(void)
{
TRACE("()\n");
return 0x0400;
}

2
dlls/setupapi/setupapi.spec
View File

@ -125,7 +125,7 @@
@ stub CM_Get_Res_Des_Data_Size_Ex @ stub CM_Get_Res_Des_Data_Size_Ex
@ stub CM_Get_Sibling @ stub CM_Get_Sibling
@ stub CM_Get_Sibling_Ex @ stub CM_Get_Sibling_Ex
@ stub CM_Get_Version @ stdcall CM_Get_Version()
@ stub CM_Get_Version_Ex @ stub CM_Get_Version_Ex
@ stub CM_Intersect_Range_List @ stub CM_Intersect_Range_List
@ stub CM_Invert_Range_List @ stub CM_Invert_Range_List

10
dlls/setupapi/tests/misc.c
View File

@ -29,6 +29,7 @@
#include "winuser.h" #include "winuser.h"
#include "winreg.h" #include "winreg.h"
#include "setupapi.h" #include "setupapi.h"
#include "cfgmgr32.h"
#include "wine/test.h" #include "wine/test.h"
@ -816,6 +817,14 @@ static void test_SetupLogError(void)
SetupCloseLog(); 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) START_TEST(misc)
{ {
HMODULE hsetupapi = GetModuleHandleA("setupapi.dll"); HMODULE hsetupapi = GetModuleHandleA("setupapi.dll");
@ -849,4 +858,5 @@ START_TEST(misc)
test_defaultcallback(); test_defaultcallback();
test_SetupLogError(); test_SetupLogError();
test_CM_Get_Version();
} }

1
include/cfgmgr32.h
View File

@ -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) #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(PULONG,DEVINST,ULONG);
CMAPI CONFIGRET WINAPI CM_Get_Device_ID_Size_Ex(PULONG,DEVINST,ULONG,HMACHINE); 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_DevNodeA(PDEVINST,DEVINSTID_A,ULONG);
CMAPI CONFIGRET WINAPI CM_Locate_DevNodeW(PDEVINST,DEVINSTID_W,ULONG); CMAPI CONFIGRET WINAPI CM_Locate_DevNodeW(PDEVINST,DEVINSTID_W,ULONG);
#define CM_Locate_DevNode WINELIB_NAME_AW(CM_Locate_DevNode) #define CM_Locate_DevNode WINELIB_NAME_AW(CM_Locate_DevNode)