March 2016 - Wine-Devel - list.winehq.org

Re: winex11.drv: Allow grabed window belonging to a different thread in send_mouse_input.
by Henri Verbeet March 10, 2016

March 10, 2016

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 March 10, 2016

March 10, 2016

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 March 10, 2016

March 10, 2016

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 March 10, 2016

March 10, 2016

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 March 10, 2016

March 10, 2016

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 March 10, 2016

March 10, 2016

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 March 9, 2016

March 9, 2016

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 March 9, 2016

March 9, 2016

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 March 9, 2016

March 9, 2016

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 March 9, 2016

March 9, 2016

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