wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-04-13 14:42:51 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against e0e4f9bbcda1243b9317dbfbeeff84a18b4e855c.

Browse Source
This commit is contained in:
Sebastian Lackner
2017-06-10 00:47:39 +02:00
parent 38cdf5d3f4
commit 25e345194d
7 changed files with 63 additions and 168 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
patches/mpr-WNetGetUniversalNameW/0001-mpr-Return-correct-error-code-for-non-network-paths-.patch
View File

@@ -1,4 +1,4 @@
From 98a994918027aac485362b84a843096e0f5c3284 Mon Sep 17 00:00:00 2001
From 09b4c584ce6017ae0887edf18d989807c40bec4e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Sun, 18 Oct 2015 03:27:41 +0200
Subject: mpr: Return correct error code for non network paths and
@@ -9,12 +9,12 @@ Content-Transfer-Encoding: 8bit
Signed-off-by: Michael Müller <michael@fds-team.de>
---
dlls/mpr/tests/mpr.c | 10 ++++------
dlls/mpr/wnet.c | 2 +-
2 files changed, 5 insertions(+), 7 deletions(-)
dlls/mpr/tests/mpr.c | 9 +++------
dlls/mpr/wnet.c | 2 +-
2 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/dlls/mpr/tests/mpr.c b/dlls/mpr/tests/mpr.c
index ee1ff3a..ee9e220 100644
index 364ac2cc601..19097b8a286 100644
--- a/dlls/mpr/tests/mpr.c
+++ b/dlls/mpr/tests/mpr.c
@@ -101,25 +101,23 @@ static void test_WNetGetRemoteName(void)
@@ -45,27 +45,26 @@ index ee1ff3a..ee9e220 100644
ret = WNetGetUniversalNameA(driveA, REMOTE_NAME_INFO_LEVEL,
buffer, NULL);
todo_wine ok(ret == WN_BAD_POINTER, "WNetGetUniversalNameA failed: %08x\n", ret);
@@ -127,13 +125,13 @@ static void test_WNetGetRemoteName(void)
@@ -127,13 +125,12 @@ static void test_WNetGetRemoteName(void)
ret = WNetGetUniversalNameA(driveA, REMOTE_NAME_INFO_LEVEL,
NULL, &info_size);
- todo_wine{
if(((GetVersion() & 0x8000ffff) == 0x00000004) || /* NT40 */
(drive_type == DRIVE_REMOTE))
- todo_wine {
if(drive_type == DRIVE_REMOTE)
+ todo_wine
ok(ret == WN_BAD_POINTER, "WNetGetUniversalNameA failed: %08x\n", ret);
else
ok(ret == WN_NOT_CONNECTED || ret == WN_BAD_VALUE,
- "(%s) WNetGetUniversalNameA gave wrong error: %u\n", driveA, ret); }
+ "(%s) WNetGetUniversalNameA gave wrong error: %u\n", driveA, ret);
"(%s) WNetGetUniversalNameA gave wrong error: %u\n", driveA, ret);
- }
fail_size = sizeof(driveA) / sizeof(char) - 1;
ret = WNetGetUniversalNameA(driveA, REMOTE_NAME_INFO_LEVEL,
diff --git a/dlls/mpr/wnet.c b/dlls/mpr/wnet.c
index 0d4209c..5973089 100644
index cbbc1bdfb04..1514d014e8b 100644
--- a/dlls/mpr/wnet.c
+++ b/dlls/mpr/wnet.c
@@ -2111,7 +2111,7 @@ DWORD WINAPI WNetGetUniversalNameA ( LPCSTR lpLocalPath, DWORD dwInfoLevel,
@@ -2345,7 +2345,7 @@ DWORD WINAPI WNetGetUniversalNameA ( LPCSTR lpLocalPath, DWORD dwInfoLevel,
break;
}
case REMOTE_NAME_INFO_LEVEL:
@@ -75,5 +74,5 @@ index 0d4209c..5973089 100644
default:
--
2.8.0
2.13.1