May 2011 - Wine-Devel - list.winehq.org

Re: [8/8] d3d8: Use D3DPRIMITIVETYPE -> WINED3DPRIMITIVETYPE enum conversion function instead of implicit conversion (clang)

by Stefan Dösinger

On Monday 30 May 2011 11:29:26 Frédéric Delanoy wrote: > Yeah right, I changed/adapted the title in [7/8] since the conv > function wasn't needed anymore and thought that if I used a [7/8] with > another subject and (try 2) it wouldn't be noticed straightforwardly. Nah, Alexandre's scripts work very well there, and if the scripts don't figure it out he does. However if you restart your numbering you'll confuse the winetestbot. Your patches don't change the tests though so the testbot didn't complain.

May 30, 2011

Re: [8/8] d3d8: Use D3DPRIMITIVETYPE -> WINED3DPRIMITIVETYPE enum conversion function instead of implicit conversion (clang)

by Frédéric Delanoy

On Mon, May 30, 2011 at 10:58, Stefan Dösinger <stefandoesinger(a)gmx.at> wrote: > > Am 29.05.2011 um 19:35 schrieb Frédéric Delanoy: > >> Please skip this patch; it needs adaptation to avoid rebasing/merge >> conflicts due to changes to be done in patch " [7/8] d3d8: Use >> D3DRENDERSTATETYPE -> WINED3DRENDERSTATETYPE enum conversion function >> instead of implicit conversion (clang)." >> >> I'll resend both patches in a subsequent series. > To avoid confusion it is better to resend them as [7/8] and [8/8] as long as the original patches aren't applied. Now I'd recommend you to wait until today's commit wave before resending anything else to see which patches are applied and resend the others. Yeah right, I changed/adapted the title in [7/8] since the conv function wasn't needed anymore and thought that if I used a [7/8] with another subject and (try 2) it wouldn't be noticed straightforwardly. Frédéric

May 30, 2011

Re: [8/8] d3d8: Use D3DPRIMITIVETYPE -> WINED3DPRIMITIVETYPE enum conversion function instead of implicit conversion (clang)

by Stefan Dösinger

Am 29.05.2011 um 19:35 schrieb Frédéric Delanoy: > Please skip this patch; it needs adaptation to avoid rebasing/merge > conflicts due to changes to be done in patch " [7/8] d3d8: Use > D3DRENDERSTATETYPE -> WINED3DRENDERSTATETYPE enum conversion function > instead of implicit conversion (clang)." > > I'll resend both patches in a subsequent series. To avoid confusion it is better to resend them as [7/8] and [8/8] as long as the original patches aren't applied. Now I'd recommend you to wait until today's commit wave before resending anything else to see which patches are applied and resend the others.

May 30, 2011

Re: NTDLL doesn't compile under Clang

by James McKenzie

On 5/29/11 11:43 AM, Charles Davis wrote: > On 5/29/11 12:41 PM, C.W. Betts wrote: >> When compiling the NTDLL component of Wine, I get the following error: >> ../../../wine-git/./dlls/ntdll/large_int.c:267:13: error: unknown use of >> instruction mnemonic without a size suffix >> __asm__("div %4,%%eax" >> ^ >> <inline asm>:1:2: note: instantiated into assembly here >> div 12(%esp),%eax >> ^ >> I'm using Clang 2.0 from Xcode 4.0 > That's a Clang bug that's already been fixed. Sadly, it didn't make it > into Xcode 4.0. Any hope of it making it into a up release of XCode? Don't like running into upstream fixed bugs in a .0 release product. :( James McKenzie

May 29, 2011

Re: [PATCH] gdiplus: Convert and pass in 3 points, not 1 (Coverity)

by Vincent Povirk

Good catch. This sort of thing would have been very hard to track down in a real app. On Sun, May 29, 2011 at 4:53 PM, Marcus Meissner <marcus(a)jet.franken.de> wrote: > Hi, > > CID 1147 > We get 3 points, not 1 ... and also need to pass on 3 points. > > Ciao, Marcus > --- > dlls/gdiplus/matrix.c | 12 +++++++----- > 1 files changed, 7 insertions(+), 5 deletions(-) > > diff --git a/dlls/gdiplus/matrix.c b/dlls/gdiplus/matrix.c > index 1035cc2..acfe989 100644 > --- a/dlls/gdiplus/matrix.c > +++ b/dlls/gdiplus/matrix.c > @@ -105,7 +105,8 @@ GpStatus WINGDIPAPI GdipCreateMatrix3I(GDIPCONST GpRect *rect, GDIPCONST GpPoint > GpMatrix **matrix) > { > GpRectF rectF; > - GpPointF ptF; > + GpPointF ptF[3]; > + int i; > > TRACE("(%p, %p, %p)\n", rect, pt, matrix); > > @@ -114,10 +115,11 @@ GpStatus WINGDIPAPI GdipCreateMatrix3I(GDIPCONST GpRect *rect, GDIPCONST GpPoint > rectF.Width = (REAL)rect->Width; > rectF.Height = (REAL)rect->Height; > > - ptF.X = (REAL)pt->X; > - ptF.Y = (REAL)pt->Y; > - > - return GdipCreateMatrix3(&rectF, &ptF, matrix); > + for (i = 0; i < 3; i++) { > + ptF[i].X = (REAL)pt[i].X; > + ptF[i].Y = (REAL)pt[i].Y; > + } > + return GdipCreateMatrix3(&rectF, ptF, matrix); > } > > GpStatus WINGDIPAPI GdipCloneMatrix(GpMatrix *matrix, GpMatrix **clone) > -- > 1.7.3.4 > > > >

May 29, 2011

GSoC: dinput8 Action Mapping

by Lucas Zawacki

Hey guys. So last week I finally got a good understanding of dinput as a whole and nailed some trivial cases of action mapping, the ones with the keyboard. I'm sending a series of patches so everyone can take a look before I try commiting them. Please note that these contain a partial implementation of EnumDevicesBySemantics, BuildActionMap and SetActionMap, and also they're only the A versions. There are some tests for EnumDevicesBySemantics. I'm not too sure of how to code the tests that require user input... I hope it's not a nuisance to read the code split in 7 files, if you guys want I can merge it in one big diff. On a bright note, this patchset results in the input working for these two games: * http://appdb.winehq.org/objectManager.php?sClass=application&iId=3678 * http://appdb.winehq.org/objectManager.php?sClass=application&iId=7919 Cheers :)

May 29, 2011

Re: ddraw: Add tests for SetCooperativeLevel

by Marvin

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 http://testbot.winehq.org/JobDetails.pl?Key=11295 Your paranoid android. === W7PROX64 (64 bit ddrawmodes) === Timeout

May 29, 2011

Re: NTDLL doesn't compile under Clang

by Marcus Meissner

On Sun, May 29, 2011 at 12:43:35PM -0600, Charles Davis wrote: > On 5/29/11 12:41 PM, C.W. Betts wrote: > > When compiling the NTDLL component of Wine, I get the following error: > > ../../../wine-git/./dlls/ntdll/large_int.c:267:13: error: unknown use of > > instruction mnemonic without a size suffix > > __asm__("div %4,%%eax" > > ^ > > <inline asm>:1:2: note: instantiated into assembly here > > div 12(%esp),%eax > > ^ > > I'm using Clang 2.0 from Xcode 4.0 > That's a Clang bug that's already been fixed. Sadly, it didn't make it > into Xcode 4.0. Try this patch? Ciao, Marcus Subject: [PATCH] ntdll: specify div to be divl Hi, avoids a clang build issue. Ciao, Marcus --- dlls/ntdll/large_int.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/large_int.c b/dlls/ntdll/large_int.c index cb98bae..54ce6b0 100644 --- a/dlls/ntdll/large_int.c +++ b/dlls/ntdll/large_int.c @@ -264,7 +264,7 @@ UINT WINAPI RtlEnlargedUnsignedDivide( ULONGLONG a, UINT b, UINT *remptr ) p1 = a >> 32; p2 = a & 0xffffffffLL; - __asm__("div %4,%%eax" + __asm__("divl %4,%%eax" : "=a" (ret), "=d" (rem) : "0" (p2), "1" (p1), "g" (b) ); if (remptr) *remptr = rem; -- 1.7.3.4

May 29, 2011

Re: NTDLL doesn't compile under Clang

by Charles Davis

On 5/29/11 12:41 PM, C.W. Betts wrote: > When compiling the NTDLL component of Wine, I get the following error: > ../../../wine-git/./dlls/ntdll/large_int.c:267:13: error: unknown use of > instruction mnemonic without a size suffix > __asm__("div %4,%%eax" > ^ > <inline asm>:1:2: note: instantiated into assembly here > div 12(%esp),%eax > ^ > I'm using Clang 2.0 from Xcode 4.0 That's a Clang bug that's already been fixed. Sadly, it didn't make it into Xcode 4.0. Chip

May 29, 2011

NTDLL doesn't compile under Clang

by C.W. Betts

When compiling the NTDLL component of Wine, I get the following error: ../../../wine-git/./dlls/ntdll/large_int.c:267:13: error: unknown use of instruction mnemonic without a size suffix __asm__("div %4,%%eax" ^ <inline asm>:1:2: note: instantiated into assembly here div 12(%esp),%eax ^ I'm using Clang 2.0 from Xcode 4.0

May 29, 2011