winehq.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2025
February
January
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
January
2003
December
November
October
September
August
July
June
May
April
March
February
January
2002
December
November
October
September
August
July
June
May
April
March
February
January
2001
December
November
October
September
August
July
June
May
April
March
February
List overview
wine-commits
June 2012
----- 2025 -----
February 2025
January 2025
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
January 2004
----- 2003 -----
December 2003
November 2003
October 2003
September 2003
August 2003
July 2003
June 2003
May 2003
April 2003
March 2003
February 2003
January 2003
----- 2002 -----
December 2002
November 2002
October 2002
September 2002
August 2002
July 2002
June 2002
May 2002
April 2002
March 2002
February 2002
January 2002
----- 2001 -----
December 2001
November 2001
October 2001
September 2001
August 2001
July 2001
June 2001
May 2001
April 2001
March 2001
February 2001
wine-commits@winehq.org
3 participants
827 discussions
Start a n
N
ew thread
Alexandre Julliard : Release 1.5.7.
by Alexandre Julliard
22 Jun '12
22 Jun '12
Module: wine Branch: master Commit: d35cb8164a7635201c2ccdf73de2a78cebf6cb94 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=d35cb8164a7635201c2ccdf73…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 22 20:16:32 2012 +0200 Release 1.5.7. --- ANNOUNCE | 913 ++++++++++++++++++++++++++++++++++-------------------------- VERSION | 2 +- configure | 18 +- 3 files changed, 527 insertions(+), 406 deletions(-) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=d35cb8164a7635201c2cc…
1
0
0
0
Piotr Caban : msvcp: Sync spec files.
by Alexandre Julliard
22 Jun '12
22 Jun '12
Module: wine Branch: master Commit: 4b97c4b1ef8c83f3cc51c7b8396b99839a10a87f URL:
http://source.winehq.org/git/wine.git/?a=commit;h=4b97c4b1ef8c83f3cc51c7b83…
Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jun 22 10:42:09 2012 +0200 msvcp: Sync spec files. --- dlls/msvcp100/msvcp100.spec | 292 +++++++++++++++++++++--------------------- dlls/msvcp70/msvcp70.spec | 228 +++++++++++++++++----------------- dlls/msvcp71/msvcp71.spec | 260 +++++++++++++++++++------------------- dlls/msvcp80/msvcp80.spec | 284 +++++++++++++++++++++--------------------- 4 files changed, 532 insertions(+), 532 deletions(-) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=4b97c4b1ef8c83f3cc51c…
1
0
0
0
Henri Verbeet : wined3d: Get rid of the d3d_caps debug channel.
by Alexandre Julliard
22 Jun '12
22 Jun '12
Module: wine Branch: master Commit: c11c2e2dbbce3f9b59d2a976281a0fcb60549fba URL:
http://source.winehq.org/git/wine.git/?a=commit;h=c11c2e2dbbce3f9b59d2a9762…
Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jun 22 15:57:31 2012 +0200 wined3d: Get rid of the d3d_caps debug channel. --- dlls/wined3d/arb_program_shader.c | 13 +- dlls/wined3d/directx.c | 425 ++++++++++++++++++------------------- dlls/wined3d/glsl_shader.c | 7 +- 3 files changed, 215 insertions(+), 230 deletions(-) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=c11c2e2dbbce3f9b59d2a…
1
0
0
0
Henri Verbeet : wined3d: Only store a different screen format if it' s explicitly changed through wined3d.
by Alexandre Julliard
22 Jun '12
22 Jun '12
Module: wine Branch: master Commit: b6c7b825a10f6661763cf0e196004d21f600a12e URL:
http://source.winehq.org/git/wine.git/?a=commit;h=b6c7b825a10f6661763cf0e19…
Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jun 22 15:57:30 2012 +0200 wined3d: Only store a different screen format if it's explicitly changed through wined3d. --- dlls/wined3d/device.c | 11 ----------- 1 files changed, 0 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 49b1efb..4c3282c 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5678,7 +5678,6 @@ HRESULT device_init(struct wined3d_device *device, struct wined3d *wined3d, { struct wined3d_adapter *adapter = &wined3d->adapters[adapter_idx]; const struct fragment_pipeline *fragment_pipeline; - struct wined3d_display_mode mode; struct shader_caps shader_caps; struct fragment_caps ffp_caps; unsigned int i; @@ -5693,16 +5692,6 @@ HRESULT device_init(struct wined3d_device *device, struct wined3d *wined3d, list_init(&device->shaders); device->surface_alignment = surface_alignment; - /* Get the initial screen setup for ddraw. */ - hr = wined3d_get_adapter_display_mode(wined3d, adapter_idx, &mode); - if (FAILED(hr)) - { - ERR("Failed to get the adapter's display mode, hr %#x.\n", hr); - wined3d_decref(device->wined3d); - return hr; - } - adapter->screen_format = mode.format_id; - /* Save the creation parameters. */ device->create_parms.adapter_idx = adapter_idx; device->create_parms.device_type = device_type;
1
0
0
0
Henri Verbeet : wined3d: Properly retrieve the display mode in wined3d_device_set_cursor_properties ().
by Alexandre Julliard
22 Jun '12
22 Jun '12
Module: wine Branch: master Commit: c2c0743ccfd4a945df3b88231d62731e14da3324 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=c2c0743ccfd4a945df3b88231…
Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jun 22 15:57:29 2012 +0200 wined3d: Properly retrieve the display mode in wined3d_device_set_cursor_properties(). --- dlls/wined3d/device.c | 15 ++++++++++----- dlls/wined3d/directx.c | 2 -- dlls/wined3d/wined3d_private.h | 1 - 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 08b9b63..49b1efb 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4800,7 +4800,9 @@ HRESULT CDECL wined3d_device_set_cursor_properties(struct wined3d_device *device if (cursor_image) { + struct wined3d_display_mode mode; struct wined3d_map_desc map_desc; + HRESULT hr; /* MSDN: Cursor must be A8R8G8B8 */ if (cursor_image->resource.format->id != WINED3DFMT_B8G8R8A8_UNORM) @@ -4809,13 +4811,18 @@ HRESULT CDECL wined3d_device_set_cursor_properties(struct wined3d_device *device return WINED3DERR_INVALIDCALL; } + if (FAILED(hr = wined3d_get_adapter_display_mode(device->wined3d, device->adapter->ordinal, &mode))) + { + ERR("Failed to get display mode, hr %#x.\n", hr); + return WINED3DERR_INVALIDCALL; + } + /* MSDN: Cursor must be smaller than the display mode */ - if (cursor_image->resource.width > device->adapter->screen_size.cx - || cursor_image->resource.height > device->adapter->screen_size.cy) + if (cursor_image->resource.width > mode.width || cursor_image->resource.height > mode.height) { WARN("Surface %p dimensions are %ux%u, but screen dimensions are %ux%u.\n", cursor_image, cursor_image->resource.width, cursor_image->resource.height, - device->adapter->screen_size.cx, device->adapter->screen_size.cy); + mode.width, mode.height); return WINED3DERR_INVALIDCALL; } @@ -5694,8 +5701,6 @@ HRESULT device_init(struct wined3d_device *device, struct wined3d *wined3d, wined3d_decref(device->wined3d); return hr; } - adapter->screen_size.cx = mode.width; - adapter->screen_size.cy = mode.height; adapter->screen_format = mode.format_id; /* Save the creation parameters. */ diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 8fe3109..2685504 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -3136,8 +3136,6 @@ HRESULT CDECL wined3d_set_adapter_display_mode(struct wined3d *wined3d, } /* Store the new values. */ - adapter->screen_size.cx = mode->width; - adapter->screen_size.cy = mode->height; adapter->screen_format = mode->format_id; /* And finally clip mouse to our screen. */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 9aa4be3..5d07091 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1543,7 +1543,6 @@ struct wined3d_adapter BOOL opengl; POINT monitorPoint; - SIZE screen_size; enum wined3d_format_id screen_format; struct wined3d_gl_info gl_info;
1
0
0
0
Henri Verbeet : wined3d: Just forward wined3d_device_get_display_mode() to the appropriate swapchain.
by Alexandre Julliard
22 Jun '12
22 Jun '12
Module: wine Branch: master Commit: 70008999486651b62bef641196a31f6c7002d0e5 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=70008999486651b62bef64119…
Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jun 22 15:57:28 2012 +0200 wined3d: Just forward wined3d_device_get_display_mode() to the appropriate swapchain. --- dlls/wined3d/device.c | 27 +++------------------------ 1 files changed, 3 insertions(+), 24 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 54eea3f..08b9b63 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3723,31 +3723,10 @@ HRESULT CDECL wined3d_device_get_display_mode(const struct wined3d_device *devic TRACE("device %p, swapchain_idx %u, mode %p.\n", device, swapchain_idx, mode); - if (swapchain_idx) + if (SUCCEEDED(hr = wined3d_device_get_swapchain(device, swapchain_idx, &swapchain))) { - hr = wined3d_device_get_swapchain(device, swapchain_idx, &swapchain); - if (SUCCEEDED(hr)) - { - hr = wined3d_swapchain_get_display_mode(swapchain, mode); - wined3d_swapchain_decref(swapchain); - } - } - else - { - const struct wined3d_adapter *adapter = device->adapter; - - /* Don't read the real display mode, but return the stored mode - * instead. X11 can't change the color depth, and some apps are - * pretty angry if they SetDisplayMode from 24 to 16 bpp and find out - * that GetDisplayMode still returns 24 bpp. - * - * Also don't relay to the swapchain because with ddraw it's possible - * that there isn't a swapchain at all. */ - mode->width = adapter->screen_size.cx; - mode->height = adapter->screen_size.cy; - mode->format_id = adapter->screen_format; - mode->refresh_rate = 0; - hr = WINED3D_OK; + hr = wined3d_swapchain_get_display_mode(swapchain, mode); + wined3d_swapchain_decref(swapchain); } return hr;
1
0
0
0
Henri Verbeet : wined3d: Implement mode setting in the adapter instead of the device.
by Alexandre Julliard
22 Jun '12
22 Jun '12
Module: wine Branch: master Commit: 0f0fe49240522cc3cf67d2211c875fb38c140396 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=0f0fe49240522cc3cf67d2211…
Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jun 22 15:57:27 2012 +0200 wined3d: Implement mode setting in the adapter instead of the device. --- dlls/ddraw/ddraw.c | 2 +- dlls/wined3d/device.c | 80 +++----------------------------------------- dlls/wined3d/directx.c | 72 ++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/swapchain.c | 8 +++-- dlls/wined3d/wined3d.spec | 2 +- include/wine/wined3d.h | 4 +- 6 files changed, 87 insertions(+), 81 deletions(-) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=0f0fe49240522cc3cf67d…
1
0
0
0
Alexandre Julliard : gdi32: Fix StretchDIBits return value when destination is clipped.
by Alexandre Julliard
22 Jun '12
22 Jun '12
Module: wine Branch: master Commit: 1c2f9255f45d8ebea2416329eeeb513befa53c07 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=1c2f9255f45d8ebea2416329e…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 22 13:37:19 2012 +0200 gdi32: Fix StretchDIBits return value when destination is clipped. --- dlls/gdi32/dib.c | 5 ++- dlls/gdi32/tests/bitmap.c | 63 ++++++++++++++++++++++++++++++-------------- 2 files changed, 46 insertions(+), 22 deletions(-) diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index 286c404..c35de33 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -544,6 +544,9 @@ INT nulldrv_StretchDIBits( PHYSDEV dev, INT xDst, INT yDst, INT widthDst, INT he src.visrect.bottom = height; if (!intersect_rect( &src.visrect, &src.visrect, &rect )) goto done; + if (rop == SRCCOPY) ret = height; + else ret = src_info->bmiHeader.biHeight; + get_bounding_rect( &rect, dst.x, dst.y, dst.width, dst.height ); if (!clip_visrect( dc, &dst.visrect, &rect )) goto done; @@ -584,8 +587,6 @@ INT nulldrv_StretchDIBits( PHYSDEV dev, INT xDst, INT yDst, INT widthDst, INT he if (!err) err = dev->funcs->pPutImage( dev, NULL, dst_info, &src_bits, &src, &dst, rop ); } if (err) ret = 0; - else if (rop == SRCCOPY) ret = height; - else ret = src_info->bmiHeader.biHeight; done: if (src_bits.free) src_bits.free( &src_bits ); diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index b27b85c..a620361 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -3353,12 +3353,13 @@ static void check_StretchDIBits_pixel(HDC hdcDst, UINT32 *dstBuffer, UINT32 *src dwRop, expected, *dstBuffer, line); } -static void check_StretchDIBits_stretch(HDC hdcDst, UINT32 *dstBuffer, UINT32 *srcBuffer, +static INT check_StretchDIBits_stretch( HDC hdcDst, UINT32 *dstBuffer, UINT32 *srcBuffer, int nXOriginDest, int nYOriginDest, int nWidthDest, int nHeightDest, int nXOriginSrc, int nYOriginSrc, int nWidthSrc, int nHeightSrc, UINT32 expected[4], int line) { BITMAPINFO bitmapInfo; + INT ret; memset(&bitmapInfo, 0, sizeof(BITMAPINFO)); bitmapInfo.bmiHeader.biSize = sizeof(BITMAPINFOHEADER); @@ -3369,9 +3370,9 @@ static void check_StretchDIBits_stretch(HDC hdcDst, UINT32 *dstBuffer, UINT32 *s bitmapInfo.bmiHeader.biCompression = BI_RGB; memset(dstBuffer, 0, 16); - StretchDIBits(hdcDst, nXOriginDest, nYOriginDest, nWidthDest, nHeightDest, - nXOriginSrc, nYOriginSrc, nWidthSrc, nHeightSrc, - srcBuffer, &bitmapInfo, DIB_RGB_COLORS, SRCCOPY); + ret = StretchDIBits(hdcDst, nXOriginDest, nYOriginDest, nWidthDest, nHeightDest, + nXOriginSrc, nYOriginSrc, nWidthSrc, nHeightSrc, + srcBuffer, &bitmapInfo, DIB_RGB_COLORS, SRCCOPY); ok(memcmp(dstBuffer, expected, 16) == 0, "StretchDIBits expected { %08X, %08X, %08X, %08X } got { %08X, %08X, %08X, %08X } " "stretching { %d, %d, %d, %d } to { %d, %d, %d, %d } from line %d\n", @@ -3379,6 +3380,7 @@ static void check_StretchDIBits_stretch(HDC hdcDst, UINT32 *dstBuffer, UINT32 *s dstBuffer[0], dstBuffer[1], dstBuffer[2], dstBuffer[3], nXOriginSrc, nYOriginSrc, nWidthSrc, nHeightSrc, nXOriginDest, nYOriginDest, nWidthDest, nHeightDest, line); + return ret; } static void test_StretchDIBits(void) @@ -3390,6 +3392,7 @@ static void test_StretchDIBits(void) HBRUSH hBrush, hOldBrush; BITMAPINFO biDst; UINT32 expected[4]; + INT ret; memset(&biDst, 0, sizeof(BITMAPINFO)); biDst.bmiHeader.biSize = sizeof(BITMAPINFOHEADER); @@ -3435,43 +3438,63 @@ static void test_StretchDIBits(void) expected[0] = 0xCAFED00D, expected[1] = 0xFEEDFACE; expected[2] = 0xFEDCBA98, expected[3] = 0x76543210; - check_StretchDIBits_stretch(hdcDst, dstBuffer, srcBuffer, - 0, 0, 2, 2, 0, 0, 2, 2, expected, __LINE__); + ret = check_StretchDIBits_stretch(hdcDst, dstBuffer, srcBuffer, + 0, 0, 2, 2, 0, 0, 2, 2, expected, __LINE__); + ok( ret == 2, "got ret %d\n", ret ); expected[0] = 0xCAFED00D, expected[1] = 0x00000000; expected[2] = 0x00000000, expected[3] = 0x00000000; - check_StretchDIBits_stretch(hdcDst, dstBuffer, srcBuffer, - 0, 0, 1, 1, 0, 0, 1, 1, expected, __LINE__); + ret = check_StretchDIBits_stretch(hdcDst, dstBuffer, srcBuffer, + 0, 0, 1, 1, 0, 0, 1, 1, expected, __LINE__); + todo_wine ok( ret == 1, "got ret %d\n", ret ); expected[0] = 0xFEDCBA98, expected[1] = 0xFEDCBA98; expected[2] = 0xFEDCBA98, expected[3] = 0xFEDCBA98; - check_StretchDIBits_stretch(hdcDst, dstBuffer, srcBuffer, - 0, 0, 2, 2, 0, 0, 1, 1, expected, __LINE__); + ret = check_StretchDIBits_stretch(hdcDst, dstBuffer, srcBuffer, + 0, 0, 2, 2, 0, 0, 1, 1, expected, __LINE__); + ok( ret == 2, "got ret %d\n", ret ); expected[0] = 0x42441000, expected[1] = 0x00000000; expected[2] = 0x00000000, expected[3] = 0x00000000; - check_StretchDIBits_stretch(hdcDst, dstBuffer, srcBuffer, - 0, 0, 1, 1, 0, 0, 2, 2, expected, __LINE__); + ret = check_StretchDIBits_stretch(hdcDst, dstBuffer, srcBuffer, + 0, 0, 1, 1, 0, 0, 2, 2, expected, __LINE__); + ok( ret == 2, "got ret %d\n", ret ); expected[0] = 0x00000000, expected[1] = 0x00000000; expected[2] = 0x00000000, expected[3] = 0x00000000; - check_StretchDIBits_stretch(hdcDst, dstBuffer, srcBuffer, - 0, 0, 2, 2, 1, 1, -2, -2, expected, __LINE__); + ret = check_StretchDIBits_stretch(hdcDst, dstBuffer, srcBuffer, + 0, 0, 2, 2, 1, 1, -2, -2, expected, __LINE__); + ok( ret == 0, "got ret %d\n", ret ); expected[0] = 0x00000000, expected[1] = 0x00000000; expected[2] = 0x00000000, expected[3] = 0x00000000; - check_StretchDIBits_stretch(hdcDst, dstBuffer, srcBuffer, - 0, 0, 2, 2, 1, 1, -2, -2, expected, __LINE__); + ret = check_StretchDIBits_stretch(hdcDst, dstBuffer, srcBuffer, + 0, 0, 2, 2, 1, 1, -2, -2, expected, __LINE__); + ok( ret == 0, "got ret %d\n", ret ); expected[0] = 0x00000000, expected[1] = 0x00000000; expected[2] = 0x00000000, expected[3] = 0x00000000; - check_StretchDIBits_stretch(hdcDst, dstBuffer, srcBuffer, - 1, 1, -2, -2, 1, 1, -2, -2, expected, __LINE__); + ret = check_StretchDIBits_stretch(hdcDst, dstBuffer, srcBuffer, + 1, 1, -2, -2, 1, 1, -2, -2, expected, __LINE__); + ok( ret == 0, "got ret %d\n", ret ); expected[0] = 0x00000000, expected[1] = 0x00000000; expected[2] = 0x00000000, expected[3] = 0xCAFED00D; - check_StretchDIBits_stretch(hdcDst, dstBuffer, srcBuffer, - 1, 1, 2, 2, 0, 0, 2, 2, expected, __LINE__); + ret = check_StretchDIBits_stretch(hdcDst, dstBuffer, srcBuffer, + 1, 1, 2, 2, 0, 0, 2, 2, expected, __LINE__); + ok( ret == 2, "got ret %d\n", ret ); + + expected[0] = 0x00000000, expected[1] = 0x00000000; + expected[2] = 0x00000000, expected[3] = 0x00000000; + ret = check_StretchDIBits_stretch(hdcDst, dstBuffer, srcBuffer, + 2, 2, 4, 4, 0, 0, 2, 2, expected, __LINE__); + ok( ret == 2, "got ret %d\n", ret ); + + expected[0] = 0x00000000, expected[1] = 0x00000000; + expected[2] = 0x00000000, expected[3] = 0x00000000; + ret = check_StretchDIBits_stretch(hdcDst, dstBuffer, srcBuffer, + -4, -4, 4, 4, 0, 0, 4, 4, expected, __LINE__); + ok( ret == 2, "got ret %d\n", ret ); SelectObject(hdcDst, oldDst); DeleteObject(bmpDst);
1
0
0
0
Stefan Leichter : psapi/tests: Added tests for EnumProcessModules with last parameter NULL.
by Alexandre Julliard
22 Jun '12
22 Jun '12
Module: wine Branch: master Commit: 0773ed8d271261db28d31afd780a7ff944ef320f URL:
http://source.winehq.org/git/wine.git/?a=commit;h=0773ed8d271261db28d31afd7…
Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Thu Jun 21 23:11:22 2012 +0200 psapi/tests: Added tests for EnumProcessModules with last parameter NULL. --- dlls/psapi/tests/psapi_main.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/psapi/tests/psapi_main.c b/dlls/psapi/tests/psapi_main.c index 8db695e..312d544 100644 --- a/dlls/psapi/tests/psapi_main.c +++ b/dlls/psapi/tests/psapi_main.c @@ -117,6 +117,16 @@ static void test_EnumProcessModules(void) ok(GetLastError() == ERROR_ACCESS_DENIED, "expected error=ERROR_ACCESS_DENIED but got %d\n", GetLastError()); SetLastError(0xdeadbeef); + ret = pEnumProcessModules(hpQI, &hMod, sizeof(HMODULE), NULL); + ok(!ret, "succeeded\n"); + ok(GetLastError() == ERROR_ACCESS_DENIED, "expected error=ERROR_ACCESS_DENIED but got %d\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = pEnumProcessModules(hpQV, &hMod, sizeof(HMODULE), NULL); + ok(!ret, "succeeded\n"); + ok(GetLastError() == ERROR_NOACCESS, "expected error=ERROR_NOACCESS but got %d\n", GetLastError()); + + SetLastError(0xdeadbeef); ret = pEnumProcessModules(hpQV, NULL, 0, &cbNeeded); ok(ret == 1, "failed with %d\n", GetLastError());
1
0
0
0
Stefan Leichter : kernel32: Let K32EnumProcessModules fail if the last parameter is NULL.
by Alexandre Julliard
22 Jun '12
22 Jun '12
Module: wine Branch: master Commit: c0e72bb3626a7ba8090ee07cc0aa88cd5c8b7f9e URL:
http://source.winehq.org/git/wine.git/?a=commit;h=c0e72bb3626a7ba8090ee07cc…
Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Thu Jun 21 23:11:19 2012 +0200 kernel32: Let K32EnumProcessModules fail if the last parameter is NULL. --- dlls/kernel32/module.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/module.c b/dlls/kernel32/module.c index adf8a99..9913f1b 100644 --- a/dlls/kernel32/module.c +++ b/dlls/kernel32/module.c @@ -1175,6 +1175,12 @@ BOOL WINAPI K32EnumProcessModules(HANDLE process, HMODULE *lphModule, if (!init_module_iterator(&iter, process)) return FALSE; + if (!needed) + { + SetLastError(ERROR_NOACCESS); + return FALSE; + } + *needed = 0; while ((ret = module_iterator_next(&iter)) > 0)
1
0
0
0
← Newer
1
...
24
25
26
27
28
29
30
...
83
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
Results per page:
10
25
50
100
200