Removed most inclusions of options.h.
Removed a few no longer used PROFILE_* functions.
diff --git a/dlls/winedos/module.c b/dlls/winedos/module.c
index 91cc0ba..dcf2dfa 100644
--- a/dlls/winedos/module.c
+++ b/dlls/winedos/module.c
@@ -45,7 +45,6 @@
#include "wine/debug.h"
#include "dosexe.h"
#include "dosvm.h"
-#include "options.h"
#include "vga.h"
WINE_DEFAULT_DEBUG_CHANNEL(module);
diff --git a/dlls/x11drv/event.c b/dlls/x11drv/event.c
index 4c18568..848f224 100644
--- a/dlls/x11drv/event.c
+++ b/dlls/x11drv/event.c
@@ -40,7 +40,6 @@
#include "dce.h"
#include "wine/debug.h"
#include "input.h"
-#include "options.h"
#include "win.h"
#include "winpos.h"
#include "windef.h"
diff --git a/files/directory.c b/files/directory.c
index 0ee2cd1..37acb3e 100644
--- a/files/directory.c
+++ b/files/directory.c
@@ -43,7 +43,6 @@
#include "file.h"
#include "heap.h"
#include "msdos.h"
-#include "options.h"
#include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(dosfs);
diff --git a/files/dos_fs.c b/files/dos_fs.c
index 3c1884b..058e1c4 100644
--- a/files/dos_fs.c
+++ b/files/dos_fs.c
@@ -49,7 +49,6 @@
#include "heap.h"
#include "msdos.h"
#include "ntddk.h"
-#include "options.h"
#include "wine/server.h"
#include "msvcrt/excpt.h"
diff --git a/files/drive.c b/files/drive.c
index 2090ca0..d4736b4 100644
--- a/files/drive.c
+++ b/files/drive.c
@@ -60,7 +60,6 @@
#include "file.h"
#include "heap.h"
#include "msdos.h"
-#include "options.h"
#include "task.h"
#include "wine/debug.h"
#include "wine/server.h"
diff --git a/files/profile.c b/files/profile.c
index 836da14..cb68ae7 100644
--- a/files/profile.c
+++ b/files/profile.c
@@ -39,7 +39,6 @@
#include "file.h"
#include "heap.h"
#include "wine/debug.h"
-#include "options.h"
#include "wine/server.h"
WINE_DEFAULT_DEBUG_CHANNEL(profile);
@@ -951,50 +950,6 @@
}
-/***********************************************************************
- * PROFILE_EnumWineIniString
- *
- * Get a config string from the wine.ini file.
- */
-BOOL PROFILE_EnumWineIniString( const char *section, int index,
- char *name, int name_len, char *buffer, int len )
-{
- char tmp[PROFILE_MAX_LINE_LEN];
- HKEY hkey;
- DWORD err, type;
- DWORD count = sizeof(tmp);
-
- if (RegOpenKeyA( wine_profile_key, section, &hkey )) return FALSE;
- err = RegEnumValueA( hkey, index, name, (DWORD*)&name_len, NULL, &type, tmp, &count );
- RegCloseKey( hkey );
- if (!err)
- {
- PROFILE_CopyEntry( buffer, tmp, len, TRUE );
- TRACE( "('%s',%d): returning '%s'='%s'\n", section, index, name, buffer );
- }
- return !err;
-}
-
-
-/***********************************************************************
- * PROFILE_GetWineIniInt
- *
- * Get a config integer from the wine.ini file.
- */
-int PROFILE_GetWineIniInt( const char *section, const char *key_name, int def )
-{
- char buffer[20];
- char *p;
- long result;
-
- PROFILE_GetWineIniString( section, key_name, "", buffer, sizeof(buffer) );
- if (!buffer[0]) return def;
- /* FIXME: strtol wrong ?? see GetPrivateProfileIntA */
- result = strtol( buffer, &p, 0 );
- return (p == buffer) ? 0 /* No digits at all */ : (int)result;
-}
-
-
/******************************************************************************
*
* int PROFILE_GetWineIniBool(
@@ -1148,30 +1103,6 @@
/* RTFM, so to say */
}
-/***********************************************************************
- * PROFILE_GetStringItem
- *
- * Convenience function that turns a string 'xxx, yyy, zzz' into
- * the 'xxx\0 yyy, zzz' and returns a pointer to the 'yyy, zzz'.
- */
-char* PROFILE_GetStringItem( char* start )
-{
- char* lpchX, *lpch;
-
- for (lpchX = start, lpch = NULL; *lpchX != '\0'; lpchX++ )
- {
- if( *lpchX == ',' )
- {
- if( lpch ) *lpch = '\0'; else *lpchX = '\0';
- while( *(++lpchX) )
- if( !PROFILE_isspace(*lpchX) ) return lpchX;
- }
- else if( PROFILE_isspace( *lpchX ) && !lpch ) lpch = lpchX;
- else lpch = NULL;
- }
- if( lpch ) *lpch = '\0';
- return NULL;
-}
/********************* API functions **********************************/
diff --git a/include/file.h b/include/file.h
index a986d4e..2d7dbd3 100644
--- a/include/file.h
+++ b/include/file.h
@@ -107,6 +107,13 @@
const char *long_mask, int drive, BYTE attr,
int skip, WIN32_FIND_DATAA *entry );
+/* profile.c */
+extern int PROFILE_LoadWineIni(void);
+extern void PROFILE_UsageWineIni(void);
+extern int PROFILE_GetWineIniString( const char *section, const char *key_name,
+ const char *def, char *buffer, int len );
+extern int PROFILE_GetWineIniBool( char const *section, char const *key_name, int def );
+
/* win32/device.c */
extern HANDLE DEVICE_Open( LPCSTR filename, DWORD access, LPSECURITY_ATTRIBUTES sa );
diff --git a/include/options.h b/include/options.h
index ee6f9b1..afc1bda 100644
--- a/include/options.h
+++ b/include/options.h
@@ -25,25 +25,8 @@
extern const char *argv0;
extern const char *full_argv0;
-extern unsigned int server_startticks;
extern void OPTIONS_Usage(void) WINE_NORETURN;
extern void OPTIONS_ParseOptions( char *argv[] );
-/* Profile functions */
-
-extern int PROFILE_LoadWineIni(void);
-extern void PROFILE_UsageWineIni(void);
-extern int PROFILE_GetWineIniString( const char *section, const char *key_name,
- const char *def, char *buffer, int len );
-extern BOOL PROFILE_EnumWineIniString( const char *section, int index,
- char *name, int name_len, char *buffer, int len );
-extern int PROFILE_GetWineIniInt( const char *section, const char *key_name, int def );
-extern int PROFILE_GetWineIniBool( char const *section, char const *key_name, int def );
-extern char* PROFILE_GetStringItem( char* );
-
-/* Version functions */
-extern void VERSION_ParseWinVersion( const char *arg );
-extern void VERSION_ParseDosVersion( const char *arg );
-
#endif /* __WINE_OPTIONS_H */
diff --git a/loader/loadorder.c b/loader/loadorder.c
index 171708a..38412be 100644
--- a/loader/loadorder.c
+++ b/loader/loadorder.c
@@ -27,7 +27,6 @@
#include "windef.h"
#include "winreg.h"
#include "winerror.h"
-#include "options.h"
#include "file.h"
#include "module.h"
#include "wine/debug.h"
diff --git a/misc/main.c b/misc/main.c
index 93aed08..018869c 100644
--- a/misc/main.c
+++ b/misc/main.c
@@ -35,7 +35,6 @@
#include "ntddk.h"
#include "winnls.h"
#include "winerror.h"
-#include "options.h"
#include "wine/debug.h"
WINE_DECLARE_DEBUG_CHANNEL(file);
@@ -61,19 +60,3 @@
FIXME_(file)("(0x%8x): stub\n", (int) x);
return (FARPROC16)TRUE;
}
-
-/***********************************************************************
- * GetTickCount (USER.13)
- * GetCurrentTime (USER.15)
- * GetTickCount (KERNEL32.@)
- * GetSystemMSecCount (SYSTEM.6)
- *
- * Returns the number of milliseconds, modulo 2^32, since the start
- * of the wineserver.
- */
-DWORD WINAPI GetTickCount(void)
-{
- struct timeval t;
- gettimeofday( &t, NULL );
- return ((t.tv_sec * 1000) + (t.tv_usec / 1000)) - server_startticks;
-}
diff --git a/misc/registry.c b/misc/registry.c
index 57eab1f..d4f0f01 100644
--- a/misc/registry.c
+++ b/misc/registry.c
@@ -56,7 +56,6 @@
#include "wine/server.h"
#include "wine/unicode.h"
#include "file.h"
-#include "options.h"
#include "wine/debug.h"
@@ -1047,10 +1046,12 @@
static void _init_registry_saving( HKEY hkey_users_default )
{
int all;
- int period;
+ int period = 0;
+ char buffer[20];
- all = PROFILE_GetWineIniBool("registry","SaveOnlyUpdatedKeys",1);
- period = PROFILE_GetWineIniInt("registry","PeriodicSave",0);
+ all = !PROFILE_GetWineIniBool("registry","SaveOnlyUpdatedKeys",1);
+ PROFILE_GetWineIniString( "registry", "PeriodicSave", "", buffer, sizeof(buffer) );
+ if (buffer[0]) period = atoi(buffer);
/* set saving level (0 for saving everything, 1 for saving only modified keys) */
_set_registry_levels(1,!all,period*1000);
diff --git a/msdos/dosconf.c b/msdos/dosconf.c
index 9192967..03a214a 100644
--- a/msdos/dosconf.c
+++ b/msdos/dosconf.c
@@ -31,7 +31,6 @@
#include "file.h"
#include "miscemu.h"
#include "msdos.h"
-#include "options.h"
#include "wine/debug.h"
diff --git a/msdos/int11.c b/msdos/int11.c
index 5a2811a..c07b396 100644
--- a/msdos/int11.c
+++ b/msdos/int11.c
@@ -27,8 +27,8 @@
#include "windef.h"
#include "miscemu.h"
#include "msdos.h"
+#include "file.h"
#include "wine/debug.h"
-#include "options.h"
/**********************************************************************
* INT_Int11Handler (WPROCS.117)
diff --git a/msdos/int1a.c b/msdos/int1a.c
index 233f378..596244b 100644
--- a/msdos/int1a.c
+++ b/msdos/int1a.c
@@ -21,7 +21,6 @@
#include <time.h>
#include <sys/time.h>
#include <stdlib.h>
-#include "options.h"
#include "miscemu.h"
#include "wine/debug.h"
diff --git a/msdos/int21.c b/msdos/int21.c
index 3623207..09e3b6a 100644
--- a/msdos/int21.c
+++ b/msdos/int21.c
@@ -49,7 +49,6 @@
#include "file.h"
#include "callback.h"
#include "msdos.h"
-#include "options.h"
#include "miscemu.h"
#include "task.h"
#include "wine/debug.h"
diff --git a/msdos/ioports.c b/msdos/ioports.c
index 2cae99e..46e52cb 100644
--- a/msdos/ioports.c
+++ b/msdos/ioports.c
@@ -35,7 +35,7 @@
#include <unistd.h>
#include "windef.h"
#include "callback.h"
-#include "options.h"
+#include "file.h"
#include "miscemu.h"
#include "wine/debug.h"
diff --git a/objects/font.c b/objects/font.c
index f778f59..e250bc4 100644
--- a/objects/font.c
+++ b/objects/font.c
@@ -26,7 +26,6 @@
#include "winnls.h"
#include "wine/unicode.h"
#include "font.h"
-#include "options.h"
#include "wine/debug.h"
#include "gdi.h"
diff --git a/ole/ole2nls.c b/ole/ole2nls.c
index a3320d7..c1d0cb3 100644
--- a/ole/ole2nls.c
+++ b/ole/ole2nls.c
@@ -34,7 +34,6 @@
#include "wingdi.h"
#include "winuser.h"
#include "wine/unicode.h"
-#include "options.h"
#include "winver.h"
#include "winnls.h"
#include "winreg.h"
diff --git a/programs/progman/string.c b/programs/progman/string.c
index 46dca24..e359810 100644
--- a/programs/progman/string.c
+++ b/programs/progman/string.c
@@ -19,9 +19,6 @@
*/
#include "windows.h"
-#ifdef WINELIB
-#include "options.h"
-#endif
#include "progman.h"
/* Class names */
diff --git a/scheduler/process.c b/scheduler/process.c
index b6e885c..e611b55 100644
--- a/scheduler/process.c
+++ b/scheduler/process.c
@@ -115,7 +115,7 @@
static HANDLE main_exe_file;
static int main_create_flags;
-unsigned int server_startticks;
+static unsigned int server_startticks;
/* memory/environ.c */
extern struct _ENVDB *ENV_InitStartupInfo( handle_t info_handle, size_t info_size,
@@ -1784,6 +1784,23 @@
}
+/***********************************************************************
+ * GetTickCount (USER.13)
+ * GetCurrentTime (USER.15)
+ * GetTickCount (KERNEL32.@)
+ * GetSystemMSecCount (SYSTEM.6)
+ *
+ * Returns the number of milliseconds, modulo 2^32, since the start
+ * of the wineserver.
+ */
+DWORD WINAPI GetTickCount(void)
+{
+ struct timeval t;
+ gettimeofday( &t, NULL );
+ return ((t.tv_sec * 1000) + (t.tv_usec / 1000)) - server_startticks;
+}
+
+
/**********************************************************************
* TlsAlloc [KERNEL32.@] Allocates a TLS index.
*
diff --git a/win32/console.c b/win32/console.c
index 3b31bf7..a0bb0fa 100644
--- a/win32/console.c
+++ b/win32/console.c
@@ -43,7 +43,6 @@
#include "wine/server.h"
#include "wine/exception.h"
#include "wine/debug.h"
-#include "options.h"
#include "msvcrt/excpt.h"
WINE_DEFAULT_DEBUG_CHANNEL(console);
