December 2019 - Wine-devel - list.winehq.org

[PATCH v2 6/6] wined3d: Store the blend factor in the stateblock as a render state.
by Zebediah Figura 03 Dec '19

03 Dec '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- This supersedes 174719. dlls/d3d9/device.c | 33 ++++++++------------------ dlls/wined3d/stateblock.c | 42 ++++++++-------------------------- dlls/wined3d/wined3d.spec | 1 - dlls/wined3d/wined3d_private.h | 3 +-- include/wine/wined3d.h | 4 +--- 5 files changed, 21 insertions(+), 62 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 51b7f4d6f59..174cdc5bf49 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -2304,22 +2304,18 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH d3d9_device_SetRenderState(IDirect3DDevi TRACE("iface %p, state %#x, value %#x.\n", iface, state, value); - if (state == D3DRS_BLENDFACTOR) - { - wined3d_color_from_d3dcolor(&factor, value); - wined3d_mutex_lock(); - wined3d_stateblock_set_blend_factor(device->update_state, &factor); - if (!device->recording) - wined3d_device_set_blend_state(device->wined3d_device, NULL, &factor); - wined3d_mutex_unlock(); - - return D3D_OK; - } - wined3d_mutex_lock(); wined3d_stateblock_set_render_state(device->update_state, state, value); if (!device->recording) - wined3d_device_set_render_state(device->wined3d_device, state, value); + { + if (state == D3DRS_BLENDFACTOR) + { + wined3d_color_from_d3dcolor(&factor, value); + wined3d_device_set_blend_state(device->wined3d_device, NULL, &factor); + } + else + wined3d_device_set_render_state(device->wined3d_device, state, value); + } wined3d_mutex_unlock(); return D3D_OK; @@ -2330,20 +2326,9 @@ static HRESULT WINAPI d3d9_device_GetRenderState(IDirect3DDevice9Ex *iface, { struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); const struct wined3d_stateblock_state *device_state; - struct wined3d_color factor; TRACE("iface %p, state %#x, value %p.\n", iface, state, value); - if (state == D3DRS_BLENDFACTOR) - { - wined3d_mutex_lock(); - wined3d_device_get_blend_state(device->wined3d_device, &factor); - wined3d_mutex_unlock(); - *value = D3DCOLOR_COLORVALUE(factor.r, factor.g, factor.b, factor.a); - - return D3D_OK; - } - wined3d_mutex_lock(); device_state = wined3d_stateblock_get_state(device->state); *value = device_state->rs[state]; diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 1a0ba0a3d59..24134b8f3ef 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -35,6 +35,7 @@ static const DWORD pixel_states_render[] = WINED3D_RS_ALPHAREF, WINED3D_RS_ALPHATESTENABLE, WINED3D_RS_ANTIALIASEDLINEENABLE, + WINED3D_RS_BLENDFACTOR, WINED3D_RS_BLENDOP, WINED3D_RS_BLENDOPALPHA, WINED3D_RS_BACK_STENCILFAIL, @@ -208,7 +209,6 @@ static void stateblock_savedstates_set_all(struct wined3d_saved_states *states, states->pixelShader = 1; states->vertexShader = 1; states->scissorRect = 1; - states->blend_state = 1; /* Fixed size arrays */ states->streamSource = 0xffff; @@ -236,7 +236,6 @@ static void stateblock_savedstates_set_pixel(struct wined3d_saved_states *states unsigned int i; states->pixelShader = 1; - states->blend_state = 1; for (i = 0; i < ARRAY_SIZE(pixel_states_render); ++i) { @@ -903,15 +902,6 @@ void CDECL wined3d_stateblock_capture(struct wined3d_stateblock *stateblock, stateblock->stateblock_state.scissor_rect = state->scissor_rect; } - if (stateblock->changed.blend_state - && memcmp(&state->blend_factor, &stateblock->stateblock_state.blend_factor, - sizeof(stateblock->stateblock_state.blend_factor))) - { - TRACE("Updating blend factor.\n"); - - stateblock->stateblock_state.blend_factor = state->blend_factor; - } - map = stateblock->changed.streamSource; for (i = 0; map; map >>= 1, ++i) { @@ -1129,7 +1119,14 @@ void CDECL wined3d_stateblock_apply(const struct wined3d_stateblock *stateblock, enum wined3d_render_state rs = stateblock->contained_render_states[i]; state->rs[rs] = stateblock->stateblock_state.rs[rs]; - wined3d_device_set_render_state(device, rs, stateblock->stateblock_state.rs[rs]); + if (rs == WINED3D_RS_BLENDFACTOR) + { + struct wined3d_color color; + wined3d_color_from_d3dcolor(&color, stateblock->stateblock_state.rs[rs]); + wined3d_device_set_blend_state(device, NULL, &color); + } + else + wined3d_device_set_render_state(device, rs, stateblock->stateblock_state.rs[rs]); } /* Texture states. */ @@ -1209,12 +1206,6 @@ void CDECL wined3d_stateblock_apply(const struct wined3d_stateblock *stateblock, wined3d_device_set_scissor_rects(device, 1, &stateblock->stateblock_state.scissor_rect); } - if (stateblock->changed.blend_state) - { - state->blend_factor = stateblock->stateblock_state.blend_factor; - wined3d_device_set_blend_state(device, NULL, &stateblock->stateblock_state.blend_factor); - } - map = stateblock->changed.streamSource; for (i = 0; map; map >>= 1, ++i) { @@ -1437,15 +1428,6 @@ void CDECL wined3d_stateblock_set_render_state(struct wined3d_stateblock *stateb stateblock->changed.renderState[state >> 5] |= 1u << (state & 0x1f); } -void CDECL wined3d_stateblock_set_blend_factor(struct wined3d_stateblock *stateblock, - const struct wined3d_color *blend_factor) -{ - TRACE("stateblock %p, blend_factor %p.\n", stateblock, blend_factor); - - stateblock->stateblock_state.blend_factor = *blend_factor; - stateblock->changed.blend_state = TRUE; -} - void CDECL wined3d_stateblock_set_sampler_state(struct wined3d_stateblock *stateblock, UINT sampler_idx, enum wined3d_sampler_state state, DWORD value) { @@ -1827,6 +1809,7 @@ static void init_default_render_states(DWORD rs[WINEHIGHEST_RENDER_STATE + 1], c rs[WINED3D_RS_COLORWRITEENABLE1] = 0x0000000f; rs[WINED3D_RS_COLORWRITEENABLE2] = 0x0000000f; rs[WINED3D_RS_COLORWRITEENABLE3] = 0x0000000f; + rs[WINED3D_RS_BLENDFACTOR] = 0xffffffff; rs[WINED3D_RS_SRGBWRITEENABLE] = 0; rs[WINED3D_RS_DEPTHBIAS] = 0; rs[WINED3D_RS_WRAP8] = 0; @@ -1971,11 +1954,6 @@ static void stateblock_state_init_default(struct wined3d_stateblock_state *state init_default_sampler_states(state->sampler_states); - state->blend_factor.r = 1.0f; - state->blend_factor.g = 1.0f; - state->blend_factor.b = 1.0f; - state->blend_factor.a = 1.0f; - for (i = 0; i < WINED3D_MAX_STREAMS; ++i) state->streams[i].frequency = 1; } diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index bec84b5979c..716b902f313 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -264,7 +264,6 @@ @ cdecl wined3d_stateblock_init_contained_states(ptr) @ cdecl wined3d_stateblock_reset(ptr) @ cdecl wined3d_stateblock_set_base_vertex_index(ptr long) -@ cdecl wined3d_stateblock_set_blend_factor(ptr ptr) @ cdecl wined3d_stateblock_set_clip_plane(ptr long ptr) @ cdecl wined3d_stateblock_set_index_buffer(ptr ptr long) @ cdecl wined3d_stateblock_set_light(ptr long ptr) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 2a7dffb26a9..34bef2c10fc 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3874,9 +3874,8 @@ struct wined3d_saved_states DWORD pixelShader : 1; DWORD vertexShader : 1; DWORD scissorRect : 1; - DWORD blend_state : 1; DWORD store_stream_offset : 1; - DWORD padding : 3; + DWORD padding : 4; }; struct StageState { diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 8b64bf66c23..fd8c56bf781 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -384,6 +384,7 @@ enum wined3d_render_state WINED3D_RS_COLORWRITEENABLE1 = 190, WINED3D_RS_COLORWRITEENABLE2 = 191, WINED3D_RS_COLORWRITEENABLE3 = 192, + WINED3D_RS_BLENDFACTOR = 193, WINED3D_RS_SRGBWRITEENABLE = 194, WINED3D_RS_DEPTHBIAS = 195, WINED3D_RS_WRAP8 = 198, @@ -2151,7 +2152,6 @@ struct wined3d_stateblock_state BOOL ps_consts_b[WINED3D_MAX_CONSTS_B]; DWORD rs[WINEHIGHEST_RENDER_STATE + 1]; - struct wined3d_color blend_factor; struct wined3d_texture *textures[WINED3D_MAX_COMBINED_SAMPLERS]; DWORD sampler_states[WINED3D_MAX_COMBINED_SAMPLERS][WINED3D_HIGHEST_SAMPLER_STATE + 1]; @@ -2726,8 +2726,6 @@ ULONG __cdecl wined3d_stateblock_incref(struct wined3d_stateblock *stateblock); void __cdecl wined3d_stateblock_init_contained_states(struct wined3d_stateblock *stateblock); void __cdecl wined3d_stateblock_reset(struct wined3d_stateblock *stateblock); void __cdecl wined3d_stateblock_set_base_vertex_index(struct wined3d_stateblock *stateblock, INT base_index); -void __cdecl wined3d_stateblock_set_blend_factor(struct wined3d_stateblock *stateblock, - const struct wined3d_color *blend_factor); HRESULT __cdecl wined3d_stateblock_set_clip_plane(struct wined3d_stateblock *stateblock, UINT plane_idx, const struct wined3d_vec4 *plane); void __cdecl wined3d_stateblock_set_index_buffer(struct wined3d_stateblock *stateblock, -- 2.23.0

2 1

[PATCH] mshtml/tests: Fix a typo in ok() message.
by Andrey Gusev 03 Dec '19

03 Dec '19

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- dlls/mshtml/tests/htmldoc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 4b55fdd0c8..141d2378db 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -2879,7 +2879,7 @@ static HRESULT WINAPI OleCommandTarget_Exec(IOleCommandTarget *iface, const GUID readystate_set_interactive = (load_state != LD_INTERACTIVE); break; default: - ok(0, "unexpevted V_I4(pvaIn)=%d\n", V_I4(pvaIn)); + ok(0, "unexpected V_I4(pvaIn)=%d\n", V_I4(pvaIn)); } return S_OK; -- 2.23.0

1 0

[PATCH] ieframe/tests: Fix a typo in ok() message.
by Andrey Gusev 03 Dec '19

03 Dec '19

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- dlls/ieframe/tests/webbrowser.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ieframe/tests/webbrowser.c b/dlls/ieframe/tests/webbrowser.c index a99c68ac5e..f89b2c5b57 100644 --- a/dlls/ieframe/tests/webbrowser.c +++ b/dlls/ieframe/tests/webbrowser.c @@ -420,7 +420,7 @@ static HRESULT WINAPI OleCommandTarget_Exec(IOleCommandTarget *iface, const GUID CHECK_EXPECT2(Exec_SETDOWNLOADSTATE_1); break; default: - ok(0, "unexpevted V_I4(pvaIn)=%d\n", V_I4(pvaIn)); + ok(0, "unexpected V_I4(pvaIn)=%d\n", V_I4(pvaIn)); } return S_OK; case OLECMDID_UPDATECOMMANDS: -- 2.23.0

1 0

[PATCH 1/2] mfplat: Use underlying stream access mode for bytestream capabilities.
by Nikolay Sivov 03 Dec '19

03 Dec '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfplat/main.c | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index e4ade7f202..fc656678ca 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -2700,6 +2700,24 @@ static ULONG WINAPI bytestream_Release(IMFByteStream *iface) return refcount; } +static HRESULT WINAPI bytestream_stream_GetCapabilities(IMFByteStream *iface, DWORD *capabilities) +{ + struct bytestream *stream = impl_from_IMFByteStream(iface); + STATSTG stat; + HRESULT hr; + + TRACE("%p, %p.\n", iface, capabilities); + + if (FAILED(hr = IStream_Stat(stream->stream, &stat, STATFLAG_NONAME))) + return hr; + + *capabilities = MFBYTESTREAM_IS_READABLE | MFBYTESTREAM_IS_SEEKABLE; + if (stat.grfMode & (STGM_WRITE | STGM_READWRITE)) + *capabilities |= MFBYTESTREAM_IS_WRITABLE; + + return S_OK; +} + static HRESULT WINAPI bytestream_GetCapabilities(IMFByteStream *iface, DWORD *capabilities) { struct bytestream *stream = impl_from_IMFByteStream(iface); @@ -3060,7 +3078,7 @@ static const IMFByteStreamVtbl bytestream_stream_vtbl = bytestream_QueryInterface, bytestream_AddRef, bytestream_Release, - bytestream_GetCapabilities, + bytestream_stream_GetCapabilities, bytestream_stream_GetLength, bytestream_stream_SetLength, bytestream_stream_GetCurrentPosition, @@ -3252,7 +3270,6 @@ HRESULT WINAPI MFCreateMFByteStreamOnStream(IStream *stream, IMFByteStream **byt IStream_AddRef(object->stream); position.QuadPart = 0; IStream_Seek(object->stream, position, STREAM_SEEK_SET, NULL); - object->capabilities = MFBYTESTREAM_IS_READABLE | MFBYTESTREAM_IS_SEEKABLE; *bytestream = &object->IMFByteStream_iface; -- 2.24.0

1 1

[PATCH 1/2] ntdll: Use better type for thread description info structure.
by Nikolay Sivov 03 Dec '19

03 Dec '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- I didn't realize UNICODE_STRING lengths are 2-byte. dlls/kernel32/tests/thread.c | 28 ++++++++++++++-------------- dlls/kernelbase/thread.c | 14 ++++++-------- dlls/ntdll/thread.c | 12 +++++------- include/winternl.h | 3 +-- 4 files changed, 26 insertions(+), 31 deletions(-) diff --git a/dlls/kernel32/tests/thread.c b/dlls/kernel32/tests/thread.c index 8ff34ba5f3..9a8ad9151c 100644 --- a/dlls/kernel32/tests/thread.c +++ b/dlls/kernel32/tests/thread.c @@ -2145,14 +2145,15 @@ static void test_thread_description(void) ok(len == sizeof(*thread_desc), "Unexpected structure length %u.\n", len); len2 = 0; - thread_desc->Length = 1; - thread_desc->Description = (WCHAR *)thread_desc; + thread_desc->Description.Length = 1; + thread_desc->Description.MaximumLength = 0; + thread_desc->Description.Buffer = (WCHAR *)thread_desc; status = pNtQueryInformationThread(GetCurrentThread(), ThreadDescription, thread_desc, len, &len2); ok(!status, "Failed to get thread info, status %#x.\n", status); ok(len2 == sizeof(*thread_desc), "Unexpected structure length %u.\n", len); - ok(!thread_desc->Length, "Unexpected description length %#x.\n", thread_desc->Length); - ok(thread_desc->Description == (WCHAR *)(thread_desc + 1), "Unexpected description string pointer %p, %p.\n", - thread_desc->Description, thread_desc); + ok(!thread_desc->Description.Length, "Unexpected description length %#x.\n", thread_desc->Description.Length); + ok(thread_desc->Description.Buffer == (WCHAR *)(thread_desc + 1), + "Unexpected description string pointer %p, %p.\n", thread_desc->Description.Buffer, thread_desc); hr = pSetThreadDescription(GetCurrentThread(), NULL); ok(hr == HRESULT_FROM_NT(STATUS_SUCCESS), "Failed to set thread description, hr %#x.\n", hr); @@ -2176,11 +2177,11 @@ static void test_thread_description(void) ok(!status, "Failed to get thread info.\n"); ok(len == sizeof(*thread_desc) + desc_len, "Unexpected structure length %u.\n", len); - ok(thread_desc->Length == (desc_len << 16 | desc_len), "Unexpected description length %#x.\n", - thread_desc->Length); - ok(thread_desc->Description == (WCHAR *)(thread_desc + 1), "Unexpected description string pointer %p, %p.\n", - thread_desc->Description, thread_desc); - ok(!memcmp(thread_desc->Description, desc, desc_len), "Unexpected description string.\n"); + ok(thread_desc->Description.Length == desc_len && thread_desc->Description.MaximumLength == desc_len, + "Unexpected description length %u.\n", thread_desc->Description.Length); + ok(thread_desc->Description.Buffer == (WCHAR *)(thread_desc + 1), + "Unexpected description string pointer %p, %p.\n", thread_desc->Description.Buffer, thread_desc); + ok(!memcmp(thread_desc->Description.Buffer, desc, desc_len), "Unexpected description string.\n"); /* Partial results. */ len = 0; @@ -2193,7 +2194,7 @@ static void test_thread_description(void) ok(len == sizeof(*thread_desc) + desc_len, "Unexpected structure length %u.\n", len); /* Change description. */ - thread_desc->Length = 8 << 16 | 8; + thread_desc->Description.Length = thread_desc->Description.MaximumLength = 8; lstrcpyW((WCHAR *)(thread_desc + 1), L"desc"); status = pNtSetInformationThread(GetCurrentThread(), ThreadDescription, thread_desc, sizeof(*thread_desc)); @@ -2211,7 +2212,7 @@ static void test_thread_description(void) status = NtSetInformationThread(GetCurrentThread(), ThreadDescription, NULL, sizeof(*thread_desc)); ok(status == STATUS_ACCESS_VIOLATION, "Unexpected status %#x.\n", status); - thread_desc->Description = NULL; + thread_desc->Description.Buffer = NULL; status = pNtSetInformationThread(GetCurrentThread(), ThreadDescription, thread_desc, sizeof(*thread_desc)); ok(status == STATUS_ACCESS_VIOLATION, "Unexpected status %#x.\n", status); @@ -2228,8 +2229,7 @@ static void test_thread_description(void) hr = pSetThreadDescription(GetCurrentThread(), L"123"); ok(hr == HRESULT_FROM_NT(STATUS_SUCCESS), "Failed to set thread description, hr %#x.\n", hr); - thread_desc->Length = 0; - thread_desc->Description = NULL; + memset(thread_desc, 0, sizeof(*thread_desc)); status = pNtSetInformationThread(GetCurrentThread(), ThreadDescription, thread_desc, sizeof(*thread_desc)); ok(!status, "Failed to set thread description, status %#x.\n", status); diff --git a/dlls/kernelbase/thread.c b/dlls/kernelbase/thread.c index 521d3be079..2f0bcb7dde 100644 --- a/dlls/kernelbase/thread.c +++ b/dlls/kernelbase/thread.c @@ -404,8 +404,8 @@ HRESULT WINAPI DECLSPEC_HOTPATCH SetThreadDescription( HANDLE thread, PCWSTR des if (length > USHRT_MAX) return HRESULT_FROM_NT(STATUS_INVALID_PARAMETER); - info.Length = length << 16 | length; - info.Description = (WCHAR *)description; + info.Description.Length = info.Description.MaximumLength = length; + info.Description.Buffer = (WCHAR *)description; return HRESULT_FROM_NT(NtSetInformationThread( thread, ThreadDescription, &info, sizeof(info) )); } @@ -434,15 +434,13 @@ HRESULT WINAPI DECLSPEC_HOTPATCH GetThreadDescription( HANDLE thread, WCHAR **de status = NtQueryInformationThread( thread, ThreadDescription, info, length, &length ); if (!status) { - length = info->Length & 0xffff; - - if (!(*description = LocalAlloc( 0, length + sizeof(WCHAR)))) + if (!(*description = LocalAlloc( 0, info->Description.Length + sizeof(WCHAR)))) status = STATUS_NO_MEMORY; else { - if (length) - memcpy(*description, info->Description, length); - (*description)[length / sizeof(WCHAR)] = 0; + if (info->Description.Length) + memcpy(*description, info->Description.Buffer, info->Description.Length); + (*description)[info->Description.Length / sizeof(WCHAR)] = 0; } } diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 6079a6c195..fd8d388403 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -1137,8 +1137,8 @@ NTSTATUS WINAPI NtQueryInformationThread( HANDLE handle, THREADINFOCLASS class, status = STATUS_BUFFER_TOO_SMALL; else if (status == STATUS_SUCCESS) { - info->Length = desc_len << 16 | desc_len; - info->Description = ptr; + info->Description.Length = info->Description.MaximumLength = desc_len; + info->Description.Buffer = ptr; } if (ret_len && (status == STATUS_SUCCESS || status == STATUS_BUFFER_TOO_SMALL)) @@ -1303,20 +1303,18 @@ NTSTATUS WINAPI NtSetInformationThread( HANDLE handle, THREADINFOCLASS class, case ThreadDescription: { const THREAD_DESCRIPTION_INFORMATION *info = data; - data_size_t desc_len; if (length != sizeof(*info)) return STATUS_INFO_LENGTH_MISMATCH; if (!info) return STATUS_ACCESS_VIOLATION; - desc_len = info->Length & 0xffff; - if (info->Length >> 16 != desc_len) return STATUS_INVALID_PARAMETER; - if (info->Length && !info->Description) return STATUS_ACCESS_VIOLATION; + if (info->Description.Length != info->Description.MaximumLength) return STATUS_INVALID_PARAMETER; + if (info->Description.Length && !info->Description.Buffer) return STATUS_ACCESS_VIOLATION; SERVER_START_REQ( set_thread_info ) { req->handle = wine_server_obj_handle( handle ); req->mask = SET_THREAD_INFO_DESCRIPTION; - wine_server_add_data( req, info->Description, desc_len ); + wine_server_add_data( req, info->Description.Buffer, info->Description.Length ); status = wine_server_call( req ); } SERVER_END_REQ; diff --git a/include/winternl.h b/include/winternl.h index 1477932d10..311fba3ae9 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -1030,8 +1030,7 @@ typedef struct _THREAD_DESCRIPTOR_INFORMATION typedef struct _THREAD_DESCRIPTION_INFORMATION { - DWORD Length; - WCHAR *Description; + UNICODE_STRING Description; } THREAD_DESCRIPTION_INFORMATION, *PTHREAD_DESCRIPTION_INFORMATION; typedef struct _KERNEL_USER_TIMES { -- 2.24.0

1 1

[PATCH] d3dcompiler/tests: Fix parameter desc test on d3d10.
by Matteo Bruni 03 Dec '19

03 Dec '19

Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- D3D11_SIGNATURE_PARAMETER_DESC has an additional "Stream" field compared to D3D10_SIGNATURE_PARAMETER_DESC but they share the same size on 64-bit because of padding (while they do not on 32-bit). Don't check the contents of the padding area. Inspired by a patch from Sven Baars. dlls/d3dcompiler_43/tests/reflection.c | 38 +++++++++++++++++++------- 1 file changed, 28 insertions(+), 10 deletions(-) diff --git a/dlls/d3dcompiler_43/tests/reflection.c b/dlls/d3dcompiler_43/tests/reflection.c index f8c97230d61..44e66044ec1 100644 --- a/dlls/d3dcompiler_43/tests/reflection.c +++ b/dlls/d3dcompiler_43/tests/reflection.c @@ -433,8 +433,14 @@ static void test_reflection_desc_vs(void) i, desc.Mask, pdesc->Mask); ok(desc.ReadWriteMask == pdesc->ReadWriteMask, "GetInputParameterDesc(%u) ReadWriteMask failed, got %x, expected %x\n", i, desc.ReadWriteMask, pdesc->ReadWriteMask); - ok(desc.Stream == pdesc->Stream, "GetInputParameterDesc(%u) Stream failed, got %u, expected %u\n", - i, desc.Stream, pdesc->Stream); + /* The Stream field of D3D11_SIGNATURE_PARAMETER_DESC is in the + * trailing padding of the D3D10_SIGNATURE_PARAMETER_DESC struct on + * 64-bits and thus undefined. Don't test it. */ + if (D3D_COMPILER_VERSION) + ok(desc.Stream == pdesc->Stream, "(%u): got unexpected Stream %u, expected %u.\n", + i, desc.Stream, pdesc->Stream); + else if (sizeof(void *) == 4) + ok(!desc.Stream, "(%u): got unexpected Stream %u.\n", i, desc.Stream); } for (i = 0; i < ARRAY_SIZE(test_reflection_desc_vs_resultout); ++i) @@ -458,8 +464,11 @@ static void test_reflection_desc_vs(void) i, desc.Mask, pdesc->Mask); ok(desc.ReadWriteMask == pdesc->ReadWriteMask, "GetOutputParameterDesc(%u) ReadWriteMask failed, got %x, expected %x\n", i, desc.ReadWriteMask, pdesc->ReadWriteMask); - ok(desc.Stream == pdesc->Stream, "GetOutputParameterDesc(%u) Stream failed, got %u, expected %u\n", - i, desc.Stream, pdesc->Stream); + if (D3D_COMPILER_VERSION) + ok(desc.Stream == pdesc->Stream, "(%u): got unexpected Stream %u, expected %u.\n", + i, desc.Stream, pdesc->Stream); + else if (sizeof(void *) == 4) + ok(!desc.Stream, "(%u): got unexpected Stream %u.\n", i, desc.Stream); } count = ref11->lpVtbl->Release(ref11); @@ -740,8 +749,11 @@ static void test_reflection_desc_ps(void) i, desc.Mask, pdesc->Mask); ok(desc.ReadWriteMask == pdesc->ReadWriteMask, "GetInputParameterDesc(%u) ReadWriteMask failed, got %x, expected %x\n", i, desc.ReadWriteMask, pdesc->ReadWriteMask); - ok(desc.Stream == pdesc->Stream, "GetInputParameterDesc(%u) Stream failed, got %u, expected %u\n", - i, desc.Stream, pdesc->Stream); + if (D3D_COMPILER_VERSION) + ok(desc.Stream == pdesc->Stream, "(%u): got unexpected Stream %u, expected %u.\n", + i, desc.Stream, pdesc->Stream); + else if (sizeof(void *) == 4) + ok(!desc.Stream, "(%u): got unexpected Stream %u.\n", i, desc.Stream); } for (i = 0; i < ARRAY_SIZE(test_reflection_desc_ps_resultout); ++i) @@ -771,8 +783,11 @@ static void test_reflection_desc_ps(void) i, desc.Mask, pdesc->Mask); ok(desc.ReadWriteMask == pdesc->ReadWriteMask, "GetOutputParameterDesc(%u) ReadWriteMask failed, got %x, expected %x\n", i, desc.ReadWriteMask, pdesc->ReadWriteMask); - ok(desc.Stream == pdesc->Stream, "GetOutputParameterDesc(%u) Stream failed, got %u, expected %u\n", - i, desc.Stream, pdesc->Stream); + if (D3D_COMPILER_VERSION) + ok(desc.Stream == pdesc->Stream, "(%u): got unexpected Stream %u, expected %u.\n", + i, desc.Stream, pdesc->Stream); + else if (sizeof(void *) == 4) + ok(!desc.Stream, "(%u): got unexpected Stream %u.\n", i, desc.Stream); } count = ref11->lpVtbl->Release(ref11); @@ -1008,8 +1023,11 @@ static void test_reflection_desc_ps_output(void) i, desc.Mask, pdesc->Mask); ok(desc.ReadWriteMask == pdesc->ReadWriteMask, "(%u): GetOutputParameterDesc ReadWriteMask failed, got %x, expected %x\n", i, desc.ReadWriteMask, pdesc->ReadWriteMask); - ok(desc.Stream == pdesc->Stream, "(%u): GetOutputParameterDesc Stream failed, got %u, expected %u\n", - i, desc.Stream, pdesc->Stream); + if (D3D_COMPILER_VERSION) + ok(desc.Stream == pdesc->Stream, "(%u): got unexpected Stream %u, expected %u.\n", + i, desc.Stream, pdesc->Stream); + else if (sizeof(void *) == 4) + ok(!desc.Stream, "(%u): got unexpected Stream %u.\n", i, desc.Stream); count = ref11->lpVtbl->Release(ref11); ok(count == 0, "(%u): Release failed %u\n", i, count); -- 2.23.0

1 0

[PATCH] msiexec: Improve RegQueryValueExW() calls a bit.
by Serge Gautherie 03 Dec '19

03 Dec '19

Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> --- programs/msiexec/msiexec.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/programs/msiexec/msiexec.c b/programs/msiexec/msiexec.c index 17d4bf8..dd83dac 100644 --- a/programs/msiexec/msiexec.c +++ b/programs/msiexec/msiexec.c @@ -573,14 +573,14 @@ static BOOL process_args_from_reg( const WCHAR *ident, int *pargc, WCHAR ***parg { LONG r; HKEY hkey; - DWORD sz = 0, type = 0; + DWORD sz, type; WCHAR *buf; BOOL ret = FALSE; r = RegOpenKeyW(HKEY_LOCAL_MACHINE, InstallRunOnce, &hkey); if(r != ERROR_SUCCESS) return FALSE; - r = RegQueryValueExW(hkey, ident, 0, &type, 0, &sz); + r = RegQueryValueExW(hkey, ident, NULL, &type, NULL, &sz); if(r == ERROR_SUCCESS && type == REG_SZ) { int len = lstrlenW( *pargv[0] ); @@ -591,8 +591,8 @@ static BOOL process_args_from_reg( const WCHAR *ident, int *pargc, WCHAR ***parg } memcpy( buf, *pargv[0], len * sizeof(WCHAR) ); buf[len++] = ' '; - r = RegQueryValueExW(hkey, ident, 0, &type, (LPBYTE)(buf + len), &sz); - if( r == ERROR_SUCCESS ) + r = RegQueryValueExW(hkey, ident, NULL, &type, (LPBYTE)(buf + len), &sz); + if (r == ERROR_SUCCESS && type == REG_SZ) { process_args(buf, pargc, pargv); ret = TRUE; -- 2.10.0.windows.1

3 2

[PATCH] riched20/tests: Fix function names in two ok() messages.
by Mathew Hodson 03 Dec '19

03 Dec '19

Signed-off-by: Mathew Hodson <mathew.hodson(a)gmail.com> --- dlls/riched20/tests/txtsrv.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/tests/txtsrv.c b/dlls/riched20/tests/txtsrv.c index dd290e3..487b9a0 100644 --- a/dlls/riched20/tests/txtsrv.c +++ b/dlls/riched20/tests/txtsrv.c @@ -992,10 +992,10 @@ static void test_TxGetScroll(void) return; ret = ITextServices_TxGetHScroll(txtserv, NULL, NULL, NULL, NULL, NULL); - ok(ret == S_OK, "ITextSerHices_GetVScroll failed: 0x%08x.\n", ret); + ok(ret == S_OK, "ITextServices_TxGetHScroll failed: 0x%08x.\n", ret); ret = ITextServices_TxGetVScroll(txtserv, NULL, NULL, NULL, NULL, NULL); - ok(ret == S_OK, "ITextServices_GetVScroll failed: 0x%08x.\n", ret); + ok(ret == S_OK, "ITextServices_TxGetVScroll failed: 0x%08x.\n", ret); ITextServices_Release(txtserv); ITextHost_Release(host); -- 2.7.4

2 1

[PATCH 1/4] wusa: Add support for extracting MSU files.
by Hans Leidekker 03 Dec '19

03 Dec '19

This is mostly the work of Michael Müller and Sebastian Lackner. I have split the large first patch up and folded some of the later patches into the earlier ones. I left out a workaround for Vista updates and updated the code to use modern Wine conventions. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- programs/wusa/Makefile.in | 1 + programs/wusa/main.c | 369 +++++++++++++++++++++++++++++++++++++- programs/wusa/wusa.h | 62 +++++++ 3 files changed, 427 insertions(+), 5 deletions(-) create mode 100644 programs/wusa/wusa.h diff --git a/programs/wusa/Makefile.in b/programs/wusa/Makefile.in index 3042e86bf8..5e60bdf1b0 100644 --- a/programs/wusa/Makefile.in +++ b/programs/wusa/Makefile.in @@ -1,4 +1,5 @@ MODULE = wusa.exe +IMPORTS = cabinet shlwapi EXTRADLLFLAGS = -mconsole -municode -mno-cygwin diff --git a/programs/wusa/main.c b/programs/wusa/main.c index c3e3dfd38c..a719eefc5b 100644 --- a/programs/wusa/main.c +++ b/programs/wusa/main.c @@ -1,5 +1,7 @@ /* * Copyright 2012 Austin English + * Copyright 2015 Michael Müller + * Copyright 2015 Sebastian Lackner * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -16,18 +18,375 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <windows.h> +#include <fcntl.h> +#include <fdi.h> +#include <shlwapi.h> + #include "wine/debug.h" +#include "wine/list.h" +#include "wusa.h" WINE_DEFAULT_DEBUG_CHANNEL(wusa); +struct installer_tempdir +{ + struct list entry; + WCHAR *path; +}; + +struct installer_state +{ + BOOL norestart; + BOOL quiet; + struct list tempdirs; +}; + +static void * CDECL cabinet_alloc(ULONG cb) +{ + return heap_alloc(cb); +} + +static void CDECL cabinet_free(void *pv) +{ + heap_free(pv); +} + +static INT_PTR CDECL cabinet_open(char *pszFile, int oflag, int pmode) +{ + DWORD dwAccess = 0; + DWORD dwShareMode = 0; + DWORD dwCreateDisposition = OPEN_EXISTING; + + switch (oflag & _O_ACCMODE) + { + case _O_RDONLY: + dwAccess = GENERIC_READ; + dwShareMode = FILE_SHARE_READ | FILE_SHARE_DELETE; + break; + case _O_WRONLY: + dwAccess = GENERIC_WRITE; + dwShareMode = FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE; + break; + case _O_RDWR: + dwAccess = GENERIC_READ | GENERIC_WRITE; + dwShareMode = FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE; + break; + } + + if ((oflag & (_O_CREAT | _O_EXCL)) == (_O_CREAT | _O_EXCL)) + dwCreateDisposition = CREATE_NEW; + else if (oflag & _O_CREAT) + dwCreateDisposition = CREATE_ALWAYS; + + return (INT_PTR)CreateFileA(pszFile, dwAccess, dwShareMode, NULL, dwCreateDisposition, 0, NULL); +} + +static UINT CDECL cabinet_read(INT_PTR hf, void *pv, UINT cb) +{ + HANDLE handle = (HANDLE)hf; + DWORD read; + + if (ReadFile(handle, pv, cb, &read, NULL)) + return read; + + return 0; +} + +static UINT CDECL cabinet_write(INT_PTR hf, void *pv, UINT cb) +{ + HANDLE handle = (HANDLE)hf; + DWORD written; + + if (WriteFile(handle, pv, cb, &written, NULL)) + return written; + + return 0; +} + +static int CDECL cabinet_close(INT_PTR hf) +{ + HANDLE handle = (HANDLE)hf; + return CloseHandle(handle) ? 0 : -1; +} + +static LONG CDECL cabinet_seek(INT_PTR hf, LONG dist, int seektype) +{ + HANDLE handle = (HANDLE)hf; + /* flags are compatible and so are passed straight through */ + return SetFilePointer(handle, dist, NULL, seektype); +} + +static WCHAR *path_combine(const WCHAR *path, const WCHAR *filename) +{ + WCHAR *result; + DWORD length; + + if (!path || !filename) return NULL; + length = lstrlenW(path) + lstrlenW(filename) + 2; + if (!(result = heap_alloc(length * sizeof(WCHAR)))) return NULL; + + lstrcpyW(result, path); + if (result[0] && result[lstrlenW(result) - 1] != '\\') lstrcatW(result, L"\\"); + lstrcatW(result, filename); + return result; +} + +static WCHAR *get_uncompressed_path(PFDINOTIFICATION pfdin) +{ + WCHAR *file = strdupAtoW(pfdin->psz1); + WCHAR *path = path_combine(pfdin->pv, file); + heap_free(file); + return path; +} + +static BOOL is_directory(const WCHAR *path) +{ + DWORD attrs = GetFileAttributesW(path); + if (attrs == INVALID_FILE_ATTRIBUTES) return FALSE; + return (attrs & FILE_ATTRIBUTE_DIRECTORY) != 0; +} + +static BOOL create_directory(const WCHAR *path) +{ + if (is_directory(path)) return TRUE; + if (CreateDirectoryW(path, NULL)) return TRUE; + return (GetLastError() == ERROR_ALREADY_EXISTS); +} + +static BOOL create_parent_directory(const WCHAR *filename) +{ + WCHAR *p, *path = strdupW(filename); + BOOL ret = FALSE; + + if (!path) return FALSE; + if (!PathRemoveFileSpecW(path)) goto done; + if (is_directory(path)) + { + ret = TRUE; + goto done; + } + + for (p = path; *p; p++) + { + if (*p != '\\') continue; + *p = 0; + if (!create_directory(path)) goto done; + *p = '\\'; + } + ret = create_directory(path); + +done: + heap_free(path); + return ret; +} + +static INT_PTR cabinet_copy_file(FDINOTIFICATIONTYPE fdint, PFDINOTIFICATION pfdin) +{ + HANDLE handle = INVALID_HANDLE_VALUE; + WCHAR *file; + DWORD attrs; + + if (!(file = get_uncompressed_path(pfdin))) + return -1; + + TRACE("Extracting %s -> %s\n", debugstr_a(pfdin->psz1), debugstr_w(file)); + + if (create_parent_directory(file)) + { + attrs = pfdin->attribs; + if (!attrs) attrs = FILE_ATTRIBUTE_NORMAL; + handle = CreateFileW(file, GENERIC_READ | GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, attrs, NULL); + } + + heap_free(file); + return (handle != INVALID_HANDLE_VALUE) ? (INT_PTR)handle : -1; +} + +static INT_PTR cabinet_close_file_info(FDINOTIFICATIONTYPE fdint, PFDINOTIFICATION pfdin) +{ + HANDLE handle = (HANDLE)pfdin->hf; + CloseHandle(handle); + return 1; +} + +static INT_PTR CDECL cabinet_notify(FDINOTIFICATIONTYPE fdint, PFDINOTIFICATION pfdin) +{ + switch (fdint) + { + case fdintPARTIAL_FILE: + FIXME("fdintPARTIAL_FILE not implemented\n"); + return 0; + + case fdintNEXT_CABINET: + FIXME("fdintNEXT_CABINET not implemented\n"); + return 0; + + case fdintCOPY_FILE: + return cabinet_copy_file(fdint, pfdin); + + case fdintCLOSE_FILE_INFO: + return cabinet_close_file_info(fdint, pfdin); + + default: + return 0; + } +} + +static BOOL extract_cabinet(const WCHAR *filename, const WCHAR *destination) +{ + char *filenameA = NULL; + BOOL ret = FALSE; + HFDI hfdi; + ERF erf; + + hfdi = FDICreate(cabinet_alloc, cabinet_free, cabinet_open, cabinet_read, + cabinet_write, cabinet_close, cabinet_seek, 0, &erf); + if (!hfdi) return FALSE; + + if ((filenameA = strdupWtoA(filename))) + { + ret = FDICopy(hfdi, filenameA, NULL, 0, cabinet_notify, NULL, (void *)destination); + heap_free(filenameA); + } + + FDIDestroy(hfdi); + return ret; +} + +static const WCHAR *create_temp_directory(struct installer_state *state) +{ + static UINT id; + struct installer_tempdir *entry; + WCHAR tmp[MAX_PATH]; + + if (!GetTempPathW(ARRAY_SIZE(tmp), tmp)) return NULL; + if (!(entry = heap_alloc(sizeof(*entry)))) return NULL; + if (!(entry->path = heap_alloc((MAX_PATH + 20) * sizeof(WCHAR)))) + { + heap_free(entry); + return NULL; + } + for (;;) + { + if (!GetTempFileNameW(tmp, L"msu", ++id, entry->path)) + { + heap_free(entry->path); + heap_free(entry); + return NULL; + } + if (CreateDirectoryW(entry->path, NULL)) break; + } + + list_add_tail(&state->tempdirs, &entry->entry); + return entry->path; +} + +static BOOL delete_directory(const WCHAR *path) +{ + WIN32_FIND_DATAW data; + WCHAR *full_path; + HANDLE search; + + if (!(full_path = path_combine(path, L"*"))) return FALSE; + search = FindFirstFileW(full_path, &data); + heap_free(full_path); + + if (search != INVALID_HANDLE_VALUE) + { + do + { + if (!wcscmp(data.cFileName, L".")) continue; + if (!wcscmp(data.cFileName, L"..")) continue; + if (!(full_path = path_combine(path, data.cFileName))) continue; + if (data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) + delete_directory(full_path); + else + DeleteFileW(full_path); + heap_free(full_path); + } + while (FindNextFileW(search, &data)); + FindClose(search); + } + + return RemoveDirectoryW(path); +} + +static void installer_cleanup(struct installer_state *state) +{ + struct installer_tempdir *tempdir, *tempdir2; + + LIST_FOR_EACH_ENTRY_SAFE(tempdir, tempdir2, &state->tempdirs, struct installer_tempdir, entry) + { + list_remove(&tempdir->entry); + delete_directory(tempdir->path); + heap_free(tempdir->path); + heap_free(tempdir); + } +} + +static BOOL install_msu(const WCHAR *filename, struct installer_state *state) +{ + const WCHAR *temp_path; + BOOL ret = FALSE; + + list_init(&state->tempdirs); + + TRACE("Processing msu file %s\n", debugstr_w(filename)); + + if (!(temp_path = create_temp_directory(state))) return FALSE; + if (!extract_cabinet(filename, temp_path)) + { + ERR("Failed to extract %s\n", debugstr_w(filename)); + goto done; + } + + ret = TRUE; + +done: + installer_cleanup(state); + return ret; +} + int __cdecl wmain(int argc, WCHAR *argv[]) { + struct installer_state state; + const WCHAR *filename = NULL; int i; - WINE_FIXME("stub:"); - for (i = 0; i < argc; i++) - WINE_FIXME(" %s", wine_dbgstr_w(argv[i])); - WINE_FIXME("\n"); + state.norestart = FALSE; + state.quiet = FALSE; - return 0; + if (TRACE_ON(wusa)) + { + TRACE("Command line:"); + for (i = 0; i < argc; i++) + TRACE(" %s", wine_dbgstr_w(argv[i])); + TRACE("\n"); + } + + for (i = 1; i < argc; i++) + { + if (argv[i][0] == '/') + { + if (!wcscmp(argv[i], L"/norestart")) + state.norestart = TRUE; + else if (!wcscmp(argv[i], L"/quiet")) + state.quiet = TRUE; + else + FIXME("Unknown option: %s\n", wine_dbgstr_w(argv[i])); + } + else if (!filename) + filename = argv[i]; + else + FIXME("Unknown option: %s\n", wine_dbgstr_w(argv[i])); + } + + if (!filename) + { + FIXME("Missing filename argument\n"); + return 1; + } + + return !install_msu(filename, &state); } diff --git a/programs/wusa/wusa.h b/programs/wusa/wusa.h new file mode 100644 index 0000000000..c6bf7eda11 --- /dev/null +++ b/programs/wusa/wusa.h @@ -0,0 +1,62 @@ +/* + * Copyright 2015 Michael Müller + * Copyright 2015 Sebastian Lackner + * + * 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 + */ + +static void *heap_alloc(size_t len) __WINE_ALLOC_SIZE(1); +static inline void *heap_alloc(size_t len) +{ + return HeapAlloc(GetProcessHeap(), 0, len); +} + +static inline BOOL heap_free(void *mem) +{ + return HeapFree(GetProcessHeap(), 0, mem); +} + +static inline char *strdupWtoA(const WCHAR *str) +{ + char *ret = NULL; + DWORD len; + + if (!str) return ret; + len = WideCharToMultiByte(CP_ACP, 0, str, -1, NULL, 0, NULL, NULL); + if ((ret = heap_alloc(len))) + WideCharToMultiByte(CP_ACP, 0, str, -1, ret, len, NULL, NULL); + return ret; +} + +static inline WCHAR *strdupAtoW(const char *str) +{ + WCHAR *ret = NULL; + DWORD len; + + if (!str) return ret; + len = MultiByteToWideChar(CP_ACP, 0, str, -1, NULL, 0); + if ((ret = heap_alloc(len * sizeof(WCHAR)))) + MultiByteToWideChar(CP_ACP, 0, str, -1, ret, len); + return ret; +} + +static inline WCHAR *strdupW(const WCHAR *str) +{ + WCHAR *ret; + if (!str) return NULL; + ret = heap_alloc((lstrlenW(str) + 1) * sizeof(WCHAR)); + if (ret) lstrcpyW(ret, str); + return ret; +} -- 2.20.1

2 2

[PATCH v3 1/7] wined3d: Add extra memory management fields to struct wined3d_adapter.
by Conor McCarthy 03 Dec '19

03 Dec '19

Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> --- This set supersedes 173693 to 173699. --- dlls/wined3d/adapter_gl.c | 4 +++- dlls/wined3d/adapter_vk.c | 4 +++- dlls/wined3d/device.c | 6 +++--- dlls/wined3d/directx.c | 11 +++++++---- dlls/wined3d/wined3d_private.h | 10 +++++++++- 5 files changed, 25 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 7018c6da..2cc6aaf9 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -3881,7 +3881,9 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, TRACE("Reporting (fake) driver version 0x%08x-0x%08x.\n", driver_info->version_high, driver_info->version_low); - adapter->vram_bytes_used = 0; + memset(&adapter->memory_usage, 0, sizeof(adapter->memory_usage)); + adapter->memory_events = NULL; + adapter->event_count = 0; TRACE("Emulating 0x%s bytes of video ram.\n", wine_dbgstr_longlong(driver_info->vram_bytes)); if (gl_info->supported[EXT_MEMORY_OBJECT]) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 21163a20..81526ade 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -1180,7 +1180,9 @@ static BOOL wined3d_adapter_vk_init(struct wined3d_adapter_vk *adapter_vk, VK_CALL(vkGetPhysicalDeviceMemoryProperties(adapter_vk->physical_device, &memory_properties)); adapter_vk_init_driver_info(adapter, &properties2.properties, &memory_properties); - adapter->vram_bytes_used = 0; + memset(&adapter->memory_usage, 0, sizeof(adapter->memory_usage)); + adapter->memory_events = NULL; + adapter->event_count = 0; TRACE("Emulating 0x%s bytes of video ram.\n", wine_dbgstr_longlong(adapter->driver_info.vram_bytes)); memcpy(&adapter->driver_uuid, id_properties.driverUUID, sizeof(adapter->driver_uuid)); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 87db701d..85532dbd 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1204,10 +1204,10 @@ UINT CDECL wined3d_device_get_available_texture_mem(const struct wined3d_device TRACE("Emulating 0x%s bytes. 0x%s used, returning 0x%s left.\n", wine_dbgstr_longlong(driver_info->vram_bytes), - wine_dbgstr_longlong(device->adapter->vram_bytes_used), - wine_dbgstr_longlong(driver_info->vram_bytes - device->adapter->vram_bytes_used)); + wine_dbgstr_longlong(device->adapter->memory_usage[0].bytes_used), + wine_dbgstr_longlong(driver_info->vram_bytes - device->adapter->memory_usage[0].bytes_used)); - return min(UINT_MAX, driver_info->vram_bytes - device->adapter->vram_bytes_used); + return min(UINT_MAX, driver_info->vram_bytes - device->adapter->memory_usage[0].bytes_used); } void CDECL wined3d_device_set_stream_output(struct wined3d_device *device, UINT idx, diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 902cc444..fa991d36 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -146,16 +146,17 @@ static HRESULT wined3d_output_init(struct wined3d_output *output, const WCHAR *d /* Adjust the amount of used texture memory */ UINT64 adapter_adjust_memory(struct wined3d_adapter *adapter, INT64 amount) { - adapter->vram_bytes_used += amount; + adapter->memory_usage[0].bytes_used += amount; TRACE("Adjusted used adapter memory by 0x%s to 0x%s.\n", wine_dbgstr_longlong(amount), - wine_dbgstr_longlong(adapter->vram_bytes_used)); - return adapter->vram_bytes_used; + wine_dbgstr_longlong(adapter->memory_usage[0].bytes_used)); + return adapter->memory_usage[0].bytes_used; } void wined3d_adapter_cleanup(struct wined3d_adapter *adapter) { wined3d_output_cleanup(&adapter->output); + heap_free(adapter->memory_events); heap_free(adapter->formats); } @@ -2778,7 +2779,9 @@ static struct wined3d_adapter *wined3d_adapter_no3d_create(unsigned int ordinal, return NULL; wined3d_driver_info_init(&adapter->driver_info, &gpu_description, 0, 0); - adapter->vram_bytes_used = 0; + memset(&adapter->memory_usage, 0, sizeof(adapter->memory_usage)); + adapter->memory_events = NULL; + adapter->event_count = 0; TRACE("Emulating 0x%s bytes of video ram.\n", wine_dbgstr_longlong(adapter->driver_info.vram_bytes)); if (!wined3d_adapter_init(adapter, ordinal, &wined3d_adapter_no3d_ops)) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index f6d25aa6..7c0a73a0 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2868,6 +2868,12 @@ struct wined3d_output D3DDDI_VIDEO_PRESENT_SOURCE_ID vidpn_source_id; }; +struct wined3d_adapter_memory_usage +{ + UINT64 bytes_used; + UINT64 bytes_reserved; +}; + /* The adapter structure */ struct wined3d_adapter { @@ -2879,7 +2885,9 @@ struct wined3d_adapter struct wined3d_d3d_info d3d_info; struct wined3d_driver_info driver_info; struct wined3d_output output; - UINT64 vram_bytes_used; + struct wined3d_adapter_memory_usage memory_usage[2]; + HANDLE *memory_events; + DWORD event_count; GUID driver_uuid; GUID device_uuid; LUID luid; -- 2.24.0

3 14