- wine-devel - winehq.org

d3d8/9 swapchain flip
by Stefan Dösinger 04 Sep '15

04 Sep '15

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Hi Henri, I'm sending my current swapchain flipping patches for you to look at in case you have any comments. A few notes: *) It doesn't involve the front buffer yet, it only cycles through the back buffers. Patch 8 has a few comments about that. *) The first interesting patch is patch 4. I am updating the wined3d_surface pointers in each d3d9_surface in the swapchain and adjust the d3d9 surface's parents. *) The other interesting parts are patch 7 and 8. If a view is created for a swapchain texture I'm storing the swapchain + buffer index in the view. When the view is used the texture is fetched from the swapchain. Alternatively I could maintain a list of views that are created for each texture and modify the views in present. With the current way we don't have to worry about how many views there are, but it makes looking up the actual texture slightly more expensive. So far this is only implemented for render target views, but the same approach should work for shader resource views. Before sending this I'm going to remove the back buffer type from the wined3d interface. It's not used anywhere according to MSDN, and none of the stereo hacks out there (occulus rift, ati quad buffer, nvidia 3d vision) use it. Stefan -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBAgAGBQJV6dE/AAoJEN0/YqbEcdMwZQ4P+weZy8ymZAp8pHgMztjuQRIC dUXaVO3hhoj6l6q/a2l27VDPnON81FBUADHG/Mk00MNOi0K/7IlHvKW5cEx54hV6 HsmRdtq1Kp9HLhgDTGJqy2yMhg9K9ugg5+u0ouQUxxxFdhDxhwlwDlfOGQvUkXL8 +SqAM5lB6wnDxVQ5OOlip2yJDEXYimL2e6QQOXaRpyWnciKUqd9Rs1RrFObLCnBK OC7rGpkCg0jmI6cKCsNEUrA+3ihz+zl+E7XU+W/g454oGTO3dKRI68iqrfN1wNB5 JfOzwIyHIdHTZOuuXZ+66Z8qqSxx8XcvyjEiKuN/bnvVCjGB+zLnqi10sKHD8yJv 2FE9AKFb6Kwyty9zLw2AMC/8Ch/Fh0s75TzhDm0cywORDwx94ApSDCF0R+ryQ+h8 QYhTpj187lQum1Egmti7PlHQRVCDv+sblyssdGvwDIYqmyfSoBARCILO08bKSGsd 9teITH2yfYYiChbf05n1aDzYyTwNRf52/p7xSHtfzaSR/U7G/tO7nvpXUuQjoPso je87AM2WJk0JSlfifCUn6qQ4j+aXLftUzzvqPSNRTmhw4uuO7Y1cxg7kp0ORwpC7 nEFrR/AaPJyGg/Hcy69LsNwokv/qlT1FgFrhnZrI2Rauop3dt4rZQSou2id2fo+J OQG8vE6dUux/GGHPIPIk =W1o8 -----END PGP SIGNATURE-----

1 0

Re: wineps.drv: Add glyph names for PostScript Format 1 glyphs (try 2).
by Nikolay Sivov 04 Sep '15

04 Sep '15

> +void get_glyph_name(HDC hdc, UINT flags, WORD index, char *name) > { > - /* FIXME */ > + BOOL bIsGlyphIndex = ((flags & ETO_GLYPH_INDEX) == 0); > + > + if (bIsGlyphIndex && index < 258) This is essentially the same as it was on try 1. I still think we shouldn't rely on glyph indices mapped to some specific code range, I don't see any documentation that says it should be mapped like that. I think what we want is to map from WCHAR string to such glyph names directly, and that's why ETO_GLYPH_INDEX case is important - if you get index array initially you fallback to generic glyph names, if you got string then for codepoints that have defined glyphs in your names array you use those, for the rest of codepoints fallback again to generic name. This way we could also extend this lookup when it's decided how to deal with licensed glyph list data.

3 8

Re: reg: Implement binary data add operation
by Alexandre Julliard 04 Sep '15

04 Sep '15

Thomas Faller <tfaller1(a)gmx.de> writes: > +static inline BOOL is_xp_or_older(void) > +{ > + DWORD version = GetVersion(); > + if(version < 0x80000000){ > + /* compare major */ > + return (DWORD)(LOBYTE(LOWORD(version))) < 6; > + } > + return TRUE; > +} Do you actually have an app that depends on such a version check? -- Alexandre Julliard julliard(a)winehq.org

2 2

Re: [PATCH 1/2] reg: simplify root key search
by Stefan Dösinger 03 Sep '15

03 Sep '15

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Hi, This patch still fails to apply with the same error: stefan@retina ~/src/wine $ git am /dev/shm/\[PATCH\ 1_2\]\ reg\:\ simplify\ root\ key\ search.eml Applying: reg: simplify root key search /home/stefan/src/wine/.git/rebase-apply/patch:14: trailing whitespace. static const WCHAR short_hklm[] = {'H','K','L','M',0}; /home/stefan/src/wine/.git/rebase-apply/patch:15: trailing whitespace. static const WCHAR short_hkcu[] = {'H','K','C','U',0}; /home/stefan/src/wine/.git/rebase-apply/patch:16: trailing whitespace. static const WCHAR short_hkcr[] = {'H','K','C','R',0}; /home/stefan/src/wine/.git/rebase-apply/patch:17: trailing whitespace. static const WCHAR short_hku[] = {'H','K','U',0}; /home/stefan/src/wine/.git/rebase-apply/patch:18: trailing whitespace. static const WCHAR short_hkcc[] = {'H','K','C','C',0}; error: patch failed: programs/reg/reg.c:22 error: programs/reg/reg.c: patch does not apply Patch failed at 0001 reg: simplify root key search The copy of the patch that failed is found in: /home/stefan/src/wine/.git/rebase-apply/patch When you have resolved this problem, run "git am --continue". If you prefer to skip this patch, run "git am --skip" instead. To restore the original branch and stop patching, run "git am --abort". Stefan Am 2015-08-31 um 22:09 schrieb Michel Zou: > Split patch from Jonathan Vollebregt: > https://github.com/jnvsor/wine/commit/ea0e2fc70db6ce4904655ea4a27ee34531d96… > > - --- > programs/reg/reg.c | 85 > +++++++++++++++++++++++++++--------------------------- 1 file > changed, 43 insertions(+), 42 deletions(-) > > > > > > -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBAgAGBQJV6Bl1AAoJEN0/YqbEcdMwf+sQAI7u19WiDrPOtniTS00sJZeS mrBSZHvhKlDujZ4iCr4VHyycBzhCmg8peflfgEHRyF9xGx6duy/mzh0JHN3qJFlM r7zbm9wbhFCaH7i4d1JD2a7l9hthow+N3PuPKWk5ox+T+Pe9HaXTQwxUmgB/6YjR xXjkHDEc5GtyBeqxpiskw2W92GWubrMrEJmfmlQQSWfcIZjkUM0MmKCEUCibMu3O bLPOsx1AjD3aQ+S0R50D3s1W1u/yO0tfKa0pGki2pqZRL/72UcbBWNow6F9tZIeD qXaAgNhvn0rc66nMVb7yc//9nN4oN2prBNtrpCtSCCfSgd/Xh47xoq8g3HQUXjHd nNbfSuePuNLvNzu5XhNb0yP5cGCZedU8q7cYcPURn376t25xw22daigpdId3kaS0 KN+gwb2M1PSazPwkjRy94qIX9Kl0NIsJT8dLHZgV0TM7ZrRBy0sa2baqH5jvL+4h pCn9+Kcuyv5jC7Oj/ewNx+9EIRmUf7wOJvgdNocUqwSyHPf7bJwZOysAm4ltk8pq A7RA2qiyicANi34Yf1e8zKG1Fv1M/uYwvjc3Sd8jrTpkn0z9mzijll4R+bcThAXA jdZjA3HTyvoaaENxmKJngb7Xz2o0WBV1WUEjIIUos+md8IV7bCnH0dbCDtE3AQKl u/eABCeasbpTQJ61px7N =V5u2 -----END PGP SIGNATURE-----

2 1

Re: [4/13](try 3)hidclass.sys: Add USB Descriptor parsing
by Andrew Eikum 03 Sep '15

03 Sep '15

Sorry for not noticing this before you resent, but you've got some C++ style comments in parse_io_feature. Andrew On Thu, Sep 03, 2015 at 11:19:31AM -0500, Aric Stewart wrote: > More good comments and changes from Henri Verbeet > > --- > dlls/hidclass.sys/Makefile.in | 1 + > dlls/hidclass.sys/descriptor.c | 1163 ++++++++++++++++++++++++++++++++++++++++ > dlls/hidclass.sys/hid.h | 3 + > dlls/hidclass.sys/pnp.c | 37 ++ > 4 files changed, 1204 insertions(+) > create mode 100644 dlls/hidclass.sys/descriptor.c

2 1

Idea of fixing SHFileOperation(FO_MOVE)
by Zhenbo Li 03 Sep '15

03 Sep '15

Hello, As I'm working on bug 25207, I found that previous test code (test_move() in shlfileop.c) had some disadvantages 1. Duplicate tests 2. Legacy test code (for Win98 or NT4) 3. Lack of test for Vista or later Windows Versions As more applications are depending on the new behaviours introduced in Vista, IMHO, we should focus on Vista's new behaviour. So I rewrote test_move() to remove code for win98, mark xp behaviour as broken, and expect Vista's behaviour. My next step is to re-implement FO_MOVE operation of SHFileOperation to fix bug 25207. Any suggestion for this? Thank you. -- Have a nice day! Zhenbo Li

2 3

Re: quartz: Simplify a loop and make the code more robust
by Bruno Jesus 03 Sep '15

03 Sep '15

On Thu, Sep 3, 2015 at 9:06 PM, Bruno Jesus <00cpxxx(a)gmail.com> wrote: > Sorry, ignore this patch. Current quartz behavior is wrong and should be fixed instead of reinforced.

1 0

Re: [4/13](resend)hidclass.sys: Add USB Descriptor parsing
by Andrew Eikum 03 Sep '15

03 Sep '15

A couple small notes inline below. On Wed, Sep 02, 2015 at 07:01:51AM -0500, Aric Stewart wrote: > diff --git a/dlls/hidclass.sys/Makefile.in b/dlls/hidclass.sys/Makefile.in > index 8ed51e6..6e79486 100644 > --- a/dlls/hidclass.sys/Makefile.in > +++ b/dlls/hidclass.sys/Makefile.in > @@ -5,6 +5,7 @@ DELAYIMPORTS = setupapi hid > > C_SRCS = \ > buffer.c \ > + descriptor.c \ > device.c \ > main.c \ > pnp.c > diff --git a/dlls/hidclass.sys/descriptor.c b/dlls/hidclass.sys/descriptor.c > new file mode 100644 > index 0000000..c277dec > --- /dev/null > +++ b/dlls/hidclass.sys/descriptor.c > @@ -0,0 +1,1106 @@ > +/* > + * HID descriptor parsing > + * > + * Copyright (C) 2015 Aric Stewart > + * > + * This library is free software; you can redistribute it and/or > + * modify it under the terms of the GNU Lesser General Public > + * License as published by the Free Software Foundation; either > + * version 2.1 of the License, or (at your option) any later version. > + * > + * This library is distributed in the hope that it will be useful, > + * but WITHOUT ANY WARRANTY; without even the implied warranty of > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > + * Lesser General Public License for more details. > + * > + * You should have received a copy of the GNU Lesser General Public > + * License along with this library; if not, write to the Free Software > + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA > + */ > + > +#include "config.h" > + > +#include <stdarg.h> > +#include <stdlib.h> > +#define NONAMELESSUNION > +#include "hid.h" > + > +#include "wine/debug.h" > +#include "wine/list.h" > + > +WINE_DEFAULT_DEBUG_CHANNEL(hid); > + > +#define USAGE_MAX 10 > + > +static const char* feature_string[] = > + { "Input", "Output", "Feature" }; > + > +struct caps { > + USAGE UsagePage; > + LONG LogicalMin; > + LONG LogicalMax; > + LONG PhysicalMin; > + LONG PhysicalMax; > + ULONG UnitsExp; > + ULONG Units; > + USHORT BitSize; > + UCHAR ReportID; > + USHORT ReportCount; > + > + BOOLEAN IsRange; > + BOOLEAN IsStringRange; > + BOOLEAN IsDesignatorRange; > + int usage_count; > + union { > + struct { > + USAGE UsageMin; > + USAGE UsageMax; > + USHORT StringMin; > + USHORT StringMax; > + USHORT DesignatorMin; > + USHORT DesignatorMax; > + } Range; > + struct { > + USAGE Usage[USAGE_MAX]; > + USAGE Reserved1; > + USHORT StringIndex; > + USHORT Reserved2; > + USHORT DesignatorIndex; > + USHORT Reserved3; > + } NotRange; > + } DUMMYUNIONNAME; > + > + int Delim; > +}; > + > +struct feature { > + struct list entry; > + struct list col_entry; > + struct caps caps; > + > + HIDP_REPORT_TYPE type; > + BOOLEAN isData; > + BOOLEAN isArray; > + BOOLEAN IsAbsolute; > + BOOLEAN Wrap; > + BOOLEAN Linear; > + BOOLEAN prefState; > + BOOLEAN HasNull; > + BOOLEAN Volatile; > + BOOLEAN BitField; > + > + int index; > + struct collection *collection; > +}; > + > +static const char* collection_string[] = { > + "Physical", > + "Application", > + "Logical", > + "Report", > + "Named Array", > + "Usage Switch", > + "Usage Modifier", > +}; > + > +struct collection { > + struct list entry; > + struct caps caps; > + int index; > + int type; > + struct collection *parent; > + struct list features; > + struct list collections; > +}; > + > +static const char* debugstr_usages(struct caps *caps) > +{ > + if (!caps->IsRange) > + { > + static char out[30]; > + int i; > + strcpy(out, "[ "); > + for (i = 0; i < caps->usage_count; i++) > + strcat(out, wine_dbg_sprintf("%x ", caps->u.NotRange.Usage[i])); > + strcat(out,"]"); > + return out; > + } > + else > + return wine_dbg_sprintf("[%x - %x]", caps->u.Range.UsageMin, caps->u.Range.UsageMax); > +} > + > +static const char* debugstr_stringindex(struct caps *caps) > +{ > + if (!caps->IsStringRange) > + return wine_dbg_sprintf("%i", caps->u.NotRange.StringIndex); > + else > + return wine_dbg_sprintf("[%i - %i]", caps->u.Range.StringMin, caps->u.Range.StringMax); > +} > + > +static const char* debugstr_designatorindex(struct caps *caps) > +{ > + if (!caps->IsDesignatorRange) > + return wine_dbg_sprintf("%i", caps->u.NotRange.DesignatorIndex); > + else > + return wine_dbg_sprintf("[%i - %i]", caps->u.Range.DesignatorMin, caps->u.Range.DesignatorMax); > +} > + > +static const char* debugstr_caps(struct caps *caps) > +{ > + if (!caps) > + return ""; > + return wine_dbg_sprintf("(UsagePage %x; LogicalMin %i; LogicalMax %i; PhysicalMin %i; PhysicalMax %i; UnitsExp %i; Units %i; BitSize %i; ReportID %i; ReportCount %i; Usage %s; StringIndex %s; DesignatorIndex %s; Delim %i;)", > + caps->UsagePage, > + caps->LogicalMin, > + caps->LogicalMax, > + caps->PhysicalMin, > + caps->PhysicalMax, > + caps->UnitsExp, > + caps->Units, > + caps->BitSize, > + caps->ReportID, > + caps->ReportCount, > + debugstr_usages(caps), > + debugstr_stringindex(caps), > + debugstr_designatorindex(caps), > + caps->Delim); > +} > + > +static void debug_feature(struct feature *feature) > +{ > + if (!feature) > + return; > + TRACE("[\n\t type %s [%i]; %s; %s; %s; %s; %s; %s; %s; %s; %s\n\t %s\n]\n", > + feature_string[feature->type], > + feature->index, > + (feature->isData)?"Data":"Const", > + (feature->isArray)?"Array":"Var", > + (feature->IsAbsolute)?"Abs":"Rel", > + (feature->Wrap)?"Wrap":"NoWrap", > + (feature->Linear)?"Linear":"NonLinear", > + (feature->prefState)?"PrefStat":"NoPrefState", > + (feature->HasNull)?"HasNull":"NoNull", > + (feature->Volatile)?"Volatile":"NonVolatile", > + (feature->BitField)?"BitField":"Buffered", > + debugstr_caps(&feature->caps)); > +} > + > +static void debug_collection(struct collection *collection) > +{ > + struct feature *fentry; > + struct collection *centry; > + if (TRACE_ON(hid)) > + { > + TRACE("{ %s[%i], %p, %i features, %i collections\n\t %s\n", collection_string[collection->type], collection->index, collection->parent, list_count(&collection->features), list_count(&collection->collections), debugstr_caps(&collection->caps)); > + LIST_FOR_EACH_ENTRY(fentry, &collection->features, struct feature, col_entry) > + debug_feature(fentry); > + LIST_FOR_EACH_ENTRY(centry, &collection->collections, struct collection, entry) > + debug_collection(centry); > + TRACE("}\n"); > + } > +} > + > +static void debug_print_button_cap(const CHAR * type, WINE_HID_ELEMENT *wine_element) > +{ > + if (!wine_element->caps.button.IsRange) > + TRACE("%s Button: %x/%04x: ReportId %i, startBit %i/1\n" , type, > + wine_element->caps.button.UsagePage, > + wine_element->caps.button.u.NotRange.Usage, > + wine_element->caps.value.ReportID, > + wine_element->valueStartBit); > + else > + TRACE("%s Button: %x/[%04x-%04x]: ReportId %i, startBit %i/%i\n" ,type, > + wine_element->caps.button.UsagePage, > + wine_element->caps.button.u.Range.UsageMin, > + wine_element->caps.button.u.Range.UsageMax, > + wine_element->caps.value.ReportID, > + wine_element->valueStartBit, > + wine_element->bitCount); > +} > + > +static void debug_print_value_cap(const CHAR * type, WINE_HID_ELEMENT *wine_element) > +{ > + TRACE("%s Value: %x/%x: ReportId %i, IsAbsolute %i, HasNull %i, " > + "Bit Size %i, ReportCount %i, UnitsExp %i, Units %i, " > + "LogicalMin %i, Logical Max %i, PhysicalMin %i, " > + "PhysicalMax %i -- StartBit %i/%i\n", type, > + wine_element->caps.value.UsagePage, > + wine_element->caps.value.u.NotRange.Usage, > + wine_element->caps.value.ReportID, > + wine_element->caps.value.IsAbsolute, > + wine_element->caps.value.HasNull, > + wine_element->caps.value.BitSize, > + wine_element->caps.value.ReportCount, > + wine_element->caps.value.UnitsExp, > + wine_element->caps.value.Units, > + wine_element->caps.value.LogicalMin, > + wine_element->caps.value.LogicalMax, > + wine_element->caps.value.PhysicalMin, > + wine_element->caps.value.PhysicalMax, > + wine_element->valueStartBit, > + wine_element->bitCount); > +} > + > +static void debug_print_element(const CHAR* type, WINE_HID_ELEMENT *wine_element) > +{ > + if (wine_element->ElementType == ButtonElement) > + debug_print_button_cap(type, wine_element); > + else if (wine_element->ElementType == ValueElement) > + debug_print_value_cap(type, wine_element); > + else > + TRACE("%s: UNKNOWN\n", type); > +} > + > +static void debug_print_report(const char* type, WINE_HID_REPORT *report) > +{ > + int i; > + TRACE("%s REPORT:\n" > + "\tReportID: %i\n" > + "\tdwSize: %i\n" > + "\telementCount: %i\n", > + type, > + report->reportID, > + report->dwSize, > + report->elementCount); > + for (i = 0; i < report->elementCount; i++) > + debug_print_element(type, &report->Elements[i]); > +} > + > +static void debug_print_preparsed(WINE_HIDP_PREPARSED_DATA *data) > +{ > + int i; > + WINE_HID_REPORT *r; > + if (TRACE_ON(hid)) > + { > + TRACE("PREPARSED Data:\n" > + "\tdwSize: %i\n" > + "\tCaps:\n" > + "\t\tUsage: %i\n" > + "\t\tUsagePage: %i\n" > + "\t\tInputReportByteLength: %i\n" > + "\t\tOutputReportByteLength: %i\n" > + "\t\tFeatureReportByteLength: %i\n" > + "\t\tNumberLinkCollectionNodes: %i\n" > + "\t\tNumberInputButtonCaps: %i\n" > + "\t\tNumberInputValueCaps: %i\n" > + "\t\tNumberInputDataIndices: %i\n" > + "\t\tNumberOutputButtonCaps: %i\n" > + "\t\tNumberOutputValueCaps: %i\n" > + "\t\tNumberOutputDataIndices: %i\n" > + "\t\tNumberFeatureButtonCaps: %i\n" > + "\t\tNumberFeatureValueCaps: %i\n" > + "\t\tNumberFeatureDataIndices: %i\n" > + "\tdwInputReportCount: %i\n" > + "\tdwOutputReportCount: %i\n" > + "\tdwFeatureReportCount: %i\n" > + "\tdwOutputReportOffset: %i\n" > + "\tdwFeatureReportOffset: %i\n", > + data->dwSize, > + data->caps.Usage, > + data->caps.UsagePage, > + data->caps.InputReportByteLength, > + data->caps.OutputReportByteLength, > + data->caps.FeatureReportByteLength, > + data->caps.NumberLinkCollectionNodes, > + data->caps.NumberInputButtonCaps, > + data->caps.NumberInputValueCaps, > + data->caps.NumberInputDataIndices, > + data->caps.NumberOutputButtonCaps, > + data->caps.NumberOutputValueCaps, > + data->caps.NumberOutputDataIndices, > + data->caps.NumberFeatureButtonCaps, > + data->caps.NumberFeatureValueCaps, > + data->caps.NumberFeatureDataIndices, > + data->dwInputReportCount, > + data->dwOutputReportCount, > + data->dwFeatureReportCount, > + data->dwOutputReportOffset, > + data->dwFeatureReportOffset); > + > + r = HID_INPUT_REPORTS(data); > + for (i = 0; i < data->dwInputReportCount; i++) > + { > + debug_print_report("INPUT", r); > + r = HID_NEXT_REPORT(data, r); > + } > + r = HID_OUTPUT_REPORTS(data); > + for (i = 0; i < data->dwOutputReportCount; i++) > + { > + debug_print_report("OUTPUT", r); > + r = HID_NEXT_REPORT(data, r); > + } > + r = HID_FEATURE_REPORTS(data); > + for (i = 0; i < data->dwFeatureReportCount; i++) > + { > + debug_print_report("FEATURE", r); > + r = HID_NEXT_REPORT(data, r); > + } > + } > +} > + > +static int getValue(int bsize, int source) > +{ > + int mask = 0xff; > + int negative = 0x80; > + int outofrange = 0x100; > + int value; > + int i; > + > + if (bsize == 4) > + return source; > + > + for (i = 1; i < bsize; i++) > + { > + mask = (mask<<8) + 0xff; > + negative = (negative<<8); > + outofrange = (outofrange<<8); > + } > + value = (source&mask); > + if (value&negative) > + value = -1 * (outofrange - value); > + return value; > +} > + > +void parse_io_feature(int bSize, int itemVal, int bTag, int *feature_index, struct feature *feature) > +{ > + if (bSize <= 0) > + { > + return; > + } > + else > + { > + if ((itemVal & 0x01) == 0) > + feature->isData = TRUE; > + else > + feature->isData = FALSE; //Const > + if ((itemVal & 0x02) == 0) > + feature->isArray= TRUE; > + else > + feature->isArray= TRUE; //Var > + if ((itemVal & 0x04) == 0) > + feature->IsAbsolute = TRUE; > + else > + feature->IsAbsolute = FALSE; //Rel > + if ((itemVal & 0x08) == 0) > + feature->Wrap = FALSE; > + else > + feature->Wrap = TRUE; > + if ((itemVal & 0x10) == 0) > + feature->Linear = TRUE; > + else > + feature->Linear = FALSE; > + if ((itemVal & 0x20) == 0) > + feature->prefState = TRUE; > + else > + feature->prefState = FALSE; > + if ((itemVal & 0x40) == 0) > + feature->HasNull = FALSE; > + else > + feature->HasNull = TRUE; > + > + if (bTag != 0x08) > + { > + if ((itemVal & 0x80) == 0) > + feature->Volatile = FALSE; > + else > + feature->Volatile = TRUE; > + } > + if (bSize > 1) > + { > + if ((itemVal & 0x100) == 0) > + feature->BitField = TRUE; > + else > + feature->BitField = FALSE; //Buffered Bytes > + } > + feature->index = *feature_index; > + *feature_index = *feature_index + 1; > + } > +} > + > +void parse_collection(int bSize, int itemVal, struct collection *collection) > +{ > + if (bSize <= 0) > + return; > + else > + { > + collection->type = itemVal; > + > + if (itemVal >= 0x07 && itemVal <= 0x7F) { > + ERR(" (Reserved %x )\n", itemVal); > + } > + else if (itemVal >= 0x80 && itemVal <= 0xFF) { > + ERR(" (Vendor Defined %x )\n", itemVal); > + } > + } > +} > + > +static void new_caps(struct caps *caps) > +{ > + caps->IsRange = 0; > + caps->IsStringRange = 0; > + caps->IsDesignatorRange = 0; > + caps->usage_count = 0; > +} > + > +int parse_descriptor(BYTE *descriptor, INT index, INT length, INT *feature_index, INT *collection_index, struct collection *collection, struct caps *caps, struct list *features) > +{ > + int i; > + for (i = index; i < length;) > + { > + BYTE b0 = descriptor[i++]; > + int bSize = b0 & 0x03; > + int bType = (b0 >> 2) & 0x03; > + int bTag = (b0 >> 4) & 0x0F; > + > + bSize = (bSize == 3) ? 4 : bSize; > + if (bType == 0x03 && bTag == 0x0F && bSize == 2 && i + 2 < length) > + { > + /* Long data items: Should be unused */ > + ERR("Long Data Item, should be unused\n"); This confused me. Is this a malformed report from the HID or something Wine doesn't yet support? > + } > + else > + { > + int bSizeActual = 0; > + int itemVal = 0; > + int j; > + > + for (j = 0; j < bSize; j++) > + { > + if (i + j < length) > + { > + itemVal += descriptor[i + j] << (8 * j); > + bSizeActual++; > + } > + } > + TRACE(" %x[%i], type %i , tag %i, size %i, val %i\n",b0,i-1,bType, bTag, bSize, itemVal ); > + > + if (bType == 0x00) > + { > + struct feature *feature; > + switch(bTag) > + { > + case 0x08: Here and elsewhere, there's a lot of magic numbers. Do these have names in the standard? Could you make up names for them? TAG_INPUT or something. Or is it more useful to have the raw numbers? > + feature = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*feature)); > + list_add_tail(&collection->features, &feature->col_entry); > + list_add_tail(features, &feature->entry); > + feature->type = HidP_Input; > + parse_io_feature(bSize, itemVal, bTag, feature_index, feature); > + feature->caps = *caps; > + feature->collection = collection; > + new_caps(caps); > + break; > + case 0x09: > + feature = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*feature)); > + list_add_tail(&collection->features, &feature->col_entry); > + list_add_tail(features, &feature->entry); > + feature->type = HidP_Output; > + parse_io_feature(bSize, itemVal, bTag, feature_index, feature); > + feature->caps = *caps; > + feature->collection = collection; > + new_caps(caps); > + break; > + case 0x0B: > + feature = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*feature)); > + list_add_tail(&collection->features, &feature->col_entry); > + list_add_tail(features, &feature->entry); > + feature->type = HidP_Feature; > + parse_io_feature(bSize, itemVal, bTag, feature_index, feature); > + feature->caps = *caps; > + feature->collection = collection; > + new_caps(caps); > + break; > + case 0x0A: Here, the cases are in a different order. That wouldn't matter with symbols, but it struck me with the raw numbers. > + { > + struct collection *subcollection = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(struct collection)); > + list_add_tail(&collection->collections, &subcollection->entry); > + subcollection->parent = collection; > + /* Only set our collection once... > + We do not properly handle composite devices yet. */ > + if (*collection_index == 0) > + collection->caps = *caps; > + subcollection->caps = *caps; > + subcollection->index = *collection_index; > + *collection_index = *collection_index + 1; > + list_init(&subcollection->features); > + list_init(&subcollection->collections); > + new_caps(caps); > + > + parse_collection(bSize, itemVal, subcollection); > + > + i = parse_descriptor(descriptor, i+1, length, feature_index, collection_index, subcollection, caps, features); > + continue; > + } > + case 0x0C: > + return i; > + default: > + ERR("Unknown Tag\n"); Would it be useful to print the tag value here? > + } > + } > + else if (bType == 0x01) > + { > + switch(bTag) > + { > + case 0x00: > + caps->UsagePage = getValue(bSize, itemVal); > + break; > + case 0x01: > + caps->LogicalMin = getValue(bSize, itemVal); > + break; > + case 0x02: > + caps->LogicalMax = getValue(bSize, itemVal); > + break; > + case 0x03: > + caps->PhysicalMin = getValue(bSize, itemVal); > + break; > + case 0x04: > + caps->PhysicalMax = getValue(bSize, itemVal); > + break; > + case 0x05: > + caps->UnitsExp = getValue(bSize, itemVal); > + break; > + case 0x06: > + caps->Units = getValue(bSize, itemVal); > + break; > + case 0x07: > + caps->BitSize = getValue(bSize, itemVal); > + break; > + case 0x08: > + caps->ReportID = getValue(bSize, itemVal); > + break; > + case 0x09: > + caps->ReportCount = getValue(bSize, itemVal); > + break; > + case 0x0A: > + ERR("Push\n"); > + break; > + case 0x0B: > + ERR("Pop\n"); > + break; Are these invalid messages from the HID device, or things wine doesn't yet support? Should they be FIXMEs? > + default: > + ERR("Unknown (bTag: %x, bType: %x)\n", bTag, bType); > + } > + } > + else if (bType == 0x02) > + { > + switch(bTag) > + { > + case 0x00: > + if (caps->usage_count >= USAGE_MAX) > + FIXME("More than %i individual usages defined\n",USAGE_MAX); > + else > + { > + caps->u.NotRange.Usage[caps->usage_count++] = getValue(bSize, itemVal); > + caps->IsRange = FALSE; > + } > + break; > + case 0x01: > + caps->usage_count = 1; > + caps->u.Range.UsageMin = getValue(bSize, itemVal); > + caps->IsRange = TRUE; > + break; > + case 0x02: > + caps->usage_count = 1; > + caps->u.Range.UsageMax = getValue(bSize, itemVal); > + caps->IsRange = TRUE; > + break; > + case 0x03: > + caps->u.NotRange.DesignatorIndex = getValue(bSize, itemVal); > + caps->IsDesignatorRange = FALSE; > + break; > + case 0x04: > + caps->u.Range.DesignatorMin = getValue(bSize, itemVal); > + caps->IsDesignatorRange = TRUE; > + break; > + case 0x05: > + caps->u.Range.DesignatorMax = getValue(bSize, itemVal); > + caps->IsDesignatorRange = TRUE; > + break; > + case 0x07: > + caps->u.NotRange.StringIndex = getValue(bSize, itemVal); > + caps->IsStringRange = FALSE; > + break; > + case 0x08: > + caps->u.Range.StringMin = getValue(bSize, itemVal); > + caps->IsStringRange = TRUE; > + break; > + case 0x09: > + caps->u.Range.StringMax = getValue(bSize, itemVal); > + caps->IsStringRange = TRUE; > + break; > + case 0x0A: > + caps->Delim = getValue(bSize, itemVal); > + break; > + default: > + ERR("Unknown (bTag: %x, bType: %x)\n", bTag, bType); > + } > + } > + else > + ERR("Unknown (bTag: %x, bType: %x)\n", bTag, bType); > + > + i += bSize; > + } > + } > + return i; > +} > + > +static inline void new_report(WINE_HID_REPORT *wine_report, struct feature* feature) > +{ > + wine_report->reportID = feature->caps.ReportID; > + wine_report->dwSize = sizeof(*wine_report) - sizeof(WINE_HID_ELEMENT); > + wine_report->elementCount = 0; > +} > + > +static void build_elements(WINE_HID_REPORT *wine_report, struct feature* feature, DWORD *bitOffset) > +{ > + int i; > + > + if (!feature->isData) > + { > + *bitOffset = *bitOffset + (feature->caps.BitSize * feature->caps.ReportCount); > + return; > + } > + > + for (i = 0; i < feature->caps.usage_count; i++) > + { > + WINE_HID_ELEMENT *wine_element = &wine_report->Elements[wine_report->elementCount]; > + > + wine_element->valueStartBit = *bitOffset; > + if (feature->caps.UsagePage == HID_USAGE_PAGE_BUTTON) > + { > + wine_element->ElementType = ButtonElement; > + wine_element->caps.button.UsagePage = feature->caps.UsagePage; > + wine_element->caps.button.ReportID = feature->caps.ReportID; > + wine_element->caps.button.BitField = feature->BitField; > + wine_element->caps.button.IsRange = feature->caps.IsRange; > + wine_element->caps.button.IsStringRange = feature->caps.IsStringRange; > + wine_element->caps.button.IsDesignatorRange = feature->caps.IsDesignatorRange; > + wine_element->caps.button.IsAbsolute = feature->IsAbsolute; > + if (wine_element->caps.button.IsRange) > + { > + wine_element->bitCount = (feature->caps.u.Range.UsageMax - feature->caps.u.Range.UsageMin) + 1; > + *bitOffset = *bitOffset + wine_element->bitCount; > + wine_element->caps.button.u.Range.UsageMin = feature->caps.u.Range.UsageMin; > + wine_element->caps.button.u.Range.UsageMax = feature->caps.u.Range.UsageMax; > + wine_element->caps.button.u.Range.StringMin = feature->caps.u.Range.StringMin; > + wine_element->caps.button.u.Range.StringMax = feature->caps.u.Range.StringMax; > + wine_element->caps.button.u.Range.DesignatorMin = feature->caps.u.Range.DesignatorMin; > + wine_element->caps.button.u.Range.DesignatorMax = feature->caps.u.Range.DesignatorMax; > + } > + else > + { > + *bitOffset = *bitOffset + 1; > + wine_element->bitCount = 1; > + wine_element->caps.button.u.NotRange.Usage = feature->caps.u.NotRange.Usage[i]; > + wine_element->caps.button.u.NotRange.StringIndex = feature->caps.u.NotRange.StringIndex; > + wine_element->caps.button.u.NotRange.DesignatorIndex = feature->caps.u.NotRange.DesignatorIndex; > + } > + } > + else > + { > + wine_element->ElementType = ValueElement; > + wine_element->caps.value.UsagePage = feature->caps.UsagePage; > + wine_element->caps.value.ReportID = feature->caps.ReportID; > + wine_element->caps.value.BitField = feature->BitField; > + wine_element->caps.value.IsRange = feature->caps.IsRange; > + wine_element->caps.value.IsStringRange = feature->caps.IsStringRange; > + wine_element->caps.value.IsDesignatorRange = feature->caps.IsDesignatorRange; > + wine_element->caps.value.IsAbsolute = feature->IsAbsolute; > + wine_element->caps.value.HasNull = feature->HasNull; > + wine_element->caps.value.BitSize = feature->caps.BitSize; > + if (feature->caps.usage_count > 1) > + wine_element->caps.value.ReportCount = 1; > + else > + wine_element->caps.value.ReportCount = feature->caps.ReportCount; > + wine_element->bitCount = (feature->caps.BitSize * wine_element->caps.value.ReportCount); > + *bitOffset = *bitOffset + wine_element->bitCount; > + wine_element->caps.value.UnitsExp = feature->caps.UnitsExp; > + wine_element->caps.value.Units = feature->caps.Units; > + wine_element->caps.value.LogicalMin = feature->caps.LogicalMin; > + wine_element->caps.value.LogicalMax = feature->caps.LogicalMax; > + wine_element->caps.value.PhysicalMin = feature->caps.PhysicalMin; > + wine_element->caps.value.PhysicalMax = feature->caps.PhysicalMax; > + if (wine_element->caps.value.IsRange) > + { > + wine_element->caps.value.u.Range.UsageMin = feature->caps.u.Range.UsageMin; > + wine_element->caps.value.u.Range.UsageMax = feature->caps.u.Range.UsageMax; > + wine_element->caps.value.u.Range.StringMin = feature->caps.u.Range.StringMin; > + wine_element->caps.value.u.Range.StringMax = feature->caps.u.Range.StringMax; > + wine_element->caps.value.u.Range.DesignatorMin = feature->caps.u.Range.DesignatorMin; > + wine_element->caps.value.u.Range.DesignatorMax = feature->caps.u.Range.DesignatorMax; > + } > + else > + { > + wine_element->caps.value.u.NotRange.Usage = feature->caps.u.NotRange.Usage[i]; > + wine_element->caps.value.u.NotRange.StringIndex = feature->caps.u.NotRange.StringIndex; > + wine_element->caps.value.u.NotRange.DesignatorIndex = feature->caps.u.NotRange.DesignatorIndex; > + } > + } > + > + wine_report->elementCount++; > + } > +} > + > +static void count_elements(struct feature* feature, USHORT *buttons, USHORT *values) > +{ > + if (feature->caps.UsagePage == HID_USAGE_PAGE_BUTTON) > + { > + if (feature->caps.IsRange) > + *buttons = *buttons + 1; > + else > + *buttons = *buttons + feature->caps.usage_count; > + } > + else > + { > + if (feature->caps.IsRange) > + *values = *values + 1; > + else > + *values = *values + feature->caps.usage_count; > + } > +} > + > +WINE_HIDP_PREPARSED_DATA* build_PreparseData( > + struct feature **features, int feature_count, > + struct feature **input_features, int i_count, > + struct feature **output_features, int o_count, > + struct feature **feature_features, int f_count, > + struct collection *base_collection) > +{ > + WINE_HIDP_PREPARSED_DATA *data; > + WINE_HID_REPORT *wine_report = NULL; > + DWORD bitOffset, bitLength; > + int report_count = 1; > + int i; > + int element_count; > + int size = 0; > + > + if (features[0]->caps.ReportID != 0) > + { > + int *report_ids; > + int cnt = max(i_count, o_count); > + cnt = max(cnt, f_count); > + report_ids = HeapAlloc(GetProcessHeap(), 0 , sizeof(*report_ids) * cnt); > + > + if (i_count) > + { > + report_ids[0] = input_features[0]->caps.ReportID; > + for (i = 1; i < i_count; i++) > + { > + int j; > + int found = FALSE; > + for (j = 0; !found && j < i_count; j++) > + { > + if (report_ids[j] == input_features[i]->caps.ReportID) > + found = TRUE; > + } > + if (!found) > + { > + report_ids[report_count] = input_features[i]->caps.ReportID; > + report_count++; > + } > + } > + } > + if (o_count) > + { > + report_count++; > + report_ids[0] = output_features[0]->caps.ReportID; > + for (i = 1; i < o_count; i++) > + { > + int j; > + int found = FALSE; > + for (j = 0; !found && j < o_count; j++) > + { > + if (report_ids[j] == output_features[i]->caps.ReportID) > + found = TRUE; > + } > + if (!found) > + { > + report_ids[report_count] = output_features[i]->caps.ReportID; > + report_count++; > + } > + } > + } > + if (f_count) > + { > + report_count++; > + report_ids[0] = feature_features[0]->caps.ReportID; > + for (i = 1; i < f_count; i++) > + { > + int j; > + int found = FALSE; > + for (j = 0; !found && j < f_count; j++) > + { > + if (report_ids[j] == feature_features[i]->caps.ReportID) > + found = TRUE; > + } > + if (!found) > + { > + report_ids[report_count] = feature_features[i]->caps.ReportID; > + report_count++; > + } > + } > + } > + HeapFree(GetProcessHeap(), 0, report_ids); > + } > + else > + { > + if (o_count) report_count++; > + if (f_count) report_count++; > + } > + > + element_count = 0; > + for (i = 0; i < feature_count; i++) > + element_count += features[i]->caps.usage_count; > + > + size = sizeof(WINE_HIDP_PREPARSED_DATA) + > + (element_count * sizeof(WINE_HID_ELEMENT)) + > + (report_count * sizeof(WINE_HID_REPORT)); > + > + TRACE("%i reports %i elements -> size %i\n",report_count, element_count, size); > + > + data = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); > + data->magic = HID_MAGIC; > + data->dwSize = size; > + data->caps.Usage = base_collection->caps.u.NotRange.Usage[0]; > + data->caps.UsagePage = base_collection->caps.UsagePage; > + > + wine_report = data->InputReports; > + if (i_count) > + { > + bitLength = 0; > + new_report(wine_report, input_features[0]); > + data->dwInputReportCount ++; > + > + if (input_features[0]->caps.ReportID != 0) > + bitOffset = 8; > + else > + bitOffset = 0; > + > + for (i = 0; i < i_count; i++) > + { > + if (input_features[i]->caps.ReportID != wine_report->reportID) > + { > + wine_report->dwSize += (sizeof(WINE_HID_ELEMENT) * wine_report->elementCount); > + wine_report = (WINE_HID_REPORT*)(((BYTE*)wine_report)+wine_report->dwSize); > + new_report(wine_report, input_features[i]); > + data->dwInputReportCount ++; > + bitLength = max(bitOffset, bitLength); > + if (input_features[i]->caps.ReportID != 0) > + bitOffset = 8; > + else > + bitOffset = 0; > + } > + build_elements(wine_report, input_features[i], &bitOffset); > + count_elements(input_features[i], &data->caps.NumberInputButtonCaps, > + &data->caps.NumberInputValueCaps); > + } > + wine_report->dwSize += (sizeof(WINE_HID_ELEMENT) * wine_report->elementCount); > + bitLength = max(bitOffset, bitLength); > + data->caps.InputReportByteLength = ((bitLength + 7) & ~7)/8; > + } > + > + if (o_count) > + { > + bitLength = 0; > + wine_report = (WINE_HID_REPORT*)(((BYTE*)wine_report)+wine_report->dwSize); > + data->dwOutputReportOffset = (BYTE*)wine_report - (BYTE*)data->InputReports; > + new_report(wine_report, output_features[0]); > + data->dwOutputReportCount ++; > + if (output_features[0]->caps.ReportID != 0) > + bitOffset = 8; > + else > + bitOffset = 0; > + > + for (i = 0; i < o_count; i++) > + { > + if (output_features[i]->caps.ReportID != wine_report->reportID) > + { > + wine_report->dwSize += (sizeof(WINE_HID_ELEMENT) * wine_report->elementCount); > + wine_report = (WINE_HID_REPORT*)(((BYTE*)wine_report)+wine_report->dwSize); > + new_report(wine_report, output_features[i]); > + data->dwOutputReportCount ++; > + bitLength = max(bitOffset, bitLength); > + if (output_features[0]->caps.ReportID != 0) > + bitOffset = 8; > + else > + bitOffset = 0; > + } > + build_elements(wine_report, output_features[i], &bitOffset); > + count_elements(output_features[i], &data->caps.NumberOutputButtonCaps, > + &data->caps.NumberOutputValueCaps); > + } > + wine_report->dwSize += (sizeof(WINE_HID_ELEMENT) * wine_report->elementCount); > + bitLength = max(bitOffset, bitLength); > + data->caps.OutputReportByteLength = ((bitLength + 7) & ~7)/8; > + } > + > + if (f_count) > + { > + bitLength = 0; > + wine_report = (WINE_HID_REPORT*)(((BYTE*)wine_report)+wine_report->dwSize); > + data->dwFeatureReportOffset = (BYTE*)wine_report - (BYTE*)data->InputReports; > + new_report(wine_report, feature_features[0]); > + data->dwFeatureReportCount ++; > + if (feature_features[0]->caps.ReportID != 0) > + bitOffset = 8; > + else > + bitOffset = 0; > + > + for (i = 0; i < f_count; i++) > + { > + if (feature_features[i]->caps.ReportID != wine_report->reportID) > + { > + wine_report->dwSize += (sizeof(WINE_HID_ELEMENT) * wine_report->elementCount); > + wine_report = (WINE_HID_REPORT*)((BYTE*)wine_report)+wine_report->dwSize; > + new_report(wine_report, feature_features[i]); > + data->dwFeatureReportCount ++; > + bitLength = max(bitOffset, bitLength); > + if (feature_features[0]->caps.ReportID != 0) > + bitOffset = 8; > + else > + bitOffset = 0; > + } > + build_elements(wine_report, feature_features[i], &bitOffset); > + count_elements(feature_features[i], &data->caps.NumberFeatureButtonCaps, > + &data->caps.NumberFeatureValueCaps); > + } > + bitLength = max(bitOffset, bitLength); > + data->caps.FeatureReportByteLength = ((bitLength + 7) & ~7)/8; > + } > + > + return data; > +} > + > +static void free_collection(struct collection *collection) > +{ > + struct feature *fentry, *fnext; > + struct collection *centry, *cnext; > + LIST_FOR_EACH_ENTRY_SAFE(centry, cnext, &collection->collections, struct collection, entry) > + { > + list_remove(&centry->entry); > + free_collection(centry); > + } > + LIST_FOR_EACH_ENTRY_SAFE(fentry, fnext, &collection->features, struct feature, col_entry) > + { > + list_remove(&fentry->col_entry); > + HeapFree(GetProcessHeap(), 0, fentry); > + } > + HeapFree(GetProcessHeap(), 0, collection); > +} > + > +static int compare_reports(const void *a, const void* b) > +{ > + struct feature *f1 = *(struct feature **)a; > + struct feature *f2 = *(struct feature **)b; > + int c = (f1->caps.ReportID - f2->caps.ReportID); > + if (c) return c; > + return (f1->index - f2->index); > +} > + > +WINE_HIDP_PREPARSED_DATA* ParseDescriptor(BYTE *descriptor, INT length) > +{ > + WINE_HIDP_PREPARSED_DATA *data = NULL; > + struct collection *base; > + struct caps caps; > + > + struct list features; > + > + int feature_count = 0; > + int cidx; > + > + if (TRACE_ON(hid)) > + { > + TRACE("Descriptor[%i]: ", length); > + for (cidx = 0; cidx < length; cidx++) > + TRACE("%x ",descriptor[cidx]); > + TRACE("\n"); > + } > + > + list_init(&features); > + > + base = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*base)); > + base->index = 1; > + list_init(&base->features); > + list_init(&base->collections); > + memset(&caps, 0, sizeof(caps)); > + > + cidx = 0; > + parse_descriptor(descriptor, 0, length, &feature_count, &cidx, base, &caps, &features); > + > + debug_collection(base); > + > + cidx = 2; > + if (feature_count) > + { > + struct feature *entry; > + struct feature** sorted_features; > + struct feature** input_features; > + struct feature** output_features; > + struct feature** feature_features; > + int i_count, o_count, f_count; > + int i; > + > + i_count = o_count = f_count = 0; > + > + sorted_features = HeapAlloc(GetProcessHeap(), 0, sizeof(*sorted_features) * feature_count); > + input_features = HeapAlloc(GetProcessHeap(), 0, sizeof(*input_features) * feature_count); > + output_features = HeapAlloc(GetProcessHeap(), 0, sizeof(*output_features) * feature_count); > + feature_features = HeapAlloc(GetProcessHeap(), 0, sizeof(*feature_features) * feature_count); > + > + i = 0; > + LIST_FOR_EACH_ENTRY(entry, &features, struct feature, entry) > + sorted_features[i++] = entry; > + > + /* Sort features base on report if there are multiple reports */ > + if (sorted_features[0]->caps.ReportID != 0) > + qsort(sorted_features, feature_count, sizeof(struct feature*), compare_reports); > + > + for (i = 0; i < feature_count; i++) > + { > + switch (sorted_features[i]->type) > + { > + case HidP_Input: > + input_features[i_count] = sorted_features[i]; > + i_count++; > + break; > + case HidP_Output: > + output_features[o_count] = sorted_features[i]; > + o_count++; > + break; > + case HidP_Feature: > + feature_features[f_count] = sorted_features[i]; > + f_count++; > + break; > + default: > + ERR("Unknown type %i\n",sorted_features[i]->type); > + } > + } > + > + if (TRACE_ON(hid)) > + { > + TRACE("DUMP FEATURES:\n"); > + TRACE("----INPUT----\n"); > + for (cidx = 0; cidx < i_count; cidx++) > + debug_feature(input_features[cidx]); > + TRACE("----OUTPUT----\n"); > + for (cidx = 0; cidx < o_count; cidx++) > + debug_feature(output_features[cidx]); > + TRACE("----FEATURE----\n"); > + for (cidx = 0; cidx < f_count; cidx++) > + debug_feature(feature_features[cidx]); > + } > + > + data = build_PreparseData(sorted_features, feature_count, input_features, i_count, output_features, o_count, feature_features, f_count, base); > + > + debug_print_preparsed(data); > + > + HeapFree(GetProcessHeap(), 0, sorted_features); > + HeapFree(GetProcessHeap(), 0, input_features); > + HeapFree(GetProcessHeap(), 0, output_features); > + HeapFree(GetProcessHeap(), 0, feature_features); > + } > + > + free_collection(base); > + /* We do not have to free the list as free_collection does all the work */ > + > + return data; > +} > diff --git a/dlls/hidclass.sys/hid.h b/dlls/hidclass.sys/hid.h > index 8f9e56f..c8cee69 100644 > --- a/dlls/hidclass.sys/hid.h > +++ b/dlls/hidclass.sys/hid.h > @@ -81,3 +81,6 @@ void HID_DeleteDevice(HID_MINIDRIVER_REGISTRATION *driver, DEVICE_OBJECT *device > /* Pseudo-Plug and Play support*/ > NTSTATUS WINAPI PNP_AddDevice(DRIVER_OBJECT *driver, void* native) DECLSPEC_HIDDEN; > void PNP_CleanupPNP() DECLSPEC_HIDDEN; > + > +/* Parsing HID Report Descriptors into preparsed data */ > +WINE_HIDP_PREPARSED_DATA* ParseDescriptor(BYTE *descriptor, INT length) DECLSPEC_HIDDEN; > diff --git a/dlls/hidclass.sys/pnp.c b/dlls/hidclass.sys/pnp.c > index ca85cb7..5694b8a 100644 > --- a/dlls/hidclass.sys/pnp.c > +++ b/dlls/hidclass.sys/pnp.c > @@ -53,6 +53,9 @@ NTSTATUS WINAPI PNP_AddDevice(DRIVER_OBJECT *driver, void *native) > DWORD index = HID_STRING_ID_ISERIALNUMBER; > NATIVE_DEVICE *tracked_device, *ptr; > INT interface_index = 1; > + HID_DESCRIPTOR descriptor; > + BYTE *reportDescriptor; > + INT i; > > static const WCHAR ig_fmtW[] = {'I','G','_','%','i',0}; > static const WCHAR im_fmtW[] = {'I','M','_','%','i',0}; > @@ -104,6 +107,40 @@ NTSTATUS WINAPI PNP_AddDevice(DRIVER_OBJECT *driver, void *native) > > list_add_tail(&tracked_devices, &tracked_device->entry); > > + status = call_minidriver(IOCTL_HID_GET_DEVICE_DESCRIPTOR, device, NULL, 0, > + &descriptor, sizeof(descriptor)); > + if (status != STATUS_SUCCESS) > + { > + ERR("Cannot get Device Descriptor(%x)\n",status); > + HID_DeleteDevice(&minidriver->minidriver, device); > + return status; > + } > + for (i = 0; i < descriptor.bNumDescriptors; i++) > + if (descriptor.DescriptorList[i].bReportType == HID_REPORT_DESCRIPTOR_TYPE) > + break; > + > + if (i >= descriptor.bNumDescriptors) > + { > + ERR("No Report Descriptor found in reply\n"); > + HID_DeleteDevice(&minidriver->minidriver, device); > + return status; > + } > + > + reportDescriptor = HeapAlloc(GetProcessHeap(), 0, descriptor.DescriptorList[i].wReportLength); > + status = call_minidriver(IOCTL_HID_GET_REPORT_DESCRIPTOR, device, NULL, 0, > + reportDescriptor, descriptor.DescriptorList[i].wReportLength); > + if (status != STATUS_SUCCESS) > + { > + ERR("Cannot get Report Descriptor(%x)\n",status); > + HID_DeleteDevice(&minidriver->minidriver, device); > + HeapFree(GetProcessHeap(), 0, reportDescriptor); > + return status; > + } > + > + ext->preparseData = ParseDescriptor(reportDescriptor, descriptor.DescriptorList[0].wReportLength); > + ext->information.DescriptorSize = ext->preparseData->dwSize; > + HeapFree(GetProcessHeap(), 0, reportDescriptor); > + > status = call_minidriver(IOCTL_HID_GET_STRING, device, > (void*)index, sizeof(DWORD), serial, sizeof(serial)); > > >

3 2

Re: [8/13](resend)hidclass.sys: Add a processing thread for HID devices
by Andrew Eikum 03 Sep '15

03 Sep '15

On Wed, Sep 02, 2015 at 07:02:18AM -0500, Aric Stewart wrote: > --- > dlls/hidclass.sys/buffer.c | 21 ++++++ > dlls/hidclass.sys/device.c | 175 +++++++++++++++++++++++++++++++++++++++++++++ > dlls/hidclass.sys/hid.h | 2 + > dlls/hidclass.sys/pnp.c | 2 + > 4 files changed, 200 insertions(+) > > > diff --git a/dlls/hidclass.sys/buffer.c b/dlls/hidclass.sys/buffer.c > index 6f09393..94e3372 100644 > --- a/dlls/hidclass.sys/buffer.c > +++ b/dlls/hidclass.sys/buffer.c > @@ -140,3 +140,24 @@ void RingBuffer_RemovePointer(struct ReportRingBuffer *ring, UINT index) > ring->pointers[index] = 0xffffffff; > LeaveCriticalSection(&ring->lock); > } > + > +void RingBuffer_Write(struct ReportRingBuffer *ring, void *data) > +{ > + UINT i; > + > + EnterCriticalSection(&ring->lock); > + memcpy(&ring->buffer[ring->end * ring->buffer_size], data, ring->buffer_size); > + ring->end++; > + if (ring->end == ring->size) > + ring->end = 0; > + if (ring->start == ring->end) > + { > + ring->start++; > + if (ring->start == ring->size) > + ring->start = 0; > + } > + for (i = 0; i < ring->pointer_alloc; i++) > + if (ring->pointers[i] == ring->end) > + ring->pointers[i] = ring->start; > + LeaveCriticalSection(&ring->lock); > +} > diff --git a/dlls/hidclass.sys/device.c b/dlls/hidclass.sys/device.c > index 326c994..e09a96c 100644 > --- a/dlls/hidclass.sys/device.c > +++ b/dlls/hidclass.sys/device.c > @@ -198,6 +198,181 @@ void HID_DeleteDevice(HID_MINIDRIVER_REGISTRATION *driver, DEVICE_OBJECT *device > IoDeleteDevice(device); > } > > +static void HID_Device_processQueue(DEVICE_OBJECT *device) > +{ > + LIST_ENTRY *entry; > + IRP *irp; > + BASE_DEVICE_EXTENSION *ext = device->DeviceExtension; > + UINT buffer_size = RingBuffer_GetBufferSize(ext->ring_buffer); > + HID_XFER_PACKET *packet; > + > + packet = HeapAlloc(GetProcessHeap(), 0, buffer_size); > + > + entry = RemoveHeadList(&ext->irp_queue); > + while(entry != &ext->irp_queue) > + { > + int ptr; > + irp = CONTAINING_RECORD(entry, IRP, Tail.Overlay.ListEntry); > + ptr = (int)irp->Tail.Overlay.OriginalFileObject->FsContext; > + > + buffer_size = RingBuffer_GetBufferSize(ext->ring_buffer); > + RingBuffer_Read(ext->ring_buffer, ptr, packet, &buffer_size); > + if (buffer_size) > + { > + IO_STACK_LOCATION *irpsp = IoGetCurrentIrpStackLocation(irp); > + TRACE_(hid_report)("Processing Request (%i)\n",ptr); > + if (irpsp->Parameters.Read.Length >= packet->reportBufferLen) > + { > + memcpy(irp->AssociatedIrp.SystemBuffer, packet->reportBuffer, packet->reportBufferLen); > + irp->IoStatus.Information = packet->reportBufferLen; > + irp->IoStatus.u.Status = STATUS_SUCCESS; > + } > + else > + { > + irp->IoStatus.Information = 0; > + irp->IoStatus.u.Status = STATUS_BUFFER_OVERFLOW; > + } > + } > + else > + { > + irp->IoStatus.Information = 0; > + irp->IoStatus.u.Status = STATUS_UNSUCCESSFUL; > + } > + IoCompleteRequest( irp, IO_NO_INCREMENT ); > + entry = RemoveHeadList(&ext->irp_queue); > + } > + HeapFree(GetProcessHeap(), 0, packet); > +} > + > +static NTSTATUS WINAPI read_Completion(DEVICE_OBJECT *deviceObject, IRP *irp, void *context ) > +{ > + SetEvent(irp->UserEvent); > + return STATUS_MORE_PROCESSING_REQUIRED; > +} > + > +static DWORD CALLBACK hid_device_thread(void *args) > +{ > + DEVICE_OBJECT *device = (DEVICE_OBJECT*)args; > + > + IRP *irp; > + IO_STATUS_BLOCK irp_status; > + IO_STACK_LOCATION *irpsp; > + DWORD rc; > + HANDLE events[2]; > + NTSTATUS ntrc; > + > + BASE_DEVICE_EXTENSION *ext = device->DeviceExtension; > + events[0] = CreateEventA(NULL, FALSE, FALSE, NULL); > + events[1] = ext->halt_event; > + > + if (ext->information.Polled) > + { > + while(1) > + { > + HID_XFER_PACKET *packet; > + ResetEvent(events[0]); > + > + packet = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*packet) + ext->preparseData->caps.InputReportByteLength); > + packet->reportBufferLen = ext->preparseData->caps.InputReportByteLength; > + packet->reportBuffer = ((BYTE*)packet) + sizeof(*packet); > + packet->reportId = 0; > + > + irp = IoBuildDeviceIoControlRequest(IOCTL_HID_GET_INPUT_REPORT, > + device, NULL, 0, packet, sizeof(packet), TRUE, events[0], > + &irp_status); > + > + irpsp = IoGetNextIrpStackLocation(irp); > + irpsp->CompletionRoutine = read_Completion; > + irpsp->Control = SL_INVOKE_ON_SUCCESS | SL_INVOKE_ON_ERROR; > + > + ntrc = IoCallDriver(device, irp); > + > + if (ntrc == STATUS_PENDING) > + rc = WaitForMultipleObjects(2, events, FALSE, INFINITE); > + > + if (irp->IoStatus.u.Status == STATUS_SUCCESS) > + { > + RingBuffer_Write(ext->ring_buffer, packet); I'm not opposed to what you have here, but a get-buffer/commit-buffer model would avoid an allocation and a memcpy. Although this would complicate simultaneous writes, if that's a concern.

2 1

Re: [7/13](resend)hidclass.sys: Implement IRP_MJ_READ for HID Devices
by Andrew Eikum 03 Sep '15

03 Sep '15

On Wed, Sep 02, 2015 at 07:02:11AM -0500, Aric Stewart wrote: > diff --git a/dlls/hidclass.sys/buffer.c b/dlls/hidclass.sys/buffer.c > index 2561235..6f09393 100644 > --- a/dlls/hidclass.sys/buffer.c > +++ b/dlls/hidclass.sys/buffer.c > @@ -80,6 +80,39 @@ void RingBuffer_Destroy(struct ReportRingBuffer *ring) > HeapFree(GetProcessHeap(), 0, ring); > } > > +UINT RingBuffer_GetBufferSize(struct ReportRingBuffer *ring) > +{ > + return ring->buffer_size; > +} > + > +void RingBuffer_Read(struct ReportRingBuffer *ring, UINT index, void *output, UINT *size) > +{ > + void *ret = NULL; > + > + EnterCriticalSection(&ring->lock); > + if (index >= ring->pointer_alloc || ring->pointers[index] == 0xffffffff) > + { > + LeaveCriticalSection(&ring->lock); > + *size = 0; > + return; > + } > + if (ring->pointers[index] == ring->end) > + { > + LeaveCriticalSection(&ring->lock); > + *size = 0; > + } > + else > + { > + ret = &ring->buffer[ring->pointers[index] * ring->buffer_size]; > + memcpy(output, ret, ring->buffer_size); Is it necessary to make a copy of the data in the ring buffer? Seems like returning a raw pointer would be more efficient. I flipped through the rest of the patch sequence and all uses of RingBuffer_Read seemed to be read-only. > + ring->pointers[index]++; > + if (ring->pointers[index] == ring->size) > + ring->pointers[index] = 0; > + LeaveCriticalSection(&ring->lock); > + *size = ring->buffer_size; > + } > +} > + > UINT RingBuffer_AddPointer(struct ReportRingBuffer *ring) > { > UINT idx; > diff --git a/dlls/hidclass.sys/device.c b/dlls/hidclass.sys/device.c > index a6660db..326c994 100644 > --- a/dlls/hidclass.sys/device.c > +++ b/dlls/hidclass.sys/device.c > @@ -36,6 +36,7 @@ > #include "devguid.h" > > WINE_DEFAULT_DEBUG_CHANNEL(hid); > +WINE_DECLARE_DEBUG_CHANNEL(hid_report); > > static const WCHAR device_name_fmtW[] = {'\\','D','e','v','i','c','e', > '\\','H','I','D','#','%','p','&','%','p',0}; > @@ -353,6 +354,48 @@ NTSTATUS WINAPI HID_Device_ioctl(DEVICE_OBJECT *device, IRP *irp) > return rc; > } > > +NTSTATUS WINAPI HID_Device_read(DEVICE_OBJECT *device, IRP *irp) > +{ > + HID_XFER_PACKET *packet; > + BASE_DEVICE_EXTENSION *ext = device->DeviceExtension; > + UINT buffer_size = RingBuffer_GetBufferSize(ext->ring_buffer); > + NTSTATUS rc = STATUS_SUCCESS; > + int ptr = -1; > + > + packet = HeapAlloc(GetProcessHeap(), 0, buffer_size); > + ptr = (int)irp->Tail.Overlay.OriginalFileObject->FsContext; > + > + irp->IoStatus.Information = 0; > + RingBuffer_Read(ext->ring_buffer, ptr, packet, &buffer_size); > + > + if (buffer_size) > + { > + IO_STACK_LOCATION *irpsp = IoGetCurrentIrpStackLocation( irp ); > + TRACE_(hid_report)("Got Packet %p %i\n", packet->reportBuffer, packet->reportBufferLen); > + if (irpsp->Parameters.Read.Length >= packet->reportBufferLen) > + { > + memcpy(irp->AssociatedIrp.SystemBuffer, packet->reportBuffer, packet->reportBufferLen); > + irp->IoStatus.Information = packet->reportBufferLen; > + irp->IoStatus.u.Status = STATUS_SUCCESS; > + } > + else > + { > + irp->IoStatus.Information = 0; > + irp->IoStatus.u.Status = STATUS_BUFFER_OVERFLOW; > + } > + IoCompleteRequest( irp, IO_NO_INCREMENT ); > + } > + else > + { > + TRACE_(hid_report)("Queue irp\n"); > + InsertTailList(&ext->irp_queue, &irp->Tail.Overlay.ListEntry); > + rc = STATUS_PENDING; > + } > + HeapFree(GetProcessHeap(), 0, packet); > + > + return rc; > +} > + > NTSTATUS WINAPI HID_Device_create(DEVICE_OBJECT *device, IRP *irp) > { > BASE_DEVICE_EXTENSION *ext = device->DeviceExtension; > diff --git a/dlls/hidclass.sys/hid.h b/dlls/hidclass.sys/hid.h > index c9bc338..34ec241 100644 > --- a/dlls/hidclass.sys/hid.h > +++ b/dlls/hidclass.sys/hid.h > @@ -58,6 +58,8 @@ typedef struct _BASE_DEVICE_EXTENSTION { > > UINT RingBuffer_AddPointer(struct ReportRingBuffer *buffer) DECLSPEC_HIDDEN; > void RingBuffer_RemovePointer(struct ReportRingBuffer *ring, UINT index) DECLSPEC_HIDDEN; > +void RingBuffer_Read(struct ReportRingBuffer *buffer, UINT index, void *output, UINT *size) DECLSPEC_HIDDEN; > +UINT RingBuffer_GetBufferSize(struct ReportRingBuffer *buffer) DECLSPEC_HIDDEN; > void RingBuffer_Destroy(struct ReportRingBuffer *buffer) DECLSPEC_HIDDEN; > struct ReportRingBuffer* RingBuffer_Create(UINT buffer_size) DECLSPEC_HIDDEN; > > @@ -81,6 +83,7 @@ NTSTATUS HID_LinkDevice(DEVICE_OBJECT *device, LPCWSTR serial, LPCWSTR index) DE > void HID_DeleteDevice(HID_MINIDRIVER_REGISTRATION *driver, DEVICE_OBJECT *device) DECLSPEC_HIDDEN; > > NTSTATUS WINAPI HID_Device_ioctl(DEVICE_OBJECT *device, IRP *irp) DECLSPEC_HIDDEN; > +NTSTATUS WINAPI HID_Device_read(DEVICE_OBJECT *device, IRP *irp) DECLSPEC_HIDDEN; > NTSTATUS WINAPI HID_Device_create(DEVICE_OBJECT *device, IRP *irp) DECLSPEC_HIDDEN; > NTSTATUS WINAPI HID_Device_close(DEVICE_OBJECT *device, IRP *irp) DECLSPEC_HIDDEN; > > diff --git a/dlls/hidclass.sys/main.c b/dlls/hidclass.sys/main.c > index 1e0e802..4be4409 100644 > --- a/dlls/hidclass.sys/main.c > +++ b/dlls/hidclass.sys/main.c > @@ -69,6 +69,7 @@ NTSTATUS WINAPI HidRegisterMinidriver(HID_MINIDRIVER_REGISTRATION *registration) > registration->DriverObject->DriverUnload = UnloadDriver; > > registration->DriverObject->MajorFunction[IRP_MJ_DEVICE_CONTROL] = HID_Device_ioctl; > + registration->DriverObject->MajorFunction[IRP_MJ_READ] = HID_Device_read; > registration->DriverObject->MajorFunction[IRP_MJ_CREATE] = HID_Device_create; > registration->DriverObject->MajorFunction[IRP_MJ_CLOSE] = HID_Device_close; > > >

3 2

Re: [PATCH 5/6] wined3d: Return a texture from the swapchain resource creation callback.
by Henri Verbeet 03 Sep '15

03 Sep '15

On 3 September 2015 at 12:52, Stefan Dösinger <stefan(a)codeweavers.com> wrote: > @@ -3034,32 +3034,29 @@ static HRESULT CDECL device_parent_volume_created(struct wined3d_device_parent * > return D3D_OK; > } > > -static HRESULT CDECL device_parent_create_swapchain_surface(struct wined3d_device_parent *device_parent, > - void *container_parent, const struct wined3d_resource_desc *desc, struct wined3d_surface **surface) > +static HRESULT CDECL device_parent_create_swapchain_texture(struct wined3d_device_parent *device_parent, > + void *container_parent, const struct wined3d_resource_desc *desc, struct wined3d_texture **texture) > { > struct d3d8_device *device = device_from_device_parent(device_parent); > struct wined3d_resource_desc texture_desc; > + struct wined3d_surface *surface; > struct d3d8_surface *d3d_surface; > - struct wined3d_texture *texture; > HRESULT hr; > > - TRACE("device_parent %p, container_parent %p, desc %p, surface %p.\n", > - device_parent, container_parent, desc, surface); > + TRACE("device_parent %p, container_parent %p, desc %p, texture %p.\n", > + device_parent, container_parent, desc, texture); > > texture_desc = *desc; > texture_desc.resource_type = WINED3D_RTYPE_TEXTURE; Now that you're creating a texture, you don't need to change the resource type anymore. You should just be able to pass "desc" to wined3d_texture_create(). > - *surface = wined3d_surface_from_resource(wined3d_texture_get_sub_resource(texture, 0)); > - wined3d_surface_incref(*surface); > - wined3d_texture_decref(texture); > - > - d3d_surface = wined3d_surface_get_parent(*surface); > + surface = wined3d_surface_from_resource(wined3d_texture_get_sub_resource(*texture, 0)); > + d3d_surface = wined3d_surface_get_parent(surface); wined3d_resource_get_parent(). > diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c > index 765af0d..d50cd84 100644 > --- a/dlls/wined3d/device.c > +++ b/dlls/wined3d/device.c > @@ -4685,32 +4685,37 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, > } > if (swapchain->desc.enable_auto_depth_stencil) > { > - struct wined3d_resource_desc surface_desc; > - struct wined3d_surface *surface; > + struct wined3d_resource_desc texture_desc; > + struct wined3d_texture *texture; > + struct wined3d_rendertarget_view_desc view_desc; > > TRACE("Creating the depth stencil buffer\n"); > > - surface_desc.resource_type = WINED3D_RTYPE_SURFACE; > - surface_desc.format = swapchain->desc.auto_depth_stencil_format; > - surface_desc.multisample_type = swapchain->desc.multisample_type; > - surface_desc.multisample_quality = swapchain->desc.multisample_quality; > - surface_desc.usage = WINED3DUSAGE_DEPTHSTENCIL; > - surface_desc.pool = WINED3D_POOL_DEFAULT; > - surface_desc.width = swapchain->desc.backbuffer_width; > - surface_desc.height = swapchain->desc.backbuffer_height; > - surface_desc.depth = 1; > - surface_desc.size = 0; > - > - if (FAILED(hr = device->device_parent->ops->create_swapchain_surface(device->device_parent, > - device->device_parent, &surface_desc, &surface))) > + texture_desc.resource_type = WINED3D_RTYPE_SURFACE; This looks wrong. It probably works anyway because you overwrite the resource type in the create_swapchain_texture() implementations.

1 0

Re: [2/4] user32: Add test case for DeferWindowPos() with invalid HWND (try 2)
by Marvin 02 Sep '15

02 Sep '15

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=16475 Your paranoid android. === w8 (32 bit win) === win.c:3417: Test failed: hwnd 000300F6 message 0118

1 0

Re: [1/4] user32: Add test case for basic {Begin, , End}DeferWindowPos() (try 2)
by Marvin 02 Sep '15

02 Sep '15

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=16474 Your paranoid android. === w7u (32 bit win) === win.c:3297: Test failed: hwnd 00060134 message 0200 win.c:3299: Test failed: message 0100 available

1 0

Re: [PATCH 2/2] ole32: Catch crashes in stub object destructors when destroying stub manager.
by Marvin 02 Sep '15

02 Sep '15

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=16468 Your paranoid android. === w8 (32 bit marshal) === marshal.c:3390: Test failed: info->cbSize was 629240687 instead of 48 marshal.c:3391: Test failed: info->dwServerPid was 0x5ac instead of 0xfc4 marshal.c:3407: Test failed: info->cbSize was 629240687 instead of 48 marshal.c:3408: Test failed: info->dwServerPid was 0x5ac instead of 0xfc4 marshal.c:3445: Test failed: info->cbSize was 629240687 instead of 48 marshal.c:3446: Test failed: info->dwServerPid was 0x5ac instead of 0xfc4 marshal.c:3463: Test failed: info->cbSize was 629240687 instead of 48 marshal.c:3464: Test failed: info->dwServerPid was 0x5ac instead of 0xfc4 marshal.c:3427: Test failed: info->cbSize was 629240687 instead of 48 marshal.c:3428: Test failed: info->dwServerPid was 0x5ac instead of 0xfc4 marshal.c:3390: Test failed: info->cbSize was 629240687 instead of 48 marshal.c:3391: Test failed: info->dwServerPid was 0x5ac instead of 0xfc4 marshal.c:3407: Test failed: info->cbSize was 629240687 instead of 48 marshal.c:3408: Test failed: info->dwServerPid was 0x5ac instead of 0xfc4 marshal.c:3445: Test failed: info->cbSize was 629240687 instead of 48 marshal.c:3446: Test failed: info->dwServerPid was 0x5ac instead of 0xfc4 marshal.c:3463: Test failed: info->cbSize was 629240687 instead of 48 marshal.c:3464: Test failed: info->dwServerPid was 0x5ac instead of 0xfc4 marshal.c:3427: Test failed: info->cbSize was 629240687 instead of 48 marshal.c:3428: Test failed: info->dwServerPid was 0x5ac instead of 0xfc4 marshal.c:3390: Test failed: info->cbSize was 629240687 instead of 48 marshal.c:3391: Test failed: info->dwServerPid was 0x5ac instead of 0xfc4 marshal.c:3407: Test failed: info->cbSize was 629240687 instead of 48 marshal.c:3408: Test failed: info->dwServerPid was 0x5ac instead of 0xfc4 marshal.c:3445: Test failed: info->cbSize was 629240687 instead of 48 marshal.c:3446: Test failed: info->dwServerPid was 0x5ac instead of 0xfc4 marshal.c:3463: Test failed: info->cbSize was 629240687 instead of 48 marshal.c:3464: Test failed: info->dwServerPid was 0x5ac instead of 0xfc4 marshal.c:3427: Test failed: info->cbSize was 629240687 instead of 48 marshal.c:3428: Test failed: info->dwServerPid was 0x5ac instead of 0xfc4

1 0

Re: [PATCH 1/2] ole32: Quote executable name in CreateProcess call.
by Marvin 02 Sep '15

02 Sep '15

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=16467 Your paranoid android. === w8 (32 bit marshal) === marshal.c:3315: Test failed: info->cbSize was 629240687 instead of 48 marshal.c:3316: Test failed: info->dwServerPid was 0x920 instead of 0xfd4 marshal.c:3332: Test failed: info->cbSize was 629240687 instead of 48 marshal.c:3333: Test failed: info->dwServerPid was 0x920 instead of 0xfd4 marshal.c:3370: Test failed: info->cbSize was 629240687 instead of 48 marshal.c:3371: Test failed: info->dwServerPid was 0x920 instead of 0xfd4 marshal.c:3388: Test failed: info->cbSize was 629240687 instead of 48 marshal.c:3389: Test failed: info->dwServerPid was 0x920 instead of 0xfd4 marshal.c:3352: Test failed: info->cbSize was 629240687 instead of 48 marshal.c:3353: Test failed: info->dwServerPid was 0x920 instead of 0xfd4 marshal.c:3315: Test failed: info->cbSize was 629240687 instead of 48 marshal.c:3316: Test failed: info->dwServerPid was 0x920 instead of 0xfd4 marshal.c:3332: Test failed: info->cbSize was 629240687 instead of 48 marshal.c:3333: Test failed: info->dwServerPid was 0x920 instead of 0xfd4 marshal.c:3370: Test failed: info->cbSize was 629240687 instead of 48 marshal.c:3371: Test failed: info->dwServerPid was 0x920 instead of 0xfd4 marshal.c:3388: Test failed: info->cbSize was 629240687 instead of 48 marshal.c:3389: Test failed: info->dwServerPid was 0x920 instead of 0xfd4 marshal.c:3352: Test failed: info->cbSize was 629240687 instead of 48 marshal.c:3353: Test failed: info->dwServerPid was 0x920 instead of 0xfd4 marshal.c:3315: Test failed: info->cbSize was 629240687 instead of 48 marshal.c:3316: Test failed: info->dwServerPid was 0x920 instead of 0xfd4 marshal.c:3332: Test failed: info->cbSize was 629240687 instead of 48 marshal.c:3333: Test failed: info->dwServerPid was 0x920 instead of 0xfd4 marshal.c:3370: Test failed: info->cbSize was 629240687 instead of 48 marshal.c:3371: Test failed: info->dwServerPid was 0x920 instead of 0xfd4 marshal.c:3388: Test failed: info->cbSize was 629240687 instead of 48 marshal.c:3389: Test failed: info->dwServerPid was 0x920 instead of 0xfd4 marshal.c:3352: Test failed: info->cbSize was 629240687 instead of 48 marshal.c:3353: Test failed: info->dwServerPid was 0x920 instead of 0xfd4

1 0

Re: wineps.drv: Add glyph names for PostScript Format 1 glyphs.
by Nikolay Sivov 02 Sep '15

02 Sep '15

On 01.09.2015 19:21, Erich E. Hoover wrote: > + /* These PostScript Format 1 glyph names are stored by glyph index, do not reorder them. */ > + const char *glyph_table[] = { > + ".notdef", > + ".null", > + "nonmarkingreturn", > + "space", I don't think it can work like that for anything except .notdef. If I understand it correctly one of wineps.drv tasks is to generate Type1/Type42 font description from currently selected font, including converting outline data and metrics to proper format, and that selected font could be anything scalable. get_glyph_name() operates on glyph index, and ttf/otf formats are free to map codepoints to any index, so mapping you implemented will only work in case when currently selected font has 'post' table in Format 1. So if you really need adobe glyph name you have to use unicode-value-to-name lookup based on [1] probably (comes under Apache 2.0 license, no idea if it's usable in Wine). But even that won't always work I think, because we have to support ETO_GLYPH_INDEX case too where you have indices as input. [1] https://github.com/adobe-type-tools/agl-aglfn/blob/master/glyphlist.txt

3 3

Re: [2/13]hidclass.sys: Add Plug-and-play and AddDevice
by Alexandre Julliard 02 Sep '15

02 Sep '15

Aric Stewart <aric(a)codeweavers.com> writes: > @@ -57,9 +57,18 @@ typedef struct _minidriver > HID_MINIDRIVER_REGISTRATION minidriver; > > PDRIVER_UNLOAD DriverUnload; > + > + void *AddDevice; Please use the correct callback type and remove the corresponding casts. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: oleaut32: Implement CreateTypeLib
by Nikolay Sivov 02 Sep '15

02 Sep '15

This is wrong as CreateTypeLib() is supposed to create SLTG typelib. For https://bugs.winehq.org/show_bug.cgi?id=8780 preferred way is to fix vbscript/jscript so you don't have to switch to native. In any case you don't need separate QI call.

1 0

Re: user32: Hide horizontal Listbox scroll bar if no horizontal extent is set. (try 2)
by Joachim Priesner 01 Sep '15

01 Sep '15

Hi, I was wondering about the status of this patch I sent over a month ago. Anything I can do to improve it and get it reviewed? Joachim Am Samstag, 25. Juli 2015 schrieb Joachim Priesner: > According to https://msdn.microsoft.com/en-us/library/ms997541.aspx , a > horizontal scroll bar is shown iff the WS_HSCROLL style is set and > > a) the LBS_MULTICOLUMN style is set and there are too many items or > b) the LBS_MULTICOLUMN style is not set and a horizontal extent is > specified. > > Before this patch, the default scroll info min=0, max=100 would be set > even if no horizontal extent was specified. This led to WS_HSCROLL > list boxes that were less than 100 pixels wide to erroneously have > a horizontal scroll bar. > > Try 2 because I noted a minor formatting error in the first iteration of the patch. > --- > dlls/user32/listbox.c | 20 ++++++++- > dlls/user32/tests/listbox.c | 103 ++++++++++++++++++++++++++++++++++++++++++++ > 2 files changed, 122 insertions(+), 1 deletion(-) > > diff --git a/dlls/user32/listbox.c b/dlls/user32/listbox.c > index 2902ac9..f4d890b 100644 > --- a/dlls/user32/listbox.c > +++ b/dlls/user32/listbox.c > @@ -265,7 +265,7 @@ static void LISTBOX_UpdateScroll( LB_DESCR *descr ) > if (descr->style & WS_VSCROLL) > SetScrollInfo( descr->self, SB_VERT, &info, TRUE ); > > - if (descr->style & WS_HSCROLL) > + if ((descr->style & WS_HSCROLL) && descr->horz_extent) > { > info.nPos = descr->horz_pos; > info.nPage = descr->width; > @@ -274,6 +274,20 @@ static void LISTBOX_UpdateScroll( LB_DESCR *descr ) > info.fMask |= SIF_DISABLENOSCROLL; > SetScrollInfo( descr->self, SB_HORZ, &info, TRUE ); > } > + else > + { > + if (descr->style & LBS_DISABLENOSCROLL) > + { > + info.nMin = 0; > + info.nMax = 0; > + info.fMask = SIF_RANGE | SIF_DISABLENOSCROLL; > + SetScrollInfo( descr->self, SB_HORZ, &info, TRUE ); > + } > + else > + { > + ShowScrollBar( descr->self, SB_HORZ, FALSE ); > + } > + } > } > } > > @@ -1248,6 +1262,8 @@ static LRESULT LISTBOX_SetHorizontalExtent( LB_DESCR *descr, INT extent ) > info.nMin = 0; > info.nMax = descr->horz_extent ? descr->horz_extent - 1 : 0; > info.fMask = SIF_RANGE; > + if (descr->style & LBS_DISABLENOSCROLL) > + info.fMask |= SIF_DISABLENOSCROLL; > SetScrollInfo( descr->self, SB_HORZ, &info, TRUE ); > } > if (descr->horz_pos > extent - descr->width) > @@ -2537,6 +2553,8 @@ static BOOL LISTBOX_Create( HWND hwnd, LPHEADCOMBO lphc ) > } > } > > + LISTBOX_UpdateScroll(descr); > + > TRACE("owner: %p, style: %08x, width: %d, height: %d\n", descr->owner, descr->style, descr->width, descr->height); > return TRUE; > } > diff --git a/dlls/user32/tests/listbox.c b/dlls/user32/tests/listbox.c > index 79d18e7..9380457 100644 > --- a/dlls/user32/tests/listbox.c > +++ b/dlls/user32/tests/listbox.c > @@ -1665,7 +1665,10 @@ static void test_extents(void) > ok(br == TRUE, "GetScrollInfo failed\n"); > ok(sinfo.nMin == 0, "got wrong min: %u\n", sinfo.nMin); > ok(sinfo.nMax == 100, "got wrong max: %u\n", sinfo.nMax); > + ok((GetWindowLongA(listbox, GWL_STYLE) & WS_HSCROLL) == 0, > + "List box should not have a horizontal scroll bar\n"); > > + /* horizontal extent < width */ > SendMessageA(listbox, LB_SETHORIZONTALEXTENT, 64, 0); > > res = SendMessageA(listbox, LB_GETHORIZONTALEXTENT, 0, 0); > @@ -1677,6 +1680,23 @@ static void test_extents(void) > ok(br == TRUE, "GetScrollInfo failed\n"); > ok(sinfo.nMin == 0, "got wrong min: %u\n", sinfo.nMin); > ok(sinfo.nMax == 100, "got wrong max: %u\n", sinfo.nMax); > + ok((GetWindowLongA(listbox, GWL_STYLE) & WS_HSCROLL) == 0, > + "List box should not have a horizontal scroll bar\n"); > + > + /* horizontal extent > width */ > + SendMessageA(listbox, LB_SETHORIZONTALEXTENT, 184, 0); > + > + res = SendMessageA(listbox, LB_GETHORIZONTALEXTENT, 0, 0); > + ok(res == 184, "Got wrong horizontal extent: %u\n", res); > + > + sinfo.cbSize = sizeof(sinfo); > + sinfo.fMask = SIF_RANGE; > + br = GetScrollInfo(listbox, SB_HORZ, &sinfo); > + ok(br == TRUE, "GetScrollInfo failed\n"); > + ok(sinfo.nMin == 0, "got wrong min: %u\n", sinfo.nMin); > + ok(sinfo.nMax == 100, "got wrong max: %u\n", sinfo.nMax); > + ok((GetWindowLongA(listbox, GWL_STYLE) & WS_HSCROLL) == 0, > + "List box should not have a horizontal scroll bar\n"); > > DestroyWindow(listbox); > > @@ -1692,7 +1712,71 @@ static void test_extents(void) > ok(br == TRUE, "GetScrollInfo failed\n"); > ok(sinfo.nMin == 0, "got wrong min: %u\n", sinfo.nMin); > ok(sinfo.nMax == 100, "got wrong max: %u\n", sinfo.nMax); > + ok((GetWindowLongA(listbox, GWL_STYLE) & WS_HSCROLL) == 0, > + "List box should not have a horizontal scroll bar\n"); > + > + /* horizontal extent < width */ > + SendMessageA(listbox, LB_SETHORIZONTALEXTENT, 64, 0); > + > + res = SendMessageA(listbox, LB_GETHORIZONTALEXTENT, 0, 0); > + ok(res == 64, "Got wrong horizontal extent: %u\n", res); > + > + sinfo.cbSize = sizeof(sinfo); > + sinfo.fMask = SIF_RANGE; > + br = GetScrollInfo(listbox, SB_HORZ, &sinfo); > + ok(br == TRUE, "GetScrollInfo failed\n"); > + ok(sinfo.nMin == 0, "got wrong min: %u\n", sinfo.nMin); > + ok(sinfo.nMax == 63, "got wrong max: %u\n", sinfo.nMax); > + ok((GetWindowLongA(listbox, GWL_STYLE) & WS_HSCROLL) == 0, > + "List box should not have a horizontal scroll bar\n"); > + > + /* horizontal extent > width */ > + SendMessageA(listbox, LB_SETHORIZONTALEXTENT, 184, 0); > + > + res = SendMessageA(listbox, LB_GETHORIZONTALEXTENT, 0, 0); > + ok(res == 184, "Got wrong horizontal extent: %u\n", res); > + > + sinfo.cbSize = sizeof(sinfo); > + sinfo.fMask = SIF_RANGE; > + br = GetScrollInfo(listbox, SB_HORZ, &sinfo); > + ok(br == TRUE, "GetScrollInfo failed\n"); > + ok(sinfo.nMin == 0, "got wrong min: %u\n", sinfo.nMin); > + ok(sinfo.nMax == 183, "got wrong max: %u\n", sinfo.nMax); > + ok((GetWindowLongA(listbox, GWL_STYLE) & WS_HSCROLL) != 0, > + "List box should have a horizontal scroll bar\n"); > + > + SendMessageA(listbox, LB_SETHORIZONTALEXTENT, 0, 0); > > + res = SendMessageA(listbox, LB_GETHORIZONTALEXTENT, 0, 0); > + ok(res == 0, "Got wrong horizontal extent: %u\n", res); > + > + sinfo.cbSize = sizeof(sinfo); > + sinfo.fMask = SIF_RANGE; > + br = GetScrollInfo(listbox, SB_HORZ, &sinfo); > + ok(br == TRUE, "GetScrollInfo failed\n"); > + ok(sinfo.nMin == 0, "got wrong min: %u\n", sinfo.nMin); > + ok(sinfo.nMax == 0, "got wrong max: %u\n", sinfo.nMax); > + ok((GetWindowLongA(listbox, GWL_STYLE) & WS_HSCROLL) == 0, > + "List box should not have a horizontal scroll bar\n"); > + > + DestroyWindow(listbox); > + > + > + listbox = create_listbox(WS_CHILD | WS_VISIBLE | WS_HSCROLL | LBS_DISABLENOSCROLL, parent); > + > + res = SendMessageA(listbox, LB_GETHORIZONTALEXTENT, 0, 0); > + ok(res == 0, "Got wrong initial horizontal extent: %u\n", res); > + > + sinfo.cbSize = sizeof(sinfo); > + sinfo.fMask = SIF_RANGE; > + br = GetScrollInfo(listbox, SB_HORZ, &sinfo); > + ok(br == TRUE, "GetScrollInfo failed\n"); > + ok(sinfo.nMin == 0, "got wrong min: %u\n", sinfo.nMin); > + ok(sinfo.nMax == 0, "got wrong max: %u\n", sinfo.nMax); > + ok((GetWindowLongA(listbox, GWL_STYLE) & WS_HSCROLL) != 0, > + "List box should have a horizontal scroll bar\n"); > + > + /* horizontal extent < width */ > SendMessageA(listbox, LB_SETHORIZONTALEXTENT, 64, 0); > > res = SendMessageA(listbox, LB_GETHORIZONTALEXTENT, 0, 0); > @@ -1704,6 +1788,23 @@ static void test_extents(void) > ok(br == TRUE, "GetScrollInfo failed\n"); > ok(sinfo.nMin == 0, "got wrong min: %u\n", sinfo.nMin); > ok(sinfo.nMax == 63, "got wrong max: %u\n", sinfo.nMax); > + ok((GetWindowLongA(listbox, GWL_STYLE) & WS_HSCROLL) != 0, > + "List box should have a horizontal scroll bar\n"); > + > + /* horizontal extent > width */ > + SendMessageA(listbox, LB_SETHORIZONTALEXTENT, 184, 0); > + > + res = SendMessageA(listbox, LB_GETHORIZONTALEXTENT, 0, 0); > + ok(res == 184, "Got wrong horizontal extent: %u\n", res); > + > + sinfo.cbSize = sizeof(sinfo); > + sinfo.fMask = SIF_RANGE; > + br = GetScrollInfo(listbox, SB_HORZ, &sinfo); > + ok(br == TRUE, "GetScrollInfo failed\n"); > + ok(sinfo.nMin == 0, "got wrong min: %u\n", sinfo.nMin); > + ok(sinfo.nMax == 183, "got wrong max: %u\n", sinfo.nMax); > + ok((GetWindowLongA(listbox, GWL_STYLE) & WS_HSCROLL) != 0, > + "List box should have a horizontal scroll bar\n"); > > SendMessageA(listbox, LB_SETHORIZONTALEXTENT, 0, 0); > > @@ -1716,6 +1817,8 @@ static void test_extents(void) > ok(br == TRUE, "GetScrollInfo failed\n"); > ok(sinfo.nMin == 0, "got wrong min: %u\n", sinfo.nMin); > ok(sinfo.nMax == 0, "got wrong max: %u\n", sinfo.nMax); > + ok((GetWindowLongA(listbox, GWL_STYLE) & WS_HSCROLL) != 0, > + "List box should have a horizontal scroll bar\n"); > > DestroyWindow(listbox); > >

1 0

Re: [PATCH] Fix performance problem in debug tracing
by Alexandre Julliard 01 Sep '15

01 Sep '15

Daniel Santos <daniel.santos(a)pobox.com> writes: > Currently, if any classes are passed to WINEDEBUG (nb_debug_options > 0) then > the initial lazy-init call to __wine_dbg_get_channel_flags() never sets the > flags in the struct __wine_debug_channel in the object file, resulting in all > 45k trace calls in wine making a function call, running bsearch on > debug_options with string compare, etc. Not really. Only the channel that is actually enabled will make repeated function calls. This is done on purpose so that you can toggle it on and off for a given process from the task manager. -- Alexandre Julliard julliard(a)winehq.org

2 1

Re: [PATCH 3/7] d3d11: Add ID3D11Texture3D interface stub.
by Henri Verbeet 01 Sep '15

01 Sep '15

On 1 September 2015 at 00:27, Józef Kucia <jkucia(a)codeweavers.com> wrote: > + else if (IsEqualGUID(riid, &IID_ID3D10Texture3D) > + || IsEqualGUID(riid, &IID_ID3D10Resource) > + || IsEqualGUID(riid, &IID_ID3D10DeviceChild)) > + { > + IUnknown_AddRef(iface); > + *object = &texture->ID3D10Texture3D_iface; For what it's worth, this works here because the d3d10 and d3d11 interfaces share the reference count, but in general you should AddRef() the actual interface you're returning.

2 2

Re: [PATCH 1/2] vcruntime140: Add the new MSVC 2015 compiler specific DLL.
by Alexandre Julliard 01 Sep '15

01 Sep '15

Martin Storsjo <martin(a)martin.st> writes: > Since MSVC 2015/Windows 10, the C runtime has now been split into two > parts, ucrtbase, which is the generic C runtime which is now considered > a system component, and vcruntimeX which is specific to the compiler > version. > > Even if this DLL only has a fraction of the functions of the full > msvcrt/ucrtbase, it still requires almost all the object files from > msvcrt. It would be better to isolate the corresponding code so that we don't need all the files. -- Alexandre Julliard julliard(a)winehq.org

2 2

RFC: New dependency on FFmpeg?
by Andrew Eikum 31 Aug '15

31 Aug '15

I have a working implementation of the new xaudio2 API in my tree. Microsoft is treating it as a replacement for dsound[1], and as a result, this new API is used by lots of recent games; see Bug 26808[2] for some examples. Most games that use the xaudio2 API use a version of Microsoft's WMA codec. Wine doesn't currently have the ability to decode this audio for playback. In order for the xaudio2 implementation to be useful for most games, we'll need some way to convert it. I chose to use the FFmpeg library to decode WMA audio. This means for most games, Wine's built-in xaudio2 will require that the 32-bit FFmpeg library be available on the system to successfully play audio. The new code only uses the audio decoding features of FFmpeg, specifically linking only against libavcodec and libavutil. The newest APIs that we use were introduced in 2013. Most of the rest date from 2011 and a few from 2002. FFmpeg's API isn't stable, but I don't expect much maintenance burden from the small piece that we're using. An additional complication is the libav fork. The APIs that we're using are currently unchanged between FFmpeg and libav, so libav should function as a drop-in replacement. Further, distros seem to be migrating back to FFmpeg, if they ever changed. So again, I don't expect this to be a barrier. Wine packagers and developers, do you have any thoughts or objections to depending on FFmpeg/libav's libavutils and libavcodec for xaudio2 support? [1] https://msdn.microsoft.com/en-us/library/windows/desktop/ee415813%28v=vs.85… [2] https://bugs.winehq.org/show_bug.cgi?id=26808 Thanks, Andrew

7 17

Re: [PATCH 2/4] ntdll: Fix read_directory_getdirentries().
by Ken Thomases 31 Aug '15

31 Aug '15

On Aug 27, 2015, at 2:08 PM, Matteo Bruni <mbruni(a)codeweavers.com> wrote: > > --- > The man page for getdirentries mentions that only positions previously > returned from lseek or getdirentries should be used, I'm arguably abusing > the pointer to store the index and then restoring the position using > SEEK_CUR. It seems to work fine for me, not sure if that might cause > issues with some specific filesystem setups. You're not restoring it, you're setting it to a computed value. The computation assumes that the file position is the index of the entry that was read. For example, you get the current position and then you're setting the position to that original position minus 2 (for the synthesized . and .. entries). That doesn't seem like a reasonable assumption to me. In some quick testing (with different code), I get results like these: rc 8172 base 0/0x00000000 filepos 469762300/0x1c0000fc entries 252/0x000000fc total 252/0x000000fc rc 8188 base 469762300/0x1c0000fc filepos 469762640/0x1c000250 entries 340/0x00000154 total 592/0x00000250 rc 2364 base 469762640/0x1c000250 filepos 469762732/0x1c0002ac entries 92/0x0000005c total 684/0x000002ac The file positions seem to be 0x1c000000 with the entry index added to it. However, each run of my test program gives a different fixed baseline. The file positions are definitely not _just_ entry indices. It does seem to work to seek to an entry index in some quick testing, but it makes me very nervous. > --- > dlls/ntdll/directory.c | 143 ++++++++++++++++++------------------------------- > 1 file changed, 53 insertions(+), 90 deletions(-) > > diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c > index f9562d2..eb6cd45 100644 > --- a/dlls/ntdll/directory.c > +++ b/dlls/ntdll/directory.c > @@ -1820,27 +1820,27 @@ static int read_directory_getdirentries( int fd, IO_STATUS_BLOCK *io, void *buff > BOOLEAN restart_scan, FILE_INFORMATION_CLASS class ) > { > long restart_pos; > - ULONG_PTR restart_info_pos = 0; > - size_t size, initial_size = length; > - int res, fake_dot_dot = 1; > - char *data, local_buffer[8192]; > + off_t newcursor; This newcursor variable is only ever set and then never used. > + int total, res, i; > + char data[8192]; > struct dirent *de; > - union file_directory_info *info, *last_info = NULL, *restart_last_info = NULL; > + union file_directory_info *info, *last_info = NULL; > > - size = initial_size; > - data = local_buffer; > - if (size > sizeof(local_buffer) && !(data = RtlAllocateHeap( GetProcessHeap(), 0, size ))) > + io->u.Status = STATUS_SUCCESS; > + > + if (restart_scan) > { > - io->u.Status = STATUS_NO_MEMORY; > - return io->u.Status; > + lseek( fd, 0, SEEK_SET ); > + i = 0; > + } > + else > + { > + i = lseek( fd, 0, SEEK_CUR ); > + lseek( fd, 0, SEEK_SET ); > + newcursor = lseek( fd, i < 2 ? 0 : i - 2, SEEK_CUR ); Here's where you're seeking to an arbitrary position. Also, the last two seeks can be combined (if they were right). That is, seeking to the beginning (0, SEEK_SET) and then seeking relative to the current position is just seeking to the relative position as though it were absolute. > res = 0; > done: > - if (data != local_buffer) RtlFreeHeap( GetProcessHeap(), 0, data ); > return res; This wasn't changed by your patch, but it appears that this function can only return 0 at this point, so it should just do so. res is set to 0 just before the "done" label. All "goto done" statements are immediately preceded by setting res to 0. So, the conflation of "res" with a return value should be eliminated. Setting it to 0 in those various places is unnecessary. Once that's cleared up, I would rename res and total to something like bytes_left and bytes_read, respectively. To me, on my first scan through your patch, I was expecting total to accumulate the total amount read over several iterations. (Not that that would have been useful, but it confused me.) -Ken

2 5

Does wine send window messages without waiting apps to reenter userdll?
by Javier Pimás 31 Aug '15

31 Aug '15

Hi! this is a very low-level technical question and my first one to this list so please take with a grain of salt. I'm debugging a 32 bit app in wine 1.6.2, on ubuntu 15.04 64 bits. The app I'm debugging is a smalltalk vm, so it is very possessive with the native stack, synchronization, callbacks and things like that. I'm having a problem that happens in wine and not in windows, and the following thing I describe might be the cause, it's very subtle. The problem is related with non-queued messages, in a loop that calls WaitMessage and does something more if there's a message. When running on windows, WaitMessage blocks the thread until there's something (queued or non-queued). If the message is non-queued, it is not immediately delivered (adding frames to the stack by hand), but windows just awakes the thread and waits it to reenter the OS (or userdll, I guess). I'm not sure if i can trust wine to do the same, or if it awakes the process with a bunch of frames pushed in the stack so that the non-queued message is delivered as if WaitMessage never returned. Here is a small idea of the subtle stack variations: always in windows: | VM Callback | <--- stack top | WndProc context | | .... | | Next userdll call context | <- WaitMessage already returned | VM Callout | | .... | ------------------ never happens in windows (*i think*), possible in Wine?: | VM Callback | <--- stack top | WndProc context | | .... | | WaitMessage context | <--- never returned | VM Callout | | .... | As I said, this is very low-level and subtle. Most apps wouldn't notice the difference, but this is a VM. Is the second layout possible in wine? Thanks for reading! -- Javier Pimás Ciudad de Buenos Aires

4 10

Re: [PATCH 6/7] dxgi: Store parents in textures.
by Henri Verbeet 31 Aug '15

31 Aug '15

On 31 August 2015 at 00:25, Stefan Dösinger <stefan(a)codeweavers.com> wrote: > @@ -2875,7 +2875,7 @@ static HRESULT CDECL device_parent_surface_created(struct wined3d_device_parent > TRACE("device_parent %p, container_parent %p, surface %p, parent %p, parent_ops %p.\n", > device_parent, container_parent, surface, parent, parent_ops); > > - *parent = container_parent; > + *parent = NULL; > *parent_ops = &d3d10_null_wined3d_parent_ops; > > return S_OK; I don't get what this patch is trying to achieve. For one, the description doesn't quite seem to match what it does. As it is, it looks like an odd mix of making it harder to get at the d3d11 texture from the wined3d surface and some bits that should have been in an earlier patch.

2 2

Re: [PATCH 2/7] wined3d: Return a texture from wined3d_swapchain_get_back_buffer.
by Henri Verbeet 31 Aug '15

31 Aug '15

On 31 August 2015 at 00:25, Stefan Dösinger <stefan(a)codeweavers.com> wrote: > + wined3d_surface = wined3d_surface_from_resource(wined3d_resource); > surface_impl = wined3d_surface_get_parent(wined3d_surface); This works, but it's a bit silly. You can just use wined3d_resource_get_parent(). > diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c > index ce09450..cfc1a09 100644 > --- a/dlls/dxgi/swapchain.c > +++ b/dlls/dxgi/swapchain.c > @@ -152,13 +154,15 @@ static HRESULT STDMETHODCALLTYPE dxgi_swapchain_GetBuffer(IDXGISwapChain *iface, > > EnterCriticalSection(&dxgi_cs); > > - if (!(backbuffer = wined3d_swapchain_get_back_buffer(This->wined3d_swapchain, > + if (!(texture = wined3d_swapchain_get_back_buffer(This->wined3d_swapchain, > buffer_idx, WINED3D_BACKBUFFER_TYPE_MONO))) > { > LeaveCriticalSection(&dxgi_cs); > return DXGI_ERROR_INVALID_CALL; > } > > + resource = wined3d_texture_get_sub_resource(texture, 0); > + backbuffer = wined3d_surface_from_resource(resource); > parent = wined3d_surface_get_parent(backbuffer); > hr = IUnknown_QueryInterface(parent, riid, surface); > LeaveCriticalSection(&dxgi_cs); And here you don't even need the sub-resource, because you want the (d3d11) texture in the first place. I.e., you can just use wined3d_texture_get_parent().

1 0

Re: mciavi32: Add partial support for MCI_DGV_PLAY_REPEAT
by Joerg-Cyril.Hoehle＠t-systems.com 31 Aug '15

31 Aug '15

Bruno, >If you ever have time, please take a look. + wma->dwCurrVideoFrame = wma->dwCurrAudioBlock = 0; I'm sorry I'd reject this patch because it's missing integration for the MCI_FROM keyword. Example using MS' clock.avi: OPEN clock.avi alias c WINDOW c State Show ; may still be needed in Wine PLAY c FROM 2 TO 5 repeat should open the window and repeat stepping the clock from 3 to 6 o'clock. (You remember my MCI shell in bugzilla, don't you?) You could argue that there's no need to bother for MCI_FROM, because it's not yet supported with audio output (see mmoutput.c). However, play c FROM x to y currently works with video only output (e.g. clock.avi), thus new patches should at least support what's already in place. BTW (not in your patch): FIXME("Should recompute dwCurrAudioBlock, except unsynchronized sound & video\n"); Typo, should be "expect" Supporting sound with MCI_FROM non-zero would be the matter of another patch for a volunteer... In summary, I believe that a better patch would either add dwFromVideoFrame to WINE_MCIAVI or remember dwCurrentVideoFrame (but see below) at the entrance of MCIAVI_Player and use that. Note that I'd expect any patch to handle this scenario correctly: Play c FROM 2 TO 5 repeat Play c TO 8 repeat In native, the second play would *continue* playing from the current position upto 9 o'clock, then resume from 0 (not 3 o'clock, because 0 is the default FROM value in the second play command). Well, that's probably too much for a single patch, since it would likely require keeping the player thread alive, just changing its start/repeat and end positions, rather than restarting a new one. Regards, Jörg Höhle

2 1

Re: [PATCH] dxgi/tests: Avoid c++ style comment.
by Stefan Dösinger 31 Aug '15

31 Aug '15

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Am 2015-08-30 um 21:59 schrieb Józef Kucia: > - {FALSE, 0, 2 /* undefined */, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, //30 > + {FALSE, 0, 2 /* undefined */, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, /*30 */ better to remove those index comments entirely. While they may seem useful on first sight, it's easy for them to become misleading if lines are added / removed / commented out. I'll send my patch, then Henri can chose whatever he likes best. Cheers, Stefan -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBAgAGBQJV44HSAAoJEN0/YqbEcdMwqWMP/35BfDqJhe7KvM5poSHoIq+8 4KbFkdZkfDkRsLBXQsRlFDDME/VXE74rUA55iOA8rhHqfHt4cUEYrjLBxY8mJ2MK FaSb3Vcp+eUxOrXs/mrtIbUq1ZhrqOwFNHQH/1w+dspozxxg0k9WeK+5Tj1sU+Kx J8RycMNn049rqiJ2TGJq9FV+4w8cvrhJH/DO3I8xu+wSMK8SPeGx7QuYiQ2xO4Th IkBLkiOIOwfghn8ehqS4yzWv2333BlUZDAJruUiZ62ISWj1UqZTRMFA0Al4KT+v4 qO+pB/jym9YIqXUKwufi9z4Y0MYM8fADLeW2VLvrp+TiYz8ahp5Ed5UygizHXHRD aIaFu+RoECUoWb7l//RHBfhm3CyEuElP1IBXfLVeNm1WIt2q4EJhICkVBDcgVDaQ ygX4uxmfjW3Iswl/vHJxXM1BlD/ryycoPJ7/FzytFBzvUH/q6XX+45+NpmtfV5ZR wa6hk0UjFLdmMgwkP03W315Co4OuUVToQGX+M3vGqqQz2dMZ3tlz0NjGHAg4YUDV 9iUFYjIGtiZBnaz7CVVlsMbf+pVd65D2sxCeGodfDDYV/feek0yHykYY6GDGPzfb vhaL/38ejg24Z704ayk1St12RWX9iaXZkzPbCicWtC0avpYzjA2/WlH/X8TS/FFm lCJBPUM5GioDhUI9oqcp =PvBv -----END PGP SIGNATURE-----

1 1

Re: [PATCH 5/7] d3d8/tests: Add more GetBackBuffer error handling tests.
by Marvin 31 Aug '15

31 Aug '15

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=16429 Your paranoid android. === w8 (32 bit device) === device.c:1225: Test failed: TestCooperativeLevel failed, hr 0x88760868. device.c:1270: Test failed: Reset failed, hr 0x88760868. device.c:1272: Test failed: TestCooperativeLevel failed, hr 0x88760869. device.c:1276: Test failed: Got unexpected value 0 for D3DRS_LIGHTING. device.c:1283: Test failed: D3DVIEWPORT->X = 10, expected 0. device.c:1284: Test failed: D3DVIEWPORT->Y = 20, expected 0. device.c:1285: Test failed: D3DVIEWPORT->Width = 400, expected 800. device.c:1286: Test failed: D3DVIEWPORT->Height = 300, expected 600. device.c:1287: Test failed: D3DVIEWPORT->MinZ = 2.00000003e-001, expected 0. device.c:1288: Test failed: D3DVIEWPORT->MaxZ = 3.00000012e-001, expected 1. device.c:1293: Test failed: Screen width is 640, expected 800. device.c:1294: Test failed: Screen height is 480, expected 600. device.c:1300: Test failed: Back buffer width is 640, expected 800. device.c:1302: Test failed: Back buffer height is 480, expected 600. device.c:1332: Test failed: Screen width is 640, expected 1024. device.c:1333: Test failed: Screen height is 480, expected 768. device.c:2580: Test failed: Expected message 0x7e for window 0, but didn't receive it. device.c:2585: Test failed: The focus window is active. device.c:2593: Test failed: Got unexpected hr 0x88760869. device.c:2599: Test failed: Got unexpect screen size 800x600. device.c:2614: Test failed: Expected message 0x47 for window 0, but didn't receive it, i=1. device.c:2623: Test failed: Got unexpect screen size 800x600. device.c:2636: Test failed: Expected message 0x7e for window 0, but didn't receive it. device.c:2644: Test failed: Got unexpect width 640. device.c:2645: Test failed: Got unexpect height 480.

1 0

Re: [PATCH 2/2] gdi32: Added GetFontRealizationInfo() export
by Marvin 31 Aug '15

31 Aug '15

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=16404 Your paranoid android. === wvistau64 (64 bit font) === The test timed out

2 1

Re: [PATCH] shell32: Fix SHFileOperation(FO_MOVE) for creating subdirectories.
by Zhenbo Li 31 Aug '15

31 Aug '15

Excuse me, Does anyone knows how patch 113646 can be improved? Thank you very much 2015-08-14 21:18 GMT+08:00 Zhenbo Li <litimetal(a)gmail.com>: > This patch fixes bug 25207. Seems that a dozen of apps are affected by this > bug, so please tell me how I can improve this patch if this patch can't be > committed directly. > > There will be a test error: > shlfileop.c:818: Test failed: Expected ERROR_CANCELLED or DE_DIFFDIR > > It is not related to my patch. > > Hope you enjoy your weekend. > > --- > dlls/shell32/shlfileop.c | 11 +++++++++-- > dlls/shell32/tests/shlfileop.c | 6 +++--- > 2 files changed, 12 insertions(+), 5 deletions(-) > > -- Have a nice day! Zhenbo Li

2 2

Can't compile wine-git: initializer element is not constant in d3d11
by Bruno Jesus 31 Aug '15

31 Aug '15

Hi all, I have not compiled wine in one about 4 days and now I updated and tried and the results are: ../../../wine/dlls/d3d11/utils.c: In function ‘d3d11_resource_misc_flags_from_d3d10_resource_misc_flags’: ../../../wine/dlls/d3d11/utils.c:473:13: error: initializer element is not constant ../../../wine/dlls/d3d11/utils.c: In function ‘d3d10_resource_misc_flags_from_d3d11_resource_misc_flags’: ../../../wine/dlls/d3d11/utils.c:501:13: error: initializer element is not constant make[1]: ** [utils.o] Erro 1 make[1]: Saindo do diretório `/home/bruno/programs/wine32/dlls/d3d11' make: ** [dlls/d3d11] Erro 2 Is anyone experiencing a similar issue? I already tried make clean && make. Best regards, Bruno

5 8

Re: findstr: Minimal implementation
by Nikolay Sivov 30 Aug '15

30 Aug '15

Hi, Mikhail. Some comments: > +static void __cdecl printError(unsigned int id, ...) Why explicit __cdecl? > + WCHAR format[1024]; Here, and everywhere else - please use 4 spaces per indentation level instead of a tab. > + if (!LoadStringW(GetModuleHandleW(NULL), id, format, sizeof(format) / sizeof(format[0]))) I think calling it as LoadStringW(NULL, ...) has same effect. > +int find(WCHAR* patternW, WCHAR* filename) This should be static. > + WideCharToMultiByte(CP_OEMCP, 0, patternW, -1, pattern, patternLen, NULL, NULL); Why OEMCP and not ACP? > + // Latest char, include them to line Please avoid this C99/C++ comment style.

2 1

Re: krnl386.exe16: Avoid shift overflows in DMA_ioport_in.
by André Hentschel 30 Aug '15

30 Aug '15

Am 29.08.2015 um 22:51 schrieb Gerald Pfeifer: > Use 0xFFu isntead 0xFF to indicate we are looking at an unsigned > value/constant. > > Gerald > --- I think the change in gcc origins in the fact that there are different shift implementations which vary across cpu architecture. Personally I have ARM in mind which shifts different from x86, so I highly value your work on it.

1 0

How X11 server generate XClientMessageEvent ?
by Changhui LIU 30 Aug '15

30 Aug '15

Dear Alexandre, I'm debugging a window set focus problem on Deepin Linux(www.deepin.org), I found some hints in handle_wm_protocols function of winex11.drv. But I feel very strange, I don't find where generate the XClientMessageEvent with event.data.l[0] = x11drv_atom(WM_TAKE_FOCUS) when I git grep WM_TAKE_FOCUS in wine source directory. How X11 server generate XClientMessageEvent with event.type = x11drv_atom(WM_PROTOCOLS) and event.data.l[0] = x11drv_atom(WM_TAKE_FOCUS) ? Thank you! ------------------ Regards, Changhui Liu

2 2

Re: WS2_32: WSACleanup implementation, server-side, plus remove todos around passing tests. This also fixes bug 32910
by Marvin 30 Aug '15

30 Aug '15

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=16405 Your paranoid android. === w2008s64 (64 bit sock) === No test summary line found

3 2

Re: [PATCH 1/4] xaudio2: Implement device activation
by Andrew Eikum 29 Aug '15

29 Aug '15

Please don't merge these patches. I got some feedback on IRC and will be sending improved versions. Andrew On Mon, Aug 24, 2015 at 10:31:36AM -0500, Andrew Eikum wrote: > This adds a build-time dependency on openal, and a run-time dependency > on openal-soft's ALC_SOFT_loopback extension. > > --- > configure.ac | 3 +- > dlls/xaudio2_7/Makefile.in | 1 + > dlls/xaudio2_7/xaudio_dll.c | 274 +++++++++++++++++++++++++++++++++++++++++++- > 3 files changed, 274 insertions(+), 4 deletions(-) > > diff --git a/configure.ac b/configure.ac > index 004e79d..dea394f 100644 > --- a/configure.ac > +++ b/configure.ac > @@ -1738,8 +1738,9 @@ then > AC_DEFINE_UNQUOTED(HAVE_OPENAL,1,[Define to 1 if OpenAL is available])],,) > fi > WINE_NOTICE_WITH(openal,[test "x$ac_cv_lib_openal" != xyes], > - [libopenal ${notice_platform}development files not found (or too old), OpenAL won't be supported.]) > + [libopenal ${notice_platform}development files not found (or too old), OpenAL and XAudio2 won't be supported]) > test "x$ac_cv_lib_openal" = xyes || enable_openal32=${enable_openal32:-no} > +test "x$ac_cv_lib_openal" = xyes || enable_xaudio2_7=${enable_xaudio2_7:-no} > > dnl **** Check for libkstat **** > if test "$ac_cv_header_kstat_h" = "yes" > diff --git a/dlls/xaudio2_7/Makefile.in b/dlls/xaudio2_7/Makefile.in > index 6bdf362..5a09c82 100644 > --- a/dlls/xaudio2_7/Makefile.in > +++ b/dlls/xaudio2_7/Makefile.in > @@ -1,5 +1,6 @@ > MODULE = xaudio2_7.dll > IMPORTS = advapi32 kernel32 ole32 user32 uuid > +EXTRALIBS = $(OPENAL_LIBS) > > C_SRCS = \ > xaudio_dll.c > diff --git a/dlls/xaudio2_7/xaudio_dll.c b/dlls/xaudio2_7/xaudio_dll.c > index 6bb48e6..95740fa 100644 > --- a/dlls/xaudio2_7/xaudio_dll.c > +++ b/dlls/xaudio2_7/xaudio_dll.c > @@ -41,8 +41,14 @@ > #include "mmdeviceapi.h" > #include "audioclient.h" > > +#include <AL/al.h> > +#include <AL/alc.h> > +#include <AL/alext.h> > + > WINE_DEFAULT_DEBUG_CHANNEL(xaudio2); > > +static ALCdevice *(ALC_APIENTRY *palcLoopbackOpenDeviceSOFT)(const ALCchar*); > + > static HINSTANCE instance; > > static void dump_fmt(const WAVEFORMATEX *fmt) > @@ -86,6 +92,13 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD reason, void *pReserved) > case DLL_PROCESS_ATTACH: > instance = hinstDLL; > DisableThreadLibraryCalls( hinstDLL ); > + > + if(!alcIsExtensionPresent(NULL, "ALC_SOFT_loopback") || > + !(palcLoopbackOpenDeviceSOFT = alGetProcAddress("alcLoopbackOpenDeviceSOFT"))){ > + ERR("XAudio2 requires the ALC_SOFT_loopback extension (OpenAL-Soft >= 1.14)\n"); > + return FALSE; > + } > + > break; > } > return TRUE; > @@ -173,6 +186,14 @@ struct _IXAudio2Impl { > > WCHAR **devids; > UINT32 ndevs; > + > + IAudioClient *aclient; > + IAudioRenderClient *render; > + > + WAVEFORMATEXTENSIBLE fmt; > + > + ALCdevice *al_device; > + ALCcontext *al_ctx; > }; > > static inline IXAudio2Impl *impl_from_IXAudio2(IXAudio2 *iface) > @@ -190,6 +211,32 @@ IXAudio2Impl *impl_from_IXAudio2MasteringVoice(IXAudio2MasteringVoice *iface) > return CONTAINING_RECORD(iface, IXAudio2Impl, IXAudio2MasteringVoice_iface); > } > > +static DWORD get_channel_mask(unsigned int channels) > +{ > + switch(channels){ > + case 0: > + return 0; > + case 1: > + return KSAUDIO_SPEAKER_MONO; > + case 2: > + return KSAUDIO_SPEAKER_STEREO; > + case 3: > + return KSAUDIO_SPEAKER_STEREO | SPEAKER_LOW_FREQUENCY; > + case 4: > + return KSAUDIO_SPEAKER_QUAD; /* not _SURROUND */ > + case 5: > + return KSAUDIO_SPEAKER_QUAD | SPEAKER_LOW_FREQUENCY; > + case 6: > + return KSAUDIO_SPEAKER_5POINT1; /* not 5POINT1_SURROUND */ > + case 7: > + return KSAUDIO_SPEAKER_5POINT1 | SPEAKER_BACK_CENTER; > + case 8: > + return KSAUDIO_SPEAKER_7POINT1_SURROUND; /* Vista deprecates 7POINT1 */ > + } > + FIXME("Unknown speaker configuration: %u\n", channels); > + return 0; > +} > + > static void WINAPI XA2SRC_GetVoiceDetails(IXAudio2SourceVoice *iface, > XAUDIO2_VOICE_DETAILS *pVoiceDetails) > { > @@ -891,7 +938,29 @@ static void WINAPI XA2M_GetOutputMatrix(IXAudio2MasteringVoice *iface, > static void WINAPI XA2M_DestroyVoice(IXAudio2MasteringVoice *iface) > { > IXAudio2Impl *This = impl_from_IXAudio2MasteringVoice(iface); > + > TRACE("%p\n", This); > + > + EnterCriticalSection(&This->lock); > + > + if(!This->aclient){ > + LeaveCriticalSection(&This->lock); > + return; > + } > + > + IAudioRenderClient_Release(This->render); > + This->render = NULL; > + > + IAudioClient_Release(This->aclient); > + This->aclient = NULL; > + > + alcCloseDevice(This->al_device); > + This->al_device = NULL; > + > + alcDestroyContext(This->al_ctx); > + This->al_ctx = NULL; > + > + LeaveCriticalSection(&This->lock); > } > > /* not present in XAudio2 2.7 */ > @@ -1164,6 +1233,8 @@ static ULONG WINAPI IXAudio2Impl_Release(IXAudio2 *iface) > HeapFree(GetProcessHeap(), 0, sub); > } > > + IXAudio2MasteringVoice_DestroyVoice(&This->IXAudio2MasteringVoice_iface); > + > if(This->devenum) > IMMDeviceEnumerator_Release(This->devenum); > for(i = 0; i < This->ndevs; ++i) > @@ -1322,6 +1393,28 @@ static HRESULT WINAPI IXAudio2Impl_CreateSubmixVoice(IXAudio2 *iface, > return S_OK; > } > > +static ALenum al_get_loopback_format(const WAVEFORMATEXTENSIBLE *fmt) > +{ > + if(fmt->Format.wFormatTag == WAVE_FORMAT_PCM || > + (fmt->Format.wFormatTag == WAVE_FORMAT_EXTENSIBLE && > + IsEqualGUID(&fmt->SubFormat, &KSDATAFORMAT_SUBTYPE_PCM))){ > + switch(fmt->Format.wBitsPerSample){ > + case 8: > + return AL_UNSIGNED_BYTE_SOFT; > + case 16: > + return AL_SHORT_SOFT; > + case 32: > + return AL_INT_SOFT; > + } > + }else if(fmt->Format.wFormatTag == WAVE_FORMAT_IEEE_FLOAT || > + (fmt->Format.wFormatTag == WAVE_FORMAT_EXTENSIBLE && > + IsEqualGUID(&fmt->SubFormat, &KSDATAFORMAT_SUBTYPE_IEEE_FLOAT))){ > + if(fmt->Format.wBitsPerSample == 32) > + return AL_FLOAT_SOFT; > + } > + return 0; > +} > + > static HRESULT WINAPI IXAudio2Impl_CreateMasteringVoice(IXAudio2 *iface, > IXAudio2MasteringVoice **ppMasteringVoice, UINT32 inputChannels, > UINT32 inputSampleRate, UINT32 flags, const WCHAR *deviceId, > @@ -1329,8 +1422,12 @@ static HRESULT WINAPI IXAudio2Impl_CreateMasteringVoice(IXAudio2 *iface, > AUDIO_STREAM_CATEGORY streamCategory) > { > IXAudio2Impl *This = impl_from_IXAudio2(iface); > + IMMDevice *dev; > + HRESULT hr; > + WAVEFORMATEX *fmt; > + ALCint attrs[7]; > > - FIXME("(%p)->(%p, %u, %u, 0x%x, %s, %p, 0x%x): stub!\n", This, > + TRACE("(%p)->(%p, %u, %u, 0x%x, %s, %p, 0x%x)\n", This, > ppMasteringVoice, inputChannels, inputSampleRate, flags, > wine_dbgstr_w(deviceId), pEffectChain, streamCategory); > > @@ -1340,12 +1437,183 @@ static HRESULT WINAPI IXAudio2Impl_CreateMasteringVoice(IXAudio2 *iface, > if(pEffectChain) > WARN("Effect chain is unimplemented\n"); > > - /* TODO: Initialize mmdevice */ > + EnterCriticalSection(&This->lock); > > /* there can only be one Mastering Voice, so just build it into XA2 */ > + if(This->aclient){ > + LeaveCriticalSection(&This->lock); > + return XAUDIO2_E_INVALID_CALL; > + } > + > + if(!deviceId){ > + if(This->ndevs == 0){ > + LeaveCriticalSection(&This->lock); > + return ERROR_NOT_FOUND; > + } > + deviceId = This->devids[0]; > + } > + > + hr = IMMDeviceEnumerator_GetDevice(This->devenum, deviceId, &dev); > + if(FAILED(hr)){ > + WARN("GetDevice failed: %08x\n", hr); > + hr = XAUDIO2_E_DEVICE_INVALIDATED; > + goto exit; > + } > + > + hr = IMMDevice_Activate(dev, &IID_IAudioClient, > + CLSCTX_INPROC_SERVER, NULL, (void**)&This->aclient); > + if(FAILED(hr)){ > + WARN("Activate(IAudioClient) failed: %08x\n", hr); > + IMMDevice_Release(dev); > + hr = XAUDIO2_E_DEVICE_INVALIDATED; > + goto exit; > + } > + > + IMMDevice_Release(dev); > + > + hr = IAudioClient_GetMixFormat(This->aclient, &fmt); > + if(FAILED(hr)){ > + WARN("GetMixFormat failed: %08x\n", hr); > + hr = XAUDIO2_E_DEVICE_INVALIDATED; > + goto exit; > + } > + > + if(sizeof(WAVEFORMATEX) + fmt->cbSize > sizeof(WAVEFORMATEXTENSIBLE)){ > + FIXME("Mix format doesn't fit into WAVEFORMATEXTENSIBLE!\n"); > + hr = XAUDIO2_E_DEVICE_INVALIDATED; > + goto exit; > + } > + > + if(inputChannels == XAUDIO2_DEFAULT_CHANNELS) > + inputChannels = fmt->nChannels; > + if(inputSampleRate == XAUDIO2_DEFAULT_SAMPLERATE) > + inputSampleRate = fmt->nSamplesPerSec; > + > + memcpy(&This->fmt, fmt, sizeof(WAVEFORMATEX) + fmt->cbSize); > + This->fmt.Format.nChannels = inputChannels; > + This->fmt.Format.nSamplesPerSec = inputSampleRate; > + This->fmt.Format.nBlockAlign = This->fmt.Format.nChannels * This->fmt.Format.wBitsPerSample / 8; > + This->fmt.Format.nAvgBytesPerSec = This->fmt.Format.nSamplesPerSec * This->fmt.Format.nBlockAlign; > + This->fmt.dwChannelMask = get_channel_mask(This->fmt.Format.nChannels); > + > + CoTaskMemFree(fmt); > + fmt = NULL; > + > + hr = IAudioClient_IsFormatSupported(This->aclient, > + AUDCLNT_SHAREMODE_SHARED, &This->fmt.Format, &fmt); > + if(hr == S_FALSE){ > + if(sizeof(WAVEFORMATEX) + fmt->cbSize > sizeof(WAVEFORMATEXTENSIBLE)){ > + FIXME("Mix format doesn't fit into WAVEFORMATEXTENSIBLE!\n"); > + hr = XAUDIO2_E_DEVICE_INVALIDATED; > + goto exit; > + } > + memcpy(&This->fmt, fmt, sizeof(WAVEFORMATEX) + fmt->cbSize); > + } > + > + CoTaskMemFree(fmt); > + > + hr = IAudioClient_Initialize(This->aclient, AUDCLNT_SHAREMODE_SHARED, > + AUDCLNT_STREAMFLAGS_EVENTCALLBACK, inputSampleRate /* 1s buffer */, > + 0, &This->fmt.Format, NULL); > + if(FAILED(hr)){ > + WARN("Initialize failed: %08x\n", hr); > + hr = XAUDIO2_E_DEVICE_INVALIDATED; > + goto exit; > + } > + > + hr = IAudioClient_GetService(This->aclient, &IID_IAudioRenderClient, > + (void**)&This->render); > + if(FAILED(hr)){ > + WARN("GetService(IAudioRenderClient) failed: %08x\n", hr); > + hr = XAUDIO2_E_DEVICE_INVALIDATED; > + goto exit; > + } > + > + /* setup openal context */ > + attrs[0] = ALC_FORMAT_CHANNELS_SOFT; > + switch(inputChannels){ > + case 1: > + attrs[1] = ALC_MONO_SOFT; > + break; > + case 2: > + attrs[1] = ALC_STEREO_SOFT; > + break; > + case 4: > + attrs[1] = ALC_QUAD_SOFT; > + break; > + case 6: > + attrs[1] = ALC_5POINT1_SOFT; > + break; > + case 7: > + attrs[1] = ALC_6POINT1_SOFT; > + break; > + case 8: > + attrs[1] = ALC_7POINT1_SOFT; > + break; > + default: > + WARN("OpenAL doesn't support %u channels\n", inputChannels); > + LeaveCriticalSection(&This->lock); > + return AUDCLNT_E_UNSUPPORTED_FORMAT; > + } > + attrs[2] = ALC_FREQUENCY; > + attrs[3] = inputSampleRate; > + attrs[4] = ALC_FORMAT_TYPE_SOFT; > + attrs[5] = al_get_loopback_format(&This->fmt); > + attrs[6] = 0; > + > + if(!attrs[5]){ > + WARN("OpenAL can't output samples in this format\n"); > + hr = XAUDIO2_E_DEVICE_INVALIDATED; > + goto exit; > + } > + > + This->al_device = palcLoopbackOpenDeviceSOFT(NULL); > + if(!This->al_device){ > + WARN("alcLoopbackOpenDeviceSOFT failed\n"); > + hr = XAUDIO2_E_DEVICE_INVALIDATED; > + goto exit; > + } > + > + This->al_ctx = alcCreateContext(This->al_device, attrs); > + if(!This->al_ctx){ > + WARN("alcCreateContext failed\n"); > + hr = XAUDIO2_E_DEVICE_INVALIDATED; > + goto exit; > + } > + > + if(alcMakeContextCurrent(This->al_ctx) == ALC_FALSE){ > + WARN("alcMakeContextCurrent failed\n"); > + hr = XAUDIO2_E_DEVICE_INVALIDATED; > + goto exit; > + } > + > + IAudioClient_Start(This->aclient); > + > *ppMasteringVoice = &This->IXAudio2MasteringVoice_iface; > > - return S_OK; > +exit: > + if(FAILED(hr)){ > + if(This->render){ > + IAudioRenderClient_Release(This->render); > + This->render = NULL; > + } > + if(This->aclient){ > + IAudioClient_Release(This->aclient); > + This->aclient = NULL; > + } > + if(This->al_ctx){ > + alcDestroyContext(This->al_ctx); > + This->al_ctx = NULL; > + } > + if(This->al_device){ > + alcCloseDevice(This->al_device); > + This->al_device = NULL; > + } > + } > + > + LeaveCriticalSection(&This->lock); > + > + return hr; > } > > static HRESULT WINAPI IXAudio2Impl_StartEngine(IXAudio2 *iface) > -- > 2.5.0 > > > >

4 5

Re: ws2_32: WSACleanup cleans up open sockets (OSX only)
by Ken Thomases 29 Aug '15

29 Aug '15

Hi, Thanks for contributing to Wine. I've commented on the patch in-line below: On Jul 31, 2015, at 10:19 PM, Matt Durgavich <mattdurgavich(a)gmail.com> wrote: > +static void close_open_sockets() { > +#ifdef HAVE_LIBPROC_H > + int pid = getpid(); > + int bufferSizeNeeded = proc_pidinfo(pid, PROC_PIDLISTFDS, 0, NULL, 0); This function isn't documented and the header which declares it says it's SPI rather than API and can change at any time. Also, is this the right approach generally? This is going to close all Unix sockets opened by the process, not just Win32 sockets opened by ws2_32. Is it safe/proper for WSACleanup to close sockets that it didn't open? Isn't it possible that other parts of Wine could open Unix sockets for other reasons? Or that system libraries or frameworks might do so to carry out requests made by Wine? > + if (bufferSizeNeeded > 0) { > + struct proc_fdinfo *infos = (struct proc_fdinfo*)malloc(bufferSizeNeeded); > + int ret = proc_pidinfo(pid, PROC_PIDLISTFDS, 0, infos, bufferSizeNeeded); > + int numfds = bufferSizeNeeded / PROC_PIDLISTFD_SIZE; Shouldn't you use ret / PROC_PIDLISTFD_SIZE (assuming no error)? > + if (ret >= 0) { > + for (int i = 0; i < numfds; ++i ) { I don't think declaring the loop variable in the loop is allowed by Wine's coding standards. > + int32_t fd = infos[i].proc_fd; > + uint32_t type = infos[i].proc_fdtype; > + if (type == PROX_FDTYPE_SOCKET) { > + TRACE("Closing socket with descriptor %d\n", fd); > + close(fd); > + } > + } > + } > + free(infos); > + } > +#else > + FIXME("stub") > +#endif > +} > > /*********************************************************************** > * WSACleanup (WS2_32.116) > @@ -1458,8 +1490,14 @@ INT WINAPI WSACleanup(void) > if (num_startup) { > num_startup--; > TRACE("pending cleanups: %d\n", num_startup); > + if (num_startup == 0) { > + TRACE("cleaning up open sockets"); > + close_open_sockets(); > + } > return 0; > } > + > + /* Close all sockets */ What's this last comment about? Did you mean to put it above? > SetLastError(WSANOTINITIALISED); > return SOCKET_ERROR; > } > -Ken

5 28

Congratulations / thanks to our 2015 GSoC Students
by Austin English 29 Aug '15

29 Aug '15

I wanted to send a note congratulating our Google Summer of Code students for all passing their reviews, and thanking them for their work on Wine this summer. I hope you've enjoyed working on Wine and will continue to work with us in the future. -- -Austin

4 3

Wine and OS/X
by Jonathan Allen 28 Aug '15

28 Aug '15

Dear Wine list, I hope this isn't too off-topic, but can someone tell me if Wine works on OS/X and, if so, is there a binary download for it? Jonathan

2 1

Re: [PATCH 5/5] xaudio2/tests: Add callback tests
by Marvin 28 Aug '15

28 Aug '15

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=16390 Your paranoid android. === build (build) === Unable to regenerate dlls/xaudio2_7/Makefile Unable to regenerate dlls/xaudio2_7/Makefile

1 0

Re: [PATCH 4/5] xaudio2: Add a simple audio streaming test
by Marvin 28 Aug '15

28 Aug '15

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=16389 Your paranoid android. === build (build) === Unable to regenerate dlls/xaudio2_7/Makefile Unable to regenerate dlls/xaudio2_7/Makefile

1 0

Re: [PATCH 5/5] d3d11/tests: Add test for 2D texture interfaces.
by Henri Verbeet 28 Aug '15

28 Aug '15

On 28 August 2015 at 00:39, Józef Kucia <jkucia(a)codeweavers.com> wrote: > + hr = ID3D11Texture2D_QueryInterface(texture, &IID_IDXGISurface, (void **)&surface); > + ok(hr == E_NOINTERFACE, "Texture should not implement IDXGISurface.\n"); > + if (SUCCEEDED(hr)) IDXGISurface_Release(surface); You don't need the Release(), if the QueryInterface() would succeed the test would fail. > + if (FAILED(hr)) > + { > + skip("2D textures do not implement ID3D10Texture2D, skipping tests.\n"); This should probably be a win_skip(). You're leaking the device here. > + hr = ID3D11Device_CreateTexture2D(device, &desc, NULL, &texture); > + ok(SUCCEEDED(hr), "%u: Failed to create a 2d texture, hr %#x.\n", i, hr); > + if (FAILED(hr)) continue; ... > + hr = ID3D11Texture2D_QueryInterface(texture, &IID_IDXGISurface, (void **)&surface); > + ok(SUCCEEDED(hr), "%u: Texture should implement IDXGISurface.\n", i); > + if (SUCCEEDED(hr)) IDXGISurface_Release(surface); ... > + hr = ID3D11Texture2D_QueryInterface(texture, &IID_ID3D10Texture2D, (void **)&d3d10_texture); > + ok(SUCCEEDED(hr), "%u: Texture should implement ID3D10Texture2D.\n", i); > + if (SUCCEEDED(hr)) > + { Similar to above, you don't need to account for conditions where the test would fail.

1 0

Re: [PATCH 4/5] d3d11/tests: Port test_create_texture2d() from d3d10core.
by Henri Verbeet 28 Aug '15

28 Aug '15

On 28 August 2015 at 00:39, Józef Kucia <jkucia(a)codeweavers.com> wrote: > +static ID3D11Device *create_default_device(void) > +{ > + ID3D11Device *device; > + > + if (SUCCEEDED(D3D11CreateDevice(NULL, D3D_DRIVER_TYPE_HARDWARE, NULL, 0, NULL, 0, D3D11_SDK_VERSION, > + &device, NULL, NULL))) > + return device; > + if (SUCCEEDED(D3D11CreateDevice(NULL, D3D_DRIVER_TYPE_WARP, NULL, 0, NULL, 0, D3D11_SDK_VERSION, > + &device, NULL, NULL))) > + return device; > + if (SUCCEEDED(D3D11CreateDevice(NULL, D3D_DRIVER_TYPE_REFERENCE, NULL, 0, NULL, 0, D3D11_SDK_VERSION, > + &device, NULL, NULL))) > + return device; > + > + return NULL; > +} > + I think I'd make the "feature_level" parameter to the existing create_device() a pointer, and then make it optional. See also e.g. create_device() in dlls/d3d9/tests/device.c.

1 0

Re: [PATCH 3/5] d3d11: Implement d3d11_device_CreateTexture2D().
by Henri Verbeet 28 Aug '15

28 Aug '15

On 28 August 2015 at 00:39, Józef Kucia <jkucia(a)codeweavers.com> wrote: > +static inline struct d3d10_texture2d *impl_from_ID3D11Texture2D(ID3D11Texture2D *iface) > +{ > + return CONTAINING_RECORD(iface, struct d3d10_texture2d, ID3D11Texture2D_iface); > +} > + We usually try to keep these in the file that contains the interface implementation, texture.c in this case. We do make the occasional exception though. > + object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); > + if (!object) You could just do "if (!(object = HeapAlloc(...)))" here, but it doesn't matter that much. > @@ -2006,15 +2025,12 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateTexture2D(ID3D10Device1 *ifa > { > struct d3d_device *device = impl_from_ID3D10Device(iface); > D3D11_TEXTURE2D_DESC d3d11_desc; > + ID3D11Texture2D *d3d11_texture; > struct d3d10_texture2d *object; > HRESULT hr; > > TRACE("iface %p, desc %p, data %p, texture %p.\n", iface, desc, data, texture); > > - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); > - if (!object) > - return E_OUTOFMEMORY; > - > d3d11_desc.Width = desc->Width; > d3d11_desc.Height = desc->Height; > d3d11_desc.MipLevels = desc->MipLevels; > @@ -2026,16 +2042,14 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateTexture2D(ID3D10Device1 *ifa > d3d11_desc.CPUAccessFlags = d3d11_cpu_access_flags_from_d3d10_cpu_access_flags(desc->CPUAccessFlags); > d3d11_desc.MiscFlags = d3d11_resource_misc_flags_from_d3d10_resource_misc_flags(desc->MiscFlags); > > - if (FAILED(hr = d3d10_texture2d_init(object, device, &d3d11_desc, data))) > - { > - WARN("Failed to initialize texture, hr %#x.\n", hr); > - HeapFree(GetProcessHeap(), 0, object); > + if (FAILED(hr = d3d11_device_CreateTexture2D(&device->ID3D11Device_iface, &d3d11_desc, > + (const D3D11_SUBRESOURCE_DATA *)data, &d3d11_texture))) > return hr; > - } > > + object = impl_from_ID3D11Texture2D(d3d11_texture); > *texture = &object->ID3D10Texture2D_iface; > > - TRACE("Created ID3D10Texture2D %p\n", object); > + TRACE("Created ID3D10Texture2D %p.\n", object); > > return S_OK; > } This change doesn't really seem worth it. You do save a couple of lines by avoiding the memory allocation, but you need to make impl_from_ID3D11Texture2D() available outside of texture.c to do it. You could create a d3d_texture2d_create() function similar to e.g. d3d9_swapchain_create() in d3d9 and avoid the duplication that way, but it may not make much of a difference in line count. Up to you.

1 0

Re: [PATCH 5/5] d3d11/tests: Add test for 2D texture interfaces.
by Marvin 28 Aug '15

28 Aug '15

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=16380 Your paranoid android. === w7u (32 bit d3d11) === d3d11.c:360: Test failed: 0: Texture should implement ID3D10Texture2D. d3d11.c:352: Test failed: 2: Failed to create a 2d texture, hr 0x8007000e. === w8 (32 bit d3d11) === d3d11.c:360: Test failed: 0: Texture should implement ID3D10Texture2D.

2 1

Re: ieframe: Fixed random test failures.
by Marvin 28 Aug '15

28 Aug '15

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=16383 Your paranoid android. === w2000pro (32 bit webbrowser) === webbrowser.c:2972: Test failed: expected Invoke_COMMANDSTATECHANGE_NAVIGATEBACK_FALSE webbrowser.c:2977: Test failed: expected Invoke_COMMANDSTATECHANGE_NAVIGATEFORWARD_FALSE webbrowser.c:2972: Test failed: expected Invoke_COMMANDSTATECHANGE_NAVIGATEBACK_FALSE webbrowser.c:2977: Test failed: expected Invoke_COMMANDSTATECHANGE_NAVIGATEFORWARD_FALSE webbrowser.c:2972: Test failed: expected Invoke_COMMANDSTATECHANGE_NAVIGATEBACK_FALSE webbrowser.c:2977: Test failed: expected Invoke_COMMANDSTATECHANGE_NAVIGATEFORWARD_FALSE

1 0

What would the best approach for adding securing Wine and is it a reasonable goal?
by Steven Stewart-Gallus 28 Aug '15

28 Aug '15

Hello, I noticed that CreateRestrictedToken basically just duplicates the token and doesn't do anything. This makes sense as Wine is implemented as a compatibility library and program loader and not as a virtual machine and Windows programs running on Wine can break out and access Linux system calls so making CreateRestrictedToken do anything more wouldn't accomplish anything. I think it would be really cool though if CreateRestrictedToken and similar sandboxing APIs actually accomplished something in Wine though. What would the best approach for securing Wine be and is it a reasonable goal? First, see http://wiki.winehq.org/SecuringWine. So far, I can think of a few approaches. The first approach is to make a whole operating system such as ReactOS. The second approach is making a whole operating system that only has device drivers for working on top of virtual machines or hypervisors. The third approach is making a kernel that runs as a normal user process on top of a full OS (similar to User-Mode Linux or a weekend project I am working on at https://gitlab.com/sstewartgallus/wum, also see the Chrome sandbox at https://www.chromium.org/developers/design-documents/sandbox, https://code.google.com/p/chromium/wiki/LinuxSandboxing and https://dev.chromium.org/developers/design-documents/sandbox/osx-sandboxing…). The fourth approach is to abandon securing Wine itself and simply run Wine programs inside separate sandboxes. ReactOS already serves as an example of the first approach. The second approach is basically similar to ReactOS. My project at https://gitlab.com/sstewartgallus/wum serves as a tiny example of of the third approach might work. The fourth approach of separate sandboxes is actually very simple. One possible implementation of this fourth approach on Linux might be to use a script like the sandbox-X.sh script shown below and remove the Z: symlink in dosdevices (this isn't actually needed or improves security but just looks nice.) Note that to make this script work I had to do some configuration to let my automatically su into the sandbox account. As well, I also had to download a dummy Xorg configuration to the home directory of the sandbox account. Thank you, Steven Stewart-Gallus sandbox-X.sh: #! /bin/sh set -e set -C set -u exec su -l -c 'exec sh <&3' sstewartgallus-sandbox 3<<'EOF' set -e set -C set -u exec 3<&- export DISPLAY=':76' export XPRA_SOCKET_DIR='/tmp' exec xpra\ start\ ${DISPLAY}\ --xvfb="Xorg -noreset +extension GLX +extension RANDR +extension RENDER -logfile ./${DISPLAY}.log -config ./xorg.conf"\ "--no-daemon"\ "--mmap-group"\ "--no-sharing"\ "--bell"\ "--system-tray"\ "--xsettings"\ "--cursors"\ "--encoding=rgb"\ "--clipboard"\ --start-child=xterm

2 1

Re: [1/3] comdlg32: Implement open dropdown menu.
by Marvin 27 Aug '15

27 Aug '15

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=16371 Your paranoid android. === wvistau64 (64 bit itemdlg) === No test summary line found

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel