January 2017 - Wine-Devel - list.winehq.org

Re: [PATCH 07/10] wined3d: Add dispatch_compute() draw primitive.
by Józef Kucia Jan. 30, 2017

Jan. 30, 2017

On Sun, Jan 29, 2017 at 2:43 PM, Guillaume Charifi <guillaume.charifi(a)sfr.fr> wrote: > + if (!context_apply_draw_state(context, device, state)) > + { > + context_release(context); > + WARN("Unable to apply draw state, skipping draw.\n"); > + return; > + } I don't think it makes sense to apply all states for compute pipeline. Note that graphics pipeline and compute pipeline have separate UAV bindings.

1 0

Re: [PATCH 08/10] wined3d: Dispatch compute through the command stream.
by Józef Kucia Jan. 30, 2017

Jan. 30, 2017

On Sun, Jan 29, 2017 at 2:43 PM, Guillaume Charifi <guillaume.charifi(a)sfr.fr> wrote: > + for (i = 0; i < ARRAY_SIZE(state->streams); ++i) > + { > + if (state->streams[i].buffer) > + wined3d_resource_acquire(&state->streams[i].buffer->resource); > + } > + for (i = 0; i < ARRAY_SIZE(state->textures); ++i) > + { > + if (state->textures[i]) > + wined3d_resource_acquire(&state->textures[i]->resource); > + } Streams and textures are not supposed to be used by compute pipeline.

1 0

Re: [PATCH 05/10] wined3d: Add compute shaders cb/samplers state updates.
by Józef Kucia Jan. 30, 2017

Jan. 30, 2017

FWIW, I have a patch series adding basic support for compute shaders in my patch queue. I should start submitting the series when my SM5 shader instructions series from wine-patches is committed. I've skimmed over your patches though. I'll share some high-level comments. On Sun, Jan 29, 2017 at 2:43 PM, Guillaume Charifi <guillaume.charifi(a)sfr.fr> wrote: > Signed-off-by: Guillaume Charifi <guillaume.charifi(a)sfr.fr> > --- > dlls/wined3d/context.c | 1 + > dlls/wined3d/state.c | 3 +++ > 2 files changed, 4 insertions(+) > > diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c > index ca73bcc..eaae0b8 100644 > --- a/dlls/wined3d/context.c > +++ b/dlls/wined3d/context.c > @@ -3382,6 +3382,7 @@ static void context_bind_shader_resources(struct wined3d_context *context, const > { > {WINED3D_SHADER_TYPE_PIXEL, 0, MAX_FRAGMENT_SAMPLERS}, > {WINED3D_SHADER_TYPE_VERTEX, MAX_FRAGMENT_SAMPLERS, MAX_VERTEX_SAMPLERS}, > + {WINED3D_SHADER_TYPE_COMPUTE, 0, MAX_COMPUTE_SAMPLERS}, > }; I don't think that adding a proper support for binding compute shader resources is that simple.

1 0

Re: [PATCH 1/3] wined3d: Add some missing state updates for buffer textures.
by Henri Verbeet Jan. 30, 2017

Jan. 30, 2017

On 29 January 2017 at 03:32, Guillaume Charifi <guillaume.charifi(a)sfr.fr> wrote: > Signed-off-by: Guillaume Charifi <guillaume.charifi(a)sfr.fr> > > --- > dlls/wined3d/context.c | 12 ++++++++++++ > dlls/wined3d/state.c | 5 +++++ > dlls/wined3d/view.c | 6 ------ > 3 files changed, 17 insertions(+), 6 deletions(-) > These patches are incredibly unappealing to review. There are multiple versions of multiple interleaved series, with html and other errors mixed in. (See e.g. https://source.winehq.org/patches/data/129296.) Please only send a reasonable number of patches at once, I'd suggest sticking with 5, and please use git send-email for sending patches.

1 0

Re: patches: Display multiple check marks for multiple signoffs.
by André Hentschel Jan. 30, 2017

Jan. 30, 2017

Hi, > --- a/patches/update > +++ b/patches/update > @@ -229,7 +229,7 @@ foreach my $file (sort { $patches{$b}->{"order"} <=> $patches{$a}->{"order"} } k > } > if (defined($patch->{"signoff"})) > { > - printf INDEX "<td class=\"checkmark\" onclick=\"toggle_display('$file.signoff')\">✓</td>"; > + printf INDEX "<td class=\"checkmark\" onclick=\"toggle_display('$file.signoff')\">%s</td>", "✓" x @{$patch->{"signoff"}}; > } The patch is definitly an improvement, but the problem with the patch is, that right now I can't see that my patch has been signed-off by Aric when looking at it in the patch list ... 129264 New Aric Stewart Re: usp10: Fix ScriptRecordDigitSubstitution spec file entry ✓ ... 129183 Assigned André Hentschel usp10: Fix ScriptRecordDigitSubstitution spec file entry Aric Stewart ✓ ... I think something like that was what Bruno is looking for

3 4

Re: [PATCH] winbase.h: Add UnlockResource prototype
by Dmitry Timoshkov Jan. 30, 2017

Jan. 30, 2017

Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> wrote: > This function is obsolete and was only used in win16. However when trying > to compile a project with winelib found this function was called. Then you need to add it to an appropriate win16 header, or better remove it from your project since it won't compile with PSDK either. -- Dmitry.

2 1

Re: [PATCH 1/7] regedit: Use a helper for LoadString() and add debug information
by Dmitry Timoshkov Jan. 30, 2017

Jan. 30, 2017

Hugh McMaster <hugh.mcmaster(a)outlook.com> wrote: > -static INT vmessagebox(HWND hwnd, INT buttons, INT titleId, INT resId, va_list ap) > +static void load_string(unsigned int msg_id, WCHAR *buf, unsigned int count) > { > static const WCHAR errorW[] = {'E','r','r','o','r',0}; > - static const WCHAR unknownW[] = {'U','n','k','n','o','w','n',' ','e','r','r','o','r',' ','s','t','r','i','n','g','!',0}; > > + if (!buf) return; > + > + if (!LoadStringW(hInst, msg_id, buf, count)) > + { > + WINE_FIXME("LoadString failed with %u\n", GetLastError()); > + lstrcpyW(buf, errorW); > + } > +} Probably using a flavour of lstrcpy that checks the target buffer length would be more appropriate. Although simply returning an empty buffer and an error indicator to the caller could be slightly better. Under which conditions LoadString may fail here? -- Dmitry.

2 2

Re: [PATCH] MAINTAINERS: Add myself for printing
by Bruno Jesus Jan. 29, 2017

Jan. 29, 2017

On Sun, Jan 29, 2017 at 8:15 PM, Detlef Riekenberg <wine.dev(a)web.de> wrote: > -- > bye bye Detlef > > Signed-off-by: Detlef Riekenberg <wine.dev(a)web.de> > --- > MAINTAINERS | 7 ++++++- > 1 file changed, 6 insertions(+), 1 deletion(-) > > diff --git a/MAINTAINERS b/MAINTAINERS > index e5224ff..d53af50 100644 > --- a/MAINTAINERS > +++ b/MAINTAINERS > @@ -206,10 +206,15 @@ F: dlls/vcomp*/ > > Printing > M: Huw Davies <huw(a)codeweavers.com> > +P: Detlef Riekenberg <wine.dev(a)web.de> > F: dlls/localspl/ > -F: dlls/wineps.drv/ > +F: dlls/spoolss/ > F: dlls/winspool.drv/ > > +Postscript Driver > +M: Huw Davies <huw(a)codeweavers.com> > +F: dlls/wineps.drv/ > + I believe we are trying to keep the areas in alphabetical order.

1 0

Re: [v2 PATCH 3/3] windowscodecs: Add support for palette image formats to PNG encoder.
by Vincent Povirk Jan. 29, 2017

Jan. 29, 2017

> + else > + { > + png_palette[i].red = 0; > + png_palette[i].green = 0; > + png_palette[i].blue = 0; > + } Why is it necessary to pad the palette in this way? Couldn't you just pass the appropriate number of colors?

3 2

Re: [PATCH] wined3d: Recognize SM5 dcl_resource_raw instruction.
by guillaume.charifi＠sfr.fr Jan. 29, 2017

Jan. 29, 2017

Yes, you're right, I forgot to commit the declaration of raw_resource in wined3d_private. And yes, it can be replaced by dst instead. <div class="gl_quote" style="margin-top: 20px; padding-top: 5px;"> <div class="gl_quoted">On Sun, Jan 29, 2017 at 11:52 AM, Guillaume Charifi wrote: > Signed-off-by: Guillaume Charifi > --- > dlls/wined3d/arb_program_shader.c | 1 + > dlls/wined3d/glsl_shader.c | 1 + > dlls/wined3d/shader.c | 6 ++++++ > dlls/wined3d/shader_sm4.c | 10 ++++++++++ > dlls/wined3d/wined3d_private.h | 1 + > 5 files changed, 19 insertions(+) This patch doesn't even compile. Please test your patches before sending them to wine-patches. > +static void shader_sm5_read_dcl_resource_raw(struct wined3d_shader_instruction *ins, > + DWORD opcode, DWORD opcode_token, const DWORD *tokens, unsigned int token_count, > + struct wined3d_sm4_data *priv) > +{ > + shader_sm4_read_dst_param(priv, &tokens, WINED3D_DATA_RESOURCE, &ins->declaration.raw_resource.reg); > +} You should just use "ins->declaration.dst".</div> </div>

1 0

Re: [PATCH] wined3d: Recognize SM5 dcl_resource_raw instruction.
by Józef Kucia Jan. 29, 2017

Jan. 29, 2017

On Sun, Jan 29, 2017 at 11:52 AM, Guillaume Charifi <guillaume.charifi(a)sfr.fr> wrote: > Signed-off-by: Guillaume Charifi <guillaume.charifi(a)sfr.fr> > --- > dlls/wined3d/arb_program_shader.c | 1 + > dlls/wined3d/glsl_shader.c | 1 + > dlls/wined3d/shader.c | 6 ++++++ > dlls/wined3d/shader_sm4.c | 10 ++++++++++ > dlls/wined3d/wined3d_private.h | 1 + > 5 files changed, 19 insertions(+) This patch doesn't even compile. Please test your patches before sending them to wine-patches. > +static void shader_sm5_read_dcl_resource_raw(struct wined3d_shader_instruction *ins, > + DWORD opcode, DWORD opcode_token, const DWORD *tokens, unsigned int token_count, > + struct wined3d_sm4_data *priv) > +{ > + shader_sm4_read_dst_param(priv, &tokens, WINED3D_DATA_RESOURCE, &ins->declaration.raw_resource.reg); > +} You should just use "ins->declaration.dst".

1 0

Re: [PATCH] wined3d: Implement buffer texture range.
by Józef Kucia Jan. 29, 2017

Jan. 29, 2017

Please add a test. On Sun, Jan 29, 2017 at 12:25 AM, Guillaume Charifi <guillaume.charifi(a)sfr.fr> wrote: > + GL_EXTCALL(glTexBufferRange(GL_TEXTURE_BUFFER, view_format->glInternal, buffer->buffer_object, > + desc->u.buffer.start_idx, desc->u.buffer.count)); This is wrong.

1 0

RE : [PATCH] wined3d: Implement buffer texture range.
by Guillaume Charifi Jan. 29, 2017

Jan. 29, 2017

Woops, I forgot the patch adding the required extension, I'll send it later.

1 0

RE : Re: [PATCH 1/3] wined3d: Add some missing state updates for buffer textures.
by Guillaume Charifi Jan. 29, 2017

Jan. 29, 2017

Right, thank you... -------- Message d'origine -------- De : Bruno Jesus <00cpxxx(a)gmail.com> Date :29/01/2017 03:13 (GMT+01:00) À : Guillaume Charifi Cc : Wine Develop Objet : Re: [PATCH 1/3] wined3d: Add some missing state updates for buffer textures. On Sat, Jan 28, 2017 at 8:46 PM, Guillaume Charifi <guillaume.charifi(a)sfr.fr> wrote: > --- > dlls/wined3d/context.c | 12 ++++++++++++ > dlls/wined3d/state.c | 5 +++++ > dlls/wined3d/view.c | 6 ------ > 3 files changed, 17 insertions(+), 6 deletions(-) You missed the Signed-off-by, see the red marks at http://source.winehq.org/patches/

1 0

Re: [PATCH 1/3] wined3d: Add some missing state updates for buffer textures.
by Bruno Jesus Jan. 29, 2017

Jan. 29, 2017

On Sat, Jan 28, 2017 at 8:46 PM, Guillaume Charifi <guillaume.charifi(a)sfr.fr> wrote: > --- > dlls/wined3d/context.c | 12 ++++++++++++ > dlls/wined3d/state.c | 5 +++++ > dlls/wined3d/view.c | 6 ------ > 3 files changed, 17 insertions(+), 6 deletions(-) You missed the Signed-off-by, see the red marks at http://source.winehq.org/patches/

1 0

Re: [PATCH v3 1/4] ddraw: Don't crash if writing out a new ddraw1 surface segfaults.
by Marvin Jan. 28, 2017

Jan. 28, 2017

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=28113 Your paranoid android. === w1064 (32 bit ddraw1) === ddraw1.c:1662: Test failed: Got unexpected color 0x000000ff.

1 0

Re: [PATCH v3 1/4] ddraw: Don't crash if writing out a new ddraw1 surface segfaults.
by Sebastian Lackner Jan. 28, 2017

Jan. 28, 2017

On 28.01.2017 22:59, Alex Henrie wrote: > + __TRY > { > - *surface = NULL; > - return hr; > + if (FAILED(hr)) > + { > + *surface = NULL; > + return hr; > + } Its not possible to use return in a __TRY block.

1 0

Re: [PATCH 1/5] wined3d: Fix sRGB clears with no support for ARB_framebuffer_sRGB.
by Henri Verbeet Jan. 27, 2017

Jan. 27, 2017

On 27 January 2017 at 19:52, Matteo Bruni <mbruni(a)codeweavers.com> wrote: > - if (!gl_info->supported[ARB_FRAMEBUFFER_SRGB] && needs_srgb_write(context, state, fb)) > + if (!gl_info->supported[ARB_FRAMEBUFFER_SRGB] > + && ((!(context->d3d_info->wined3d_creation_flags & WINED3D_SRGB_READ_WRITE_CONTROL) > + && fb->render_targets[0] && fb->render_targets[0]->format_flags & WINED3DFMT_FLAG_SRGB_WRITE) > + || state->render_states[WINED3D_RS_SRGBWRITEENABLE])) I think this looks suspicious, why is this more correct? In particular, wouldn't this enable sRGB clears on formats without WINED3DFMT_FLAG_SRGB_WRITE? Patch 2/5 hints that that may be intentional, but in that case, shouldn't this be independent of ARB_framebuffer_sRGB support?

2 3

Re: [PATCH v2 1/4] ddraw: Don't write out if a ddraw1 surface of size 0 is requested.
by Alex Henrie Jan. 27, 2017

Jan. 27, 2017

2017-01-27 5:43 GMT-07:00 Henri Verbeet <hverbeet(a)gmail.com>: > On 26 January 2017 at 06:20, Alex Henrie <alexhenrie24(a)gmail.com> wrote: >> + hr = IDirectDraw_CreateSurface(ddraw, &surface_desc, &surface, NULL); >> + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); >> + ok(surface == (IDirectDrawSurface *)0xdeadbeef || broken(!surface) /* 32-bit on Win8/10 */, >> + "Got unexpected surface %p.\n", surface); > Where does this pass without the broken()? It writes NULL to surface > for me on Windows 7, and appears to handle the exception when an > invalid pointer is passed in. http://testbot.winehq.org/JobDetails.pl?Key=28086 The following testbot VMs are the only ones that zero out the surface pointer: w8 (32 bit ddraw1) w864 (32 bit ddraw1) w1064 (32 bit ddraw1) Maybe the behavior of newer versions of Windows depends on the video card driver? -Alex ---------- Forwarded message ---------- From: Marvin <testbot(a)winehq.org> Date: 2017-01-27 10:00 GMT-07:00 Subject: TestBot job 28086 results: ddraw: Don't write out if a ddraw1 surface of size 0 is requested. To: Alex Henrie <alexhenrie24(a)gmail.com> VM Status Number of test failures build completed wxppro completed 0 w2003std completed 0 wvistau64 completed 0 w2008s64 completed 0 w7u completed 0 w7pro64 completed 0 w8 completed 1 w864 completed 1 w1064 completed 2 wvistau64 completed 0 w2008s64 completed 0 w7pro64 completed 0 w864 completed 0 w1064 completed 1 === build (build) === No build failures found === wxppro (32 bit ddraw1) === No test failures found === w2003std (32 bit ddraw1) === No test failures found === wvistau64 (32 bit ddraw1) === No test failures found === w2008s64 (32 bit ddraw1) === No test failures found === w7u (32 bit ddraw1) === No test failures found === w7pro64 (32 bit ddraw1) === No test failures found === w8 (32 bit ddraw1) === ddraw: ddraw1.c:1971: Test failed: Got unexpected surface 00000000. === w864 (32 bit ddraw1) === ddraw: ddraw1.c:1971: Test failed: Got unexpected surface 00000000. === w1064 (32 bit ddraw1) === ddraw: ddraw1.c:1971: Test failed: Got unexpected surface 00000000. ddraw1.c:2299: Test failed: Expected (0,0)-(512,384), got (0,0)-(1024,768). === wvistau64 (64 bit ddraw1) === No test failures found === w2008s64 (64 bit ddraw1) === No test failures found === w7pro64 (64 bit ddraw1) === No test failures found === w864 (64 bit ddraw1) === No test failures found === w1064 (64 bit ddraw1) === ddraw: ddraw1.c:2299: Test failed: Expected (0,0)-(512,384), got (0,0)-(1024,768).

2 1

Re: [PATCH] d3dx11: Add D3DX11CreateShaderResourceViewFromMemory stub. (resend)
by Matteo Bruni Jan. 27, 2017

Jan. 27, 2017

2017-01-25 12:19 GMT+01:00 Andrey Gusev <andrey.goosev(a)gmail.com>: > Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> > --- > dlls/d3dx11_42/Makefile.in | 1 + > dlls/d3dx11_42/d3dx11_42.spec | 2 +- > dlls/d3dx11_43/Makefile.in | 1 + > dlls/d3dx11_43/d3dx11_43.spec | 2 +- > dlls/d3dx11_43/shader.c | 36 ++++++++++++++++++++++++++++++++++++ > 5 files changed, 40 insertions(+), 2 deletions(-) > create mode 100644 dlls/d3dx11_43/shader.c I had a better look at the patch and unfortunately I don't think this is okay as is. Sorry that I missed it the first time around. The D3DX11CreateShaderResourceViewFrom* functions are probably supposed to be very thin wrappers over the corresponding D3DX11CreateTextureFrom* functions. So e.g. for D3DX11CreateShaderResourceViewFromMemory() an implementation calling D3DX11CreateTextureFromMemory() and then ID3D11Device_CreateShaderResourceView(device, ...) on the returned resource is probably all there is to it. Except that, for the pump != NULL case, you want to do the work on the thread pump so e.g. create the the SRV in a ID3DX11DataProcessor. Anyway, it's still okay to me to go with just a stub or with an implementation only taking into account the !pump case. You need to add the function definition to d3dx11tex.h though. Also, given that this is really a texture function, it doesn't make sense to put it in a new shader.c file. Just adding it to texture.c seems fine.

1 0

Re: opengl32: add OpenGL 3.3/4.0 extensions
by Vito Paradiso Jan. 27, 2017

Jan. 27, 2017

i quite didn’t understand > Il giorno 16 gen 2017, alle ore 22:49, Marvin <testbot(a)winehq.org> ha scritto: > > 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 "No patch". > > This means that no patch was found in your mail. > > 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.

1 0

Re: [PATCH] d3d8/tests: Fix copy&paste issue in compare_mode (cppcheck)
by Henri Verbeet Jan. 27, 2017

Jan. 27, 2017

On 27 January 2017 at 05:58, Bruno Jesus <00cpxxx(a)gmail.com> wrote: > - unsigned int h = mode_b->h - mode_b->h; > + unsigned int h = mode_a->h - mode_b->h; This is correct of course, but I'd hesitate to call copy/paste on it.

1 0

Re: [PATCH v2 1/4] ddraw: Don't write out if a ddraw1 surface of size 0 is requested.
by Henri Verbeet Jan. 27, 2017

Jan. 27, 2017

On 26 January 2017 at 06:20, Alex Henrie <alexhenrie24(a)gmail.com> wrote: > + hr = IDirectDraw_CreateSurface(ddraw, &surface_desc, &surface, NULL); > + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); > + ok(surface == (IDirectDrawSurface *)0xdeadbeef || broken(!surface) /* 32-bit on Win8/10 */, > + "Got unexpected surface %p.\n", surface); Where does this pass without the broken()? It writes NULL to surface for me on Windows 7, and appears to handle the exception when an invalid pointer is passed in.

1 0

Re: ntprint: Fix PSetupCreateMonitorInfo spec file entry
by Huw Davies Jan. 27, 2017

Jan. 27, 2017

On Thu, Jan 26, 2017 at 11:46:57PM +0100, André Hentschel wrote: > Signed-off-by: André Hentschel <nerv(a)dawncrow.de> > --- > dlls/ntprint/ntprint.spec | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > > diff --git a/dlls/ntprint/ntprint.spec b/dlls/ntprint/ntprint.spec > index 8869776..3687979 100644 > --- a/dlls/ntprint/ntprint.spec > +++ b/dlls/ntprint/ntprint.spec > @@ -2,7 +2,7 @@ > @ stub PSetupAssociateICMProfiles > @ stub PSetupBuildDriversFromPath > @ stub PSetupCreateDrvSetupPage > -@ stdcall PSetupCreateMonitorInfo(long ptr ptr) > +@ stdcall PSetupCreateMonitorInfo(ptr ptr ptr) > @ stub PSetupCreatePrinterDeviceInfoList > @ stub PSetupDestroyDriverInfo3 > @ stdcall PSetupDestroyMonitorInfo(long) > I get exceptions running the tests on 32-bit Windows (with or without this patch) which go away when I call the function with just two arguments - I suspect we should lose the third argument. Huw.

1 0

Re: ntdll: add a stub for NtLoadKey2/ZwLoadKey2
by Dmitry Timoshkov Jan. 27, 2017

Jan. 27, 2017

Austin English <austinenglish(a)gmail.com> wrote: > +NTSTATUS WINAPI NtLoadKey2(OBJECT_ATTRIBUTES *attr, OBJECT_ATTRIBUTES *file, ULONG flags) > +{ > + NTSTATUS ret; > + > + FIXME("(%p,%p,0x%08x) semi-stub: ignoring flags\n", attr, file, flags); > + ret = NtLoadKey(attr, file); > + > + return ret; > +} There is no need for an intermediate variable. -- Dmitry.

1 0