wine-commits October 2009

wine-commits@winehq.org

3 participants
1207 discussions

Alexandre Julliard : user32: Don't use a static dc for icon blitting.
by Alexandre Julliard 05 Oct '09

05 Oct '09

Module: wine Branch: master Commit: 5cdd8a2a4889f3f2556e57e020ba2a3eb5ff3142 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5cdd8a2a4889f3f2556e57e02… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 5 15:18:10 2009 +0200 user32: Don't use a static dc for icon blitting. --- dlls/user32/cursoricon.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index a74b79d..fca04ce 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -674,10 +674,7 @@ static BOOL stretch_blt_icon(HBITMAP hDest, BITMAPINFO *pDestInfo, BITMAPINFO *p { HBITMAP hOld; BOOL res = FALSE; - static HDC hdcMem = NULL; - - if (!hdcMem) - hdcMem = CreateCompatibleDC(screen_dc); + HDC hdcMem = CreateCompatibleDC(screen_dc); if (hdcMem) { @@ -687,6 +684,7 @@ static BOOL stretch_blt_icon(HBITMAP hDest, BITMAPINFO *pDestInfo, BITMAPINFO *p 0, 0, pSrcInfo->bmiHeader.biWidth, pSrcInfo->bmiHeader.biHeight, pSrcBits, pSrcInfo, DIB_RGB_COLORS, SRCCOPY); SelectObject(hdcMem, hOld); + DeleteDC( hdcMem ); } return res;

1 0

Joel Holdsworth : user32: Fixed CURSORICON_CreateIconFromBMI to preserve the alpha channel.
by Alexandre Julliard 05 Oct '09

05 Oct '09

Module: wine Branch: master Commit: c2202929ab4b6d1ce379865dfd8904186814f265 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2202929ab4b6d1ce379865df… Author: Joel Holdsworth <joel(a)airwebreathe.org.uk> Date: Mon Jun 29 19:10:36 2009 +0100 user32: Fixed CURSORICON_CreateIconFromBMI to preserve the alpha channel. --- dlls/user32/cursoricon.c | 147 +++++++++++++++++++++++++++------------------- 1 files changed, 87 insertions(+), 60 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 23de6a5..a74b79d 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -659,6 +659,39 @@ static CURSORICONFILEDIRENTRY *CURSORICON_FindBestIconFile( CURSORICONFILEDIR *d return &dir->idEntries[n]; } +/*********************************************************************** + * stretch_blt_icon + * + * A helper function that stretches a bitmap buffer into an HBITMAP. + * + * PARAMS + * hDest [I] The handle of the destination bitmap. + * pDestInfo [I] The BITMAPINFO of the destination bitmap. + * pSrcInfo [I] The BITMAPINFO of the source bitmap. + * pSrcBits [I] A pointer to the source bitmap buffer. + **/ +static BOOL stretch_blt_icon(HBITMAP hDest, BITMAPINFO *pDestInfo, BITMAPINFO *pSrcInfo, char *pSrcBits) +{ + HBITMAP hOld; + BOOL res = FALSE; + static HDC hdcMem = NULL; + + if (!hdcMem) + hdcMem = CreateCompatibleDC(screen_dc); + + if (hdcMem) + { + hOld = SelectObject(hdcMem, hDest); + res = StretchDIBits(hdcMem, + 0, 0, pDestInfo->bmiHeader.biWidth, pDestInfo->bmiHeader.biHeight, + 0, 0, pSrcInfo->bmiHeader.biWidth, pSrcInfo->bmiHeader.biHeight, + pSrcBits, pSrcInfo, DIB_RGB_COLORS, SRCCOPY); + SelectObject(hdcMem, hOld); + } + + return res; +} + static HICON CURSORICON_CreateIconFromBMI( BITMAPINFO *bmi, POINT16 hotspot, BOOL bIcon, DWORD dwVersion, @@ -666,12 +699,11 @@ static HICON CURSORICON_CreateIconFromBMI( BITMAPINFO *bmi, UINT cFlag ) { HGLOBAL16 hObj; - static HDC hdcMem; int sizeAnd, sizeXor; HBITMAP hAndBits = 0, hXorBits = 0; /* error condition for later */ BITMAP bmpXor, bmpAnd; - BOOL DoStretch; INT size; + BITMAPINFO *pSrcInfo, *pDestInfo; if (dwVersion == 0x00020000) { @@ -693,11 +725,10 @@ static HICON CURSORICON_CreateIconFromBMI( BITMAPINFO *bmi, if (!width) width = bmi->bmiHeader.biWidth; if (!height) height = bmi->bmiHeader.biHeight/2; - DoStretch = (bmi->bmiHeader.biHeight/2 != height) || - (bmi->bmiHeader.biWidth != width); /* Scale the hotspot */ - if (DoStretch && hotspot.x != ICON_HOTSPOT && hotspot.y != ICON_HOTSPOT) + if (((bmi->bmiHeader.biHeight/2 != height) || (bmi->bmiHeader.biWidth != width)) && + hotspot.x != ICON_HOTSPOT && hotspot.y != ICON_HOTSPOT) { hotspot.x = (hotspot.x * width) / bmi->bmiHeader.biWidth; hotspot.y = (hotspot.y * height) / (bmi->bmiHeader.biHeight / 2); @@ -706,8 +737,6 @@ static HICON CURSORICON_CreateIconFromBMI( BITMAPINFO *bmi, if (!screen_dc) screen_dc = CreateDCW( DISPLAYW, NULL, NULL, NULL ); if (screen_dc) { - BITMAPINFO* pInfo; - /* Make sure we have room for the monochrome bitmap later on. * Note that BITMAPINFOINFO and BITMAPCOREHEADER are the same * up to and including the biBitCount. In-memory icon resource @@ -719,40 +748,47 @@ static HICON CURSORICON_CreateIconFromBMI( BITMAPINFO *bmi, * BYTE icAND[] // DIB bits for AND mask */ - if ((pInfo = HeapAlloc( GetProcessHeap(), 0, - max(size, sizeof(BITMAPINFOHEADER) + 2*sizeof(RGBQUAD))))) + pSrcInfo = HeapAlloc( GetProcessHeap(), 0, + max(size, sizeof(BITMAPINFOHEADER) + 2*sizeof(RGBQUAD))); + pDestInfo = HeapAlloc( GetProcessHeap(), 0, + max(size, sizeof(BITMAPINFOHEADER) + 2*sizeof(RGBQUAD))); + if (pSrcInfo && pDestInfo) { - memcpy( pInfo, bmi, size ); - pInfo->bmiHeader.biHeight /= 2; + memcpy( pSrcInfo, bmi, size ); + pSrcInfo->bmiHeader.biHeight /= 2; + + memcpy( pDestInfo, bmi, size ); + pDestInfo->bmiHeader.biWidth = width; + pDestInfo->bmiHeader.biHeight = height; + pDestInfo->bmiHeader.biSizeImage = 0; /* Create the XOR bitmap */ + if(pSrcInfo->bmiHeader.biBitCount == 32) + { + void *pDIBBuffer = NULL; + hXorBits = CreateDIBSection(screen_dc, pDestInfo, DIB_RGB_COLORS, &pDIBBuffer, NULL, 0); - if (DoStretch) { + if(hXorBits) + { + if (!stretch_blt_icon(hXorBits, pDestInfo, pSrcInfo, (char*)bmi + size)) + { + DeleteObject(hXorBits); + hXorBits = 0; + } + } + } + else + { hXorBits = CreateCompatibleBitmap(screen_dc, width, height); + if(hXorBits) { - HBITMAP hOld; - BOOL res = FALSE; - - if (!hdcMem) hdcMem = CreateCompatibleDC(screen_dc); - if (hdcMem) { - hOld = SelectObject(hdcMem, hXorBits); - res = StretchDIBits(hdcMem, 0, 0, width, height, 0, 0, - bmi->bmiHeader.biWidth, bmi->bmiHeader.biHeight/2, - (char*)bmi + size, pInfo, DIB_RGB_COLORS, SRCCOPY); - SelectObject(hdcMem, hOld); + if(!stretch_blt_icon(hXorBits, pDestInfo, pSrcInfo, (char*)bmi + size)) + { + DeleteObject(hXorBits); + hXorBits = 0; + } } - if (!res) { DeleteObject(hXorBits); hXorBits = 0; } - } - } else { - if (is_dib_monochrome(bmi)) { - hXorBits = CreateBitmap(width, height, 1, 1, NULL); - SetDIBits(screen_dc, hXorBits, 0, height, - (char*)bmi + size, pInfo, DIB_RGB_COLORS); - } - else - hXorBits = CreateDIBitmap(screen_dc, &pInfo->bmiHeader, - CBM_INIT, (char*)bmi + size, pInfo, DIB_RGB_COLORS); } if( hXorBits ) @@ -761,51 +797,42 @@ static HICON CURSORICON_CreateIconFromBMI( BITMAPINFO *bmi, get_dib_width_bytes( bmi->bmiHeader.biWidth, bmi->bmiHeader.biBitCount ) * abs( bmi->bmiHeader.biHeight ) / 2; - pInfo->bmiHeader.biBitCount = 1; - if (pInfo->bmiHeader.biSize != sizeof(BITMAPCOREHEADER)) + pSrcInfo->bmiHeader.biBitCount = 1; + if (pSrcInfo->bmiHeader.biSize != sizeof(BITMAPCOREHEADER)) { - RGBQUAD *rgb = pInfo->bmiColors; + RGBQUAD *rgb = pSrcInfo->bmiColors; - pInfo->bmiHeader.biClrUsed = pInfo->bmiHeader.biClrImportant = 2; + pSrcInfo->bmiHeader.biClrUsed = pSrcInfo->bmiHeader.biClrImportant = 2; rgb[0].rgbBlue = rgb[0].rgbGreen = rgb[0].rgbRed = 0x00; rgb[1].rgbBlue = rgb[1].rgbGreen = rgb[1].rgbRed = 0xff; rgb[0].rgbReserved = rgb[1].rgbReserved = 0; } else { - RGBTRIPLE *rgb = (RGBTRIPLE *)(((BITMAPCOREHEADER *)pInfo) + 1); + RGBTRIPLE *rgb = (RGBTRIPLE *)(((BITMAPCOREHEADER *)pSrcInfo) + 1); rgb[0].rgbtBlue = rgb[0].rgbtGreen = rgb[0].rgbtRed = 0x00; rgb[1].rgbtBlue = rgb[1].rgbtGreen = rgb[1].rgbtRed = 0xff; } /* Create the AND bitmap */ + hAndBits = CreateBitmap(width, height, 1, 1, NULL); - if (DoStretch) { - if ((hAndBits = CreateBitmap(width, height, 1, 1, NULL))) { - HBITMAP hOld; - BOOL res = FALSE; - - if (!hdcMem) hdcMem = CreateCompatibleDC(screen_dc); - if (hdcMem) { - hOld = SelectObject(hdcMem, hAndBits); - res = StretchDIBits(hdcMem, 0, 0, width, height, 0, 0, - pInfo->bmiHeader.biWidth, pInfo->bmiHeader.biHeight, - xbits, pInfo, DIB_RGB_COLORS, SRCCOPY); - SelectObject(hdcMem, hOld); + if(!stretch_blt_icon(hAndBits, pDestInfo, pSrcInfo, xbits)) + { + DeleteObject(hAndBits); + hAndBits = 0; } - if (!res) { DeleteObject(hAndBits); hAndBits = 0; } - } - } else { - hAndBits = CreateBitmap(width, height, 1, 1, NULL); - - if (hAndBits) SetDIBits(screen_dc, hAndBits, 0, height, - xbits, pInfo, DIB_RGB_COLORS); + if( !hAndBits ) + { + DeleteObject( hXorBits ); + hXorBits = 0; + } } - if( !hAndBits ) DeleteObject( hXorBits ); - } - HeapFree( GetProcessHeap(), 0, pInfo ); + + HeapFree( GetProcessHeap(), 0, pSrcInfo ); + HeapFree( GetProcessHeap(), 0, pDestInfo ); } }

1 0

Joel Holdsworth : comdlg32: Replaced file dialog house icon with the shell icon for desktop.
by Alexandre Julliard 05 Oct '09

05 Oct '09

Module: wine Branch: master Commit: ee09534c27098bc8b00a7c0d5f9199232aab8fb5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee09534c27098bc8b00a7c0d5… Author: Joel Holdsworth <joel(a)airwebreathe.org.uk> Date: Sat Oct 3 10:12:55 2009 +0100 comdlg32: Replaced file dialog house icon with the shell icon for desktop. --- dlls/comdlg32/800.bmp | Bin 1334 -> 0 bytes dlls/comdlg32/cdlg_xx.rc | 3 --- dlls/comdlg32/filedlg.c | 27 +++++++++++++++++++-------- 3 files changed, 19 insertions(+), 11 deletions(-) diff --git a/dlls/comdlg32/800.bmp b/dlls/comdlg32/800.bmp deleted file mode 100644 index 3b7dae2..0000000 Binary files a/dlls/comdlg32/800.bmp and /dev/null differ diff --git a/dlls/comdlg32/cdlg_xx.rc b/dlls/comdlg32/cdlg_xx.rc index 0797897..24139d2 100644 --- a/dlls/comdlg32/cdlg_xx.rc +++ b/dlls/comdlg32/cdlg_xx.rc @@ -71,9 +71,6 @@ PD32_PORTRAIT ICON pd32_portrait.ico /* @makedep: pd32_landscape.ico */ PD32_LANDSCAPE ICON pd32_landscape.ico -/* @makedep: 800.bmp */ -800 BITMAP DISCARDABLE LOADONCALL "800.bmp" - /* @makedep: folder.ico */ FOLDER ICON folder.ico diff --git a/dlls/comdlg32/filedlg.c b/dlls/comdlg32/filedlg.c index a28c457..d1147eb 100644 --- a/dlls/comdlg32/filedlg.c +++ b/dlls/comdlg32/filedlg.c @@ -1320,15 +1320,16 @@ static LRESULT FILEDLG95_InitControls(HWND hwnd) {VIEW_LIST, FCIDM_TB_SMALLICON, TBSTATE_ENABLED, BTNS_BUTTON, {0, 0}, 0, 0 }, {VIEW_DETAILS, FCIDM_TB_REPORTVIEW, TBSTATE_ENABLED, BTNS_BUTTON, {0, 0}, 0, 0 }, }; - TBADDBITMAP tba[2]; + static const TBADDBITMAP tba = {HINST_COMMCTRL, IDB_VIEW_SMALL_COLOR}; + RECT rectTB; RECT rectlook; - FileOpenDlgInfos *fodInfos = GetPropA(hwnd,FileOpenDlgInfosStr); - tba[0].hInst = HINST_COMMCTRL; - tba[0].nID = IDB_VIEW_SMALL_COLOR; - tba[1].hInst = COMDLG32_hInstance; - tba[1].nID = 800; + HIMAGELIST toolbarImageList; + SHFILEINFOA shFileInfo; + ITEMIDLIST *desktopPidl; + + FileOpenDlgInfos *fodInfos = GetPropA(hwnd,FileOpenDlgInfosStr); TRACE("%p\n", fodInfos); @@ -1378,9 +1379,19 @@ static LRESULT FILEDLG95_InitControls(HWND hwnd) /* FIXME: use TB_LOADIMAGES when implemented */ /* SendMessageW(fodInfos->DlgInfos.hwndTB, TB_LOADIMAGES, IDB_VIEW_SMALL_COLOR, HINST_COMMCTRL);*/ SendMessageW(fodInfos->DlgInfos.hwndTB, TB_SETMAXTEXTROWS, 0, 0); - SendMessageW(fodInfos->DlgInfos.hwndTB, TB_ADDBITMAP, 12, (LPARAM) &tba[0]); - SendMessageW(fodInfos->DlgInfos.hwndTB, TB_ADDBITMAP, 1, (LPARAM) &tba[1]); + SendMessageW(fodInfos->DlgInfos.hwndTB, TB_ADDBITMAP, 12, (LPARAM) &tba); + + /* Retrieve and add desktop icon to the toolbar */ + toolbarImageList = (HIMAGELIST)SendMessageW(fodInfos->DlgInfos.hwndTB, TB_GETIMAGELIST, 0, 0L); + SHGetSpecialFolderLocation(hwnd, CSIDL_DESKTOP, &desktopPidl); + SHGetFileInfoA((LPCSTR)desktopPidl, 0, &shFileInfo, sizeof(shFileInfo), + SHGFI_PIDL | SHGFI_ICON | SHGFI_SMALLICON); + ImageList_AddIcon(toolbarImageList, shFileInfo.hIcon); + + DestroyIcon(shFileInfo.hIcon); + CoTaskMemFree(desktopPidl); + /* Finish Toolbar Construction */ SendMessageW(fodInfos->DlgInfos.hwndTB, TB_ADDBUTTONSW, 9, (LPARAM) tbb); SendMessageW(fodInfos->DlgInfos.hwndTB, TB_AUTOSIZE, 0, 0);

1 0

Gerald Pfeifer : winebuild: Add support for PLATFORM_FREEBSD.
by Alexandre Julliard 05 Oct '09

05 Oct '09

Module: wine Branch: master Commit: d222e8edf1983303a7f6ab1ba6bebf3770e00994 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d222e8edf1983303a7f6ab1ba… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Mon Oct 5 02:24:57 2009 +0200 winebuild: Add support for PLATFORM_FREEBSD. --- tools/winebuild/build.h | 6 +++++- tools/winebuild/main.c | 3 +++ 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/tools/winebuild/build.h b/tools/winebuild/build.h index 07ac347..b942934 100644 --- a/tools/winebuild/build.h +++ b/tools/winebuild/build.h @@ -124,7 +124,11 @@ enum target_cpu enum target_platform { - PLATFORM_UNSPECIFIED, PLATFORM_APPLE, PLATFORM_SOLARIS, PLATFORM_WINDOWS + PLATFORM_UNSPECIFIED, + PLATFORM_APPLE, + PLATFORM_FREEBSD, + PLATFORM_SOLARIS, + PLATFORM_WINDOWS }; extern char *target_alias; diff --git a/tools/winebuild/main.c b/tools/winebuild/main.c index 9fef1c4..4dfa63f 100644 --- a/tools/winebuild/main.c +++ b/tools/winebuild/main.c @@ -64,6 +64,8 @@ enum target_cpu target_cpu = CPU_POWERPC; #ifdef __APPLE__ enum target_platform target_platform = PLATFORM_APPLE; +#elif defined(__FreeBSD__) +enum target_platform target_platform = PLATFORM_FREEBSD; #elif defined(__sun) enum target_platform target_platform = PLATFORM_SOLARIS; #elif defined(_WIN32) @@ -111,6 +113,7 @@ static const struct { { "macos", PLATFORM_APPLE }, { "darwin", PLATFORM_APPLE }, + { "freebsd", PLATFORM_FREEBSD }, { "solaris", PLATFORM_SOLARIS }, { "windows", PLATFORM_WINDOWS }, { "winnt", PLATFORM_WINDOWS }

1 0

Jörg Höhle : winecoreaudio: Accept up to 8 channels.
by Alexandre Julliard 05 Oct '09

05 Oct '09

Module: wine Branch: master Commit: b16fc0e163dd970665f6d37503c18e1b01f0452f URL: http://source.winehq.org/git/wine.git/?a=commit;h=b16fc0e163dd970665f6d3750… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Mon Oct 5 10:34:24 2009 +0200 winecoreaudio: Accept up to 8 channels. --- dlls/winecoreaudio.drv/audio.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winecoreaudio.drv/audio.c b/dlls/winecoreaudio.drv/audio.c index 7f7c1ee..72e523e 100644 --- a/dlls/winecoreaudio.drv/audio.c +++ b/dlls/winecoreaudio.drv/audio.c @@ -449,7 +449,7 @@ static BOOL supportedFormat(LPWAVEFORMATEX wf) WAVEFORMATEXTENSIBLE * wfex = (WAVEFORMATEXTENSIBLE *)wf; if (wf->cbSize == 22 && IsEqualGUID(&wfex->SubFormat, &KSDATAFORMAT_SUBTYPE_PCM)) { - if (wf->nChannels >=1 && wf->nChannels <= 2) { + if (wf->nChannels >=1 && wf->nChannels <= 8) { if (wf->wBitsPerSample==wfex->Samples.wValidBitsPerSample) { if (wf->wBitsPerSample==8||wf->wBitsPerSample==16) return TRUE;

1 0

Jörg Höhle : wineoss: Fix the buffer size check for more than 2 channels.
by Alexandre Julliard 05 Oct '09

05 Oct '09

Module: wine Branch: master Commit: 55fca7778bf593e4ddde583868ea514ae93edb11 URL: http://source.winehq.org/git/wine.git/?a=commit;h=55fca7778bf593e4ddde58386… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Sat Oct 3 22:42:30 2009 +0200 wineoss: Fix the buffer size check for more than 2 channels. --- dlls/wineoss.drv/audio.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/wineoss.drv/audio.c b/dlls/wineoss.drv/audio.c index ddf973f..98575f1 100644 --- a/dlls/wineoss.drv/audio.c +++ b/dlls/wineoss.drv/audio.c @@ -2169,6 +2169,7 @@ static DWORD wodClose(WORD wDevID) */ static DWORD wodWrite(WORD wDevID, LPWAVEHDR lpWaveHdr, DWORD dwSize) { + WORD delta; TRACE("(%u, %p, %08X);\n", wDevID, lpWaveHdr, dwSize); /* first, do the sanity checks... */ @@ -2187,10 +2188,11 @@ static DWORD wodWrite(WORD wDevID, LPWAVEHDR lpWaveHdr, DWORD dwSize) lpWaveHdr->dwFlags |= WHDR_INQUEUE; lpWaveHdr->lpNext = 0; - if ((lpWaveHdr->dwBufferLength & (WOutDev[wDevID].waveFormat.Format.nBlockAlign - 1)) != 0) + delta = lpWaveHdr->dwBufferLength % WOutDev[wDevID].waveFormat.Format.nBlockAlign; + if (delta != 0) { WARN("WaveHdr length isn't a multiple of the PCM block size: %d %% %d\n",lpWaveHdr->dwBufferLength,WOutDev[wDevID].waveFormat.Format.nBlockAlign); - lpWaveHdr->dwBufferLength &= ~(WOutDev[wDevID].waveFormat.Format.nBlockAlign - 1); + lpWaveHdr->dwBufferLength -= delta; } OSS_AddRingMessage(&WOutDev[wDevID].msgRing, WINE_WM_HEADER, (DWORD_PTR)lpWaveHdr, FALSE);

1 0

Jörg Höhle : winmm: Require at least 16 bytes in the WAVE fmt header for PlaySound.
by Alexandre Julliard 05 Oct '09

05 Oct '09

Module: wine Branch: master Commit: 376f74b452c2b8dff15b62f6225a27e29814accc URL: http://source.winehq.org/git/wine.git/?a=commit;h=376f74b452c2b8dff15b62f62… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Sat Oct 3 11:42:37 2009 +0200 winmm: Require at least 16 bytes in the WAVE fmt header for PlaySound. --- dlls/winmm/playsound.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winmm/playsound.c b/dlls/winmm/playsound.c index e1badec..54db68f 100644 --- a/dlls/winmm/playsound.c +++ b/dlls/winmm/playsound.c @@ -376,7 +376,7 @@ static DWORD WINAPI proc_PlaySound(LPVOID arg) (LPSTR)&mmckInfo.ckid, mmckInfo.fccType, mmckInfo.cksize); lpWaveFormat = HeapAlloc(GetProcessHeap(), 0, mmckInfo.cksize); - if (mmioRead(hmmio, (HPSTR)lpWaveFormat, mmckInfo.cksize) < sizeof(WAVEFORMAT)) + if (mmioRead(hmmio, (HPSTR)lpWaveFormat, mmckInfo.cksize) < sizeof(PCMWAVEFORMAT)) goto errCleanUp; TRACE("wFormatTag=%04X !\n", lpWaveFormat->wFormatTag);

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

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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2009