January 2022 - Wine-devel - list.winehq.org

[PATCH vkd3d 1/5] vkd3d-shader/hlsl: Use list_empty() instead of comparing list_count() against zero.
by Zebediah Figura 11 Jan '22

11 Jan '22

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.y | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 636882c4b..5a17449a3 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -326,7 +326,7 @@ static bool append_conditional_break(struct hlsl_ctx *ctx, struct list *cond_lis struct hlsl_ir_if *iff; /* E.g. "for (i = 0; ; ++i)". */ - if (!list_count(cond_list)) + if (list_empty(cond_list)) return true; condition = node_from_list(cond_list); -- 2.34.1

5 13

[PATCH 2/2] user: Copy back the 16-bit MDICREATESTRUCT.
by Huw Davies 11 Jan '22

11 Jan '22

Otherwise lpCreateParams is overwitten by CREATESTRUCT32Ato16(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52356 Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/user.exe16/message.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/user.exe16/message.c b/dlls/user.exe16/message.c index b79b0cb7751..1b4bf9afbd8 100644 --- a/dlls/user.exe16/message.c +++ b/dlls/user.exe16/message.c @@ -610,6 +610,7 @@ LRESULT WINPROC_CallProc16To32A( winproc_callback_t callback, HWND16 hwnd, UINT1 CREATESTRUCT16 *cs16 = MapSL(lParam); CREATESTRUCTA cs; MDICREATESTRUCTA mdi_cs; + SEGPTR mdi_cs_segptr = 0; CREATESTRUCT16to32A( cs16, &cs ); if (GetWindowLongW(hwnd32, GWL_EXSTYLE) & WS_EX_MDICHILD) @@ -617,9 +618,15 @@ LRESULT WINPROC_CallProc16To32A( winproc_callback_t callback, HWND16 hwnd, UINT1 MDICREATESTRUCT16 *mdi_cs16 = MapSL(cs16->lpCreateParams); MDICREATESTRUCT16to32A(mdi_cs16, &mdi_cs); cs.lpCreateParams = &mdi_cs; + mdi_cs_segptr = cs16->lpCreateParams; } ret = callback( hwnd32, msg, wParam, (LPARAM)&cs, result, arg ); CREATESTRUCT32Ato16( &cs, cs16 ); + if (mdi_cs_segptr) + { + MDICREATESTRUCT32Ato16( &mdi_cs, MapSL( mdi_cs_segptr ) ); + cs16->lpCreateParams = mdi_cs_segptr; + } } break; case WM_MDICREATE: -- 2.23.0

1 0

[PATCH 1/2] commdlg: Pass the 16-bit structure to the WM_INITDIALOG hook.
by Huw Davies 11 Jan '22

11 Jan '22

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52356 Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/commdlg.dll16/filedlg.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/commdlg.dll16/filedlg.c b/dlls/commdlg.dll16/filedlg.c index 4fa62c15d6c..0a4dad4a37a 100644 --- a/dlls/commdlg.dll16/filedlg.c +++ b/dlls/commdlg.dll16/filedlg.c @@ -482,6 +482,12 @@ static UINT_PTR CALLBACK call_hook_proc( WNDPROC16 hook, HWND hwnd, UINT msg, WP case WM_ACTIVATEAPP: ret = call_hook16( hook, hwnd, msg, wp, HTASK_16( lp )); break; + case WM_INITDIALOG: + { + OPENFILENAMEA *ofn = (OPENFILENAMEA *)lp; + ret = call_hook16( hook, hwnd, msg, wp, ofn->lCustData ); + break; + } default: ret = call_hook16( hook, hwnd, msg, wp, lp ); break; @@ -591,7 +597,7 @@ BOOL16 WINAPI GetOpenFileName16( SEGPTR ofn ) /* [in/out] address of structure w ofn32.nFileOffset = lpofn->nFileOffset; ofn32.nFileExtension = lpofn->nFileExtension; ofn32.lpstrDefExt = MapSL( lpofn->lpstrDefExt ); - ofn32.lCustData = lpofn->lCustData; + ofn32.lCustData = ofn; /* See WM_INITDIALOG in the hook proc */ ofn32.lpfnHook = dummy_hook; /* this is to force old 3.1 dialog style */ if (lpofn->Flags & OFN_ENABLETEMPLATE) -- 2.23.0

1 0

[PATCH] kerberos: Avoid a crash on NULL expiry parameter.
by Hans Leidekker 11 Jan '22

11 Jan '22

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52353 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/kerberos/krb5_ap.c | 1 + dlls/secur32/tests/secur32.c | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kerberos/krb5_ap.c b/dlls/kerberos/krb5_ap.c index 8295d2e103e..2e47c23bb69 100644 --- a/dlls/kerberos/krb5_ap.c +++ b/dlls/kerberos/krb5_ap.c @@ -87,6 +87,7 @@ static void expiry_to_timestamp( ULONG expiry, TimeStamp *timestamp ) { LARGE_INTEGER time; + if (!timestamp) return; NtQuerySystemTime( &time ); RtlSystemTimeToLocalTime( &time, &time ); time.QuadPart += expiry * (ULONGLONG)10000000; diff --git a/dlls/secur32/tests/secur32.c b/dlls/secur32/tests/secur32.c index f6bca55561c..aa286c64732 100644 --- a/dlls/secur32/tests/secur32.c +++ b/dlls/secur32/tests/secur32.c @@ -418,7 +418,6 @@ static void test_SspiPrepareForCredWrite(void) static void test_kerberos(void) { SecPkgInfoA *info; - TimeStamp ttl; CredHandle cred; SECURITY_STATUS status; @@ -460,7 +459,7 @@ static void test_kerberos(void) FreeContextBuffer( info ); status = AcquireCredentialsHandleA( NULL, provider, SECPKG_CRED_OUTBOUND, NULL, - NULL, NULL, NULL, &cred, &ttl ); + NULL, NULL, NULL, &cred, NULL ); todo_wine ok( status == SEC_E_OK, "AcquireCredentialsHandleA returned %08x\n", status ); if(status == SEC_E_OK) FreeCredentialHandle( &cred ); -- 2.30.2

1 0

[PATCH] include: Add WbemErrorEnum error codes.
by Nikolay Sivov 11 Jan '22

11 Jan '22

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52378 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- include/wbemdisp.idl | 137 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 137 insertions(+) diff --git a/include/wbemdisp.idl b/include/wbemdisp.idl index 6f09f7ee154..7182a14a331 100644 --- a/include/wbemdisp.idl +++ b/include/wbemdisp.idl @@ -760,6 +760,143 @@ enum WbemCimtypeEnum wbemCimtypeChar16 = 103 } WbemCimtypeEnum; +typedef +[ + v1_enum, + uuid(4a249b7c-fc9a-11d1-8b1e-00600806d9b6), +] +enum WbemErrorEnum +{ + wbemNoErr = 0, + wbemErrFailed = 0x80041001, + wbemErrNotFound = 0x80041002, + wbemErrAccessDenied = 0x80041003, + wbemErrProviderFailure = 0x80041004, + wbemErrTypeMismatch = 0x80041005, + wbemErrOutOfMemory = 0x80041006, + wbemErrInvalidContext = 0x80041007, + wbemErrInvalidParameter = 0x80041008, + wbemErrNotAvailable = 0x80041009, + wbemErrCriticalError = 0x8004100a, + wbemErrInvalidStream = 0x8004100b, + wbemErrNotSupported = 0x8004100c, + wbemErrInvalidSuperclass = 0x8004100d, + wbemErrInvalidNamespace = 0x8004100e, + wbemErrInvalidObject = 0x8004100f, + wbemErrInvalidClass = 0x80041010, + wbemErrProviderNotFound = 0x80041011, + wbemErrInvalidProviderRegistration = 0x80041012, + wbemErrProviderLoadFailure = 0x80041013, + wbemErrInitializationFailure = 0x80041014, + wbemErrTransportFailure = 0x80041015, + wbemErrInvalidOperation = 0x80041016, + wbemErrInvalidQuery = 0x80041017, + wbemErrInvalidQueryType = 0x80041018, + wbemErrAlreadyExists = 0x80041019, + wbemErrOverrideNotAllowed = 0x8004101a, + wbemErrPropagatedQualifier = 0x8004101b, + wbemErrPropagatedProperty = 0x8004101c, + wbemErrUnexpected = 0x8004101d, + wbemErrIllegalOperation = 0x8004101e, + wbemErrCannotBeKey = 0x8004101f, + wbemErrIncompleteClass = 0x80041020, + wbemErrInvalidSyntax = 0x80041021, + wbemErrNondecoratedObject = 0x80041022, + wbemErrReadOnly = 0x80041023, + wbemErrProviderNotCapable = 0x80041024, + wbemErrClassHasChildren = 0x80041025, + wbemErrClassHasInstances = 0x80041026, + wbemErrQueryNotImplemented = 0x80041027, + wbemErrIllegalNull = 0x80041028, + wbemErrInvalidQualifierType = 0x80041029, + wbemErrInvalidPropertyType = 0x8004102a, + wbemErrValueOutOfRange = 0x8004102b, + wbemErrCannotBeSingleton = 0x8004102c, + wbemErrInvalidCimType = 0x8004102d, + wbemErrInvalidMethod = 0x8004102e, + wbemErrInvalidMethodParameters = 0x8004102f, + wbemErrSystemProperty = 0x80041030, + wbemErrInvalidProperty = 0x80041031, + wbemErrCallCancelled = 0x80041032, + wbemErrShuttingDown = 0x80041033, + wbemErrPropagatedMethod = 0x80041034, + wbemErrUnsupportedParameter = 0x80041035, + wbemErrMissingParameter = 0x80041036, + wbemErrInvalidParameterId = 0x80041037, + wbemErrNonConsecutiveParameterIds = 0x80041038, + wbemErrParameterIdOnRetval = 0x80041039, + wbemErrInvalidObjectPath = 0x8004103a, + wbemErrOutOfDiskSpace = 0x8004103b, + wbemErrBufferTooSmall = 0x8004103c, + wbemErrUnsupportedPutExtension = 0x8004103d, + wbemErrUnknownObjectType = 0x8004103e, + wbemErrUnknownPacketType = 0x8004103f, + wbemErrMarshalVersionMismatch = 0x80041040, + wbemErrMarshalInvalidSignature = 0x80041041, + wbemErrInvalidQualifier = 0x80041042, + wbemErrInvalidDuplicateParameter = 0x80041043, + wbemErrTooMuchData = 0x80041044, + wbemErrServerTooBusy = 0x80041045, + wbemErrInvalidFlavor = 0x80041046, + wbemErrCircularReference = 0x80041047, + wbemErrUnsupportedClassUpdate = 0x80041048, + wbemErrCannotChangeKeyInheritance = 0x80041049, + wbemErrCannotChangeIndexInheritance = 0x80041050, + wbemErrTooManyProperties = 0x80041051, + wbemErrUpdateTypeMismatch = 0x80041052, + wbemErrUpdateOverrideNotAllowed = 0x80041053, + wbemErrUpdatePropagatedMethod = 0x80041054, + wbemErrMethodNotImplemented = 0x80041055, + wbemErrMethodDisabled = 0x80041056, + wbemErrRefresherBusy = 0x80041057, + wbemErrUnparsableQuery = 0x80041058, + wbemErrNotEventClass = 0x80041059, + wbemErrMissingGroupWithin = 0x8004105a, + wbemErrMissingAggregationList = 0x8004105b, + wbemErrPropertyNotAnObject = 0x8004105c, + wbemErrAggregatingByObject = 0x8004105d, + wbemErrUninterpretableProviderQuery = 0x8004105f, + wbemErrBackupRestoreWinmgmtRunning = 0x80041060, + wbemErrQueueOverflow = 0x80041061, + wbemErrPrivilegeNotHeld = 0x80041062, + wbemErrInvalidOperator = 0x80041063, + wbemErrLocalCredentials = 0x80041064, + wbemErrCannotBeAbstract = 0x80041065, + wbemErrAmendedObject = 0x80041066, + wbemErrClientTooSlow = 0x80041067, + wbemErrNullSecurityDescriptor = 0x80041068, + wbemErrTimeout = 0x80041069, + wbemErrInvalidAssociation = 0x8004106a, + wbemErrAmbiguousOperation = 0x8004106b, + wbemErrQuotaViolation = 0x8004106c, + wbemErrTransactionConflict = 0x8004106d, + wbemErrForcedRollback = 0x8004106e, + wbemErrUnsupportedLocale = 0x8004106f, + wbemErrHandleOutOfDate = 0x80041070, + wbemErrConnectionFailed = 0x80041071, + wbemErrInvalidHandleRequest = 0x80041072, + wbemErrPropertyNameTooWide = 0x80041073, + wbemErrClassNameTooWide = 0x80041074, + wbemErrMethodNameTooWide = 0x80041075, + wbemErrQualifierNameTooWide = 0x80041076, + wbemErrRerunCommand = 0x80041077, + wbemErrDatabaseVerMismatch = 0x80041078, + wbemErrVetoPut = 0x80041079, + wbemErrVetoDelete = 0x8004107a, + wbemErrInvalidLocale = 0x80041080, + wbemErrProviderSuspended = 0x80041081, + wbemErrSynchronizationRequired = 0x80041082, + wbemErrNoSchema = 0x80041083, + wbemErrProviderAlreadyRegistered = 0x80041084, + wbemErrProviderNotRegistered = 0x80041085, + wbemErrFatalTransportError = 0x80041086, + wbemErrEncryptedConnectionRequired = 0x80041087, + wbemErrRegistrationTooBroad = 0x80042001, + wbemErrRegistrationTooPrecise = 0x80042002, + wbemErrTimedout = 0x80043001, + wbemErrResetToDefault = 0x80043002 +} WbemErrorEnum; + [ object, local, -- 2.34.1

1 0

Re: [PATCH] ntdll: set user_shared_data to 0x7fffffff0000 and virtual_alloc_first_teb can run succeeded on android aarch64
by Stefan Dösinger 11 Jan '22

11 Jan '22

I'm taking the liberty of CC'ing wine-devel in my reply... > Am 11.01.2022 um 04:38 schrieb fanwj(a)mail.ustc.edu.cn: > > __ANDROID__ only defined when CC use NDK with flag "-b aarch64-linux-android". if flag is "-b aarch64-windows" it would not defined. > > 在2022-01-11 02:30:57,Stefan Dösinger<stefandoesinger(a)gmail.com>写道： >> >> >>> Am 10.01.2022 um 15:22 schrieb fanwj(a)mail.ustc.edu.cn: >>> >>> The commit only has effect on android-aarch64, because condition macro "if defined(__aarch64__) && defined(__ANDROID__)", it does not affect other platform. Android only has 3-level page table, page size is 4096. pointer(address) size is 8, so every page contain 4096 / 8 = 512 address. it use lg(512) = 9 bits. page use lg(4096) = 12 bits. so 3-level address has valid bits count is 9 * 3 + 12 = 39bits. it can present max address is (2 << 39) - 1 = 0x7fffffffff. user_shared_data must alloc at 0x20000 to end of address. so it is 0x7ffffe0000. 0x7ffe0000 is incorect because it is at middle of address space. and the address space usually be used. >> >> Did you deliberately omit the wine-devel CC? Regardless of where the user address space ends on Android, the user_shared_data struct needs to be in the same place as it is on Windows. Observe that it is in the same place in 32 and 64 bit Windows, and it doesn't care if you run 32 bit Windows with a 2/2 or 3/1 memsplit. The only reason to use it on aarch64 Wine is if aarch64 Windows also places it elsewhere. If something else is mapped at this place already that's a problem with the wine preloader. The preloader is trying to reserve certain addresses as early as possible, before unix libraries get loaded and place data. The user shared data address is a critical one that's at a hardcoded place. Another example would be 0x400000 and 0x140000000, the default load addresses of x86 and x86_64 .exe files (which usually aren't PIC and have no reloc symbols). (Semi-educated guess on my end: I guess the process where ntdll finds the area occupied is explorer.exe, which is spawned through java, so a lot of stuff is already in place. That'll be tricky to solve, because we don't really have a preloader...)

1 0

[PATCH v2] d2d1: Silence SetSegmentFlags FIXME when setting default value
by Stefan Brüns 11 Jan '22

11 Jan '22

Some software (Buhl Tax and variants) repeatedly calls SetSegmentFlags with D2D1_PATH_SEGMENT_NONE, which is just the default value and has no effect (unless the flags where already changed, which still reports a FIXME). Signed-off-by: Stefan Brüns <stefan.bruens(a)rwth-aachen.de> --- v2: use TRACE when setting flags to D2D1_PATH_SEGMENT_NONE dlls/d2d1/geometry.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/d2d1/geometry.c b/dlls/d2d1/geometry.c index a7074899fda..a58dadcad85 100644 --- a/dlls/d2d1/geometry.c +++ b/dlls/d2d1/geometry.c @@ -2773,7 +2773,10 @@ static void STDMETHODCALLTYPE d2d_geometry_sink_SetFillMode(ID2D1GeometrySink *i static void STDMETHODCALLTYPE d2d_geometry_sink_SetSegmentFlags(ID2D1GeometrySink *iface, D2D1_PATH_SEGMENT flags) { - FIXME("iface %p, flags %#x stub!\n", iface, flags); + if (flags == D2D1_PATH_SEGMENT_NONE) + TRACE("iface %p, mode %#x.\n", iface, mode); + else + FIXME("iface %p, flags %#x stub!\n", iface, flags); } static void STDMETHODCALLTYPE d2d_geometry_sink_BeginFigure(ID2D1GeometrySink *iface, -- 2.34.1

2 1

[PATCH] d2d1: Silence SetSegmentFlags FIXME when setting default value
by Stefan Brüns 11 Jan '22

11 Jan '22

Some software (Buhl Tax and variants) repeatedly calls SetSegmentFlags with D2D1_PATH_SEGMENT_NONE, which is just the default value and has no effect (unless the flags where already changed for the current segment, which still reports a FIXME). Signed-off-by: Stefan Brüns <stefan.bruens(a)rwth-aachen.de> --- dlls/d2d1/geometry.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/d2d1/geometry.c b/dlls/d2d1/geometry.c index a7074899fda..ac5f1019f3f 100644 --- a/dlls/d2d1/geometry.c +++ b/dlls/d2d1/geometry.c @@ -2773,6 +2773,8 @@ static void STDMETHODCALLTYPE d2d_geometry_sink_SetFillMode(ID2D1GeometrySink *i static void STDMETHODCALLTYPE d2d_geometry_sink_SetSegmentFlags(ID2D1GeometrySink *iface, D2D1_PATH_SEGMENT flags) { + if (flags == D2D1_PATH_SEGMENT_NONE) + return; FIXME("iface %p, flags %#x stub!\n", iface, flags); } -- 2.34.1

2 1

[PATCH vkd3d 1/4] vkd3d-shader: Do not validate the target type in vkd3d_shader_scan().
by Zebediah Figura 11 Jan '22

11 Jan '22

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- libs/vkd3d-shader/vkd3d_shader_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 3982d0730..47fe3d60d 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -1025,7 +1025,7 @@ int vkd3d_shader_scan(const struct vkd3d_shader_compile_info *compile_info, char if (messages) *messages = NULL; - if ((ret = vkd3d_shader_validate_compile_info(compile_info, true)) < 0) + if ((ret = vkd3d_shader_validate_compile_info(compile_info, false)) < 0) return ret; vkd3d_shader_message_context_init(&message_context, compile_info->log_level); -- 2.34.1

5 11

[PATCH vkd3d] vkd3d-shader: Add tiled resource opcode definitions.
by Zebediah Figura 10 Jan '22

10 Jan '22

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- libs/vkd3d-shader/sm4.h | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/libs/vkd3d-shader/sm4.h b/libs/vkd3d-shader/sm4.h index f6b4b612d..62bb4d12b 100644 --- a/libs/vkd3d-shader/sm4.h +++ b/libs/vkd3d-shader/sm4.h @@ -354,6 +354,22 @@ enum vkd3d_sm4_opcode VKD3D_SM5_OP_DTOU = 0xd7, VKD3D_SM5_OP_ITOD = 0xd8, VKD3D_SM5_OP_UTOD = 0xd9, + VKD3D_SM5_OP_GATHER4_S = 0xdb, + VKD3D_SM5_OP_GATHER4_C_S = 0xdc, + VKD3D_SM5_OP_GATHER4_PO_S = 0xdd, + VKD3D_SM5_OP_GATHER4_PO_C_S = 0xde, + VKD3D_SM5_OP_LD_S = 0xdf, + VKD3D_SM5_OP_LD2DMS_S = 0xe0, + VKD3D_SM5_OP_LD_UAV_TYPED_S = 0xe1, + VKD3D_SM5_OP_LD_RAW_S = 0xe2, + VKD3D_SM5_OP_LD_STRUCTURED_S = 0xe3, + VKD3D_SM5_OP_SAMPLE_LOD_S = 0xe4, + VKD3D_SM5_OP_SAMPLE_C_LZ_S = 0xe5, + VKD3D_SM5_OP_SAMPLE_CL_S = 0xe6, + VKD3D_SM5_OP_SAMPLE_B_CL_S = 0xe7, + VKD3D_SM5_OP_SAMPLE_GRAD_CL_S = 0xe8, + VKD3D_SM5_OP_SAMPLE_C_CL_S = 0xe9, + VKD3D_SM5_OP_CHECK_ACCESS_FULLY_MAPPED = 0xea, }; enum vkd3d_sm4_instruction_modifier -- 2.34.1

4 3