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

Re: wintrust: Add more spec entries
by Alexandre Julliard Feb. 3, 2015

Feb. 3, 2015

Andrey Gusev <andrey.goosev(a)gmail.com> writes: > @@ -9,6 +9,7 @@ > @ stdcall CryptCATAdminReleaseContext(long long) > @ stdcall CryptCATAdminRemoveCatalog(ptr wstr long) > @ stdcall CryptCATAdminResolveCatalogPath(ptr wstr ptr long) > +@ stub CryptCATAllocSortedMemberInfo > @ stdcall CryptCATCDFClose(ptr) > @ stub CryptCATCDFEnumAttributes > @ stub CryptCATCDFEnumAttributesWithCDFTag That's not a good idea. You should only add things that are needed by applications, or else add them commented out. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [1/2] loader: FreeBSD requires pre_exec() on x86_64
by André Hentschel Feb. 3, 2015

Feb. 3, 2015

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Am 02.02.2015 um 21:20 schrieb David Naylor: > Just as with i386, FreeBSD requires the maximum size of the data segment to be > extended on x86_64 for Wine to work correctly. > --- > loader/main.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/loader/main.c b/loader/main.c > index ac67290..bb4f949 100644 > --- a/loader/main.c > +++ b/loader/main.c > @@ -181,7 +181,7 @@ static int pre_exec(void) > return 1; /* we have a preloader on x86-64 */ > } > > -#elif (defined(__FreeBSD__) || defined (__FreeBSD_kernel__) || defined(__DragonFly__)) && defined(__i386__) > +#elif (defined(__FreeBSD__) || defined (__FreeBSD_kernel__) || defined(__DragonFly__)) && (defined(__i386__) || defined(__x86_64__)) > > static int pre_exec(void) > { > > > > This is already fixed for a while, see: https://www.winehq.org/wwn/383#Wine64%20on%20FreeBSD -> https://bugs.winehq.org/show_bug.cgi?id=34330 -> https://source.winehq.org/git/wine.git/blobdiff/036670810c7e8bf55a5ee0e71e3… -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQGcBAEBAgAGBQJUz+qIAAoJEGm5GZTakYssKKEL/1kc5U/Um4TIfoIWFCZZoenL XhlZwjyJ90hJDicOZAHCKZxIcpu5J0fld52FIB5JunJZGSVcIXtcwmp1OwiA1BT4 5QPGR1WJ2bL4MU2lWw6+IEFZoL92Z7EsFkKjEM5l+u0l/APXp/5pq7Tj61qYvyoI HWhgauD7oWSK9PThWVdT7KiLmWFMLL5Rt3wB4coVExOhNah2jfGsJUDQUW08fX6B wKIB2r+O0h7xaR+zjnZSdB8iBqSTuCasUcaq0YcT8NccPQedlKJswnVu809Ygdg4 5PDn89Y1MGbSBIlcM8PjRtQrfU7bWLqOXmbY5bpaJbRbABz39UryrW0RleDTWC/G 8sJ3jtF7sO3YILQeFaaLUc0lyD64uGnwEoeGTJjB6n4khSVG5ZCsbn+twU6TwlT4 JYRfCNLgAv/fr9LnoI54HmBuyOscpP/1k9UO/6w2mQvugLe5k6TBQoiUMkk5le93 TbyOop4cFqHXR6DPfaIRuJ1czdrqVrZ1kZySKXubSg== =gd3v -----END PGP SIGNATURE-----

2 1

[2/2] Directx 11.2 idl's d3d11_2.idl
by Martell Malone Feb. 3, 2015

Feb. 3, 2015

The second idl needed for dx11.2 function and structure compliance. Please review :)

1 1

Fwd: Add d3d11_CreateDeviceAndSwapChain
by Martell Malone Feb. 2, 2015

Feb. 2, 2015

This is the explanation for the d3d11 patch I submitted to wine-patches. Stefan said Henri might have an interest so I should post the explanation here Comments are welcome :) ---------- Forwarded message ---------- From: Martell Malone <martellmalone(a)gmail.com> Date: Mon, Feb 2, 2015 at 7:12 PM Subject: Re: Add d3d11_CreateDeviceAndSwapChain To: Stefan Dösinger <stefandoesinger(a)gmail.com> Whoops that sent without my comments In the d3d code we use use 8 byte extran indentation for continued lines: > > void function() > { > <4> FIXME("bla long text bla\n", > <4> <8> param1, param2); > } > I have sent an updated patch to reflect this. I'm curious, does this improve the behavior of some application? E.g. game > X now falls back to d3d9 without crashing due to the stub? > My main focus for writing this was for the mingw-w64 project that imports the headers and libs from wine. We were just casually missing 1 of the 3 most important functions so I sent in this patch :) There are 2 ways to create a device and swapchain however. You can do them seperatly or this function does them both at once. I assume that this returns the correct error like CreateDevice so that if the application has a fallback it can use it. So thats highly possible. Kind Regards Martell On Mon, Feb 2, 2015 at 7:06 PM, Martell Malone <martellmalone(a)gmail.com> wrote: > Hi Stefan, > > On Mon, Feb 2, 2015 at 6:33 PM, Stefan Dösinger <stefandoesinger(a)gmail.com > > wrote: > >> Hi, >> >> I'm curious, does this improve the behavior of some application? E.g. >> game X now falls back to d3d9 without crashing due to the stub? >> >> > +HRESULT WINAPI D3D11CreateDeviceAndSwapChain(IDXGIAdapter *adapter, >> D3D_DRIVER_TYPE driver, HMODULE swrast, UINT flags, >> > + const D3D_FEATURE_LEVEL >> *feature_levels, UINT levels, UINT sdk_version, >> > + const >> DXGI_SWAP_CHAIN_DESC *swapchain_desc, IDXGISwapChain ** swapchain, >> > + ID3D11Device **device, >> D3D_FEATURE_LEVEL *feature_level, ID3D11DeviceContext **context) >> > +{ >> > + FIXME("stub: adapter %p, driver_type %s, swrast %p, flags %#x, >> feature_levels %p, levels %#x, sdk_version %d, " >> > + "swapchain_desc %p, swapchain %p, device %p, feature_level >> %p, context %p\n", adapter, debug_d3d_driver_type(driver_type), swrast, >> > + flags, feature_levels, levels, sdk_version, swapchain_desc, >> swapchain, device, feature_level, context); >> > + return E_OUTOFMEMORY; >> sdk_version is an UINT, you need to print it with %u. >> >> In the d3d code we use use 8 byte extran indentation for continued lines: >> >> void function() >> { >> <4> FIXME("bla long text bla\n", >> <4> <8> param1, param2); >> } >> >> Cheers, >> Stefan >> >> >

1 0

Re: Add d3d11_CreateDeviceAndSwapChain
by Stefan Dösinger Feb. 2, 2015

Feb. 2, 2015

Hi, I'm curious, does this improve the behavior of some application? E.g. game X now falls back to d3d9 without crashing due to the stub? > +HRESULT WINAPI D3D11CreateDeviceAndSwapChain(IDXGIAdapter *adapter, D3D_DRIVER_TYPE driver, HMODULE swrast, UINT flags, > + const D3D_FEATURE_LEVEL *feature_levels, UINT levels, UINT sdk_version, > + const DXGI_SWAP_CHAIN_DESC *swapchain_desc, IDXGISwapChain ** swapchain, > + ID3D11Device **device, D3D_FEATURE_LEVEL *feature_level, ID3D11DeviceContext **context) > +{ > + FIXME("stub: adapter %p, driver_type %s, swrast %p, flags %#x, feature_levels %p, levels %#x, sdk_version %d, " > + "swapchain_desc %p, swapchain %p, device %p, feature_level %p, context %p\n", adapter, debug_d3d_driver_type(driver_type), swrast, > + flags, feature_levels, levels, sdk_version, swapchain_desc, swapchain, device, feature_level, context); > + return E_OUTOFMEMORY; sdk_version is an UINT, you need to print it with %u. In the d3d code we use use 8 byte extran indentation for continued lines: void function() { <4> FIXME("bla long text bla\n", <4> <8> param1, param2); } Cheers, Stefan

1 0

D3d11 CreateDeviceAndSwapChain
by Martell Malone Feb. 1, 2015

Feb. 1, 2015

Hi, I hope this is the right place to send this Jacek asked me to send d3d11 patches to wine and not mingw-w64 first. More will come so if this is the wrong place please correct me :) Kind Regards Martell

2 2