wine-commits November 2009

wine-commits@winehq.org

3 participants
910 discussions

Roderick Colenbrander : opengl32: Fix wglCreateContextAttribsARB test on vista/ win7 where Nvidia drivers return hresults instead of win32 errors.
by Alexandre Julliard 23 Nov '09

23 Nov '09

Module: wine Branch: master Commit: ca1d79b26c246fd669a8791e4984d9fa215bc8a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca1d79b26c246fd669a8791e4… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Mon Nov 23 14:04:31 2009 +0100 opengl32: Fix wglCreateContextAttribsARB test on vista/win7 where Nvidia drivers return hresults instead of win32 errors. --- dlls/opengl32/tests/opengl.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/opengl32/tests/opengl.c b/dlls/opengl32/tests/opengl.c index c216ed2..2850117 100644 --- a/dlls/opengl32/tests/opengl.c +++ b/dlls/opengl32/tests/opengl.c @@ -581,7 +581,9 @@ static void test_opengl3(HDC hdc) gl3Ctx = pwglCreateContextAttribsARB(hdc, (HGLRC)0xdeadbeef, 0); todo_wine ok(gl3Ctx == 0, "pwglCreateContextAttribsARB using an invalid shareList passed\n"); error = GetLastError(); - todo_wine ok(error == ERROR_INVALID_OPERATION, "Expected ERROR_INVALID_OPERATION, got error=%x\n", error); + /* The Nvidia implementation seems to return hresults instead of win32 error codes */ + todo_wine ok(error == ERROR_INVALID_OPERATION || + error == HRESULT_FROM_WIN32(ERROR_INVALID_OPERATION), "Expected ERROR_INVALID_OPERATION, got error=%x\n", error); wglDeleteContext(gl3Ctx); }

1 0

Louis Lenders : advapi32: Don't delay import rpcrt4.
by Alexandre Julliard 23 Nov '09

23 Nov '09

Module: wine Branch: master Commit: 5edac266282d0cc25a7f02d0c778911fc562ffbf URL: http://source.winehq.org/git/wine.git/?a=commit;h=5edac266282d0cc25a7f02d0c… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Sun Nov 22 00:48:03 2009 +0100 advapi32: Don't delay import rpcrt4. --- dlls/advapi32/Makefile.in | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/Makefile.in b/dlls/advapi32/Makefile.in index d9236dc..3fb0948 100644 --- a/dlls/advapi32/Makefile.in +++ b/dlls/advapi32/Makefile.in @@ -5,9 +5,8 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = advapi32.dll IMPORTLIB = advapi32 -IMPORTS = kernel32 ntdll +IMPORTS = rpcrt4 kernel32 ntdll EXTRALIBS = @SECURITYLIB@ -DELAYIMPORTS = rpcrt4 C_SRCS = \ advapi.c \

1 0

Charles Davis : gdi32/tests: Test BitBlt() to an enhanced metafile.
by Alexandre Julliard 23 Nov '09

23 Nov '09

Module: wine Branch: master Commit: 3f1281cc449a9a9c92b1fe1f0064c35a8a103f55 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f1281cc449a9a9c92b1fe1f0… Author: Charles Davis <cdavis(a)mymail.mines.edu> Date: Sun Nov 22 13:25:42 2009 -0700 gdi32/tests: Test BitBlt() to an enhanced metafile. --- dlls/gdi32/tests/metafile.c | 122 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 122 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index b559901..9ce3ece 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -1030,6 +1030,63 @@ static const unsigned char EMF_LINETO_MM_TEXT_BITS[] = { 0x14, 0x00, 0x00, 0x00 }; +static const unsigned char EMF_BITBLT[] = +{ + 0x01, 0x00, 0x00, 0x00, 0x6c, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x03, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x6a, 0x00, 0x00, 0x00, 0x6a, 0x00, 0x00, 0x00, + 0x20, 0x45, 0x4d, 0x46, 0x00, 0x00, 0x01, 0x00, + 0xa0, 0x01, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, + 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x23, 0x04, 0x00, 0x00, 0x3b, 0x02, 0x00, 0x00, + 0x75, 0x01, 0x00, 0x00, 0xc9, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x08, 0xb1, 0x05, 0x00, + 0x28, 0x11, 0x03, 0x00, 0x4c, 0x00, 0x00, 0x00, + 0xbc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, + 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, + 0x04, 0x00, 0x00, 0x00, 0x20, 0x00, 0xcc, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x80, 0x3f, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x3f, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x64, 0x00, 0x00, 0x00, 0x28, 0x00, 0x00, 0x00, + 0x8c, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, + 0x28, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, + 0x04, 0x00, 0x00, 0x00, 0x01, 0x00, 0x18, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x4c, 0x00, 0x00, 0x00, 0x64, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x03, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, + 0x62, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x3f, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x80, 0x3f, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, + 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x10, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00 +}; + + /* For debugging or dumping the raw metafiles produced by * new test functions. */ @@ -1382,6 +1439,70 @@ static int compare_emf_bits(const HENHMETAFILE mf, const unsigned char *bits, return 0; } + +/* tests blitting to an EMF */ +static void test_emf_BitBlt(void) +{ + HDC hdcDisplay, hdcMetafile, hdcBitmap; + HBITMAP hBitmap, hOldBitmap; + HENHMETAFILE hMetafile; +#define BMP_DIM 4 + BITMAPINFOHEADER bmih = + { + sizeof(BITMAPINFOHEADER), + BMP_DIM,/* biWidth */ + BMP_DIM,/* biHeight */ + 1, /* biPlanes */ + 24, /* biBitCount */ + BI_RGB, /* biCompression */ + 0, /* biXPelsPerMeter */ + 0, /* biYPelsPerMeter */ + 0, /* biClrUsed */ + 0, /* biClrImportant */ + }; + void *bits; + BOOL ret; + + hdcDisplay = CreateDCA("DISPLAY", NULL, NULL, NULL); + ok( hdcDisplay != 0, "CreateDCA error %d\n", GetLastError() ); + + hdcBitmap = CreateCompatibleDC(hdcDisplay); + ok( hdcBitmap != 0, "CreateCompatibleDC failed\n" ); + bmih.biXPelsPerMeter = MulDiv(GetDeviceCaps(hdcDisplay, LOGPIXELSX), 100, 3937); + bmih.biYPelsPerMeter = MulDiv(GetDeviceCaps(hdcDisplay, LOGPIXELSY), 100, 3937); + hBitmap = CreateDIBSection(hdcDisplay, (const BITMAPINFO *)&bmih, + DIB_RGB_COLORS, &bits, NULL, 0); + hOldBitmap = SelectObject(hdcBitmap, hBitmap); + + hdcMetafile = CreateEnhMetaFileA(hdcBitmap, NULL, NULL, NULL); + ok( hdcMetafile != 0, "CreateEnhMetaFileA failed\n" ); + + /* First fill the bitmap DC with something recognizable, like BLACKNESS */ + ret = BitBlt(hdcBitmap, 0, 0, BMP_DIM, BMP_DIM, 0, 0, 0, BLACKNESS); + ok( ret, "BitBlt(BLACKNESS) failed\n" ); + + ret = BitBlt(hdcMetafile, 0, 0, BMP_DIM, BMP_DIM, hdcBitmap, 0, 0, SRCCOPY); + ok( ret, "BitBlt(SRCCOPY) failed\n" ); + ret = BitBlt(hdcMetafile, 0, 0, BMP_DIM, BMP_DIM, 0, 0, 0, WHITENESS); + ok( ret, "BitBlt(WHITENESS) failed\n" ); + + hMetafile = CloseEnhMetaFile(hdcMetafile); + ok( hMetafile != 0, "CloseEnhMetaFile failed\n" ); + + if(compare_emf_bits(hMetafile, EMF_BITBLT, sizeof(EMF_BITBLT), + "emf_BitBlt", FALSE) != 0) + { + dump_emf_bits(hMetafile, "emf_BitBlt"); + dump_emf_records(hMetafile, "emf_BitBlt"); + } + + SelectObject(hdcBitmap, hOldBitmap); + DeleteObject(hBitmap); + DeleteDC(hdcBitmap); + DeleteDC(hdcDisplay); +#undef BMP_DIM +} + /* Test a blank metafile. May be used as a template for new tests. */ static void test_mf_Blank(void) @@ -2628,6 +2749,7 @@ START_TEST(metafile) /* For enhanced metafiles (enhmfdrv) */ test_ExtTextOut(); test_SaveDC(); + test_emf_BitBlt(); /* For win-format metafiles (mfdrv) */ test_mf_SaveDC();

1 0

Charles Davis : gdi32/enhmfdrv: When blitting, don' t crash if the source is NULL.
by Alexandre Julliard 23 Nov '09

23 Nov '09

Module: wine Branch: master Commit: b6f841eaca4d02a209a3b06d4c04bd137849aa41 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6f841eaca4d02a209a3b06d4… Author: Charles Davis <cdavis(a)mymail.mines.edu> Date: Sun Nov 22 13:25:38 2009 -0700 gdi32/enhmfdrv: When blitting, don't crash if the source is NULL. --- dlls/gdi32/enhmfdrv/bitblt.c | 117 +++++++++++++++++++++++++++-------------- 1 files changed, 77 insertions(+), 40 deletions(-) diff --git a/dlls/gdi32/enhmfdrv/bitblt.c b/dlls/gdi32/enhmfdrv/bitblt.c index 1a84c32..e5c80f6 100644 --- a/dlls/gdi32/enhmfdrv/bitblt.c +++ b/dlls/gdi32/enhmfdrv/bitblt.c @@ -79,10 +79,14 @@ static BOOL EMFDRV_BitBlockTransfer( UINT bitsSize; UINT size; BITMAP BM; - WORD nBPP; + WORD nBPP = 0; LPBITMAPINFOHEADER lpBmiH; + BOOL useSrc; EMFDRV_PDEVICE* physDevSrc = (EMFDRV_PDEVICE*)devSrc; - HBITMAP hBitmap = GetCurrentObject(physDevSrc->hdc, OBJ_BITMAP); + HBITMAP hBitmap = NULL; + + useSrc = (((rop >> 2) & 0x330000) != (rop & 0x330000)); + if (!physDevSrc && useSrc) return FALSE; if (emrType == EMR_BITBLT) emrSize = sizeof(EMRBITBLT); @@ -91,16 +95,25 @@ static BOOL EMFDRV_BitBlockTransfer( else return FALSE; - if(sizeof(BITMAP) != GetObjectW(hBitmap, sizeof(BITMAP), &BM)) - return FALSE; + if(useSrc) + { + hBitmap = GetCurrentObject(physDevSrc->hdc, OBJ_BITMAP); - nBPP = BM.bmPlanes * BM.bmBitsPixel; - if(nBPP > 8) nBPP = 24; /* FIXME Can't get 16bpp to work for some reason */ + if(sizeof(BITMAP) != GetObjectW(hBitmap, sizeof(BITMAP), &BM)) + return FALSE; - bitsSize = DIB_GetDIBWidthBytes(BM.bmWidth, nBPP) * BM.bmHeight; - bmiSize = sizeof(BITMAPINFOHEADER) + - (nBPP <= 8 ? 1 << nBPP : 0) * sizeof(RGBQUAD); - size = emrSize + bmiSize + bitsSize; + 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; + } + + size = emrSize + bmiSize + bitsSize; pEMR = HeapAlloc(GetProcessHeap(), 0, size); if (!pEMR) return FALSE; @@ -119,12 +132,28 @@ static BOOL EMFDRV_BitBlockTransfer( pEMR->dwRop = rop; pEMR->xSrc = xSrc; pEMR->ySrc = ySrc; - GetWorldTransform(physDevSrc->hdc, &pEMR->xformSrc); - pEMR->crBkColorSrc = GetBkColor(physDevSrc->hdc); - pEMR->iUsageSrc = DIB_RGB_COLORS; - pEMR->offBmiSrc = emrSize; + 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; + } pEMR->cbBmiSrc = bmiSize; - pEMR->offBitsSrc = emrSize + bmiSize; pEMR->cbBitsSrc = bitsSize; if (emrType == EMR_STRETCHBLT) { @@ -133,34 +162,42 @@ static BOOL EMFDRV_BitBlockTransfer( pEMRStretch->cySrc = heightSrc; } - /* 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)) + 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 { ret = EMFDRV_WriteRecord(devDst, (EMR*)pEMR); if (ret) EMFDRV_UpdateBBox(devDst, &(pEMR->rclBounds)); - } - else - ret = FALSE; + } HeapFree( GetProcessHeap(), 0, pEMR); return ret;

1 0

Charles Davis : gdi32/enhmfdrv: Get the source transformation from the source DC.
by Alexandre Julliard 23 Nov '09

23 Nov '09

Module: wine Branch: master Commit: 5e17b04df7b683406084bb84a81c14951f0329c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e17b04df7b683406084bb84a… Author: Charles Davis <cdavis(a)mymail.mines.edu> Date: Sun Nov 22 13:25:34 2009 -0700 gdi32/enhmfdrv: Get the source transformation from the source DC. --- dlls/gdi32/enhmfdrv/bitblt.c | 7 +------ 1 files changed, 1 insertions(+), 6 deletions(-) diff --git a/dlls/gdi32/enhmfdrv/bitblt.c b/dlls/gdi32/enhmfdrv/bitblt.c index 9d87c7f..1a84c32 100644 --- a/dlls/gdi32/enhmfdrv/bitblt.c +++ b/dlls/gdi32/enhmfdrv/bitblt.c @@ -119,12 +119,7 @@ static BOOL EMFDRV_BitBlockTransfer( pEMR->dwRop = rop; pEMR->xSrc = xSrc; pEMR->ySrc = ySrc; - 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; /** ???? */ + GetWorldTransform(physDevSrc->hdc, &pEMR->xformSrc); pEMR->crBkColorSrc = GetBkColor(physDevSrc->hdc); pEMR->iUsageSrc = DIB_RGB_COLORS; pEMR->offBmiSrc = emrSize;

1 0

Charles Davis : gdi32/enhmfdrv: Don' t fill in the PelsPerMeter fields in the BITMAPINFOHEADER when blitting.
by Alexandre Julliard 23 Nov '09

23 Nov '09

Module: wine Branch: master Commit: d456f99a04e2b0a8c950a377abfe6ce732a23a56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d456f99a04e2b0a8c950a377a… Author: Charles Davis <cdavis(a)mymail.mines.edu> Date: Sun Nov 22 13:25:29 2009 -0700 gdi32/enhmfdrv: Don't fill in the PelsPerMeter fields in the BITMAPINFOHEADER when blitting. --- dlls/gdi32/enhmfdrv/bitblt.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/enhmfdrv/bitblt.c b/dlls/gdi32/enhmfdrv/bitblt.c index ddb9dd1..9d87c7f 100644 --- a/dlls/gdi32/enhmfdrv/bitblt.c +++ b/dlls/gdi32/enhmfdrv/bitblt.c @@ -149,10 +149,8 @@ static BOOL EMFDRV_BitBlockTransfer( /* Assume the bitmap isn't compressed and set the BI_RGB flag. */ lpBmiH->biCompression = BI_RGB; lpBmiH->biSizeImage = bitsSize; - lpBmiH->biYPelsPerMeter = /* 1 meter = 39.37 inch */ - MulDiv(GetDeviceCaps(physDevSrc->hdc,LOGPIXELSX),3937,100); - lpBmiH->biXPelsPerMeter = - MulDiv(GetDeviceCaps(physDevSrc->hdc,LOGPIXELSY),3937,100); + 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. */

1 0

Vincent Povirk : winex11.drv: Remove the HTML Format -> text/ html clipboard mapping.
by Alexandre Julliard 23 Nov '09

23 Nov '09

Module: wine Branch: master Commit: 56b8536336f79af093a630148a04e7f8cc02e965 URL: http://source.winehq.org/git/wine.git/?a=commit;h=56b8536336f79af093a630148… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sun Nov 22 12:57:12 2009 -0600 winex11.drv: Remove the HTML Format -> text/html clipboard mapping. The two formats do not match exactly. --- dlls/winex11.drv/clipboard.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index 82928a2..085836d 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -295,7 +295,6 @@ static const WCHAR wszRichTextFormat[] = {'R','i','c','h',' ','T','e','x','t',' static const WCHAR wszGIF[] = {'G','I','F',0}; static const WCHAR wszJFIF[] = {'J','F','I','F',0}; static const WCHAR wszPNG[] = {'P','N','G',0}; -static const WCHAR wszHTMLFormat[] = {'H','T','M','L',' ','F','o','r','m','a','t',0}; static const struct { LPCWSTR lpszFormat; @@ -307,7 +306,6 @@ static const struct { wszGIF, XATOM_image_gif }, { wszJFIF, XATOM_image_jpeg }, { wszPNG, XATOM_image_png }, - { wszHTMLFormat, XATOM_text_html }, };

1 0

Vincent Povirk : winex11.drv: Generate text/ html clipboard data from HTML Format.
by Alexandre Julliard 23 Nov '09

23 Nov '09

Module: wine Branch: master Commit: 1bd13dec61ae693637c6514b9d35e29597f6ed6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=1bd13dec61ae693637c6514b9… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sun Nov 22 14:30:18 2009 -0600 winex11.drv: Generate text/html clipboard data from HTML Format. --- dlls/winex11.drv/clipboard.c | 116 ++++++++++++++++++++++++++++++++++++++++ dlls/winex11.drv/x11drv.h | 1 + dlls/winex11.drv/x11drv_main.c | 1 + 3 files changed, 118 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index 085836d..2740264 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -167,6 +167,8 @@ static HANDLE X11DRV_CLIPBOARD_ExportMetaFilePict(Display *display, Window reque Atom rprop, LPWINE_CLIPDATA lpdata, LPDWORD lpBytes); static HANDLE X11DRV_CLIPBOARD_ExportEnhMetaFile(Display *display, Window requestor, Atom aTarget, Atom rprop, LPWINE_CLIPDATA lpdata, LPDWORD lpBytes); +static HANDLE X11DRV_CLIPBOARD_ExportTextHtml(Display *display, Window requestor, Atom aTarget, + Atom rprop, LPWINE_CLIPDATA lpdata, LPDWORD lpBytes); static WINE_CLIPFORMAT *X11DRV_CLIPBOARD_InsertClipboardFormat(LPCWSTR FormatName, Atom prop); static BOOL X11DRV_CLIPBOARD_RenderSynthesizedText(Display *display, UINT wFormatID); static void X11DRV_CLIPBOARD_FreeData(LPWINE_CLIPDATA lpData); @@ -295,6 +297,7 @@ static const WCHAR wszRichTextFormat[] = {'R','i','c','h',' ','T','e','x','t',' static const WCHAR wszGIF[] = {'G','I','F',0}; static const WCHAR wszJFIF[] = {'J','F','I','F',0}; static const WCHAR wszPNG[] = {'P','N','G',0}; +static const WCHAR wszHTMLFormat[] = {'H','T','M','L',' ','F','o','r','m','a','t',0}; static const struct { LPCWSTR lpszFormat; @@ -306,6 +309,7 @@ static const struct { wszGIF, XATOM_image_gif }, { wszJFIF, XATOM_image_jpeg }, { wszPNG, XATOM_image_png }, + { wszHTMLFormat, XATOM_HTML_Format }, /* prefer this to text/html */ }; @@ -356,10 +360,15 @@ static Window thread_selection_wnd(void) void X11DRV_InitClipboard(void) { UINT i; + WINE_CLIPFORMAT *format; /* Register known mapping between window formats and X properties */ for (i = 0; i < sizeof(PropertyFormatMap)/sizeof(PropertyFormatMap[0]); i++) X11DRV_CLIPBOARD_InsertClipboardFormat(PropertyFormatMap[i].lpszFormat, GET_ATOM(PropertyFormatMap[i].prop)); + + /* Set up a conversion function from "HTML Format" to "text/html" */ + format = X11DRV_CLIPBOARD_InsertClipboardFormat(wszHTMLFormat, GET_ATOM(XATOM_text_html)); + format->lpDrvExportFunc = X11DRV_CLIPBOARD_ExportTextHtml; } @@ -1818,6 +1827,113 @@ static HANDLE X11DRV_CLIPBOARD_ExportEnhMetaFile(Display *display, Window reques /************************************************************************** + * get_html_description_field + * + * Find the value of a field in an HTML Format description. + */ +static LPCSTR get_html_description_field(LPCSTR data, LPCSTR keyword) +{ + LPCSTR pos=data; + + while (pos && *pos && *pos != '<') + { + if (memcmp(pos, keyword, strlen(keyword)) == 0) + return pos+strlen(keyword); + + pos = strchr(pos, '\n'); + if (pos) pos++; + } + + return NULL; +} + + +/************************************************************************** + * X11DRV_CLIPBOARD_ExportTextHtml + * + * Export HTML Format to text/html. + * + * FIXME: We should attempt to add an <a base> tag and convert windows paths. + */ +static HANDLE X11DRV_CLIPBOARD_ExportTextHtml(Display *display, Window requestor, Atom aTarget, + Atom rprop, LPWINE_CLIPDATA lpdata, LPDWORD lpBytes) +{ + HANDLE hdata; + UINT datasize; + LPCSTR data, field_value; + UINT fragmentstart, fragmentend, htmlsize; + HANDLE hhtmldata=NULL; + LPSTR htmldata; + + *lpBytes = 0; + + if (!X11DRV_CLIPBOARD_RenderFormat(display, lpdata)) + { + ERR("Failed to export %04x format\n", lpdata->wFormatID); + return 0; + } + + hdata = lpdata->hData32; + + datasize = GlobalSize(hdata); + + data = GlobalLock(hdata); + if (!data) + { + ERR("Failed to lock HTML Format data\n"); + return 0; + } + + /* read the important fields */ + field_value = get_html_description_field(data, "StartFragment:"); + if (!field_value) + { + ERR("Couldn't find StartFragment value\n"); + goto end; + } + fragmentstart = atoi(field_value); + + field_value = get_html_description_field(data, "EndFragment:"); + if (!field_value) + { + ERR("Couldn't find EndFragment value\n"); + goto end; + } + fragmentend = atoi(field_value); + + /* export only the fragment */ + htmlsize = fragmentend - fragmentstart + 1; + + hhtmldata = GlobalAlloc(0, htmlsize); + + if (hhtmldata) + { + htmldata = GlobalLock(hhtmldata); + + if (!htmldata) + { + GlobalFree(hhtmldata); + htmldata = NULL; + goto end; + } + + memcpy(htmldata, &data[fragmentstart], fragmentend-fragmentstart); + htmldata[htmlsize-1] = '\0'; + + *lpBytes = htmlsize; + + GlobalUnlock(htmldata); + } + +end: + + GlobalUnlock(hdata); + + return hhtmldata; +} + + +/************************************************************************** * X11DRV_CLIPBOARD_QueryTargets */ static BOOL X11DRV_CLIPBOARD_QueryTargets(Display *display, Window w, Atom selection, diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 11f8e0d..3dd5edf 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -661,6 +661,7 @@ enum x11drv_atoms XATOM_XdndSelection, XATOM_XdndTarget, XATOM_XdndTypeList, + XATOM_HTML_Format, XATOM_WCF_DIB, XATOM_image_gif, XATOM_image_jpeg, diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index b97426e..3600cd0 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -170,6 +170,7 @@ static const char * const atom_names[NB_XATOMS - FIRST_XATOM] = "XdndSelection", "XdndTarget", "XdndTypeList", + "HTML Format", "WCF_DIB", "image/gif", "image/jpeg",

1 0

Alexandre Julliard : mountmgr: Move creation of the DEVICEMAP registry keys to mountmgr.
by Alexandre Julliard 23 Nov '09

23 Nov '09

Module: wine Branch: master Commit: d19e2ada9ce2d52d8b09e984fe5b12803bf6d4ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=d19e2ada9ce2d52d8b09e984f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 23 13:21:22 2009 +0100 mountmgr: Move creation of the DEVICEMAP registry keys to mountmgr. --- dlls/mountmgr.sys/mountmgr.c | 16 ++++++++++++++++ tools/wine.inf.in | 2 -- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/mountmgr.sys/mountmgr.c b/dlls/mountmgr.sys/mountmgr.c index a80d492..7056ef4 100644 --- a/dlls/mountmgr.sys/mountmgr.c +++ b/dlls/mountmgr.sys/mountmgr.c @@ -400,10 +400,14 @@ NTSTATUS WINAPI DriverEntry( DRIVER_OBJECT *driver, UNICODE_STRING *path ) static const WCHAR device_mountmgrW[] = {'\\','D','e','v','i','c','e','\\','M','o','u','n','t','P','o','i','n','t','M','a','n','a','g','e','r',0}; static const WCHAR link_mountmgrW[] = {'\\','?','?','\\','M','o','u','n','t','P','o','i','n','t','M','a','n','a','g','e','r',0}; static const WCHAR harddiskW[] = {'\\','D','r','i','v','e','r','\\','H','a','r','d','d','i','s','k',0}; + static const WCHAR devicemapW[] = {'H','A','R','D','W','A','R','E','\\','D','E','V','I','C','E','M','A','P',0}; + static const WCHAR parallelW[] = {'P','A','R','A','L','L','E','L',' ','P','O','R','T','S',0}; + static const WCHAR serialW[] = {'S','E','R','I','A','L','C','O','M','M',0}; UNICODE_STRING nameW, linkW; DEVICE_OBJECT *device; NTSTATUS status; + HKEY hkey, devicemap_key; TRACE( "%s\n", debugstr_w(path->Buffer) ); @@ -422,6 +426,18 @@ NTSTATUS WINAPI DriverEntry( DRIVER_OBJECT *driver, UNICODE_STRING *path ) RegCreateKeyExW( HKEY_LOCAL_MACHINE, mounted_devicesW, 0, NULL, REG_OPTION_VOLATILE, KEY_ALL_ACCESS, NULL, &mount_key, NULL ); + if (!RegCreateKeyExW( HKEY_LOCAL_MACHINE, devicemapW, 0, NULL, REG_OPTION_VOLATILE, + KEY_ALL_ACCESS, NULL, &devicemap_key, NULL )) + { + if (!RegCreateKeyExW( devicemap_key, parallelW, 0, NULL, REG_OPTION_VOLATILE, + KEY_ALL_ACCESS, NULL, &hkey, NULL )) + RegCloseKey( hkey ); + if (!RegCreateKeyExW( devicemap_key, serialW, 0, NULL, REG_OPTION_VOLATILE, + KEY_ALL_ACCESS, NULL, &hkey, NULL )) + RegCloseKey( hkey ); + RegCloseKey( devicemap_key ); + } + RtlInitUnicodeString( &nameW, harddiskW ); status = IoCreateDriver( &nameW, harddisk_driver_entry ); diff --git a/tools/wine.inf.in b/tools/wine.inf.in index d264054..f676898 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -540,8 +540,6 @@ HKLM,System\CurrentControlSet\Control\Session Manager,,,"" HKLM,System\CurrentControlSet\Control\VMM32Files,,,"" HKCU,AppEvents\Schemes\Apps\Explorer\Navigating\.Current,,,"" HKCU,Software\Microsoft\Protected Storage System Provider,,,"" -HKLM,HARDWARE\DEVICEMAP\PARALLEL PORTS,,,"" -HKLM,HARDWARE\DEVICEMAP\SERIALCOMM,,,"" ; Some apps requires at least four subkeys of Active Setup\Installed Components HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{44BBA855-CC51-11CF-AAFA-00AA00B6015F},,2,"DirectDrawEx" HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{44BBA855-CC51-11CF-AAFA-00AA00B6015F},"ComponentID",2,"DirectDrawEx"

1 0

Jörg Höhle : winmm: Don't stop parsing after MCI' s alias keyword.
by Alexandre Julliard 23 Nov '09

23 Nov '09

Module: wine Branch: master Commit: e36db94c7cf8b8d56adda70ef1c753c5231e7974 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e36db94c7cf8b8d56adda70ef… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Sun Oct 25 20:18:41 2009 +0100 winmm: Don't stop parsing after MCI's alias keyword. --- dlls/winmm/mci.c | 15 +-------------- dlls/winmm/tests/mci.c | 16 +++++++++++++--- 2 files changed, 14 insertions(+), 17 deletions(-) diff --git a/dlls/winmm/mci.c b/dlls/winmm/mci.c index c46c4c5..49e8598 100644 --- a/dlls/winmm/mci.c +++ b/dlls/winmm/mci.c @@ -1232,7 +1232,6 @@ DWORD WINAPI mciSendStringW(LPCWSTR lpstrCommand, LPWSTR lpstrRet, DWORD data[MCI_DATA_SIZE]; DWORD retType; LPCWSTR lpCmd = 0; - LPWSTR devAlias = NULL; static const WCHAR wszNew[] = {'n','e','w',0}; static const WCHAR wszSAliasS[] = {' ','a','l','i','a','s',' ',0}; static const WCHAR wszTypeS[] = {'t','y','p','e',' ',0}; @@ -1311,19 +1310,7 @@ DWORD WINAPI mciSendStringW(LPCWSTR lpstrCommand, LPWSTR lpstrRet, dwFlags |= MCI_OPEN_ELEMENT; data[3] = (DWORD)dev; } - if ((devAlias = strstrW(args, wszSAliasS))) { - WCHAR* tmp2; - devAlias += 7; - if (!(tmp = strchrW(devAlias,' '))) tmp = devAlias + strlenW(devAlias); - if (tmp) *tmp = '\0'; - tmp2 = HeapAlloc(GetProcessHeap(), 0, (tmp - devAlias + 1) * sizeof(WCHAR) ); - memcpy( tmp2, devAlias, (tmp - devAlias) * sizeof(WCHAR) ); - tmp2[tmp - devAlias] = 0; - data[4] = (DWORD)tmp2; - /* should be done in regular options parsing */ - /* dwFlags |= MCI_OPEN_ALIAS; */ - } else if (dev == 0) { - /* "open new" requires alias */ + if (!strstrW(args, wszSAliasS) && !dev) { dwRet = MCIERR_NEW_REQUIRES_ALIAS; goto errCleanUp; } diff --git a/dlls/winmm/tests/mci.c b/dlls/winmm/tests/mci.c index c72c81d..6607e17 100644 --- a/dlls/winmm/tests/mci.c +++ b/dlls/winmm/tests/mci.c @@ -168,7 +168,7 @@ static void test_openCloseWAVE(HWND hwnd) { MCIERROR err; MCI_GENERIC_PARMS parm; - const char command_open[] = "open new type waveaudio alias mysound"; + const char command_open[] = "open new type waveaudio alias mysound notify"; const char command_close_my[] = "close mysound notify"; const char command_close_all[] = "close all notify"; const char command_sysinfo[] = "sysinfo waveaudio quantity open"; @@ -180,9 +180,18 @@ static void test_openCloseWAVE(HWND hwnd) todo_wine ok(!err,"mci %s returned %s\n", command_open, dbg_mcierr(err)); if(!err) trace("[MCI] with %s drivers\n", buf); - err = mciSendString(command_open, buf, sizeof(buf), NULL); + err = mciSendString("open new type waveaudio alias r shareable", buf, sizeof(buf), NULL); + ok(err==MCIERR_UNSUPPORTED_FUNCTION,"mci open new shareable returned %s\n", dbg_mcierr(err)); + if(!err) { + err = mciSendString("close r", NULL, 0, NULL); + ok(!err,"mci close shareable returned %s\n", dbg_mcierr(err)); + } + + err = mciSendString(command_open, buf, sizeof(buf), hwnd); ok(!err,"mci %s returned %s\n", command_open, dbg_mcierr(err)); ok(!strcmp(buf,"1"), "mci open deviceId: %s, expected 1\n", buf); + /* Wine<=1.1.33 used to ignore anything past alias XY */ + test_notification(hwnd,"open new alias notify",MCI_NOTIFY_SUCCESSFUL); err = mciSendString("status mysound time format", buf, sizeof(buf), hwnd); ok(!err,"mci status time format returned %s\n", dbg_mcierr(err)); @@ -514,7 +523,7 @@ static void test_asyncWAVE(HWND hwnd) char buf[1024]; memset(buf, 0, sizeof(buf)); - err = mciSendString("open tempfile.wav alias mysound", buf, sizeof(buf), NULL); + err = mciSendString("open tempfile.wav alias mysound notify", buf, sizeof(buf), hwnd); ok(err==ok_saved,"mci open tempfile.wav returned %s\n", dbg_mcierr(err)); if(err) { skip("Cannot open tempfile.wav for playing (%s), skipping\n", dbg_mcierr(err)); @@ -523,6 +532,7 @@ static void test_asyncWAVE(HWND hwnd) ok(!strcmp(buf,"1"), "mci open deviceId: %s, expected 1\n", buf); wDeviceID = atoi(buf); ok(wDeviceID,"mci open DeviceID: %d\n", wDeviceID); + test_notification(hwnd,"open alias notify",MCI_NOTIFY_SUCCESSFUL); err = mciSendString("status mysound mode", buf, sizeof(buf), hwnd); ok(!err,"mci status mode returned %s\n", dbg_mcierr(err));

1 0

← Newer
1
...
11
12
13
14
15
16
17
...
91
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 November 2009