September 2020 - Wine-devel

[PATCH] oleaut32: ITypeInfo_ReleaseFuncDesc_Proxy handle NULL parameter
by Alistair Leslie-Hughes 22 Sep '20

22 Sep '20

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/oleaut32/usrmarshal.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/oleaut32/usrmarshal.c b/dlls/oleaut32/usrmarshal.c index 163b48f6f4..07dabde174 100644 --- a/dlls/oleaut32/usrmarshal.c +++ b/dlls/oleaut32/usrmarshal.c @@ -1905,6 +1905,9 @@ void CALLBACK ITypeInfo_ReleaseFuncDesc_Proxy( SHORT param; TRACE("(%p, %p)\n", This, pFuncDesc); + if (!pFuncDesc) + return; + for(param = 0; param < pFuncDesc->cParams; param++) free_embedded_elemdesc(pFuncDesc->lprgelemdescParam + param); if(param) -- 2.28.0

3 2

[PATCH v2] d3dx9: No need to fail if we don't support vertices reordering in D3DXMESHOPT_ATTRSORT
by Gijs Vermeulen 22 Sep '20

22 Sep '20

From: Christian Costa <titan.costa(a)gmail.com> A non optimized mesh does not prevent rendering as long as we return valid data to the application. In our case we provided an identity remapping array when no vertices reordering is done. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48529 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- v2: d3dx9_36 -> d3dx9, sorry for the noise. dlls/d3dx9_36/mesh.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index 22f86f10d0..8f7c926c32 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -1689,11 +1689,7 @@ static HRESULT WINAPI d3dx9_mesh_OptimizeInplace(ID3DXMesh *iface, DWORD flags, if (FAILED(hr)) goto cleanup; } else if (flags & D3DXMESHOPT_ATTRSORT) { if (!(flags & D3DXMESHOPT_IGNOREVERTS)) - { FIXME("D3DXMESHOPT_ATTRSORT vertex reordering not implemented.\n"); - hr = E_NOTIMPL; - goto cleanup; - } hr = iface->lpVtbl->LockAttributeBuffer(iface, 0, &attrib_buffer); if (FAILED(hr)) goto cleanup; -- 2.28.0

2 1

[PATCH] d3dx9_36: No need to fail if we don't support vertices reordering in D3DXMESHOPT_ATTRSORT
by Gijs Vermeulen 22 Sep '20

22 Sep '20

From: Christian Costa <titan.costa(a)gmail.com> A non optimized mesh does not prevent rendering as long as we return valid data to the application. In our case we provided an identity remapping array when no vertices reordering is done. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48529 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- dlls/d3dx9_36/mesh.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index 22f86f10d0..8f7c926c32 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -1689,11 +1689,7 @@ static HRESULT WINAPI d3dx9_mesh_OptimizeInplace(ID3DXMesh *iface, DWORD flags, if (FAILED(hr)) goto cleanup; } else if (flags & D3DXMESHOPT_ATTRSORT) { if (!(flags & D3DXMESHOPT_IGNOREVERTS)) - { FIXME("D3DXMESHOPT_ATTRSORT vertex reordering not implemented.\n"); - hr = E_NOTIMPL; - goto cleanup; - } hr = iface->lpVtbl->LockAttributeBuffer(iface, 0, &attrib_buffer); if (FAILED(hr)) goto cleanup; -- 2.28.0

2 1

[PATCH 1/3] wined3d: Track resource binding as render target.
by Paul Gofman 22 Sep '20

22 Sep '20

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/wined3d/device.c | 12 +++++++++++- dlls/wined3d/wined3d_private.h | 18 ++++++++++-------- 2 files changed, 21 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 7fef322e3d0..036ff8f81c6 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1060,6 +1060,7 @@ HRESULT wined3d_device_set_implicit_swapchain(struct wined3d_device *device, str static const struct wined3d_color black = {0.0f, 0.0f, 0.0f, 0.0f}; const struct wined3d_swapchain_desc *swapchain_desc; DWORD clear_flags = 0; + unsigned int i; HRESULT hr; TRACE("device %p, swapchain %p.\n", device, swapchain); @@ -1096,6 +1097,10 @@ HRESULT wined3d_device_set_implicit_swapchain(struct wined3d_device *device, str } device->swapchains[0] = swapchain; + for (i = 0; i < ARRAY_SIZE(device->state.fb.render_targets); ++i) + if (device->state.fb.render_targets[i]) + wined3d_dec_rtv_bind_count(device->state.fb.render_targets[i]); + memset(device->state.fb.render_targets, 0, sizeof(device->state.fb.render_targets)); if (FAILED(hr = device->adapter->adapter_ops->adapter_init_3d(device))) goto err_out; @@ -4873,13 +4878,19 @@ HRESULT CDECL wined3d_device_set_rendertarget_view(struct wined3d_device *device return WINED3D_OK; if (view) + { wined3d_rendertarget_view_incref(view); + wined3d_inc_rtv_bind_count(view); + } device->state.fb.render_targets[view_idx] = view; wined3d_cs_emit_set_rendertarget_view(device->cs, view_idx, view); /* Release after the assignment, to prevent device_resource_released() * from seeing the surface as still in use. */ if (prev) + { + wined3d_dec_rtv_bind_count(prev); wined3d_rendertarget_view_decref(prev); + } wined3d_unbind_srv_for_rtv(device, view, FALSE); @@ -4912,7 +4923,6 @@ HRESULT CDECL wined3d_device_set_depth_stencil_view(struct wined3d_device *devic wined3d_cs_emit_set_depth_stencil_view(device->cs, view); if (prev) wined3d_rendertarget_view_decref(prev); - wined3d_unbind_srv_for_rtv(device, view, TRUE); return WINED3D_OK; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 048c16663f4..147832ad771 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3954,6 +3954,7 @@ struct wined3d_resource LONG ref; LONG bind_count; LONG srv_bind_count_device; + LONG rtv_bind_count_device; LONG map_count; LONG access_count; struct wined3d_device *device; @@ -5999,23 +6000,24 @@ static inline BOOL wined3d_dsv_srv_conflict(const struct wined3d_rendertarget_vi static inline BOOL wined3d_resource_check_fbo_attached(const struct wined3d_state *state, const struct wined3d_resource *resource, const struct wined3d_format *srv_format) { - struct wined3d_rendertarget_view * const *rts = &state->fb.render_targets[0]; const struct wined3d_rendertarget_view *dsv; - unsigned int i; if ((resource->bind_flags & WINED3D_BIND_DEPTH_STENCIL) && (dsv = state->fb.depth_stencil) && dsv->resource == resource && wined3d_dsv_srv_conflict(dsv, srv_format)) return TRUE; - if (!(resource->bind_flags & WINED3D_BIND_RENDER_TARGET)) - return FALSE; + return resource->rtv_bind_count_device; +} - for (i = 0; i < WINED3D_MAX_RENDER_TARGETS; ++i) - if (rts[i] && rts[i]->resource == resource) - return TRUE; +static inline void wined3d_inc_rtv_bind_count(struct wined3d_rendertarget_view *rt) +{ + ++rt->resource->rtv_bind_count_device; +} - return FALSE; +static inline void wined3d_dec_rtv_bind_count(struct wined3d_rendertarget_view *rt) +{ + --rt->resource->rtv_bind_count_device; } static inline void wined3d_viewport_get_z_range(const struct wined3d_viewport *vp, float *min_z, float *max_z) -- 2.26.2

2 3

[PATCH] advapi32: Remove superfluous cast to self
by Michael Stefaniuc 22 Sep '20

22 Sep '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/advapi32/service.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index 846a2b8d456..8a1024ff803 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -179,12 +179,12 @@ EnumServicesStatusW( SC_HANDLE manager, DWORD type, DWORD state, ENUM_SERVICE_ST for (i = 0; i < *ret_count; i++) { lstrcpyW( p, status_ex[i].lpServiceName ); - status[i].lpServiceName = (WCHAR *)p; + status[i].lpServiceName = p; p += lstrlenW( p ) + 1; if (status_ex[i].lpDisplayName) { lstrcpyW( p, status_ex[i].lpDisplayName ); - status[i].lpDisplayName = (WCHAR *)p; + status[i].lpDisplayName = p; p += lstrlenW( p ) + 1; } else status[i].lpDisplayName = NULL; -- 2.26.2

2 1

[PATCH] xactengine3_7: Remove superfluous cast to self
by Michael Stefaniuc 22 Sep '20

22 Sep '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/xactengine3_7/xact_dll.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/xactengine3_7/xact_dll.c b/dlls/xactengine3_7/xact_dll.c index 742fe86cc95..84ed35d2c4d 100644 --- a/dlls/xactengine3_7/xact_dll.c +++ b/dlls/xactengine3_7/xact_dll.c @@ -259,7 +259,7 @@ static HRESULT WINAPI IXACT3SoundBankImpl_Prepare(IXACT3SoundBank *iface, cue->IXACT3Cue_iface.lpVtbl = &XACT3Cue_Vtbl; cue->fact_cue = fcue; - *ppCue = (IXACT3Cue*)&cue->IXACT3Cue_iface; + *ppCue = &cue->IXACT3Cue_iface; TRACE("Created Cue: %p\n", cue); @@ -301,7 +301,7 @@ static HRESULT WINAPI IXACT3SoundBankImpl_Play(IXACT3SoundBank *iface, cue->IXACT3Cue_iface.lpVtbl = &XACT3Cue_Vtbl; cue->fact_cue = fcue; - *ppCue = (IXACT3Cue*)&cue->IXACT3Cue_iface; + *ppCue = &cue->IXACT3Cue_iface; } return hr; -- 2.26.2

1 0

[PATCH] dwmapi: Implement DwmIsCompositionEnabled.
by Gijs Vermeulen 22 Sep '20

22 Sep '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=44055 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- I tested to see if win8 or win8.1 was the cutoff by advertising only win8 in a manifest TestBot run can be found here: https://testbot.winehq.org/JobDetails.pl?Key=78961 Run to see which machines return false without any other changes can be found here: https://testbot.winehq.org/JobDetails.pl?Key=78963 dlls/dwmapi/dwmapi_main.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/dlls/dwmapi/dwmapi_main.c b/dlls/dwmapi/dwmapi_main.c index 8408a2efed..eb11ecb6b7 100644 --- a/dlls/dwmapi/dwmapi_main.c +++ b/dlls/dwmapi/dwmapi_main.c @@ -51,19 +51,20 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) */ HRESULT WINAPI DwmIsCompositionEnabled(BOOL *enabled) { - static int once; - if (!once) - { - FIXME("%p\n", enabled); - once = 1; - } - else - TRACE("%p\n", enabled); + OSVERSIONINFOW version; + + TRACE("%p\n", enabled); if (!enabled) return E_INVALIDARG; - *enabled = FALSE; + version.dwOSVersionInfoSize = sizeof(OSVERSIONINFOW); + + if (!GetVersionExW(&version)) + *enabled = FALSE; + else + *enabled = (version.dwMajorVersion > 6 || (version.dwMajorVersion == 6 && version.dwMinorVersion >= 3)); + return S_OK; } -- 2.28.0

2 1

[PATCH] wevtsvc: Add EventLog service stub.
by Dmitry Timoshkov 22 Sep '20

22 Sep '20

There's an installer that fails if EventLog service is not running. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/advapi32/tests/service.c | 42 +++++++++++++++++ dlls/wevtsvc/Makefile.in | 7 +++ dlls/wevtsvc/wevtsvc.c | 87 +++++++++++++++++++++++++++++++++++ dlls/wevtsvc/wevtsvc.spec | 1 + loader/wine.inf.in | 17 +++++++ 5 files changed, 154 insertions(+) create mode 100644 dlls/wevtsvc/Makefile.in create mode 100644 dlls/wevtsvc/wevtsvc.c create mode 100644 dlls/wevtsvc/wevtsvc.spec diff --git a/dlls/advapi32/tests/service.c b/dlls/advapi32/tests/service.c index 7048e5a09a..94aecf5d7e 100644 --- a/dlls/advapi32/tests/service.c +++ b/dlls/advapi32/tests/service.c @@ -2678,6 +2678,47 @@ static void test_refcount(void) CloseServiceHandle(scm_handle); } +static void test_EventLog(void) +{ + SC_HANDLE scm_handle, svc_handle; + DWORD size; + BOOL ret; + QUERY_SERVICE_CONFIGA *config; + + scm_handle = OpenSCManagerA(NULL, NULL, GENERIC_READ); + ok(scm_handle != NULL, "OpenSCManager error %u\n", GetLastError()); + + svc_handle = OpenServiceA(scm_handle, "EventLog", GENERIC_READ); + ok(svc_handle != NULL, "OpenService error %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = QueryServiceConfigA(svc_handle, NULL, 0, &size); + ok(!ret, "QueryServiceConfig should fail\n"); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "got %u\n", GetLastError()); + + config = HeapAlloc(GetProcessHeap(), 0, size); + ret = QueryServiceConfigA(svc_handle, config, size, &size); + ok(ret, "QueryServiceConfig error %u\n", GetLastError()); + + ok(config->dwServiceType == SERVICE_WIN32_SHARE_PROCESS, "got %#x\n", config->dwServiceType); + ok(config->dwStartType == SERVICE_AUTO_START, "got %u\n", config->dwStartType); + ok(config->dwErrorControl == SERVICE_ERROR_NORMAL, "got %u\n", config->dwErrorControl); + ok(!strcmpi(config->lpBinaryPathName, "C:\\windows\\system32\\services.exe") /* XP */ || + !strcmpi(config->lpBinaryPathName, "C:\\windows\\system32\\svchost.exe -k LocalServiceNetworkRestricted") /* Vista+ */, + "got %s\n", config->lpBinaryPathName); +todo_wine + ok(!strcmp(config->lpLoadOrderGroup, "Event log"), "got %s\n", config->lpLoadOrderGroup); + ok(config->dwTagId == 0, "Expected 0, got %d\n", config->dwTagId); + ok(!config->lpDependencies[0], "lpDependencies is not empty\n"); + ok(!strcmp(config->lpServiceStartName, "LocalSystem"), "got %s\n", config->lpServiceStartName); + ok(!strcmp(config->lpDisplayName, "Event Log"), "got %s\n", config->lpDisplayName); + + HeapFree(GetProcessHeap(), 0, config); + + CloseServiceHandle(svc_handle); + CloseServiceHandle(scm_handle); +} + static DWORD WINAPI ctrl_handler(DWORD ctl, DWORD type, void *data, void *user) { HANDLE evt = user; @@ -2775,4 +2816,5 @@ START_TEST(service) * and what the rules are */ test_refcount(); + test_EventLog(); } diff --git a/dlls/wevtsvc/Makefile.in b/dlls/wevtsvc/Makefile.in new file mode 100644 index 0000000000..3dcbb804a3 --- /dev/null +++ b/dlls/wevtsvc/Makefile.in @@ -0,0 +1,7 @@ +MODULE = wevtsvc.dll +IMPORTS = rpcrt4 advapi32 + +EXTRADLLFLAGS = -mno-cygwin + +C_SRCS = \ + wevtsvc.c diff --git a/dlls/wevtsvc/wevtsvc.c b/dlls/wevtsvc/wevtsvc.c new file mode 100644 index 0000000000..14c30791ff --- /dev/null +++ b/dlls/wevtsvc/wevtsvc.c @@ -0,0 +1,87 @@ +/* + * Event Log Service + * + * 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 + */ + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "winsvc.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(eventlog); + +static SERVICE_STATUS_HANDLE svc_handle; +static HANDLE done_event; + +static void eventlog_update_status(DWORD state) +{ + SERVICE_STATUS status; + + status.dwServiceType = SERVICE_WIN32; + status.dwControlsAccepted = SERVICE_ACCEPT_STOP | SERVICE_ACCEPT_SHUTDOWN; + status.dwWin32ExitCode = 0; + status.dwServiceSpecificExitCode = 0; + status.dwCheckPoint = 0; + status.dwWaitHint = 0; + status.dwControlsAccepted = 0; + status.dwCurrentState = state; + + SetServiceStatus(svc_handle, &status); +} + +static void WINAPI eventlog_handler(DWORD control) +{ + TRACE("%#x\n", control); + + switch (control) + { + case SERVICE_CONTROL_STOP: + case SERVICE_CONTROL_SHUTDOWN: + eventlog_update_status(SERVICE_STOP_PENDING); + SetEvent(done_event); + break; + + default: + eventlog_update_status(SERVICE_RUNNING); + break; + } +} + +void WINAPI ServiceMain(DWORD argc, LPWSTR *argv) +{ + TRACE("starting Event Log Service\n"); + + svc_handle = RegisterServiceCtrlHandlerW(L"EventLog", eventlog_handler); + if (!svc_handle) + { + ERR("RegisterServiceCtrlHandler error %u\n", GetLastError()); + return; + } + + eventlog_update_status(SERVICE_RUNNING); + + done_event = CreateEventW(NULL, TRUE, FALSE, NULL); + WaitForSingleObject(done_event, INFINITE); + CloseHandle(done_event); + + eventlog_update_status(SERVICE_STOPPED); + + TRACE("exiting Event Log Service\n"); +} diff --git a/dlls/wevtsvc/wevtsvc.spec b/dlls/wevtsvc/wevtsvc.spec new file mode 100644 index 0000000000..daa88578f7 --- /dev/null +++ b/dlls/wevtsvc/wevtsvc.spec @@ -0,0 +1 @@ +@ stdcall -private ServiceMain(long ptr) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index cd0e7bd16f..0b71b10544 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -149,6 +149,7 @@ WineFakeDlls=FakeDllsWin32 [DefaultInstall.Services] AddService=BITS,0,BITSService +AddService=EventLog,0,EventLogService AddService=HTTP,0,HTTPService AddService=MSIServer,0,MSIService AddService=MountMgr,0x800,MountMgrService @@ -167,6 +168,7 @@ AddService=NDIS,0x800,NDISService [DefaultInstall.NT.Services] AddService=BITS,0,BITSService +AddService=EventLog,0,EventLogService AddService=HTTP,0,HTTPService AddService=MSIServer,0,MSIService AddService=MountMgr,0x800,MountMgrService @@ -185,6 +187,7 @@ AddService=NDIS,0x800,NDISService [DefaultInstall.ntamd64.Services] AddService=BITS,0,BITSService +AddService=EventLog,0,EventLogService AddService=HTTP,0,HTTPService AddService=MSIServer,0,MSIService AddService=MountMgr,0x800,MountMgrService @@ -203,6 +206,7 @@ AddService=NDIS,0x800,NDISService [DefaultInstall.ntarm64.Services] AddService=BITS,0,BITSService +AddService=EventLog,0,EventLogService AddService=HTTP,0,HTTPService AddService=MSIServer,0,MSIService AddService=MountMgr,0x800,MountMgrService @@ -3609,6 +3613,15 @@ ServiceType=16 StartType=3 ErrorControl=1 +[EventLogService] +AddReg=EventLogServiceKeys +Description="Event Log" +DisplayName="Event Log" +ServiceBinary="%11%\svchost.exe -k LocalServiceNetworkRestricted" +ServiceType=32 +StartType=2 +ErrorControl=1 + [HTTPService] Description="HTTP server" DisplayName="HTTP" @@ -3696,6 +3709,10 @@ ErrorControl=1 HKR,Parameters,"ServiceDll",,"%11%\qmgr.dll" HKLM,%CurrentVersionNT%\SvcHost,"netsvcs",0x00010000,"BITS" +[EventLogServiceKeys] +HKR,Parameters,"ServiceDll",,"%11%\wevtsvc.dll" +HKLM,%CurrentVersionNT%\SvcHost,"LocalServiceNetworkRestricted",0x00010000,"Event Log" + [StiServiceKeys] HKR,Parameters,"ServiceDll",,"%11%\wiaservc.dll" HKLM,%CurrentVersionNT%\SvcHost,"imgsvc",0x00010000,"StiSvc" -- 2.26.2

2 1

[PATCH v2 5/7] kernelbase: Move ReadConsoleInput.
by Jacek Caban 22 Sep '20

22 Sep '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- v2: Pass blocking argument. It should not be needed once we move flush to ioctl, but I was planning to move windowing mode to conhost first. dlls/kernel32/console.c | 63 --------------------------------- dlls/kernel32/kernel32.spec | 4 +-- dlls/kernelbase/console.c | 28 +++++++++++++++ dlls/kernelbase/kernelbase.spec | 4 +-- 4 files changed, 32 insertions(+), 67 deletions(-)

1 0

[PATCH 7/7] kernelbase: Move Beep.
by Jacek Caban 22 Sep '20

22 Sep '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernel32/console.c | 12 ------------ dlls/kernel32/kernel32.spec | 2 +- dlls/kernelbase/console.c | 13 +++++++++++++ dlls/kernelbase/kernelbase.spec | 2 +- 4 files changed, 15 insertions(+), 14 deletions(-)

2 1