February 2017 - Wine-devel - list.winehq.org

Re: [v2 PATCH 1/2] include: Add mfreadwrite.idl
by Alex Henrie 22 Feb '17

22 Feb '17

+ HRESULT ReadSample([in] DWORD index, [in] DWORD flags, [out] DWORD *actualindex, [out] DWORD *Streamflags, + [out] LONGLONG *timestamp, [out] IMFSample **sample); +cpp_quote("HRESULT WINAPI MFCreateSourceReaderFromMediaSource(IMFMediaSource *source,") +cpp_quote(" IMFAttributes *attributes, IMFSourceReader **reader);") Please choose a consistent indentation style. I think most commonly Wine code indents the second line of parameters to start at the column after the ( in the first line. It would also be OK to indent the second line by 12 spaces like you did in the first example. The same goes for the second patch in this series. Additionally, the capital S is "Streamflags" looks like a mistake. -Alex

1 0

Re: [PATCH 4/4] d3d9/tests: Check encryption support, not WARP in test_create_depth_stencil_surface_ex.
by Henri Verbeet 21 Feb '17

21 Feb '17

On 20 February 2017 at 23:31, Stefan Dösinger <stefandoesinger(a)gmx.at> wrote: > This change intentionally accepts the success on Wine despite unsupported > D3DUSAGE_RESTRICTED_CONTENT. > Why would you want to do that? This should probably rename "broken_warp" to "optional", and then validate the results are consistent with CheckDeviceFormat().

2 1

Re: ntdll: Use environment variable "WINESERVER" first on search for wineserver to start.
by Sebastian Lackner 21 Feb '17

21 Feb '17

On 15.02.2017 15:27, Ralf Habacker wrote: > This fixes the issue that WINESERVER environment variable is only > used if @bindir@/wineserver does not exist. > > Fixes https://bugs.winehq.org/show_bug.cgi?id=40811 Maybe I'm missing something, but what would be the purpose of running a different wineserver? If the protocol version does not match this will not work anyway. > > Signed-off-by: Ralf Habacker <ralf.habacker(a)freenet.de> > --- > libs/wine/config.c | 16 ++++++++-------- > 1 file changed, 8 insertions(+), 8 deletions(-) > > diff --git a/libs/wine/config.c b/libs/wine/config.c > index 3b5dd68..433666b 100644 > --- a/libs/wine/config.c > +++ b/libs/wine/config.c > @@ -530,6 +530,13 @@ void wine_exec_wine_binary( const char *name, char > **argv, const char *env_var ) It looks like your mail client corrupted the patch. > use_preloader = 0; > #endif > + /* first specified environment variable */ > + if (env_var) > + { > + argv[0] = (char *)env_var; > + preloader_exec( argv, use_preloader ); > + } > + > if ((ptr = strrchr( name, '/' ))) > { > /* if we are in build dir and name contains a path, try that */ > @@ -542,7 +549,7 @@ void wine_exec_wine_binary( const char *name, char > **argv, const char *env_var ) > name = ptr + 1; /* get rid of path */ > } > - /* first, bin directory from the current libdir or argv0 */ > + /* then, bin directory from the current libdir or argv0 */ > if (bindir) > { > argv[0] = build_path( bindir, name ); > @@ -550,13 +557,6 @@ void wine_exec_wine_binary( const char *name, char > **argv, const char *env_var ) > free( argv[0] ); > } > - /* then specified environment variable */ > - if (env_var) > - { > - argv[0] = (char *)env_var; > - preloader_exec( argv, use_preloader ); > - } > - > /* now search in the Unix path */ > if ((path = getenv( "PATH" ))) > { >

4 8

Uninitialized varying test on r500 on Windows
by Stefan Dösinger 21 Feb '17

21 Feb '17

Hi Matteo, I'm trying to make my Windows systems test failure free and I'd like to ask you for your opinion of a failure I am getting in test_uninitialized_varyings on my r500 GPU (Radeon X1600M) I have attached the output of d3d9:visual to this mail. I am a bit lost how those results fit in the grand scheme of things. Is it just another case of some varying components being initialized to 0 and others to 1, or do you see a pattern in these? The .y=0.5 result in test cases 14 and 17 are weird as well. The test failure in line 7362 (pretransformed_varying_test) seems related too, although here my card behaves in the same way as WARP. The d3d8 version of test_uninitialized_varyings is affected as well. The line numbers are from commit 9eb56e25e37b4adec0d72875455ffb787238672f. Cheers, Stefan

2 1

Re: qcap: Define O_CLOEXEC when needed (try 2)
by Sebastian Lackner 21 Feb '17

21 Feb '17

On 21.02.2017 00:21, André Hentschel wrote: > Signed-off-by: André Hentschel <nerv(a)dawncrow.de> > --- > > https://bugs.winehq.org/show_bug.cgi?id=42478 > Thanks Bruno for the note on octal > > dlls/qcap/v4l.c | 4 +++ > dlls/setupapi/devinst.c | 71 +++++++++++++++++++++++++++++++++++++++++++++ > dlls/setupapi/dialog.c | 2 ++ > dlls/setupapi/dirid.c | 2 ++ > dlls/setupapi/diskspace.c | 10 +++++++ > dlls/setupapi/install.c | 10 +++++++ > dlls/setupapi/misc.c | 42 +++++++++++++++++++++++++++ > dlls/setupapi/parser.c | 27 +++++++++++++++++ > dlls/setupapi/query.c | 12 ++++++++ > dlls/setupapi/queue.c | 44 ++++++++++++++++++++++++++++ > dlls/setupapi/setupcab.c | 2 ++ > dlls/setupapi/stringtable.c | 13 +++++++++ > dlls/setupapi/stubs.c | 63 ++++++++++++++++++++++++++++++++++++++++ > 13 files changed, 302 insertions(+) It looks like you added various unrelated changes. Also, defining O_CLOEXEC will have no effect when its not supported by the operating system. We could use fcntl( fd, F_SETFD, FD_CLOEXEC ); as a portable way to set close-on-exec for all platforms.

2 1

Re: [PATCH 2/3] storage.dll16: Correctly handle block values of -1.
by Alexandre Julliard 21 Feb '17

21 Feb '17

Zebediah Figura <z.figura12(a)gmail.com> writes: > @@ -610,9 +610,10 @@ STORAGE_get_nth_next_small_blocknr(stream_access16*str,int blocknr,int nr) { > READ_HEADER(str); > assert(blocknr>=0); > while ((nr--) && (blocknr>=0)) { > - if (lastblocknr/128!=blocknr/128) { > + if (lastblocknr>>7 != blocknr>>7) > + { > int bigblocknr; > - bigblocknr = STORAGE_get_nth_next_big_blocknr(str,sth.sbd_startblock,blocknr/128); > + bigblocknr = STORAGE_get_nth_next_big_blocknr(str,sth.sbd_startblock,blocknr>>7); I'm not sure what you are trying to fix. Most places already check that blocknr is >= 0, and if it's really negative, you can't rely on right shift doing the right thing. -- Alexandre Julliard julliard(a)winehq.org

2 2

Re: [PATCH] oledb32: Suport converting to DBTYPE_BYREF | DBTYPE_STR in DataConvert
by Huw Davies 21 Feb '17

21 Feb '17

On Wed, Feb 15, 2017 at 04:36:38AM +0000, Alistair Leslie-Hughes wrote: > Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> > --- > dlls/oledb32/convert.c | 26 ++++++++++++ > dlls/oledb32/tests/convert.c | 94 ++++++++++++++++++++++++++++++++++++++++++++ > 2 files changed, 120 insertions(+) > > diff --git a/dlls/oledb32/convert.c b/dlls/oledb32/convert.c > index 0a1518d9a9..cd4161c886 100644 > --- a/dlls/oledb32/convert.c > +++ b/dlls/oledb32/convert.c > @@ -845,6 +845,32 @@ static HRESULT WINAPI convert_DataConvert(IDataConvert* iface, > return hr; > } > > + case DBTYPE_BYREF | DBTYPE_STR: > + { > + BSTR b; > + char **d = dst; > + DBLENGTH bstr_len; > + hr = IDataConvert_DataConvert(iface, src_type, DBTYPE_BSTR, src_len, &bstr_len, > + src, &b, sizeof(BSTR), src_status, dst_status, > + precision, scale, flags); > + if(hr != S_OK) return hr; > + > + bstr_len = SysStringLen(b) * sizeof(char); > + *dst_len = bstr_len; /* Doesn't include size for '\0' */ dst_len should be calculated by calling WideCharToMultiByte(). This is also a bug in the DBTYPE_STR handling above (which I guess is where this came from). > + *dst_status = DBSTATUS_S_OK; > + *d = CoTaskMemAlloc(bstr_len + sizeof(char)); And this should be dst_len; It probably makes sense to move this case below DBTYPE_BYREF | DBTYPE_WSTR, to mirror the order of DBTYPE_WSTR / DBTYPE_STR. Huw.

2 1

Re: [PATCH 1/6] usp10: Introduce an enumeration for GPOS lookup types.
by Aric Stewart 21 Feb '17

21 Feb '17

Signed-off-by: Aric Stewart <aric(a)codeweavers.com> On 2/19/17 12:02 PM, Henri Verbeet wrote: > As opposed to using magic numbers. > > Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> > --- > This supersedes patch 130419. > --- > dlls/usp10/opentype.c | 57 ++++++++++++++++++++++++++++++++++++--------------- > 1 file changed, 40 insertions(+), 17 deletions(-) > > diff --git a/dlls/usp10/opentype.c b/dlls/usp10/opentype.c > index a9aa4f4..a67bba7 100644 > --- a/dlls/usp10/opentype.c > +++ b/dlls/usp10/opentype.c > @@ -48,6 +48,19 @@ WINE_DEFAULT_DEBUG_CHANNEL(uniscribe); > /* These are all structures needed for the cmap format 12 table */ > #define CMAP_TAG MS_MAKE_TAG('c', 'm', 'a', 'p') > > +enum gpos_lookup_type > +{ > + GPOS_LOOKUP_ADJUST_SINGLE = 0x1, > + GPOS_LOOKUP_ADJUST_PAIR = 0x2, > + GPOS_LOOKUP_ATTACH_CURSIVE = 0x3, > + GPOS_LOOKUP_ATTACH_MARK_TO_BASE = 0x4, > + GPOS_LOOKUP_ATTACH_MARK_TO_LIGATURE = 0x5, > + GPOS_LOOKUP_ATTACH_MARK_TO_MARK = 0x6, > + GPOS_LOOKUP_POSITION_CONTEXT = 0x7, > + GPOS_LOOKUP_POSITION_CONTEXT_CHAINED = 0x8, > + GPOS_LOOKUP_POSITION_EXTENSION = 0x9, > +}; > + > typedef struct { > WORD platformID; > WORD encodingID; > @@ -1587,7 +1600,7 @@ static const BYTE *GPOS_get_subtable(const OT_LookupTable *look, int index) > { > int offset = GET_BE_WORD(look->SubTable[index]); > > - if (GET_BE_WORD(look->LookupType) == 9) > + if (GET_BE_WORD(look->LookupType) == GPOS_LOOKUP_POSITION_EXTENSION) > { > const GPOS_ExtensionPosFormat1 *ext = (const GPOS_ExtensionPosFormat1 *)((const BYTE *)look + offset); > if (GET_BE_WORD(ext->PosFormat) == 1) > @@ -2250,13 +2263,15 @@ static INT GPOS_apply_lookup(ScriptCache *psc, LPOUTLINETEXTMETRICW lpotm, LPLOG > int offset; > const OT_LookupTable *look; > int ppem = lpotm->otmTextMetrics.tmAscent + lpotm->otmTextMetrics.tmDescent - lpotm->otmTextMetrics.tmInternalLeading; > - WORD type; > + enum gpos_lookup_type type; > > offset = GET_BE_WORD(lookup->Lookup[lookup_index]); > look = (const OT_LookupTable*)((const BYTE*)lookup + offset); > type = GET_BE_WORD(look->LookupType); > - TRACE("type %i, flag %x, subtables %i\n",type,GET_BE_WORD(look->LookupFlag),GET_BE_WORD(look->SubTableCount)); > - if (type == 9) > + TRACE("type %#x, flag %#x, subtables %u.\n", type, > + GET_BE_WORD(look->LookupFlag), GET_BE_WORD(look->SubTableCount)); > + > + if (type == GPOS_LOOKUP_POSITION_EXTENSION) > { > if (GET_BE_WORD(look->SubTableCount)) > { > @@ -2278,7 +2293,7 @@ static INT GPOS_apply_lookup(ScriptCache *psc, LPOUTLINETEXTMETRICW lpotm, LPLOG > } > switch (type) > { > - case 1: > + case GPOS_LOOKUP_ADJUST_SINGLE: > { > double devX, devY; > POINT adjust = {0,0}; > @@ -2299,7 +2314,8 @@ static INT GPOS_apply_lookup(ScriptCache *psc, LPOUTLINETEXTMETRICW lpotm, LPLOG > } > break; > } > - case 2: > + > + case GPOS_LOOKUP_ADJUST_PAIR: > { > POINT advance[2]= {{0,0},{0,0}}; > POINT adjust[2]= {{0,0},{0,0}}; > @@ -2333,7 +2349,8 @@ static INT GPOS_apply_lookup(ScriptCache *psc, LPOUTLINETEXTMETRICW lpotm, LPLOG > } > return index; > } > - case 3: > + > + case GPOS_LOOKUP_ATTACH_CURSIVE: > { > POINT desU = {0,0}; > double devX, devY; > @@ -2348,7 +2365,8 @@ static INT GPOS_apply_lookup(ScriptCache *psc, LPOUTLINETEXTMETRICW lpotm, LPLOG > } > break; > } > - case 4: > + > + case GPOS_LOOKUP_ATTACH_MARK_TO_BASE: > { > double devX, devY; > POINT desU = {0,0}; > @@ -2366,7 +2384,8 @@ static INT GPOS_apply_lookup(ScriptCache *psc, LPOUTLINETEXTMETRICW lpotm, LPLOG > } > break; > } > - case 5: > + > + case GPOS_LOOKUP_ATTACH_MARK_TO_LIGATURE: > { > double devX, devY; > POINT desU = {0,0}; > @@ -2379,7 +2398,8 @@ static INT GPOS_apply_lookup(ScriptCache *psc, LPOUTLINETEXTMETRICW lpotm, LPLOG > } > break; > } > - case 6: > + > + case GPOS_LOOKUP_ATTACH_MARK_TO_MARK: > { > double devX, devY; > POINT desU = {0,0}; > @@ -2393,14 +2413,17 @@ static INT GPOS_apply_lookup(ScriptCache *psc, LPOUTLINETEXTMETRICW lpotm, LPLOG > } > break; > } > - case 7: > - return GPOS_apply_ContextPos(psc, lpotm, lplogfont, analysis, piAdvance, lookup, look, glyphs, glyph_index, glyph_count, ppem, pGoffset); > - case 8: > - { > - return GPOS_apply_ChainContextPos(psc, lpotm, lplogfont, analysis, piAdvance, lookup, look, glyphs, glyph_index, glyph_count, ppem, pGoffset); > - } > + > + case GPOS_LOOKUP_POSITION_CONTEXT: > + return GPOS_apply_ContextPos(psc, lpotm, lplogfont, analysis, piAdvance, > + lookup, look, glyphs, glyph_index, glyph_count, ppem, pGoffset); > + > + case GPOS_LOOKUP_POSITION_CONTEXT_CHAINED: > + return GPOS_apply_ChainContextPos(psc, lpotm, lplogfont, analysis, piAdvance, > + lookup, look, glyphs, glyph_index, glyph_count, ppem, pGoffset); > + > default: > - FIXME("We do not handle SubType %i\n",type); > + FIXME("Unhandled GPOS lookup type %#x.\n", type); > } > return glyph_index+1; > } >

1 0

HID success
by Marcus Meissner 21 Feb '17

21 Feb '17

Hi, Small success story on HID ;) I just helped a colleague to enable the "Polar Loop 2" wristband for his wive. The device uses HID to synchronize settings and update firmware. While the device can be (later) configured used with Bluetooth and a Smartphone App, the basic initialization must be done with a Windows App. Wine worked nicely after the usual chmod og+rw /dev/hidraw0 (The reconnect after the firmware update had a bit of trouble, but the syncing of settings worked.) https://flow.polar.com/ Ciao, Marcus

2 1

Re: msxml3: Add __WINE_ALLOC_SIZE attributes to heap_xxx() functions.
by Nikolay Sivov 21 Feb '17

21 Feb '17

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com>

1 0