From e298b95f54fed3f2cb01fc551925e3330b222c95 Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Sat, 4 Apr 2015 22:45:27 +0200 Subject: [PATCH] Added patch with stub for setupapi.SetupDiSelectBestCompatDrv. --- README.md | 3 +- debian/changelog | 1 + patches/patchinstall.sh | 19 ++++++++ ...-stub-for-SetupDiSelectBestCompatDrv.patch | 47 +++++++++++++++++++ .../definition | 1 + 5 files changed, 70 insertions(+), 1 deletion(-) create mode 100644 patches/setupapi-SetupDiSelectBestCompatDrv/0001-setupapi-Add-stub-for-SetupDiSelectBestCompatDrv.patch create mode 100644 patches/setupapi-SetupDiSelectBestCompatDrv/definition diff --git a/README.md b/README.md index 3f6c52e9..dffbcaa3 100644 --- a/README.md +++ b/README.md @@ -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 diff --git a/debian/changelog b/debian/changelog index 439059d1..ac59aa1f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -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). diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index 3a7ea68a..6216b8c6 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -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: diff --git a/patches/setupapi-SetupDiSelectBestCompatDrv/0001-setupapi-Add-stub-for-SetupDiSelectBestCompatDrv.patch b/patches/setupapi-SetupDiSelectBestCompatDrv/0001-setupapi-Add-stub-for-SetupDiSelectBestCompatDrv.patch new file mode 100644 index 00000000..85835387 --- /dev/null +++ b/patches/setupapi-SetupDiSelectBestCompatDrv/0001-setupapi-Add-stub-for-SetupDiSelectBestCompatDrv.patch @@ -0,0 +1,47 @@ +From 0c804c1f6c491384e6b48d2569d130468c6fe28d Mon Sep 17 00:00:00 2001 +From: Austin English +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 + diff --git a/patches/setupapi-SetupDiSelectBestCompatDrv/definition b/patches/setupapi-SetupDiSelectBestCompatDrv/definition new file mode 100644 index 00000000..c8ad9812 --- /dev/null +++ b/patches/setupapi-SetupDiSelectBestCompatDrv/definition @@ -0,0 +1 @@ +Fixes: [32088] Add stub for setupapi.SetupDiSelectBestCompatDrv