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

Re: [PATCH 2/5] wined3d: Just enable ARB_shader_texture_lod if it's available.
by Stefan Dösinger June 7, 2011

June 7, 2011

On Tuesday 07 June 2011 11:06:25 Henri Verbeet wrote: > - if (gl_info->supported[ARB_SHADER_TEXTURE_LOD] && > reg_maps->usestexldd) Why is reg_maps->usestexldd not true in pixel shaders?

3 5

GSoC: dinput8 Action Mapping
by Lucas Zawacki June 6, 2011

June 6, 2011

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 :)

3 3

Re: wined3d: Enable blit stretching for 64 bpp
by Stefan Dösinger June 6, 2011

June 6, 2011

On Saturday 04 June 2011 18:24:39 André Hentschel wrote: > + case 8: > + STRETCH_ROW(DWORD64); > + break; 64 bit formats can be floating point formats too, like ARGB16F, or RG32F. But Roderick's comment catches the more important issue: This code shouldn't be called for 64 bit formats at all since they are only supported with FBOs which bring hardware blitting support.

2 1

Re: [3/3] kernel32/heap: Add registry caps for reported memory. (resend)
by Andrew Nguyen June 6, 2011

June 6, 2011

On 06/06/2011 11:03 AM, Adam Martinson wrote: > + /* Only check this once */ > + if (!cache_lastchecked) > + { > + HMODULE hadvapi32 = LoadLibraryA("advapi32.dll"); > +#define ADVAPI32_GET_PROC(func) typeof(func) * p ## func = (void*)GetProcAddress(hadvapi32, #func) > + ADVAPI32_GET_PROC(RegOpenKeyExA); > + ADVAPI32_GET_PROC(RegCloseKey); > + ADVAPI32_GET_PROC(RegGetValueA); I think you want to use NtCreateKey and NtQueryValueKey instead of dynamically loading advapi32 for registry functionality.

2 1

Re: ole32/ole2: Don't call IDropTarget::QueryInterface() in RegisterDragDrop(). (try 4 resend)
by Michael Stefaniuc June 6, 2011

June 6, 2011

Hello Adam, Adam Martinson wrote: > This is to work around apps which break COM rules by not implementing you need to follow the Wine COM guidelines: http://wiki.winehq.org/COMGuideline > IDropTarget::QueryInterface(). Windows doesn't expose this because it > doesn't call CoMarshallInterface() in RegisterDragDrop(). > > Fixes bug 23861. > --- > dlls/ole32/ole2.c | 122 > +++++++++++++++++++++++++++++++++++++++--- > dlls/ole32/tests/dragdrop.c | 2 +- > 2 files changed, 114 insertions(+), 10 deletions(-) >

2 1

Re: [1/3] kernel32/heap: Emulate Win9x if appropriate in GlobalMemoryStatusEx(). (try 2)
by Juan Lang June 6, 2011

June 6, 2011

Hi Adam, perhaps I'm just being obtuse, but I don't see how Dmitry's comment has been addressed for this patch. I'm confused by the commit comment ("Emulate Win9x if appropriate") and the change itself: /* Win98 returns only the swapsize in ullTotalPageFile/ullAvailPageFile, WinXP returns the size of physical memory + swapsize; - mimic the behavior of XP. You are removing the part of the comment explaining what the code actually does, which I find confusing. If you're part of the "the code is the documentation" crowd, just remove the entire comment. If not, please add a brief explanation. Note: Project2k refuses to start if it sees less than 1Mb of free swap. */ - lpmemex->ullTotalPageFile += lpmemex->ullTotalPhys; - lpmemex->ullAvailPageFile += lpmemex->ullAvailPhys; - - /* Titan Quest refuses to run if TotalPageFile <= ullTotalPhys */ - if(lpmemex->ullTotalPageFile == lpmemex->ullTotalPhys) + if (osver.dwMajorVersion >= 5 || osver.dwPlatformId != VER_PLATFORM_WIN32_WINDOWS) This change is confusing to me. dwPlatformId == VER_PLATFORM_WIN32_NT for NT4, Win2k, XP, etc. dwMajorVersion is never greater than 4 on Windows 9x. In other words, do you mean to exclude NT4 here, or not? If so, then the first check should suffice. If not, then the second check should. But in either case, what does this have to do with being "appropriate" for Win9x emulation? --Juan

2 8

Re: [2/3] kernel32/heap: Fix some hacks in GlobalMemoryStatus(). (try 2)
by Dmitry Timoshkov June 6, 2011

June 6, 2011

Adam Martinson <amartinson(a)codeweavers.com> wrote: > +/* Check the current process and all ancestors that share its address space. > + * Some apps run sub-processes that have the IMAGE_FILE_LARGE_ADDRESS_AWARE flag set, but > + * the parent process doesn't (eg, Dragon NaturallySpeaking 7 setup runs Install Shield 6). > + * If any don't have IMAGE_FILE_LARGE_ADDRESS_AWARE, return FALSE. */ My previous question still applies. -- Dmitry.

3 11

Re: [PATCH 9/9] ddraw: Separate IDirectDrawSurface4 vtable.
by Jesse Allen June 6, 2011

June 6, 2011

2011/6/6 Ričardas Barkauskas <rbarkauskas(a)codeweavers.com>: > This patch is quite big, but unfortunately I again have no idea how I > could split this properly. Suggestions are welcome. > > Ričardas Barkauskas > REalm > > I don't know how to make it any more straight forward than this. We need to split out IDirectDrawSurface4. Are you going to continue to do test work on this version of DDraw surface? Jesse

1 0

Re: [PATCH 1/5] wined3d: Don't clamp vertex depth values.
by Stefan Dösinger June 6, 2011

June 6, 2011

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Am 05.06.2011 um 22:48 schrieb Henri Verbeet: > Since we report D3DPMISCCAPS_CLIPTLVERTS. Do we still need GL_ARB_depth_clamp after this change? -----BEGIN PGP SIGNATURE----- Version: GnuPG/MacGPG2 v2.0.17 (Darwin) iQIcBAEBAgAGBQJN7H3AAAoJEN0/YqbEcdMw5bwP/2Tne/S6K+XYvL+5snYlrA7i 8i+eADNKVT5MmUJ6F6EZNDJ/esFbU2vfmIoFMlbDZ/l5seubIz1bMjvwteEiqOPo FakpButx8UKh08aGGw/utk3uVTu44ryEnTiNrSoEmx9h2ybym7JdBb/iAEf/nb17 qxI5V4dJf2beB+RQJ88ldtghn++VpDiFOo0t+TlOAe/sDcXTrT+25JtEJF23TxkL amfzjAYEV/f8hXuji2yAU1YOoRFZPfsFOjR+0snnlmXSbMUu5jwJAb+kM0nItlKQ JJGhI4QPOoqyNrltfKmbA3OOpTiihQQ8DYnd8y3PDrzFxftbdmjOHecgIFMxAifZ bOWDlVUctocidCxwUZB83kwhXX4MRVy9iFq0vbrl8omMgnoWC/hoQvO84gLG4E/c LBsIuOl/foLUbye6kk2cPT84hyJdQK4de852dk796zKSUxivCiKEI2L84H/Gi5uO 7l7YPIV9zAeqRV5YFyNgmZsF2ROyy0wQcOx0jt6lp0FTRi2mMKv04L7pdSM/dWO5 AXX/0KDQrZgWMHT/zZzC/LUAxvtBNTezBsk8IHhGvp7yXsKaIGmBbXFpkMANTOJM yVMRwF/VJhbCZXNmAIrrL9Gim/LDp6rcFnQPTYGWe4DJJ+b9gwn6hLbSF2PSEw/Z 9Cqfg2hhtJpfqmx7sjna =5kPk -----END PGP SIGNATURE-----

2 3

mmdevapi/tests: Fix wrong buffer unit and memory leaks.
by Joerg-Cyril.Hoehle＠t-systems.com June 6, 2011

June 6, 2011

Hi, >* nBlockAlign is wrong since data is counted in frames, not bytes. I forgot to comment that I introduced the 10x multiplicator to convince myself that GetData accepts buffer sizes larger than the default 10ms chunk returned by GetDevicePeriod. That is reasonable, but not guaranteed when I read MSDN (the API would work with small buffers too). Regards, Jörg Höhle

1 0

CD-ROM ioctl support on MacOS?
by Joerg-Cyril.Hoehle＠t-systems.com June 6, 2011

June 6, 2011

Hi, what's the state of CD-ROM support on the Mac? ntdll/cdrom.c contains quite a few #ifdef apple. I'm asking because the mcicda currently uses these ioctl: 1. READ_RAW 2. READ_TOC 3. READ_Q -> POSITION MCICDA could be changed to avoid the third one entirely -- when using the dsound output. Would that be enough to use mcicda on MacOS to play music? Thanks for your help, Jörg Höhle

2 3

Re: dinput: Added a check for NULL callback in EnumDevices.
by Vitaliy Margolen June 5, 2011

June 5, 2011

On 06/03/2011 04:19 PM, Lucas Fialho Zawacki wrote: > In the absence of this check apps passing a NULL pointer as callback to > EnumDevices segfault under Wine. Do you have an example of such application? And the bug in bugzilla? Vitaliy.

3 5

Re: urlmon: Fix incorrect pointer arithmetic (too conversative) in map_url_to_zone. (RESEND)
by Joris Huizer June 5, 2011

June 5, 2011

On 06/04/2011 03:02 PM, Gerald Pfeifer wrote: > Resending: This really looks like a straightforward bug fix and the > current code definitely wrong??? > > > The difference between two pointers (of the same type) is the number > of elements, not the number of bytes. Thus the code below was way > incorrect, luckily only too conversative. > > Gerald > > --- > dlls/urlmon/sec_mgr.c | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > diff --git a/dlls/urlmon/sec_mgr.c b/dlls/urlmon/sec_mgr.c > index 7b4bb35..75850ee 100644 > --- a/dlls/urlmon/sec_mgr.c > +++ b/dlls/urlmon/sec_mgr.c > @@ -529,7 +529,7 @@ static HRESULT map_url_to_zone(LPCWSTR url, DWORD *zone, LPWSTR *ret_url) > hres = CoInternetParseUrl(secur_url, PARSE_PATH_FROM_URL, 0, path, > sizeof(path)/sizeof(WCHAR),&size, 0); > > - if(SUCCEEDED(hres)&& (ptr = strchrW(path, '\\'))&& ptr-path< sizeof(root)/sizeof(WCHAR)) { > + if(SUCCEEDED(hres)&& (ptr = strchrW(path, '\\'))&& ptr-path< sizeof(root)) { > UINT type; > > memcpy(root, path, (ptr-path)*sizeof(WCHAR)); Indeed, the difference between two pointers is the number of elements. sizeof(root) is the number of bytes, sizeof(root)/sizeof(WCHAR) is the number of elements. HTH, Joris

1 0

re: cmd: ensure create_full_path returns FALSE for all errors
by Dan Kegel June 5, 2011

June 5, 2011

Please add a test case, too.

2 6

Re: urlmon: Fix incorrect pointer arithmetic (too conversative) in map_url_to_zone. (RESEND)
by Ken Thomases June 4, 2011

June 4, 2011

On Jun 4, 2011, at 8:02 AM, Gerald Pfeifer wrote: > Resending: This really looks like a straightforward bug fix and the > current code definitely wrong??? No. As others have pointed out, your logic is wrong. The existing code is correct. > The difference between two pointers (of the same type) is the number > of elements, not the number of bytes. Thus the code below was way > incorrect, luckily only too conversative. So, ptr-path is the number of elements between the two pointers. But sizeof(root) is a number of bytes. The precise reason to divide the latter by sizeof(WCHAR) is to arrive at a number of elements so it is proper to compare to ptr-path. Put another way, look a bit lower in the code: > memcpy(root, path, (ptr-path)*sizeof(WCHAR)); It is clear that (ptr-path)*sizeof(WCHAR), a measure of bytes, must be no larger than the size of root in bytes. Thus, this is the requirement: (ptr-path)*sizeof(WCHAR) <= sizeof(root) Dividing both sides by sizeof(WCHAR) gives an equivalent requirement: (ptr-path) <= sizeof(root)/sizeof(WCHAR) which is exactly what the code, as is, tests. (Except that the current code doesn't allow for the equal case, in order to preserve a null terminator.) Regards, Ken > --- > dlls/urlmon/sec_mgr.c | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > diff --git a/dlls/urlmon/sec_mgr.c b/dlls/urlmon/sec_mgr.c > index 7b4bb35..75850ee 100644 > --- a/dlls/urlmon/sec_mgr.c > +++ b/dlls/urlmon/sec_mgr.c > @@ -529,7 +529,7 @@ static HRESULT map_url_to_zone(LPCWSTR url, DWORD *zone, LPWSTR *ret_url) > hres = CoInternetParseUrl(secur_url, PARSE_PATH_FROM_URL, 0, path, > sizeof(path)/sizeof(WCHAR), &size, 0); > > - if(SUCCEEDED(hres) && (ptr = strchrW(path, '\\')) && ptr-path < sizeof(root)/sizeof(WCHAR)) { > + if(SUCCEEDED(hres) && (ptr = strchrW(path, '\\')) && ptr-path < sizeof(root)) { > UINT type; > > memcpy(root, path, (ptr-path)*sizeof(WCHAR)); > -- > 1.7.4.1 > > >

1 0

Re: Added unbound sampler test for pixel shaders. (try 2)
by Henri Verbeet June 4, 2011

June 4, 2011

Testing 3D and Cube textures (provided they're supported) may be useful too.

1 0

re: gdi speed: 10x slower than real win
by Dan Kegel June 4, 2011

June 4, 2011

Yup. It's being worked on, slowly; see http://wiki.winehq.org/Performance, especially http://wiki.winehq.org/DIBEngine

1 0

Re: [1/8] d3d8: Use D3DPOOL <-> WINED3DPOOL enum conversion functions instead of implicit conversions (clang)
by Alexandre Julliard June 4, 2011

June 4, 2011

Frédéric Delanoy <frederic.delanoy(a)gmail.com> writes: > +static inline D3DPOOL d3dpool_from_wined3dpool(WINED3DPOOL type) > +{ > + switch (type) > + { > + case WINED3DPOOL_DEFAULT: return D3DPOOL_DEFAULT; > + case WINED3DPOOL_MANAGED: return D3DPOOL_MANAGED; > + case WINED3DPOOL_SYSTEMMEM: return D3DPOOL_SYSTEMMEM; > + case WINED3DPOOL_SCRATCH: return D3DPOOL_SCRATCH; > + case WINED3DPOOL_FORCE_DWORD: return D3DPOOL_FORCE_DWORD; > + } > + return (D3DPOOL) type; > +} > + > +static inline WINED3DPOOL wined3dpool_from_d3dpool(D3DPOOL type) > +{ > + switch (type) > + { > + case D3DPOOL_DEFAULT: return WINED3DPOOL_DEFAULT; > + case D3DPOOL_MANAGED: return WINED3DPOOL_MANAGED; > + case D3DPOOL_SYSTEMMEM: return WINED3DPOOL_SYSTEMMEM; > + case D3DPOOL_SCRATCH: return WINED3DPOOL_SCRATCH; > + case D3DPOOL_FORCE_DWORD: return WINED3DPOOL_FORCE_DWORD; > + } > + return (WINED3DPOOL) type; > +} I still don't see the point of that kind of switch statement. To be honest I don't see either why we even need different enum types in the first place. -- Alexandre Julliard julliard(a)winehq.org

4 7

gdi speed: 10x slower than real win
by Jarek Czekalski June 4, 2011

June 4, 2011

Hi Devels The app I use runs unacceptably slow under wine. I suspected gdi routines and wrote a simple win32 api app to make some tests and comparisons. On my box it shows wine gdi is 10 times slower than the real windows. Let's get into details. REASON I love EditPad Pro (appdb editpad pro <http://appdb.winehq.org/objectManager.php?sClass=application&iId=8392>), a text editor with the capabilities for a programmer that I can't find in any other tool. After upgrade from version 6 to 7 I have problems with the usability, due to slow performance. The app is written in Delphi and now they included new interface features. The menus seem to be animated, they roll down instead of popping up immediately. Menus roll down slowly on wine, but that's a little problem, just a noticable thing. I have problems with very typing characters and these problems are almost gone when I switch off all the toolbars. Looks like the icons on them make them slow down the whole app. The author of the app claims that on his vmwared ubuntu everything is ok. I hope to get the judgement from you. TESTING APP I attach zip with source code and the executable of a short win32 api. It's an animated rectangle, optionally with a bitmap inside. It moves pixel by pixel from left to right. The next move is generated by PostMessage(WM_USER) at the end of OnPaint. I hope that's a way of assessing the gdi speed. Time needed to make the full pass of 500 pixels is printed on the screen. RESULTS test_gdi.exe without parameters draws bitmapped rect, while with the option "t" - the rect is bare. I tested 3 evironments and took 2 measurings on each of them. First number is the bitmapped time. Units are seconds. wine 0.39 0.22 - every movement phase is drawn vmwared w2k 0.123 0.085 - only several painted rects in random places w2k 0.0387 0.0285 - several painted every 2nd line, skewed rects The factor of 10 comes from comparing bitmapped time between wine and real W2K. Wine graphics is perfect, and the faster environments take some shorter ways. POSSIBLE EXPLANATION Just my imagination. I guess Windows buffer their graphics outcome in memory. Fast changes in this memory are not passed to the graphic device. This would explain the artifacts seen in the experiment and also the lack of flickering of the apps under the real win. For example mentioned EditPadPro redraws its edit area with every character typed (at least in the syntax highlighting mode), while under real win this behaviour is undetectable. BIBLIOGRAPHY The speed issue was reviewed in such posts I could locate: GDI Question <http://www.winehq.org/pipermail/wine-devel/2003-February/014052.html> (2003) Windows 2D GDI benchmark tools? <http://www.winehq.org/pipermail/wine-devel/2009-July/077144.html> (2009) Speed problem with Wine... <http://www.winehq.org/pipermail/wine-users/2001-July/007320.html> (2001) Has anything changed? LAST WORD I hope you'll benefit from the tester I wrote. I'm looking forward to see your comments. Do you notice the same speed multiplier as me: 10x? Maybe I have to fix my Debian to reach better results. Jarek

1 0

Re: wined3d: Enable blit stretching for 64 bpp
by Roderick Colenbrander June 4, 2011

June 4, 2011

Hi André, I'm not sure if we should add this change since for a part it hides the real problem. Sure this patch likely works, but >32bpp blits should never enter the software rendering code in the first place. The code used to be a huge mess and Henri cleaned it up quite a bit already (thanks, because I became too busy). It may be easier now to fix this properly. Roderick 2011/6/4 André Hentschel <nerv(a)dawncrow.de>: > For http://bugs.winehq.org/show_bug.cgi?id=27377 > --- > dlls/wined3d/surface.c | 3 +++ > 1 files changed, 3 insertions(+), 0 deletions(-) > > diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c > index 91b16a6..7f9d9df 100644 > --- a/dlls/wined3d/surface.c > +++ b/dlls/wined3d/surface.c > @@ -6780,6 +6780,9 @@ do { \ > case 4: > STRETCH_ROW(DWORD); > break; > + case 8: > + STRETCH_ROW(DWORD64); > + break; > case 3: > { > const BYTE *s; > -- > > Best Regards, André Hentschel > > >

1 0

Re: cmd: ensure create_full_path returns FALSE for all errors
by Marcus Meissner June 4, 2011

June 4, 2011

On Sat, Jun 04, 2011 at 04:37:05PM +0200, Frédéric Delanoy wrote: > This resolves the issue from bug #27383 > --- > programs/cmd/builtins.c | 1 + > 1 files changed, 1 insertions(+), 0 deletions(-) > > diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c > index 0352e59..18e16fe 100644 > --- a/programs/cmd/builtins.c > +++ b/programs/cmd/builtins.c > @@ -496,6 +496,7 @@ static BOOL create_full_path(WCHAR* path) > WCHAR *slash; > DWORD last_error = GetLastError(); > if (last_error == ERROR_ALREADY_EXISTS) > + ret = FALSE; > break; You at least miss { } here. Ciao, Marcus

2 1

Re: [1/2] d3d8: Increment the reference count of the IDirect3D8 parent when creating a device.
by Stefan Dösinger June 4, 2011

June 4, 2011

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 The two patches look ok Am 03.06.2011 um 14:23 schrieb Andrew Nguyen: > --- > dlls/d3d8/d3d8_private.h | 5 +++-- > dlls/d3d8/device.c | 29 ++++++++--------------------- > dlls/d3d8/directx.c | 2 +- > dlls/d3d8/tests/device.c | 12 ++++++++++++ > 4 files changed, 24 insertions(+), 24 deletions(-) > > > <0001-d3d8-Increment-the-reference-count-of-the-IDirect3D8-p.txt> -----BEGIN PGP SIGNATURE----- Version: GnuPG/MacGPG2 v2.0.17 (Darwin) iQIcBAEBAgAGBQJN6jEJAAoJEN0/YqbEcdMwpNoP/33vRTq283VUfbwKhtVwYGQP hkp1Hh53id7moMGQ4YoH6BhsdWH2KeAvx5asuHEiciJZ/6JiS5Jc/1tNIuD5U+HS RcaFsOrKInuvbPojZECNoe1J/JH5i/A7fCLrAY+FknXOWz+t1UsD6sQbaZqVRM4H j7SvP335TRYYN/8KOyuI2vc2ZDQ+aLo+MXoQpu/7OfRbnnbCsR2ddDLCw/B6ktDN W0fUHjxRU5OigKebUG/KIcXmxYIbbVvNABR4UpRG30Py68CXlYsSM04HRZK4rLea H9pTGSLN1b2eybDKeDbwuIcCVsZHEDFp/mCYxQhPnGoPMHvwfUcHgP8q/rJrTN8+ JYWWYq4g9CuawMxjKivycq30PmAjl2vFl2Dttt9eDuub49ND6sqdDEmcJm8evvhn edOaV8C1o8TVQ4i4AOuUGyMjP3LdXrE02Ec60qjGq5J94NLolAAj5qjDX1JhwghW NKeSsNKGAdstD1FUBOZ6kOPWJ9OOFWyA0GQjiJ7/6616lbjvxJqso/D7IariJImz k/8Rb5UYgYOfB5sHXcyU0pohjouXBqntC5la0Bd1EMy44lZ61K6b03e7rpsyFTKI Wq3Noq1LE4u0gr0E00jE91UVyo30a3Msr6Ss8p1DJf/wmxbrUWNODvYXVlLUd06+ 18tpvn6fFHzrE9vBq3Ll =tSUa -----END PGP SIGNATURE-----

1 0

Re: wineoss.drv: Add mmdevapi driver.
by Gerald Pfeifer June 4, 2011

June 4, 2011

I believe commit be332326ba8fc3def406c5f29adf04fbe9a83976 Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Apr 27 09:12:36 2011 -0500 is causing the following build failures on my nightly FreeBSD testers: mmdevdrv.c:463:20: error: 'AFMT_S24_PACKED' undeclared (first use in this function) mmdevdrv.c:476:16: error: 'AFMT_FLOAT' undeclared (first use in this function) mmdevdrv.c:854:24: error: 'AFMT_FLOAT' undeclared (first use in this function) mmdevdrv.c:863:24: error: 'AFMT_S24_PACKED' undeclared (first use in this function) mmdevdrv.c:1084:24: error: 'SNDCTL_DSP_HALT' undeclared (first use in this function) Looks like some autoconfigury is not working or incomplete? Gerald

3 6

Re: wineoss.drv: Support platforms that do not feature AFMT_FLOAT.
by Andrew Eikum June 4, 2011

June 4, 2011

On 05/07/2011 07:46 PM, Gerald Pfeifer wrote: > As we have seen from a related thread on wine-devel, FreeBSD's > implementation of OSS is slightly, though not a lot, different from > what current Linux distributions feature. > > This patch addresses one such case, AFMT_FLOAT which does not exist > on FreeBSD (yet?), and I'm sure other non-Linux systems. I guess we can add this workaround. I don't know how far down this road we should be willing to go, though. I would consider the FreeBSD implementation broken: it deviates from the spec as stated by the authors. So this seems to be their bug, not ours. How far should we bend over backwards to accommodate their bug? Anyways this is a tiny hassle, so I'm fine with it. Perhaps you should consider filing a FreeBSD bug? Thanks Gerald. Andrew > I created this diff with more context so that it becomes immediate that > this patch is harmless in that AFMT_FLOAT is handled as an error case > for system not providing it. > > Gerald > > --- > dlls/wineoss.drv/mmdevdrv.c | 4 ++++ > 1 files changed, 4 insertions(+), 0 deletions(-) > > diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c > index 789cb1e..254a119 100644 > --- a/dlls/wineoss.drv/mmdevdrv.c > +++ b/dlls/wineoss.drv/mmdevdrv.c > @@ -504,25 +504,27 @@ static int get_oss_format(const WAVEFORMATEX *fmt) > case 32: > return AFMT_S32_LE; > } > return -1; > } > > if(fmt->wFormatTag == WAVE_FORMAT_IEEE_FLOAT || > (fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE&& > IsEqualGUID(&fmtex->SubFormat,&KSDATAFORMAT_SUBTYPE_IEEE_FLOAT))){ > if(fmt->wBitsPerSample != 32) > return -1; > > +#ifdef AFMT_FLOAT > return AFMT_FLOAT; > +#endif > } > > return -1; > } > > static WAVEFORMATEX *clone_format(const WAVEFORMATEX *fmt) > { > WAVEFORMATEX *ret; > size_t size; > > if(fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE) > size = sizeof(WAVEFORMATEXTENSIBLE); > @@ -935,27 +937,29 @@ static HRESULT WINAPI AudioClient_GetMixFormat(IAudioClient *iface, > > if(This->dataflow == eRender) > formats = This->ai.oformats; > else if(This->dataflow == eCapture) > formats = This->ai.iformats; > else > return E_UNEXPECTED; > > fmt->Format.wFormatTag = WAVE_FORMAT_EXTENSIBLE; > if(formats& AFMT_S16_LE){ > fmt->Format.wBitsPerSample = 16; > fmt->SubFormat = KSDATAFORMAT_SUBTYPE_PCM; > +#ifdef AFMT_FLOAT > }else if(formats& AFMT_FLOAT){ > fmt->Format.wBitsPerSample = 32; > fmt->SubFormat = KSDATAFORMAT_SUBTYPE_IEEE_FLOAT; > +#endif > }else if(formats& AFMT_U8){ > fmt->Format.wBitsPerSample = 8; > fmt->SubFormat = KSDATAFORMAT_SUBTYPE_PCM; > }else if(formats& AFMT_S32_LE){ > fmt->Format.wBitsPerSample = 32; > fmt->SubFormat = KSDATAFORMAT_SUBTYPE_PCM; > }else if(formats& AFMT_S24_LE){ > fmt->Format.wBitsPerSample = 24; > fmt->SubFormat = KSDATAFORMAT_SUBTYPE_PCM; > }else{ > ERR("Didn't recognize any available OSS formats: %x\n", formats); > return E_FAIL; > >

2 1

Re: loader: Add Polish translation
by Frédéric Delanoy June 4, 2011

June 4, 2011

2011/6/3 Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com>: > --- > loader/wine.pl.man.in | 327 +++++++++++++++++++++++++++++++++++++++++++++++++ > 1 files changed, 327 insertions(+), 0 deletions(-) > create mode 100644 loader/wine.pl.man.in > > diff --git a/loader/wine.pl.man.in b/loader/wine.pl.man.in > new file mode 100644 > index 0000000..e4a14a8 > --- /dev/null > +++ b/loader/wine.pl.man.in > @@ -0,0 +1,327 @@ > +.\" -*- nroff -*- > +.TH WINE 1 "June 2011" "@PACKAGE_STRING@" "Windows On Unix" That line is not translated Also, you might want to alter the Makefile.in for install/uninstalls Frédéric

1 0