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

Iván Matellanes : msvcirt: Implement ostream manipulators.
by Alexandre Julliard June 22, 2016

June 22, 2016

Module: wine Branch: master Commit: 38fb1062daaf68afe4dc20e1aceddfa89fe1ea4f URL: http://source.winehq.org/git/wine.git/?a=commit;h=38fb1062daaf68afe4dc20e1a… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Wed Jun 22 13:59:53 2016 +0100 msvcirt: Implement ostream manipulators. 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 | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index 32c1bf4..666c44c 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -2843,24 +2843,25 @@ ostream* __thiscall ostream_print_ios_manip(ostream *this, ios* (__cdecl *func)( /* ?endl@@YAAEAVostream@@AEAV1@@Z */ ostream* __cdecl ostream_endl(ostream *this) { - FIXME("(%p) stub\n", this); - return this; + TRACE("(%p)\n", this); + ostream_put_char(this, '\n'); + return ostream_flush(this); } /* ?ends@@YAAAVostream@@AAV1@@Z */ /* ?ends@@YAAEAVostream@@AEAV1@@Z */ ostream* __cdecl ostream_ends(ostream *this) { - FIXME("(%p) stub\n", this); - return this; + TRACE("(%p)\n", this); + return ostream_put_char(this, 0); } /* ?flush@@YAAAVostream@@AAV1@@Z */ /* ?flush@@YAAEAVostream@@AEAV1@@Z */ ostream* __cdecl ostream_flush_manip(ostream *this) { - FIXME("(%p) stub\n", this); - return this; + TRACE("(%p)\n", this); + return ostream_flush(this); } /******************************************************************

1 0

Henri Verbeet : wined3d: Send vertex declaration destruction through the command stream.
by Alexandre Julliard June 22, 2016

June 22, 2016

Module: wine Branch: master Commit: 9ba058e94c2662f5296c95adeafd29c59b137249 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ba058e94c2662f5296c95ade… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jun 22 10:39:02 2016 +0200 wined3d: Send vertex declaration destruction through the command stream. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/vertexdeclaration.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/vertexdeclaration.c b/dlls/wined3d/vertexdeclaration.c index febd695..c8704e9 100644 --- a/dlls/wined3d/vertexdeclaration.c +++ b/dlls/wined3d/vertexdeclaration.c @@ -50,6 +50,14 @@ ULONG CDECL wined3d_vertex_declaration_incref(struct wined3d_vertex_declaration return refcount; } +static void wined3d_vertex_declaration_destroy_object(void *object) +{ + struct wined3d_vertex_declaration *declaration = object; + + HeapFree(GetProcessHeap(), 0, declaration->elements); + HeapFree(GetProcessHeap(), 0, declaration); +} + ULONG CDECL wined3d_vertex_declaration_decref(struct wined3d_vertex_declaration *declaration) { ULONG refcount = InterlockedDecrement(&declaration->ref); @@ -58,9 +66,9 @@ ULONG CDECL wined3d_vertex_declaration_decref(struct wined3d_vertex_declaration if (!refcount) { - HeapFree(GetProcessHeap(), 0, declaration->elements); declaration->parent_ops->wined3d_object_destroyed(declaration->parent); - HeapFree(GetProcessHeap(), 0, declaration); + wined3d_cs_emit_destroy_object(declaration->device->cs, + wined3d_vertex_declaration_destroy_object, declaration); } return refcount;

1 0

Andrew Eikum : urlmon: Allow NULL IBindStatusCallback in URLOpenBlockingStream.
by Alexandre Julliard June 22, 2016

June 22, 2016

Module: wine Branch: master Commit: 4ac74d108310ce9b721504025d35567e3f83afda URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ac74d108310ce9b721504025… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Jun 21 14:13:05 2016 -0500 urlmon: Allow NULL IBindStatusCallback in URLOpenBlockingStream. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/urlmon/tests/stream.c | 15 +++++++++++++++ dlls/urlmon/umstream.c | 8 +++++++- 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/dlls/urlmon/tests/stream.c b/dlls/urlmon/tests/stream.c index 9882a4d..354d809 100644 --- a/dlls/urlmon/tests/stream.c +++ b/dlls/urlmon/tests/stream.c @@ -328,6 +328,21 @@ static void test_URLOpenBlockingStreamW(void) ok(pStream != NULL, "pStream is NULL\n"); if(pStream) { + buffer[0] = 0; + hr = IStream_Read(pStream, buffer, sizeof(buffer), NULL); + ok(hr == S_OK, "IStream_Read failed with error 0x%08x\n", hr); + ok(!memcmp(buffer, szHtmlDoc, sizeof(szHtmlDoc)-1), "read data differs from file\n"); + + IStream_Release(pStream); + } + + hr = URLOpenBlockingStreamW(NULL, INDEX_HTML, &pStream, 0, NULL); + ok(hr == S_OK, "URLOpenBlockingStreamW failed with error 0x%08x\n", hr); + + ok(pStream != NULL, "pStream is NULL\n"); + if(pStream) + { + buffer[0] = 0; hr = IStream_Read(pStream, buffer, sizeof(buffer), NULL); ok(hr == S_OK, "IStream_Read failed with error 0x%08x\n", hr); ok(!memcmp(buffer, szHtmlDoc, sizeof(szHtmlDoc)-1), "read data differs from file\n"); diff --git a/dlls/urlmon/umstream.c b/dlls/urlmon/umstream.c index 3a3e09a..9c94658 100644 --- a/dlls/urlmon/umstream.c +++ b/dlls/urlmon/umstream.c @@ -122,12 +122,18 @@ static HRESULT WINAPI ProxyBindStatusCallback_OnStopBinding(IBindStatusCallback static HRESULT WINAPI ProxyBindStatusCallback_GetBindInfo(IBindStatusCallback *iface, DWORD *grfBINDF, BINDINFO *pbindinfo) { + DWORD size = pbindinfo->cbSize; ProxyBindStatusCallback *This = impl_from_IBindStatusCallback(iface); if(This->pBSC) return IBindStatusCallback_GetBindInfo(This->pBSC, grfBINDF, pbindinfo); - return E_INVALIDARG; + memset(pbindinfo, 0, size); + pbindinfo->cbSize = size; + + *grfBINDF = 0; + + return S_OK; } static HRESULT WINAPI ProxyBindStatusCallback_OnDataAvailable(IBindStatusCallback *iface, DWORD grfBSCF,

1 0

Iván Matellanes : msvcirt: Implement ostream:: operator<< for strings.
by Alexandre Julliard June 22, 2016

June 22, 2016

Module: wine Branch: master Commit: 65935c4c881bc3304b588d13c3d9ed3b49246db7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=65935c4c881bc3304b588d13c… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Wed Jun 22 13:59:48 2016 +0100 msvcirt: Implement ostream::operator<< for strings. 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 | 9 ++++++--- dlls/msvcirt/tests/msvcirt.c | 21 +++++++++++++++++++-- 2 files changed, 25 insertions(+), 5 deletions(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index a09b4d6..9ec61c3 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -2625,7 +2625,11 @@ ostream* __thiscall ostream_print_unsigned_char(ostream *this, unsigned char c) DEFINE_THISCALL_WRAPPER(ostream_print_str, 8) ostream* __thiscall ostream_print_str(ostream *this, const char *str) { - FIXME("(%p %s) stub\n", this, str); + TRACE("(%p %s)\n", this, str); + if (ostream_opfx(this)) { + ostream_writepad(this, "", str); + ostream_osfx(this); + } return this; } @@ -2634,8 +2638,7 @@ ostream* __thiscall ostream_print_str(ostream *this, const char *str) DEFINE_THISCALL_WRAPPER(ostream_print_unsigned_str, 8) ostream* __thiscall ostream_print_unsigned_str(ostream *this, const unsigned char *str) { - FIXME("(%p %s) stub\n", this, str); - return this; + return ostream_print_str(this, (const char*) str); } /* ??6ostream@@QAEAAV0(a)F@Z */ diff --git a/dlls/msvcirt/tests/msvcirt.c b/dlls/msvcirt/tests/msvcirt.c index 2d776ad..2ce59e4 100644 --- a/dlls/msvcirt/tests/msvcirt.c +++ b/dlls/msvcirt/tests/msvcirt.c @@ -271,6 +271,7 @@ 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*); static ostream* (*__thiscall p_ostream_print_char)(ostream*, char); +static ostream* (*__thiscall p_ostream_print_str)(ostream*, const char*); /* Emulate a __thiscall */ #ifdef __i386__ @@ -446,6 +447,7 @@ static BOOL init(void) SET(p_ostream_tellp, "?tellp(a)ostream@@QEAAJXZ"); SET(p_ostream_writepad, "?writepad(a)ostream@@AEAAAEAV1(a)PEBD0@Z"); SET(p_ostream_print_char, "??6ostream@@QEAAAEAV0(a)D@Z"); + SET(p_ostream_print_str, "??6ostream@@QEAAAEAV0(a)PEBD@Z"); } else { p_operator_new = (void*)GetProcAddress(msvcrt, "??2(a)YAPAXI@Z"); p_operator_delete = (void*)GetProcAddress(msvcrt, "??3(a)YAXPAX@Z"); @@ -551,6 +553,7 @@ static BOOL init(void) SET(p_ostream_tellp, "?tellp(a)ostream@@QAEJXZ"); SET(p_ostream_writepad, "?writepad(a)ostream@@AAEAAV1(a)PBD0@Z"); SET(p_ostream_print_char, "??6ostream@@QAEAAV0(a)D@Z"); + SET(p_ostream_print_str, "??6ostream@@QAEAAV0(a)PBD@Z"); } SET(p_ios_static_lock, "?x_lockc(a)ios@@0U_CRT_CRITICAL_SECTION@@A"); SET(p_ios_lockc, "?lockc(a)ios@@KAXXZ"); @@ -3013,8 +3016,9 @@ static void test_ostream_print(void) int i; char param_char[] = {'a', '9', 'e'}; + const char* param_str[] = {"Test", "800", "3.14159", " Test"}; struct ostream_print_test { - enum { type_chr } type; + enum { type_chr, type_str } type; int param_index; ios_io_state state; ios_flags flags; @@ -3035,7 +3039,18 @@ static void test_ostream_print(void) {type_chr, /* 'a' */ 0, IOSTATE_goodbit, FLAGS_internal|FLAGS_hex|FLAGS_showbase, 6, ' ', 4, " a", IOSTATE_goodbit}, {type_chr, /* '9' */ 1, IOSTATE_goodbit, FLAGS_oct|FLAGS_showbase|FLAGS_uppercase, 6, 'i', 2, "i9", IOSTATE_goodbit}, {type_chr, /* '9' */ 1, IOSTATE_goodbit, FLAGS_showpos|FLAGS_scientific, 0, 'i', 2, "i9", IOSTATE_goodbit}, - {type_chr, /* 'e' */ 2, IOSTATE_goodbit, FLAGS_left|FLAGS_right|FLAGS_uppercase, 0, '*', 8, "e*******", IOSTATE_goodbit} + {type_chr, /* 'e' */ 2, IOSTATE_goodbit, FLAGS_left|FLAGS_right|FLAGS_uppercase, 0, '*', 8, "e*******", IOSTATE_goodbit}, + /* const char* */ + {type_str, /* "Test" */ 0, IOSTATE_badbit, 0, 6, ' ', 0, "", IOSTATE_badbit|IOSTATE_failbit}, + {type_str, /* "Test" */ 0, IOSTATE_eofbit, 0, 6, ' ', 0, "", IOSTATE_eofbit|IOSTATE_failbit}, + {type_str, /* "Test" */ 0, IOSTATE_goodbit, 0, 6, ' ', 0, "Test", IOSTATE_goodbit}, + {type_str, /* "Test" */ 0, IOSTATE_goodbit, 0, 6, ' ', 6, " Test", IOSTATE_goodbit}, + {type_str, /* "Test" */ 0, IOSTATE_goodbit, FLAGS_internal, 6, 'x', 6, "xxTest", IOSTATE_goodbit}, + {type_str, /* "Test" */ 0, IOSTATE_goodbit, FLAGS_left, 6, ' ', 5, "Test ", IOSTATE_goodbit}, + {type_str, /* "Test" */ 0, IOSTATE_goodbit, FLAGS_left|FLAGS_hex|FLAGS_showpoint, 6, '?', 6, "Test??", IOSTATE_goodbit}, + {type_str, /* "800" */ 1, IOSTATE_goodbit, FLAGS_showbase|FLAGS_showpos, 6, ' ', 4, " 800", IOSTATE_goodbit}, + {type_str, /* "3.14159" */ 2, IOSTATE_goodbit, FLAGS_scientific, 2, 'x', 2, "3.14159", IOSTATE_goodbit}, + {type_str, /* " Test" */ 3, IOSTATE_goodbit, FLAGS_skipws, 6, 'x', 2, " Test", IOSTATE_goodbit} }; pssb = call_func1(p_strstreambuf_ctor, &ssb); @@ -3054,6 +3069,8 @@ static void test_ostream_print(void) switch (tests[i].type) { case type_chr: pos = call_func2(p_ostream_print_char, &os, (int) param_char[tests[i].param_index]); break; + case type_str: + pos = call_func2(p_ostream_print_str, &os, param_str[tests[i].param_index]); break; } length = ssb.base.pptr - ssb.base.pbase;

1 0

Iván Matellanes : msvcirt: Implement ostream:: operator<< for characters.
by Alexandre Julliard June 22, 2016

June 22, 2016

Module: wine Branch: master Commit: 81cf0b2c487e7281ed9ab40cbfd5471fa5c6847d URL: http://source.winehq.org/git/wine.git/?a=commit;h=81cf0b2c487e7281ed9ab40cb… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Wed Jun 22 13:59:47 2016 +0100 msvcirt: Implement ostream::operator<< for characters. 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 | 70 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 79 insertions(+), 3 deletions(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index ce5c021..a09b4d6 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -2599,7 +2599,14 @@ ostream* __thiscall ostream_writepad(ostream *this, const char *str1, const char DEFINE_THISCALL_WRAPPER(ostream_print_char, 8) ostream* __thiscall ostream_print_char(ostream *this, char c) { - FIXME("(%p %c) stub\n", this, c); + const char c_str[2] = {c, 0}; + + TRACE("(%p %c)\n", this, c); + + if (ostream_opfx(this)) { + ostream_writepad(this, "", c_str); + ostream_osfx(this); + } return this; } @@ -2608,8 +2615,7 @@ ostream* __thiscall ostream_print_char(ostream *this, char c) DEFINE_THISCALL_WRAPPER(ostream_print_unsigned_char, 8) ostream* __thiscall ostream_print_unsigned_char(ostream *this, unsigned char c) { - FIXME("(%p %c) stub\n", this, c); - return this; + return ostream_print_char(this, c); } /* ??6ostream@@QAEAAV0(a)PBC@Z */ diff --git a/dlls/msvcirt/tests/msvcirt.c b/dlls/msvcirt/tests/msvcirt.c index 428ddf3..2d776ad 100644 --- a/dlls/msvcirt/tests/msvcirt.c +++ b/dlls/msvcirt/tests/msvcirt.c @@ -270,6 +270,7 @@ static ostream* (*__thiscall p_ostream_seekp_offset)(ostream*, streamoff, ios_se 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*); +static ostream* (*__thiscall p_ostream_print_char)(ostream*, char); /* Emulate a __thiscall */ #ifdef __i386__ @@ -444,6 +445,7 @@ static BOOL init(void) 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"); + SET(p_ostream_print_char, "??6ostream@@QEAAAEAV0(a)D@Z"); } else { p_operator_new = (void*)GetProcAddress(msvcrt, "??2(a)YAPAXI@Z"); p_operator_delete = (void*)GetProcAddress(msvcrt, "??3(a)YAXPAX@Z"); @@ -548,6 +550,7 @@ static BOOL init(void) 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_ostream_print_char, "??6ostream@@QAEAAV0(a)D@Z"); } SET(p_ios_static_lock, "?x_lockc(a)ios@@0U_CRT_CRITICAL_SECTION@@A"); SET(p_ios_lockc, "?lockc(a)ios@@KAXXZ"); @@ -3002,6 +3005,72 @@ if (0) /* crashes on native */ ok(_unlink(filename2) == 0, "Couldn't unlink file named '%s'\n", filename2); } +static void test_ostream_print(void) +{ + ostream os, *pos; + strstreambuf ssb, *pssb; + LONG length, expected_length; + int i; + + char param_char[] = {'a', '9', 'e'}; + struct ostream_print_test { + enum { type_chr } type; + int param_index; + ios_io_state state; + ios_flags flags; + int precision; + int fill; + int width; + const char *expected_text; + ios_io_state expected_flags; + } tests[] = { + /* char */ + {type_chr, /* 'a' */ 0, IOSTATE_badbit, 0, 6, ' ', 0, "", IOSTATE_badbit|IOSTATE_failbit}, + {type_chr, /* 'a' */ 0, IOSTATE_eofbit, 0, 6, ' ', 0, "", IOSTATE_eofbit|IOSTATE_failbit}, + {type_chr, /* 'a' */ 0, IOSTATE_goodbit, 0, 6, ' ', 0, "a", IOSTATE_goodbit}, + {type_chr, /* 'a' */ 0, IOSTATE_goodbit, 0, 6, ' ', 4, " a", IOSTATE_goodbit}, + {type_chr, /* 'a' */ 0, IOSTATE_goodbit, 0, 6, 'x', 3, "xxa", IOSTATE_goodbit}, + {type_chr, /* 'a' */ 0, IOSTATE_goodbit, FLAGS_left, 6, ' ', 4, "a ", IOSTATE_goodbit}, + {type_chr, /* 'a' */ 0, IOSTATE_goodbit, FLAGS_left|FLAGS_internal, 6, ' ', 4, " a", IOSTATE_goodbit}, + {type_chr, /* 'a' */ 0, IOSTATE_goodbit, FLAGS_internal|FLAGS_hex|FLAGS_showbase, 6, ' ', 4, " a", IOSTATE_goodbit}, + {type_chr, /* '9' */ 1, IOSTATE_goodbit, FLAGS_oct|FLAGS_showbase|FLAGS_uppercase, 6, 'i', 2, "i9", IOSTATE_goodbit}, + {type_chr, /* '9' */ 1, IOSTATE_goodbit, FLAGS_showpos|FLAGS_scientific, 0, 'i', 2, "i9", IOSTATE_goodbit}, + {type_chr, /* 'e' */ 2, IOSTATE_goodbit, FLAGS_left|FLAGS_right|FLAGS_uppercase, 0, '*', 8, "e*******", IOSTATE_goodbit} + }; + + pssb = call_func1(p_strstreambuf_ctor, &ssb); + ok(pssb == &ssb, "wrong return, expected %p got %p\n", &ssb, pssb); + pos = call_func3(p_ostream_sb_ctor, &os, &ssb.base, TRUE); + ok(pos == &os, "wrong return, expected %p got %p\n", &os, pos); + + for (i = 0; i < sizeof(tests) / sizeof(tests[0]); i++) { + os.base_ios.state = tests[i].state; + os.base_ios.flags = tests[i].flags; + os.base_ios.precision = tests[i].precision; + os.base_ios.fill = tests[i].fill; + os.base_ios.width = tests[i].width; + ssb.base.pptr = ssb.base.pbase; + + switch (tests[i].type) { + case type_chr: + pos = call_func2(p_ostream_print_char, &os, (int) param_char[tests[i].param_index]); break; + } + + length = ssb.base.pptr - ssb.base.pbase; + expected_length = strlen(tests[i].expected_text); + ok(pos == &os, "Test %d: wrong return, expected %p got %p\n", i, &os, pos); + ok(os.base_ios.state == tests[i].expected_flags, "Test %d: expected %d got %d\n", i, + tests[i].expected_flags, os.base_ios.state); + ok(os.base_ios.width == 0, "Test %d: expected 0 got %d\n", i, os.base_ios.width); + ok(expected_length == length, "Test %d: wrong output length, expected %d got %d\n", i, expected_length, length); + ok(!strncmp(tests[i].expected_text, ssb.base.pbase, length), + "Test %d: wrong output, expected '%s' got '%s'\n", i, tests[i].expected_text, ssb.base.pbase); + } + + call_func1(p_ostream_vbase_dtor, &os); + call_func1(p_strstreambuf_dtor, &ssb); +} + START_TEST(msvcirt) { if(!init()) @@ -3013,6 +3082,7 @@ START_TEST(msvcirt) test_stdiobuf(); test_ios(); test_ostream(); + test_ostream_print(); FreeLibrary(msvcrt); FreeLibrary(msvcirt);

1 0

Michael Stefaniuc : comdlg32: Avoid using CopyRect().
by Alexandre Julliard June 22, 2016

June 22, 2016

Module: wine Branch: master Commit: 4e7272f087f814007a3225a5e08d8d8d811be8bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e7272f087f814007a3225a5e… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jun 22 11:52:30 2016 +0200 comdlg32: Avoid using CopyRect(). Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comdlg32/colordlg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comdlg32/colordlg.c b/dlls/comdlg32/colordlg.c index 8b307ae..6bf54c3 100644 --- a/dlls/comdlg32/colordlg.c +++ b/dlls/comdlg32/colordlg.c @@ -247,7 +247,7 @@ static void CC_DrawFocusRect(CCPRIV *lpp, HWND hwnd, int x, int y, int rows, int /* draw it */ hdc = GetDC(hwnd); DrawFocusRect(hdc, &rect); - CopyRect(&lpp->focusRect, &rect); + lpp->focusRect = rect; lpp->hwndFocus = hwnd; ReleaseDC(hwnd, hdc); }

1 0

Józef Kucia : wined3d: Introduce wined3d_gl_limits_get_uniform_block_range().
by Alexandre Julliard June 22, 2016

June 22, 2016

Module: wine Branch: master Commit: f6bd191385431929f5a8847a8a3556e6309850df URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6bd191385431929f5a8847a8… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Jun 22 11:37:32 2016 +0200 wined3d: Introduce wined3d_gl_limits_get_uniform_block_range(). 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/glsl_shader.c | 17 +++++++---------- dlls/wined3d/state.c | 14 +++++++++----- dlls/wined3d/utils.c | 27 +++++++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 9 ++++++--- 4 files changed, 49 insertions(+), 18 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index b4ddf89..3aa9626 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -7518,13 +7518,14 @@ static void shader_glsl_init_ps_uniform_locations(const struct wined3d_gl_info * static void shader_glsl_init_uniform_block_bindings(const struct wined3d_gl_info *gl_info, struct shader_glsl_priv *priv, GLuint program_id, - const struct wined3d_shader_reg_maps *reg_maps, unsigned int base, unsigned int count) + const struct wined3d_shader_reg_maps *reg_maps) { + struct wined3d_string_buffer *name = string_buffer_get(&priv->string_buffers); const char *prefix = shader_glsl_get_prefix(reg_maps->shader_version.type); + unsigned int i, base, count; GLuint block_idx; - unsigned int i; - struct wined3d_string_buffer *name = string_buffer_get(&priv->string_buffers); + wined3d_gl_limits_get_uniform_block_range(&gl_info->limits, reg_maps->shader_version.type, &base, &count); for (i = 0; i < count; ++i) { if (!reg_maps->cb_sizes[i]) @@ -7819,8 +7820,7 @@ static void set_glsl_shader_program(const struct wined3d_context *context, const if (entry->vs.pos_fixup_location != -1) entry->constant_update_mask |= WINED3D_SHADER_CONST_POS_FIXUP; - shader_glsl_init_uniform_block_bindings(gl_info, priv, program_id, &vshader->reg_maps, - 0, gl_info->limits.vertex_uniform_blocks); + shader_glsl_init_uniform_block_bindings(gl_info, priv, program_id, &vshader->reg_maps); } else { @@ -7860,8 +7860,7 @@ static void set_glsl_shader_program(const struct wined3d_context *context, const if (gshader) { entry->constant_update_mask |= WINED3D_SHADER_CONST_POS_FIXUP; - shader_glsl_init_uniform_block_bindings(gl_info, priv, program_id, &gshader->reg_maps, - gl_info->limits.vertex_uniform_blocks, gl_info->limits.geometry_uniform_blocks); + shader_glsl_init_uniform_block_bindings(gl_info, priv, program_id, &gshader->reg_maps); } if (ps_id) @@ -7876,9 +7875,7 @@ static void set_glsl_shader_program(const struct wined3d_context *context, const if (entry->ps.ycorrection_location != -1) entry->constant_update_mask |= WINED3D_SHADER_CONST_PS_Y_CORR; - shader_glsl_init_uniform_block_bindings(gl_info, priv, program_id, &pshader->reg_maps, - gl_info->limits.vertex_uniform_blocks + gl_info->limits.geometry_uniform_blocks, - gl_info->limits.fragment_uniform_blocks); + shader_glsl_init_uniform_block_bindings(gl_info, priv, program_id, &pshader->reg_maps); } else { diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index bc55263..6b9cd3d 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -4849,30 +4849,34 @@ static void state_cb(const struct wined3d_gl_info *gl_info, const struct wined3d static void state_cb_vs(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { const struct wined3d_gl_limits *limits = &context->gl_info->limits; + unsigned int base, count; TRACE("context %p, state %p, state_id %#x.\n", context, state, state_id); - state_cb(context->gl_info, state, WINED3D_SHADER_TYPE_VERTEX, 0, limits->vertex_uniform_blocks); + wined3d_gl_limits_get_uniform_block_range(limits, WINED3D_SHADER_TYPE_VERTEX, &base, &count); + state_cb(context->gl_info, state, WINED3D_SHADER_TYPE_VERTEX, base, count); } static void state_cb_gs(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { const struct wined3d_gl_limits *limits = &context->gl_info->limits; + unsigned int base, count; TRACE("context %p, state %p, state_id %#x.\n", context, state, state_id); - state_cb(context->gl_info, state, WINED3D_SHADER_TYPE_GEOMETRY, - limits->vertex_uniform_blocks, limits->geometry_uniform_blocks); + wined3d_gl_limits_get_uniform_block_range(limits, WINED3D_SHADER_TYPE_GEOMETRY, &base, &count); + state_cb(context->gl_info, state, WINED3D_SHADER_TYPE_GEOMETRY, base, count); } static void state_cb_ps(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { const struct wined3d_gl_limits *limits = &context->gl_info->limits; + unsigned int base, count; TRACE("context %p, state %p, state_id %#x.\n", context, state, state_id); - state_cb(context->gl_info, state, WINED3D_SHADER_TYPE_PIXEL, - limits->vertex_uniform_blocks + limits->geometry_uniform_blocks, limits->fragment_uniform_blocks); + wined3d_gl_limits_get_uniform_block_range(limits, WINED3D_SHADER_TYPE_PIXEL, &base, &count); + state_cb(context->gl_info, state, WINED3D_SHADER_TYPE_PIXEL, base, count); } static void state_cb_warn(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 9575b39..01e56eb 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -5748,3 +5748,30 @@ BOOL wined3d_clip_blit(const RECT *clip_rect, RECT *clipped, RECT *other) return TRUE; } + +void wined3d_gl_limits_get_uniform_block_range(const struct wined3d_gl_limits *gl_limits, + enum wined3d_shader_type shader_type, unsigned int *base, unsigned int *count) +{ + *base = 0; + *count = gl_limits->vertex_uniform_blocks; + + if (shader_type == WINED3D_SHADER_TYPE_VERTEX) + return; + + *base += *count; + *count = gl_limits->geometry_uniform_blocks; + + if (shader_type == WINED3D_SHADER_TYPE_GEOMETRY) + return; + + *base += *count; + *count = gl_limits->fragment_uniform_blocks; + + if (shader_type == WINED3D_SHADER_TYPE_PIXEL) + return; + + *base += *count; + *count = 0; + + ERR("Unhandled shader type %#x.\n", shader_type); +} diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 701e93e..ce094ca 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1971,9 +1971,9 @@ struct wined3d_gl_limits UINT lights; UINT textures; UINT texture_coords; - UINT vertex_uniform_blocks; - UINT geometry_uniform_blocks; - UINT fragment_uniform_blocks; + unsigned int vertex_uniform_blocks; + unsigned int geometry_uniform_blocks; + unsigned int fragment_uniform_blocks; UINT fragment_samplers; UINT vertex_samplers; UINT combined_samplers; @@ -2004,6 +2004,9 @@ struct wined3d_gl_limits UINT arb_ps_temps; }; +void wined3d_gl_limits_get_uniform_block_range(const struct wined3d_gl_limits *gl_limits, + enum wined3d_shader_type shader_type, unsigned int *base, unsigned int *count) DECLSPEC_HIDDEN; + struct wined3d_gl_info { DWORD selected_gl_version;

1 0

Józef Kucia : wined3d: Recognize SM5 dcl_tgsm_structured opcode.
by Alexandre Julliard June 22, 2016

June 22, 2016

Module: wine Branch: master Commit: e2384387e0f56c175916083df8577527bc2d97c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2384387e0f56c175916083df… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Jun 22 11:37:31 2016 +0200 wined3d: Recognize SM5 dcl_tgsm_structured opcode. 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/arb_program_shader.c | 1 + dlls/wined3d/glsl_shader.c | 1 + dlls/wined3d/shader.c | 8 ++++++++ dlls/wined3d/shader_sm4.c | 12 ++++++++++++ dlls/wined3d/wined3d_private.h | 9 +++++++++ 5 files changed, 31 insertions(+) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index f81e8ea..2e070fb 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5251,6 +5251,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_DCL_TESSELLATOR_OUTPUT_PRIMITIVE */ NULL, /* WINED3DSIH_DCL_TESSELLATOR_PARTITIONING */ NULL, /* WINED3DSIH_DCL_TGSM_RAW */ NULL, + /* WINED3DSIH_DCL_TGSM_STRUCTURED */ NULL, /* WINED3DSIH_DCL_THREAD_GROUP */ NULL, /* WINED3DSIH_DCL_UAV_TYPED */ NULL, /* WINED3DSIH_DCL_VERTICES_OUT */ shader_hw_nop, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 921904f..b4ddf89 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -8589,6 +8589,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_DCL_TESSELLATOR_OUTPUT_PRIMITIVE */ NULL, /* WINED3DSIH_DCL_TESSELLATOR_PARTITIONING */ NULL, /* WINED3DSIH_DCL_TGSM_RAW */ NULL, + /* WINED3DSIH_DCL_TGSM_STRUCTURED */ NULL, /* WINED3DSIH_DCL_THREAD_GROUP */ NULL, /* WINED3DSIH_DCL_UAV_TYPED */ NULL, /* WINED3DSIH_DCL_VERTICES_OUT */ shader_glsl_nop, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 1859c0f..4a3f53d 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -81,6 +81,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_DCL_TESSELLATOR_OUTPUT_PRIMITIVE */ "dcl_tessellator_output_primitive", /* WINED3DSIH_DCL_TESSELLATOR_PARTITIONING */ "dcl_tessellator_partitioning", /* WINED3DSIH_DCL_TGSM_RAW */ "dcl_tgsm_raw", + /* WINED3DSIH_DCL_TGSM_STRUCTURED */ "dcl_tgsm_structured", /* WINED3DSIH_DCL_THREAD_GROUP */ "dcl_thread_group", /* WINED3DSIH_DCL_UAV_TYPED */ "dcl_uav_typed", /* WINED3DSIH_DCL_VERTICES_OUT */ "dcl_maxOutputVertexCount", @@ -2279,6 +2280,13 @@ static void shader_trace_init(const struct wined3d_shader_frontend *fe, void *fe shader_dump_dst_param(&buffer, &ins.declaration.tgsm_raw.reg, &shader_version); shader_addline(&buffer, ", %u", ins.declaration.tgsm_raw.byte_count); } + else if (ins.handler_idx == WINED3DSIH_DCL_TGSM_STRUCTURED) + { + shader_addline(&buffer, "%s ", shader_opcode_names[ins.handler_idx]); + shader_dump_dst_param(&buffer, &ins.declaration.tgsm_structured.reg, &shader_version); + shader_addline(&buffer, ", %u, %u", ins.declaration.tgsm_structured.byte_stride, + ins.declaration.tgsm_structured.structure_count); + } else if (ins.handler_idx == WINED3DSIH_DCL_THREAD_GROUP) { shader_addline(&buffer, "%s %u, %u, %u", shader_opcode_names[ins.handler_idx], diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 959b10c..8961dc5 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -222,6 +222,7 @@ enum wined3d_sm4_opcode WINED3D_SM5_OP_DCL_THREAD_GROUP = 0x9b, WINED3D_SM5_OP_DCL_UAV_TYPED = 0x9c, WINED3D_SM5_OP_DCL_TGSM_RAW = 0x9f, + WINED3D_SM5_OP_DCL_TGSM_STRUCTURED = 0xa0, WINED3D_SM5_OP_DCL_RESOURCE_STRUCTURED = 0xa2, WINED3D_SM5_OP_LD_UAV_TYPED = 0xa3, WINED3D_SM5_OP_STORE_UAV_TYPED = 0xa4, @@ -637,6 +638,15 @@ static void shader_sm5_read_dcl_tgsm_raw(struct wined3d_shader_instruction *ins, ins->declaration.tgsm_raw.byte_count = *tokens; } +static void shader_sm5_read_dcl_tgsm_structured(struct wined3d_shader_instruction *ins, + DWORD opcode, DWORD opcode_token, const DWORD *tokens, unsigned int token_count, + struct wined3d_sm4_data *priv) +{ + shader_sm4_read_dst_param(priv, &tokens, WINED3D_DATA_FLOAT, &ins->declaration.tgsm_structured.reg); + ins->declaration.tgsm_structured.byte_stride = *tokens++; + ins->declaration.tgsm_structured.structure_count = *tokens; +} + static void shader_sm5_read_dcl_resource_structured(struct wined3d_shader_instruction *ins, DWORD opcode, DWORD opcode_token, const DWORD *tokens, unsigned int token_count, struct wined3d_sm4_data *priv) @@ -799,6 +809,8 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = shader_sm4_read_dcl_resource}, {WINED3D_SM5_OP_DCL_TGSM_RAW, WINED3DSIH_DCL_TGSM_RAW, "", "", shader_sm5_read_dcl_tgsm_raw}, + {WINED3D_SM5_OP_DCL_TGSM_STRUCTURED, WINED3DSIH_DCL_TGSM_STRUCTURED, "", "", + shader_sm5_read_dcl_tgsm_structured}, {WINED3D_SM5_OP_DCL_RESOURCE_STRUCTURED, WINED3DSIH_DCL_RESOURCE_STRUCTURED, "", "", shader_sm5_read_dcl_resource_structured}, {WINED3D_SM5_OP_LD_UAV_TYPED, WINED3DSIH_LD_UAV_TYPED, "u", "iU"}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 45207df..701e93e 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -595,6 +595,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_DCL_TESSELLATOR_OUTPUT_PRIMITIVE, WINED3DSIH_DCL_TESSELLATOR_PARTITIONING, WINED3DSIH_DCL_TGSM_RAW, + WINED3DSIH_DCL_TGSM_STRUCTURED, WINED3DSIH_DCL_THREAD_GROUP, WINED3DSIH_DCL_UAV_TYPED, WINED3DSIH_DCL_VERTICES_OUT, @@ -920,6 +921,13 @@ struct wined3d_shader_tgsm_raw unsigned int byte_count; }; +struct wined3d_shader_tgsm_structured +{ + struct wined3d_shader_dst_param reg; + unsigned int byte_stride; + unsigned int structure_count; +}; + struct wined3d_shader_thread_group_size { unsigned int x, y, z; @@ -953,6 +961,7 @@ struct wined3d_shader_instruction const struct wined3d_shader_immediate_constant_buffer *icb; struct wined3d_shader_structured_resource structured_resource; struct wined3d_shader_tgsm_raw tgsm_raw; + struct wined3d_shader_tgsm_structured tgsm_structured; struct wined3d_shader_thread_group_size thread_group_size; enum wined3d_tessellator_domain tessellator_domain; enum wined3d_tessellator_output_primitive tessellator_output_primitive;

1 0

Józef Kucia : wined3d: Recognize SM5 dcl_tgsm_raw opcode.
by Alexandre Julliard June 22, 2016

June 22, 2016

Module: wine Branch: master Commit: 6778ceca2c52d67c066b8b01d9270c681664810b URL: http://source.winehq.org/git/wine.git/?a=commit;h=6778ceca2c52d67c066b8b01d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Jun 22 11:37:30 2016 +0200 wined3d: Recognize SM5 dcl_tgsm_raw opcode. 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/arb_program_shader.c | 1 + dlls/wined3d/glsl_shader.c | 1 + dlls/wined3d/shader.c | 7 +++++++ dlls/wined3d/shader_sm4.c | 11 +++++++++++ dlls/wined3d/wined3d_private.h | 8 ++++++++ 5 files changed, 28 insertions(+) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 00cc495..f81e8ea 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5250,6 +5250,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_DCL_TESSELLATOR_DOMAIN */ NULL, /* WINED3DSIH_DCL_TESSELLATOR_OUTPUT_PRIMITIVE */ NULL, /* WINED3DSIH_DCL_TESSELLATOR_PARTITIONING */ NULL, + /* WINED3DSIH_DCL_TGSM_RAW */ NULL, /* WINED3DSIH_DCL_THREAD_GROUP */ NULL, /* WINED3DSIH_DCL_UAV_TYPED */ NULL, /* WINED3DSIH_DCL_VERTICES_OUT */ shader_hw_nop, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index bb2beb4..921904f 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -8588,6 +8588,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_DCL_TESSELLATOR_DOMAIN */ NULL, /* WINED3DSIH_DCL_TESSELLATOR_OUTPUT_PRIMITIVE */ NULL, /* WINED3DSIH_DCL_TESSELLATOR_PARTITIONING */ NULL, + /* WINED3DSIH_DCL_TGSM_RAW */ NULL, /* WINED3DSIH_DCL_THREAD_GROUP */ NULL, /* WINED3DSIH_DCL_UAV_TYPED */ NULL, /* WINED3DSIH_DCL_VERTICES_OUT */ shader_glsl_nop, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index b79416f..1859c0f 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -80,6 +80,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_DCL_TESSELLATOR_DOMAIN */ "dcl_tessellator_domain", /* WINED3DSIH_DCL_TESSELLATOR_OUTPUT_PRIMITIVE */ "dcl_tessellator_output_primitive", /* WINED3DSIH_DCL_TESSELLATOR_PARTITIONING */ "dcl_tessellator_partitioning", + /* WINED3DSIH_DCL_TGSM_RAW */ "dcl_tgsm_raw", /* WINED3DSIH_DCL_THREAD_GROUP */ "dcl_thread_group", /* WINED3DSIH_DCL_UAV_TYPED */ "dcl_uav_typed", /* WINED3DSIH_DCL_VERTICES_OUT */ "dcl_maxOutputVertexCount", @@ -2272,6 +2273,12 @@ static void shader_trace_init(const struct wined3d_shader_frontend *fe, void *fe shader_addline(&buffer, "%s ", shader_opcode_names[ins.handler_idx]); shader_dump_tessellator_partitioning(&buffer, ins.declaration.tessellator_partitioning); } + else if (ins.handler_idx == WINED3DSIH_DCL_TGSM_RAW) + { + shader_addline(&buffer, "%s ", shader_opcode_names[ins.handler_idx]); + shader_dump_dst_param(&buffer, &ins.declaration.tgsm_raw.reg, &shader_version); + shader_addline(&buffer, ", %u", ins.declaration.tgsm_raw.byte_count); + } else if (ins.handler_idx == WINED3DSIH_DCL_THREAD_GROUP) { shader_addline(&buffer, "%s %u, %u, %u", shader_opcode_names[ins.handler_idx], diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 447861c..959b10c 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -221,6 +221,7 @@ enum wined3d_sm4_opcode WINED3D_SM5_OP_DCL_HS_FORK_PHASE_INSTANCE_COUNT = 0x99, WINED3D_SM5_OP_DCL_THREAD_GROUP = 0x9b, WINED3D_SM5_OP_DCL_UAV_TYPED = 0x9c, + WINED3D_SM5_OP_DCL_TGSM_RAW = 0x9f, WINED3D_SM5_OP_DCL_RESOURCE_STRUCTURED = 0xa2, WINED3D_SM5_OP_LD_UAV_TYPED = 0xa3, WINED3D_SM5_OP_STORE_UAV_TYPED = 0xa4, @@ -628,6 +629,14 @@ static void shader_sm5_read_dcl_thread_group(struct wined3d_shader_instruction * ins->declaration.thread_group_size.z = *tokens++; } +static void shader_sm5_read_dcl_tgsm_raw(struct wined3d_shader_instruction *ins, + DWORD opcode, DWORD opcode_token, const DWORD *tokens, unsigned int token_count, + struct wined3d_sm4_data *priv) +{ + shader_sm4_read_dst_param(priv, &tokens, WINED3D_DATA_FLOAT, &ins->declaration.tgsm_raw.reg); + ins->declaration.tgsm_raw.byte_count = *tokens; +} + static void shader_sm5_read_dcl_resource_structured(struct wined3d_shader_instruction *ins, DWORD opcode, DWORD opcode_token, const DWORD *tokens, unsigned int token_count, struct wined3d_sm4_data *priv) @@ -788,6 +797,8 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = shader_sm5_read_dcl_thread_group}, {WINED3D_SM5_OP_DCL_UAV_TYPED, WINED3DSIH_DCL_UAV_TYPED, "", "", shader_sm4_read_dcl_resource}, + {WINED3D_SM5_OP_DCL_TGSM_RAW, WINED3DSIH_DCL_TGSM_RAW, "", "", + shader_sm5_read_dcl_tgsm_raw}, {WINED3D_SM5_OP_DCL_RESOURCE_STRUCTURED, WINED3DSIH_DCL_RESOURCE_STRUCTURED, "", "", shader_sm5_read_dcl_resource_structured}, {WINED3D_SM5_OP_LD_UAV_TYPED, WINED3DSIH_LD_UAV_TYPED, "u", "iU"}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 40eb8e0..45207df 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -594,6 +594,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_DCL_TESSELLATOR_DOMAIN, WINED3DSIH_DCL_TESSELLATOR_OUTPUT_PRIMITIVE, WINED3DSIH_DCL_TESSELLATOR_PARTITIONING, + WINED3DSIH_DCL_TGSM_RAW, WINED3DSIH_DCL_THREAD_GROUP, WINED3DSIH_DCL_UAV_TYPED, WINED3DSIH_DCL_VERTICES_OUT, @@ -913,6 +914,12 @@ struct wined3d_shader_structured_resource unsigned int byte_stride; }; +struct wined3d_shader_tgsm_raw +{ + struct wined3d_shader_dst_param reg; + unsigned int byte_count; +}; + struct wined3d_shader_thread_group_size { unsigned int x, y, z; @@ -945,6 +952,7 @@ struct wined3d_shader_instruction UINT count; const struct wined3d_shader_immediate_constant_buffer *icb; struct wined3d_shader_structured_resource structured_resource; + struct wined3d_shader_tgsm_raw tgsm_raw; struct wined3d_shader_thread_group_size thread_group_size; enum wined3d_tessellator_domain tessellator_domain; enum wined3d_tessellator_output_primitive tessellator_output_primitive;

1 0

Henri Verbeet : wined3d: Send shader destruction through the command stream.
by Alexandre Julliard June 22, 2016

June 22, 2016

Module: wine Branch: master Commit: 87f667b46843589c4656b7373f28536343e06f7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=87f667b46843589c4656b7373… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jun 22 10:39:01 2016 +0200 wined3d: Send shader destruction through the command stream. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/shader.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 8f3e145..7682850 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -2650,6 +2650,12 @@ ULONG CDECL wined3d_shader_incref(struct wined3d_shader *shader) return refcount; } +static void wined3d_shader_destroy_object(void *object) +{ + shader_cleanup(object); + HeapFree(GetProcessHeap(), 0, object); +} + ULONG CDECL wined3d_shader_decref(struct wined3d_shader *shader) { ULONG refcount = InterlockedDecrement(&shader->ref); @@ -2658,9 +2664,8 @@ ULONG CDECL wined3d_shader_decref(struct wined3d_shader *shader) if (!refcount) { - shader_cleanup(shader); shader->parent_ops->wined3d_object_destroyed(shader->parent); - HeapFree(GetProcessHeap(), 0, shader); + wined3d_cs_emit_destroy_object(shader->device->cs, wined3d_shader_destroy_object, shader); } return refcount;

1 0