Moved profile functions to dlls/kernel.

dlls/kernel/Makefile.in

@@ -38,6 +38,7 @@ C_SRCS = \
 	ne_segment.c \
 	powermgnt.c \
 	process.c \
+	profile.c \
 	relay16.c \
 	resource.c \
 	resource16.c \

files/profile.c → dlls/kernel/profile.c

@@ -867,21 +867,6 @@ static BOOL PROFILE_SetString( LPCWSTR section_name, LPCWSTR key_name,
 }
 
 
-/***********************************************************************
- *           PROFILE_UsageWineIni
- *
- * Explain the wine.ini file to those who don't read documentation.
- * Keep below one screenful in length so that error messages above are
- * noticed.
- */
-void PROFILE_UsageWineIni(void)
-{
-    MESSAGE("Perhaps you have not properly edited or created "
-	"your Wine configuration file,\n");
-    MESSAGE("which is (supposed to be) '%s/config'.\n", wine_get_config_dir());
-}
-
-
 /********************* API functions **********************************/
 
 /***********************************************************************

dlls/ntdll/Makefile.in

@@ -11,7 +11,6 @@ C_SRCS = \
 	$(TOPOBJDIR)/files/dos_fs.c \
 	$(TOPOBJDIR)/files/drive.c \
 	$(TOPOBJDIR)/files/file.c \
-	$(TOPOBJDIR)/files/profile.c \
 	$(TOPOBJDIR)/files/smb.c \
 	$(TOPOBJDIR)/loader/loadorder.c \
 	$(TOPOBJDIR)/loader/module.c \

files/directory.c

@@ -89,8 +89,12 @@ static int DIR_GetPath( HKEY hkey, LPCWSTR keyname, LPCWSTR defval, DOS_FULL_NAM
         (!(GetLongPathNameW(full_name->short_name, longname, longname_len))) )
     {
         if (warn)
+        {
             MESSAGE("Invalid path %s for %s directory: %s.\n",
                     debugstr_w(path), debugstr_w(keyname), mess);
+            MESSAGE("Perhaps you have not properly edited your Wine configuration file (%s/config)\n",
+                    wine_get_config_dir());
+        }
         return 0;
     }
     return 1;
@@ -170,7 +174,6 @@ int DIR_Init(void)
         !(DIR_GetPath( hkey, systemW, system_dirW, &DIR_System, longpath, MAX_PATHNAME_LEN, TRUE )) ||
         !(DIR_GetPath( hkey, tempW, windows_dirW, &tmp_dir, longpath, MAX_PATHNAME_LEN, TRUE )))
     {
-	PROFILE_UsageWineIni();
         if (hkey) NtClose( hkey );
         return 0;
     }
@@ -178,8 +181,9 @@ int DIR_Init(void)
     {
     	if (errno==EACCES)
 	{
-		MESSAGE("Warning: the temporary directory '%s' (specified in wine configuration file) is not writeable.\n", tmp_dir.long_name);
-		PROFILE_UsageWineIni();
+		MESSAGE("Warning: the temporary directory '%s' specified in your\n"
+                        "configuration file (%s) is not writeable.\n",
+                        tmp_dir.long_name, wine_get_config_dir() );
 	}
 	else
 		MESSAGE("Warning: access to temporary directory '%s' failed (%s).\n",
@@ -219,8 +223,7 @@ int DIR_Init(void)
 
         if (strchrW(path, '/'))
         {
-            MESSAGE("Fix your wine config to use DOS drive syntax in [wine] 'Path=' statement! (no '/' allowed)\n");
-            PROFILE_UsageWineIni();
+            MESSAGE("Fix your wine config (%s/config) to use DOS drive syntax in [wine] 'Path=' statement! (no '/' allowed)\n", wine_get_config_dir() );
             ExitProcess(1);
         }
         SetEnvironmentVariableW( path_capsW, path );

files/drive.c

@@ -751,7 +751,6 @@ int DRIVE_ReadSuperblock (int drive, char * buff)
     }
     if (fd == -1) {
 	ERR("Can't read drive volume info ! Either pre-set it or make sure the device to read it from is accessible !\n");
-	PROFILE_UsageWineIni();
 	return -1;
     }
 

include/file.h

@@ -106,9 +106,6 @@ extern int DOSFS_FindNext( const char *path, const char *short_mask,
                            const char *long_mask, int drive, BYTE attr,
                            int skip, WIN32_FIND_DATAA *entry );
 
-/* profile.c */
-extern void PROFILE_UsageWineIni(void);
-
 /* win32/device.c */
 extern HANDLE DEVICE_Open( LPCWSTR filename, DWORD access, LPSECURITY_ATTRIBUTES sa );