Ros-diffs

ros-diffs@reactos.org

81390 discussions

[akhaldi] 46757: - Move winsplp.h to PSDK and improve it. - wspiapi.h : __inline -> FORCEINLINE, alter _WSPIAPI_STRNCPY_S and _WSPIAPI_SPRINTF_S_1 - winspool.h : Add missing PRINTER_NOTIFY_OPTIONS(_TYPE) - ws2spi.h and also compstui.h : Group some related definitions. - Add wine/ddk/winsplp.h and winddiui.h wrappers around our files, as wine code wants them in ddk.
by akhaldi＠svn.reactos.org 07 Apr '10

07 Apr '10

Author: akhaldi Date: Wed Apr 7 02:02:57 2010 New Revision: 46757 URL: http://svn.reactos.org/svn/reactos?rev=46757&view=rev Log: - Move winsplp.h to PSDK and improve it. - wspiapi.h : __inline -> FORCEINLINE, alter _WSPIAPI_STRNCPY_S and _WSPIAPI_SPRINTF_S_1 - winspool.h : Add missing PRINTER_NOTIFY_OPTIONS(_TYPE) - ws2spi.h and also compstui.h : Group some related definitions. - Add wine/ddk/winsplp.h and winddiui.h wrappers around our files, as wine code wants them in ddk. Added: branches/header-work/include/psdk/winsplp.h - copied, changed from r46746, branches/header-work/include/ddk/winsplp.h branches/header-work/include/reactos/wine/ddk/winddiui.h (with props) branches/header-work/include/reactos/wine/ddk/winsplp.h (with props) Removed: branches/header-work/include/ddk/winsplp.h Modified: branches/header-work/include/psdk/compstui.h branches/header-work/include/psdk/winspool.h branches/header-work/include/psdk/ws2spi.h branches/header-work/include/psdk/wspiapi.h [This mail would be too long, it was shortened to contain the URLs only.] Removed: branches/header-work/include/ddk/winsplp.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/ddk/winsplp… Modified: branches/header-work/include/psdk/compstui.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/psdk/compst… Copied: branches/header-work/include/psdk/winsplp.h (from r46746, branches/header-work/include/ddk/winsplp.h) URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/psdk/winspl… Modified: branches/header-work/include/psdk/winspool.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/psdk/winspo… Modified: branches/header-work/include/psdk/ws2spi.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/psdk/ws2spi… Modified: branches/header-work/include/psdk/wspiapi.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/psdk/wspiap… Added: branches/header-work/include/reactos/wine/ddk/winddiui.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/reactos/win… Added: branches/header-work/include/reactos/wine/ddk/winsplp.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/reactos/win…

1 0

[fireball] 46756: - Finally implement timeout removal from the old desktop when setting a new one for the process.
by fireball＠svn.reactos.org 06 Apr '10

06 Apr '10

Author: fireball Date: Wed Apr 7 00:08:17 2010 New Revision: 46756 URL: http://svn.reactos.org/svn/reactos?rev=46756&view=rev Log: - Finally implement timeout removal from the old desktop when setting a new one for the process. Modified: branches/arwinss/reactos/subsystems/win32/win32k/wine/winstation.c Modified: branches/arwinss/reactos/subsystems/win32/win32k/wine/winstation.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/wine/winstation.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/wine/winstation.c [iso-8859-1] Wed Apr 7 00:08:17 2010 @@ -355,8 +355,7 @@ ExfReleasePushLockShared(&eProcess->ProcessLock); KeLeaveCriticalRegion(); -#if 0 - if (!process->is_system) + if (desktop) { desktop->users++; if (desktop->close_timeout) @@ -366,9 +365,6 @@ } if (old_desktop) old_desktop->users--; } -#else - DPRINT1("close_timeout for this process is not done yet!\n"); -#endif if (old_desktop) release_object( old_desktop ); }

1 0

[fireball] 46755: - Add thread termination cleanup (destroying windows, freeing a message queue, dereferencing its desktop).
by fireball＠svn.reactos.org 06 Apr '10

06 Apr '10

Author: fireball Date: Tue Apr 6 23:30:29 2010 New Revision: 46755 URL: http://svn.reactos.org/svn/reactos?rev=46755&view=rev Log: - Add thread termination cleanup (destroying windows, freeing a message queue, dereferencing its desktop). Modified: branches/arwinss/reactos/subsystems/win32/win32k/main/init.c Modified: branches/arwinss/reactos/subsystems/win32/win32k/main/init.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/main/init.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/main/init.c [iso-8859-1] Tue Apr 6 23:30:29 2010 @@ -153,6 +153,15 @@ else { DPRINT("Destroying W32 thread TID:%d at IRQ level: %lu\n", Thread->Tcb.Teb->ClientId.UniqueThread, KeGetCurrentIrql()); + + /* USER thread-level cleanup */ + UserEnterExclusive(); + //cleanup_clipboard_thread(); + destroy_thread_windows(Win32Thread); + free_msg_queue(Win32Thread); + close_thread_desktop(Win32Thread); + UserLeave(); + PsSetThreadWin32Thread(Thread, NULL); }

1 0

[gschneider] 46754: [SHELL32] - Updated Italian translation by Gabriel Ilardi See issue #1494 for more details.
by gschneider＠svn.reactos.org 06 Apr '10

06 Apr '10

Author: gschneider Date: Tue Apr 6 20:51:13 2010 New Revision: 46754 URL: http://svn.reactos.org/svn/reactos?rev=46754&view=rev Log: [SHELL32] - Updated Italian translation by Gabriel Ilardi See issue #1494 for more details. Modified: trunk/reactos/dll/win32/shell32/lang/it-IT.rc Modified: trunk/reactos/dll/win32/shell32/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/it-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/it-IT.rc [iso-8859-1] Tue Apr 6 20:51:13 2010 @@ -434,8 +434,8 @@ CAPTION "Conferma della sovrascrittura dei file" FONT 8, "MS Shell Dlg" BEGIN - DEFPUSHBUTTON "&Si", IDYES, 20, 122, 60, 14 - PUSHBUTTON "Si &tutti", 12807, 85, 122, 60, 14 + DEFPUSHBUTTON "&Sì", IDYES, 20, 122, 60, 14 + PUSHBUTTON "Sì &tutti", 12807, 85, 122, 60, 14 PUSHBUTTON "&No", IDNO, 150, 122, 60, 14 PUSHBUTTON "Annulla", IDCANCEL, 215, 122, 60, 14 ICON 146, -1, 11, 10, 21, 20, SS_REALSIZECONTROL @@ -555,13 +555,13 @@ LTEXT "&File system", -1, 7, 35, 170, 9 COMBOBOX 28677, 7, 46, 170, 200, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP CONTROL "", 28678, "MSCTLS_PROGRESS32", 0, 7, 181, 170, 8 - LTEXT "Dimensione dell'unità di &Allocazione", -1, 7, 64, 170, 9 + LTEXT "Dimensione dell'unità di &allocazione", -1, 7, 64, 170, 9 COMBOBOX 28680, 7, 75, 170, 200, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP LTEXT "&Etichetta del Volume", -1, 7, 93, 170, 9 EDITTEXT 28679, 7, 103, 170, 13, ES_AUTOHSCROLL - GROUPBOX "Opzioni di &Formattazione", 4610, 7, 121, 170, 49 + GROUPBOX "Opzioni di &formattazione", 4610, 7, 121, 170, 49 AUTOCHECKBOX "Formattazione &rapida", 28674, 16, 135, 155, 10 - AUTOCHECKBOX "Abilita la &Compressione", 28675, 16, 152, 155, 10 + AUTOCHECKBOX "Abilita la &compressione", 28675, 16, 152, 155, 10 END CHKDSK_DLG DIALOGEX 50, 50, 194, 120 @@ -645,7 +645,7 @@ IDS_CREATEFOLDER_DENIED "Impossibile creare la cartella: Accesso negato." IDS_CREATEFOLDER_CAPTION "Errore durante la creazione della cartella" - IDS_DELETEITEM_CAPTION "Confermare la cancallazione del file" + IDS_DELETEITEM_CAPTION "Confermare la cancellazione del file" IDS_DELETEFOLDER_CAPTION "Confermare la cancellazione della cartella" IDS_DELETEITEM_TEXT "Sei sicuro di voler cancellare '%1'?" IDS_DELETEMULTIPLE_TEXT "Sei sicuro di voler cancellare questi %1 elementi?" @@ -664,10 +664,10 @@ /* message box strings */ IDS_RESTART_TITLE "Riavvia" IDS_RESTART_PROMPT "Volete riavviare il sistema?" - IDS_SHUTDOWN_TITLE "Termina sessione" - IDS_SHUTDOWN_PROMPT "Volete terminare la sessione di ReactOS?" - IDS_LOGOFF_TITLE "Log Off" - IDS_LOGOFF_PROMPT "Do you want to log off?" + IDS_SHUTDOWN_TITLE "Arresta sistema" + IDS_SHUTDOWN_PROMPT "Volete arrestare il sistema?" + IDS_LOGOFF_TITLE "Disconnetti" + IDS_LOGOFF_PROMPT "Volete disconnettervi?" /* shell folder path default values */ IDS_PROGRAMS "Menu Avvio\\Programmi"

1 0

[fireball] 46753: - Create and use idle_event as expected by Wine. It creates idle_event for every gui process (TODO: investigate if CUI process in ReactOS should have it). - Rewrite get_process_idle_event handler in a NT way.
by fireball＠svn.reactos.org 06 Apr '10

06 Apr '10

Author: fireball Date: Tue Apr 6 20:47:52 2010 New Revision: 46753 URL: http://svn.reactos.org/svn/reactos?rev=46753&view=rev Log: - Create and use idle_event as expected by Wine. It creates idle_event for every gui process (TODO: investigate if CUI process in ReactOS should have it). - Rewrite get_process_idle_event handler in a NT way. Modified: branches/arwinss/reactos/subsystems/win32/win32k/include/object.h branches/arwinss/reactos/subsystems/win32/win32k/include/win32.h branches/arwinss/reactos/subsystems/win32/win32k/main/init.c branches/arwinss/reactos/subsystems/win32/win32k/win32k.rbuild branches/arwinss/reactos/subsystems/win32/win32k/wine/process.c branches/arwinss/reactos/subsystems/win32/win32k/wine/stubs.c branches/arwinss/reactos/subsystems/win32/win32k/wine/winesup.c Modified: branches/arwinss/reactos/subsystems/win32/win32k/include/object.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/include/object.h [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/include/object.h [iso-8859-1] Tue Apr 6 20:47:52 2010 @@ -157,7 +157,7 @@ const struct security_descriptor *sd ); extern struct event *get_event_obj( PPROCESSINFO process, obj_handle_t handle, unsigned int access ); extern void pulse_event( struct event *event ); -extern void set_event( struct event *event ); +extern void set_event( PKEVENT event ); extern void reset_event( struct event *event ); /* mutex functions */ Modified: branches/arwinss/reactos/subsystems/win32/win32k/include/win32.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/include/win32.h [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/include/win32.h [iso-8859-1] Tue Apr 6 20:47:52 2010 @@ -18,7 +18,7 @@ W32HEAP_USER_MAPPING HeapMappings; struct list Classes; /* window classes owned by the process */ struct handle_table *handles; /* handle entries */ - struct event *idle_event; /* event for input idle */ + PKEVENT idle_event; /* event for input idle */ struct msg_queue *queue; /* main message queue */ obj_handle_t winstation; /* main handle to process window station */ obj_handle_t desktop; /* handle to desktop to use for new threads */ Modified: branches/arwinss/reactos/subsystems/win32/win32k/main/init.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/main/init.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/main/init.c [iso-8859-1] Tue Apr 6 20:47:52 2010 @@ -38,6 +38,8 @@ BOOLEAN Create) { PPROCESSINFO Win32Process; + NTSTATUS Status; + HANDLE IdleHandle; struct handle_table *handles; DPRINT("Enter Win32kProcessCallback\n"); @@ -62,6 +64,19 @@ Win32Process->peProcess = Process; /* FIXME - unlock the process */ + /* Create an idle event */ + Status = ZwCreateEvent(&IdleHandle, EVENT_ALL_ACCESS, NULL, SynchronizationEvent, TRUE); + if (!NT_SUCCESS(Status)) DPRINT1("Creating idle event failed with status 0x%08X\n", Status); + + /* Get a pointer to the object itself */ + Status = ObReferenceObjectByHandle(IdleHandle, + EVENT_ALL_ACCESS, + NULL, + KernelMode, + (PVOID*)&Win32Process->idle_event, + NULL); + if (!NT_SUCCESS(Status)) ZwClose(IdleHandle); + list_init(&Win32Process->Classes); Win32Process->handles = alloc_handle_table(Win32Process, 0); connect_process_winstation(Win32Process); @@ -79,6 +94,8 @@ /* Destroy its classes */ destroy_process_classes(Win32Process); + + if (Win32Process->idle_event) ZwClose(Win32Process->idle_event); UserLeave(); Modified: branches/arwinss/reactos/subsystems/win32/win32k/win32k.rbuild URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/win32k.rbuild [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/win32k.rbuild [iso-8859-1] Tue Apr 6 20:47:52 2010 @@ -144,6 +144,7 @@ <file>hook.c</file> <file>main.c</file> <file>object.c</file> + <file>process.c</file> <file>queue.c</file> <file>region.c</file> <file>stubs.c</file> Modified: branches/arwinss/reactos/subsystems/win32/win32k/wine/process.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/wine/process.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/wine/process.c [iso-8859-1] Tue Apr 6 20:47:52 2010 @@ -1,7 +1,7 @@ /* * Server-side process management * - * Copyright (C) 1998 Alexandre Julliard + * Copyright (C) 2010 Aleksey Bragin * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -32,30 +32,35 @@ /* retrieve the process idle event */ DECL_HANDLER(get_process_idle_event) { - PEPROCESS process_obj; - PPROCESSINFO process; - NTSTATUS status; + PEPROCESS ProcessObject; + PPROCESSINFO Process; + NTSTATUS Status; reply->event = 0; /* Reference the process */ - status = ObReferenceObjectByHandle((HANDLE)req->handle, + Status = ObReferenceObjectByHandle((HANDLE)req->handle, PROCESS_QUERY_INFORMATION, PsProcessType, KernelMode, - (PVOID*)&process_obj, + (PVOID*)&ProcessObject, NULL); -DPRINT1("status 0x%08X\n", status); - if (NT_SUCCESS(status)) + + if (NT_SUCCESS(Status)) { - process = PsGetProcessWin32Process(process_obj); + Process = PsGetProcessWin32Process(ProcessObject); - if (process->idle_event && process_obj != PsGetCurrentProcess()) + if (Process->idle_event && ProcessObject != PsGetCurrentProcess()) { - UNIMPLEMENTED; - //reply->event = alloc_handle( PsGetCurrentProcess(), process->idle_event, - // EVENT_ALL_ACCESS, 0 ); + /* Get a handle to the idle event (in another process) */ + Status = ObOpenObjectByPointer(Process->idle_event, + 0, + NULL, + EVENT_ALL_ACCESS, + 0, + KernelMode, + (PHANDLE)&reply->event); } - ObDereferenceObject( process_obj ); + ObDereferenceObject( ProcessObject ); } } Modified: branches/arwinss/reactos/subsystems/win32/win32k/wine/stubs.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/wine/stubs.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/wine/stubs.c [iso-8859-1] Tue Apr 6 20:47:52 2010 @@ -558,11 +558,6 @@ UNIMPLEMENTED; } -DECL_HANDLER(get_process_idle_event) -{ - UNIMPLEMENTED; -} - DECL_HANDLER(get_serial_info) { UNIMPLEMENTED; Modified: branches/arwinss/reactos/subsystems/win32/win32k/wine/winesup.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/wine/winesup.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/wine/winesup.c [iso-8859-1] Tue Apr 6 20:47:52 2010 @@ -125,9 +125,9 @@ #endif } -void set_event( struct event *event ) +void set_event( PKEVENT event ) { - UNIMPLEMENTED; + KeSetEvent(event, EVENT_INCREMENT, FALSE); } void reset_event( struct event *event )

1 0

[fireball] 46752: - Import process.s from wineserver, clean it up to contain only ported get_process_idle_event handler. Not included into the build now.
by fireball＠svn.reactos.org 06 Apr '10

06 Apr '10

Author: fireball Date: Tue Apr 6 19:37:08 2010 New Revision: 46752 URL: http://svn.reactos.org/svn/reactos?rev=46752&view=rev Log: - Import process.s from wineserver, clean it up to contain only ported get_process_idle_event handler. Not included into the build now. Added: branches/arwinss/reactos/subsystems/win32/win32k/wine/process.c - copied, changed from r46314, vendor/wine/server/current/process.c Copied: branches/arwinss/reactos/subsystems/win32/win32k/wine/process.c (from r46314, vendor/wine/server/current/process.c) URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- vendor/wine/server/current/process.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/wine/process.c [iso-8859-1] Tue Apr 6 19:37:08 2010 @@ -18,1243 +18,44 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" +#include <win32k.h> -#include <assert.h> #include <limits.h> -#include <signal.h> -#include <string.h> -#include <stdarg.h> -#include <stdio.h> -#include <stdlib.h> -#include <sys/time.h> -#ifdef HAVE_SYS_SOCKET_H -# include <sys/socket.h> -#endif -#include <unistd.h> -#ifdef HAVE_POLL_H -#include <poll.h> -#endif +#include "object.h" +#include "request.h" +#include "handle.h" +#include "user.h" -#include "ntstatus.h" -#define WIN32_NO_STATUS -#include "winternl.h" - -#include "file.h" -#include "handle.h" -#include "process.h" -#include "thread.h" -#include "request.h" -#include "user.h" -#include "security.h" - -/* process structure */ - -static struct list process_list = LIST_INIT(process_list); -static int running_processes, user_processes; -static struct event *shutdown_event; /* signaled when shutdown starts */ -static struct timeout_user *shutdown_timeout; /* timeout for server shutdown */ -static int shutdown_stage; /* current stage in the shutdown process */ - -/* process operations */ - -static void process_dump( struct object *obj, int verbose ); -static int process_signaled( struct object *obj, struct thread *thread ); -static unsigned int process_map_access( struct object *obj, unsigned int access ); -static void process_poll_event( struct fd *fd, int event ); -static void process_destroy( struct object *obj ); - -static const struct object_ops process_ops = -{ - sizeof(struct process), /* size */ - process_dump, /* dump */ - no_get_type, /* get_type */ - add_queue, /* add_queue */ - remove_queue, /* remove_queue */ - process_signaled, /* signaled */ - no_satisfied, /* satisfied */ - no_signal, /* signal */ - no_get_fd, /* get_fd */ - process_map_access, /* map_access */ - default_get_sd, /* get_sd */ - default_set_sd, /* set_sd */ - no_lookup_name, /* lookup_name */ - no_open_file, /* open_file */ - no_close_handle, /* close_handle */ - process_destroy /* destroy */ -}; - -static const struct fd_ops process_fd_ops = -{ - NULL, /* get_poll_events */ - process_poll_event, /* poll_event */ - NULL, /* flush */ - NULL, /* get_fd_type */ - NULL, /* ioctl */ - NULL, /* queue_async */ - NULL, /* reselect_async */ - NULL /* cancel async */ -}; - -/* process startup info */ - -struct startup_info -{ - struct object obj; /* object header */ - struct file *exe_file; /* file handle for main exe */ - struct process *process; /* created process */ - data_size_t info_size; /* size of startup info */ - data_size_t data_size; /* size of whole startup data */ - startup_info_t *data; /* data for startup info */ -}; - -static void startup_info_dump( struct object *obj, int verbose ); -static int startup_info_signaled( struct object *obj, struct thread *thread ); -static void startup_info_destroy( struct object *obj ); - -static const struct object_ops startup_info_ops = -{ - sizeof(struct startup_info), /* size */ - startup_info_dump, /* dump */ - no_get_type, /* get_type */ - add_queue, /* add_queue */ - remove_queue, /* remove_queue */ - startup_info_signaled, /* signaled */ - no_satisfied, /* satisfied */ - no_signal, /* signal */ - no_get_fd, /* get_fd */ - no_map_access, /* map_access */ - default_get_sd, /* get_sd */ - default_set_sd, /* set_sd */ - no_lookup_name, /* lookup_name */ - no_open_file, /* open_file */ - no_close_handle, /* close_handle */ - startup_info_destroy /* destroy */ -}; - - -struct ptid_entry -{ - void *ptr; /* entry ptr */ - unsigned int next; /* next free entry */ -}; - -static struct ptid_entry *ptid_entries; /* array of ptid entries */ -static unsigned int used_ptid_entries; /* number of entries in use */ -static unsigned int alloc_ptid_entries; /* number of allocated entries */ -static unsigned int next_free_ptid; /* next free entry */ -static unsigned int last_free_ptid; /* last free entry */ - -static void kill_all_processes(void); - -#define PTID_OFFSET 8 /* offset for first ptid value */ - -/* allocate a new process or thread id */ -unsigned int alloc_ptid( void *ptr ) -{ - struct ptid_entry *entry; - unsigned int id; - - if (used_ptid_entries < alloc_ptid_entries) - { - id = used_ptid_entries + PTID_OFFSET; - entry = &ptid_entries[used_ptid_entries++]; - } - else if (next_free_ptid) - { - id = next_free_ptid; - entry = &ptid_entries[id - PTID_OFFSET]; - if (!(next_free_ptid = entry->next)) last_free_ptid = 0; - } - else /* need to grow the array */ - { - unsigned int count = alloc_ptid_entries + (alloc_ptid_entries / 2); - if (!count) count = 64; - if (!(entry = realloc( ptid_entries, count * sizeof(*entry) ))) - { - set_error( STATUS_NO_MEMORY ); - return 0; - } - ptid_entries = entry; - alloc_ptid_entries = count; - id = used_ptid_entries + PTID_OFFSET; - entry = &ptid_entries[used_ptid_entries++]; - } - - entry->ptr = ptr; - return id; -} - -/* free a process or thread id */ -void free_ptid( unsigned int id ) -{ - struct ptid_entry *entry = &ptid_entries[id - PTID_OFFSET]; - - entry->ptr = NULL; - entry->next = 0; - - /* append to end of free list so that we don't reuse it too early */ - if (last_free_ptid) ptid_entries[last_free_ptid - PTID_OFFSET].next = id; - else next_free_ptid = id; - - last_free_ptid = id; -} - -/* retrieve the pointer corresponding to a process or thread id */ -void *get_ptid_entry( unsigned int id ) -{ - if (id < PTID_OFFSET) return NULL; - if (id - PTID_OFFSET >= used_ptid_entries) return NULL; - return ptid_entries[id - PTID_OFFSET].ptr; -} - -/* return the main thread of the process */ -struct thread *get_process_first_thread( struct process *process ) -{ - struct list *ptr = list_head( &process->thread_list ); - if (!ptr) return NULL; - return LIST_ENTRY( ptr, struct thread, proc_entry ); -} - -/* set the state of the process startup info */ -static void set_process_startup_state( struct process *process, enum startup_state state ) -{ - if (process->startup_state == STARTUP_IN_PROGRESS) process->startup_state = state; - if (process->startup_info) - { - wake_up( &process->startup_info->obj, 0 ); - release_object( process->startup_info ); - process->startup_info = NULL; - } -} - -/* callback for server shutdown */ -static void server_shutdown_timeout( void *arg ) -{ - shutdown_timeout = NULL; - if (!running_processes) - { - close_master_socket( 0 ); - return; - } - switch(++shutdown_stage) - { - case 1: /* signal system processes to exit */ - if (debug_level) fprintf( stderr, "wineserver: shutting down\n" ); - if (shutdown_event) set_event( shutdown_event ); - shutdown_timeout = add_timeout_user( 2 * -TICKS_PER_SEC, server_shutdown_timeout, NULL ); - close_master_socket( 4 * -TICKS_PER_SEC ); - break; - case 2: /* now forcibly kill all processes (but still wait for SIGKILL timeouts) */ - kill_all_processes(); - break; - } -} - -/* forced shutdown, used for wineserver -k */ -void shutdown_master_socket(void) -{ - kill_all_processes(); - shutdown_stage = 2; - if (shutdown_timeout) - { - remove_timeout_user( shutdown_timeout ); - shutdown_timeout = NULL; - } - close_master_socket( 2 * -TICKS_PER_SEC ); /* for SIGKILL timeouts */ -} - -/* final cleanup once we are sure a process is really dead */ -static void process_died( struct process *process ) -{ - if (debug_level) fprintf( stderr, "%04x: *process killed*\n", process->id ); - if (!process->is_system) - { - if (!--user_processes && !shutdown_stage && master_socket_timeout != TIMEOUT_INFINITE) - shutdown_timeout = add_timeout_user( master_socket_timeout, server_shutdown_timeout, NULL ); - } - release_object( process ); - if (!--running_processes && shutdown_stage) close_master_socket( 0 ); -} - -/* callback for process sigkill timeout */ -static void process_sigkill( void *private ) -{ - struct process *process = private; - - process->sigkill_timeout = NULL; - kill( process->unix_pid, SIGKILL ); - process_died( process ); -} - -/* start the sigkill timer for a process upon exit */ -static void start_sigkill_timer( struct process *process ) -{ - grab_object( process ); - if (process->unix_pid != -1 && process->msg_fd) - process->sigkill_timeout = add_timeout_user( -TICKS_PER_SEC, process_sigkill, process ); - else - process_died( process ); -} - -/* create a new process and its main thread */ -/* if the function fails the fd is closed */ -struct thread *create_process( int fd, struct thread *parent_thread, int inherit_all ) -{ - struct process *process; - struct thread *thread = NULL; - int request_pipe[2]; - - if (!(process = alloc_object( &process_ops ))) - { - close( fd ); - goto error; - } - process->parent = NULL; - process->debugger = NULL; - process->handles = NULL; - process->msg_fd = NULL; - process->sigkill_timeout = NULL; - process->unix_pid = -1; - process->exit_code = STILL_ACTIVE; - process->running_threads = 0; - process->priority = PROCESS_PRIOCLASS_NORMAL; - process->affinity = ~0; - process->suspend = 0; - process->is_system = 0; - process->create_flags = 0; - process->console = NULL; - process->startup_state = STARTUP_IN_PROGRESS; - process->startup_info = NULL; - process->idle_event = NULL; - process->peb = 0; - process->ldt_copy = 0; - process->winstation = 0; - process->desktop = 0; - process->token = NULL; - process->trace_data = 0; - list_init( &process->thread_list ); - list_init( &process->locks ); - list_init( &process->classes ); - list_init( &process->dlls ); - - process->start_time = current_time; - process->end_time = 0; - list_add_tail( &process_list, &process->entry ); - - if (!(process->id = process->group_id = alloc_ptid( process ))) - { - close( fd ); - goto error; - } - if (!(process->msg_fd = create_anonymous_fd( &process_fd_ops, fd, &process->obj, 0 ))) goto error; - - /* create the handle table */ - if (!parent_thread) - { - process->handles = alloc_handle_table( process, 0 ); - process->token = token_create_admin(); - } - else - { - struct process *parent = parent_thread->process; - process->parent = (struct process *)grab_object( parent ); - process->handles = inherit_all ? copy_handle_table( process, parent ) - : alloc_handle_table( process, 0 ); - /* Note: for security reasons, starting a new process does not attempt - * to use the current impersonation token for the new process */ - process->token = token_duplicate( parent->token, TRUE, 0 ); - } - if (!process->handles || !process->token) goto error; - - /* create the main thread */ - if (pipe( request_pipe ) == -1) - { - file_set_error(); - goto error; - } - if (send_client_fd( process, request_pipe[1], SERVER_PROTOCOL_VERSION ) == -1) - { - close( request_pipe[0] ); - close( request_pipe[1] ); - goto error; - } - close( request_pipe[1] ); - if (!(thread = create_thread( request_pipe[0], process ))) goto error; - - set_fd_events( process->msg_fd, POLLIN ); /* start listening to events */ - release_object( process ); - return thread; - - error: - if (process) release_object( process ); - /* if we failed to start our first process, close everything down */ - if (!running_processes) close_master_socket( 0 ); - return NULL; -} - -/* initialize the current process and fill in the request */ -data_size_t init_process( struct thread *thread ) -{ - struct process *process = thread->process; - struct startup_info *info = process->startup_info; - - init_process_tracing( process ); - if (!info) return 0; - return info->data_size; -} - -/* destroy a process when its refcount is 0 */ -static void process_destroy( struct object *obj ) -{ - struct process *process = (struct process *)obj; - assert( obj->ops == &process_ops ); - - /* we can't have a thread remaining */ - assert( list_empty( &process->thread_list )); - - assert( !process->sigkill_timeout ); /* timeout should hold a reference to the process */ - - set_process_startup_state( process, STARTUP_ABORTED ); - if (process->console) release_object( process->console ); - if (process->parent) release_object( process->parent ); - if (process->msg_fd) release_object( process->msg_fd ); - list_remove( &process->entry ); - if (process->idle_event) release_object( process->idle_event ); - if (process->id) free_ptid( process->id ); - if (process->token) release_object( process->token ); -} - -/* dump a process on stdout for debugging purposes */ -static void process_dump( struct object *obj, int verbose ) -{ - struct process *process = (struct process *)obj; - assert( obj->ops == &process_ops ); - - fprintf( stderr, "Process id=%04x handles=%p\n", process->id, process->handles ); -} - -static int process_signaled( struct object *obj, struct thread *thread ) -{ - struct process *process = (struct process *)obj; - return !process->running_threads; -} - -static unsigned int process_map_access( struct object *obj, unsigned int access ) -{ - if (access & GENERIC_READ) access |= STANDARD_RIGHTS_READ | SYNCHRONIZE; - if (access & GENERIC_WRITE) access |= STANDARD_RIGHTS_WRITE | SYNCHRONIZE; - if (access & GENERIC_EXECUTE) access |= STANDARD_RIGHTS_EXECUTE; - if (access & GENERIC_ALL) access |= PROCESS_ALL_ACCESS; - return access & ~(GENERIC_READ | GENERIC_WRITE | GENERIC_EXECUTE | GENERIC_ALL); -} - -static void process_poll_event( struct fd *fd, int event ) -{ - struct process *process = get_fd_user( fd ); - assert( process->obj.ops == &process_ops ); - - if (event & (POLLERR | POLLHUP)) kill_process( process, 0 ); - else if (event & POLLIN) receive_fd( process ); -} - -static void startup_info_destroy( struct object *obj ) -{ - struct startup_info *info = (struct startup_info *)obj; - assert( obj->ops == &startup_info_ops ); - free( info->data ); - if (info->exe_file) release_object( info->exe_file ); - if (info->process) release_object( info->process ); -} - -static void startup_info_dump( struct object *obj, int verbose ) -{ - struct startup_info *info = (struct startup_info *)obj; - assert( obj->ops == &startup_info_ops ); - - fprintf( stderr, "Startup info in=%04x out=%04x err=%04x\n", - info->data->hstdin, info->data->hstdout, info->data->hstderr ); -} - -static int startup_info_signaled( struct object *obj, struct thread *thread ) -{ - struct startup_info *info = (struct startup_info *)obj; - return info->process && info->process->startup_state != STARTUP_IN_PROGRESS; -} - -/* get a process from an id (and increment the refcount) */ -struct process *get_process_from_id( process_id_t id ) -{ - struct object *obj = get_ptid_entry( id ); - - if (obj && obj->ops == &process_ops) return (struct process *)grab_object( obj ); - set_error( STATUS_INVALID_PARAMETER ); - return NULL; -} - -/* get a process from a handle (and increment the refcount) */ -struct process *get_process_from_handle( obj_handle_t handle, unsigned int access ) -{ - return (struct process *)get_handle_obj( current->process, handle, - access, &process_ops ); -} - -/* find a dll from its base address */ -static inline struct process_dll *find_process_dll( struct process *process, mod_handle_t base ) -{ - struct process_dll *dll; - - LIST_FOR_EACH_ENTRY( dll, &process->dlls, struct process_dll, entry ) - { - if (dll->base == base) return dll; - } - return NULL; -} - -/* add a dll to a process list */ -static struct process_dll *process_load_dll( struct process *process, struct file *file, - mod_handle_t base, const WCHAR *filename, - data_size_t name_len ) -{ - struct process_dll *dll; - - /* make sure we don't already have one with the same base address */ - if (find_process_dll( process, base )) - { - set_error( STATUS_INVALID_PARAMETER ); - return NULL; - } - - if ((dll = mem_alloc( sizeof(*dll) ))) - { - dll->file = NULL; - dll->base = base; - dll->filename = NULL; - dll->namelen = name_len; - if (name_len && !(dll->filename = memdup( filename, name_len ))) - { - free( dll ); - return NULL; - } - if (file) dll->file = grab_file_unless_removable( file ); - list_add_tail( &process->dlls, &dll->entry ); - } - return dll; -} - -/* remove a dll from a process list */ -static void process_unload_dll( struct process *process, mod_handle_t base ) -{ - struct process_dll *dll = find_process_dll( process, base ); - - if (dll && (&dll->entry != list_head( &process->dlls ))) /* main exe can't be unloaded */ - { - if (dll->file) release_object( dll->file ); - free( dll->filename ); - list_remove( &dll->entry ); - free( dll ); - generate_debug_event( current, UNLOAD_DLL_DEBUG_EVENT, &base ); - } - else set_error( STATUS_INVALID_PARAMETER ); -} - -/* terminate a process with the given exit code */ -static void terminate_process( struct process *process, struct thread *skip, int exit_code ) -{ - struct thread *thread; - - grab_object( process ); /* make sure it doesn't get freed when threads die */ -restart: - LIST_FOR_EACH_ENTRY( thread, &process->thread_list, struct thread, proc_entry ) - { - if (exit_code) thread->exit_code = exit_code; - if (thread == skip) continue; - if (thread->state == TERMINATED) continue; - kill_thread( thread, 1 ); - goto restart; - } - release_object( process ); -} - -/* kill all processes */ -static void kill_all_processes(void) -{ - for (;;) - { - struct process *process; - - LIST_FOR_EACH_ENTRY( process, &process_list, struct process, entry ) - { - if (process->running_threads) break; - } - if (&process->entry == &process_list) break; /* no process found */ - terminate_process( process, NULL, 1 ); - } -} - -/* kill all processes being attached to a console renderer */ -void kill_console_processes( struct thread *renderer, int exit_code ) -{ - for (;;) /* restart from the beginning of the list every time */ - { - struct process *process; - - /* find the first process being attached to 'renderer' and still running */ - LIST_FOR_EACH_ENTRY( process, &process_list, struct process, entry ) - { - if (process == renderer->process) continue; - if (!process->running_threads) continue; - if (process->console && console_get_renderer( process->console ) == renderer) break; - } - if (&process->entry == &process_list) break; /* no process found */ - terminate_process( process, NULL, exit_code ); - } -} - -/* a process has been killed (i.e. its last thread died) */ -static void process_killed( struct process *process ) -{ - struct handle_table *handles; - struct list *ptr; - - assert( list_empty( &process->thread_list )); - process->end_time = current_time; - if (!process->is_system) close_process_desktop( process ); - handles = process->handles; - process->handles = NULL; - if (handles) release_object( handles ); - process->winstation = 0; - process->desktop = 0; - if (process->idle_event) - { - release_object( process->idle_event ); - process->idle_event = NULL; - } - - /* close the console attached to this process, if any */ - free_console( process ); - - while ((ptr = list_head( &process->dlls ))) - { - struct process_dll *dll = LIST_ENTRY( ptr, struct process_dll, entry ); - if (dll->file) release_object( dll->file ); - free( dll->filename ); - list_remove( &dll->entry ); - free( dll ); - } - destroy_process_classes( process ); - free_process_user_handles( process ); - remove_process_locks( process ); - set_process_startup_state( process, STARTUP_ABORTED ); - finish_process_tracing( process ); - start_sigkill_timer( process ); - wake_up( &process->obj, 0 ); -} - -/* add a thread to a process running threads list */ -void add_process_thread( struct process *process, struct thread *thread ) -{ - list_add_tail( &process->thread_list, &thread->proc_entry ); - if (!process->running_threads++) - { - running_processes++; - if (!process->is_system) - { - if (!user_processes++ && shutdown_timeout) - { - remove_timeout_user( shutdown_timeout ); - shutdown_timeout = NULL; - } - } - } - grab_object( thread ); -} - -/* remove a thread from a process running threads list */ -void remove_process_thread( struct process *process, struct thread *thread ) -{ - assert( process->running_threads > 0 ); - assert( !list_empty( &process->thread_list )); - - list_remove( &thread->proc_entry ); - - if (!--process->running_threads) - { - /* we have removed the last running thread, exit the process */ - process->exit_code = thread->exit_code; - generate_debug_event( thread, EXIT_PROCESS_DEBUG_EVENT, process ); - process_killed( process ); - } - else generate_debug_event( thread, EXIT_THREAD_DEBUG_EVENT, thread ); - release_object( thread ); -} - -/* suspend all the threads of a process */ -void suspend_process( struct process *process ) -{ - if (!process->suspend++) - { - struct list *ptr, *next; - - LIST_FOR_EACH_SAFE( ptr, next, &process->thread_list ) - { - struct thread *thread = LIST_ENTRY( ptr, struct thread, proc_entry ); - if (!thread->suspend) stop_thread( thread ); - } - } -} - -/* resume all the threads of a process */ -void resume_process( struct process *process ) -{ - assert (process->suspend > 0); - if (!--process->suspend) - { - struct list *ptr, *next; - - LIST_FOR_EACH_SAFE( ptr, next, &process->thread_list ) - { - struct thread *thread = LIST_ENTRY( ptr, struct thread, proc_entry ); - if (!thread->suspend) wake_thread( thread ); - } - } -} - -/* kill a process on the spot */ -void kill_process( struct process *process, int violent_death ) -{ - if (!violent_death && process->msg_fd) /* normal termination on pipe close */ - { - release_object( process->msg_fd ); - process->msg_fd = NULL; - } - - if (process->sigkill_timeout) /* already waiting for it to die */ - { - remove_timeout_user( process->sigkill_timeout ); - process->sigkill_timeout = NULL; - process_died( process ); - return; - } - - if (violent_death) terminate_process( process, NULL, 1 ); - else - { - struct list *ptr; - - grab_object( process ); /* make sure it doesn't get freed when threads die */ - while ((ptr = list_head( &process->thread_list ))) - { - struct thread *thread = LIST_ENTRY( ptr, struct thread, proc_entry ); - kill_thread( thread, 0 ); - } - release_object( process ); - } -} - -/* kill all processes being debugged by a given thread */ -void kill_debugged_processes( struct thread *debugger, int exit_code ) -{ - for (;;) /* restart from the beginning of the list every time */ - { - struct process *process; - - /* find the first process being debugged by 'debugger' and still running */ - LIST_FOR_EACH_ENTRY( process, &process_list, struct process, entry ) - { - if (!process->running_threads) continue; - if (process->debugger == debugger) break; - } - if (&process->entry == &process_list) break; /* no process found */ - process->debugger = NULL; - terminate_process( process, NULL, exit_code ); - } -} - - -/* trigger a breakpoint event in a given process */ -void break_process( struct process *process ) -{ - struct thread *thread; - - suspend_process( process ); - - LIST_FOR_EACH_ENTRY( thread, &process->thread_list, struct thread, proc_entry ) - { - if (thread->context) /* inside an exception event already */ - { - break_thread( thread ); - goto done; - } - } - if ((thread = get_process_first_thread( process ))) thread->debug_break = 1; - else set_error( STATUS_ACCESS_DENIED ); -done: - resume_process( process ); -} - - -/* detach a debugger from all its debuggees */ -void detach_debugged_processes( struct thread *debugger ) -{ - struct process *process; - - LIST_FOR_EACH_ENTRY( process, &process_list, struct process, entry ) - { - if (process->debugger == debugger && process->running_threads) - { - debugger_detach( process, debugger ); - } - } -} - - -void enum_processes( int (*cb)(struct process*, void*), void *user ) -{ - struct list *ptr, *next; - - LIST_FOR_EACH_SAFE( ptr, next, &process_list ) - { - struct process *process = LIST_ENTRY( ptr, struct process, entry ); - if ((cb)(process, user)) break; - } -} - -/* set the debugged flag in the process PEB */ -int set_process_debug_flag( struct process *process, int flag ) -{ - char data = (flag != 0); - - /* BeingDebugged flag is the byte at offset 2 in the PEB */ - return write_process_memory( process, process->peb + 2, 1, &data ); -} - -/* take a snapshot of currently running processes */ -struct process_snapshot *process_snap( int *count ) -{ - struct process_snapshot *snapshot, *ptr; - struct process *process; - - if (!running_processes) return NULL; - if (!(snapshot = mem_alloc( sizeof(*snapshot) * running_processes ))) - return NULL; - ptr = snapshot; - LIST_FOR_EACH_ENTRY( process, &process_list, struct process, entry ) - { - if (!process->running_threads) continue; - ptr->process = process; - ptr->threads = process->running_threads; - ptr->count = process->obj.refcount; - ptr->priority = process->priority; - ptr->handles = get_handle_table_count(process); - grab_object( process ); - ptr++; - } - - if (!(*count = ptr - snapshot)) - { - free( snapshot ); - snapshot = NULL; - } - return snapshot; -} - -/* create a new process */ -DECL_HANDLER(new_process) -{ - struct startup_info *info; - struct thread *thread; - struct process *process; - struct process *parent = current->process; - int socket_fd = thread_get_inflight_fd( current, req->socket_fd ); - - if (socket_fd == -1) - { - set_error( STATUS_INVALID_PARAMETER ); - return; - } - if (fcntl( socket_fd, F_SETFL, O_NONBLOCK ) == -1) - { - set_error( STATUS_INVALID_HANDLE ); - close( socket_fd ); - return; - } - if (shutdown_stage) - { - set_error( STATUS_SHUTDOWN_IN_PROGRESS ); - close( socket_fd ); - return; - } - - /* build the startup info for a new process */ - if (!(info = alloc_object( &startup_info_ops ))) return; - info->exe_file = NULL; - info->process = NULL; - info->data = NULL; - - if (req->exe_file && - !(info->exe_file = get_file_obj( current->process, req->exe_file, FILE_READ_DATA ))) - goto done; - - info->data_size = get_req_data_size(); - info->info_size = min( req->info_size, info->data_size ); - - if (req->info_size < sizeof(*info->data)) - { - /* make sure we have a full startup_info_t structure */ - data_size_t env_size = info->data_size - info->info_size; - data_size_t info_size = min( req->info_size, FIELD_OFFSET( startup_info_t, curdir_len )); - - if (!(info->data = mem_alloc( sizeof(*info->data) + env_size ))) goto done; - memcpy( info->data, get_req_data(), info_size ); - memset( (char *)info->data + info_size, 0, sizeof(*info->data) - info_size ); - memcpy( info->data + 1, (const char *)get_req_data() + req->info_size, env_size ); - info->info_size = sizeof(startup_info_t); - info->data_size = info->info_size + env_size; - } - else - { - data_size_t pos = sizeof(*info->data); - - if (!(info->data = memdup( get_req_data(), info->data_size ))) goto done; -#define FIXUP_LEN(len) do { (len) = min( (len), info->info_size - pos ); pos += (len); } while(0) - FIXUP_LEN( info->data->curdir_len ); - FIXUP_LEN( info->data->dllpath_len ); - FIXUP_LEN( info->data->imagepath_len ); - FIXUP_LEN( info->data->cmdline_len ); - FIXUP_LEN( info->data->title_len ); - FIXUP_LEN( info->data->desktop_len ); - FIXUP_LEN( info->data->shellinfo_len ); - FIXUP_LEN( info->data->runtime_len ); -#undef FIXUP_LEN - } - - if (!(thread = create_process( socket_fd, current, req->inherit_all ))) goto done; - process = thread->process; - process->create_flags = req->create_flags; - process->startup_info = (struct startup_info *)grab_object( info ); - - /* connect to the window station */ - connect_process_winstation( process, current ); - - /* thread will be actually suspended in init_done */ - if (req->create_flags & CREATE_SUSPENDED) thread->suspend++; - - /* set the process console */ - if (!(req->create_flags & (DETACHED_PROCESS | CREATE_NEW_CONSOLE))) - { - /* FIXME: some better error checking should be done... - * like if hConOut and hConIn are console handles, then they should be on the same - * physical console - */ - inherit_console( current, process, req->inherit_all ? info->data->hstdin : 0 ); - } - - if (!req->inherit_all && !(req->create_flags & CREATE_NEW_CONSOLE)) - { - info->data->hstdin = duplicate_handle( parent, info->data->hstdin, process, - 0, OBJ_INHERIT, DUPLICATE_SAME_ACCESS ); - info->data->hstdout = duplicate_handle( parent, info->data->hstdout, process, - 0, OBJ_INHERIT, DUPLICATE_SAME_ACCESS ); - info->data->hstderr = duplicate_handle( parent, info->data->hstderr, process, - 0, OBJ_INHERIT, DUPLICATE_SAME_ACCESS ); - /* some handles above may have been invalid; this is not an error */ - if (get_error() == STATUS_INVALID_HANDLE || - get_error() == STATUS_OBJECT_TYPE_MISMATCH) clear_error(); - } - - /* attach to the debugger if requested */ - if (req->create_flags & (DEBUG_PROCESS | DEBUG_ONLY_THIS_PROCESS)) - set_process_debugger( process, current ); - else if (parent->debugger && !(parent->create_flags & DEBUG_ONLY_THIS_PROCESS)) - set_process_debugger( process, parent->debugger ); - - if (!(req->create_flags & CREATE_NEW_PROCESS_GROUP)) - process->group_id = parent->group_id; - - info->process = (struct process *)grab_object( process ); - reply->info = alloc_handle( current->process, info, SYNCHRONIZE, 0 ); - reply->pid = get_process_id( process ); - reply->tid = get_thread_id( thread ); - reply->phandle = alloc_handle( parent, process, req->process_access, req->process_attr ); - reply->thandle = alloc_handle( parent, thread, req->thread_access, req->thread_attr ); - - done: - release_object( info ); -} - -/* Retrieve information about a newly started process */ -DECL_HANDLER(get_new_process_info) -{ - struct startup_info *info; - - if ((info = (struct startup_info *)get_handle_obj( current->process, req->info, - 0, &startup_info_ops ))) - { - reply->success = is_process_init_done( info->process ); - reply->exit_code = info->process->exit_code; - release_object( info ); - } -} - -/* Retrieve the new process startup info */ -DECL_HANDLER(get_startup_info) -{ - struct process *process = current->process; - struct startup_info *info = process->startup_info; - data_size_t size; - - if (!info) return; - - if (info->exe_file && - !(reply->exe_file = alloc_handle( process, info->exe_file, GENERIC_READ, 0 ))) return; - - /* we return the data directly without making a copy so this can only be called once */ - reply->info_size = info->info_size; - size = info->data_size; - if (size > get_reply_max_size()) size = get_reply_max_size(); - set_reply_data_ptr( info->data, size ); - info->data = NULL; - info->data_size = 0; -} - -/* signal the end of the process initialization */ -DECL_HANDLER(init_process_done) -{ - struct process_dll *dll; - struct process *process = current->process; - - if (is_process_init_done(process)) - { - set_error( STATUS_INVALID_PARAMETER ); - return; - } - if (!(dll = find_process_dll( process, req->module ))) - { - set_error( STATUS_DLL_NOT_FOUND ); - return; - } - - /* main exe is the first in the dll list */ - list_remove( &dll->entry ); - list_add_head( &process->dlls, &dll->entry ); - - process->ldt_copy = req->ldt_copy; - - generate_startup_debug_events( process, req->entry ); - set_process_startup_state( process, STARTUP_DONE ); - - if (req->gui) process->idle_event = create_event( NULL, NULL, 0, 1, 0, NULL ); - if (current->suspend + process->suspend > 0) stop_thread( current ); - if (process->debugger) set_process_debug_flag( process, 1 ); -} - -/* open a handle to a process */ -DECL_HANDLER(open_process) -{ - struct process *process = get_process_from_id( req->pid ); - reply->handle = 0; - if (process) - { - reply->handle = alloc_handle( current->process, process, req->access, req->attributes ); - release_object( process ); - } -} - -/* terminate a process */ -DECL_HANDLER(terminate_process) -{ - struct process *process; - - if ((process = get_process_from_handle( req->handle, PROCESS_TERMINATE ))) - { - reply->self = (current->process == process); - terminate_process( process, current, req->exit_code ); - release_object( process ); - } -} - -/* fetch information about a process */ -DECL_HANDLER(get_process_info) -{ - struct process *process; - - if ((process = get_process_from_handle( req->handle, PROCESS_QUERY_INFORMATION ))) - { - reply->pid = get_process_id( process ); - reply->ppid = process->parent ? get_process_id( process->parent ) : 0; - reply->exit_code = process->exit_code; - reply->priority = process->priority; - reply->affinity = process->affinity; - reply->peb = process->peb; - reply->start_time = process->start_time; - reply->end_time = process->end_time; - reply->cpu = process->cpu; - reply->debugger_present = !!process->debugger; - release_object( process ); - } -} - -static void set_process_affinity( struct process *process, affinity_t affinity ) -{ - struct thread *thread; - - process->affinity = affinity; - - LIST_FOR_EACH_ENTRY( thread, &process->thread_list, struct thread, proc_entry ) - { - set_thread_affinity( thread, affinity ); - } -} - -/* set information about a process */ -DECL_HANDLER(set_process_info) -{ - struct process *process; - - if ((process = get_process_from_handle( req->handle, PROCESS_SET_INFORMATION ))) - { - if (req->mask & SET_PROCESS_INFO_PRIORITY) process->priority = req->priority; - if (req->mask & SET_PROCESS_INFO_AFFINITY) set_process_affinity( process, req->affinity ); - release_object( process ); - } -} - -/* read data from a process address space */ -DECL_HANDLER(read_process_memory) -{ - struct process *process; - data_size_t len = get_reply_max_size(); - - if (!(process = get_process_from_handle( req->handle, PROCESS_VM_READ ))) return; - - if (len) - { - char *buffer = mem_alloc( len ); - if (buffer) - { - if (read_process_memory( process, req->addr, len, buffer )) - set_reply_data_ptr( buffer, len ); - else - free( buffer ); - } - } - release_object( process ); -} - -/* write data to a process address space */ -DECL_HANDLER(write_process_memory) -{ - struct process *process; - - if ((process = get_process_from_handle( req->handle, PROCESS_VM_WRITE ))) - { - data_size_t len = get_req_data_size(); - if (len) write_process_memory( process, req->addr, len, get_req_data() ); - else set_error( STATUS_INVALID_PARAMETER ); - release_object( process ); - } -} - -/* notify the server that a dll has been loaded */ -DECL_HANDLER(load_dll) -{ - struct process_dll *dll; - struct file *file = NULL; - - if (req->handle && !(file = get_file_obj( current->process, req->handle, FILE_READ_DATA ))) - return; - - if ((dll = process_load_dll( current->process, file, req->base, - get_req_data(), get_req_data_size() ))) - { - dll->size = req->size; - dll->dbg_offset = req->dbg_offset; - dll->dbg_size = req->dbg_size; - dll->name = req->name; - /* only generate event if initialization is done */ - if (is_process_init_done( current->process )) - generate_debug_event( current, LOAD_DLL_DEBUG_EVENT, dll ); - } - if (file) release_object( file ); -} - -/* notify the server that a dll is being unloaded */ -DECL_HANDLER(unload_dll) -{ - process_unload_dll( current->process, req->base ); -} - -/* retrieve information about a module in a process */ -DECL_HANDLER(get_dll_info) -{ - struct process *process; - - if ((process = get_process_from_handle( req->handle, PROCESS_QUERY_INFORMATION ))) - { - struct process_dll *dll; - - if (req->base_address) - dll = find_process_dll( process, req->base_address ); - else /* NULL means main module */ - dll = list_head( &process->dlls ) ? - LIST_ENTRY(list_head( &process->dlls ), struct process_dll, entry) : NULL; - - if (dll) - { - reply->size = dll->size; - reply->entry_point = 0; /* FIXME */ - reply->filename_len = dll->namelen; - if (dll->filename) - { - if (dll->namelen <= get_reply_max_size()) - set_reply_data( dll->filename, dll->namelen ); - else - set_error( STATUS_BUFFER_TOO_SMALL ); - } - } - else - set_error( STATUS_DLL_NOT_FOUND ); - - release_object( process ); - } -} +#define NDEBUG +#include <debug.h> /* retrieve the process idle event */ DECL_HANDLER(get_process_idle_event) { - struct process *process; + PEPROCESS process_obj; + PPROCESSINFO process; + NTSTATUS status; reply->event = 0; - if ((process = get_process_from_handle( req->handle, PROCESS_QUERY_INFORMATION ))) + + /* Reference the process */ + status = ObReferenceObjectByHandle((HANDLE)req->handle, + PROCESS_QUERY_INFORMATION, + PsProcessType, + KernelMode, + (PVOID*)&process_obj, + NULL); +DPRINT1("status 0x%08X\n", status); + if (NT_SUCCESS(status)) { - if (process->idle_event && process != current->process) - reply->event = alloc_handle( current->process, process->idle_event, - EVENT_ALL_ACCESS, 0 ); - release_object( process ); + process = PsGetProcessWin32Process(process_obj); + + if (process->idle_event && process_obj != PsGetCurrentProcess()) + { + UNIMPLEMENTED; + //reply->event = alloc_handle( PsGetCurrentProcess(), process->idle_event, + // EVENT_ALL_ACCESS, 0 ); + } + ObDereferenceObject( process_obj ); } } - -/* make the current process a system process */ -DECL_HANDLER(make_process_system) -{ - struct process *process = current->process; - - if (!shutdown_event) - { - if (!(shutdown_event = create_event( NULL, NULL, 0, 1, 0, NULL ))) return; - make_object_static( (struct object *)shutdown_event ); - } - - if (!(reply->event = alloc_handle( current->process, shutdown_event, SYNCHRONIZE, 0 ))) - return; - - if (!process->is_system) - { - process->is_system = 1; - close_process_desktop( process ); - if (!--user_processes && !shutdown_stage && master_socket_timeout != TIMEOUT_INFINITE) - shutdown_timeout = add_timeout_user( master_socket_timeout, server_shutdown_timeout, NULL ); - } -}

1 0

[janderwald] 46751: [MSDVBNP] - Register BDA Filter components
by janderwald＠svn.reactos.org 06 Apr '10

06 Apr '10

Author: janderwald Date: Tue Apr 6 17:47:15 2010 New Revision: 46751 URL: http://svn.reactos.org/svn/reactos?rev=46751&view=rev Log: [MSDVBNP] - Register BDA Filter components Modified: trunk/reactos/dll/directx/msdvbnp/msdvbnp.cpp Modified: trunk/reactos/dll/directx/msdvbnp/msdvbnp.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/msdvbnp/msdvbn… ============================================================================== --- trunk/reactos/dll/directx/msdvbnp/msdvbnp.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/directx/msdvbnp/msdvbnp.cpp [iso-8859-1] Tue Apr 6 17:47:15 2010 @@ -86,6 +86,24 @@ return hr; } +VOID +RegisterBDAComponent( + HKEY hFilter, + LPCWSTR ComponentClsid, + LPCWSTR ComponentName) +{ + HKEY hComp; + + // create network provider filter key + if (RegCreateKeyExW(hFilter, ComponentClsid, 0, NULL, 0, KEY_WRITE, NULL, &hComp, NULL) == ERROR_SUCCESS) + { + // store class id + RegSetValueExW(hComp, L"CLSID", 0, REG_SZ, (const BYTE*)ComponentClsid, (wcslen(ComponentClsid)+1) * sizeof(WCHAR)); + RegSetValueExW(hComp, L"FriendlyName", 0, REG_SZ, (const BYTE*)ComponentName, (wcslen(ComponentName)+1) * sizeof(WCHAR)); + RegCloseKey(hComp); + } +} + extern "C" KSDDKAPI HRESULT @@ -95,7 +113,7 @@ ULONG Index = 0; LPOLESTR pStr; HRESULT hr = S_OK; - HKEY hClass, hKey, hSubKey, hProvider, hInstance; + HKEY hClass, hKey, hSubKey, hProvider, hInstance, hFilter; static LPCWSTR ModuleName = L"msdvbnp.ax"; static LPCWSTR ThreadingModel = L"Both"; @@ -124,6 +142,21 @@ return E_FAIL; } RegCloseKey(hProvider); + + /* open active movie filter category key */ + if (RegCreateKeyExW(hClass, L"{da4e3da0-d07d-11d0-bd50-00a0c911ce86}\\Instance", 0, NULL, 0, KEY_WRITE, NULL, &hFilter, NULL) != ERROR_SUCCESS) + { + RegCloseKey(hClass); + RegCloseKey(hInstance); + return E_FAIL; + } + + RegisterBDAComponent(hFilter, L"{71985F4A-1CA1-11d3-9CC8-00C04F7971E0}", L"BDA Playback Filter"); + RegisterBDAComponent(hFilter, L"{71985F4B-1CA1-11D3-9CC8-00C04F7971E0}", L"BDA Network Providerss"); + RegisterBDAComponent(hFilter, L"{71985F48-1CA1-11d3-9CC8-00C04F7971E0}", L"BDA Source Filter"); + RegisterBDAComponent(hFilter, L"{A2E3074F-6C3D-11D3-B653-00C04F79498E}", L"BDA Transport Information Renderers"); + RegisterBDAComponent(hFilter, L"{FD0A5AF4-B41D-11d2-9C95-00C04F7971E0}", L"BDA Receiver Component"); + RegCloseKey(hKey); do { @@ -150,6 +183,9 @@ RegCloseKey(hKey); } + + + CoTaskMemFree(pStr); Index++; }while(InterfaceTable[Index].lpfnCI != 0);

1 0

[janderwald] 46750: [MSDVBNP] - Dynamically register DVB network provider categories
by janderwald＠svn.reactos.org 06 Apr '10

06 Apr '10

Author: janderwald Date: Tue Apr 6 17:08:16 2010 New Revision: 46750 URL: http://svn.reactos.org/svn/reactos?rev=46750&view=rev Log: [MSDVBNP] - Dynamically register DVB network provider categories Modified: trunk/reactos/dll/directx/msdvbnp/msdvbnp.cpp trunk/reactos/dll/directx/msdvbnp/precomp.h Modified: trunk/reactos/dll/directx/msdvbnp/msdvbnp.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/msdvbnp/msdvbn… ============================================================================== --- trunk/reactos/dll/directx/msdvbnp/msdvbnp.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/directx/msdvbnp/msdvbnp.cpp [iso-8859-1] Tue Apr 6 17:08:16 2010 @@ -9,10 +9,14 @@ #include "precomp.h" +#ifndef _MSC_VER +const GUID KSCATEGORY_BDA_NETWORK_PROVIDER = {0x71985f4b, 0x1ca1, 0x11d3, {0x9c, 0xc8, 0x0, 0xc0, 0x4f, 0x79, 0x71, 0xe0}}; +#endif + static INTERFACE_TABLE InterfaceTable[] = { - {&CLSID_DVBTNetworkProvider, CNetworkProvider_fnConstructor}, - {NULL, NULL} + {&CLSID_DVBTNetworkProvider, CNetworkProvider_fnConstructor, L"ReactOS DVBT Network Provider"}, + {NULL, NULL, NULL} }; extern "C" @@ -53,8 +57,19 @@ HRESULT hr = S_OK; HKEY hClass; + + hr = StringFromCLSID(KSCATEGORY_BDA_NETWORK_PROVIDER, &pStr); + if (FAILED(hr)) + return hr; + if (RegOpenKeyExW(HKEY_CLASSES_ROOT, L"CLSID", 0, KEY_SET_VALUE, &hClass) != ERROR_SUCCESS) - return E_FAIL; + { + CoTaskMemFree(pStr); + return E_FAIL; + } + + RegDeleteKeyW(hClass, pStr); + CoTaskMemFree(pStr); do { @@ -80,12 +95,35 @@ ULONG Index = 0; LPOLESTR pStr; HRESULT hr = S_OK; - HKEY hClass, hKey, hSubKey; + HKEY hClass, hKey, hSubKey, hProvider, hInstance; static LPCWSTR ModuleName = L"msdvbnp.ax"; static LPCWSTR ThreadingModel = L"Both"; + hr = StringFromCLSID(KSCATEGORY_BDA_NETWORK_PROVIDER, &pStr); + if (FAILED(hr)) + return hr; + if (RegOpenKeyExW(HKEY_CLASSES_ROOT, L"CLSID", 0, KEY_WRITE, &hClass) != ERROR_SUCCESS) - return E_FAIL; + { + CoTaskMemFree(pStr); + return E_FAIL; + } + + if (RegCreateKeyExW(hClass, pStr, 0, NULL, 0, KEY_WRITE, NULL, &hProvider, NULL) != ERROR_SUCCESS) + { + RegCloseKey(hClass); + CoTaskMemFree(pStr); + return E_FAIL; + } + + CoTaskMemFree(pStr); + + if (RegCreateKeyExW(hProvider, L"Instance", 0, NULL, 0, KEY_WRITE, NULL, &hInstance, NULL) != ERROR_SUCCESS) + { + RegCloseKey(hClass); + return E_FAIL; + } + RegCloseKey(hProvider); do { @@ -104,11 +142,20 @@ RegCloseKey(hKey); } + if (RegCreateKeyExW(hInstance, InterfaceTable[Index].ProviderName, 0, 0, 0, KEY_WRITE, NULL, &hKey, 0) == ERROR_SUCCESS) + { + //FIXME filterdata + RegSetValueExW(hKey, L"FriendlyName", 0, REG_SZ, (const BYTE*)InterfaceTable[Index].ProviderName, (wcslen(InterfaceTable[Index].ProviderName) + 1) * sizeof(WCHAR)); + RegSetValueExW(hKey, L"CLSID", 0, REG_SZ, (const BYTE*)pStr, (wcslen(pStr)+1) * sizeof(WCHAR)); + RegCloseKey(hKey); + } + CoTaskMemFree(pStr); Index++; }while(InterfaceTable[Index].lpfnCI != 0); RegCloseKey(hClass); + RegCloseKey(hInstance); return hr; } Modified: trunk/reactos/dll/directx/msdvbnp/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/msdvbnp/precom… ============================================================================== --- trunk/reactos/dll/directx/msdvbnp/precomp.h [iso-8859-1] (original) +++ trunk/reactos/dll/directx/msdvbnp/precomp.h [iso-8859-1] Tue Apr 6 17:08:16 2010 @@ -28,6 +28,7 @@ { const GUID* riid; LPFNCREATEINSTANCE lpfnCI; + LPCWSTR ProviderName; } INTERFACE_TABLE; /* classfactory.cpp */

1 0

[janderwald] 46749: [KSPROXY] - Implement sending multiple media samples to tv tuner at once in order to avoid the kernel irp queue running out
by janderwald＠svn.reactos.org 06 Apr '10

06 Apr '10

Author: janderwald Date: Tue Apr 6 16:32:35 2010 New Revision: 46749 URL: http://svn.reactos.org/svn/reactos?rev=46749&view=rev Log: [KSPROXY] - Implement sending multiple media samples to tv tuner at once in order to avoid the kernel irp queue running out Modified: trunk/reactos/dll/directx/ksproxy/allocator.cpp trunk/reactos/dll/directx/ksproxy/output_pin.cpp Modified: trunk/reactos/dll/directx/ksproxy/allocator.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ksproxy/alloca… ============================================================================== --- trunk/reactos/dll/directx/ksproxy/allocator.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/directx/ksproxy/allocator.cpp [iso-8859-1] Tue Apr 6 16:32:35 2010 @@ -357,6 +357,7 @@ if (!m_FreeList.empty()) { + OutputDebugStringW(L"CKsAllocator::GetBuffer HACK\n"); Sample = m_FreeList.top(); m_FreeList.pop(); } Modified: trunk/reactos/dll/directx/ksproxy/output_pin.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ksproxy/output… ============================================================================== --- trunk/reactos/dll/directx/ksproxy/output_pin.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/directx/ksproxy/output_pin.cpp [iso-8859-1] Tue Apr 6 16:32:35 2010 @@ -2383,16 +2383,47 @@ IMediaSample *Sample; LONG SampleCount; HRESULT hr; - PKSSTREAM_SEGMENT StreamSegment; + PKSSTREAM_SEGMENT * StreamSegment; HANDLE hEvent; - IMediaSample * Samples[1]; + IMediaSample ** Samples; + LONG NumHandles; + DWORD dwStatus; #ifdef KSPROXY_TRACE WCHAR Buffer[200]; #endif + + NumHandles = m_Properties.cBuffers / 2; + + if (!NumHandles) + NumHandles = 8; + + assert(NumHandles); + + //allocate stream segment array + StreamSegment = (PKSSTREAM_SEGMENT*)CoTaskMemAlloc(sizeof(PKSSTREAM_SEGMENT) * NumHandles); + if (!StreamSegment) + { + OutputDebugStringW(L"COutputPin::IoProcessRoutine out of memory\n"); + return E_FAIL; + } + + // allocate handle array + Samples = (IMediaSample**)CoTaskMemAlloc(sizeof(IMediaSample*) * NumHandles); + if (!Samples) + { + OutputDebugStringW(L"COutputPin::IoProcessRoutine out of memory\n"); + return E_FAIL; + } + + // zero handles array + ZeroMemory(StreamSegment, sizeof(PKSSTREAM_SEGMENT) * NumHandles); + ZeroMemory(Samples, sizeof(IMediaSample*) * NumHandles); // first wait for the start event to signal WaitForSingleObject(m_hStartEvent, INFINITE); + + m_IoCount = 0; assert(m_InterfaceHandler); do @@ -2418,14 +2449,14 @@ // fill buffer SampleCount = 1; - Samples[0] = Sample; + Samples[m_IoCount] = Sample; Sample->SetTime(NULL, NULL); hr = m_InterfaceHandler->KsProcessMediaSamples(NULL, /* FIXME */ - Samples, + &Samples[m_IoCount], &SampleCount, KsIoOperation_Read, - &StreamSegment); + &StreamSegment[m_IoCount]); if (FAILED(hr) || !StreamSegment) { #ifdef KSPROXY_TRACE @@ -2435,14 +2466,26 @@ break; } - // get completion event - hEvent = StreamSegment->CompletionEvent; + // interface handle should increment pending i/o count + assert(m_IoCount >= 1); + + swprintf(Buffer, L"COutputPin::IoProcessRoutine m_IoCount %lu NumHandles %lu\n", m_IoCount, NumHandles); + OutputDebugStringW(Buffer); + + if (m_IoCount != NumHandles) + continue; + + // get completion handle + hEvent = StreamSegment[0]->CompletionEvent; // wait for i/o completion - WaitForSingleObject(hEvent, INFINITE); + dwStatus = WaitForSingleObject(hEvent, INFINITE); + + swprintf(Buffer, L"COutputPin::IoProcessRoutine dwStatus %lx Error %lx NumHandles %lu\n", dwStatus, GetLastError(), NumHandles); + OutputDebugStringW(Buffer); // perform completion - m_InterfaceHandler->KsCompleteIo(StreamSegment); + m_InterfaceHandler->KsCompleteIo(StreamSegment[0]); // close completion event CloseHandle(hEvent); @@ -2452,7 +2495,7 @@ assert(m_MemInputPin); // now deliver the sample - hr = m_MemInputPin->Receive(Sample); + hr = m_MemInputPin->Receive(Samples[0]); #ifdef KSPROXY_TRACE swprintf(Buffer, L"COutputPin::IoProcessRoutine PinName %s IMemInputPin::Receive hr %lx Sample %p m_MemAllocator %p\n", m_PinName, hr, Sample, m_MemAllocator); @@ -2464,6 +2507,11 @@ Sample = NULL; } + + //circular stream segment array + RtlMoveMemory(StreamSegment, &StreamSegment[1], sizeof(PKSSTREAM_SEGMENT) * (NumHandles - 1)); + RtlMoveMemory(Samples, &Samples[1], sizeof(IMediaSample*) * (NumHandles - 1)); + }while(TRUE); // signal end of i/o thread

1 0

[janderwald] 46748: [NTOS] - Device interface strings are null terminated
by janderwald＠svn.reactos.org 06 Apr '10

06 Apr '10

Author: janderwald Date: Tue Apr 6 16:00:02 2010 New Revision: 46748 URL: http://svn.reactos.org/svn/reactos?rev=46748&view=rev Log: [NTOS] - Device interface strings are null terminated Modified: trunk/reactos/ntoskrnl/io/iomgr/deviface.c Modified: trunk/reactos/ntoskrnl/io/iomgr/deviface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/deviface… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/deviface.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/deviface.c [iso-8859-1] Tue Apr 6 16:00:02 2010 @@ -661,12 +661,6 @@ DPRINT("RtlAppendUnicodeStringToString() failed with status 0x%08lx\n", Status); goto cleanup; } - /* RtlAppendUnicodeStringToString added a NULL at the end of the - * destination string, but didn't increase the Length field. - * Do it for it. - */ - ReturnBuffer.Length += sizeof(WCHAR); - NextReferenceString: ExFreePool(ReferenceBi); ReferenceBi = NULL;

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs