From b8c9d22e4c8fc2b7dcd956336181f69625ed08bd Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Sun, 8 Feb 2015 18:02:28 +0100 Subject: [PATCH] Added patch to improve stub for AEV_GetVolumeRange. --- README.md | 3 +- debian/changelog | 1 + ...vapi-Improve-AEV_GetVolumeRange-stub.patch | 36 +++++++++++++++++++ .../mmdevapi-AEV_GetVolumeRange/definition | 1 + patches/patchinstall.sh | 19 ++++++++++ 5 files changed, 59 insertions(+), 1 deletion(-) create mode 100644 patches/mmdevapi-AEV_GetVolumeRange/0001-mmdevapi-Improve-AEV_GetVolumeRange-stub.patch create mode 100644 patches/mmdevapi-AEV_GetVolumeRange/definition diff --git a/README.md b/README.md index d93ce10b..a6dd12ef 100644 --- a/README.md +++ b/README.md @@ -38,7 +38,7 @@ Wine. All those differences are also documented on the Included bug fixes and improvements =================================== -**Bugfixes and features included in the next upcoming release [22]:** +**Bugfixes and features included in the next upcoming release [23]:** * Add implementation for CreateThreadpool ([Wine Bug #35192](https://bugs.winehq.org/show_bug.cgi?id=35192)) * Add library override instead of closing winecfg when pressing ENTER over the combobox ([Wine Bug #12804](https://bugs.winehq.org/show_bug.cgi?id=12804)) @@ -58,6 +58,7 @@ Included bug fixes and improvements * Implement threadpool timers ([Wine Bug #37306](https://bugs.winehq.org/show_bug.cgi?id=37306)) * Implement threadpool wait objects * Implement threadpool work items ([Wine Bug #32531](https://bugs.winehq.org/show_bug.cgi?id=32531)) +* Improve stub for AEV_GetVolumeRange ([Wine Bug #35658](https://bugs.winehq.org/show_bug.cgi?id=35658)) * Jedi Knight: Dark Forces II crashes with winmm set to native ([Wine Bug #37983](https://bugs.winehq.org/show_bug.cgi?id=37983)) * MediaCoder needs CUDA for video encoding ([Wine Bug #37664](https://bugs.winehq.org/show_bug.cgi?id=37664)) * Support for NVIDIA video encoder library (nvencodeapi) diff --git a/debian/changelog b/debian/changelog index 718c8ad2..39e808c4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -20,6 +20,7 @@ wine-staging (1.7.36) UNRELEASED; urgency=low * Added patch to implement stub for ntoskrnl.KeDelayExecutionThread. * Added patch to improve various ntoskrnl stub functions. * Added patch to fix wrong defition of ntoskrnl.IoReleaseCancelSpinLock function. + * Added patch to improve stub for AEV_GetVolumeRange. * Removed patch to add additional tests for SLGetWindowsInformationDWORD (accepted upstream). * Removed patch to avoid filling KdHelp structure for usermode applications (accepted upstream). -- Sebastian Lackner Sun, 25 Jan 2015 05:58:36 +0100 diff --git a/patches/mmdevapi-AEV_GetVolumeRange/0001-mmdevapi-Improve-AEV_GetVolumeRange-stub.patch b/patches/mmdevapi-AEV_GetVolumeRange/0001-mmdevapi-Improve-AEV_GetVolumeRange-stub.patch new file mode 100644 index 00000000..f4caf906 --- /dev/null +++ b/patches/mmdevapi-AEV_GetVolumeRange/0001-mmdevapi-Improve-AEV_GetVolumeRange-stub.patch @@ -0,0 +1,36 @@ +From e88178f705163d00848d550641734f0e06855509 Mon Sep 17 00:00:00 2001 +From: Christian Costa +Date: Sun, 8 Feb 2015 11:32:55 +0100 +Subject: mmdevapi: Improve AEV_GetVolumeRange stub. + +--- + dlls/mmdevapi/audiovolume.c | 11 ++++++++--- + 1 file changed, 8 insertions(+), 3 deletions(-) + +diff --git a/dlls/mmdevapi/audiovolume.c b/dlls/mmdevapi/audiovolume.c +index 4cc3226..f174f58 100644 +--- a/dlls/mmdevapi/audiovolume.c ++++ b/dlls/mmdevapi/audiovolume.c +@@ -248,11 +248,16 @@ static HRESULT WINAPI AEV_QueryHardwareSupport(IAudioEndpointVolumeEx *iface, DW + + static HRESULT WINAPI AEV_GetVolumeRange(IAudioEndpointVolumeEx *iface, float *mindb, float *maxdb, float *inc) + { +- TRACE("(%p)->(%p,%p,%p)\n", iface, mindb, maxdb, inc); ++ FIXME("(%p)->(%p,%p,%p): stub\n", iface, mindb, maxdb, inc); ++ + if (!mindb || !maxdb || !inc) + return E_POINTER; +- FIXME("stub\n"); +- return E_NOTIMPL; ++ ++ *mindb = 0.0f; ++ *maxdb = 1.0f; ++ *inc = 0.1f; ++ ++ return S_OK; + } + + static HRESULT WINAPI AEV_GetVolumeRangeChannel(IAudioEndpointVolumeEx *iface, UINT chan, float *mindb, float *maxdb, float *inc) +-- +2.2.2 + diff --git a/patches/mmdevapi-AEV_GetVolumeRange/definition b/patches/mmdevapi-AEV_GetVolumeRange/definition new file mode 100644 index 00000000..2996d5d8 --- /dev/null +++ b/patches/mmdevapi-AEV_GetVolumeRange/definition @@ -0,0 +1 @@ +Fixes: [35658] Improve stub for AEV_GetVolumeRange diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index edfc003d..b1ac228d 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -109,6 +109,7 @@ patch_enable_all () enable_kernel32_VerifyVersionInfo="$1" enable_libs_Unicode_Collation="$1" enable_makedep_PARENTSPEC="$1" + enable_mmdevapi_AEV_GetVolumeRange="$1" enable_msvcp90_basic_string_wchar_dtor="$1" enable_msvcrt_atof_strtod="$1" enable_msvfw32_Image_Size="$1" @@ -354,6 +355,9 @@ patch_enable () makedep-PARENTSPEC) enable_makedep_PARENTSPEC="$2" ;; + mmdevapi-AEV_GetVolumeRange) + enable_mmdevapi_AEV_GetVolumeRange="$2" + ;; msvcp90-basic_string_wchar_dtor) enable_msvcp90_basic_string_wchar_dtor="$2" ;; @@ -1860,6 +1864,21 @@ if test "$enable_makedep_PARENTSPEC" -eq 1; then ) >> "$patchlist" fi +# Patchset mmdevapi-AEV_GetVolumeRange +# | +# | This patchset fixes the following Wine bugs: +# | * [#35658] Improve stub for AEV_GetVolumeRange +# | +# | Modified files: +# | * dlls/mmdevapi/audiovolume.c +# | +if test "$enable_mmdevapi_AEV_GetVolumeRange" -eq 1; then + patch_apply mmdevapi-AEV_GetVolumeRange/0001-mmdevapi-Improve-AEV_GetVolumeRange-stub.patch + ( + echo '+ { "Christian Costa", "mmdevapi: Improve AEV_GetVolumeRange stub.", 1 },'; + ) >> "$patchlist" +fi + # Patchset msvcp90-basic_string_wchar_dtor # | # | This patchset fixes the following Wine bugs: