September 2013 - Wine-commits

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

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

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

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

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

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

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

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

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

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