October 2009 - Wine-Commits

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

Oct. 12, 2009

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 : user32: Use client-side user handles for DeferWindowPos.
by Alexandre Julliard Oct. 12, 2009

Oct. 12, 2009

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

Louis Lenders : include: Add definition of MilMatrix3x2D.
by Alexandre Julliard Oct. 12, 2009

Oct. 12, 2009

Module: wine Branch: master Commit: be72cd213658996d86a7952c07cde055290d1b50 URL: http://source.winehq.org/git/wine.git/?a=commit;h=be72cd213658996d86a7952c0… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Sun Oct 11 23:02:27 2009 +0200 include: Add definition of MilMatrix3x2D. --- include/dwmapi.h | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/include/dwmapi.h b/include/dwmapi.h index 551138e..4fe51bc 100644 --- a/include/dwmapi.h +++ b/include/dwmapi.h @@ -31,6 +31,16 @@ extern "C" { DECLARE_HANDLE(HTHUMBNAIL); +typedef struct _MilMatrix3x2D +{ + DOUBLE S_11; + DOUBLE S_12; + DOUBLE S_21; + DOUBLE S_22; + DOUBLE DX; + DOUBLE DY; +} MilMatrix3x2D; + DWMAPI DwmEnableComposition(UINT); DWMAPI DwmEnableMMCSS(BOOL); DWMAPI DwmExtendFrameIntoClientArea(HWND,const MARGINS*);

1 0

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

Oct. 12, 2009

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

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

Oct. 12, 2009

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: Get rid of duplicated helper.
by Alexandre Julliard Oct. 12, 2009

Oct. 12, 2009

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/monthcal: Fix today link test.
by Alexandre Julliard Oct. 12, 2009

Oct. 12, 2009

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

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

Oct. 12, 2009

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: Use SDK class name for inner button window.
by Alexandre Julliard Oct. 12, 2009

Oct. 12, 2009

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/datetime: Fix wrong assumption about DTN_DATETIMECHANGE flags, add DTN_CLOSEUP notifications.
by Alexandre Julliard Oct. 12, 2009

Oct. 12, 2009

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