[pkg-wine-party] [wine] 399/402: Merge branch 'upstream'

Jens Reyer jreyer-guest at moszumanska.debian.org
Mon Jan 15 22:12:57 UTC 2018


This is an automated email from the git hooks/post-receive script.

jreyer-guest pushed a commit to branch master
in repository wine.

commit 540e3a2d88a216ad00dff5c0ecbe0d710ce6986b
Merge: 280409b c97cfdc
Author: Jens Reyer <jre.winesim at gmail.com>
Date:   Mon Jan 15 19:48:28 2018 +0100

    Merge branch 'upstream'

 ANNOUNCE                                           | 560 +++---------
 VERSION                                            |   2 +-
 configure                                          |  19 +-
 configure.ac                                       |   1 +
 dlls/appwiz.cpl/addons.c                           |   3 +
 dlls/bcrypt/bcrypt.spec                            |  12 +-
 dlls/bcrypt/bcrypt_main.c                          |  36 +
 dlls/cabinet/fdi.c                                 |   4 +-
 dlls/cabinet/tests/fdi.c                           |   2 +-
 dlls/comctl32/imagelist.c                          |   2 +-
 dlls/comctl32/listview.c                           |   1 +
 dlls/comctl32/tests/Makefile.in                    |   3 +-
 dlls/{user32 => comctl32}/tests/combo.c            | 995 ++++++++++++++-------
 dlls/comctl32/tests/comboex.c                      | 612 -------------
 dlls/comctl32/tests/listview.c                     |   3 +-
 dlls/{user32 => comctl32}/tests/static.c           |  49 +-
 dlls/d2d1/tests/d2d1.c                             |  78 +-
 dlls/d3d10core/tests/device.c                      | 805 +++++++++++++++--
 dlls/d3d11/device.c                                |   6 +-
 dlls/d3d11/tests/d3d11.c                           | 475 ++++++++++
 dlls/d3d9/tests/device.c                           |  47 +
 dlls/dplayx/tests/dplayx.c                         |   4 +-
 dlls/jscript/dispex.c                              |   4 +
 dlls/kernel32/module.c                             |  27 +-
 dlls/krnl386.exe16/ne_module.c                     |   6 +-
 dlls/mshtml/tests/dom.c                            |   4 +
 dlls/mshtml/tests/elements.js                      |  16 +
 .../wmsbuffer.idl => dlls/mshtml/tests/frame.js    |  30 +-
 dlls/mshtml/tests/rsrc.rc                          |   6 +
 dlls/mshtml/tests/runscript.html                   |  11 +
 dlls/msvcrt/except_arm64.c                         |   4 +-
 dlls/ncrypt/ncrypt.spec                            |  12 +-
 dlls/ntdll/ntdll_misc.h                            |   3 +-
 dlls/ntdll/relay.c                                 | 114 ++-
 dlls/ntdll/signal_arm.c                            | 137 ++-
 dlls/ntdll/signal_arm64.c                          |  12 +-
 dlls/ntdll/signal_i386.c                           |  40 +-
 dlls/ntdll/signal_powerpc.c                        |  12 +-
 dlls/ntdll/signal_x86_64.c                         |  39 +-
 dlls/ntdll/tests/time.c                            |  44 +
 dlls/ntdll/thread.c                                |  28 +-
 dlls/ntdll/virtual.c                               |   2 +-
 dlls/ole32/datacache.c                             |  58 +-
 dlls/ole32/tests/ole2.c                            |  47 +-
 dlls/secur32/tests/negotiate.c                     |  18 +-
 dlls/secur32/tests/ntlm.c                          |  60 ++
 dlls/secur32/tests/schannel.c                      |   4 +
 dlls/urlmon/axinstall.c                            |  23 +-
 dlls/user.exe16/user.c                             |  13 +
 dlls/user.exe16/user.exe16.spec                    |   2 +-
 dlls/user32/combo.c                                |   8 +
 dlls/user32/tests/combo.c                          |  20 +-
 dlls/user32/tests/cursoricon.c                     |   2 +
 dlls/user32/tests/static.c                         |   1 +
 dlls/user32/tests/sysparams.c                      |   3 +-
 dlls/user32/tests/win.c                            |   1 +
 dlls/usp10/opentype.c                              |   2 +-
 dlls/wined3d/arb_program_shader.c                  |   1 +
 dlls/wined3d/directx.c                             |  29 +-
 dlls/wined3d/glsl_shader.c                         |   1 +
 dlls/wined3d/shader.c                              |   1 +
 dlls/wined3d/shader_sm4.c                          |   2 +
 dlls/wined3d/wined3d_private.h                     |   1 +
 dlls/wsdapi/tests/Makefile.in                      |   2 +-
 dlls/wsdapi/tests/discovery.c                      | 140 +++
 dlls/wshom.ocx/shell.c                             |  78 +-
 dlls/wshom.ocx/tests/wshom.c                       |  49 +
 dlls/xaudio2_7/xaudio_dll.c                        |  18 +-
 include/access.idl                                 |   2 +-
 include/amstream.idl                               |   2 +-
 include/asptlb.idl                                 |   2 +-
 include/audiopolicy.idl                            |  12 +-
 include/axextend.idl                               |   8 +-
 include/bcrypt.h                                   |  23 +
 include/bits3_0.idl                                |   2 +-
 include/cmdbas.idl                                 |   2 +-
 include/cmdtxt.idl                                 |   2 +-
 include/comsvcs.idl                                |   2 +-
 include/config.h.in                                |   3 +
 include/cordebug.idl                               |  76 +-
 include/d3d10sdklayers.idl                         |   2 +-
 include/d3dx10core.idl                             |   6 +-
 include/d3dx11core.idl                             |   6 +-
 include/devicetopology.idl                         |   2 +-
 include/docobjectservice.idl                       |   2 +-
 include/dwrite.idl                                 |   2 +-
 include/dwrite_1.idl                               |  18 +-
 include/dwrite_2.idl                               |   2 +-
 include/dxva2api.idl                               |  12 +-
 include/iads.idl                                   |  10 +-
 include/mediaobj.idl                               |   2 +-
 include/metahost.idl                               |   4 +-
 include/mfreadwrite.idl                            |   4 +-
 include/mftransform.idl                            |   2 +-
 include/mlang.idl                                  |   2 +-
 include/mscoree.idl                                |   2 +-
 include/msdadc.idl                                 |   4 +-
 include/msinkaut.idl                               |  40 +-
 include/mstask.idl                                 |   4 +-
 include/msxml2.idl                                 |  78 +-
 include/msxml6.idl                                 |  82 +-
 include/netcfgx.idl                                |   8 +-
 include/netcon.idl                                 |   2 +-
 include/oleacc.idl                                 |   2 +-
 include/pstore.idl                                 |   2 +-
 include/qedit.idl                                  |  24 +-
 include/shdeprecated.idl                           |   8 +-
 include/shobjidl.idl                               |   2 +-
 include/stdole2.idl                                |  16 +-
 include/textstor.idl                               |   4 +-
 include/transact.idl                               |  14 +-
 include/txcoord.idl                                |  28 +-
 include/txdtc.idl                                  |  76 +-
 include/urlmon.idl                                 |   2 +-
 include/vmr9.idl                                   |  28 +-
 include/vmrender.idl                               |  28 +-
 include/wbemcli.idl                                |  12 +-
 include/wbemdisp.idl                               |  38 +-
 include/wincodec.idl                               |   4 +-
 include/wine/exception.h                           |  10 +-
 include/wine/port.h                                |   5 +
 include/wmdrmsdk.idl                               |   4 +-
 include/wmiutils.idl                               |   6 +-
 include/wmsbuffer.idl                              |   2 +-
 include/wmsdkidl.idl                               |  44 +-
 include/wsdxml.idl                                 |   2 +-
 libs/port/Makefile.in                              |   1 +
 include/wmsbuffer.idl => libs/port/strnlen.c       |  36 +-
 loader/wine.inf.in                                 |   1 +
 po/ar.po                                           |  16 +-
 po/bg.po                                           |   4 +-
 po/ca.po                                           |  16 +-
 po/cs.po                                           |  16 +-
 po/da.po                                           |  16 +-
 po/de.po                                           |  31 +-
 po/el.po                                           |   4 +-
 po/eo.po                                           |  12 +-
 po/es.po                                           |  16 +-
 po/fr.po                                           |  16 +-
 po/he.po                                           |  12 +-
 po/hr.po                                           |  16 +-
 po/hu.po                                           |  16 +-
 po/it.po                                           |  16 +-
 po/ja.po                                           |  91 +-
 po/ko.po                                           |  16 +-
 po/nb_NO.po                                        | 124 +--
 po/nl.po                                           |  16 +-
 po/pl.po                                           |  12 +-
 po/pt_BR.po                                        |  16 +-
 po/pt_PT.po                                        |  16 +-
 po/ro.po                                           |  16 +-
 po/sk.po                                           |   4 +-
 po/sl.po                                           |  16 +-
 po/sr_RS at cyrillic.po                               |  12 +-
 po/sr_RS at latin.po                                  |  11 +-
 po/sv.po                                           |  16 +-
 po/th.po                                           |   4 +-
 po/tr.po                                           | 433 ++++-----
 po/uk.po                                           | 194 +---
 po/wa.po                                           |   7 +-
 po/zh_CN.po                                        |   8 +-
 po/zh_TW.po                                        |  16 +-
 programs/dxdiag/main.c                             |   9 +
 programs/explorer/explorer.c                       |  13 +-
 tools/winebuild/spec32.c                           |  16 +-
 165 files changed, 3881 insertions(+), 3077 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-wine/wine.git



More information about the pkg-wine-party mailing list