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

Michael Stefaniuc : maintainers: D3dxof is a D3D helper library too.
by Alexandre Julliard 15 Jul '16

15 Jul '16

Module: wine Branch: master Commit: 919a338947510aada7069761677cdd63895db099 URL: http://source.winehq.org/git/wine.git/?a=commit;h=919a338947510aada70697616… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jul 14 10:27:32 2016 +0200 maintainers: D3dxof is a D3D helper library too. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- MAINTAINERS | 1 + 1 file changed, 1 insertion(+) diff --git a/MAINTAINERS b/MAINTAINERS index ac3f515..4a7191c 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -85,6 +85,7 @@ F: dlls/d3dcompiler*/ F: dlls/d3dx10*/ F: dlls/d3dx11*/ F: dlls/d3dx9*/ +F: dlls/d3dxof/ DirectInput P: Andrew Eikum <aeikum(a)codeweavers.com>

1 0

Michael Stefaniuc : mshtml: Use SetRect() instead of open coding it.
by Alexandre Julliard 14 Jul '16

14 Jul '16

Module: wine Branch: master Commit: 9cec2e5936598aa9b3d9482d7a9a0e5daa5077a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9cec2e5936598aa9b3d9482d7… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jul 12 10:08:52 2016 +0200 mshtml: Use SetRect() instead of open coding it. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/pluginhost.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/mshtml/pluginhost.c b/dlls/mshtml/pluginhost.c index 7b1133d..712f7e0 100644 --- a/dlls/mshtml/pluginhost.c +++ b/dlls/mshtml/pluginhost.c @@ -124,10 +124,7 @@ static void update_readystate(PluginHost *host) /* FIXME: We shouldn't need this function and we should embed plugin directly in the main document */ static void get_pos_rect(PluginHost *host, RECT *ret) { - ret->top = 0; - ret->left = 0; - ret->bottom = host->rect.bottom - host->rect.top; - ret->right = host->rect.right - host->rect.left; + SetRect(ret, 0, 0, host->rect.right - host->rect.left, host->rect.bottom - host->rect.top); } static void load_prop_bag(PluginHost *host, IPersistPropertyBag *persist_prop_bag)

1 0

Nikolay Sivov : mshtml: Fix a typo in a trace message.
by Alexandre Julliard 14 Jul '16

14 Jul '16

Module: wine Branch: master Commit: 3ea8a700f7d06fa55449d1463e01a6849ae6ebcb URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ea8a700f7d06fa55449d1463… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jul 11 23:25:24 2016 +0300 mshtml: Fix a typo in a trace message. 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/mshtml/script.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mshtml/script.c b/dlls/mshtml/script.c index 255c37f..f6eb7ea 100644 --- a/dlls/mshtml/script.c +++ b/dlls/mshtml/script.c @@ -140,7 +140,7 @@ static BOOL init_script_engine(ScriptHost *script_host) hres = IActiveScript_QueryInterface(script_host->script, &IID_IActiveScriptParse, (void**)&script_host->parse); if(FAILED(hres)) { - WARN("Could not get IActiveScriptHost: %08x\n", hres); + WARN("Could not get IActiveScriptParse: %08x\n", hres); return FALSE; }

1 0

Nikolay Sivov : msscript: Implement some connection point methods.
by Alexandre Julliard 14 Jul '16

14 Jul '16

Module: wine Branch: master Commit: 4058b68966e6933b83b6164140a32006a5bd8263 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4058b68966e6933b83b616414… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jul 14 14:14:28 2016 +0300 msscript: Implement some connection point methods. 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/msscript.ocx/msscript.c | 15 +++++++++++---- dlls/msscript.ocx/tests/msscript.c | 35 ++++++++++++++++++++++++++++++++++- 2 files changed, 45 insertions(+), 5 deletions(-) diff --git a/dlls/msscript.ocx/msscript.c b/dlls/msscript.ocx/msscript.c index 5be53da..bc3f5c1 100644 --- a/dlls/msscript.ocx/msscript.c +++ b/dlls/msscript.ocx/msscript.c @@ -1282,9 +1282,10 @@ static HRESULT WINAPI ConnectionPoint_GetConnectionInterface(IConnectionPoint *i { ConnectionPoint *This = impl_from_IConnectionPoint(iface); - FIXME("(%p)->(%p)\n", This, iid); + TRACE("(%p)->(%p)\n", This, iid); - return E_NOTIMPL; + *iid = *This->riid; + return S_OK; } static HRESULT WINAPI ConnectionPoint_GetConnectionPointContainer(IConnectionPoint *iface, @@ -1292,9 +1293,15 @@ static HRESULT WINAPI ConnectionPoint_GetConnectionPointContainer(IConnectionPoi { ConnectionPoint *This = impl_from_IConnectionPoint(iface); - FIXME("(%p)->(%p)\n", This, container); + TRACE("(%p)->(%p)\n", This, container); - return E_NOTIMPL; + if (!container) + return E_POINTER; + + *container = &This->control->IConnectionPointContainer_iface; + IConnectionPointContainer_AddRef(*container); + + return S_OK; } static HRESULT WINAPI ConnectionPoint_Advise(IConnectionPoint *iface, IUnknown *unk_sink, diff --git a/dlls/msscript.ocx/tests/msscript.c b/dlls/msscript.ocx/tests/msscript.c index 714b075..f4e6306 100644 --- a/dlls/msscript.ocx/tests/msscript.c +++ b/dlls/msscript.ocx/tests/msscript.c @@ -782,10 +782,11 @@ if (hr == S_OK) static void test_connectionpoints(void) { - IConnectionPointContainer *container; + IConnectionPointContainer *container, *container2; IConnectionPoint *cp; IScriptControl *sc; HRESULT hr; + IID iid; hr = CoCreateInstance(&CLSID_ScriptControl, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, &IID_IScriptControl, (void**)&sc); @@ -799,10 +800,42 @@ static void test_connectionpoints(void) hr = IConnectionPointContainer_FindConnectionPoint(container, &IID_IPropertyNotifySink, &cp); ok(hr == S_OK, "got 0x%08x\n", hr); + + if (0) /* crashes on win2k3 */ + { + hr = IConnectionPoint_GetConnectionPointContainer(cp, NULL); + ok(hr == E_POINTER, "got 0x%08x\n", hr); + } + + hr = IConnectionPoint_GetConnectionInterface(cp, &iid); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(IsEqualIID(&iid, &IID_IPropertyNotifySink), "got %s\n", wine_dbgstr_guid(&iid)); + + hr = IConnectionPoint_GetConnectionPointContainer(cp, &container2); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(container2 == container, "got %p, expected %p\n", container2, container); + IConnectionPointContainer_Release(container2); + IConnectionPoint_Release(cp); hr = IConnectionPointContainer_FindConnectionPoint(container, &DIID_DScriptControlSource, &cp); ok(hr == S_OK, "got 0x%08x\n", hr); + + if (0) /* crashes on win2k3 */ + { + hr = IConnectionPoint_GetConnectionPointContainer(cp, NULL); + ok(hr == E_POINTER, "got 0x%08x\n", hr); + } + + hr = IConnectionPoint_GetConnectionInterface(cp, &iid); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(IsEqualIID(&iid, &DIID_DScriptControlSource), "got %s\n", wine_dbgstr_guid(&iid)); + + hr = IConnectionPoint_GetConnectionPointContainer(cp, &container2); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(container2 == container, "got %p, expected %p\n", container2, container); + IConnectionPointContainer_Release(container2); + IConnectionPoint_Release(cp); IConnectionPointContainer_Release(container);

1 0

Piotr Caban : msi: Don' t validate platform while checking if transform is applicable.
by Alexandre Julliard 14 Jul '16

14 Jul '16

Module: wine Branch: master Commit: 92defc736e1e538320599655f614a959f71b7ae1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=92defc736e1e538320599655f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jul 14 13:47:34 2016 +0200 msi: Don't validate platform while checking if transform is applicable. .Net2.0SP2 64-bit installer uses patches with INTEL platform in x64 package to update 32-bit parts of .Net. Native applies patch even if platform is unknown. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/patch.c | 12 +++--------- dlls/msi/tests/patch.c | 43 ++++++++++++++++++++++--------------------- 2 files changed, 25 insertions(+), 30 deletions(-) diff --git a/dlls/msi/patch.c b/dlls/msi/patch.c index f8f3eaf..eb91e06 100644 --- a/dlls/msi/patch.c +++ b/dlls/msi/patch.c @@ -139,6 +139,9 @@ static UINT check_transform_applicable( MSIPACKAGE *package, IStorage *transform wanted_flags &= 0xffff; /* mask off error condition flags */ TRACE("validation flags 0x%04x\n", wanted_flags); + /* native is not validating platform */ + wanted_flags &= ~MSITRANSFORM_VALIDATE_PLATFORM; + if (wanted_flags & ~supported_flags) { FIXME("unsupported validation flags 0x%04x\n", wanted_flags); @@ -192,15 +195,6 @@ static UINT check_transform_applicable( MSIPACKAGE *package, IStorage *transform } msi_free( product_code_installed ); } - if (wanted_flags & MSITRANSFORM_VALIDATE_PLATFORM) - { - if ((p = strchrW( template, ';' ))) - { - *p = 0; - if (package->platform == parse_platform( template )) - valid_flags |= MSITRANSFORM_VALIDATE_PLATFORM; - } - } msi_free( template ); if (wanted_flags & MSITRANSFORM_VALIDATE_MAJORVERSION) { diff --git a/dlls/msi/tests/patch.c b/dlls/msi/tests/patch.c index 3c23656..b6e990b 100644 --- a/dlls/msi/tests/patch.c +++ b/dlls/msi/tests/patch.c @@ -471,16 +471,16 @@ static const char t1_data3[] = { /* SummaryInformation */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0xe0, 0x85, 0x9f, 0xf2, 0xf9, 0x4f, 0x68, 0x10, 0xab, 0x91, 0x08, 0x00, 0x2b, 0x27, 0xb3, 0xd9, - 0x30, 0x00, 0x00, 0x00, 0x9c, 0x01, 0x00, 0x00, 0x0c, 0x00, 0x00, + 0x30, 0x00, 0x00, 0x00, 0x9f, 0x01, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x68, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x88, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0xa8, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0xb8, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0xc4, 0x00, 0x00, 0x00, 0x12, 0x00, 0x00, 0x00, 0xd0, 0x00, 0x00, 0x00, 0x13, 0x00, 0x00, 0x00, 0xdc, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0xe4, 0x00, 0x00, 0x00, 0x08, - 0x00, 0x00, 0x00, 0xf4, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, - 0x04, 0x01, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, 0x8c, 0x01, 0x00, - 0x00, 0x10, 0x00, 0x00, 0x00, 0x94, 0x01, 0x00, 0x00, 0x1e, 0x00, + 0x00, 0x00, 0x00, 0xf7, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, + 0x07, 0x01, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, 0x8f, 0x01, 0x00, + 0x00, 0x10, 0x00, 0x00, 0x00, 0x97, 0x01, 0x00, 0x00, 0x1e, 0x00, 0x00, 0x00, 0x16, 0x00, 0x00, 0x00, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6c, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x44, 0x61, 0x74, 0x61, 0x62, 0x61, 0x73, 0x65, 0x00, 0x00, 0x00, 0x1e, 0x00, 0x00, @@ -492,23 +492,24 @@ static const char t1_data3[] = { /* SummaryInformation */ 0x00, 0x00, 0x1e, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1e, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x1e, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x3b, 0x31, - 0x30, 0x33, 0x33, 0x00, 0x00, 0x00, 0x1e, 0x00, 0x00, 0x00, 0x06, - 0x00, 0x00, 0x00, 0x3b, 0x31, 0x30, 0x33, 0x33, 0x00, 0x00, 0x00, - 0x1e, 0x00, 0x00, 0x00, 0x7f, 0x00, 0x00, 0x00, 0x7b, 0x39, 0x31, - 0x33, 0x42, 0x38, 0x44, 0x31, 0x38, 0x2d, 0x46, 0x42, 0x42, 0x36, - 0x2d, 0x34, 0x43, 0x41, 0x43, 0x2d, 0x41, 0x32, 0x33, 0x39, 0x2d, - 0x43, 0x37, 0x34, 0x43, 0x31, 0x31, 0x45, 0x33, 0x46, 0x41, 0x37, - 0x34, 0x7d, 0x31, 0x2e, 0x31, 0x2e, 0x31, 0x3b, 0x7b, 0x39, 0x31, - 0x33, 0x42, 0x38, 0x44, 0x31, 0x38, 0x2d, 0x46, 0x42, 0x42, 0x36, - 0x2d, 0x34, 0x43, 0x41, 0x43, 0x2d, 0x41, 0x32, 0x33, 0x39, 0x2d, - 0x43, 0x37, 0x34, 0x43, 0x31, 0x31, 0x45, 0x33, 0x46, 0x41, 0x37, - 0x34, 0x7d, 0x31, 0x2e, 0x31, 0x2e, 0x31, 0x3b, 0x7b, 0x41, 0x32, - 0x45, 0x33, 0x44, 0x36, 0x34, 0x33, 0x2d, 0x34, 0x45, 0x32, 0x43, - 0x2d, 0x34, 0x37, 0x37, 0x46, 0x2d, 0x41, 0x33, 0x30, 0x39, 0x2d, - 0x46, 0x37, 0x36, 0x46, 0x35, 0x35, 0x32, 0x44, 0x35, 0x46, 0x34, - 0x33, 0x7d, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x64, 0x00, 0x00, - 0x00, 0x03, 0x00, 0x00, 0x00, 0x17, 0x00, 0x22, 0x09 + 0x00, 0x1e, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x78, 0x38, + 0x36, 0x3b, 0x31, 0x30, 0x33, 0x33, 0x00, 0x00, 0x00, 0x1e, 0x00, + 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x3b, 0x31, 0x30, 0x33, 0x33, + 0x00, 0x00, 0x00, 0x1e, 0x00, 0x00, 0x00, 0x7f, 0x00, 0x00, 0x00, + 0x7b, 0x39, 0x31, 0x33, 0x42, 0x38, 0x44, 0x31, 0x38, 0x2d, 0x46, + 0x42, 0x42, 0x36, 0x2d, 0x34, 0x43, 0x41, 0x43, 0x2d, 0x41, 0x32, + 0x33, 0x39, 0x2d, 0x43, 0x37, 0x34, 0x43, 0x31, 0x31, 0x45, 0x33, + 0x46, 0x41, 0x37, 0x34, 0x7d, 0x31, 0x2e, 0x31, 0x2e, 0x31, 0x3b, + 0x7b, 0x39, 0x31, 0x33, 0x42, 0x38, 0x44, 0x31, 0x38, 0x2d, 0x46, + 0x42, 0x42, 0x36, 0x2d, 0x34, 0x43, 0x41, 0x43, 0x2d, 0x41, 0x32, + 0x33, 0x39, 0x2d, 0x43, 0x37, 0x34, 0x43, 0x31, 0x31, 0x45, 0x33, + 0x46, 0x41, 0x37, 0x34, 0x7d, 0x31, 0x2e, 0x31, 0x2e, 0x31, 0x3b, + 0x7b, 0x41, 0x32, 0x45, 0x33, 0x44, 0x36, 0x34, 0x33, 0x2d, 0x34, + 0x45, 0x32, 0x43, 0x2d, 0x34, 0x37, 0x37, 0x46, 0x2d, 0x41, 0x33, + 0x30, 0x39, 0x2d, 0x46, 0x37, 0x36, 0x46, 0x35, 0x35, 0x32, 0x44, + 0x35, 0x46, 0x34, 0x33, 0x7d, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, + 0x64, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x17, 0x00, 0x22, + 0x09 }; static const struct table_data table_transform1_data[] = {

1 0

Sebastian Lackner : secur32: Define missing gnutls_kx_algorithm_t constants for gnutls versions < 3.
by Alexandre Julliard 14 Jul '16

14 Jul '16

Module: wine Branch: master Commit: e6c85e8436ac889c9c0b22ade2a607cdc0e4404d URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6c85e8436ac889c9c0b22ade… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Jul 14 13:09:39 2016 +0200 secur32: Define missing gnutls_kx_algorithm_t constants for gnutls versions < 3. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/schannel_gnutls.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/secur32/schannel_gnutls.c b/dlls/secur32/schannel_gnutls.c index 7f2dbd6..da83482 100644 --- a/dlls/secur32/schannel_gnutls.c +++ b/dlls/secur32/schannel_gnutls.c @@ -82,6 +82,11 @@ MAKE_FUNCPTR(gnutls_transport_set_push_function); #define GNUTLS_CIPHER_AES_192_CBC 92 #define GNUTLS_CIPHER_AES_128_GCM 93 #define GNUTLS_CIPHER_AES_256_GCM 94 + +#define GNUTLS_KX_ANON_ECDH 11 +#define GNUTLS_KX_ECDHE_RSA 12 +#define GNUTLS_KX_ECDHE_ECDSA 13 +#define GNUTLS_KX_ECDHE_PSK 14 #endif static int compat_cipher_get_block_size(gnutls_cipher_algorithm_t cipher) @@ -327,7 +332,7 @@ static ALG_ID schannel_get_mac_algid(gnutls_mac_algorithm_t mac) } } -static ALG_ID schannel_get_kx_algid(gnutls_kx_algorithm_t kx) +static ALG_ID schannel_get_kx_algid(int kx) { switch (kx) {

1 0

Iván Matellanes : msvcirt: Reset the pointers on file sync in most cases.
by Alexandre Julliard 14 Jul '16

14 Jul '16

Module: wine Branch: master Commit: 5101a90bca2bd2618b488f37624af43efe17a0e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5101a90bca2bd2618b488f376… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Mon Jul 11 11:34:56 2016 +0100 msvcirt: Reset the pointers on file sync in most cases. 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 | 4 ++-- dlls/msvcirt/tests/msvcirt.c | 40 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 2 deletions(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index 3adaf74..07aea3e 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -1126,8 +1126,8 @@ int __thiscall filebuf_sync(filebuf *this) count = this->base.pptr - this->base.pbase; if (count > 0 && _write(this->fd, this->base.pbase, count) != count) return EOF; - this->base.pbase = this->base.pptr = this->base.epptr = NULL; } + this->base.pbase = this->base.pptr = this->base.epptr = NULL; /* flush input buffer */ if (this->base.egptr != NULL) { offset = this->base.egptr - this->base.gptr; @@ -1143,8 +1143,8 @@ int __thiscall filebuf_sync(filebuf *this) if (_lseek(this->fd, -offset, SEEK_CUR) < 0) return EOF; } - this->base.eback = this->base.gptr = this->base.egptr = NULL; } + this->base.eback = this->base.gptr = this->base.egptr = NULL; return 0; } diff --git a/dlls/msvcirt/tests/msvcirt.c b/dlls/msvcirt/tests/msvcirt.c index 3e8b548..13b8397 100644 --- a/dlls/msvcirt/tests/msvcirt.c +++ b/dlls/msvcirt/tests/msvcirt.c @@ -1419,6 +1419,46 @@ static void test_filebuf(void) ok(fb1.base.gptr == NULL, "wrong get pointer, expected %p got %p\n", NULL, fb1.base.gptr); ok(fb1.base.pptr == NULL, "wrong put pointer, expected %p got %p\n", NULL, fb1.base.pptr); ok(_tell(fb1.fd) == 0, "_tell failed\n"); + fb1.base.pbase = fb1.base.pptr = fb1.base.base; + ret = (int) call_func1(p_filebuf_sync, &fb1); + ok(ret == 0, "wrong return, expected 0 got %d\n", ret); + 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); + fb1.base.epptr = fb1.base.ebuf; + ret = (int) call_func1(p_filebuf_sync, &fb1); + ok(ret == 0, "wrong return, expected 0 got %d\n", ret); + ok(fb1.base.epptr == NULL, "wrong put end, expected %p got %p\n", NULL, fb1.base.epptr); + fb1.base.pbase = fb1.base.base; + ret = (int) call_func1(p_filebuf_sync, &fb1); + ok(ret == 0, "wrong return, expected 0 got %d\n", ret); + ok(fb1.base.pbase == NULL, "wrong put base, expected %p got %p\n", NULL, fb1.base.pbase); + fb1.base.pbase = fb1.base.base; + fb1.base.epptr = fb1.base.ebuf; + ret = (int) call_func1(p_filebuf_sync, &fb1); + ok(ret == 0, "wrong return, expected 0 got %d\n", ret); + ok(fb1.base.pbase == NULL, "wrong put base, expected %p got %p\n", NULL, fb1.base.pbase); + ok(fb1.base.epptr == NULL, "wrong put end, expected %p got %p\n", NULL, fb1.base.epptr); + fb1.base.eback = fb1.base.base; + ret = (int) call_func1(p_filebuf_sync, &fb1); + ok(ret == 0, "wrong return, expected 0 got %d\n", ret); + ok(fb1.base.eback == NULL, "wrong get base, expected %p got %p\n", NULL, fb1.base.eback); + fb1.base.eback = fb1.base.gptr = fb1.base.base; + ret = (int) call_func1(p_filebuf_sync, &fb1); + ok(ret == 0, "wrong return, expected 0 got %d\n", ret); + ok(fb1.base.gptr == NULL, "wrong get base, expected %p got %p\n", NULL, fb1.base.gptr); + fb1.base.gptr = fb1.base.base; + fb1.base.egptr = fb1.base.base + 100; + fb1.base.pbase = fb1.base.base; + ret = (int) call_func1(p_filebuf_sync, &fb1); + ok(ret == -1, "wrong return, expected -1 got %d\n", ret); + ok(fb1.base.gptr == fb1.base.base, "wrong get base, expected %p got %p\n", fb1.base.base, fb1.base.gptr); + ok(fb1.base.egptr == fb1.base.base + 100, "wrong get base, expected %p got %p\n", fb1.base.base + 100, fb1.base.egptr); + ok(fb1.base.pbase == NULL, "wrong put base, expected %p got %p\n", NULL, fb1.base.pbase); + fb1.base.egptr = NULL; + ret = (int) call_func1(p_filebuf_sync, &fb1); + ok(ret == 0, "wrong return, expected 0 got %d\n", ret); + ok(fb1.base.gptr == NULL, "wrong get base, expected %p got %p\n", NULL, fb1.base.gptr); + ok(fb1.base.egptr == NULL, "wrong get base, expected %p got %p\n", NULL, fb1.base.egptr); ret = (int) call_func1(p_filebuf_sync, &fb2); ok(ret == -1, "wrong return, expected -1 got %d\n", ret); fb3.base.eback = fb3.base.base;

1 0

Józef Kucia : d3d11: Implement d3d11_immediate_context_RSGetScissorRects().
by Alexandre Julliard 14 Jul '16

14 Jul '16

Module: wine Branch: master Commit: ee29789685d0cdded90a1d94089fc0145b6fa266 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee29789685d0cdded90a1d940… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Jul 13 10:52:00 2016 +0200 d3d11: Implement d3d11_immediate_context_RSGetScissorRects(). 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/d3d11/device.c | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index e0e12a1..7f819db8 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -1789,7 +1789,24 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_RSGetViewports(ID3D11Devic static void STDMETHODCALLTYPE d3d11_immediate_context_RSGetScissorRects(ID3D11DeviceContext *iface, UINT *rect_count, D3D11_RECT *rects) { - FIXME("iface %p, rect_count %p, rects %p stub!\n", iface, rect_count, rects); + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + + TRACE("iface %p, rect_count %p, rects %p.\n", iface, rect_count, rects); + + if (!rects) + { + *rect_count = 1; + return; + } + + if (!*rect_count) + return; + + wined3d_mutex_lock(); + wined3d_device_get_scissor_rect(device->wined3d_device, rects); + wined3d_mutex_unlock(); + if (*rect_count > 1) + memset(&rects[1], 0, (*rect_count - 1) * sizeof(*rects)); } static void STDMETHODCALLTYPE d3d11_immediate_context_HSGetShaderResources(ID3D11DeviceContext *iface,

1 0

Józef Kucia : d3d10core/tests: Add test for immediate constant buffer.
by Alexandre Julliard 14 Jul '16

14 Jul '16

Module: wine Branch: master Commit: b7b58e85bcaa43895a8bc2c66d735f27c7ad1d38 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7b58e85bcaa43895a8bc2c66… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Jul 13 10:52:01 2016 +0200 d3d10core/tests: Add test for immediate constant buffer. 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/d3d10core/tests/device.c | 143 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 143 insertions(+) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 1071552..26e525c 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -612,6 +612,49 @@ static void check_texture_float_(unsigned int line, ID3D10Texture2D *texture, check_texture_sub_resource_float_(line, texture, sub_resource_idx, expected_value, max_diff); } +#define check_texture_sub_resource_vec4(a, b, c, d) check_texture_sub_resource_vec4_(__LINE__, a, b, c, d) +static void check_texture_sub_resource_vec4_(unsigned int line, ID3D10Texture2D *texture, + unsigned int sub_resource_idx, const struct vec4 *expected_value, BYTE max_diff) +{ + struct texture_readback rb; + unsigned int x = 0, y = 0; + struct vec4 value = {0}; + BOOL all_match = TRUE; + + get_texture_readback(texture, sub_resource_idx, &rb); + for (y = 0; y < rb.height; ++y) + { + for (x = 0; x < rb.width; ++x) + { + value = *get_readback_vec4(&rb, x, y); + if (!compare_vec4(&value, expected_value, max_diff)) + { + all_match = FALSE; + break; + } + } + if (!all_match) + break; + } + release_texture_readback(&rb); + ok_(__FILE__, line)(all_match, + "Got unexpected value {%.8e, %.8e, %.8e, %.8e} at (%u, %u), sub-resource %u.\n", + value.x, value.y, value.z, value.w, x, y, sub_resource_idx); +} + +#define check_texture_vec4(a, b, c) check_texture_vec4_(__LINE__, a, b, c) +static void check_texture_vec4_(unsigned int line, ID3D10Texture2D *texture, + const struct vec4 *expected_value, BYTE max_diff) +{ + unsigned int sub_resource_idx, sub_resource_count; + D3D10_TEXTURE2D_DESC texture_desc; + + ID3D10Texture2D_GetDesc(texture, &texture_desc); + sub_resource_count = texture_desc.ArraySize * texture_desc.MipLevels; + for (sub_resource_idx = 0; sub_resource_idx < sub_resource_count; ++sub_resource_idx) + check_texture_sub_resource_vec4_(line, texture, sub_resource_idx, expected_value, max_diff); +} + static ID3D10Device *create_device(void) { ID3D10Device *device; @@ -8458,6 +8501,105 @@ static void test_null_sampler(void) release_test_context(&test_context); } +static void test_immediate_constant_buffer(void) +{ + struct d3d10core_test_context test_context; + D3D10_TEXTURE2D_DESC texture_desc; + ID3D10RenderTargetView *rtv; + unsigned int index[4] = {0}; + ID3D10Texture2D *texture; + ID3D10PixelShader *ps; + ID3D10Device *device; + ID3D10Buffer *cb; + unsigned int i; + HRESULT hr; + + static const DWORD ps_code[] = + { +#if 0 + uint index; + + static const int int_array[6] = + { + 310, 111, 212, -513, -318, 0, + }; + + static const uint uint_array[6] = + { + 2, 7, 0x7f800000, 0xff800000, 0x7fc00000, 0 + }; + + static const float float_array[6] = + { + 76, 83.5f, 0.5f, 0.75f, -0.5f, 0.0f, + }; + + float4 main() : SV_Target + { + return float4(int_array[index], uint_array[index], float_array[index], 1.0f); + } +#endif + 0x43425844, 0xbad068da, 0xd631ea3c, 0x41648374, 0x3ccd0120, 0x00000001, 0x00000184, 0x00000003, + 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000, + 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x52444853, 0x0000010c, 0x00000040, 0x00000043, + 0x00001835, 0x0000001a, 0x00000136, 0x00000002, 0x42980000, 0x00000000, 0x0000006f, 0x00000007, + 0x42a70000, 0x00000000, 0x000000d4, 0x7f800000, 0x3f000000, 0x00000000, 0xfffffdff, 0xff800000, + 0x3f400000, 0x00000000, 0xfffffec2, 0x7fc00000, 0xbf000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, + 0x00000000, 0x02000068, 0x00000001, 0x05000036, 0x00102082, 0x00000000, 0x00004001, 0x3f800000, + 0x06000036, 0x00100012, 0x00000000, 0x0020800a, 0x00000000, 0x00000000, 0x06000056, 0x00102022, + 0x00000000, 0x0090901a, 0x0010000a, 0x00000000, 0x0600002b, 0x00102012, 0x00000000, 0x0090900a, + 0x0010000a, 0x00000000, 0x06000036, 0x00102042, 0x00000000, 0x0090902a, 0x0010000a, 0x00000000, + 0x0100003e, + }; + static struct vec4 expected_result[] = + { + { 310.0f, 2.0f, 76.00f, 1.0f}, + { 111.0f, 7.0f, 83.50f, 1.0f}, + { 212.0f, 2139095040.0f, 0.50f, 1.0f}, + {-513.0f, 4286578688.0f, 0.75f, 1.0f}, + {-318.0f, 2143289344.0f, -0.50f, 1.0f}, + { 0.0f, 0.0f, 0.0f, 1.0f}, + }; + + if (!init_test_context(&test_context)) + return; + + device = test_context.device; + + hr = ID3D10Device_CreatePixelShader(device, ps_code, sizeof(ps_code), &ps); + ok(SUCCEEDED(hr), "Failed to create pixel shader, hr %#x.\n", hr); + ID3D10Device_PSSetShader(device, ps); + + cb = create_buffer(device, D3D10_BIND_CONSTANT_BUFFER, sizeof(index), NULL); + ID3D10Device_PSSetConstantBuffers(device, 0, 1, &cb); + + ID3D10Texture2D_GetDesc(test_context.backbuffer, &texture_desc); + texture_desc.Format = DXGI_FORMAT_R32G32B32A32_FLOAT; + hr = ID3D10Device_CreateTexture2D(device, &texture_desc, NULL, &texture); + ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); + + hr = ID3D10Device_CreateRenderTargetView(device, (ID3D10Resource *)texture, NULL, &rtv); + ok(SUCCEEDED(hr), "Failed to create render target view, hr %#x.\n", hr); + ID3D10Device_OMSetRenderTargets(device, 1, &rtv, NULL); + + for (i = 0; i < sizeof(expected_result) / sizeof(*expected_result); ++i) + { + *index = i; + ID3D10Device_UpdateSubresource(device, (ID3D10Resource *)cb, 0, NULL, index, 0, 0); + + draw_quad(&test_context); + check_texture_vec4(texture, &expected_result[i], 0); + } + + ID3D10Buffer_Release(cb); + ID3D10PixelShader_Release(ps); + ID3D10Texture2D_Release(texture); + ID3D10RenderTargetView_Release(rtv); + release_test_context(&test_context); +} + START_TEST(device) { test_feature_level(); @@ -8502,4 +8644,5 @@ START_TEST(device) test_create_input_layout(); test_input_assembler(); test_null_sampler(); + test_immediate_constant_buffer(); }

1 0

Józef Kucia : wined3d: Use uintBitsToFloat() for float immediate shader constants.
by Alexandre Julliard 14 Jul '16

14 Jul '16

Module: wine Branch: master Commit: a44cdbfdd256dcdb0e87d51b723dbd566d91b1f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a44cdbfdd256dcdb0e87d51b7… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Jul 13 10:52:02 2016 +0200 wined3d: Use uintBitsToFloat() for float immediate shader constants. This fixes issues with special floating-point values in immediate constants. Inspired by a patch by Guillaume Charifi. 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 | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 2c04260..0090308 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2548,7 +2548,10 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * switch (reg->data_type) { case WINED3D_DATA_FLOAT: - wined3d_ftoa(*(const float *)reg->immconst_data, register_name); + if (gl_info->supported[ARB_SHADER_BIT_ENCODING]) + sprintf(register_name, "uintBitsToFloat(%#xu)", reg->immconst_data[0]); + else + wined3d_ftoa(*(const float *)reg->immconst_data, register_name); break; case WINED3D_DATA_INT: sprintf(register_name, "%#x", reg->immconst_data[0]); @@ -2568,12 +2571,21 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * switch (reg->data_type) { case WINED3D_DATA_FLOAT: - wined3d_ftoa(*(const float *)&reg->immconst_data[0], imm_str[0]); - wined3d_ftoa(*(const float *)&reg->immconst_data[1], imm_str[1]); - wined3d_ftoa(*(const float *)&reg->immconst_data[2], imm_str[2]); - wined3d_ftoa(*(const float *)&reg->immconst_data[3], imm_str[3]); - sprintf(register_name, "vec4(%s, %s, %s, %s)", - imm_str[0], imm_str[1], imm_str[2], imm_str[3]); + if (gl_info->supported[ARB_SHADER_BIT_ENCODING]) + { + sprintf(register_name, "uintBitsToFloat(uvec4(%#xu, %#xu, %#xu, %#xu))", + reg->immconst_data[0], reg->immconst_data[1], + reg->immconst_data[2], reg->immconst_data[3]); + } + else + { + wined3d_ftoa(*(const float *)&reg->immconst_data[0], imm_str[0]); + wined3d_ftoa(*(const float *)&reg->immconst_data[1], imm_str[1]); + wined3d_ftoa(*(const float *)&reg->immconst_data[2], imm_str[2]); + wined3d_ftoa(*(const float *)&reg->immconst_data[3], imm_str[3]); + sprintf(register_name, "vec4(%s, %s, %s, %s)", + imm_str[0], imm_str[1], imm_str[2], imm_str[3]); + } break; case WINED3D_DATA_INT: sprintf(register_name, "ivec4(%#x, %#x, %#x, %#x)",

1 0