January 2017 - Wine-commits

André Hentschel : dwrite: Remove dead initialization (clang).
by Alexandre Julliard 31 Jan '17

31 Jan '17

Module: wine Branch: master Commit: e07e8293b96298832b1e530d978cf1c2fdf70f7a URL: http://source.winehq.org/git/wine.git/?a=commit;h=e07e8293b96298832b1e530d9… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Jan 30 23:11:06 2017 +0100 dwrite: Remove dead initialization (clang). Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/layout.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 014fba4..3d931cb 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -883,7 +883,7 @@ static HRESULT layout_compute_runs(struct dwrite_textlayout *layout) run->run.fontEmSize = range->fontsize * scale; if (mapped_length < length) { - struct regular_layout_run *nextrun = &r->u.regular; + struct regular_layout_run *nextrun; struct layout_run *nextr; /* keep mapped part for current run, add another run for the rest */

1 0

André Hentschel : msxml3: Remove dead initialization (clang).
by Alexandre Julliard 31 Jan '17

31 Jan '17

Module: wine Branch: master Commit: 1242648faefa04d6f9b18ecb917267cea9b036e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1242648faefa04d6f9b18ecb9… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Jan 30 23:11:06 2017 +0100 msxml3: Remove dead initialization (clang). Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/node.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index d39ed57..ccecaa8 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -829,7 +829,7 @@ static xmlChar* do_get_text(xmlNodePtr node, BOOL trim, DWORD *first, DWORD *las case XML_DOCUMENT_FRAG_NODE: if (trim && !preserving) { - xmlChar* ret = str; + xmlChar* ret; int len; if (!str)

1 0

André Hentschel : server: Remove dead assignment ( clang).
by Alexandre Julliard 31 Jan '17

31 Jan '17

Module: wine Branch: master Commit: 6b85b31b00b06cb810d6dc333160221fbe1940e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b85b31b00b06cb810d6dc333… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Jan 30 23:11:07 2017 +0100 server: Remove dead assignment (clang). Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/token.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/server/token.c b/server/token.c index ca12813..8c5e836 100644 --- a/server/token.c +++ b/server/token.c @@ -1080,8 +1080,7 @@ DECL_HANDLER(adjust_token_privileges) if (req->disable_all) token_disable_privileges( token ); else - modified_priv_count = token_adjust_privileges( token, privs, - priv_count, modified_privs, modified_priv_count ); + token_adjust_privileges( token, privs, priv_count, modified_privs, modified_priv_count ); release_object( token ); }

1 0

Bruno Jesus : patches: Allow sorting the patches list by clicking table headers.
by Alexandre Julliard 31 Jan '17

31 Jan '17

Module: tools Branch: master Commit: f4dc8670692a4257a6da9f2607e1573cc0ff3870 URL: http://source.winehq.org/git/tools.git/?a=commit;h=f4dc8670692a4257a6da9f26… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sun Jan 29 00:11:56 2017 -0200 patches: Allow sorting the patches list by clicking table headers. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- patches/update | 120 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 117 insertions(+), 3 deletions(-) diff --git a/patches/update b/patches/update index 0d991dc..ddf1396 100755 --- a/patches/update +++ b/patches/update @@ -122,14 +122,14 @@ print INDEX "<div id=\"tabs\"><ul>", "<li><a href=\"//forum.winehq.org/\">Forums</a></li></ul></div>\n"; print INDEX "<div id=\"logo_blurb\">Wine source repository – Patch status</div>\n"; print INDEX "<div id=\"main_content\"><div id=\"content\"><div class=\"main\">\n"; -print INDEX "<table class=\"main\"><tr><th class=\"id\">ID</th>", +print INDEX "<table id=\"main_table\" class=\"main\"><thead><tr><th class=\"id\">ID</th>", "<th class=\"status\">Status</th>", "<th class=\"author\">Author</th>", "<th class=\"subject\">Subject</th>", "<th class=\"author\">Reviewer</th>", "<th class=\"status\">Sign</th>", "<th class=\"status\">Testbot</th>", - "<th class=\"status\">Job ID</th></tr>\n"; + "<th class=\"status\">Job ID</th></tr></thead><tbody>\n"; opendir DIR, $dir; foreach my $file (readdir DIR) @@ -262,7 +262,7 @@ foreach my $file (sort { $patches{$b}->{"order"} <=> $patches{$a}->{"order"} } k } $row++; } -print INDEX "</table></div>\n"; +print INDEX "</tbody></table></div>\n"; $row = 0; print INDEX "<div class=\"legend\"><h2 id=\"legend\">Legend</h2>\n"; @@ -274,6 +274,120 @@ foreach my $status (@legend) $row++; } print INDEX "</table></div></div></div>\n"; + +my $sorter = <<END; +<script> + var table = document.getElementById('main_table'), + thead = table.children[0], + tbody = table.children[1], + ths = thead.getElementsByTagName('th'), + trs = tbody.getElementsByTagName('tr'), + i, do_reverse, th, sort_func; + + for (i = 0; i < ths.length; i++) + ths[i].onclick = sort_table; + + function sort_table(event) + { + th = event.target; + var sort_type = text_content(th), clone_trs = [], sign_trs = {}, tr, j, k; + + if (sort_type == 'ID' || sort_type == 'Job ID') + sort_func = int_sort; + else if(sort_type == 'Sign') + sort_func = sign_sort; + else + sort_func = text_sort; + + if (th.getAttribute('data-order')==1) + do_reverse = 0; + else + do_reverse = 1; + th.setAttribute('data-order', do_reverse) + + for (j = 0, i = trs.length - 1; i != -1; i--) + { + tr = tbody.removeChild(trs[i]) + if (!tr.getAttribute('id')) + clone_trs[j++] = tr; + else + sign_trs[text_content(trs[i - 1].children[0])] = tr; /* based on the patch ID */ + } + clone_trs.sort(sorter); + + for (i = 0; i < clone_trs.length; i++) + { + odd_even(clone_trs[i], i & 1); + tbody.appendChild(clone_trs[i]); + j = text_content(clone_trs[i].children[0]); + if (sign_trs[j]) + tbody.appendChild(sign_trs[j]); + } + } + + function odd_even(tr, i) + { + var cl = tr.getAttribute('class').replace(/odd|even/gi,''); + tr.setAttribute('class', cl + (i & 1 ? ' odd ' : ' even ')); + } + + function sorter(a, b) + { + var r = sort_func(a.children[th.cellIndex], b.children[th.cellIndex]); + + if (do_reverse) + { + if (r == 1) r = -1; + else if(r == -1) r = 1; + } + return r; + } + + function text_content(ele) + { + if (typeof ele.textContent == 'string') + return ele.textContent; + else if (typeof ele.innerText == 'string') + return ele.innerText; + return ele.innerHTML; + } + + function int_sort(a, b, r) + { + var ret, t1 = text_content(a), t2 = text_content(b); + if (!r) r = 1; //when R is set reverse_order is ignored + + if (t1.length == 0 && t2.length == 0) return 0; + if (t1.length && !t2.length) return -1; + if (!t1.length && t2.length) return 1; + return parseInt(t1) - parseInt(t2) < 0 ? -1 * r : 1 * r; + } + + function text_sort(a, b) + { + var t1 = text_content(a), t2 = text_content(b); + + //if equal sort by patch id + return t1 === t2 ? int_sort(a.parentElement.children[0], b.parentElement.children[0], 2) : t1 > t2 ? -1 : 1; + } + + function sign_sort(a, b) + { + var ret, t1 = text_content(a), t2 = text_content(b); + + if (t1 == 'X') return -1; + if (t2 == 'X') return 1; + ret = t1.length - t2.length; + + //if equal sort by patch id + return ret ? ret : int_sort(a.parentElement.children[0], b.parentElement.children[0], 2); + } + +</script> +END + +print INDEX $sorter; + print INDEX end_html; close INDEX;

1 0

Alexandre Julliard : update-winehq: Get the download URL from the ANNOUNCE file.
by Alexandre Julliard 31 Jan '17

31 Jan '17

Module: tools Branch: master Commit: 0b92f47d3ca1b10eb1f085198642965506c6c660 URL: http://source.winehq.org/git/tools.git/?a=commit;h=0b92f47d3ca1b10eb1f08519… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 31 14:45:08 2017 +0100 update-winehq: Get the download URL from the ANNOUNCE file. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- update-winehq | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/update-winehq b/update-winehq index efcf1d5..4ba11d4 100755 --- a/update-winehq +++ b/update-winehq @@ -36,6 +36,7 @@ open ANNOUNCE, $ARGV[1] || "ANNOUNCE" or die "cannot open ANNOUNCE"; my $whats_new = 0; my $release_notes = 0; my $first = 1; +my $url; push @text, "<body>\n<p>"; @@ -90,9 +91,17 @@ while (<ANNOUNCE>) } } -(my $dir = $rel) =~ s/^([0-9]+\.[0-9]+).*/$1/; +while (<ANNOUNCE>) +{ + if (/https?:(\/\/dl.winehq.org\/wine\/source\/.*\/wine-$rel\..*)$/) + { + $url = $1; + last; + } +} +die "Download URL not found" unless $url; -push @text, "<p>The source is <a href=\"//dl.winehq.org/wine/source/$dir/wine-$rel.tar.bz2\">available now</a>.\n"; +push @text, "<p>The source is <a href=\"$url\">available now</a>.\n"; push @text, "Binary packages are in the process of being built, and will appear soon at their respective <a href=\"{\$root}/download\">download locations</a>.\n"; push @text, "</p></body></news>\n"; close ANNOUNCE;

1 0

André Hentschel : winscard: Fix some spec file entries.
by Alexandre Julliard 30 Jan '17

30 Jan '17

Module: wine Branch: master Commit: 4df855d1312b08d9e127e394b7c1105ca2839743 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4df855d1312b08d9e127e394b… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Jan 29 21:59:03 2017 +0100 winscard: Fix some spec file entries. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winscard/winscard.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/winscard/winscard.spec b/dlls/winscard/winscard.spec index 5fd8903..d2ae62a 100644 --- a/dlls/winscard/winscard.spec +++ b/dlls/winscard/winscard.spec @@ -34,7 +34,7 @@ @ stub SCardIntroduceReaderGroupW @ stub SCardIntroduceReaderW @ stdcall SCardIsValidContext(long) -@ stdcall SCardListCardsA(long ptr ptr long str long) +@ stdcall SCardListCardsA(long ptr ptr long str ptr) @ stub SCardListCardsW @ stub SCardListInterfacesA @ stub SCardListInterfacesW @@ -55,8 +55,8 @@ @ stub SCardSetCardTypeProviderNameA @ stub SCardSetCardTypeProviderNameW @ stub SCardState -@ stdcall SCardStatusA (long str long long long ptr long ) -@ stdcall SCardStatusW (long wstr long long long ptr long ) +@ stdcall SCardStatusA(long str ptr ptr ptr ptr ptr) +@ stdcall SCardStatusW(long wstr ptr ptr ptr ptr ptr) @ stub SCardTransmit @ extern g_rgSCardRawPci @ extern g_rgSCardT0Pci

1 0

André Hentschel : avifil32: Fix AVIStreamReadFormat spec file entry.
by Alexandre Julliard 30 Jan '17

30 Jan '17

Module: wine Branch: master Commit: 349a80e076549b480b4cdb20b42737e00f3ad941 URL: http://source.winehq.org/git/wine.git/?a=commit;h=349a80e076549b480b4cdb20b… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Jan 29 21:59:13 2017 +0100 avifil32: Fix AVIStreamReadFormat spec file entry. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/avifil32/avifil32.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/avifil32/avifil32.spec b/dlls/avifil32/avifil32.spec index 9eae749..897f464 100644 --- a/dlls/avifil32/avifil32.spec +++ b/dlls/avifil32/avifil32.spec @@ -49,7 +49,7 @@ @ stdcall AVIStreamOpenFromFileW(ptr wstr long long long ptr) @ stdcall AVIStreamRead(ptr long long ptr long ptr ptr) @ stdcall AVIStreamReadData(ptr long ptr ptr) -@ stdcall AVIStreamReadFormat(ptr long ptr long) +@ stdcall AVIStreamReadFormat(ptr long ptr ptr) @ stdcall AVIStreamRelease(ptr) @ stdcall AVIStreamSampleToTime(ptr long) @ stdcall AVIStreamSetFormat(ptr long ptr long)

1 0

André Hentschel : secur32: Fix LsaConnectUntrusted spec file entry.
by Alexandre Julliard 30 Jan '17

30 Jan '17

Module: wine Branch: master Commit: 42817e244c206aed9a2eec5b9dc3a1af6719a4f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=42817e244c206aed9a2eec5b9… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Jan 29 21:59:15 2017 +0100 secur32: Fix LsaConnectUntrusted spec file entry. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/secur32.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/secur32/secur32.spec b/dlls/secur32/secur32.spec index 0d6895a..ee872c5 100644 --- a/dlls/secur32/secur32.spec +++ b/dlls/secur32/secur32.spec @@ -33,7 +33,7 @@ @ stdcall InitializeSecurityContextA(ptr ptr str long long long ptr long ptr ptr ptr ptr) @ stdcall InitializeSecurityContextW(ptr ptr wstr long long long ptr long ptr ptr ptr ptr) @ stdcall LsaCallAuthenticationPackage(long long ptr long ptr ptr ptr) -@ stdcall LsaConnectUntrusted(long) +@ stdcall LsaConnectUntrusted(ptr) @ stdcall LsaDeregisterLogonProcess(long) @ stdcall LsaEnumerateLogonSessions(ptr ptr) @ stdcall LsaFreeReturnBuffer(ptr)

1 0

André Hentschel : mapi32: Fix some spec file entries.
by Alexandre Julliard 30 Jan '17

30 Jan '17

Module: wine Branch: master Commit: 6e8553ca28b970f3e2b810b8574400c0a4e8afb0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e8553ca28b970f3e2b810b85… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Jan 29 21:58:59 2017 +0100 mapi32: Fix some spec file entries. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mapi32/mapi32.spec | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/mapi32/mapi32.spec b/dlls/mapi32/mapi32.spec index 560784c..0b5acbb 100644 --- a/dlls/mapi32/mapi32.spec +++ b/dlls/mapi32/mapi32.spec @@ -87,8 +87,8 @@ 144 stub HrDecomposeEID(a)28 145 stub HrComposeMsgID(a)24 146 stub HrDecomposeMsgID(a)24 -147 stdcall OpenStreamOnFile(a)24(ptr ptr ptr ptr ptr ptr) OpenStreamOnFile -148 stdcall OpenStreamOnFile(ptr ptr ptr ptr ptr ptr) +147 stdcall OpenStreamOnFile(a)24(ptr ptr long ptr ptr ptr) OpenStreamOnFile +148 stdcall OpenStreamOnFile(ptr ptr long ptr ptr ptr) 149 stub OpenTnefStream(a)28 150 stub OpenTnefStream 151 stub OpenTnefStreamEx(a)32 @@ -145,17 +145,17 @@ 205 stub FDecodeID(a)12 206 stub CchOfEncoding(a)4 207 stdcall CbOfEncoded(a)4(ptr) CbOfEncoded -208 stdcall MAPISendDocuments(ptr str str str long) -209 stdcall MAPILogon(ptr str str long long ptr) -210 stdcall MAPILogoff(ptr ptr long long) -211 stdcall MAPISendMail(ptr ptr ptr long long) -212 stdcall MAPISaveMail(ptr ptr ptr long long str) -213 stdcall MAPIReadMail(ptr ptr str long long ptr) -214 stdcall MAPIFindNext(ptr ptr str str long long ptr) -215 stdcall MAPIDeleteMail(ptr ptr str long long) -217 stdcall MAPIAddress(ptr ptr str long str long ptr long long ptr ptr) -218 stdcall MAPIDetails(ptr ptr ptr long long) -219 stdcall MAPIResolveName(ptr ptr str long long ptr) +208 stdcall MAPISendDocuments(long str str str long) +209 stdcall MAPILogon(long str str long long ptr) +210 stdcall MAPILogoff(ptr long long long) +211 stdcall MAPISendMail(ptr long ptr long long) +212 stdcall MAPISaveMail(ptr long ptr long long str) +213 stdcall MAPIReadMail(ptr long str long long ptr) +214 stdcall MAPIFindNext(ptr long str str long long ptr) +215 stdcall MAPIDeleteMail(ptr long str long long) +217 stdcall MAPIAddress(ptr long str long str long ptr long long ptr ptr) +218 stdcall MAPIDetails(ptr long ptr long long) +219 stdcall MAPIResolveName(ptr long str long long ptr) 220 stub BMAPISendMail 221 stub BMAPISaveMail 222 stub BMAPIReadMail @@ -188,4 +188,4 @@ 253 stub FixMAPI(a)0 254 stdcall FGetComponentPath(str str ptr long long) 255 stdcall FGetComponentPath(a)20(str str ptr long long) FGetComponentPath -256 stdcall MAPISendMailW(ptr ptr ptr long long) +256 stdcall MAPISendMailW(ptr long ptr long long)

1 0

André Hentschel : d3d8: Fix ValidatePixelShader spec file entry.
by Alexandre Julliard 30 Jan '17

30 Jan '17

Module: wine Branch: master Commit: 8ed4919b698d738f25123c4491eb0f2b88283eba URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ed4919b698d738f25123c449… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Jan 29 21:59:10 2017 +0100 d3d8: Fix ValidatePixelShader spec file entry. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/d3d8.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d8/d3d8.spec b/dlls/d3d8/d3d8.spec index 4bad850..4f125a9 100644 --- a/dlls/d3d8/d3d8.spec +++ b/dlls/d3d8/d3d8.spec @@ -1,5 +1,5 @@ @ stdcall D3D8GetSWInfo() @ stdcall DebugSetMute() @ stdcall Direct3DCreate8(long) -@ stdcall ValidatePixelShader(ptr long long ptr) +@ stdcall ValidatePixelShader(ptr ptr long ptr) @ stdcall ValidateVertexShader(ptr ptr ptr long ptr)

1 0