October 2009 - Wine-commits

Eric Pouech : msvcrt: Added __uncaught_exception support.
by Alexandre Julliard 05 Oct '09

05 Oct '09

Module: wine Branch: master Commit: dcf68254bd315bf1227e8e849077189daff44971 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dcf68254bd315bf1227e8e849… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sat Oct 3 13:13:37 2009 +0200 msvcrt: Added __uncaught_exception support. --- dlls/msvcr71/msvcr71.spec | 2 +- dlls/msvcrt/except.c | 8 ++++++++ dlls/msvcrt/msvcrt.spec | 1 + 3 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/msvcr71/msvcr71.spec b/dlls/msvcr71/msvcr71.spec index fc693bd..7552ca3 100644 --- a/dlls/msvcr71/msvcr71.spec +++ b/dlls/msvcr71/msvcr71.spec @@ -30,7 +30,7 @@ @ stub ??_Fbad_typeid@@QAEXXZ @ cdecl ??_U(a)YAPAXI@Z(long) msvcrt.??_U(a)YAPAXI@Z @ cdecl ??_V(a)YAXPAX@Z(ptr) msvcrt.??_V(a)YAXPAX@Z -@ stub __uncaught_exception +@ cdecl __uncaught_exception() msvcrt.__uncaught_exception @ cdecl ?_query_new_handler@@YAP6AHI(a)ZXZ() msvcrt.?_query_new_handler@@YAP6AHI(a)ZXZ @ cdecl ?_query_new_mode@@YAHXZ() msvcrt.?_query_new_mode@@YAHXZ @ cdecl ?_set_new_handler@@YAP6AHI(a)ZP6AHI@Z(a)Z(ptr) msvcrt.?_set_new_handler@@YAP6AHI(a)ZP6AHI@Z(a)Z diff --git a/dlls/msvcrt/except.c b/dlls/msvcrt/except.c index 5de42db..119469b 100644 --- a/dlls/msvcrt/except.c +++ b/dlls/msvcrt/except.c @@ -608,3 +608,11 @@ int CDECL _XcptFilter(NTSTATUS ex, PEXCEPTION_POINTERS ptr) /* I assume ptr->ExceptionRecord->ExceptionCode is the same as ex */ return msvcrt_exception_filter(ptr); } + +/****************************************************************** + * MSVCRT___uncaught_exception + */ +BOOL CDECL MSVCRT___uncaught_exception(void) +{ + return FALSE; +} diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index d143bee..ad8fa94 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -151,6 +151,7 @@ @ cdecl __threadhandle() kernel32.GetCurrentThread @ cdecl __threadid() kernel32.GetCurrentThreadId @ cdecl __toascii(long) MSVCRT___toascii +@ cdecl __uncaught_exception() MSVCRT___uncaught_exception @ cdecl __unDName(ptr str long ptr ptr long) @ cdecl __unDNameEx(ptr str long ptr ptr ptr long) @ extern __unguarded_readlc_active MSVCRT___unguarded_readlc_active

1 0

Eric Pouech : dbghelp: Enhance support for constant values in dwarf debug information.
by Alexandre Julliard 05 Oct '09

05 Oct '09

Module: wine Branch: master Commit: 6a1b2a9ca55374e9dc117dcc8dc3847aac2c471e URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a1b2a9ca55374e9dc117dcc8… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sat Oct 3 13:15:43 2009 +0200 dbghelp: Enhance support for constant values in dwarf debug information. --- dlls/dbghelp/dwarf.c | 14 +++++++++++++- dlls/dbghelp/symbol.c | 1 + 2 files changed, 14 insertions(+), 1 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 7843e67..e5617c3 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -1393,12 +1393,24 @@ static void dwarf2_parse_variable(dwarf2_subprogram_t* subpgm, v.n1.n2.n3.byref = pool_strdup(&subpgm->ctx->module->pool, value.u.string); break; - case DW_FORM_data8: case DW_FORM_block: case DW_FORM_block1: case DW_FORM_block2: case DW_FORM_block4: + v.n1.n2.vt = VT_I4; + switch (value.u.block.size) + { + case 1: v.n1.n2.n3.lVal = *(BYTE*)value.u.block.ptr; break; + case 2: v.n1.n2.n3.lVal = *(USHORT*)value.u.block.ptr; break; + case 4: v.n1.n2.n3.lVal = *(DWORD*)value.u.block.ptr; break; + default: + v.n1.n2.vt = VT_I1 | VT_BYREF; + v.n1.n2.n3.byref = pool_alloc(&subpgm->ctx->module->pool, value.u.block.size); + memcpy(v.n1.n2.n3.byref, value.u.block.ptr, value.u.block.size); + } + break; + case DW_FORM_data8: default: FIXME("Unsupported form for const value %s (%lx)\n", name.u.string, value.form); diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index 34d00b2..c322a62 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -703,6 +703,7 @@ static void symt_fill_sym_info(const struct module_pair* pair, case VT_UI2: sym_info->Value = (ULONG)data->u.value.n1.n2.n3.uiVal; break; case VT_UI1: sym_info->Value = (ULONG)data->u.value.n1.n2.n3.bVal; break; case VT_I1 | VT_BYREF: sym_info->Value = (ULONG)data->u.value.n1.n2.n3.byref; break; + case VT_EMPTY: sym_info->Value = 0; break; default: FIXME("Unsupported variant type (%u)\n", data->u.value.n1.n2.vt); sym_info->Value = 0;

1 0

Eric Pouech : winedbg: Properly manage Wine' s dbghelp extensions for constant symbols which value is passed by ref.
by Alexandre Julliard 05 Oct '09

05 Oct '09

Module: wine Branch: master Commit: 700d9df4140596e3bd8cad60e42e2784ec7e2319 URL: http://source.winehq.org/git/wine.git/?a=commit;h=700d9df4140596e3bd8cad60e… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sat Oct 3 13:15:49 2009 +0200 winedbg: Properly manage Wine's dbghelp extensions for constant symbols which value is passed by ref. --- programs/winedbg/symbol.c | 37 ++++++++++++++++++++++++++----------- 1 files changed, 26 insertions(+), 11 deletions(-) diff --git a/programs/winedbg/symbol.c b/programs/winedbg/symbol.c index e0553e7..abc7d2d 100644 --- a/programs/winedbg/symbol.c +++ b/programs/winedbg/symbol.c @@ -91,24 +91,39 @@ static BOOL fill_sym_lvalue(const SYMBOL_INFO* sym, ULONG base, { struct dbg_type type; VARIANT v; - DWORD* pdw; type.module = sym->ModBase; type.id = sym->info; - /* FIXME: this won't work for pointers, as we always for the - * dereference to be in debuggee address space while here - * it's in debugger address space - */ - if (!types_get_info(&type, TI_GET_VALUE, &v) || (v.n1.n2.vt & VT_BYREF)) + if (!types_get_info(&type, TI_GET_VALUE, &v)) { - if (buffer) snprintf(buffer, sz, "Couldn't dereference pointer for const value"); + if (buffer) snprintf(buffer, sz, "Couldn't get full value information for %s", sym->Name); return FALSE; } - pdw = (DWORD*)lexeme_alloc_size(sizeof(*pdw)); - lvalue->cookie = DLV_HOST; - lvalue->addr.Offset = (ULONG)(DWORD_PTR)pdw; - *pdw = sym->Value; + else if (v.n1.n2.vt & VT_BYREF) + { + /* FIXME: this won't work for pointers or arrays, as we don't always + * know, if the value to be dereferenced lies in debuggee or + * debugger address space. + */ + if (sym->Tag == SymTagPointerType || sym->Tag == SymTagArrayType) + { + if (buffer) snprintf(buffer, sz, "Couldn't dereference pointer for const value for %s", sym->Name); + return FALSE; + } + /* this is likely Wine's dbghelp which passes const values by reference + * (object is managed by dbghelp, hence in debugger address space) + */ + lvalue->cookie = DLV_HOST; + lvalue->addr.Offset = (DWORD_PTR)sym->Value; + } + else + { + DWORD* pdw = (DWORD*)lexeme_alloc_size(sizeof(*pdw)); + lvalue->cookie = DLV_HOST; + lvalue->addr.Offset = (DWORD_PTR)pdw; + *pdw = sym->Value; + } } else if (sym->Flags & SYMFLAG_LOCAL) {

1 0

Nikolay Sivov : comctl32/monthcal: Drop exstyle parameter, it isn't used.
by Alexandre Julliard 05 Oct '09

05 Oct '09

Module: wine Branch: master Commit: ec3e9308da35c614f67af17e36e82a8987885f43 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec3e9308da35c614f67af17e3… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sun Oct 4 18:26:43 2009 +0400 comctl32/monthcal: Drop exstyle parameter, it isn't used. --- dlls/comctl32/tests/datetime.c | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/comctl32/tests/datetime.c b/dlls/comctl32/tests/datetime.c index c449e45..a0f12f0 100644 --- a/dlls/comctl32/tests/datetime.c +++ b/dlls/comctl32/tests/datetime.c @@ -149,7 +149,7 @@ static LRESULT WINAPI datetime_subclass_proc(HWND hwnd, UINT message, WPARAM wPa return ret; } -static HWND create_datetime_control(DWORD style, DWORD exstyle) +static HWND create_datetime_control(DWORD style) { struct subclass_info *info; HWND hWndDateTime = NULL; @@ -187,7 +187,7 @@ static void test_dtm_set_format(void) SYSTEMTIME systime; LRESULT r; - hWnd = create_datetime_control(DTS_SHOWNONE, 0); + hWnd = create_datetime_control(DTS_SHOWNONE); flush_sequences(sequences, NUM_MSG_SEQUENCES); @@ -238,7 +238,7 @@ static void test_dtm_set_and_get_mccolor(void) { HWND hWnd; - hWnd = create_datetime_control(DTS_SHOWNONE, 0); + hWnd = create_datetime_control(DTS_SHOWNONE); flush_sequences(sequences, NUM_MSG_SEQUENCES); @@ -259,7 +259,7 @@ static void test_dtm_set_and_get_mcfont(void) HFONT hFontOrig, hFontNew; HWND hWnd; - hWnd = create_datetime_control(DTS_SHOWNONE, 0); + hWnd = create_datetime_control(DTS_SHOWNONE); flush_sequences(sequences, NUM_MSG_SEQUENCES); @@ -277,7 +277,7 @@ static void test_dtm_get_monthcal(void) LRESULT r; HWND hWnd; - hWnd = create_datetime_control(DTS_SHOWNONE, 0); + hWnd = create_datetime_control(DTS_SHOWNONE); flush_sequences(sequences, NUM_MSG_SEQUENCES); @@ -337,7 +337,7 @@ static void test_dtm_set_and_get_range(void) SYSTEMTIME getSt[2]; HWND hWnd; - hWnd = create_datetime_control(DTS_SHOWNONE, 0); + hWnd = create_datetime_control(DTS_SHOWNONE); flush_sequences(sequences, NUM_MSG_SEQUENCES); @@ -423,7 +423,7 @@ static void test_dtm_set_range_swap_min_max(void) SYSTEMTIME origSt; HWND hWnd; - hWnd = create_datetime_control(DTS_SHOWNONE, 0); + hWnd = create_datetime_control(DTS_SHOWNONE); flush_sequences(sequences, NUM_MSG_SEQUENCES); fill_systime_struct(&st[0], 2007, 2, 4, 15, 2, 2, 2, 2); @@ -527,7 +527,7 @@ static void test_dtm_set_and_get_system_time(void) SYSTEMTIME st, getSt, ref; HWND hWnd, hWndDateTime_test_gdt_none; - hWndDateTime_test_gdt_none = create_datetime_control(0, 0); + hWndDateTime_test_gdt_none = create_datetime_control(0); ok(hWndDateTime_test_gdt_none!=NULL, "Expected non NULL, got %p\n", hWndDateTime_test_gdt_none); if(hWndDateTime_test_gdt_none) { @@ -543,7 +543,7 @@ static void test_dtm_set_and_get_system_time(void) DestroyWindow(hWndDateTime_test_gdt_none); - hWnd = create_datetime_control(DTS_SHOWNONE, 0); + hWnd = create_datetime_control(DTS_SHOWNONE); flush_sequences(sequences, NUM_MSG_SEQUENCES); r = SendMessage(hWnd, DTM_SETSYSTEMTIME, GDT_NONE, (LPARAM)&st);

1 0

Nikolay Sivov : comctl32/monthcal: Implement MCM_GETMONTHRANGE for GMR_VISIBLE flag, single calendar control only.
by Alexandre Julliard 05 Oct '09

05 Oct '09

Module: wine Branch: master Commit: 96022da6c88a3d60050ed5e1032f7666351072d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=96022da6c88a3d60050ed5e10… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sun Oct 4 18:27:21 2009 +0400 comctl32/monthcal: Implement MCM_GETMONTHRANGE for GMR_VISIBLE flag, single calendar control only. --- dlls/comctl32/monthcal.c | 23 +++++++++++++++++++++-- dlls/comctl32/tests/monthcal.c | 3 +++ 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index ed059ff..b5cb65a 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -936,10 +936,29 @@ MONTHCAL_SetFirstDayOfWeek(MONTHCAL_INFO *infoPtr, INT day) static LRESULT -MONTHCAL_GetMonthRange(const MONTHCAL_INFO *infoPtr) +MONTHCAL_GetMonthRange(const MONTHCAL_INFO *infoPtr, DWORD flag, SYSTEMTIME *st) { TRACE("\n"); + if(st) + { + if(flag == GMR_VISIBLE) + { + /*FIXME: currently multicalendar feature isn't implelented, so entirely + visible month is current */ + st[0] = st[1] = infoPtr->curSel; + + 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); + st[1].wDayOfWeek = MONTHCAL_CalculateDayOfWeek(st[1].wDay, st[1].wMonth, + st[1].wYear); + } + else + FIXME("only GMR_VISIBLE flag supported, got %d\n", flag); + } + return infoPtr->monthRange; } @@ -2053,7 +2072,7 @@ MONTHCAL_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) return MONTHCAL_SetSelRange(infoPtr, (LPSYSTEMTIME)lParam); case MCM_GETMONTHRANGE: - return MONTHCAL_GetMonthRange(infoPtr); + return MONTHCAL_GetMonthRange(infoPtr, wParam, (SYSTEMTIME*)lParam); case MCM_SETDAYSTATE: return MONTHCAL_SetDayState(infoPtr, (INT)wParam, (LPMONTHDAYSTATE)lParam); diff --git a/dlls/comctl32/tests/monthcal.c b/dlls/comctl32/tests/monthcal.c index 1ac2bb8..4a051b7 100644 --- a/dlls/comctl32/tests/monthcal.c +++ b/dlls/comctl32/tests/monthcal.c @@ -1323,10 +1323,13 @@ static void test_monthcal_monthrange(void) res = SendMessage(hwnd, MCM_GETMONTHRANGE, GMR_VISIBLE, (LPARAM)st_visible); todo_wine { expect(2, res); + } expect(2000, st_visible[0].wYear); expect(11, st_visible[0].wMonth); expect(1, st_visible[0].wDay); expect(2000, st_visible[1].wYear); + + todo_wine { expect(12, st_visible[1].wMonth); expect(31, st_visible[1].wDay); }

1 0

Nikolay Sivov : comctl32/monthcal: Handle mouse pointer followed focus rectangle more accurately.
by Alexandre Julliard 05 Oct '09

05 Oct '09

Module: wine Branch: master Commit: 1ebf42751e8d899a0e170067229230f097b67b11 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ebf42751e8d899a0e1700672… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sun Oct 4 23:16:41 2009 +0400 comctl32/monthcal: Handle mouse pointer followed focus rectangle more accurately. --- dlls/comctl32/monthcal.c | 73 +++++++++++++++++++++++++++++++++++++++------- 1 files changed, 62 insertions(+), 11 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index b5cb65a..a54cba7 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -102,6 +102,7 @@ typedef struct SYSTEMTIME minSel; SYSTEMTIME maxSel; SYSTEMTIME curSel; /* contains currently selected year, month and day */ + SYSTEMTIME focusedSel; /* date currently focused with mouse movement */ DWORD rangeValid; SYSTEMTIME minDate; SYSTEMTIME maxDate; @@ -312,6 +313,43 @@ static inline void MONTHCAL_CalcPosFromDay(const MONTHCAL_INFO *infoPtr, MONTHCAL_CalcDayRect(infoPtr, r, x, y); } +/* Focused day helper: + + - set focused date to given value; + - reset to zero value if NULL passed; + - invalidate previous and new day rectangle only if needed. +*/ +static void MONTHCAL_SetDayFocus(MONTHCAL_INFO *infoPtr, const SYSTEMTIME *st) +{ + RECT r; + + if(st) + { + /* there's nothing to do if it's the same date, + mouse move within same date rectangle case */ + if(MONTHCAL_IsDateEqual(&infoPtr->focusedSel, st)) return; + + /* invalidate old focused day */ + MONTHCAL_CalcPosFromDay(infoPtr, infoPtr->focusedSel.wDay, + infoPtr->focusedSel.wMonth, &r); + InvalidateRect(infoPtr->hwndSelf, &r, FALSE); + + infoPtr->focusedSel = *st; + } + + MONTHCAL_CalcPosFromDay(infoPtr, infoPtr->focusedSel.wDay, + infoPtr->focusedSel.wMonth, &r); + + if(!st & MONTHCAL_ValidateDate(&infoPtr->focusedSel)) + { + static const SYSTEMTIME st_null; + + infoPtr->focusedSel = st_null; + } + + /* on set invalidates new day, on reset clears previous focused day */ + InvalidateRect(infoPtr->hwndSelf, &r, FALSE); +} /* day is the day in the month(1 == 1st of the month) */ /* month is the month value(1 == january, 12 == december) */ @@ -393,8 +431,8 @@ static void MONTHCAL_DrawDay(const MONTHCAL_INFO *infoPtr, HDC hdc, int day, int SetBkColor(hdc, oldBk); } - /* draw a rectangle around the currently selected days text */ - if((day == infoPtr->curSel.wDay) && (month == infoPtr->curSel.wMonth)) + /* draw focus rectangle */ + if((day == infoPtr->focusedSel.wDay) && (month == infoPtr->focusedSel.wMonth)) DrawFocusRect(hdc, &r); } @@ -1470,13 +1508,16 @@ MONTHCAL_LButtonDown(MONTHCAL_INFO *infoPtr, LPARAM lParam) InvalidateRect(infoPtr->hwndSelf, NULL, FALSE); } + SetCapture(infoPtr->hwndSelf); + ht.cbSize = sizeof(MCHITTESTINFO); ht.pt.x = (short)LOWORD(lParam); ht.pt.y = (short)HIWORD(lParam); - TRACE("(%d, %d)\n", ht.pt.x, ht.pt.y); hit = MONTHCAL_HitTest(infoPtr, &ht); + TRACE("%x at (%d, %d)\n", hit, ht.pt.x, ht.pt.y); + switch(hit) { case MCHT_TITLEBTNNEXT: @@ -1535,12 +1576,13 @@ MONTHCAL_LButtonDown(MONTHCAL_INFO *infoPtr, LPARAM lParam) MONTHCAL_NotifySelect(infoPtr); return 0; } + case MCHT_CALENDARDATENEXT: + case MCHT_CALENDARDATEPREV: case MCHT_CALENDARDATE: { - TRACE("MCHT_CALENDARDATE\n"); - infoPtr->firstSelDay = ht.st.wDay; infoPtr->status = MC_SEL_LBUTDOWN; + MONTHCAL_SetDayFocus(infoPtr, &ht.st); return 0; } } @@ -1570,6 +1612,8 @@ MONTHCAL_LButtonUp(MONTHCAL_INFO *infoPtr, LPARAM lParam) redraw = TRUE; } + ReleaseCapture(); + /* always send NM_RELEASEDCAPTURE notification */ nmhdr.hwndFrom = infoPtr->hwndSelf; nmhdr.idFrom = GetWindowLongPtrW(infoPtr->hwndSelf, GWLP_ID); @@ -1584,6 +1628,7 @@ MONTHCAL_LButtonUp(MONTHCAL_INFO *infoPtr, LPARAM lParam) hit = MONTHCAL_HitTest(infoPtr, &ht); infoPtr->status = MC_SEL_LBUTUP; + MONTHCAL_SetDayFocus(infoPtr, NULL); if((hit == MCHT_CALENDARDATENEXT) || (hit == MCHT_CALENDARDATEPREV) || @@ -1646,7 +1691,8 @@ static LRESULT MONTHCAL_MouseMove(MONTHCAL_INFO *infoPtr, LPARAM lParam) { MCHITTESTINFO ht; - int oldselday, selday, hit; + SYSTEMTIME old_focused; + int selday, hit; RECT r; if(!(infoPtr->status & MC_SEL_LBUTDOWN)) return 0; @@ -1659,12 +1705,17 @@ MONTHCAL_MouseMove(MONTHCAL_INFO *infoPtr, LPARAM lParam) /* not on the calendar date numbers? bail out */ TRACE("hit:%x\n",hit); - if((hit & MCHT_CALENDARDATE) != MCHT_CALENDARDATE) return 0; + if((hit & MCHT_CALENDARDATE) != MCHT_CALENDARDATE) + { + MONTHCAL_SetDayFocus(infoPtr, NULL); + return 0; + } selday = ht.st.wDay; - oldselday = infoPtr->curSel.wDay; - infoPtr->curSel.wDay = selday; - MONTHCAL_CalcPosFromDay(infoPtr, selday, ht.st. wMonth, &r); + old_focused = infoPtr->focusedSel; + MONTHCAL_SetDayFocus(infoPtr, &ht.st); + + MONTHCAL_CalcPosFromDay(infoPtr, ht.st.wDay, ht.st.wMonth, &r); if(infoPtr->dwStyle & MCS_MULTISELECT) { SYSTEMTIME selArray[2]; @@ -1709,7 +1760,7 @@ done: /* only redraw if the currently selected day changed */ /* FIXME: this should specify a rectangle containing only the days that changed */ /* using InvalidateRect */ - if(oldselday != infoPtr->curSel.wDay) + if(!MONTHCAL_IsDateEqual(&old_focused, &infoPtr->focusedSel)) InvalidateRect(infoPtr->hwndSelf, NULL, FALSE); return 0;

1 0

Nikolay Sivov : comctl32/monthcal: Use true date comparison on multiselection, not only the day is valuable.
by Alexandre Julliard 05 Oct '09

05 Oct '09

Module: wine Branch: master Commit: 480f54b1407bc51150896a3abc82545037c466e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=480f54b1407bc51150896a3ab… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sun Oct 4 23:17:07 2009 +0400 comctl32/monthcal: Use true date comparison on multiselection, not only the day is valuable. --- dlls/comctl32/monthcal.c | 133 ++++++++++++++++++++++++++++++++++------------ 1 files changed, 98 insertions(+), 35 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index a54cba7..2078efc 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -71,6 +71,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(monthcal); #define countof(arr) (sizeof(arr)/sizeof(arr[0])) +/* convert from days to 100 nanoseconds unit - used as FILETIME unit */ +#define DAYSTO100NSECS(days) (((ULONGLONG)(days))*24*60*60*10000000) + typedef struct { HWND hwndSelf; @@ -97,7 +100,7 @@ typedef struct MONTHDAYSTATE *monthdayState; SYSTEMTIME todaysDate; int status; /* See MC_SEL flags */ - int firstSelDay; /* first selected day */ + SYSTEMTIME firstSel; /* first selected day */ INT maxSelCount; SYSTEMTIME minSel; SYSTEMTIME maxSel; @@ -1108,7 +1111,6 @@ MONTHCAL_GetCurSel(const MONTHCAL_INFO *infoPtr, SYSTEMTIME *curSel) } /* FIXME: if the specified date is not visible, make it visible */ -/* FIXME: redraw? */ static LRESULT MONTHCAL_SetCurSel(MONTHCAL_INFO *infoPtr, SYSTEMTIME *curSel) { @@ -1126,6 +1128,7 @@ MONTHCAL_SetCurSel(MONTHCAL_INFO *infoPtr, SYSTEMTIME *curSel) infoPtr->curSel = *curSel; + /* FIXME: it's possible to reduce rectangle here */ InvalidateRect(infoPtr->hwndSelf, NULL, FALSE); return TRUE; @@ -1181,15 +1184,28 @@ MONTHCAL_SetSelRange(MONTHCAL_INFO *infoPtr, SYSTEMTIME *range) if(infoPtr->dwStyle & MCS_MULTISELECT) { + SYSTEMTIME old_range[2]; + /* adjust timestamps */ if(!MONTHCAL_ValidateTime(&range[0])) MONTHCAL_CopyTime(&infoPtr->todaysDate, &range[0]); if(!MONTHCAL_ValidateTime(&range[1])) MONTHCAL_CopyTime(&infoPtr->todaysDate, &range[1]); + old_range[0] = infoPtr->minSel; + old_range[1] = infoPtr->maxSel; + infoPtr->minSel = range[0]; infoPtr->maxSel = range[1]; + /* redraw if bounds changed */ + /* FIXME: no actual need to redraw everything */ + if(!MONTHCAL_IsDateEqual(&old_range[0], &range[0]) || + !MONTHCAL_IsDateEqual(&old_range[1], &range[1])) + { + InvalidateRect(infoPtr->hwndSelf, NULL, FALSE); + } + TRACE("[min,max]=[%d %d]\n", infoPtr->minSel.wDay, infoPtr->maxSel.wDay); return TRUE; } @@ -1566,7 +1582,7 @@ MONTHCAL_LButtonDown(MONTHCAL_INFO *infoPtr, LPARAM lParam) } case MCHT_TODAYLINK: { - infoPtr->firstSelDay = infoPtr->todaysDate.wDay; + infoPtr->firstSel = infoPtr->todaysDate; infoPtr->curSel = infoPtr->todaysDate; infoPtr->minSel = infoPtr->todaysDate; infoPtr->maxSel = infoPtr->todaysDate; @@ -1580,7 +1596,18 @@ MONTHCAL_LButtonDown(MONTHCAL_INFO *infoPtr, LPARAM lParam) case MCHT_CALENDARDATEPREV: case MCHT_CALENDARDATE: { - infoPtr->firstSelDay = ht.st.wDay; + infoPtr->firstSel = ht.st; + + if(infoPtr->dwStyle & MCS_MULTISELECT) + { + SYSTEMTIME st[2]; + + st[0] = st[1] = ht.st; + + /* clear selection range */ + MONTHCAL_SetSelRange(infoPtr, st); + } + infoPtr->status = MC_SEL_LBUTDOWN; MONTHCAL_SetDayFocus(infoPtr, &ht.st); return 0; @@ -1634,12 +1661,17 @@ MONTHCAL_LButtonUp(MONTHCAL_INFO *infoPtr, LPARAM lParam) (hit == MCHT_CALENDARDATEPREV) || (hit == MCHT_CALENDARDATE)) { - SYSTEMTIME st[2], sel = infoPtr->curSel; + SYSTEMTIME sel = infoPtr->curSel; - st[0] = st[1] = ht.st; - MONTHCAL_SetSelRange(infoPtr, st); - /* will be invalidated here */ - MONTHCAL_SetCurSel(infoPtr, &st[0]); + if(!(infoPtr->dwStyle & MCS_MULTISELECT)) + { + SYSTEMTIME st[2]; + + st[0] = st[1] = ht.st; + MONTHCAL_SetSelRange(infoPtr, st); + /* will be invalidated here */ + MONTHCAL_SetCurSel(infoPtr, &st[0]); + } /* send MCN_SELCHANGE only if new date selected */ if (!MONTHCAL_IsDateEqual(&sel, &ht.st)) @@ -1691,8 +1723,8 @@ static LRESULT MONTHCAL_MouseMove(MONTHCAL_INFO *infoPtr, LPARAM lParam) { MCHITTESTINFO ht; - SYSTEMTIME old_focused; - int selday, hit; + SYSTEMTIME old_focused, st_ht; + INT hit; RECT r; if(!(infoPtr->status & MC_SEL_LBUTDOWN)) return 0; @@ -1711,47 +1743,78 @@ MONTHCAL_MouseMove(MONTHCAL_INFO *infoPtr, LPARAM lParam) return 0; } - selday = ht.st.wDay; + st_ht = ht.st; old_focused = infoPtr->focusedSel; MONTHCAL_SetDayFocus(infoPtr, &ht.st); MONTHCAL_CalcPosFromDay(infoPtr, ht.st.wDay, ht.st.wMonth, &r); if(infoPtr->dwStyle & MCS_MULTISELECT) { - SYSTEMTIME selArray[2]; + SYSTEMTIME st[2]; + FILETIME ft_ht, ft_first; + ULARGE_INTEGER ul_ht, ul_first, ul_diff; int i; + LONG cmp; + + MONTHCAL_GetSelRange(infoPtr, st); + i = MONTHCAL_IsDateEqual(&infoPtr->firstSel, &st[0]) ? 1 : 0; + + SystemTimeToFileTime(&st_ht, &ft_ht); + SystemTimeToFileTime(&infoPtr->firstSel, &ft_first); + + cmp = CompareFileTime(&ft_ht, &ft_first); + + if(MONTHCAL_IsDateEqual(&infoPtr->firstSel, &st[1])) { + /* If we're still at the first selected date and range is empty, return. + If range isn't empty we should change range to a singel firstSel */ + if(MONTHCAL_IsDateEqual(&infoPtr->firstSel, &st_ht) && + MONTHCAL_IsDateEqual(&st[0], &st[1])) goto done; - MONTHCAL_GetSelRange(infoPtr, selArray); - i = 0; - if(infoPtr->firstSelDay==selArray[0].wDay) i=1; - TRACE("oldRange:%d %d %d %d\n", infoPtr->firstSelDay, selArray[0].wDay, selArray[1].wDay, i); - if(infoPtr->firstSelDay==selArray[1].wDay) { - /* 1st time we get here: selArray[0]=selArray[1]) */ - /* if we're still at the first selected date, return */ - if(infoPtr->firstSelDay==selday) goto done; - if(selday<infoPtr->firstSelDay) i = 0; + /* new selected date is earlier */ + if(cmp == -1) i = 0; } - if(abs(infoPtr->firstSelDay - selday) >= infoPtr->maxSelCount) { - if(selday>infoPtr->firstSelDay) - selday = infoPtr->firstSelDay + infoPtr->maxSelCount; + ul_ht.LowPart = ft_ht.dwLowDateTime; + ul_ht.HighPart = ft_ht.dwHighDateTime; + ul_first.LowPart = ft_first.dwLowDateTime; + ul_first.HighPart = ft_first.dwHighDateTime; + + /* new selected date is later */ + if(cmp == 1) + ul_diff.QuadPart = ul_ht.QuadPart - ul_first.QuadPart; + else + ul_diff.QuadPart = -ul_ht.QuadPart + ul_first.QuadPart; + + if(ul_diff.QuadPart >= DAYSTO100NSECS(infoPtr->maxSelCount)) { + if(cmp == 1) + ul_ht.QuadPart = ul_first.QuadPart + DAYSTO100NSECS(infoPtr->maxSelCount - 1); else - selday = infoPtr->firstSelDay - infoPtr->maxSelCount; + ul_ht.QuadPart = ul_first.QuadPart - DAYSTO100NSECS(infoPtr->maxSelCount - 1); + + ft_ht.dwLowDateTime = ul_ht.LowPart; + ft_ht.dwHighDateTime = ul_ht.HighPart; + FileTimeToSystemTime(&ft_ht, &st_ht); } - if(selArray[i].wDay!=selday) { - TRACE("newRange:%d %d %d %d\n", infoPtr->firstSelDay, selArray[0].wDay, selArray[1].wDay, i); + if(!MONTHCAL_IsDateEqual(&st[i], &st_ht)) { + FILETIME ft_range0, ft_range1; + + st[i] = st_ht; + + SystemTimeToFileTime(&st[0], &ft_range0); + SystemTimeToFileTime(&st[1], &ft_range1); - selArray[i].wDay = selday; + /* swap bounds if needed */ + if(CompareFileTime(&ft_range0, &ft_range1) == 1) { + SYSTEMTIME swap = st[1]; - if(selArray[0].wDay>selArray[1].wDay) { - DWORD tempday; - tempday = selArray[1].wDay; - selArray[1].wDay = selArray[0].wDay; - selArray[0].wDay = tempday; + st[1] = st[0]; + st[0] = swap; } - MONTHCAL_SetSelRange(infoPtr, selArray); + MONTHCAL_CopyTime(&infoPtr->todaysDate, &st[0]); + MONTHCAL_CopyTime(&infoPtr->todaysDate, &st[1]); + MONTHCAL_SetSelRange(infoPtr, st); } }

1 0

Nikolay Sivov : comctl32/monthcal: Check range limits in MCM_SETCURSEL.
by Alexandre Julliard 05 Oct '09

05 Oct '09

Module: wine Branch: master Commit: b97697dbe7f43aca866ec1481e13b5dec9e54504 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b97697dbe7f43aca866ec1481… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sun Oct 4 23:17:33 2009 +0400 comctl32/monthcal: Check range limits in MCM_SETCURSEL. --- dlls/comctl32/monthcal.c | 57 ++++++++++++++++++++++++++++++++++++++++ dlls/comctl32/tests/monthcal.c | 33 +++++++++++++++++++++++ 2 files changed, 90 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index 2078efc..a35d261 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -202,6 +202,62 @@ static BOOL MONTHCAL_ValidateDate(const SYSTEMTIME *time) return TRUE; } +/* Compares two dates in SYSTEMTIME format + * + * PARAMETERS + * + * [I] first : pointer to valid first date data to compare + * [I] second : pointer to valid second date data to compare + * + * RETURN VALUE + * + * -1 : first < second + * 0 : first == second + * 1 : first > second + * + * Note that no date validation performed, alreadt validated values expected. + */ +static LONG MONTHCAL_CompareSystemTime(const SYSTEMTIME *first, const SYSTEMTIME *second) +{ + FILETIME ft_first, ft_second; + + SystemTimeToFileTime(first, &ft_first); + SystemTimeToFileTime(second, &ft_second); + + return CompareFileTime(&ft_first, &ft_second); +} + +/* Checks largest possible date range and configured one + * + * PARAMETERS + * + * [I] infoPtr : valid pointer to control data + * [I] date : pointer to valid date data to check + * + * RETURN VALUE + * + * TRUE - date whithin largest and configured range + * FALSE - date is outside largest or configured range + */ +static BOOL MONTHCAL_IsDateInValidRange(const MONTHCAL_INFO *infoPtr, const SYSTEMTIME *date) +{ + static const SYSTEMTIME max_date = { .wYear = 9999, .wMonth = 12, .wDay = 31 }; + static const SYSTEMTIME min_date = { .wYear = 1752, .wMonth = 9, .wDay = 14 }; + + if((MONTHCAL_CompareSystemTime(date, &max_date) == 1) || + (MONTHCAL_CompareSystemTime(date, &min_date) == -1)) return FALSE; + + if(infoPtr->rangeValid & GDTR_MAX) { + if((MONTHCAL_CompareSystemTime(date, &infoPtr->maxSel) == 1)) return FALSE; + } + + if(infoPtr->rangeValid & GDTR_MIN) { + if((MONTHCAL_CompareSystemTime(date, &infoPtr->minSel) == -1)) return FALSE; + } + + return TRUE; +} + /* Used in MCM_SETRANGE/MCM_SETSELRANGE to determine resulting time part. Milliseconds are intentionaly not validated. */ static BOOL MONTHCAL_ValidateTime(const SYSTEMTIME *time) @@ -1119,6 +1175,7 @@ MONTHCAL_SetCurSel(MONTHCAL_INFO *infoPtr, SYSTEMTIME *curSel) if(infoPtr->dwStyle & MCS_MULTISELECT) return FALSE; if(!MONTHCAL_ValidateDate(curSel)) return FALSE; + if(!MONTHCAL_IsDateInValidRange(infoPtr, curSel)) return FALSE; infoPtr->minSel = *curSel; infoPtr->maxSel = *curSel; diff --git a/dlls/comctl32/tests/monthcal.c b/dlls/comctl32/tests/monthcal.c index 4a051b7..034487d 100644 --- a/dlls/comctl32/tests/monthcal.c +++ b/dlls/comctl32/tests/monthcal.c @@ -789,6 +789,39 @@ static void test_monthcal_currdate(void) ok_sequence(sequences, MONTHCAL_SEQ_INDEX, monthcal_curr_date_seq, "monthcal currDate", TRUE); + /* December, 31, 9999 is the maximum allowed date */ + memset(&st_new, 0, sizeof(st_new)); + st_new.wYear = 9999; + st_new.wMonth = 12; + st_new.wDay = 31; + res = SendMessage(hwnd, MCM_SETCURSEL, 0, (LPARAM)&st_new); + expect(1, res); + memset(&st_test, 0, sizeof(st_test)); + res = SendMessage(hwnd, MCM_GETCURSEL, 0, (LPARAM)&st_test); + expect(1, res); + expect(st_new.wYear, st_test.wYear); + expect(st_new.wMonth, st_test.wMonth); + expect(st_new.wDay, st_test.wDay); + expect(st_new.wHour, st_test.wHour); + expect(st_new.wMinute, st_test.wMinute); + expect(st_new.wSecond, st_test.wSecond); + /* try one day later */ + st_original = st_new; + st_new.wYear = 10000; + st_new.wMonth = 1; + st_new.wDay = 1; + res = SendMessage(hwnd, MCM_SETCURSEL, 0, (LPARAM)&st_new); + expect(0, res); + memset(&st_test, 0, sizeof(st_test)); + res = SendMessage(hwnd, MCM_GETCURSEL, 0, (LPARAM)&st_test); + expect(1, res); + expect(st_original.wYear, st_test.wYear); + expect(st_original.wMonth, st_test.wMonth); + expect(st_original.wDay, st_test.wDay); + expect(st_original.wHour, st_test.wHour); + expect(st_original.wMinute, st_test.wMinute); + expect(st_original.wSecond, st_test.wSecond); + DestroyWindow(hwnd); }

1 0

Maarten Lankhorst : winealsa.drv: Add non-mmap support to dscapture.
by Alexandre Julliard 05 Oct '09

05 Oct '09

Module: wine Branch: master Commit: e2faa98c66bf882392f2430dbec7b092a5e9e635 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2faa98c66bf882392f2430db… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Mon Oct 5 09:10:53 2009 +0200 winealsa.drv: Add non-mmap support to dscapture. --- dlls/winealsa.drv/dscapture.c | 135 ++++++++++++++++++++++++++++++----------- 1 files changed, 99 insertions(+), 36 deletions(-) diff --git a/dlls/winealsa.drv/dscapture.c b/dlls/winealsa.drv/dscapture.c index a15c369..f663b6c 100644 --- a/dlls/winealsa.drv/dscapture.c +++ b/dlls/winealsa.drv/dscapture.c @@ -92,6 +92,7 @@ struct IDsCaptureDriverBufferImpl CRITICAL_SECTION pcm_crst; LPBYTE mmap_buffer, presented_buffer; DWORD mmap_buflen_bytes, play_looping, mmap_ofs_bytes; + BOOL mmap; /* Note: snd_pcm_frames_to_bytes(This->pcm, mmap_buflen_frames) != mmap_buflen_bytes */ /* The actual buffer may differ in size from the wanted buffer size */ @@ -342,30 +343,77 @@ static snd_pcm_uframes_t CommitAll(IDsCaptureDriverBufferImpl *This, DWORD force if (used < commitahead && (forced || This->play_looping)) { snd_pcm_uframes_t done, putin = commitahead - used; - snd_pcm_mmap_begin(This->pcm, &areas, &This->mmap_pos, &putin); - CopyData(This, This->mmap_pos, putin); - done = snd_pcm_mmap_commit(This->pcm, This->mmap_pos, putin); - This->mmap_pos += done; - used += done; - putin = commitahead - used; - - if (This->mmap_pos == This->mmap_buflen_frames && (snd_pcm_sframes_t)putin > 0 && This->play_looping) + if (This->mmap) { snd_pcm_mmap_begin(This->pcm, &areas, &This->mmap_pos, &putin); - This->mmap_ofs_bytes += snd_pcm_frames_to_bytes(This->pcm, This->mmap_buflen_frames); - This->mmap_ofs_bytes %= This->mmap_buflen_bytes; CopyData(This, This->mmap_pos, putin); done = snd_pcm_mmap_commit(This->pcm, This->mmap_pos, putin); + This->mmap_pos += done; used += done; + putin = commitahead - used; + + if (This->mmap_pos == This->mmap_buflen_frames && (snd_pcm_sframes_t)putin > 0 && This->play_looping) + { + This->mmap_ofs_bytes += snd_pcm_frames_to_bytes(This->pcm, This->mmap_buflen_frames); + This->mmap_ofs_bytes %= This->mmap_buflen_bytes; + + snd_pcm_mmap_begin(This->pcm, &areas, &This->mmap_pos, &putin); + CopyData(This, This->mmap_pos, putin); + done = snd_pcm_mmap_commit(This->pcm, This->mmap_pos, putin); + + This->mmap_pos += done; + used += done; + } } + else + { + DWORD pos; + snd_pcm_sframes_t ret; + + snd_pcm_uframes_t cap = snd_pcm_bytes_to_frames(This->pcm, This->mmap_buflen_bytes); + pos = realpos_to_fakepos(This, This->mmap_pos); + if (This->mmap_pos + putin > cap) + putin = cap - This->mmap_pos; + ret = snd_pcm_readi(This->pcm, This->presented_buffer + pos, putin); + if (ret == -EPIPE) + { + WARN("Underrun occurred\n"); + snd_pcm_prepare(This->pcm); + ret = snd_pcm_readi(This->pcm, This->presented_buffer + pos, putin); + snd_pcm_start(This->pcm); + } + if (ret < 0) + { + WARN("Committing data: %ld / %s (%ld)\n", ret, snd_strerror(ret), putin); + ret = 0; + } + This->mmap_pos += ret; + used += ret; + /* At this point mmap_pos may be >= This->mmap_pos this is harmless + * realpos_to_fakepos handles it well, and below it is truncated + */ + + putin = commitahead - used; + if (putin > 0) + { + pos = realpos_to_fakepos(This, This->mmap_pos); + ret = snd_pcm_readi(This->pcm, This->presented_buffer + pos, putin); + if (ret > 0) + { + This->mmap_pos += ret; + used += ret; + } + } + } + } - if (This->mmap_pos == This->mmap_buflen_frames) + if (This->mmap_pos >= This->mmap_buflen_frames) { This->mmap_ofs_bytes += snd_pcm_frames_to_bytes(This->pcm, This->mmap_buflen_frames); This->mmap_ofs_bytes %= This->mmap_buflen_bytes; - This->mmap_pos = 0; + This->mmap_pos -= This->mmap_buflen_frames; } return used; @@ -451,23 +499,30 @@ static int CreateMMAP(IDsCaptureDriverBufferImpl* pdbi) snd_pcm_sw_params_set_avail_min(pcm, sw_params, 0); err = snd_pcm_sw_params(pcm, sw_params); - avail = snd_pcm_avail_update(pcm); - if ((snd_pcm_sframes_t)avail < 0) + pdbi->mmap_ofs_bytes = 0; + if (!pdbi->mmap) { - ERR("No buffer is available: %s.\n", snd_strerror(avail)); - return DSERR_GENERIC; + pdbi->mmap_buffer = NULL; + + frames = snd_pcm_bytes_to_frames(pdbi->pcm, pdbi->mmap_buflen_bytes); + snd_pcm_format_set_silence(format, pdbi->presented_buffer, frames); + pdbi->mmap_pos = 0; } - err = snd_pcm_mmap_begin(pcm, &areas, &ofs, &avail); - if ( err < 0 ) + else { - ERR("Can't map sound device for direct access: %s\n", snd_strerror(err)); - return DSERR_GENERIC; + err = snd_pcm_mmap_begin(pcm, &areas, &ofs, &avail); + if ( err < 0 ) + { + ERR("Can't map sound device for direct access: %s/%d\n", snd_strerror(err), err); + return DSERR_GENERIC; + } + snd_pcm_format_set_silence(format, areas->addr, pdbi->mmap_buflen_frames); + pdbi->mmap_pos = ofs + snd_pcm_mmap_commit(pcm, ofs, 0); + pdbi->mmap_buffer = areas->addr; } - err = snd_pcm_mmap_commit(pcm, ofs, 0); - pdbi->mmap_buffer = areas->addr; TRACE("created mmap buffer of %ld frames (%d bytes) at %p\n", - frames, pdbi->mmap_buflen_bytes, pdbi->mmap_buffer); + pdbi->mmap_buflen_frames, pdbi->mmap_buflen_bytes, pdbi->mmap_buffer); return DS_OK; } @@ -591,6 +646,7 @@ static HRESULT WINAPI IDsCaptureDriverBufferImpl_SetFormat(PIDSCDRIVERBUFFER ifa snd_pcm_uframes_t buffer_size; DWORD rate = pwfx->nSamplesPerSec; int err=0; + BOOL mmap; TRACE("(%p, %p)\n", iface, pwfx); @@ -632,8 +688,6 @@ static HRESULT WINAPI IDsCaptureDriverBufferImpl_SetFormat(PIDSCDRIVERBUFFER ifa /* Set some defaults */ snd_pcm_hw_params_any(pcm, hw_params); - err = snd_pcm_hw_params_set_access (pcm, hw_params, SND_PCM_ACCESS_MMAP_INTERLEAVED); - if (err < 0) goto err; err = snd_pcm_hw_params_set_channels(pcm, hw_params, pwfx->nChannels); if (err < 0) { WARN("Could not set channels to %d\n", pwfx->nChannels); goto err; } @@ -657,9 +711,19 @@ static HRESULT WINAPI IDsCaptureDriverBufferImpl_SetFormat(PIDSCDRIVERBUFFER ifa snd_pcm_hw_params_set_buffer_size_near(pcm, hw_params, &buffer_size); buffer_size = 5000; snd_pcm_hw_params_set_period_time_near(pcm, hw_params, (unsigned int*)&buffer_size, NULL); + + err = snd_pcm_hw_params_set_access (pcm, hw_params, SND_PCM_ACCESS_MMAP_INTERLEAVED); + if (err < 0) + { + err = snd_pcm_hw_params_set_access (pcm, hw_params, SND_PCM_ACCESS_RW_INTERLEAVED); + if (err < 0) { WARN("Could not set access\n"); goto err; } + mmap = 0; + } + else + mmap = 1; + err = snd_pcm_hw_params(pcm, hw_params); - err = snd_pcm_sw_params(pcm, This->sw_params); - snd_pcm_prepare(pcm); + if (err < 0) { WARN("Could not set hw parameters\n"); goto err; } if (This->pcm) { @@ -667,6 +731,7 @@ static HRESULT WINAPI IDsCaptureDriverBufferImpl_SetFormat(PIDSCDRIVERBUFFER ifa snd_pcm_close(This->pcm); } This->pcm = pcm; + This->mmap = mmap; snd_pcm_prepare(This->pcm); CreateMMAP(This); @@ -708,8 +773,8 @@ static HRESULT WINAPI IDsCaptureDriverBufferImpl_GetPosition(PIDSCDRIVERBUFFER i if (snd_pcm_state(This->pcm) != SND_PCM_STATE_RUNNING) { - hw_pptr = This->mmap_pos; CheckXRUN(This); + hw_pptr = This->mmap_pos; } else { @@ -730,7 +795,7 @@ static HRESULT WINAPI IDsCaptureDriverBufferImpl_GetPosition(PIDSCDRIVERBUFFER i LeaveCriticalSection(&This->pcm_crst); - TRACE("hw_pptr=0x%08x, hw_wptr=0x%08x playpos=%d, writepos=%d\n", (unsigned int)hw_pptr, (unsigned int)hw_wptr, lpdwCappos?*lpdwCappos:-1, lpdwReadpos?*lpdwReadpos:-1); + TRACE("hw_pptr=%u, hw_wptr=%u playpos=%u(%p), writepos=%u(%p)\n", (unsigned int)hw_pptr, (unsigned int)hw_wptr, realpos_to_fakepos(This, hw_pptr), lpdwCappos, realpos_to_fakepos(This, hw_wptr), lpdwReadpos); return DS_OK; } @@ -893,7 +958,11 @@ static HRESULT WINAPI IDsCaptureDriverImpl_Open(PIDSCDRIVER iface) err = snd_pcm_hw_params_any(pcm, hw_params); if (err < 0) goto err; err = snd_pcm_hw_params_set_access (pcm, hw_params, SND_PCM_ACCESS_MMAP_INTERLEAVED); - if (err < 0) goto err; + if (err < 0) + { + err = snd_pcm_hw_params_set_access (pcm, hw_params, SND_PCM_ACCESS_RW_INTERLEAVED); + if (err < 0) goto err; + } TRACE("Success\n"); snd_pcm_close(pcm); @@ -1008,12 +1077,6 @@ DWORD widDsCreate(UINT wDevID, PIDSCDRIVER* drv) IDsCaptureDriverImpl** idrv = (IDsCaptureDriverImpl**)drv; TRACE("(%d,%p)\n",wDevID,drv); - if (!(WInDev[wDevID].dwSupport & WAVECAPS_DIRECTSOUND)) - { - WARN("Hardware accelerated capture not supported, falling back to wavein\n"); - return MMSYSERR_NOTSUPPORTED; - } - *idrv = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(IDsCaptureDriverImpl)); if (!*idrv) return MMSYSERR_NOMEM;

1 0

Maarten Lankhorst : winealsa.drv: Remove test for mmap in waveinit.
by Alexandre Julliard 05 Oct '09

05 Oct '09

Module: wine Branch: master Commit: 059017f9143d08c007f24e04a7249d2d1d24fcf2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=059017f9143d08c007f24e04a… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Mon Oct 5 09:27:27 2009 +0200 winealsa.drv: Remove test for mmap in waveinit. No longer needed since winealsa has fallbacks now for both. --- dlls/winealsa.drv/waveinit.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/winealsa.drv/waveinit.c b/dlls/winealsa.drv/waveinit.c index 450c2ca..f6c406f 100644 --- a/dlls/winealsa.drv/waveinit.c +++ b/dlls/winealsa.drv/waveinit.c @@ -304,9 +304,7 @@ static int ALSA_ComputeCaps(snd_ctl_t *ctl, snd_pcm_t *pcm, ** Can we do WAVECAPS_PITCH, WAVECAPS_SYNC, or WAVECAPS_PLAYBACKRATE? */ *supports |= WAVECAPS_SAMPLEACCURATE; - /* FIXME: NONITERLEAVED and COMPLEX are not supported right now */ - if ( snd_pcm_access_mask_test( acmask, SND_PCM_ACCESS_MMAP_INTERLEAVED ) ) - *supports |= WAVECAPS_DIRECTSOUND; + *supports |= WAVECAPS_DIRECTSOUND; /* check for volume control support */ if (ctl) {

1 0