April 2008 - Wine-commits - list.winehq.org

Alexander Morozov : ntoskrnl.exe: Change calling conventions for Interlocked* functions.
by Alexandre Julliard 28 Apr '08

28 Apr '08

Module: wine Branch: master Commit: 7f3b1daaf2d21a553aadc37a04968defcaaed916 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f3b1daaf2d21a553aadc37a0… Author: Alexander Morozov <amorozov(a)etersoft.ru> Date: Fri Apr 25 18:22:24 2008 +0400 ntoskrnl.exe: Change calling conventions for Interlocked* functions. --- dlls/ntoskrnl.exe/ntoskrnl.c | 70 +++++++++++++++++++++++++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 10 ++-- 2 files changed, 75 insertions(+), 5 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index cf1603a..cda3476 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -427,6 +427,76 @@ void WINAPI IofCompleteRequest( IRP *irp, UCHAR priority_boost ) /*********************************************************************** + * InterlockedCompareExchange (NTOSKRNL.EXE.@) + */ +#ifdef DEFINE_FASTCALL2_ENTRYPOINT +DEFINE_FASTCALL2_ENTRYPOINT( NTOSKRNL_InterlockedCompareExchange ) +LONG WINAPI __regs_NTOSKRNL_InterlockedCompareExchange( LONG volatile *dest, LONG xchg, LONG compare ) +#else +LONG WINAPI NTOSKRNL_InterlockedCompareExchange( LONG volatile *dest, LONG xchg, LONG compare ) +#endif +{ + return InterlockedCompareExchange( dest, xchg, compare ); +} + + +/*********************************************************************** + * InterlockedDecrement (NTOSKRNL.EXE.@) + */ +#ifdef DEFINE_FASTCALL1_ENTRYPOINT +DEFINE_FASTCALL1_ENTRYPOINT( NTOSKRNL_InterlockedDecrement ) +LONG WINAPI __regs_NTOSKRNL_InterlockedDecrement( LONG volatile *dest ) +#else +LONG WINAPI NTOSKRNL_InterlockedDecrement( LONG volatile *dest ) +#endif +{ + return InterlockedDecrement( dest ); +} + + +/*********************************************************************** + * InterlockedExchange (NTOSKRNL.EXE.@) + */ +#ifdef DEFINE_FASTCALL2_ENTRYPOINT +DEFINE_FASTCALL2_ENTRYPOINT( NTOSKRNL_InterlockedExchange ) +LONG WINAPI __regs_NTOSKRNL_InterlockedExchange( LONG volatile *dest, LONG val ) +#else +LONG WINAPI NTOSKRNL_InterlockedExchange( LONG volatile *dest, LONG val ) +#endif +{ + return InterlockedExchange( dest, val ); +} + + +/*********************************************************************** + * InterlockedExchangeAdd (NTOSKRNL.EXE.@) + */ +#ifdef DEFINE_FASTCALL2_ENTRYPOINT +DEFINE_FASTCALL2_ENTRYPOINT( NTOSKRNL_InterlockedExchangeAdd ) +LONG WINAPI __regs_NTOSKRNL_InterlockedExchangeAdd( LONG volatile *dest, LONG incr ) +#else +LONG WINAPI NTOSKRNL_InterlockedExchangeAdd( LONG volatile *dest, LONG incr ) +#endif +{ + return InterlockedExchangeAdd( dest, incr ); +} + + +/*********************************************************************** + * InterlockedIncrement (NTOSKRNL.EXE.@) + */ +#ifdef DEFINE_FASTCALL1_ENTRYPOINT +DEFINE_FASTCALL1_ENTRYPOINT( NTOSKRNL_InterlockedIncrement ) +LONG WINAPI __regs_NTOSKRNL_InterlockedIncrement( LONG volatile *dest ) +#else +LONG WINAPI NTOSKRNL_InterlockedIncrement( LONG volatile *dest ) +#endif +{ + return InterlockedIncrement( dest ); +} + + +/*********************************************************************** * ExAllocatePool (NTOSKRNL.EXE.@) */ PVOID WINAPI ExAllocatePool( POOL_TYPE type, SIZE_T size ) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 3aef928..0e7b8e8 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -28,11 +28,11 @@ @ stub Exfi386InterlockedExchangeUlong @ stub Exfi386InterlockedIncrementLong @ stub HalExamineMBR -@ stdcall InterlockedCompareExchange(ptr long long) kernel32.InterlockedCompareExchange -@ stdcall InterlockedDecrement(ptr) kernel32.InterlockedDecrement -@ stdcall InterlockedExchange(ptr long) kernel32.InterlockedExchange -@ stdcall InterlockedExchangeAdd(ptr long ) kernel32.InterlockedExchangeAdd -@ stdcall InterlockedIncrement(ptr) kernel32.InterlockedIncrement +@ stdcall -norelay InterlockedCompareExchange(ptr long long) NTOSKRNL_InterlockedCompareExchange +@ stdcall -norelay InterlockedDecrement(ptr) NTOSKRNL_InterlockedDecrement +@ stdcall -norelay InterlockedExchange(ptr long) NTOSKRNL_InterlockedExchange +@ stdcall -norelay InterlockedExchangeAdd(ptr long) NTOSKRNL_InterlockedExchangeAdd +@ stdcall -norelay InterlockedIncrement(ptr) NTOSKRNL_InterlockedIncrement @ stdcall InterlockedPopEntrySList(ptr) kernel32.InterlockedPopEntrySList @ stdcall InterlockedPushEntrySList(ptr ptr) kernel32.InterlockedPushEntrySList @ stub IoAssignDriveLetters

1 0

Matthias Derer : winejack: Re-added line which has been accidently deleted.
by Alexandre Julliard 28 Apr '08

28 Apr '08

Module: wine Branch: master Commit: a41bf52bb8fa29758dd73e0b80db3565e35bf3cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=a41bf52bb8fa29758dd73e0b8… Author: Matthias Derer <webmaster(a)tonstube.de> Date: Mon Apr 21 20:47:05 2008 +0200 winejack: Re-added line which has been accidently deleted. --- dlls/winejack.drv/audio.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/winejack.drv/audio.c b/dlls/winejack.drv/audio.c index 0e742f4..b196e4a 100644 --- a/dlls/winejack.drv/audio.c +++ b/dlls/winejack.drv/audio.c @@ -1307,6 +1307,7 @@ static DWORD wodOpen(WORD wDevID, LPWAVEOPENDESC lpDesc, DWORD dwFlags) dwFlags &= ~WAVE_DIRECTSOUND; /* direct sound not supported, ignore the flag */ + wwo->wFlags = HIWORD(dwFlags & CALLBACK_TYPEMASK); wwo->waveDesc = *lpDesc; memcpy(&wwo->format, lpDesc->lpFormat, sizeof(PCMWAVEFORMAT));

1 0

Nikolay Sivov : gdiplus: Implemented GdipAddPathBeziersI.
by Alexandre Julliard 28 Apr '08

28 Apr '08

Module: wine Branch: master Commit: c282f248fa2f1461db329fc2279648f957db2844 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c282f248fa2f1461db329fc22… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Fri Apr 25 22:16:36 2008 +0400 gdiplus: Implemented GdipAddPathBeziersI. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/graphicspath.c | 25 +++++++++++++++++++++++++ include/gdiplusflat.h | 1 + 3 files changed, 27 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index bdead36..107af12 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -3,7 +3,7 @@ @ stdcall GdipAddPathBezier(ptr long long long long long long long long) @ stdcall GdipAddPathBezierI(ptr long long long long long long long long) @ stdcall GdipAddPathBeziers(ptr ptr long) -@ stub GdipAddPathBeziersI +@ stdcall GdipAddPathBeziersI(ptr ptr long) @ stub GdipAddPathClosedCurve2 @ stub GdipAddPathClosedCurve2I @ stub GdipAddPathClosedCurve diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index 3f83bea..681b785 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -171,6 +171,31 @@ GpStatus WINGDIPAPI GdipAddPathBeziers(GpPath *path, GDIPCONST GpPointF *points, return Ok; } +GpStatus WINGDIPAPI GdipAddPathBeziersI(GpPath *path, GDIPCONST GpPoint *points, + INT count) +{ + GpPointF *ptsF; + GpStatus ret; + INT i; + + if(!points || ((count - 1) % 3)) + return InvalidParameter; + + ptsF = GdipAlloc(sizeof(GpPointF) * count); + if(!ptsF) + return OutOfMemory; + + for(i = 0; i < count; i++){ + ptsF[i].X = (REAL)points[i].X; + ptsF[i].Y = (REAL)points[i].Y; + } + + ret = GdipAddPathBeziers(path, ptsF, count); + GdipFree(ptsF); + + return ret; +} + GpStatus WINGDIPAPI GdipAddPathEllipse(GpPath *path, REAL x, REAL y, REAL width, REAL height) { diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 8df6c5b..de1125e 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -194,6 +194,7 @@ GpStatus WINGDIPAPI GdipAddPathArcI(GpPath*,INT,INT,INT,INT,REAL,REAL); GpStatus WINGDIPAPI GdipAddPathBezier(GpPath*,REAL,REAL,REAL,REAL,REAL,REAL,REAL,REAL); GpStatus WINGDIPAPI GdipAddPathBezierI(GpPath*,INT,INT,INT,INT,INT,INT,INT,INT); GpStatus WINGDIPAPI GdipAddPathBeziers(GpPath*,GDIPCONST GpPointF*,INT); +GpStatus WINGDIPAPI GdipAddPathBeziersI(GpPath*,GDIPCONST GpPoint*,INT); GpStatus WINGDIPAPI GdipAddPathEllipse(GpPath*,REAL,REAL,REAL,REAL); GpStatus WINGDIPAPI GdipAddPathEllipseI(GpPath*,INT,INT,INT,INT); GpStatus WINGDIPAPI GdipAddPathLine(GpPath*,REAL,REAL,REAL,REAL);

1 0

Nikolay Sivov : gdiplus: Implemented GdipAddPathEllipseI.
by Alexandre Julliard 28 Apr '08

28 Apr '08

Module: wine Branch: master Commit: da76020e5d3d30714e5b5cb9d2d4f0b2824933d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da76020e5d3d30714e5b5cb9d… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Fri Apr 25 23:17:36 2008 +0400 gdiplus: Implemented GdipAddPathEllipseI. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/graphicspath.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 107af12..9774600 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -15,7 +15,7 @@ @ stub GdipAddPathCurve @ stub GdipAddPathCurveI @ stdcall GdipAddPathEllipse(ptr long long long long) -@ stub GdipAddPathEllipseI +@ stdcall GdipAddPathEllipseI(ptr long long long long) @ stdcall GdipAddPathLine2(ptr ptr long) @ stdcall GdipAddPathLine2I(ptr ptr long) @ stdcall GdipAddPathLine(ptr long long long long) diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index 681b785..59b018d 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -226,6 +226,12 @@ GpStatus WINGDIPAPI GdipAddPathEllipse(GpPath *path, REAL x, REAL y, REAL width, return Ok; } +GpStatus WINGDIPAPI GdipAddPathEllipseI(GpPath *path, INT x, INT y, INT width, + INT height) +{ + return GdipAddPathEllipse(path,(REAL)x,(REAL)y,(REAL)width,(REAL)height); +} + GpStatus WINGDIPAPI GdipAddPathLine2(GpPath *path, GDIPCONST GpPointF *points, INT count) {

1 0

Nikolay Sivov : gdiplus: Implemented GdipCreatePathGradientI.
by Alexandre Julliard 28 Apr '08

28 Apr '08

Module: wine Branch: master Commit: 836b4183b9c2a6a8b7b2765bfee1122e774ee00c URL: http://source.winehq.org/git/wine.git/?a=commit;h=836b4183b9c2a6a8b7b2765bf… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Fri Apr 25 23:17:41 2008 +0400 gdiplus: Implemented GdipCreatePathGradientI. --- dlls/gdiplus/brush.c | 28 ++++++++++++++++++++++++++++ dlls/gdiplus/gdiplus.spec | 2 +- 2 files changed, 29 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c index 727d12d..8129c10 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -211,6 +211,34 @@ GpStatus WINGDIPAPI GdipCreatePathGradient(GDIPCONST GpPointF* points, return Ok; } +GpStatus WINGDIPAPI GdipCreatePathGradientI(GDIPCONST GpPoint* points, + INT count, GpWrapMode wrap, GpPathGradient **grad) +{ + GpPointF *pointsF; + GpStatus ret; + INT i; + + if(!points || !grad) + return InvalidParameter; + + if(count <= 0) + return OutOfMemory; + + pointsF = GdipAlloc(sizeof(GpPointF) * count); + if(!pointsF) + return OutOfMemory; + + for(i = 0; i < count; i++){ + pointsF[i].X = (REAL)points[i].X; + pointsF[i].Y = (REAL)points[i].Y; + } + + ret = GdipCreatePathGradient(pointsF, count, wrap, grad); + GdipFree(pointsF); + + return ret; +} + /* FIXME: path gradient brushes not truly supported (drawn as solid brushes) */ GpStatus WINGDIPAPI GdipCreatePathGradientFromPath(GDIPCONST GpPath* path, GpPathGradient **grad) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 9774600..512947e 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -118,7 +118,7 @@ @ stdcall GdipCreatePath(long ptr) @ stdcall GdipCreatePathGradient(ptr long long ptr) @ stdcall GdipCreatePathGradientFromPath(ptr ptr) -@ stub GdipCreatePathGradientI +@ stdcall GdipCreatePathGradientI(ptr long long ptr) @ stdcall GdipCreatePathIter(ptr ptr) @ stdcall GdipCreatePen1(long long long ptr) @ stdcall GdipCreatePen2(ptr long long ptr)

1 0

Dmitry Timoshkov : fonts: Change encoding of tahomabd.sfd to unicode.
by Alexandre Julliard 28 Apr '08

28 Apr '08

Module: wine Branch: master Commit: 02df8a3ab732a316bcb33172738e58c5725ba5e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=02df8a3ab732a316bcb331727… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Fri Apr 25 23:13:44 2008 +0900 fonts: Change encoding of tahomabd.sfd to unicode. --- fonts/tahomabd.sfd | 946 ++++++++++++++++++++++++++-------------------------- fonts/tahomabd.ttf | Bin 62316 -> 62804 bytes 2 files changed, 473 insertions(+), 473 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=02df8a3ab732a316bcb33…

1 0

Alexandre Julliard : shell32: Avoid traces that use size_t.
by Alexandre Julliard 28 Apr '08

28 Apr '08

Module: wine Branch: master Commit: 93e775a8b70f1295e260ead88d1840cca579bb4c URL: http://source.winehq.org/git/wine.git/?a=commit;h=93e775a8b70f1295e260ead88… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 25 17:01:50 2008 +0200 shell32: Avoid traces that use size_t. --- dlls/shell32/shellpath.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index abbaf19..6e66d1f 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -1699,7 +1699,6 @@ HRESULT WINAPI SHGetFolderPathAndSubDirA( pszPathW = HeapAlloc(GetProcessHeap(), 0, MAX_PATH * sizeof(WCHAR)); if(!pszPathW) { hr = HRESULT_FROM_WIN32(ERROR_NOT_ENOUGH_MEMORY); - WARN("Failed to allocate %u bytes of memory\n", MAX_PATH * sizeof(WCHAR)); goto cleanup; } } @@ -1714,7 +1713,6 @@ HRESULT WINAPI SHGetFolderPathAndSubDirA( pszSubPathW = HeapAlloc(GetProcessHeap(), 0, length * sizeof(WCHAR)); if(!pszSubPathW) { hr = HRESULT_FROM_WIN32(ERROR_NOT_ENOUGH_MEMORY); - WARN("Failed to allocate %u bytes of memory\n", length * sizeof(WCHAR)); goto cleanup; } MultiByteToWideChar(CP_ACP, 0, pszSubPath, -1, pszSubPathW, length);

1 0

Austin English : download.template: Update Mandriva download info (try 2)
by Jeremy Newman 26 Apr '08

26 Apr '08

Module: website Branch: master Commit: 8f7a007c4c4fba1e03c5ca19904507b9e97bcb2f URL: http://source.winehq.org/git/website.git/?a=commit;h=8f7a007c4c4fba1e03c5ca… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Apr 23 18:33:09 2008 -0500 download.template: Update Mandriva download info (try 2) ------=_Part_5172_25697671.1208993589752 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Content-Disposition: inline First one had a typo. See bug 12661. First one had a typo. See bug 12661. >From f7421b7fc6dcb726879080dc8adf28ccde625ef8 Mon Sep 17 00:00:00 2001 From: Austin English <austinenglish(a)gmail.com> Date: Sun, 20 Apr 2008 22:21:53 -0500 Subject: [PATCH] download.template: update Mandriva download info --- templates/en/download.template | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/en/download.template b/templates/en/download.template index d0bbd9a..4fdcb9d 100644 --- a/templates/en/download.template +++ b/templates/en/download.template @@ -50,8 +50,8 @@ for post-installation instructions. <img src="{$root}/images/distro/mandriva.png" width="50" height="50" alt="Mandriva Linux" border="0"></a> </td> <td> <a href="http://sourceforge.net/project/showfiles.php?group_id=6241&package_id=8…">Mandriva</a> - binary .rpms for Mandriva Linux 2006 and 2007. Download the 2007.1 package if your Mandriva is a 2007.1 - release, eg. 2007 Spring. Download the 2007.0 package if your Mandriva is the first 2007 release.</td> + binary .rpms for Mandriva Linux 2006, 2007, and 2008. Download the 2008.1 package if your Mandriva is a 2008.1 + release, eg. 2008 Spring. Download the 2008.0 package if your Mandriva is the first 2008 release.</td> <td><a href="mailto:marco(a)mandrivaclub.nl">Marco Meijer</a></td> </tr>

1 0

Alexandre Julliard : winex11: Check if IsXExtensionPointer is defined before using it.
by Alexandre Julliard 25 Apr '08

25 Apr '08

Module: wine Branch: master Commit: 405575168faaa80cc66ccfa9d9adefa0fbbc8a65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=405575168faaa80cc66ccfa9d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 25 16:46:17 2008 +0200 winex11: Check if IsXExtensionPointer is defined before using it. --- dlls/winex11.drv/wintab.c | 35 ++++++++++++++--------------------- 1 files changed, 14 insertions(+), 21 deletions(-) diff --git a/dlls/winex11.drv/wintab.c b/dlls/winex11.drv/wintab.c index b086e44..4e3e9de 100644 --- a/dlls/winex11.drv/wintab.c +++ b/dlls/winex11.drv/wintab.c @@ -523,21 +523,18 @@ void X11DRV_LoadTabletInfo(HWND hwnddefault) { int class_loop; char *device_type = devices[loop].type ? XGetAtomName(data->display, devices[loop].type) : NULL; + LPWTI_CURSORS_INFO cursor; - TRACE("Device %i: [id %d|name %s|type %s|num_classes %d|use %s]\n", + TRACE("Device %i: [id %d|name %s|type %s|num_classes %d|use %d]\n", loop, (int) devices[loop].id, devices[loop].name, device_type ? device_type : "", - devices[loop].num_classes, - devices[loop].use == IsXKeyboard ? "IsXKeyboard" : - devices[loop].use == IsXPointer ? "IsXPointer" : - devices[loop].use == IsXExtensionDevice ? "IsXExtensionDevice" : - devices[loop].use == IsXExtensionPointer ? "IsXExtensionPointer" : - "Unknown" - ); - - if ((devices[loop].use == IsXExtensionDevice) || (devices[loop].use == IsXExtensionPointer)) - { - LPWTI_CURSORS_INFO cursor; + devices[loop].num_classes, devices[loop].use ); + switch (devices[loop].use) + { + case IsXExtensionDevice: +#ifdef IsXExtensionPointer + case IsXExtensionPointer: +#endif TRACE("Is XExtension%s\n", (devices[loop].use == IsXExtensionDevice)? "Device":"Pointer"); cursor_target++; target = &devices[loop]; @@ -547,8 +544,7 @@ void X11DRV_LoadTabletInfo(HWND hwnddefault) { ERR("Input device '%s' name too long - skipping\n", wine_dbgstr_a(target->name)); cursor_target--; - XFree(device_type); - continue; + break; } X11DRV_expect_error(data->display, Tablet_ErrorHandler, NULL); @@ -566,8 +562,7 @@ void X11DRV_LoadTabletInfo(HWND hwnddefault) TRACE("No buttons, Non Tablet Device\n"); pXCloseDevice(data->display, opendevice); cursor_target --; - XFree(device_type); - continue; + break; } for (i=0; i< cursor->BUTTONS; i++,shft++) @@ -581,8 +576,7 @@ void X11DRV_LoadTabletInfo(HWND hwnddefault) { WARN("Unable to open device %s\n",target->name); cursor_target --; - XFree(device_type); - continue; + break; } MultiByteToWideChar(CP_UNIXCP, 0, target->name, -1, cursor->NAME, WT_MAX_NAME_LEN); @@ -590,9 +584,8 @@ void X11DRV_LoadTabletInfo(HWND hwnddefault) { WARN("Skipping device %d [name %s|type %s]; not apparently a tablet cursor type device. If this is wrong, please report it to wine-devel(a)winehq.org\n", loop, devices[loop].name, device_type ? device_type : ""); - XFree(device_type); cursor_target --; - continue; + break; } cursor->ACTIVE = 1; @@ -727,10 +720,10 @@ void X11DRV_LoadTabletInfo(HWND hwnddefault) } any = (XAnyClassPtr) ((char*) any + any->length); } + break; } XFree(device_type); - } pXFreeDeviceList(devices);

1 0

Vitaly Perov : cabinet: Fix for FDICopy with an empty cabinet file.
by Alexandre Julliard 25 Apr '08

25 Apr '08

Module: wine Branch: master Commit: 33e561f53cc510c6b5be3b4f1f3d2fbf8aa7486c URL: http://source.winehq.org/git/wine.git/?a=commit;h=33e561f53cc510c6b5be3b4f1… Author: Vitaly Perov <vitperov(a)etersoft.ru> Date: Thu Apr 24 18:13:46 2008 +0400 cabinet: Fix for FDICopy with an empty cabinet file. --- dlls/cabinet/fdi.c | 25 ++++++++++++++++--------- dlls/cabinet/tests/fdi.c | 5 +---- 2 files changed, 17 insertions(+), 13 deletions(-) diff --git a/dlls/cabinet/fdi.c b/dlls/cabinet/fdi.c index 468a68d..7e5edcd 100644 --- a/dlls/cabinet/fdi.c +++ b/dlls/cabinet/fdi.c @@ -562,9 +562,14 @@ static BOOL FDI_read_entries( /* get the number of folders */ num_folders = EndGetI16(buf+cfhead_NumFolders); - if (num_folders == 0) { - /* PONDERME: is this really invalid? */ - WARN("weird cabinet detect failure: no folders in cabinet\n"); + /* if num_folders is 0, it's correct cab, but empty */ + /* if num_folders is 1, there is no folders in this cab */ + + /* get the number of files */ + num_files = EndGetI16(buf+cfhead_NumFiles); + if (num_files && !num_folders) { + /* If there at least one file in the cabinet. num_folders is always >= 1 */ + WARN("weird cabinet detect failure: cabinet is not empty, but num_folders = 0\n"); if (pmii) { PFDI_INT(hfdi)->perf->erfOper = FDIERROR_NOT_A_CABINET; PFDI_INT(hfdi)->perf->erfType = 0; @@ -572,12 +577,9 @@ static BOOL FDI_read_entries( } return FALSE; } - - /* get the number of files */ - num_files = EndGetI16(buf+cfhead_NumFiles); - if (num_files == 0) { - /* PONDERME: is this really invalid? */ - WARN("weird cabinet detect failure: no files in cabinet\n"); + if (!num_files && num_folders) { + /* If cabinet consist of 0 files, num_folders must be 0 */ + WARN("weird cabinet detect failure: no files in cabinet, but there are folders\n"); if (pmii) { PFDI_INT(hfdi)->perf->erfOper = FDIERROR_NOT_A_CABINET; PFDI_INT(hfdi)->perf->erfType = 0; @@ -2834,6 +2836,11 @@ BOOL __cdecl FDICopy( } /* free decompression temps */ + if (!fol) { + /* Empty cabinet */ + PFDI_CLOSE(hfdi, cabhf); + return TRUE; /* empty, but correct */ + } switch (fol->comp_type & cffoldCOMPTYPE_MASK) { case cffoldCOMPTYPE_LZX: if (LZX(window)) { diff --git a/dlls/cabinet/tests/fdi.c b/dlls/cabinet/tests/fdi.c index bedcfa6..fc36c78 100644 --- a/dlls/cabinet/tests/fdi.c +++ b/dlls/cabinet/tests/fdi.c @@ -627,10 +627,7 @@ static void test_FDICopy(void) cpuUNKNOWN, &erf); ret=FDICopy(hfdi, name, path, 0, CopyProgress, NULL, 0); - todo_wine - { - ok(ret, "Expected FDICopy to succeed\n"); - } + ok(ret, "Expected FDICopy to succeed\n"); FDIDestroy(hfdi); DeleteFileA(name);

1 0