September 2008 - Wine-devel

Re: xinput implementation
by Andrew Fenn 12 Sep '08

12 Sep '08

On Fri, Sep 12, 2008 at 1:04 AM, chourmovs vs <chourmovs(a)gmail.com> wrote: > No sorry > No time and no skill for that, but maybe i could help doing some tests > In that case I will have a try at implementing it. Can someone have a look at this patch I made and offer any advice on where I may be going wrong (incorrect syntax, etc). This patch lets me load Assassin's Creed without complaining about missing the native dll (it's a start I guess), problem is that Assassin's Creed is so slow it's impossible to use for testing with a joystick. Regards, Andrew

3 3

Re: Patchwatcher: patchwatcher bug: Try number 2 drawprim.c drawStridedSlow
by Henri Verbeet 12 Sep '08

12 Sep '08

2008/9/11 Chris Ahrendt <celticht32(a)aol.com>: > Ok what now.... I did a git to get the latest tree... I generated the > patch off the latest tree.. and submitted it again... what I am failing. > so I can fix it =).. the code compiles just fine and runs on my machine > so not sure... > > chris > The patch is not against current git, it's against an earlier version of your patch. More importantly though, the patch is completely unacceptable. You really need to try to get a better understanding of how D3D vertex declarations work, and what the different D3DDECLTYPE values mean.

3 4

Wine mouse input: Fwd: [RFC] Preliminary XI 2 feature list
by Roderick Colenbrander 12 Sep '08

12 Sep '08

Hi all, Today Peter Hutterer posted a preliminary feature list of Xinput 2. I have forwarded the email to here so that Vitaly and others can check it out and see if it offers what we need in Wine. If you have comments I would send them to the xorg list. Regards, Roderick Colenbrander --- Xorg mail --- Subject: [RFC] Preliminary XI 2 feature list Following XDS, various notes, the discussions and preliminary executive decisions by me, here's a first draft of XI2 features. If you have anything to add, please speak up. Time-line: I'd like to get it into server 1.6 but it doesn't look particularly likely. 7.5 is more likely. - Compatibility with XI 1.x, although some requests will be deactivated or of limited functionality. - 16 bit device IDs - All events available as XGE events. - Event selection through event masks (instead or in addition to the event classes). i.e. the common cases of "select from all devices" and "select from all master devices" will be simplified. - Devices may have relative + absolute axes simultaneously, and change the mode on any of these axes at runtime. - Relative coordinates as a separate event. - 32 bit keycodes (reliant on XKB2) - ListInputDevices will include the currently attached Slave - Axis and button labelling through device properties. - subpixel resolution (from relative devices) available to clients. i.e. you get the data in screen coordinates, but with subpixel resolution available as fixed floating point. - no window access protocol, this will be thrown out. - dynamic device classes - device may add/remove classes at runtime. - aspect-ratio scaling of valuators. Probable implementation details: - libXi: "namespacing": i.e. X<dosomething> will be XI<dosomething> - server-internal use of XGE events, XI 1.x events emulated when needed. - some standardisation on axis label Atom names. - Clients have to announce XI2 support, otherwise they will be treated as XI 1.x clients. Once the feature discussion is complete, I'll get a protocol spec out. Cheers, Peter _______________________________________________ xorg mailing list xorg(a)lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/xorg -- Psssst! Schon das coole Video vom GMX MultiMessenger gesehen? Der Eine für Alle: http://www.gmx.net/de/go/messenger03

2 4

Re: d3dx8 [patch 1/2]: Implement D3DXGetFVFVertexSize
by Henri Verbeet 11 Sep '08

11 Sep '08

> + switch (FVF & 0xe) You should use D3DFVF_POSITION_MASK instead of 0xe here. > + texture = FVF >> 16; > + > + for (i = 0; i < ((FVF&D3DFVF_TEXCOUNT_MASK) >> D3DFVF_TEXCOUNT_SHIFT); i++) > + { > + switch (texture & 3) > + { > + case D3DFVF_TEXTUREFORMAT1: > + size = size + sizeof(FLOAT); > + break; > + case D3DFVF_TEXTUREFORMAT2: > + size = size + sizeof(FLOAT) * 2; > + break; > + case D3DFVF_TEXTUREFORMAT3: > + size = size + sizeof(FLOAT) * 3; > + break; > + case D3DFVF_TEXTUREFORMAT4: > + size = size + sizeof(FLOAT) * 4; > + break; > + default: > + break; > + } > + texture = texture >> 2; > + } It's not completely obvious where you get the different shifts and masks here, a comment wouldn't hurt.

1 0

Re: dplayx: Fix static overrun of pDP array in test. (Coverity)
by Kai Blin 11 Sep '08

11 Sep '08

On Thursday 11 September 2008 20:50:58 Ismael Barros wrote: > On 9/10/08, Kai Blin <kai.blin(a)gmail.com> wrote: > > --- > > dlls/dplayx/tests/dplayx.c | 2 +- > > 1 files changed, 1 insertions(+), 1 deletions(-) > > Sorry for the delay, I should have checked this before. I hadn't even > read the coverity thread. > > The patch is incorrect, because EnumSessions_cb_join always receives a > LPDIRECTPLAY4 as lpContext argument, even if most callbacks receive a > lpCallbackData. The initialization of callbackData before the call was > an error on my side. > > This patch fixes the double error. Just the reason why I cc'ed you on this patch. :) Thanks, Kai -- Kai Blin WorldForge developer http://www.worldforge.org/ Wine developer http://wiki.winehq.org/KaiBlin Samba team member http://www.samba.org/samba/team/ -- Will code for cotton.

1 0

Buffer overrun in dlls/riched20/editor.c
by Juan Lang 11 Sep '08

11 Sep '08

Hi Dylan, commit 11c80396995065701205f2facb3dba10a6f8170f[1] introduced a buffer overrun in riched20's editor.c. Here's the hunk that did it: @@ -666,35 +661,83 @@ static void ME_RTFParAttrHook(RTF_Info *info) static void ME_RTFTblAttrHook(RTF_Info *info) { - ME_DisplayItem *para; - switch (info->rtfMinor) { case rtfRowDef: - RTFFlushOutputBuffer(info); - para = ME_GetParagraph(info->editor->pCursors[0].pRun); - - /* Release possibly inherited cell definitions */ - ME_DestroyTableCellList(para); - - para->member.para.pCells = ALLOC_OBJ(ME_TableCell); - para->member.para.pCells->nRightBoundary = 0; - para->member.para.pCells->next = NULL; - para->member.para.pLastCell = para->member.para.pCells; + if (!info->tableDef) + info->tableDef = ALLOC_OBJ(RTFTable); + ZeroMemory(info->tableDef, sizeof(RTFTable)); break; case rtfCellPos: + if (!info->tableDef) + { + info->tableDef = ALLOC_OBJ(RTFTable); + ZeroMemory(info->tableDef, sizeof(RTFTable)); + } + if (info->tableDef->numCellsDefined >= MAX_TABLE_CELLS) + break; + info->tableDef->cells[info->tableDef->numCellsDefined].rightBoundary = info->rtfParam; + { + /* Tab stops store the cell positions. */ + ME_DisplayItem *para = ME_GetParagraph(info->editor->pCursors[0].pRun); + PARAFORMAT2 *pFmt = para->member.para.pFmt; + int cellNum = info->tableDef->numCellsDefined; + pFmt->rgxTabs[cellNum] &= ~0x00FFFFFF; + pFmt->rgxTabs[cellNum] = 0x00FFFFFF & info->rtfParam; The trouble is, numCellsDefined is only guaranteed to be less than MAX_TABLE_CELLS (defined as 63 in include/richedit.h), while rgxTabs is of size MAX_TAB_STOPS, or 32. I'm not sure what the correct fix is. Would you mind having a look? For what it's worth, this is Coverity id 727. Thanks, --Juan 1: http://source.winehq.org/git/wine.git/?a=commit;h=11c80396995065701205f2fac…

2 1

Buffer overrun in dlls/riched20/editor.c
by Juan Lang 11 Sep '08

11 Sep '08

Hi Dylan, commit 11c80396995065701205f2facb3dba10a6f8170f[1] introduced a buffer overrun in riched20's editor.c. Here's the hunk that did it: @@ -666,35 +661,83 @@ static void ME_RTFParAttrHook(RTF_Info *info) static void ME_RTFTblAttrHook(RTF_Info *info) { - ME_DisplayItem *para; - switch (info->rtfMinor) { case rtfRowDef: - RTFFlushOutputBuffer(info); - para = ME_GetParagraph(info->editor->pCursors[0].pRun); - - /* Release possibly inherited cell definitions */ - ME_DestroyTableCellList(para); - - para->member.para.pCells = ALLOC_OBJ(ME_TableCell); - para->member.para.pCells->nRightBoundary = 0; - para->member.para.pCells->next = NULL; - para->member.para.pLastCell = para->member.para.pCells; + if (!info->tableDef) + info->tableDef = ALLOC_OBJ(RTFTable); + ZeroMemory(info->tableDef, sizeof(RTFTable)); break; case rtfCellPos: + if (!info->tableDef) + { + info->tableDef = ALLOC_OBJ(RTFTable); + ZeroMemory(info->tableDef, sizeof(RTFTable)); + } + if (info->tableDef->numCellsDefined >= MAX_TABLE_CELLS) + break; + info->tableDef->cells[info->tableDef->numCellsDefined].rightBoundary = info->rtfParam; + { + /* Tab stops store the cell positions. */ + ME_DisplayItem *para = ME_GetParagraph(info->editor->pCursors[0].pRun); + PARAFORMAT2 *pFmt = para->member.para.pFmt; + int cellNum = info->tableDef->numCellsDefined; + pFmt->rgxTabs[cellNum] &= ~0x00FFFFFF; + pFmt->rgxTabs[cellNum] = 0x00FFFFFF & info->rtfParam; The trouble is, numCellsDefined is only guaranteed to be less than MAX_TABLE_CELLS (defined as 63 in include/richedit.h), while rgxTabs is of size MAX_TAB_STOPS, or 32. I'm not sure what the correct fix is. Would you mind having a look? For what it's worth, this is Coverity id 727. Thanks, --Juan 1: http://source.winehq.org/git/wine.git/?a=commit;h=11c80396995065701205f2fac…

1 0

Re: xinput implementation
by Andrew Fenn 11 Sep '08

11 Sep '08

Hi, I was wondering how you were coming with your implementation of xinput1_3.dll ? It sounds quite interesting although I would personally prefer the wine implementation to be able to use all joysticks and not just Xbox 360 controllers. Perhaps another configuration screen could be added to winecfg so that you can map your own joystick/joysticks controls to the key codes that are returned by XInputGetKeystroke? Regards, Andrew

1 0

Re: richedit: Avoid acting on control words in skipped RTF groups (Bug 15227) [try 2]
by Dylan Smith 11 Sep '08

11 Sep '08

It seems like I somehow missed the fact that patch was already accepted on the first try, however I still ended up rebasing the patch against the origin. I'll resend it anyways, since the commit message needs to be changed. On Thu, Sep 11, 2008 at 10:34 AM, Dylan Smith <dylan.ah.smith(a)gmail.com>wrote: > Previously the control words in skipped groups were being processed by > the read hook on the RTF parser. By moving this code into the class > callbacks for the parser, the skipped groups actually remain skipped. > > An example of a skipped group is a optional destination that isn't > recognized by the parser. The RTF specifications say to ignore these > groups, and native richedit controls act accordingly. > > This patch fixes bug 15227 which was caused by the \itap4 control word > in a destination which caused an unterminated table, since this control > word changes the nesting level by starting nested tables to reach that > nesting level. > > Changes for try 2: > Added in a destination callback for nesttableprops to avoid it being > ignored. Otherwise this patch would cause a regression where the > default table properties would be used for nested tables. > --- > dlls/riched20/editor.c | 3 +++ > dlls/riched20/reader.c | 10 ++++++++++ > dlls/riched20/rtf.h | 1 + > 3 files changed, 14 insertions(+), 0 deletions(-) >

1 0

Re: d3dx9_36: Fix the tests for native Windows.
by Tony 11 Sep '08

11 Sep '08

Hi, At least for all Windows versions below Vista, the d3dx9 importlib does exist (and d3dx9_36 does not), so either something is screwed up with your system or Vista is handling it otherwise (in that case we need another solution though). Best regards, Tony

4 8