Luis Sahagun : winevdm: Tell dosbox to read the current user's config.

[Alexandre Julliard]

Module: wine
Branch: stable
Commit: a7704487daf1d70bf3a0a19ef45c4ac50f558f9c
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=a7704487daf1d70bf3a0a19ef4...

Author: Luis Sahagun <shankao(a)gmail.com>
Date:   Thu Jun  2 17:48:38 2016 +0800

winevdm: Tell dosbox to read the current user's config.

Signed-off-by: Luis Sahagun <shankao(a)gmail.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
(cherry picked from commit 6a05abed484cdfbb75956508a5837dbf58424f88)
Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org>

---

 programs/winevdm/winevdm.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/programs/winevdm/winevdm.c b/programs/winevdm/winevdm.c
index 290ad25..08bfcfe 100644
--- a/programs/winevdm/winevdm.c
+++ b/programs/winevdm/winevdm.c
@@ -192,12 +192,13 @@ static void start_dosbox( const char *appname, const char *args )
     p += sprintf( p, "exit\n" );
     if (WriteFile( file, buffer, strlen(buffer), &written, NULL ) && written == strlen(buffer))
     {
-        const char *args[4];
+        const char *args[5];
         char *config_file = wine_get_unix_file_name( config );
         args[0] = dosbox;
-        args[1] = "-conf";
-        args[2] = config_file;
-        args[3] = NULL;
+        args[1] = "-userconf";
+        args[2] = "-conf";
+        args[3] = config_file;
+        args[4] = NULL;
         ret = _spawnvp( _P_WAIT, args[0], args );
     }
     CloseHandle( file );