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
September 2013
----- 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
2 participants
645 discussions
Start a n
N
ew thread
Frédéric Delanoy : wrc: Use BOOL type where appropriate.
by Alexandre Julliard
24 Sep '13
24 Sep '13
Module: wine Branch: master Commit: a46da0e86a223a96a206a57a2fc104baea2456c2 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=a46da0e86a223a96a206a57a2…
Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Sep 21 00:43:26 2013 +0200 wrc: Use BOOL type where appropriate. --- tools/wrc/po.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tools/wrc/po.c b/tools/wrc/po.c index 4b13c26..5d4f485 100644 --- a/tools/wrc/po.c +++ b/tools/wrc/po.c @@ -124,10 +124,10 @@ static char *get_message_context( char **msgid ) return context; } -static int control_has_title( const control_t *ctrl ) +static BOOL control_has_title( const control_t *ctrl ) { - if (!ctrl->title) return 0; - if (ctrl->title->type != name_str) return 0; + if (!ctrl->title) return FALSE; + if (ctrl->title->type != name_str) return FALSE; /* check for text static control */ if (ctrl->ctlclass && ctrl->ctlclass->type == name_ord && ctrl->ctlclass->name.i_name == CT_STATIC) { @@ -136,12 +136,12 @@ static int control_has_title( const control_t *ctrl ) case SS_LEFT: case SS_CENTER: case SS_RIGHT: - return 1; + return TRUE; default: - return 0; + return FALSE; } } - return 1; + return TRUE; } static resource_t *dup_resource( resource_t *res, language_t *lang )
1
0
0
0
Akihiro Sagawa : gdi32: Fix empty glyph handling.
by Alexandre Julliard
24 Sep '13
24 Sep '13
Module: wine Branch: master Commit: 31a6fce46b13c09584209ac07b280399b438cff2 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=31a6fce46b13c09584209ac07…
Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Fri Sep 20 00:57:53 2013 +0900 gdi32: Fix empty glyph handling. --- dlls/gdi32/font.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 7fd5bd3..a025d17 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -1812,7 +1812,11 @@ static DWORD get_glyph_bitmap( HDC hdc, UINT index, UINT flags, UINT aa_flags, image->ptr = NULL; image->free = NULL; - if (!ret) return ERROR_SUCCESS; /* empty glyph */ + if (!ret) /* empty glyph */ + { + metrics->gmBlackBoxX = metrics->gmBlackBoxY = 0; + return ERROR_SUCCESS; + } stride = get_dib_stride( metrics->gmBlackBoxX, 1 ); size = metrics->gmBlackBoxY * stride;
1
0
0
0
Akihiro Sagawa : gdiplus: Fix empty glyph handling.
by Alexandre Julliard
24 Sep '13
24 Sep '13
Module: wine Branch: master Commit: e29e4caca3bb914556cf66fd95165ca5ebce152a URL:
http://source.winehq.org/git/wine.git/?a=commit;h=e29e4caca3bb914556cf66fd9…
Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Fri Sep 20 00:57:52 2013 +0900 gdiplus: Fix empty glyph handling. --- dlls/gdiplus/graphics.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 79e4c7c..a642bd8 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -6242,11 +6242,15 @@ static GpStatus SOFTWARE_GdipDrawDriverString(GpGraphics *graphics, GDIPCONST UI /* Generate a mask for the text */ for (i=0; i<length; i++) { + DWORD ret; int left, top, stride; - GetGlyphOutlineW(hdc, text[i], ggo_flags, + ret = GetGlyphOutlineW(hdc, text[i], ggo_flags, &glyphmetrics, max_glyphsize, glyph_mask, &identity); + if (ret == GDI_ERROR || ret == 0) + continue; /* empty glyph */ + left = pti[i].x + glyphmetrics.gmptGlyphOrigin.x; top = pti[i].y - glyphmetrics.gmptGlyphOrigin.y; stride = (glyphmetrics.gmBlackBoxX + 3) & (~3);
1
0
0
0
Akihiro Sagawa : opengl32: Fix empty glyph handling.
by Alexandre Julliard
24 Sep '13
24 Sep '13
Module: wine Branch: master Commit: 33e05eb6c5cce89b22fa779deacfeb2b415e7f19 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=33e05eb6c5cce89b22fa779de…
Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Fri Sep 20 00:57:50 2013 +0900 opengl32: Fix empty glyph handling. --- dlls/opengl32/wgl.c | 14 +++++++++----- 1 files changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index 1317ff5..361a1ec 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -1121,11 +1121,15 @@ static BOOL wglUseFontBitmaps_common( HDC hdc, DWORD first, DWORD count, DWORD l bitmap = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); gl_bitmap = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); } - if (unicode) - ret = (GetGlyphOutlineW(hdc, glyph, GGO_BITMAP, &gm, size, bitmap, &identity) != GDI_ERROR); - else - ret = (GetGlyphOutlineA(hdc, glyph, GGO_BITMAP, &gm, size, bitmap, &identity) != GDI_ERROR); - if (!ret) break; + if (needed_size != 0) { + if (unicode) + ret = (GetGlyphOutlineW(hdc, glyph, GGO_BITMAP, &gm, + size, bitmap, &identity) != GDI_ERROR); + else + ret = (GetGlyphOutlineA(hdc, glyph, GGO_BITMAP, &gm, + size, bitmap, &identity) != GDI_ERROR); + if (!ret) break; + } if (TRACE_ON(wgl)) { unsigned int bitmask;
1
0
0
0
Akihiro Sagawa : winex11.drv: Fix empty glyph handling.
by Alexandre Julliard
24 Sep '13
24 Sep '13
Module: wine Branch: master Commit: 310a3b1d11bd175ee1182b0e37812fd140a7b6b4 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=310a3b1d11bd175ee1182b0e3…
Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Fri Sep 20 00:57:48 2013 +0900 winex11.drv: Fix empty glyph handling. --- dlls/winex11.drv/xrender.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index 671f67a..ca2d3da 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -1129,7 +1129,10 @@ static void UploadGlyph(struct xrender_physdev *physDev, UINT glyph, enum glyph_ buf = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, buflen); - GetGlyphOutlineW(physDev->dev.hdc, glyph, ggo_format, &gm, buflen, buf, &identity); + if (buflen) + GetGlyphOutlineW(physDev->dev.hdc, glyph, ggo_format, &gm, buflen, buf, &identity); + else + gm.gmBlackBoxX = gm.gmBlackBoxY = 0; /* empty glyph */ formatEntry->realized[glyph] = TRUE; TRACE("buflen = %d. Got metrics: %dx%d adv=%d,%d origin=%d,%d\n",
1
0
0
0
Akihiro Sagawa : gdi32/tests: Add more empty glyph tests.
by Alexandre Julliard
24 Sep '13
24 Sep '13
Module: wine Branch: master Commit: cc7b39681dfd8e451870811440192f172337e8ea URL:
http://source.winehq.org/git/wine.git/?a=commit;h=cc7b39681dfd8e45187081144…
Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Fri Sep 20 00:57:46 2013 +0900 gdi32/tests: Add more empty glyph tests. --- dlls/gdi32/tests/font.c | 68 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 68 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 99c5eef..f68021e 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -4029,6 +4029,8 @@ static void test_GetGlyphOutline(void) LOGFONTA lf; HFONT hfont, old_hfont; INT ret, ret2; + const UINT fmt[] = { GGO_METRICS, GGO_BITMAP, GGO_GRAY2_BITMAP, + GGO_GRAY4_BITMAP, GGO_GRAY8_BITMAP }; static const struct { UINT cs; @@ -4105,6 +4107,72 @@ static void test_GetGlyphOutline(void) ok(GetLastError() == 0xdeadbeef, "expected 0xdeadbeef, got %u\n", GetLastError()); } + for (i = 0; i < sizeof(fmt) / sizeof(fmt[0]); ++i) + { + DWORD dummy; + + memset(&gm, 0xab, sizeof(gm)); + SetLastError(0xdeadbeef); + ret = GetGlyphOutlineW(hdc, ' ', fmt[i], &gm, 0, NULL, &mat); + if (GetLastError() != ERROR_CALL_NOT_IMPLEMENTED) + { + if (fmt[i] == GGO_METRICS) + ok(ret != GDI_ERROR, "%2d:GetGlyphOutlineW should succeed, got %d\n", fmt[i], ret); + else + ok(ret == 0, "%2d:GetGlyphOutlineW should return 0, got %d\n", fmt[i], ret); + todo_wine { + ok(gm.gmBlackBoxX == 1, "%2d:expected 1, got %u\n", fmt[i], gm.gmBlackBoxX); + ok(gm.gmBlackBoxY == 1, "%2d:expected 1, got %u\n", fmt[i], gm.gmBlackBoxX); + } + } + + memset(&gm, 0xab, sizeof(gm)); + SetLastError(0xdeadbeef); + ret = GetGlyphOutlineW(hdc, ' ', fmt[i], &gm, 0, &dummy, &mat); + if (GetLastError() != ERROR_CALL_NOT_IMPLEMENTED) + { + if (fmt[i] == GGO_METRICS) + ok(ret != GDI_ERROR, "%2d:GetGlyphOutlineW should succeed, got %d\n", fmt[i], ret); + else + ok(ret == 0, "%2d:GetGlyphOutlineW should return 0, got %d\n", fmt[i], ret); + todo_wine { + ok(gm.gmBlackBoxX == 1, "%2d:expected 1, got %u\n", fmt[i], gm.gmBlackBoxX); + ok(gm.gmBlackBoxY == 1, "%2d:expected 1, got %u\n", fmt[i], gm.gmBlackBoxX); + } + } + + memset(&gm, 0xab, sizeof(gm)); + SetLastError(0xdeadbeef); + ret = GetGlyphOutlineW(hdc, ' ', fmt[i], &gm, sizeof(dummy), NULL, &mat); + if (GetLastError() != ERROR_CALL_NOT_IMPLEMENTED) + { + if (fmt[i] == GGO_METRICS) + ok(ret != GDI_ERROR, "%2d:GetGlyphOutlineW should succeed, got %d\n", fmt[i], ret); + else + ok(ret == 0, "%2d:GetGlyphOutlineW should return 0, got %d\n", fmt[i], ret); + todo_wine { + ok(gm.gmBlackBoxX == 1, "%2d:expected 1, got %u\n", fmt[i], gm.gmBlackBoxX); + ok(gm.gmBlackBoxY == 1, "%2d:expected 1, got %u\n", fmt[i], gm.gmBlackBoxX); + } + } + + memset(&gm, 0xab, sizeof(gm)); + SetLastError(0xdeadbeef); + ret = GetGlyphOutlineW(hdc, ' ', fmt[i], &gm, sizeof(dummy), &dummy, &mat); + if (GetLastError() != ERROR_CALL_NOT_IMPLEMENTED) + { + if (fmt[i] == GGO_METRICS) { + ok(ret != GDI_ERROR, "%2d:GetGlyphOutlineW should succeed, got %d\n", fmt[i], ret); + todo_wine { + ok(gm.gmBlackBoxX == 1, "%2d:expected 1, got %u\n", fmt[i], gm.gmBlackBoxX); + ok(gm.gmBlackBoxY == 1, "%2d:expected 1, got %u\n", fmt[i], gm.gmBlackBoxX); + } + } + else + todo_wine ok(ret == GDI_ERROR, "%2d:GetGlyphOutlineW should return GDI_ERROR, got %d\n", fmt[i], ret); + } + } + SelectObject(hdc, old_hfont); DeleteObject(hfont);
1
0
0
0
Dmitry Timoshkov : ntdll: Perform the offset checks also for a serial device.
by Alexandre Julliard
24 Sep '13
24 Sep '13
Module: wine Branch: master Commit: 084f4b643cd4cd98bdedbd89dc1e5ccc239cc83b URL:
http://source.winehq.org/git/wine.git/?a=commit;h=084f4b643cd4cd98bdedbd89d…
Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Sep 19 16:10:09 2013 +0900 ntdll: Perform the offset checks also for a serial device. --- dlls/kernel32/tests/comm.c | 9 --------- dlls/ntdll/file.c | 8 ++++++++ 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/dlls/kernel32/tests/comm.c b/dlls/kernel32/tests/comm.c index dfd148c..242b599 100644 --- a/dlls/kernel32/tests/comm.c +++ b/dlls/kernel32/tests/comm.c @@ -2153,20 +2153,14 @@ todo_wine SetLastError(0xdeadbeef); ret = ReadFile(hcom, buf, 0, &bytes, NULL); ok(!ret, "ReadFile should fail\n"); -todo_wine ok(GetLastError() == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); ok(bytes == 0, "bytes %u\n", bytes); iob.Status = -1; iob.Information = -1; status = pNtReadFile(hcom, 0, NULL, NULL, &iob, buf, 0, NULL, NULL); -todo_wine ok(status == STATUS_INVALID_PARAMETER, "expected STATUS_INVALID_PARAMETER, got %#x\n", status); - /* FIXME: Remove once Wine is fixed */ - if (status == STATUS_PENDING) WaitForSingleObject(hcom, TIMEOUT); -todo_wine ok(iob.Status == -1, "expected -1, got %#x\n", iob.Status); -todo_wine ok(iob.Information == -1, "expected -1, got %ld\n", iob.Information); for (i = -20; i < 20; i++) @@ -2187,11 +2181,8 @@ todo_wine } else { -todo_wine ok(status == STATUS_INVALID_PARAMETER, "%d: expected STATUS_INVALID_PARAMETER, got %#x\n", i, status); -todo_wine ok(iob.Status == -1, "%d: expected -1, got %#x\n", i, iob.Status); -todo_wine ok(iob.Information == -1, "%d: expected -1, got %ld\n", i, iob.Information); } } diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 15e8829..75ce35c 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -632,6 +632,14 @@ NTSTATUS WINAPI NtReadFile(HANDLE hFile, HANDLE hEvent, goto done; } } + else if (type == FD_TYPE_SERIAL) + { + if (!(options & (FILE_SYNCHRONOUS_IO_ALERT | FILE_SYNCHRONOUS_IO_NONALERT)) && (!offset || offset->QuadPart < 0)) + { + status = STATUS_INVALID_PARAMETER; + goto done; + } + } for (;;) {
1
0
0
0
Huw Davies : dbghelp: Add a couple of structures that are missing from the Android ndk.
by Alexandre Julliard
24 Sep '13
24 Sep '13
Module: wine Branch: master Commit: 96e32da5c9f51fd7b8fd987b096d73b61e539ebd URL:
http://source.winehq.org/git/wine.git/?a=commit;h=96e32da5c9f51fd7b8fd987b0…
Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Sep 23 14:49:39 2013 +0100 dbghelp: Add a couple of structures that are missing from the Android ndk. --- configure | 32 ++++++++++++++++++++++++++++++++ configure.ac | 8 ++++++++ dlls/dbghelp/elf_module.c | 26 ++++++++++++++++++++++++++ include/config.h.in | 6 ++++++ 4 files changed, 72 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 7cbe217..2e21690 100755 --- a/configure +++ b/configure @@ -14220,6 +14220,38 @@ _ACEOF fi +ac_fn_c_check_type "$LINENO" "struct r_debug" "ac_cv_type_struct_r_debug" "#ifdef HAVE_LINK_H +#include <link.h> +#endif +#ifdef HAVE_SYS_LINK_H +#include <sys/link.h> +#endif +" +if test "x$ac_cv_type_struct_r_debug" = xyes; then : + +cat >>confdefs.h <<_ACEOF +#define HAVE_STRUCT_R_DEBUG 1 +_ACEOF + + +fi +ac_fn_c_check_type "$LINENO" "struct link_map" "ac_cv_type_struct_link_map" "#ifdef HAVE_LINK_H +#include <link.h> +#endif +#ifdef HAVE_SYS_LINK_H +#include <sys/link.h> +#endif +" +if test "x$ac_cv_type_struct_link_map" = xyes; then : + +cat >>confdefs.h <<_ACEOF +#define HAVE_STRUCT_LINK_MAP 1 +_ACEOF + + +fi + + ac_fn_c_check_member "$LINENO" "struct ff_effect" "direction" "ac_cv_member_struct_ff_effect_direction" "#ifdef HAVE_LINUX_INPUT_H #include <linux/input.h> #endif diff --git a/configure.ac b/configure.ac index 8b78cfe..d733610 100644 --- a/configure.ac +++ b/configure.ac @@ -2203,6 +2203,14 @@ AC_CHECK_TYPES([struct xinpgen],,, #include <netinet/in_pcb.h> #endif]) +AC_CHECK_TYPES([struct r_debug, struct link_map],,, +[#ifdef HAVE_LINK_H +#include <link.h> +#endif +#ifdef HAVE_SYS_LINK_H +#include <sys/link.h> +#endif]) + AC_CHECK_MEMBERS([struct ff_effect.direction],,, [#ifdef HAVE_LINUX_INPUT_H #include <linux/input.h> diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c index f8015c1..8539d0c 100644 --- a/dlls/dbghelp/elf_module.c +++ b/dlls/dbghelp/elf_module.c @@ -60,6 +60,32 @@ #define NT_GNU_BUILD_ID 3 #endif +#ifndef HAVE_STRUCT_R_DEBUG +struct r_debug +{ + int r_version; + struct link_map *r_map; + ElfW(Addr) r_brk; + enum + { + RT_CONSISTENT, + RT_ADD, + RT_DELETE + } r_state; + ElfW(Addr) r_ldbase; +}; +#endif /* HAVE_STRUCT_R_DEBUG */ + +#ifndef HAVE_STRUCT_LINK_MAP +struct link_map +{ + ElfW(Addr) l_addr; + char *l_name; + ElfW(Dyn) *l_ld; + struct link_map *l_next, *l_prev; +}; +#endif /* HAVE_STRUCT_LINK_MAP */ + WINE_DEFAULT_DEBUG_CHANNEL(dbghelp); struct elf_info diff --git a/include/config.h.in b/include/config.h.in index 1f0bfea..5863d10 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -825,6 +825,9 @@ /* Define to 1 if `ips_total' is a member of `struct ip_stats'. */ #undef HAVE_STRUCT_IP_STATS_IPS_TOTAL +/* Define to 1 if the system has the type `struct link_map'. */ +#undef HAVE_STRUCT_LINK_MAP + /* Define to 1 if `msg_accrights' is a member of `struct msghdr'. */ #undef HAVE_STRUCT_MSGHDR_MSG_ACCRIGHTS @@ -840,6 +843,9 @@ /* Define to 1 if `name' is a member of `struct option'. */ #undef HAVE_STRUCT_OPTION_NAME +/* Define to 1 if the system has the type `struct r_debug'. */ +#undef HAVE_STRUCT_R_DEBUG + /* Define to 1 if `sin6_scope_id' is a member of `struct sockaddr_in6'. */ #undef HAVE_STRUCT_SOCKADDR_IN6_SIN6_SCOPE_ID
1
0
0
0
Piotr Caban : msvcp: Add ostream::operator<<(unsigned short) implementation .
by Alexandre Julliard
24 Sep '13
24 Sep '13
Module: wine Branch: master Commit: 8e26d7aee8c17a9ea8400c11675ae4614d08b2d6 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=8e26d7aee8c17a9ea8400c116…
Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sat Sep 21 13:02:48 2013 +0200 msvcp: Add ostream::operator<<(unsigned short) implementation. --- dlls/msvcp100/ios.c | 26 ++++++++++++++++++++------ dlls/msvcp100/msvcp100.spec | 4 ++-- dlls/msvcp110/msvcp110.spec | 6 +++--- dlls/msvcp60/ios.c | 28 ++++++++++++++++++++++++++++ dlls/msvcp60/msvcp60.spec | 4 ++-- dlls/msvcp60/tests/ios.c | 28 ++++++++++++++++++++++++++++ dlls/msvcp70/msvcp70.spec | 4 ++-- dlls/msvcp71/ios.c | 26 ++++++++++++++++++++------ dlls/msvcp71/msvcp71.spec | 4 ++-- dlls/msvcp90/ios.c | 26 ++++++++++++++++++++------ dlls/msvcp90/msvcp90.spec | 5 +++-- dlls/msvcp90/tests/ios.c | 32 ++++++++++++++++++++++++++++++++ 12 files changed, 162 insertions(+), 31 deletions(-) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=8e26d7aee8c17a9ea8400…
1
0
0
0
Piotr Caban : msvcp: Fix default constructor closures arguments.
by Alexandre Julliard
24 Sep '13
24 Sep '13
Module: wine Branch: master Commit: f159b33da22045949db7b037134616dada128f54 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=f159b33da22045949db7b0371…
Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sat Sep 21 13:02:24 2013 +0200 msvcp: Fix default constructor closures arguments. --- dlls/msvcp60/ios.c | 36 +++++++++++++++--------------- dlls/msvcp60/msvcp60.spec | 24 ++++++++++---------- dlls/msvcp70/msvcp70.spec | 36 +++++++++++++++--------------- dlls/msvcp71/ios.c | 54 ++++++++++++++++++++++---------------------- dlls/msvcp71/msvcp71.spec | 36 +++++++++++++++--------------- dlls/msvcp90/ios.c | 54 ++++++++++++++++++++++---------------------- dlls/msvcp90/msvcp90.spec | 36 +++++++++++++++--------------- dlls/msvcp90/tests/ios.c | 9 +++---- 8 files changed, 142 insertions(+), 143 deletions(-) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=f159b33da22045949db7b…
1
0
0
0
← Newer
1
...
14
15
16
17
18
19
20
...
65
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
Results per page:
10
25
50
100
200