diff --git a/wine-1.7.51.tar.bz2 b/wine-1.7.51.tar.bz2
deleted file mode 100644
index 13e21a2..0000000
--- a/wine-1.7.51.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:397fc95b463d6ae1b65ab0477d9fe5d0871e8e2a3322bc9d984e438f2c4d0f52
-size 22639053
diff --git a/wine-1.7.51.tar.bz2.sign b/wine-1.7.51.tar.bz2.sign
deleted file mode 100644
index 204749f..0000000
--- a/wine-1.7.51.tar.bz2.sign
+++ /dev/null
@@ -1,7 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1
-
-iEYEABECAAYFAlXpiFgACgkQ9ebp7rlGHdePlQCfbqMMKe93aykjZ8N6W45s5Ue/
-y+AAn1vrrN79UkquqDfbgGddmzW5evbL
-=/Sq2
------END PGP SIGNATURE-----
diff --git a/wine-1.7.52.tar.bz2 b/wine-1.7.52.tar.bz2
new file mode 100644
index 0000000..a463e65
--- /dev/null
+++ b/wine-1.7.52.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0773b32a0c358323db4c383ceb1e9e28d5d4ed4ea37570af2bcb41fecf0d554b
+size 22707539
diff --git a/wine-1.7.52.tar.bz2.sign b/wine-1.7.52.tar.bz2.sign
new file mode 100644
index 0000000..43ca50e
--- /dev/null
+++ b/wine-1.7.52.tar.bz2.sign
@@ -0,0 +1,7 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1
+
+iEYEABECAAYFAlYOkroACgkQ9ebp7rlGHdfbyQCfUGdlCb4IKfkzARMdvDDphzbw
+cd4An0HDx4oSSQwstU6dPgaVuIQGiu4n
+=izSO
+-----END PGP SIGNATURE-----
diff --git a/wine.changes b/wine.changes
index 578f76b..c118bbf 100644
--- a/wine.changes
+++ b/wine.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Fri Oct  2 14:37:06 UTC 2015 - meissner@suse.com
+
+- Updated to 1.7.52 development snapshot
+  - Unicode data updated to Unicode 8.0.0.
+  - Some implementation of the Web Services DLL.
+  - More Direct3D 11 interfaces.
+  - A few more functions in the C++ runtime.
+  - Output standard glyph names in the PostScript driver.
+  - Various bug fixes.
+- updated winetricks
+
 -------------------------------------------------------------------
 Fri Sep  4 14:29:47 UTC 2015 - meissner@suse.com
 
diff --git a/wine.spec b/wine.spec
index 7cc082a..4face5e 100644
--- a/wine.spec
+++ b/wine.spec
@@ -60,7 +60,7 @@ BuildRequires:  sane-backends-devel
 BuildRequires:  update-desktop-files
 BuildRequires:  valgrind-devel
 BuildRequires:  xorg-x11-devel
-Version:        1.7.51
+Version:        1.7.52
 Release:        0
 Summary:        An MS Windows Emulator
 License:        LGPL-2.1+
diff --git a/winetricks b/winetricks
index d0029ab..7cdcf1b 100644
--- a/winetricks
+++ b/winetricks
@@ -26,7 +26,7 @@ WINETRICKS_VERSION=20150826
 # - aria2c, wget, or curl is needed for downloading.
 # - sha1sum or openssl is needed for verifying downloads.
 # - zenity is needed by the GUI, though it can limp along somewhat with kdialog.
-# - xdg-open (if present) or open (for Mac OSX) is used to open download pages 
+# - xdg-open (if present) or open (for Mac OSX) is used to open download pages
 #   for the user when downloads cannot be fully automated.
 # - sudo is used to mount .iso images if the user cached them with -k option.
 # - perl is used to munge steam config files
@@ -426,10 +426,7 @@ w_read_key()
         zh_CN*)  _W_keymsg="按任意键为 '$W_PACKAGE'"
             _W_nokeymsg="No key given"
             ;;
-        zh_TW*)  _W_keymsg="按任意鍵為 '$W_PACKAGE'"
-            _W_nokeymsg="No key given"
-            ;;
-        zh_HK*)  _W_keymsg="按任意鍵為 '$W_PACKAGE'"
+        zh_TW*|zh_HK*)  _W_keymsg="按任意鍵為 '$W_PACKAGE'"
             _W_nokeymsg="No key given"
             ;;
         *)  _W_keymsg="Please enter the key for app '$W_PACKAGE'"
@@ -606,7 +603,7 @@ w_dotnet_verify()
                     {
                         process, close, setupverifier2.exe
                         break
-                    }                    
+                    }
                 }
             "
             dn_status=$?
@@ -888,8 +885,7 @@ w_download_manual_to()
     pl*) _W_dlmsg="Proszę pobrać plik $_W_file z $_W_url, następnie umieścić go w $W_CACHE/$_W_packagename, a na końcu uruchomić ponownie ten skrypt.";;
     uk*) _W_dlmsg="Будь ласка, звантажте $_W_file з $_W_url, розташуйте в $W_CACHE/$_W_packagename, потім запустіть скрипт знову.";;
     zh_CN*) _W_dlmsg="请从 $_W_url 下载 $_W_file，并置放于 $W_CACHE/$_W_packagename, 然后重新运行 winetricks.";;
-    zh_TW*) _W_dlmsg="請從 $_W_url 下載 $_W_file，并置放於 $W_CACHE/$_W_packagename, 然后重新執行 winetricks.";;
-    zh_HK*) _W_dlmsg="請從 $_W_url 下載 $_W_file，并置放於 $W_CACHE/$_W_packagename, 然后重新執行 winetricks.";;
+    zh_TW*|zh_HK*) _W_dlmsg="請從 $_W_url 下載 $_W_file，并置放於 $W_CACHE/$_W_packagename, 然后重新執行 winetricks.";;
     *) _W_dlmsg="Please download $_W_file from $_W_url, place it in $W_CACHE/$_W_packagename, then re-run this script.";;
     esac
 
@@ -1489,93 +1485,201 @@ w_override_all_dlls()
     # Disable all known native Microsoft DLLs in favor of Wine's builtin ones
     # Generated with
     # find ~/wine-git/dlls -maxdepth 1 -type d -print | sed 's,.*/,,' | sort | fmt -50 | sed 's/$/ \\/'
+    # Last updated: 2015-09-28
     w_override_dlls builtin \
         acledit aclui activeds actxprxy adsiid advapi32 \
-        advpack amstream apphelp appwiz.cpl atl atl80 \
-        authz avicap32 avifil32 avifile.dll16 avrt \
-        bcrypt browseui cabinet capi2032 cards cfgmgr32 \
-        clusapi comcat comctl32 comdlg32 commdlg.dll16 \
-        comm.drv16 compobj.dll16 compstui credui crtdll \
-        crypt32 cryptdlg cryptdll cryptnet cryptui \
-        ctapi32 ctl3d32 ctl3d.dll16 ctl3dv2.dll16 d3d10 \
-        d3d10core d3d8 d3d9 d3dcompiler_33 d3dcompiler_34 \
+        advpack amstream api-ms-win-core-com-l1-1-0 \
+        api-ms-win-core-console-l1-1-0 \
+        api-ms-win-core-datetime-l1-1-0 \
+        api-ms-win-core-datetime-l1-1-1 \
+        api-ms-win-core-debug-l1-1-0 \
+        api-ms-win-core-debug-l1-1-1 \
+        api-ms-win-core-errorhandling-l1-1-0 \
+        api-ms-win-core-errorhandling-l1-1-1 \
+        api-ms-win-core-errorhandling-l1-1-2 \
+        api-ms-win-core-fibers-l1-1-0 \
+        api-ms-win-core-fibers-l1-1-1 \
+        api-ms-win-core-file-l1-1-0 \
+        api-ms-win-core-file-l1-2-0 \
+        api-ms-win-core-file-l2-1-0 \
+        api-ms-win-core-file-l2-1-1 \
+        api-ms-win-core-handle-l1-1-0 \
+        api-ms-win-core-heap-l1-1-0 \
+        api-ms-win-core-heap-l1-2-0 \
+        api-ms-win-core-heap-obsolete-l1-1-0 \
+        api-ms-win-core-interlocked-l1-1-0 \
+        api-ms-win-core-interlocked-l1-2-0 \
+        api-ms-win-core-io-l1-1-1 \
+        api-ms-win-core-kernel32-legacy-l1-1-0 \
+        api-ms-win-core-libraryloader-l1-1-0 \
+        api-ms-win-core-libraryloader-l1-1-1 \
+        api-ms-win-core-localization-l1-2-0 \
+        api-ms-win-core-localization-l1-2-1 \
+        api-ms-win-core-localization-obsolete-l1-1-0 \
+        api-ms-win-core-localregistry-l1-1-0 \
+        api-ms-win-core-memory-l1-1-0 \
+        api-ms-win-core-memory-l1-1-1 \
+        api-ms-win-core-misc-l1-1-0 \
+        api-ms-win-core-namedpipe-l1-1-0 \
+        api-ms-win-core-namedpipe-l1-2-0 \
+        api-ms-win-core-processenvironment-l1-1-0 \
+        api-ms-win-core-processenvironment-l1-2-0 \
+        api-ms-win-core-processthreads-l1-1-0 \
+        api-ms-win-core-processthreads-l1-1-1 \
+        api-ms-win-core-processthreads-l1-1-2 \
+        api-ms-win-core-profile-l1-1-0 \
+        api-ms-win-core-psapi-l1-1-0 \
+        api-ms-win-core-registry-l1-1-0 \
+        api-ms-win-core-rtlsupport-l1-1-0 \
+        api-ms-win-core-rtlsupport-l1-2-0 \
+        api-ms-win-core-shlwapi-legacy-l1-1-0 \
+        api-ms-win-core-string-l1-1-0 \
+        api-ms-win-core-synch-l1-1-0 \
+        api-ms-win-core-synch-l1-2-0 \
+        api-ms-win-core-sysinfo-l1-1-0 \
+        api-ms-win-core-sysinfo-l1-2-0 \
+        api-ms-win-core-sysinfo-l1-2-1 \
+        api-ms-win-core-threadpool-legacy-l1-1-0 \
+        api-ms-win-core-timezone-l1-1-0 \
+        api-ms-win-core-url-l1-1-0 \
+        api-ms-win-core-util-l1-1-0 \
+        api-ms-win-core-winrt-error-l1-1-0 \
+        api-ms-win-core-winrt-error-l1-1-1 \
+        api-ms-win-core-winrt-l1-1-0 \
+        api-ms-win-core-winrt-string-l1-1-0 \
+        api-ms-win-core-xstate-l2-1-0 \
+        api-ms-win-crt-conio-l1-1-0 \
+        api-ms-win-crt-convert-l1-1-0 \
+        api-ms-win-crt-environment-l1-1-0 \
+        api-ms-win-crt-filesystem-l1-1-0 \
+        api-ms-win-crt-heap-l1-1-0 \
+        api-ms-win-crt-locale-l1-1-0 \
+        api-ms-win-crt-math-l1-1-0 \
+        api-ms-win-crt-multibyte-l1-1-0 \
+        api-ms-win-crt-private-l1-1-0 \
+        api-ms-win-crt-process-l1-1-0 \
+        api-ms-win-crt-runtime-l1-1-0 \
+        api-ms-win-crt-stdio-l1-1-0 \
+        api-ms-win-crt-string-l1-1-0 \
+        api-ms-win-crt-time-l1-1-0 \
+        api-ms-win-crt-utility-l1-1-0 \
+        api-ms-win-downlevel-advapi32-l1-1-0 \
+        api-ms-win-downlevel-advapi32-l2-1-0 \
+        api-ms-win-downlevel-normaliz-l1-1-0 \
+        api-ms-win-downlevel-ole32-l1-1-0 \
+        api-ms-win-downlevel-shell32-l1-1-0 \
+        api-ms-win-downlevel-shlwapi-l1-1-0 \
+        api-ms-win-downlevel-shlwapi-l2-1-0 \
+        api-ms-win-downlevel-user32-l1-1-0 \
+        api-ms-win-downlevel-version-l1-1-0 \
+        api-ms-win-eventing-provider-l1-1-0 \
+        api-ms-win-ntuser-dc-access-l1-1-0 \
+        api-ms-win-security-base-l1-1-0 \
+        api-ms-win-security-base-l1-2-0 \
+        api-ms-win-security-sddl-l1-1-0 \
+        api-ms-win-service-core-l1-1-1 \
+        api-ms-win-service-management-l1-1-0 \
+        api-ms-win-service-winsvc-l1-2-0 apphelp \
+        appwiz.cpl atl atl100 atl110 atl80 atl90 authz \
+        avicap32 avifil32 avifile.dll16 avrt bcrypt \
+        browseui cabinet capi2032 cards cfgmgr32 clusapi \
+        combase comcat comctl32 comdlg32 commdlg.dll16 \
+        comm.drv16 compobj.dll16 compstui comsvcs connect \
+        credui crtdll crypt32 cryptdlg cryptdll cryptext \
+        cryptnet cryptui ctapi32 ctl3d32 ctl3d.dll16 \
+        ctl3dv2.dll16 d2d1 d3d10 d3d10_1 d3d10core \
+        d3d11 d3d8 d3d9 d3dcompiler_33 d3dcompiler_34 \
         d3dcompiler_35 d3dcompiler_36 d3dcompiler_37 \
         d3dcompiler_38 d3dcompiler_39 d3dcompiler_40 \
         d3dcompiler_41 d3dcompiler_42 d3dcompiler_43 \
-        d3dim d3drm d3dx10_33 d3dx10_34 d3dx10_35 \
-        d3dx10_36 d3dx10_37 d3dx10_38 d3dx10_39 \
-        d3dx10_40 d3dx10_41 d3dx10_42 d3dx10_43 \
-        d3dx9_24 d3dx9_25 d3dx9_26 d3dx9_27 d3dx9_28 \
-        d3dx9_29 d3dx9_30 d3dx9_31 d3dx9_32 d3dx9_33 \
-        d3dx9_34 d3dx9_35 d3dx9_36 d3dx9_37 d3dx9_38 \
-        d3dx9_39 d3dx9_40 d3dx9_41 d3dx9_42 d3dx9_43 \
-        d3dxof dbgeng dbghelp dciman32 ddeml.dll16 \
-        ddraw ddrawex devenum dhcpcsvc dinput dinput8 \
-        dispdib.dll16 dispex display.drv16 dlls dmband \
-        dmcompos dmime dmloader dmscript dmstyle dmsynth \
-        dmusic dmusic32 dnsapi dplay dplayx dpnaddr \
-        dpnet dpnhpast dpnlobby dpwsockx drmclien \
-        dsound dssenh dswave dwmapi dxdiagn dxerr8 \
-        dxerr9 dxgi dxguid explorerframe faultrep \
-        fltlib fusion fwpuclnt gameux gdi32 gdi.exe16 \
-        gdiplus glu32 gphoto2.ds gpkcsp hal hhctrl.ocx \
-        hid hlink hnetcfg httpapi iccvid icmp ieframe \
-        ifsmgr.vxd imaadp32.acm imagehlp imm32 imm.dll16 \
-        inetcomm inetcpl.cpl inetmib1 infosoft initpki \
-        inkobj inseng iphlpapi itircl itss jscript \
-        kernel32 keyboard.drv16 krnl386.exe16 ktmw32 \
-        loadperf localspl localui lz32 lzexpand.dll16 \
-        mapi32 mapistub mciavi32 mcicda mciqtz32 mciseq \
-        mciwave mgmtapi midimap mlang mmcndmgr mmdevapi \
+        d3dcompiler_46 d3dcompiler_47 d3dim d3drm \
+        d3dx10_33 d3dx10_34 d3dx10_35 d3dx10_36 d3dx10_37 \
+        d3dx10_38 d3dx10_39 d3dx10_40 d3dx10_41 d3dx10_42 \
+        d3dx10_43 d3dx11_42 d3dx11_43 d3dx9_24 d3dx9_25 \
+        d3dx9_26 d3dx9_27 d3dx9_28 d3dx9_29 d3dx9_30 \
+        d3dx9_31 d3dx9_32 d3dx9_33 d3dx9_34 d3dx9_35 \
+        d3dx9_36 d3dx9_37 d3dx9_38 d3dx9_39 d3dx9_40 \
+        d3dx9_41 d3dx9_42 d3dx9_43 d3dxof davclnt \
+        dbgeng dbghelp dciman32 ddeml.dll16 ddraw \
+        ddrawex devenum dhcpcsvc difxapi dinput \
+        dinput8 dispdib.dll16 dispex display.drv16 \
+        dlls dmband dmcompos dmime dmloader dmscript \
+        dmstyle dmsynth dmusic dmusic32 dnsapi dplay \
+        dplayx dpnaddr dpnet dpnhpast dpnlobby dpvoice \
+        dpwsockx drmclien dsound dssenh dswave dwmapi \
+        dwrite dxdiagn dxerr8 dxerr9 dxgi dxguid dxva2 \
+        evr explorerframe ext-ms-win-gdi-devcaps-l1-1-0 \
+        faultrep fltlib fntcache fontsub fusion fwpuclnt \
+        gameux gdi32 gdi.exe16 gdiplus glu32 gphoto2.ds \
+        gpkcsp hal hhctrl.ocx hid hidclass.sys hlink \
+        hnetcfg httpapi iccvid icmp ieframe ifsmgr.vxd \
+        imaadp32.acm imagehlp imm32 imm.dll16 inetcomm \
+        inetcpl.cpl inetmib1 infosoft initpki inkobj \
+        inseng iphlpapi itircl itss joy.cpl jscript \
+        jsproxy kernel32 keyboard.drv16 krnl386.exe16 \
+        ksuser ktmw32 loadperf localspl localui lz32 \
+        lzexpand.dll16 mapi32 mapistub mciavi32 mcicda \
+        mciqtz32 mciseq mciwave mf mfplat mfreadwrite \
+        mgmtapi midimap mlang mmcndmgr mmdevapi \
         mmdevldr.vxd mmsystem.dll16 monodebg.vxd \
         mountmgr.sys mouse.drv16 mpr mprapi msacm32 \
-        msacm32.drv msacm.dll16 msadp32.acm mscat32 mscms \
-        mscoree msctf msdaps msdmo msftedit msg711.acm \
-        msgsm32.acm mshtml mshtml.tlb msi msident msimg32 \
-        msimsg msimtf msisip msisys.ocx msnet32 mspatcha \
-        msrle32 mssign32 mssip32 mstask msvcirt msvcm80 \
-        msvcm90 msvcp100 msvcp60 msvcp70 msvcp71 msvcp80 \
-        msvcp90 msvcr100 msvcr70 msvcr71 msvcr80 msvcr90 \
-        msvcrt msvcrt20 msvcrt40 msvcrtd msvfw32 msvidc32 \
-        msvideo.dll16 mswsock msxml msxml2 msxml3 msxml4 \
-        msxml6 nddeapi netapi32 newdev normaliz npmshtml \
-        ntdll ntdsapi ntoskrnl.exe ntprint objsel \
-        odbc32 odbccp32 ole2conv.dll16 ole2disp.dll16 \
-        ole2.dll16 ole2nls.dll16 ole2prox.dll16 \
-        ole2thk.dll16 ole32 oleacc oleaut32 olecli32 \
-        olecli.dll16 oledb32 oledlg olepro32 olesvr32 \
-        olesvr.dll16 olethk32 openal32 opencl opengl32 \
-        pdh photometadatahandler pidgen powrprof printui \
-        propsys psapi pstorec qcap qedit qmgr qmgrprxy \
-        quartz query rasapi16.dll16 rasapi32 rasdlg \
-        regapi resutils riched20 riched32 rpcrt4 rsabase \
-        rsaenh rstrtmgr rtutils samlib sane.ds scarddlg \
-        sccbase schannel scrrun secur32 security sensapi \
-        serialui setupapi setupx.dll16 sfc sfc_os shdoclc \
-        shdocvw shell32 shell.dll16 shfolder shlwapi \
-        slbcsp slc snmpapi softpub sound.drv16 spoolss \
-        stdole2.tlb stdole32.tlb sti storage.dll16 \
-        stress.dll16 strmbase strmiids svrapi sxs \
-        system.drv16 t2embed tapi32 toolhelp.dll16 \
-        traffic twain_32 twain.dll16 typelib.dll16 \
-        unicows updspapi url urlmon usbd.sys user32 \
-        userenv user.exe16 usp10 uuid uxtheme vbscript \
-        vcomp vcomp100 vdhcp.vxd vdmdbg ver.dll16 \
-        version vmm.vxd vnbt.vxd vnetbios.vxd vtdapi.vxd \
-        vwin32.vxd w32skrnl w32sys.dll16 wbemprox wer \
-        wevtapi wiaservc win32s16.dll16 win87em.dll16 \
-        winaspi.dll16 windebug.dll16 windowscodecs \
-        winealsa.drv winecoreaudio.drv winecrt0 \
-        wined3d winegstreamer winejoystick.drv winemapi \
-        winemp3.acm wineoss.drv wineps16.drv16 wineps.drv \
-        wineqtdecoder winequartz.drv winex11.drv wing32 \
+        msacm32.drv msacm.dll16 msadp32.acm msasn1 \
+        mscat32 mscms mscoree msctf msctfp msdaps \
+        msdmo msftedit msg711.acm msgsm32.acm mshtml \
+        mshtml.tlb msi msident msimg32 msimsg msimtf \
+        msisip msisys.ocx msls31 msnet32 mspatcha msrle32 \
+        msscript.ocx mssign32 mssip32 mstask msvcirt \
+        msvcm80 msvcm90 msvcp100 msvcp110 msvcp120 \
+        msvcp120_app msvcp60 msvcp70 msvcp71 msvcp80 \
+        msvcp90 msvcr100 msvcr110 msvcr120 msvcr120_app \
+        msvcr70 msvcr71 msvcr80 msvcr90 msvcrt msvcrt20 \
+        msvcrt40 msvcrtd msvfw32 msvidc32 msvideo.dll16 \
+        mswsock msxml msxml2 msxml3 msxml4 msxml6 \
+        nddeapi ndis.sys netapi32 netcfgx netprofm \
+        newdev normaliz npmshtml npptools ntdll ntdsapi \
+        ntoskrnl.exe ntprint objsel odbc32 odbccp32 \
+        odbccu32 ole2conv.dll16 ole2disp.dll16 ole2.dll16 \
+        ole2nls.dll16 ole2prox.dll16 ole2thk.dll16 \
+        ole32 oleacc oleaut32 olecli32 olecli.dll16 \
+        oledb32 oledlg olepro32 olesvr32 olesvr.dll16 \
+        olethk32 openal32 opencl opengl32 packager pdh \
+        photometadatahandler pidgen powrprof printui \
+        prntvpt propsys psapi pstorec qcap qedit qmgr \
+        qmgrprxy quartz query rasapi16.dll16 rasapi32 \
+        rasdlg regapi resutils riched20 riched32 \
+        rpcrt4 rsabase rsaenh rstrtmgr rtutils \
+        samlib sane.ds scarddlg sccbase schannel \
+        schedsvc scrrun scsiport.sys secur32 security \
+        sensapi serialui setupapi setupx.dll16 sfc \
+        sfc_os shdoclc shdocvw shell32 shell.dll16 \
+        shfolder shlwapi slbcsp slc snmpapi softpub \
+        sound.drv16 spoolss stdole2.tlb stdole32.tlb \
+        sti storage.dll16 stress.dll16 strmbase strmiids \
+        svrapi sxs system.drv16 t2embed tapi32 taskschd \
+        toolhelp.dll16 traffic twain_32 twain.dll16 \
+        typelib.dll16 ucrtbase unicows updspapi url \
+        urlmon usbd.sys user32 userenv user.exe16 usp10 \
+        uuid uxtheme vbscript vcomp vcomp100 vcomp110 \
+        vcomp90 vdhcp.vxd vdmdbg ver.dll16 version \
+        vmm.vxd vnbt.vxd vnetbios.vxd vssapi vtdapi.vxd \
+        vwin32.vxd w32skrnl w32sys.dll16 wbemdisp \
+        wbemprox webservices wer wevtapi wiaservc \
+        win32s16.dll16 win87em.dll16 winaspi.dll16 \
+        windebug.dll16 windowscodecs windowscodecsext \
+        winealsa.drv winecoreaudio.drv winecrt0 wined3d \
+        winegstreamer winejoystick.drv winemac.drv \
+        winemapi winemp3.acm wineoss.drv wineps16.drv16 \
+        wineps.drv wineqtdecoder winex11.drv wing32 \
         wing.dll16 winhttp wininet winmm winnls32 \
         winnls.dll16 winscard winsock.dll16 winspool.drv \
         winsta wintab32 wintab.dll16 wintrust wlanapi \
-        wldap32 wmi wmiutils wmvcore wnaspi32 wow32 \
-        ws2_32 wshom.ocx wsnmp32 wsock32 wtsapi32 wuapi \
-        wuaueng xapofx1_1 xinput1_1 xinput1_2 xinput1_3 \
-        xinput9_1_0 xmllite xolehlp xpsprint \
+        wldap32 wmi wmiutils wmp wmvcore wnaspi32 wow32 \
+        wpcap ws2_32 wshom.ocx wsnmp32 wsock32 wtsapi32 \
+        wuapi wuaueng x3daudio1_1 x3daudio1_2 x3daudio1_3 \
+        x3daudio1_4 x3daudio1_5 x3daudio1_6 x3daudio1_7 \
+        xapofx1_1 xapofx1_3 xapofx1_4 xapofx1_5 xaudio2_7 \
+        xaudio2_8 xinput1_1 xinput1_2 xinput1_3 xinput1_4 \
+        xinput9_1_0 xmllite xolehlp xpsprint xpssvcs \
 
         # blank line so you don't have to remove the extra trailing \
 }
@@ -1923,8 +2027,7 @@ w_workaround_wine_bug()
     pl*) w_warn "Obchodzenie błędu w wine ${1} $_W_msg" ;;
     uk*) w_warn "Обхід помилки ${1} $_W_msg" ;;
     zh_CN*)   w_warn "绕过 wine bug ${1} $_W_msg" ;;
-    zh_TW*)   w_warn "繞過 wine bug ${1} $_W_msg" ;;
-    zh_HK*)   w_warn "繞過 wine bug ${1} $_W_msg" ;;
+    zh_TW*|zh_HK*)   w_warn "繞過 wine bug ${1} $_W_msg" ;;
     *)   w_warn "Working around wine bug ${1} $_W_msg" ;;
     esac
     winetricks_stats_log_command w_workaround_wine_bug-$1
@@ -2121,7 +2224,7 @@ w_do_call()
             echo "$1 already installed, skipping"
             return 0
         fi
-        
+
         # Don't install if a conflicting verb is already installed:
         if test "$WINETRICKS_FORCE" != 1 && test "$conflicts" && test -f "$WINEPREFIX/winetricks.log"
         then
@@ -2365,26 +2468,14 @@ winetricks_prefixmenu()
          _W_msg_showbroken1="有问题的程序 (例如那些有数字版权问题)"
          _W_msg_help="查看帮助"
          ;;
-    zh_TW*)   _W_msg_title="Windows 應用裝載向導 - 選取一個 wine 容器"
+    zh_TW*|zh_HK*)   _W_msg_title="Windows 應用安裝向導 - 選取一個 wine 容器"
          _W_msg_body='君欲何為？'
-         _W_msg_apps='裝載一個 windows 應用'
-         _W_msg_games='裝載一個游戲'
-         _W_msg_benchmarks='裝載一個基准測試軟體'
+         _W_msg_apps='安裝一個 windows 應用'
+         _W_msg_games='安裝一個游戲'
+         _W_msg_benchmarks='安裝一個基准測試軟體'
          _W_msg_default="選取預設的 wine 容器"
-         _W_msg_unattended0="禁用靜默裝載"
-         _W_msg_unattended1="啟用靜默裝載"
-         _W_msg_showbroken0="隱藏有問題的程式 (例如那些有數字版權問題)"
-         _W_msg_showbroken1="有問題的程式 (例如那些有數字版權問題)"
-         _W_msg_help="檢視輔助說明"
-         ;;
-    zh_HK*)   _W_msg_title="Windows 應用裝載向導 - 選取一個 wine 容器"
-         _W_msg_body='君欲何為？'
-         _W_msg_apps='裝載一個 windows 應用'
-         _W_msg_games='裝載一個游戲'
-         _W_msg_benchmarks='裝載一個基准測試軟體'
-         _W_msg_default="選取預設的 wine 容器"
-         _W_msg_unattended0="禁用靜默裝載"
-         _W_msg_unattended1="啟用靜默裝載"
+         _W_msg_unattended0="禁用靜默安裝"
+         _W_msg_unattended1="啟用靜默安裝"
          _W_msg_showbroken0="隱藏有問題的程式 (例如那些有數字版權問題)"
          _W_msg_showbroken1="有問題的程式 (例如那些有數字版權問題)"
          _W_msg_help="檢視輔助說明"
@@ -2444,7 +2535,11 @@ winetricks_prefixmenu()
                 else
                     _W_msg_name="$p"
                 fi
-                printf %s " FALSE prefix='$p' 'Select $_W_msg_name' "
+            case $LANG in 
+            zh_CN*) printf %s " FALSE prefix='$p' '选择管理 $_W_msg_name' " ;;
+            zh_TW*|zh_HK*) printf %s " FALSE prefix='$p' '選擇管理 $_W_msg_name' " ;;
+            *) printf %s " FALSE prefix='$p' 'Select $_W_msg_name' " ;;
+            esac
             done >> "$WINETRICKS_WORKDIR"/zenity.sh
         fi
         printf %s " FALSE $_W_cmd_unattended '$_W_msg_unattended'" >> "$WINETRICKS_WORKDIR"/zenity.sh
@@ -2499,6 +2594,7 @@ winetricks_mainmenu()
          _W_msg_winecfg='Run winecfg'
          _W_msg_regedit='Run regedit'
          _W_msg_taskmgr='Run taskmgr'
+         _W_msg_uninstaller='Run uninstaller'
          _W_msg_shell='Run a commandline shell (for debugging)'
          _W_msg_folder='Browse files'
          _W_msg_annihilate="Delete ALL DATA AND APPLICATIONS INSIDE THIS WINEPREFIX"
@@ -2511,6 +2607,7 @@ winetricks_mainmenu()
          _W_msg_winecfg='Run winecfg'
          _W_msg_regedit='Run regedit'
          _W_msg_taskmgr='Run taskmgr'
+         _W_msg_uninstaller='Run uninstaller'
          _W_msg_shell='Run a commandline shell (for debugging)'
          _W_msg_folder='Browse files'
          _W_msg_annihilate="Delete ALL DATA AND APPLICATIONS INSIDE THIS WINEPREFIX"
@@ -2523,6 +2620,7 @@ winetricks_mainmenu()
          _W_msg_winecfg='Uruchom winecfg'
          _W_msg_regedit='Uruchom regedit'
          _W_msg_taskmgr='Uruchom taskmgr'
+         _W_msg_uninstaller='Run uninstaller'
          _W_msg_shell='Uruchom powłokę wiersza poleceń (dla debugowania)'
          _W_msg_folder='Przeglądaj pliki'
          _W_msg_annihilate="Usuń WSZYSTKIE DANE I APLIKACJE WEWNĄTRZ TEGO WINEPREFIXA"
@@ -2535,6 +2633,7 @@ winetricks_mainmenu()
          _W_msg_winecfg='Запустити winecfg'
          _W_msg_regedit='Запустити regedit'
          _W_msg_taskmgr='Запустити taskmgr'
+         _W_msg_uninstaller='Run uninstaller'
          _W_msg_shell='Запуск командної оболонки (для налагодження)'
          _W_msg_folder='Перегляд файлів'
          _W_msg_annihilate="Видалити УСІ ДАНІ ТА ПРОГРАМИ З ЦЬОГО WINEPREFIX"
@@ -2547,23 +2646,12 @@ winetricks_mainmenu()
          _W_msg_winecfg='运行 winecfg'
          _W_msg_regedit='运行注册表'
          _W_msg_taskmgr='运行任务管理器'
+         _W_msg_uninstaller='Run uninstaller'
          _W_msg_shell='运行命令提示窗口 (作为调试)'
          _W_msg_folder='浏览容器中的文件'
          _W_msg_annihilate="删除当前容器所有相关文件，包括启动器，完全卸载"
          ;;
-    zh_TW*)   _W_msg_title="Windows 應用裝載向導 - 目前容器路徑是 \"$WINEPREFIX\""
-         _W_msg_body='管理目前容器'
-         _W_msg_dlls="裝載 Windows DLL 或套件"
-         _W_msg_fonts='裝載字型'
-         _W_msg_settings='修改設定'
-         _W_msg_winecfg='執行 winecfg'
-         _W_msg_regedit='執行註冊表'
-         _W_msg_taskmgr='執行工作管理者'
-         _W_msg_shell='執行指令輔助說明視窗 (作為除錯)'
-         _W_msg_folder='瀏覽容器中的檔案'
-         _W_msg_annihilate="移除目前容器所有相依檔案，包括啟動器，完全卸載"
-         ;;
-    zh_HK*)   _W_msg_title="Windows 應用裝載向導 - 目前容器路徑是 \"$WINEPREFIX\""
+    zh_TW*|zh_HK*)   _W_msg_title="Windows 應用裝載向導 - 目前容器路徑是 \"$WINEPREFIX\""
          _W_msg_body='管理目前容器'
          _W_msg_dlls="裝載 Windows DLL 或套件"
          _W_msg_fonts='裝載字型'
@@ -2571,6 +2659,7 @@ winetricks_mainmenu()
          _W_msg_winecfg='執行 winecfg'
          _W_msg_regedit='執行註冊表'
          _W_msg_taskmgr='執行工作管理者'
+         _W_msg_uninstaller='Run uninstaller'
          _W_msg_shell='執行指令輔助說明視窗 (作為除錯)'
          _W_msg_folder='瀏覽容器中的檔案'
          _W_msg_annihilate="移除目前容器所有相依檔案，包括啟動器，完全卸載"
@@ -2583,6 +2672,7 @@ winetricks_mainmenu()
          _W_msg_winecfg='Run winecfg'
          _W_msg_regedit='Run regedit'
          _W_msg_taskmgr='Run taskmgr'
+         _W_msg_uninstaller='Run uninstaller'
          _W_msg_shell='Run a commandline shell (for debugging)'
          _W_msg_folder='Browse files'
          _W_msg_annihilate="Delete ALL DATA AND APPLICATIONS INSIDE THIS WINEPREFIX"
@@ -2603,15 +2693,16 @@ winetricks_mainmenu()
             --height $WINETRICKS_MENU_HEIGHT \
             --width $WINETRICKS_MENU_WIDTH \
             --hide-column 2 \
-            FALSE dlls       '$_W_msg_dlls' \
-            FALSE fonts      '$_W_msg_fonts' \
-            FALSE settings   '$_W_msg_settings' \
-            FALSE winecfg    '$_W_msg_winecfg' \
-            FALSE regedit    '$_W_msg_regedit' \
-            FALSE taskmgr    '$_W_msg_taskmgr' \
-            FALSE shell      '$_W_msg_shell' \
-            FALSE folder     '$_W_msg_folder' \
-            FALSE annihilate '$_W_msg_annihilate' \
+            FALSE dlls        '$_W_msg_dlls' \
+            FALSE fonts       '$_W_msg_fonts' \
+            FALSE settings    '$_W_msg_settings' \
+            FALSE winecfg     '$_W_msg_winecfg' \
+            FALSE regedit     '$_W_msg_regedit' \
+            FALSE taskmgr     '$_W_msg_taskmgr' \
+            FALSE uninstaller '$_W_msg_uninstaller' \
+            FALSE shell       '$_W_msg_shell' \
+            FALSE folder      '$_W_msg_folder' \
+            FALSE annihilate  '$_W_msg_annihilate' \
          "
          ) > "$WINETRICKS_WORKDIR"/zenity.sh
         sh "$WINETRICKS_WORKDIR"/zenity.sh | tr '|' ' '
@@ -2623,15 +2714,16 @@ winetricks_mainmenu()
                 --separate-output \
                 --radiolist \
                 "$_W_msg_body"\
-                dlls       "$_W_msg_dlls" off \
-                fonts      "$_W_msg_fonts" off \
-                settings   "$_W_msg_settings" off \
-                winecfg    "$_W_msg_winecfg" off \
-                regedit    "$_W_msg_regedit" off \
-                taskmgr    "$_W_msg_taskmgr" off \
-                shell      "$_W_msg_shell" off \
-                folder     "$_W_msg_folder" off \
-                annihilate "$_W_msg_annihilate" off \
+                dlls        "$_W_msg_dlls" off \
+                fonts       "$_W_msg_fonts" off \
+                settings    "$_W_msg_settings" off \
+                winecfg     "$_W_msg_winecfg" off \
+                regedit     "$_W_msg_regedit" off \
+                taskmgr     "$_W_msg_taskmgr" off \
+                uninstaller "$_W_msg_uninstaller" off \
+                shell       "$_W_msg_shell" off \
+                folder      "$_W_msg_folder" off \
+                annihilate  "$_W_msg_annihilate" off \
                 $_W_cmd_unattended "$_W_msg_unattended" off \
 
         ;;
@@ -2658,10 +2750,7 @@ winetricks_settings_menu()
     zh_CN*)   _W_msg_title="Windows 应用安装向导 - 当前容器路径是 \"$WINEPREFIX\""
          _W_msg_body='君欲更改哪项设置？'
          ;;
-    zh_TW*)   _W_msg_title="Windows 應用裝載向導 - 目前容器路徑是 \"$WINEPREFIX\""
-         _W_msg_body='君欲變更哪項設定？'
-         ;;
-    zh_HK*)   _W_msg_title="Windows 應用裝載向導 - 目前容器路徑是 \"$WINEPREFIX\""
+    zh_TW*|zh_HK*)   _W_msg_title="Windows 應用裝載向導 - 目前容器路徑是 \"$WINEPREFIX\""
          _W_msg_body='君欲變更哪項設定？'
          ;;
     *)   _W_msg_title="Winetricks - current prefix is \"$WINEPREFIX\""
@@ -2732,19 +2821,7 @@ winetricks_settings_menu()
                 --width $WINETRICKS_MENU_WIDTH \
                 "
             ;;
-        zh_TW*) printf %s "zenity \
-                --title '$_W_msg_title' \
-                --text '$_W_msg_body' \
-                --list \
-                --checklist \
-                --column '' \
-                --column 設定 \
-                --column 標題 \
-                --height $WINETRICKS_MENU_HEIGHT \
-                --width $WINETRICKS_MENU_WIDTH \
-                "
-            ;;
-        zh_HK*) printf %s "zenity \
+        zh_TW*|zh_HK*) printf %s "zenity \
                 --title '$_W_msg_title' \
                 --text '$_W_msg_body' \
                 --list \
@@ -2830,11 +2907,7 @@ winetricks_showmenu()
          _W_msg_body='君欲安装何种应用？'
          _W_cached="已缓存"
          ;;
-    zh_TW*)   _W_msg_title="Windows 應用裝載向導 - 目前容器路徑是 \"$WINEPREFIX\""
-         _W_msg_body='君欲裝載何種應用？'
-         _W_cached="已緩存"
-         ;;
-    zh_HK*)   _W_msg_title="Windows 應用裝載向導 - 目前容器路徑是 \"$WINEPREFIX\""
+    zh_TW*|zh_HK*)   _W_msg_title="Windows 應用裝載向導 - 目前容器路徑是 \"$WINEPREFIX\""
          _W_msg_body='君欲裝載何種應用？'
          _W_cached="已緩存"
          ;;
@@ -2938,25 +3011,7 @@ winetricks_showmenu()
                 --width $WINETRICKS_MENU_WIDTH \
                 "
              ;;
-        zh_TW*) printf %s "zenity \
-                --title '$_W_msg_title' \
-                --text '$_W_msg_body' \
-                --list \
-                --checklist \
-                --column '' \
-                --column 包名 \
-                --column 軟體名 \
-                --column 發行商 \
-                --column 發行年 \
-                --column 媒介 \
-                --column 狀態 \
-                --column '檔案大小 (MB)' \
-                --column '時間 (秒)' \
-                --height $WINETRICKS_MENU_HEIGHT \
-                --width $WINETRICKS_MENU_WIDTH \
-                "
-             ;;
-        zh_HK*) printf %s "zenity \
+        zh_TW*|zh_HK*) printf %s "zenity \
                 --title '$_W_msg_title' \
                 --text '$_W_msg_body' \
                 --list \
@@ -3228,8 +3283,7 @@ winetricks_list_all()
     pl*) _W_cached="zarchiwizowane"   ; _W_download="do pobrania"  ;;
     uk*) _W_cached="кешовано"   ; _W_download="завантажуване"  ;;
     zh_CN*)   _W_cached="已缓存"   ; _W_download="可下载"  ;;
-    zh_TW*)   _W_cached="已緩存"   ; _W_download="可下載"  ;;
-    zh_HK*)   _W_cached="已緩存"   ; _W_download="可下載"  ;;
+    zh_TW*|zh_HK*)   _W_cached="已緩存"   ; _W_download="可下載"  ;;
     *)   _W_cached="cached"   ; _W_download="downloadable"  ;;
     esac
 
@@ -3468,8 +3522,7 @@ winetricks_cache_iso()
         pl*)  w_warn "Włożono zły dysk [$_W_volname].  Proszę włożyć dysk [$_W_expected_volname]" ;;
             uk*)  w_warn "Неправильний диск [$_W_volname].  Будь ласка, вставте диск [$_W_expected_volname]" ;;
             zh_CN*)    w_warn " [$_W_volname] 光盘插入错误，请插入光盘 [$_W_expected_volname]" ;;
-            zh_TW*)    w_warn " [$_W_volname] 光槃插入錯誤，請插入光槃 [$_W_expected_volname]" ;;
-            zh_HK*)    w_warn " [$_W_volname] 光槃插入錯誤，請插入光槃 [$_W_expected_volname]" ;;
+            zh_TW*|zh_HK*)    w_warn " [$_W_volname] 光碟插入錯誤，請插入光碟 [$_W_expected_volname]" ;;
             *)    w_warn "Wrong disc [$_W_volname] inserted.  Please insert disc [$_W_expected_volname]" ;;
             esac
 
@@ -3689,8 +3742,7 @@ winetricks_mount_real_volume()
     pl*)  _W_mountmsg="Proszę włożyć dysk '$_W_expected_volname' (potrzebny paczce '$W_PACKAGE')" ;;
     uk*)  _W_mountmsg="Будь ласка, вставте том '$_W_expected_volname' (потрібний для пакунка '$W_PACKAGE')" ;;
     zh_CN*)  _W_mountmsg="请插入卷 '$_W_expected_volname' (为包 '$W_PACKAGE 所需')" ;;
-    zh_TW*)  _W_mountmsg="請插入卷 '$_W_expected_volname' (為包 '$W_PACKAGE 所需')" ;;
-    zh_HK*)  _W_mountmsg="請插入卷 '$_W_expected_volname' (為包 '$W_PACKAGE 所需')" ;;
+    zh_TW*|zh_HK*)  _W_mountmsg="請插入卷 '$_W_expected_volname' (為包 '$W_PACKAGE 所需')" ;;
     *)  _W_mountmsg="Please insert volume '$_W_expected_volname' (needed for package '$W_PACKAGE')" ;;
     esac
 
@@ -4217,8 +4269,7 @@ winetricks_install_app()
     pl*) fail_msg="Niepowodzenie przy instalacji paczki $1" ;;
     uk*) fail_msg="Помилка встановлення пакунка $1" ;;
     zh_CN*)   fail_msg="$1 安装失败" ;;
-    zh_TW*)   fail_msg="$1 裝載失敗" ;;
-    zh_HK*)   fail_msg="$1 裝載失敗" ;;
+    zh_TW*|zh_HK*)   fail_msg="$1 安裝失敗" ;;
     *)   fail_msg="Failed to install package $1" ;;
     esac
 
@@ -4269,6 +4320,14 @@ helper_d3dx9_xx()
     do
       w_try_cabextract -d "$W_SYSTEM32_DLLS" -L -F "$dllname.dll" "$x"
     done
+    if test "$W_ARCH" = "win64"
+    then
+        w_try_cabextract -d "$W_TMP" -L -F "*$dllname*x64*" "$W_CACHE"/directx9/$DIRECTX_NAME
+        for x in "$W_TMP"/*x64.cab
+        do
+            w_try_cabextract -d "$W_SYSTEM64_DLLS" -L -F "$dllname.dll" "$x"
+        done
+    fi
 
     w_override_dlls native $dllname
 }
@@ -4583,6 +4642,14 @@ load_d3dcompiler_43()
     do
       w_try_cabextract -d "$W_SYSTEM32_DLLS" -L -F "$dllname.dll" "$x"
     done
+    if test "$W_ARCH" = "win64"
+    then
+        w_try_cabextract -d "$W_TMP" -L -F "*$dllname*x64*" "$W_CACHE"/directx9/$DIRECTX_NAME
+        for x in "$W_TMP"/*x64.cab
+        do
+            w_try_cabextract -d "$W_SYSTEM64_DLLS" -L -F "$dllname.dll" "$x"
+        done
+    fi
 
     w_override_dlls native $dllname
 }
@@ -4627,6 +4694,14 @@ load_d3dx9()
     do
       w_try_cabextract -d "$W_SYSTEM32_DLLS" -L -F 'd3dx9*.dll' "$x"
     done
+    if test "$W_ARCH" = "win64"
+    then
+        w_try_cabextract -d "$W_TMP" -L -F '*d3dx9*x64*' "$W_CACHE"/directx9/$DIRECTX_NAME
+        for x in "$W_TMP"/*x64.cab
+        do
+            w_try_cabextract -d "$W_SYSTEM64_DLLS" -L -F 'd3dx9*.dll' "$x"
+        done
+    fi
 
     # For now, not needed, but when Wine starts preferring our builtin dll over native it will be.
     w_override_dlls native d3dx9_24 d3dx9_25 d3dx9_26 d3dx9_27 d3dx9_28 d3dx9_29 d3dx9_30
@@ -4760,6 +4835,14 @@ load_d3dx9_43()
     do
       w_try_cabextract -d "$W_SYSTEM32_DLLS" -L -F "$dllname.dll" "$x"
     done
+    if test "$W_ARCH" = "win64"
+    then
+        w_try_cabextract -d "$W_TMP" -L -F "*$dllname*x64*" "$W_CACHE"/directx9/$DIRECTX_NAME
+        for x in "$W_TMP"/*x64.cab
+        do
+            w_try_cabextract -d "$W_SYSTEM64_DLLS" -L -F "$dllname.dll" "$x"
+        done
+    fi
 
     w_override_dlls native $dllname
 }
@@ -4785,6 +4868,14 @@ load_d3dx11_42()
     do
       w_try_cabextract -d "$W_SYSTEM32_DLLS" -L -F "$dllname.dll" "$x"
     done
+    if test "$W_ARCH" = "win64"
+    then
+        w_try_cabextract -d "$W_TMP" -L -F "*$dllname*x64*" "$W_CACHE"/directx9/$DIRECTX_NAME
+        for x in "$W_TMP"/*x64.cab
+        do
+            w_try_cabextract -d "$W_SYSTEM64_DLLS" -L -F "$dllname.dll" "$x"
+        done
+    fi
 
     w_override_dlls native $dllname
 }
@@ -4810,6 +4901,14 @@ load_d3dx11_43()
     do
       w_try_cabextract -d "$W_SYSTEM32_DLLS" -L -F "$dllname.dll" "$x"
     done
+    if test "$W_ARCH" = "win64"
+    then
+        w_try_cabextract -d "$W_TMP" -L -F "*$dllname*x64*" "$W_CACHE"/directx9/$DIRECTX_NAME
+        for x in "$W_TMP"/*x64.cab
+        do
+            w_try_cabextract -d "$W_SYSTEM64_DLLS" -L -F "$dllname.dll" "$x"
+        done
+    fi
 
     w_override_dlls native $dllname
 }
@@ -4821,12 +4920,12 @@ w_metadata d3dx10 dlls \
     publisher="Microsoft" \
     year="2010" \
     media="download" \
-    file1="../directx9/directx_feb2010_redist.exe" \
+    file1="../directx9/directx_Jun2010_redist.exe" \
     installed_file1="$W_SYSTEM32_DLLS_WIN/d3dx10_33.dll"
 
 load_d3dx10()
 {
-    helper_directx_dl
+    helper_directx_Jun2010
 
     # Kinder, less invasive directx10 - only extract and override d3dx10_??.dll
     w_try_cabextract -d "$W_TMP" -L -F '*d3dx10*x86*' "$W_CACHE"/directx9/$DIRECTX_NAME
@@ -4834,6 +4933,14 @@ load_d3dx10()
     do
       w_try_cabextract -d "$W_SYSTEM32_DLLS" -L -F 'd3dx10*.dll' "$x"
     done
+    if test "$W_ARCH" = "win64"
+    then
+        w_try_cabextract -d "$W_TMP" -L -F '*d3dx10*x64*' "$W_CACHE"/directx9/$DIRECTX_NAME
+        for x in "$W_TMP"/*x64.cab
+        do
+            w_try_cabextract -d "$W_SYSTEM64_DLLS" -L -F 'd3dx10*.dll' "$x"
+        done
+    fi
 
     # For now, not needed, but when Wine starts preferring our builtin dll over native it will be.
     w_override_dlls native d3dx10_33 d3dx10_34 d3dx10_35 d3dx10_36 d3dx10_37
@@ -5585,7 +5692,7 @@ load_dotnet30()
     w_download http://web.archive.org/web/20120509084326/http://download.microsoft.com/download/3/F/0/3F0A922C-F239-4B9B-9CB0-DF53621C57D9/dotnetfx3.exe f3d2c3c7e4c0c35450cf6dab1f9f2e9e7ff50039
 
     w_call remove_mono
-    
+
     if test -f /proc/sys/kernel/yama/ptrace_scope
     then
         case `cat /proc/sys/kernel/yama/ptrace_scope` in
@@ -5658,7 +5765,7 @@ w_metadata dotnet30sp1 dlls \
 
 load_dotnet30sp1()
 {
-    # FIXME: URL?    
+    # FIXME: URL?
     w_download http://download.microsoft.com/download/8/F/E/8FEEE89D-9E4F-4BA3-993E-0FFEA8E21E1B/NetFx30SP1_x86.exe 8d779e337920b097aa0c01859912950606e9fc12
     # Recipe from http://bugs.winehq.org/show_bug.cgi?id=25060#c10
     w_download http://download.microsoft.com/download/2/5/2/2526f55d-32bc-410f-be18-164ba67ae07d/XPSEP%20XP%20and%20Server%202003%2032%20bit.msi 5d332ebd1025e294adafe72030fe33db707b2c82 "XPSEP XP and Server 2003 32 bit.msi"
@@ -6053,7 +6160,7 @@ load_flash()
     #w_download https://fpdownload.macromedia.com/get/flashplayer/pdc/14.0.0.176/install_flash_player_ax.exe 16231b509d8e689dc34ae36597d41c4fb1b3a67e
     # 2014-10-02
     w_download http://download.macromedia.com/pub/flashplayer/installers/archive/fp_14.0.0.176_archive.zip 40df72ab2c22bcd4442aa35eb586000776129982
-    
+
     w_try_unzip "$W_TMP" "$W_CACHE"/flash/fp_14.0.0.176_archive.zip fp_14.0.0.176_archive/14_0_r0_176/flashplayer14_0r0_176_winax.exe
     cd "$W_TMP"/fp_14.0.0.176_archive/14_0_r0_176
     w_try "$WINE" flashplayer14_0r0_176_winax.exe ${W_OPT_UNATTENDED:+ /install}
@@ -6419,13 +6526,13 @@ w_metadata kindle apps \
     publisher="Amazon" \
     year="2015" \
     media="download" \
-    file1="KindleForPC-installer.exe" \
+    file1="KindleForPC-installer-1.12.40996.exe" \
     installed_exe1="$W_PROGRAMS_WIN/Amazon/Kindle/Kindle.exe" \
     homepage="http://www.amazon.com/gp/feature.html/?docId=1000426311"
 
 load_kindle()
 {
-    w_download http://kindleforpc.amazon.com/40666/KindleForPC-installer.exe 10e8c82587f8c08b77e5ed55dd94d9851a2a899c
+    w_download http://kindleforpc.amazon.com/40996/KindleForPC-installer-1.12.40996.exe bda4bcbcf905da2f900a99e09fffe44dec060131
     cd "$W_CACHE"/kindle
     w_try "$WINE" $file1 ${W_OPT_UNATTENDED:+ /S}
     w_declare_exe "$W_PROGRAMS_WIN\\Amazon\\Kindle" Kindle.exe
@@ -7082,7 +7189,7 @@ w_metadata physx dlls \
 
 load_physx()
 {
-    # Has a minor issue, see bug report http://bugs.winehq.org/show_bug.cgi?id=34167 
+    # Has a minor issue, see bug report http://bugs.winehq.org/show_bug.cgi?id=34167
     w_download http://uk.download.nvidia.com/Windows/9.14.0702/PhysX-9.14.0702-SystemSoftware.msi 81e2d38e2356e807ad80cdf150ed5acfff839c8b
     cd "$W_CACHE"/physx
     w_try "$WINE" msiexec /i PhysX-9.14.0702-SystemSoftware.msi $W_UNATTENDED_SLASH_Q
@@ -8170,12 +8277,31 @@ load_xact()
       w_try_cabextract -d "$W_SYSTEM32_DLLS" -L -F 'x3daudio*.dll' "$x"
       w_try_cabextract -d "$W_SYSTEM32_DLLS" -L -F 'xapofx*.dll' "$x"
     done
+    if test "$W_ARCH" = "win64"
+    then
+        w_try_cabextract -d "$W_TMP" -L -F '*_xact_*x64*' "$W_CACHE"/directx9/$DIRECTX_NAME
+        w_try_cabextract -d "$W_TMP" -L -F '*_x3daudio_*x64*' "$W_CACHE"/directx9/$DIRECTX_NAME
+        w_try_cabextract -d "$W_TMP" -L -F '*_xaudio_*x64*' "$W_CACHE"/directx9/$DIRECTX_NAME
+        for x in "$W_TMP"/*x64.cab
+        do
+          w_try_cabextract -d "$W_SYSTEM64_DLLS" -L -F 'xactengine*.dll' "$x"
+          w_try_cabextract -d "$W_SYSTEM64_DLLS" -L -F 'xaudio*.dll' "$x"
+          w_try_cabextract -d "$W_SYSTEM64_DLLS" -L -F 'x3daudio*.dll' "$x"
+          w_try_cabextract -d "$W_SYSTEM64_DLLS" -L -F 'xapofx*.dll' "$x"
+        done
+    fi
 
-    # Register xactengine?_?.dll, xaudio?_?.dll
-    for x in "$W_SYSTEM32_DLLS"/xactengine* "$W_SYSTEM32_DLLS"/xaudio*
+    # Register xactengine?_?.dll
+    for x in "$W_SYSTEM32_DLLS"/xactengine*
     do
       w_try_regsvr `basename "$x"`
     done
+
+    # and xaudio?_?.dll, but not xaudio2_8 (unsupported)
+    for x in 0 1 2 3 4 5 6 7
+    do
+      w_try_regsvr `basename "$W_SYSTEM32_DLLS/xaudio2_${x}"`
+    done
 }
 
 #----------------------------------------------------------------
@@ -8203,12 +8329,31 @@ load_xact_jun2010()
       w_try_cabextract -d "$W_SYSTEM32_DLLS" -L -F 'x3daudio*.dll' "$x"
       w_try_cabextract -d "$W_SYSTEM32_DLLS" -L -F 'xapofx*.dll' "$x"
     done
+    if test "$W_ARCH" = "win64"
+    then
+        w_try_cabextract -d "$W_TMP" -L -F '*_xact_*x64*' "$W_CACHE"/directx9/$DIRECTX_NAME
+        w_try_cabextract -d "$W_TMP" -L -F '*_x3daudio_*x64*' "$W_CACHE"/directx9/$DIRECTX_NAME
+        w_try_cabextract -d "$W_TMP" -L -F '*_xaudio_*x64*' "$W_CACHE"/directx9/$DIRECTX_NAME
+        for x in "$W_TMP"/*x64.cab
+        do
+          w_try_cabextract -d "$W_SYSTEM64_DLLS" -L -F 'xactengine*.dll' "$x"
+          w_try_cabextract -d "$W_SYSTEM64_DLLS" -L -F 'xaudio*.dll' "$x"
+          w_try_cabextract -d "$W_SYSTEM64_DLLS" -L -F 'x3daudio*.dll' "$x"
+          w_try_cabextract -d "$W_SYSTEM64_DLLS" -L -F 'xapofx*.dll' "$x"
+        done
+    fi
 
-    # Register xactengine?_?.dll, xaudio?_?.dll
-    for x in "$W_SYSTEM32_DLLS"/xactengine* "$W_SYSTEM32_DLLS"/xaudio*
+    # Register xactengine?_?.dll
+    for x in "$W_SYSTEM32_DLLS"/xactengine*
     do
       w_try_regsvr `basename "$x"`
     done
+
+    # and xaudio?_?.dll, but not xaudio2_8 (unsupported)
+    for x in 0 1 2 3 4 5 6 7
+    do
+      w_try_regsvr `basename "$W_SYSTEM32_DLLS/xaudio2_${x}"`
+    done
 }
 
 #----------------------------------------------------------------
@@ -8230,6 +8375,14 @@ load_xinput()
     do
       w_try_cabextract -d "$W_SYSTEM32_DLLS" -L -F 'xinput*.dll' "$x"
     done
+    if test "$W_ARCH" = "win64"
+    then
+        w_try_cabextract -d "$W_TMP" -L -F '*_xinput_*x64*' "$W_CACHE"/directx9/$DIRECTX_NAME
+        for x in "$W_TMP"/*x64.cab
+        do
+            w_try_cabextract -d "$W_SYSTEM64_DLLS" -L -F 'xinput*.dll' "$x"
+        done
+    fi
     w_try_regsvr xinput1_1.dll
     w_try_regsvr xinput1_2.dll
     w_try_regsvr xinput1_3.dll
@@ -8963,6 +9116,25 @@ load_allfonts()
 # Apps
 #----------------------------------------------------------------
 
+w_metadata 3m_library apps \
+    title="3M Cloud Library" \
+    publisher="3M Company" \
+    year="2015" \
+    media="download" \
+    file1="3M-TM-Cloud-Library-PC-App-LIVE-Installer-1.51.735677.exe" \
+    installed_exe1="$W_PROGRAMS_X86_WIN/3M(TM) Cloud Library PC App/3MCloudLibrary.exe"
+    homepage="http://www.3m.com/us/library/eBook/index.html"
+
+load_3m_library()
+{
+    w_download http://www.3m.com/us/library/eBook/docs/3M-TM-Cloud-Library-PC-App-LIVE-Installer-1.51.735677.exe 810dc5f6b74ab7b34893288ee44ef7dc563a4ee7
+    cd "$W_CACHE/$W_PACKAGE"
+    w_try "$WINE" 3M-TM-Cloud-Library-PC-App-LIVE-Installer-1.51.735677.exe $W_UNATTENDED_SLASH_S
+    w_declare_exe "$W_PROGRAMS_X86_WIN\\3M(TM) Cloud Library PC App" "3MCloudLibrary.exe"
+}
+
+#----------------------------------------------------------------
+
 w_metadata 7zip apps \
     title="7-Zip 15.05 beta" \
     publisher="Igor Pavlov" \
@@ -9383,11 +9555,11 @@ load_irfanview()
             ControlClick, Button1 ; deselect chrome googsrch
             Sleep 900
             ControlClick, Button18 ; Next
-            Sleep 1000 
+            Sleep 1000
             winwait, Setup, INI
             Sleep 1000
             ControlClick, Button23 ; Next
-            Sleep 1000 
+            Sleep 1000
             winwait, Setup, You want to change
             winactivate, Setup, really
             Sleep 900
@@ -9761,7 +9933,7 @@ load_mingw()
 
     cd "$W_CACHE/mingw"
     w_try "$WINE" "$file1"
-    
+
     w_append_path 'C:\MinGW\bin'
     w_try "$WINE" mingw-get update
     w_try "$WINE" mingw-get install gcc msys-base
@@ -10000,7 +10172,9 @@ w_metadata picasa39 apps \
 
 load_picasa39()
 {
-    w_download http://dl.google.com/picasa/picasa39-setup.exe 39b2df46dbc423e250371e826026a2827f55b956
+    # 2015/01/17: 39b2df46dbc423e250371e826026a2827f55b956
+    # 2015/09/21: 55907fc84b1d9d6a450463869b16927f07737298
+    w_download http://dl.google.com/picasa/picasa39-setup.exe 55907fc84b1d9d6a450463869b16927f07737298
     if w_workaround_wine_bug 29434 "Picasa 3.9 fails to authenticate with Google"
     then
         w_warn "Picasa 3.9 authentication to the Google account is currently broken under wine. See http://bugs.winehq.org/show_bug.cgi?id=29434 for more details."
@@ -10656,7 +10830,7 @@ load_vc2005expresssp1()
     if w_workaround_wine_bug 37375
         then
             w_warn "Installer currently fails"
-    fi 
+    fi
     w_download http://download.microsoft.com/download/7/7/3/7737290f-98e8-45bf-9075-85cc6ae34bf1/VS80sp1-KB926748-X86-INTL.exe 8b9a0172efad64774aa122f29e093ad2043b308d
     w_try $WINE "$W_CACHE"/vc2005expresssp1/VS80sp1-KB926748-X86-INTL.exe
 }
@@ -10852,25 +11026,25 @@ load_winamp()
             WinWait, Installer Language, Please select
             Sleep 500
             ControlClick, Button1 ; OK
-            WinWait, Winamp Installer, Welcome to the Winamp installer 
+            WinWait, Winamp Installer, Welcome to the Winamp installer
             Sleep 500
             ControlClick, Button2 ; Next
-            WinWait, Winamp Installer, License Agreement 
+            WinWait, Winamp Installer, License Agreement
             Sleep 500
             ControlClick, Button2 ; I Agree
-            WinWait, Winamp Installer, Choose Install Location 
+            WinWait, Winamp Installer, Choose Install Location
             Sleep 500
             ControlClick, Button2 ; Next
-            WinWait, Winamp Installer, Choose Components 
+            WinWait, Winamp Installer, Choose Components
             Sleep 500
             ControlClick, Button2 ; Next for Full install
-            WinWait, Winamp Installer, Choose Start Options 
+            WinWait, Winamp Installer, Choose Start Options
             Sleep 500
-            ControlClick, Button4 ; uncheck start menu entry 
+            ControlClick, Button4 ; uncheck start menu entry
             Sleep 500
-            ControlClick, Button5 ; uncheck ql icon 
+            ControlClick, Button5 ; uncheck ql icon
             Sleep 500
-            ControlClick, Button6 ; uncheck deskto icon 
+            ControlClick, Button6 ; uncheck deskto icon
             Sleep 500
             ControlClick, Button2 ; Install
             WinWait, Winamp Installer, Installation Complete
@@ -11458,7 +11632,7 @@ load_amnesia_tdd_demo()
             WinWait, Amnesia - The Dark Descent Demo, finished
             ControlClick, TNewButton4
             WinWaitClose, Amnesia - The Dark Descent Demo, finished
-        }       
+        }
     "
 
     w_declare_exe "$W_PROGRAMS_X86_WIN\\Amnesia - The Dark Descent Demo\\redist" "Amnesia.exe"
@@ -16014,18 +16188,20 @@ load_puzzleagent_demo()
 #----------------------------------------------------------------
 
 w_metadata qq apps \
- title="QQ 6.3 (Chinese chat app)" \
+ title="QQ 7.1 (Chinese chat app)" \
  publisher="Tencent" \
- year="2014" \
+ year="2015" \
  media="download" \
- file1="QQ6.3.exe" \
+ file1="QQ7.1.exe" \
+ file2="QQ.tar.gz"\
  installed_exe1="$W_PROGRAMS_X86_WIN/Tencent/QQ/Bin/QQ.exe" \
  homepage="http://www.qq.com" \
  unattended="no"
 
 load_qq()
 {
-    w_download http://dldir1.qq.com/qqfile/qq/QQ6.3/12369/QQ6.3.exe cebe73a2f8b7299ba0f01aba779e0e4a7dbd173b
+    w_download http://dldir1.qq.com/qqfile/qq/QQ7.1/14522/QQ7.1.exe 700b469560b1bd8521ede61a0e169ff8c38b1d29
+    w_download http://hillwoodhome.net/wine/QQ.tar.gz 08de45d3e5bb34b22e7c33e1163daec69742db58
 
     if w_workaround_wine_bug 29636 "Installing native riched20 to work around crash bug"
     then
@@ -16043,6 +16219,19 @@ load_qq()
     # uses mfc42u.dll
     w_call mfc42
 
+    if w_workaround_wine_bug 38171 "Installing desktop file to work around bug"
+    then
+        cd "$W_TMP/"
+        tar -zxf "$W_CACHE/qq/QQ.tar.gz"
+        mkdir -p $HOME/.local/share/applications/wine/Programs/腾讯软件/QQ
+        mkdir -p $HOME/.local/share/icons/hicolor/48x48/apps
+        mkdir -p $HOME/.local/share/icons/hicolor/256x256/apps
+        w_try mv QQ/腾讯QQ.desktop ~/.local/share/applications/wine/Programs/腾讯软件/QQ
+        w_try mv QQ/48x48/QQ.png ~/.local/share/icons/hicolor/48x48/apps
+        w_try mv QQ/256x256/QQ.png ~/.local/share/icons/hicolor/256x256/apps
+        echo Exec=env WINEPREFIX=$WINEPREFIX $WINE C:\/Program\\ Files\/Tencent\/QQ\/Bin\/QQ.exe >> $HOME/.local/share/applications/wine/Programs/腾讯软件/QQ/腾讯QQ.desktop
+    fi
+
     cd "$W_CACHE/$W_PACKAGE"
     w_try "$WINE" "$file1"
     w_declare_exe "$W_PROGRAMS_X86_WIN\\Tencent\\QQ\\Bin" QQ.exe
@@ -19192,6 +19381,7 @@ execute_command()
     winecfg) "$WINE" winecfg ;;
     regedit) "$WINE" regedit ;;
     taskmgr) "$WINE" taskmgr & ;;
+    uninstaller) "$WINE" uninstaller ;;
     shell) winetricks_shell ;;
 
     # These have to come before *=disabled to avoid looking like dlls