From 6e8328f85798474296d4362aebb864bf464cdec3 Mon Sep 17 00:00:00 2001 From: Ricardo Filipe Date: Wed, 17 Dec 2008 20:03:27 +0000 Subject: setupapi: add stubs for CM_Locate_DevNodeA\W --- dlls/setupapi/setupapi.spec | 4 ++-- dlls/setupapi/stubs.c | 20 ++++++++++++++++++++ include/cfgmgr32.h | 14 ++++++++++++++ 3 files changed, 36 insertions(+), 2 deletions(-) diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index 75cb7c8..d08b4d3 100644 --- a/dlls/setupapi/setupapi.spec +++ b/dlls/setupapi/setupapi.spec @@ -128,8 +128,8 @@ @ stub CM_Intersect_Range_List @ stub CM_Invert_Range_List @ stub CM_Is_Dock_Station_Present -@ stub CM_Locate_DevNodeA -@ stub CM_Locate_DevNodeW +@ stdcall CM_Locate_DevNodeA(ptr str long) +@ stdcall CM_Locate_DevNodeW(ptr wstr long) @ stub CM_Locate_DevNode_ExA @ stub CM_Locate_DevNode_ExW @ stub CM_Merge_Range_List diff --git a/dlls/setupapi/stubs.c b/dlls/setupapi/stubs.c index 33240ce..9a56fd0 100644 --- a/dlls/setupapi/stubs.c +++ b/dlls/setupapi/stubs.c @@ -228,3 +228,23 @@ UINT WINAPI SetupPromptForDiskW(HWND hwndParent, PCWSTR DialogTitle, PCWSTR Disk PathRequiredSize); return 0; } + +/*********************************************************************** + * CM_Locate_DevNodeA (SETUPAPI.@) + */ +CONFIGRET WINAPI CM_Locate_DevNodeA(PDEVINST pdnDevInst, DEVINSTID_A pDeviceID, ULONG ulFlags) +{ + FIXME("%p %s 0x%08x: stub\n", pdnDevInst, debugstr_a(pDeviceID), ulFlags); + + return CR_FAILURE; +} + +/*********************************************************************** + * CM_Locate_DevNodeW (SETUPAPI.@) + */ +CONFIGRET WINAPI CM_Locate_DevNodeW(PDEVINST pdnDevInst, DEVINSTID_W pDeviceID, ULONG ulFlags) +{ + FIXME("%p %s 0x%08x: stub\n", pdnDevInst, debugstr_w(pDeviceID), ulFlags); + + return CR_FAILURE; +} diff --git a/include/cfgmgr32.h b/include/cfgmgr32.h index 5862fa6..20bb935 100644 --- a/include/cfgmgr32.h +++ b/include/cfgmgr32.h @@ -21,6 +21,13 @@ /* FIXME: #include */ +/* cfgmgr32 doesn't use the normal convention, it adds an underscore before A/W */ +#ifdef WINE_NO_UNICODE_MACROS +# define DECL_WINELIB_CFGMGR32_TYPE_AW(type) /* nothing */ +#else +# define DECL_WINELIB_CFGMGR32_TYPE_AW(type) typedef WINELIB_NAME_AW(type##_) type; +#endif + #define CMAPI typedef DWORD CONFIGRET; @@ -97,6 +104,11 @@ typedef DWORD CONFIGRET; typedef DWORD DEVINST, *PDEVINST; typedef DWORD DEVNODE, *PDEVNODE; typedef HANDLE HMACHINE, *PHMACHINE; +typedef CHAR *DEVNODEID_A, *DEVINSTID_A; +typedef WCHAR *DEVNODEID_W, *DEVINSTID_W; + +DECL_WINELIB_CFGMGR32_TYPE_AW(DEVNODEID) +DECL_WINELIB_CFGMGR32_TYPE_AW(DEVINSTID) #ifdef __cplusplus extern "C" { @@ -122,4 +134,6 @@ CMAPI CONFIGRET WINAPI CM_Get_Device_ID_Size_Ex(PULONG,DEVINST,ULONG,HMACHINE); } #endif +#undef DECL_WINELIB_CFGMGR32_TYPE_AW + #endif /* _CFGMGR32_H_ */ -- 1.5.6.3