[PATCH 4/4] kernel32: Share the internal definitions with kernelbase.

Rémi Bernon rbernon at codeweavers.com
Wed Mar 30 03:35:36 CDT 2022


Signed-off-by: Rémi Bernon <rbernon at codeweavers.com>
---
 dlls/kernel32/atom.c           |  2 +-
 dlls/kernel32/computername.c   |  2 +-
 dlls/kernel32/console.c        |  2 +-
 dlls/kernel32/debugger.c       |  2 +-
 dlls/kernel32/file.c           | 16 +++++++--------
 dlls/kernel32/kernel_main.c    |  3 ++-
 dlls/kernel32/kernel_private.h | 37 ----------------------------------
 dlls/kernel32/lcformat.c       |  2 +-
 dlls/kernel32/locale.c         |  2 +-
 dlls/kernel32/module.c         |  8 ++++----
 dlls/kernel32/path.c           | 24 +++++++++++-----------
 dlls/kernel32/powermgnt.c      |  2 +-
 dlls/kernel32/process.c        |  2 +-
 dlls/kernel32/resource.c       |  2 +-
 dlls/kernel32/sync.c           |  2 +-
 dlls/kernel32/thread.c         |  2 +-
 dlls/kernel32/toolhelp.c       |  2 +-
 dlls/kernel32/virtual.c        |  3 ++-
 dlls/kernel32/volume.c         | 26 ++++++++++++------------
 dlls/kernelbase/kernelbase.h   |  4 +++-
 20 files changed, 56 insertions(+), 89 deletions(-)
 delete mode 100644 dlls/kernel32/kernel_private.h

diff --git a/dlls/kernel32/atom.c b/dlls/kernel32/atom.c
index 2330131fb65..3e55447c961 100644
--- a/dlls/kernel32/atom.c
+++ b/dlls/kernel32/atom.c
@@ -31,7 +31,7 @@
 #include "winternl.h"
 
 #include "wine/exception.h"
-#include "kernel_private.h"
+#include "kernelbase.h"
 
 #define MAX_ATOM_LEN 255
 #define IS_INTATOM(x)   (((ULONG_PTR)(x) >> 16) == 0)
diff --git a/dlls/kernel32/computername.c b/dlls/kernel32/computername.c
index 7c2003664e8..7947a7e601a 100644
--- a/dlls/kernel32/computername.c
+++ b/dlls/kernel32/computername.c
@@ -33,7 +33,7 @@
 #include "winternl.h"
 #include "wine/exception.h"
 
-#include "kernel_private.h"
+#include "kernelbase.h"
 
 
 /***********************************************************************
diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c
index da8171dcccf..411e513a9e9 100644
--- a/dlls/kernel32/console.c
+++ b/dlls/kernel32/console.c
@@ -39,7 +39,7 @@
 #include "wincon.h"
 #include "wine/condrv.h"
 #include "wine/debug.h"
-#include "kernel_private.h"
+#include "kernelbase.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(console);
 
diff --git a/dlls/kernel32/debugger.c b/dlls/kernel32/debugger.c
index 6ccce02a8f3..3f6963a0d5e 100644
--- a/dlls/kernel32/debugger.c
+++ b/dlls/kernel32/debugger.c
@@ -27,7 +27,7 @@
 #include "winbase.h"
 #include "winerror.h"
 #include "winternl.h"
-#include "kernel_private.h"
+#include "kernelbase.h"
 #include "wine/asm.h"
 #include "wine/debug.h"
 #include "wine/exception.h"
diff --git a/dlls/kernel32/file.c b/dlls/kernel32/file.c
index be355c9090d..90a9e8e96a7 100644
--- a/dlls/kernel32/file.c
+++ b/dlls/kernel32/file.c
@@ -35,7 +35,7 @@
 #include "winioctl.h"
 #include "wincon.h"
 #include "ddk/ntddk.h"
-#include "kernel_private.h"
+#include "kernelbase.h"
 #include "fileapi.h"
 #include "shlwapi.h"
 
@@ -83,7 +83,7 @@ static HANDLE create_file_OF( LPCSTR path, INT mode )
 
 
 /***********************************************************************
- *           FILE_name_AtoW
+ *           file_name_AtoW
  *
  * Convert a file name to Unicode, taking into account the OEM/Ansi API mode.
  *
@@ -91,7 +91,7 @@ static HANDLE create_file_OF( LPCSTR path, INT mode )
  * there is no possibility for the function to do that twice, taking into
  * account any called function.
  */
-WCHAR *FILE_name_AtoW( LPCSTR name, BOOL alloc )
+WCHAR *file_name_AtoW( LPCSTR name, BOOL alloc )
 {
     ANSI_STRING str;
     UNICODE_STRING strW, *pstrW;
@@ -114,11 +114,11 @@ WCHAR *FILE_name_AtoW( LPCSTR name, BOOL alloc )
 
 
 /***********************************************************************
- *           FILE_name_WtoA
+ *           file_name_WtoA
  *
  * Convert a file name back to OEM/Ansi. Returns number of bytes copied.
  */
-DWORD FILE_name_WtoA( LPCWSTR src, INT srclen, LPSTR dest, INT destlen )
+DWORD file_name_WtoA( LPCWSTR src, INT srclen, LPSTR dest, INT destlen )
 {
     DWORD ret;
 
@@ -340,12 +340,12 @@ BOOL WINAPI ReplaceFileA(LPCSTR lpReplacedFileName,LPCSTR lpReplacementFileName,
     BOOL ret;
 
     /* This function only makes sense when the first two parameters are defined */
-    if (!lpReplacedFileName || !(replacedW = FILE_name_AtoW( lpReplacedFileName, TRUE )))
+    if (!lpReplacedFileName || !(replacedW = file_name_AtoW( lpReplacedFileName, TRUE )))
     {
         SetLastError(ERROR_INVALID_PARAMETER);
         return FALSE;
     }
-    if (!lpReplacementFileName || !(replacementW = FILE_name_AtoW( lpReplacementFileName, TRUE )))
+    if (!lpReplacementFileName || !(replacementW = file_name_AtoW( lpReplacementFileName, TRUE )))
     {
         HeapFree( GetProcessHeap(), 0, replacedW );
         SetLastError(ERROR_INVALID_PARAMETER);
@@ -354,7 +354,7 @@ BOOL WINAPI ReplaceFileA(LPCSTR lpReplacedFileName,LPCSTR lpReplacementFileName,
     /* The backup parameter, however, is optional */
     if (lpBackupFileName)
     {
-        if (!(backupW = FILE_name_AtoW( lpBackupFileName, TRUE )))
+        if (!(backupW = file_name_AtoW( lpBackupFileName, TRUE )))
         {
             HeapFree( GetProcessHeap(), 0, replacedW );
             HeapFree( GetProcessHeap(), 0, replacementW );
diff --git a/dlls/kernel32/kernel_main.c b/dlls/kernel32/kernel_main.c
index 352a873933f..a69ea40a415 100644
--- a/dlls/kernel32/kernel_main.c
+++ b/dlls/kernel32/kernel_main.c
@@ -29,12 +29,13 @@
 #include "wincon.h"
 #include "winternl.h"
 
-#include "kernel_private.h"
+#include "kernelbase.h"
 #include "wine/debug.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(process);
 
 static STARTUPINFOA startup_infoA;
+extern SYSTEM_BASIC_INFORMATION system_info;
 
 /***********************************************************************
  *           set_entry_point
diff --git a/dlls/kernel32/kernel_private.h b/dlls/kernel32/kernel_private.h
deleted file mode 100644
index 633511d6140..00000000000
--- a/dlls/kernel32/kernel_private.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Kernel32 undocumented and private functions definition
- *
- * Copyright 2003 Eric Pouech
- *
- * 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
- */
-
-#ifndef __WINE_KERNEL_PRIVATE_H
-#define __WINE_KERNEL_PRIVATE_H
-
-NTSTATUS WINAPI BaseGetNamedObjectDirectory( HANDLE *dir );
-
-static inline BOOL set_ntstatus( NTSTATUS status )
-{
-    if (status) SetLastError( RtlNtStatusToDosError( status ));
-    return !status;
-}
-
-extern SYSTEM_BASIC_INFORMATION system_info DECLSPEC_HIDDEN;
-
-extern WCHAR *FILE_name_AtoW( LPCSTR name, BOOL alloc ) DECLSPEC_HIDDEN;
-extern DWORD FILE_name_WtoA( LPCWSTR src, INT srclen, LPSTR dest, INT destlen ) DECLSPEC_HIDDEN;
-
-#endif
diff --git a/dlls/kernel32/lcformat.c b/dlls/kernel32/lcformat.c
index 76837a62431..3591dd07a9c 100644
--- a/dlls/kernel32/lcformat.c
+++ b/dlls/kernel32/lcformat.c
@@ -33,7 +33,7 @@
 #include "wine/debug.h"
 #include "winternl.h"
 
-#include "kernel_private.h"
+#include "kernelbase.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(nls);
 
diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c
index 020ec3d843d..882d4dc9538 100644
--- a/dlls/kernel32/locale.c
+++ b/dlls/kernel32/locale.c
@@ -37,7 +37,7 @@
 #include "winnls.h"
 #include "winerror.h"
 #include "winver.h"
-#include "kernel_private.h"
+#include "kernelbase.h"
 #include "wine/heap.h"
 #include "wine/debug.h"
 
diff --git a/dlls/kernel32/module.c b/dlls/kernel32/module.c
index 433366d364b..4b164821fb7 100644
--- a/dlls/kernel32/module.c
+++ b/dlls/kernel32/module.c
@@ -31,7 +31,7 @@
 #include "windef.h"
 #include "winbase.h"
 #include "winternl.h"
-#include "kernel_private.h"
+#include "kernelbase.h"
 #include "psapi.h"
 
 #include "wine/list.h"
@@ -69,10 +69,10 @@ DWORD WINAPI GetDllDirectoryA( DWORD buf_len, LPSTR buffer )
 
     if (!set_ntstatus( status )) return 0;
 
-    len = FILE_name_WtoA( str.Buffer, str.Length / sizeof(WCHAR), NULL, 0 );
+    len = file_name_WtoA( str.Buffer, str.Length / sizeof(WCHAR), NULL, 0 );
     if (buffer && buf_len > len)
     {
-        FILE_name_WtoA( str.Buffer, -1, buffer, buf_len );
+        file_name_WtoA( str.Buffer, -1, buffer, buf_len );
     }
     else
     {
@@ -109,7 +109,7 @@ BOOL WINAPI SetDllDirectoryA( LPCSTR dir )
     WCHAR *dirW = NULL;
     BOOL ret;
 
-    if (dir && !(dirW = FILE_name_AtoW( dir, TRUE ))) return FALSE;
+    if (dir && !(dirW = file_name_AtoW( dir, TRUE ))) return FALSE;
     ret = SetDllDirectoryW( dirW );
     HeapFree( GetProcessHeap(), 0, dirW );
     return ret;
diff --git a/dlls/kernel32/path.c b/dlls/kernel32/path.c
index 2dd3eac3c26..4b13c01b39c 100644
--- a/dlls/kernel32/path.c
+++ b/dlls/kernel32/path.c
@@ -33,14 +33,14 @@
 #include "winnls.h"
 #include "winternl.h"
 
-#include "kernel_private.h"
+#include "kernelbase.h"
 #include "wine/debug.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(file);
 
 #define MAX_PATHNAME_LEN        1024
 
-static const WCHAR system_dir[] = L"C:\\windows\\system32";
+const WCHAR system_dir[] = L"C:\\windows\\system32";
 
 /***********************************************************************
  *           copy_filename_WtoA
@@ -82,7 +82,7 @@ DWORD WINAPI GetShortPathNameA( LPCSTR longpath, LPSTR shortpath, DWORD shortlen
 
     TRACE("%s\n", debugstr_a(longpath));
 
-    if (!(longpathW = FILE_name_AtoW( longpath, FALSE ))) return 0;
+    if (!(longpathW = file_name_AtoW( longpath, FALSE ))) return 0;
 
     ret = GetShortPathNameW(longpathW, shortpathW, MAX_PATH);
 
@@ -104,8 +104,8 @@ BOOL WINAPI CopyFileA( LPCSTR source, LPCSTR dest, BOOL fail_if_exists)
     WCHAR *sourceW, *destW;
     BOOL ret;
 
-    if (!(sourceW = FILE_name_AtoW( source, FALSE ))) return FALSE;
-    if (!(destW = FILE_name_AtoW( dest, TRUE ))) return FALSE;
+    if (!(sourceW = file_name_AtoW( source, FALSE ))) return FALSE;
+    if (!(destW = file_name_AtoW( dest, TRUE ))) return FALSE;
 
     ret = CopyFileW( sourceW, destW, fail_if_exists );
 
@@ -125,8 +125,8 @@ BOOL WINAPI CopyFileExA(LPCSTR sourceFilename, LPCSTR destFilename,
     BOOL ret;
 
     /* can't use the TEB buffer since we may have a callback routine */
-    if (!(sourceW = FILE_name_AtoW( sourceFilename, TRUE ))) return FALSE;
-    if (!(destW = FILE_name_AtoW( destFilename, TRUE )))
+    if (!(sourceW = file_name_AtoW( sourceFilename, TRUE ))) return FALSE;
+    if (!(destW = file_name_AtoW( destFilename, TRUE )))
     {
         HeapFree( GetProcessHeap(), 0, sourceW );
         return FALSE;
@@ -168,10 +168,10 @@ BOOL WINAPI MoveFileWithProgressA( LPCSTR source, LPCSTR dest,
     WCHAR *sourceW, *destW;
     BOOL ret;
 
-    if (!(sourceW = FILE_name_AtoW( source, FALSE ))) return FALSE;
+    if (!(sourceW = file_name_AtoW( source, FALSE ))) return FALSE;
     if (dest)
     {
-        if (!(destW = FILE_name_AtoW( dest, TRUE ))) return FALSE;
+        if (!(destW = file_name_AtoW( dest, TRUE ))) return FALSE;
     }
     else
         destW = NULL;
@@ -218,8 +218,8 @@ BOOL WINAPI CreateDirectoryExA( LPCSTR template, LPCSTR path, LPSECURITY_ATTRIBU
     WCHAR *pathW, *templateW = NULL;
     BOOL ret;
 
-    if (!(pathW = FILE_name_AtoW( path, FALSE ))) return FALSE;
-    if (template && !(templateW = FILE_name_AtoW( template, TRUE ))) return FALSE;
+    if (!(pathW = file_name_AtoW( path, FALSE ))) return FALSE;
+    if (template && !(templateW = file_name_AtoW( template, TRUE ))) return FALSE;
 
     ret = CreateDirectoryExW( templateW, pathW, sa );
     HeapFree( GetProcessHeap(), 0, templateW );
@@ -390,7 +390,7 @@ BOOL WINAPI CheckNameLegalDOS8Dot3A(const char *name, char *oemname, DWORD oemna
     if (!name || !is_legal)
         return FALSE;
 
-    if (!(nameW = FILE_name_AtoW( name, FALSE ))) return FALSE;
+    if (!(nameW = file_name_AtoW( name, FALSE ))) return FALSE;
 
     return CheckNameLegalDOS8Dot3W( nameW, oemname, oemname_len, contains_spaces, is_legal );
 }
diff --git a/dlls/kernel32/powermgnt.c b/dlls/kernel32/powermgnt.c
index ca62019b256..78f0b2ad08f 100644
--- a/dlls/kernel32/powermgnt.c
+++ b/dlls/kernel32/powermgnt.c
@@ -24,7 +24,7 @@
 #include "windef.h"
 #include "winbase.h"
 #include "winternl.h"
-#include "kernel_private.h"
+#include "kernelbase.h"
 #include "wine/debug.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(powermgnt);
diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c
index 4630043645c..b27e1df72f2 100644
--- a/dlls/kernel32/process.c
+++ b/dlls/kernel32/process.c
@@ -32,7 +32,7 @@
 #include "winbase.h"
 #include "winnls.h"
 #include "wincon.h"
-#include "kernel_private.h"
+#include "kernelbase.h"
 #include "psapi.h"
 #include "ddk/wdm.h"
 #include "wine/asm.h"
diff --git a/dlls/kernel32/resource.c b/dlls/kernel32/resource.c
index ab30a88bfb4..7f1874a01ec 100644
--- a/dlls/kernel32/resource.c
+++ b/dlls/kernel32/resource.c
@@ -32,7 +32,7 @@
 #include "wine/debug.h"
 #include "wine/exception.h"
 #include "wine/list.h"
-#include "kernel_private.h"
+#include "kernelbase.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(resource);
 
diff --git a/dlls/kernel32/sync.c b/dlls/kernel32/sync.c
index 219800a46e5..67d620cf17e 100644
--- a/dlls/kernel32/sync.c
+++ b/dlls/kernel32/sync.c
@@ -36,7 +36,7 @@
 #include "ddk/wdm.h"
 
 #include "wine/asm.h"
-#include "kernel_private.h"
+#include "kernelbase.h"
 
 #include "wine/debug.h"
 
diff --git a/dlls/kernel32/thread.c b/dlls/kernel32/thread.c
index a090c54aa28..9366597e939 100644
--- a/dlls/kernel32/thread.c
+++ b/dlls/kernel32/thread.c
@@ -31,7 +31,7 @@
 
 #include "wine/asm.h"
 #include "wine/debug.h"
-#include "kernel_private.h"
+#include "kernelbase.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(thread);
 
diff --git a/dlls/kernel32/toolhelp.c b/dlls/kernel32/toolhelp.c
index 5e1ec84d100..aa5af0d6f47 100644
--- a/dlls/kernel32/toolhelp.c
+++ b/dlls/kernel32/toolhelp.c
@@ -33,7 +33,7 @@
 #include "winnls.h"
 #include "winternl.h"
 
-#include "kernel_private.h"
+#include "kernelbase.h"
 #include "wine/debug.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(toolhelp);
diff --git a/dlls/kernel32/virtual.c b/dlls/kernel32/virtual.c
index f5693de4e28..a0fa46e4f8b 100644
--- a/dlls/kernel32/virtual.c
+++ b/dlls/kernel32/virtual.c
@@ -37,10 +37,11 @@
 #include "wine/exception.h"
 #include "wine/debug.h"
 
-#include "kernel_private.h"
+#include "kernelbase.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(seh);
 
+extern SYSTEM_BASIC_INFORMATION system_info;
 
 static LONG WINAPI badptr_handler( EXCEPTION_POINTERS *eptr )
 {
diff --git a/dlls/kernel32/volume.c b/dlls/kernel32/volume.c
index 54fc65343ad..8c9225aee4a 100644
--- a/dlls/kernel32/volume.c
+++ b/dlls/kernel32/volume.c
@@ -35,7 +35,7 @@
 #include "winioctl.h"
 #include "ntddcdrm.h"
 #include "ddk/wdm.h"
-#include "kernel_private.h"
+#include "kernelbase.h"
 #include "wine/debug.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(volume);
@@ -306,8 +306,8 @@ BOOL WINAPI SetVolumeLabelA(LPCSTR root, LPCSTR volname)
     WCHAR *rootW = NULL, *volnameW = NULL;
     BOOL ret;
 
-    if (root && !(rootW = FILE_name_AtoW( root, FALSE ))) return FALSE;
-    if (volname && !(volnameW = FILE_name_AtoW( volname, TRUE ))) return FALSE;
+    if (root && !(rootW = file_name_AtoW( root, FALSE ))) return FALSE;
+    if (volname && !(volnameW = file_name_AtoW( volname, TRUE ))) return FALSE;
     ret = SetVolumeLabelW( rootW, volnameW );
     HeapFree( GetProcessHeap(), 0, volnameW );
     return ret;
@@ -325,11 +325,11 @@ BOOL WINAPI GetVolumeNameForVolumeMountPointA( LPCSTR path, LPSTR volume, DWORD
 
     TRACE("(%s, %p, %lx)\n", debugstr_a(path), volume, size);
 
-    if (!path || !(pathW = FILE_name_AtoW( path, TRUE )))
+    if (!path || !(pathW = file_name_AtoW( path, TRUE )))
         return FALSE;
 
     if ((ret = GetVolumeNameForVolumeMountPointW( pathW, volumeW, len )))
-        FILE_name_WtoA( volumeW, -1, volume, len );
+        file_name_WtoA( volumeW, -1, volume, len );
 
     HeapFree( GetProcessHeap(), 0, pathW );
     return ret;
@@ -344,8 +344,8 @@ BOOL WINAPI DefineDosDeviceA(DWORD flags, LPCSTR devname, LPCSTR targetpath)
     WCHAR *devW, *targetW = NULL;
     BOOL ret;
 
-    if (!(devW = FILE_name_AtoW( devname, FALSE ))) return FALSE;
-    if (targetpath && !(targetW = FILE_name_AtoW( targetpath, TRUE ))) return FALSE;
+    if (!(devW = file_name_AtoW( devname, FALSE ))) return FALSE;
+    if (targetpath && !(targetW = file_name_AtoW( targetpath, TRUE ))) return FALSE;
     ret = DefineDosDeviceW(flags, devW, targetW);
     HeapFree( GetProcessHeap(), 0, targetW );
     return ret;
@@ -363,7 +363,7 @@ DWORD WINAPI QueryDosDeviceA( LPCSTR devname, LPSTR target, DWORD bufsize )
     WCHAR *devnameW = NULL;
     LPWSTR targetW;
 
-    if (devname && !(devnameW = FILE_name_AtoW( devname, FALSE ))) return 0;
+    if (devname && !(devnameW = file_name_AtoW( devname, FALSE ))) return 0;
 
     targetW = HeapAlloc( GetProcessHeap(),0, bufsize * sizeof(WCHAR) );
     if (!targetW)
@@ -374,7 +374,7 @@ DWORD WINAPI QueryDosDeviceA( LPCSTR devname, LPSTR target, DWORD bufsize )
 
     retW = QueryDosDeviceW(devnameW, targetW, bufsize);
 
-    ret = FILE_name_WtoA( targetW, retW, target, bufsize );
+    ret = file_name_WtoA( targetW, retW, target, bufsize );
 
     HeapFree(GetProcessHeap(), 0, targetW);
     return ret;
@@ -417,13 +417,13 @@ BOOL WINAPI GetVolumePathNameA(LPCSTR filename, LPSTR volumepathname, DWORD bufl
 
     TRACE("(%s, %p, %ld)\n", debugstr_a(filename), volumepathname, buflen);
 
-    if (filename && !(filenameW = FILE_name_AtoW( filename, FALSE )))
+    if (filename && !(filenameW = file_name_AtoW( filename, FALSE )))
         return FALSE;
     if (volumepathname && !(volumeW = HeapAlloc( GetProcessHeap(), 0, buflen * sizeof(WCHAR) )))
         return FALSE;
 
     if ((ret = GetVolumePathNameW( filenameW, volumeW, buflen )))
-        FILE_name_WtoA( volumeW, -1, volumepathname, buflen );
+        file_name_WtoA( volumeW, -1, volumepathname, buflen );
 
     HeapFree( GetProcessHeap(), 0, volumeW );
     return ret;
@@ -438,7 +438,7 @@ BOOL WINAPI GetVolumePathNamesForVolumeNameA(LPCSTR volumename, LPSTR volumepath
     BOOL ret;
     WCHAR *volumenameW = NULL, *volumepathnameW;
 
-    if (volumename && !(volumenameW = FILE_name_AtoW( volumename, TRUE ))) return FALSE;
+    if (volumename && !(volumenameW = file_name_AtoW( volumename, TRUE ))) return FALSE;
     if (!(volumepathnameW = HeapAlloc( GetProcessHeap(), 0, buflen * sizeof(WCHAR) )))
     {
         HeapFree( GetProcessHeap(), 0, volumenameW );
@@ -452,7 +452,7 @@ BOOL WINAPI GetVolumePathNamesForVolumeNameA(LPCSTR volumename, LPSTR volumepath
         while (*pathW)
         {
             int len = lstrlenW( pathW ) + 1;
-            FILE_name_WtoA( pathW, len, path, buflen );
+            file_name_WtoA( pathW, len, path, buflen );
             buflen -= len;
             pathW += len;
             path += len;
diff --git a/dlls/kernelbase/kernelbase.h b/dlls/kernelbase/kernelbase.h
index 4be7177d74d..775413b30eb 100644
--- a/dlls/kernelbase/kernelbase.h
+++ b/dlls/kernelbase/kernelbase.h
@@ -1,5 +1,5 @@
 /*
- * Kernelbase internal definitions
+ * Kernelbase private and internal definitions
  *
  * Copyright 2019 Alexandre Julliard
  *
@@ -24,6 +24,8 @@
 #include "windef.h"
 #include "winbase.h"
 
+NTSTATUS WINAPI BaseGetNamedObjectDirectory( HANDLE *dir );
+
 struct pseudo_console
 {
     HANDLE signal;
-- 
2.35.1




More information about the wine-devel mailing list