- Wine-Devel - list.winehq.org

[PATCH v2 3/5] win32u: Move NtUserGetKeyboardLayoutName implementation from user32.
by Jacek Caban Dec. 3, 2021

Dec. 3, 2021

2 1

[PATCH v2 2/5] win32u: Move NtUserGetCursor implementation from user32.
by Jacek Caban Dec. 3, 2021

Dec. 3, 2021

2 1

[PATCH v2 1/5] win32u: Move NtUserShowCursor implementation from user32.
by Jacek Caban Dec. 3, 2021

Dec. 3, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/cursoricon.c | 27 ---------------- dlls/user32/user32.spec | 2 +- dlls/win32u/Makefile.in | 1 + dlls/win32u/cursoricon.c | 63 ++++++++++++++++++++++++++++++++++++ dlls/win32u/driver.c | 6 ++++ dlls/win32u/gdiobj.c | 1 + dlls/win32u/win32u.spec | 2 +- dlls/win32u/win32u_private.h | 1 + dlls/win32u/wrappers.c | 5 +++ 9 files changed, 79 insertions(+), 29 deletions(-) create mode 100644 dlls/win32u/cursoricon.c

2 1

[PATCH] include: Add print document package interfaces.
by Nikolay Sivov Dec. 3, 2021

Dec. 3, 2021

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- include/Makefile.in | 1 + include/documenttarget.idl | 113 +++++++++++++++++++++++++++++++++++++ 2 files changed, 114 insertions(+) create mode 100644 include/documenttarget.idl diff --git a/include/Makefile.in b/include/Makefile.in index a869ae4bc73..c99b0e1e1c1 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -245,6 +245,7 @@ SOURCES = \ dmusics.h \ docobj.idl \ docobjectservice.idl \ + documenttarget.idl \ downloadmgr.idl \ dpaddr.h \ dpfilter.h \ diff --git a/include/documenttarget.idl b/include/documenttarget.idl new file mode 100644 index 00000000000..17c7cefe5b5 --- /dev/null +++ b/include/documenttarget.idl @@ -0,0 +1,113 @@ +/* + * Copyright 2021 Nikolay Sivov for CodeWeavers + * + * 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 + */ + +import "oaidl.idl"; + +[ + object, + uuid(1b8efec4-3019-4c27-964e-367202156906), +] +interface IPrintDocumentPackageTarget : IUnknown +{ + HRESULT GetPackageTargetTypes( + [out] UINT32 *targetCount, + [out, size_is(, *targetCount)] GUID **targetTypes + ); + + HRESULT GetPackageTarget( + [in] REFGUID guidTargetType, + [in] REFIID riid, + [out, iid_is(riid)] void **ppvTarget + ); + + HRESULT Cancel(); +} + +typedef [v1_enum] enum PrintDocumentPackageCompletion +{ + PrintDocumentPackageCompletion_InProgress, + PrintDocumentPackageCompletion_Completed, + PrintDocumentPackageCompletion_Canceled, + PrintDocumentPackageCompletion_Failed +} PrintDocumentPackageCompletion; + +typedef struct +{ + UINT32 JobId; + INT32 CurrentDocument; + INT32 CurrentPage; + INT32 CurrentPageTotal; + PrintDocumentPackageCompletion Completion; + HRESULT PackageStatus; +} PrintDocumentPackageStatus; + +[ + object, + dual, + nonextensible, + uuid(ed90c8ad-5c34-4d05-a1ec-0e8a9b3ad7af), +] +interface IPrintDocumentPackageStatusEvent : IDispatch +{ + [id(1)] + HRESULT PackageStatusUpdated( + [in] PrintDocumentPackageStatus *packageStatus + ); +} + +[ + object, + uuid(d2959bf7-b31b-4a3d-9600-712eb1335ba4), +] +interface IPrintDocumentPackageTargetFactory : IUnknown +{ + HRESULT CreateDocumentPackageTargetForPrintJob( + [in, string] LPCWSTR printerName, + [in, string] LPCWSTR jobName, + [in] IStream *jobOutputStream, + [in] IStream *jobPrintTicketStream, + [out] IPrintDocumentPackageTarget **docPackageTarget + ); +} + +[ + version(1.0), + uuid(410d76f7-8bb5-4a7d-9d37-9c71b1b14d14), +] +library PrintDocumentTargetLib +{ + +[ + noncreatable, + uuid(4842669e-9947-46ea-8ba2-d8cce432c2ca), +] +coclass PrintDocumentPackageTarget +{ + [default] interface IPrintDocumentPackageTarget; + [source] dispinterface IPrintDocumentPackageStatusEvent; +} + +[ + uuid(348ef17d-6c81-4982-92b4-ee188a43867a) +] +coclass PrintDocumentPackageTargetFactory +{ + [default] interface IPrintDocumentPackageTargetFactory; +} + +} /* library */ -- 2.33.0

1 0

[PATCH] mfplat: Trace types passed to MFTEnum*.
by Nikolay Sivov Dec. 3, 2021

Dec. 3, 2021

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfplat/main.c | 29 +++++++++++++++++++++++------ 1 file changed, 23 insertions(+), 6 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index a70d7d401a1..978340a7ece 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -90,6 +90,12 @@ struct mft_registration BOOL local; }; +static const char *debugstr_reg_typeinfo(const MFT_REGISTER_TYPE_INFO *info) +{ + return info ? wine_dbg_sprintf("%p{%s,%s}", info, debugstr_mf_guid(&info->guidMajorType), + debugstr_mf_guid(&info->guidSubtype)) : wine_dbg_sprintf("%p", info); +} + static CRITICAL_SECTION local_mfts_section = { NULL, -1, 0, 0, 0, 0 }; static struct list local_mfts = LIST_INIT(local_mfts); @@ -1331,8 +1337,8 @@ HRESULT WINAPI MFTEnum(GUID category, UINT32 flags, MFT_REGISTER_TYPE_INFO *inpu struct list mfts; HRESULT hr; - TRACE("%s, %#x, %p, %p, %p, %p, %p.\n", debugstr_guid(&category), flags, input_type, output_type, attributes, - clsids, count); + TRACE("%s, %#x, %s, %s, %p, %p, %p.\n", debugstr_mf_guid(&category), flags, debugstr_reg_typeinfo(input_type), + debugstr_reg_typeinfo(output_type), attributes, clsids, count); if (!clsids || !count) return E_INVALIDARG; @@ -1377,7 +1383,8 @@ HRESULT WINAPI MFTEnum(GUID category, UINT32 flags, MFT_REGISTER_TYPE_INFO *inpu HRESULT WINAPI MFTEnumEx(GUID category, UINT32 flags, const MFT_REGISTER_TYPE_INFO *input_type, const MFT_REGISTER_TYPE_INFO *output_type, IMFActivate ***activate, UINT32 *count) { - TRACE("%s, %#x, %p, %p, %p, %p.\n", debugstr_guid(&category), flags, input_type, output_type, activate, count); + TRACE("%s, %#x, %s, %s, %p, %p.\n", debugstr_mf_guid(&category), flags, debugstr_reg_typeinfo(input_type), + debugstr_reg_typeinfo(output_type), activate, count); return mft_enum(category, flags, input_type, output_type, NULL, activate, count); } @@ -1388,8 +1395,8 @@ HRESULT WINAPI MFTEnumEx(GUID category, UINT32 flags, const MFT_REGISTER_TYPE_IN HRESULT WINAPI MFTEnum2(GUID category, UINT32 flags, const MFT_REGISTER_TYPE_INFO *input_type, const MFT_REGISTER_TYPE_INFO *output_type, IMFAttributes *attributes, IMFActivate ***activate, UINT32 *count) { - TRACE("%s, %#x, %p, %p, %p, %p, %p.\n", debugstr_guid(&category), flags, input_type, output_type, attributes, - activate, count); + TRACE("%s, %#x, %s, %s, %p, %p, %p.\n", debugstr_mf_guid(&category), flags, debugstr_reg_typeinfo(input_type), + debugstr_reg_typeinfo(output_type), attributes, activate, count); if (attributes) FIXME("Ignoring attributes.\n"); @@ -1903,7 +1910,9 @@ const char *debugstr_mf_guid(const GUID *guid) X(MFVideoFormat_RGB565), X(MFVideoFormat_RGB555), X(MF_DEVSOURCE_ATTRIBUTE_SOURCE_TYPE_AUDCAP_GUID), + X(MFT_CATEGORY_MULTIPLEXER), X(MFVideoFormat_A2R10G10B10), + X(MFT_CATEGORY_VIDEO_EFFECT), X(MFMediaType_Script), X(MFMediaType_Image), X(MFMediaType_HTML), @@ -1923,8 +1932,10 @@ const char *debugstr_mf_guid(const GUID *guid) X(MFVideoFormat_H265), X(MFVideoFormat_HEVC), X(MFVideoFormat_HEVC_ES), + X(MFT_CATEGORY_AUDIO_EFFECT), X(MFVideoFormat_I420), X(MFVideoFormat_IYUV), + X(MFT_CATEGORY_VIDEO_DECODER), X(MFVideoFormat_M4S2), X(MFVideoFormat_MJPG), X(MFVideoFormat_MP43), @@ -1937,8 +1948,8 @@ const char *debugstr_mf_guid(const GUID *guid) X(MFVideoFormat_NV12), X(MFVideoFormat_ORAW), X(MFAudioFormat_Opus), - X(MFVideoFormat_D16), X(MFAudioFormat_MPEG), + X(MFVideoFormat_D16), X(MFVideoFormat_P010), X(MFVideoFormat_P016), X(MFVideoFormat_P210), @@ -1953,6 +1964,7 @@ const char *debugstr_mf_guid(const GUID *guid) X(MFVideoFormat_WMV2), X(MFVideoFormat_WMV3), X(MFVideoFormat_WVC1), + X(MFT_CATEGORY_OTHER), X(MFVideoFormat_Y210), X(MFVideoFormat_Y216), X(MFVideoFormat_Y410), @@ -1986,7 +1998,9 @@ const char *debugstr_mf_guid(const GUID *guid) X(MFVideoFormat_v410), X(MFMediaType_Video), X(MFAudioFormat_AAC_HDCP), + X(MFT_CATEGORY_DEMULTIPLEXER), X(MF_DEVSOURCE_ATTRIBUTE_SOURCE_TYPE_VIDCAP_GUID), + X(MFT_CATEGORY_VIDEO_ENCODER), X(MFAudioFormat_Dolby_AC3_HDCP), X(MFMediaType_Subtitle), X(MFMediaType_Stream), @@ -1997,7 +2011,9 @@ const char *debugstr_mf_guid(const GUID *guid) X(MFAudioFormat_FLAC), X(MFAudioFormat_Dolby_DDPlus), X(MFMediaType_MultiplexedFrames), + X(MFT_CATEGORY_AUDIO_DECODER), X(MFAudioFormat_Base_HDCP), + X(MFT_CATEGORY_AUDIO_ENCODER), X(MFVideoFormat_Base_HDCP), X(MFVideoFormat_H264_HDCP), X(MFVideoFormat_HEVC_HDCP), @@ -2005,6 +2021,7 @@ const char *debugstr_mf_guid(const GUID *guid) X(MFMediaType_Protected), X(MFVideoFormat_H264_ES), X(MFMediaType_Perception), + X(MFT_CATEGORY_VIDEO_PROCESSOR), #undef X }; struct guid_def *ret = NULL; -- 2.33.0

1 0

[PATCH] wbemprox: Add a stub MSSMBios_RawSMBiosTables implementation.
by Hans Leidekker Dec. 3, 2021

Dec. 3, 2021

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51946 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/wbemprox/builtin.c | 22 +++++++++++++++++++++- dlls/wbemprox/tests/query.c | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 57 insertions(+), 1 deletion(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 3fccd3fb600..6b63c744b69 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -358,6 +358,10 @@ static const struct column col_quickfixengineering[] = { L"Caption", CIM_STRING }, { L"HotFixID", CIM_STRING|COL_FLAG_KEY }, }; +static const struct column col_rawsmbiostables[] = +{ + { L"SMBiosData", CIM_UINT8|CIM_FLAG_ARRAY }, +}; static const struct column col_service[] = { { L"AcceptPause", CIM_BOOLEAN }, @@ -776,6 +780,10 @@ struct record_quickfixengineering const WCHAR *caption; const WCHAR *hotfixid; }; +struct record_rawsmbiostables +{ + const struct array *smbiosdata; +}; struct record_service { int accept_pause; @@ -953,11 +961,18 @@ static const struct record_physicalmedia data_physicalmedia[] = { { L"WINEHDISK", L"\\\\.\\PHYSICALDRIVE0" } }; + +static const struct record_rawsmbiostables data_rawsmbiostables[] = +{ + { 0 }, +}; + static const struct record_qualifier data_qualifier[] = { { L"__WIN32_PROCESS_GETOWNER_OUT", L"User", CIM_SINT32, FLAVOR_ID, L"ID", 0 }, { L"__WIN32_PROCESS_GETOWNER_OUT", L"Domain", CIM_SINT32, FLAVOR_ID, L"ID", 1 } }; + static const struct record_quickfixengineering data_quickfixengineering[] = { { L"http://winehq.org", L"KB1234567" }, @@ -4128,6 +4143,11 @@ static struct table cimv2_builtin_classes[] = { L"Win32_VideoController", C(col_videocontroller), 0, 0, NULL, fill_videocontroller }, { L"Win32_WinSAT", C(col_winsat), D(data_winsat) }, }; + +static struct table wmi_builtin_classes[] = +{ + { L"MSSMBios_RawSMBiosTables", C(col_rawsmbiostables), D(data_rawsmbiostables) }, +}; #undef C #undef D @@ -4141,7 +4161,7 @@ builtin_namespaces[WBEMPROX_NAMESPACE_LAST] = { {L"cimv2", cimv2_builtin_classes, ARRAY_SIZE(cimv2_builtin_classes)}, {L"Microsoft\\Windows\\Storage", NULL, 0}, - {L"wmi", NULL, 0}, + {L"wmi", wmi_builtin_classes, ARRAY_SIZE(wmi_builtin_classes)}, }; void init_table_list( void ) diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 577a352c26f..912671f4ad2 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -2102,6 +2102,41 @@ static void test_empty_namespace( IWbemLocator *locator ) IWbemServices_Release( services ); } +static void test_MSSMBios_RawSMBiosTables( IWbemLocator *locator ) +{ + BSTR path = SysAllocString( L"ROOT\\WMI" ); + BSTR bios = SysAllocString( L"MSSMBios_RawSMBiosTables" ); + IWbemServices *services; + IEnumWbemClassObject *iter; + IWbemClassObject *obj; + VARIANT val; + CIMTYPE type; + ULONG count; + HRESULT hr; + + hr = IWbemLocator_ConnectServer( locator, path, NULL, NULL, NULL, 0, NULL, NULL, &services ); + ok( hr == S_OK, "failed to get IWbemServices interface %08x\n", hr ); + + hr = IWbemServices_CreateInstanceEnum( services, bios, 0, NULL, &iter ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = IEnumWbemClassObject_Next( iter, WBEM_INFINITE, 1, &obj, &count ); + ok( hr == S_OK, "got %08x\n", hr ); + + type = 0; + VariantInit( &val ); + hr = IWbemClassObject_Get( obj, L"SMBiosData", 0, &val, &type, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + todo_wine ok( V_VT( &val ) == (VT_UI1 | VT_ARRAY), "got %08x\n", V_VT(&val) ); + ok( type == (CIM_UINT8 | CIM_FLAG_ARRAY), "got %08x\n", type ); + + IWbemClassObject_Release( obj ); + IEnumWbemClassObject_Release( iter ); + IWbemServices_Release( services ); + SysFreeString( path ); + SysFreeString( bios ); +} + START_TEST(query) { BSTR path = SysAllocString( L"ROOT\\CIMV2" ); @@ -2180,6 +2215,7 @@ START_TEST(query) test_Win32_WinSAT( services ); test_SystemRestore( services ); test_empty_namespace( locator ); + test_MSSMBios_RawSMBiosTables( locator ); SysFreeString( path ); IWbemServices_Release( services ); -- 2.30.2

1 0

[PATCH 1/4] dinput: Fix incorrect use of constant_force instead of ramp_force.
by Rémi Bernon Dec. 3, 2021

Dec. 3, 2021

From: Ivo Ivanov <logos128(a)gmail.com> Signed-off-by: Ivo Ivanov <logos128(a)gmail.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/dinput/joystick_hid.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index 976961c3a9f..a5deedb6ffb 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -2437,7 +2437,7 @@ static HRESULT WINAPI hid_joystick_effect_GetParameters( IDirectInputEffect *ifa case PID_USAGE_ET_RAMP: if (!params->lpvTypeSpecificParams) return E_POINTER; if (params->cbTypeSpecificParams != sizeof(DIRAMPFORCE)) return DIERR_INVALIDPARAM; - memcpy( params->lpvTypeSpecificParams, &impl->constant_force, sizeof(DIRAMPFORCE) ); + memcpy( params->lpvTypeSpecificParams, &impl->ramp_force, sizeof(DIRAMPFORCE) ); break; case PID_USAGE_ET_CUSTOM_FORCE_DATA: FIXME( "DIEP_TYPESPECIFICPARAMS not implemented!\n" ); @@ -2591,9 +2591,9 @@ static HRESULT WINAPI hid_joystick_effect_SetParameters( IDirectInputEffect *ifa case PID_USAGE_ET_RAMP: if (!params->lpvTypeSpecificParams) return E_POINTER; if (params->cbTypeSpecificParams != sizeof(DIRAMPFORCE)) return DIERR_INVALIDPARAM; - if (memcmp( &impl->constant_force, params->lpvTypeSpecificParams, sizeof(DIRAMPFORCE) )) + if (memcmp( &impl->ramp_force, params->lpvTypeSpecificParams, sizeof(DIRAMPFORCE) )) impl->modified |= DIEP_TYPESPECIFICPARAMS; - memcpy( &impl->constant_force, params->lpvTypeSpecificParams, sizeof(DIRAMPFORCE) ); + memcpy( &impl->ramp_force, params->lpvTypeSpecificParams, sizeof(DIRAMPFORCE) ); impl->params.cbTypeSpecificParams = sizeof(DIRAMPFORCE); break; case PID_USAGE_ET_CUSTOM_FORCE_DATA: -- 2.34.0

1 3

[PATCH 2/5] win32u: Move NtUserGetCursor implementation from user32.
by Jacek Caban Dec. 3, 2021

Dec. 3, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/cursoricon.c | 19 +------------------ dlls/user32/user32.spec | 2 +- dlls/win32u/cursoricon.c | 18 ++++++++++++++++++ dlls/win32u/syscall.c | 1 + dlls/win32u/win32u.spec | 2 +- dlls/wow64win/user.c | 5 +++++ include/ntuser.h | 1 + 7 files changed, 28 insertions(+), 20 deletions(-)

2 2

[PATCH 01/10] winmm: Correctly check parameters in joyGetDevCaps(A|W).
by Rémi Bernon Dec. 3, 2021

Dec. 3, 2021

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/winmm/joystick.c | 96 ++++++++++++++++++++++++------------------- 1 file changed, 53 insertions(+), 43 deletions(-) diff --git a/dlls/winmm/joystick.c b/dlls/winmm/joystick.c index 2b1811d3778..bc9632df75c 100644 --- a/dlls/winmm/joystick.c +++ b/dlls/winmm/joystick.c @@ -167,64 +167,74 @@ UINT WINAPI DECLSPEC_HOTPATCH joyGetNumDevs(void) /************************************************************************** * joyGetDevCapsW [WINMM.@] */ -MMRESULT WINAPI DECLSPEC_HOTPATCH joyGetDevCapsW(UINT_PTR wID, LPJOYCAPSW lpCaps, UINT wSize) +MMRESULT WINAPI DECLSPEC_HOTPATCH joyGetDevCapsW( UINT_PTR id, LPJOYCAPSW caps, UINT size ) { - if (wID >= MAXJOYSTICK) return JOYERR_PARMS; - if (!JOY_LoadDriver(wID)) return MMSYSERR_NODRIVER; + TRACE( "id %d, caps %p, size %u.\n", (int)id, caps, size ); - lpCaps->wPeriodMin = JOY_PERIOD_MIN; /* FIXME */ - lpCaps->wPeriodMax = JOY_PERIOD_MAX; /* FIXME (same as MS Joystick Driver) */ + if (!caps) return MMSYSERR_INVALPARAM; + if (size != sizeof(JOYCAPSW) && size != sizeof(JOYCAPS2W)) return JOYERR_PARMS; - return SendDriverMessage(JOY_Sticks[wID].hDriver, JDD_GETDEVCAPS, (LPARAM)lpCaps, wSize); + if (id >= MAXJOYSTICK) return JOYERR_PARMS; + if (!JOY_LoadDriver( id )) return MMSYSERR_NODRIVER; + + caps->wPeriodMin = JOY_PERIOD_MIN; /* FIXME */ + caps->wPeriodMax = JOY_PERIOD_MAX; /* FIXME (same as MS Joystick Driver) */ + + return SendDriverMessage( JOY_Sticks[id].hDriver, JDD_GETDEVCAPS, (LPARAM)caps, size ); } /************************************************************************** * joyGetDevCapsA [WINMM.@] */ -MMRESULT WINAPI DECLSPEC_HOTPATCH joyGetDevCapsA(UINT_PTR wID, LPJOYCAPSA lpCaps, UINT wSize) +MMRESULT WINAPI DECLSPEC_HOTPATCH joyGetDevCapsA( UINT_PTR id, JOYCAPSA *caps, UINT size ) { - JOYCAPSW jcw; - MMRESULT ret; + JOYCAPS2W caps_w; + MMRESULT res; - if (lpCaps == NULL) return MMSYSERR_INVALPARAM; + TRACE( "id %d, caps %p, size %u.\n", (int)id, caps, size ); - ret = joyGetDevCapsW(wID, &jcw, sizeof(jcw)); + if (!caps) return MMSYSERR_INVALPARAM; + if (size != sizeof(JOYCAPSA) && size != sizeof(JOYCAPS2A)) return JOYERR_PARMS; - if (ret == JOYERR_NOERROR) + res = joyGetDevCapsW( id, (JOYCAPSW *)&caps_w, sizeof(caps_w) ); + if (res) return res; + + caps->wMid = caps_w.wMid; + caps->wPid = caps_w.wPid; + WideCharToMultiByte( CP_ACP, 0, caps_w.szPname, -1, caps->szPname, + sizeof(caps->szPname), NULL, NULL ); + caps->wXmin = caps_w.wXmin; + caps->wXmax = caps_w.wXmax; + caps->wYmin = caps_w.wYmin; + caps->wYmax = caps_w.wYmax; + caps->wZmin = caps_w.wZmin; + caps->wZmax = caps_w.wZmax; + caps->wNumButtons = caps_w.wNumButtons; + caps->wPeriodMin = caps_w.wPeriodMin; + caps->wPeriodMax = caps_w.wPeriodMax; + caps->wRmin = caps_w.wRmin; + caps->wRmax = caps_w.wRmax; + caps->wUmin = caps_w.wUmin; + caps->wUmax = caps_w.wUmax; + caps->wVmin = caps_w.wVmin; + caps->wVmax = caps_w.wVmax; + caps->wCaps = caps_w.wCaps; + caps->wMaxAxes = caps_w.wMaxAxes; + caps->wNumAxes = caps_w.wNumAxes; + caps->wMaxButtons = caps_w.wMaxButtons; + WideCharToMultiByte( CP_ACP, 0, caps_w.szRegKey, -1, caps->szRegKey, + sizeof(caps->szRegKey), NULL, NULL ); + WideCharToMultiByte( CP_ACP, 0, caps_w.szOEMVxD, -1, caps->szOEMVxD, + sizeof(caps->szOEMVxD), NULL, NULL ); + + if (size == sizeof(JOYCAPS2A)) { - lpCaps->wMid = jcw.wMid; - lpCaps->wPid = jcw.wPid; - WideCharToMultiByte( CP_ACP, 0, jcw.szPname, -1, lpCaps->szPname, - sizeof(lpCaps->szPname), NULL, NULL ); - lpCaps->wXmin = jcw.wXmin; - lpCaps->wXmax = jcw.wXmax; - lpCaps->wYmin = jcw.wYmin; - lpCaps->wYmax = jcw.wYmax; - lpCaps->wZmin = jcw.wZmin; - lpCaps->wZmax = jcw.wZmax; - lpCaps->wNumButtons = jcw.wNumButtons; - lpCaps->wPeriodMin = jcw.wPeriodMin; - lpCaps->wPeriodMax = jcw.wPeriodMax; - - if (wSize >= sizeof(JOYCAPSA)) { /* Win95 extensions ? */ - lpCaps->wRmin = jcw.wRmin; - lpCaps->wRmax = jcw.wRmax; - lpCaps->wUmin = jcw.wUmin; - lpCaps->wUmax = jcw.wUmax; - lpCaps->wVmin = jcw.wVmin; - lpCaps->wVmax = jcw.wVmax; - lpCaps->wCaps = jcw.wCaps; - lpCaps->wMaxAxes = jcw.wMaxAxes; - lpCaps->wNumAxes = jcw.wNumAxes; - lpCaps->wMaxButtons = jcw.wMaxButtons; - WideCharToMultiByte( CP_ACP, 0, jcw.szRegKey, -1, lpCaps->szRegKey, - sizeof(lpCaps->szRegKey), NULL, NULL ); - WideCharToMultiByte( CP_ACP, 0, jcw.szOEMVxD, -1, lpCaps->szOEMVxD, - sizeof(lpCaps->szOEMVxD), NULL, NULL ); - } + ((JOYCAPS2A *)caps)->ManufacturerGuid = caps_w.ManufacturerGuid; + ((JOYCAPS2A *)caps)->ProductGuid = caps_w.ProductGuid; + ((JOYCAPS2A *)caps)->NameGuid = caps_w.NameGuid; } - return ret; + return JOYERR_NOERROR; } /************************************************************************** -- 2.34.0

2 11

[PATCH vkd3d v7 1/6] vkd3d-shader/hlsl: Remove trivial swizzles.
by Giovanni Mascellani Dec. 3, 2021

Dec. 3, 2021

Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- libs/vkd3d-shader/hlsl_codegen.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 24b8205c..f8b977b0 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -475,6 +475,27 @@ static bool fold_constants(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, voi return true; } +static bool remove_trivial_swizzles(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void *context) +{ + struct hlsl_ir_swizzle *swizzle; + unsigned int i; + + if (instr->type != HLSL_IR_SWIZZLE) + return false; + swizzle = hlsl_ir_swizzle(instr); + + if (instr->data_type->dimx != swizzle->val.node->data_type->dimx) + return false; + + for (i = 0; i < instr->data_type->dimx; ++i) + if (((swizzle->swizzle >> (2 * i)) & 3) != i) + return false; + + replace_node(instr, swizzle->val.node); + + return true; +} + /* Lower DIV to RCP + MUL. */ static bool lower_division(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void *context) { @@ -1355,6 +1376,7 @@ int hlsl_emit_dxbc(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry_fun } while (progress); while (transform_ir(ctx, fold_constants, body, NULL)); + transform_ir(ctx, remove_trivial_swizzles, body, NULL); if (ctx->profile->major_version < 4) transform_ir(ctx, lower_division, body, NULL); -- 2.33.1

6 33