mirror of
https://gitlab.winehq.org/wine/wine-staging.git
synced 2024-09-13 09:17:20 -07:00
Added patch with stub for setupapi.SetupDiSetDeviceInstallParamsW.
This commit is contained in:
Sebastian Lackner
parent
f1b780f2e7
commit
3f56243b9b
1
debian/changelog
vendored
1
debian/changelog
vendored
@ -1,6 +1,7 @@
|
||||
wine-staging (1.7.41) UNRELEASED; urgency=low
|
||||
* Disable DXVA2 controls in winecfg when support is not compiled in.
|
||||
* Added patch to enable/disable EAX support via winecfg.
|
||||
* Added patch with stub for setupapi.SetupDiSetDeviceInstallParamsW.
|
||||
* Added tests for RtlIpv6AddressToString and RtlIpv6AddressToStringEx.
|
||||
* Removed patches to fix invalid memory access in get_registry_locale_info (accepted upstream).
|
||||
* Removed patches to avoid repeated FIXMEs in PsLookupProcessByProcessId stub (accepted upstream).
|
||||
|
||||
@ -185,6 +185,7 @@ patch_enable_all ()
|
||||
enable_server_Stored_ACLs="$1"
|
||||
enable_server_Unexpected_Wakeup="$1"
|
||||
enable_setupapi_SetupDiSelectBestCompatDrv="$1"
|
||||
enable_setupapi_SetupDiSetDeviceInstallParamsW="$1"
|
||||
enable_setupapi_SetupPromptForDisk="$1"
|
||||
enable_shdocvw_ParseURLFromOutsideSource_Tests="$1"
|
||||
enable_shell32_Default_Folder_ACLs="$1"
|
||||
@ -619,6 +620,9 @@ patch_enable ()
|
||||
setupapi-SetupDiSelectBestCompatDrv)
|
||||
enable_setupapi_SetupDiSelectBestCompatDrv="$2"
|
||||
;;
|
||||
setupapi-SetupDiSetDeviceInstallParamsW)
|
||||
enable_setupapi_SetupDiSetDeviceInstallParamsW="$2"
|
||||
;;
|
||||
setupapi-SetupPromptForDisk)
|
||||
enable_setupapi_SetupPromptForDisk="$2"
|
||||
;;
|
||||
@ -1961,18 +1965,15 @@ if test "$enable_wined3d_CSMT_Helper" -eq 1; then
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset wined3d-Multisampling
|
||||
# |
|
||||
# | This patchset fixes the following Wine bugs:
|
||||
# | * [#12652] Allow to override number of quality levels for D3DMULTISAMPLE_NONMASKABLE.
|
||||
# Patchset wined3d-UnhandledBlendFactor
|
||||
# |
|
||||
# | Modified files:
|
||||
# | * dlls/wined3d/directx.c, dlls/wined3d/wined3d_main.c, dlls/wined3d/wined3d_private.h
|
||||
# | * dlls/wined3d/state.c
|
||||
# |
|
||||
if test "$enable_wined3d_Multisampling" -eq 1; then
|
||||
patch_apply wined3d-Multisampling/0001-wined3d-Allow-to-specify-multisampling-AA-quality-le.patch
|
||||
if test "$enable_wined3d_UnhandledBlendFactor" -eq 1; then
|
||||
patch_apply wined3d-UnhandledBlendFactor/0001-wined3d-Silence-repeated-Unhandled-blend-factor-0-me.patch
|
||||
(
|
||||
echo '+ { "Austin English", "wined3d: Allow to specify multisampling AA quality levels via registry.", 1 },';
|
||||
echo '+ { "Sebastian Lackner", "wined3d: Silence repeated '\''Unhandled blend factor 0'\'' messages.", 1 },';
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
@ -2000,6 +2001,21 @@ if test "$enable_wined3d_wined3d_swapchain_present" -eq 1; then
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset wined3d-Multisampling
|
||||
# |
|
||||
# | This patchset fixes the following Wine bugs:
|
||||
# | * [#12652] Allow to override number of quality levels for D3DMULTISAMPLE_NONMASKABLE.
|
||||
# |
|
||||
# | Modified files:
|
||||
# | * dlls/wined3d/directx.c, dlls/wined3d/wined3d_main.c, dlls/wined3d/wined3d_private.h
|
||||
# |
|
||||
if test "$enable_wined3d_Multisampling" -eq 1; then
|
||||
patch_apply wined3d-Multisampling/0001-wined3d-Allow-to-specify-multisampling-AA-quality-le.patch
|
||||
(
|
||||
echo '+ { "Austin English", "wined3d: Allow to specify multisampling AA quality levels via registry.", 1 },';
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset wined3d-Revert_PixelFormat
|
||||
# |
|
||||
# | This patchset fixes the following Wine bugs:
|
||||
@ -2034,18 +2050,6 @@ if test "$enable_wined3d_Revert_PixelFormat" -eq 1; then
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset wined3d-UnhandledBlendFactor
|
||||
# |
|
||||
# | Modified files:
|
||||
# | * dlls/wined3d/state.c
|
||||
# |
|
||||
if test "$enable_wined3d_UnhandledBlendFactor" -eq 1; then
|
||||
patch_apply wined3d-UnhandledBlendFactor/0001-wined3d-Silence-repeated-Unhandled-blend-factor-0-me.patch
|
||||
(
|
||||
echo '+ { "Sebastian Lackner", "wined3d: Silence repeated '\''Unhandled blend factor 0'\'' messages.", 1 },';
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset wined3d-CSMT_Main
|
||||
# |
|
||||
# | This patchset fixes the following Wine bugs:
|
||||
@ -3972,6 +3976,21 @@ if test "$enable_setupapi_SetupDiSelectBestCompatDrv" -eq 1; then
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset setupapi-SetupDiSetDeviceInstallParamsW
|
||||
# |
|
||||
# | This patchset fixes the following Wine bugs:
|
||||
# | * [#29903] Add stub for setupapi.SetupDiSetDeviceInstallParamsW
|
||||
# |
|
||||
# | Modified files:
|
||||
# | * dlls/setupapi/devinst.c, dlls/setupapi/setupapi.spec
|
||||
# |
|
||||
if test "$enable_setupapi_SetupDiSetDeviceInstallParamsW" -eq 1; then
|
||||
patch_apply setupapi-SetupDiSetDeviceInstallParamsW/0001-setupapi-add-SetupDiSetDeviceInstallParamsW-stub.patch
|
||||
(
|
||||
echo '+ { "Austin English", "setupapi: add SetupDiSetDeviceInstallParamsW stub.", 1 },';
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset setupapi-SetupPromptForDisk
|
||||
# |
|
||||
# | This patchset fixes the following Wine bugs:
|
||||
|
||||
@ -0,0 +1,51 @@
|
||||
From b56da992c9fe09059e922603182063bbb21ccbd1 Mon Sep 17 00:00:00 2001
|
||||
From: Austin English <austinenglish@gmail.com>
|
||||
Date: Fri, 3 Apr 2015 17:06:51 -0500
|
||||
Subject: setupapi: add SetupDiSetDeviceInstallParamsW stub.
|
||||
|
||||
Fixes https://bugs.winehq.org/show_bug.cgi?id=38347
|
||||
---
|
||||
dlls/setupapi/devinst.c | 13 +++++++++++++
|
||||
dlls/setupapi/setupapi.spec | 2 +-
|
||||
2 files changed, 14 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c
|
||||
index 966af75..eaaa40e 100644
|
||||
--- a/dlls/setupapi/devinst.c
|
||||
+++ b/dlls/setupapi/devinst.c
|
||||
@@ -3710,6 +3710,19 @@ BOOL WINAPI SetupDiSetDeviceInstallParamsA(
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
+/***********************************************************************
|
||||
+ * SetupDiSetDeviceInstallParamsW (SETUPAPI.@)
|
||||
+ */
|
||||
+BOOL WINAPI SetupDiSetDeviceInstallParamsW(
|
||||
+ HDEVINFO DeviceInfoSet,
|
||||
+ PSP_DEVINFO_DATA DeviceInfoData,
|
||||
+ PSP_DEVINSTALL_PARAMS_W DeviceInstallParams)
|
||||
+{
|
||||
+ FIXME("(%p, %p, %p) stub\n", DeviceInfoSet, DeviceInfoData, DeviceInstallParams);
|
||||
+
|
||||
+ return TRUE;
|
||||
+}
|
||||
+
|
||||
static HKEY SETUPDI_OpenDevKey(struct DeviceInfo *devInfo, REGSAM samDesired)
|
||||
{
|
||||
HKEY enumKey, key = INVALID_HANDLE_VALUE;
|
||||
diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec
|
||||
index c1dbed5..c8e7677 100644
|
||||
--- a/dlls/setupapi/setupapi.spec
|
||||
+++ b/dlls/setupapi/setupapi.spec
|
||||
@@ -386,7 +386,7 @@
|
||||
@ stdcall SetupDiSetClassInstallParamsA(ptr ptr ptr long)
|
||||
@ stdcall SetupDiSetClassInstallParamsW(ptr ptr ptr long)
|
||||
@ stdcall SetupDiSetDeviceInstallParamsA(ptr ptr ptr)
|
||||
-@ stub SetupDiSetDeviceInstallParamsW
|
||||
+@ stdcall SetupDiSetDeviceInstallParamsW(ptr ptr ptr)
|
||||
@ stdcall SetupDiSetDeviceRegistryPropertyA(ptr ptr long ptr ptr)
|
||||
@ stdcall SetupDiSetDeviceRegistryPropertyW(ptr ptr long ptr ptr)
|
||||
@ stub SetupDiSetDriverInstallParamsA
|
||||
--
|
||||
2.3.5
|
||||
|
||||
@ -0,0 +1 @@
|
||||
Fixes: [29903] Add stub for setupapi.SetupDiSetDeviceInstallParamsW
|
||||
Loading…
Reference in New Issue
Block a user