Added patch with stub for setupapi.SetupDiSelectBestCompatDrv.

This commit is contained in:
Sebastian Lackner 2015-04-04 22:45:27 +02:00
parent 4ad22c8418
commit e298b95f54
5 changed files with 70 additions and 1 deletions

View File

@ -39,10 +39,11 @@ Wine. All those differences are also documented on the
Included bug fixes and improvements
-----------------------------------
**Bug fixes and features included in the next upcoming release [21]:**
**Bug fixes and features included in the next upcoming release [22]:**
* Add stub fltmgr.sys (filter manager driver) ([Wine Bug #23583](https://bugs.winehq.org/show_bug.cgi?id=23583))
* Add stub for ntoskrnl.PsRemoveLoadImageNotifyRoutine
* Add stub for setupapi.SetupDiSelectBestCompatDrv ([Wine Bug #32088](https://bugs.winehq.org/show_bug.cgi?id=32088))
* Add stubs for Power[Set|Clear]Request
* Allow NULL pointer as keystate argument in ToUnicodeEx ([Wine Bug #38353](https://bugs.winehq.org/show_bug.cgi?id=38353))
* Allow to open files/directories without any access rights in order to query attributes

1
debian/changelog vendored
View File

@ -23,6 +23,7 @@ wine-staging (1.7.40) UNRELEASED; urgency=low
* Added patch to implement DDENUMSURFACES_CANBECREATED in IDirectDraw7::EnumSurfaces and fix some bugs.
* Added patch to ignore unsupported job object restrictions.
* Added patch to allow NULL pointer as keystate argument in ToUnicodeEx.
* Added patch with stub for setupapi.SetupDiSelectBestCompatDrv.
* Removed patch to fix regression causing black screen on startup (accepted upstream).
* Removed patch to fix edge cases in TOOLTIPS_GetTipText (fixed upstream).
* Removed patch for IConnectionPoint/INetworkListManagerEvents stub interface (accepted upstream).

View File

@ -190,6 +190,7 @@ patch_enable_all ()
enable_server_Shared_Memory="$1"
enable_server_Stored_ACLs="$1"
enable_server_Unexpected_Wakeup="$1"
enable_setupapi_SetupDiSelectBestCompatDrv="$1"
enable_setupapi_SetupPromptForDisk="$1"
enable_shdocvw_ParseURLFromOutsideSource_Tests="$1"
enable_shell32_Default_Folder_ACLs="$1"
@ -640,6 +641,9 @@ patch_enable ()
server-Unexpected_Wakeup)
enable_server_Unexpected_Wakeup="$2"
;;
setupapi-SetupDiSelectBestCompatDrv)
enable_setupapi_SetupDiSelectBestCompatDrv="$2"
;;
setupapi-SetupPromptForDisk)
enable_setupapi_SetupPromptForDisk="$2"
;;
@ -4081,6 +4085,21 @@ if test "$enable_server_Unexpected_Wakeup" -eq 1; then
) >> "$patchlist"
fi
# Patchset setupapi-SetupDiSelectBestCompatDrv
# |
# | This patchset fixes the following Wine bugs:
# | * [#32088] Add stub for setupapi.SetupDiSelectBestCompatDrv
# |
# | Modified files:
# | * dlls/setupapi/setupapi.spec, dlls/setupapi/stubs.c
# |
if test "$enable_setupapi_SetupDiSelectBestCompatDrv" -eq 1; then
patch_apply setupapi-SetupDiSelectBestCompatDrv/0001-setupapi-Add-stub-for-SetupDiSelectBestCompatDrv.patch
(
echo '+ { "Austin English", "setupapi: Add stub for SetupDiSelectBestCompatDrv.", 1 },';
) >> "$patchlist"
fi
# Patchset setupapi-SetupPromptForDisk
# |
# | This patchset fixes the following Wine bugs:

View File

@ -0,0 +1,47 @@
From 0c804c1f6c491384e6b48d2569d130468c6fe28d Mon Sep 17 00:00:00 2001
From: Austin English <austinenglish@gmail.com>
Date: Sat, 4 Apr 2015 22:43:43 +0200
Subject: setupapi: Add stub for SetupDiSelectBestCompatDrv.
---
dlls/setupapi/setupapi.spec | 1 +
dlls/setupapi/stubs.c | 11 +++++++++++
2 files changed, 12 insertions(+)
diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec
index c1dbed5..4486994 100644
--- a/dlls/setupapi/setupapi.spec
+++ b/dlls/setupapi/setupapi.spec
@@ -381,6 +381,7 @@
@ stdcall SetupDiRegisterDeviceInfo(ptr ptr long ptr ptr ptr)
@ stdcall SetupDiRemoveDevice(ptr ptr)
@ stub SetupDiRemoveDeviceInterface
+@ stdcall SetupDiSelectBestCompatDrv(ptr ptr)
@ stub SetupDiSelectDevice
@ stub SetupDiSelectOEMDrv
@ stdcall SetupDiSetClassInstallParamsA(ptr ptr ptr long)
diff --git a/dlls/setupapi/stubs.c b/dlls/setupapi/stubs.c
index a57f5fe..ffc766b 100644
--- a/dlls/setupapi/stubs.c
+++ b/dlls/setupapi/stubs.c
@@ -594,6 +594,17 @@ BOOL WINAPI SetupDiLoadClassIcon(const GUID *ClassGuid, HICON *LargeIcon, PINT M
}
/***********************************************************************
+ * SetupDiSelectBestCompatDrv (SETUPAPI.@)
+ */
+BOOL WINAPI SetupDiSelectBestCompatDrv(HDEVINFO DeviceInfoSet, PSP_DEVINFO_DATA DeviceInfoData)
+{
+ FIXME(": stub %p, %p\n", DeviceInfoSet, DeviceInfoData);
+
+ SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
+ return FALSE;
+}
+
+/***********************************************************************
* SetupDiSetSelectedDevice (SETUPAPI.@)
*/
BOOL WINAPI SetupDiSetSelectedDevice(HDEVINFO SetupDiSetSelectedDevice, PSP_DEVINFO_DATA DeviceInfoData)
--
2.3.3

View File

@ -0,0 +1 @@
Fixes: [32088] Add stub for setupapi.SetupDiSelectBestCompatDrv