May 2010 - Wine-Commits - list.winehq.org

Vincent Povirk : ole32/tests: Add more IStream_Seek tests for hglobalstream .
by Alexandre Julliard May 27, 2010

May 27, 2010

Module: wine Branch: master Commit: ff4292c229ceb4621e661601c9763d13c4f4bab7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff4292c229ceb4621e661601c… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed May 26 12:10:53 2010 -0500 ole32/tests: Add more IStream_Seek tests for hglobalstream. --- dlls/ole32/tests/hglobalstream.c | 47 +++++++++++++++++++++++++++++++++++++- 1 files changed, 46 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/tests/hglobalstream.c b/dlls/ole32/tests/hglobalstream.c index 5632b24..6d2230d 100644 --- a/dlls/ole32/tests/hglobalstream.c +++ b/dlls/ole32/tests/hglobalstream.c @@ -151,7 +151,7 @@ static void test_streamonhglobal(IStream *pStream) ok(ull.u.LowPart == 0, "should have set LowPart to 0 instead of %d\n", ull.u.LowPart); ok(ull.u.HighPart == 0, "should have set HighPart to 0 instead of %d\n", ull.u.HighPart); - /* IStream_Seek -- invalid LowPart value (seek from current position) */ + /* IStream_Seek -- invalid LowPart value (seek before start of stream) */ ll.u.HighPart = 0; ll.u.LowPart = sizeof(data); hr = IStream_Seek(pStream, ll, STREAM_SEEK_SET, &ull); @@ -166,6 +166,51 @@ static void test_streamonhglobal(IStream *pStream) ok(ull.u.LowPart == sizeof(data), "LowPart set to %d\n", ull.u.LowPart); ok(ull.u.HighPart == 0, "should have set HighPart to 0 instead of %d\n", ull.u.HighPart); + /* IStream_Seek -- valid LowPart value (seek to start of stream) */ + ll.u.HighPart = 0; + ll.u.LowPart = sizeof(data); + hr = IStream_Seek(pStream, ll, STREAM_SEEK_SET, &ull); + ok_ole_success(hr, "IStream_Seek"); + + ull.u.HighPart = 0xCAFECAFE; + ull.u.LowPart = 0xCAFECAFE; + ll.u.HighPart = 0; + ll.u.LowPart = -sizeof(data); + hr = IStream_Seek(pStream, ll, STREAM_SEEK_CUR, &ull); + todo_wine ok_ole_success(hr, "IStream_Seek"); + todo_wine ok(ull.u.LowPart == 0, "LowPart set to %d\n", ull.u.LowPart); + ok(ull.u.HighPart == 0, "should have set HighPart to 0 instead of %d\n", ull.u.HighPart); + + /* IStream_Seek -- invalid LowPart value (seek to start of stream-1) */ + ll.u.HighPart = 0; + ll.u.LowPart = sizeof(data); + hr = IStream_Seek(pStream, ll, STREAM_SEEK_SET, &ull); + ok_ole_success(hr, "IStream_Seek"); + + ull.u.HighPart = 0xCAFECAFE; + ull.u.LowPart = 0xCAFECAFE; + ll.u.HighPart = 0; + ll.u.LowPart = -sizeof(data)-1; + hr = IStream_Seek(pStream, ll, STREAM_SEEK_CUR, &ull); + ok(hr == STG_E_SEEKERROR, "IStream_Seek should have returned STG_E_SEEKERROR instead of 0x%08x\n", hr); + ok(ull.u.LowPart == sizeof(data), "LowPart set to %d\n", ull.u.LowPart); + ok(ull.u.HighPart == 0, "should have set HighPart to 0 instead of %d\n", ull.u.HighPart); + + /* IStream_Seek -- valid LowPart value (seek forward to 0x80000000) */ + ll.u.HighPart = 0; + ll.u.LowPart = sizeof(data); + hr = IStream_Seek(pStream, ll, STREAM_SEEK_SET, &ull); + ok_ole_success(hr, "IStream_Seek"); + + ull.u.HighPart = 0xCAFECAFE; + ull.u.LowPart = 0xCAFECAFE; + ll.u.HighPart = 0; + ll.u.LowPart = 0x80000000 - sizeof(data); + hr = IStream_Seek(pStream, ll, STREAM_SEEK_CUR, &ull); + ok_ole_success(hr, "IStream_Seek"); + ok(ull.u.LowPart == 0x80000000, "LowPart set to %d\n", ull.u.LowPart); + ok(ull.u.HighPart == 0, "should have set HighPart to 0 instead of %d\n", ull.u.HighPart); + /* IStream_Seek -- invalid LowPart value (seek to beginning) */ ll.u.HighPart = 0; ll.u.LowPart = sizeof(data);

1 0

Vincent Povirk : ole32: Fix seeking backwards in hglobalstream.
by Alexandre Julliard May 27, 2010

May 27, 2010

Module: wine Branch: master Commit: d64ee9ff11d8712bbb0c643f902a62a0ee557021 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d64ee9ff11d8712bbb0c643f9… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed May 26 12:15:11 2010 -0500 ole32: Fix seeking backwards in hglobalstream. --- dlls/ole32/hglobalstream.c | 19 +++++++++++-------- dlls/ole32/tests/hglobalstream.c | 4 ++-- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/dlls/ole32/hglobalstream.c b/dlls/ole32/hglobalstream.c index 5742f99..ef616de 100644 --- a/dlls/ole32/hglobalstream.c +++ b/dlls/ole32/hglobalstream.c @@ -371,12 +371,6 @@ static HRESULT WINAPI HGLOBALStreamImpl_Seek( TRACE("(%p, %x%08x, %d, %p)\n", iface, dlibMove.u.HighPart, dlibMove.u.LowPart, dwOrigin, plibNewPosition); - if (dlibMove.u.LowPart >= 0x80000000) - { - hr = STG_E_SEEKERROR; - goto end; - } - /* * The file pointer is moved depending on the given "function" * parameter. @@ -405,10 +399,19 @@ static HRESULT WINAPI HGLOBALStreamImpl_Seek( newPosition.u.HighPart = 0; newPosition.u.LowPart += dlibMove.QuadPart; -end: - if (plibNewPosition) *plibNewPosition = newPosition; + if (dlibMove.u.LowPart >= 0x80000000 && + newPosition.u.LowPart >= dlibMove.u.LowPart) + { + /* We tried to seek backwards and went past the start. */ + hr = STG_E_SEEKERROR; + goto end; + } + This->currentPosition = newPosition; +end: + if (plibNewPosition) *plibNewPosition = This->currentPosition; + return hr; } diff --git a/dlls/ole32/tests/hglobalstream.c b/dlls/ole32/tests/hglobalstream.c index 6d2230d..0810d9f 100644 --- a/dlls/ole32/tests/hglobalstream.c +++ b/dlls/ole32/tests/hglobalstream.c @@ -177,8 +177,8 @@ static void test_streamonhglobal(IStream *pStream) ll.u.HighPart = 0; ll.u.LowPart = -sizeof(data); hr = IStream_Seek(pStream, ll, STREAM_SEEK_CUR, &ull); - todo_wine ok_ole_success(hr, "IStream_Seek"); - todo_wine ok(ull.u.LowPart == 0, "LowPart set to %d\n", ull.u.LowPart); + ok_ole_success(hr, "IStream_Seek"); + ok(ull.u.LowPart == 0, "LowPart set to %d\n", ull.u.LowPart); ok(ull.u.HighPart == 0, "should have set HighPart to 0 instead of %d\n", ull.u.HighPart); /* IStream_Seek -- invalid LowPart value (seek to start of stream-1) */

1 0

Roderick Colenbrander : wined3d: Don't use blit_supported() in d3dfmt_get_conv for now.
by Alexandre Julliard May 27, 2010

May 27, 2010

Module: wine Branch: master Commit: ba09e7a2a1ddd8bc9675043c8e0e3d56dd460bcf URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba09e7a2a1ddd8bc9675043c8… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Wed May 26 21:51:31 2010 +0200 wined3d: Don't use blit_supported() in d3dfmt_get_conv for now. --- dlls/wined3d/surface.c | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index f128bb6..62c5831 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2145,8 +2145,8 @@ HRESULT d3dfmt_get_conv(IWineD3DSurfaceImpl *This, BOOL need_alpha_ck, BOOL use_ { BOOL colorkey_active = need_alpha_ck && (This->CKeyFlags & WINEDDSD_CKSRCBLT); IWineD3DDeviceImpl *device = This->resource.device; + const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; BOOL blit_supported = FALSE; - RECT rect = {0, 0, This->pow2Width, This->pow2Height}; /* Copy the default values from the surface. Below we might perform fixups */ /* TODO: get rid of color keying desc fixups by using e.g. a table. */ @@ -2161,10 +2161,19 @@ HRESULT d3dfmt_get_conv(IWineD3DSurfaceImpl *This, BOOL need_alpha_ck, BOOL use_ Paletted Texture **************** */ + /* Below the call to blit_supported is disabled for Wine 1.2 because the function isn't operating correctly yet. + * At the moment 8-bit blits are handled in software and if certain GL extensions are around, surface conversion + * is performed at upload time. The blit_supported call recognizes it as a destination fixup. This type of upload 'fixup' + * and 8-bit to 8-bit blits need to be handled by the blit_shader. + * TODO: get rid of this #if 0 + */ +#if 0 blit_supported = device->blitter->blit_supported(&device->adapter->gl_info, BLIT_OP_BLIT, &rect, This->resource.usage, This->resource.pool, This->resource.format_desc, &rect, This->resource.usage, This->resource.pool, This->resource.format_desc); +#endif + blit_supported = gl_info->supported[EXT_PALETTED_TEXTURE] || gl_info->supported[ARB_FRAGMENT_PROGRAM]; /* Use conversion when the blit_shader backend supports it. It only supports this in case of * texturing. Further also use conversion in case of color keying.

1 0

Roderick Colenbrander : wined3d: Replace set_shader call with unset_shader in blt_to_drawable.
by Alexandre Julliard May 27, 2010

May 27, 2010

Module: wine Branch: master Commit: e54f06183c24ecb59fd4ec08e137484553f8f07b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e54f06183c24ecb59fd4ec08e… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Wed May 26 21:51:30 2010 +0200 wined3d: Replace set_shader call with unset_shader in blt_to_drawable. The blit_shader is activated before draw_textured_quad, so after use it should be deactivated instead of being activated again. --- dlls/wined3d/surface.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 0903f6e..f128bb6 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -4355,7 +4355,7 @@ static inline void surface_blt_to_drawable(IWineD3DSurfaceImpl *This, const RECT draw_textured_quad(This, &src_rect, &dst_rect, WINED3DTEXF_POINT); LEAVE_GL(); - device->blitter->set_shader((IWineD3DDevice *) device, This); + device->blitter->unset_shader((IWineD3DDevice *) device); swapchain = (This->Flags & SFLAG_SWAPCHAIN) ? (IWineD3DSwapChainImpl *)This->container : NULL; if (wined3d_settings.strict_draw_ordering || (swapchain

1 0

Roderick Colenbrander : wined3d: Update Nvidia Geforce6+ driver version to latest 197.45 WHQL version.
by Alexandre Julliard May 27, 2010

May 27, 2010

Module: wine Branch: master Commit: 3e10c3d547b67c203f4ae38001a19e0c5ab01a04 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e10c3d547b67c203f4ae3800… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Wed May 26 21:51:32 2010 +0200 wined3d: Update Nvidia Geforce6+ driver version to latest 197.45 WHQL version. --- dlls/wined3d/directx.c | 40 ++++++++++++++++++++-------------------- 1 files changed, 20 insertions(+), 20 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index ded549a..56b5565 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -999,26 +999,26 @@ static const struct driver_version_information driver_version_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCEFX_5200, "NVIDIA GeForce FX 5200", 15, 11, 7516 }, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCEFX_5600, "NVIDIA GeForce FX 5600", 15, 11, 7516 }, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCEFX_5800, "NVIDIA GeForce FX 5800", 15, 11, 7516 }, - {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_6200, "NVIDIA GeForce 6200", 15, 11, 8618 }, - {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_6600GT, "NVIDIA GeForce 6600 GT", 15, 11, 8618 }, - {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_6800, "NVIDIA GeForce 6800", 15, 11, 8618 }, - {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_7300, "NVIDIA GeForce Go 7300", 15, 11, 8585 }, - {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_7400, "NVIDIA GeForce Go 7400", 15, 11, 8585 }, - {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_7600, "NVIDIA GeForce 7600 GT", 15, 11, 8618 }, - {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_7800GT, "NVIDIA GeForce 7800 GT", 15, 11, 8618 }, - {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_8300GS, "NVIDIA GeForce 8300 GS", 15, 11, 8618 }, - {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_8600GT, "NVIDIA GeForce 8600 GT", 15, 11, 8618 }, - {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_8600MGT, "NVIDIA GeForce 8600M GT", 15, 11, 8585 }, - {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_8800GTS, "NVIDIA GeForce 8800 GTS", 15, 11, 8618 }, - {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_9200, "NVIDIA GeForce 9200", 15, 11, 8618 }, - {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_9400GT, "NVIDIA GeForce 9400 GT", 15, 11, 8618 }, - {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_9500GT, "NVIDIA GeForce 9500 GT", 15, 11, 8618 }, - {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_9600GT, "NVIDIA GeForce 9600 GT", 15, 11, 8618 }, - {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_9800GT, "NVIDIA GeForce 9800 GT", 15, 11, 8618 }, - {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX260, "NVIDIA GeForce GTX 260", 15, 11, 8618 }, - {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX275, "NVIDIA GeForce GTX 275", 15, 11, 8618 }, - {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX280, "NVIDIA GeForce GTX 280", 15, 11, 8618 }, - {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT240, "NVIDIA GeForce GT 240", 15, 11, 8618 }, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_6200, "NVIDIA GeForce 6200", 15, 11, 9745 }, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_6600GT, "NVIDIA GeForce 6600 GT", 15, 11, 9745 }, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_6800, "NVIDIA GeForce 6800", 15, 11, 9745 }, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_7300, "NVIDIA GeForce Go 7300", 15, 11, 9745 }, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_7400, "NVIDIA GeForce Go 7400", 15, 11, 9745 }, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_7600, "NVIDIA GeForce 7600 GT", 15, 11, 9745 }, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_7800GT, "NVIDIA GeForce 7800 GT", 15, 11, 9745 }, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_8300GS, "NVIDIA GeForce 8300 GS", 15, 11, 9745 }, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_8600GT, "NVIDIA GeForce 8600 GT", 15, 11, 9745 }, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_8600MGT, "NVIDIA GeForce 8600M GT", 15, 11, 9745 }, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_8800GTS, "NVIDIA GeForce 8800 GTS", 15, 11, 9745 }, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_9200, "NVIDIA GeForce 9200", 15, 11, 9745 }, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_9400GT, "NVIDIA GeForce 9400 GT", 15, 11, 9745 }, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_9500GT, "NVIDIA GeForce 9500 GT", 15, 11, 9745 }, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_9600GT, "NVIDIA GeForce 9600 GT", 15, 11, 9745 }, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_9800GT, "NVIDIA GeForce 9800 GT", 15, 11, 9745 }, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX260, "NVIDIA GeForce GTX 260", 15, 11, 9745 }, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX275, "NVIDIA GeForce GTX 275", 15, 11, 9745 }, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX280, "NVIDIA GeForce GTX 280", 15, 11, 9745 }, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT240, "NVIDIA GeForce GT 240", 15, 11, 9745 }, /* ATI cards. The driver versions are somewhat similar, but not quite the same. Let's hardcode. */ {HW_VENDOR_ATI, CARD_ATI_RADEON_9500, "ATI Radeon 9500", 14, 10, 6764 },

1 0

Jacek Caban : jscript: Added leftContext and rightCont4ext tests.
by Alexandre Julliard May 27, 2010

May 27, 2010

Module: wine Branch: master Commit: 0ce3bcee1b0a699d8743967f7a16acd258b86c9c URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ce3bcee1b0a699d8743967f7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 26 19:19:34 2010 +0200 jscript: Added leftContext and rightCont4ext tests. --- dlls/jscript/tests/regexp.js | 72 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 72 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0ce3bcee1b0a699d87439…

1 0

Alexandre Julliard : gdi32: Only 16 and 32 bpp DIB sections can have bitfields.
by Alexandre Julliard May 27, 2010

May 27, 2010

Module: wine Branch: master Commit: 7f19bda6ec10036f6202d7eeb64c3691082af847 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f19bda6ec10036f6202d7eeb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 27 13:38:30 2010 +0200 gdi32: Only 16 and 32 bpp DIB sections can have bitfields. --- dlls/gdi32/dib.c | 42 ++++++++++++++++++++++++--------- dlls/gdi32/tests/bitmap.c | 55 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 85 insertions(+), 12 deletions(-) diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index 2725247..ce5ab8b 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -647,18 +647,24 @@ INT WINAPI GetDIBits( DIB_GetDIBImageBytes( bmp->bitmap.bmWidth, bmp->bitmap.bmHeight, bmp->bitmap.bmBitsPixel ); - info->bmiHeader.biCompression = (bmp->bitmap.bmBitsPixel > 8) ? BI_BITFIELDS : BI_RGB; - switch(bmp->bitmap.bmBitsPixel) + if (bmp->dib) { - case 15: - info->bmiHeader.biBitCount = 16; - break; - case 24: - info->bmiHeader.biBitCount = 32; - break; - default: + info->bmiHeader.biBitCount = bmp->dib->dsBm.bmBitsPixel; + switch (bmp->dib->dsBm.bmBitsPixel) + { + case 16: + case 32: + info->bmiHeader.biCompression = BI_BITFIELDS; + break; + default: + info->bmiHeader.biCompression = BI_RGB; + break; + } + } + else + { + info->bmiHeader.biCompression = (bmp->bitmap.bmBitsPixel > 8) ? BI_BITFIELDS : BI_RGB; info->bmiHeader.biBitCount = bmp->bitmap.bmBitsPixel; - break; } info->bmiHeader.biXPelsPerMeter = 0; info->bmiHeader.biYPelsPerMeter = 0; @@ -1244,10 +1250,22 @@ HBITMAP WINAPI CreateDIBSection(HDC hdc, CONST BITMAPINFO *bmi, UINT usage, &planes, &bpp, &compression, &sizeImage )) == -1)) return 0; - if (compression != BI_RGB && compression != BI_BITFIELDS) + switch (bpp) { - TRACE("can't create a compressed (%u) dibsection\n", compression); + case 16: + case 32: + if (compression == BI_BITFIELDS) break; + /* fall through */ + case 1: + case 4: + case 8: + case 24: + if (compression == BI_RGB) break; + WARN( "invalid %u bpp compression %u\n", bpp, compression ); return 0; + default: + FIXME( "should fail %u bpp compression %u\n", bpp, compression ); + break; } if (!(dib = HeapAlloc( GetProcessHeap(), 0, sizeof(*dib) ))) return 0; diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index b25cfd4..8e5ad2e 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -546,6 +546,18 @@ static void test_dibsections(void) ok(hdib == NULL, "CreateDIBSection should fail when asked to create a compressed DIB section\n"); ok(GetLastError() == 0xdeadbeef, "wrong error %d\n", GetLastError()); + for (i = 0; i < 128; i++) + { + pbmi->bmiHeader.biBitCount = i; + pbmi->bmiHeader.biCompression = BI_RGB; + hdib = CreateDIBSection(hdc, pbmi, DIB_RGB_COLORS, (void**)&bits, NULL, 0); + if (i == 1 || i == 4 || i == 8 || i == 16 || i == 24 || i == 32) + ok(hdib != NULL, "CreateDIBSection bpp %u\n", i); + else + todo_wine ok(hdib == NULL, "CreateDIBSection bpp %u succeeded\n", i); + if (hdib) DeleteObject( hdib ); + } + pbmi->bmiHeader.biBitCount = 16; pbmi->bmiHeader.biCompression = BI_BITFIELDS; ((PDWORD)pbmi->bmiColors)[0] = 0xf800; @@ -1978,6 +1990,49 @@ static void test_GetDIBits_BI_BITFIELDS(void) DeleteObject(hbm); } + /* 24-bpp DIB sections don't have bitfields */ + + dibinfo->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + dibinfo->bmiHeader.biWidth = 1; + dibinfo->bmiHeader.biHeight = 1; + dibinfo->bmiHeader.biPlanes = 1; + dibinfo->bmiHeader.biBitCount = 24; + dibinfo->bmiHeader.biCompression = BI_BITFIELDS; + dibinfo->bmiHeader.biSizeImage = 0; + dibinfo->bmiHeader.biXPelsPerMeter = 0; + dibinfo->bmiHeader.biYPelsPerMeter = 0; + dibinfo->bmiHeader.biClrUsed = 0; + dibinfo->bmiHeader.biClrImportant = 0; + hbm = CreateDIBSection( hdc, dibinfo, DIB_RGB_COLORS, &ptr, NULL, 0 ); + ok( hbm == 0, "creating 24-bpp BI_BITFIELDS dibsection should fail\n" ); + dibinfo->bmiHeader.biCompression = BI_RGB; + hbm = CreateDIBSection( hdc, dibinfo, DIB_RGB_COLORS, &ptr, NULL, 0 ); + ok( hbm != 0, "failed to create bitmap\n" ); + + memset(dibinfo, 0, sizeof(dibinfo_buf)); + dibinfo->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + ret = GetDIBits(hdc, hbm, 0, 0, NULL, dibinfo, DIB_RGB_COLORS); + ok(ret == 1, "GetDIBits failed\n"); + ok( dibinfo->bmiHeader.biBitCount == 24, "wrong bit count %u\n", dibinfo->bmiHeader.biBitCount ); + + ok( dibinfo->bmiHeader.biCompression == BI_RGB, + "compression is %u\n", dibinfo->bmiHeader.biCompression ); + ok( !bitmasks[0], "red mask is set\n" ); + ok( !bitmasks[1], "green mask is set\n" ); + ok( !bitmasks[2], "blue mask is set\n" ); + + dibinfo->bmiHeader.biSizeImage = 0xdeadbeef; + ret = GetDIBits(hdc, hbm, 0, 1, bits, dibinfo, DIB_RGB_COLORS); + ok(ret == 1, "GetDIBits failed\n"); + ok( dibinfo->bmiHeader.biBitCount == 24, "wrong bit count %u\n", dibinfo->bmiHeader.biBitCount ); + ok( !bitmasks[0], "red mask is set\n" ); + ok( !bitmasks[1], "green mask is set\n" ); + ok( !bitmasks[2], "blue mask is set\n" ); + ok( dibinfo->bmiHeader.biSizeImage != 0xdeadbeef || + broken(dibinfo->bmiHeader.biSizeImage == 0xdeadbeef), /* win9x */ + "size image not set\n" ); + + DeleteObject(hbm); ReleaseDC(NULL, hdc); }

1 0

Matteo Bruni : d3dx9: Shader assembler vs_1_0 and vs_1_1 support.
by Alexandre Julliard May 27, 2010

May 27, 2010

Module: wine Branch: master Commit: 913278c5cb50d0279d63f559b3b623c5eec6e8a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=913278c5cb50d0279d63f559b… Author: Matteo Bruni <matteo.mystral(a)gmail.com> Date: Sun Aug 16 01:02:16 2009 +0200 d3dx9: Shader assembler vs_1_0 and vs_1_1 support. --- dlls/d3dx9_36/asmparser.c | 110 +++++++++++++++++++++++++++ dlls/d3dx9_36/asmshader.y | 6 +- dlls/d3dx9_36/bytecodewriter.c | 156 +++++++++++++++++++++++++++++++++++++- dlls/d3dx9_36/d3dx9_36_private.h | 3 + dlls/d3dx9_36/tests/asm.c | 15 ++-- 5 files changed, 278 insertions(+), 12 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=913278c5cb50d0279d63f…

1 0

Jacek Caban : jscript: Treat no argument as "undefined" in RegExp.test.
by Alexandre Julliard May 27, 2010

May 27, 2010

Module: wine Branch: master Commit: fe86330d7e0df03ae1deb08e258dcd96f0e76e6f URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe86330d7e0df03ae1deb08e2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 26 19:17:58 2010 +0200 jscript: Treat no argument as "undefined" in RegExp.test. --- dlls/jscript/regexp.c | 15 ++++++++++++++- dlls/jscript/tests/regexp.js | 6 ++++++ 2 files changed, 20 insertions(+), 1 deletions(-) diff --git a/dlls/jscript/regexp.c b/dlls/jscript/regexp.c index 2abf1f8..da23f5c 100644 --- a/dlls/jscript/regexp.c +++ b/dlls/jscript/regexp.c @@ -101,6 +101,7 @@ static const WCHAR leftContextW[] = static const WCHAR rightContextW[] = {'r','i','g','h','t','C','o','n','t','e','x','t',0}; +static const WCHAR undefinedW[] = {'u','n','d','e','f','i','n','e','d',0}; static const WCHAR emptyW[] = {0}; /* FIXME: Better error handling */ @@ -3717,12 +3718,24 @@ static HRESULT RegExp_test(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISPP VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { match_result_t match; + VARIANT undef_var; VARIANT_BOOL b; + DWORD argc; HRESULT hres; TRACE("\n"); - hres = run_exec(ctx, jsthis, arg_cnt(dp) ? get_arg(dp,0) : NULL, ei, NULL, &match, NULL, NULL, &b); + argc = arg_cnt(dp); + if(!argc) { + V_VT(&undef_var) = VT_BSTR; + V_BSTR(&undef_var) = SysAllocString(undefinedW); + if(!V_BSTR(&undef_var)) + return E_OUTOFMEMORY; + } + + hres = run_exec(ctx, jsthis, argc ? get_arg(dp,0) : &undef_var, ei, NULL, &match, NULL, NULL, &b); + if(!argc) + SysFreeString(V_BSTR(&undef_var)); if(FAILED(hres)) return hres; diff --git a/dlls/jscript/tests/regexp.js b/dlls/jscript/tests/regexp.js index 7b74cb1..eb9a81a 100644 --- a/dlls/jscript/tests/regexp.js +++ b/dlls/jscript/tests/regexp.js @@ -96,6 +96,12 @@ ok(m[1] === "test", "m[1] = " + m[1]); b = /a*/.test(); ok(b === true, "/a*/.test() returned " + b); +b = /f/.test(); +ok(b === true, "/f/.test() returned " + b); + +b = /abc/.test(); +ok(b === false, "/abc/.test() returned " + b); + m = "abcabc".match(re = /ca/); ok(typeof(m) === "object", "typeof m is not object"); ok(m.length === 1, "m.length is not 1");

1 0

Jacek Caban : jscript: Store match result in script context.
by Alexandre Julliard May 27, 2010

May 27, 2010

Module: wine Branch: master Commit: 32c61c5092e76c9f50655b92880c4033fc78b3d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=32c61c5092e76c9f50655b928… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 26 19:18:18 2010 +0200 jscript: Store match result in script context. --- dlls/jscript/jscript.c | 1 + dlls/jscript/jscript.h | 4 ++++ dlls/jscript/regexp.c | 23 +++++++++++++++++++++-- dlls/jscript/string.c | 27 +++++++++++++++++++++------ 4 files changed, 47 insertions(+), 8 deletions(-) diff --git a/dlls/jscript/jscript.c b/dlls/jscript/jscript.c index 9a516aa..c7c77e3 100644 --- a/dlls/jscript/jscript.c +++ b/dlls/jscript/jscript.c @@ -71,6 +71,7 @@ void script_release(script_ctx_t *ctx) return; jsheap_free(&ctx->tmp_heap); + SysFreeString(ctx->last_match); heap_free(ctx); } diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index c58c05d..901f25d 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -272,6 +272,10 @@ struct _script_ctx_t { IDispatch *host_global; + BSTR last_match; + DWORD last_match_index; + DWORD last_match_length; + DispatchEx *global; DispatchEx *function_constr; DispatchEx *activex_constr; diff --git a/dlls/jscript/regexp.c b/dlls/jscript/regexp.c index da23f5c..c4c7225 100644 --- a/dlls/jscript/regexp.c +++ b/dlls/jscript/regexp.c @@ -3348,8 +3348,6 @@ static HRESULT do_regexp_match_next(script_ctx_t *ctx, RegExpInstance *regexp, D } if(parens) { - DWORD i; - if(regexp->jsregexp->parenCount > *parens_size) { match_result_t *new_parens; @@ -3362,6 +3360,22 @@ static HRESULT do_regexp_match_next(script_ctx_t *ctx, RegExpInstance *regexp, D *parens = new_parens; } + } + + /* FIXME: We often already have a copy of input string that we could use to store last match */ + if(!(rem_flags & REM_NO_CTX_UPDATE) && + (!ctx->last_match || len != SysStringLen(ctx->last_match) || strncmpW(ctx->last_match, str, len))) { + BSTR last_match; + + last_match = SysAllocStringLen(str, len); + if(!last_match) + return E_OUTOFMEMORY; + SysFreeString(ctx->last_match); + ctx->last_match = last_match; + } + + if(parens) { + DWORD i; *parens_cnt = regexp->jsregexp->parenCount; @@ -3382,6 +3396,11 @@ static HRESULT do_regexp_match_next(script_ctx_t *ctx, RegExpInstance *regexp, D ret->len = matchlen; set_last_index(regexp, result->cp-str); + if(!(rem_flags & REM_NO_CTX_UPDATE)) { + ctx->last_match_index = ret->str-str; + ctx->last_match_length = matchlen; + } + return S_OK; } diff --git a/dlls/jscript/string.c b/dlls/jscript/string.c index 510dcc2..05b9eba 100644 --- a/dlls/jscript/string.c +++ b/dlls/jscript/string.c @@ -779,9 +779,9 @@ static HRESULT String_replace(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DI DWORD parens_cnt = 0, parens_size=0, rep_len=0, length; BSTR rep_str = NULL, match_str = NULL, ret_str, val_str; DispatchEx *rep_func = NULL, *regexp = NULL; - match_result_t *parens = NULL, match, **parens_ptr = &parens; + match_result_t *parens = NULL, match = {NULL,0}, **parens_ptr = &parens; strbuf_t ret = {NULL,0,0}; - DWORD re_flags = 0; + DWORD re_flags = REM_NO_CTX_UPDATE; VARIANT *arg_var; HRESULT hres = S_OK; @@ -860,7 +860,7 @@ static HRESULT String_replace(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DI if(regexp) { hres = regexp_match_next(ctx, regexp, re_flags, str, length, &cp, parens_ptr, &parens_size, &parens_cnt, &match); - re_flags = REM_CHECK_GLOBAL; + re_flags |= REM_CHECK_GLOBAL; if(hres == S_FALSE) { hres = S_OK; @@ -969,13 +969,28 @@ static HRESULT String_replace(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DI if(rep_func) jsdisp_release(rep_func); - if(regexp) - jsdisp_release(regexp); - SysFreeString(val_str); SysFreeString(rep_str); SysFreeString(match_str); heap_free(parens); + if(SUCCEEDED(hres) && match.str && regexp) { + if(!val_str) + val_str = SysAllocStringLen(str, length); + if(val_str) { + SysFreeString(ctx->last_match); + ctx->last_match = val_str; + val_str = NULL; + ctx->last_match_index = match.str-str; + ctx->last_match_length = match.len; + }else { + hres = E_OUTOFMEMORY; + } + } + + if(regexp) + jsdisp_release(regexp); + SysFreeString(val_str); + if(SUCCEEDED(hres) && retv) { ret_str = SysAllocStringLen(ret.buf, ret.len); if(!ret_str)

1 0