April 2014 - Wine-devel - list.winehq.org

Re: [PATCH 3/6] ole32: Try to open 1Ole stream before trying to create it in SetConvertStg function (try2)
by Vincent Povirk 07 Apr '14

07 Apr '14

Looks good to me.

1 0

Re: [PATCH 3/5] ole32: Try to open 1Ole stream before trying to create it in SetConvertStg function
by Vincent Povirk 07 Apr '14

07 Apr '14

This looks like a no-op to me. It means we read/update the flags even if we created the stream, but in that case it should already be correct. Why do we need this?

2 1

Re: [3/5] netprofm: Add a class factory implementation.
by Dmitry Timoshkov 07 Apr '14

07 Apr '14

Hi Hans, Hans Leidekker <hans(a)codeweavers.com> wrote: > +struct netprofm_cf > +{ > + const struct IClassFactoryVtbl *vtbl; > + HRESULT (*create_instance)(void **); > +}; > + > +static inline struct netprofm_cf *impl_from_IClassFactory( IClassFactory *iface ) > +{ > + return (struct netprofm_cf *)((char *)iface - FIELD_OFFSET( struct netprofm_cf, vtbl )); > +} Objects in this new dll don't follow http://wiki.winehq.org/COMGuideline, but that's not a big problem, and could be fixed later. > +static HRESULT WINAPI netprofm_cf_CreateInstance( IClassFactory *iface, LPUNKNOWN outer, > + REFIID riid, LPVOID *obj ) > +{ > + struct netprofm_cf *factory = impl_from_IClassFactory( iface ); > + IUnknown *unk; > + HRESULT r; > + > + TRACE( "%p %s %p\n", outer, debugstr_guid(riid), obj ); > + > + *obj = NULL; > + if (outer) return CLASS_E_NOAGGREGATION; > + > + r = factory->create_instance( (void **)&unk ); > + if (FAILED( r )) > + return r; > + > + r = IUnknown_QueryInterface( unk, riid, obj ); > + if (FAILED( r )) > + return r; > + > + IUnknown_Release( unk ); > + return r; > +} It seems that 'unk' is leaked if IUnknown_QueryInterface fails. -- Dmitry.

1 0

Re: loader: add HKLM\\Software\\Microsoft\\Multimedia\\WMPlayer\\Extensions key
by Jacek Caban 07 Apr '14

07 Apr '14

Hi Austin, On 04/07/14 09:32, Austin English wrote: > diff --git a/loader/wine.inf.in b/loader/wine.inf.in > index 1f08d2e..8200d41 100644 > --- a/loader/wine.inf.in > +++ b/loader/wine.inf.in > @@ -662,6 +662,8 @@ HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{de5aed00-a4bf-11d1-99 > HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{de5aed00-a4bf-11d1-9948-00c04f98bbc9},"Locale",2,"*" > HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{de5aed00-a4bf-11d1-9948-00c04f98bbc9},"Version",2,"4,74,9273,0" > > +; Windows Media Player > +HKLM,SOFTWARE\Microsoft\Multimedia\WMPlayer\Extensions,,16 This could probably go to dlls/wmp/wmp.rgs. Jacek

1 0

Re: [2/2] include/vfw.h: Replace handmade COM method macros by widl generated ones (including inline wrappers).
by Nikolay Sivov 07 Apr '14

07 Apr '14

I think the idea was to have a proper idl file eventually.

3 3

Re: [PATCH 2/2] dwrite: Store text format properties
by Dmitry Timoshkov 07 Apr '14

07 Apr '14

Nikolay Sivov <nsivov(a)codeweavers.com> wrote: > +static HRESULT WINAPI dwritetextformat_SetLineSpacing(IDWriteTextFormat *iface, DWRITE_LINE_SPACING_METHOD method, > + FLOAT spacing, FLOAT baseline) > { > struct dwrite_textformat *This = impl_from_IDWriteTextFormat(iface); > - FIXME("(%p)->(%d %f %f): stub\n", This, spacing, line_spacing, baseline); > - return E_NOTIMPL; > + TRACE("(%p)->(%d %f %f)\n", This, method, spacing, baseline); > + This->format.spacingmethod = method; > + This->format.spacing = spacing; > + This->format.baseline = baseline; > + return S_OK; > } Probably all the format properties setters should handle invalid enum or negative floating point arguments some way. -- Dmitry.

2 3

Re: [3/5] ntdll: Implement RtlInstallFunctionTableCallback on x86_64.
by Dmitry Timoshkov 07 Apr '14

07 Apr '14

Sebastian Lackner <sebastian(a)fds-team.de> wrote: > +BOOLEAN CDECL RtlInstallFunctionTableCallback( DWORD64 table, DWORD64 base, DWORD length, > + PGET_RUNTIME_FUNCTION_CALLBACK callback, PVOID context, PCWSTR dll ) > +{ http://msdn.microsoft.com/en-us/library/windows/desktop/ms680595%28v=vs.85%… claims that RtlInstallFunctionTableCallback is WINAPI, not CDECL, which one is correct? -- Dmitry.

2 1

Re: [3/5] ntdll: Implement RtlInstallFunctionTableCallback on x86_64.
by Dmitry Timoshkov 07 Apr '14

07 Apr '14

Sebastian Lackner <sebastian(a)fds-team.de> wrote: > +@ cdecl -arch=x86_64 RtlInstallFunctionTableCallback(long long long ptr ptr ptr) ... > +BOOLEAN CDECL RtlInstallFunctionTableCallback( DWORD64 table, DWORD64 base, DWORD length, > + PGET_RUNTIME_FUNCTION_CALLBACK callback, PVOID context, PCWSTR dll ) spec entry doesn't match the implementation. Probably it should be (int64 int64 long ptr ptr wstr) -- Dmitry.

1 0

Re: [PATCH] ddraw: add dsurface dimension tests, try 8
by Stefan Dösinger 06 Apr '14

06 Apr '14

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Am 2014-04-04 13:57, schrieb Patrick Rudolph: > + static struct > + { > + const char *name; > + DDPIXELFORMAT fmt; > + } > + formats[] = You can make this const. > + /* 6: Test maximum surface height */ > + {DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT, DDSCAPS_OFFSCREENPLAIN, 1, 0x10000, DDERR_INVALIDPARAMS}, > + /* 7: Test maximum surface width */ > + {DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT, DDSCAPS_OFFSCREENPLAIN, 0x10000, 1, DDERR_INVALIDPARAMS}, These tests fail on Wine. Please include your patch that introduces the size check in this patch or in a separate patch to apply before this one, or mark them todo_wine. > + /* 8: Test OUTOFVIDEOMEMORY */ > + {DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT, DDSCAPS_OFFSCREENPLAIN | DDSCAPS_VIDEOMEMORY, > + 0xffff, 0xffff, DDERR_OUTOFVIDEOMEMORY}, This also fails on Wine. You'll have to move the adapter_adjust_memory() call in dlls/wined3d/resource.c, resource_init() ahead of the memory allocation call. > + /* 9: Test OUTOFMEMORY */ > + {DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT, DDSCAPS_OFFSCREENPLAIN | DDSCAPS_SYSTEMMEMORY, > + 0xffff, 0xffff, DDERR_OUTOFMEMORY}, This test still fails in 64 bit on my Windows 7 test machine with D3DFMT_P8. The failure happens because CreateSurface succeeds although the test expects it to fail. I'd suggest to remove this test for the same reason as test 10. > + /* does the hardware support videomemory ? */ > + if (!(ddcaps.ddsCaps.dwCaps & DDSCAPS_VIDEOMEMORY)) > + { > + tests[8].hr = DDERR_NODIRECTDRAWHW; > + } You can remove the curly brackets here. > + for (i = 0; i < sizeof(tests) / sizeof(*tests); i ++) > + { > + if (surface) > + { > + IDirectDrawSurface_Release(surface); > + surface = NULL; > + } > + > + memset(&surfacedesc, 0, sizeof(surfacedesc)); > + surfacedesc.dwSize = sizeof(surfacedesc); > + surfacedesc.dwFlags = tests[i].dwFlags | DDSD_PIXELFORMAT; > + surfacedesc.ddsCaps.dwCaps = tests[i].dwCaps; > + surfacedesc.dwWidth = tests[i].dwWidth; > + surfacedesc.dwHeight = tests[i].dwHeight; > + surfacedesc.ddpfPixelFormat = formats[j].fmt; > + > + hr = IDirectDraw_CreateSurface(ddraw, &surfacedesc, &surface, NULL); > + ok(hr == tests[i].hr, "Pixelformat %s, test %d returned %08x\n", formats[j].name, i, hr); > + } Why is the surface release before the create call? You're potentially leaking surfaces here. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIcBAEBAgAGBQJTQdGlAAoJEN0/YqbEcdMwvikP/RT9mO2pARAAfY7DIRuOns3R 8rYw7skxAOwKU12NK42gaSqTjZKoRglpXyYJwD1keq9uRZnk8oAy4yQN7axg3/wq OI8gF6VN9Dlqofq6l4FD8rNC0yBFxxehZkOJXpzGXGisDau3C+pK007+fnwb0zQI IOJ+M/ok+cOvmymbktmrRryVtrttG5Z0EYqpBQw53+ZTKUyu6AhcuoXV5Sf04Jkx SnCHhRn3RLKEMTwc/XT6O5+in89CgIcrMmNWnCk0JrgywNhqOxX4A9HzkHTL3h/n OHR1fJW4SmRDwT4r+nQmOBjIY7tCipv0xK5LTOqbaNCDxTIyZL2AOji5PeR4mZWH iHPOb6826iouxE8P12cLfgueBebhY/lVCmiWwV67K7koFSmYs4MhtR/jdeiuZ8rI jYgta2gNvP8Nk+R+HGxhGg6rrykNBb+lWTI5Ua+QAa7DBdW9uldLH4U+bf6mti90 171NAQA0VTrxV/dnkAxOmZ4jXogWhShrIyElD3PG6ZCxZ6W85/tdLReAyy/+feoQ OS+QdlYDrnYJlW0Bko254YAWJHk5hViy7feDFCHl+FuI/7hN3+UmKvpVloWkD7sh EpRqmAm8GtxAyaPsJtJVkWQ6s3YTkoYIZOSVUbItRWJbQvEfB/DDIYG6lTkGAxS5 cEUsoGMsqQbBK9QZf/s2 =TT3X -----END PGP SIGNATURE-----

1 0

Re: po: Revise Russian translation
by Nikolay Sivov 06 Apr '14

06 Apr '14

Looks good. I especially like changes like these: --- -msgstr "Пожалуйста, выберите файл." +msgstr "Выберите файл." ---

4 10