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

Re: [PATCH] d3dx11: Remove forward to d3dx11_43.

by Matteo Bruni

2016-12-29 16:59 GMT+01:00 Andrey Gusev <andrey.goosev(a)gmail.com>: > Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> > --- > dlls/d3dx11_42/d3dx11_42.spec | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/dlls/d3dx11_42/d3dx11_42.spec b/dlls/d3dx11_42/d3dx11_42.spec > index f97ec24..0a6350c 100644 > --- a/dlls/d3dx11_42/d3dx11_42.spec > +++ b/dlls/d3dx11_42/d3dx11_42.spec > @@ -29,7 +29,7 @@ > @ stub D3DX11FilterTexture > @ stub D3DX11GetImageInfoFromFileA > @ stub D3DX11GetImageInfoFromFileW > -@ stdcall D3DX11GetImageInfoFromMemory(ptr long ptr ptr ptr) d3dx11_43.D3DX11GetImageInfoFromMemory > +@ stdcall D3DX11GetImageInfoFromMemory(ptr long ptr ptr ptr) > @ stub D3DX11GetImageInfoFromResourceA > @ stub D3DX11GetImageInfoFromResourceW > @ stub D3DX11LoadTextureFromTexture Does that compile?

Jan. 6, 2017

Re: [PATCH] d3dx11: Add D3DX11CreateShaderResourceViewFromMemory stub.

by Matteo Bruni

2016-12-28 15:43 GMT+01:00 Andrey Gusev <andrey.goosev(a)gmail.com>: It's probably pretty safe but I'd prefer to defer this patch after 2.0.

Jan. 6, 2017

Re: [PATCH 1/4] ddraw: Don't write out if a ddraw1 surface of size 0 is requested.

by Henri Verbeet

On 6 January 2017 at 19:31, Alex Henrie <alexhenrie24(a)gmail.com> wrote: > Thanks for the feedback. No, this isn't a regression. Should I wait > until after the code freeze to submit a revised patchset? > Submitting it is fine, and I'll review it, but I won't sign off on it until after the release.

Jan. 6, 2017

Re: [PATCH 1/4] ddraw: Don't write out if a ddraw1 surface of size 0 is requested.

by Alex Henrie

2017-01-06 4:57 GMT-07:00 Henri Verbeet <hverbeet(a)gmail.com>: > On 6 January 2017 at 08:07, Alex Henrie <alexhenrie24(a)gmail.com> wrote: >> Fixes https://bugs.winehq.org/show_bug.cgi?id=42159 >> > This isn't a regression, right? > >> @@ -2975,10 +2975,7 @@ static HRESULT WINAPI ddraw1_CreateSurface(IDirectDraw *iface, >> hr = ddraw_surface_create(ddraw, &surface_desc2, &impl, outer_unknown, 1); >> wined3d_mutex_unlock(); >> if (FAILED(hr)) >> - { >> - *surface = NULL; >> return hr; >> - } > This does a bit more than the commit message says it does, this > doesn't write to *surface on any error from ddraw_surface_create(). > That may very well be correct, but that's not what the test tests. The > test only tests that CreateSurface() doesn't crash on error with an > invalid "surface" pointer, but that could also be because of e.g. an > exception handler. If you want to prove that it doesn't (try to) write > to the "surface" pointer, you should pass a valid pointer to > CreateSurface() and test that it isn't modified after the call. Thanks for the feedback. No, this isn't a regression. Should I wait until after the code freeze to submit a revised patchset? -Alex

Jan. 6, 2017

Re: [PATCH 1/4] ddraw: Don't write out if a ddraw1 surface of size 0 is requested.

by Henri Verbeet

On 6 January 2017 at 08:07, Alex Henrie <alexhenrie24(a)gmail.com> wrote: > Fixes https://bugs.winehq.org/show_bug.cgi?id=42159 > This isn't a regression, right? > @@ -2975,10 +2975,7 @@ static HRESULT WINAPI ddraw1_CreateSurface(IDirectDraw *iface, > hr = ddraw_surface_create(ddraw, &surface_desc2, &impl, outer_unknown, 1); > wined3d_mutex_unlock(); > if (FAILED(hr)) > - { > - *surface = NULL; > return hr; > - } This does a bit more than the commit message says it does, this doesn't write to *surface on any error from ddraw_surface_create(). That may very well be correct, but that's not what the test tests. The test only tests that CreateSurface() doesn't crash on error with an invalid "surface" pointer, but that could also be because of e.g. an exception handler. If you want to prove that it doesn't (try to) write to the "surface" pointer, you should pass a valid pointer to CreateSurface() and test that it isn't modified after the call.

Jan. 6, 2017

Re: [PATCH] user.exe16: Add missing SELECTOROF in WM_DDE_EXECUTE.

by Alexandre Julliard

Zebediah Figura <z.figura12(a)gmail.com> writes: > On 01/05/2017 05:23 AM, Alexandre Julliard wrote: >> Zebediah Figura <z.figura12(a)gmail.com> writes: >> >>> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> >>> --- >>> dlls/user.exe16/message.c | 2 +- >>> 1 file changed, 1 insertion(+), 1 deletion(-) >>> >>> diff --git a/dlls/user.exe16/message.c b/dlls/user.exe16/message.c >>> index 7bcc8e2..383d746 100644 >>> --- a/dlls/user.exe16/message.c >>> +++ b/dlls/user.exe16/message.c >>> @@ -900,7 +900,7 @@ LRESULT WINPROC_CallProc16To32A( winproc_callback_t callback, HWND16 hwnd, UINT1 >>> } >>> break; /* FIXME don't know how to free allocated memory (handle) !! */ >>> case WM_DDE_EXECUTE: >>> - lParam = convert_handle_16_to_32( lParam, GMEM_DDESHARE ); >>> + lParam = convert_handle_16_to_32( SELECTOROF(lParam), GMEM_DDESHARE ); >> >> This won't work without fixing the opposite mapping. Do you have a >> reference for this? What application is this for? >> > > Sorry, I'm a little new to Wine development. > > The application is The Magic School Bus Explores The Solar System [1], > an old educational game. I was trying to fix a bug [2] in which the > Progman DDE interface, besides being unimplemented, was being passed > garbage memory. The program itself was passing values like 14660000 to > lParam. Thanks. It does look like the handle (not the selector) is supposed to be in the high word for 16-bit, so the patch is OK, though HIWORD would be better that SELECTOROF. And you need to do the opposite conversion for the 32->16 translation. -- Alexandre Julliard julliard(a)winehq.org

Jan. 6, 2017

Re: [PATCH 1/4] ddraw: Don't write out if a ddraw1 surface of size 0 is requested.

by Alex Henrie

2017-01-06 0:07 GMT-07:00 Alex Henrie <alexhenrie24(a)gmail.com>: > Fixes https://bugs.winehq.org/show_bug.cgi?id=42159 > > With this patch, Sega Bug shows its intro logos, although it crashes > with "Unhandled privileged instruction" immediately after that. In case anyone is curious, I got rid of the "Unhandled privileged instruction" error by modifying my ioperm wrapper described at https://www.winehq.org/pipermail/wine-devel/2016-September/114873.html to open ports 3D0-3DF. With the patch and the ioperm wrapper, the game does not crash and the sound plays, but the game window is all black and the console repeats "fixme:d3d:surface_cpu_blt Filter WINED3D_TEXF_LINEAR not supported in software blit." -Alex

Jan. 6, 2017

Re: [PATCH 4/4] ddraw: Don't write out if a ddraw7 surface of size 0 is requested.

by Marvin

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=27599 Your paranoid android. === w1064 (32 bit ddraw7) === ddraw7.c:2276: Test failed: Expected (0,0)-(512,384), got (0,0)-(1024,768). === w1064 (64 bit ddraw7) === ddraw7.c:2276: Test failed: Expected (0,0)-(512,384), got (0,0)-(1024,768).

Jan. 6, 2017

Re: [PATCH 3/4] ddraw: Don't write out if a ddraw4 surface of size 0 is requested.

by Marvin

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=27598 Your paranoid android. === w1064 (32 bit ddraw4) === ddraw4.c:2550: Test failed: Expected (0,0)-(512,384), got (0,0)-(1024,768). === w1064 (64 bit ddraw4) === ddraw4.c:2550: Test failed: Expected (0,0)-(512,384), got (0,0)-(1024,768).

Jan. 6, 2017

Re: [PATCH 2/4] ddraw: Don't write out if a ddraw2 surface of size 0 is requested.

by Marvin

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=27597 Your paranoid android. === w1064 (32 bit ddraw2) === ddraw2.c:2395: Test failed: Expected (0,0)-(512,384), got (0,0)-(1024,768). === w1064 (64 bit ddraw2) === ddraw2.c:2395: Test failed: Expected (0,0)-(512,384), got (0,0)-(1024,768).

Jan. 6, 2017