October 2009 - Wine-Commits

Nikolay Sivov : comctl32/monthcal: Really use locale data for all days.
by Alexandre Julliard Oct. 9, 2009

Oct. 9, 2009

Module: wine Branch: master Commit: 08b6bff386fbb254e91de2f16a2e31221a13ed00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=08b6bff386fbb254e91de2f16… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Fri Oct 9 00:47:42 2009 +0400 comctl32/monthcal: Really use locale data for all days. --- dlls/comctl32/monthcal.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index 766dbde..7697187 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -2107,7 +2107,7 @@ static void MONTHCAL_UpdateSize(MONTHCAL_INFO *infoPtr) size.cx = sz.cx = 0; for (i = 0; i < 7; i++) { - if(GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SABBREVDAYNAME1, + if(GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SABBREVDAYNAME1 + i, buff, countof(buff))) { GetTextExtentPoint32W(hdc, buff, lstrlenW(buff), &sz);

1 0

Nikolay Sivov : comctl32/datetime: Fix selections painting - use text rectangle, not whole field.
by Alexandre Julliard Oct. 9, 2009

Oct. 9, 2009

Module: wine Branch: master Commit: c93a520783cec3219aeb82d995e45577130d58b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c93a520783cec3219aeb82d99… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Fri Oct 9 00:38:38 2009 +0400 comctl32/datetime: Fix selections painting - use text rectangle, not whole field. --- dlls/comctl32/datetime.c | 38 ++++++++++++++++++++++---------------- 1 files changed, 22 insertions(+), 16 deletions(-) diff --git a/dlls/comctl32/datetime.c b/dlls/comctl32/datetime.c index c37134b..b21eb0f 100644 --- a/dlls/comctl32/datetime.c +++ b/dlls/comctl32/datetime.c @@ -632,19 +632,15 @@ DATETIME_ReturnFieldWidth (const DATETIME_INFO *infoPtr, HDC hdc, int count, SHO static void DATETIME_Refresh (DATETIME_INFO *infoPtr, HDC hdc) { - int i,prevright; - RECT *field; - RECT *rcDraw = &infoPtr->rcDraw; - RECT *calbutton = &infoPtr->calbutton; - RECT *checkbox = &infoPtr->checkbox; - SIZE size; - COLORREF oldTextColor; - SHORT fieldWidth = 0; - - /* draw control edge */ TRACE("\n"); if (infoPtr->dateValid) { + int i, prevright; + RECT *field; + RECT *rcDraw = &infoPtr->rcDraw; + SIZE size; + COLORREF oldTextColor; + SHORT fieldWidth = 0; HFONT oldFont = SelectObject (hdc, infoPtr->hFont); INT oldBkMode = SetBkMode (hdc, TRANSPARENT); WCHAR txt[80]; @@ -653,25 +649,35 @@ DATETIME_Refresh (DATETIME_INFO *infoPtr, HDC hdc) GetTextExtentPoint32W (hdc, txt, strlenW(txt), &size); rcDraw->bottom = size.cy + 2; - prevright = checkbox->right = ((infoPtr->dwStyle & DTS_SHOWNONE) ? 18 : 2); + prevright = infoPtr->checkbox.right = ((infoPtr->dwStyle & DTS_SHOWNONE) ? 18 : 2); for (i = 0; i < infoPtr->nrFields; i++) { DATETIME_ReturnTxt (infoPtr, i, txt, sizeof(txt)/sizeof(txt[0])); GetTextExtentPoint32W (hdc, txt, strlenW(txt), &size); DATETIME_ReturnFieldWidth (infoPtr, hdc, i, &fieldWidth); field = &infoPtr->fieldRect[i]; - field->left = prevright; - field->right = prevright + fieldWidth; - field->top = rcDraw->top; + field->left = prevright; + field->right = prevright + fieldWidth; + field->top = rcDraw->top; field->bottom = rcDraw->bottom; prevright = field->right; if (infoPtr->dwStyle & WS_DISABLED) oldTextColor = SetTextColor (hdc, comctl32_color.clrGrayText); else if ((infoPtr->haveFocus) && (i == infoPtr->select)) { + RECT selection; + /* fill if focused */ HBRUSH hbr = CreateSolidBrush (comctl32_color.clrActiveCaption); - FillRect(hdc, field, hbr); + + selection.right = field->right; + selection.left = selection.right - size.cx; + selection.top = 0; + selection.bottom = size.cy; + /* center rectangle */ + OffsetRect(&selection, 0, (field->bottom - size.cy)/2); + + FillRect(hdc, &selection, hbr); DeleteObject (hbr); oldTextColor = SetTextColor (hdc, comctl32_color.clrWindow); } @@ -687,7 +693,7 @@ DATETIME_Refresh (DATETIME_INFO *infoPtr, HDC hdc) } if (!(infoPtr->dwStyle & DTS_UPDOWN)) { - DrawFrameControl(hdc, calbutton, DFC_SCROLL, + DrawFrameControl(hdc, &infoPtr->calbutton, DFC_SCROLL, DFCS_SCROLLDOWN | (infoPtr->bCalDepressed ? DFCS_PUSHED : 0) | (infoPtr->dwStyle & WS_DISABLED ? DFCS_INACTIVE : 0) ); }

1 0

Nikolay Sivov : comctl32/datetime: Properly handle hit on separators and empty control area.
by Alexandre Julliard Oct. 9, 2009

Oct. 9, 2009

Module: wine Branch: master Commit: 26ab381ffabfbf8db39a2ab697b8381a780ad03d URL: http://source.winehq.org/git/wine.git/?a=commit;h=26ab381ffabfbf8db39a2ab69… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Fri Oct 9 00:00:49 2009 +0400 comctl32/datetime: Properly handle hit on separators and empty control area. --- dlls/comctl32/datetime.c | 44 +++++++++++++++++++++++++++++++++++--------- 1 files changed, 35 insertions(+), 9 deletions(-) diff --git a/dlls/comctl32/datetime.c b/dlls/comctl32/datetime.c index 5cda4c0..c37134b 100644 --- a/dlls/comctl32/datetime.c +++ b/dlls/comctl32/datetime.c @@ -126,10 +126,11 @@ extern int MONTHCAL_CalculateDayOfWeek(WORD day, WORD month, WORD year); #define DTHT_DATEFIELD 0xff /* for hit-testing */ -#define DTHT_NONE 0 -#define DTHT_CHECKBOX 0x200 /* these should end at '00' , to make */ -#define DTHT_MCPOPUP 0x300 /* & DTHT_DATEFIELD 0 when DATETIME_KeyDown */ -#define DTHT_GOTFOCUS 0x400 /* tests for date-fields */ +#define DTHT_NONE 0x1000 +#define DTHT_CHECKBOX 0x2000 /* these should end at '00' , to make */ +#define DTHT_MCPOPUP 0x3000 /* & DTHT_DATEFIELD 0 when DATETIME_KeyDown */ +#define DTHT_GOTFOCUS 0x4000 /* tests for date-fields */ +#define DTHT_NODATEMASK 0xf000 /* to mask check and drop down from others */ static BOOL DATETIME_SendSimpleNotify (const DATETIME_INFO *infoPtr, UINT code); static BOOL DATETIME_SendDateTimeChangeNotify (const DATETIME_INFO *infoPtr); @@ -668,7 +669,7 @@ DATETIME_Refresh (DATETIME_INFO *infoPtr, HDC hdc) if (infoPtr->dwStyle & WS_DISABLED) oldTextColor = SetTextColor (hdc, comctl32_color.clrGrayText); else if ((infoPtr->haveFocus) && (i == infoPtr->select)) { - /* fill if focussed */ + /* fill if focused */ HBRUSH hbr = CreateSolidBrush (comctl32_color.clrActiveCaption); FillRect(hdc, field, hbr); DeleteObject (hbr); @@ -703,13 +704,23 @@ DATETIME_HitTest (const DATETIME_INFO *infoPtr, POINT pt) if (PtInRect (&infoPtr->calbutton, pt)) return DTHT_MCPOPUP; if (PtInRect (&infoPtr->checkbox, pt)) return DTHT_CHECKBOX; - for (i=0; i < infoPtr->nrFields; i++) { + for (i = 0; i < infoPtr->nrFields; i++) { if (PtInRect (&infoPtr->fieldRect[i], pt)) return i; } return DTHT_NONE; } +/* Returns index of a closest date field from given counting to left + or -1 if there's no such fields at left */ +static int DATETIME_GetPrevDateField(const DATETIME_INFO *infoPtr, int i) +{ + for(--i; i >= 0; i--) + { + if (infoPtr->fieldspec[i] & DTHT_DATEFIELD) return i; + } + return -1; +} static LRESULT DATETIME_LButtonDown (DATETIME_INFO *infoPtr, INT x, INT y) @@ -722,11 +733,26 @@ DATETIME_LButtonDown (DATETIME_INFO *infoPtr, INT x, INT y) old = infoPtr->select; new = DATETIME_HitTest (infoPtr, pt); - /* FIXME: might be conditions where we don't want to update infoPtr->select */ - infoPtr->select = new; - SetFocus(infoPtr->hwndSelf); + if (!(new & DTHT_NODATEMASK) || (new == DTHT_NONE)) + { + if (new == DTHT_NONE) + new = infoPtr->nrFields - 1; + else + { + /* hitting string part moves selection to next date field to left */ + if (infoPtr->fieldspec[new] & DT_STRING) + { + new = DATETIME_GetPrevDateField(infoPtr, new); + if (new == -1) return 0; + } + /* never select full day of week */ + if (infoPtr->fieldspec[new] == FULLDAY) return 0; + } + } + infoPtr->select = new; + if (infoPtr->select == DTHT_MCPOPUP) { RECT rcMonthCal; SendMessageW(infoPtr->hMonthCal, MCM_GETMINREQRECT, 0, (LPARAM)&rcMonthCal);

1 0

Vincent Povirk : gdiplus: Add some hatch brushes not present in gdi.
by Alexandre Julliard Oct. 9, 2009

Oct. 9, 2009

Module: wine Branch: master Commit: f0c99e0115888919ca6a889e231227b34d773041 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0c99e0115888919ca6a889e2… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Oct 8 15:48:21 2009 -0500 gdiplus: Add some hatch brushes not present in gdi. --- dlls/gdiplus/brush.c | 24 ++++++++++++++++++++++++ 1 files changed, 24 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c index 44f983c..3bce1d3 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -184,6 +184,30 @@ static const char HatchBrushes[][8] = { { 0x80, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x01 }, /* HatchStyleBackwardDiagonal */ { 0x08, 0x08, 0x08, 0xff, 0x08, 0x08, 0x08, 0x08 }, /* HatchStyleCross */ { 0x81, 0x42, 0x24, 0x18, 0x18, 0x24, 0x42, 0x81 }, /* HatchStyleDiagonalCross */ + { 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x80 }, /* HatchStyle05Percent */ + { 0x00, 0x02, 0x00, 0x88, 0x00, 0x20, 0x00, 0x88 }, /* HatchStyle10Percent */ + { 0x00, 0x22, 0x00, 0xcc, 0x00, 0x22, 0x00, 0xcc }, /* HatchStyle20Percent */ + { 0x00, 0xcc, 0x00, 0xcc, 0x00, 0xcc, 0x00, 0xcc }, /* HatchStyle25Percent */ + { 0x00, 0xcc, 0x04, 0xcc, 0x00, 0xcc, 0x40, 0xcc }, /* HatchStyle30Percent */ + { 0x44, 0xcc, 0x22, 0xcc, 0x44, 0xcc, 0x22, 0xcc }, /* HatchStyle40Percent */ + { 0x55, 0xcc, 0x55, 0xcc, 0x55, 0xcc, 0x55, 0xcc }, /* HatchStyle50Percent */ + { 0x55, 0xcd, 0x55, 0xee, 0x55, 0xdc, 0x55, 0xee }, /* HatchStyle60Percent */ + { 0x55, 0xdd, 0x55, 0xff, 0x55, 0xdd, 0x55, 0xff }, /* HatchStyle70Percent */ + { 0x55, 0xff, 0x55, 0xff, 0x55, 0xff, 0x55, 0xff }, /* HatchStyle75Percent */ + { 0x55, 0xff, 0x59, 0xff, 0x55, 0xff, 0x99, 0xff }, /* HatchStyle80Percent */ + { 0x77, 0xff, 0xdd, 0xff, 0x77, 0xff, 0xfd, 0xff }, /* HatchStyle90Percent */ + { 0x11, 0x22, 0x44, 0x88, 0x11, 0x22, 0x44, 0x88 }, /* HatchStyleLightDownwardDiagonal */ + { 0x88, 0x44, 0x22, 0x11, 0x88, 0x44, 0x22, 0x11 }, /* HatchStyleLightUpwardDiagonal */ + { 0x99, 0x33, 0x66, 0xcc, 0x99, 0x33, 0x66, 0xcc }, /* HatchStyleDarkDownwardDiagonal */ + { 0xcc, 0x66, 0x33, 0x99, 0xcc, 0x66, 0x33, 0x99 }, /* HatchStyleDarkUpwardDiagonal */ + { 0xc1, 0x83, 0x07, 0x0e, 0x1c, 0x38, 0x70, 0xe0 }, /* HatchStyleWideDownwardDiagonal */ + { 0xe0, 0x70, 0x38, 0x1c, 0x0e, 0x07, 0x83, 0xc1 }, /* HatchStyleWideUpwardDiagonal */ + { 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88 }, /* HatchStyleLightVertical */ + { 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0xff }, /* HatchStyleLightHorizontal */ + { 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa }, /* HatchStyleNarrowVertical */ + { 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff }, /* HatchStyleNarrowHorizontal */ + { 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc }, /* HatchStyleDarkVertical */ + { 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0xff, 0xff }, /* HatchStyleDarkHorizontal */ }; /******************************************************************************

1 0

Vincent Povirk : gdiplus: Use gdi texture brushes to draw hatch brushes.
by Alexandre Julliard Oct. 9, 2009

Oct. 9, 2009

Module: wine Branch: master Commit: bd86e27919859d9ce67721f7c7d8dfd70f0a95eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd86e27919859d9ce67721f7c… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Oct 8 13:35:03 2009 -0500 gdiplus: Use gdi texture brushes to draw hatch brushes. --- dlls/gdiplus/brush.c | 112 +++++++++++++++++++++++++++++++++---------------- 1 files changed, 75 insertions(+), 37 deletions(-) diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c index 1425ab7..44f983c 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -177,19 +177,14 @@ GpStatus WINGDIPAPI GdipCloneBrush(GpBrush *brush, GpBrush **clone) return Ok; } -static LONG HatchStyleToHatch(HatchStyle hatchstyle) -{ - switch (hatchstyle) - { - case HatchStyleHorizontal: return HS_HORIZONTAL; - case HatchStyleVertical: return HS_VERTICAL; - case HatchStyleForwardDiagonal: return HS_FDIAGONAL; - case HatchStyleBackwardDiagonal: return HS_BDIAGONAL; - case HatchStyleCross: return HS_CROSS; - case HatchStyleDiagonalCross: return HS_DIAGCROSS; - default: return 0; - } -} +static const char HatchBrushes[][8] = { + { 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00 }, /* HatchStyleHorizontal */ + { 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08 }, /* HatchStyleVertical */ + { 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80 }, /* HatchStyleForwardDiagonal */ + { 0x80, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x01 }, /* HatchStyleBackwardDiagonal */ + { 0x08, 0x08, 0x08, 0xff, 0x08, 0x08, 0x08, 0x08 }, /* HatchStyleCross */ + { 0x81, 0x42, 0x24, 0x18, 0x18, 0x24, 0x42, 0x81 }, /* HatchStyleDiagonalCross */ +}; /****************************************************************************** * GdipCreateHatchBrush [GDIPLUS.@] @@ -197,6 +192,7 @@ static LONG HatchStyleToHatch(HatchStyle hatchstyle) GpStatus WINGDIPAPI GdipCreateHatchBrush(HatchStyle hatchstyle, ARGB forecol, ARGB backcol, GpHatch **brush) { COLORREF fgcol = ARGB2COLORREF(forecol); + GpStatus stat = Ok; TRACE("(%d, %d, %d, %p)\n", hatchstyle, forecol, backcol, brush); @@ -205,37 +201,79 @@ GpStatus WINGDIPAPI GdipCreateHatchBrush(HatchStyle hatchstyle, ARGB forecol, AR *brush = GdipAlloc(sizeof(GpHatch)); if (!*brush) return OutOfMemory; - switch (hatchstyle) + if (hatchstyle < sizeof(HatchBrushes) / sizeof(HatchBrushes[0])) { - case HatchStyleHorizontal: - case HatchStyleVertical: - case HatchStyleForwardDiagonal: - case HatchStyleBackwardDiagonal: - case HatchStyleCross: - case HatchStyleDiagonalCross: - /* Brushes that map to BS_HATCHED */ - (*brush)->brush.lb.lbStyle = BS_HATCHED; - (*brush)->brush.lb.lbColor = fgcol; - (*brush)->brush.lb.lbHatch = HatchStyleToHatch(hatchstyle); - break; + HBITMAP hbmp; + HDC hdc; + BITMAPINFOHEADER bmih; + DWORD* bits; + int x, y; - default: - FIXME("Unimplemented hatch style %d\n", hatchstyle); + hdc = CreateCompatibleDC(0); - (*brush)->brush.lb.lbStyle = BS_SOLID; - (*brush)->brush.lb.lbColor = fgcol; - (*brush)->brush.lb.lbHatch = 0; - break; + if (hdc) + { + bmih.biSize = sizeof(bmih); + bmih.biWidth = 8; + bmih.biHeight = 8; + bmih.biPlanes = 1; + bmih.biBitCount = 32; + bmih.biCompression = BI_RGB; + bmih.biSizeImage = 0; + + hbmp = CreateDIBSection(hdc, (BITMAPINFO*)&bmih, DIB_RGB_COLORS, (void**)&bits, NULL, 0); + + if (hbmp) + { + for (y=0; y<8; y++) + for (x=0; x<8; x++) + if ((HatchBrushes[hatchstyle][y] & (0x80 >> x)) != 0) + bits[y*8+x] = forecol; + else + bits[y*8+x] = backcol; + } + else + stat = GenericError; + + DeleteDC(hdc); + } + else + stat = GenericError; + + if (stat == Ok) + { + (*brush)->brush.lb.lbStyle = BS_PATTERN; + (*brush)->brush.lb.lbColor = 0; + (*brush)->brush.lb.lbHatch = (ULONG_PTR)hbmp; + (*brush)->brush.gdibrush = CreateBrushIndirect(&(*brush)->brush.lb); + + DeleteObject(hbmp); + } } + else + { + FIXME("Unimplemented hatch style %d\n", hatchstyle); + (*brush)->brush.lb.lbStyle = BS_SOLID; + (*brush)->brush.lb.lbColor = fgcol; + (*brush)->brush.lb.lbHatch = 0; + (*brush)->brush.gdibrush = CreateBrushIndirect(&(*brush)->brush.lb); + } - (*brush)->brush.gdibrush = CreateBrushIndirect(&(*brush)->brush.lb); - (*brush)->brush.bt = BrushTypeHatchFill; - (*brush)->forecol = forecol; - (*brush)->backcol = backcol; - (*brush)->hatchstyle = hatchstyle; + if (stat == Ok) + { + (*brush)->brush.bt = BrushTypeHatchFill; + (*brush)->forecol = forecol; + (*brush)->backcol = backcol; + (*brush)->hatchstyle = hatchstyle; + } + else + { + GdipFree(*brush); + *brush = NULL; + } - return Ok; + return stat; } /******************************************************************************

1 0

Vincent Povirk : include: Add gdiplus hatch brush functions to headers.
by Alexandre Julliard Oct. 9, 2009

Oct. 9, 2009

Module: wine Branch: master Commit: 55162681caa880b7a29ee1ab684e8cec296392f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=55162681caa880b7a29ee1ab6… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Oct 8 12:54:01 2009 -0500 include: Add gdiplus hatch brush functions to headers. --- include/gdiplusflat.h | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 11756c8..bce1e21 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -337,6 +337,11 @@ GpStatus WINGDIPAPI GdipSetPathMarker(GpPath*); GpStatus WINGDIPAPI GdipStartPathFigure(GpPath*); GpStatus WINGDIPAPI GdipTransformPath(GpPath*,GpMatrix*); +/* HatchBrush */ +GpStatus WINGDIPAPI GdipCreateHatchBrush(HatchStyle,ARGB,ARGB,GpHatch**); +GpStatus WINGDIPAPI GdipGetHatchBackgroundColor(GpHatch*,ARGB*); +GpStatus WINGDIPAPI GdipGetHatchForegroundColor(GpHatch*,ARGB*); + /* Image */ GpStatus WINGDIPAPI GdipCloneImage(GpImage*, GpImage**); GpStatus WINGDIPAPI GdipCloneImageAttributes(GDIPCONST GpImageAttributes*,GpImageAttributes**);

1 0

Nikolay Sivov : comctl32/datetime: Block WM_SETTEXT message.
by Alexandre Julliard Oct. 9, 2009

Oct. 9, 2009

Module: wine Branch: master Commit: b398d4434d0fe9cf037ecd4c559fc42732a2b8b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b398d4434d0fe9cf037ecd4c5… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Thu Oct 8 22:05:13 2009 +0400 comctl32/datetime: Block WM_SETTEXT message. --- dlls/comctl32/datetime.c | 3 +++ dlls/comctl32/tests/datetime.c | 20 ++++++++++++++++++++ 2 files changed, 23 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/datetime.c b/dlls/comctl32/datetime.c index 097e442..5cda4c0 100644 --- a/dlls/comctl32/datetime.c +++ b/dlls/comctl32/datetime.c @@ -1399,6 +1399,9 @@ DATETIME_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) case WM_GETFONT: return (LRESULT) infoPtr->hFont; + case WM_SETTEXT: + return CB_ERR; + default: if ((uMsg >= WM_USER) && (uMsg < WM_APP) && !COMCTL32_IsReflectedMessage(uMsg)) ERR("unknown msg %04x wp=%08lx lp=%08lx\n", diff --git a/dlls/comctl32/tests/datetime.c b/dlls/comctl32/tests/datetime.c index a0f12f0..7cd08a0 100644 --- a/dlls/comctl32/tests/datetime.c +++ b/dlls/comctl32/tests/datetime.c @@ -668,6 +668,25 @@ static void test_dtm_set_and_get_system_time(void) DestroyWindow(hWnd); } +static void test_wm_set_get_text(void) +{ + static const CHAR a_str[] = "a"; + char buff[10]; + HWND hWnd; + LRESULT ret; + + hWnd = create_datetime_control(0); + + ret = SendMessage(hWnd, WM_SETTEXT, 0, (LPARAM)a_str); + expect(CB_ERR, ret); + + buff[0] = 0; + ret = SendMessage(hWnd, WM_GETTEXT, sizeof(buff), (LPARAM)buff); + ok(strcmp(buff, a_str) != 0, "Expected text not to change, got %s\n", buff); + + DestroyWindow(hWnd); +} + START_TEST(datetime) { HMODULE hComctl32; @@ -694,4 +713,5 @@ START_TEST(datetime) test_dtm_set_and_get_range(); test_dtm_set_range_swap_min_max(); test_dtm_set_and_get_system_time(); + test_wm_set_get_text(); }

1 0

Eric Pouech : winmm: Reduce in MMSystem the calls to WinMM's internals.
by Alexandre Julliard Oct. 9, 2009

Oct. 9, 2009

Module: wine Branch: master Commit: 0d5c65fef2e1d9a76c29ee408698d8c5dc7cd5df URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d5c65fef2e1d9a76c29ee408… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Thu Oct 8 20:57:17 2009 +0200 winmm: Reduce in MMSystem the calls to WinMM's internals. --- dlls/winmm/mmsystem.c | 108 +++++++++++++++--------------------------------- 1 files changed, 34 insertions(+), 74 deletions(-) diff --git a/dlls/winmm/mmsystem.c b/dlls/winmm/mmsystem.c index 669d161..dfe9be4 100644 --- a/dlls/winmm/mmsystem.c +++ b/dlls/winmm/mmsystem.c @@ -209,7 +209,7 @@ void WINAPI OutputDebugStr16(LPCSTR str) */ UINT16 WINAPI mixerGetNumDevs16(void) { - return MMDRV_GetNum(MMDRV_MIXER); + return mixerGetNumDevs(); } /************************************************************************** @@ -443,7 +443,7 @@ DWORD WINAPI mixerMessage16(HMIXER16 hmix, UINT16 uMsg, DWORD dwParam1, */ UINT16 WINAPI auxGetNumDevs16(void) { - return MMDRV_GetNum(MMDRV_AUX); + return auxGetNumDevs(); } /* ################################################### @@ -480,13 +480,7 @@ UINT16 WINAPI auxGetDevCaps16(UINT16 uDeviceID, LPAUXCAPS16 lpCaps, UINT16 uSize */ UINT16 WINAPI auxGetVolume16(UINT16 uDeviceID, LPDWORD lpdwVolume) { - LPWINE_MLD wmld; - - TRACE("(%04X, %p) !\n", uDeviceID, lpdwVolume); - - if ((wmld = MMDRV_Get((HANDLE)(ULONG_PTR)uDeviceID, MMDRV_AUX, TRUE)) == NULL) - return MMSYSERR_INVALHANDLE; - return MMDRV_Message(wmld, AUXDM_GETVOLUME, (DWORD_PTR)lpdwVolume, 0L, TRUE); + return auxGetVolume(uDeviceID, lpdwVolume); } /************************************************************************** @@ -494,13 +488,7 @@ UINT16 WINAPI auxGetVolume16(UINT16 uDeviceID, LPDWORD lpdwVolume) */ UINT16 WINAPI auxSetVolume16(UINT16 uDeviceID, DWORD dwVolume) { - LPWINE_MLD wmld; - - TRACE("(%04X, %u) !\n", uDeviceID, dwVolume); - - if ((wmld = MMDRV_Get((HANDLE)(ULONG_PTR)uDeviceID, MMDRV_AUX, TRUE)) == NULL) - return MMSYSERR_INVALHANDLE; - return MMDRV_Message(wmld, AUXDM_SETVOLUME, dwVolume, 0L, TRUE); + return auxSetVolume(uDeviceID, dwVolume); } /************************************************************************** @@ -508,8 +496,6 @@ UINT16 WINAPI auxSetVolume16(UINT16 uDeviceID, DWORD dwVolume) */ DWORD WINAPI auxOutMessage16(UINT16 uDeviceID, UINT16 uMessage, DWORD dw1, DWORD dw2) { - LPWINE_MLD wmld; - TRACE("(%04X, %04X, %08X, %08X)\n", uDeviceID, uMessage, dw1, dw2); switch (uMessage) { @@ -526,10 +512,7 @@ DWORD WINAPI auxOutMessage16(UINT16 uDeviceID, UINT16 uMessage, DWORD dw1, DWORD uDeviceID, uMessage, dw1, dw2); break; } - if ((wmld = MMDRV_Get((HANDLE)(ULONG_PTR)uDeviceID, MMDRV_AUX, TRUE)) == NULL) - return MMSYSERR_INVALHANDLE; - - return MMDRV_Message(wmld, uMessage, dw1, dw2, TRUE); + return auxOutMessage(uDeviceID, uMessage, dw1, dw2); } /* ################################################### @@ -657,14 +640,7 @@ YIELDPROC16 WINAPI mciGetYieldProc16(UINT16 uDeviceID, DWORD* lpdwYieldData) */ HTASK16 WINAPI mciGetCreatorTask16(UINT16 uDeviceID) { - LPWINE_MCIDRIVER wmd; - HTASK16 ret = 0; - - if ((wmd = MCI_GetDriver(uDeviceID))) - ret = HTASK_16(wmd->CreatorThread); - - TRACE("(%u) => %04x\n", uDeviceID, ret); - return ret; + return HTASK_16(mciGetCreatorTask(uDeviceID)); } /************************************************************************** @@ -696,7 +672,7 @@ UINT16 WINAPI mciDriverYield16(UINT16 uDeviceID) */ UINT16 WINAPI midiOutGetNumDevs16(void) { - return MMDRV_GetNum(MMDRV_MIDIOUT); + return midiOutGetNumDevs(); } /************************************************************************** @@ -871,16 +847,13 @@ UINT16 WINAPI midiOutCacheDrumPatches16(HMIDIOUT16 hMidiOut, UINT16 uPatch, */ UINT16 WINAPI midiOutGetID16(HMIDIOUT16 hMidiOut, UINT16* lpuDeviceID) { - LPWINE_MLD wmld; - - TRACE("(%04X, %p)\n", hMidiOut, lpuDeviceID); - - if (lpuDeviceID == NULL) return MMSYSERR_INVALPARAM; - if ((wmld = MMDRV_Get(HMIDIOUT_32(hMidiOut), MMDRV_MIDIOUT, FALSE)) == NULL) - return MMSYSERR_INVALHANDLE; + UINT devid; + UINT16 ret; - *lpuDeviceID = wmld->uDeviceID; - return MMSYSERR_NOERROR; + ret = midiOutGetID(HMIDIOUT_32(hMidiOut), &devid); + if (ret != MMSYSERR_NOERROR) return ret; + *lpuDeviceID = devid; + return ret; } /************************************************************************** @@ -920,7 +893,7 @@ DWORD WINAPI midiOutMessage16(HMIDIOUT16 hMidiOut, UINT16 uMessage, */ UINT16 WINAPI midiInGetNumDevs16(void) { - return MMDRV_GetNum(MMDRV_MIDIIN); + return midiInGetNumDevs(); } /************************************************************************** @@ -1055,18 +1028,13 @@ UINT16 WINAPI midiInReset16(HMIDIIN16 hMidiIn) */ UINT16 WINAPI midiInGetID16(HMIDIIN16 hMidiIn, UINT16* lpuDeviceID) { - LPWINE_MLD wmld; - - TRACE("(%04X, %p)\n", hMidiIn, lpuDeviceID); + UINT devid; + UINT16 ret; - if (lpuDeviceID == NULL) return MMSYSERR_INVALPARAM; - - if ((wmld = MMDRV_Get(HMIDIIN_32(hMidiIn), MMDRV_MIDIIN, TRUE)) == NULL) - return MMSYSERR_INVALHANDLE; - - *lpuDeviceID = wmld->uDeviceID; - - return MMSYSERR_NOERROR; + ret = midiInGetID(HMIDIIN_32(hMidiIn), &devid); + if (ret != MMSYSERR_NOERROR) return ret; + *lpuDeviceID = devid; + return ret; } /************************************************************************** @@ -1197,7 +1165,7 @@ MMRESULT16 WINAPI midiStreamStop16(HMIDISTRM16 hMidiStrm) */ UINT16 WINAPI waveOutGetNumDevs16(void) { - return MMDRV_GetNum(MMDRV_WAVEOUT); + return waveOutGetNumDevs(); } /************************************************************************** @@ -1466,17 +1434,13 @@ UINT16 WINAPI waveOutSetVolume16(UINT16 devid, DWORD dw) */ UINT16 WINAPI waveOutGetID16(HWAVEOUT16 hWaveOut, UINT16* lpuDeviceID) { - LPWINE_MLD wmld; - - TRACE("(%04X, %p);\n", hWaveOut, lpuDeviceID); - - if (lpuDeviceID == NULL) return MMSYSERR_INVALHANDLE; - - if ((wmld = MMDRV_Get(HWAVEOUT_32(hWaveOut), MMDRV_WAVEOUT, FALSE)) == NULL) - return MMSYSERR_INVALHANDLE; + UINT devid; + UINT16 ret; - *lpuDeviceID = wmld->uDeviceID; - return 0; + ret = waveOutGetID(HWAVEOUT_32(hWaveOut), &devid); + if (ret != MMSYSERR_NOERROR) return ret; + *lpuDeviceID = devid; + return ret; } /************************************************************************** @@ -1510,7 +1474,7 @@ DWORD WINAPI waveOutMessage16(HWAVEOUT16 hWaveOut, UINT16 uMessage, */ UINT16 WINAPI waveInGetNumDevs16(void) { - return MMDRV_GetNum(MMDRV_WAVEIN); + return waveInGetNumDevs(); } /************************************************************************** @@ -1701,17 +1665,13 @@ UINT16 WINAPI waveInGetPosition16(HWAVEIN16 hWaveIn, LPMMTIME16 lpTime, */ UINT16 WINAPI waveInGetID16(HWAVEIN16 hWaveIn, UINT16* lpuDeviceID) { - LPWINE_MLD wmld; - - TRACE("(%04X, %p);\n", hWaveIn, lpuDeviceID); - - if (lpuDeviceID == NULL) return MMSYSERR_INVALHANDLE; + UINT devid; + UINT16 ret; - if ((wmld = MMDRV_Get(HWAVEIN_32(hWaveIn), MMDRV_WAVEIN, FALSE)) == NULL) - return MMSYSERR_INVALHANDLE; - - *lpuDeviceID = wmld->uDeviceID; - return MMSYSERR_NOERROR; + ret = waveInGetID(HWAVEIN_32(hWaveIn), &devid); + if (ret != MMSYSERR_NOERROR) return ret; + *lpuDeviceID = devid; + return ret; } /**************************************************************************

1 0

Eric Pouech : winmm: Remove direct inclusion of winemm.h in winemm16.h.
by Alexandre Julliard Oct. 9, 2009

Oct. 9, 2009

Module: wine Branch: master Commit: 5b8b9d6da72d228da572abc18b0e0c1c33191d43 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b8b9d6da72d228da572abc18… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Thu Oct 8 20:57:11 2009 +0200 winmm: Remove direct inclusion of winemm.h in winemm16.h. --- dlls/winmm/message16.c | 1 + dlls/winmm/mmsystem.c | 1 + dlls/winmm/winemm16.h | 1 - 3 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/winmm/message16.c b/dlls/winmm/message16.c index 2e9b953..0bbc14a 100644 --- a/dlls/winmm/message16.c +++ b/dlls/winmm/message16.c @@ -26,6 +26,7 @@ #include "windef.h" #include "winbase.h" #include "wownt32.h" +#include "winemm.h" #include "winemm16.h" #include "digitalv.h" #include "wine/debug.h" diff --git a/dlls/winmm/mmsystem.c b/dlls/winmm/mmsystem.c index fd065d0..669d161 100644 --- a/dlls/winmm/mmsystem.c +++ b/dlls/winmm/mmsystem.c @@ -39,6 +39,7 @@ #include "winnls.h" #include "wine/winuser16.h" +#include "winemm.h" #include "winemm16.h" #include "wine/debug.h" diff --git a/dlls/winmm/winemm16.h b/dlls/winmm/winemm16.h index 2099833..a64e28c 100644 --- a/dlls/winmm/winemm16.h +++ b/dlls/winmm/winemm16.h @@ -19,7 +19,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "winemm.h" #include "wine/mmsystem16.h" #include "wownt32.h"

1 0

Alexandre Julliard : oleaut32/tests: Skip a test that may crash on Win64.
by Alexandre Julliard Oct. 9, 2009

Oct. 9, 2009

Module: wine Branch: master Commit: 4c184a8b880e0ee3c8ddf4f5cbe19518bdd115e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c184a8b880e0ee3c8ddf4f5c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 8 22:45:40 2009 +0200 oleaut32/tests: Skip a test that may crash on Win64. --- dlls/oleaut32/tests/vartype.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/tests/vartype.c b/dlls/oleaut32/tests/vartype.c index 0321013..65a6a4b 100644 --- a/dlls/oleaut32/tests/vartype.c +++ b/dlls/oleaut32/tests/vartype.c @@ -5249,8 +5249,11 @@ static void test_SysAllocStringByteLen(void) const CHAR szTestA[6] = { 'T','e','s','t','\0','?' }; BSTR str; - str = SysAllocStringByteLen(szTestA, 0x80000000); - ok (str == NULL, "Expected NULL, got %p\n", str); + if (sizeof(void *) == 4) /* not limited to 0x80000000 on Win64 */ + { + str = SysAllocStringByteLen(szTestA, 0x80000000); + ok (str == NULL, "Expected NULL, got %p\n", str); + } str = SysAllocStringByteLen(szTestA, 0xffffffff); ok (str == NULL, "Expected NULL, got %p\n", str);

1 0