May 2016 - Wine-Commits - list.winehq.org

Michael Stefaniuc : wined3d: Use IsRectEmpty() instead of open coding it.
by Alexandre Julliard May 14, 2016

May 14, 2016

Module: wine Branch: master Commit: 128e6b5975b6837b0a2605cbd857d04d4a2b7ae6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=128e6b5975b6837b0a2605cbd… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue May 3 21:48:05 2016 +0200 wined3d: Use IsRectEmpty() instead of open coding it. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index c3c028c..e0d7c80 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1147,8 +1147,7 @@ HRESULT surface_upload_from_surface(struct wined3d_surface *dst_surface, const P wined3d_texture_get_level_height(src_texture, src_surface->texture_level)); src_rect = &r; } - else if (src_rect->left < 0 || src_rect->left >= src_rect->right - || src_rect->top < 0 || src_rect->top >= src_rect->bottom) + else if (src_rect->left < 0 || src_rect->top < 0 || IsRectEmpty(src_rect)) { WARN("Invalid source rectangle.\n"); return WINED3DERR_INVALIDCALL; @@ -4032,8 +4031,7 @@ HRESULT wined3d_surface_blt(struct wined3d_surface *dst_surface, const RECT *dst dst_w = wined3d_texture_get_level_width(dst_texture, dst_surface->texture_level); dst_h = wined3d_texture_get_level_height(dst_texture, dst_surface->texture_level); - if (dst_rect->left >= dst_rect->right || dst_rect->top >= dst_rect->bottom - || dst_rect->left > dst_w || dst_rect->left < 0 + if (IsRectEmpty(dst_rect) || dst_rect->left > dst_w || dst_rect->left < 0 || dst_rect->top > dst_h || dst_rect->top < 0 || dst_rect->right > dst_w || dst_rect->right < 0 || dst_rect->bottom > dst_h || dst_rect->bottom < 0) @@ -4046,8 +4044,7 @@ HRESULT wined3d_surface_blt(struct wined3d_surface *dst_surface, const RECT *dst { src_w = wined3d_texture_get_level_width(src_texture, src_surface->texture_level); src_h = wined3d_texture_get_level_height(src_texture, src_surface->texture_level); - if (src_rect->left >= src_rect->right || src_rect->top >= src_rect->bottom - || src_rect->left > src_w || src_rect->left < 0 + if (IsRectEmpty(src_rect) || src_rect->left > src_w || src_rect->left < 0 || src_rect->top > src_h || src_rect->top < 0 || src_rect->right > src_w || src_rect->right < 0 || src_rect->bottom > src_h || src_rect->bottom < 0)

1 0

Andrey Gusev : wined3d: Fix a typo in checkGLcall.
by Alexandre Julliard May 14, 2016

May 14, 2016

Module: wine Branch: master Commit: ecb5a74b3607f45a545ae87ba97c8030c5035620 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ecb5a74b3607f45a545ae87ba… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Thu Apr 28 13:58:53 2016 +0300 wined3d: Fix a typo in checkGLcall. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index e0a7370..d1f77ca 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -827,7 +827,7 @@ static void create_default_sampler(struct wined3d_device *device) checkGLcall("glGenSamplers"); GL_EXTCALL(glSamplerParameteri(device->default_sampler, GL_TEXTURE_MAG_FILTER, GL_NEAREST)); GL_EXTCALL(glSamplerParameteri(device->default_sampler, GL_TEXTURE_MIN_FILTER, GL_NEAREST_MIPMAP_NEAREST)); - checkGLcall("glSamplerParamteri"); + checkGLcall("glSamplerParameteri"); } else {

1 0

Piotr Caban : msvcrt: Fix mbtowc behavior for buffers containing more than one character.
by Alexandre Julliard May 14, 2016

May 14, 2016

Module: wine Branch: master Commit: a36b5f0741ac7e6a44aaa9d804ebdb7524186723 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a36b5f0741ac7e6a44aaa9d80… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri May 6 22:09:14 2016 +0200 msvcrt: Fix mbtowc behavior for buffers containing more than one character. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/mbcs.c | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index 56945bb..2c73de0 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -2157,17 +2157,25 @@ int CDECL MSVCRT_mbtowc_l(MSVCRT_wchar_t *dst, const char* str, MSVCRT_size_t n, if(n <= 0 || !str) return 0; - if(!locinfo->lc_codepage) - tmpdst = (unsigned char)*str; - else if(!MultiByteToWideChar(locinfo->lc_codepage, 0, str, n, &tmpdst, 1)) - return -1; - if(dst) - *dst = tmpdst; - /* return the number of bytes from src that have been used */ - if(!*str) + + if(!*str) { + if(dst) *dst = 0; return 0; - if(n >= 2 && MSVCRT__isleadbyte_l((unsigned char)*str, locale) && str[1]) + } + + if(!locinfo->lc_codepage) { + if(dst) *dst = (unsigned char)*str; + return 1; + } + if(n>=2 && MSVCRT__isleadbyte_l((unsigned char)*str, locale)) { + if(!MultiByteToWideChar(locinfo->lc_codepage, 0, str, 2, &tmpdst, 1)) + return -1; + if(dst) *dst = tmpdst; return 2; + } + if(!MultiByteToWideChar(locinfo->lc_codepage, 0, str, 1, &tmpdst, 1)) + return -1; + if(dst) *dst = tmpdst; return 1; }

1 0

Piotr Caban : msvcp110: Fix Yarn::operator=(const char*) implementation.
by Alexandre Julliard May 14, 2016

May 14, 2016

Module: wine Branch: master Commit: f8a0f90effcb0ff2d5f453079c47f4881483744a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8a0f90effcb0ff2d5f453079… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue May 10 15:23:58 2016 +0200 msvcp110: Fix Yarn::operator=(const char*) implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp90/string.c | 40 ++++++++++++++++++++++------------------ 1 file changed, 22 insertions(+), 18 deletions(-) diff --git a/dlls/msvcp90/string.c b/dlls/msvcp90/string.c index 9f0d7fe..e102020 100644 --- a/dlls/msvcp90/string.c +++ b/dlls/msvcp90/string.c @@ -1644,17 +1644,19 @@ _Yarn_char* __thiscall _Yarn_char_op_assign_cstr(_Yarn_char *this, const char *s { TRACE("(%p %p)\n", this, str); - _Yarn_char__Tidy(this); - - if(str) { - MSVCP_size_t len = strlen(str); - - this->str = MSVCRT_operator_new((len+1)*sizeof(char)); - if(!this->str) { - ERR("out of memory\n"); - return NULL; + if(str != this->str) { + _Yarn_char__Tidy(this); + + if(str) { + MSVCP_size_t len = strlen(str); + + this->str = MSVCRT_operator_new((len+1)*sizeof(char)); + if(!this->str) { + ERR("out of memory\n"); + return NULL; + } + memcpy(this->str, str, (len+1)*sizeof(char)); } - memcpy(this->str, str, (len+1)*sizeof(char)); } return this; } @@ -1762,17 +1764,19 @@ _Yarn_wchar* __thiscall _Yarn_wchar_op_assign_cstr(_Yarn_wchar *this, const wcha { TRACE("(%p %p)\n", this, str); - _Yarn_wchar__Tidy(this); + if(str != this->str) { + _Yarn_wchar__Tidy(this); - if(str) { - MSVCP_size_t len = wcslen(str); + if(str) { + MSVCP_size_t len = wcslen(str); - this->str = MSVCRT_operator_new((len+1)*sizeof(wchar_t)); - if(!this->str) { - ERR("out of memory\n"); - return NULL; + this->str = MSVCRT_operator_new((len+1)*sizeof(wchar_t)); + if(!this->str) { + ERR("out of memory\n"); + return NULL; + } + memcpy(this->str, str, (len+1)*sizeof(wchar_t)); } - memcpy(this->str, str, (len+1)*sizeof(wchar_t)); } return this; }

1 0

Akihiro Sagawa : po: Update Japanese translation.
by Alexandre Julliard May 14, 2016

May 14, 2016

Module: wine Branch: master Commit: 407c57705413394049839bacb7a4dcc19ceeb619 URL: http://source.winehq.org/git/wine.git/?a=commit;h=407c57705413394049839bacb… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sun May 8 20:25:07 2016 +0900 po: Update Japanese translation. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ja.po | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/po/ja.po b/po/ja.po index 335c624..604cc42 100644 --- a/po/ja.po +++ b/po/ja.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2016-02-19 21:25+0900\n" +"PO-Revision-Date: 2016-05-05 15:32+0900\n" "Last-Translator: Akihiro Sagawa <sagawa.aki(a)gmail.com>\n" "Language-Team: Japanese\n" "Language: ja\n" @@ -11612,26 +11612,28 @@ msgid "Are you sure you want to delete the registry key '%1'?" msgstr "本当にレジストリキー '%1' を削除しますか?" #: reg.rc:52 -#, fuzzy -#| msgid "reg: The option [/d] must be followed by a valid integer\n" msgid "reg: The option [/d] must be followed by a valid string\n" -msgstr "reg: /d オプションのあとに正しい整数値を指定してください\n" +msgstr "reg: /d オプションのあとに正しい文字列を指定してください\n" #: reg.rc:53 msgid "" "reg: Unable to delete all registry values in '%1'. An unexpected error " "occurred.\n" msgstr "" +"reg: '%1' にある一部のレジストリ値を削除できませんでした。予期しない\n" +"エラーが発生しました。\n" #: reg.rc:54 msgid "" "reg: Unable to complete the specified operation. An unexpected error " "occurred.\n" msgstr "" +"reg: 指定された操作を完了できませんでした。予期しないエラーが発生しまし\n" +"た。\n" #: reg.rc:55 msgid "Search complete. Number of matches found: %1!d!\n" -msgstr "" +msgstr "検索が完了しました。該当箇所の数: %1!d!\n" #: regedit.rc:34 msgid "&Registry"

1 0

Piotr Caban : msvcp110: Use locale_string:: assign instead of freeing and allocating new object in _Locinfo__W_Getdays.
by Alexandre Julliard May 14, 2016

May 14, 2016

Module: wine Branch: master Commit: 40a59a968a9818321c9534cb858c4e1f06ccc9f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=40a59a968a9818321c9534cb8… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue May 10 15:24:08 2016 +0200 msvcp110: Use locale_string::assign instead of freeing and allocating new object in _Locinfo__W_Getdays. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp90/locale.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 0a06da2..89465b5 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -86,9 +86,9 @@ LCID* __cdecl ___lc_handle_func(void); #define locale_string_wchar _Yarn_wchar #define locale_string_wchar_ctor(this) _Yarn_wchar_ctor(this) -#define locale_string_wchar_ctor_cstr(this,str) _Yarn_wchar_ctor(this); _Yarn_wchar_op_assign_cstr(this,str) #define locale_string_wchar_dtor(this) _Yarn_wchar_dtor(this) #define locale_string_wchar_c_str(this) _Yarn_wchar__C_str(this) +#define locale_string_wchar_assign(this,str) _Yarn_wchar_op_assign_cstr(this,str) #endif typedef int category; @@ -850,8 +850,7 @@ const wchar_t* __thiscall _Locinfo__W_Getdays(const _Locinfo *this) TRACE("(%p)\n", this); if(wdays) { - locale_string_wchar_dtor((locale_string_wchar *)&this->wdays); - locale_string_wchar_ctor_cstr((locale_string_wchar *)&this->wdays, wdays); + locale_string_wchar_assign((locale_string_wchar *)&this->wdays, wdays); free(wdays); } @@ -886,8 +885,7 @@ const wchar_t* __thiscall _Locinfo__W_Getmonths(const _Locinfo *this) TRACE("(%p)\n", this); if(wmonths) { - locale_string_wchar_dtor((locale_string_wchar *)&this->wmonths); - locale_string_wchar_ctor_cstr((locale_string_wchar *)&this->wmonths, wmonths); + locale_string_wchar_assign((locale_string_wchar *)&this->wmonths, wmonths); free(wmonths); }

1 0

Kim Malmo : po: Update Norwegian translation.
by Alexandre Julliard May 14, 2016

May 14, 2016

Module: wine Branch: master Commit: b23a1437f1e78e899b70fdd6558b753b18f0d6cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=b23a1437f1e78e899b70fdd65… Author: Kim Malmo <berencamlost(a)msn.com> Date: Sun May 8 18:53:51 2016 +0000 po: Update Norwegian translation. Signed-off-by: Kim Malmo <berencamlost(a)msn.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/nb_NO.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/po/nb_NO.po b/po/nb_NO.po index 5cc5229..9d23bd6 100644 --- a/po/nb_NO.po +++ b/po/nb_NO.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2016-05-04 12:00+0200\n" +"PO-Revision-Date: 2016-05-08 20:00+0200\n" "Last-Translator: Kim Malmo <berencamlost(a)msn.com>\n" "Language-Team: Norwegian Bokmål <alexsornes(a)gmail.com>\n" "Language: nb_NO\n" @@ -11631,15 +11631,15 @@ msgid "" "reg: Unable to delete all registry values in '%1'. An unexpected error " "occurred.\n" msgstr "" -"reg: Kan ikke slette alle registerverdiene i \"%1\". Ett uventet " -"problemoppstod.\n" +"reg: Kan ikke slette alle registerverdiene i \"%1\". Ett uventet problem " +"oppstod.\n" #: reg.rc:54 msgid "" "reg: Unable to complete the specified operation. An unexpected error " "occurred.\n" msgstr "" -"reg: Kan ikke fullføre den spesifiserte operasjonen. Ett uventetproblem " +"reg: Kan ikke fullføre den spesifiserte operasjonen. Ett uventet problem " "oppstod.\n" #: reg.rc:55

1 0

Michael Stefaniuc : ddraw: Use IsRectEmpty() instead of open coding it.
by Alexandre Julliard May 14, 2016

May 14, 2016

Module: wine Branch: master Commit: 08201eef3cac11cbab5a923adc5cb939a8a2868b URL: http://source.winehq.org/git/wine.git/?a=commit;h=08201eef3cac11cbab5a923ad… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue May 3 21:43:55 2016 +0200 ddraw: Use IsRectEmpty() instead of open coding it. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/device.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 80a2f0b..1edf8fe 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -6118,8 +6118,7 @@ static HRESULT d3d_device7_Load(IDirect3DDevice7 *iface, IDirectDrawSurface7 *ds * for it may be divided. If any dimension of dest is larger than source, it can't be * mip level subset, so an error can be returned early. */ - if (srcrect.left >= srcrect.right || srcrect.top >= srcrect.bottom || - srcrect.right > src->surface_desc.dwWidth || + if (IsRectEmpty(&srcrect) || srcrect.right > src->surface_desc.dwWidth || srcrect.bottom > src->surface_desc.dwHeight || destpoint.x + srcrect.right - srcrect.left > src->surface_desc.dwWidth || destpoint.y + srcrect.bottom - srcrect.top > src->surface_desc.dwHeight ||

1 0

Kirill Smirnov : msi: Do not return success on failure (spotted by clang).
by Alexandre Julliard May 14, 2016

May 14, 2016

Module: wine Branch: master Commit: 0869852c2e08c7bbd8bd6ebbdf89e92012d8a706 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0869852c2e08c7bbd8bd6ebbd… Author: Kirill Smirnov <kirill.k.smirnov(a)gmail.com> Date: Mon May 9 13:51:34 2016 +0300 msi: Do not return success on failure (spotted by clang). Signed-off-by: Kirill K. Smirnov <kirill.k.smirnov(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/where.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msi/where.c b/dlls/msi/where.c index e3bc9b7..ddd8c07 100644 --- a/dlls/msi/where.c +++ b/dlls/msi/where.c @@ -593,7 +593,7 @@ static UINT WHERE_evaluate( MSIWHEREVIEW *wv, const UINT rows[], default: ERR("Invalid expression type\n"); - break; + return ERROR_FUNCTION_FAILED; } return ERROR_SUCCESS;

1 0

Julian Rüger : German translation for release 1.9.9
by Jeremy Newman May 10, 2016

May 10, 2016

Module: website Branch: master Commit: b63a3e3e15a406dee4e3a6dd31303b65c1ad4963 URL: http://source.winehq.org/git/website.git/?a=commit;h=b63a3e3e15a406dee4e3a6… Author: Julian Rüger <jr98(a)gmx.net> Date: Tue May 10 16:55:17 2016 +0200 German translation for release 1.9.9 Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/de/2016043001.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/de/2016043001.xml b/news/de/2016043001.xml new file mode 100644 index 0000000..6d90351 --- /dev/null +++ b/news/de/2016043001.xml @@ -0,0 +1,16 @@ +<news> +<date>30. April 2016</date> +<title>Wine 1.9.9 freigegeben</title> +<body> + Die Entwicklungsversion 1.9.9 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.9.9">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Fortschritte in Richtung des WineD3D-Commandstream.</li> + <li>Service-Proxies in WebServices.</li> + <li>Query-Unterstützung des mitgelieferten reg.exe-Werkzeugs.</li> + <li>Verbesserte Unterstützung langer URLs in WinInet.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/1.9/wine-1.9.9.tar.bz2">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0