[Wine-patches] [eterwine 1/2] Do not convert path a second time (eterbug #6748).

[Alexander Morozov]

----------- следующая часть -----------
From 0a6e46218fa2c34bd6bc1a7d85fa395bb9d21f16 Mon Sep 17 00:00:00 2001
From: Alexander Morozov <amorozov на etersoft.ru>
Date: Tue, 11 Jan 2011 16:48:32 +0300
Subject: [eterwine 1/2] Do not convert path a second time (eterbug #6748).

---
 programs/start/start.c |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/programs/start/start.c b/programs/start/start.c
index 81c1d27..6c5df38 100644
--- a/programs/start/start.c
+++ b/programs/start/start.c
@@ -154,6 +154,7 @@ static WCHAR *build_args( int argc, WCHAR **argvW )
 	return ret;
 }
 
+#if 0
 static WCHAR *get_parent_dir(WCHAR* path)
 {
 	WCHAR *last_slash;
@@ -172,6 +173,7 @@ static WCHAR *get_parent_dir(WCHAR* path)
 
 	return result;
 }
+#endif
 
 int wmain (int argc, WCHAR *argv[])
 {
@@ -182,7 +184,9 @@ int wmain (int argc, WCHAR *argv[])
 	int progid_open = 0;
 	WCHAR *dos_filename = NULL;
 	WCHAR *parent_directory = NULL;
+#if 0
 	DWORD binary_type;
+#endif
 
 	static const WCHAR openW[] = { 'o', 'p', 'e', 'n', 0 };
 	static const WCHAR unixW[] = { 'u', 'n', 'i', 'x', 0 };
@@ -283,6 +287,7 @@ int wmain (int argc, WCHAR *argv[])
 	args = build_args( argc - i, &argv[i] );
 	sei.lpParameters = args;
 
+#if 0  /* In WINE на Etersoft path is already converted to Windows path (eterbug #6748) */
 	if (unix_mode || progid_open) {
 		LPWSTR (*CDECL wine_get_dos_file_name_ptr)(LPCSTR);
 		char* multibyte_unixpath;
@@ -341,11 +346,14 @@ int wmain (int argc, WCHAR *argv[])
                     goto done;
                 }
 	}
+#endif
 
         if (!ShellExecuteExW(&sei))
             fatal_string_error(STRING_EXECFAIL, GetLastError(), sei.lpFile);
 
+#if 0
 done:
+#endif
 	HeapFree( GetProcessHeap(), 0, args );
 	HeapFree( GetProcessHeap(), 0, dos_filename );
 	HeapFree( GetProcessHeap(), 0, parent_directory );
-- 
1.7.3.4