April 2015 - Wine-Devel - list.winehq.org

Re: [PATCH 1/2] winex11: Don't pump messages in ChangeDisplaySettings (v3).
by Marvin April 27, 2015

April 27, 2015

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=13041 Your paranoid android. === w8 (32 bit sysparams) === sysparams.c:2497: Test failed: Waiting for the WM_DISPLAYCHANGE message timed out sysparams.c:2510: Test failed: Set bpp 32, but WM_DISPLAYCHANGE reported bpp -1

1 0

Re: [3/3] user32: Don't perform SetWindowPos synchronously.
by Marvin April 27, 2015

April 27, 2015

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=13038 Your paranoid android. === w7u (32 bit msg) === msg.c:12230: Test failed: unexpected hwnd 0017014A msg.c:12252: Test failed: bad time 31267/31276

1 0

Re: [1/3] user32/tests: Add a test for calling SetWindowPos for other thread window.
by Marvin April 27, 2015

April 27, 2015

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=13037 Your paranoid android. === w7u (32 bit msg) === msg.c:12230: Test failed: unexpected hwnd 00150136 msg.c:12252: Test failed: bad time 31100/3111f

1 0

Re: [PATCH 4/5] wined3d: Don't use the builtin FFP uniforms for texture transformation matrices. (v3)
by Henri Verbeet April 26, 2015

April 26, 2015

On 24 April 2015 at 22:25, Matteo Bruni <mbruni(a)codeweavers.com> wrote: > +static void shader_glsl_ffp_vertex_texmatrix_uniform(const struct wined3d_context *context, > + const struct wined3d_state *state, unsigned int tex, struct glsl_shader_prog_link *prog) > +{ > + const struct wined3d_gl_info *gl_info = context->gl_info; > + struct wined3d_matrix mat; > + > + if (tex >= MAX_TEXTURES) > + return; I think the patch is fine as it is, but as a style comment, arguably you aren't so much validating "tex" against MAX_TEXTURES here as against ARRAY_SIZE(texture_matrix_location).

1 0

Re: [PATCH] wined3d: fix wrong struct initialization
by Henri Verbeet April 26, 2015

April 26, 2015

On 26 April 2015 at 12:22, Patrick Rudolph <siro(a)das-labor.org> wrote: > - static const struct wined3d_query_data_timestamp_disjoint > disjoint_data = {FALSE, 1000 * 1000 * 1000}; > + static const struct wined3d_query_data_timestamp_disjoint > disjoint_data = {1000 * 1000 * 1000, FALSE}; The change is fine like this, but unfortunately it looks like your MUA has wrapped the patch.

1 0

Re: advapi32/tests: Add tests for RegQueryInfoKey.
by Nikolay Sivov April 26, 2015

April 26, 2015

On 04/25/2015 08:41 PM, Thomas Faber wrote: > + /* class name with buffer one char too small */ > + memset(classbuffer, 0x55, sizeof(classbuffer)); > + classlen = sizeof(subkey_class) - 1; > + ret = RegQueryInfoKeyA(subkey, classbuffer, &classlen, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); > + ok(ret == ERROR_MORE_DATA, "ret = %d\n", ret); > + todo_wine ok(classlen == sizeof(subkey_class) - 2, "classlen = %u\n", classlen); > + todo_wine ok(classbuffer[0] == 's', "classbuffer[0] = 0x%x\n", classbuffer[0]); > + todo_wine ok(classbuffer[1] == 'u', "classbuffer[1] = 0x%x\n", classbuffer[1]); > + todo_wine ok(classbuffer[10] == 's', "classbuffer[10] = 0x%x\n", classbuffer[10]); > + todo_wine ok(classbuffer[11] == 0, "classbuffer[11] = 0x%x\n", classbuffer[11]); > + ok(classbuffer[12] == 0x55, "classbuffer[12] = 0x%x\n", classbuffer[12]); I think it would be more readable if you tested it against a string. Also hardcoded offsets could be avoided in this case. > + memset(classbufferW, 0x55, sizeof(classbufferW)); > + classlen = sizeof(subkey_class) - 1; > + ret = RegQueryInfoKeyW(subkey, classbufferW, &classlen, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); > + todo_wine ok(ret == ERROR_INSUFFICIENT_BUFFER, "ret = %d\n", ret); > + ok(classlen == sizeof(subkey_class) - 2 /* win8 */ || > + classlen == strlen(subkey_class), "classlen = %u\n", classlen); > + ok(classbufferW[0] == 0x5555, "classbufferW[0] = 0x%x\n", classbufferW[0]); > + ok(classbufferW[1] == 0x5555, "classbufferW[1] = 0x%x\n", classbufferW[1]); > + ok(classbufferW[10] == 0x5555, "classbufferW[10] = 0x%x\n", classbufferW[10]); > + ok(classbufferW[11] == 0x5555, "classbufferW[11] = 0x%x\n", classbufferW[11]); > + ok(classbufferW[12] == 0x5555, "classbufferW[12] = 0x%x\n", classbufferW[12]); If first element is not changed, it's really unlikely that anything else did. > + ok(classbuffer[12] == 0, "classbuffer[12] = 0x%x\n", classbuffer[12]); > + ok(classbuffer[13] == 0x55, "classbuffer[13] = 0x%x\n", classbuffer[13]); ... > + ok(!lstrcmpW(classbufferW, subkey_classW), "classbufferW = %s\n", wine_dbgstr_w(classbufferW)); > + ok(classbufferW[12] == 0, "classbufferW[12] = 0x%x\n", classbufferW[12]); > + ok(classbufferW[13] == 0x5555, "classbufferW[13] = 0x%x\n", classbufferW[13]); Could you replace offsets with calculated string length instead so it still works for different strings.

2 1

Re: [PATCH] wined3d: fix wrong data order for D3DQUERYTYPE_TIMESTAMPDISJOINT
by Henri Verbeet April 25, 2015

April 25, 2015

On 25 April 2015 at 14:26, Patrick Rudolph <siro(a)das-labor.org> wrote: > At the moment the querry D3DQUERYTYPE_TIMESTAMPDISJOINT returns TRUE instead > of FALSE due to wrong data order in struct > wined3d_query_data_timestamp_disjoint. > Please use "git send-email" for sending patches. (Or fix your MUA to inline them.) Unfortunately swapping the order of the fields will introduce a hole in the structure between "disjoint" and "frequency", and make it incompatible with the equivalent d3d10 structure (D3D10_QUERY_DATA_TIMESTAMP_DISJOINT). I think it would be much nicer to fix the initializer of "disjoint_data" in wined3d_timestamp_disjoint_query_ops_get_data() to match the structure layout instead.

1 0

Re: (resend)comctl32:TTM_SETTOOLINFO does not change subclassing
by Alexandre Julliard April 24, 2015

April 24, 2015

Aric Stewart <aric(a)codeweavers.com> writes: > + toolInfo2.cbSize = TTTOOLINFOA_V1_SIZE; > + toolInfo2.hwnd = parent2; > + toolInfo2.uId = 0x1234ABCE; > + lResult = SendMessageA(hwndTip, TTM_GETTOOLINFOA, 0, (LPARAM)&toolInfo2); > + ok(lResult, "GetToolInfo failed\n"); > + ok(!(toolInfo2.uFlags & TTF_SUBCLASS), "uFlags has subclass\n"); > + wndProc = GetWindowLongPtrA(parent2, GWLP_WNDPROC); > + ok (wndProc == (DWORD)(&info_wnd_proc), "Window Proc is wrong\n"); > + > + toolInfo2.uFlags |= TTF_SUBCLASS; > + SendMessageA(hwndTip, TTM_SETTOOLINFOA, 0, (LPARAM)&toolInfo2); > + lResult = SendMessageA(hwndTip, TTM_GETTOOLINFOA, 0, (LPARAM)&toolInfo2); > + ok(lResult, "GetToolInfo failed\n"); > + ok(toolInfo2.uFlags & TTF_SUBCLASS, "uFlags does not have subclass\n"); > + ok (wndProc == (DWORD)(&info_wnd_proc), "Window Proc is wrong\n"); Please use the correct types for window function pointers. -- Alexandre Julliard julliard(a)winehq.org

2 1

Re: [PATCH 5/5] wined3d: Move volume DXTn handling to apply_format_fixups.
by Henri Verbeet April 24, 2015

April 24, 2015

This fails the d3dx9_36 tests: ../../../tools/runtest -q -P wine -T ../../.. -M d3dx9_36.dll -p d3dx9_36_test.exe.so texture && touch texture.ok ... texture.c:1778: Test failed: D3DXCreateVolumeTextureFromFileInMemory returned 0x8876086c, expected 0

1 0

Re: [PATCH 6/6] wined3d: Introduce a scratch string buffers framework.
by Henri Verbeet April 23, 2015

April 23, 2015

On 22 April 2015 at 19:30, Matteo Bruni <mbruni(a)codeweavers.com> wrote: > It's somewhat of an RFC at this point. In particular I'd like some > feedback about the API. In general, I think it goes in the right direction. > An obvious variant would be to store the pointer to the parent > wined3d_shader_buffer structure right before the string and just > return the string itself (thus avoiding having to add ->buffer to > all the uses of the string). Personally, I don't particularly mind the couple of extra characters, and it seems like a good thing to explicitly distinguish between string buffers and regular strings. > + tex_reg_name = shader_sprintf_unsafe(&priv->string_buffers, "tex%u", stage); > shader_glsl_color_correction_ext(buffer, tex_reg_name, WINED3DSP_WRITEMASK_ALL, > settings->op[stage].color_fixup); The problem with this construction is that it is likely to break as soon as shader_glsl_color_correction_ext() does anything that ends up calling shader_get_buffer(). To make it worse, shader_glsl_color_correction_ext() isn't aware of this because it just gets a const char *, and shader_glsl_generate_ffp_fragment_shader() isn't supposed to care about the internals of shader_glsl_color_correction_ext(). > @@ -276,13 +276,17 @@ int shader_vaddline(struct wined3d_shader_buffer *buffer, const char *format, va > char *base = buffer->buffer + buffer->content_size; > int rc; > char *new_buffer; > + unsigned int new_buffer_size; > > while(1) > { > rc = vsnprintf(base, buffer->buffer_size - buffer->content_size, format, args); > if (rc < 0 /* C89 */ || (unsigned int)rc >= buffer->buffer_size - buffer->content_size /* C99 */) > { > - new_buffer = HeapReAlloc(GetProcessHeap(), 0, buffer->buffer, buffer->buffer_size * 2); > + new_buffer_size = buffer->buffer_size * 2; > + while (rc > 0 && (unsigned int)rc >= new_buffer_size - buffer->content_size) > + new_buffer_size *= 2; > + new_buffer = HeapReAlloc(GetProcessHeap(), 0, buffer->buffer, new_buffer_size); > if (!new_buffer) > { > ERR("The buffer allocated for the shader program string is too small at %d bytes.\n", buffer->buffer_size); > @@ -290,7 +294,7 @@ int shader_vaddline(struct wined3d_shader_buffer *buffer, const char *format, va > return -1; > } > buffer->buffer = new_buffer; > - buffer->buffer_size = buffer->buffer_size * 2; > + buffer->buffer_size = new_buffer_size; > base = buffer->buffer + buffer->content_size; > } > else This is a bit of an unrelated change, but probably the right thing to do. Note that I have an unsent patch that separates tracing the shader source from shader_vaddline() though, so it's going to look a bit different fairly soon. > +static char shader_empty_string[] = ""; This should be const, right? > +static void shader_sprintf_va_list(struct wined3d_shader_buffer *buffer, const char *format, va_list args) I probably would have called that vprintf/vsprintf instead of sprintf_va_list. > +{ > + int ret; > + char *new_buffer; > + unsigned int new_buffer_size; > + > + if (!buffer) > + return; > + while (1) > + { > + ret = vsnprintf(buffer->buffer, buffer->buffer_size, format, args); > + if (ret < 0 || (unsigned int)ret >= buffer->buffer_size) > + { > + new_buffer_size = buffer->buffer_size * 2; > + while (ret > 0 && (unsigned int)ret >= new_buffer_size) > + new_buffer_size *= 2; > + new_buffer = HeapReAlloc(GetProcessHeap(), 0, buffer->buffer, new_buffer_size); > + if (!new_buffer) > + { > + ERR("Couldn't allocate buffer for temporary string.\n"); > + buffer->buffer[0] = 0; > + return; > + } > + buffer->buffer = new_buffer; > + buffer->buffer_size = new_buffer_size; > + } > + else > + { > + break; > + } > + } > +} Once tracing the shader source is removed from shader_vaddline(), this comes down to a shader_buffer_clear() followed by shader_vaddline(). And arguably shader_get_buffer() should always shader_buffer_clear() the buffers it returns. > +/* This function immediately puts the buffer back into the free list (it's > + * intended to be used when the string is to be used and discarded immediately, > + * mostly useful to avoid having to move the string pointer out of the block). */ > +const char *shader_sprintf_unsafe(struct list *buffer_list, const char *format, ...) Not a fan, for the reasons mentioned at shader_glsl_generate_ffp_fragment_shader() above. > +void shader_release_buffer(struct list *list, struct wined3d_shader_buffer *buffer) > +{ > + if (!buffer) > + return; Can buffer ever legitimately be NULL? > +void shader_buffer_list_free(struct list *list) > +{ > + struct wined3d_shader_buffer *buffer, *buffer_next; > + > + LIST_FOR_EACH_ENTRY_SAFE(buffer, buffer_next, list, struct wined3d_shader_buffer, entry) > + { > + shader_buffer_free(buffer); > + HeapFree(GetProcessHeap(), 0, buffer); > + } > +} > + This doesn't actually remove the buffers from the list. There may also be an argument for wrapping the list itself in a structure, similar to struct wined3d_private_store. > struct wined3d_shader_buffer > { At some point we'll probably want to rename this to something like "wined3d_string_buffer".

2 2