[PATCH] winetest: Run winetest on win9x again
Detlef Riekenberg
wine.dev at web.de
Wed Jul 16 11:33:12 CDT 2008
---
programs/winetest/main.c | 16 ++++++++++++++++
programs/winetest/send.c | 8 ++++++++
2 files changed, 24 insertions(+), 0 deletions(-)
diff --git a/programs/winetest/main.c b/programs/winetest/main.c
index 9d04e90..04eaae4 100644
--- a/programs/winetest/main.c
+++ b/programs/winetest/main.c
@@ -346,6 +346,14 @@ get_subtests (const char *tempdir, struct wine_test *test, LPTSTR res_name)
subfile = CreateFileA( subname, GENERIC_READ|GENERIC_WRITE,
FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE,
&sa, CREATE_ALWAYS, 0, NULL );
+
+ if ((subfile == INVALID_HANDLE_VALUE) &&
+ (GetLastError() == ERROR_INVALID_PARAMETER)) {
+ /* FILE_SHARE_DELETE not supported on win9x */
+ subfile = CreateFileA( subname, GENERIC_READ|GENERIC_WRITE,
+ FILE_SHARE_READ | FILE_SHARE_WRITE,
+ &sa, CREATE_ALWAYS, 0, NULL );
+ }
if (subfile == INVALID_HANDLE_VALUE) {
report (R_ERROR, "Can't open subtests output of %s: %u",
test->name, GetLastError());
@@ -474,6 +482,14 @@ run_tests (char *logname)
logfile = CreateFileA( logname, GENERIC_READ|GENERIC_WRITE,
FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE,
&sa, CREATE_ALWAYS, 0, NULL );
+
+ if ((logfile == INVALID_HANDLE_VALUE) &&
+ (GetLastError() == ERROR_INVALID_PARAMETER)) {
+ /* FILE_SHARE_DELETE not supported on win9x */
+ logfile = CreateFileA( logname, GENERIC_READ|GENERIC_WRITE,
+ FILE_SHARE_READ | FILE_SHARE_WRITE,
+ &sa, CREATE_ALWAYS, 0, NULL );
+ }
if (logfile == INVALID_HANDLE_VALUE)
report (R_FATAL, "Could not open logfile: %u", GetLastError());
diff --git a/programs/winetest/send.c b/programs/winetest/send.c
index dc25bd2..c8372f3 100644
--- a/programs/winetest/send.c
+++ b/programs/winetest/send.c
@@ -134,6 +134,14 @@ send_file (const char *name)
file = CreateFileA( name, GENERIC_READ,
FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE,
NULL, OPEN_EXISTING, 0, NULL );
+
+ if ((file == INVALID_HANDLE_VALUE) &&
+ (GetLastError() == ERROR_INVALID_PARAMETER)) {
+ /* FILE_SHARE_DELETE not supported on win9x */
+ file = CreateFileA( name, GENERIC_READ,
+ FILE_SHARE_READ | FILE_SHARE_WRITE,
+ NULL, OPEN_EXISTING, 0, NULL );
+ }
if (file == INVALID_HANDLE_VALUE)
{
report (R_WARNING, "Can't open file '%s': %u", name, GetLastError());
--
1.5.4.3
--=-F1cO3TlUnqBRvV6nZj7T--
More information about the wine-patches
mailing list