- wine-devel - winehq.org

[PATCH] ws2_32: Allow getsockname after AcceptEx
by David Curtiss 07 Apr '22

07 Apr '22

.NET 6's HTTP/Socket code queries this. Winsock allows getsockname on the AcceptEx AcceptSocket, but only if SO_UPDATE_ACCEPT_CONTEXT is set. Signed-off-by: David Curtiss <david.curtiss(a)ni.com> --- dlls/ws2_32/tests/sock.c | 9 +++++++++ server/sock.c | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index d501930b32d..93f4f420c66 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -7718,6 +7718,15 @@ static void test_AcceptEx(void) ok(bret, "GetOverlappedResult failed, error %ld\n", GetLastError()); ok(bytesReturned == 0, "bytesReturned isn't supposed to be %ld\n", bytesReturned); + /* Try to call getsockname on the acceptor socket. + * + * On Windows, this requires setting SO_UPDATE_ACCEPT_CONTEXT. */ + iret = setsockopt(acceptor, SOL_SOCKET, SO_UPDATE_ACCEPT_CONTEXT, (char *)&listener, sizeof(SOCKET)); + ok(!iret, "Failed to set accept context %ld\n", GetLastError()); + iret = getsockname(acceptor, (struct sockaddr *)&peerAddress, &remoteSize); + ok(!iret, "getsockname failed.\n"); + ok(remoteSize == sizeof(struct sockaddr_in), "got remote size %u\n", remoteSize); + closesocket(connector); connector = INVALID_SOCKET; closesocket(acceptor); diff --git a/server/sock.c b/server/sock.c index b403541fcbf..22fcce50312 100644 --- a/server/sock.c +++ b/server/sock.c @@ -2701,7 +2701,7 @@ static void sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) } case IOCTL_AFD_GETSOCKNAME: - if (!sock->bound) + if (!sock->addr_len) { set_error( STATUS_INVALID_PARAMETER ); return; -- 2.25.1

1 0

[PATCH 7/7] win32u: Don't use CDECL for user driver functions.
by Jacek Caban 07 Apr '22

07 Apr '22

2 1

[PATCH 6/7] win32u: Move __wine_set_user_driver implementation from user32.
by Jacek Caban 07 Apr '22

07 Apr '22

3 2

[PATCH 5/7] win32u: Partially move WM_SYSCOMMAND implementation from user32.
by Jacek Caban 07 Apr '22

07 Apr '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/driver.c | 8 +------- dlls/user32/nonclient.c | 7 +------ dlls/win32u/defwnd.c | 16 ++++++++++++++++ dlls/win32u/win32u_private.h | 1 + dlls/win32u/window.c | 2 +- 5 files changed, 20 insertions(+), 14 deletions(-)

3 2

[PATCH 4/7] win32u: Move IsWindowEnabled implementation from user32.
by Jacek Caban 07 Apr '22

07 Apr '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- We technically don't really need to expose it from win32u, but then we'd need to duplicate it both for win32u internals and drivers, so that seems cleaner. dlls/user32/win.c | 9 ++------- dlls/win32u/window.c | 13 +++++++++++++ include/ntuser.h | 1 + 3 files changed, 16 insertions(+), 7 deletions(-)

3 2

[PATCH 3/7] win32u: Move WM_SETICON implementation from user32.
by Jacek Caban 07 Apr '22

07 Apr '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/defwnd.c | 48 +++------------------------------------- dlls/user32/driver.c | 7 +----- dlls/win32u/defwnd.c | 52 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 56 insertions(+), 51 deletions(-)

3 2

[PATCH 2/7] win32u: Move default window text setting to from user32.
by Jacek Caban 07 Apr '22

07 Apr '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/defwnd.c | 112 +++-------------------------------- dlls/user32/driver.c | 7 +-- dlls/user32/user_main.c | 1 - dlls/win32u/Makefile.in | 1 + dlls/win32u/defwnd.c | 110 ++++++++++++++++++++++++++++++++++ dlls/win32u/message.c | 2 + dlls/win32u/tests/win32u.c | 34 +++++++++++ dlls/win32u/win32u_private.h | 4 ++ dlls/win32u/window.c | 2 + include/ntuser.h | 1 + 10 files changed, 162 insertions(+), 112 deletions(-) create mode 100644 dlls/win32u/defwnd.c

3 2

[PATCH 1/7] win32u: Improve string duplication helpers.
by Jacek Caban 07 Apr '22

07 Apr '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/win32u/font.c | 37 +++++++++++++++++++++--------------- dlls/win32u/freetype.c | 22 ++------------------- dlls/win32u/win32u_private.h | 28 ++++++++++++++++++++++----- 3 files changed, 47 insertions(+), 40 deletions(-)

2 1

[PATCH] d3drm: Build without -DWINE_NO_LONG_TYPES.
by Nikolay Sivov 07 Apr '22

07 Apr '22

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3drm/Makefile.in | 1 - dlls/d3drm/d3drm.c | 56 +++++++------- dlls/d3drm/device.c | 50 ++++++------ dlls/d3drm/face.c | 36 ++++----- dlls/d3drm/frame.c | 82 ++++++++++---------- dlls/d3drm/light.c | 8 +- dlls/d3drm/material.c | 6 +- dlls/d3drm/meshbuilder.c | 162 +++++++++++++++++++-------------------- dlls/d3drm/texture.c | 52 ++++++------- dlls/d3drm/viewport.c | 30 ++++---- 10 files changed, 241 insertions(+), 242 deletions(-) diff --git a/dlls/d3drm/Makefile.in b/dlls/d3drm/Makefile.in index 701375ec4f0..8daaa426c8f 100644 --- a/dlls/d3drm/Makefile.in +++ b/dlls/d3drm/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = d3drm.dll IMPORTLIB = d3drm IMPORTS = d3dxof ddraw diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c index cf785b0e387..864323053f3 100644 --- a/dlls/d3drm/d3drm.c +++ b/dlls/d3drm/d3drm.c @@ -249,7 +249,7 @@ static ULONG WINAPI d3drm1_AddRef(IDirect3DRM *iface) struct d3drm *d3drm = impl_from_IDirect3DRM(iface); ULONG refcount = InterlockedIncrement(&d3drm->ref1); - TRACE("%p increasing refcount to %u.\n", iface, refcount); + TRACE("%p increasing refcount to %lu.\n", iface, refcount); if (refcount == 1) InterlockedIncrement(&d3drm->iface_count); @@ -262,7 +262,7 @@ static ULONG WINAPI d3drm1_Release(IDirect3DRM *iface) struct d3drm *d3drm = impl_from_IDirect3DRM(iface); ULONG refcount = InterlockedDecrement(&d3drm->ref1); - TRACE("%p decreasing refcount to %u.\n", iface, refcount); + TRACE("%p decreasing refcount to %lu.\n", iface, refcount); if (!refcount && !InterlockedDecrement(&d3drm->iface_count)) d3drm_destroy(d3drm); @@ -384,7 +384,7 @@ static HRESULT WINAPI d3drm1_CreateLight(IDirect3DRM *iface, { struct d3drm *d3drm = impl_from_IDirect3DRM(iface); - TRACE("iface %p, type %#x, color 0x%08x, light %p.\n", iface, type, color, light); + TRACE("iface %p, type %#x, color 0x%08lx, light %p.\n", iface, type, color, light); return IDirect3DRM3_CreateLight(&d3drm->IDirect3DRM3_iface, type, color, light); } @@ -413,7 +413,7 @@ static HRESULT WINAPI d3drm1_CreateMaterial(IDirect3DRM *iface, static HRESULT WINAPI d3drm1_CreateDevice(IDirect3DRM *iface, DWORD width, DWORD height, IDirect3DRMDevice **device) { - TRACE("iface %p, width %u, height %u, device %p.\n", iface, width, height, device); + TRACE("iface %p, width %lu, height %lu, device %p.\n", iface, width, height, device); if (!device) return D3DRMERR_BADVALUE; @@ -565,7 +565,7 @@ static HRESULT WINAPI d3drm1_CreateViewport(IDirect3DRM *iface, IDirect3DRMDevic IDirect3DRMViewport2 *viewport2; HRESULT hr; - TRACE("iface %p, device %p, camera %p, x %u, y %u, width %u, height %u, viewport %p.\n", + TRACE("iface %p, device %p, camera %p, x %lu, y %lu, width %lu, height %lu, viewport %p.\n", iface, device, camera, x, y, width, height, viewport); if (!viewport) @@ -694,14 +694,14 @@ static HRESULT WINAPI d3drm1_GetSearchPath(IDirect3DRM *iface, DWORD *size, char static HRESULT WINAPI d3drm1_SetDefaultTextureColors(IDirect3DRM *iface, DWORD color_count) { - FIXME("iface %p, color_count %u stub!\n", iface, color_count); + FIXME("iface %p, color_count %lu stub!\n", iface, color_count); return E_NOTIMPL; } static HRESULT WINAPI d3drm1_SetDefaultTextureShades(IDirect3DRM *iface, DWORD shade_count) { - FIXME("iface %p, shade_count %u stub!\n", iface, shade_count); + FIXME("iface %p, shade_count %lu stub!\n", iface, shade_count); return E_NOTIMPL; } @@ -736,7 +736,7 @@ static HRESULT WINAPI d3drm1_Load(IDirect3DRM *iface, void *source, void *object IDirect3DRMFrame3 *parent_frame3 = NULL; HRESULT hr = D3DRM_OK; - TRACE("iface %p, source %p, object_id %p, iids %p, iid_count %u, flags %#x, " + TRACE("iface %p, source %p, object_id %p, iids %p, iid_count %lu, flags %#lx, " "load_cb %p, load_ctx %p, load_tex_cb %p, load_tex_ctx %p, parent_frame %p.\n", iface, source, object_id, iids, iid_count, flags, load_cb, load_ctx, load_tex_cb, load_tex_ctx, parent_frame); @@ -810,7 +810,7 @@ static ULONG WINAPI d3drm2_AddRef(IDirect3DRM2 *iface) struct d3drm *d3drm = impl_from_IDirect3DRM2(iface); ULONG refcount = InterlockedIncrement(&d3drm->ref2); - TRACE("%p increasing refcount to %u.\n", iface, refcount); + TRACE("%p increasing refcount to %lu.\n", iface, refcount); if (refcount == 1) InterlockedIncrement(&d3drm->iface_count); @@ -823,7 +823,7 @@ static ULONG WINAPI d3drm2_Release(IDirect3DRM2 *iface) struct d3drm *d3drm = impl_from_IDirect3DRM2(iface); ULONG refcount = InterlockedDecrement(&d3drm->ref2); - TRACE("%p decreasing refcount to %u.\n", iface, refcount); + TRACE("%p decreasing refcount to %lu.\n", iface, refcount); if (!refcount && !InterlockedDecrement(&d3drm->iface_count)) d3drm_destroy(d3drm); @@ -938,7 +938,7 @@ static HRESULT WINAPI d3drm2_CreateLight(IDirect3DRM2 *iface, { struct d3drm *d3drm = impl_from_IDirect3DRM2(iface); - TRACE("iface %p, type %#x, color 0x%08x, light %p.\n", iface, type, color, light); + TRACE("iface %p, type %#x, color 0x%08lx, light %p.\n", iface, type, color, light); return IDirect3DRM3_CreateLight(&d3drm->IDirect3DRM3_iface, type, color, light); } @@ -967,7 +967,7 @@ static HRESULT WINAPI d3drm2_CreateMaterial(IDirect3DRM2 *iface, static HRESULT WINAPI d3drm2_CreateDevice(IDirect3DRM2 *iface, DWORD width, DWORD height, IDirect3DRMDevice2 **device) { - TRACE("iface %p, width %u, height %u, device %p.\n", iface, width, height, device); + TRACE("iface %p, width %lu, height %lu, device %p.\n", iface, width, height, device); if (!device) return D3DRMERR_BADVALUE; @@ -1089,7 +1089,7 @@ static HRESULT WINAPI d3drm2_CreateViewport(IDirect3DRM2 *iface, IDirect3DRMDevi IDirect3DRMViewport2 *viewport2; HRESULT hr; - TRACE("iface %p, device %p, camera %p, x %u, y %u, width %u, height %u, viewport %p.\n", + TRACE("iface %p, device %p, camera %p, x %lu, y %lu, width %lu, height %lu, viewport %p.\n", iface, device, camera, x, y, width, height, viewport); if (!viewport) @@ -1208,14 +1208,14 @@ static HRESULT WINAPI d3drm2_GetSearchPath(IDirect3DRM2 *iface, DWORD *size, cha static HRESULT WINAPI d3drm2_SetDefaultTextureColors(IDirect3DRM2 *iface, DWORD color_count) { - FIXME("iface %p, color_count %u stub!\n", iface, color_count); + FIXME("iface %p, color_count %lu stub!\n", iface, color_count); return E_NOTIMPL; } static HRESULT WINAPI d3drm2_SetDefaultTextureShades(IDirect3DRM2 *iface, DWORD shade_count) { - FIXME("iface %p, shade_count %u stub!\n", iface, shade_count); + FIXME("iface %p, shade_count %lu stub!\n", iface, shade_count); return E_NOTIMPL; } @@ -1250,7 +1250,7 @@ static HRESULT WINAPI d3drm2_Load(IDirect3DRM2 *iface, void *source, void *objec IDirect3DRMFrame3 *parent_frame3 = NULL; HRESULT hr = D3DRM_OK; - TRACE("iface %p, source %p, object_id %p, iids %p, iid_count %u, flags %#x, " + TRACE("iface %p, source %p, object_id %p, iids %p, iid_count %lu, flags %#lx, " "load_cb %p, load_ctx %p, load_tex_cb %p, load_tex_ctx %p, parent_frame %p.\n", iface, source, object_id, iids, iid_count, flags, load_cb, load_ctx, load_tex_cb, load_tex_ctx, parent_frame); @@ -1332,7 +1332,7 @@ static ULONG WINAPI d3drm3_AddRef(IDirect3DRM3 *iface) struct d3drm *d3drm = impl_from_IDirect3DRM3(iface); ULONG refcount = InterlockedIncrement(&d3drm->ref3); - TRACE("%p increasing refcount to %u.\n", iface, refcount); + TRACE("%p increasing refcount to %lu.\n", iface, refcount); if (refcount == 1) InterlockedIncrement(&d3drm->iface_count); @@ -1345,7 +1345,7 @@ static ULONG WINAPI d3drm3_Release(IDirect3DRM3 *iface) struct d3drm *d3drm = impl_from_IDirect3DRM3(iface); ULONG refcount = InterlockedDecrement(&d3drm->ref3); - TRACE("%p decreasing refcount to %u.\n", iface, refcount); + TRACE("%p decreasing refcount to %lu.\n", iface, refcount); if (!refcount && !InterlockedDecrement(&d3drm->iface_count)) d3drm_destroy(d3drm); @@ -1549,7 +1549,7 @@ static HRESULT WINAPI d3drm3_CreateLight(IDirect3DRM3 *iface, struct d3drm_light *object; HRESULT hr; - TRACE("iface %p, type %#x, color 0x%08x, light %p.\n", iface, type, color, light); + TRACE("iface %p, type %#x, color 0x%08lx, light %p.\n", iface, type, color, light); if (SUCCEEDED(hr = d3drm_light_create(&object, &d3drm->IDirect3DRM_iface))) { @@ -1603,7 +1603,7 @@ static HRESULT WINAPI d3drm3_CreateMaterial(IDirect3DRM3 *iface, static HRESULT WINAPI d3drm3_CreateDevice(IDirect3DRM3 *iface, DWORD width, DWORD height, IDirect3DRMDevice3 **device) { - TRACE("iface %p, width %u, height %u, device %p.\n", iface, width, height, device); + TRACE("iface %p, width %lu, height %lu, device %p.\n", iface, width, height, device); if (!device) return D3DRMERR_BADVALUE; @@ -1620,7 +1620,7 @@ static HRESULT WINAPI d3drm3_CreateDeviceFromSurface(IDirect3DRM3 *iface, GUID * BOOL use_z_surface; HRESULT hr; - TRACE("iface %p, guid %s, ddraw %p, backbuffer %p, flags %#x, device %p.\n", + TRACE("iface %p, guid %s, ddraw %p, backbuffer %p, flags %#lx, device %p.\n", iface, debugstr_guid(guid), ddraw, backbuffer, flags, device); if (!device) @@ -1762,7 +1762,7 @@ static HRESULT WINAPI d3drm3_CreateViewport(IDirect3DRM3 *iface, IDirect3DRMDevi struct d3drm_viewport *object; HRESULT hr; - TRACE("iface %p, device %p, camera %p, x %u, y %u, width %u, height %u, viewport %p.\n", + TRACE("iface %p, device %p, camera %p, x %lu, y %lu, width %lu, height %lu, viewport %p.\n", iface, device, camera, x, y, width, height, viewport); if (!viewport) @@ -1886,14 +1886,14 @@ static HRESULT WINAPI d3drm3_GetSearchPath(IDirect3DRM3 *iface, DWORD *size, cha static HRESULT WINAPI d3drm3_SetDefaultTextureColors(IDirect3DRM3 *iface, DWORD color_count) { - FIXME("iface %p, color_count %u stub!\n", iface, color_count); + FIXME("iface %p, color_count %lu stub!\n", iface, color_count); return E_NOTIMPL; } static HRESULT WINAPI d3drm3_SetDefaultTextureShades(IDirect3DRM3 *iface, DWORD shade_count) { - FIXME("iface %p, shade_count %u stub!\n", iface, shade_count); + FIXME("iface %p, shade_count %lu stub!\n", iface, shade_count); return E_NOTIMPL; } @@ -2121,7 +2121,7 @@ static HRESULT WINAPI d3drm3_Load(IDirect3DRM3 *iface, void *source, void *objec HRESULT ret = D3DRMERR_BADOBJECT; DWORD i; - TRACE("iface %p, source %p, object_id %p, iids %p, iid_count %u, flags %#x, " + TRACE("iface %p, source %p, object_id %p, iids %p, iid_count %lu, flags %#lx, " "load_cb %p, load_ctx %p, load_tex_cb %p, load_tex_ctx %p, parent_frame %p.\n", iface, source, object_id, iids, iid_count, flags, load_cb, load_ctx, load_tex_cb, load_tex_ctx, parent_frame); @@ -2141,7 +2141,7 @@ static HRESULT WINAPI d3drm3_Load(IDirect3DRM3 *iface, void *source, void *objec } else { - FIXME("Load options %#x not supported yet.\n", flags); + FIXME("Load options %#lx not supported yet.\n", flags); return E_NOTIMPL; } @@ -2177,7 +2177,7 @@ static HRESULT WINAPI d3drm3_Load(IDirect3DRM3 *iface, void *source, void *objec if ((hr != DXFILE_OK) || (size != sizeof(*header))) goto end; - TRACE("Version is %u.%u, flags %#x.\n", header->major, header->minor, header->flags); + TRACE("Version is %u.%u, flags %#lx.\n", header->major, header->minor, header->flags); /* Version must be 1.0.x */ if ((header->major != 1) || (header->minor != 0)) @@ -2262,7 +2262,7 @@ static HRESULT WINAPI d3drm3_CreateClippedVisual(IDirect3DRM3 *iface, static HRESULT WINAPI d3drm3_SetOptions(IDirect3DRM3 *iface, DWORD flags) { - FIXME("iface %p, flags %#x stub!\n", iface, flags); + FIXME("iface %p, flags %#lx stub!\n", iface, flags); return E_NOTIMPL; } diff --git a/dlls/d3drm/device.c b/dlls/d3drm/device.c index 2e1b5f2d24f..50be26536d8 100644 --- a/dlls/d3drm/device.c +++ b/dlls/d3drm/device.c @@ -307,7 +307,7 @@ static ULONG WINAPI d3drm_device3_AddRef(IDirect3DRMDevice3 *iface) struct d3drm_device *device = impl_from_IDirect3DRMDevice3(iface); ULONG refcount = InterlockedIncrement(&device->obj.ref); - TRACE("%p increasing refcount to %u.\n", iface, refcount); + TRACE("%p increasing refcount to %lu.\n", iface, refcount); return refcount; } @@ -335,7 +335,7 @@ static ULONG WINAPI d3drm_device3_Release(IDirect3DRMDevice3 *iface) struct d3drm_device *device = impl_from_IDirect3DRMDevice3(iface); ULONG refcount = InterlockedDecrement(&device->obj.ref); - TRACE("%p decreasing refcount to %u.\n", iface, refcount); + TRACE("%p decreasing refcount to %lu.\n", iface, refcount); if (!refcount) d3drm_device_destroy(device); @@ -453,7 +453,7 @@ static HRESULT WINAPI d3drm_device3_SetAppData(IDirect3DRMDevice3 *iface, DWORD { struct d3drm_device *device = impl_from_IDirect3DRMDevice3(iface); - TRACE("iface %p, data %#x.\n", iface, data); + TRACE("iface %p, data %#lx.\n", iface, data); device->obj.appdata = data; @@ -464,7 +464,7 @@ static HRESULT WINAPI d3drm_device2_SetAppData(IDirect3DRMDevice2 *iface, DWORD { struct d3drm_device *device = impl_from_IDirect3DRMDevice2(iface); - TRACE("iface %p, data %#x.\n", iface, data); + TRACE("iface %p, data %#lx.\n", iface, data); return d3drm_device3_SetAppData(&device->IDirect3DRMDevice3_iface, data); } @@ -473,7 +473,7 @@ static HRESULT WINAPI d3drm_device1_SetAppData(IDirect3DRMDevice *iface, DWORD d { struct d3drm_device *device = impl_from_IDirect3DRMDevice(iface); - TRACE("iface %p, data %#x.\n", iface, data); + TRACE("iface %p, data %#lx.\n", iface, data); return d3drm_device3_SetAppData(&device->IDirect3DRMDevice3_iface, data); } @@ -590,7 +590,7 @@ static HRESULT WINAPI d3drm_device3_Init(IDirect3DRMDevice3 *iface, ULONG width, { struct d3drm_device *device = impl_from_IDirect3DRMDevice3(iface); - FIXME("iface %p, width %u, height %u stub!\n", iface, width, height); + FIXME("iface %p, width %lu, height %lu stub!\n", iface, width, height); device->height = height; device->width = width; @@ -602,7 +602,7 @@ static HRESULT WINAPI d3drm_device2_Init(IDirect3DRMDevice2 *iface, ULONG width, { struct d3drm_device *device = impl_from_IDirect3DRMDevice2(iface); - TRACE("iface %p, width %u, height %u.\n", iface, width, height); + TRACE("iface %p, width %lu, height %lu.\n", iface, width, height); return d3drm_device3_Init(&device->IDirect3DRMDevice3_iface, width, height); } @@ -611,7 +611,7 @@ static HRESULT WINAPI d3drm_device1_Init(IDirect3DRMDevice *iface, ULONG width, { struct d3drm_device *device = impl_from_IDirect3DRMDevice(iface); - TRACE("iface %p, width %u, height %u.\n", iface, width, height); + TRACE("iface %p, width %lu, height %lu.\n", iface, width, height); return d3drm_device3_Init(&device->IDirect3DRMDevice3_iface, width, height); } @@ -759,7 +759,7 @@ static HRESULT WINAPI d3drm_device1_DeleteUpdateCallback(IDirect3DRMDevice *ifac static HRESULT WINAPI d3drm_device3_SetBufferCount(IDirect3DRMDevice3 *iface, DWORD count) { - FIXME("iface %p, count %u stub!\n", iface, count); + FIXME("iface %p, count %lu stub!\n", iface, count); return E_NOTIMPL; } @@ -768,7 +768,7 @@ static HRESULT WINAPI d3drm_device2_SetBufferCount(IDirect3DRMDevice2 *iface, DW { struct d3drm_device *device = impl_from_IDirect3DRMDevice2(iface); - TRACE("iface %p, count %u.\n", iface, count); + TRACE("iface %p, count %lu.\n", iface, count); return d3drm_device3_SetBufferCount(&device->IDirect3DRMDevice3_iface, count); } @@ -777,7 +777,7 @@ static HRESULT WINAPI d3drm_device1_SetBufferCount(IDirect3DRMDevice *iface, DWO { struct d3drm_device *device = impl_from_IDirect3DRMDevice(iface); - TRACE("iface %p, count %u.\n", iface, count); + TRACE("iface %p, count %lu.\n", iface, count); return d3drm_device3_SetBufferCount(&device->IDirect3DRMDevice3_iface, count); } @@ -838,7 +838,7 @@ static HRESULT WINAPI d3drm_device1_SetDither(IDirect3DRMDevice *iface, BOOL ena static HRESULT WINAPI d3drm_device3_SetShades(IDirect3DRMDevice3 *iface, DWORD count) { - FIXME("iface %p, count %u stub!\n", iface, count); + FIXME("iface %p, count %lu stub!\n", iface, count); return E_NOTIMPL; } @@ -847,7 +847,7 @@ static HRESULT WINAPI d3drm_device2_SetShades(IDirect3DRMDevice2 *iface, DWORD c { struct d3drm_device *device = impl_from_IDirect3DRMDevice2(iface); - TRACE("iface %p, count %u.\n", iface, count); + TRACE("iface %p, count %lu.\n", iface, count); return d3drm_device3_SetShades(&device->IDirect3DRMDevice3_iface, count); } @@ -856,7 +856,7 @@ static HRESULT WINAPI d3drm_device1_SetShades(IDirect3DRMDevice *iface, DWORD co { struct d3drm_device *device = impl_from_IDirect3DRMDevice(iface); - TRACE("iface %p, count %u.\n", iface, count); + TRACE("iface %p, count %lu.\n", iface, count); return d3drm_device3_SetShades(&device->IDirect3DRMDevice3_iface, count); } @@ -865,7 +865,7 @@ static HRESULT WINAPI d3drm_device3_SetQuality(IDirect3DRMDevice3 *iface, D3DRMR { struct d3drm_device *device = impl_from_IDirect3DRMDevice3(iface); - TRACE("iface %p, quality %u.\n", iface, quality); + TRACE("iface %p, quality %lu.\n", iface, quality); device->quality = quality; @@ -876,7 +876,7 @@ static HRESULT WINAPI d3drm_device2_SetQuality(IDirect3DRMDevice2 *iface, D3DRMR { struct d3drm_device *device = impl_from_IDirect3DRMDevice2(iface); - TRACE("iface %p, quality %u.\n", iface, quality); + TRACE("iface %p, quality %lu.\n", iface, quality); return d3drm_device3_SetQuality(&device->IDirect3DRMDevice3_iface, quality); } @@ -885,7 +885,7 @@ static HRESULT WINAPI d3drm_device1_SetQuality(IDirect3DRMDevice *iface, D3DRMRE { struct d3drm_device *device = impl_from_IDirect3DRMDevice(iface); - TRACE("iface %p, quality %u.\n", iface, quality); + TRACE("iface %p, quality %lu.\n", iface, quality); return d3drm_device3_SetQuality(&device->IDirect3DRMDevice3_iface, quality); } @@ -1264,7 +1264,7 @@ static HRESULT WINAPI d3drm_device3_SetRenderMode(IDirect3DRMDevice3 *iface, DWO { struct d3drm_device *device = impl_from_IDirect3DRMDevice3(iface); - TRACE("iface %p, flags %#x.\n", iface, flags); + TRACE("iface %p, flags %#lx.\n", iface, flags); device->rendermode = flags; @@ -1275,7 +1275,7 @@ static HRESULT WINAPI d3drm_device2_SetRenderMode(IDirect3DRMDevice2 *iface, DWO { struct d3drm_device *device = impl_from_IDirect3DRMDevice2(iface); - TRACE("iface %p, flags %#x.\n", iface, flags); + TRACE("iface %p, flags %#lx.\n", iface, flags); return d3drm_device3_SetRenderMode(&device->IDirect3DRMDevice3_iface, flags); } @@ -1325,7 +1325,7 @@ static HRESULT WINAPI d3drm_device2_GetDirect3DDevice2(IDirect3DRMDevice2 *iface static HRESULT WINAPI d3drm_device3_FindPreferredTextureFormat(IDirect3DRMDevice3 *iface, DWORD bitdepths, DWORD flags, DDPIXELFORMAT *pf) { - FIXME("iface %p, bitdepths %u, flags %#x, pf %p stub!\n", iface, bitdepths, flags, pf); + FIXME("iface %p, bitdepths %lu, flags %#lx, pf %p stub!\n", iface, bitdepths, flags, pf); return E_NOTIMPL; } @@ -1333,7 +1333,7 @@ static HRESULT WINAPI d3drm_device3_FindPreferredTextureFormat(IDirect3DRMDevice static HRESULT WINAPI d3drm_device3_RenderStateChange(IDirect3DRMDevice3 *iface, D3DRENDERSTATETYPE state, DWORD value, DWORD flags) { - FIXME("iface %p, state %#x, value %#x, flags %#x stub!\n", iface, state, value, flags); + FIXME("iface %p, state %#x, value %#lx, flags %#lx stub!\n", iface, state, value, flags); return E_NOTIMPL; } @@ -1341,7 +1341,7 @@ static HRESULT WINAPI d3drm_device3_RenderStateChange(IDirect3DRMDevice3 *iface, static HRESULT WINAPI d3drm_device3_LightStateChange(IDirect3DRMDevice3 *iface, D3DLIGHTSTATETYPE state, DWORD value, DWORD flags) { - FIXME("iface %p, state %#x, value %#x, flags %#x stub!\n", iface, state, value, flags); + FIXME("iface %p, state %#x, value %#lx, flags %#lx stub!\n", iface, state, value, flags); return E_NOTIMPL; } @@ -1349,7 +1349,7 @@ static HRESULT WINAPI d3drm_device3_LightStateChange(IDirect3DRMDevice3 *iface, static HRESULT WINAPI d3drm_device3_GetStateChangeOptions(IDirect3DRMDevice3 *iface, DWORD state_class, DWORD state_idx, DWORD *flags) { - FIXME("iface %p, state_class %#x, state_idx %#x, flags %p stub!\n", + FIXME("iface %p, state_class %#lx, state_idx %#lx, flags %p stub!\n", iface, state_class, state_idx, flags); return E_NOTIMPL; @@ -1358,7 +1358,7 @@ static HRESULT WINAPI d3drm_device3_GetStateChangeOptions(IDirect3DRMDevice3 *if static HRESULT WINAPI d3drm_device3_SetStateChangeOptions(IDirect3DRMDevice3 *iface, DWORD state_class, DWORD state_idx, DWORD flags) { - FIXME("iface %p, state_class %#x, state_idx %#x, flags %#x stub!\n", + FIXME("iface %p, state_class %#lx, state_idx %#lx, flags %#lx stub!\n", iface, state_class, state_idx, flags); return E_NOTIMPL; @@ -1550,7 +1550,7 @@ static HRESULT WINAPI d3drm_device_win_SetAppData(IDirect3DRMWinDevice *iface, D { struct d3drm_device *device = impl_from_IDirect3DRMWinDevice(iface); - TRACE("iface %p, data %#x.\n", iface, data); + TRACE("iface %p, data %#lx.\n", iface, data); return d3drm_device3_SetAppData(&device->IDirect3DRMDevice3_iface, data); } diff --git a/dlls/d3drm/face.c b/dlls/d3drm/face.c index 1799ad98cf4..3214c56cb33 100644 --- a/dlls/d3drm/face.c +++ b/dlls/d3drm/face.c @@ -64,7 +64,7 @@ static ULONG WINAPI d3drm_face1_AddRef(IDirect3DRMFace *iface) struct d3drm_face *face = impl_from_IDirect3DRMFace(iface); ULONG refcount = InterlockedIncrement(&face->ref); - TRACE("%p increasing refcount to %u.\n", iface, refcount); + TRACE("%p increasing refcount to %lu.\n", iface, refcount); return refcount; } @@ -74,7 +74,7 @@ static ULONG WINAPI d3drm_face1_Release(IDirect3DRMFace *iface) struct d3drm_face *face = impl_from_IDirect3DRMFace(iface); ULONG refcount = InterlockedDecrement(&face->ref); - TRACE("%p decreasing refcount to %u.\n", iface, refcount); + TRACE("%p decreasing refcount to %lu.\n", iface, refcount); if (!refcount) { @@ -117,7 +117,7 @@ static HRESULT WINAPI d3drm_face2_SetAppData(IDirect3DRMFace2 *iface, DWORD data { struct d3drm_face *face = impl_from_IDirect3DRMFace2(iface); - TRACE("iface %p, data %#x.\n", iface, data); + TRACE("iface %p, data %#lx.\n", iface, data); face->obj.appdata = data; @@ -128,7 +128,7 @@ static HRESULT WINAPI d3drm_face1_SetAppData(IDirect3DRMFace *iface, DWORD data) { struct d3drm_face *face = impl_from_IDirect3DRMFace(iface); - TRACE("iface %p, data %#x.\n", iface, data); + TRACE("iface %p, data %#lx.\n", iface, data); return d3drm_face2_SetAppData(&face->IDirect3DRMFace2_iface, data); } @@ -206,7 +206,7 @@ static HRESULT WINAPI d3drm_face1_AddVertex(IDirect3DRMFace *iface, D3DVALUE x, static HRESULT WINAPI d3drm_face1_AddVertexAndNormalIndexed(IDirect3DRMFace *iface, DWORD vertex, DWORD normal) { - FIXME("iface %p, vertex %u, normal %u stub!\n", iface, vertex, normal); + FIXME("iface %p, vertex %lu, normal %lu stub!\n", iface, vertex, normal); return E_NOTIMPL; } @@ -236,7 +236,7 @@ static HRESULT WINAPI d3drm_face2_SetColor(IDirect3DRMFace2 *iface, D3DCOLOR col { struct d3drm_face *face = impl_from_IDirect3DRMFace2(iface); - TRACE("iface %p, color 0x%08x.\n", iface, color); + TRACE("iface %p, color 0x%08lx.\n", iface, color); face->color = color; @@ -247,7 +247,7 @@ static HRESULT WINAPI d3drm_face1_SetColor(IDirect3DRMFace *iface, D3DCOLOR colo { struct d3drm_face *face = impl_from_IDirect3DRMFace(iface); - TRACE("iface %p, color 0x%08x.\n", iface, color); + TRACE("iface %p, color 0x%08lx.\n", iface, color); return d3drm_face2_SetColor(&face->IDirect3DRMFace2_iface, color); } @@ -262,7 +262,7 @@ static HRESULT WINAPI d3drm_face1_SetTexture(IDirect3DRMFace *iface, IDirect3DRM static HRESULT WINAPI d3drm_face1_SetTextureCoordinates(IDirect3DRMFace *iface, DWORD vertex, D3DVALUE u, D3DVALUE v) { - FIXME("iface %p, vertex %u, u %.8e, v %.8e stub!\n", iface, vertex, u, v); + FIXME("iface %p, vertex %lu, u %.8e, v %.8e stub!\n", iface, vertex, u, v); return E_NOTIMPL; } @@ -284,7 +284,7 @@ static HRESULT WINAPI d3drm_face1_SetTextureTopology(IDirect3DRMFace *iface, BOO static HRESULT WINAPI d3drm_face1_GetVertex(IDirect3DRMFace *iface, DWORD index, D3DVECTOR *vertex, D3DVECTOR *normal) { - FIXME("iface %p, index %u, vertex %p, normal %p stub!\n", iface, index, vertex, normal); + FIXME("iface %p, index %lu, vertex %p, normal %p stub!\n", iface, index, vertex, normal); return E_NOTIMPL; } @@ -301,7 +301,7 @@ static HRESULT WINAPI d3drm_face1_GetVertices(IDirect3DRMFace *iface, static HRESULT WINAPI d3drm_face1_GetTextureCoordinates(IDirect3DRMFace *iface, DWORD vertex, D3DVALUE *u, D3DVALUE *v) { - FIXME("iface %p, vertex %u, u %p, v %p stub!\n", iface, vertex, u, v); + FIXME("iface %p, vertex %lu, u %p, v %p stub!\n", iface, vertex, u, v); return E_NOTIMPL; } @@ -343,14 +343,14 @@ static int WINAPI d3drm_face1_GetVertexCount(IDirect3DRMFace *iface) static int WINAPI d3drm_face1_GetVertexIndex(IDirect3DRMFace *iface, DWORD which) { - FIXME("iface %p, which %u stub!\n", iface, which); + FIXME("iface %p, which %lu stub!\n", iface, which); return 0; } static int WINAPI d3drm_face1_GetTextureCoordinateIndex(IDirect3DRMFace *iface, DWORD which) { - FIXME("iface %p, which %u stub!\n", iface, which); + FIXME("iface %p, which %lu stub!\n", iface, which); return 0; } @@ -475,7 +475,7 @@ static HRESULT WINAPI d3drm_face2_AddVertex(IDirect3DRMFace2 *iface, D3DVALUE x, static HRESULT WINAPI d3drm_face2_AddVertexAndNormalIndexed(IDirect3DRMFace2 *iface, DWORD vertex, DWORD normal) { - FIXME("iface %p, vertex %u, normal %u stub!\n", iface, vertex, normal); + FIXME("iface %p, vertex %lu, normal %lu stub!\n", iface, vertex, normal); return E_NOTIMPL; } @@ -490,7 +490,7 @@ static HRESULT WINAPI d3drm_face2_SetTexture(IDirect3DRMFace2 *iface, IDirect3DR static HRESULT WINAPI d3drm_face2_SetTextureCoordinates(IDirect3DRMFace2 *iface, DWORD vertex, D3DVALUE u, D3DVALUE v) { - FIXME("iface %p, vertex %u, u %.8e, v %.8e stub!\n", iface, vertex, u, v); + FIXME("iface %p, vertex %lu, u %.8e, v %.8e stub!\n", iface, vertex, u, v); return E_NOTIMPL; } @@ -512,7 +512,7 @@ static HRESULT WINAPI d3drm_face2_SetTextureTopology(IDirect3DRMFace2 *iface, BO static HRESULT WINAPI d3drm_face2_GetVertex(IDirect3DRMFace2 *iface, DWORD index, D3DVECTOR *vertex, D3DVECTOR *normal) { - FIXME("iface %p, index %u, vertex %p, normal %p stub!\n", iface, index, vertex, normal); + FIXME("iface %p, index %lu, vertex %p, normal %p stub!\n", iface, index, vertex, normal); return E_NOTIMPL; } @@ -529,7 +529,7 @@ static HRESULT WINAPI d3drm_face2_GetVertices(IDirect3DRMFace2 *iface, static HRESULT WINAPI d3drm_face2_GetTextureCoordinates(IDirect3DRMFace2 *iface, DWORD vertex, D3DVALUE *u, D3DVALUE *v) { - FIXME("iface %p, vertex %u, u %p, v %p stub!\n", iface, vertex, u, v); + FIXME("iface %p, vertex %lu, u %p, v %p stub!\n", iface, vertex, u, v); return E_NOTIMPL; } @@ -571,14 +571,14 @@ static int WINAPI d3drm_face2_GetVertexCount(IDirect3DRMFace2 *iface) static int WINAPI d3drm_face2_GetVertexIndex(IDirect3DRMFace2 *iface, DWORD which) { - FIXME("iface %p, which %u stub!\n", iface, which); + FIXME("iface %p, which %lu stub!\n", iface, which); return 0; } static int WINAPI d3drm_face2_GetTextureCoordinateIndex(IDirect3DRMFace2 *iface, DWORD which) { - FIXME("iface %p, which %u stub!\n", iface, which); + FIXME("iface %p, which %lu stub!\n", iface, which); return 0; } diff --git a/dlls/d3drm/frame.c b/dlls/d3drm/frame.c index 265afdf3d63..5cc3ad585d4 100644 --- a/dlls/d3drm/frame.c +++ b/dlls/d3drm/frame.c @@ -187,7 +187,7 @@ static ULONG WINAPI d3drm_frame_array_AddRef(IDirect3DRMFrameArray *iface) struct d3drm_frame_array *array = impl_from_IDirect3DRMFrameArray(iface); ULONG refcount = InterlockedIncrement(&array->ref); - TRACE("%p increasing refcount to %u.\n", iface, refcount); + TRACE("%p increasing refcount to %lu.\n", iface, refcount); return refcount; } @@ -198,7 +198,7 @@ static ULONG WINAPI d3drm_frame_array_Release(IDirect3DRMFrameArray *iface) ULONG refcount = InterlockedDecrement(&array->ref); ULONG i; - TRACE("%p decreasing refcount to %u.\n", iface, refcount); + TRACE("%p decreasing refcount to %lu.\n", iface, refcount); if (!refcount) { @@ -227,7 +227,7 @@ static HRESULT WINAPI d3drm_frame_array_GetElement(IDirect3DRMFrameArray *iface, { struct d3drm_frame_array *array = impl_from_IDirect3DRMFrameArray(iface); - TRACE("iface %p, index %u, frame %p.\n", iface, index, frame); + TRACE("iface %p, index %lu, frame %p.\n", iface, index, frame); if (!frame) return D3DRMERR_BADVALUE; @@ -305,7 +305,7 @@ static ULONG WINAPI d3drm_visual_array_AddRef(IDirect3DRMVisualArray *iface) struct d3drm_visual_array *array = impl_from_IDirect3DRMVisualArray(iface); ULONG refcount = InterlockedIncrement(&array->ref); - TRACE("%p increasing refcount to %u.\n", iface, refcount); + TRACE("%p increasing refcount to %lu.\n", iface, refcount); return refcount; } @@ -316,7 +316,7 @@ static ULONG WINAPI d3drm_visual_array_Release(IDirect3DRMVisualArray *iface) ULONG refcount = InterlockedDecrement(&array->ref); ULONG i; - TRACE("%p decreasing refcount to %u.\n", iface, refcount); + TRACE("%p decreasing refcount to %lu.\n", iface, refcount); if (!refcount) { @@ -345,7 +345,7 @@ static HRESULT WINAPI d3drm_visual_array_GetElement(IDirect3DRMVisualArray *ifac { struct d3drm_visual_array *array = impl_from_IDirect3DRMVisualArray(iface); - TRACE("iface %p, index %u, visual %p.\n", iface, index, visual); + TRACE("iface %p, index %lu, visual %p.\n", iface, index, visual); if (!visual) return D3DRMERR_BADVALUE; @@ -424,7 +424,7 @@ static ULONG WINAPI d3drm_light_array_AddRef(IDirect3DRMLightArray *iface) struct d3drm_light_array *array = impl_from_IDirect3DRMLightArray(iface); ULONG refcount = InterlockedIncrement(&array->ref); - TRACE("%p increasing refcount to %u.\n", iface, refcount); + TRACE("%p increasing refcount to %lu.\n", iface, refcount); return refcount; } @@ -435,7 +435,7 @@ static ULONG WINAPI d3drm_light_array_Release(IDirect3DRMLightArray *iface) ULONG refcount = InterlockedDecrement(&array->ref); ULONG i; - TRACE("%p decreasing refcount to %u.\n", iface, refcount); + TRACE("%p decreasing refcount to %lu.\n", iface, refcount); if (!refcount) { @@ -464,7 +464,7 @@ static HRESULT WINAPI d3drm_light_array_GetElement(IDirect3DRMLightArray *iface, { struct d3drm_light_array *array = impl_from_IDirect3DRMLightArray(iface); - TRACE("iface %p, index %u, light %p.\n", iface, index, light); + TRACE("iface %p, index %lu, light %p.\n", iface, index, light); if (!light) return D3DRMERR_BADVALUE; @@ -575,7 +575,7 @@ static ULONG WINAPI d3drm_frame3_AddRef(IDirect3DRMFrame3 *iface) struct d3drm_frame *frame = impl_from_IDirect3DRMFrame3(iface); ULONG refcount = InterlockedIncrement(&frame->ref); - TRACE("%p increasing refcount to %u.\n", iface, refcount); + TRACE("%p increasing refcount to %lu.\n", iface, refcount); return refcount; } @@ -604,7 +604,7 @@ static ULONG WINAPI d3drm_frame3_Release(IDirect3DRMFrame3 *iface) ULONG refcount = InterlockedDecrement(&frame->ref); ULONG i; - TRACE("%p decreasing refcount to %u.\n", iface, refcount); + TRACE("%p decreasing refcount to %lu.\n", iface, refcount); if (!refcount) { @@ -737,7 +737,7 @@ static HRESULT WINAPI d3drm_frame3_SetAppData(IDirect3DRMFrame3 *iface, DWORD da { struct d3drm_frame *frame = impl_from_IDirect3DRMFrame3(iface); - TRACE("iface %p, data %#x.\n", iface, data); + TRACE("iface %p, data %#lx.\n", iface, data); frame->obj.appdata = data; @@ -748,7 +748,7 @@ static HRESULT WINAPI d3drm_frame2_SetAppData(IDirect3DRMFrame2 *iface, DWORD da { struct d3drm_frame *frame = impl_from_IDirect3DRMFrame2(iface); - TRACE("iface %p, data %#x.\n", iface, data); + TRACE("iface %p, data %#lx.\n", iface, data); return d3drm_frame3_SetAppData(&frame->IDirect3DRMFrame3_iface, data); } @@ -757,7 +757,7 @@ static HRESULT WINAPI d3drm_frame1_SetAppData(IDirect3DRMFrame *iface, DWORD dat { struct d3drm_frame *frame = impl_from_IDirect3DRMFrame(iface); - TRACE("iface %p, data %#x.\n", iface, data); + TRACE("iface %p, data %#lx.\n", iface, data); return d3drm_frame3_SetAppData(&frame->IDirect3DRMFrame3_iface, data); } @@ -984,7 +984,7 @@ static HRESULT WINAPI d3drm_frame1_AddLight(IDirect3DRMFrame *iface, IDirect3DRM static HRESULT WINAPI d3drm_frame3_AddMoveCallback(IDirect3DRMFrame3 *iface, D3DRMFRAME3MOVECALLBACK cb, void *ctx, DWORD flags) { - FIXME("iface %p, cb %p, ctx %p flags %#x stub!\n", iface, cb, ctx, flags); + FIXME("iface %p, cb %p, ctx %p flags %#lx stub!\n", iface, cb, ctx, flags); return E_NOTIMPL; } @@ -1754,7 +1754,7 @@ static HRESULT WINAPI d3drm_frame1_InverseTransform(IDirect3DRMFrame *iface, D3D static HRESULT WINAPI d3drm_frame3_Load(IDirect3DRMFrame3 *iface, void *filename, void *name, D3DRMLOADOPTIONS flags, D3DRMLOADTEXTURE3CALLBACK cb, void *ctx) { - FIXME("iface %p, filename %p, name %p, flags %#x, cb %p, ctx %p stub!\n", + FIXME("iface %p, filename %p, name %p, flags %#lx, cb %p, ctx %p stub!\n", iface, filename, name, flags, cb, ctx); return E_NOTIMPL; @@ -1763,7 +1763,7 @@ static HRESULT WINAPI d3drm_frame3_Load(IDirect3DRMFrame3 *iface, void *filename static HRESULT WINAPI d3drm_frame2_Load(IDirect3DRMFrame2 *iface, void *filename, void *name, D3DRMLOADOPTIONS flags, D3DRMLOADTEXTURECALLBACK cb, void *ctx) { - FIXME("iface %p, filename %p, name %p, flags %#x, cb %p, ctx %p stub!\n", + FIXME("iface %p, filename %p, name %p, flags %#lx, cb %p, ctx %p stub!\n", iface, filename, name, flags, cb, ctx); return E_NOTIMPL; @@ -1772,7 +1772,7 @@ static HRESULT WINAPI d3drm_frame2_Load(IDirect3DRMFrame2 *iface, void *filename static HRESULT WINAPI d3drm_frame1_Load(IDirect3DRMFrame *iface, void *filename, void *name, D3DRMLOADOPTIONS flags, D3DRMLOADTEXTURECALLBACK cb, void *ctx) { - FIXME("iface %p, filename %p, name %p, flags %#x, cb %p, ctx %p stub!\n", + FIXME("iface %p, filename %p, name %p, flags %#lx, cb %p, ctx %p stub!\n", iface, filename, name, flags, cb, ctx); return E_NOTIMPL; @@ -2138,7 +2138,7 @@ static HRESULT WINAPI d3drm_frame3_SetSceneBackground(IDirect3DRMFrame3 *iface, { struct d3drm_frame *frame = impl_from_IDirect3DRMFrame3(iface); - TRACE("iface %p, color 0x%08x.\n", iface, color); + TRACE("iface %p, color 0x%08lx.\n", iface, color); frame->scenebackground = color; @@ -2149,7 +2149,7 @@ static HRESULT WINAPI d3drm_frame2_SetSceneBackground(IDirect3DRMFrame2 *iface, { struct d3drm_frame *frame = impl_from_IDirect3DRMFrame2(iface); - TRACE("iface %p, color 0x%08x.\n", iface, color); + TRACE("iface %p, color 0x%08lx.\n", iface, color); return d3drm_frame3_SetSceneBackground(&frame->IDirect3DRMFrame3_iface, color); } @@ -2158,7 +2158,7 @@ static HRESULT WINAPI d3drm_frame1_SetSceneBackground(IDirect3DRMFrame *iface, D { struct d3drm_frame *frame = impl_from_IDirect3DRMFrame(iface); - TRACE("iface %p, color 0x%08x.\n", iface, color); + TRACE("iface %p, color 0x%08lx.\n", iface, color); return d3drm_frame3_SetSceneBackground(&frame->IDirect3DRMFrame3_iface, color); } @@ -2266,21 +2266,21 @@ static HRESULT WINAPI d3drm_frame1_SetSceneFogEnable(IDirect3DRMFrame *iface, BO static HRESULT WINAPI d3drm_frame3_SetSceneFogColor(IDirect3DRMFrame3 *iface, D3DCOLOR color) { - FIXME("iface %p, color 0x%08x stub!\n", iface, color); + FIXME("iface %p, color 0x%08lx stub!\n", iface, color); return E_NOTIMPL; } static HRESULT WINAPI d3drm_frame2_SetSceneFogColor(IDirect3DRMFrame2 *iface, D3DCOLOR color) { - FIXME("iface %p, color 0x%08x stub!\n", iface, color); + FIXME("iface %p, color 0x%08lx stub!\n", iface, color); return E_NOTIMPL; } static HRESULT WINAPI d3drm_frame1_SetSceneFogColor(IDirect3DRMFrame *iface, D3DCOLOR color) { - FIXME("iface %p, color 0x%08x stub!\n", iface, color); + FIXME("iface %p, color 0x%08lx stub!\n", iface, color); return E_NOTIMPL; } @@ -2332,21 +2332,21 @@ static HRESULT WINAPI d3drm_frame1_SetSceneFogParams(IDirect3DRMFrame *iface, static HRESULT WINAPI d3drm_frame3_SetColor(IDirect3DRMFrame3 *iface, D3DCOLOR color) { - FIXME("iface %p, color 0x%08x stub!\n", iface, color); + FIXME("iface %p, color 0x%08lx stub!\n", iface, color); return E_NOTIMPL; } static HRESULT WINAPI d3drm_frame2_SetColor(IDirect3DRMFrame2 *iface, D3DCOLOR color) { - FIXME("iface %p, color 0x%08x stub!\n", iface, color); + FIXME("iface %p, color 0x%08lx stub!\n", iface, color); return E_NOTIMPL; } static HRESULT WINAPI d3drm_frame1_SetColor(IDirect3DRMFrame *iface, D3DCOLOR color) { - FIXME("iface %p, color 0x%08x stub!\n", iface, color); + FIXME("iface %p, color 0x%08lx stub!\n", iface, color); return E_NOTIMPL; } @@ -2635,7 +2635,7 @@ static HRESULT WINAPI d3drm_frame1_Transform(IDirect3DRMFrame *iface, D3DVECTOR static HRESULT WINAPI d3drm_frame2_AddMoveCallback2(IDirect3DRMFrame2 *iface, D3DRMFRAMEMOVECALLBACK cb, void *ctx, DWORD flags) { - FIXME("iface %p, cb %p, ctx %p, flags %#x stub!\n", iface, cb, ctx, flags); + FIXME("iface %p, cb %p, ctx %p, flags %#lx stub!\n", iface, cb, ctx, flags); return E_NOTIMPL; } @@ -2772,7 +2772,7 @@ static HRESULT WINAPI d3drm_frame3_SetQuaternion(IDirect3DRMFrame3 *iface, static HRESULT WINAPI d3drm_frame3_RayPick(IDirect3DRMFrame3 *iface, IDirect3DRMFrame3 *reference, D3DRMRAY *ray, DWORD flags, IDirect3DRMPicked2Array **visuals) { - FIXME("iface %p, reference %p, ray %p, flags %#x, visuals %p stub!\n", + FIXME("iface %p, reference %p, ray %p, flags %#lx, visuals %p stub!\n", iface, reference, ray, flags, visuals); return E_NOTIMPL; @@ -2781,7 +2781,7 @@ static HRESULT WINAPI d3drm_frame3_RayPick(IDirect3DRMFrame3 *iface, IDirect3DRM static HRESULT WINAPI d3drm_frame3_Save(IDirect3DRMFrame3 *iface, const char *filename, D3DRMXOFFORMAT format, D3DRMSAVEOPTIONS flags) { - FIXME("iface %p, filename %s, format %#x, flags %#x stub!\n", + FIXME("iface %p, filename %s, format %#x, flags %#lx stub!\n", iface, debugstr_a(filename), format, flags); return E_NOTIMPL; @@ -2790,7 +2790,7 @@ static HRESULT WINAPI d3drm_frame3_Save(IDirect3DRMFrame3 *iface, static HRESULT WINAPI d3drm_frame3_TransformVectors(IDirect3DRMFrame3 *iface, IDirect3DRMFrame3 *reference, DWORD num, D3DVECTOR *dst, D3DVECTOR *src) { - FIXME("iface %p, reference %p, num %u, dst %p, src %p stub!\n", iface, reference, num, dst, src); + FIXME("iface %p, reference %p, num %lu, dst %p, src %p stub!\n", iface, reference, num, dst, src); return E_NOTIMPL; } @@ -2798,7 +2798,7 @@ static HRESULT WINAPI d3drm_frame3_TransformVectors(IDirect3DRMFrame3 *iface, static HRESULT WINAPI d3drm_frame3_InverseTransformVectors(IDirect3DRMFrame3 *iface, IDirect3DRMFrame3 *reference, DWORD num, D3DVECTOR *dst, D3DVECTOR *src) { - FIXME("iface %p, reference %p, num %u, dst %p, src %p stub!\n", iface, reference, num, dst, src); + FIXME("iface %p, reference %p, num %lu, dst %p, src %p stub!\n", iface, reference, num, dst, src); return E_NOTIMPL; } @@ -2808,7 +2808,7 @@ static HRESULT WINAPI d3drm_frame3_SetTraversalOptions(IDirect3DRMFrame3 *iface, static const DWORD supported_options = D3DRMFRAME_RENDERENABLE | D3DRMFRAME_PICKENABLE; struct d3drm_frame *frame = impl_from_IDirect3DRMFrame3(iface); - TRACE("iface %p, options %#x.\n", iface, options); + TRACE("iface %p, options %#lx.\n", iface, options); if (options & ~supported_options) return D3DRMERR_BADVALUE; @@ -2834,7 +2834,7 @@ static HRESULT WINAPI d3drm_frame3_GetTraversalOptions(IDirect3DRMFrame3 *iface, static HRESULT WINAPI d3drm_frame3_SetSceneFogMethod(IDirect3DRMFrame3 *iface, DWORD flags) { - FIXME("iface %p, flags %#x stub!\n", iface, flags); + FIXME("iface %p, flags %#lx stub!\n", iface, flags); return E_NOTIMPL; } @@ -3210,7 +3210,7 @@ static ULONG WINAPI d3drm_animation2_AddRef(IDirect3DRMAnimation2 *iface) struct d3drm_animation *animation = impl_from_IDirect3DRMAnimation2(iface); ULONG refcount = InterlockedIncrement(&animation->ref); - TRACE("%p increasing refcount to %u.\n", iface, refcount); + TRACE("%p increasing refcount to %lu.\n", iface, refcount); return refcount; } @@ -3226,7 +3226,7 @@ static ULONG WINAPI d3drm_animation2_Release(IDirect3DRMAnimation2 *iface) struct d3drm_animation *animation = impl_from_IDirect3DRMAnimation2(iface); ULONG refcount = InterlockedDecrement(&animation->ref); - TRACE("%p decreasing refcount to %u.\n", iface, refcount); + TRACE("%p decreasing refcount to %lu.\n", iface, refcount); if (!refcount) { @@ -3306,7 +3306,7 @@ static HRESULT WINAPI d3drm_animation2_SetAppData(IDirect3DRMAnimation2 *iface, { struct d3drm_animation *animation = impl_from_IDirect3DRMAnimation2(iface); - TRACE("iface %p, data %#x.\n", iface, data); + TRACE("iface %p, data %#lx.\n", iface, data); animation->obj.appdata = data; @@ -3317,7 +3317,7 @@ static HRESULT WINAPI d3drm_animation1_SetAppData(IDirect3DRMAnimation *iface, D { struct d3drm_animation *animation = impl_from_IDirect3DRMAnimation(iface); - TRACE("iface %p, data %#x.\n", iface, data); + TRACE("iface %p, data %#lx.\n", iface, data); return d3drm_animation2_SetAppData(&animation->IDirect3DRMAnimation2_iface, data); } @@ -3400,7 +3400,7 @@ static HRESULT WINAPI d3drm_animation2_SetOptions(IDirect3DRMAnimation2 *iface, static const DWORD supported_options = D3DRMANIMATION_OPEN | D3DRMANIMATION_CLOSED | D3DRMANIMATION_LINEARPOSITION | D3DRMANIMATION_SPLINEPOSITION | D3DRMANIMATION_SCALEANDROTATION | D3DRMANIMATION_POSITION; - TRACE("iface %p, options %#x.\n", iface, options); + TRACE("iface %p, options %#lx.\n", iface, options); if (!(options & supported_options)) return D3DRMERR_BADVALUE; @@ -3423,7 +3423,7 @@ static HRESULT WINAPI d3drm_animation1_SetOptions(IDirect3DRMAnimation *iface, D { struct d3drm_animation *animation = impl_from_IDirect3DRMAnimation(iface); - TRACE("iface %p, %#x.\n", iface, options); + TRACE("iface %p, %#lx.\n", iface, options); return d3drm_animation2_SetOptions(&animation->IDirect3DRMAnimation2_iface, options); } @@ -3746,7 +3746,7 @@ static HRESULT WINAPI d3drm_animation2_GetFrame(IDirect3DRMAnimation2 *iface, ID static HRESULT WINAPI d3drm_animation2_DeleteKeyByID(IDirect3DRMAnimation2 *iface, DWORD id) { - FIXME("iface %p, id %#x.\n", iface, id); + FIXME("iface %p, id %#lx.\n", iface, id); return E_NOTIMPL; } diff --git a/dlls/d3drm/light.c b/dlls/d3drm/light.c index 675dcaa0b54..b67599c1340 100644 --- a/dlls/d3drm/light.c +++ b/dlls/d3drm/light.c @@ -51,7 +51,7 @@ static ULONG WINAPI d3drm_light_AddRef(IDirect3DRMLight *iface) struct d3drm_light *light = impl_from_IDirect3DRMLight(iface); ULONG refcount = InterlockedIncrement(&light->ref); - TRACE("%p increasing refcount to %u.\n", iface, refcount); + TRACE("%p increasing refcount to %lu.\n", iface, refcount); return refcount; } @@ -61,7 +61,7 @@ static ULONG WINAPI d3drm_light_Release(IDirect3DRMLight *iface) struct d3drm_light *light = impl_from_IDirect3DRMLight(iface); ULONG refcount = InterlockedDecrement(&light->ref); - TRACE("%p decreasing refcount to %u.\n", iface, refcount); + TRACE("%p decreasing refcount to %lu.\n", iface, refcount); if (!refcount) { @@ -105,7 +105,7 @@ static HRESULT WINAPI d3drm_light_SetAppData(IDirect3DRMLight *iface, DWORD data { struct d3drm_light *light = impl_from_IDirect3DRMLight(iface); - TRACE("iface %p, data %#x.\n", iface, data); + TRACE("iface %p, data %#lx.\n", iface, data); light->obj.appdata = data; @@ -163,7 +163,7 @@ static HRESULT WINAPI d3drm_light_SetColor(IDirect3DRMLight *iface, D3DCOLOR col { struct d3drm_light *light = impl_from_IDirect3DRMLight(iface); - TRACE("iface %p, color 0x%08x.\n", iface, color); + TRACE("iface %p, color 0x%08lx.\n", iface, color); light->color = 0xff000000 | color; diff --git a/dlls/d3drm/material.c b/dlls/d3drm/material.c index e402ea630d3..2e831b5d252 100644 --- a/dlls/d3drm/material.c +++ b/dlls/d3drm/material.c @@ -52,7 +52,7 @@ static ULONG WINAPI d3drm_material_AddRef(IDirect3DRMMaterial2 *iface) struct d3drm_material *material = impl_from_IDirect3DRMMaterial2(iface); ULONG refcount = InterlockedIncrement(&material->ref); - TRACE("%p increasing refcount to %u.\n", iface, refcount); + TRACE("%p increasing refcount to %lu.\n", iface, refcount); return refcount; } @@ -62,7 +62,7 @@ static ULONG WINAPI d3drm_material_Release(IDirect3DRMMaterial2 *iface) struct d3drm_material *material = impl_from_IDirect3DRMMaterial2(iface); ULONG refcount = InterlockedDecrement(&material->ref); - TRACE("%p decreasing refcount to %u.\n", iface, refcount); + TRACE("%p decreasing refcount to %lu.\n", iface, refcount); if (!refcount) { @@ -106,7 +106,7 @@ static HRESULT WINAPI d3drm_material_SetAppData(IDirect3DRMMaterial2 *iface, DWO { struct d3drm_material *material = impl_from_IDirect3DRMMaterial2(iface); - TRACE("iface %p, data %#x.\n", iface, data); + TRACE("iface %p, data %#lx.\n", iface, data); material->obj.appdata = data; diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index 401b5aac334..4a08b32d72d 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -372,7 +372,7 @@ static ULONG WINAPI d3drm_mesh_builder2_AddRef(IDirect3DRMMeshBuilder2 *iface) struct d3drm_mesh_builder *mesh_builder = impl_from_IDirect3DRMMeshBuilder2(iface); ULONG refcount = InterlockedIncrement(&mesh_builder->ref); - TRACE("%p increasing refcount to %u.\n", mesh_builder, refcount); + TRACE("%p increasing refcount to %lu.\n", mesh_builder, refcount); return refcount; } @@ -382,7 +382,7 @@ static ULONG WINAPI d3drm_mesh_builder2_Release(IDirect3DRMMeshBuilder2 *iface) struct d3drm_mesh_builder *mesh_builder = impl_from_IDirect3DRMMeshBuilder2(iface); ULONG refcount = InterlockedDecrement(&mesh_builder->ref); - TRACE("%p decreasing refcount to %u.\n", mesh_builder, refcount); + TRACE("%p decreasing refcount to %lu.\n", mesh_builder, refcount); if (!refcount) { @@ -431,7 +431,7 @@ static HRESULT WINAPI d3drm_mesh_builder3_SetAppData(IDirect3DRMMeshBuilder3 *if { struct d3drm_mesh_builder *mesh_builder = impl_from_IDirect3DRMMeshBuilder3(iface); - TRACE("iface %p, data %#x.\n", iface, data); + TRACE("iface %p, data %#lx.\n", iface, data); mesh_builder->obj.appdata = data; @@ -442,7 +442,7 @@ static HRESULT WINAPI d3drm_mesh_builder2_SetAppData(IDirect3DRMMeshBuilder2 *if { struct d3drm_mesh_builder *mesh_builder = impl_from_IDirect3DRMMeshBuilder2(iface); - TRACE("iface %p, data %#x.\n", iface, data); + TRACE("iface %p, data %#lx.\n", iface, data); return d3drm_mesh_builder3_SetAppData(&mesh_builder->IDirect3DRMMeshBuilder3_iface, data); } @@ -497,7 +497,7 @@ static HRESULT WINAPI d3drm_mesh_builder2_Load(IDirect3DRMMeshBuilder2 *iface, v { struct d3drm_mesh_builder *mesh_builder = impl_from_IDirect3DRMMeshBuilder2(iface); - TRACE("iface %p, filename %p, name %p, flags %#x, cb %p, ctx %p.\n", + TRACE("iface %p, filename %p, name %p, flags %#lx, cb %p, ctx %p.\n", iface, filename, name, flags, cb, ctx); if (cb) @@ -510,7 +510,7 @@ static HRESULT WINAPI d3drm_mesh_builder2_Load(IDirect3DRMMeshBuilder2 *iface, v static HRESULT WINAPI d3drm_mesh_builder2_Save(IDirect3DRMMeshBuilder2 *iface, const char *filename, D3DRMXOFFORMAT format, D3DRMSAVEOPTIONS flags) { - FIXME("iface %p, filename %s, format %#x, flags %#x stub!\n", + FIXME("iface %p, filename %s, format %#x, flags %#lx stub!\n", iface, debugstr_a(filename), format, flags); return E_NOTIMPL; @@ -595,7 +595,7 @@ static HRESULT WINAPI d3drm_mesh_builder2_AddFaces(IDirect3DRMMeshBuilder2 *ifac DWORD vertex_count, D3DVECTOR *vertices, DWORD normal_count, D3DVECTOR *normals, DWORD *face_data, IDirect3DRMFaceArray **array) { - FIXME("iface %p, vertex_count %u, vertices %p, normal_count %u, normals %p, face_data %p, array %p stub!\n", + FIXME("iface %p, vertex_count %lu, vertices %p, normal_count %lu, normals %p, face_data %p, array %p stub!\n", iface, vertex_count, vertices, normal_count, normals, face_data, array); return E_NOTIMPL; @@ -604,7 +604,7 @@ static HRESULT WINAPI d3drm_mesh_builder2_AddFaces(IDirect3DRMMeshBuilder2 *ifac static HRESULT WINAPI d3drm_mesh_builder2_ReserveSpace(IDirect3DRMMeshBuilder2 *iface, DWORD vertex_count, DWORD normal_count, DWORD face_count) { - FIXME("iface %p, vertex_count %u, normal_count %u, face_count %u stub!\n", + FIXME("iface %p, vertex_count %lu, normal_count %lu, face_count %lu stub!\n", iface, vertex_count, normal_count, face_count); return E_NOTIMPL; @@ -624,7 +624,7 @@ static HRESULT WINAPI d3drm_mesh_builder2_SetColor(IDirect3DRMMeshBuilder2 *ifac { struct d3drm_mesh_builder *mesh_builder = impl_from_IDirect3DRMMeshBuilder2(iface); - TRACE("iface %p, color 0x%08x.\n", iface, color); + TRACE("iface %p, color 0x%08lx.\n", iface, color); return IDirect3DRMMeshBuilder3_SetColor(&mesh_builder->IDirect3DRMMeshBuilder3_iface, color); } @@ -670,7 +670,7 @@ static HRESULT WINAPI d3drm_mesh_builder2_SetTextureTopology(IDirect3DRMMeshBuil static HRESULT WINAPI d3drm_mesh_builder2_SetQuality(IDirect3DRMMeshBuilder2 *iface, D3DRMRENDERQUALITY quality) { - FIXME("iface %p, quality %#x stub!\n", iface, quality); + FIXME("iface %p, quality %#lx stub!\n", iface, quality); return E_NOTIMPL; } @@ -685,7 +685,7 @@ static HRESULT WINAPI d3drm_mesh_builder2_SetPerspective(IDirect3DRMMeshBuilder2 static HRESULT WINAPI d3drm_mesh_builder2_SetVertex(IDirect3DRMMeshBuilder2 *iface, DWORD index, D3DVALUE x, D3DVALUE y, D3DVALUE z) { - FIXME("iface %p, index %u, x %.8e, y %.8e, z %.8e stub!\n", iface, index, x, y, z); + FIXME("iface %p, index %lu, x %.8e, y %.8e, z %.8e stub!\n", iface, index, x, y, z); return E_NOTIMPL; } @@ -693,7 +693,7 @@ static HRESULT WINAPI d3drm_mesh_builder2_SetVertex(IDirect3DRMMeshBuilder2 *ifa static HRESULT WINAPI d3drm_mesh_builder2_SetNormal(IDirect3DRMMeshBuilder2 *iface, DWORD index, D3DVALUE x, D3DVALUE y, D3DVALUE z) { - FIXME("iface %p, index %u, x %.8e, y %.8e, z %.8e stub!\n", iface, index, x, y, z); + FIXME("iface %p, index %lu, x %.8e, y %.8e, z %.8e stub!\n", iface, index, x, y, z); return E_NOTIMPL; } @@ -703,7 +703,7 @@ static HRESULT WINAPI d3drm_mesh_builder2_SetTextureCoordinates(IDirect3DRMMeshB { struct d3drm_mesh_builder *mesh_builder = impl_from_IDirect3DRMMeshBuilder2(iface); - TRACE("iface %p, index %u, u %.8e, v %.8e.\n", iface, index, u, v); + TRACE("iface %p, index %lu, u %.8e, v %.8e.\n", iface, index, u, v); return IDirect3DRMMeshBuilder3_SetTextureCoordinates(&mesh_builder->IDirect3DRMMeshBuilder3_iface, index, u, v); @@ -712,7 +712,7 @@ static HRESULT WINAPI d3drm_mesh_builder2_SetTextureCoordinates(IDirect3DRMMeshB static HRESULT WINAPI d3drm_mesh_builder2_SetVertexColor(IDirect3DRMMeshBuilder2 *iface, DWORD index, D3DCOLOR color) { - FIXME("iface %p, index %u, color 0x%08x stub!\n", iface, index, color); + FIXME("iface %p, index %lu, color 0x%08lx stub!\n", iface, index, color); return E_NOTIMPL; } @@ -720,7 +720,7 @@ static HRESULT WINAPI d3drm_mesh_builder2_SetVertexColor(IDirect3DRMMeshBuilder2 static HRESULT WINAPI d3drm_mesh_builder2_SetVertexColorRGB(IDirect3DRMMeshBuilder2 *iface, DWORD index, D3DVALUE red, D3DVALUE green, D3DVALUE blue) { - FIXME("iface %p, index %u, red %.8e, green %.8e, blue %.8e stub!\n", + FIXME("iface %p, index %lu, red %.8e, green %.8e, blue %.8e stub!\n", iface, index, red, green, blue); return E_NOTIMPL; @@ -772,7 +772,7 @@ static HRESULT WINAPI d3drm_mesh_builder2_GetTextureCoordinates(IDirect3DRMMeshB { struct d3drm_mesh_builder *mesh_builder = impl_from_IDirect3DRMMeshBuilder2(iface); - TRACE("iface %p, index %u, u %p, v %p.\n", iface, index, u, v); + TRACE("iface %p, index %lu, u %p, v %p.\n", iface, index, u, v); return IDirect3DRMMeshBuilder3_GetTextureCoordinates(&mesh_builder->IDirect3DRMMeshBuilder3_iface, index, u, v); @@ -847,7 +847,7 @@ static int WINAPI d3drm_mesh_builder2_GetVertexCount(IDirect3DRMMeshBuilder2 *if static D3DCOLOR WINAPI d3drm_mesh_builder2_GetVertexColor(IDirect3DRMMeshBuilder2 *iface, DWORD index) { - FIXME("iface %p, index %u stub!\n", iface, index); + FIXME("iface %p, index %lu stub!\n", iface, index); return 0; } @@ -864,7 +864,7 @@ static HRESULT WINAPI d3drm_mesh_builder2_CreateMesh(IDirect3DRMMeshBuilder2 *if static HRESULT WINAPI d3drm_mesh_builder2_GenerateNormals2(IDirect3DRMMeshBuilder2 *iface, D3DVALUE crease, DWORD flags) { - FIXME("iface %p, crease %.8e, flags %#x stub!\n", iface, crease, flags); + FIXME("iface %p, crease %.8e, flags %#lx stub!\n", iface, crease, flags); return E_NOTIMPL; } @@ -872,7 +872,7 @@ static HRESULT WINAPI d3drm_mesh_builder2_GenerateNormals2(IDirect3DRMMeshBuilde static HRESULT WINAPI d3drm_mesh_builder2_GetFace(IDirect3DRMMeshBuilder2 *iface, DWORD index, IDirect3DRMFace **face) { - FIXME("iface %p, index %u, face %p stub!\n", iface, index, face); + FIXME("iface %p, index %lu, face %p stub!\n", iface, index, face); return E_NOTIMPL; } @@ -1066,7 +1066,7 @@ HRESULT load_mesh_data(IDirect3DRMMeshBuilder3 *iface, IDirectXFileData *pData, mesh_builder->nb_faces = *(DWORD*)(ptr + sizeof(DWORD) + mesh_builder->nb_vertices * sizeof(D3DVECTOR)); faces_vertex_idx_size = size - sizeof(DWORD) - mesh_builder->nb_vertices * sizeof(D3DVECTOR) - sizeof(DWORD); - TRACE("Mesh: nb_vertices = %lu, nb_faces = %d, faces_vertex_idx_size = %d\n", mesh_builder->nb_vertices, + TRACE("Mesh: nb_vertices = %Iu, nb_faces = %ld, faces_vertex_idx_size = %ld\n", mesh_builder->nb_vertices, mesh_builder->nb_faces, faces_vertex_idx_size); if (!d3drm_array_reserve((void **)&mesh_builder->vertices, &mesh_builder->vertices_size, mesh_builder->nb_vertices, @@ -1121,9 +1121,9 @@ HRESULT load_mesh_data(IDirect3DRMMeshBuilder3 *iface, IDirectXFileData *pData, mesh_builder->nb_normals = *(DWORD*)ptr; nb_faces_normals = *(DWORD*)(ptr + sizeof(DWORD) + mesh_builder->nb_normals * sizeof(D3DVECTOR)); - TRACE("MeshNormals: nb_normals = %lu, nb_faces_normals = %d\n", mesh_builder->nb_normals, nb_faces_normals); + TRACE("MeshNormals: nb_normals = %Iu, nb_faces_normals = %ld\n", mesh_builder->nb_normals, nb_faces_normals); if (nb_faces_normals != mesh_builder->nb_faces) - WARN("nb_face_normals (%d) != nb_faces (%d)\n", nb_faces_normals, mesh_builder->nb_faces); + WARN("nb_face_normals (%ld) != nb_faces (%ld)\n", nb_faces_normals, mesh_builder->nb_faces); if (!d3drm_array_reserve((void **)&mesh_builder->normals, &mesh_builder->normals_size, mesh_builder->nb_normals, sizeof(*mesh_builder->normals))) @@ -1146,7 +1146,7 @@ HRESULT load_mesh_data(IDirect3DRMMeshBuilder3 *iface, IDirectXFileData *pData, mesh_builder->nb_coords2d = *(DWORD*)ptr; - TRACE("MeshTextureCoords: nb_coords2d = %d\n", mesh_builder->nb_coords2d); + TRACE("MeshTextureCoords: nb_coords2d = %ld\n", mesh_builder->nb_coords2d); mesh_builder->pCoords2d = heap_calloc(mesh_builder->nb_coords2d, sizeof(*mesh_builder->pCoords2d)); memcpy(mesh_builder->pCoords2d, ptr + sizeof(DWORD), mesh_builder->nb_coords2d * sizeof(*mesh_builder->pCoords2d)); @@ -1171,10 +1171,10 @@ HRESULT load_mesh_data(IDirect3DRMMeshBuilder3 *iface, IDirectXFileData *pData, nb_face_indices = *(DWORD*)(ptr + sizeof(DWORD)); data_size = 2 * sizeof(DWORD) + nb_face_indices * sizeof(DWORD); - TRACE("nMaterials = %u, nFaceIndexes = %u\n", nb_materials, nb_face_indices); + TRACE("nMaterials = %lu, nFaceIndexes = %lu\n", nb_materials, nb_face_indices); if (size != data_size) - WARN("Returned size %u does not match expected one %u\n", size, data_size); + WARN("Returned size %lu does not match expected one %lu\n", size, data_size); if (!(mesh_builder->material_indices = heap_calloc(nb_face_indices, sizeof(*mesh_builder->material_indices)))) @@ -1230,7 +1230,7 @@ HRESULT load_mesh_data(IDirect3DRMMeshBuilder3 *iface, IDirectXFileData *pData, } if (size != 44) - WARN("Material size %u does not match expected one %u\n", size, 44); + WARN("Material size %lu does not match expected one %u\n", size, 44); values = (float*)ptr; @@ -1355,7 +1355,7 @@ HRESULT load_mesh_data(IDirect3DRMMeshBuilder3 *iface, IDirectXFileData *pData, D3DVECTOR face_normal; if (faces_vertex_idx_size < sizeof(DWORD)) - WARN("Not enough data to read number of indices of face %d\n", i); + WARN("Not enough data to read number of indices of face %ld\n", i); nb_face_indexes = *(faces_data_ptr + faces_data_size++) = *(faces_vertex_idx_ptr++); faces_vertex_idx_size--; @@ -1363,7 +1363,7 @@ HRESULT load_mesh_data(IDirect3DRMMeshBuilder3 *iface, IDirectXFileData *pData, WARN("Faces indices number mismatch\n"); if (faces_vertex_idx_size < (nb_face_indexes * sizeof(DWORD))) - WARN("Not enough data to read all indices of face %d\n", i); + WARN("Not enough data to read all indices of face %ld\n", i); if (!mesh_builder->nb_normals) { @@ -1403,7 +1403,7 @@ HRESULT load_mesh_data(IDirect3DRMMeshBuilder3 *iface, IDirectXFileData *pData, DWORD vertex_idx = *faces_vertex_idx_ptr; if (vertex_idx >= mesh_builder->nb_vertices) { - WARN("Found vertex index %u but only %lu vertices available => use index 0\n", vertex_idx, + WARN("Found vertex index %lu but only %Iu vertices available => use index 0\n", vertex_idx, mesh_builder->nb_vertices); vertex_idx = 0; } @@ -1470,7 +1470,7 @@ static HRESULT WINAPI d3drm_mesh_builder3_Load(IDirect3DRMMeshBuilder3 *iface, v HRESULT hr; HRESULT ret = D3DRMERR_BADOBJECT; - TRACE("iface %p, filename %p, name %p, loadflags %#x, cb %p, arg %p.\n", + TRACE("iface %p, filename %p, name %p, loadflags %#lx, cb %p, arg %p.\n", iface, filename, name, loadflags, cb, arg); clean_mesh_builder_data(mesh_builder); @@ -1486,7 +1486,7 @@ static HRESULT WINAPI d3drm_mesh_builder3_Load(IDirect3DRMMeshBuilder3 *iface, v } else { - FIXME("Load options %d not supported yet\n", loadflags); + FIXME("Load options %ld not supported yet\n", loadflags); return E_NOTIMPL; } @@ -1522,7 +1522,7 @@ static HRESULT WINAPI d3drm_mesh_builder3_Load(IDirect3DRMMeshBuilder3 *iface, v if ((hr != DXFILE_OK) || (size != sizeof(*header))) goto end; - TRACE("Version is %u.%u, flags %#x.\n", header->major, header->minor, header->flags); + TRACE("Version is %u.%u, flags %#lx.\n", header->major, header->minor, header->flags); /* Version must be 1.0.x */ if ((header->major != 1) || (header->minor != 0)) @@ -1576,7 +1576,7 @@ end: static HRESULT WINAPI d3drm_mesh_builder3_Save(IDirect3DRMMeshBuilder3 *iface, const char *filename, D3DRMXOFFORMAT format, D3DRMSAVEOPTIONS flags) { - FIXME("iface %p, filename %s, format %#x, flags %#x stub!\n", + FIXME("iface %p, filename %s, format %#x, flags %#lx stub!\n", iface, debugstr_a(filename), format, flags); return E_NOTIMPL; @@ -1628,7 +1628,7 @@ static HRESULT WINAPI d3drm_mesh_builder3_GetBox(IDirect3DRMMeshBuilder3 *iface, static HRESULT WINAPI d3drm_mesh_builder3_GenerateNormals(IDirect3DRMMeshBuilder3 *iface, D3DVALUE crease, DWORD flags) { - FIXME("iface %p, crease %.8e, flags %#x stub!\n", iface, crease, flags); + FIXME("iface %p, crease %.8e, flags %#lx stub!\n", iface, crease, flags); return E_NOTIMPL; } @@ -1650,7 +1650,7 @@ static HRESULT WINAPI d3drm_mesh_builder3_AddMesh(IDirect3DRMMeshBuilder3 *iface static HRESULT WINAPI d3drm_mesh_builder3_AddMeshBuilder(IDirect3DRMMeshBuilder3 *iface, IDirect3DRMMeshBuilder3 *mesh_builder, DWORD flags) { - FIXME("iface %p, mesh_builder %p, flags %#x stub!\n", iface, mesh_builder, flags); + FIXME("iface %p, mesh_builder %p, flags %#lx stub!\n", iface, mesh_builder, flags); return E_NOTIMPL; } @@ -1673,7 +1673,7 @@ static HRESULT WINAPI d3drm_mesh_builder3_AddFaces(IDirect3DRMMeshBuilder3 *ifac DWORD vertex_count, D3DVECTOR *vertices, DWORD normal_count, D3DVECTOR *normals, DWORD *face_data, IDirect3DRMFaceArray **array) { - FIXME("iface %p, vertex_count %u, vertices %p, normal_count %u, normals %p, face_data %p array %p stub!\n", + FIXME("iface %p, vertex_count %lu, vertices %p, normal_count %lu, normals %p, face_data %p array %p stub!\n", iface, vertex_count, vertices, normal_count, normals, face_data, array); return E_NOTIMPL; @@ -1682,7 +1682,7 @@ static HRESULT WINAPI d3drm_mesh_builder3_AddFaces(IDirect3DRMMeshBuilder3 *ifac static HRESULT WINAPI d3drm_mesh_builder3_ReserveSpace(IDirect3DRMMeshBuilder3 *iface, DWORD vertex_count, DWORD normal_count, DWORD face_count) { - FIXME("iface %p, vertex_count %u, normal_count %u, face_count %u stub!\n", + FIXME("iface %p, vertex_count %lu, normal_count %lu, face_count %lu stub!\n", iface, vertex_count, normal_count, face_count); return E_NOTIMPL; @@ -1704,7 +1704,7 @@ static HRESULT WINAPI d3drm_mesh_builder3_SetColor(IDirect3DRMMeshBuilder3 *ifac { struct d3drm_mesh_builder *mesh_builder = impl_from_IDirect3DRMMeshBuilder3(iface); - TRACE("iface %p, color 0x%08x.\n", iface, color); + TRACE("iface %p, color 0x%08lx.\n", iface, color); mesh_builder->color = color; @@ -1754,7 +1754,7 @@ static HRESULT WINAPI d3drm_mesh_builder3_SetTextureTopology(IDirect3DRMMeshBuil static HRESULT WINAPI d3drm_mesh_builder3_SetQuality(IDirect3DRMMeshBuilder3 *iface, D3DRMRENDERQUALITY quality) { - FIXME("iface %p, quality %#x stub!\n", iface, quality); + FIXME("iface %p, quality %#lx stub!\n", iface, quality); return E_NOTIMPL; } @@ -1770,7 +1770,7 @@ static HRESULT WINAPI d3drm_mesh_builder3_SetPerspective(IDirect3DRMMeshBuilder3 static HRESULT WINAPI d3drm_mesh_builder3_SetVertex(IDirect3DRMMeshBuilder3 *iface, DWORD index, D3DVALUE x, D3DVALUE y, D3DVALUE z) { - FIXME("iface %p, index %u, x %.8e, y %.8e, z %.8e stub!\n", iface, index, x, y, z); + FIXME("iface %p, index %lu, x %.8e, y %.8e, z %.8e stub!\n", iface, index, x, y, z); return E_NOTIMPL; } @@ -1778,7 +1778,7 @@ static HRESULT WINAPI d3drm_mesh_builder3_SetVertex(IDirect3DRMMeshBuilder3 *ifa static HRESULT WINAPI d3drm_mesh_builder3_SetNormal(IDirect3DRMMeshBuilder3 *iface, DWORD index, D3DVALUE x, D3DVALUE y, D3DVALUE z) { - FIXME("iface %p, index %u, x %.8e, y %.8e, z %.8e stub!\n", iface, index, x, y, z); + FIXME("iface %p, index %lu, x %.8e, y %.8e, z %.8e stub!\n", iface, index, x, y, z); return E_NOTIMPL; } @@ -1788,7 +1788,7 @@ static HRESULT WINAPI d3drm_mesh_builder3_SetTextureCoordinates(IDirect3DRMMeshB { struct d3drm_mesh_builder *mesh_builder = impl_from_IDirect3DRMMeshBuilder3(iface); - TRACE("iface %p, index %u, u %.8e, v %.8e.\n", iface, index, u, v); + TRACE("iface %p, index %lu, u %.8e, v %.8e.\n", iface, index, u, v); if (index >= mesh_builder->nb_coords2d) return D3DRMERR_BADVALUE; @@ -1802,7 +1802,7 @@ static HRESULT WINAPI d3drm_mesh_builder3_SetTextureCoordinates(IDirect3DRMMeshB static HRESULT WINAPI d3drm_mesh_builder3_SetVertexColor(IDirect3DRMMeshBuilder3 *iface, DWORD index, D3DCOLOR color) { - FIXME("iface %p, index %u, color 0x%08x stub!\n", iface, index, color); + FIXME("iface %p, index %lu, color 0x%08lx stub!\n", iface, index, color); return E_NOTIMPL; } @@ -1810,7 +1810,7 @@ static HRESULT WINAPI d3drm_mesh_builder3_SetVertexColor(IDirect3DRMMeshBuilder3 static HRESULT WINAPI d3drm_mesh_builder3_SetVertexColorRGB(IDirect3DRMMeshBuilder3 *iface, DWORD index, D3DVALUE red, D3DVALUE green, D3DVALUE blue) { - FIXME("iface %p, index %u, red %.8e, green %.8e, blue %.8e stub!\n", + FIXME("iface %p, index %lu, red %.8e, green %.8e, blue %.8e stub!\n", iface, index, red, green, blue); return E_NOTIMPL; @@ -1840,7 +1840,7 @@ static HRESULT WINAPI d3drm_mesh_builder3_GetTextureCoordinates(IDirect3DRMMeshB { struct d3drm_mesh_builder *mesh_builder = impl_from_IDirect3DRMMeshBuilder3(iface); - TRACE("iface %p, index %u, u %p, v %p.\n", iface, index, u, v); + TRACE("iface %p, index %lu, u %p, v %p.\n", iface, index, u, v); if (index >= mesh_builder->nb_coords2d) return D3DRMERR_BADVALUE; @@ -1937,7 +1937,7 @@ static int WINAPI d3drm_mesh_builder3_GetVertexCount(IDirect3DRMMeshBuilder3 *if static D3DCOLOR WINAPI d3drm_mesh_builder3_GetVertexColor(IDirect3DRMMeshBuilder3 *iface, DWORD index) { - FIXME("iface %p, index %u stub!\n", iface, index); + FIXME("iface %p, index %lu stub!\n", iface, index); return 0; } @@ -2077,7 +2077,7 @@ static HRESULT WINAPI d3drm_mesh_builder3_CreateMesh(IDirect3DRMMeshBuilder3 *if static HRESULT WINAPI d3drm_mesh_builder3_GetFace(IDirect3DRMMeshBuilder3 *iface, DWORD index, IDirect3DRMFace2 **face) { - FIXME("iface %p, index %u, face %p stub!\n", iface, index, face); + FIXME("iface %p, index %lu, face %p stub!\n", iface, index, face); return E_NOTIMPL; } @@ -2085,7 +2085,7 @@ static HRESULT WINAPI d3drm_mesh_builder3_GetFace(IDirect3DRMMeshBuilder3 *iface static HRESULT WINAPI d3drm_mesh_builder3_GetVertex(IDirect3DRMMeshBuilder3 *iface, DWORD index, D3DVECTOR *vector) { - FIXME("iface %p, index %u, vector %p stub!\n", iface, index, vector); + FIXME("iface %p, index %lu, vector %p stub!\n", iface, index, vector); return E_NOTIMPL; } @@ -2093,7 +2093,7 @@ static HRESULT WINAPI d3drm_mesh_builder3_GetVertex(IDirect3DRMMeshBuilder3 *ifa static HRESULT WINAPI d3drm_mesh_builder3_GetNormal(IDirect3DRMMeshBuilder3 *iface, DWORD index, D3DVECTOR *vector) { - FIXME("iface %p, index %u, vector %p stub!\n", iface, index, vector); + FIXME("iface %p, index %lu, vector %p stub!\n", iface, index, vector); return E_NOTIMPL; } @@ -2101,7 +2101,7 @@ static HRESULT WINAPI d3drm_mesh_builder3_GetNormal(IDirect3DRMMeshBuilder3 *ifa static HRESULT WINAPI d3drm_mesh_builder3_DeleteVertices(IDirect3DRMMeshBuilder3 *iface, DWORD start_idx, DWORD count) { - FIXME("iface %p, start_idx %u, count %u stub!\n", iface, start_idx, count); + FIXME("iface %p, start_idx %lu, count %lu stub!\n", iface, start_idx, count); return E_NOTIMPL; } @@ -2109,7 +2109,7 @@ static HRESULT WINAPI d3drm_mesh_builder3_DeleteVertices(IDirect3DRMMeshBuilder3 static HRESULT WINAPI d3drm_mesh_builder3_DeleteNormals(IDirect3DRMMeshBuilder3 *iface, DWORD start_idx, DWORD count) { - FIXME("iface %p, start_idx %u, count %u stub!\n", iface, start_idx, count); + FIXME("iface %p, start_idx %lu, count %lu stub!\n", iface, start_idx, count); return E_NOTIMPL; } @@ -2123,14 +2123,14 @@ static HRESULT WINAPI d3drm_mesh_builder3_DeleteFace(IDirect3DRMMeshBuilder3 *if static HRESULT WINAPI d3drm_mesh_builder3_Empty(IDirect3DRMMeshBuilder3 *iface, DWORD flags) { - FIXME("iface %p, flags %#x stub!\n", iface, flags); + FIXME("iface %p, flags %#lx stub!\n", iface, flags); return E_NOTIMPL; } static HRESULT WINAPI d3drm_mesh_builder3_Optimize(IDirect3DRMMeshBuilder3 *iface, DWORD flags) { - FIXME("iface %p, flags %#x stub!\n", iface, flags); + FIXME("iface %p, flags %#lx stub!\n", iface, flags); return E_NOTIMPL; } @@ -2138,7 +2138,7 @@ static HRESULT WINAPI d3drm_mesh_builder3_Optimize(IDirect3DRMMeshBuilder3 *ifac static HRESULT WINAPI d3drm_mesh_builder3_AddFacesIndexed(IDirect3DRMMeshBuilder3 *iface, DWORD flags, DWORD *indices, DWORD *start_idx, DWORD *count) { - FIXME("iface %p, flags %#x, indices %p, start_idx %p, count %p stub!\n", + FIXME("iface %p, flags %#lx, indices %p, start_idx %p, count %p stub!\n", iface, flags, indices, start_idx, count); return E_NOTIMPL; @@ -2154,7 +2154,7 @@ static HRESULT WINAPI d3drm_mesh_builder3_CreateSubMesh(IDirect3DRMMeshBuilder3 static HRESULT WINAPI d3drm_mesh_builder3_GetParentMesh(IDirect3DRMMeshBuilder3 *iface, DWORD flags, IUnknown **parent) { - FIXME("iface %p, flags %#x, parent %p stub!\n", iface, flags, parent); + FIXME("iface %p, flags %#lx, parent %p stub!\n", iface, flags, parent); return E_NOTIMPL; } @@ -2176,7 +2176,7 @@ static HRESULT WINAPI d3drm_mesh_builder3_DeleteSubMesh(IDirect3DRMMeshBuilder3 static HRESULT WINAPI d3drm_mesh_builder3_Enable(IDirect3DRMMeshBuilder3 *iface, DWORD index) { - FIXME("iface %p, index %u stub!\n", iface, index); + FIXME("iface %p, index %lu stub!\n", iface, index); return E_NOTIMPL; } @@ -2191,7 +2191,7 @@ static HRESULT WINAPI d3drm_mesh_builder3_GetEnable(IDirect3DRMMeshBuilder3 *ifa static HRESULT WINAPI d3drm_mesh_builder3_AddTriangles(IDirect3DRMMeshBuilder3 *iface, DWORD flags, DWORD format, DWORD vertex_count, void *data) { - FIXME("iface %p, flags %#x, format %#x, vertex_count %u, data %p stub!\n", + FIXME("iface %p, flags %#lx, format %#lx, vertex_count %lu, data %p stub!\n", iface, flags, format, vertex_count, data); return E_NOTIMPL; @@ -2200,7 +2200,7 @@ static HRESULT WINAPI d3drm_mesh_builder3_AddTriangles(IDirect3DRMMeshBuilder3 * static HRESULT WINAPI d3drm_mesh_builder3_SetVertices(IDirect3DRMMeshBuilder3 *iface, DWORD start_idx, DWORD count, D3DVECTOR *vector) { - FIXME("iface %p, start_idx %u, count %u, vector %p stub!\n", iface, start_idx, count, vector); + FIXME("iface %p, start_idx %lu, count %lu, vector %p stub!\n", iface, start_idx, count, vector); return E_NOTIMPL; } @@ -2211,7 +2211,7 @@ static HRESULT WINAPI d3drm_mesh_builder3_GetVertices(IDirect3DRMMeshBuilder3 *i struct d3drm_mesh_builder *mesh_builder = impl_from_IDirect3DRMMeshBuilder3(iface); DWORD count = mesh_builder->nb_vertices - start_idx; - TRACE("iface %p, start_idx %u, vertex_count %p, vertices %p.\n", + TRACE("iface %p, start_idx %lu, vertex_count %p, vertices %p.\n", iface, start_idx, vertex_count, vertices); if (vertex_count) @@ -2225,7 +2225,7 @@ static HRESULT WINAPI d3drm_mesh_builder3_GetVertices(IDirect3DRMMeshBuilder3 *i static HRESULT WINAPI d3drm_mesh_builder3_SetNormals(IDirect3DRMMeshBuilder3 *iface, DWORD start_idx, DWORD count, D3DVECTOR *vector) { - FIXME("iface %p, start_idx %u, count %u, vector %p stub!\n", + FIXME("iface %p, start_idx %lu, count %lu, vector %p stub!\n", iface, start_idx, count, vector); return E_NOTIMPL; @@ -2237,7 +2237,7 @@ static HRESULT WINAPI d3drm_mesh_builder3_GetNormals(IDirect3DRMMeshBuilder3 *if struct d3drm_mesh_builder *mesh_builder = impl_from_IDirect3DRMMeshBuilder3(iface); DWORD count = mesh_builder->nb_normals - start_idx; - TRACE("iface %p, start_idx %u, normal_count %p, normals %p.\n", + TRACE("iface %p, start_idx %lu, normal_count %p, normals %p.\n", iface, start_idx, normal_count, normals); if (normal_count) @@ -2379,7 +2379,7 @@ static ULONG WINAPI d3drm_mesh_AddRef(IDirect3DRMMesh *iface) struct d3drm_mesh *mesh = impl_from_IDirect3DRMMesh(iface); ULONG refcount = InterlockedIncrement(&mesh->ref); - TRACE("%p increasing refcount to %u.\n", iface, refcount); + TRACE("%p increasing refcount to %lu.\n", iface, refcount); return refcount; } @@ -2389,7 +2389,7 @@ static ULONG WINAPI d3drm_mesh_Release(IDirect3DRMMesh *iface) struct d3drm_mesh *mesh = impl_from_IDirect3DRMMesh(iface); ULONG refcount = InterlockedDecrement(&mesh->ref); - TRACE("%p decreasing refcount to %u.\n", iface, refcount); + TRACE("%p decreasing refcount to %lu.\n", iface, refcount); if (!refcount) { @@ -2445,7 +2445,7 @@ static HRESULT WINAPI d3drm_mesh_SetAppData(IDirect3DRMMesh *iface, DWORD data) { struct d3drm_mesh *mesh = impl_from_IDirect3DRMMesh(iface); - TRACE("iface %p, data %#x.\n", iface, data); + TRACE("iface %p, data %#lx.\n", iface, data); mesh->obj.appdata = data; @@ -2573,7 +2573,7 @@ static HRESULT WINAPI d3drm_mesh_SetVertices(IDirect3DRMMesh *iface, D3DRMGROUPI { struct d3drm_mesh *mesh = impl_from_IDirect3DRMMesh(iface); - TRACE("iface %p, group_id %#x, start_idx %u, count %u, values %p.\n", + TRACE("iface %p, group_id %#lx, start_idx %u, count %u, values %p.\n", iface, group_id, start_idx, count, values); if (group_id >= mesh->nb_groups) @@ -2594,7 +2594,7 @@ static HRESULT WINAPI d3drm_mesh_SetGroupColor(IDirect3DRMMesh *iface, D3DRMGROU { struct d3drm_mesh *mesh = impl_from_IDirect3DRMMesh(iface); - TRACE("iface %p, id %#x, color 0x%08x.\n", iface, id, color); + TRACE("iface %p, id %#lx, color 0x%08lx.\n", iface, id, color); if (id >= mesh->nb_groups) return D3DRMERR_BADVALUE; @@ -2609,7 +2609,7 @@ static HRESULT WINAPI d3drm_mesh_SetGroupColorRGB(IDirect3DRMMesh *iface, { struct d3drm_mesh *mesh = impl_from_IDirect3DRMMesh(iface); - TRACE("iface %p, id %#x, red %.8e, green %.8e, blue %.8e.\n", iface, id, red, green, blue); + TRACE("iface %p, id %#lx, red %.8e, green %.8e, blue %.8e.\n", iface, id, red, green, blue); if (id >= mesh->nb_groups) return D3DRMERR_BADVALUE; @@ -2621,14 +2621,14 @@ static HRESULT WINAPI d3drm_mesh_SetGroupColorRGB(IDirect3DRMMesh *iface, static HRESULT WINAPI d3drm_mesh_SetGroupMapping(IDirect3DRMMesh *iface, D3DRMGROUPINDEX id, D3DRMMAPPING value) { - FIXME("iface %p, id %#x, value %#x stub!\n", iface, id, value); + FIXME("iface %p, id %#lx, value %#lx stub!\n", iface, id, value); return E_NOTIMPL; } static HRESULT WINAPI d3drm_mesh_SetGroupQuality(IDirect3DRMMesh *iface, D3DRMGROUPINDEX id, D3DRMRENDERQUALITY value) { - FIXME("iface %p, id %#x, value %#x stub!\n", iface, id, value); + FIXME("iface %p, id %#lx, value %#lx stub!\n", iface, id, value); return E_NOTIMPL; } @@ -2638,7 +2638,7 @@ static HRESULT WINAPI d3drm_mesh_SetGroupMaterial(IDirect3DRMMesh *iface, { struct d3drm_mesh *mesh = impl_from_IDirect3DRMMesh(iface); - TRACE("iface %p, id %#x, material %p.\n", iface, id, material); + TRACE("iface %p, id %#lx, material %p.\n", iface, id, material); if (id >= mesh->nb_groups) return D3DRMERR_BADVALUE; @@ -2659,7 +2659,7 @@ static HRESULT WINAPI d3drm_mesh_SetGroupTexture(IDirect3DRMMesh *iface, { struct d3drm_mesh *mesh = impl_from_IDirect3DRMMesh(iface); - TRACE("iface %p, id %#x, texture %p.\n", iface, id, texture); + TRACE("iface %p, id %#lx, texture %p.\n", iface, id, texture); if (id >= mesh->nb_groups) return D3DRMERR_BADVALUE; @@ -2690,7 +2690,7 @@ static HRESULT WINAPI d3drm_mesh_GetGroup(IDirect3DRMMesh *iface, D3DRMGROUPINDE { struct d3drm_mesh *mesh = impl_from_IDirect3DRMMesh(iface); - TRACE("iface %p, id %#x, vertex_count %p, face_count %p, vertex_per_face %p, face_data_size %p, face_data %p.\n", + TRACE("iface %p, id %#lx, vertex_count %p, face_count %p, vertex_per_face %p, face_data_size %p, face_data %p.\n", iface, id, vertex_count, face_count, vertex_per_face, face_data_size,face_data); if (id >= mesh->nb_groups) @@ -2715,7 +2715,7 @@ static HRESULT WINAPI d3drm_mesh_GetVertices(IDirect3DRMMesh *iface, { struct d3drm_mesh *mesh = impl_from_IDirect3DRMMesh(iface); - TRACE("iface %p, group_id %#x, start_idx %u, count %u, vertices %p.\n", + TRACE("iface %p, group_id %#lx, start_idx %lu, count %lu, vertices %p.\n", iface, group_id, start_idx, count, vertices); if (group_id >= mesh->nb_groups) @@ -2736,20 +2736,20 @@ static D3DCOLOR WINAPI d3drm_mesh_GetGroupColor(IDirect3DRMMesh *iface, D3DRMGRO { struct d3drm_mesh *mesh = impl_from_IDirect3DRMMesh(iface); - TRACE("iface %p, id %#x.\n", iface, id); + TRACE("iface %p, id %#lx.\n", iface, id); return mesh->groups[id].color; } static D3DRMMAPPING WINAPI d3drm_mesh_GetGroupMapping(IDirect3DRMMesh *iface, D3DRMGROUPINDEX id) { - FIXME("iface %p, id %#x stub!\n", iface, id); + FIXME("iface %p, id %#lx stub!\n", iface, id); return 0; } static D3DRMRENDERQUALITY WINAPI d3drm_mesh_GetGroupQuality(IDirect3DRMMesh *iface, D3DRMGROUPINDEX id) { - FIXME("iface %p, id %#x stub!\n", iface, id); + FIXME("iface %p, id %#lx stub!\n", iface, id); return 0; } @@ -2759,7 +2759,7 @@ static HRESULT WINAPI d3drm_mesh_GetGroupMaterial(IDirect3DRMMesh *iface, { struct d3drm_mesh *mesh = impl_from_IDirect3DRMMesh(iface); - TRACE("iface %p, id %#x, material %p.\n", iface, id, material); + TRACE("iface %p, id %#lx, material %p.\n", iface, id, material); if (id >= mesh->nb_groups) return D3DRMERR_BADVALUE; @@ -2780,7 +2780,7 @@ static HRESULT WINAPI d3drm_mesh_GetGroupTexture(IDirect3DRMMesh *iface, { struct d3drm_mesh *mesh = impl_from_IDirect3DRMMesh(iface); - TRACE("iface %p, id %#x, texture %p.\n", iface, id, texture); + TRACE("iface %p, id %#lx, texture %p.\n", iface, id, texture); if (id >= mesh->nb_groups) return D3DRMERR_BADVALUE; @@ -2876,7 +2876,7 @@ static ULONG WINAPI d3drm_wrap_AddRef(IDirect3DRMWrap *iface) struct d3drm_wrap *wrap = impl_from_IDirect3DRMWrap(iface); ULONG refcount = InterlockedIncrement(&wrap->ref); - TRACE("%p increasing refcount to %u.\n", iface, refcount); + TRACE("%p increasing refcount to %lu.\n", iface, refcount); return refcount; } @@ -2886,7 +2886,7 @@ static ULONG WINAPI d3drm_wrap_Release(IDirect3DRMWrap *iface) struct d3drm_wrap *wrap = impl_from_IDirect3DRMWrap(iface); ULONG refcount = InterlockedDecrement(&wrap->ref); - TRACE("%p decreasing refcount to %u.\n", iface, refcount); + TRACE("%p decreasing refcount to %lu.\n", iface, refcount); if (!refcount) { @@ -2929,7 +2929,7 @@ static HRESULT WINAPI d3drm_wrap_SetAppData(IDirect3DRMWrap *iface, DWORD data) { struct d3drm_wrap *wrap = impl_from_IDirect3DRMWrap(iface); - TRACE("iface %p, data %#x.\n", iface, data); + TRACE("iface %p, data %#lx.\n", iface, data); wrap->obj.appdata = data; diff --git a/dlls/d3drm/texture.c b/dlls/d3drm/texture.c index 07f0896a30b..c679100c6b7 100644 --- a/dlls/d3drm/texture.c +++ b/dlls/d3drm/texture.c @@ -409,7 +409,7 @@ static HRESULT WINAPI d3drm_texture1_SetAppData(IDirect3DRMTexture *iface, DWORD { struct d3drm_texture *texture = impl_from_IDirect3DRMTexture(iface); - TRACE("iface %p, data %#x.\n", iface, data); + TRACE("iface %p, data %#lx.\n", iface, data); return IDirect3DRMTexture3_SetAppData(&texture->IDirect3DRMTexture3_iface, data); } @@ -492,7 +492,7 @@ static HRESULT WINAPI d3drm_texture1_SetColors(IDirect3DRMTexture *iface, DWORD { struct d3drm_texture *texture = impl_from_IDirect3DRMTexture(iface); - TRACE("iface %p, max_colors %u.\n", iface, max_colors); + TRACE("iface %p, max_colors %lu.\n", iface, max_colors); return IDirect3DRMTexture3_SetColors(&texture->IDirect3DRMTexture3_iface, max_colors); } @@ -501,7 +501,7 @@ static HRESULT WINAPI d3drm_texture1_SetShades(IDirect3DRMTexture *iface, DWORD { struct d3drm_texture *texture = impl_from_IDirect3DRMTexture(iface); - TRACE("iface %p, max_shades %u.\n", iface, max_shades); + TRACE("iface %p, max_shades %lu.\n", iface, max_shades); return IDirect3DRMTexture3_SetShades(&texture->IDirect3DRMTexture3_iface, max_shades); } @@ -519,7 +519,7 @@ static HRESULT WINAPI d3drm_texture1_SetDecalOrigin(IDirect3DRMTexture *iface, L { struct d3drm_texture *texture = impl_from_IDirect3DRMTexture(iface); - TRACE("iface %p, x %d, y %d.\n", iface, x, y); + TRACE("iface %p, x %ld, y %ld.\n", iface, x, y); return IDirect3DRMTexture3_SetDecalOrigin(&texture->IDirect3DRMTexture3_iface, x, y); } @@ -528,7 +528,7 @@ static HRESULT WINAPI d3drm_texture1_SetDecalScale(IDirect3DRMTexture *iface, DW { struct d3drm_texture *texture = impl_from_IDirect3DRMTexture(iface); - TRACE("iface %p, scale %u.\n", iface, scale); + TRACE("iface %p, scale %lu.\n", iface, scale); return IDirect3DRMTexture3_SetDecalScale(&texture->IDirect3DRMTexture3_iface, scale); } @@ -546,7 +546,7 @@ static HRESULT WINAPI d3drm_texture1_SetDecalTransparentColor(IDirect3DRMTexture { struct d3drm_texture *texture = impl_from_IDirect3DRMTexture(iface); - TRACE("iface %p, color 0x%08x.\n", iface, color); + TRACE("iface %p, color 0x%08lx.\n", iface, color); return IDirect3DRMTexture3_SetDecalTransparentColor(&texture->IDirect3DRMTexture3_iface, color); } @@ -718,7 +718,7 @@ static HRESULT WINAPI d3drm_texture2_SetAppData(IDirect3DRMTexture2 *iface, DWOR { struct d3drm_texture *texture = impl_from_IDirect3DRMTexture2(iface); - TRACE("iface %p, data %#x.\n", iface, data); + TRACE("iface %p, data %#lx.\n", iface, data); return IDirect3DRMTexture3_SetAppData(&texture->IDirect3DRMTexture3_iface, data); } @@ -796,7 +796,7 @@ static HRESULT WINAPI d3drm_texture2_SetColors(IDirect3DRMTexture2 *iface, DWORD { struct d3drm_texture *texture = impl_from_IDirect3DRMTexture2(iface); - TRACE("iface %p, max_colors %u.\n", iface, max_colors); + TRACE("iface %p, max_colors %lu.\n", iface, max_colors); return IDirect3DRMTexture3_SetColors(&texture->IDirect3DRMTexture3_iface, max_colors); } @@ -805,7 +805,7 @@ static HRESULT WINAPI d3drm_texture2_SetShades(IDirect3DRMTexture2 *iface, DWORD { struct d3drm_texture *texture = impl_from_IDirect3DRMTexture2(iface); - TRACE("iface %p, max_shades %u.\n", iface, max_shades); + TRACE("iface %p, max_shades %lu.\n", iface, max_shades); return IDirect3DRMTexture3_SetShades(&texture->IDirect3DRMTexture3_iface, max_shades); } @@ -823,7 +823,7 @@ static HRESULT WINAPI d3drm_texture2_SetDecalOrigin(IDirect3DRMTexture2 *iface, { struct d3drm_texture *texture = impl_from_IDirect3DRMTexture2(iface); - TRACE("iface %p, x %d, y %d.\n", iface, x, y); + TRACE("iface %p, x %ld, y %ld.\n", iface, x, y); return IDirect3DRMTexture3_SetDecalOrigin(&texture->IDirect3DRMTexture3_iface, x, y); } @@ -832,7 +832,7 @@ static HRESULT WINAPI d3drm_texture2_SetDecalScale(IDirect3DRMTexture2 *iface, D { struct d3drm_texture *texture = impl_from_IDirect3DRMTexture2(iface); - TRACE("iface %p, scale %u.\n", iface, scale); + TRACE("iface %p, scale %lu.\n", iface, scale); return IDirect3DRMTexture3_SetDecalScale(&texture->IDirect3DRMTexture3_iface, scale); } @@ -850,7 +850,7 @@ static HRESULT WINAPI d3drm_texture2_SetDecalTransparentColor(IDirect3DRMTexture { struct d3drm_texture *texture = impl_from_IDirect3DRMTexture2(iface); - TRACE("iface %p, color 0x%08x.\n", iface, color); + TRACE("iface %p, color 0x%08lx.\n", iface, color); return IDirect3DRMTexture3_SetDecalTransparentColor(&texture->IDirect3DRMTexture3_iface, color); } @@ -949,7 +949,7 @@ static HRESULT WINAPI d3drm_texture2_GenerateMIPMap(IDirect3DRMTexture2 *iface, { struct d3drm_texture *texture = impl_from_IDirect3DRMTexture2(iface); - TRACE("iface %p, flags %#x.\n", iface, flags); + TRACE("iface %p, flags %#lx.\n", iface, flags); return IDirect3DRMTexture3_GenerateMIPMap(&texture->IDirect3DRMTexture3_iface, flags); } @@ -1028,7 +1028,7 @@ static ULONG WINAPI d3drm_texture3_AddRef(IDirect3DRMTexture3 *iface) struct d3drm_texture *texture = impl_from_IDirect3DRMTexture3(iface); ULONG refcount = InterlockedIncrement(&texture->obj.ref); - TRACE("%p increasing refcount to %u.\n", iface, refcount); + TRACE("%p increasing refcount to %lu.\n", iface, refcount); return refcount; } @@ -1038,7 +1038,7 @@ static ULONG WINAPI d3drm_texture3_Release(IDirect3DRMTexture3 *iface) struct d3drm_texture *texture = impl_from_IDirect3DRMTexture3(iface); ULONG refcount = InterlockedDecrement(&texture->obj.ref); - TRACE("%p decreasing refcount to %u.\n", iface, refcount); + TRACE("%p decreasing refcount to %lu.\n", iface, refcount); if (!refcount) d3drm_texture_destroy(texture); @@ -1078,7 +1078,7 @@ static HRESULT WINAPI d3drm_texture3_SetAppData(IDirect3DRMTexture3 *iface, DWOR { struct d3drm_texture *texture = impl_from_IDirect3DRMTexture3(iface); - TRACE("iface %p, data %#x.\n", iface, data); + TRACE("iface %p, data %#lx.\n", iface, data); texture->obj.appdata = data; @@ -1166,21 +1166,21 @@ static HRESULT WINAPI d3drm_texture3_InitFromResource(IDirect3DRMTexture3 *iface static HRESULT WINAPI d3drm_texture3_Changed(IDirect3DRMTexture3 *iface, DWORD flags, DWORD rect_count, RECT *rects) { - FIXME("iface %p, flags %#x, rect_count %u, rects %p stub!\n", iface, flags, rect_count, rects); + FIXME("iface %p, flags %#lx, rect_count %lu, rects %p stub!\n", iface, flags, rect_count, rects); return E_NOTIMPL; } static HRESULT WINAPI d3drm_texture3_SetColors(IDirect3DRMTexture3 *iface, DWORD max_colors) { - FIXME("iface %p, max_colors %u stub!\n", iface, max_colors); + FIXME("iface %p, max_colors %lu stub!\n", iface, max_colors); return E_NOTIMPL; } static HRESULT WINAPI d3drm_texture3_SetShades(IDirect3DRMTexture3 *iface, DWORD max_shades) { - FIXME("iface %p, max_shades %u stub!\n", iface, max_shades); + FIXME("iface %p, max_shades %lu stub!\n", iface, max_shades); return E_NOTIMPL; } @@ -1194,14 +1194,14 @@ static HRESULT WINAPI d3drm_texture3_SetDecalSize(IDirect3DRMTexture3 *iface, D3 static HRESULT WINAPI d3drm_texture3_SetDecalOrigin(IDirect3DRMTexture3 *iface, LONG x, LONG y) { - FIXME("iface %p, x %d, y %d stub!\n", iface, x, y); + FIXME("iface %p, x %ld, y %ld stub!\n", iface, x, y); return E_NOTIMPL; } static HRESULT WINAPI d3drm_texture3_SetDecalScale(IDirect3DRMTexture3 *iface, DWORD scale) { - FIXME("iface %p, scale %u stub!\n", iface, scale); + FIXME("iface %p, scale %lu stub!\n", iface, scale); return E_NOTIMPL; } @@ -1215,7 +1215,7 @@ static HRESULT WINAPI d3drm_texture3_SetDecalTransparency(IDirect3DRMTexture3 *i static HRESULT WINAPI d3drm_texture3_SetDecalTransparentColor(IDirect3DRMTexture3 *iface, D3DCOLOR color) { - FIXME("iface %p, color 0x%08x stub!\n", iface, color); + FIXME("iface %p, color 0x%08lx stub!\n", iface, color); return E_NOTIMPL; } @@ -1309,7 +1309,7 @@ static HRESULT WINAPI d3drm_texture3_InitFromResource2(IDirect3DRMTexture3 *ifac static HRESULT WINAPI d3drm_texture3_GenerateMIPMap(IDirect3DRMTexture3 *iface, DWORD flags) { - FIXME("iface %p, flags %#x stub!\n", iface, flags); + FIXME("iface %p, flags %#lx stub!\n", iface, flags); return E_NOTIMPL; } @@ -1319,10 +1319,10 @@ static HRESULT WINAPI d3drm_texture3_GetSurface(IDirect3DRMTexture3 *iface, { struct d3drm_texture *texture = impl_from_IDirect3DRMTexture3(iface); - TRACE("iface %p, flags %#x, surface %p.\n", iface, flags, surface); + TRACE("iface %p, flags %#lx, surface %p.\n", iface, flags, surface); if (flags) - FIXME("unexpected flags %#x.\n", flags); + FIXME("unexpected flags %#lx.\n", flags); if (!surface) return D3DRMERR_BADVALUE; @@ -1338,7 +1338,7 @@ static HRESULT WINAPI d3drm_texture3_GetSurface(IDirect3DRMTexture3 *iface, static HRESULT WINAPI d3drm_texture3_SetCacheOptions(IDirect3DRMTexture3 *iface, LONG importance, DWORD flags) { - FIXME("iface %p, importance %d, flags %#x stub!\n", iface, importance, flags); + FIXME("iface %p, importance %ld, flags %#lx stub!\n", iface, importance, flags); return E_NOTIMPL; } diff --git a/dlls/d3drm/viewport.c b/dlls/d3drm/viewport.c index 8d9c4fde822..36a80c95675 100644 --- a/dlls/d3drm/viewport.c +++ b/dlls/d3drm/viewport.c @@ -117,7 +117,7 @@ static ULONG WINAPI d3drm_viewport2_AddRef(IDirect3DRMViewport2 *iface) struct d3drm_viewport *viewport = impl_from_IDirect3DRMViewport2(iface); ULONG refcount = InterlockedIncrement(&viewport->obj.ref); - TRACE("%p increasing refcount to %u.\n", iface, refcount); + TRACE("%p increasing refcount to %lu.\n", iface, refcount); return refcount; } @@ -136,7 +136,7 @@ static ULONG WINAPI d3drm_viewport2_Release(IDirect3DRMViewport2 *iface) struct d3drm_viewport *viewport = impl_from_IDirect3DRMViewport2(iface); ULONG refcount = InterlockedDecrement(&viewport->obj.ref); - TRACE("%p decreasing refcount to %u.\n", iface, refcount); + TRACE("%p decreasing refcount to %lu.\n", iface, refcount); if (!refcount) d3drm_viewport_destroy(viewport); @@ -213,7 +213,7 @@ static HRESULT WINAPI d3drm_viewport2_SetAppData(IDirect3DRMViewport2 *iface, DW { struct d3drm_viewport *viewport = impl_from_IDirect3DRMViewport2(iface); - TRACE("iface %p, data %#x\n", iface, data); + TRACE("iface %p, data %#lx\n", iface, data); viewport->obj.appdata = data; return S_OK; @@ -223,7 +223,7 @@ static HRESULT WINAPI d3drm_viewport1_SetAppData(IDirect3DRMViewport *iface, DWO { struct d3drm_viewport *viewport = impl_from_IDirect3DRMViewport(iface); - TRACE("iface %p, data %#x\n", iface, data); + TRACE("iface %p, data %#lx\n", iface, data); return d3drm_viewport2_SetAppData(&viewport->IDirect3DRMViewport2_iface, data); } @@ -313,7 +313,7 @@ static HRESULT WINAPI d3drm_viewport2_Init(IDirect3DRMViewport2 *iface, IDirect3 D3DMATERIALHANDLE hmat; HRESULT hr = D3DRM_OK; - TRACE("iface %p, device %p, camera %p, x %u, y %u, width %u, height %u.\n", + TRACE("iface %p, device %p, camera %p, x %lu, y %lu, width %lu, height %lu.\n", iface, device, camera, x, y, width, height); if (!device_obj || !camera @@ -407,7 +407,7 @@ static HRESULT WINAPI d3drm_viewport1_Init(IDirect3DRMViewport *iface, IDirect3D IDirect3DRMDevice3 *device3; HRESULT hr; - TRACE("iface %p, device %p, camera %p, x %u, y %u, width %u, height %u.\n", + TRACE("iface %p, device %p, camera %p, x %lu, y %lu, width %lu, height %lu.\n", iface, device, camera, x, y, width, height); if (!device || !frame) @@ -432,7 +432,7 @@ static HRESULT WINAPI d3drm_viewport2_Clear(IDirect3DRMViewport2 *iface, DWORD f IDirectDrawSurface *ds; DWORD clear_flags = 0; - TRACE("iface %p, flags %#x.\n", iface, flags); + TRACE("iface %p, flags %#lx.\n", iface, flags); clear_rect.u1.x1 = clear_rect.u2.y1 = 0; clear_rect.u3.x2 = viewport->device->width; @@ -661,7 +661,7 @@ static HRESULT WINAPI d3drm_viewport1_InverseTransform(IDirect3DRMViewport *ifac static HRESULT WINAPI d3drm_viewport2_Configure(IDirect3DRMViewport2 *iface, LONG x, LONG y, DWORD width, DWORD height) { - FIXME("iface %p, x %d, y %d, width %u, height %u stub!\n", iface, x, y, width, height); + FIXME("iface %p, x %ld, y %ld, width %lu, height %lu stub!\n", iface, x, y, width, height); return E_NOTIMPL; } @@ -669,7 +669,7 @@ static HRESULT WINAPI d3drm_viewport2_Configure(IDirect3DRMViewport2 *iface, static HRESULT WINAPI d3drm_viewport1_Configure(IDirect3DRMViewport *iface, LONG x, LONG y, DWORD width, DWORD height) { - FIXME("iface %p, x %d, y %d, width %u, height %u stub!\n", iface, x, y, width, height); + FIXME("iface %p, x %ld, y %ld, width %lu, height %lu stub!\n", iface, x, y, width, height); return E_NOTIMPL; } @@ -677,7 +677,7 @@ static HRESULT WINAPI d3drm_viewport1_Configure(IDirect3DRMViewport *iface, static HRESULT WINAPI d3drm_viewport2_ForceUpdate(IDirect3DRMViewport2* iface, DWORD x1, DWORD y1, DWORD x2, DWORD y2) { - FIXME("iface %p, x1 %u, y1 %u, x2 %u, y2 %u stub!\n", iface, x1, y1, x2, y2); + FIXME("iface %p, x1 %lu, y1 %lu, x2 %lu, y2 %lu stub!\n", iface, x1, y1, x2, y2); return E_NOTIMPL; } @@ -685,7 +685,7 @@ static HRESULT WINAPI d3drm_viewport2_ForceUpdate(IDirect3DRMViewport2* iface, static HRESULT WINAPI d3drm_viewport1_ForceUpdate(IDirect3DRMViewport *iface, DWORD x1, DWORD y1, DWORD x2, DWORD y2) { - FIXME("iface %p, x1 %u, y1 %u, x2 %u, y2 %u stub!\n", iface, x1, y1, x2, y2); + FIXME("iface %p, x1 %lu, y1 %lu, x2 %lu, y2 %lu stub!\n", iface, x1, y1, x2, y2); return E_NOTIMPL; } @@ -825,7 +825,7 @@ static HRESULT WINAPI d3drm_viewport1_GetPlane(IDirect3DRMViewport *iface, static HRESULT WINAPI d3drm_viewport2_Pick(IDirect3DRMViewport2 *iface, LONG x, LONG y, IDirect3DRMPickedArray **visuals) { - FIXME("iface %p, x %d, y %d, visuals %p stub!\n", iface, x, y, visuals); + FIXME("iface %p, x %ld, y %ld, visuals %p stub!\n", iface, x, y, visuals); return E_NOTIMPL; } @@ -833,7 +833,7 @@ static HRESULT WINAPI d3drm_viewport2_Pick(IDirect3DRMViewport2 *iface, static HRESULT WINAPI d3drm_viewport1_Pick(IDirect3DRMViewport *iface, LONG x, LONG y, IDirect3DRMPickedArray **visuals) { - FIXME("iface %p, x %d, y %d, visuals %p stub!\n", iface, x, y, visuals); + FIXME("iface %p, x %ld, y %ld, visuals %p stub!\n", iface, x, y, visuals); return E_NOTIMPL; } @@ -1025,7 +1025,7 @@ static HRESULT WINAPI d3drm_viewport1_GetDirect3DViewport(IDirect3DRMViewport *i static HRESULT WINAPI d3drm_viewport2_TransformVectors(IDirect3DRMViewport2 *iface, DWORD vector_count, D3DRMVECTOR4D *dst, D3DVECTOR *src) { - FIXME("iface %p, vector_count %u, dst %p, src %p stub!\n", iface, vector_count, dst, src); + FIXME("iface %p, vector_count %lu, dst %p, src %p stub!\n", iface, vector_count, dst, src); return E_NOTIMPL; } @@ -1033,7 +1033,7 @@ static HRESULT WINAPI d3drm_viewport2_TransformVectors(IDirect3DRMViewport2 *ifa static HRESULT WINAPI d3drm_viewport2_InverseTransformVectors(IDirect3DRMViewport2 *iface, DWORD vector_count, D3DVECTOR *dst, D3DRMVECTOR4D *src) { - FIXME("iface %p, vector_count %u, dst %p, src %p stub!\n", iface, vector_count, dst, src); + FIXME("iface %p, vector_count %lu, dst %p, src %p stub!\n", iface, vector_count, dst, src); return E_NOTIMPL; } -- 2.35.1

2 1

[PATCH vkd3d v2 1/7] vkd3d-shader/hlsl: Lower casts to bool to comparisons.
by Matteo Bruni 07 Apr '22

07 Apr '22

From: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- v2: Rebase on top of 231826. libs/vkd3d-shader/hlsl_codegen.c | 32 +++++++++++++++++++++++++++ libs/vkd3d-shader/hlsl_constant_ops.c | 9 ++------ libs/vkd3d-shader/hlsl_sm4.c | 3 ++- 3 files changed, 36 insertions(+), 8 deletions(-) diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 2b05264c..72c00430 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -750,6 +750,37 @@ static bool lower_division(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, voi return true; } +static bool lower_casts_to_bool(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void *context) +{ + struct hlsl_type *type = instr->data_type, *arg_type; + struct hlsl_ir_constant *zero; + struct hlsl_ir_expr *expr; + + if (instr->type != HLSL_IR_EXPR) + return false; + expr = hlsl_ir_expr(instr); + if (expr->op != HLSL_OP1_CAST) + return false; + arg_type = expr->operands[0].node->data_type; + if (type->type > HLSL_CLASS_VECTOR || arg_type->type > HLSL_CLASS_VECTOR) + return false; + if (type->base_type != HLSL_TYPE_BOOL) + return false; + + /* Narrowing casts should have already been lowered. */ + assert(type->dimx == arg_type->dimx); + + zero = hlsl_new_constant(ctx, arg_type, &instr->loc); + if (!zero) + return false; + list_add_before(&instr->entry, &zero->node.entry); + + expr->op = HLSL_OP2_NEQUAL; + hlsl_src_from_node(&expr->operands[1], &zero->node); + + return true; +} + static bool dce(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void *context) { switch (instr->type) @@ -1655,6 +1686,7 @@ int hlsl_emit_bytecode(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry } while (progress); transform_ir(ctx, lower_narrowing_casts, body, NULL); + transform_ir(ctx, lower_casts_to_bool, body, NULL); do { progress = transform_ir(ctx, hlsl_fold_constants, body, NULL); diff --git a/libs/vkd3d-shader/hlsl_constant_ops.c b/libs/vkd3d-shader/hlsl_constant_ops.c index e282dbd4..5cac4bde 100644 --- a/libs/vkd3d-shader/hlsl_constant_ops.c +++ b/libs/vkd3d-shader/hlsl_constant_ops.c @@ -27,7 +27,6 @@ static bool fold_cast(struct hlsl_ctx *ctx, struct hlsl_ir_constant *dst, struct int32_t i; double d; float f; - bool b; if (dst->node.data_type->dimx != src->node.data_type->dimx || dst->node.data_type->dimy != src->node.data_type->dimy) @@ -47,7 +46,6 @@ static bool fold_cast(struct hlsl_ctx *ctx, struct hlsl_ir_constant *dst, struct i = src->value[k].f; f = src->value[k].f; d = src->value[k].f; - b = !!src->value[k].f; break; case HLSL_TYPE_DOUBLE: @@ -55,7 +53,6 @@ static bool fold_cast(struct hlsl_ctx *ctx, struct hlsl_ir_constant *dst, struct i = src->value[k].d; f = src->value[k].d; d = src->value[k].d; - b = !!src->value[k].d; break; case HLSL_TYPE_INT: @@ -63,7 +60,6 @@ static bool fold_cast(struct hlsl_ctx *ctx, struct hlsl_ir_constant *dst, struct i = src->value[k].i; f = src->value[k].i; d = src->value[k].i; - b = !!src->value[k].i; break; case HLSL_TYPE_UINT: @@ -71,7 +67,6 @@ static bool fold_cast(struct hlsl_ctx *ctx, struct hlsl_ir_constant *dst, struct i = src->value[k].u; f = src->value[k].u; d = src->value[k].u; - b = !!src->value[k].u; break; case HLSL_TYPE_BOOL: @@ -79,7 +74,6 @@ static bool fold_cast(struct hlsl_ctx *ctx, struct hlsl_ir_constant *dst, struct i = !!src->value[k].u; f = !!src->value[k].u; d = !!src->value[k].u; - b = !!src->value[k].u; break; default: @@ -107,7 +101,8 @@ static bool fold_cast(struct hlsl_ctx *ctx, struct hlsl_ir_constant *dst, struct break; case HLSL_TYPE_BOOL: - dst->value[k].u = b ? ~0u : 0; + /* Casts to bool should have already been lowered. */ + assert(0); break; default: diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index 400c3a62..9de8654c 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -1542,7 +1542,8 @@ static void write_sm4_cast(struct hlsl_ctx *ctx, break; case HLSL_TYPE_BOOL: - hlsl_fixme(ctx, &expr->node.loc, "SM4 cast to bool."); + /* Casts to bool should have already been lowered. */ + assert(0); break; default: -- 2.34.1

2 13

[PATCH vkd3d 1/3] vkd3d-shader/hlsl: Drop extra '\n' from hlsl_fixme() messages.
by Matteo Bruni 07 Apr '22

07 Apr '22

Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- libs/vkd3d-shader/hlsl_sm1.c | 2 +- libs/vkd3d-shader/hlsl_sm4.c | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/libs/vkd3d-shader/hlsl_sm1.c b/libs/vkd3d-shader/hlsl_sm1.c index f661dbc2..0cdd3917 100644 --- a/libs/vkd3d-shader/hlsl_sm1.c +++ b/libs/vkd3d-shader/hlsl_sm1.c @@ -790,7 +790,7 @@ static void write_sm1_instructions(struct hlsl_ctx *ctx, struct vkd3d_bytecode_b } else if (instr->data_type->type == HLSL_CLASS_OBJECT) { - hlsl_fixme(ctx, &instr->loc, "Object copy.\n"); + hlsl_fixme(ctx, &instr->loc, "Object copy."); break; } diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index 872118c1..afc4d26b 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -1519,11 +1519,11 @@ static void write_sm4_cast(struct hlsl_ctx *ctx, break; case HLSL_TYPE_BOOL: - hlsl_fixme(ctx, &expr->node.loc, "SM4 cast from bool to uint.\n"); + hlsl_fixme(ctx, &expr->node.loc, "SM4 cast from bool to uint."); break; case HLSL_TYPE_DOUBLE: - hlsl_fixme(ctx, &expr->node.loc, "SM4 cast from double to uint.\n"); + hlsl_fixme(ctx, &expr->node.loc, "SM4 cast from double to uint."); break; default: @@ -1532,15 +1532,15 @@ static void write_sm4_cast(struct hlsl_ctx *ctx, break; case HLSL_TYPE_HALF: - hlsl_fixme(ctx, &expr->node.loc, "SM4 cast to half.\n"); + hlsl_fixme(ctx, &expr->node.loc, "SM4 cast to half."); break; case HLSL_TYPE_DOUBLE: - hlsl_fixme(ctx, &expr->node.loc, "SM4 cast to double.\n"); + hlsl_fixme(ctx, &expr->node.loc, "SM4 cast to double."); break; case HLSL_TYPE_BOOL: - hlsl_fixme(ctx, &expr->node.loc, "SM4 cast to bool.\n"); + hlsl_fixme(ctx, &expr->node.loc, "SM4 cast to bool."); break; default: @@ -2019,7 +2019,7 @@ static void write_sm4_store(struct hlsl_ctx *ctx, if (store->lhs.var->data_type->type == HLSL_CLASS_MATRIX) { - hlsl_fixme(ctx, &store->node.loc, "Store to a matrix variable.\n"); + hlsl_fixme(ctx, &store->node.loc, "Store to a matrix variable."); return; } @@ -2072,7 +2072,7 @@ static void write_sm4_block(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer * } else if (instr->data_type->type == HLSL_CLASS_OBJECT) { - hlsl_fixme(ctx, &instr->loc, "Object copy.\n"); + hlsl_fixme(ctx, &instr->loc, "Object copy."); break; } -- 2.34.1

2 5

[PATCH] winevulkan: Update to VK spec version 1.3.211.
by Georg Lehmann 07 Apr '22

07 Apr '22

Signed-off-by: Georg Lehmann <dadschoorse(a)gmail.com> --- dlls/winevulkan/make_vulkan | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 505aaa81c60..c26951d06b9 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -64,7 +64,7 @@ from enum import Enum LOGGER = logging.Logger("vulkan") LOGGER.addHandler(logging.StreamHandler()) -VK_XML_VERSION = "1.3.210" +VK_XML_VERSION = "1.3.211" WINE_VK_VERSION = (1, 3) # Filenames to create. -- 2.35.1

1 0

[PATCH v2 2/2] ncrypt/tests: Add NCryptIsAlgSupported tests.
by Hans Leidekker 07 Apr '22

07 Apr '22

From: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> v2: Use one provider handle for all algorithms. Signed-off-by: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/ncrypt/tests/ncrypt.c | 75 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 75 insertions(+) diff --git a/dlls/ncrypt/tests/ncrypt.c b/dlls/ncrypt/tests/ncrypt.c index 7fb8b2cb4c5..5808a3bb30a 100644 --- a/dlls/ncrypt/tests/ncrypt.c +++ b/dlls/ncrypt/tests/ncrypt.c @@ -465,6 +465,80 @@ static void test_verify_signature(void) NCryptFreeObject(prov); } +static void test_NCryptIsAlgSupported(void) +{ + NCRYPT_PROV_HANDLE prov; + SECURITY_STATUS ret; + + NCryptOpenStorageProvider(&prov, NULL, 0); + ret = NCryptIsAlgSupported(0, BCRYPT_RSA_ALGORITHM, 0); + ok(ret == NTE_INVALID_HANDLE, "expected NTE_INVALID_HANDLE, got %#lx\n", ret); + + ret = NCryptIsAlgSupported(prov, NULL, 0); + ok(ret == HRESULT_FROM_WIN32(RPC_X_NULL_REF_POINTER) || broken(ret == NTE_FAIL) /* win7 */, "got %#lx\n", ret); + + ret = NCryptIsAlgSupported(prov, BCRYPT_RSA_ALGORITHM, 20); + ok(ret == NTE_BAD_FLAGS, "expected NTE_BAD_FLAGS, got %#lx\n", ret); + + ret = NCryptIsAlgSupported(prov, BCRYPT_RSA_ALGORITHM, 0); + ok(ret == ERROR_SUCCESS, "expected BCRYPT_RSA_ALGORITHM to be supported, got %#lx\n", ret); + + ret = NCryptIsAlgSupported(prov, BCRYPT_RSA_ALGORITHM, NCRYPT_SILENT_FLAG); + ok(ret == ERROR_SUCCESS, "expected BCRYPT_RSA_ALGORITHM to be supported, got %#lx\n", ret); + + ret = NCryptIsAlgSupported(prov, BCRYPT_3DES_ALGORITHM, 0); + ok(ret == ERROR_SUCCESS || broken(ret == NTE_NOT_SUPPORTED) /* win7 */, + "expected BCRYPT_3DES_ALGORITHM to be supported, got %#lx\n", ret); + + ret = NCryptIsAlgSupported(prov, BCRYPT_AES_ALGORITHM, 0); + ok(ret == ERROR_SUCCESS || broken(ret == NTE_NOT_SUPPORTED) /* win7 */, + "expected BCRYPT_AES_ALGORITHM to be supported, got %#lx\n", ret); + + ret = NCryptIsAlgSupported(prov, BCRYPT_ECDH_P256_ALGORITHM, 0); + ok(ret == ERROR_SUCCESS, "expected BCRYPT_ECDH_P256_ALGORITHM to be supported, got %#lx\n", ret); + + ret = NCryptIsAlgSupported(prov, BCRYPT_ECDSA_P256_ALGORITHM, 0); + ok(ret == ERROR_SUCCESS, "expected BCRYPT_ECDSA_P256_ALGORITHM to be supported, got %#lx\n", ret); + + ret = NCryptIsAlgSupported(prov, BCRYPT_ECDSA_P384_ALGORITHM, 0); + ok(ret == ERROR_SUCCESS, "expected BCRYPT_ECDSA_P384_ALGORITHM to be supported, got %#lx\n", ret); + + ret = NCryptIsAlgSupported(prov, BCRYPT_DSA_ALGORITHM, 0); + ok(ret == ERROR_SUCCESS, "expected BCRYPT_DSA_ALGORITHM to be supported, got %#lx\n", ret); + + /* Not supported */ + ret = NCryptIsAlgSupported(prov, BCRYPT_SHA256_ALGORITHM, 0); + ok(ret == NTE_NOT_SUPPORTED, "expected BCRYPT_SHA256_ALGORITHM to not be supported, got %#lx\n", ret); + + ret = NCryptIsAlgSupported(prov, BCRYPT_SHA384_ALGORITHM, 0); + ok(ret == NTE_NOT_SUPPORTED, "expected BCRYPT_SHA384_ALGORITHM to not be supported, got %#lx\n", ret); + + ret = NCryptIsAlgSupported(prov, BCRYPT_SHA512_ALGORITHM, 0); + ok(ret == NTE_NOT_SUPPORTED, "expected BCRYPT_SHA512_ALGORITHM to not be supported, got %#lx\n", ret); + + ret = NCryptIsAlgSupported(prov, BCRYPT_SHA1_ALGORITHM, 0); + ok(ret == NTE_NOT_SUPPORTED, "expected BCRYPT_SHA1_ALGORITHM to not be supported, got %#lx\n", ret); + + ret = NCryptIsAlgSupported(prov, BCRYPT_MD5_ALGORITHM, 0); + ok(ret == NTE_NOT_SUPPORTED, "expected BCRYPT_MD5_ALGORITHM to not be supported, got %#lx\n", ret); + + ret = NCryptIsAlgSupported(prov, BCRYPT_MD4_ALGORITHM, 0); + ok(ret == NTE_NOT_SUPPORTED, "expected BCRYPT_MD4_ALGORITHM to not be supported, got %#lx\n", ret); + + ret = NCryptIsAlgSupported(prov, BCRYPT_MD2_ALGORITHM, 0); + ok(ret == NTE_NOT_SUPPORTED, "expected BCRYPT_MD2_ALGORITHM to not be supported, got %#lx\n", ret); + + ret = NCryptIsAlgSupported(prov, BCRYPT_RSA_SIGN_ALGORITHM, 0); + ok(ret == NTE_NOT_SUPPORTED, "expected BCRYPT_RSA_SIGN_ALGORITHM to not be supported, got %#lx\n", ret); + + ret = NCryptIsAlgSupported(prov, BCRYPT_RSA_SIGN_ALGORITHM, 20); + ok(ret == NTE_BAD_FLAGS, "expected NTE_BAD_FLAGS, got %#lx\n", ret); + + ret = NCryptIsAlgSupported(prov, BCRYPT_RNG_ALGORITHM, 0); + ok(ret == NTE_NOT_SUPPORTED, "expected BCRYPT_RNG_ALGORITHM to not be supported, got %#lx\n", ret); + NCryptFreeObject(prov); +} + START_TEST(ncrypt) { test_key_import_rsa(); @@ -474,4 +548,5 @@ START_TEST(ncrypt) test_create_persisted_key(); test_finalize_key(); test_verify_signature(); + test_NCryptIsAlgSupported(); } -- 2.30.2

1 0

[PATCH v2 1/2] ncrypt: Implement NCryptIsAlgSupported.
by Hans Leidekker 07 Apr '22

07 Apr '22

From: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Microsoft Edge calls this function expecting an implementation. With this, Internet browsing works. Signed-off-by: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/ncrypt/main.c | 44 +++++++++++++++++++++++++++++++++++++++-- dlls/ncrypt/ncrypt.spec | 2 +- include/ncrypt.h | 1 + 3 files changed, 44 insertions(+), 3 deletions(-) diff --git a/dlls/ncrypt/main.c b/dlls/ncrypt/main.c index e12284e0867..10cec633269 100644 --- a/dlls/ncrypt/main.c +++ b/dlls/ncrypt/main.c @@ -416,8 +416,48 @@ SECURITY_STATUS WINAPI NCryptImportKey(NCRYPT_PROV_HANDLE provider, NCRYPT_KEY_H SECURITY_STATUS WINAPI NCryptIsAlgSupported(NCRYPT_PROV_HANDLE provider, const WCHAR *algid, DWORD flags) { - FIXME("(%#Ix, %s, %#lx): stub\n", provider, wine_dbgstr_w(algid), flags); - return NTE_NOT_SUPPORTED; + static const ULONG supported = BCRYPT_CIPHER_OPERATION |\ + BCRYPT_ASYMMETRIC_ENCRYPTION_OPERATION |\ + BCRYPT_SIGNATURE_OPERATION |\ + BCRYPT_SECRET_AGREEMENT_OPERATION; + BCRYPT_ALGORITHM_IDENTIFIER *list; + ULONG i, count; + NTSTATUS status; + + TRACE("(%#Ix, %s, %#lx)\n", provider, wine_dbgstr_w(algid), flags); + + if (!provider) return NTE_INVALID_HANDLE; + if (!algid) return HRESULT_FROM_WIN32(RPC_X_NULL_REF_POINTER); + if (flags == NCRYPT_SILENT_FLAG) + { + FIXME("Silent flag not implemented\n"); + } + else if (flags) + { + WARN("Invalid flags %#lx\n", flags); + return NTE_BAD_FLAGS; + } + if (!lstrcmpiW(BCRYPT_RSA_SIGN_ALGORITHM, algid)) return NTE_NOT_SUPPORTED; + + status = BCryptEnumAlgorithms(supported, &count, &list, 0); + if (status != STATUS_SUCCESS) + { + ERR("Error retrieving algorithm list %#lx\n", status); + return map_ntstatus(status); + } + + status = STATUS_NOT_SUPPORTED; + for (i = 0; i < count; i++) + { + if (!lstrcmpiW(list[i].pszName, algid)) + { + status = STATUS_SUCCESS; + break; + } + } + + BCryptFreeBuffer(list); + return map_ntstatus(status); } BOOL WINAPI NCryptIsKeyHandle(NCRYPT_KEY_HANDLE hKey) diff --git a/dlls/ncrypt/ncrypt.spec b/dlls/ncrypt/ncrypt.spec index bb914616373..60b367260d5 100644 --- a/dlls/ncrypt/ncrypt.spec +++ b/dlls/ncrypt/ncrypt.spec @@ -77,7 +77,7 @@ @ stdcall NCryptGetProperty(ptr wstr ptr long ptr long) @ stub NCryptGetProtectionDescriptorInfo @ stdcall NCryptImportKey(long long wstr ptr ptr ptr long long) -@ stub NCryptIsAlgSupported(long wstr long) +@ stdcall NCryptIsAlgSupported(long wstr long) @ stdcall NCryptIsKeyHandle(long) @ stub NCryptKeyDerivation @ stub NCryptNotifyChangeKey diff --git a/include/ncrypt.h b/include/ncrypt.h index c09a1ec8676..18198fdc5bb 100644 --- a/include/ncrypt.h +++ b/include/ncrypt.h @@ -118,6 +118,7 @@ SECURITY_STATUS WINAPI NCryptFreeObject(NCRYPT_HANDLE); SECURITY_STATUS WINAPI NCryptGetProperty(NCRYPT_HANDLE, const WCHAR *, BYTE *, DWORD, DWORD *, DWORD); SECURITY_STATUS WINAPI NCryptImportKey(NCRYPT_PROV_HANDLE, NCRYPT_KEY_HANDLE, const WCHAR *, NCryptBufferDesc *, NCRYPT_KEY_HANDLE *, BYTE *, DWORD, DWORD); +SECURITY_STATUS WINAPI NCryptIsAlgSupported(NCRYPT_PROV_HANDLE, const WCHAR *, DWORD); SECURITY_STATUS WINAPI NCryptOpenKey(NCRYPT_PROV_HANDLE, NCRYPT_KEY_HANDLE *, const WCHAR *, DWORD, DWORD); SECURITY_STATUS WINAPI NCryptOpenStorageProvider(NCRYPT_PROV_HANDLE *, const WCHAR *, DWORD); SECURITY_STATUS WINAPI NCryptSetProperty(NCRYPT_HANDLE, const WCHAR *, BYTE *, DWORD, DWORD); -- 2.30.2

1 0

[PATCH] wmic: Use CRT allocation functions.
by Nikolay Sivov 07 Apr '22

07 Apr '22

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- programs/wmic/main.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/programs/wmic/main.c b/programs/wmic/main.c index 50c28ebec5d..15b590098e7 100644 --- a/programs/wmic/main.c +++ b/programs/wmic/main.c @@ -61,15 +61,6 @@ static const WCHAR *find_class( const WCHAR *alias ) return NULL; } -static inline WCHAR *strdupW( const WCHAR *src ) -{ - WCHAR *dst; - if (!src) return NULL; - if (!(dst = HeapAlloc( GetProcessHeap(), 0, (lstrlenW( src ) + 1) * sizeof(WCHAR) ))) return NULL; - lstrcpyW( dst, src ); - return dst; -} - static WCHAR *find_prop( IWbemClassObject *class, const WCHAR *prop ) { SAFEARRAY *sa; @@ -85,7 +76,7 @@ static WCHAR *find_prop( IWbemClassObject *class, const WCHAR *prop ) SafeArrayGetElement( sa, &i, &str ); if (!wcsicmp( str, prop )) { - ret = strdupW( str ); + ret = wcsdup( str ); break; } } @@ -228,7 +219,7 @@ done: SysFreeString( path ); SysFreeString( query ); SysFreeString( wql ); - HeapFree( GetProcessHeap(), 0, prop ); + free( prop ); CoUninitialize(); return ret; } -- 2.35.1

1 0

[PATCH 1/2] d2d1/tests: Add tests for GetImageLocalBounds().
by Ziqing Hui 07 Apr '22

07 Apr '22

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/d2d1/tests/d2d1.c | 73 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 73 insertions(+) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 826526d9d38..5b72d79de0e 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -10764,6 +10764,78 @@ static void test_stroke_contains_point(BOOL d3d11) ID2D1Factory_Release(factory); } +static void test_image_bounds(BOOL d3d11) +{ + D2D1_BITMAP_PROPERTIES bitmap_desc; + D2D_RECT_F bounds, expected_bounds; + struct d2d1_test_context ctx; + ID2D1DeviceContext *context; + ID2D1Factory1 *factory; + ID2D1Bitmap *bitmap; + D2D1_SIZE_F size; + unsigned int i; + HRESULT hr; + + const struct bitmap_bounds_test + { + float dpi_x; + float dpi_y; + D2D_SIZE_U pixel_size; + } + bitmap_bounds_tests[] = + { + {96.0f, 96.0f, {100, 100}}, + {48.0f, 48.0f, {100, 100}}, + {192.0f, 192.0f, {100, 100}}, + {96.0f, 48.0f, {100, 100}}, + {48.0f, 192.0f, {100, 100}}, + {150.0f, 150.0f, {100, 100}}, + {96.0f, 96.0f, {1, 1}}, + {192.0f, 192.0f, {1, 1}}, + }; + + if (!init_test_context(&ctx, d3d11)) + return; + + if (FAILED(D2D1CreateFactory(D2D1_FACTORY_TYPE_SINGLE_THREADED, &IID_ID2D1Factory1, NULL, (void **)&factory))) + { + win_skip("ID2D1Factory1 is not supported.\n"); + release_test_context(&ctx); + return; + } + + hr = ID2D1RenderTarget_QueryInterface(ctx.rt, &IID_ID2D1DeviceContext, (void **)&context); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + + for (i = 0; i < ARRAY_SIZE(bitmap_bounds_tests); ++i) + { + const struct bitmap_bounds_test *test = &bitmap_bounds_tests[i]; + winetest_push_context("Test %u", i); + + bitmap_desc.dpiX = test->dpi_x; + bitmap_desc.dpiY = test->dpi_y; + bitmap_desc.pixelFormat.format = DXGI_FORMAT_B8G8R8A8_UNORM; + bitmap_desc.pixelFormat.alphaMode = D2D1_ALPHA_MODE_IGNORE; + hr = ID2D1RenderTarget_CreateBitmap(ctx.rt, test->pixel_size, NULL, 0, &bitmap_desc, &bitmap); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + + set_rect(&bounds, 0.0f, 0.0f, 0.0f, 0.0f); + size = ID2D1Bitmap_GetSize(bitmap); + ID2D1DeviceContext_GetImageLocalBounds(context, (ID2D1Image *)bitmap, &bounds); + todo_wine ok(compare_rect(&bounds, 0.0f, 0.0f, size.width, size.height, 0), + "Got unexpected bounds {%.8e, %.8e, %.8e, %.8e}, expected {%.8e, %.8e, %.8e, %.8e}.\n", + bounds.left, bounds.top, bounds.right, bounds.bottom, + expected_bounds.left, expected_bounds.top, expected_bounds.right, expected_bounds.bottom); + + ID2D1Bitmap_Release(bitmap); + winetest_pop_context(); + } + + ID2D1DeviceContext_Release(context); + ID2D1Factory1_Release(factory); + release_test_context(&ctx); +} + START_TEST(d2d1) { HMODULE d2d1_dll = GetModuleHandleA("d2d1.dll"); @@ -10835,6 +10907,7 @@ START_TEST(d2d1) queue_test(test_effect_crop); queue_test(test_effect_grayscale); queue_d3d10_test(test_stroke_contains_point); + queue_test(test_image_bounds); run_queued_tests(); } -- 2.25.1

2 3

[PATCH 1/2] wmp: Use CRT allocation functions.
by Nikolay Sivov 07 Apr '22

07 Apr '22

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/wmp/events.c | 15 +++++++-------- dlls/wmp/oleobj.c | 5 ++--- dlls/wmp/player.c | 40 ++++++++++++++++++++-------------------- dlls/wmp/wmp_private.h | 17 ----------------- 4 files changed, 29 insertions(+), 48 deletions(-) diff --git a/dlls/wmp/events.c b/dlls/wmp/events.c index f541830773b..9f2b1cb4b29 100644 --- a/dlls/wmp/events.c +++ b/dlls/wmp/events.c @@ -152,7 +152,7 @@ static ULONG WINAPI EnumConnections_Release(IEnumConnections *iface) if(!ref) { IConnectionPoint_Release(&This->cp->IConnectionPoint_iface); - heap_free(This); + free(This); } return ref; @@ -296,10 +296,9 @@ static HRESULT WINAPI ConnectionPoint_Advise(IConnectionPoint *iface, IUnknown * } if(i == This->sinks_size) - This->sinks = heap_realloc(This->sinks, - (++This->sinks_size)*sizeof(*This->sinks)); + This->sinks = realloc(This->sinks, (++This->sinks_size)*sizeof(*This->sinks)); }else { - This->sinks = heap_alloc(sizeof(*This->sinks)); + This->sinks = malloc(sizeof(*This->sinks)); This->sinks_size = 1; i = 0; } @@ -333,7 +332,7 @@ static HRESULT WINAPI ConnectionPoint_EnumConnections(IConnectionPoint *iface, TRACE("(%p)->(%p)\n", This, ppEnum); - ret = heap_alloc(sizeof(*ret)); + ret = malloc(sizeof(*ret)); if(!ret) return E_OUTOFMEMORY; @@ -370,14 +369,14 @@ static void ConnectionPoint_Destroy(ConnectionPoint *This) IDispatch_Release(This->sinks[i]); } - heap_free(This->sinks); - heap_free(This); + free(This->sinks); + free(This); } static void ConnectionPoint_Create(REFIID riid, ConnectionPoint **cp, IConnectionPointContainer *container) { - ConnectionPoint *ret = heap_alloc(sizeof(ConnectionPoint)); + ConnectionPoint *ret = malloc(sizeof(ConnectionPoint)); ret->IConnectionPoint_iface.lpVtbl = &ConnectionPointVtbl; diff --git a/dlls/wmp/oleobj.c b/dlls/wmp/oleobj.c index 5eaa789f87f..e227f91f8ba 100644 --- a/dlls/wmp/oleobj.c +++ b/dlls/wmp/oleobj.c @@ -20,7 +20,6 @@ #include "olectl.h" #include "wine/debug.h" -#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(wmp); @@ -307,7 +306,7 @@ static ULONG WINAPI OleObject_Release(IOleObject *iface) release_client_site(This); destroy_player(This); ConnectionPointContainer_Destroy(This); - heap_free(This); + free(This); } return ref; @@ -890,7 +889,7 @@ HRESULT WINAPI WMPFactory_CreateInstance(IClassFactory *iface, IUnknown *outer, TRACE("(%p %s %p)\n", outer, debugstr_guid(riid), ppv); - wmp = heap_alloc_zero(sizeof(*wmp)); + wmp = calloc(1, sizeof(*wmp)); if(!wmp) return E_OUTOFMEMORY; diff --git a/dlls/wmp/player.c b/dlls/wmp/player.c index 7225e7130a9..254d04d23f8 100644 --- a/dlls/wmp/player.c +++ b/dlls/wmp/player.c @@ -1741,9 +1741,9 @@ static ULONG WINAPI WMPMedia_Release(IWMPMedia *iface) TRACE("(%p) ref=%ld\n", This, ref); if(!ref) { - heap_free(This->url); - heap_free(This->name); - heap_free(This); + free(This->url); + free(This->name); + free(This); } return ref; @@ -1815,8 +1815,8 @@ static HRESULT WINAPI WMPMedia_put_name(IWMPMedia *iface, BSTR name) if (!name) return E_POINTER; - heap_free(This->name); - This->name = heap_strdupW(name); + free(This->name); + This->name = wcsdup(name); return S_OK; } @@ -1990,9 +1990,9 @@ static ULONG WINAPI WMPPlaylist_Release(IWMPPlaylist *iface) TRACE("(%p) ref=%ld\n", This, ref); if(!ref) { - heap_free(This->url); - heap_free(This->name); - heap_free(This); + free(This->url); + free(This->name); + free(This); } return ref; @@ -2060,8 +2060,8 @@ static HRESULT WINAPI WMPPlaylist_put_name(IWMPPlaylist *iface, BSTR name) if (!name) return E_POINTER; - heap_free(This->name); - This->name = heap_strdupW(name); + free(This->name); + This->name = wcsdup(name); return S_OK; } @@ -2282,7 +2282,7 @@ HRESULT create_media_from_url(BSTR url, double duration, IWMPMedia **ppMedia) HRESULT hr; WCHAR *name_dup; - media = heap_alloc_zero(sizeof(*media)); + media = calloc(1, sizeof(*media)); if (!media) return E_OUTOFMEMORY; @@ -2290,20 +2290,20 @@ HRESULT create_media_from_url(BSTR url, double duration, IWMPMedia **ppMedia) if (url) { - media->url = heap_strdupW(url); - name_dup = heap_strdupW(url); + media->url = wcsdup(url); + name_dup = wcsdup(url); hr = CreateUri(name_dup, Uri_CREATE_ALLOW_RELATIVE | Uri_CREATE_ALLOW_IMPLICIT_FILE_SCHEME, 0, &uri); if (FAILED(hr)) { - heap_free(name_dup); + free(name_dup); IWMPMedia_Release(&media->IWMPMedia_iface); return hr; } hr = IUri_GetPath(uri, &path); if (hr != S_OK) { - heap_free(name_dup); + free(name_dup); IUri_Release(uri); IWMPMedia_Release(&media->IWMPMedia_iface); return hr; @@ -2323,8 +2323,8 @@ HRESULT create_media_from_url(BSTR url, double duration, IWMPMedia **ppMedia) } else { - media->url = heap_strdupW(L""); - media->name = heap_strdupW(L""); + media->url = wcsdup(L""); + media->name = wcsdup(L""); } media->duration = duration; @@ -2343,13 +2343,13 @@ HRESULT create_playlist(BSTR name, BSTR url, LONG count, IWMPPlaylist **ppPlayli { WMPPlaylist *playlist; - playlist = heap_alloc_zero(sizeof(*playlist)); + playlist = calloc(1, sizeof(*playlist)); if (!playlist) return E_OUTOFMEMORY; playlist->IWMPPlaylist_iface.lpVtbl = &WMPPlaylistVtbl; - playlist->url = heap_strdupW(url ? url : L""); - playlist->name = heap_strdupW(name ? name : L""); + playlist->url = wcsdup(url ? url : L""); + playlist->name = wcsdup(name ? name : L""); playlist->ref = 1; playlist->count = count; diff --git a/dlls/wmp/wmp_private.h b/dlls/wmp/wmp_private.h index e1a1e036cd1..ffeaca09a47 100644 --- a/dlls/wmp/wmp_private.h +++ b/dlls/wmp/wmp_private.h @@ -19,7 +19,6 @@ #define COBJMACROS #include "windows.h" -#include "wine/heap.h" #include "ole2.h" #include "dshow.h" #include "wmp.h" @@ -129,22 +128,6 @@ void unregister_player_msg_class(void) DECLSPEC_HIDDEN; extern HINSTANCE wmp_instance DECLSPEC_HIDDEN; -static inline WCHAR *heap_strdupW(const WCHAR *str) -{ - WCHAR *ret; - - if(str) { - size_t size = lstrlenW(str)+1; - ret = heap_alloc(size*sizeof(WCHAR)); - if(ret) - memcpy(ret, str, size*sizeof(WCHAR)); - }else { - ret = NULL; - } - - return ret; -} - static inline HRESULT return_bstr(const WCHAR *value, BSTR *p) { if(!p) -- 2.35.1

1 1

[PATCH] qmgr: Use CRT allocation functions.
by Nikolay Sivov 07 Apr '22

07 Apr '22

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/qmgr/enum_files.c | 11 +++++----- dlls/qmgr/enum_jobs.c | 11 +++++----- dlls/qmgr/file.c | 23 ++++++++----------- dlls/qmgr/job.c | 50 ++++++++++++++++++++---------------------- dlls/qmgr/qmgr.h | 7 ------ 5 files changed, 43 insertions(+), 59 deletions(-) diff --git a/dlls/qmgr/enum_files.c b/dlls/qmgr/enum_files.c index 92834c6bd3b..a7a26da60c9 100644 --- a/dlls/qmgr/enum_files.c +++ b/dlls/qmgr/enum_files.c @@ -76,8 +76,8 @@ static ULONG WINAPI EnumBackgroundCopyFiles_Release(IEnumBackgroundCopyFiles *if { for(i = 0; i < This->numFiles; i++) IBackgroundCopyFile2_Release(This->files[i]); - HeapFree(GetProcessHeap(), 0, This->files); - HeapFree(GetProcessHeap(), 0, This); + free(This->files); + free(This); } return ref; @@ -188,7 +188,7 @@ HRESULT EnumBackgroundCopyFilesConstructor(BackgroundCopyJobImpl *job, IEnumBack TRACE("%p, %p)\n", job, enum_files); - This = HeapAlloc(GetProcessHeap(), 0, sizeof *This); + This = malloc(sizeof(*This)); if (!This) return E_OUTOFMEMORY; @@ -202,12 +202,11 @@ HRESULT EnumBackgroundCopyFilesConstructor(BackgroundCopyJobImpl *job, IEnumBack This->files = NULL; if (This->numFiles > 0) { - This->files = HeapAlloc(GetProcessHeap(), 0, - This->numFiles * sizeof This->files[0]); + This->files = malloc(This->numFiles * sizeof This->files[0]); if (!This->files) { LeaveCriticalSection(&job->cs); - HeapFree(GetProcessHeap(), 0, This); + free(This); return E_OUTOFMEMORY; } } diff --git a/dlls/qmgr/enum_jobs.c b/dlls/qmgr/enum_jobs.c index 00d8ea52b4f..d31303ab1fc 100644 --- a/dlls/qmgr/enum_jobs.c +++ b/dlls/qmgr/enum_jobs.c @@ -76,8 +76,8 @@ static ULONG WINAPI EnumBackgroundCopyJobs_Release(IEnumBackgroundCopyJobs *ifac if (ref == 0) { for(i = 0; i < This->numJobs; i++) IBackgroundCopyJob4_Release(This->jobs[i]); - HeapFree(GetProcessHeap(), 0, This->jobs); - HeapFree(GetProcessHeap(), 0, This); + free(This->jobs); + free(This); } return ref; @@ -182,7 +182,7 @@ HRESULT enum_copy_job_create(BackgroundCopyManagerImpl *qmgr, IEnumBackgroundCop TRACE("%p, %p)\n", qmgr, enumjob); - This = HeapAlloc(GetProcessHeap(), 0, sizeof *This); + This = malloc(sizeof(*This)); if (!This) return E_OUTOFMEMORY; This->IEnumBackgroundCopyJobs_iface.lpVtbl = &EnumBackgroundCopyJobsVtbl; @@ -196,12 +196,11 @@ HRESULT enum_copy_job_create(BackgroundCopyManagerImpl *qmgr, IEnumBackgroundCop if (0 < This->numJobs) { - This->jobs = HeapAlloc(GetProcessHeap(), 0, - This->numJobs * sizeof *This->jobs); + This->jobs = malloc(This->numJobs * sizeof *This->jobs); if (!This->jobs) { LeaveCriticalSection(&qmgr->cs); - HeapFree(GetProcessHeap(), 0, This); + free(This); return E_OUTOFMEMORY; } } diff --git a/dlls/qmgr/file.c b/dlls/qmgr/file.c index 339354d59c0..c82344a51a8 100644 --- a/dlls/qmgr/file.c +++ b/dlls/qmgr/file.c @@ -82,9 +82,9 @@ static ULONG WINAPI BackgroundCopyFile_Release( if (ref == 0) { IBackgroundCopyJob4_Release(&file->owner->IBackgroundCopyJob4_iface); - HeapFree(GetProcessHeap(), 0, file->info.LocalName); - HeapFree(GetProcessHeap(), 0, file->info.RemoteName); - HeapFree(GetProcessHeap(), 0, file); + free(file->info.LocalName); + free(file->info.RemoteName); + free(file); } return ref; @@ -167,34 +167,29 @@ HRESULT BackgroundCopyFileConstructor(BackgroundCopyJobImpl *owner, TRACE("(%s, %s, %p)\n", debugstr_w(remoteName), debugstr_w(localName), file); - This = HeapAlloc(GetProcessHeap(), 0, sizeof *This); + This = calloc(1, sizeof(*This)); if (!This) return E_OUTOFMEMORY; - This->info.RemoteName = strdupW(remoteName); + This->info.RemoteName = wcsdup(remoteName); if (!This->info.RemoteName) { - HeapFree(GetProcessHeap(), 0, This); + free(This); return E_OUTOFMEMORY; } - This->info.LocalName = strdupW(localName); + This->info.LocalName = wcsdup(localName); if (!This->info.LocalName) { - HeapFree(GetProcessHeap(), 0, This->info.RemoteName); - HeapFree(GetProcessHeap(), 0, This); + free(This->info.RemoteName); + free(This); return E_OUTOFMEMORY; } This->IBackgroundCopyFile2_iface.lpVtbl = &BackgroundCopyFile2Vtbl; This->ref = 1; - This->fileProgress.BytesTotal = BG_SIZE_UNKNOWN; - This->fileProgress.BytesTransferred = 0; - This->fileProgress.Completed = FALSE; This->owner = owner; - This->read_size = 0; - This->tempFileName[0] = 0; IBackgroundCopyJob4_AddRef(&owner->IBackgroundCopyJob4_iface); *file = This; diff --git a/dlls/qmgr/job.c b/dlls/qmgr/job.c index 2b8572465ad..233d894b3ea 100644 --- a/dlls/qmgr/job.c +++ b/dlls/qmgr/job.c @@ -99,7 +99,7 @@ static ULONG WINAPI copy_error_Release( if (!refs) { if (error->file) IBackgroundCopyFile2_Release(error->file); - HeapFree(GetProcessHeap(), 0, error); + free(error); } return refs; } @@ -189,7 +189,7 @@ static HRESULT create_copy_error( TRACE("context %u code %08lx file %p\n", context, code, file); - if (!(error = HeapAlloc(GetProcessHeap(), 0, sizeof(*error) ))) return E_OUTOFMEMORY; + if (!(error = malloc(sizeof(*error) ))) return E_OUTOFMEMORY; error->IBackgroundCopyError_iface.lpVtbl = &copy_error_vtbl; error->refs = 1; error->context = context; @@ -262,22 +262,22 @@ static ULONG WINAPI BackgroundCopyJob_Release(IBackgroundCopyJob4 *iface) DeleteCriticalSection(&job->cs); if (job->callback) IBackgroundCopyCallback2_Release(job->callback); - HeapFree(GetProcessHeap(), 0, job->displayName); - HeapFree(GetProcessHeap(), 0, job->description); - HeapFree(GetProcessHeap(), 0, job->http_options.headers); + free(job->displayName); + free(job->description); + free(job->http_options.headers); for (i = 0; i < BG_AUTH_TARGET_PROXY; i++) { for (j = 0; j < BG_AUTH_SCHEME_PASSPORT; j++) { BG_AUTH_CREDENTIALS *cred = &job->http_options.creds[i][j]; - HeapFree(GetProcessHeap(), 0, cred->Credentials.Basic.UserName); - HeapFree(GetProcessHeap(), 0, cred->Credentials.Basic.Password); + free(cred->Credentials.Basic.UserName); + free(cred->Credentials.Basic.Password); } } CloseHandle(job->wait); CloseHandle(job->cancel); CloseHandle(job->done); - HeapFree(GetProcessHeap(), 0, job); + free(job); } return ref; @@ -578,10 +578,8 @@ static HRESULT WINAPI BackgroundCopyJob_SetDescription(IBackgroundCopyJob4 *ifac } else { - HeapFree(GetProcessHeap(), 0, job->description); - if ((job->description = HeapAlloc(GetProcessHeap(), 0, (len+1)*sizeof(WCHAR)))) - lstrcpyW(job->description, desc); - else + free(job->description); + if (!(job->description = wcsdup(desc))) hr = E_OUTOFMEMORY; } @@ -803,13 +801,13 @@ static HRESULT WINAPI BackgroundCopyJob_SetCredentials(IBackgroundCopyJob4 *ifac if (cred->Credentials.Basic.UserName) { - HeapFree(GetProcessHeap(), 0, new_cred->Credentials.Basic.UserName); - new_cred->Credentials.Basic.UserName = strdupW(cred->Credentials.Basic.UserName); + free(new_cred->Credentials.Basic.UserName); + new_cred->Credentials.Basic.UserName = wcsdup(cred->Credentials.Basic.UserName); } if (cred->Credentials.Basic.Password) { - HeapFree(GetProcessHeap(), 0, new_cred->Credentials.Basic.Password); - new_cred->Credentials.Basic.Password = strdupW(cred->Credentials.Basic.Password); + free(new_cred->Credentials.Basic.Password); + new_cred->Credentials.Basic.Password = wcsdup(cred->Credentials.Basic.Password); } LeaveCriticalSection(&job->cs); @@ -834,9 +832,9 @@ static HRESULT WINAPI BackgroundCopyJob_RemoveCredentials( EnterCriticalSection(&job->cs); new_cred->Target = new_cred->Scheme = 0; - HeapFree(GetProcessHeap(), 0, new_cred->Credentials.Basic.UserName); + free(new_cred->Credentials.Basic.UserName); new_cred->Credentials.Basic.UserName = NULL; - HeapFree(GetProcessHeap(), 0, new_cred->Credentials.Basic.Password); + free(new_cred->Credentials.Basic.Password); new_cred->Credentials.Basic.Password = NULL; LeaveCriticalSection(&job->cs); @@ -1047,18 +1045,18 @@ static HRESULT WINAPI http_options_SetCustomHeaders( if (RequestHeaders) { - WCHAR *headers = strdupW(RequestHeaders); + WCHAR *headers = wcsdup(RequestHeaders); if (!headers) { LeaveCriticalSection(&job->cs); return E_OUTOFMEMORY; } - HeapFree(GetProcessHeap(), 0, job->http_options.headers); + free(job->http_options.headers); job->http_options.headers = headers; } else { - HeapFree(GetProcessHeap(), 0, job->http_options.headers); + free(job->http_options.headers); job->http_options.headers = NULL; } @@ -1140,7 +1138,7 @@ HRESULT BackgroundCopyJobConstructor(LPCWSTR displayName, BG_JOB_TYPE type, GUID TRACE("(%s,%d,%p)\n", debugstr_w(displayName), type, job); - This = HeapAlloc(GetProcessHeap(), 0, sizeof *This); + This = malloc(sizeof(*This)); if (!This) return E_OUTOFMEMORY; @@ -1152,12 +1150,12 @@ HRESULT BackgroundCopyJobConstructor(LPCWSTR displayName, BG_JOB_TYPE type, GUID This->ref = 1; This->type = type; - This->displayName = strdupW(displayName); + This->displayName = wcsdup(displayName); if (!This->displayName) { This->cs.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&This->cs); - HeapFree(GetProcessHeap(), 0, This); + free(This); return E_OUTOFMEMORY; } @@ -1166,8 +1164,8 @@ HRESULT BackgroundCopyJobConstructor(LPCWSTR displayName, BG_JOB_TYPE type, GUID { This->cs.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&This->cs); - HeapFree(GetProcessHeap(), 0, This->displayName); - HeapFree(GetProcessHeap(), 0, This); + free(This->displayName); + free(This); return hr; } *job_id = This->jobId; diff --git a/dlls/qmgr/qmgr.h b/dlls/qmgr/qmgr.h index de808049ea3..8d9ccae73ff 100644 --- a/dlls/qmgr/qmgr.h +++ b/dlls/qmgr/qmgr.h @@ -115,13 +115,6 @@ BOOL processFile(BackgroundCopyFileImpl *file, BackgroundCopyJobImpl *job) DECLS BOOL transitionJobState(BackgroundCopyJobImpl *job, BG_JOB_STATE from, BG_JOB_STATE to) DECLSPEC_HIDDEN; /* Little helper functions */ -static inline WCHAR *strdupW(const WCHAR *src) -{ - WCHAR *dst = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(src) + 1) * sizeof(WCHAR)); - if (dst) lstrcpyW(dst, src); - return dst; -} - static inline WCHAR *co_strdupW(const WCHAR *src) { WCHAR *dst = CoTaskMemAlloc((lstrlenW(src) + 1) * sizeof(WCHAR)); -- 2.35.1

1 0

[PATCH] localui/tests: Use CRT allocation functions.
by Nikolay Sivov 07 Apr '22

07 Apr '22

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/localui/tests/localui.c | 35 ++++++++--------------------------- 1 file changed, 8 insertions(+), 27 deletions(-) diff --git a/dlls/localui/tests/localui.c b/dlls/localui/tests/localui.c index 28cecaabd50..b504bd870f7 100644 --- a/dlls/localui/tests/localui.c +++ b/dlls/localui/tests/localui.c @@ -69,7 +69,7 @@ static PORT_INFO_2W * find_portinfo2(LPCWSTR pPort) return NULL; } ok(!res, "EnumPorts succeeded: got %ld\n", res); - pi_buffer = HeapAlloc(GetProcessHeap(), 0, pi_needed); + pi_buffer = malloc(pi_needed); res = EnumPortsW(NULL, 2, pi_buffer, pi_needed, &pi_needed, &pi_numports); ok(res == 1, "EnumPorts failed: got %ld\n", res); } @@ -105,21 +105,6 @@ static LPCSTR load_functions(void) return NULL; } -/* ########################### - * strdupW [internal] - */ - -static LPWSTR strdupW(LPCWSTR strW) -{ - LPWSTR ptr; - - ptr = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(strW) + 1) * sizeof(WCHAR)); - if (ptr) { - lstrcpyW(ptr, strW); - } - return ptr; -} - /* ########################### */ static void test_AddPortUI(void) @@ -267,7 +252,6 @@ START_TEST(localui) DWORD numentries; PORT_INFO_2W * pi2; WCHAR bufferW[16]; - CHAR bufferA[16]; DWORD id; /* localui.dll does not exist before w2k */ @@ -302,29 +286,26 @@ START_TEST(localui) /* "LPT1:" - "LPT9:" */ while (((lpt_present == NULL) || (lpt_absent == NULL)) && id < 9) { id++; - sprintf(bufferA, "LPT%lu:", id); - MultiByteToWideChar( CP_ACP, 0, bufferA, -1, bufferW, ARRAY_SIZE(bufferW)); + swprintf(bufferW, ARRAY_SIZE(bufferW), L"LPT%lu:", id); pi2 = find_portinfo2(bufferW); if (pi2 && (lpt_present == NULL)) lpt_present = pi2; - if (!pi2 && (lpt_absent == NULL)) lpt_absent = strdupW(bufferW); + if (!pi2 && (lpt_absent == NULL)) lpt_absent = wcsdup(bufferW); } id = 0; /* "COM1:" - "COM9:" */ while (((com_present == NULL) || (com_absent == NULL)) && id < 9) { id++; - sprintf(bufferA, "COM%lu:", id); - MultiByteToWideChar( CP_ACP, 0, bufferA, -1, bufferW, ARRAY_SIZE(bufferW)); + swprintf(bufferW, ARRAY_SIZE(bufferW), L"COM%lu:", id); pi2 = find_portinfo2(bufferW); if (pi2 && (com_present == NULL)) com_present = pi2; - if (!pi2 && (com_absent == NULL)) com_absent = strdupW(bufferW); + if (!pi2 && (com_absent == NULL)) com_absent = wcsdup(bufferW); } test_AddPortUI(); test_ConfigurePortUI(); - /* cleanup */ - HeapFree(GetProcessHeap(), 0, lpt_absent); - HeapFree(GetProcessHeap(), 0, com_absent); - HeapFree(GetProcessHeap(), 0, pi_buffer); + free(lpt_absent); + free(com_absent); + free(pi_buffer); } -- 2.35.1

1 0

[PATCH v2 1/2] riched20/tests: Add tests for IRichEditOleCallback_QueryInsertObject.
by Jinoh Kang 07 Apr '22

07 Apr '22

Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> --- Notes: v1 -> v2: - remove unused typedef storage class specifier from struct IRichEditOleCallbackImpl definition (thanks huw) - remove Hungarian notation from struct fields and callback params (thanks huw) dlls/riched20/tests/richole.c | 247 ++++++++++++++++++++++++++++++++-- 1 file changed, 236 insertions(+), 11 deletions(-) diff --git a/dlls/riched20/tests/richole.c b/dlls/riched20/tests/richole.c index 24284a24484..fce4e74285d 100644 --- a/dlls/riched20/tests/richole.c +++ b/dlls/riched20/tests/richole.c @@ -33,6 +33,169 @@ #include <tom.h> #include <wine/test.h> +#define EXPECT_TODO_WINE 0x80000000UL + +struct IRichEditOleCallbackImpl { + IRichEditOleCallback IRichEditOleCallback_iface; + LONG ref; + int line; + + ULONG expect_queryinsertobject; + + const CLSID *clsid; + LPSTORAGE stg; + LONG cp; + HRESULT queryinsertobject_result; +}; + +static inline struct IRichEditOleCallbackImpl *impl_from_IRichEditOleCallback(IRichEditOleCallback *iface) +{ + return CONTAINING_RECORD(iface, struct IRichEditOleCallbackImpl, IRichEditOleCallback_iface); +} + +static HRESULT STDMETHODCALLTYPE RichEditOleCallbackImpl_QueryInterface(IRichEditOleCallback *iface, REFIID riid, void **obj) +{ + if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IRichEditOleCallback)) { + IRichEditOleCallback_AddRef(iface); + *obj = iface; + return S_OK; + } + *obj = NULL; + return E_NOINTERFACE; +} + +static ULONG STDMETHODCALLTYPE RichEditOleCallbackImpl_AddRef(IRichEditOleCallback *iface) +{ + struct IRichEditOleCallbackImpl *This = impl_from_IRichEditOleCallback(iface); + ULONG ref = InterlockedIncrement(&This->ref); + return ref; +} + +static ULONG STDMETHODCALLTYPE RichEditOleCallbackImpl_Release(IRichEditOleCallback *iface) +{ + struct IRichEditOleCallbackImpl *This = impl_from_IRichEditOleCallback(iface); + ULONG ref = InterlockedDecrement(&This->ref); + if (!ref) free(This); + return ref; +} + +static HRESULT STDMETHODCALLTYPE RichEditOleCallbackImpl_GetNewStorage(IRichEditOleCallback *iface, LPSTORAGE *stg) +{ + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE RichEditOleCallbackImpl_GetInPlaceContext(IRichEditOleCallback *iface, LPOLEINPLACEFRAME *frame, LPOLEINPLACEUIWINDOW *doc, LPOLEINPLACEFRAMEINFO frame_info) +{ + return E_INVALIDARG; +} + +static HRESULT STDMETHODCALLTYPE RichEditOleCallbackImpl_ShowContainerUI(IRichEditOleCallback *iface, BOOL show) +{ + return S_OK; +} + +static HRESULT STDMETHODCALLTYPE RichEditOleCallbackImpl_QueryInsertObject(IRichEditOleCallback *iface, LPCLSID clsid, LPSTORAGE stg, LONG cp) +{ + struct IRichEditOleCallbackImpl *This = impl_from_IRichEditOleCallback(iface); + ULONG expect = This->expect_queryinsertobject; + + todo_wine_if(expect & EXPECT_TODO_WINE) + ok_(__FILE__,This->line)( expect & ~EXPECT_TODO_WINE, "unexpected call to IRichEditOleCallback_QueryInsertObject\n"); + if (!(expect & ~EXPECT_TODO_WINE)) return S_OK; + This->expect_queryinsertobject--; + + if (This->clsid && clsid) + ok_(__FILE__,This->line)( IsEqualGUID(This->clsid, clsid), "QueryInsertObject clsid expected %s, got %s\n", wine_dbgstr_guid( This->clsid ), wine_dbgstr_guid( clsid )); + else + ok_(__FILE__,This->line)( This->clsid == clsid, "QueryInsertObject clsid expected %p, got %p\n", This->clsid, clsid ); + ok_(__FILE__,This->line)( This->stg == stg, "QueryInsertObject stg expected %p, got %p\n", This->stg, stg ); + ok_(__FILE__,This->line)( This->cp == cp, "QueryInsertObject cp expected %ld, got %ld\n", This->cp, cp ); + return This->queryinsertobject_result; +} + +static HRESULT STDMETHODCALLTYPE RichEditOleCallbackImpl_DeleteObject(IRichEditOleCallback *iface, LPOLEOBJECT oleobj) +{ + return S_OK; +} + +static HRESULT STDMETHODCALLTYPE RichEditOleCallbackImpl_QueryAcceptData(IRichEditOleCallback *iface, LPDATAOBJECT dataobj, CLIPFORMAT *cf_format, DWORD reco, BOOL really, HGLOBAL metapict) +{ + return S_OK; +} + +static HRESULT STDMETHODCALLTYPE RichEditOleCallbackImpl_ContextSensitiveHelp(IRichEditOleCallback *iface, BOOL enter_mode) +{ + return S_OK; +} + +static HRESULT STDMETHODCALLTYPE RichEditOleCallbackImpl_GetClipboardData(IRichEditOleCallback *iface, CHARRANGE *chrg, DWORD reco, LPDATAOBJECT *dataobj) +{ + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE RichEditOleCallbackImpl_GetDragDropEffect(IRichEditOleCallback *iface, BOOL drag, DWORD key_state, LPDWORD effect) +{ + if (effect) *effect = DROPEFFECT_COPY; + return S_OK; +} + +static HRESULT STDMETHODCALLTYPE RichEditOleCallbackImpl_GetContextMenu(IRichEditOleCallback *iface, WORD seltype, LPOLEOBJECT oleobj, CHARRANGE *chrg, HMENU *hmenu) +{ + return E_NOTIMPL; +} + +static const struct IRichEditOleCallbackVtbl RichEditOleCallbackImpl_Vtbl = { + RichEditOleCallbackImpl_QueryInterface, + RichEditOleCallbackImpl_AddRef, + RichEditOleCallbackImpl_Release, + RichEditOleCallbackImpl_GetNewStorage, + RichEditOleCallbackImpl_GetInPlaceContext, + RichEditOleCallbackImpl_ShowContainerUI, + RichEditOleCallbackImpl_QueryInsertObject, + RichEditOleCallbackImpl_DeleteObject, + RichEditOleCallbackImpl_QueryAcceptData, + RichEditOleCallbackImpl_ContextSensitiveHelp, + RichEditOleCallbackImpl_GetClipboardData, + RichEditOleCallbackImpl_GetDragDropEffect, + RichEditOleCallbackImpl_GetContextMenu, +}; + +static HRESULT RichEditOleCallbackImpl_Create(struct IRichEditOleCallbackImpl **objptr) +{ + struct IRichEditOleCallbackImpl *obj; + + obj = calloc(sizeof(struct IRichEditOleCallbackImpl), 1); + if (!obj) return E_OUTOFMEMORY; + + obj->IRichEditOleCallback_iface.lpVtbl = &RichEditOleCallbackImpl_Vtbl; + obj->ref = 1; + + *objptr = obj; + return S_OK; +} + +static void olecb_expect_QueryInsertObject(struct IRichEditOleCallbackImpl *This, int line, ULONG expect, const CLSID *clsid, LPSTORAGE stg, LONG cp, HRESULT result) +{ + if (!This) return; + + This->line = line; + This->expect_queryinsertobject = expect; + This->clsid = clsid; + This->stg = stg; + This->cp = cp; + This->queryinsertobject_result = result; +} + +static void olecb_check_QueryInsertObject(struct IRichEditOleCallbackImpl *This, int line) +{ + if (!This) return; + + todo_wine_if(This->expect_queryinsertobject & EXPECT_TODO_WINE) + ok(!(This->expect_queryinsertobject & ~EXPECT_TODO_WINE), "expected IRichEditOleCallback_QueryInsertObject to be called\n"); + + olecb_expect_QueryInsertObject(This, 0, 0, NULL, NULL, 0, S_OK); +} + static HMODULE hmoduleRichEdit; DEFINE_GUID(GUID_NULL, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0); @@ -3233,21 +3396,24 @@ static void _check_reobject_struct(IRichEditOle *reole, LONG index, DWORD flags, ok_(__FILE__,line)(reobj.dwUser == user, "got wrong user-defined value.\n"); } -#define INSERT_REOBJECT(reole,reobj,cp,user) \ - _insert_reobject(reole, reobj, cp, user, __LINE__) -static void _insert_reobject(IRichEditOle *reole, REOBJECT *reobj, LONG cp, DWORD user, int line) +#define INSERT_REOBJECT(callback,reole,reobj,cp,user) \ + _insert_reobject(callback, reole, reobj, cp, user, __LINE__) +static void _insert_reobject(struct IRichEditOleCallbackImpl *callback, IRichEditOle *reole, REOBJECT *reobj, LONG cp, DWORD user, int line) { IOleClientSite *clientsite; HRESULT hr; + + olecb_expect_QueryInsertObject(callback, line, EXPECT_TODO_WINE | 1, &CLSID_NULL, NULL, REO_CP_SELECTION /* cp overriden */, S_OK); hr = IRichEditOle_GetClientSite(reole, &clientsite); ok_(__FILE__,line)(hr == S_OK, "IRichEditOle_GetClientSite got hr %#lx.\n", hr); fill_reobject_struct(reobj, cp, NULL, NULL, clientsite, 10, 10, DVASPECT_CONTENT, 0, user); hr = IRichEditOle_InsertObject(reole, reobj); ok_(__FILE__,line)(hr == S_OK, "IRichEditOle_InsertObject got hr %#lx.\n", hr); IOleClientSite_Release(clientsite); + olecb_check_QueryInsertObject(callback, line); } -static void test_InsertObject(void) +static void subtest_InsertObject(struct IRichEditOleCallbackImpl *callback) { static CHAR test_text1[] = "abcdefg"; IRichEditOle *reole = NULL; @@ -3271,6 +3437,12 @@ static void test_InsertObject(void) BSTR bstr; create_interfaces(&hwnd, &reole, &doc, &selection); + if (callback) + { + LRESULT sendres = SendMessageA(hwnd, EM_SETOLECALLBACK, 0, (LPARAM)&callback->IRichEditOleCallback_iface); + ok( !!sendres, "EM_SETOLECALLBACK should succeed\n" ); + } + SendMessageA(hwnd, WM_SETTEXT, 0, (LPARAM)test_text1); hr = IRichEditOle_InsertObject(reole, NULL); @@ -3278,22 +3450,47 @@ static void test_InsertObject(void) /* insert object1 in (0, 1)*/ SendMessageA(hwnd, EM_SETSEL, 0, 1); - INSERT_REOBJECT(reole, &reo1, REO_CP_SELECTION, 1); + INSERT_REOBJECT(callback, reole, &reo1, REO_CP_SELECTION, 1); count = IRichEditOle_GetObjectCount(reole); ok(count == 1, "got wrong object count: %ld\n", count); /* insert object2 in (2, 3)*/ SendMessageA(hwnd, EM_SETSEL, 2, 3); - INSERT_REOBJECT(reole, &reo2, REO_CP_SELECTION, 2); + INSERT_REOBJECT(callback, reole, &reo2, REO_CP_SELECTION, 2); count = IRichEditOle_GetObjectCount(reole); ok(count == 2, "got wrong object count: %ld\n", count); /* insert object3 in (1, 2)*/ SendMessageA(hwnd, EM_SETSEL, 1, 2); - INSERT_REOBJECT(reole, &reo3, REO_CP_SELECTION, 3); + INSERT_REOBJECT(callback, reole, &reo3, REO_CP_SELECTION, 3); count = IRichEditOle_GetObjectCount(reole); ok(count == 3, "got wrong object count: %ld\n", count); + if (callback) + { + IOleClientSite *clientsite; + REOBJECT reobj; + + /* (fail to) insert object1 in (3, 4)*/ + SendMessageA(hwnd, EM_SETSEL, 3, 4); + + hr = IRichEditOle_GetClientSite(reole, &clientsite); + ok(hr == S_OK, "IRichEditOle_GetClientSite got hr %#lx.\n", hr); + + olecb_expect_QueryInsertObject(callback, __LINE__, EXPECT_TODO_WINE | 1, &CLSID_NULL, NULL, REO_CP_SELECTION, S_FALSE); + fill_reobject_struct(&reobj, REO_CP_SELECTION, NULL, NULL, clientsite, 10, 10, DVASPECT_CONTENT, 0, 0); + hr = IRichEditOle_InsertObject(reole, &reobj); + todo_wine + ok(hr == S_FALSE, "IRichEditOle_InsertObject got hr %#lx.\n", hr); + olecb_check_QueryInsertObject(callback, __LINE__); + + IOleClientSite_Release(clientsite); + + count = IRichEditOle_GetObjectCount(reole); + todo_wine + ok(count == 3, "got wrong object count: %ld\n", count); + } + /* tests below show that order of rebject (from 0 to 2) is: reo1,reo3,reo2 */ CHECK_REOBJECT_STRUCT(reole, 0, REO_GETOBJ_ALL_INTERFACES, 0, 0, NULL, NULL, reo1.polesite, 1); CHECK_REOBJECT_STRUCT(reole, 1, REO_GETOBJ_ALL_INTERFACES, 0, 1, NULL, NULL, reo3.polesite, 3); @@ -3371,8 +3568,8 @@ static void test_InsertObject(void) SendMessageA(hwnd, WM_SETTEXT, 0, (LPARAM)test_text1); /* "abc|d|efg" */ - INSERT_REOBJECT(reole, &reo1, 3, 1); - INSERT_REOBJECT(reole, &reo2, 5, 2); + INSERT_REOBJECT(callback, reole, &reo1, 3, 1); + INSERT_REOBJECT(callback, reole, &reo2, 5, 2); SendMessageW(hwnd, EM_SETSEL, 2, 3); result = SendMessageW(hwnd, EM_SELECTIONTYPE, 0, 0); @@ -3473,8 +3670,8 @@ static void test_InsertObject(void) ok(!result, "Got result %lx.\n", result); /* "abc|d|efg" */ SendMessageA(hwnd, WM_SETTEXT, 0, (LPARAM)test_text1); - INSERT_REOBJECT(reole, &reo1, 3, 1); - INSERT_REOBJECT(reole, &reo2, 5, 2); + INSERT_REOBJECT(callback, reole, &reo1, 3, 1); + INSERT_REOBJECT(callback, reole, &reo2, 5, 2); expected_string = L"abc d efg"; charrange.cpMin = 0; @@ -3551,9 +3748,37 @@ static void test_InsertObject(void) ok(hr == S_OK, "Got hr %#lx.\n", hr); todo_wine ok(result == 0xfffc, "Got char: %lc\n", (WCHAR)result); + if (callback) + { + LRESULT sendres = SendMessageA(hwnd, EM_SETOLECALLBACK, 0, 0); + ok( !!sendres, "EM_SETOLECALLBACK should succeed\n" ); + } + release_interfaces(&hwnd, &reole, &doc, &selection); } +static void test_InsertObject(void) +{ + struct IRichEditOleCallbackImpl *callback; + HRESULT hr; + ULONG ref; + + subtest_InsertObject(NULL); + + hr = RichEditOleCallbackImpl_Create(&callback); + ok(SUCCEEDED(hr), "RichEditOleCallbackImpl_Create returned %#lx\n", hr); + if (SUCCEEDED(hr)) + { + subtest_InsertObject(callback); + ref = IRichEditOleCallback_Release(&callback->IRichEditOleCallback_iface); + ok(ref == 0, "expected IRichEditOleCallback recount to be 0, got %lu\n", ref); + } + else + { + skip("cannot test InsertObject with callback\n"); + } +} + static void test_GetStoryLength(void) { static const CHAR test_text1[] = "TestSomeText"; -- 2.34.1

2 2

[PATCH 1/2] user32/tests: Test NUMCOLORS for display DCs.
by Zhiyi Zhang 07 Apr '22

07 Apr '22

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/tests/monitor.c | 79 ++++++++++++++++++++++++++++++++++++- 1 file changed, 78 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index d0d4ff1f324..1d88afafb18 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -2193,8 +2193,10 @@ static void _check_display_dc(INT line, HDC hdc, const DEVMODEA *dm, BOOL allow_ static void test_display_dc(void) { static const INT bpps[] = {1, 4, 8, 16, 24, 32}; + unsigned char buffer[sizeof(BITMAPINFOHEADER) + 256 * sizeof(RGBQUAD)]; + BITMAPINFO *bmi = (BITMAPINFO *)buffer; + INT count, old_count, i, bpp, value; HBITMAP hbitmap, old_hbitmap; - INT count, old_count, i, bpp; DWORD device_idx, mode_idx; DEVMODEA dm, dm2, dm3; DISPLAY_DEVICEA dd; @@ -2247,6 +2249,81 @@ static void test_display_dc(void) winetest_pop_context(); } + /* Test selecting a DIB of a different depth into a display compatible DC */ + for (i = 0; i < ARRAY_SIZE(bpps); ++i) + { + winetest_push_context("bpp %d", bpps[i]); + + mem_dc = CreateCompatibleDC(hdc); + memset(buffer, 0, sizeof(buffer)); + bmi->bmiHeader.biSize = sizeof(bmi->bmiHeader); + bmi->bmiHeader.biWidth = dm.dmPelsWidth; + bmi->bmiHeader.biHeight = dm.dmPelsHeight; + bmi->bmiHeader.biBitCount = bpps[i]; + bmi->bmiHeader.biPlanes = 1; + bmi->bmiHeader.biCompression = BI_RGB; + hbitmap = CreateDIBSection(hdc, bmi, DIB_RGB_COLORS, NULL, NULL, 0); + ok(!!hbitmap, "CreateDIBSection failed, error %ld.\n", GetLastError()); + old_hbitmap = SelectObject(mem_dc, hbitmap); + ok(!!old_hbitmap, "Failed to select bitmap.\n"); + + value = GetDeviceCaps(mem_dc, BITSPIXEL); + ok(value == 32, "Expected 32, got %d.\n", value); + value = GetDeviceCaps(mem_dc, NUMCOLORS); + ok(value == -1, "Expected -1, got %d.\n", value); + + SelectObject(mem_dc, old_hbitmap); + DeleteObject(hbitmap); + DeleteDC(mem_dc); + + winetest_pop_context(); + } + + /* Test NUMCOLORS for display DCs */ + for (i = 0; i < ARRAY_SIZE(bpps); ++i) + { + winetest_push_context("bpp %d", bpps[i]); + + memset(&dm2, 0, sizeof(dm2)); + dm2.dmSize = sizeof(dm2); + for (mode_idx = 0; EnumDisplaySettingsA(NULL, mode_idx, &dm2); ++mode_idx) + { + if (dm2.dmBitsPerPel == bpps[i]) + break; + } + if (dm2.dmBitsPerPel != bpps[i]) + { + skip("%d-bit display mode not found.\n", bpps[i]); + winetest_pop_context(); + continue; + } + + res = ChangeDisplaySettingsExA(NULL, &dm2, NULL, CDS_RESET, NULL); + /* Win8 TestBots */ + ok(res == DISP_CHANGE_SUCCESSFUL || broken(res == DISP_CHANGE_FAILED), + "ChangeDisplaySettingsExA returned unexpected %ld.\n", res); + if (res == DISP_CHANGE_SUCCESSFUL) + { + value = GetDeviceCaps(hdc, BITSPIXEL); + ok(value == (bpps[i] == 4 ? 1 : bpps[i]), "Expected %d, got %d.\n", + (bpps[i] == 4 ? 1 : bpps[i]), value); + + value = GetDeviceCaps(hdc, NUMCOLORS); + if (bpps[i] > 8 || (bpps[i] == 8 && LOBYTE(LOWORD(GetVersion())) >= 6)) + todo_wine_if(bpps[i] == 8 && LOBYTE(LOWORD(GetVersion())) >= 6) + ok(value == -1, "Expected -1, got %d.\n", value); + else if (bpps[i] == 8 && LOBYTE(LOWORD(GetVersion())) < 6) + ok(value > 16 && value <= 256, "Got %d.\n", value); + else + ok(value == 1 << bpps[i], "Expected %d, got %d.\n", 1 << bpps[i], value); + + res = ChangeDisplaySettingsExA(NULL, NULL, NULL, 0, NULL); + ok(res == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsExA returned unexpected %ld.\n", + res); + } + winetest_pop_context(); + } + /* Test selecting a DDB of the same color depth into a display compatible DC */ mem_dc = CreateCompatibleDC(hdc); bpp = GetDeviceCaps(mem_dc, BITSPIXEL); -- 2.32.0

2 1

[PATCH v2] combase/tests: Add some RoGetActivationFactory tests with manifest.
by Rémi Bernon 07 Apr '22

07 Apr '22

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- v2: Add broken results for older w10 versions which did not support the activatableClass manifest entry. dlls/combase/tests/Makefile.in | 7 +- dlls/combase/tests/combase.manifest | 15 ++ dlls/combase/tests/combase.rc | 22 +++ dlls/combase/tests/roapi.c | 59 ++++++++ dlls/combase/tests/wine.combase.test.c | 159 ++++++++++++++++++++++ dlls/combase/tests/wine.combase.test.spec | 3 + 6 files changed, 263 insertions(+), 2 deletions(-) create mode 100644 dlls/combase/tests/combase.manifest create mode 100644 dlls/combase/tests/combase.rc create mode 100644 dlls/combase/tests/wine.combase.test.c create mode 100644 dlls/combase/tests/wine.combase.test.spec diff --git a/dlls/combase/tests/Makefile.in b/dlls/combase/tests/Makefile.in index 1c3d77725b3..99c036b78d9 100644 --- a/dlls/combase/tests/Makefile.in +++ b/dlls/combase/tests/Makefile.in @@ -1,6 +1,9 @@ TESTDLL = combase.dll IMPORTS = combase -C_SRCS = \ +SOURCES = \ roapi.c \ - string.c + string.c \ + combase.rc \ + wine.combase.test.c \ + wine.combase.test.spec diff --git a/dlls/combase/tests/combase.manifest b/dlls/combase/tests/combase.manifest new file mode 100644 index 00000000000..72f3ac915e0 --- /dev/null +++ b/dlls/combase/tests/combase.manifest @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> + <assemblyIdentity + type="win32" + name="wine.combase.test" + version="1.0.0.0" + processorArchitecture="*" + /> +<description>Wine combase test suite</description> +<file name="wine.combase.test.dll"> + <activatableClass name="Wine.Test.Missing" threadingModel="both" xmlns="urn:schemas-microsoft-com:winrt.v1"/> + <activatableClass name="Wine.Test.Class" threadingModel="both" xmlns="urn:schemas-microsoft-com:winrt.v1"/> + <activatableClass name="Wine.Test.Trusted" threadingModel="both" xmlns="urn:schemas-microsoft-com:winrt.v1"/> +</file> +</assembly> diff --git a/dlls/combase/tests/combase.rc b/dlls/combase/tests/combase.rc new file mode 100644 index 00000000000..865bf703d5c --- /dev/null +++ b/dlls/combase/tests/combase.rc @@ -0,0 +1,22 @@ +/* + * Copyright 2022 Rémi Bernon 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 "winuser.h" + +/* @makedep: combase.manifest */ +1 RT_MANIFEST combase.manifest diff --git a/dlls/combase/tests/roapi.c b/dlls/combase/tests/roapi.c index b1ac15a08cb..579b1502797 100644 --- a/dlls/combase/tests/roapi.c +++ b/dlls/combase/tests/roapi.c @@ -28,12 +28,31 @@ #include "wine/test.h" +static void load_resource(const WCHAR *filename) +{ + DWORD written; + HANDLE file; + HRSRC res; + void *ptr; + + file = CreateFileW(filename, GENERIC_READ | GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0); + ok(file != INVALID_HANDLE_VALUE, "failed to create %s, error %lu\n", debugstr_w(filename), GetLastError()); + + res = FindResourceW(NULL, filename, L"TESTDLL"); + ok(res != 0, "couldn't find resource\n"); + ptr = LockResource(LoadResource(GetModuleHandleW(NULL), res)); + WriteFile(file, ptr, SizeofResource(GetModuleHandleW(NULL), res), &written, NULL); + ok(written == SizeofResource(GetModuleHandleW(NULL), res), "couldn't write resource\n"); + CloseHandle(file); +} + static void test_ActivationFactories(void) { HRESULT hr; HSTRING str, str2; IActivationFactory *factory = NULL; IInspectable *inspect = NULL; + ULONG ref; hr = WindowsCreateString(L"Windows.Data.Xml.Dom.XmlDocument", ARRAY_SIZE(L"Windows.Data.Xml.Dom.XmlDocument") - 1, &str); @@ -63,10 +82,50 @@ static void test_ActivationFactories(void) WindowsDeleteString(str2); WindowsDeleteString(str); + + hr = WindowsCreateString(L"Wine.Test.Missing", ARRAY_SIZE(L"Wine.Test.Missing") - 1, &str); + ok(hr == S_OK, "WindowsCreateString returned %#lx.\n", hr); + hr = RoGetActivationFactory(str, &IID_IActivationFactory, (void **)&factory); + ok(hr == REGDB_E_CLASSNOTREG, "RoGetActivationFactory returned %#lx.\n", hr); + ok(factory == NULL, "got factory %p.\n", factory); + WindowsDeleteString(str); + hr = WindowsCreateString(L"Wine.Test.Class", ARRAY_SIZE(L"Wine.Test.Class") - 1, &str); + ok(hr == S_OK, "WindowsCreateString returned %#lx.\n", hr); + hr = RoGetActivationFactory(str, &IID_IActivationFactory, (void **)&factory); + todo_wine + ok(hr == E_NOTIMPL || broken(hr == REGDB_E_CLASSNOTREG) /* <= w1064v1809 */, + "RoGetActivationFactory returned %#lx.\n", hr); + ok(factory == NULL, "got factory %p.\n", factory); + WindowsDeleteString(str); + hr = WindowsCreateString(L"Wine.Test.Trusted", ARRAY_SIZE(L"Wine.Test.Trusted") - 1, &str); + ok(hr == S_OK, "WindowsCreateString returned %#lx.\n", hr); + hr = RoGetActivationFactory(str, &IID_IActivationFactory, (void **)&factory); + todo_wine + ok(hr == S_OK || broken(hr == REGDB_E_CLASSNOTREG) /* <= w1064v1809 */, + "RoGetActivationFactory returned %#lx.\n", hr); + if (hr == REGDB_E_CLASSNOTREG) + ok(!factory, "got factory %p.\n", factory); + else + { + todo_wine + ok(!!factory, "got factory %p.\n", factory); + } + if (!factory) ref = 0; + else ref = IActivationFactory_Release(factory); + ok(ref == 0, "Release returned %lu\n", ref); + WindowsDeleteString(str); + RoUninitialize(); } START_TEST(roapi) { + BOOL ret; + + load_resource(L"wine.combase.test.dll"); + test_ActivationFactories(); + + ret = DeleteFileW(L"wine.combase.test.dll"); + ok(ret, "Failed to delete file, error %lu\n", GetLastError()); } diff --git a/dlls/combase/tests/wine.combase.test.c b/dlls/combase/tests/wine.combase.test.c new file mode 100644 index 00000000000..e6171c6c6e7 --- /dev/null +++ b/dlls/combase/tests/wine.combase.test.c @@ -0,0 +1,159 @@ +/* + * Copyright 2022 Rémi Bernon 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 <stddef.h> + +#define COBJMACROS +#include "windef.h" +#include "winbase.h" + +#include "initguid.h" +#include "inspectable.h" +#include "roapi.h" +#include "winstring.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(combase); + +struct factory +{ + IActivationFactory IActivationFactory_iface; + LONG ref; + BOOL trusted; +}; + +static inline struct factory *impl_from_IActivationFactory(IActivationFactory *iface) +{ + return CONTAINING_RECORD(iface, struct factory, IActivationFactory_iface); +} + +static HRESULT WINAPI factory_QueryInterface(IActivationFactory *iface, REFIID iid, void **out) +{ + struct factory *impl = impl_from_IActivationFactory(iface); + + TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); + + if (IsEqualGUID(iid, &IID_IUnknown) + || IsEqualGUID(iid, &IID_IInspectable) + || IsEqualGUID(iid, &IID_IAgileObject) + || IsEqualGUID(iid, &IID_IActivationFactory)) + { + IInspectable_AddRef((*out = &impl->IActivationFactory_iface)); + return S_OK; + } + + FIXME("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); + *out = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI factory_AddRef(IActivationFactory *iface) +{ + struct factory *impl = impl_from_IActivationFactory(iface); + ULONG ref = InterlockedIncrement(&impl->ref); + TRACE("iface %p increasing refcount to %lu.\n", iface, ref); + return ref; +} + +static ULONG WINAPI factory_Release(IActivationFactory *iface) +{ + struct factory *impl = impl_from_IActivationFactory(iface); + ULONG ref = InterlockedDecrement(&impl->ref); + TRACE("iface %p decreasing refcount to %lu.\n", iface, ref); + return ref; +} + +static HRESULT WINAPI factory_GetIids(IActivationFactory *iface, ULONG *iid_count, IID **iids) +{ + FIXME("iface %p, iid_count %p, iids %p stub!\n", iface, iid_count, iids); + return E_NOTIMPL; +} + +static HRESULT WINAPI factory_GetRuntimeClassName(IActivationFactory *iface, HSTRING *class_name) +{ + FIXME("iface %p, class_name %p stub!\n", iface, class_name); + return E_NOTIMPL; +} + +static HRESULT WINAPI factory_GetTrustLevel(IActivationFactory *iface, TrustLevel *trust_level) +{ + struct factory *impl = impl_from_IActivationFactory(iface); + + FIXME("iface %p, trust_level %p stub!\n", iface, trust_level); + + if (!impl->trusted) return E_NOTIMPL; + + *trust_level = BaseTrust; + return S_OK; +} + +static HRESULT WINAPI factory_ActivateInstance(IActivationFactory *iface, IInspectable **instance) +{ + FIXME("iface %p, instance %p stub!\n", iface, instance); + return E_NOTIMPL; +} + +static const struct IActivationFactoryVtbl factory_vtbl = +{ + factory_QueryInterface, + factory_AddRef, + factory_Release, + /* IInspectable methods */ + factory_GetIids, + factory_GetRuntimeClassName, + factory_GetTrustLevel, + /* IActivationFactory methods */ + factory_ActivateInstance, +}; + +static struct factory class_factory = {{&factory_vtbl}, 0}; +static struct factory trusted_factory = {{&factory_vtbl}, 0, TRUE}; + +HRESULT WINAPI DllCanUnloadNow(void) +{ + FIXME("stub!\n"); + return S_OK; +} + +HRESULT WINAPI DllGetActivationFactory(HSTRING classid, IActivationFactory **factory) +{ + const WCHAR *buffer = WindowsGetStringRawBuffer(classid, NULL); + + FIXME("class %s, factory %p stub!\n", debugstr_w(buffer), factory); + + if (!wcscmp(buffer, L"Wine.Test.Class")) + { + IActivationFactory_AddRef((*factory = &class_factory.IActivationFactory_iface)); + return S_OK; + } + if (!wcscmp(buffer, L"Wine.Test.Trusted")) + { + IActivationFactory_AddRef((*factory = &trusted_factory.IActivationFactory_iface)); + return S_OK; + } + + return REGDB_E_CLASSNOTREG; +} + +HRESULT WINAPI DllGetClassObject(REFCLSID clsid, REFIID riid, void **out) +{ + FIXME("clsid %s, riid %s, out %p stub!\n", debugstr_guid(clsid), debugstr_guid(riid), out); + return CLASS_E_CLASSNOTAVAILABLE; +} diff --git a/dlls/combase/tests/wine.combase.test.spec b/dlls/combase/tests/wine.combase.test.spec new file mode 100644 index 00000000000..20a8bfa98ea --- /dev/null +++ b/dlls/combase/tests/wine.combase.test.spec @@ -0,0 +1,3 @@ +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetActivationFactory(ptr ptr) +@ stdcall -private DllGetClassObject(ptr ptr ptr) -- 2.35.1

2 1

[PATCH] dlls/iphlpapi: don't cast SIZE_T to DWORD in trace, use %I instead
by Eric Pouech 07 Apr '22

07 Apr '22

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/iphlpapi/iphlpapi_main.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index afc400d26c1c..0bd7cdc06c89 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -4183,7 +4183,7 @@ DWORD WINAPI ConvertInterfaceLuidToAlias( const NET_LUID *luid, WCHAR *alias, SI DWORD err; IF_COUNTED_STRING name; - TRACE( "(%p %p %lu)\n", luid, alias, (DWORD)len ); + TRACE( "(%p %p %Iu)\n", luid, alias, len ); if (!luid || !alias) return ERROR_INVALID_PARAMETER; @@ -4243,7 +4243,7 @@ DWORD WINAPI ConvertInterfaceLuidToNameA(const NET_LUID *luid, char *name, SIZE_ DWORD err; WCHAR nameW[IF_MAX_STRING_SIZE + 1]; - TRACE( "(%p %p %lu)\n", luid, name, (DWORD)len ); + TRACE( "(%p %p %Iu)\n", luid, name, len ); if (!luid) return ERROR_INVALID_PARAMETER; if (!name || !len) return ERROR_NOT_ENOUGH_MEMORY; @@ -4283,7 +4283,7 @@ DWORD WINAPI ConvertInterfaceLuidToNameW(const NET_LUID *luid, WCHAR *name, SIZE const WCHAR *prefix = NULL; WCHAR buf[IF_MAX_STRING_SIZE + 1]; - TRACE( "(%p %p %lu)\n", luid, name, (DWORD)len ); + TRACE( "(%p %p %Iu)\n", luid, name, len ); if (!luid || !name) return ERROR_INVALID_PARAMETER;

2 1

[PATCH] dlls/schedvc: don't cast size_t to DWORD in trace, use %I instead
by Eric Pouech 07 Apr '22

07 Apr '22

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/schedsvc/atsvc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/schedsvc/atsvc.c b/dlls/schedsvc/atsvc.c index 0a47e37089bc..e8ea1b25c6f7 100644 --- a/dlls/schedsvc/atsvc.c +++ b/dlls/schedsvc/atsvc.c @@ -491,8 +491,8 @@ static BOOL load_job_data(const char *data, DWORD size, struct job_t *info) data += sizeof(USHORT) + data_size; /* Trigger Data */ - TRACE("trigger_offset %04x, triggers end at %04lx\n", fixed->trigger_offset, - (DWORD)(fixed->trigger_offset + sizeof(USHORT) + info->trigger_count * sizeof(TASK_TRIGGER))); + TRACE("trigger_offset %04x, triggers end at %04Ix\n", fixed->trigger_offset, + fixed->trigger_offset + sizeof(USHORT) + info->trigger_count * sizeof(TASK_TRIGGER)); info->trigger_count = *(const USHORT *)data; TRACE("trigger_count %u\n", info->trigger_count);

1 0

[PATCH] dlls/mstask: don't cast size_t to DWORD in trace, use %I instead
by Eric Pouech 07 Apr '22

07 Apr '22

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/mstask/task.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mstask/task.c b/dlls/mstask/task.c index 23e9af7f0f37..72592b27c094 100644 --- a/dlls/mstask/task.c +++ b/dlls/mstask/task.c @@ -1396,8 +1396,8 @@ static HRESULT load_job_data(TaskImpl *This, BYTE *data, DWORD size) data += sizeof(USHORT) + data_size; /* Trigger Data */ - TRACE("trigger_offset %04x, triggers end at %04lx\n", fixed->trigger_offset, - (DWORD)(fixed->trigger_offset + sizeof(USHORT) + trigger_count * sizeof(TASK_TRIGGER))); + TRACE("trigger_offset %04x, triggers end at %04Ix\n", fixed->trigger_offset, + fixed->trigger_offset + sizeof(USHORT) + trigger_count * sizeof(TASK_TRIGGER)); task_trigger = (TASK_TRIGGER *)(data + sizeof(USHORT));

1 0

[PATCH] msvcrt: SSE2 implementation of memcmp for x86_64.
by Jan Sikorski 07 Apr '22

07 Apr '22

Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> --- It's about 13x faster on my machine than the byte version. memcmp performance is important to wined3d, where it's used to find pipelines in the cache, and the keys are pretty big. --- dlls/msvcrt/string.c | 46 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index 3b352ac0bf2..66761e7a282 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -34,6 +34,10 @@ #include "wine/asm.h" #include "wine/debug.h" +#ifdef __x86_64__ +#include <immintrin.h> +#endif + WINE_DEFAULT_DEBUG_CHANNEL(msvcrt); /********************************************************************* @@ -2675,11 +2679,52 @@ int CDECL I10_OUTPUT(MSVCRT__LDOUBLE ld80, int prec, int flag, struct _I10_OUTPU } #undef I10_OUTPUT_MAX_PREC +#ifdef __x86_64__ +static int sse2_memcmp(const void *p1, const void *p2, size_t size) +{ + const unsigned char *first = p1, *second = p2; + size_t remainder = size & 0xf; + size_t size_16 = size / 16; + uint16_t mask; + DWORD index; + + while (size_16-- > 0) + { + __m128i value_1 = _mm_loadu_si128((__m128i *)first); + __m128i value_2 = _mm_loadu_si128((__m128i *)second); + __m128i compare = _mm_cmpeq_epi8(value_1, value_2); + if ((mask = ~_mm_movemask_epi8(compare))) + { + _BitScanForward(&index, mask); + if (first[index] < second[index]) return -1; + else return 1; + } + + first += 16; + second += 16; + } + + while (remainder-- > 0) + { + if (*first < *second) return -1; + if (*first > *second) return 1; + + first++; + second++; + } + + return 0; +} +#endif + /********************************************************************* * memcmp (MSVCRT.@) */ int __cdecl memcmp(const void *ptr1, const void *ptr2, size_t n) { +#ifdef __x86_64__ + return sse2_memcmp(ptr1, ptr2, n); +#else const unsigned char *p1, *p2; for (p1 = ptr1, p2 = ptr2; n; n--, p1++, p2++) @@ -2688,6 +2733,7 @@ int __cdecl memcmp(const void *ptr1, const void *ptr2, size_t n) if (*p1 > *p2) return 1; } return 0; +#endif } #if defined(__i386__) || defined(__x86_64__) -- 2.32.0

7 16

[PATCH v4 1/2] ncrypt: Implement NCryptIsAlgSupported.
by Mohamad Al-Jaf 07 Apr '22

07 Apr '22

Microsoft Edge calls this function expecting an implementation. With this, Internet browsing works. Signed-off-by: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> --- v3: - Retrieve a list using bitwise operation in BCryptEnumAlgorithms. - Use proper NTSTATUS. v4: - Return NTE_NOT_SUPPORTED for BCRYPT_RSA_SIGN_ALGORITHM after checking for bad flags. Sorry, I only realized to test this behavior after submitting the patch. I thought there would be no point in checking if the flags are bad if the algorithm isn't even supported to begin with. --- dlls/ncrypt/main.c | 44 +++++++++++++++++++++++++++++++++++++++-- dlls/ncrypt/ncrypt.spec | 2 +- include/ncrypt.h | 1 + 3 files changed, 44 insertions(+), 3 deletions(-) diff --git a/dlls/ncrypt/main.c b/dlls/ncrypt/main.c index e12284e0867..10cec633269 100644 --- a/dlls/ncrypt/main.c +++ b/dlls/ncrypt/main.c @@ -416,8 +416,48 @@ SECURITY_STATUS WINAPI NCryptImportKey(NCRYPT_PROV_HANDLE provider, NCRYPT_KEY_H SECURITY_STATUS WINAPI NCryptIsAlgSupported(NCRYPT_PROV_HANDLE provider, const WCHAR *algid, DWORD flags) { - FIXME("(%#Ix, %s, %#lx): stub\n", provider, wine_dbgstr_w(algid), flags); - return NTE_NOT_SUPPORTED; + static const ULONG supported = BCRYPT_CIPHER_OPERATION |\ + BCRYPT_ASYMMETRIC_ENCRYPTION_OPERATION |\ + BCRYPT_SIGNATURE_OPERATION |\ + BCRYPT_SECRET_AGREEMENT_OPERATION; + BCRYPT_ALGORITHM_IDENTIFIER *list; + ULONG i, count; + NTSTATUS status; + + TRACE("(%#Ix, %s, %#lx)\n", provider, wine_dbgstr_w(algid), flags); + + if (!provider) return NTE_INVALID_HANDLE; + if (!algid) return HRESULT_FROM_WIN32(RPC_X_NULL_REF_POINTER); + if (flags == NCRYPT_SILENT_FLAG) + { + FIXME("Silent flag not implemented\n"); + } + else if (flags) + { + WARN("Invalid flags %#lx\n", flags); + return NTE_BAD_FLAGS; + } + if (!lstrcmpiW(BCRYPT_RSA_SIGN_ALGORITHM, algid)) return NTE_NOT_SUPPORTED; + + status = BCryptEnumAlgorithms(supported, &count, &list, 0); + if (status != STATUS_SUCCESS) + { + ERR("Error retrieving algorithm list %#lx\n", status); + return map_ntstatus(status); + } + + status = STATUS_NOT_SUPPORTED; + for (i = 0; i < count; i++) + { + if (!lstrcmpiW(list[i].pszName, algid)) + { + status = STATUS_SUCCESS; + break; + } + } + + BCryptFreeBuffer(list); + return map_ntstatus(status); } BOOL WINAPI NCryptIsKeyHandle(NCRYPT_KEY_HANDLE hKey) diff --git a/dlls/ncrypt/ncrypt.spec b/dlls/ncrypt/ncrypt.spec index bb914616373..60b367260d5 100644 --- a/dlls/ncrypt/ncrypt.spec +++ b/dlls/ncrypt/ncrypt.spec @@ -77,7 +77,7 @@ @ stdcall NCryptGetProperty(ptr wstr ptr long ptr long) @ stub NCryptGetProtectionDescriptorInfo @ stdcall NCryptImportKey(long long wstr ptr ptr ptr long long) -@ stub NCryptIsAlgSupported(long wstr long) +@ stdcall NCryptIsAlgSupported(long wstr long) @ stdcall NCryptIsKeyHandle(long) @ stub NCryptKeyDerivation @ stub NCryptNotifyChangeKey diff --git a/include/ncrypt.h b/include/ncrypt.h index c09a1ec8676..18198fdc5bb 100644 --- a/include/ncrypt.h +++ b/include/ncrypt.h @@ -118,6 +118,7 @@ SECURITY_STATUS WINAPI NCryptFreeObject(NCRYPT_HANDLE); SECURITY_STATUS WINAPI NCryptGetProperty(NCRYPT_HANDLE, const WCHAR *, BYTE *, DWORD, DWORD *, DWORD); SECURITY_STATUS WINAPI NCryptImportKey(NCRYPT_PROV_HANDLE, NCRYPT_KEY_HANDLE, const WCHAR *, NCryptBufferDesc *, NCRYPT_KEY_HANDLE *, BYTE *, DWORD, DWORD); +SECURITY_STATUS WINAPI NCryptIsAlgSupported(NCRYPT_PROV_HANDLE, const WCHAR *, DWORD); SECURITY_STATUS WINAPI NCryptOpenKey(NCRYPT_PROV_HANDLE, NCRYPT_KEY_HANDLE *, const WCHAR *, DWORD, DWORD); SECURITY_STATUS WINAPI NCryptOpenStorageProvider(NCRYPT_PROV_HANDLE *, const WCHAR *, DWORD); SECURITY_STATUS WINAPI NCryptSetProperty(NCRYPT_HANDLE, const WCHAR *, BYTE *, DWORD, DWORD); -- 2.35.1

1 1

[PATCH v3 1/2] ncrypt: Implement NCryptIsAlgSupported.
by Mohamad Al-Jaf 07 Apr '22

07 Apr '22

Microsoft Edge calls this function expecting an implementation. With this, Internet browsing works. Signed-off-by: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> --- v3: - Retrieve a list using bitwise operation in BCryptEnumAlgorithms. - Use proper NTSTATUS. --- dlls/ncrypt/main.c | 44 +++++++++++++++++++++++++++++++++++++++-- dlls/ncrypt/ncrypt.spec | 2 +- include/ncrypt.h | 1 + 3 files changed, 44 insertions(+), 3 deletions(-) diff --git a/dlls/ncrypt/main.c b/dlls/ncrypt/main.c index e12284e0867..85bf8cb7206 100644 --- a/dlls/ncrypt/main.c +++ b/dlls/ncrypt/main.c @@ -416,8 +416,48 @@ SECURITY_STATUS WINAPI NCryptImportKey(NCRYPT_PROV_HANDLE provider, NCRYPT_KEY_H SECURITY_STATUS WINAPI NCryptIsAlgSupported(NCRYPT_PROV_HANDLE provider, const WCHAR *algid, DWORD flags) { - FIXME("(%#Ix, %s, %#lx): stub\n", provider, wine_dbgstr_w(algid), flags); - return NTE_NOT_SUPPORTED; + static const ULONG supported = BCRYPT_CIPHER_OPERATION |\ + BCRYPT_ASYMMETRIC_ENCRYPTION_OPERATION |\ + BCRYPT_SIGNATURE_OPERATION |\ + BCRYPT_SECRET_AGREEMENT_OPERATION; + BCRYPT_ALGORITHM_IDENTIFIER *list; + ULONG i, count; + NTSTATUS status; + + TRACE("(%#Ix, %s, %#lx)\n", provider, wine_dbgstr_w(algid), flags); + + if (!provider) return NTE_INVALID_HANDLE; + if (!algid) return HRESULT_FROM_WIN32(RPC_X_NULL_REF_POINTER); + if (!lstrcmpiW(BCRYPT_RSA_SIGN_ALGORITHM, algid)) return NTE_NOT_SUPPORTED; + if (flags == NCRYPT_SILENT_FLAG) + { + FIXME("Silent flag not implemented\n"); + } + else if (flags) + { + WARN("Invalid flags %#lx\n", flags); + return NTE_BAD_FLAGS; + } + + status = BCryptEnumAlgorithms(supported, &count, &list, 0); + if (status != STATUS_SUCCESS) + { + ERR("Error retrieving algorithm list %#lx\n", status); + return map_ntstatus(status); + } + + status = STATUS_NOT_SUPPORTED; + for (i = 0; i < count; i++) + { + if (!lstrcmpiW(list[i].pszName, algid)) + { + status = STATUS_SUCCESS; + break; + } + } + + BCryptFreeBuffer(list); + return map_ntstatus(status); } BOOL WINAPI NCryptIsKeyHandle(NCRYPT_KEY_HANDLE hKey) diff --git a/dlls/ncrypt/ncrypt.spec b/dlls/ncrypt/ncrypt.spec index bb914616373..60b367260d5 100644 --- a/dlls/ncrypt/ncrypt.spec +++ b/dlls/ncrypt/ncrypt.spec @@ -77,7 +77,7 @@ @ stdcall NCryptGetProperty(ptr wstr ptr long ptr long) @ stub NCryptGetProtectionDescriptorInfo @ stdcall NCryptImportKey(long long wstr ptr ptr ptr long long) -@ stub NCryptIsAlgSupported(long wstr long) +@ stdcall NCryptIsAlgSupported(long wstr long) @ stdcall NCryptIsKeyHandle(long) @ stub NCryptKeyDerivation @ stub NCryptNotifyChangeKey diff --git a/include/ncrypt.h b/include/ncrypt.h index c09a1ec8676..18198fdc5bb 100644 --- a/include/ncrypt.h +++ b/include/ncrypt.h @@ -118,6 +118,7 @@ SECURITY_STATUS WINAPI NCryptFreeObject(NCRYPT_HANDLE); SECURITY_STATUS WINAPI NCryptGetProperty(NCRYPT_HANDLE, const WCHAR *, BYTE *, DWORD, DWORD *, DWORD); SECURITY_STATUS WINAPI NCryptImportKey(NCRYPT_PROV_HANDLE, NCRYPT_KEY_HANDLE, const WCHAR *, NCryptBufferDesc *, NCRYPT_KEY_HANDLE *, BYTE *, DWORD, DWORD); +SECURITY_STATUS WINAPI NCryptIsAlgSupported(NCRYPT_PROV_HANDLE, const WCHAR *, DWORD); SECURITY_STATUS WINAPI NCryptOpenKey(NCRYPT_PROV_HANDLE, NCRYPT_KEY_HANDLE *, const WCHAR *, DWORD, DWORD); SECURITY_STATUS WINAPI NCryptOpenStorageProvider(NCRYPT_PROV_HANDLE *, const WCHAR *, DWORD); SECURITY_STATUS WINAPI NCryptSetProperty(NCRYPT_HANDLE, const WCHAR *, BYTE *, DWORD, DWORD); -- 2.35.1

1 1

[tools] testbot/cgi: Clean up FormPage's property handling.
by Francois Gouget 06 Apr '22

06 Apr '22

Separate getting the value used by the form, from generating the HTML to display or edit it. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/ObjectModel/CGI/FormPage.pm | 191 +++++++++++++++--------- testbot/web/Submit.pl | 2 +- 2 files changed, 124 insertions(+), 69 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/FormPage.pm b/testbot/lib/ObjectModel/CGI/FormPage.pm index c6a8c6bf1..c41924433 100644 --- a/testbot/lib/ObjectModel/CGI/FormPage.pm +++ b/testbot/lib/ObjectModel/CGI/FormPage.pm @@ -222,6 +222,17 @@ sub GetPropertyValue($$) # Form field support # +=pod +=over 12 + +=item C<GetDisplayName()> + +Returns the unescaped property's label / description / user-friendly name. +Escaping the name for HTML is the responsibility of the caller. + +=back +=cut + sub GetDisplayName($$) { my ($self, $PropertyDescriptor) = @_; @@ -229,17 +240,54 @@ sub GetDisplayName($$) return $PropertyDescriptor->GetDisplayName(); } -sub GetDisplayValue($$) +=pod +=over 12 + +=item C<GetFormValue()> + +Returns the value to be used for this form's property. + +This is either the value received through the HTTP parameters, or if it was +not specified there, the underlying property value (see GetPropertyValue()). + +Converting that value into a form suitable for viewing (including escaping it +for HTML) or editing is the responsibility of GenerateValueView() and +GenerateValueInput() respectively. + +=back +=cut + +sub GetFormValue($$) { my ($self, $PropertyDescriptor) = @_; my $Value = $self->GetParam($PropertyDescriptor->GetName()); - if (!defined $Value) + return defined $Value ? $Value : + $self->GetPropertyValue($PropertyDescriptor); +} + +=pod +=over 12 + +=item C<GenerateValueView()> + +Generates an HTML snippet representing the value in a user-readable form. + +=back +=cut + +sub GenerateValueView($$$) +{ + my ($self, $PropertyDescriptor, $Value) = @_; + + if ($PropertyDescriptor->GetClass() eq "Basic") { - $Value = $self->GetPropertyValue($PropertyDescriptor); + if ($PropertyDescriptor->GetType() eq "B") + { + print $Value ? "Yes" : "No"; + } } - - return $Value; + print defined $Value ? $self->escapeHTML($Value) : " "; } sub GetInputType($$) @@ -276,85 +324,69 @@ sub GenerateRequired($$) } } -sub GenerateField($$$) -{ - my ($self, $PropertyDescriptor, $Display) = @_; +=pod +=over 12 - print "<div class='ItemProperty'><label>", - $self->escapeHTML($self->GetDisplayName($PropertyDescriptor)), - "</label>"; +=item C<GenerateValueInput()> - my $Value = $self->GetDisplayValue($PropertyDescriptor); - if ($Display eq "rw") +Generates an HTML snippet allowing the specified value to be edited. + +=back +=cut + +sub GenerateValueInput($$$) +{ + my ($self, $PropertyDescriptor, $Value) = @_; + + my $InputType = $self->GetInputType($PropertyDescriptor); + if ($InputType eq "checkbox") { - my $InputType = $self->GetInputType($PropertyDescriptor); - print "<div class='ItemValue'>"; - if ($InputType eq "checkbox") - { - print "<input type='checkbox' name='", $PropertyDescriptor->GetName(), - "' "; - if ($Value) - { - print "checked='checked' "; - } - print "/>"; - } - elsif ($InputType eq "select") + my $Checked = $Value ? " checked" : ""; + print "<input type='checkbox' name='", $PropertyDescriptor->GetName(), + "'$Checked/>"; + } + elsif ($InputType eq "select") + { + print "<select name='", $PropertyDescriptor->GetName(), "'>\n"; + foreach my $V (@{$PropertyDescriptor->GetValues()}) { - print "<select name='", $PropertyDescriptor->GetName(), "'>\n"; - foreach my $V (@{$PropertyDescriptor->GetValues()}) - { - print " <option value='", $self->escapeHTML($V), "'"; - print " selected='selected'" if ($Value eq $V); - print ">", $self->escapeHTML($V), "</option>\n"; - } - print "</select>"; + print " <option value='", $self->escapeHTML($V), "'"; + print " selected" if ($Value eq $V); + print ">", $self->escapeHTML($V), "</option>\n"; } - elsif ($InputType eq "textarea") + print "</select>"; + # No need to add a 'required' label since checkboxes always have a value + } + elsif ($InputType eq "textarea") + { + my $MaxLength = $PropertyDescriptor->GetMaxLength(); + print "<textarea name='", $PropertyDescriptor->GetName(), "' cols='"; + if ($MaxLength < 50) { - my $MaxLength = $PropertyDescriptor->GetMaxLength(); - print "<textarea name='", $PropertyDescriptor->GetName(), "' cols='"; - if ($MaxLength < 50) - { - print "$MaxLength' rows='1"; - } - else - { - print "50' rows='", int(($MaxLength + 49) / 50); - } - print "'>"; - print $self->escapeHTML($Value) if (defined $Value); - print "</textarea>"; - $self->GenerateRequired($PropertyDescriptor); + print "$MaxLength' rows='1'>"; } else { - my $Size=$PropertyDescriptor->GetMaxLength(); - $Size=45 if ($Size > 45); - print "<input type='$InputType' name='", $PropertyDescriptor->GetName(), - "' maxlength='", $PropertyDescriptor->GetMaxLength(), "' size='$Size'"; - if (defined $Value && $InputType ne "password") - { - print " value='", $self->escapeHTML($Value), "'"; - } - print " />"; - $self->GenerateRequired($PropertyDescriptor); + print "50' rows='", int(($MaxLength + 49) / 50), "'>"; } - print "</div>"; + print $self->escapeHTML($Value) if (defined $Value); + print "</textarea>"; + $self->GenerateRequired($PropertyDescriptor); } else { - if ($Value) - { - print $self->escapeHTML($Value); - } - else + my $Size=$PropertyDescriptor->GetMaxLength(); + $Size=45 if ($Size > 45); + print "<input type='$InputType' name='", $PropertyDescriptor->GetName(), + "' maxlength='", $PropertyDescriptor->GetMaxLength(), + "' size='$Size'"; + if (defined $Value and $InputType ne "password") { - print " "; + print " value='", $self->escapeHTML($Value), "'"; } + print "/>"; + $self->GenerateRequired($PropertyDescriptor); } - - print "</div>\n"; } @@ -392,6 +424,29 @@ sub GenerateFormStart($) "' method='$self->{Method}' enctype='multipart/form-data'>\n"; } +sub GenerateField($$$) +{ + my ($self, $PropertyDescriptor, $Display) = @_; + + print "<div class='ItemProperty'><label>", + $self->escapeHTML($self->GetDisplayName($PropertyDescriptor)), + "</label>"; + + my $Value = $self->GetFormValue($PropertyDescriptor); + if ($Display eq "rw") + { + print "<div class='ItemValue'>"; + $self->GenerateValueInput($PropertyDescriptor, $Value); + print "</div>"; + } + else + { + $self->GenerateValueView($PropertyDescriptor, $Value); + } + + print "</div>\n"; +} + sub GenerateFields($) { my ($self) = @_; diff --git a/testbot/web/Submit.pl b/testbot/web/Submit.pl index 8323b9ab7..1ad94e4a4 100644 --- a/testbot/web/Submit.pl +++ b/testbot/web/Submit.pl @@ -947,7 +947,7 @@ sub DisplayProperty($$) return $self->SUPER::DisplayProperty($PropertyDescriptor); } -sub GetDisplayValue($$) +sub GetPropertyValue($$) { my ($self, $PropertyDescriptor) = @_; -- 2.30.2

1 0

[tools] testbot/cgi: Simplify link handling in CollectionBlock::GenerateDataCell().
by Francois Gouget 06 Apr '22

06 Apr '22

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/ObjectModel/CGI/CollectionBlock.pm | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm index 736c3f8a3..23825d757 100644 --- a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm +++ b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm @@ -278,13 +278,6 @@ sub GenerateDataCell($$$$) if ($PropertyDescriptor->GetIsKey() && $DetailsPage) { $NeedLink = 1; - } - else - { - $NeedLink = !1; - } - if ($NeedLink) - { my $Query = "$DetailsPage?Key=" . uri_escape($Item->GetKey()); my ($MasterColNames, $MasterColValues) = $Item->GetMasterCols(); if (defined($MasterColNames)) @@ -298,10 +291,7 @@ sub GenerateDataCell($$$$) print "<a href='", $self->escapeHTML($Query), "'>"; } print $self->GetEscapedDisplayValue($Item, $PropertyDescriptor); - if ($NeedLink) - { - print "</a>"; - } + print "</a>" if ($NeedLink); print "</td>\n"; } -- 2.30.2

1 0

[tools] testbot/cgi: Improve the Add button label for multi-word item class names.
by Francois Gouget 06 Apr '22

06 Apr '22

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/ObjectModel/CGI/CollectionBlock.pm | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm index 13c2a62bd..736c3f8a3 100644 --- a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm +++ b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm @@ -570,6 +570,15 @@ sub OnItemAction($$$) # Actions handling # +sub GetAddButtonLabel($) +{ + my ($self) = @_; + + my $Label = $self->{Collection}->GetItemName(); + $Label =~ s/([a-z])([A-Z])/$1 $2/g; + return "Add $Label"; +} + =pod =over 12 @@ -587,9 +596,7 @@ sub GetActions($) { my ($self) = @_; - return $self->GetDetailsPage() ? - ["Add ". $self->{Collection}->GetItemName()] : - []; + return $self->GetDetailsPage() ? [$self->GetAddButtonLabel()] : []; } =pod @@ -614,7 +621,7 @@ sub OnAction($$) { my ($self, $Action) = @_; - if ($self->{RW} and $Action eq "Add ". $self->{Collection}->GetItemName()) + if ($self->{RW} and $Action eq $self->GetAddButtonLabel()) { my $Target = $self->GetDetailsPage(); my ($MasterColNames, $MasterColValues) = $self->{Collection}->GetMasterCols(); -- 2.30.2

1 0

[tools] testbot/Engine: Optimize sorting the jobs for scheduling.
by Francois Gouget 06 Apr '22

06 Apr '22

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/Engine/Scheduler.pm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/testbot/lib/WineTestBot/Engine/Scheduler.pm b/testbot/lib/WineTestBot/Engine/Scheduler.pm index f606c0d07..cc2ea1f18 100644 --- a/testbot/lib/WineTestBot/Engine/Scheduler.pm +++ b/testbot/lib/WineTestBot/Engine/Scheduler.pm @@ -44,8 +44,9 @@ use WineTestBot::VMs; sub CompareJobPriority { # Process Jobs with a higher Priority value last (it's a niceness in fact), - # and older Jobs first. - return $a->Priority <=> $b->Priority || $a->Id <=> $b->Id; + # and older Jobs first. And use GetColValue() for performance. + return $a->GetColValue("Priority") <=> $b->GetColValue("Priority") || + $a->GetColValue("Id") <=> $b->GetColValue("Id"); } =pod -- 2.30.2

1 0

[tools] testbot: Optimize the VM comparison method.
by Francois Gouget 06 Apr '22

06 Apr '22

Using Item::GetColValue() is faster than relying on Item::AUTOLOAD. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/VMs.pm | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm index ee0c1be24..2e475b722 100644 --- a/testbot/lib/WineTestBot/VMs.pm +++ b/testbot/lib/WineTestBot/VMs.pm @@ -177,16 +177,17 @@ sub InitializeNew($$) $self->SUPER::InitializeNew($Collection); } +# Sort retired and deleted VMs last +my %_CmpRole = ("retired" => 1, "deleted" => 2); + sub Compare($$) { my ($self, $B) = @_; - # Sort retired and deleted VMs last - my %RoleOrders = ("retired" => 1, "deleted" => 2); - - return ($RoleOrders{$self->Role} || 0) <=> ($RoleOrders{$B->Role} || 0) || - $self->SortOrder <=> $B->SortOrder || - $self->Name <=> $B->Name; + # Use GetColValue() for performance. + return ($_CmpRole{$self->GetColValue("Role")} || 0) <=> ($_CmpRole{$B->GetColValue("Role")} || 0) || + $self->GetColValue("SortOrder") <=> $B->GetColValue("SortOrder") || + $self->GetColValue("Name") <=> $B->GetColValue("Name"); } sub HasEnabledRole($) -- 2.30.2

1 0

[tools] testbot/web: Use Collection::GetSortedItems() to sort record groups.
by Francois Gouget 06 Apr '22

06 Apr '22

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/Activity.pm | 2 +- testbot/lib/WineTestBot/RecordGroups.pm | 22 +++++++++++----------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/testbot/lib/WineTestBot/Activity.pm b/testbot/lib/WineTestBot/Activity.pm index 2a1e21f0b..b82d265f8 100644 --- a/testbot/lib/WineTestBot/Activity.pm +++ b/testbot/lib/WineTestBot/Activity.pm @@ -111,7 +111,7 @@ sub GetActivity($;$) } my $MinId; $Counters->{recordgroups} = $RecordGroups->GetItemsCount(); - foreach my $RecordGroup (sort CompareRecordGroups @{$RecordGroups->GetItems()}) + foreach my $RecordGroup (@{$RecordGroups->GetSortedItems()}) { my $Group = { id => $RecordGroup->Id, start => $RecordGroup->Timestamp }; diff --git a/testbot/lib/WineTestBot/RecordGroups.pm b/testbot/lib/WineTestBot/RecordGroups.pm index f0945434c..c3022ae5b 100644 --- a/testbot/lib/WineTestBot/RecordGroups.pm +++ b/testbot/lib/WineTestBot/RecordGroups.pm @@ -43,6 +43,16 @@ sub InitializeNew($$) $self->SUPER::InitializeNew($Collection); } +sub Compare($$) +{ + my ($self, $B) = @_; + + # The Timestamps have a 1 second granularity and may have duplicates. + # So use the Id to break ties. And use GetColValue() for performance. + return $self->GetColValue("Timestamp") <=> $B->GetColValue("Timestamp") || + $self->GetColValue("Id") <=> $B->GetColValue("Id"); +} + package WineTestBot::RecordGroups; @@ -57,7 +67,7 @@ use WineTestBot::WineTestBotObjects; BEGIN { our @ISA = qw(WineTestBot::WineTestBotCollection); - our @EXPORT = qw(CreateRecordGroups CompareRecordGroups SaveRecord); + our @EXPORT = qw(CreateRecordGroups SaveRecord); } use ObjectModel::BasicPropertyDescriptor; @@ -96,16 +106,6 @@ sub CreateRecordGroups(;$) \@PropertyDescriptors, $ScopeObject); } -sub CompareRecordGroups($$) -{ - my ($RecordGroup1, $RecordGroup2) = @_; - - # The Timestamps have a 1 second granularity and may have duplicates. - # So use the Id to break ties. - return $RecordGroup1->Timestamp <=> $RecordGroup2->Timestamp || - $RecordGroup1->Id <=> $RecordGroup2->Id; -} - =pod =over 12 -- 2.30.2

1 0

[PATCH 1/3] winegstreamer: Support dynamic wg_transform output format change.
by Rémi Bernon 06 Apr '22

06 Apr '22

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45988 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47084 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49715 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52183 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- (This need to come first, before 231660-231665 as the spurious todo_wine is caused by the H264 format being synchronously rejected when libav plugins are used) In this patch I assumed that sink callbacks are always called from the same thread, and then do not require any locking around sink_caps accesses. The output samples will each hold their own ref on the caps, eventually different ones as the stream format changes, and wg_transform_read_data will only read the caps from the sample it unqueued. dlls/winegstreamer/unixlib.h | 1 + dlls/winegstreamer/wg_transform.c | 89 ++++++++++++++++++++++++------- 2 files changed, 71 insertions(+), 19 deletions(-) diff --git a/dlls/winegstreamer/unixlib.h b/dlls/winegstreamer/unixlib.h index f4e2ea4966b..7a31020fb87 100644 --- a/dlls/winegstreamer/unixlib.h +++ b/dlls/winegstreamer/unixlib.h @@ -122,6 +122,7 @@ struct wg_sample UINT32 max_size; UINT32 size; BYTE *data; + struct wg_format *format; }; struct wg_parser_buffer diff --git a/dlls/winegstreamer/wg_transform.c b/dlls/winegstreamer/wg_transform.c index 0327b92ce8e..ddf86de13ae 100644 --- a/dlls/winegstreamer/wg_transform.c +++ b/dlls/winegstreamer/wg_transform.c @@ -51,40 +51,73 @@ struct wg_transform GstBufferList *input; guint input_max_length; GstAtomicQueue *output_queue; - GstBuffer *output_buffer; + GstSample *output_sample; + GstCaps *sink_caps; }; static GstFlowReturn transform_sink_chain_cb(GstPad *pad, GstObject *parent, GstBuffer *buffer) { struct wg_transform *transform = gst_pad_get_element_private(pad); + GstSample *sample; GST_LOG("transform %p, buffer %p.", transform, buffer); - gst_atomic_queue_push(transform->output_queue, buffer); + if ((sample = gst_sample_new(buffer, transform->sink_caps, NULL, NULL))) + gst_atomic_queue_push(transform->output_queue, sample); - return GST_FLOW_OK; + gst_buffer_unref(buffer); + + return sample ? GST_FLOW_OK : GST_FLOW_ERROR; +} + +static gboolean transform_sink_event_cb(GstPad *pad, GstObject *parent, GstEvent *event) +{ + struct wg_transform *transform = gst_pad_get_element_private(pad); + + GST_LOG("transform %p, type \"%s\".", transform, GST_EVENT_TYPE_NAME(event)); + + switch (event->type) + { + case GST_EVENT_CAPS: + { + GstCaps *caps; + + gst_event_parse_caps(event, &caps); + + gst_caps_unref(transform->sink_caps); + transform->sink_caps = gst_caps_ref(caps); + break; + } + default: + GST_WARNING("Ignoring \"%s\" event.", GST_EVENT_TYPE_NAME(event)); + break; + } + + gst_event_unref(event); + return TRUE; } NTSTATUS wg_transform_destroy(void *args) { struct wg_transform *transform = args; - GstBuffer *buffer; + GstSample *sample; if (transform->input) gst_buffer_list_unref(transform->input); gst_element_set_state(transform->container, GST_STATE_NULL); - if (transform->output_buffer) - gst_buffer_unref(transform->output_buffer); - while ((buffer = gst_atomic_queue_pop(transform->output_queue))) - gst_buffer_unref(buffer); + if (transform->output_sample) + gst_sample_unref(transform->output_sample); + while ((sample = gst_atomic_queue_pop(transform->output_queue))) + gst_sample_unref(sample); g_object_unref(transform->their_sink); g_object_unref(transform->their_src); g_object_unref(transform->container); g_object_unref(transform->my_sink); g_object_unref(transform->my_src); + gst_caps_unref(transform->sink_caps); gst_atomic_queue_unref(transform->output_queue); free(transform); @@ -162,10 +195,10 @@ static bool transform_append_element(struct wg_transform *transform, GstElement NTSTATUS wg_transform_create(void *args) { struct wg_transform_create_params *params = args; - GstCaps *raw_caps = NULL, *src_caps = NULL, *sink_caps = NULL; struct wg_format output_format = *params->output_format; struct wg_format input_format = *params->input_format; GstElement *first = NULL, *last = NULL, *element; + GstCaps *raw_caps = NULL, *src_caps = NULL; NTSTATUS status = STATUS_UNSUCCESSFUL; GstPadTemplate *template = NULL; struct wg_transform *transform; @@ -194,9 +227,9 @@ NTSTATUS wg_transform_create(void *args) if (!transform->my_src) goto out; - if (!(sink_caps = wg_format_to_caps(&output_format))) + if (!(transform->sink_caps = wg_format_to_caps(&output_format))) goto out; - if (!(template = gst_pad_template_new("sink", GST_PAD_SINK, GST_PAD_ALWAYS, sink_caps))) + if (!(template = gst_pad_template_new("sink", GST_PAD_SINK, GST_PAD_ALWAYS, transform->sink_caps))) goto out; transform->my_sink = gst_pad_new_from_template(template, "sink"); g_object_unref(template); @@ -204,13 +237,14 @@ NTSTATUS wg_transform_create(void *args) goto out; gst_pad_set_element_private(transform->my_sink, transform); + gst_pad_set_event_function(transform->my_sink, transform_sink_event_cb); gst_pad_set_chain_function(transform->my_sink, transform_sink_chain_cb); /* Since we append conversion elements, we don't want to filter decoders * based on the actual output caps now. Matching decoders with the * raw output media type should be enough. */ - media_type = gst_structure_get_name(gst_caps_get_structure(sink_caps, 0)); + media_type = gst_structure_get_name(gst_caps_get_structure(transform->sink_caps, 0)); if (!(raw_caps = gst_caps_new_empty_simple(media_type))) goto out; @@ -264,6 +298,11 @@ NTSTATUS wg_transform_create(void *args) break; case WG_MAJOR_TYPE_VIDEO: + if (!(element = create_element("videoconvert", "base")) + || !transform_append_element(transform, element, &first, &last)) + goto out; + /* Let GStreamer choose a default number of threads. */ + gst_util_set_object_arg(G_OBJECT(element), "n-threads", "0"); break; case WG_MAJOR_TYPE_H264: @@ -306,7 +345,6 @@ NTSTATUS wg_transform_create(void *args) || !gst_pad_push_event(transform->my_src, event)) goto out; - gst_caps_unref(sink_caps); gst_caps_unref(src_caps); GST_INFO("Created winegstreamer transform %p.", transform); @@ -320,8 +358,8 @@ out: gst_object_unref(transform->their_src); if (transform->my_sink) gst_object_unref(transform->my_sink); - if (sink_caps) - gst_caps_unref(sink_caps); + if (transform->sink_caps) + gst_caps_unref(transform->sink_caps); if (transform->my_src) gst_object_unref(transform->my_src); if (src_caps) @@ -401,8 +439,10 @@ NTSTATUS wg_transform_read_data(void *args) struct wg_transform *transform = params->transform; struct wg_sample *sample = params->sample; GstBufferList *input = transform->input; + struct wg_format format; GstFlowReturn ret; NTSTATUS status; + GstCaps *caps; if (!gst_buffer_list_length(transform->input)) GST_DEBUG("Not input buffer queued"); @@ -417,7 +457,7 @@ NTSTATUS wg_transform_read_data(void *args) return STATUS_UNSUCCESSFUL; } - if (!transform->output_buffer && !(transform->output_buffer = gst_atomic_queue_pop(transform->output_queue))) + if (!transform->output_sample && !(transform->output_sample = gst_atomic_queue_pop(transform->output_queue))) { sample->size = 0; params->result = MF_E_TRANSFORM_NEED_MORE_INPUT; @@ -425,7 +465,18 @@ NTSTATUS wg_transform_read_data(void *args) return STATUS_SUCCESS; } - if ((status = read_transform_output_data(transform->output_buffer, sample))) + if (sample->format && (caps = gst_sample_get_caps(transform->output_sample))) + { + wg_format_from_caps(&format, caps); + if (!wg_format_compare(&format, sample->format)) + { + *sample->format = format; + params->result = MF_E_TRANSFORM_STREAM_CHANGE; + return STATUS_SUCCESS; + } + } + + if ((status = read_transform_output_data(gst_sample_get_buffer(transform->output_sample), sample))) { sample->size = 0; return status; @@ -433,8 +484,8 @@ NTSTATUS wg_transform_read_data(void *args) if (!(sample->flags & WG_SAMPLE_FLAG_INCOMPLETE)) { - gst_buffer_unref(transform->output_buffer); - transform->output_buffer = NULL; + gst_sample_unref(transform->output_sample); + transform->output_sample = NULL; } params->result = S_OK; -- 2.35.1

3 12

[PATCH vkd3d 1/2] vkd3d: Use Vulkan timeline semaphores for D3D12 fences.
by Henri Verbeet 06 Apr '22

06 Apr '22

From: Conor McCarthy <cmccarthy(a)codeweavers.com> D3D12 supports signalling a fence to a lower value, while Vulkan timeline semaphores do not. On the GPU side this is handled by simply submitting the signal anyway, if a test for this passes on device creation, because working around this is impractical. For CPU signals the Vulkan semaphore is replaced with a new one at the lower value only if no waits and/or signals are pending on the GPU. Otherwise, a fixme is emitted. Partly based on a vkd3d-proton patch by Hans-Kristian Arntzen (not including the handling of lower fence values). The old implementation is used if KHR_timeline_semaphore is not available or GPU signals do not work for a lower value. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- This supersedes patch 230633. v4: - Fix the (trivial) merge conflict with patch 230641. - Simplify setting "device->use_timeline_semaphores". libs/vkd3d/command.c | 571 ++++++++++++++++++++++++++++++++++--- libs/vkd3d/device.c | 87 ++++++ libs/vkd3d/vkd3d_private.h | 30 ++ libs/vkd3d/vulkan_procs.h | 5 + tests/d3d12.c | 11 +- 5 files changed, 663 insertions(+), 41 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 952675cf..09171fe4 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -46,6 +46,9 @@ HRESULT vkd3d_queue_create(struct d3d12_device *device, object->vk_queue_flags = properties->queueFlags; object->timestamp_bits = properties->timestampValidBits; + object->wait_completion_semaphore = VK_NULL_HANDLE; + object->pending_wait_completion_value = 0; + object->semaphores = NULL; object->semaphores_size = 0; object->semaphore_count = 0; @@ -61,6 +64,20 @@ HRESULT vkd3d_queue_create(struct d3d12_device *device, return S_OK; } +bool vkd3d_queue_init_timeline_semaphore(struct vkd3d_queue *queue, struct d3d12_device *device) +{ + VkResult vr; + + if (!queue->wait_completion_semaphore + && (vr = vkd3d_create_timeline_semaphore(device, 0, &queue->wait_completion_semaphore)) < 0) + { + WARN("Failed to create timeline semaphore, vr %d.\n", vr); + return false; + } + + return true; +} + void vkd3d_queue_destroy(struct vkd3d_queue *queue, struct d3d12_device *device) { const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; @@ -75,6 +92,8 @@ void vkd3d_queue_destroy(struct vkd3d_queue *queue, struct d3d12_device *device) vkd3d_free(queue->semaphores); + VK_CALL(vkDestroySemaphore(device->vk_device, queue->wait_completion_semaphore, NULL)); + for (i = 0; i < ARRAY_SIZE(queue->old_vk_semaphores); ++i) { if (queue->old_vk_semaphores[i]) @@ -268,6 +287,7 @@ static HRESULT vkd3d_enqueue_gpu_fence(struct vkd3d_fence_worker *worker, } worker->enqueued_fences[worker->enqueued_fence_count].vk_fence = vk_fence; + worker->enqueued_fences[worker->enqueued_fence_count].vk_semaphore = VK_NULL_HANDLE; waiting_fence = &worker->enqueued_fences[worker->enqueued_fence_count].waiting_fence; waiting_fence->fence = fence; waiting_fence->value = value; @@ -317,6 +337,7 @@ static void vkd3d_fence_worker_remove_fence(struct vkd3d_fence_worker *worker, s static void vkd3d_fence_worker_move_enqueued_fences_locked(struct vkd3d_fence_worker *worker) { unsigned int i; + bool timeline; size_t count; bool ret; @@ -325,8 +346,18 @@ static void vkd3d_fence_worker_move_enqueued_fences_locked(struct vkd3d_fence_wo count = worker->fence_count + worker->enqueued_fence_count; - ret = vkd3d_array_reserve((void **)&worker->vk_fences, &worker->vk_fences_size, - count, sizeof(*worker->vk_fences)); + if ((timeline = worker->device->use_timeline_semaphores)) + { + ret = vkd3d_array_reserve((void **) &worker->vk_semaphores, &worker->vk_semaphores_size, + count, sizeof(*worker->vk_semaphores)); + ret &= vkd3d_array_reserve((void **) &worker->semaphore_wait_values, &worker->semaphore_wait_values_size, + count, sizeof(*worker->semaphore_wait_values)); + } + else + { + ret = vkd3d_array_reserve((void **)&worker->vk_fences, &worker->vk_fences_size, + count, sizeof(*worker->vk_fences)); + } ret &= vkd3d_array_reserve((void **)&worker->fences, &worker->fences_size, count, sizeof(*worker->fences)); if (!ret) @@ -339,7 +370,16 @@ static void vkd3d_fence_worker_move_enqueued_fences_locked(struct vkd3d_fence_wo { struct vkd3d_enqueued_fence *current = &worker->enqueued_fences[i]; - worker->vk_fences[worker->fence_count] = current->vk_fence; + if (timeline) + { + worker->vk_semaphores[worker->fence_count] = current->vk_semaphore; + worker->semaphore_wait_values[worker->fence_count] = current->waiting_fence.value; + } + else + { + worker->vk_fences[worker->fence_count] = current->vk_fence; + } + worker->fences[worker->fence_count] = current->waiting_fence; ++worker->fence_count; } @@ -347,6 +387,66 @@ static void vkd3d_fence_worker_move_enqueued_fences_locked(struct vkd3d_fence_wo worker->enqueued_fence_count = 0; } +static void vkd3d_wait_for_gpu_timeline_semaphores(struct vkd3d_fence_worker *worker) +{ + const struct d3d12_device *device = worker->device; + const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; + VkSemaphoreWaitInfoKHR wait_info; + VkSemaphore vk_semaphore; + uint64_t counter_value; + unsigned int i, j; + HRESULT hr; + int vr; + + if (!worker->fence_count) + return; + + wait_info.sType = VK_STRUCTURE_TYPE_SEMAPHORE_WAIT_INFO_KHR; + wait_info.pNext = NULL; + wait_info.flags = VK_SEMAPHORE_WAIT_ANY_BIT_KHR; + wait_info.pSemaphores = worker->vk_semaphores; + wait_info.semaphoreCount = worker->fence_count; + wait_info.pValues = worker->semaphore_wait_values; + + vr = VK_CALL(vkWaitSemaphoresKHR(device->vk_device, &wait_info, ~(uint64_t)0)); + if (vr == VK_TIMEOUT) + return; + if (vr != VK_SUCCESS) + { + ERR("Failed to wait for Vulkan timeline semaphores, vr %d.\n", vr); + return; + } + + for (i = 0, j = 0; i < worker->fence_count; ++i) + { + struct vkd3d_waiting_fence *current = &worker->fences[i]; + + vk_semaphore = worker->vk_semaphores[i]; + if ((vr = VK_CALL(vkGetSemaphoreCounterValueKHR(device->vk_device, vk_semaphore, &counter_value))) < 0) + { + ERR("Failed to get Vulkan semaphore value, vr %d.\n", vr); + } + else if (counter_value >= current->value) + { + TRACE("Signaling fence %p value %#"PRIx64".\n", current->fence, current->value); + if (FAILED(hr = d3d12_fence_signal(current->fence, counter_value, VK_NULL_HANDLE))) + ERR("Failed to signal D3D12 fence, hr %#x.\n", hr); + + InterlockedDecrement(&current->fence->pending_worker_operation_count); + continue; + } + + if (i != j) + { + worker->vk_semaphores[j] = worker->vk_semaphores[i]; + worker->semaphore_wait_values[j] = worker->semaphore_wait_values[i]; + worker->fences[j] = worker->fences[i]; + } + ++j; + } + worker->fence_count = j; +} + static void vkd3d_wait_for_gpu_fences(struct vkd3d_fence_worker *worker) { struct d3d12_device *device = worker->device; @@ -408,7 +508,7 @@ static void *vkd3d_fence_worker_main(void *arg) for (;;) { - vkd3d_wait_for_gpu_fences(worker); + worker->wait_for_gpu_fences(worker); if (!worker->fence_count || InterlockedAdd(&worker->enqueued_fence_count, 0)) { @@ -473,6 +573,13 @@ HRESULT vkd3d_fence_worker_start(struct vkd3d_fence_worker *worker, worker->vk_fences_size = 0; worker->fences = NULL; worker->fences_size = 0; + worker->vk_semaphores = NULL; + worker->vk_semaphores_size = 0; + worker->semaphore_wait_values = NULL; + worker->semaphore_wait_values_size = 0; + + worker->wait_for_gpu_fences = device->use_timeline_semaphores + ? vkd3d_wait_for_gpu_timeline_semaphores : vkd3d_wait_for_gpu_fences; if ((rc = vkd3d_mutex_init(&worker->mutex))) { @@ -535,6 +642,8 @@ HRESULT vkd3d_fence_worker_stop(struct vkd3d_fence_worker *worker, vkd3d_free(worker->enqueued_fences); vkd3d_free(worker->vk_fences); vkd3d_free(worker->fences); + vkd3d_free(worker->vk_semaphores); + vkd3d_free(worker->semaphore_wait_values); return S_OK; } @@ -684,6 +793,7 @@ static void d3d12_fence_destroy_vk_objects(struct d3d12_fence *fence) } d3d12_fence_garbage_collect_vk_semaphores_locked(fence, true); + VK_CALL(vkDestroySemaphore(device->vk_device, fence->timeline_semaphore, NULL)); vkd3d_mutex_unlock(&fence->mutex); } @@ -802,31 +912,21 @@ static HRESULT d3d12_fence_add_vk_semaphore(struct d3d12_fence *fence, return hr; } -static HRESULT d3d12_fence_signal(struct d3d12_fence *fence, uint64_t value, VkFence vk_fence) +static bool d3d12_fence_signal_external_events_locked(struct d3d12_fence *fence) { struct d3d12_device *device = fence->device; - struct vkd3d_signaled_semaphore *current; bool signal_null_event_cond = false; unsigned int i, j; - int rc; - - if ((rc = vkd3d_mutex_lock(&fence->mutex))) - { - ERR("Failed to lock mutex, error %d.\n", rc); - return hresult_from_errno(rc); - } - - fence->value = value; for (i = 0, j = 0; i < fence->event_count; ++i) { struct vkd3d_waiting_event *current = &fence->events[i]; - if (current->value <= value) + if (current->value <= fence->value) { if (current->event) { - fence->device->signal_event(current->event); + device->signal_event(current->event); } else { @@ -841,9 +941,28 @@ static HRESULT d3d12_fence_signal(struct d3d12_fence *fence, uint64_t value, VkF ++j; } } + fence->event_count = j; - if (signal_null_event_cond) + return signal_null_event_cond; +} + +static HRESULT d3d12_fence_signal(struct d3d12_fence *fence, uint64_t value, VkFence vk_fence) +{ + struct d3d12_device *device = fence->device; + struct vkd3d_signaled_semaphore *current; + unsigned int i; + int rc; + + if ((rc = vkd3d_mutex_lock(&fence->mutex))) + { + ERR("Failed to lock mutex, error %d.\n", rc); + return hresult_from_errno(rc); + } + + fence->value = value; + + if (d3d12_fence_signal_external_events_locked(fence)) vkd3d_cond_broadcast(&fence->null_event_cond); if (vk_fence) @@ -1069,12 +1188,160 @@ static HRESULT STDMETHODCALLTYPE d3d12_fence_SetEventOnCompletion(ID3D12Fence *i return S_OK; } +static inline bool d3d12_fence_gpu_wait_is_completed(const struct d3d12_fence *fence, unsigned int i) +{ + const struct d3d12_device *device = fence->device; + const struct vkd3d_vk_device_procs *vk_procs; + uint64_t value; + VkResult vr; + + vk_procs = &device->vk_procs; + + if ((vr = VK_CALL(vkGetSemaphoreCounterValueKHR(device->vk_device, + fence->gpu_waits[i].queue->wait_completion_semaphore, &value))) >= 0) + { + return value >= fence->gpu_waits[i].pending_value; + } + + ERR("Failed to get Vulkan semaphore status, vr %d.\n", vr); + return true; +} + +static inline bool d3d12_fence_has_pending_gpu_ops_locked(struct d3d12_fence *fence) +{ + const struct d3d12_device *device = fence->device; + const struct vkd3d_vk_device_procs *vk_procs; + uint64_t value; + unsigned int i; + VkResult vr; + + for (i = 0; i < fence->gpu_wait_count; ++i) + { + if (d3d12_fence_gpu_wait_is_completed(fence, i) && i < --fence->gpu_wait_count) + fence->gpu_waits[i] = fence->gpu_waits[fence->gpu_wait_count]; + } + if (fence->gpu_wait_count) + return true; + + /* Check for pending signals too. */ + if (fence->value >= fence->pending_timeline_value) + return false; + + vk_procs = &device->vk_procs; + + /* Check the actual semaphore value in case fence->value update is lagging. */ + if ((vr = VK_CALL(vkGetSemaphoreCounterValueKHR(device->vk_device, fence->timeline_semaphore, &value))) < 0) + { + ERR("Failed to get Vulkan semaphore status, vr %d.\n", vr); + return false; + } + + return value < fence->pending_timeline_value; +} + +/* Replace the VkSemaphore with a new one to allow a lower value to be set. Ideally apps will + * only use this to reset the fence when no operations are pending on the queue. */ +static HRESULT d3d12_fence_reinit_timeline_semaphore_locked(struct d3d12_fence *fence, uint64_t value) +{ + const struct d3d12_device *device = fence->device; + const struct vkd3d_vk_device_procs *vk_procs; + VkSemaphore timeline_semaphore; + VkResult vr; + + if (d3d12_fence_has_pending_gpu_ops_locked(fence)) + { + /* This situation is not very likely because it means a fence with pending waits and/or signals was + * signalled on the CPU to a lower value. For now, emit a fixme so it can be patched if necessary. + * A patch already exists for this but it's not pretty. */ + FIXME("Unable to re-initialise timeline semaphore to a lower value due to pending GPU ops.\n"); + return E_FAIL; + } + + if ((vr = vkd3d_create_timeline_semaphore(device, value, &timeline_semaphore)) < 0) + { + WARN("Failed to create timeline semaphore, vr %d.\n", vr); + return hresult_from_vk_result(vr); + } + + fence->value = value; + fence->pending_timeline_value = value; + + WARN("Replacing timeline semaphore with a new object.\n"); + + vk_procs = &device->vk_procs; + + VK_CALL(vkDestroySemaphore(device->vk_device, fence->timeline_semaphore, NULL)); + fence->timeline_semaphore = timeline_semaphore; + + return S_OK; +} + +static HRESULT d3d12_fence_signal_cpu_timeline_semaphore(struct d3d12_fence *fence, uint64_t value) +{ + const struct d3d12_device *device = fence->device; + VkSemaphoreSignalInfoKHR info; + HRESULT hr = S_OK; + VkResult vr; + int rc; + + if ((rc = vkd3d_mutex_lock(&fence->mutex))) + { + ERR("Failed to lock mutex, error %d.\n", rc); + return hresult_from_errno(rc); + } + + /* We must only signal a value which is greater than the current value. + * That value can be in the range of current known value (fence->value), or as large as pending_timeline_value. + * Pending timeline value signal might be blocked by another synchronization primitive, and thus statically + * cannot be that value, so the safest thing to do is to check the current value which is updated by the fence + * wait thread continuously. This check is technically racy since the value might be immediately out of date, + * but there is no way to avoid this. */ + if (value > fence->value) + { + const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; + + /* Sanity check against the delta limit. */ + if (value - fence->value > device->vk_info.timeline_semaphore_properties.maxTimelineSemaphoreValueDifference) + { + FIXME("Timeline semaphore delta is %"PRIu64", but implementation only supports a delta of %"PRIu64".\n", + value - fence->value, device->vk_info.timeline_semaphore_properties.maxTimelineSemaphoreValueDifference); + } + + info.sType = VK_STRUCTURE_TYPE_SEMAPHORE_SIGNAL_INFO_KHR; + info.pNext = NULL; + info.semaphore = fence->timeline_semaphore; + info.value = value; + if ((vr = VK_CALL(vkSignalSemaphoreKHR(device->vk_device, &info))) >= 0) + { + fence->value = value; + if (value > fence->pending_timeline_value) + fence->pending_timeline_value = value; + } + else + { + ERR("Failed to signal timeline semaphore, vr %d.\n", vr); + hr = hresult_from_vk_result(vr); + } + } + else if (value < fence->value) + { + hr = d3d12_fence_reinit_timeline_semaphore_locked(fence, value); + } + + d3d12_fence_signal_external_events_locked(fence); + + vkd3d_mutex_unlock(&fence->mutex); + return hr; +} + static HRESULT STDMETHODCALLTYPE d3d12_fence_Signal(ID3D12Fence *iface, UINT64 value) { struct d3d12_fence *fence = impl_from_ID3D12Fence(iface); TRACE("iface %p, value %#"PRIx64".\n", iface, value); + if (fence->timeline_semaphore) + return d3d12_fence_signal_cpu_timeline_semaphore(fence, value); return d3d12_fence_signal(fence, value, VK_NULL_HANDLE); } @@ -1108,6 +1375,7 @@ static struct d3d12_fence *unsafe_impl_from_ID3D12Fence(ID3D12Fence *iface) static HRESULT d3d12_fence_init(struct d3d12_fence *fence, struct d3d12_device *device, UINT64 initial_value, D3D12_FENCE_FLAGS flags) { + VkResult vr; HRESULT hr; int rc; @@ -1136,6 +1404,16 @@ static HRESULT d3d12_fence_init(struct d3d12_fence *fence, struct d3d12_device * fence->events_size = 0; fence->event_count = 0; + fence->timeline_semaphore = VK_NULL_HANDLE; + if (device->use_timeline_semaphores && (vr = vkd3d_create_timeline_semaphore(device, initial_value, + &fence->timeline_semaphore)) < 0) + { + WARN("Failed to create timeline semaphore, vr %d.\n", vr); + return hresult_from_vk_result(vr); + } + fence->pending_timeline_value = initial_value; + fence->gpu_wait_count = 0; + list_init(&fence->semaphores); fence->semaphore_count = 0; @@ -1172,6 +1450,25 @@ HRESULT d3d12_fence_create(struct d3d12_device *device, return S_OK; } +VkResult vkd3d_create_timeline_semaphore(const struct d3d12_device *device, uint64_t initial_value, + VkSemaphore *timeline_semaphore) +{ + const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; + VkSemaphoreTypeCreateInfoKHR type_info; + VkSemaphoreCreateInfo info; + + info.sType = VK_STRUCTURE_TYPE_SEMAPHORE_CREATE_INFO; + info.pNext = &type_info; + info.flags = 0; + + type_info.sType = VK_STRUCTURE_TYPE_SEMAPHORE_TYPE_CREATE_INFO_KHR; + type_info.pNext = NULL; + type_info.semaphoreType = VK_SEMAPHORE_TYPE_TIMELINE_KHR; + type_info.initialValue = initial_value; + + return VK_CALL(vkCreateSemaphore(device->vk_device, &info, NULL, timeline_semaphore)); +} + /* Command buffers */ static void d3d12_command_list_mark_as_invalid(struct d3d12_command_list *list, const char *message, ...) @@ -6138,18 +6435,88 @@ static void STDMETHODCALLTYPE d3d12_command_queue_EndEvent(ID3D12CommandQueue *i FIXME("iface %p stub!\n", iface); } +static HRESULT d3d12_fence_update_gpu_signal_timeline_semaphore(struct d3d12_fence *fence, uint64_t value) +{ + const struct d3d12_device *device = fence->device; + int rc; + + if ((rc = vkd3d_mutex_lock(&fence->mutex))) + { + ERR("Failed to lock mutex, error %d.\n", rc); + return hresult_from_errno(rc); + } + + /* If we're attempting to async signal a fence with a value which is not strictly increasing the payload value, + * warn about this case. Do not treat this as an error since it works at least with RADV and Nvidia drivers and + * there's no workaround on the GPU side. */ + if (value <= fence->pending_timeline_value) + { + WARN("Fence %p values are not strictly increasing. Pending values: old %"PRIu64", new %"PRIu64".\n", + fence, fence->pending_timeline_value, value); + } + /* Sanity check against the delta limit. Use the current fence value. */ + else if (value - fence->value > device->vk_info.timeline_semaphore_properties.maxTimelineSemaphoreValueDifference) + { + FIXME("Timeline semaphore delta is %"PRIu64", but implementation only supports a delta of %"PRIu64".\n", + value - fence->value, device->vk_info.timeline_semaphore_properties.maxTimelineSemaphoreValueDifference); + } + fence->pending_timeline_value = value; + + vkd3d_mutex_unlock(&fence->mutex); + + return S_OK; +} + +static HRESULT vkd3d_enqueue_timeline_semaphore(struct vkd3d_fence_worker *worker, VkSemaphore vk_semaphore, + struct d3d12_fence *fence, uint64_t value, struct vkd3d_queue *queue) +{ + struct vkd3d_waiting_fence *waiting_fence; + int rc; + + TRACE("worker %p, fence %p, value %#"PRIx64".\n", worker, fence, value); + + if ((rc = vkd3d_mutex_lock(&worker->mutex))) + { + ERR("Failed to lock mutex, error %d.\n", rc); + return hresult_from_errno(rc); + } + + if (!vkd3d_array_reserve((void **)&worker->enqueued_fences, &worker->enqueued_fences_size, + worker->enqueued_fence_count + 1, sizeof(*worker->enqueued_fences))) + { + ERR("Failed to add GPU timeline semaphore.\n"); + vkd3d_mutex_unlock(&worker->mutex); + return E_OUTOFMEMORY; + } + + worker->enqueued_fences[worker->enqueued_fence_count].vk_semaphore = vk_semaphore; + waiting_fence = &worker->enqueued_fences[worker->enqueued_fence_count].waiting_fence; + waiting_fence->fence = fence; + waiting_fence->value = value; + waiting_fence->queue = queue; + ++worker->enqueued_fence_count; + + InterlockedIncrement(&fence->pending_worker_operation_count); + + vkd3d_cond_signal(&worker->cond); + vkd3d_mutex_unlock(&worker->mutex); + + return S_OK; +} + static HRESULT STDMETHODCALLTYPE d3d12_command_queue_Signal(ID3D12CommandQueue *iface, ID3D12Fence *fence_iface, UINT64 value) { struct d3d12_command_queue *command_queue = impl_from_ID3D12CommandQueue(iface); + VkTimelineSemaphoreSubmitInfoKHR timeline_submit_info; const struct vkd3d_vk_device_procs *vk_procs; VkSemaphore vk_semaphore = VK_NULL_HANDLE; VkFence vk_fence = VK_NULL_HANDLE; struct vkd3d_queue *vkd3d_queue; + uint64_t sequence_number = 0; struct d3d12_device *device; struct d3d12_fence *fence; VkSubmitInfo submit_info; - uint64_t sequence_number; VkQueue vk_queue; VkResult vr; HRESULT hr; @@ -6162,10 +6529,21 @@ static HRESULT STDMETHODCALLTYPE d3d12_command_queue_Signal(ID3D12CommandQueue * fence = unsafe_impl_from_ID3D12Fence(fence_iface); - if ((vr = d3d12_fence_create_vk_fence(fence, &vk_fence)) < 0) + if (device->use_timeline_semaphores) { - WARN("Failed to create Vulkan fence, vr %d.\n", vr); - goto fail_vkresult; + if (FAILED(hr = d3d12_fence_update_gpu_signal_timeline_semaphore(fence, value))) + return hr; + + vk_semaphore = fence->timeline_semaphore; + assert(vk_semaphore); + } + else + { + if ((vr = d3d12_fence_create_vk_fence(fence, &vk_fence)) < 0) + { + WARN("Failed to create Vulkan fence, vr %d.\n", vr); + goto fail_vkresult; + } } if (!(vk_queue = vkd3d_queue_acquire(vkd3d_queue))) @@ -6175,7 +6553,8 @@ static HRESULT STDMETHODCALLTYPE d3d12_command_queue_Signal(ID3D12CommandQueue * goto fail; } - if ((vr = vkd3d_queue_create_vk_semaphore_locked(vkd3d_queue, device, &vk_semaphore)) < 0) + if (!device->use_timeline_semaphores && (vr = vkd3d_queue_create_vk_semaphore_locked(vkd3d_queue, + device, &vk_semaphore)) < 0) { ERR("Failed to create Vulkan semaphore, vr %d.\n", vr); vk_semaphore = VK_NULL_HANDLE; @@ -6191,7 +6570,19 @@ static HRESULT STDMETHODCALLTYPE d3d12_command_queue_Signal(ID3D12CommandQueue * submit_info.signalSemaphoreCount = vk_semaphore ? 1 : 0; submit_info.pSignalSemaphores = &vk_semaphore; - if ((vr = VK_CALL(vkQueueSubmit(vk_queue, 1, &submit_info, vk_fence))) >= 0) + if (device->use_timeline_semaphores) + { + timeline_submit_info.sType = VK_STRUCTURE_TYPE_TIMELINE_SEMAPHORE_SUBMIT_INFO_KHR; + timeline_submit_info.pNext = NULL; + timeline_submit_info.pSignalSemaphoreValues = &value; + timeline_submit_info.signalSemaphoreValueCount = submit_info.signalSemaphoreCount; + timeline_submit_info.waitSemaphoreValueCount = 0; + timeline_submit_info.pWaitSemaphoreValues = NULL; + submit_info.pNext = &timeline_submit_info; + } + + vr = VK_CALL(vkQueueSubmit(vk_queue, 1, &submit_info, vk_fence)); + if (!device->use_timeline_semaphores && vr >= 0) { sequence_number = ++vkd3d_queue->submitted_sequence_number; @@ -6208,6 +6599,9 @@ static HRESULT STDMETHODCALLTYPE d3d12_command_queue_Signal(ID3D12CommandQueue * goto fail_vkresult; } + if (device->use_timeline_semaphores) + return vkd3d_enqueue_timeline_semaphore(&device->fence_worker, vk_semaphore, fence, value, vkd3d_queue); + if (vk_semaphore && SUCCEEDED(hr = d3d12_fence_add_vk_semaphore(fence, vk_semaphore, vk_fence, value))) vk_semaphore = VK_NULL_HANDLE; @@ -6243,32 +6637,27 @@ fail_vkresult: hr = hresult_from_vk_result(vr); fail: VK_CALL(vkDestroyFence(device->vk_device, vk_fence, NULL)); - VK_CALL(vkDestroySemaphore(device->vk_device, vk_semaphore, NULL)); + if (!device->use_timeline_semaphores) + VK_CALL(vkDestroySemaphore(device->vk_device, vk_semaphore, NULL)); return hr; } -static HRESULT STDMETHODCALLTYPE d3d12_command_queue_Wait(ID3D12CommandQueue *iface, - ID3D12Fence *fence_iface, UINT64 value) +static HRESULT d3d12_command_queue_wait_binary_semaphore(struct d3d12_command_queue *command_queue, + struct d3d12_fence *fence, uint64_t value) { static const VkPipelineStageFlagBits wait_stage_mask = VK_PIPELINE_STAGE_ALL_COMMANDS_BIT; - struct d3d12_command_queue *command_queue = impl_from_ID3D12CommandQueue(iface); const struct vkd3d_vk_device_procs *vk_procs; struct vkd3d_signaled_semaphore *semaphore; uint64_t completed_value = 0; struct vkd3d_queue *queue; - struct d3d12_fence *fence; VkSubmitInfo submit_info; VkQueue vk_queue; VkResult vr; HRESULT hr; - TRACE("iface %p, fence %p, value %#"PRIx64".\n", iface, fence_iface, value); - vk_procs = &command_queue->device->vk_procs; queue = command_queue->vkd3d_queue; - fence = unsafe_impl_from_ID3D12Fence(fence_iface); - semaphore = d3d12_fence_acquire_vk_semaphore(fence, value, &completed_value); if (!semaphore && completed_value >= value) { @@ -6346,6 +6735,122 @@ fail: return hr; } +static inline void d3d12_fence_update_gpu_wait(struct d3d12_fence *fence, const struct vkd3d_queue *queue) +{ + unsigned int i; + bool found; + int rc; + + if ((rc = vkd3d_mutex_lock(&fence->mutex))) + { + ERR("Failed to lock mutex, error %d.\n", rc); + return; + } + + for (i = 0, found = false; i < fence->gpu_wait_count; ++i) + { + if (fence->gpu_waits[i].queue == queue) + { + fence->gpu_waits[i].pending_value = queue->pending_wait_completion_value; + found = true; + } + else if (d3d12_fence_gpu_wait_is_completed(fence, i) && i < --fence->gpu_wait_count) + { + fence->gpu_waits[i] = fence->gpu_waits[fence->gpu_wait_count]; + } + } + + if (!found) + { + if (fence->gpu_wait_count < ARRAY_SIZE(fence->gpu_waits)) + { + fence->gpu_waits[fence->gpu_wait_count].queue = queue; + fence->gpu_waits[fence->gpu_wait_count++].pending_value = queue->pending_wait_completion_value; + } + else + { + FIXME("Unable to track GPU fence wait.\n"); + } + } + + vkd3d_mutex_unlock(&fence->mutex); +} + +static HRESULT d3d12_command_queue_wait_timeline_semaphore(struct d3d12_command_queue *command_queue, + struct d3d12_fence *fence, uint64_t value) +{ + static const VkPipelineStageFlagBits wait_stage_mask = VK_PIPELINE_STAGE_ALL_COMMANDS_BIT; + VkTimelineSemaphoreSubmitInfoKHR timeline_submit_info; + const struct vkd3d_vk_device_procs *vk_procs; + struct vkd3d_queue *queue; + VkSubmitInfo submit_info; + VkQueue vk_queue; + VkResult vr; + + vk_procs = &command_queue->device->vk_procs; + queue = command_queue->vkd3d_queue; + + assert(fence->timeline_semaphore); + timeline_submit_info.sType = VK_STRUCTURE_TYPE_TIMELINE_SEMAPHORE_SUBMIT_INFO_KHR; + timeline_submit_info.pNext = NULL; + timeline_submit_info.signalSemaphoreValueCount = 0; + timeline_submit_info.pSignalSemaphoreValues = NULL; + timeline_submit_info.waitSemaphoreValueCount = 1; + timeline_submit_info.pWaitSemaphoreValues = &value; + + if (!(vk_queue = vkd3d_queue_acquire(queue))) + { + ERR("Failed to acquire queue %p.\n", queue); + return E_FAIL; + } + + submit_info.sType = VK_STRUCTURE_TYPE_SUBMIT_INFO; + submit_info.pNext = &timeline_submit_info; + submit_info.waitSemaphoreCount = 1; + submit_info.pWaitSemaphores = &fence->timeline_semaphore; + submit_info.pWaitDstStageMask = &wait_stage_mask; + submit_info.commandBufferCount = 0; + submit_info.pCommandBuffers = NULL; + submit_info.signalSemaphoreCount = 0; + submit_info.pSignalSemaphores = NULL; + + ++queue->pending_wait_completion_value; + + submit_info.signalSemaphoreCount = 1; + submit_info.pSignalSemaphores = &queue->wait_completion_semaphore; + timeline_submit_info.signalSemaphoreValueCount = 1; + timeline_submit_info.pSignalSemaphoreValues = &queue->pending_wait_completion_value; + + d3d12_fence_update_gpu_wait(fence, queue); + + vr = VK_CALL(vkQueueSubmit(vk_queue, 1, &submit_info, VK_NULL_HANDLE)); + + vkd3d_queue_release(queue); + + if (vr < 0) + { + WARN("Failed to submit wait operation, vr %d.\n", vr); + return hresult_from_vk_result(vr); + } + + return S_OK; +} + +static HRESULT STDMETHODCALLTYPE d3d12_command_queue_Wait(ID3D12CommandQueue *iface, + ID3D12Fence *fence_iface, UINT64 value) +{ + struct d3d12_command_queue *command_queue = impl_from_ID3D12CommandQueue(iface); + struct d3d12_fence *fence = unsafe_impl_from_ID3D12Fence(fence_iface); + + TRACE("iface %p, fence %p, value %#"PRIx64".\n", iface, fence_iface, value); + + if (command_queue->device->use_timeline_semaphores) + return d3d12_command_queue_wait_timeline_semaphore(command_queue, fence, value); + + FIXME_ONCE("KHR_timeline_semaphore is not available or incompatible. Some wait commands may be unsupported.\n"); + return d3d12_command_queue_wait_binary_semaphore(command_queue, fence, value); +} + static HRESULT STDMETHODCALLTYPE d3d12_command_queue_GetTimestampFrequency(ID3D12CommandQueue *iface, UINT64 *frequency) { diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index eb470c12..ab087d60 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -129,6 +129,7 @@ static const struct vkd3d_optional_extension_info optional_device_extensions[] = VK_EXTENSION(KHR_MAINTENANCE3, KHR_maintenance3), VK_EXTENSION(KHR_PUSH_DESCRIPTOR, KHR_push_descriptor), VK_EXTENSION(KHR_SAMPLER_MIRROR_CLAMP_TO_EDGE, KHR_sampler_mirror_clamp_to_edge), + VK_EXTENSION(KHR_TIMELINE_SEMAPHORE, KHR_timeline_semaphore), /* EXT extensions */ VK_EXTENSION(EXT_CALIBRATED_TIMESTAMPS, EXT_calibrated_timestamps), VK_EXTENSION(EXT_CONDITIONAL_RENDERING, EXT_conditional_rendering), @@ -791,6 +792,7 @@ struct vkd3d_physical_device_info VkPhysicalDeviceTexelBufferAlignmentPropertiesEXT texel_buffer_alignment_properties; VkPhysicalDeviceTransformFeedbackPropertiesEXT xfb_properties; VkPhysicalDeviceVertexAttributeDivisorPropertiesEXT vertex_divisor_properties; + VkPhysicalDeviceTimelineSemaphorePropertiesKHR timeline_semaphore_properties; VkPhysicalDeviceProperties2KHR properties2; @@ -803,6 +805,7 @@ struct vkd3d_physical_device_info VkPhysicalDeviceTexelBufferAlignmentFeaturesEXT texel_buffer_alignment_features; VkPhysicalDeviceTransformFeedbackFeaturesEXT xfb_features; VkPhysicalDeviceVertexAttributeDivisorFeaturesEXT vertex_divisor_features; + VkPhysicalDeviceTimelineSemaphoreFeaturesKHR timeline_semaphore_features; VkPhysicalDeviceFeatures2 features2; }; @@ -814,11 +817,13 @@ static void vkd3d_physical_device_info_init(struct vkd3d_physical_device_info *i VkPhysicalDeviceDescriptorIndexingPropertiesEXT *descriptor_indexing_properties; VkPhysicalDeviceVertexAttributeDivisorPropertiesEXT *vertex_divisor_properties; VkPhysicalDeviceTexelBufferAlignmentPropertiesEXT *buffer_alignment_properties; + VkPhysicalDeviceTimelineSemaphorePropertiesKHR *timeline_semaphore_properties; VkPhysicalDeviceDescriptorIndexingFeaturesEXT *descriptor_indexing_features; VkPhysicalDeviceRobustness2FeaturesEXT *robustness2_features; VkPhysicalDeviceVertexAttributeDivisorFeaturesEXT *vertex_divisor_features; VkPhysicalDeviceTexelBufferAlignmentFeaturesEXT *buffer_alignment_features; VkPhysicalDeviceShaderDemoteToHelperInvocationFeaturesEXT *demote_features; + VkPhysicalDeviceTimelineSemaphoreFeaturesKHR *timeline_semaphore_features; VkPhysicalDeviceDepthClipEnableFeaturesEXT *depth_clip_features; VkPhysicalDeviceMaintenance3Properties *maintenance3_properties; VkPhysicalDeviceTransformFeedbackPropertiesEXT *xfb_properties; @@ -838,6 +843,8 @@ static void vkd3d_physical_device_info_init(struct vkd3d_physical_device_info *i buffer_alignment_properties = &info->texel_buffer_alignment_properties; vertex_divisor_features = &info->vertex_divisor_features; vertex_divisor_properties = &info->vertex_divisor_properties; + timeline_semaphore_features = &info->timeline_semaphore_features; + timeline_semaphore_properties = &info->timeline_semaphore_properties; xfb_features = &info->xfb_features; xfb_properties = &info->xfb_properties; @@ -859,6 +866,8 @@ static void vkd3d_physical_device_info_init(struct vkd3d_physical_device_info *i vk_prepend_struct(&info->features2, xfb_features); vertex_divisor_features->sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VERTEX_ATTRIBUTE_DIVISOR_FEATURES_EXT; vk_prepend_struct(&info->features2, vertex_divisor_features); + timeline_semaphore_features->sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TIMELINE_SEMAPHORE_FEATURES_KHR; + vk_prepend_struct(&info->features2, timeline_semaphore_features); if (vulkan_info->KHR_get_physical_device_properties2) VK_CALL(vkGetPhysicalDeviceFeatures2KHR(physical_device, &info->features2)); @@ -877,6 +886,8 @@ static void vkd3d_physical_device_info_init(struct vkd3d_physical_device_info *i vk_prepend_struct(&info->properties2, xfb_properties); vertex_divisor_properties->sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VERTEX_ATTRIBUTE_DIVISOR_PROPERTIES_EXT; vk_prepend_struct(&info->properties2, vertex_divisor_properties); + timeline_semaphore_properties->sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TIMELINE_SEMAPHORE_PROPERTIES_KHR; + vk_prepend_struct(&info->properties2, timeline_semaphore_properties); if (vulkan_info->KHR_get_physical_device_properties2) VK_CALL(vkGetPhysicalDeviceProperties2KHR(physical_device, &info->properties2)); @@ -1465,6 +1476,7 @@ static HRESULT vkd3d_init_device_caps(struct d3d12_device *device, vulkan_info->rasterization_stream = physical_device_info->xfb_properties.transformFeedbackRasterizationStreamSelect; vulkan_info->transform_feedback_queries = physical_device_info->xfb_properties.transformFeedbackQueries; vulkan_info->max_vertex_attrib_divisor = max(physical_device_info->vertex_divisor_properties.maxVertexAttribDivisor, 1); + vulkan_info->timeline_semaphore_properties = physical_device_info->timeline_semaphore_properties; device->feature_options.DoublePrecisionFloatShaderOps = features->shaderFloat64; device->feature_options.OutputMergerLogicOp = features->logicOp; @@ -1589,6 +1601,8 @@ static HRESULT vkd3d_init_device_caps(struct d3d12_device *device, vulkan_info->EXT_shader_demote_to_helper_invocation = false; if (!physical_device_info->texel_buffer_alignment_features.texelBufferAlignment) vulkan_info->EXT_texel_buffer_alignment = false; + if (!physical_device_info->timeline_semaphore_features.timelineSemaphore) + vulkan_info->KHR_timeline_semaphore = false; vulkan_info->texel_buffer_alignment_properties = physical_device_info->texel_buffer_alignment_properties; @@ -1939,6 +1953,75 @@ static bool d3d12_is_64k_msaa_supported(struct d3d12_device *device) && info.Alignment <= 0x10000; } +/* A lower value can be signalled on a D3D12 fence. Vulkan timeline semaphores + * do not support this, but test if it works anyway. */ +static bool d3d12_is_timeline_semaphore_supported(const struct d3d12_device *device) +{ + const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; + VkTimelineSemaphoreSubmitInfoKHR timeline_submit_info; + VkSemaphore timeline_semaphore; + VkSubmitInfo submit_info; + bool result = false; + uint64_t value = 0; + VkQueue vk_queue; + VkResult vr; + + if (!device->vk_info.KHR_timeline_semaphore) + return false; + + if ((vr = vkd3d_create_timeline_semaphore(device, 1, &timeline_semaphore)) < 0) + { + WARN("Failed to create timeline semaphore, vr %d.\n", vr); + return false; + } + + if (!(vk_queue = vkd3d_queue_acquire(device->direct_queue))) + { + ERR("Failed to acquire queue %p.\n", device->direct_queue); + VK_CALL(vkDestroySemaphore(device->vk_device, timeline_semaphore, NULL)); + return false; + } + + submit_info.sType = VK_STRUCTURE_TYPE_SUBMIT_INFO; + submit_info.pNext = &timeline_submit_info; + submit_info.waitSemaphoreCount = 0; + submit_info.pWaitSemaphores = NULL; + submit_info.pWaitDstStageMask = NULL; + submit_info.commandBufferCount = 0; + submit_info.pCommandBuffers = NULL; + submit_info.signalSemaphoreCount = 1; + submit_info.pSignalSemaphores = &timeline_semaphore; + + timeline_submit_info.sType = VK_STRUCTURE_TYPE_TIMELINE_SEMAPHORE_SUBMIT_INFO_KHR; + timeline_submit_info.pNext = NULL; + timeline_submit_info.pSignalSemaphoreValues = &value; + timeline_submit_info.signalSemaphoreValueCount = 1; + timeline_submit_info.waitSemaphoreValueCount = 0; + timeline_submit_info.pWaitSemaphoreValues = NULL; + + vr = VK_CALL(vkQueueSubmit(vk_queue, 1, &submit_info, VK_NULL_HANDLE)); + + if (vr >= 0) + { + if ((vr = VK_CALL(vkQueueWaitIdle(vk_queue))) < 0) + WARN("Failed to wait for queue, vr %d.\n", vr); + + if ((vr = VK_CALL(vkGetSemaphoreCounterValueKHR(device->vk_device, timeline_semaphore, &value))) < 0) + ERR("Failed to get Vulkan semaphore status, vr %d.\n", vr); + else if (!(result = !value)) + WARN("Disabling timeline semaphore use due to incompatible behaviour.\n"); + } + else + { + WARN("Failed to submit signal operation, vr %d.\n", vr); + } + + vkd3d_queue_release(device->direct_queue); + VK_CALL(vkDestroySemaphore(device->vk_device, timeline_semaphore, NULL)); + + return result; +} + static HRESULT vkd3d_create_vk_device(struct d3d12_device *device, const struct vkd3d_device_create_info *create_info) { @@ -2037,6 +2120,10 @@ static HRESULT vkd3d_create_vk_device(struct d3d12_device *device, } device->feature_options4.MSAA64KBAlignedTextureSupported = d3d12_is_64k_msaa_supported(device); + device->use_timeline_semaphores = d3d12_is_timeline_semaphore_supported(device) + && vkd3d_queue_init_timeline_semaphore(device->direct_queue, device) + && vkd3d_queue_init_timeline_semaphore(device->compute_queue, device) + && vkd3d_queue_init_timeline_semaphore(device->copy_queue, device); TRACE("Created Vulkan device %p.\n", vk_device); diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 796dfefd..56060b6d 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -59,6 +59,7 @@ #define VKD3D_MAX_SHADER_EXTENSIONS 3u #define VKD3D_MAX_SHADER_STAGES 5u #define VKD3D_MAX_VK_SYNC_OBJECTS 4u +#define VKD3D_MAX_FENCE_WAITING_QUEUES 4u #define VKD3D_MAX_DESCRIPTOR_SETS 64u /* D3D12 binding tier 3 has a limit of 2048 samplers. */ #define VKD3D_MAX_DESCRIPTOR_SET_SAMPLERS 2048u @@ -125,6 +126,7 @@ struct vkd3d_vulkan_info bool KHR_maintenance3; bool KHR_push_descriptor; bool KHR_sampler_mirror_clamp_to_edge; + bool KHR_timeline_semaphore; /* EXT device extensions */ bool EXT_calibrated_timestamps; bool EXT_conditional_rendering; @@ -150,6 +152,8 @@ struct vkd3d_vulkan_info VkPhysicalDeviceTexelBufferAlignmentPropertiesEXT texel_buffer_alignment_properties; + VkPhysicalDeviceTimelineSemaphorePropertiesKHR timeline_semaphore_properties; + unsigned int shader_extension_count; enum vkd3d_shader_spirv_extension shader_extensions[VKD3D_MAX_SHADER_EXTENSIONS]; @@ -348,6 +352,7 @@ struct vkd3d_fence_worker struct vkd3d_enqueued_fence { VkFence vk_fence; + VkSemaphore vk_semaphore; struct vkd3d_waiting_fence waiting_fence; } *enqueued_fences; size_t enqueued_fences_size; @@ -357,6 +362,12 @@ struct vkd3d_fence_worker size_t vk_fences_size; struct vkd3d_waiting_fence *fences; size_t fences_size; + VkSemaphore *vk_semaphores; + size_t vk_semaphores_size; + uint64_t *semaphore_wait_values; + size_t semaphore_wait_values_size; + + void (*wait_for_gpu_fences)(struct vkd3d_fence_worker *worker); struct d3d12_device *device; }; @@ -511,6 +522,12 @@ struct vkd3d_signaled_semaphore bool is_acquired; }; +struct vkd3d_pending_fence_wait +{ + const struct vkd3d_queue *queue; + uint64_t pending_value; +}; + /* ID3D12Fence */ struct d3d12_fence { @@ -530,6 +547,11 @@ struct d3d12_fence size_t events_size; size_t event_count; + VkSemaphore timeline_semaphore; + uint64_t pending_timeline_value; + struct vkd3d_pending_fence_wait gpu_waits[VKD3D_MAX_FENCE_WAITING_QUEUES]; + unsigned int gpu_wait_count; + struct list semaphores; unsigned int semaphore_count; @@ -545,6 +567,9 @@ struct d3d12_fence HRESULT d3d12_fence_create(struct d3d12_device *device, uint64_t initial_value, D3D12_FENCE_FLAGS flags, struct d3d12_fence **fence); +VkResult vkd3d_create_timeline_semaphore(const struct d3d12_device *device, uint64_t initial_value, + VkSemaphore *timeline_semaphore); + /* ID3D12Heap */ struct d3d12_heap { @@ -1284,6 +1309,9 @@ struct vkd3d_queue VkQueueFlags vk_queue_flags; uint32_t timestamp_bits; + VkSemaphore wait_completion_semaphore; + uint64_t pending_wait_completion_value; + struct { VkSemaphore vk_semaphore; @@ -1298,6 +1326,7 @@ struct vkd3d_queue VkQueue vkd3d_queue_acquire(struct vkd3d_queue *queue); HRESULT vkd3d_queue_create(struct d3d12_device *device, uint32_t family_index, const VkQueueFamilyProperties *properties, struct vkd3d_queue **queue); +bool vkd3d_queue_init_timeline_semaphore(struct vkd3d_queue *queue, struct d3d12_device *device); void vkd3d_queue_destroy(struct vkd3d_queue *queue, struct d3d12_device *device); void vkd3d_queue_release(struct vkd3d_queue *queue); @@ -1456,6 +1485,7 @@ struct d3d12_device VkDescriptorPoolSize vk_pool_sizes[VKD3D_DESCRIPTOR_POOL_COUNT]; struct vkd3d_vk_descriptor_heap_layout vk_descriptor_heap_layouts[VKD3D_SET_INDEX_COUNT]; bool use_vk_heaps; + bool use_timeline_semaphores; }; HRESULT d3d12_device_create(struct vkd3d_instance *instance, diff --git a/libs/vkd3d/vulkan_procs.h b/libs/vkd3d/vulkan_procs.h index 60556735..34e0ab4b 100644 --- a/libs/vkd3d/vulkan_procs.h +++ b/libs/vkd3d/vulkan_procs.h @@ -195,6 +195,11 @@ VK_DEVICE_EXT_PFN(vkGetDescriptorSetLayoutSupportKHR) /* VK_KHR_push_descriptor */ VK_DEVICE_EXT_PFN(vkCmdPushDescriptorSetKHR) +/* VK_KHR_timeline_semaphore */ +VK_DEVICE_EXT_PFN(vkGetSemaphoreCounterValueKHR) +VK_DEVICE_EXT_PFN(vkWaitSemaphoresKHR) +VK_DEVICE_EXT_PFN(vkSignalSemaphoreKHR) + /* VK_EXT_calibrated_timestamps */ VK_DEVICE_EXT_PFN(vkGetCalibratedTimestampsEXT) diff --git a/tests/d3d12.c b/tests/d3d12.c index 29bd40c8..2059b182 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -33240,7 +33240,9 @@ static void test_queue_wait(void) command_list = context.list; queue = context.queue; - queue2 = create_command_queue(device, D3D12_COMMAND_LIST_TYPE_DIRECT, D3D12_COMMAND_QUEUE_PRIORITY_NORMAL); + /* 'queue2' must not map to the same command queue as 'queue', or Wait() before GPU signal will fail. + * Using a compute queue fixes this on most hardware, but it may still fail on low spec hardware. */ + queue2 = create_command_queue(device, D3D12_COMMAND_LIST_TYPE_COMPUTE, D3D12_COMMAND_QUEUE_PRIORITY_NORMAL); event = create_event(); ok(event, "Failed to create event.\n"); @@ -33305,12 +33307,6 @@ static void test_queue_wait(void) check_readback_data_uint(&rb, NULL, 0xff00ff00, 0); release_resource_readback(&rb); - if (!vkd3d_test_platform_is_windows()) - { - skip("Wait() is not implemented yet.\n"); /* FIXME */ - goto skip_tests; - } - /* Wait() before CPU signal */ update_buffer_data(cb, 0, sizeof(blue), &blue); queue_wait(queue, fence, 2); @@ -33386,7 +33382,6 @@ static void test_queue_wait(void) check_readback_data_uint(&rb, NULL, 0xff00ff00, 0); release_resource_readback(&rb); -skip_tests: /* Signal() and Wait() in the same command queue */ update_buffer_data(cb, 0, sizeof(blue), &blue); queue_signal(queue, fence, 7); -- 2.20.1

2 1

[PATCH v2] include: Add some math declarations.
by Daniel Lehman 06 Apr '22

06 Apr '22

Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> --- v2: correct some declarations --- include/msvcrt/math.h | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/include/msvcrt/math.h b/include/msvcrt/math.h index da07303bcd9..82f58839cd8 100644 --- a/include/msvcrt/math.h +++ b/include/msvcrt/math.h @@ -69,12 +69,16 @@ _ACRTIMP double __cdecl fabs(double); _ACRTIMP double __cdecl ldexp(double, int); _ACRTIMP double __cdecl frexp(double, int*); _ACRTIMP double __cdecl modf(double, double*); +_ACRTIMP double __cdecl fdim(double, double); _ACRTIMP double __cdecl fmod(double, double); _ACRTIMP double __cdecl fmin(double, double); _ACRTIMP double __cdecl fmax(double, double); _ACRTIMP double __cdecl erf(double); +_ACRTIMP double __cdecl remainder(double, double); _ACRTIMP double __cdecl remquo(double, double, int*); _ACRTIMP float __cdecl remquof(float, float, int*); +_ACRTIMP double __cdecl lgamma(double); +_ACRTIMP double __cdecl tgamma(double); _ACRTIMP double __cdecl _hypot(double, double); _ACRTIMP double __cdecl _j0(double); @@ -86,18 +90,31 @@ _ACRTIMP double __cdecl _yn(int, double); _ACRTIMP double __cdecl cbrt(double); _ACRTIMP double __cdecl exp2(double); +_ACRTIMP double __cdecl expm1(double); +_ACRTIMP double __cdecl log1p(double); _ACRTIMP double __cdecl log2(double); +_ACRTIMP double __cdecl logb(double); _ACRTIMP double __cdecl rint(double); _ACRTIMP double __cdecl round(double); _ACRTIMP double __cdecl trunc(double); _ACRTIMP float __cdecl cbrtf(float); _ACRTIMP float __cdecl exp2f(float); +_ACRTIMP float __cdecl expm1f(float); +_ACRTIMP float __cdecl log1pf(float); _ACRTIMP float __cdecl log2f(float); +_ACRTIMP float __cdecl logbf(float); _ACRTIMP float __cdecl rintf(float); _ACRTIMP float __cdecl roundf(float); _ACRTIMP float __cdecl truncf(float); +_ACRTIMP int __cdecl ilogb(double); +_ACRTIMP int __cdecl ilogbf(float); + +_ACRTIMP long long __cdecl llrint(double); +_ACRTIMP long long __cdecl llrintf(float); +_ACRTIMP long long __cdecl llround(double); +_ACRTIMP long long __cdecl llroundf(float); _ACRTIMP __msvcrt_long __cdecl lrint(double); _ACRTIMP __msvcrt_long __cdecl lrintf(float); _ACRTIMP __msvcrt_long __cdecl lround(double); @@ -105,6 +122,8 @@ _ACRTIMP __msvcrt_long __cdecl lroundf(float); _ACRTIMP double __cdecl scalbn(double,int); _ACRTIMP float __cdecl scalbnf(float,int); +_ACRTIMP double __cdecl scalbln(double,__msvcrt_long); +_ACRTIMP float __cdecl scalblnf(float,__msvcrt_long); _ACRTIMP double __cdecl _copysign (double, double); _ACRTIMP double __cdecl _chgsign (double); @@ -115,6 +134,8 @@ _ACRTIMP int __cdecl _finite(double); _ACRTIMP int __cdecl _isnan(double); _ACRTIMP int __cdecl _fpclass(double); +_ACRTIMP double __cdecl nextafter(double, double); + #ifndef __i386__ _ACRTIMP float __cdecl sinf(float); @@ -199,6 +220,14 @@ _ACRTIMP float __cdecl _logbf(float); _ACRTIMP float __cdecl acoshf(float); _ACRTIMP float __cdecl asinhf(float); _ACRTIMP float __cdecl atanhf(float); +_ACRTIMP float __cdecl erff(float); +_ACRTIMP float __cdecl fdimf(float, float); +_ACRTIMP float __cdecl fmaxf(float, float); +_ACRTIMP float __cdecl fminf(float, float); +_ACRTIMP float __cdecl lgammaf(float); +_ACRTIMP float __cdecl nextafterf(float, float); +_ACRTIMP float __cdecl remainderf(float, float); +_ACRTIMP float __cdecl tgammaf(float); #else @@ -208,6 +237,14 @@ static inline float _logbf(float x) { return _logb(x); } static inline float acoshf(float x) { return acosh(x); } static inline float asinhf(float x) { return asinh(x); } static inline float atanhf(float x) { return atanh(x); } +static inline float erff(float x) { return erf(x); } +static inline float fdimf(float x, float y) { return fdim(x, y); } +static inline float fmaxf(float x, float y) { return fmax(x, y); } +static inline float fminf(float x, float y) { return fmin(x, y); } +static inline float lgammaf(float x) { return lgamma(x); } +static inline float nextafterf(float x, float y) { return nextafter(x, y); } +static inline float remainderf(float x, float y) { return remainder(x, y); } +static inline float tgammaf(float x) { return tgamma(x); } #endif -- 2.25.1

3 2

[PATCH v3 1/7] include/winerror.h: Add missing WinRT HRESULT codes.
by Bernhard Kölbl 06 Apr '22

06 Apr '22

Taken from MSDN and original winerror.h. Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> --- include/winerror.h | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/include/winerror.h b/include/winerror.h index b63b74a5b18..d51d5648cdb 100644 --- a/include/winerror.h +++ b/include/winerror.h @@ -2578,6 +2578,25 @@ static inline HRESULT HRESULT_FROM_WIN32(unsigned int x) #define E_CHANGED_STATE _HRESULT_TYPEDEF_(0x8000000C) #define E_ILLEGAL_STATE_CHANGE _HRESULT_TYPEDEF_(0x8000000D) #define E_ILLEGAL_METHOD_CALL _HRESULT_TYPEDEF_(0x8000000E) +#define RO_E_METADATA_NAME_NOT_FOUND _HRESULT_TYPEDEF_(0x8000000F) +#define RO_E_METADATA_NAME_IS_NAMESPACE _HRESULT_TYPEDEF_(0x80000010) +#define RO_E_METADATA_INVALID_TYPE_FORMAT _HRESULT_TYPEDEF_(0x80000011) +#define RO_E_INVALID_METADATA_FILE _HRESULT_TYPEDEF_(0x80000012) +#define RO_E_CLOSED _HRESULT_TYPEDEF_(0x80000013) +#define RO_E_EXCLUSIVE_WRITE _HRESULT_TYPEDEF_(0x80000014) +#define RO_E_CHANGE_NOTIFICATION_IN_PROGRESS _HRESULT_TYPEDEF_(0x80000015) +#define RO_E_ERROR_STRING_NOT_FOUND _HRESULT_TYPEDEF_(0x80000016) +#define E_STRING_NOT_NULL_TERMINATED _HRESULT_TYPEDEF_(0x80000017) +#define E_ILLEGAL_DELEGATE_ASSIGNMENT _HRESULT_TYPEDEF_(0x80000018) +#define E_ASYNC_OPERATION_NOT_STARTED _HRESULT_TYPEDEF_(0x80000019) +#define E_APPLICATION_EXITING _HRESULT_TYPEDEF_(0x8000001A) +#define E_APPLICATION_VIEW_EXITING _HRESULT_TYPEDEF_(0x8000001B) +#define RO_E_MUST_BE_AGILE _HRESULT_TYPEDEF_(0x8000001C) +#define RO_E_UNSUPPORTED_FROM_MTA _HRESULT_TYPEDEF_(0x8000001D) +#define RO_E_COMMITTED _HRESULT_TYPEDEF_(0x8000001E) +#define RO_E_BLOCKED_CROSS_ASTA_CALL _HRESULT_TYPEDEF_(0x8000001F) +#define RO_E_CANNOT_ACTIVATE_FULL_TRUST_SERVER _HRESULT_TYPEDEF_(0x80000020) +#define RO_E_CANNOT_ACTIVATE_UNIVERSAL_APPLICATION_SERVER _HRESULT_TYPEDEF_(0x80000021) #define E_NOTIMPL _HRESULT_TYPEDEF_(0x80004001) #define E_NOINTERFACE _HRESULT_TYPEDEF_(0x80004002) -- 2.35.1

2 12

[PATCH vkd3d v3 1/7] vkd3d-shader/hlsl: Lower casts to bool to comparisons.
by Giovanni Mascellani 06 Apr '22

06 Apr '22

Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- v3: * Fix optimization passes order. * Rename lower_cast_to_bool() to lower_casts_to_bool(). --- libs/vkd3d-shader/hlsl_codegen.c | 32 +++++++++++++++++++++++++++ libs/vkd3d-shader/hlsl_constant_ops.c | 9 ++------ libs/vkd3d-shader/hlsl_sm4.c | 3 ++- 3 files changed, 36 insertions(+), 8 deletions(-) diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 2b05264c..72c00430 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -750,6 +750,37 @@ static bool lower_division(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, voi return true; } +static bool lower_casts_to_bool(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void *context) +{ + struct hlsl_type *type = instr->data_type, *arg_type; + struct hlsl_ir_constant *zero; + struct hlsl_ir_expr *expr; + + if (instr->type != HLSL_IR_EXPR) + return false; + expr = hlsl_ir_expr(instr); + if (expr->op != HLSL_OP1_CAST) + return false; + arg_type = expr->operands[0].node->data_type; + if (type->type > HLSL_CLASS_VECTOR || arg_type->type > HLSL_CLASS_VECTOR) + return false; + if (type->base_type != HLSL_TYPE_BOOL) + return false; + + /* Narrowing casts should have already been lowered. */ + assert(type->dimx == arg_type->dimx); + + zero = hlsl_new_constant(ctx, arg_type, &instr->loc); + if (!zero) + return false; + list_add_before(&instr->entry, &zero->node.entry); + + expr->op = HLSL_OP2_NEQUAL; + hlsl_src_from_node(&expr->operands[1], &zero->node); + + return true; +} + static bool dce(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void *context) { switch (instr->type) @@ -1655,6 +1686,7 @@ int hlsl_emit_bytecode(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry } while (progress); transform_ir(ctx, lower_narrowing_casts, body, NULL); + transform_ir(ctx, lower_casts_to_bool, body, NULL); do { progress = transform_ir(ctx, hlsl_fold_constants, body, NULL); diff --git a/libs/vkd3d-shader/hlsl_constant_ops.c b/libs/vkd3d-shader/hlsl_constant_ops.c index e282dbd4..5cac4bde 100644 --- a/libs/vkd3d-shader/hlsl_constant_ops.c +++ b/libs/vkd3d-shader/hlsl_constant_ops.c @@ -27,7 +27,6 @@ static bool fold_cast(struct hlsl_ctx *ctx, struct hlsl_ir_constant *dst, struct int32_t i; double d; float f; - bool b; if (dst->node.data_type->dimx != src->node.data_type->dimx || dst->node.data_type->dimy != src->node.data_type->dimy) @@ -47,7 +46,6 @@ static bool fold_cast(struct hlsl_ctx *ctx, struct hlsl_ir_constant *dst, struct i = src->value[k].f; f = src->value[k].f; d = src->value[k].f; - b = !!src->value[k].f; break; case HLSL_TYPE_DOUBLE: @@ -55,7 +53,6 @@ static bool fold_cast(struct hlsl_ctx *ctx, struct hlsl_ir_constant *dst, struct i = src->value[k].d; f = src->value[k].d; d = src->value[k].d; - b = !!src->value[k].d; break; case HLSL_TYPE_INT: @@ -63,7 +60,6 @@ static bool fold_cast(struct hlsl_ctx *ctx, struct hlsl_ir_constant *dst, struct i = src->value[k].i; f = src->value[k].i; d = src->value[k].i; - b = !!src->value[k].i; break; case HLSL_TYPE_UINT: @@ -71,7 +67,6 @@ static bool fold_cast(struct hlsl_ctx *ctx, struct hlsl_ir_constant *dst, struct i = src->value[k].u; f = src->value[k].u; d = src->value[k].u; - b = !!src->value[k].u; break; case HLSL_TYPE_BOOL: @@ -79,7 +74,6 @@ static bool fold_cast(struct hlsl_ctx *ctx, struct hlsl_ir_constant *dst, struct i = !!src->value[k].u; f = !!src->value[k].u; d = !!src->value[k].u; - b = !!src->value[k].u; break; default: @@ -107,7 +101,8 @@ static bool fold_cast(struct hlsl_ctx *ctx, struct hlsl_ir_constant *dst, struct break; case HLSL_TYPE_BOOL: - dst->value[k].u = b ? ~0u : 0; + /* Casts to bool should have already been lowered. */ + assert(0); break; default: diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index 872118c1..f3530084 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -1540,7 +1540,8 @@ static void write_sm4_cast(struct hlsl_ctx *ctx, break; case HLSL_TYPE_BOOL: - hlsl_fixme(ctx, &expr->node.loc, "SM4 cast to bool.\n"); + /* Casts to bool should have already been lowered. */ + assert(0); break; default: -- 2.35.1

2 7

[PATCH vkd3d v2 1/9] vkd3d-shader/hlsl: Use an unsigned variable for iteration.
by Giovanni Mascellani 06 Apr '22

06 Apr '22

Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- v2: * New --- libs/vkd3d-shader/hlsl_constant_ops.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/hlsl_constant_ops.c b/libs/vkd3d-shader/hlsl_constant_ops.c index 51cee179..109fc2ee 100644 --- a/libs/vkd3d-shader/hlsl_constant_ops.c +++ b/libs/vkd3d-shader/hlsl_constant_ops.c @@ -194,11 +194,12 @@ static bool fold_mul(struct hlsl_ctx *ctx, struct hlsl_ir_constant *dst, struct hlsl_ir_constant *src1, struct hlsl_ir_constant *src2) { enum hlsl_base_type type = dst->node.data_type->base_type; + unsigned int k; assert(type == src1->node.data_type->base_type); assert(type == src2->node.data_type->base_type); - for (int k = 0; k < 4; ++k) + for (k = 0; k < 4; ++k) { switch (type) { -- 2.35.1

4 35

[PATCH] mf/session: Use correct format specifier for start position.
by Nikolay Sivov 06 Apr '22

06 Apr '22

Fixup for 3f84ee1eb6637602e3e95fee20985444639b4602. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mf/session.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index 85cbcc29630..85b63f767fe 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -2009,7 +2009,7 @@ static HRESULT WINAPI mfsession_Start(IMFMediaSession *iface, const GUID *format struct session_op *op; HRESULT hr; - TRACE("%p, %s, %p.\n", iface, debugstr_guid(format), debugstr_propvar(start_position)); + TRACE("%p, %s, %s.\n", iface, debugstr_guid(format), debugstr_propvar(start_position)); if (!start_position) return E_POINTER; -- 2.35.1

1 0

[PATCH 1/3] evr/presenter: Fix hns-to-msec conversion multiplier.
by Nikolay Sivov 06 Apr '22

06 Apr '22

From: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/evr/presenter.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/evr/presenter.c b/dlls/evr/presenter.c index 7e14cb2f720..1b119ce9cab 100644 --- a/dlls/evr/presenter.c +++ b/dlls/evr/presenter.c @@ -548,7 +548,7 @@ static void video_presenter_check_queue(struct video_presenter *presenter, if (delta > 3 * presenter->frame_time_threshold) { /* Convert 100ns -> msec */ - wait = (delta - 3 * presenter->frame_time_threshold) / 100000; + wait = (delta - 3 * presenter->frame_time_threshold) / 10000; present = FALSE; } } -- 2.35.1

1 2

[PATCH] combase: Don't start dllhost if the CLSID key doesn't exist.
by Huw Davies 06 Apr '22

06 Apr '22

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/combase/rpc.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/combase/rpc.c b/dlls/combase/rpc.c index f620339f19e..c8401fe0cbd 100644 --- a/dlls/combase/rpc.c +++ b/dlls/combase/rpc.c @@ -538,6 +538,12 @@ static HRESULT create_surrogate_server(REFCLSID rclsid, HANDLE *process) TRACE("Attempting to start surrogate server for %s\n", debugstr_guid(rclsid)); + hr = open_key_for_clsid(rclsid, NULL, KEY_READ, &key); + if (FAILED(hr) && (arch == 64 || (IsWow64Process(GetCurrentProcess(), &is_wow64) && is_wow64))) + hr = open_key_for_clsid(rclsid, NULL, opposite | KEY_READ, &key); + if (FAILED(hr)) return hr; + RegCloseKey(key); + hr = open_appidkey_from_clsid(rclsid, KEY_READ, &key); if (FAILED(hr) && (arch == 64 || (IsWow64Process(GetCurrentProcess(), &is_wow64) && is_wow64))) { -- 2.23.0

1 0

[PATCH 1/3] include: Add ACTIVATION_CONTEXT_SECTION_WINRT_ACTIVATABLE_CLASSES declaration.
by Rémi Bernon 06 Apr '22

06 Apr '22

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- include/winnt.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/winnt.h b/include/winnt.h index 079858d2f7d..31c6b7d69e9 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -5861,6 +5861,7 @@ typedef enum _ACTIVATION_CONTEXT_INFO_CLASS { #define ACTIVATION_CONTEXT_SECTION_CLR_SURROGATES 9 #define ACTIVATION_CONTEXT_SECTION_APPLICATION_SETTINGS 10 #define ACTIVATION_CONTEXT_SECTION_COMPATIBILITY_INFO 11 +#define ACTIVATION_CONTEXT_SECTION_WINRT_ACTIVATABLE_CLASSES 12 typedef enum _JOBOBJECTINFOCLASS { -- 2.35.1

1 2

Re: TestBot job 111813 results: [PATCH 1/3] ntdll/tests: Add some exception tests.
by Daniel Lehman 06 Apr '22

06 Apr '22

> You can also see the results at: > https://testbot.winehq.org/JobDetails.pl?Key=111813 > > > === debian11 (64 bit WoW report) === > > Report validation errors: > ntdll:exception prints too much data (35604 bytes) I have similar errors in these as well: - https://testbot.winehq.org/JobDetails.pl?Key=111814 - https://testbot.winehq.org/JobDetails.pl?Key=111815 but i didn't see them in testbot before i submitted. i retried this one on testbot and it passed: https://testbot.winehq.org/JobDetails.pl?Key=112000 anything i can do different? thanks daniel

1 0

[PATCH] cryptnet: Support verifying certificate revocation with OCSP.
by Hans Leidekker 06 Apr '22

06 Apr '22

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/cryptnet/Makefile.in | 2 +- dlls/cryptnet/cryptnet_main.c | 391 ++++++++++++++++++++++++++++++++-- include/wincrypt.h | 4 + 3 files changed, 375 insertions(+), 22 deletions(-) diff --git a/dlls/cryptnet/Makefile.in b/dlls/cryptnet/Makefile.in index 8b13861da1e..af41122193f 100644 --- a/dlls/cryptnet/Makefile.in +++ b/dlls/cryptnet/Makefile.in @@ -1,6 +1,6 @@ MODULE = cryptnet.dll IMPORTLIB = cryptnet -IMPORTS = crypt32 shell32 ole32 +IMPORTS = crypt32 shell32 ole32 advapi32 DELAYIMPORTS = wininet C_SRCS = \ diff --git a/dlls/cryptnet/cryptnet_main.c b/dlls/cryptnet/cryptnet_main.c index 8aec76e9b81..6654ef77c8c 100644 --- a/dlls/cryptnet/cryptnet_main.c +++ b/dlls/cryptnet/cryptnet_main.c @@ -1720,37 +1720,386 @@ static DWORD verify_cert_revocation_from_dist_points_ext(const CRYPT_DATA_BLOB * return error; } +static void sha1_hash(const BYTE *data, DWORD datalen, BYTE *buf, DWORD *buflen) +{ + HCRYPTPROV prov; + HCRYPTHASH hash; + + CryptAcquireContextW(&prov, NULL, NULL, PROV_RSA_FULL, CRYPT_VERIFYCONTEXT); + CryptCreateHash(prov, CALG_SHA1, 0, 0, &hash); + CryptHashData(hash, data, datalen, 0); + CryptGetHashParam(hash, HP_HASHVAL, buf, buflen, 0); + + CryptDestroyHash(hash); + CryptReleaseContext(prov, 0); +} + +static BYTE *build_ocsp_request(const CERT_CONTEXT *cert, const CERT_CONTEXT *issuer_cert, DWORD *ret_size) +{ + OCSP_REQUEST_ENTRY entry; + OCSP_REQUEST_INFO request; + OCSP_SIGNED_REQUEST_INFO request_signed; + CERT_INFO *issuer = issuer_cert->pCertInfo; + BYTE issuer_name_hash[20], issuer_key_hash[20], *buf, *ret; + DWORD size = 0, hash_len = sizeof(issuer_name_hash); + + memset(&entry, 0, sizeof(entry)); + entry.CertId.HashAlgorithm.pszObjId = (char *)szOID_OIWSEC_sha1; + + sha1_hash(issuer->Subject.pbData, issuer->Subject.cbData, issuer_name_hash, &hash_len); + entry.CertId.IssuerNameHash.cbData = sizeof(issuer_name_hash); + entry.CertId.IssuerNameHash.pbData = issuer_name_hash; + + sha1_hash(issuer->SubjectPublicKeyInfo.PublicKey.pbData, issuer->SubjectPublicKeyInfo.PublicKey.cbData, + issuer_key_hash, &hash_len); + entry.CertId.IssuerKeyHash.cbData = sizeof(issuer_key_hash); + entry.CertId.IssuerKeyHash.pbData = issuer_key_hash; + + entry.CertId.SerialNumber.cbData = cert->pCertInfo->SerialNumber.cbData; + entry.CertId.SerialNumber.pbData = cert->pCertInfo->SerialNumber.pbData; + + request.dwVersion = OCSP_REQUEST_V1; + request.pRequestorName = NULL; + request.cRequestEntry = 1; + request.rgRequestEntry = &entry; + request.cExtension = 0; + request.rgExtension = NULL; + if (!CryptEncodeObjectEx(X509_ASN_ENCODING, OCSP_REQUEST, &request, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size)) + { + ERR("failed to encode request %#lx\n", GetLastError()); + return NULL; + } + + request_signed.ToBeSigned.pbData = buf; + request_signed.ToBeSigned.cbData = size; + request_signed.pOptionalSignatureInfo = NULL; + if (!CryptEncodeObjectEx(X509_ASN_ENCODING, OCSP_SIGNED_REQUEST, &request_signed, CRYPT_ENCODE_ALLOC_FLAG, NULL, + &ret, &size)) + { + ERR("failed to encode signed request %#lx\n", GetLastError()); + LocalFree(buf); + return NULL; + } + + LocalFree(buf); + *ret_size = size; + return ret; +} + +static void escape_path(const WCHAR *src, DWORD src_len, WCHAR *dst, DWORD *dst_len) +{ + static const WCHAR hex[] = L"0123456789ABCDEF"; + WCHAR *ptr = dst; + DWORD i; + + *dst_len = src_len; + for (i = 0; i < src_len; i++) + { + if (src[i] == '+' || src[i] == '/' || src[i] == '=') + { + if (dst) + { + ptr[0] = '%'; + ptr[1] = hex[(src[i] >> 4) & 0xf]; + ptr[2] = hex[src[i] & 0xf]; + ptr += 3; + } + *dst_len += 2; + } + else if (dst) *ptr++ = src[i]; + } +} + +static WCHAR *build_request_path(const BYTE *data, DWORD data_size) +{ + WCHAR *path, *ret; + DWORD path_len, ret_len; + + if (!CryptBinaryToStringW(data, data_size, CRYPT_STRING_BASE64 | CRYPT_STRING_NOCRLF, NULL, &path_len)) return NULL; + if (!(path = malloc(path_len * sizeof(WCHAR)))) return NULL; + CryptBinaryToStringW(data, data_size, CRYPT_STRING_BASE64 | CRYPT_STRING_NOCRLF, path, &path_len); + + escape_path(path, path_len, NULL, &ret_len); + if (!(ret = malloc((ret_len + 2) * sizeof(WCHAR)))) + { + free(path); + return NULL; + } + escape_path(path, path_len, ret + 1, &ret_len); + ret[ret_len + 1] = 0; + ret[0] = '/'; + + free(path); + return ret; +} + +static WCHAR *build_request_url(const WCHAR *base_url, const BYTE *data, DWORD data_size) +{ + WCHAR *path, *ret; + DWORD len = 0; + + if (!(path = build_request_path(data, data_size))) return NULL; + + InternetCombineUrlW(base_url, path, NULL, &len, 0); + if (!(ret = malloc(len * sizeof(WCHAR)))) + { + free(path); + return NULL; + } + InternetCombineUrlW(base_url, path, ret, &len, 0); + free(path); + return ret; +} + +static DWORD map_ocsp_status(DWORD status) +{ + switch (status) + { + case OCSP_BASIC_GOOD_CERT_STATUS: return ERROR_SUCCESS; + case OCSP_BASIC_REVOKED_CERT_STATUS: return CRYPT_E_REVOKED; + case OCSP_BASIC_UNKNOWN_CERT_STATUS: return CRYPT_E_REVOCATION_OFFLINE; + default: + FIXME("unhandled status %lu\n", status); + return CRYPT_E_REVOCATION_OFFLINE; + } +} + +static BOOL match_cert_id(const OCSP_CERT_ID *id, const CERT_INFO *cert, const CERT_INFO *issuer) +{ + BYTE hash[20]; + DWORD hash_len = sizeof(hash); + + if (!id->HashAlgorithm.pszObjId || strcmp(id->HashAlgorithm.pszObjId, szOID_OIWSEC_sha1)) + { + FIXME("hash algorithm %s not supported\n", debugstr_a(id->HashAlgorithm.pszObjId)); + return FALSE; + } + + sha1_hash(issuer->Subject.pbData, issuer->Subject.cbData, hash, &hash_len); + if (id->IssuerNameHash.cbData != hash_len) return FALSE; + if (memcmp(id->IssuerNameHash.pbData, hash, hash_len)) return FALSE; + + sha1_hash(issuer->SubjectPublicKeyInfo.PublicKey.pbData, + issuer->SubjectPublicKeyInfo.PublicKey.cbData, hash, &hash_len); + if (id->IssuerKeyHash.cbData != hash_len) return FALSE; + if (memcmp(id->IssuerKeyHash.pbData, hash, hash_len)) return FALSE; + + if (cert->SerialNumber.cbData != id->SerialNumber.cbData) return FALSE; + return !memcmp(cert->SerialNumber.pbData, id->SerialNumber.pbData, id->SerialNumber.cbData); +} + +static DWORD check_ocsp_response_info(const CERT_INFO *cert, const CERT_INFO *issuer, + const CRYPT_OBJID_BLOB *blob, DWORD *status) +{ + OCSP_BASIC_RESPONSE_INFO *info; + DWORD size, i; + + if (!CryptDecodeObjectEx(X509_ASN_ENCODING, OCSP_BASIC_RESPONSE, blob->pbData, blob->cbData, + CRYPT_DECODE_ALLOC_FLAG, NULL, &info, &size)) return GetLastError(); + + FIXME("check responder id\n"); + for (i = 0; i < info->cResponseEntry; i++) + { + OCSP_BASIC_RESPONSE_ENTRY *entry = &info->rgResponseEntry[i]; + if (match_cert_id(&entry->CertId, cert, issuer)) *status = map_ocsp_status(entry->dwCertStatus); + } + + LocalFree(info); + return ERROR_SUCCESS; +} + +static DWORD verify_signed_ocsp_response_info(const CERT_INFO *cert, const CERT_INFO *issuer, + const CRYPT_OBJID_BLOB *blob) +{ + OCSP_BASIC_SIGNED_RESPONSE_INFO *info; + DWORD size, error, status = CRYPT_E_REVOCATION_OFFLINE; + CRYPT_ALGORITHM_IDENTIFIER *alg; + CRYPT_BIT_BLOB *sig; + HCRYPTPROV prov = 0; + HCRYPTHASH hash = 0; + HCRYPTKEY key = 0; + + if (!CryptDecodeObjectEx(X509_ASN_ENCODING, OCSP_BASIC_SIGNED_RESPONSE, blob->pbData, blob->cbData, + CRYPT_DECODE_ALLOC_FLAG, NULL, &info, &size)) return GetLastError(); + + if ((error = check_ocsp_response_info(cert, issuer, &info->ToBeSigned, &status))) goto done; + + alg = &info->SignatureInfo.SignatureAlgorithm; + if (!alg->pszObjId || strcmp(alg->pszObjId, szOID_RSA_SHA256RSA)) + { + FIXME("unhandled signature algorithm %s\n", debugstr_a(alg->pszObjId)); + error = CRYPT_E_NO_REVOCATION_CHECK; + goto done; + } + + if (!CryptAcquireContextW(&prov, NULL, NULL, PROV_RSA_FULL, CRYPT_VERIFYCONTEXT)) goto done; + if (!CryptCreateHash(prov, CALG_SHA_256, 0, 0, &hash)) goto done; + if (!CryptHashData(hash, info->ToBeSigned.pbData, info->ToBeSigned.cbData, 0)) goto done; + + sig = &info->SignatureInfo.Signature; + if (!CryptImportPublicKeyInfoEx(prov, X509_ASN_ENCODING, (CERT_PUBLIC_KEY_INFO *)&issuer->SubjectPublicKeyInfo, + 0, 0, NULL, &key)) + { + error = GetLastError(); + TRACE("failed to import public key %#lx\n", error); + } + else if (!CryptVerifySignatureW(hash, sig->pbData, sig->cbData, key, NULL, 0)) + { + error = GetLastError(); + TRACE("failed to verify signature %#lx\n", error); + } + else error = ERROR_SUCCESS; + +done: + CryptDestroyKey(key); + CryptDestroyHash(hash); + CryptReleaseContext(prov, 0); + LocalFree(info); + if (error) return error; + return status; +} + +static DWORD handle_ocsp_response(const CERT_INFO *cert, const CERT_INFO *issuer, const BYTE *encoded, + DWORD encoded_size) +{ + OCSP_RESPONSE_INFO *info; + DWORD size, error = CRYPT_E_NO_REVOCATION_CHECK; + + if (!CryptDecodeObjectEx(X509_ASN_ENCODING, OCSP_RESPONSE, encoded, encoded_size, CRYPT_DECODE_ALLOC_FLAG, NULL, + &info, &size)) return GetLastError(); + + switch (info->dwStatus) + { + case OCSP_SUCCESSFUL_RESPONSE: + if (!info->pszObjId || strcmp(info->pszObjId, szOID_PKIX_OCSP_BASIC_SIGNED_RESPONSE)) + { + FIXME("unhandled response type %s\n", debugstr_a(info->pszObjId)); + break; + } + error = verify_signed_ocsp_response_info(cert, issuer, &info->Value); + break; + + default: + FIXME("unhandled status %lu\n", info->dwStatus); + break; + } + + LocalFree(info); + return error; +} + +static DWORD verify_cert_revocation_with_ocsp(const CERT_CONTEXT *cert, const WCHAR *base_url, + const CERT_REVOCATION_PARA *revpara) +{ + HINTERNET ses, con, req = NULL; + BYTE *request_data = NULL, *response_data = NULL; + DWORD size, flags, status, request_len, response_len, count, ret = CRYPT_E_REVOCATION_OFFLINE; + URL_COMPONENTSW comp; + WCHAR *url; + + if (!revpara || !revpara->pIssuerCert) + { + TRACE("no issuer certificate\n"); + return CRYPT_E_REVOCATION_OFFLINE; + } + if (!(request_data = build_ocsp_request(cert, revpara->pIssuerCert, &request_len))) + return CRYPT_E_REVOCATION_OFFLINE; + + url = build_request_url(base_url, request_data, request_len); + LocalFree(request_data); + if (!url) return CRYPT_E_REVOCATION_OFFLINE; + + memset(&comp, 0, sizeof(comp)); + comp.dwStructSize = sizeof(comp); + comp.dwHostNameLength = ~0u; + comp.dwUrlPathLength = ~0u; + if (!InternetCrackUrlW(url, 0, 0, &comp)) + { + free(url); + return CRYPT_E_REVOCATION_OFFLINE; + } + + switch (comp.nScheme) + { + case INTERNET_SCHEME_HTTP: + flags = 0; + break; + case INTERNET_SCHEME_HTTPS: + flags = INTERNET_FLAG_SECURE; + break; + default: + FIXME("scheme %u not supported\n", comp.nScheme); + free(url); + return ERROR_NOT_SUPPORTED; + } + + if (!(ses = InternetOpenW(L"CryptoAPI", 0, NULL, NULL, 0))) return GetLastError(); + comp.lpszHostName[comp.dwHostNameLength] = 0; + if (!(con = InternetConnectW(ses, comp.lpszHostName, comp.nPort, NULL, NULL, INTERNET_SERVICE_HTTP, 0, 0))) + { + free(url); + InternetCloseHandle(ses); + return GetLastError(); + } + comp.lpszHostName[comp.dwHostNameLength] = '/'; + if (!(req = HttpOpenRequestW(con, NULL, comp.lpszUrlPath, NULL, NULL, NULL, flags, 0)) || + !HttpSendRequestW(req, NULL, 0, NULL, 0)) goto done; + + size = sizeof(status); + if (!HttpQueryInfoW(req, HTTP_QUERY_STATUS_CODE | HTTP_QUERY_FLAG_NUMBER, &status, &size, NULL)) goto done; + if (status != HTTP_STATUS_OK) + { + WARN("request status %lu\n", status); + goto done; + } + + size = sizeof(response_len); + if (!HttpQueryInfoW(req, HTTP_QUERY_FLAG_NUMBER | HTTP_QUERY_CONTENT_LENGTH, &response_len, &size, 0) || + !response_len || !(response_data = malloc(response_len)) || + !InternetReadFile(req, response_data, response_len, &count) || count != response_len) goto done; + + ret = handle_ocsp_response(cert->pCertInfo, revpara->pIssuerCert->pCertInfo, response_data, response_len); + +done: + free(url); + free(response_data); + InternetCloseHandle(req); + InternetCloseHandle(con); + InternetCloseHandle(ses); + return ret; +} + static DWORD verify_cert_revocation_from_aia_ext(const CRYPT_DATA_BLOB *value, const CERT_CONTEXT *cert, FILETIME *pTime, DWORD dwFlags, CERT_REVOCATION_PARA *pRevPara, CERT_REVOCATION_STATUS *pRevStatus) { BOOL ret; - DWORD error, size; + DWORD size, i, error = CRYPT_E_NO_REVOCATION_CHECK; CERT_AUTHORITY_INFO_ACCESS *aia; - ret = CryptDecodeObjectEx(X509_ASN_ENCODING, X509_AUTHORITY_INFO_ACCESS, - value->pbData, value->cbData, CRYPT_DECODE_ALLOC_FLAG, NULL, &aia, &size); - if (ret) - { - DWORD i; + ret = CryptDecodeObjectEx(X509_ASN_ENCODING, X509_AUTHORITY_INFO_ACCESS, value->pbData, value->cbData, + CRYPT_DECODE_ALLOC_FLAG, NULL, &aia, &size); + if (!ret) return GetLastError(); - for (i = 0; i < aia->cAccDescr; i++) - if (!strcmp(aia->rgAccDescr[i].pszAccessMethod, - szOID_PKIX_OCSP)) + for (i = 0; i < aia->cAccDescr; i++) + { + if (!strcmp(aia->rgAccDescr[i].pszAccessMethod, szOID_PKIX_OCSP)) + { + if (aia->rgAccDescr[i].AccessLocation.dwAltNameChoice == CERT_ALT_NAME_URL) { - if (aia->rgAccDescr[i].AccessLocation.dwAltNameChoice == - CERT_ALT_NAME_URL) - FIXME("OCSP URL = %s\n", - debugstr_w(aia->rgAccDescr[i].AccessLocation.u.pwszURL)); - else - FIXME("unsupported AccessLocation type %ld\n", - aia->rgAccDescr[i].AccessLocation.dwAltNameChoice); + const WCHAR *url = aia->rgAccDescr[i].AccessLocation.u.pwszURL; + TRACE("OCSP URL = %s\n", debugstr_w(url)); + error = verify_cert_revocation_with_ocsp(cert, url, pRevPara); } - LocalFree(aia); - /* FIXME: lie and pretend OCSP validated the cert */ - error = ERROR_SUCCESS; + else + { + FIXME("unsupported AccessLocation type %lu\n", aia->rgAccDescr[i].AccessLocation.dwAltNameChoice); + error = ERROR_NOT_SUPPORTED; + } + break; + } } - else - error = GetLastError(); + + LocalFree(aia); return error; } diff --git a/include/wincrypt.h b/include/wincrypt.h index f5f05c1f8d0..2c1e3f0d4c3 100644 --- a/include/wincrypt.h +++ b/include/wincrypt.h @@ -669,6 +669,10 @@ typedef struct _OCSP_BASIC_REVOKED_INFO { DWORD dwCrlReasonCode; } OCSP_BASIC_REVOKED_INFO, *POCSP_BASIC_REVOKED_INFO; +#define OCSP_BASIC_GOOD_CERT_STATUS 0 +#define OCSP_BASIC_REVOKED_CERT_STATUS 1 +#define OCSP_BASIC_UNKNOWN_CERT_STATUS 2 + typedef struct _OCSP_BASIC_RESPONSE_ENTRY { OCSP_CERT_ID CertId; DWORD dwCertStatus; -- 2.30.2

1 0

[PATCH v2 1/6] include: Add CWMAEncMediaObject class declaration to wmcodecdsp.idl.
by Rémi Bernon 06 Apr '22

06 Apr '22

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- v2: Use "pts" rather than "timestamp", use UINT64 for their types. include/wmcodecdsp.idl | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/include/wmcodecdsp.idl b/include/wmcodecdsp.idl index ae2a42419b4..4ad965ab3d9 100644 --- a/include/wmcodecdsp.idl +++ b/include/wmcodecdsp.idl @@ -45,6 +45,11 @@ coclass CMSH264DecoderMFT {} ] coclass CWMADecMediaObject {}; +[ + uuid(70f598e9-f4ab-495a-99e2-a7c4d3d89abf) +] +coclass CWMAEncMediaObject {}; + [ uuid(93af0c51-2275-45d2-a35b-f2ba21caed00) ] -- 2.35.1

4 13

Re: [PATCH v3 1/4] dwrite/tests: Add some tests for Segoe UI font family.
by Nikolay Sivov 06 Apr '22

06 Apr '22

> + > +static void test_SegoeUI(void) > +{ > + HRESULT hr; > + IDWriteFactory2 *factory; > + IDWriteFontCollection *collection; > + IDWriteFontFamily *family; > + IDWriteFont *font; > + UINT32 index, count, i; > + WCHAR name[256]; > + BOOL exists, found; > + > + hr = DWriteCreateFactory(DWRITE_FACTORY_TYPE_SHARED, > &IID_IDWriteFactory2, (IUnknown **)&factory); > + if (hr != S_OK) > + { > + win_skip("IDWriteFactory2 is not supported\n"); > + return; > + } > + > + hr = IDWriteFactory2_GetSystemFontCollection(factory, &collection, > FALSE); > + ok(hr == S_OK, "got %#x\n", hr); > + > + hr = IDWriteFontCollection_FindFamilyName(collection, L"Segoe UI", > &index, &exists); > + ok(hr == S_OK, "got %#x\n", hr); > + if (!exists) > + { > + skip("Segoe UI is not installed\n"); > + IDWriteFontCollection_Release(collection); > + IDWriteFactory2_Release(factory); > + return; > + } > + ok(index != UINT_MAX && exists, "Segoe UI was not found\n"); > + > + hr = IDWriteFontCollection_GetFontFamily(collection, index, &family); > + ok(hr == S_OK, "got %#x\n", hr); > + > + count = IDWriteFontFamily_GetFontCount(family); > + trace("family Segoe UI has %u fonts\n", count); > + > + found = FALSE; > + > + for (i = 0; i < count; i++) > + { > + hr = IDWriteFontFamily_GetFont(family, i, &font); > + ok(hr == S_OK, "got %#x\n", hr); > + > + get_font_name(font, name, ARRAY_SIZE(name)); > + if (!wcscmp(name, L"Segoe UI Symbol")) > + found = TRUE; > + > + hr = IDWriteFont_HasCharacter(font, 0x25d4, &exists); > + ok(hr == S_OK, "got %#x\n", hr); > + ok(!exists, "%u: %s has character 0x25d4\n", i, > wine_dbgstr_w(name)); > + > + IDWriteFont_Release(font); > + } > + > + ok(!found, "Segoe UI Symbol should not be part of Segoe UI family\n"); > + > + IDWriteFontFamily_Release(family); > + IDWriteFontCollection_Release(collection); > + IDWriteFactory2_Release(factory); > +} All this does is checking if font is installed, and we know it is installed on all current Windows versions, it's not some directwrite functionality. Second patch will already trigger a todo case when font is installed in Wine.

2 4

[PATCH 6/6] win32u: Move NtUserCloseClipboard implementation from user32.
by Jacek Caban 06 Apr '22

06 Apr '22

3 2

[PATCH 5/6] user.exe: Remove no longer used wait_message16.
by Jacek Caban 06 Apr '22

06 Apr '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user.exe16/message.c | 15 --------------- dlls/user.exe16/user_private.h | 2 -- dlls/user32/controls.h | 2 -- dlls/user32/driver.c | 11 +---------- dlls/user32/winproc.c | 10 ---------- 5 files changed, 1 insertion(+), 39 deletions(-)

3 2

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel