mirror of
https://gitlab.winehq.org/wine/wine-staging.git
synced 2024-09-13 09:17:20 -07:00
Added patch to return WN_NOT_CONNECTED from WNetGetUniversalName REMOTE_NAME_INFO_LEVEL stub.
This commit is contained in:
Sebastian Lackner
parent
3f46a6acb7
commit
b8c9f3454e
@ -34,12 +34,13 @@ Wine. All those differences are also documented on the
|
||||
Included bug fixes and improvements
|
||||
-----------------------------------
|
||||
|
||||
**Bug fixes and features included in the next upcoming release [6]:**
|
||||
**Bug fixes and features included in the next upcoming release [7]:**
|
||||
|
||||
* Add implementation for IDXGIOutput::GetDesc ([Wine Bug #32006](https://bugs.winehq.org/show_bug.cgi?id=32006))
|
||||
* Add implementation for comctl32.PROPSHEET_InsertPage. ([Wine Bug #25625](https://bugs.winehq.org/show_bug.cgi?id=25625))
|
||||
* Do not check if object was signaled after user APC in server_select
|
||||
* Fix the initialization of combined DACLs when the new DACL is empty ([Wine Bug #38423](https://bugs.winehq.org/show_bug.cgi?id=38423))
|
||||
* Return WN_NOT_CONNECTED from WNetGetUniversalName REMOTE_NAME_INFO_LEVEL stub ([Wine Bug #39452](https://bugs.winehq.org/show_bug.cgi?id=39452))
|
||||
* Show windows version when collecting system info in winedbg
|
||||
* Use wrapper functions for syscalls to appease Chromium sandbox (32-bit) ([Wine Bug #39403](https://bugs.winehq.org/show_bug.cgi?id=39403))
|
||||
|
||||
|
||||
2
debian/changelog
vendored
2
debian/changelog
vendored
@ -10,6 +10,8 @@ wine-staging (1.7.53) UNRELEASED; urgency=low
|
||||
* Added patch to fix the initialization of combined DACLs when the new DACL is
|
||||
empty.
|
||||
* Added patch to implement comctl32.PROPSHEET_InsertPage.
|
||||
* Added patch to return WN_NOT_CONNECTED from WNetGetUniversalName
|
||||
REMOTE_NAME_INFO_LEVEL stub.
|
||||
* Removed patch to mark RegOpenKeyExA, RegCloseKey and RegQueryValueExA as
|
||||
hotpatchable (accepted upstream).
|
||||
* Removed patch to mark BitBlt and StretchDIBits as hotpatchable (accepted
|
||||
|
||||
@ -0,0 +1,52 @@
|
||||
From 46832825a6821d5c2af8eb0ae66581e94972231b 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
|
||||
REMOTE_NAME_INFO_LEVEL in WNetGetUniversalName.
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Signed-off-by: Michael Müller <michael@fds-team.de>
|
||||
---
|
||||
dlls/mpr/tests/mpr.c | 6 +++---
|
||||
dlls/mpr/wnet.c | 2 +-
|
||||
2 files changed, 4 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/dlls/mpr/tests/mpr.c b/dlls/mpr/tests/mpr.c
|
||||
index 99b05f6..bf3d2cc 100644
|
||||
--- a/dlls/mpr/tests/mpr.c
|
||||
+++ b/dlls/mpr/tests/mpr.c
|
||||
@@ -149,13 +149,13 @@ static void test_WNetGetRemoteName(void)
|
||||
info_size = sizeof(buffer);
|
||||
ret = WNetGetUniversalNameW(driveW, REMOTE_NAME_INFO_LEVEL,
|
||||
buffer, &info_size);
|
||||
- todo_wine{
|
||||
+
|
||||
if(drive_type == DRIVE_REMOTE)
|
||||
- ok(ret == WN_NO_ERROR, "WNetGetUniversalNameW failed: %08x\n", ret);
|
||||
+ todo_wine ok(ret == WN_NO_ERROR, "WNetGetUniversalNameW failed: %08x\n", ret);
|
||||
else
|
||||
ok(ret == WN_NOT_CONNECTED || ret == WN_NO_NET_OR_BAD_PATH,
|
||||
"(%s) WNetGetUniversalNameW gave wrong error: %u\n", driveA, ret);
|
||||
- }
|
||||
+
|
||||
ok(info_size == sizeof(buffer), "Got wrong size: %u\n", info_size);
|
||||
}
|
||||
}
|
||||
diff --git a/dlls/mpr/wnet.c b/dlls/mpr/wnet.c
|
||||
index dd34969..4c1d221 100644
|
||||
--- a/dlls/mpr/wnet.c
|
||||
+++ b/dlls/mpr/wnet.c
|
||||
@@ -1958,7 +1958,7 @@ DWORD WINAPI WNetGetUniversalNameW ( LPCWSTR lpLocalPath, DWORD dwInfoLevel,
|
||||
break;
|
||||
}
|
||||
case REMOTE_NAME_INFO_LEVEL:
|
||||
- err = WN_NO_NETWORK;
|
||||
+ err = WN_NOT_CONNECTED;
|
||||
break;
|
||||
|
||||
default:
|
||||
--
|
||||
2.6.1
|
||||
|
||||
1
patches/mpr-WNetGetUniversalNameW/definition
Normal file
1
patches/mpr-WNetGetUniversalNameW/definition
Normal file
@ -0,0 +1 @@
|
||||
Fixes: [39452] Return WN_NOT_CONNECTED from WNetGetUniversalName REMOTE_NAME_INFO_LEVEL stub
|
||||
@ -169,6 +169,7 @@ patch_enable_all ()
|
||||
enable_mfplat_MFTRegister="$1"
|
||||
enable_mmdevapi_AEV_Stubs="$1"
|
||||
enable_mountmgr_DosDevices="$1"
|
||||
enable_mpr_WNetGetUniversalNameW="$1"
|
||||
enable_mscoree_CorValidateImage="$1"
|
||||
enable_mshtml_HTMLLocation_put_hash="$1"
|
||||
enable_msidb_Implementation="$1"
|
||||
@ -600,6 +601,9 @@ patch_enable ()
|
||||
mountmgr-DosDevices)
|
||||
enable_mountmgr_DosDevices="$2"
|
||||
;;
|
||||
mpr-WNetGetUniversalNameW)
|
||||
enable_mpr_WNetGetUniversalNameW="$2"
|
||||
;;
|
||||
mscoree-CorValidateImage)
|
||||
enable_mscoree_CorValidateImage="$2"
|
||||
;;
|
||||
@ -3705,6 +3709,21 @@ if test "$enable_mountmgr_DosDevices" -eq 1; then
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset mpr-WNetGetUniversalNameW
|
||||
# |
|
||||
# | This patchset fixes the following Wine bugs:
|
||||
# | * [#39452] Return WN_NOT_CONNECTED from WNetGetUniversalName REMOTE_NAME_INFO_LEVEL stub
|
||||
# |
|
||||
# | Modified files:
|
||||
# | * dlls/mpr/tests/mpr.c, dlls/mpr/wnet.c
|
||||
# |
|
||||
if test "$enable_mpr_WNetGetUniversalNameW" -eq 1; then
|
||||
patch_apply mpr-WNetGetUniversalNameW/0001-mpr-Return-correct-error-code-for-non-network-paths-.patch
|
||||
(
|
||||
echo '+ { "Michael Müller", "mpr: Return correct error code for non network paths and REMOTE_NAME_INFO_LEVEL in WNetGetUniversalName.", 1 },';
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset mscoree-CorValidateImage
|
||||
# |
|
||||
# | This patchset fixes the following Wine bugs:
|
||||
|
||||
Loading…
Reference in New Issue
Block a user