June 2011 - wine-devel

Re: [PATCH 2/5] wined3d: Just enable ARB_shader_texture_lod if it's available.
by Stefan Dösinger 07 Jun '11

07 Jun '11

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 06 Jun '11

06 Jun '11

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 06 Jun '11

06 Jun '11

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 06 Jun '11

06 Jun '11

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 06 Jun '11

06 Jun '11

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 06 Jun '11

06 Jun '11

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 06 Jun '11

06 Jun '11

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 06 Jun '11

06 Jun '11

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 06 Jun '11

06 Jun '11

-----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 06 Jun '11

06 Jun '11

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 06 Jun '11

06 Jun '11

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 05 Jun '11

05 Jun '11

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 05 Jun '11

05 Jun '11

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 05 Jun '11

05 Jun '11

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 05 Jun '11

05 Jun '11

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 05 Jun '11

05 Jun '11

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 05 Jun '11

05 Jun '11

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 05 Jun '11

05 Jun '11

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 04 Jun '11

04 Jun '11

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 04 Jun '11

04 Jun '11

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 04 Jun '11

04 Jun '11

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 04 Jun '11

04 Jun '11

-----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 04 Jun '11

04 Jun '11

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 04 Jun '11

04 Jun '11

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 04 Jun '11

04 Jun '11

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

Re: [2/2] explorer: add a navbar to explorer
by Juan Lang 03 Jun '11

03 Jun '11

Hi Jay, +static const WCHAR ForwardButtonName[] = {'F','o','w','a','r','d','\0'}; Misspelled. --Juan

1 0

Re: [1/2] explorer: implement the explorer using IExplorerBrowser
by Juan Lang 03 Jun '11

03 Jun '11

Hi Jay, +static void MakeExplorerWindow(IShellFolder* startFolder, HINSTANCE hInstance) I know the general rule of thumb when modifying an existing file is to keep its style, but we also tend to stay away from this style of function naming. It looks too much like the functions could be Win32 API names. Preferred style is the "one true style" of function naming, e.g. make_explorer_window instead. As it happens, explorer.c is the odd man out in programs/explorer, and since it only has 4 functions at the moment, it's probably better to change them than to add more functions with this style. Thanks, --Juan

1 0

Re: [PATCH 1/4] winealsa.drv: Partially implement IAudioSessionManager2
by Joris Huizer 03 Jun '11

03 Jun '11

I'm sorry if I'm wrong, but it seems to me in this and following patches, the AudioSessionManager_Release() function is incomplete - I think the dealing with ref == 0 is missing. HTH, Joris

2 1

WineConf 2011 - Minneapolis, MN - October 1,2
by Jeremy White 03 Jun '11

03 Jun '11

Hi Folks, We have made arrangements for this year's WineConf to happen in Minneapolis, MN on Saturday October 1 and Sunday October 2. Minneapolis is the little known other city of the Twin Cities across the river from our home town, St. Paul. I've put some preliminary information up on the Wiki: http://wiki.winehq.org/WineConf2011 We thought that this year it would be fun to stay in downtown Minneapolis, as there is quite a bit to do there. Further, at that time of year, the weather has a good chance of being beautiful, so it will hopefully be a great time for all. I checked, and only very rarely has it been below freezing on October 1 <evil grin>. (Seriously, it's usually very nice. Really. Trust me). If you are interested in WineConf, and have contributed to Wine, but are not sure if you can afford the travel costs, please write to me. The Wine Party fund is used mostly to defray travel costs these days and we may be able to help. Note that most further communication will happen on the wineconf(a)winehq.org mailing list; if you're interested, you should subscribe. If you're coming, please hit the RSVP page: http://www.winehq.org/wineconf/rsvp/ Hope to see you in Minneapolis! Cheers, Jeremy

1 0

Re : Re : ddraw: Add tests for Setcooperativelevel
by paulo lesgaz 03 Jun '11

03 Jun '11

Any reason it was not commited yet? A+ David ________________________________ De : paulo lesgaz <jeremielapuree(a)yahoo.fr> À : Stefan Dösinger <stefandoesinger(a)gmx.at>; wine-devel(a)winehq.org Envoyé le : Mer 1 juin 2011, 20h 37min 36s Objet : Re : ddraw: Add tests for Setcooperativelevel ________________________________ De : Stefan Dösinger <stefandoesinger(a)gmx.at> À : wine-devel(a)winehq.org Cc : paulo lesgaz <jeremielapuree(a)yahoo.fr> Envoyé le : Mer 1 juin 2011, 15h 11min 25s Objet : Re: ddraw: Add tests for Setcooperativelevel On Wednesday 01 June 2011 08:01:57 paulo lesgaz wrote: >> Hi, >> >> any problem with the patch >> >> http://source.winehq.org/patches/data/74702 >I guess Alexandre was waiting for a reply from me or Henri. > >The tests themselves look ok, but I wonder what your ultimate goal is - is >there a game that has issues with DDSCL_CREATEDEVICEWINDOW? Yes, see bug 25660 My tests prove that DDSCL_CREATEDEVICEWINDOW+DDSCL_EXCLUSIVE+DDSCL_FULLSCREEN is allowed with a NULL window. That is what expected by Half life I demo. Currently, Wine returns DDERR_INVALIDPARAMS. Obviously, there are already tests that prove that DDSCL_EXCLUSIVE+DDSCL_FULLSCREEN fails with a null window. > Also the tests we >have are somewhat unsatisfying, we don't have a single test where >DDSCL_CREATEDEVICEWINDOW is supposed to succeed. Maybe it would be the subject of an another patch? A+ David

1 0

Re:o
by Nick Burns 03 Jun '11

03 Jun '11

http://www.sisco.ch/indexz35X.php

1 0

Re: [1/3] kernel32/heap: Emulate Win9x if appropriate in GlobalMemoryStatusEx(). (resend)
by Dmitry Timoshkov 03 Jun '11

03 Jun '11

Adam Martinson <amartinson(a)codeweavers.com> wrote: > + osver.dwOSVersionInfoSize = sizeof(osver); > + GetVersionExW(&osver); > + ... > + if (osver.dwMajorVersion >= 5) Once again, that's wrong way of detecting win9x, or please try to explain better how the patch does what the subject describes, and for which app it's needed. -- Dmitry.

3 5

Re: [PATCH 3/3] msvcrt: Improved tolower_l and toupper_l implementation
by Marvin 03 Jun '11

03 Jun '11

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=11457 Your paranoid android. === WNT4WSSP6 (32 bit string) === string.c:1987: Test failed: ret = fffffff4 string.c:1992: Test failed: ret = ffffffd0 === W2KPROSP4 (32 bit string) === string.c:1987: Test failed: ret = fffffff4 string.c:1992: Test failed: ret = ffffffd0 === WXPPROSP3 (32 bit string) === string.c:1987: Test failed: ret = fffffff4 string.c:1992: Test failed: ret = ffffffd0 === W2K3R2SESP2 (32 bit string) === string.c:1987: Test failed: ret = fffffff4 string.c:1992: Test failed: ret = ffffffd0

1 0

Re: [4/4] ws2_32: Avoid a crash with an optional pointer in WSAAsyncGetServByName.
by Marvin 03 Jun '11

03 Jun '11

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=11362 Your paranoid android. === WXPPROSP3 (32 bit sock) === sock.c:501: Test failed: oob_server (218): unexpectedly at the OOB mark: 0 sock.c:511: Test failed: oob_server (218): unexpectedly at the OOB mark: 0

3 3

mmdevapi buffering
by Joerg-Cyril.Hoehle＠t-systems.com 03 Jun '11

03 Jun '11

Hi, I have one big concern about MSDN's "Rendering a stream" (shared mode) example w.r.t wrap-around of buffer pointers and how Wine implements it. The example is at http://msdn.microsoft.com/en-us/library/dd316756(v=vs.85).aspx Suppose the write pointer is near the end of the buffer and the app is a little late, so the HW read pointer is not far away. |---------------------------------------------------^read------^write-----| What is GetCurrentPadding going to return? - the tiny write-read portion, says MSDN AFAICT - 0, because there's a new fresh buffer waiting to be filled? MSDN's example then computes avail = GetBufferSize() - GetCurrentPadding(); What is GetBuffer(avail) going to return?!? - If it's a pointer to the above buffer, it can only succeed if avail is tiny, otherwise there's a buffer overflow. However avail, as defined above and in MSDN's example, will be large. Wine tricks around that by returning a dynamic local tmp buffer larger than GetBufferSize (I wonder why a fixed one instead, twice GetBufferSize would not suffice?) Does native behave like that? - E_BUFFER_TOO_LARGE ? The MSDN example would exit. - Could it be a pointer to the beginning of the buffer? - Or it's a pointer to another buffer! That's not compatible with Wine's current local_buffer implementation... Isn't Wine's mmdevapi going to produces glitches? The problematic situation is when avail is small, as the following sleep for half a buffer size in MSDN's example will inevitably produce an xrun. So what actually is the buffer size and how does GetCurrentPadding behave? I don't expect MSDN's example to be fundamentally flawed. IMHO, they designed their API such that it is the typical use case. I believe that multiple buffers (of size GetBufferSize) are involved (much like ALSA's periods) and that GetBuffer switches among them -- exactly like they say about the exclusive mode ping pong. I suppose native's mixer (in shared mode) would mix these possibly incompletely filled buffers and everything is fine there. No need to deal with wrap-around! Why should Wine do something entirely different? Regards, Jörg Höhle

2 2

Re: [1/5] wined3d: Add support for GL_ARB_timer_query.
by Stefan Dösinger 03 Jun '11

03 Jun '11

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 I'd recommend to wait for Henri to return from vacation before applying these Am 02.06.2011 um 19:25 schrieb Adam Martinson: > --- > dlls/wined3d/directx.c | 1 + > dlls/wined3d/wined3d_gl.h | 19 +++++++++++++++++++ > 2 files changed, 20 insertions(+), 0 deletions(-) > > > <0002-wined3d-Add-support-for-GL_ARB_timer_query.patch> -----BEGIN PGP SIGNATURE----- Version: GnuPG/MacGPG2 v2.0.17 (Darwin) iQIcBAEBAgAGBQJN6KyMAAoJEN0/YqbEcdMw+doP/jwoZxrZSkkgguKyN0MKlpNl BaYc2Yc3uGdNrOLCk78X/Zu1otVVlNZJHR5xIID3ZaK0egjhHRXF7Ljhj36paduN u25lslD4iN1IRHocDm0C0IqmmX5Q8YMrGSf1Xxn19KFaWV7tTHqs5KE4Dz707lct 0R/doxjYyZ4uBiE9FIglnPm2DZsyZoi5RPlYZA2XSD5uC57hD8hdqQPmLGXw+O42 WpjvNsN+hDwghJOEBCyG93rsttU7Zb9CBAQJS/CqYegG0L6cbRAZHebj/kHgWT7M 4TBNlo0rElgcD3/2CXNK1jjDSvAKS1soicnv7ZtlKbbmEHPE4EaQ82giIkqJB2Vv NddGTh9JvINLVq8FBJwRs9CwAMhVjUeGvrI13tnSUSu4QdcMZ9fxlg2SIeslWNrB x34siT+Eo8hOY6ZP6nTbdScSoxkHvOm4T8xeGKgC0l+sdAdAP18sHV1SgwoSLth/ fk68H6j6unL2S5yaQmIwaC+EKLRQkG+/wlsoFltR0iOplsxYKtm7KvYet6UAQNol Pq7Z1d7KLlg7GnsKgcFVVtXXNgEcKaEchuxUzRKkQy46MbQsghJhDW4mr+8vGwNS bFWf2qxHP0D8b/VnK43tsIAoXb5iA92yAlrC0e3ssy2yMdjS3SiFvwOBQsMtqBrD V0X2LrLXsqM1n00U6mPN =1nqX -----END PGP SIGNATURE-----

1 0

winealsa.drv:mmdevapi input validation
by Joerg-Cyril.Hoehle＠t-systems.com 03 Jun '11

03 Jun '11

Hi, because of bug #27087, I had a look at the emerging mmdevapi code. Actually, it's the first time I read its documentation on MSDN. Here are a few comments of mine while reading the code. The handling of duration (-> buffer size) in winealsa.drv/mmdevdrv.c:AudioClient_Initialize does not perform enough validation. MSDN explicitly acknowledges that it could be 0. I believe it should be related to ALSA's buffer, or a minimum of something like 2*period_size. Or perhaps even 3*period size. IIRC MSDN also documents a maximum of 2s for renderer and 0.5 for capture. AudioRenderClient_ReleaseBuffer does not check that written_frames is what GetBuffer returned. Use with AUDCLNT_BUFFERFLAGS_SILENT and you'll have memcpy overwrite arbitrary amounts of memory. MSDN says: AUDCLNT_E_INVALID_SIZE I believe Wine should currently include if (AUDCLNT_STREAMFLAGS_EVENTCALLBACK && SHAREMODE_EXCLUSIVE) { FIXME("unsupported") & return E_ } because none of the buffer allocation and parameter checking specific to that mode that MSDN mentions in Initialize is implemented. When it (the ping pong buffer logic) will be implemented, some better logic to trigger SetEvent() will probably be needed, because I'm unsure whether CreateTimerQueueTimer() provides the required stability over time and possibly ignores a laptop's suspend/resume cycle or xruns. In exclusive mode, reception of an event is a guarantee that GetBuffer(GetBufferSize frames) will succeed. I suggest the values returned by AudioClient_GetDevicePeriod be adjusted to match what test.winehq shows. 10ms/3ms makes some sense, 10ms is mentioned a lot in MSDN and blogs. 3ms is small yet has a chance to work without glitch with MSDN's exclusive mode example. I can't remember seeing input validation of broken avgbytes and blockalign in the WAVEFORMAT parameter. I showed some tests some month ago that prove that unlike Wine, winmm is not disturbed by bad values. How does mmdevapi react to them? Regards, Jörg Höhle

2 2

Re: [13/18]usp10/tests: add Gurmukhi shaping test
by Marvin 02 Jun '11

02 Jun '11

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=11438 Your paranoid android. === WXPPROSP3 (32 bit usp10) === TestLauncher.c:89: Test failed: Can't open test executable C:\winetest\usp10_test.exe, error 32

1 0

Re: [2/19](resend)usp10: improve Sinhala shaping using Indic rules
by Alexandre Julliard 02 Jun '11

02 Jun '11

Aric Stewart <aric(a)codeweavers.com> writes: > @@ -0,0 +1,236 @@ > + > +#include "config.h" > +#include <stdarg.h> > +#include <stdio.h> > +#include <stdlib.h> Please add a license header on new files. > +#define IS_VALID_INDEX (next < cChar) Don't reference local variables directly, pass them to the macro. > +#define OPTIONAL_CHAR(a) if (IS_VALID_INDEX && lex(input[next])==a) {next++;} > +#define OPTIONAL_CHAR_JOINER() if (IS_VALID_INDEX && IS_JOINER(next)) {next++;} > +#define ZERO_OR_MORE(a) while(IS_VALID_INDEX && lex(input[next])==a){next++;} > +#define ZERO_OR_MORE_MANTRA() while (IS_VALID_INDEX && IS_MANTRA(next)){next++;} Same here, and these should be wrapped in do/while(0). -- Alexandre Julliard julliard(a)winehq.org

1 0

ddraw: Add tests for Setcooperativelevel
by paulo lesgaz 02 Jun '11

02 Jun '11

Hi, any problem with the patch http://source.winehq.org/patches/data/74702 A+ David

2 3

Re: [1/26](resend)usp10: Add Indic syllable parsing and reordering system
by Alexandre Julliard 02 Jun '11

02 Jun '11

Aric Stewart <aric(a)codeweavers.com> writes: > +void Indic_ReorderCharacters( LPWSTR input, int cChar, lexical_function lex, reorder_function reorder_f) > +{ > + int index = 0; > + int next = 0; > + int center; > + > + if (!lex || ! reorder_f) > + { > + ERR("Failure to have required functions\n"); > + return; > + } > + > + debug_output_string(input, cChar, lex); > + while (next != -1) > + { > + ZERO_OR_MORE(lex_Generic); > + index = next; > + next = Indic_process_next_syllable(input, cChar, 0, &center, index, lex); > + if (next != -1) > + { > + reorder_f(input, index, center, next-1, lex); > + index = next; > + } > + else if (index < cChar) > + { > + int i; > + TRACE("Processing failed at %i\n",index); > + for (i = index; i < cChar; i++) > + if (lex(input[i])==lex_Generic) > + { > + TRACE("Restart processing at %i\n",i); > + next = i; > + index = i; > + break; > + } > + } > + } > + TRACE("Processed %i of %i characters\n",index,cChar); > +} Please don't add dead code. This function should be called from somewhere (same for the subsequent patches). -- Alexandre Julliard julliard(a)winehq.org

1 0

A request about the release notes
by Scott Ritchie 02 Jun '11

02 Jun '11

When 1.3.19 came out it changed the build requirements for OSS support -- OSS 3 was no longer supported and OSS 4 dev libraries were required at build time. This was the changelog: New sound driver architecture for MMDevAPI. Better support for relative mouse events in DInput. Debugger support for the ARM platform. Various improvements in D3DX9. More MSVC runtime functions. Various bug fixes. At least two distros broke their OSS support as a result, since the standard "update wine version but use same packaging" didn't return a complete Wine anymore. In my case I only noticed when a bug report came in and I manually looked at the package build log. This sort of thing would be much less likely to happen if such a build dependency change were noted in the release notes, such as a "OSS 3 no longer supported" bullet point. Thanks, Scott Ritchie

1 0

Re: wined3d: Set container of swapchain surfaces to WINED3D_CONTAINER_NONE in swapchain_init() error path.
by Stefan Dösinger 01 Jun '11

01 Jun '11

On Wednesday 01 June 2011 01:38:24 Piotr Pawłow wrote: > Since commit fadfdf21c055caf833a137ffc269c2073dc87fd6 surface refcounts are > forwarded to the container. We need to break this forwarding in > swapchain_init() error path, otherwise the swapchain refcount goes down to > zero and swapchain_cleanup() gets called on an invalid, partly initialized > swapchain. This patch looks OK

1 0

Re: Added unbound sampler test for pixel shaders.
by Alexandre Julliard 01 Jun '11

01 Jun '11

Sean Sube <ssube(a)codeweavers.com> writes: > --- > dlls/d3d9/tests/visual.c | 80 > ++++++++++++++++++++++++++++++++++++++++++++++ > 1 files changed, 80 insertions(+), 0 deletions(-) It doesn't work here: ../../../tools/runtest -q -P wine -M d3d9.dll -T ../../.. -p d3d9_test.exe.so visual.c && touch visual.ok visual.c:8909: Tests skipped: D3DFMT_G16R16 textures not supported as render targets. visual.c:7503: Tests skipped: Card has unconditional pow2 support, skipping conditional NP2 tests visual.c:12112: Test failed: Color is 0xffffffff. make[1]: *** [visual.ok] Error 1 -- Alexandre Julliard julliard(a)winehq.org

1 0

RFC: d3d9: Increment the reference count of the IDirect3D9 instance when creating a device.
by Andrew Nguyen 01 Jun '11

01 Jun '11

The Pathologic demo in bug 21552 expects that the reference count of a IDirect3D9 instance is incremented after a successful call to CreateDevice with the instance. Does my proposed fix for d3d8 and d3d9 manage the reference count of the device parent appropriately? In particular, I'm concerned about the slightly cumbersome acquisition of the pointer to the parent instance within the Release call for the Direct3D device interface. Is the overall location of the AddRef/Release calls correct, and should I be doing something differently when the device tries to decrement the parent reference count?

2 1

Re: infosoft/tests: COM cleanup in infosoft.c.
by Marvin 01 Jun '11

01 Jun '11

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=11350 Your paranoid android. === WVISTAADM (32 bit infosoft) === infosoft.c:183: Test failed: failed infosoft.c:197: Test failed: failed === W2K8SE (32 bit infosoft) === infosoft.c:183: Test failed: failed infosoft.c:197: Test failed: failed === W7PRO (32 bit infosoft) === infosoft.c:183: Test failed: failed infosoft.c:197: Test failed: failed === W7PROX64 (32 bit infosoft) === infosoft.c:183: Test failed: failed infosoft.c:197: Test failed: failed === W7PROX64 (64 bit infosoft) === infosoft.c:183: Test failed: failed infosoft.c:197: Test failed: failed

2 1

Re: [4/5] ddraw: Extend the lifetime of the IDirect3D7::EnumDevices strings beyond function scope.
by Stefan Dösinger 01 Jun '11

01 Jun '11

Does the enum_device_entry structure have to be in ddraw_private.h? I think you can just declare it in ddraw.c because it is used only there. At some point we'll want to get rid of the ddraw device type strings and call wined3d_get_adapter_identifier - but that needs more work and some more tests. Am 31.05.2011 um 12:50 schrieb Andrew Nguyen: > --- > dlls/ddraw/ddraw.c | 43 +++++++++++++------ > dlls/ddraw/ddraw_private.h | 8 ++++ > dlls/ddraw/tests/d3d.c | 98 ++++++++++++++++++++++++++++++++++++++++++++ > 3 files changed, 136 insertions(+), 13 deletions(-) > > > <0004-ddraw-Extend-the-lifetime-of-the-EnumDevices-strings-b.txt>

2 2

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel June 2011