[fireball] 49213: - Change the way private window data is stored, from using window properties to a per-process usermode linked list. Fixes crashes in a number of apps (e.g. uTorrent), and also imp...
Author: fireball Date: Tue Oct 19 22:24:52 2010 New Revision: 49213
URL: http://svn.reactos.org/svn/reactos?rev=49213&view=rev Log: - Change the way private window data is stored, from using window properties to a per-process usermode linked list. Fixes crashes in a number of apps (e.g. uTorrent), and also improves performance (no syscall is necessary). See issue #5623 for more details.
Modified: branches/arwinss/reactos/dll/win32/winent.drv/clipboard.c branches/arwinss/reactos/dll/win32/winent.drv/font.c branches/arwinss/reactos/dll/win32/winent.drv/gdidrv.c branches/arwinss/reactos/dll/win32/winent.drv/main.c branches/arwinss/reactos/dll/win32/winent.drv/mouse.c branches/arwinss/reactos/dll/win32/winent.drv/userdrv.c branches/arwinss/reactos/dll/win32/winent.drv/winent.h branches/arwinss/reactos/dll/win32/winent.drv/wnd.c
Modified: branches/arwinss/reactos/dll/win32/winent.drv/clipboard.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winent... ============================================================================== --- branches/arwinss/reactos/dll/win32/winent.drv/clipboard.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winent.drv/clipboard.c [iso-8859-1] Tue Oct 19 22:24:52 2010 @@ -25,6 +25,7 @@ #include <win32k/ntgdityp.h> #include "ntrosgdi.h" #include "wine/rosuser.h" +#include "wine/list.h" #include "winent.h" #include "wine/unicode.h" #include "wine/server.h"
Modified: branches/arwinss/reactos/dll/win32/winent.drv/font.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winent... ============================================================================== --- branches/arwinss/reactos/dll/win32/winent.drv/font.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winent.drv/font.c [iso-8859-1] Tue Oct 19 22:24:52 2010 @@ -19,6 +19,7 @@ #include <winddi.h> #include <win32k/ntgdityp.h> #include "ntrosgdi.h" +#include "wine/list.h" #include "winent.h" #include "wine/unicode.h" #include "wine/debug.h"
Modified: branches/arwinss/reactos/dll/win32/winent.drv/gdidrv.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winent... ============================================================================== --- branches/arwinss/reactos/dll/win32/winent.drv/gdidrv.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winent.drv/gdidrv.c [iso-8859-1] Tue Oct 19 22:24:52 2010 @@ -17,6 +17,7 @@ #include <winddi.h> #include <win32k/ntgdityp.h> #include "ntrosgdi.h" +#include "wine/list.h" #include "winent.h" #include <pseh/pseh2.h> #include "wine/debug.h"
Modified: branches/arwinss/reactos/dll/win32/winent.drv/main.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winent... ============================================================================== --- branches/arwinss/reactos/dll/win32/winent.drv/main.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winent.drv/main.c [iso-8859-1] Tue Oct 19 22:24:52 2010 @@ -22,6 +22,7 @@ #include <win32k/ntgdityp.h> #include "ntrosgdi.h" #include "wine/rosuser.h" +#include "wine/list.h" #include "winent.h" #include "wine/server.h" #include "wine/debug.h"
Modified: branches/arwinss/reactos/dll/win32/winent.drv/mouse.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winent... ============================================================================== --- branches/arwinss/reactos/dll/win32/winent.drv/mouse.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winent.drv/mouse.c [iso-8859-1] Tue Oct 19 22:24:52 2010 @@ -32,6 +32,7 @@ #include <win32k/ntgdityp.h> #include "ntrosgdi.h" #include "wine/rosuser.h" +#include "wine/list.h" #include "winent.h" #include "wine/server.h" #include "wine/debug.h"
Modified: branches/arwinss/reactos/dll/win32/winent.drv/userdrv.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winent... ============================================================================== --- branches/arwinss/reactos/dll/win32/winent.drv/userdrv.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winent.drv/userdrv.c [iso-8859-1] Tue Oct 19 22:24:52 2010 @@ -21,6 +21,7 @@ #include <win32k/ntgdityp.h> #include "ntrosgdi.h" #include "wine/rosuser.h" +#include "wine/list.h" #include "winent.h" #include "wine/server.h" #include "wine/debug.h"
Modified: branches/arwinss/reactos/dll/win32/winent.drv/winent.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winent... ============================================================================== --- branches/arwinss/reactos/dll/win32/winent.drv/winent.h [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winent.drv/winent.h [iso-8859-1] Tue Oct 19 22:24:52 2010 @@ -30,6 +30,7 @@ /* ntdrv private window data */ struct ntdrv_win_data { + struct list entry; /* entry in the linked list of win data */ HWND hwnd; /* hwnd that this private data belongs to */ PVOID whole_window; /* SWM window for the complete window */ RECT window_rect; /* USER window rectangle relative to parent */
Modified: branches/arwinss/reactos/dll/win32/winent.drv/wnd.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winent... ============================================================================== --- branches/arwinss/reactos/dll/win32/winent.drv/wnd.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winent.drv/wnd.c [iso-8859-1] Tue Oct 19 22:24:52 2010 @@ -21,13 +21,22 @@ #include <win32k/ntgdityp.h> #include "ntrosgdi.h" #include "wine/rosuser.h" +#include "wine/list.h" #include "winent.h" #include "wine/server.h" #include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(rosuserdrv);
-static const char window_data_prop[] = "__ros_nt_window_data"; +static struct list wnd_data_list = LIST_INIT( wnd_data_list ); +static CRITICAL_SECTION wnd_data_cs; +static CRITICAL_SECTION_DEBUG critsect_debug = +{ + 0, 0, &wnd_data_cs, + { &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": wnd_data_cs") } +}; +static CRITICAL_SECTION wnd_data_cs = { &critsect_debug, -1, 0, 0, 0, 0 };
/* FUNCTIONS **************************************************************/
@@ -48,6 +57,53 @@ SERVER_END_REQ; }
+struct ntdrv_win_data *associate_create( HWND hwnd ) +{ + struct ntdrv_win_data *data; + + /* Insert our mapping */ + data = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(struct ntdrv_win_data)); + if(!data) return NULL; + + data->hwnd = hwnd; + + EnterCriticalSection(&wnd_data_cs); + list_add_tail(&wnd_data_list, &data->entry); + LeaveCriticalSection(&wnd_data_cs); + + return data; +} + +VOID associate_destroy( struct ntdrv_win_data *data ) +{ + EnterCriticalSection(&wnd_data_cs); + list_remove( &data->entry ); + LeaveCriticalSection(&wnd_data_cs); + + HeapFree( GetProcessHeap(), 0, data); +} + +struct ntdrv_win_data *associate_find( HWND hwnd ) +{ + struct ntdrv_win_data *item; + BOOL found = FALSE; + + EnterCriticalSection(&wnd_data_cs); + + LIST_FOR_EACH_ENTRY( item, &wnd_data_list, struct ntdrv_win_data, entry ) + if (item->hwnd == hwnd) + { + found = TRUE; + break; + } + + LeaveCriticalSection(&wnd_data_cs); + + if (!found) item = NULL; + + return item; +} + /*********************************************************************** * NTDRV_get_win_data * @@ -59,7 +115,7 @@
if (!hwnd) return NULL;
- data = (struct ntdrv_win_data *)GetPropA( hwnd, window_data_prop ); + data = associate_find( hwnd );
return data; } @@ -81,12 +137,8 @@ /* don't create win data for HWND_MESSAGE windows */ if (parent != GetDesktopWindow() && !GetAncestor( parent, GA_PARENT )) return NULL;
- data = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(struct ntdrv_win_data)); + data = associate_create(hwnd); if (!data) return NULL; - data->hwnd = hwnd; - - /* Add it as a property to the window */ - SetPropA( hwnd, window_data_prop, (HANDLE)data );
GetWindowRect( hwnd, &data->window_rect ); MapWindowPoints( 0, parent, (POINT *)&data->window_rect, 2 ); @@ -116,12 +168,8 @@ { struct ntdrv_win_data *data;
- data = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(struct ntdrv_win_data)); + data = associate_create(hwnd); if (!data) return NULL; - data->hwnd = hwnd; - - /* Add it as a property to the window */ - SetPropA( hwnd, window_data_prop, (HANDLE)data );
/* Mark it as being a whole window */ data->whole_window = (PVOID)1; @@ -139,14 +187,11 @@ struct ntdrv_win_data *data = NTDRV_get_win_data(hwnd); if (!data) return;
- /* Remove property */ - RemovePropA( hwnd, window_data_prop ); + /* Remove property and free its data */ + associate_destroy( data );
/* Inform window manager */ SwmRemoveWindow( hwnd ); - - /* Free window data */ - HeapFree( GetProcessHeap(), 0, data ); }
-
fireball＠svn.reactos.org