Added patch to recognize localhost as local machine in wbemprox.

This commit is contained in:
Sebastian Lackner
2015-04-17 06:29:29 +02:00
parent d8cb439f29
commit 04afcf114c
5 changed files with 49 additions and 1 deletions

View File

@@ -213,6 +213,7 @@ patch_enable_all ()
enable_vcomp_Stub_Functions="$1"
enable_version_VerQueryValue="$1"
enable_version_VersionInfoEx="$1"
enable_wbemprox_Localhost="$1"
enable_wiaservc_IEnumWIA_DEV_INFO="$1"
enable_windowscodecs_TIFF_Decoder="$1"
enable_wine_inf_Performance="$1"
@@ -708,6 +709,9 @@ patch_enable ()
version-VersionInfoEx)
enable_version_VersionInfoEx="$2"
;;
wbemprox-Localhost)
enable_wbemprox_Localhost="$2"
;;
wiaservc-IEnumWIA_DEV_INFO)
enable_wiaservc_IEnumWIA_DEV_INFO="$2"
;;
@@ -4416,6 +4420,18 @@ if test "$enable_version_VersionInfoEx" -eq 1; then
) >> "$patchlist"
fi
# Patchset wbemprox-Localhost
# |
# | Modified files:
# | * dlls/wbemprox/wbemlocator.c
# |
if test "$enable_wbemprox_Localhost" -eq 1; then
patch_apply wbemprox-Localhost/0001-wbemprox-Allow-connecting-to-localhost.patch
(
echo '+ { "Michael Müller", "wbemprox: Allow connecting to localhost.", 1 },';
) >> "$patchlist"
fi
# Patchset wiaservc-IEnumWIA_DEV_INFO
# |
# | This patchset fixes the following Wine bugs:

View File

@@ -0,0 +1,29 @@
From 87053e0d99e5e8691b571729e66f9c3ff8272569 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Thu, 16 Apr 2015 21:27:22 +0200
Subject: wbemprox: Allow connecting to localhost.
---
dlls/wbemprox/wbemlocator.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/dlls/wbemprox/wbemlocator.c b/dlls/wbemprox/wbemlocator.c
index 463e6d4..b50d7cb 100644
--- a/dlls/wbemprox/wbemlocator.c
+++ b/dlls/wbemprox/wbemlocator.c
@@ -89,10 +89,11 @@ static HRESULT WINAPI wbem_locator_QueryInterface(
static BOOL is_local_machine( const WCHAR *server )
{
static const WCHAR dotW[] = {'.',0};
+ static const WCHAR localhostW[] = {'l','o','c','a','l','h','o','s','t',0};
WCHAR buffer[MAX_COMPUTERNAME_LENGTH + 1];
DWORD len = sizeof(buffer) / sizeof(buffer[0]);
- if (!server || !strcmpW( server, dotW )) return TRUE;
+ if (!server || !strcmpW( server, dotW ) || !strcmpW( server, localhostW )) return TRUE;
if (GetComputerNameW( buffer, &len ) && !strcmpiW( server, buffer )) return TRUE;
return FALSE;
}
--
2.3.5

View File

@@ -0,0 +1 @@
Fixes: Recognize localhost as local machine in wbemprox