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

Rémi Bernon : server: Keep a reference on the desktop the hook are registered for.
by Alexandre Julliard 26 Jun '24

26 Jun '24

Module: wine Branch: master Commit: f784374bcb5195c918754b1da6142a618a0da7dd URL: https://gitlab.winehq.org/wine/wine/-/commit/f784374bcb5195c918754b1da6142a… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Jun 24 16:32:29 2024 +0200 server: Keep a reference on the desktop the hook are registered for. --- server/hook.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/server/hook.c b/server/hook.c index c22e3748b8b..140f2ba5a90 100644 --- a/server/hook.c +++ b/server/hook.c @@ -43,6 +43,7 @@ struct hook { struct list chain; /* hook chain entry */ user_handle_t handle; /* user handle for this hook */ + struct desktop *desktop; /* desktop the hook is registered for */ struct process *process; /* process the hook is set to */ struct thread *thread; /* thread the hook is set to */ struct thread *owner; /* owner of the out of context hook */ @@ -145,6 +146,7 @@ static struct hook *add_hook( struct desktop *desktop, struct thread *thread, in free( hook ); return NULL; } + hook->desktop = (struct desktop *)grab_object( desktop ); hook->thread = thread ? (struct thread *)grab_object( thread ) : NULL; hook->table = table; hook->index = index; @@ -165,6 +167,7 @@ static void free_hook( struct hook *hook ) release_object( hook->thread ); } if (hook->process) release_object( hook->process ); + release_object( hook->desktop ); release_object( hook->owner ); list_remove( &hook->chain ); free( hook ); @@ -500,6 +503,7 @@ DECL_HANDLER(remove_hook) return; } } + remove_hook( hook ); reply->active_hooks = get_active_hooks(); }

1 0

Rémi Bernon : server: Move hooks struct initialization within add_hook.
by Alexandre Julliard 26 Jun '24

26 Jun '24

Module: wine Branch: master Commit: cd8bbea138819915fe870afaf46b49afc2cd38bc URL: https://gitlab.winehq.org/wine/wine/-/commit/cd8bbea138819915fe870afaf46b49… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Jun 24 23:35:06 2024 +0200 server: Move hooks struct initialization within add_hook. And some run_hook_in_current_thread logic in a separate helper. --- server/hook.c | 48 +++++++++++++++++++++++++++++------------------- 1 file changed, 29 insertions(+), 19 deletions(-) diff --git a/server/hook.c b/server/hook.c index 140f2ba5a90..ed5ab7f5938 100644 --- a/server/hook.c +++ b/server/hook.c @@ -127,8 +127,20 @@ static struct hook_table *get_global_hooks( struct thread *thread ) return table; } +/* check if a given hook should run in the given thread */ +static int run_hook_in_thread( struct hook *hook, struct thread *thread ) +{ + if (hook->process && hook->process != thread->process) return 0; + if ((hook->flags & WINEVENT_SKIPOWNPROCESS) && hook->process == thread->process) return 0; + if (hook->thread && hook->thread != thread) return 0; + if ((hook->flags & WINEVENT_SKIPOWNTHREAD) && hook->thread == thread) return 0; + return 1; +} + /* create a new hook and add it to the specified table */ -static struct hook *add_hook( struct desktop *desktop, struct thread *thread, int index, int global ) +static struct hook *add_hook( struct desktop *desktop, struct process *process, struct thread *thread, int index, int global, + int event_min, int event_max, int flags, client_ptr_t proc, int unicode, + WCHAR *module, data_size_t module_size ) { struct hook *hook; struct hook_table *table = global ? desktop->global_hooks : get_queue_hooks(thread); @@ -146,10 +158,19 @@ static struct hook *add_hook( struct desktop *desktop, struct thread *thread, in free( hook ); return NULL; } - hook->desktop = (struct desktop *)grab_object( desktop ); - hook->thread = thread ? (struct thread *)grab_object( thread ) : NULL; - hook->table = table; - hook->index = index; + hook->owner = (struct thread *)grab_object( current ); + hook->desktop = (struct desktop *)grab_object( desktop ); + hook->process = process ? (struct process *)grab_object( process ) : NULL; + hook->thread = thread ? (struct thread *)grab_object( thread ) : NULL; + hook->table = table; + hook->index = index; + hook->event_min = event_min; + hook->event_max = event_max; + hook->flags = flags; + hook->proc = proc; + hook->unicode = unicode; + hook->module = module; + hook->module_size = module_size; list_add_head( &table->hooks[index], &hook->chain ); if (thread) thread->desktop_users++; return hook; @@ -209,10 +230,7 @@ static inline int run_hook_in_owner_thread( struct hook *hook ) /* check if a given hook should run in the current thread */ static inline int run_hook_in_current_thread( struct hook *hook ) { - if (hook->process && hook->process != current->process) return 0; - if ((hook->flags & WINEVENT_SKIPOWNPROCESS) && hook->process == current->process) return 0; - if (hook->thread && hook->thread != current) return 0; - if ((hook->flags & WINEVENT_SKIPOWNTHREAD) && hook->thread == current) return 0; + if (!run_hook_in_thread( hook, current )) return 0; /* don't run low-level hooks in processes suspended for debugging */ if (run_hook_in_owner_thread( hook ) && hook->owner->process->suspend) return 0; return 1; @@ -454,17 +472,9 @@ DECL_HANDLER(set_hook) global = 0; } - if ((hook = add_hook( desktop, thread, req->id - WH_MINHOOK, global ))) + if ((hook = add_hook( desktop, process, thread, req->id - WH_MINHOOK, global, req->event_min, req->event_max, + req->flags, req->proc, req->unicode, module, module_size ))) { - hook->owner = (struct thread *)grab_object( current ); - hook->process = process ? (struct process *)grab_object( process ) : NULL; - hook->event_min = req->event_min; - hook->event_max = req->event_max; - hook->flags = req->flags; - hook->proc = req->proc; - hook->unicode = req->unicode; - hook->module = module; - hook->module_size = module_size; reply->handle = hook->handle; reply->active_hooks = get_active_hooks(); }

1 0

Rémi Bernon : server: Update the active hooks bitmaps when hooks are added / removed.
by Alexandre Julliard 26 Jun '24

26 Jun '24

Module: wine Branch: master Commit: ae5a02e808f6d8fbbb182e556c76827cf9f804db URL: https://gitlab.winehq.org/wine/wine/-/commit/ae5a02e808f6d8fbbb182e556c7682… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Jun 24 23:35:06 2024 +0200 server: Update the active hooks bitmaps when hooks are added / removed. --- include/wine/server_protocol.h | 4 +-- server/hook.c | 70 ++++++++++++++++++++++++------------------ server/protocol.def | 2 +- server/queue.c | 42 +++++++++++++++++++++++++ server/user.h | 2 ++ server/winstation.c | 2 ++ 6 files changed, 89 insertions(+), 33 deletions(-) diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index b8a4878c7d5..b39be73443c 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -899,7 +899,7 @@ typedef volatile struct typedef volatile struct { - int placeholder; + int hooks_count[WH_MAX - WH_MIN + 2]; } queue_shm_t; typedef volatile union @@ -6575,7 +6575,7 @@ union generic_reply /* ### protocol_version begin ### */ -#define SERVER_PROTOCOL_VERSION 816 +#define SERVER_PROTOCOL_VERSION 817 /* ### protocol_version end ### */ diff --git a/server/hook.c b/server/hook.c index ed5ab7f5938..3047f52492d 100644 --- a/server/hook.c +++ b/server/hook.c @@ -173,6 +173,15 @@ static struct hook *add_hook( struct desktop *desktop, struct process *process, hook->module_size = module_size; list_add_head( &table->hooks[index], &hook->chain ); if (thread) thread->desktop_users++; + + if (!global) + add_queue_hook_count( hook->thread, index, 1 ); + else LIST_FOR_EACH_ENTRY( thread, &desktop->threads, struct thread, desktop_entry ) + { + if (!run_hook_in_thread( hook, thread )) continue; + add_queue_hook_count( thread, index, 1 ); + } + return hook; } @@ -315,12 +324,43 @@ static void hook_table_destroy( struct object *obj ) /* remove a hook, freeing it if the chain is not in use */ static void remove_hook( struct hook *hook ) { + struct desktop *desktop = hook->desktop; + int global = hook->table == desktop->global_hooks; + struct thread *thread; + + if (!global) + add_queue_hook_count( hook->thread, hook->index, -1 ); + else LIST_FOR_EACH_ENTRY( thread, &desktop->threads, struct thread, desktop_entry ) + { + if (!run_hook_in_thread( hook, thread )) continue; + add_queue_hook_count( thread, hook->index, -1 ); + } + if (hook->table->counts[hook->index]) hook->proc = 0; /* chain is in use, just mark it and return */ else free_hook( hook ); } +/* update the thread message queue hooks counters from the desktop global hooks */ +void add_desktop_hook_count( struct desktop *desktop, struct thread *thread, int count ) +{ + struct hook_table *table; + struct hook *hook; + int index; + + if (!(table = desktop->global_hooks)) return; + + for (index = 0; index < ARRAY_SIZE(table->hooks); index++) + { + LIST_FOR_EACH_ENTRY( hook, &table->hooks[index], struct hook, chain ) + { + if (!run_hook_in_thread( hook, thread )) continue; + add_queue_hook_count( thread, hook->index, count ); + } + } +} + /* release a hook chain, removing deleted hooks if the use count drops to 0 */ static void release_hook_chain( struct hook_table *table, int index ) { @@ -362,36 +402,6 @@ void remove_thread_hooks( struct thread *thread ) } } -/* get a bitmap of active hooks in a hook table */ -static int is_hook_active( struct hook_table *table, int index ) -{ - struct hook *hook = get_first_hook( table, index ); - - while (hook) - { - if (hook->proc && run_hook_in_current_thread( hook )) return 1; - hook = HOOK_ENTRY( list_next( &table->hooks[index], &hook->chain ) ); - } - return 0; -} - -/* get a bitmap of all active hooks for the current thread */ -unsigned int get_active_hooks(void) -{ - struct hook_table *table = get_queue_hooks( current ); - struct hook_table *global_hooks = get_global_hooks( current ); - unsigned int ret = 1u << 31; /* set high bit to indicate that the bitmap is valid */ - int id; - - for (id = WH_MINHOOK; id <= WH_WINEVENT; id++) - { - if ((table && is_hook_active( table, id - WH_MINHOOK )) || - (global_hooks && is_hook_active( global_hooks, id - WH_MINHOOK ))) - ret |= 1 << (id - WH_MINHOOK); - } - return ret; -} - /* return the thread that owns the first global hook */ struct thread *get_first_global_hook( struct desktop *desktop, int id ) { diff --git a/server/protocol.def b/server/protocol.def index 97b4805c552..12c27a8e3e1 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -915,7 +915,7 @@ typedef volatile struct typedef volatile struct { - int placeholder; + int hooks_count[WH_MAX - WH_MIN + 2]; /* active hooks count */ } queue_shm_t; typedef volatile union diff --git a/server/queue.c b/server/queue.c index 5f4e5fa33c2..6d9c9f20a5f 100644 --- a/server/queue.c +++ b/server/queue.c @@ -290,6 +290,7 @@ static struct msg_queue *create_msg_queue( struct thread *thread, struct thread_ { struct thread_input *new_input = NULL; struct msg_queue *queue; + struct desktop *desktop; int i; if (!input) @@ -328,7 +329,19 @@ static struct msg_queue *create_msg_queue( struct thread *thread, struct thread_ return NULL; } + SHARED_WRITE_BEGIN( queue->shared, queue_shm_t ) + { + memset( (void *)shared->hooks_count, 0, sizeof(shared->hooks_count) ); + } + SHARED_WRITE_END; + thread->queue = queue; + + if ((desktop = get_thread_desktop( thread, 0 ))) + { + add_desktop_hook_count( desktop, thread, 1 ); + release_object( desktop ); + } } if (new_input) release_object( new_input ); return queue; @@ -612,6 +625,35 @@ void set_queue_hooks( struct thread *thread, struct hook_table *hooks ) queue->hooks = hooks; } +/* get the thread message queue active hooks bitmap */ +unsigned int get_active_hooks(void) +{ + unsigned int ret = 1u << 31; /* set high bit to indicate that the bitmap is valid */ + struct msg_queue *queue; + int bit; + + if (!(queue = current->queue)) return ret; + + for (bit = 0; bit < ARRAY_SIZE(queue->shared->hooks_count); bit++) + if (queue->shared->hooks_count[bit]) ret |= 1 << bit; + + return ret; +} + +/* update the thread message queue hooks counters */ +void add_queue_hook_count( struct thread *thread, unsigned int index, int count ) +{ + if (!thread->queue) return; + + SHARED_WRITE_BEGIN( thread->queue->shared, queue_shm_t ) + { + shared->hooks_count[index] += count; + } + SHARED_WRITE_END; + + assert( thread->queue->shared->hooks_count[index] >= 0 ); +} + /* check the queue status */ static inline int is_signaled( struct msg_queue *queue ) { diff --git a/server/user.h b/server/user.h index 99491293a7c..4633c7dae7f 100644 --- a/server/user.h +++ b/server/user.h @@ -108,12 +108,14 @@ extern void cleanup_clipboard_thread( struct thread *thread ); extern void remove_thread_hooks( struct thread *thread ); extern unsigned int get_active_hooks(void); extern struct thread *get_first_global_hook( struct desktop *desktop, int id ); +extern void add_desktop_hook_count( struct desktop *desktop, struct thread *thread, int count ); /* queue functions */ extern void free_msg_queue( struct thread *thread ); extern struct hook_table *get_queue_hooks( struct thread *thread ); extern void set_queue_hooks( struct thread *thread, struct hook_table *hooks ); +extern void add_queue_hook_count( struct thread *thread, unsigned int index, int count ); extern void inc_queue_paint_count( struct thread *thread, int incr ); extern void queue_cleanup_window( struct thread *thread, user_handle_t win ); extern int init_thread_queue( struct thread *thread ); diff --git a/server/winstation.c b/server/winstation.c index 45c7defa1f7..75b604ae1c3 100644 --- a/server/winstation.c +++ b/server/winstation.c @@ -410,6 +410,7 @@ static void close_desktop_timeout( void *private ) static void add_desktop_thread( struct desktop *desktop, struct thread *thread ) { list_add_tail( &desktop->threads, &thread->desktop_entry ); + add_desktop_hook_count( desktop, thread, 1 ); if (!thread->process->is_system) { @@ -441,6 +442,7 @@ static void remove_desktop_user( struct desktop *desktop, struct thread *thread /* remove a thread from the list of threads attached to a desktop */ static void remove_desktop_thread( struct desktop *desktop, struct thread *thread ) { + add_desktop_hook_count( desktop, thread, -1 ); list_remove( &thread->desktop_entry ); if (!thread->process->is_system) remove_desktop_user( desktop, thread );

1 0

Rémi Bernon : win32u: Read the active hooks count from the shared memory.
by Alexandre Julliard 26 Jun '24

26 Jun '24

Module: wine Branch: master Commit: 96c44adae808aff62a6d8435884ae360e74c307a URL: https://gitlab.winehq.org/wine/wine/-/commit/96c44adae808aff62a6d8435884ae3… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Feb 19 22:37:36 2024 +0100 win32u: Read the active hooks count from the shared memory. --- dlls/win32u/hook.c | 16 +++++++++++----- dlls/win32u/message.c | 2 +- dlls/win32u/win32u_private.h | 1 + dlls/win32u/winstation.c | 35 +++++++++++++++++++++++++++++++++++ include/wine/server_protocol.h | 22 +++++++++++++++++++--- server/protocol.def | 9 ++++++++- server/queue.c | 12 ++++++++++-- server/request.h | 9 +++++++-- server/trace.c | 14 +++++++++++++- 9 files changed, 105 insertions(+), 15 deletions(-)

1 0

Rémi Bernon : win32u: Remove now unnecessary thread info active_hooks cache.
by Alexandre Julliard 26 Jun '24

26 Jun '24

Module: wine Branch: master Commit: 96a24135be3fd0e1239846152f72de6ee6be669f URL: https://gitlab.winehq.org/wine/wine/-/commit/96a24135be3fd0e1239846152f72de… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Jun 21 20:50:22 2024 +0200 win32u: Remove now unnecessary thread info active_hooks cache. --- dlls/win32u/hook.c | 9 --------- dlls/win32u/message.c | 1 - dlls/win32u/ntuser_private.h | 1 - 3 files changed, 11 deletions(-) diff --git a/dlls/win32u/hook.c b/dlls/win32u/hook.c index 3e2798b8c75..d47aed4c6d6 100644 --- a/dlls/win32u/hook.c +++ b/dlls/win32u/hook.c @@ -135,7 +135,6 @@ HHOOK WINAPI NtUserSetWindowsHookEx( HINSTANCE inst, UNICODE_STRING *module, DWO if (!wine_server_call_err( req )) { handle = wine_server_ptr_handle( reply->handle ); - get_user_thread_info()->active_hooks = reply->active_hooks; } } SERVER_END_REQ; @@ -156,7 +155,6 @@ BOOL WINAPI NtUserUnhookWindowsHookEx( HHOOK handle ) req->handle = wine_server_user_handle( handle ); req->id = 0; status = wine_server_call_err( req ); - if (!status) get_user_thread_info()->active_hooks = reply->active_hooks; } SERVER_END_REQ; if (status == STATUS_INVALID_HANDLE) RtlSetLastWin32Error( ERROR_INVALID_HOOK_HANDLE ); @@ -176,7 +174,6 @@ BOOL unhook_windows_hook( INT id, HOOKPROC proc ) req->id = id; req->proc = wine_server_client_ptr( proc ); status = wine_server_call_err( req ); - if (!status) get_user_thread_info()->active_hooks = reply->active_hooks; } SERVER_END_REQ; if (status == STATUS_INVALID_HANDLE) RtlSetLastWin32Error( ERROR_INVALID_HOOK_HANDLE ); @@ -427,7 +424,6 @@ LRESULT call_current_hook( HHOOK hhook, INT code, WPARAM wparam, LPARAM lparam ) LRESULT call_message_hooks( INT id, INT code, WPARAM wparam, LPARAM lparam, size_t lparam_size, size_t message_size, BOOL ansi ) { - struct user_thread_info *thread_info = get_user_thread_info(); struct win_hook_params info; WCHAR module[MAX_PATH]; DWORD_PTR ret; @@ -457,7 +453,6 @@ LRESULT call_message_hooks( INT id, INT code, WPARAM wparam, LPARAM lparam, size info.tid = reply->tid; info.proc = wine_server_get_ptr( reply->proc ); info.next_unicode = reply->unicode; - thread_info->active_hooks = reply->active_hooks; } } SERVER_END_REQ; @@ -525,7 +520,6 @@ HWINEVENTHOOK WINAPI NtUserSetWinEventHook( DWORD event_min, DWORD event_max, HM if (!wine_server_call_err( req )) { handle = wine_server_ptr_handle( reply->handle ); - get_user_thread_info()->active_hooks = reply->active_hooks; } } SERVER_END_REQ; @@ -546,7 +540,6 @@ BOOL WINAPI NtUserUnhookWinEvent( HWINEVENTHOOK handle ) req->handle = wine_server_user_handle( handle ); req->id = WH_WINEVENT; ret = !wine_server_call_err( req ); - if (ret) get_user_thread_info()->active_hooks = reply->active_hooks; } SERVER_END_REQ; return ret; @@ -557,7 +550,6 @@ BOOL WINAPI NtUserUnhookWinEvent( HWINEVENTHOOK handle ) */ void WINAPI NtUserNotifyWinEvent( DWORD event, HWND hwnd, LONG object_id, LONG child_id ) { - struct user_thread_info *thread_info = get_user_thread_info(); struct win_event_hook_params info; void *ret_ptr; ULONG ret_len; @@ -599,7 +591,6 @@ void WINAPI NtUserNotifyWinEvent( DWORD event, HWND hwnd, LONG object_id, LONG c info.module[wine_server_reply_size(req) / sizeof(WCHAR)] = 0; info.handle = wine_server_ptr_handle( reply->handle ); info.proc = wine_server_get_ptr( reply->proc ); - thread_info->active_hooks = reply->active_hooks; } } SERVER_END_REQ; diff --git a/dlls/win32u/message.c b/dlls/win32u/message.c index 941af31701f..3099f5a6660 100644 --- a/dlls/win32u/message.c +++ b/dlls/win32u/message.c @@ -2698,7 +2698,6 @@ int peek_message( MSG *msg, const struct peek_message_filter *filter ) info.msg.pt.x = reply->x; info.msg.pt.y = reply->y; hw_id = 0; - thread_info->active_hooks = reply->active_hooks; } else buffer_size = reply->total; } diff --git a/dlls/win32u/ntuser_private.h b/dlls/win32u/ntuser_private.h index d95ea03d45f..44edadad8f8 100644 --- a/dlls/win32u/ntuser_private.h +++ b/dlls/win32u/ntuser_private.h @@ -114,7 +114,6 @@ struct user_thread_info WORD hook_call_depth; /* Number of recursively called hook procs */ WORD hook_unicode; /* Is current hook unicode? */ HHOOK hook; /* Current hook */ - UINT active_hooks; /* Bitmap of active hooks */ struct received_message_info *receive_info; /* Message being currently received */ struct imm_thread_data *imm_thread_data; /* IMM thread data */ HKL kbd_layout; /* Current keyboard layout */

1 0

Rémi Bernon : server: Remove now unnecessary active_hooks from replies.
by Alexandre Julliard 26 Jun '24

26 Jun '24

Module: wine Branch: master Commit: 817cb4dd696b8f9c9e118a29d949fa419a63bcaf URL: https://gitlab.winehq.org/wine/wine/-/commit/817cb4dd696b8f9c9e118a29d949fa… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Jun 24 16:30:15 2024 +0200 server: Remove now unnecessary active_hooks from replies. --- include/wine/server_protocol.h | 10 +++------- server/hook.c | 4 ---- server/protocol.def | 4 ---- server/queue.c | 17 ----------------- server/request.h | 10 +++------- server/trace.c | 10 +--------- 6 files changed, 7 insertions(+), 48 deletions(-) diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index e78c3af4cc1..0516d23d3ee 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -2967,9 +2967,9 @@ struct get_message_reply int x; int y; unsigned int time; - unsigned int active_hooks; data_size_t total; /* VARARG(data,message_data); */ + char __pad_52[4]; }; @@ -4228,7 +4228,7 @@ struct set_hook_reply { struct reply_header __header; user_handle_t handle; - unsigned int active_hooks; + char __pad_12[4]; }; @@ -4244,8 +4244,6 @@ struct remove_hook_request struct remove_hook_reply { struct reply_header __header; - unsigned int active_hooks; - char __pad_12[4]; }; @@ -4267,9 +4265,7 @@ struct start_hook_chain_reply thread_id_t tid; int unicode; client_ptr_t proc; - unsigned int active_hooks; /* VARARG(module,unicode_str); */ - char __pad_36[4]; }; @@ -6591,7 +6587,7 @@ union generic_reply /* ### protocol_version begin ### */ -#define SERVER_PROTOCOL_VERSION 818 +#define SERVER_PROTOCOL_VERSION 819 /* ### protocol_version end ### */ diff --git a/server/hook.c b/server/hook.c index 3047f52492d..c2d2823cd61 100644 --- a/server/hook.c +++ b/server/hook.c @@ -486,7 +486,6 @@ DECL_HANDLER(set_hook) req->flags, req->proc, req->unicode, module, module_size ))) { reply->handle = hook->handle; - reply->active_hooks = get_active_hooks(); } else free( module ); @@ -525,7 +524,6 @@ DECL_HANDLER(remove_hook) } remove_hook( hook ); - reply->active_hooks = get_active_hooks(); } @@ -542,8 +540,6 @@ DECL_HANDLER(start_hook_chain) return; } - reply->active_hooks = get_active_hooks(); - if (!table || !(hook = get_first_valid_hook( table, req->id - WH_MINHOOK, req->event, req->window, req->object_id, req->child_id ))) { diff --git a/server/protocol.def b/server/protocol.def index 128aab3a812..33fd7a96e03 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -2231,7 +2231,6 @@ enum message_type int x; /* message x position */ int y; /* message y position */ unsigned int time; /* message time */ - unsigned int active_hooks; /* active hooks bitmap */ data_size_t total; /* total size of extra data */ VARARG(data,message_data); /* message data for sent messages */ @END @@ -3035,7 +3034,6 @@ enum caret_state VARARG(module,unicode_str); /* module name */ @REPLY user_handle_t handle; /* handle to the hook */ - unsigned int active_hooks; /* active hooks bitmap */ @END @@ -3045,7 +3043,6 @@ enum caret_state client_ptr_t proc; /* hook procedure if handle is 0 */ int id; /* id of the hook if handle is 0 */ @REPLY - unsigned int active_hooks; /* active hooks bitmap */ @END @@ -3062,7 +3059,6 @@ enum caret_state thread_id_t tid; /* thread id for low-level keyboard/mouse hooks */ int unicode; /* is it a unicode hook? */ client_ptr_t proc; /* hook procedure */ - unsigned int active_hooks; /* active hooks bitmap */ VARARG(module,unicode_str); /* module name */ @END diff --git a/server/queue.c b/server/queue.c index f73beb3ce4c..53306f46793 100644 --- a/server/queue.c +++ b/server/queue.c @@ -625,21 +625,6 @@ void set_queue_hooks( struct thread *thread, struct hook_table *hooks ) queue->hooks = hooks; } -/* get the thread message queue active hooks bitmap */ -unsigned int get_active_hooks(void) -{ - unsigned int ret = 1u << 31; /* set high bit to indicate that the bitmap is valid */ - struct msg_queue *queue; - int bit; - - if (!(queue = current->queue)) return ret; - - for (bit = 0; bit < ARRAY_SIZE(queue->shared->hooks_count); bit++) - if (queue->shared->hooks_count[bit]) ret |= 1 << bit; - - return ret; -} - /* update the thread message queue hooks counters */ void add_queue_hook_count( struct thread *thread, unsigned int index, int count ) { @@ -3125,8 +3110,6 @@ DECL_HANDLER(get_message) user_handle_t get_win = get_user_full_handle( req->get_win ); unsigned int filter = req->flags >> 16; - reply->active_hooks = get_active_hooks(); - if (get_win && get_win != 1 && get_win != -1 && !get_user_object( get_win, USER_WINDOW )) { set_win32_error( ERROR_INVALID_WINDOW_HANDLE ); diff --git a/server/request.h b/server/request.h index 2dbde23f705..3944e754cfa 100644 --- a/server/request.h +++ b/server/request.h @@ -1430,8 +1430,7 @@ C_ASSERT( FIELD_OFFSET(struct get_message_reply, type) == 32 ); C_ASSERT( FIELD_OFFSET(struct get_message_reply, x) == 36 ); C_ASSERT( FIELD_OFFSET(struct get_message_reply, y) == 40 ); C_ASSERT( FIELD_OFFSET(struct get_message_reply, time) == 44 ); -C_ASSERT( FIELD_OFFSET(struct get_message_reply, active_hooks) == 48 ); -C_ASSERT( FIELD_OFFSET(struct get_message_reply, total) == 52 ); +C_ASSERT( FIELD_OFFSET(struct get_message_reply, total) == 48 ); C_ASSERT( sizeof(struct get_message_reply) == 56 ); C_ASSERT( FIELD_OFFSET(struct reply_message_request, remove) == 12 ); C_ASSERT( FIELD_OFFSET(struct reply_message_request, result) == 16 ); @@ -1863,14 +1862,12 @@ C_ASSERT( FIELD_OFFSET(struct set_hook_request, flags) == 40 ); C_ASSERT( FIELD_OFFSET(struct set_hook_request, unicode) == 44 ); C_ASSERT( sizeof(struct set_hook_request) == 48 ); C_ASSERT( FIELD_OFFSET(struct set_hook_reply, handle) == 8 ); -C_ASSERT( FIELD_OFFSET(struct set_hook_reply, active_hooks) == 12 ); C_ASSERT( sizeof(struct set_hook_reply) == 16 ); C_ASSERT( FIELD_OFFSET(struct remove_hook_request, handle) == 12 ); C_ASSERT( FIELD_OFFSET(struct remove_hook_request, proc) == 16 ); C_ASSERT( FIELD_OFFSET(struct remove_hook_request, id) == 24 ); C_ASSERT( sizeof(struct remove_hook_request) == 32 ); -C_ASSERT( FIELD_OFFSET(struct remove_hook_reply, active_hooks) == 8 ); -C_ASSERT( sizeof(struct remove_hook_reply) == 16 ); +C_ASSERT( sizeof(struct remove_hook_reply) == 8 ); C_ASSERT( FIELD_OFFSET(struct start_hook_chain_request, id) == 12 ); C_ASSERT( FIELD_OFFSET(struct start_hook_chain_request, event) == 16 ); C_ASSERT( FIELD_OFFSET(struct start_hook_chain_request, window) == 20 ); @@ -1882,8 +1879,7 @@ C_ASSERT( FIELD_OFFSET(struct start_hook_chain_reply, pid) == 12 ); C_ASSERT( FIELD_OFFSET(struct start_hook_chain_reply, tid) == 16 ); C_ASSERT( FIELD_OFFSET(struct start_hook_chain_reply, unicode) == 20 ); C_ASSERT( FIELD_OFFSET(struct start_hook_chain_reply, proc) == 24 ); -C_ASSERT( FIELD_OFFSET(struct start_hook_chain_reply, active_hooks) == 32 ); -C_ASSERT( sizeof(struct start_hook_chain_reply) == 40 ); +C_ASSERT( sizeof(struct start_hook_chain_reply) == 32 ); C_ASSERT( FIELD_OFFSET(struct finish_hook_chain_request, id) == 12 ); C_ASSERT( sizeof(struct finish_hook_chain_request) == 16 ); C_ASSERT( FIELD_OFFSET(struct get_hook_info_request, handle) == 12 ); diff --git a/server/trace.c b/server/trace.c index c1d25247611..36ff25afe6a 100644 --- a/server/trace.c +++ b/server/trace.c @@ -2805,7 +2805,6 @@ static void dump_get_message_reply( const struct get_message_reply *req ) fprintf( stderr, ", x=%d", req->x ); fprintf( stderr, ", y=%d", req->y ); fprintf( stderr, ", time=%08x", req->time ); - fprintf( stderr, ", active_hooks=%08x", req->active_hooks ); fprintf( stderr, ", total=%u", req->total ); dump_varargs_message_data( ", data=", cur_size ); } @@ -3656,7 +3655,6 @@ static void dump_set_hook_request( const struct set_hook_request *req ) static void dump_set_hook_reply( const struct set_hook_reply *req ) { fprintf( stderr, " handle=%08x", req->handle ); - fprintf( stderr, ", active_hooks=%08x", req->active_hooks ); } static void dump_remove_hook_request( const struct remove_hook_request *req ) @@ -3666,11 +3664,6 @@ static void dump_remove_hook_request( const struct remove_hook_request *req ) fprintf( stderr, ", id=%d", req->id ); } -static void dump_remove_hook_reply( const struct remove_hook_reply *req ) -{ - fprintf( stderr, " active_hooks=%08x", req->active_hooks ); -} - static void dump_start_hook_chain_request( const struct start_hook_chain_request *req ) { fprintf( stderr, " id=%d", req->id ); @@ -3687,7 +3680,6 @@ static void dump_start_hook_chain_reply( const struct start_hook_chain_reply *re fprintf( stderr, ", tid=%04x", req->tid ); fprintf( stderr, ", unicode=%d", req->unicode ); dump_uint64( ", proc=", &req->proc ); - fprintf( stderr, ", active_hooks=%08x", req->active_hooks ); dump_varargs_unicode_str( ", module=", cur_size ); } @@ -5143,7 +5135,7 @@ static const dump_func reply_dumpers[REQ_NB_REQUESTS] = { (dump_func)dump_set_caret_window_reply, (dump_func)dump_set_caret_info_reply, (dump_func)dump_set_hook_reply, - (dump_func)dump_remove_hook_reply, + NULL, (dump_func)dump_start_hook_chain_reply, NULL, (dump_func)dump_get_hook_info_reply,

1 0

Esme Povirk : mscoree: Update Wine Mono to 9.2.0.
by Alexandre Julliard 26 Jun '24

26 Jun '24

Module: wine Branch: master Commit: 07544942e2c9c2f35263adb5104998f18967dc6c URL: https://gitlab.winehq.org/wine/wine/-/commit/07544942e2c9c2f35263adb5104998… Author: Esme Povirk <esme(a)codeweavers.com> Date: Wed Jun 26 17:49:05 2024 +0000 mscoree: Update Wine Mono to 9.2.0. --- dlls/appwiz.cpl/addons.c | 4 ++-- dlls/mscoree/mscoree_private.h | 2 +- tools/gitlab/test.yml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/appwiz.cpl/addons.c b/dlls/appwiz.cpl/addons.c index 0b11a48b8fe..e5a509ab288 100644 --- a/dlls/appwiz.cpl/addons.c +++ b/dlls/appwiz.cpl/addons.c @@ -56,10 +56,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(appwizcpl); #define GECKO_SHA "???" #endif -#define MONO_VERSION "9.1.0" +#define MONO_VERSION "9.2.0" #if defined(__i386__) || defined(__x86_64__) #define MONO_ARCH "x86" -#define MONO_SHA "8a0a1e6837b494df49927e5d759b1c6908e89b8a2f8e3ad025e1c2881882476e" +#define MONO_SHA "fd5829244d92985b8a404745adddb58c3a9b0bbb6d54ca4c6eaf86ea466735f9" #else #define MONO_ARCH "" #define MONO_SHA "???" diff --git a/dlls/mscoree/mscoree_private.h b/dlls/mscoree/mscoree_private.h index 9f73522c6c4..32c019cbb66 100644 --- a/dlls/mscoree/mscoree_private.h +++ b/dlls/mscoree/mscoree_private.h @@ -45,7 +45,7 @@ extern HRESULT assembly_get_runtime_version(ASSEMBLY *assembly, LPSTR *version); extern HRESULT assembly_get_vtable_fixups(ASSEMBLY *assembly, VTableFixup **fixups, DWORD *count); extern HRESULT assembly_get_native_entrypoint(ASSEMBLY *assembly, NativeEntryPointFunc *func); -#define WINE_MONO_VERSION "9.1.0" +#define WINE_MONO_VERSION "9.2.0" /* Mono embedding */ typedef struct _MonoDomain MonoDomain; diff --git a/tools/gitlab/test.yml b/tools/gitlab/test.yml index 882f67342a2..f49e935485a 100644 --- a/tools/gitlab/test.yml +++ b/tools/gitlab/test.yml @@ -7,7 +7,7 @@ variables: GIT_STRATEGY: none GECKO_VER: 2.47.4 - MONO_VER: 9.1.0 + MONO_VER: 9.2.0 cache: - key: wine-gecko-$GECKO_VER paths:

1 0

Alistair Leslie-Hughes : msado15: Support interface ADOCommandConstruction in _Command.
by Alexandre Julliard 26 Jun '24

26 Jun '24

Module: wine Branch: master Commit: d7ad75e2d4de3a3b71e74648c6700a3b0170f276 URL: https://gitlab.winehq.org/wine/wine/-/commit/d7ad75e2d4de3a3b71e74648c6700a… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Jun 25 20:32:16 2024 +1000 msado15: Support interface ADOCommandConstruction in _Command. --- dlls/msado15/command.c | 66 ++++++++++++++++++++++++++++++++++++++++++++ dlls/msado15/tests/msado15.c | 5 ++++ 2 files changed, 71 insertions(+) diff --git a/dlls/msado15/command.c b/dlls/msado15/command.c index 152528308e0..762a13c8776 100644 --- a/dlls/msado15/command.c +++ b/dlls/msado15/command.c @@ -32,6 +32,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(msado15); struct command { _Command Command_iface; + ADOCommandConstruction ADOCommandConstruction_iface; LONG ref; CommandTypeEnum type; BSTR text; @@ -43,8 +44,14 @@ static inline struct command *impl_from_Command( _Command *iface ) return CONTAINING_RECORD( iface, struct command, Command_iface ); } +static inline struct command *impl_from_ADOCommandConstruction( ADOCommandConstruction *iface ) +{ + return CONTAINING_RECORD( iface, struct command, ADOCommandConstruction_iface ); +} + static HRESULT WINAPI command_QueryInterface( _Command *iface, REFIID riid, void **obj ) { + struct command *command = impl_from_Command( iface ); TRACE( "%p, %s, %p\n", iface, debugstr_guid(riid), obj ); *obj = NULL; @@ -58,6 +65,10 @@ static HRESULT WINAPI command_QueryInterface( _Command *iface, REFIID riid, void { *obj = iface; } + else if (IsEqualIID(riid, &IID_ADOCommandConstruction)) + { + *obj = &command->ADOCommandConstruction_iface; + } else { FIXME( "interface %s not implemented\n", debugstr_guid(riid) ); @@ -374,12 +385,67 @@ static const struct _CommandVtbl command_vtbl = command_get_NamedParameters }; +static HRESULT WINAPI construction_QueryInterface(ADOCommandConstruction *iface, REFIID riid, void **obj) +{ + TRACE( "%p, %s, %p\n", iface, debugstr_guid(riid), obj ); + + *obj = NULL; + + if (IsEqualIID(riid, &IID_IUnknown) || + IsEqualIID(riid, &IID_ADOCommandConstruction)) + { + *obj = iface; + } + else + { + FIXME( "interface %s not implemented\n", debugstr_guid(riid) ); + return E_NOINTERFACE; + } + + ADOCommandConstruction_AddRef( iface ); + return S_OK; +} + +static ULONG WINAPI construction_AddRef(ADOCommandConstruction *iface) +{ + struct command *command = impl_from_ADOCommandConstruction( iface ); + return _Command_AddRef(&command->Command_iface); +} + +static ULONG WINAPI construction_Release(ADOCommandConstruction *iface) +{ + struct command *command = impl_from_ADOCommandConstruction( iface ); + return _Command_Release(&command->Command_iface); +} + +static HRESULT WINAPI construction_get_OLEDBCommand(ADOCommandConstruction *iface, IUnknown **command) +{ + FIXME("%p, %p\n", iface, command); + return E_NOTIMPL; +} + +static HRESULT WINAPI construction_put_OLEDBCommand(ADOCommandConstruction *iface, IUnknown *command) +{ + FIXME("%p, %p\n", iface, command); + return E_NOTIMPL; +} + +static ADOCommandConstructionVtbl construct_vtbl = +{ + construction_QueryInterface, + construction_AddRef, + construction_Release, + construction_get_OLEDBCommand, + construction_put_OLEDBCommand +}; + HRESULT Command_create( void **obj ) { struct command *command; if (!(command = malloc( sizeof(*command) ))) return E_OUTOFMEMORY; command->Command_iface.lpVtbl = &command_vtbl; + command->ADOCommandConstruction_iface.lpVtbl = &construct_vtbl; command->type = adCmdUnknown; command->text = NULL; command->connection = NULL; diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index b6c1c391e71..8826fb5b0e8 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -1331,6 +1331,7 @@ static void test_Command(void) CommandTypeEnum cmd_type = adCmdUnspecified; BSTR cmd_text = (BSTR)"test"; _Connection *connection; + ADOCommandConstruction *adocommand; hr = CoCreateInstance( &CLSID_Command, NULL, CLSCTX_INPROC_SERVER, &IID__Command, (void **)&command ); ok( hr == S_OK, "got %08lx\n", hr ); @@ -1347,6 +1348,10 @@ static void test_Command(void) ok( hr == S_OK, "got %08lx\n", hr ); Command25_Release( command25 ); + hr = _Command_QueryInterface( command, &IID_ADOCommandConstruction, (void **)&adocommand ); + ok( hr == S_OK, "got %08lx\n", hr ); + ADOCommandConstruction_Release( adocommand ); + hr = _Command_get_CommandType( command, &cmd_type ); ok( hr == S_OK, "got %08lx\n", hr ); ok( cmd_type == adCmdUnknown, "got %08x\n", cmd_type );

1 0

Alexandre Julliard : configure: Disable non-PE import libraries if compiler support is missing.
by Alexandre Julliard 26 Jun '24

26 Jun '24

Module: wine Branch: master Commit: 84d8a24af71d79ddc0fa1122c168816e04e9075d URL: https://gitlab.winehq.org/wine/wine/-/commit/84d8a24af71d79ddc0fa1122c16881… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 26 10:27:15 2024 +0200 configure: Disable non-PE import libraries if compiler support is missing. --- configure | 18 ++++++++++-------- configure.ac | 19 +++++++++---------- 2 files changed, 19 insertions(+), 18 deletions(-) diff --git a/configure b/configure index c506c72ad8b..2373cf89da8 100755 --- a/configure +++ b/configure @@ -20253,16 +20253,14 @@ if test "x$ac_cv_cflags__Wno_format" = xyes then : EXTRACFLAGS="$EXTRACFLAGS -Wno-format" fi ;; - *) if test -z "$PE_ARCHS" - then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for working -mabi=ms" >&5 + *) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for working -mabi=ms" >&5 printf %s "checking for working -mabi=ms... " >&6; } if test ${ac_cv_mabi_ms+y} then : printf %s "(cached) " >&6 else $as_nop CFLAGS="$CFLAGS -mabi=ms" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <stdarg.h> int a(int b, ...) { __builtin_ms_va_list list; __builtin_ms_va_start(list,b); } @@ -20281,13 +20279,17 @@ else $as_nop ac_cv_mabi_ms=no fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext - CFLAGS=$saved_CFLAGS + CFLAGS=$saved_CFLAGS fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_mabi_ms" >&5 printf "%s\n" "$ac_cv_mabi_ms" >&6; } - test $ac_cv_mabi_ms = yes || as_fn_error $? "The compiler doesn't support -mabi=ms. Use gcc instead of clang, or install mingw-w64." "$LINENO" 5 - fi - MSVCRTFLAGS="$MSVCRTFLAGS -mabi=ms" ;; + if test "x$ac_cv_mabi_ms" = xyes +then : + MSVCRTFLAGS="$MSVCRTFLAGS -mabi=ms" +else $as_nop + test -n "$PE_ARCHS" || as_fn_error $? "The compiler doesn't support -mabi=ms. Use gcc instead of clang, or install mingw-w64." "$LINENO" 5 + DLLEXT="" +fi ;; esac ;; arm) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wincompatible-function-pointer-types" >&5 diff --git a/configure.ac b/configure.ac index 7fe5477daf7..43bba37a39b 100644 --- a/configure.ac +++ b/configure.ac @@ -1966,17 +1966,16 @@ char*f(const char *h,char n) {return strchr(h,n);}]])],[ac_cv_c_logicalop_noisy= dnl Mingw uses Windows 64-bit types, not Unix ones cygwin*|mingw32*) WINE_TRY_CFLAGS([-Wno-format]) ;; dnl Default to ms_abi on 64-bit - *) if test -z "$PE_ARCHS" - then - AC_CACHE_CHECK([for working -mabi=ms], ac_cv_mabi_ms, - [CFLAGS="$CFLAGS -mabi=ms" - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdarg.h> + *) AC_CACHE_CHECK([for working -mabi=ms], ac_cv_mabi_ms, + [CFLAGS="$CFLAGS -mabi=ms" + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdarg.h> int a(int b, ...) { __builtin_ms_va_list list; __builtin_ms_va_start(list,b); }]])], - [ac_cv_mabi_ms=yes],[ac_cv_mabi_ms=no]) - CFLAGS=$saved_CFLAGS]) - test $ac_cv_mabi_ms = yes || AC_MSG_ERROR([The compiler doesn't support -mabi=ms. Use gcc instead of clang, or install mingw-w64.]) - fi - MSVCRTFLAGS="$MSVCRTFLAGS -mabi=ms" ;; + [ac_cv_mabi_ms=yes],[ac_cv_mabi_ms=no]) + CFLAGS=$saved_CFLAGS]) + AS_VAR_IF([ac_cv_mabi_ms],[yes], + [MSVCRTFLAGS="$MSVCRTFLAGS -mabi=ms"], + [test -n "$PE_ARCHS" || AC_MSG_ERROR([The compiler doesn't support -mabi=ms. Use gcc instead of clang, or install mingw-w64.]) + DLLEXT=""]) ;; esac ;; arm) WINE_TRY_CFLAGS([-Wincompatible-function-pointer-types],[EXTRACFLAGS="$EXTRACFLAGS -Wno-error=incompatible-function-pointer-types"]) ;;

1 0

Alexandre Julliard : makedep: Remove the -R option.
by Alexandre Julliard 26 Jun '24

26 Jun '24

Module: wine Branch: master Commit: 29555a1feacaa2b13eee8aad334cde059a5ac702 URL: https://gitlab.winehq.org/wine/wine/-/commit/29555a1feacaa2b13eee8aad334cde… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 26 10:31:27 2024 +0200 makedep: Remove the -R option. --- tools/makedep.c | 69 ++++----------------------------------------------------- 1 file changed, 4 insertions(+), 65 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index cf22bc7bf07..a1534e8e9da 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -240,16 +240,14 @@ static const char *output_makefile_name = "Makefile"; static const char *input_file_name; static const char *output_file_name; static const char *temp_file_name; -static int relative_dir_mode; static int silent_rules; static int input_line; static int output_column; static FILE *output_file; static const char Usage[] = - "Usage: makedep [options] [directories]\n" + "Usage: makedep [options]\n" "Options:\n" - " -R from to Compute the relative path between two directories\n" " -S Generate Automake-style silent rules\n" " -fxxx Store output in file 'xxx' (default: Makefile)\n"; @@ -493,52 +491,6 @@ static char *replace_substr( const char *str, const char *start, size_t len, con } -/******************************************************************* - * get_relative_path - * - * Determine where the destination path is located relative to the 'from' path. - */ -static char *get_relative_path( const char *from, const char *dest ) -{ - const char *start; - char *ret, *p; - unsigned int dotdots = 0; - - /* a path of "." is equivalent to an empty path */ - if (!strcmp( from, "." )) from = ""; - - for (;;) - { - while (*from == '/') from++; - while (*dest == '/') dest++; - start = dest; /* save start of next path element */ - if (!*from) break; - - while (*from && *from != '/' && *from == *dest) { from++; dest++; } - if ((!*from || *from == '/') && (!*dest || *dest == '/')) continue; - - /* count remaining elements in 'from' */ - do - { - dotdots++; - while (*from && *from != '/') from++; - while (*from == '/') from++; - } - while (*from); - break; - } - - if (!start[0] && !dotdots) return NULL; /* empty path */ - - ret = xmalloc( 3 * dotdots + strlen( start ) + 1 ); - for (p = ret; dotdots; dotdots--, p += 3) memcpy( p, "../", 3 ); - - if (start[0]) strcpy( p, start ); - else p[-1] = 0; /* remove trailing slash */ - return ret; -} - - /******************************************************************* * get_root_relative_path * @@ -4432,9 +4384,6 @@ static int parse_option( const char *opt ) case 'f': if (opt[2]) output_makefile_name = opt + 2; break; - case 'R': - relative_dir_mode = 1; - break; case 'S': silent_rules = 1; break; @@ -4479,22 +4428,12 @@ int main( int argc, char *argv[] ) else i++; } - if (relative_dir_mode) + if (argc > 1) { - char *relpath; - - if (argc != 3) - { - fprintf( stderr, "Option -R needs two directories\n%s", Usage ); - exit( 1 ); - } - relpath = get_relative_path( argv[1], argv[2] ); - printf( "%s\n", relpath ? relpath : "." ); - exit( 0 ); + fprintf( stderr, "Unknown argument '%s'\n%s", argv[1], Usage ); + exit(1); } - if (argc > 1) fatal_error( "Directory arguments not supported in this mode\n" ); - atexit( cleanup_files ); init_signals( exit_on_signal );

1 0