March 2024 - Wine-commits - list.winehq.org

Alexandros Frantzis : win32u: Cancel previous key auto-repeat when starting a new one.
by Alexandre Julliard 15 Mar '24

15 Mar '24

Module: wine Branch: master Commit: e63da6ea68e2eadf04a664f5e6660adb084f8e1e URL: https://gitlab.winehq.org/wine/wine/-/commit/e63da6ea68e2eadf04a664f5e6660a… Author: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> Date: Fri Mar 15 10:48:09 2024 +0200 win32u: Cancel previous key auto-repeat when starting a new one. The previous auto-repeat may be associated with a different HWND, so we cannot rely on the new timer replacing the old timer, and we don't want simultaneous repeats on different windows in the same thread. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56307 --- dlls/win32u/message.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/win32u/message.c b/dlls/win32u/message.c index 417f67452d7..44a27763bdc 100644 --- a/dlls/win32u/message.c +++ b/dlls/win32u/message.c @@ -2425,6 +2425,8 @@ static BOOL process_keyboard_message( MSG *msg, UINT hw_id, HWND hwnd_filter, if (msg->wParam == VK_PROCESSKEY) break; + if (thread_info->key_repeat_msg.hwnd != msg->hwnd) + kill_system_timer( thread_info->key_repeat_msg.hwnd, SYSTEM_TIMER_KEY_REPEAT ); thread_info->key_repeat_msg = *msg; if (NtUserSystemParametersInfo( SPI_GETKEYBOARDDELAY, 0, &delay, 0 )) NtUserSetSystemTimer( msg->hwnd, SYSTEM_TIMER_KEY_REPEAT, (delay + 1) * 250 );

1 0

Nikolay Sivov : wshom/network: Implement UserDomain property.
by Alexandre Julliard 15 Mar '24

15 Mar '24

Module: wine Branch: master Commit: 9d3e458c55391141971217ec0088931d598236aa URL: https://gitlab.winehq.org/wine/wine/-/commit/9d3e458c55391141971217ec008893… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 15 19:27:06 2024 +0100 wshom/network: Implement UserDomain property. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56434 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/wshom.ocx/network.c | 7 +++++-- dlls/wshom.ocx/shell.c | 20 +++++++++++++------- dlls/wshom.ocx/tests/wshom.c | 8 ++++++++ dlls/wshom.ocx/wshom_private.h | 1 + 4 files changed, 27 insertions(+), 9 deletions(-) diff --git a/dlls/wshom.ocx/network.c b/dlls/wshom.ocx/network.c index f2a88c2117f..1f7996d2952 100644 --- a/dlls/wshom.ocx/network.c +++ b/dlls/wshom.ocx/network.c @@ -114,9 +114,12 @@ static HRESULT WINAPI WshNetwork2_Invoke(IWshNetwork2 *iface, DISPID dispIdMembe static HRESULT WINAPI WshNetwork2_get_UserDomain(IWshNetwork2 *iface, BSTR *user_domain) { - FIXME("%p stub\n", user_domain); + TRACE("%p, %p.\n", iface, user_domain); - return E_NOTIMPL; + if (!user_domain) + return E_POINTER; + + return get_env_var(L"USERDOMAIN", user_domain); } static HRESULT WINAPI WshNetwork2_get_UserName(IWshNetwork2 *iface, BSTR *user_name) diff --git a/dlls/wshom.ocx/shell.c b/dlls/wshom.ocx/shell.c index 69db995cd0d..dd21e03b898 100644 --- a/dlls/wshom.ocx/shell.c +++ b/dlls/wshom.ocx/shell.c @@ -538,16 +538,10 @@ static HRESULT WINAPI WshEnvironment_Invoke(IWshEnvironment *iface, DISPID dispI return hr; } -static HRESULT WINAPI WshEnvironment_get_Item(IWshEnvironment *iface, BSTR name, BSTR *value) +HRESULT get_env_var(const WCHAR *name, BSTR *value) { - WshEnvironment *This = impl_from_IWshEnvironment(iface); DWORD len; - TRACE("(%p)->(%s %p)\n", This, debugstr_w(name), value); - - if (!value) - return E_POINTER; - len = GetEnvironmentVariableW(name, NULL, 0); if (len) { @@ -561,6 +555,18 @@ static HRESULT WINAPI WshEnvironment_get_Item(IWshEnvironment *iface, BSTR name, return *value ? S_OK : E_OUTOFMEMORY; } +static HRESULT WINAPI WshEnvironment_get_Item(IWshEnvironment *iface, BSTR name, BSTR *value) +{ + WshEnvironment *This = impl_from_IWshEnvironment(iface); + + TRACE("(%p)->(%s %p)\n", This, debugstr_w(name), value); + + if (!value) + return E_POINTER; + + return get_env_var(name, value); +} + static HRESULT WINAPI WshEnvironment_put_Item(IWshEnvironment *iface, BSTR name, BSTR value) { WshEnvironment *This = impl_from_IWshEnvironment(iface); diff --git a/dlls/wshom.ocx/tests/wshom.c b/dlls/wshom.ocx/tests/wshom.c index ed0f4e186a3..58736ff601f 100644 --- a/dlls/wshom.ocx/tests/wshom.c +++ b/dlls/wshom.ocx/tests/wshom.c @@ -745,6 +745,14 @@ static void test_wshnetwork(void) SysFreeString(name); SysFreeString(str); + str = NULL; + hr = IWshNetwork2_get_UserDomain(nw2, NULL); + ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr); + hr = IWshNetwork2_get_UserDomain(nw2, &str); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(!!str, "Unexpected pointer.\n"); + SysFreeString(str); + IWshNetwork2_Release(nw2); IDispatch_Release(disp); } diff --git a/dlls/wshom.ocx/wshom_private.h b/dlls/wshom.ocx/wshom_private.h index 8e7792c871c..19e3fff5b2c 100644 --- a/dlls/wshom.ocx/wshom_private.h +++ b/dlls/wshom.ocx/wshom_private.h @@ -46,6 +46,7 @@ struct provideclassinfo { }; extern void init_classinfo(const GUID *guid, IUnknown *outer, struct provideclassinfo *classinfo); +HRESULT get_env_var(const WCHAR *name, BSTR *value); HRESULT WINAPI WshShellFactory_CreateInstance(IClassFactory*,IUnknown*,REFIID,void**); HRESULT WINAPI WshNetworkFactory_CreateInstance(IClassFactory*,IUnknown*,REFIID,void**);

1 0

Paul Gofman : server: Ignore some ICMP-originated socket errors for connectionless sockets.
by Alexandre Julliard 15 Mar '24

15 Mar '24

Module: wine Branch: master Commit: 4d56a33ab0b8f6f808a3a507e76c29b905dd6d83 URL: https://gitlab.winehq.org/wine/wine/-/commit/4d56a33ab0b8f6f808a3a507e76c29… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Mar 14 20:05:31 2024 -0600 server: Ignore some ICMP-originated socket errors for connectionless sockets. --- server/sock.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/server/sock.c b/server/sock.c index 3ad1ce39194..8a95caded8b 100644 --- a/server/sock.c +++ b/server/sock.c @@ -813,7 +813,7 @@ static void post_sock_messages( struct sock *sock ) } } -static inline int sock_error( struct sock *sock ) +static inline int sock_error( struct sock *sock, int *poll_event ) { int error = 0; socklen_t len = sizeof(error); @@ -839,8 +839,14 @@ static inline int sock_error( struct sock *sock ) error = sock->errors[AFD_POLL_BIT_ACCEPT]; break; - case SOCK_CONNECTED: case SOCK_CONNECTIONLESS: + if (error == ENETUNREACH || error == EHOSTUNREACH || error == ECONNRESET) + { + if (poll_event) *poll_event &= ~POLLERR; + return 0; + } + /* fallthrough */ + case SOCK_CONNECTED: if (error == ECONNRESET || error == EPIPE) { sock->reset = 1; @@ -1346,7 +1352,7 @@ static void sock_poll_event( struct fd *fd, int event ) fprintf(stderr, "socket %p select event: %x\n", sock, event); if (event & (POLLERR | POLLHUP)) - error = sock_error( sock ); + error = sock_error( sock, &event ); switch (sock->state) { @@ -3115,7 +3121,7 @@ static void sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) return; } - error = sock_error( sock ); + error = sock_error( sock, NULL ); if (!error) { for (i = 0; i < ARRAY_SIZE( sock->errors ); ++i)

1 0

Esme Povirk : user32/tests: Add another missing message for TrackPopupMenu.
by Alexandre Julliard 15 Mar '24

15 Mar '24

Module: wine Branch: master Commit: 552cc456d1889ab3ee0dd5ead6c7520c34d030c0 URL: https://gitlab.winehq.org/wine/wine/-/commit/552cc456d1889ab3ee0dd5ead6c752… Author: Esme Povirk <esme(a)codeweavers.com> Date: Fri Mar 15 20:27:05 2024 +0000 user32/tests: Add another missing message for TrackPopupMenu. --- dlls/user32/tests/msg.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 23e9f043ed8..e11e4a09f7e 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -2176,6 +2176,7 @@ static const struct message WmTrackPopupMenuMinimizeWindow[] = { { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam|optional, 0, 0 }, /* Win7 seems to send this twice. */ { EVENT_SYSTEM_MINIMIZESTART, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, { HCBT_ACTIVATE, hook|optional }, /* win11 */ + { WM_NCACTIVATE, sent|optional }, /* win11 */ { WM_CANCELMODE, sent }, { EVENT_SYSTEM_CAPTUREEND, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, { WM_CAPTURECHANGED, sent|defwinproc },

1 0

Andrew Nguyen : ddraw: Release only valid texture parents on ddraw_texture_init failure.
by Alexandre Julliard 15 Mar '24

15 Mar '24

Module: wine Branch: master Commit: 1600f2e6bd0d4624dad10f61d08439aca967ce95 URL: https://gitlab.winehq.org/wine/wine/-/commit/1600f2e6bd0d4624dad10f61d08439… Author: Andrew Nguyen <arethusa26(a)gmail.com> Date: Wed Mar 13 22:51:23 2024 -0500 ddraw: Release only valid texture parents on ddraw_texture_init failure. When ddraw_texture_init needs to clean up on failure, it will call the wined3d_texture_get_sub_resource_parent function on draw_texture in order to retrieve its parent for a IDirectDrawSurface release call. However, if draw_texture is NULL, then the function call will crash due to a null pointer dereference. Therefore, on failure cleanup, the release operation on the texture parent should only be performed if draw_texture is not NULL. This fixes a crash in the Virtual Insanity game demo. --- dlls/ddraw/surface.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index d0c4bf67cbc..a096c5d7d8e 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -6519,15 +6519,17 @@ static HRESULT ddraw_texture_init(struct ddraw_texture *texture, struct ddraw *d fail: if (draw_texture) + { wined3d_texture_decref(draw_texture); - parent = wined3d_texture_get_sub_resource_parent(draw_texture, 0); - if (texture->version == 7) - IDirectDrawSurface7_Release(&parent->IDirectDrawSurface7_iface); - else if (texture->version == 4) - IDirectDrawSurface4_Release(&parent->IDirectDrawSurface4_iface); - else - IDirectDrawSurface_Release(&parent->IDirectDrawSurface_iface); + parent = wined3d_texture_get_sub_resource_parent(draw_texture, 0); + if (texture->version == 7) + IDirectDrawSurface7_Release(&parent->IDirectDrawSurface7_iface); + else if (texture->version == 4) + IDirectDrawSurface4_Release(&parent->IDirectDrawSurface4_iface); + else + IDirectDrawSurface_Release(&parent->IDirectDrawSurface_iface); + } return hr; }

1 0

Zhiyi Zhang : win32u: Fix a possible condition that makes EnumDisplayMonitors() not reporting any monitors.
by Alexandre Julliard 15 Mar '24

15 Mar '24

Module: wine Branch: master Commit: 6505403e58a67ac02b2587f442ac68184935f3f5 URL: https://gitlab.winehq.org/wine/wine/-/commit/6505403e58a67ac02b2587f442ac68… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Mar 15 11:56:30 2024 +0800 win32u: Fix a possible condition that makes EnumDisplayMonitors() not reporting any monitors. When there are two monitors and they are mirrored, both of them are considered primary. When the first primary monitor happens to be a clone, EnumDisplayMonitors() ends up not reporting any monitors because should_enumerate_monitor() returns FALSE and we break out the loop to enumerate primary monitors after that. This is a regression from b59619d and my review comments. My indent was to break out of the loop after finding the *master* primary monitor, not cloned primary monitors, to avoid unnecessary iterations. However, the primary monitor count is small and it's cleaner this way so let's break when should_enumerate_monitor() returns TRUE. --- dlls/win32u/sysparams.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index 7cefb3822a3..d2f7396971b 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -3459,8 +3459,10 @@ BOOL WINAPI NtUserEnumDisplayMonitors( HDC hdc, RECT *rect, MONITORENUMPROC proc { if (!is_monitor_primary( monitor )) continue; if (should_enumerate_monitor( monitor, &origin, &limit, &enum_info[count].rect )) + { enum_info[count++].handle = monitor->handle; - break; + break; + } } /* then non-primary monitors */

1 0

Zhiyi Zhang : win32u: Don't enumerate mirrored monitor clones for GetSystemMetrics(SM_CMONITORS).
by Alexandre Julliard 15 Mar '24

15 Mar '24

Module: wine Branch: master Commit: 793e4640e49d367906c4a9e7f35c46bf3df6a5b9 URL: https://gitlab.winehq.org/wine/wine/-/commit/793e4640e49d367906c4a9e7f35c46… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Mar 15 10:50:40 2024 +0800 win32u: Don't enumerate mirrored monitor clones for GetSystemMetrics(SM_CMONITORS). Only one monitor in a mirrored monitor set contributes to the result of GetSystemMetrics(SM_CMONITORS). Tested manually on Win7 and Win10. --- dlls/win32u/sysparams.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index d2f7396971b..6e638922629 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -3348,15 +3348,15 @@ struct monitor_enum_info RECT rect; }; -static unsigned int active_monitor_count(void) +static unsigned int active_unique_monitor_count(void) { struct monitor *monitor; unsigned int count = 0; LIST_FOR_EACH_ENTRY(monitor, &monitors, struct monitor, entry) { - if (!is_monitor_active( monitor )) continue; - count++; + if (is_monitor_active( monitor ) && !monitor->is_clone) + count++; } return count; } @@ -5941,7 +5941,7 @@ int get_system_metrics( int index ) return rect.bottom - rect.top; case SM_CMONITORS: if (!lock_display_devices()) return FALSE; - ret = active_monitor_count(); + ret = active_unique_monitor_count(); unlock_display_devices(); return ret; case SM_SAMEDISPLAYFORMAT:

1 0

Zhiyi Zhang : win32u: Don't enumerate mirrored monitor clones when unnecessary.
by Alexandre Julliard 15 Mar '24

15 Mar '24

Module: wine Branch: master Commit: d6ac41a9f40539645483f111aab2f2a1386c14b2 URL: https://gitlab.winehq.org/wine/wine/-/commit/d6ac41a9f40539645483f111aab2f2… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Mar 15 11:02:05 2024 +0800 win32u: Don't enumerate mirrored monitor clones when unnecessary. These functions don't need to enumerate mirrored monitor clones. --- dlls/win32u/sysparams.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index 6e638922629..07b9d46d9eb 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -2248,7 +2248,7 @@ RECT get_virtual_screen_rect( UINT dpi ) LIST_FOR_EACH_ENTRY( monitor, &monitors, struct monitor, entry ) { - if (!is_monitor_active( monitor )) continue; + if (!is_monitor_active( monitor ) || monitor->is_clone) continue; union_rect( &rect, &rect, &monitor->rc_monitor ); } @@ -2269,7 +2269,7 @@ static BOOL is_window_rect_full_screen( const RECT *rect ) { RECT monrect; - if (!is_monitor_active( monitor )) continue; + if (!is_monitor_active( monitor ) || monitor->is_clone) continue; monrect = map_dpi_rect( monitor->rc_monitor, get_monitor_dpi( monitor->handle ), get_thread_dpi() ); @@ -3558,7 +3558,7 @@ HMONITOR monitor_from_rect( const RECT *rect, UINT flags, UINT dpi ) { RECT intersect, monitor_rect; - if (!is_monitor_active( monitor )) continue; + if (!is_monitor_active( monitor ) || monitor->is_clone) continue; monitor_rect = map_dpi_rect( monitor->rc_monitor, get_monitor_dpi( monitor->handle ), system_dpi ); if (intersect_rect( &intersect, &monitor_rect, &r ))

1 0

Henri Verbeet : wined3d: Do not check the input signature element count for sm4+ shaders in shader_spirv_compile_arguments_init().
by Alexandre Julliard 15 Mar '24

15 Mar '24

Module: wine Branch: master Commit: 47be32f3d1fc6fbbcd2faae96ae1f8a3d617c0fe URL: https://gitlab.winehq.org/wine/wine/-/commit/47be32f3d1fc6fbbcd2faae96ae1f8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 13 13:15:53 2024 +0100 wined3d: Do not check the input signature element count for sm4+ shaders in shader_spirv_compile_arguments_init(). Shader model 4 fragment shaders can have more than 12 input varyings. That's fine though, because we don't need to build a varying map for them in the first place. Note that in principle the ERR in question could still be triggered by e.g. attempting to use a shader model 4 fragment shader with a shader model 3 vertex shader. --- dlls/wined3d/shader_spirv.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/shader_spirv.c b/dlls/wined3d/shader_spirv.c index 7b054c7cd9d..4e9b291a0ce 100644 --- a/dlls/wined3d/shader_spirv.c +++ b/dlls/wined3d/shader_spirv.c @@ -169,16 +169,15 @@ static void shader_spirv_compile_arguments_init(struct shader_spirv_compile_argu { struct wined3d_shader *ps = state->shader[WINED3D_SHADER_TYPE_PIXEL]; - if (ps) + if (shader->reg_maps.shader_version.major < 4 && ps) { struct shader_spirv_graphics_program_vk *vs_program = shader->backend_data; struct shader_spirv_graphics_program_vk *ps_program = ps->backend_data; if (ps_program->signature_info.input.element_count > ARRAY_SIZE(args->u.vs.varying_map)) ERR("Unexpected inter-stage varying count %u.\n", ps_program->signature_info.input.element_count); - if (shader->reg_maps.shader_version.major < 4) - vkd3d_shader_build_varying_map(&vs_program->signature_info.output, - &ps_program->signature_info.input, &args->u.vs.varying_count, args->u.vs.varying_map); + vkd3d_shader_build_varying_map(&vs_program->signature_info.output, + &ps_program->signature_info.input, &args->u.vs.varying_count, args->u.vs.varying_map); } break; }

1 0

Jinoh Kang : server: Generalize server request make_temporary to set_object_permanence.
by Alexandre Julliard 15 Mar '24

15 Mar '24

Module: wine Branch: master Commit: e368515eefe82525c444fd374ff1b9b5f066e337 URL: https://gitlab.winehq.org/wine/wine/-/commit/e368515eefe82525c444fd374ff1b9… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Mon Mar 11 21:48:19 2024 +0900 server: Generalize server request make_temporary to set_object_permanence. Required for implementing NtMakePermanentObject(). --- dlls/ntdll/unix/sync.c | 3 ++- include/wine/server_protocol.h | 14 ++++++++------ server/handle.c | 9 +++++++-- server/protocol.def | 5 +++-- server/request.h | 9 +++++---- server/trace.c | 7 ++++--- 6 files changed, 29 insertions(+), 18 deletions(-) diff --git a/dlls/ntdll/unix/sync.c b/dlls/ntdll/unix/sync.c index cde6a0f8483..68a861f047a 100644 --- a/dlls/ntdll/unix/sync.c +++ b/dlls/ntdll/unix/sync.c @@ -1281,9 +1281,10 @@ NTSTATUS WINAPI NtMakeTemporaryObject( HANDLE handle ) TRACE("%p\n", handle); - SERVER_START_REQ( make_temporary ) + SERVER_START_REQ( set_object_permanence ) { req->handle = wine_server_obj_handle( handle ); + req->permanent = 0; ret = wine_server_call( req ); } SERVER_END_REQ; diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 31ea45b9530..f9b591ef207 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -1314,12 +1314,14 @@ struct compare_objects_reply -struct make_temporary_request +struct set_object_permanence_request { struct request_header __header; obj_handle_t handle; + int permanent; + char __pad_20[4]; }; -struct make_temporary_reply +struct set_object_permanence_reply { struct reply_header __header; }; @@ -5659,7 +5661,7 @@ enum request REQ_set_handle_info, REQ_dup_handle, REQ_compare_objects, - REQ_make_temporary, + REQ_set_object_permanence, REQ_open_process, REQ_open_thread, REQ_select, @@ -5951,7 +5953,7 @@ union generic_request struct set_handle_info_request set_handle_info_request; struct dup_handle_request dup_handle_request; struct compare_objects_request compare_objects_request; - struct make_temporary_request make_temporary_request; + struct set_object_permanence_request set_object_permanence_request; struct open_process_request open_process_request; struct open_thread_request open_thread_request; struct select_request select_request; @@ -6241,7 +6243,7 @@ union generic_reply struct set_handle_info_reply set_handle_info_reply; struct dup_handle_reply dup_handle_reply; struct compare_objects_reply compare_objects_reply; - struct make_temporary_reply make_temporary_reply; + struct set_object_permanence_reply set_object_permanence_reply; struct open_process_reply open_process_reply; struct open_thread_reply open_thread_reply; struct select_reply select_reply; @@ -6505,7 +6507,7 @@ union generic_reply /* ### protocol_version begin ### */ -#define SERVER_PROTOCOL_VERSION 796 +#define SERVER_PROTOCOL_VERSION 797 /* ### protocol_version end ### */ diff --git a/server/handle.c b/server/handle.c index 71cdd2e328c..02a5a22edd1 100644 --- a/server/handle.c +++ b/server/handle.c @@ -885,13 +885,18 @@ DECL_HANDLER(get_system_handles) } } -DECL_HANDLER(make_temporary) +DECL_HANDLER(set_object_permanence) { struct object *obj; if (!(obj = get_handle_obj( current->process, req->handle, 0, NULL ))) return; - if (obj->is_permanent) + if (req->permanent && !obj->is_permanent) + { + grab_object( obj ); + make_object_permanent( obj ); + } + else if (!req->permanent && obj->is_permanent) { make_object_temporary( obj ); release_object( obj ); diff --git a/server/protocol.def b/server/protocol.def index 13aea96e796..814ad741f9a 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -1175,9 +1175,10 @@ typedef struct @END -/* Make an object temporary */ -(a)REQ(make_temporary) +/* Make an object permanent or temporary */ +(a)REQ(set_object_permanence) obj_handle_t handle; /* handle to the object */ + int permanent; /* 1 to make permanent, 0 to make temporary */ @END diff --git a/server/request.h b/server/request.h index 8b07f5ee7c1..69d10bcb138 100644 --- a/server/request.h +++ b/server/request.h @@ -144,7 +144,7 @@ DECL_HANDLER(close_handle); DECL_HANDLER(set_handle_info); DECL_HANDLER(dup_handle); DECL_HANDLER(compare_objects); -DECL_HANDLER(make_temporary); +DECL_HANDLER(set_object_permanence); DECL_HANDLER(open_process); DECL_HANDLER(open_thread); DECL_HANDLER(select); @@ -435,7 +435,7 @@ static const req_handler req_handlers[REQ_NB_REQUESTS] = (req_handler)req_set_handle_info, (req_handler)req_dup_handle, (req_handler)req_compare_objects, - (req_handler)req_make_temporary, + (req_handler)req_set_object_permanence, (req_handler)req_open_process, (req_handler)req_open_thread, (req_handler)req_select, @@ -916,8 +916,9 @@ C_ASSERT( sizeof(struct dup_handle_reply) == 16 ); C_ASSERT( FIELD_OFFSET(struct compare_objects_request, first) == 12 ); C_ASSERT( FIELD_OFFSET(struct compare_objects_request, second) == 16 ); C_ASSERT( sizeof(struct compare_objects_request) == 24 ); -C_ASSERT( FIELD_OFFSET(struct make_temporary_request, handle) == 12 ); -C_ASSERT( sizeof(struct make_temporary_request) == 16 ); +C_ASSERT( FIELD_OFFSET(struct set_object_permanence_request, handle) == 12 ); +C_ASSERT( FIELD_OFFSET(struct set_object_permanence_request, permanent) == 16 ); +C_ASSERT( sizeof(struct set_object_permanence_request) == 24 ); C_ASSERT( FIELD_OFFSET(struct open_process_request, pid) == 12 ); C_ASSERT( FIELD_OFFSET(struct open_process_request, access) == 16 ); C_ASSERT( FIELD_OFFSET(struct open_process_request, attributes) == 20 ); diff --git a/server/trace.c b/server/trace.c index 74a11f5fd6b..2852770a5d2 100644 --- a/server/trace.c +++ b/server/trace.c @@ -1697,9 +1697,10 @@ static void dump_compare_objects_request( const struct compare_objects_request * fprintf( stderr, ", second=%04x", req->second ); } -static void dump_make_temporary_request( const struct make_temporary_request *req ) +static void dump_set_object_permanence_request( const struct set_object_permanence_request *req ) { fprintf( stderr, " handle=%04x", req->handle ); + fprintf( stderr, ", permanent=%d", req->permanent ); } static void dump_open_process_request( const struct open_process_request *req ) @@ -4621,7 +4622,7 @@ static const dump_func req_dumpers[REQ_NB_REQUESTS] = { (dump_func)dump_set_handle_info_request, (dump_func)dump_dup_handle_request, (dump_func)dump_compare_objects_request, - (dump_func)dump_make_temporary_request, + (dump_func)dump_set_object_permanence_request, (dump_func)dump_open_process_request, (dump_func)dump_open_thread_request, (dump_func)dump_select_request, @@ -5197,7 +5198,7 @@ static const char * const req_names[REQ_NB_REQUESTS] = { "set_handle_info", "dup_handle", "compare_objects", - "make_temporary", + "set_object_permanence", "open_process", "open_thread", "select",

1 0