wine-commits July 2015

wine-commits@winehq.org

2 participants
567 discussions

Henri Verbeet : d2d1: Also infer the alpha mode in d2d_d3d_render_target_CreateBitmapFromWicBitmap ().
by Alexandre Julliard 28 Jul '15

28 Jul '15

Module: wine Branch: master Commit: ccc347038bd38d793536ca3c080f9198372c7e6f URL: http://source.winehq.org/git/wine.git/?a=commit;h=ccc347038bd38d793536ca3c0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jul 23 19:32:05 2015 +0200 d2d1: Also infer the alpha mode in d2d_d3d_render_target_CreateBitmapFromWicBitmap(). --- dlls/d2d1/render_target.c | 48 ++++++++++++++++++++++++++++++++--------------- 1 file changed, 33 insertions(+), 15 deletions(-) diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index e939fef..1c641e7 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -300,14 +300,28 @@ static HRESULT STDMETHODCALLTYPE d2d_d3d_render_target_CreateBitmap(ID2D1RenderT static HRESULT STDMETHODCALLTYPE d2d_d3d_render_target_CreateBitmapFromWicBitmap(ID2D1RenderTarget *iface, IWICBitmapSource *bitmap_source, const D2D1_BITMAP_PROPERTIES *desc, ID2D1Bitmap **bitmap) { + const D2D1_PIXEL_FORMAT *d2d_format; D2D1_BITMAP_PROPERTIES bitmap_desc; + WICPixelFormatGUID wic_format; unsigned int bpp, data_size; D2D1_SIZE_U size; + unsigned int i; WICRect rect; UINT32 pitch; HRESULT hr; void *data; + static const struct + { + const WICPixelFormatGUID *wic; + D2D1_PIXEL_FORMAT d2d; + } + format_lookup[] = + { + {&GUID_WICPixelFormat32bppPBGRA, {DXGI_FORMAT_B8G8R8A8_UNORM, D2D1_ALPHA_MODE_PREMULTIPLIED}}, + {&GUID_WICPixelFormat32bppBGR, {DXGI_FORMAT_B8G8R8A8_UNORM, D2D1_ALPHA_MODE_IGNORE}}, + }; + TRACE("iface %p, bitmap_source %p, desc %p, bitmap %p.\n", iface, bitmap_source, desc, bitmap); @@ -329,28 +343,32 @@ static HRESULT STDMETHODCALLTYPE d2d_d3d_render_target_CreateBitmapFromWicBitmap bitmap_desc = *desc; } - if (bitmap_desc.pixelFormat.format == DXGI_FORMAT_UNKNOWN) + if (FAILED(hr = IWICBitmapSource_GetPixelFormat(bitmap_source, &wic_format))) { - WICPixelFormatGUID wic_format; + WARN("Failed to get bitmap format, hr %#x.\n", hr); + return hr; + } - if (FAILED(hr = IWICBitmapSource_GetPixelFormat(bitmap_source, &wic_format))) + for (i = 0, d2d_format = NULL; i < sizeof(format_lookup) / sizeof(*format_lookup); ++i) + { + if (IsEqualGUID(&wic_format, format_lookup[i].wic)) { - WARN("Failed to get bitmap format, hr %#x.\n", hr); - return hr; + d2d_format = &format_lookup[i].d2d; + break; } + } - if (IsEqualGUID(&wic_format, &GUID_WICPixelFormat32bppPBGRA) - || IsEqualGUID(&wic_format, &GUID_WICPixelFormat32bppBGR)) - { - bitmap_desc.pixelFormat.format = DXGI_FORMAT_B8G8R8A8_UNORM; - } - else - { - WARN("Unsupported WIC bitmap format %s.\n", debugstr_guid(&wic_format)); - return D2DERR_UNSUPPORTED_PIXEL_FORMAT; - } + if (!d2d_format) + { + WARN("Unsupported WIC bitmap format %s.\n", debugstr_guid(&wic_format)); + return D2DERR_UNSUPPORTED_PIXEL_FORMAT; } + if (bitmap_desc.pixelFormat.format == DXGI_FORMAT_UNKNOWN) + bitmap_desc.pixelFormat.format = d2d_format->format; + if (bitmap_desc.pixelFormat.alphaMode == D2D1_ALPHA_MODE_UNKNOWN) + bitmap_desc.pixelFormat.alphaMode = d2d_format->alphaMode; + switch (bitmap_desc.pixelFormat.format) { case DXGI_FORMAT_B8G8R8A8_UNORM:

1 0

Henri Verbeet : include: Add WIC error codes to winerror.h.
by Alexandre Julliard 28 Jul '15

28 Jul '15

Module: wine Branch: master Commit: e9e21ab4f9b40c983e317acff75103d005434ef6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9e21ab4f9b40c983e317acff… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jul 23 19:32:04 2015 +0200 include: Add WIC error codes to winerror.h. --- include/wincodec.idl | 17 ----------------- include/winerror.h | 41 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+), 17 deletions(-) diff --git a/include/wincodec.idl b/include/wincodec.idl index 7216d07..639d925 100644 --- a/include/wincodec.idl +++ b/include/wincodec.idl @@ -220,23 +220,6 @@ typedef struct WICBitmapPattern { typedef UINT32 WICColor; -cpp_quote("#define WINCODEC_ERR_WRONGSTATE 0x88982f04") -cpp_quote("#define WINCODEC_ERR_VALUEOUTOFRANGE 0x88982f05") -cpp_quote("#define WINCODEC_ERR_NOTINITIALIZED 0x88982f0c") -cpp_quote("#define WINCODEC_ERR_ALREADYLOCKED 0x88982f0d") -cpp_quote("#define WINCODEC_ERR_PROPERTYNOTFOUND 0x88982f40") -cpp_quote("#define WINCODEC_ERR_CODECNOTHUMBNAIL 0x88982f44") -cpp_quote("#define WINCODEC_ERR_PALETTEUNAVAILABLE 0x88982f45") -cpp_quote("#define WINCODEC_ERR_COMPONENTNOTFOUND 0x88982f50") -cpp_quote("#define WINCODEC_ERR_BADIMAGE 0x88982f60") -cpp_quote("#define WINCODEC_ERR_FRAMEMISSING 0x88982f62") -cpp_quote("#define WINCODEC_ERR_BADMETADATAHEADER 0x88982f63") -cpp_quote("#define WINCODEC_ERR_UNSUPPORTEDPIXELFORMAT 0x88982f80") -cpp_quote("#define WINCODEC_ERR_UNSUPPORTEDOPERATION 0x88982f81") -cpp_quote("#define WINCODEC_ERR_INSUFFICIENTBUFFER 0x88982f8c") -cpp_quote("#define WINCODEC_ERR_PROPERTYUNEXPECTEDTYPE 0x88982f8e") -cpp_quote("#define WINCODEC_ERR_WIN32ERROR 0x88982f94") - interface IWICPalette; [ diff --git a/include/winerror.h b/include/winerror.h index f1c2f3b..1c9df07 100644 --- a/include/winerror.h +++ b/include/winerror.h @@ -2995,6 +2995,47 @@ static inline HRESULT HRESULT_FROM_WIN32(unsigned int x) #define SCARD_W_CACHE_ITEM_STALE _HRESULT_TYPEDEF_(0x80100071) #define SCARD_W_CACHE_ITEM_TOO_BIG _HRESULT_TYPEDEF_(0x80100072) +#define WINCODEC_ERR_WRONGSTATE _HRESULT_TYPEDEF_(0x88982f04) +#define WINCODEC_ERR_VALUEOUTOFRANGE _HRESULT_TYPEDEF_(0x88982f05) +#define WINCODEC_ERR_UNKNOWNIMAGEFORMAT _HRESULT_TYPEDEF_(0x88982f07) +#define WINCODEC_ERR_UNSUPPORTEDVERSION _HRESULT_TYPEDEF_(0x88982f0b) +#define WINCODEC_ERR_NOTINITIALIZED _HRESULT_TYPEDEF_(0x88982f0c) +#define WINCODEC_ERR_ALREADYLOCKED _HRESULT_TYPEDEF_(0x88982f0d) +#define WINCODEC_ERR_PROPERTYNOTFOUND _HRESULT_TYPEDEF_(0x88982f40) +#define WINCODEC_ERR_PROPERTYNOTSUPPORTED _HRESULT_TYPEDEF_(0x88982f41) +#define WINCODEC_ERR_PROPERTYSIZE _HRESULT_TYPEDEF_(0x88982f42) +#define WINCODEC_ERR_CODECPRESENT _HRESULT_TYPEDEF_(0x88982f43) +#define WINCODEC_ERR_CODECNOTHUMBNAIL _HRESULT_TYPEDEF_(0x88982f44) +#define WINCODEC_ERR_PALETTEUNAVAILABLE _HRESULT_TYPEDEF_(0x88982f45) +#define WINCODEC_ERR_CODECTOOMANYSCANLINES _HRESULT_TYPEDEF_(0x88982f46) +#define WINCODEC_ERR_INTERNALERROR _HRESULT_TYPEDEF_(0x88982f48) +#define WINCODEC_ERR_SOURCERECTDOESNOTMATCHDIMENSIONS _HRESULT_TYPEDEF_(0x88982f49) +#define WINCODEC_ERR_COMPONENTNOTFOUND _HRESULT_TYPEDEF_(0x88982f50) +#define WINCODEC_ERR_IMAGESIZEOUTOFRANGE _HRESULT_TYPEDEF_(0x88982f51) +#define WINCODEC_ERR_TOOMUCHMETADATA _HRESULT_TYPEDEF_(0x88982f52) +#define WINCODEC_ERR_BADIMAGE _HRESULT_TYPEDEF_(0x88982f60) +#define WINCODEC_ERR_BADHEADER _HRESULT_TYPEDEF_(0x88982f61) +#define WINCODEC_ERR_FRAMEMISSING _HRESULT_TYPEDEF_(0x88982f62) +#define WINCODEC_ERR_BADMETADATAHEADER _HRESULT_TYPEDEF_(0x88982f63) +#define WINCODEC_ERR_BADSTREAMDATA _HRESULT_TYPEDEF_(0x88982f70) +#define WINCODEC_ERR_STREAMWRITE _HRESULT_TYPEDEF_(0x88982f71) +#define WINCODEC_ERR_STREAMREAD _HRESULT_TYPEDEF_(0x88982f72) +#define WINCODEC_ERR_STREAMNOTAVAILABLE _HRESULT_TYPEDEF_(0x88982f73) +#define WINCODEC_ERR_UNSUPPORTEDPIXELFORMAT _HRESULT_TYPEDEF_(0x88982f80) +#define WINCODEC_ERR_UNSUPPORTEDOPERATION _HRESULT_TYPEDEF_(0x88982f81) +#define WINCODEC_ERR_INVALIDREGISTRATION _HRESULT_TYPEDEF_(0x88982f8a) +#define WINCODEC_ERR_COMPONENTINITIALIZEFAILURE _HRESULT_TYPEDEF_(0x88982f8b) +#define WINCODEC_ERR_INSUFFICIENTBUFFER _HRESULT_TYPEDEF_(0x88982f8c) +#define WINCODEC_ERR_DUPLICATEMETADATAPRESENT _HRESULT_TYPEDEF_(0x88982f8d) +#define WINCODEC_ERR_PROPERTYUNEXPECTEDTYPE _HRESULT_TYPEDEF_(0x88982f8e) +#define WINCODEC_ERR_UNEXPECTEDSIZE _HRESULT_TYPEDEF_(0x88982f8f) +#define WINCODEC_ERR_INVALIDQUERYREQUEST _HRESULT_TYPEDEF_(0x88982f90) +#define WINCODEC_ERR_UNEXPECTEDMETADATATYPE _HRESULT_TYPEDEF_(0x88982f91) +#define WINCODEC_ERR_REQUESTONLYVALIDATMETADATAROOT _HRESULT_TYPEDEF_(0x88982f92) +#define WINCODEC_ERR_INVALIDQUERYCHARACTER _HRESULT_TYPEDEF_(0x88982f93) +#define WINCODEC_ERR_WIN32ERROR _HRESULT_TYPEDEF_(0x88982f94) +#define WINCODEC_ERR_INVALIDPROGRESSIVELEVEL _HRESULT_TYPEDEF_(0x88982f95) + #define DWRITE_E_FILEFORMAT _HRESULT_TYPEDEF_(0x88985000) #define DWRITE_E_UNEXPECTED _HRESULT_TYPEDEF_(0x88985001) #define DWRITE_E_NOFONT _HRESULT_TYPEDEF_(0x88985002)

1 0

Jeremy Newman : use the development wine version on Debian
by Jeremy Newman 23 Jul '15

23 Jul '15

Module: website Branch: master Commit: 8da818b180d95c6089cb69129b245fc89b97f917 URL: http://source.winehq.org/git/website.git/?a=commit;h=8da818b180d95c6089cb69… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Thu Jul 23 09:06:08 2015 -0500 use the development wine version on Debian --- templates/de/download.template | 4 ++-- templates/en/download.template | 4 ++-- templates/fr/download.template | 4 ++-- templates/he/download.template | 4 ++-- templates/pl/download.template | 4 ++-- templates/pt/download.template | 4 ++-- templates/tr/download.template | 4 ++-- templates/uk/download.template | 4 ++-- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/templates/de/download.template b/templates/de/download.template index 18c058d..479a717 100644 --- a/templates/de/download.template +++ b/templates/de/download.template @@ -69,10 +69,10 @@ für das Hosten der Wine-Webseite erbeten hat. </tr> <tr bgcolor="#ffffff"> - <td align=center><a href="https://packages.debian.org/stable/wine"> + <td align=center><a href="https://packages.debian.org/stable/wine-development"> <img src="{$root}/images/distro/debian.png" width="50" height="50" alt="Debian Linux" border="0"></a> </td> - <td> <a href="https://packages.debian.org/stable/wine">Debian</a> + <td> <a href="https://packages.debian.org/stable/wine-development">Debian</a> Binärpakete (.deb) für Debian</td> <td><a href="mailto:pkg-wine-party@lists.alioth.debian.org">Debian Wine Party</a></td> </tr> diff --git a/templates/en/download.template b/templates/en/download.template index f673da4..02bc360 100644 --- a/templates/en/download.template +++ b/templates/en/download.template @@ -68,10 +68,10 @@ requested in exchange for hosting the Wine web site. </tr> <tr bgcolor="#ffffff"> - <td align=center><a href="https://packages.debian.org/stable/wine"> + <td align=center><a href="https://packages.debian.org/stable/wine-development"> <img src="{$root}/images/distro/debian.png" width="50" height="50" alt="Debian Linux" border="0"></a> </td> - <td> <a href="https://packages.debian.org/stable/wine">Download Debian packages</a> + <td> <a href="https://packages.debian.org/stable/wine-development">Download Debian packages</a> - binary and source .debs for Debian</td> <td><a href="mailto:pkg-wine-party@lists.alioth.debian.org">Debian Wine Party</a></td> </tr> diff --git a/templates/fr/download.template b/templates/fr/download.template index fa62953..0d34178 100644 --- a/templates/fr/download.template +++ b/templates/fr/download.template @@ -71,10 +71,10 @@ center;">Voyez la </tr> <tr bgcolor="#ffffff"> - <td align=center><a href="https://packages.debian.org/stable/wine"> + <td align=center><a href="https://packages.debian.org/stable/wine-development"> <img src="{$root}/images/distro/debian.png" width="50" height="50" alt="Debian Linux" border="0"></a> </td> - <td> <a href="https://packages.debian.org/stable/wine">Paquets Debian</a> + <td> <a href="https://packages.debian.org/stable/wine-development">Paquets Debian</a> - .deb binaires pour Debian Sid</td> <td><a href="mailto:pkg-wine-party@lists.alioth.debian.org">Debian Wine Party</a></td> </tr> diff --git a/templates/he/download.template b/templates/he/download.template index 5d9400b..fd10e37 100644 --- a/templates/he/download.template +++ b/templates/he/download.template @@ -67,10 +67,10 @@ </tr> <tr bgcolor="#ffffff"> - <td align=center><a href="https://packages.debian.org/stable/wine"> + <td align=center><a href="https://packages.debian.org/stable/wine-development"> <img src="{$root}/images/distro/debian.png" width="50" height="50" alt="Debian Linux" border="0"></a> </td> - <td> <a href="https://packages.debian.org/stable/wine">הורדת חבילות לדביאן</a> + <td> <a href="https://packages.debian.org/stable/wine-development">הורדת חבילות לדביאן</a> - קובצי .debבינריים לדביאן; <td><a href="mailto:pkg-wine-party@lists.alioth.debian.org">Debian Wine Party</a></td> </tr> diff --git a/templates/pl/download.template b/templates/pl/download.template index cc3ed9a..4b39e63 100644 --- a/templates/pl/download.template +++ b/templates/pl/download.template @@ -65,10 +65,10 @@ </tr> <tr bgcolor="#ffffff"> - <td align=center><a href="https://packages.debian.org/stable/wine"> + <td align=center><a href="https://packages.debian.org/stable/wine-development"> <img src="{$root}/images/distro/debian.png" width="50" height="50" alt="Debian Linux" border="0"></a> </td> - <td> <a href="https://packages.debian.org/stable/wine">Pobierz paczki dla Debian</a> + <td> <a href="https://packages.debian.org/stable/wine-development">Pobierz paczki dla Debian</a> - binarne paczki .deb dla Debian</td> <td><a href="mailto:pkg-wine-party@lists.alioth.debian.org">Debian Wine Party</a></td> </tr> diff --git a/templates/pt/download.template b/templates/pt/download.template index f881093..66ce52f 100644 --- a/templates/pt/download.template +++ b/templates/pt/download.template @@ -64,10 +64,10 @@ </tr> <tr bgcolor="#ffffff"> - <td align=center><a href="https://packages.debian.org/stable/wine"> + <td align=center><a href="https://packages.debian.org/stable/wine-development"> <img src="{$root}/images/distro/debian.png" width="50" height="50" alt="Debian Linux" border="0"></a> </td> - <td> <a href="https://packages.debian.org/stable/wine">Descarregar pacotes para Debian</a> + <td> <a href="https://packages.debian.org/stable/wine-development">Descarregar pacotes para Debian</a> - .debs binários para Debian</td> <td><a href="mailto:pkg-wine-party@lists.alioth.debian.org">Debian Wine Party</a></td> </tr> diff --git a/templates/tr/download.template b/templates/tr/download.template index baa4442..4cc7d3d 100644 --- a/templates/tr/download.template +++ b/templates/tr/download.template @@ -64,10 +64,10 @@ </tr> <tr bgcolor="#ffffff"> - <td align=center><a href="https://packages.debian.org/stable/wine"> + <td align=center><a href="https://packages.debian.org/stable/wine-development"> <img src="{$root}/images/distro/debian.png" width="50" height="50" alt="Debian Linux" border="0"></a> </td> - <td> <a href="https://packages.debian.org/stable/wine">Debian paketleri indirin</a> + <td> <a href="https://packages.debian.org/stable/wine-development">Debian paketleri indirin</a> - Debian için ikili .deb dosyaları</td> <td><a href="mailto:pkg-wine-party@lists.alioth.debian.org">Debian Wine Party</a></td> </tr> diff --git a/templates/uk/download.template b/templates/uk/download.template index 59bf96c..5440152 100644 --- a/templates/uk/download.template +++ b/templates/uk/download.template @@ -65,10 +65,10 @@ </tr> <tr bgcolor="#ffffff"> - <td align=center><a href="https://packages.debian.org/stable/wine"> + <td align=center><a href="https://packages.debian.org/stable/wine-development"> <img src="{$root}/images/distro/debian.png" width="50" height="50" alt="Debian Linux" border="0"></a> </td> - <td> <a href="https://packages.debian.org/stable/wine">Завантажити пакунки Debian</a> + <td> <a href="https://packages.debian.org/stable/wine-development">Завантажити пакунки Debian</a> - бінарні .deb файли для Debian</td> <td><a href="mailto:pkg-wine-party@lists.alioth.debian.org">Debian Wine Party</a></td> </tr>

1 0

Jeremy Newman : remove duplicate debian redirects
by Jeremy Newman 22 Jul '15

22 Jul '15

Module: website Branch: master Commit: 80e66fac49120bafa41f1cf344e0a11399746188 URL: http://source.winehq.org/git/website.git/?a=commit;h=80e66fac49120bafa41f1c… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Wed Jul 22 14:59:04 2015 -0500 remove duplicate debian redirects --- include/htaccess.sample | 2 -- 1 file changed, 2 deletions(-) diff --git a/include/htaccess.sample b/include/htaccess.sample index 25cb03d..5efb8bf 100644 --- a/include/htaccess.sample +++ b/include/htaccess.sample @@ -41,8 +41,6 @@ RedirectPermanent /download.html https://www.winehq.org/download RedirectPermanent /download-mirrors.html https://www.winehq.org/download RedirectPermanent /download-mirrors.shtml https://www.winehq.org/download RedirectPermanent /site/download-deb https://www.winehq.org/download/debian -RedirectPermanent /download/deb https://www.winehq.org/download/ubuntu -RedirectPermanent /download/deblenny https://www.winehq.org/download/debian RedirectPermanent /site/getting_help https://www.winehq.org/help RedirectPermanent /support.shtml https://www.winehq.org/help RedirectPermanent /News/status.html https://www.winehq.org/status

1 0

Jeremy Newman : change redirects to https, add debian download redirect
by Jeremy Newman 22 Jul '15

22 Jul '15

Module: website Branch: master Commit: 2131e769172c5a2d6a923b77e093e81ef87ad228 URL: http://source.winehq.org/git/website.git/?a=commit;h=2131e769172c5a2d6a923b… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Wed Jul 22 14:55:51 2015 -0500 change redirects to https, add debian download redirect --- include/htaccess.sample | 125 +++++++++++++++++++++++------------------------- 1 file changed, 61 insertions(+), 64 deletions(-) Diff: http://source.winehq.org/git/website.git/?a=commitdiff;h=2131e769172c5a2d6a…

1 0

Jeremy Newman : remove debian specific download pages
by Jeremy Newman 22 Jul '15

22 Jul '15

Module: website Branch: master Commit: 1057850f7970f9d982d45104ac322a5b97a11d5a URL: http://source.winehq.org/git/website.git/?a=commit;h=1057850f7970f9d982d451… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Wed Jul 22 14:46:06 2015 -0500 remove debian specific download pages --- templates/de/download/debian.template | 30 ---------------- templates/fr/download/debian.template | 33 ------------------ templates/he/download/deb.template | 60 -------------------------------- templates/he/download/deblenny.template | 45 ------------------------ templates/pl/download/debian.template | 27 -------------- templates/pt/download/debian.template | 22 ------------ templates/tr/download/debian.template | 23 ------------ templates/uk/download/debian.template | 22 ------------ templates/zh-cn/download/debian.template | 22 ------------ 9 files changed, 284 deletions(-) Diff: http://source.winehq.org/git/website.git/?a=commitdiff;h=1057850f7970f9d982…

1 0

Jeremy Newman : set download link to stable wine package, sync translations
by Jeremy Newman 22 Jul '15

22 Jul '15

Module: website Branch: master Commit: 425cdb9dc15e9191df3a6e6ab67c7d234b4ad574 URL: http://source.winehq.org/git/website.git/?a=commit;h=425cdb9dc15e9191df3a6e… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Wed Jul 22 14:45:33 2015 -0500 set download link to stable wine package, sync translations --- templates/de/download.template | 8 ++++---- templates/en/download.template | 4 ++-- templates/fr/download.template | 6 +++--- templates/he/download.template | 8 ++++---- templates/pl/download.template | 8 ++++---- templates/pt/download.template | 8 ++++---- templates/tr/download.template | 8 ++++---- templates/uk/download.template | 8 ++++---- 8 files changed, 29 insertions(+), 29 deletions(-) diff --git a/templates/de/download.template b/templates/de/download.template index 69be404..18c058d 100644 --- a/templates/de/download.template +++ b/templates/de/download.template @@ -69,12 +69,12 @@ für das Hosten der Wine-Webseite erbeten hat. </tr> <tr bgcolor="#ffffff"> - <td align=center><a href="{$root}/download/debian"> + <td align=center><a href="https://packages.debian.org/stable/wine"> <img src="{$root}/images/distro/debian.png" width="50" height="50" alt="Debian Linux" border="0"></a> </td> - <td> <a href="{$root}/download/debian">Debian</a> - Binärpakete (.deb) für Debian Sid</td> - <td><a href="mailto:curan@debian.org">Kai Wasserbäch</a></td> + <td> <a href="https://packages.debian.org/stable/wine">Debian</a> + Binärpakete (.deb) für Debian</td> + <td><a href="mailto:pkg-wine-party@lists.alioth.debian.org">Debian Wine Party</a></td> </tr> <tr bgcolor="#ffffff"> diff --git a/templates/en/download.template b/templates/en/download.template index a68e8b1..f673da4 100644 --- a/templates/en/download.template +++ b/templates/en/download.template @@ -68,10 +68,10 @@ requested in exchange for hosting the Wine web site. </tr> <tr bgcolor="#ffffff"> - <td align=center><a href="https://packages.debian.org/search?keywords=wine-development"> + <td align=center><a href="https://packages.debian.org/stable/wine"> <img src="{$root}/images/distro/debian.png" width="50" height="50" alt="Debian Linux" border="0"></a> </td> - <td> <a href="https://packages.debian.org/search?keywords=wine-development">Download Debian packages</a> + <td> <a href="https://packages.debian.org/stable/wine">Download Debian packages</a> - binary and source .debs for Debian</td> <td><a href="mailto:pkg-wine-party@lists.alioth.debian.org">Debian Wine Party</a></td> </tr> diff --git a/templates/fr/download.template b/templates/fr/download.template index 4ffaad9..fa62953 100644 --- a/templates/fr/download.template +++ b/templates/fr/download.template @@ -71,12 +71,12 @@ center;">Voyez la </tr> <tr bgcolor="#ffffff"> - <td align=center><a href="{$root}/download/debian"> + <td align=center><a href="https://packages.debian.org/stable/wine"> <img src="{$root}/images/distro/debian.png" width="50" height="50" alt="Debian Linux" border="0"></a> </td> - <td> <a href="{$root}/download/debian">Paquets Debian</a> + <td> <a href="https://packages.debian.org/stable/wine">Paquets Debian</a> - .deb binaires pour Debian Sid</td> - <td><a href="mailto:curan@debian.org">Kai Wasserbäch</a></td> + <td><a href="mailto:pkg-wine-party@lists.alioth.debian.org">Debian Wine Party</a></td> </tr> <tr bgcolor="#ffffff"> diff --git a/templates/he/download.template b/templates/he/download.template index 61efa19..5d9400b 100644 --- a/templates/he/download.template +++ b/templates/he/download.template @@ -67,12 +67,12 @@ </tr> <tr bgcolor="#ffffff"> - <td align=center><a href="{$root}/download/deblenny"> + <td align=center><a href="https://packages.debian.org/stable/wine"> <img src="{$root}/images/distro/debian.png" width="50" height="50" alt="Debian Linux" border="0"></a> </td> - <td> <a href="{$root}/download/deblenny">הורדת חבילות לדביאן</a> - - קובצי .debבינריים לדביאן Lenny,&rlm; Squeeze ו־Sid</td> - <td><a href="mailto:curan@debian.org">Kai Wasserbäch</a></td> + <td> <a href="https://packages.debian.org/stable/wine">הורדת חבילות לדביאן</a> + - קובצי .debבינריים לדביאן; + <td><a href="mailto:pkg-wine-party@lists.alioth.debian.org">Debian Wine Party</a></td> </tr> <tr bgcolor="#ffffff"> diff --git a/templates/pl/download.template b/templates/pl/download.template index 1f3baa6..cc3ed9a 100644 --- a/templates/pl/download.template +++ b/templates/pl/download.template @@ -65,12 +65,12 @@ </tr> <tr bgcolor="#ffffff"> - <td align=center><a href="{$root}/download/deblenny"> + <td align=center><a href="https://packages.debian.org/stable/wine"> <img src="{$root}/images/distro/debian.png" width="50" height="50" alt="Debian Linux" border="0"></a> </td> - <td> <a href="{$root}/download/deblenny">Pobierz paczki dla Debian</a> - - binarne paczki .deb dla Debian Sid</td> - <td><a href="mailto:curan@debian.org">Kai Wasserbäch</a></td> + <td> <a href="https://packages.debian.org/stable/wine">Pobierz paczki dla Debian</a> + - binarne paczki .deb dla Debian</td> + <td><a href="mailto:pkg-wine-party@lists.alioth.debian.org">Debian Wine Party</a></td> </tr> <tr bgcolor="#ffffff"> diff --git a/templates/pt/download.template b/templates/pt/download.template index 063beae..f881093 100644 --- a/templates/pt/download.template +++ b/templates/pt/download.template @@ -64,12 +64,12 @@ </tr> <tr bgcolor="#ffffff"> - <td align=center><a href="{$root}/download/debian"> + <td align=center><a href="https://packages.debian.org/stable/wine"> <img src="{$root}/images/distro/debian.png" width="50" height="50" alt="Debian Linux" border="0"></a> </td> - <td> <a href="{$root}/download/debian">Descarregar pacotes para Debian</a> - - .debs binários para Debian Sid</td> - <td><a href="mailto:curan@debian.org">Kai Wasserbäch</a></td> + <td> <a href="https://packages.debian.org/stable/wine">Descarregar pacotes para Debian</a> + - .debs binários para Debian</td> + <td><a href="mailto:pkg-wine-party@lists.alioth.debian.org">Debian Wine Party</a></td> </tr> <tr bgcolor="#ffffff"> diff --git a/templates/tr/download.template b/templates/tr/download.template index 3558e1f..baa4442 100644 --- a/templates/tr/download.template +++ b/templates/tr/download.template @@ -64,12 +64,12 @@ </tr> <tr bgcolor="#ffffff"> - <td align=center><a href="{$root}/download/debian"> + <td align=center><a href="https://packages.debian.org/stable/wine"> <img src="{$root}/images/distro/debian.png" width="50" height="50" alt="Debian Linux" border="0"></a> </td> - <td> <a href="{$root}/download/debian">Debian paketleri indirin</a> - - Debian Sid için ikili .deb dosyaları</td> - <td><a href="mailto:curan@debian.org">Kai Wasserbäch</a></td> + <td> <a href="https://packages.debian.org/stable/wine">Debian paketleri indirin</a> + - Debian için ikili .deb dosyaları</td> + <td><a href="mailto:pkg-wine-party@lists.alioth.debian.org">Debian Wine Party</a></td> </tr> <tr bgcolor="#ffffff"> diff --git a/templates/uk/download.template b/templates/uk/download.template index 88a35b0..59bf96c 100644 --- a/templates/uk/download.template +++ b/templates/uk/download.template @@ -65,12 +65,12 @@ </tr> <tr bgcolor="#ffffff"> - <td align=center><a href="{$root}/download/debian"> + <td align=center><a href="https://packages.debian.org/stable/wine"> <img src="{$root}/images/distro/debian.png" width="50" height="50" alt="Debian Linux" border="0"></a> </td> - <td> <a href="{$root}/download/debian">Завантажити пакунки Debian</a> - - бінарні .deb файли для Debian Sid</td> - <td><a href="mailto:curan@debian.org">Kai Wasserbäch</a></td> + <td> <a href="https://packages.debian.org/stable/wine">Завантажити пакунки Debian</a> + - бінарні .deb файли для Debian</td> + <td><a href="mailto:pkg-wine-party@lists.alioth.debian.org">Debian Wine Party</a></td> </tr> <tr bgcolor="#ffffff">

1 0

Rosanne DiMesio : Update Debian downloads info
by Jeremy Newman 22 Jul '15

22 Jul '15

Module: website Branch: master Commit: 1c63dd484188bd38349c79dc7d7800c0dcdf4a95 URL: http://source.winehq.org/git/website.git/?a=commit;h=1c63dd484188bd38349c79… Author: Rosanne DiMesio <dimesio(a)earthlink.net> Date: Wed Jul 22 13:43:25 2015 -0500 Update Debian downloads info Updates the Debian links on the Downloads page to point to packages.debian.org and deletes the obsolete WineHQ Debian downloads page. --- templates/en/download.template | 8 ++++---- templates/en/download/debian.template | 22 ---------------------- 2 files changed, 4 insertions(+), 26 deletions(-) diff --git a/templates/en/download.template b/templates/en/download.template index 587415f..a68e8b1 100644 --- a/templates/en/download.template +++ b/templates/en/download.template @@ -68,12 +68,12 @@ requested in exchange for hosting the Wine web site. </tr> <tr bgcolor="#ffffff"> - <td align=center><a href="{$root}/download/debian"> + <td align=center><a href="https://packages.debian.org/search?keywords=wine-development"> <img src="{$root}/images/distro/debian.png" width="50" height="50" alt="Debian Linux" border="0"></a> </td> - <td> <a href="{$root}/download/debian">Download Debian packages</a> - - binary .debs for Debian Sid</td> - <td><a href="mailto:curan@debian.org">Kai Wasserbäch</a></td> + <td> <a href="https://packages.debian.org/search?keywords=wine-development">Download Debian packages</a> + - binary and source .debs for Debian</td> + <td><a href="mailto:pkg-wine-party@lists.alioth.debian.org">Debian Wine Party</a></td> </tr> <tr bgcolor="#ffffff"> diff --git a/templates/en/download/debian.template b/templates/en/download/debian.template deleted file mode 100644 index 51bacdf..0000000 --- a/templates/en/download/debian.template +++ /dev/null @@ -1,22 +0,0 @@ - - - -<h1 class="title"><a href="http://www.debian.org/" target="_new"><img src="{$root}/images/distro/debian.png" width="50" height="50" alt="Debian Linux" border="0"></a> -Wine for Debian Sid -<a href="http://www.debian.org/" target="_new"><img src="{$root}/images/distro/debian.png" width="50" height="50" alt="Debian Linux" border="0"></a></h1> - -Debian-based distributions utilize a special tool for managing packages known as APT. APT is able to automagically install all of the needed dependencies for a software package, as well as keep the package up to date, by scanning what are known as APT repositories. Debian-based distributions have their own repositories of software that include Wine, however we keep our own repository of the latest available beta packages here for download. - -Warning: These are beta packages -This means they will periodically suffer from <a href="http://wiki.winehq.org/RegressionTesting">regressions</a>, and as a result an update may break functionality in Wine. If the latest stable release of Wine (currently Wine {$config_stable_release}) works for you, then you may not want to use these beta packages. - -This website has packages for i386 and amd64 architecture. - -To install wine packages you must download the .deb files and manually install them. See the page for more details. - - -Homepage: <a href="http://dev.carbon-project.org/debian/wine-unstable/" target="_blank">http://dev.carbon-project.org/debian/wine-unstable/</a> -Package builder: <a href="mailto:curan@debian.org">Kai Wasserbäch</a> - - -

1 0

Zhenbo Li : mshtml: Add IHTMLXMLHttpRequest:: status property implementation.
by Alexandre Julliard 22 Jul '15

22 Jul '15

Module: wine Branch: master Commit: 21043e5acf479c2a0fde96e415ed5dd21bca15e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=21043e5acf479c2a0fde96e41… Author: Zhenbo Li <litimetal(a)gmail.com> Date: Wed Jul 22 23:34:05 2015 +0800 mshtml: Add IHTMLXMLHttpRequest::status property implementation. --- dlls/mshtml/tests/xmlhttprequest.c | 18 +++++++++--------- dlls/mshtml/xmlhttprequest.c | 19 +++++++++++++++++-- 2 files changed, 26 insertions(+), 11 deletions(-) diff --git a/dlls/mshtml/tests/xmlhttprequest.c b/dlls/mshtml/tests/xmlhttprequest.c index db6aca4..713dedf 100644 --- a/dlls/mshtml/tests/xmlhttprequest.c +++ b/dlls/mshtml/tests/xmlhttprequest.c @@ -449,12 +449,12 @@ static void test_sync_xhr(IHTMLDocument2 *doc, const char *xml_url) ok(val == 0, "Expect UNSENT, got %d\n", val); hres = IHTMLXMLHttpRequest_get_status(xhr, NULL); - todo_wine ok(hres == E_POINTER, "Expect E_POINTER, got %08x\n", hres); + ok(hres == E_POINTER, "Expect E_POINTER, got %08x\n", hres); val = 0xdeadbeef; hres = IHTMLXMLHttpRequest_get_status(xhr, &val); - todo_wine ok(hres == E_FAIL, "Expect E_FAIL, got: %08x\n", hres); - todo_wine ok(val == 0, "Expect 0, got %d\n", val); + ok(hres == E_FAIL, "Expect E_FAIL, got: %08x\n", hres); + ok(val == 0, "Expect 0, got %d\n", val); hres = IHTMLXMLHttpRequest_get_statusText(xhr, NULL); todo_wine ok(hres == E_POINTER, "Expect E_POINTER, got %08x\n", hres); @@ -561,8 +561,8 @@ static void test_async_xhr(IHTMLDocument2 *doc, const char *xml_url) val = 0xdeadbeef; hres = IHTMLXMLHttpRequest_get_status(xhr, &val); - todo_wine ok(hres == E_FAIL, "Expect E_FAIL, got: %08x\n", hres); - todo_wine ok(val == 0, "Expect 0, got %d\n", val); + ok(hres == E_FAIL, "Expect E_FAIL, got: %08x\n", hres); + ok(val == 0, "Expect 0, got %d\n", val); text = (BSTR)0xdeadbeef; hres = IHTMLXMLHttpRequest_get_statusText(xhr, &text); @@ -596,8 +596,8 @@ static void test_async_xhr(IHTMLDocument2 *doc, const char *xml_url) val = 0xdeadbeef; hres = IHTMLXMLHttpRequest_get_status(xhr, &val); - todo_wine ok(hres == E_FAIL, "Expect E_FAIL, got: %08x\n", hres); - todo_wine ok(val == 0, "Expect 0, got %d\n", val); + ok(hres == E_FAIL, "Expect E_FAIL, got: %08x\n", hres); + ok(val == 0, "Expect 0, got %d\n", val); hres = IHTMLXMLHttpRequest_get_statusText(xhr, &text); todo_wine ok(hres == E_FAIL, "Expect E_FAIL, got: %08x\n", hres); @@ -630,8 +630,8 @@ static void test_async_xhr(IHTMLDocument2 *doc, const char *xml_url) val = 0xdeadbeef; hres = IHTMLXMLHttpRequest_get_status(xhr, &val); - todo_wine ok(hres == S_OK, "get_status failed: %08x\n", hres); - todo_wine ok(val == 200, "Expect 200, got %d\n", val); + ok(hres == S_OK, "get_status failed: %08x\n", hres); + ok(val == 200, "Expect 200, got %d\n", val); text = NULL; hres = IHTMLXMLHttpRequest_get_statusText(xhr, &text); diff --git a/dlls/mshtml/xmlhttprequest.c b/dlls/mshtml/xmlhttprequest.c index f680b17..5b5cf87 100644 --- a/dlls/mshtml/xmlhttprequest.c +++ b/dlls/mshtml/xmlhttprequest.c @@ -312,8 +312,23 @@ static HRESULT WINAPI HTMLXMLHttpRequest_get_responseXML(IHTMLXMLHttpRequest *if static HRESULT WINAPI HTMLXMLHttpRequest_get_status(IHTMLXMLHttpRequest *iface, LONG *p) { HTMLXMLHttpRequest *This = impl_from_IHTMLXMLHttpRequest(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + DWORD val; + nsresult nsres; + TRACE("(%p)->(%p)\n", This, p); + + if(!p) + return E_POINTER; + + nsres = nsIXMLHttpRequest_GetStatus(This->nsxhr, &val); + if(NS_FAILED(nsres)) { + ERR("nsIXMLHttpRequest_GetStatus failed: %08x\n", nsres); + return E_FAIL; + } + *p = val; + if(val == 0) + return E_FAIL; /* WinAPI thinks this is an error */ + + return S_OK; } static HRESULT WINAPI HTMLXMLHttpRequest_get_statusText(IHTMLXMLHttpRequest *iface, BSTR *p)

1 0

Zhenbo Li : mshtml: Add nsChannel_GetResponseStatusText implementation.
by Alexandre Julliard 22 Jul '15

22 Jul '15

Module: wine Branch: master Commit: 4e6e9a14852298fe8c17f2666a16d5484cbe50b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e6e9a14852298fe8c17f2666… Author: Zhenbo Li <litimetal(a)gmail.com> Date: Wed Jul 22 23:34:12 2015 +0800 mshtml: Add nsChannel_GetResponseStatusText implementation. --- dlls/mshtml/binding.h | 1 + dlls/mshtml/mshtml_private.h | 17 +++++++++++++++++ dlls/mshtml/navigate.c | 28 ++++++++++++++++++++++++++++ dlls/mshtml/nsio.c | 5 +++-- 4 files changed, 49 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/binding.h b/dlls/mshtml/binding.h index c2daffd..e173431 100644 --- a/dlls/mshtml/binding.h +++ b/dlls/mshtml/binding.h @@ -51,6 +51,7 @@ typedef struct { char *content_type; char *charset; UINT32 response_status; + char *response_status_text; REQUEST_METHOD request_method; struct list response_headers; struct list request_headers; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 87e4154..3cbaa24 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -1230,6 +1230,23 @@ static inline char *heap_strdupWtoU(const WCHAR *str) return ret; } +static inline char *heap_strndupWtoU(LPCWSTR str, unsigned len) +{ + char *ret = NULL; + DWORD size; + + if(str && len) { + size = WideCharToMultiByte(CP_UTF8, 0, str, len, NULL, 0, NULL, NULL); + ret = heap_alloc(size + 1); + if(ret) { + WideCharToMultiByte(CP_UTF8, 0, str, len, ret, size, NULL, NULL); + ret[size] = '\0'; + } + } + + return ret; +} + static inline void windowref_addref(windowref_t *ref) { InterlockedIncrement(&ref->ref); diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index e1516d2..c22080d 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -1595,10 +1595,29 @@ static HRESULT nsChannelBSC_on_progress(BSCallback *bsc, ULONG status_code, LPCW return S_OK; } +static HRESULT process_response_status_text(const WCHAR *header, const WCHAR *header_end, char **status_text) +{ + header = strchrW(header + 1, ' '); + if(!header || header >= header_end) + return E_FAIL; + header = strchrW(header + 1, ' '); + if(!header || header >= header_end) + return E_FAIL; + ++header; + + *status_text = heap_strndupWtoU(header, header_end - header); + + if(!*status_text) + return E_OUTOFMEMORY; + + return S_OK; +} + static HRESULT nsChannelBSC_on_response(BSCallback *bsc, DWORD response_code, LPCWSTR response_headers) { nsChannelBSC *This = nsChannelBSC_from_BSCallback(bsc); + char *str; HRESULT hres; This->response_processed = TRUE; @@ -1608,6 +1627,15 @@ static HRESULT nsChannelBSC_on_response(BSCallback *bsc, DWORD response_code, const WCHAR *headers; headers = strchrW(response_headers, '\r'); + hres = process_response_status_text(response_headers, headers, &str); + if(FAILED(hres)) { + WARN("parsing headers failed: %08x\n", hres); + return hres; + } + + heap_free(This->nschannel->response_status_text); + This->nschannel->response_status_text = str; + if(headers && headers[1] == '\n') { headers += 2; hres = process_response_headers(This, headers); diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index fd811e9..9bced99 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -1394,9 +1394,10 @@ static nsresult NSAPI nsChannel_GetResponseStatusText(nsIHttpChannel *iface, { nsChannel *This = impl_from_nsIHttpChannel(iface); - FIXME("(%p)->(%p)\n", This, aResponseStatusText); + TRACE("(%p)->(%p)\n", This, aResponseStatusText); - return NS_ERROR_NOT_IMPLEMENTED; + nsACString_SetData(aResponseStatusText, This->response_status_text); + return NS_OK; } static nsresult NSAPI nsChannel_GetRequestSucceeded(nsIHttpChannel *iface,

1 0

← Newer
1
...
9
10
11
12
13
14
15
...
57
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 July 2015