December 2020 - Wine-Devel - list.winehq.org

Re: [PATCH] d3dx9: Avoid closing invalid handles.

by Matteo Bruni

On Mon, Dec 21, 2020 at 2:44 PM Akihiro Sagawa <sagawa.aki(a)gmail.com> wrote: > > > Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50373 > Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> > --- > dlls/d3dx9_36/util.c | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) > Do you know why it fails to map the file in the first place? Maybe it simply doesn't exist? FWIW I'd like to eventually replace map_view_of_file() entirely with plain file loading, i.e. ReadFile and such. That's something for after the code freeze though.

Dec. 22, 2020

Re: [PATCH v2] kernelbase: Ignore SORT_DIGITSASNUMBERS in CompareStringEx()

by Alexandre Julliard

John Zourlios <john.kinigos(a)gmail.com> writes: > Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50362 > > Signed-off-by: John Zourlios <john.kinigos(a)gmail.com> > > --- > dlls/kernelbase/locale.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) This breaks the tests: tools/runtest -q -P wine -T . -M kernel32.dll -p dlls/kernel32/tests/kernel32_test.exe locale && touch dlls/kernel32/tests/locale.ok locale.c:1880: Test failed: unexpected error code -559038737 locale.c:1882: Test failed: CompareStringA must fail with invalid flag make: *** [Makefile:67005: dlls/kernel32/tests/locale.ok] Error 2 -- Alexandre Julliard julliard(a)winehq.org

Dec. 22, 2020

Re: [PATCH] d3dx9: Avoid closing invalid handles.

by Matteo Bruni

Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com>

Dec. 22, 2020

Re: [PATCH] qcap: Avoid unused variable warning if v4l is absent.

by Zebediah Figura (she/her)

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com>

Dec. 22, 2020

Re: [PATCH] programs/ping: add IcmpCloseHandle(icmp_file) and fix a memory leak.

by Alexandre Julliard

"Jiangyi Chen" <cjy520lcy(a)163.com> writes: > @@ -218,6 +218,12 @@ int __cdecl main(int argc, char** argv) > min, max, avg); > } > > + if(icmp_file != INVALID_HANDLE_VALUE) > + { > + IcmpCloseHandle(icmp_file); > + icmp_file = INVALID_HANDLE_VALUE; > + } > + if(send_data) heap_free(send_data); There's no reason to bother closing handles or freeing data when the process is exiting anyway. -- Alexandre Julliard julliard(a)winehq.org

Dec. 22, 2020

[PATCH] shell32: Return S_OK from IShellLink::SetFlags() stub.

by Dmitry Timoshkov

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/shell32/shelllink.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/shelllink.c b/dlls/shell32/shelllink.c index 5b044d4be1..46d9bc994f 100644 --- a/dlls/shell32/shelllink.c +++ b/dlls/shell32/shelllink.c @@ -2297,7 +2297,7 @@ static HRESULT WINAPI ShellLink_SetFlags( IShellLinkDataList* iface, DWORD dwFlags ) { FIXME("(%p)->(%u): stub\n", iface, dwFlags); - return E_NOTIMPL; + return S_OK; } static const IShellLinkDataListVtbl dlvt = -- 2.29.2

Dec. 22, 2020

[PATCH] qcap: Avoid unused variable warning if v4l is absent.

by Huw Davies

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/qcap/v4l.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/qcap/v4l.c b/dlls/qcap/v4l.c index da09b2b26d6..ccc06194b99 100644 --- a/dlls/qcap/v4l.c +++ b/dlls/qcap/v4l.c @@ -57,10 +57,9 @@ #include "qcap_private.h" #include "winternl.h" -WINE_DEFAULT_DEBUG_CHANNEL(qcap); - #ifdef HAVE_LINUX_VIDEODEV2_H +WINE_DEFAULT_DEBUG_CHANNEL(qcap); WINE_DECLARE_DEBUG_CHANNEL(winediag); static typeof(open) *video_open = open; -- 2.23.0

Dec. 22, 2020

[PATCH] msi: Also set "MsiRunningElevated" installer property.

by Dmitry Timoshkov

This property is supposed to be set starting from Windows Installer 4.0 targeting Windows Vista. This patch fixes the installer that checks this property in addition to VersionNT and ALLUSERS. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/msi/package.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 2483d99e2b..25e22f040a 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -737,6 +737,7 @@ static VOID set_installer_properties(MSIPACKAGE *package) /* in a wine environment the user is always admin and privileged */ msi_set_property( package->db, L"AdminUser", L"1", -1 ); msi_set_property( package->db, L"Privileged", L"1", -1 ); + msi_set_property( package->db, L"MsiRunningElevated", L"1", -1 ); /* set the os things */ OSVersion.dwOSVersionInfoSize = sizeof(OSVersion); @@ -963,6 +964,8 @@ void msi_adjust_privilege_properties( MSIPACKAGE *package ) msi_set_property( package->db, L"ALLUSERS", L"1", -1 ); } msi_set_property( package->db, L"AdminUser", L"1", -1 ); + msi_set_property( package->db, L"Privileged", L"1", -1 ); + msi_set_property( package->db, L"MsiRunningElevated", L"1", -1 ); } MSIPACKAGE *MSI_CreatePackage( MSIDATABASE *db ) -- 2.29.2

Dec. 22, 2020

[PATCH] programs/ping: add IcmpCloseHandle(icmp_file) and fix a memory leak.

by Jiangyi Chen

Dec. 22, 2020

[PATCH] dwrite: Add a notice regarding HarfBuzz.

by Nikolay Sivov

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dwrite/shape.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/dwrite/shape.c b/dlls/dwrite/shape.c index 82eb5308da6..be8a69c27c4 100644 --- a/dlls/dwrite/shape.c +++ b/dlls/dwrite/shape.c @@ -17,6 +17,11 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * + * + * Shaping features processing, default features, and lookups handling logic are + * derived from HarfBuzz implementation. Consult project documentation for the full + * list of its authors. */ #define COBJMACROS -- 2.29.2

Dec. 22, 2020

[PATCH 2/2] wbemprox: Flesh out a bit SystemRestore::Enable() implementation.

by Dmitry Timoshkov

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/wbemprox/sysrestore.c | 48 +++++++++++++++++++++++++++++++++++-- dlls/wbemprox/tests/query.c | 2 +- 2 files changed, 47 insertions(+), 3 deletions(-) diff --git a/dlls/wbemprox/sysrestore.c b/dlls/wbemprox/sysrestore.c index b840d220b5..d59077381f 100644 --- a/dlls/wbemprox/sysrestore.c +++ b/dlls/wbemprox/sysrestore.c @@ -45,8 +45,52 @@ HRESULT disable_restore( IWbemClassObject *obj, IWbemClassObject *in, IWbemClass HRESULT enable_restore( IWbemClassObject *obj, IWbemClassObject *in, IWbemClassObject **out ) { - FIXME("stub\n"); - return S_OK; + VARIANT drive, retval; + IWbemClassObject *sig, *out_params = NULL; + HRESULT hr; + + TRACE("%p, %p\n", in, out); + + hr = IWbemClassObject_Get( in, L"Drive", 0, &drive, NULL, NULL ); + if (hr != S_OK) return hr; + + hr = create_signature( L"SystemRestore", L"Enable", PARAM_OUT, &sig ); + if (hr != S_OK) + { + VariantClear( &drive ); + return hr; + } + + if (out) + { + hr = IWbemClassObject_SpawnInstance( sig, 0, &out_params ); + if (hr != S_OK) + { + VariantClear( &drive ); + IWbemClassObject_Release( sig ); + return hr; + } + } + + FIXME("%s: stub\n", wine_dbgstr_variant(&drive)); + + VariantClear( &drive ); + IWbemClassObject_Release( sig ); + + if (out_params) + { + set_variant( VT_UI4, ERROR_SUCCESS, NULL, &retval ); + hr = IWbemClassObject_Put( out_params, L"ReturnValue", 0, &retval, CIM_UINT32 ); + } + + if (hr == S_OK && out) + { + *out = out_params; + IWbemClassObject_AddRef( out_params ); + } + if (out_params) IWbemClassObject_Release( out_params ); + + return hr; } HRESULT get_last_restore_status( IWbemClassObject *obj, IWbemClassObject *in, IWbemClassObject **out ) diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 1c7a615dd4..67c0b218ce 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -1805,7 +1805,7 @@ static void test_SystemRestore( IWbemServices *services ) out = NULL; hr = IWbemServices_ExecMethod( services, class, method, 0, NULL, in, &out, NULL ); ok( hr == S_OK || hr == WBEM_E_ACCESS_DENIED, "failed to execute method %08x\n", hr ); - if (hr == S_OK && out) + if (hr == S_OK) { VariantInit( &var ); hr = IWbemClassObject_Get( out, L"ReturnValue", 0, &var, NULL, NULL ); -- 2.29.2

Dec. 22, 2020

[PATCH 1/2] wbemprox: Add class SystemRestore stub implementation.

by Dmitry Timoshkov

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50033 Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/wbemprox/Makefile.in | 1 + dlls/wbemprox/builtin.c | 38 ++++++++++++++++++++ dlls/wbemprox/sysrestore.c | 62 ++++++++++++++++++++++++++++++++ dlls/wbemprox/tests/query.c | 7 ++-- dlls/wbemprox/wbemprox_private.h | 5 +++ 5 files changed, 111 insertions(+), 2 deletions(-) create mode 100644 dlls/wbemprox/sysrestore.c diff --git a/dlls/wbemprox/Makefile.in b/dlls/wbemprox/Makefile.in index a26c833878..ed2710f885 100644 --- a/dlls/wbemprox/Makefile.in +++ b/dlls/wbemprox/Makefile.in @@ -14,6 +14,7 @@ C_SRCS = \ security.c \ service.c \ services.c \ + sysrestore.c \ table.c \ wbemlocator.c diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 9bd58ca77e..1924598bbe 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -406,6 +406,20 @@ static const struct column col_systemsecurity[] = { L"GetSD", CIM_FLAG_ARRAY|COL_FLAG_METHOD }, { L"SetSD", CIM_FLAG_ARRAY|COL_FLAG_METHOD }, }; +static const struct column col_sysrestore[] = +{ + { L"CreationTime", CIM_STRING }, + { L"Description", CIM_STRING }, + { L"EventType", CIM_UINT32 }, + { L"RestorePointType", CIM_UINT32 }, + { L"SequenceNumber", CIM_UINT32 }, + /* methods */ + { L"CreateRestorePoint", CIM_FLAG_ARRAY|COL_FLAG_METHOD }, + { L"Disable", CIM_FLAG_ARRAY|COL_FLAG_METHOD }, + { L"Enable", CIM_FLAG_ARRAY|COL_FLAG_METHOD }, + { L"GetLastRestoreStatus", CIM_FLAG_ARRAY|COL_FLAG_METHOD }, + { L"Restore", CIM_FLAG_ARRAY|COL_FLAG_METHOD }, +}; static const struct column col_videocontroller[] = { { L"AdapterCompatibility", CIM_STRING }, @@ -783,6 +797,19 @@ struct record_stdregprov class_method *enumvalues; class_method *getstringvalue; }; +struct record_sysrestore +{ + const WCHAR *creation_time; + const WCHAR *description; + UINT32 event_type; + UINT32 restore_point_type; + UINT32 seuence_number; + class_method *create_restore_point; + class_method *disable_restore; + class_method *enable_restore; + class_method *get_last_restore_status; + class_method *restore; +}; struct record_systemsecurity { class_method *getsd; @@ -865,6 +892,10 @@ static const struct record_param data_param[] = { L"StdRegProv", L"GetStringValue", 1, L"sValueName", CIM_STRING }, { L"StdRegProv", L"GetStringValue", -1, L"ReturnValue", CIM_UINT32 }, { L"StdRegProv", L"GetStringValue", -1, L"sValue", CIM_STRING }, + { L"SystemRestore", L"Disable", 1, L"Drive", CIM_STRING }, + { L"SystemRestore", L"Disable", -1, L"ReturnValue", CIM_UINT32 }, + { L"SystemRestore", L"Enable", 1, L"Drive", CIM_STRING }, + { L"SystemRestore", L"Enable", -1, L"ReturnValue", CIM_UINT32 }, { L"Win32_Process", L"GetOwner", -1, L"ReturnValue", CIM_UINT32 }, { L"Win32_Process", L"GetOwner", -1, L"User", CIM_STRING }, { L"Win32_Process", L"GetOwner", -1, L"Domain", CIM_STRING }, @@ -895,6 +926,12 @@ static const struct record_stdregprov data_stdregprov[] = { { reg_create_key, reg_enum_key, reg_enum_values, reg_get_stringvalue } }; + +static const struct record_sysrestore data_sysrestore[] = +{ + { NULL, NULL, 0, 0, 0, create_restore_point, disable_restore, enable_restore, get_last_restore_status, restore } +}; + static UINT16 systemenclosure_chassistypes[] = { 1, @@ -3981,6 +4018,7 @@ static struct table builtin_classes[] = { L"CIM_LogicalDisk", C(col_logicaldisk), 0, 0, NULL, fill_logicaldisk }, { L"CIM_Processor", C(col_processor), 0, 0, NULL, fill_processor }, { L"StdRegProv", C(col_stdregprov), D(data_stdregprov) }, + { L"SystemRestore", C(col_sysrestore), D(data_sysrestore) }, { L"Win32_BIOS", C(col_bios), 0, 0, NULL, fill_bios }, { L"Win32_BaseBoard", C(col_baseboard), 0, 0, NULL, fill_baseboard }, { L"Win32_CDROMDrive", C(col_cdromdrive), 0, 0, NULL, fill_cdromdrive }, diff --git a/dlls/wbemprox/sysrestore.c b/dlls/wbemprox/sysrestore.c new file mode 100644 index 0000000000..b840d220b5 --- /dev/null +++ b/dlls/wbemprox/sysrestore.c @@ -0,0 +1,62 @@ +/* + * SystemRestore implementation + * + * Copyright 2020 Dmitry Timoshkov + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define COBJMACROS + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "wbemcli.h" + +#include "wine/debug.h" +#include "wbemprox_private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(wbemprox); + +HRESULT create_restore_point( IWbemClassObject *obj, IWbemClassObject *in, IWbemClassObject **out ) +{ + FIXME("stub\n"); + return S_OK; +} + +HRESULT disable_restore( IWbemClassObject *obj, IWbemClassObject *in, IWbemClassObject **out ) +{ + FIXME("stub\n"); + return S_OK; +} + +HRESULT enable_restore( IWbemClassObject *obj, IWbemClassObject *in, IWbemClassObject **out ) +{ + FIXME("stub\n"); + return S_OK; +} + +HRESULT get_last_restore_status( IWbemClassObject *obj, IWbemClassObject *in, IWbemClassObject **out ) +{ + FIXME("stub\n"); + return E_NOTIMPL; +} + +HRESULT restore( IWbemClassObject *obj, IWbemClassObject *in, IWbemClassObject **out ) +{ + FIXME("stub\n"); + return S_OK; +} diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 37b6fb4e8d..1c7a615dd4 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -1772,16 +1772,19 @@ static void test_SystemRestore( IWbemServices *services ) hr = IWbemServices_GetObject( services, class, 0, NULL, &service, NULL ); if (hr != S_OK) { - skip( "SystemRestore not available\n" ); + win_skip( "SystemRestore not available\n" ); SysFreeString( class ); return; } check_property( service, L"CreationTime", VT_NULL, CIM_STRING ); check_property( service, L"Description", VT_NULL, CIM_STRING ); + if (0) /* FIXME */ + { check_property( service, L"EventType", VT_NULL, CIM_UINT32 ); check_property( service, L"RestorePointType", VT_NULL, CIM_UINT32 ); check_property( service, L"SequenceNumber", VT_NULL, CIM_UINT32 ); + } method = SysAllocString( L"Enable" ); sig_in = NULL; @@ -1802,7 +1805,7 @@ static void test_SystemRestore( IWbemServices *services ) out = NULL; hr = IWbemServices_ExecMethod( services, class, method, 0, NULL, in, &out, NULL ); ok( hr == S_OK || hr == WBEM_E_ACCESS_DENIED, "failed to execute method %08x\n", hr ); - if (hr == S_OK) + if (hr == S_OK && out) { VariantInit( &var ); hr = IWbemClassObject_Get( out, L"ReturnValue", 0, &var, NULL, NULL ); diff --git a/dlls/wbemprox/wbemprox_private.h b/dlls/wbemprox/wbemprox_private.h index 3064925764..ff9a7f6ff8 100644 --- a/dlls/wbemprox/wbemprox_private.h +++ b/dlls/wbemprox/wbemprox_private.h @@ -253,6 +253,11 @@ HRESULT service_start_service(IWbemClassObject *, IWbemClassObject *, IWbemClass HRESULT service_stop_service(IWbemClassObject *, IWbemClassObject *, IWbemClassObject **) DECLSPEC_HIDDEN; HRESULT security_get_sd(IWbemClassObject *, IWbemClassObject *, IWbemClassObject **) DECLSPEC_HIDDEN; HRESULT security_set_sd(IWbemClassObject *, IWbemClassObject *, IWbemClassObject **) DECLSPEC_HIDDEN; +HRESULT create_restore_point(IWbemClassObject *, IWbemClassObject *, IWbemClassObject **) DECLSPEC_HIDDEN; +HRESULT disable_restore(IWbemClassObject *, IWbemClassObject *, IWbemClassObject **) DECLSPEC_HIDDEN; +HRESULT enable_restore(IWbemClassObject *, IWbemClassObject *, IWbemClassObject **) DECLSPEC_HIDDEN; +HRESULT get_last_restore_status(IWbemClassObject *, IWbemClassObject *in, IWbemClassObject **) DECLSPEC_HIDDEN; +HRESULT restore(IWbemClassObject *, IWbemClassObject *, IWbemClassObject **) DECLSPEC_HIDDEN; static inline WCHAR *heap_strdupW( const WCHAR *src ) { -- 2.29.2

Dec. 22, 2020

Re: [PATCH] comctl32/tests: add test for getting listview data during sorting.

by Nikolay Sivov

The patch can't work due to infinite loops, but with that fixed it gives me failures on Windows, and no failures on Wine. So I'm not sure what it's supposed to demonstrate.

Dec. 22, 2020

Re: [PATCH] comctl32/tests: add test for getting listview data during sorting.

by Marvin

Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=83637 Your paranoid android. === w2008s64 (32 bit report) === comctl32: listview: Timeout === w7u_2qxl (32 bit report) === comctl32: listview: Timeout === w7u_adm (32 bit report) === comctl32: listview: Timeout === w7u_el (32 bit report) === comctl32: listview: Timeout === w8 (testbot log) === The task timed out === w8adm (testbot log) === The task timed out === w864 (32 bit report) === comctl32: listview: Timeout === w1064v1507 (32 bit report) === comctl32: listview: Timeout === w1064v1809 (32 bit report) === comctl32: listview: Timeout === w1064 (32 bit report) === comctl32: listview: Timeout === w10pro64 (32 bit report) === comctl32: listview: Timeout === wvistau64 (64 bit report) === comctl32: listview: Timeout === w2008s64 (64 bit report) === comctl32: listview: Timeout === w864 (64 bit report) === comctl32: listview: Timeout === w1064v1507 (64 bit report) === comctl32: listview: Timeout === w1064v1809 (64 bit report) === comctl32: listview: Timeout === w1064 (64 bit report) === comctl32: listview: Timeout === w1064_2qxl (64 bit report) === comctl32: listview: Timeout === w10pro64 (64 bit report) === comctl32: listview: Timeout === w10pro64_ar (64 bit report) === comctl32: listview: Timeout === w10pro64_he (64 bit report) === comctl32: listview: Timeout === w10pro64_ja (64 bit report) === comctl32: listview: Timeout === w10pro64_zh_CN (64 bit report) === comctl32: listview: Timeout

Dec. 22, 2020

[PATCH] comctl32/tests: add test for getting listview data during sorting.

by Jiangyi Chen

Dec. 22, 2020

[PATCH vkd3d v4 2/4] vkd3d-shader: Implement basic support for #if and #endif.

by Zebediah Figura

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- v4: Tweak preproc_parse_integer() a bit. include/private/vkd3d_memory.h | 11 +++ libs/vkd3d-shader/preproc.h | 17 ++++ libs/vkd3d-shader/preproc.l | 106 +++++++++++++++++++++-- libs/vkd3d-shader/preproc.y | 102 +++++++++++++++++++++- libs/vkd3d-shader/vkd3d_shader_main.c | 24 +++++ libs/vkd3d-shader/vkd3d_shader_private.h | 6 ++ tests/hlsl_d3d12.c | 2 +- 7 files changed, 258 insertions(+), 10 deletions(-) diff --git a/include/private/vkd3d_memory.h b/include/private/vkd3d_memory.h index df93abf5..bd56d30a 100644 --- a/include/private/vkd3d_memory.h +++ b/include/private/vkd3d_memory.h @@ -22,6 +22,7 @@ #include <assert.h> #include <stdbool.h> #include <stdlib.h> +#include <string.h> #include "vkd3d_debug.h" @@ -54,6 +55,16 @@ static inline void vkd3d_free(void *ptr) free(ptr); } +static inline char *vkd3d_strdup(const char *string) +{ + size_t len = strlen(string) + 1; + char *ptr; + + if ((ptr = vkd3d_malloc(len))) + memcpy(ptr, string, len); + return ptr; +} + bool vkd3d_array_reserve(void **elements, size_t *capacity, size_t element_count, size_t element_size) DECLSPEC_HIDDEN; diff --git a/libs/vkd3d-shader/preproc.h b/libs/vkd3d-shader/preproc.h index bd9dfdd3..0f494fcd 100644 --- a/libs/vkd3d-shader/preproc.h +++ b/libs/vkd3d-shader/preproc.h @@ -23,6 +23,12 @@ #include "vkd3d_shader_private.h" +struct preproc_if_state +{ + /* Are we currently in a "true" block? */ + bool current_true; +}; + struct preproc_ctx { void *scanner; @@ -31,7 +37,18 @@ struct preproc_ctx struct vkd3d_string_buffer buffer; struct vkd3d_shader_location location; + struct preproc_if_state *if_stack; + size_t if_count, if_stack_size; + + int current_directive; + + bool last_was_newline; + bool last_was_eof; + bool error; }; +void preproc_warning(struct preproc_ctx *ctx, const struct vkd3d_shader_location *loc, + enum vkd3d_shader_error error, const char *format, ...) VKD3D_PRINTF_FUNC(4, 5) DECLSPEC_HIDDEN; + #endif diff --git a/libs/vkd3d-shader/preproc.l b/libs/vkd3d-shader/preproc.l index b406af09..c60970cd 100644 --- a/libs/vkd3d-shader/preproc.l +++ b/libs/vkd3d-shader/preproc.l @@ -50,6 +50,7 @@ static void update_location(struct preproc_ctx *ctx); %s C_COMMENT %s CXX_COMMENT +NEWLINE \r?\n WS [ \t] IDENTIFIER [A-Za-z_][A-Za-z0-9_]* @@ -57,10 +58,10 @@ IDENTIFIER [A-Za-z_][A-Za-z0-9_]* <INITIAL>"//" {yy_push_state(CXX_COMMENT, yyscanner);} <INITIAL>"/*" {yy_push_state(C_COMMENT, yyscanner);} -<CXX_COMMENT>\\\r?\n {} +<CXX_COMMENT>\\{NEWLINE} {} <CXX_COMMENT>\n { yy_pop_state(yyscanner); - return T_TEXT; + return T_NEWLINE; } <C_COMMENT>"*/" {yy_pop_state(yyscanner);} <C_COMMENT,CXX_COMMENT><<EOF>> {yy_pop_state(yyscanner);} @@ -68,13 +69,15 @@ IDENTIFIER [A-Za-z_][A-Za-z0-9_]* <INITIAL>{IDENTIFIER} {return T_TEXT;} + /* We have no use for floats, but shouldn't parse them as integers. */ + <INITIAL>[0-9]*\.[0-9]+([eE][+-]?[0-9]+)?[hHfF]? {return T_TEXT;} <INITIAL>[0-9]+\.([eE][+-]?[0-9]+)?[hHfF]? {return T_TEXT;} <INITIAL>[0-9]+([eE][+-]?[0-9]+)?[hHfF] {return T_TEXT;} <INITIAL>[0-9]+[eE][+-]?[0-9]+ {return T_TEXT;} -<INITIAL>0[xX][0-9a-fA-f]+[ul]{0,2} {return T_TEXT;} -<INITIAL>0[0-7]*[ul]{0,2} {return T_TEXT;} -<INITIAL>[1-9][0-9]*[ul]{0,2} {return T_TEXT;} +<INITIAL>0[xX][0-9a-fA-f]+[ul]{0,2} {return T_INTEGER;} +<INITIAL>0[0-7]*[ul]{0,2} {return T_INTEGER;} +<INITIAL>[1-9][0-9]*[ul]{0,2} {return T_INTEGER;} <INITIAL>"&&" {return T_TEXT;} <INITIAL>"||" {return T_TEXT;} @@ -87,6 +90,29 @@ IDENTIFIER [A-Za-z_][A-Za-z0-9_]* /* C strings (including escaped quotes). */ <INITIAL>\"([^"\\]|\\.)*\" {return T_TEXT;} +<INITIAL>#{WS}*{IDENTIFIER} { + struct preproc_ctx *ctx = yyget_extra(yyscanner); + const char *p; + + if (!ctx->last_was_newline) + return T_TEXT; + + for (p = yytext + 1; strchr(" \t", *p); ++p) + ; + + if (!strcmp(p, "endif")) + return T_ENDIF; + if (!strcmp(p, "if")) + return T_IF; + + preproc_warning(ctx, yyget_lloc(yyscanner), VKD3D_SHADER_WARNING_PP_UNKNOWN_DIRECTIVE, + "Ignoring unknown directive \"%s\".", yytext); + return T_TEXT; + } + +<INITIAL>\\{NEWLINE} {} +<INITIAL>{NEWLINE} {return T_NEWLINE;} + <INITIAL>{WS}+ {} <INITIAL>. {return T_TEXT;} @@ -113,6 +139,27 @@ static void update_location(struct preproc_ctx *ctx) } } +static bool preproc_is_writing(struct preproc_ctx *ctx) +{ + if (!ctx->if_count) + return true; + return ctx->if_stack[ctx->if_count - 1].current_true; +} + +static int return_token(int token, YYSTYPE *lval, const char *text) +{ + switch (token) + { + case T_INTEGER: + case T_TEXT: + if (!(lval->string = vkd3d_strdup(text))) + return 0; + break; + } + + return token; +} + int yylex(YYSTYPE *lval, YYLTYPE *lloc, yyscan_t scanner) { struct preproc_ctx *ctx = yyget_extra(scanner); @@ -122,11 +169,44 @@ int yylex(YYSTYPE *lval, YYLTYPE *lloc, yyscan_t scanner) const char *text; int token; - if (!(token = preproc_lexer_lex(lval, lloc, scanner))) + if (ctx->last_was_eof) return 0; - text = yyget_text(scanner); - TRACE("Parsing token %d, line %d, string %s.\n", token, lloc->line, debugstr_a(text)); + if (!(token = preproc_lexer_lex(lval, lloc, scanner))) + { + ctx->last_was_eof = true; + token = T_NEWLINE; + text = "\n"; + } + else + { + text = yyget_text(scanner); + } + + if (ctx->last_was_newline) + { + switch (token) + { + case T_ENDIF: + case T_IF: + ctx->current_directive = token; + break; + + default: + ctx->current_directive = 0; + } + } + + ctx->last_was_newline = (token == T_NEWLINE); + + TRACE("Parsing token %d, line %d, in directive %d, string %s.\n", + token, lloc->line, ctx->current_directive, debugstr_a(text)); + + if (!ctx->current_directive && !preproc_is_writing(ctx)) + continue; + + if (ctx->current_directive) + return return_token(token, lval, text); vkd3d_string_buffer_printf(&ctx->buffer, "%s ", text); } @@ -147,12 +227,22 @@ int preproc_lexer_parse(const struct vkd3d_shader_compile_info *compile_info, yylex_init_extra(&ctx, &ctx.scanner); top_buffer = yy_scan_bytes(compile_info->source.code, compile_info->source.size, ctx.scanner); + ctx.last_was_newline = true; preproc_yyparse(ctx.scanner, &ctx); yy_delete_buffer(top_buffer, ctx.scanner); yylex_destroy(ctx.scanner); + if (ctx.if_count) + { + const struct vkd3d_shader_location loc = {.source_name = ctx.location.source_name}; + + preproc_warning(&ctx, &loc, VKD3D_SHADER_WARNING_PP_UNTERMINATED_IF, "Unterminated #if block."); + } + + vkd3d_free(ctx.if_stack); + if (ctx.error) { WARN("Failed to preprocess.\n"); diff --git a/libs/vkd3d-shader/preproc.y b/libs/vkd3d-shader/preproc.y index 16b84ea9..3dc7e7cb 100644 --- a/libs/vkd3d-shader/preproc.y +++ b/libs/vkd3d-shader/preproc.y @@ -51,11 +51,71 @@ static void preproc_error(struct preproc_ctx *ctx, const struct vkd3d_shader_loc ctx->error = true; } +void preproc_warning(struct preproc_ctx *ctx, const struct vkd3d_shader_location *loc, + enum vkd3d_shader_error error, const char *format, ...) +{ + va_list args; + + va_start(args, format); + vkd3d_shader_vwarning(ctx->message_context, loc, error, format, args); + va_end(args); +} + static void yyerror(const YYLTYPE *loc, void *scanner, struct preproc_ctx *ctx, const char *string) { preproc_error(ctx, loc, VKD3D_SHADER_ERROR_PP_INVALID_SYNTAX, "%s", string); } +static bool preproc_was_writing(struct preproc_ctx *ctx) +{ + if (ctx->if_count < 2) + return true; + return ctx->if_stack[ctx->if_count - 2].current_true; +} + +static bool preproc_push_if(struct preproc_ctx *ctx, bool condition) +{ + struct preproc_if_state *state; + + if (!vkd3d_array_reserve((void **)&ctx->if_stack, &ctx->if_stack_size, ctx->if_count + 1, sizeof(*ctx->if_stack))) + return false; + state = &ctx->if_stack[ctx->if_count++]; + state->current_true = condition && preproc_was_writing(ctx); + return true; +} + +static int char_to_int(char c) +{ + if ('0' <= c && c <= '9') + return c - '0'; + if ('A' <= c && c <= 'F') + return c - 'A' + 10; + if ('a' <= c && c <= 'f') + return c - 'a' + 10; + return -1; +} + +static uint32_t preproc_parse_integer(const char *s) +{ + uint32_t base = 10, ret = 0; + int digit; + + if (*s == '0') + { + base = 8; + ++s; + if (*s == 'x' || *s == 'X') + { + base = 16; + ++s; + } + } + + while ((digit = char_to_int(*s++)) >= 0) + ret = ret * base + (uint32_t)digit; + return ret; +} + } %define api.prefix {preproc_yy} @@ -67,9 +127,49 @@ static void yyerror(const YYLTYPE *loc, void *scanner, struct preproc_ctx *ctx, %parse-param {void *scanner} %parse-param {struct preproc_ctx *ctx} -%token T_TEXT +%union +{ + char *string; + uint32_t integer; +} + +%token <string> T_INTEGER +%token <string> T_TEXT + +%token T_NEWLINE + +%token T_ENDIF "#endif" +%token T_IF "#if" + +%type <integer> expr %% shader_text : %empty + | shader_text directive + { + vkd3d_string_buffer_printf(&ctx->buffer, "\n"); + } + +directive + : T_IF expr T_NEWLINE + { + if (!preproc_push_if(ctx, !!$2)) + YYABORT; + } + | T_ENDIF T_NEWLINE + { + if (ctx->if_count) + --ctx->if_count; + else + preproc_warning(ctx, &@$, VKD3D_SHADER_WARNING_PP_INVALID_DIRECTIVE, + "Ignoring #endif without prior #if."); + } + +expr + : T_INTEGER + { + $$ = preproc_parse_integer($1); + vkd3d_free($1); + } diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 173ff170..df3b1a57 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -144,6 +144,30 @@ bool vkd3d_shader_message_context_copy_messages(struct vkd3d_shader_message_cont return true; } +void vkd3d_shader_vwarning(struct vkd3d_shader_message_context *context, const struct vkd3d_shader_location *location, + enum vkd3d_shader_error error, const char *format, va_list args) +{ + if (context->log_level < VKD3D_SHADER_LOG_WARNING) + return; + + if (location) + { + const char *source_name = location->source_name ? location->source_name : "<anonymous>"; + + if (location->line) + vkd3d_string_buffer_printf(&context->messages, "%s:%u:%u: W%04u: ", + source_name, location->line, location->column, error); + else + vkd3d_string_buffer_printf(&context->messages, "%s: W%04u: ", source_name, error); + } + else + { + vkd3d_string_buffer_printf(&context->messages, "W%04u: ", error); + } + vkd3d_string_buffer_vprintf(&context->messages, format, args); + vkd3d_string_buffer_printf(&context->messages, "\n"); +} + void vkd3d_shader_verror(struct vkd3d_shader_message_context *context, const struct vkd3d_shader_location *location, enum vkd3d_shader_error error, const char *format, va_list args) { diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 882a8060..b89d20e2 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -81,6 +81,10 @@ enum vkd3d_shader_error VKD3D_SHADER_ERROR_RS_MIXED_DESCRIPTOR_RANGE_TYPES = 3004, VKD3D_SHADER_ERROR_PP_INVALID_SYNTAX = 4000, + + VKD3D_SHADER_WARNING_PP_INVALID_DIRECTIVE = 4301, + VKD3D_SHADER_WARNING_PP_UNKNOWN_DIRECTIVE = 4303, + VKD3D_SHADER_WARNING_PP_UNTERMINATED_IF = 4305, }; enum VKD3D_SHADER_INSTRUCTION_HANDLER @@ -871,6 +875,8 @@ void vkd3d_shader_error(struct vkd3d_shader_message_context *context, const stru enum vkd3d_shader_error error, const char *format, ...) VKD3D_PRINTF_FUNC(4, 5) DECLSPEC_HIDDEN; void vkd3d_shader_verror(struct vkd3d_shader_message_context *context, const struct vkd3d_shader_location *location, enum vkd3d_shader_error error, const char *format, va_list args) DECLSPEC_HIDDEN; +void vkd3d_shader_vwarning(struct vkd3d_shader_message_context *context, const struct vkd3d_shader_location *location, + enum vkd3d_shader_error error, const char *format, va_list args) DECLSPEC_HIDDEN; int shader_extract_from_dxbc(const void *dxbc, size_t dxbc_length, struct vkd3d_shader_message_context *message_context, const char *source_name, diff --git a/tests/hlsl_d3d12.c b/tests/hlsl_d3d12.c index 61324fa9..77a7ea1a 100644 --- a/tests/hlsl_d3d12.c +++ b/tests/hlsl_d3d12.c @@ -414,7 +414,7 @@ static void test_preprocess(void) hr = D3DPreprocess(test_include_top, strlen(test_include_top), NULL, NULL, &test_include_fail, &blob, &errors); todo ok(hr == E_FAIL, "Got hr %#x.\n", hr); todo ok(blob == (ID3D10Blob *)0xdeadbeef, "Expected no compiled shader blob.\n"); - todo ok(!!errors, "Expected non-NULL error blob.\n"); + ok(!!errors, "Expected non-NULL error blob.\n"); if (errors) { if (vkd3d_test_state.debug_level) -- 2.29.2

Dec. 21, 2020

Re: [PATCH vkd3d v3 2/4] vkd3d-shader: Implement basic support for #if and #endif.

by Zebediah Figura (she/her)

On 12/21/20 3:11 AM, Matteo Bruni wrote: > Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> > --- > Apparently I never got the email so I'm adding a couple of comments > right here... > > preproc_was_writing() manages to trigger my review alarms every > time. The function is definitely correct though, and clearly so after > patch 4/4. So nothing to do but ignore the alarm. Yeah, I know :-/ I'm not sure there's a better option though, besides crawling the whole stack in preproc_is_writing(). Granted, that may not be awful for performance (who's going to stack that many #ifs?) > > +static uint32_t preproc_parse_integer(const char *s) > +{ > + uint32_t base = 10, ret = 0; > + int digit; > + > + if (s[0] == '0') > + { > + base = 8; > > I'd "++s;" here > > + if (s[1] == 'x' || s[1] == 'X') > + { > + base = 16; > + s += 2; > > And then replace this one with another "++s;" (fixing up the if > condition above to now check *s). > > + } > + } > + > + while ((digit = char_to_int(*s++)) >= 0) > + ret = ret * base + (uint32_t)digit; > + return ret; > +} > > AFAICS this should still work. It's all just a nitpick, it doesn't > really matter. > Sounds reasonable; I'll adjust that.

Dec. 21, 2020

[PATCH] conhost: Fix copy-paste typos in selection coordinates.

by Jacek Caban

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50052 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- programs/conhost/window.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)

Dec. 21, 2020

[PATCH] amstream/tests: Define NONAMELESSUNION.

by Zebediah Figura

Old versions of gcc allow nameless unions, but can't parse them in designated initializers. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50378 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/amstream/tests/amstream.c | 255 +++++++++++++++++---------------- 1 file changed, 128 insertions(+), 127 deletions(-) diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index 279b040339c..648d5ee93c3 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -19,6 +19,7 @@ */ #define COBJMACROS +#define NONAMELESSUNION #include "wine/test.h" #include "dshow.h" @@ -79,7 +80,7 @@ static const VIDEOINFO rgb565_video_info = .bmiHeader.biPlanes = 1, .bmiHeader.biBitCount = 16, .bmiHeader.biCompression = BI_BITFIELDS, - .dwBitMasks = {0xf800, 0x07e0, 0x001f}, + .u.dwBitMasks = {0xf800, 0x07e0, 0x001f}, }; static const VIDEOINFO rgb24_video_info = @@ -158,7 +159,7 @@ static const DDSURFACEDESC rgb8_format = .dwFlags = DDSD_PIXELFORMAT, .ddpfPixelFormat.dwSize = sizeof(DDPIXELFORMAT), .ddpfPixelFormat.dwFlags = DDPF_RGB | DDPF_PALETTEINDEXED8, - .ddpfPixelFormat.dwRGBBitCount = 8, + .ddpfPixelFormat.u1.dwRGBBitCount = 8, }; static const DDSURFACEDESC rgb555_format = @@ -167,10 +168,10 @@ static const DDSURFACEDESC rgb555_format = .dwFlags = DDSD_PIXELFORMAT, .ddpfPixelFormat.dwSize = sizeof(DDPIXELFORMAT), .ddpfPixelFormat.dwFlags = DDPF_RGB, - .ddpfPixelFormat.dwRGBBitCount = 16, - .ddpfPixelFormat.dwRBitMask = 0x7c00, - .ddpfPixelFormat.dwGBitMask = 0x03e0, - .ddpfPixelFormat.dwBBitMask = 0x001f, + .ddpfPixelFormat.u1.dwRGBBitCount = 16, + .ddpfPixelFormat.u2.dwRBitMask = 0x7c00, + .ddpfPixelFormat.u3.dwGBitMask = 0x03e0, + .ddpfPixelFormat.u4.dwBBitMask = 0x001f, }; static const DDSURFACEDESC rgb565_format = @@ -179,10 +180,10 @@ static const DDSURFACEDESC rgb565_format = .dwFlags = DDSD_PIXELFORMAT, .ddpfPixelFormat.dwSize = sizeof(DDPIXELFORMAT), .ddpfPixelFormat.dwFlags = DDPF_RGB, - .ddpfPixelFormat.dwRGBBitCount = 16, - .ddpfPixelFormat.dwRBitMask = 0xf800, - .ddpfPixelFormat.dwGBitMask = 0x07e0, - .ddpfPixelFormat.dwBBitMask = 0x001f, + .ddpfPixelFormat.u1.dwRGBBitCount = 16, + .ddpfPixelFormat.u2.dwRBitMask = 0xf800, + .ddpfPixelFormat.u3.dwGBitMask = 0x07e0, + .ddpfPixelFormat.u4.dwBBitMask = 0x001f, }; static const DDSURFACEDESC rgb24_format = @@ -191,10 +192,10 @@ static const DDSURFACEDESC rgb24_format = .dwFlags = DDSD_PIXELFORMAT, .ddpfPixelFormat.dwSize = sizeof(DDPIXELFORMAT), .ddpfPixelFormat.dwFlags = DDPF_RGB, - .ddpfPixelFormat.dwRGBBitCount = 24, - .ddpfPixelFormat.dwRBitMask = 0xff0000, - .ddpfPixelFormat.dwGBitMask = 0x00ff00, - .ddpfPixelFormat.dwBBitMask = 0x0000ff, + .ddpfPixelFormat.u1.dwRGBBitCount = 24, + .ddpfPixelFormat.u2.dwRBitMask = 0xff0000, + .ddpfPixelFormat.u3.dwGBitMask = 0x00ff00, + .ddpfPixelFormat.u4.dwBBitMask = 0x0000ff, }; static const DDSURFACEDESC rgb32_format = @@ -203,10 +204,10 @@ static const DDSURFACEDESC rgb32_format = .dwFlags = DDSD_PIXELFORMAT, .ddpfPixelFormat.dwSize = sizeof(DDPIXELFORMAT), .ddpfPixelFormat.dwFlags = DDPF_RGB, - .ddpfPixelFormat.dwRGBBitCount = 32, - .ddpfPixelFormat.dwRBitMask = 0xff0000, - .ddpfPixelFormat.dwGBitMask = 0x00ff00, - .ddpfPixelFormat.dwBBitMask = 0x0000ff, + .ddpfPixelFormat.u1.dwRGBBitCount = 32, + .ddpfPixelFormat.u2.dwRBitMask = 0xff0000, + .ddpfPixelFormat.u3.dwGBitMask = 0x00ff00, + .ddpfPixelFormat.u4.dwBBitMask = 0x0000ff, }; static const DDSURFACEDESC argb32_format = @@ -215,11 +216,11 @@ static const DDSURFACEDESC argb32_format = .dwFlags = DDSD_PIXELFORMAT, .ddpfPixelFormat.dwSize = sizeof(DDPIXELFORMAT), .ddpfPixelFormat.dwFlags = DDPF_RGB | DDPF_ALPHAPIXELS, - .ddpfPixelFormat.dwRGBBitCount = 32, - .ddpfPixelFormat.dwRBitMask = 0xff0000, - .ddpfPixelFormat.dwGBitMask = 0x00ff00, - .ddpfPixelFormat.dwBBitMask = 0x0000ff, - .ddpfPixelFormat.dwRGBAlphaBitMask = 0xff000000, + .ddpfPixelFormat.u1.dwRGBBitCount = 32, + .ddpfPixelFormat.u2.dwRBitMask = 0xff0000, + .ddpfPixelFormat.u3.dwGBitMask = 0x00ff00, + .ddpfPixelFormat.u4.dwBBitMask = 0x0000ff, + .ddpfPixelFormat.u5.dwRGBAlphaBitMask = 0xff000000, }; static const DDSURFACEDESC yuy2_format = @@ -229,7 +230,7 @@ static const DDSURFACEDESC yuy2_format = .ddpfPixelFormat.dwSize = sizeof(DDPIXELFORMAT), .ddpfPixelFormat.dwFlags = DDPF_FOURCC, .ddpfPixelFormat.dwFourCC = MAKEFOURCC('Y', 'U', 'Y', '2'), - .ddpfPixelFormat.dwYUVBitCount = 16, + .ddpfPixelFormat.u1.dwYUVBitCount = 16, }; static const DDSURFACEDESC yv12_format = @@ -239,7 +240,7 @@ static const DDSURFACEDESC yv12_format = .ddpfPixelFormat.dwSize = sizeof(DDPIXELFORMAT), .ddpfPixelFormat.dwFlags = DDPF_FOURCC, .ddpfPixelFormat.dwFourCC = MAKEFOURCC('Y', 'V', '1', '2'), - .ddpfPixelFormat.dwYUVBitCount = 12, + .ddpfPixelFormat.u1.dwYUVBitCount = 12, }; static const WCHAR primary_video_sink_id[] = L"I{A35FF56A-9FDA-11D0-8FDF-00C04FD9189D}"; @@ -3799,9 +3800,9 @@ static void test_ddrawstream_receive_connection(void) ok(hr == VFW_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr); format = yuy2_format; - format.ddpfPixelFormat.dwRBitMask = 0xf800; - format.ddpfPixelFormat.dwGBitMask = 0x07e0; - format.ddpfPixelFormat.dwBBitMask = 0x001f; + format.ddpfPixelFormat.u2.dwRBitMask = 0xf800; + format.ddpfPixelFormat.u3.dwGBitMask = 0x07e0; + format.ddpfPixelFormat.u4.dwBBitMask = 0x001f; hr = IDirectDrawMediaStream_SetFormat(ddraw_stream, &format, NULL); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -5116,7 +5117,7 @@ static void test_ddrawstream_set_format(void) .dwFlags = DDSD_PIXELFORMAT, .ddpfPixelFormat.dwSize = sizeof(DDPIXELFORMAT), .ddpfPixelFormat.dwFlags = DDPF_RGB | DDPF_PALETTEINDEXED1, - .ddpfPixelFormat.dwRGBBitCount = 1, + .ddpfPixelFormat.u1.dwRGBBitCount = 1, }; static const DDSURFACEDESC rgb2_format = { @@ -5124,7 +5125,7 @@ static void test_ddrawstream_set_format(void) .dwFlags = DDSD_PIXELFORMAT, .ddpfPixelFormat.dwSize = sizeof(DDPIXELFORMAT), .ddpfPixelFormat.dwFlags = DDPF_RGB | DDPF_PALETTEINDEXED2, - .ddpfPixelFormat.dwRGBBitCount = 2, + .ddpfPixelFormat.u1.dwRGBBitCount = 2, }; static const DDSURFACEDESC rgb4_format = { @@ -5132,7 +5133,7 @@ static void test_ddrawstream_set_format(void) .dwFlags = DDSD_PIXELFORMAT, .ddpfPixelFormat.dwSize = sizeof(DDPIXELFORMAT), .ddpfPixelFormat.dwFlags = DDPF_RGB | DDPF_PALETTEINDEXED4, - .ddpfPixelFormat.dwRGBBitCount = 4, + .ddpfPixelFormat.u1.dwRGBBitCount = 4, }; static const DDSURFACEDESC rgb4to8_format = { @@ -5140,7 +5141,7 @@ static void test_ddrawstream_set_format(void) .dwFlags = DDSD_PIXELFORMAT, .ddpfPixelFormat.dwSize = sizeof(DDPIXELFORMAT), .ddpfPixelFormat.dwFlags = DDPF_RGB | DDPF_PALETTEINDEXEDTO8, - .ddpfPixelFormat.dwRGBBitCount = 4, + .ddpfPixelFormat.u1.dwRGBBitCount = 4, }; static const DDSURFACEDESC rgb332_format = { @@ -5148,10 +5149,10 @@ static void test_ddrawstream_set_format(void) .dwFlags = DDSD_PIXELFORMAT, .ddpfPixelFormat.dwSize = sizeof(DDPIXELFORMAT), .ddpfPixelFormat.dwFlags = DDPF_RGB, - .ddpfPixelFormat.dwRGBBitCount = 8, - .ddpfPixelFormat.dwRBitMask = 0xe0, - .ddpfPixelFormat.dwGBitMask = 0x1c, - .ddpfPixelFormat.dwBBitMask = 0x03, + .ddpfPixelFormat.u1.dwRGBBitCount = 8, + .ddpfPixelFormat.u2.dwRBitMask = 0xe0, + .ddpfPixelFormat.u3.dwGBitMask = 0x1c, + .ddpfPixelFormat.u4.dwBBitMask = 0x03, }; IDirectDrawMediaStream *ddraw_stream; @@ -5231,19 +5232,19 @@ static void test_ddrawstream_set_format(void) check_ddrawstream_set_format(ddraw_stream, &format, NULL, DDERR_INVALIDSURFACETYPE); format = rgb565_format; - format.ddpfPixelFormat.dwRBitMask = 0x001f; - format.ddpfPixelFormat.dwGBitMask = 0x07e0; - format.ddpfPixelFormat.dwBBitMask = 0xf800; + format.ddpfPixelFormat.u2.dwRBitMask = 0x001f; + format.ddpfPixelFormat.u3.dwGBitMask = 0x07e0; + format.ddpfPixelFormat.u4.dwBBitMask = 0xf800; check_ddrawstream_set_format(ddraw_stream, &format, NULL, DDERR_INVALIDSURFACETYPE); format = rgb32_format; - format.ddpfPixelFormat.dwRBitMask = 0x00ff00; - format.ddpfPixelFormat.dwGBitMask = 0x0000ff; - format.ddpfPixelFormat.dwBBitMask = 0xff0000; + format.ddpfPixelFormat.u2.dwRBitMask = 0x00ff00; + format.ddpfPixelFormat.u3.dwGBitMask = 0x0000ff; + format.ddpfPixelFormat.u4.dwBBitMask = 0xff0000; check_ddrawstream_set_format(ddraw_stream, &format, NULL, DDERR_INVALIDSURFACETYPE); format = yuy2_format; - format.ddpfPixelFormat.dwYUVBitCount = 0; + format.ddpfPixelFormat.u1.dwYUVBitCount = 0; check_ddrawstream_set_format(ddraw_stream, &format, NULL, E_INVALIDARG); format = rgb32_format; @@ -5289,10 +5290,10 @@ static void test_ddrawstream_set_format(void) "Got subtype %s.\n", wine_dbgstr_guid(&source.source.pin.mt.subtype)); hr = IDirectDrawMediaStream_GetFormat(ddraw_stream, &current_format, NULL, &desired_format, NULL); ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(current_format.ddpfPixelFormat.dwRGBBitCount == 8, - "Got rgb bit count %u.\n", current_format.ddpfPixelFormat.dwRGBBitCount); - ok(desired_format.ddpfPixelFormat.dwRGBBitCount == 8, - "Got rgb bit count %u.\n", desired_format.ddpfPixelFormat.dwRGBBitCount); + ok(current_format.ddpfPixelFormat.u1.dwRGBBitCount == 8, + "Got rgb bit count %u.\n", current_format.ddpfPixelFormat.u1.dwRGBBitCount); + ok(desired_format.ddpfPixelFormat.u1.dwRGBBitCount == 8, + "Got rgb bit count %u.\n", desired_format.ddpfPixelFormat.u1.dwRGBBitCount); format = rgb555_format; format.dwFlags = 0; @@ -5312,10 +5313,10 @@ static void test_ddrawstream_set_format(void) "Got subtype %s.\n", wine_dbgstr_guid(&source.source.pin.mt.subtype)); hr = IDirectDrawMediaStream_GetFormat(ddraw_stream, &current_format, NULL, &desired_format, NULL); ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(current_format.ddpfPixelFormat.dwRGBBitCount == 16, - "Got rgb bit count %u.\n", current_format.ddpfPixelFormat.dwRGBBitCount); - ok(desired_format.ddpfPixelFormat.dwRGBBitCount == 16, - "Got rgb bit count %u.\n", desired_format.ddpfPixelFormat.dwRGBBitCount); + ok(current_format.ddpfPixelFormat.u1.dwRGBBitCount == 16, + "Got rgb bit count %u.\n", current_format.ddpfPixelFormat.u1.dwRGBBitCount); + ok(desired_format.ddpfPixelFormat.u1.dwRGBBitCount == 16, + "Got rgb bit count %u.\n", desired_format.ddpfPixelFormat.u1.dwRGBBitCount); video_info = rgb555_video_info; video_info.bmiHeader.biWidth = 222; @@ -7189,7 +7190,7 @@ static void test_ddrawstream_create_sample(void) ok(desc.dwWidth == 100, "Expected width 100, got %d.\n", desc.dwWidth); ok(desc.dwHeight == 100, "Expected height 100, got %d.\n", desc.dwHeight); ok(desc.ddpfPixelFormat.dwFlags == DDPF_RGB, "Expected format flags DDPF_RGB, got %#x.\n", desc.ddpfPixelFormat.dwFlags); - ok(desc.ddpfPixelFormat.dwRGBBitCount, "Expected non-zero RGB bit count.\n"); + ok(desc.ddpfPixelFormat.u1.dwRGBBitCount, "Expected non-zero RGB bit count.\n"); IDirectDrawSurface_Release(surface); IDirectDrawStreamSample_Release(sample); EXPECT_REF(stream, 3); @@ -7233,11 +7234,11 @@ static void test_ddrawstream_create_sample(void) desc.dwHeight = 400; desc.ddpfPixelFormat.dwSize = sizeof(DDPIXELFORMAT); desc.ddpfPixelFormat.dwFlags = DDPF_RGB | DDPF_ALPHAPIXELS; - desc.ddpfPixelFormat.dwRGBBitCount = 32; - desc.ddpfPixelFormat.dwRBitMask = 0xff0000; - desc.ddpfPixelFormat.dwGBitMask = 0x00ff00; - desc.ddpfPixelFormat.dwBBitMask = 0x0000ff; - desc.ddpfPixelFormat.dwRGBAlphaBitMask = 0xff000000; + desc.ddpfPixelFormat.u1.dwRGBBitCount = 32; + desc.ddpfPixelFormat.u2.dwRBitMask = 0xff0000; + desc.ddpfPixelFormat.u3.dwGBitMask = 0x00ff00; + desc.ddpfPixelFormat.u4.dwBBitMask = 0x0000ff; + desc.ddpfPixelFormat.u5.dwRGBAlphaBitMask = 0xff000000; desc.ddsCaps.dwCaps = DDSCAPS_SYSTEMMEMORY | DDSCAPS_OFFSCREENPLAIN; hr = IDirectDraw_CreateSurface(ddraw, &desc, &surface, NULL); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -7278,7 +7279,7 @@ static void test_ddrawstream_create_sample(void) desc.dwHeight = 400; desc.ddpfPixelFormat.dwSize = sizeof(DDPIXELFORMAT); desc.ddpfPixelFormat.dwFlags = DDPF_RGB | DDPF_PALETTEINDEXED4; - desc.ddpfPixelFormat.dwRGBBitCount = 4; + desc.ddpfPixelFormat.u1.dwRGBBitCount = 4; desc.ddsCaps.dwCaps = DDSCAPS_SYSTEMMEMORY | DDSCAPS_OFFSCREENPLAIN; hr = IDirectDraw_CreateSurface(ddraw, &desc, &surface, NULL); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -7304,10 +7305,10 @@ static void test_ddrawstream_create_sample(void) ok(desc.dwWidth == 100, "Got width %u.\n", desc.dwWidth); ok(desc.dwHeight == 100, "Got height %u.\n", desc.dwHeight); ok(desc.ddpfPixelFormat.dwFlags == DDPF_RGB, "Got flags %#x.\n", desc.ddpfPixelFormat.dwFlags); - ok(desc.ddpfPixelFormat.dwRGBBitCount == 32, "Got rgb bit count %u.\n", desc.ddpfPixelFormat.dwRGBBitCount); - ok(desc.ddpfPixelFormat.dwRBitMask == 0xff0000, "Got r bit mask %#x.\n", desc.ddpfPixelFormat.dwRBitMask); - ok(desc.ddpfPixelFormat.dwGBitMask == 0x00ff00, "Got g bit mask %#x.\n", desc.ddpfPixelFormat.dwGBitMask); - ok(desc.ddpfPixelFormat.dwBBitMask == 0x0000ff, "Got b bit mask %#x.\n", desc.ddpfPixelFormat.dwBBitMask); + ok(desc.ddpfPixelFormat.u1.dwRGBBitCount == 32, "Got rgb bit count %u.\n", desc.ddpfPixelFormat.u1.dwRGBBitCount); + ok(desc.ddpfPixelFormat.u2.dwRBitMask == 0xff0000, "Got r bit mask %#x.\n", desc.ddpfPixelFormat.u2.dwRBitMask); + ok(desc.ddpfPixelFormat.u3.dwGBitMask == 0x00ff00, "Got g bit mask %#x.\n", desc.ddpfPixelFormat.u3.dwGBitMask); + ok(desc.ddpfPixelFormat.u4.dwBBitMask == 0x0000ff, "Got b bit mask %#x.\n", desc.ddpfPixelFormat.u4.dwBBitMask); format1 = rgb8_format; format1.dwFlags |= DDSD_WIDTH; @@ -7333,30 +7334,30 @@ static void test_ddrawstream_create_sample(void) ok(desc.dwWidth == 333, "Got width %u.\n", desc.dwWidth); ok(desc.dwHeight == 444, "Got height %u.\n", desc.dwHeight); ok(desc.ddpfPixelFormat.dwFlags == DDPF_RGB, "Got flags %#x.\n", desc.ddpfPixelFormat.dwFlags); - ok(desc.ddpfPixelFormat.dwRGBBitCount == 32, "Got rgb bit count %u.\n", desc.ddpfPixelFormat.dwRGBBitCount); - ok(desc.ddpfPixelFormat.dwRBitMask == 0xff0000, "Got r bit mask %#x.\n", desc.ddpfPixelFormat.dwRBitMask); - ok(desc.ddpfPixelFormat.dwGBitMask == 0x00ff00, "Got g bit mask %#x.\n", desc.ddpfPixelFormat.dwGBitMask); - ok(desc.ddpfPixelFormat.dwBBitMask == 0x0000ff, "Got b bit mask %#x.\n", desc.ddpfPixelFormat.dwBBitMask); + ok(desc.ddpfPixelFormat.u1.dwRGBBitCount == 32, "Got rgb bit count %u.\n", desc.ddpfPixelFormat.u1.dwRGBBitCount); + ok(desc.ddpfPixelFormat.u2.dwRBitMask == 0xff0000, "Got r bit mask %#x.\n", desc.ddpfPixelFormat.u2.dwRBitMask); + ok(desc.ddpfPixelFormat.u3.dwGBitMask == 0x00ff00, "Got g bit mask %#x.\n", desc.ddpfPixelFormat.u3.dwGBitMask); + ok(desc.ddpfPixelFormat.u4.dwBBitMask == 0x0000ff, "Got b bit mask %#x.\n", desc.ddpfPixelFormat.u4.dwBBitMask); get_ddrawstream_create_sample_desc(&rgb565_format, NULL, NULL, &desc); ok(desc.dwWidth == 100, "Got width %u.\n", desc.dwWidth); ok(desc.dwHeight == 100, "Got height %u.\n", desc.dwHeight); ok(desc.ddpfPixelFormat.dwFlags == DDPF_RGB, "Got flags %#x.\n", desc.ddpfPixelFormat.dwFlags); - ok(desc.ddpfPixelFormat.dwRGBBitCount == 16, "Got rgb bit count %u.\n", desc.ddpfPixelFormat.dwRGBBitCount); - ok(desc.ddpfPixelFormat.dwRBitMask == 0xf800, "Got r bit mask %#x.\n", desc.ddpfPixelFormat.dwRBitMask); - ok(desc.ddpfPixelFormat.dwGBitMask == 0x07e0, "Got g bit mask %#x.\n", desc.ddpfPixelFormat.dwGBitMask); - ok(desc.ddpfPixelFormat.dwBBitMask == 0x001f, "Got b bit mask %#x.\n", desc.ddpfPixelFormat.dwBBitMask); + ok(desc.ddpfPixelFormat.u1.dwRGBBitCount == 16, "Got rgb bit count %u.\n", desc.ddpfPixelFormat.u1.dwRGBBitCount); + ok(desc.ddpfPixelFormat.u2.dwRBitMask == 0xf800, "Got r bit mask %#x.\n", desc.ddpfPixelFormat.u2.dwRBitMask); + ok(desc.ddpfPixelFormat.u3.dwGBitMask == 0x07e0, "Got g bit mask %#x.\n", desc.ddpfPixelFormat.u3.dwGBitMask); + ok(desc.ddpfPixelFormat.u4.dwBBitMask == 0x001f, "Got b bit mask %#x.\n", desc.ddpfPixelFormat.u4.dwBBitMask); get_ddrawstream_create_sample_desc(&argb32_format, NULL, NULL, &desc); ok(desc.dwWidth == 100, "Got width %u.\n", desc.dwWidth); ok(desc.dwHeight == 100, "Got height %u.\n", desc.dwHeight); ok(desc.ddpfPixelFormat.dwFlags == (DDPF_RGB | DDPF_ALPHAPIXELS), "Got flags %#x.\n", desc.ddpfPixelFormat.dwFlags); - ok(desc.ddpfPixelFormat.dwRGBBitCount == 32, "Got rgb bit count %u.\n", desc.ddpfPixelFormat.dwRGBBitCount); - ok(desc.ddpfPixelFormat.dwRBitMask == 0xff0000, "Got r bit mask %#x.\n", desc.ddpfPixelFormat.dwRBitMask); - ok(desc.ddpfPixelFormat.dwGBitMask == 0x00ff00, "Got g bit mask %#x.\n", desc.ddpfPixelFormat.dwGBitMask); - ok(desc.ddpfPixelFormat.dwBBitMask == 0x0000ff, "Got b bit mask %#x.\n", desc.ddpfPixelFormat.dwBBitMask); - ok(desc.ddpfPixelFormat.dwRGBAlphaBitMask == 0xff000000, - "Got alpha bit mask %#x.\n", desc.ddpfPixelFormat.dwBBitMask); + ok(desc.ddpfPixelFormat.u1.dwRGBBitCount == 32, "Got rgb bit count %u.\n", desc.ddpfPixelFormat.u1.dwRGBBitCount); + ok(desc.ddpfPixelFormat.u2.dwRBitMask == 0xff0000, "Got r bit mask %#x.\n", desc.ddpfPixelFormat.u2.dwRBitMask); + ok(desc.ddpfPixelFormat.u3.dwGBitMask == 0x00ff00, "Got g bit mask %#x.\n", desc.ddpfPixelFormat.u3.dwGBitMask); + ok(desc.ddpfPixelFormat.u4.dwBBitMask == 0x0000ff, "Got b bit mask %#x.\n", desc.ddpfPixelFormat.u4.dwBBitMask); + ok(desc.ddpfPixelFormat.u5.dwRGBAlphaBitMask == 0xff000000, + "Got alpha bit mask %#x.\n", desc.ddpfPixelFormat.u4.dwBBitMask); format1 = rgb32_format; format1.dwFlags |= DDSD_CAPS; @@ -7368,10 +7369,10 @@ static void test_ddrawstream_create_sample(void) ok(desc.dwWidth == 100, "Got width %u.\n", desc.dwWidth); ok(desc.dwHeight == 100, "Got height %u.\n", desc.dwHeight); ok(desc.ddpfPixelFormat.dwFlags == DDPF_RGB, "Got flags %#x.\n", desc.ddpfPixelFormat.dwFlags); - ok(desc.ddpfPixelFormat.dwRGBBitCount == 32, "Got rgb bit count %u.\n", desc.ddpfPixelFormat.dwRGBBitCount); - ok(desc.ddpfPixelFormat.dwRBitMask == 0xff0000, "Got r bit mask %#x.\n", desc.ddpfPixelFormat.dwRBitMask); - ok(desc.ddpfPixelFormat.dwGBitMask == 0x00ff00, "Got g bit mask %#x.\n", desc.ddpfPixelFormat.dwGBitMask); - ok(desc.ddpfPixelFormat.dwBBitMask == 0x0000ff, "Got b bit mask %#x.\n", desc.ddpfPixelFormat.dwBBitMask); + ok(desc.ddpfPixelFormat.u1.dwRGBBitCount == 32, "Got rgb bit count %u.\n", desc.ddpfPixelFormat.u1.dwRGBBitCount); + ok(desc.ddpfPixelFormat.u2.dwRBitMask == 0xff0000, "Got r bit mask %#x.\n", desc.ddpfPixelFormat.u2.dwRBitMask); + ok(desc.ddpfPixelFormat.u3.dwGBitMask == 0x00ff00, "Got g bit mask %#x.\n", desc.ddpfPixelFormat.u3.dwGBitMask); + ok(desc.ddpfPixelFormat.u4.dwBBitMask == 0x0000ff, "Got b bit mask %#x.\n", desc.ddpfPixelFormat.u4.dwBBitMask); format1 = rgb32_format; format1.dwFlags |= DDSD_CKSRCBLT; @@ -7382,10 +7383,10 @@ static void test_ddrawstream_create_sample(void) ok(desc.dwWidth == 100, "Got width %u.\n", desc.dwWidth); ok(desc.dwHeight == 100, "Got height %u.\n", desc.dwHeight); ok(desc.ddpfPixelFormat.dwFlags == DDPF_RGB, "Got flags %#x.\n", desc.ddpfPixelFormat.dwFlags); - ok(desc.ddpfPixelFormat.dwRGBBitCount == 32, "Got rgb bit count %u.\n", desc.ddpfPixelFormat.dwRGBBitCount); - ok(desc.ddpfPixelFormat.dwRBitMask == 0xff0000, "Got r bit mask %#x.\n", desc.ddpfPixelFormat.dwRBitMask); - ok(desc.ddpfPixelFormat.dwGBitMask == 0x00ff00, "Got g bit mask %#x.\n", desc.ddpfPixelFormat.dwGBitMask); - ok(desc.ddpfPixelFormat.dwBBitMask == 0x0000ff, "Got b bit mask %#x.\n", desc.ddpfPixelFormat.dwBBitMask); + ok(desc.ddpfPixelFormat.u1.dwRGBBitCount == 32, "Got rgb bit count %u.\n", desc.ddpfPixelFormat.u1.dwRGBBitCount); + ok(desc.ddpfPixelFormat.u2.dwRBitMask == 0xff0000, "Got r bit mask %#x.\n", desc.ddpfPixelFormat.u2.dwRBitMask); + ok(desc.ddpfPixelFormat.u3.dwGBitMask == 0x00ff00, "Got g bit mask %#x.\n", desc.ddpfPixelFormat.u3.dwGBitMask); + ok(desc.ddpfPixelFormat.u4.dwBBitMask == 0x0000ff, "Got b bit mask %#x.\n", desc.ddpfPixelFormat.u4.dwBBitMask); ok(desc.ddckCKSrcBlt.dwColorSpaceLowValue == 0, "Got color key low value %#x.\n", desc.ddckCKSrcBlt.dwColorSpaceLowValue); ok(desc.ddckCKSrcBlt.dwColorSpaceHighValue == 0, "Got color key high value %#x.\n", @@ -7557,7 +7558,7 @@ static void test_ddrawstreamsample_update(void) hr = IDirectDrawSurface_Lock(surface, NULL, &desc, 0, NULL); ok(hr == S_OK, "Got hr %#x.\n", hr); for (i = 0; i < 5; ++i) - memcpy((BYTE *)desc.lpSurface + i * desc.lPitch, initial_data, 12); + memcpy((BYTE *)desc.lpSurface + i * desc.u1.lPitch, initial_data, 12); hr = IDirectDrawSurface_Unlock(surface, desc.lpSurface); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -7574,11 +7575,11 @@ static void test_ddrawstreamsample_update(void) ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IDirectDrawSurface_Lock(surface, NULL, &desc, 0, NULL); ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(memcmp((BYTE *)desc.lpSurface + 0 * desc.lPitch, initial_data, 12) == 0, "Sample data didn't match.\n"); - ok(memcmp((BYTE *)desc.lpSurface + 1 * desc.lPitch, &test_data[0], 12) == 0, "Sample data didn't match.\n"); - ok(memcmp((BYTE *)desc.lpSurface + 2 * desc.lPitch, &test_data[12], 12) == 0, "Sample data didn't match.\n"); - ok(memcmp((BYTE *)desc.lpSurface + 3 * desc.lPitch, initial_data, 12) == 0, "Sample data didn't match.\n"); - ok(memcmp((BYTE *)desc.lpSurface + 4 * desc.lPitch, initial_data, 12) == 0, "Sample data didn't match.\n"); + ok(memcmp((BYTE *)desc.lpSurface + 0 * desc.u1.lPitch, initial_data, 12) == 0, "Sample data didn't match.\n"); + ok(memcmp((BYTE *)desc.lpSurface + 1 * desc.u1.lPitch, &test_data[0], 12) == 0, "Sample data didn't match.\n"); + ok(memcmp((BYTE *)desc.lpSurface + 2 * desc.u1.lPitch, &test_data[12], 12) == 0, "Sample data didn't match.\n"); + ok(memcmp((BYTE *)desc.lpSurface + 3 * desc.u1.lPitch, initial_data, 12) == 0, "Sample data didn't match.\n"); + ok(memcmp((BYTE *)desc.lpSurface + 4 * desc.u1.lPitch, initial_data, 12) == 0, "Sample data didn't match.\n"); hr = IDirectDrawSurface_Unlock(surface, desc.lpSurface); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -7605,7 +7606,7 @@ static void test_ddrawstreamsample_update(void) hr = IDirectDrawSurface_Lock(surface, NULL, &desc, 0, NULL); ok(hr == S_OK, "Got hr %#x.\n", hr); for (i = 0; i < 5; ++i) - memcpy((BYTE *)desc.lpSurface + i * desc.lPitch, initial_data, 12); + memcpy((BYTE *)desc.lpSurface + i * desc.u1.lPitch, initial_data, 12); hr = IDirectDrawSurface_Unlock(surface, desc.lpSurface); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -7622,11 +7623,11 @@ static void test_ddrawstreamsample_update(void) ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IDirectDrawSurface_Lock(surface, NULL, &desc, 0, NULL); ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(memcmp((BYTE *)desc.lpSurface + 0 * desc.lPitch, initial_data, 12) == 0, "Sample data didn't match.\n"); - ok(memcmp((BYTE *)desc.lpSurface + 1 * desc.lPitch, &test_data[12], 12) == 0, "Sample data didn't match.\n"); - ok(memcmp((BYTE *)desc.lpSurface + 2 * desc.lPitch, &test_data[0], 12) == 0, "Sample data didn't match.\n"); - ok(memcmp((BYTE *)desc.lpSurface + 3 * desc.lPitch, initial_data, 12) == 0, "Sample data didn't match.\n"); - ok(memcmp((BYTE *)desc.lpSurface + 4 * desc.lPitch, initial_data, 12) == 0, "Sample data didn't match.\n"); + ok(memcmp((BYTE *)desc.lpSurface + 0 * desc.u1.lPitch, initial_data, 12) == 0, "Sample data didn't match.\n"); + ok(memcmp((BYTE *)desc.lpSurface + 1 * desc.u1.lPitch, &test_data[12], 12) == 0, "Sample data didn't match.\n"); + ok(memcmp((BYTE *)desc.lpSurface + 2 * desc.u1.lPitch, &test_data[0], 12) == 0, "Sample data didn't match.\n"); + ok(memcmp((BYTE *)desc.lpSurface + 3 * desc.u1.lPitch, initial_data, 12) == 0, "Sample data didn't match.\n"); + ok(memcmp((BYTE *)desc.lpSurface + 4 * desc.u1.lPitch, initial_data, 12) == 0, "Sample data didn't match.\n"); hr = IDirectDrawSurface_Unlock(surface, desc.lpSurface); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -7658,7 +7659,7 @@ static void test_ddrawstreamsample_update(void) hr = IDirectDrawSurface_Lock(surface, NULL, &desc, 0, NULL); ok(hr == S_OK, "Got hr %#x.\n", hr); for (i = 0; i < 5; ++i) - memcpy((BYTE *)desc.lpSurface + i * desc.lPitch, initial_data, 12); + memcpy((BYTE *)desc.lpSurface + i * desc.u1.lPitch, initial_data, 12); hr = IDirectDrawSurface_Unlock(surface, desc.lpSurface); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -7674,11 +7675,11 @@ static void test_ddrawstreamsample_update(void) ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IDirectDrawSurface_Lock(surface, NULL, &desc, 0, NULL); ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(memcmp((BYTE *)desc.lpSurface + 0 * desc.lPitch, initial_data, 12) == 0, "Sample data didn't match.\n"); - ok(memcmp((BYTE *)desc.lpSurface + 1 * desc.lPitch, &test_data[12], 12) == 0, "Sample data didn't match.\n"); - ok(memcmp((BYTE *)desc.lpSurface + 2 * desc.lPitch, &test_data[0], 12) == 0, "Sample data didn't match.\n"); - ok(memcmp((BYTE *)desc.lpSurface + 3 * desc.lPitch, initial_data, 12) == 0, "Sample data didn't match.\n"); - ok(memcmp((BYTE *)desc.lpSurface + 4 * desc.lPitch, initial_data, 12) == 0, "Sample data didn't match.\n"); + ok(memcmp((BYTE *)desc.lpSurface + 0 * desc.u1.lPitch, initial_data, 12) == 0, "Sample data didn't match.\n"); + ok(memcmp((BYTE *)desc.lpSurface + 1 * desc.u1.lPitch, &test_data[12], 12) == 0, "Sample data didn't match.\n"); + ok(memcmp((BYTE *)desc.lpSurface + 2 * desc.u1.lPitch, &test_data[0], 12) == 0, "Sample data didn't match.\n"); + ok(memcmp((BYTE *)desc.lpSurface + 3 * desc.u1.lPitch, initial_data, 12) == 0, "Sample data didn't match.\n"); + ok(memcmp((BYTE *)desc.lpSurface + 4 * desc.u1.lPitch, initial_data, 12) == 0, "Sample data didn't match.\n"); hr = IDirectDrawSurface_Unlock(surface, desc.lpSurface); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -7707,7 +7708,7 @@ static void test_ddrawstreamsample_update(void) hr = IDirectDrawSurface_Lock(surface, NULL, &desc, 0, NULL); ok(hr == S_OK, "Got hr %#x.\n", hr); for (i = 0; i < 5; ++i) - memcpy((BYTE *)desc.lpSurface + i * desc.lPitch, initial_data, 12); + memcpy((BYTE *)desc.lpSurface + i * desc.u1.lPitch, initial_data, 12); hr = IDirectDrawSurface_Unlock(surface, desc.lpSurface); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -7723,11 +7724,11 @@ static void test_ddrawstreamsample_update(void) ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IDirectDrawSurface_Lock(surface, NULL, &desc, 0, NULL); ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(memcmp((BYTE *)desc.lpSurface + 0 * desc.lPitch, initial_data, 12) == 0, "Sample data didn't match.\n"); - ok(memcmp((BYTE *)desc.lpSurface + 1 * desc.lPitch, &test_data[12], 12) == 0, "Sample data didn't match.\n"); - ok(memcmp((BYTE *)desc.lpSurface + 2 * desc.lPitch, &test_data[0], 12) == 0, "Sample data didn't match.\n"); - ok(memcmp((BYTE *)desc.lpSurface + 3 * desc.lPitch, initial_data, 12) == 0, "Sample data didn't match.\n"); - ok(memcmp((BYTE *)desc.lpSurface + 4 * desc.lPitch, initial_data, 12) == 0, "Sample data didn't match.\n"); + ok(memcmp((BYTE *)desc.lpSurface + 0 * desc.u1.lPitch, initial_data, 12) == 0, "Sample data didn't match.\n"); + ok(memcmp((BYTE *)desc.lpSurface + 1 * desc.u1.lPitch, &test_data[12], 12) == 0, "Sample data didn't match.\n"); + ok(memcmp((BYTE *)desc.lpSurface + 2 * desc.u1.lPitch, &test_data[0], 12) == 0, "Sample data didn't match.\n"); + ok(memcmp((BYTE *)desc.lpSurface + 3 * desc.u1.lPitch, initial_data, 12) == 0, "Sample data didn't match.\n"); + ok(memcmp((BYTE *)desc.lpSurface + 4 * desc.u1.lPitch, initial_data, 12) == 0, "Sample data didn't match.\n"); hr = IDirectDrawSurface_Unlock(surface, desc.lpSurface); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -7743,7 +7744,7 @@ static void test_ddrawstreamsample_update(void) hr = IDirectDrawSurface_Lock(surface, NULL, &desc, 0, NULL); ok(hr == S_OK, "Got hr %#x.\n", hr); for (i = 0; i < 5; ++i) - memcpy((BYTE *)desc.lpSurface + i * desc.lPitch, initial_data, 12); + memcpy((BYTE *)desc.lpSurface + i * desc.u1.lPitch, initial_data, 12); hr = IDirectDrawSurface_Unlock(surface, desc.lpSurface); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -7755,18 +7756,18 @@ static void test_ddrawstreamsample_update(void) hr = IDirectDrawSurface_Lock(surface, NULL, &desc, 0, NULL); ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(memcmp((BYTE *)desc.lpSurface + 0 * desc.lPitch, initial_data, 12) == 0, "Sample data didn't match.\n"); - ok(memcmp((BYTE *)desc.lpSurface + 1 * desc.lPitch, &test_data[12], 12) == 0, "Sample data didn't match.\n"); - ok(memcmp((BYTE *)desc.lpSurface + 2 * desc.lPitch, &test_data[0], 12) == 0, "Sample data didn't match.\n"); - ok(memcmp((BYTE *)desc.lpSurface + 3 * desc.lPitch, initial_data, 12) == 0, "Sample data didn't match.\n"); - ok(memcmp((BYTE *)desc.lpSurface + 4 * desc.lPitch, initial_data, 12) == 0, "Sample data didn't match.\n"); + ok(memcmp((BYTE *)desc.lpSurface + 0 * desc.u1.lPitch, initial_data, 12) == 0, "Sample data didn't match.\n"); + ok(memcmp((BYTE *)desc.lpSurface + 1 * desc.u1.lPitch, &test_data[12], 12) == 0, "Sample data didn't match.\n"); + ok(memcmp((BYTE *)desc.lpSurface + 2 * desc.u1.lPitch, &test_data[0], 12) == 0, "Sample data didn't match.\n"); + ok(memcmp((BYTE *)desc.lpSurface + 3 * desc.u1.lPitch, initial_data, 12) == 0, "Sample data didn't match.\n"); + ok(memcmp((BYTE *)desc.lpSurface + 4 * desc.u1.lPitch, initial_data, 12) == 0, "Sample data didn't match.\n"); hr = IDirectDrawSurface_Unlock(surface, desc.lpSurface); ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IDirectDrawSurface_Lock(surface, NULL, &desc, 0, NULL); ok(hr == S_OK, "Got hr %#x.\n", hr); for (i = 0; i < 5; ++i) - memcpy((BYTE *)desc.lpSurface + i * desc.lPitch, initial_data, 12); + memcpy((BYTE *)desc.lpSurface + i * desc.u1.lPitch, initial_data, 12); hr = IDirectDrawSurface_Unlock(surface, desc.lpSurface); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -7778,11 +7779,11 @@ static void test_ddrawstreamsample_update(void) hr = IDirectDrawSurface_Lock(surface, NULL, &desc, 0, NULL); ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(memcmp((BYTE *)desc.lpSurface + 0 * desc.lPitch, initial_data, 12) == 0, "Sample data didn't match.\n"); - ok(memcmp((BYTE *)desc.lpSurface + 1 * desc.lPitch, &test_data[12], 12) == 0, "Sample data didn't match.\n"); - ok(memcmp((BYTE *)desc.lpSurface + 2 * desc.lPitch, &test_data[0], 12) == 0, "Sample data didn't match.\n"); - ok(memcmp((BYTE *)desc.lpSurface + 3 * desc.lPitch, initial_data, 12) == 0, "Sample data didn't match.\n"); - ok(memcmp((BYTE *)desc.lpSurface + 4 * desc.lPitch, initial_data, 12) == 0, "Sample data didn't match.\n"); + ok(memcmp((BYTE *)desc.lpSurface + 0 * desc.u1.lPitch, initial_data, 12) == 0, "Sample data didn't match.\n"); + ok(memcmp((BYTE *)desc.lpSurface + 1 * desc.u1.lPitch, &test_data[12], 12) == 0, "Sample data didn't match.\n"); + ok(memcmp((BYTE *)desc.lpSurface + 2 * desc.u1.lPitch, &test_data[0], 12) == 0, "Sample data didn't match.\n"); + ok(memcmp((BYTE *)desc.lpSurface + 3 * desc.u1.lPitch, initial_data, 12) == 0, "Sample data didn't match.\n"); + ok(memcmp((BYTE *)desc.lpSurface + 4 * desc.u1.lPitch, initial_data, 12) == 0, "Sample data didn't match.\n"); hr = IDirectDrawSurface_Unlock(surface, desc.lpSurface); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -7811,7 +7812,7 @@ static void test_ddrawstreamsample_update(void) hr = IDirectDrawSurface_Lock(surface, NULL, &desc, 0, NULL); ok(hr == S_OK, "Got hr %#x.\n", hr); for (i = 0; i < 5; ++i) - memcpy((BYTE *)desc.lpSurface + i * desc.lPitch, initial_data, 12); + memcpy((BYTE *)desc.lpSurface + i * desc.u1.lPitch, initial_data, 12); hr = IDirectDrawSurface_Unlock(surface, desc.lpSurface); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -7837,7 +7838,7 @@ static void test_ddrawstreamsample_update(void) hr = IDirectDrawSurface_Lock(surface, NULL, &desc, 0, NULL); ok(hr == S_OK, "Got hr %#x.\n", hr); for (i = 0; i < 5; ++i) - ok(memcmp((BYTE *)desc.lpSurface + i * desc.lPitch, initial_data, 12) == 0, "Sample data didn't match.\n"); + ok(memcmp((BYTE *)desc.lpSurface + i * desc.u1.lPitch, initial_data, 12) == 0, "Sample data didn't match.\n"); hr = IDirectDrawSurface_Unlock(surface, desc.lpSurface); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -7848,11 +7849,11 @@ static void test_ddrawstreamsample_update(void) hr = IDirectDrawSurface_Lock(surface, NULL, &desc, 0, NULL); ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(memcmp((BYTE *)desc.lpSurface + 0 * desc.lPitch, initial_data, 12) == 0, "Sample data didn't match.\n"); - ok(memcmp((BYTE *)desc.lpSurface + 1 * desc.lPitch, &test_data[12], 12) == 0, "Sample data didn't match.\n"); - ok(memcmp((BYTE *)desc.lpSurface + 2 * desc.lPitch, &test_data[0], 12) == 0, "Sample data didn't match.\n"); - ok(memcmp((BYTE *)desc.lpSurface + 3 * desc.lPitch, initial_data, 12) == 0, "Sample data didn't match.\n"); - ok(memcmp((BYTE *)desc.lpSurface + 4 * desc.lPitch, initial_data, 12) == 0, "Sample data didn't match.\n"); + ok(memcmp((BYTE *)desc.lpSurface + 0 * desc.u1.lPitch, initial_data, 12) == 0, "Sample data didn't match.\n"); + ok(memcmp((BYTE *)desc.lpSurface + 1 * desc.u1.lPitch, &test_data[12], 12) == 0, "Sample data didn't match.\n"); + ok(memcmp((BYTE *)desc.lpSurface + 2 * desc.u1.lPitch, &test_data[0], 12) == 0, "Sample data didn't match.\n"); + ok(memcmp((BYTE *)desc.lpSurface + 3 * desc.u1.lPitch, initial_data, 12) == 0, "Sample data didn't match.\n"); + ok(memcmp((BYTE *)desc.lpSurface + 4 * desc.u1.lPitch, initial_data, 12) == 0, "Sample data didn't match.\n"); hr = IDirectDrawSurface_Unlock(surface, desc.lpSurface); ok(hr == S_OK, "Got hr %#x.\n", hr); -- 2.29.2

Dec. 21, 2020

Re: [PATCH 2/2] include: Add IAMCameraControl definition in axextend.idl.

by Zebediah Figura (she/her)

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com>

Dec. 21, 2020

Re: Looking for TestBot help

by Francois Gouget

On Mon, 21 Dec 2020, Zhiyi Zhang wrote: [...] > > * Write or find a Windows tool to automatically take a screenshot every > > few seconds and deduplicate identical screenshots. The requirements > > are: > I can help out with this one. I had been debugging some screenshot problems on > Wine and already have a few code snippets to do screenshots and save them. That's great. > For this tool, I'm thinking doing it generally the following way: > 1. Capture the whole virtual screen and save it in a png in memory. > 2. Compare the png in 1, if it's not equal to the previous screenshot, > save it to disk in a folder. Yes, that sounds good. [...] > I wonder if it would be better if we do video capture instead? If we > don't plan on keeping the video forever, I think a 2 mins video > shouldn't be too large. A few megabytes I think, depending on the > video format. Video would obviously be nice but the VMs typically don't have access to a graphics card to offload the video compression. So I worry that the CPU usage would be too high and/or interfere with the tests. Also compression would have to happen in real time because we don't want the VM to be stuck compressing the video for 5 minutes after the test is done. That pretty much means MJPEG [1] but then you either get large files or bad quality. Maybe it could work if we put a frontend detecting duplicate frames but then I don't know how we could preserve the frame interval in the MJPEG file [2]. Disk usage could also be an issue though a video encoder should allow us to solve that by lowering the bitrate, assuming we can still get a reasonable quality. Bandwidth usage may be more of an issue, both in terms of billing, and in terms of transfer time (from the VM hosts to the offsite TestBot server). But maybe I'm overestimating the challenges of video encoding. Currently my plan would be to do tests and then set the screenshot interval between 1 and 10 seconds based on the results. [1] Some internet forums suggest huffyuv or lagarith but neither provides interframe compression which I think would be very beneficial in our case (even if it's very basic like doing a simple diff). The other issue as soon as one strays away from the 'mainstream encoders' is browser support. [2] It seems like variable rate 'mjpeg' should be possible with a 'modern container' like mkv and mp4 (the latter being probably more compatible with browsers). -- Francois Gouget <fgouget(a)free.fr> http://fgouget.free.fr/ Any sufficiently advanced bug is indistinguishable from a feature. -- from some indian guy

Dec. 21, 2020

[PATCH 2/2] include: Add IAMCameraControl definition in axextend.idl.

by Biswapriyo Nath

Dec. 21, 2020

[PATCH 1/2] include: Add more Media Foundation error codes.

by Biswapriyo Nath

Dec. 21, 2020

Re: Looking for TestBot help

by Francois Gouget

On Sun, 20 Dec 2020, Zebediah Figura (she/her) wrote: > > On 12/17/20 3:28 AM, Francois Gouget wrote: > > > > In these freezing times I'm looking for volunteers to help with three > > TestBot related tasks: > > > > * Modify WineTest to detect which tests can be run by running > > 'xxx_test --list' and automatically detecting and dismissing the > > "Missing dll" / "Missing entrypoint" dialogs. > > Are we sure we want to do it this way? It seems potentially quite fragile... I think it would be more robust than what we're doing now which is trying to predict whether the linker will find all the dependencies the test needs, taking into account manifests, recursive dll dependencies, etc. I expect it would also be less code and less duplication. -- Francois Gouget <fgouget(a)free.fr> http://fgouget.free.fr/ All generalizations are false, including this one. -- Mark Twain

Dec. 21, 2020

[PATCH] d3dx9: Avoid closing invalid handles.

by Akihiro Sagawa

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50373 Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/d3dx9_36/util.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)

Dec. 21, 2020