From dab61e733374d9718906948a4d39b611d0ce1338 Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Fri, 23 Jun 2017 06:14:34 +0200 Subject: [PATCH] Rebase against f2bb2064bfdf0e7b369f22c34d680dec6c12493c. --- ...und-Add-EAX-v1-constants-and-structs.patch | 10 +-- patches/patchinstall.sh | 18 +--- ...ort-for-VT_LPSTR-and-VT_LPWSTR-to-Pr.patch | 86 ------------------- 3 files changed, 6 insertions(+), 108 deletions(-) delete mode 100644 patches/propsys-Improvements/0006-propsys-Add-support-for-VT_LPSTR-and-VT_LPWSTR-to-Pr.patch diff --git a/patches/dsound-EAX/0002-dsound-Add-EAX-v1-constants-and-structs.patch b/patches/dsound-EAX/0002-dsound-Add-EAX-v1-constants-and-structs.patch index ee2f6bd9..1378aceb 100644 --- a/patches/dsound-EAX/0002-dsound-Add-EAX-v1-constants-and-structs.patch +++ b/patches/dsound-EAX/0002-dsound-Add-EAX-v1-constants-and-structs.patch @@ -1,4 +1,4 @@ -From b95848a7794ff437b58f1a307da8c8fdca6a362f Mon Sep 17 00:00:00 2001 +From 85367d69fb057ba4557d9195b324425bd0e84316 Mon Sep 17 00:00:00 2001 From: Mark Harmstone Date: Sun, 15 Mar 2015 18:04:16 +0000 Subject: dsound: Add EAX v1 constants and structs. @@ -11,7 +11,7 @@ Subject: dsound: Add EAX v1 constants and structs. diff --git a/dlls/dsound/dsound_eax.h b/dlls/dsound/dsound_eax.h new file mode 100644 -index 0000000..600029f +index 00000000000..600029fa94f --- /dev/null +++ b/dlls/dsound/dsound_eax.h @@ -0,0 +1,89 @@ @@ -105,7 +105,7 @@ index 0000000..600029f + +#endif diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h -index ed645db..3c7dc7a 100644 +index 45232cbd729..58163646fd7 100644 --- a/dlls/dsound/dsound_private.h +++ b/dlls/dsound/dsound_private.h @@ -29,6 +29,7 @@ @@ -115,7 +115,7 @@ index ed645db..3c7dc7a 100644 +#include "dsound_eax.h" #include "wine/list.h" - + #include "wine/unicode.h" -- -2.3.3 +2.13.1 diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index 40b56441..592c0bb8 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -52,7 +52,7 @@ usage() # Get the upstream commit sha upstream_commit() { - echo "5cbc84e51eca1a8ce35916ddeebe79b4ccbd761d" + echo "f2bb2064bfdf0e7b369f22c34d680dec6c12493c" } # Show version information @@ -306,7 +306,6 @@ patch_enable_all () enable_oleaut32_x86_64_Marshaller="$1" enable_opengl32_Revert_Disable_Ext="$1" enable_opengl32_glDebugMessageCallback="$1" - enable_propsys_Improvements="$1" enable_quartz_MediaSeeking_Positions="$1" enable_quartz_Silence_FIXMEs="$1" enable_riched20_Class_Tests="$1" @@ -1162,9 +1161,6 @@ patch_enable () opengl32-glDebugMessageCallback) enable_opengl32_glDebugMessageCallback="$2" ;; - propsys-Improvements) - enable_propsys_Improvements="$2" - ;; quartz-MediaSeeking_Positions) enable_quartz_MediaSeeking_Positions="$2" ;; @@ -6841,18 +6837,6 @@ if test "$enable_opengl32_glDebugMessageCallback" -eq 1; then ) >> "$patchlist" fi -# Patchset propsys-Improvements -# | -# | Modified files: -# | * dlls/propsys/propvar.c, dlls/propsys/tests/propsys.c -# | -if test "$enable_propsys_Improvements" -eq 1; then - patch_apply propsys-Improvements/0006-propsys-Add-support-for-VT_LPSTR-and-VT_LPWSTR-to-Pr.patch - ( - printf '%s\n' '+ { "Dmitry Timoshkov", "propsys: Add support for VT_LPSTR and VT_LPWSTR to PropVariantCompareEx.", 2 },'; - ) >> "$patchlist" -fi - # Patchset quartz-MediaSeeking_Positions # | # | Modified files: diff --git a/patches/propsys-Improvements/0006-propsys-Add-support-for-VT_LPSTR-and-VT_LPWSTR-to-Pr.patch b/patches/propsys-Improvements/0006-propsys-Add-support-for-VT_LPSTR-and-VT_LPWSTR-to-Pr.patch deleted file mode 100644 index 78aac6d5..00000000 --- a/patches/propsys-Improvements/0006-propsys-Add-support-for-VT_LPSTR-and-VT_LPWSTR-to-Pr.patch +++ /dev/null @@ -1,86 +0,0 @@ -From 1908c1582fcd927a08c0aa7b0a6c1e11c614942f Mon Sep 17 00:00:00 2001 -From: Dmitry Timoshkov -Date: Fri, 31 Mar 2017 13:53:14 +0800 -Subject: propsys: Add support for VT_LPSTR and VT_LPWSTR to - PropVariantCompareEx. (v2) - ---- - dlls/propsys/propvar.c | 28 ++++++++++++++++++++++++++-- - dlls/propsys/tests/propsys.c | 4 ++-- - 2 files changed, 28 insertions(+), 4 deletions(-) - -diff --git a/dlls/propsys/propvar.c b/dlls/propsys/propvar.c -index 8233d2f362f..0c366d5a053 100644 ---- a/dlls/propsys/propvar.c -+++ b/dlls/propsys/propvar.c -@@ -18,8 +18,12 @@ - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -+#include "config.h" -+#include "wine/port.h" -+ - #include - #include -+#include - - #define NONAMELESSUNION - -@@ -112,6 +116,15 @@ static HRESULT PROPVAR_ConvertNumber(REFPROPVARIANT pv, int dest_bits, - src_signed = FALSE; - *res = 0; - break; -+ case VT_LPSTR: -+ *res = strtoll(pv->u.pszVal, NULL, 0); -+ src_signed = *res < 0; -+ break; -+ case VT_LPWSTR: -+ case VT_BSTR: -+ *res = strtolW(pv->u.pwszVal, NULL, 0); -+ src_signed = *res < 0; -+ break; - default: - FIXME("unhandled vt %d\n", pv->vt); - return E_NOTIMPL; -@@ -698,8 +711,19 @@ INT WINAPI PropVariantCompareEx(REFPROPVARIANT propvar1, REFPROPVARIANT propvar2 - CMP_INT_VALUE(uhVal.QuadPart); - break; - case VT_BSTR: -- /* FIXME: Use string flags. */ -- res = lstrcmpW(propvar1->u.bstrVal, propvar2->u.bstrVal); -+ case VT_LPWSTR: -+ /* FIXME: Use other string flags. */ -+ if (flags & (PVCF_USESTRCMPI | PVCF_USESTRCMPIC)) -+ res = lstrcmpiW(propvar1->u.bstrVal, propvar2_converted->u.bstrVal); -+ else -+ res = lstrcmpW(propvar1->u.bstrVal, propvar2_converted->u.bstrVal); -+ break; -+ case VT_LPSTR: -+ /* FIXME: Use other string flags. */ -+ if (flags & (PVCF_USESTRCMPI | PVCF_USESTRCMPIC)) -+ res = lstrcmpiA(propvar1->u.pszVal, propvar2_converted->u.pszVal); -+ else -+ res = lstrcmpA(propvar1->u.pszVal, propvar2_converted->u.pszVal); - break; - default: - FIXME("vartype %d not handled\n", propvar1->vt); -diff --git a/dlls/propsys/tests/propsys.c b/dlls/propsys/tests/propsys.c -index 71b6a93df17..54b45ace9bd 100644 ---- a/dlls/propsys/tests/propsys.c -+++ b/dlls/propsys/tests/propsys.c -@@ -735,10 +735,10 @@ static void test_PropVariantCompare(void) - ok(res == 0, "res=%i\n", res); - - res = PropVariantCompareEx(&i2_2, &str_2, 0, 0); -- todo_wine ok(res == 0, "res=%i\n", res); -+ ok(res == 0, "res=%i\n", res); - - res = PropVariantCompareEx(&i2_2, &str_02, 0, 0); -- todo_wine ok(res == 0, "res=%i\n", res); -+ ok(res == 0, "res=%i\n", res); - - res = PropVariantCompareEx(&str_2, &i2_2, 0, 0); - todo_wine ok(res == 0, "res=%i\n", res); --- -2.12.2 -