Ros-diffs

ros-diffs@reactos.org

81390 discussions

[fireball] 42040: - Similarly port other needed components to kernelmode.
by fireball＠svn.reactos.org 18 Jul '09

18 Jul '09

Author: fireball Date: Sat Jul 18 14:33:44 2009 New Revision: 42040 URL: http://svn.reactos.org/svn/reactos?rev=42040&view=rev Log: - Similarly port other needed components to kernelmode. Modified: branches/arwinss/reactos/subsystems/win32/win32k/wine/directory.c branches/arwinss/reactos/subsystems/win32/win32k/wine/handle.c branches/arwinss/reactos/subsystems/win32/win32k/wine/hook.c branches/arwinss/reactos/subsystems/win32/win32k/wine/object.c branches/arwinss/reactos/subsystems/win32/win32k/wine/queue.c branches/arwinss/reactos/subsystems/win32/win32k/wine/region.c branches/arwinss/reactos/subsystems/win32/win32k/wine/stubs.c branches/arwinss/reactos/subsystems/win32/win32k/wine/user.c branches/arwinss/reactos/subsystems/win32/win32k/wine/window.c branches/arwinss/reactos/subsystems/win32/win32k/wine/winstation.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/arwinss/reactos/subsystems/win32/win32k/wine/directory.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… Modified: branches/arwinss/reactos/subsystems/win32/win32k/wine/handle.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… Modified: branches/arwinss/reactos/subsystems/win32/win32k/wine/hook.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… Modified: branches/arwinss/reactos/subsystems/win32/win32k/wine/object.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… Modified: branches/arwinss/reactos/subsystems/win32/win32k/wine/queue.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… Modified: branches/arwinss/reactos/subsystems/win32/win32k/wine/region.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… Modified: branches/arwinss/reactos/subsystems/win32/win32k/wine/stubs.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… Modified: branches/arwinss/reactos/subsystems/win32/win32k/wine/user.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… Modified: branches/arwinss/reactos/subsystems/win32/win32k/wine/window.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… Modified: branches/arwinss/reactos/subsystems/win32/win32k/wine/winstation.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3…

1 0

[fireball] 42039: - Fix include headers. - Change memory allocations to pool allocations. - Reference/dereference process and thread objects using NT's object manager. - Disable current process check in set_class_info request, a "Fixme!" debug print for reminding.
by fireball＠svn.reactos.org 18 Jul '09

18 Jul '09

Author: fireball Date: Sat Jul 18 13:53:20 2009 New Revision: 42039 URL: http://svn.reactos.org/svn/reactos?rev=42039&view=rev Log: - Fix include headers. - Change memory allocations to pool allocations. - Reference/dereference process and thread objects using NT's object manager. - Disable current process check in set_class_info request, a "Fixme!" debug print for reminding. Modified: branches/arwinss/reactos/subsystems/win32/win32k/wine/class.c Modified: branches/arwinss/reactos/subsystems/win32/win32k/wine/class.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/wine/class.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/wine/class.c [iso-8859-1] Sat Jul 18 13:53:20 2009 @@ -19,30 +19,32 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" - -#include <assert.h> -#include <stdlib.h> -#include <stdio.h> -#include <string.h> - -#include "ntstatus.h" -#define WIN32_NO_STATUS - -#include "wine/list.h" - +#include <win32k.h> + +#include <limits.h> + +#undef LIST_FOR_EACH +#undef LIST_FOR_EACH_SAFE +#include "object.h" #include "request.h" -#include "object.h" -#include "process.h" #include "user.h" -#include "winuser.h" -#include "winternl.h" + +#define NDEBUG +#include <debug.h> + +#undef LIST_FOR_EACH +/* iterate through the list using a list entry. + * elem is set to NULL if the list is run thru without breaking out or if list is empty. + */ +#define LIST_FOR_EACH(elem, list, type, field) \ + for ((elem) = CONTAINING_RECORD((list)->Flink, type, field); \ + &(elem)->field != (list) || (elem == NULL); \ + (elem) = CONTAINING_RECORD((elem)->field.Flink, type, field)) struct window_class { - struct list entry; /* entry in process list */ - struct process *process; /* process owning the class */ + LIST_ENTRY entry; /* entry in process list */ + PPROCESSINFO process; /* process owning the class */ int count; /* reference count */ int local; /* local class? */ atom_t atom; /* class atom */ @@ -54,13 +56,13 @@ char extra_bytes[1]; /* extra bytes storage */ }; -static struct window_class *create_class( struct process *process, int extra_bytes, int local ) +static struct window_class *create_class( PPROCESSINFO process, int extra_bytes, int local ) { struct window_class *class; if (!(class = mem_alloc( sizeof(*class) + extra_bytes - 1 ))) return NULL; - - class->process = (struct process *)grab_object( process ); + ObReferenceObjectByPointer(process->peProcess, 0, NULL, KernelMode); + class->process = process; class->count = 0; class->local = local; class->nb_extra_bytes = extra_bytes; @@ -68,43 +70,43 @@ /* other fields are initialized by caller */ /* local classes have priority so we put them first in the list */ - if (local) list_add_head( &process->classes, &class->entry ); - else list_add_tail( &process->classes, &class->entry ); + if (local) InsertHeadList( &process->Classes, &class->entry ); + else InsertTailList( &process->Classes, &class->entry ); return class; } static void destroy_class( struct window_class *class ) { - list_remove( &class->entry ); - release_object( class->process ); - free( class ); -} - -void destroy_process_classes( struct process *process ) -{ - struct list *ptr; - - while ((ptr = list_head( &process->classes ))) - { - struct window_class *class = LIST_ENTRY( ptr, struct window_class, entry ); + RemoveEntryList( &class->entry ); + ObDereferenceObject( class->process->peProcess ); + ExFreePool( class ); +} + +void destroy_process_classes( PPROCESSINFO process ) +{ + PLIST_ENTRY ptr; + + while (( ptr = process->Classes.Flink )) + { + struct window_class *class = CONTAINING_RECORD( ptr, struct window_class, entry ); destroy_class( class ); } } -static struct window_class *find_class( struct process *process, atom_t atom, mod_handle_t instance ) -{ - struct list *ptr; - - LIST_FOR_EACH( ptr, &process->classes ) - { - struct window_class *class = LIST_ENTRY( ptr, struct window_class, entry ); +static struct window_class *find_class( PPROCESSINFO process, atom_t atom, mod_handle_t instance ) +{ + struct window_class *class; + + LIST_FOR_EACH( class, &process->Classes, struct window_class, entry) + { + //struct window_class *class = CONTAINING_RECORD( ptr, struct window_class, entry ); if (class->atom != atom) continue; if (!instance || !class->local || class->instance == instance) return class; } return NULL; } -struct window_class *grab_class( struct process *process, atom_t atom, +struct window_class *grab_class( PPROCESSINFO process, atom_t atom, mod_handle_t instance, int *extra_bytes ) { struct window_class *class = find_class( process, atom, instance ); @@ -153,7 +155,7 @@ struct unicode_str name; atom_t atom; - get_req_unicode_str( &name ); + get_req_unicode_str( (void *)req, &name ); if (name.len) { atom = add_global_atom( NULL, &name ); @@ -165,7 +167,7 @@ if (!grab_global_atom( NULL, atom )) return; } - class = find_class( current->process, atom, req->instance ); + class = find_class( (PPROCESSINFO)PsGetCurrentProcessWin32Process(), atom, req->instance ); if (class && !class->local == !req->local) { set_win32_error( ERROR_CLASS_ALREADY_EXISTS ); @@ -180,7 +182,7 @@ return; } - if (!(class = create_class( current->process, req->extra, req->local ))) + if (!(class = create_class( (PPROCESSINFO)PsGetCurrentProcessWin32Process(), req->extra, req->local ))) { release_global_atom( NULL, atom ); return; @@ -200,10 +202,10 @@ struct unicode_str name; atom_t atom = req->atom; - get_req_unicode_str( &name ); + get_req_unicode_str( (void *)req, &name ); if (name.len) atom = find_global_atom( NULL, &name ); - if (!(class = find_class( current->process, atom, req->instance ))) + if (!(class = find_class( (PPROCESSINFO)PsGetCurrentProcessWin32Process(), atom, req->instance ))) set_win32_error( ERROR_CLASS_DOES_NOT_EXIST ); else if (class->count) set_win32_error( ERROR_CLASS_HAS_WINDOWS ); @@ -221,13 +223,14 @@ struct window_class *class = get_window_class( req->window ); if (!class) return; - - if (req->flags && class->process != current->process) +DPRINT1("Fixme!\n"); +#if 0 + if (req->flags && class->process != PsGetCurrentProcessWin32Process()) { set_error( STATUS_ACCESS_DENIED ); return; } - +#endif if (req->extra_size > sizeof(req->extra_value) || req->extra_offset < -1 || req->extra_offset > class->nb_extra_bytes - (int)req->extra_size)

1 0

[fireball] 42038: - Fix include headers. - Change memory allocations to pool allocations.
by fireball＠svn.reactos.org 18 Jul '09

18 Jul '09

Author: fireball Date: Sat Jul 18 13:50:12 2009 New Revision: 42038 URL: http://svn.reactos.org/svn/reactos?rev=42038&view=rev Log: - Fix include headers. - Change memory allocations to pool allocations. Modified: branches/arwinss/reactos/subsystems/win32/win32k/wine/atom.c Modified: branches/arwinss/reactos/subsystems/win32/win32k/wine/atom.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/wine/atom.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/wine/atom.c [iso-8859-1] Sat Jul 18 13:50:12 2009 @@ -19,25 +19,19 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" - -#include <assert.h> -#include <stdlib.h> -#include <stdio.h> -#include <string.h> - -#include "ntstatus.h" -#define WIN32_NO_STATUS - -#include "unicode.h" +#include <win32k.h> + +#include <limits.h> + +#undef LIST_FOR_EACH +#undef LIST_FOR_EACH_SAFE +#include "object.h" #include "request.h" -#include "object.h" -#include "process.h" #include "handle.h" #include "user.h" -#include "winuser.h" -#include "winternl.h" + +#define NDEBUG +#include <debug.h> #define HASH_SIZE 37 #define MIN_HASH_SIZE 4 @@ -104,7 +98,7 @@ if ((entries_count < MIN_HASH_SIZE) || (entries_count > MAX_HASH_SIZE)) entries_count = HASH_SIZE; table->entries_count = entries_count; - if (!(table->entries = malloc( sizeof(*table->entries) * table->entries_count ))) + if (!(table->entries = ExAllocatePool( PagedPool, sizeof(*table->entries) * table->entries_count ))) { set_error( STATUS_NO_MEMORY ); goto fail; @@ -143,7 +137,12 @@ int new_size = table->count + table->count / 2; if (new_size > MAX_ATOMS) new_size = MAX_ATOMS; if (new_size > table->count) - new_table = realloc( table->handles, sizeof(*table->handles) * new_size ); + { + //new_table = ExAllocatePool(PagedPool, sizeof(*table->handles) * new_size); + //RtlCopyMemory(new_table, table, sizeof(*table->handles)); + //new_table = realloc( table->handles, sizeof(*table->handles) * new_size ); + UNIMPLEMENTED; + } if (!new_table) { set_error( STATUS_NO_MEMORY ); @@ -171,6 +170,7 @@ /* dump an atom table */ static void atom_table_dump( struct object *obj, int verbose ) { +#if 0 int i; struct atom_table *table = (struct atom_table *)obj; assert( obj->ops == &atom_table_ops ); @@ -187,6 +187,7 @@ dump_strW( entry->str, entry->len / sizeof(WCHAR), stderr, "\"\""); fprintf( stderr, "\"\n" ); } +#endif } /* destroy the atom table */ @@ -197,10 +198,10 @@ assert( obj->ops == &atom_table_ops ); if (table->handles) { - for (i = 0; i <= table->last; i++) free( table->handles[i] ); - free( table->handles ); - } - free( table->entries ); + for (i = 0; i <= table->last; i++) ExFreePool( table->handles[i] ); + ExFreePool( table->handles ); + } + ExFreePool( table->entries ); } /* find an atom entry in its hash list */ @@ -252,7 +253,7 @@ entry->len = str->len; memcpy( entry->str, str->str, str->len ); } - else free( entry ); + else ExFreePool( entry ); } else set_error( STATUS_NO_MEMORY ); return atom; @@ -270,7 +271,7 @@ if (entry->prev) entry->prev->next = entry->next; else table->entries[entry->hash] = entry->next; table->handles[atom - MIN_STR_ATOM] = NULL; - free( entry ); + ExFreePool( entry ); } } @@ -321,7 +322,7 @@ if (h) { - table = (struct atom_table *)get_handle_obj( current->process, h, 0, &atom_table_ops ); + table = (struct atom_table *)get_handle_obj( (PPROCESSINFO)PsGetCurrentProcessWin32Process(), h, 0, &atom_table_ops ); } else { @@ -386,7 +387,7 @@ if (table) { - get_req_unicode_str( &name ); + get_req_unicode_str( (void *)req, &name ); reply->atom = add_atom( table, &name ); release_object( table ); } @@ -411,13 +412,14 @@ if (table) { - get_req_unicode_str( &name ); + get_req_unicode_str( (void *)req, &name ); reply->atom = find_atom( table, &name ); release_object( table ); } } /* get global atom name */ +#if 0 DECL_HANDLER(get_atom_information) { struct atom_table *table = get_table( req->table, 0 ); @@ -427,7 +429,7 @@ if ((entry = get_atom_entry( table, req->atom ))) { - set_reply_data( entry->str, min( entry->len, get_reply_max_size() )); + set_reply_data( (void*)req, entry->str, min( entry->len, get_reply_max_size((void*)req) )); reply->count = entry->count; reply->pinned = entry->pinned; reply->total = entry->len; @@ -436,7 +438,7 @@ release_object( table ); } } - +#endif /* set global atom name */ DECL_HANDLER(set_atom_information) { @@ -460,7 +462,7 @@ if (table) { - reply->table = alloc_handle( current->process, table, 0, 0 ); + reply->table = alloc_handle( (PPROCESSINFO)PsGetCurrentProcessWin32Process(), table, 0, 0 ); release_object( table ); } } @@ -483,7 +485,7 @@ if (entry->prev) entry->prev->next = entry->next; else table->entries[entry->hash] = entry->next; table->handles[i] = NULL; - free( entry ); + ExFreePool( entry ); } } release_object( table );

1 0

[fireball] 42037: - One leftover header, copying from wineserver.
by fireball＠svn.reactos.org 18 Jul '09

18 Jul '09

Author: fireball Date: Sat Jul 18 13:48:23 2009 New Revision: 42037 URL: http://svn.reactos.org/svn/reactos?rev=42037&view=rev Log: - One leftover header, copying from wineserver. Added: branches/arwinss/reactos/subsystems/win32/win32k/include/object.h - copied unchanged from r41998, vendor/wine/server/current/object.h

1 0

[fireball] 42036: - Rename "gre" to "main" since it better describes the contents.
by fireball＠svn.reactos.org 18 Jul '09

18 Jul '09

Author: fireball Date: Sat Jul 18 13:47:01 2009 New Revision: 42036 URL: http://svn.reactos.org/svn/reactos?rev=42036&view=rev Log: - Rename "gre" to "main" since it better describes the contents. Added: branches/arwinss/reactos/subsystems/win32/win32k/main/ - copied from r42035, branches/arwinss/reactos/subsystems/win32/win32k/gre/ Removed: branches/arwinss/reactos/subsystems/win32/win32k/gre/ Modified: branches/arwinss/reactos/subsystems/win32/win32k/win32k.rbuild 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] Sat Jul 18 13:47:01 2009 @@ -16,7 +16,7 @@ <directory name="include"> <pch>win32k.h</pch> </directory> - <directory name="gre"> + <directory name="main"> <file>err.c</file> <file>init.c</file> <file>usrheap.c</file>

1 0

[fireball] 42035: - Add X11 headers.
by fireball＠svn.reactos.org 18 Jul '09

18 Jul '09

Author: fireball Date: Sat Jul 18 13:40:18 2009 New Revision: 42035 URL: http://svn.reactos.org/svn/reactos?rev=42035&view=rev Log: - Add X11 headers. Added: branches/arwinss/reactos/include/reactos/X11/ (with props) branches/arwinss/reactos/include/reactos/X11/X.h (with props) branches/arwinss/reactos/include/reactos/X11/Xatom.h (with props) branches/arwinss/reactos/include/reactos/X11/Xfuncproto.h (with props) branches/arwinss/reactos/include/reactos/X11/Xlib.h (with props) branches/arwinss/reactos/include/reactos/X11/Xmd.h (with props) branches/arwinss/reactos/include/reactos/X11/Xosdefs.h (with props) branches/arwinss/reactos/include/reactos/X11/Xproto.h (with props) branches/arwinss/reactos/include/reactos/X11/Xprotostr.h (with props) branches/arwinss/reactos/include/reactos/X11/Xresource.h (with props) branches/arwinss/reactos/include/reactos/X11/Xutil.h (with props) branches/arwinss/reactos/include/reactos/X11/cursorfont.h (with props) branches/arwinss/reactos/include/reactos/X11/keysym.h (with props) branches/arwinss/reactos/include/reactos/X11/keysymdef.h (with props) [This mail would be too long, it was shortened to contain the URLs only.] Added: branches/arwinss/reactos/include/reactos/X11/X.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/reactos… Added: branches/arwinss/reactos/include/reactos/X11/Xatom.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/reactos… Added: branches/arwinss/reactos/include/reactos/X11/Xfuncproto.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/reactos… Added: branches/arwinss/reactos/include/reactos/X11/Xlib.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/reactos… Added: branches/arwinss/reactos/include/reactos/X11/Xmd.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/reactos… Added: branches/arwinss/reactos/include/reactos/X11/Xosdefs.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/reactos… Added: branches/arwinss/reactos/include/reactos/X11/Xproto.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/reactos… Added: branches/arwinss/reactos/include/reactos/X11/Xprotostr.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/reactos… Added: branches/arwinss/reactos/include/reactos/X11/Xresource.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/reactos… Added: branches/arwinss/reactos/include/reactos/X11/Xutil.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/reactos… Added: branches/arwinss/reactos/include/reactos/X11/cursorfont.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/reactos… Added: branches/arwinss/reactos/include/reactos/X11/keysym.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/reactos… Added: branches/arwinss/reactos/include/reactos/X11/keysymdef.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/reactos…

1 0

[fireball] 42034: - Import the following from a wineserver: * Wine's object manager * Window classes support * Atoms support * Handles support * Windows stations * Object directory * Windows support * Region implementation * Queue and user functions
by fireball＠svn.reactos.org 18 Jul '09

18 Jul '09

Author: fireball Date: Sat Jul 18 11:46:29 2009 New Revision: 42034 URL: http://svn.reactos.org/svn/reactos?rev=42034&view=rev Log: - Import the following from a wineserver: * Wine's object manager * Window classes support * Atoms support * Handles support * Windows stations * Object directory * Windows support * Region implementation * Queue and user functions Added: branches/arwinss/reactos/subsystems/win32/win32k/wine/atom.c - copied unchanged from r41998, vendor/wine/server/current/atom.c branches/arwinss/reactos/subsystems/win32/win32k/wine/class.c - copied unchanged from r41998, vendor/wine/server/current/class.c branches/arwinss/reactos/subsystems/win32/win32k/wine/directory.c - copied unchanged from r41998, vendor/wine/server/current/directory.c branches/arwinss/reactos/subsystems/win32/win32k/wine/handle.c - copied unchanged from r41998, vendor/wine/server/current/handle.c branches/arwinss/reactos/subsystems/win32/win32k/wine/hook.c - copied unchanged from r41998, vendor/wine/server/current/hook.c branches/arwinss/reactos/subsystems/win32/win32k/wine/object.c - copied unchanged from r41998, vendor/wine/server/current/object.c branches/arwinss/reactos/subsystems/win32/win32k/wine/queue.c - copied unchanged from r41998, vendor/wine/server/current/queue.c branches/arwinss/reactos/subsystems/win32/win32k/wine/region.c - copied unchanged from r41998, vendor/wine/server/current/region.c branches/arwinss/reactos/subsystems/win32/win32k/wine/user.c - copied unchanged from r41998, vendor/wine/server/current/user.c branches/arwinss/reactos/subsystems/win32/win32k/wine/window.c - copied unchanged from r41998, vendor/wine/server/current/window.c branches/arwinss/reactos/subsystems/win32/win32k/wine/winstation.c - copied unchanged from r41998, vendor/wine/server/current/winstation.c

1 0

[fireball] 42033: - Bring in two more headers from wineserver.
by fireball＠svn.reactos.org 18 Jul '09

18 Jul '09

Author: fireball Date: Sat Jul 18 11:41:02 2009 New Revision: 42033 URL: http://svn.reactos.org/svn/reactos?rev=42033&view=rev Log: - Bring in two more headers from wineserver. Added: branches/arwinss/reactos/subsystems/win32/win32k/include/handle.h - copied unchanged from r41998, vendor/wine/server/current/handle.h branches/arwinss/reactos/subsystems/win32/win32k/include/user.h - copied unchanged from r41998, vendor/wine/server/current/user.h

1 0

[fireball] 42032: - Fix Wine-server interface to allow data transfer, first version.
by fireball＠svn.reactos.org 18 Jul '09

18 Jul '09

Author: fireball Date: Sat Jul 18 11:39:24 2009 New Revision: 42032 URL: http://svn.reactos.org/svn/reactos?rev=42032&view=rev Log: - Fix Wine-server interface to allow data transfer, first version. Modified: branches/arwinss/reactos/subsystems/win32/win32k/gre/init.c branches/arwinss/reactos/subsystems/win32/win32k/include/request.h branches/arwinss/reactos/subsystems/win32/win32k/include/win32.h branches/arwinss/reactos/subsystems/win32/win32k/include/winesup.h branches/arwinss/reactos/subsystems/win32/win32k/wine/main.c branches/arwinss/reactos/subsystems/win32/win32k/wine/winesup.c Modified: branches/arwinss/reactos/subsystems/win32/win32k/gre/init.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/gre/init.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/gre/init.c [iso-8859-1] Sat Jul 18 11:39:24 2009 @@ -82,6 +82,7 @@ Win32Process->HeapMappings.KernelMapping = (PVOID)GlobalUserHeap; Win32Process->HeapMappings.UserMapping = UserBase; Win32Process->HeapMappings.Count = 1; + InitializeListHead(&Win32Process->Classes); } else { Modified: branches/arwinss/reactos/subsystems/win32/win32k/include/request.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/include/request.h [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/include/request.h [iso-8859-1] Sat Jul 18 11:39:24 2009 @@ -27,6 +27,20 @@ /* request handler definition */ #define DECL_HANDLER(name) \ void req_##name( const struct name##_request *req, struct name##_reply *reply ) + +/* get the request vararg size */ +static inline data_size_t get_req_data_size(struct __server_request_info *req) +{ + return req->u.req.request_header.request_size; +} + +/* get the request vararg as unicode string */ +static inline void get_req_unicode_str( void *req, struct unicode_str *str ) +{ + struct __server_request_info *serv_req = (struct __server_request_info *)req; + str->str = serv_req->data[0].ptr; + str->len = (get_req_data_size(serv_req) / sizeof(WCHAR)) * sizeof(WCHAR); +} /* Everything below this line is generated automatically by tools/make_requests */ /* ### make_requests begin ### */ 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] Sat Jul 18 11:39:24 2009 @@ -28,8 +28,9 @@ typedef struct _PROCESSINFO { - PEPROCESS peProcess; + PEPROCESS peProcess; W32HEAP_USER_MAPPING HeapMappings; + LIST_ENTRY Classes; /* window classes owned by the process */ } PROCESSINFO, *PPROCESSINFO; #endif /* __INCLUDE_NAPI_WIN32_H */ Modified: branches/arwinss/reactos/subsystems/win32/win32k/include/winesup.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/include/winesup.h [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/include/winesup.h [iso-8859-1] Sat Jul 18 11:39:24 2009 @@ -14,9 +14,11 @@ #define assert ASSERT #define tolowerW(n) towlower((n)) #define strncmpiW(s1,s2,n) _wcsnicmp((const wchar_t *)(s1),(const wchar_t *)(s2),(n)) +#define set_win32_error(x) SetLastWin32Error(x) void set_error( unsigned int err ); static inline void clear_error(void) { set_error(0); } +struct window_class* get_window_class( user_handle_t window ); /* gets the discretionary access control list from a security descriptor */ static inline const ACL *sd_get_dacl( const struct security_descriptor *sd, int *present ) @@ -63,4 +65,7 @@ int dump_strW( const WCHAR *str, data_size_t len, FILE *f, const char escape[2] ); const SID *token_get_user( void *token ); +// misc stuff, should be moved elsewhere +#define DESKTOP_ATOM ((atom_t)32769) + #endif Modified: branches/arwinss/reactos/subsystems/win32/win32k/wine/main.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/wine/main.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/wine/main.c [iso-8859-1] Sat Jul 18 11:39:24 2009 @@ -9,6 +9,10 @@ /* INCLUDES ******************************************************************/ #include <win32k.h> + +#undef LIST_FOR_EACH +#undef LIST_FOR_EACH_SAFE +#include "object.h" #define WANT_REQUEST_HANDLERS #include "request.h" 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] Sat Jul 18 11:39:24 2009 @@ -24,4 +24,9 @@ return NULL; } +struct window_class* get_window_class( user_handle_t window ) +{ + return NULL; +} + /* EOF */

1 0

[fireball] 42031: - Add win32 thread infrastructure. - Cleanup win32 process/thread info structures.
by fireball＠svn.reactos.org 18 Jul '09

18 Jul '09

Author: fireball Date: Sat Jul 18 11:35:40 2009 New Revision: 42031 URL: http://svn.reactos.org/svn/reactos?rev=42031&view=rev Log: - Add win32 thread infrastructure. - Cleanup win32 process/thread info structures. Modified: branches/arwinss/reactos/subsystems/win32/win32k/gre/init.c branches/arwinss/reactos/subsystems/win32/win32k/gre/usrheap.c branches/arwinss/reactos/subsystems/win32/win32k/include/heap.h branches/arwinss/reactos/subsystems/win32/win32k/include/win32.h Modified: branches/arwinss/reactos/subsystems/win32/win32k/gre/init.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/gre/init.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/gre/init.c [iso-8859-1] Sat Jul 18 11:35:40 2009 @@ -28,7 +28,7 @@ Win32kProcessCallout(PEPROCESS Process, BOOLEAN Create) { - PW32PROCESS Win32Process; + PPROCESSINFO Win32Process; DPRINT("Enter Win32kProcessCallback\n"); @@ -82,23 +82,6 @@ Win32Process->HeapMappings.KernelMapping = (PVOID)GlobalUserHeap; Win32Process->HeapMappings.UserMapping = UserBase; Win32Process->HeapMappings.Count = 1; - - InitializeListHead(&Win32Process->ClassList); - InitializeListHead(&Win32Process->MenuListHead); - InitializeListHead(&Win32Process->PrivateFontListHead); - ExInitializeFastMutex(&Win32Process->PrivateFontListLock); - InitializeListHead(&Win32Process->DriverObjListHead); - ExInitializeFastMutex(&Win32Process->DriverObjListLock); - - if(Process->Peb != NULL) - { - /* map the gdi handle table to user land */ - //Process->Peb->GdiSharedHandleTable = GDI_MapHandleTable(GdiTableSection, Process); - //Process->Peb->GdiDCAttributeList = GDI_BATCH_LIMIT; - } - - /* setup process flags */ - Win32Process->W32PF_flags = 0; } else { @@ -114,7 +97,61 @@ Win32kThreadCallout(PETHREAD Thread, PSW32THREADCALLOUTTYPE Type) { - UNIMPLEMENTED; + struct _EPROCESS *Process; + PTHREADINFO Win32Thread; + + DPRINT("Enter Win32kThreadCallback\n"); + + Process = Thread->ThreadsProcess; + + /* Get the Win32 Thread */ + Win32Thread = PsGetThreadWin32Thread(Thread); + + /* Allocate one if needed */ + if (!Win32Thread) + { + /* FIXME - lock the process */ + Win32Thread = ExAllocatePoolWithTag(NonPagedPool, + sizeof(THREADINFO), + TAG('W', '3', '2', 't')); + + if (!Win32Thread) + return STATUS_NO_MEMORY; + + RtlZeroMemory(Win32Thread, sizeof(THREADINFO)); + + PsSetThreadWin32Thread(Thread, Win32Thread); + /* FIXME - unlock the process */ + } + if (Type == PsW32ThreadCalloutInitialize) + { + //PTEB pTeb; + + DPRINT("Creating W32 thread TID:%d at IRQ level: %lu\n", Thread->Cid.UniqueThread, KeGetCurrentIrql()); + + Win32Thread->ppi = PsGetCurrentProcessWin32Process(); + /*pTeb = NtCurrentTeb(); + if (pTeb) + { + Win32Thread->pClientInfo = (PCLIENTINFO)pTeb->Win32ClientInfo; + Win32Thread->pClientInfo->pClientThreadInfo = NULL; + }*/ + } + else + { + DPRINT("Destroying W32 thread TID:%d at IRQ level: %lu\n", Thread->Cid.UniqueThread, KeGetCurrentIrql()); + + /*if (Win32Thread->ThreadInfo != NULL) + { + UserHeapFree(Win32Thread->ThreadInfo); + Win32Thread->ThreadInfo = NULL; + }*/ + + PsSetThreadWin32Thread(Thread, NULL); + } + + DPRINT("Leave Win32kThreadCallback\n"); + return STATUS_SUCCESS; } Modified: branches/arwinss/reactos/subsystems/win32/win32k/gre/usrheap.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/gre/usrheap.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/gre/usrheap.c [iso-8859-1] Sat Jul 18 11:35:40 2009 @@ -28,13 +28,13 @@ IN OUT PVOID *CommitAddress, IN OUT PSIZE_T CommitSize) { - PW32PROCESS W32Process; + PPROCESSINFO W32Process; PW32HEAP_USER_MAPPING Mapping; PVOID UserBase = NULL; NTSTATUS Status; SIZE_T Delta = (SIZE_T)((ULONG_PTR)(*CommitAddress) - (ULONG_PTR)Base); - W32Process = PsGetCurrentProcessWin32Process(); + W32Process = (PPROCESSINFO)PsGetCurrentProcessWin32Process(); if (W32Process != NULL) { Modified: branches/arwinss/reactos/subsystems/win32/win32k/include/heap.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/include/heap.h [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/include/heap.h [iso-8859-1] Sat Jul 18 11:35:40 2009 @@ -77,7 +77,7 @@ static __inline PVOID UserHeapAddressToUser(PVOID lpMem) { - PW32PROCESS W32Process = PsGetCurrentProcessWin32Process(); + PPROCESSINFO W32Process = (PPROCESSINFO)PsGetCurrentProcessWin32Process(); return (PVOID)(((ULONG_PTR)lpMem - (ULONG_PTR)GlobalUserHeap) + (ULONG_PTR)W32Process->HeapMappings.UserMapping); } 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] Sat Jul 18 11:35:40 2009 @@ -4,54 +4,15 @@ typedef struct _WIN32HEAP WIN32HEAP, *PWIN32HEAP; #include <pshpack1.h> -// FIXME! Move to ntuser.h -typedef struct _TL -{ - struct _TL* next; - PVOID pobj; - PVOID pfnFree; -} TL, *PTL; - typedef struct _W32THREAD { PETHREAD pEThread; - ULONG RefCount; - PTL ptlW32; - PVOID pgdiDcattr; - PVOID pgdiBrushAttr; - PVOID pUMPDObjs; - PVOID pUMPDHeap; - DWORD dwEngAcquireCount; - PVOID pSemTable; - PVOID pUMPDObj; } W32THREAD, *PW32THREAD; typedef struct _THREADINFO { W32THREAD W32Thread; - PTL ptl; PVOID ppi; // FIXME: use PPROCESSINFO - struct _USER_MESSAGE_QUEUE* MessageQueue; - struct _KBL* KeyboardLayout; - PCLIENTTHREADINFO pcti; - struct _DESKTOP* Desktop; - //PDESKTOPINFO pDeskInfo; - //PCLIENTINFO pClientInfo; - FLONG TIF_flags; - LONG timeLast; - HANDLE hDesktop; - UINT cPaintsReady; /* Count of paints pending. */ - UINT cTimersReady; /* Count of timers pending. */ - ULONG fsHooks; - LIST_ENTRY PtiLink; - - CLIENTTHREADINFO cti; // Used only when no Desktop or pcti NULL. - - LIST_ENTRY WindowListHead; - LIST_ENTRY W32CallbackListHead; - BOOLEAN IsExiting; - SINGLE_LIST_ENTRY ReferencesList; - PW32THREADINFO ThreadInfo; } THREADINFO, *PTHREADINFO; #include <poppack.h> @@ -65,45 +26,10 @@ ULONG Count; } W32HEAP_USER_MAPPING, *PW32HEAP_USER_MAPPING; -typedef struct _W32PROCESS +typedef struct _PROCESSINFO { PEPROCESS peProcess; - DWORD RefCount; - ULONG W32PF_flags; - PKEVENT InputIdleEvent; - DWORD StartCursorHideTime; - DWORD NextStart; - PVOID pDCAttrList; - PVOID pBrushAttrList; - DWORD W32Pid; - LONG GDIHandleCount; - LONG UserHandleCount; - DWORD cSimpleLock; /* Locking Process during access to structure. */ - RTL_AVL_TABLE rtlAvlTable; /* Process AVL Table. */ - LIST_ENTRY leDCAttrList; - LIST_ENTRY leObjAttrList; -/* ReactOS */ - LIST_ENTRY ClassList; - LIST_ENTRY MenuListHead; - FAST_MUTEX PrivateFontListLock; - LIST_ENTRY PrivateFontListHead; - FAST_MUTEX DriverObjListLock; - LIST_ENTRY DriverObjListHead; - struct _KBL* KeyboardLayout; W32HEAP_USER_MAPPING HeapMappings; -} W32PROCESS, *PW32PROCESS; - -typedef struct _PROCESSINFO -{ - W32PROCESS XzyxW32Process; /* Place holder. */ - /* ReactOS */ - HINSTANCE hModUser; - PWINDOWCLASS LocalClassList; - PWINDOWCLASS GlobalClassList; - PWINDOWCLASS SystemClassList; - - UINT RegisteredSysClasses : 1; - -} PROCESSINFO; +} PROCESSINFO, *PPROCESSINFO; #endif /* __INCLUDE_NAPI_WIN32_H */

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