- wine-devel - winehq.org

Re: [PATCH 1/4] xmllite/writer: Handle initial and ready states in the rest of tested Write* methods
by Dmitry Timoshkov 24 Mar '16

24 Mar '16

Nikolay Sivov <nsivov(a)codeweavers.com> wrote: > + switch (This->state) > + { > + case XmlWriterState_Initial: > + return E_UNEXPECTED; > + case XmlWriterState_DocClosed: > + return WR_E_INVALIDACTION; > + default: > + ; > + } What's wrong with explicit 'break;' instead of weird ';'? -- Dmitry.

1 0

Re: oleaut32: add OleLoadPictureFile stub (try 2)
by Dmitry Timoshkov 24 Mar '16

24 Mar '16

Austin English <austinenglish(a)gmail.com> wrote: > -422 stub OleLoadPictureFile > +422 stdcall OleLoadPictureFile(long ptr) ... > +HRESULT WINAPI OleLoadPictureFile(VARIANT file, LPDISPATCH *picture) > +{ > + FIXME("(%p),stub!\n", picture); > + return E_NOTIMPL; > +} Is passing VARIANT by value supposed to be represented like this in a .spec file? -- Dmitry.

2 1

Re: oleaut32: add OleLoadPictureFile stub
by Andrew Eikum 24 Mar '16

24 Mar '16

> + * OleLoadPictureFile (OLEAUT32.422) > + */ > +HRESULT WINAPI OleLoadPictureFile(VARIANT file, LPDISPATCH *picture) > +{ > + FIXME("(%p),stub!\n", picture); > + return ERROR_CALL_NOT_IMPLEMENTED; > +} > + > +/*********************************************************************** This should return an HRESULT, right? Probably E_NOTIMPL. Andrew

2 1

Re: [v2] d3d9: Add test for D3DFMT_L8 format as render target.
by Henri Verbeet 23 Mar '16

23 Mar '16

On 23 March 2016 at 17:17, Paul Gofman <gofmanp(a)gmail.com> wrote: > @@ -11295,10 +11296,10 @@ static void pixelshader_blending_test(void) > /* Quad with R=0x10, G=0x20 */ > quad1[] = > { > - {{-1.0f, -1.0f, 0.1f}, 0x80102000}, > - {{-1.0f, 1.0f, 0.1f}, 0x80102000}, > - {{ 1.0f, -1.0f, 0.1f}, 0x80102000}, > - {{ 1.0f, 1.0f, 0.1f}, 0x80102000}, > + {{-1.0f, -1.0f, 0.1f}, 0x80103000}, > + {{-1.0f, 1.0f, 0.1f}, 0x80103000}, > + {{ 1.0f, -1.0f, 0.1f}, 0x80103000}, > + {{ 1.0f, 1.0f, 0.1f}, 0x80103000}, > }, The patch looks fine at first sight, but you should probably either update the comment or just remove it.

1 0

XInput and HID - architecture
by Juan Jose Gonzalez 23 Mar '16

23 Mar '16

Hi, I got a bit stuck and would like to hear your opinion on the XInput HID backend, specifically on the mappings, i.e. the code that "accepts" a certain device based on its properties and then maps its buttons and axes to XInput buttons and axes. As long as the mappings are fixed, i.e. are not supposed to be extended or edited by the user, everything can be compiled into xinput1_3.dll. However, I would like to provide a "xinput.cpl" control panel node for xinput similar to "joy.cpl", where the user can not only test the XInput gamepads, but also manage the XInput-HID backend mappings. The first part can be accomplished by using xinput1_3.dll. However, in order to load and persist different mappings, the second part requires access to the functions that serialize and deserialize the mappings. It also needs some way of getting raw capabilities and changes in HID devices in order to be able to create new mappings. Here are some possible ways of solving it: * Extend xinput1_3.dll with the required management functions and add a "wine/xinput_hid_mgmt.h" or similar header that declares those methods. xinput.cpl could then simply use xinput1_3.dll to perform all management functions. I'm not sure if this would break anything due to the additional exports in the dll. * Extract the mapping load and store logic into a separate "xinputhid.dll" or similar. I this case both xinput1_3.dll and xinput.cpl would access this library to load and store mappings. * Move the xinput core and backends into a driver and let xinput1_3.dll access it via IOCTLs. I believe this is the way it works on windows, although there doesn't seem to be any freely available documentation regarding the internal architecture. The XInput-HID backend could then create its own kernel object as a management interface, which could be accessed by xinput.cpl. This would have the added effect of having a single instance managing the xinput devices if several programs are running at the same time, which mimics the behavior of windows. What do you think would be the best option? Is there another way I haven't mentioned? - Juan

6 24

Re: [PATCH 2/5] d3d11/tests: Add test for ClearRenderTargetView().
by Marvin 23 Mar '16

23 Mar '16

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=21619 Your paranoid android. === build (build) === Patch failed to apply

1 0

Re: [PATCH 1/5] d3d10core/tests: Add test for ClearRenderTargetView().
by Marvin 23 Mar '16

23 Mar '16

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=21618 Your paranoid android. === build (build) === Patch failed to apply

1 0

Re: [PATCH 4/4] xmllite/writer: Fix WriteEndElement()/WriteFullEndElement() on ready state
by Marvin 23 Mar '16

23 Mar '16

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=21608 Your paranoid android. === build (build) === Patch failed to apply

1 0

Re: [PATCH 3/4] xmllite/writer: Properly fail on initial state in WriteEndElement()
by Marvin 23 Mar '16

23 Mar '16

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=21607 Your paranoid android. === build (build) === Patch failed to apply

1 0

Re: [PATCH 2/4] xmllite/writer: Fix initial state handling in WriteEndDocument()
by Marvin 23 Mar '16

23 Mar '16

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=21606 Your paranoid android. === build (build) === Patch failed to apply

1 0

Re: [PATCH 1/4] xmllite/tests: A test for Write* behaviour on initial writer state
by Marvin 23 Mar '16

23 Mar '16

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=21605 Your paranoid android. === build (build) === Patch failed to apply

1 0

Re: [v2] bcrypt: Added BCryptHash function.
by Hans Leidekker 23 Mar '16

23 Mar '16

On Tue, 2016-03-22 at 07:50 -0700, Patrick Armstrong wrote: > +NTSTATUS WINAPI BCryptHash( BCRYPT_ALG_HANDLE algorithm, UCHAR *secret, ULONG secretlen, > + UCHAR *input, ULONG inputlen, UCHAR *output, ULONG outputlen ) > +{ > + NTSTATUS status; > + BCRYPT_HASH_HANDLE handle; > + > + TRACE( "%p, %p, %u, %p, %u, %p, %u\n", algorithm, secret, secretlen, > + input, inputlen, output, outputlen ); > + > + status = BCryptCreateHash( algorithm, &handle, NULL, 0, secret, secretlen, 0); > + if (status != STATUS_SUCCESS) > + { > + BCryptDestroyHash( handle ); > + return status; > + } BCryptCreateHash doesn't return a handle when it fails. > NTSTATUS WINAPI BCryptCloseAlgorithmProvider(BCRYPT_ALG_HANDLE, ULONG); > NTSTATUS WINAPI BCryptCreateHash(BCRYPT_ALG_HANDLE, BCRYPT_HASH_HANDLE *, PUCHAR, ULONG, PUCHAR, ULONG, ULONG); > NTSTATUS WINAPI BCryptDestroyHash(BCRYPT_HASH_HANDLE); > +NTSTATUS WINAPI BCryptHash(BCRYPT_ALG_HANDLE, PUCHAR, ULONG, PUCHAR, ULONG, PUCHAR, ULONG); > NTSTATUS WINAPI BCryptEnumAlgorithms(ULONG, ULONG *, BCRYPT_ALGORITHM_IDENTIFIER **, ULONG); > NTSTATUS WINAPI BCryptFinishHash(BCRYPT_HASH_HANDLE, PUCHAR, ULONG, ULONG); > NTSTATUS WINAPI BCryptGenRandom(BCRYPT_ALG_HANDLE, PUCHAR, ULONG, ULONG); While you're at it, please keep these sorted.

1 0

Re: [v5 2/8] d3dx9: Introduce preshaders in effect.
by Matteo Bruni 23 Mar '16

23 Mar '16

2016-03-21 14:55 GMT+01:00 Paul Gofman <gofmanp(a)gmail.com>: > Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> > @@ -5435,9 +5416,30 @@ static HRESULT d3dx9_parse_array_selector(struct d3dx9_base_effect *base, struct > } > TRACE("Unknown DWORD: 0x%.8x.\n", *(DWORD *)(ptr + string_size)); > > - FIXME("Parse preshader.\n"); > + d3dx_create_param_eval(base, (DWORD *)(ptr + string_size) + 1, object->size - (string_size + 1), > + D3DXPT_INT, &param->param_eval); Does this do the right thing if ptr + string_size is aligned to a DWORD? In other words, does the bytecode contain 4 bytes of padding if string_size % 4 == 0?

2 2

Re: mshtml: Fixed remaining xmlhttprequest test failures.
by Marvin 23 Mar '16

23 Mar '16

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=21603 Your paranoid android. === build (build) === Patch failed to apply

1 0

Re: [tools 2/2] Support for disabling and enabling warnings, handle warning number 2368
by Nikolay Sivov 23 Mar '16

23 Mar '16

On 20.03.2016 13:12, Bolotov Sergey wrote: > diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c > index 8b65ead..137bb2d 100644 > --- a/tools/widl/write_msft.c > +++ b/tools/widl/write_msft.c > @@ -51,6 +51,7 @@ > #include "header.h" > #include "hash.h" > #include "typetree.h" > +#include "parser.h" > > enum MSFT_segment_index { > MSFT_SEG_TYPEINFO = 0, /* type information */ > @@ -504,7 +505,7 @@ static int ctl2_alloc_guid( > offset = ctl2_find_guid(typelib, hash_key, &guid->guid); > if (offset != -1) > { > - if (pedantic) > + if (is_warning_enabled(2368)) > warning("duplicate uuid {%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}\n", > guid->guid.Data1, guid->guid.Data2, guid->guid.Data3, > guid->guid.Data4[0], guid->guid.Data4[1], guid->guid.Data4[2], guid->guid.Data4[3], > Duplicate UUID is not a warning 2368, it's an error 2270, I don't think you can suppress it, so we should really abort compilation at this point. Also if we're doing this, it looks cleaner to have is_warning..() check within warning(), so you can check there if it's enabled or not, and it's possible 'pedantic' should take precedence. Could you share a minimal idl you're using to test that?

2 3

Re: [v5 8/8] d3dx9: Implement setting named shader constants in effect.
by Matteo Bruni 22 Mar '16

22 Mar '16

2016-03-21 14:55 GMT+01:00 Paul Gofman <gofmanp(a)gmail.com>: > +HRESULT d3dx_set_shader_const_fxlc(struct ID3DXEffectImpl *effect, struct d3dx_pass *pass, > + struct d3dx_parameter *param, unsigned int vs) Using a BOOL for the vs flag seems nicer. > diff --git a/dlls/d3dx9_36/preshader.c b/dlls/d3dx9_36/preshader.c > index fec9de4..1770046 100644 > --- a/dlls/d3dx9_36/preshader.c > +++ b/dlls/d3dx9_36/preshader.c > @@ -242,7 +242,7 @@ static void regstore_set_values(struct d3dx_regstore *rs, unsigned int table, vo > static unsigned int regstore_is_val_set_reg(struct d3dx_regstore *rs, unsigned int table, unsigned int reg_idx) > { > return rs->table_value_set[table][reg_idx / PRES_BITMASK_BLOCK_SIZE] & > - (1ul << (reg_idx % PRES_BITMASK_BLOCK_SIZE)); > + (1u << (reg_idx % PRES_BITMASK_BLOCK_SIZE)); When you end up changing stuff introduced in a previous patch in the series you know there is something wrong ;) I guess it's a rebase glitch (by any chance, was this a remnant of a try with the uint_ptr idea you mentioned earlier?) > +HRESULT d3dx_param_eval_set_shader_constants(struct IDirect3DDevice9 *device, struct d3dx_param_eval *peval) > +{ > + HRESULT hr, res; > + struct d3dx_preshader *pres = &peval->pres; > + struct d3dx_regstore *rs = &pres->regs; > + > + TRACE("device %p, peval %p, param_type %u.\n", device, peval, peval->param_type); > + > + if (FAILED(hr = set_constants(rs, &pres->inputs))) > + return hr; > + if (FAILED(hr = execute_preshader(pres))) > + return hr; > + if (FAILED(hr = set_constants(rs, &peval->shader_inputs))) > + return hr; > + > + #define SET_TABLE(table, func_suff, type) \ > + { \ > + unsigned int is, n; \ > + \ > + is = 0; \ > + while (is < rs->table_sizes[table]) \ > + {\ > + n = 0; \ > + while (is < rs->table_sizes[table] && !regstore_is_val_set_reg(rs, table, is)) \ > + is++; \ > + while (is + n < rs->table_sizes[table] && regstore_is_val_set_reg(rs, table, is + n)) \ > + n++; \ > + if (!n) \ > + continue; \ > + TRACE("setting %u consts at %u.\n", n, is); \ > + hr = IDirect3DDevice9_##func_suff(device, is, \ > + (const type *)rs->tables[table] + is * table_info[table].reg_component_count, n); \ > + if (FAILED(hr)) \ > + { \ > + ERR(#func_suff " failed, hr %#x.\n", hr); \ > + res = hr; \ > + } \ > + is += n; \ > + } \ > + regstore_reset_table(rs, table); \ > + } > + res = D3D_OK; > + if (peval->param_type == D3DXPT_VERTEXSHADER) > + { > + SET_TABLE(PRES_REGTAB_OCONST, SetVertexShaderConstantF, float); > + SET_TABLE(PRES_REGTAB_OICONST, SetVertexShaderConstantI, int); > + SET_TABLE(PRES_REGTAB_OBCONST, SetVertexShaderConstantB, BOOL); > + } > + else if (peval->param_type == D3DXPT_PIXELSHADER) > + { > + SET_TABLE(PRES_REGTAB_OCONST, SetPixelShaderConstantF, float); > + SET_TABLE(PRES_REGTAB_OICONST, SetPixelShaderConstantI, int); > + SET_TABLE(PRES_REGTAB_OBCONST, SetPixelShaderConstantB, BOOL); > + } > + else > + { > + FIXME("Unexpected parameter type %u.\n", peval->param_type); > + return D3DERR_INVALIDCALL; > + } > + #undef SET_TABLE This is certainly hard to handle nicely because of the multiple similar d3d9 functions with slightly different signatures but I think it's better to avoid macros (especially such large ones) as much as possible. There are multiple ways to achieve that. Perhaps the easiest one is to turn SET_TABLE into a function taking an array of enum PRES_REG_TABLES (which, btw, should be lowercase) and the shader type as additional parameters, loop over the tables and call the correct d3d9 function by using two levels of switches (or ifs). The type isn't really necessary, you can calculate the offset with table_info[].component_size.

2 2

Re: [v5 1/8] d3dx9: Add test for preshader in effect.
by Matteo Bruni 22 Mar '16

22 Mar '16

2016-03-21 14:55 GMT+01:00 Paul Gofman <gofmanp(a)gmail.com>: > +struct test_struct > +{ > + float3 v1; > + float fv; > + float4 v2; > +}; > + > +test_struct ts1[1] = {{{9, 10, 11}, 12, {13, 14, 15, 16}}}; > +test_struct ts2[2] = {{{0, 0, 0}, 0, {0, 0, 0, 0}}, {{1, 2, 3}, 4, {5, 6, 7, 8}}}; Is it also possible to create a struct with an array field? And an array of those structs? > + static const struct > + { > + const char *comment; > + BOOL todo[4]; > + unsigned int result[4]; > + } > + test_effect_preshader_op_results[] = > + { > + {"1 / op", { TRUE, TRUE, TRUE, TRUE}, {0x7f800000, 0xff800000, 0xbee8ba2e, 0x00200000}}, > +#if __x86_64__ > + {"rsq", { TRUE, TRUE, TRUE, TRUE}, {0x7f800000, 0x7f800000, 0x3f2c985d, 0x1f800000}}, > +#else > + {"rsq", { TRUE, TRUE, TRUE, TRUE}, {0x7f800000, 0x7f800000, 0x3f2c985c, 0x1f800001}}, > +#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}}, > +#if __x86_64__ > + {"sin", {FALSE, TRUE, TRUE, TRUE}, {0x00000000, 0x80000000, 0xbf4ef99e, 0xbf0599b3}}, > + {"cos", { TRUE, TRUE, TRUE, TRUE}, {0x3f800000, 0x3f800000, 0xbf16a803, 0x3f5a5f96}}, > +#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}} > +#endif > + }; I don't like those #ifdefs much although apparently I don't have nicer suggestions.

2 2

Re: [v5 5/8] d3dx9: Implement fxlc constants (expressions) in effect.
by Matteo Bruni 22 Mar '16

22 Mar '16

2016-03-21 14:55 GMT+01:00 Paul Gofman <gofmanp(a)gmail.com>: > +static unsigned int regstore_is_val_set_reg(struct d3dx_regstore *rs, unsigned int table, unsigned int reg_idx) > +{ > + return rs->table_value_set[table][reg_idx / PRES_BITMASK_BLOCK_SIZE] & > + (1ul << (reg_idx % PRES_BITMASK_BLOCK_SIZE)); > +} Actually you don't want "ul" here, just "u". > +static void regstore_set_float(struct d3dx_regstore *rs, unsigned int table, unsigned int offset, float v) > +{ > + BYTE *p; > + unsigned int reg_idx; > + > + p = (BYTE *)rs->tables[table] + table_info[table].component_size * offset; > + switch (table_info[table].type) > + { > + case PRES_VT_FLOAT : *(float *)p = v; break; > + case PRES_VT_DOUBLE: *(double *)p = v; break; > + case PRES_VT_INT : *(int *)p = roundf(v); break; > + case PRES_VT_BOOL : *(BOOL *)p = !!v; break; > + } > + reg_idx = OFFSET2REG(table, offset); > + rs->table_value_set[table][reg_idx / PRES_BITMASK_BLOCK_SIZE] |= > + 1ul << (reg_idx % PRES_BITMASK_BLOCK_SIZE); Same here. > +static HRESULT set_constants_param(struct d3dx_regstore *rs, struct d3dx_const_tab *const_tab, > + D3DXHANDLE hc, struct d3dx_parameter *param) > +{ > + ID3DXConstantTable *ctab = const_tab->ctab; > + D3DXCONSTANT_DESC desc; > + unsigned int const_count, param_count, i, j, n, table, start_offset; > + unsigned int nminor, nmajor, major_stride, inp_ind; Nitpick, also rename nmajor/nminor to major_size or just major (resp. minor). inp_ind also feels like it has room for improvement, although I don't have any good suggestion. > +#define ARGS_ARRAY_SIZE 8 > +static HRESULT execute_preshader(struct d3dx_preshader *pres) > +{ > + unsigned int i, j, k; > + float args[ARGS_ARRAY_SIZE]; Doesn't this need to be double to preserve the precision of the immediate operands / literals? I guess that means the regstore should also be able to return doubles.

1 0

Re: [v5 3/8] d3dx9: Implement preshader parsing.
by Matteo Bruni 22 Mar '16

22 Mar '16

2016-03-21 14:55 GMT+01:00 Paul Gofman <gofmanp(a)gmail.com>: > Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> > +enum PRES_VALUE_TYPE Please use lowercase for type names. > +#define OFFSET2REG(table, offset) ((offset) / table_info[table].reg_component_count) I think this could be a function instead, that's usually preferred to macros when possible. Not sure about the name, maybe get_reg_offset(). > +static HRESULT regstore_alloc_table(struct d3dx_regstore *rs, unsigned int table) > +{ > + unsigned int sz; Nitpick, I would just spell out "size", it's pretty short anyway. > +static void regstore_set_values(struct d3dx_regstore *rs, unsigned int table, void *data, > + unsigned int start_offset, unsigned int count) > +{ > + unsigned int reg_idx; > + > + if (!count) > + return; > + > + memcpy((BYTE *)rs->tables[table] + start_offset * table_info[table].component_size, > + data, count * table_info[table].component_size); > + for (reg_idx = OFFSET2REG(table, start_offset); reg_idx <= OFFSET2REG(table, start_offset + count - 1); > + ++reg_idx) > + rs->table_value_set[table][reg_idx / PRES_BITMASK_BLOCK_SIZE] |= > + 1u << (reg_idx % PRES_BITMASK_BLOCK_SIZE); This might be optimized, enabling each bit one by one doesn't seem very efficient. > +} > + > +static void dump_bytecode(void *data, unsigned int size) > +{ > + unsigned int *bytecode = (unsigned int *)data; > + unsigned int i, j, n; > + > + size /= 4; Nitpick, sizeof(*bytecode).

1 0

Re: [v4 2/6] d3dx9: add preshaders to effect.
by Matteo Bruni 22 Mar '16

22 Mar '16

2016-03-17 12:59 GMT+01:00 Paul Gofman <gofmanp(a)gmail.com>: > +enum PRES_REG_TABLES > +{ > + PRES_REGTAB_NONE, > + PRES_REGTAB_IMMED, /* immediate double constants from CLIT */ > + PRES_REGTAB_CONST, > + PRES_REGTAB_VERTEX, /* not used */ > + PRES_REGTAB_OCONST, > + PRES_REGTAB_OBCONST, > + PRES_REGTAB_OICONST, > + PRES_REGTAB_REG, > + PRES_REGTAB_MAX, > + PRES_REGTAB_FIRST = PRES_REGTAB_IMMED, > + PRES_REGTAB_LAST = PRES_REGTAB_REG, > +}; You can drop PRES_REGTAB_NONE unless it's going to be used. > +++ b/dlls/d3dx9_36/preshader.c > @@ -0,0 +1,627 @@ > +/* > + * FX preshader parsing & execution, setting shader constants > + * from effect parameters. > + * It looks like that kind of general file description is omitted in newer source files. Maybe drop it? I don't particularly care though. > + /* TODO: use double precision for x64 arch */ > + {sizeof(float), 4, PRES_VT_FLOAT } /* PRES_REGTAB_REG */ Nitpick, just mention "64 bit" or something, we don't want to make all the non-Intel archs angry ;) > +#define PRES_VS_BITS_PER_WORD (sizeof(unsigned int) * 8) What does the _VS_ part of the name mean? I'm also a bit thrown off by the _WORD part, mostly because in Win32 WORD is a 16 bit while DWORD is 32 bit and unsigned int is also 32 bit. Maybe it's just me, I don't know. > +static void dump_shader_bytecode(void *data, unsigned int size) > +{ > + unsigned int *words = (unsigned int *)data; Same here. I guess you could call it "bytecode" or such. > +static unsigned int *find_bytecode_comment(unsigned int *ptr, unsigned int fourcc) > +{ > + while ((*ptr & 0xFFFF) == 0xFFFE) A couple leftover uppercase hexadecimal constants. > + hr = D3DXGetShaderConstantTable(byte_code, &ctab); > + if (FAILED(hr) || !ctab) > + { > + TRACE("Could not get CTAB data, hr %#x.\n", hr); > + /* returning OK is not a typo */ > + return D3D_OK; > + } Sorry, back to that comment again. I guess it would be better to spell out why that's the intended return value instead (e.g. "Not returning an error, shaders without a CTAB are valid."). > +static void dump_arg(struct d3dx_regstore *rs, struct d3dx_pres_operand *arg, int component_count) > +{ > + static const char *xyzw_str = "xyzw"; > + unsigned int i, table; > + > + table = arg->table; > + if (table == PRES_REGTAB_IMMED) > + { > + TRACE("("); > + for (i = 0; i < component_count; ++i) > + TRACE(i < component_count - 1 ? "%lf, " : "%lf", > + ((double *)rs->tables[PRES_REGTAB_IMMED])[arg->offset + i]); %lf is not right, %f already expects a double. I'd just use %.16e (which has the added benefit of showing something different from 0 in the "precision" test from the previous patch). Another option would be to use the same format used by MS when disassembling shaders, although this seems to be a case where it's worth diverging. > +static void dump_ins(struct d3dx_regstore *rs, struct d3dx_pres_ins *ins) > +{ > + unsigned int i; > + > + TRACE(" %s ", pres_op_info[ins->op].mnem); > + dump_arg(rs, &ins->output, pres_op_info[ins->op].func_all_comps ? 1 : ins->component_count); > + for (i = 0; i < pres_op_info[ins->op].input_count; ++i) > + { > + TRACE(","); With a blank after the comma it would be prettier. There is still some inconsistent formatting (e.g. "== NULL" vs "!", uppercase hexadecimals, cnt vs count). A possible idea to split this patch further: what if you move the addition of (most of) the contents of the various functions in preshader.c to a separate patch? That is, make a patch which adds the various calls to d3dx_create_param_eval(), d3dx_free_param_eval() and similar (i.e. most if not all the changes to effect.c) but only introduces a skeleton implementation of those functions in preshader.c. Those are actually fleshed out only in the next patch. Many of the new preshader-related definitions can probably also go into the second patch. The traces of the disassembled preshader can also potentially go to a separate patch (leaving only dump_shader_bytecode() in the initial implementation - btw, I think it should be called dump_preshader_bytecode() given the renaming of the other stuff).

2 2

Re: [tools 1/2] Handle "midl_pragma warning" statement in parser
by Nikolay Sivov 22 Mar '16

22 Mar '16

On 20.03.2016 13:11, Bolotov Sergey wrote: > Signed-off-by: Bolotov Sergey <bolotov.s.s(a)yandex.ru> > --- > tools/widl/parser.h | 2 ++ > tools/widl/parser.l | 25 +++++++++++++++++++++++++ > tools/widl/parser.y | 38 +++++++++++++++++++++++++++++++++++++- > tools/widl/widltypes.h | 7 +++++++ > 4 files changed, 71 insertions(+), 1 deletion(-) > > diff --git a/tools/widl/parser.h b/tools/widl/parser.h > index 1bcc3c1..c15d874 100644 > --- a/tools/widl/parser.h > +++ b/tools/widl/parser.h > @@ -45,6 +45,8 @@ void pop_import(void); > > int is_type(const char *name); > > +int do_warning(char *toggle, warning_list_t *wnum); > + > extern char *temp_name; > > #endif > diff --git a/tools/widl/parser.l b/tools/widl/parser.l > index 5c2dcab..65e0f45 100644 > --- a/tools/widl/parser.l > +++ b/tools/widl/parser.l > @@ -164,6 +164,7 @@ UUID *parse_uuid(const char *u) > yy_pop_state(); > } > <PP_PRAGMA>[^\n]* parser_lval.str = xstrdup(yytext); yy_pop_state(); return aPRAGMA; > +<INITIAL>^{ws}*"midl_pragma warning" return tPRAGMA_WARNING; > <INITIAL,ATTR>\" yy_push_state(QUOTE); cbufidx = 0; > <QUOTE>\" { This is wrong, any number of spaces is allowed before 'warning'. > yy_pop_state(); > @@ -555,3 +556,27 @@ void abort_import(void) > for (ptr=0; ptr<import_stack_ptr; ptr++) > unlink(import_stack[ptr].temp_name); > } > + > +static void warning_disable(int warning) > +{ > + printf("disable %d\n", warning); > +} > + > +static void warning_enable(int warning) > +{ > + printf("enable %d\n", warning); > +} > + > +int do_warning(char *toggle, warning_list_t *wnum) > +{ > + warning_t *warning; > + if(!strcmp(toggle, "disable")) > + LIST_FOR_EACH_ENTRY(warning, wnum, warning_t, entry) > + warning_disable(warning->num); > + else if(!strcmp(toggle, "enable")) > + LIST_FOR_EACH_ENTRY(warning, wnum, warning_t, entry) > + warning_enable(warning->num); > + else > + return 0; > + return 1; > +} You remove this in next patch, I think it'd be enough to add parser support first, so widl does not fail on such construct, and add handling as 2/2. Why do you need this in a first place? Is it to process some third party idls?

1 0

Re: [PATCH 1/6] ddraw/tests: Rewrite blt_test().
by Marvin 22 Mar '16

22 Mar '16

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=21588 Your paranoid android. === w1064 (32 bit ddraw2) === ddraw2.c:2360: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}. === w1064 (64 bit ddraw2) === ddraw2.c:2360: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}. === w1064 (32 bit ddraw1) === ddraw1.c:2209: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}. === w1064 (64 bit ddraw1) === ddraw1.c:2209: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}. === w8 (32 bit visual) === visual.c:1387: Test failed: unexpected colortable on offscreen surface === w864 (32 bit visual) === visual.c:1387: Test failed: unexpected colortable on offscreen surface === w1064 (32 bit visual) === visual.c:307: Test failed: Clear rectangle 3(pos, neg) has color 0000ff00 visual.c:309: Test failed: Clear rectangle 1(pos, pos) has color 0000ff00 visual.c:311: Test failed: Clear rectangle 4(NULL) has color 0000ff00 visual.c:313: Test failed: Clear rectangle 4(neg, neg) has color 0000ff00 visual.c:1387: Test failed: unexpected colortable on offscreen surface === w1064 (32 bit ddraw7) === ddraw7.c:2275: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}. === w1064 (64 bit ddraw7) === ddraw7.c:2275: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}. === w1064 (32 bit ddraw4) === ddraw4.c:2545: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}. === w1064 (64 bit ddraw4) === ddraw4.c:2545: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}.

1 0

Student interested in GSoC 2016 implementing D3DX9 API idea
by Xu Zhao 22 Mar '16

22 Mar '16

Hello Wine Community, First congrats that Wine Project get accepted into GSoC 2016 summer organization! I am currently a PhD student in University of Toronto and I am interested in the D3DX9 API implementation task. Mainly because I would like to see more games can run in wine because of my work! My research field is operating system so I am a pretty good C/CPP programmer. However I am not very familiar with DirectX related programming and hopefully I can get some help from the community, like where to start. I have read the wiki entry of D3DX9 API and want to get some help in selecting a reasonable sized API list, maybe someone can reply and provide some help? Thank you! Regards, - Xu -- Xu Zhao i(a)xuzhao.net

2 2

Server Downtime 2016-03-16 19:00 CDT
by Jeremy Newman 22 Mar '16

22 Mar '16

WineHQ.org and all related websites will be offline for maintenance and upgrades on 2016-03-16 starting at 19:00 CDT. This downtime should last 1-2 hours. Some websites may remain offline longer if they need additional work. I'll reply to this post when everything looks to be back online. -N

4 6

Re: [PATCH 2/6] ddraw/tests: Get rid of the unused "d3d" variable in test_shademode().
by Marvin 22 Mar '16

22 Mar '16

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=21589 Your paranoid android. === w1064 (32 bit ddraw1) === ddraw1.c:2209: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}. === w1064 (64 bit ddraw1) === ddraw1.c:2209: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}. === w1064 (32 bit ddraw2) === ddraw2.c:2360: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}. === w1064 (64 bit ddraw2) === ddraw2.c:2360: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}.

1 0

Re: [PATCH] vulkan-icd: Add stub dll.
by Roderick Colenbrander 22 Mar '16

22 Mar '16

Hi Gabríel, Thanks for your patch. Depending on the direction where you intend to take this, I'm not sure if we need this dll. Note I haven't done much with Vulkan myself yet, but following the analogy of opengl32, the ICD portion should be inside winex11.drv (and our other drivers). It is what should export this function call ultimately and similar needs to host the x11 related vulkan code, which has to live in here as well, because such code is not supposed to live outside winex11.drv. Thanks, Roderick On Mon, Mar 21, 2016 at 8:26 PM, Gabríel Arthúr Pétursson <gabriel(a)system.is> wrote: > Signed-off-by: Gabríel Arthúr Pétursson <gabriel(a)system.is> > --- > configure.ac | 1 + > dlls/vulkan-icd/Makefile.in | 2 ++ > dlls/vulkan-icd/vulkan-icd.spec | 1 + > 3 files changed, 4 insertions(+) > create mode 100644 dlls/vulkan-icd/Makefile.in > create mode 100644 dlls/vulkan-icd/vulkan-icd.spec > > diff --git a/configure.ac b/configure.ac > index 77c54c8..04ddb54 100644 > --- a/configure.ac > +++ b/configure.ac > @@ -3310,6 +3310,7 @@ WINE_CONFIG_DLL(vnbt.vxd,enable_win16) > WINE_CONFIG_DLL(vnetbios.vxd,enable_win16) > WINE_CONFIG_DLL(vssapi) > WINE_CONFIG_DLL(vtdapi.vxd,enable_win16) > +WINE_CONFIG_DLL(vulkan-icd,,[implib]) > WINE_CONFIG_DLL(vwin32.vxd,enable_win16) > WINE_CONFIG_DLL(w32skrnl,enable_win16) > WINE_CONFIG_DLL(w32sys.dll16,enable_win16) > diff --git a/dlls/vulkan-icd/Makefile.in b/dlls/vulkan-icd/Makefile.in > new file mode 100644 > index 0000000..c41bf8f > --- /dev/null > +++ b/dlls/vulkan-icd/Makefile.in > @@ -0,0 +1,2 @@ > +MODULE = vulkan-icd.dll > +IMPORTLIB = vulkan-icd > diff --git a/dlls/vulkan-icd/vulkan-icd.spec b/dlls/vulkan-icd/vulkan-icd.spec > new file mode 100644 > index 0000000..db3616e > --- /dev/null > +++ b/dlls/vulkan-icd/vulkan-icd.spec > @@ -0,0 +1 @@ > +@ stub vk_icdGetInstanceProcAddr > -- > 2.7.0 > > >

2 3

Re: services: Make release_process() static.
by Sebastian Lackner 22 Mar '16

22 Mar '16

On 22.03.2016 11:26, Francois Gouget wrote: > Signed-off-by: Francois Gouget <fgouget(a)free.fr> > --- > programs/services/services.c | 12 ++++++------ > programs/services/services.h | 1 - > 2 files changed, 6 insertions(+), 7 deletions(-) > I do not mind if this patch is accepted, but follow patches would have to undo this change again. We also need the function from other services files.

1 0

Re: [PATCH 2/2] ddraw/tests: Use SetRect() instead of open coding it.
by Marvin 22 Mar '16

22 Mar '16

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=21571 Your paranoid android. === w864 (32 bit d3d) === d3d.c:2311: Test failed: Unexpected destination texture level pixels; 2031 differences at 0 level d3d.c:2311: Test failed: Unexpected destination texture level pixels; 518 differences at 1 level d3d.c:2311: Test failed: Unexpected destination texture level pixels; 138 differences at 2 level d3d.c:2311: Test failed: Unexpected destination texture level pixels; 46 differences at 3 level d3d.c:2492: Test failed: Unexpected destination texture level pixels; 257 differences d3d.c:2636: Test failed: Unexpected destination texture level pixels; 256 differences at 2 level d3d.c:2636: Test failed: Unexpected destination texture level pixels; 64 differences at 3 level d3d.c:2636: Test failed: Unexpected destination texture level pixels; 16 differences at 4 level d3d.c:2636: Test failed: Unexpected destination texture level pixels; 4 differences at 5 level === w1064 (32 bit d3d) === d3d.c:2311: Test failed: Unexpected destination texture level pixels; 2031 differences at 0 level d3d.c:2311: Test failed: Unexpected destination texture level pixels; 518 differences at 1 level d3d.c:2311: Test failed: Unexpected destination texture level pixels; 138 differences at 2 level d3d.c:2311: Test failed: Unexpected destination texture level pixels; 46 differences at 3 level d3d.c:2492: Test failed: Unexpected destination texture level pixels; 257 differences d3d.c:2636: Test failed: Unexpected destination texture level pixels; 256 differences at 2 level d3d.c:2636: Test failed: Unexpected destination texture level pixels; 64 differences at 3 level d3d.c:2636: Test failed: Unexpected destination texture level pixels; 16 differences at 4 level d3d.c:2636: Test failed: Unexpected destination texture level pixels; 4 differences at 5 level === w8 (32 bit visual) === visual.c:1478: Test failed: unexpected colortable on offscreen surface === w864 (32 bit visual) === visual.c:307: Test failed: Clear rectangle 3(pos, neg) has color 0000ff00 visual.c:309: Test failed: Clear rectangle 1(pos, pos) has color 0000ff00 visual.c:311: Test failed: Clear rectangle 4(NULL) has color 0000ff00 visual.c:313: Test failed: Clear rectangle 4(neg, neg) has color 0000ff00 visual.c:1478: Test failed: unexpected colortable on offscreen surface === w1064 (32 bit visual) === visual.c:307: Test failed: Clear rectangle 3(pos, neg) has color 0000ff00 visual.c:309: Test failed: Clear rectangle 1(pos, pos) has color 0000ff00 visual.c:311: Test failed: Clear rectangle 4(NULL) has color 0000ff00 visual.c:313: Test failed: Clear rectangle 4(neg, neg) has color 0000ff00 visual.c:1478: Test failed: unexpected colortable on offscreen surface

2 1

Failing mshtml:xmlhttprequest test
by Francois Gouget 22 Mar '16

22 Mar '16

Since the WineHQ.org upgrade the mshtml:xmlhttprequest test has been failing on all platforms: xmlhttprequest.c:448: Test failed: Expect Server: Apache, got L"Apache/2.4.10 (Debian)" Due to: 583 static const struct HEADER_TYPE expect_headers[] = { 584 {"Server", "Apache"}, 585 {"Accept-Ranges", "bytes"}, Fixing the failure is easy, but maybe the test should be more flexible? It could be annoying to have to upgrade it with each minor server upgrade. -- Francois Gouget <fgouget(a)free.fr> http://fgouget.free.fr/ Theory is where you know everything but nothing works. Practice is where everything works but nobody knows why. Sometimes they go hand in hand: nothing works and nobody knows why.

2 1

Re: [PATCH 1/2] ddraw/tests: Fix copy&paste errors in open coded SetRect()
by Marvin 22 Mar '16

22 Mar '16

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=21570 Your paranoid android. === w8 (32 bit visual) === visual.c:1486: Test failed: unexpected colortable on offscreen surface === w864 (32 bit visual) === visual.c:307: Test failed: Clear rectangle 3(pos, neg) has color 0000ff00 visual.c:309: Test failed: Clear rectangle 1(pos, pos) has color 0000ff00 visual.c:311: Test failed: Clear rectangle 4(NULL) has color 0000ff00 visual.c:313: Test failed: Clear rectangle 4(neg, neg) has color 0000ff00 visual.c:1486: Test failed: unexpected colortable on offscreen surface === w1064 (32 bit visual) === visual.c:307: Test failed: Clear rectangle 3(pos, neg) has color 0000ff00 visual.c:309: Test failed: Clear rectangle 1(pos, pos) has color 0000ff00 visual.c:311: Test failed: Clear rectangle 4(NULL) has color 0000ff00 visual.c:313: Test failed: Clear rectangle 4(neg, neg) has color 0000ff00 visual.c:1486: Test failed: unexpected colortable on offscreen surface

2 1

Re: [PATCH] msctf/tests: Fix a crash on unsupported interface
by Marvin 22 Mar '16

22 Mar '16

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=21569 Your paranoid android. === w864 (32 bit inputprocessor) === inputprocessor.c:787: Test failed: Deactivation came unexpectedly === w1064 (64 bit inputprocessor) === inputprocessor.c:787: Test failed: Deactivation came unexpectedly

1 0

Re: [PATCH 2/2] msctf: Added stub ITextStoreACPServices support for context ITextStoreACPSink
by Marvin 22 Mar '16

22 Mar '16

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=21563 Your paranoid android. === w864 (32 bit inputprocessor) === inputprocessor.c:793: Test failed: Deactivation came unexpectedly

2 1

Re: [PATCH 1/2] d3drm: Move struct d3drm_texture to header for global access.
by Henri Verbeet 21 Mar '16

21 Mar '16

On 20 March 2016 at 19:24, Aaryaman Vasishta <jem456.vasishta(a)gmail.com> wrote: > @@ -1038,12 +1029,11 @@ static const struct IDirect3DRMTexture3Vtbl d3drm_texture3_vtbl = > d3drm_texture3_SetValidationCallback, > }; > > -HRESULT Direct3DRMTexture_create(REFIID riid, IUnknown **out) > +HRESULT d3drm_texture_create(struct d3drm_texture **texture) > { > struct d3drm_texture *object; > - HRESULT hr; > > - TRACE("riid %s, out %p.\n", debugstr_guid(riid), out); > + TRACE("out %p.\n", texture); You'll also want to fix the TRACE message here.

2 1

Re: [PATCH] include: Use fixed stack size for rbtree.
by Henri Verbeet 21 Mar '16

21 Mar '16

On 20 March 2016 at 21:05, Gabríel Arthúr Pétursson <gabriel(a)system.is> wrote: > struct wine_rb_stack > { > - struct wine_rb_entry ***entries; > size_t count; > - size_t size; > + struct wine_rb_entry **entries[2 * sizeof(void *) * 8]; > }; Why do you think this is a good idea?

4 12

Re: shell32: Don't return argified string in FindExecutable
by Alexandre Julliard 21 Mar '16

21 Mar '16

André Hentschel <nerv(a)dawncrow.de> writes: > @@ -698,10 +698,15 @@ static UINT SHELL_FindExecutable(LPCWSTR lpPath, LPCWSTR lpFile, LPCWSTR lpVerb, > > if (retval > 32) > { > - DWORD finishedLen; > - SHELL_ArgifyW(lpResult, resultLen, command, xlpFile, pidl, args, &finishedLen); > - if (finishedLen > resultLen) > - ERR("Argify buffer not large enough.. truncated\n"); > + if (exec_only) > + lstrcpynW(lpResult, command, resultLen); > + else > + { > + DWORD finishedLen; > + SHELL_ArgifyW(lpResult, resultLen, command, xlpFile, pidl, args, &finishedLen); > + if (finishedLen > resultLen) > + ERR("Argify buffer not large enough.. truncated\n"); > + } That's not much of an improvement, and I don't see why it should be limited to FindExecutable. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: bcrypt: Added BCryptHash function.
by Hans Leidekker 21 Mar '16

21 Mar '16

On Fri, 2016-03-18 at 09:26 -0700, Patrick Armstrong wrote: > +NTSTATUS WINAPI BCryptHash( BCRYPT_ALG_HANDLE algorithm, UCHAR *secret, ULONG secretlen, > + UCHAR *input, ULONG inputlen, UCHAR *output, ULONG outputlen ) > +{ > + NTSTATUS status; > + BCRYPT_ALG_HANDLE handle; This should be BCRYPT_HASH_HANDLE. > + TRACE( "%p, %p, %u, %p, %u, %p, %u\n", algorithm, secret, secretlen, > + input, inputlen, output, outputlen ); > + > + status = BCryptCreateHash( algorithm, &handle, NULL, 0, secret, secretlen, 0); > + if (status != STATUS_SUCCESS) > + { > + goto cleanup_bcrypt_hash; > + } There's no need for cleanup here. > + status = BCryptHashData( handle, input, inputlen, 0 ); > + if (status != STATUS_SUCCESS) > + { > + goto cleanup_bcrypt_hash; > + } >+ > + status = BCryptFinishHash( handle, output, outputlen, 0 ); > + if (status != STATUS_SUCCESS) > + { > + goto cleanup_bcrypt_hash; > + } > + > + return BCryptDestroyHash( handle ); > + > +cleanup_bcrypt_hash: > + > + BCryptDestroyHash( handle ); > + > + return status; > +} I don't think this goto is better than repeated BCryptDestroyHash calls.

1 0

Re: [v4 3/6] d3dx9: implement fxlc constants (expressions) in effect.
by Matteo Bruni 21 Mar '16

21 Mar '16

2016-03-17 12:59 GMT+01:00 Paul Gofman <gofmanp(a)gmail.com>: > @@ -2616,7 +2630,7 @@ static void d3dx9_set_material_parameter(enum MATERIAL_TYPE op, D3DMATERIAL9 *ma > D3DCOLORVALUE c = *(D3DCOLORVALUE *)value; > > TRACE("%s, value (%f %f %f %f).\n", material_tbl[op].name, c.r, c.g, c.b, c.a); > - *(D3DCOLORVALUE *)((char *)material + material_tbl[op].offset) = c; > + *(D3DCOLORVALUE *)((BYTE *)material + material_tbl[op].offset) = c; > break; > } > default: While you're at it, you could change the format strings to use %.8e for the float values. > +static void regstore_reset_table(struct d3dx_regstore *rs, unsigned int table) > +{ > + unsigned int sz; > + > + sz = rs->table_sizes[table] * table_info[table].reg_component_count * table_info[table].component_size; > + > + memset(rs->tables[table], 0, sz); > + memset(rs->table_value_set[table], 0, > + sizeof(*rs->table_value_set[table]) * > + ((rs->table_sizes[table] + PRES_VS_BITS_PER_WORD - 1) / PRES_VS_BITS_PER_WORD)); > +} This function is unused and the compiler should throw a warning about it. > + rs->table_value_set[table][reg_idx / PRES_VS_BITS_PER_WORD] |= > + 1 << (reg_idx % PRES_VS_BITS_PER_WORD); That should be "1u", otherwise here shifting by 31 is technically undefined behavior and there are some compilers that complain about it. The line continuation is also misindented. > + while (param->member_count && param->element_count) > + { > + if (param->element_count > 1) > + { > + FIXME("Unexpected param having both elements and members.\n"); > + return D3DERR_INVALIDCALL; > + } > + param = &param->members[0]; > + } I don't quite understand what you're trying to do here but it doesn't look right. > + TRACE("%s rows %u, par columns %u, par class %u, par flags %u, par bytes %u, c rows %u," \ > + "c columns %u, c class %u, c bytes %u, transpose %u.\n", > + desc.Name, param->rows, param->columns, param->class, param->flags, param->bytes, > + desc.Rows, desc.Columns, desc.Class, desc.Bytes, transpose); I would make two separate TRACEs for parameter and constant info. Also the string comes from the application so you should use debugstr_a(). Something like: TRACE("Constant %s rows %u, columns %u, class %u, bytes %u.\n", debugstr_a(desc.Name), desc.Rows, desc.Columns, desc.Class, desc.Bytes); TRACE("Parameter rows %u, columns %u, class %u, flags %#x, bytes %u, transpose %#x.\n", param->rows, param->columns, param->class, param->flags, param->bytes, transpose); Gmail will probably mangle the code but you get the point.

2 2

Wine fonts
by Jens Reyer 21 Mar '16

21 Mar '16

Hi, I'm currently working on the correct Debian packaging of the fonts. Afaik vanilla wine installs the following ttf-fonts: marlett.ttf symbol.ttf tahomabd.ttf tahoma.ttf wingding.ttf I realize that these are indeed necessary for the fon-fonts to display correctly. However in the source there are additionally the following ttf: courier.ttf fixedsys_jp.ttf fixedsys.ttf ms_sans_serif.ttf small_fonts_jp.ttf small_fonts.ttf system.ttf Shouldn't these be installed, too? I haven't noted any difference, but that could be because I don't know how to test this. Can anybody with more knowledge enlighten me? Thanks in advance! jre

2 1

Re: winscard: add stubs for SCardListReadersA/W (try 4)
by Nikolay Sivov 21 Mar '16

21 Mar '16

Spec file needs fixing too.

1 0

Re: winscard: add stubs for SCardListReadersA/W (try 3)
by Nikolay Sivov 21 Mar '16

21 Mar '16

> +LONG WINAPI SCardListReadersA(SCARDCONTEXT context, const CHAR *groups, char *readers, DWORD *buflen) > +{ > + FIXME("(%lx, %s, %s, %p) stub\n", context, debugstr_a(groups), debugstr_a(readers), buflen); > + return SCARD_F_INTERNAL_ERROR; > +} > + > +LONG WINAPI SCardListReadersW(SCARDCONTEXT context, const WCHAR *groups, WCHAR *readers, DWORD *buflen) > +{ > + FIXME("(%lx, %s, %s, %p) stub\n", context, debugstr_w(groups), debugstr_w(readers), buflen); > + return SCARD_F_INTERNAL_ERROR; > +} 'readers' is an out buffer.

1 0

Re: [PATCH v2 2/6] wined3d: Implement copying of buffer resources.
by Henri Verbeet 20 Mar '16

20 Mar '16

On 20 March 2016 at 23:15, Józef Kucia <jkucia(a)codeweavers.com> wrote: > + buffer_get_memory(dst_buffer, context, &dst_bo_address); > + buffer_get_memory(src_buffer, context, &src_bo_address); > + > + dst_buffer_mem = dst_buffer->resource.heap_memory; > + src_buffer_mem = src_buffer->resource.heap_memory; > + > + if (!dst_buffer_mem && !src_buffer_mem) > + { The way struct wined3d_bo_address works is that if the "buffer_object" field is non-zero, the "addr" field is relative to the start of the corresponding buffer object, and otherwise it's relative to the start of system memory. I.e., the correct check here should be for src_bo_address.buffer_object and dst_bo_address.buffer_object being non-zero, and you should be able to use src_bo_address.addr and dst_bo_address.addr instead of src_buffer_mem and dst_buffer_mem in most other places. > + if (gl_info->supported[ARB_COPY_BUFFER]) > + { > + GL_EXTCALL(glBindBuffer(GL_COPY_READ_BUFFER, src_bo_address.buffer_object)); > + GL_EXTCALL(glBindBuffer(GL_COPY_WRITE_BUFFER, dst_bo_address.buffer_object)); > + GL_EXTCALL(glCopyBufferSubData(GL_COPY_READ_BUFFER, GL_COPY_WRITE_BUFFER, src_offset, dst_offset, size)); The "addr" field is always going to be NULL in practice for buffer resources, but strictly speaking you should use something like "(INT_PTR)src_bo_address.add + src_offset" instead of just "src_offset" here.

2 1

prelink
by version2013＠openmailbox.org 20 Mar '16

20 Mar '16

According to [1], prelink is no longer needed. When I configure wine-1.9.6, I get the warning message, "configure: WARNING: prelink not found and linker does not support relocation, base address of core dlls won't be set correctly." [1] http://oldwiki.winehq.org/Prelink

4 3

Re: [PATCH 1/2] d3drm: Move struct d3drm_texture to header for global access.
by Józef Kucia 20 Mar '16

20 Mar '16

On Sun, Mar 20, 2016 at 7:24 PM, Aaryaman Vasishta <jem456.vasishta(a)gmail.com> wrote: > CloseHandle(file); > - > - hr = Direct3DRMTexture_create(&IID_IDirect3DRMTexture3, (IUnknown**)&This->materials[i].texture); > + struct d3drm_texture *texture_object; > + hr = d3drm_texture_create(&texture_object); > if (FAILED(hr)) Put the "texture_object" declaration at the beginning of the block or the function. Mixed declarations and code is C99 feature and is not allowed in Wine. Also, "if (FAILED(hr = d3drm_texture_create(&texture_object)))" would be preferred.

1 0

Re: [2/3] shell32/tests: Move a file URL test to test_fileurl().
by Marvin 20 Mar '16

20 Mar '16

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=21531 Your paranoid android. === wvistau64 (32 bit shlexec) === shlexec.c:1690: Test failed: ShellExecute(verb="", file="C:\Users\winetest\AppData\Local\Temp\wtD670.tmp\masked file.shlexec") WaitForSingleObject returned 258 shlexec.c:1698: Test failed: ShellExecute(verb="", file=""C:\Users\winetest\AppData\Local\Temp\wtD670.tmp\masked file.shlexec"") ShlexecVar expected 'Present', but key not found or empty shlexec.c:1712: Test failed: ShellExecute(file=""C:\Users\winetest\AppData\Local\Temp\wtD670.tmp\masked file.shlexec"") argvA3 expected 'Open', but key not found or empty shlexec.c:1714: Test failed: ShellExecute(file=""C:\Users\winetest\AppData\Local\Temp\wtD670.tmp\masked file.shlexec"") argvA4 expected 'C:\Users\winetest\AppData\Local\Temp\wtD670.tmp\masked file.shlexec', but key not found or empty shlexec.c:1723: Test failed: ShellExecute(verb="LowerL", file="C:\Users\winetest\AppData\Local\Temp\wtD670.tmp\test file.shlexec") WaitForSingleObject returned 258 shlexec.c:1772: Test failed: ShellExecute(file=""C:\Users\winetest\AppData\Local\Temp\wtD670.tmp\test file.shlexec"") argcA expected 5, but got 6 shlexec.c:1773: Test failed: ShellExecute(file=""C:\Users\winetest\AppData\Local\Temp\wtD670.tmp\test file.shlexec"") argvA3 expected 'Open', got 'UpperL' shlexec.c:1775: Test failed: ShellExecute(file=""C:\Users\winetest\AppData\Local\Temp\wtD670.tmp\test file.shlexec"") argvA4 expected 'C:\Users\winetest\AppData\Local\Temp\wtD670.tmp\test file.shlexec', got 'C:\Users\winetest\AppData\Local\Temp\wtD670.tmp\test' shlexec.c:2466: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wtD670.tmp\test file.sde") Assoc class="shlexec.sde", verb="Open", rawcmd="0", cmdtail="", ddeexec="[open("%1")]", app="shlexec", topic="dde" ShlexecVar expected 'Present', but key not found or empty shlexec.c:2483: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wtD670.tmp\test file.sde") Assoc class="shlexec.sde", verb="Open", rawcmd="0", cmdtail="", ddeexec="[open("%1")]", app="shlexec", topic="dde" failed: rc=2 err=2 shlexec.c:2466: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wtD670.tmp\test file.sde") Assoc class="shlexec.sde", verb="Open", rawcmd="0", cmdtail=""%1"", ddeexec="[open("%1")]", app="shlexec", topic="dde" ShlexecVar expected 'Present', but key not found or empty shlexec.c:2483: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wtD670.tmp\test file.sde") Assoc class="shlexec.sde", verb="Open", rawcmd="0", cmdtail=""%1"", ddeexec="[open("%1")]", app="shlexec", topic="dde" failed: rc=2 err=2 shlexec.c:2466: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wtD670.tmp\test file.sde") Assoc class="shlexec.sde", verb="Open", rawcmd="0", cmdtail="%1", ddeexec="[open(%1)]", app="shlexec", topic="dde" ShlexecVar expected 'Present', but key not found or empty shlexec.c:2483: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wtD670.tmp\test file.sde") Assoc class="shlexec.sde", verb="Open", rawcmd="0", cmdtail="%1", ddeexec="[open(%1)]", app="shlexec", topic="dde" failed: rc=2 err=2 shlexec.c:2466: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wtD670.tmp\test file.sde") Assoc class="shlexec.sde", verb="Open", rawcmd="0", cmdtail="", ddeexec="[open("%1")]", app="shlexec", topic="dde", ifexec="[ifexec("%1")]" ShlexecVar expected 'Present', but key not found or empty shlexec.c:2483: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wtD670.tmp\test file.sde") Assoc class="shlexec.sde", verb="Open", rawcmd="0", cmdtail="", ddeexec="[open("%1")]", app="shlexec", topic="dde", ifexec="[ifexec("%1")]" failed: rc=2 err=2 shlexec.c:2466: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wtD670.tmp\test file.sde") Assoc class="shlexec.sde", verb="Open", rawcmd="0", cmdtail="", ddeexec="[open("%1")]", app="shlexec" ShlexecVar expected 'Present', but key not found or empty shlexec.c:2483: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wtD670.tmp\test file.sde") Assoc class="shlexec.sde", verb="Open", rawcmd="0", cmdtail="", ddeexec="[open("%1")]", app="shlexec" failed: rc=2 err=2 shlexec.c:2466: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wtD670.tmp\test file.sde") Assoc class="shlexec.sde", verb="Open", rawcmd="0", cmdtail="", ddeexec="[open("%1")]", topic="dde" ShlexecVar expected 'Present', but key not found or empty shlexec.c:2483: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wtD670.tmp\test file.sde") Assoc class="shlexec.sde", verb="Open", rawcmd="0", cmdtail="", ddeexec="[open("%1")]", topic="dde" failed: rc=2 err=2 shlexec.c:2580: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wtD670.tmp\test file.sde") Assoc class="shlexec.sde", verb="Open", rawcmd="1", cmdtail="C:\Users\winetest\AppData\Local\Temp\wtD670.tmp\test file.exe", ddeexec="[test]", topic="shlexec" ShlexecVar expected 'Present', but key not found or empty shlexec.c:2580: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wtD670.tmp\test file.sde") Assoc class="shlexec.sde", verb="Open", rawcmd="1", cmdtail="C:\Users\winetest\AppData\Local\Temp\wtD670.tmp\test2 file.exe", ddeexec="[test]", topic="shlexec" ShlexecVar expected 'Present', but key not found or empty shlexec.c:2580: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wtD670.tmp\test file.sde") Assoc class="shlexec.sde", verb="Open", rawcmd="1", cmdtail="C:\Users\winetest\AppData\Local\Temp\wtD670.tmp\test file.exe param", ddeexec="[test]", topic="shlexec" ShlexecVar expected 'Present', but key not found or empty shlexec.c:2580: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wtD670.tmp\test file.sde") Assoc class="shlexec.sde", verb="Open", rawcmd="1", cmdtail=""C:\Users\winetest\AppData\Local\Temp\wtD670.tmp\test file.exe"", ddeexec="[test]", topic="shlexec" ShlexecVar expected 'Present', but key not found or empty shlexec.c:2580: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wtD670.tmp\test file.sde") Assoc class="shlexec.sde", verb="Open", rawcmd="1", cmdtail=""C:\Users\winetest\AppData\Local\Temp\wtD670.tmp\test file.exe" param", ddeexec="[test]", topic="shlexec" ShlexecVar expected 'Present', but key not found or empty shlexec.c:2580: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wtD670.tmp\test file.sde") Assoc class="shlexec.sde", verb="Open", rawcmd="1", cmdtail="C:\Users\winetest\AppData\Local\Temp\wtD670.tmp\test2 file.exe param", ddeexec="[test]", topic="shlexec" ShlexecVar expected 'Present', but key not found or empty shlexec.c:2580: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wtD670.tmp\test file.sde") Assoc class="shlexec.sde", verb="Open", rawcmd="1", cmdtail=""C:\Users\winetest\AppData\Local\Temp\wtD670.tmp\test2 file.exe"", ddeexec="[test]", topic="shlexec" ShlexecVar expected 'Present', but key not found or empty shlexec.c:2580: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wtD670.tmp\test file.sde") Assoc class="shlexec.sde", verb="Open", rawcmd="1", cmdtail=""C:\Users\winetest\AppData\Local\Temp\wtD670.tmp\test2 file.exe" param", ddeexec="[test]", topic="shlexec" ShlexecVar expected 'Present', but key not found or empty shlexec.c:2580: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wtD670.tmp\test file.sde") Assoc class="shlexec.sde", verb="Open", rawcmd="1", cmdtail="C:\Users\winetest\AppData\Local\Temp\wtD670.tmp\test2", ddeexec="[test]", topic="shlexec" ShlexecVar expected 'Present', but key not found or empty shlexec.c:2580: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wtD670.tmp\test file.sde") Assoc class="shlexec.sde", verb="Open", rawcmd="1", cmdtail="C:\Users\winetest\AppData\Local\Temp\wtD670.tmp\test2 param", ddeexec="[test]", topic="shlexec" ShlexecVar expected 'Present', but key not found or empty shlexec.c:2580: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wtD670.tmp\test file.sde") Assoc class="shlexec.sde", verb="Open", rawcmd="1", cmdtail="C:\Users\winetest\AppData\Local\Temp\wtD670.tmp\notexist.exe", ddeexec="[test]", topic="shlexec" ShlexecVar expected 'Present', but key not found or empty shlexec.c:2580: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wtD670.tmp\test file.sde") Assoc class="shlexec.sde", verb="Open", rawcmd="1", cmdtail="C:\Users\winetest\AppData\Local\Temp\wtD670.tmp\notexist.exe param", ddeexec="[test]", topic="shlexec" ShlexecVar expected 'Present', but key not found or empty shlexec.c:2580: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wtD670.tmp\test file.sde") Assoc class="shlexec.sde", verb="Open", rawcmd="1", cmdtail="cmd", ddeexec="[test]", topic="shlexec" ShlexecVar expected 'Present', but key not found or empty shlexec.c:2580: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wtD670.tmp\test file.sde") Assoc class="shlexec.sde", verb="Open", rawcmd="1", cmdtail="cmd param", ddeexec="[test]", topic="shlexec" ShlexecVar expected 'Present', but key not found or empty shlexec.c:2580: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wtD670.tmp\test file.sde") Assoc class="shlexec.sde", verb="Open", rawcmd="1", cmdtail="xyzwxyzwxyz", ddeexec="[test]", topic="shlexec" ShlexecVar expected 'Present', but key not found or empty shlexec.c:2580: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wtD670.tmp\test file.sde") Assoc class="shlexec.sde", verb="Open", rawcmd="1", cmdtail="xyzwxyzwxyz param", ddeexec="[test]", topic="shlexec" ShlexecVar expected 'Present', but key not found or empty shlexec.c:2855: Test failed: ShellExecuteEx(mask="0x808440", file="test2.exe", params="shlexec "C:\Users\winetest\AppData\Local\Temp\wtD670.tmp\wtD671.tmp" Exec") ShlexecVar expected 'Present', but key not found or empty shlexec.c:2858: Test failed: ShellExecuteEx(mask="0x808440", file="test2.exe", params="shlexec "C:\Users\winetest\AppData\Local\Temp\wtD670.tmp\wtD671.tmp" Exec") argvA3 expected 'Exec', but key not found or empty shlexec.c:2859: Test failed: ShellExecuteEx(mask="0x808440", file="test2.exe", params="shlexec "C:\Users\winetest\AppData\Local\Temp\wtD670.tmp\wtD671.tmp" Exec") longPath expected 'C:\Users\winetest\AppData\Local\Temp\wtD670.tmp\test2.exe', but key not found or empty shlexec.c:2863: Test failed: ShellExecuteEx(mask="0x808440", file="test2.exe", params="shlexec "C:\Users\winetest\AppData\Local\Temp\wtD670.tmp\wtD671.tmp" Exec") ShlexecVar expected 'Present', but key not found or empty shlexec.c:2868: Test failed: ShellExecuteEx(mask="0x808440", file="test2.exe", params="shlexec "C:\Users\winetest\AppData\Local\Temp\wtD670.tmp\wtD671.tmp" Exec", dir="C:\Users\winetest\AppData\Local\Temp\wtD670.tmp") WaitForSingleObject returned 258 shlexec.c:2868: Test failed: ShellExecuteEx(mask="0x808440", file="test2.exe", params="shlexec "C:\Users\winetest\AppData\Local\Temp\wtD670.tmp\wtD671.tmp" Exec", dir="C:\Users\winetest\AppData\Local\Temp\wtD670.tmp") ShlexecVar expected 'Present', but key not found or empty shlexec.c:2871: Test failed: ShellExecuteEx(mask="0x808440", file="test2.exe", params="shlexec "C:\Users\winetest\AppData\Local\Temp\wtD670.tmp\wtD671.tmp" Exec", dir="C:\Users\winetest\AppData\Local\Temp\wtD670.tmp") argvA3 expected 'Exec', but key not found or empty shlexec.c:2872: Test failed: ShellExecuteEx(mask="0x808440", file="test2.exe", params="shlexec "C:\Users\winetest\AppData\Local\Temp\wtD670.tmp\wtD671.tmp" Exec", dir="C:\Users\winetest\AppData\Local\Temp\wtD670.tmp") longPath expected 'C:\Users\winetest\AppData\Local\Temp\wtD670.tmp\test2.exe', but key not found or empty shlexec.c:2876: Test failed: ShellExecuteEx(mask="0x808440", file="test2.exe", params="shlexec "C:\Users\winetest\AppData\Local\Temp\wtD670.tmp\wtD671.tmp" Exec", dir="%TMPDIR%") ShlexecVar expected 'Present', but key not found or empty shlexec.c:2880: Test failed: ShellExecuteEx(mask="0x808640", file="test2.exe", params="shlexec "C:\Users\winetest\AppData\Local\Temp\wtD670.tmp\wtD671.tmp" Exec", dir="%TMPDIR%") WaitForSingleObject returned 258 shlexec.c:2880: Test failed: ShellExecuteEx(mask="0x808640", file="test2.exe", params="shlexec "C:\Users\winetest\AppData\Local\Temp\wtD670.tmp\wtD671.tmp" Exec", dir="%TMPDIR%") ShlexecVar expected 'Present', but key not found or empty shlexec.c:2883: Test failed: ShellExecuteEx(mask="0x808640", file="test2.exe", params="shlexec "C:\Users\winetest\AppData\Local\Temp\wtD670.tmp\wtD671.tmp" Exec", dir="%TMPDIR%") argvA3 expected 'Exec', but key not found or empty shlexec.c:2884: Test failed: ShellExecuteEx(mask="0x808640", file="test2.exe", params="shlexec "C:\Users\winetest\AppData\Local\Temp\wtD670.tmp\wtD671.tmp" Exec", dir="%TMPDIR%") longPath expected 'C:\Users\winetest\AppData\Local\Temp\wtD670.tmp\test2.exe', but key not found or empty shlexec.c:2889: Test failed: ShellExecuteEx(mask="0x808440", file="test2.exe", params="shlexec "C:\Users\winetest\AppData\Local\Temp\wtD670.tmp\wtD671.tmp" Exec", dir="C:\Users\Public\Documents:C:\Users\winetest\AppData\Local\Temp\wtD670.tmp") ShlexecVar expected 'Present', but key not found or empty

1 0

Re: [1/3] shell32/tests: Delete the shlproto test class when done.
by Marvin 20 Mar '16

20 Mar '16

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=21530 Your paranoid android. === wvistau64 (64 bit shlexec) === shlexec.c:1979: Test failed: ShellExecuteEx(mask="0x8640", file="shlproto://%TMPDIR%/bar") WaitForSingleObject returned 258 shlexec.c:1983: Test failed: ShellExecuteEx(mask="0x8640", file="shlproto://%TMPDIR%/bar") argvA3 expected 'URL', but key not found or empty shlexec.c:1984: Test failed: ShellExecuteEx(mask="0x8640", file="shlproto://%TMPDIR%/bar") argvA4 expected 'shlproto://C:\Users\winetest\AppData\Local\Temp\wtCE84.tmp/bar', but key not found or empty shlexec.c:1988: Test failed: ShellExecute(verb="", file="%urlprefix%foo") ShlexecVar expected 'Present', but key not found or empty

1 0

Re: [v4 1/6] d3dx9: add test for preshader in effect.
by Matteo Bruni 19 Mar '16

19 Mar '16

2016-03-17 12:59 GMT+01:00 Paul Gofman <gofmanp(a)gmail.com>: Nice job. I have a few nitpicks still... > +static const D3DXVECTOR4 test_effect_preshader_fconstsv[] = > +{ > + {11.0f, 12.0f, 13.0f, 0.0f}, > + {21.0f, 22.0f, 23.0f, 0.0f}, > + {31.0f, 32.0f, 33.0f, 0.0f}, > + {41.0f, 42.0f, 43.0f, 0.0f}, > + {11.0f, 21.0f, 31.0f, 0.0f}, > + {12.0f, 22.0f, 32.0f, 0.0f}, > + {13.0f, 23.0f, 33.0f, 0.0f}, > + {14.0f, 24.0f, 34.0f, 0.0f}, > + {11.0f, 12.0f, 13.0f, 14.0f}, > + {21.0f, 22.0f, 23.0f, 24.0f}, > + {31.0f, 32.0f, 33.0f, 34.0f}, > + {11.0f, 21.0f, 31.0f, 41.0f}, > + {12.0f, 22.0f, 32.0f, 42.0f}, > + {13.0f, 23.0f, 33.0f, 43.0f}, > + {4.0f, 5.0f, 6.0f, 7.0f} > +}; > + > +static const D3DXVECTOR4 test_effect_preshader_fconstsp[] = > +{ > + {11.0f, 21.0f, 0.0f, 0.0f}, > + {12.0f, 22.0f, 0.0f, 0.0f}, > + {13.0f, 23.0f, 0.0f, 0.0f}, > + {11.0f, 12.0f, 0.0f, 0.0f}, > + {21.0f, 22.0f, 0.0f, 0.0f}, > + {31.0f, 32.0f, 0.0f, 0.0f}, > + {11.0f, 12.0f, 0.0f, 0.0f}, > + {21.0f, 22.0f, 0.0f, 0.0f}, > + {11.0f, 21.0f, 0.0f, 0.0f}, > + {12.0f, 22.0f, 0.0f, 0.0f}, > + {11.0f, 12.0f, 13.0f, 0.0f}, > + {21.0f, 22.0f, 23.0f, 0.0f}, > + {11.0f, 21.0f, 31.0f, 0.0f}, > + {12.0f, 22.0f, 32.0f, 0.0f} > +}; > + > +static const BOOL test_effect_preshader_bconsts[] = > +{ > + TRUE, FALSE, TRUE, FALSE, TRUE, FALSE > +}; > + > +static const struct > +{ > + const char *comment; > + unsigned int todo[4]; > + unsigned int result[4]; > +} > +test_effect_preshader_op_results[] = > +{ > + {"1 / op", {1, 1, 1, 1}, {0x7f800000, 0xff800000, 0xbee8ba2e, 0x00200000}}, > + {"rsq", {1, 1, 3, 3}, {0x7f800000, 0x7f800000, 0x3f2c985d, 0x1f800000}}, > + {"mul", {1, 1, 1, 1}, {0x00000000, 0x80000000, 0x40d33334, 0x7f800000}}, > + {"add", {0, 1, 1, 1}, {0x3f800000, 0x40000000, 0xc0a66666, 0x7f7fffff}}, > + {"lt", {0, 0, 1, 0}, {0x3f800000, 0x3f800000, 0x00000000, 0x00000000}}, > + {"ge", {1, 1, 0, 1}, {0x00000000, 0x00000000, 0x3f800000, 0x3f800000}}, > + {"neg", {1, 1, 1, 1}, {0x80000000, 0x00000000, 0x400ccccd, 0xff7fffff}}, > + {"rcp", {1, 1, 1, 1}, {0x7f800000, 0xff800000, 0xbee8ba2e, 0x00200000}}, > + {"frac", {0, 0, 1, 0}, {0x00000000, 0x00000000, 0x3f4ccccc, 0x00000000}}, > + {"min", {0, 1, 1, 1}, {0x00000000, 0x80000000, 0xc0400000, 0x40800000}}, > + {"max", {1, 1, 1, 1}, {0x3f800000, 0x40000000, 0xc00ccccd, 0x7f7fffff}}, > + {"sin", {0, 1, 1, 3}, {0x00000000, 0x80000000, 0xbf4ef99e, 0xbf0599b3}}, > + {"cos", {1, 1, 1, 3}, {0x3f800000, 0x3f800000, 0xbf16a803, 0x3f5a5f96}}, > + {"den mul",{1, 1, 1, 1}, {0x7f800000, 0xff800000, 0xbb94f209, 0x000051ec}}, > + {"dot", {0, 1, 1, 0}, {0x00000000, 0x7f800000, 0x41f00000, 0x00000000}}, > + {"prec", {1, 1, 2, 0}, {0x2b8cbccc, 0x2c0cbccc, 0x00000000, 0x00000000}} > +}; > + > +#define TEST_EFFECT_PRES_NFLOATV ARRAY_SIZE(test_effect_preshader_fconstsv) > +#define TEST_EFFECT_PRES_NFLOATP ARRAY_SIZE(test_effect_preshader_fconstsp) > +#define TEST_EFFECT_PRES_NFLOATMAX (TEST_EFFECT_PRES_NFLOATV > TEST_EFFECT_PRES_NFLOATP ? \ > + TEST_EFFECT_PRES_NFLOATV : TEST_EFFECT_PRES_NFLOATP) > +#define TEST_EFFECT_PRES_NBOOL ARRAY_SIZE(test_effect_preshader_bconsts) > +#define TEST_EFFECT_PRES_NOPTESTS ARRAY_SIZE(test_effect_preshader_op_results) Those arrays above should probably be inside test_effect_preshader(), unless you plan to add other functions needing them. > + for ( ; i < 16; ++i) Those spaces in place of the first "for" expression look weird. Just leave that empty i.e. for (; i < 16; ++i) > + for (i = 0; i < TEST_EFFECT_PRES_NOPTESTS; ++i) > + { > + unsigned int *v; > + > + hr = IDirect3DDevice9_GetLight(device, i % 8, &light); > + v = i < 8 ? (unsigned int *)&light.Diffuse : (unsigned int *)&light.Ambient; > + 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] & 1) > + ok(v[j] == test_effect_preshader_op_results[i].result[j] > + || ((test_effect_preshader_op_results[i].todo[j] & 2) > + && broken(v[j] != test_effect_preshader_op_results[i].result[j])), > + "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]); I don't like that broken(), it isn't checking much (i.e. the condition is true for almost any value) and overloading the "todo" field for that doesn't seem too clean. Maybe something like this for the test results table would help: static const struct { const char *name; unsigned int expected[4]; BOOL todo[4]; unsigned int expected_broken[4]; } I think all the broken results are != 0 so expected_broken also works as a flag. If that's not the case you can add explicit "BOOL broken[4]" flags. You can then leave out the todo and expected_broken fields for the table entries which don't require them, since they end up zero-initialized. Maybe also add a small comment for each broken value, if it makes sense? > + todo_wine ok(!memcmp(byte_code, > + &test_effect_preshader_effect_blob[TEST_EFFECT_PRESHADER_VSHADER_POS + > + 1 * TEST_EFFECT_PRESHADER_VSHADER_LEN], byte_code_size), You can leave out the "1 *", it's pretty clear either way.

2 2

Re: [PATCH 2/5] wined3d: Implement copying of buffer resources.
by Henri Verbeet 19 Mar '16

19 Mar '16

On 18 March 2016 at 12:30, Józef Kucia <jkucia(a)codeweavers.com> wrote: > +HRESULT wined3d_buffer_copy(struct wined3d_buffer *dst_buffer, unsigned int dst_offset, > + struct wined3d_buffer *src_buffer, unsigned int src_offset, unsigned int size) > +{ > + BYTE *dst_buffer_mem, *src_buffer_mem; > + const struct wined3d_gl_info *gl_info; > + struct wined3d_context *context; > + struct wined3d_device *device; > + > + device = dst_buffer->resource.device; > + > + context = context_acquire(device, NULL); > + gl_info = context->gl_info; > + > + buffer_internal_preload(dst_buffer, context, NULL); > + buffer_internal_preload(src_buffer, context, NULL); > + > + dst_buffer_mem = dst_buffer->resource.heap_memory; > + src_buffer_mem = src_buffer->resource.heap_memory; This is probably fine, but I wonder why you're not using buffer_get_memory()? Somewhat related, there may be something to be said for the function just taking wined3d_bo_address structures and a size, although I don't have an immediate use for that yet. > + > + if (!dst_buffer_mem && !src_buffer_mem) > + { > + if (!gl_info->supported[ARB_COPY_BUFFER]) > + { > + FIXME("Direct buffer copy not supported.\n"); > + return WINED3DERR_INVALIDCALL; > + } I think that's fine, but we could of course implement that case by mapping the buffers and using memcpy().

2 2

Re: [PATCH 3/5] wined3d: Add support for buffers in wined3d_device_copy_sub_resource().
by Henri Verbeet 19 Mar '16

19 Mar '16

On 18 March 2016 at 12:30, Józef Kucia <jkucia(a)codeweavers.com> wrote: > + if (src_offset > src_resource->size > + || src_offset + size > src_resource->size That's not a safe way to validate "size". For large enough values of "size", "src_offset + size" may wrap to something smaller than "src_resource->size". You'd typically do something like "size > src_resource->size - src_offset" instead.

1 0

Re: [PATCH] msvcr120/tests: Add critical section test.
by Marvin 18 Mar '16

18 Mar '16

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=21522 Your paranoid android. === w2008s64 (64 bit msvcr120) === msvcr120: unhandled exception c0000005 at 000007FEF6F8B045

1 0

GSoC Idea: Winetest Graphical User Interface
by Zhenbo Li 18 Mar '16

18 Mar '16

Hello, I'm Zhenbo Li. This year, I wish to work on a project related to wine test suite. Previously, I sent a mail for Winetest Scripting Interface. A better winetest.exe should have such functions: 1. Choose which dlls to be tested. Users could use GUI, CLI, or a config file. 2. Show the result in winetest, or render it to html 3. Allow to leave tag and email blank if the user doesn't want to submit the result to test.winehq.org, and they can fill them when submitting them. I'm wondering whether this job would be enough for a summer, and I'm glad to write a script for wine test suite as another part of my job. Really appreciate your comments. -- Have a nice day! Zhenbo Li

6 7

Re: [v3 resend 2/6] d3dx9: add preshaders to effect.
by Matteo Bruni 17 Mar '16

17 Mar '16

2016-03-10 19:50 GMT+01:00 Paul Gofman <gofmanp(a)gmail.com>: > Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Looks pretty good to me in general. I also like d3dx_param_eval and related names. > + for (i = 0; i < param->element_count; i++) > + { > + if (param->members[i].type != param->type) > + { > + FIXME("Unexpected member parameter type %u (need %u).\n", param->members[i].type, param->type); I would use "expected" or something similar instead of "need" in this message. > diff --git a/dlls/d3dx9_36/preshader.c b/dlls/d3dx9_36/preshader.c > new file mode 100644 > index 0000000..409c00f > --- /dev/null > +++ b/dlls/d3dx9_36/preshader.c > @@ -0,0 +1,688 @@ > +/* > + * FX preshader parsing & execution, setting shader constants > + * from effect parameters. > + * > + * Copyright 2016 Paul Gofman > + * > + * This library is free software; you can redistribute it and/or > + * modify it under the terms of the GNU Lesser General Public > + * License as published by the Free Software Foundation; either > + * version 2.1 of the License, or (at your option) any later version. > + * > + * This library is distributed in the hope that it will be useful, > + * but WITHOUT ANY WARRANTY; without even the implied warranty of > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > + * Lesser General Public License for more details. > + * > + * You should have received a copy of the GNU Lesser General Public > + * License along with this library; if not, write to the Free Software > + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA > + */ > + > +#include "config.h" > +#include "wine/port.h" > + > +#include "windef.h" > +#include "wingdi.h" Not your fault but those shouldn't be there. wingdi.h is already included by d3dx9_36_private.h, while windef.h is not but still it's necessary to avoid errors when including d3dx9_36_private.h. I'm sending a patch cleaning up the includes in d3dx9 (and renaming d3dx9_36_private.h to d3dx9_private.h while at it), please update this patch accordingly. > +static const struct > +{ > + unsigned int value_size; > + unsigned int reg_value_cnt; Just my preference, I would go with component_size and component_count (or maybe reg_component_count). > + {sizeof(float), 4, PRES_VT_FLOAT } /* PRES_REGTAB_REG */ I think I had tested this in the past and it turned out temporaries are stored as doubles. I'll see if I can find something. > +static const char *table_symbol[] = > +{ > + "(null)", "imm", "c", "v", "oc", "ob", "oi", "r" > +}; > + > +static const char *xyzw_str = "xyzw"; I haven't checked but maybe you can put those directly in the function using them. > + > +#define OFFSET2REG(table, offset) ((offset) / table_info[table].reg_value_cnt) > + > +static const enum PRES_REG_TABLES pres_regset2table[] = > +{ > + PRES_REGTAB_OBCONST, /* D3DXRS_BOOL */ > + PRES_REGTAB_OICONST, /* D3DXRS_INT4 */ > + PRES_REGTAB_CONST, /* D3DXRS_FLOAT4 */ > + PRES_REGTAB_NONE, /* D3DXRS_SAMPLER */ > +}; > + > +static const enum PRES_REG_TABLES shad_regset2table[] = > +{ > + PRES_REGTAB_OBCONST, /* D3DXRS_BOOL */ > + PRES_REGTAB_OICONST, /* D3DXRS_INT4 */ > + PRES_REGTAB_OCONST, /* D3DXRS_FLOAT4 */ > + PRES_REGTAB_NONE, /* D3DXRS_SAMPLER */ > +}; > + > +struct d3dx_pres_operand > +{ > + enum PRES_REG_TABLES table; > + /* offset is value index, not register index, e. g. > + offset for value c3.y is 17 (3 * 4 + 1) */ As I mentioned already, I would refer to "components" instead of "values". > + unsigned int offset; > +}; > + > +struct d3dx_pres_ins > +{ > + enum PRES_OPS op; > + /* first input argument is scalar, > + scalar component is propagated */ > + BOOL scalar_op; > + unsigned int ncomps; > + unsigned int ninp_args; Something like "component_count" and "operands_count" (or "input_count", or whatever) seems nicer. Similarly for the other counts. > + > +struct d3dx_param_eval > +{ > + enum param_eval_type peval_type; I feel like I might have already asked this, sorry if that's the case: do you really need this field? At least for what I can see at the moment you can do without since it's used only in d3dx_create_param_eval(), which is where you set the field, and in d3dx_param_eval_set_shader_constants(), where you don't really need it. > + D3DXPARAMETER_TYPE param_type; This one can also probably be avoided (e.g. by passing it down the call chain from the d3dx_parameter struct) although it's probably a bit more useful so I don't mind. > + > + struct d3dx_preshader pres; > + struct d3dx_const_tab shader_inputs; > +}; > + > +static HRESULT regstore_alloc_table(struct d3dx_regstore *rs, unsigned int table) > +{ > + unsigned int sz; > + > + sz = rs->table_sizes[table] * table_info[table].reg_value_cnt * table_info[table].value_size; > + if (sz) > + { > + rs->tables[table] = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sz); > + rs->table_value_set[table] = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, > + sizeof(*rs->table_value_set[table]) * > + ((rs->table_sizes[table] + PRES_VS_BITS_PER_WORD - 1) / PRES_VS_BITS_PER_WORD)); > + if (!rs->tables[table] || !rs->table_value_set[table]) > + return E_OUTOFMEMORY; > + } > + return D3D_OK; > +} > + > +static void regstore_free_tables(struct d3dx_regstore *rs) > +{ > + unsigned int i; > + > + for (i = PRES_REGTAB_IMMED; i < PRES_REGTAB_MAX; i++) Maybe add a couple of enum PRES_REGTAB_FIRST and PRES_REGTAB_LAST and use them here? > + for (j = 0; j < n; j++) > + TRACE("0x%08X,", words[i + j]); Please use lowercase hexadecimals. > + if (ninp_args != pres_op_info[i].ninp_args) > + { > + FIXME("Actual input args %u, expected %u, instruction %s.\n", ninp_args, > + pres_op_info[i].ninp_args, pres_op_info[i].mnem); > + return NULL; > + } > + ins->ninp_args = ninp_args; It shouldn't be necessary to store the number of arguments in the instruction structure at the moment, although maybe there is some variable-arguments opcode? > + hr = E_FAIL; This seems unnecessary. > + > -- git am complains about that empty line at the end of the file.

2 2

Re: TestBot job 21484 results: winhttp/tests: Fix test failures.
by Hans Leidekker 17 Mar '16

17 Mar '16

On Thu, 2016-03-17 at 04:21 -0500, Marvin wrote: > === w864 (32 bit winhttp) === > > winhttp: > winhttp.c:1030: Test failed: failed to send request 2148074273 > winhttp.c:1034: Test failed: failed to retrieve certificate context 12019 > winhttp.c:1039: Test failed: failed to retrieve key bitness 4317 > winhttp.c:1043: Test failed: failed to retrieve certificate info 12019 > winhttp.c:1056: Test failed: failed to receive response 12019 > winhttp.c:1060: Test failed: failed to query available data 12019 > winhttp.c:1061: Test failed: available_size = 0 > winhttp.c:1066: Test failed: failed unexpectedly 12019 > winhttp.c:1067: Test failed: request failed unexpectedly 3735928559 > winhttp.c:1078: Test failed: WinHttpReadData failed: 12019. Here's a clean run: https://testbot.winehq.org/JobDetails.pl?Key=21483 In this test run without my patch the same error occurs only on that VM, but in a different test: https://testbot.winehq.org/JobDetails.pl?Key=21482 I don't remember seeing this failure before, so it looks like an unrelated issue that was also introduced with the upgrade.

1 0

Re: winhttp/tests: Fix test failures.
by Marvin 17 Mar '16

17 Mar '16

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=21484 Your paranoid android. === w864 (32 bit winhttp) === winhttp.c:1030: Test failed: failed to send request 2148074273 winhttp.c:1034: Test failed: failed to retrieve certificate context 12019 winhttp.c:1039: Test failed: failed to retrieve key bitness 4317 winhttp.c:1043: Test failed: failed to retrieve certificate info 12019 winhttp.c:1056: Test failed: failed to receive response 12019 winhttp.c:1060: Test failed: failed to query available data 12019 winhttp.c:1061: Test failed: available_size = 0 winhttp.c:1066: Test failed: failed unexpectedly 12019 winhttp.c:1067: Test failed: request failed unexpectedly 3735928559 winhttp.c:1078: Test failed: WinHttpReadData failed: 12019.

1 0

Home Stretch for the New Wiki
by Kyle Auble 17 Mar '16

17 Mar '16

Hi everybody, I just wanted to update you all on the state of the wiki. This email may seem long but it isn't too dense; feel free to skip the numbers, but for anyone that might appreciate some figures, the old wiki had... Total pages: 841 (Less) system pages: ~150 Actual pages by us: ~690 These consisted of... Redirects ~45 Homepages ~150 Categories ~25 Content pages: ~470 Of the content pages, we had... English pages: 384 Translations: ~86 Of the translations, between 20-26 were immediately disqualified (either as less than 50% actually translated or a translation of an English page we rejected). Alex H mentioned that most of the translations probably weren't worth migrating, but we thought we should leave that up to potential translators. For those remaining English pages... Already ported in some way: 153 Rejected as not worth porting: 169 Still unfinished: 62 Of these last 62, we actually have relatively clear plans for how to port ~25 of them, leaving just 35 or so as truly up for grabs. Furthermore, we've tried to leave a quick note on http://oldwiki.winehq.org/PageMigration for every page that still needs a decision. And of course, people are free to override our rejections if they really want to keep a page (we left an explanation for every rejection at the top of the relevant page) While some of those last 35 pages are really just a matter of policy (e.g. do we want a page for every command, even if it's a stub?), many of them have at least one or two technical notes that seem to supplement the API documentation. These are the ones where we would really appreciate input or decisions from developers, particularly whether anything is worth moving to the Developers' docs. Finally, as Rosanne and I made alternating edits, we discussed a few points that we think are worth keeping in mind for the future: 1. If a page is experimental / dev-oriented, try to make that clear from the name, text, and possibly a bold note (for example, a lot of users were apparently misinterpreting "WineOnWindows" as a stable feature they could use) 2. If you're using a distro/OS with its own wiki page, keeping an eye on its page for incorrect or outdated info would be great, even if only every few months. I updated several of them last year, testing what I could and researching docs on and outside WineHQ for changes, but it's no substitute for someone that knows first-hand what each one requires. 3. If you don't agree with a change, don't be afraid to revert it and start a discussion for the page, especially now that we have the talk pages. 4. The wiki is a natural place for things like to-do lists and transient notes, but if the same information can be easily written so that it's just as useful 5 years from now, aim for timelessness. If more of the wiki ages well, it should be easier to keep track of the things that may bit-rot. 5. Finally, if you want to start a new page, check to see if you could somehow add your info to existing pages first. Obviously we don't want the pages to get too long and it's totally subjective in the end, but it seems the more the pages spread out wildly, the more likely they are to wind up orphaned and abandoned. Have a good start to your spring everybody, Kyle

1 0

Re: [PATCH 1/2] d3drm: Change signature of d3drm_texture_create.
by Henri Verbeet 16 Mar '16

16 Mar '16

The subject line is pretty vague. On 15 March 2016 at 22:19, Aaryaman Vasishta <jem456.vasishta(a)gmail.com> wrote: > @@ -193,8 +194,16 @@ static HRESULT WINAPI d3drm1_CreateTexture(IDirect3DRM *iface, > D3DRMIMAGE *image, IDirect3DRMTexture **texture) > { > FIXME("iface %p, image %p, texture %p partial stub.\n", iface, image, texture); > + struct d3drm_texture *object; > + HRESULT hr; You mix declarations and code here. The compiler should have warned about that. > + hr = d3drm_texture_create(&object); > + if (FAILED(hr)) > + return hr; We would generally write that as if (FAILED(hr = d3drm_texture_create(&object))) return hr; not a big deal though. > +IDirect3DRMTexture *IDirect3DRMTexture_from_impl(struct d3drm_texture *texture) > +{ > + return &texture->IDirect3DRMTexture_iface; > +} > + > +IDirect3DRMTexture2 *IDirect3DRMTexture2_from_impl(struct d3drm_texture *texture) > +{ > + return &texture->IDirect3DRMTexture2_iface; > +} > + > +IDirect3DRMTexture3 *IDirect3DRMTexture3_from_impl(struct d3drm_texture *texture) > +{ > + return &texture->IDirect3DRMTexture3_iface; > +} I don't think these are an improvement, I'd prefer them just written out. > -HRESULT Direct3DRMTexture_create(REFIID riid, IUnknown **out) > +HRESULT d3drm_texture_create(struct d3drm_texture **out) I think "texture" would be a more appropriate name than "out" here.

2 2

Re: dsound: Avoid implicit cast of interface pointer. [RFC]
by Henri Verbeet 16 Mar '16

16 Mar '16

On 16 March 2016 at 05:46, Sebastian Lackner <sebastian(a)fds-team.de> wrote: > To catch errors like http://source.winehq.org/patches/data/120308 easier in the future, > I would like to propose, that we replace CONTAINING_RECORD and similar macros with a > typesafe definition (on compilers where this is possible). The linux kernel source > contains an example how to do that, but there are multiple solutions available: > > #define container_of(ptr, type, member) ({ \ > const typeof( ((type *)0)->member ) *__mptr = (ptr); \ > (type *)( (char *)__mptr - offsetof(type,member) );}) > > One disadvantage is that we'll have to add explicit casts to a couple of places, like below. > Other dlls which would require explicit casts at a couple of places: > > amstream, d2d1, d3d11, d3d8, d3d9, ddraw, dwrite, msxml3, oleaut32, quartz, rpcrt4, vbscript > That implies you've tried the change. Did you find any issues other than the one in 120308? If not, I think this is rarely an issue in practice and not worth making legitimate cases uglier for.

2 1

Re: ddraw/tests: Fix function name in multiple ok() messages. (resend)
by Henri Verbeet 16 Mar '16

16 Mar '16

On 7 March 2016 at 08:40, Sebastian Lackner <sebastian(a)fds-team.de> wrote: > I assume this patch was missed somehow, resending. > No, the patch is just not very useful.

3 3

Re: [PATCH 2/2] d3drm: Partially Implement IDirect3DRM*::LoadTexture.
by Henri Verbeet 16 Mar '16

16 Mar '16

On 15 March 2016 at 22:19, Aaryaman Vasishta <jem456.vasishta(a)gmail.com> wrote: > dlls/d3drm/Makefile.in | 2 +- > dlls/d3drm/d3drm.c | 35 +++++-- > dlls/d3drm/d3drm_private.h | 6 ++ > dlls/d3drm/tests/d3drm.c | 22 ++++- > dlls/d3drm/texture.c | 224 ++++++++++++++++++++++++++++++++++++++++++++- > 5 files changed, 273 insertions(+), 16 deletions(-) > I briefly looked at this, and it has some issues, some perhaps more obvious than others. But let's work on the first patch in the series first.

1 0

Re: [PATCH] shell32: Implement NIM_SETVERSION in Shell_NotifyIcon()
by Roman Pišl 16 Mar '16

16 Mar '16

Hello, thank you for paying attention to this patch. Please, give me a hint how should I split the patch. Should I create three separate patches - shell32, explorer and winex11? I'm ready to do what is necessary. Best regards Roman Pišl On Tuesday 15 of March 2016 10:12:31 you wrote: > Thank you for your contribution to Wine! > > This is an automated notification to let you know that your patch has > been reviewed and its status set to "Needs splitting". > > This means that the patch needs to be split, either because it > contains unrelated changes that should be their own separate patch, or > because it's too large for review. You need to find a way to resend > the changes in smaller chunks. > > If you do not understand the reason for this status, disagree with our > assessment, or are simply not sure how to proceed next, please ask for > clarification by replying to this email.

2 1

[RFC] winex11: Don't put a default icon on modal dialogs.
by Alex Henrie 16 Mar '16

16 Mar '16

Fixes https://bugs.winehq.org/show_bug.cgi?id=29336 when using the xfwm4 window manager. Could some other developers take a look at this patch? It passes the test program attached to the bug report, but I am not sure that it is the right way. --- dlls/winex11.drv/window.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 4789f98..63d256a 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -274,7 +274,7 @@ static unsigned long get_mwm_decorations( struct x11drv_win_data *data, if ((style & WS_CAPTION) == WS_CAPTION) { ret |= MWM_DECOR_TITLE | MWM_DECOR_BORDER; - if (style & WS_SYSMENU) ret |= MWM_DECOR_MENU; + if ((style & WS_SYSMENU) && data->icon_pixmap) ret |= MWM_DECOR_MENU; if (style & WS_MINIMIZEBOX) ret |= MWM_DECOR_MINIMIZE; if (style & WS_MAXIMIZEBOX) ret |= MWM_DECOR_MAXIMIZE; } @@ -603,7 +603,8 @@ static void fetch_icon_data( HWND hwnd, HICON icon_big, HICON icon_small ) { icon_big = (HICON)SendMessageW( hwnd, WM_GETICON, ICON_BIG, 0 ); if (!icon_big) icon_big = (HICON)GetClassLongPtrW( hwnd, GCLP_HICON ); - if (!icon_big) icon_big = LoadIconW( 0, (LPWSTR)IDI_WINLOGO ); + if (!icon_big && !(GetWindowLongW( hwnd, GWL_EXSTYLE ) & WS_EX_DLGMODALFRAME)) + icon_big = LoadIconW( 0, (LPWSTR)IDI_WINLOGO ); } if (!icon_small) { @@ -611,7 +612,7 @@ static void fetch_icon_data( HWND hwnd, HICON icon_big, HICON icon_small ) if (!icon_small) icon_small = (HICON)GetClassLongPtrW( hwnd, GCLP_HICONSM ); } - if (!GetIconInfo(icon_big, &ii)) return; + if (!GetIconInfo(icon_small, &ii) && !GetIconInfo(icon_big, &ii)) return; hDC = CreateCompatibleDC(0); bits = get_bitmap_argb( hDC, ii.hbmColor, ii.hbmMask, &size ); -- 2.7.3

1 0

Re: [v6] shell32: fix two bugs in IQueryAssocations
by Theodore Dubois 16 Mar '16

16 Mar '16

OK. I'll resend with the changes suggested. ~Theodore On Mar 15, 2016, at 07:03 PM, Alexandre Julliard <julliard(a)winehq.org> wrote: Theodore Dubois <tblodt(a)icloud.com> writes: The reason I need the macro is: If I wrote ok(getstring_test(whatever)), first the ok macro would call winetest_set_location with the current line number, and then it would call getstring_test. The ok macros in getstring_test would call winetest_set_location and overwrite the location of the actual test. Then if getstring_test returns with a failure, the error message has the wrong line number. The only way to fix this is to call getstring_test on one line and call ok on the next line. There's no reason to call ok on the getstring_test result, since getstring_test would have already reported the error. If you want to know which caller triggered it, you can pass a line number or some string description to getstring_test. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [v6] shell32: fix two bugs in IQueryAssocations
by Alexandre Julliard 16 Mar '16

16 Mar '16

Theodore Dubois <tblodt(a)icloud.com> writes: > + > + /* This macro is necessary because of what the ok macro expands to. Failures would report the wrong line number. */ > +#define TEST_GET_STRING(a,p,s,es) \ > + getstring_test_result = getstring_test(a,p,s,es);\ > + ok(getstring_test_result, "\n"); It would be better to avoid the macro and write the tests explicitly, with meaningful error messages. Also, any chance to split the patch? -- Alexandre Julliard julliard(a)winehq.org

2 2

Re: [PATCH 2/2] d3drm: Partially Implement IDirect3DRM*::LoadTexture.
by Aaryaman Vasishta 15 Mar '16

15 Mar '16

I forgot to remove some trailing whitespaces - sorry about that! I will send another patch without them if needed.

1 1

Re: [PATCH 2/2] d3drm: Partially Implement IDirect3DRM*::LoadTexture.
by Marvin 15 Mar '16

15 Mar '16

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=21458 Your paranoid android. === build (build) === Patch failed to apply

1 0

Re: [v3 resend 3/6] d3dx9: implement fxlc constants (expressions) in effect.
by Matteo Bruni 15 Mar '16

15 Mar '16

2016-03-10 19:50 GMT+01:00 Paul Gofman <gofmanp(a)gmail.com>: > Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> > +static float regstore_get_float(struct d3dx_regstore *rs, unsigned int table, unsigned int offset) > +{ > + BYTE *p; > + > + p = (BYTE *)rs->tables[table] + table_info[table].value_size * offset; > + switch (table_info[table].type) > + { > + case PRES_VT_FLOAT : return *(float *)p; > + case PRES_VT_DOUBLE: return *(double *)p; > + case PRES_VT_INT : return *(int *)p; > + case PRES_VT_BOOL : return *(BOOL *)p ? 1.0f : -0.0f; I guess that -0.0f comes from some test? > + /* no EOL in WARN to dump arg in the same line */ > + WARN("Using uninitialized input "); > + dump_arg(rs, opr, comp); > + TRACE(".\n"); > + dump_ins(rs, ins); You can probably do without the comment, it's pretty clear anyway. > +#define ARGS_ARRAY_SIZE 8 > +static HRESULT execute_preshader(struct d3dx_preshader *pres) > +{ > + unsigned int i, j, k; > + float args[ARGS_ARRAY_SIZE]; > + float res; > + > + for (i = 0; i < pres->nins; i++) > + { > + struct d3dx_pres_ins *ins; > + struct op_info *oi; > + > + ins = &pres->ins[i]; > + oi = &pres_op_info[ins->op]; > + if (oi->func_all_comps) > + { > + if (ins->ninp_args * ins->ncomps > ARGS_ARRAY_SIZE) > + { > + FIXME("Too much arguments (%u) for one instruction.\n", ins->ninp_args * ins->ncomps); That should be "Too many". > +HRESULT d3dx_param_eval_set_shader_constants(struct IDirect3DDevice9 *device, struct d3dx_param_eval *peval) This function is unused in this patch. Please move it to the first patch requiring it (I think that's patch 6/6). BTW, splitting patch 6/6 would be nice although I don't have any suggestions on how to do that in a sensible manner... > +HRESULT d3dx_param_eval_get_shader_parameters(struct d3dx_param_eval *peval, struct d3dx_parameter ***param, > + unsigned int *nparam, D3DXCONSTANT_DESC **cdesc) > +{ > + *nparam = peval->shader_inputs.ninputs; > + *param = peval->shader_inputs.inputs_param; > + *cdesc = peval->shader_inputs.inputs; > + return D3D_OK; > +} You don't use this function in this patch either. Also it doesn't seem useful, it isn't an improvement to just assigning those three pointers directly in the caller IMO.

2 2

Re: [v3 1/6] d3dx9: add test for preshader in effect.
by Matteo Bruni 15 Mar '16

15 Mar '16

2016-03-10 15:23 GMT+01:00 Paul Gofman <gofmanp(a)gmail.com>: > Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> > --- Looks much better, thanks. I still have a few comments though. > + for (i = 0; i < 256; i++) > + { > + hr = IDirect3DDevice9_SetVertexShaderConstantF(device, i, > + (const float *)&fvect_empty, 1); > + ok(hr == D3D_OK, "Got result %#x.\n", hr); > + } > + for (i = 0; i < TEST_EFFECT_PRES_NFLOATP; i++) > + { > + hr = IDirect3DDevice9_SetPixelShaderConstantF(device, i, > + (const float *)&fvect_empty, 1); > + ok(hr == D3D_OK, "Got result %#x.\n", hr); > + } I know it was me who suggested to clear all the 256 float shader constants but it looks a bit weird if the same doesn't happen for the other constant types. It's also not very useful if those additional constants aren't checked later on. I would change the initialization of the other constant types in the same way (maybe with a define or something instead of the plain number?) and then check that those are not modified by BeginPass(). > + bval = FALSE; > + for (i = 0; i < TEST_EFFECT_PRES_NBOOL; i++) > + { > + hr = IDirect3DDevice9_SetPixelShaderConstantB(device, i, &bval, 1); > + ok(hr == D3D_OK, "Got result %#x.\n", hr); > + } > + > + hr = effect->lpVtbl->Begin(effect, &npasses, 0); > + ok(hr == D3D_OK, "Got result %#x.\n", hr); > + > + par = effect->lpVtbl->GetParameterByName(effect, NULL, "g_Pos2"); > + ok(par != NULL, "GetParameterByName failed.\n"); > + > + hr = effect->lpVtbl->SetVector(effect, par, &fvect1); > + ok(hr == D3D_OK, "SetFloatArray failed, hr %#x.\n", hr); This message is still wrong. > + > + hr = effect->lpVtbl->BeginPass(effect, 0); > + todo_wine ok(hr == D3D_OK, "Got result %#x.\n", hr); > + > + hr = IDirect3DDevice9_GetVertexShaderConstantF(device, 0, (float *)fdata, TEST_EFFECT_PRES_NFLOATV); We usually avoid the cast in these cases with something like "&fdata->x". > + ok(hr == D3D_OK, "Got result %#x.\n", hr); > + todo_wine ok(!memcmp(fdata, test_effect_preshader_fconstsv, sizeof(test_effect_preshader_fconstsv)), > + "Vertex shader float constants do not match.\n"); > + hr = IDirect3DDevice9_GetPixelShaderConstantF(device, 0, (float *)fdata, TEST_EFFECT_PRES_NFLOATP); > + ok(hr == D3D_OK, "Got result %#x.\n", hr); > + todo_wine ok(!memcmp(fdata, test_effect_preshader_fconstsp, sizeof(test_effect_preshader_fconstsp)), > + "Pixel shader float constants do not match.\n"); > + > + hr = IDirect3DDevice9_GetPixelShaderConstantB(device, 0, bdata, TEST_EFFECT_PRES_NBOOL); > + ok(hr == D3D_OK, "Got result %#x.\n", hr); > + for (i = 0; i < TEST_EFFECT_PRES_NBOOL; i++) > + todo_wine_if(!bdata[i] != !test_effect_preshader_bconsts[i]) > + ok(!bdata[i] == !test_effect_preshader_bconsts[i], > + "Pixel shader boolean constants do not match.\n"); > + > + for (i = 0; i < TEST_EFFECT_PRES_NOPTESTS; i++) > + { > + unsigned int *v; > + > + hr = IDirect3DDevice9_GetLight(device, i % 8, &light); > + v = i < 8 ? (unsigned int *)&light.Diffuse : (unsigned int *)&light.Ambient; > + 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] & 1) > + ok(v[j] == test_effect_preshader_op_results[i].result[j] || > + ((test_effect_preshader_op_results[i].todo[j] & 2) && > + broken(v[j] != test_effect_preshader_op_results[i].result[j])), > + "Operation %s, component %u, expected %#x, got %#x.\n", > + test_effect_preshader_op_results[i].comment, j, > + test_effect_preshader_op_results[i].result[j], v[j]); The indentation is pretty weird here. Even if you keep the ok on the same column of the todo_wine_if (to make its removal a few patches later nicer) the continuations of the ok condition should be indented, matching the other continuation lines. FWIW in newer d3d code we usually put the operators at the start of the next line (instead of at the end of the previous line) in line continuations. Also we prefer preincrement to postincrement of typical 'for' induction variables. > + ok(!!vshader, "Got NULL vshader.\n"); This double negation is unnecessary. > + > + hr = IDirect3DVertexShader9_GetFunction(vshader, NULL, &byte_code_size); > + ok(hr == D3D_OK, "Got result %#x.\n", hr); > + byte_code = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, byte_code_size); > + hr = IDirect3DVertexShader9_GetFunction(vshader, byte_code, &byte_code_size); > + ok(hr == D3D_OK, "Got result %#x.\n", hr); > + ok(byte_code_size > 1, "Got unexpected byte code size %u.\n", byte_code_size); > + todo_wine ok(!memcmp(byte_code, > + &test_effect_preshader_effect_blob[TEST_EFFECT_PRESHADER_VSHADER_POS + > + 1 * TEST_EFFECT_PRESHADER_VSHADER_LEN], byte_code_size), > + "Incorrect shader selected.\n"); > + HeapFree(GetProcessHeap(), 0, byte_code); > + IDirect3DVertexShader9_Release(vshader); > + > + hr = IDirect3DDevice9_SetVertexShader(device, NULL); > + ok(hr == D3D_OK, "Got result %#x.\n", hr); > + > + hr = effect->lpVtbl->SetVector(effect, par, &fvect1); > + ok(hr == D3D_OK, "SetFloatArray failed, hr %#x.\n", hr); > + hr = effect->lpVtbl->CommitChanges(effect); > + todo_wine ok(hr == D3D_OK, "Got result %#x.\n", hr); > + hr = IDirect3DDevice9_GetVertexShader(device, &vshader); > + ok(hr == D3D_OK, "Got result %#x.\n", hr); > + ok(!vshader, "Incorrect shader selected.\n"); > + if (vshader) > + IDirect3DVertexShader9_Release(vshader); I think you can remove this release too.

2 2

Re: [PATCH v2 08/12] wined3d: Implement stencil clear in wined3d_device_clear_rendertarget_view().
by Henri Verbeet 15 Mar '16

15 Mar '16

On 15 March 2016 at 10:52, Józef Kucia <jkucia(a)codeweavers.com> wrote: > static HRESULT cpu_blit_depth_fill(struct wined3d_device *device, > - struct wined3d_rendertarget_view *view, const RECT *rect, float depth) > + struct wined3d_rendertarget_view *view, const RECT *rect, DWORD clear_flags, Minor typo.

1 0

Re: [PATCH 2/3] winex11.drv: Fix handling of CF_DIBV5 clipboard data.
by Alexandre Julliard 15 Mar '16

15 Mar '16

Charles Davis <cdavis5x(a)gmail.com> writes: > @@ -1149,9 +1154,7 @@ static BOOL X11DRV_CLIPBOARD_RenderSynthesizedBitmap(Display *display) > lpbmih = GlobalLock(lpSource->hData); > if (lpbmih) > { > - offset = sizeof(BITMAPINFOHEADER) > - + ((lpbmih->biBitCount <= 8) ? (sizeof(RGBQUAD) * > - (1 << lpbmih->biBitCount)) : 0); > + offset = lpbmih->biSize - lpbmih->biSizeImage; This doesn't look right. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: dinput: Support IUnknown in the IDirectInputEffect COM object. (2nd try)
by Huw Davies 15 Mar '16

15 Mar '16

On Tue, Mar 15, 2016 at 11:43:58AM +0100, Michael Stefaniuc wrote: > Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> > --- > v2: Use IsEqualIID consistently. Thanks Huw! > > And of course again not even compile tested as I don't have a Mac. Yes, > I need to set me up with a cross compile for that. > gcc -m32 -c -o joystick_osx.o joystick_osx.c -I. -I../../include -D__WINESRC__ -D_REENTRANT -fPIC -Wall -pipe \ -fno-strict-aliasing -Wdeclaration-after-statement -Wempty-body -Wstrict-prototypes \ -Wwrite-strings -Wpointer-arith -gdwarf-2 -fno-omit-frame-pointer -g -O2 -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=0 joystick_osx.c: In function ‘effect_QueryInterface’: joystick_osx.c:1477: error: ‘riid’ undeclared (first use in this function) joystick_osx.c:1477: error: (Each undeclared identifier is reported only once joystick_osx.c:1477: error: for each function it appears in.) make: *** [joystick_osx.o] Error 1 > > dlls/dinput/joystick_osx.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/dlls/dinput/joystick_osx.c b/dlls/dinput/joystick_osx.c > index 6a8926d..19ca070 100644 > --- a/dlls/dinput/joystick_osx.c > +++ b/dlls/dinput/joystick_osx.c > @@ -1474,7 +1474,7 @@ static HRESULT WINAPI effect_QueryInterface(IDirectInputEffect *iface, > > TRACE("%p %s %p\n", This, debugstr_guid(guid), out); > > - if(IsEqualIID(guid, &IID_IDirectInputEffect)){ > + if(IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(guid, &IID_IDirectInputEffect)){ > *out = iface; > IDirectInputEffect_AddRef(iface); > return S_OK; > -- > 2.4.3 > >

1 0

Re: dinput: Support IUnknown in the IDirectInputEffect COM object.
by Huw Davies 15 Mar '16

15 Mar '16

On Tue, Mar 15, 2016 at 10:37:16AM +0100, Michael Stefaniuc wrote: > Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> > --- > dlls/dinput/joystick_osx.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/dlls/dinput/joystick_osx.c b/dlls/dinput/joystick_osx.c > index 6a8926d..19ca070 100644 > --- a/dlls/dinput/joystick_osx.c > +++ b/dlls/dinput/joystick_osx.c > @@ -1474,7 +1474,7 @@ static HRESULT WINAPI effect_QueryInterface(IDirectInputEffect *iface, > > TRACE("%p %s %p\n", This, debugstr_guid(guid), out); > > - if(IsEqualIID(guid, &IID_IDirectInputEffect)){ > + if(IsEqualGUID(riid, &IID_IUnknown) || IsEqualIID(guid, &IID_IDirectInputEffect)){ It looks a bit strange to mix IsEqualGUID and IsEqualIID. Huw.

2 3

GSoC Idea: Tools - Winetest Scripting Interface
by Zhenbo Li 15 Mar '16

15 Mar '16

Hello, I'm Zhenbo Li. I participated in GSoC twice. This year, I want to work on "Tools - Winetest Scripting Interface". After "make test", checking the output in stdout manually is horrible. As ok() macro is used quite widely, my patches should cause no surprise. That is to say, other developers need to read neither my patches nor the changelog to continue their jobs, although ok() macro and other tools for test have been changed. I think there will be two steps for the goal: 1. ok() macro ===================== int winetest_vok( int condition, const char *msg, __winetest_va_list args ) { tls_data* data=get_tls_data(); if (data->todo_level){...} else { if (!condition) { printf( "%s:%d: Test failed: ", data->current_file, data->current_line ); vprintf(msg, args); InterlockedIncrement(&failures); return 0; } else{.....} } } Instead of printing all the data to stderr, I think we can write a wrapper static void test_print(const char *s) { if(want_print_to_file) fprintf(file_handle, s); printf(s); } It needs some work to make sure that the file_handle is opened/closed successfully. With that, we can record the failed tests to a file, and developers don't need to find them in stdout anymore. 2. compare the results ======================= On the idea page, it says that any scripting language is acceptable. I prefer Python3. To make the code simple, I think editing runtest script is the best solution. Currently, our logic in Makefile is htmllocation.ok: ../../../tools/runtest $(RUNTESTFLAGS) -T ../../.. -M mshtml.dll -p mshtml_test.exe.so htmllocation && touch $@ And in runtest, we have exec $WINETEST_WRAPPER "$topobjdir/wine" "$program" "$@" I don't want to touch Makefile. Instead, I'm going to add some options for runtest. For example, one can use ../../../tools/runtest $(RUNTESTFLAGS) -new_option expected_errors_generated before -T ../../.. -M mshtml.dll -p mshtml_test.exe.so htmllocation And in runtest script, we can expected_errors_generated and new_errors_got, then tell that whether the test result has been changed. It should be easy for developers to write a script for git bisect or other circumstance. Problems ========= This approach seems to be quite simple, and there are some conditions can't be handled. For example void test_foo(sturct Data *d){ ret = foo(d); ok(ret, "foo(%s) is %d\n", data_to_str(d), ret); } struct Data list[]={a,b,c,d,e}; void test(){ for(i in list) test_foo(i); } I think we should not do too much "smart deduce" here, and don't hide what's happening to other developers. Maybe we can add another option for runtest script: --scrict=false This is my humble idea for Wine's GSoC 2016. If this project goes well, working on wine test suit will be much more satisfying(although still boring). I appreciate for your comment. With you a happy weekend. -- Have a nice day! Zhenbo Li

6 15

Re: winemac: Call the EnumDisplayMonitors callback using a wrapper.
by Henri Verbeet 15 Mar '16

15 Mar '16

On 15 March 2016 at 05:50, Ken Thomases <ken(a)codeweavers.com> wrote: > Signed-off-by: Ken Thomases <ken(a)codeweavers.com> > --- > For <https://bugs.winehq.org/show_bug.cgi?id=40297>. > > dlls/winemac.drv/display.c | 31 +++++++++++++++++++++++++++++-- > 1 file changed, 29 insertions(+), 2 deletions(-) > Is this really specific to winemac, or would it be more appropriate to add the wrapper in user32?

1 0

Re: winemac: Call the EnumDisplayMonitors callback using a wrapper.
by Ken Thomases 15 Mar '16

15 Mar '16

On Mar 14, 2016, at 11:50 PM, Ken Thomases <ken(a)codeweavers.com> wrote: > > Signed-off-by: Ken Thomases <ken(a)codeweavers.com> > --- > For <https://bugs.winehq.org/show_bug.cgi?id=40297>. > > dlls/winemac.drv/display.c | 31 +++++++++++++++++++++++++++++-- > 1 file changed, 29 insertions(+), 2 deletions(-) Dmitry pointed out that this version misaligns the stack, so ignore it. I'll submit another try tomorrow. -Ken

1 0

Re: [PATCH] crypt32/tests: Accept Windows 10 results.
by Alexandre Julliard 15 Mar '16

15 Mar '16

Detlef Riekenberg <wine.dev(a)web.de> writes: > @@ -336,11 +336,13 @@ static void testStringToBinaryA(void) > /* Bad strings */ > for (i = 0; i < sizeof(badStrings) / sizeof(badStrings[0]); i++) > { > - bufLen = 0; > + bufLen = 0xdeadbeef; > + SetLastError(0xdeadbeef); > + /* This succeeds on Windows 10 with our CRYPT_STRING_BASE64 test data */ > ret = pCryptStringToBinaryA(badStrings[i].str, 0, badStrings[i].format, > NULL, &bufLen, NULL, NULL); > - ok(!ret && GetLastError() == ERROR_INVALID_DATA, > - "Expected ERROR_INVALID_DATA, got ret=%d le=%u\n", ret, GetLastError()); > + ok((!ret && GetLastError() == ERROR_INVALID_DATA) || broken(ret), > + "%d: Expected FALSE with ERROR_INVALID_DATA, got ret=%d le=%u len=%d\n", i, ret, GetLastError(), bufLen); I'm not convinced this should be considered broken. It would be worth testing some other truly bad strings, and the CRYPT_STRING_STRICT flag also. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: msrle32: Use the correct number of colors when biClrUsed = 0 (try 2)
by Alexandre Julliard 15 Mar '16

15 Mar '16

Bruno Jesus <00cpxxx(a)gmail.com> writes: > @@ -1647,27 +1655,33 @@ static LRESULT DecompressBegin(CodecInfo *pi, LPCBITMAPINFOHEADER lpbiIn, > > if (lpbiIn->biCompression != BI_RGB) > { > + int colors; > + > + if (lpbiIn->biClrUsed == 0) > + colors = 1 << lpbiIn->biBitCount; > + else > + colors = lpbiIn->biClrUsed; I don't think you want to do that for biBitCount > 8. -- Alexandre Julliard julliard(a)winehq.org

2 1

Re: [PATCH] winex11: Don't create a temporary context each time X11DRV_wglBindTexImageARB is called.
by Matteo Bruni 15 Mar '16

15 Mar '16

2016-03-12 14:57 GMT+01:00 Miklós Máté <mtmkls(a)gmail.com>: > Theoretically wglBindTexImageARB is supposed to be a fast > render-to-texture method, and creating a new context is anything but fast. > > This fixes horrible performance in Star Wars > Knights of the Old Republic when post-process effects are enabled. > > v2: fix context caching, fix destructor, fix comments > v3: better handling of context delete > > Signed-off-by: Miklós Máté <mtmkls(a)gmail.com> Thank you for following up after the review comments. Unfortunately I think there is one more (and hopefully last) bit which still needs addressing: > @@ -2301,6 +2314,7 @@ static struct wgl_pbuffer *X11DRV_wglCreatePbufferARB( HDC hdc, int iPixelFormat > SetLastError(ERROR_NO_SYSTEM_RESOURCES); > goto create_failed; /* unexpected error */ > } > + list_add_head( &pbuffer_list, &object->entry ); > TRACE("->(%p)\n", object); > return object; This needs to be done inside the critical section, so please put EnterCriticalSection() + LeaveCriticalSection() around it. FTR the wglCreateContext and wglCreateContextAttribsARB implementation functions indirectly acquire and release the critical section via get_gl_drawable() / release_gl_drawable(). It looks good to me otherwise.

1 0

Re: [v2 6/6] d3dx9: imlement setting named shader constants in effect.
by Matteo Bruni 15 Mar '16

15 Mar '16

2016-03-10 14:51 GMT+01:00 Paul Gofman <gofmanp(a)gmail.com>: > + unsigned i, j; We usually avoid the bare "unsigned". > + for (i = 0; i < parameters_count; i++) > + if (params[i] && params[i]->class == D3DXPC_OBJECT && params[i]->type == D3DXPT_SAMPLER) > + { > + struct d3dx_sampler *sampler; > + > + sampler = (struct d3dx_sampler *)params[i]->data; > + TRACE("sampler %s, register index %u, state count %u.\n", params[i]->name, > + cdesc[i].RegisterIndex, sampler->state_count); > + for (j = 0; j < sampler->state_count; j++) > + { > + hr = d3dx9_apply_state(effect, pass, &sampler->states[j], > + cdesc[i].RegisterIndex + (vs ? D3DVERTEXTEXTURESAMPLER0 : 0)); > + if (FAILED(hr)) > + ret = hr; > + } > + } It's better to add brackets to the for, for greater clarity.

1 0

Re: [2/2] user32: Skip menu loop for empty popup menus.
by Marvin 14 Mar '16

14 Mar '16

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=21431 Your paranoid android. === w864 (32 bit msg) === msg.c:6417: Test failed: Update region shouldn't be empty msg.c:6651: Test failed: InvalidateErase: 0: the msg sequence is not complete: expected 0085 - actual 0000 msg.c:6653: Test failed: Paint: 0: the msg sequence is not complete: expected 000f - actual 0000 msg.c:6423: Test failed: Regions are different msg.c:6423: Test failed: Regions are different msg.c:6423: Test failed: Regions are different === w1064 (32 bit msg) === msg.c:6417: Test failed: Update region shouldn't be empty msg.c:6651: Test failed: InvalidateErase: 0: the msg sequence is not complete: expected 0085 - actual 0000 msg.c:6653: Test failed: Paint: 0: the msg sequence is not complete: expected 000f - actual 0000 msg.c:6423: Test failed: Regions are different msg.c:6423: Test failed: Regions are different msg.c:6423: Test failed: Regions are different === w1064 (64 bit msg) === msg.c:6417: Test failed: Update region shouldn't be empty msg.c:6651: Test failed: InvalidateErase: 0: the msg sequence is not complete: expected 0085 - actual 0000 msg.c:6653: Test failed: Paint: 0: the msg sequence is not complete: expected 000f - actual 0000 msg.c:6423: Test failed: Regions are different msg.c:6423: Test failed: Regions are different msg.c:6423: Test failed: Regions are different

1 0

Re: [PATCH 2/2] d3d11/tests: Port swapchain_flip to d3d11.
by Henri Verbeet 14 Mar '16

14 Mar '16

On 13 March 2016 at 19:08, Stefan Dösinger <stefandoesinger(a)gmx.at> wrote: > --- > > I am not using create_test_context in this test because it would introduce > asymetry in how back buffer 0 is created that would make the test more > difficult to read in my opinion. It would probably be worth it, mostly because you also get to use draw_quad() that way. We could also consider making the "backbuffer" and "backbuffer_rtv" members arrays. For the moment it's probably more important that it matches the d3d10core test though. > > Signed-off-by: Stefan Dösinger <stefandoesinger(a)gmx.at> If you put the Signed-off-by here, it won't be put in the commit message.

2 2

Re: [PATCH 1/2] windowscodecs: Stub IWICMetadataQueryReader
by Vincent Povirk 14 Mar '16

14 Mar '16

You're referencing the block reader in MetadataQueryReader_CreateInstance but not releasing it in mqr_Release.

1 0

Re: [PATCH 1/8] wined3d: Introduce wined3d_rendertarget_view_clear().
by Henri Verbeet 14 Mar '16

14 Mar '16

On 14 March 2016 at 00:03, Józef Kucia <jkucia(a)codeweavers.com> wrote: > Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> > --- > dlls/wined3d/device.c | 18 +----------------- > dlls/wined3d/surface.c | 22 ++-------------------- > dlls/wined3d/view.c | 40 ++++++++++++++++++++++++++++++++++++++++ > dlls/wined3d/wined3d_private.h | 3 +++ > 4 files changed, 46 insertions(+), 37 deletions(-) > I'm not sure how I feel about this change. There doesn't seem to be a particularly compelling reason to change this, although I suppose there's no strong reason not to either. I guess it depends on where you're going with this.

2 2

Re: [PATCH 2/2] ole32: Fix refcounting of IObjContext per-thread instance
by Huw Davies 14 Mar '16

14 Mar '16

On Mon, Mar 14, 2016 at 08:10:00AM +0300, Nikolay Sivov wrote: > Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> > --- > dlls/ole32/compobj.c | 57 +++++++++++++++++++--------------------------- > dlls/ole32/tests/compobj.c | 46 ++++++++++++++++++++++--------------- > 2 files changed, 51 insertions(+), 52 deletions(-) > > diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c > index b095aeb..1081f98 100644 > --- a/dlls/ole32/compobj.c > +++ b/dlls/ole32/compobj.c > @@ -4683,10 +4683,13 @@ static ULONG Context_AddRef(Context *This) > > static ULONG Context_Release(Context *This) > { > - ULONG refs = InterlockedDecrement(&This->refs); > - if (!refs) > + if (!This->refs) > + { Since this is non-standard it needs a comment. Probably just referring to the constructor below. > HeapFree(GetProcessHeap(), 0, This); > - return refs; > + return 0; > + } > + > + return InterlockedDecrement(&This->refs); > } > > static HRESULT WINAPI Context_CTI_QueryInterface(IComThreadingInfo *iface, REFIID riid, LPVOID *ppv) > @@ -4924,39 +4927,19 @@ static const IObjContextVtbl Context_Object_Vtbl = > */ > HRESULT WINAPI CoGetObjectContext(REFIID riid, void **ppv) > { > - APARTMENT *apt = COM_CurrentApt(); > - Context *context; > + IObjContext *context; > HRESULT hr; > > TRACE("(%s, %p)\n", debugstr_guid(riid), ppv); > > *ppv = NULL; > - if (!apt) > - { > - if (!(apt = apartment_find_multi_threaded())) > - { > - ERR("apartment not initialised\n"); > - return CO_E_NOTINITIALIZED; > - } > - apartment_release(apt); > - } > - > - context = HeapAlloc(GetProcessHeap(), 0, sizeof(*context)); > - if (!context) > - return E_OUTOFMEMORY; > - > - context->IComThreadingInfo_iface.lpVtbl = &Context_Threading_Vtbl; > - context->IContextCallback_iface.lpVtbl = &Context_Callback_Vtbl; > - context->IObjContext_iface.lpVtbl = &Context_Object_Vtbl; > - context->refs = 1; > - > - hr = IComThreadingInfo_QueryInterface(&context->IComThreadingInfo_iface, riid, ppv); > - IComThreadingInfo_Release(&context->IComThreadingInfo_iface); > + hr = CoGetContextToken((ULONG_PTR*)&context); > + if (FAILED(hr)) > + return hr; > > - return hr; > + return IObjContext_QueryInterface(context, riid, ppv); > } > > - > /*********************************************************************** > * CoGetContextToken [OLE32.@] > */ > @@ -4985,16 +4968,22 @@ HRESULT WINAPI CoGetContextToken( ULONG_PTR *token ) > > if (!info->context_token) > { > - HRESULT hr; > - IObjContext *ctx; > + Context *context; > + > + context = HeapAlloc(GetProcessHeap(), 0, sizeof(*context)); > + if (!context) > + return E_OUTOFMEMORY; > + > + context->IComThreadingInfo_iface.lpVtbl = &Context_Threading_Vtbl; > + context->IContextCallback_iface.lpVtbl = &Context_Callback_Vtbl; > + context->IObjContext_iface.lpVtbl = &Context_Object_Vtbl; Add a comment here stating that context_token does not take a ref. > + context->refs = 0; > > - hr = CoGetObjectContext(&IID_IObjContext, (void **)&ctx); > - if (FAILED(hr)) return hr; > - info->context_token = ctx; > + info->context_token = &context->IObjContext_iface; > } > > *token = (ULONG_PTR)info->context_token; > - TRACE("apt->context_token=%p\n", info->context_token); > + TRACE("context_token=%p\n", info->context_token); > > return S_OK; > } I'm wondering whether this patch could be split since it's doing rather more than fixing a ref counting issue. Could you move the constructor to CoGetContextToken first and then fix the refs, or would that mess up the tests? Huw.

2 2

Re: [PATCH 6/8] d3d10core/tests: Add test for ClearDepthStencilView().
by Henri Verbeet 14 Mar '16

14 Mar '16

On 14 March 2016 at 00:03, Józef Kucia <jkucia(a)codeweavers.com> wrote: > +static float get_readback_float(struct texture_readback *rb, unsigned int x, unsigned int y) > +{ > + return rb->texture > + ? ((float *)rb->mapped_texture.pData)[rb->mapped_texture.RowPitch * y / sizeof(float) + x] : NAN; > +} Can the texture ever legitimately be NULL?

2 1

Re: [PATCH 2/8] wined3d: Implement depth clear in wined3d_device_clear_rendertarget_view().
by Henri Verbeet 14 Mar '16

14 Mar '16

On 14 March 2016 at 00:03, Józef Kucia <jkucia(a)codeweavers.com> wrote: > @@ -4100,7 +4110,13 @@ HRESULT CDECL wined3d_device_clear_rendertarget_view(struct wined3d_device *devi > rect = &r; > } > > - return wined3d_rendertarget_view_clear(view, rect, WINED3DCLEAR_TARGET, color, 0.0f, 0); > + if (!(flags & WINED3DCLEAR_TARGET) == !(flags & (WINED3DCLEAR_ZBUFFER | WINED3DCLEAR_STENCIL))) > + { > + ERR("Color and depth/stencil clears are mutually exclusive.\n"); > + return WINED3DERR_INVALIDCALL; > + } You may not need this. The documentation suggests depth/stencil views can only be created on depth formats, and I'd be inclined to believe it. IIRC it doesn't say much about creating rendertarget views on depth/stencil formats, but I wouldn't be all that surprised if that's not allowed either. In that case you'd just need to check the flags against the format capabilities. > +const char *debug_color(const struct wined3d_color *color) > +{ > + if (!color) > + return "(null)"; > + return wine_dbg_sprintf("{%.8e, %.8e, %.8e, %.8e}", > + color->r, color->g, color->b, color->a); > +} This is fine, but might as well be a separate change. There are a couple of other places where we trace wined3d_color values as well, the easiest way to find them is probably to look for the format string.

2 1

Re: d3drm: Use debugstr_a to print a string that can be NULL.
by Henri Verbeet 14 Mar '16

14 Mar '16

On 14 March 2016 at 10:36, Michael Stefaniuc <mstefani(a)redhat.de> wrote: > - TRACE("Mesh name is '%s'\n", This->name ? This->name : ""); > + TRACE("Mesh name is '%s'\n", debugstr_a(This->name)); You should remove the quotes, since debugstr_a() also adds quotes. Note that just being external data is enough reason to use debugstr_a(), it doesn't matter much if it can be NULL or not in that regard.

2 1

Re: [PATCH] Read operation's type explicitly as QStringList
by Nikolay Sivov 14 Mar '16

14 Mar '16

On 13.03.2016 19:12, Łukasz Wojniłowicz wrote: > Fixes bug #360129 > --- > kmymoney/plugins/csvimport/investprocessing.cpp | 22 ++++++++-------------- > 1 file changed, 8 insertions(+), 14 deletions(-) > Hi, Łukasz. Just pointing out so this patch is not lost by accident - wrong mailing list. You aimed for https://mail.kde.org/pipermail/kmymoney-devel/ probably or some list next to it.

1 0

Re: [PATCH] kernel32/tests: Skip ResolveDelayLoadedAPI tests on Win10+
by Nikolay Sivov 13 Mar '16

13 Mar '16

On 13.03.2016 19:42, André Hentschel wrote: > Signed-off-by: André Hentschel <nerv(a)dawncrow.de> > --- > dlls/kernel32/tests/loader.c | 6 ++++++ > 1 file changed, 6 insertions(+) > > diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c > index c35cf25..30cc2e4 100644 > --- a/dlls/kernel32/tests/loader.c > +++ b/dlls/kernel32/tests/loader.c > @@ -2728,6 +2728,11 @@ static void test_ResolveDelayLoadedAPI(void) > > cb_count = 0; > ret = pResolveDelayLoadedAPI(hlib, delaydir, failuredllhook, NULL, &itda[i], 0); > + if (!ret && td[i].succeeds) > + { > + win_skip("Skipping broken ResolveDelayLoadedAPI implementation\n"); > + goto cleanup; > + } > if (td[i].succeeds) > { > ok(ret != NULL, "Test %u: ResolveDelayLoadedAPI failed\n", i); > @@ -2745,6 +2750,7 @@ static void test_ResolveDelayLoadedAPI(void) > delaydir++; > } > > +cleanup: > FreeLibrary(hlib); > trace("deleting %s\n", dll_name); > DeleteFileA(dll_name); > So what's exactly wrong with it on Win10? Silencing failures does not seem useful if actual issue was not investigated.

1 0

Re: [PATCH] d3d9/tests Accept Windows 10 result
by Stefan Dösinger 13 Mar '16

13 Mar '16

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 Am 2016-03-13 um 17:04 schrieb Detlef Riekenberg: > Windows 10 is returning D3D_OK, so the recent behavior seems to be > better as before. That's why I used D3D_OK as expected result, > marked the old S_PRESENT_MODE_CHANGED as broken and removed the > wine_todo I think the new behavior is more broken than the old one. "It needs a present call to pick up a mode change" - If my memory serves me right the issue was that CheckDeviceState would incorrectly return D3D_OK instead of S_PRESENT_MODE_CHANGED when the mode was changed. Now it's always wrong, even with a preceding Present call. Of course in light of the Windows 10 results we may have to redefine "wrong". -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJW5aMEAAoJEN0/YqbEcdMweH8P/2OQymbb9EhNw4YqaXw0lcVN ozmH/7MYrxM4V1zzk+1+7XBR7nlIwDFRBGYw6LaZCiCmJYDfb1CTpYbSoVokHzQo UW2aCJCVRNWnZ5L72aZ12AoFq5sIuUX0FCAWhnpT4rNU7/bv35T/Zz0h439vn4RN +USZIHayRpmsJbhSbSn9VejSyin7GhBZ3VD7Qcd+7MqBxqOATX5p62cgFg+KUPkN Wi1HelDEHNsybHE4U60zYcZ2uxZxh7alfP6FjOtffOOxYilmG5eGEpGQX/dRIIv7 wxAfkjy/lgZqV9T4kEVyVO4tiwf9Vj1ccijkBNOttP7cFNGA4IM5W/urSWxL0uPd QEzP3QUv03NPN9Mtgq7K+DOyZmMUeedU+dHcCTwPJj/GTuXGxs2KHpLURXiAWXjD they7Iog2TEBFWuDskx58RHJyevbzKfWqfeM6/nJew5ter19W62Y1Sn01hfI0Ym0 aaTdzj+/tnf5pdc5Mgu6AtSRbApziwtYdfn4xGyEImw7J4pu7BnSmzHk8FMowtHm Dy2+GKE0FlmpAExwo0FAY2z6fCvMtIQMYzinU95LYaWvIggjsUo3wII3PxLtjKY0 8gXqBk+6WUUeDrAKqRqdkMCdzLBsVrlmxlj37KhfmPNCvG9gAlnMRegNW9eZkE2F aqvHGFSUrJzmk9CPtwtt =+25F -----END PGP SIGNATURE-----

1 0

Re: [PATCH] kernel32/tests: Skip ResolveDelayLoadedAPI tests on Win10+
by Marvin 13 Mar '16

13 Mar '16

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=21399 Your paranoid android. === w864 (32 bit loader) === loader.c:1820: Test failed: expected STILL_ACTIVE, got 195 loader.c:1855: Test failed: expected STILL_ACTIVE, got 195 === w1064 (32 bit loader) === loader.c:1820: Test failed: expected STILL_ACTIVE, got 195 loader.c:1855: Test failed: expected STILL_ACTIVE, got 195 === w864 (64 bit loader) === loader.c:1820: Test failed: expected STILL_ACTIVE, got 195 loader.c:1855: Test failed: expected STILL_ACTIVE, got 195 === w1064 (64 bit loader) === loader.c:1820: Test failed: expected STILL_ACTIVE, got 195 loader.c:1855: Test failed: expected STILL_ACTIVE, got 195

1 0

Builtin DLL View
by Keno Fischer 12 Mar '16

12 Mar '16

Hello everyone, out of curiosity, I was tracking down why a piece of code in julia [1] threw an assertion when running under wine, but not on windows proper. The problem in this piece of code turned out to be that VirtualQuery is claiming a region of memory is free, when it is actually occupied by part of one of the builtin dlls. If I understand correctly what's happening here is that builtin dlls are regular shared objects on the host system, and get loaded as such, but contain the respective windows dll inside of them (modulo header, which gets created in `map_dll` by mapping over a couple of pages in the middle). Later, after going through the load callback, `virtual_create_builtin_view` records the appropriate information in the view map. However, it only records what it knows about the inner dll, not the shared object wrapper around it. I was thinking of preparing a patch, but I am not sure how to go about it. Options I could see: - Expand the mapping in `virtual_create_builtin_view`. This seems most straightforward, but I don't quite know what the proper way to pass this information through to here is. Or maybe we can parse the wrapper's header right in the function, if we assume that it's base will always be 64K before the PE header base? - Unmap the parts of the shared library that do not constitute the inner dll. I would imagine that at some point wine stops relying on the native dynamic linker, at which point it would probably be safe to just unmap the extra pages such that view agrees with what is actually mapped. I'd be happy to put together a patch, but I'll need some guidance on how best to do this, since I haven't looked at the Wine codebase before today. [1] https://github.com/JuliaLang/julia/blob/01dd5ec0b25fc5fa8cf1fbae6bb00ef5874…

1 0

Re: kernel32: Don't set unconditionally SECTION_QUERY flag in OpenFileMapping.
by Dmitry Timoshkov 12 Mar '16

12 Mar '16

Thanks, I have only style related comments, and since I'm an author of existing tests I'd prefer to keep an original style if possible. Jacek Caban <jacek(a)codeweavers.com> wrote: > --- a/dlls/advapi32/tests/security.c > +++ b/dlls/advapi32/tests/security.c > @@ -5560,17 +5560,23 @@ static void test_filemap_security(void) > char temp_path[MAX_PATH]; > char file_name[MAX_PATH]; > DWORD ret, i, access; > - HANDLE file, mapping, dup; > + HANDLE file, mapping, dup, created_mapping; > static const struct > { > - int generic, mapped; > + DWORD generic, mapped; Please leave 'int' type, it changes nothing. > + BOOL open_only; > } map[] = > { > { 0, 0 }, > { GENERIC_READ, STANDARD_RIGHTS_READ | SECTION_QUERY | SECTION_MAP_READ }, > { GENERIC_WRITE, STANDARD_RIGHTS_WRITE | SECTION_MAP_WRITE }, > { GENERIC_EXECUTE, STANDARD_RIGHTS_EXECUTE | SECTION_MAP_EXECUTE }, > - { GENERIC_ALL, STANDARD_RIGHTS_REQUIRED | SECTION_ALL_ACCESS } > + { GENERIC_ALL, STANDARD_RIGHTS_REQUIRED | SECTION_ALL_ACCESS }, > + { SECTION_MAP_READ | SECTION_MAP_WRITE, SECTION_MAP_READ | SECTION_MAP_WRITE}, > + { SECTION_MAP_WRITE, SECTION_MAP_WRITE}, > + { SECTION_MAP_READ | SECTION_QUERY, SECTION_MAP_READ | SECTION_QUERY}, > + { SECTION_QUERY, SECTION_MAP_READ, TRUE }, > + { SECTION_QUERY | SECTION_MAP_READ, SECTION_QUERY | SECTION_MAP_READ } > }; > static const struct > { > @@ -5599,6 +5605,8 @@ static void test_filemap_security(void) > > for (i = 0; i < sizeof(prot_map)/sizeof(prot_map[0]); i++) > { > + if (map[i].open_only) continue; > + > SetLastError(0xdeadbeef); > mapping = CreateFileMappingW(file, NULL, prot_map[i].prot, 0, 4096, NULL); > if (prot_map[i].mapped) > @@ -5645,6 +5653,8 @@ static void test_filemap_security(void) > > for (i = 0; i < sizeof(map)/sizeof(map[0]); i++) > { > + if (map[i].open_only) continue; > + > SetLastError( 0xdeadbeef ); > ret = DuplicateHandle(GetCurrentProcess(), mapping, GetCurrentProcess(), &dup, > map[i].generic, FALSE, 0); > @@ -5659,6 +5669,24 @@ static void test_filemap_security(void) > CloseHandle(mapping); > CloseHandle(file); > DeleteFileA(file_name); > + > + created_mapping = CreateFileMappingA( INVALID_HANDLE_VALUE, NULL, PAGE_READWRITE, 0, 0x1000, > + "Wine Test Open Mapping"); > + ok( created_mapping != NULL, "CreateFileMapping failed with error %u\n", GetLastError() ); > + > + for(i=0; i < sizeof(map)/sizeof(*map); i++) Please add spaces around '=' and use sizeof(map[0]) for consistency with existing code. > + { > + if (!map[i].generic) continue; > + > + mapping = OpenFileMappingA( map[i].generic, FALSE, "Wine Test Open Mapping"); > + ok( mapping != NULL, "OpenFileMapping failed with error %d\n", GetLastError()); > + access = get_obj_access( mapping ); > + ok( access == map[i].mapped, "[%d] unexpected access flags %x, expected %x\n", > + i, access, map[i].mapped ); Please use "%d:" instead of [%d] and %#x instead of %x for consistency with existing code. P.S. That's perfectly fine to completely ignore my comments, just wanted to show how it looks like for comparison with d3d-like acceptance policy :) -- Dmitry.

3 4

Attachments missing in new wiki
by Qian Hong 11 Mar '16

11 Mar '16

Hi folks, Thanks for migrating the wiki to new site. Recently two different people ask me about attachments on https://wiki.winehq.org/WineConf2015, and I found they are missing, anyone knows what happen during the migration? Should we manually upload again? Is there backup for the attachments from old side? Thanks! -- Regards, Qian Hong - http://www.winehq.org

5 5

Re: [PATCH 2/6] ddraw/tests: Skip initialising "quad" and "indices" in test_specular_lighting() if a 3D device can't be crea
by Marvin 11 Mar '16

11 Mar '16

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=21376 Your paranoid android. === w1064 (32 bit ddraw2) === ddraw2.c:2360: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}. === w1064 (64 bit ddraw2) === ddraw2.c:2360: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}. === w1064 (32 bit ddraw7) === ddraw7.c:2275: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}. === w1064 (64 bit ddraw7) === ddraw7.c:2275: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}. === w1064 (32 bit ddraw4) === ddraw4.c:2545: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}. === w1064 (64 bit ddraw4) === The test timed out

1 0

Re: [PATCH try2] kernel32: Don't set unconditionally SECTION_QUERY flag in OpenFileMapping.
by Marvin 11 Mar '16

11 Mar '16

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=21372 Your paranoid android. === w1064 (32 bit security) === security.c:3964: Test failed: MACHINE\Software owner SID (S-1-5-18) != Administrators SID (S-1-5-32-544). security.c:4005: Test failed: Builtin Users ACE has unexpected flags (0x12 != 0xa) security.c:4009: Test failed: Builtin Users ACE has unexpected mask (0x20019 != 0x80000000) security.c:4018: Test failed: Builtin Admins ACE has unexpected flags (0x12 != 0x0) === w1064 (64 bit security) === security.c:4005: Test failed: Builtin Users ACE has unexpected flags (0x2 != 0xa) security.c:4009: Test failed: Builtin Users ACE has unexpected mask (0x20019 != 0x80000000) security.c:4018: Test failed: Builtin Admins ACE has unexpected flags (0x2 != 0x0)

1 0

Re: kernel32: Don't set unconditionally SECTION_QUERY flag in OpenFileMapping.
by Marvin 11 Mar '16

11 Mar '16

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=21371 Your paranoid android. === w1064 (32 bit security) === security.c:3964: Test failed: MACHINE\Software owner SID (S-1-5-18) != Administrators SID (S-1-5-32-544). security.c:4005: Test failed: Builtin Users ACE has unexpected flags (0x12 != 0xa) security.c:4009: Test failed: Builtin Users ACE has unexpected mask (0x20019 != 0x80000000) security.c:4018: Test failed: Builtin Admins ACE has unexpected flags (0x12 != 0x0) === w1064 (64 bit security) === security.c:4005: Test failed: Builtin Users ACE has unexpected flags (0x2 != 0xa) security.c:4009: Test failed: Builtin Users ACE has unexpected mask (0x20019 != 0x80000000) security.c:4018: Test failed: Builtin Admins ACE has unexpected flags (0x2 != 0x0)

1 0

Re: kernel32: Don't set unconditionally SECTION_QUERY flag in OpenFileMapping.
by Dmitry Timoshkov 11 Mar '16

11 Mar '16

Hi Jacek, Jacek Caban <jacek(a)codeweavers.com> wrote: > +static void test_OpenFileMapping(void) > +{ > + HANDLE created_handle, handle; > + DWORD access; > + int i; > + > + static const struct { > + DWORD open_access; > + DWORD handle_access; > + } access_tests[] = { > + { FILE_MAP_ALL_ACCESS, STANDARD_RIGHTS_REQUIRED | SECTION_QUERY | SECTION_EXTEND_SIZE | SECTION_MAP_EXECUTE | SECTION_MAP_READ | SECTION_MAP_WRITE }, > + { SECTION_MAP_READ | SECTION_MAP_WRITE, SECTION_MAP_READ | SECTION_MAP_WRITE}, > + { SECTION_MAP_WRITE, SECTION_MAP_WRITE}, > + { SECTION_MAP_READ | SECTION_QUERY, SECTION_MAP_READ | SECTION_QUERY}, > + { SECTION_QUERY, SECTION_MAP_READ }, > + { SECTION_QUERY | SECTION_MAP_READ, SECTION_QUERY | SECTION_MAP_READ }, > + { GENERIC_READ, READ_CONTROL | SECTION_MAP_READ | SECTION_QUERY } > + }; > + > + created_handle = CreateFileMappingA( INVALID_HANDLE_VALUE, NULL, PAGE_READWRITE, 0, 0x1000, > + "Wine Test Open Mapping"); > + ok( created_handle != NULL, "CreateFileMapping failed with error %u\n", GetLastError()); > + > + for(i=0; i < sizeof(access_tests)/sizeof(*access_tests); i++) > + { > + handle = OpenFileMappingA( access_tests[i].open_access, FALSE, "Wine Test Open Mapping"); > + ok( handle != NULL, "OpenFileMapping failed with error %d\n", GetLastError()); > + access = get_obj_access( handle ); > + ok( access == access_tests[i].handle_access, "[%d] unexpected access flags %x, expected %x\n", > + i, access, access_tests[i].handle_access ); > + CloseHandle( handle ); > + } > + > + CloseHandle( created_handle ); > + } Please correct me if I'm mistaken but this test is basically a modified copy of test_filemap_security() from dlls/advapi32/tests/security.c, why not add it there and extend the test if needed so that all related tests are collected in one place? -- Dmitry.

2 1

Re: [v2 3/6] d3dx9: implement fxlc constants (expressions) in effect.
by Marvin 10 Mar '16

10 Mar '16

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=21342 Your paranoid android. === w8 (32 bit effect) === effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. === w864 (32 bit effect) === effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. === w1064 (32 bit effect) === effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. === w864 (64 bit effect) === effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. === w1064 (64 bit effect) === effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c.

2 1

Re: [v2 1/6] d3dx9: add test for preshader in effect.
by Marvin 10 Mar '16

10 Mar '16

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=21340 Your paranoid android. === w8 (32 bit effect) === effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. === w864 (32 bit effect) === effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. === w1064 (32 bit effect) === effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. === w864 (64 bit effect) === effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. === w1064 (64 bit effect) === effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c.

1 0

Re: [PATCH 3/6] d3dx9: implement fxlc constants (expressions) in effect.
by Marvin 10 Mar '16

10 Mar '16

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=21341 Your paranoid android. === build (build) === Patch failed to apply

1 0

Re: wined3d: add Nvidia GPU SKUS (950,950M,960,960M)
by Henri Verbeet 10 Mar '16

10 Mar '16

On 10 March 2016 at 01:40, Rob Walker <bob.mt.wya(a)gmail.com> wrote: > + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX950, "NVIDIA GeForce GTX 950", DRIVER_NVIDIA_GEFORCE8, 2048}, > + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX950, "NVIDIA GeForce GTX 950M", DRIVER_NVIDIA_GEFORCE8, 2048}, This looks wrong. You're also missing a sign-off line.

1 0

Re: winex11.drv: Allow grabed window belonging to a different thread in send_mouse_input.
by Henri Verbeet 10 Mar '16

10 Mar '16

On 8 March 2016 at 17:01, Jacek Caban <jacek(a)codeweavers.com> wrote: > Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> > > If we call XGrabPointer on a window belonging to a different thread, we > may end up handling its events with different display and being unable > to associate X11 window with HWND. Is calling SetCapture() on a window from a different thread really supposed to be valid? Assuming it is, wouldn't it then be easier to grab the window from the correct thread instead? (Similar to how e.g. WM_X11DRV_CLIP_CURSOR works.)

2 1

Re: [PATCH] ole32: Implement CoGetCurrentLogicalThreadId()
by Huw Davies 10 Mar '16

10 Mar '16

On Wed, Mar 09, 2016 at 11:43:26PM +0300, Nikolay Sivov wrote: > diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c > index 183d8a0..e0c396f 100644 > --- a/dlls/ole32/tests/compobj.c > +++ b/dlls/ole32/tests/compobj.c > @@ -3093,6 +3093,21 @@ static void test_IMallocSpy(void) > ok(hr == CO_E_OBJNOTREG, "got 0x%08x\n", hr); > } > > +static void test_CoGetCurrentLogicalThreadId(void) > +{ > + GUID id, id2; > + HRESULT hr; > + > + hr = CoGetCurrentLogicalThreadId(NULL); > + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); > + > + memset(&id, 0, sizeof(id)); > + memset(&id2, 0, sizeof(id2)); > + hr = CoGetCurrentLogicalThreadId(&id); > + ok(hr == S_OK, "got 0x%08x\n", hr); > + ok(memcmp(&id, &id2, sizeof(id)), "got zero id\n"); Any reason why you didn't do ok(!IsEqualGUID(&id, &GUID_NULL), ...) here? A follow-up patch could implement Context_CTI_GetCurrentLogicalThreadId() using CoGetCurrentLogicalThreadId(). Huw.

2 1

Re: [PATCH 2/6] d3dx9: add preshaders to effect.
by Matteo Bruni 10 Mar '16

10 Mar '16

2016-03-09 14:38 GMT+01:00 Paul Gofman <gofmanp(a)gmail.com>: > Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> > --- > dlls/d3dx9_36/Makefile.in | 3 +- > dlls/d3dx9_36/d3dx9_36_private.h | 36 +++ > dlls/d3dx9_36/effect.c | 80 +++-- > dlls/d3dx9_36/preshader.c | 671 +++++++++++++++++++++++++++++++++++++++ > 4 files changed, 757 insertions(+), 33 deletions(-) > create mode 100644 dlls/d3dx9_36/preshader.c > > diff --git a/dlls/d3dx9_36/Makefile.in b/dlls/d3dx9_36/Makefile.in > index 95e3045..b71b38e 100644 > --- a/dlls/d3dx9_36/Makefile.in > +++ b/dlls/d3dx9_36/Makefile.in > @@ -19,6 +19,7 @@ C_SRCS = \ > texture.c \ > util.c \ > volume.c \ > - xfile.c > + xfile.c \ > + preshader.c Please keep this in alphabetic order. > @@ -5427,6 +5407,7 @@ static HRESULT d3dx9_parse_array_selector(struct d3dx9_base_effect *base, struct > DWORD string_size; > struct d3dx_object *object = &base->objects[param->object_id]; > char *ptr = object->data; > + HRESULT ret; > > TRACE("Parsing array entry selection state for parameter %p.\n", param); > > @@ -5443,9 +5424,30 @@ static HRESULT d3dx9_parse_array_selector(struct d3dx9_base_effect *base, struct > } > TRACE("Unknown DWORD: 0x%.8x.\n", *(DWORD *)(ptr + string_size)); > > - FIXME("Parse preshader.\n"); > + d3dx_create_preshader(base, (DWORD *)(ptr + string_size) + 1, object->size - (string_size + 1), > + D3DXPT_INT, &param->pres); > + ret = D3D_OK; > + param = param->referenced_param; > + if (param->type == D3DXPT_VERTEXSHADER || param->type == D3DXPT_PIXELSHADER) > + { > + UINT i; > > - return D3D_OK; > + for (i = 0; i < param->element_count; i++) > + { > + if (param->members[i].type != param->type) > + { > + FIXME("Unexpected member parameter type %u (need %u).\n", param->members[i].type, param->type); > + return D3DXERR_INVALIDDATA; > + } > + if (!param->members[i].pres) > + { > + TRACE("Creating preshader for object %u.\n", param->members[i].object_id); > + object = &base->objects[param->members[i].object_id]; > + d3dx_create_preshader(base, object->data, object->size, param->type, &param->members[i].pres); > + } > + } > + } > + return ret; We discussed about this a bit already and arguably it's a matter of conventions but: a shader in an effect might have a preshader (PRES comment with its various subparts) or not. Calling the "plain" CTAB constants a "preshader" doesn't seem right to me. > +#define MIN(a, b) ((a) < (b) ? (a) : (b)) > +#define MAX(a, b) ((a) > (b) ? (a) : (b)) min() and max() are already defined and should be usable. > + > +enum preshader_type > +{ > + PRES_TYPE_FXLC, > + PRES_TYPE_SHADER > +}; You should rename this to something that doesn't imply that "plain shader constants" are a preshader type or drop it entirely (depending on how you separate the preshader from the plain constants an explicit type field might not be necessary). > + > +enum PRES_OPS > +{ > + PO_NOP, > + PO_MOV, > + PO_OP_MAX > +}; I would use somewhat longer and more descriptive names (e.g. PRESHADER_OP_NOP). > + > +typedef float (*pres_op_func)(float *args, int ncomp); > + > +static float pres_mov(float *args, int ncomp) {return args[0];} > + > +#define PRES_OPCODE_MASK 0x7FF00000 > +#define PRES_OPCODE_SHIFT 20 > +#define PRES_SCALAR_FLAG 0x80000000 > +#define PRES_NCOMP_MASK 0x0000FFFF > + > +#define FOURCC_PRES 0x53455250 > +#define FOURCC_CLIT 0x54494C43 > +#define FOURCC_FXLC 0x434C5846 > +#define FOURCC_PRSI 0x49535250 > +#define PRES_SIGN 0x46580000 Please use lowercase hexadecimal constants. > +struct op_info > +{ > + DWORD opcode; > + char mnem[8]; > + unsigned int ninp_args; > + BOOL func_all_comps; > + pres_op_func func; > +}; > + > +static struct op_info pres_op_info[] = > +{ > + {0x000, "nop", 0, 0, NULL }, /* PO_NOP */ > + {0x100, "mov", 1, 0, pres_mov}, /* PO_MOV */ > +}; > + > +enum PRES_VALUE_TYPE > +{ > + PRES_VT_FLOAT, > + PRES_VT_DOUBLE, > + PRES_VT_INT, > + PRES_VT_BOOL > +}; > + > +enum PRES_TABLES > +{ > + PRES_TAB_NONE, > + PRES_TAB_IMMED, /* immediate double constants from CLIT */ > + PRES_TAB_CONST, /* preshader input float constants */ > + PRES_TAB_VERTEX, /* not used */ > + PRES_TAB_OCONST, /* shader input float constants */ > + PRES_TAB_OBCONST, /* shader input bool constants */ > + PRES_TAB_OICONST, /* shader input int constants */ > + PRES_TAB_REG, /* registers */ > + PRES_TAB_MAX > +}; Same here, with more expressive names you might not need comments at all (although they seem pretty clear already). BTW, what is that PRES_TAB_VERTEX entry? > + > +static const struct > +{ > + unsigned int value_size; > + unsigned int reg_value_cnt; > + enum PRES_VALUE_TYPE type; > +} > +table_info[] = > +{ > + {0, 0}, > + {sizeof(double), 1, PRES_VT_DOUBLE}, /* PRES_TAB_IMMED */ > + {sizeof(float), 4, PRES_VT_FLOAT }, /* PRES_TAB_CONST */ > + {sizeof(float), 4, PRES_VT_FLOAT }, /* PRES_TAB_VERTEX */ > + {sizeof(float), 4, PRES_VT_FLOAT }, /* PRES_TAB_OCONST */ > + {sizeof(BOOL), 1, PRES_VT_BOOL }, /* PRES_TAB_OBCONST */ > + {sizeof(int), 4, PRES_VT_INT, }, /* PRES_TAB_OICONST */ > + {sizeof(float), 4, PRES_VT_FLOAT } /* PRES_TAB_REG */ > +}; > + > +static const char *table_symbol[] = > +{ > + "(null)", "imm", "c", "v", "oc", "ob", "oi", "r" > +}; > + > +static const char *xyzw_str = "xyzw"; > + > +#define OFFSET2REG(table, offset) ((offset) / table_info[table].reg_value_cnt) > + > +static const enum PRES_TABLES pres_regset2table[] = > +{ > + PRES_TAB_OBCONST, /* D3DXRS_BOOL */ > + PRES_TAB_OICONST, /* D3DXRS_INT4 */ > + PRES_TAB_CONST, /* D3DXRS_FLOAT4 */ > + PRES_TAB_NONE, /* D3DXRS_SAMPLER */ > +}; > + > +static const enum PRES_TABLES shad_regset2table[] = > +{ > + PRES_TAB_OBCONST, /* D3DXRS_BOOL */ > + PRES_TAB_OICONST, /* D3DXRS_INT4 */ > + PRES_TAB_OCONST, /* D3DXRS_FLOAT4 */ > + PRES_TAB_NONE, /* D3DXRS_SAMPLER */ > +}; > + > +struct d3dx_pres_operand > +{ > + enum PRES_TABLES table; > + unsigned int offset; /* value index, not register index */ That probably isn't very clear. Maybe call it "component index" instead of "value index" or write a longer comment. > +}; > + > +struct d3dx_pres_ins > +{ > + enum PRES_OPS op; > + BOOL scalar_op; /* first input argument is scalar, > + first scalar component is propagated */ Maybe put the comment above the field instead. > + unsigned int ncomps; > + unsigned int ninp_args; > + struct d3dx_pres_operand inputs[3]; > + struct d3dx_pres_operand output; > +}; > + > +#define PRES_VS_BITS_PER_WORD (sizeof(DWORD)*8) > + > +struct d3dx_const_tab > +{ > + unsigned int ninputs; > + D3DXCONSTANT_DESC *inputs; > + struct d3dx_parameter **inputs_param; > + ID3DXConstantTable *ctab; > + /* TODO: do not keep input constant structure > + (use it only at the parse stage) */ > + const enum PRES_TABLES *regset2table; > +}; > + > +struct d3dx_fxlc I would call this d3dx_preshader, > +{ > + void *tables[PRES_TAB_MAX]; > + unsigned int table_sizes[PRES_TAB_MAX]; /* registers count */ > + DWORD *table_value_set[PRES_TAB_MAX]; > + > + unsigned int nins; > + struct d3dx_pres_ins *ins; > + > + struct d3dx_const_tab inputs; > +}; > + > +struct d3dx_preshader and this one d3dx_shader or something. > +{ > + enum preshader_type pres_type; > + D3DXPARAMETER_TYPE param_type; > + > + struct d3dx_fxlc fxlc; > + struct d3dx_const_tab shader_inputs; > +}; > + > +static void val_set_reg(struct d3dx_fxlc *fxlc, unsigned int table, unsigned int reg_idx) > +{ > + fxlc->table_value_set[table][reg_idx / PRES_VS_BITS_PER_WORD] |= > + 1 << (reg_idx % PRES_VS_BITS_PER_WORD); > +} > + > +static void dump_shader_bytecode(void *data, unsigned int size) > +{ > + DWORD *words = (DWORD *)data; > + unsigned int i, j, n; > + > + size /= 4; > + i = 0; > + while (i < size) > + { > + n = MIN(size - i, 15); > + for (j = 0; j < n; j++) > + MESSAGE("0x%08X,", words[i + j]); > + i += n; > + MESSAGE("\n"); > + } > +} I would just use TRACE instead. 15 seems a bit too much, I'd stick to 8 per line or so. Also please use lowercase with hex. > + > +static DWORD *find_bytecode_comment(DWORD *ptr, DWORD fourcc) > +{ > + while ((*ptr & 0xFFFF) == 0xFFFE) > + { > + if (*(ptr + 1) == fourcc) > + return ptr + 2; > + ptr += 1 + (*ptr >> 16); > + } > + return NULL; > +} > + > +static DWORD *parse_pres_arg(DWORD *ptr, struct d3dx_pres_operand *opr) > +{ > + if (*ptr != 0) > + { > + FIXME("Relative addressing not supported yet, word %#x.\n", *ptr); > + return NULL; > + } > + ptr++; > + > + if (*ptr < 1 || *ptr >= PRES_TAB_MAX || *ptr == PRES_TAB_VERTEX) It's probably better to use the proper enum value instead of '1'. > +static HRESULT get_constants_desc(DWORD *byte_code, struct d3dx_const_tab *out, struct d3dx9_base_effect *base) > +{ > + ID3DXConstantTable *ctab; > + D3DXCONSTANT_DESC *cdesc; > + struct d3dx_parameter **inputs_param; > + D3DXCONSTANTTABLE_DESC desc; > + HRESULT hr; > + D3DXHANDLE hc; > + unsigned int i; > + unsigned int cnt; > + > + out->inputs = cdesc = NULL; > + out->ctab = NULL; > + out->inputs_param = NULL; > + out->ninputs = 0; > + inputs_param = NULL; > + hr = D3DXGetShaderConstantTable(byte_code, &ctab); > + if (FAILED(hr) || !ctab) > + { > + TRACE("Could not get CTAB data, hr %#x.\n", hr); > + /* returnin OK is not a typo */ But that is a typo ;) > + return D3D_OK; > + } > + hr = ID3DXConstantTable_GetDesc(ctab, &desc); > + if (FAILED(hr)) > + { > + FIXME("Could not get CTAB desc, hr %#x.\n", hr); > + goto err_out; > + } > + > + cdesc = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(D3DXCONSTANT_DESC) * desc.Constants); > + inputs_param = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(struct d3dx_parameter **) * desc.Constants); Here you can use sizeof on the variable, as with your other patch, e.g.: cdesc = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*cdesc) * desc.Constants); inputs_param = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*inputs_param) * desc.Constants); Notice that the second allocation was wrong. I haven't looked in detail at the rest of the patch, although I spotted a number of formatting issues.

2 1

Re: wined3d: Use a printf format specifier to avoid a compiler warning [-Wformat-security]
by Józef Kucia 10 Mar '16

10 Mar '16

On Thu, Mar 10, 2016 at 7:46 AM, Hugh McMaster <hugh.mcmaster(a)outlook.com> wrote: > Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> > --- > dlls/wined3d/glsl_shader.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c > index 85244c8..8b0f617 100644 > --- a/dlls/wined3d/glsl_shader.c > +++ b/dlls/wined3d/glsl_shader.c > @@ -342,7 +342,7 @@ static void shader_glsl_append_imm_ivec(struct wined3d_string_buffer *buffer, > if (size > 1) > shader_addline(buffer, "ivec%u(%s%s%s%s)", size, str[0], str[1], str[2], str[3]); > else > - shader_addline(buffer, str[0]); > + shader_addline(buffer, "%s", str[0]); > } > > static const char *get_info_log_line(const char **ptr) > -- > 1.9.1 > > > This should be fixed by 120126 (https://www.winehq.org/pipermail/wine-patches/2016-March/148053.html).

1 0

Wiki migration update
by Rosanne DiMesio 10 Mar '16

10 Mar '16

The old MoinMoin wiki (http://oldwiki.winehq.org) is going to be taken down at the end of this month. Dimi will provide a tarball archive; snapshots should also be available on archive.org. Kyle has set up a page migration status page on http://oldwiki.winehq.org/PageMigration; you can check the status of any pages you are interested in there. If you decide to port any of remaining pages yourself, please update its status on that page and leave a note at the top of the ported page saying "This page has been ported to the new wiki." -- Rosanne DiMesio dimesio(a)earthlink.net

1 0

Re: [PATCH 1/6] d3dx9: add test for preshader in effect.
by Matteo Bruni 10 Mar '16

10 Mar '16

Hi Paul, I have a few more comments, in addition to Henri's (BTW thank you for taking a look). 2016-03-09 14:38 GMT+01:00 Paul Gofman <gofmanp(a)gmail.com>: > Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> > --- > dlls/d3dx9_36/tests/effect.c | 755 +++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 755 insertions(+) > > diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c > index a785f4d..8c5b5bb 100644 > --- a/dlls/d3dx9_36/tests/effect.c > +++ b/dlls/d3dx9_36/tests/effect.c > @@ -3009,6 +3009,760 @@ static void test_effect_states(IDirect3DDevice9 *device) > ok(value == 3, "Got result %u, expected %u.\n", value, 1); > } > > +/* > + * fxc.exe /Tfx_2_0 > + */ > +#if 0 > +float4 g_Pos1; > +float4 g_Pos2; > +float4 g_Selector[2] = {{0, 0, 0, 0}, {10, 10, 10, 10}}; > + > +float4 opvect1 = {0.0, -0.0, -2.2, 3.402823466e+38F}; > +float4 opvect2 = {1.0, 2.0, -3.0, 4.0}; > + > +int4 g_iVect = {4, 3, 2, 1}; > + > +vertexshader vs_arr[3] = > +{ > + asm > + { > + vs_1_0 > + def c0, 1, 1, 1, 1 > + mov oPos, c0 > + }, Indentation. > + asm > + { > + vs_1_1 > + def c0, 2, 2, 2, 2 > + mov oPos, c0 > + }, > + asm > + { > + vs_2_0 > + def c0, 3, 3, 3, 3 > + mov oPos, c0 > + } > +}; > + > +row_major float4x3 m4x3row={{11, 12, 13}, {21, 22, 23}, {31, 32, 33}, {41, 42, 43}}; > +row_major float3x4 m3x4row={{11, 12, 13, 14}, {21, 22, 23, 24}, {31, 32, 33, 34}}; > +column_major float4x3 m4x3column={{11, 12, 13},{21, 22, 23},{31, 32, 33},{41, 42, 43}}; > +column_major float3x4 m3x4column={{11, 12, 13, 14}, {21, 22, 23, 24}, {31, 32, 33, 34}}; > +row_major float2x2 m2x2row={{11, 12}, {21, 22}}; > +column_major float2x2 m2x2column={{11, 12}, {21, 22}}; > +row_major float2x3 m2x3row={{11, 12, 13}, {21, 22, 23}}; > +column_major float2x3 m2x3column={{11, 12, 13}, {21, 22, 23}}; > +row_major float3x2 m3x2row={{11, 12}, {21, 22}, {31, 32}}; > +column_major float3x2 m3x2column={{11, 12}, {21, 22}, {31, 32}}; Formatting. > + > +row_major bool2x3 mb2x3row = { {true, false, true}, {false, true, true}}; > +column_major bool2x3 mb2x3column = { {true, false, true}, {false, true, true}}; > + > +struct VS_OUTPUT > +{ > + float4 Position : POSITION; // vertex position > + float2 TextureUV : TEXCOORD0; // vertex texture coords > + float4 Diffuse : COLOR0; // vertex diffuse color > +}; Those comments don't seem particularly useful. > +static float test_effect_preshader_fconstsp[][4] = > +{ > + {11.0, 21.0, 0.0 , 0.0 }, Numbers are usually right-aligned. Also those need the 'f' suffix. The whitespace before the '}' seems wrong. > +static BOOL test_effect_preshader_bconsts[] = > +{ > + 1, 0, 1, 0, 1, 0 > +}; If you're using BOOL, you should also use TRUE and FALSE. > +static void test_effect_preshader(IDirect3DDevice9 *device) > +{ > + const static D3DXVECTOR4 fvect1 = {28.0f, 29.0f, 30.0f, 31.0f}; > + const static D3DXVECTOR4 fvect2 = {0.0f, 0.0f, 1.0f, 0.0f}; > + const static float fvect_empty[] = {-9999.0f, -9999.0f, -9999.0f, -9999.0f}; > + HRESULT hr; > + ID3DXEffect *effect; > + D3DXHANDLE par; > + UINT npasses; > + BOOL bval; > + D3DLIGHT9 light; > + DWORD value; > + float fdata[TEST_EFFECT_PRES_NFLOATMAX * 4]; > + BOOL bdata[TEST_EFFECT_PRES_NBOOL]; > + IDirect3DVertexShader9 *vshader; > + void *byte_code; > + UINT byte_code_size; Just use unsigned int instead of UINT or DWORD IMO. > + > + unsigned int i, j; > + > + hr = D3DXCreateEffect(device, test_effect_preshader_effect_blob, sizeof(test_effect_preshader_effect_blob), > + NULL, NULL, 0, NULL, &effect, NULL); > + ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); > + > + for (i = 0; i < TEST_EFFECT_PRES_NFLOATV; i++) > + { > + hr = IDirect3DDevice9_SetVertexShaderConstantF(device, 0, fvect_empty, 1); > + ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); > + } That is repeatedly setting c0, right? I don't think that's what you meant to do here. Regardless, you probably want to initialize all 256 float constant registers. > + hr = effect->lpVtbl->Begin(effect, &npasses, 0); > + ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); > + > + par = effect->lpVtbl->GetParameterByName(effect, NULL, "g_Pos2"); > + ok(par != NULL, "GetParameterByName failed.\n"); > + > + hr = effect->lpVtbl->SetVector(effect, par, &fvect1); > + ok(hr == D3D_OK, "SetFloatArray failed, hr %#x,\n", hr); Typo. More of the same below. > + for (i = 0; i < TEST_EFFECT_PRES_NOPTESTS; i++) > + { > + DWORD *v; > + > + hr = IDirect3DDevice9_GetLight(device, i % 8, &light); > + v = i < 8 ? (DWORD *)&light.Diffuse : (DWORD *)&light.Ambient; > + ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); > + if (i < TEST_EFFECT_PRES_NOPTESTS) This seems either wrong or unnecessary.

1 0

Re: [1/2] gdiplus/tests: Add tests for 0-pixel pens.
by Marvin 09 Mar '16

09 Mar '16

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=21326 Your paranoid android. === wxppro (32 bit graphics) === graphics.c:3903: Test failed: 1: expected 1, got 0 graphics.c:3928: Test failed: 1: expected 1, got 0 === w2003std (32 bit graphics) === graphics.c:3903: Test failed: 1: expected 1, got 0 graphics.c:3928: Test failed: 1: expected 1, got 0 === wvistau64 (32 bit graphics) === graphics.c:3903: Test failed: 1: expected 1, got 0 graphics.c:3928: Test failed: 1: expected 1, got 0 === w2008s64 (32 bit graphics) === graphics.c:3903: Test failed: 1: expected 1, got 0 graphics.c:3928: Test failed: 1: expected 1, got 0 === w7u (32 bit graphics) === graphics.c:3903: Test failed: 1: expected 1, got 0 graphics.c:3928: Test failed: 1: expected 1, got 0 === w7pro64 (32 bit graphics) === graphics.c:3903: Test failed: 1: expected 1, got 0 graphics.c:3928: Test failed: 1: expected 1, got 0 === w8 (32 bit graphics) === graphics.c:3903: Test failed: 1: expected 1, got 0 graphics.c:3928: Test failed: 1: expected 1, got 0 === w864 (32 bit graphics) === graphics.c:3903: Test failed: 1: expected 1, got 0 graphics.c:3928: Test failed: 1: expected 1, got 0 === w1064 (32 bit graphics) === graphics.c:3903: Test failed: 1: expected 1, got 0 graphics.c:3928: Test failed: 1: expected 1, got 0 === wvistau64 (64 bit graphics) === graphics.c:3903: Test failed: 1: expected 1, got 0 graphics.c:3928: Test failed: 1: expected 1, got 0 === w2008s64 (64 bit graphics) === graphics.c:3903: Test failed: 1: expected 1, got 0 graphics.c:3928: Test failed: 1: expected 1, got 0 === w7pro64 (64 bit graphics) === graphics.c:3903: Test failed: 1: expected 1, got 0 graphics.c:3928: Test failed: 1: expected 1, got 0 === w864 (64 bit graphics) === graphics.c:3903: Test failed: 1: expected 1, got 0 graphics.c:3928: Test failed: 1: expected 1, got 0 === w1064 (64 bit graphics) === graphics.c:3903: Test failed: 1: expected 1, got 0 graphics.c:3928: Test failed: 1: expected 1, got 0

1 0

Re: [PATCH 1/6] d3dx9: add test for preshader in effect.
by Henri Verbeet 09 Mar '16

09 Mar '16

On 9 March 2016 at 14:38, Paul Gofman <gofmanp(a)gmail.com> wrote: > +static float test_effect_preshader_fconstsv[][4] = > +{ > + {11.0, 12.0, 13.0, 0.0 }, > + {21.0, 22.0, 23.0, 0.0 }, > + {31.0, 32.0, 33.0, 0.0 }, > + {41.0, 42.0, 43.0, 0.0 }, > + {11.0, 21.0, 31.0, 0.0 }, > + {12.0, 22.0, 32.0, 0.0 }, > + {13.0, 23.0, 33.0, 0.0 }, > + {14.0, 24.0, 34.0, 0.0 }, > + {11.0, 12.0, 13.0, 14.0}, > + {21.0, 22.0, 23.0, 24.0}, > + {31.0, 32.0, 33.0, 34.0}, > + {11.0, 21.0, 31.0, 41.0}, > + {12.0, 22.0, 32.0, 42.0}, > + {13.0, 23.0, 33.0, 43.0} > +}; > + > +static float test_effect_preshader_fconstsp[][4] = > +{ > + {11.0, 21.0, 0.0 , 0.0 }, > + {12.0, 22.0, 0.0 , 0.0 }, > + {13.0, 23.0, 0.0 , 0.0 }, > + {11.0, 12.0, 0.0 , 0.0 }, > + {21.0, 22.0, 0.0 , 0.0 }, > + {31.0, 32.0, 0.0 , 0.0 }, > + {11.0, 12.0, 0.0 , 0.0 }, > + {21.0, 22.0, 0.0 , 0.0 }, > + {11.0, 21.0, 0.0 , 0.0 }, > + {12.0, 22.0, 0.0 , 0.0 }, > + {11.0, 12.0, 13.0, 0.0 }, > + {21.0, 22.0, 23.0, 0.0 }, > + {11.0, 21.0, 31.0, 0.0 }, > + {12.0, 22.0, 32.0, 0.0 } > +}; > + > +static BOOL test_effect_preshader_bconsts[] = > +{ > + 1, 0, 1, 0, 1, 0 > +}; > + > +static struct > +{ > + const char *comment; > + BOOL todo[4]; > + DWORD result[4]; > +} > +test_effect_preshader_op_results[] = > +{ > + {"1 / op", {1, 1, 1, 1}, {0x7f800000, 0xff800000, 0xbee8ba2e, 0x00200000}}, > + {"rsq", {1, 1, 3, 3}, {0x7f800000, 0x7f800000, 0x3f2c985d, 0x1f800000}}, > + {"mul", {1, 1, 1, 1}, {0x00000000, 0x80000000, 0x40d33334, 0x7f800000}}, > + {"add", {0, 1, 1, 1}, {0x3f800000, 0x40000000, 0xc0a66666, 0x7f7fffff}}, > + {"lt", {0, 0, 1, 0}, {0x3f800000, 0x3f800000, 0x00000000, 0x00000000}}, > + {"ge", {1, 1, 0, 1}, {0x00000000, 0x00000000, 0x3f800000, 0x3f800000}}, > + {"neg", {1, 1, 1, 1}, {0x80000000, 0x00000000, 0x400ccccd, 0xff7fffff}}, > + {"rcp", {1, 1, 1, 1}, {0x7f800000, 0xff800000, 0xbee8ba2e, 0x00200000}}, > + {"frac", {0, 0, 1, 0}, {0x00000000, 0x00000000, 0x3f4ccccc, 0x00000000}}, > + {"min", {0, 1, 1, 1}, {0x00000000, 0x80000000, 0xc0400000, 0x40800000}}, > + {"max", {1, 1, 1, 1}, {0x3f800000, 0x40000000, 0xc00ccccd, 0x7f7fffff}}, > + {"sin", {0, 1, 1, 3}, {0x00000000, 0x80000000, 0xbf4ef99e, 0xbf0599b3}}, > + {"cos", {1, 1, 1, 3}, {0x3f800000, 0x3f800000, 0xbf16a803, 0x3f5a5f96}}, > + {"den mul",{1, 1, 1, 1}, {0x7f800000, 0xff800000, 0xbb94f209, 0x000051ec}}, > + {"dot", {0, 1, 1, 0}, {0x00000000, 0x7f800000, 0x41f00000, 0x00000000}} > +}; These should all be const. I'd probably use D3DXVECTOR4 for the float constant arrays. > +#define TEST_EFFECT_PRES_NFLOATV (sizeof(test_effect_preshader_fconstsv) / sizeof(*test_effect_preshader_fconstsv)) > +#define TEST_EFFECT_PRES_NFLOATP (sizeof(test_effect_preshader_fconstsp) / sizeof(*test_effect_preshader_fconstsp)) > +#define TEST_EFFECT_PRES_NFLOATMAX (TEST_EFFECT_PRES_NFLOATV > TEST_EFFECT_PRES_NFLOATP ? \ > + TEST_EFFECT_PRES_NFLOATV : TEST_EFFECT_PRES_NFLOATP) > +#define TEST_EFFECT_PRES_NBOOL (sizeof(test_effect_preshader_bconsts) / sizeof(*test_effect_preshader_bconsts)) > +#define TEST_EFFECT_PRES_NOPTESTS (sizeof(test_effect_preshader_op_results) / \ > + sizeof(*test_effect_preshader_op_results)) I think you should either just write these out, or introduce an ARRAY_SIZE macro. > + const static D3DXVECTOR4 fvect1 = {28.0f, 29.0f, 30.0f, 31.0f}; > + const static D3DXVECTOR4 fvect2 = {0.0f, 0.0f, 1.0f, 0.0f}; > + const static float fvect_empty[] = {-9999.0f, -9999.0f, -9999.0f, -9999.0f}; This is not wrong, but the usual order is "static const". > + todo_wine_if(!!bdata[i] != !!test_effect_preshader_bconsts[i]) You can write that as "!bdata[i] != !test_effect_preshader_bconsts[i]" without changing the meaning. > + todo_wine ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); %#x to make it clear it's a hexadecimal value. You don't need to print the expected value if it's a constant. > + hr = IDirect3DDevice9_GetVertexShader(device, &vshader); > + ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); > + ok(vshader != NULL, "Got NULL vshader.\n"); > + if (vshader) > + { That kind of thing is pointless, if "vshader" was NULL, the test would have failed. > + ok(vshader == NULL, "Incorrect shader selected.\n"); I would prefer those as "ok(!vshader, ...);", but it's just style.

2 6

Re: configure: Fix cross-compiling of 32-bit Wine for OSX.
by Alexandre Julliard 09 Mar '16

09 Mar '16

Sebastian Lackner <sebastian(a)fds-team.de> writes: > @@ -175,6 +175,13 @@ case $host in > AC_SUBST(TARGETFLAGS,"-marm") > ;; > i[[3456789]]86*) > + if test "$cross_compiling" = "yes"; then > + CC="$CC -m32" > + CXX="$CXX -m32" > + host_cpu="i386" > + notice_platform="32-bit " > + AC_SUBST(TARGETFLAGS,"-m32") > + fi The idea is that if you are cross-compiling, you have already specified the correct host so this shouldn't be needed. How does the OS/X cross-compiler behave? -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH 2/5] user32: Add initial out of window procedure slots test
by Dmitry Timoshkov 09 Mar '16

09 Mar '16

Piotr Caban <piotr(a)codeweavers.com> wrote: > +static LRESULT WINAPI winproc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) > +{ > + if(!hwnd) { > + int *count = (int*)lparam; > + (*count)++; > + } > + return 0; > +} > + > +static LRESULT WINAPI winproc2(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) > +{ > + return 0; > +} ... > + memset(&wnd_classA, 0, sizeof(wnd_classA)); > + wnd_classA.lpszClassName = "winproc_test"; > + wnd_classA.lpfnWndProc = &winproc; Should be just "winproc" instead of "&winproc" > + ok(SetWindowLongPtrA(hwnd, GWLP_WNDPROC, (LONG_PTR)&winproc2), > + "SetWindowLongPtr failed with error %d\n", GetLastError()); Same here. -- Dmitry.

2 1

Re: [PATCH 5/6] d3d10core/tests: Add test for aoffimmi modifier.
by Henri Verbeet 09 Mar '16

09 Mar '16

On 8 March 2016 at 17:46, Józef Kucia <jkucia(a)codeweavers.com> wrote: > Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> > --- > dlls/d3d10core/tests/device.c | 34 ++++++++++++++++++++++++++++++++++ > 1 file changed, 34 insertions(+) > This (and the equivalent d3d11 test) fails for me on Windows: device.c:4022: Test failed: Test 18: Got unexpected color 0x00000000 at (0, 0). device.c:4022: Test failed: Test 18: Got unexpected color 0x00000000 at (0, 1). device.c:4022: Test failed: Test 18: Got unexpected color 0x00000000 at (1, 0). device.c:4022: Test failed: Test 18: Got unexpected color 0x00000000 at (1, 1). device.c:4022: Test failed: Test 18: Got unexpected color 0x00000000 at (2, 0). device.c:4022: Test failed: Test 18: Got unexpected color 0x00000000 at (2, 1). device.c:4022: Test failed: Test 18: Got unexpected color 0x00000000 at (3, 0). device.c:4022: Test failed: Test 18: Got unexpected color 0x00000000 at (3, 1).

1 0

Re: [PATCH 2/6] wined3d: Extend shader_glsl_gen_sample_code() to support offsets.
by Henri Verbeet 09 Mar '16

09 Mar '16

On 8 March 2016 at 17:46, Józef Kucia <jkucia(a)codeweavers.com> wrote: > +static void shader_glsl_append_imm_ivec(struct wined3d_string_buffer *buffer, > + const int *values, unsigned int size) > +{ > + const char *fmt = "%#x"; > + char str[4][17] = {{0}}; I guess this is inspired by shader_glsl_append_imm_vec4(), but I think you can just append to the buffer here. > + if (1 > size || size > 4) I don't think "1 > size" is all that more readable than "!size". > + for (i = size - 1; i >= 0; --i) > + { > + sprintf(str[i], fmt, values[i]); > + fmt = "%#x, "; > + } If you use ", %#x" for the format you don't need the awkward reverse loop. > - if (flags != WINED3D_GLSL_SAMPLE_LOAD) > - ERR("Unexpected flags for texelFetch %#x.\n", flags & ~WINED3D_GLSL_SAMPLE_LOAD); > + static const DWORD texel_fetch_flags = WINED3D_GLSL_SAMPLE_LOAD | WINED3D_GLSL_SAMPLE_OFFSET; > + if (flags & ~texel_fetch_flags) > + ERR("Unexpected flags for texelFetch %#x.\n", flags & ~texel_fetch_flags); The original had this as well, of course, but "Unexpected flags %#x for texelFetch.\n" may be better.

1 0

Re: [PATCH v2 2/5] dxgi: Add feature level support.
by Henri Verbeet 09 Mar '16

09 Mar '16

On 8 March 2016 at 23:19, Matteo Bruni <mbruni(a)codeweavers.com> wrote: > @@ -214,7 +215,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_adapter_CheckInterfaceSupport(IDXGIAdapter > return DXGI_ERROR_UNSUPPORTED; > } > > - if (FAILED(hr = dxgi_check_d3d10_support(adapter->parent, adapter))) > + if (FAILED(hr = dxgi_check_feature_level_support(adapter->parent, adapter, &feature_level, 1))) > return DXGI_ERROR_UNSUPPORTED; I don't think this does what you want it to do, > -HRESULT dxgi_check_d3d10_support(struct dxgi_factory *factory, struct dxgi_adapter *adapter) > +HRESULT dxgi_check_feature_level_support(struct dxgi_factory *factory, struct dxgi_adapter *adapter, > + const D3D_FEATURE_LEVEL *feature_levels, unsigned int level_count) ... > + D3D_FEATURE_LEVEL selected_feature_level = 0; ... > + return selected_feature_level; because this doesn't match the return type.

1 0

Re: [PATCH 1/5] wmasf: add stub dll
by Austin English 09 Mar '16

09 Mar '16

On Wed, Mar 9, 2016 at 12:31 AM, Austin English <austinenglish(a)gmail.com> wrote: > This patch series is for https://bugs.winehq.org/show_bug.cgi?id=39797 > > The bug subject is wmasf, but the uploaded log shows that there are a > few more dlls requested (api-ms-wine-core-*), so I went ahead and > added stubs for those while I was at it. > > -- > -Austin Sorry for the noise, gitconfig wasn't set up on the machine the patches were generated on, I'll resend tomorrow. -- -Austin

1 0

Re: [PATCH] d3dx9: IsParameterUsed stub should return TRUE.
by Henri Verbeet 08 Mar '16

08 Mar '16

On 7 March 2016 at 22:49, Matteo Bruni <matteo.mystral(a)gmail.com> wrote: > Yes, I guess returning TRUE is usually more likely to work. Of course Is that necessarily what you want though? It might be harder to debug something being slow because it's updating unused parameters than to debug something rendering incorrectly because it's not updating them. > a proper implementation would be even better (although it may be non > obvious to find out if a parameter is used, depending on what "used" > really means - it needs tests)... You always need tests, but a reasonable guess would be whether the parameter is referenced by the technique.

3 7

Metatrader 5 uses all CPU time
by Vyacheslav Napadovsky 08 Mar '16

08 Mar '16

Hello. I'm trying to launch Metatrader 5 in ubuntu with winehq-devel=1.9.5~ubuntu14.04.1 When I log in to my demo account the wineserver and terminal.exe (Metetrader 5 itself) start consume all available CPU. And if I'm trying to "Show all symbols" in "Market overview" then Metatrader UI just hangs. Here's last 10000 lines of 1.9GB log I dumped with WINEDEBUG=fixme-all,warn+all,+relay wine terminal.exe > terminal.log 2>&1 http://sendfile.su/1211848 (can't post it with pastebin.com, because it's over 500kB). Note, I killed process at the end with `killall terminal.exe` Moreover, when terminal.exe is running (without showing all symbols), `vmstat 1` shows that user space / system space consumes 50 / 50 % of CPU. And one more notice, if I run terminal.exe in a Virtual Box and assign this VM only one CPU core, than terminal.exe works fine consuming about 7% cpu, but with 2 cores it consumes 50%/50% with wineserver. On native Windows OS terminal.exe consumes less than 4% CPU with showing all symbols (I have 4 CPU cores on my notebook). Any clues where to dig next? -- Vyacheslav Napadovsky

1 0

wine dll loader
by Vyacheslav Napadovsky 08 Mar '16

08 Mar '16

Hello. I'm developing .dll plugin for thirdparty software. In Windows 8.0 all works fine (my plugin loads and unloads correctly), but in wine, I got DLL_PROCESS_ATTACH, then 7 DLL_THREAD_ATTACH at plugin loading stage and only 1 DLL_THREAD_DETACH at plugin unloading, i.e my plugin remains active (because no DLL_PROCESS_DETACH came in). Maybe that's because I spawn new thread (CreateThread) at DLL_PROCESS_ATTACH. Please, suggest ways to debug this issue. Regards, Vyacheslav Napadovsky

3 6

Re: [PATCH] opencl/tests: Add initial tests
by Henri Verbeet 08 Mar '16

08 Mar '16

On 8 March 2016 at 13:14, Detlef Riekenberg <wine.dev(a)web.de> wrote: > + * Copyright 2013 Detlef Riekenberg Is the year correct? > +INT WINAPI clGetPlatformIDs(UINT, PVOID*, UINT*); That doesn't look right. I also don't think anything in this test is particularly Windows specific.

1 0

Re: [PATCH] opencl/tests: Add initial tests
by Marvin 08 Mar '16

08 Mar '16

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=21276 Your paranoid android. === build (build) === Recreation of tests/Makefile failed

1 0

Re: user32: Do not block sending/posting WM_NOTIFY messages.
by Alexandre Julliard 08 Mar '16

08 Mar '16

Sebastian Lackner <sebastian(a)fds-team.de> writes: > @@ -11188,6 +11188,35 @@ static void test_quit_message(void) > ok_sequence(WmStopQuitSeq, "WmStopQuitSeq", FALSE); > } > > +static void test_notify_message(void) > +{ > + HWND hwnd; > + BOOL ret; > + > + hwnd = CreateWindowExA(0, "TestWindowClass", NULL, WS_OVERLAPPEDWINDOW, > + CW_USEDEFAULT, CW_USEDEFAULT, 300, 300, 0, NULL, NULL, 0); > + ok(hwnd != 0, "Failed to create window\n"); > + > + ret = SendNotifyMessageA(hwnd, WM_NOTIFY, 0x1234, 0xdeadbeef); > + ok(ret == TRUE, "SendNotifyMessageA failed with error %u\n", GetLastError()); > + ret = SendNotifyMessageW(hwnd, WM_NOTIFY, 0x1234, 0xdeadbeef); > + ok(ret == TRUE, "SendNotifyMessageW failed with error %u\n", GetLastError()); > + ret = SendMessageCallbackA(hwnd, WM_NOTIFY, 0x1234, 0xdeadbeef, NULL, 0); > + ok(ret == TRUE, "SendMessageCallbackA failed with error %u\n", GetLastError()); > + ret = SendMessageCallbackW(hwnd, WM_NOTIFY, 0x1234, 0xdeadbeef, NULL, 0); > + ok(ret == TRUE, "SendMessageCallbackW failed with error %u\n", GetLastError()); > + ret = PostMessageA(hwnd, WM_NOTIFY, 0x1234, 0xdeadbeef); > + ok(ret == TRUE, "PostMessageA failed with error %u\n", GetLastError()); > + ret = PostMessageW(hwnd, WM_NOTIFY, 0x1234, 0xdeadbeef); > + ok(ret == TRUE, "PostMessageW failed with error %u\n", GetLastError()); > + ret = PostThreadMessageA(GetCurrentThreadId(), WM_NOTIFY, 0x1234, 0xdeadbeef); > + ok(ret == TRUE, "PostThreadMessageA failed with error %u\n", GetLastError()); > + ret = PostThreadMessageW(GetCurrentThreadId(), WM_NOTIFY, 0x1234, 0xdeadbeef); > + ok(ret == TRUE, "PostThreadMessageW failed with error %u\n", GetLastError()); It would be interesting to test the received message contents too, also for the case of valid data. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [v3] d3dx9: support setting texture through SetValue in effect.
by Matteo Bruni 07 Mar '16

07 Mar '16

2016-03-06 9:39 GMT+01:00 Paul Gofman <gofmanp(a)gmail.com>: > Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> > --- a/dlls/d3dx9_36/tests/effect.c > +++ b/dlls/d3dx9_36/tests/effect.c > @@ -2389,6 +2389,43 @@ static void test_effect_parameter_value(IDirect3DDevice9 *device) > } > } > > +static void test_effect_setvalue_object(IDirect3DDevice9 *device) > +{ > + ID3DXEffect *effect; > + D3DXHANDLE parameter; > + IDirect3DTexture9 *texture; > + IDirect3DTexture9 *texture_set; > + HRESULT hr; > + ULONG count; > + > + hr = D3DXCreateEffect(device, test_effect_parameter_value_blob_object, > + sizeof(test_effect_parameter_value_blob_object), NULL, NULL, 0, NULL, &effect, NULL); > + ok(hr == D3D_OK, "Got result %#x, expected 0 (D3D_OK).\n", hr); > + > + parameter = effect->lpVtbl->GetParameterByName(effect, NULL, "tex"); > + ok(parameter != NULL, "GetParameterByName failed, got %p\n", parameter); > + > + texture = NULL; > + hr = D3DXCreateTexture(device, D3DX_DEFAULT, D3DX_DEFAULT, D3DX_DEFAULT, 0, 0, D3DPOOL_DEFAULT, &texture); > + ok(hr == D3D_OK, "Got result %#x, expected 0 (D3D_OK).\n", hr); > + hr = effect->lpVtbl->SetValue(effect, parameter, &texture, sizeof(IDirect3DTexture9 **)); That sizeof() happens to have the right value (because IDirect3DTexture9 * is also a pointer type) although it's technically incorrect. It's generally preferred to use the variable instead of the type in sizeof when possible (e.g. in this case sizeof(texture)), that would have avoided this mistake and it also helps in other cases. The other two calls to {GS}etValue below have the same issue.

1 0

[PATCH RFC] programs/winedevice.exe: allow group loading
by Aric Stewart 07 Mar '16

07 Mar '16

Here is a patch Sebastian Lackner wanted to see. This is continued work to allow group loading and working off of moving to using IoCreateDriver and such in winedevice. Still using a mailslot which I know Sebastian does not like. But it works quite well. -aric --- programs/winedevice/device.c | 190 ++++++++++++++++++++++++++++++++++++++----- 1 file changed, 170 insertions(+), 20 deletions(-)

1 0

Re: [PATCH] webservices: Fixed memory leaks in one error condition (Coverity)
by Hans Leidekker 07 Mar '16

07 Mar '16

Hi Marcus, > diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c > index 72e75c3..688bc2b 100644 > --- a/dlls/webservices/reader.c > +++ b/dlls/webservices/reader.c > @@ -928,7 +928,7 @@ static HRESULT read_attribute( struct reader *reader, WS_XML_ATTRIBUTE **ret ) > WS_XML_UTF8_TEXT *text; > unsigned int len = 0, ch, skip, quote; > const unsigned char *start; > - WS_XML_STRING *prefix, *localname; > + WS_XML_STRING *prefix, *localname = NULL; > HRESULT hr = WS_E_INVALID_FORMAT; > > if (!(attr = heap_alloc_zero( sizeof(*attr) ))) return E_OUTOFMEMORY; > @@ -948,7 +948,11 @@ static HRESULT read_attribute( struct reader *reader, WS_XML_ATTRIBUTE **ret ) > if (WsXmlStringEquals( prefix, &xmlns, NULL ) == S_OK) > { > attr->isXmlNs = 1; > - if (!(attr->prefix = alloc_xml_string( localname->bytes, localname->length ))) goto error; > + heap_free (prefix); > + if (!(attr->prefix = alloc_xml_string( localname->bytes, localname->length ))) { > + heap_free (localname); > + goto error; > + } > attr->localName = localname; > } > else Please replace tabs with spaces and use the same formatting as surrounding code. Otherwise it looks good, thanks.

1 0

Re: ddraw/tests: Fix function name in multiple ok() messages. (resend)
by Marvin 07 Mar '16

07 Mar '16

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=21242 Your paranoid android. === w1064 (32 bit dsurface) === dsurface.c:144: Test failed: Destination data after blitting is not correct dsurface.c:178: Test failed: Destination data after blitting is not correct dsurface.c:357: Test failed: Surface data after srckey blit does not match dsurface.c:382: Test failed: Surface data after src override key blit does not match dsurface.c:436: Test failed: Surface data after dest key blit does not match dsurface.c:462: Test failed: Surface data after dest key override blit does not match dsurface.c:524: Test failed: Surface data with src key and dest key blit does not match === w864 (64 bit dsurface) === dsurface.c:144: Test failed: Destination data after blitting is not correct dsurface.c:178: Test failed: Destination data after blitting is not correct dsurface.c:357: Test failed: Surface data after srckey blit does not match dsurface.c:382: Test failed: Surface data after src override key blit does not match dsurface.c:436: Test failed: Surface data after dest key blit does not match dsurface.c:462: Test failed: Surface data after dest key override blit does not match dsurface.c:524: Test failed: Surface data with src key and dest key blit does not match === w1064 (64 bit dsurface) === dsurface.c:144: Test failed: Destination data after blitting is not correct dsurface.c:178: Test failed: Destination data after blitting is not correct dsurface.c:357: Test failed: Surface data after srckey blit does not match dsurface.c:382: Test failed: Surface data after src override key blit does not match dsurface.c:436: Test failed: Surface data after dest key blit does not match dsurface.c:462: Test failed: Surface data after dest key override blit does not match dsurface.c:524: Test failed: Surface data with src key and dest key blit does not match

1 0

Re: user32: Do not block sending/posting WM_NOTIFY messages.
by Marvin 07 Mar '16

07 Mar '16

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=21241 Your paranoid android. === w1064 (32 bit msg) === msg.c:6417: Test failed: Update region shouldn't be empty msg.c:6651: Test failed: InvalidateErase: 0: the msg sequence is not complete: expected 0085 - actual 0000 msg.c:6653: Test failed: Paint: 0: the msg sequence is not complete: expected 000f - actual 0000 msg.c:6423: Test failed: Regions are different msg.c:6423: Test failed: Regions are different msg.c:6423: Test failed: Regions are different === w864 (64 bit msg) === msg.c:6417: Test failed: Update region shouldn't be empty msg.c:6651: Test failed: InvalidateErase: 0: the msg sequence is not complete: expected 0085 - actual 0000 msg.c:6653: Test failed: Paint: 0: the msg sequence is not complete: expected 000f - actual 0000 msg.c:6423: Test failed: Regions are different msg.c:6423: Test failed: Regions are different msg.c:6423: Test failed: Regions are different === w1064 (64 bit msg) === msg.c:6417: Test failed: Update region shouldn't be empty msg.c:6651: Test failed: InvalidateErase: 0: the msg sequence is not complete: expected 0085 - actual 0000 msg.c:6653: Test failed: Paint: 0: the msg sequence is not complete: expected 000f - actual 0000 msg.c:6423: Test failed: Regions are different msg.c:6423: Test failed: Regions are different msg.c:6423: Test failed: Regions are different

2 1

Re: make_xftmpl: Remove getopt prototype
by Alexandre Julliard 07 Mar '16

07 Mar '16

André Hentschel <nerv(a)dawncrow.de> writes: > @@ -92,8 +92,6 @@ static const struct keyword reserved_words[] = { > {"WORD", TOKEN_WORD} > }; > > -extern int getopt(int argc, char *const *argv, const char *optstring); This was explicitly added for MSVC builds. -- Alexandre Julliard julliard(a)winehq.org

1 0

Problems about License Compatibility
by Jianqiu Zhang 07 Mar '16

07 Mar '16

Hi, I am writing packet.dll which is a dependency of windows native wpcap.dll , Source can be get from winpcap.org , When I try to impelment it in wine, I found that I need to use the Packet32.h from packet.dll , Which has a different license than wine(LGPL), And I am not familar with solving license compability, Is there anyone that know how to solve this problem? Thanks in advance I Attach the License for Packet32.h below -- snip -- /* * Copyright (c) 1999 - 2005 NetGroup, Politecnico di Torino (Italy) * Copyright (c) 2005 - 2007 CACE Technologies, Davis (California) * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * 3. Neither the name of the Politecnico di Torino, CACE Technologies * nor the names of its contributors may be used to endorse or promote * products derived from this software without specific prior written * permission. * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * */

3 2

Re: ntdll: add stub for RtlAddAccessDeniedObjectAce and forward to AddAccessDeniedObjectAce in advapi32
by Alexandre Julliard 07 Mar '16

07 Mar '16

Louis Lenders <xerox.xerox2000x(a)gmail.com> writes: > Signed-off-by: Louis Lenders <xerox.xerox2000x at gmail.com> I'll apply this one, but next time could you please put a valid email address here? Thanks. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [v2] d3dx9: support setting texture through SetValue in effect.
by Paul Gofman 06 Mar '16

06 Mar '16

I will add a fall through message, thanks for the notice On 03/06/2016 11:29 AM, Paul Gofman wrote: > Hi Alistair, no, there is actual copy of data below there which is > required for this case either. Thanks, Paul. > > On Sun, 6 Mar 2016 at 06:16, Alistair Leslie-Hughes > <leslie_alistair(a)hotmail.com <mailto:leslie_alistair@hotmail.com>> wrote: > > Hi Paul, > I think you have missed a break in the switch or a message to > state fall through. > > > Alistair >

1 0

re: [v2] d3dx9: support setting texture through SetValue in effect.
by Alistair Leslie-Hughes 06 Mar '16

06 Mar '16

Hi Paul, I think you have missed a break in the switch or a message to state fall through. Alistair

1 0

wine 1.9.5 shared wow64 compile error
by Olivier F. R. Dierick 06 Mar '16

06 Mar '16

Hello, I've updated my git tree with 1.9.5 and now I have this error while compiling 32bit Wine with the --with-wine64 option (in a shared wow64 setup): ---begin make output--- ... rm -f fonts && ln -s ../1.9.5_wow_64/fonts fonts rm: impossible de supprimer « fonts »: est un dossier make: *** [fonts] Erreur 1 ... ---end make output--- It says fonts is a directory and can't be removed. I do out-of-tree builds. The 32bit directory doesn't exists when I run configure. After running configure, the 32bit build tree is there and contains a fonts directory with a single Makefile in it. I had no such error with Wine 1.9.4 and I don't have it when compiling stand-alone 32bit Wine or the 64bit shared wow part. I did a regression test and found this commit to be the culprit: ---begin git bisect output--- dcc16c7cac1cbf93096b072fe2f7b32ad08d1fa5 is the first bad commit commit dcc16c7cac1cbf93096b072fe2f7b32ad08d1fa5 Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 29 15:06:42 2016 +0900 makefiles: Don't generate global rules in disabled directories. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> ... ---end git bisect output--- I look forward to hearing from you soon -- Olivier F. R. Dierick o.dierick(a)piezo-forte.be

2 2

Wine-1.9.5 source code Cppcheck 1.69 scanning
by Игорь Чебаненко 04 Mar '16

04 Mar '16

Source code scanned with Cppcheck 1.69. Yes,I know that in this scanning report I have messages called "noise messages",but I hope,that you will see real bugs,and will ingnore this type of messages.

1 0

Re: [PATCH 07/10] d3d10_1: Implement D3D10CreateDeviceAndSwapChain1().
by Henri Verbeet 04 Mar '16

04 Mar '16

On 4 March 2016 at 11:43, Józef Kucia <jkucia(a)codeweavers.com> wrote: > It doesn't seem to be easy to declare D3D10CreateDeviceAndSwapChain1() > without using cpp_quote() because D3D10_DRIVER_TYPE is unknown to idl > (it's declared in d3d10misc.h). My knowledge about idl is limited > so maybe someone knows better. The easiest thing to do would be to use "enum D3D10_DRIVER_TYPE" instead of "D3D10_DRIVER_TYPE". I wouldn't be opposed to just using idl for d3d10misc.h either though. > +cpp_quote("HRESULT WINAPI D3D10CreateDeviceAndSwapChain1(IDXGIAdapter *,") > +cpp_quote(" D3D10_DRIVER_TYPE, HMODULE, UINT, D3D10_FEATURE_LEVEL1,") > +cpp_quote(" UINT, DXGI_SWAP_CHAIN_DESC *, IDXGISwapChain **, ID3D10Device1 **);") I'd prefer this with parameter names either way.

1 0

Re: [PATCH 1/2] user32: Store pointer to timer callback in SetTimer function instead of treating it as window procedure
by Alexandre Julliard 04 Mar '16

04 Mar '16

Piotr Caban <piotr(a)codeweavers.com> writes: > I decided to leave 16-bit version of SetTimer as is for now. I haven't > seen any application running out of window procedures in this > case. This patch will change behavior of following 16-bit application: > SetTimer(hWnd, TIMER_ID, 1, tfunc); > GetMessage32(&msg, 0, 0, 0, TRUE); //get's WM_TIMER message > DispatchMessage32(&msg, TRUE); > Now this code will no longer call tfunc callback. According to my test > new behavior is correct. The more likely case is a 16-bit app retrieving a 32-bit timer and calling it through DispatchMessage16. How is this going to work with your proposed changes? -- Alexandre Julliard julliard(a)winehq.org

2 4

Re: [PATCH 2/2 v2] d3drm: Implement AddDestroyCallback/DeleteDestroyCallback for a viewport
by Henri Verbeet 04 Mar '16

04 Mar '16

On 3 March 2016 at 09:10, Nikolay Sivov <nsivov(a)codeweavers.com> wrote: > +HRESULT d3drm_object_delete_destroy_callback(struct d3drm_object *object, D3DRMOBJECTCALLBACK cb, void *ctx) > +{ > + struct destroy_callback *callback, *callback2; > + > + if (!cb) > + return D3DRMERR_BADVALUE; > + > + LIST_FOR_EACH_ENTRY_SAFE(callback, callback2, &object->destroy_callbacks, struct destroy_callback, entry) > + { > + if (callback->cb == cb && callback->ctx == ctx) > + { > + list_remove(&callback->entry); > + HeapFree(GetProcessHeap(), 0, callback); > + } > + } > + > + return D3DRM_OK; > +} I won't hold it against the patch (much), but is that correct? E.g. suppose you do something like the following: add cb1 add cb2 add cb3 add cb2 delete cb2 What would the sequence be that ends up getting called?

2 1

Re: [v3 6/7] d3dx9: implement state save and restore in effect.
by Matteo Bruni 03 Mar '16

03 Mar '16

2016-03-03 13:22 GMT+01:00 Paul Gofman <gofmanp(a)gmail.com>: > Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> > --- For your next submissions, can you please write a short changelog of the differences with the previous version(s) of the same patch? Ideally that goes after the '---'. > @@ -3493,18 +3501,34 @@ static HRESULT WINAPI ID3DXEffectImpl_Begin(ID3DXEffect *iface, UINT *passes, DW > if (flags & ~(D3DXFX_DONOTSAVESTATE | D3DXFX_DONOTSAVESAMPLERSTATE | D3DXFX_DONOTSAVESHADERSTATE)) > WARN("Invalid flags (%#x) specified.\n", flags); > > - if (This->manager || flags & D3DXFX_DONOTSAVESTATE) > + if (effect->manager || flags & D3DXFX_DONOTSAVESTATE) > { > TRACE("State capturing disabled.\n"); > } > else > { > - FIXME("State capturing not supported, yet!\n"); > + HRESULT hr; > + unsigned int i; > + > + if (!technique->saved_state) > + { > + hr = IDirect3DDevice9_BeginStateBlock(effect->device); > + if (FAILED(hr)) > + ERR("BeginStateBlock failed, hr %#x.\n", hr); > + for (i = 0; i < technique->pass_count; i++) > + d3dx9_apply_pass_states(effect, &technique->passes[i]); This is likely correct but testing it with a technique with at least 2 passes would be nice.

1 0

Re: [v3 5/7] d3dx9: implement sampler and texture effect states application.
by Matteo Bruni 03 Mar '16

03 Mar '16

2016-03-03 13:22 GMT+01:00 Paul Gofman <gofmanp(a)gmail.com>: > Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> > --- > dlls/d3dx9_36/effect.c | 41 +++++++++++++++++++++++++++++++++++++++-- > dlls/d3dx9_36/tests/effect.c | 2 +- > 2 files changed, 40 insertions(+), 3 deletions(-) > > diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c > index e1f01f2..6813c79 100644 > --- a/dlls/d3dx9_36/effect.c > +++ b/dlls/d3dx9_36/effect.c > @@ -2681,7 +2681,8 @@ HRESULT d3dx_set_shader_const_state(IDirect3DDevice9 *device, enum SHADER_CONSTA > return D3D_OK; > } > > -static HRESULT d3dx9_apply_state(struct ID3DXEffectImpl *effect, struct d3dx_pass *pass, struct d3dx_state *state) > +static HRESULT d3dx9_apply_state(struct ID3DXEffectImpl *effect, struct d3dx_pass *pass, > + struct d3dx_state *state, int parent_index) I would have used an unsigned int here, flagging "none" with ~0u.

1 0

Re: [v3 4/7] d3dx9: implement shader constants effect states application.
by Matteo Bruni 03 Mar '16

03 Mar '16

2016-03-03 13:22 GMT+01:00 Paul Gofman <gofmanp(a)gmail.com>: > Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> > --- > + UINT nelem; "unsigned int element_count;" would be better.

1 0

Re: [v3 3/7] d3dx9: implement light and material effect states application.
by Matteo Bruni 03 Mar '16

03 Mar '16

2016-03-03 13:22 GMT+01:00 Paul Gofman <gofmanp(a)gmail.com>: > Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> > --- > + light_tbl[] = > + { > + {FIELD_OFFSET(D3DLIGHT9, Type), "LC_TYPE"}, > + {FIELD_OFFSET(D3DLIGHT9, Diffuse), "LT_DIFFUSE"}, > + {FIELD_OFFSET(D3DLIGHT9, Specular), "LT_SPECULAR"}, > + {FIELD_OFFSET(D3DLIGHT9, Ambient), "LT_AMBIENT"}, > + {FIELD_OFFSET(D3DLIGHT9, Position), "LT_POSITION"}, > + {FIELD_OFFSET(D3DLIGHT9, Direction), "LT_DIRECTION"}, > + {FIELD_OFFSET(D3DLIGHT9, Range), "LT_RANGE"}, > + {FIELD_OFFSET(D3DLIGHT9, Falloff), "LT_FALLOFF"}, > + {FIELD_OFFSET(D3DLIGHT9, Attenuation0), "LT_ATTENUATION0"}, > + {FIELD_OFFSET(D3DLIGHT9, Attenuation1), "LT_ATTENUATION1"}, > + {FIELD_OFFSET(D3DLIGHT9, Attenuation2), "LT_ATTENUATION2"}, > + {FIELD_OFFSET(D3DLIGHT9, Theta), "LT_THETA"}, > + {FIELD_OFFSET(D3DLIGHT9, Phi), "LT_PHI"} > + }; This is misindented. > + switch (op) > + { > + case LT_TYPE: > + TRACE("LT_TYPE %u.\n", *(D3DLIGHTTYPE *)value); > + light->Type = *(D3DLIGHTTYPE *)value; > + break; > + case LT_DIFFUSE: > + case LT_SPECULAR: > + case LT_AMBIENT: > + { > + D3DCOLORVALUE c = *(D3DCOLORVALUE *)value; > + > + TRACE("%s (%f %f %f %f).\n", light_tbl[op].name, c.r, c.g, c.b, c.a); > + *(D3DCOLORVALUE *)((char *)light + light_tbl[op].offset) = c; It's probably a bit nicer to cast to (BYTE *) instead of (char *). > diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c > index 81a7d12..3bcba72 100644 > --- a/dlls/d3dx9_36/tests/effect.c > +++ b/dlls/d3dx9_36/tests/effect.c > @@ -2910,11 +2910,11 @@ static void test_effect_states(IDirect3DDevice9 *device) > } > > hr = IDirect3DDevice9_GetLightEnable(device, 2, &bval); > - todo_wine ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); > + ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); > if (hr == D3D_OK) > ok(bval, "Got result %u, expected TRUE.\n", bval); > hr = IDirect3DDevice9_GetLight(device, 2, &light); > - todo_wine ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); > + ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); > if (hr == D3D_OK) > ok(light.Position.x == 4.0f && light.Position.y == 5.0f && light.Position.z == 6.0f, > "Got unexpected light position (%f, %f, %f).\n", light.Position.x, light.Position.y, light.Position.z); > @@ -2950,9 +2950,9 @@ static void test_effect_states(IDirect3DDevice9 *device) > todo_wine ok(!memcmp(mat.m, test_mat.m, sizeof(mat)), "World matrix not restored.\n"); > > hr = IDirect3DDevice9_GetLightEnable(device, 2, &bval); > - todo_wine ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); > + ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); > if (hr == D3D_OK) > - ok(!bval, "Got result %u, expected 0.\n", bval); > + todo_wine ok(!bval, "Got result %u, expected 0.\n", bval); It would be nice if the test also checked the material.

1 0

Re: [v3 1/7] d3dx9: add test for basic effect state management.
by Matteo Bruni 03 Mar '16

03 Mar '16

2016-03-03 13:22 GMT+01:00 Paul Gofman <gofmanp(a)gmail.com>: > + > + if (effect) > + effect->lpVtbl->Release(effect); > +} The if is unnecessary, the effect creation should never fail (and if it failed you would have already crashed long before that).

1 0

Re: [3/5] imm32: Create default IME window when creating a new window.
by Aric Stewart 03 Mar '16

03 Mar '16

Ok I have been chatting with Alexandre and also dusting off my own memories here. The problem with hooks is that they create serious performance issues. Alexandre will likely not accept any patch that involves hooks. What is likely a better approach is to move some of this code into user32. I know that on windows there is very close integration between imm32 and user32, beyond what we have in wine. I am thinking maybe we need the default IME window creation in user32 and have it stored somewhere, like in the TEB, where it can be in existing thread data. I was brainstorming with Alexandre so that I could give you some guidance, and he said that the user_thread_info block (user32/user_private.h stored in the TEB->Win32ClientInfo) would be acceptable, but the user_thread_info is private to user32, so there would have to be a way to get that to that data so that ImmGetDefaultIMEWnd can find that window. I dont have the answers for that yet, but it is a starting point to try to figure this out. I know when I implemented the IMMThreadData stuff in imm32 it was all mostly thing I felt like really belonged in the TEB, but I was not in a place where I needed to really advocated for that change. There are other Reserved blocks in the TEB that you could argue imm32 could take over if you feel that to be better than the user_thread_info structure. Unfortunately it sounds like hooks will not be acceptable for us. -aric On 3/2/16 7:54 AM, Akihiro Sagawa wrote: > Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> > --- > dlls/imm32/imm.c | 56 +++++++++++++++++++++++++++++++++++++++++++++++- > dlls/imm32/tests/imm32.c | 4 ++-- > 2 files changed, 57 insertions(+), 3 deletions(-) > > > >

1 0

Re: [4/5] imm32: Move default IME window creation to WM_NCCREATE hook.
by Aric Stewart 03 Mar '16

03 Mar '16

Hooks are only installed if GetSystemMetrics(SM_DBCSENABLED) and GetSystemMetrics(SM_IMMENABLED) are both true. Your earlier patch which implement SM_IMEENABLED turns it on if GetVersion() & 0xff >= 6 or if the version is == 5 SM_DBCSENABLED, what window versions. So Any prefix with a version of lower than XP would no longer have default IME windows? For Windows XP and higher then we need SM_DBCSENABLED to be true. SM_DBCSENABLED results in the codepage having a MaxCharSize as > 1, which looks like it pretty much always true, especially for UTF8, but under which situations would that not be the case, and again we would be disabling the default IME window? I like what you are doing here, I just want to understand what situations we would be disabling ime input. -aric On 3/2/16 7:54 AM, Akihiro Sagawa wrote: > > In other words, we no longer create it in ImmGetDefaultIMEWnd(). > > Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> > --- > dlls/imm32/imm.c | 59 ++++++++++++++++++++++++++++++++++---------------------- > 1 file changed, 36 insertions(+), 23 deletions(-) > > > >

2 1

Re: [1/5] imm32/tests: Add tests for life cycle of default IME window.
by Aric Stewart 03 Mar '16

03 Mar '16

I worry about the 64-bit errors and even if they are false alarms we will want to be able to at least prevent/silence them. Otherwise looks good! -aric On 3/2/16 7:53 AM, Akihiro Sagawa wrote: > Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> > --- > dlls/imm32/tests/imm32.c | 51 ++++++++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 51 insertions(+) > > > >

2 1

Re: libport: Mark internal functions and data tables as hidden.
by Francois Gouget 03 Mar '16

03 Mar '16

commit 34174e2ca8cb61150d3d880400d8231a39d38307 Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 24 13:36:41 2016 +0900 libport: Mark internal functions and data tables as hidden. This patch breaks the compilation on Solaris 11.11: ld: fatal: relocation error: R_386_GOTOFF: file ../../libs/port/libwine_port.a(fold.o): symbol wine_digitmap: a GOT relative relocation must reference a local symbol ld: fatal: relocation error: R_386_GOTOFF: file ../../libs/port/libwine_port.a(fold.o): symbol wine_compatmap: a GOT relative relocation must reference a local symbol Removing the DECLSPEC_HIDDEN on wine_digitmap(), wine_compatmap() but also wine_compose() and wine_decompose() fixes this. As far as I can tell the linker considers that hidden symbols are not visible outside the static library. -- Francois Gouget <fgouget(a)free.fr> http://fgouget.free.fr/ A black hole is just God dividing by zero.

2 7

Re: [PATCH] manpages: markup fixes
by Michael Stefaniuc 03 Mar '16

03 Mar '16

On 03/02/2016 02:03 PM, Eric S. Raymond wrote: > Marcus Meissner <marcus(a)jet.franken.de>: >> Supplied by Eric S. Raymond. >> >> (Did not send a specific signed-off-by, but his email and his follow up email >> seems to imply it.) > > That is correct. > > Thanks, I have marked thesse patches "promised" in my database. The patches were committed: https://source.winehq.org/git/wine.git/commitdiff/0d06ebf5fb515e19cd9ec951d… Thank you for your contribution to Wine! bye michael

2 1

Re: shell32/tests: Use SetRectEmpty() instead of open coding it.
by Marvin 03 Mar '16

03 Mar '16

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=21142 Your paranoid android. === w1064 (32 bit ebrowser) === ebrowser.c:524: Test failed: unknown service, serviceID: {c13b3d3a-10d6-43f5-98db-b7ddd987b33d}, riid: {c13b3d3a-10d6-43f5-98db-b7ddd987b33d} ebrowser.c:524: Test failed: unknown service, serviceID: {2e228ba3-ea25-4378-97b6-d574faeba356}, riid: {2e228ba3-ea25-4378-97b6-d574faeba356} ebrowser.c:524: Test failed: unknown service, serviceID: {c13b3d3a-10d6-43f5-98db-b7ddd987b33d}, riid: {c13b3d3a-10d6-43f5-98db-b7ddd987b33d} ebrowser.c:524: Test failed: unknown service, serviceID: {c13b3d3a-10d6-43f5-98db-b7ddd987b33d}, riid: {c13b3d3a-10d6-43f5-98db-b7ddd987b33d} ebrowser.c:524: Test failed: unknown service, serviceID: {c13b3d3a-10d6-43f5-98db-b7ddd987b33d}, riid: {c13b3d3a-10d6-43f5-98db-b7ddd987b33d} ebrowser.c:524: Test failed: unknown service, serviceID: {c13b3d3a-10d6-43f5-98db-b7ddd987b33d}, riid: {c13b3d3a-10d6-43f5-98db-b7ddd987b33d} ebrowser.c:524: Test failed: unknown service, serviceID: {c13b3d3a-10d6-43f5-98db-b7ddd987b33d}, riid: {c13b3d3a-10d6-43f5-98db-b7ddd987b33d} ebrowser.c:524: Test failed: unknown service, serviceID: {d56a2092-7dbf-4144-a110-c2963a709832}, riid: {d56a2092-7dbf-4144-a110-c2963a709832} ebrowser.c:524: Test failed: unknown service, serviceID: {d56a2092-7dbf-4144-a110-c2963a709832}, riid: {d56a2092-7dbf-4144-a110-c2963a709832} ebrowser.c:524: Test failed: unknown service, serviceID: {d56a2092-7dbf-4144-a110-c2963a709832}, riid: {42f85136-db7e-439c-85f1-e4075d135fc8} ebrowser.c:524: Test failed: unknown service, serviceID: {d56a2092-7dbf-4144-a110-c2963a709832}, riid: {42f85136-db7e-439c-85f1-e4075d135fc8} ebrowser.c:524: Test failed: unknown service, serviceID: {c13b3d3a-10d6-43f5-98db-b7ddd987b33d}, riid: {c13b3d3a-10d6-43f5-98db-b7ddd987b33d} ebrowser.c:524: Test failed: unknown service, serviceID: {d56a2092-7dbf-4144-a110-c2963a709832}, riid: {d56a2092-7dbf-4144-a110-c2963a709832} ebrowser.c:524: Test failed: unknown service, serviceID: {d56a2092-7dbf-4144-a110-c2963a709832}, riid: {d56a2092-7dbf-4144-a110-c2963a709832} ebrowser.c:524: Test failed: unknown service, serviceID: {d56a2092-7dbf-4144-a110-c2963a709832}, riid: {d56a2092-7dbf-4144-a110-c2963a709832} ebrowser.c:524: Test failed: unknown service, serviceID: {d56a2092-7dbf-4144-a110-c2963a709832}, riid: {d56a2092-7dbf-4144-a110-c2963a709832} ebrowser.c:524: Test failed: unknown service, serviceID: {d56a2092-7dbf-4144-a110-c2963a709832}, riid: {d56a2092-7dbf-4144-a110-c2963a709832} ebrowser.c:524: Test failed: unknown service, serviceID: {d56a2092-7dbf-4144-a110-c2963a709832}, riid: {d56a2092-7dbf-4144-a110-c2963a709832} ebrowser.c:524: Test failed: unknown service, serviceID: {d56a2092-7dbf-4144-a110-c2963a709832}, riid: {d56a2092-7dbf-4144-a110-c2963a709832} ebrowser.c:524: Test failed: unknown service, serviceID: {d56a2092-7dbf-4144-a110-c2963a709832}, riid: {d56a2092-7dbf-4144-a110-c2963a709832} ebrowser.c:524: Test failed: unknown service, serviceID: {c13b3d3a-10d6-43f5-98db-b7ddd987b33d}, riid: {c13b3d3a-10d6-43f5-98db-b7ddd987b33d} ebrowser.c:524: Test failed: unknown service, serviceID: {c13b3d3a-10d6-43f5-98db-b7ddd987b33d}, riid: {c13b3d3a-10d6-43f5-98db-b7ddd987b33d} ebrowser.c:524: Test failed: unknown service, serviceID: {d56a2092-7dbf-4144-a110-c2963a709832}, riid: {d56a2092-7dbf-4144-a110-c2963a709832} ebrowser.c:524: Test failed: unknown service, serviceID: {d56a2092-7dbf-4144-a110-c2963a709832}, riid: {42f85136-db7e-439c-85f1-e4075d135fc8} ebrowser.c:524: Test failed: unknown service, serviceID: {d56a2092-7dbf-4144-a110-c2963a709832}, riid: {d56a2092-7dbf-4144-a110-c2963a709832} ebrowser.c:524: Test failed: unknown service, serviceID: {d56a2092-7dbf-4144-a110-c2963a709832}, riid: {d56a2092-7dbf-4144-a110-c2963a709832} ebrowser.c:524: Test failed: unknown service, serviceID: {d56a2092-7dbf-4144-a110-c2963a709832}, riid: {d56a2092-7dbf-4144-a110-c2963a709832} ebrowser.c:524: Test failed: unknown service, serviceID: {d56a2092-7dbf-4144-a110-c2963a709832}, riid: {d56a2092-7dbf-4144-a110-c2963a709832} ebrowser.c:524: Test failed: unknown service, serviceID: {d56a2092-7dbf-4144-a110-c2963a709832}, riid: {d56a2092-7dbf-4144-a110-c2963a709832} ebrowser.c:524: Test failed: unknown service, serviceID: {d56a2092-7dbf-4144-a110-c2963a709832}, riid: {d56a2092-7dbf-4144-a110-c2963a709832} === w1064 (64 bit ebrowser) === ebrowser.c:524: Test failed: unknown service, serviceID: {c13b3d3a-10d6-43f5-98db-b7ddd987b33d}, riid: {c13b3d3a-10d6-43f5-98db-b7ddd987b33d} ebrowser.c:524: Test failed: unknown service, serviceID: {2e228ba3-ea25-4378-97b6-d574faeba356}, riid: {2e228ba3-ea25-4378-97b6-d574faeba356} ebrowser.c:524: Test failed: unknown service, serviceID: {c13b3d3a-10d6-43f5-98db-b7ddd987b33d}, riid: {c13b3d3a-10d6-43f5-98db-b7ddd987b33d} ebrowser.c:524: Test failed: unknown service, serviceID: {c13b3d3a-10d6-43f5-98db-b7ddd987b33d}, riid: {c13b3d3a-10d6-43f5-98db-b7ddd987b33d} ebrowser.c:524: Test failed: unknown service, serviceID: {c13b3d3a-10d6-43f5-98db-b7ddd987b33d}, riid: {c13b3d3a-10d6-43f5-98db-b7ddd987b33d} ebrowser.c:524: Test failed: unknown service, serviceID: {c13b3d3a-10d6-43f5-98db-b7ddd987b33d}, riid: {c13b3d3a-10d6-43f5-98db-b7ddd987b33d} ebrowser.c:524: Test failed: unknown service, serviceID: {c13b3d3a-10d6-43f5-98db-b7ddd987b33d}, riid: {c13b3d3a-10d6-43f5-98db-b7ddd987b33d} ebrowser.c:524: Test failed: unknown service, serviceID: {d56a2092-7dbf-4144-a110-c2963a709832}, riid: {d56a2092-7dbf-4144-a110-c2963a709832} ebrowser.c:524: Test failed: unknown service, serviceID: {d56a2092-7dbf-4144-a110-c2963a709832}, riid: {d56a2092-7dbf-4144-a110-c2963a709832} ebrowser.c:524: Test failed: unknown service, serviceID: {d56a2092-7dbf-4144-a110-c2963a709832}, riid: {42f85136-db7e-439c-85f1-e4075d135fc8} ebrowser.c:524: Test failed: unknown service, serviceID: {d56a2092-7dbf-4144-a110-c2963a709832}, riid: {42f85136-db7e-439c-85f1-e4075d135fc8} ebrowser.c:524: Test failed: unknown service, serviceID: {c13b3d3a-10d6-43f5-98db-b7ddd987b33d}, riid: {c13b3d3a-10d6-43f5-98db-b7ddd987b33d} ebrowser.c:524: Test failed: unknown service, serviceID: {d56a2092-7dbf-4144-a110-c2963a709832}, riid: {d56a2092-7dbf-4144-a110-c2963a709832} ebrowser.c:524: Test failed: unknown service, serviceID: {d56a2092-7dbf-4144-a110-c2963a709832}, riid: {d56a2092-7dbf-4144-a110-c2963a709832} ebrowser.c:524: Test failed: unknown service, serviceID: {d56a2092-7dbf-4144-a110-c2963a709832}, riid: {d56a2092-7dbf-4144-a110-c2963a709832} ebrowser.c:524: Test failed: unknown service, serviceID: {d56a2092-7dbf-4144-a110-c2963a709832}, riid: {d56a2092-7dbf-4144-a110-c2963a709832} ebrowser.c:524: Test failed: unknown service, serviceID: {d56a2092-7dbf-4144-a110-c2963a709832}, riid: {d56a2092-7dbf-4144-a110-c2963a709832} ebrowser.c:524: Test failed: unknown service, serviceID: {d56a2092-7dbf-4144-a110-c2963a709832}, riid: {d56a2092-7dbf-4144-a110-c2963a709832} ebrowser.c:524: Test failed: unknown service, serviceID: {d56a2092-7dbf-4144-a110-c2963a709832}, riid: {d56a2092-7dbf-4144-a110-c2963a709832} ebrowser.c:524: Test failed: unknown service, serviceID: {d56a2092-7dbf-4144-a110-c2963a709832}, riid: {d56a2092-7dbf-4144-a110-c2963a709832} ebrowser.c:524: Test failed: unknown service, serviceID: {c13b3d3a-10d6-43f5-98db-b7ddd987b33d}, riid: {c13b3d3a-10d6-43f5-98db-b7ddd987b33d} ebrowser.c:524: Test failed: unknown service, serviceID: {c13b3d3a-10d6-43f5-98db-b7ddd987b33d}, riid: {c13b3d3a-10d6-43f5-98db-b7ddd987b33d} ebrowser.c:524: Test failed: unknown service, serviceID: {d56a2092-7dbf-4144-a110-c2963a709832}, riid: {d56a2092-7dbf-4144-a110-c2963a709832} ebrowser.c:524: Test failed: unknown service, serviceID: {d56a2092-7dbf-4144-a110-c2963a709832}, riid: {42f85136-db7e-439c-85f1-e4075d135fc8} ebrowser.c:524: Test failed: unknown service, serviceID: {d56a2092-7dbf-4144-a110-c2963a709832}, riid: {d56a2092-7dbf-4144-a110-c2963a709832} ebrowser.c:524: Test failed: unknown service, serviceID: {d56a2092-7dbf-4144-a110-c2963a709832}, riid: {d56a2092-7dbf-4144-a110-c2963a709832} ebrowser.c:524: Test failed: unknown service, serviceID: {d56a2092-7dbf-4144-a110-c2963a709832}, riid: {d56a2092-7dbf-4144-a110-c2963a709832} ebrowser.c:524: Test failed: unknown service, serviceID: {d56a2092-7dbf-4144-a110-c2963a709832}, riid: {d56a2092-7dbf-4144-a110-c2963a709832} ebrowser.c:524: Test failed: unknown service, serviceID: {d56a2092-7dbf-4144-a110-c2963a709832}, riid: {d56a2092-7dbf-4144-a110-c2963a709832} ebrowser.c:524: Test failed: unknown service, serviceID: {d56a2092-7dbf-4144-a110-c2963a709832}, riid: {d56a2092-7dbf-4144-a110-c2963a709832}

2 1

Re: ddraw: Use SetRectEmpty() instead of open coding it.
by Marvin 03 Mar '16

03 Mar '16

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=21137 Your paranoid android. === w864 (32 bit d3d) === d3d.c:2326: Test failed: Unexpected destination texture level pixels; 2031 differences at 0 level d3d.c:2326: Test failed: Unexpected destination texture level pixels; 518 differences at 1 level d3d.c:2326: Test failed: Unexpected destination texture level pixels; 138 differences at 2 level d3d.c:2326: Test failed: Unexpected destination texture level pixels; 46 differences at 3 level d3d.c:2510: Test failed: Unexpected destination texture level pixels; 257 differences d3d.c:2657: Test failed: Unexpected destination texture level pixels; 256 differences at 2 level d3d.c:2657: Test failed: Unexpected destination texture level pixels; 64 differences at 3 level d3d.c:2657: Test failed: Unexpected destination texture level pixels; 16 differences at 4 level d3d.c:2657: Test failed: Unexpected destination texture level pixels; 4 differences at 5 level === w1064 (32 bit d3d) === d3d.c:2326: Test failed: Unexpected destination texture level pixels; 2031 differences at 0 level d3d.c:2326: Test failed: Unexpected destination texture level pixels; 518 differences at 1 level d3d.c:2326: Test failed: Unexpected destination texture level pixels; 138 differences at 2 level d3d.c:2326: Test failed: Unexpected destination texture level pixels; 46 differences at 3 level d3d.c:2510: Test failed: Unexpected destination texture level pixels; 257 differences d3d.c:2657: Test failed: Unexpected destination texture level pixels; 256 differences at 2 level d3d.c:2657: Test failed: Unexpected destination texture level pixels; 64 differences at 3 level d3d.c:2657: Test failed: Unexpected destination texture level pixels; 16 differences at 4 level d3d.c:2657: Test failed: Unexpected destination texture level pixels; 4 differences at 5 level

2 1

Re: [resend] shell32: fix two bugs in IQueryAssocations
by Marvin 03 Mar '16

03 Mar '16

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=21124 Your paranoid android. === wxppro (32 bit assoc) === assoc.c:123: Test failed: GetString returned 0x80070002, expected 0x0 assoc.c:176: Test failed: assoc.c:123: Test failed: GetString returned 0x80070002, expected 0x0 assoc.c:180: Test failed: assoc.c:123: Test failed: GetString returned 0x80070002, expected 0x80070483 assoc.c:185: Test failed: assoc.c:123: Test failed: GetString returned 0x80070002, expected 0x80070483 assoc.c:186: Test failed: assoc.c:123: Test failed: GetString returned 0x80070002, expected 0x80070483 assoc.c:187: Test failed: === w2003std (32 bit assoc) === assoc.c:123: Test failed: GetString returned 0x80070002, expected 0x0 assoc.c:176: Test failed: assoc.c:123: Test failed: GetString returned 0x80070002, expected 0x0 assoc.c:180: Test failed: assoc.c:123: Test failed: GetString returned 0x80070002, expected 0x80070483 assoc.c:185: Test failed: assoc.c:123: Test failed: GetString returned 0x80070002, expected 0x80070483 assoc.c:186: Test failed: assoc.c:123: Test failed: GetString returned 0x80070002, expected 0x80070483 assoc.c:187: Test failed:

1 0

Re: [v2 1/6] d3dx9: add test for basic effect state management.
by Matteo Bruni 02 Mar '16

02 Mar '16

2016-03-01 18:09 GMT+01:00 Paul Gofman <gofmanp(a)gmail.com>: > Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> > --- > dlls/d3dx9_36/tests/effect.c | 260 +++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 260 insertions(+) > I think these patches are on the right path in general. There are a number of small issues though. You have a few trailing whitespaces in your patches, make sure to get rid of them. > diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c > index 1b895da..6dd3e00 100644 > --- a/dlls/d3dx9_36/tests/effect.c > +++ b/dlls/d3dx9_36/tests/effect.c > @@ -2692,6 +2692,265 @@ static void test_effect_compilation_errors(IDirect3DDevice9 *device) > effect->lpVtbl->Release(effect); > } > > +/* fxc.exe /T fx_2_0 Better if you put the effect source in a #if 0 block, as it is done elsewhere, instead of inside a comment. > +vertexshader vs_arr1[2] = > +{ > + asm > + { > + vs_1_1 > + def c0, 1, 1, 1, 1 > + mov oPos, c0 > + }, > + asm > + { > + vs_2_0 > + def c0, 2, 2, 2, 2 > + mov oPos, c0 > + } > +}; > + > +sampler sampler1 = > + sampler_state > + { > + MipFilter = LINEAR; > + }; > + > +float4x4 camera : VIEW = {4.0,0.0,0.0,0.0, 0.0,0.0,0.0,0.0, 0.0,0.0,0.0,0.0, 0.0,0.0,0.0,6.0}; > +technique tech0 > +{ > + pass p0 > + { > + vertexshader = vs_arr1[1]; > + VertexShaderConstant1[3] = {2,2,2,2}; > + BlendOp = 2; > + AlphaOp[3] = 4; > + ZEnable = true; > + WorldTransform[1]={2.0,0.0,0.0,0.0, 0.0,0.0,0.0,0.0, 0.0,0.0,0.0,0.0, 0.0,0.0,0.0,4.0}; > + ViewTransform=(camera); > + LightEnable[2] = TRUE; > + LightType[2] = POINT; > + LightPosition[2] = {4.0f, 5.0f, 6.0f}; > + Sampler[1] = sampler1; > + } > +} */ > + > +static const DWORD test_effect_states_effect_blob[] = > +{ > +0xfeff0901, 0x000002e8, 0x00000000, 0x00000010, 0x00000004, 0x00000020, 0x00000000, 0x00000002, > +0x00000001, 0x00000002, 0x00000008, 0x615f7376, 0x00317272, 0x0000000a, 0x00000004, 0x00000074, > +0x00000000, 0x00000000, 0x00000002, 0x00000002, 0x00000002, 0x00000000, 0x00000000, 0x00000000, > +0x00000001, 0x00000001, 0x00000001, 0x000000ab, 0x00000100, 0x00000044, 0x00000040, 0x00000009, > +0x706d6173, 0x3172656c, 0x00000000, 0x00000003, 0x00000002, 0x000000e0, 0x000000ec, 0x00000000, > +0x00000004, 0x00000004, 0x40800000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, > +0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, > +0x00000000, 0x40c00000, 0x00000007, 0x656d6163, 0x00006172, 0x00000005, 0x57454956, 0x00000000, > +0x00000003, 0x00000010, 0x00000004, 0x00000000, 0x00000000, 0x00000000, 0x40000000, 0x40000000, > +0x40000000, 0x40000000, 0x00000003, 0x00000003, 0x00000000, 0x00000000, 0x00000000, 0x00000004, > +0x00000001, 0x00000002, 0x00000002, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000001, > +0x00000001, 0x00000004, 0x00000002, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000001, > +0x00000001, 0x00000001, 0x00000002, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000001, > +0x00000001, 0x40000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, > +0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, > +0x40800000, 0x00000003, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000010, 0x00000001, > +0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, > +0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, > +0x00000003, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000004, 0x00000004, 0x00000001, > +0x00000002, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000001, 0x00000001, > +0x00000002, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000001, 0x40800000, > +0x40a00000, 0x40c00000, 0x00000003, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000003, > +0x00000001, 0x00000000, 0x0000000a, 0x00000004, 0x00000000, 0x00000000, 0x00000000, 0x00000003, > +0x00003070, 0x00000006, 0x68636574, 0x00000030, 0x00000003, 0x00000001, 0x00000005, 0x00000004, > +0x00000004, 0x00000018, 0x00000000, 0x00000000, 0x0000002c, 0x00000060, 0x00000000, 0x00000000, > +0x00000084, 0x000000a0, 0x00000000, 0x00000000, 0x000002dc, 0x00000000, 0x00000001, 0x000002d4, > +0x00000000, 0x0000000b, 0x00000092, 0x00000000, 0x000000fc, 0x000000f8, 0x00000098, 0x00000003, > +0x00000120, 0x00000110, 0x0000004b, 0x00000000, 0x00000140, 0x0000013c, 0x0000006b, 0x00000003, > +0x00000160, 0x0000015c, 0x00000000, 0x00000000, 0x00000180, 0x0000017c, 0x0000007d, 0x00000001, > +0x000001dc, 0x0000019c, 0x0000007c, 0x00000000, 0x00000238, 0x000001f8, 0x00000091, 0x00000002, > +0x00000258, 0x00000254, 0x00000084, 0x00000002, 0x00000278, 0x00000274, 0x00000088, 0x00000002, > +0x000002a0, 0x00000294, 0x000000b2, 0x00000001, 0x000002c0, 0x000002bc, 0x00000002, 0x00000003, > +0x00000001, 0x0000002c, 0xfffe0101, 0x00000051, 0xa00f0000, 0x3f800000, 0x3f800000, 0x3f800000, > +0x3f800000, 0x00000001, 0xc00f0000, 0xa0e40000, 0x0000ffff, 0x00000002, 0x0000002c, 0xfffe0200, > +0x05000051, 0xa00f0000, 0x40000000, 0x40000000, 0x40000000, 0x40000000, 0x02000001, 0xc00f0000, > +0xa0e40000, 0x0000ffff, 0x00000000, 0x00000000, 0xffffffff, 0x0000000a, 0x00000001, 0x00000009, > +0x706d6173, 0x3172656c, 0x00000000, 0x00000000, 0x00000000, 0xffffffff, 0x00000006, 0x00000000, > +0x0000016c, 0x46580200, 0x0030fffe, 0x42415443, 0x0000001c, 0x0000008b, 0x46580200, 0x00000001, > +0x0000001c, 0x20000100, 0x00000088, 0x00000030, 0x00000002, 0x00000004, 0x00000038, 0x00000048, > +0x656d6163, 0xab006172, 0x00030003, 0x00040004, 0x00000001, 0x00000000, 0x40800000, 0x00000000, > +0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, > +0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x40c00000, 0x4d007874, 0x6f726369, > +0x74666f73, 0x29522820, 0x534c4820, 0x6853204c, 0x72656461, 0x6d6f4320, 0x656c6970, 0x2e392072, > +0x392e3932, 0x332e3235, 0x00313131, 0x0002fffe, 0x54494c43, 0x00000000, 0x0024fffe, 0x434c5846, > +0x00000004, 0x10000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000000, 0x00000004, > +0x00000000, 0x10000004, 0x00000001, 0x00000000, 0x00000002, 0x00000004, 0x00000000, 0x00000004, > +0x00000004, 0x10000004, 0x00000001, 0x00000000, 0x00000002, 0x00000008, 0x00000000, 0x00000004, > +0x00000008, 0x10000004, 0x00000001, 0x00000000, 0x00000002, 0x0000000c, 0x00000000, 0x00000004, > +0x0000000c, 0xf0f0f0f0, 0x0f0f0f0f, 0x0000ffff, 0x00000000, 0x00000000, 0xffffffff, 0x00000000, > +0x00000001, 0x0000000b, 0x615f7376, 0x5b317272, 0x00005d31, > +}; Can you please indent the effect blob data? > + > +static DWORD test_effect_states_vshader_buf[sizeof(test_effect_states_effect_blob) / sizeof(DWORD)]; It seems better to dynamically allocate the buffer instead. Something like: - call GetFunction() with a NULL data pointer to get the size - HeapAlloc() the buffer with the received size - call GetFunction() again, passing it the allocated buffer - do your checks - HeapFree() the buffer > + > +static void test_effect_states(IDirect3DDevice9 *device) > +{ > + D3DMATRIX test_mat = > + {{{ > + -1.0f, 0.0f, 0.0f, 0.0f, > + 0.0f, 0.0f, 0.0f, 0.0f, > + 0.0f, 0.0f, 0.0f, 0.0f, > + 0.0f, 0.0f, 0.0f, 0.0f > + }}}; > + D3DMATRIX test_mat_camera = > + {{{ > + 4.0f, 0.0f, 0.0f, 0.0f, > + 0.0f, 0.0f, 0.0f, 0.0f, > + 0.0f, 0.0f, 0.0f, 0.0f, > + 0.0f, 0.0f, 0.0f, 6.0f > + }}}; > + D3DMATRIX test_mat_world1 = > + {{{ > + 2.0f, 0.0f, 0.0f, 0.0f, > + 0.0f, 0.0f, 0.0f, 0.0f, > + 0.0f, 0.0f, 0.0f, 0.0f, > + 0.0f, 0.0f, 0.0f, 4.0f > + }}}; > + D3DMATRIX mat; > + HRESULT hr; > + ID3DXEffect *effect; > + UINT npasses; > + DWORD value; > + IDirect3DVertexShader9 *vshader; > + UINT byte_code_size; > + BOOL bval; > + D3DLIGHT9 light; > + float float_data[4]; > + > + hr = D3DXCreateEffect(device, test_effect_states_effect_blob, sizeof(test_effect_states_effect_blob), > + NULL, NULL, 0, NULL, &effect, NULL); > + ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); > + > + /* 1. State affected in passes saved/restored even if no pass > + was performed. States not present in passes are not saved & > + restored */ That type of "n." notation isn't found elsewhere and I don't think it's particularly useful here either. > + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_BLENDOP, 1); > + ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); > + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_ALPHAFUNC, 1); > + ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); > + > + hr = effect->lpVtbl->Begin(effect, &npasses, 0); > + ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); > + ok(npasses == 1, "Expected 1 pass, got %u\n", npasses); > + > + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_BLENDOP, 3); > + ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); > + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_ALPHAFUNC, 2); > + ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); > + > + hr = effect->lpVtbl->End(effect); > + ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); > + > + hr = IDirect3DDevice9_GetRenderState(device, D3DRS_BLENDOP, &value); > + ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); > + todo_wine ok(value == 1, "Got result %u, expected %u.\n", value, 1); > + hr = IDirect3DDevice9_GetRenderState(device, D3DRS_ALPHAFUNC, &value); > + ok(value == 2, "Got result %u, expected %u.\n", value, 2); > + > + /* 2. Test states application in BeginPass. No states are restored > + on EndPass. */ > + hr = IDirect3DDevice9_SetSamplerState(device, 1, D3DSAMP_MIPFILTER, 0); > + ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); > + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_ZENABLE, 0); > + ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); > + > + hr = IDirect3DDevice9_GetLightEnable(device, 2, &bval); > + todo_wine ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); > + if (hr == D3D_OK) > + ok(!bval,"Got result %u, expected 0.", bval); > + > + hr = IDirect3DDevice9_SetTransform(device, D3DTS_WORLDMATRIX(1), &test_mat); > + hr = effect->lpVtbl->Begin(effect, &npasses, 0); > + ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); > + > + hr = IDirect3DDevice9_GetTransform(device, D3DTS_WORLDMATRIX(1), &mat); > + ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); > + ok(mat.m[0][0] == test_mat.m[0][0], "Unexpected value: %f.\n", mat.m[0][0]); Any reason you're not checking the entire matrix this time only? > + > + hr = effect->lpVtbl->BeginPass(effect, 0); > + ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); > + > + hr = IDirect3DDevice9_GetTransform(device, D3DTS_WORLDMATRIX(1), &mat); > + ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); > + todo_wine ok(!memcmp(mat.m, test_mat_world1.m, sizeof(mat)), "World matrix does not match.\n"); > + > + hr = IDirect3DDevice9_GetTransform(device, D3DTS_VIEW, &mat); > + ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); > + todo_wine ok(!memcmp(mat.m, test_mat_camera.m, sizeof(mat)), "View matrix does not match.\n"); > + > + hr = IDirect3DDevice9_GetRenderState(device, D3DRS_BLENDOP, &value); > + ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); > + todo_wine ok(value == 2, "Got result %u, expected %u\n", value, 2); > + > + hr = IDirect3DDevice9_GetVertexShader(device, &vshader); > + ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); > + todo_wine ok(vshader != NULL, "Got NULL vshader.\n"); > + if (vshader) > + { > + byte_code_size = sizeof(test_effect_states_vshader_buf); > + hr = IDirect3DVertexShader9_GetFunction(vshader, test_effect_states_vshader_buf,&byte_code_size); Whitespace after comma. > + ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); > + ok(byte_code_size > 1, "Got unexpected byte code size %u.\n", byte_code_size); > + ok(test_effect_states_vshader_buf[0] == 0xfffe0200, "Incorrect shader selected: %#x.\n", test_effect_states_vshader_buf[0]); Here you could memcmp the entire shader with the one from the effect blob. > + IDirect3DVertexShader9_Release(vshader); > + } > + > + hr = IDirect3DDevice9_GetLightEnable(device, 2, &bval); > + todo_wine ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); > + if (hr == D3D_OK) > + ok(bval,"Got result %u, expected TRUE.\n", bval); > + hr = IDirect3DDevice9_GetLight(device, 2, &light); > + todo_wine ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); > + if (hr == D3D_OK) > + ok(light.Position.x == 4.0f && light.Position.y == 5.0f && light.Position.z == 6.0f, > + "Got unexpected light position (%f, %f, %f).\n", light.Position.x, light.Position.y, light.Position.z); > + hr = IDirect3DDevice9_GetVertexShaderConstantF(device, 3, float_data, 1); > + ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); > + todo_wine ok(float_data[0] == 2.0f && float_data[1] == 2.0f && float_data[2] == 2.0f && float_data[3] == 2.0f, > + "Got unexpected vertex shader floats: (%f %f %f %f).\n", > + float_data[0], float_data[1], float_data[2], float_data[3]); > + > + hr = effect->lpVtbl->EndPass(effect); > + ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); > + hr = IDirect3DDevice9_GetRenderState(device, D3DRS_BLENDOP, &value); > + ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); > + todo_wine ok(value == 2, "Got result %u, expected %u\n", value, 2); > + > + hr = IDirect3DDevice9_GetRenderState(device, D3DRS_ZENABLE, &value); > + ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); > + todo_wine ok(value,"Got result %u, expected TRUE.\n", value); > + > + hr = IDirect3DDevice9_GetSamplerState(device, 1, D3DSAMP_MIPFILTER, &value); > + ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); > + todo_wine ok(value == D3DTEXF_LINEAR, "Unexpected sampler 1 mipfilter %u.\n", value); > + > + hr = IDirect3DDevice9_GetTextureStageState(device, 3, D3DTSS_ALPHAOP, &value); > + ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); > + todo_wine ok(value == 4, "Unexpected texture stage 3 AlphaOp %u.\n", value); > + > + hr = effect->lpVtbl->End(effect); > + ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); > + > + hr = IDirect3DDevice9_GetTransform(device, D3DTS_WORLDMATRIX(1), &mat); > + ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); > + ok(!memcmp(mat.m, test_mat.m, sizeof(mat)), "World matrix not restored.\n"); > + > + hr = IDirect3DDevice9_GetLightEnable(device, 2, &bval); > + todo_wine ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); > + if (hr == D3D_OK) > + ok(!bval,"Got result %u, expected 0.\n", bval); > + > + if (effect) > + effect->lpVtbl->Release(effect); > +} > + > START_TEST(effect) > { > HWND wnd; > @@ -2730,6 +2989,7 @@ START_TEST(effect) > test_effect_parameter_value(device); > test_effect_variable_names(device); > test_effect_compilation_errors(device); > + test_effect_states(device); > > count = IDirect3DDevice9_Release(device); > ok(count == 0, "The device was not properly freed: refcount %u\n", count); > -- > 2.5.0

2 2

Re: [PATCH v2] winejoystick.drv: Gracefully handle polling an unplugged device
by Ken Thomases 02 Mar '16

02 Mar '16

On Mar 2, 2016, at 1:46 PM, Aric Stewart <aric(a)codeweavers.com> wrote: > > v2: Use a Helper function instead of duplicated code I should have caught this the first time, but: > +static LRESULT driver_getElementValue(IOHIDDeviceRef device, IOHIDElementRef element, IOHIDValueRef *pValueRef) > +{ > + IOReturn ret; > + ret = IOHIDDeviceGetValue(device, element, pValueRef); > + if (ret != kIOReturnSuccess) > + { > + switch (ret) > + { > + case kIOReturnNotAttached: > + return JOYERR_UNPLUGGED; > + default: > + ERR("IOHIDDeviceGetValue returned 0x%x\n",ret); > + return JOYERR_NOCANDO; > + } > + } > + return JOYERR_NOERROR; > +} It's a bit strange to use an "if" based on ret and then a "switch" based on it, too. You could just use the switch, right? -Ken

2 1

Re: [1/5] imm32/tests: Add tests for life cycle of default IME window.
by Aric Stewart 02 Mar '16

02 Mar '16

I am curious. Are the test failures here because of the 32bit vs 64bi? It seems strange. We are going to want to find a way that these done introduce more failures into our winetest runs. -aric On 3/2/16 7:53 AM, Akihiro Sagawa wrote: > Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> > --- > dlls/imm32/tests/imm32.c | 51 ++++++++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 51 insertions(+) > > > >

1 0

Re: [PATCH] winejoystick.drv: Gracefully handle polling an unplugged device
by Ken Thomases 02 Mar '16

02 Mar '16

On Mar 2, 2016, at 11:28 AM, Aric Stewart <aric(a)codeweavers.com> wrote: > > dlls/winejoystick.drv/joystick_osx.c | 40 +++++++++++++++++++++++++++++++++--- > 1 file changed, 37 insertions(+), 3 deletions(-) > - IOHIDDeviceGetValue(device, button, &valueRef); > + ret = IOHIDDeviceGetValue(device, button, &valueRef); > + if (ret != kIOReturnSuccess) > + { > + switch (ret) > + { > + case kIOReturnNotAttached: > + return JOYERR_UNPLUGGED; > + default: > + ERR("IOHIDDeviceGetValue returned 0x%x\n",ret); > + return JOYERR_NOCANDO; > + } > + } The above sort of change is repeated three times. Seems like a case for a helper function. -Ken

1 0

Re: [v2 6/6] d3dx9: implement state save and restore in effect.
by Matteo Bruni 02 Mar '16

02 Mar '16

2016-03-01 18:10 GMT+01:00 Paul Gofman <gofmanp(a)gmail.com>: > Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> > --- > dlls/d3dx9_36/effect.c | 66 ++++++++++++++++++++++++++++++++------------ > dlls/d3dx9_36/tests/effect.c | 8 +++--- > 2 files changed, 53 insertions(+), 21 deletions(-) > > diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c > index 8a359d0..a7611fe 100644 > --- a/dlls/d3dx9_36/effect.c > +++ b/dlls/d3dx9_36/effect.c > @@ -162,6 +162,8 @@ struct d3dx_technique > > struct d3dx_parameter *annotations; > struct d3dx_pass *passes; > + > + struct IDirect3DStateBlock9 *saved_state; > }; > > struct param_table > @@ -642,6 +644,12 @@ static void free_technique(struct d3dx_technique *technique) > if (!technique) > return; > > + if (technique->saved_state) > + { > + IDirect3DStateBlock9_Release(technique->saved_state); > + technique->saved_state = NULL; > + } > + What happens if the effect is released while inside a Begin() / End() pair? Is the state restored or not? > if (technique->annotations) > { > for (i = 0; i < technique->annotation_count; ++i) > @@ -3467,8 +3475,8 @@ static BOOL WINAPI ID3DXEffectImpl_IsParameterUsed(ID3DXEffect* iface, D3DXHANDL > > static HRESULT WINAPI ID3DXEffectImpl_Begin(ID3DXEffect *iface, UINT *passes, DWORD flags) > { > - struct ID3DXEffectImpl *This = impl_from_ID3DXEffect(iface); > - struct d3dx_technique *technique = This->active_technique; > + struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); > + struct d3dx_technique *technique = effect->active_technique; > > TRACE("iface %p, passes %p, flags %#x.\n", iface, passes, flags); > > @@ -3477,18 +3485,34 @@ static HRESULT WINAPI ID3DXEffectImpl_Begin(ID3DXEffect *iface, UINT *passes, DW > if (flags & ~(D3DXFX_DONOTSAVESTATE | D3DXFX_DONOTSAVESAMPLERSTATE | D3DXFX_DONOTSAVESHADERSTATE)) > WARN("Invalid flags (%#x) specified.\n", flags); > > - if (This->manager || flags & D3DXFX_DONOTSAVESTATE) > + if (effect->manager || flags & D3DXFX_DONOTSAVESTATE) > { > TRACE("State capturing disabled.\n"); > } > else > { > - FIXME("State capturing not supported, yet!\n"); > + HRESULT hr; > + int i; > + > + if (!technique->saved_state) > + { > + hr = IDirect3DDevice9_BeginStateBlock(effect->device); > + if (FAILED(hr)) > + ERR("BeginStateBlock failed: %#x.\n",hr); > + for (i = 0; i < technique->pass_count; i++) > + d3dx9_apply_pass_states(effect, &technique->passes[i]); > + hr = IDirect3DDevice9_EndStateBlock(effect->device, &technique->saved_state); > + if (FAILED(hr)) > + ERR("EndStateBlock failed: %#x.\n",hr); > + } > + hr = IDirect3DStateBlock9_Capture(technique->saved_state); > + if (FAILED(hr)) > + ERR("StateBlock Capture failed: %#x.\n",hr); > } > > *passes = technique->pass_count; > - This->started = TRUE; > - This->flags = flags; > + effect->started = TRUE; > + effect->flags = flags; > > return D3D_OK; > } > @@ -3518,17 +3542,15 @@ static HRESULT WINAPI ID3DXEffectImpl_BeginPass(ID3DXEffect *iface, UINT pass) > > static HRESULT WINAPI ID3DXEffectImpl_CommitChanges(ID3DXEffect* iface) > { > - struct ID3DXEffectImpl *This = impl_from_ID3DXEffect(iface); > - > - FIXME("(%p)->(): stub\n", This); > + struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); Implementing CommitChanges should be a separate patch. Also please turn the FIXME into a TRACE instead of dropping it entirely. > > - if (!This->active_pass) > + if (!effect->active_pass) > { > WARN("Called without an active pass.\n"); > return D3D_OK; > } > - > - return E_NOTIMPL; > + /* TODO: apply only changed states */ > + return d3dx9_apply_pass_states(effect, effect->active_pass); > } > > static HRESULT WINAPI ID3DXEffectImpl_EndPass(ID3DXEffect *iface) > @@ -3550,23 +3572,33 @@ static HRESULT WINAPI ID3DXEffectImpl_EndPass(ID3DXEffect *iface) > > static HRESULT WINAPI ID3DXEffectImpl_End(ID3DXEffect *iface) > { > - struct ID3DXEffectImpl *This = impl_from_ID3DXEffect(iface); > + struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); > + struct d3dx_technique *technique = effect->active_technique; > > TRACE("iface %p.\n", iface); > > - if (!This->started) > + if (!effect->started) > return D3D_OK; > > - if (This->manager || This->flags & D3DXFX_DONOTSAVESTATE) > + if (effect->manager || effect->flags & D3DXFX_DONOTSAVESTATE) > { > TRACE("State restoring disabled.\n"); > } > else > { > - FIXME("State restoring not supported, yet!\n"); > + HRESULT hr; > + > + if (technique && technique->saved_state) > + { > + hr = IDirect3DStateBlock9_Apply(technique->saved_state); > + if (FAILED(hr)) > + ERR("State block apply failed: %#x.\n",hr); > + } > + else > + ERR("No saved state."); Missing '\n'. > } > > - This->started = FALSE; > + effect->started = FALSE; > > return D3D_OK; > } > diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c > index a052bce..3d0e01c 100644 > --- a/dlls/d3dx9_36/tests/effect.c > +++ b/dlls/d3dx9_36/tests/effect.c > @@ -2850,7 +2850,7 @@ static void test_effect_states(IDirect3DDevice9 *device) > > hr = IDirect3DDevice9_GetRenderState(device, D3DRS_BLENDOP, &value); > ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); > - todo_wine ok(value == 1, "Got result %u, expected %u.\n", value, 1); > + ok(value == 1, "Got result %u, expected %u.\n", value, 1); > hr = IDirect3DDevice9_GetRenderState(device, D3DRS_ALPHAFUNC, &value); > ok(value == 2, "Got result %u, expected %u.\n", value, 2); > > @@ -2862,7 +2862,7 @@ static void test_effect_states(IDirect3DDevice9 *device) > ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); > > hr = IDirect3DDevice9_GetLightEnable(device, 2, &bval); > - todo_wine ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); > + ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); > if (hr == D3D_OK) > ok(!bval,"Got result %u, expected 0.", bval); > > @@ -2940,12 +2940,12 @@ static void test_effect_states(IDirect3DDevice9 *device) > > hr = IDirect3DDevice9_GetTransform(device, D3DTS_WORLDMATRIX(1), &mat); > ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); > - todo_wine ok(!memcmp(mat.m, test_mat.m, sizeof(mat)), "World matrix not restored.\n"); > + ok(!memcmp(mat.m, test_mat.m, sizeof(mat)), "World matrix not restored.\n"); > > hr = IDirect3DDevice9_GetLightEnable(device, 2, &bval); > ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); > if (hr == D3D_OK) > - todo_wine ok(!bval,"Got result %u, expected 0.\n", bval); > + ok(!bval,"Got result %u, expected 0.\n", bval); > > if (effect) > effect->lpVtbl->Release(effect); > -- > 2.5.0

2 1

Re: [v2 5/6] d3dx9: implement sampler and texture effect states application.
by Matteo Bruni 02 Mar '16

02 Mar '16

2016-03-01 18:10 GMT+01:00 Paul Gofman <gofmanp(a)gmail.com>: > Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> > --- > dlls/d3dx9_36/effect.c | 37 +++++++++++++++++++++++++++++++++++-- > dlls/d3dx9_36/tests/effect.c | 2 +- > 2 files changed, 36 insertions(+), 3 deletions(-) > > diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c > index decc048..8a359d0 100644 > --- a/dlls/d3dx9_36/effect.c > +++ b/dlls/d3dx9_36/effect.c > @@ -2676,7 +2676,7 @@ HRESULT d3dx_set_shader_const_state(IDirect3DDevice9 *device, enum SHADER_CONSTA > return D3D_OK; > } > > -static HRESULT d3dx9_apply_state(struct ID3DXEffectImpl *effect, struct d3dx_pass *pass, struct d3dx_state *state) > +static HRESULT d3dx9_apply_state(struct ID3DXEffectImpl *effect, struct d3dx_pass *pass, struct d3dx_state *state, int parent_index) > { > IDirect3DDevice9 *device = effect->device; > struct d3dx_parameter *param; > @@ -2696,9 +2696,42 @@ static HRESULT d3dx9_apply_state(struct ID3DXEffectImpl *effect, struct d3dx_pas > case SC_FVF: > TRACE("%s: value %#x.\n", state_table[state->operation].name, *(DWORD *)param_value); > return IDirect3DDevice9_SetFVF(device, *(DWORD *)param_value); > + case SC_TEXTURE: > + { > + UINT sampler; Technically this would be a texture unit (or texture stage) more than a sampler index. > + > + sampler = parent_index == -1 ? state->index : parent_index; > + TRACE("%s: sampler %u value %p.\n", state_table[state->operation].name, sampler, *(IDirect3DBaseTexture9 **)param_value); > + return IDirect3DDevice9_SetTexture(device, sampler, *(IDirect3DBaseTexture9 **)param_value); > + } > case SC_TEXTURESTAGE: > TRACE("%s: stage %u value %u.\n", state_table[state->operation].name, state->index, *(DWORD *)param_value); > return IDirect3DDevice9_SetTextureStageState(device, state->index, state_table[state->operation].op, *(DWORD *)param_value); > + case SC_SETSAMPLER: > + { > + struct d3dx_sampler *sampler; > + HRESULT ret, hr; > + int i; > + > + sampler = (struct d3dx_sampler *)param_value; > + TRACE("%s: sampler %u applying %u states.\n", state_table[state->operation].name, state->index, sampler->state_count); > + ret = D3D_OK; > + for (i = 0; i < sampler->state_count; i++) > + { > + hr = d3dx9_apply_state(effect, pass, &sampler->states[i], state->index); > + if (FAILED(hr)) > + ret = hr; > + } > + return ret; > + } > + case SC_SAMPLERSTATE: > + { > + UINT sampler; > + > + sampler = parent_index == -1 ? state->index : parent_index; > + TRACE("%s sampler %u:%u.\n", state_table[state->operation].name, sampler, *(DWORD *)param_value); Please use the same trace style you're using for the other states. > + return IDirect3DDevice9_SetSamplerState(device, sampler, state_table[state->operation].op, *(DWORD *)param_value); > + } > case SC_VERTEXSHADER: > TRACE("%s vertex shader %p.\n", state_table[state->operation].name, *(IDirect3DVertexShader9 **)param_value); > hr = IDirect3DDevice9_SetVertexShader(device, *(IDirect3DVertexShader9 **)param_value); > @@ -2772,7 +2805,7 @@ static HRESULT d3dx9_apply_pass_states(struct ID3DXEffectImpl *effect, struct d3 > { > HRESULT hr; > > - hr = d3dx9_apply_state(effect, pass, &pass->states[i]); > + hr = d3dx9_apply_state(effect, pass, &pass->states[i], -1); > if (FAILED(hr)) > { > WARN("Error applying state: %#x.\n", hr); > diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c > index 3184f26..a052bce 100644 > --- a/dlls/d3dx9_36/tests/effect.c > +++ b/dlls/d3dx9_36/tests/effect.c > @@ -2929,7 +2929,7 @@ static void test_effect_states(IDirect3DDevice9 *device) > > hr = IDirect3DDevice9_GetSamplerState(device, 1, D3DSAMP_MIPFILTER, &value); > ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); > - todo_wine ok(value == D3DTEXF_LINEAR, "Unexpected sampler 1 mipfilter %u.\n", value); > + ok(value == D3DTEXF_LINEAR, "Unexpected sampler 1 mipfilter %u.\n", value); > > hr = IDirect3DDevice9_GetTextureStageState(device, 3, D3DTSS_ALPHAOP, &value); > ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); > -- > 2.5.0

1 0

Re: [v2 3/6] d3dx9: implement light and material effect states application.
by Matteo Bruni 02 Mar '16

02 Mar '16

2016-03-01 18:09 GMT+01:00 Paul Gofman <gofmanp(a)gmail.com>: > Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> > --- > dlls/d3dx9_36/effect.c | 139 +++++++++++++++++++++++++++++++++++++++++++ > dlls/d3dx9_36/tests/effect.c | 8 +-- > 2 files changed, 143 insertions(+), 4 deletions(-) > More nitpicks on this one... > diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c > index 7ccdb36..16110c5 100644 > --- a/dlls/d3dx9_36/effect.c > +++ b/dlls/d3dx9_36/effect.c > @@ -2514,6 +2514,114 @@ static HRESULT d3dx9_get_param_value_ptr(struct ID3DXEffectImpl *effect, struct > return E_NOTIMPL; > } > > +static void d3dx9_set_light_parameter(enum LIGHT_TYPE op, D3DLIGHT9 *light, void *value) > +{ > + static const struct > + { > + int off; I'd prefer "unsigned int offset;". > + const char *name; > + } light_tbl[] = I think the wined3d style is to put the closing '}' on its own line. > + { > + {FIELD_OFFSET(D3DLIGHT9, Type), "LC_TYPE"}, > + {FIELD_OFFSET(D3DLIGHT9, Diffuse), "LT_DIFFUSE"}, > + {FIELD_OFFSET(D3DLIGHT9, Specular), "LT_SPECULAR"}, > + {FIELD_OFFSET(D3DLIGHT9, Ambient), "LT_AMBIENT"}, > + {FIELD_OFFSET(D3DLIGHT9, Position), "LT_POSITION"}, > + {FIELD_OFFSET(D3DLIGHT9, Direction), "LT_DIRECTION"}, > + {FIELD_OFFSET(D3DLIGHT9, Range), "LT_RANGE"}, > + {FIELD_OFFSET(D3DLIGHT9, Falloff), "LT_FALLOFF"}, > + {FIELD_OFFSET(D3DLIGHT9, Attenuation0), "LT_ATTENUATION0"}, > + {FIELD_OFFSET(D3DLIGHT9, Attenuation1), "LT_ATTENUATION1"}, > + {FIELD_OFFSET(D3DLIGHT9, Attenuation2), "LT_ATTENUATION2"}, > + {FIELD_OFFSET(D3DLIGHT9, Theta), "LT_THETA"}, > + {FIELD_OFFSET(D3DLIGHT9, Phi), "LT_PHI"} > + }; > + switch (op) > + { > + case LT_TYPE: > + TRACE("LT_TYPE %u.\n", *(D3DLIGHTTYPE *)value); > + light->Type = *(D3DLIGHTTYPE *)value; > + break; > + case LT_DIFFUSE: > + case LT_SPECULAR: > + case LT_AMBIENT: > + { > + D3DCOLORVALUE c = *(D3DCOLORVALUE *)value; > + > + TRACE("%s (%f %f %f %f).\n", light_tbl[op].name, c.r, c.g, c.b, c.a); > + *(D3DCOLORVALUE *)((char *)light + light_tbl[op].off) = c; > + break; > + } > + case LT_POSITION: > + case LT_DIRECTION: > + { > + D3DVECTOR v = *(D3DVECTOR *)value; > + > + TRACE("%s (%f %f %f).\n", light_tbl[op].name, v.x, v.y, v.z); > + *(D3DVECTOR *)((char *)light + light_tbl[op].off) = v; > + break; > + } > + case LT_RANGE: > + case LT_FALLOFF: > + case LT_ATTENUATION0: > + case LT_ATTENUATION1: > + case LT_ATTENUATION2: > + case LT_THETA: > + case LT_PHI: > + { > + float v = *(float *)value; > + TRACE("%s %f.\n", light_tbl[op].name, v); > + *(float *)((char *)light + light_tbl[op].off) = v; > + break; > + } > + default: > + FIXME("Unknown light parameter %u.\n",op); > + break; > + } > +} > + > +static void d3dx9_set_material_parameter(enum MATERIAL_TYPE op, D3DMATERIAL9 *material, void *value) > +{ > + static const struct > + { > + int off; > + const char *name; > + } material_tbl[] = Same as above. > + { > + {FIELD_OFFSET(D3DMATERIAL9, Diffuse), "MT_DIFFUSE"}, > + {FIELD_OFFSET(D3DMATERIAL9, Ambient), "MT_AMBIENT"}, > + {FIELD_OFFSET(D3DMATERIAL9, Specular), "MT_SPECULAR"}, > + {FIELD_OFFSET(D3DMATERIAL9, Emissive), "MT_EMISSIVE"}, > + {FIELD_OFFSET(D3DMATERIAL9, Power), "MT_POWER"} > + }; > + > + if (op < 0 || op > MT_POWER) > + { > + FIXME("Unknown material parameter %u.\n",op); > + return; > + } > + > + switch (op) > + { > + case MT_POWER: > + { > + float v = *(float *)value; > + > + TRACE("%s %f.\n", material_tbl[op].name, v); > + material->Power = v; > + break; > + } > + default: > + { > + D3DCOLORVALUE c = *(D3DCOLORVALUE *)value; > + > + TRACE("%s (%f %f %f %f).\n", material_tbl[op].name, c.r, c.g, c.b, c.a); > + *(D3DCOLORVALUE *)((char *)material + material_tbl[op].off) = c; > + break; > + } > + } > +} I probably prefer if you write this in the same fashion as with the light parameter above (explicit cases for the 4 color values, error message in the default case of the switch). Actually the error message should probably be a WARN() instead since I don't think values different from the ones you're handling are ever legitimate so there is nothing to fix for us (but the value comes from the application so it's not an ERR). > + > static HRESULT d3dx9_apply_state(struct ID3DXEffectImpl *effect, struct d3dx_pass *pass, struct d3dx_state *state) > { > IDirect3DDevice9 *device = effect->device; > @@ -2554,6 +2662,37 @@ static HRESULT d3dx9_apply_state(struct ID3DXEffectImpl *effect, struct d3dx_pas > case SC_TRANSFORM: > TRACE("%s %u.\n", state_table[state->operation].name, state->index); > return IDirect3DDevice9_SetTransform(device, state_table[state->operation].op + state->index, (D3DMATRIX *)param_value); > + case SC_LIGHTENABLE: > + TRACE("%s index %u %u.\n", state_table[state->operation].name, state->index, *(BOOL *)param_value); > + return IDirect3DDevice9_LightEnable(device, state->index, *(BOOL *)param_value); > + case SC_LIGHT: > + { > + D3DLIGHT9 light; > + > + TRACE("%s op %u index %u.\n", state_table[state->operation].name, state_table[state->operation].op, state->index); > + hr = IDirect3DDevice9_GetLight(device, state->index, &light); > + if (FAILED(hr)) > + { > + WARN("Could not get light: %#x.\n", hr); > + memset(&light, 0, sizeof light); Please parenthesize the sizeof argument. > + } > + d3dx9_set_light_parameter(state_table[state->operation].op, &light, param_value); > + return IDirect3DDevice9_SetLight(device, state->index, &light); > + } > + case SC_MATERIAL: > + { > + D3DMATERIAL9 material; > + > + TRACE("%s op %u index %u.\n", state_table[state->operation].name, state_table[state->operation].op, state->index); > + hr = IDirect3DDevice9_GetMaterial(device, &material); > + if (FAILED(hr)) > + { > + WARN("Could not get material: %#x.\n", hr); > + memset(&material, 0, sizeof material); > + } > + d3dx9_set_material_parameter(state_table[state->operation].op, &material, param_value); > + return IDirect3DDevice9_SetMaterial(device, &material); > + } > case SC_NPATCHMODE: > TRACE("%s %f.\n", state_table[state->operation].name, *(float *)param_value); > return IDirect3DDevice9_SetNPatchMode(device, *(float *)param_value); > diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c > index e415a3c..3eaddb7 100644 > --- a/dlls/d3dx9_36/tests/effect.c > +++ b/dlls/d3dx9_36/tests/effect.c > @@ -2903,11 +2903,11 @@ static void test_effect_states(IDirect3DDevice9 *device) > } > > hr = IDirect3DDevice9_GetLightEnable(device, 2, &bval); > - todo_wine ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); > + ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); > if (hr == D3D_OK) > ok(bval,"Got result %u, expected TRUE.\n", bval); > hr = IDirect3DDevice9_GetLight(device, 2, &light); > - todo_wine ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); > + ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); > if (hr == D3D_OK) > ok(light.Position.x == 4.0f && light.Position.y == 5.0f && light.Position.z == 6.0f, > "Got unexpected light position (%f, %f, %f).\n", light.Position.x, light.Position.y, light.Position.z); > @@ -2943,9 +2943,9 @@ static void test_effect_states(IDirect3DDevice9 *device) > todo_wine ok(!memcmp(mat.m, test_mat.m, sizeof(mat)), "World matrix not restored.\n"); > > hr = IDirect3DDevice9_GetLightEnable(device, 2, &bval); > - todo_wine ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); > + ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); > if (hr == D3D_OK) > - ok(!bval,"Got result %u, expected 0.\n", bval); > + todo_wine ok(!bval,"Got result %u, expected 0.\n", bval); > > if (effect) > effect->lpVtbl->Release(effect); > -- > 2.5.0

1 0

Re: [v2 2/6] d3dx9: implement simple effect states application.
by Matteo Bruni 02 Mar '16

02 Mar '16

2016-03-01 18:09 GMT+01:00 Paul Gofman <gofmanp(a)gmail.com>: > Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> > --- > dlls/d3dx9_36/effect.c | 111 +++++++++++++++++++++++++++++++++++++++---- > dlls/d3dx9_36/tests/effect.c | 16 +++---- > 2 files changed, 110 insertions(+), 17 deletions(-) > > diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c > index f0bbd0b..7ccdb36 100644 > --- a/dlls/d3dx9_36/effect.c > +++ b/dlls/d3dx9_36/effect.c > @@ -2490,6 +2490,102 @@ static HRESULT d3dx9_base_effect_set_array_range(struct d3dx9_base_effect *base, > return E_NOTIMPL; > } > > +static HRESULT d3dx9_get_param_value_ptr(struct ID3DXEffectImpl *effect, struct d3dx_pass *pass, struct d3dx_state *state, void **param_value, struct d3dx_parameter **out_param) Please break lines so they stay under 100 - 120 characters. > +{ > + struct d3dx_parameter *param; > + param = state->parameter.referenced_param ? state->parameter.referenced_param : &state->parameter; > + > + switch (state->type) > + { > + case ST_CONSTANT: > + case ST_PARAMETER: > + *param_value = param->data; > + *out_param = param; > + return D3D_OK; > + case ST_ARRAY_SELECTOR: > + FIXME("Array selector.\n"); > + break; > + case ST_FXLC: > + FIXME("FXLC not supported yet.\n"); > + break; > + } > + *param_value = NULL; > + *out_param = NULL; > + return E_NOTIMPL; > +} > + > +static HRESULT d3dx9_apply_state(struct ID3DXEffectImpl *effect, struct d3dx_pass *pass, struct d3dx_state *state) > +{ > + IDirect3DDevice9 *device = effect->device; > + struct d3dx_parameter *param; > + void *param_value; > + HRESULT hr; > + > + TRACE("operation %u, index %u, type %u.\n", state->operation, state->index, state->type); > + hr = d3dx9_get_param_value_ptr(effect, pass, state, &param_value, &param); > + if (FAILED(hr)) > + return hr; > + > + switch (state_table[state->operation].class) > + { > + case SC_RENDERSTATE: > + TRACE("%s: operation %u value %u.\n", state_table[state->operation].name, state_table[state->operation].op, *(DWORD *)param_value); You're not being entirely consistent with those traces. I'd use the style you're using here throughout the file but without the ':'. > + return IDirect3DDevice9_SetRenderState(device, state_table[state->operation].op, *(DWORD *)param_value); > + case SC_FVF: > + TRACE("%s: value %#x.\n", state_table[state->operation].name, *(DWORD *)param_value); > + return IDirect3DDevice9_SetFVF(device, *(DWORD *)param_value); > + case SC_TEXTURESTAGE: > + TRACE("%s: stage %u value %u.\n", state_table[state->operation].name, state->index, *(DWORD *)param_value); > + return IDirect3DDevice9_SetTextureStageState(device, state->index, state_table[state->operation].op, *(DWORD *)param_value); > + case SC_VERTEXSHADER: > + TRACE("%s vertex shader %p.\n", state_table[state->operation].name, *(IDirect3DVertexShader9 **)param_value); > + hr = IDirect3DDevice9_SetVertexShader(device, *(IDirect3DVertexShader9 **)param_value); > + if (FAILED(hr)) > + ERR("Could not set vertex shader.\n"); > + FIXME("Not executing preshader and not setting constants.\n"); > + return hr; > + case SC_PIXELSHADER: > + TRACE("%s pixel shader %p.\n", state_table[state->operation].name, *(IDirect3DPixelShader9 **)param_value); > + hr = IDirect3DDevice9_SetPixelShader(device, *(IDirect3DPixelShader9 **)param_value); > + if (FAILED(hr)) > + ERR("Could not set pixel shader.\n"); > + FIXME("Not executing preshader and not setting constants.\n"); > + return hr; > + case SC_TRANSFORM: > + TRACE("%s %u.\n", state_table[state->operation].name, state->index); > + return IDirect3DDevice9_SetTransform(device, state_table[state->operation].op + state->index, (D3DMATRIX *)param_value); > + case SC_NPATCHMODE: > + TRACE("%s %f.\n", state_table[state->operation].name, *(float *)param_value); > + return IDirect3DDevice9_SetNPatchMode(device, *(float *)param_value); > + default: > + FIXME("%s not handled.\n", state_table[state->operation].name); > + break; > + } > + return D3D_OK; > +} > + > +static HRESULT d3dx9_apply_pass_states(struct ID3DXEffectImpl *effect, struct d3dx_pass *pass) > +{ > + UINT i; I'd prefer "unsigned int" for these kind of loop variables, here and elsewhere in those patches. > + HRESULT ret; > + > + TRACE("Effect %p, pass %p, state_count=%u.\n", effect, pass, pass->state_count); Please drop the '='. While at it, use lowercase for "effect". > + > + ret = D3D_OK; > + for (i = 0; i < pass->state_count; i++) > + { > + HRESULT hr; > + > + hr = d3dx9_apply_state(effect, pass, &pass->states[i]); > + if (FAILED(hr)) > + { > + WARN("Error applying state: %#x.\n", hr); > + ret = hr; > + } > + } > + return ret; > +} > + > static inline struct ID3DXEffectImpl *impl_from_ID3DXEffect(ID3DXEffect *iface) > { > return CONTAINING_RECORD(iface, struct ID3DXEffectImpl, ID3DXEffect_iface); > @@ -3175,18 +3271,15 @@ static HRESULT WINAPI ID3DXEffectImpl_Begin(ID3DXEffect *iface, UINT *passes, DW > > static HRESULT WINAPI ID3DXEffectImpl_BeginPass(ID3DXEffect *iface, UINT pass) > { > - struct ID3DXEffectImpl *This = impl_from_ID3DXEffect(iface); > - struct d3dx_technique *technique = This->active_technique; > + struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); > + struct d3dx_technique *technique = effect->active_technique; > > - TRACE("iface %p, pass %u\n", This, pass); > + TRACE("iface %p, pass %u\n", effect, pass); > > - if (technique && pass < technique->pass_count && !This->active_pass) > + if (technique && pass < technique->pass_count && !effect->active_pass) > { > - This->active_pass = &technique->passes[pass]; > - > - FIXME("No states applied, yet!\n"); > - > - return D3D_OK; > + effect->active_pass = &technique->passes[pass]; > + return d3dx9_apply_pass_states(effect, effect->active_pass); > } > > WARN("Invalid argument supplied.\n"); > diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c > index 6dd3e00..e415a3c 100644 > --- a/dlls/d3dx9_36/tests/effect.c > +++ b/dlls/d3dx9_36/tests/effect.c > @@ -2875,11 +2875,11 @@ static void test_effect_states(IDirect3DDevice9 *device) > ok(mat.m[0][0] == test_mat.m[0][0], "Unexpected value: %f.\n", mat.m[0][0]); > > hr = effect->lpVtbl->BeginPass(effect, 0); > - ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); > + todo_wine ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); > > hr = IDirect3DDevice9_GetTransform(device, D3DTS_WORLDMATRIX(1), &mat); > ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); > - todo_wine ok(!memcmp(mat.m, test_mat_world1.m, sizeof(mat)), "World matrix does not match.\n"); > + ok(!memcmp(mat.m, test_mat_world1.m, sizeof(mat)), "World matrix does not match.\n"); > > hr = IDirect3DDevice9_GetTransform(device, D3DTS_VIEW, &mat); > ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); > @@ -2887,11 +2887,11 @@ static void test_effect_states(IDirect3DDevice9 *device) > > hr = IDirect3DDevice9_GetRenderState(device, D3DRS_BLENDOP, &value); > ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); > - todo_wine ok(value == 2, "Got result %u, expected %u\n", value, 2); > + ok(value == 2, "Got result %u, expected %u\n", value, 2); > > hr = IDirect3DDevice9_GetVertexShader(device, &vshader); > ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); > - todo_wine ok(vshader != NULL, "Got NULL vshader.\n"); > + ok(vshader != NULL, "Got NULL vshader.\n"); > if (vshader) > { > byte_code_size = sizeof(test_effect_states_vshader_buf); > @@ -2921,11 +2921,11 @@ static void test_effect_states(IDirect3DDevice9 *device) > ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); > hr = IDirect3DDevice9_GetRenderState(device, D3DRS_BLENDOP, &value); > ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); > - todo_wine ok(value == 2, "Got result %u, expected %u\n", value, 2); > + ok(value == 2, "Got result %u, expected %u\n", value, 2); > > hr = IDirect3DDevice9_GetRenderState(device, D3DRS_ZENABLE, &value); > ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); > - todo_wine ok(value,"Got result %u, expected TRUE.\n", value); > + ok(value,"Got result %u, expected TRUE.\n", value); > > hr = IDirect3DDevice9_GetSamplerState(device, 1, D3DSAMP_MIPFILTER, &value); > ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); > @@ -2933,14 +2933,14 @@ static void test_effect_states(IDirect3DDevice9 *device) > > hr = IDirect3DDevice9_GetTextureStageState(device, 3, D3DTSS_ALPHAOP, &value); > ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); > - todo_wine ok(value == 4, "Unexpected texture stage 3 AlphaOp %u.\n", value); > + ok(value == 4, "Unexpected texture stage 3 AlphaOp %u.\n", value); > > hr = effect->lpVtbl->End(effect); > ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); > > hr = IDirect3DDevice9_GetTransform(device, D3DTS_WORLDMATRIX(1), &mat); > ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); > - ok(!memcmp(mat.m, test_mat.m, sizeof(mat)), "World matrix not restored.\n"); > + todo_wine ok(!memcmp(mat.m, test_mat.m, sizeof(mat)), "World matrix not restored.\n"); > > hr = IDirect3DDevice9_GetLightEnable(device, 2, &bval); > todo_wine ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); > -- > 2.5.0

1 0

Re: [PATCH 2/3 try2] user32: Added more dialog owner tests.
by Marvin 02 Mar '16

02 Mar '16

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=21102 Your paranoid android. === w1064 (32 bit msg) === msg.c:6417: Test failed: Update region shouldn't be empty msg.c:6651: Test failed: InvalidateErase: 0: the msg sequence is not complete: expected 0085 - actual 0000 msg.c:6653: Test failed: Paint: 0: the msg sequence is not complete: expected 000f - actual 0000 msg.c:6423: Test failed: Regions are different msg.c:6423: Test failed: Regions are different msg.c:6423: Test failed: Regions are different === w864 (64 bit msg) === msg.c:6417: Test failed: Update region shouldn't be empty msg.c:6651: Test failed: InvalidateErase: 0: the msg sequence is not complete: expected 0085 - actual 0000 msg.c:6653: Test failed: Paint: 0: the msg sequence is not complete: expected 000f - actual 0000 msg.c:6423: Test failed: Regions are different msg.c:6423: Test failed: Regions are different msg.c:6423: Test failed: Regions are different === w1064 (64 bit msg) === msg.c:6417: Test failed: Update region shouldn't be empty msg.c:6651: Test failed: InvalidateErase: 0: the msg sequence is not complete: expected 0085 - actual 0000 msg.c:6653: Test failed: Paint: 0: the msg sequence is not complete: expected 000f - actual 0000 msg.c:6423: Test failed: Regions are different msg.c:6423: Test failed: Regions are different msg.c:6423: Test failed: Regions are different

1 0

Re: [5/5] imm32: Destroy default IME window when all other windows are destroyed in the thread.
by Marvin 02 Mar '16

02 Mar '16

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=21100 Your paranoid android. === wvistau64 (32 bit imm32) === imm32.c:851: Test failed: Expected IME window existence imm32.c:852: Test failed: Expected 00000000, got 00040196 === w2008s64 (32 bit imm32) === imm32.c:851: Test failed: Expected IME window existence imm32.c:852: Test failed: Expected 00000000, got 000800FE === wvistau64 (64 bit imm32) === imm32.c:851: Test failed: Expected IME window existence imm32.c:852: Test failed: Expected 0000000000000000, got 0000000000040196 === w2008s64 (64 bit imm32) === imm32.c:851: Test failed: Expected IME window existence imm32.c:852: Test failed: Expected 0000000000000000, got 00000000000C0108

1 0

Re: [PATCH 2/6] dxgi: Add feature level support.
by Józef Kucia 02 Mar '16

02 Mar '16

On Wed, Mar 2, 2016 at 12:50 AM, Matteo Bruni <mbruni(a)codeweavers.com> wrote: > Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> > --- > dlls/d3d11/d3d11_main.c | 21 +++++++++++--- > dlls/d3d11/d3d11_private.h | 5 +++- > dlls/dxgi/adapter.c | 3 +- > dlls/dxgi/device.c | 10 +++++-- > dlls/dxgi/dxgi.spec | 2 +- > dlls/dxgi/dxgi_main.c | 10 ++++--- > dlls/dxgi/dxgi_private.h | 7 +++-- > dlls/dxgi/utils.c | 71 ++++++++++++++++++++++++++++++++++++++++------ > 8 files changed, 104 insertions(+), 25 deletions(-) > > diff --git a/dlls/d3d11/d3d11_main.c b/dlls/d3d11/d3d11_main.c > index 8602f00..0eeaf9f 100644 > --- a/dlls/d3d11/d3d11_main.c > +++ b/dlls/d3d11/d3d11_main.c > @@ -101,11 +101,26 @@ static HRESULT WINAPI layer_create(enum dxgi_device_layer_id id, void **layer_ba > return S_OK; > } > > +static void WINAPI layer_set_max_sm(enum dxgi_device_layer_id id, void *device, unsigned int max_sm) > +{ > + struct d3d_device *d3d_device = device; > + > + TRACE("id %#x, device %p, max_sm %u.\n", id, device, max_sm); > + > + if (id != DXGI_DEVICE_LAYER_D3D10_DEVICE) > + { > + WARN("Unknown layer id %#x.\n", id); > + return; > + } > + > + d3d_device->max_sm = max_sm; > +} > + > HRESULT WINAPI D3D11CoreRegisterLayers(void) > { > static const struct dxgi_device_layer layers[] = > { > - {DXGI_DEVICE_LAYER_D3D10_DEVICE, layer_init, layer_get_size, layer_create}, > + {DXGI_DEVICE_LAYER_D3D10_DEVICE, layer_init, layer_get_size, layer_create, layer_set_max_sm}, > }; > > DXGID3D10RegisterLayers(layers, sizeof(layers)/sizeof(*layers)); > @@ -123,10 +138,8 @@ HRESULT WINAPI D3D11CoreCreateDevice(IDXGIFactory *factory, IDXGIAdapter *adapte > TRACE("factory %p, adapter %p, flags %#x, feature_levels %p, levels %u, device %p.\n", > factory, adapter, flags, feature_levels, levels, device); > > - FIXME("Ignoring feature levels.\n"); > - > d3d11 = GetModuleHandleA("d3d11.dll"); > - hr = DXGID3D10CreateDevice(d3d11, factory, adapter, flags, 0, (void **)&dxgi_device); > + hr = DXGID3D10CreateDevice(d3d11, factory, adapter, flags, feature_levels, levels, (void **)&dxgi_device); > if (FAILED(hr)) > { > WARN("Failed to create device, returning %#x.\n", hr); > diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h > index 9d5fd8f..606d84a 100644 > --- a/dlls/d3d11/d3d11_private.h > +++ b/dlls/d3d11/d3d11_private.h > @@ -394,6 +394,8 @@ struct d3d_device > IUnknown *outer_unk; > LONG refcount; > > + unsigned int max_sm; > + > struct d3d11_immediate_context immediate_context; > > struct wined3d_device_parent device_parent; > @@ -453,10 +455,11 @@ struct dxgi_device_layer > UINT (WINAPI *get_size)(enum dxgi_device_layer_id id, struct layer_get_size_args *args, DWORD unknown0); > HRESULT (WINAPI *create)(enum dxgi_device_layer_id id, void **layer_base, DWORD unknown0, > void *device_object, REFIID riid, void **device_layer); > + void (WINAPI *set_max_sm)(enum dxgi_device_layer_id id, void *device, unsigned int max_sm); > }; > > HRESULT WINAPI DXGID3D10CreateDevice(HMODULE d3d10core, IDXGIFactory *factory, IDXGIAdapter *adapter, > - UINT flags, void *unknown0, void **device); > + unsigned int flags, const D3D_FEATURE_LEVEL *feature_levels, unsigned int level_count, void **device); > HRESULT WINAPI DXGID3D10RegisterLayers(const struct dxgi_device_layer *layers, UINT layer_count); > > #endif /* __WINE_D3D11_PRIVATE_H */ > diff --git a/dlls/dxgi/adapter.c b/dlls/dxgi/adapter.c > index 3e58fd2..91a8048 100644 > --- a/dlls/dxgi/adapter.c > +++ b/dlls/dxgi/adapter.c > @@ -200,6 +200,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_adapter_GetDesc(IDXGIAdapter1 *iface, DXGI > static HRESULT STDMETHODCALLTYPE dxgi_adapter_CheckInterfaceSupport(IDXGIAdapter1 *iface, > REFGUID guid, LARGE_INTEGER *umd_version) > { > + static const D3D_FEATURE_LEVEL feature_level = D3D_FEATURE_LEVEL_10_0; > struct dxgi_adapter *adapter = impl_from_IDXGIAdapter1(iface); > struct wined3d_adapter_identifier adapter_id; > HRESULT hr; > @@ -214,7 +215,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_adapter_CheckInterfaceSupport(IDXGIAdapter > return DXGI_ERROR_UNSUPPORTED; > } > > - if (FAILED(hr = dxgi_check_d3d10_support(adapter->parent, adapter))) > + if (FAILED(hr = dxgi_check_feature_level_support(adapter->parent, adapter, &feature_level, 1))) > return DXGI_ERROR_UNSUPPORTED; > > if (umd_version) > diff --git a/dlls/dxgi/device.c b/dlls/dxgi/device.c > index 8645b02..9929c22 100644 > --- a/dlls/dxgi/device.c > +++ b/dlls/dxgi/device.c > @@ -366,13 +366,15 @@ static const struct IWineDXGIDeviceVtbl dxgi_device_vtbl = > }; > > HRESULT dxgi_device_init(struct dxgi_device *device, struct dxgi_device_layer *layer, > - IDXGIFactory *factory, IDXGIAdapter *adapter) > + IDXGIFactory *factory, IDXGIAdapter *adapter, > + const D3D_FEATURE_LEVEL *feature_levels, unsigned int level_count) > { > struct wined3d_device_parent *wined3d_device_parent; > struct wined3d_swapchain_desc swapchain_desc; > IWineDXGIDeviceParent *dxgi_device_parent; > struct dxgi_adapter *dxgi_adapter; > struct dxgi_factory *dxgi_factory; > + unsigned int max_sm; > void *layer_base; > HRESULT hr; > > @@ -416,12 +418,12 @@ HRESULT dxgi_device_init(struct dxgi_device *device, struct dxgi_device_layer *l > wined3d_device_parent = IWineDXGIDeviceParent_get_wined3d_device_parent(dxgi_device_parent); > IWineDXGIDeviceParent_Release(dxgi_device_parent); > > - if (FAILED(hr = dxgi_check_d3d10_support(dxgi_factory, dxgi_adapter))) > + if (!(max_sm = dxgi_check_feature_level_support(dxgi_factory, dxgi_adapter, feature_levels, level_count))) > { > IUnknown_Release(device->child_layer); > wined3d_private_store_cleanup(&device->private_store); > wined3d_mutex_unlock(); > - return hr; > + return E_FAIL; > } > > FIXME("Ignoring adapter type.\n"); > @@ -437,6 +439,8 @@ HRESULT dxgi_device_init(struct dxgi_device *device, struct dxgi_device_layer *l > return hr; > } > > + layer->set_max_sm(layer->id, device->child_layer, max_sm); > + > memset(&swapchain_desc, 0, sizeof(swapchain_desc)); > swapchain_desc.swap_effect = WINED3D_SWAP_EFFECT_DISCARD; > swapchain_desc.device_window = dxgi_factory_get_device_window(dxgi_factory); > diff --git a/dlls/dxgi/dxgi.spec b/dlls/dxgi/dxgi.spec > index 2232f88..3270a53 100644 > --- a/dlls/dxgi/dxgi.spec > +++ b/dlls/dxgi/dxgi.spec > @@ -1,4 +1,4 @@ > @ stdcall CreateDXGIFactory(ptr ptr) > @ stdcall CreateDXGIFactory1(ptr ptr) > -@ stdcall DXGID3D10CreateDevice(ptr ptr ptr long ptr ptr) > +@ stdcall DXGID3D10CreateDevice(ptr ptr ptr long ptr long ptr) > @ stdcall DXGID3D10RegisterLayers(ptr long) > diff --git a/dlls/dxgi/dxgi_main.c b/dlls/dxgi/dxgi_main.c > index c8d049a..a4c1362 100644 > --- a/dlls/dxgi/dxgi_main.c > +++ b/dlls/dxgi/dxgi_main.c > @@ -125,7 +125,7 @@ static HRESULT register_d3d10core_layers(HMODULE d3d10core) > } > > HRESULT WINAPI DXGID3D10CreateDevice(HMODULE d3d10core, IDXGIFactory *factory, IDXGIAdapter *adapter, > - UINT flags, void *unknown0, void **device) > + unsigned int flags, const D3D_FEATURE_LEVEL *feature_levels, unsigned int level_count, void **device) > { > struct layer_get_size_args get_size_args; > struct dxgi_device *dxgi_device; > @@ -134,8 +134,10 @@ HRESULT WINAPI DXGID3D10CreateDevice(HMODULE d3d10core, IDXGIFactory *factory, I > DWORD count; > HRESULT hr; > > - TRACE("d3d10core %p, factory %p, adapter %p, flags %#x, unknown0 %p, device %p.\n", > - d3d10core, factory, adapter, flags, unknown0, device); > + TRACE("d3d10core %p, factory %p, adapter %p, flags %#x, feature_levels %p, level_count %u, device %p.\n", > + d3d10core, factory, adapter, flags, feature_levels, level_count, device); > + > + FIXME("Ignoring flags.\n"); > > hr = register_d3d10core_layers(d3d10core); > if (FAILED(hr)) > @@ -178,7 +180,7 @@ HRESULT WINAPI DXGID3D10CreateDevice(HMODULE d3d10core, IDXGIFactory *factory, I > return E_OUTOFMEMORY; > } > > - hr = dxgi_device_init(dxgi_device, &d3d10_layer, factory, adapter); > + hr = dxgi_device_init(dxgi_device, &d3d10_layer, factory, adapter, feature_levels, level_count); > if (FAILED(hr)) > { > WARN("Failed to initialize device, hr %#x.\n", hr); > diff --git a/dlls/dxgi/dxgi_private.h b/dlls/dxgi/dxgi_private.h > index 59b436b..22910cf 100644 > --- a/dlls/dxgi/dxgi_private.h > +++ b/dlls/dxgi/dxgi_private.h > @@ -73,6 +73,7 @@ struct dxgi_device_layer > UINT (WINAPI *get_size)(enum dxgi_device_layer_id id, struct layer_get_size_args *args, DWORD unknown0); > HRESULT (WINAPI *create)(enum dxgi_device_layer_id id, void **layer_base, DWORD unknown0, > void *device_object, REFIID riid, void **device_layer); > + void (WINAPI *set_max_sm)(enum dxgi_device_layer_id id, void *device, unsigned int max_sm); > }; > > /* TRACE helper functions */ > @@ -120,7 +121,8 @@ struct dxgi_device > }; > > HRESULT dxgi_device_init(struct dxgi_device *device, struct dxgi_device_layer *layer, > - IDXGIFactory *factory, IDXGIAdapter *adapter) DECLSPEC_HIDDEN; > + IDXGIFactory *factory, IDXGIAdapter *adapter, > + const D3D_FEATURE_LEVEL *feature_levels, unsigned int level_count) DECLSPEC_HIDDEN; > > /* IDXGIOutput */ > struct dxgi_output > @@ -174,6 +176,7 @@ struct dxgi_surface > HRESULT dxgi_surface_init(struct dxgi_surface *surface, IDXGIDevice *device, > IUnknown *outer, struct wined3d_resource *wined3d_resource) DECLSPEC_HIDDEN; > > -HRESULT dxgi_check_d3d10_support(struct dxgi_factory *factory, struct dxgi_adapter *adapter) DECLSPEC_HIDDEN; > +HRESULT dxgi_check_feature_level_support(struct dxgi_factory *factory, struct dxgi_adapter *adapter, > + const D3D_FEATURE_LEVEL *feature_levels, unsigned int level_count) DECLSPEC_HIDDEN; > > #endif /* __WINE_DXGI_PRIVATE_H */ > diff --git a/dlls/dxgi/utils.c b/dlls/dxgi/utils.c > index 92a049f..d71eb31 100644 > --- a/dlls/dxgi/utils.c > +++ b/dlls/dxgi/utils.c > @@ -434,24 +434,77 @@ HRESULT dxgi_set_private_data_interface(struct wined3d_private_store *store, > return hr; > } > > -HRESULT dxgi_check_d3d10_support(struct dxgi_factory *factory, struct dxgi_adapter *adapter) > +HRESULT dxgi_check_feature_level_support(struct dxgi_factory *factory, struct dxgi_adapter *adapter, > + const D3D_FEATURE_LEVEL *feature_levels, unsigned int level_count) > { > + static const struct > + { > + D3D_FEATURE_LEVEL feature_level; > + unsigned int sm; > + } > + feature_levels_sm[] = > + { > + {D3D_FEATURE_LEVEL_11_1, 5}, > + {D3D_FEATURE_LEVEL_11_0, 5}, > + {D3D_FEATURE_LEVEL_10_1, 4}, > + {D3D_FEATURE_LEVEL_10_0, 4}, > + {D3D_FEATURE_LEVEL_9_3, 3}, > + {D3D_FEATURE_LEVEL_9_2, 2}, > + {D3D_FEATURE_LEVEL_9_1, 2}, > + }; > + static const D3D_FEATURE_LEVEL default_feature_levels[] = > + { > + D3D_FEATURE_LEVEL_11_0, > + D3D_FEATURE_LEVEL_10_1, > + D3D_FEATURE_LEVEL_10_0, > + D3D_FEATURE_LEVEL_9_3, > + D3D_FEATURE_LEVEL_9_2, > + D3D_FEATURE_LEVEL_9_1, > + }; > + unsigned int selected_sm = 0; > + unsigned int i, j; > WINED3DCAPS caps; > HRESULT hr; > > FIXME("Ignoring adapter type.\n"); > > + if (!feature_levels) > + { > + feature_levels = default_feature_levels; > + level_count = sizeof(default_feature_levels) / sizeof(default_feature_levels[0]); > + } > + > wined3d_mutex_lock(); > hr = wined3d_get_device_caps(factory->wined3d, adapter->ordinal, WINED3D_DEVICE_TYPE_HAL, &caps); > - if (FAILED(hr) || caps.VertexShaderVersion < 4 || caps.PixelShaderVersion < 4) > + wined3d_mutex_unlock(); > + > + if (FAILED(hr)) > + level_count = 0; > + > + for (i = 0; i < level_count; ++i) > { > - FIXME_(winediag)("Direct3D 10 is not supported on this GPU with the current shader backend.\n"); > - if (SUCCEEDED(hr)) > - hr = E_FAIL; > - wined3d_mutex_unlock(); > - return hr; > + for (j = 0; j < sizeof(feature_levels_sm) / sizeof(feature_levels_sm[0]); ++j) > + { > + if (feature_levels[i] == feature_levels_sm[j].feature_level) > + { > + if (caps.VertexShaderVersion >= feature_levels_sm[j].sm > + && caps.PixelShaderVersion >= feature_levels_sm[j].sm) > + { > + selected_sm = feature_levels_sm[j].sm; > + TRACE("Choosing supported feature level %#x (SM%u).\n", feature_levels[i], selected_sm); > + } > + break; > + } > + } > + if (selected_sm) > + break; > + > + if (j == sizeof(feature_levels_sm) / sizeof(feature_levels_sm[0])) > + FIXME("Unexpected feature level %#x.\n", feature_levels[i]); > } > - wined3d_mutex_unlock(); > + if (!selected_sm) > + FIXME_(winediag)("None of the requested D3D feature levels is supported on this GPU " > + "with the current shader backend.\n"); > > - return S_OK; > + return selected_sm; > } > -- > 2.4.10 > > > Not that this is necessarily bad way to implement feature levels, but have you considered exposing wined3d_d3d_level from wined3d?

3 2

Re: [3/5] imm32: Create default IME window when creating a new window.
by Marvin 02 Mar '16

02 Mar '16

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=21099 Your paranoid android. === wvistau64 (32 bit imm32) === imm32.c:851: Test failed: Expected IME window existence imm32.c:852: Test failed: Expected 00000000, got 00040196 === w2008s64 (32 bit imm32) === imm32.c:851: Test failed: Expected IME window existence imm32.c:852: Test failed: Expected 00000000, got 000800FE === wvistau64 (64 bit imm32) === imm32.c:851: Test failed: Expected IME window existence imm32.c:852: Test failed: Expected 0000000000000000, got 0000000000040170 === w2008s64 (64 bit imm32) === imm32.c:851: Test failed: Expected IME window existence imm32.c:852: Test failed: Expected 0000000000000000, got 00000000000C0108

1 0

Re: ole32: Implement CoGetApartmentType. (v2)
by Huw Davies 02 Mar '16

02 Mar '16

On Wed, Mar 02, 2016 at 08:51:49AM +0100, Sebastian Lackner wrote: > From: Michael Müller <michael(a)fds-team.de> > > Signed-off-by: Michael Müller <michael(a)fds-team.de> > Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> > --- > > Changes in v2 (thanks Nikolay): > * Replace ERROR_SUCCESS -> S_OK (Oopps..) > * Initialize variables in tests to make it more convincing. > > dlls/api-ms-win-core-com-l1-1-0/api-ms-win-core-com-l1-1-0.spec | 2 > dlls/api-ms-win-core-com-l1-1-1/api-ms-win-core-com-l1-1-1.spec | 2 > dlls/api-ms-win-downlevel-ole32-l1-1-0/api-ms-win-downlevel-ole32-l1-1-0.spec | 2 > dlls/combase/combase.spec | 2 > dlls/ole32/compobj.c | 29 +++++ > dlls/ole32/ole32.spec | 1 > dlls/ole32/tests/compobj.c | 56 ++++++++++ > include/objidl.idl | 9 + > 8 files changed, 99 insertions(+), 4 deletions(-) The prototype should go in objbase.h . Actually, newer SDKs have moved that into combaseapi.h, but we don't have that yet so objbase.h is good for now. Huw.

3 5

Re: [1/5] imm32/tests: Add tests for life cycle of default IME window.
by Marvin 02 Mar '16

02 Mar '16

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=21098 Your paranoid android. === wvistau64 (32 bit imm32) === imm32.c:851: Test failed: Expected IME window existence imm32.c:852: Test failed: Expected 00000000, got 00040196 === w2008s64 (32 bit imm32) === imm32.c:851: Test failed: Expected IME window existence imm32.c:852: Test failed: Expected 00000000, got 000800FE === wvistau64 (64 bit imm32) === imm32.c:851: Test failed: Expected IME window existence imm32.c:852: Test failed: Expected 0000000000000000, got 0000000000040196 === w2008s64 (64 bit imm32) === imm32.c:851: Test failed: Expected IME window existence imm32.c:852: Test failed: Expected 0000000000000000, got 00000000000800FE

1 0

Re: ddraw/tests: Fix function name in multiple ok() messages.
by Marvin 02 Mar '16

02 Mar '16

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=21063 Your paranoid android. === w1064 (32 bit dsurface) === dsurface.c:144: Test failed: Destination data after blitting is not correct dsurface.c:178: Test failed: Destination data after blitting is not correct dsurface.c:357: Test failed: Surface data after srckey blit does not match dsurface.c:382: Test failed: Surface data after src override key blit does not match dsurface.c:436: Test failed: Surface data after dest key blit does not match dsurface.c:462: Test failed: Surface data after dest key override blit does not match dsurface.c:524: Test failed: Surface data with src key and dest key blit does not match === w864 (64 bit dsurface) === dsurface.c:144: Test failed: Destination data after blitting is not correct dsurface.c:178: Test failed: Destination data after blitting is not correct dsurface.c:357: Test failed: Surface data after srckey blit does not match dsurface.c:382: Test failed: Surface data after src override key blit does not match dsurface.c:436: Test failed: Surface data after dest key blit does not match dsurface.c:462: Test failed: Surface data after dest key override blit does not match dsurface.c:524: Test failed: Surface data with src key and dest key blit does not match === w1064 (64 bit dsurface) === dsurface.c:144: Test failed: Destination data after blitting is not correct dsurface.c:178: Test failed: Destination data after blitting is not correct dsurface.c:357: Test failed: Surface data after srckey blit does not match dsurface.c:382: Test failed: Surface data after src override key blit does not match dsurface.c:436: Test failed: Surface data after dest key blit does not match dsurface.c:462: Test failed: Surface data after dest key override blit does not match dsurface.c:524: Test failed: Surface data with src key and dest key blit does not match

1 0

Re: [PATCH] manpages: markup fixes
by Sebastian Lackner 02 Mar '16

02 Mar '16

On 02.03.2016 09:24, Marcus Meissner wrote: > Supplied by Eric S. Raymond. > > (Did not send a specific signed-off-by, but his email and his follow up email > seems to imply it.) > > Signed-off-by: Marcus Meissner <marcus(a)jet.franken.de> > Signed-off-by: Eric S. Raymond <esr(a)thyrsus.com> > --- > programs/msiexec/msiexec.man.in | 50 ++++++++++++++++++++-------------------- > programs/winedbg/winedbg.man.in | 2 +- > tools/winemaker/winemaker.man.in | 1 - > 3 files changed, 26 insertions(+), 27 deletions(-) > The original mail (which was more a bug report than a proper patch submission) didn't contain a Signed-off-by, so imho it would be wrong to add it on your own. If the patch is accepted, I would prefer to have this invalid Signed-off-by stripped from the subject. Please also note that your own Signed-off-by should be always the last one, otherwise it has a different meaning, and it looks like Eric sent a Sign-off for your patch.

1 0

Re: ole32: Implement semi-stub for CoGetApartmentType.
by Nikolay Sivov 02 Mar '16

02 Mar '16

On 02.03.2016 10:30, Sebastian Lackner wrote: > + return info->apt ? ERROR_SUCCESS : CO_E_NOTINITIALIZED; It should be S_OK. > + hr = pCoGetApartmentType(NULL, NULL); > + ok(hr == E_INVALIDARG, "CoGetApartmentType succeeded, error: 0x%08x\n", hr); > + hr = pCoGetApartmentType(&type, NULL); > + ok(hr == E_INVALIDARG, "CoGetApartmentType succeeded, error: 0x%08x\n", hr); > + hr = pCoGetApartmentType(NULL, &qualifier); > + ok(hr == E_INVALIDARG, "CoGetApartmentType succeeded, error: 0x%08x\n", hr); > + > + hr = pCoGetApartmentType(&type, &qualifier); > + ok(hr == CO_E_NOTINITIALIZED, "CoGetApartmentType succeeded, error: 0x%08x\n", hr); > + ok(type == APTTYPE_CURRENT, "Expected APTTYPE_CURRENT, got %u\n", type); > + ok(qualifier == APTTYPEQUALIFIER_NONE, "Expected APTTYPEQUALIFIER_NONE, got %u\n", qualifier); Please set out variables to some unrealistic values before the calls, to see if it actually sets them. Also if they are set for CO_E_NOTINITIALIZED, it's possible they are set for E_INVALIDARG cases too, and that's not tested (for both initialized and not initialized cases).

2 2

Re: [PATCH 2/3] user32: Added more dialog owner tests.
by Dmitry Timoshkov 02 Mar '16

02 Mar '16

Hi Jacek, Jacek Caban <jacek(a)codeweavers.com> wrote: > + parent = CreateWindowExA(0, "TestParentClass", "Test parent", > + WS_OVERLAPPEDWINDOW | WS_VISIBLE, > + 100, 100, 200, 200, 0, 0, 0, NULL); > + ok (parent != 0, "Failed to create parent window\n"); > + > + child = CreateWindowExA(0, "TestWindowClass", "Test child", > + WS_OVERLAPPEDWINDOW | WS_VISIBLE, > + 100, 100, 200, 200, 0, 0, 0, NULL); > + ok (child != 0, "Failed to create child window\n"); > + > + child2 = CreateWindowExA(0, "SimpleWindowClass", "Test child2", > + WS_OVERLAPPEDWINDOW | WS_VISIBLE | WS_CHILD, > + 100, 100, 200, 200, child, 0, 0, NULL); > + ok (child2 != 0, "Failed to create child window\n"); > + > + SetParent(child, parent); > + SetFocus(child); Is that really required to use SetParent() instead of specifying correct parent in the CreateWindowEx call? > + flush_sequence(); > + DialogBoxA( 0, "TEST_DIALOG", child2, TestModalDlgProc2 ); > + ok_sequence(WmModalDialogSeq_2, "ModalDialog2", TRUE); Is this test supposed to show that actual dialog owner is parent window? If yes, then this theory is not tested at all. > + SetForegroundWindow(hdlg); > + > + { > + const struct message WmEndDialogSeq[] = { > + { WM_ENABLE, sent }, > + { WM_WINDOWPOSCHANGING, sent|wparam, SWP_HIDEWINDOW|SWP_NOACTIVATE|SWP_NOSIZE|SWP_NOMOVE }, > + { HCBT_ACTIVATE, hook|wparam, (WPARAM)hchild }, > + { WM_NCACTIVATE, sent|wparam|lparam, WA_INACTIVE, (LPARAM)hchild }, > + { WM_ACTIVATE, sent|wparam|lparam, WA_INACTIVE, (LPARAM)hchild }, > + /* FIXME: Following two are optional because Wine sends WM_QUERYNEWPALETTE instead of WM_WINDOWPOSCHANGING */ > + { WM_WINDOWPOSCHANGING, sent|wparam|optional, SWP_NOSIZE|SWP_NOMOVE }, > + { WM_QUERYNEWPALETTE, sent|optional }, > + { WM_NCACTIVATE, sent|wparam|lparam, WA_ACTIVE, (LPARAM)hdlg }, > + { WM_GETTEXT, sent|optional|defwinproc }, > + { WM_ACTIVATE, sent|wparam|lparam, WA_ACTIVE, (LPARAM)hdlg }, > + { HCBT_SETFOCUS, hook|wparam, (WPARAM)hchild }, > + { WM_KILLFOCUS, sent|wparam, (WPARAM)hchild }, > + { WM_SETFOCUS, sent|defwinproc|wparam, (WPARAM)hdlg }, > + { 0 } > + }; > + > + flush_sequence(); > + EndDialog(hdlg, 0); > + ok_sequence(WmEndDialogSeq, "EndDialog", FALSE); > + } Please don't create fake embedded blocks. Also it would be really nice to send the tests first so it would be more clear when a todo_wine is removed with a subsequent patch in order to see whether the patch is actually related to the previously sent tests. -- Dmitry.

3 17

Re: [PATCH 1/3] winemac.drv: Fix our handling of bitmaps on the clipboard.
by Ken Thomases 02 Mar '16

02 Mar '16

On Feb 26, 2016, at 3:55 AM, Charles Davis <cdavis5x(a)gmail.com> wrote: > > dlls/winemac.drv/clipboard.c | 87 ++++++++++++++++++++++++++++++++++++++------ > 1 file changed, 76 insertions(+), 11 deletions(-) Mostly looks good. One request, though: please move create_bitmap_from_dib() to above import_clipboard_data(), just to keep all of the import_* functions together. Also, do you happen to have or know of a convenient program to test this with? Thanks, Ken

1 1

The Wine Project has been accepted as a GSoC 2016 mentor organization!
by André Hentschel 01 Mar '16

01 Mar '16

Hi, I'm a little late, but yes, we're accepted again!

2 2

Re: [PATCH 4/4] d3d10core/tests: Port test_multiple_render_targets() from d3d11.
by Marvin 01 Mar '16

01 Mar '16

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=21044 Your paranoid android. === build (build) === Make failed

1 0

Problems in winedbg.1, msiexec.1, winemaker.1
by esr＠thyrsus.com 01 Mar '16

01 Mar '16

This is automatically generated email about markup problems in a man page for which you appear to be responsible. If you are not the right person or list, please tell me so I can correct my database. See http://catb.org/~esr/doclifter/bugs.html for details on how and why these patches were generated. Feel free to email me with any questions. Note: These patches do not change the modification date of any manual page. You may wish to do that by hand. I apologize if this message seems spammy or impersonal. The volume of markup bugs I am tracking is over five hundred - there is no real alternative to generating bugmail from a database and template. -- Eric S. Raymond Problems with winedbg.1: Ambiguous or invalid backslash. This doesn't cause groff a problem. but it confuses doclifter and may confuse older troff implementations. --- winedbg.1-unpatched 2014-06-02 09:40:08.604693388 -0400 +++ winedbg.1 2014-06-02 09:41:09.350110336 -0400 @@ -163,7 +163,7 @@ .IP \fBbreak\ \fIN\fR Adds a breakpoint at line \fIN\fR of current source file. .IP \fBbreak\fR -Adds a breakpoint at current \f$PC\fR address. +Adds a breakpoint at current \fB$PC\fR address. .IP \fBwatch\ *\ \fIN\fR Adds a watch command (on write) at address \fIN\fR (on 4 bytes). .IP \fBwatch\ \fIid\fR Problems with msiexec.1: Ambiguous or invalid backslash. This doesn't cause groff a problem. but it confuses doclifter and may confuse older troff implementations. --- msiexec.1-unpatched 2014-06-02 17:15:58.428528019 -0400 +++ msiexec.1 2014-06-02 17:18:59.360645276 -0400 @@ -24,25 +24,25 @@ \fR[\fBp\fR|\fBo\fR|\fBe\fR|\fBd\fR|\fBc\fR|\fBa\fR|\fBu\fR|\fBm\fR|\fBs\fR|\fBv\fR]\ \ \fR{\fIpackage\fR|\fIproductcode\fR} Repair an installation. Default options are \'omus\' -.IP "\flp\fR" +.IP "\fBlp\fR" Reinstall the file if it is missing. -.IP "\flo\fR" +.IP "\fBlo\fR" Reinstall the file if it is missing or if any older version is installed. -.IP "\fle\fR" +.IP "\fBle\fR" Reinstall the file if it is missing, or if the installed version is equal or older. -.IP "\fld\fR" +.IP "\fBld\fR" Reinstall the file if it is missing or a different version is installed. -.IP "\flc\fR" +.IP "\fBlc\fR" Reinstall the file if it is missing or the checksum does not match. -.IP "\fla\fR" +.IP "\fBla\fR" Reinstall all files. -.IP "\flu\fR" +.IP "\fBlu\fR" Rewrite all required user registry entries. -.IP "\flm\fR" +.IP "\fBlm\fR" Rewrite all required machine registry entries. -.IP "\fls\fR" +.IP "\fBls\fR" Overwrite any conflicting shortcuts. -.IP "\flv\fR" +.IP "\fBlv\fR" Recache the local installation package from the source installation package. .SH PATCHING .IP \fB/p\ \fR{\fIpatch\fR}\ \fR[\fIproperty\fR=\fIfoobar\fR] @@ -65,35 +65,35 @@ [\fBi\fR|\fBw\fR|\fBe\fR|\fBa\fR|\fBr\fR|\fBu\fR|\fBc\fR|\fBm\fR|\fBo\fR|\fBp\fR|\fBv\fR]\ [\fB+\fR|\fB!\fR]\ {\fIlogfile\fR} Enable logging to \fIlogfile\fR. Defaults are \'iwearmo\'. -.IP "\fl*\fR" +.IP "\fBl*\fR" Enable all logging options except \'v\' and \'x\'. -.IP "\fli\fR" +.IP "\fBli\fR" Log status messages. -.IP "\flw\fR" +.IP "\fBlw\fR" Log nonfatal warnings. -.IP "\fle\fR" +.IP "\fBle\fR" Log all error messages. -.IP "\fla\fR" +.IP "\fBla\fR" Log start of actions. -.IP "\flr\fR" +.IP "\fBlr\fR" Log action specifc records. -.IP "\flu\fR" +.IP "\fBlu\fR" Log user requests. -.IP "\flc\fR" +.IP "\fBlc\fR" Log initial UI parameters. -.IP "\flm\fR" +.IP "\fBlm\fR" Log out of memory errors. -.IP "\flo\fR" +.IP "\fBlo\fR" Log out of diskspace messages. -.IP "\flp \fR" +.IP "\fBlp \fR" Log terminal properties. -.IP "\flv \fR" +.IP "\fBlv \fR" Verbose logging. -.IP "\flx \fR" +.IP "\fBlx \fR" Log extra debugging messages. -.IP "\fl+ \fR" +.IP "\fBl+ \fR" Append logging to existing file. -.IP "\fl! \fR" +.IP "\fBl! \fR" Flush each line to log. .SH OTHER OPTIONS .IP \fB/h Problems with winemaker.1: Unbalanced group in command synopis. You probably forgot to open or close a [ ] or { } group properly. --- winemaker.1-unpatched 2014-06-02 09:52:02.517334795 -0400 +++ winemaker.1 2014-06-02 09:54:21.272566508 -0400 @@ -29,7 +29,6 @@ .br [ .BR "--generated-files " "] [ " "--nogenerated-files " "] -] .br [ .BR "--wine32 " "]

3 3

Re: [PATCH] d3dx9: implement effect state management.
by Matteo Bruni 01 Mar '16

01 Mar '16

2016-02-29 19:08 GMT+01:00 Paul Gofman <gofmanp(a)gmail.com>: > Preshaders (and FXLC-type constants requiring preshaders) are TODOs (on the way). > > Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> > --- > dlls/d3dx9_36/effect.c | 375 +++++++++++++++++++++++++++++++++++++++++-- > dlls/d3dx9_36/tests/effect.c | 241 +++++++++++++++++++++++++++ > 2 files changed, 606 insertions(+), 10 deletions(-) You should split this patch into smaller pieces. One way to do that is to introduce the various state classes one at a time into d3dx9_apply_state (or, not everything at once, anyway). The state saving / restoring should also be a separate patch. WRT the tests, they should probably be split out too. You can put them before the implementation, inserting and removing "todo_wine" where necessary, or after. If it's not too complicated the first option is generally preferred. BTW it turns out I have a similar test somewhere in my queue. I'll have another look and I might send it if it still makes sense to. I'm leaving a few comments inline in the patch, below, mostly style issues I noticed at a quick look. Many of them apply multiple times through the patch. In general, make sure to be consistent with code style. Oh, and thank you for working on this! > diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c > index f0bbd0b..33e063a 100644 > --- a/dlls/d3dx9_36/effect.c > +++ b/dlls/d3dx9_36/effect.c > @@ -162,6 +162,8 @@ struct d3dx_technique > > struct d3dx_parameter *annotations; > struct d3dx_pass *passes; > + > + struct IDirect3DStateBlock9 *saved_state; > }; > > struct param_table > @@ -642,6 +644,12 @@ static void free_technique(struct d3dx_technique *technique) > if (!technique) > return; > > + if (technique->saved_state) > + { > + IDirect3DStateBlock9_Release(technique->saved_state); > + technique->saved_state = NULL; > + } > + > if (technique->annotations) > { > for (i = 0; i < technique->annotation_count; ++i) > @@ -2490,6 +2498,332 @@ static HRESULT d3dx9_base_effect_set_array_range(struct d3dx9_base_effect *base, > return E_NOTIMPL; > } > > +static HRESULT d3dx9_get_param_value_ptr(struct ID3DXEffectImpl *This, struct d3dx_pass *pass, struct d3dx_state *state, void **param_value, struct d3dx_parameter **out_param) > +{ > + struct d3dx_parameter *param; > + param = state->parameter.referenced_param ? state->parameter.referenced_param : &state->parameter; > + > + switch(state->type) Space after the switch keyword. > + { > + case ST_CONSTANT: > + case ST_PARAMETER: > + *param_value = param->data; > + *out_param = param; > + return D3D_OK; > + case ST_ARRAY_SELECTOR: > + FIXME("array selector\n"); Uppercase at the start and period at the end of the message. > + break; > + case ST_FXLC: > + FIXME("FXLC not supported yet\n"); > + break; > + } > + *param_value = NULL; > + *out_param = NULL; > + return E_NOTIMPL; > +} > + > +void d3dx9_set_light_parameter(enum LIGHT_TYPE op, D3DLIGHT9 *light, void *value) > +{ > + static struct > + { > + int off; > + const char *name; > + } light_tbl[] = > + { > + {offsetof(D3DLIGHT9, Type), "LC_TYPE"}, You probably want to use FIELD_OFFSET instead. > + {offsetof(D3DLIGHT9, Diffuse), "LT_DIFFUSE"}, > + {offsetof(D3DLIGHT9, Specular), "LT_SPECULAR"}, > + {offsetof(D3DLIGHT9, Ambient), "LT_AMBIENT"}, > + {offsetof(D3DLIGHT9, Position), "LT_POSITION"}, > + {offsetof(D3DLIGHT9, Direction), "LT_DIRECTION"}, > + {offsetof(D3DLIGHT9, Range), "LT_RANGE"}, > + {offsetof(D3DLIGHT9, Falloff), "LT_FALLOFF"}, > + {offsetof(D3DLIGHT9, Attenuation0), "LT_ATTENUATION0"}, > + {offsetof(D3DLIGHT9, Attenuation1), "LT_ATTENUATION1"}, > + {offsetof(D3DLIGHT9, Attenuation2), "LT_ATTENUATION2"}, > + {offsetof(D3DLIGHT9, Theta), "LT_THETA"}, > + {offsetof(D3DLIGHT9, Phi), "LT_PHI"} > + }; > + switch(op) > + { > + case LT_TYPE: > + TRACE("LT_TYPE %d\n", *(D3DLIGHTTYPE*)value); Please put a space between the type and the '*' in the cast. > + light->Type = *(D3DLIGHTTYPE*)value; > + break; > + case LT_DIFFUSE: > + case LT_SPECULAR: > + case LT_AMBIENT: > + { > + D3DCOLORVALUE c = *(D3DCOLORVALUE*)value; > + > + TRACE("%s (%f %f %f %f)\n", light_tbl[op].name, c.r, c.g, c.b, c.a); > + *(D3DCOLORVALUE*)((char*)light + light_tbl[op].off) = c; > + break; > + } > + case LT_POSITION: > + case LT_DIRECTION: > + { > + D3DVECTOR v = *(D3DVECTOR*)value; > + > + TRACE("%s (%f %f %f)\n", light_tbl[op].name, v.x, v.y, v.z); > + *(D3DVECTOR*)((char*)light + light_tbl[op].off) = v; > + break; > + } > + case LT_RANGE: > + case LT_FALLOFF: > + case LT_ATTENUATION0: > + case LT_ATTENUATION1: > + case LT_ATTENUATION2: > + case LT_THETA: > + case LT_PHI: > + { > + float v = *(float*)value; > + TRACE("%s %f\n", light_tbl[op].name, v); > + *(float*)((char*)light + light_tbl[op].off) = v; > + break; > + } > + default: > + FIXME("unknown light parameter %d\n",op); > + break; > + } > +} > + > +void d3dx9_set_material_parameter(enum MATERIAL_TYPE op, D3DMATERIAL9 *material, void *value) > +{ > + static struct Please make it const too, if that works (I guess it might not). > + { > + int off; > + const char *name; > + } material_tbl[] = > + { > + {offsetof(D3DMATERIAL9, Diffuse), "MT_DIFFUSE"}, > + {offsetof(D3DMATERIAL9, Ambient), "MT_AMBIENT"}, > + {offsetof(D3DMATERIAL9, Specular), "MT_SPECULAR"}, > + {offsetof(D3DMATERIAL9, Emissive), "MT_EMISSIVE"}, > + {offsetof(D3DMATERIAL9, Power), "MT_POWER"} > + }; > + > + if (op < 0 || op > MT_POWER) > + { > + FIXME("unknown material parameter %d\n",op); > + return ; Stray whitespace. > + } > + > + switch(op) > + { > + case MT_POWER: > + { > + float v = *(float*)value; > + > + TRACE("%s %f\n", material_tbl[op].name, v); > + material->Power = v; > + break; > + } > + default: > + { > + D3DCOLORVALUE c = *(D3DCOLORVALUE*)value; > + > + TRACE("%s (%f %f %f %f)\n", material_tbl[op].name, c.r, c.g, c.b, c.a); > + *(D3DCOLORVALUE*)((char*)material + material_tbl[op].off) = c; > + break; > + } > + } > +} > + > +HRESULT d3dx_set_shader_const_state(IDirect3DDevice9 *device, enum SHADER_CONSTANT_TYPE op, int index, struct d3dx_parameter *param, void *value_ptr) Probably index should be unsigned int. > +{ > + static struct { '{' should be on its own line. > + D3DXPARAMETER_TYPE type; > + int elem_size; > + const char *name; > + } const_tbl[] = > + { > + {D3DXPT_FLOAT, sizeof(float)*4, "SCT_VSFLOAT"}, Space before and after the binary operator. > + {D3DXPT_BOOL, sizeof(BOOL), "SCT_VSBOOL"}, > + {D3DXPT_INT, sizeof(int)*4, "SCT_VSINT"}, > + {D3DXPT_FLOAT, sizeof(float)*4, "SCT_PSFLOAT"}, > + {D3DXPT_BOOL, sizeof(BOOL), "SCT_PSBOOL"}, > + {D3DXPT_INT, sizeof(int)*4, "SCT_PSINT"}, > + }; > + int nelem; > + > + if (op < 0 || op > SCT_PSINT) > + { > + FIXME("unknown op %d\n", op); > + return D3DERR_INVALIDCALL; > + } > + nelem = param->bytes / const_tbl[op].elem_size; > + TRACE("setting %s index %d, %d elements\n", const_tbl[op].name, index, nelem); > + if (param->type != const_tbl[op].type) > + { > + FIXME("unexpected param type: %d\n", param->type); > + return D3DERR_INVALIDCALL; > + } > + if (param->bytes % const_tbl[op].elem_size != 0) > + { > + FIXME("unexpected param size: %d (rows=%d, cols=%d)\n", param->bytes, param->rows, param->columns); %u, also we usually do without the '=' i.e. "rows %u, cols %u". > + return D3DERR_INVALIDCALL; > + } > + > + switch(op) > + { > + case SCT_VSFLOAT: > + return IDirect3DDevice9_SetVertexShaderConstantF(device, index, (const float*)value_ptr,nelem); > + case SCT_VSBOOL: > + return IDirect3DDevice9_SetVertexShaderConstantB(device, index, (const BOOL*)value_ptr,nelem); > + case SCT_VSINT: > + return IDirect3DDevice9_SetVertexShaderConstantI(device, index, (const int*)value_ptr,nelem); > + case SCT_PSFLOAT: > + return IDirect3DDevice9_SetPixelShaderConstantF(device, index, (const float*)value_ptr,nelem); > + case SCT_PSBOOL: > + return IDirect3DDevice9_SetPixelShaderConstantB(device, index, (const BOOL*)value_ptr,nelem); > + case SCT_PSINT: > + return IDirect3DDevice9_SetPixelShaderConstantI(device, index, (const int*)value_ptr,nelem); > + } > + return D3D_OK; > +} > + > +static HRESULT d3dx9_apply_state(struct ID3DXEffectImpl *This, struct d3dx_pass *pass, struct d3dx_state *state, int parent_index) > +{ > + IDirect3DDevice9 *device = This->device; > + struct d3dx_parameter *param; > + void *param_value; > + HRESULT hr; > + > + TRACE("operation=%d index=%d type=%u\n", state->operation, state->index, state->type); > + hr = d3dx9_get_param_value_ptr(This, pass, state, &param_value, &param); > + if (FAILED(hr)) > + return hr; > + > + switch(state_table[state->operation].class) > + { > + case SC_RENDERSTATE: > + TRACE("%s: operation %d value %u\n", state_table[state->operation].name, state_table[state->operation].op, *(DWORD*)param_value); > + return IDirect3DDevice9_SetRenderState(device, state_table[state->operation].op, *(DWORD*)param_value); > + case SC_FVF: > + TRACE("%s: value %#x\n", state_table[state->operation].name, *(DWORD*)param_value); > + return IDirect3DDevice9_SetFVF(device, *(DWORD*)param_value); > + case SC_TEXTURE: > + { > + int sampler; > + > + sampler = parent_index == -1 ? state->index : parent_index; > + TRACE("%s: sampler %d value %p\n", state_table[state->operation].name, sampler, *(IDirect3DBaseTexture9 **)param_value); > + return IDirect3DDevice9_SetTexture(device, sampler, *(IDirect3DBaseTexture9 **)param_value); > + } > + case SC_TEXTURESTAGE: > + TRACE("%s: stage %d value %u\n", state_table[state->operation].name, state->index, *(DWORD*)param_value); > + return IDirect3DDevice9_SetTextureStageState(device, state->index, state_table[state->operation].op, *(DWORD*)param_value); > + case SC_SETSAMPLER: > + { > + struct d3dx_sampler *sampler; > + HRESULT ret, hr; > + int i; > + > + sampler = (struct d3dx_sampler *)param_value; > + TRACE("%s: sampler %d applying %d states\n", state_table[state->operation].name, state->index, sampler->state_count); > + ret = D3D_OK; > + for (i = 0; i < sampler->state_count; i++) > + { > + hr = d3dx9_apply_state(This, pass, &sampler->states[i], state->index); > + if (FAILED(hr)) > + ret = hr; > + } > + return ret; > + } > + case SC_SAMPLERSTATE: > + { > + int sampler; > + > + sampler = parent_index == -1 ? state->index : parent_index; > + TRACE("%s sampler %d:%u\n", state_table[state->operation].name, sampler, *(DWORD*)param_value); > + return IDirect3DDevice9_SetSamplerState(device, sampler, state_table[state->operation].op, *(DWORD*)param_value); > + } > + case SC_VERTEXSHADER: > + TRACE("%s vertex shader %p\n", state_table[state->operation].name, *(IDirect3DVertexShader9 **)param_value); > + hr = IDirect3DDevice9_SetVertexShader(device, *(IDirect3DVertexShader9 **)param_value); > + if (FAILED(hr)) > + ERR("could not set vertex shader\n"); > + FIXME("not executing preshader and not setting constants\n"); > + return hr; > + case SC_PIXELSHADER: > + TRACE("%s pixel shader %p\n", state_table[state->operation].name, *(IDirect3DPixelShader9 **)param_value); > + hr = IDirect3DDevice9_SetPixelShader(device, *(IDirect3DPixelShader9 **)param_value); > + if (FAILED(hr)) > + ERR("could not set pixel shader\n"); > + FIXME("not executing preshader and not setting constants\n"); > + return hr; > + case SC_TRANSFORM: > + TRACE("%s %d\n", state_table[state->operation].name, state->index); > + return IDirect3DDevice9_SetTransform(device, state_table[state->operation].op + state->index, (D3DMATRIX*)param_value); > + case SC_LIGHTENABLE: > + TRACE("%s index %d %d\n", state_table[state->operation].name, state->index, *(BOOL*)param_value); > + return IDirect3DDevice9_LightEnable(device, state->index, *(BOOL*)param_value); > + case SC_LIGHT: > + { > + D3DLIGHT9 light; > + > + TRACE("%s op %d index %d\n", state_table[state->operation].name, state_table[state->operation].op, state->index); > + hr = IDirect3DDevice9_GetLight(device, state->index, &light); > + if (FAILED(hr)) > + { > + WARN("could not get light: %#x\n", hr); > + memset(&light, 0, sizeof light); > + } > + d3dx9_set_light_parameter(state_table[state->operation].op, &light, param_value); > + return IDirect3DDevice9_SetLight(device, state->index, &light); > + } > + case SC_MATERIAL: > + { > + D3DMATERIAL9 material; > + > + TRACE("%s op %d index %d\n", state_table[state->operation].name, state_table[state->operation].op, state->index); > + hr = IDirect3DDevice9_GetMaterial(device, &material); > + if (FAILED(hr)) > + { > + WARN("could not get material: %#x\n", hr); > + memset(&material, 0, sizeof material); > + } > + d3dx9_set_material_parameter(state_table[state->operation].op, &material, param_value); > + return IDirect3DDevice9_SetMaterial(device, &material); > + } > + case SC_NPATCHMODE: > + TRACE("%s %f\n", state_table[state->operation].name, *(float*)param_value); > + return IDirect3DDevice9_SetNPatchMode(device, *(float*)param_value); > + break; Break is unnecessary after the return (also it's wrongly indented). > + case SC_SHADERCONST: > + TRACE("%s op %d index %d\n", state_table[state->operation].name, state_table[state->operation].op, state->index); > + return d3dx_set_shader_const_state(device, state_table[state->operation].op, state->index, param, param_value); > + break; > + default: > + FIXME("%s not handled\n", state_table[state->operation].name); > + break; > + } > + return D3D_OK; > +} > + > +static HRESULT d3dx9_apply_pass_states(struct ID3DXEffectImpl *This, struct d3dx_pass *pass) > +{ > + int istate; Unsigned int, also you could just call it "i" (or "state_idx"). > + HRESULT ret; > + > + TRACE("This %p, pass %p, state_count=%d\n", This, pass, pass->state_count); > + > + ret = D3D_OK; > + for (istate = 0; istate < pass->state_count; istate++) > + { > + HRESULT hr; > + > + hr = d3dx9_apply_state(This, pass, &pass->states[istate], -1); > + if (FAILED(hr)) > + { > + WARN("error applying state: %#x\n", hr); > + ret = hr; > + } > + } > + return ret; > +} > + > static inline struct ID3DXEffectImpl *impl_from_ID3DXEffect(ID3DXEffect *iface) > { > return CONTAINING_RECORD(iface, struct ID3DXEffectImpl, ID3DXEffect_iface); > @@ -3158,7 +3492,23 @@ static HRESULT WINAPI ID3DXEffectImpl_Begin(ID3DXEffect *iface, UINT *passes, DW > } > else > { > - FIXME("State capturing not supported, yet!\n"); > + HRESULT hr; > + int i; > + > + if (!technique->saved_state) > + { > + hr = IDirect3DDevice9_BeginStateBlock(This->device); > + if (FAILED(hr)) > + ERR("BeginStateBlock failed: %#x\n",hr); > + for (i = 0; i < technique->pass_count; i++) > + d3dx9_apply_pass_states(This, &technique->passes[i]); > + hr = IDirect3DDevice9_EndStateBlock(This->device, &technique->saved_state); > + if (FAILED(hr)) > + ERR("EndStateBlock failed: %#x\n",hr); > + } > + hr = IDirect3DStateBlock9_Capture(technique->saved_state); > + if (FAILED(hr)) > + ERR("StateBlock Capture failed: %#x\n",hr); > } > > *passes = technique->pass_count; > @@ -3183,10 +3533,7 @@ static HRESULT WINAPI ID3DXEffectImpl_BeginPass(ID3DXEffect *iface, UINT pass) > if (technique && pass < technique->pass_count && !This->active_pass) > { > This->active_pass = &technique->passes[pass]; > - > - FIXME("No states applied, yet!\n"); > - > - return D3D_OK; > + return d3dx9_apply_pass_states(This, This->active_pass); > } > > WARN("Invalid argument supplied.\n"); > @@ -3198,15 +3545,13 @@ static HRESULT WINAPI ID3DXEffectImpl_CommitChanges(ID3DXEffect* iface) > { > struct ID3DXEffectImpl *This = impl_from_ID3DXEffect(iface); > > - FIXME("(%p)->(): stub\n", This); > - > if (!This->active_pass) > { > WARN("Called without an active pass.\n"); > return D3D_OK; > } > - > - return E_NOTIMPL; > + /* TODO: apply only changed states */ > + return d3dx9_apply_pass_states(This, This->active_pass); > } > > static HRESULT WINAPI ID3DXEffectImpl_EndPass(ID3DXEffect *iface) > @@ -3229,6 +3574,7 @@ static HRESULT WINAPI ID3DXEffectImpl_EndPass(ID3DXEffect *iface) > static HRESULT WINAPI ID3DXEffectImpl_End(ID3DXEffect *iface) > { > struct ID3DXEffectImpl *This = impl_from_ID3DXEffect(iface); > + struct d3dx_technique *technique = This->active_technique; > > TRACE("iface %p.\n", iface); > > @@ -3241,7 +3587,16 @@ static HRESULT WINAPI ID3DXEffectImpl_End(ID3DXEffect *iface) > } > else > { > - FIXME("State restoring not supported, yet!\n"); > + HRESULT hr; > + > + if (technique && technique->saved_state) > + { > + hr = IDirect3DStateBlock9_Apply(technique->saved_state); > + if (FAILED(hr)) > + ERR("stateblock apply failed: %#x\n",hr); > + } > + else > + ERR("no saved state"); > } > > This->started = FALSE; > diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c > index 482f064..a1b35b7 100644 > --- a/dlls/d3dx9_36/tests/effect.c > +++ b/dlls/d3dx9_36/tests/effect.c > @@ -2692,6 +2692,246 @@ static void test_effect_compilation_errors(IDirect3DDevice9 *device) > effect->lpVtbl->Release(effect); > } > > +/* fxc.exe /T fx_2_0 > +vertexshader vs_arr1[2] = > +{ > + asm > + { > + vs_1_1 > + def c0, 1, 1, 1, 1 > + mov oPos, c0 > + }, > + asm > + { > + vs_2_0 > + def c0, 2, 2, 2, 2 > + mov oPos, c0 > + } > +}; Good idea with the shader array. > + > +sampler sampler1 = > +sampler_state > +{ > + MipFilter = LINEAR; > +}; > + > +float4x4 camera : VIEW = {4.0,0.0,0.0,0.0, 0.0,0.0,0.0,0.0, 0.0,0.0,0.0,0.0, 0.0,0.0,0.0,6.0}; > +technique tech0 > +{ > + pass p0 > + { > + vertexshader = vs_arr1[1]; Idea for a future preshader test, see what happens if you put an expression using parameters as the array index. Not a priority by any means. > + VertexShaderConstant1[3] = {2,2,2,2}; > + BlendOp = 2; > + AlphaOp[3] = 4; > + ZEnable = true; > + WorldTransform[1]={2.0,0.0,0.0,0.0, 0.0,0.0,0.0,0.0, 0.0,0.0,0.0,0.0, 0.0,0.0,0.0,4.0}; > + ViewTransform=(camera); > + LightEnable[2] = TRUE; > + LightType[2] = POINT; > + LightPosition[2] = {4.0f, 5.0f, 6.0f}; > + Sampler[1] = sampler1; > + } > +} I know this is just for reference but it would be better if this was formatted properly. > +*/ > +static const DWORD test_effect_states_effect_blob[] = > +{ > +0xfeff0901, 0x000002e8, 0x00000000, 0x00000010, 0x00000004, 0x00000020, 0x00000000, 0x00000002, > +0x00000001, 0x00000002, 0x00000008, 0x615f7376, 0x00317272, 0x0000000a, 0x00000004, 0x00000074, > +0x00000000, 0x00000000, 0x00000002, 0x00000002, 0x00000002, 0x00000000, 0x00000000, 0x00000000, > +0x00000001, 0x00000001, 0x00000001, 0x000000ab, 0x00000100, 0x00000044, 0x00000040, 0x00000009, > +0x706d6173, 0x3172656c, 0x00000000, 0x00000003, 0x00000002, 0x000000e0, 0x000000ec, 0x00000000, > +0x00000004, 0x00000004, 0x40800000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, > +0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, > +0x00000000, 0x40c00000, 0x00000007, 0x656d6163, 0x00006172, 0x00000005, 0x57454956, 0x00000000, > +0x00000003, 0x00000010, 0x00000004, 0x00000000, 0x00000000, 0x00000000, 0x40000000, 0x40000000, > +0x40000000, 0x40000000, 0x00000003, 0x00000003, 0x00000000, 0x00000000, 0x00000000, 0x00000004, > +0x00000001, 0x00000002, 0x00000002, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000001, > +0x00000001, 0x00000004, 0x00000002, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000001, > +0x00000001, 0x00000001, 0x00000002, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000001, > +0x00000001, 0x40000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, > +0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, > +0x40800000, 0x00000003, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000010, 0x00000001, > +0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, > +0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, > +0x00000003, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000004, 0x00000004, 0x00000001, > +0x00000002, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000001, 0x00000001, > +0x00000002, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000001, 0x40800000, > +0x40a00000, 0x40c00000, 0x00000003, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000003, > +0x00000001, 0x00000000, 0x0000000a, 0x00000004, 0x00000000, 0x00000000, 0x00000000, 0x00000003, > +0x00003070, 0x00000006, 0x68636574, 0x00000030, 0x00000003, 0x00000001, 0x00000005, 0x00000004, > +0x00000004, 0x00000018, 0x00000000, 0x00000000, 0x0000002c, 0x00000060, 0x00000000, 0x00000000, > +0x00000084, 0x000000a0, 0x00000000, 0x00000000, 0x000002dc, 0x00000000, 0x00000001, 0x000002d4, > +0x00000000, 0x0000000b, 0x00000092, 0x00000000, 0x000000fc, 0x000000f8, 0x00000098, 0x00000003, > +0x00000120, 0x00000110, 0x0000004b, 0x00000000, 0x00000140, 0x0000013c, 0x0000006b, 0x00000003, > +0x00000160, 0x0000015c, 0x00000000, 0x00000000, 0x00000180, 0x0000017c, 0x0000007d, 0x00000001, > +0x000001dc, 0x0000019c, 0x0000007c, 0x00000000, 0x00000238, 0x000001f8, 0x00000091, 0x00000002, > +0x00000258, 0x00000254, 0x00000084, 0x00000002, 0x00000278, 0x00000274, 0x00000088, 0x00000002, > +0x000002a0, 0x00000294, 0x000000b2, 0x00000001, 0x000002c0, 0x000002bc, 0x00000002, 0x00000003, > +0x00000001, 0x0000002c, 0xfffe0101, 0x00000051, 0xa00f0000, 0x3f800000, 0x3f800000, 0x3f800000, > +0x3f800000, 0x00000001, 0xc00f0000, 0xa0e40000, 0x0000ffff, 0x00000002, 0x0000002c, 0xfffe0200, > +0x05000051, 0xa00f0000, 0x40000000, 0x40000000, 0x40000000, 0x40000000, 0x02000001, 0xc00f0000, > +0xa0e40000, 0x0000ffff, 0x00000000, 0x00000000, 0xffffffff, 0x0000000a, 0x00000001, 0x00000009, > +0x706d6173, 0x3172656c, 0x00000000, 0x00000000, 0x00000000, 0xffffffff, 0x00000006, 0x00000000, > +0x0000016c, 0x46580200, 0x0030fffe, 0x42415443, 0x0000001c, 0x0000008b, 0x46580200, 0x00000001, > +0x0000001c, 0x20000100, 0x00000088, 0x00000030, 0x00000002, 0x00000004, 0x00000038, 0x00000048, > +0x656d6163, 0xab006172, 0x00030003, 0x00040004, 0x00000001, 0x00000000, 0x40800000, 0x00000000, > +0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, > +0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x40c00000, 0x4d007874, 0x6f726369, > +0x74666f73, 0x29522820, 0x534c4820, 0x6853204c, 0x72656461, 0x6d6f4320, 0x656c6970, 0x2e392072, > +0x392e3932, 0x332e3235, 0x00313131, 0x0002fffe, 0x54494c43, 0x00000000, 0x0024fffe, 0x434c5846, > +0x00000004, 0x10000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000000, 0x00000004, > +0x00000000, 0x10000004, 0x00000001, 0x00000000, 0x00000002, 0x00000004, 0x00000000, 0x00000004, > +0x00000004, 0x10000004, 0x00000001, 0x00000000, 0x00000002, 0x00000008, 0x00000000, 0x00000004, > +0x00000008, 0x10000004, 0x00000001, 0x00000000, 0x00000002, 0x0000000c, 0x00000000, 0x00000004, > +0x0000000c, 0xf0f0f0f0, 0x0f0f0f0f, 0x0000ffff, 0x00000000, 0x00000000, 0xffffffff, 0x00000000, > +0x00000001, 0x0000000b, 0x615f7376, 0x5b317272, 0x00005d31, > +}; > + > +static DWORD test_effect_states_vshader_buf[sizeof test_effect_states_effect_blob / sizeof (DWORD)]; Please use parentheses for the argument of sizeof consistently (always use them, no space). > + > +static void test_effect_states(IDirect3DDevice9 *device) > +{ > + D3DMATRIX test_mat = > + { > + { > + -1.0f, 0.0f, 0.0f, 0.0f, > + 0.0f, 0.0f, 0.0f, 0.0f, > + 0.0f, 0.0f, 0.0f, 0.0f, > + 0.0f, 0.0f, 0.0f, 0.0f > + } > + }; > + D3DMATRIX mat; > + HRESULT hr; > + ID3DXEffect *effect; > + UINT cPasses; No camelcase or similar, just lowercase with underscores. > + DWORD value; > + IDirect3DVertexShader9 *vshader; > + UINT byte_code_size; > + BOOL bval; > + D3DLIGHT9 light; > + float float_data[4]; > + > + hr = D3DXCreateEffect(device, test_effect_states_effect_blob, sizeof(test_effect_states_effect_blob), > + NULL, NULL, 0, NULL, &effect, NULL); > + ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK)\n", hr); > + > + /* 1. State affected in passes saved/restored even if no pass > + was performed. States not present in passes are not saved & > + restored > + */ The "*/" goes on the previous line. > + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_BLENDOP, 1); > + ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK)\n", hr); > + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_ALPHAFUNC, 1); > + ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK)\n", hr); > + > + hr = effect->lpVtbl->Begin(effect, &cPasses, 0); > + ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK)\n", hr); > + ok(cPasses == 1, "Expected 1 pass, got %d\n", cPasses); > + > + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_BLENDOP, 3); > + ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK)\n", hr); > + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_ALPHAFUNC, 2); > + ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK)\n", hr); > + > + hr = effect->lpVtbl->End(effect); > + ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK)\n", hr); > + > + hr = IDirect3DDevice9_GetRenderState(device, D3DRS_BLENDOP, &value); > + ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK)\n", hr); > + ok(value == 1, "Got result %d, expected %d\n", value, 1); > + hr = IDirect3DDevice9_GetRenderState(device, D3DRS_ALPHAFUNC, &value); > + ok(value == 2, "Got result %d, expected %d\n", value, 2); > + > + /* 2. Test states application in BeginPass. No states are restored > + on EndPass. > + */ > + hr = IDirect3DDevice9_SetSamplerState(device, 1, D3DSAMP_MIPFILTER, 0); > + ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK)\n", hr); > + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_ZENABLE, 0); > + ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK)\n", hr); > + > + hr = IDirect3DDevice9_GetLightEnable(device, 2, &bval); > + ok(!bval,"Got result %d, expected 0", bval); > + > + hr = IDirect3DDevice9_SetTransform(device, D3DTS_WORLDMATRIX(1), &test_mat); > + hr = effect->lpVtbl->Begin(effect, &cPasses, 0); > + ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK)\n", hr); > + > + hr = IDirect3DDevice9_GetTransform(device, D3DTS_WORLDMATRIX(1), &mat); > + ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK)\n", hr); > + ok(mat.m[0][0] == test_mat.m[0][0], "Unexpected value: %f\n", mat.m[0][0]); I would check the entire matrix with memcmp(). > + > + hr = effect->lpVtbl->BeginPass(effect, 0); > + ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK)\n", hr); > + > + hr = IDirect3DDevice9_GetTransform(device, D3DTS_WORLDMATRIX(1), &mat); > + ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK)\n", hr); > + ok(mat.m[0][0] == 2.0f && mat.m[3][3] == 4.0f, "World matrix not applied (%f %f)\n", mat.m[0][0], mat.m[3][3]); > + > + hr = IDirect3DDevice9_GetTransform(device, D3DTS_VIEW, &mat); > + ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK)\n", hr); > + todo_wine ok(mat.m[0][0] == 4.0f && mat.m[3][3] == 6.0f, "View matrix not applied (%f %f)\n", mat.m[0][0], mat.m[3][3]); > + > + hr = IDirect3DDevice9_GetRenderState(device, D3DRS_BLENDOP, &value); > + ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK)\n", hr); > + ok(value == 2, "Got result %d, expected %d\n", value, 2); > + > + hr = IDirect3DDevice9_GetVertexShader(device, &vshader); > + ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK)\n", hr); > + byte_code_size = sizeof test_effect_states_vshader_buf; > + hr = IDirect3DVertexShader9_GetFunction(vshader, test_effect_states_vshader_buf,&byte_code_size); > + ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK)\n", hr); > + ok(byte_code_size > 1, "Got unexpected byte code size %d\n", byte_code_size); > + ok(test_effect_states_vshader_buf[0] == 0xfffe0200, "Incorrect shader selected: %#x\n", test_effect_states_vshader_buf[0]); > + IDirect3DVertexShader9_Release(vshader); > + > + hr = IDirect3DDevice9_GetLightEnable(device, 2, &bval); > + ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK)\n", hr); > + ok(bval,"Got result %d, expected TRUE", bval); > + hr = IDirect3DDevice9_GetLight(device, 2, &light); > + ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK)\n", hr); > + ok(light.Position.x == 4.0f && light.Position.y == 5.0f && light.Position.z == 6.0f, > + "Got unexpected light position (%f, %f, %f)\n", light.Position.x, light.Position.y, light.Position.z); > + hr = IDirect3DDevice9_GetVertexShaderConstantF(device, 3, float_data, 1); > + ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK)\n", hr); > + ok(float_data[0] == 2.0f && float_data[1] == 2.0f && float_data[2] == 2.0f && float_data[3] == 2.0f, > + "Got unexpected vertex shader floats: (%f %f %f %f)\n", > + float_data[0], float_data[1], float_data[2], float_data[3]); We use 8 spaces for line continuations in new code. > + > + hr = effect->lpVtbl->EndPass(effect); > + ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK)\n", hr); > + hr = IDirect3DDevice9_GetRenderState(device, D3DRS_BLENDOP, &value); > + ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK)\n", hr); > + ok(value == 2, "Got result %d, expected %d\n", value, 2); > + > + hr = IDirect3DDevice9_GetRenderState(device, D3DRS_ZENABLE, &value); > + ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK)\n", hr); > + ok(value,"Got result %d, expected TRUE\n", value); > + > + hr = IDirect3DDevice9_GetSamplerState(device, 1, D3DSAMP_MIPFILTER, &value); > + ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK)\n", hr); > + ok(value == D3DTEXF_LINEAR, "Unexpected sampler 1 mipfilter %d\n", value); > + > + hr = IDirect3DDevice9_GetTextureStageState(device, 3, D3DTSS_ALPHAOP, &value); > + ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK)\n", hr); > + ok(value == 4, "Unexpected texture stage 3 AlphaOp %d\n", value); > + > + hr = effect->lpVtbl->End(effect); > + ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK)\n", hr); > + > + hr = IDirect3DDevice9_GetTransform(device, D3DTS_WORLDMATRIX(1), &mat); > + ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK)\n", hr); > + ok(mat.m[0][0] == test_mat.m[0][0] && mat.m[3][3] == test_mat.m[3][3], > + "World matrix not restored (%f %f)\n", mat.m[0][0], mat.m[3][3]); > + > + hr = IDirect3DDevice9_GetLightEnable(device, 2, &bval); > + ok(!bval,"Got result %d, expected 0", bval); > + > + if (effect) > + effect->lpVtbl->Release(effect); > +} > + > START_TEST(effect) > { > HWND wnd; > @@ -2730,6 +2970,7 @@ START_TEST(effect) > test_effect_parameter_value(device); > test_effect_variable_names(device); > test_effect_compilation_errors(device); > + test_effect_states(device); > > count = IDirect3DDevice9_Release(device); > ok(count == 0, "The device was not properly freed: refcount %u\n", count); > -- > 2.5.0

3 3

Re: [PATCH] winex11: Don't create a temporary context each time X11DRV_wglBindTexImageARB is called.
by Ken Thomases 01 Mar '16

01 Mar '16

On Feb 26, 2016, at 5:29 PM, Miklós Máté <mtmkls(a)gmail.com> wrote: > @@ -2320,6 +2322,7 @@ static BOOL X11DRV_wglDestroyPbufferARB( struct wgl_pbuffer *object ) > TRACE("(%p)\n", object); > > pglXDestroyPbuffer(gdi_display, object->drawable); > + pglXDestroyContext(gdi_display, object->tmp_context); I think you need to check if object->tmp_context is non-zero before calling glXDestroyContext() to avoid a GLXBadContext error. > + if (!object->tmp_context) { > + object->tmp_context = pglXCreateNewContext(gdi_display, object->fmt->fbconfig, object->fmt->render_type, prev_context, True); > + object->prev_context = prev_context; > + } else if (object->prev_context != prev_context) { > + pglXDestroyContext(gdi_display, object->tmp_context); > + object->tmp_context = pglXCreateNewContext(gdi_display, object->fmt->fbconfig, object->fmt->render_type, prev_context, True); > + object->prev_context = prev_context; > + } Those two branches are mostly the same. This could be reduced to: if (!object->tmp_context || object->prev_context != prev_context) { if (object->tmp_context) pglXDestroyContext(gdi_display, object->tmp_context); object->tmp_context = pglXCreateNewContext(gdi_display, object->fmt->fbconfig, object->fmt->render_type, prev_context, True); object->prev_context = prev_context; } Is it necessary, when a context is destroyed, to go through all wgl_pbuffer structs looking for any whose prev_context matches the one being destroyed and clear it? Otherwise, you risk having a stale reference that could be reused for a different context and not realize you need to recreate tmp_context. Of course, enumerating all of them in a thread-safe manner is going to require a lot of added infrastructure and complexity. -Ken

3 3

Re: [PATCH 2/2] user32: Add SetTimer test with window procedure handle passed as timer callback
by Marvin 01 Mar '16

01 Mar '16

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=21002 Your paranoid android. === w864 (32 bit msg) === msg.c:6360: Test failed: Update region shouldn't be empty msg.c:6594: Test failed: InvalidateErase: 0: the msg sequence is not complete: expected 0085 - actual 0000 msg.c:6596: Test failed: Paint: 0: the msg sequence is not complete: expected 000f - actual 0000 msg.c:6366: Test failed: Regions are different msg.c:6366: Test failed: Regions are different msg.c:6366: Test failed: Regions are different === w1064 (32 bit msg) === msg.c:6360: Test failed: Update region shouldn't be empty msg.c:6594: Test failed: InvalidateErase: 0: the msg sequence is not complete: expected 0085 - actual 0000 msg.c:6596: Test failed: Paint: 0: the msg sequence is not complete: expected 000f - actual 0000 msg.c:6366: Test failed: Regions are different msg.c:6366: Test failed: Regions are different msg.c:6366: Test failed: Regions are different === w1064 (64 bit msg) === msg.c:6360: Test failed: Update region shouldn't be empty msg.c:6594: Test failed: InvalidateErase: 0: the msg sequence is not complete: expected 0085 - actual 0000 msg.c:6596: Test failed: Paint: 0: the msg sequence is not complete: expected 000f - actual 0000 msg.c:6366: Test failed: Regions are different msg.c:6366: Test failed: Regions are different msg.c:6366: Test failed: Regions are different

1 0

Re: [PATCH 2/4] gdi32: Return NTM_DSIG when table is present
by Huw Davies 01 Mar '16

01 Mar '16

On Tue, Mar 01, 2016 at 07:19:02AM +0300, Nikolay Sivov wrote: > Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> > --- > dlls/gdi32/freetype.c | 13 ++++++++++--- > dlls/gdi32/tests/font.c | 3 +++ > 2 files changed, 13 insertions(+), 3 deletions(-) > > diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c > index 01cb913..57cf695 100644 > --- a/dlls/gdi32/freetype.c > +++ b/dlls/gdi32/freetype.c > @@ -1942,7 +1942,6 @@ static inline FT_Fixed get_font_version( FT_Face ft_face ) > static inline DWORD get_ntm_flags( FT_Face ft_face ) > { > DWORD flags = 0; > - FT_ULong table_size = 0; > FT_WinFNT_HeaderRec winfnt_header; > > if (ft_face->style_flags & FT_STYLE_FLAG_ITALIC) flags |= NTM_ITALIC; > @@ -1956,8 +1955,16 @@ static inline DWORD get_ntm_flags( FT_Face ft_face ) > > if (flags == 0) flags = NTM_REGULAR; > > - if (!pFT_Load_Sfnt_Table( ft_face, FT_MAKE_TAG( 'C','F','F',' ' ), 0, NULL, &table_size )) > - flags |= NTM_PS_OPENTYPE; > + if (FT_IS_SFNT( ft_face )) { > + FT_ULong table_size = 0; > + > + if (!pFT_Load_Sfnt_Table( ft_face, FT_MAKE_TAG( 'C','F','F',' ' ), 0, NULL, &table_size )) > + flags |= NTM_PS_OPENTYPE; > + > + table_size = 0; > + if (!pFT_Load_Sfnt_Table( ft_face, FT_MAKE_TAG( 'D','S','I','G' ), 0, NULL, &table_size )) > + flags |= NTM_DSIG; > + } > > return flags; > } > diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c > index d39e701..1059d29 100644 > --- a/dlls/gdi32/tests/font.c > +++ b/dlls/gdi32/tests/font.c > @@ -78,6 +78,7 @@ static WORD system_lang_id; > #define MS_CMAP_TAG MS_MAKE_TAG('c','m','a','p') > #define MS_NAME_TAG MS_MAKE_TAG('n','a','m','e') > #define MS_CFF_TAG MS_MAKE_TAG('C','F','F',' ') > +#define MS_DSIG_TAG MS_MAKE_TAG('D','S','I','G') > > static void init(void) > { > @@ -3968,6 +3969,8 @@ static void test_text_metrics(const LOGFONTA *lf, const NEWTEXTMETRICA *ntm) > has_cff = GetFontData(hdc, MS_CFF_TAG, 0, NULL, 0) != GDI_ERROR; > ok(((ntm->ntmFlags & NTM_PS_OPENTYPE) == NTM_PS_OPENTYPE) == has_cff, "CFF test, got flags 0x%08x, CFF table %d, %s\n", > ntm->ntmFlags, has_cff, font_name); > + if (GetFontData(hdc, MS_DSIG_TAG, 0, NULL, 0) != GDI_ERROR) > + ok(ntm->ntmFlags & NTM_DSIG, "DSIG test, got flags 0x%08x, %s\n", ntm->ntmFlags, font_name); > > test_negative_width(hdc, lf); I get a test failure on OS/X. I suspect it might be something to do with the Helvetica -> Arial substitution. font.c:3974: Test failed: DSIG test, got flags 0x00040040, Helvetica Also, since you'll have to resend it, could you avoid adding more K&R style braces. Huw.

1 0

Re: [v5 PATCH] comctl32/tooltip: Protect TTM_ADDTOOLW from invalid text pointers
by Nikolay Sivov 01 Mar '16

01 Mar '16

On 01.03.2016 9:46, Alistair Leslie-Hughes wrote: > diff --git a/dlls/comctl32/tooltips.c b/dlls/comctl32/tooltips.c > index 8bf6919..43c02ee 100644 > --- a/dlls/comctl32/tooltips.c > +++ b/dlls/comctl32/tooltips.c > @@ -1038,7 +1038,9 @@ TOOLTIPS_AddToolT (TOOLTIPS_INFO *infoPtr, const TTTOOLINFOW *ti, BOOL isW) > infoPtr->hwndSelf, ti->hwnd, ti->uId, > (ti->uFlags & TTF_IDISHWND) ? " TTF_IDISHWND" : ""); > > - if (ti->cbSize >= TTTOOLINFOW_V2_SIZE && !ti->lpszText && isW) > + if (ti->cbSize >= TTTOOLINFOW_V2_SIZE && isW && (!ti->lpszText || > + (ti->lpszText != LPSTR_TEXTCALLBACKW && > + IsBadStringPtrW(ti->lpszText, sizeof(WCHAR))))) > return FALSE; > > if (infoPtr->uNumTools == 0) { > IsBadStringPtrW() won't do what you expect, if you expect it to validate whole string up to NULL char. Also !ti->lpszText case is covered by IsBadStringPtrW(), you don't need to test for it separately.

1 0

Re: [PATCH] user32/text: Stop crash when Tab Length is zero
by Alexandre Julliard 01 Mar '16

01 Mar '16

Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> writes: > @@ -948,7 +948,7 @@ INT WINAPI DrawTextExW( HDC hdc, LPWSTR str, INT i_count, > > if (flags & DT_EXPANDTABS) > { > - int tabstop = ((flags & DT_TABSTOP) && dtp) ? dtp->iTabLength : 8; > + int tabstop = ((flags & DT_TABSTOP) && dtp && dtp->iTabLength) ? dtp->iTabLength : 8; You should test the resulting text size to show that this is the correct behavior. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH 2/4] gdi32: Return NTM_DSIG when table is present
by Marvin 01 Mar '16

01 Mar '16

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=20990 Your paranoid android. === wvistau64 (32 bit font) === An error occurred while waiting for the test to complete: network read timed out (Connect:AgentVersion.h:0/9)

2 1

Re: [v5 PATCH] comctl32/tooltip: Protect TTM_ADDTOOLW from invalid text pointers
by Marvin 01 Mar '16

01 Mar '16

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=20992 Your paranoid android. === wxppro (32 bit tooltips) === tooltips.c:471: Test failed: Adding the tool to the tooltip failed! === w2003std (32 bit tooltips) === tooltips.c:471: Test failed: Adding the tool to the tooltip failed! === wvistau64 (32 bit tooltips) === tooltips.c:471: Test failed: Adding the tool to the tooltip failed! === w2008s64 (32 bit tooltips) === tooltips.c:471: Test failed: Adding the tool to the tooltip failed! === w7u (32 bit tooltips) === tooltips.c:471: Test failed: Adding the tool to the tooltip failed! === w7pro64 (32 bit tooltips) === tooltips.c:471: Test failed: Adding the tool to the tooltip failed! === w8 (32 bit tooltips) === tooltips.c:471: Test failed: Adding the tool to the tooltip failed! === w864 (32 bit tooltips) === tooltips.c:471: Test failed: Adding the tool to the tooltip failed! === w1064 (32 bit tooltips) === tooltips.c:471: Test failed: Adding the tool to the tooltip failed! === wvistau64 (64 bit tooltips) === tooltips.c:471: Test failed: Adding the tool to the tooltip failed! === w2008s64 (64 bit tooltips) === tooltips.c:471: Test failed: Adding the tool to the tooltip failed! === w7pro64 (64 bit tooltips) === tooltips.c:471: Test failed: Adding the tool to the tooltip failed! === w864 (64 bit tooltips) === tooltips.c:471: Test failed: Adding the tool to the tooltip failed! === w1064 (64 bit tooltips) === tooltips.c:471: Test failed: Adding the tool to the tooltip failed!

1 0

Re: [PATCH 3/4] gdi32: Set NTM_TT_OPENTYPE flag for fonts with TrueType outlines
by Marvin 01 Mar '16

01 Mar '16

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=20991 Your paranoid android. === wvistau64 (32 bit font) === An error occurred while waiting for the test to complete: network read timed out (Connect:AgentVersion.h:0/9)

1 0

Re: [PATCH 6/6] d3d10core/tests: Port test_multiple_render_targets() from d3d11.
by Marvin 29 Feb '16

29 Feb '16

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=20980 Your paranoid android. === build (build) === Patch failed to apply

1 0

Re: [PATCH 5/6] d3d10core/tests: Introduce check_texture_color().
by Marvin 29 Feb '16

29 Feb '16

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=20979 Your paranoid android. === build (build) === Patch failed to apply

1 0

Re: [PATCH 4/6] d3d11/tests: Introduce check_texture_color().
by Marvin 29 Feb '16

29 Feb '16

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=20978 Your paranoid android. === build (build) === Patch failed to apply

1 0

Re: [PATCH 3/6] d3d11/tests: Add test for multiple render targets.
by Marvin 29 Feb '16

29 Feb '16

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=20977 Your paranoid android. === build (build) === Patch failed to apply

1 0

Re: [PATCH 1/6] d3d10core/tests: Port test_create_typeless_resource() from d3d11.
by Marvin 29 Feb '16

29 Feb '16

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=20976 Your paranoid android. === build (build) === Patch failed to apply

1 0

Re: ole32: Do not open registry keys with no access rights.
by Sebastian Lackner 29 Feb '16

29 Feb '16

On 29.02.2016 16:49, Thomas Faber wrote: > While simply opening a subkey (as done here) does not require any > access rights in particular, NtOpenKey with 0 desired access always > fails with STATUS_ACCESS_DENIED on Windows. > Consequently specifying a nonzero access is a prerequisite for some day > fixing Wine's NtOpenKey behavior in this regard. It would be nice to have tests for that in the wine source tree (marked with todo_wine, until all places which rely on it have been fixed).

2 1

Re: [PATCH v3] winex11.drv: Make the GL context current even if no drawables were given.
by Matteo Bruni 29 Feb '16

29 Feb '16

2016-02-24 5:12 GMT+01:00 Charles Davis <cdavis5x(a)gmail.com>: > Signed-off-by: Charles Davis <cdavis5x(a)gmail.com> > --- > Try 3: Fix an assignment I missed. (Thanks, Ken.) > > dlls/opengl32/tests/opengl.c | 2 +- > dlls/winex11.drv/opengl.c | 69 +++++++++++++++++++++++++------------------- > 2 files changed, 41 insertions(+), 30 deletions(-) > > diff --git a/dlls/opengl32/tests/opengl.c b/dlls/opengl32/tests/opengl.c > index e5e1507..c058c19 100644 > --- a/dlls/opengl32/tests/opengl.c > +++ b/dlls/opengl32/tests/opengl.c > @@ -975,7 +975,7 @@ static void test_opengl3(HDC hdc) > * expect drivers to ever offer it. > */ > res = wglMakeCurrent(0, gl3Ctx); > - ok(res == FALSE, "Wow, OpenGL 3.0 windowless rendering passed while it was expected not to!\n"); > + ok(res || broken(!res), "OpenGL 3.0 windowless rendering failed!\n"); That seems suspicious... AFAICS the comment right above this hunk is still valid (it is for current Nvidia drivers on Win7 at least), which probably means that this patch is not a good idea.

4 5

Re: [PATCH 2/3] user32: Added more dialog owner tests.
by Marvin 29 Feb '16

29 Feb '16

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=20971 Your paranoid android. === w7u (32 bit msg) === msg.c:8926: Test failed: did not get expected count for minimum timeout (51 != ~100). === w7pro64 (32 bit msg) === msg.c:15473: Test failed: wrong status 00400040 === w1064 (32 bit msg) === msg.c:6417: Test failed: Update region shouldn't be empty msg.c:6651: Test failed: InvalidateErase: 0: the msg sequence is not complete: expected 0085 - actual 0000 msg.c:6653: Test failed: Paint: 0: the msg sequence is not complete: expected 000f - actual 0000 msg.c:6423: Test failed: Regions are different msg.c:6423: Test failed: Regions are different msg.c:6423: Test failed: Regions are different

1 0

Re: [PATCH 1/2] include: add authz.h
by Alexandre Julliard 29 Feb '16

29 Feb '16

Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> writes: > +typedef struct _AUTHZ_ACCESS_REPLY > +{ > + DWORD ResultListLength; > + DWORD *SaclEvaluationResults; > + DWORD *Error; > +} AUTHZ_ACCESS_REPLY, *PAUTHZ_ACCESS_REPLY; There's a field missing here. > +BOOL WINAPI AuthzInitializeResourceManager(DWORD flags, void *access_checker, > + void *compute_dyn_groups, void *free_dyn_groups, > + const WCHAR *managername, void *handle ); That's not the correct prototype. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [v4 PATCH] comctl32/tooltip: Protect TTM_ADDTOOLW from invalid text pointers
by Alexandre Julliard 29 Feb '16

29 Feb '16

Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> writes: > @@ -1041,6 +1041,9 @@ TOOLTIPS_AddToolT (TOOLTIPS_INFO *infoPtr, const TTTOOLINFOW *ti, BOOL isW) > if (ti->cbSize >= TTTOOLINFOW_V2_SIZE && !ti->lpszText && isW) > return FALSE; > > + if(isW && ti->lpszText && IsBadReadPtr(ti->lpszText, sizeof(WCHAR))) > + return FALSE; You want IsBadStringPtrW, and this should most likely be merged with the check above it one way or another. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH 4/4] d3d10core/tests: Test swapchain buffer cycling.
by Henri Verbeet 29 Feb '16

29 Feb '16

On 24 February 2016 at 23:28, Stefan Dösinger <stefandoesinger(a)gmx.at> wrote: > Testing multisampling is not possible because only > DXGI_SWAP_EFFECT_DISCARD supports multisampled swapchains and it allows > only access to buffer 0. > > Not exactly test_flip from ddraw because we can't write to the end of > the chain... > > Plenty of todo_wine in here. The read-only part is missing and texturing > from swapchain buffers doesn't work either. > > foo > Is there a d3d11 version of this as well?

1 0

Re: xcopy/tests: Reset "current directory" of current process.
by Alexandre Julliard 29 Feb '16

29 Feb '16

Jactry Zeng <jzeng(a)codeweavers.com> writes: > @@ -97,4 +99,5 @@ START_TEST(xcopy) > > DeleteFileA("xcopy1"); > RemoveDirectoryA("xcopytest"); > + SetCurrentDirectoryW(curdir); Restoring the directory at process exit is not useful. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: shell32/tests: Reset "current directory" of current process.
by Alexandre Julliard 29 Feb '16

29 Feb '16

Jactry Zeng <jzeng(a)codeweavers.com> writes: > @@ -1882,6 +1884,7 @@ static void test_ITEMIDLIST_format(void) { > } > > IShellFolder_Release(psfPersonal); > + SetCurrentDirectoryW(curdir); > } You'd need to do that on the various error returns too. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH 1/2] ntoskrnl.exe: Track drivers created with IoCreateDriver
by Sebastian Lackner 29 Feb '16

29 Feb '16

On 26.02.2016 21:22, Aric Stewart wrote: > Signed-off-by: Aric Stewart <aric(a)codeweavers.com> > --- > dlls/ntoskrnl.exe/ntoskrnl.c | 64 +++++++++++++++++++++++++++++++++----------- > 1 file changed, 48 insertions(+), 16 deletions(-) > > > > 0002-ntoskrnl.exe-Track-drivers-created-with-IoCreateDriver.txt > > > diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c > index 3bee2bf..49c8cab 100644 > --- a/dlls/ntoskrnl.exe/ntoskrnl.c > +++ b/dlls/ntoskrnl.exe/ntoskrnl.c > @@ -72,6 +72,16 @@ static DWORD request_thread; > static DWORD client_tid; > static DWORD client_pid; > > +typedef struct _created_driver { > + struct list entry; > + > + UNICODE_STRING driver_name; > + DRIVER_OBJECT *driver_obj; > + DRIVER_EXTENSION *driver_extension; Isn't it possible to add the DRIVER_OBJECT and DRIVER_EXTENSION struct directly (without pointer), to avoid multiple memory allocations? I would also suggest to use a more meaningful name than "created_driver", and you also don't really need the typedef. Something like "struct wine_driver" would make more sense for example, but probably you have a better idea. ;) > +} created_driver; > + > +struct list created_drivers = LIST_INIT(created_drivers); > + > #ifdef __i386__ > #define DEFINE_FASTCALL1_ENTRYPOINT( name ) \ > __ASM_STDCALL_FUNC( name, 4, \ > @@ -818,36 +828,47 @@ PIRP WINAPI IoBuildSynchronousFsdRequest(ULONG majorfunc, PDEVICE_OBJECT device, > */ > NTSTATUS WINAPI IoCreateDriver( UNICODE_STRING *name, PDRIVER_INITIALIZE init ) > { > - DRIVER_OBJECT *driver; > - DRIVER_EXTENSION *extension; > + created_driver *driver; > NTSTATUS status; > > TRACE("(%s, %p)\n", debugstr_us(name), init); > > if (!(driver = RtlAllocateHeap( GetProcessHeap(), HEAP_ZERO_MEMORY, > - sizeof(*driver) + sizeof(*extension) ))) > + sizeof(*driver) ))) > + return STATUS_NO_MEMORY; > + > + if (!(driver->driver_obj = RtlAllocateHeap( GetProcessHeap(), HEAP_ZERO_MEMORY, > + sizeof(*driver->driver_obj) + sizeof(*driver->driver_extension) ))) > + { > + RtlFreeHeap( GetProcessHeap(), 0, driver ); > return STATUS_NO_MEMORY; > + } > > - if ((status = RtlDuplicateUnicodeString( 1, name, &driver->DriverName ))) > + if ((status = RtlDuplicateUnicodeString( 1, name, &driver->driver_name ))) > { > + RtlFreeHeap( GetProcessHeap(), 0, driver->driver_obj ); > RtlFreeHeap( GetProcessHeap(), 0, driver ); > return status; > } > > - extension = (DRIVER_EXTENSION *)(driver + 1); > - driver->Size = sizeof(*driver); > - driver->DriverInit = init; > - driver->DriverExtension = extension; > - extension->DriverObject = driver; > - extension->ServiceKeyName = driver->DriverName; > + driver->driver_extension = (DRIVER_EXTENSION *)((BYTE*)driver->driver_obj + sizeof(*driver->driver_obj)); > + driver->driver_obj->DriverName = driver->driver_name; > + driver->driver_obj->Size = sizeof(*driver->driver_obj); > + driver->driver_obj->DriverInit = init; > + driver->driver_obj->DriverExtension = driver->driver_extension; > + driver->driver_extension->DriverObject = driver->driver_obj; > + driver->driver_extension->ServiceKeyName = driver->driver_name; > > - status = driver->DriverInit( driver, name ); > + status = driver->driver_obj->DriverInit( driver->driver_obj, name ); > > if (status) > { > - RtlFreeUnicodeString( &driver->DriverName ); > + RtlFreeUnicodeString( &driver->driver_name ); > + RtlFreeHeap( GetProcessHeap(), 0, driver->driver_obj ); > RtlFreeHeap( GetProcessHeap(), 0, driver ); > } > + > + list_add_tail( &created_drivers, &driver->entry ); Such a global list will need locking. > return status; > } > > @@ -855,12 +876,23 @@ NTSTATUS WINAPI IoCreateDriver( UNICODE_STRING *name, PDRIVER_INITIALIZE init ) > /*********************************************************************** > * IoDeleteDriver (NTOSKRNL.EXE.@) > */ > -void WINAPI IoDeleteDriver( DRIVER_OBJECT *driver ) > +void WINAPI IoDeleteDriver( DRIVER_OBJECT *driver_object ) > { > - TRACE("(%p)\n", driver); > + created_driver *driver, *next; > + > + TRACE("(%p)\n", driver_object); > + By putting the driver_object in the same struct, you could use CONTAINING_RECORD here. Also, a lock will be required while unlinking the driver from the list. > + LIST_FOR_EACH_ENTRY_SAFE(driver, next, &created_drivers, created_driver, entry) > + { > + if (driver->driver_obj == driver_object) > + { > + list_remove( &driver->entry ); > + RtlFreeUnicodeString( &driver->driver_name); > + break; > + } > + } > > - RtlFreeUnicodeString( &driver->DriverName ); > - RtlFreeHeap( GetProcessHeap(), 0, driver ); > + RtlFreeHeap( GetProcessHeap(), 0, driver_object ); > } > > > > >

2 2

Re: [PATCH] programs/winedevice.exe: Use IoCreateDriver and IoDeleteDriver
by Sebastian Lackner 29 Feb '16

29 Feb '16

On 26.02.2016 21:15, Aric Stewart wrote: > Signed-off-by: Aric Stewart <aric(a)codeweavers.com> > --- > programs/winedevice/device.c | 55 ++++++++++++++++++++------------------------ > 1 file changed, 25 insertions(+), 30 deletions(-) > > > > 0001-programs-winedevice.exe-Use-IoCreateDriver-and-IoDelet.txt > > > diff --git a/programs/winedevice/device.c b/programs/winedevice/device.c > index 94132ed..f6dd678 100644 > --- a/programs/winedevice/device.c > +++ b/programs/winedevice/device.c > @@ -43,8 +43,8 @@ extern NTSTATUS CDECL wine_ntoskrnl_main_loop( HANDLE stop_event ); > static WCHAR *driver_name; > static SERVICE_STATUS_HANDLE service_handle; > static HANDLE stop_event; > -static DRIVER_OBJECT driver_obj; > -static DRIVER_EXTENSION driver_extension; > +static DRIVER_OBJECT *driver_obj; > +static HMODULE driver_module; Most of it looks fine, but isn't the plan to get rid of global variables? Do you plan to remove it again in follow-up patches? > > /* find the LDR_MODULE corresponding to the driver module */ > static LDR_MODULE *find_ldr_module( HMODULE module ) > @@ -133,38 +133,35 @@ error: > }

2 1

Re: [PATCH] packet: create packet.dll and Implement PacketGetAdapterNames(try 7)
by André Hentschel 27 Feb '16

27 Feb '16

Am 26.02.2016 um 02:35 schrieb Jianqiu Zhang: > > Hi, still some problems: see the mail by slackner on try 6 missing blank lines I pointed out meanwhile you can totally omit empty_str no need for brackets around single lines Best regards

1 0

Re: shell32/tests: Reset "current directory" of current process.
by Marvin 27 Feb '16

27 Feb '16

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=20931 Your paranoid android. === w1064 (32 bit shlfolder) === shlfolder.c:1591: Test failed: IShellFolder_GetDisplayNameOf(NULL) failed! hr = 80070057

1 0

Re: windowscodecs/tests: Use todo_wine_if() in tests.
by Frédéric Delanoy 27 Feb '16

27 Feb '16

Arf, forget this one, bad title. My bad. Frédéric On Sat, Feb 27, 2016 at 2:42 PM, Frédéric Delanoy <frederic.delanoy(a)gmail.com> wrote: > Signed-off-by: Frédéric Delanoy <frederic.delanoy(a)gmail.com> > --- > dlls/dxgi/tests/device.c | 20 ++++---------------- > 1 file changed, 4 insertions(+), 16 deletions(-) > > diff --git a/dlls/dxgi/tests/device.c b/dlls/dxgi/tests/device.c > index dd5da83..7b052d3 100644 > --- a/dlls/dxgi/tests/device.c > +++ b/dlls/dxgi/tests/device.c > @@ -478,19 +478,13 @@ static void test_createswapchain(void) > hr = IDXGISwapChain_GetDesc(swapchain, &result_desc); > ok(SUCCEEDED(hr), "GetDesc failed, hr %#x.\n", hr); > > ...

1 0

[PATCH] comdlg32: Use SetDlgItemInt() instead of writing number manually.
by carlo.bramix＠libero.it 27 Feb '16

27 Feb '16

Hello friends, I have sent this patch: https://source.winehq.org/patches/data/119492 but it has been put in "Formatting" state and I cannot understand why. Could you help me and tell me what's wrong, so I will use more attention next time? Thank you very much. Sincerely, Carlo Bramini.

3 2

[GSoC] Idea: Implement functions from Concurrency namespace
by YongHao Hu 27 Feb '16

27 Feb '16

Hello, folks. I'm YongHao Hu. I participated in GSoC of Wine last year and most of the work are finished. This year I want to implement functions from Concurrency namespace[1]. As Wine had already implemented class Concurrency::critical_section[2], SpinWait and Concurrency::details::_GetConcurrency, and I had found information in Microsoft open-source project for cloud-based client-server communication in native code using a modern asynchronous C++ API design[3] which are helpful for the implementation, I think that I am able to handle this project. By now, I had made some patches as my proof of concept.[4] There are many bugs[4-8] relied on functions from Concurrency namespace, this project would fix some bugs and benefit wine's behavior on many software. By making an appropriate proposal, I think the project's work can satisfy GSoC's requirement. Thank you for reading this email. I will be grateful for any advice you can provide. [1]: https://msdn.microsoft.com/en-us/library/dd492819.aspx [2]: https://msdn.microsoft.com/en-us/library/dd492843.aspx [3]: https://github.com/Microsoft/cpprestsdk [4]: https://github.com/YongHaoWu/wine-hub/commits/Concurrency [5]: https://bugs.winehq.org/show_bug.cgi?id=37887 [6]: https://bugs.winehq.org/show_bug.cgi?id=37997 [7]: https://bugs.winehq.org/show_bug.cgi?id=39685 [8]: https://bugs.winehq.org/show_bug.cgi?id=34676 [9]: https://bugs.winehq.org/show_bug.cgi?id=37976

3 6

Wine Mono release plans
by Vincent Povirk 26 Feb '16

26 Feb '16

Hi everyone, With Wine moving to a yearly stable release series, I thought it would make sense to base Wine Mono updates on that schedule. My general plan is to create a branch of Wine Mono after each new development series of Wine begins. After this branch is made, there will be no more merges from upstream Mono (barring some compelling changes that can't easily be cherry-picked). Build fixes and obviously correct bug fixes for related platforms will be cherry-picked from upstream, as will changes that look especially relevant to Wine. If you want to suggest a specific change for Wine Mono (whether it's upstream or not), email me or send a pull request to one of my repositories on github. I've made a wine-mono-4.6 branch for this on github (https://github.com/madewokherd/wine-mono/tree/wine-mono-4.6) and there are 4.6.0 packages on dl.winehq.org (http://dl.winehq.org/wine/wine-mono/4.6.0/). I plan to send patches to update Wine to use this version shortly, but as always you can install it early if you want by using 'wine64 msiexec' (or just 'wine msiexec' if you have a 32-bit prefix). Merges from upstream Mono will still be made on the master branch, and I will work to keep Wine compatible with the master branch as the development cycle goes on. However, no releases will be made from the master branch. Each Wine Mono series will be compatible with the corresponding development series of Wine, and the stable series before and after. Thus all Wine Mono 4.6.x versions should work with Wine 1.8.x, 1.9.x, or 2.0.x. I'm not sure if I will continue to publish changelogs for each release. In this case, the only major changes in 4.6.0 are the update from upstream and the ability to function on a basic level in a 64-bit Wine process.

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel