Added patch to return CR_NO_SUCH_DEVNODE from CM_Get_Parent stub.

This commit is contained in:
Sebastian Lackner 2017-10-04 03:28:28 +02:00
parent 2d16aafa9a
commit 5672a07b8d
3 changed files with 47 additions and 0 deletions

View File

@ -357,6 +357,7 @@ patch_enable_all ()
enable_server_open_mapping_file="$1"
enable_server_send_hardware_message="$1"
enable_server_shared_mapping="$1"
enable_setupapi_CM_Get_Parent="$1"
enable_setupapi_DiskSpaceList="$1"
enable_setupapi_Display_Device="$1"
enable_setupapi_HSPFILEQ_Check_Type="$1"
@ -1357,6 +1358,9 @@ patch_enable ()
server-shared_mapping)
enable_server_shared_mapping="$2"
;;
setupapi-CM_Get_Parent)
enable_setupapi_CM_Get_Parent="$2"
;;
setupapi-DiskSpaceList)
enable_setupapi_DiskSpaceList="$2"
;;
@ -8058,6 +8062,21 @@ if test "$enable_server_shared_mapping" -eq 1; then
) >> "$patchlist"
fi
# Patchset setupapi-CM_Get_Parent
# |
# | This patchset fixes the following Wine bugs:
# | * [#43831] Return CR_NO_SUCH_DEVNODE from CM_Get_Parent stub
# |
# | Modified files:
# | * dlls/setupapi/stubs.c
# |
if test "$enable_setupapi_CM_Get_Parent" -eq 1; then
patch_apply setupapi-CM_Get_Parent/0001-setupapi-Return-CR_NO_SUCH_DEVNODE-from-CM_Get_Paren.patch
(
printf '%s\n' '+ { "Tim Wanders", "setupapi: Return CR_NO_SUCH_DEVNODE from CM_Get_Parent stub.", 1 },';
) >> "$patchlist"
fi
# Patchset setupapi-DiskSpaceList
# |
# | Modified files:

View File

@ -0,0 +1,27 @@
From 2ea8a6a3b8e6d3ee42a6887587d49045b45677ca Mon Sep 17 00:00:00 2001
From: Tim Wanders <timwanders241@gmail.com>
Date: Wed, 4 Oct 2017 03:25:48 +0200
Subject: setupapi: Return CR_NO_SUCH_DEVNODE from CM_Get_Parent stub.
---
dlls/setupapi/stubs.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/dlls/setupapi/stubs.c b/dlls/setupapi/stubs.c
index 54958434fb9..aafa0c131cf 100644
--- a/dlls/setupapi/stubs.c
+++ b/dlls/setupapi/stubs.c
@@ -180,8 +180,8 @@ CONFIGRET WINAPI CM_Get_Device_ID_List_SizeW( PULONG pulLen, PCWSTR pszFilter,
DWORD WINAPI CM_Get_Parent(PDEVINST pdnDevInst, DEVINST dnDevInst, ULONG ulFlags)
{
FIXME("%p 0x%08x 0x%08x stub\n", pdnDevInst, dnDevInst, ulFlags);
- *pdnDevInst = dnDevInst;
- return CR_SUCCESS;
+ *pdnDevInst = 0;
+ return CR_NO_SUCH_DEVNODE;
}
/***********************************************************************
--
2.14.1

View File

@ -0,0 +1 @@
Fixes: [43831] Return CR_NO_SUCH_DEVNODE from CM_Get_Parent stub