February 2023 - Wine-Commits

Huw Davies : rpcrt4/tests: Remove a failing test.
by Alexandre Julliard Feb. 8, 2023

Feb. 8, 2023

Module: wine Branch: master Commit: fc6af061faf1dadeb4193a91a0d7145d10bbb54f URL: https://gitlab.winehq.org/wine/wine/-/commit/fc6af061faf1dadeb4193a91a0d714… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Jan 16 07:53:10 2023 +0000 rpcrt4/tests: Remove a failing test. --- dlls/rpcrt4/tests/rpc.c | 42 ++++++++++++++---------------------------- 1 file changed, 14 insertions(+), 28 deletions(-) diff --git a/dlls/rpcrt4/tests/rpc.c b/dlls/rpcrt4/tests/rpc.c index a4653fd603f..2a3d43cfc2d 100644 --- a/dlls/rpcrt4/tests/rpc.c +++ b/dlls/rpcrt4/tests/rpc.c @@ -158,41 +158,27 @@ static void test_UuidFromString(void) static void test_DceErrorInqTextA(void) { char bufferInvalid [1024]; - char buffer [1024]; /* The required size is not documented but would - * appear to be 256. - */ + char buffer [1024]; DWORD dwCount; + RPC_STATUS status; dwCount = FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, NULL, RPC_S_NOT_RPC_ERROR, 0, bufferInvalid, ARRAY_SIZE(bufferInvalid), NULL); + ok(dwCount, "Cannot set up for DceErrorInqText\n"); - /* A random sample of DceErrorInqText */ /* 0 is success */ - ok ((DceErrorInqTextA (0, (unsigned char*)buffer) == RPC_S_OK), - "DceErrorInqTextA(0...)\n"); - /* A real RPC_S error */ - ok ((DceErrorInqTextA (RPC_S_INVALID_STRING_UUID, (unsigned char*)buffer) == RPC_S_OK), - "DceErrorInqTextA(valid...)\n"); + status = DceErrorInqTextA(0, (unsigned char*)buffer); + ok(status == RPC_S_OK, "got %lx\n", status); - if (dwCount) - { - /* A message for which FormatMessage should fail - * which should return RPC_S_OK and the - * fixed "not valid" message - */ - ok ((DceErrorInqTextA (35, (unsigned char*)buffer) == RPC_S_OK && - strcmp (buffer, bufferInvalid) == 0), - "DceErrorInqTextA(unformattable...)\n"); - /* One for which FormatMessage should succeed but - * DceErrorInqText should "fail" - * 3814 is generally quite a long message - */ - ok ((DceErrorInqTextA (3814, (unsigned char*)buffer) == RPC_S_OK && - strcmp (buffer, bufferInvalid) == 0), - "DceErrorInqTextA(deviation...)\n"); - } - else - ok (0, "Cannot set up for DceErrorInqText\n"); + /* A real RPC_S error */ + status = DceErrorInqTextA(RPC_S_INVALID_STRING_UUID, (unsigned char*)buffer); + ok(status == RPC_S_OK, "got %lx\n", status); + + /* A message for which FormatMessage should fail which should return RPC_S_OK and the + * fixed "not valid" message */ + status = DceErrorInqTextA(35, (unsigned char*)buffer); + ok(status == RPC_S_OK, "got %lx\n", status); + ok(!strcmp(buffer, bufferInvalid), "got %s vs %s\n", wine_dbgstr_a(buffer), wine_dbgstr_a(bufferInvalid)); } static RPC_DISPATCH_FUNCTION IFoo_table[] =

1 0

Michael Stefaniuc : ntdll/tests: Remove some Vista broken broken(<constant>) calls.
by Alexandre Julliard Feb. 8, 2023

Feb. 8, 2023

Module: wine Branch: master Commit: c1fb8fe23e2772bba86e58e8f254e6aa08d89989 URL: https://gitlab.winehq.org/wine/wine/-/commit/c1fb8fe23e2772bba86e58e8f254e6… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Feb 7 19:30:35 2023 +0100 ntdll/tests: Remove some Vista broken broken(<constant>) calls. One of them still needs a broken() for some Win8 machines. --- dlls/ntdll/tests/info.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index 192f6be7ce9..cf074076c96 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -199,7 +199,7 @@ static void test_query_basic(void) "info is different\n" ); } #else - ok( status == STATUS_INVALID_INFO_CLASS || broken(STATUS_NOT_IMPLEMENTED), /* vista */ + ok( status == STATUS_INVALID_INFO_CLASS || broken(status == STATUS_SUCCESS), /* some Win8 */ "got %08lx\n", status); status = pRtlGetNativeSystemInformation( SystemNativeBasicInformation, &sbi3, sizeof(sbi3), &ReturnLength ); ok( !status || status == STATUS_INFO_LENGTH_MISMATCH || @@ -3219,9 +3219,9 @@ static void test_ThreadEnableAlignmentFaultFixup(void) dummy = 0; status = NtQueryInformationThread( GetCurrentThread(), ThreadEnableAlignmentFaultFixup, &dummy, sizeof(ULONG), NULL ); - ok( status == STATUS_INVALID_INFO_CLASS || broken(STATUS_NOT_IMPLEMENTED), "Expected STATUS_INVALID_INFO_CLASS, got %08lx\n", status ); + ok( status == STATUS_INVALID_INFO_CLASS, "Expected STATUS_INVALID_INFO_CLASS, got %08lx\n", status ); status = NtQueryInformationThread( GetCurrentThread(), ThreadEnableAlignmentFaultFixup, &dummy, 1, NULL ); - ok( status == STATUS_INVALID_INFO_CLASS || broken(STATUS_NOT_IMPLEMENTED), "Expected STATUS_INVALID_INFO_CLASS, got %08lx\n", status ); + ok( status == STATUS_INVALID_INFO_CLASS, "Expected STATUS_INVALID_INFO_CLASS, got %08lx\n", status ); dummy = 1; status = pNtSetInformationThread( GetCurrentThread(), ThreadEnableAlignmentFaultFixup, &dummy, sizeof(ULONG) );

1 0

Zebediah Figura : oleaut32: Manually construct a stub buffer for dispinterfaces.
by Alexandre Julliard Feb. 8, 2023

Feb. 8, 2023

Module: wine Branch: master Commit: bf859fb09bba29ac1fbc9c8d92377399573afc50 URL: https://gitlab.winehq.org/wine/wine/-/commit/bf859fb09bba29ac1fbc9c8d923773… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Dec 12 16:02:57 2022 -0600 oleaut32: Manually construct a stub buffer for dispinterfaces. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53926 --- dlls/oleaut32/oleaut.c | 114 ++++++++++++++++++++++++++++++++++++++++- dlls/oleaut32/tests/tmarshal.c | 17 +++++- 2 files changed, 127 insertions(+), 4 deletions(-) diff --git a/dlls/oleaut32/oleaut.c b/dlls/oleaut32/oleaut.c index 858622c833c..92a9f12661b 100644 --- a/dlls/oleaut32/oleaut.c +++ b/dlls/oleaut32/oleaut.c @@ -18,6 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <assert.h> #include <stdarg.h> #include <stdio.h> #include <string.h> @@ -34,6 +35,7 @@ #include "ole2.h" #include "olectl.h" #include "oleauto.h" +#include "rpcproxy.h" #include "initguid.h" #include "typelib.h" #include "oleaut32_oaidl.h" @@ -999,6 +1001,114 @@ static HRESULT dispatch_create_stub(IUnknown *server, IRpcStubBuffer **stub) return hr; } +struct dispinterface_stub +{ + CInterfaceStubVtbl stub_vtbl; + CStdStubBuffer stub_buffer; +}; + +static struct dispinterface_stub *impl_from_IRpcStubBuffer(IRpcStubBuffer *iface) +{ + return CONTAINING_RECORD(&iface->lpVtbl, struct dispinterface_stub, stub_buffer.lpVtbl); +} + +static ULONG WINAPI dispinterface_stub_Release(IRpcStubBuffer *iface) +{ + struct dispinterface_stub *stub = impl_from_IRpcStubBuffer(iface); + unsigned int refcount = InterlockedDecrement(&stub->stub_buffer.RefCount); + + TRACE("%p decreasing refcount to %u.\n", stub, refcount); + + if (!refcount) + { + /* Copied from NdrCStdStubBuffer_Release(), but supposedly incorrect + * according to the comment there. */ + IRpcStubBuffer_Disconnect(iface); + + free(stub); + } + return refcount; +} + +extern const ExtendedProxyFileInfo oleaut32_oaidl_ProxyFileInfo; + +static const CInterfaceStubVtbl *find_idispatch_stub_vtbl(void) +{ + CInterfaceStubVtbl *const *vtbl; + + for (vtbl = oleaut32_oaidl_ProxyFileInfo.pStubVtblList; *vtbl; ++vtbl) + { + if (IsEqualGUID((*vtbl)->header.piid, &IID_IDispatch)) + return *vtbl; + } + + assert(0); + return NULL; +} + +/* Normal dispinterfaces have an IID specified by the IDL compiler as DIID_*, + * but are otherwise identical to IDispatch. Unfortunately, such interfaces may + * not actually support IDispatch in QueryInterface. + * + * This becomes a problem, since CreateStub() was designed such that, for some + * reason, the caller need not actually pass the interface matching "iid". As + * such the standard rpcrt4 implementation will query the server for the + * relevant IID. + * + * This means that we cannot just pass IID_IDispatch with the object, even + * though it is in theory an IDispatch. However, while the standard stub + * constructor is not exported from rpcrt4, all of the vtbl methods are, and + * the type is public, so we *can* manually create it ourselves, bypassing the + * QueryInterface check. + * + * This relies on some rpcrt4 implementation details. + */ +static HRESULT dispinterface_create_stub(IUnknown *server, const GUID *iid, IRpcStubBuffer **stub) +{ + const CInterfaceStubVtbl *stub_vtbl = find_idispatch_stub_vtbl(); + struct dispinterface_stub *object; + void *dispatch; + HRESULT hr; + + if (!(object = calloc(1, sizeof(*object)))) + return E_OUTOFMEMORY; + + /* It's possible we can just assume that "server" is already the + * dispinterface type—we don't have tests for this—but since rpcrt4 queries + * (which we do have tests for) it makes sense for us to match that + * behaviour. */ + if (FAILED(hr = IUnknown_QueryInterface(server, iid, &dispatch))) + { + ERR("Object does not support interface %s.\n", debugstr_guid(iid)); + free(object); + return hr; + } + + object->stub_vtbl.header = stub_vtbl->header; + object->stub_vtbl.Vtbl.QueryInterface = CStdStubBuffer_QueryInterface; + object->stub_vtbl.Vtbl.AddRef = CStdStubBuffer_AddRef; + object->stub_vtbl.Vtbl.Release = dispinterface_stub_Release; + object->stub_vtbl.Vtbl.Connect = CStdStubBuffer_Connect; + object->stub_vtbl.Vtbl.Disconnect = CStdStubBuffer_Disconnect; + object->stub_vtbl.Vtbl.Invoke = CStdStubBuffer_Invoke; + object->stub_vtbl.Vtbl.IsIIDSupported = CStdStubBuffer_IsIIDSupported; + object->stub_vtbl.Vtbl.CountRefs = CStdStubBuffer_CountRefs; + object->stub_vtbl.Vtbl.DebugServerQueryInterface = CStdStubBuffer_DebugServerQueryInterface; + object->stub_vtbl.Vtbl.DebugServerRelease = CStdStubBuffer_DebugServerRelease; + object->stub_buffer.lpVtbl = &object->stub_vtbl.Vtbl; + object->stub_buffer.RefCount = 1; + object->stub_buffer.pvServerObject = dispatch; + /* rpcrt4 will also fill pPSFactory, but it never uses it except in the + * Release method (which we reimplement). It's only to keep a reference to + * the module to implement NdrDllCanUnloadNow(). We use the default + * DllCanUnloadNow() from winecrt0, which always returns S_FALSE, so don't + * bother filling pPSFactory. */ + + TRACE("Created stub %p.\n", object); + *stub = (IRpcStubBuffer *)&object->stub_buffer.lpVtbl; + return S_OK; +} + static HRESULT WINAPI dispatch_typelib_ps_CreateStub(IPSFactoryBuffer *iface, REFIID iid, IUnknown *server, IRpcStubBuffer **stub) { @@ -1022,10 +1132,10 @@ static HRESULT WINAPI dispatch_typelib_ps_CreateStub(IPSFactoryBuffer *iface, if (attr->typekind == TKIND_INTERFACE || (attr->wTypeFlags & TYPEFLAG_FDUAL)) hr = CreateStubFromTypeInfo(typeinfo, iid, server, stub); else - hr = dispatch_create_stub(server, stub); + hr = dispinterface_create_stub(server, iid, stub); if (FAILED(hr)) - ERR("Failed to create proxy, hr %#lx.\n", hr); + ERR("Failed to create stub, hr %#lx.\n", hr); ITypeInfo_ReleaseTypeAttr(typeinfo, attr); ITypeInfo_Release(typeinfo); diff --git a/dlls/oleaut32/tests/tmarshal.c b/dlls/oleaut32/tests/tmarshal.c index 53861870e78..5ffc103c7eb 100644 --- a/dlls/oleaut32/tests/tmarshal.c +++ b/dlls/oleaut32/tests/tmarshal.c @@ -17,6 +17,7 @@ * */ +#include <stdbool.h> #include <math.h> #define COBJMACROS @@ -394,6 +395,7 @@ struct disp_obj { ISomethingFromDispatch ISomethingFromDispatch_iface; LONG ref; + bool support_idispatch; }; static inline struct disp_obj *impl_from_ISomethingFromDispatch(ISomethingFromDispatch *iface) @@ -403,6 +405,11 @@ static inline struct disp_obj *impl_from_ISomethingFromDispatch(ISomethingFromDi static HRESULT WINAPI disp_obj_QueryInterface(ISomethingFromDispatch *iface, REFIID iid, void **out) { + struct disp_obj *obj = impl_from_ISomethingFromDispatch(iface); + + if (!obj->support_idispatch) + ok(!IsEqualGUID(iid, &IID_IDispatch), "Expected no query for IDispatch.\n"); + if (IsEqualGUID(iid, &IID_IUnknown) || IsEqualGUID(iid, &IID_IDispatch) || IsEqualGUID(iid, &IID_ISomethingFromDispatch) || IsEqualGUID(iid, &DIID_ItestIF4)) @@ -475,14 +482,20 @@ static const ISomethingFromDispatchVtbl disp_obj_vtbl = disp_obj_anotherfn, }; -static ISomethingFromDispatch *create_disp_obj(void) +static ISomethingFromDispatch *create_disp_obj2(bool support_idispatch) { struct disp_obj *obj = CoTaskMemAlloc(sizeof(*obj)); obj->ISomethingFromDispatch_iface.lpVtbl = &disp_obj_vtbl; obj->ref = 1; + obj->support_idispatch = support_idispatch; return &obj->ISomethingFromDispatch_iface; } +static ISomethingFromDispatch *create_disp_obj(void) +{ + return create_disp_obj2(true); +} + struct coclass_obj { ICoclass1 ICoclass1_iface; @@ -3710,7 +3723,7 @@ static void test_marshal_dispinterface(void) { static const LARGE_INTEGER zero; - ISomethingFromDispatch *disp_obj = create_disp_obj(); + ISomethingFromDispatch *disp_obj = create_disp_obj2(false); ITypeInfo *typeinfo = NULL; IDispatch *proxy_disp; IStream *stream;

1 0

Zebediah Figura : scardsvr: Add stub service.
by Alexandre Julliard Feb. 8, 2023

Feb. 8, 2023

Module: wine Branch: master Commit: aff181e6d9c352182ef44e917af47c8be8571d3b URL: https://gitlab.winehq.org/wine/wine/-/commit/aff181e6d9c352182ef44e917af47c… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Jan 29 16:07:51 2023 -0600 scardsvr: Add stub service. The Rutoken driver installer tries to start this service, and fails if it doesn't exist. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54396 --- configure | 2 ++ configure.ac | 1 + dlls/scardsvr/Makefile.in | 5 +++ dlls/scardsvr/scardsvr.c | 88 +++++++++++++++++++++++++++++++++++++++++++++ dlls/scardsvr/scardsvr.spec | 3 ++ loader/wine.inf.in | 17 +++++++++ 6 files changed, 116 insertions(+) diff --git a/configure b/configure index 759a59410df..25bffe3c8eb 100755 --- a/configure +++ b/configure @@ -1358,6 +1358,7 @@ enable_sane_ds enable_sapi enable_sas enable_scarddlg +enable_scardsvr enable_sccbase enable_schannel enable_schedsvc @@ -21590,6 +21591,7 @@ wine_fn_config_makefile dlls/sapi enable_sapi wine_fn_config_makefile dlls/sapi/tests enable_tests wine_fn_config_makefile dlls/sas enable_sas wine_fn_config_makefile dlls/scarddlg enable_scarddlg +wine_fn_config_makefile dlls/scardsvr enable_scardsvr wine_fn_config_makefile dlls/sccbase enable_sccbase wine_fn_config_makefile dlls/schannel enable_schannel wine_fn_config_makefile dlls/schannel/tests enable_tests diff --git a/configure.ac b/configure.ac index 2b0e0eaccff..8a6d21702cc 100644 --- a/configure.ac +++ b/configure.ac @@ -2961,6 +2961,7 @@ WINE_CONFIG_MAKEFILE(dlls/sapi) WINE_CONFIG_MAKEFILE(dlls/sapi/tests) WINE_CONFIG_MAKEFILE(dlls/sas) WINE_CONFIG_MAKEFILE(dlls/scarddlg) +WINE_CONFIG_MAKEFILE(dlls/scardsvr) WINE_CONFIG_MAKEFILE(dlls/sccbase) WINE_CONFIG_MAKEFILE(dlls/schannel) WINE_CONFIG_MAKEFILE(dlls/schannel/tests) diff --git a/dlls/scardsvr/Makefile.in b/dlls/scardsvr/Makefile.in new file mode 100644 index 00000000000..c89e86c17d8 --- /dev/null +++ b/dlls/scardsvr/Makefile.in @@ -0,0 +1,5 @@ +MODULE = scardsvr.dll +IMPORTS = advapi32 + +C_SRCS = \ + scardsvr.c diff --git a/dlls/scardsvr/scardsvr.c b/dlls/scardsvr/scardsvr.c new file mode 100644 index 00000000000..5c4e26f5362 --- /dev/null +++ b/dlls/scardsvr/scardsvr.c @@ -0,0 +1,88 @@ +/* + * Smart card service + * + * Copyright 2014 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 + */ + +#include <stdarg.h> +#include "windef.h" +#include "winbase.h" +#include "winsvc.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(winscard); + +static SERVICE_STATUS_HANDLE service_handle; +static HANDLE stop_event; + +static DWORD WINAPI service_handler(DWORD ctrl, DWORD event_type, void *event_data, void *context) +{ + SERVICE_STATUS status; + + status.dwServiceType = SERVICE_WIN32; + status.dwControlsAccepted = SERVICE_ACCEPT_STOP; + status.dwWin32ExitCode = 0; + status.dwServiceSpecificExitCode = 0; + status.dwCheckPoint = 0; + status.dwWaitHint = 0; + + switch(ctrl) + { + case SERVICE_CONTROL_STOP: + case SERVICE_CONTROL_SHUTDOWN: + TRACE("Shutting down.\n"); + status.dwCurrentState = SERVICE_STOP_PENDING; + status.dwControlsAccepted = 0; + SetServiceStatus(service_handle, &status); + SetEvent(stop_event); + return ERROR_SUCCESS; + + default: + FIXME("Got unknown control %#lx.\n", ctrl); + status.dwCurrentState = SERVICE_RUNNING; + SetServiceStatus(service_handle, &status); + return ERROR_SUCCESS; + } +} + +void WINAPI CalaisMain(DWORD argc, WCHAR **argv) +{ + SERVICE_STATUS status; + + TRACE("Starting service.\n"); + + stop_event = CreateEventW(NULL, TRUE, FALSE, NULL); + + if (!(service_handle = RegisterServiceCtrlHandlerExW(L"scardsvr", service_handler, NULL))) + return; + + status.dwServiceType = SERVICE_WIN32; + status.dwCurrentState = SERVICE_RUNNING; + status.dwControlsAccepted = SERVICE_ACCEPT_STOP | SERVICE_ACCEPT_SHUTDOWN; + status.dwWin32ExitCode = 0; + status.dwServiceSpecificExitCode = 0; + status.dwCheckPoint = 0; + status.dwWaitHint = 10000; + SetServiceStatus(service_handle, &status); + + WaitForSingleObject(stop_event, INFINITE); + + status.dwCurrentState = SERVICE_STOPPED; + status.dwControlsAccepted = 0; + SetServiceStatus(service_handle, &status); + TRACE("Service stopped.\n"); +} diff --git a/dlls/scardsvr/scardsvr.spec b/dlls/scardsvr/scardsvr.spec new file mode 100644 index 00000000000..c33a1aa6569 --- /dev/null +++ b/dlls/scardsvr/scardsvr.spec @@ -0,0 +1,3 @@ +@ stdcall -private CalaisMain(long ptr) +@ stub InitSmartCardService +# @ stub SvchostPushServiceGlobals diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 58013064753..a306b07dc26 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -171,6 +171,7 @@ AddService=EventLog,0x800,EventLogService AddService=HTTP,0,HTTPService AddService=MSIServer,0,MSIService AddService=RpcSs,0,RpcSsService +AddService=scardsvr,0,ScardSvrService AddService=Spooler,0,SpoolerService AddService=StiSvc,0,StiService AddService=TermService,0,TerminalServices @@ -190,6 +191,7 @@ AddService=EventLog,0x800,EventLogService AddService=HTTP,0,HTTPService AddService=MSIServer,0,MSIService AddService=RpcSs,0,RpcSsService +AddService=scardsvr,0,ScardSvrService AddService=Spooler,0,SpoolerService AddService=StiSvc,0,StiService AddService=TermService,0,TerminalServices @@ -209,6 +211,7 @@ AddService=EventLog,0x800,EventLogService AddService=HTTP,0,HTTPService AddService=MSIServer,0,MSIService AddService=RpcSs,0,RpcSsService +AddService=scardsvr,0,ScardSvrService AddService=Spooler,0,SpoolerService AddService=StiSvc,0,StiService AddService=TermService,0,TerminalServices @@ -228,6 +231,7 @@ AddService=EventLog,0x800,EventLogService AddService=HTTP,0,HTTPService AddService=MSIServer,0,MSIService AddService=RpcSs,0,RpcSsService +AddService=scardsvr,0,ScardSvrService AddService=Spooler,0,SpoolerService AddService=StiSvc,0,StiService AddService=TermService,0,TerminalServices @@ -2321,6 +2325,19 @@ ServiceType=32 StartType=3 ErrorControl=1 +[ScardSvrService] +AddReg=ScardSvrServiceKeys +DisplayName="Smart card server" +ServiceBinary="%11%\svchost.exe -k netsvcs" +ServiceType=32 +StartType=3 +ErrorControl=1 + +[ScardSvrServiceKeys] +HKR,Parameters,"ServiceDll",,"%11%\scardsvr.dll" +HKR,Parameters,"ServiceMain",,"CalaisMain" +HKLM,%CurrentVersionNT%\SvcHost,"netsvcs",0x00010008,"scardsvr" + [SpoolerService] AddReg=SpoolerServiceKeys Description="Loads files to memory for later printing"

1 0

Zebediah Figura : setupapi/tests: Add tests for FLG_ADDREG_APPEND.
by Alexandre Julliard Feb. 8, 2023

Feb. 8, 2023

Module: wine Branch: master Commit: d7c8279c08c25e2afddb33184522386e928d5497 URL: https://gitlab.winehq.org/wine/wine/-/commit/d7c8279c08c25e2afddb3318452238… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Feb 6 19:24:26 2023 -0600 setupapi/tests: Add tests for FLG_ADDREG_APPEND. --- dlls/setupapi/tests/install.c | 100 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 100 insertions(+) diff --git a/dlls/setupapi/tests/install.c b/dlls/setupapi/tests/install.c index 2bbcbec88dc..0334450dfce 100644 --- a/dlls/setupapi/tests/install.c +++ b/dlls/setupapi/tests/install.c @@ -2297,6 +2297,105 @@ static void test_rename(void) ok(ret, "Failed to delete directory, error %lu.\n", GetLastError()); } +static void test_append_reg(void) +{ + static const char inf_data[] = "[Version]\n" + "Signature=\"$Chicago$\"\n" + "[DefaultInstall]\n" + "AddReg=reg_section\n" + "[reg_section]\n" + "HKCU,Software\\winetest_setupapi,value,0x10008,\"data\"\n"; + + void *context = SetupInitDefaultQueueCallbackEx(NULL, INVALID_HANDLE_VALUE, 0, 0, 0); + char path[MAX_PATH]; + DWORD type, size; + char value[20]; + HINF hinf; + BOOL ret; + HKEY key; + LONG l; + + create_inf_file("test.inf", inf_data); + sprintf(path, "%s\\test.inf", CURR_DIR); + hinf = SetupOpenInfFileA(path, NULL, INF_STYLE_WIN4, NULL); + ok(hinf != INVALID_HANDLE_VALUE, "Failed to open INF file, error %#lx.\n", GetLastError()); + + /* Key doesn't exist yet. */ + + RegDeleteKeyA(HKEY_CURRENT_USER, "winetest_setupapi"); + + ret = SetupInstallFromInfSectionA(NULL, hinf, "DefaultInstall", SPINST_REGISTRY, + NULL, "C:\\", 0, SetupDefaultQueueCallbackA, context, NULL, NULL); + ok(ret, "Failed to install, error %#lx.\n", GetLastError()); + + l = RegOpenKeyA(HKEY_CURRENT_USER, "Software\\winetest_setupapi", &key); + ok(!l, "Got error %lu.\n", l); + size = sizeof(value); + l = RegQueryValueExA(key, "value", NULL, &type, (BYTE *)value, &size); + todo_wine ok(!l, "Got error %lu.\n", l); + if (!l) + { + ok(type == REG_MULTI_SZ, "Got type %#lx.\n", type); + ok(size == sizeof("data\0"), "Got size %lu.\n", size); + ok(!memcmp(value, "data\0", size), "Got data %s.\n", debugstr_an(value, size)); + } + + /* Key exists and already has a value. */ + + l = RegSetValueExA(key, "value", 0, REG_MULTI_SZ, (const BYTE *)"foo\0bar\0", sizeof("foo\0bar\0")); + ok(!l, "Got error %lu.\n", l); + + ret = SetupInstallFromInfSectionA(NULL, hinf, "DefaultInstall", SPINST_REGISTRY, + NULL, "C:\\", 0, SetupDefaultQueueCallbackA, context, NULL, NULL); + ok(ret, "Failed to install, error %#lx.\n", GetLastError()); + + size = sizeof(value); + l = RegQueryValueExA(key, "value", NULL, &type, (BYTE *)value, &size); + ok(!l, "Got error %lu.\n", l); + ok(type == REG_MULTI_SZ, "Got type %#lx.\n", type); + ok(size == sizeof("foo\0bar\0data\0"), "Got size %lu.\n", size); + ok(!memcmp(value, "foo\0bar\0data\0", size), "Got data %s.\n", debugstr_an(value, size)); + + /* Key exists and already has the value to be added. */ + + ret = SetupInstallFromInfSectionA(NULL, hinf, "DefaultInstall", SPINST_REGISTRY, + NULL, "C:\\", 0, SetupDefaultQueueCallbackA, context, NULL, NULL); + ok(ret, "Failed to install, error %#lx.\n", GetLastError()); + + size = sizeof(value); + l = RegQueryValueExA(key, "value", NULL, &type, (BYTE *)value, &size); + ok(!l, "Got error %lu.\n", l); + ok(type == REG_MULTI_SZ, "Got type %#lx.\n", type); + ok(size == sizeof("foo\0bar\0data\0"), "Got size %lu.\n", size); + ok(!memcmp(value, "foo\0bar\0data\0", size), "Got data %s.\n", debugstr_an(value, size)); + + /* Key exists and already has a value of the wrong type. */ + + l = RegSetValueExA(key, "value", 0, REG_SZ, (const BYTE *)"string", sizeof("string")); + ok(!l, "Got error %lu.\n", l); + + ret = SetupInstallFromInfSectionA(NULL, hinf, "DefaultInstall", SPINST_REGISTRY, + NULL, "C:\\", 0, SetupDefaultQueueCallbackA, context, NULL, NULL); + todo_wine ok(!ret, "Expected failure.\n"); + todo_wine ok(GetLastError() == ERROR_INVALID_DATA, "Got error %#lx.\n", GetLastError()); + + size = sizeof(value); + l = RegQueryValueExA(key, "value", NULL, &type, (BYTE *)value, &size); + ok(!l, "Got error %lu.\n", l); + ok(type == REG_SZ, "Got type %#lx.\n", type); + ok(size == sizeof("string"), "Got size %lu.\n", size); + ok(!memcmp(value, "string", size), "Got data %s.\n", debugstr_an(value, size)); + + RegCloseKey(key); + + l = RegDeleteKeyA(HKEY_CURRENT_USER, "Software\\winetest_setupapi"); + ok(!l, "Got error %lu.\n", l); + + SetupCloseInfFile(hinf); + ret = DeleteFileA("test.inf"); + ok(ret, "Failed to delete INF file, error %lu.\n", GetLastError()); +} + static WCHAR service_name[] = L"Wine Test Service"; static SERVICE_STATUS_HANDLE service_handle; static HANDLE stop_event; @@ -2406,6 +2505,7 @@ START_TEST(install) test_start_copy(); test_register_dlls(); test_rename(); + test_append_reg(); UnhookWindowsHookEx(hhook);

1 0

Zebediah Figura : setupapi: Fail installation when trying to append to a registry value of the wrong type.
by Alexandre Julliard Feb. 8, 2023

Feb. 8, 2023

Module: wine Branch: master Commit: 0ab56b88dfdca442ab0820eacc14f6397f628924 URL: https://gitlab.winehq.org/wine/wine/-/commit/0ab56b88dfdca442ab0820eacc14f6… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Feb 6 19:36:49 2023 -0600 setupapi: Fail installation when trying to append to a registry value of the wrong type. --- dlls/setupapi/install.c | 29 ++++++++++++++++++++++------- dlls/setupapi/tests/install.c | 4 ++-- 2 files changed, 24 insertions(+), 9 deletions(-) diff --git a/dlls/setupapi/install.c b/dlls/setupapi/install.c index 532ac6c36a6..435918e815e 100644 --- a/dlls/setupapi/install.c +++ b/dlls/setupapi/install.c @@ -19,6 +19,7 @@ */ #include <stdarg.h> +#include <stdbool.h> #define COBJMACROS @@ -227,17 +228,26 @@ static HKEY get_root_key( const WCHAR *name, HKEY def_root ) * * Append a multisz string to a multisz registry value. */ -static void append_multi_sz_value( HKEY hkey, const WCHAR *value, const WCHAR *strings, +static bool append_multi_sz_value( HKEY hkey, const WCHAR *value, const WCHAR *strings, DWORD str_size ) { DWORD size, type, total; WCHAR *buffer, *p; - if (RegQueryValueExW( hkey, value, NULL, &type, NULL, &size )) return; - if (type != REG_MULTI_SZ) return; + if (RegQueryValueExW( hkey, value, NULL, &type, NULL, &size )) return true; + if (type != REG_MULTI_SZ) + { + WARN( "value %s exists but has wrong type %#lx\n", debugstr_w(value), type ); + SetLastError( ERROR_INVALID_DATA ); + return false; + } - if (!(buffer = HeapAlloc( GetProcessHeap(), 0, (size + str_size) * sizeof(WCHAR) ))) return; - if (RegQueryValueExW( hkey, value, NULL, NULL, (BYTE *)buffer, &size )) goto done; + if (!(buffer = HeapAlloc( GetProcessHeap(), 0, (size + str_size) * sizeof(WCHAR) ))) return false; + if (RegQueryValueExW( hkey, value, NULL, NULL, (BYTE *)buffer, &size )) + { + HeapFree( GetProcessHeap(), 0, buffer ); + return false; + } /* compare each string against all the existing ones */ total = size; @@ -261,8 +271,9 @@ static void append_multi_sz_value( HKEY hkey, const WCHAR *value, const WCHAR *s TRACE( "setting value %s to %s\n", debugstr_w(value), debugstr_w(buffer) ); RegSetValueExW( hkey, value, 0, REG_MULTI_SZ, (BYTE *)buffer, total ); } - done: + HeapFree( GetProcessHeap(), 0, buffer ); + return true; } @@ -374,7 +385,11 @@ static BOOL do_reg_operation( HKEY hkey, const WCHAR *value, INFCONTEXT *context if (flags & FLG_ADDREG_APPEND) { if (!str) return TRUE; - append_multi_sz_value( hkey, value, str, size ); + if (!append_multi_sz_value( hkey, value, str, size )) + { + HeapFree( GetProcessHeap(), 0, str ); + return FALSE; + } HeapFree( GetProcessHeap(), 0, str ); return TRUE; } diff --git a/dlls/setupapi/tests/install.c b/dlls/setupapi/tests/install.c index 0334450dfce..10c93482ece 100644 --- a/dlls/setupapi/tests/install.c +++ b/dlls/setupapi/tests/install.c @@ -2376,8 +2376,8 @@ static void test_append_reg(void) ret = SetupInstallFromInfSectionA(NULL, hinf, "DefaultInstall", SPINST_REGISTRY, NULL, "C:\\", 0, SetupDefaultQueueCallbackA, context, NULL, NULL); - todo_wine ok(!ret, "Expected failure.\n"); - todo_wine ok(GetLastError() == ERROR_INVALID_DATA, "Got error %#lx.\n", GetLastError()); + ok(!ret, "Expected failure.\n"); + ok(GetLastError() == ERROR_INVALID_DATA, "Got error %#lx.\n", GetLastError()); size = sizeof(value); l = RegQueryValueExA(key, "value", NULL, &type, (BYTE *)value, &size);

1 0

Zebediah Figura : wine.inf: Always use FLG_ADDREG_APPEND for SvcHost entries.
by Alexandre Julliard Feb. 8, 2023

Feb. 8, 2023

Module: wine Branch: master Commit: c08310a8822ecb0829c5967e6892525eec61f46c URL: https://gitlab.winehq.org/wine/wine/-/commit/c08310a8822ecb0829c5967e689252… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Feb 6 20:08:30 2023 -0600 wine.inf: Always use FLG_ADDREG_APPEND for SvcHost entries. Now that FLG_ADDREG_APPEND is changed to correctly create the value if it doesn't exist, this is safe, and less error-prone when adding new services. --- loader/wine.inf.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 3c9cb9bc6dc..58013064753 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -2370,15 +2370,15 @@ ErrorControl=1 [BITSServiceKeys] HKR,Parameters,"ServiceDll",,"%11%\qmgr.dll" -HKLM,%CurrentVersionNT%\SvcHost,"netsvcs",0x00010000,"BITS" +HKLM,%CurrentVersionNT%\SvcHost,"netsvcs",0x00010008,"BITS" [EventLogServiceKeys] HKR,Parameters,"ServiceDll",,"%11%\wevtsvc.dll" -HKLM,%CurrentVersionNT%\SvcHost,"LocalServiceNetworkRestricted",0x00010000,"EventLog" +HKLM,%CurrentVersionNT%\SvcHost,"LocalServiceNetworkRestricted",0x00010008,"EventLog" [StiServiceKeys] HKR,Parameters,"ServiceDll",,"%11%\wiaservc.dll" -HKLM,%CurrentVersionNT%\SvcHost,"imgsvc",0x00010000,"StiSvc" +HKLM,%CurrentVersionNT%\SvcHost,"imgsvc",0x00010008,"StiSvc" [PlugPlayService] Description="Enables automatic configuration of devices"

1 0

Zebediah Figura : setupapi: Create the registry value if it doesn't exist in append_multi_sz_value().
by Alexandre Julliard Feb. 8, 2023

Feb. 8, 2023

Module: wine Branch: master Commit: 38e36e8fdaf6dc682ce5af7b5b00cb795fffd967 URL: https://gitlab.winehq.org/wine/wine/-/commit/38e36e8fdaf6dc682ce5af7b5b00cb… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Feb 6 19:43:08 2023 -0600 setupapi: Create the registry value if it doesn't exist in append_multi_sz_value(). --- dlls/setupapi/install.c | 21 ++++++++++++++++++++- dlls/setupapi/tests/install.c | 11 ++++------- 2 files changed, 24 insertions(+), 8 deletions(-) diff --git a/dlls/setupapi/install.c b/dlls/setupapi/install.c index 435918e815e..8a28bfcc4e1 100644 --- a/dlls/setupapi/install.c +++ b/dlls/setupapi/install.c @@ -233,8 +233,27 @@ static bool append_multi_sz_value( HKEY hkey, const WCHAR *value, const WCHAR *s { DWORD size, type, total; WCHAR *buffer, *p; + LONG ret; + + if ((ret = RegQueryValueExW( hkey, value, NULL, &type, NULL, &size ))) + { + if (ret != ERROR_FILE_NOT_FOUND) + { + ERR( "failed to query value %s, error %lu\n", debugstr_w(value), ret ); + SetLastError( ret ); + return false; + } + + if ((ret = RegSetValueExW( hkey, value, 0, REG_MULTI_SZ, (BYTE *)strings, str_size * sizeof(WCHAR) ))) + { + ERR( "failed to set value %s, error %lu\n", debugstr_w(value), ret ); + SetLastError( ret ); + return false; + } + + return true; + } - if (RegQueryValueExW( hkey, value, NULL, &type, NULL, &size )) return true; if (type != REG_MULTI_SZ) { WARN( "value %s exists but has wrong type %#lx\n", debugstr_w(value), type ); diff --git a/dlls/setupapi/tests/install.c b/dlls/setupapi/tests/install.c index 10c93482ece..318f1294210 100644 --- a/dlls/setupapi/tests/install.c +++ b/dlls/setupapi/tests/install.c @@ -2332,13 +2332,10 @@ static void test_append_reg(void) ok(!l, "Got error %lu.\n", l); size = sizeof(value); l = RegQueryValueExA(key, "value", NULL, &type, (BYTE *)value, &size); - todo_wine ok(!l, "Got error %lu.\n", l); - if (!l) - { - ok(type == REG_MULTI_SZ, "Got type %#lx.\n", type); - ok(size == sizeof("data\0"), "Got size %lu.\n", size); - ok(!memcmp(value, "data\0", size), "Got data %s.\n", debugstr_an(value, size)); - } + ok(!l, "Got error %lu.\n", l); + ok(type == REG_MULTI_SZ, "Got type %#lx.\n", type); + ok(size == sizeof("data\0"), "Got size %lu.\n", size); + ok(!memcmp(value, "data\0", size), "Got data %s.\n", debugstr_an(value, size)); /* Key exists and already has a value. */

1 0

Francisco Casas : vkd3d-shader/hlsl: Map SM1 src swizzles outside write_sm1_instruction().
by Alexandre Julliard Feb. 8, 2023

Feb. 8, 2023

Module: vkd3d Branch: master Commit: d01729921c18912708ac3fb75413674e2a678a49 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/d01729921c18912708ac3fb754136… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Fri Feb 3 11:25:19 2023 -0300 vkd3d-shader/hlsl: Map SM1 src swizzles outside write_sm1_instruction(). Not every instruction expects src swizzles to be mapped according to the dst writemasks, so this logic must be outside this function. --- libs/vkd3d-shader/hlsl_sm1.c | 32 ++++++++++++++++++++++++-------- 1 file changed, 24 insertions(+), 8 deletions(-) diff --git a/libs/vkd3d-shader/hlsl_sm1.c b/libs/vkd3d-shader/hlsl_sm1.c index 60b54a42..ebeaadb1 100644 --- a/libs/vkd3d-shader/hlsl_sm1.c +++ b/libs/vkd3d-shader/hlsl_sm1.c @@ -435,11 +435,9 @@ static void write_sm1_dst_register(struct vkd3d_bytecode_buffer *buffer, const s } static void write_sm1_src_register(struct vkd3d_bytecode_buffer *buffer, - const struct sm1_src_register *reg, unsigned int dst_writemask) + const struct sm1_src_register *reg) { - unsigned int swizzle = hlsl_map_swizzle(reg->swizzle, dst_writemask); - - put_u32(buffer, (1u << 31) | sm1_encode_register_type(reg->type) | reg->mod | (swizzle << 16) | reg->reg); + put_u32(buffer, (1u << 31) | sm1_encode_register_type(reg->type) | reg->mod | (reg->swizzle << 16) | reg->reg); } static void write_sm1_instruction(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *buffer, @@ -456,14 +454,19 @@ static void write_sm1_instruction(struct hlsl_ctx *ctx, struct vkd3d_bytecode_bu write_sm1_dst_register(buffer, &instr->dst); for (i = 0; i < instr->src_count; ++i) - write_sm1_src_register(buffer, &instr->srcs[i], instr->dst.writemask); + write_sm1_src_register(buffer, &instr->srcs[i]); }; +static void sm1_map_src_swizzle(struct sm1_src_register *src, unsigned int map_writemask) +{ + src->swizzle = hlsl_map_swizzle(src->swizzle, map_writemask); +} + static void write_sm1_ternary_op(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *buffer, D3DSHADER_INSTRUCTION_OPCODE_TYPE opcode, const struct hlsl_reg *dst, const struct hlsl_reg *src1, const struct hlsl_reg *src2, const struct hlsl_reg *src3) { - const struct sm1_instruction instr = + struct sm1_instruction instr = { .opcode = opcode, @@ -483,6 +486,10 @@ static void write_sm1_ternary_op(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buf .srcs[2].reg = src3->id, .src_count = 3, }; + + sm1_map_src_swizzle(&instr.srcs[0], instr.dst.writemask); + sm1_map_src_swizzle(&instr.srcs[1], instr.dst.writemask); + sm1_map_src_swizzle(&instr.srcs[2], instr.dst.writemask); write_sm1_instruction(ctx, buffer, &instr); } @@ -490,7 +497,7 @@ static void write_sm1_binary_op(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buff D3DSHADER_INSTRUCTION_OPCODE_TYPE opcode, const struct hlsl_reg *dst, const struct hlsl_reg *src1, const struct hlsl_reg *src2) { - const struct sm1_instruction instr = + struct sm1_instruction instr = { .opcode = opcode, @@ -507,6 +514,9 @@ static void write_sm1_binary_op(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buff .srcs[1].reg = src2->id, .src_count = 2, }; + + sm1_map_src_swizzle(&instr.srcs[0], instr.dst.writemask); + sm1_map_src_swizzle(&instr.srcs[1], instr.dst.writemask); write_sm1_instruction(ctx, buffer, &instr); } @@ -514,7 +524,7 @@ static void write_sm1_unary_op(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffe D3DSHADER_INSTRUCTION_OPCODE_TYPE opcode, const struct hlsl_reg *dst, const struct hlsl_reg *src, D3DSHADER_PARAM_SRCMOD_TYPE src_mod, D3DSHADER_PARAM_DSTMOD_TYPE dst_mod) { - const struct sm1_instruction instr = + struct sm1_instruction instr = { .opcode = opcode, @@ -530,6 +540,8 @@ static void write_sm1_unary_op(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffe .srcs[0].mod = src_mod, .src_count = 1, }; + + sm1_map_src_swizzle(&instr.srcs[0], instr.dst.writemask); write_sm1_instruction(ctx, buffer, &instr); } @@ -634,6 +646,7 @@ static void write_sm1_constant(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffe assert(instr->reg.allocated); assert(constant->reg.allocated); + sm1_map_src_swizzle(&sm1_instr.srcs[0], sm1_instr.dst.writemask); write_sm1_instruction(ctx, buffer, &sm1_instr); } @@ -777,6 +790,7 @@ static void write_sm1_load(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *b sm1_instr.srcs[0].swizzle = hlsl_swizzle_from_writemask((1 << load->src.var->data_type->dimx) - 1); } + sm1_map_src_swizzle(&sm1_instr.srcs[0], sm1_instr.dst.writemask); write_sm1_instruction(ctx, buffer, &sm1_instr); } @@ -822,6 +836,7 @@ static void write_sm1_store(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer * else assert(reg.allocated); + sm1_map_src_swizzle(&sm1_instr.srcs[0], sm1_instr.dst.writemask); write_sm1_instruction(ctx, buffer, &sm1_instr); } @@ -848,6 +863,7 @@ static void write_sm1_swizzle(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer assert(instr->reg.allocated); assert(val->reg.allocated); + sm1_map_src_swizzle(&sm1_instr.srcs[0], sm1_instr.dst.writemask); write_sm1_instruction(ctx, buffer, &sm1_instr); }

1 0

Francisco Casas : vkd3d-shader/hlsl: Set writemasks correctly for SM1 scalar and vector types.
by Alexandre Julliard Feb. 8, 2023

Feb. 8, 2023

Module: vkd3d Branch: master Commit: b84f560bdf59c35e093e51bfdf9a166c196d3a9b URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/b84f560bdf59c35e093e51bfdf9a1… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Thu Feb 2 14:41:13 2023 -0300 vkd3d-shader/hlsl: Set writemasks correctly for SM1 scalar and vector types. Because of the change introduced in f21693b2 vkd3d-shader/hlsl: Use reg_size as component count when allocating a single register. SM1 scalars and vectors were not longer getting the correct writemask when they are allocated. This happened because they have to reserve the whole register even if they only use some of its components, so their reg_size may differ from the number of components. This commit fixes that. --- libs/vkd3d-shader/hlsl_codegen.c | 36 ++++++++++++++++-------------------- 1 file changed, 16 insertions(+), 20 deletions(-) diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 83b4c6b6..7c95ebd1 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -2231,6 +2231,15 @@ static struct hlsl_reg allocate_range(struct hlsl_ctx *ctx, struct liveness *liv return ret; } +static struct hlsl_reg allocate_numeric_registers_for_type(struct hlsl_ctx *ctx, struct liveness *liveness, + unsigned int first_write, unsigned int last_read, const struct hlsl_type *type) +{ + if (type->type <= HLSL_CLASS_VECTOR) + return allocate_register(ctx, liveness, first_write, last_read, type->reg_size, type->dimx); + else + return allocate_range(ctx, liveness, first_write, last_read, type->reg_size); +} + static const char *debug_register(char class, struct hlsl_reg reg, const struct hlsl_type *type) { static const char writemask_offset[] = {'w','x','y','z'}; @@ -2254,12 +2263,9 @@ static void allocate_variable_temp_register(struct hlsl_ctx *ctx, struct hlsl_ir if (!var->reg.allocated && var->last_read) { - if (var->data_type->reg_size > 4) - var->reg = allocate_range(ctx, liveness, var->first_write, - var->last_read, var->data_type->reg_size); - else - var->reg = allocate_register(ctx, liveness, var->first_write, - var->last_read, var->data_type->reg_size, var->data_type->reg_size); + var->reg = allocate_numeric_registers_for_type(ctx, liveness, var->first_write, var->last_read, + var->data_type); + TRACE("Allocated %s to %s (liveness %u-%u).\n", var->name, debug_register('r', var->reg, var->data_type), var->first_write, var->last_read); } @@ -2273,12 +2279,8 @@ static void allocate_temp_registers_recurse(struct hlsl_ctx *ctx, struct hlsl_bl { if (!instr->reg.allocated && instr->last_read) { - if (instr->data_type->reg_size > 4) - instr->reg = allocate_range(ctx, liveness, instr->index, - instr->last_read, instr->data_type->reg_size); - else - instr->reg = allocate_register(ctx, liveness, instr->index, - instr->last_read, instr->data_type->reg_size, instr->data_type->reg_size); + instr->reg = allocate_numeric_registers_for_type(ctx, liveness, instr->index, instr->last_read, + instr->data_type); TRACE("Allocated anonymous expression @%u to %s (liveness %u-%u).\n", instr->index, debug_register('r', instr->reg, instr->data_type), instr->index, instr->last_read); } @@ -2338,10 +2340,7 @@ static void allocate_const_registers_recurse(struct hlsl_ctx *ctx, struct hlsl_b unsigned int x, y, i, writemask, end_reg; unsigned int reg_size = type->reg_size; - if (reg_size > 4) - constant->reg = allocate_range(ctx, liveness, 1, UINT_MAX, reg_size); - else - constant->reg = allocate_register(ctx, liveness, 1, UINT_MAX, reg_size, reg_size); + constant->reg = allocate_numeric_registers_for_type(ctx, liveness, 1, UINT_MAX, type); TRACE("Allocated constant @%u to %s.\n", instr->index, debug_register('c', constant->reg, type)); if (!hlsl_array_reserve(ctx, (void **)&defs->values, &defs->size, @@ -2438,10 +2437,7 @@ static void allocate_const_registers(struct hlsl_ctx *ctx, struct hlsl_ir_functi if (var->data_type->reg_size == 0) continue; - if (var->data_type->reg_size > 4) - var->reg = allocate_range(ctx, &liveness, 1, UINT_MAX, var->data_type->reg_size); - else - var->reg = allocate_register(ctx, &liveness, 1, UINT_MAX, 4, var->data_type->reg_size); + var->reg = allocate_numeric_registers_for_type(ctx, &liveness, 1, UINT_MAX, var->data_type); TRACE("Allocated %s to %s.\n", var->name, debug_register('c', var->reg, var->data_type)); } }

1 0