October 2011 - Wine-Commits

Frédéric Delanoy : dmime: Avoid idempotent operation (Clang).
by Alexandre Julliard Oct. 19, 2011

Oct. 19, 2011

Module: wine Branch: master Commit: f9ecfff4bfd66106b49234582e06a1a819d00919 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9ecfff4bfd66106b49234582… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Oct 19 11:33:56 2011 +0200 dmime: Avoid idempotent operation (Clang). --- dlls/dmime/segment.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/dmime/segment.c b/dlls/dmime/segment.c index 9f968e6..82ea753 100644 --- a/dlls/dmime/segment.c +++ b/dlls/dmime/segment.c @@ -1226,8 +1226,7 @@ static HRESULT WINAPI IDirectMusicSegment8Impl_IPersistStream_Load (LPPERSISTSTR IStream_Clone (pStm, &pClonedStream); - liMove.QuadPart = 0; - liMove.QuadPart -= sizeof(FOURCC) + (sizeof(FOURCC)+sizeof(DWORD)); + liMove.QuadPart = - (LONGLONG)(sizeof(FOURCC) * 2 + sizeof(DWORD)); IStream_Seek (pClonedStream, liMove, STREAM_SEEK_CUR, NULL); hr = IDirectMusicSegment8Impl_IPersistStream_LoadWave (iface, pClonedStream, &pWave);

1 0

Andrew Talbot : wininet: Add a break to a switch statement.
by Alexandre Julliard Oct. 19, 2011

Oct. 19, 2011

Module: wine Branch: master Commit: 31b3cbfb93a36aac85a0d174d59bc804fe65f93f URL: http://source.winehq.org/git/wine.git/?a=commit;h=31b3cbfb93a36aac85a0d174d… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Oct 18 20:56:32 2011 +0100 wininet: Add a break to a switch statement. --- dlls/wininet/internet.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index f9e8dea..020fe2c 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -287,15 +287,16 @@ BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) g_dwTlsErrIndex = TlsAlloc(); - if (g_dwTlsErrIndex == TLS_OUT_OF_INDEXES) - return FALSE; + if (g_dwTlsErrIndex == TLS_OUT_OF_INDEXES) + return FALSE; URLCacheContainers_CreateDefaults(); WININET_hModule = hinstDLL; + break; case DLL_THREAD_ATTACH: - break; + break; case DLL_THREAD_DETACH: if (g_dwTlsErrIndex != TLS_OUT_OF_INDEXES)

1 0

Jacek Caban : wscript: Added tests using vbscript.
by Alexandre Julliard Oct. 19, 2011

Oct. 19, 2011

Module: wine Branch: master Commit: ec3d0e9b5cb339c6014c001c484b1fcfee60ed39 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec3d0e9b5cb339c6014c001c4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 19 13:16:30 2011 +0200 wscript: Added tests using vbscript. --- programs/wscript/tests/rsrc.rc | 3 +++ programs/wscript/tests/run.c | 20 ++++++++++++++++---- programs/wscript/tests/run.vbs | 30 ++++++++++++++++++++++++++++++ 3 files changed, 49 insertions(+), 4 deletions(-) diff --git a/programs/wscript/tests/rsrc.rc b/programs/wscript/tests/rsrc.rc index b1df1c5..87e9a73 100644 --- a/programs/wscript/tests/rsrc.rc +++ b/programs/wscript/tests/rsrc.rc @@ -18,3 +18,6 @@ /* @makedep: run.js */ run.js TESTSCRIPT "run.js" + +/* @makedep: run.vbs */ +run.vbs TESTSCRIPT "run.vbs" diff --git a/programs/wscript/tests/run.c b/programs/wscript/tests/run.c index b7d3c3c..163be22 100644 --- a/programs/wscript/tests/run.c +++ b/programs/wscript/tests/run.c @@ -170,16 +170,28 @@ static HRESULT WINAPI Dispatch_Invoke(IDispatch *iface, DISPID dispIdMember, REF WORD wFlags, DISPPARAMS *pdp, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) { switch(dispIdMember) { - case DISPID_TESTOBJ_OK: + case DISPID_TESTOBJ_OK: { + VARIANT *expr, *msg; + ok(wFlags == INVOKE_FUNC, "wFlags = %x\n", wFlags); ok(pdp->cArgs == 2, "cArgs = %d\n", pdp->cArgs); ok(!pdp->cNamedArgs, "cNamedArgs = %d\n", pdp->cNamedArgs); - ok(V_VT(pdp->rgvarg) == VT_BSTR, "V_VT(psp->rgvargs) = %d\n", V_VT(pdp->rgvarg)); - ok(V_VT(pdp->rgvarg+1) == VT_BOOL, "V_VT(psp->rgvargs+1) = %d\n", V_VT(pdp->rgvarg)); - ok(V_BOOL(pdp->rgvarg+1), "%s: %s\n", script_name, wine_dbgstr_w(V_BSTR(pdp->rgvarg))); + + expr = pdp->rgvarg+1; + if(V_VT(expr) == (VT_VARIANT|VT_BYREF)) + expr = V_VARIANTREF(expr); + + msg = pdp->rgvarg; + if(V_VT(msg) == (VT_VARIANT|VT_BYREF)) + msg = V_VARIANTREF(msg); + + ok(V_VT(msg) == VT_BSTR, "V_VT(psp->rgvargs) = %d\n", V_VT(msg)); + ok(V_VT(expr) == VT_BOOL, "V_VT(psp->rgvargs+1) = %d\n", V_VT(expr)); + ok(V_BOOL(expr), "%s: %s\n", script_name, wine_dbgstr_w(V_BSTR(msg))); if(pVarResult) V_VT(pVarResult) = VT_EMPTY; break; + } case DISPID_TESTOBJ_TRACE: ok(wFlags == INVOKE_FUNC, "wFlags = %x\n", wFlags); ok(pdp->cArgs == 1, "cArgs = %d\n", pdp->cArgs); diff --git a/programs/wscript/tests/run.vbs b/programs/wscript/tests/run.vbs new file mode 100644 index 0000000..785df78 --- /dev/null +++ b/programs/wscript/tests/run.vbs @@ -0,0 +1,30 @@ +' +' Copyright 2011 Jacek Caban for CodeWeavers +' +' This library is free software; you can redistribute it and/or +' modify it under the terms of the GNU Lesser General Public +' License as published by the Free Software Foundation; either +' version 2.1 of the License, or (at your option) any later version. +' +' This library is distributed in the hope that it will be useful, +' but WITHOUT ANY WARRANTY; without even the implied warranty of +' MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +' Lesser General Public License for more details. +' +' You should have received a copy of the GNU Lesser General Public +' License along with this library; if not, write to the Free Software +' Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA +' + +Option Explicit + +Dim winetest +Set winetest = CreateObject("Wine.Test") + +Sub ok(expr, msg) + Call winetest.ok(expr, msg) +End Sub + +Call ok(WScript is WSH, "WScript is not WSH") + +Call winetest.reportSuccess()

1 0

Huw Davies : gdi32: Introduce a unified function to perform COLORREF to pixel color mapping.
by Alexandre Julliard Oct. 19, 2011

Oct. 19, 2011

Module: wine Branch: master Commit: 0967de74dbfd452a7d2599e1e32655a4d5b567d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0967de74dbfd452a7d2599e1e… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Oct 19 12:41:51 2011 +0100 gdi32: Introduce a unified function to perform COLORREF to pixel color mapping. --- dlls/gdi32/dibdrv/dc.c | 8 ++++---- dlls/gdi32/dibdrv/dibdrv.h | 2 +- dlls/gdi32/dibdrv/objects.c | 22 +++++++++++----------- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c index 2331e7c..e832a20 100644 --- a/dlls/gdi32/dibdrv/dc.c +++ b/dlls/gdi32/dibdrv/dc.c @@ -323,8 +323,8 @@ DWORD convert_bitmapinfo( const BITMAPINFO *src_info, void *src_bits, struct bit static void update_fg_colors( dibdrv_physdev *pdev ) { - pdev->pen_color = get_fg_color( pdev, pdev->pen_colorref ); - pdev->brush_color = get_fg_color( pdev, pdev->brush_colorref ); + pdev->pen_color = get_pixel_color( pdev, pdev->pen_colorref, TRUE ); + pdev->brush_color = get_pixel_color( pdev, pdev->brush_colorref, TRUE ); } static void update_masks( dibdrv_physdev *pdev, INT rop ) @@ -427,7 +427,7 @@ static COLORREF dibdrv_SetBkColor( PHYSDEV dev, COLORREF color ) PHYSDEV next = GET_NEXT_PHYSDEV( dev, pSetBkColor ); dibdrv_physdev *pdev = get_dibdrv_pdev(dev); - pdev->bkgnd_color = pdev->dib.funcs->colorref_to_pixel( &pdev->dib, color ); + pdev->bkgnd_color = get_pixel_color( pdev, color, FALSE ); if( GetBkMode(dev->hdc) == OPAQUE ) calc_and_xor_masks( GetROP2(dev->hdc), pdev->bkgnd_color, &pdev->bkgnd_and, &pdev->bkgnd_xor ); @@ -488,7 +488,7 @@ static UINT dibdrv_SetDIBColorTable( PHYSDEV dev, UINT pos, UINT count, const RG if( pos + count > pdev->dib.color_table_size ) count = pdev->dib.color_table_size - pos; memcpy( pdev->dib.color_table + pos, colors, count * sizeof(RGBQUAD) ); - pdev->bkgnd_color = pdev->dib.funcs->colorref_to_pixel( &pdev->dib, GetBkColor( dev->hdc ) ); + pdev->bkgnd_color = get_pixel_color( pdev, GetBkColor( dev->hdc ), FALSE ); update_fg_colors( pdev ); update_masks( pdev, GetROP2( dev->hdc ) ); diff --git a/dlls/gdi32/dibdrv/dibdrv.h b/dlls/gdi32/dibdrv/dibdrv.h index 60b24ee..6d96e77 100644 --- a/dlls/gdi32/dibdrv/dibdrv.h +++ b/dlls/gdi32/dibdrv/dibdrv.h @@ -198,7 +198,7 @@ extern void free_dib_info(dib_info *dib) DECLSPEC_HIDDEN; extern void free_pattern_brush(dibdrv_physdev *pdev) DECLSPEC_HIDDEN; extern void copy_dib_color_info(dib_info *dst, const dib_info *src) DECLSPEC_HIDDEN; extern BOOL convert_dib(dib_info *dst, const dib_info *src) DECLSPEC_HIDDEN; -extern DWORD get_fg_color(dibdrv_physdev *pdev, COLORREF color) DECLSPEC_HIDDEN; +extern DWORD get_pixel_color(dibdrv_physdev *pdev, COLORREF color, BOOL mono_fixup) DECLSPEC_HIDDEN; extern BOOL brush_rects( dibdrv_physdev *pdev, int num, const RECT *rects ) DECLSPEC_HIDDEN; extern HRGN add_extra_clipping_region( dibdrv_physdev *pdev, HRGN rgn ) DECLSPEC_HIDDEN; extern void restore_clipping_region( dibdrv_physdev *pdev, HRGN rgn ) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/dibdrv/objects.c b/dlls/gdi32/dibdrv/objects.c index 67eda57..6b278c8 100644 --- a/dlls/gdi32/dibdrv/objects.c +++ b/dlls/gdi32/dibdrv/objects.c @@ -124,7 +124,7 @@ static inline BOOL rgbquad_equal(const RGBQUAD *a, const RGBQUAD *b) } /****************************************************************** - * get_fg_color + * get_pixel_color * * 1 bit bitmaps map the fg/bg colors as follows: * If the fg colorref exactly matches one of the color table entries then @@ -132,20 +132,20 @@ static inline BOOL rgbquad_equal(const RGBQUAD *a, const RGBQUAD *b) * Otherwise the bg color is mapped to the closest entry in the table and * the fg takes the other one. */ -DWORD get_fg_color( dibdrv_physdev *pdev, COLORREF fg ) +DWORD get_pixel_color( dibdrv_physdev *pdev, COLORREF color, BOOL mono_fixup ) { RGBQUAD fg_quad; - if(pdev->dib.bit_count != 1) - return pdev->dib.funcs->colorref_to_pixel( &pdev->dib, fg ); + if (pdev->dib.bit_count != 1 || !mono_fixup) + return pdev->dib.funcs->colorref_to_pixel( &pdev->dib, color ); - fg_quad = rgbquad_from_colorref( fg ); + fg_quad = rgbquad_from_colorref( color ); if(rgbquad_equal(&fg_quad, pdev->dib.color_table)) return 0; if(rgbquad_equal(&fg_quad, pdev->dib.color_table + 1)) return 1; - if(fg == GetBkColor(pdev->dev.hdc)) return pdev->bkgnd_color; + if(color == GetBkColor(pdev->dev.hdc)) return pdev->bkgnd_color; else return pdev->bkgnd_color ? 0 : 1; } @@ -987,7 +987,7 @@ HPEN dibdrv_SelectPen( PHYSDEV dev, HPEN hpen ) logpen.lopnColor = GetDCPenColor( dev->hdc ); pdev->pen_colorref = logpen.lopnColor; - pdev->pen_color = get_fg_color( pdev, pdev->pen_colorref ); + pdev->pen_color = get_pixel_color( pdev, pdev->pen_colorref, TRUE ); calc_and_xor_masks(GetROP2(dev->hdc), pdev->pen_color, &pdev->pen_and, &pdev->pen_xor); pdev->pen_pattern = dash_patterns[PS_SOLID]; @@ -1039,7 +1039,7 @@ COLORREF dibdrv_SetDCPenColor( PHYSDEV dev, COLORREF color ) if (GetCurrentObject(dev->hdc, OBJ_PEN) == GetStockObject( DC_PEN )) { pdev->pen_colorref = color; - pdev->pen_color = get_fg_color( pdev, pdev->pen_colorref ); + pdev->pen_color = get_pixel_color( pdev, pdev->pen_colorref, TRUE ); calc_and_xor_masks(GetROP2(dev->hdc), pdev->pen_color, &pdev->pen_and, &pdev->pen_xor); } @@ -1311,7 +1311,7 @@ HBRUSH dibdrv_SelectBrush( PHYSDEV dev, HBRUSH hbrush ) { case BS_SOLID: pdev->brush_colorref = logbrush.lbColor; - pdev->brush_color = get_fg_color( pdev, pdev->brush_colorref ); + pdev->brush_color = get_pixel_color( pdev, pdev->brush_colorref, TRUE ); calc_and_xor_masks(GetROP2(dev->hdc), pdev->brush_color, &pdev->brush_and, &pdev->brush_xor); pdev->brush_rects = solid_brush; pdev->defer &= ~DEFER_BRUSH; @@ -1363,7 +1363,7 @@ HBRUSH dibdrv_SelectBrush( PHYSDEV dev, HBRUSH hbrush ) if(logbrush.lbHatch > HS_DIAGCROSS) return 0; pdev->brush_hatch = logbrush.lbHatch; pdev->brush_colorref = logbrush.lbColor; - pdev->brush_color = get_fg_color( pdev, pdev->brush_colorref ); + pdev->brush_color = get_pixel_color( pdev, pdev->brush_colorref, TRUE ); calc_and_xor_masks(GetROP2(dev->hdc), pdev->brush_color, &pdev->brush_and, &pdev->brush_xor); pdev->brush_rects = pattern_brush; pdev->defer &= ~DEFER_BRUSH; @@ -1388,7 +1388,7 @@ COLORREF dibdrv_SetDCBrushColor( PHYSDEV dev, COLORREF color ) if (GetCurrentObject(dev->hdc, OBJ_BRUSH) == GetStockObject( DC_BRUSH )) { pdev->brush_colorref = color; - pdev->brush_color = get_fg_color( pdev, pdev->brush_colorref ); + pdev->brush_color = get_pixel_color( pdev, pdev->brush_colorref, TRUE ); calc_and_xor_masks(GetROP2(dev->hdc), pdev->brush_color, &pdev->brush_and, &pdev->brush_xor); }

1 0

Huw Davies : gdi32/tests: Add tests for non-rgb colorrefs.
by Alexandre Julliard Oct. 19, 2011

Oct. 19, 2011

Module: wine Branch: master Commit: b70066007511aba97df730695b73e0759bc7e0a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b70066007511aba97df730695… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Oct 19 12:41:53 2011 +0100 gdi32/tests: Add tests for non-rgb colorrefs. --- dlls/gdi32/tests/dib.c | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 47 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/tests/dib.c b/dlls/gdi32/tests/dib.c index 5577918..4c81330 100644 --- a/dlls/gdi32/tests/dib.c +++ b/dlls/gdi32/tests/dib.c @@ -27,6 +27,7 @@ #include "wingdi.h" #include "winuser.h" #include "wincrypt.h" +#include "mmsystem.h" /* DIBINDEX */ #include "wine/test.h" @@ -129,6 +130,7 @@ static const char *sha1_graphics_a8r8g8b8[] = "d7dd4700f49808541bba99244b7eb5840e0a2439", "af99228aa4cfbd1f61bd824db046144a3c6c2ed7", "568f87f0194ca19b69a5b2bcdef795d89c5721ce", + "257d114354a93e681225072bcde756f155b70496", NULL }; @@ -186,6 +188,7 @@ static const char *sha1_graphics_a8b8g8r8[] = "86c84cc8306975edecc6d4a89a8aff29f59b55a7", "af99228aa4cfbd1f61bd824db046144a3c6c2ed7", "25675c30adfe24d6cae60793b156dfdaa36ac3ba", + "2c4f116451b571106beba8b85da8e4b923937246", NULL }; @@ -243,6 +246,7 @@ static const char *sha1_graphics_r10g10b10[] = "fc0c32afb719295f28bcfef22803bef94f798e20", "36f6db4fbe2a1630a7597d3a446f2902755c96ef", "d3f08946300e1700865042aed121870e292d1095", + "abb56db94becb64d663b51f0ea6b4bd535a88ba0", NULL }; @@ -300,6 +304,7 @@ static const char *sha1_graphics_r6g6b6[] = "49341c297a887186bd47d7465d827ab3147f05e3", "325279e76367200d3fd7194d81c09fd139988ece", "c3def160a1e847605ff0fc7edd30397fa90635a0", + "50acb1597c4d53ad63225376d2aa36f64e8a229d", NULL }; @@ -357,6 +362,7 @@ static const char *sha1_graphics_24[] = "b25ba91487ec945410deb2b51bc1156890c032a8", "d347ca5c6c4b6a61389247c3b6f61564033e8c25", "ee315634ed92da3a32c2675ecd1b369471c60936", + "3491e2bd81e70dd203c8551cc2d39b19401caafe", NULL }; @@ -418,6 +424,7 @@ static const char *sha1_graphics_r5g5b5[] = "3772003c7fb420003512d0c437b3659d96d89ce4", "dab47c9dc149e570045d699598b14a613bf319b3", "2daca4d26a086ed34894693be0b0374402232809", + "bf0e0b74ce5686b73c527843e0d0df0cd10efefe", NULL }; @@ -474,6 +481,7 @@ static const char *sha1_graphics_r4g4b4[] = "f0acb3cfcda62e95bee5f7bc8830ffeb3dd7e5a7", "07b10c3f191d0a93e5e5694aae37dcad407e10f5", "f7900e60347029876ba55e8f0c4c02e89deb36b6", + "734d4a7836891d729f4a9ec6916ead78eecb2596", NULL }; @@ -536,6 +544,7 @@ static const char *sha1_graphics_8_color[] = "9ae38bb94c7b4c0c6dfebbee23d1de4db9b77488", "678979a45126a76eb629992cd64734862f53a555", "2f7ba8803604c032cb1a1228bc021f0f1c03e245", + "0204f06422a01787f7379d0edb51104bb023758a", NULL }; @@ -603,6 +612,7 @@ static const char *sha1_graphics_8_grayscale[] = "3685c9ae95118a83db3569832c29753276fa1264", "09640bad951c33e7d70a1fced83b1869f65b3fc5", "cb9ea8137eca1450e049879772f5c11a0e11ff0a", + "a05e05b2e6e515baa59ea032d063ca11e70a72b5", NULL }; @@ -663,6 +673,7 @@ static const char *sha1_graphics_8[] = "31e667c2dbb81dcf81d01cb88f794e88ddb90ff2", "465d9cd0a77ab4fcf035aa67544b2a26269e0b09", "600d6b2713d5e4c0d90c02660245ed26c7ae3033", + "963d1fa8608c8b743e972eb9a4e9f3fc53c6c7e8", NULL }; @@ -719,6 +730,7 @@ static const char *sha1_graphics_4[] = "df5feb905a31c288008cf5e82d73ac818a160d82", "d8af3868c66c7d6dac35ec8ee0317b38a6910bb1", "ec8e2aebfb4a1c28ebcd0e053b9e4d8638b50951", + "da401c745421f6bdfaefd590ab99dee948dce412", NULL }; @@ -775,6 +787,7 @@ static const char *sha1_graphics_4_grayscale[] = "f8681c09f1abfc38d31e47622cb8798cd896a00e", "b5ee51cfc73acb59a2f6124509ea236f8fc7f9f7", "d374d4d92c940ae42a9b42c14d744341b68a8c14", + "25ec9fd2eeb1514ba4e0458a444149a5456cf63a", NULL }; @@ -846,6 +859,7 @@ static const char *sha1_graphics_1[] = "23366004515f3bc46796ea505d748f8d0f97fbe1", "88763f8e8fcf4f78fa864325791a9dd35a0bd279", "013cee26bac8f815eadad4bfc012d9b5d01c3b7f", + "6b2cb2346b5820bdd0251cd6a4aeb5c22ee82e85", NULL }; @@ -1055,6 +1069,14 @@ static const DWORD four_by_four_data[16] = { 0x000000, 0xff0000, 0x00ff00, 0x000 0x000000, 0xff0000, 0x00ff00, 0x0000ff, 0xffffff, 0x00ffff, 0xff00ff, 0xffff00 }; +static inline void solid_patblt( HDC hdc, int x, int y, int width, int height, COLORREF color ) +{ + HBRUSH brush = CreateSolidBrush( color ); + brush = SelectObject( hdc, brush ); + PatBlt( hdc, x, y, width, height, PATCOPY ); + DeleteObject( SelectObject( hdc, brush ) ); +} + static void draw_graphics(HDC hdc, BITMAPINFO *bmi, BYTE *bits, const char ***sha1) { DWORD dib_size = get_dib_size(bmi); @@ -1925,7 +1947,32 @@ static void draw_graphics(HDC hdc, BITMAPINFO *bmi, BYTE *bits, const char ***sh ok(ret == -4, "got %d\n", ret); compare_hash_broken_todo( bmi, bits, sha1, "stretchdibits", dib_is_8bpp_gray ? 1 : 0, dib_is_8bpp_gray ); + memset(bits, 0xcc, dib_size); + + /* Solid colors */ + for (i = 0; i < 256; i++) + { + solid_patblt( hdc, i * 2, 10, 1, 1, DIBINDEX(i) ); + solid_patblt( hdc, i * 2, 20, 1, 1, PALETTEINDEX(i) ); + solid_patblt( hdc, i * 2, 30, 1, 1, RGB( (i & 0x07) << 5, (i & 0x38) << 2, i & 0xc0 ) ); + solid_patblt( hdc, i * 2, 40, 1, 1, PALETTERGB( (i & 0x07) << 5, (i & 0x38) << 2, i & 0xc0 ) ); + } + + /* A few extra colors that are interesting in the 1bpp case */ + + /* bk color */ + solid_patblt( hdc, 0, 50, 1, 1, RGB( 0, 0xff, 0 ) ); + solid_patblt( hdc, 2, 50, 1, 1, PALETTERGB( 0, 0xff, 0 ) ); + + /* color 0 */ + solid_patblt( hdc, 4, 50, 1, 1, RGB( 0, 0x1, 0xff ) ); + solid_patblt( hdc, 6, 50, 1, 1, PALETTERGB( 0, 0x1, 0xff ) ); + + /* color 1 */ + solid_patblt( hdc, 8, 50, 1, 1, RGB( 0xff, 0, 0 ) ); + solid_patblt( hdc, 10, 50, 1, 1, PALETTERGB( 0xff, 0, 0 ) ); + compare_hash(bmi, bits, sha1, "Colors"); memset(bits, 0xcc, dib_size); SelectObject(hdc, orig_brush);

1 0

Huw Davies : gdi32: Implement SetPixel.
by Alexandre Julliard Oct. 19, 2011

Oct. 19, 2011

Module: wine Branch: master Commit: 2ac6a1bbf6eb192a906f31837719e3c947979b0e URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ac6a1bbf6eb192a906f31837… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Oct 19 12:41:55 2011 +0100 gdi32: Implement SetPixel. --- dlls/gdi32/dibdrv/dc.c | 2 +- dlls/gdi32/dibdrv/dibdrv.h | 1 + dlls/gdi32/dibdrv/graphics.c | 40 ++++++++++++++++++++++++++++++++++++++++ dlls/gdi32/dibdrv/objects.c | 6 ------ dlls/gdi32/gdi_private.h | 6 ++++++ dlls/gdi32/tests/bitmap.c | 38 +++++++++++++++++++------------------- dlls/gdi32/tests/palette.c | 1 + 7 files changed, 68 insertions(+), 26 deletions(-) diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c index e832a20..877c132 100644 --- a/dlls/gdi32/dibdrv/dc.c +++ b/dlls/gdi32/dibdrv/dc.c @@ -606,7 +606,7 @@ const struct gdi_dc_funcs dib_driver = NULL, /* pSetLayout */ NULL, /* pSetMapMode */ NULL, /* pSetMapperFlags */ - NULL, /* pSetPixel */ + dibdrv_SetPixel, /* pSetPixel */ NULL, /* pSetPixelFormat */ NULL, /* pSetPolyFillMode */ dibdrv_SetROP2, /* pSetROP2 */ diff --git a/dlls/gdi32/dibdrv/dibdrv.h b/dlls/gdi32/dibdrv/dibdrv.h index b23e931..c73bc8e 100644 --- a/dlls/gdi32/dibdrv/dibdrv.h +++ b/dlls/gdi32/dibdrv/dibdrv.h @@ -120,6 +120,7 @@ extern HBRUSH dibdrv_SelectBrush( PHYSDEV dev, HBRUSH hbrush ) DECLSPEC_HIDDEN extern HPEN dibdrv_SelectPen( PHYSDEV dev, HPEN hpen ) DECLSPEC_HIDDEN; extern COLORREF dibdrv_SetDCBrushColor( PHYSDEV dev, COLORREF color ) DECLSPEC_HIDDEN; extern COLORREF dibdrv_SetDCPenColor( PHYSDEV dev, COLORREF color ) DECLSPEC_HIDDEN; +extern COLORREF dibdrv_SetPixel( PHYSDEV dev, INT x, INT y, COLORREF color ) DECLSPEC_HIDDEN; extern BOOL dibdrv_StretchBlt( PHYSDEV dst_dev, struct bitblt_coords *dst, PHYSDEV src_dev, struct bitblt_coords *src, DWORD rop ) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/dibdrv/graphics.c b/dlls/gdi32/dibdrv/graphics.c index f8b3f8a..b68b17e 100644 --- a/dlls/gdi32/dibdrv/graphics.c +++ b/dlls/gdi32/dibdrv/graphics.c @@ -240,3 +240,43 @@ BOOL dibdrv_Rectangle( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) return TRUE; } + +/*********************************************************************** + * dibdrv_SetPixel + */ +COLORREF dibdrv_SetPixel( PHYSDEV dev, INT x, INT y, COLORREF color ) +{ + dibdrv_physdev *pdev = get_dibdrv_pdev( dev ); + int i; + POINT pt; + DWORD pixel; + const WINEREGION *clip = get_wine_region( pdev->clip ); + + TRACE( "(%p, %d, %d, %08x)\n", dev, x, y, color ); + + pt.x = x; + pt.y = y; + LPtoDP( dev->hdc, &pt, 1 ); + + /* SetPixel doesn't do the 1bpp massaging like other fg colors */ + pixel = get_pixel_color( pdev, color, FALSE ); + color = pdev->dib.funcs->pixel_to_colorref( &pdev->dib, pixel ); + + for (i = 0; i < clip->numRects; i++) + { + if (pt_in_rect( clip->rects + i, pt )) + { + RECT rect; + rect.left = pt.x; + rect.top = pt.y; + rect.right = rect.left + 1; + rect.bottom = rect.top + 1; + + pdev->dib.funcs->solid_rects( &pdev->dib, 1, &rect, 0, pixel ); + break; + } + } + + release_wine_region( pdev->clip ); + return color; +} diff --git a/dlls/gdi32/dibdrv/objects.c b/dlls/gdi32/dibdrv/objects.c index a1f6829..8d84284 100644 --- a/dlls/gdi32/dibdrv/objects.c +++ b/dlls/gdi32/dibdrv/objects.c @@ -259,12 +259,6 @@ static inline void order_end_points(int *s, int *e) } } -static inline BOOL pt_in_rect( const RECT *rect, const POINT *pt ) -{ - return ((pt->x >= rect->left) && (pt->x < rect->right) && - (pt->y >= rect->top) && (pt->y < rect->bottom)); -} - #define Y_INCREASING_MASK 0x0f #define X_INCREASING_MASK 0xc3 #define X_MAJOR_MASK 0x99 diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 67bdd2c..0d38efe 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -480,6 +480,12 @@ static inline void offset_rect( RECT *rect, int offset_x, int offset_y ) rect->bottom += offset_y; } +static inline BOOL pt_in_rect( const RECT *rect, POINT pt ) +{ + return ((pt.x >= rect->left) && (pt.x < rect->right) && + (pt.y >= rect->top) && (pt.y < rect->bottom)); +} + static inline void get_bounding_rect( RECT *rect, int x, int y, int width, int height ) { rect->left = x; diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index a412cc9..bf18b9b 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -582,17 +582,17 @@ static void test_dibsections(void) test_color(hdcmem, DIBINDEX(0), c0, 0, 1); test_color(hdcmem, DIBINDEX(1), c1, 0, 1); - test_color(hdcmem, DIBINDEX(2), c0, 1, 1); - test_color(hdcmem, PALETTEINDEX(0), c0, 1, 1); - test_color(hdcmem, PALETTEINDEX(1), c0, 1, 1); - test_color(hdcmem, PALETTEINDEX(2), c0, 1, 1); + test_color(hdcmem, DIBINDEX(2), c0, 0, 1); + test_color(hdcmem, PALETTEINDEX(0), c0, 0, 1); + test_color(hdcmem, PALETTEINDEX(1), c0, 0, 1); + test_color(hdcmem, PALETTEINDEX(2), c0, 0, 1); test_color(hdcmem, PALETTERGB(pbmi->bmiColors[0].rgbRed, pbmi->bmiColors[0].rgbGreen, - pbmi->bmiColors[0].rgbBlue), c0, 1, 1); + pbmi->bmiColors[0].rgbBlue), c0, 0, 1); test_color(hdcmem, PALETTERGB(pbmi->bmiColors[1].rgbRed, pbmi->bmiColors[1].rgbGreen, - pbmi->bmiColors[1].rgbBlue), c1, 1, 1); - test_color(hdcmem, PALETTERGB(0, 0, 0), c0, 1, 1); - test_color(hdcmem, PALETTERGB(0xff, 0xff, 0xff), c0, 1, 1); - test_color(hdcmem, PALETTERGB(0, 0, 0xfe), c1, 1, 1); + pbmi->bmiColors[1].rgbBlue), c1, 0, 1); + test_color(hdcmem, PALETTERGB(0, 0, 0), c0, 0, 1); + test_color(hdcmem, PALETTERGB(0xff, 0xff, 0xff), c0, 0, 1); + test_color(hdcmem, PALETTERGB(0, 0, 0xfe), c1, 0, 1); SelectObject(hdcmem, oldbm); DeleteObject(hdib); @@ -706,20 +706,20 @@ static void test_dibsections(void) test_color(hdcmem, DIBINDEX(0), c0, 0, 1); test_color(hdcmem, DIBINDEX(1), c1, 0, 1); - test_color(hdcmem, DIBINDEX(2), c0, 1, 1); + test_color(hdcmem, DIBINDEX(2), c0, 0, 1); test_color(hdcmem, PALETTEINDEX(0), c0, 0, 1); test_color(hdcmem, PALETTEINDEX(1), c1, 0, 1); - test_color(hdcmem, PALETTEINDEX(2), c0, 1, 1); + test_color(hdcmem, PALETTEINDEX(2), c0, 0, 1); test_color(hdcmem, PALETTERGB(plogpal->palPalEntry[0].peRed, plogpal->palPalEntry[0].peGreen, - plogpal->palPalEntry[0].peBlue), c0, 1, 1); + plogpal->palPalEntry[0].peBlue), c0, 0, 1); test_color(hdcmem, PALETTERGB(plogpal->palPalEntry[1].peRed, plogpal->palPalEntry[1].peGreen, - plogpal->palPalEntry[1].peBlue), c1, 1, 1); - test_color(hdcmem, PALETTERGB(0, 0, 0), c1, 1, 1); - test_color(hdcmem, PALETTERGB(0xff, 0xff, 0xff), c0, 1, 1); - test_color(hdcmem, PALETTERGB(0, 0, 0xfe), c0, 1, 1); - test_color(hdcmem, PALETTERGB(0, 1, 0), c1, 1, 1); - test_color(hdcmem, PALETTERGB(0x3f, 0, 0x3f), c1, 1, 1); - test_color(hdcmem, PALETTERGB(0x40, 0, 0x40), c0, 1, 1); + plogpal->palPalEntry[1].peBlue), c1, 0, 1); + test_color(hdcmem, PALETTERGB(0, 0, 0), c1, 0, 1); + test_color(hdcmem, PALETTERGB(0xff, 0xff, 0xff), c0, 0, 1); + test_color(hdcmem, PALETTERGB(0, 0, 0xfe), c0, 0, 1); + test_color(hdcmem, PALETTERGB(0, 1, 0), c1, 0, 1); + test_color(hdcmem, PALETTERGB(0x3f, 0, 0x3f), c1, 0, 1); + test_color(hdcmem, PALETTERGB(0x40, 0, 0x40), c0, 0, 1); /* Bottom and 2nd row from top green, everything else magenta */ bits[0] = bits[1] = 0xff; diff --git a/dlls/gdi32/tests/palette.c b/dlls/gdi32/tests/palette.c index 039be59..0a5822a 100644 --- a/dlls/gdi32/tests/palette.c +++ b/dlls/gdi32/tests/palette.c @@ -109,6 +109,7 @@ static void test_DIB_PAL_COLORS(void) { SetPixel( memhdc, 0, 0, setColor ); chkColor = RGB( logpalettedata[3].peRed, logpalettedata[3].peGreen, logpalettedata[3].peBlue ); getColor = GetPixel( memhdc, 0, 0 ); +todo_wine /* this will be removed with the GetPixel patch */ ok( getColor == chkColor, "getColor=%08X\n", (UINT)getColor ); SelectPalette( memhdc, hpalOld, FALSE );

1 0

Andrew Eikum : shell32: ShellExec with empty operation should behave same as with NULL operation.
by Alexandre Julliard Oct. 19, 2011

Oct. 19, 2011

Module: wine Branch: master Commit: 3f3e42b6bc296af9f18a4b3eff6610590db033c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f3e42b6bc296af9f18a4b3ef… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Oct 18 15:19:17 2011 -0500 shell32: ShellExec with empty operation should behave same as with NULL operation. --- dlls/shell32/classes.c | 2 +- dlls/shell32/shlexec.c | 4 ++-- dlls/shell32/tests/shlexec.c | 9 ++++++++- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/dlls/shell32/classes.c b/dlls/shell32/classes.c index 9fbdf0e..a56af62 100644 --- a/dlls/shell32/classes.c +++ b/dlls/shell32/classes.c @@ -129,7 +129,7 @@ BOOL HCR_GetDefaultVerbW( HKEY hkeyClass, LPCWSTR szVerb, LPWSTR szDest, DWORD l TRACE("%p %s %p\n", hkeyClass, debugstr_w(szVerb), szDest); - if (szVerb) + if (szVerb && *szVerb) { lstrcpynW(szDest, szVerb, len); return TRUE; diff --git a/dlls/shell32/shlexec.c b/dlls/shell32/shlexec.c index 7fd485e..77212f0 100644 --- a/dlls/shell32/shlexec.c +++ b/dlls/shell32/shlexec.c @@ -1517,7 +1517,7 @@ static UINT_PTR SHELL_execute_url( LPCWSTR lpFile, LPCWSTR wFile, LPCWSTR wcmd, TRACE("Got URL: %s\n", debugstr_w(lpFile)); /* Looking for ...protocol\shell\lpOperation\command */ len = iSize + lstrlenW(wShell) + lstrlenW(wCommand) + 1; - if (psei->lpVerb) + if (psei->lpVerb && *psei->lpVerb) len += lstrlenW(psei->lpVerb); else len += lstrlenW(wszOpen); @@ -1525,7 +1525,7 @@ static UINT_PTR SHELL_execute_url( LPCWSTR lpFile, LPCWSTR wFile, LPCWSTR wcmd, memcpy(lpstrProtocol, lpFile, iSize*sizeof(WCHAR)); lpstrProtocol[iSize] = '\0'; strcatW(lpstrProtocol, wShell); - strcatW(lpstrProtocol, psei->lpVerb? psei->lpVerb: wszOpen); + strcatW(lpstrProtocol, psei->lpVerb && *psei->lpVerb ? psei->lpVerb: wszOpen); strcatW(lpstrProtocol, wCommand); /* Remove File Protocol from lpFile */ diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index 9c0bc58..5542ea5 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -92,7 +92,10 @@ static void strcat_param(char* str, const char* param) static char shell_call[2048]=""; static int shell_execute(LPCSTR operation, LPCSTR file, LPCSTR parameters, LPCSTR directory) { - INT_PTR rc; + INT_PTR rc, rcEmpty = 0; + + if(!operation) + rcEmpty = shell_execute("", file, parameters, directory); strcpy(shell_call, "ShellExecute("); strcat_param(shell_call, operation); @@ -139,6 +142,10 @@ static int shell_execute(LPCSTR operation, LPCSTR file, LPCSTR parameters, LPCST if (rc > 32) dump_child(); + if(!operation) + ok(rc == rcEmpty || broken(rc > 32 && rcEmpty == SE_ERR_NOASSOC) /* NT4 */, + "Got different return value with empty string: %lu %lu\n", rc, rcEmpty); + return rc; }

1 0

Frédéric Delanoy : mlang/tests: Fix a typo.
by Alexandre Julliard Oct. 19, 2011

Oct. 19, 2011

Module: wine Branch: master Commit: 241ccd9ab9d98574f6310fcfb05b3d3539e5f561 URL: http://source.winehq.org/git/wine.git/?a=commit;h=241ccd9ab9d98574f6310fcfb… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Oct 19 11:35:54 2011 +0200 mlang/tests: Fix a typo. --- dlls/mlang/tests/mlang.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mlang/tests/mlang.c b/dlls/mlang/tests/mlang.c index 42ad1f8..65244bb 100644 --- a/dlls/mlang/tests/mlang.c +++ b/dlls/mlang/tests/mlang.c @@ -1202,7 +1202,7 @@ static void test_GetRfc1766Info(IMultiLanguage2 *iML2) ok(!lstrcmpA(rfc1766A, info_table[i].rfc1766), "#%02d: got '%s' (expected '%s')\n", i, rfc1766A, info_table[i].rfc1766); - /* Some IE versions truncate an oversized name one character to short */ + /* Some IE versions truncate an oversized name one character too short */ if (info_table[i].broken_name) { lstrcpyW(short_broken_name, info_table[i].broken_name); short_broken_name[MAX_LOCALE_NAME - 2] = 0;

1 0

Frédéric Delanoy : cmd: Rename WCMD_opt_s_strip_quotes function.
by Alexandre Julliard Oct. 19, 2011

Oct. 19, 2011

Module: wine Branch: master Commit: d19455e8958dc828a5c180cb8da96e45901a0324 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d19455e8958dc828a5c180cb8… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Oct 19 09:47:58 2011 +0200 cmd: Rename WCMD_opt_s_strip_quotes function. --- programs/cmd/builtins.c | 4 ++-- programs/cmd/wcmd.h | 2 +- programs/cmd/wcmdmain.c | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 5a890c7..79e1ced 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -2229,7 +2229,7 @@ void WCMD_setshow_env (WCHAR *s) { s += 2; while (*s && (*s==' ' || *s=='\t')) s++; if (*s=='\"') - WCMD_opt_s_strip_quotes(s); + WCMD_strip_quotes(s); /* If no parameter, or no '=' sign, return an error */ if (!(*s) || ((p = strchrW (s, '=')) == NULL )) { @@ -2255,7 +2255,7 @@ void WCMD_setshow_env (WCHAR *s) { DWORD gle; if (*s=='\"') - WCMD_opt_s_strip_quotes(s); + WCMD_strip_quotes(s); p = strchrW (s, '='); if (p == NULL) { env = GetEnvironmentStringsW(); diff --git a/programs/cmd/wcmd.h b/programs/cmd/wcmd.h index 61cef8f..e025484 100644 --- a/programs/cmd/wcmd.h +++ b/programs/cmd/wcmd.h @@ -108,7 +108,7 @@ BOOL WCMD_keyword_ws_found(const WCHAR *keyword, int len, const WCHAR *ptr); void WCMD_HandleTildaModifiers(WCHAR **start, const WCHAR *forVariable, const WCHAR *forValue, BOOL justFors); void WCMD_splitpath(const WCHAR* path, WCHAR* drv, WCHAR* dir, WCHAR* name, WCHAR* ext); -void WCMD_opt_s_strip_quotes(WCHAR *cmd); +void WCMD_strip_quotes(WCHAR *cmd); WCHAR *WCMD_LoadMessage(UINT id); WCHAR *WCMD_strdupW(const WCHAR *input); void WCMD_strsubstW(WCHAR *start, const WCHAR* next, const WCHAR* insert, int len); diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index a4726e8..56aa85f 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -506,11 +506,11 @@ BOOL WCMD_keyword_ws_found(const WCHAR *keyword, int len, const WCHAR *ptr) { } /************************************************************************* - * WCMD_opt_s_strip_quotes + * WCMD_strip_quotes * * Remove first and last quote WCHARacters, preserving all other text */ -void WCMD_opt_s_strip_quotes(WCHAR *cmd) { +void WCMD_strip_quotes(WCHAR *cmd) { WCHAR *src = cmd + 1, *dest = cmd, *lastq = NULL; while((*dest=*src) != '\0') { if (*src=='\"') @@ -1204,7 +1204,7 @@ void WCMD_run_program (WCHAR *command, int called) { if ((opt_c || opt_k) && !opt_s && !status && GetLastError()==ERROR_FILE_NOT_FOUND && command[0]=='\"') { /* strip first and last quote WCHARacters and try again */ - WCMD_opt_s_strip_quotes(command); + WCMD_strip_quotes(command); opt_s=1; WCMD_run_program(command, called); return; @@ -2478,7 +2478,7 @@ int wmain (int argc, WCHAR *argvW[]) /* strip first and last quote characters if opt_s; check for invalid * executable is done later */ if (opt_s && *cmd=='\"') - WCMD_opt_s_strip_quotes(cmd); + WCMD_strip_quotes(cmd); } if (opt_c) {

1 0

Austin English : configure: Use -fno-omit-frame-pointer when available.
by Alexandre Julliard Oct. 19, 2011

Oct. 19, 2011

Module: wine Branch: master Commit: 5cfe7db1854ff1142d598eaf49f6050676c8d547 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5cfe7db1854ff1142d598eaf4… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Oct 18 12:17:37 2011 -0700 configure: Use -fno-omit-frame-pointer when available. --- configure | 28 ++++++++++++++++++++++++++++ configure.ac | 5 +++++ 2 files changed, 33 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 7325264..138fa8d 100755 --- a/configure +++ b/configure @@ -12014,6 +12014,34 @@ if test $ac_cv_cflags__Wwrite_strings = yes; then : EXTRACFLAGS="$EXTRACFLAGS -Wwrite-strings" fi + case $host_cpu in + *i[3456789]86*) { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -fno-omit-frame-pointer" >&5 +$as_echo_n "checking whether the compiler supports -fno-omit-frame-pointer... " >&6; } +if ${ac_cv_cflags__fno_omit_frame_pointer+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_wine_try_cflags_saved=$CFLAGS +CFLAGS="$CFLAGS -fno-omit-frame-pointer" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int main(int argc, char **argv) { return 0; } +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_cflags__fno_omit_frame_pointer=yes +else + ac_cv_cflags__fno_omit_frame_pointer=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +CFLAGS=$ac_wine_try_cflags_saved +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags__fno_omit_frame_pointer" >&5 +$as_echo "$ac_cv_cflags__fno_omit_frame_pointer" >&6; } +if test $ac_cv_cflags__fno_omit_frame_pointer = yes; then : + EXTRACFLAGS="$EXTRACFLAGS -fno-omit-frame-pointer" +fi ;; + esac + saved_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -Wpointer-arith -Werror" { $as_echo "$as_me:${as_lineno-$LINENO}: checking for broken string.h that generates warnings with -Wpointer-arith" >&5 diff --git a/configure.ac b/configure.ac index 5a9fd2b..363d08f 100644 --- a/configure.ac +++ b/configure.ac @@ -1684,6 +1684,11 @@ then WINE_TRY_CFLAGS([-Wunused-but-set-parameter]) WINE_TRY_CFLAGS([-Wwrite-strings]) + dnl gcc-4.6+ omits frame pointers by default, breaking some copy protections + case $host_cpu in + *i[[3456789]]86*) WINE_TRY_CFLAGS([-fno-omit-frame-pointer]) ;; + esac + dnl Check for noisy string.h saved_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -Wpointer-arith -Werror"

1 0