June 2016 - Wine-commits - list.winehq.org

Iván Matellanes : msvcirt: Implement ostream::tellp.
by Alexandre Julliard 15 Jun '16

15 Jun '16

Module: wine Branch: master Commit: 3f32455f01aaefb50ccb323ddbdd5974f533f253 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f32455f01aaefb50ccb323dd… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Tue Jun 14 15:40:23 2016 +0100 msvcirt: Implement ostream::tellp. Signed-off-by: Iván Matellanes <matellanes.ivan(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcirt/msvcirt.c | 12 ++++++++++-- dlls/msvcirt/tests/msvcirt.c | 27 +++++++++++++++++++++++++++ 2 files changed, 37 insertions(+), 2 deletions(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index 2464d4f..0879a1d 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -2511,8 +2511,16 @@ ostream* __thiscall ostream_seekp_offset(ostream *this, streamoff off, ios_seek_ DEFINE_THISCALL_WRAPPER(ostream_tellp, 4) streampos __thiscall ostream_tellp(ostream *this) { - FIXME("(%p) stub\n", this); - return 0; + ios *base = ostream_get_ios(this); + streampos pos; + + TRACE("(%p)\n", this); + + ios_lockbuf(base); + if ((pos = call_streambuf_seekoff(base->sb, 0, SEEKDIR_cur, OPENMODE_out)) == EOF) + ios_clear(base, base->state | IOSTATE_failbit); + ios_unlockbuf(base); + return pos; } /* ?write(a)ostream@@QAEAAV1(a)PBDH@Z */ diff --git a/dlls/msvcirt/tests/msvcirt.c b/dlls/msvcirt/tests/msvcirt.c index 3a6cb6e..baabd65 100644 --- a/dlls/msvcirt/tests/msvcirt.c +++ b/dlls/msvcirt/tests/msvcirt.c @@ -268,6 +268,7 @@ static ostream* (*__thiscall p_ostream_put_char)(ostream*, char); static ostream* (*__thiscall p_ostream_write_char)(ostream*, const char*, int); static ostream* (*__thiscall p_ostream_seekp_offset)(ostream*, streamoff, ios_seek_dir); static ostream* (*__thiscall p_ostream_seekp)(ostream*, streampos); +static streampos (*__thiscall p_ostream_tellp)(ostream*); /* Emulate a __thiscall */ #ifdef __i386__ @@ -440,6 +441,7 @@ static BOOL init(void) SET(p_ostream_write_char, "?write(a)ostream@@QEAAAEAV1(a)PEBDH@Z"); SET(p_ostream_seekp_offset, "?seekp(a)ostream@@QEAAAEAV1(a)JW4seek_dir@ios@@@Z"); SET(p_ostream_seekp, "?seekp(a)ostream@@QEAAAEAV1(a)J@Z"); + SET(p_ostream_tellp, "?tellp(a)ostream@@QEAAJXZ"); } else { p_operator_new = (void*)GetProcAddress(msvcrt, "??2(a)YAPAXI@Z"); p_operator_delete = (void*)GetProcAddress(msvcrt, "??3(a)YAXPAX@Z"); @@ -542,6 +544,7 @@ static BOOL init(void) SET(p_ostream_write_char, "?write(a)ostream@@QAEAAV1(a)PBDH@Z"); SET(p_ostream_seekp_offset, "?seekp(a)ostream@@QAEAAV1(a)JW4seek_dir@ios@@@Z"); SET(p_ostream_seekp, "?seekp(a)ostream@@QAEAAV1(a)J@Z"); + SET(p_ostream_tellp, "?tellp(a)ostream@@QAEJXZ"); } SET(p_ios_static_lock, "?x_lockc(a)ios@@0U_CRT_CRITICAL_SECTION@@A"); SET(p_ios_lockc, "?lockc(a)ios@@KAXXZ"); @@ -2856,6 +2859,30 @@ if (0) /* crashes on native */ ok(os1.base_ios.state == (IOSTATE_badbit|IOSTATE_failbit), "expected %d got %d\n", IOSTATE_badbit|IOSTATE_failbit, os1.base_ios.state); + /* tellp */ + ret = (int) call_func1(p_ostream_tellp, &os1); + ok(ret == 0, "wrong return, expected 0 got %d\n", ret); + ok(os1.base_ios.state == (IOSTATE_badbit|IOSTATE_failbit), "expected %d got %d\n", + IOSTATE_badbit|IOSTATE_failbit, os1.base_ios.state); + ret = (int) call_func3(p_streambuf_xsputn, &fb1.base, "to say it", 9); + ok(ret == 9, "expected 9 got %d\n", ret); + ok(fb1.base.pbase == fb1.base.base, "wrong put base, expected %p got %p\n", fb1.base.base, fb1.base.pbase); + ok(fb1.base.pptr == fb1.base.base + 9, "wrong put pointer, expected %p got %p\n", fb1.base.base + 9, fb1.base.pptr); + ret = (int) call_func1(p_ostream_tellp, &os1); + ok(ret == 9, "wrong return, expected 9 got %d\n", ret); + ok(os1.base_ios.state == (IOSTATE_badbit|IOSTATE_failbit), "expected %d got %d\n", + IOSTATE_badbit|IOSTATE_failbit, os1.base_ios.state); + ok(fb1.base.pbase == NULL, "wrong put base, expected %p got %p\n", NULL, fb1.base.pbase); + ok(fb1.base.pptr == NULL, "wrong put pointer, expected %p got %p\n", NULL, fb1.base.pptr); + os1.base_ios.state = IOSTATE_eofbit; + fd = fb1.fd; + fb1.fd = -1; + ret = (int) call_func1(p_ostream_tellp, &os1); + ok(ret == EOF, "wrong return, expected EOF got %d\n", ret); + ok(os1.base_ios.state == (IOSTATE_eofbit|IOSTATE_failbit), "expected %d got %d\n", + IOSTATE_eofbit|IOSTATE_failbit, os1.base_ios.state); + fb1.fd = fd; + call_func1(p_ostream_vbase_dtor, &os1); call_func1(p_ostream_vbase_dtor, &os2); call_func1(p_filebuf_dtor, &fb1);

1 0

Iván Matellanes : msvcirt: Implement ostream:: writepad.
by Alexandre Julliard 15 Jun '16

15 Jun '16

Module: wine Branch: master Commit: d5f445511e57611c83b85e241e939b3ca7e598a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5f445511e57611c83b85e241… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Tue Jun 14 15:40:24 2016 +0100 msvcirt: Implement ostream::writepad. Signed-off-by: Iván Matellanes <matellanes.ivan(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcirt/msvcirt.c | 26 +++++++++++++- dlls/msvcirt/tests/msvcirt.c | 83 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 108 insertions(+), 1 deletion(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index 0879a1d..fe5901a 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -2561,7 +2561,31 @@ ostream* __thiscall ostream_write_unsigned_char(ostream *this, const unsigned ch DEFINE_THISCALL_WRAPPER(ostream_writepad, 12) ostream* __thiscall ostream_writepad(ostream *this, const char *str1, const char *str2) { - FIXME("(%p %s %s) stub\n", this, str1, str2); + ios *base = ostream_get_ios(this); + int len1 = strlen(str1), len2 = strlen(str2), i; + + TRACE("(%p %p %p)\n", this, str1, str2); + + /* left of the padding */ + if (base->flags & (FLAGS_left|FLAGS_internal)) { + if (streambuf_sputn(base->sb, str1, len1) != len1) + ios_clear(base, base->state | IOSTATE_failbit | IOSTATE_badbit); + if (!(base->flags & FLAGS_internal)) + if (streambuf_sputn(base->sb, str2, len2) != len2) + ios_clear(base, base->state | IOSTATE_failbit | IOSTATE_badbit); + } + /* add padding to fill the width */ + for (i = len1 + len2; i < base->width; i++) + if (streambuf_sputc(base->sb, base->fill) == EOF) + ios_clear(base, base->state | IOSTATE_failbit | IOSTATE_badbit); + /* right of the padding */ + if ((base->flags & (FLAGS_left|FLAGS_internal)) != FLAGS_left) { + if (!(base->flags & (FLAGS_left|FLAGS_internal))) + if (streambuf_sputn(base->sb, str1, len1) != len1) + ios_clear(base, base->state | IOSTATE_failbit | IOSTATE_badbit); + if (streambuf_sputn(base->sb, str2, len2) != len2) + ios_clear(base, base->state | IOSTATE_failbit | IOSTATE_badbit); + } return this; } diff --git a/dlls/msvcirt/tests/msvcirt.c b/dlls/msvcirt/tests/msvcirt.c index baabd65..a6916c1 100644 --- a/dlls/msvcirt/tests/msvcirt.c +++ b/dlls/msvcirt/tests/msvcirt.c @@ -269,6 +269,7 @@ static ostream* (*__thiscall p_ostream_write_char)(ostream*, const char*, int); static ostream* (*__thiscall p_ostream_seekp_offset)(ostream*, streamoff, ios_seek_dir); static ostream* (*__thiscall p_ostream_seekp)(ostream*, streampos); static streampos (*__thiscall p_ostream_tellp)(ostream*); +static ostream* (*__thiscall p_ostream_writepad)(ostream*, const char*, const char*); /* Emulate a __thiscall */ #ifdef __i386__ @@ -442,6 +443,7 @@ static BOOL init(void) SET(p_ostream_seekp_offset, "?seekp(a)ostream@@QEAAAEAV1(a)JW4seek_dir@ios@@@Z"); SET(p_ostream_seekp, "?seekp(a)ostream@@QEAAAEAV1(a)J@Z"); SET(p_ostream_tellp, "?tellp(a)ostream@@QEAAJXZ"); + SET(p_ostream_writepad, "?writepad(a)ostream@@AEAAAEAV1(a)PEBD0@Z"); } else { p_operator_new = (void*)GetProcAddress(msvcrt, "??2(a)YAPAXI@Z"); p_operator_delete = (void*)GetProcAddress(msvcrt, "??3(a)YAXPAX@Z"); @@ -545,6 +547,7 @@ static BOOL init(void) SET(p_ostream_seekp_offset, "?seekp(a)ostream@@QAEAAV1(a)JW4seek_dir@ios@@@Z"); SET(p_ostream_seekp, "?seekp(a)ostream@@QAEAAV1(a)J@Z"); SET(p_ostream_tellp, "?tellp(a)ostream@@QAEJXZ"); + SET(p_ostream_writepad, "?writepad(a)ostream@@AAEAAV1(a)PBD0@Z"); } SET(p_ios_static_lock, "?x_lockc(a)ios@@0U_CRT_CRITICAL_SECTION@@A"); SET(p_ios_lockc, "?lockc(a)ios@@KAXXZ"); @@ -2883,6 +2886,86 @@ if (0) /* crashes on native */ IOSTATE_eofbit|IOSTATE_failbit, os1.base_ios.state); fb1.fd = fd; + /* writepad */ + os1.base_ios.state = IOSTATE_eofbit; + os1.base_ios.flags = + FLAGS_right|FLAGS_hex|FLAGS_showbase|FLAGS_showpoint|FLAGS_showpos|FLAGS_uppercase|FLAGS_fixed; + os1.base_ios.fill = 'z'; + os1.base_ios.width = 9; + pos = (ostream*) call_func3(p_ostream_writepad, &os1, "a", "b"); + ok(pos == &os1, "wrong return, expected %p got %p\n", &os1, pos); + ok(!strncmp(fb1.base.pptr - 9, "zzzzzzzab", 9), "expected 'zzzzzzzab' got '%s'\n", fb1.base.pptr - 9); + pos = (ostream*) call_func3(p_ostream_writepad, &os1, "aa", "bb"); + ok(pos == &os1, "wrong return, expected %p got %p\n", &os1, pos); + ok(!strncmp(fb1.base.pptr - 9, "zzzzzaabb", 9), "expected 'zzzzzaabb' got '%s'\n", fb1.base.pptr - 9); + pos = (ostream*) call_func3(p_ostream_writepad, &os1, "aaaaa", "bbbbb"); + ok(pos == &os1, "wrong return, expected %p got %p\n", &os1, pos); + ok(!strncmp(fb1.base.pptr - 10, "aaaaabbbbb", 10), "expected 'aaaaabbbbb' got '%s'\n", fb1.base.pptr - 10); + os1.base_ios.flags |= FLAGS_internal; + pos = (ostream*) call_func3(p_ostream_writepad, &os1, "aa", "bb"); + ok(pos == &os1, "wrong return, expected %p got %p\n", &os1, pos); + ok(!strncmp(fb1.base.pptr - 9, "aazzzzzbb", 9), "expected 'aazzzzzbb' got '%s'\n", fb1.base.pptr - 9); + os1.base_ios.flags &= ~FLAGS_right; + pos = (ostream*) call_func3(p_ostream_writepad, &os1, "a", "b"); + ok(pos == &os1, "wrong return, expected %p got %p\n", &os1, pos); + ok(!strncmp(fb1.base.pptr - 9, "azzzzzzzb", 9), "expected 'azzzzzzzb' got '%s'\n", fb1.base.pptr - 9); + os1.base_ios.width = 6; + pos = (ostream*) call_func3(p_ostream_writepad, &os1, "1", "2"); + ok(pos == &os1, "wrong return, expected %p got %p\n", &os1, pos); + ok(!strncmp(fb1.base.pptr - 6, "1zzzz2", 6), "expected '1zzzz2' got '%s'\n", fb1.base.pptr - 6); + pos = (ostream*) call_func3(p_ostream_writepad, &os1, "12345678", ""); + ok(pos == &os1, "wrong return, expected %p got %p\n", &os1, pos); + ok(!strncmp(fb1.base.pptr - 8, "12345678", 8), "expected '12345678' got '%s'\n", fb1.base.pptr - 8); + os1.base_ios.flags |= FLAGS_left; + pos = (ostream*) call_func3(p_ostream_writepad, &os1, "z1", "2z"); + ok(pos == &os1, "wrong return, expected %p got %p\n", &os1, pos); + ok(!strncmp(fb1.base.pptr - 6, "z1zz2z", 6), "expected 'z1zz2z' got '%s'\n", fb1.base.pptr - 6); + os1.base_ios.flags &= ~FLAGS_internal; + pos = (ostream*) call_func3(p_ostream_writepad, &os1, "hell", "o"); + ok(pos == &os1, "wrong return, expected %p got %p\n", &os1, pos); + ok(!strncmp(fb1.base.pptr - 6, "helloz", 6), "expected 'helloz' got '%s'\n", fb1.base.pptr - 6); + os1.base_ios.flags |= FLAGS_right; + pos = (ostream*) call_func3(p_ostream_writepad, &os1, "a", "b"); + ok(pos == &os1, "wrong return, expected %p got %p\n", &os1, pos); + ok(!strncmp(fb1.base.pptr - 6, "abzzzz", 6), "expected 'abzzzz' got '%s'\n", fb1.base.pptr - 6); +if (0) /* crashes on native */ + pos = (ostream*) call_func3(p_ostream_writepad, &os1, NULL, "o"); + pos = (ostream*) call_func3(p_ostream_writepad, &os1, "", "hello"); + ok(pos == &os1, "wrong return, expected %p got %p\n", &os1, pos); + ok(!strncmp(fb1.base.pptr - 6, "helloz", 6), "expected 'helloz' got '%s'\n", fb1.base.pptr - 6); + os1.base_ios.fill = '*'; + pos = (ostream*) call_func3(p_ostream_writepad, &os1, "", ""); + ok(pos == &os1, "wrong return, expected %p got %p\n", &os1, pos); + ok(!strncmp(fb1.base.pptr - 6, "******", 6), "expected '******' got '%s'\n", fb1.base.pptr - 6); + pos = (ostream*) call_func3(p_ostream_writepad, &os1, "aa", ""); + ok(pos == &os1, "wrong return, expected %p got %p\n", &os1, pos); + ok(!strncmp(fb1.base.pptr - 6, "aa****", 6), "expected 'aa****' got '%s'\n", fb1.base.pptr - 6); + os1.base_ios.flags = 0; + pos = (ostream*) call_func3(p_ostream_writepad, &os1, "a", "b"); + ok(pos == &os1, "wrong return, expected %p got %p\n", &os1, pos); + ok(!strncmp(fb1.base.pptr - 6, "****ab", 6), "expected '****ab' got '%s'\n", fb1.base.pptr - 6); + call_func1(p_filebuf_sync, &fb1); + fb1.fd = -1; + pos = (ostream*) call_func3(p_ostream_writepad, &os1, "aa", "bb"); + ok(pos == &os1, "wrong return, expected %p got %p\n", &os1, pos); + ok(os1.base_ios.state == (IOSTATE_badbit|IOSTATE_failbit|IOSTATE_eofbit), "expected %d got %d\n", + IOSTATE_badbit|IOSTATE_failbit|IOSTATE_eofbit, os1.base_ios.state); + os1.base_ios.state = IOSTATE_goodbit; + pos = (ostream*) call_func3(p_ostream_writepad, &os1, "", ""); + ok(pos == &os1, "wrong return, expected %p got %p\n", &os1, pos); + ok(os1.base_ios.state == (IOSTATE_badbit|IOSTATE_failbit), "expected %d got %d\n", + IOSTATE_badbit|IOSTATE_failbit, os1.base_ios.state); + os1.base_ios.state = IOSTATE_goodbit; + os1.base_ios.width = 0; + pos = (ostream*) call_func3(p_ostream_writepad, &os1, "", ""); + ok(pos == &os1, "wrong return, expected %p got %p\n", &os1, pos); + ok(os1.base_ios.state == IOSTATE_goodbit, "expected %d got %d\n", IOSTATE_goodbit, os1.base_ios.state); + pos = (ostream*) call_func3(p_ostream_writepad, &os1, "a", ""); + ok(pos == &os1, "wrong return, expected %p got %p\n", &os1, pos); + ok(os1.base_ios.state == (IOSTATE_badbit|IOSTATE_failbit), "expected %d got %d\n", + IOSTATE_badbit|IOSTATE_failbit, os1.base_ios.state); + fb1.fd = fd; + call_func1(p_ostream_vbase_dtor, &os1); call_func1(p_ostream_vbase_dtor, &os2); call_func1(p_filebuf_dtor, &fb1);

1 0

Jacek Caban : mshtmdid.h: Fixed IHTMLDocument6 DISPIDs.
by Alexandre Julliard 15 Jun '16

15 Jun '16

Module: wine Branch: master Commit: 66462b4ef83deae533360a79002d111dcd938b01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=66462b4ef83deae533360a790… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jun 14 22:02:44 2016 +0200 mshtmdid.h: Fixed IHTMLDocument6 DISPIDs. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/mshtmdid.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/mshtmdid.h b/include/mshtmdid.h index d17af33..6d66dd6 100644 --- a/include/mshtmdid.h +++ b/include/mshtmdid.h @@ -1136,8 +1136,8 @@ #define DISPID_IHTMLDOCUMENT6_DOCUMENTMODE DISPID_OMDOCUMENT+104 #define DISPID_IHTMLDOCUMENT6_ONSTORAGE DISPID_EVPROP_ONSTORAGE #define DISPID_IHTMLDOCUMENT6_ONSTORAGECOMMIT DISPID_EVPROP_ONSTORAGECOMMIT -#define DISPID_IHTMLDOCUMENT6_IE8_GETELEMENTBYID DISPID_OMDOCUMENT+105 -#define DISPID_IHTMLDOCUMENT6_UPDATESETTINGS DISPID_OMDOCUMENT+106 +#define DISPID_IHTMLDOCUMENT6_IE8_GETELEMENTBYID DISPID_OMDOCUMENT+107 +#define DISPID_IHTMLDOCUMENT6_UPDATESETTINGS DISPID_OMDOCUMENT+109 /* IHTMLDocument7 */ #define DISPID_IHTMLDOCUMENT7_DEFAULTVIEW DISPID_OMDOCUMENT+110

1 0

Andrey Gusev : include: Add d3dx11.h.
by Alexandre Julliard 15 Jun '16

15 Jun '16

Module: wine Branch: master Commit: 69b4b3385c903af2da1863c4d83ea63e11bb048b URL: http://source.winehq.org/git/wine.git/?a=commit;h=69b4b3385c903af2da1863c4d… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Fri Jun 3 11:56:29 2016 +0300 include: Add d3dx11.h. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/d3dx11.h | 31 +++++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 7c44c40..1612a94 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -256,6 +256,7 @@ HEADER_SRCS = \ d3dx10.h \ d3dx10async.h \ d3dx10tex.h \ + d3dx11.h \ d3dx9.h \ d3dx9anim.h \ d3dx9core.h \ diff --git a/include/d3dx11.h b/include/d3dx11.h new file mode 100644 index 0000000..52191da --- /dev/null +++ b/include/d3dx11.h @@ -0,0 +1,31 @@ +/* + * Copyright 2016 Andrey Gusev + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __D3DX11_H__ +#define __D3DX11_H__ + +#include <limits.h> +#include <float.h> + +#define D3DX11_DEFAULT (0xffffffffu) +#define D3DX11_FROM_FILE (0xfffffffdu) +#define DXGI_FORMAT_FROM_FILE ((DXGI_FORMAT)0xfffffffdu) + +#include "d3d11.h" + +#endif

1 0

Andrey Gusev : include: Add d3dx11core.idl.
by Alexandre Julliard 15 Jun '16

15 Jun '16

Module: wine Branch: master Commit: 6a751578a8c357e2742deec83f5def4a9d1d4dc8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a751578a8c357e2742deec83… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Tue Jun 14 22:57:22 2016 +0200 include: Add d3dx11core.idl. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/d3dx11.h | 1 + include/d3dx11core.idl | 65 ++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 67 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 1612a94..9ffaff4 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -42,6 +42,7 @@ IDL_SRCS = \ d3d11sdklayers.idl \ d3dcommon.idl \ d3dx10core.idl \ + d3dx11core.idl \ dbccmd.idl \ dbcses.idl \ dbdsad.idl \ diff --git a/include/d3dx11.h b/include/d3dx11.h index 52191da..08a303d 100644 --- a/include/d3dx11.h +++ b/include/d3dx11.h @@ -27,5 +27,6 @@ #define DXGI_FORMAT_FROM_FILE ((DXGI_FORMAT)0xfffffffdu) #include "d3d11.h" +#include "d3dx11core.h" #endif diff --git a/include/d3dx11core.idl b/include/d3dx11core.idl new file mode 100644 index 0000000..d47463c --- /dev/null +++ b/include/d3dx11core.idl @@ -0,0 +1,65 @@ +/* + * Copyright 2016 Andrey Gusev + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +import "oaidl.idl"; +import "ocidl.idl"; +import "dxgi.idl"; +import "d3dcommon.idl"; + +[ + object, + local, + pointer_default(unique) +] +interface ID3DX11DataLoader +{ + HRESULT Load(); + HRESULT Decompress([out] void **data, [in] SIZE_T *bytes); + HRESULT Destroy(); +}; + +[ + object, + local, + pointer_default(unique) +] +interface ID3DX11DataProcessor +{ + HRESULT Process([in] void *data, [in] SIZE_T bytes); + HRESULT CreateDeviceObject([out] void **data_object); + HRESULT Destroy(); +}; + +[ + object, + local, + pointer_default(unique), + uuid(c93fecfa-6967-478a-abbc-402d90621fcb) +] +interface ID3DX11ThreadPump : IUnknown +{ + HRESULT AddWorkItem([in] ID3DX11DataLoader *loader, [in] ID3DX11DataProcessor *processor, + [in] HRESULT *hresult, [out] void **device_object); + UINT GetWorkItemCount(); + + HRESULT WaitForAllItems(); + HRESULT ProcessDeviceWorkItems([in] UINT count); + + HRESULT PurgeAllItems(); + HRESULT GetQueueStatus([in] UINT *io_queue, [in] UINT *process_queue, [in] UINT *device_queue); +};

1 0

Andrey Gusev : include: Add d3dx11tex.h.
by Alexandre Julliard 15 Jun '16

15 Jun '16

Module: wine Branch: master Commit: 94711ead3b9c0f97164c4b26ee6d11ca53f1746f URL: http://source.winehq.org/git/wine.git/?a=commit;h=94711ead3b9c0f97164c4b26e… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Tue Jun 14 22:57:23 2016 +0200 include: Add d3dx11tex.h. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/d3dx11.h | 1 + include/d3dx11tex.h | 96 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 98 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 9ffaff4..d981ac5 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -258,6 +258,7 @@ HEADER_SRCS = \ d3dx10async.h \ d3dx10tex.h \ d3dx11.h \ + d3dx11tex.h \ d3dx9.h \ d3dx9anim.h \ d3dx9core.h \ diff --git a/include/d3dx11.h b/include/d3dx11.h index 08a303d..de54034 100644 --- a/include/d3dx11.h +++ b/include/d3dx11.h @@ -28,5 +28,6 @@ #include "d3d11.h" #include "d3dx11core.h" +#include "d3dx11tex.h" #endif diff --git a/include/d3dx11tex.h b/include/d3dx11tex.h new file mode 100644 index 0000000..54c77b7 --- /dev/null +++ b/include/d3dx11tex.h @@ -0,0 +1,96 @@ +/* + * Copyright 2016 Andrey Gusev + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "d3dx11.h" + +#ifndef __D3DX11TEX_H__ +#define __D3DX11TEX_H__ + +typedef enum D3DX11_IMAGE_FILE_FORMAT +{ + D3DX11_IFF_BMP = 0, + D3DX11_IFF_JPG = 1, + D3DX11_IFF_PNG = 3, + D3DX11_IFF_DDS = 4, + D3DX11_IFF_TIFF = 10, + D3DX11_IFF_GIF = 11, + D3DX11_IFF_WMP = 12, + D3DX11_IFF_FORCE_DWORD = 0x7fffffff +} D3DX11_IMAGE_FILE_FORMAT; + +typedef struct D3DX11_IMAGE_INFO +{ + UINT Width; + UINT Height; + UINT Depth; + UINT ArraySize; + UINT MipLevels; + UINT MiscFlags; + DXGI_FORMAT Format; + D3D11_RESOURCE_DIMENSION ResourceDimension; + D3DX11_IMAGE_FILE_FORMAT ImageFileFormat; +} D3DX11_IMAGE_INFO; + +typedef struct D3DX11_IMAGE_LOAD_INFO +{ + UINT Width; + UINT Height; + UINT Depth; + UINT FirstMipLevel; + UINT MipLevels; + D3D11_USAGE Usage; + UINT BindFlags; + UINT CpuAccessFlags; + UINT MiscFlags; + DXGI_FORMAT Format; + UINT Filter; + UINT MipFilter; + D3DX11_IMAGE_INFO *pSrcInfo; + +#ifdef __cplusplus + D3DX11_IMAGE_LOAD_INFO() + { + Width = D3DX11_DEFAULT; + Height = D3DX11_DEFAULT; + Depth = D3DX11_DEFAULT; + FirstMipLevel = D3DX11_DEFAULT; + MipLevels = D3DX11_DEFAULT; + Usage = (D3D11_USAGE)D3DX11_DEFAULT; + BindFlags = D3DX11_DEFAULT; + CpuAccessFlags = D3DX11_DEFAULT; + MiscFlags = D3DX11_DEFAULT; + Format = DXGI_FORMAT_FROM_FILE; + Filter = D3DX11_DEFAULT; + MipFilter = D3DX11_DEFAULT; + pSrcInfo = NULL; + } +#endif +} D3DX11_IMAGE_LOAD_INFO; + +#ifdef __cplusplus +extern "C" { +#endif + +HRESULT WINAPI D3DX11CreateTextureFromMemory(ID3D11Device *device, const void *src_data, SIZE_T src_data_size, + D3DX11_IMAGE_LOAD_INFO *loadinfo, ID3DX11ThreadPump *pump, ID3D11Resource **texture, HRESULT *hresult); + +#ifdef __cplusplus +} +#endif + +#endif

1 0

Matteo Bruni : d3dx11: Implement D3DX11CompileFromMemory().
by Alexandre Julliard 15 Jun '16

15 Jun '16

Module: wine Branch: master Commit: f7a1491a5ebd7d8ae3e9db55a8b49e66a08e6be6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7a1491a5ebd7d8ae3e9db55a… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Jun 14 22:57:24 2016 +0200 d3dx11: Implement D3DX11CompileFromMemory(). Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 +- configure.ac | 2 +- dlls/d3dx11_42/d3dx11_42.spec | 2 +- dlls/d3dx11_43/Makefile.in | 6 +++++- dlls/d3dx11_43/async.c | 43 +++++++++++++++++++++++++++++++++++++++++++ dlls/d3dx11_43/d3dx11_43.c | 2 +- dlls/d3dx11_43/d3dx11_43.spec | 2 +- include/Makefile.in | 1 + include/d3dx11async.h | 37 +++++++++++++++++++++++++++++++++++++ 9 files changed, 91 insertions(+), 6 deletions(-) diff --git a/configure b/configure index 6151ef8..d1a6a68 100755 --- a/configure +++ b/configure @@ -17595,7 +17595,7 @@ wine_fn_config_dll d3dx10_42 enable_d3dx10_42 wine_fn_config_dll d3dx10_43 enable_d3dx10_43 implib d3dx10 wine_fn_config_test dlls/d3dx10_43/tests d3dx10_43_test wine_fn_config_dll d3dx11_42 enable_d3dx11_42 -wine_fn_config_dll d3dx11_43 enable_d3dx11_43 +wine_fn_config_dll d3dx11_43 enable_d3dx11_43 implib d3dx11 wine_fn_config_dll d3dx9_24 enable_d3dx9_24 wine_fn_config_dll d3dx9_25 enable_d3dx9_25 wine_fn_config_dll d3dx9_26 enable_d3dx9_26 diff --git a/configure.ac b/configure.ac index a2b1705..7f234b2 100644 --- a/configure.ac +++ b/configure.ac @@ -2841,7 +2841,7 @@ WINE_CONFIG_DLL(d3dx10_42) WINE_CONFIG_DLL(d3dx10_43,,[implib],[d3dx10]) WINE_CONFIG_TEST(dlls/d3dx10_43/tests) WINE_CONFIG_DLL(d3dx11_42) -WINE_CONFIG_DLL(d3dx11_43) +WINE_CONFIG_DLL(d3dx11_43,,[implib],[d3dx11]) WINE_CONFIG_DLL(d3dx9_24) WINE_CONFIG_DLL(d3dx9_25) WINE_CONFIG_DLL(d3dx9_26) diff --git a/dlls/d3dx11_42/d3dx11_42.spec b/dlls/d3dx11_42/d3dx11_42.spec index 3fd291c..b917263 100644 --- a/dlls/d3dx11_42/d3dx11_42.spec +++ b/dlls/d3dx11_42/d3dx11_42.spec @@ -1,7 +1,7 @@ @ stdcall D3DX11CheckVersion(long long) @ stub D3DX11CompileFromFileA @ stub D3DX11CompileFromFileW -@ stub D3DX11CompileFromMemory +@ stdcall D3DX11CompileFromMemory(str long str ptr ptr str str long long ptr ptr ptr ptr) d3dx11_43.D3DX11CompileFromMemory @ stub D3DX11CompileFromResourceA @ stub D3DX11CompileFromResourceW @ stub D3DX11ComputeNormalMap diff --git a/dlls/d3dx11_43/Makefile.in b/dlls/d3dx11_43/Makefile.in index 8336602..1cc4911 100644 --- a/dlls/d3dx11_43/Makefile.in +++ b/dlls/d3dx11_43/Makefile.in @@ -1,5 +1,9 @@ MODULE = d3dx11_43.dll +IMPORTLIB = d3dx11 +IMPORTS = d3dcompiler -C_SRCS = d3dx11_43.c +C_SRCS = \ + async.c \ + d3dx11_43.c RC_SRCS = version.rc diff --git a/dlls/d3dx11_43/async.c b/dlls/d3dx11_43/async.c new file mode 100644 index 0000000..c809f2c --- /dev/null +++ b/dlls/d3dx11_43/async.c @@ -0,0 +1,43 @@ +/* + * Copyright 2016 Matteo Bruni for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "config.h" +#include "wine/port.h" +#include "d3dx11.h" +#include "d3dcompiler.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(d3dx); + +HRESULT WINAPI D3DX11CompileFromMemory(const char *data, SIZE_T data_size, const char *filename, + const D3D10_SHADER_MACRO *defines, ID3D10Include *include, const char *entry_point, + const char *target, UINT sflags, UINT eflags, ID3DX11ThreadPump *pump, ID3D10Blob **shader, + ID3D10Blob **error_messages, HRESULT *hresult) +{ + TRACE("data %s, data_size %lu, filename %s, defines %p, include %p, entry_point %s, target %s, " + "sflags %#x, eflage %#x, pump %p, shader %p, error_messages %p, hresult %p.\n", + debugstr_a(data), data_size, debugstr_a(filename), defines, include, entry_point, + debugstr_a(target), sflags, eflags, pump, shader, error_messages, hresult); + + if (pump) + FIXME("Unimplemented ID3DX11ThreadPump handling.\n"); + + return D3DCompile(data, data_size, filename, defines, include, entry_point, target, + sflags, eflags, shader, error_messages); +} diff --git a/dlls/d3dx11_43/d3dx11_43.c b/dlls/d3dx11_43/d3dx11_43.c index a609613..149d953 100644 --- a/dlls/d3dx11_43/d3dx11_43.c +++ b/dlls/d3dx11_43/d3dx11_43.c @@ -26,7 +26,7 @@ #include "winbase.h" #include "winuser.h" #include "objbase.h" -#include "d3d11.h" +#include "d3dx11.h" BOOL WINAPI DllMain(HINSTANCE hdll, DWORD reason, LPVOID reserved) { diff --git a/dlls/d3dx11_43/d3dx11_43.spec b/dlls/d3dx11_43/d3dx11_43.spec index 3fd291c..a2a32ff 100644 --- a/dlls/d3dx11_43/d3dx11_43.spec +++ b/dlls/d3dx11_43/d3dx11_43.spec @@ -1,7 +1,7 @@ @ stdcall D3DX11CheckVersion(long long) @ stub D3DX11CompileFromFileA @ stub D3DX11CompileFromFileW -@ stub D3DX11CompileFromMemory +@ stdcall D3DX11CompileFromMemory(str long str ptr ptr str str long long ptr ptr ptr ptr) @ stub D3DX11CompileFromResourceA @ stub D3DX11CompileFromResourceW @ stub D3DX11ComputeNormalMap diff --git a/include/Makefile.in b/include/Makefile.in index d981ac5..b2002a9 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -258,6 +258,7 @@ HEADER_SRCS = \ d3dx10async.h \ d3dx10tex.h \ d3dx11.h \ + d3dx11async.h \ d3dx11tex.h \ d3dx9.h \ d3dx9anim.h \ diff --git a/include/d3dx11async.h b/include/d3dx11async.h new file mode 100644 index 0000000..210067b --- /dev/null +++ b/include/d3dx11async.h @@ -0,0 +1,37 @@ +/* + * Copyright 2016 Matteo Bruni for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __D3DX11ASYNC_H__ +#define __D3DX11ASYNC_H__ + +#include "d3dx11.h" + +#ifdef __cplusplus +extern "C" { +#endif + +HRESULT WINAPI D3DX11CompileFromMemory(const char *data, SIZE_T data_size, const char *filename, + const D3D10_SHADER_MACRO *defines, ID3D10Include *include, const char *entry_point, + const char *target, UINT sflags, UINT eflags, ID3DX11ThreadPump *pump, ID3D10Blob **shader, + ID3D10Blob **error_messages, HRESULT *hresult); + +#ifdef __cplusplus +} +#endif + +#endif

1 0

Matteo Bruni : d3dx11_42: Share the source code with d3dx11_43.
by Alexandre Julliard 15 Jun '16

15 Jun '16

Module: wine Branch: master Commit: ae8fc713203941ab99aadb586c816d9e5284f410 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae8fc713203941ab99aadb586… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Jun 14 22:57:25 2016 +0200 d3dx11_42: Share the source code with d3dx11_43. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx11_42/Makefile.in | 6 +++++- dlls/d3dx11_42/d3dx11_42.c | 2 +- dlls/d3dx11_42/d3dx11_42.spec | 2 +- tools/make_specfiles | 4 ---- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/d3dx11_42/Makefile.in b/dlls/d3dx11_42/Makefile.in index 3b6ab39..3ed7fd3 100644 --- a/dlls/d3dx11_42/Makefile.in +++ b/dlls/d3dx11_42/Makefile.in @@ -1,5 +1,9 @@ MODULE = d3dx11_42.dll +IMPORTS = d3dcompiler +PARENTSRC = ../d3dx11_43 -C_SRCS = d3dx11_42.c +C_SRCS = \ + async.c \ + d3dx11_42.c RC_SRCS = version.rc diff --git a/dlls/d3dx11_42/d3dx11_42.c b/dlls/d3dx11_42/d3dx11_42.c index ac56fbe..823ebf4 100644 --- a/dlls/d3dx11_42/d3dx11_42.c +++ b/dlls/d3dx11_42/d3dx11_42.c @@ -26,7 +26,7 @@ #include "winbase.h" #include "winuser.h" #include "objbase.h" -#include "d3d11.h" +#include "d3dx11.h" BOOL WINAPI DllMain(HINSTANCE hdll, DWORD reason, LPVOID reserved) { diff --git a/dlls/d3dx11_42/d3dx11_42.spec b/dlls/d3dx11_42/d3dx11_42.spec index b917263..a2a32ff 100644 --- a/dlls/d3dx11_42/d3dx11_42.spec +++ b/dlls/d3dx11_42/d3dx11_42.spec @@ -1,7 +1,7 @@ @ stdcall D3DX11CheckVersion(long long) @ stub D3DX11CompileFromFileA @ stub D3DX11CompileFromFileW -@ stdcall D3DX11CompileFromMemory(str long str ptr ptr str str long long ptr ptr ptr ptr) d3dx11_43.D3DX11CompileFromMemory +@ stdcall D3DX11CompileFromMemory(str long str ptr ptr str str long long ptr ptr ptr ptr) @ stub D3DX11CompileFromResourceA @ stub D3DX11CompileFromResourceW @ stub D3DX11ComputeNormalMap diff --git a/tools/make_specfiles b/tools/make_specfiles index feb65b4..448d813 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -108,10 +108,6 @@ my @dll_groups = "d3dx10_33", ], [ - "d3dx11_43", - "d3dx11_42", - ], - [ "d3dcompiler_43", "d3dcompiler_47", "d3dcompiler_46",

1 0

Matteo Bruni : d3dx9: Turn an ERR into a WARN.
by Alexandre Julliard 15 Jun '16

15 Jun '16

Module: wine Branch: master Commit: c614f0b1b4cf0ee7c9e4f52aff50bfff0ad3f60c URL: http://source.winehq.org/git/wine.git/?a=commit;h=c614f0b1b4cf0ee7c9e4f52af… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Jun 14 22:57:26 2016 +0200 d3dx9: Turn an ERR into a WARN. It can potentially happen if the application passes broken effect data. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/preshader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3dx9_36/preshader.c b/dlls/d3dx9_36/preshader.c index 78f3bdb..68301fe 100644 --- a/dlls/d3dx9_36/preshader.c +++ b/dlls/d3dx9_36/preshader.c @@ -524,7 +524,7 @@ static HRESULT get_constants_desc(unsigned int *byte_code, struct d3dx_const_tab if (cdesc[i].Class == D3DXPC_OBJECT) TRACE("Object %s, parameter %p.\n", cdesc[i].Name, inputs_param[i]); else if (!inputs_param[i]) - ERR("Could not find parameter %s in effect.\n", cdesc[i].Name); + WARN("Could not find parameter %s in effect.\n", cdesc[i].Name); } out->input_count = desc.Constants; out->inputs = cdesc;

1 0

Piotr Caban : msvcrt: Fix C locale handling in mbstowcs.
by Alexandre Julliard 14 Jun '16

14 Jun '16

Module: wine Branch: master Commit: f091d9edf652eb2b45d8042c598addd7d0ef4d2c URL: http://source.winehq.org/git/wine.git/?a=commit;h=f091d9edf652eb2b45d8042c5… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jun 14 11:57:16 2016 +0200 msvcrt: Fix C locale handling in mbstowcs. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/mbcs.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index 5d389bf..fe88cc7 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -2253,6 +2253,17 @@ MSVCRT_size_t CDECL MSVCRT__mbstowcs_l(MSVCRT_wchar_t *wcstr, const char *mbstr, else locinfo = locale->locinfo; + if(!locinfo->lc_codepage) { + if(!wcstr) + return strlen(mbstr); + + for(i=0; i<count; i++) { + wcstr[i] = (unsigned char)mbstr[i]; + if(!wcstr[i]) break; + } + return i; + } + /* Ignore count parameter */ if(!wcstr) return MultiByteToWideChar(locinfo->lc_codepage, 0, mbstr, -1, NULL, 0)-1;

1 0