- wine-devel - winehq.org

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

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