March 2011 - Wine-commits - list.winehq.org

Alexandre Julliard : gdi32: Get rid of the BitBlt driver entry point.
by Alexandre Julliard 17 Mar '11

17 Mar '11

Module: wine Branch: master Commit: 33e27fca77f12d81470b43bf2bdf3734fc305c60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=33e27fca77f12d81470b43bf2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 17 15:01:11 2011 +0100 gdi32: Get rid of the BitBlt driver entry point. --- dlls/gdi32/bitblt.c | 75 +---------------------------------------- dlls/gdi32/driver.c | 2 - dlls/gdi32/enhmfdrv/bitblt.c | 39 ++++++--------------- dlls/gdi32/enhmfdrv/init.c | 1 - dlls/gdi32/gdi_private.h | 1 - dlls/gdi32/mfdrv/init.c | 1 - 6 files changed, 13 insertions(+), 106 deletions(-) diff --git a/dlls/gdi32/bitblt.c b/dlls/gdi32/bitblt.c index 6586f41..daf29cd 100644 --- a/dlls/gdi32/bitblt.c +++ b/dlls/gdi32/bitblt.c @@ -68,80 +68,9 @@ BOOL WINAPI PatBlt( HDC hdc, INT left, INT top, INT width, INT height, DWORD rop BOOL WINAPI BitBlt( HDC hdcDst, INT xDst, INT yDst, INT width, INT height, HDC hdcSrc, INT xSrc, INT ySrc, DWORD rop ) { - BOOL ret = FALSE; - DC *dcDst, *dcSrc; - if (!rop_uses_src( rop )) return PatBlt( hdcDst, xDst, yDst, width, height, rop ); - - TRACE("hdcSrc=%p %d,%d -> hdcDest=%p %d,%d %dx%d rop=%06x\n", - hdcSrc, xSrc, ySrc, hdcDst, xDst, yDst, width, height, rop); - - if (!(dcDst = get_dc_ptr( hdcDst ))) return FALSE; - update_dc( dcDst ); - - if (dcDst->funcs->pBitBlt || dcDst->funcs->pStretchBlt) - { - dcSrc = get_dc_ptr( hdcSrc ); - if (dcSrc) update_dc( dcSrc ); - - if (dcDst->funcs->pBitBlt) - ret = dcDst->funcs->pBitBlt( dcDst->physDev, xDst, yDst, width, height, - dcSrc ? dcSrc->physDev : NULL, xSrc, ySrc, rop ); - else - ret = dcDst->funcs->pStretchBlt( dcDst->physDev, xDst, yDst, width, height, - dcSrc ? dcSrc->physDev : NULL, xSrc, ySrc, - width, height, rop ); - - release_dc_ptr( dcDst ); - if (dcSrc) release_dc_ptr( dcSrc ); - } - else if (dcDst->funcs->pStretchDIBits) - { - BITMAP bm; - BITMAPINFOHEADER info_hdr; - HBITMAP hbm; - LPVOID bits; - INT lines; - - release_dc_ptr( dcDst ); - - if(GetObjectType( hdcSrc ) != OBJ_MEMDC) - { - FIXME("hdcSrc isn't a memory dc. Don't yet cope with this\n"); - return FALSE; - } - - GetObjectW(GetCurrentObject(hdcSrc, OBJ_BITMAP), sizeof(bm), &bm); - - info_hdr.biSize = sizeof(info_hdr); - info_hdr.biWidth = bm.bmWidth; - info_hdr.biHeight = bm.bmHeight; - info_hdr.biPlanes = 1; - info_hdr.biBitCount = 32; - info_hdr.biCompression = BI_RGB; - info_hdr.biSizeImage = 0; - info_hdr.biXPelsPerMeter = 0; - info_hdr.biYPelsPerMeter = 0; - info_hdr.biClrUsed = 0; - info_hdr.biClrImportant = 0; - - if(!(bits = HeapAlloc(GetProcessHeap(), 0, bm.bmHeight * bm.bmWidth * 4))) - return FALSE; - - /* Select out the src bitmap before calling GetDIBits */ - hbm = SelectObject(hdcSrc, GetStockObject(DEFAULT_BITMAP)); - GetDIBits(hdcSrc, hbm, 0, bm.bmHeight, bits, (BITMAPINFO*)&info_hdr, DIB_RGB_COLORS); - SelectObject(hdcSrc, hbm); - - lines = StretchDIBits(hdcDst, xDst, yDst, width, height, xSrc, bm.bmHeight - height - ySrc, - width, height, bits, (BITMAPINFO*)&info_hdr, DIB_RGB_COLORS, rop); - - HeapFree(GetProcessHeap(), 0, bits); - return (lines == height); - } - else release_dc_ptr( dcDst ); - - return ret; + else return StretchBlt( hdcDst, xDst, yDst, width, height, + hdcSrc, xSrc, ySrc, width, height, rop ); } diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index 57f3117..f70293d 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -81,7 +81,6 @@ static struct graphics_driver *create_driver( HMODULE module ) GET_FUNC(Arc); GET_FUNC(ArcTo); GET_FUNC(BeginPath); - GET_FUNC(BitBlt); GET_FUNC(ChoosePixelFormat); GET_FUNC(Chord); GET_FUNC(CloseFigure); @@ -794,7 +793,6 @@ const DC_FUNCTIONS null_driver = nulldrv_Arc, /* pArc */ nulldrv_ArcTo, /* pArcTo */ nulldrv_BeginPath, /* pBeginPath */ - NULL, /* pBitBlt */ nulldrv_ChoosePixelFormat, /* pChoosePixelFormat */ nulldrv_Chord, /* pChord */ nulldrv_CloseFigure, /* pCloseFigure */ diff --git a/dlls/gdi32/enhmfdrv/bitblt.c b/dlls/gdi32/enhmfdrv/bitblt.c index f56e8ac..377efad 100644 --- a/dlls/gdi32/enhmfdrv/bitblt.c +++ b/dlls/gdi32/enhmfdrv/bitblt.c @@ -65,12 +65,8 @@ BOOL CDECL EMFDRV_PatBlt( PHYSDEV dev, INT left, INT top, return ret; } -/* Utilitarian function used by EMFDRV_BitBlt and EMFDRV_StretchBlt */ - -static BOOL EMFDRV_BitBlockTransfer( - PHYSDEV devDst, INT xDst, INT yDst, INT widthDst, INT heightDst, - PHYSDEV devSrc, INT xSrc, INT ySrc, INT widthSrc, INT heightSrc, DWORD rop, - DWORD emrType) +BOOL CDECL EMFDRV_StretchBlt( PHYSDEV devDst, INT xDst, INT yDst, INT widthDst, INT heightDst, + PHYSDEV devSrc, INT xSrc, INT ySrc, INT widthSrc, INT heightSrc, DWORD rop ) { BOOL ret; PEMRBITBLT pEMR; @@ -83,13 +79,18 @@ static BOOL EMFDRV_BitBlockTransfer( LPBITMAPINFOHEADER lpBmiH; EMFDRV_PDEVICE* physDevSrc = (EMFDRV_PDEVICE*)devSrc; HBITMAP hBitmap = NULL; + DWORD emrType; - if (emrType == EMR_BITBLT) + if (widthSrc == widthDst && heightSrc == heightDst) + { + emrType = EMR_BITBLT; emrSize = sizeof(EMRBITBLT); - else if (emrType == EMR_STRETCHBLT) - emrSize = sizeof(EMRSTRETCHBLT); + } else - return FALSE; + { + emrType = EMR_STRETCHBLT; + emrSize = sizeof(EMRSTRETCHBLT); + } hBitmap = GetCurrentObject(physDevSrc->hdc, OBJ_BITMAP); @@ -168,24 +169,6 @@ static BOOL EMFDRV_BitBlockTransfer( return ret; } -BOOL CDECL EMFDRV_BitBlt( - PHYSDEV devDst, INT xDst, INT yDst, INT width, INT height, - PHYSDEV devSrc, INT xSrc, INT ySrc, DWORD rop) -{ - return EMFDRV_BitBlockTransfer( devDst, xDst, yDst, width, height, - devSrc, xSrc, ySrc, width, height, - rop, EMR_BITBLT ); -} - -BOOL CDECL EMFDRV_StretchBlt( - PHYSDEV devDst, INT xDst, INT yDst, INT widthDst, INT heightDst, - PHYSDEV devSrc, INT xSrc, INT ySrc, INT widthSrc, INT heightSrc, DWORD rop ) -{ - return EMFDRV_BitBlockTransfer( devDst, xDst, yDst, widthDst, heightDst, - devSrc, xSrc, ySrc, widthSrc, heightSrc, - rop, EMR_STRETCHBLT ); -} - INT CDECL EMFDRV_StretchDIBits( PHYSDEV dev, INT xDst, INT yDst, INT widthDst, INT heightDst, INT xSrc, INT ySrc, INT widthSrc, INT heightSrc, diff --git a/dlls/gdi32/enhmfdrv/init.c b/dlls/gdi32/enhmfdrv/init.c index ac3fa4f..c31496b 100644 --- a/dlls/gdi32/enhmfdrv/init.c +++ b/dlls/gdi32/enhmfdrv/init.c @@ -43,7 +43,6 @@ static const DC_FUNCTIONS EMFDRV_Funcs = EMFDRV_Arc, /* pArc */ NULL, /* pArcTo */ EMFDRV_BeginPath, /* pBeginPath */ - EMFDRV_BitBlt, /* pBitBlt */ NULL, /* pChoosePixelFormat */ EMFDRV_Chord, /* pChord */ EMFDRV_CloseFigure, /* pCloseFigure */ diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 9db7c32..01f2c1b 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -88,7 +88,6 @@ typedef struct tagDC_FUNCS BOOL (CDECL *pArc)(PHYSDEV,INT,INT,INT,INT,INT,INT,INT,INT); BOOL (CDECL *pArcTo)(PHYSDEV,INT,INT,INT,INT,INT,INT,INT,INT); BOOL (CDECL *pBeginPath)(PHYSDEV); - BOOL (CDECL *pBitBlt)(PHYSDEV,INT,INT,INT,INT,PHYSDEV,INT,INT,DWORD); INT (CDECL *pChoosePixelFormat)(PHYSDEV,const PIXELFORMATDESCRIPTOR *); BOOL (CDECL *pChord)(PHYSDEV,INT,INT,INT,INT,INT,INT,INT,INT); BOOL (CDECL *pCloseFigure)(PHYSDEV); diff --git a/dlls/gdi32/mfdrv/init.c b/dlls/gdi32/mfdrv/init.c index 03af2e8..2cd3ff8 100644 --- a/dlls/gdi32/mfdrv/init.c +++ b/dlls/gdi32/mfdrv/init.c @@ -41,7 +41,6 @@ static const DC_FUNCTIONS MFDRV_Funcs = MFDRV_Arc, /* pArc */ NULL, /* pArcTo */ MFDRV_BeginPath, /* pBeginPath */ - NULL, /* pBitBlt */ NULL, /* pChoosePixelFormat */ MFDRV_Chord, /* pChord */ MFDRV_CloseFigure, /* pCloseFigure */

1 0

Alexandre Julliard : gdi32: Fix the calling convention of the DeleteDC entry points.
by Alexandre Julliard 17 Mar '11

17 Mar '11

Module: wine Branch: master Commit: 23ae69332a2cf332fe98eac06c062c63cd21a35c URL: http://source.winehq.org/git/wine.git/?a=commit;h=23ae69332a2cf332fe98eac06… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 17 15:24:44 2011 +0100 gdi32: Fix the calling convention of the DeleteDC entry points. --- dlls/gdi32/enhmfdrv/init.c | 4 ++-- dlls/gdi32/mfdrv/init.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/enhmfdrv/init.c b/dlls/gdi32/enhmfdrv/init.c index c31496b..09af117 100644 --- a/dlls/gdi32/enhmfdrv/init.c +++ b/dlls/gdi32/enhmfdrv/init.c @@ -32,7 +32,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(enhmetafile); -static BOOL EMFDRV_DeleteDC( PHYSDEV dev ); +static BOOL CDECL EMFDRV_DeleteDC( PHYSDEV dev ); static const DC_FUNCTIONS EMFDRV_Funcs = { @@ -161,7 +161,7 @@ static const DC_FUNCTIONS EMFDRV_Funcs = /********************************************************************** * EMFDRV_DeleteDC */ -static BOOL EMFDRV_DeleteDC( PHYSDEV dev ) +static BOOL CDECL EMFDRV_DeleteDC( PHYSDEV dev ) { EMFDRV_PDEVICE *physDev = (EMFDRV_PDEVICE *)dev; UINT index; diff --git a/dlls/gdi32/mfdrv/init.c b/dlls/gdi32/mfdrv/init.c index 2cd3ff8..cee4534 100644 --- a/dlls/gdi32/mfdrv/init.c +++ b/dlls/gdi32/mfdrv/init.c @@ -30,7 +30,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(metafile); -static BOOL MFDRV_DeleteDC( PHYSDEV dev ); +static BOOL CDECL MFDRV_DeleteDC( PHYSDEV dev ); static const DC_FUNCTIONS MFDRV_Funcs = { @@ -205,7 +205,7 @@ static DC *MFDRV_AllocMetaFile(void) /********************************************************************** * MFDRV_DeleteDC */ -static BOOL MFDRV_DeleteDC( PHYSDEV dev ) +static BOOL CDECL MFDRV_DeleteDC( PHYSDEV dev ) { METAFILEDRV_PDEVICE *physDev = (METAFILEDRV_PDEVICE *)dev; DWORD index;

1 0

Paul Vriens : msi: Only call MSI_RecordGetString() when needed (Coverity).
by Alexandre Julliard 17 Mar '11

17 Mar '11

Module: wine Branch: master Commit: abdecfbe1756378d137435858fd3d693a23229d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=abdecfbe1756378d137435858… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Thu Mar 17 14:55:30 2011 +0100 msi: Only call MSI_RecordGetString() when needed (Coverity). --- dlls/msi/table.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/table.c b/dlls/msi/table.c index 80fe3ee..14f4d30 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -2595,7 +2595,7 @@ static void dump_record( MSIRECORD *rec ) n = MSI_RecordGetFieldCount( rec ); for( i=1; i<=n; i++ ) { - LPCWSTR sval = MSI_RecordGetString( rec, i ); + LPCWSTR sval; if( MSI_RecordIsNull( rec, i ) ) TRACE("row -> []\n");

1 0

Paul Vriens : msvfw32: Only call MSVIDEO_GetHicPtr() once (Coverity).
by Alexandre Julliard 17 Mar '11

17 Mar '11

Module: wine Branch: master Commit: ec90fcd9c1260d1402993318e64ff2cca24a4fcc URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec90fcd9c1260d1402993318e… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Thu Mar 17 14:58:13 2011 +0100 msvfw32: Only call MSVIDEO_GetHicPtr() once (Coverity). --- dlls/msvfw32/msvideo_main.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/msvfw32/msvideo_main.c b/dlls/msvfw32/msvideo_main.c index ae8d6d2..c5b404d 100644 --- a/dlls/msvfw32/msvideo_main.c +++ b/dlls/msvfw32/msvideo_main.c @@ -530,7 +530,6 @@ LRESULT VFWAPI ICGetInfo(HIC hic, ICINFO *picinfo, DWORD cb) TRACE("(%p,%p,%d)\n", hic, picinfo, cb); - whic = MSVIDEO_GetHicPtr(hic); if (!whic) return ICERR_BADHANDLE; if (!picinfo) return MMSYSERR_INVALPARAM;

1 0

Michael Stefaniuc : d3d8: COM cleanup for the IDirect3DVolumeTexture8 iface .
by Alexandre Julliard 17 Mar '11

17 Mar '11

Module: wine Branch: master Commit: d71d1cf7033d62350dbdaf0bb7c5c95887c341cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=d71d1cf7033d62350dbdaf0bb… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Mar 17 16:50:46 2011 +0100 d3d8: COM cleanup for the IDirect3DVolumeTexture8 iface. --- dlls/d3d8/d3d8_private.h | 4 +- dlls/d3d8/device.c | 2 +- dlls/d3d8/volumetexture.c | 106 +++++++++++++++++++++++++++----------------- 3 files changed, 68 insertions(+), 44 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d71d1cf7033d62350dbda…

1 0

Hwang YunSong : po: Update Korean resource.
by Alexandre Julliard 17 Mar '11

17 Mar '11

Module: wine Branch: master Commit: 99f3a399f8c5c2d42b4a0d477d517cf690f37a34 URL: http://source.winehq.org/git/wine.git/?a=commit;h=99f3a399f8c5c2d42b4a0d477… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Thu Mar 17 17:30:13 2011 +0900 po: Update Korean resource. --- po/ko.po | 18 +----------------- 1 files changed, 1 insertions(+), 17 deletions(-) diff --git a/po/ko.po b/po/ko.po index 2959719..29cfe34 100644 --- a/po/ko.po +++ b/po/ko.po @@ -27,7 +27,7 @@ msgstr "" #: appwiz.rc:30 taskmgr.rc:263 winecfg.rc:38 msgid "Applications" -msgstr "어플리케이션" +msgstr "응용프로그램" #: appwiz.rc:32 msgid "" @@ -2782,7 +2782,6 @@ msgid "Signal pending\n" msgstr "시그널 대기중\n" #: winerror.mc:681 -#, fuzzy msgid "Max system-wide thread count reached\n" msgstr "최대 시스템 전역 쓰레드 카운트 도달\n" @@ -4211,7 +4210,6 @@ msgid "Private dialog index\n" msgstr "비공개 다이얼로그 색인\n" #: winerror.mc:2476 -#, fuzzy msgid "List box ID not found\n" msgstr "목록상자 ID를 찾을 수 없습니다\n" @@ -4276,7 +4274,6 @@ msgid "Hook procedure not installed\n" msgstr "설치되어 있지 않은 후크 프로 시저\n" #: winerror.mc:2556 -#, fuzzy msgid "Invalid list box message\n" msgstr "올바르지 않은 목록상자 메세지\n" @@ -4285,7 +4282,6 @@ msgid "Invalid LB_SETCOUNT sent\n" msgstr "올바르지 않은 LB_SETCOUNT 보내기\n" #: winerror.mc:2566 -#, fuzzy msgid "No tab stops on this list box\n" msgstr "목록상자에는 탭정지가 없음\n" @@ -4302,7 +4298,6 @@ msgid "Window has no system menu\n" msgstr "창은 시스템 메뉴를 가지고 있지 않습니다\n" #: winerror.mc:2586 -#, fuzzy msgid "Invalid message box style\n" msgstr "올바르지 않은 메세지 박스 스타일\n" @@ -4355,7 +4350,6 @@ msgid "No system resources\n" msgstr "시스템 리소스가 없습니다\n" #: winerror.mc:2651 -#, fuzzy msgid "No non-paged system resources\n" msgstr "페이지되지 않은 시스템 자원이 없음\n" @@ -4368,7 +4362,6 @@ msgid "No working set quota\n" msgstr "작동하는 할당령 설정이 없음\n" #: winerror.mc:2666 -#, fuzzy msgid "No page file quota\n" msgstr "페이지파일 할당량이 없음\n" @@ -4445,7 +4438,6 @@ msgid "Unknown component\n" msgstr "알 수 없는 컴포넌트\n" #: winerror.mc:2761 -#, fuzzy msgid "Unknown property\n" msgstr "알 수 없는 속성\n" @@ -4978,7 +4970,6 @@ msgid "Invalid printer command\n" msgstr "올바르지 않은 프린터 명령\n" #: winerror.mc:3431 -#, fuzzy msgid "Invalid data type\n" msgstr "올바르지 않은 데이타 형식\n" @@ -5290,7 +5281,6 @@ msgid "insert disk %s" msgstr "디스크 %s 삽입" #: msi.rc:30 -#, fuzzy msgid "" "Windows Installer %s\n" "\n" @@ -6867,7 +6857,6 @@ msgid "An invalid parameter was passed to a system function." msgstr "잘못된 매개변수는 시스템 함수에서 무시했습니다." #: winmm.rc:42 -#, fuzzy msgid "" "The specified format is not supported or cannot be translated. Use the " "Capabilities function to determine the supported formats." @@ -7058,7 +7047,6 @@ msgid "Cannot use 'all' as the device name with the specified command." msgstr "지정된 명령의 장치 이름으로 'all'은 사용할 수 없습니다." #: winmm.rc:77 -#, fuzzy msgid "" "Errors occurred in more than one device. Specify each command and device " "separately to determine which devices caused the error." @@ -7963,7 +7951,6 @@ msgstr "" "다.\n" #: cmd.rc:158 -#, fuzzy msgid "RENAME <filename> renames a file.\n" msgstr "RENAME <파일이름> 은 파일의 이름을 바꿈\n" @@ -8057,7 +8044,6 @@ msgstr "" "이 검증 플래그는 Wine에서는 아무 기능을 안함.\n" #: cmd.rc:204 -#, fuzzy msgid "VER displays the version of cmd you are running.\n" msgstr "VER 당신이 실행시킨 cmd 버젼 보여줌\n" @@ -10312,7 +10298,6 @@ msgid "CD-ROM" msgstr "CD-ROM" #: winecfg.rc:86 -#, fuzzy msgid "" "You cannot add any more drives.\n" "\n" @@ -11223,7 +11208,6 @@ msgid "&System\tCtrl+1" msgstr "시스템(&S)\tCtrl+1" #: wordpad.rc:88 -#, fuzzy msgid "&Pale yellow\tCtrl+2" msgstr "노랑색으로(&P)\tCtrl+2"

1 0

Łukasz Wojniłowicz : po: Update Polish translation.
by Alexandre Julliard 17 Mar '11

17 Mar '11

Module: wine Branch: master Commit: 12b24af8d7bbb515c4cc678eef45c396487816a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=12b24af8d7bbb515c4cc678ee… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Thu Mar 17 09:34:41 2011 +0100 po: Update Polish translation. --- po/pl.po | 584 +++++++++++++++++++++++++++++--------------------------------- 1 files changed, 276 insertions(+), 308 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=12b24af8d7bbb515c4cc6…

1 0

Alexandre Julliard : configure: Don' t build winmm drivers when their backend library is missing.
by Alexandre Julliard 17 Mar '11

17 Mar '11

Module: wine Branch: master Commit: 98cb21f74328ac5d893ba8302158eaffbec7836b URL: http://source.winehq.org/git/wine.git/?a=commit;h=98cb21f74328ac5d893ba8302… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 17 11:42:17 2011 +0100 configure: Don't build winmm drivers when their backend library is missing. --- configure | 10 ++++++++++ configure.ac | 11 +++++++++++ 2 files changed, 21 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 8790041..09cc4aa 100755 --- a/configure +++ b/configure @@ -12070,6 +12070,16 @@ _ACEOF fi +test -n "$ALSALIBS" || enable_winealsa_drv=${enable_winealsa_drv:-no} +test -n "$COREAUDIO" || enable_winecoreaudio_drv=${enable_winecoreaudio_drv:-no} +test -n "$NASLIBS" || enable_winenas_drv=${enable_winenas_drv:-no} +test -n "$ESDLIBS" || enable_wineesd_drv=${enable_wineesd_drv:-no} +test -n "$ac_cv_lib_soname_jack" || enable_winejack_drv=${enable_winejack_drv:-no} +test "$ac_cv_header_sys_soundcard_h" = "yes" -o \ + "$ac_cv_header_machine_soundcard_h" = "yes" -o \ + "$ac_cv_header_soundcard_h" = "yes" || enable_wineoss_drv=${enable_wineoss_drv:-no} +test "$ac_cv_header_linux_joystick_h" = "yes" || enable_winejoystick_drv=${enable_winejoystick_drv:-no} + if test "x$ALSALIBS$COREAUDIO$NASLIBS$ESDLIBS$ac_cv_lib_soname_jack" = "x" -a \ "$ac_cv_header_sys_soundcard_h" != "yes" -a \ "$ac_cv_header_machine_soundcard_h" != "yes" -a \ diff --git a/configure.ac b/configure.ac index b16b9e9..448975e 100644 --- a/configure.ac +++ b/configure.ac @@ -1660,6 +1660,17 @@ fi dnl **** Check for libodbc **** WINE_CHECK_SONAME(odbc,SQLConnect,,[AC_DEFINE_UNQUOTED(SONAME_LIBODBC,["libodbc.$LIBEXT"])]) +dnl **** Disable unsupported winmm drivers **** +test -n "$ALSALIBS" || enable_winealsa_drv=${enable_winealsa_drv:-no} +test -n "$COREAUDIO" || enable_winecoreaudio_drv=${enable_winecoreaudio_drv:-no} +test -n "$NASLIBS" || enable_winenas_drv=${enable_winenas_drv:-no} +test -n "$ESDLIBS" || enable_wineesd_drv=${enable_wineesd_drv:-no} +test -n "$ac_cv_lib_soname_jack" || enable_winejack_drv=${enable_winejack_drv:-no} +test "$ac_cv_header_sys_soundcard_h" = "yes" -o \ + "$ac_cv_header_machine_soundcard_h" = "yes" -o \ + "$ac_cv_header_soundcard_h" = "yes" || enable_wineoss_drv=${enable_wineoss_drv:-no} +test "$ac_cv_header_linux_joystick_h" = "yes" || enable_winejoystick_drv=${enable_winejoystick_drv:-no} + dnl **** Check for any sound system **** if test "x$ALSALIBS$COREAUDIO$NASLIBS$ESDLIBS$ac_cv_lib_soname_jack" = "x" -a \ "$ac_cv_header_sys_soundcard_h" != "yes" -a \

1 0

Erich Hoover : user32: Handle static and animated cursors as separate objects.
by Alexandre Julliard 17 Mar '11

17 Mar '11

Module: wine Branch: master Commit: fa4f9c43bcc06619fcf3e71f9e0a767981f2a750 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa4f9c43bcc06619fcf3e71f9… Author: Erich Hoover <ehoover(a)mines.edu> Date: Wed Mar 16 18:58:37 2011 -0600 user32: Handle static and animated cursors as separate objects. --- dlls/user32/cursoricon.c | 141 ++++++++++++++++++++++++++++++++++------------ 1 files changed, 104 insertions(+), 37 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fa4f9c43bcc06619fcf3e…

1 0

Erich Hoover : user32: Add support for retrieving individual animated frames.
by Alexandre Julliard 17 Mar '11

17 Mar '11

Module: wine Branch: master Commit: 28e9b99728db1d13e4a6c65faf5ff457c0c89e40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=28e9b99728db1d13e4a6c65fa… Author: Erich Hoover <ehoover(a)mines.edu> Date: Wed Mar 16 19:15:45 2011 -0600 user32: Add support for retrieving individual animated frames. --- dlls/user32/cursoricon.c | 30 +++++++++++++------- dlls/user32/tests/cursoricon.c | 59 +++++++++++++++++++++++++++++++++++++-- 2 files changed, 75 insertions(+), 14 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 34d7cf8..96027d5 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -1848,8 +1848,8 @@ HICON WINAPI LoadIconA(HINSTANCE hInstance, LPCSTR name) HCURSOR WINAPI GetCursorFrameInfo(HCURSOR hCursor, DWORD unk1, DWORD istep, DWORD *rate_jiffies, DWORD *num_steps) { struct cursoricon_object *ptr; - UINT icon_frames = 1; HCURSOR ret = 0; + UINT icon_steps; if (rate_jiffies == NULL || num_steps == NULL) return 0; @@ -1857,27 +1857,35 @@ HCURSOR WINAPI GetCursorFrameInfo(HCURSOR hCursor, DWORD unk1, DWORD istep, DWOR FIXME("semi-stub! %p => %d %d %p %p\n", hCursor, unk1, istep, rate_jiffies, num_steps); - if (ptr->is_ani) - { - struct animated_cursoricon_object *ani_icon_data; - - ani_icon_data = (struct animated_cursoricon_object *) ptr; - icon_frames = ani_icon_data->num_frames; - } + icon_steps = get_icon_steps(ptr); /* Important Note: Sequences are not currently supported, so this implementation * will not properly handle all cases. */ - if (istep < get_icon_steps(ptr) || icon_frames == 1) + if (istep < icon_steps || !ptr->is_ani) { - ret = hCursor; + struct animated_cursoricon_object *ani_icon_data = (struct animated_cursoricon_object *) ptr; + UINT icon_frames = 1; + + if (ptr->is_ani) + icon_frames = ani_icon_data->num_frames; + if (ptr->is_ani && icon_frames > 1) + ret = ani_icon_data->frames[istep]; + else + ret = hCursor; if (icon_frames == 1) { *rate_jiffies = 0; *num_steps = 1; } - else + else if (icon_steps == 1) + { + *num_steps = ~0; + *rate_jiffies = ptr->delay; + } + else if (istep < icon_steps) { struct cursoricon_frame *frame; + *num_steps = icon_steps; frame = get_icon_frame( ptr, istep ); if (get_icon_steps(ptr) == 1) *num_steps = ~0; diff --git a/dlls/user32/tests/cursoricon.c b/dlls/user32/tests/cursoricon.c index 0fc3cb7..527e4d2 100644 --- a/dlls/user32/tests/cursoricon.c +++ b/dlls/user32/tests/cursoricon.c @@ -1387,9 +1387,51 @@ static void test_CreateIconFromResource(void) ok(error == 0xdeadbeef, "Last error: %u\n", error); } +static int check_cursor_data( HDC hdc, HCURSOR hCursor, void *data, int length) +{ + char *image = NULL; + BITMAPINFO *info; + ICONINFO iinfo; + DWORD ret; + + ret = GetIconInfo( hCursor, &iinfo ); + ok(ret, "GetIconInfo() failed\n"); + if (!ret) return 0; + ret = 0; + info = HeapAlloc( GetProcessHeap(), 0, FIELD_OFFSET( BITMAPINFO, bmiColors[256] )); + ok(info != NULL, "HeapAlloc() failed\n"); + if (!info) return 0; + + info->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + info->bmiHeader.biWidth = 32; + info->bmiHeader.biHeight = 32; + info->bmiHeader.biPlanes = 1; + info->bmiHeader.biBitCount = 32; + info->bmiHeader.biCompression = BI_RGB; + info->bmiHeader.biSizeImage = 32 * 32 * 4; + info->bmiHeader.biXPelsPerMeter = 0; + info->bmiHeader.biYPelsPerMeter = 0; + info->bmiHeader.biClrUsed = 0; + info->bmiHeader.biClrImportant = 0; + image = HeapAlloc( GetProcessHeap(), 0, info->bmiHeader.biSizeImage ); + ok(image != NULL, "HeapAlloc() failed\n"); + if (!image) goto cleanup; + ret = GetDIBits( hdc, iinfo.hbmColor, 0, 32, image, info, DIB_RGB_COLORS ); + ok(ret, "GetDIBits() failed\n"); + if (!ret) goto cleanup; + ret = (memcmp(image, data, length) == 0); + ok(ret, "Expected 0x%x, actually 0x%x (first 4 bytes only)\n", *(DWORD *)data, *(DWORD *)image); + +cleanup: + HeapFree( GetProcessHeap(), 0, image ); + HeapFree( GetProcessHeap(), 0, info ); + return ret; +} + static HCURSOR WINAPI (*pGetCursorFrameInfo)(HCURSOR hCursor, VOID *unk1, VOID *unk2, VOID *unk3, VOID *unk4); static void test_GetCursorFrameInfo(void) { + DWORD frame_identifier[] = { 0x10Ad, 0xc001, 0x1c05 }; HBITMAP bmp = NULL, bmpOld = NULL; DWORD unk1, unk2, unk3, unk4; BITMAPINFOHEADER *icon_header; @@ -1472,6 +1514,7 @@ static void test_GetCursorFrameInfo(void) empty_anicursor.frames[0].data.icon_info.idType = 2; /* type: cursor */ empty_anicursor.frames[0].data.icon_info.idEntries[0].xHotspot = 3; empty_anicursor.frames[0].data.icon_info.idEntries[0].yHotspot = 3; + memcpy( &empty_anicursor.frames[0].data.bmi_data.data[0], &frame_identifier[0], sizeof(DWORD) ); SetLastError(0xdeadbeef); h1 = CreateIconFromResource((PBYTE) &empty_anicursor, sizeof(empty_anicursor), FALSE, 0x00030000); ok(h1 != NULL, "Create cursor failed (error = %d).\n", GetLastError()); @@ -1480,6 +1523,8 @@ static void test_GetCursorFrameInfo(void) unk1 = unk2 = unk3 = unk4 = 0xdead; h2 = pGetCursorFrameInfo(h1, &unk1, NULL, &unk3, &unk4); ok(h1 == h2, "GetCursorFrameInfo() failed: (%p != %p).\n", h1, h2); + ret = check_cursor_data( hdc, h2, &frame_identifier[0], sizeof(DWORD) ); + ok(ret, "GetCursorFrameInfo() returned wrong cursor data for frame 0.\n"); ok(unk1 == 0xdead, "GetCursorFrameInfo() unexpected param 2 value (0x%x != 0xdead).\n", unk1); ok(unk2 == 0xdead, "GetCursorFrameInfo() unexpected param 3 value (0x%x != 0xdead).\n", unk2); ok(unk3 == 0x0, "GetCursorFrameInfo() unexpected param 4 value (0x%x != 0x0).\n", unk3); @@ -1497,6 +1542,7 @@ static void test_GetCursorFrameInfo(void) empty_anicursor3.frames[i].data.icon_info.idType = 2; /* type: cursor */ empty_anicursor3.frames[i].data.icon_info.idEntries[0].xHotspot = 3; empty_anicursor3.frames[i].data.icon_info.idEntries[0].yHotspot = 3; + memcpy( &empty_anicursor3.frames[i].data.bmi_data.data[0], &frame_identifier[i], sizeof(DWORD) ); } SetLastError(0xdeadbeef); h1 = CreateIconFromResource((PBYTE) &empty_anicursor3, sizeof(empty_anicursor3), FALSE, 0x00030000); @@ -1515,7 +1561,9 @@ static void test_GetCursorFrameInfo(void) { unk1 = unk2 = unk3 = unk4 = 0xdead; h2 = pGetCursorFrameInfo(h1, &unk1, (VOID*)i, &unk3, &unk4); - ok(h2 != 0, "GetCursorFrameInfo() failed for cursor %p: (%p == 0).\n", h1, h2); + ok(h1 != h2 && h2 != 0, "GetCursorFrameInfo() failed for cursor %p: (%p, %p).\n", h1, h1, h2); + ret = check_cursor_data( hdc, h2, &frame_identifier[i], sizeof(DWORD) ); + ok(ret, "GetCursorFrameInfo() returned wrong cursor data for frame %d.\n", i); ok(unk1 == 0xdead, "GetCursorFrameInfo() unexpected param 2 value (0x%x != 0xdead).\n", unk1); ok(unk2 == 0xdead, "GetCursorFrameInfo() unexpected param 3 value (0x%x != 0xdead).\n", unk2); ok(unk3 == empty_anicursor3.header.header.display_rate, @@ -1561,7 +1609,9 @@ static void test_GetCursorFrameInfo(void) /* Check GetCursorFrameInfo behavior on rate 0 for a multi-frame animated cursor (with num_steps == 1) */ unk1 = unk2 = unk3 = unk4 = 0xdead; h2 = pGetCursorFrameInfo(h1, &unk1, NULL, &unk3, &unk4); - ok(h2 != 0, "GetCursorFrameInfo() failed for cursor %p: (%p == 0).\n", h1, h2); + ok(h1 != h2 && h2 != 0, "GetCursorFrameInfo() failed for cursor %p: (%p, %p).\n", h1, h1, h2); + ret = check_cursor_data( hdc, h2, &frame_identifier[0], sizeof(DWORD) ); + ok(ret, "GetCursorFrameInfo() returned wrong cursor data for frame 0.\n"); ok(unk1 == 0xdead, "GetCursorFrameInfo() unexpected param 2 value (0x%x != 0xdead).\n", unk1); ok(unk2 == 0xdead, "GetCursorFrameInfo() unexpected param 3 value (0x%x != 0xdead).\n", unk2); ok(unk3 == empty_anicursor3.header.header.display_rate, @@ -1594,6 +1644,7 @@ static void test_GetCursorFrameInfo(void) empty_anicursor3_rate.frames[i].data.icon_info.idType = 2; /* type: cursor */ empty_anicursor3_rate.frames[i].data.icon_info.idEntries[0].xHotspot = 3; empty_anicursor3_rate.frames[i].data.icon_info.idEntries[0].yHotspot = 3; + memcpy( &empty_anicursor3_rate.frames[i].data.bmi_data.data[0], &frame_identifier[i], sizeof(DWORD) ); } SetLastError(0xdeadbeef); h1 = CreateIconFromResource((PBYTE) &empty_anicursor3_rate, sizeof(empty_anicursor3_rate), FALSE, 0x00030000); @@ -1612,7 +1663,9 @@ static void test_GetCursorFrameInfo(void) { unk1 = unk2 = unk3 = unk4 = 0xdead; h2 = pGetCursorFrameInfo(h1, &unk1, (VOID*)i, &unk3, &unk4); - ok(h2 != 0, "GetCursorFrameInfo() failed for cursor %p: (%p != 0).\n", h1, h2); + ok(h1 != h2 && h2 != 0, "GetCursorFrameInfo() failed for cursor %p: (%p, %p).\n", h1, h1, h2); + ret = check_cursor_data( hdc, h2, &frame_identifier[i], sizeof(DWORD) ); + ok(ret, "GetCursorFrameInfo() returned wrong cursor data for frame %d.\n", i); ok(unk1 == 0xdead, "GetCursorFrameInfo() unexpected param 2 value (0x%x != 0xdead).\n", unk1); ok(unk2 == 0xdead, "GetCursorFrameInfo() unexpected param 3 value (0x%x != 0xdead).\n", unk2); ok(unk3 == empty_anicursor3_rate.rates.rate[i],

1 0