Jacek Caban : kernel32: Moved device-related stubs from psapi to kernel32.
Alexandre Julliard
julliard at winehq.org
Mon May 16 11:36:51 CDT 2011
Module: wine
Branch: master
Commit: 0909f2e0540d8d1a3ca9340aecb3b34815cc481f
URL: http://source.winehq.org/git/wine.git/?a=commit;h=0909f2e0540d8d1a3ca9340aecb3b34815cc481f
Author: Jacek Caban <jacek at codeweavers.com>
Date: Mon May 16 15:19:07 2011 +0200
kernel32: Moved device-related stubs from psapi to kernel32.
---
dlls/kernel32/file.c | 65 +++++++++++++++++++++++++++++++++++++++++
dlls/kernel32/kernel32.spec | 5 +++
dlls/psapi/psapi.spec | 10 +++---
dlls/psapi/psapi_main.c | 68 -------------------------------------------
4 files changed, 75 insertions(+), 73 deletions(-)
diff --git a/dlls/kernel32/file.c b/dlls/kernel32/file.c
index 537ea0a..94d795e 100644
--- a/dlls/kernel32/file.c
+++ b/dlls/kernel32/file.c
@@ -2536,3 +2536,68 @@ error: /* We get here if there was an error opening the file */
WARN("(%s): return = HFILE_ERROR error= %d\n", name,ofs->nErrCode );
return HFILE_ERROR;
}
+
+/***********************************************************************
+ * K32EnumDeviceDrivers (KERNEL32.@)
+ */
+BOOL WINAPI K32EnumDeviceDrivers(void **image_base, DWORD cb, DWORD *needed)
+{
+ FIXME("(%p, %d, %p): stub\n", image_base, cb, needed);
+
+ if (needed)
+ *needed = 0;
+
+ return TRUE;
+}
+
+/***********************************************************************
+ * K32GetDeviceDriverBaseNameA (KERNEL32.@)
+ */
+DWORD WINAPI K32GetDeviceDriverBaseNameA(void *image_base, LPSTR base_name, DWORD size)
+{
+ FIXME("(%p, %p, %d): stub\n", image_base, base_name, size);
+
+ if (base_name && size)
+ base_name[0] = '\0';
+
+ return 0;
+}
+
+/***********************************************************************
+ * K32GetDeviceDriverBaseNameW (KERNEL32.@)
+ */
+DWORD WINAPI K32GetDeviceDriverBaseNameW(void *image_base, LPWSTR base_name, DWORD size)
+{
+ FIXME("(%p, %p, %d): stub\n", image_base, base_name, size);
+
+ if (base_name && size)
+ base_name[0] = '\0';
+
+ return 0;
+}
+
+/***********************************************************************
+ * K32GetDeviceDriverFileNameA (KERNEL32.@)
+ */
+DWORD WINAPI K32GetDeviceDriverFileNameA(void *image_base, LPSTR file_name, DWORD size)
+{
+ FIXME("(%p, %p, %d): stub\n", image_base, file_name, size);
+
+ if (file_name && size)
+ file_name[0] = '\0';
+
+ return 0;
+}
+
+/***********************************************************************
+ * K32GetDeviceDriverFileNameW (KERNEL32.@)
+ */
+DWORD WINAPI K32GetDeviceDriverFileNameW(void *image_base, LPWSTR file_name, DWORD size)
+{
+ FIXME("(%p, %p, %d): stub\n", image_base, file_name, size);
+
+ if (file_name && size)
+ file_name[0] = '\0';
+
+ return 0;
+}
diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec
index 9edd92e..52ddb12 100644
--- a/dlls/kernel32/kernel32.spec
+++ b/dlls/kernel32/kernel32.spec
@@ -770,8 +770,13 @@
@ stdcall K32EmptyWorkingSet(long)
@ stdcall K32GetProcessImageFileNameA(long ptr long)
@ stdcall K32GetProcessImageFileNameW(long ptr long)
+@ stdcall K32EnumDeviceDrivers(ptr long ptr)
@ stdcall K32EnumProcessModules(long ptr long ptr)
@ stdcall K32EnumProcesses(ptr long ptr)
+@ stdcall K32GetDeviceDriverBaseNameA(ptr ptr long)
+@ stdcall K32GetDeviceDriverBaseNameW(ptr ptr long)
+@ stdcall K32GetDeviceDriverFileNameA(ptr ptr long)
+@ stdcall K32GetDeviceDriverFileNameW(ptr ptr long)
@ stdcall K32GetMappedFileNameA(long ptr ptr long)
@ stdcall K32GetMappedFileNameW(long ptr ptr long)
@ stdcall K32GetModuleBaseNameA(long long ptr long)
diff --git a/dlls/psapi/psapi.spec b/dlls/psapi/psapi.spec
index a53ec04..835de4e 100644
--- a/dlls/psapi/psapi.spec
+++ b/dlls/psapi/psapi.spec
@@ -1,13 +1,13 @@
@ stdcall EmptyWorkingSet(long) kernel32.K32EmptyWorkingSet
-@ stdcall EnumDeviceDrivers(ptr long ptr)
+@ stdcall EnumDeviceDrivers(ptr long ptr) kernel32.K32EnumDeviceDrivers
@ stdcall EnumPageFilesA(ptr ptr)
@ stdcall EnumPageFilesW(ptr ptr)
@ stdcall EnumProcessModules(long ptr long ptr) kernel32.K32EnumProcessModules
@ stdcall EnumProcesses(ptr long ptr) kernel32.K32EnumProcesses
-@ stdcall GetDeviceDriverBaseNameA(ptr ptr long)
-@ stdcall GetDeviceDriverBaseNameW(ptr ptr long)
-@ stdcall GetDeviceDriverFileNameA(ptr ptr long)
-@ stdcall GetDeviceDriverFileNameW(ptr ptr long)
+@ stdcall GetDeviceDriverBaseNameA(ptr ptr long) kernel32.K32GetDeviceDriverBaseNameA
+@ stdcall GetDeviceDriverBaseNameW(ptr ptr long) kernel32.K32GetDeviceDriverBaseNameW
+@ stdcall GetDeviceDriverFileNameA(ptr ptr long) kernel32.K32GetDeviceDriverFileNameA
+@ stdcall GetDeviceDriverFileNameW(ptr ptr long) kernel32.K32GetDeviceDriverFileNameW
@ stdcall GetMappedFileNameA(long ptr ptr long) kernel32.K32GetMappedFileNameA
@ stdcall GetMappedFileNameW(long ptr ptr long) kernel32.K32GetMappedFileNameW
@ stdcall GetModuleBaseNameA(long long ptr long) kernel32.K32GetModuleBaseNameA
diff --git a/dlls/psapi/psapi_main.c b/dlls/psapi/psapi_main.c
index 8d79892..ef2f23d 100644
--- a/dlls/psapi/psapi_main.c
+++ b/dlls/psapi/psapi_main.c
@@ -35,19 +35,6 @@
WINE_DEFAULT_DEBUG_CHANNEL(psapi);
/***********************************************************************
- * EnumDeviceDrivers (PSAPI.@)
- */
-BOOL WINAPI EnumDeviceDrivers(LPVOID *lpImageBase, DWORD cb, LPDWORD lpcbNeeded)
-{
- FIXME("(%p, %d, %p): stub\n", lpImageBase, cb, lpcbNeeded);
-
- if (lpcbNeeded)
- *lpcbNeeded = 0;
-
- return TRUE;
-}
-
-/***********************************************************************
* EnumPageFilesA (PSAPI.@)
*/
BOOL WINAPI EnumPageFilesA( PENUM_PAGE_FILE_CALLBACKA callback, LPVOID context )
@@ -65,61 +52,6 @@ BOOL WINAPI EnumPageFilesW( PENUM_PAGE_FILE_CALLBACKW callback, LPVOID context )
return FALSE;
}
-/***********************************************************************
- * GetDeviceDriverBaseNameA (PSAPI.@)
- */
-DWORD WINAPI GetDeviceDriverBaseNameA(LPVOID ImageBase, LPSTR lpBaseName,
- DWORD nSize)
-{
- FIXME("(%p, %p, %d): stub\n", ImageBase, lpBaseName, nSize);
-
- if (lpBaseName && nSize)
- lpBaseName[0] = '\0';
-
- return 0;
-}
-
-/***********************************************************************
- * GetDeviceDriverBaseNameW (PSAPI.@)
- */
-DWORD WINAPI GetDeviceDriverBaseNameW(LPVOID ImageBase, LPWSTR lpBaseName,
- DWORD nSize)
-{
- FIXME("(%p, %p, %d): stub\n", ImageBase, lpBaseName, nSize);
-
- if (lpBaseName && nSize)
- lpBaseName[0] = '\0';
-
- return 0;
-}
-
-/***********************************************************************
- * GetDeviceDriverFileNameA (PSAPI.@)
- */
-DWORD WINAPI GetDeviceDriverFileNameA(LPVOID ImageBase, LPSTR lpFilename,
- DWORD nSize)
-{
- FIXME("(%p, %p, %d): stub\n", ImageBase, lpFilename, nSize);
-
- if (lpFilename && nSize)
- lpFilename[0] = '\0';
-
- return 0;
-}
-
-/***********************************************************************
- * GetDeviceDriverFileNameW (PSAPI.@)
- */
-DWORD WINAPI GetDeviceDriverFileNameW(LPVOID ImageBase, LPWSTR lpFilename,
- DWORD nSize)
-{
- FIXME("(%p, %p, %d): stub\n", ImageBase, lpFilename, nSize);
-
- if (lpFilename && nSize)
- lpFilename[0] = '\0';
-
- return 0;
-}
/***********************************************************************
* GetPerformanceInfo (PSAPI.@)
More information about the wine-cvs
mailing list