July 2008 - Wine-devel - list.winehq.org

Re: iPod patches
by Maarten Lankhorst 14 Jul '08

14 Jul '08

Hello Austin, 2008/6/9 Austin English <austinenglish(a)gmail.com>: > Howdy Maarten, > > I'm trying to do some dogfood testing with iTunes, and am building a > wine build with a few hacks to get around the ddraw blacking bug, iPod > support, etc. I tried applying your patch for iPod support, but it > seems that patch has a lot of conflicts with recent wine versions. I > was about to go through and start settling them manually, but thought > you may have a version laying around in your git tree that applies > (relatively) cleanly to 1.0-rc4. The most recent iteration is at: http://www.winehq.org/pipermail/wine-patches/2008-May/054483.html It should still apply cleanly, since the last patch touches wineserver, you have to run tools/make_requests from the top of the wine tree to update all wineserver related files. I added wine-devel to CC since lots of people asked me about it. The downside is that it still doesn't work 100%, for some reason there is a huge delay every time the ipod is used. How to use it: Set windows version to vista Install iTunes Mount the ipod 'wine net start "ipod service"' Wait 10 seconds or so start itunes, it should take 3 minutes instead of instantly. (From the delay above) There is a race condition if the ipod service isn't started before itunes is, resulting in the ipod not being found. Might be a wine bug, but I'm not 100% sure. Cheers, Maarten. Cheers, Maarten

3 3

Re: configure: add ip_icmp.h for getICMPStats on FreeBSD
by Alexandre Julliard 14 Jul '08

14 Jul '08

EA Durbin <ead1234(a)hotmail.com> writes: > diff --git a/configure.ac b/configure.ac > index bd764a3..500cae1 100644 > --- a/configure.ac > +++ b/configure.ac > @@ -274,6 +274,7 @@ AC_CHECK_HEADERS(\ > mntent.h \ > ncurses.h \ > netdb.h \ > + netinet/ip_icmp.h \ > netinet/in.h \ > netinet/in_systm.h \ > netinet/tcp.h \ ip_icmp.h is already checked for later on, since it depends on some other headers. -- Alexandre Julliard julliard(a)winehq.org

1 0

Illegal attachment in bug 14461
by Vitaliy Margolen 13 Jul '08

13 Jul '08

Bugzilla admin(s) please remove the illegal attachment from the http://bugs.winehq.org/show_bug.cgi?id=14461 Vitaliy.

1 0

please disregard my patch " wined3d: add surface convertor from D3DFMT_X8R8G8B8 to D3DFMT_R5G6B5"
by Victor 13 Jul '08

13 Jul '08

Hello. I ask to disregard patch " wined3d: add surface convertor from D3DFMT_X8R8G8B8 to D3DFMT_R5G6B5" (d15c66beebaaaa5ab7130161278d0ee86ee79aed.diff) I've sent yesterday. There are minor errors in masks used within x8r8g8b8_to_x5r6g5 that might cause minor graphical artefacts on textures with this conversion. I've written better (more flexible) converter function which will be submitted to wine-patches soon. -- With best regards, Victor Eremin (ErV2005(a)rambler.ru)

1 0

Re: [dplayx] New library dpwsockx, needed by dplayx
by Michael Karcher 13 Jul '08

13 Jul '08

Am Samstag, den 12.07.2008, 18:46 +0300 schrieb Ismael Barros: > I'm sorry, that patch lacked a header file, this is the fixed patch. I would put the dplaysp.h file into include, not dlls/dpwsockx. It contains definitions for all DirectPlay service providers, so it might be useful if a modem provider or a direct serial connection provider will be implemented. Is there a reason not to do so? Regards, Michael Karcher

4 8

Re: [2/3] gdiplus: fix GdipPathIterNextMarker behaviour on path without markers. fix tests.
by James Hawkins 13 Jul '08

13 Jul '08

On Sat, Jul 12, 2008 at 11:56 AM, Nikolay Sivov <bunglehead(a)gmail.com> wrote: > Changelog: > - Fix GdipPathIterNextMarker behaviour on path without markers. Make tests pass on native. > > --- > dlls/gdiplus/pathiterator.c | 3 ++- > dlls/gdiplus/tests/pathiterator.c | 6 +++--- > 2 files changed, 5 insertions(+), 4 deletions(-) > > diff --git a/dlls/gdiplus/pathiterator.c b/dlls/gdiplus/pathiterator.c > index 55b0782..3d3b1dc 100644 > --- a/dlls/gdiplus/pathiterator.c > +++ b/dlls/gdiplus/pathiterator.c > @@ -140,7 +140,8 @@ GpStatus WINGDIPAPI GdipPathIterNextMarker(GpPathIterator* iterator, INT *result > /* first call could start with second point as all subsequent, cause > path couldn't contain only one */ > for(i = iterator->marker_pos + 1; i < iterator->pathdata.Count; i++){ > - if(iterator->pathdata.Types[i] & PathPointTypePathMarker){ > + if((iterator->pathdata.Types[i] & PathPointTypePathMarker) || > + (i == iterator->pathdata.Count - 1)){ > *startIndex = iterator->marker_pos; > if(iterator->marker_pos > 0) (*startIndex)++; > *endIndex = iterator->marker_pos = i; > diff --git a/dlls/gdiplus/tests/pathiterator.c b/dlls/gdiplus/tests/pathiterator.c > index 071c1d5..6498bb3 100644 > --- a/dlls/gdiplus/tests/pathiterator.c > +++ b/dlls/gdiplus/tests/pathiterator.c > @@ -114,7 +114,7 @@ static void test_nextmarker(void) > GdipCreatePathIter(&iter, path); > stat = GdipPathIterNextMarker(iter, &result, &start, &end); > expect(Ok, stat); > - expect(0, result); > + if(stat == Ok) expect(TRUE, (result == 4) && (start == 0) && (end == 3)); Why are you checking if stat == Ok? You're linking what should be separate tests together. You also need to put each of these checks into separate tests. If the test fails, you have no idea (without debugging further) which one of those checks fails. They're called unit tests for a reason. > GdipDeletePathIter(iter); > > /* one marker */ > @@ -125,7 +125,7 @@ static void test_nextmarker(void) > expect(TRUE, (start == 0) && (end == 3) && (result == 4)); > stat = GdipPathIterNextMarker(iter, &result, &start, &end); > expect(Ok, stat); > - expect(0, result); > + if(stat == Ok) expect(0, result); Same thing as above. > GdipDeletePathIter(iter); > > /* two markers */ > @@ -140,7 +140,7 @@ static void test_nextmarker(void) > expect(TRUE, (start == 4) && (end == 5) && (result == 2)); > stat = GdipPathIterNextMarker(iter, &result, &start, &end); > expect(Ok, stat); > - expect(0, result); > + if(stat == Ok) expect(0, result); Same. -- James Hawkins

5 13

RE: wined3d: add surface convertor from D3DFMT_X8R8G8B8 to D3DFMT_R5G6B5
by Stefan Dösinger 13 Jul '08

13 Jul '08

Please allign the entries in the conversion table. It seems that the spacing isn't properly alliged(although maybe my outlook messed it up). Otherwise it looks ok to me Also it is generally better to attach the patch as an extra file to the mail instead of inlining it, since mail clients often mangle the lines, thus breaking the patch > -----Original Message----- > From: wine-patches-bounces(a)winehq.org [mailto:wine-patches- > bounces(a)winehq.org] On Behalf Of Victor > Sent: Saturday, July 12, 2008 9:54 PM > To: wine-patches(a)winehq.org > Subject: wined3d: add surface convertor from D3DFMT_X8R8G8B8 to > D3DFMT_R5G6B5 > > > removes "cannot convert" FIXMEs in "Ancient Evil" game. > --- > dlls/wined3d/surface_base.c | 18 ++++++++++++++++++ > 1 files changed, 18 insertions(+), 0 deletions(-) > > diff --git a/dlls/wined3d/surface_base.c b/dlls/wined3d/surface_base.c > index 183cd2b..d74ec42 100644 > --- a/dlls/wined3d/surface_base.c > +++ b/dlls/wined3d/surface_base.c > @@ -636,6 +636,23 @@ void convert_r32f_r16f(BYTE *src, BYTE *dst, DWORD > pitch_in, DWORD pitch_out, un > } > } > > +inline WORD x8r8g8b8_to_x5r6g5(DWORD xrgb){ > + return ((xrgb & 0xFF) >> 3) | ((xrgb & 0xFF00) >> 10) | > + ((xrgb & 0xFF0000) >> 19); > +} > + > +void convert_x8r8g8b8_x5r6g5(BYTE* src, BYTE* dst, DWORD pitch_in, > DWORD pitch_out, unsigned int w, unsigned int h){ > + unsigned int x, y; > + DWORD* srcp; > + WORD* destp; > + for (y = 0; y < h; y++, src+= pitch_in, dst += pitch_out){ > + srcp = (DWORD*)src; > + destp = (WORD*)dst; > + for (x = 0; x < w; x++) > + destp[x] = x8r8g8b8_to_x5r6g5(srcp[x]); > + } > +} > + > struct d3dfmt_convertor_desc { > WINED3DFORMAT from, to; > void (*convert)(BYTE *src, BYTE *dst, DWORD pitch_in, DWORD > pitch_out, unsigned int w, unsigned int h); @@ -643,6 +660,7 @@ struct > d3dfmt_convertor_desc { > > struct d3dfmt_convertor_desc convertors[] = { > {WINED3DFMT_R32F, WINED3DFMT_R16F, convert_r32f_r16f}, > + {WINED3DFMT_X8R8G8B8, WINED3DFMT_R5G6B5, > convert_x8r8g8b8_x5r6g5} > }; > > static inline struct d3dfmt_convertor_desc > *find_convertor(WINED3DFORMAT from, WINED3DFORMAT to) { > -- > 1.5.5

1 0

How do I write an exception filter?
by Stefan Kuhr 13 Jul '08

13 Jul '08

Hello everyone, I would like to know what the proper way is to write an exception filter function for WINE code. Most of the WINE exception filtering seems to be done with the __EXCEPT_PAGE_FAULT macro, for whatever reason. In all other places I see the macro __EXCEPT with a filter function of this prototype LONG WINAPI filter(EXCEPTION_POINTERS *); However, I have the need to implement a filter function that takes additional formal parameters such as the values of local parameters of the function where the SEH frame resides. Alternatively, I would like to do something like the following (in MSVC parlance), where the exception filter is a simple boolean expression: __try { PDWORD pdwCommStatus = ....; PDWORD pdwFaultStatus = ....; doSomething(); } __except( (pdwCommStatus||pdwFaultStatus) ? EXCEPTION_EXECUTE_HANDLER : EXCEPTION_CONTINUE_SEARCH ) { // handle the exception } In include/wine/exception.h, a comment from AJ says that "__EXCEPT(filter_func,param)" is the proper way to do it but "param" is not explained at all and "filter_func must be defined with the WINE_EXCEPTION_FILTER macro", as the comment says. However, a search for WINE_EXCEPTION_FILTER yields no results. So, how do I do these things in WINE properly? Did I overlook something obvious? -- Stefan

4 14

RFC: More tests for riched20 ITextServices
by Austin Lund 13 Jul '08

13 Jul '08

The first patch in this series is the same as that which I have sent around before. The remainder implement tests for TxGetText, TxSetText, TxGetNaturalSize and a very simple test for TxDraw. Patches 2 through 4 don't pass on wine but are in a wine_todo{} section. When the TxDraw patch is added and the test is run with WINETEST_INTERACTIVE=1 then you get two seconds to see the text in an undecorated window in the top left of the screen. I have run these with the native dll in wine and it works fine, but would like someone to test them on windows platforms. There is some trickery with "thiscall". Some background for the implementation can be found here: http://www.winehq.org/pipermail/wine-devel/2005-July/038185.html

3 6

Re: [3/3] gdiplus: Make GdipInvertMatrix test pass on native
by James Hawkins 12 Jul '08

12 Jul '08

On Sat, Jul 12, 2008 at 4:12 PM, Nikolay Sivov <bunglehead(a)gmail.com> wrote: > Changelog: > - Make GdipInvertMatrix test pass on native > > --- > dlls/gdiplus/tests/matrix.c | 23 +++++++++++++++++------ > 1 files changed, 17 insertions(+), 6 deletions(-) > > diff --git a/dlls/gdiplus/tests/matrix.c b/dlls/gdiplus/tests/matrix.c > index 16c1517..daf61ea 100644 > --- a/dlls/gdiplus/tests/matrix.c > +++ b/dlls/gdiplus/tests/matrix.c > @@ -27,6 +27,19 @@ > > #define expect(expected, got) ok(got == expected, "Expected %.8x, got %.8x\n", expected, got) > > +/* compare matrix data with some tolerance */ > +BOOL m_equalf(REAL *m1, REAL *m2) > +{ > + BOOL ret = TRUE; > + INT i; > + > + for(i = 0; i < 6; i++){ > + ret = ret && (fabsf(m1[i] - m2[i]) < 1e-5); > + } > + > + return ret; > +} > + > static void test_constructor_destructor(void) > { > GpStatus status; > @@ -119,12 +132,12 @@ static void test_isinvertible(void) > GdipDeleteMatrix(matrix); > } > > +static REAL minverted[] = {1.0/9.0, 2.0/9.0, 4.0/9.0, -1.0/9.0, -2.0, -1.0}; > static void test_invert(void) > { > GpStatus status; > GpMatrix *matrix = NULL; > - GpMatrix *inverted = NULL; > - BOOL equal; > + REAL mdata[6]; > > /* NULL */ > status = GdipInvertMatrix(NULL); > @@ -141,11 +154,9 @@ static void test_invert(void) > status = GdipInvertMatrix(matrix); > expect(Ok, status); > > - GdipCreateMatrix2(1.0/9.0, 2.0/9.0, 4.0/9.0, -1.0/9.0, -2.0, -1.0, &inverted); > - GdipIsMatrixEqual(matrix, inverted, &equal); > - expect(TRUE, equal); > + GdipGetMatrixElements(matrix, mdata); > + expect(TRUE, m_equalf(mdata, minverted)); > Why are you creating a new function that allows tolerance when you control the matrix you're comparing it to? Allowing slop is acceptable in some circumstances, but not in this case, when there is one exact value (or matrix of values) returned. -- James Hawkins

4 8