wine-commits October 2009

wine-commits@winehq.org

3 participants
1207 discussions

Hans Leidekker : iphlpapi: Allow both direct and indirect default routes in GetBestRoute.
by Alexandre Julliard 12 Oct '09

12 Oct '09

Module: wine Branch: master Commit: a57d86068e564c2cca63673c9a695f5290c49de6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a57d86068e564c2cca63673c9… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Oct 12 13:39:30 2009 +0200 iphlpapi: Allow both direct and indirect default routes in GetBestRoute. --- dlls/iphlpapi/iphlpapi_main.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 522d1d5..011e21a 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -869,9 +869,7 @@ DWORD WINAPI GetBestRoute(DWORD dwDestAddr, DWORD dwSourceAddr, PMIB_IPFORWARDRO matchedBits = numShifts; matchedNdx = ndx; } - else if (!matchedBits && table->table[ndx].dwForwardType == - MIB_IPROUTE_TYPE_INDIRECT) { - /* default to a default gateway */ + else if (!matchedBits) { matchedNdx = ndx; } }

1 0

Hans Leidekker : hnetcfg: Add stub implementations of INetFwServices and INetFwService.
by Alexandre Julliard 12 Oct '09

12 Oct '09

Module: wine Branch: master Commit: 1e867f3647a56c83a2374ca2aff1e9a847a85a7d URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e867f3647a56c83a2374ca2a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Oct 12 13:38:57 2009 +0200 hnetcfg: Add stub implementations of INetFwServices and INetFwService. --- dlls/hnetcfg/Makefile.in | 3 +- dlls/hnetcfg/hnetcfg_private.h | 1 + dlls/hnetcfg/profile.c | 4 +- dlls/hnetcfg/service.c | 479 ++++++++++++++++++++++++++++++++++++++++ 4 files changed, 484 insertions(+), 3 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1e867f3647a56c83a2374…

1 0

Hans Leidekker : hnetcfg: Add stub implementations of INetFwOpenPorts and INetFwOpenPort.
by Alexandre Julliard 12 Oct '09

12 Oct '09

Module: wine Branch: master Commit: 535025c93d2a2575801bef0ec8b2ad94535d5f8d URL: http://source.winehq.org/git/wine.git/?a=commit;h=535025c93d2a2575801bef0ec… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Oct 12 13:38:29 2009 +0200 hnetcfg: Add stub implementations of INetFwOpenPorts and INetFwOpenPort. --- dlls/hnetcfg/Makefile.in | 1 + dlls/hnetcfg/hnetcfg_private.h | 1 + dlls/hnetcfg/port.c | 544 ++++++++++++++++++++++++++++++++++++++++ dlls/hnetcfg/profile.c | 4 +- 4 files changed, 548 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=535025c93d2a2575801be…

1 0

Alexandre Julliard : user32: Set last error in WIN_GetRectangles.
by Alexandre Julliard 12 Oct '09

12 Oct '09

Module: wine Branch: master Commit: 5db3e7d43ed99ebcedc87c3e7da00e29def0cc2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=5db3e7d43ed99ebcedc87c3e7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 12 15:51:12 2009 +0200 user32: Set last error in WIN_GetRectangles. --- dlls/user32/win.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index be40018..333b6b6 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -661,7 +661,11 @@ BOOL WIN_GetRectangles( HWND hwnd, RECT *rectWindow, RECT *rectClient ) WND *win = WIN_GetPtr( hwnd ); BOOL ret = TRUE; - if (!win) return FALSE; + if (!win) + { + SetLastError( ERROR_INVALID_WINDOW_HANDLE ); + return FALSE; + } if (win == WND_DESKTOP) { RECT rect; @@ -684,7 +688,7 @@ BOOL WIN_GetRectangles( HWND hwnd, RECT *rectWindow, RECT *rectClient ) SERVER_START_REQ( get_window_rectangles ) { req->handle = wine_server_user_handle( hwnd ); - if ((ret = !wine_server_call( req ))) + if ((ret = !wine_server_call_err( req ))) { if (rectWindow) {

1 0

Alexandre Julliard : user32: Get rid of the 16-bit heap support.
by Alexandre Julliard 12 Oct '09

12 Oct '09

Module: wine Branch: master Commit: 796346f825e92759c957ffaba4ad24d1a9761a73 URL: http://source.winehq.org/git/wine.git/?a=commit;h=796346f825e92759c957ffaba… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 12 14:32:21 2009 +0200 user32: Get rid of the 16-bit heap support. --- dlls/user32/user.exe.spec | 2 +- dlls/user32/user16.c | 15 ++++++++++++++ dlls/user32/user_main.c | 11 +--------- dlls/user32/user_private.h | 46 -------------------------------------------- 4 files changed, 17 insertions(+), 57 deletions(-) diff --git a/dlls/user32/user.exe.spec b/dlls/user32/user.exe.spec index 9a22d87..517ced8 100644 --- a/dlls/user32/user.exe.spec +++ b/dlls/user32/user.exe.spec @@ -351,7 +351,7 @@ 371 pascal -ret16 SetWindowPlacement(word ptr) SetWindowPlacement16 372 stub GetInternalIconHeader 373 pascal -ret16 SubtractRect(ptr ptr ptr) SubtractRect16 -#374 DllEntryPoint +374 pascal -ret16 DllEntryPoint(long word word word long word) 375 stub DrawTextEx 376 stub SetMessageExtraInfo 378 stub SetPropEx diff --git a/dlls/user32/user16.c b/dlls/user32/user16.c index 85b7212..5ca8837 100644 --- a/dlls/user32/user16.c +++ b/dlls/user32/user16.c @@ -56,6 +56,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(user); WORD WINAPI DestroyIcon32(HGLOBAL16, UINT16); +WORD USER_HeapSel = 0; /* USER heap selector */ struct gray_string_info { @@ -1206,6 +1207,20 @@ BOOL16 WINAPI SubtractRect16( LPRECT16 dest, const RECT16 *src1, /********************************************************************** + * DllEntryPoint (USER.374) + */ +BOOL WINAPI DllEntryPoint( DWORD reason, HINSTANCE16 inst, WORD ds, + WORD heap, DWORD reserved1, WORD reserved2 ) +{ + if (reason != DLL_PROCESS_ATTACH) return TRUE; + if (USER_HeapSel) return TRUE; /* already called */ + + USER_HeapSel = ds; + return TRUE; +} + + +/********************************************************************** * SetMenuContextHelpId (USER.384) */ BOOL16 WINAPI SetMenuContextHelpId16( HMENU16 hMenu, DWORD dwContextHelpID) diff --git a/dlls/user32/user_main.c b/dlls/user32/user_main.c index 7b7b885..516338c 100644 --- a/dlls/user32/user_main.c +++ b/dlls/user32/user_main.c @@ -36,7 +36,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(graphics); #define DESKTOP_ALL_ACCESS 0x01ff -WORD USER_HeapSel = 0; /* USER heap selector */ HMODULE user32_module = 0; static SYSLEVEL USER_SysLevel; @@ -267,15 +266,7 @@ static void winstation_init(void) */ static BOOL process_attach(void) { - HINSTANCE16 instance; - - /* Create USER heap */ - if ((instance = LoadLibrary16( "USER.EXE" )) >= 32) USER_HeapSel = instance | 7; - else - { - USER_HeapSel = GlobalAlloc16( GMEM_FIXED, 65536 ); - LocalInit16( USER_HeapSel, 32, 65534 ); - } + LoadLibrary16( "user.exe" ); /* some Win9x dlls expect keyboard to be loaded */ if (GetVersion() & 0x80000000) LoadLibrary16( "keyboard.drv" ); diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index fa6118d..3dc1d83 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -29,55 +29,9 @@ #include "winreg.h" #include "winternl.h" #include "wine/windef16.h" -#include "wine/winbase16.h" extern WORD USER_HeapSel DECLSPEC_HIDDEN; -static inline HLOCAL16 LOCAL_Alloc( HANDLE16 ds, UINT16 flags, WORD size ) -{ - STACK16FRAME* stack16 = MapSL(PtrToUlong(NtCurrentTeb()->WOW32Reserved)); - HANDLE16 oldDS = stack16->ds; - HLOCAL16 ret; - - stack16->ds = ds; - ret = LocalAlloc16 (flags, size); - stack16->ds = oldDS; - return ret; -} - -static inline HLOCAL16 LOCAL_ReAlloc( HANDLE16 ds, HLOCAL16 handle, WORD size, UINT16 flags ) -{ - STACK16FRAME* stack16 = MapSL(PtrToUlong(NtCurrentTeb()->WOW32Reserved)); - HANDLE16 oldDS = stack16->ds; - HLOCAL16 ret; - - stack16->ds = ds; - ret = LocalReAlloc16 (handle, size, flags); - stack16->ds = oldDS; - return ret; -} - -static inline HLOCAL16 LOCAL_Free( HANDLE16 ds, HLOCAL16 handle ) -{ - STACK16FRAME* stack16 = MapSL(PtrToUlong(NtCurrentTeb()->WOW32Reserved)); - HANDLE16 oldDS = stack16->ds; - HLOCAL16 ret; - - stack16->ds = ds; - ret = LocalFree16 (handle); - stack16->ds = oldDS; - return ret; -} - -#define USER_HEAP_ALLOC(size) \ - ((HANDLE)(ULONG_PTR)LOCAL_Alloc( USER_HeapSel, LMEM_FIXED, (size) )) -#define USER_HEAP_REALLOC(handle,size) \ - ((HANDLE)(ULONG_PTR)LOCAL_ReAlloc( USER_HeapSel, LOWORD(handle), (size), LMEM_FIXED )) -#define USER_HEAP_FREE(handle) \ - LOCAL_Free( USER_HeapSel, LOWORD(handle) ) -#define USER_HEAP_LIN_ADDR(handle) \ - ((handle) ? MapSL(MAKESEGPTR(USER_HeapSel, LOWORD(handle))) : NULL) - #define GET_WORD(ptr) (*(const WORD *)(ptr)) #define GET_DWORD(ptr) (*(const DWORD *)(ptr))

1 0

Alexandre Julliard : user32: Use client-side user handles for menus.
by Alexandre Julliard 12 Oct '09

12 Oct '09

Module: wine Branch: master Commit: db79a9f2e9a5f4d82c0a910fd92ce8449cdf74e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=db79a9f2e9a5f4d82c0a910fd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 12 14:30:34 2009 +0200 user32: Use client-side user handles for menus. --- dlls/user32/menu.c | 30 +++++++++++++++--------------- dlls/user32/user_private.h | 1 + 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index a3accaa..5960031 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -92,8 +92,8 @@ typedef struct { /* Popup menu structure */ typedef struct { + struct user_object obj; WORD wFlags; /* Menu flags (MF_POPUP, MF_SYSMENU) */ - WORD wMagic; /* Magic number */ WORD Width; /* Width of the whole menu */ WORD Height; /* Height of the whole menu */ UINT nItems; /* Number of items in the menu */ @@ -299,12 +299,15 @@ static void do_debug_print_menuitem(const char *prefix, const MENUITEM *mp, */ static POPUPMENU *MENU_GetMenu(HMENU hMenu) { - POPUPMENU *menu = USER_HEAP_LIN_ADDR(hMenu); - if (!menu || menu->wMagic != MENU_MAGIC) + POPUPMENU *menu = get_user_handle_ptr( hMenu, USER_MENU ); + + if (menu == OBJ_OTHER_PROCESS) { - WARN("invalid menu handle=%p, ptr=%p, magic=%x\n", hMenu, menu, menu? menu->wMagic:0); - menu = NULL; + WARN( "other process menu %p?\n", hMenu); + return NULL; } + if (menu) release_user_handle_ptr( menu ); /* FIXME! */ + else WARN("invalid menu handle=%p\n", hMenu); return menu; } @@ -4028,14 +4031,13 @@ HMENU WINAPI CreateMenu(void) { HMENU hMenu; LPPOPUPMENU menu; - if (!(hMenu = USER_HEAP_ALLOC( sizeof(POPUPMENU) ))) return 0; - menu = USER_HEAP_LIN_ADDR(hMenu); - ZeroMemory(menu, sizeof(POPUPMENU)); - menu->wMagic = MENU_MAGIC; + if (!(menu = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*menu) ))) return 0; menu->FocusedItem = NO_SELECTED_ITEM; menu->bTimeToHide = FALSE; + if (!(hMenu = alloc_user_handle( &menu->obj, USER_MENU ))) HeapFree( GetProcessHeap(), 0, menu ); + TRACE("return %p\n", hMenu ); return hMenu; @@ -4047,14 +4049,12 @@ HMENU WINAPI CreateMenu(void) */ BOOL WINAPI DestroyMenu( HMENU hMenu ) { - LPPOPUPMENU lppop = MENU_GetMenu(hMenu); + LPPOPUPMENU lppop; TRACE("(%p)\n", hMenu); - - if (!lppop) return FALSE; - - lppop->wMagic = 0; /* Mark it as destroyed */ + if (!(lppop = free_user_handle( hMenu, USER_MENU ))) return FALSE; + if (lppop == OBJ_OTHER_PROCESS) return FALSE; /* DestroyMenu should not destroy system menu popup owner */ if ((lppop->wFlags & (MF_POPUP | MF_SYSMENU)) == MF_POPUP && lppop->hWnd) @@ -4074,7 +4074,7 @@ BOOL WINAPI DestroyMenu( HMENU hMenu ) } HeapFree( GetProcessHeap(), 0, lppop->items ); } - USER_HEAP_FREE( hMenu ); + HeapFree( GetProcessHeap(), 0, lppop ); return TRUE; } diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index 1020064..fa6118d 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -173,6 +173,7 @@ struct hook16_queue_info; enum user_obj_type { USER_WINDOW = 1, /* window */ + USER_MENU, /* menu */ USER_DWP /* DeferWindowPos structure */ };

1 0

Alexandre Julliard : user32: Use the generic handle functions for windows too.
by Alexandre Julliard 12 Oct '09

12 Oct '09

Module: wine Branch: master Commit: 4bb95f4d0f10f3f27b36fab2fddb6fad74e9fd82 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4bb95f4d0f10f3f27b36fab2f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 12 14:29:34 2009 +0200 user32: Use the generic handle functions for windows too. --- dlls/user32/nonclient.c | 10 ++++---- dlls/user32/win.c | 53 +++++++++++++++------------------------------- dlls/user32/win.h | 5 +-- dlls/user32/winpos.c | 2 +- 4 files changed, 25 insertions(+), 45 deletions(-) diff --git a/dlls/user32/nonclient.c b/dlls/user32/nonclient.c index 03831a3..ccea517 100644 --- a/dlls/user32/nonclient.c +++ b/dlls/user32/nonclient.c @@ -533,17 +533,17 @@ static LRESULT NC_DoNCHitTest (WND *wndPtr, POINT pt ) RECT rect, rcClient; POINT ptClient; - TRACE("hwnd=%p pt=%d,%d\n", wndPtr->hwndSelf, pt.x, pt.y ); + TRACE("hwnd=%p pt=%d,%d\n", wndPtr->obj.handle, pt.x, pt.y ); - GetWindowRect(wndPtr->hwndSelf, &rect ); + GetWindowRect(wndPtr->obj.handle, &rect ); if (!PtInRect( &rect, pt )) return HTNOWHERE; if (wndPtr->dwStyle & WS_MINIMIZE) return HTCAPTION; /* Check client area */ ptClient = pt; - ScreenToClient( wndPtr->hwndSelf, &ptClient ); - GetClientRect( wndPtr->hwndSelf, &rcClient ); + ScreenToClient( wndPtr->obj.handle, &ptClient ); + GetClientRect( wndPtr->obj.handle, &rcClient ); if (PtInRect( &rcClient, ptClient )) return HTCLIENT; /* Check borders */ @@ -606,7 +606,7 @@ static LRESULT NC_DoNCHitTest (WND *wndPtr, POINT pt ) /* Check system menu */ if ((wndPtr->dwStyle & WS_SYSMENU) && !(wndPtr->dwExStyle & WS_EX_TOOLWINDOW)) { - if (NC_IconForWindow(wndPtr->hwndSelf)) + if (NC_IconForWindow(wndPtr->obj.handle)) rect.left += GetSystemMetrics(SM_CYCAPTION) - 1; } if (pt.x < rect.left) return HTSYSMENU; diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 28ea841..be40018 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -250,12 +250,12 @@ static WND *create_window_handle( HWND parent, HWND owner, LPCWSTR name, index = USER_HANDLE_TO_INDEX(handle); assert( index < NB_USER_HANDLES ); user_handles[index] = win; - win->hwndSelf = handle; + win->obj.handle = handle; + win->obj.type = USER_WINDOW; win->parent = full_parent; win->owner = full_owner; win->class = class; win->winproc = get_class_winproc( class ); - win->dwMagic = WND_MAGIC; win->cbWndExtra = extra_bytes; if (WINPROC_IsUnicode( win->winproc, unicode )) win->flags |= WIN_ISUNICODE; return win; @@ -267,31 +267,23 @@ static WND *create_window_handle( HWND parent, HWND owner, LPCWSTR name, * * Free a window handle. */ -static WND *free_window_handle( HWND hwnd ) +static void free_window_handle( HWND hwnd ) { - WND *ptr; + struct user_object *ptr; WORD index = USER_HANDLE_TO_INDEX(hwnd); - if (index >= NB_USER_HANDLES) return NULL; - USER_Lock(); - if ((ptr = user_handles[index])) + if ((ptr = get_user_handle_ptr( hwnd, USER_WINDOW )) && ptr != OBJ_OTHER_PROCESS) { SERVER_START_REQ( destroy_window ) { req->handle = wine_server_user_handle( hwnd ); - if (!wine_server_call_err( req )) - { - user_handles[index] = NULL; - ptr->dwMagic = 0; - } - else - ptr = NULL; + if (!wine_server_call_err( req )) user_handles[index] = NULL; + else ptr = NULL; } SERVER_END_REQ; + release_user_handle_ptr( ptr ); + HeapFree( GetProcessHeap(), 0, ptr ); } - USER_Unlock(); - HeapFree( GetProcessHeap(), 0, ptr ); - return ptr; } @@ -494,22 +486,12 @@ BOOL is_desktop_window( HWND hwnd ) */ WND *WIN_GetPtr( HWND hwnd ) { - WND * ptr; - WORD index = USER_HANDLE_TO_INDEX(hwnd); - - if (index >= NB_USER_HANDLES) return NULL; + WND *ptr; - USER_Lock(); - if ((ptr = user_handles[index])) + if ((ptr = get_user_handle_ptr( hwnd, USER_WINDOW )) == WND_OTHER_PROCESS) { - if (ptr->dwMagic == WND_MAGIC && - (hwnd == ptr->hwndSelf || !HIWORD(hwnd) || HIWORD(hwnd) == 0xffff)) - return ptr; - ptr = NULL; + if (is_desktop_window( hwnd )) ptr = WND_DESKTOP; } - else if (is_desktop_window( hwnd )) ptr = WND_DESKTOP; - else ptr = WND_OTHER_PROCESS; - USER_Unlock(); return ptr; } @@ -525,7 +507,7 @@ HWND WIN_IsCurrentProcess( HWND hwnd ) HWND ret; if (!(ptr = WIN_GetPtr( hwnd )) || ptr == WND_OTHER_PROCESS || ptr == WND_DESKTOP) return 0; - ret = ptr->hwndSelf; + ret = ptr->obj.handle; WIN_ReleasePtr( ptr ); return ret; } @@ -542,7 +524,7 @@ HWND WIN_IsCurrentThread( HWND hwnd ) HWND ret = 0; if (!(ptr = WIN_GetPtr( hwnd )) || ptr == WND_OTHER_PROCESS || ptr == WND_DESKTOP) return 0; - if (ptr->tid == GetCurrentThreadId()) ret = ptr->hwndSelf; + if (ptr->tid == GetCurrentThreadId()) ret = ptr->obj.handle; WIN_ReleasePtr( ptr ); return ret; } @@ -572,7 +554,7 @@ HWND WIN_Handle32( HWND16 hwnd16 ) if (ptr != WND_OTHER_PROCESS) { - hwnd = ptr->hwndSelf; + hwnd = ptr->obj.handle; WIN_ReleasePtr( ptr ); } else /* may belong to another process */ @@ -832,7 +814,6 @@ static void destroy_thread_window( HWND hwnd ) sys_menu = wndPtr->hSysMenu; free_dce( wndPtr->dce, hwnd ); user_handles[index] = NULL; - wndPtr->dwMagic = 0; } USER_Unlock(); @@ -1219,7 +1200,7 @@ static HWND WIN_CreateWindowEx( CREATESTRUCTA *cs, LPCWSTR className, UINT flags if (!(wndPtr = create_window_handle( parent, owner, className, cs->hInstance, unicode ))) return 0; - hwnd = wndPtr->hwndSelf; + hwnd = wndPtr->obj.handle; /* Fill the window structure */ @@ -3305,7 +3286,7 @@ BOOL WINAPI FlashWindow( HWND hWnd, BOOL bInvert ) wndPtr = WIN_GetPtr(hWnd); if (!wndPtr || wndPtr == WND_OTHER_PROCESS || wndPtr == WND_DESKTOP) return FALSE; - hWnd = wndPtr->hwndSelf; /* make it a full handle */ + hWnd = wndPtr->obj.handle; /* make it a full handle */ if (bInvert) wparam = !(wndPtr->flags & WIN_NCACTIVATED); else wparam = (hWnd == GetForegroundWindow()); diff --git a/dlls/user32/win.h b/dlls/user32/win.h index 5cd879a..743c67e 100644 --- a/dlls/user32/win.h +++ b/dlls/user32/win.h @@ -28,20 +28,19 @@ #include <winuser.h> #include <wine/windef16.h> -#define WND_MAGIC 0x444e4957 /* 'WIND' */ +#include "user_private.h" struct tagCLASS; struct tagDIALOGINFO; typedef struct tagWND { - HWND hwndSelf; /* Handle of this window */ + struct user_object obj; /* object header */ HWND parent; /* Window parent */ HWND owner; /* Window owner */ struct tagCLASS *class; /* Window class */ struct dce *dce; /* DCE pointer */ WNDPROC winproc; /* Window procedure */ - DWORD dwMagic; /* Magic number (must be WND_MAGIC) */ DWORD tid; /* Owner thread id */ HINSTANCE hInstance; /* Window hInstance (from CreateWindow) */ RECT rectClient; /* Client area rel. to parent client area */ diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index 72532de..c62fdaa 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -1790,7 +1790,7 @@ static BOOL fixup_flags( WINDOWPOS *winpos ) SetLastError( ERROR_INVALID_WINDOW_HANDLE ); return FALSE; } - winpos->hwnd = wndPtr->hwndSelf; /* make it a full handle */ + winpos->hwnd = wndPtr->obj.handle; /* make it a full handle */ /* Finally make sure that all coordinates are valid */ if (winpos->x < -32768) winpos->x = -32768;

1 0

Alexandre Julliard : user32: Use client-side user handles for DeferWindowPos.
by Alexandre Julliard 12 Oct '09

12 Oct '09

Module: wine Branch: master Commit: da3c4c995ae76b3b12320cb6a6fc82699742f7f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da3c4c995ae76b3b12320cb6a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 12 15:31:22 2009 +0200 user32: Use client-side user handles for DeferWindowPos. --- dlls/user32/winpos.c | 61 +++++++++++++++++++++++++++---------------------- 1 files changed, 34 insertions(+), 27 deletions(-) diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index ba33967..72532de 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -68,17 +68,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(win); #define PLACE_MAX 0x0002 #define PLACE_RECT 0x0004 - -#define DWP_MAGIC ((INT)('W' | ('P' << 8) | ('O' << 16) | ('S' << 24))) - typedef struct { + struct user_object obj; INT actualCount; INT suggestedCount; - BOOL valid; - INT wMagic; HWND hwndParent; - WINDOWPOS winPos[1]; + WINDOWPOS *winPos; } DWP; @@ -2073,7 +2069,7 @@ BOOL WINAPI SetWindowPos( HWND hwnd, HWND hwndInsertAfter, */ HDWP WINAPI BeginDeferWindowPos( INT count ) { - HDWP handle; + HDWP handle = 0; DWP *pDWP; TRACE("%d\n", count); @@ -2086,15 +2082,19 @@ HDWP WINAPI BeginDeferWindowPos( INT count ) /* Windows allows zero count, in which case it allocates context for 8 moves */ if (count == 0) count = 8; - handle = USER_HEAP_ALLOC( sizeof(DWP) + (count-1)*sizeof(WINDOWPOS) ); - if (!handle) return 0; - pDWP = USER_HEAP_LIN_ADDR( handle ); + if (!(pDWP = HeapAlloc( GetProcessHeap(), 0, sizeof(DWP)))) return 0; + pDWP->actualCount = 0; pDWP->suggestedCount = count; - pDWP->valid = TRUE; - pDWP->wMagic = DWP_MAGIC; pDWP->hwndParent = 0; + if (!(pDWP->winPos = HeapAlloc( GetProcessHeap(), 0, count * sizeof(WINDOWPOS) )) || + !(handle = alloc_user_handle( &pDWP->obj, USER_DWP ))) + { + HeapFree( GetProcessHeap(), 0, pDWP->winPos ); + HeapFree( GetProcessHeap(), 0, pDWP ); + } + TRACE("returning hdwp %p\n", handle); return handle; } @@ -2109,7 +2109,7 @@ HDWP WINAPI DeferWindowPos( HDWP hdwp, HWND hwnd, HWND hwndAfter, { DWP *pDWP; int i; - HDWP newhdwp = hdwp,retvalue; + HDWP retvalue = hdwp; TRACE("hdwp %p, hwnd %p, after %p, %d,%d (%dx%d), flags %08x\n", hdwp, hwnd, hwndAfter, x, y, cx, cy, flags); @@ -2117,9 +2117,12 @@ HDWP WINAPI DeferWindowPos( HDWP hdwp, HWND hwnd, HWND hwndAfter, hwnd = WIN_GetFullHandle( hwnd ); if (is_desktop_window( hwnd )) return 0; - if (!(pDWP = USER_HEAP_LIN_ADDR( hdwp ))) return 0; - - USER_Lock(); + if (!(pDWP = get_user_handle_ptr( hdwp, USER_DWP ))) return 0; + if (pDWP == OBJ_OTHER_PROCESS) + { + FIXME( "other process handle %p?\n", hdwp ); + return 0; + } for (i = 0; i < pDWP->actualCount; i++) { @@ -2146,21 +2149,20 @@ HDWP WINAPI DeferWindowPos( HDWP hdwp, HWND hwnd, HWND hwndAfter, SWP_NOOWNERZORDER); pDWP->winPos[i].flags |= flags & (SWP_SHOWWINDOW | SWP_HIDEWINDOW | SWP_FRAMECHANGED); - retvalue = hdwp; goto END; } } if (pDWP->actualCount >= pDWP->suggestedCount) { - newhdwp = USER_HEAP_REALLOC( hdwp, - sizeof(DWP) + pDWP->suggestedCount*sizeof(WINDOWPOS) ); - if (!newhdwp) + WINDOWPOS *newpos = HeapReAlloc( GetProcessHeap(), 0, pDWP->winPos, + pDWP->suggestedCount * 2 * sizeof(WINDOWPOS) ); + if (!newpos) { retvalue = 0; goto END; } - pDWP = USER_HEAP_LIN_ADDR( newhdwp ); - pDWP->suggestedCount++; + pDWP->suggestedCount *= 2; + pDWP->winPos = newpos; } pDWP->winPos[pDWP->actualCount].hwnd = hwnd; pDWP->winPos[pDWP->actualCount].hwndInsertAfter = hwndAfter; @@ -2170,9 +2172,8 @@ HDWP WINAPI DeferWindowPos( HDWP hdwp, HWND hwnd, HWND hwndAfter, pDWP->winPos[pDWP->actualCount].cy = cy; pDWP->winPos[pDWP->actualCount].flags = flags; pDWP->actualCount++; - retvalue = newhdwp; END: - USER_Unlock(); + release_user_handle_ptr( pDWP ); return retvalue; } @@ -2189,8 +2190,13 @@ BOOL WINAPI EndDeferWindowPos( HDWP hdwp ) TRACE("%p\n", hdwp); - pDWP = USER_HEAP_LIN_ADDR( hdwp ); - if (!pDWP) return FALSE; + if (!(pDWP = free_user_handle( hdwp, USER_DWP ))) return FALSE; + if (pDWP == OBJ_OTHER_PROCESS) + { + FIXME( "other process handle %p?\n", hdwp ); + return FALSE; + } + for (i = 0, winpos = pDWP->winPos; res && i < pDWP->actualCount; i++, winpos++) { TRACE("hwnd %p, after %p, %d,%d (%dx%d), flags %08x\n", @@ -2202,7 +2208,8 @@ BOOL WINAPI EndDeferWindowPos( HDWP hdwp ) else res = SendMessageW( winpos->hwnd, WM_WINE_SETWINDOWPOS, 0, (LPARAM)winpos ); } - USER_HEAP_FREE( hdwp ); + HeapFree( GetProcessHeap(), 0, pDWP->winPos ); + HeapFree( GetProcessHeap(), 0, pDWP ); return res; }

1 0

Alexandre Julliard : user32: Add functions for manipulating client-side user handles.
by Alexandre Julliard 12 Oct '09

12 Oct '09

Module: wine Branch: master Commit: d996f7e334d3274465b75cacf02695b4314040ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=d996f7e334d3274465b75cacf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 12 14:27:55 2009 +0200 user32: Add functions for manipulating client-side user handles. --- dlls/user32/user_private.h | 19 ++++++++++ dlls/user32/win.c | 83 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 102 insertions(+), 0 deletions(-) diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index 1ff6ef4..1020064 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -170,6 +170,25 @@ extern void USER_unload_driver(void) DECLSPEC_HIDDEN; struct received_message_info; struct hook16_queue_info; +enum user_obj_type +{ + USER_WINDOW = 1, /* window */ + USER_DWP /* DeferWindowPos structure */ +}; + +struct user_object +{ + HANDLE handle; + enum user_obj_type type; +}; + +#define OBJ_OTHER_PROCESS ((void *)1) /* returned by get_user_handle_ptr on unknown handles */ + +HANDLE alloc_user_handle( struct user_object *ptr, enum user_obj_type type ) DECLSPEC_HIDDEN; +void *get_user_handle_ptr( HANDLE handle, enum user_obj_type type ) DECLSPEC_HIDDEN; +void release_user_handle_ptr( void *ptr ) DECLSPEC_HIDDEN; +void *free_user_handle( HANDLE handle, enum user_obj_type type ) DECLSPEC_HIDDEN; + /* type of message-sending functions that need special WM_CHAR handling */ enum wm_char_mapping { diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 44b15b1..28ea841 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -91,6 +91,89 @@ static inline void set_win_data( void *ptr, LONG_PTR val, UINT size ) static void *user_handles[NB_USER_HANDLES]; /*********************************************************************** + * alloc_user_handle + */ +HANDLE alloc_user_handle( struct user_object *ptr, enum user_obj_type type ) +{ + HANDLE handle = 0; + + SERVER_START_REQ( alloc_user_handle ) + { + if (!wine_server_call_err( req )) handle = wine_server_ptr_handle( reply->handle ); + } + SERVER_END_REQ; + + if (handle) + { + UINT index = USER_HANDLE_TO_INDEX( handle ); + + assert( index < NB_USER_HANDLES ); + ptr->handle = handle; + ptr->type = type; + user_handles[index] = ptr; + } + return handle; +} + + +/*********************************************************************** + * get_user_handle_ptr + */ +void *get_user_handle_ptr( HANDLE handle, enum user_obj_type type ) +{ + struct user_object *ptr; + WORD index = USER_HANDLE_TO_INDEX( handle ); + + if (index >= NB_USER_HANDLES) return NULL; + + USER_Lock(); + if ((ptr = user_handles[index])) + { + if (ptr->type == type && + ((UINT)(UINT_PTR)ptr->handle == (UINT)(UINT_PTR)handle || + !HIWORD(handle) || HIWORD(handle) == 0xffff)) + return ptr; + ptr = NULL; + } + else ptr = OBJ_OTHER_PROCESS; + USER_Unlock(); + return ptr; +} + + +/*********************************************************************** + * release_user_handle_ptr + */ +void release_user_handle_ptr( void *ptr ) +{ + USER_Unlock(); +} + + +/*********************************************************************** + * free_user_handle + */ +void *free_user_handle( HANDLE handle, enum user_obj_type type ) +{ + struct user_object *ptr; + WORD index = USER_HANDLE_TO_INDEX( handle ); + + if ((ptr = get_user_handle_ptr( handle, type )) && ptr != OBJ_OTHER_PROCESS) + { + SERVER_START_REQ( free_user_handle ) + { + req->handle = wine_server_user_handle( handle ); + if (!wine_server_call( req )) user_handles[index] = NULL; + else ptr = NULL; + } + SERVER_END_REQ; + release_user_handle_ptr( ptr ); + } + return ptr; +} + + +/*********************************************************************** * create_window_handle * * Create a window handle with the server.

1 0

Alexandre Julliard : server: Add support for allocating purely client-side user handles.
by Alexandre Julliard 12 Oct '09

12 Oct '09

Module: wine Branch: master Commit: 9018e13c5e727e6f66d8bb0be969a6638ce5b695 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9018e13c5e727e6f66d8bb0be… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 12 14:25:01 2009 +0200 server: Add support for allocating purely client-side user handles. --- include/wine/server_protocol.h | 35 +++++++++++++++++++++++++++++++++-- server/protocol.def | 13 +++++++++++++ server/request.h | 8 ++++++++ server/trace.c | 20 ++++++++++++++++++++ server/user.c | 19 +++++++++++++++++++ server/user.h | 3 ++- 6 files changed, 95 insertions(+), 3 deletions(-) diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 7683e8a..d2b159a 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -115,8 +115,8 @@ typedef union struct { int code; - client_ptr_t string; data_size_t length; + client_ptr_t string; } output_string; struct { @@ -4614,6 +4614,31 @@ struct set_window_layered_info_reply }; + +struct alloc_user_handle_request +{ + struct request_header __header; +}; +struct alloc_user_handle_reply +{ + struct reply_header __header; + user_handle_t handle; + char __pad_12[4]; +}; + + + +struct free_user_handle_request +{ + struct request_header __header; + user_handle_t handle; +}; +struct free_user_handle_reply +{ + struct reply_header __header; +}; + + enum request { REQ_new_process, @@ -4854,6 +4879,8 @@ enum request REQ_add_fd_completion, REQ_get_window_layered_info, REQ_set_window_layered_info, + REQ_alloc_user_handle, + REQ_free_user_handle, REQ_NB_REQUESTS }; @@ -5099,6 +5126,8 @@ union generic_request struct add_fd_completion_request add_fd_completion_request; struct get_window_layered_info_request get_window_layered_info_request; struct set_window_layered_info_request set_window_layered_info_request; + struct alloc_user_handle_request alloc_user_handle_request; + struct free_user_handle_request free_user_handle_request; }; union generic_reply { @@ -5342,8 +5371,10 @@ union generic_reply struct add_fd_completion_reply add_fd_completion_reply; struct get_window_layered_info_reply get_window_layered_info_reply; struct set_window_layered_info_reply set_window_layered_info_reply; + struct alloc_user_handle_reply alloc_user_handle_reply; + struct free_user_handle_reply free_user_handle_reply; }; -#define SERVER_PROTOCOL_VERSION 391 +#define SERVER_PROTOCOL_VERSION 392 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/protocol.def b/server/protocol.def index d7b31f4..a0e1702 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -3224,3 +3224,16 @@ enum message_type unsigned int alpha; /* alpha (0..255) */ unsigned int flags; /* LWA_* flags */ @END + + +/* Allocate an arbitrary user handle */ +@REQ(alloc_user_handle) +@REPLY + user_handle_t handle; /* allocated handle */ +@END + + +/* Free an arbitrary user handle */ +@REQ(free_user_handle) + user_handle_t handle; /* handle to free*/ +@END diff --git a/server/request.h b/server/request.h index 02c7984..87b6a75 100644 --- a/server/request.h +++ b/server/request.h @@ -349,6 +349,8 @@ DECL_HANDLER(set_completion_info); DECL_HANDLER(add_fd_completion); DECL_HANDLER(get_window_layered_info); DECL_HANDLER(set_window_layered_info); +DECL_HANDLER(alloc_user_handle); +DECL_HANDLER(free_user_handle); #ifdef WANT_REQUEST_HANDLERS @@ -593,6 +595,8 @@ static const req_handler req_handlers[REQ_NB_REQUESTS] = (req_handler)req_add_fd_completion, (req_handler)req_get_window_layered_info, (req_handler)req_set_window_layered_info, + (req_handler)req_alloc_user_handle, + (req_handler)req_free_user_handle, }; C_ASSERT( sizeof(affinity_t) == 8 ); @@ -1892,6 +1896,10 @@ C_ASSERT( FIELD_OFFSET(struct set_window_layered_info_request, color_key) == 16 C_ASSERT( FIELD_OFFSET(struct set_window_layered_info_request, alpha) == 20 ); C_ASSERT( FIELD_OFFSET(struct set_window_layered_info_request, flags) == 24 ); C_ASSERT( sizeof(struct set_window_layered_info_request) == 32 ); +C_ASSERT( FIELD_OFFSET(struct alloc_user_handle_reply, handle) == 8 ); +C_ASSERT( sizeof(struct alloc_user_handle_reply) == 16 ); +C_ASSERT( FIELD_OFFSET(struct free_user_handle_request, handle) == 12 ); +C_ASSERT( sizeof(struct free_user_handle_request) == 16 ); #endif /* WANT_REQUEST_HANDLERS */ diff --git a/server/trace.c b/server/trace.c index 10c731c..b7dec85 100644 --- a/server/trace.c +++ b/server/trace.c @@ -3780,6 +3780,20 @@ static void dump_set_window_layered_info_request( const struct set_window_layere fprintf( stderr, ", flags=%08x", req->flags ); } +static void dump_alloc_user_handle_request( const struct alloc_user_handle_request *req ) +{ +} + +static void dump_alloc_user_handle_reply( const struct alloc_user_handle_reply *req ) +{ + fprintf( stderr, " handle=%08x", req->handle ); +} + +static void dump_free_user_handle_request( const struct free_user_handle_request *req ) +{ + fprintf( stderr, " handle=%08x", req->handle ); +} + static const dump_func req_dumpers[REQ_NB_REQUESTS] = { (dump_func)dump_new_process_request, (dump_func)dump_get_new_process_info_request, @@ -4019,6 +4033,8 @@ static const dump_func req_dumpers[REQ_NB_REQUESTS] = { (dump_func)dump_add_fd_completion_request, (dump_func)dump_get_window_layered_info_request, (dump_func)dump_set_window_layered_info_request, + (dump_func)dump_alloc_user_handle_request, + (dump_func)dump_free_user_handle_request, }; static const dump_func reply_dumpers[REQ_NB_REQUESTS] = { @@ -4260,6 +4276,8 @@ static const dump_func reply_dumpers[REQ_NB_REQUESTS] = { NULL, (dump_func)dump_get_window_layered_info_reply, NULL, + (dump_func)dump_alloc_user_handle_reply, + NULL, }; static const char * const req_names[REQ_NB_REQUESTS] = { @@ -4501,6 +4519,8 @@ static const char * const req_names[REQ_NB_REQUESTS] = { "add_fd_completion", "get_window_layered_info", "set_window_layered_info", + "alloc_user_handle", + "free_user_handle", }; static const struct diff --git a/server/user.c b/server/user.c index 6be1c8f..2515799 100644 --- a/server/user.c +++ b/server/user.c @@ -20,6 +20,7 @@ #include "thread.h" #include "user.h" +#include "request.h" struct user_handle { @@ -164,3 +165,21 @@ void *next_user_handle( user_handle_t *handle, enum user_object type ) } return NULL; } + +/* allocate an arbitrary user handle */ +DECL_HANDLER(alloc_user_handle) +{ + reply->handle = alloc_user_handle( NULL, USER_CLIENT ); +} + + +/* free an arbitrary user handle */ +DECL_HANDLER(free_user_handle) +{ + struct user_handle *entry; + + if ((entry = handle_to_entry( req->handle )) && entry->type == USER_CLIENT) + free_user_entry( entry ); + else + set_error( STATUS_INVALID_HANDLE ); +} diff --git a/server/user.h b/server/user.h index 166d20b..bf1e23c 100644 --- a/server/user.h +++ b/server/user.h @@ -35,7 +35,8 @@ struct clipboard; enum user_object { USER_WINDOW = 1, - USER_HOOK + USER_HOOK, + USER_CLIENT /* arbitrary client handle */ }; #define DESKTOP_ATOM ((atom_t)32769)

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2009