wine-commits October 2015

wine-commits@winehq.org

2 participants
749 discussions

Stefan Dösinger : d3d8: Accept D3DSWAPEFFECT_COPY_VSYNC.
by Alexandre Julliard 02 Oct '15

02 Oct '15

Module: wine Branch: master Commit: 6b8564d629551e2f5cfd5aeb013a271d76fd2c1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b8564d629551e2f5cfd5aeb0… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Sep 28 21:02:10 2015 +0200 d3d8: Accept D3DSWAPEFFECT_COPY_VSYNC. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> --- dlls/d3d8/device.c | 5 +++-- dlls/d3d8/tests/device.c | 48 ++++++++++++++++++++++++++++-------------------- 2 files changed, 31 insertions(+), 22 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index e899b34..c6e34ef 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -191,13 +191,14 @@ static void present_parameters_from_wined3d_swapchain_desc(D3DPRESENT_PARAMETERS static BOOL wined3d_swapchain_desc_from_present_parameters(struct wined3d_swapchain_desc *swapchain_desc, const D3DPRESENT_PARAMETERS *present_parameters) { - if (!present_parameters->SwapEffect || present_parameters->SwapEffect > D3DSWAPEFFECT_COPY) + if (!present_parameters->SwapEffect || present_parameters->SwapEffect > D3DSWAPEFFECT_COPY_VSYNC) { WARN("Invalid swap effect %u passed.\n", present_parameters->SwapEffect); return FALSE; } if (present_parameters->BackBufferCount > 3 - || (present_parameters->SwapEffect == D3DSWAPEFFECT_COPY + || ((present_parameters->SwapEffect == D3DSWAPEFFECT_COPY + || present_parameters->SwapEffect == D3DSWAPEFFECT_COPY_VSYNC) && present_parameters->BackBufferCount > 1)) { WARN("Invalid backbuffer count %u.\n", present_parameters->BackBufferCount); diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index cb7f5e1..ccc16c6 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -7309,36 +7309,44 @@ static void test_swapchain_parameters(void) tests[] = { /* Swap effect 0 is not allowed. */ - {TRUE, 1, 0, D3DERR_INVALIDCALL}, - {FALSE, 1, 0, D3DERR_INVALIDCALL}, + {TRUE, 1, 0, D3DERR_INVALIDCALL}, + {FALSE, 1, 0, D3DERR_INVALIDCALL}, /* All (non-ex) swap effects are allowed in * windowed and fullscreen mode. */ - {TRUE, 1, D3DSWAPEFFECT_DISCARD, D3D_OK}, - {TRUE, 1, D3DSWAPEFFECT_FLIP, D3D_OK}, - {FALSE, 1, D3DSWAPEFFECT_DISCARD, D3D_OK}, - {FALSE, 1, D3DSWAPEFFECT_FLIP, D3D_OK}, - {FALSE, 1, D3DSWAPEFFECT_COPY, D3D_OK}, + {TRUE, 1, D3DSWAPEFFECT_DISCARD, D3D_OK}, + {TRUE, 1, D3DSWAPEFFECT_FLIP, D3D_OK}, + {FALSE, 1, D3DSWAPEFFECT_DISCARD, D3D_OK}, + {FALSE, 1, D3DSWAPEFFECT_FLIP, D3D_OK}, + {FALSE, 1, D3DSWAPEFFECT_COPY, D3D_OK}, /* Only one backbuffer in copy mode. Reset allows it for * some reason. */ - {TRUE, 0, D3DSWAPEFFECT_COPY, D3D_OK}, - {TRUE, 1, D3DSWAPEFFECT_COPY, D3D_OK}, - {TRUE, 2, D3DSWAPEFFECT_COPY, D3DERR_INVALIDCALL}, - {FALSE, 2, D3DSWAPEFFECT_COPY, D3DERR_INVALIDCALL}, + {TRUE, 0, D3DSWAPEFFECT_COPY, D3D_OK}, + {TRUE, 1, D3DSWAPEFFECT_COPY, D3D_OK}, + {TRUE, 2, D3DSWAPEFFECT_COPY, D3DERR_INVALIDCALL}, + {FALSE, 2, D3DSWAPEFFECT_COPY, D3DERR_INVALIDCALL}, + {TRUE, 0, D3DSWAPEFFECT_COPY_VSYNC, D3D_OK}, + {TRUE, 1, D3DSWAPEFFECT_COPY_VSYNC, D3D_OK}, + {TRUE, 2, D3DSWAPEFFECT_COPY_VSYNC, D3DERR_INVALIDCALL}, + {FALSE, 2, D3DSWAPEFFECT_COPY_VSYNC, D3DERR_INVALIDCALL}, /* Ok with the others, in fullscreen and windowed mode. */ - {TRUE, 2, D3DSWAPEFFECT_DISCARD, D3D_OK}, - {TRUE, 2, D3DSWAPEFFECT_FLIP, D3D_OK}, - {FALSE, 2, D3DSWAPEFFECT_DISCARD, D3D_OK}, - {FALSE, 2, D3DSWAPEFFECT_FLIP, D3D_OK}, + {TRUE, 2, D3DSWAPEFFECT_DISCARD, D3D_OK}, + {TRUE, 2, D3DSWAPEFFECT_FLIP, D3D_OK}, + {FALSE, 2, D3DSWAPEFFECT_DISCARD, D3D_OK}, + {FALSE, 2, D3DSWAPEFFECT_FLIP, D3D_OK}, + + /* Invalid swapeffects. */ + {TRUE, 1, D3DSWAPEFFECT_COPY_VSYNC + 1, D3DERR_INVALIDCALL}, + {FALSE, 1, D3DSWAPEFFECT_COPY_VSYNC + 1, D3DERR_INVALIDCALL}, /* 3 is the highest allowed backbuffer count. */ - {TRUE, 3, D3DSWAPEFFECT_DISCARD, D3D_OK}, - {TRUE, 4, D3DSWAPEFFECT_DISCARD, D3DERR_INVALIDCALL}, - {TRUE, 4, D3DSWAPEFFECT_FLIP, D3DERR_INVALIDCALL}, - {FALSE, 4, D3DSWAPEFFECT_DISCARD, D3DERR_INVALIDCALL}, - {FALSE, 4, D3DSWAPEFFECT_FLIP, D3DERR_INVALIDCALL}, + {TRUE, 3, D3DSWAPEFFECT_DISCARD, D3D_OK}, + {TRUE, 4, D3DSWAPEFFECT_DISCARD, D3DERR_INVALIDCALL}, + {TRUE, 4, D3DSWAPEFFECT_FLIP, D3DERR_INVALIDCALL}, + {FALSE, 4, D3DSWAPEFFECT_DISCARD, D3DERR_INVALIDCALL}, + {FALSE, 4, D3DSWAPEFFECT_FLIP, D3DERR_INVALIDCALL}, }; window = CreateWindowA("static", "d3d8_test", WS_OVERLAPPEDWINDOW,

1 0

Nikolay Sivov : Update data tables to Unicode 8.0.0.
by Alexandre Julliard 02 Oct '15

02 Oct '15

Module: wine Branch: master Commit: e8c1cf44024d7dd2969bd3d46f9e71e8fe308059 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8c1cf44024d7dd2969bd3d46… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Oct 1 21:55:56 2015 +0300 Update data tables to Unicode 8.0.0. --- dlls/dwrite/analyzer.c | 6 + dlls/dwrite/bracket.c | 2 +- dlls/dwrite/linebreak.c | 128 +++-- dlls/dwrite/mirror.c | 2 +- dlls/dwrite/scripts.c | 1334 ++++++++++++++++++++++---------------------- dlls/dwrite/scripts.h | 256 ++++----- dlls/usp10/bracket.c | 2 +- dlls/usp10/indicsyllable.c | 274 +++++---- dlls/usp10/linebreak.c | 128 +++-- dlls/usp10/mirror.c | 2 +- dlls/usp10/shaping.c | 20 +- libs/wine/casemap.c | 134 ++++- libs/wine/wctype.c | 84 +-- loader/l_intl.nls | Bin 6118 -> 6406 bytes tools/make_unicode | 12 +- 15 files changed, 1249 insertions(+), 1135 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e8c1cf44024d7dd2969bd…

1 0

Aric Stewart : maintainers: Add HID section.
by Alexandre Julliard 02 Oct '15

02 Oct '15

Module: wine Branch: master Commit: fb6ad0fe2131b8b716147ac4e32ad7fcd5a4d32b URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb6ad0fe2131b8b716147ac4e… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Oct 1 13:30:51 2015 -0500 maintainers: Add HID section. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> --- MAINTAINERS | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS index 98622bd..c40bb68 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -56,6 +56,11 @@ DirectInput P: Andrew Eikum <aeikum(a)codeweavers.com> F: dlls/dinput/ +HID support +M: Aric Stewart <aric(a)codeweavers.com> +F: dlls/hid/ +F: dlls/hidclass.sys/ + HTML rendering (Gecko) M: Jacek Caban <jacek(a)codeweavers.com> F: dlls/mshtml/

1 0

Alexandre Julliard : patches: Add support for new bug statuses in regression page.
by Alexandre Julliard 02 Oct '15

02 Oct '15

Module: tools Branch: master Commit: e1b5ff7e49bff9e0746663a5dfc8cde2ca9a2aeb URL: http://source.winehq.org/git/tools.git/?a=commit;h=e1b5ff7e49bff9e0746663a5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 2 17:53:26 2015 +0900 patches: Add support for new bug statuses in regression page. --- patches/update-regressions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/patches/update-regressions b/patches/update-regressions index 0502878..65eb263 100755 --- a/patches/update-regressions +++ b/patches/update-regressions @@ -44,7 +44,7 @@ sub read_bugs() { my $csv = Text::CSV::Encoded->new({ binary => 1 }); - open LIST, "-|", "wget", "-qO-", "http://bugs.winehq.org/buglist.cgi?bug_status=UNCONFIRMED&bug_status=NEW&bu…" or die "cannot query bug list"; + open LIST, "-|", "wget", "-qO-", "http://bugs.winehq.org/buglist.cgi?bug_status=UNCONFIRMED&bug_status=NEW&bu…" or die "cannot query bug list"; <LIST>; # skip header line while (<LIST>)

1 0

Alexandre Julliard : Update bug lists for new bug statuses.
by Alexandre Julliard 02 Oct '15

02 Oct '15

Module: bugzilla Branch: master Commit: 9e9048fbdff7fa2ca5eb5f20ccd64c0fdc872109 URL: http://source.winehq.org/git/bugzilla.git/?a=commit;h=9e9048fbdff7fa2ca5eb5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 2 17:45:49 2015 +0900 Update bug lists for new bug statuses. --- template/en/default/global/sidebar.html.tmpl | 12 +++++------- template/en/default/index.html.tmpl | 6 +++--- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/template/en/default/global/sidebar.html.tmpl b/template/en/default/global/sidebar.html.tmpl index 54e9b79..d00bf4c 100644 --- a/template/en/default/global/sidebar.html.tmpl +++ b/template/en/default/global/sidebar.html.tmpl @@ -23,9 +23,9 @@ [% INCLUDE global/menu_start.html.tmpl bt = 'Task Lists' %] - <li><a href="buglist.cgi?bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&product=Wine&target_milestone=1.8.0&order=bugs.bug_severity">Wine 1.8</a></li> - <li><a href="buglist.cgi?bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&product=Wine&keywords=regression&columnlist=bug_severity,priority,bug_status,cf_regression_sha1sum,short_desc&keywords_type=anywords">Regressions</a></li> - <li><a href="buglist.cgi?bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&product=Wine&keywords=download&keywords_type=anywords">With download</a></li> + <li><a href="buglist.cgi?bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&bug_status=NEEDINFO&bug_status=STAGED&product=Wine&target_milestone=1.8.0&order=bugs.bug_severity">Wine 1.8</a></li> + <li><a href="buglist.cgi?bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&bug_status=NEEDINFO&bug_status=STAGED&product=Wine&keywords=regression&columnlist=bug_severity,priority,bug_status,cf_regression_sha1sum,short_desc&keywords_type=anywords">Regressions</a></li> + <li><a href="buglist.cgi?bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&bug_status=NEEDINFO&bug_status=STAGED&product=Wine&keywords=download&keywords_type=anywords">With download</a></li> [% INCLUDE global/menu_end.html.tmpl %] [% IF user.id %] @@ -90,11 +90,9 @@ bt = 'Bug Lists' %] <li><a href="buglist.cgi?bug_status=UNCONFIRMED&bug_status=NEW&bug_status=REOPENED&cmdtype=doit&order=Bug+Number" class=menuItem>Available</a></li> - <li><a href="buglist.cgi?bug_status=UNCONFIRMED" class=menuItem>Unconfirmed</a></li> - <li><a href="buglist.cgi?bug_status=NEW" class=menuItem>New</a></li> <li><a href="buglist.cgi?bug_status=ASSIGNED" class=menuItem>Assigned</a></li> + <li><a href="buglist.cgi?bug_status=NEEDINFO" class=menuItem>NeedInfo</a></li> + <li><a href="buglist.cgi?bug_status=STAGED" class=menuItem>Staged</a></li> <li><a href="buglist.cgi?bug_status=RESOLVED" class=menuItem>Resolved</a></li> - <li><a href="buglist.cgi?bug_status=VERIFIED" class=menuItem>Verified</a></li> - <li><a href="buglist.cgi?bug_status=CLOSED" class=menuItem>Closed</a></li> [% INCLUDE global/menu_end.html.tmpl %] diff --git a/template/en/default/index.html.tmpl b/template/en/default/index.html.tmpl index a099e31..5d5b1b8 100644 --- a/template/en/default/index.html.tmpl +++ b/template/en/default/index.html.tmpl @@ -150,15 +150,15 @@ YAHOO.util.Event.onDOMReady(onLoadActions); The bugs we are currently working on are organized into Task lists. <ol class="wine_index_list"> - <li><a href="//bugs.winehq.org/buglist.cgi?bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&product=Wine&target_milestone=1.8.0&order=bugs.bug_severity">Wine 1.8</a> + <li><a href="//bugs.winehq.org/buglist.cgi?bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&bug_status=NEEDINFO&bug_status=STAGED&product=Wine&target_milestone=1.8.0&order=bugs.bug_severity">Wine 1.8</a> These bugs are scheduled to be fixed before Wine 1.8 is released. </li> - <li><a href="//bugs.winehq.org/buglist.cgi?bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&product=Wine&columnlist=bug_severity,priority,bug_status,cf_regression_sha1sum,short_desc&keywords=regression&keywords_type=anywords">Regressions</a> + <li><a href="//bugs.winehq.org/buglist.cgi?bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&bug_status=NEEDINFO&bug_status=STAGED&product=Wine&columnlist=bug_severity,priority,bug_status,cf_regression_sha1sum,short_desc&keywords=regression&keywords_type=anywords">Regressions</a> Bugs introduced as result of a regression. </li> - <li><a href="//bugs.winehq.org/buglist.cgi?bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&product=Wine&keywords=download&keywords_type=anywords">With download</a> + <li><a href="//bugs.winehq.org/buglist.cgi?bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&bug_status=NEEDINFO&bug_status=STAGED&product=Wine&keywords=download&keywords_type=anywords">With download</a> Bugs in downloadable Applications. </li>

1 0

Aric Stewart : gdi32/tests: Expand tests skipped in Arabic to also skip in Hebrew.
by Alexandre Julliard 01 Oct '15

01 Oct '15

Module: wine Branch: master Commit: 781b88b7c586fc295780f0c8ad76bda0ffe96cd1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=781b88b7c586fc295780f0c8a… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Oct 1 06:59:26 2015 -0500 gdi32/tests: Expand tests skipped in Arabic to also skip in Hebrew. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> --- dlls/gdi32/tests/font.c | 34 ++++++++++++++++++++++------------ 1 file changed, 22 insertions(+), 12 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index e04ee1e..dff0eb6 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -753,6 +753,7 @@ static BOOL is_CJK(void) #define FH_SCALE 0x80000000 static void test_bitmap_font_metrics(void) { + static const WORD skip_rtl[] = {LANG_ARABIC, LANG_HEBREW, 0}; static const struct font_data { const char face_name[LF_FACESIZE]; @@ -760,19 +761,19 @@ static void test_bitmap_font_metrics(void) int ave_char_width, max_char_width, dpi; BYTE first_char, last_char, def_char, break_char; DWORD ansi_bitfield; - WORD skip_lang_id; + const WORD *skip_lang_id; int scaled_height; } fd[] = { - { "MS Sans Serif", FW_NORMAL, FH_SCALE | 6, 11, 2, 2, 0, 5, 11, 96, 0x20, 0xff, 0x81, 0x20, FS_LATIN1 | FS_LATIN2, LANG_ARABIC, 13 }, + { "MS Sans Serif", FW_NORMAL, FH_SCALE | 6, 11, 2, 2, 0, 5, 11, 96, 0x20, 0xff, 0x81, 0x20, FS_LATIN1 | FS_LATIN2, skip_rtl, 13 }, { "MS Sans Serif", FW_NORMAL, FH_SCALE | 6, 11, 2, 2, 0, 5, 11, 96, 0x20, 0xff, 0x7f, 0x20, FS_CYRILLIC, 0, 13 }, - { "MS Sans Serif", FW_NORMAL, FH_SCALE | 8, 11, 2, 2, 0, 5, 11, 96, 0x20, 0xff, 0x81, 0x20, FS_LATIN1 | FS_LATIN2, LANG_ARABIC, 13 }, + { "MS Sans Serif", FW_NORMAL, FH_SCALE | 8, 11, 2, 2, 0, 5, 11, 96, 0x20, 0xff, 0x81, 0x20, FS_LATIN1 | FS_LATIN2, skip_rtl, 13 }, { "MS Sans Serif", FW_NORMAL, FH_SCALE | 8, 11, 2, 2, 0, 5, 11, 96, 0x20, 0xff, 0x7f, 0x20, FS_CYRILLIC, 0, 13 }, - { "MS Sans Serif", FW_NORMAL, FH_SCALE | 10, 11, 2, 2, 0, 5, 11, 96, 0x20, 0xff, 0x81, 0x20, FS_LATIN1 | FS_LATIN2, LANG_ARABIC, 13 }, + { "MS Sans Serif", FW_NORMAL, FH_SCALE | 10, 11, 2, 2, 0, 5, 11, 96, 0x20, 0xff, 0x81, 0x20, FS_LATIN1 | FS_LATIN2, skip_rtl, 13 }, { "MS Sans Serif", FW_NORMAL, FH_SCALE | 10, 11, 2, 2, 0, 5, 11, 96, 0x20, 0xff, 0x7f, 0x20, FS_CYRILLIC, 0, 13 }, - { "MS Sans Serif", FW_NORMAL, FH_SCALE | 14, 11, 2, 2, 0, 5, 11, 96, 0x20, 0xff, 0x81, 0x20, FS_LATIN1 | FS_LATIN2, LANG_ARABIC, 13 }, + { "MS Sans Serif", FW_NORMAL, FH_SCALE | 14, 11, 2, 2, 0, 5, 11, 96, 0x20, 0xff, 0x81, 0x20, FS_LATIN1 | FS_LATIN2, skip_rtl, 13 }, { "MS Sans Serif", FW_NORMAL, FH_SCALE | 14, 11, 2, 2, 0, 5, 11, 96, 0x20, 0xff, 0x7f, 0x20, FS_CYRILLIC, 0, 13 }, - { "MS Sans Serif", FW_NORMAL, FH_SCALE | 18, 13, 3, 3, 0, 7, 14, 96, 0x20, 0xff, 0x81, 0x20, FS_LATIN1 | FS_LATIN2, LANG_ARABIC, 16 }, + { "MS Sans Serif", FW_NORMAL, FH_SCALE | 18, 13, 3, 3, 0, 7, 14, 96, 0x20, 0xff, 0x81, 0x20, FS_LATIN1 | FS_LATIN2, skip_rtl, 16 }, { "MS Sans Serif", FW_NORMAL, FH_SCALE | 18, 13, 3, 3, 0, 7, 14, 96, 0x20, 0xff, 0x7f, 0x20, FS_CYRILLIC, 0, 16 }, { "MS Sans Serif", FW_NORMAL, FH_SCALE | 6, 13, 3, 3, 0, 7, 14, 120, 0x20, 0xff, 0x81, 0x20, FS_LATIN1 | FS_LATIN2, 0, 16 }, @@ -864,22 +865,22 @@ static void test_bitmap_font_metrics(void) { "Small Fonts", FW_NORMAL, 3, 2, 1, 0, 0, 1, 2, 96, 0x20, 0xff, 0x80, 0x20, FS_LATIN1 }, { "Small Fonts", FW_NORMAL, 3, 2, 1, 0, 0, 1, 8, 96, 0x20, 0xff, 0x80, 0x20, FS_LATIN2 | FS_CYRILLIC }, { "Small Fonts", FW_NORMAL, 3, 2, 1, 0, 0, 2, 4, 96, 0x20, 0xff, 0x80, 0x20, FS_JISJAPAN }, - { "Small Fonts", FW_NORMAL, 5, 4, 1, 1, 0, 3, 4, 96, 0x20, 0xff, 0x80, 0x20, FS_LATIN1, LANG_ARABIC }, + { "Small Fonts", FW_NORMAL, 5, 4, 1, 1, 0, 3, 4, 96, 0x20, 0xff, 0x80, 0x20, FS_LATIN1, skip_rtl}, { "Small Fonts", FW_NORMAL, 5, 4, 1, 1, 0, 2, 8, 96, 0x20, 0xff, 0x80, 0x20, FS_LATIN2 | FS_CYRILLIC }, { "Small Fonts", FW_NORMAL, 5, 4, 1, 0, 0, 3, 6, 96, 0x20, 0xff, 0x80, 0x20, FS_JISJAPAN }, - { "Small Fonts", FW_NORMAL, 6, 5, 1, 1, 0, 3, 13, 96, 0x20, 0xff, 0x80, 0x20, FS_LATIN1, LANG_ARABIC }, + { "Small Fonts", FW_NORMAL, 6, 5, 1, 1, 0, 3, 13, 96, 0x20, 0xff, 0x80, 0x20, FS_LATIN1, skip_rtl}, { "Small Fonts", FW_NORMAL, 6, 5, 1, 1, 0, 3, 8, 96, 0x20, 0xff, 0x80, 0x20, FS_LATIN2 | FS_CYRILLIC }, { "Small Fonts", FW_NORMAL, 6, 5, 1, 1, 0, 3, 8, 96, 0x00, 0xff, 0x60, 0x00, FS_ARABIC }, { "Small Fonts", FW_NORMAL, 6, 5, 1, 0, 0, 4, 8, 96, 0x20, 0xff, 0x80, 0x20, FS_JISJAPAN }, - { "Small Fonts", FW_NORMAL, 8, 7, 1, 1, 0, 4, 7, 96, 0x20, 0xff, 0x80, 0x20, FS_LATIN1, LANG_ARABIC }, + { "Small Fonts", FW_NORMAL, 8, 7, 1, 1, 0, 4, 7, 96, 0x20, 0xff, 0x80, 0x20, FS_LATIN1, skip_rtl}, { "Small Fonts", FW_NORMAL, 8, 7, 1, 1, 0, 4, 8, 96, 0x20, 0xff, 0x80, 0x20, FS_LATIN2 | FS_CYRILLIC }, { "Small Fonts", FW_NORMAL, 8, 7, 1, 1, 0, 4, 8, 96, 0x00, 0xff, 0x60, 0x00, FS_ARABIC }, { "Small Fonts", FW_NORMAL, 8, 7, 1, 0, 0, 5, 10, 96, 0x20, 0xff, 0x80, 0x20, FS_JISJAPAN }, - { "Small Fonts", FW_NORMAL, 10, 8, 2, 2, 0, 4, 8, 96, 0x20, 0xff, 0x80, 0x20, FS_LATIN1 | FS_LATIN2, LANG_ARABIC }, + { "Small Fonts", FW_NORMAL, 10, 8, 2, 2, 0, 4, 8, 96, 0x20, 0xff, 0x80, 0x20, FS_LATIN1 | FS_LATIN2, skip_rtl}, { "Small Fonts", FW_NORMAL, 10, 8, 2, 2, 0, 5, 8, 96, 0x20, 0xff, 0x80, 0x20, FS_CYRILLIC }, { "Small Fonts", FW_NORMAL, 10, 8, 2, 2, 0, 4, 9, 96, 0x00, 0xff, 0x60, 0x00, FS_ARABIC }, { "Small Fonts", FW_NORMAL, 10, 8, 2, 0, 0, 6, 12, 96, 0x20, 0xff, 0x80, 0x20, FS_JISJAPAN }, - { "Small Fonts", FW_NORMAL, 11, 9, 2, 2, 0, 5, 9, 96, 0x20, 0xff, 0x80, 0x20, FS_LATIN1 | FS_LATIN2 | FS_CYRILLIC, LANG_ARABIC }, + { "Small Fonts", FW_NORMAL, 11, 9, 2, 2, 0, 5, 9, 96, 0x20, 0xff, 0x80, 0x20, FS_LATIN1 | FS_LATIN2 | FS_CYRILLIC, skip_rtl}, { "Small Fonts", FW_NORMAL, 11, 9, 2, 2, 0, 4, 10, 96, 0x00, 0xff, 0x60, 0x00, FS_ARABIC }, { "Small Fonts", FW_NORMAL, 11, 9, 2, 0, 0, 7, 14, 96, 0x20, 0xff, 0x80, 0x20, FS_JISJAPAN }, @@ -1021,8 +1022,17 @@ static void test_bitmap_font_metrics(void) if(fd[i].dpi == tm.tmDigitizedAspectX) { + int skipme = 0; trace("matched %s, height %d charset %x dpi %d\n", lf.lfFaceName, lf.lfHeight, lf.lfCharSet, fd[i].dpi); - if (fd[i].skip_lang_id == 0 || system_lang_id != fd[i].skip_lang_id) + if (fd[i].skip_lang_id) + { + int si = 0; + skipme = 0; + while(!skipme && fd[i].skip_lang_id[si]) + if (fd[i].skip_lang_id[si++] == system_lang_id) + skipme = 1; + } + if (!skipme) { ok(tm.tmWeight == fd[i].weight, "%s(%d): tm.tmWeight %d != %d\n", fd[i].face_name, height, tm.tmWeight, fd[i].weight); if (fd[i].height & FH_SCALE)

1 0

Charles Davis : ntdll: Use an __ms_va_list in sscanf (Clang).
by Alexandre Julliard 01 Oct '15

01 Oct '15

Module: wine Branch: master Commit: 476d97b0eea4ad231e4341add5fcc4b419b6a77d URL: http://source.winehq.org/git/wine.git/?a=commit;h=476d97b0eea4ad231e4341add… Author: Charles Davis <cdavis5x(a)gmail.com> Date: Sat Sep 19 13:26:44 2015 -0600 ntdll: Use an __ms_va_list in sscanf (Clang). Signed-off-by: Charles Davis <cdavis5x(a)gmail.com> --- dlls/ntdll/string.c | 594 +++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 590 insertions(+), 4 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=476d97b0eea4ad231e434…

1 0

Thomas Faller : winex11.drv: Fix use of uninitialized memory.
by Alexandre Julliard 01 Oct '15

01 Oct '15

Module: wine Branch: master Commit: 587733855b55725d637e044ad9ac0232a79de919 URL: http://source.winehq.org/git/wine.git/?a=commit;h=587733855b55725d637e044ad… Author: Thomas Faller <tfaller1(a)gmx.de> Date: Thu Sep 24 23:44:17 2015 +0200 winex11.drv: Fix use of uninitialized memory. --- dlls/winex11.drv/clipboard.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index 6c6b3b9..842ebfe 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -367,8 +367,19 @@ static void intern_atoms(void) i = 0; LIST_FOR_EACH_ENTRY( format, &format_list, WINE_CLIPFORMAT, entry ) if (!format->drvData) { - GetClipboardFormatNameW( format->wFormatID, buffer, 256 ); - len = WideCharToMultiByte(CP_UNIXCP, 0, buffer, -1, NULL, 0, NULL, NULL); + if (GetClipboardFormatNameW(format->wFormatID, buffer, 256) > 0) + { + /* use defined format name */ + len = WideCharToMultiByte(CP_UNIXCP, 0, buffer, -1, NULL, 0, NULL, NULL); + } + else + { + /* create a name in the same way as ntdll/atom.c:integral_atom_name + * which is normally used by GetClipboardFormatNameW + */ + static const WCHAR fmt[] = {'#','%','u',0}; + len = sprintfW(buffer, fmt, format->wFormatID) + 1; + } names[i] = HeapAlloc(GetProcessHeap(), 0, len); WideCharToMultiByte(CP_UNIXCP, 0, buffer, -1, names[i++], len, NULL, NULL); }

1 0

Andrew Eikum : maintainers: Add MAINTAINERS file.
by Alexandre Julliard 01 Oct '15

01 Oct '15

Module: wine Branch: master Commit: 93a685ad23eb518b0bfd52a8c44837e9b77bc1b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=93a685ad23eb518b0bfd52a8c… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Sep 23 10:25:50 2015 -0500 maintainers: Add MAINTAINERS file. --- MAINTAINERS | 104 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 104 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS new file mode 100644 index 0000000..98622bd --- /dev/null +++ b/MAINTAINERS @@ -0,0 +1,104 @@ + + + List of Wine subsection maintainers + +When submitting patches to Wine, the guidelines at +<http://wiki.winehq.org/SubmittingPatches> should be followed. This file +contains a list of maintainers for subsections of Wine. When submitting +patches, you may want to CC relevant people from this list. If you have +questions about your work in an area of Wine, you may find a list of +knowledgeable people here. + +Many areas of Wine don't have a specific maintainer, although there may +be people with knowledge of those areas. If an area is not listed here +at all, you can use the git log to find developers working in that area +recently. Or, you can send a mail to wine-devel, but be aware that there +may simply be no one knowledgeable about that subject on the list. + +This file uses a similar format to the Linux kernel MAINTAINERS file. +Descriptions of section entries used here: + + M: Primary maintainer. CC patches to: FullName <address@domain> + P: Other knowledgeable person. FullName <address@domain> + F: Files and directories with wildcard patterns. + One pattern per line. Multiple F: lines acceptable. + +Maintainers List + + ----------------------------------- + +Audio I/O +M: Andrew Eikum <aeikum(a)codeweavers.com> +F: dlls/dsound/ +F: dlls/dswave/ +F: dlls/mmdevapi/ +F: dlls/winealsa.drv/ +F: dlls/winecoreaudio.drv/ +F: dlls/wineoss.drv/ +F: dlls/winmm/ +F: dlls/x3daudio*/ +F: dlls/xapofx*/ +F: dlls/xaudio*/ + +Direct2D +M: Henri Verbeet <hverbeet(a)codeweavers.com> +F: dlls/d2d*/ + +Direct3D +M: Henri Verbeet <hverbeet(a)codeweavers.com> +P: Stefan Dösinger <stefan(a)codeweavers.com> +P: Józef Kucia <jkucia(a)codeweavers.com> +P: Matteo Bruni <mbruni(a)codeweavers.com> +F: dlls/d3d*/ +F: dlls/wined3d/ + +DirectInput +P: Andrew Eikum <aeikum(a)codeweavers.com> +F: dlls/dinput/ + +HTML rendering (Gecko) +M: Jacek Caban <jacek(a)codeweavers.com> +F: dlls/mshtml/ +F: dlls/ieframe/ +F: dlls/shdocvw/ + +Input methods +M: Aric Stewart <aric(a)codeweavers.com> +F: dlls/imm32/ + +JavaScript +M: Jacek Caban <jacek(a)codeweavers.com> +F: dlls/jscript/ + +Mac OS X graphics driver +M: Ken Thomases <ken(a)codeweavers.com> +F: dlls/winemac.drv/ + +Media format conversion +M: Andrew Eikum <aeikum(a)codeweavers.com> +F: dlls/msacm32/ +F: dlls/*.acm/ + +Microsoft C Runtime +M: Piotr Caban <piotr(a)codeweavers.com> +F: dlls/msvc*/ + +MSI installers +M: Hans Leidekker <hans(a)codeweavers.com> +F: dlls/msi/ + +OLE Typelibs +P: Andrew Eikum <aeikum(a)codeweavers.com> +F: dlls/oleaut32/typelib.c + +Wine server, IPC +M: Alexandre Julliard <julliard(a)winehq.org> +F: server/ + +VB Script +M: Jacek Caban <jacek(a)codeweavers.com> +F: dlls/vbscript/ + +XML parsing +M: Nikolay Sivov <nsivov(a)codeweavers.com> +F: dlls/msxml*/

1 0

Dmitry Timoshkov : ntdll: Print process id in the loader log if requested.
by Alexandre Julliard 01 Oct '15

01 Oct '15

Module: wine Branch: master Commit: 7d2cd2fe61d0425537ff0366a5fffed516623efc URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d2cd2fe61d0425537ff0366a… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Sep 23 16:07:49 2015 +0800 ntdll: Print process id in the loader log if requested. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/ntdll/loader.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 8a43310..831f049 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -49,6 +49,7 @@ WINE_DECLARE_DEBUG_CHANNEL(relay); WINE_DECLARE_DEBUG_CHANNEL(snoop); WINE_DECLARE_DEBUG_CHANNEL(loaddll); WINE_DECLARE_DEBUG_CHANNEL(imports); +WINE_DECLARE_DEBUG_CHANNEL(pid); #ifdef _WIN64 #define DEFAULT_SECURITY_COOKIE_64 (((ULONGLONG)0x00002b99 << 32) | 0x2ddfa232) @@ -1036,8 +1037,12 @@ static void call_tls_callbacks( HMODULE module, UINT reason ) for (callback = (const PIMAGE_TLS_CALLBACK *)dir->AddressOfCallBacks; *callback; callback++) { if (TRACE_ON(relay)) + { + if (TRACE_ON(pid)) + DPRINTF( "%04x:", GetCurrentProcessId() ); DPRINTF("%04x:Call TLS callback (proc=%p,module=%p,reason=%s,reserved=0)\n", GetCurrentThreadId(), *callback, module, reason_names[reason] ); + } __TRY { call_dll_entry_point( (DLLENTRYPROC)*callback, module, reason, NULL ); @@ -1045,14 +1050,22 @@ static void call_tls_callbacks( HMODULE module, UINT reason ) __EXCEPT_ALL { if (TRACE_ON(relay)) + { + if (TRACE_ON(pid)) + DPRINTF( "%04x:", GetCurrentProcessId() ); DPRINTF("%04x:exception in TLS callback (proc=%p,module=%p,reason=%s,reserved=0)\n", GetCurrentThreadId(), callback, module, reason_names[reason] ); + } return; } __ENDTRY if (TRACE_ON(relay)) + { + if (TRACE_ON(pid)) + DPRINTF( "%04x:", GetCurrentProcessId() ); DPRINTF("%04x:Ret TLS callback (proc=%p,module=%p,reason=%s,reserved=0)\n", GetCurrentThreadId(), *callback, module, reason_names[reason] ); + } } } @@ -1079,6 +1092,8 @@ static NTSTATUS MODULE_InitDLL( WINE_MODREF *wm, UINT reason, LPVOID lpReserved size_t len = min( wm->ldr.BaseDllName.Length, sizeof(mod_name)-sizeof(WCHAR) ); memcpy( mod_name, wm->ldr.BaseDllName.Buffer, len ); mod_name[len / sizeof(WCHAR)] = 0; + if (TRACE_ON(pid)) + DPRINTF( "%04x:", GetCurrentProcessId() ); DPRINTF("%04x:Call PE DLL (proc=%p,module=%p %s,reason=%s,res=%p)\n", GetCurrentThreadId(), entry, module, debugstr_w(mod_name), reason_names[reason], lpReserved ); @@ -1095,8 +1110,12 @@ static NTSTATUS MODULE_InitDLL( WINE_MODREF *wm, UINT reason, LPVOID lpReserved __EXCEPT_ALL { if (TRACE_ON(relay)) + { + if (TRACE_ON(pid)) + DPRINTF( "%04x:", GetCurrentProcessId() ); DPRINTF("%04x:exception in PE entry point (proc=%p,module=%p,reason=%s,res=%p)\n", GetCurrentThreadId(), entry, module, reason_names[reason], lpReserved ); + } status = GetExceptionCode(); } __ENDTRY @@ -1105,9 +1124,13 @@ static NTSTATUS MODULE_InitDLL( WINE_MODREF *wm, UINT reason, LPVOID lpReserved to the dll. We cannot assume that this module has not been deleted. */ if (TRACE_ON(relay)) + { + if (TRACE_ON(pid)) + DPRINTF( "%04x:", GetCurrentProcessId() ); DPRINTF("%04x:Ret PE DLL (proc=%p,module=%p %s,reason=%s,res=%p) retval=%x\n", GetCurrentThreadId(), entry, module, debugstr_w(mod_name), reason_names[reason], lpReserved, retv ); + } else TRACE("(%p,%s,%p) - RETURN %d\n", module, reason_names[reason], lpReserved, retv ); return status;

1 0

← Newer
1
...
68
69
70
71
72
73
74
75
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2015