wine-commits March 2011

wine-commits@winehq.org

2 participants
849 discussions

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

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

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

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

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

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: Add a null driver entry point for PatBlt.
by Alexandre Julliard 17 Mar '11

17 Mar '11

Module: wine Branch: master Commit: ef676d6d7d19354e12bda0fa58de92922fd63e88 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef676d6d7d19354e12bda0fa5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 17 14:54:56 2011 +0100 gdi32: Add a null driver entry point for PatBlt. --- dlls/gdi32/bitblt.c | 44 ++++++++++++++------------------------------ dlls/gdi32/driver.c | 7 ++++++- 2 files changed, 20 insertions(+), 31 deletions(-) diff --git a/dlls/gdi32/bitblt.c b/dlls/gdi32/bitblt.c index f32ae98..6586f41 100644 --- a/dlls/gdi32/bitblt.c +++ b/dlls/gdi32/bitblt.c @@ -43,28 +43,21 @@ static inline BOOL rop_uses_src( DWORD rop ) /*********************************************************************** * PatBlt (GDI32.@) */ -BOOL WINAPI PatBlt( HDC hdc, INT left, INT top, - INT width, INT height, DWORD rop) +BOOL WINAPI PatBlt( HDC hdc, INT left, INT top, INT width, INT height, DWORD rop) { DC * dc; BOOL bRet = FALSE; - if (rop_uses_src( rop )) return FALSE; - if (!(dc = get_dc_ptr( hdc ))) return FALSE; - TRACE("%p %d,%d %dx%d %06x\n", hdc, left, top, width, height, rop ); - if (dc->funcs->pPatBlt) - { - update_dc( dc ); - bRet = dc->funcs->pPatBlt( dc->physDev, left, top, width, height, rop ); - } - else if (dc->funcs->pStretchBlt) + if (rop_uses_src( rop )) return FALSE; + if ((dc = get_dc_ptr( hdc ))) { + PHYSDEV physdev = GET_DC_PHYSDEV( dc, pPatBlt ); update_dc( dc ); - bRet = dc->funcs->pStretchBlt( dc->physDev, left, top, width, height, NULL, 0, 0, 0, 0, rop ); + bRet = physdev->funcs->pPatBlt( physdev, left, top, width, height, rop ); + release_dc_ptr( dc ); } - release_dc_ptr( dc ); return bRet; } @@ -78,18 +71,15 @@ BOOL WINAPI BitBlt( HDC hdcDst, INT xDst, INT yDst, INT width, 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 (!rop_uses_src( rop ) && dcDst->funcs->pPatBlt) - { - ret = dcDst->funcs->pPatBlt( dcDst->physDev, xDst, yDst, width, height, rop ); - release_dc_ptr( dcDst ); - } - else if (dcDst->funcs->pBitBlt || dcDst->funcs->pStretchBlt) + if (dcDst->funcs->pBitBlt || dcDst->funcs->pStretchBlt) { dcSrc = get_dc_ptr( hdcSrc ); if (dcSrc) update_dc( dcSrc ); @@ -158,15 +148,14 @@ BOOL WINAPI BitBlt( HDC hdcDst, INT xDst, INT yDst, INT width, /*********************************************************************** * StretchBlt (GDI32.@) */ -BOOL WINAPI StretchBlt( HDC hdcDst, INT xDst, INT yDst, - INT widthDst, INT heightDst, - HDC hdcSrc, INT xSrc, INT ySrc, - INT widthSrc, INT heightSrc, - DWORD rop ) +BOOL WINAPI StretchBlt( HDC hdcDst, INT xDst, INT yDst, INT widthDst, INT heightDst, + HDC hdcSrc, INT xSrc, INT ySrc, INT widthSrc, INT heightSrc, DWORD rop ) { BOOL ret = FALSE; DC *dcDst, *dcSrc; + if (!rop_uses_src( rop )) return PatBlt( hdcDst, xDst, yDst, widthDst, heightDst, rop ); + TRACE("%p %d,%d %dx%d -> %p %d,%d %dx%d rop=%06x\n", hdcSrc, xSrc, ySrc, widthSrc, heightSrc, hdcDst, xDst, yDst, widthDst, heightDst, rop ); @@ -175,12 +164,7 @@ BOOL WINAPI StretchBlt( HDC hdcDst, INT xDst, INT yDst, if (!(dcDst = get_dc_ptr( hdcDst ))) return FALSE; update_dc( dcDst ); - if (!rop_uses_src( rop ) && dcDst->funcs->pPatBlt) - { - ret = dcDst->funcs->pPatBlt( dcDst->physDev, xDst, yDst, widthDst, heightDst, rop ); - release_dc_ptr( dcDst ); - } - else if (dcDst->funcs->pStretchBlt) + if (dcDst->funcs->pStretchBlt) { if ((dcSrc = get_dc_ptr( hdcSrc ))) { diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index f040bde..57f3117 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -514,6 +514,11 @@ static BOOL CDECL nulldrv_PaintRgn( PHYSDEV dev, HRGN rgn ) return TRUE; } +static BOOL CDECL nulldrv_PatBlt( PHYSDEV dev, INT x, INT y, INT width, INT height, DWORD rop ) +{ + return TRUE; +} + static BOOL CDECL nulldrv_Pie( PHYSDEV dev, INT left, INT top, INT right, INT bottom, INT xstart, INT ystart, INT xend, INT yend ) { @@ -839,7 +844,7 @@ const DC_FUNCTIONS null_driver = nulldrv_OffsetViewportOrgEx, /* pOffsetViewportOrg */ nulldrv_OffsetWindowOrgEx, /* pOffsetWindowOrg */ nulldrv_PaintRgn, /* pPaintRgn */ - NULL, /* pPatBlt */ + nulldrv_PatBlt, /* pPatBlt */ nulldrv_Pie, /* pPie */ nulldrv_PolyBezier, /* pPolyBezier */ nulldrv_PolyBezierTo, /* pPolyBezierTo */

1 0

Alexandre Julliard : winex11: Implement a separate entry point for PatBlt and simplify the StretchBlt handling .
by Alexandre Julliard 17 Mar '11

17 Mar '11

Module: wine Branch: master Commit: 8e396a9417d4aa3c1e9cc6b8fcd97b6f303da2f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e396a9417d4aa3c1e9cc6b8f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 17 14:49:16 2011 +0100 winex11: Implement a separate entry point for PatBlt and simplify the StretchBlt handling. --- dlls/winex11.drv/bitblt.c | 278 ++++++++++++++++++------------------- dlls/winex11.drv/winex11.drv.spec | 1 + 2 files changed, 139 insertions(+), 140 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8e396a9417d4aa3c1e9cc…

1 0

Alexandre Julliard : gdi32: Always call the PatBlt entry point for blits that don't use a source.
by Alexandre Julliard 17 Mar '11

17 Mar '11

Module: wine Branch: master Commit: 5eb105f6e19f7583d660d4fc67b43c9e63529f69 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5eb105f6e19f7583d660d4fc6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 17 14:30:45 2011 +0100 gdi32: Always call the PatBlt entry point for blits that don't use a source. --- dlls/gdi32/bitblt.c | 29 ++++++++--- dlls/gdi32/enhmfdrv/bitblt.c | 109 ++++++++++++++--------------------------- 2 files changed, 59 insertions(+), 79 deletions(-) diff --git a/dlls/gdi32/bitblt.c b/dlls/gdi32/bitblt.c index f638a73..f32ae98 100644 --- a/dlls/gdi32/bitblt.c +++ b/dlls/gdi32/bitblt.c @@ -35,6 +35,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(bitblt); +static inline BOOL rop_uses_src( DWORD rop ) +{ + return ((rop >> 2) & 0x330000) != (rop & 0x330000); +} /*********************************************************************** * PatBlt (GDI32.@) @@ -42,10 +46,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(bitblt); BOOL WINAPI PatBlt( HDC hdc, INT left, INT top, INT width, INT height, DWORD rop) { - DC * dc = get_dc_ptr( hdc ); + DC * dc; BOOL bRet = FALSE; - if (!dc) return FALSE; + if (rop_uses_src( rop )) return FALSE; + if (!(dc = get_dc_ptr( hdc ))) return FALSE; TRACE("%p %d,%d %dx%d %06x\n", hdc, left, top, width, height, rop ); @@ -77,10 +82,15 @@ BOOL WINAPI BitBlt( HDC hdcDst, INT xDst, INT yDst, INT width, 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) + if (!rop_uses_src( rop ) && dcDst->funcs->pPatBlt) + { + ret = dcDst->funcs->pPatBlt( dcDst->physDev, xDst, yDst, width, height, rop ); + release_dc_ptr( dcDst ); + } + else if (dcDst->funcs->pBitBlt || dcDst->funcs->pStretchBlt) { - update_dc( dcDst ); dcSrc = get_dc_ptr( hdcSrc ); if (dcSrc) update_dc( dcSrc ); @@ -163,20 +173,25 @@ BOOL WINAPI StretchBlt( HDC hdcDst, INT xDst, INT yDst, if (!(dcDst = get_dc_ptr( hdcDst ))) return FALSE; + update_dc( dcDst ); - if (dcDst->funcs->pStretchBlt) + if (!rop_uses_src( rop ) && dcDst->funcs->pPatBlt) + { + ret = dcDst->funcs->pPatBlt( dcDst->physDev, xDst, yDst, widthDst, heightDst, rop ); + release_dc_ptr( dcDst ); + } + else if (dcDst->funcs->pStretchBlt) { if ((dcSrc = get_dc_ptr( hdcSrc ))) { - update_dc( dcDst ); update_dc( dcSrc ); ret = dcDst->funcs->pStretchBlt( dcDst->physDev, xDst, yDst, widthDst, heightDst, dcSrc->physDev, xSrc, ySrc, widthSrc, heightSrc, rop ); - release_dc_ptr( dcDst ); release_dc_ptr( dcSrc ); } + release_dc_ptr( dcDst ); } else if (dcDst->funcs->pStretchDIBits) { diff --git a/dlls/gdi32/enhmfdrv/bitblt.c b/dlls/gdi32/enhmfdrv/bitblt.c index e5c80f6..f56e8ac 100644 --- a/dlls/gdi32/enhmfdrv/bitblt.c +++ b/dlls/gdi32/enhmfdrv/bitblt.c @@ -81,13 +81,9 @@ static BOOL EMFDRV_BitBlockTransfer( BITMAP BM; WORD nBPP = 0; LPBITMAPINFOHEADER lpBmiH; - BOOL useSrc; EMFDRV_PDEVICE* physDevSrc = (EMFDRV_PDEVICE*)devSrc; HBITMAP hBitmap = NULL; - useSrc = (((rop >> 2) & 0x330000) != (rop & 0x330000)); - if (!physDevSrc && useSrc) return FALSE; - if (emrType == EMR_BITBLT) emrSize = sizeof(EMRBITBLT); else if (emrType == EMR_STRETCHBLT) @@ -95,23 +91,16 @@ static BOOL EMFDRV_BitBlockTransfer( else return FALSE; - if(useSrc) - { - hBitmap = GetCurrentObject(physDevSrc->hdc, OBJ_BITMAP); + hBitmap = GetCurrentObject(physDevSrc->hdc, OBJ_BITMAP); - if(sizeof(BITMAP) != GetObjectW(hBitmap, sizeof(BITMAP), &BM)) - return FALSE; + if(sizeof(BITMAP) != GetObjectW(hBitmap, sizeof(BITMAP), &BM)) + return FALSE; - nBPP = BM.bmPlanes * BM.bmBitsPixel; - if(nBPP > 8) nBPP = 24; /* FIXME Can't get 16bpp to work for some reason */ - bitsSize = DIB_GetDIBWidthBytes(BM.bmWidth, nBPP) * BM.bmHeight; - bmiSize = sizeof(BITMAPINFOHEADER) + - (nBPP <= 8 ? 1 << nBPP : 0) * sizeof(RGBQUAD); - } - else - { - bitsSize = bmiSize = 0; - } + nBPP = BM.bmPlanes * BM.bmBitsPixel; + if(nBPP > 8) nBPP = 24; /* FIXME Can't get 16bpp to work for some reason */ + bitsSize = DIB_GetDIBWidthBytes(BM.bmWidth, nBPP) * BM.bmHeight; + bmiSize = sizeof(BITMAPINFOHEADER) + + (nBPP <= 8 ? 1 << nBPP : 0) * sizeof(RGBQUAD); size = emrSize + bmiSize + bitsSize; @@ -132,27 +121,11 @@ static BOOL EMFDRV_BitBlockTransfer( pEMR->dwRop = rop; pEMR->xSrc = xSrc; pEMR->ySrc = ySrc; - if (useSrc) - { - GetWorldTransform(physDevSrc->hdc, &pEMR->xformSrc); - pEMR->crBkColorSrc = GetBkColor(physDevSrc->hdc); - pEMR->iUsageSrc = DIB_RGB_COLORS; - pEMR->offBmiSrc = emrSize; - pEMR->offBitsSrc = emrSize + bmiSize; - } - else - { - pEMR->xformSrc.eM11 = 1.0; /** FIXME: */ - pEMR->xformSrc.eM12 = 0.0; /** Setting default */ - pEMR->xformSrc.eM21 = 0.0; /** value. */ - pEMR->xformSrc.eM22 = 1.0; /** Where should we */ - pEMR->xformSrc.eDx = 0.0; /** get that info */ - pEMR->xformSrc.eDy = 0.0; /** ???? */ - pEMR->crBkColorSrc = 0; - pEMR->iUsageSrc = 0; - pEMR->offBmiSrc = 0; - pEMR->offBitsSrc = 0; - } + GetWorldTransform(physDevSrc->hdc, &pEMR->xformSrc); + pEMR->crBkColorSrc = GetBkColor(physDevSrc->hdc); + pEMR->iUsageSrc = DIB_RGB_COLORS; + pEMR->offBmiSrc = emrSize; + pEMR->offBitsSrc = emrSize + bmiSize; pEMR->cbBmiSrc = bmiSize; pEMR->cbBitsSrc = bitsSize; if (emrType == EMR_STRETCHBLT) @@ -162,42 +135,34 @@ static BOOL EMFDRV_BitBlockTransfer( pEMRStretch->cySrc = heightSrc; } - if (useSrc) - { - /* Initialize BITMAPINFO structure */ - lpBmiH = (LPBITMAPINFOHEADER)((BYTE*)pEMR + pEMR->offBmiSrc); - - lpBmiH->biSize = sizeof(BITMAPINFOHEADER); - lpBmiH->biWidth = BM.bmWidth; - lpBmiH->biHeight = BM.bmHeight; - lpBmiH->biPlanes = BM.bmPlanes; - lpBmiH->biBitCount = nBPP; - /* Assume the bitmap isn't compressed and set the BI_RGB flag. */ - lpBmiH->biCompression = BI_RGB; - lpBmiH->biSizeImage = bitsSize; - lpBmiH->biYPelsPerMeter = 0; - lpBmiH->biXPelsPerMeter = 0; - lpBmiH->biClrUsed = nBPP <= 8 ? 1 << nBPP : 0; - /* Set biClrImportant to 0, indicating that all of the - device colors are important. */ - lpBmiH->biClrImportant = 0; - - /* Initialize bitmap bits */ - if (GetDIBits(physDevSrc->hdc, hBitmap, 0, (UINT)lpBmiH->biHeight, - (BYTE*)pEMR + pEMR->offBitsSrc, - (LPBITMAPINFO)lpBmiH, DIB_RGB_COLORS)) - { - ret = EMFDRV_WriteRecord(devDst, (EMR*)pEMR); - if (ret) EMFDRV_UpdateBBox(devDst, &(pEMR->rclBounds)); - } - else - ret = FALSE; - } - else + /* Initialize BITMAPINFO structure */ + lpBmiH = (LPBITMAPINFOHEADER)((BYTE*)pEMR + pEMR->offBmiSrc); + + lpBmiH->biSize = sizeof(BITMAPINFOHEADER); + lpBmiH->biWidth = BM.bmWidth; + lpBmiH->biHeight = BM.bmHeight; + lpBmiH->biPlanes = BM.bmPlanes; + lpBmiH->biBitCount = nBPP; + /* Assume the bitmap isn't compressed and set the BI_RGB flag. */ + lpBmiH->biCompression = BI_RGB; + lpBmiH->biSizeImage = bitsSize; + lpBmiH->biYPelsPerMeter = 0; + lpBmiH->biXPelsPerMeter = 0; + lpBmiH->biClrUsed = nBPP <= 8 ? 1 << nBPP : 0; + /* Set biClrImportant to 0, indicating that all of the + device colors are important. */ + lpBmiH->biClrImportant = 0; + + /* Initialize bitmap bits */ + if (GetDIBits(physDevSrc->hdc, hBitmap, 0, (UINT)lpBmiH->biHeight, + (BYTE*)pEMR + pEMR->offBitsSrc, + (LPBITMAPINFO)lpBmiH, DIB_RGB_COLORS)) { ret = EMFDRV_WriteRecord(devDst, (EMR*)pEMR); if (ret) EMFDRV_UpdateBBox(devDst, &(pEMR->rclBounds)); } + else + ret = FALSE; HeapFree( GetProcessHeap(), 0, pEMR); return ret;

1 0

Nikolay Sivov : msxml3: Clean formatting chars before passing to base64 decoder.
by Alexandre Julliard 17 Mar '11

17 Mar '11

Module: wine Branch: master Commit: ae2057cbb8cf5f60df061e8152e9f145f106549e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae2057cbb8cf5f60df061e815… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 17 13:14:25 2011 +0300 msxml3: Clean formatting chars before passing to base64 decoder. --- dlls/msxml3/element.c | 31 +++++++++++++++++++++++-------- dlls/msxml3/tests/domdoc.c | 37 ++++++++++++++++++++----------------- 2 files changed, 43 insertions(+), 25 deletions(-) diff --git a/dlls/msxml3/element.c b/dlls/msxml3/element.c index 61afb2d..5071244 100644 --- a/dlls/msxml3/element.c +++ b/dlls/msxml3/element.c @@ -459,7 +459,7 @@ static inline BYTE base64_to_byte(xmlChar c) return c-'a'+26; } -static inline HRESULT VARIANT_from_DT(XDR_DT dt, xmlChar* str, VARIANT* v) +static inline HRESULT variant_from_dt(XDR_DT dt, xmlChar* str, VARIANT* v) { VARIANT src; HRESULT hr = S_OK; @@ -571,9 +571,25 @@ static inline HRESULT VARIANT_from_DT(XDR_DT dt, xmlChar* str, VARIANT* v) case DT_BIN_BASE64: { SAFEARRAYBOUND sab; + xmlChar *c1, *c2; int i, len; - len = xmlStrlen(str); + /* remove all formatting chars */ + c1 = c2 = str; + len = 0; + while (*c2) + { + if ( *c2 == ' ' || *c2 == '\t' || + *c2 == '\n' || *c2 == '\r' ) + { + c2++; + continue; + } + *c1++ = *c2++; + len++; + } + + /* skip padding */ if(str[len-2] == '=') i = 2; else if(str[len-1] == '=') i = 1; else i = 0; @@ -719,23 +735,22 @@ static XDR_DT element_get_dt(xmlNodePtr node) static HRESULT WINAPI domelem_get_nodeTypedValue( IXMLDOMElement *iface, - VARIANT* var1) + VARIANT* v) { domelem *This = impl_from_IXMLDOMElement( iface ); XDR_DT dt; xmlChar* content; HRESULT hr; - TRACE("(%p)->(%p)\n", This, var1); + TRACE("(%p)->(%p)\n", This, v); - if(!var1) - return E_INVALIDARG; + if(!v) return E_INVALIDARG; - V_VT(var1) = VT_NULL; + V_VT(v) = VT_NULL; dt = element_get_dt(get_element(This)); content = xmlNodeGetContent(get_element(This)); - hr = VARIANT_from_DT(dt, content, var1); + hr = variant_from_dt(dt, content, v); xmlFree(content); return hr; diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 3e60e24..99553fd 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -373,6 +373,8 @@ static const CHAR szTypeValueXML[] = " <uuid dt:dt=\"uuid\">333C7BC4-460F-11D0-BC04-0080C7055a83</uuid>\n" " <binhex dt:dt=\"bin.hex\">fffca012003c</binhex>\n" " <binbase64 dt:dt=\"bin.base64\">YmFzZTY0IHRlc3Q=</binbase64>\n" +" <binbase64_1 dt:dt=\"bin.base64\">\nYmFzZTY0\nIHRlc3Q=\n</binbase64_1>\n" +" <binbase64_2 dt:dt=\"bin.base64\">\nYmF\r\t z ZTY0\nIHRlc3Q=\n</binbase64_2>\n" "</root>"; static const CHAR szBasicTransformSSXMLPart1[] = @@ -5867,6 +5869,9 @@ static const nodetypedvalue_t get_nodetypedvalue[] = { { "root/r8", VT_R8, "0.412" }, { "root/float", VT_R8, "41221.421" }, { "root/uuid", VT_BSTR, "333C7BC4-460F-11D0-BC04-0080C7055a83" }, + { "root/binbase64", VT_ARRAY|VT_UI1, "base64 test" }, + { "root/binbase64_1", VT_ARRAY|VT_UI1, "base64 test" }, + { "root/binbase64_2", VT_ARRAY|VT_UI1, "base64 test" }, { 0 } }; @@ -5938,21 +5943,6 @@ static void test_nodeTypedValue(void) IXMLDOMNode_Release(node); } - hr = IXMLDOMDocument_selectSingleNode(doc, _bstr_("root/binbase64"), &node); - ok(hr == S_OK, "ret %08x\n", hr ); - { - BYTE bytes[] = {0x62,0x61,0x73,0x65,0x36,0x34,0x20,0x74,0x65,0x73,0x74}; - - hr = IXMLDOMNode_get_nodeTypedValue(node, &value); - ok(hr == S_OK, "ret %08x\n", hr ); - ok(V_VT(&value) == (VT_ARRAY|VT_UI1), "incorrect type\n"); - ok(V_ARRAY(&value)->rgsabound[0].cElements == 11, "incorrect array size\n"); - if(V_ARRAY(&value)->rgsabound[0].cElements == 11) - ok(!memcmp(bytes, V_ARRAY(&value)->pvData, sizeof(bytes)), "incorrect value\n"); - VariantClear(&value); - IXMLDOMNode_Release(node); - } - hr = IXMLDOMDocument_createProcessingInstruction(doc, _bstr_("foo"), _bstr_("value"), &pi); ok(hr == S_OK, "ret %08x\n", hr ); { @@ -6042,6 +6032,12 @@ static void test_nodeTypedValue(void) ok(hr == S_OK, "ret %08x\n", hr ); ok(V_VT(&value) == entry->type, "incorrect type, expected %d, got %d\n", entry->type, V_VT(&value)); + if (entry->type == (VT_ARRAY|VT_UI1)) + { + ok(V_ARRAY(&value)->rgsabound[0].cElements == strlen(entry->value), + "incorrect array size, got %d, expected %d\n", V_ARRAY(&value)->rgsabound[0].cElements, strlen(entry->value)); + } + if (entry->type != VT_BSTR) { if (entry->type == VT_DATE || @@ -6064,8 +6060,15 @@ static void test_nodeTypedValue(void) ok(hr == S_OK, "ret %08x\n", hr ); } - ok(lstrcmpW( V_BSTR(&value), _bstr_(entry->value)) == 0, - "expected %s, got %s\n", entry->value, wine_dbgstr_w(V_BSTR(&value))); + /* for byte array from VT_ARRAY|VT_UI1 it's not a WCHAR buffer */ + if (entry->type == (VT_ARRAY|VT_UI1)) + { + ok(!memcmp( V_BSTR(&value), entry->value, strlen(entry->value)), + "expected %s", entry->value); + } + else + ok(lstrcmpW( V_BSTR(&value), _bstr_(entry->value)) == 0, + "expected %s, got %s\n", entry->value, wine_dbgstr_w(V_BSTR(&value))); } else ok(lstrcmpW( V_BSTR(&value), _bstr_(entry->value)) == 0,

1 0

← Newer
1
...
26
27
28
29
30
31
32
...
85
Older →

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 March 2011