wine-commits November 2016

wine-commits@winehq.org

2 participants
465 discussions

Józef Kucia : wined3d: Add support for WINED3DFMT_R32G32_UINT format.
by Alexandre Julliard 10 Nov '16

10 Nov '16

Module: wine Branch: master Commit: fa04582bf7ea83ec5615f7da0b3c3917ae6cbad3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa04582bf7ea83ec5615f7da0… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Nov 10 12:39:11 2016 +0100 wined3d: Add support for WINED3DFMT_R32G32_UINT format. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/utils.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 103a5b6..7790e40 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -1318,6 +1318,10 @@ static const struct wined3d_format_texture_info format_texture_info[] = GL_RG_INTEGER, GL_BYTE, 0, WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_RENDERTARGET, ARB_TEXTURE_RG, NULL}, + {WINED3DFMT_R32G32_UINT, GL_RG32UI, GL_RG32UI, 0, + GL_RG_INTEGER, GL_UNSIGNED_INT, 0, + WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_RENDERTARGET, + ARB_TEXTURE_RG, NULL}, {WINED3DFMT_R32_UINT, GL_R32UI, GL_R32UI, 0, GL_RED_INTEGER, GL_UNSIGNED_INT, 0, WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_RENDERTARGET,

1 0

Józef Kucia : wined3d: Add support for WINED3DFMT_R8G8_SINT format.
by Alexandre Julliard 10 Nov '16

10 Nov '16

Module: wine Branch: master Commit: dbbb7217c676b6cf668a03c217235059918f43c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dbbb7217c676b6cf668a03c21… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Nov 10 12:39:10 2016 +0100 wined3d: Add support for WINED3DFMT_R8G8_SINT format. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/utils.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 3471131..103a5b6 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -244,6 +244,7 @@ static const struct wined3d_typed_format_info typed_formats[] = {WINED3DFMT_R8G8_SNORM, WINED3DFMT_R8G8_TYPELESS, "ii"}, {WINED3DFMT_R8G8_UNORM, WINED3DFMT_R8G8_TYPELESS, "uu"}, {WINED3DFMT_R8G8_UINT, WINED3DFMT_R8G8_TYPELESS, "UU"}, + {WINED3DFMT_R8G8_SINT, WINED3DFMT_R8G8_TYPELESS, "II"}, {WINED3DFMT_R16_UNORM, WINED3DFMT_R16_TYPELESS, "u"}, {WINED3DFMT_R16_UINT, WINED3DFMT_R16_TYPELESS, "U"}, {WINED3DFMT_R16_SINT, WINED3DFMT_R16_TYPELESS, "I"}, @@ -1313,6 +1314,10 @@ static const struct wined3d_format_texture_info format_texture_info[] = GL_RG_INTEGER, GL_UNSIGNED_BYTE, 0, WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_RENDERTARGET, ARB_TEXTURE_RG, NULL}, + {WINED3DFMT_R8G8_SINT, GL_RG8I, GL_RG8I, 0, + GL_RG_INTEGER, GL_BYTE, 0, + WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_RENDERTARGET, + ARB_TEXTURE_RG, NULL}, {WINED3DFMT_R32_UINT, GL_R32UI, GL_R32UI, 0, GL_RED_INTEGER, GL_UNSIGNED_INT, 0, WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_RENDERTARGET,

1 0

Józef Kucia : wined3d: Add support for WINED3DFMT_R8G8_UINT format.
by Alexandre Julliard 10 Nov '16

10 Nov '16

Module: wine Branch: master Commit: 5471465863e5a53fb1039811214252389b8a4784 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5471465863e5a53fb10398112… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Nov 10 12:39:09 2016 +0100 wined3d: Add support for WINED3DFMT_R8G8_UINT format. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/utils.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 9e16416..3471131 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -243,6 +243,7 @@ static const struct wined3d_typed_format_info typed_formats[] = {WINED3DFMT_D24_UNORM_S8_UINT, WINED3DFMT_R24G8_TYPELESS, "DS"}, {WINED3DFMT_R8G8_SNORM, WINED3DFMT_R8G8_TYPELESS, "ii"}, {WINED3DFMT_R8G8_UNORM, WINED3DFMT_R8G8_TYPELESS, "uu"}, + {WINED3DFMT_R8G8_UINT, WINED3DFMT_R8G8_TYPELESS, "UU"}, {WINED3DFMT_R16_UNORM, WINED3DFMT_R16_TYPELESS, "u"}, {WINED3DFMT_R16_UINT, WINED3DFMT_R16_TYPELESS, "U"}, {WINED3DFMT_R16_SINT, WINED3DFMT_R16_TYPELESS, "I"}, @@ -1308,6 +1309,10 @@ static const struct wined3d_format_texture_info format_texture_info[] = WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_RENDERTARGET, ARB_TEXTURE_RG, NULL}, + {WINED3DFMT_R8G8_UINT, GL_RG8UI, GL_RG8UI, 0, + GL_RG_INTEGER, GL_UNSIGNED_BYTE, 0, + WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_RENDERTARGET, + ARB_TEXTURE_RG, NULL}, {WINED3DFMT_R32_UINT, GL_R32UI, GL_R32UI, 0, GL_RED_INTEGER, GL_UNSIGNED_INT, 0, WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_RENDERTARGET,

1 0

Józef Kucia : wined3d: Add support for WINED3DFMT_R8_SINT format.
by Alexandre Julliard 10 Nov '16

10 Nov '16

Module: wine Branch: master Commit: ec2eaaade05dcdde10ddd23c18ee722e1f55d846 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec2eaaade05dcdde10ddd23c1… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Nov 10 12:39:08 2016 +0100 wined3d: Add support for WINED3DFMT_R8_SINT format. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/utils.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 4f5f8ad..9e16416 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -250,6 +250,7 @@ static const struct wined3d_typed_format_info typed_formats[] = {WINED3DFMT_D16_UNORM, WINED3DFMT_R16_TYPELESS, "D"}, {WINED3DFMT_R8_UNORM, WINED3DFMT_R8_TYPELESS, "u"}, {WINED3DFMT_R8_UINT, WINED3DFMT_R8_TYPELESS, "U"}, + {WINED3DFMT_R8_SINT, WINED3DFMT_R8_TYPELESS, "I"}, {WINED3DFMT_BC1_UNORM_SRGB, WINED3DFMT_BC1_TYPELESS, ""}, {WINED3DFMT_BC1_UNORM, WINED3DFMT_BC1_TYPELESS, ""}, {WINED3DFMT_BC2_UNORM_SRGB, WINED3DFMT_BC2_TYPELESS, ""}, @@ -1332,6 +1333,10 @@ static const struct wined3d_format_texture_info format_texture_info[] = GL_RED_INTEGER, GL_UNSIGNED_BYTE, 0, WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_RENDERTARGET, ARB_TEXTURE_RG, NULL}, + {WINED3DFMT_R8_SINT, GL_R8I, GL_R8I, 0, + GL_RED_INTEGER, GL_BYTE, 0, + WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_RENDERTARGET, + ARB_TEXTURE_RG, NULL}, /* Luminance */ {WINED3DFMT_L8_UNORM, GL_LUMINANCE8, GL_SLUMINANCE8_EXT, 0, GL_LUMINANCE, GL_UNSIGNED_BYTE, 0,

1 0

Józef Kucia : wined3d: Add support for WINED3DFMT_R8_UINT format.
by Alexandre Julliard 10 Nov '16

10 Nov '16

Module: wine Branch: master Commit: 40c42757f301e95fef29261f61a31adeb8d16f96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=40c42757f301e95fef29261f6… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Nov 10 12:39:07 2016 +0100 wined3d: Add support for WINED3DFMT_R8_UINT format. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/utils.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index d683203..4f5f8ad 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -249,6 +249,7 @@ static const struct wined3d_typed_format_info typed_formats[] = {WINED3DFMT_R16_FLOAT, WINED3DFMT_R16_TYPELESS, "F"}, {WINED3DFMT_D16_UNORM, WINED3DFMT_R16_TYPELESS, "D"}, {WINED3DFMT_R8_UNORM, WINED3DFMT_R8_TYPELESS, "u"}, + {WINED3DFMT_R8_UINT, WINED3DFMT_R8_TYPELESS, "U"}, {WINED3DFMT_BC1_UNORM_SRGB, WINED3DFMT_BC1_TYPELESS, ""}, {WINED3DFMT_BC1_UNORM, WINED3DFMT_BC1_TYPELESS, ""}, {WINED3DFMT_BC2_UNORM_SRGB, WINED3DFMT_BC2_TYPELESS, ""}, @@ -1327,6 +1328,10 @@ static const struct wined3d_format_texture_info format_texture_info[] = GL_RED_INTEGER, GL_SHORT, 0, WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_RENDERTARGET, ARB_TEXTURE_RG, NULL}, + {WINED3DFMT_R8_UINT, GL_R8UI, GL_R8UI, 0, + GL_RED_INTEGER, GL_UNSIGNED_BYTE, 0, + WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_RENDERTARGET, + ARB_TEXTURE_RG, NULL}, /* Luminance */ {WINED3DFMT_L8_UNORM, GL_LUMINANCE8, GL_SLUMINANCE8_EXT, 0, GL_LUMINANCE, GL_UNSIGNED_BYTE, 0,

1 0

Nikolay Sivov : po: Update Russian translation.
by Alexandre Julliard 10 Nov '16

10 Nov '16

Module: wine Branch: master Commit: ffd1fa550dd2576983b0ecf7e735c133849fdf90 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ffd1fa550dd2576983b0ecf7e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Nov 10 09:54:15 2016 +0300 po: Update Russian translation. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ru.po | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/po/ru.po b/po/ru.po index 5e50b63..f726956 100644 --- a/po/ru.po +++ b/po/ru.po @@ -5,14 +5,14 @@ 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-10-28 10:09+0300\n" +"PO-Revision-Date: 2016-11-10 09:53+0300\n" "Last-Translator: Nikolay Sivov <nsivov(a)codeweavers.com>\n" "Language-Team: Russian\n" "Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 1.8.10\n" +"X-Generator: Poedit 1.8.11\n" #: appwiz.rc:58 msgid "Install/Uninstall" @@ -8044,10 +8044,8 @@ msgid "Wine was brought to you by:" msgstr "Разработчики Wine:" #: shell32.rc:334 -#, fuzzy -#| msgid "&Run..." msgid "Run" -msgstr "&Запустить..." +msgstr "Запустить" #: shell32.rc:338 msgid ""

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 10 Nov '16

10 Nov '16

Module: wine Branch: master Commit: e8f87f3476ed6b4d1e9915110651f2d3a5013151 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8f87f3476ed6b4d1e9915110… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Wed Nov 9 23:10:59 2016 +0200 po: Update Lithuanian translation. Signed-off-by: Aurimas Fišeras <aurimas(a)members.fsf.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/lt.po | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/po/lt.po b/po/lt.po index e931b01..d7242fb 100644 --- a/po/lt.po +++ b/po/lt.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-10-14 22:22+0300\n" +"PO-Revision-Date: 2016-11-09 23:09+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: Lithuanian <komp_lt(a)konf.lt>\n" "Language: lt\n" @@ -8041,10 +8041,8 @@ msgid "Wine was brought to you by:" msgstr "Prie „Wine“ kūrimo prisidėjo:" #: shell32.rc:334 -#, fuzzy -#| msgid "&Run..." msgid "Run" -msgstr "&Vykdyti..." +msgstr "Paleidimas" #: shell32.rc:338 msgid ""

1 0

Nikolay Sivov : ieframe/tests: Fix IShellUIHelper instance leak (Valgrind) .
by Alexandre Julliard 10 Nov '16

10 Nov '16

Module: wine Branch: master Commit: 153c234683d554f2b49f0f5614048e8a0227593c URL: http://source.winehq.org/git/wine.git/?a=commit;h=153c234683d554f2b49f0f561… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 9 22:40:16 2016 +0300 ieframe/tests: Fix IShellUIHelper instance leak (Valgrind). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ieframe/tests/webbrowser.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ieframe/tests/webbrowser.c b/dlls/ieframe/tests/webbrowser.c index cbd1d6b..763e0b9 100644 --- a/dlls/ieframe/tests/webbrowser.c +++ b/dlls/ieframe/tests/webbrowser.c @@ -3393,6 +3393,7 @@ static void test_external(IWebBrowser2 *unk) hres = IDispatch_QueryInterface(disp, &IID_IShellUIHelper, (void**)&uihelper); ok(hres == S_OK, "Could not get IShellUIHelper iface: %08x\n", hres); IShellUIHelper_Release(uihelper); + IDispatch_Release(disp); } IDocHostUIHandler2_Release(dochost);

1 0

Alistair Leslie-Hughes : vbscript: Coerce datatype in StrComp.
by Alexandre Julliard 10 Nov '16

10 Nov '16

Module: wine Branch: master Commit: 73924a45d6c674ae6eb729fb10207d896a1a8c72 URL: http://source.winehq.org/git/wine.git/?a=commit;h=73924a45d6c674ae6eb729fb1… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Nov 8 07:06:15 2016 +0000 vbscript: Coerce datatype in StrComp. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/global.c | 20 +++++++++++++------- dlls/vbscript/tests/api.vbs | 9 +++++++++ 2 files changed, 22 insertions(+), 7 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index a1ffa50..7e14776 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -1038,11 +1038,6 @@ static HRESULT Global_StrComp(vbdisp_t *This, VARIANT *args, unsigned args_cnt, assert(args_cnt == 2 || args_cnt == 3); - if(V_VT(args) != VT_BSTR || V_VT(args+1) != VT_BSTR) { - FIXME("args[0] = %s, args[1] = %s\n", debugstr_variant(args), debugstr_variant(args+1)); - return E_NOTIMPL; - } - if (args_cnt == 3) { hres = to_int(args+2, &mode); if(FAILED(hres)) @@ -1056,11 +1051,22 @@ static HRESULT Global_StrComp(vbdisp_t *This, VARIANT *args, unsigned args_cnt, else mode = 0; - left = V_BSTR(args); - right = V_BSTR(args+1); + hres = to_string(args, &left); + if(FAILED(hres)) + return hres; + + hres = to_string(args+1, &right); + if(FAILED(hres)) + { + SysFreeString(left); + return hres; + } ret = mode ? strcmpiW(left, right) : strcmpW(left, right); val = ret < 0 ? -1 : (ret > 0 ? 1 : 0); + + SysFreeString(left); + SysFreeString(right); return return_short(res, val); } diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index 91d34ce..f6b6f69 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -459,6 +459,15 @@ TestStrComp "ABCD", "ABC", 1, 1 TestStrComp "ABC", "ABCD", 1, -1 TestStrComp "ABC", "ABCD", "0", -1 TestStrComp "ABC", "ABCD", "1", -1 +TestStrComp 1, 1, 1, 0 +TestStrComp "1", 1, 1, 0 +TestStrComp "1", 1.0, 1, 0 +TestStrComp Empty, Empty, 1, 0 +TestStrComp Empty, "", 1, 0 +TestStrComp Empty, "ABC", 1, -1 +TestStrComp "ABC", Empty, 1, 1 +TestStrComp vbNull, vbNull, 1, 0 +TestStrComp "", vbNull, 1, -1 Call ok(Len("abc") = 3, "Len(abc) = " & Len("abc")) Call ok(Len("") = 0, "Len() = " & Len(""))

1 0

Jared Smudde : shell32: Add caption to Run dialog.
by Alexandre Julliard 09 Nov '16

09 Nov '16

1 0

← Newer
1
...
32
33
34
35
36
37
38
...
47
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 November 2016