October 2009 - Wine-commits

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: 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 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

Nikolay Sivov : comctl32: Don' t use additional heap allocated pointer to old window procedure.
by Alexandre Julliard 12 Oct '09

12 Oct '09

Module: wine Branch: master Commit: a4b5c5db1c52a29d1145a01045bcab8ca209dee5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4b5c5db1c52a29d1145a0104… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sun Oct 11 16:25:17 2009 +0400 comctl32: Don't use additional heap allocated pointer to old window procedure. --- dlls/comctl32/tests/datetime.c | 26 +++-------- dlls/comctl32/tests/header.c | 20 +++------ dlls/comctl32/tests/listview.c | 95 ++++++++++++--------------------------- dlls/comctl32/tests/monthcal.c | 27 +++-------- dlls/comctl32/tests/tab.c | 19 ++------ dlls/comctl32/tests/trackbar.c | 26 +++-------- dlls/comctl32/tests/updown.c | 49 ++++++--------------- 7 files changed, 74 insertions(+), 188 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a4b5c5db1c52a29d1145a…

1 0

Nikolay Sivov : comctl32/datetime: Get rid of duplicated helper.
by Alexandre Julliard 12 Oct '09

12 Oct '09

Module: wine Branch: master Commit: 8431bed5f60fac3e237fff6aa86e356c38935ca1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8431bed5f60fac3e237fff6aa… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sun Oct 11 17:05:36 2009 +0400 comctl32/datetime: Get rid of duplicated helper. --- dlls/comctl32/datetime.c | 31 +++++++------------------------ 1 files changed, 7 insertions(+), 24 deletions(-) diff --git a/dlls/comctl32/datetime.c b/dlls/comctl32/datetime.c index f00b588..5cd8b19 100644 --- a/dlls/comctl32/datetime.c +++ b/dlls/comctl32/datetime.c @@ -448,19 +448,6 @@ DATETIME_ReturnTxt (const DATETIME_INFO *infoPtr, int count, LPWSTR result, int TRACE ("arg%d=%x->[%s]\n", count, infoPtr->fieldspec[count], debugstr_w(result)); } -/* Offsets of days in the week to the weekday of january 1 in a leap year. */ -static const int DayOfWeekTable[] = {0, 3, 2, 5, 0, 3, 5, 1, 4, 6, 2, 4}; - -/* returns the day in the week(0 == sunday, 6 == saturday) */ -/* day(1 == 1st, 2 == 2nd... etc), year is the year value */ -static int DATETIME_CalculateDayOfWeek(DWORD day, DWORD month, DWORD year) -{ - year-=(month < 3); - - return((year + year/4 - year/100 + year/400 + - DayOfWeekTable[month-1] + day ) % 7); -} - static int wrap(int val, int delta, int minVal, int maxVal) { val += delta; @@ -484,14 +471,14 @@ DATETIME_IncreaseField (DATETIME_INFO *infoPtr, int number, int delta) case TWODIGITYEAR: case FULLYEAR: date->wYear = wrap(date->wYear, delta, 1752, 9999); - date->wDayOfWeek = DATETIME_CalculateDayOfWeek(date->wDay,date->wMonth,date->wYear); + MONTHCAL_CalculateDayOfWeek(date, TRUE); break; case ONEDIGITMONTH: case TWODIGITMONTH: case THREECHARMONTH: case FULLMONTH: date->wMonth = wrap(date->wMonth, delta, 1, 12); - date->wDayOfWeek = DATETIME_CalculateDayOfWeek(date->wDay,date->wMonth,date->wYear); + MONTHCAL_CalculateDayOfWeek(date, TRUE); delta = 0; /* fall through */ case ONEDIGITDAY: @@ -499,7 +486,7 @@ DATETIME_IncreaseField (DATETIME_INFO *infoPtr, int number, int delta) case THREECHARDAY: case FULLDAY: date->wDay = wrap(date->wDay, delta, 1, MONTHCAL_MonthLength(date->wMonth, date->wYear)); - date->wDayOfWeek = DATETIME_CalculateDayOfWeek(date->wDay,date->wMonth,date->wYear); + MONTHCAL_CalculateDayOfWeek(date, TRUE); break; case ONELETTERAMPM: case TWOLETTERAMPM: @@ -1042,16 +1029,14 @@ DATETIME_Char (DATETIME_INFO *infoPtr, WPARAM vkCode) case TWODIGITYEAR: date->wYear = date->wYear - (date->wYear%100) + (date->wYear%10)*10 + num; - date->wDayOfWeek = DATETIME_CalculateDayOfWeek( - date->wDay,date->wMonth,date->wYear); + MONTHCAL_CalculateDayOfWeek(date, TRUE); DATETIME_SendDateTimeChangeNotify (infoPtr); break; case INVALIDFULLYEAR: case FULLYEAR: /* reset current year initialy */ date->wYear = ((date->wYear/1000) ? 0 : 1)*(date->wYear%1000)*10 + num; - date->wDayOfWeek = DATETIME_CalculateDayOfWeek( - date->wDay,date->wMonth,date->wYear); + MONTHCAL_CalculateDayOfWeek(date, TRUE); DATETIME_SendDateTimeChangeNotify (infoPtr); break; case ONEDIGITMONTH: @@ -1060,8 +1045,7 @@ DATETIME_Char (DATETIME_INFO *infoPtr, WPARAM vkCode) date->wMonth = num; else date->wMonth = (date->wMonth%10)*10+num; - date->wDayOfWeek = DATETIME_CalculateDayOfWeek( - date->wDay,date->wMonth,date->wYear); + MONTHCAL_CalculateDayOfWeek(date, TRUE); DATETIME_SendDateTimeChangeNotify (infoPtr); break; case ONEDIGITDAY: @@ -1071,8 +1055,7 @@ DATETIME_Char (DATETIME_INFO *infoPtr, WPARAM vkCode) date->wDay = num; else date->wDay = newDays; - date->wDayOfWeek = DATETIME_CalculateDayOfWeek( - date->wDay,date->wMonth,date->wYear); + MONTHCAL_CalculateDayOfWeek(date, TRUE); DATETIME_SendDateTimeChangeNotify (infoPtr); break; case ONEDIGIT12HOUR:

1 0

Nikolay Sivov : comctl32/datetime: Fix wrong assumption about DTN_DATETIMECHANGE flags, add DTN_CLOSEUP notifications.
by Alexandre Julliard 12 Oct '09

12 Oct '09

Module: wine Branch: master Commit: a096ba4c5b444110e734612dfa61af27373cd88f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a096ba4c5b444110e734612df… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sun Oct 11 18:12:46 2009 +0400 comctl32/datetime: Fix wrong assumption about DTN_DATETIMECHANGE flags, add DTN_CLOSEUP notifications. --- dlls/comctl32/datetime.c | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/datetime.c b/dlls/comctl32/datetime.c index 5cd8b19..65f7005 100644 --- a/dlls/comctl32/datetime.c +++ b/dlls/comctl32/datetime.c @@ -31,7 +31,6 @@ * TODO: * -- DTS_APPCANPARSE * -- DTS_SHORTDATECENTURYFORMAT - * -- DTN_CLOSEUP * -- DTN_FORMAT * -- DTN_FORMATQUERY * -- DTN_USERSTRING @@ -811,20 +810,23 @@ DATETIME_LButtonDown (DATETIME_INFO *infoPtr, INT x, INT y) if(IsWindowVisible(infoPtr->hMonthCal)) { ShowWindow(infoPtr->hMonthCal, SW_HIDE); + infoPtr->bDropdownEnabled = FALSE; + DATETIME_SendSimpleNotify (infoPtr, DTN_CLOSEUP); } else { const SYSTEMTIME *lprgSysTimeArray = &infoPtr->date; TRACE("update calendar %04d/%02d/%02d\n", lprgSysTimeArray->wYear, lprgSysTimeArray->wMonth, lprgSysTimeArray->wDay); SendMessageW(infoPtr->hMonthCal, MCM_SETCURSEL, 0, (LPARAM)(&infoPtr->date)); - if (infoPtr->bDropdownEnabled) + if (infoPtr->bDropdownEnabled) { ShowWindow(infoPtr->hMonthCal, SW_SHOW); + DATETIME_SendSimpleNotify (infoPtr, DTN_DROPDOWN); + } infoPtr->bDropdownEnabled = TRUE; } TRACE ("dt:%p mc:%p mc parent:%p, desktop:%p\n", infoPtr->hwndSelf, infoPtr->hMonthCal, infoPtr->hwndNotify, GetDesktopWindow ()); - DATETIME_SendSimpleNotify (infoPtr, DTN_DROPDOWN); } InvalidateRect(infoPtr->hwndSelf, NULL, TRUE); @@ -944,6 +946,7 @@ DATETIME_Notify (DATETIME_INFO *infoPtr, LPNMHDR lpnmh) SendMessageW (infoPtr->hwndCheckbut, BM_SETCHECK, BST_CHECKED, 0); InvalidateRect(infoPtr->hwndSelf, NULL, TRUE); DATETIME_SendDateTimeChangeNotify (infoPtr); + DATETIME_SendSimpleNotify(infoPtr, DTN_CLOSEUP); } if ((lpnmh->hwndFrom == infoPtr->hUpdown) && (lpnmh->code == UDN_DELTAPOS)) { LPNMUPDOWN lpnmud = (LPNMUPDOWN)lpnmh; @@ -1188,7 +1191,7 @@ DATETIME_SendDateTimeChangeNotify (const DATETIME_INFO *infoPtr) dtdtc.nmhdr.idFrom = GetWindowLongPtrW(infoPtr->hwndSelf, GWLP_ID); dtdtc.nmhdr.code = DTN_DATETIMECHANGE; - dtdtc.dwFlags = (infoPtr->dwStyle & DTS_SHOWNONE) ? GDT_NONE : GDT_VALID; + dtdtc.dwFlags = infoPtr->dateValid ? GDT_VALID : GDT_NONE; dtdtc.st = infoPtr->date; return (BOOL) SendMessageW (infoPtr->hwndNotify, WM_NOTIFY,

1 0

Nikolay Sivov : comctl32/datetime: It isn' t allowed to change DTS_SHOWNONE after creation.
by Alexandre Julliard 12 Oct '09

12 Oct '09

Module: wine Branch: master Commit: f12f948849408881e2c4ea5a24b064b085c96fe0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f12f948849408881e2c4ea5a2… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sun Oct 11 18:23:16 2009 +0400 comctl32/datetime: It isn't allowed to change DTS_SHOWNONE after creation. --- dlls/comctl32/datetime.c | 20 ++++++++++++++++++++ dlls/comctl32/tests/datetime.c | 22 ++++++++++++++++++++++ 2 files changed, 42 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/datetime.c b/dlls/comctl32/datetime.c index 65f7005..2b3d64b 100644 --- a/dlls/comctl32/datetime.c +++ b/dlls/comctl32/datetime.c @@ -1251,6 +1251,23 @@ DATETIME_Size (DATETIME_INFO *infoPtr, INT width, INT height) return 0; } +static LRESULT +DATETIME_StyleChanging(DATETIME_INFO *infoPtr, WPARAM wStyleType, STYLESTRUCT *lpss) +{ + TRACE("(styletype=%lx, styleOld=0x%08x, styleNew=0x%08x)\n", + wStyleType, lpss->styleOld, lpss->styleNew); + + /* block DTS_SHOWNONE change */ + if ((lpss->styleNew ^ lpss->styleOld) & DTS_SHOWNONE) + { + if (lpss->styleOld & DTS_SHOWNONE) + lpss->styleNew |= DTS_SHOWNONE; + else + lpss->styleNew &= ~DTS_SHOWNONE; + } + + return 0; +} static LRESULT DATETIME_StyleChanged(DATETIME_INFO *infoPtr, WPARAM wStyleType, const STYLESTRUCT *lpss) @@ -1449,6 +1466,9 @@ DATETIME_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) case WM_COMMAND: return DATETIME_Command (infoPtr, wParam, lParam); + case WM_STYLECHANGING: + return DATETIME_StyleChanging(infoPtr, wParam, (LPSTYLESTRUCT)lParam); + case WM_STYLECHANGED: return DATETIME_StyleChanged(infoPtr, wParam, (LPSTYLESTRUCT)lParam); diff --git a/dlls/comctl32/tests/datetime.c b/dlls/comctl32/tests/datetime.c index 973d411..8a3ad03 100644 --- a/dlls/comctl32/tests/datetime.c +++ b/dlls/comctl32/tests/datetime.c @@ -677,6 +677,27 @@ static void test_wm_set_get_text(void) DestroyWindow(hWnd); } +static void test_dts_shownone(void) +{ + HWND hwnd; + DWORD style; + + /* it isn't allowed to change DTS_SHOWNONE after creation */ + hwnd = create_datetime_control(0); + style = GetWindowLong(hwnd, GWL_STYLE); + SetWindowLong(hwnd, GWL_STYLE, style | DTS_SHOWNONE); + style = GetWindowLong(hwnd, GWL_STYLE); + ok(!(style & DTS_SHOWNONE), "Expected DTS_SHOWNONE not to be set\n"); + DestroyWindow(hwnd); + + hwnd = create_datetime_control(DTS_SHOWNONE); + style = GetWindowLong(hwnd, GWL_STYLE); + SetWindowLong(hwnd, GWL_STYLE, style & ~DTS_SHOWNONE); + style = GetWindowLong(hwnd, GWL_STYLE); + ok(style & DTS_SHOWNONE, "Expected DTS_SHOWNONE to be set\n"); + DestroyWindow(hwnd); +} + START_TEST(datetime) { HMODULE hComctl32; @@ -704,4 +725,5 @@ START_TEST(datetime) test_dtm_set_range_swap_min_max(); test_dtm_set_and_get_system_time(); test_wm_set_get_text(); + test_dts_shownone(); }

1 0

Nikolay Sivov : comctl32/datetime: Use SDK class name for inner button window.
by Alexandre Julliard 12 Oct '09

12 Oct '09

Module: wine Branch: master Commit: a914372586e3e990627700136704428431e7a0c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a914372586e3e990627700136… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sun Oct 11 18:43:52 2009 +0400 comctl32/datetime: Use SDK class name for inner button window. --- dlls/comctl32/datetime.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/datetime.c b/dlls/comctl32/datetime.c index 2b3d64b..724cba7 100644 --- a/dlls/comctl32/datetime.c +++ b/dlls/comctl32/datetime.c @@ -932,7 +932,7 @@ DATETIME_EraseBackground (const DATETIME_INFO *infoPtr, HDC hdc) static LRESULT -DATETIME_Notify (DATETIME_INFO *infoPtr, LPNMHDR lpnmh) +DATETIME_Notify (DATETIME_INFO *infoPtr, const NMHDR *lpnmh) { TRACE ("Got notification %x from %p\n", lpnmh->code, lpnmh->hwndFrom); TRACE ("info: %p %p %p\n", infoPtr->hwndSelf, infoPtr->hMonthCal, infoPtr->hUpdown); @@ -1272,8 +1272,6 @@ DATETIME_StyleChanging(DATETIME_INFO *infoPtr, WPARAM wStyleType, STYLESTRUCT *l static LRESULT DATETIME_StyleChanged(DATETIME_INFO *infoPtr, WPARAM wStyleType, const STYLESTRUCT *lpss) { - static const WCHAR buttonW[] = { 'b', 'u', 't', 't', 'o', 'n', 0 }; - TRACE("(styletype=%lx, styleOld=0x%08x, styleNew=0x%08x)\n", wStyleType, lpss->styleOld, lpss->styleNew); @@ -1282,7 +1280,7 @@ DATETIME_StyleChanged(DATETIME_INFO *infoPtr, WPARAM wStyleType, const STYLESTRU infoPtr->dwStyle = lpss->styleNew; if ( !(lpss->styleOld & DTS_SHOWNONE) && (lpss->styleNew & DTS_SHOWNONE) ) { - infoPtr->hwndCheckbut = CreateWindowExW (0, buttonW, 0, WS_CHILD | WS_VISIBLE | BS_AUTOCHECKBOX, + infoPtr->hwndCheckbut = CreateWindowExW (0, WC_BUTTONW, 0, WS_CHILD | WS_VISIBLE | BS_AUTOCHECKBOX, 2, 2, 13, 13, infoPtr->hwndSelf, 0, (HINSTANCE)GetWindowLongPtrW (infoPtr->hwndSelf, GWLP_HINSTANCE), 0); SendMessageW (infoPtr->hwndCheckbut, BM_SETCHECK, 1, 0);

1 0

Nikolay Sivov : comctl32/monthcal: Fix today link test.
by Alexandre Julliard 12 Oct '09

12 Oct '09

Module: wine Branch: master Commit: 5a244bc86394c65ad221ea85860e6e29402edac1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a244bc86394c65ad221ea858… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sun Oct 11 19:02:51 2009 +0400 comctl32/monthcal: Fix today link test. --- dlls/comctl32/tests/monthcal.c | 36 ++++++++++++++---------------------- 1 files changed, 14 insertions(+), 22 deletions(-) diff --git a/dlls/comctl32/tests/monthcal.c b/dlls/comctl32/tests/monthcal.c index c9b4dec..b8e64cc 100644 --- a/dlls/comctl32/tests/monthcal.c +++ b/dlls/comctl32/tests/monthcal.c @@ -219,7 +219,7 @@ static const struct message monthcal_todaylink_seq[] = { { MCM_SETTODAY, sent|wparam, 0}, { WM_PAINT, sent|wparam|lparam|defwinproc, 0, 0}, { MCM_GETTODAY, sent|wparam, 0}, - { WM_LBUTTONDOWN, sent|wparam|lparam, MK_LBUTTON, MAKELONG(70, 370)}, + { WM_LBUTTONDOWN, sent|wparam, MK_LBUTTON}, { WM_CAPTURECHANGED, sent|wparam|lparam|defwinproc, 0, 0}, { WM_PAINT, sent|wparam|lparam|defwinproc, 0, 0}, { MCM_GETCURSEL, sent|wparam, 0}, @@ -1181,54 +1181,46 @@ static void test_monthcal_todaylink(void) { MCHITTESTINFO mchit; SYSTEMTIME st_test, st_new; - BOOL error = FALSE; UINT res; HWND hwnd; + RECT r; memset(&mchit, 0, sizeof(MCHITTESTINFO)); hwnd = create_monthcal_control(0); + res = SendMessage(hwnd, MCM_GETMINREQRECT, 0, (LPARAM)&r); + MoveWindow(hwnd, 0, 0, r.right, r.bottom, FALSE); + flush_sequences(sequences, NUM_MSG_SEQUENCES); - /* (70, 370) is in active area - today link */ + /* hit active area - today link */ mchit.cbSize = MCHITTESTINFO_V1_SIZE; - mchit.pt.x = 70; - mchit.pt.y = 370; + mchit.pt.x = r.right / 14; + mchit.pt.y = 18 * r.bottom / 19; res = SendMessage(hwnd, MCM_HITTEST, 0, (LPARAM) & mchit); - expect(70, mchit.pt.x); - expect(370, mchit.pt.y); + expect(r.right / 14, mchit.pt.x); + expect(18 * r.bottom / 19, mchit.pt.y); expect(mchit.uHit, res); - todo_wine {expect(MCHT_TODAYLINK, res);} - if (70 != mchit.pt.x || 370 != mchit.pt.y || mchit.uHit != res - || MCHT_TODAYLINK != res) - error = TRUE; + expect(MCHT_TODAYLINK, res); st_test.wDay = 1; st_test.wMonth = 1; st_test.wYear = 2005; - memset(&st_new, 0, sizeof(SYSTEMTIME)); SendMessage(hwnd, MCM_SETTODAY, 0, (LPARAM)&st_test); + memset(&st_new, 0, sizeof(st_new)); res = SendMessage(hwnd, MCM_GETTODAY, 0, (LPARAM)&st_new); expect(1, res); expect(1, st_new.wDay); expect(1, st_new.wMonth); expect(2005, st_new.wYear); - if (1 != res || 1 != st_new.wDay || 1 != st_new.wMonth - || 2005 != st_new.wYear) - error = TRUE; - - if (error) { - skip("cannot perform today link test\n"); - return; - } - res = SendMessage(hwnd, WM_LBUTTONDOWN, MK_LBUTTON, MAKELONG(70, 370)); + res = SendMessage(hwnd, WM_LBUTTONDOWN, MK_LBUTTON, MAKELONG(mchit.pt.x, mchit.pt.y)); expect(0, res); - memset(&st_new, 0, sizeof(SYSTEMTIME)); + memset(&st_new, 0, sizeof(st_new)); res = SendMessage(hwnd, MCM_GETCURSEL, 0, (LPARAM)&st_new); expect(1, res); expect(1, st_new.wDay);

1 0

Austin English : include: fix a compiler warning on GNU/FreeBSD.
by Alexandre Julliard 12 Oct '09

12 Oct '09

Module: wine Branch: master Commit: cc34e753852d7f801fd4f42358fe4270bb869deb URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc34e753852d7f801fd4f4235… Author: Austin English <austinenglish(a)gmail.com> Date: Sun Oct 11 02:21:52 2009 -0500 include: fix a compiler warning on GNU/FreeBSD. --- include/wine/list.h | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/include/wine/list.h b/include/wine/list.h index b610e5e..da3ce91 100644 --- a/include/wine/list.h +++ b/include/wine/list.h @@ -221,9 +221,11 @@ static inline void list_move_head( struct list *dst, struct list *src ) (cursor2) = LIST_ENTRY((cursor)->field.prev, type, field)) /* macros for statically initialized lists */ +#undef LIST_INIT #define LIST_INIT(list) { &(list), &(list) } /* get pointer to object containing list element */ +#undef LIST_ENTRY #define LIST_ENTRY(elem, type, field) \ ((type *)((char *)(elem) - (unsigned long)(&((type *)0)->field)))

1 0