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

Alistair Leslie-Hughes : inetcomm: Trace all IMimeBody function parameters.
by Alexandre Julliard 18 Apr '16

18 Apr '16

Module: wine Branch: master Commit: 860460424427202e0ce49a64b2fa8383435d01dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=860460424427202e0ce49a64b… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Apr 15 07:50:33 2016 +0000 inetcomm: Trace all IMimeBody function parameters. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/inetcomm/mimeole.c | 93 ++++++++++++++++++++++++++++++++----------------- 1 file changed, 61 insertions(+), 32 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=860460424427202e0ce49…

1 0

Alistair Leslie-Hughes : inetcomm: Add MimeOleGetPropertySchema stub.
by Alexandre Julliard 18 Apr '16

18 Apr '16

Module: wine Branch: master Commit: 9b8d63d168bd96e32b5de61cb20860cc96a26776 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b8d63d168bd96e32b5de61cb… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Apr 15 07:50:47 2016 +0000 inetcomm: Add MimeOleGetPropertySchema stub. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/inetcomm/inetcomm.spec | 2 +- dlls/inetcomm/mimeole.c | 6 ++++++ include/mimeole.idl | 2 ++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/inetcomm/inetcomm.spec b/dlls/inetcomm/inetcomm.spec index 0c90b4d..86eb9bd 100644 --- a/dlls/inetcomm/inetcomm.spec +++ b/dlls/inetcomm/inetcomm.spec @@ -79,7 +79,7 @@ @ stdcall MimeOleGetInternat(ptr) @ stub MimeOleGetPropA @ stub MimeOleGetPropW -@ stub MimeOleGetPropertySchema +@ stdcall MimeOleGetPropertySchema(ptr) @ stub MimeOleGetRelatedSection @ stub MimeOleInetDateToFileTime @ stub MimeOleObjectFromMoniker diff --git a/dlls/inetcomm/mimeole.c b/dlls/inetcomm/mimeole.c index 8ca8b35..8aebb38 100644 --- a/dlls/inetcomm/mimeole.c +++ b/dlls/inetcomm/mimeole.c @@ -3031,3 +3031,9 @@ HRESULT VirtualStream_create(IUnknown *outer, void **obj) return MimeOleCreateVirtualStream((IStream **)obj); } + +HRESULT WINAPI MimeOleGetPropertySchema(IMimePropertySchema **schema) +{ + FIXME("(%p) stub\n", schema); + return E_NOTIMPL; +} diff --git a/include/mimeole.idl b/include/mimeole.idl index c10d8e0..65c0b42 100644 --- a/include/mimeole.idl +++ b/include/mimeole.idl @@ -1378,6 +1378,8 @@ cpp_quote("HRESULT WINAPI MimeEditCreateMimeDocument(IUnknown*,IMimeMessage*,DWO cpp_quote("HRESULT WINAPI MimeEditGetBackgroundImageUrl(IUnknown*,BSTR*);") cpp_quote("HRESULT WINAPI MimeEditDocumentFromStream(IStream*,REFIID,void**);") +cpp_quote("HRESULT WINAPI MimeOleGetPropertySchema(IMimePropertySchema**);") + cpp_quote("#ifdef __cplusplus") cpp_quote("}") cpp_quote("#endif")

1 0

Alistair Leslie-Hughes : mimeole.idl: Correct IMimePropertySchema interface.
by Alexandre Julliard 18 Apr '16

18 Apr '16

Module: wine Branch: master Commit: 3a974b1c5e7effd3bd0d324a6d21c6f3181d5da3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a974b1c5e7effd3bd0d324a6… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Apr 15 07:50:59 2016 +0000 mimeole.idl: Correct IMimePropertySchema interface. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/mimeole.idl | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/include/mimeole.idl b/include/mimeole.idl index 65c0b42..dddfc26 100644 --- a/include/mimeole.idl +++ b/include/mimeole.idl @@ -469,6 +469,8 @@ library MIMEOLE ] interface IMimePropertySchema : IUnknown { + typedef [unique] IMimePropertySchema *LPMIMEPROPERTYSCHEMA; + typedef enum tagMIMEPROPFLAGS { MPF_INETCSET = 0x01, @@ -479,7 +481,30 @@ library MIMEOLE MPF_READONLY = 0x20 } MIMEPROPFLAGS; - /* FIXME: fill this in */ + HRESULT RegisterProperty( + [in] const char *name, + [in] DWORD flags, + [in] DWORD rownumber, + [in] VARTYPE vtdefault, + [out] DWORD *propid); + + HRESULT ModifyProperty( + [in] const char *name, + [in] DWORD flags, + [in] DWORD rownumber, + [in] VARTYPE vtdefault); + + HRESULT GetPropertyId( + [in] const char *name, + [out] DWORD *propid); + + HRESULT GetPropertyName( + [in] DWORD propid, + [out] char **name); + + HRESULT RegisterAddressType( + [in] const char *name, + [out] DWORD *adrtype); } [

1 0

Michael Müller : wbemprox/tests: Add initial tests for ASSOCIATORS query.
by Alexandre Julliard 18 Apr '16

18 Apr '16

Module: wine Branch: master Commit: df5388b977df7b822ea7cf53f73b538905629c9d URL: http://source.winehq.org/git/wine.git/?a=commit;h=df5388b977df7b822ea7cf53f… Author: Michael Müller <michael(a)fds-team.de> Date: Mon Apr 18 11:04:49 2016 +0200 wbemprox/tests: Add initial tests for ASSOCIATORS query. Signed-off-by: Michael Müller <michael(a)fds-team.de> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/tests/query.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 9dc0db4..c0889f9 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -147,6 +147,29 @@ static void test_select( IWbemServices *services ) SysFreeString( query ); } +static void test_associators( IWbemServices *services ) +{ + static const WCHAR query1[] = + {'A','S','S','O','C','I','A','T','O','R','S',' ','O','F',' ','{','W','i','n','3','2','_', + 'L','o','g','i','c','a','l','D','i','s','k','.','D','e','v','i','c','e','I','D','=','"','C',':','"','}',0}; + static const WCHAR query2[] = + {'A','S','S','O','C','I','A','T','O','R','S',' ','O','F',' ','{','W','i','n','3','2','_', + 'L','o','g','i','c','a','l','D','i','s','k','.','D','e','v','i','c','e','I','D','=','"','C',':','"','}',' ', + 'W','H','E','R','E',' ','A','s','s','o','c','C','l','a','s','s',' ','=',' ','W','i','n','3','2','_', + 'L','o','g','i','c','a','l','D','i','s','k','T','o','P','a','r','t','i','t','i','o','n',0}; + static const WCHAR *test[] = { query1, query2 }; + HRESULT hr; + IEnumWbemClassObject *result; + UINT i; + + for (i = 0; i < sizeof(test)/sizeof(test[0]); i++) + { + hr = exec_query( services, test[i], &result ); + todo_wine ok( hr == S_OK, "query %u failed: %08x\n", i, hr ); + if (result) IEnumWbemClassObject_Release( result ); + } +} + static void test_Win32_Service( IWbemServices *services ) { static const WCHAR returnvalueW[] = {'R','e','t','u','r','n','V','a','l','u','e',0}; @@ -1054,6 +1077,7 @@ START_TEST(query) ok( hr == S_OK, "failed to set proxy blanket %08x\n", hr ); test_select( services ); + test_associators( services ); test_Win32_Bios( services ); test_Win32_Process( services ); test_Win32_Service( services );

1 0

Sebastian Lackner : krnl386.exe16: Do not reassign default handles after they got closed.
by Alexandre Julliard 18 Apr '16

18 Apr '16

Module: wine Branch: master Commit: 414c73feabb6d33be969f3927f8b3e8a8075bcd4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=414c73feabb6d33be969f3927… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Apr 18 11:29:29 2016 +0200 krnl386.exe16: Do not reassign default handles after they got closed. Based on a patch by Michael Müller. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/krnl386.exe16/file.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/krnl386.exe16/file.c b/dlls/krnl386.exe16/file.c index b66b753..4e7f7c4 100644 --- a/dlls/krnl386.exe16/file.c +++ b/dlls/krnl386.exe16/file.c @@ -113,8 +113,7 @@ HFILE WINAPI Win32HandleToDosFileHandle( HANDLE handle ) if (!handle || (handle == INVALID_HANDLE_VALUE)) return HFILE_ERROR; - FILE_InitProcessDosHandles(); - for (i = 0; i < DOS_TABLE_SIZE; i++) + for (i = 5; i < DOS_TABLE_SIZE; i++) if (!dos_handles[i]) { dos_handles[i] = handle;

1 0

Caron Wills : wined3d: Add Nvidia GeForce 840M.
by Alexandre Julliard 18 Apr '16

18 Apr '16

Module: wine Branch: master Commit: f8d6eee32a612443d460c34b24c27ab7646da811 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8d6eee32a612443d460c34b2… Author: Caron Wills <caron(a)codeweavers.com> Date: Fri Apr 15 18:10:42 2016 +0000 wined3d: Add Nvidia GeForce 840M. Signed-off-by: Caron Wills <caron(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 3 +++ dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 4 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 8358930..8c3ccf0 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1287,6 +1287,7 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTXTITAN, "NVIDIA GeForce GTX TITAN Black", DRIVER_NVIDIA_GEFORCE8, 6144}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_820M, "NVIDIA GeForce 820M", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_830M, "NVIDIA GeForce 830M", DRIVER_NVIDIA_GEFORCE8, 2048}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_840M, "NVIDIA GeForce 840M", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX860M, "NVIDIA GeForce GTX 860M", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX950, "NVIDIA GeForce GTX 950", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX950M, "NVIDIA GeForce GTX 950M", DRIVER_NVIDIA_GEFORCE8, 4096}, @@ -1751,6 +1752,7 @@ cards_nvidia_binary[] = {"GTX 950M", CARD_NVIDIA_GEFORCE_GTX950M}, /* GeForce 900 - midend mobile */ {"GTX 950", CARD_NVIDIA_GEFORCE_GTX950}, /* GeForce 900 - midend */ {"GTX 860M", CARD_NVIDIA_GEFORCE_GTX860M}, /* GeForce 800 - mobile */ + {"GeForce 840M", CARD_NVIDIA_GEFORCE_840M}, /* GeForce 800 - mobile */ {"GeForce 830M", CARD_NVIDIA_GEFORCE_830M}, /* GeForce 800 - mobile */ {"GeForce 820M", CARD_NVIDIA_GEFORCE_820M}, /* GeForce 800 - mobile */ {"GTX 780 Ti", CARD_NVIDIA_GEFORCE_GTX780TI}, /* Geforce 700 - highend */ @@ -2111,6 +2113,7 @@ cards_nvidia_mesa[] = { /* Maxwell */ {"NV124", CARD_NVIDIA_GEFORCE_GTX970}, + {"NV118", CARD_NVIDIA_GEFORCE_840M}, {"NV117", CARD_NVIDIA_GEFORCE_GTX750}, /* Kepler */ {"NVF1", CARD_NVIDIA_GEFORCE_GTX780TI}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 24515da..f51d7e2 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1796,6 +1796,7 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_GTXTITAN = 0x100c, CARD_NVIDIA_GEFORCE_820M = 0x0fed, CARD_NVIDIA_GEFORCE_830M = 0x1340, + CARD_NVIDIA_GEFORCE_840M = 0x1341, CARD_NVIDIA_GEFORCE_GTX860M = 0x1392, /* Other PCI ID 0x119a */ CARD_NVIDIA_GEFORCE_GTX950 = 0x1402, CARD_NVIDIA_GEFORCE_GTX950M = 0x139a,

1 0

Francois Gouget : d3d9/tests: Spelling fixes for a couple of ok() calls.
by Alexandre Julliard 18 Apr '16

18 Apr '16

Module: wine Branch: master Commit: 0277ba190b2486a3e1c62dfe40cddaf6a8afb1db URL: http://source.winehq.org/git/wine.git/?a=commit;h=0277ba190b2486a3e1c62dfe4… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Apr 16 02:24:33 2016 +0200 d3d9/tests: Spelling fixes for a couple of ok() calls. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/device.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 237fcc3..8fc9a22 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -3205,7 +3205,7 @@ static void test_scissor_size(void) ok(hr == D3D_OK, "IDirect3DDevice9_GetScissorRect failed with: %08x\n", hr); ok(scissorrect.right == scts[i].backx && scissorrect.bottom == scts[i].backy && scissorrect.top == 0 && scissorrect.left == 0, - "Scissorrect missmatch (%d, %d) should be (%d, %d)\n", scissorrect.right, scissorrect.bottom, + "Scissorrect mismatch (%d, %d) should be (%d, %d)\n", scissorrect.right, scissorrect.bottom, scts[i].backx, scts[i].backy); /* check the scissorrect values after a reset */ @@ -3221,7 +3221,7 @@ static void test_scissor_size(void) ok(hr == D3D_OK, "IDirect3DDevice9_GetScissorRect failed with: %08x\n", hr); ok(scissorrect.right == registry_mode.dmPelsWidth && scissorrect.bottom == registry_mode.dmPelsHeight && scissorrect.top == 0 && scissorrect.left == 0, - "Scissorrect missmatch (%d, %d) should be (%u, %u)\n", scissorrect.right, scissorrect.bottom, + "Scissorrect mismatch (%d, %d) should be (%u, %u)\n", scissorrect.right, scissorrect.bottom, registry_mode.dmPelsWidth, registry_mode.dmPelsHeight); if(device_ptr) {

1 0

Paul Gofman : d3dx9: Implement fxlc constants (expressions) in effect.
by Alexandre Julliard 18 Apr '16

18 Apr '16

Module: wine Branch: master Commit: 43208b6348ba09617d2625e9b12f08913cb02b6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=43208b6348ba09617d2625e9b… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Thu Apr 14 13:30:52 2016 +0300 d3dx9: Implement fxlc constants (expressions) in effect. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/d3dx9_private.h | 2 + dlls/d3dx9_36/effect.c | 81 ++++++----- dlls/d3dx9_36/preshader.c | 328 ++++++++++++++++++++++++++++++++++++++++-- dlls/d3dx9_36/tests/effect.c | 4 +- 4 files changed, 369 insertions(+), 46 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=43208b6348ba09617d262…

1 0

Paul Gofman : d3dx9: Add basic opcodes to preshader.
by Alexandre Julliard 18 Apr '16

18 Apr '16

Module: wine Branch: master Commit: 58d80d90a54a9d3be853e549ae828edc411f2649 URL: http://source.winehq.org/git/wine.git/?a=commit;h=58d80d90a54a9d3be853e549a… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Sun Apr 17 18:59:45 2016 +0200 d3dx9: Add basic opcodes to preshader. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/preshader.c | 64 ++++++++++++++++++++++++++++++++++++++++++-- dlls/d3dx9_36/tests/effect.c | 56 +++++++++++++++++++------------------- 2 files changed, 90 insertions(+), 30 deletions(-) diff --git a/dlls/d3dx9_36/preshader.c b/dlls/d3dx9_36/preshader.c index fba9973..b831be1 100644 --- a/dlls/d3dx9_36/preshader.c +++ b/dlls/d3dx9_36/preshader.c @@ -29,11 +29,57 @@ enum pres_ops { PRESHADER_OP_NOP, PRESHADER_OP_MOV, + PRESHADER_OP_ADD, + PRESHADER_OP_MUL, + PRESHADER_OP_DOT, + PRESHADER_OP_NEG, + PRESHADER_OP_RCP, + PRESHADER_OP_LT, + PRESHADER_OP_FRC, + PRESHADER_OP_MIN, + PRESHADER_OP_MAX, + PRESHADER_OP_GE, + PRESHADER_OP_CMP, + PRESHADER_OP_SIN, + PRESHADER_OP_COS, + PRESHADER_OP_RSQ, }; -typedef double (*pres_op_func)(double *args, int ncomp); +typedef double (*pres_op_func)(double *args, int n); -static double pres_mov(double *args, int ncomp) {return args[0];} +static double pres_mov(double *args, int n) {return args[0];} +static double pres_add(double *args, int n) {return args[0] + args[1];} +static double pres_mul(double *args, int n) {return args[0] * args[1];} +static double pres_dot(double *args, int n) +{ + int i; + double sum; + + sum = 0.0; + for (i = 0; i < n; ++i) + sum += args[i] * args[i + n]; + return sum; +} +static double pres_neg(double *args, int n) {return -args[0];} +static double pres_rcp(double *args, int n) {return 1.0 / args[0];} +static double pres_lt(double *args, int n) {return args[0] < args[1] ? 1.0 : 0.0;} +static double pres_ge(double *args, int n) {return args[0] >= args[1] ? 1.0 : 0.0;} +static double pres_frc(double *args, int n) {return args[0] - floor(args[0]);} +static double pres_min(double *args, int n) {return fmin(args[0], args[1]);} +static double pres_max(double *args, int n) {return fmax(args[0], args[1]);} +static double pres_cmp(double *args, int n) {return args[0] < 0.0 ? args[2] : args[1];} +static double pres_sin(double *args, int n) {return sin(args[0]);} +static double pres_cos(double *args, int n) {return cos(args[0]);} +static double pres_rsq(double *args, int n) +{ + double v; + + v = fabs(args[0]); + if (v == 0.0) + return INFINITY; + else + return 1.0 / sqrt(v); +} #define PRES_OPCODE_MASK 0x7ff00000 #define PRES_OPCODE_SHIFT 20 @@ -59,6 +105,20 @@ static const struct op_info pres_op_info[] = { {0x000, "nop", 0, 0, NULL }, /* PRESHADER_OP_NOP */ {0x100, "mov", 1, 0, pres_mov}, /* PRESHADER_OP_MOV */ + {0x204, "add", 2, 0, pres_add}, /* PRESHADER_OP_ADD */ + {0x205, "mul", 2, 0, pres_mul}, /* PRESHADER_OP_MUL */ + {0x500, "dot", 2, 1, pres_dot}, /* PRESHADER_OP_DOT */ + {0x101, "neg", 1, 0, pres_neg}, /* PRESHADER_OP_NEG */ + {0x103, "rcp", 1, 0, pres_rcp}, /* PRESHADER_OP_RCP */ + {0x202, "lt", 2, 0, pres_lt }, /* PRESHADER_OP_LT */ + {0x104, "frc", 1, 0, pres_frc}, /* PRESHADER_OP_FRC */ + {0x200, "min", 2, 0, pres_min}, /* PRESHADER_OP_MIN */ + {0x201, "max", 2, 0, pres_max}, /* PRESHADER_OP_MAX */ + {0x203, "ge", 2, 0, pres_ge }, /* PRESHADER_OP_GE */ + {0x300, "cmp", 3, 0, pres_cmp}, /* PRESHADER_OP_CMP */ + {0x108, "sin", 1, 0, pres_sin}, /* PRESHADER_OP_SIN */ + {0x109, "cos", 1, 0, pres_cos}, /* PRESHADER_OP_COS */ + {0x107, "rsq", 1, 0, pres_rsq}, /* PRESHADER_OP_RSQ */ }; enum pres_value_type diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index 4f017bd..99f0d46 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -3692,37 +3692,34 @@ static void test_effect_preshader(IDirect3DDevice9 *device) const char *comment; BOOL todo[4]; unsigned int result[4]; + unsigned int ulps; } test_effect_preshader_op_results[] = { - {"1 / op", { TRUE, TRUE, TRUE, TRUE}, {0x7f800000, 0xff800000, 0xbee8ba2e, 0x00200000}}, + {"1 / op", {FALSE, FALSE, FALSE, FALSE}, {0x7f800000, 0xff800000, 0xbee8ba2e, 0x00200000}}, + {"rsq", {FALSE, FALSE, FALSE, FALSE}, {0x7f800000, 0x7f800000, 0x3f2c985c, 0x1f800001}, 1}, + {"mul", {FALSE, FALSE, FALSE, FALSE}, {0x00000000, 0x80000000, 0x40d33334, 0x7f800000}}, + {"add", {FALSE, FALSE, FALSE, FALSE}, {0x3f800000, 0x40000000, 0xc0a66666, 0x7f7fffff}}, + {"lt", {FALSE, FALSE, FALSE, FALSE}, {0x3f800000, 0x3f800000, 0x00000000, 0x00000000}}, + {"ge", {FALSE, FALSE, FALSE, FALSE}, {0x00000000, 0x00000000, 0x3f800000, 0x3f800000}}, + {"neg", {FALSE, FALSE, FALSE, FALSE}, {0x80000000, 0x00000000, 0x400ccccd, 0xff7fffff}}, + {"rcp", {FALSE, FALSE, FALSE, FALSE}, {0x7f800000, 0xff800000, 0xbee8ba2e, 0x00200000}}, + {"frac", {FALSE, FALSE, FALSE, FALSE}, {0x00000000, 0x00000000, 0x3f4ccccc, 0x00000000}}, + {"min", {FALSE, FALSE, FALSE, FALSE}, {0x00000000, 0x80000000, 0xc0400000, 0x40800000}}, + {"max", {FALSE, FALSE, FALSE, FALSE}, {0x3f800000, 0x40000000, 0xc00ccccd, 0x7f7fffff}}, #if __x86_64__ - {"rsq", { TRUE, TRUE, TRUE, TRUE}, {0x7f800000, 0x7f800000, 0x3f2c985d, 0x1f800000}}, + {"sin", {FALSE, FALSE, FALSE, FALSE}, {0x00000000, 0x80000000, 0xbf4ef99e, 0xbf0599b3}}, + {"cos", {FALSE, FALSE, FALSE, FALSE}, {0x3f800000, 0x3f800000, 0xbf16a803, 0x3f5a5f96}}, #else - {"rsq", { TRUE, TRUE, TRUE, TRUE}, {0x7f800000, 0x7f800000, 0x3f2c985c, 0x1f800001}}, + {"sin", {FALSE, FALSE, FALSE, TRUE}, {0x00000000, 0x80000000, 0xbf4ef99e, 0x3f792dc4}}, + {"cos", {FALSE, FALSE, FALSE, TRUE}, {0x3f800000, 0x3f800000, 0xbf16a803, 0xbe6acefc}}, #endif - {"mul", { TRUE, TRUE, TRUE, TRUE}, {0x00000000, 0x80000000, 0x40d33334, 0x7f800000}}, - {"add", {FALSE, TRUE, TRUE, TRUE}, {0x3f800000, 0x40000000, 0xc0a66666, 0x7f7fffff}}, - {"lt", {FALSE, FALSE, TRUE, FALSE}, {0x3f800000, 0x3f800000, 0x00000000, 0x00000000}}, - {"ge", { TRUE, TRUE, FALSE, TRUE}, {0x00000000, 0x00000000, 0x3f800000, 0x3f800000}}, - {"neg", { TRUE, TRUE, TRUE, TRUE}, {0x80000000, 0x00000000, 0x400ccccd, 0xff7fffff}}, - {"rcp", { TRUE, TRUE, TRUE, TRUE}, {0x7f800000, 0xff800000, 0xbee8ba2e, 0x00200000}}, - {"frac", {FALSE, FALSE, TRUE, FALSE}, {0x00000000, 0x00000000, 0x3f4ccccc, 0x00000000}}, - {"min", {FALSE, TRUE, TRUE, TRUE}, {0x00000000, 0x80000000, 0xc0400000, 0x40800000}}, - {"max", { TRUE, TRUE, TRUE, TRUE}, {0x3f800000, 0x40000000, 0xc00ccccd, 0x7f7fffff}}, + {"den mul",{FALSE, FALSE, FALSE, FALSE}, {0x7f800000, 0xff800000, 0xbb94f209, 0x000051ec}}, + {"dot", {FALSE, FALSE, FALSE, FALSE}, {0x00000000, 0x7f800000, 0x41f00000, 0x00000000}}, #if __x86_64__ - {"sin", {FALSE, TRUE, TRUE, TRUE}, {0x00000000, 0x80000000, 0xbf4ef99e, 0xbf0599b3}}, - {"cos", { TRUE, TRUE, TRUE, TRUE}, {0x3f800000, 0x3f800000, 0xbf16a803, 0x3f5a5f96}}, + {"prec", {FALSE, FALSE, TRUE, FALSE}, {0x2b8cbccc, 0x2c0cbccc, 0xac531800, 0x00000000}} #else - {"sin", {FALSE, TRUE, TRUE, TRUE}, {0x00000000, 0x80000000, 0xbf4ef99e, 0x3f792dc4}}, - {"cos", { TRUE, TRUE, TRUE, TRUE}, {0x3f800000, 0x3f800000, 0xbf16a803, 0xbe6acefc}}, -#endif - {"den mul",{ TRUE, TRUE, TRUE, TRUE}, {0x7f800000, 0xff800000, 0xbb94f209, 0x000051ec}}, - {"dot", {FALSE, TRUE, TRUE, FALSE}, {0x00000000, 0x7f800000, 0x41f00000, 0x00000000}}, -#if __x86_64__ - {"prec", { TRUE, TRUE, TRUE, FALSE}, {0x2b8cbccc, 0x2c0cbccc, 0xac531800, 0x00000000}} -#else - {"prec", { TRUE, TRUE, FALSE, FALSE}, {0x2b8cbccc, 0x2c0cbccc, 0x00000000, 0x00000000}} + {"prec", {FALSE, FALSE, FALSE, FALSE}, {0x2b8cbccc, 0x2c0cbccc, 0x00000000, 0x00000000}} #endif }; #define TEST_EFFECT_PRES_NFLOATV ARRAY_SIZE(test_effect_preshader_fconstsv) @@ -3789,7 +3786,7 @@ static void test_effect_preshader(IDirect3DDevice9 *device) ok(hr == D3D_OK, "SetVector failed, hr %#x.\n", hr); hr = effect->lpVtbl->BeginPass(effect, 0); - todo_wine ok(hr == D3D_OK, "Got result %#x.\n", hr); + ok(hr == D3D_OK, "Got result %#x.\n", hr); hr = IDirect3DDevice9_GetVertexShaderConstantF(device, 0, &fdata[0].x, TEST_EFFECT_PRES_NFLOATV); ok(hr == D3D_OK, "Got result %#x.\n", hr); @@ -3828,17 +3825,20 @@ static void test_effect_preshader(IDirect3DDevice9 *device) for (i = 0; i < TEST_EFFECT_PRES_NOPTESTS; ++i) { - unsigned int *v; + float *v; hr = IDirect3DDevice9_GetLight(device, i % 8, &light); - v = i < 8 ? (unsigned int *)&light.Diffuse : (unsigned int *)&light.Ambient; + v = i < 8 ? &light.Diffuse.r : &light.Ambient.r; ok(hr == D3D_OK, "Got result %#x.\n", hr); for (j = 0; j < 4; ++j) + { todo_wine_if(test_effect_preshader_op_results[i].todo[j]) - ok(v[j] == test_effect_preshader_op_results[i].result[j], + ok(compare_float(v[j], ((float *)test_effect_preshader_op_results[i].result)[j], + test_effect_preshader_op_results[i].ulps), "Operation %s, component %u, expected %#x, got %#x (%g).\n", test_effect_preshader_op_results[i].comment, j, - test_effect_preshader_op_results[i].result[j], v[j], ((float *)v)[j]); + test_effect_preshader_op_results[i].result[j], ((unsigned int *)v)[j], v[j]); + } } hr = effect->lpVtbl->EndPass(effect);

1 0

Paul Gofman : d3dx9: Implement array selectors in effect.
by Alexandre Julliard 18 Apr '16

18 Apr '16

Module: wine Branch: master Commit: 4620bb80b05a933b59e5c1dd62df2f93793d2b7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=4620bb80b05a933b59e5c1dd6… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Thu Apr 14 13:30:54 2016 +0300 d3dx9: Implement array selectors in effect. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/effect.c | 84 ++++++++++++++++++++++++++------------------ dlls/d3dx9_36/tests/effect.c | 6 ++-- 2 files changed, 53 insertions(+), 37 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4620bb80b05a933b59e5c…

1 0