October 2009 - Wine-Commits

Dmitry Timoshkov : kernel32: Implement HeapQueryInformation, add some basic tests for it.
by Alexandre Julliard Oct. 12, 2009

Oct. 12, 2009

Module: wine Branch: master Commit: 27ebfdb879ad4ddccbef5a864ea6928c7b80ccc1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=27ebfdb879ad4ddccbef5a864… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Mon Oct 12 17:20:57 2009 +0900 kernel32: Implement HeapQueryInformation, add some basic tests for it. --- dlls/kernel32/heap.c | 8 ++++++ dlls/kernel32/kernel32.spec | 2 +- dlls/kernel32/tests/heap.c | 55 +++++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/heap.c | 23 ++++++++++++++++++ dlls/ntdll/ntdll.spec | 2 +- include/winternl.h | 1 + 6 files changed, 89 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/heap.c b/dlls/kernel32/heap.c index 93cf545..e85ccc3 100644 --- a/dlls/kernel32/heap.c +++ b/dlls/kernel32/heap.c @@ -291,6 +291,14 @@ SIZE_T WINAPI HeapSize( HANDLE heap, DWORD flags, LPCVOID ptr ) return RtlSizeHeap( heap, flags, ptr ); } +BOOL WINAPI HeapQueryInformation( HANDLE heap, HEAP_INFORMATION_CLASS info_class, + PVOID info, SIZE_T size_in, PSIZE_T size_out) +{ + NTSTATUS ret = RtlQueryHeapInformation( heap, info_class, info, size_in, size_out ); + if (ret) SetLastError( RtlNtStatusToDosError(ret) ); + return !ret; +} + BOOL WINAPI HeapSetInformation( HANDLE heap, HEAP_INFORMATION_CLASS infoclass, PVOID info, SIZE_T size) { FIXME("%p %d %p %ld\n", heap, infoclass, info, size ); diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index c97aa28..f5df031 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -707,7 +707,7 @@ @ stub HeapExtend @ stdcall HeapFree(long long long) ntdll.RtlFreeHeap @ stdcall HeapLock(long) -# @ stub HeapQueryInformation +@ stdcall HeapQueryInformation(long long ptr long ptr) @ stub HeapQueryTagW @ stdcall HeapReAlloc(long long ptr long) ntdll.RtlReAllocateHeap @ stub HeapSetFlags diff --git a/dlls/kernel32/tests/heap.c b/dlls/kernel32/tests/heap.c index 19b4106..c59d304 100644 --- a/dlls/kernel32/tests/heap.c +++ b/dlls/kernel32/tests/heap.c @@ -28,6 +28,8 @@ #define MAGIC_DEAD 0xdeadbeef +static BOOL (WINAPI *pHeapQueryInformation)(HANDLE, HEAP_INFORMATION_CLASS, PVOID, SIZE_T, PSIZE_T); + static SIZE_T resize_9x(SIZE_T size) { DWORD dwSizeAligned = (size + 3) & ~3; @@ -410,6 +412,58 @@ static void test_obsolete_flags(void) } } +static void test_HeapQueryInformation(void) +{ + ULONG info; + SIZE_T size; + BOOL ret; + + pHeapQueryInformation = (void *)GetProcAddress(GetModuleHandle("kernel32.dll"), "HeapQueryInformation"); + if (!pHeapQueryInformation) + { + win_skip("HeapQueryInformation is not available\n"); + return; + } + + if (0) /* crashes under XP */ + { + size = 0; + ret = pHeapQueryInformation(0, + HeapCompatibilityInformation, + &info, sizeof(info), &size); + size = 0; + ret = pHeapQueryInformation(GetProcessHeap(), + HeapCompatibilityInformation, + NULL, sizeof(info), &size); + } + + size = 0; + SetLastError(0xdeadbeef); + ret = pHeapQueryInformation(GetProcessHeap(), + HeapCompatibilityInformation, + NULL, 0, &size); + ok(!ret, "HeapQueryInformation should fail\n"); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, + "expected ERROR_INSUFFICIENT_BUFFER got %u\n", GetLastError()); + ok(size == sizeof(ULONG), "expected 4, got %lu\n", size); + + SetLastError(0xdeadbeef); + ret = pHeapQueryInformation(GetProcessHeap(), + HeapCompatibilityInformation, + NULL, 0, NULL); + ok(!ret, "HeapQueryInformation should fail\n"); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, + "expected ERROR_INSUFFICIENT_BUFFER got %u\n", GetLastError()); + + info = 0xdeadbeaf; + SetLastError(0xdeadbeef); + ret = pHeapQueryInformation(GetProcessHeap(), + HeapCompatibilityInformation, + &info, sizeof(info) + 1, NULL); + ok(ret, "HeapQueryInformation error %u\n", GetLastError()); + ok(info == 0 || info == 1 || info == 2, "expected 0, 1 or 2, got %u\n", info); +} + START_TEST(heap) { test_heap(); @@ -422,4 +476,5 @@ START_TEST(heap) test_sized_HeapReAlloc(1, (1 << 20)); test_sized_HeapReAlloc((1 << 20), (2 << 20)); test_sized_HeapReAlloc((1 << 20), 1); + test_HeapQueryInformation(); } diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index 14cac32..adaf693 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -1961,3 +1961,26 @@ ULONG WINAPI RtlGetProcessHeaps( ULONG count, HANDLE *heaps ) RtlLeaveCriticalSection( &processHeap->critSection ); return total; } + +/*********************************************************************** + * RtlQueryHeapInformation (NTDLL.@) + */ +NTSTATUS WINAPI RtlQueryHeapInformation( HANDLE heap, HEAP_INFORMATION_CLASS info_class, + PVOID info, SIZE_T size_in, PSIZE_T size_out) +{ + switch (info_class) + { + case HeapCompatibilityInformation: + if (size_out) *size_out = sizeof(ULONG); + + if (size_in < sizeof(ULONG)) + return STATUS_BUFFER_TOO_SMALL; + + *(ULONG *)info = 0; /* standard heap */ + return STATUS_SUCCESS; + + default: + FIXME("Unknown heap information class %u\n", info_class); + return STATUS_INVALID_INFO_CLASS; + } +} diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 8787611..70647d2 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -768,7 +768,7 @@ @ stdcall RtlQueryAtomInAtomTable(ptr long ptr ptr ptr ptr) @ stdcall RtlQueryDepthSList(ptr) @ stdcall RtlQueryEnvironmentVariable_U(ptr ptr ptr) -@ stub RtlQueryHeapInformation +@ stdcall RtlQueryHeapInformation(long long ptr long ptr) @ stdcall RtlQueryInformationAcl(ptr ptr long long) @ stdcall RtlQueryInformationActivationContext(long long ptr long ptr long ptr) @ stub RtlQueryInformationActiveActivationContext diff --git a/include/winternl.h b/include/winternl.h index a6fea7d..a78e9e5 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2412,6 +2412,7 @@ NTSYSAPI BOOLEAN WINAPI RtlPrefixString(const STRING*,const STRING*,BOOLEAN); NTSYSAPI BOOLEAN WINAPI RtlPrefixUnicodeString(const UNICODE_STRING*,const UNICODE_STRING*,BOOLEAN); NTSYSAPI NTSTATUS WINAPI RtlQueryAtomInAtomTable(RTL_ATOM_TABLE,RTL_ATOM,ULONG*,ULONG*,WCHAR*,ULONG*); NTSYSAPI NTSTATUS WINAPI RtlQueryEnvironmentVariable_U(PWSTR,PUNICODE_STRING,PUNICODE_STRING); +NTSYSAPI NTSTATUS WINAPI RtlQueryHeapInformation(HANDLE,HEAP_INFORMATION_CLASS,PVOID,SIZE_T,PSIZE_T); NTSYSAPI NTSTATUS WINAPI RtlQueryInformationAcl(PACL,LPVOID,DWORD,ACL_INFORMATION_CLASS); NTSYSAPI NTSTATUS WINAPI RtlQueryInformationActivationContext(ULONG,HANDLE,PVOID,ULONG,PVOID,SIZE_T,SIZE_T*); NTSYSAPI NTSTATUS WINAPI RtlQueryProcessDebugInformation(ULONG,ULONG,PDEBUG_BUFFER);

1 0

Paul Vriens : user32/tests: Fix an intermittent test failure.
by Alexandre Julliard Oct. 12, 2009

Oct. 12, 2009

Module: wine Branch: master Commit: 42f7e4a4d9b9ebc9a0364647a34910038562fe64 URL: http://source.winehq.org/git/wine.git/?a=commit;h=42f7e4a4d9b9ebc9a0364647a… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Mon Oct 12 09:21:25 2009 +0200 user32/tests: Fix an intermittent test failure. --- dlls/user32/tests/listbox.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/user32/tests/listbox.c b/dlls/user32/tests/listbox.c index 0aef698..942c780 100644 --- a/dlls/user32/tests/listbox.c +++ b/dlls/user32/tests/listbox.c @@ -303,6 +303,7 @@ static void test_ownerdraw(void) hLB = create_listbox(LBS_OWNERDRAWFIXED | WS_CHILD | WS_VISIBLE, parent); assert(hLB); + SetForegroundWindow(hLB); UpdateWindow(hLB); /* make height short enough */

1 0

Henri Verbeet : d3d9: Cleanup the stateblock test callbacks a bit.
by Alexandre Julliard Oct. 12, 2009

Oct. 12, 2009

Module: wine Branch: master Commit: 803eab27c7d69451251eeb6a77623cf377852c23 URL: http://source.winehq.org/git/wine.git/?a=commit;h=803eab27c7d69451251eeb6a7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Oct 12 10:10:25 2009 +0200 d3d9: Cleanup the stateblock test callbacks a bit. --- dlls/d3d9/tests/stateblock.c | 118 +++++++++++++++++++----------------------- 1 files changed, 53 insertions(+), 65 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=803eab27c7d69451251ee…

1 0

Nikolay Sivov : comctl32/monthcal: Handle September 1752 with a special case - it's a 19 day month.
by Alexandre Julliard Oct. 12, 2009

Oct. 12, 2009

Module: wine Branch: master Commit: 18857222ecf7c13a113efe4d15fd8952d80efcce URL: http://source.winehq.org/git/wine.git/?a=commit;h=18857222ecf7c13a113efe4d1… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sat Oct 10 23:12:43 2009 +0400 comctl32/monthcal: Handle September 1752 with a special case - it's a 19 day month. --- dlls/comctl32/monthcal.c | 17 +++++++++++++---- dlls/comctl32/tests/monthcal.c | 25 +++++++++++++++++++++++++ 2 files changed, 38 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index d75526a..9f242ed 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -184,6 +184,9 @@ int MONTHCAL_MonthLength(int month, int year) else if(month == 13) month = 1; + /* special case for calendar transition year */ + if(month == min_allowed_date.wMonth && year == min_allowed_date.wYear) return 19; + /* if we have a leap year add 1 day to February */ /* a leap year is a year either divisible by 400 */ /* or divisible by 4 and not by 100 */ @@ -1224,11 +1227,17 @@ MONTHCAL_GetMonthRange(const MONTHCAL_INFO *infoPtr, DWORD flag, SYSTEMTIME *st) switch (flag) { case GMR_VISIBLE: { - /*FIXME: currently multicalendar feature isn't implelented, so entirely + /*FIXME: currently multicalendar feature isn't implemented, so entirely visible month is current */ st[0] = st[1] = infoPtr->curSel; - st[0].wDay = 1; + if (infoPtr->curSel.wMonth == min_allowed_date.wMonth && + infoPtr->curSel.wYear == min_allowed_date.wYear) + { + st[0].wDay = min_allowed_date.wDay; + } + else + st[0].wDay = 1; st[0].wDayOfWeek = MONTHCAL_CalculateDayOfWeek(1, st[0].wMonth, st[0].wYear); st[1].wDay = MONTHCAL_MonthLength(st[1].wMonth, st[1].wYear); @@ -1239,7 +1248,7 @@ MONTHCAL_GetMonthRange(const MONTHCAL_INFO *infoPtr, DWORD flag, SYSTEMTIME *st) } case GMR_DAYSTATE: { - /*FIXME: currently multicalendar feature isn't implelented, + /*FIXME: currently multicalendar feature isn't implemented, min date from previous month and max date from next one returned */ MONTHCAL_GetMinDate(infoPtr, &st[0]); MONTHCAL_GetMaxDate(infoPtr, &st[1]); @@ -1625,7 +1634,7 @@ MONTHCAL_HitTest(const MONTHCAL_INFO *infoPtr, MCHITTESTINFO *lpht) lpht->st.wDay = day; } /* always update day of week */ - lpht->st.wDayOfWeek = MONTHCAL_CalculateDayOfWeek(day, lpht->st.wMonth, + lpht->st.wDayOfWeek = MONTHCAL_CalculateDayOfWeek(lpht->st.wDay, lpht->st.wMonth, lpht->st.wYear); goto done; } diff --git a/dlls/comctl32/tests/monthcal.c b/dlls/comctl32/tests/monthcal.c index d767066..3ead3ed 100644 --- a/dlls/comctl32/tests/monthcal.c +++ b/dlls/comctl32/tests/monthcal.c @@ -1350,6 +1350,7 @@ static void test_monthcal_monthrange(void) int res; SYSTEMTIME st_visible[2], st_daystate[2], st; HWND hwnd; + RECT r; hwnd = create_monthcal_control(0); @@ -1404,6 +1405,30 @@ static void test_monthcal_monthrange(void) ok_sequence(sequences, MONTHCAL_SEQ_INDEX, monthcal_monthrange_seq, "monthcal monthrange", FALSE); + /* resize control to display single Calendar */ + res = SendMessage(hwnd, MCM_GETMINREQRECT, 0, (LPARAM)&r); + MoveWindow(hwnd, 0, 0, r.right, r.bottom, FALSE); + + memset(&st, 0, sizeof(st)); + st.wMonth = 9; + st.wYear = 1752; + st.wDay = 14; + + res = SendMessage(hwnd, MCM_SETCURSEL, 0, (LPARAM)&st); + expect(1, res); + + /* September 1752 has 19 days */ + res = SendMessage(hwnd, MCM_GETMONTHRANGE, GMR_VISIBLE, (LPARAM)st_visible); + expect(1, res); + + expect(1752, st_visible[0].wYear); + expect(9, st_visible[0].wMonth); + expect(14, st_visible[0].wDay); + + expect(1752, st_visible[1].wYear); + expect(9, st_visible[1].wMonth); + expect(19, st_visible[1].wDay); + DestroyWindow(hwnd); }

1 0

Nikolay Sivov : comctl32/monthcal: Reuse existing calls to get day of week.
by Alexandre Julliard Oct. 12, 2009

Oct. 12, 2009

Module: wine Branch: master Commit: a00c217ce910bc20f5c40a0a864c588dc720bf37 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a00c217ce910bc20f5c40a0a8… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sat Oct 10 21:20:26 2009 +0400 comctl32/monthcal: Reuse existing calls to get day of week. --- dlls/comctl32/monthcal.c | 18 +++++++++++------- 1 files changed, 11 insertions(+), 7 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index fc73537..d75526a 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -131,10 +131,6 @@ typedef struct WNDPROC EditWndProc; /* original Edit window procedure */ } MONTHCAL_INFO, *LPMONTHCAL_INFO; - -/* 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}; - static const WCHAR themeClass[] = { 'S','c','r','o','l','l','b','a','r',0 }; /* empty SYSTEMTIME const */ @@ -389,10 +385,18 @@ static void MONTHCAL_CopyDate(const SYSTEMTIME *from, SYSTEMTIME *to) */ int MONTHCAL_CalculateDayOfWeek(WORD day, WORD month, WORD year) { - year-=(month < 3); + FILETIME ft; + SYSTEMTIME st; + + st.wYear = year; + st.wMonth = month; + st.wDay = day; + st.wHour = st.wMinute = st.wSecond = st.wMilliseconds = 0; + + SystemTimeToFileTime(&st, &ft); + FileTimeToSystemTime(&ft, &st); - return((year + year/4 - year/100 + year/400 + - DayOfWeekTable[month-1] + day ) % 7); + return st.wDayOfWeek; } /* properly updates date to point on next month */

1 0

Nikolay Sivov : comctl32/tab: Support for TCN_KEYDOWN notification.
by Alexandre Julliard Oct. 12, 2009

Oct. 12, 2009

Module: wine Branch: master Commit: 48fcccd861394f85ebae0065927431612e43739b URL: http://source.winehq.org/git/wine.git/?a=commit;h=48fcccd861394f85ebae00659… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sat Oct 10 03:27:33 2009 +0400 comctl32/tab: Support for TCN_KEYDOWN notification. --- dlls/comctl32/tab.c | 14 +++++++++++--- 1 files changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/tab.c b/dlls/comctl32/tab.c index 431c54c..22af8d7 100644 --- a/dlls/comctl32/tab.c +++ b/dlls/comctl32/tab.c @@ -46,7 +46,6 @@ * NM_RELEASEDCAPTURE * TCN_FOCUSCHANGE * TCN_GETOBJECT - * TCN_KEYDOWN * * Macros: * TabCtrl_AdjustRect @@ -488,9 +487,18 @@ TAB_GetItemRect(const TAB_INFO *infoPtr, INT item, RECT *rect) * * This method is called to handle keyboard input */ -static LRESULT TAB_KeyDown(TAB_INFO* infoPtr, WPARAM keyCode) +static LRESULT TAB_KeyDown(TAB_INFO* infoPtr, WPARAM keyCode, LPARAM lParam) { INT newItem = -1; + NMTCKEYDOWN nm; + + /* TCN_KEYDOWN notification sent always */ + nm.hdr.hwndFrom = infoPtr->hwnd; + nm.hdr.idFrom = GetWindowLongPtrW(infoPtr->hwnd, GWLP_ID); + nm.hdr.code = TCN_KEYDOWN; + nm.wVKey = keyCode; + nm.flags = lParam; + SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, nm.hdr.idFrom, (LPARAM)&nm); switch (keyCode) { @@ -3473,7 +3481,7 @@ TAB_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) break; /* Don't disturb normal focus behavior */ case WM_KEYDOWN: - return TAB_KeyDown(infoPtr, wParam); + return TAB_KeyDown(infoPtr, wParam, lParam); case WM_NCHITTEST: return TAB_NCHitTest(infoPtr, lParam);

1 0

Nikolay Sivov : comctl32/tab: Remove dead parameter check code.
by Alexandre Julliard Oct. 12, 2009

Oct. 12, 2009

Module: wine Branch: master Commit: 6f05fd2dd9ba7f8be0f7596340587cc1a27d8721 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f05fd2dd9ba7f8be0f759634… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Fri Oct 9 22:42:32 2009 +0400 comctl32/tab: Remove dead parameter check code. --- dlls/comctl32/tab.c | 16 +++++----------- 1 files changed, 5 insertions(+), 11 deletions(-) diff --git a/dlls/comctl32/tab.c b/dlls/comctl32/tab.c index 5cb7360..c9fd8a0 100644 --- a/dlls/comctl32/tab.c +++ b/dlls/comctl32/tab.c @@ -2722,9 +2722,9 @@ TAB_HighlightItem (TAB_INFO *infoPtr, INT iItem, BOOL fHighlight) TRACE("(%p,%d,%s)\n", infoPtr, iItem, fHighlight ? "true" : "false"); - if (!infoPtr || iItem < 0 || iItem >= infoPtr->uNumItem) + if (iItem < 0 || iItem >= infoPtr->uNumItem) return FALSE; - + lpState = &TAB_GetItem(infoPtr, iItem)->dwState; oldState = *lpState; @@ -3100,9 +3100,6 @@ TAB_Destroy (TAB_INFO *infoPtr) { UINT iItem; - if (!infoPtr) - return 0; - SetWindowLongPtrW(infoPtr->hwnd, 0, 0); if (infoPtr->items) { @@ -3122,7 +3119,7 @@ TAB_Destroy (TAB_INFO *infoPtr) KillTimer(infoPtr->hwnd, TAB_HOTTRACK_TIMER); CloseThemeData (GetWindowTheme (infoPtr->hwnd)); - + Free (infoPtr); return 0; } @@ -3146,7 +3143,7 @@ static LRESULT TAB_NCCalcSize(WPARAM wParam) static inline LRESULT TAB_SetItemExtra (TAB_INFO *infoPtr, INT cbInfo) { - if (!infoPtr || cbInfo <= 0) + if (cbInfo <= 0) return FALSE; if (infoPtr->uNumItem) @@ -3161,9 +3158,6 @@ TAB_SetItemExtra (TAB_INFO *infoPtr, INT cbInfo) static LRESULT TAB_RemoveImage (TAB_INFO *infoPtr, INT image) { - if (!infoPtr) - return 0; - if (ImageList_Remove (infoPtr->himl, image)) { INT i, *idx; @@ -3334,7 +3328,7 @@ TAB_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) return TAB_InsertItemT (infoPtr, wParam, lParam, uMsg == TCM_INSERTITEMW); case TCM_SETITEMEXTRA: - return TAB_SetItemExtra (infoPtr, (int)wParam); + return TAB_SetItemExtra (infoPtr, (INT)wParam); case TCM_ADJUSTRECT: return TAB_AdjustRect (infoPtr, (BOOL)wParam, (LPRECT)lParam);

1 0

Nikolay Sivov : comctl32/tab: Remove unnecessary helper parameter, use SDK name for UpDown control.
by Alexandre Julliard Oct. 12, 2009

Oct. 12, 2009

Module: wine Branch: master Commit: b0952c959bba6752109496909a79c1c9ee0c1bcb URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0952c959bba6752109496909… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Fri Oct 9 22:35:54 2009 +0400 comctl32/tab: Remove unnecessary helper parameter, use SDK name for UpDown control. --- dlls/comctl32/tab.c | 17 +++++++---------- 1 files changed, 7 insertions(+), 10 deletions(-) diff --git a/dlls/comctl32/tab.c b/dlls/comctl32/tab.c index a611b64..5cb7360 100644 --- a/dlls/comctl32/tab.c +++ b/dlls/comctl32/tab.c @@ -957,14 +957,11 @@ static LRESULT TAB_OnHScroll(TAB_INFO *infoPtr, int nScrollCode, int nPos) * scrolling control is displayed (or not). */ static void TAB_SetupScrolling( - HWND hwnd, TAB_INFO* infoPtr, const RECT* clientRect) { - static const WCHAR msctls_updown32W[] = { 'm','s','c','t','l','s','_','u','p','d','o','w','n','3','2',0 }; static const WCHAR emptyW[] = { 0 }; INT maxRange = 0; - DWORD lStyle = GetWindowLongW(hwnd, GWL_STYLE); if (infoPtr->needsScrolling) { @@ -974,12 +971,12 @@ static void TAB_SetupScrolling( /* * Calculate the position of the scroll control. */ - if(lStyle & TCS_VERTICAL) + if(infoPtr->dwStyle & TCS_VERTICAL) { controlPos.right = clientRect->right; controlPos.left = controlPos.right - 2 * GetSystemMetrics(SM_CXHSCROLL); - if (lStyle & TCS_BOTTOM) + if (infoPtr->dwStyle & TCS_BOTTOM) { controlPos.top = clientRect->bottom - infoPtr->tabHeight; controlPos.bottom = controlPos.top + GetSystemMetrics(SM_CYHSCROLL); @@ -995,7 +992,7 @@ static void TAB_SetupScrolling( controlPos.right = clientRect->right; controlPos.left = controlPos.right - 2 * GetSystemMetrics(SM_CXHSCROLL); - if (lStyle & TCS_BOTTOM) + if (infoPtr->dwStyle & TCS_BOTTOM) { controlPos.top = clientRect->bottom - infoPtr->tabHeight; controlPos.bottom = controlPos.top + GetSystemMetrics(SM_CYHSCROLL); @@ -1013,12 +1010,12 @@ static void TAB_SetupScrolling( */ if (infoPtr->hwndUpDown==0) { - infoPtr->hwndUpDown = CreateWindowW(msctls_updown32W, emptyW, + infoPtr->hwndUpDown = CreateWindowW(UPDOWN_CLASSW, emptyW, WS_VISIBLE | WS_CHILD | UDS_HORZ, controlPos.left, controlPos.top, controlPos.right - controlPos.left, controlPos.bottom - controlPos.top, - hwnd, NULL, NULL, NULL); + infoPtr->hwnd, NULL, NULL, NULL); } else { @@ -1053,7 +1050,7 @@ static void TAB_SetupScrolling( else { /* If we once had a scroll control... hide it */ - if (infoPtr->hwndUpDown!=0) + if (infoPtr->hwndUpDown) ShowWindow(infoPtr->hwndUpDown, SW_HIDE); } if (infoPtr->hwndUpDown) @@ -1267,7 +1264,7 @@ static void TAB_SetItemBounds (TAB_INFO *infoPtr) infoPtr->needsScrolling = FALSE; infoPtr->leftmostVisible = 0; } - TAB_SetupScrolling(infoPtr->hwnd, infoPtr, &clientRect); + TAB_SetupScrolling(infoPtr, &clientRect); /* Set the number of rows */ infoPtr->uNumRows = curItemRowCount;

1 0

Nikolay Sivov : comctl32/tab: Cache window GWL_STYLE style.
by Alexandre Julliard Oct. 12, 2009

Oct. 12, 2009

Module: wine Branch: master Commit: 9b06ec73fcd470367751f052718ab47aafd35d1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b06ec73fcd470367751f0527… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Fri Oct 9 22:27:32 2009 +0400 comctl32/tab: Cache window GWL_STYLE style. --- dlls/comctl32/tab.c | 231 +++++++++++++++++++++++++++------------------------ 1 files changed, 123 insertions(+), 108 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9b06ec73fcd470367751f…

1 0

Henri Verbeet : d3d8: Cleanup the stateblock test callbacks a bit.
by Alexandre Julliard Oct. 12, 2009

Oct. 12, 2009

Module: wine Branch: master Commit: eb9727bbabb1cb125ec0ef23edcb89b4119a039d URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb9727bbabb1cb125ec0ef23e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Oct 12 10:10:24 2009 +0200 d3d8: Cleanup the stateblock test callbacks a bit. This mostly just makes the naming more conistent with what we use in other D3D code, but also passes the device to the init() and cleanup() callbacks to allow device resources to be created there. Future tests require this. --- dlls/d3d8/tests/stateblock.c | 98 ++++++++++++++++++------------------------ 1 files changed, 42 insertions(+), 56 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=eb9727bbabb1cb125ec0e…

1 0