Juan Lang : cfgmgr32: Forward cfgmgr32 functions to setupapi.
Alexandre Julliard
julliard at winehq.org
Thu Nov 8 07:07:32 CST 2007
Module: wine
Branch: master
Commit: f9f18bfb06e9e1b706eda7afeb1b1c892cc354f2
URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9f18bfb06e9e1b706eda7afeb1b1c892cc354f2
Author: Juan Lang <juan.lang at gmail.com>
Date: Wed Nov 7 10:38:49 2007 -0800
cfgmgr32: Forward cfgmgr32 functions to setupapi.
---
dlls/cfgmgr32/Makefile.in | 3 --
dlls/cfgmgr32/cfgmgr32.spec | 6 ++--
dlls/cfgmgr32/main.c | 79 -------------------------------------------
3 files changed, 3 insertions(+), 85 deletions(-)
diff --git a/dlls/cfgmgr32/Makefile.in b/dlls/cfgmgr32/Makefile.in
index 33360db..9974fbc 100644
--- a/dlls/cfgmgr32/Makefile.in
+++ b/dlls/cfgmgr32/Makefile.in
@@ -6,9 +6,6 @@ MODULE = cfgmgr32.dll
IMPORTLIB = libcfgmgr32.$(IMPLIBEXT)
IMPORTS = setupapi kernel32
-C_SRCS = \
- main.c
-
@MAKE_DLL_RULES@
@DEPENDENCIES@ # everything below this line is overwritten by make depend
diff --git a/dlls/cfgmgr32/cfgmgr32.spec b/dlls/cfgmgr32/cfgmgr32.spec
index 2d53dd1..b00648b 100644
--- a/dlls/cfgmgr32/cfgmgr32.spec
+++ b/dlls/cfgmgr32/cfgmgr32.spec
@@ -60,11 +60,11 @@
@ stub CM_Get_DevNode_Registry_Property_ExW
@ stub CM_Get_DevNode_Status
@ stub CM_Get_DevNode_Status_Ex
-@ stdcall CM_Get_Device_IDA(ptr ptr long long)
+@ stdcall CM_Get_Device_IDA(ptr ptr long long) setupapi.CM_Get_Device_IDA
@ stub CM_Get_Device_IDW
@ stub CM_Get_Device_ID_ExA
@ stub CM_Get_Device_ID_ExW
-@ stdcall CM_Get_Device_ID_ListA(ptr ptr long long)
+@ stdcall CM_Get_Device_ID_ListA(ptr ptr long long) setupapi.CM_Get_Device_ID_ListA
@ stub CM_Get_Device_ID_ListW
@ stub CM_Get_Device_ID_List_ExA
@ stub CM_Get_Device_ID_List_ExW
@@ -72,7 +72,7 @@
@ stub CM_Get_Device_ID_List_SizeW
@ stub CM_Get_Device_ID_List_Size_ExA
@ stub CM_Get_Device_ID_List_Size_ExW
-@ stdcall CM_Get_Device_ID_Size(ptr ptr long)
+@ stdcall CM_Get_Device_ID_Size(ptr ptr long) setupapi.CM_Get_Device_ID_Size
@ stub CM_Get_Device_ID_Size_Ex
@ stub CM_Get_Device_Interface_AliasA
@ stub CM_Get_Device_Interface_AliasW
diff --git a/dlls/cfgmgr32/main.c b/dlls/cfgmgr32/main.c
deleted file mode 100644
index 9f27a29..0000000
--- a/dlls/cfgmgr32/main.c
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * cfgmgr32 implementation
- *
- * Copyright 2004 Aric Stewart for CodeWeavers
- * Copyright 2003 Mike McCormack for CodeWeavers
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
- */
-
-#include <stdarg.h>
-#include "windef.h"
-#include "winbase.h"
-#include "winnt.h"
-#include "cfgmgr32.h"
-
-#include "wine/debug.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(cfgmgr32);
-
-/***********************************************************************
- * DllMain (CFGMGR32.@)
- */
-BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved )
-{
- switch(reason)
- {
- case DLL_WINE_PREATTACH:
- return FALSE; /* prefer native version */
- case DLL_PROCESS_ATTACH:
- DisableThreadLibraryCalls( inst );
- break;
- }
- return TRUE;
-}
-
-/***********************************************************************
- * CM_Get_Device_ID_ListA (CFGMGR32.@)
- */
-CONFIGRET WINAPI CM_Get_Device_ID_ListA(
- PCSTR pszFilter, PCHAR Buffer, ULONG BufferLen, ULONG ulFlags )
-{
- FIXME("%p %p %d %d\n", pszFilter, Buffer, BufferLen, ulFlags );
- memset(Buffer,0,2);
- return CR_SUCCESS;
-}
-
-/***********************************************************************
- * CM_Get_Device_ID_Size (CFGMGR32.@)
- */
-CONFIGRET WINAPI CM_Get_Device_ID_Size( ULONG* pulLen, LPVOID dnDevInst,
- ULONG ulFlags)
-{
- FIXME("%p %p %u\n",pulLen, dnDevInst, ulFlags);
- *pulLen = 1;
- return CR_SUCCESS;
-}
-
-/***********************************************************************
- * CM_Get_Device_IDA (CFGMGR32.@)
- */
-CONFIGRET WINAPI CM_Get_Device_IDA( LPVOID dnDevInst, LPSTR Buffer,
- ULONG BufferLen, ULONG ulFlags)
-{
- FIXME("%p, %p, %u %u\n",dnDevInst, Buffer, BufferLen, ulFlags);
- Buffer[0] = 0;
- return CR_SUCCESS;
-}
More information about the wine-cvs
mailing list