June 2021 - Wine-commits - list.winehq.org

Henri Verbeet : wined3d: Implement NULL constant buffer views for the Vulkan backend.
by Alexandre Julliard 07 Jun '21

07 Jun '21

Module: wine Branch: stable Commit: 53bbcc789e964bdce225e41806b8af573c4f9466 URL: https://source.winehq.org/git/wine.git/?a=commit;h=53bbcc789e964bdce225e418… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jan 22 10:45:22 2021 +0100 wined3d: Implement NULL constant buffer views for the Vulkan backend. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 50a90dcb3230b65fefdbb8d9c5fff0d7968172e3) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wined3d/context_vk.c | 7 +++++-- dlls/wined3d/device.c | 6 +++++- dlls/wined3d/wined3d_private.h | 2 ++ 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index 04d24ba163a..34a428c8308 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -2527,8 +2527,11 @@ static bool wined3d_context_vk_update_descriptors(struct wined3d_context_vk *con case WINED3D_SHADER_DESCRIPTOR_TYPE_CBV: if (!(buffer = state->cb[binding->shader_type][binding->resource_idx])) { - FIXME("NULL constant buffer views not implemented.\n"); - return false; + if (!wined3d_shader_descriptor_writes_vk_add_write(writes, vk_descriptor_set, + binding->binding_idx, VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER, + &device_vk->null_resources_vk.buffer_info, NULL, NULL)) + return false; + break; } buffer_vk = wined3d_buffer_vk(buffer); buffer_info = wined3d_buffer_vk_get_buffer_info(buffer_vk); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index cc40125ac95..3c16a3c691e 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -717,11 +717,15 @@ bool wined3d_device_vk_create_null_resources(struct wined3d_device_vk *device_vk vk_info = context_vk->vk_info; - usage = VK_BUFFER_USAGE_TRANSFER_DST_BIT | VK_BUFFER_USAGE_UNIFORM_TEXEL_BUFFER_BIT; + usage = VK_BUFFER_USAGE_TRANSFER_DST_BIT | VK_BUFFER_USAGE_UNIFORM_TEXEL_BUFFER_BIT + | VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT; memory_type = VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT; if (!wined3d_context_vk_create_bo(context_vk, 16, usage, memory_type, &r->bo)) return false; VK_CALL(vkCmdFillBuffer(vk_command_buffer, r->bo.vk_buffer, r->bo.buffer_offset, r->bo.size, 0x00000000u)); + r->buffer_info.buffer = r->bo.vk_buffer; + r->buffer_info.offset = r->bo.buffer_offset; + r->buffer_info.range = r->bo.size; if (!wined3d_null_image_vk_init(&r->image_1d, context_vk, vk_command_buffer, VK_IMAGE_TYPE_1D, 1, 1)) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 62626b326ca..d720cfa07b0 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3881,6 +3881,8 @@ struct wined3d_null_image_vk struct wined3d_null_resources_vk { struct wined3d_bo_vk bo; + VkDescriptorBufferInfo buffer_info; + struct wined3d_null_image_vk image_1d; struct wined3d_null_image_vk image_2d; struct wined3d_null_image_vk image_2dms;

1 0

Henri Verbeet : wined3d: Always include any depth/stencil attachment in the Vulkan framebuffer.
by Alexandre Julliard 07 Jun '21

07 Jun '21

Module: wine Branch: stable Commit: 198c0579be8728fc47378ab75cd4d8da17e36367 URL: https://source.winehq.org/git/wine.git/?a=commit;h=198c0579be8728fc47378ab7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 21 10:55:51 2021 +0100 wined3d: Always include any depth/stencil attachment in the Vulkan framebuffer. Analogous to the GL backend. The alternative would be to potentially invalidate STATE_FRAMEBUFFER when changing the depth/stencil state object, which doesn't seem worth it. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit a3f829bbb8894410c7e2e5f909ef37415c33deac) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wined3d/context_vk.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index 34a428c8308..841b3d742c6 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -2174,7 +2174,7 @@ static bool wined3d_context_vk_begin_render_pass(struct wined3d_context_vk *cont ++attachment_count; } - if (wined3d_state_uses_depth_buffer(state) && (view = state->fb.depth_stencil)) + if ((view = state->fb.depth_stencil)) { rtv_vk = wined3d_rendertarget_view_vk(view); vk_views[attachment_count] = wined3d_rendertarget_view_vk_get_image_view(rtv_vk, context_vk); @@ -2191,7 +2191,7 @@ static bool wined3d_context_vk_begin_render_pass(struct wined3d_context_vk *cont } if (!(context_vk->vk_render_pass = wined3d_context_vk_get_render_pass(context_vk, &state->fb, - ARRAY_SIZE(state->fb.render_targets), wined3d_state_uses_depth_buffer(state), 0))) + ARRAY_SIZE(state->fb.render_targets), !!state->fb.depth_stencil, 0))) { ERR("Failed to get render pass.\n"); return false;

1 0

Nikolay Sivov : dcomp: Add DCompositionCreateDevice() stub.
by Alexandre Julliard 07 Jun '21

07 Jun '21

Module: wine Branch: stable Commit: da2955cdb7dc047ec304e14b83ed5e61ac4ddf13 URL: https://source.winehq.org/git/wine.git/?a=commit;h=da2955cdb7dc047ec304e14b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jan 14 22:45:05 2021 +0300 dcomp: Add DCompositionCreateDevice() stub. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50459 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 8eabf58dee5b6212d14f425f2c32f6e42a7d8538) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dcomp/dcomp.spec | 2 +- dlls/dcomp/device.c | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/dcomp/dcomp.spec b/dlls/dcomp/dcomp.spec index 10e9f49a412..428385e3a2a 100644 --- a/dlls/dcomp/dcomp.spec +++ b/dlls/dcomp/dcomp.spec @@ -15,7 +15,7 @@ @ stub DCompositionAttachMouseWheelToHwnd @ stdcall DCompositionCreateDevice2(ptr ptr ptr) @ stub DCompositionCreateDevice3 -@ stub DCompositionCreateDevice +@ stdcall DCompositionCreateDevice(ptr ptr ptr) @ stub DCompositionCreateSurfaceHandle @ stub DeserializeEffectDescription @ stub DllCanUnloadNow diff --git a/dlls/dcomp/device.c b/dlls/dcomp/device.c index efc6bacdb08..2d0600ce50a 100644 --- a/dlls/dcomp/device.c +++ b/dlls/dcomp/device.c @@ -20,10 +20,18 @@ #include "windef.h" #include "winbase.h" #include "objidl.h" +#include "dxgi.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(dcomp); +HRESULT WINAPI DCompositionCreateDevice(IDXGIDevice *dxgi_device, REFIID iid, void **device) +{ + FIXME("%p, %s, %p.\n", dxgi_device, debugstr_guid(iid), device); + + return E_NOTIMPL; +} + HRESULT WINAPI DCompositionCreateDevice2(IUnknown *rendering_device, REFIID iid, void **device) { FIXME("%p, %s, %p.\n", rendering_device, debugstr_guid(iid), device);

1 0

Henri Verbeet : wined3d: Use glFinish() for synchronisation when cleaning up a destroyed context in wined3d_context_gl_cleanup().
by Alexandre Julliard 07 Jun '21

07 Jun '21

Module: wine Branch: stable Commit: dbfed2e2f67453160e37874d74eccfddb519c474 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dbfed2e2f67453160e37874d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 12 21:15:57 2021 +0330 wined3d: Use glFinish() for synchronisation when cleaning up a destroyed context in wined3d_context_gl_cleanup(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50485 Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 3cc8147594de868884d3e57babff8eef058c63a3) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wined3d/context_gl.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index 467f5b64d6c..a51e5ec9095 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -1374,9 +1374,20 @@ static void wined3d_context_gl_cleanup(struct wined3d_context_gl *context_gl) if (context_gl->valid) { - wined3d_context_gl_submit_command_fence(context_gl); - wined3d_context_gl_wait_command_fence(context_gl, - wined3d_device_gl(context_gl->c.device)->current_fence_id - 1); + /* If we're here because we're switching away from a previously + * destroyed context, acquiring a context in order to submit a fence + * is problematic. (In particular, we'd end up back here again in the + * process of switching to the newly acquired context.) */ + if (context_gl->c.destroyed) + { + gl_info->gl_ops.gl.p_glFinish(); + } + else + { + wined3d_context_gl_submit_command_fence(context_gl); + wined3d_context_gl_wait_command_fence(context_gl, + wined3d_device_gl(context_gl->c.device)->current_fence_id - 1); + } if (context_gl->dummy_arbfp_prog) GL_EXTCALL(glDeleteProgramsARB(1, &context_gl->dummy_arbfp_prog));

1 0

Zebediah Figura : gdi32: Do not compare face file names in insert_face_in_family_list() if either is NULL.
by Alexandre Julliard 07 Jun '21

07 Jun '21

Module: wine Branch: stable Commit: ae93bdd8fa743a319d858b44e26793861c7733ce URL: https://source.winehq.org/git/wine.git/?a=commit;h=ae93bdd8fa743a319d858b44… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jan 11 16:11:33 2021 -0600 gdi32: Do not compare face file names in insert_face_in_family_list() if either is NULL. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50486 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 96fdbabc722f95fd9c4051c1d6f73e5f9515afa3) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/gdi32/font.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 7f243192cc3..6f50cc92a83 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -913,7 +913,7 @@ static BOOL insert_face_in_family_list( struct gdi_font_face *face, struct gdi_f debugstr_w(face->full_name), debugstr_w(family->family_name), cursor->version, face->version ); - if (face->file && !wcsicmp( face->file, cursor->file )) + if (face->file && cursor->file && !wcsicmp( face->file, cursor->file )) { cursor->refcount++; TRACE("Font %s already in list, refcount now %d\n",

1 0

Alistair Leslie-Hughes : dsound: IDirectSoundBuffer8 GetStatus return DSBSTATUS_LOCSOFTWARE for deferred buffers.
by Alexandre Julliard 07 Jun '21

07 Jun '21

Module: wine Branch: stable Commit: 50fdd5e2b5c6347ccffb19efe31f271feca92de0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=50fdd5e2b5c6347ccffb19ef… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Jan 15 18:22:18 2021 +1100 dsound: IDirectSoundBuffer8 GetStatus return DSBSTATUS_LOCSOFTWARE for deferred buffers. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=21014 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 2e8bd2682a1c5335465ed891ea1063d82c346577) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dsound/buffer.c | 2 ++ dlls/dsound/tests/dsound8.c | 74 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 76 insertions(+) diff --git a/dlls/dsound/buffer.c b/dlls/dsound/buffer.c index bc30a8a5448..fafa6fc6015 100644 --- a/dlls/dsound/buffer.c +++ b/dlls/dsound/buffer.c @@ -420,6 +420,8 @@ static HRESULT WINAPI IDirectSoundBufferImpl_GetStatus(IDirectSoundBuffer8 *ifac if (This->playflags & DSBPLAY_LOOPING) *status |= DSBSTATUS_LOOPING; } + if (This->dsbd.dwFlags & DSBCAPS_LOCDEFER) + *status |= DSBSTATUS_LOCSOFTWARE; ReleaseSRWLockShared(&This->lock); TRACE("status=%x\n", *status); diff --git a/dlls/dsound/tests/dsound8.c b/dlls/dsound/tests/dsound8.c index 81c5710dbaf..85272dd9b55 100644 --- a/dlls/dsound/tests/dsound8.c +++ b/dlls/dsound/tests/dsound8.c @@ -1809,6 +1809,79 @@ static void test_effects(void) ok(!ref, "Got outstanding refcount %u.\n", ref); } +static void test_AcquireResources(void) +{ + IDirectSound8 *dsound; + IDirectSoundBuffer *primary, *secondary; + DSBUFFERDESC bufdesc; + WAVEFORMATEX fmt; + HRESULT hr; + + hr = DirectSoundCreate8(NULL, &dsound, NULL); + ok(hr == DS_OK || hr == DSERR_NODRIVER, "Got hr %#x.\n", hr); + if (FAILED(hr)) + return; + + hr = IDirectSound8_SetCooperativeLevel(dsound, get_hwnd(), DSSCL_PRIORITY); + ok(hr == DS_OK, "Got hr %#x.\n", hr); + + bufdesc.dwSize = sizeof(bufdesc); + bufdesc.dwFlags = DSBCAPS_GETCURRENTPOSITION2 | DSBCAPS_PRIMARYBUFFER; + bufdesc.dwBufferBytes = 0; + bufdesc.dwReserved = 0; + bufdesc.lpwfxFormat = NULL; + bufdesc.guid3DAlgorithm = GUID_NULL; + + hr = IDirectSound8_CreateSoundBuffer(dsound, &bufdesc, &primary, NULL); + ok(hr == S_OK, "CreateSoundBuffer failed: %08x\n", hr); + if(hr != S_OK) { + IDirectSound_Release(dsound); + return; + } + + fmt.wFormatTag = WAVE_FORMAT_PCM; + fmt.nChannels = 2; + fmt.nSamplesPerSec = 48000; + fmt.wBitsPerSample = 16; + fmt.nBlockAlign = fmt.nChannels * fmt.wBitsPerSample / 8; + fmt.nAvgBytesPerSec = fmt.nBlockAlign * fmt.nSamplesPerSec; + fmt.cbSize = 0; + + bufdesc.lpwfxFormat = &fmt; + bufdesc.dwBufferBytes = fmt.nSamplesPerSec * fmt.nBlockAlign / 10; + bufdesc.dwFlags = DSBCAPS_LOCDEFER | DSBCAPS_CTRLVOLUME; + + /* see if we can create one more */ + hr = IDirectSound8_CreateSoundBuffer(dsound, &bufdesc, &secondary, NULL); + ok(hr == S_OK, "CreateSoundBuffer gave wrong error: %08x\n", hr); + if(hr == S_OK) { + DWORD status; + IDirectSoundBuffer8 *buffer8; + + hr = IDirectSoundBuffer_QueryInterface(secondary, &IID_IDirectSoundBuffer8, (void **)&buffer8); + ok(hr == S_OK, "got: %08x\n", hr); + + status = 0xFFFF; + hr = IDirectSoundBuffer8_GetStatus(buffer8, &status); + ok(hr == S_OK, "got: %08x\n", hr); + todo_wine ok(status == 0, "got: %08x\n", status); + + hr = IDirectSoundBuffer8_AcquireResources(buffer8, 0, 0, NULL); + ok(hr == S_OK, "got: %08x\n", hr); + + status = 0xFFFF; + hr = IDirectSoundBuffer8_GetStatus(buffer8, &status); + ok(hr == S_OK, "got: %08x\n", hr); + ok(status == DSBSTATUS_LOCSOFTWARE, "got: %08x\n", status); + + IDirectSoundBuffer8_Release(buffer8); + IDirectSoundBuffer_Release(secondary); + } + + IDirectSoundBuffer_Release(primary); + IDirectSound_Release(dsound); +} + START_TEST(dsound8) { DWORD cookie; @@ -1822,6 +1895,7 @@ START_TEST(dsound8) test_hw_buffers(); test_first_device(); test_primary_flags(); + test_AcquireResources(); hr = CoRegisterClassObject(&testdmo_clsid, (IUnknown *)&testdmo_cf, CLSCTX_INPROC_SERVER, REGCLS_MULTIPLEUSE, &cookie);

1 0

Henri Verbeet : wined3d: Implement the "precise" flag in the GLSL shader backend.
by Alexandre Julliard 07 Jun '21

07 Jun '21

Module: wine Branch: stable Commit: 15f4d9c60e1ce111220951b6489368b3438fa8a0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=15f4d9c60e1ce111220951b6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 19 14:34:53 2021 +0100 wined3d: Implement the "precise" flag in the GLSL shader backend. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 7a54209d4bb5df18ac8fcdf26d8aa73e770403c4) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 7423b2003a6..b3bbd6f9f7f 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2540,6 +2540,10 @@ static void shader_generate_glsl_declarations(const struct wined3d_context_gl *c /* Temporary variables for matrix operations */ shader_addline(buffer, "vec4 tmp0;\n"); shader_addline(buffer, "vec4 tmp1;\n"); + if (gl_info->supported[ARB_GPU_SHADER5]) + shader_addline(buffer, "precise vec4 tmp_precise;\n"); + else + shader_addline(buffer, "/* precise */ vec4 tmp_precise;\n"); if (!shader->load_local_constsF) { @@ -3268,6 +3272,9 @@ static DWORD shader_glsl_append_dst_ext(struct wined3d_string_buffer *buffer, if ((mask = shader_glsl_add_dst_param(ins, dst, &glsl_dst))) { + if (ins->flags & WINED3DSI_PRECISE_XYZW) + sprintf(glsl_dst.reg_name, "tmp_precise"); + switch (data_type) { case WINED3D_DATA_FLOAT: @@ -3309,6 +3316,13 @@ static void shader_glsl_add_instruction_modifiers(const struct wined3d_shader_in if (!ins->dst_count) return; + if (ins->flags & WINED3DSI_PRECISE_XYZW) + { + shader_glsl_add_dst_param(ins, &ins->dst[0], &dst_param); + shader_addline(ins->ctx->buffer, "%s%s = tmp_precise%s;\n", + dst_param.reg_name, dst_param.mask_str, dst_param.mask_str); + } + modifiers = ins->dst[0].modifiers; if (!modifiers) return;

1 0

Hans Leidekker : winhttp: Avoid a crash when the connection is closed while handling a redirect.
by Alexandre Julliard 07 Jun '21

07 Jun '21

Module: wine Branch: stable Commit: dd59c1a45bdbebc5e379c97af65d123c486d97da URL: https://source.winehq.org/git/wine.git/?a=commit;h=dd59c1a45bdbebc5e379c97a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jan 19 16:52:08 2021 +0100 winhttp: Avoid a crash when the connection is closed while handling a redirect. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48870 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 83afd177b3735f88e38f926aaf3aa0a20178e458) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/winhttp/request.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 31296cd02ba..2ff211255ee 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -2739,7 +2739,7 @@ static DWORD receive_response( struct request *request, BOOL async ) break; } - netconn_set_timeout( request->netconn, FALSE, request->receive_timeout ); + if (request->netconn) netconn_set_timeout( request->netconn, FALSE, request->receive_timeout ); if (request->content_length) ret = refill_buffer( request, FALSE ); if (async)

1 0

Dmitry Timoshkov : wbemprox: Add class SystemRestore stub implementation.
by Alexandre Julliard 07 Jun '21

07 Jun '21

Module: wine Branch: stable Commit: 35fb24069560faeae24d4717b2c6f5a183330103 URL: https://source.winehq.org/git/wine.git/?a=commit;h=35fb24069560faeae24d4717… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Jan 20 11:15:57 2021 +0100 wbemprox: Add class SystemRestore stub implementation. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50033 Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit e0cb4d509338f5d1d6db71584722731d38b0d837) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wbemprox/Makefile.in | 1 + dlls/wbemprox/builtin.c | 38 ++++++++++++++++++++++++ dlls/wbemprox/sysrestore.c | 62 ++++++++++++++++++++++++++++++++++++++++ dlls/wbemprox/tests/query.c | 7 +++-- dlls/wbemprox/wbemprox_private.h | 5 ++++ 5 files changed, 111 insertions(+), 2 deletions(-) diff --git a/dlls/wbemprox/Makefile.in b/dlls/wbemprox/Makefile.in index a26c833878f..ed2710f8855 100644 --- a/dlls/wbemprox/Makefile.in +++ b/dlls/wbemprox/Makefile.in @@ -14,6 +14,7 @@ C_SRCS = \ security.c \ service.c \ services.c \ + sysrestore.c \ table.c \ wbemlocator.c diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 9bd58ca77e6..39166a21171 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -406,6 +406,20 @@ static const struct column col_systemsecurity[] = { L"GetSD", CIM_FLAG_ARRAY|COL_FLAG_METHOD }, { L"SetSD", CIM_FLAG_ARRAY|COL_FLAG_METHOD }, }; +static const struct column col_sysrestore[] = +{ + { L"CreationTime", CIM_STRING }, + { L"Description", CIM_STRING }, + { L"EventType", CIM_UINT32 }, + { L"RestorePointType", CIM_UINT32 }, + { L"SequenceNumber", CIM_UINT32 }, + /* methods */ + { L"CreateRestorePoint", CIM_FLAG_ARRAY|COL_FLAG_METHOD }, + { L"Disable", CIM_FLAG_ARRAY|COL_FLAG_METHOD }, + { L"Enable", CIM_FLAG_ARRAY|COL_FLAG_METHOD }, + { L"GetLastRestoreStatus", CIM_FLAG_ARRAY|COL_FLAG_METHOD }, + { L"Restore", CIM_FLAG_ARRAY|COL_FLAG_METHOD }, +}; static const struct column col_videocontroller[] = { { L"AdapterCompatibility", CIM_STRING }, @@ -783,6 +797,19 @@ struct record_stdregprov class_method *enumvalues; class_method *getstringvalue; }; +struct record_sysrestore +{ + const WCHAR *creation_time; + const WCHAR *description; + UINT32 event_type; + UINT32 restore_point_type; + UINT32 sequence_number; + class_method *create_restore_point; + class_method *disable_restore; + class_method *enable_restore; + class_method *get_last_restore_status; + class_method *restore; +}; struct record_systemsecurity { class_method *getsd; @@ -865,6 +892,10 @@ static const struct record_param data_param[] = { L"StdRegProv", L"GetStringValue", 1, L"sValueName", CIM_STRING }, { L"StdRegProv", L"GetStringValue", -1, L"ReturnValue", CIM_UINT32 }, { L"StdRegProv", L"GetStringValue", -1, L"sValue", CIM_STRING }, + { L"SystemRestore", L"Disable", 1, L"Drive", CIM_STRING }, + { L"SystemRestore", L"Disable", -1, L"ReturnValue", CIM_UINT32 }, + { L"SystemRestore", L"Enable", 1, L"Drive", CIM_STRING }, + { L"SystemRestore", L"Enable", -1, L"ReturnValue", CIM_UINT32 }, { L"Win32_Process", L"GetOwner", -1, L"ReturnValue", CIM_UINT32 }, { L"Win32_Process", L"GetOwner", -1, L"User", CIM_STRING }, { L"Win32_Process", L"GetOwner", -1, L"Domain", CIM_STRING }, @@ -895,6 +926,12 @@ static const struct record_stdregprov data_stdregprov[] = { { reg_create_key, reg_enum_key, reg_enum_values, reg_get_stringvalue } }; + +static const struct record_sysrestore data_sysrestore[] = +{ + { NULL, NULL, 0, 0, 0, create_restore_point, disable_restore, enable_restore, get_last_restore_status, restore } +}; + static UINT16 systemenclosure_chassistypes[] = { 1, @@ -3981,6 +4018,7 @@ static struct table builtin_classes[] = { L"CIM_LogicalDisk", C(col_logicaldisk), 0, 0, NULL, fill_logicaldisk }, { L"CIM_Processor", C(col_processor), 0, 0, NULL, fill_processor }, { L"StdRegProv", C(col_stdregprov), D(data_stdregprov) }, + { L"SystemRestore", C(col_sysrestore), D(data_sysrestore) }, { L"Win32_BIOS", C(col_bios), 0, 0, NULL, fill_bios }, { L"Win32_BaseBoard", C(col_baseboard), 0, 0, NULL, fill_baseboard }, { L"Win32_CDROMDrive", C(col_cdromdrive), 0, 0, NULL, fill_cdromdrive }, diff --git a/dlls/wbemprox/sysrestore.c b/dlls/wbemprox/sysrestore.c new file mode 100644 index 00000000000..b840d220b5c --- /dev/null +++ b/dlls/wbemprox/sysrestore.c @@ -0,0 +1,62 @@ +/* + * SystemRestore implementation + * + * Copyright 2020 Dmitry Timoshkov + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define COBJMACROS + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "wbemcli.h" + +#include "wine/debug.h" +#include "wbemprox_private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(wbemprox); + +HRESULT create_restore_point( IWbemClassObject *obj, IWbemClassObject *in, IWbemClassObject **out ) +{ + FIXME("stub\n"); + return S_OK; +} + +HRESULT disable_restore( IWbemClassObject *obj, IWbemClassObject *in, IWbemClassObject **out ) +{ + FIXME("stub\n"); + return S_OK; +} + +HRESULT enable_restore( IWbemClassObject *obj, IWbemClassObject *in, IWbemClassObject **out ) +{ + FIXME("stub\n"); + return S_OK; +} + +HRESULT get_last_restore_status( IWbemClassObject *obj, IWbemClassObject *in, IWbemClassObject **out ) +{ + FIXME("stub\n"); + return E_NOTIMPL; +} + +HRESULT restore( IWbemClassObject *obj, IWbemClassObject *in, IWbemClassObject **out ) +{ + FIXME("stub\n"); + return S_OK; +} diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 37b6fb4e8dc..1c7a615dd4e 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -1772,16 +1772,19 @@ static void test_SystemRestore( IWbemServices *services ) hr = IWbemServices_GetObject( services, class, 0, NULL, &service, NULL ); if (hr != S_OK) { - skip( "SystemRestore not available\n" ); + win_skip( "SystemRestore not available\n" ); SysFreeString( class ); return; } check_property( service, L"CreationTime", VT_NULL, CIM_STRING ); check_property( service, L"Description", VT_NULL, CIM_STRING ); + if (0) /* FIXME */ + { check_property( service, L"EventType", VT_NULL, CIM_UINT32 ); check_property( service, L"RestorePointType", VT_NULL, CIM_UINT32 ); check_property( service, L"SequenceNumber", VT_NULL, CIM_UINT32 ); + } method = SysAllocString( L"Enable" ); sig_in = NULL; @@ -1802,7 +1805,7 @@ static void test_SystemRestore( IWbemServices *services ) out = NULL; hr = IWbemServices_ExecMethod( services, class, method, 0, NULL, in, &out, NULL ); ok( hr == S_OK || hr == WBEM_E_ACCESS_DENIED, "failed to execute method %08x\n", hr ); - if (hr == S_OK) + if (hr == S_OK && out) { VariantInit( &var ); hr = IWbemClassObject_Get( out, L"ReturnValue", 0, &var, NULL, NULL ); diff --git a/dlls/wbemprox/wbemprox_private.h b/dlls/wbemprox/wbemprox_private.h index 30649257641..ff9a7f6ff82 100644 --- a/dlls/wbemprox/wbemprox_private.h +++ b/dlls/wbemprox/wbemprox_private.h @@ -253,6 +253,11 @@ HRESULT service_start_service(IWbemClassObject *, IWbemClassObject *, IWbemClass HRESULT service_stop_service(IWbemClassObject *, IWbemClassObject *, IWbemClassObject **) DECLSPEC_HIDDEN; HRESULT security_get_sd(IWbemClassObject *, IWbemClassObject *, IWbemClassObject **) DECLSPEC_HIDDEN; HRESULT security_set_sd(IWbemClassObject *, IWbemClassObject *, IWbemClassObject **) DECLSPEC_HIDDEN; +HRESULT create_restore_point(IWbemClassObject *, IWbemClassObject *, IWbemClassObject **) DECLSPEC_HIDDEN; +HRESULT disable_restore(IWbemClassObject *, IWbemClassObject *, IWbemClassObject **) DECLSPEC_HIDDEN; +HRESULT enable_restore(IWbemClassObject *, IWbemClassObject *, IWbemClassObject **) DECLSPEC_HIDDEN; +HRESULT get_last_restore_status(IWbemClassObject *, IWbemClassObject *in, IWbemClassObject **) DECLSPEC_HIDDEN; +HRESULT restore(IWbemClassObject *, IWbemClassObject *, IWbemClassObject **) DECLSPEC_HIDDEN; static inline WCHAR *heap_strdupW( const WCHAR *src ) {

1 0

Dmitry Timoshkov : wbemprox: Flesh out a bit SystemRestore::Enable() implementation.
by Alexandre Julliard 07 Jun '21

07 Jun '21

Module: wine Branch: stable Commit: 5bb151ebabc421986fbebb8a94a1678c725af43d URL: https://source.winehq.org/git/wine.git/?a=commit;h=5bb151ebabc421986fbebb8a… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Jan 20 11:15:58 2021 +0100 wbemprox: Flesh out a bit SystemRestore::Enable() implementation. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit d2baf148a14b41d0347dfdc2bc6cf9efc4f63242) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wbemprox/sysrestore.c | 48 +++++++++++++++++++++++++++++++++++++++++++-- dlls/wbemprox/tests/query.c | 2 +- 2 files changed, 47 insertions(+), 3 deletions(-) diff --git a/dlls/wbemprox/sysrestore.c b/dlls/wbemprox/sysrestore.c index b840d220b5c..d59077381fb 100644 --- a/dlls/wbemprox/sysrestore.c +++ b/dlls/wbemprox/sysrestore.c @@ -45,8 +45,52 @@ HRESULT disable_restore( IWbemClassObject *obj, IWbemClassObject *in, IWbemClass HRESULT enable_restore( IWbemClassObject *obj, IWbemClassObject *in, IWbemClassObject **out ) { - FIXME("stub\n"); - return S_OK; + VARIANT drive, retval; + IWbemClassObject *sig, *out_params = NULL; + HRESULT hr; + + TRACE("%p, %p\n", in, out); + + hr = IWbemClassObject_Get( in, L"Drive", 0, &drive, NULL, NULL ); + if (hr != S_OK) return hr; + + hr = create_signature( L"SystemRestore", L"Enable", PARAM_OUT, &sig ); + if (hr != S_OK) + { + VariantClear( &drive ); + return hr; + } + + if (out) + { + hr = IWbemClassObject_SpawnInstance( sig, 0, &out_params ); + if (hr != S_OK) + { + VariantClear( &drive ); + IWbemClassObject_Release( sig ); + return hr; + } + } + + FIXME("%s: stub\n", wine_dbgstr_variant(&drive)); + + VariantClear( &drive ); + IWbemClassObject_Release( sig ); + + if (out_params) + { + set_variant( VT_UI4, ERROR_SUCCESS, NULL, &retval ); + hr = IWbemClassObject_Put( out_params, L"ReturnValue", 0, &retval, CIM_UINT32 ); + } + + if (hr == S_OK && out) + { + *out = out_params; + IWbemClassObject_AddRef( out_params ); + } + if (out_params) IWbemClassObject_Release( out_params ); + + return hr; } HRESULT get_last_restore_status( IWbemClassObject *obj, IWbemClassObject *in, IWbemClassObject **out ) diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 1c7a615dd4e..67c0b218ce1 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -1805,7 +1805,7 @@ static void test_SystemRestore( IWbemServices *services ) out = NULL; hr = IWbemServices_ExecMethod( services, class, method, 0, NULL, in, &out, NULL ); ok( hr == S_OK || hr == WBEM_E_ACCESS_DENIED, "failed to execute method %08x\n", hr ); - if (hr == S_OK && out) + if (hr == S_OK) { VariantInit( &var ); hr = IWbemClassObject_Get( out, L"ReturnValue", 0, &var, NULL, NULL );

1 0