- wine-devel - winehq.org

Re: [04/09]strmbase: implement renderer quality control into the base renderer
by Alexandre Julliard 02 Apr '12

02 Apr '12

Aric Stewart <aric(a)codeweavers.com> writes: > --- > dlls/quartz/dsoundrender.c | 28 ++++++++++------------------ > dlls/quartz/nullrenderer.c | 2 +- > dlls/strmbase/renderer.c | 41 > ++++++++++++++++++++++++++++++++++++++++- > include/wine/strmbase.h | 4 ++++ > 4 files changed, 55 insertions(+), 20 deletions(-) It doesn't work here: ../../../tools/runtest -q -P wine -M quartz.dll -T ../../.. -p quartz_test.exe.so dsoundrender.c && touch dsoundrender.ok dsoundrender.c:155: Test failed: IUnknown_Release should return 1, got 0 wine: Unhandled page fault on execute access to 0x00110118 at address 0x110118 (thread 002b), starting debugger... Unhandled exception: page fault on execute access to 0x00110118 in 32-bit code (0x00110118). Register dump: CS:0023 SS:002b DS:002b ES:002b FS:0063 GS:006b EIP:00110118 ESP:0032fccc EBP:0032fd58 EFLAGS:00010202( R- -- I - - - ) EAX:0012e9c0 EBX:687ee314 ECX:687ea900 EDX:0012f630 ESI:687e8269 EDI:00000000 Stack dump: 0x0032fccc: 687dd8c1 0012e9c0 687ea900 0032fd38 0x0032fcdc: 00000000 687eea78 00000000 00125338 0x0032fcec: 683bd30c 687ec163 683bd30c 0032fd18 0x0032fcfc: 00000000 687ea900 687e8490 687e7e01 0x0032fd0c: 687e82c0 683702d9 684d85f0 0032fd58 0x0032fd1c: 0012e9c0 0012ebe0 00000000 0012a298 Backtrace: =>0 0x00110118 (0x0032fd58) 1 0x687db392 main+0x3a1(argc=0x56a86895, argv=0x11ce0ad4) [/home/julliard/wine/wine/dlls/quartz/tests/../../../include/wine/test.h:556] in quartz_test (0x0032fe28) 2 0x687e7c85 __wine_spec_exe_entry+0x74(peb=0x7ffdf000) [/home/julliard/wine/wine/dlls/winecrt0/exe_entry.c:36] in quartz_test (0x0032fe70) 3 0x6848fdbc call_process_entry+0xb() in kernel32 (0x0032fe88) 4 0x68490f3f start_process+0x5e(peb=0x7ffdf000) [/home/julliard/wine/wine/dlls/kernel32/process.c:1083] in kernel32 (0x0032fec8) 5 0x6837d200 call_thread_func_wrapper+0xb() in ntdll (0x0032fed8) 6 0x6837ff0d call_thread_func+0x7c(entry=0x68490ee0, arg=0x7ffdf000, frame=0x32ffc8) [/home/julliard/wine/wine/dlls/ntdll/signal_i386.c:2532] in ntdll (0x0032ffa8) 7 0x6837d1de call_thread_entry_point+0x11() in ntdll (0x0032ffc8) 8 0x6835530e start_process+0x1d(kernel_start=0x68490ee0) [/home/julliard/wine/wine/dlls/ntdll/loader.c:2653] in ntdll (0x0032ffe8) 9 0x68028a9d wine_call_on_stack+0x1c() in libwine.so.1 (0x00000000) 10 0x68028b5b wine_switch_to_stack+0x2a(func=0x683552f0, arg=0x68490ee0, stack=0x330000) [/home/julliard/wine/wine/libs/wine/port.c:59] in libwine.so.1 (0xff90f428) 11 0x6835ae86 LdrInitializeThunk+0x3b5(kernel_start=0x68490ee0, unknown2=0, unknown3=0, unknown4=0) [/home/julliard/wine/wine/dlls/ntdll/loader.c:2709] in ntdll (0xff90f498) 12 0x68496e02 __wine_kernel_init+0x9e1() [/home/julliard/wine/wine/dlls/kernel32/process.c:1255] in kernel32 (0xff910638) 13 0x6835b5db __wine_process_init+0x25a() [/home/julliard/wine/wine/dlls/ntdll/loader.c:2918] in ntdll (0xff9106b8) 14 0x68025fe8 wine_init+0x277(argc=0x3, argv=0xff910c14, error="", error_size=0x400) [/home/julliard/wine/wine/libs/wine/loader.c:831] in libwine.so.1 (0xff910718) 15 0x7bf00e5b main+0x7a(argc=0x3, argv=0xff910c14) [/home/julliard/wine/wine/loader/main.c:230] in <wine-loader> (0xff910b68) 16 0x681bce46 __libc_start_main+0xe5() in libc.so.6 (0xff910be8) 0x00110118: subb %al,0x0(%ecx) -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: jscript: Fixed parsing /=/ regexp
by Marvin 02 Apr '12

02 Apr '12

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=17637 Your paranoid android. === WNT4WSSP6 (32 bit) === No test summary line found === W2KPROSP4 (32 bit) === No test summary line found === WXPPROSP3 (32 bit) === No test summary line found === W2K3R2SESP2 (32 bit) === No test summary line found === WVISTAADM (32 bit) === No test summary line found === W2K8SE (32 bit) === No test summary line found === W7PRO (32 bit) === No test summary line found === W7PROX64 (32 bit) === No test summary line found === TEST64_W7SP1 (32 bit) === No test summary line found === W7PROX64 (64 bit) === No test summary line found === TEST64_W7SP1 (64 bit) === No test summary line found

1 0

Re: jscript: Emit undefined statement return for switch without default clausule
by Marvin 02 Apr '12

02 Apr '12

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=17636 Your paranoid android. === WNT4WSSP6 (32 bit) === No test summary line found === W2KPROSP4 (32 bit) === No test summary line found === WXPPROSP3 (32 bit) === No test summary line found === W2K3R2SESP2 (32 bit) === No test summary line found === WVISTAADM (32 bit) === No test summary line found === W2K8SE (32 bit) === No test summary line found === W7PRO (32 bit) === No test summary line found === W7PROX64 (32 bit) === No test summary line found === TEST64_W7SP1 (32 bit) === No test summary line found === W7PROX64 (64 bit) === No test summary line found === TEST64_W7SP1 (64 bit) === No test summary line found

1 0

Re: jscript: Emit undefined statement return for switch without default clausule
by Marvin 02 Apr '12

02 Apr '12

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=17636 Your paranoid android. === WNT4WSSP6 (32 bit) === No test summary line found === W2KPROSP4 (32 bit) === No test summary line found === WXPPROSP3 (32 bit) === No test summary line found === W2K3R2SESP2 (32 bit) === No test summary line found === WVISTAADM (32 bit) === No test summary line found === W2K8SE (32 bit) === No test summary line found === W7PRO (32 bit) === No test summary line found === W7PROX64 (32 bit) === No test summary line found === TEST64_W7SP1 (32 bit) === No test summary line found === W7PROX64 (64 bit) === No test summary line found === TEST64_W7SP1 (64 bit) === No test summary line found

1 0

Re: wined3d: Added PCI device IDs for AMD Radeon 6750M & 6770M
by Henri Verbeet 02 Apr '12

02 Apr '12

On 31 March 2012 21:20, Gaurav Jain <gaurav(a)gauravjain.org> wrote: > CARD_AMD_RADEON_HD6600M = 0x6741, > + CARD_AMD_RADEON_HD6750M = 0x6741, If those are actually supposed to be the same, I don't think there's much of a point in this patch.

2 6

Re: [PATCH 1/4] d3drm: Implement IDirect3DRMFrameX_AddChild.
by Jacek Caban 02 Apr '12

02 Apr '12

Hi Christian, On 04/02/12 08:54, Christian Costa wrote: > { > IDirect3DRMFrameImpl *This = impl_from_IDirect3DRMFrame2(iface); > + LPDIRECT3DRMFRAME3 frame; > > - FIXME("(%p/%p)->(%p): stub\n", iface, This, child); > + TRACE("(%p/%p)->(%p)\n", iface, This, child); > > - return E_NOTIMPL; > + if (!child) > + return D3DRMERR_BADOBJECT; > + > + frame = &impl_from_IDirect3DRMFrame2((LPDIRECT3DRMFRAME2)child)->IDirect3DRMFrame3_iface; This should be avoided. See unsafe_impl_from_* at http://wiki.winehq.org/COMGuideline for an example. Jacek

1 0

Re: [PATCH 1/4] dmime: COM cleanup for IDirectMusicPerformance8.
by Christian Costa 02 Apr '12

02 Apr '12

Le 02/04/2012 00:03, Michael Stefaniuc a écrit : > --- > > -static HRESULT WINAPI IDirectMusicPerformance8Impl_MusicToReferenceTime (LPDIRECTMUSICPERFORMANCE8 iface, MUSIC_TIME mtTime, REFERENCE_TIME* prtTime) { > - IDirectMusicPerformance8Impl *This = (IDirectMusicPerformance8Impl *)iface; > +static HRESULT WINAPI IDirectMusicPerformance8Impl_MusicToReferenceTime(IDirectMusicPerformance8 *iface, > + MUSIC_TIME mtTime, REFERENCE_TIME *prtTime) > +{ > + IDirectMusicPerformance8Impl *This = impl_from_IDirectMusicPerformance8(iface); > + > FIXME("(%p, %d, %p): stub\n", This, mtTime, prtTime); > return S_OK; > } > > -static HRESULT WINAPI IDirectMusicPerformance8Impl_ReferenceToMusicTime (LPDIRECTMUSICPERFORMANCE8 iface, REFERENCE_TIME rtTime, MUSIC_TIME* pmtTime) { > - IDirectMusicPerformance8Impl *This = (IDirectMusicPerformance8Impl *)iface; > +static HRESULT WINAPI IDirectMusicPerformance8Impl_ReferenceToMusicTime(IDirectMusicPerformance8 *iface, > + REFERENCE_TIME rtTime, MUSIC_TIME *pmtTime) > +{ > + IDirectMusicPerformance8Impl *This = impl_from_IDirectMusicPerformance8(iface); > + > FIXME("(%p, 0x%s, %p): stub\n", This, wine_dbgstr_longlong(rtTime), pmtTime); > return S_OK; > } > > -static HRESULT WINAPI IDirectMusicPerformance8Impl_IsPlaying (LPDIRECTMUSICPERFORMANCE8 iface, IDirectMusicSegment* pSegment, IDirectMusicSegmentState* pSegState) { > - IDirectMusicPerformance8Impl *This = (IDirectMusicPerformance8Impl *)iface; > +static HRESULT WINAPI IDirectMusicPerformance8Impl_IsPlaying(IDirectMusicPerformance8 *iface, > + IDirectMusicSegment *pSegment, IDirectMusicSegmentState *pSegState) > +{ > + IDirectMusicPerformance8Impl *This = impl_from_IDirectMusicPerformance8(iface); > + > FIXME("(%p, %p, %p): stub\n", This, pSegment, pSegState); > return S_FALSE; > } > > Hi Michael, While you're at it, could you put a 4 spaces indentation to whole method. Christian

2 1

Re: [PATCH 4/4] d3drm: Implement IDirect3DRMFrameX_GetChildren method and IDirect3DRMFrameArray interface.
by Marvin 02 Apr '12

02 Apr '12

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=17632 Your paranoid android. === WNT4WSSP6 (32 bit d3drm) === d3drm.c:467: Test failed: Invalid refcount. Expected 3 got 2 d3drm.c:475: Test failed: Invalid refcount. Expected 4 got 3 d3drm.c:477: Test failed: Invalid refcount. Expected 3 got 2

1 0

Re: [PATCH] wined3d: When releasing resources, don't perform any other operations on device if it has been released.
by Henri Verbeet 02 Apr '12

02 Apr '12

This looks wrong. Is there a legitimate way that this can happen?

2 3

Wine test bot and win16 exe
by Christian Costa 01 Apr '12

01 Apr '12

Hi, I wrote a win16 exe test file using open watcom but I cannot submit it to winebot. I fails saying "Unricognized file type". This is a little annoying. Is this a known limitation of wine test bot ? Thanks Christian

2 1

Re: d3dx9: Implement D3DXCreatePolygon
by Józef Kucia 01 Apr '12

01 Apr '12

On Sun, Apr 1, 2012 at 10:43 PM, David Adam <david.adam.cnrs(a)gmail.com> wrote: > + *mesh = polygon; > + > + if (adjacency) > + { > + hr = D3DXCreateBuffer(3 * sides * sizeof(DWORD), &adjacency_tmp); > + if (FAILED(hr)) return hr; You should release the polygon mesh. Also, you probably shouldn't touch *mesh when the function fails. -- Józef Kucia

1 0

Re: shell32: Added stubs for IMarshal interface (resend)
by Jacek Caban 01 Apr '12

01 Apr '12

Hi Gaurav, On 3/31/12 9:22 PM, Gaurav Jain wrote: > shell32: Added stubs for IMarshal interface (resend) > > Resending due to previous code freeze. > > ShellLink_QueryInterface() did not have a lookup for the IMarshal Interface. This resulted in an error message popping up in the Quest for Glory II (remake) installer. Providing IMarshal interface stubs avoids this error behaviour. > IMarshal is an interface that has serious impact on how the object is handled in RPC calls and the fact that you see better behavior in an app may be very well a side effect of Wine behaving badly, but in a different (more friendly for given application) way. The first question is does the object really implements custom IMarshal implementation on Windows? Cheers, Jacek

2 1

Re: [2/2] gdi32: Simplify font cache. (try 2)
by Alexandre Julliard 01 Apr '12

01 Apr '12

Kusanagi Kouichi <slash(a)ac.auone-net.jp> writes: > @@ -1516,23 +1464,8 @@ static void add_face_to_cache(Face *face) > RegSetValueExW(hkey_face, face_full_name_value, 0, REG_SZ, (BYTE*)face->FullName, > (strlenW(face->FullName) + 1) * sizeof(WCHAR)); > > - reg_save_dword(hkey_face, face_index_value, face->face_index); > - reg_save_dword(hkey_face, face_italic_value, (face->ntmFlags & NTM_ITALIC) != 0); > - reg_save_dword(hkey_face, face_bold_value, (face->ntmFlags & NTM_BOLD) != 0); > - reg_save_dword(hkey_face, face_version_value, face->font_version); > - reg_save_dword(hkey_face, face_external_value, face->external); > - > - RegSetValueExW(hkey_face, face_font_sig_value, 0, REG_BINARY, (BYTE*)&face->fs, sizeof(face->fs)); > + RegSetValueExW(hkey_face, face_value, 0, REG_BINARY, (BYTE*)face, sizeof *face); I don't think that's a good idea. There are many things in the structure that don't make sense to have in the registry. Also this won't work on 64-bit. -- Alexandre Julliard julliard(a)winehq.org

2 2

Re: d3dx9_36: Implement D3DXSHDot
by Rico Schüller 01 Apr '12

01 Apr '12

Am 01.04.2012 04:33, schrieb David Adam: + * Order is not limited by D3DXSH_MINORDER and D3DXSH_MAXORDER! + * All values will work, test from 0-7 [D3DXSH_MINORDER = 2, D3DXSH_MAXORDER = 6] + * Exceptions will show up when out, in1 or in2 are NULL + */ + for (k = 0; k < 8; k++) Where is the variable out? Cheers Rico

1 0

Re: msi: add support for MSIRUNMODE_REBOOTNOW in MsiGetMode
by Hans Leidekker 31 Mar '12

31 Mar '12

On Fri, 2012-03-30 at 17:27 -0700, Austin English wrote: > + case MSIRUNMODE_REBOOTNOW: > + r = package->need_reboot; > + break; > + MSIRUNMODE_REBOOTNOW and MSIRUNMODE_REBOOTATEND are not the same thing.

2 1

Re: quartz: update ICOM_THIS_MULTI to follow the new COM standard
by Jacek Caban 31 Mar '12

31 Mar '12

On 03/30/12 17:55, Aric Stewart wrote: > diff --git a/dlls/quartz/quartz_private.h b/dlls/quartz/quartz_private.h > index 35cd52b..d2f680c 100644 > --- a/dlls/quartz/quartz_private.h > +++ b/dlls/quartz/quartz_private.h > @@ -38,7 +38,7 @@ > #define BYTES_FROM_MEDIATIME(time) SEC_FROM_MEDIATIME(time) > #define MSEC_FROM_MEDIATIME(time) ((time) / 10000) > > -#define ICOM_THIS_MULTI(impl,field,iface) impl* const This=(impl*)((char*)(iface) - offsetof(impl,field)) > +#define ICOM_THIS_MULTI(impl,field,iface) impl* const This=CONTAINING_RECORD(iface, impl, field) These should disappear once the clean up of affected code is done. Cheers, Jacek

3 5

Re: Wine release 1.5.1
by mike＠yurick.ca 30 Mar '12

30 Mar '12

I am no longer using this e-mail. Please contact me for my new e-mail address. Thank you, Mike

1 0

Re: jscript: Fixed jsheap_grow implementation
by Marvin 30 Mar '12

30 Mar '12

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=17589 Your paranoid android. === WNT4WSSP6 (32 bit) === No test summary line found === W2KPROSP4 (32 bit) === No test summary line found === WXPPROSP3 (32 bit) === No test summary line found === W2K3R2SESP2 (32 bit) === No test summary line found === WVISTAADM (32 bit) === No test summary line found === W2K8SE (32 bit) === No test summary line found === W7PRO (32 bit) === No test summary line found === W7PROX64 (32 bit) === No test summary line found === TEST64_W7SP1 (32 bit) === No test summary line found === W7PROX64 (64 bit) === No test summary line found === TEST64_W7SP1 (64 bit) === No test summary line found

1 0

[PATCH 3/3] dmsynth: Put port caps that match native ones.
by Joerg-Cyril.Hoehle＠t-systems.com 30 Mar '12

30 Mar '12

Hi, Andrew Eikum asked Christian Costa: >Just to be clear, which "native" do you mean? Does this match Windows >7's dmusic behavior, or something else? I've been trying to target >Windows 7's behavior in the new audio design. A w7 target makes a lot of sense for mmdevapi/WASAPI. However, isn't DMusic a thing of the past? In that case, I argue that DSound and DMusic should target the "best in class" native OS of the time where apps were written using these APIs, because the app writers "optimized" their apps to the behaviour they could observe. Wouldn't "best in class" mean XP for DSound/DMusic? For similar reasons, the MCI should mimic w9x(/wxp) behaviour, because that's what was available when apps using the MCI were developed. I prefer to hear "thank you guys, app X works like a charm in Wine like it worked on my rusty w98 and later xp box, whereas it refuses to run on w7" rather than "you guys do a great job of making my app X worked as badly in Wine as in w7 :-( whereas it used to work fine on my w98/xp machine". Actually, there are quite a few AppDB comments like the first one. One reason might be that the dlls those app use were added to Wine at a time where the target OS was w9x or xp, whereas if they were written now, targeting w7, the old app would not work in Wine either. A related topic is: we have no idea what the "set compatibility for wXY" checkbox in w7 does. Recently, I discovered that "Age of Empires II - Conquerors" only plays videos on a w7 machine when you set w7 to xp compatibility. Why? The rest of the app seems to work (except for the purple grass issue, which requires a particular DirectDraw compatibility registry entry in w7). Did AoE target w7 when it was written? Obviously not. Regards, Jörg Höhle

2 1

Re: jscript: Add VT_I2 support (try 2)
by Jacek Caban 30 Mar '12

30 Mar '12

Hi Alistair, On 03/30/12 12:29, Alistair Leslie-Hughes wrote: > Hi, > > > Changelog: > jscript: Add VT_I2 support > hres = IDispatchEx_InvokeEx(dispex, id, ctx->lcid, flags, dp, retv, &ei->ei, &ctx->jscaller->IServiceProvider_iface); + if(SUCCEEDED(hres) && retv) + { + if(V_VT(retv) == VT_I2) + VariantChangeType(retv, retv, 0, VT_I4); + } Since the conversion here is trivial, why not do it directly? --- a/dlls/jscript/jsutils.c +++ b/dlls/jscript/jsutils.c @@ -191,6 +191,10 @@ HRESULT to_primitive(script_ctx_t *ctx, VARIANT *v, jsexcept_t *ei, VARIANT *ret case VT_R8: *ret = *v; break; + case VT_I2: + V_VT(ret) = VT_I4; + V_I4(ret) = V_I2(v); + break; I thought the findings we've discussed off-list was that internal values should never be of VT_I2 types, so this should never happen. If it's not the case, I'd like to see a test case. +function TestVT_I2() +{ + varI2 = GetShort(); + num3 = 3 + + ok(getVT(varI2) === "VT_I4", "getVT(varI2) = " + getVT(varI2)); Please include getVT(GetShort()) test I've showed you. This eliminates a lot of flow of value. + if(!strcmp_wa(bstrName, "GetShort")) { + *pid = DISPID_GLOBAL_SHORT; + return S_OK; + } Please follow JavaScript names convention (this should be getShort). Cheers, Jacek

1 0

Re: [2/2] scrrun: Add scrrun tests (try 3)
by Marvin 30 Mar '12

30 Mar '12

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=17581 Your paranoid android. === WINEBUILD (build) === Make failed

1 0

Re: gdi32: Add support for loading scalable font resources.
by Dmitry Timoshkov 30 Mar '12

30 Mar '12

Huw Davies <huw(a)codeweavers.com> wrote: > + if (size.u.LowPart < sizeof( *dos )) goto fail; Testing LowPart only could not work for large sizes. -- Dmitry.

2 2

Re: [PATCH 2/3] dmsynth: Check the rigth CLSID to create the DirectMusicSynthSink object.
by Marvin 29 Mar '12

29 Mar '12

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=17568 Your paranoid android. === WNT4WSSP6 (32 bit dmsynth) === dmsynth.c:39: Test failed: CoCreateInstance returned: 80040154 dmsynth.c:42: Test failed: CoCreateInstance returned: 80040154 === W2KPROSP4 (32 bit dmsynth) === dmsynth.c:39: Test failed: CoCreateInstance returned: 80004002 dmsynth.c:42: Test failed: CoCreateInstance returned: 80004002 === W2K3R2SESP2 (32 bit dmsynth) === dmsynth.c:39: Test failed: CoCreateInstance returned: 80040154 dmsynth.c:42: Test failed: CoCreateInstance returned: 80040154 === W2K8SE (32 bit dmsynth) === dmsynth.c:39: Test failed: CoCreateInstance returned: 80040154 dmsynth.c:42: Test failed: CoCreateInstance returned: 80040154

1 0

Re: [PATCH 1/3] dmsynth: Add basic tests.
by Marvin 29 Mar '12

29 Mar '12

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=17567 Your paranoid android. === WNT4WSSP6 (32 bit dmsynth) === dmsynth.c:39: Test failed: CoCreateInstance returned: 80040154 dmsynth.c:42: Test failed: CoCreateInstance returned: 80040154 === W2KPROSP4 (32 bit dmsynth) === dmsynth.c:39: Test failed: CoCreateInstance returned: 80004002 dmsynth.c:42: Test failed: CoCreateInstance returned: 80004002 === W2K3R2SESP2 (32 bit dmsynth) === dmsynth.c:39: Test failed: CoCreateInstance returned: 80040154 dmsynth.c:42: Test failed: CoCreateInstance returned: 80040154 === W2K8SE (32 bit dmsynth) === dmsynth.c:39: Test failed: CoCreateInstance returned: 80040154 dmsynth.c:42: Test failed: CoCreateInstance returned: 80040154

1 0

Re: [PATCH 3/3] d3drm: Implement CreateMesh method and stubbed IDirect3DRMMesh interface.
by Michael Stefaniuc 29 Mar '12

29 Mar '12

Hello Christian, On 03/29/2012 11:57 PM, Christian Costa wrote: > +HRESULT Direct3DRMMesh_create(REFIID riid, IUnknown** ppObj) > +{ > + IDirect3DRMMeshImpl* object; > + > + TRACE("(%p)\n", ppObj); > + > + object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirect3DRMMeshImpl)); > + if (!object) > + { > + ERR("Out of memory\n"); > + return E_OUTOFMEMORY; > + } > + > + object->IDirect3DRMMesh_iface.lpVtbl = &Direct3DRMMesh_Vtbl; > + object->ref = 1; > + > + if (IsEqualGUID(riid, &IID_IDirect3DRMMesh)) > + *ppObj = (IUnknown*)&object->IDirect3DRMMesh_iface; > + else > + *ppObj = (IUnknown*)&object->IDirect3DRMMesh_iface; both if and else code path are the same. > + > + return S_OK; > +} > + bye michael

2 1

Would like to get some feedback on GSOC idea
by M C 29 Mar '12

29 Mar '12

Hi everyone, My name is Marek Chmiel, I am a student a NEIU. I am studying computer science and network security related topics. This semester I had spent a fair amount of time writing crypt related functions with java, and became very interested in Cryptography. After looking over the suggested ideas on SOC official wine wiki I was pleasantly surprised to see that there was already a crypt related idea suggested. I have a great understanding of c++ and java, and though I know c I have not worked with it as much as the other languages. Implementing a DSS provider sounds like an awesome task to tackle, if someone has never written code for Linux, can they take on such a task? Are there any significant issues implementing a DSS that you guys know about? Any crypt GSOC ideas would you suggest for someone who has wrote limited amount of code for Linux? What I would also like to do, besides implementing a DSS provider, is to fix most if not all of the crypt related bugs that remain in Wine. This might seem like more than most people can chew, but viewing the Bug Tracking database it appears that there aren't that many crypt related bugs and might even be caused by a lack of a DSS provider (Hopefully this wouldn't create a entire new series of bugs). Thanks for any input I might receive, and look forward to speaking with you all. I can also be found on the irc for development with the nick "MarcoVonChmiel". Marek K Chmiel.

2 1

Implementing a DSS provider
by M C 29 Mar '12

29 Mar '12

Hello everyone, I am doing some research in regards GSOC, and would like to find out if anyone besides Juan Lang is experienced enough to make suggestions in regards to bug 10506 and/or the implementation of a DSS provider.

1 0

Re: [PATCH 2/5] dmusic: Enumerate ports for midi out and midi in devices in EnumPort.
by Alexandre Julliard 29 Mar '12

29 Mar '12

Christian Costa <titan.costa(a)gmail.com> writes: > With this patch I get exactly the same output for ports caps (except guid) as native. > I kept the comment regarding dmusic32 usage altough the native version > of dmusic I used does standard winmm calls to get port informations. > --- > dlls/dmusic/Makefile.in | 2 - > dlls/dmusic/dmusic.c | 120 ++++++++++++++++++++++++++++++++--------------- > 2 files changed, 82 insertions(+), 40 deletions(-) It doesn't work here: ../../../tools/runtest -q -P wine -M dmime.dll -T ../../.. -p dmime_test.exe.so performance.c && touch performance.ok performance.c:111: Test failed: Got unexpected portcaps struct size: 00000004 make[1]: *** [performance.ok] Error 1 -- Alexandre Julliard julliard(a)winehq.org

2 1

Re: MsiGetFileHash
by Hans Leidekker 29 Mar '12

29 Mar '12

On Thu, 2012-03-29 at 18:29 +0200, Robert van Herk wrote: > + mapping = CreateFileMappingW( handle, NULL, PAGE_READONLY, 0, 0, NULL ); > + if (mapping) > + { > + p = MapViewOfFile( mapping, FILE_MAP_READ, 0, 0, length ); > + if (p) > + { > + MD5_CTX ctx; > + > + MD5Init( &ctx ); > + MD5Update( &ctx, p, length ); > + MD5Final( &ctx ); > + UnmapViewOfFile( p ); > + > + memcpy( pHash->dwData, ctx.digest, sizeof pHash->dwData ); > + r = ERROR_SUCCESS; > + } > + CloseHandle( mapping ); > + } > + } else { > + /* Empty file -> set hash to 0 */ > + memset( pHash->dwData, 0, sizeof pHash->dwData ); > + r = ERROR_SUCCESS; > } > + > CloseHandle( handle ); Please use 4 space indentation and put brackets on a new line like in the rest of that function. Same for the test. Please also provide a more descriptive subject line and prefix it with "msi: "

1 0

SoC 2012 Ideas
by Charles Davis 29 Mar '12

29 Mar '12

Hi, Since I graduate this year, this may be the last time I participate--or at least, attempt to participate, since last year didn't quite work out for me :(--in Summer of Code. (I realize I was supposed to email you last week, but what's done is done.) So, without further ado, here's what I'm proposing: 1) Make Wine use App Sandbox on Mac OS X. A project that used to be listed on the SoC ideas page was to implement proper sandboxing in Wine. Apparently, you think this is unrealistic, because you took it down. (Not the page, just that suggestion.) But, I think that if I narrowed my focus a bit, it could be possible to do this. I'm proposing using the Mac OS App Sandbox API--the beginnings of which were introduced in 10.5 and which came into its own in 10.7--to improve security of Wine on Mac OS. Wine is an excellent candidate for the App Sandbox, because most of its file-system activity is limited to a single directory--namely, the Wine prefix. I'm not sure what you think of this, though, so I'm throwing this out there to get feedback. At the very least, I would like to be able to limit Wine's file-system activity to the prefix. 2) HLSL compiler. Well, my D3D bytecode backend to LLVM didn't pan out like I'd hoped. Maybe an LLVM-based compiler is too complex for Wine right now. But perhaps we don't need it right now anyway. If CodeWeavers can't afford to pay me, maybe Google can. I can add a simple parser and compiler (that performs little or no optimization) that hopefully would be sufficient for Wine's purposes. 3) Integrate pieces of DCE/RPC into Wine. As you may or may not know, in Mac OS 10.7, Apple stopped using Samba (probably because it uses the GPL3 as its license) in favor of their own implementation--which just so happens to be based on the original DCE/RPC implementation (the same one that was used as a base for MS RPC). I figured we could cannibalize pieces of it for our own use. Or is that not acceptable? What do you think? I'm not sure how useful or feasible these are, so I'm posting to the list before. Chip

2 1

Re: [PATCH 3/3] (try2) gdi32: Add support for loading scalable font resources.
by Alexandre Julliard 29 Mar '12

29 Mar '12

Huw Davies <huw(a)codeweavers.com> writes: > --- > dlls/gdi32/font.c | 75 +++++++++++++++++++++++++++++++++++++++++++++++++++++ > 1 files changed, 75 insertions(+), 0 deletions(-) This one doesn't build: gcc -m32 -c -I. -I. -I../../include -I../../include -I/usr/include/freetype2 -D__WINESRC__ -D_GDI32_ -D_REENTRANT -fPIC -Wall -pipe -fno-strict-aliasing -Wdeclaration-after-statement -Wempty-body -Wignored-qualifiers -Wstrict-prototypes -Wtype-limits -Wunused-but-set-parameter -Wwrite-strings -fno-omit-frame-pointer -Wpointer-arith -Wlogical-op -Werror -I/usr/include/freetype2 -g -O2 -o font.o font.c font.c: In function ‘AddFontResourceExW’: font.c:3498:59: error: ‘count’ may be used uninitialized in this function [-Werror=uninitialized] font.c:3475:36: note: ‘count’ was declared here cc1: all warnings being treated as errors make[1]: *** [font.o] Error 1 Admittedly count would always be initialized with the files we create, but we probably shouldn't rely on that. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH 2/5] dmusic: Enumerate ports for midi out and midi in devices in EnumPort.
by Andrew Eikum 29 Mar '12

29 Mar '12

On Thu, Mar 29, 2012 at 08:52:45AM +0200, Christian Costa wrote: > + midiOutGetDevCapsW(index - 1, &caps, sizeof(caps)); > ... > + CoCreateInstance(&CLSID_DirectMusicSynth, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicSynth8, (void**)&synth); > + IDirectMusicSynth8_GetPortCaps(synth, port_caps); Maybe I'm pickier than most people, but I like error checking on these sorts of calls. They make it easier to find what is happening when something goes terribly and unexpectedly wrong.

2 2

Re: [PATCH 5/5] dmusic: Implement partially SetDirectSound.
by Andrew Eikum 29 Mar '12

29 Mar '12

It would be nice to see some tests for this. For example, how does this IDirectSound reference relate to the one created by IDirectMusicPerformance::InitAudio()? On Thu, Mar 29, 2012 at 08:53:10AM +0200, Christian Costa wrote: > > --- > dlls/dmusic/dmusic.c | 27 +++++++++++++++++++++------ > dlls/dmusic/dmusic_private.h | 2 ++ > 2 files changed, 23 insertions(+), 6 deletions(-) > > diff --git a/dlls/dmusic/dmusic.c b/dlls/dmusic/dmusic.c > index 8f2edea..60d6b8a 100644 > --- a/dlls/dmusic/dmusic.c > +++ b/dlls/dmusic/dmusic.c > @@ -52,19 +52,22 @@ static ULONG WINAPI IDirectMusic8Impl_AddRef (LPDIRECTMUSIC8 iface) { > return refCount; > } > > -static ULONG WINAPI IDirectMusic8Impl_Release (LPDIRECTMUSIC8 iface) { > +static ULONG WINAPI IDirectMusic8Impl_Release(LPDIRECTMUSIC8 iface) > +{ > IDirectMusic8Impl *This = (IDirectMusic8Impl *)iface; > ULONG refCount = InterlockedDecrement(&This->ref); > > TRACE("(%p)->(ref before=%u)\n", This, refCount + 1); > > if (!refCount) { > + if (This->dsound) > + IDirectSound_Release(This->dsound); > HeapFree(GetProcessHeap(), 0, This->ppPorts); > HeapFree(GetProcessHeap(), 0, This); > } > > DMUSIC_UnlockModule(); > - > + > return refCount; > } > > @@ -257,10 +260,22 @@ static HRESULT WINAPI IDirectMusic8Impl_GetDefaultPort (LPDIRECTMUSIC8 iface, LP > return S_OK; > } > > -static HRESULT WINAPI IDirectMusic8Impl_SetDirectSound (LPDIRECTMUSIC8 iface, LPDIRECTSOUND pDirectSound, HWND hWnd) { > - IDirectMusic8Impl *This = (IDirectMusic8Impl *)iface; > - FIXME("(%p, %p, %p): stub\n", This, pDirectSound, hWnd); > - return S_OK; > +static HRESULT WINAPI IDirectMusic8Impl_SetDirectSound(LPDIRECTMUSIC8 iface, LPDIRECTSOUND dsound, HWND wnd) > +{ > + IDirectMusic8Impl *This = (IDirectMusic8Impl *)iface; > + > + FIXME("(%p, %p, %p): partial implementation\n", This, dsound, wnd); > + > + if (dsound) > + { > + This->dsound = dsound; > + IDirectSound_AddRef(dsound); > + } > + > + /* If no direct sound object is given, native does not create one yet */ > + This->dsound_inited = TRUE; > + > + return S_OK; > } > > static HRESULT WINAPI IDirectMusic8Impl_SetExternalMasterClock (LPDIRECTMUSIC8 iface, IReferenceClock* pClock) { > diff --git a/dlls/dmusic/dmusic_private.h b/dlls/dmusic/dmusic_private.h > index c05adf0..b0655d6 100644 > --- a/dlls/dmusic/dmusic_private.h > +++ b/dlls/dmusic/dmusic_private.h > @@ -96,6 +96,8 @@ struct IDirectMusic8Impl { > IReferenceClockImpl* pMasterClock; > IDirectMusicPort** ppPorts; > int nrofports; > + BOOL dsound_inited; > + IDirectSound* dsound; > }; > > /***************************************************************************** > > >

2 1

Re: [PATCH 3/3] dmsynth: Put port caps that match native ones.
by Andrew Eikum 29 Mar '12

29 Mar '12

Just to be clear, which "native" do you mean? Does this match Windows 7's dmusic behavior, or something else? I've been trying to target Windows 7's behavior in the new audio design. Also... On Thu, Mar 29, 2012 at 08:53:52AM +0200, Christian Costa wrote: > - obj->pCaps.dwEffectFlags = DMUS_EFFECT_REVERB | DMUS_EFFECT_CHORUS | DMUS_EFFECT_DELAY; > + obj->pCaps.dwEffectFlags = DMUS_EFFECT_REVERB; /* DMUS_EFFECT_CHORUS | DMUS_EFFECT_DELAY */ I'd just remove the unused flags. No need for crufty comments.

2 1

Re: po: Update German translation
by Julian Rüger 29 Mar '12

29 Mar '12

Hi André, Am Dienstag, den 27.03.2012, 21:43 +0200 schrieb André Hentschel: > --- > po/de.po | 7 +++---- > 1 files changed, 3 insertions(+), 4 deletions(-) > > #: jscript.rc:37 >-#, fuzzy > #| msgid "Invalid parameter.\n" > msgid "Invalid character" >-msgstr "Ungültiger Parameter.\n" >+msgstr "Ungültiges Zeichen" du solltest die alte msgid auch entfernen. (Ist ein neues Feature, wurden schon andere drauf hingewiesen ;) Viele Grüsse, Julian

2 2

Re: [PATCH 1/2] vbscript: Added Mid function implementation
by Marvin 29 Mar '12

29 Mar '12

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=17548 Your paranoid android. === WNT4WSSP6 (32 bit) === No test summary line found === W2KPROSP4 (32 bit) === No test summary line found === WXPPROSP3 (32 bit) === No test summary line found === W2K3R2SESP2 (32 bit) === No test summary line found === WVISTAADM (32 bit) === No test summary line found === W2K8SE (32 bit) === No test summary line found === W7PRO (32 bit) === No test summary line found === W7PROX64 (32 bit) === No test summary line found === TEST64_W7SP1 (32 bit) === No test summary line found === W7PROX64 (64 bit) === No test summary line found === TEST64_W7SP1 (64 bit) === No test summary line found

1 0

Re: [PATCH 1/2] vbscript: Added Mid function implementation
by Marvin 29 Mar '12

29 Mar '12

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=17548 Your paranoid android. === WNT4WSSP6 (32 bit) === No test summary line found === W2KPROSP4 (32 bit) === No test summary line found === WXPPROSP3 (32 bit) === No test summary line found === W2K3R2SESP2 (32 bit) === No test summary line found === WVISTAADM (32 bit) === No test summary line found === W2K8SE (32 bit) === No test summary line found === W7PRO (32 bit) === No test summary line found === W7PROX64 (32 bit) === No test summary line found === TEST64_W7SP1 (32 bit) === No test summary line found === W7PROX64 (64 bit) === No test summary line found === TEST64_W7SP1 (64 bit) === No test summary line found

1 0

SoC 2012 Ideas
by Joerg-Cyril.Hoehle＠t-systems.com 29 Mar '12

29 Mar '12

Charles Davis wrote: >1) Make Wine use App Sandbox on Mac OS X. >At the very least, I would like to be able to limit Wine's file-system activity to the prefix. I'm not familiar with Mac OS X' particular security features, but I wonder why limiting FS activity needs changes in wine? With AppArmor or the like on Linux, you'd define a set of rules living outside of the app. Limiting to the prefix won't work, because /dev/tty and /tmp/X11.socket etc. need be used. All my apps are installed in a directory outside any .wine prefix. There's a symlink from within C:\Programs. How would you take that into account? BTW, I once defined a set of iptable rules to prevent networking for Wine (or was it for a whole user?) based on the consideration that the apps I use have nothing to do with networking. Here too, nothing need be changed in Wine. Regards, Jörg Höhle

2 1

Re: [PATCH 2/3] dmsynth: Check the rigth CLSID to create the DirectMusicSynthSink object.
by Marvin 29 Mar '12

29 Mar '12

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=17544 Your paranoid android. === WINEBUILD (build) === Patch failed to apply

1 0

Re: [PATCH 1/3] dmsynth: Add basic tests.
by Marvin 29 Mar '12

29 Mar '12

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=17543 Your paranoid android. === WINEBUILD (build) === Patch failed to apply

1 0

Re: [PATCH 1/3] dmsynth: Add basic tests.
by Marvin 29 Mar '12

29 Mar '12

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=17543 Your paranoid android. === WINEBUILD (build) === Patch failed to apply

1 0

Re: [PATCH 1/5] dmusic: Add some tests for enumerating and creating ports.
by Marvin 29 Mar '12

29 Mar '12

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=17542 Your paranoid android. === WNT4WSSP6 (32 bit dmusic) === dmusic.c:51: Test failed: CoCreateInstance returned: 80040154 dmusic: unhandled exception c0000005 at 00401347 === W2KPROSP4 (32 bit dmusic) === dmusic.c:51: Test failed: CoCreateInstance returned: 80004002 dmusic: unhandled exception c0000005 at 00401347 === W2K3R2SESP2 (32 bit dmusic) === dmusic.c:51: Test failed: CoCreateInstance returned: 80040154 dmusic: unhandled exception c0000005 at 00401347 === WVISTAADM (32 bit dmusic) === Failure running script in VM: The specified guest user must be logged in interactively to perform this operation === W2K8SE (32 bit dmusic) === dmusic.c:51: Test failed: CoCreateInstance returned: 80040154 dmusic: unhandled exception c0000005 at 00401347

1 0

Re: winspool.drv: Update allowed driver Version
by Marvin 28 Mar '12

28 Mar '12

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=17541 Your paranoid android. === WINEBUILD (build) === Can't determine base name

1 0

RFC: Duplicate in/out device naming
by Andrew Eikum 28 Mar '12

28 Mar '12

I'm working on Bug 14559 and have run into an interesting UI problem. In WinMM, there are three "classes" of devices: waveIn, waveOut, and mixer. Windows 7's WinMM implementation provides one mixer for each waveIn and waveOut device. The "WCHAR caps.szPname[32]" field for the matching mixer and waveIn/Out device are the same. Some applications, in this case Rosetta Stone 3, use the matching szPname fields to determine which mixer to associate with which device. The problem turns up when we have duplicate input and output device names. Consider: waveOut: 0: default 1: HDA Intel Analog 2: HDA Intel Digital waveIn: 0: default 1: HDA Intel Analog mixer: 0: default 1: HDA Intel Analog 2: HDA Intel Digital 3: default 4: HDA Intel Analog Rosetta Stone chooses waveIn[0] and starts iterating over the mixers' szPname fields, finding that mixer[0] matches. But, mixer[0] is actually associated with the waveOut default, not the waveIn default. Bad things happen. Windows 7 solves this problem implicitly by providing unique device names at the MMDevAPI level. For instance, the input device is Microphone and the output devices are Stereo and Headphones. Hacking the registry to force duplicate MMDevAPI device names actually does result in duplicate mixer names. But Wine's backends don't provide this kind of information, so we simply provide the ALSA device name as the device's name. As an attempt to solve this in Wine, I added a prefix to each MMDevice indicating its flow direction. The unique identifier must be a prefix, as WinMM's szPname field truncates at 31 characters. This gives WinMM device names like: waveOut: 0: Out: default 1: Out: HDA Intel Analog 2: Out: HDA Intel Digital This solves the Rosetta Stone issue, as you can see in the bug. But when testing this in other applications, it quickly becomes silly. Audacity 1.3 adds its own "Out: " prefix to WinMM device names, creating "Out: Out: default" in the UI. Dynamically adding prefixes only if a duplicate device is present causes issues with duplicates appearing/disappearing. Trying to remember if a duplicate has ever been present is quite "ugly" in code, requiring storing that kind of information in the registry. So I don't know what to do. Have ugly, redundant device names? Leave Rosetta Stone broken, as it is arguably an application bug? Try to guess at the device type, and insert names like "Speakers" and "Microphone" into the MMDevAPI device name, even if that might be wrong? Thoughts? Andrew

3 2

Re: [2/4] scrrun: Register Scripting interfaces (try 2)
by Alexandre Julliard 28 Mar '12

28 Mar '12

Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> writes: > @@ -4,4 +4,6 @@ C_SRCS = scrrun.c > > RC_SRCS = scrrun.rc > > +IDL_TLB_SCRS = scrrun.idl This can't possibly do anything. I've fixed it up, but please test your code before sending, it's not the first time you send a registration patch that doesn't register anything. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH] strmbase: Display dll in which we are searching a class to instanciate.
by Alexandre Julliard 28 Mar '12

28 Mar '12

Christian Costa <titan.costa(a)gmail.com> writes: > @@ -360,14 +361,17 @@ HRESULT WINAPI STRMBASE_DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID * > break; > } > > + if (!GetModuleFileNameA(g_hInst, dllname, sizeof(dllname))) > + strcpy(dllname, "???"); You don't want to do that in the success case. -- Alexandre Julliard julliard(a)winehq.org

2 3

Re: strmbase: add beginnings of BaseWindow
by Alexandre Julliard 28 Mar '12

28 Mar '12

Aric Stewart <aric(a)codeweavers.com> writes: > +HRESULT WINAPI BaseWindow_Destroy(BaseWindow *This) > +{ > + if (This->hWnd) > + BaseWindowImpl_DoneWithWindow(This); > + > + UnregisterClassW(This->pClassName, NULL); You most likely don't want to unregister the class every time. > + wnd_class_registered = GetClassInfoW(This->hInstance, This->pClassName, > + &winclass); > + > + if (!wnd_class_registered) > + { There shouldn't be any reason to do this. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH 1/5] winex11: Use GLX_DONT_CARE instead of ~0 in ConvertAttribWGLtoGLX().
by Chris Robinson 28 Mar '12

28 Mar '12

On Tuesday, March 27, 2012 8:35:49 PM Henri Verbeet wrote: > - int pixelattrib = ~0; > + int pixelattrib = GLX_DONT_CARE; I want to say there's a reason we used ~0 instead of GLX_DONT_CARE, but it's been too long that I can't remember. I think it was because GLX_DONT_CARE didn't include all possibilities that ~0 would, like what WGL wanted.

2 1

Re: [4/4] scrrun: Add scrrun tests (try 2)
by Marvin 28 Mar '12

28 Mar '12

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=17522 Your paranoid android. === WINEBUILD (build) === Make failed

1 0

Re: [PATCH] devenum: Add tests for devenum. (try 2)
by Marvin 27 Mar '12

27 Mar '12

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=17512 Your paranoid android. === WINEBUILD (build) === Make failed

1 0

Re: [PATCH] devenum: Add tests for devenum.
by Marvin 27 Mar '12

27 Mar '12

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=17507 Your paranoid android. === WNT4WSSP6 (32 bit devenum) === devenum.c:59: Test failed: Cannot create CLSID_SystemDeviceEnum object (res = 80040154)

1 0

Re: [PATCH 1/2] winmm: Support DRVM_MAPPER_PREFERRED_GET in waveXxxMessage
by Marvin 27 Mar '12

27 Mar '12

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=17495 Your paranoid android. === WNT4WSSP6 (32 bit capture) === capture.c:648: Test failed: waveInMessage(DRVM_MAPPER_PREFERRED_GET) failed: 6 capture.c:653: Test failed: Got invalid preferred device: 0x22fe5c === W2KPROSP4 (32 bit capture) === capture.c:648: Test failed: waveInMessage(DRVM_MAPPER_PREFERRED_GET) failed: 6 capture.c:653: Test failed: Got invalid preferred device: 0x235370 === WNT4WSSP6 (32 bit wave) === wave.c:1386: Test failed: waveOutMessage(DRVM_MAPPER_PREFERRED_GET) failed: 6 wave.c:1391: Test failed: Got invalid preferred device: 0x234098 === W2KPROSP4 (32 bit wave) === wave.c:1386: Test failed: waveOutMessage(DRVM_MAPPER_PREFERRED_GET) failed: 6 wave.c:1391: Test failed: Got invalid preferred device: 0x41

1 0

Re: winex11.drv: Do not trash existing clip rectangle if XInput2 is not available.
by Alexandre Julliard 27 Mar '12

27 Mar '12

Dmitry Timoshkov <dmitry(a)baikal.ru> writes: > This patch makes dlls/user32/input.c and dlls/user32/monitor.c tests pass > on a system without XInput2. It will break dinput, we rely on the clip rectangle being reset. -- Alexandre Julliard julliard(a)winehq.org

3 12

[PATCH] mciqtz: Actually assign result to the output structure
by Joerg-Cyril.Hoehle＠t-systems.com 27 Mar '12

27 Mar '12

Andrew, Aric, Maarten, I'm pleased to see that patches to quartz and mciqtz keep flowing in. For the last years, I've wondered whether I should open a sort of generic bug that mciqtz/quartz still is a mostly broken MCI device, missing many basic functions. Every time I try it out using my MCI shell, it has improved a little bit, but it's still in a very bad shape overall. Alas, I've never written a significant mciavi testsuite. That could be used to check mciqtz too. For instance, basic commands like the following are either partially implemented or completely missing: open xyz.avi type mpegvideo alias q notify status q length status q time format notify seek q to 0 set q time format xyz play q from 50 to 500 notify status q position window q state show seek q to end Furthermore, mciqtz should be able to access other files, e.g. play .wav and even IIRC .mid files. open sound.wav type mpegvideo alias w notify status w time format play w from 4 status w length status w position In theory, one could use the mciwave testsuite, add type mpegvideo to every open, and it should mostly pass. Even without "type mpegvideo", using mciqtz to open an .mpg file with audio and/or video yields many fixme lines and has issues, e.g. IIRC it doesn't manage to stop! close all Often, the missing bits are in quartz or associated dlls, not mciqtz. Every time I look at quartz code, I'm lost among lots of methods that do nothing but delegate to other methods. Typical OO :-( A quartz working well would allow to close bug #19496. See comment #13. I believe msvfw should always delegate to one of mciavi or mciqtz. But currently, mciqtz+quartz is in too bad shape to switch msvfw. I'd be happy to see mciqtz work at least as well as most other mci drivers. Please keep sending patches! Thank you, Jörg Höhle

2 3

Need suggestion to choose a GSoC idea
by Qian Hong 27 Mar '12

27 Mar '12

Hi all, I'm a student in Department of Mathematics, Sun Yat-sen University. My irc nick name is fracting, my real name is Qian Hong. I'm in GMT+8 time zone, availible on 10:00 to 18:00 (GMT+8) on #winehackers. I know C/bash and some Linux skills. Currently I'm an intern in Redhat, working in the kernel-qe group. I have great interesting in the Wine project. Last year I spent most of my spare time on reporting bugs to Wine. When I doing this I found lots of bugs regarding Chinese software have beem complained in local Linux forum for years but no one reported them to Wine project. In other words, I found most Chinese Linux users didn't report bugs to open source projects, well, I think that is a bug too :) After reported 100+ bugs, I'm surprised so many bugs have been fixed in just one year. I wish I can do some more then reporting bugs for Wine project, great if I can get start with the 2012 GSoC and keep submitting patches to Wine after that. I have lots of ideas in my TODO list, unfortunately most of them might too hard to do as a GSoC project. Anyway, I'll post my ideas here, wait for feedbacks, choose one of them as my GSoC idea, and leave others as my job in the coming years. Certainly I'm glad to see any others working on those ideas :) Here is my list: - Implement ndis.sys This idea come from the off-standard network authentication in China. Lots of Universities in China using some off-standard network authentication methods for campus network connection, the authentication protocols are usually private and changed frequently, the authentication clients are usually Windows-only. This issue is the main blocker for students in those Universities to change to Linux desktop or Mac. I've filed some bugs regarding some network authentication clients, such as [1],[2],[3],[4],[5]. However, even the above bugs are fixed, these clients might not work on wine because they depends on ndis.sys which is not implemented yet. As an intern in Redhat network-qe group focus on NIC testing, I have great interesting in implement ndis.sys, though I think it is too hard for a GSoC project. The ndiswrapper code is a great resource but not complete, also I known ReactOS project has a ndis.sys too but obviously it won't work on Wine. Is it allowed to read ReactOS implementation to learn how things work? Anyway I'm interesting in what you think :) - Implement/improve wpcap proxy This idea is similar with the first one, in fact André H has already done the most important part [6],[7]. I hope André's patch will be accepted, and I'm interesting in improving it. I have done some proof-of-concept to show that some kinds of network auth client wich depends on winpcap will work on wine with André's patch. - Improve builtin iexplore This idea is come from another main blocker for using Linux/Mac in China. Most Chinese online banks are ie-only, depends on ActiveX and some ie-only style JavaScript or even VBScript. Jacek and other wine developers has done lots of work on them, and I'm interesting in participating. I've filed 40+ bugs regarding online bank support with Wine [8]. My goal is to make wine builtin iexplore works for as many online banks, currently I have more then 6 different online bank accounts for testing, guys in openbank-discuss group [9] will help on testing too. - Improve USB support Yeah, this might be another idea which is too hard for a GSoC project. We already have a third party patch, I wonder will Wine-1.6 have official USB support? This idea is similar with the above one, my goal is to solve the online bank USB-key issues. After testing on 8 different USB-keys with the USB patch [10], I noticed they won't work on wine without hidusb.sys. ReactOS project has implement hidusb.sys in the last few months, again, is it allow to learn ReactOS code if I would like to contribute to Wine? - Improve Wine CJK font support The main idea is fix Bug 16325 [11], Aric and others have done a lot of work on it, and I'm glad to participating too. I think the main blocker for Wine CJK font support is Font Association now, is it suitable for a GSoC project? Also I've filed some other Wine font bugs [12],[13],[14],[15],[16], I'm happy to working on them. - Improve Wine font test case This idea is similar with the above one, however, instead of fixing real bugs, this idea is to prevent new bugs(regression). As having filed 100+ bugs I know the pain of doing regression test if we can't script the test, this happens on font related bugs. The main idea is to integrate an OCR engine to wine testcase, use ORC method to detect whether the fonts display correctly. We already have very good open source ORC engine [17] which is in Apache License. However tesseract-ocr is written in C++ an I am worring that will not be integrated to Wine code tree. - Improve Wine App install / App running testing This idea is similar with Austin's early work [18], my idea is using sikuli [19] instead of autohotkey, since sikuli is more powerful for complex work. Sikuli using tesseract as orc engine, so if we done this job we can prevent many font relate regression as well. - I'm also open to other ideas... I'm sorry for my long post, and thank you for your time to read it. In fact I have much more things on my todo list regarding to Wine, but time is limit and I have to give up most of them in the near future. I'm happy to know whether there is anyone working on these ideas, also I'm happy if any others take them as GSoC project :) Rather than to be accepted by GSoC, I'm more glad to see Wine is improved, especially on parts I've mentioned above, that is why I post this long mail. Wish we can see them in Wine 1.6. Of cause, GSoC is awesome to me :) Any suggestion is appreciated, and feel free to ping me on IRC (fracting). Last but not least, thanks wine community for such a great project. Reference: [1] Bug 29460 - Ruijie Supplicant Su1xDriver.sys crashes in driver entry due to ntoskrnl.exe IoGetCurrentProcess() being a stub [2] Bug 27060 - installation of iNodeSetup3.60-6208.exe needs netcfgx.dll [3] Bug 27061 - iNode Client exit silently on start up [4] Bug 30041 - npptools.dll is needed by ishare_user.exe of Dr.com [5] Bug 30208 - NKSetup (Shan Xun 802.1x client) infinite loop while installing [6] Bug 21571 - WinPcap 4.0.1: Setup cannot install Microsoft Network Monitor Driver (NetMon) [7] http://www.winehq.org/pipermail/wine-patches/2011-March/099838.html [8] http://code.google.com/p/online-banking-with-wine/wiki/buglist [9] https://groups.google.com/forum/?fromgroups#!forum/non-ie-online-banking [10] http://wiki.winehq.org/USB [11] Bug 16325 - incorrect font rendering for CJK programs [12] Bug 29851 - Some part of PDFCreator installer cannot display Chinese correctly even Font Replacement is setting correctly [13] Bug 29853 - QQ2011 does not display Chinese correctly with builtin usp10 if font link setting is incomplete [14] Bug 29850 - Scilab does not display Chinese [15] Bug 27285 - Miro does not display Chinese [16] Bug 30263 - builtin iexplore does not display Chinese [17] http://code.google.com/p/tesseract-ocr/ [18] http://wiki.winehq.org/Appinstall [19] http://sikuli.org/ -- Regards, Qian Hong - Sent from Ubuntu http://www.ubuntu.com/

3 4

Re: [3/8] scrrun: Add IFileSystem3 support
by Jacek Caban 27 Mar '12

27 Mar '12

Hi Alistair, On 03/27/12 11:41, Alistair Leslie-Hughes wrote: > +typedef struct FileSystem > +{ > + IFileSystem3 IFileSystem3_iface; > + LONG ref; > +} FileSystem; > + > +static inline FileSystem *impl_from_IFileSystem3( IFileSystem3 *iface ) > +{ > + return CONTAINING_RECORD(iface, FileSystem, IFileSystem3_iface); > +} Is there any reason for this to be heap-based object? It looks to me like it would better be a static object (AFAICS you don't even need FileSystem struct since you're not going to store anything in it). Cheers, Jacek

2 1

Re: [5/8] scrrun: Implement IFileSystem3 FileExists
by Jacek Caban 27 Mar '12

27 Mar '12

Hi Alistair, On 03/27/12 11:42, Alistair Leslie-Hughes wrote: > + static const WCHAR existing_fileW[] = { > + 'c', ':', '\\', 'W', 'i', 'n', 'd', 'o', 'w', 's', '\\', 's', 'y', 's', 't', 'e', 'm', '3', > + '2', '\\', 'n', 't', 'd', 'l', 'l', '.', 'd', 'l', 'l', 0}; Hardcoding even such paths is not a god idea. Cheers, Jacek

1 0

Re: [6/8] scrrun: Implement IFileSystem3 FolderExists
by Marvin 27 Mar '12

27 Mar '12

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=17493 Your paranoid android. === WINEBUILD (build) === Make failed

1 0

Re: [5/8] scrrun: Implement IFileSystem3 FileExists
by Marvin 27 Mar '12

27 Mar '12

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=17492 Your paranoid android. === WINEBUILD (build) === Make failed

1 0

Re: [4/8] scrrun: Add scrrun tests
by Marvin 27 Mar '12

27 Mar '12

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=17491 Your paranoid android. === WINEBUILD (build) === Make failed

1 0

Re: [PATCH] cmd/tests: If we rewind to the beginning of the line, don't increment line number.
by Frédéric Delanoy 27 Mar '12

27 Mar '12

On Mon, Mar 26, 2012 at 10:13, Christian Costa <titan.costa(a)gmail.com> wrote: > If some particular cases, a bias is introduced in the line number which make error message > mismatch the content of the .exp file. This patch fixes that. > --- > programs/cmd/tests/batch.c | 4 ++++ I guess this should be marked as a prerequisite to/included in your new attrib patches list Frédéric

2 1

GSoC proposal
by Cheer Xiao 27 Mar '12

27 Mar '12

Hi all, I opened bug 30255 [1](which, unfortunately, was just marked duplicate as bug 19263 [2]), which I believe is a long-standing issue. Simply put, uxthemes has some performance problems, and consequently UI rendering with theming enabled would lag a lot. Since I'm also planning for GSoC, I would like make that my GSoC proposal and fix the bug myself. Also, there are failing tests regarding dlls/uxtheme - running dlls/uxtheme/tests/uxtheme_test.exe.so gives 11 failures out of a total of 56 executed tests. I can try to fix that too. With all of these, this may still be a trivial proposal. To make it less trivial :), I would also like to work on the gtk+ theming bridge [3], once the performance issue is fixed. I also have another alternative proposal, i.e. to implement full IME support so that Windows IMEs can be used on Linux. That would consists of basically two parts - the Win32 API (which, after a brief inspection, seems to be at least partly implemented) to handle the Windows part and a daemon to handle the Linux part (half like win32's ctfmon.exe and half like ibus-daemon). But I haven't investigated much into that yet, so I don't have much to say. Still, your suggestions are very welcome. And a few words about myself: I have been one of the primary maintainers of simplified Chinese translation of Wine during the past few years - so I have already got my name into AUTHORS ;-). I know quite some C - read K&R thoroughly, plus experience in a few small projects; I also know the Git workflow well. I'd love to help fix bug 10000 so that Unix can take over the world ;-). Your suggestions and ideas are very welcome. 1. http://bugs.winehq.org/show_bug.cgi?id=30255 2. http://bugs.winehq.org/show_bug.cgi?id=19263 3. http://wiki.winehq.org/ThemingSupport -- Regards, Cheer Xiao aka. xiaq

8 15

Fwd: Student Proposals Now Being Accepted for Google Summer of Code
by Maarten Lankhorst 26 Mar '12

26 Mar '12

I'm still missing some people who haven't signed up as mentor yet. To all students, I hope you discussed your ideas on the mailing list and/or irc, good luck submitting your proposal! :D -------- Originele bericht -------- Onderwerp: Student Proposals Now Being Accepted for Google Summer of Code Datum: Mon, 26 Mar 2012 15:27:05 -0700 Van: Carol Smith <carols(a)google.com> Antwoord-naar: google-summer-of-code-announce+owners(a)googlegroups.com Aan: Google Summer of Code Announce <google-summer-of-code-announce(a)googlegroups.com> Hi there, We are pleased to announce that we are now accepting applications from students to participate in Google Summer of Code 2012. Please check out the FAQs [1], timeline [2], and student manual [3] if you are unfamiliar with the process. The deadline to apply is April 6, 2012 at 19:00 UTC [4]. Late proposals will not be accepted for any reason. [1] - http://www.google-melange.com/gsoc/document/show/gsoc_program/google/gsoc20… [2] - http://www.google-melange.com/gsoc/events/google/gsoc2012 [3] - http://www.booki.cc/gsocstudentguide/ [4] - http://goo.gl/xiKC2

1 0

[GSoC] participate and contribute in opensource community
by Narendra Kishan 26 Mar '12

26 Mar '12

Sir, I am Naren Krishna, I am students of CSE, I have some background in c++ and I have been using wine to run *.exe files in ubuntu. I want to help improve this software as this is a very good software, what do you expect from one. Please guide me, tell me if you want some bugs to be fixed. sincerely, Naren Krishna

1 0

My GSoC 2012 proposal
by Lucas Zawacki 26 Mar '12

26 Mar '12

Hello all, First of all, I'll introduce myself: I'm Lucas Fialho Zawacki a Computer Science undergrad at UFRGS university in Brazil. I have worked with Wine in GSoC 2011 (http://www.google-melange.com/gsoc/project/google/gsoc2011/lfzawacki/8001) and pretty much enjoyed the experience. I'd like to work again with Wine for this year's GSoC and with this email discuss some possible projects. *Joystick Configuration Tool* This seems like a natural project for me to work since I'm very familiar with DirectInput and have access to some josysticks, including force feedback. I'm not sure about what "Support system joystick calibration" is though. Is it related to bug 24235 ? *Scons Wine* I think this could turn out to be very worthwhile project, but there's little documentation about it. To make Scons aware of Winelib would it be enough to create an environment that uses the winelib compilers, libs and includes? Then it would be a question of programatically generating the build script, much like winemaker does for the makefile. I've also been looking at Winemaker and trying to convert some visual studio projects from random google code repositories with moderate success. As a part of this project I could test it with numerous samples, e.g Nehe tutorials (http://nehe.gamedev.net/), and with assorted open source projects targeting windows, and make these just work with Winemaker. *Winetricks* Other ideas fall in winetricks territory so I don't know if they constitute a valid Wine GSoC project, but they're: * Regression Testing GUI. Help a user download the repository, compile wine and run assisted or automated bisections. * Compatibility and exchange of installation recipes with other frontends like PlayOnLinux * Winetricks and AppDB integration. A way to mirror in AppDB the dependencies and workarounds employed by winetricks recipes. I wait for feedback. I'm also available at IRC if someone wants to discuss this in more depth.

4 6

Regarding Gsoc 2012
by prateek papriwal 26 Mar '12

26 Mar '12

I am Prateek Papriwal, a second year undergraduate student persuing Bachelors in Technology in the Indian Institute of Technology Delhi, in the department of Electrical Engineering. I love programming in C . I was told about GSOC 2012 by one of my seniors, who saw passion for coding in me. I traversed through the previous year list of organisations and thereby Wine caught my attention , through which we can install and run windows appplication in other operating systems as we do in our windows . For the last few weeks i have been going through the working of Wine and have gone through some of its modules.i am also using wine for running uTorrent application. I have done a course CSL 101 "Programming in C" in which i have several algorithms using C . I have gone through the ideas page and found "System Management - WMI support" very interesting . Relevant Courses taken: CSL 201 : Data Structures And Algorithms -- Object Oriented Programming, Trees Implementation , Sorting Techniques , Graph Theory ... *Involvement in Open Source Organisation* CMU Sphinx(SVN Repository) RAXA JSS EMR(Git Repository) -- https://raxaemr.atlassian.net/wiki/display/RAXAJSS/Voice+Module+Project Sympy (GIT Repository)

1 0

Spelling errors in en_US translation
by Julian Rüger 26 Mar '12

26 Mar '12

Hi Francois, (and everybody else ;) are there any plans to create an ignore-list for these: http://fgouget.free.fr/wine-po/en_US.spell.html to be able to distinguish real typos from false positives? Most reported errors are false positives (like "codec" or "checksum") but there are real errors, or at least instances of uncommon spelling (like "customising", which is British English afaik, or "Cancelled") which should be fixed (after 1.4), imho. Best regards, Julian

2 3

Re: [PATCH 1/2] shell32: Prepare ASSOC_GetValue and ASSOC_ReturnData to work on non WCHAR* data
by Alexandre Julliard 26 Mar '12

26 Mar '12

Piotr Caban <piotr(a)codeweavers.com> writes: > --- > dlls/shell32/assoc.c | 49 > +++++++++++++++++++++++++------------------------ > 1 files changed, 25 insertions(+), 24 deletions(-) It doesn't work here: ../../../tools/runtest -q -P wine -M shlwapi.dll -T ../../.. -p shlwapi_test.exe.so assoc.c && touch assoc.ok assoc.c:131: Test failed: Expected 72, got 36 assoc.c:160: Test failed: Expected 24, got 12 make: *** [assoc.ok] Error 2 -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: d3d10core: Standardize COM aggregation for d3d10_device.
by Henri Verbeet 26 Mar '12

26 Mar '12

On 22 March 2012 00:50, Michael Stefaniuc <mstefani(a)redhat.de> wrote: > -static HRESULT STDMETHODCALLTYPE d3d10_device_inner_QueryInterface(IUnknown *iface, REFIID riid, void **object) > +static HRESULT STDMETHODCALLTYPE d3d10_device_inner_QueryInterface(IUnknown *iface, REFIID riid, > + void **ppv) > { > - struct d3d10_device *This = d3d10_device_from_inner_unknown(iface); > + struct d3d10_device *This = impl_from_IUnknown(iface); > > - TRACE("iface %p, riid %s, object %p\n", iface, debugstr_guid(riid), object); > + TRACE("iface %p, riid %s, object %p\n", iface, debugstr_guid(riid), ppv); > > - if (IsEqualGUID(riid, &IID_IUnknown) > - || IsEqualGUID(riid, &IID_ID3D10Device)) > + if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_ID3D10Device)) > + *ppv = This; > + else if (IsEqualGUID(riid, &IID_IWineDXGIDeviceParent)) > + *ppv = &This->IWineDXGIDeviceParent_iface; > + else > { > - ID3D10Device_AddRef(&This->ID3D10Device_iface); > - *object = This; > - return S_OK; > + WARN("%s not implemented, returning E_NOINTERFACE\n", debugstr_guid(riid)); > + *ppv = NULL; > + return E_NOINTERFACE; > } > > - if (IsEqualGUID(riid, &IID_IWineDXGIDeviceParent)) > - { > - IWineDXGIDeviceParent_AddRef(&This->IWineDXGIDeviceParent_iface); > - *object = &This->IWineDXGIDeviceParent_iface; > - return S_OK; > - } > - > - WARN("%s not implemented, returning E_NOINTERFACE\n", debugstr_guid(riid)); > - > - *object = NULL; > - return E_NOINTERFACE; > + IUnknown_AddRef((IUnknown*)*ppv); > + return S_OK; > } I'm not sure this really makes it much better, but I guess it's mostly up to how Alexandre wants these.

2 1

Re: msi: Implement MSIMODIFY_MERGE function in TABLE_modify.
by Marvin 26 Mar '12

26 Mar '12

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=17479 Your paranoid android. === WNT4WSSP6 (32 bit db) === db.c:1079: Test failed: MsiViewModify failed === W2KPROSP4 (32 bit db) === db.c:1079: Test failed: MsiViewModify failed === WXPPROSP3 (32 bit db) === db.c:1079: Test failed: MsiViewModify failed === W2K3R2SESP2 (32 bit db) === db.c:1079: Test failed: MsiViewModify failed === WVISTAADM (32 bit db) === db.c:1079: Test failed: MsiViewModify failed === W2K8SE (32 bit db) === db.c:1079: Test failed: MsiViewModify failed === W7PRO (32 bit db) === db.c:1079: Test failed: MsiViewModify failed === W7PROX64 (32 bit db) === db.c:1079: Test failed: MsiViewModify failed === TEST64_W7SP1 (32 bit db) === db.c:1079: Test failed: MsiViewModify failed === W7PROX64 (64 bit db) === db.c:1079: Test failed: MsiViewModify failed === TEST64_W7SP1 (64 bit db) === db.c:1079: Test failed: MsiViewModify failed

2 1

Re: [PATCH] implement MSIMODIFY_MERGE function in TABLE_modify
by Hans Leidekker 26 Mar '12

26 Mar '12

On Mon, 2012-03-26 at 11:14 +0200, Andoni Morales wrote: > - case MSIMODIFY_REPLACE: > case MSIMODIFY_MERGE: > + /* check for a duplicated key */ > + r = msi_table_find_row( tv, rec, &row, column ); > + if (r == ERROR_SUCCESS) { > + /* check that both are identical */ > + r = compare_record (tv, row, rec); > + if (r != ERROR_SUCCESS) > + break; > + } else { > + r = table_validate_new( tv, rec, NULL ); > + if (r != ERROR_SUCCESS) > + break; > + r = TABLE_insert_row( view, rec, -1, FALSE ); > + break; > + } > + > + case MSIMODIFY_REPLACE: Please use bracketing and indentation style of the surrounding code. Some tests would be nice.

2 2

Re: [PATCH] implement MSIMODIFY_MERGE function in TABLE_modify
by Dmitry Timoshkov 26 Mar '12

26 Mar '12

Andoni Morales <ylatuya(a)gmail.com> wrote: > - case MSIMODIFY_REPLACE: > case MSIMODIFY_MERGE: > + /* check for a duplicated key */ > + r = msi_table_find_row( tv, rec, &row, column ); > + if (r == ERROR_SUCCESS) { > + /* check that both are identical */ > + r = compare_record (tv, row, rec); > + if (r != ERROR_SUCCESS) > + break; > + } else { > + r = table_validate_new( tv, rec, NULL ); > + if (r != ERROR_SUCCESS) > + break; > + r = TABLE_insert_row( view, rec, -1, FALSE ); > + break; > + } > + > + case MSIMODIFY_REPLACE: > case MSIMODIFY_VALIDATE: Please get rid of redundant 'break' statements, and add one at the end of case processing. -- Dmitry.

1 0

PDB format documentation.
by Svyatoslav Kuzmich 26 Mar '12

26 Mar '12

Hello dear Wine mailing list! I've found that Wine dbghelp.dll includes PDB file parser. Does anyone know where I can find documentation of PDB internal structure? Thanks, Svyatoslav Kuzmich

2 1

Re: My Idea for GSOC
by Daniel Oom 25 Mar '12

25 Mar '12

I think I accidentally dropped wine-devel, I have re-added and hope it does not create any trouble. And thanks for the explanation, but I'm not sure I fully understand how the different versions of direct3d interact within wine's implementation. I will probably figure it out in time. Also I will try to come up with a better test that compares lighting-settings as this was fun and fine introduction to wine. On Wed, Mar 21, 2012 at 15:18, Stefan Dösinger <stefandoesinger(a)gmx.at>wrote: > Hi, > > Did you run the test on Windows? The purpose of the tests is not do > document > what we think should happen, but figure out how Windows behaves, and then > replicate the same behavior. > > Is suspect your test fails on Windows because you're verifying that > lighting > is on or off in the wrong way. IDirect3DDevice2_GetRenderState(device, > D3DRENDERSTATE_LIGHTING, &value) will most likely not work in this way > because > D3DRENDERSTATE_LIGHTING does not exist in IDirect3DDevice2. You have to > set up > the d3d states in a way that rendering produces a different result with > lighting on vs lighting off, then read back the rendering result(there's > already a get_pixel_color function for that) and verify that you get the > correct color. > > A basic recipie for that: With lighting off, you get the diffuse color in > the > vertex as final color(well, assuming that stuff like texturing, fog, etc. > are > off too). With lighting on it runs through the d3d lighting > calculations[1]. > If you disable all lights(d3d default), set the global ambient light to > black(in later d3d there's a renderstate for that, in d3d2 I suspect that's > part of D3DLIGHT and IDirect3DLight*), and set the emissive material > property > to a color != black, your emissive color will be the final color(since the > ambient, diffuse and specular components of the equation are zero). By > setting > the vertex color and emissive material color to different colors you can > tell > if lighting is on or off. > > Cheers, > Stefan > > PS: It's prefered to keep such discussions in public, ie with wine-devel > CCed. > I haven't CCed wine-devel yet, and I'm not sure if you dropped it or if I > dropped it accidentally. > > 1: http://msdn.microsoft.com/en- > us/library/windows/desktop/bb147178(v=vs.85).aspx > > Am Mittwoch, 21. März 2012, 09:25:40 schrieb Daniel Oom: > > I have poked around a bit with the source and managed to add tests that > > checks if lighting is disabled/enabled in device2 and device7. I also > added > > SetRenderState in IDirect3DDeviceImpl_2_DrawPrimitive. The tests works > but > > I have not checked what effect the change has in other circumstances. > > > > I attached a patch in hopefully the preferred format. > > > > On Sat, Mar 10, 2012 at 22:04, Stefan Dösinger > <stefandoesinger(a)gmx.at>wrote: > > > Am Samstag, 10. März 2012, 17:22:51 schrieb Daniel Oom: > > > > Hi, > > > > > > > > Writing tests, or implementing the command line tools seems like > > > > something I could do. I'm kinda leaning towards the command line > > > > tools, since it would offer a chance to thoroughly learn the shading > > > > languages. > > > > > > For learning purposes writing tests and fixing bugs uncovered by them > > > will be > > > better. The command line tools are mostly about parsing parameters and > > > forwarding them to d3dx9 functions(*). > > > > > > If you want to look a little bit in either proposal(we recommend that > in > > > general): > > > > > > For the test stuff, take a look at IDirect3DDeviceImpl_2_DrawPrimitive > > > in > > > dlls/ddraw/device.c. It thunks IDirect3DDevice2::DrawPrimitive to > > > IDirect3DDevice7::DrawPrimitive. The main difference is the VertexType > > > parameter. It is a D3DVERTEXTYPE in the IDirect3DDevice2 method, and a > > > DWORD > > > with D3DFVF_* flags in Device7. Our thunk simply converts between these > > > two, > > > but a deeper difference a user noticed is that D3DVT_LVERTEX in Device2 > > > disables lighting calculations, whereas the equivalent D3DFVF flag > > > collection > > > in Device3 and Device7 does not. Device3 and newer have > > > D3DRENDERSTATE_LIGHTING to enable / disable lighting, but this render > > > state does not exist in Device2. > > > > > > Fixing this is fairly straightforward, just call > > > SetRenderState(LIGHTING, > > > ...) > > > in the thunk, but it needs some tests to answer / show the following: > > > > > > * Show that D3DVT_LVERTEX indeed disables lighting, and D3DVT_VERTEX > > > enables > > > it > > > * Show that D3DFVF_LVERTEX does not influence lighting in Device2 and > > > Device7(D3DFVF_TLVERTEX disables all vertex processing in all d3d > > > versions, this is already tested and implemented) > > > * Test what happens when you call SetRenderState and GetRenderState in > > > Device2. > > > * Probably others > > > > > > There are numerous things like that that need testing and probably > > > fixes. > > > This > > > is just one example that happens to be on my todo list. ddraw tests go > > > to > > > dlls/ddraw/tests/ddraw*.c. The other files should be moved to the > > > tests/ddraw*.c files and extended to cover all ddraw versions. > > > > > > For the command line tools, download an older version of the directx > sdk > > > that > > > still has vsa.exe and psa.exe(I think 2007 ones were the last ones) and > > > compare their command line parameters to > > > d3dx9.D3DXAssembleShaderFromFile > > > and > > > friends. > > > > > > The tests are certainly the more useful task. vsa.exe and psa.exe would > > > mainly > > > serve developer convenience when writing d3d8 and d3d9 tests since we > > > wouldn't > > > need an ancient dx sdk to assemble our own test shaders. d3d tests and > > > fixes > > > fix actual games. > > > > > > Enjoy, > > > Stefan > > > > > > (*) Actually, that's not how native vsa/psa work. They seem to have > > > their > > > own > > > copy-pasted version of the compiler and assembler, or they link > > > statically. We > > > should probably do it by calling d3dx9 though, especially for tools > that > > > mainly serve developer convenience. >

2 2

re: PDB format documentation.
by Dan Kegel 25 Mar '12

25 Mar '12

Svyatoslav wrote: > I've found that Wine dbghelp.dll includes PDB file parser. Does anyone > know where I can find documentation of PDB internal structure? I think you've found it :-) As you probably know, PDB is an undocumented format. I suspect the best you can find are scattered posts like http://moyix.blogspot.com/2007/08/pdb-stream-decomposition.html http://www.godevtool.com/Other/pdb.htm from people who reverse engineer bits of it. Although http://moyix.blogspot.com/2007/08/pdb-stream-decomposition.html claims http://ccimetadata.codeplex.com/ has some interesting bits from the horse's mouth, and http://code.google.com/p/pdbparse/ http://code.google.com/p/pdbparser/ http://pdbparser.codeplex.com might be interesting.

1 0

re: GSoC proposal
by Dan Kegel 25 Mar '12

25 Mar '12

> submitting multiple proposals are explicitly allowed. True, but be careful, for two reasons: 1) there may have been cases where people who submit applications to two orgs fall through the cracks, with each org thinking the other was going to take him. 2) passion generally drives success, and unless you're like my friend who didn't sleep and got a triple major in four years (and now heads chip development for a major game console), splitting your passion between multiple applications could reduce the chances of either one being accepted. Going a bit further with a single application, e.g. by including [more] working patches, seems the better choice... assuming you pick a project that the organization really likes, anyway.

1 0

Wine and Window Management
by Roger Cruz 25 Mar '12

25 Mar '12

Could someone tell me if Wine has a built-in Window Manager of its own or does it count on the host's window manager for such things as window hierarchy (parent-child relationships), clipping, move, resize, iconify, etc? I want to run Wine on an environment which lacks X and I have been told conflicting information on whether I need to write my own window manager. It has always been my impression that Wine does all the window management so it must have a Windows window manager built-in. I'm interested in knowing that if I remove the X11 driver from Wine, whether I will have to also provide my own window manager or whether what is in Wine is sufficient. If there is a window manager in Wine, what type of functionality does it require from whatever I chose to replace X11 with? Thanks Roger R. Cruz

2 1

Re: GSoC proposal
by Hin-Tak Leung 25 Mar '12

25 Mar '12

--- On Sun, 25/3/12, Cheer Xiao <xiaqqaix(a)gmail.com> wrote: > 2012/3/25 Hin-Tak Leung <htl10(a)users.sourceforge.net>: > > --- On Sun, 25/3/12, Cheer Xiao <xiaqqaix(a)gmail.com> > wrote: > > > > <snipped> > >> So according to you and the thread Jerome > mentioned, uxtheme > >> is one of > >> the more tricky and less rewarding areas; so I will > set it > >> aside for > >> the moment and work on the IME proposal instead. > > <snipped> > > > > There is no reason why you cannot submit two proposals, > if you are interested in two areas. You do not get penalized > for doing that, other than your own time of preparing two > proposals, which is twice the preparation work. > > > > In fact it is quite common for GSoC students to apply > for more than one project under different/same > organization. > > > > From the organization's point of view, it may be a good > decision to give the project to the strongest candidate if > there are multiple students applying to the same area; or > not to take up any student for lack of interests (from > mentors); in which case you might be still be taken up and > assigned to your "2nd" choice project. > > > > (poor applications - showing no understandings of the > background technology, etc - are rejected, so in that sense > you are penalized if you cannot devote enough time to your > proposal(s), if you divide your efforts). > > > > Thanks for the clarification. On the "multiple proposals" idea, in fact it is explicitly in the GSoC application schedule that there is a final decision afternoon or something, at which some organization admins come together to decide which organization would take a student, if a student had submitted multiple strong proposals to multiple organizations, and multiple organizations had decided to accept the same student to work on two different proposals. So submitting multiple proposals are explicitly allowed. Obviously, if you submit two proposals to the *same* organization, one of your applications would certainly be dropped at some intermediate stage before reaching that final stage, because they are reviewed by the same people (and there are some communications/decisions between organizations *before* that final stage, if multiple applications are made) . This is just because a student cannot be actually working on two projects over the same summer period, so all except one proposals must be turned down/withdrawn *eventually*. I am just saying that, if you feel like you could be happy working on more than one area, and is confident you can get a good proposal in for each (for the same organization, or different ones), by all means submit more than one proposals.

1 0

RFC: A donation for Corel Draw 12 - support.
by Gerold Jens Wucherpfennig 24 Mar '12

24 Mar '12

Hi, how much money do I have to donate to winehq.org to let someone fix Wine for CorelDraw 12? http://appdb.winehq.org/objectManager.php?sClass=version&iId=2390 Installation worked, but Corel is not usable and only reports: "Registry Corrupt - The UI Language registration list is invalid" I've donated a few dollars some years ago to wine and I even coded some cabinet.dll stuff some years ago... Maybe someone can help me with fixing this? Best Regards, Gerold

1 0

XTestFakeKeyEvent events postponed until wine process exits
by Ilya Basin 24 Mar '12

24 Mar '12

Hi list. Currently SendInput() works only with wine windows. I need to send keypresses to all windows, so I created a winelib dll that uses XTestFakeKeyEvent. I call this function from a wine process, but all my fake key presses wait for the process to exit. What is the reason?

1 0

Re: [website] Spanish translation for release 1.5.0
by Frédéric Delanoy 24 Mar '12

24 Mar '12

On Sat, Mar 24, 2012 at 12:13, Eduardo García <eduardo.garcia(a)gmx.com> wrote: > You should send diff using git (e.g. with 'git format-patch -k 1) i.e. sthg like http://source.winehq.org/patches/data/84646

1 0

Re: [PATCH] mscoree: Print the correct values in a TRACE.
by Nicolas Le Cam 23 Mar '12

23 Mar '12

Le 23 mars 2012 21:41, Lauri Kenttä <lauri.kentta(a)gmail.com> a écrit : > --- > dlls/mscoree/mscoree_main.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/dlls/mscoree/mscoree_main.c b/dlls/mscoree/mscoree_main.c > index 1aa120f..0ebc813 100644 > --- a/dlls/mscoree/mscoree_main.c > +++ b/dlls/mscoree/mscoree_main.c > @@ -359,7 +359,7 @@ HRESULT WINAPI GetRequestedRuntimeInfo(LPCWSTR pExe, LPCWSTR pwszVersion, LPCWST > > HRESULT WINAPI GetRequestedRuntimeVersion(LPWSTR pExe, LPWSTR pVersion, DWORD cchBuffer, DWORD *dwlength) > { > - TRACE("(%s, %p, %d, %p)\n", debugstr_w(pExe), debugstr_w(pExe), cchBuffer, dwlength); > + TRACE("(%s, %p, %d, %p)\n", debugstr_w(pExe), pVersion, cchBuffer, dwlength); > > if(!dwlength) > return E_POINTER; > -- > 1.7.9.4 > > > Hi Lauri, Should be %s debugstr_w(pVersion) IMHO. -- Nicolas Le Cam

2 2

Re: mscoree: Print the debug string and not the pointer to it.
by Lauri Kenttä 23 Mar '12

23 Mar '12

On 2012-03-22 00:36, Michael Stefaniuc wrote: > HRESULT WINAPI GetRequestedRuntimeVersion(LPWSTR pExe, LPWSTR > pVersion, DWORD cchBuffer, DWORD *dwlength) > { > - TRACE("(%s, %p, %d, %p)\n", debugstr_w(pExe), debugstr_w(pExe), > cchBuffer, dwlength); > + TRACE("(%s, %s, %d, %p)\n", debugstr_w(pExe), debugstr_w(pExe), > cchBuffer, dwlength); Why is pExe printed two times? Maybe the second one should be pVersion? -- Lauri Kenttä

2 1

GSoC 2012 - Implement a few missing functions in D3DX9
by Józef Kucia 21 Mar '12

21 Mar '12

Hi there, I'm writing to discuss my project proposal for upcoming Google Summer of Code. I was recently playing with Wine, looking around in the code and searching through Wine bugzilla. As a result I found out that there is still a quite number of functions missing in Wine's D3DX implementation. However, some of them are probably not used much in a real software. For example, the mostly unimplemented ID3DXSkinInfo interface seems to be not used frequently. In this email I would like to present things which I would like to implement. I hope that implementation of this functions, or at least some of them, could improve Wine compatibility with a few real applications. I would like to implement the following things: * Implement D3DXCreateRenderToSurface function and ID3DXRenderToSurface interface. * Finish the implementation of ID3DXFont, particularly ID3DXFont::DrawTextA and ID3DXFont::DrawTextW functions. * Implement D3DXCreateCubeTextureFrom* and D3DXCreateVolumeTextureFrom* functions. * Add support for DDS file format in D3DXGetImageInfoFrom* functions. I think I could also implement a few missing functions in ID3DXConstantTable interface, as a bonus task. I'm looking forward for a feedback. If you find any D3DX's function more important than functions enumerated by me, please let me know. I'm also looking for applications with heavy usage of D3DX dlls, especially applications which are using unimplemented or partially implemented functions (yes, I'm aware about http://wiki.winehq.org/DirectX-D3DX9). Cheers, Józef Kucia

4 8

Updating GSoC proposal
by Jacek Caban 21 Mar '12

21 Mar '12

Hi all, GSoC is starting this year and, if we want to have good applications, we need to update our proposals. Usually the most attention is directed into adding new ones, while we keep obviously bad (or just bad IMO) proposals on the page. I'm planning to remove following project proposals: Security - implement sandboxing Theming - Implement Wine theming support NTDLL - support performance registry keys Winelib Aware Scons (or cmake) Cleanup Winemenubuilder to support generating Application Bundles on Mac OS X Wine-based application virtualization If someone knows a reason to not remove them, please reply. Cheers, Jacek

9 16

Re: Changed UrlGetPartA and UrlGetPartW to return the correct (different) values.
by Nikolay Sivov 21 Mar '12

21 Mar '12

On 3/21/2012 09:24, Eric Culp wrote: > On Wed, Mar 21, 2012 at 2:59 AM, Nikolay Sivov <bunglehead(a)gmail.com > <mailto:bunglehead@gmail.com>> wrote: > > On 3/21/2012 08:58, Eric Culp wrote: > > The two functions have different return values on windows for > analogous inputs. > Changed to match windows behavior. > --- > dlls/shlwapi/url.c | 12 ++++++++++-- > 1 file changed, 10 insertions(+), 2 deletions(-) > > Please add some tests for that. > > I think it's already covered by > > dlls/shlwapi/tests/url.c:672 > res = pUrlGetPartA("hi", szPart, &dwSize, URL_PART_SCHEME, 0); > ok (res==S_FALSE, "UrlGetPartA(\"hi\") returned %08X\n", res); > > and > > dlls/shlwapi/tests/url.c:685 > res = pUrlGetPartW(hiW, bufW, &dwSize, URL_PART_SCHEME, 0); > todo_wine ok(res==S_OK, "UrlGetPartW(\"hi\") returned %08X\n", res); > > Line 686 was the one that previously triggered a todo. Should the > todo_wine be removed? Yes, you should run 'make test' and get no errors after your changes. If you fixed todo it should be removed, if you break existing test you should fix your patch. > > > >

1 0

Re: Changed UrlGetPartA and UrlGetPartW to return the correct (different) values.
by Nikolay Sivov 21 Mar '12

21 Mar '12

On 3/21/2012 08:58, Eric Culp wrote: > The two functions have different return values on windows for analogous inputs. > Changed to match windows behavior. > --- > dlls/shlwapi/url.c | 12 ++++++++++-- > 1 file changed, 10 insertions(+), 2 deletions(-) Please add some tests for that.

1 0

re: Are we the reason Apple isn't helping us?
by Dan Kegel 21 Mar '12

21 Mar '12

Vitaliy wrote: > Can you show me exactly where did I yell at him? Or where I wasn't polite enough I think it was http://bugs.winehq.org/show_bug.cgi?id=29922#c14 where you wrote "Would bugzilla admin please remove / ban this user? Jeremy, you've been told by the only person who commits stuff to Wine - Everything working fine, there is nothing to fix. Period, conversation over. If you reopen this bug it will be an indication to bad your user record." There ought to be some wiggle room granted people who work at important neighboring projects who are unable for whatever reason to follow Wine's usual conventions; at the very least, we shouldn't actively drive them away like that. - Dan

6 10

Re: usp10: properly handle invalide arguments to ScriptBreak
by Nikolay Sivov 19 Mar '12

19 Mar '12

On 3/19/2012 18:56, Aric Stewart wrote: > Fix for bug 30219 > --- > dlls/usp10/usp10.c | 2 ++ > 1 files changed, 2 insertions(+), 0 deletions(-) Could you add a test for that? Or there's some troubles with that, like different native usp10 versions behaviour or anything? >

1 0

Networking+wine
by prateek papriwal 19 Mar '12

19 Mar '12

Networking + wine (like as running uTorrent in ubuntu) can be very dangerous. I feel there should be some sandboxing(as in Windows) to prevent frequent attacks. I would be very interested in implementing sandboxing for running Wine applications. Thank you Prateek

3 3

Re: [1/2] msvcrt: Add tmpfile_s implementation (resend)
by Alexandre Julliard 18 Mar '12

18 Mar '12

André Hentschel <nerv(a)dawncrow.de> writes: > +int CDECL MSVCRT_tmpfile_s(MSVCRT_FILE** file) > +{ > + if (!file) { > + *MSVCRT__errno() = MSVCRT_EINVAL; > + return MSVCRT_EINVAL; > + } That's not the right way to check parameters in _s functions. -- Alexandre Julliard julliard(a)winehq.org

2 1

Re: po: Update Polish translation.
by Frédéric Delanoy 17 Mar '12

17 Mar '12

On Sat, Mar 17, 2012 at 19:27, Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> wrote: > Dnia sobota, 17 marca 2012 15:29:25 piszesz: >> On Fri, Mar 16, 2012 at 20:15, Łukasz Wojniłowicz >> >> <lukasz.wojnilowicz(a)gmail.com> wrote: >> > --- >> > po/pl.po | 70 >> > ++++++++++++++++++++++++++++--------------------------------- 1 files >> > changed, 32 insertions(+), 38 deletions(-) >> > >> > #: cryptui.rc:296 >> > -#, fuzzy >> > #| msgid "Cryptographic Message Syntax Standard/PKCS #7 Messages >> > (.p7b)" >> >> Those #| lines must be removed as well (previous msgid) >> >> Frédéric > > I edited it through lokalize (computer aided translation application) and it > didn't remove it. Is it vital for this patch to be accepted? AJ doesn't want those, and I agree (no need for former msgid when the entry is updated: that's just noise) I guess it should appear as comment in localize (not tested), or else you can use an editor/sed to remove those. Frédéric

1 0

Re: po: Update Polish translation.
by Frédéric Delanoy 17 Mar '12

17 Mar '12

On Fri, Mar 16, 2012 at 20:15, Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> wrote: > --- > po/pl.po | 70 ++++++++++++++++++++++++++++--------------------------------- > 1 files changed, 32 insertions(+), 38 deletions(-) > > #: cryptui.rc:296 > -#, fuzzy > #| msgid "Cryptographic Message Syntax Standard/PKCS #7 Messages (.p7b)" Those #| lines must be removed as well (previous msgid) Frédéric

1 0

What happened to my patch? --> msvcrt/file.c: file mode T (temporary file) (try 4)
by Robert van Herk 17 Mar '12

17 Mar '12

Hi all, I never heard from my patch again. Has it fallen into a void? Kind regards, Robert From: mijnspamboxje(a)hotmail.com To: wine-patches(a)winehq.org Subject: msvcrt/file.c: file mode T (temporary file) (try 4) Date: Tue, 28 Feb 2012 20:55:07 +0100 Dear all, Hereby try 4. Tested by Marvin through my brand new Marvin-test-account... Kind regards, Robert van Herk

2 2

Regarding GSoC 2012 project Ideas
by Jaldeep Vasavada 17 Mar '12

17 Mar '12

Hello, I am Jaldeep, studying Computer Science, in BITS Pilani, India. I checked some projects described on GSoC website. I am interested to work with a project in CMD-project, a parser implementation. Can you please guide in brief about the project work? Can you please explain me the procedure about application for a particular project? Thank You -- Regards Jaldeep Vasavada

1 0

Vacation
by Alexandre Julliard 16 Mar '12

16 Mar '12

Folks, I'll be on vacation for a week, so there won't be any commits. Hopefully we have caused enough regressions in 1.5.0 to keep all you busy ;-) -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [1/2] winefile: Fix compilation warnings in _NO_EXTENSIONS mode
by Alexandre Julliard 16 Mar '12

16 Mar '12

André Hentschel <nerv(a)dawncrow.de> writes: > @@ -3973,6 +3973,7 @@ static BOOL prompt_target(Pane* pane, LPWSTR source, LPWSTR target) > static IContextMenu2* s_pctxmenu2 = NULL; > static IContextMenu3* s_pctxmenu3 = NULL; > > +#ifndef _NO_EXTENSIONS > static void CtxMenu_reset(void) > { > s_pctxmenu2 = NULL; It would be better to get rid of that define, it creates a mess for no good reason. -- Alexandre Julliard julliard(a)winehq.org

2 1

Fwd: [Wine (a project of Software Freedom Conservancy)] Your organization application has been accepted.
by Maarten Lankhorst 16 Mar '12

16 Mar '12

huzzah! -------- Originele bericht -------- Onderwerp: [Wine (a project of Software Freedom Conservancy)] Your organization application has been accepted. Datum: Fri, 16 Mar 2012 17:44:28 +0000 Van: no-reply(a)google-melange.appspotmail.com Aan: m.b.lankhorst(a)gmail.com Your Organization Application for "Wine (a project of Software Freedom Conservancy)" in Google Summer of Code 2012 has been accepted. Please click "http://www.google-melange.com/gsoc/profile/organization/google/gsoc2012?org… to fill in the necessary information and create your Organization. Best regards, Google Open Source Programs

1 0

Re: [2/2] sxs/tests: Add tests for CreateAssemblyNameObject.
by Marvin 16 Mar '12

16 Mar '12

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=17409 Your paranoid android. === WINEBUILD (build) === Make failed

1 0

Re: [PATCH 1/2] urlmon: Add mime handler layer before data is processed
by Marvin 16 Mar '12

16 Mar '12

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=17407 Your paranoid android. === W2K3R2SESP2 (32 bit protocol) === Timeout

2 1

Re: [PATCH 3/8] amstream/tests: Add media streams tests.
by Marvin 16 Mar '12

16 Mar '12

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=17387 Your paranoid android. === W2KPROSP4 (32 bit amstream) === amstream.c:212: Test failed: IAMMultiMediaStream_AddMediaStream returned: 80040256

2 2

Re: wpp: Stop parsing single and double quoted string constants after a first newline character.
by Matteo Bruni 16 Mar '12

16 Mar '12

Il 14 marzo 2012 23:02, Józef Kucia <joseph.kucia(a)gmail.com> ha scritto: > @@ -679,11 +649,23 @@ void pp_writestring(const char *format, ...) > } > } > <pp_iqs,pp_dqs,pp_sqs>\\. add_string(ppy_text, ppy_leng); > -<pp_iqs,pp_dqs,pp_sqs>\n { > +<pp_iqs>\n { > newline(1); > add_string(ppy_text, ppy_leng); > ppy_warning("Newline in string constant encountered (started line %d)", string_start()); > } > +<pp_dqs>\n { > + newline(-1); > + add_string(ppy_text, ppy_leng); > + ppy_warning("Newline in double quoted string constant encountered (started line %d)", string_start()); > + if(end_double_quoted_string()) return tDQSTRING; > + } > +<pp_sqs>\n { > + newline(-1); > + add_string(ppy_text, ppy_leng); > + ppy_warning("Newline in single quoted string constant encountered (started line %d)", string_start()); > + if(end_single_quoted_string()) return tSQSTRING; > + } > > /* > * Identifier scanning I'm not sure this is legit. If I'm reading the C spec correctly, a character or string constant can be only terminated by ' or " respectively. Although it can't contain unescaped newline characters either, so it looks like we are actually in the realm of "undefined behavior". So, I guess this change will only have any effect on non-standard complying sources, and in the specific case of asm-style comments, it brings us the behavior we want. On the other hand, it also actually turns an error (unexpected end of file) into a warning, which may be troublesome in general. I hope it doesn't break anything else... (You can take this email as "okay for me, but someone else may know better")

2 2

Re: [2/4](resend)strmbase: implement BaseControlWindow
by Nikolay Sivov 16 Mar '12

16 Mar '12

On 3/16/2012 04:00, Aric Stewart wrote: > +HRESULT WINAPI BaseControlWindowImpl_GetTypeInfo(IVideoWindow *iface, UINT iTInfo, LCID lcid, ITypeInfo**ppTInfo) > +{ > + BaseControlWindow* This = (BaseControlWindow*)iface; > + It doesn't look like a normal COM interface (lack of refcount for example, and corresponding IUnknown support), but I think it's still better to use a cleaner way to get impl pointer like all others do now - with impl_from_*() functions.

2 1

Re: [PATCH 1/4] mshtml: Get rid of PRBool in nsiface.idl
by Henri Verbeet 16 Mar '12

16 Mar '12

On 15 March 2012 11:54, Jacek Caban <jacek(a)codeweavers.com> wrote: > > +typedef unsigned char cpp_bool; > +#define bool cpp_bool > +cpp_quote("#define PRBool cpp_bool") /* FIXME */ Is there any chance this is going to conflict with bool from stdbool.h? Technically that's C99, and we don't use C99, but I imagine it could still be pulled in by some other header.

2 1

Re: [po]Update Ukrainian translation
by Francois Gouget 16 Mar '12

16 Mar '12

Why did you remove these? #: xcopy.rc:43 msgctxt "File key" msgid "F" -msgstr "F" +msgstr "" #: xcopy.rc:44 msgctxt "Directory key" msgid "D" -msgstr "D" +msgstr "" They are supposed to match the key specified by the translation below which they did: #: xcopy.rc:34 msgid "" "Is '%1' a filename or directory\n" "on the target?\n" "(F - File, D - Directory)\n" msgstr "" "'%1' є файлом чи директорією?\n" "(F - Файл, D - Директорія)\n" -- Francois Gouget <fgouget(a)free.fr> http://fgouget.free.fr/ La terre est une bêta...

1 0

qcap patch
by Christian Costa 16 Mar '12

16 Mar '12

Forget my qcap patch. It's the wrong one and I need to add missing CLSID defines in some headers first.

1 0

Re: kernel32: add a stub for InitializeConditionVariable
by Dmitry Timoshkov 16 Mar '12

16 Mar '12

Austin English <austinenglish(a)gmail.com> wrote: > +VOID WINAPI InitializeConditionVariable(PCONDITION_VARIABLE variable) > +{ > + FIXME("stub: %p\n", variable); > + variable = NULL; > +} 'variable = NULL;' is a nop, you may need to add a real initialization. -- Dmitry.

1 0

Re: [PATCH 8/8] amstream/tests: Add some tests to retreive media streams to media stream filter.
by Marvin 15 Mar '12

15 Mar '12

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=17392 Your paranoid android. === W2KPROSP4 (32 bit amstream) === amstream.c:229: Test failed: IAMMultiMediaStream_AddMediaStream returned: 80040256

1 0

Re: [PATCH 7/8] amstream: Implement IAMMultiMediaStreamImpl_AddMediaStream + add tests.
by Marvin 15 Mar '12

15 Mar '12

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=17391 Your paranoid android. === W2KPROSP4 (32 bit amstream) === amstream.c:219: Test failed: IAMMultiMediaStream_AddMediaStream returned: 80040256

1 0

Re: [PATCH 6/8] amstream: No media stream is created when the defaut renderer is used.
by Marvin 15 Mar '12

15 Mar '12

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=17390 Your paranoid android. === W2KPROSP4 (32 bit amstream) === amstream.c:212: Test failed: IAMMultiMediaStream_AddMediaStream returned: 80040256

1 0

Re: [PATCH 5/8] amstream: Video streams do not support default renderer.
by Marvin 15 Mar '12

15 Mar '12

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=17389 Your paranoid android. === W2KPROSP4 (32 bit amstream) === amstream.c:212: Test failed: IAMMultiMediaStream_AddMediaStream returned: 80040256

1 0

Re: [PATCH 4/8] amstream: Check purpose id in AddMediaStream.
by Marvin 15 Mar '12

15 Mar '12

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=17388 Your paranoid android. === W2KPROSP4 (32 bit amstream) === amstream.c:212: Test failed: IAMMultiMediaStream_AddMediaStream returned: 80040256

1 0

Re: [PATCH 2/8] amstream/tests: Make test.avi filename an unicode string and test the file presence once for all.
by Marvin 15 Mar '12

15 Mar '12

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=17386 Your paranoid android. === WVISTAADM (32 bit amstream) === Failure running script in VM: The specified guest user must be logged in interactively to perform this operation

1 0

Re: po: Update Korean translation
by Frédéric Delanoy 15 Mar '12

15 Mar '12

On Wed, Mar 14, 2012 at 13:31, Hwang YunSong(황윤성) <hys545(a)dreamwiz.com>wrote: > fuzzy sections translated > Please remove the "#| msgid" comment lines (previous msgid) and resubmit.

1 0

Re: kernel32/tests: Verify the stability of CreateTimerQueue.
by Alexandre Julliard 15 Mar '12

15 Mar '12

Joerg-Cyril.Hoehle(a)t-systems.com writes: > I've been using > if (winetest_debug > 0) > partly because the trace output in a Gnome-terminal slows down wine such that the tests fail > -- redirect output to a file and the problem goes away (testbot does this) -- > and partly because make -j can cause a high system load, causing an inability to > maintain the average rate (make test uses runtest -q, i.e. winetest_debug==0). This is not a good idea. Tests have to be run by make test. Running tests with make -j is not supported anyway. -- Alexandre Julliard julliard(a)winehq.org

2 2

Re: [PATCH 2/2] ieframe: Added EnumVerbs tests
by Marvin 15 Mar '12

15 Mar '12

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=17375 Your paranoid android. === WNT4WSSP6 (32 bit webbrowser) === webbrowser.c:3237: Test failed: Creating WebBrowser object failed: 80040154 webbrowser.c:3237: Test failed: Creating WebBrowser object failed: 80040154 webbrowser.c:3237: Test failed: Creating WebBrowser object failed: 80040154 webbrowser.c:3237: Test failed: Creating WebBrowser object failed: 80040154 webbrowser.c:3356: Test failed: Creating WebBrowser object failed: 80040154 webbrowser.c:3331: Test failed: Could not get WebBrowserV1 instance: 80040154 webbrowser: unhandled exception c0000005 at 0040AE3E === W2KPROSP4 (32 bit webbrowser) === webbrowser.c:2587: Test failed: expected GetOverridesKeyPath webbrowser.c:2591: Test failed: expected Invoke_SETSECURELOCKICON webbrowser.c:2592: Test failed: expected Invoke_FILEDOWNLOAD webbrowser.c:2201: Test failed: put_Resizable failed: 80004001 webbrowser.c:2202: Test failed: expected Invoke_WINDOWSETRESIZABLE webbrowser.c:2206: Test failed: put_Resizable failed: 80004001 webbrowser.c:2207: Test failed: expected Invoke_WINDOWSETRESIZABLE webbrowser.c:2587: Test failed: expected GetOverridesKeyPath webbrowser.c:2591: Test failed: expected Invoke_SETSECURELOCKICON webbrowser.c:2592: Test failed: expected Invoke_FILEDOWNLOAD webbrowser.c:410: Test failed: unexpected call Exec_SETDOWNLOADSTATE_0 webbrowser.c:2201: Test failed: put_Resizable failed: 80004001 webbrowser.c:2202: Test failed: expected Invoke_WINDOWSETRESIZABLE webbrowser.c:2206: Test failed: put_Resizable failed: 80004001 webbrowser.c:2207: Test failed: expected Invoke_WINDOWSETRESIZABLE webbrowser.c:2587: Test failed: expected GetOverridesKeyPath webbrowser.c:2591: Test failed: expected Invoke_SETSECURELOCKICON webbrowser.c:2592: Test failed: expected Invoke_FILEDOWNLOAD webbrowser.c:469: Test failed: unexpected nCmdID 29 webbrowser.c:1007: Test failed: unexpected call GetContainer webbrowser.c:517: Test failed: unexpected call webbrowser.c:1007: Test failed: unexpected call GetContainer webbrowser.c:517: Test failed: unexpected call webbrowser.c:2750: Test failed: expected Invoke_SETSECURELOCKICON webbrowser.c:2877: Test failed: expected TranslateUrl webbrowser.c:2878: Test failed: expected Invoke_BEFORENAVIGATE2 webbrowser.c:2880: Test failed: expected Invoke_PROPERTYCHANGE webbrowser.c:2886: Test failed: ReadyState = 1, expected 4 webbrowser.c:2696: Test failed: ReadyState = 1, expected 4 webbrowser.c:839: Test failed: unexpected call Invoke_PROPERTYCHANGE webbrowser.c:855: Test failed: unexpected call Invoke_BEFORENAVIGATE2 webbrowser.c:862: Test failed: ReadyState = 1, expected 4 webbrowser.c:614: Test failed: unexpected call Invoke_AMBIENT_USERMODE webbrowser.c:614: Test failed: unexpected call Invoke_AMBIENT_USERMODE webbrowser.c:617: Test failed: unexpected call Invoke_AMBIENT_DLCONTROL webbrowser.c:621: Test failed: unexpected call Invoke_AMBIENT_USERAGENT webbrowser.c:625: Test failed: unexpected call Invoke_AMBIENT_PALETTE webbrowser.c:1557: Test failed: unexpected call GetOptionKeyPath webbrowser.c:359: Test failed: unexpected call QueryStatus_SETPROGRESSTEXT webbrowser.c:839: Test failed: unexpected call Invoke_PROPERTYCHANGE webbrowser.c:839: Test failed: unexpected call Invoke_PROPERTYCHANGE webbrowser.c:839: Test failed: unexpected call Invoke_PROPERTYCHANGE webbrowser.c:839: Test failed: unexpected call Invoke_PROPERTYCHANGE webbrowser.c:469: Test failed: unexpected nCmdID 26 webbrowser.c:469: Test failed: unexpected nCmdID 29 webbrowser.c:1007: Test failed: unexpected call GetContainer webbrowser.c:517: Test failed: unexpected call webbrowser.c:791: Test failed: ReadyState = 1, expected 4 webbrowser.c:1568: Test failed: unexpected call GetDropTarget webbrowser.c:1007: Test failed: unexpected call GetContainer webbrowser.c:517: Test failed: unexpected call webbrowser.c:2750: Test failed: expected Invoke_SETSECURELOCKICON webbrowser.c:3274: Test failed: doc != doc2 webbrowser.c:614: Test failed: unexpected call Invoke_AMBIENT_USERMODE webbrowser.c:614: Test failed: unexpected call Invoke_AMBIENT_USERMODE webbrowser.c:617: Test failed: unexpected call Invoke_AMBIENT_DLCONTROL webbrowser.c:621: Test failed: unexpected call Invoke_AMBIENT_USERAGENT webbrowser.c:625: Test failed: unexpected call Invoke_AMBIENT_PALETTE webbrowser.c:1557: Test failed: unexpected call GetOptionKeyPath webbrowser.c:359: Test failed: unexpected call QueryStatus_SETPROGRESSTEXT webbrowser.c:469: Test failed: unexpected nCmdID 26 webbrowser.c:469: Test failed: unexpected nCmdID 29 webbrowser.c:1007: Test failed: unexpected call GetContainer webbrowser.c:517: Test failed: unexpected call webbrowser.c:1568: Test failed: unexpected call GetDropTarget webbrowser.c:1007: Test failed: unexpected call GetContainer webbrowser.c:517: Test failed: unexpected call webbrowser.c:2743: Test failed: expected TranslateUrl webbrowser.c:2750: Test failed: expected Invoke_SETSECURELOCKICON webbrowser.c:3281: Test failed: doc != doc2 webbrowser.c:614: Test failed: unexpected call Invoke_AMBIENT_USERMODE webbrowser.c:614: Test failed: unexpected call Invoke_AMBIENT_USERMODE webbrowser.c:617: Test failed: unexpected call Invoke_AMBIENT_DLCONTROL webbrowser.c:621: Test failed: unexpected call Invoke_AMBIENT_USERAGENT webbrowser.c:625: Test failed: unexpected call Invoke_AMBIENT_PALETTE webbrowser.c:1557: Test failed: unexpected call GetOptionKeyPath webbrowser.c:359: Test failed: unexpected call QueryStatus_SETPROGRESSTEXT webbrowser.c:469: Test failed: unexpected nCmdID 26 webbrowser.c:469: Test failed: unexpected nCmdID 29 webbrowser.c:1007: Test failed: unexpected call GetContainer webbrowser.c:517: Test failed: unexpected call webbrowser.c:1568: Test failed: unexpected call GetDropTarget webbrowser.c:1007: Test failed: unexpected call GetContainer webbrowser.c:517: Test failed: unexpected call webbrowser.c:2743: Test failed: expected TranslateUrl webbrowser.c:2750: Test failed: expected Invoke_SETSECURELOCKICON webbrowser.c:2877: Test failed: expected TranslateUrl webbrowser.c:2878: Test failed: expected Invoke_BEFORENAVIGATE2 webbrowser.c:2886: Test failed: ReadyState = 1, expected 4 webbrowser.c:2696: Test failed: ReadyState = 1, expected 4 webbrowser.c:855: Test failed: unexpected call Invoke_BEFORENAVIGATE2 webbrowser.c:862: Test failed: ReadyState = 1, expected 4 webbrowser.c:614: Test failed: unexpected call Invoke_AMBIENT_USERMODE webbrowser.c:614: Test failed: unexpected call Invoke_AMBIENT_USERMODE webbrowser.c:617: Test failed: unexpected call Invoke_AMBIENT_DLCONTROL webbrowser.c:621: Test failed: unexpected call Invoke_AMBIENT_USERAGENT webbrowser.c:625: Test failed: unexpected call Invoke_AMBIENT_PALETTE webbrowser.c:1557: Test failed: unexpected call GetOptionKeyPath webbrowser.c:359: Test failed: unexpected call QueryStatus_SETPROGRESSTEXT webbrowser.c:469: Test failed: unexpected nCmdID 26 webbrowser.c:469: Test failed: unexpected nCmdID 29 webbrowser.c:1007: Test failed: unexpected call GetContainer webbrowser.c:517: Test failed: unexpected call webbrowser.c:791: Test failed: ReadyState = 1, expected 4 webbrowser.c:1568: Test failed: unexpected call GetDropTarget webbrowser.c:469: Test failed: unexpected nCmdID 16 webbrowser.c:469: Test failed: unexpected nCmdID 15 webbrowser.c:469: Test failed: unexpected nCmdID 16 webbrowser.c:469: Test failed: unexpected nCmdID 15 webbrowser.c:469: Test failed: unexpected nCmdID 16 webbrowser.c:469: Test failed: unexpected nCmdID 15 webbrowser.c:469: Test failed: unexpected nCmdID 16 webbrowser.c:469: Test failed: unexpected nCmdID 15 webbrowser.c:469: Test failed: unexpected nCmdID 16 webbrowser.c:469: Test failed: unexpected nCmdID 15 webbrowser.c:469: Test failed: unexpected nCmdID 16 webbrowser.c:469: Test failed: unexpected nCmdID 15 webbrowser.c:469: Test failed: unexpected nCmdID 16 webbrowser.c:469: Test failed: unexpected nCmdID 15 webbrowser.c:469: Test failed: unexpected nCmdID 16 webbrowser.c:469: Test failed: unexpected nCmdID 15 webbrowser.c:469: Test failed: unexpected nCmdID 16 webbrowser.c:469: Test failed: unexpected nCmdID 15 webbrowser.c:469: Test failed: unexpected nCmdID 16 webbrowser.c:469: Test failed: unexpected nCmdID 15 webbrowser.c:1007: Test failed: unexpected call GetContainer webbrowser.c:517: Test failed: unexpected call webbrowser.c:469: Test failed: unexpected nCmdID 16 webbrowser.c:469: Test failed: unexpected nCmdID 15 webbrowser.c:2750: Test failed: expected Invoke_SETSECURELOCKICON webbrowser.c:2696: Test failed: ReadyState = 1, expected 4 webbrowser.c:839: Test failed: unexpected call Invoke_PROPERTYCHANGE webbrowser.c:855: Test failed: unexpected call Invoke_BEFORENAVIGATE2 webbrowser.c:614: Test failed: unexpected call Invoke_AMBIENT_USERMODE webbrowser.c:614: Test failed: unexpected call Invoke_AMBIENT_USERMODE webbrowser.c:617: Test failed: unexpected call Invoke_AMBIENT_DLCONTROL webbrowser.c:621: Test failed: unexpected call Invoke_AMBIENT_USERAGENT webbrowser.c:625: Test failed: unexpected call Invoke_AMBIENT_PALETTE webbrowser.c:1557: Test failed: unexpected call GetOptionKeyPath webbrowser.c:359: Test failed: unexpected call QueryStatus_SETPROGRESSTEXT webbrowser.c:469: Test failed: unexpected nCmdID 26 webbrowser.c:469: Test failed: unexpected nCmdID 16 webbrowser.c:469: Test failed: unexpected nCmdID 15 webbrowser.c:469: Test failed: unexpected nCmdID 29 webbrowser.c:1007: Test failed: unexpected call GetContainer webbrowser.c:517: Test failed: unexpected call webbrowser.c:791: Test failed: ReadyState = 1, expected 4 webbrowser.c:1568: Test failed: unexpected call GetDropTarget webbrowser.c:1007: Test failed: unexpected call GetContainer webbrowser.c:517: Test failed: unexpected call webbrowser.c:2750: Test failed: expected Invoke_SETSECURELOCKICON webbrowser.c:2991: Test failed: expected RequestUIActivate webbrowser.c:3083: Test failed: Got 0x80004002 webbrowser.c:3178: Test failed: QueryService failed: 80004002 webbrowser: unhandled exception c0000005 at 0040DA02

2 1

Re: Problem with Precise beta 1, unity-3d, and wine menus?
by Dan Kegel 15 Mar '12

15 Mar '12

Thanks, Alexey! - Dan On Wed, Mar 14, 2012 at 4:37 PM, Alexey Loukianov <mooroon2(a)mail.ru> wrote: > -----BEGIN PGP SIGNED MESSAGE----- > Hash: SHA1 > > 13.03.2012 06:35, Dan Kegel wrote: >> In all cases, I'm using the commercial nvidia drivers supplied by ubuntu >> (for precise, version 295.20; for 11.10, version 280.13), so I'm not sure >> if the problem is the new X, or the new drivers. >> >> Before I go reporting an ubuntu bug, or jamming newer drivers into my older >> ubuntu system, has anybody else noticed this? > > Hello Dan, > > Chances are good you're hitting nVIDIA drivers bug: it had been reported on > "official nVIDIA Linux support forum" (nvnews.net) that since around 295.17+ > there are a lot of corrupted rendering of UI elements, especially for Gtk2/3 > apps. For 295.20 there are several other bug reports available, both on nvnews > forums and in Wine's Bugzilla, not directly related to "corrupted rendering" > problem, but rather about unexpected crashes in apps which had been working > good previously with the older driver version. > > As for me - since I had moved from 280.13 into using drivers 295.17 (had to > skip all versions in-between due to various rendering bugs they had introduced > when playing games under Wine) I had noticed some rendering issues in apps > which use accelerated GPU rendering to do compositing (recent versions of > Firefox and Thunderbird and Google Chrome). Tomorrow I'm going to give 295.20 > a test - there's bug report about "Rage" game crashing with this driver > version under Linux/Wine I want to reproduce - and in case 295.20 would cause > crashed and/or rendering bugs on my PC I'm going to revert back to 280.13 or > to the latest driver from 275.x series. > > - -- > Best regards, > Alexey Loukianov mailto:mooroon2@mail.ru > System Engineer, Mob.:+7(926)218-1320 > *nix Specialist > > -----BEGIN PGP SIGNATURE----- > Version: GnuPG v2.0.16 (GNU/Linux) > Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/ > > iQEcBAEBAgAGBQJPYSvAAAoJEPB9BOdTkBULAPIIAIHvvLaGTXY4JoIzQ0T9mced > I/P9GGulrxyZimf+heaneXYhxNKySI60z5O7GoLZsuZysT8o45HWvCmkb6zSZ/WE > +O3bpH2Q4eoTWulCiONSPnNVouNreRTQE7tLksdtWn5VX9l/roBGBBdM79jF2wB4 > I8zyEihmB8eQepLA7czDrNVUSOyScp+rdCH4u1SUdP0Vg034WJviIgcaahrBqLRG > gdINXPpZ0O9Tj688GrrwP8PWy5k7ZkVKY4XtjzsN1XlJW2M9HmD0N1AoI39WtpXd > U4KL4O0daVmQ3x4wfrHUy5KRCgfpMDS8xBL6gfbTxAHLKhon9XhFP2cxrbao2gM= > =ZS+F > -----END PGP SIGNATURE-----

1 0

Problem with Precise beta 1, unity-3d, and wine menus?
by Dan Kegel 15 Mar '12

15 Mar '12

Hi all, on Precise beta 1 logged in with unity-3d, giving the command wine winemine and then clicking on the "Game" menu usually results in only a small part of the pulldown menu showing up. (Also shows up in many other apps that use menus, e.g. mspaint.) This is not a problem in unity 2d, or in Ubuntu 11.10 with unity 3d. Using virtual desktop, or telling the window manager to not manage windows, works around the problem. In all cases, I'm using the commercial nvidia drivers supplied by ubuntu (for precise, version 295.20; for 11.10, version 280.13), so I'm not sure if the problem is the new X, or the new drivers. Before I go reporting an ubuntu bug, or jamming newer drivers into my older ubuntu system, has anybody else noticed this?

2 1

A question about Wine's mshtml implementation vs. crashing app
by Alexey Loukianov 14 Mar '12

14 Mar '12

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Good day to all, I've got a question, which is most probably should be addressed to Jacek Caban, concerning the proper way to debug and report about the problems with wine-gecko/mshtml implementation. What I've got here is an app that crashes unless I install IE6 or IE7 (i.e. - native mshtml implementation) using winetricks. So, what should I do (what data to collect, what test to run) prior to firing up a new bug report to Bugzilla? Thanks in advance for hints. P.S. Another thing about wine-gecko vs. native dlls: in case one would try to install native VC++ 6.0 runtime and then try to run some app which imports mshtml - it would crash on wine-gecko trying to import non-exported function from msvcrt runtime. Is it considered a bug by Wine devs? Should I report it? - -- Best regards, Alexey Loukianov mailto:mooroon2@mail.ru System Engineer, Mob.:+7(926)218-1320 *nix Specialist -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.16 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/ iQEcBAEBAgAGBQJPX6cYAAoJEPB9BOdTkBUL/LUH/RmvvObiDIwTTmqKke76cE42 aNmTKirFiadIYZKTZsqJlRzox3lRj0ySfOy8C7mHUREOwFhhMR4b8FwTEtemfhEN 9hpyPvY4iNel8YUMA8TJW1B8jb8sOlDPlg+qyphUcJI89vGHf7slCwzHLRYwJbjK qgqONwtg49WLuDs2IRqyYptgTr3wKZw5yJC036DBaF/pg2JeCZIqF0p3ZDD+6+Vg OnrcvLLRn+Ij1bagpVe25YSZCLqMSCHB73tU18ou6/1OHvualVagBzit++TLWQ4M 2/fE/+mi+oL0qZ9TXnsyfhlGAv7lD4TD2BOSvFiK2Si392bY8xXNk4VdmuXL1rE= =uDnt -----END PGP SIGNATURE-----

3 3

Re: [PATCH] po: Remove bad characters (C2 & A0) from french translations.
by Nikolay Sivov 14 Mar '12

14 Mar '12

On 3/12/2012 21:52, Christian Costa wrote: > They are displayed as a single space in a text editor but visible with an hex editor. I guess this is a non-breakable space.

6 12

Re: [PATCH] po: Remove bad characters (C2 & A0) from french translations.
by Christian Costa 14 Mar '12

14 Mar '12

Le 13/03/2012 16:23, Frédéric Delanoy a écrit : > On Tue, Mar 13, 2012 at 14:30, Henri Verbeet<hverbeet(a)gmail.com> wrote: >> On 13 March 2012 00:42, Christian Costa<titan.costa(a)gmail.com> wrote: >>> BTW, is there an editor that shows them ? gvim doesn't. >> Assuming gvim is similar enough to normal vim, you can use listchars >> to highlight various things. Use nbsp for non-breaking spaces. You can >> use Ctrl+K to insert digraphs. Use "NS" for non-breaking space, >> :digraphs for a list. > More precisely, as Henri told me, you can use sthg like > > set list listchars=tab:»·,trail:·,nbsp:␣ > (when using utf-8 encoding) > > Frédéric > It's magic. Nbsp are better than in emacs. Thanks to both of you. I didn't manage to insert NS with control+K tough. Christian

1 0

Re: po: Update Korean translation
by Frédéric Delanoy 14 Mar '12

14 Mar '12

On Wed, Mar 14, 2012 at 13:31, Hwang YunSong(황윤성) <hys545(a)dreamwiz.com>wrote: > fuzzy sections translated > You may also remove the "#| msgid ..." lines: these only indicate the former msgid, so you can see the difference quickly. Frédéric

1 0

Re: po: Spanish translation update (this patch supersedes previous patches fixing fuzzies)
by Frédéric Delanoy 14 Mar '12

14 Mar '12

On Wed, Mar 14, 2012 at 22:57, Eduardo García <eduardo.garcia(a)gmx.com> wrote: > This patch fixes fuzzies and remove obsolete comments. > > With regards. > > Eduardo You may also remove the "#| msgid ..." lines: these only indicate the former msgid, so you can see the difference quickly. Also, add "(try N)" suffix when you submit a new version of a patch (that's a bit more concise than your "this patch... fuzzies") Frédéric

1 0

Re: My Idea for GSOC
by Stefan Dösinger 14 Mar '12

14 Mar '12

Am Samstag, 10. März 2012, 17:22:51 schrieb Daniel Oom: > Hi, > > Writing tests, or implementing the command line tools seems like > something I could do. I'm kinda leaning towards the command line > tools, since it would offer a chance to thoroughly learn the shading > languages. For learning purposes writing tests and fixing bugs uncovered by them will be better. The command line tools are mostly about parsing parameters and forwarding them to d3dx9 functions(*). If you want to look a little bit in either proposal(we recommend that in general): For the test stuff, take a look at IDirect3DDeviceImpl_2_DrawPrimitive in dlls/ddraw/device.c. It thunks IDirect3DDevice2::DrawPrimitive to IDirect3DDevice7::DrawPrimitive. The main difference is the VertexType parameter. It is a D3DVERTEXTYPE in the IDirect3DDevice2 method, and a DWORD with D3DFVF_* flags in Device7. Our thunk simply converts between these two, but a deeper difference a user noticed is that D3DVT_LVERTEX in Device2 disables lighting calculations, whereas the equivalent D3DFVF flag collection in Device3 and Device7 does not. Device3 and newer have D3DRENDERSTATE_LIGHTING to enable / disable lighting, but this render state does not exist in Device2. Fixing this is fairly straightforward, just call SetRenderState(LIGHTING, ...) in the thunk, but it needs some tests to answer / show the following: * Show that D3DVT_LVERTEX indeed disables lighting, and D3DVT_VERTEX enables it * Show that D3DFVF_LVERTEX does not influence lighting in Device2 and Device7(D3DFVF_TLVERTEX disables all vertex processing in all d3d versions, this is already tested and implemented) * Test what happens when you call SetRenderState and GetRenderState in Device2. * Probably others There are numerous things like that that need testing and probably fixes. This is just one example that happens to be on my todo list. ddraw tests go to dlls/ddraw/tests/ddraw*.c. The other files should be moved to the tests/ddraw*.c files and extended to cover all ddraw versions. For the command line tools, download an older version of the directx sdk that still has vsa.exe and psa.exe(I think 2007 ones were the last ones) and compare their command line parameters to d3dx9.D3DXAssembleShaderFromFile and friends. The tests are certainly the more useful task. vsa.exe and psa.exe would mainly serve developer convenience when writing d3d8 and d3d9 tests since we wouldn't need an ancient dx sdk to assemble our own test shaders. d3d tests and fixes fix actual games. Enjoy, Stefan (*) Actually, that's not how native vsa/psa work. They seem to have their own copy-pasted version of the compiler and assembler, or they link statically. We should probably do it by calling d3dx9 though, especially for tools that mainly serve developer convenience.

3 2

Re: [PATCH 2/8] d3drm: Specify when a method is forwarded to another interface. (resend)
by Alexandre Julliard 14 Mar '12

14 Mar '12

Christian Costa <titan.costa(a)gmail.com> writes: > @@ -438,7 +438,7 @@ static HRESULT WINAPI IDirect3DRMMeshBuilder2Impl_Load(IDirect3DRMMeshBuilder2* > { > IDirect3DRMMeshBuilderImpl *This = impl_from_IDirect3DRMMeshBuilder2(iface); > > - TRACE("(%p)->(%p,%p,%x,%p,%p): partial stub\n", This, filename, name, loadflags, cb, arg); > + TRACE("(%p)->(%p,%p,%x,%p,%p): forwarding to IDirect3DRMMeshBuilder3\n", This, filename, name, loadflags, cb, arg); > > return IDirect3DRMMeshBuilder3_Load(&This->IDirect3DRMMeshBuilder3_iface, filename, name, > loadflags, (D3DRMLOADTEXTURE3CALLBACK)cb, arg); I don't think that's an improvement. "Partial stub" makes a lot more sense for someone not deeply familiar with the code. -- Alexandre Julliard julliard(a)winehq.org

2 3

Re: [1/2] advapi32: Fix failures in the security tests compiled with PSDK headers.
by Alexandre Julliard 14 Mar '12

14 Mar '12

Dmitry Timoshkov <dmitry(a)baikal.ru> writes: > @@ -22,6 +22,9 @@ > #include <stdarg.h> > #include <stdio.h> > > +/* 0x0600 makes PROCESS_ALL_ACCESS not compatible with pre-Vista versions */ > +#define _WIN32_WINNT 0x0500 This will break once the Wine headers are updated. If the definition is not reliable the test should avoid it. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: po: Update Lithuanian translation (resend)
by Alexandre Julliard 14 Mar '12

14 Mar '12

Aurimas Fišeras <aurimas(a)gmail.com> writes: > @@ -2190,16 +2190,14 @@ msgstr "" > "atšauktų liudijimų sąrašą ar patikintų liudijimų sąrašą:" > > #: cryptui.rc:296 > -#, fuzzy > #| msgid "Cryptographic Message Syntax Standard/PKCS #7 Messages (.p7b)" > msgid "Cryptographic Message Syntax Standard/PKCS #7 Messages (*.p7b)" > -msgstr "Kriptografinio pranešimo sintaksės standarto/PKCS #7 pranešimai (.p7b)" > +msgstr "Kriptografinio pranešimo sintaksės standarto/PKCS #7 pranešimai (*.p7b)" You should also remove the previous string comment when updating fuzzy entries. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: jscript: Add VT_I2 support
by Jacek Caban 14 Mar '12

14 Mar '12

Hi Alistair, On 03/14/12 10:00, Alistair Leslie-Hughes wrote: > --- a/dlls/jscript/jsutils.c > +++ b/dlls/jscript/jsutils.c > @@ -187,11 +187,14 @@ HRESULT to_primitive(script_ctx_t *ctx, VARIANT *v, jsexcept_t *ei, VARIANT *ret > case VT_EMPTY: > case VT_NULL: > case VT_BOOL: > - case VT_I2: First of all, this is not a patch against current Git. You're changing core parts of jscript and I'd really like an evidence that it's done in the right direction. There are many parts of code that assume given types are returned as result, so I'm really picky about getting this right. In your previous test you had getVT that was hiding the difference between VT_I4 and VT_I2. I've asked you about better test and now you've removed tests that were using getVT at all and took my guesses as assumptions for implementation. Please add proper tests that really show your implementing things really the right way. Hint: it may be easier to concentrate one one aspect, say to_number which is easy to test, first. That patch may be well split. Cheers, Jacek

1 0

Re: kernel32/tests: Verify the stability of CreateTimerQueue.
by Austin English 14 Mar '12

14 Mar '12

On Wed, Mar 14, 2012 at 05:32, <Joerg-Cyril.Hoehle(a)t-systems.com> wrote: > Hi, > > this should have been labeled [PATCH 3/3] because tests will fail without my 2 ntdll patches. > > First a note unrelated to my patches: if you run the tests in git in a loop, > sometimes one DeleteTimerQueueTimer(INVALID_HANDLE_VALUE) > fails (presumably with IO_PENDING) because a callback was executing concurrently. > Did Dan or anybody else running tests repeatedly observe this? > Surprisingly, test.winehq shows next to nothing like this: > http://test.winehq.org/data/tests/kernel32:sync.html > but one failure comes close (not sure if it's the same): > http://test.winehq.org/data/e79644e6a96eae419082ec78ce8ff3294888d05d/2000_f… > sync.c:867: Test failed: DeleteTimerQueueTimer The list of tests that are skipped by buildbot is at: http://code.google.com/p/winezeug/source/browse/trunk/buildbot/dotests_blac… kernel32/sync is not on the list (nor do I see any emails from buildbot for it failing). -- -Austin

1 0

Having problems with building a deb package of the sources
by Rahul Ghose 14 Mar '12

14 Mar '12

I am using the 1.4-rc6 source code to build the deb package. The source compiles smoothly but debuild -us -uc fails with this message: (last few lines, I hope which are more relevant) ../../../tools/runtest -q -P wine -M atl.dll -T ../../.. -p atl_test.exe.soatl_ax.c && touch atl_ax.ok Application tried to create a window, but no driver could be loaded. Make sure that your X server is running and that $DISPLAY is set correctly. err:systray:initialize_systray Could not create tray window Application tried to create a window, but no driver could be loaded. Make sure that your X server is running and that $DISPLAY is set correctly. fixme:atl:OleClientSite_ShowObject (0x170ed0) - stub fixme:atl:OleClientSite_ShowObject (0x178cb0) - stub fixme:atl:OleClientSite_ShowObject (0x178cf8) - stub atl_ax.c:110: Test failed: Expected AtlAxAttachControl to return S_OK, got 0x00000001 make[2]: *** [atl_ax.ok] Error 1 make[2]: Leaving directory `/home/rahul/Programming/Projects/Downloaded/Wine/wine-1.4-rc6/dlls/atl/tests' make[1]: *** [dlls/atl/tests/__test__] Error 2 make[1]: Leaving directory `/home/rahul/Programming/Projects/Downloaded/Wine/wine-1.4-rc6' dh_auto_test: make -j1 test returned exit code 2 make: *** [build] Error 29 dpkg-buildpackage: error: debian/rules build gave error exit status 2 debuild: fatal error at line 1348: dpkg-buildpackage -rfakeroot -D -us -uc failed Any help regarding this? (I am not sure if this is the best mailing list to send this query to, but I got no help from the wine-users mailing list) Thanks in advance.

3 2

Re: gdiplus: Use StretchBlt instead of GdiAlphaBlend if device doesn't support alpha blending.
by Vincent Povirk 14 Mar '12

14 Mar '12

Uh, in many cases this will be worse than a failed draw.

2 7

Preprocessing asm shaders
by Józef Kucia 13 Mar '12

13 Mar '12

Hi, I'm writing because I found a bug in asm shader preprocessor in Wine and I'm not sure what's the best way to fix it. The D3DPreprocess function is an universal shader preprocess for HLSL and asm shaders. In fact, it's C-like language preprocessor and it doesn't understand assembler style comments (comments from ';' to the end of line). The fact that it doesn't understand these comments is a root of whole problem. Valid asm shaders can contain single or double quotation characters in assembler style comments, and these quotation characters will be treated as a beginning of quoted string constants while preprocessing. The Wine's implementation of D3DPreprocess behaves differently than Windows implementation in respect to strings passing the end of line. Generally, strings passing the end of line are an error in C, but they can result in a correct asm shader when contained in a assembler style comment. D3DPreprocess on Windows works fine for shaders which contains single or double quotation marks. It only issues an error in case of unmatched double quotation mark, but returns D3D_OK anyway. In Wine situation is different, wpp tries to find a matching quotation mark to the end of file, while shader preprocessor on Windows gives up on parsing a string when it gets a first newline character. The result of wpp's behavior is a truncated output and an error returned from D3DPreprocess. I wonder if it's fine to change wpp behavior for strings passing the end of line to mimic the behavior observed on Windows. Perhaps, strings passing the end of line could be treated as an error by default. Whereas D3DCompiler would activate an option to treat such strings as a warning. Thanks, Józef Kucia

3 5

Re: msvcp90/tests: Don't redefine __thiscall (resend).
by Alexandre Julliard 13 Mar '12

13 Mar '12

Nicolas Le Cam <niko.lecam(a)gmail.com> writes: > @@ -60,11 +60,13 @@ static char* (__cdecl *p_Copy_s)(char*, size_t, const char*, size_t); > static unsigned short (__cdecl *p_wctype)(const char*); > static MSVCP__Ctypevec (__cdecl *p__Getctype)(void); > > +#ifndef __thiscall > #ifdef __i386__ > #define __thiscall __stdcall > #else > #define __thiscall __cdecl > #endif > +#endif That seems dangerous, we don't know what it has been defined to. -- Alexandre Julliard julliard(a)winehq.org

2 1

use assert etc. in Wine dlls? What is better?
by Joerg-Cyril.Hoehle＠t-systems.com 13 Mar '12

13 Mar '12

Hi, Maarten's wine-pulse contains several instances of assert() I've been thinking about adding a bit of protection against inconcsistencies within mmdevapi code too. There are two variants that could be applicable depending on the situation: /* this should not happen, but if we detect it early, we can work-around the situation */ if (a > limit) { ERR("%d > %d\n", a, limit); a = limit; } or assert(a <= limit, "whatever %d", a); I'm not too fond of assert. An assert in DSound was one of my first bug fixes in Wine, years ago. It was not obvious why the app should not continue running -- perhaps without sound. OTOH, if an assert is violated, as a programmer, I'd like to hear about it. I found little on that topic in Wine. In 2002, Alexandre Julliard wrote: http://www.winehq.org/pipermail/wine-devel/2002-October/009766.html >A better approach would be to leave assert() alone, and raise an >exception on the SIGABRT signal. What is current opinion on this topic? Thank you, Jörg Höhle

4 3

What happens upon mmdevapi capture overrun on native?
by Joerg-Cyril.Hoehle＠t-systems.com 13 Mar '12

13 Mar '12

Hi, Maarten Lankhorst wrote in winepulse: Add pulseaudio driver, v9: >- Reworked capture logic to always capture, since that seems to be the case on windows, > when stopped we simply drop whole packets, but keep firing the event. Does anybody know what precisely happens upon overrun during capture? A. mmdevapi fills the whole buffer once. It keeps firing events and sets the DISCONTINUITY flag upon the next CaptureClient_GetBuffer. This is like mciwave's "record from 0 to 5000" command. The client can read the oldest recorded samples. B. mmdevapi continuously overwrites the circular buffer. It keeps firing events and sets the DISCONTINUITY flag too. The client gets to see the newest recorded samples. It's like your TV recorder's time shift function that can only travel back by as much as the buffer holds. C. Other, e.g. mixing newest with older packets (current winealsa). In other words, what data does the dlls/mmdevapi/capture test see in: http://source.winehq.org/source/dlls/mmdevapi/tests/capture.c?v=wine-1.4-rc… I think A makes sense but really I don't know. The tests show a position jump by one period worth of frames when reading the next packet after an overrun. That's not what I'd expect from behaviour A. But from behaviour B I'd expect a much larger position jump, as large as elapsed time. We really need somebody with a microphone and Vista/w2k8/w7 to tell us what happens. Does anybody know what DSound does in such a case? (not that it matters...) Thank you, Jörg Höhle

2 3

Re: jscript: Add VT_I2 support
by Jacek Caban 13 Mar '12

13 Mar '12

Hi Alistair, On 03/13/12 10:36, Alistair Leslie-Hughes wrote: > Hi, > > > Changelog: > jscript: Add VT_I2 support static inline BOOL is_num_vt(enum VARENUM vt) { - return vt == VT_I4 || vt == VT_R8; + return vt == VT_I4 || vt == VT_I2 ||vt == VT_R8; } I'm not sure we want this handled this way. I'd much rather make sure VT_I2 (which is not internal jscript type, so it may come only from external/host objects) is never supposed to return TRUE here. If it's unavoidable, it requires convincing tests. static inline DOUBLE num_val(const VARIANT *v) { - return V_VT(v) == VT_I4 ? V_I4(v) : V_R8(v); + switch(V_VT(v)) + { + case VT_I2: + return V_I2(v); + case VT_I4: + return V_I4(v); + case VT_R8: + return V_R8(v); + } + + return 0; } It's similar here, I don't think we want to allow num_val calls on VT_I2. @@ -187,6 +187,7 @@ HRESULT to_primitive(script_ctx_t *ctx, VARIANT *v, jsexcept_t *ei, VARIANT *ret case VT_EMPTY: case VT_NULL: case VT_BOOL: + case VT_I2: That seems like a likely place for VT_I2->VT_I4 conversion. @@ -569,6 +574,9 @@ HRESULT to_string(script_ctx_t *ctx, VARIANT *v, jsexcept_t *ei, BSTR *str) case VT_NULL: *str = SysAllocString(nullW); break; + case VT_I2: + *str = int_to_bstr(V_I2(v)); + break; I'd like to see it covered by tests. @@ -76,7 +76,9 @@ static HRESULT Number_toString(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, D return throw_type_error(ctx, ei, JS_E_INVALIDARG, NULL); } - if(V_VT(&number->num) == VT_I4) + if(V_VT(&number->num) == VT_I2) + val = V_I2(&number->num); + else if(V_VT(&number->num) == VT_I4) I'd much rather keep the assumption that Number stores only VT_I4 or VT_R8. +objI2 = createVT_I2(); +ok(getVT(objI2) === "VT_I4", "getVT(obj) = " + getVT(objI2)); Hmm, this together with this: @@ -603,6 +608,7 @@ static HRESULT WINAPI Global_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, case VT_NULL: V_BSTR(pvarRes) = a2bstr("VT_NULL"); break; + case VT_I2: case VT_I4: V_BSTR(pvarRes) = a2bstr("VT_I4"); break; loses the point of this test. +ok(objI2.toString() === "2", "obj = " + objI2.toString()); +function funcLoopI2() +{ + var i = 0; + /* Tests: to_primitive, to_number */ + for(; i < objI2; i++) + ; + ok(i == objI2, "i(" + i + ") != 1"); +} + +funcLoopI2(); These tests don't really show much about how VT_I2 is handled. Please try to make them striker and closer to implementation details. Also objI2 is not really a nice name for something that's not an object. + if(!strcmp_wa(bstrName, "createVT_I2")) { + *pid = DISPID_GLOBAL_CREATE_I2; + return S_OK; + } A better name would be nice. Cheers, Jacek

1 0

Re: mscoree: Better support RUNTIME_INFO_UPGRADE_VERSION in, GetRequestedRuntimeInfo (try 4)
by Marvin 13 Mar '12

13 Mar '12

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=17320 Your paranoid android. === WVISTAADM (32 bit mscoree) === mscoree.c:154: Test failed: version is L"v2.0.50727" , expected L"v1.1.4322" === W2K8SE (32 bit mscoree) === mscoree.c:154: Test failed: version is L"v2.0.50727" , expected L"v1.1.4322" === W7PRO (32 bit mscoree) === mscoree.c:154: Test failed: version is L"v2.0.50727" , expected L"v1.1.4322" === W7PROX64 (32 bit mscoree) === mscoree.c:154: Test failed: version is L"v2.0.50727" , expected L"v1.1.4322" === TEST64_W7SP1 (32 bit mscoree) === mscoree.c:154: Test failed: version is L"v2.0.50727" , expected L"v1.1.4322" === W7PROX64 (64 bit mscoree) === mscoree.c:154: Test failed: version is L"v2.0.50727" , expected L"v1.1.4322" === TEST64_W7SP1 (64 bit mscoree) === mscoree.c:154: Test failed: version is L"v2.0.50727" , expected L"v1.1.4322"

1 0

Re: mscoree: Better support RUNTIME_INFO_UPGRADE_VERSION in, GetRequestedRuntimeInfo (try 3)
by Vincent Povirk 13 Mar '12

13 Mar '12

- FIXME("Unrecognized version %s\n", debugstr_w(pwzVersion)); + WARN("Unrecognized version %s\n", debugstr_w(pwzVersion)); I'm not so sure about this. I think GetRuntime is still incomplete, so I'd still like to know when it fails. You will get a useless FIXME in the case where RUNTIME_INFO_UPGRADE_VERSION is specified, but I think a program that makes that specifies a version number and that flag is doing it wrong. Anyway, we shouldn't be spammed with fixme's, right?

2 1

Re: kernel32: Make CreateFile called with creation == 0 work when opening a vxd in win9x mode.
by Saulius Krasuckas 12 Mar '12

12 Mar '12

* On Sun, 11 Mar 2012, Dmitry Timoshkov wrote: > > A widely used approach to open/load device drivers under win9x is > > /* Check if already loaded in system.ini */ > hvxd = CreateFile("\\\\.\\mydevice", 0, 0, 0, 0, 0, 0); > if (hvxd == INVALID_HANDLE_VALUE) > /* Load dynamically from PATH */ > hvxd = CreateFile("\\\\.\\path\\to\\mydevice.vxd", 0, 0, 0, CREATE_NEW, FILE_FLAG_DELETE_ON_CLOSE, 0); > > First call never succeeds under Wine, and some device drivers refuse to > load more than once. Are there any proof one can see? What application does behave like this? Where has this source excerpt come from? S.

1 0

GSoC 2011 - introduction
by Józef Kucia 12 Mar '12

12 Mar '12

Hi, My name is Józef Kucia. I'm a Masters student in Computer Science at Wrocław University of Technology in Poland. I would like to apply for Google Summer of Code this year. I have a good knowledge of C and OpenGL. I also have limited experience with Direct3D and win32 programming. With regard to the Wine project, I'm familiar with the project from user perspective. I used to run some applications in Wine on my Gentoo Linux box, mostly games to be exact. Unfortunately, I haven't made any previous contributions to the Wine project, except submitting two small patches recently. I have read your project ideas for GSoC, and I am primarily interested in projects related to Direct3D. Nevertheless, I'm open to other projects. I would appreciate any suggestions or comments. Thanks, Józef Kucia

3 2

Re: [PATCH 4/5] msxml3: Added partial XMLView IPersistMoniker_Load implementation
by Alexandre Julliard 12 Mar '12

12 Mar '12

Piotr Caban <piotr(a)codeweavers.com> writes: > --- > dlls/msxml3/xmlview.c | 908 > ++++++++++++++++++++++++++++++++++++++++++++++++- > 1 files changed, 904 insertions(+), 4 deletions(-) This doesn't build without libxml (missing domdoc functions). -- Alexandre Julliard julliard(a)winehq.org

2 1

Instructions for using JACK with with Wine's ALSA output on wiki: reverted twice
by Alex Bradbury 12 Mar '12

12 Mar '12

Recently user 'falktx' posted instructions on the Sound wiki page on how to set up an ALSA to JACK bridge that would work with Wine. He did this at the suggestion of aeikum: 14:45 <@aeikum> okay. so it is possible to get this working correctly. that's good to know 14:46 < falktx> I can make a small package with my setup scripts 14:47 <@aeikum> that might be handy to put up on the sound wiki page http://wiki.winehq.org/Sound If you look at the page edit history, you'll see the content has been reverted twice by Vitaliy without comment: http://wiki.winehq.org/Sound?action=info Please can you (wine developers) clarify your position on this. It seems to be useful content for the wiki that will benefit a number of users and I can see no justification for deleting it. It could be argued it clutters up the Sound wiki page, in which case it should be moved to a separate page linked to from there. Thank you, Alex

3 4

Re: advapi32: Correct tests under WOW64 (try 2)
by Vitaliy Margolen 12 Mar '12

12 Mar '12

On 03/10/2012 12:36 AM, Alistair Leslie-Hughes wrote: > Hi, > Marked test as broken if it returns true. > > + /* WoW64 return TRUE with the LastError set */ > + ok((!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER) || broken(ret), > "%d with error %d\n", ret, GetLastError()); This is incorrect. You can check or report result of GetLastError(). But not both at the same time. You have to store the result in additional variable. Then compare and report it. Vitaliy

3 4

Re: mscoree: Better support RUNTIME_INFO_UPGRADE_VERSION in, GetRequestedRuntimeInfo (try 2)
by Vincent Povirk 12 Mar '12

12 Mar '12

I suspect that RUNTIME_INFO_UPGRADE_VERSION will actually use the newest non-4.0 version when it doesn't find an exact match, which is why I asked you to add that test. I'm not sure whether Marvin's results prove that or not. If that's the case, get_runtime_info should probably be checking the result of CLRMetaHost_GetRuntime, and proceeding to the RUNTIME_INFO_UPGRADE_VERSION check if it fails.

1 0

Re: mscoree: Better support RUNTIME_INFO_UPGRADE_VERSION in, GetRequestedRuntimeInfo (try 2)
by Marvin 12 Mar '12

12 Mar '12

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=17280 Your paranoid android. === WVISTAADM (32 bit mscoree) === mscoree.c:157: Test failed: version is L"v2.0.50727" , expected L"v2.0.50727" === W2K8SE (32 bit mscoree) === mscoree.c:157: Test failed: version is L"v2.0.50727" , expected L"v2.0.50727" === W7PRO (32 bit mscoree) === mscoree.c:157: Test failed: version is L"v2.0.50727" , expected L"v2.0.50727" === W7PROX64 (32 bit mscoree) === mscoree.c:157: Test failed: version is L"v2.0.50727" , expected L"v2.0.50727" === TEST64_W7SP1 (32 bit mscoree) === mscoree.c:157: Test failed: version is L"v2.0.50727" , expected L"v2.0.50727" === W7PROX64 (64 bit mscoree) === mscoree.c:157: Test failed: version is L"v2.0.50727" , expected L"v2.0.50727" === TEST64_W7SP1 (64 bit mscoree) === mscoree.c:157: Test failed: version is L"v2.0.50727" , expected L"v2.0.50727"

1 0

Re: Are we the reason Apple isn't helping us?
by Ralph Little 11 Mar '12

11 Mar '12

Hi, Well, I'm a general lurker and small contributer in my own way. I'm looking at one bug and have requested help from wine-devel in the past. So, in a nutshell, I consider myself an outsider of the general crew. Therefore, I'm going to be a bit more forthright about my response to this post. The Wine developers know nothing about me and my experience. I have attempted to demonstrate that, although I lack much time, I am prepared to put some effort into helping where I can in my small way. There are many like me. In have tried to be cordial and respectful on wine-devel. In return I have had nothing but courtesy, helpful assistance and general goodwill in answer. There is a right way of entering into these things and a wrong way. The Wine crew, as far as I know, know nothing of this supposed Apple developer. He has not demonstrated his experience or trustworthyness or knowledge of the Wine product to any level. Jeremy expects that as a stranger the Wine team should take his word at face value that he submitted a needed fix and that it sufficiently corrected the problem without doing even the *minimum* of effort to convince them. I have read the bug issue in question, and from the outset, he was disrespectful and downright combative and dismissive of all of the Wine teams procedures. Despite that, the responses on the bug tracker from the Wine team where measured and non-escalatory. A slightly different approach would have yielded a substantially different result. A humble request for assistance in knowing the proper channel and aid in getting the change properly submitted would, I feel, have had a far greater acceptance of what he was after. I agree that sometimes the responses on the bug tracker can be curt to the point of rudeness, but mostly that is down to the impersonal nature of the medium. Jeremy obviously thought that the change was important enough that he should take the time to submit it in the first place. A little bit of natural humility and expressing a more willing sentiment would have gone a long way to helping his cause. Cheers, Ralph

1 0

wineapploader in wine64
by Michael Ost 11 Mar '12

11 Mar '12

Hi, Any explanation for why the wineapploader script doesn't use 'wine64' instead of 'wine' in a 64bit Linux with 64bit wine? That's the script that is used to build /usr/bin/wineboot and /usr/bin/regedit, for instance. In Fedora 15 with wine 1.3.24, the upshot is that the 'wineboot' command doesn't work. /usr/lib/wine/wineboot.exe.so is not installed; only /usr/lib64/wineboot.exe.so is. Since the /usr/bin/wineboot is running 'wine' instead of 'wine64' it is looking for the 32bit /usr/lib/wine/wineboot.exe.so. It can't be found since it isn't installed so the loader gives up. > $ wineboot > wine: cannot find L"C:\\windows\\system32\\wineboot.exe" If it used wine64 instead, it would work. There must be a reason that wine64 is starting 32bit apps, but I haven't been able to glean anything from the web. Thanks for any info, -- Michael Ost

4 6

Build failure after interrupted first build
by Vincent Pelletier 11 Mar '12

11 Mar '12

Hi. I got a failure building wine, where wrc would fail on utils.c:xmalloc's "assert(size > 0)". This came from a po/*.mo file being present but empty because a first build got interrupted (^C). Just in case either someone here can figure out a one-liner fix for this, or if it helps the next person encountering that behaviour. Regards, -- Vincent Pelletier

1 0

Web based translation tool
by Miroslav Suchý 11 Mar '12

11 Mar '12

Hi, I just read: http://www.winehq.org/news/2012022001 and then http://wiki.winehq.org/Translating especially: > The Wine project would be very interested in making its PO files available on web-based community translations systems such as Pootle or Launchpad. Our hope is that this would make translating Wine even easier and engage new translators. > > The reason why it has not happened yet is that all Wine contributions, including for translations, must be attributable to a specific author and that these tools don't make that possible yet. For more details see the wine-devel discussion here and here. Any contributions that would solve this issue would be very welcome. which refer: http://www.winehq.org/pipermail/wine-devel/2012-January/093908.html I would like to point you to: https://www.transifex.net/ which can do the tracking. Latest version is probably not what you want, because it just add at the top of the file: # Translators: # Martin Minar <skulliq(a)gmail.com>, 2011. # Milan Kerslager <kerslage(a)linux.cz>, 2002, 2007. # Miloslav Trmac <mitr(a)volny.cz>, 2002. # Miroslav Suchý <msuchy(a)redhat.com>, 2011. msgid "" msgstr "" "Project-Id-Version: Spacewalk\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2011-12-21 13:07+0100\n" "PO-Revision-Date: 2011-12-14 09:21+0000\n" "Last-Translator: Miroslav Suchý <msuchy(a)redhat.com>\n" "Language-Team: Czech (http://www.transifex.net/projects/p/fedora/team/cs/)\n So you had overview of contributors, but you could not tell which one contributor done which string. But version 0.7 (IIRC) sent each contribution immediately to git. Under login (and email) of that contributor. That contributor was "Author" and commiter was some transifex user. So this way you allow git commit access to those contributors directly to git, but since it goes via that web interface, they could commit only to /po/ directory and even only to language, for which they had been granted. You can download it here: http://trac.transifex.org/files/ and setup your own instance. If is sufficient for you only tracking name of contributors, you can use that hosted solution at: https://www.transifex.net/ -- Miroslav Suchy Red Hat Satellite Engineering

4 5

Are we the reason Apple isn't helping us?
by Charles Davis 11 Mar '12

11 Mar '12

Hi, An Apple developer recently contacted me directly about the Wine64 radar (number 9269783). What's interesting about his response, however, is that he put in an aside to berate us for our etiquette. I am convinced that at least this developer sees us as rude, hateful creatures now, and he cited a particular bug (29922) that he filed and even offered to fix as an example. Gee, I wonder why that might be? (Hint: Look at the "To:" field.) In your defense, I realize that Vitaliy's behavior is not representative of Wine developers as a whole, and that Jeremy's behavior wasn't exactly golden, either. I also realize that there really is no build breakage resulting from the bug, because we don't include any Objective-C headers. He was convinced that there could have been breakage, however. You--AJ, I'm talking to you in particular--did not adequately explain to him why this didn't break the build. Instead, you--Vitaliy in particular--practically yelled at him--for trying to help! By this point, he's likely told his colleagues at Apple about his experience. With guys like Vitaliy developing Wine, is it any wonder Apple doesn't want to help? Are we, the developers, the real reason Apple isn't contributing? For that matter, are we the real reason more people *in general* aren't contributing? At the very least, we should be more welcoming of help, even from Apple. We need it. Maybe not to fix trivial non-bugs like 29922, but to make Wine a better alternative to Windows--on Mac, Linux, or anywhere. But as long as people like Vitaliy are yelling at potential contributors, we won't get much help beyond what we've got at CodeWeavers. Just my two bits. Chip

4 3

Re: mscoree: Better support RUNTIME_INFO_UPGRADE_VERSION in, GetRequestedRuntimeInfo
by Vincent Povirk 11 Mar '12

11 Mar '12

Can you add a test to make sure the 2.x runtime doesn't get returned when 1.x is requested with RUNTIME_INFO_UPGRADE_VERSION ? On Sun, Mar 11, 2012 at 5:49 AM, Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> wrote: > Hi, > > > Changelog: > mscoree: Better support RUNTIME_INFO_UPGRADE_VERSION in > GetRequestedRuntimeInfo > > > Best Regards > Alistair Leslie-Hughes > > >

1 0

Re: winedbg: Respect Thumb mode when adjusting PC on ARM
by Eric Pouech 11 Mar '12

11 Mar '12

Le 10/03/2012 18:26, André Hentschel a écrit : > --- > programs/winedbg/be_arm.c | 10 ++++++---- > 1 files changed, 6 insertions(+), 4 deletions(-) > > diff --git a/programs/winedbg/be_arm.c b/programs/winedbg/be_arm.c > index c39043c..6c1cc05 100644 > --- a/programs/winedbg/be_arm.c > +++ b/programs/winedbg/be_arm.c > @@ -205,13 +205,15 @@ static void be_arm_clear_watchpoint(CONTEXT* ctx, unsigned idx) > > static int be_arm_adjust_pc_for_break(CONTEXT* ctx, BOOL way) > { > + INT step = (ctx->Cpsr& 0x20) ? 2 : 4; hmm the way winedbg works might put us in trouble here... when winedbg is entered with a break exception: 1/ winedbg calls adjust_pc_for_break(..., TRUE) to get the PC to the real location of the break insn (and not after, as most CPU report in break exception handler) 2/ user interacts with winedbg 3/ user resumes execution, and winedbg calls again adjust_pc_for_break(..., FALSE) but, the ctx passed here is the context used to resume execution... and in ARM case Cpsr could have been changed by user in step 2/ leading to wrong PC computation in 3/ therefore, if we want to plug that hole, I'd suggest having two context used in winedbg (the incoming one (never being changed), and the current/outgoing one), and that we pass the two contexts in winedbg to do the right thing here A+ -- Eric Pouech "The problem with designing something completely foolproof is to underestimate the ingenuity of a complete idiot." (Douglas Adams)

2 2

Re: gdiplus: Create GDI bitmap only when needed.
by Vincent Povirk 11 Mar '12

11 Mar '12

Looks good, thanks.

1 0

Re: [PATCH 6/6] d3dxof: Do not allow separator to terminate the string. Only the double quote can do that.
by Alexandre Julliard 10 Mar '12

10 Mar '12

Christian Costa <titan.costa(a)gmail.com> writes: > This should fix the d3dxof problem of bug 12694. It's broken on 64-bit: ../../../../wine/tools/runtest -q -P wine -M d3dxof.dll -T ../../.. -p d3dxof_test.exe.so ../../../../wine/dlls/d3dxof/tests/d3dxof.c && touch d3dxof.ok d3dxof.c:578: Test failed: Got size 8, expected 4 d3dxof.c:597: Test failed: Got size 8, expected 4 make[1]: *** [d3dxof.ok] Error 2 -- Alexandre Julliard julliard(a)winehq.org

3 7

Re: windowscodecs: Implement DllCanUnloadNow
by Vincent Povirk 10 Mar '12

10 Mar '12

Um, you missed almost much every implementation of a COM interface in the entire dll? 2012/3/10 André Hentschel <nerv(a)dawncrow.de>: > Needed for dotNet 4.5 preview > --- > dlls/windowscodecs/clsfactory.c | 15 +++++++++++++-- > dlls/windowscodecs/main.c | 9 +++++++++ > dlls/windowscodecs/wincodecs_private.h | 12 ++++++++++++ > dlls/windowscodecs/windowscodecs.spec | 1 + > 4 files changed, 35 insertions(+), 2 deletions(-) > > diff --git a/dlls/windowscodecs/clsfactory.c b/dlls/windowscodecs/clsfactory.c > index 0f30115..bd22ce5 100644 > --- a/dlls/windowscodecs/clsfactory.c > +++ b/dlls/windowscodecs/clsfactory.c > @@ -112,7 +112,10 @@ static ULONG WINAPI ClassFactoryImpl_Release(IClassFactory *iface) > TRACE("(%p) refcount=%u\n", iface, ref); > > if (ref == 0) > + { > HeapFree(GetProcessHeap(), 0, This); > + unlock_module(); > + } > > return ref; > } > @@ -127,8 +130,14 @@ static HRESULT WINAPI ClassFactoryImpl_CreateInstance(IClassFactory *iface, > > static HRESULT WINAPI ClassFactoryImpl_LockServer(IClassFactory *iface, BOOL lock) > { > - TRACE("(%p, %i): stub\n", iface, lock); > - return E_NOTIMPL; > + TRACE("(%p,%x)\n", iface, lock); > + > + if(lock) > + lock_module(); > + else > + unlock_module(); > + > + return S_OK; > } > > static const IClassFactoryVtbl ClassFactoryImpl_Vtbl = { > @@ -146,6 +155,8 @@ static HRESULT ClassFactoryImpl_Constructor(classinfo *info, REFIID riid, LPVOID > > *ppv = NULL; > > + lock_module(); > + > This = HeapAlloc(GetProcessHeap(), 0, sizeof(ClassFactoryImpl)); > if (!This) return E_OUTOFMEMORY; > > diff --git a/dlls/windowscodecs/main.c b/dlls/windowscodecs/main.c > index a6588fd..69e50f5 100644 > --- a/dlls/windowscodecs/main.c > +++ b/dlls/windowscodecs/main.c > @@ -32,6 +32,8 @@ > > WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); > > +LONG module_ref = 0; > + > extern BOOL WINAPI WIC_DllMain(HINSTANCE, DWORD, LPVOID) DECLSPEC_HIDDEN; > > BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) > @@ -49,6 +51,13 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) > return WIC_DllMain(hinstDLL, fdwReason, lpvReserved); > } > > +HRESULT WINAPI DllCanUnloadNow(void) > +{ > + TRACE("() ref=%d\n", module_ref); > + > + return module_ref ? S_FALSE : S_OK; > +} > + > HRESULT copy_pixels(UINT bpp, const BYTE *srcbuffer, > UINT srcwidth, UINT srcheight, INT srcstride, > const WICRect *rc, UINT dststride, UINT dstbuffersize, BYTE *dstbuffer) > diff --git a/dlls/windowscodecs/wincodecs_private.h b/dlls/windowscodecs/wincodecs_private.h > index 691b1ec..8845e22 100644 > --- a/dlls/windowscodecs/wincodecs_private.h > +++ b/dlls/windowscodecs/wincodecs_private.h > @@ -87,4 +87,16 @@ extern HRESULT MetadataReader_Create(const MetadataHandlerVtbl *vtable, IUnknown > > extern HRESULT UnknownMetadataReader_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv) DECLSPEC_HIDDEN; > > +extern LONG module_ref DECLSPEC_HIDDEN; > + > +static inline void lock_module(void) > +{ > + InterlockedIncrement(&module_ref); > +} > + > +static inline void unlock_module(void) > +{ > + InterlockedDecrement(&module_ref); > +} > + > #endif /* WINCODECS_PRIVATE_H */ > diff --git a/dlls/windowscodecs/windowscodecs.spec b/dlls/windowscodecs/windowscodecs.spec > index d0b6a7e..71022cb 100644 > --- a/dlls/windowscodecs/windowscodecs.spec > +++ b/dlls/windowscodecs/windowscodecs.spec > @@ -1,3 +1,4 @@ > +@ stdcall -private DllCanUnloadNow() > @ stdcall -private DllGetClassObject(ptr ptr ptr) > @ stdcall -private DllRegisterServer() > @ stdcall -private DllUnregisterServer() > -- > > Best Regards, André Hentschel > > >

2 2

Re: [1/2] kernel32: Forward RtlPcToFileHeader to ntdll also on ARM
by André Hentschel 10 Mar '12

10 Mar '12

Am 08.03.2012 22:10, schrieb André Hentschel: > needed by native msvcrt110.dll and msvcrt110d.dll > --- > dlls/kernel32/kernel32.spec | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec > index fb3f9c2..1c794c9 100644 > --- a/dlls/kernel32/kernel32.spec > +++ b/dlls/kernel32/kernel32.spec > @@ -1023,7 +1023,7 @@ > @ stdcall RtlFillMemory(ptr long long) ntdll.RtlFillMemory > @ stdcall -arch=x86_64 RtlLookupFunctionEntry(long ptr ptr) ntdll.RtlLookupFunctionEntry > @ stdcall RtlMoveMemory(ptr ptr long) ntdll.RtlMoveMemory > -@ stdcall -arch=x86_64 RtlPcToFileHeader(ptr ptr) ntdll.RtlPcToFileHeader > +@ stdcall -arch=x86_64,arm RtlPcToFileHeader(ptr ptr) ntdll.RtlPcToFileHeader I forgot to mention that i checked that it's really not exported on all architectures. And yes, it's really only on x64 and arm, not on x86. -- Best Regards, André Hentschel

1 0

NtDelayExecution: reduce multiple stack allocation
by Ferdinand Nölscher 10 Mar '12

10 Mar '12

In ntdll/sync.c, line 1232 the struct "timeval" is being allocated in a for-loop. Would'nt it be faster if tv was created before entering the loop? I have not tested doing so but I think that it would increase performance a tiny bit. kind regards

2 1

Translating the Wiki to Portuguese
by Lucas Zawacki 09 Mar '12

09 Mar '12

Hello guys, I'd like to help translate some chunks of the Wine wiki to Portuguese. What is the accepted method of translating the wiki pages? What pages do you recognize as being more important to be translated first? If any portuguese speakers want to help let's get in touch to organize ourselves and split the work. Cheers :)

3 4

Re: [PATCH 2/9] d3drm: Fix identation.
by Frédéric Delanoy 09 Mar '12

09 Mar '12

On Fri, Mar 9, 2012 at 11:55, Christian Costa <titan.costa(a)gmail.com> wrote: > > --- > dlls/d3drm/meshbuilder.c | 14 +++++++------- > 1 files changed, 7 insertions(+), 7 deletions(-) > > diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c > index 39df1c6..9ca7cea 100644 That patch has probably little chance of getting committed. Formatting-only patches are generally discarded right away. Frédéric

1 0

Got Application cross-compiled with msvc11 for ARM running
by André Hentschel 09 Mar '12

09 Mar '12

Hi, I cross-compiled a simple Application with the preview of MSVC 11 to ARM. After some minor changes to Wine i was able to run it on my Pandaboard using the native msvcr110.dll. One thing i noticed in the cross-compile environment is that there are much less libraries available for ARM, that's mostly because the win32 API isn't meant to be ported entirely, instead ARM Apps should be based on WinRT. Still i was able to dynamic load functions from dlls available in Wine beside static loaded functions that also worked. In short: The good news: The ABI is compatible (to armel gnueabi) The bad news: no fully win32 API on ARM Maybe my small changes to Wine will make it into 1.5.1 :) At least i hope so. -- Best Regards, André Hentschel

5 9

Re: [PATCH 5/5] ddraw: Get rid of IDirectDrawImpl.
by Christian Costa 09 Mar '12

09 Mar '12

Hi Henry, Maybe it's a bit late to ask this but what's the reasoning behind introducing the struct keyword ? And why removing use of This ? It's a common practise in all wine code. Christian Le 08/03/2012 20:27, Henri Verbeet a écrit : > --- > dlls/ddraw/ddraw.c | 623 ++++++++++++++++++++++---------------------- > dlls/ddraw/ddraw_private.h | 39 ++-- > dlls/ddraw/device.c | 2 +- > dlls/ddraw/light.c | 2 +- > dlls/ddraw/main.c | 22 +- > dlls/ddraw/material.c | 2 +- > dlls/ddraw/palette.c | 2 +- > dlls/ddraw/surface.c | 2 +- > dlls/ddraw/vertexbuffer.c | 2 +- > dlls/ddraw/viewport.c | 2 +- > 10 files changed, 346 insertions(+), 352 deletions(-) > > diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c > index 25519d2..3d156eb 100644 > --- a/dlls/ddraw/ddraw.chverbeet(a)codeweavers.com > +++ b/dlls/ddraw/ddraw.c > @@ -75,44 +75,44 @@ const struct wined3d_parent_ops ddraw_null_wined3d_parent_ops = > ddraw_null_wined3d_object_destroyed, > }; > > -static inline IDirectDrawImpl *impl_from_IDirectDraw(IDirectDraw *iface) > +static inline struct ddraw *impl_from_IDirectDraw(IDirectDraw *iface) > { > - return CONTAINING_RECORD(iface, IDirectDrawImpl, IDirectDraw_iface); > + return CONTAINING_RECORD(iface, struct ddraw, IDirectDraw_iface); > } > > -static inline IDirectDrawImpl *impl_from_IDirectDraw2(IDirectDraw2 *iface) > +static inline struct ddraw *impl_from_IDirectDraw2(IDirectDraw2 *iface) > { > - return CONTAINING_RECORD(iface, IDirectDrawImpl, IDirectDraw2_iface); > + return CONTAINING_RECORD(iface, struct ddraw, IDirectDraw2_iface); > } > > -static inline IDirectDrawImpl *impl_from_IDirectDraw4(IDirectDraw4 *iface) > +static inline struct ddraw *impl_from_IDirectDraw4(IDirectDraw4 *iface) > { > - return CONTAINING_RECORD(iface, IDirectDrawImpl, IDirectDraw4_iface); > + return CONTAINING_RECORD(iface, struct ddraw, IDirectDraw4_iface); > } > > -static inline IDirectDrawImpl *impl_from_IDirectDraw7(IDirectDraw7 *iface) > +static inline struct ddraw *impl_from_IDirectDraw7(IDirectDraw7 *iface) > { > - return CONTAINING_RECORD(iface, IDirectDrawImpl, IDirectDraw7_iface); > + return CONTAINING_RECORD(iface, struct ddraw, IDirectDraw7_iface); > } > > -static inline IDirectDrawImpl *impl_from_IDirect3D(IDirect3D *iface) > +static inline struct ddraw *impl_from_IDirect3D(IDirect3D *iface) > { > - return CONTAINING_RECORD(iface, IDirectDrawImpl, IDirect3D_iface); > + return CONTAINING_RECORD(iface, struct ddraw, IDirect3D_iface); > } > > -static inline IDirectDrawImpl *impl_from_IDirect3D2(IDirect3D2 *iface) > +static inline struct ddraw *impl_from_IDirect3D2(IDirect3D2 *iface) > { > - return CONTAINING_RECORD(iface, IDirectDrawImpl, IDirect3D2_iface); > + return CONTAINING_RECORD(iface, struct ddraw, IDirect3D2_iface); > } > > -static inline IDirectDrawImpl *impl_from_IDirect3D3(IDirect3D3 *iface) > +static inline struct ddraw *impl_from_IDirect3D3(IDirect3D3 *iface) > { > - return CONTAINING_RECORD(iface, IDirectDrawImpl, IDirect3D3_iface); > + return CONTAINING_RECORD(iface, struct ddraw, IDirect3D3_iface); > } > > -static inline IDirectDrawImpl *impl_from_IDirect3D7(IDirect3D7 *iface) > +static inline struct ddraw *impl_from_IDirect3D7(IDirect3D7 *iface) > { > - return CONTAINING_RECORD(iface, IDirectDrawImpl, IDirect3D7_iface); > + return CONTAINING_RECORD(iface, struct ddraw, IDirect3D7_iface); > } > > /***************************************************************************** > @@ -141,7 +141,7 @@ static inline IDirectDrawImpl *impl_from_IDirect3D7(IDirect3D7 *iface) > *****************************************************************************/ > static HRESULT WINAPI ddraw7_QueryInterface(IDirectDraw7 *iface, REFIID refiid, void **obj) > { > - IDirectDrawImpl *This = impl_from_IDirectDraw7(iface); > + struct ddraw *This = impl_from_IDirectDraw7(iface); > > TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(refiid), obj); > > @@ -248,65 +248,65 @@ static HRESULT WINAPI ddraw7_QueryInterface(IDirectDraw7 *iface, REFIID refiid, > > static HRESULT WINAPI ddraw4_QueryInterface(IDirectDraw4 *iface, REFIID riid, void **object) > { > - IDirectDrawImpl *This = impl_from_IDirectDraw4(iface); > + struct ddraw *ddraw = impl_from_IDirectDraw4(iface); > > TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), object); > > - return ddraw7_QueryInterface(&This->IDirectDraw7_iface, riid, object); > + return ddraw7_QueryInterface(&ddraw->IDirectDraw7_iface, riid, object); > } > > static HRESULT WINAPI ddraw2_QueryInterface(IDirectDraw2 *iface, REFIID riid, void **object) > { > - IDirectDrawImpl *This = impl_from_IDirectDraw2(iface); > + struct ddraw *ddraw = impl_from_IDirectDraw2(iface); > > TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), object); > > - return ddraw7_QueryInterface(&This->IDirectDraw7_iface, riid, object); > + return ddraw7_QueryInterface(&ddraw->IDirectDraw7_iface, riid, object); > } > > static HRESULT WINAPI ddraw1_QueryInterface(IDirectDraw *iface, REFIID riid, void **object) > { > - IDirectDrawImpl *This = impl_from_IDirectDraw(iface); > + struct ddraw *ddraw = impl_from_IDirectDraw(iface); > > TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), object); > > - return ddraw7_QueryInterface(&This->IDirectDraw7_iface, riid, object); > + return ddraw7_QueryInterface(&ddraw->IDirectDraw7_iface, riid, object); > } > > static HRESULT WINAPI d3d7_QueryInterface(IDirect3D7 *iface, REFIID riid, void **object) > { > - IDirectDrawImpl *This = impl_from_IDirect3D7(iface); > + struct ddraw *ddraw = impl_from_IDirect3D7(iface); > > TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), object); > > - return ddraw7_QueryInterface(&This->IDirectDraw7_iface, riid, object); > + return ddraw7_QueryInterface(&ddraw->IDirectDraw7_iface, riid, object); > } > > static HRESULT WINAPI d3d3_QueryInterface(IDirect3D3 *iface, REFIID riid, void **object) > { > - IDirectDrawImpl *This = impl_from_IDirect3D3(iface); > + struct ddraw *ddraw = impl_from_IDirect3D3(iface); > > TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), object); > > - return ddraw7_QueryInterface(&This->IDirectDraw7_iface, riid, object); > + return ddraw7_QueryInterface(&ddraw->IDirectDraw7_iface, riid, object); > } > > static HRESULT WINAPI d3d2_QueryInterface(IDirect3D2 *iface, REFIID riid, void **object) > { > - IDirectDrawImpl *This = impl_from_IDirect3D2(iface); > + struct ddraw *ddraw = impl_from_IDirect3D2(iface); > > TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), object); > > - return ddraw7_QueryInterface(&This->IDirectDraw7_iface, riid, object); > + return ddraw7_QueryInterface(&ddraw->IDirectDraw7_iface, riid, object); > } > > static HRESULT WINAPI d3d1_QueryInterface(IDirect3D *iface, REFIID riid, void **object) > { > - IDirectDrawImpl *This = impl_from_IDirect3D(iface); > + struct ddraw *ddraw = impl_from_IDirect3D(iface); > > TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), object); > > - return ddraw7_QueryInterface(&This->IDirectDraw7_iface, riid, object); > + return ddraw7_QueryInterface(&ddraw->IDirectDraw7_iface, riid, object); > } > > /***************************************************************************** > @@ -318,7 +318,7 @@ static HRESULT WINAPI d3d1_QueryInterface(IDirect3D *iface, REFIID riid, void ** > * versions have individual refcounts, but the IDirect3D interfaces do not. > * All interfaces are from one object, that means calling QueryInterface on an > * IDirectDraw7 interface for an IDirectDraw4 interface does not create a new > - * IDirectDrawImpl object. > + * ddraw object. > * > * That means all AddRef and Release implementations of IDirectDrawX work > * with their own counter, and IDirect3DX::AddRef thunk to IDirectDraw (1), > @@ -329,7 +329,7 @@ static HRESULT WINAPI d3d1_QueryInterface(IDirect3D *iface, REFIID riid, void ** > *****************************************************************************/ > static ULONG WINAPI ddraw7_AddRef(IDirectDraw7 *iface) > { > - IDirectDrawImpl *This = impl_from_IDirectDraw7(iface); > + struct ddraw *This = impl_from_IDirectDraw7(iface); > ULONG ref = InterlockedIncrement(&This->ref7); > > TRACE("%p increasing refcount to %u.\n", This, ref); > @@ -341,7 +341,7 @@ static ULONG WINAPI ddraw7_AddRef(IDirectDraw7 *iface) > > static ULONG WINAPI ddraw4_AddRef(IDirectDraw4 *iface) > { > - IDirectDrawImpl *This = impl_from_IDirectDraw4(iface); > + struct ddraw *This = impl_from_IDirectDraw4(iface); > ULONG ref = InterlockedIncrement(&This->ref4); > > TRACE("%p increasing refcount to %u.\n", This, ref); > @@ -353,7 +353,7 @@ static ULONG WINAPI ddraw4_AddRef(IDirectDraw4 *iface) > > static ULONG WINAPI ddraw2_AddRef(IDirectDraw2 *iface) > { > - IDirectDrawImpl *This = impl_from_IDirectDraw2(iface); > + struct ddraw *This = impl_from_IDirectDraw2(iface); > ULONG ref = InterlockedIncrement(&This->ref2); > > TRACE("%p increasing refcount to %u.\n", This, ref); > @@ -365,7 +365,7 @@ static ULONG WINAPI ddraw2_AddRef(IDirectDraw2 *iface) > > static ULONG WINAPI ddraw1_AddRef(IDirectDraw *iface) > { > - IDirectDrawImpl *This = impl_from_IDirectDraw(iface); > + struct ddraw *This = impl_from_IDirectDraw(iface); > ULONG ref = InterlockedIncrement(&This->ref1); > > TRACE("%p increasing refcount to %u.\n", This, ref); > @@ -377,7 +377,7 @@ static ULONG WINAPI ddraw1_AddRef(IDirectDraw *iface) > > static ULONG WINAPI d3d7_AddRef(IDirect3D7 *iface) > { > - IDirectDrawImpl *This = impl_from_IDirect3D7(iface); > + struct ddraw *This = impl_from_IDirect3D7(iface); > > TRACE("iface %p.\n", iface); > > @@ -386,7 +386,7 @@ static ULONG WINAPI d3d7_AddRef(IDirect3D7 *iface) > > static ULONG WINAPI d3d3_AddRef(IDirect3D3 *iface) > { > - IDirectDrawImpl *This = impl_from_IDirect3D3(iface); > + struct ddraw *This = impl_from_IDirect3D3(iface); > > TRACE("iface %p.\n", iface); > > @@ -395,7 +395,7 @@ static ULONG WINAPI d3d3_AddRef(IDirect3D3 *iface) > > static ULONG WINAPI d3d2_AddRef(IDirect3D2 *iface) > { > - IDirectDrawImpl *This = impl_from_IDirect3D2(iface); > + struct ddraw *This = impl_from_IDirect3D2(iface); > > TRACE("iface %p.\n", iface); > > @@ -404,14 +404,14 @@ static ULONG WINAPI d3d2_AddRef(IDirect3D2 *iface) > > static ULONG WINAPI d3d1_AddRef(IDirect3D *iface) > { > - IDirectDrawImpl *This = impl_from_IDirect3D(iface); > + struct ddraw *This = impl_from_IDirect3D(iface); > > TRACE("iface %p.\n", iface); > > return ddraw1_AddRef(&This->IDirectDraw_iface); > } > > -void ddraw_destroy_swapchain(IDirectDrawImpl *ddraw) > +void ddraw_destroy_swapchain(struct ddraw *ddraw) > { > TRACE("Destroying the swapchain.\n"); > > @@ -466,7 +466,7 @@ void ddraw_destroy_swapchain(IDirectDrawImpl *ddraw) > * This: DirectDraw object to destroy > * > *****************************************************************************/ > -static void ddraw_destroy(IDirectDrawImpl *This) > +static void ddraw_destroy(struct ddraw *This) > { > IDirectDraw7_SetCooperativeLevel(&This->IDirectDraw7_iface, NULL, DDSCL_NORMAL); > IDirectDraw7_RestoreDisplayMode(&This->IDirectDraw7_iface); > @@ -501,7 +501,7 @@ static void ddraw_destroy(IDirectDrawImpl *This) > *****************************************************************************/ > static ULONG WINAPI ddraw7_Release(IDirectDraw7 *iface) > { > - IDirectDrawImpl *This = impl_from_IDirectDraw7(iface); > + struct ddraw *This = impl_from_IDirectDraw7(iface); > ULONG ref = InterlockedDecrement(&This->ref7); > > TRACE("%p decreasing refcount to %u.\n", This, ref); > @@ -514,7 +514,7 @@ static ULONG WINAPI ddraw7_Release(IDirectDraw7 *iface) > > static ULONG WINAPI ddraw4_Release(IDirectDraw4 *iface) > { > - IDirectDrawImpl *This = impl_from_IDirectDraw4(iface); > + struct ddraw *This = impl_from_IDirectDraw4(iface); > ULONG ref = InterlockedDecrement(&This->ref4); > > TRACE("%p decreasing refcount to %u.\n", This, ref); > @@ -527,7 +527,7 @@ static ULONG WINAPI ddraw4_Release(IDirectDraw4 *iface) > > static ULONG WINAPI ddraw2_Release(IDirectDraw2 *iface) > { > - IDirectDrawImpl *This = impl_from_IDirectDraw2(iface); > + struct ddraw *This = impl_from_IDirectDraw2(iface); > ULONG ref = InterlockedDecrement(&This->ref2); > > TRACE("%p decreasing refcount to %u.\n", This, ref); > @@ -540,7 +540,7 @@ static ULONG WINAPI ddraw2_Release(IDirectDraw2 *iface) > > static ULONG WINAPI ddraw1_Release(IDirectDraw *iface) > { > - IDirectDrawImpl *This = impl_from_IDirectDraw(iface); > + struct ddraw *This = impl_from_IDirectDraw(iface); > ULONG ref = InterlockedDecrement(&This->ref1); > > TRACE("%p decreasing refcount to %u.\n", This, ref); > @@ -553,7 +553,7 @@ static ULONG WINAPI ddraw1_Release(IDirectDraw *iface) > > static ULONG WINAPI d3d7_Release(IDirect3D7 *iface) > { > - IDirectDrawImpl *This = impl_from_IDirect3D7(iface); > + struct ddraw *This = impl_from_IDirect3D7(iface); > > TRACE("iface %p.\n", iface); > > @@ -562,7 +562,7 @@ static ULONG WINAPI d3d7_Release(IDirect3D7 *iface) > > static ULONG WINAPI d3d3_Release(IDirect3D3 *iface) > { > - IDirectDrawImpl *This = impl_from_IDirect3D3(iface); > + struct ddraw *This = impl_from_IDirect3D3(iface); > > TRACE("iface %p.\n", iface); > > @@ -571,7 +571,7 @@ static ULONG WINAPI d3d3_Release(IDirect3D3 *iface) > > static ULONG WINAPI d3d2_Release(IDirect3D2 *iface) > { > - IDirectDrawImpl *This = impl_from_IDirect3D2(iface); > + struct ddraw *This = impl_from_IDirect3D2(iface); > > TRACE("iface %p.\n", iface); > > @@ -580,7 +580,7 @@ static ULONG WINAPI d3d2_Release(IDirect3D2 *iface) > > static ULONG WINAPI d3d1_Release(IDirect3D *iface) > { > - IDirectDrawImpl *This = impl_from_IDirect3D(iface); > + struct ddraw *This = impl_from_IDirect3D(iface); > > TRACE("iface %p.\n", iface); > > @@ -591,7 +591,7 @@ static ULONG WINAPI d3d1_Release(IDirect3D *iface) > * IDirectDraw methods > *****************************************************************************/ > > -static HRESULT ddraw_set_focus_window(IDirectDrawImpl *ddraw, HWND window) > +static HRESULT ddraw_set_focus_window(struct ddraw *ddraw, HWND window) > { > /* FIXME: This looks wrong, exclusive mode should imply a destination > * window. */ > @@ -609,7 +609,7 @@ static HRESULT ddraw_set_focus_window(IDirectDrawImpl *ddraw, HWND window) > return DD_OK; > } > > -static HRESULT ddraw_attach_d3d_device(IDirectDrawImpl *ddraw, > +static HRESULT ddraw_attach_d3d_device(struct ddraw *ddraw, > struct wined3d_swapchain_desc *swapchain_desc) > { > HWND window = swapchain_desc->device_window; > @@ -664,7 +664,7 @@ static HRESULT ddraw_attach_d3d_device(IDirectDrawImpl *ddraw, > return DD_OK; > } > > -static HRESULT ddraw_create_swapchain(IDirectDrawImpl *ddraw, HWND window, BOOL windowed) > +static HRESULT ddraw_create_swapchain(struct ddraw *ddraw, HWND window, BOOL windowed) > { > struct wined3d_swapchain_desc swapchain_desc; > struct wined3d_display_mode mode; > @@ -758,7 +758,7 @@ static HRESULT ddraw_create_swapchain(IDirectDrawImpl *ddraw, HWND window, BOOL > *****************************************************************************/ > static HRESULT WINAPI ddraw7_SetCooperativeLevel(IDirectDraw7 *iface, HWND hwnd, DWORD cooplevel) > { > - IDirectDrawImpl *This = impl_from_IDirectDraw7(iface); > + struct ddraw *This = impl_from_IDirectDraw7(iface); > struct wined3d_stateblock *stateblock; > struct wined3d_surface *rt, *ds; > BOOL restore_state = FALSE; > @@ -995,29 +995,29 @@ static HRESULT WINAPI ddraw7_SetCooperativeLevel(IDirectDraw7 *iface, HWND hwnd, > > static HRESULT WINAPI ddraw4_SetCooperativeLevel(IDirectDraw4 *iface, HWND window, DWORD flags) > { > - IDirectDrawImpl *This = impl_from_IDirectDraw4(iface); > + struct ddraw *ddraw = impl_from_IDirectDraw4(iface); > > TRACE("iface %p, window %p, flags %#x.\n", iface, window, flags); > > - return ddraw7_SetCooperativeLevel(&This->IDirectDraw7_iface, window, flags); > + return ddraw7_SetCooperativeLevel(&ddraw->IDirectDraw7_iface, window, flags); > } > > static HRESULT WINAPI ddraw2_SetCooperativeLevel(IDirectDraw2 *iface, HWND window, DWORD flags) > { > - IDirectDrawImpl *This = impl_from_IDirectDraw2(iface); > + struct ddraw *ddraw = impl_from_IDirectDraw2(iface); > > TRACE("iface %p, window %p, flags %#x.\n", iface, window, flags); > > - return ddraw7_SetCooperativeLevel(&This->IDirectDraw7_iface, window, flags); > + return ddraw7_SetCooperativeLevel(&ddraw->IDirectDraw7_iface, window, flags); > } > > static HRESULT WINAPI ddraw1_SetCooperativeLevel(IDirectDraw *iface, HWND window, DWORD flags) > { > - IDirectDrawImpl *This = impl_from_IDirectDraw(iface); > + struct ddraw *ddraw = impl_from_IDirectDraw(iface); > > TRACE("iface %p, window %p, flags %#x.\n", iface, window, flags); > > - return ddraw7_SetCooperativeLevel(&This->IDirectDraw7_iface, window, flags); > + return ddraw7_SetCooperativeLevel(&ddraw->IDirectDraw7_iface, window, flags); > } > > /***************************************************************************** > @@ -1032,7 +1032,7 @@ static HRESULT WINAPI ddraw1_SetCooperativeLevel(IDirectDraw *iface, HWND window > * ddraw7_SetDisplayMode. > * > *****************************************************************************/ > -static HRESULT ddraw_set_display_mode(IDirectDrawImpl *ddraw, DWORD Width, DWORD Height, > +static HRESULT ddraw_set_display_mode(struct ddraw *ddraw, DWORD Width, DWORD Height, > DWORD BPP, DWORD RefreshRate, DWORD Flags) > { > struct wined3d_display_mode mode; > @@ -1131,7 +1131,7 @@ static HRESULT ddraw_set_display_mode(IDirectDrawImpl *ddraw, DWORD Width, DWORD > static HRESULT WINAPI ddraw7_SetDisplayMode(IDirectDraw7 *iface, DWORD Width, DWORD Height, > DWORD BPP, DWORD RefreshRate, DWORD Flags) > { > - IDirectDrawImpl *This = impl_from_IDirectDraw7(iface); > + struct ddraw *ddraw = impl_from_IDirectDraw7(iface); > > TRACE("iface %p, width %u, height %u, bpp %u, refresh_rate %u, flags %#x.\n", > iface, Width, Height, BPP, RefreshRate, Flags); > @@ -1143,38 +1143,38 @@ static HRESULT WINAPI ddraw7_SetDisplayMode(IDirectDraw7 *iface, DWORD Width, DW > RefreshRate = force_refresh_rate; > } > > - return ddraw_set_display_mode(This, Width, Height, BPP, RefreshRate, Flags); > + return ddraw_set_display_mode(ddraw, Width, Height, BPP, RefreshRate, Flags); > } > > static HRESULT WINAPI ddraw4_SetDisplayMode(IDirectDraw4 *iface, DWORD width, DWORD height, > DWORD bpp, DWORD refresh_rate, DWORD flags) > { > - IDirectDrawImpl *This = impl_from_IDirectDraw4(iface); > + struct ddraw *ddraw = impl_from_IDirectDraw4(iface); > > TRACE("iface %p, width %u, height %u, bpp %u, refresh_rate %u, flags %#x.\n", > iface, width, height, bpp, refresh_rate, flags); > > - return ddraw7_SetDisplayMode(&This->IDirectDraw7_iface, width, height, bpp, refresh_rate, flags); > + return ddraw7_SetDisplayMode(&ddraw->IDirectDraw7_iface, width, height, bpp, refresh_rate, flags); > } > > static HRESULT WINAPI ddraw2_SetDisplayMode(IDirectDraw2 *iface, > DWORD width, DWORD height, DWORD bpp, DWORD refresh_rate, DWORD flags) > { > - IDirectDrawImpl *This = impl_from_IDirectDraw2(iface); > + struct ddraw *ddraw = impl_from_IDirectDraw2(iface); > > TRACE("iface %p, width %u, height %u, bpp %u, refresh_rate %u, flags %#x.\n", > iface, width, height, bpp, refresh_rate, flags); > > - return ddraw7_SetDisplayMode(&This->IDirectDraw7_iface, width, height, bpp, refresh_rate, flags); > + return ddraw7_SetDisplayMode(&ddraw->IDirectDraw7_iface, width, height, bpp, refresh_rate, flags); > } > > static HRESULT WINAPI ddraw1_SetDisplayMode(IDirectDraw *iface, DWORD width, DWORD height, DWORD bpp) > { > - IDirectDrawImpl *This = impl_from_IDirectDraw(iface); > + struct ddraw *ddraw = impl_from_IDirectDraw(iface); > > TRACE("iface %p, width %u, height %u, bpp %u.\n", iface, width, height, bpp); > > - return ddraw7_SetDisplayMode(&This->IDirectDraw7_iface, width, height, bpp, 0, 0); > + return ddraw7_SetDisplayMode(&ddraw->IDirectDraw7_iface, width, height, bpp, 0, 0); > } > > /***************************************************************************** > @@ -1200,38 +1200,38 @@ static HRESULT WINAPI ddraw1_SetDisplayMode(IDirectDraw *iface, DWORD width, DWO > *****************************************************************************/ > static HRESULT WINAPI ddraw7_RestoreDisplayMode(IDirectDraw7 *iface) > { > - IDirectDrawImpl *This = impl_from_IDirectDraw7(iface); > + struct ddraw *ddraw = impl_from_IDirectDraw7(iface); > > TRACE("iface %p.\n", iface); > > - return ddraw_set_display_mode(This, This->orig_width, This->orig_height, This->orig_bpp, 0, 0); > + return ddraw_set_display_mode(ddraw, ddraw->orig_width, ddraw->orig_height, ddraw->orig_bpp, 0, 0); > } > > static HRESULT WINAPI ddraw4_RestoreDisplayMode(IDirectDraw4 *iface) > { > - IDirectDrawImpl *This = impl_from_IDirectDraw4(iface); > + struct ddraw *ddraw = impl_from_IDirectDraw4(iface); > > TRACE("iface %p.\n", iface); > > - return ddraw7_RestoreDisplayMode(&This->IDirectDraw7_iface); > + return ddraw7_RestoreDisplayMode(&ddraw->IDirectDraw7_iface); > } > > static HRESULT WINAPI ddraw2_RestoreDisplayMode(IDirectDraw2 *iface) > { > - IDirectDrawImpl *This = impl_from_IDirectDraw2(iface); > + struct ddraw *ddraw = impl_from_IDirectDraw2(iface); > > TRACE("iface %p.\n", iface); > > - return ddraw7_RestoreDisplayMode(&This->IDirectDraw7_iface); > + return ddraw7_RestoreDisplayMode(&ddraw->IDirectDraw7_iface); > } > > static HRESULT WINAPI ddraw1_RestoreDisplayMode(IDirectDraw *iface) > { > - IDirectDrawImpl *This = impl_from_IDirectDraw(iface); > + struct ddraw *ddraw = impl_from_IDirectDraw(iface); > > TRACE("iface %p.\n", iface); > > - return ddraw7_RestoreDisplayMode(&This->IDirectDraw7_iface); > + return ddraw7_RestoreDisplayMode(&ddraw->IDirectDraw7_iface); > } > > /***************************************************************************** > @@ -1251,7 +1251,7 @@ static HRESULT WINAPI ddraw1_RestoreDisplayMode(IDirectDraw *iface) > *****************************************************************************/ > static HRESULT WINAPI ddraw7_GetCaps(IDirectDraw7 *iface, DDCAPS *DriverCaps, DDCAPS *HELCaps) > { > - IDirectDrawImpl *This = impl_from_IDirectDraw7(iface); > + struct ddraw *ddraw = impl_from_IDirectDraw7(iface); > DDCAPS caps; > WINED3DCAPS winecaps; > HRESULT hr; > @@ -1260,9 +1260,9 @@ static HRESULT WINAPI ddraw7_GetCaps(IDirectDraw7 *iface, DDCAPS *DriverCaps, DD > TRACE("iface %p, driver_caps %p, hel_caps %p.\n", iface, DriverCaps, HELCaps); > > /* One structure must be != NULL */ > - if( (!DriverCaps)&& (!HELCaps) ) > + if (!DriverCaps&& !HELCaps) > { > - ERR("(%p) Invalid params to ddraw7_GetCaps\n", This); > + WARN("Invalid parameters.\n"); > return DDERR_INVALIDPARAMS; > } > > @@ -1271,7 +1271,7 @@ static HRESULT WINAPI ddraw7_GetCaps(IDirectDraw7 *iface, DDCAPS *DriverCaps, DD > caps.dwSize = sizeof(caps); > > wined3d_mutex_lock(); > - hr = wined3d_device_get_device_caps(This->wined3d_device,&winecaps); > + hr = wined3d_device_get_device_caps(ddraw->wined3d_device,&winecaps); > if (FAILED(hr)) > { > WARN("IWineD3DDevice::GetDeviceCaps failed\n"); > @@ -1341,29 +1341,29 @@ static HRESULT WINAPI ddraw7_GetCaps(IDirectDraw7 *iface, DDCAPS *DriverCaps, DD > > static HRESULT WINAPI ddraw4_GetCaps(IDirectDraw4 *iface, DDCAPS *driver_caps, DDCAPS *hel_caps) > { > - IDirectDrawImpl *This = impl_from_IDirectDraw4(iface); > + struct ddraw *ddraw = impl_from_IDirectDraw4(iface); > > TRACE("iface %p, driver_caps %p, hel_caps %p.\n", iface, driver_caps, hel_caps); > > - return ddraw7_GetCaps(&This->IDirectDraw7_iface, driver_caps, hel_caps); > + return ddraw7_GetCaps(&ddraw->IDirectDraw7_iface, driver_caps, hel_caps); > } > > static HRESULT WINAPI ddraw2_GetCaps(IDirectDraw2 *iface, DDCAPS *driver_caps, DDCAPS *hel_caps) > { > - IDirectDrawImpl *This = impl_from_IDirectDraw2(iface); > + struct ddraw *ddraw = impl_from_IDirectDraw2(iface); > > TRACE("iface %p, driver_caps %p, hel_caps %p.\n", iface, driver_caps, hel_caps); > > - return ddraw7_GetCaps(&This->IDirectDraw7_iface, driver_caps, hel_caps); > + return ddraw7_GetCaps(&ddraw->IDirectDraw7_iface, driver_caps, hel_caps); > } > > static HRESULT WINAPI ddraw1_GetCaps(IDirectDraw *iface, DDCAPS *driver_caps, DDCAPS *hel_caps) > { > - IDirectDrawImpl *This = impl_from_IDirectDraw(iface); > + struct ddraw *ddraw = impl_from_IDirectDraw(iface); > > TRACE("iface %p, driver_caps %p, hel_caps %p.\n", iface, driver_caps, hel_caps); > > - return ddraw7_GetCaps(&This->IDirectDraw7_iface, driver_caps, hel_caps); > + return ddraw7_GetCaps(&ddraw->IDirectDraw7_iface, driver_caps, hel_caps); > } > > /***************************************************************************** > @@ -1384,29 +1384,29 @@ static HRESULT WINAPI ddraw7_Compact(IDirectDraw7 *iface) > > static HRESULT WINAPI ddraw4_Compact(IDirectDraw4 *iface) > { > - IDirectDrawImpl *This = impl_from_IDirectDraw4(iface); > + struct ddraw *ddraw = impl_from_IDirectDraw4(iface); > > TRACE("iface %p.\n", iface); > > - return ddraw7_Compact(&This->IDirectDraw7_iface); > + return ddraw7_Compact(&ddraw->IDirectDraw7_iface); > } > > static HRESULT WINAPI ddraw2_Compact(IDirectDraw2 *iface) > { > - IDirectDrawImpl *This = impl_from_IDirectDraw2(iface); > + struct ddraw *ddraw = impl_from_IDirectDraw2(iface); > > TRACE("iface %p.\n", iface); > > - return ddraw7_Compact(&This->IDirectDraw7_iface); > + return ddraw7_Compact(&ddraw->IDirectDraw7_iface); > } > > static HRESULT WINAPI ddraw1_Compact(IDirectDraw *iface) > { > - IDirectDrawImpl *This = impl_from_IDirectDraw(iface); > + struct ddraw *ddraw = impl_from_IDirectDraw(iface); > > TRACE("iface %p.\n", iface); > > - return ddraw7_Compact(&This->IDirectDraw7_iface); > + return ddraw7_Compact(&ddraw->IDirectDraw7_iface); > } > > /***************************************************************************** > @@ -1425,7 +1425,7 @@ static HRESULT WINAPI ddraw1_Compact(IDirectDraw *iface) > *****************************************************************************/ > static HRESULT WINAPI ddraw7_GetDisplayMode(IDirectDraw7 *iface, DDSURFACEDESC2 *DDSD) > { > - IDirectDrawImpl *This = impl_from_IDirectDraw7(iface); > + struct ddraw *ddraw = impl_from_IDirectDraw7(iface); > struct wined3d_display_mode mode; > HRESULT hr; > DWORD Size; > @@ -1442,10 +1442,10 @@ static HRESULT WINAPI ddraw7_GetDisplayMode(IDirectDraw7 *iface, DDSURFACEDESC2 > > /* The necessary members of LPDDSURFACEDESC and LPDDSURFACEDESC2 are equal, > * so one method can be used for all versions (Hopefully) */ > - hr = wined3d_device_get_display_mode(This->wined3d_device, 0,&mode); > + hr = wined3d_device_get_display_mode(ddraw->wined3d_device, 0,&mode); > if (FAILED(hr)) > { > - ERR(" (%p) IWineD3DDevice::GetDisplayMode returned %08x\n", This, hr); > + ERR("Failed to get display mode, hr %#x.\n", hr); > wined3d_mutex_unlock(); > return hr; > } > @@ -1476,31 +1476,31 @@ static HRESULT WINAPI ddraw7_GetDisplayMode(IDirectDraw7 *iface, DDSURFACEDESC2 > > static HRESULT WINAPI ddraw4_GetDisplayMode(IDirectDraw4 *iface, DDSURFACEDESC2 *surface_desc) > { > - IDirectDrawImpl *This = impl_from_IDirectDraw4(iface); > + struct ddraw *ddraw = impl_from_IDirectDraw4(iface); > > TRACE("iface %p, surface_desc %p.\n", iface, surface_desc); > > - return ddraw7_GetDisplayMode(&This->IDirectDraw7_iface, surface_desc); > + return ddraw7_GetDisplayMode(&ddraw->IDirectDraw7_iface, surface_desc); > } > > static HRESULT WINAPI ddraw2_GetDisplayMode(IDirectDraw2 *iface, DDSURFACEDESC *surface_desc) > { > - IDirectDrawImpl *This = impl_from_IDirectDraw2(iface); > + struct ddraw *ddraw = impl_from_IDirectDraw2(iface); > > TRACE("iface %p, surface_desc %p.\n", iface, surface_desc); > > /* FIXME: Test sizes, properly convert surface_desc */ > - return ddraw7_GetDisplayMode(&This->IDirectDraw7_iface, (DDSURFACEDESC2 *)surface_desc); > + return ddraw7_GetDisplayMode(&ddraw->IDirectDraw7_iface, (DDSURFACEDESC2 *)surface_desc); > } > > static HRESULT WINAPI ddraw1_GetDisplayMode(IDirectDraw *iface, DDSURFACEDESC *surface_desc) > { > - IDirectDrawImpl *This = impl_from_IDirectDraw(iface); > + struct ddraw *ddraw = impl_from_IDirectDraw(iface); > > TRACE("iface %p, surface_desc %p.\n", iface, surface_desc); > > /* FIXME: Test sizes, properly convert surface_desc */ > - return ddraw7_GetDisplayMode(&This->IDirectDraw7_iface, (DDSURFACEDESC2 *)surface_desc); > + return ddraw7_GetDisplayMode(&ddraw->IDirectDraw7_iface, (DDSURFACEDESC2 *)surface_desc); > } > > /***************************************************************************** > @@ -1522,7 +1522,7 @@ static HRESULT WINAPI ddraw1_GetDisplayMode(IDirectDraw *iface, DDSURFACEDESC *s > *****************************************************************************/ > static HRESULT WINAPI ddraw7_GetFourCCCodes(IDirectDraw7 *iface, DWORD *NumCodes, DWORD *Codes) > { > - IDirectDrawImpl *This = impl_from_IDirectDraw7(iface); > + struct ddraw *ddraw = impl_from_IDirectDraw7(iface); > static const enum wined3d_format_id formats[] = > { > WINED3DFMT_YUY2, WINED3DFMT_UYVY, WINED3DFMT_YV12, > @@ -1535,13 +1535,13 @@ static HRESULT WINAPI ddraw7_GetFourCCCodes(IDirectDraw7 *iface, DWORD *NumCodes > > TRACE("iface %p, codes_count %p, codes %p.\n", iface, NumCodes, Codes); > > - wined3d_device_get_display_mode(This->wined3d_device, 0,&mode); > + wined3d_device_get_display_mode(ddraw->wined3d_device, 0,&mode); > > outsize = NumCodes&& Codes ? *NumCodes : 0; > > for (i = 0; i< (sizeof(formats) / sizeof(formats[0])); ++i) > { > - hr = wined3d_check_device_format(This->wined3d, WINED3DADAPTER_DEFAULT, WINED3D_DEVICE_TYPE_HAL, > + hr = wined3d_check_device_format(ddraw->wined3d, WINED3DADAPTER_DEFAULT, WINED3D_DEVICE_TYPE_HAL, > mode.format_id, 0, WINED3D_RTYPE_SURFACE, formats[i], DefaultSurfaceType); > if (SUCCEEDED(hr)) > { > @@ -1560,29 +1560,29 @@ static HRESULT WINAPI ddraw7_GetFourCCCodes(IDirectDraw7 *iface, DWORD *NumCodes > > static HRESULT WINAPI ddraw4_GetFourCCCodes(IDirectDraw4 *iface, DWORD *codes_count, DWORD *codes) > { > - IDirectDrawImpl *This = impl_from_IDirectDraw4(iface); > + struct ddraw *ddraw = impl_from_IDirectDraw4(iface); > > TRACE("iface %p, codes_count %p, codes %p.\n", iface, codes_count, codes); > > - return ddraw7_GetFourCCCodes(&This->IDirectDraw7_iface, codes_count, codes); > + return ddraw7_GetFourCCCodes(&ddraw->IDirectDraw7_iface, codes_count, codes); > } > > static HRESULT WINAPI ddraw2_GetFourCCCodes(IDirectDraw2 *iface, DWORD *codes_count, DWORD *codes) > { > - IDirectDrawImpl *This = impl_from_IDirectDraw2(iface); > + struct ddraw *ddraw = impl_from_IDirectDraw2(iface); > > TRACE("iface %p, codes_count %p, codes %p.\n", iface, codes_count, codes); > > - return ddraw7_GetFourCCCodes(&This->IDirectDraw7_iface, codes_count, codes); > + return ddraw7_GetFourCCCodes(&ddraw->IDirectDraw7_iface, codes_count, codes); > } > > static HRESULT WINAPI ddraw1_GetFourCCCodes(IDirectDraw *iface, DWORD *codes_count, DWORD *codes) > { > - IDirectDrawImpl *This = impl_from_IDirectDraw(iface); > + struct ddraw *ddraw = impl_from_IDirectDraw(iface); > > TRACE("iface %p, codes_count %p, codes %p.\n", iface, codes_count, codes); > > - return ddraw7_GetFourCCCodes(&This->IDirectDraw7_iface, codes_count, codes); > + return ddraw7_GetFourCCCodes(&ddraw->IDirectDraw7_iface, codes_count, codes); > } > > /***************************************************************************** > @@ -1612,29 +1612,29 @@ static HRESULT WINAPI ddraw7_GetMonitorFrequency(IDirectDraw7 *iface, DWORD *Fre > > static HRESULT WINAPI ddraw4_GetMonitorFrequency(IDirectDraw4 *iface, DWORD *frequency) > { > - IDirectDrawImpl *This = impl_from_IDirectDraw4(iface); > + struct ddraw *ddraw = impl_from_IDirectDraw4(iface); > > TRACE("iface %p, frequency %p.\n", iface, frequency); > > - return ddraw7_GetMonitorFrequency(&This->IDirectDraw7_iface, frequency); > + return ddraw7_GetMonitorFrequency(&ddraw->IDirectDraw7_iface, frequency); > } > > static HRESULT WINAPI ddraw2_GetMonitorFrequency(IDirectDraw2 *iface, DWORD *frequency) > { > - IDirectDrawImpl *This = impl_from_IDirectDraw2(iface); > + struct ddraw *ddraw = impl_from_IDirectDraw2(iface); > > TRACE("iface %p, frequency %p.\n", iface, frequency); > > - return ddraw7_GetMonitorFrequency(&This->IDirectDraw7_iface, frequency); > + return ddraw7_GetMonitorFrequency(&ddraw->IDirectDraw7_iface, frequency); > } > > static HRESULT WINAPI ddraw1_GetMonitorFrequency(IDirectDraw *iface, DWORD *frequency) > { > - IDirectDrawImpl *This = impl_from_IDirectDraw(iface); > + struct ddraw *ddraw = impl_from_IDirectDraw(iface); > > TRACE("iface %p, frequency %p.\n", iface, frequency); > > - return ddraw7_GetMonitorFrequency(&This->IDirectDraw7_iface, frequency); > + return ddraw7_GetMonitorFrequency(&ddraw->IDirectDraw7_iface, frequency); > } > > /***************************************************************************** > @@ -1668,29 +1668,29 @@ static HRESULT WINAPI ddraw7_GetVerticalBlankStatus(IDirectDraw7 *iface, BOOL *s > > static HRESULT WINAPI ddraw4_GetVerticalBlankStatus(IDirectDraw4 *iface, BOOL *status) > { > - IDirectDrawImpl *This = impl_from_IDirectDraw4(iface); > + struct ddraw *ddraw = impl_from_IDirectDraw4(iface); > > TRACE("iface %p, status %p.\n", iface, status); > > - return ddraw7_GetVerticalBlankStatus(&This->IDirectDraw7_iface, status); > + return ddraw7_GetVerticalBlankStatus(&ddraw->IDirectDraw7_iface, status); > } > > static HRESULT WINAPI ddraw2_GetVerticalBlankStatus(IDirectDraw2 *iface, BOOL *status) > { > - IDirectDrawImpl *This = impl_from_IDirectDraw2(iface); > + struct ddraw *ddraw = impl_from_IDirectDraw2(iface); > > TRACE("iface %p, status %p.\n", iface, status); > > - return ddraw7_GetVerticalBlankStatus(&This->IDirectDraw7_iface, status); > + return ddraw7_GetVerticalBlankStatus(&ddraw->IDirectDraw7_iface, status); > } > > static HRESULT WINAPI ddraw1_GetVerticalBlankStatus(IDirectDraw *iface, BOOL *status) > { > - IDirectDrawImpl *This = impl_from_IDirectDraw(iface); > + struct ddraw *ddraw = impl_from_IDirectDraw(iface); > > TRACE("iface %p, status %p.\n", iface, status); > > - return ddraw7_GetVerticalBlankStatus(&This->IDirectDraw7_iface, status); > + return ddraw7_GetVerticalBlankStatus(&ddraw->IDirectDraw7_iface, status); > } > > /***************************************************************************** > @@ -1711,14 +1711,14 @@ static HRESULT WINAPI ddraw1_GetVerticalBlankStatus(IDirectDraw *iface, BOOL *st > static HRESULT WINAPI ddraw7_GetAvailableVidMem(IDirectDraw7 *iface, DDSCAPS2 *Caps, DWORD *total, > DWORD *free) > { > - IDirectDrawImpl *This = impl_from_IDirectDraw7(iface); > + struct ddraw *ddraw = impl_from_IDirectDraw7(iface); > HRESULT hr = DD_OK; > > TRACE("iface %p, caps %p, total %p, free %p.\n", iface, Caps, total, free); > > - if(TRACE_ON(ddraw)) > + if (TRACE_ON(ddraw)) > { > - TRACE("(%p) Asked for memory with description: ", This); > + TRACE("Asked for memory with description: "); > DDRAW_dump_DDSCAPS2(Caps); > } > wined3d_mutex_lock(); > @@ -1735,12 +1735,12 @@ static HRESULT WINAPI ddraw7_GetAvailableVidMem(IDirectDraw7 *iface, DDSCAPS2 *C > } > > if (free) > - *free = wined3d_device_get_available_texture_mem(This->wined3d_device); > + *free = wined3d_device_get_available_texture_mem(ddraw->wined3d_device); > if (total) > { > struct wined3d_adapter_identifier desc = {0}; > > - hr = wined3d_get_adapter_identifier(This->wined3d, WINED3DADAPTER_DEFAULT, 0,&desc); > + hr = wined3d_get_adapter_identifier(ddraw->wined3d, WINED3DADAPTER_DEFAULT, 0,&desc); > *total = desc.video_memory; > } > > @@ -1752,23 +1752,23 @@ static HRESULT WINAPI ddraw7_GetAvailableVidMem(IDirectDraw7 *iface, DDSCAPS2 *C > static HRESULT WINAPI ddraw4_GetAvailableVidMem(IDirectDraw4 *iface, > DDSCAPS2 *caps, DWORD *total, DWORD *free) > { > - IDirectDrawImpl *This = impl_from_IDirectDraw4(iface); > + struct ddraw *ddraw = impl_from_IDirectDraw4(iface); > > TRACE("iface %p, caps %p, total %p, free %p.\n", iface, caps, total, free); > > - return ddraw7_GetAvailableVidMem(&This->IDirectDraw7_iface, caps, total, free); > + return ddraw7_GetAvailableVidMem(&ddraw->IDirectDraw7_iface, caps, total, free); > } > > static HRESULT WINAPI ddraw2_GetAvailableVidMem(IDirectDraw2 *iface, > DDSCAPS *caps, DWORD *total, DWORD *free) > { > - IDirectDrawImpl *This = impl_from_IDirectDraw2(iface); > + struct ddraw *ddraw = impl_from_IDirectDraw2(iface); > DDSCAPS2 caps2; > > TRACE("iface %p, caps %p, total %p, free %p.\n", iface, caps, total, free); > > DDRAW_Convert_DDSCAPS_1_To_2(caps,&caps2); > - return ddraw7_GetAvailableVidMem(&This->IDirectDraw7_iface,&caps2, total, free); > + return ddraw7_GetAvailableVidMem(&ddraw->IDirectDraw7_iface,&caps2, total, free); > } > > /***************************************************************************** > @@ -1787,11 +1787,11 @@ static HRESULT WINAPI ddraw2_GetAvailableVidMem(IDirectDraw2 *iface, > *****************************************************************************/ > static HRESULT WINAPI ddraw7_Initialize(IDirectDraw7 *iface, GUID *guid) > { > - IDirectDrawImpl *This = impl_from_IDirectDraw7(iface); > + struct ddraw *ddraw = impl_from_IDirectDraw7(iface); > > TRACE("iface %p, guid %s.\n", iface, debugstr_guid(guid)); > > - if (This->initialized) > + if (ddraw->initialized) > return DDERR_ALREADYINITIALIZED; > > /* FIXME: To properly take the GUID into account we should call > @@ -1799,35 +1799,35 @@ static HRESULT WINAPI ddraw7_Initialize(IDirectDraw7 *iface, GUID *guid) > if (guid) > FIXME("Ignoring guid %s.\n", debugstr_guid(guid)); > > - This->initialized = TRUE; > + ddraw->initialized = TRUE; > return DD_OK; > } > > static HRESULT WINAPI ddraw4_Initialize(IDirectDraw4 *iface, GUID *guid) > { > - IDirectDrawImpl *This = impl_from_IDirectDraw4(iface); > + struct ddraw *ddraw = impl_from_IDirectDraw4(iface); > > TRACE("iface %p, guid %s.\n", iface, debugstr_guid(guid)); > > - return ddraw7_Initialize(&This->IDirectDraw7_iface, guid); > + return ddraw7_Initialize(&ddraw->IDirectDraw7_iface, guid); > } > > static HRESULT WINAPI ddraw2_Initialize(IDirectDraw2 *iface, GUID *guid) > { > - IDirectDrawImpl *This = impl_from_IDirectDraw2(iface); > + struct ddraw *ddraw = impl_from_IDirectDraw2(iface); > > TRACE("iface %p, guid %s.\n", iface, debugstr_guid(guid)); > > - return ddraw7_Initialize(&This->IDirectDraw7_iface, guid); > + return ddraw7_Initialize(&ddraw->IDirectDraw7_iface, guid); > } > > static HRESULT WINAPI ddraw1_Initialize(IDirectDraw *iface, GUID *guid) > { > - IDirectDrawImpl *This = impl_from_IDirectDraw(iface); > + struct ddraw *ddraw = impl_from_IDirectDraw(iface); > > TRACE("iface %p, guid %s.\n", iface, debugstr_guid(guid)); > > - return ddraw7_Initialize(&This->IDirectDraw7_iface, guid); > + return ddraw7_Initialize(&ddraw->IDirectDraw7_iface, guid); > } > > static HRESULT WINAPI d3d1_Initialize(IDirect3D *iface, REFIID riid) > @@ -1859,29 +1859,29 @@ static HRESULT WINAPI ddraw7_FlipToGDISurface(IDirectDraw7 *iface) > > static HRESULT WINAPI ddraw4_FlipToGDISurface(IDirectDraw4 *iface) > { > - IDirectDrawImpl *This = impl_from_IDirectDraw4(iface); > + struct ddraw *ddraw = impl_from_IDirectDraw4(iface); > > TRACE("iface %p.\n", iface); > > - return ddraw7_FlipToGDISurface(&This->IDirectDraw7_iface); > + return ddraw7_FlipToGDISurface(&ddraw->IDirectDraw7_iface); > } > > static HRESULT WINAPI ddraw2_FlipToGDISurface(IDirectDraw2 *iface) > { > - IDirectDrawImpl *This = impl_from_IDirectDraw2(iface); > + struct ddraw *ddraw = impl_from_IDirectDraw2(iface); > > TRACE("iface %p.\n", iface); > > - return ddraw7_FlipToGDISurface(&This->IDirectDraw7_iface); > + return ddraw7_FlipToGDISurface(&ddraw->IDirectDraw7_iface); > } > > static HRESULT WINAPI ddraw1_FlipToGDISurface(IDirectDraw *iface) > { > - IDirectDrawImpl *This = impl_from_IDirectDraw(iface); > + struct ddraw *ddraw = impl_from_IDirectDraw(iface); > > TRACE("iface %p.\n", iface); > > - return ddraw7_FlipToGDISurface(&This->IDirectDraw7_iface); > + return ddraw7_FlipToGDISurface(&ddraw->IDirectDraw7_iface); > } > > /***************************************************************************** > @@ -1923,29 +1923,29 @@ static HRESULT WINAPI ddraw7_WaitForVerticalBlank(IDirectDraw7 *iface, DWORD Fla > > static HRESULT WINAPI ddraw4_WaitForVerticalBlank(IDirectDraw4 *iface, DWORD flags, HANDLE event) > { > - IDirectDrawImpl *This = impl_from_IDirectDraw4(iface); > + struct ddraw *ddraw = impl_from_IDirectDraw4(iface); > > TRACE("iface %p, flags %#x, event %p.\n", iface, flags, event); > > - return ddraw7_WaitForVerticalBlank(&This->IDirectDraw7_iface, flags, event); > + return ddraw7_WaitForVerticalBlank(&ddraw->IDirectDraw7_iface, flags, event); > } > > static HRESULT WINAPI ddraw2_WaitForVerticalBlank(IDirectDraw2 *iface, DWORD flags, HANDLE event) > { > - IDirectDrawImpl *This = impl_from_IDirectDraw2(iface); > + struct ddraw *ddraw = impl_from_IDirectDraw2(iface); > > TRACE("iface %p, flags %#x, event %p.\n", iface, flags, event); > > - return ddraw7_WaitForVerticalBlank(&This->IDirectDraw7_iface, flags, event); > + return ddraw7_WaitForVerticalBlank(&ddraw->IDirectDraw7_iface, flags, event); > } > > static HRESULT WINAPI ddraw1_WaitForVerticalBlank(IDirectDraw *iface, DWORD flags, HANDLE event) > { > - IDirectDrawImpl *This = impl_from_IDirectDraw(iface); > + struct ddraw *ddraw = impl_from_IDirectDraw(iface); > > TRACE("iface %p, flags %#x, event %p.\n", iface, flags, event); > > - return ddraw7_WaitForVerticalBlank(&This->IDirectDraw7_iface, flags, event); > + return ddraw7_WaitForVerticalBlank(&ddraw->IDirectDraw7_iface, flags, event); > } > > /***************************************************************************** > @@ -1962,7 +1962,7 @@ static HRESULT WINAPI ddraw1_WaitForVerticalBlank(IDirectDraw *iface, DWORD flag > *****************************************************************************/ > static HRESULT WINAPI ddraw7_GetScanLine(IDirectDraw7 *iface, DWORD *Scanline) > { > - IDirectDrawImpl *This = impl_from_IDirectDraw7(iface); > + struct ddraw *ddraw = impl_from_IDirectDraw7(iface); > struct wined3d_display_mode mode; > static DWORD cur_scanline; > static BOOL hide = FALSE; > @@ -1977,7 +1977,7 @@ static HRESULT WINAPI ddraw7_GetScanLine(IDirectDraw7 *iface, DWORD *Scanline) > } > > wined3d_mutex_lock(); > - wined3d_device_get_display_mode(This->wined3d_device, 0,&mode); > + wined3d_device_get_display_mode(ddraw->wined3d_device, 0,&mode); > wined3d_mutex_unlock(); > > /* Fake the line sweeping of the monitor */ > @@ -1992,29 +1992,29 @@ static HRESULT WINAPI ddraw7_GetScanLine(IDirectDraw7 *iface, DWORD *Scanline) > > static HRESULT WINAPI ddraw4_GetScanLine(IDirectDraw4 *iface, DWORD *line) > { > - IDirectDrawImpl *This = impl_from_IDirectDraw4(iface); > + struct ddraw *ddraw = impl_from_IDirectDraw4(iface); > > TRACE("iface %p, line %p.\n", iface, line); > > - return ddraw7_GetScanLine(&This->IDirectDraw7_iface, line); > + return ddraw7_GetScanLine(&ddraw->IDirectDraw7_iface, line); > } > > static HRESULT WINAPI ddraw2_GetScanLine(IDirectDraw2 *iface, DWORD *line) > { > - IDirectDrawImpl *This = impl_from_IDirectDraw2(iface); > + struct ddraw *ddraw = impl_from_IDirectDraw2(iface); > > TRACE("iface %p, line %p.\n", iface, line); > > - return ddraw7_GetScanLine(&This->IDirectDraw7_iface, line); > + return ddraw7_GetScanLine(&ddraw->IDirectDraw7_iface, line); > } > > static HRESULT WINAPI ddraw1_GetScanLine(IDirectDraw *iface, DWORD *line) > { > - IDirectDrawImpl *This = impl_from_IDirectDraw(iface); > + struct ddraw *ddraw = impl_from_IDirectDraw(iface); > > TRACE("iface %p, line %p.\n", iface, line); > > - return ddraw7_GetScanLine(&This->IDirectDraw7_iface, line); > + return ddraw7_GetScanLine(&ddraw->IDirectDraw7_iface, line); > } > > /***************************************************************************** > @@ -2038,11 +2038,11 @@ static HRESULT WINAPI ddraw7_TestCooperativeLevel(IDirectDraw7 *iface) > > static HRESULT WINAPI ddraw4_TestCooperativeLevel(IDirectDraw4 *iface) > { > - IDirectDrawImpl *This = impl_from_IDirectDraw4(iface); > + struct ddraw *ddraw = impl_from_IDirectDraw4(iface); > > TRACE("iface %p.\n", iface); > > - return ddraw7_TestCooperativeLevel(&This->IDirectDraw7_iface); > + return ddraw7_TestCooperativeLevel(&ddraw->IDirectDraw7_iface); > } > > /***************************************************************************** > @@ -2061,13 +2061,13 @@ static HRESULT WINAPI ddraw4_TestCooperativeLevel(IDirectDraw4 *iface) > *****************************************************************************/ > static HRESULT WINAPI ddraw7_GetGDISurface(IDirectDraw7 *iface, IDirectDrawSurface7 **GDISurface) > { > - IDirectDrawImpl *This = impl_from_IDirectDraw7(iface); > + struct ddraw *ddraw = impl_from_IDirectDraw7(iface); > > TRACE("iface %p, surface %p.\n", iface, GDISurface); > > wined3d_mutex_lock(); > > - if (!(*GDISurface =&This->primary->IDirectDrawSurface7_iface)) > + if (!(*GDISurface =&ddraw->primary->IDirectDrawSurface7_iface)) > { > WARN("Primary not created yet.\n"); > wined3d_mutex_unlock(); > @@ -2082,14 +2082,14 @@ static HRESULT WINAPI ddraw7_GetGDISurface(IDirectDraw7 *iface, IDirectDrawSurfa > > static HRESULT WINAPI ddraw4_GetGDISurface(IDirectDraw4 *iface, IDirectDrawSurface4 **surface) > { > - IDirectDrawImpl *This = impl_from_IDirectDraw4(iface); > + struct ddraw *ddraw = impl_from_IDirectDraw4(iface); > IDirectDrawSurface7 *surface7; > IDirectDrawSurfaceImpl *surface_impl; > HRESULT hr; > > TRACE("iface %p, surface %p.\n", iface, surface); > > - hr = ddraw7_GetGDISurface(&This->IDirectDraw7_iface,&surface7); > + hr = ddraw7_GetGDISurface(&ddraw->IDirectDraw7_iface,&surface7); > if (FAILED(hr)) > { > *surface = NULL; > @@ -2105,14 +2105,14 @@ static HRESULT WINAPI ddraw4_GetGDISurface(IDirectDraw4 *iface, IDirectDrawSurfa > > static HRESULT WINAPI ddraw2_GetGDISurface(IDirectDraw2 *iface, IDirectDrawSurface **surface) > { > - IDirectDrawImpl *This = impl_from_IDirectDraw2(iface); > + struct ddraw *ddraw = impl_from_IDirectDraw2(iface); > IDirectDrawSurface7 *surface7; > IDirectDrawSurfaceImpl *surface_impl; > HRESULT hr; > > TRACE("iface %p, surface %p.\n", iface, surface); > > - hr = ddraw7_GetGDISurface(&This->IDirectDraw7_iface,&surface7); > + hr = ddraw7_GetGDISurface(&ddraw->IDirectDraw7_iface,&surface7); > if (FAILED(hr)) > { > *surface = NULL; > @@ -2128,14 +2128,14 @@ static HRESULT WINAPI ddraw2_GetGDISurface(IDirectDraw2 *iface, IDirectDrawSurfa > > static HRESULT WINAPI ddraw1_GetGDISurface(IDirectDraw *iface, IDirectDrawSurface **surface) > { > - IDirectDrawImpl *This = impl_from_IDirectDraw(iface); > + struct ddraw *ddraw = impl_from_IDirectDraw(iface); > IDirectDrawSurface7 *surface7; > IDirectDrawSurfaceImpl *surface_impl; > HRESULT hr; > > TRACE("iface %p, surface %p.\n", iface, surface); > > - hr = ddraw7_GetGDISurface(&This->IDirectDraw7_iface,&surface7); > + hr = ddraw7_GetGDISurface(&ddraw->IDirectDraw7_iface,&surface7); > if (FAILED(hr)) > { > *surface = NULL; > @@ -2185,7 +2185,7 @@ static HRESULT CALLBACK EnumDisplayModesCallbackThunk(DDSURFACEDESC2 *surface_de > static HRESULT WINAPI ddraw7_EnumDisplayModes(IDirectDraw7 *iface, DWORD Flags, > DDSURFACEDESC2 *DDSD, void *Context, LPDDENUMMODESCALLBACK2 cb) > { > - IDirectDrawImpl *This = impl_from_IDirectDraw7(iface); > + struct ddraw *ddraw = impl_from_IDirectDraw7(iface); > struct wined3d_display_mode *enum_modes = NULL; > struct wined3d_display_mode mode; > unsigned int modenum, fmt; > @@ -2223,7 +2223,7 @@ static HRESULT WINAPI ddraw7_EnumDisplayModes(IDirectDraw7 *iface, DWORD Flags, > for(fmt = 0; fmt< (sizeof(checkFormatList) / sizeof(checkFormatList[0])); fmt++) > { > modenum = 0; > - while (wined3d_enum_adapter_modes(This->wined3d, WINED3DADAPTER_DEFAULT, > + while (wined3d_enum_adapter_modes(ddraw->wined3d, WINED3DADAPTER_DEFAULT, > checkFormatList[fmt], modenum++,&mode) == WINED3D_OK) > { > PixelFormat_WineD3DtoDD(&pixelformat, mode.format_id); > @@ -2325,18 +2325,18 @@ static HRESULT WINAPI ddraw7_EnumDisplayModes(IDirectDraw7 *iface, DWORD Flags, > static HRESULT WINAPI ddraw4_EnumDisplayModes(IDirectDraw4 *iface, DWORD flags, > DDSURFACEDESC2 *surface_desc, void *context, LPDDENUMMODESCALLBACK2 callback) > { > - IDirectDrawImpl *This = impl_from_IDirectDraw4(iface); > + struct ddraw *ddraw = impl_from_IDirectDraw4(iface); > > TRACE("iface %p, flags %#x, surface_desc %p, context %p, callback %p.\n", > iface, flags, surface_desc, context, callback); > > - return ddraw7_EnumDisplayModes(&This->IDirectDraw7_iface, flags, surface_desc, context, callback); > + return ddraw7_EnumDisplayModes(&ddraw->IDirectDraw7_iface, flags, surface_desc, context, callback); > } > > static HRESULT WINAPI ddraw2_EnumDisplayModes(IDirectDraw2 *iface, DWORD flags, > DDSURFACEDESC *surface_desc, void *context, LPDDENUMMODESCALLBACK callback) > { > - IDirectDrawImpl *This = impl_from_IDirectDraw2(iface); > + struct ddraw *ddraw = impl_from_IDirectDraw2(iface); > struct displaymodescallback_context cbcontext; > DDSURFACEDESC2 surface_desc2; > > @@ -2347,14 +2347,14 @@ static HRESULT WINAPI ddraw2_EnumDisplayModes(IDirectDraw2 *iface, DWORD flags, > cbcontext.context = context; > > if (surface_desc) DDSD_to_DDSD2(surface_desc,&surface_desc2); > - return ddraw7_EnumDisplayModes(&This->IDirectDraw7_iface, flags, > + return ddraw7_EnumDisplayModes(&ddraw->IDirectDraw7_iface, flags, > surface_desc ?&surface_desc2 : NULL,&cbcontext, EnumDisplayModesCallbackThunk); > } > > static HRESULT WINAPI ddraw1_EnumDisplayModes(IDirectDraw *iface, DWORD flags, > DDSURFACEDESC *surface_desc, void *context, LPDDENUMMODESCALLBACK callback) > { > - IDirectDrawImpl *This = impl_from_IDirectDraw(iface); > + struct ddraw *ddraw = impl_from_IDirectDraw(iface); > struct displaymodescallback_context cbcontext; > DDSURFACEDESC2 surface_desc2; > > @@ -2365,7 +2365,7 @@ static HRESULT WINAPI ddraw1_EnumDisplayModes(IDirectDraw *iface, DWORD flags, > cbcontext.context = context; > > if (surface_desc) DDSD_to_DDSD2(surface_desc,&surface_desc2); > - return ddraw7_EnumDisplayModes(&This->IDirectDraw7_iface, flags, > + return ddraw7_EnumDisplayModes(&ddraw->IDirectDraw7_iface, flags, > surface_desc ?&surface_desc2 : NULL,&cbcontext, EnumDisplayModesCallbackThunk); > } > > @@ -2431,13 +2431,13 @@ static HRESULT WINAPI ddraw7_GetDeviceIdentifier(IDirectDraw7 *iface, > static HRESULT WINAPI ddraw4_GetDeviceIdentifier(IDirectDraw4 *iface, > DDDEVICEIDENTIFIER *identifier, DWORD flags) > { > - IDirectDrawImpl *This = impl_from_IDirectDraw4(iface); > + struct ddraw *ddraw = impl_from_IDirectDraw4(iface); > DDDEVICEIDENTIFIER2 identifier2; > HRESULT hr; > > TRACE("iface %p, identifier %p, flags %#x.\n", iface, identifier, flags); > > - hr = ddraw7_GetDeviceIdentifier(&This->IDirectDraw7_iface,&identifier2, flags); > + hr = ddraw7_GetDeviceIdentifier(&ddraw->IDirectDraw7_iface,&identifier2, flags); > DDRAW_Convert_DDDEVICEIDENTIFIER_2_To_1(&identifier2, identifier); > > return hr; > @@ -2460,7 +2460,7 @@ static HRESULT WINAPI ddraw4_GetDeviceIdentifier(IDirectDraw4 *iface, > static HRESULT WINAPI ddraw7_GetSurfaceFromDC(IDirectDraw7 *iface, HDC hdc, > IDirectDrawSurface7 **Surface) > { > - IDirectDrawImpl *This = impl_from_IDirectDraw7(iface); > + struct ddraw *ddraw = impl_from_IDirectDraw7(iface); > struct wined3d_surface *wined3d_surface; > HRESULT hr; > > @@ -2468,7 +2468,7 @@ static HRESULT WINAPI ddraw7_GetSurfaceFromDC(IDirectDraw7 *iface, HDC hdc, > > if (!Surface) return E_INVALIDARG; > > - hr = wined3d_device_get_surface_from_dc(This->wined3d_device, hdc,&wined3d_surface); > + hr = wined3d_device_get_surface_from_dc(ddraw->wined3d_device, hdc,&wined3d_surface); > if (FAILED(hr)) > { > TRACE("No surface found for dc %p.\n", hdc); > @@ -2485,7 +2485,7 @@ static HRESULT WINAPI ddraw7_GetSurfaceFromDC(IDirectDraw7 *iface, HDC hdc, > static HRESULT WINAPI ddraw4_GetSurfaceFromDC(IDirectDraw4 *iface, HDC dc, > IDirectDrawSurface4 **surface) > { > - IDirectDrawImpl *This = impl_from_IDirectDraw4(iface); > + struct ddraw *ddraw = impl_from_IDirectDraw4(iface); > IDirectDrawSurface7 *surface7; > IDirectDrawSurfaceImpl *surface_impl; > HRESULT hr; > @@ -2494,7 +2494,7 @@ static HRESULT WINAPI ddraw4_GetSurfaceFromDC(IDirectDraw4 *iface, HDC dc, > > if (!surface) return E_INVALIDARG; > > - hr = ddraw7_GetSurfaceFromDC(&This->IDirectDraw7_iface, dc,&surface7); > + hr = ddraw7_GetSurfaceFromDC(&ddraw->IDirectDraw7_iface, dc,&surface7); > if (FAILED(hr)) > { > *surface = NULL; > @@ -2534,11 +2534,11 @@ static HRESULT WINAPI ddraw7_RestoreAllSurfaces(IDirectDraw7 *iface) > > static HRESULT WINAPI ddraw4_RestoreAllSurfaces(IDirectDraw4 *iface) > { > - IDirectDrawImpl *This = impl_from_IDirectDraw4(iface); > + struct ddraw *ddraw = impl_from_IDirectDraw4(iface); > > TRACE("iface %p.\n", iface); > > - return ddraw7_RestoreAllSurfaces(&This->IDirectDraw7_iface); > + return ddraw7_RestoreAllSurfaces(&ddraw->IDirectDraw7_iface); > } > > /***************************************************************************** > @@ -2596,17 +2596,17 @@ static HRESULT WINAPI ddraw7_StartModeTest(IDirectDraw7 *iface, SIZE *Modes, DWO > * DD_OK on success > * > *****************************************************************************/ > -static HRESULT ddraw_create_surface(IDirectDrawImpl *This, DDSURFACEDESC2 *pDDSD, > +static HRESULT ddraw_create_surface(struct ddraw *ddraw, DDSURFACEDESC2 *pDDSD, > IDirectDrawSurfaceImpl **ppSurf, UINT level, UINT version) > { > HRESULT hr; > > TRACE("ddraw %p, surface_desc %p, surface %p, level %u.\n", > - This, pDDSD, ppSurf, level); > + ddraw, pDDSD, ppSurf, level); > > if (TRACE_ON(ddraw)) > { > - TRACE(" (%p) Requesting surface desc :\n", This); > + TRACE("Requesting surface desc:\n"); > DDRAW_dump_surface_desc(pDDSD); > } > > @@ -2620,11 +2620,11 @@ static HRESULT ddraw_create_surface(IDirectDrawImpl *This, DDSURFACEDESC2 *pDDSD > *ppSurf = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectDrawSurfaceImpl)); > if(!*ppSurf) > { > - ERR("(%p) Error allocating memory for a surface\n", This); > + ERR("Failed to allocate surface memory.\n"); > return DDERR_OUTOFVIDEOMEMORY; > } > > - hr = ddraw_surface_init(*ppSurf, This, pDDSD, level, version); > + hr = ddraw_surface_init(*ppSurf, ddraw, pDDSD, level, version); > if (FAILED(hr)) > { > WARN("Failed to initialize surface, hr %#x.\n", hr); > @@ -2633,7 +2633,7 @@ static HRESULT ddraw_create_surface(IDirectDrawImpl *This, DDSURFACEDESC2 *pDDSD > } > > /* Increase the surface counter, and attach the surface */ > - list_add_head(&This->surface_list,&(*ppSurf)->surface_list_entry); > + list_add_head(&ddraw->surface_list,&(*ppSurf)->surface_list_entry); > > TRACE("Created surface %p.\n", *ppSurf); > > @@ -2653,12 +2653,8 @@ static HRESULT ddraw_create_surface(IDirectDrawImpl *This, DDSURFACEDESC2 *pDDSD > * creates an additional surface without the mipmapping flags > * > *****************************************************************************/ > -static HRESULT > -CreateAdditionalSurfaces(IDirectDrawImpl *This, > - IDirectDrawSurfaceImpl *root, > - UINT count, > - DDSURFACEDESC2 DDSD, > - BOOL CubeFaceRoot, UINT version) > +static HRESULT CreateAdditionalSurfaces(struct ddraw *ddraw, IDirectDrawSurfaceImpl *root, > + UINT count, DDSURFACEDESC2 DDSD, BOOL CubeFaceRoot, UINT version) > { > UINT i, j, level = 0; > HRESULT hr; > @@ -2685,7 +2681,7 @@ CreateAdditionalSurfaces(IDirectDrawImpl *This, > } > CubeFaceRoot = FALSE; > > - hr = ddraw_create_surface(This,&DDSD,&object2, level, version); > + hr = ddraw_create_surface(ddraw,&DDSD,&object2, level, version); > if(hr != DD_OK) > { > return hr; > @@ -2791,7 +2787,7 @@ static HRESULT CDECL ddraw_reset_enum_callback(struct wined3d_resource *resource > * DDERR_* if an error occurs > * > *****************************************************************************/ > -static HRESULT CreateSurface(IDirectDrawImpl *ddraw, DDSURFACEDESC2 *DDSD, > +static HRESULT CreateSurface(struct ddraw *ddraw, DDSURFACEDESC2 *DDSD, > IDirectDrawSurfaceImpl **Surf, IUnknown *UnkOuter, UINT version) > { > IDirectDrawSurfaceImpl *object = NULL; > @@ -3109,7 +3105,7 @@ static HRESULT CreateSurface(IDirectDrawImpl *ddraw, DDSURFACEDESC2 *DDSD, > static HRESULT WINAPI ddraw7_CreateSurface(IDirectDraw7 *iface, DDSURFACEDESC2 *surface_desc, > IDirectDrawSurface7 **surface, IUnknown *outer_unknown) > { > - IDirectDrawImpl *This = impl_from_IDirectDraw7(iface); > + struct ddraw *ddraw = impl_from_IDirectDraw7(iface); > IDirectDrawSurfaceImpl *impl; > HRESULT hr; > > @@ -3118,7 +3114,7 @@ static HRESULT WINAPI ddraw7_CreateSurface(IDirectDraw7 *iface, DDSURFACEDESC2 * > > wined3d_mutex_lock(); > > - if (!(This->cooperative_level& (DDSCL_NORMAL | DDSCL_EXCLUSIVE))) > + if (!(ddraw->cooperative_level& (DDSCL_NORMAL | DDSCL_EXCLUSIVE))) > { > WARN("Cooperative level not set.\n"); > wined3d_mutex_unlock(); > @@ -3145,7 +3141,7 @@ static HRESULT WINAPI ddraw7_CreateSurface(IDirectDraw7 *iface, DDSURFACEDESC2 * > return DDERR_INVALIDCAPS; > } > > - hr = CreateSurface(This, surface_desc,&impl, outer_unknown, 7); > + hr = CreateSurface(ddraw, surface_desc,&impl, outer_unknown, 7); > wined3d_mutex_unlock(); > if (FAILED(hr)) > { > @@ -3163,7 +3159,7 @@ static HRESULT WINAPI ddraw7_CreateSurface(IDirectDraw7 *iface, DDSURFACEDESC2 * > static HRESULT WINAPI ddraw4_CreateSurface(IDirectDraw4 *iface, > DDSURFACEDESC2 *surface_desc, IDirectDrawSurface4 **surface, IUnknown *outer_unknown) > { > - IDirectDrawImpl *This = impl_from_IDirectDraw4(iface); > + struct ddraw *ddraw = impl_from_IDirectDraw4(iface); > IDirectDrawSurfaceImpl *impl; > HRESULT hr; > > @@ -3172,7 +3168,7 @@ static HRESULT WINAPI ddraw4_CreateSurface(IDirectDraw4 *iface, > > wined3d_mutex_lock(); > > - if (!(This->cooperative_level& (DDSCL_NORMAL | DDSCL_EXCLUSIVE))) > + if (!(ddraw->cooperative_level& (DDSCL_NORMAL | DDSCL_EXCLUSIVE))) > { > WARN("Cooperative level not set.\n"); > wined3d_mutex_unlock(); > @@ -3199,7 +3195,7 @@ static HRESULT WINAPI ddraw4_CreateSurface(IDirectDraw4 *iface, > return DDERR_INVALIDCAPS; > } > > - hr = CreateSurface(This, surface_desc,&impl, outer_unknown, 4); > + hr = CreateSurface(ddraw, surface_desc,&impl, outer_unknown, 4); > wined3d_mutex_unlock(); > if (FAILED(hr)) > { > @@ -3217,7 +3213,7 @@ static HRESULT WINAPI ddraw4_CreateSurface(IDirectDraw4 *iface, > static HRESULT WINAPI ddraw2_CreateSurface(IDirectDraw2 *iface, > DDSURFACEDESC *surface_desc, IDirectDrawSurface **surface, IUnknown *outer_unknown) > { > - IDirectDrawImpl *This = impl_from_IDirectDraw2(iface); > + struct ddraw *ddraw = impl_from_IDirectDraw2(iface); > IDirectDrawSurfaceImpl *impl; > HRESULT hr; > DDSURFACEDESC2 surface_desc2; > @@ -3227,7 +3223,7 @@ static HRESULT WINAPI ddraw2_CreateSurface(IDirectDraw2 *iface, > > wined3d_mutex_lock(); > > - if (!(This->cooperative_level& (DDSCL_NORMAL | DDSCL_EXCLUSIVE))) > + if (!(ddraw->cooperative_level& (DDSCL_NORMAL | DDSCL_EXCLUSIVE))) > { > WARN("Cooperative level not set.\n"); > wined3d_mutex_unlock(); > @@ -3255,7 +3251,7 @@ static HRESULT WINAPI ddraw2_CreateSurface(IDirectDraw2 *iface, > return DDERR_INVALIDCAPS; > } > > - hr = CreateSurface(This,&surface_desc2,&impl, outer_unknown, 2); > + hr = CreateSurface(ddraw,&surface_desc2,&impl, outer_unknown, 2); > wined3d_mutex_unlock(); > if (FAILED(hr)) > { > @@ -3272,7 +3268,7 @@ static HRESULT WINAPI ddraw2_CreateSurface(IDirectDraw2 *iface, > static HRESULT WINAPI ddraw1_CreateSurface(IDirectDraw *iface, > DDSURFACEDESC *surface_desc, IDirectDrawSurface **surface, IUnknown *outer_unknown) > { > - IDirectDrawImpl *This = impl_from_IDirectDraw(iface); > + struct ddraw *ddraw = impl_from_IDirectDraw(iface); > IDirectDrawSurfaceImpl *impl; > HRESULT hr; > DDSURFACEDESC2 surface_desc2; > @@ -3282,7 +3278,7 @@ static HRESULT WINAPI ddraw1_CreateSurface(IDirectDraw *iface, > > wined3d_mutex_lock(); > > - if (!(This->cooperative_level& (DDSCL_NORMAL | DDSCL_EXCLUSIVE))) > + if (!(ddraw->cooperative_level& (DDSCL_NORMAL | DDSCL_EXCLUSIVE))) > { > WARN("Cooperative level not set.\n"); > wined3d_mutex_unlock(); > @@ -3300,7 +3296,7 @@ static HRESULT WINAPI ddraw1_CreateSurface(IDirectDraw *iface, > * primaries anyway. */ > surface_desc->ddsCaps.dwCaps&= ~DDSCAPS_FRONTBUFFER; > DDSD_to_DDSD2(surface_desc,&surface_desc2); > - hr = CreateSurface(This,&surface_desc2,&impl, outer_unknown, 1); > + hr = CreateSurface(ddraw,&surface_desc2,&impl, outer_unknown, 1); > wined3d_mutex_unlock(); > if (FAILED(hr)) > { > @@ -3486,13 +3482,7 @@ static HRESULT CALLBACK EnumSurfacesCallbackThunk(IDirectDrawSurface7 *surface, > static HRESULT WINAPI ddraw7_EnumSurfaces(IDirectDraw7 *iface, DWORD Flags, > DDSURFACEDESC2 *DDSD, void *Context, LPDDENUMSURFACESCALLBACK7 Callback) > { > - /* The surface enumeration is handled by WineDDraw, > - * because it keeps track of all surfaces attached to > - * it. The filtering is done by our callback function, > - * because WineDDraw doesn't handle ddraw-like surface > - * caps structures > - */ > - IDirectDrawImpl *This = impl_from_IDirectDraw7(iface); > + struct ddraw *ddraw = impl_from_IDirectDraw7(iface); > IDirectDrawSurfaceImpl *surf; > BOOL all, nomatch; > DDSURFACEDESC2 desc; > @@ -3510,7 +3500,7 @@ static HRESULT WINAPI ddraw7_EnumSurfaces(IDirectDraw7 *iface, DWORD Flags, > wined3d_mutex_lock(); > > /* Use the _SAFE enumeration, the app may destroy enumerated surfaces */ > - LIST_FOR_EACH_SAFE(entry, entry2,&This->surface_list) > + LIST_FOR_EACH_SAFE(entry, entry2,&ddraw->surface_list) > { > surf = LIST_ENTRY(entry, IDirectDrawSurfaceImpl, surface_list_entry); > > @@ -3541,7 +3531,7 @@ static HRESULT WINAPI ddraw7_EnumSurfaces(IDirectDraw7 *iface, DWORD Flags, > static HRESULT WINAPI ddraw4_EnumSurfaces(IDirectDraw4 *iface, DWORD flags, > DDSURFACEDESC2 *surface_desc, void *context, LPDDENUMSURFACESCALLBACK2 callback) > { > - IDirectDrawImpl *This = impl_from_IDirectDraw4(iface); > + struct ddraw *ddraw = impl_from_IDirectDraw4(iface); > struct surfacescallback2_context cbcontext; > > TRACE("iface %p, flags %#x, surface_desc %p, context %p, callback %p.\n", > @@ -3550,14 +3540,14 @@ static HRESULT WINAPI ddraw4_EnumSurfaces(IDirectDraw4 *iface, DWORD flags, > cbcontext.func = callback; > cbcontext.context = context; > > - return ddraw7_EnumSurfaces(&This->IDirectDraw7_iface, flags, surface_desc, > + return ddraw7_EnumSurfaces(&ddraw->IDirectDraw7_iface, flags, surface_desc, > &cbcontext, EnumSurfacesCallback2Thunk); > } > > static HRESULT WINAPI ddraw2_EnumSurfaces(IDirectDraw2 *iface, DWORD flags, > DDSURFACEDESC *surface_desc, void *context, LPDDENUMSURFACESCALLBACK callback) > { > - IDirectDrawImpl *This = impl_from_IDirectDraw2(iface); > + struct ddraw *ddraw = impl_from_IDirectDraw2(iface); > struct surfacescallback_context cbcontext; > DDSURFACEDESC2 surface_desc2; > > @@ -3568,14 +3558,14 @@ static HRESULT WINAPI ddraw2_EnumSurfaces(IDirectDraw2 *iface, DWORD flags, > cbcontext.context = context; > > if (surface_desc) DDSD_to_DDSD2(surface_desc,&surface_desc2); > - return ddraw7_EnumSurfaces(&This->IDirectDraw7_iface, flags, > + return ddraw7_EnumSurfaces(&ddraw->IDirectDraw7_iface, flags, > surface_desc ?&surface_desc2 : NULL,&cbcontext, EnumSurfacesCallbackThunk); > } > > static HRESULT WINAPI ddraw1_EnumSurfaces(IDirectDraw *iface, DWORD flags, > DDSURFACEDESC *surface_desc, void *context, LPDDENUMSURFACESCALLBACK callback) > { > - IDirectDrawImpl *This = impl_from_IDirectDraw(iface); > + struct ddraw *ddraw = impl_from_IDirectDraw(iface); > struct surfacescallback_context cbcontext; > DDSURFACEDESC2 surface_desc2; > > @@ -3586,7 +3576,7 @@ static HRESULT WINAPI ddraw1_EnumSurfaces(IDirectDraw *iface, DWORD flags, > cbcontext.context = context; > > if (surface_desc) DDSD_to_DDSD2(surface_desc,&surface_desc2); > - return ddraw7_EnumSurfaces(&This->IDirectDraw7_iface, flags, > + return ddraw7_EnumSurfaces(&ddraw->IDirectDraw7_iface, flags, > surface_desc ?&surface_desc2 : NULL,&cbcontext, EnumSurfacesCallbackThunk); > } > > @@ -3659,34 +3649,34 @@ static HRESULT WINAPI ddraw7_CreateClipper(IDirectDraw7 *iface, DWORD Flags, > static HRESULT WINAPI ddraw4_CreateClipper(IDirectDraw4 *iface, DWORD flags, > IDirectDrawClipper **clipper, IUnknown *outer_unknown) > { > - IDirectDrawImpl *This = impl_from_IDirectDraw4(iface); > + struct ddraw *ddraw = impl_from_IDirectDraw4(iface); > > TRACE("iface %p, flags %#x, clipper %p, outer_unknown %p.\n", > iface, flags, clipper, outer_unknown); > > - return ddraw7_CreateClipper(&This->IDirectDraw7_iface, flags, clipper, outer_unknown); > + return ddraw7_CreateClipper(&ddraw->IDirectDraw7_iface, flags, clipper, outer_unknown); > } > > static HRESULT WINAPI ddraw2_CreateClipper(IDirectDraw2 *iface, > DWORD flags, IDirectDrawClipper **clipper, IUnknown *outer_unknown) > { > - IDirectDrawImpl *This = impl_from_IDirectDraw2(iface); > + struct ddraw *ddraw = impl_from_IDirectDraw2(iface); > > TRACE("iface %p, flags %#x, clipper %p, outer_unknown %p.\n", > iface, flags, clipper, outer_unknown); > > - return ddraw7_CreateClipper(&This->IDirectDraw7_iface, flags, clipper, outer_unknown); > + return ddraw7_CreateClipper(&ddraw->IDirectDraw7_iface, flags, clipper, outer_unknown); > } > > static HRESULT WINAPI ddraw1_CreateClipper(IDirectDraw *iface, > DWORD flags, IDirectDrawClipper **clipper, IUnknown *outer_unknown) > { > - IDirectDrawImpl *This = impl_from_IDirectDraw(iface); > + struct ddraw *ddraw = impl_from_IDirectDraw(iface); > > TRACE("iface %p, flags %#x, clipper %p, outer_unknown %p.\n", > iface, flags, clipper, outer_unknown); > > - return ddraw7_CreateClipper(&This->IDirectDraw7_iface, flags, clipper, outer_unknown); > + return ddraw7_CreateClipper(&ddraw->IDirectDraw7_iface, flags, clipper, outer_unknown); > } > > /***************************************************************************** > @@ -3709,7 +3699,7 @@ static HRESULT WINAPI ddraw1_CreateClipper(IDirectDraw *iface, > static HRESULT WINAPI ddraw7_CreatePalette(IDirectDraw7 *iface, DWORD Flags, > PALETTEENTRY *ColorTable, IDirectDrawPalette **Palette, IUnknown *pUnkOuter) > { > - IDirectDrawImpl *This = impl_from_IDirectDraw7(iface); > + struct ddraw *ddraw = impl_from_IDirectDraw7(iface); > IDirectDrawPaletteImpl *object; > HRESULT hr; > > @@ -3722,7 +3712,7 @@ static HRESULT WINAPI ddraw7_CreatePalette(IDirectDraw7 *iface, DWORD Flags, > wined3d_mutex_lock(); > > /* The refcount test shows that a cooplevel is required for this */ > - if(!This->cooperative_level) > + if (!ddraw->cooperative_level) > { > WARN("No cooperative level set, returning DDERR_NOCOOPERATIVELEVELSET\n"); > wined3d_mutex_unlock(); > @@ -3737,7 +3727,7 @@ static HRESULT WINAPI ddraw7_CreatePalette(IDirectDraw7 *iface, DWORD Flags, > return E_OUTOFMEMORY; > } > > - hr = ddraw_palette_init(object, This, Flags, ColorTable); > + hr = ddraw_palette_init(object, ddraw, Flags, ColorTable); > if (FAILED(hr)) > { > WARN("Failed to initialize palette, hr %#x.\n", hr); > @@ -3756,17 +3746,17 @@ static HRESULT WINAPI ddraw7_CreatePalette(IDirectDraw7 *iface, DWORD Flags, > static HRESULT WINAPI ddraw4_CreatePalette(IDirectDraw4 *iface, DWORD flags, PALETTEENTRY *entries, > IDirectDrawPalette **palette, IUnknown *outer_unknown) > { > - IDirectDrawImpl *This = impl_from_IDirectDraw4(iface); > + struct ddraw *ddraw = impl_from_IDirectDraw4(iface); > HRESULT hr; > > TRACE("iface %p, flags %#x, entries %p, palette %p, outer_unknown %p.\n", > iface, flags, entries, palette, outer_unknown); > > - hr = ddraw7_CreatePalette(&This->IDirectDraw7_iface, flags, entries, palette, outer_unknown); > + hr = ddraw7_CreatePalette(&ddraw->IDirectDraw7_iface, flags, entries, palette, outer_unknown); > if (SUCCEEDED(hr)&& *palette) > { > IDirectDrawPaletteImpl *impl = impl_from_IDirectDrawPalette(*palette); > - IDirectDraw7_Release(&This->IDirectDraw7_iface); > + IDirectDraw7_Release(&ddraw->IDirectDraw7_iface); > IDirectDraw4_AddRef(iface); > impl->ifaceToRelease = (IUnknown *)iface; > } > @@ -3776,17 +3766,17 @@ static HRESULT WINAPI ddraw4_CreatePalette(IDirectDraw4 *iface, DWORD flags, PAL > static HRESULT WINAPI ddraw2_CreatePalette(IDirectDraw2 *iface, DWORD flags, > PALETTEENTRY *entries, IDirectDrawPalette **palette, IUnknown *outer_unknown) > { > - IDirectDrawImpl *This = impl_from_IDirectDraw2(iface); > + struct ddraw *ddraw = impl_from_IDirectDraw2(iface); > HRESULT hr; > > TRACE("iface %p, flags %#x, entries %p, palette %p, outer_unknown %p.\n", > iface, flags, entries, palette, outer_unknown); > > - hr = ddraw7_CreatePalette(&This->IDirectDraw7_iface, flags, entries, palette, outer_unknown); > + hr = ddraw7_CreatePalette(&ddraw->IDirectDraw7_iface, flags, entries, palette, outer_unknown); > if (SUCCEEDED(hr)&& *palette) > { > IDirectDrawPaletteImpl *impl = impl_from_IDirectDrawPalette(*palette); > - IDirectDraw7_Release(&This->IDirectDraw7_iface); > + IDirectDraw7_Release(&ddraw->IDirectDraw7_iface); > impl->ifaceToRelease = NULL; > } > > @@ -3796,17 +3786,17 @@ static HRESULT WINAPI ddraw2_CreatePalette(IDirectDraw2 *iface, DWORD flags, > static HRESULT WINAPI ddraw1_CreatePalette(IDirectDraw *iface, DWORD flags, > PALETTEENTRY *entries, IDirectDrawPalette **palette, IUnknown *outer_unknown) > { > - IDirectDrawImpl *This = impl_from_IDirectDraw(iface); > + struct ddraw *ddraw = impl_from_IDirectDraw(iface); > HRESULT hr; > > TRACE("iface %p, flags %#x, entries %p, palette %p, outer_unknown %p.\n", > iface, flags, entries, palette, outer_unknown); > > - hr = ddraw7_CreatePalette(&This->IDirectDraw7_iface, flags, entries, palette, outer_unknown); > + hr = ddraw7_CreatePalette(&ddraw->IDirectDraw7_iface, flags, entries, palette, outer_unknown); > if (SUCCEEDED(hr)&& *palette) > { > IDirectDrawPaletteImpl *impl = impl_from_IDirectDrawPalette(*palette); > - IDirectDraw7_Release(&This->IDirectDraw7_iface); > + IDirectDraw7_Release(&ddraw->IDirectDraw7_iface); > impl->ifaceToRelease = NULL; > } > > @@ -3847,14 +3837,15 @@ static HRESULT WINAPI ddraw7_DuplicateSurface(IDirectDraw7 *iface, > static HRESULT WINAPI ddraw4_DuplicateSurface(IDirectDraw4 *iface, IDirectDrawSurface4 *src, > IDirectDrawSurface4 **dst) > { > - IDirectDrawImpl *This = impl_from_IDirectDraw4(iface); > + struct ddraw *ddraw = impl_from_IDirectDraw4(iface); > IDirectDrawSurfaceImpl *src_impl = unsafe_impl_from_IDirectDrawSurface4(src); > IDirectDrawSurface7 *dst7; > IDirectDrawSurfaceImpl *dst_impl; > HRESULT hr; > > TRACE("iface %p, src %p, dst %p.\n", iface, src, dst); > - hr = ddraw7_DuplicateSurface(&This->IDirectDraw7_iface, > + > + hr = ddraw7_DuplicateSurface(&ddraw->IDirectDraw7_iface, > src_impl ?&src_impl->IDirectDrawSurface7_iface : NULL,&dst7); > if (FAILED(hr)) > { > @@ -3872,14 +3863,15 @@ static HRESULT WINAPI ddraw4_DuplicateSurface(IDirectDraw4 *iface, IDirectDrawSu > static HRESULT WINAPI ddraw2_DuplicateSurface(IDirectDraw2 *iface, > IDirectDrawSurface *src, IDirectDrawSurface **dst) > { > - IDirectDrawImpl *This = impl_from_IDirectDraw2(iface); > + struct ddraw *ddraw = impl_from_IDirectDraw2(iface); > IDirectDrawSurfaceImpl *src_impl = unsafe_impl_from_IDirectDrawSurface(src); > IDirectDrawSurface7 *dst7; > IDirectDrawSurfaceImpl *dst_impl; > HRESULT hr; > > TRACE("iface %p, src %p, dst %p.\n", iface, src, dst); > - hr = ddraw7_DuplicateSurface(&This->IDirectDraw7_iface, > + > + hr = ddraw7_DuplicateSurface(&ddraw->IDirectDraw7_iface, > src_impl ?&src_impl->IDirectDrawSurface7_iface : NULL,&dst7); > if (FAILED(hr)) > return hr; > @@ -3894,14 +3886,15 @@ static HRESULT WINAPI ddraw2_DuplicateSurface(IDirectDraw2 *iface, > static HRESULT WINAPI ddraw1_DuplicateSurface(IDirectDraw *iface, IDirectDrawSurface *src, > IDirectDrawSurface **dst) > { > - IDirectDrawImpl *This = impl_from_IDirectDraw(iface); > + struct ddraw *ddraw = impl_from_IDirectDraw(iface); > IDirectDrawSurfaceImpl *src_impl = unsafe_impl_from_IDirectDrawSurface(src); > IDirectDrawSurface7 *dst7; > IDirectDrawSurfaceImpl *dst_impl; > HRESULT hr; > > TRACE("iface %p, src %p, dst %p.\n", iface, src, dst); > - hr = ddraw7_DuplicateSurface(&This->IDirectDraw7_iface, > + > + hr = ddraw7_DuplicateSurface(&ddraw->IDirectDraw7_iface, > src_impl ?&src_impl->IDirectDrawSurface7_iface : NULL,&dst7); > if (FAILED(hr)) > return hr; > @@ -3929,7 +3922,7 @@ static HRESULT WINAPI ddraw1_DuplicateSurface(IDirectDraw *iface, IDirectDrawSur > *****************************************************************************/ > static HRESULT WINAPI d3d7_EnumDevices(IDirect3D7 *iface, LPD3DENUMDEVICESCALLBACK7 callback, void *context) > { > - IDirectDrawImpl *This = impl_from_IDirect3D7(iface); > + struct ddraw *ddraw = impl_from_IDirect3D7(iface); > D3DDEVICEDESC7 device_desc7; > D3DDEVICEDESC device_desc1; > HRESULT hr; > @@ -3942,7 +3935,7 @@ static HRESULT WINAPI d3d7_EnumDevices(IDirect3D7 *iface, LPD3DENUMDEVICESCALLBA > > wined3d_mutex_lock(); > > - hr = IDirect3DImpl_GetCaps(This->wined3d,&device_desc1,&device_desc7); > + hr = IDirect3DImpl_GetCaps(ddraw->wined3d,&device_desc1,&device_desc7); > if (hr != D3D_OK) > { > wined3d_mutex_unlock(); > @@ -3991,7 +3984,7 @@ static HRESULT WINAPI d3d3_EnumDevices(IDirect3D3 *iface, LPD3DENUMDEVICESCALLBA > { > static CHAR wined3d_description[] = "Wine D3DDevice using WineD3D and OpenGL"; > > - IDirectDrawImpl *This = impl_from_IDirect3D3(iface); > + struct ddraw *ddraw = impl_from_IDirect3D3(iface); > D3DDEVICEDESC device_desc1, hal_desc, hel_desc; > D3DDEVICEDESC7 device_desc7; > HRESULT hr; > @@ -4009,7 +4002,7 @@ static HRESULT WINAPI d3d3_EnumDevices(IDirect3D3 *iface, LPD3DENUMDEVICESCALLBA > > wined3d_mutex_lock(); > > - hr = IDirect3DImpl_GetCaps(This->wined3d,&device_desc1,&device_desc7); > + hr = IDirect3DImpl_GetCaps(ddraw->wined3d,&device_desc1,&device_desc7); > if (hr != D3D_OK) > { > wined3d_mutex_unlock(); > @@ -4035,7 +4028,7 @@ static HRESULT WINAPI d3d3_EnumDevices(IDirect3D3 *iface, LPD3DENUMDEVICESCALLBA > * limitation flag), and it refuses all devices that have the perspective > * flag set. This way it refuses the emulation device, and HAL devices > * never have POW2 unset in d3d7 on windows. */ > - if (This->d3dversion != 1) > + if (ddraw->d3dversion != 1) > { > static CHAR reference_description[] = "RGB Direct3D emulation"; > > @@ -4092,20 +4085,20 @@ static HRESULT WINAPI d3d3_EnumDevices(IDirect3D3 *iface, LPD3DENUMDEVICESCALLBA > > static HRESULT WINAPI d3d2_EnumDevices(IDirect3D2 *iface, LPD3DENUMDEVICESCALLBACK callback, void *context) > { > - IDirectDrawImpl *This = impl_from_IDirect3D2(iface); > + struct ddraw *ddraw = impl_from_IDirect3D2(iface); > > TRACE("iface %p, callback %p, context %p.\n", iface, callback, context); > > - return d3d3_EnumDevices(&This->IDirect3D3_iface, callback, context); > + return d3d3_EnumDevices(&ddraw->IDirect3D3_iface, callback, context); > } > > static HRESULT WINAPI d3d1_EnumDevices(IDirect3D *iface, LPD3DENUMDEVICESCALLBACK callback, void *context) > { > - IDirectDrawImpl *This = impl_from_IDirect3D(iface); > + struct ddraw *ddraw = impl_from_IDirect3D(iface); > > TRACE("iface %p, callback %p, context %p.\n", iface, callback, context); > > - return d3d3_EnumDevices(&This->IDirect3D3_iface, callback, context); > + return d3d3_EnumDevices(&ddraw->IDirect3D3_iface, callback, context); > } > > /***************************************************************************** > @@ -4132,7 +4125,7 @@ static HRESULT WINAPI d3d1_EnumDevices(IDirect3D *iface, LPD3DENUMDEVICESCALLBAC > static HRESULT WINAPI d3d3_CreateLight(IDirect3D3 *iface, IDirect3DLight **light, > IUnknown *outer_unknown) > { > - IDirectDrawImpl *This = impl_from_IDirect3D3(iface); > + struct ddraw *ddraw = impl_from_IDirect3D3(iface); > IDirect3DLightImpl *object; > > TRACE("iface %p, light %p, outer_unknown %p.\n", iface, light, outer_unknown); > @@ -4146,7 +4139,7 @@ static HRESULT WINAPI d3d3_CreateLight(IDirect3D3 *iface, IDirect3DLight **light > return DDERR_OUTOFMEMORY; > } > > - d3d_light_init(object, This); > + d3d_light_init(object, ddraw); > > TRACE("Created light %p.\n", object); > *light =&object->IDirect3DLight_iface; > @@ -4156,20 +4149,20 @@ static HRESULT WINAPI d3d3_CreateLight(IDirect3D3 *iface, IDirect3DLight **light > > static HRESULT WINAPI d3d2_CreateLight(IDirect3D2 *iface, IDirect3DLight **light, IUnknown *outer_unknown) > { > - IDirectDrawImpl *This = impl_from_IDirect3D2(iface); > + struct ddraw *ddraw = impl_from_IDirect3D2(iface); > > TRACE("iface %p, light %p, outer_unknown %p.\n", iface, light, outer_unknown); > > - return d3d3_CreateLight(&This->IDirect3D3_iface, light, outer_unknown); > + return d3d3_CreateLight(&ddraw->IDirect3D3_iface, light, outer_unknown); > } > > static HRESULT WINAPI d3d1_CreateLight(IDirect3D *iface, IDirect3DLight **light, IUnknown *outer_unknown) > { > - IDirectDrawImpl *This = impl_from_IDirect3D(iface); > + struct ddraw *ddraw = impl_from_IDirect3D(iface); > > TRACE("iface %p, light %p, outer_unknown %p.\n", iface, light, outer_unknown); > > - return d3d3_CreateLight(&This->IDirect3D3_iface, light, outer_unknown); > + return d3d3_CreateLight(&ddraw->IDirect3D3_iface, light, outer_unknown); > } > > /***************************************************************************** > @@ -4195,14 +4188,14 @@ static HRESULT WINAPI d3d1_CreateLight(IDirect3D *iface, IDirect3DLight **light, > static HRESULT WINAPI d3d3_CreateMaterial(IDirect3D3 *iface, IDirect3DMaterial3 **material, > IUnknown *outer_unknown) > { > - IDirectDrawImpl *This = impl_from_IDirect3D3(iface); > + struct ddraw *ddraw = impl_from_IDirect3D3(iface); > IDirect3DMaterialImpl *object; > > TRACE("iface %p, material %p, outer_unknown %p.\n", iface, material, outer_unknown); > > if (outer_unknown) return CLASS_E_NOAGGREGATION; > > - object = d3d_material_create(This); > + object = d3d_material_create(ddraw); > if (!object) > { > ERR("Failed to allocate material memory.\n"); > @@ -4218,12 +4211,12 @@ static HRESULT WINAPI d3d3_CreateMaterial(IDirect3D3 *iface, IDirect3DMaterial3 > static HRESULT WINAPI d3d2_CreateMaterial(IDirect3D2 *iface, IDirect3DMaterial2 **material, > IUnknown *outer_unknown) > { > - IDirectDrawImpl *This = impl_from_IDirect3D2(iface); > + struct ddraw *ddraw = impl_from_IDirect3D2(iface); > IDirect3DMaterialImpl *object; > > TRACE("iface %p, material %p, outer_unknown %p.\n", iface, material, outer_unknown); > > - object = d3d_material_create(This); > + object = d3d_material_create(ddraw); > if (!object) > { > ERR("Failed to allocate material memory.\n"); > @@ -4239,12 +4232,12 @@ static HRESULT WINAPI d3d2_CreateMaterial(IDirect3D2 *iface, IDirect3DMaterial2 > static HRESULT WINAPI d3d1_CreateMaterial(IDirect3D *iface, IDirect3DMaterial **material, > IUnknown *outer_unknown) > { > - IDirectDrawImpl *This = impl_from_IDirect3D(iface); > + struct ddraw *ddraw = impl_from_IDirect3D(iface); > IDirect3DMaterialImpl *object; > > TRACE("iface %p, material %p, outer_unknown %p.\n", iface, material, outer_unknown); > > - object = d3d_material_create(This); > + object = d3d_material_create(ddraw); > if (!object) > { > ERR("Failed to allocate material memory.\n"); > @@ -4280,7 +4273,7 @@ static HRESULT WINAPI d3d1_CreateMaterial(IDirect3D *iface, IDirect3DMaterial ** > static HRESULT WINAPI d3d3_CreateViewport(IDirect3D3 *iface, IDirect3DViewport3 **viewport, > IUnknown *outer_unknown) > { > - IDirectDrawImpl *This = impl_from_IDirect3D3(iface); > + struct ddraw *ddraw = impl_from_IDirect3D3(iface); > IDirect3DViewportImpl *object; > > TRACE("iface %p, viewport %p, outer_unknown %p.\n", iface, viewport, outer_unknown); > @@ -4294,7 +4287,7 @@ static HRESULT WINAPI d3d3_CreateViewport(IDirect3D3 *iface, IDirect3DViewport3 > return DDERR_OUTOFMEMORY; > } > > - d3d_viewport_init(object, This); > + d3d_viewport_init(object, ddraw); > > TRACE("Created viewport %p.\n", object); > *viewport =&object->IDirect3DViewport3_iface; > @@ -4304,21 +4297,21 @@ static HRESULT WINAPI d3d3_CreateViewport(IDirect3D3 *iface, IDirect3DViewport3 > > static HRESULT WINAPI d3d2_CreateViewport(IDirect3D2 *iface, IDirect3DViewport2 **viewport, IUnknown *outer_unknown) > { > - IDirectDrawImpl *This = impl_from_IDirect3D2(iface); > + struct ddraw *ddraw = impl_from_IDirect3D2(iface); > > TRACE("iface %p, viewport %p, outer_unknown %p.\n", iface, viewport, outer_unknown); > > - return d3d3_CreateViewport(&This->IDirect3D3_iface, (IDirect3DViewport3 **)viewport, > + return d3d3_CreateViewport(&ddraw->IDirect3D3_iface, (IDirect3DViewport3 **)viewport, > outer_unknown); > } > > static HRESULT WINAPI d3d1_CreateViewport(IDirect3D *iface, IDirect3DViewport **viewport, IUnknown *outer_unknown) > { > - IDirectDrawImpl *This = impl_from_IDirect3D(iface); > + struct ddraw *ddraw = impl_from_IDirect3D(iface); > > TRACE("iface %p, viewport %p, outer_unknown %p.\n", iface, viewport, outer_unknown); > > - return d3d3_CreateViewport(&This->IDirect3D3_iface, (IDirect3DViewport3 **)viewport, > + return d3d3_CreateViewport(&ddraw->IDirect3D3_iface, (IDirect3DViewport3 **)viewport, > outer_unknown); > } > > @@ -4340,7 +4333,7 @@ static HRESULT WINAPI d3d1_CreateViewport(IDirect3D *iface, IDirect3DViewport ** > *****************************************************************************/ > static HRESULT WINAPI d3d3_FindDevice(IDirect3D3 *iface, D3DFINDDEVICESEARCH *fds, D3DFINDDEVICERESULT *fdr) > { > - IDirectDrawImpl *This = impl_from_IDirect3D3(iface); > + struct ddraw *ddraw = impl_from_IDirect3D3(iface); > D3DDEVICEDESC7 desc7; > D3DDEVICEDESC desc1; > HRESULT hr; > @@ -4373,7 +4366,7 @@ static HRESULT WINAPI d3d3_FindDevice(IDirect3D3 *iface, D3DFINDDEVICESEARCH *fd > } > > /* Get the caps */ > - hr = IDirect3DImpl_GetCaps(This->wined3d,&desc1,&desc7); > + hr = IDirect3DImpl_GetCaps(ddraw->wined3d,&desc1,&desc7); > if (hr != D3D_OK) return hr; > > /* Now return our own GUID */ > @@ -4388,20 +4381,20 @@ static HRESULT WINAPI d3d3_FindDevice(IDirect3D3 *iface, D3DFINDDEVICESEARCH *fd > > static HRESULT WINAPI d3d2_FindDevice(IDirect3D2 *iface, D3DFINDDEVICESEARCH *fds, D3DFINDDEVICERESULT *fdr) > { > - IDirectDrawImpl *This = impl_from_IDirect3D2(iface); > + struct ddraw *ddraw = impl_from_IDirect3D2(iface); > > TRACE("iface %p, fds %p, fdr %p.\n", iface, fds, fdr); > > - return d3d3_FindDevice(&This->IDirect3D3_iface, fds, fdr); > + return d3d3_FindDevice(&ddraw->IDirect3D3_iface, fds, fdr); > } > > static HRESULT WINAPI d3d1_FindDevice(IDirect3D *iface, D3DFINDDEVICESEARCH *fds, D3DFINDDEVICERESULT *fdr) > { > - IDirectDrawImpl *This = impl_from_IDirect3D(iface); > + struct ddraw *ddraw = impl_from_IDirect3D(iface); > > TRACE("iface %p, fds %p, fdr %p.\n", iface, fds, fdr); > > - return d3d3_FindDevice(&This->IDirect3D3_iface, fds, fdr); > + return d3d3_FindDevice(&ddraw->IDirect3D3_iface, fds, fdr); > } > > /***************************************************************************** > @@ -4429,7 +4422,7 @@ static HRESULT WINAPI d3d7_CreateDevice(IDirect3D7 *iface, REFCLSID riid, > IDirectDrawSurface7 *surface, IDirect3DDevice7 **device) > { > IDirectDrawSurfaceImpl *target = unsafe_impl_from_IDirectDrawSurface7(surface); > - IDirectDrawImpl *This = impl_from_IDirect3D7(iface); > + struct ddraw *ddraw = impl_from_IDirect3D7(iface); > IDirect3DDeviceImpl *object; > HRESULT hr; > > @@ -4450,7 +4443,7 @@ static HRESULT WINAPI d3d7_CreateDevice(IDirect3D7 *iface, REFCLSID riid, > return DDERR_NO3D; > } > > - if (This->d3ddevice) > + if (ddraw->d3ddevice) > { > FIXME("Only one Direct3D device per DirectDraw object supported.\n"); > wined3d_mutex_unlock(); > @@ -4465,7 +4458,7 @@ static HRESULT WINAPI d3d7_CreateDevice(IDirect3D7 *iface, REFCLSID riid, > return DDERR_OUTOFMEMORY; > } > > - hr = d3d_device_init(object, This, target); > + hr = d3d_device_init(object, ddraw, target); > if (FAILED(hr)) > { > WARN("Failed to initialize device, hr %#x.\n", hr); > @@ -4485,7 +4478,7 @@ static HRESULT WINAPI d3d7_CreateDevice(IDirect3D7 *iface, REFCLSID riid, > static HRESULT WINAPI d3d3_CreateDevice(IDirect3D3 *iface, REFCLSID riid, > IDirectDrawSurface4 *surface, IDirect3DDevice3 **device, IUnknown *outer_unknown) > { > - IDirectDrawImpl *This = impl_from_IDirect3D3(iface); > + struct ddraw *ddraw = impl_from_IDirect3D3(iface); > IDirectDrawSurfaceImpl *surface_impl = unsafe_impl_from_IDirectDrawSurface4(surface); > IDirect3DDevice7 *device7; > IDirect3DDeviceImpl *device_impl; > @@ -4496,7 +4489,7 @@ static HRESULT WINAPI d3d3_CreateDevice(IDirect3D3 *iface, REFCLSID riid, > > if (outer_unknown) return CLASS_E_NOAGGREGATION; > > - hr = d3d7_CreateDevice(&This->IDirect3D7_iface, riid, > + hr = d3d7_CreateDevice(&ddraw->IDirect3D7_iface, riid, > surface_impl ?&surface_impl->IDirectDrawSurface7_iface : NULL, device ?&device7 : NULL); > if (SUCCEEDED(hr)) > { > @@ -4510,7 +4503,7 @@ static HRESULT WINAPI d3d3_CreateDevice(IDirect3D3 *iface, REFCLSID riid, > static HRESULT WINAPI d3d2_CreateDevice(IDirect3D2 *iface, REFCLSID riid, > IDirectDrawSurface *surface, IDirect3DDevice2 **device) > { > - IDirectDrawImpl *This = impl_from_IDirect3D2(iface); > + struct ddraw *ddraw = impl_from_IDirect3D2(iface); > IDirectDrawSurfaceImpl *surface_impl = unsafe_impl_from_IDirectDrawSurface(surface); > IDirect3DDevice7 *device7; > IDirect3DDeviceImpl *device_impl; > @@ -4519,7 +4512,7 @@ static HRESULT WINAPI d3d2_CreateDevice(IDirect3D2 *iface, REFCLSID riid, > TRACE("iface %p, riid %s, surface %p, device %p.\n", > iface, debugstr_guid(riid), surface, device); > > - hr = d3d7_CreateDevice(&This->IDirect3D7_iface, riid, > + hr = d3d7_CreateDevice(&ddraw->IDirect3D7_iface, riid, > surface_impl ?&surface_impl->IDirectDrawSurface7_iface : NULL, device ?&device7 : NULL); > if (SUCCEEDED(hr)) > { > @@ -4553,7 +4546,7 @@ static HRESULT WINAPI d3d2_CreateDevice(IDirect3D2 *iface, REFCLSID riid, > static HRESULT WINAPI d3d7_CreateVertexBuffer(IDirect3D7 *iface, D3DVERTEXBUFFERDESC *desc, > IDirect3DVertexBuffer7 **vertex_buffer, DWORD flags) > { > - IDirectDrawImpl *This = impl_from_IDirect3D7(iface); > + struct ddraw *ddraw = impl_from_IDirect3D7(iface); > IDirect3DVertexBufferImpl *object; > HRESULT hr; > > @@ -4562,7 +4555,7 @@ static HRESULT WINAPI d3d7_CreateVertexBuffer(IDirect3D7 *iface, D3DVERTEXBUFFER > > if (!vertex_buffer || !desc) return DDERR_INVALIDPARAMS; > > - hr = d3d_vertex_buffer_create(&object, This, desc); > + hr = d3d_vertex_buffer_create(&object, ddraw, desc); > if (hr == D3D_OK) > { > TRACE("Created vertex buffer %p.\n", object); > @@ -4577,7 +4570,7 @@ static HRESULT WINAPI d3d7_CreateVertexBuffer(IDirect3D7 *iface, D3DVERTEXBUFFER > static HRESULT WINAPI d3d3_CreateVertexBuffer(IDirect3D3 *iface, D3DVERTEXBUFFERDESC *desc, > IDirect3DVertexBuffer **vertex_buffer, DWORD flags, IUnknown *outer_unknown) > { > - IDirectDrawImpl *This = impl_from_IDirect3D3(iface); > + struct ddraw *ddraw = impl_from_IDirect3D3(iface); > IDirect3DVertexBufferImpl *object; > HRESULT hr; > > @@ -4589,7 +4582,7 @@ static HRESULT WINAPI d3d3_CreateVertexBuffer(IDirect3D3 *iface, D3DVERTEXBUFFER > if (!vertex_buffer || !desc) > return DDERR_INVALIDPARAMS; > > - hr = d3d_vertex_buffer_create(&object, This, desc); > + hr = d3d_vertex_buffer_create(&object, ddraw, desc); > if (hr == D3D_OK) > { > TRACE("Created vertex buffer %p.\n", object); > @@ -4622,7 +4615,7 @@ static HRESULT WINAPI d3d3_CreateVertexBuffer(IDirect3D3 *iface, D3DVERTEXBUFFER > static HRESULT WINAPI d3d7_EnumZBufferFormats(IDirect3D7 *iface, REFCLSID device_iid, > LPD3DENUMPIXELFORMATSCALLBACK callback, void *context) > { > - IDirectDrawImpl *This = impl_from_IDirect3D7(iface); > + struct ddraw *ddraw = impl_from_IDirect3D7(iface); > struct wined3d_display_mode mode; > enum wined3d_device_type type; > unsigned int i; > @@ -4681,11 +4674,11 @@ static HRESULT WINAPI d3d7_EnumZBufferFormats(IDirect3D7 *iface, REFCLSID device > * not like that we'll have to find some workaround, like iterating over > * all imaginable formats and collecting all the depth stencil formats we > * can get. */ > - hr = wined3d_device_get_display_mode(This->wined3d_device, 0,&mode); > + hr = wined3d_device_get_display_mode(ddraw->wined3d_device, 0,&mode); > > for (i = 0; i< (sizeof(formats) / sizeof(*formats)); ++i) > { > - hr = wined3d_check_device_format(This->wined3d, WINED3DADAPTER_DEFAULT, type, mode.format_id, > + hr = wined3d_check_device_format(ddraw->wined3d, WINED3DADAPTER_DEFAULT, type, mode.format_id, > WINED3DUSAGE_DEPTHSTENCIL, WINED3D_RTYPE_SURFACE, formats[i], WINED3D_SURFACE_TYPE_OPENGL); > if (SUCCEEDED(hr)) > { > @@ -4710,7 +4703,7 @@ static HRESULT WINAPI d3d7_EnumZBufferFormats(IDirect3D7 *iface, REFCLSID device > * while others used dwZBufferBitDepth=32. In either case the pitch matches a 32 bits per > * pixel format, so we use dwZBufferBitDepth=32. Some games expect 24. Windows Vista and > * newer enumerate both versions, so we do the same(bug 22434) */ > - hr = wined3d_check_device_format(This->wined3d, WINED3DADAPTER_DEFAULT, type, mode.format_id, > + hr = wined3d_check_device_format(ddraw->wined3d, WINED3DADAPTER_DEFAULT, type, mode.format_id, > WINED3DUSAGE_DEPTHSTENCIL, WINED3D_RTYPE_SURFACE, WINED3DFMT_X8D24_UNORM, WINED3D_SURFACE_TYPE_OPENGL); > if (SUCCEEDED(hr)) > { > @@ -4733,12 +4726,12 @@ static HRESULT WINAPI d3d7_EnumZBufferFormats(IDirect3D7 *iface, REFCLSID device > static HRESULT WINAPI d3d3_EnumZBufferFormats(IDirect3D3 *iface, REFCLSID device_iid, > LPD3DENUMPIXELFORMATSCALLBACK callback, void *context) > { > - IDirectDrawImpl *This = impl_from_IDirect3D3(iface); > + struct ddraw *ddraw = impl_from_IDirect3D3(iface); > > TRACE("iface %p, device_iid %s, callback %p, context %p.\n", > iface, debugstr_guid(device_iid), callback, context); > > - return d3d7_EnumZBufferFormats(&This->IDirect3D7_iface, device_iid, callback, context); > + return d3d7_EnumZBufferFormats(&ddraw->IDirect3D7_iface, device_iid, callback, context); > } > > /***************************************************************************** > @@ -4755,13 +4748,13 @@ static HRESULT WINAPI d3d3_EnumZBufferFormats(IDirect3D3 *iface, REFCLSID device > *****************************************************************************/ > static HRESULT WINAPI d3d7_EvictManagedTextures(IDirect3D7 *iface) > { > - IDirectDrawImpl *This = impl_from_IDirect3D7(iface); > + struct ddraw *ddraw = impl_from_IDirect3D7(iface); > > TRACE("iface %p!\n", iface); > > wined3d_mutex_lock(); > - if (This->d3d_initialized) > - wined3d_device_evict_managed_resources(This->wined3d_device); > + if (ddraw->d3d_initialized) > + wined3d_device_evict_managed_resources(ddraw->wined3d_device); > wined3d_mutex_unlock(); > > return D3D_OK; > @@ -4769,11 +4762,11 @@ static HRESULT WINAPI d3d7_EvictManagedTextures(IDirect3D7 *iface) > > static HRESULT WINAPI d3d3_EvictManagedTextures(IDirect3D3 *iface) > { > - IDirectDrawImpl *This = impl_from_IDirect3D3(iface); > + struct ddraw *ddraw = impl_from_IDirect3D3(iface); > > TRACE("iface %p.\n", iface); > > - return d3d7_EvictManagedTextures(&This->IDirect3D7_iface); > + return d3d7_EvictManagedTextures(&ddraw->IDirect3D7_iface); > } > > /***************************************************************************** > @@ -5297,7 +5290,7 @@ static const struct IDirect3DVtbl d3d1_vtbl = > * NULL in case of an error, the vertex declaration for the FVF otherwise. > * > *****************************************************************************/ > -struct wined3d_vertex_declaration *ddraw_find_decl(IDirectDrawImpl *This, DWORD fvf) > +struct wined3d_vertex_declaration *ddraw_find_decl(struct ddraw *This, DWORD fvf) > { > struct wined3d_vertex_declaration *pDecl = NULL; > HRESULT hr; > @@ -5348,9 +5341,9 @@ struct wined3d_vertex_declaration *ddraw_find_decl(IDirectDrawImpl *This, DWORD > return pDecl; > } > > -static inline struct IDirectDrawImpl *ddraw_from_device_parent(struct wined3d_device_parent *device_parent) > +static inline struct ddraw *ddraw_from_device_parent(struct wined3d_device_parent *device_parent) > { > - return CONTAINING_RECORD(device_parent, struct IDirectDrawImpl, device_parent); > + return CONTAINING_RECORD(device_parent, struct ddraw, device_parent); > } > > static void CDECL device_parent_wined3d_device_created(struct wined3d_device_parent *device_parent, > @@ -5363,7 +5356,7 @@ static void CDECL device_parent_wined3d_device_created(struct wined3d_device_par > * wined3d mutex. */ > static void CDECL device_parent_mode_changed(struct wined3d_device_parent *device_parent) > { > - struct IDirectDrawImpl *ddraw = ddraw_from_device_parent(device_parent); > + struct ddraw *ddraw = ddraw_from_device_parent(device_parent); > MONITORINFO monitor_info; > HMONITOR monitor; > BOOL ret; > @@ -5397,7 +5390,7 @@ static HRESULT CDECL device_parent_create_surface(struct wined3d_device_parent * > void *container_parent, UINT width, UINT height, enum wined3d_format_id format, DWORD usage, > enum wined3d_pool pool, UINT level, enum wined3d_cubemap_face face, struct wined3d_surface **surface) > { > - struct IDirectDrawImpl *ddraw = ddraw_from_device_parent(device_parent); > + struct ddraw *ddraw = ddraw_from_device_parent(device_parent); > IDirectDrawSurfaceImpl *surf = NULL; > UINT i = 0; > DDSCAPS2 searchcaps = ddraw->tex_root->surface_desc.ddsCaps; > @@ -5466,7 +5459,7 @@ static HRESULT CDECL device_parent_create_surface(struct wined3d_device_parent * > > static void STDMETHODCALLTYPE ddraw_frontbuffer_destroyed(void *parent) > { > - struct IDirectDrawImpl *ddraw = parent; > + struct ddraw *ddraw = parent; > ddraw->wined3d_frontbuffer = NULL; > } > > @@ -5480,7 +5473,7 @@ static HRESULT CDECL device_parent_create_rendertarget(struct wined3d_device_par > enum wined3d_multisample_type multisample_type, DWORD multisample_quality, BOOL lockable, > struct wined3d_surface **surface) > { > - struct IDirectDrawImpl *ddraw = ddraw_from_device_parent(device_parent); > + struct ddraw *ddraw = ddraw_from_device_parent(device_parent); > DWORD flags = 0; > HRESULT hr; > > @@ -5532,7 +5525,7 @@ static HRESULT CDECL device_parent_create_volume(struct wined3d_device_parent *d > static HRESULT CDECL device_parent_create_swapchain(struct wined3d_device_parent *device_parent, > struct wined3d_swapchain_desc *desc, struct wined3d_swapchain **swapchain) > { > - struct IDirectDrawImpl *ddraw = ddraw_from_device_parent(device_parent); > + struct ddraw *ddraw = ddraw_from_device_parent(device_parent); > HRESULT hr; > > TRACE("device_parent %p, desc %p, swapchain %p.\n", device_parent, desc, swapchain); > @@ -5562,7 +5555,7 @@ static const struct wined3d_device_parent_ops ddraw_wined3d_device_parent_ops = > device_parent_create_swapchain, > }; > > -HRESULT ddraw_init(IDirectDrawImpl *ddraw, enum wined3d_device_type device_type) > +HRESULT ddraw_init(struct ddraw *ddraw, enum wined3d_device_type device_type) > { > HRESULT hr; > HDC hDC; > diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h > index c87c737..f1ec33d 100644 > --- a/dlls/ddraw/ddraw_private.h > +++ b/dlls/ddraw/ddraw_private.h > @@ -41,7 +41,6 @@ extern const struct wined3d_parent_ops ddraw_surface_wined3d_parent_ops DECLSPEC > extern const struct wined3d_parent_ops ddraw_null_wined3d_parent_ops DECLSPEC_HIDDEN; > > /* Typdef the interfaces */ > -typedef struct IDirectDrawImpl IDirectDrawImpl; > typedef struct IDirectDrawSurfaceImpl IDirectDrawSurfaceImpl; > typedef struct IDirectDrawPaletteImpl IDirectDrawPaletteImpl; > typedef struct IDirect3DDeviceImpl IDirect3DDeviceImpl; > @@ -62,7 +61,7 @@ struct FvfToDecl > struct wined3d_vertex_declaration *decl; > }; > > -struct IDirectDrawImpl > +struct ddraw > { > /* Interfaces */ > IDirectDraw7 IDirectDraw7_iface; > @@ -122,10 +121,10 @@ struct IDirectDrawImpl > > #define DDRAW_WINDOW_CLASS_NAME "DirectDrawDeviceWnd" > > -HRESULT ddraw_init(IDirectDrawImpl *ddraw, enum wined3d_device_type device_type) DECLSPEC_HIDDEN; > -void ddraw_destroy_swapchain(IDirectDrawImpl *ddraw) DECLSPEC_HIDDEN; > +HRESULT ddraw_init(struct ddraw *ddraw, enum wined3d_device_type device_type) DECLSPEC_HIDDEN; > +void ddraw_destroy_swapchain(struct ddraw *ddraw) DECLSPEC_HIDDEN; > > -static inline void ddraw_set_swapchain_window(struct IDirectDrawImpl *ddraw, HWND window) > +static inline void ddraw_set_swapchain_window(struct ddraw *ddraw, HWND window) > { > if (window == GetDesktopWindow()) > window = NULL; > @@ -135,7 +134,7 @@ static inline void ddraw_set_swapchain_window(struct IDirectDrawImpl *ddraw, HWN > /* Utility functions */ > void DDRAW_Convert_DDSCAPS_1_To_2(const DDSCAPS *pIn, DDSCAPS2 *pOut) DECLSPEC_HIDDEN; > void DDRAW_Convert_DDDEVICEIDENTIFIER_2_To_1(const DDDEVICEIDENTIFIER2 *pIn, DDDEVICEIDENTIFIER *pOut) DECLSPEC_HIDDEN; > -struct wined3d_vertex_declaration *ddraw_find_decl(IDirectDrawImpl *This, DWORD fvf) DECLSPEC_HIDDEN; > +struct wined3d_vertex_declaration *ddraw_find_decl(struct ddraw *ddraw, DWORD fvf) DECLSPEC_HIDDEN; > > /* The default surface type */ > extern enum wined3d_surface_type DefaultSurfaceType DECLSPEC_HIDDEN; > @@ -162,7 +161,7 @@ struct IDirectDrawSurfaceImpl > int version; > > /* Connections to other Objects */ > - IDirectDrawImpl *ddraw; > + struct ddraw *ddraw; > struct wined3d_surface *wined3d_surface; > struct wined3d_texture *wined3d_texture; > > @@ -200,7 +199,7 @@ struct IDirectDrawSurfaceImpl > }; > > HRESULT ddraw_surface_create_texture(IDirectDrawSurfaceImpl *surface) DECLSPEC_HIDDEN; > -HRESULT ddraw_surface_init(IDirectDrawSurfaceImpl *surface, IDirectDrawImpl *ddraw, > +HRESULT ddraw_surface_init(IDirectDrawSurfaceImpl *surface, struct ddraw *ddraw, > DDSURFACEDESC2 *desc, UINT mip_level, UINT version) DECLSPEC_HIDDEN; > ULONG ddraw_surface_release_iface(IDirectDrawSurfaceImpl *This) DECLSPEC_HIDDEN; > > @@ -288,7 +287,7 @@ struct IDirect3DDeviceImpl > > /* Other object connections */ > struct wined3d_device *wined3d_device; > - IDirectDrawImpl *ddraw; > + struct ddraw *ddraw; > struct wined3d_buffer *indexbuffer; > IDirectDrawSurfaceImpl *target; > > @@ -321,7 +320,7 @@ struct IDirect3DDeviceImpl > D3DMATRIXHANDLE world, proj, view; > }; > > -HRESULT d3d_device_init(IDirect3DDeviceImpl *device, IDirectDrawImpl *ddraw, > +HRESULT d3d_device_init(IDirect3DDeviceImpl *device, struct ddraw *ddraw, > IDirectDrawSurfaceImpl *target) DECLSPEC_HIDDEN; > > /* The IID */ > @@ -392,7 +391,7 @@ static inline IDirectDrawPaletteImpl *impl_from_IDirectDrawPalette(IDirectDrawPa > IDirectDrawPaletteImpl *unsafe_impl_from_IDirectDrawPalette(IDirectDrawPalette *iface) DECLSPEC_HIDDEN; > > HRESULT ddraw_palette_init(IDirectDrawPaletteImpl *palette, > - IDirectDrawImpl *ddraw, DWORD flags, PALETTEENTRY *entries) DECLSPEC_HIDDEN; > + struct ddraw *ddraw, DWORD flags, PALETTEENTRY *entries) DECLSPEC_HIDDEN; > > /* Helper structures */ > struct object_creation_info > @@ -411,7 +410,7 @@ struct IDirect3DLightImpl > LONG ref; > > /* IDirect3DLight fields */ > - IDirectDrawImpl *ddraw; > + struct ddraw *ddraw; > > /* If this light is active for one viewport, put the viewport here */ > IDirect3DViewportImpl *active_viewport; > @@ -427,7 +426,7 @@ struct IDirect3DLightImpl > /* Helper functions */ > void light_activate(IDirect3DLightImpl *light) DECLSPEC_HIDDEN; > void light_deactivate(IDirect3DLightImpl *light) DECLSPEC_HIDDEN; > -void d3d_light_init(IDirect3DLightImpl *light, IDirectDrawImpl *ddraw) DECLSPEC_HIDDEN; > +void d3d_light_init(IDirect3DLightImpl *light, struct ddraw *ddraw) DECLSPEC_HIDDEN; > IDirect3DLightImpl *unsafe_impl_from_IDirect3DLight(IDirect3DLight *iface) DECLSPEC_HIDDEN; > > /****************************************************************************** > @@ -441,7 +440,7 @@ struct IDirect3DMaterialImpl > LONG ref; > > /* IDirect3DMaterial2 fields */ > - IDirectDrawImpl *ddraw; > + struct ddraw *ddraw; > IDirect3DDeviceImpl *active_device; > > D3DMATERIAL mat; > @@ -450,7 +449,7 @@ struct IDirect3DMaterialImpl > > /* Helper functions */ > void material_activate(IDirect3DMaterialImpl* This) DECLSPEC_HIDDEN; > -IDirect3DMaterialImpl *d3d_material_create(IDirectDrawImpl *ddraw) DECLSPEC_HIDDEN; > +IDirect3DMaterialImpl *d3d_material_create(struct ddraw *ddraw) DECLSPEC_HIDDEN; > > /***************************************************************************** > * IDirect3DViewport - Wraps to D3D7 > @@ -461,7 +460,7 @@ struct IDirect3DViewportImpl > LONG ref; > > /* IDirect3DViewport fields */ > - IDirectDrawImpl *ddraw; > + struct ddraw *ddraw; > > /* If this viewport is active for one device, put the device here */ > IDirect3DDeviceImpl *active_device; > @@ -490,7 +489,7 @@ IDirect3DViewportImpl *unsafe_impl_from_IDirect3DViewport(IDirect3DViewport *ifa > > /* Helper functions */ > void viewport_activate(IDirect3DViewportImpl* This, BOOL ignore_lights) DECLSPEC_HIDDEN; > -void d3d_viewport_init(IDirect3DViewportImpl *viewport, IDirectDrawImpl *ddraw) DECLSPEC_HIDDEN; > +void d3d_viewport_init(IDirect3DViewportImpl *viewport, struct ddraw *ddraw) DECLSPEC_HIDDEN; > > /***************************************************************************** > * IDirect3DExecuteBuffer - Wraps to D3D7 > @@ -500,7 +499,7 @@ struct IDirect3DExecuteBufferImpl > IDirect3DExecuteBuffer IDirect3DExecuteBuffer_iface; > LONG ref; > /* IDirect3DExecuteBuffer fields */ > - IDirectDrawImpl *ddraw; > + struct ddraw *ddraw; > IDirect3DDeviceImpl *d3ddev; > > D3DEXECUTEBUFFERDESC desc; > @@ -537,14 +536,14 @@ struct IDirect3DVertexBufferImpl > /*** WineD3D and ddraw links ***/ > struct wined3d_buffer *wineD3DVertexBuffer; > struct wined3d_vertex_declaration *wineD3DVertexDeclaration; > - IDirectDrawImpl *ddraw; > + struct ddraw *ddraw; > > /*** Storage for D3D7 specific things ***/ > DWORD Caps; > DWORD fvf; > }; > > -HRESULT d3d_vertex_buffer_create(IDirect3DVertexBufferImpl **vertex_buf, IDirectDrawImpl *ddraw, > +HRESULT d3d_vertex_buffer_create(IDirect3DVertexBufferImpl **vertex_buf, struct ddraw *ddraw, > D3DVERTEXBUFFERDESC *desc) DECLSPEC_HIDDEN; > IDirect3DVertexBufferImpl *unsafe_impl_from_IDirect3DVertexBuffer(IDirect3DVertexBuffer *iface) DECLSPEC_HIDDEN; > IDirect3DVertexBufferImpl *unsafe_impl_from_IDirect3DVertexBuffer7(IDirect3DVertexBuffer7 *iface) DECLSPEC_HIDDEN; > diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c > index 72c3801e..c044d53 100644 > --- a/dlls/ddraw/device.c > +++ b/dlls/ddraw/device.c > @@ -7019,7 +7019,7 @@ enum wined3d_depth_buffer_type IDirect3DDeviceImpl_UpdateDepthStencil(IDirect3DD > return WINED3D_ZB_TRUE; > } > > -HRESULT d3d_device_init(IDirect3DDeviceImpl *device, IDirectDrawImpl *ddraw, IDirectDrawSurfaceImpl *target) > +HRESULT d3d_device_init(IDirect3DDeviceImpl *device, struct ddraw *ddraw, IDirectDrawSurfaceImpl *target) > { > static const D3DMATRIX ident = > { > diff --git a/dlls/ddraw/light.c b/dlls/ddraw/light.c > index 172ac23..4eeebd4 100644 > --- a/dlls/ddraw/light.c > +++ b/dlls/ddraw/light.c > @@ -276,7 +276,7 @@ static const struct IDirect3DLightVtbl d3d_light_vtbl = > IDirect3DLightImpl_GetLight > }; > > -void d3d_light_init(IDirect3DLightImpl *light, IDirectDrawImpl *ddraw) > +void d3d_light_init(IDirect3DLightImpl *light, struct ddraw *ddraw) > { > light->IDirect3DLight_iface.lpVtbl =&d3d_light_vtbl; > light->ref = 1; > diff --git a/dlls/ddraw/main.c b/dlls/ddraw/main.c > index b1456d8..3c8c555 100644 > --- a/dlls/ddraw/main.c > +++ b/dlls/ddraw/main.c > @@ -187,7 +187,7 @@ DDRAW_Create(const GUID *guid, > REFIID iid) > { > enum wined3d_device_type device_type; > - IDirectDrawImpl *This; > + struct ddraw *ddraw; > HRESULT hr; > > TRACE("driver_guid %s, ddraw %p, outer_unknown %p, interface_iid %s.\n", > @@ -220,25 +220,27 @@ DDRAW_Create(const GUID *guid, > return CLASS_E_NOAGGREGATION; > > /* DirectDraw creation comes here */ > - This = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectDrawImpl)); > - if(!This) > + ddraw = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*ddraw)); > + if (!ddraw) > { > ERR("Out of memory when creating DirectDraw\n"); > return E_OUTOFMEMORY; > } > > - hr = ddraw_init(This, device_type); > + hr = ddraw_init(ddraw, device_type); > if (FAILED(hr)) > { > WARN("Failed to initialize ddraw object, hr %#x.\n", hr); > - HeapFree(GetProcessHeap(), 0, This); > + HeapFree(GetProcessHeap(), 0, ddraw); > return hr; > } > > - hr = IDirectDraw7_QueryInterface(&This->IDirectDraw7_iface, iid, DD); > - IDirectDraw7_Release(&This->IDirectDraw7_iface); > - if (SUCCEEDED(hr)) list_add_head(&global_ddraw_list,&This->ddraw_list_entry); > - else WARN("Failed to query interface %s from ddraw object %p.\n", debugstr_guid(iid), This); > + hr = IDirectDraw7_QueryInterface(&ddraw->IDirectDraw7_iface, iid, DD); > + IDirectDraw7_Release(&ddraw->IDirectDraw7_iface); > + if (SUCCEEDED(hr)) > + list_add_head(&global_ddraw_list,&ddraw->ddraw_list_entry); > + else > + WARN("Failed to query interface %s from ddraw object %p.\n", debugstr_guid(iid), ddraw); > > return hr; > } > @@ -928,10 +930,10 @@ DllMain(HINSTANCE hInstDLL, > /* We remove elements from this loop */ > LIST_FOR_EACH_SAFE(entry, entry2,&global_ddraw_list) > { > + struct ddraw *ddraw = LIST_ENTRY(entry, struct ddraw, ddraw_list_entry); > HRESULT hr; > DDSURFACEDESC2 desc; > int i; > - IDirectDrawImpl *ddraw = LIST_ENTRY(entry, IDirectDrawImpl, ddraw_list_entry); > > WARN("DDraw %p has a refcount of %d\n", ddraw, ddraw->ref7 + ddraw->ref4 + ddraw->ref3 + ddraw->ref2 + ddraw->ref1); > > diff --git a/dlls/ddraw/material.c b/dlls/ddraw/material.c > index 7b3b702..24b932f 100644 > --- a/dlls/ddraw/material.c > +++ b/dlls/ddraw/material.c > @@ -506,7 +506,7 @@ static const struct IDirect3DMaterialVtbl d3d_material1_vtbl = > IDirect3DMaterialImpl_Unreserve > }; > > -IDirect3DMaterialImpl *d3d_material_create(IDirectDrawImpl *ddraw) > +IDirect3DMaterialImpl *d3d_material_create(struct ddraw *ddraw) > { > IDirect3DMaterialImpl *material; > > diff --git a/dlls/ddraw/palette.c b/dlls/ddraw/palette.c > index cff59a6..1d66db3 100644 > --- a/dlls/ddraw/palette.c > +++ b/dlls/ddraw/palette.c > @@ -269,7 +269,7 @@ IDirectDrawPaletteImpl *unsafe_impl_from_IDirectDrawPalette(IDirectDrawPalette * > } > > HRESULT ddraw_palette_init(IDirectDrawPaletteImpl *palette, > - IDirectDrawImpl *ddraw, DWORD flags, PALETTEENTRY *entries) > + struct ddraw *ddraw, DWORD flags, PALETTEENTRY *entries) > { > HRESULT hr; > > diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c > index 10643f5..0a7bf63 100644 > --- a/dlls/ddraw/surface.c > +++ b/dlls/ddraw/surface.c > @@ -5503,7 +5503,7 @@ HRESULT ddraw_surface_create_texture(IDirectDrawSurfaceImpl *surface) > levels, 0, format, pool, surface,&ddraw_texture_wined3d_parent_ops,&surface->wined3d_texture); > } > > -HRESULT ddraw_surface_init(IDirectDrawSurfaceImpl *surface, IDirectDrawImpl *ddraw, > +HRESULT ddraw_surface_init(IDirectDrawSurfaceImpl *surface, struct ddraw *ddraw, > DDSURFACEDESC2 *desc, UINT mip_level, UINT version) > { > enum wined3d_pool pool = WINED3D_POOL_DEFAULT; > diff --git a/dlls/ddraw/vertexbuffer.c b/dlls/ddraw/vertexbuffer.c > index fe39e01..d03d249 100644 > --- a/dlls/ddraw/vertexbuffer.c > +++ b/dlls/ddraw/vertexbuffer.c > @@ -539,7 +539,7 @@ static const struct IDirect3DVertexBufferVtbl d3d_vertex_buffer1_vtbl = > IDirect3DVertexBufferImpl_1_Optimize > }; > > -HRESULT d3d_vertex_buffer_create(IDirect3DVertexBufferImpl **vertex_buf, IDirectDrawImpl *ddraw, > +HRESULT d3d_vertex_buffer_create(IDirect3DVertexBufferImpl **vertex_buf, struct ddraw *ddraw, > D3DVERTEXBUFFERDESC *desc) > { > IDirect3DVertexBufferImpl *buffer; > diff --git a/dlls/ddraw/viewport.c b/dlls/ddraw/viewport.c > index 1523ac6..8980378 100644 > --- a/dlls/ddraw/viewport.c > +++ b/dlls/ddraw/viewport.c > @@ -1191,7 +1191,7 @@ IDirect3DViewportImpl *unsafe_impl_from_IDirect3DViewport(IDirect3DViewport *ifa > return CONTAINING_RECORD(iface, IDirect3DViewportImpl, IDirect3DViewport3_iface); > } > > -void d3d_viewport_init(IDirect3DViewportImpl *viewport, IDirectDrawImpl *ddraw) > +void d3d_viewport_init(IDirect3DViewportImpl *viewport, struct ddraw *ddraw) > { > viewport->IDirect3DViewport3_iface.lpVtbl =&d3d_viewport_vtbl; > viewport->ref = 1;

2 1

Wine Gecko 1.5-beta2
by Jacek Caban 09 Mar '12

09 Mar '12

Hi all, Since beta1 was done during code freeze, my sense is that it received less testing than usually (which is not bad, we had Wine 1.4 to ship!). However Wine Gecko 1.5 is going to be released fairly soon. It contains more changes than last few Wine Gecko updates, so this will be a more risky change. That's why I've decided to do another beta. beta2 contains fixes merged from Firefox beta repository and my builds use slightly updated compilation tool chain. You may find the build on SourceForge [1]. To use it, the attached patch is required. I'd appreciate any help with testing! Thanks, Jacek [1] http://sourceforge.net/projects/wine/files/Wine%20Gecko/1.5-beta2/

1 0

Re: [PATCH 2/5] msxml3/tests: Added XMLView QueryInterface tests
by Marvin 09 Mar '12

09 Mar '12

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=17248 Your paranoid android. === WNT4WSSP6 (32 bit xmlview) === xmlview.c:43: Test failed: CoCreateInstance returned 80040154, expected S_OK xmlview: unhandled exception c0000005 at 00454203

1 0

Re: [PATCH 8/9] d3drm: Add refcount info to AddRed and Release traces.
by Nikolay Sivov 09 Mar '12

09 Mar '12

On 3/9/2012 13:56, Christian Costa wrote: > > diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c > index 879d8b0..42d722c 100644 > --- a/dlls/d3drm/d3drm.c > +++ b/dlls/d3drm/d3drm.c > @@ -87,10 +87,11 @@ static HRESULT WINAPI IDirect3DRMImpl_QueryInterface(IDirect3DRM* iface, REFIID > static ULONG WINAPI IDirect3DRMImpl_AddRef(IDirect3DRM* iface) > { > IDirect3DRMImpl *This = impl_from_IDirect3DRM(iface); > + ULONG ref = InterlockedIncrement(&This->ref); > > - TRACE("(%p/%p)\n", iface, This); > + TRACE("(%p/%p): AddRef from %d\n", iface, This, ref - 1); > > - return InterlockedIncrement(&This->ref); > + return ref; > } > > static ULONG WINAPI IDirect3DRMImpl_Release(IDirect3DRM* iface) > @@ -98,7 +99,7 @@ static ULONG WINAPI IDirect3DRMImpl_Release(IDirect3DRM* iface) > IDirect3DRMImpl *This = impl_from_IDirect3DRM(iface); > ULONG ref = InterlockedDecrement(&This->ref); > > - TRACE("(%p/%p)\n", iface, This); > + TRACE("(%p/%p): ReleaseRef to %d\n", iface, This, ref); > > if (!ref) > HeapFree(GetProcessHeap(), 0, This); > diff --git a/dlls/d3drm/device.c b/dlls/d3drm/device.c > index 559128e..6f9802a 100644 > --- a/dlls/d3drm/device.c > +++ b/dlls/d3drm/device.c > @@ -93,10 +93,11 @@ static HRESULT WINAPI IDirect3DRMDevice2Impl_QueryInterface(IDirect3DRMDevice2* > static ULONG WINAPI IDirect3DRMDevice2Impl_AddRef(IDirect3DRMDevice2* iface) > { > IDirect3DRMDeviceImpl *This = impl_from_IDirect3DRMDevice2(iface); > + ULONG ref = InterlockedIncrement(&This->ref); > > - TRACE("(%p)\n", This); > + TRACE("(%p): AddRef from %d\n", This, ref - 1); > > - return InterlockedIncrement(&This->ref); > + return ref; > } > I personally don't see a reason to trace actual reference on release and previous one on AddRef. I usually trace new value in both calls so you don't need to keep in mind this +/- 1 offset when looking at logs. Also you don't need extra words in trace message cause function name is visible in traces already.

2 3

ntdll: Do not execute callbacks past DeleteTimer(INVALID_HANDLE_VALUE).
by Joerg-Cyril.Hoehle＠t-systems.com 09 Mar '12

09 Mar '12

Hi, >callbacks are running in Wine even after DeleteTimerQueue(INVALID_HANDLE_VALUE). I've attached to bug #30071 tests that show the bug and fail in unpatched Wine. Regards, Jörg Höhle

1 0

Re: advapi32: Assign a default value (clang)
by Hans Leidekker 09 Mar '12

09 Mar '12

On Fri, 2012-03-09 at 19:54 +1100, Alistair Leslie-Hughes wrote: > @@ -755,7 +755,7 @@ SC_HANDLE WINAPI OpenSCManagerA( LPCSTR lpMachineName, LPCSTR lpDatabaseName, > SC_HANDLE WINAPI OpenSCManagerW( LPCWSTR lpMachineName, LPCWSTR lpDatabaseName, > DWORD dwDesiredAccess ) > { > - SC_HANDLE handle; > + SC_HANDLE handle = INVALID_HANDLE_VALUE; These functions return NULL on failure.

1 0

My Idea for GSOC
by Daniel Oom 09 Mar '12

09 Mar '12

Hello, my name is Daniel Oom and I'm a computer science and engineering student at Chalmers in Gothenburg, Sweden. I'm in my second year and I would love to partake in GSOC. I know C, use Linux daily and don't like it when I have to reboot my computer to windows. I am very interested in game development and real time rendering, and have actually completed one simple game (written in Java/OpenGL). But I still have so much left to learn, and I believe I can learn a lot through working with wine in these areas. My idea, or rather how I would like to improve wine, is related to gaming. I've tried to run some games in wine and sometimes it works very well but more often than not there's bugs. The bad performance, misc bugs and general unresponsiveness of Steam is my greatest itch. Though as I'm not versed in wine's code base I don't know what would constitute as reasonable goals for GSOC. (I did do a bug report a long time ago, but back then I did not know a lot about programming). Would, for example: fix Steam's in-game overlay feature be a good goal? Some advice about where to take it from here would be greatly appreciated. // Daniel Oom

4 4

Re: [PATCH 1/5] wined3d: Clamp fog coordinate in the vertex shader.
by Stefan Dösinger 08 Mar '12

08 Mar '12

Am Donnerstag, 8. März 2012, 18:22:15 schrieb Matteo Bruni: > - shader_addline(buffer, "gl_FogFragCoord = OUT[%u].%c;\n", > i, reg_mask[1]); > + shader_addline(buffer, "gl_FogFragCoord = > clamp(OUT[%u].%c, 0.0, 1.0);\n", i, reg_mask[1]); Is it correct to clamp the fog coord in the vertex shader, or should this be done in the pixel shader? The tests do not answer this question because they write the same fog coordinate for each vertex. Imagine for example two lines. In each of those lines, one vertex has oFog = 0.0. The other vertex has oFog = 1.1 in one line, and oFog = 100 in the other. If the value is clamped per vertex, those lines will look the same. If it's clamped per pixel, the latter line will have much steeper gradient Also, what happens to shaders that do not write oFog, but use oPos.z, especially in the situations where the near and far clipping planes are disabled?

2 1

Re: [PATCH 4/5] wined3d: Remove a texture dimension check in state_alpha().
by Stefan Dösinger 08 Mar '12

08 Mar '12

Alexandre: The patch is OK, this mail is just some random note on why the code was there in the first place. Am Donnerstag, 8. März 2012, 20:27:15 schrieb Henri Verbeet: > I don't think there's any reason color-keying shouldn't work on e.g. cube > textures, although it probably isn't very common either. Fyi, I believe the original reason for this check was this line of code, removed by commit 70ed814b95f7719d52fa5b18a375d566a185a9ec. surf = (IWineD3DSurfaceImpl *) ((IWineD3DTextureImpl *)stateblock- >textures[0])->surfaces[0]; The implication for the current code is that there should be tests for color keying with mipmaps and cubemaps. Cubemaps are unlikely to be used with color keying as you say, and writing tests for mipmapping is on my todo list for proper color keying with the ffp replacement shader and blit shaders once I have time for this.

1 0

Re: gdiplus: Create GDI brush only when needed. Take 2. (Resend)
by Vincent Povirk 08 Mar '12

08 Mar '12

Looks good to me.

1 0

Re: ole32/tests: Load CoRegisterChannelHook dynamic
by Alexandre Julliard 08 Mar '12

08 Mar '12

André Hentschel <nerv(a)dawncrow.de> writes: > Seems Win8 (at least the costumer preview) doesn't export CoRegisterChannelHook in ole32 I don't think we should be adding test behaviors for previews. Wait until the final version is released. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH 3/3] urlmon: Use CopyBindInfo in InternetBindInfo_GetBindInfo
by Jacek Caban 08 Mar '12

08 Mar '12

Hi Piotr, On 03/08/12 13:00, Piotr Caban wrote: > - > - *pbindinfo = This->bindinfo; > - > - if(pbindinfo->szExtraInfo || pbindinfo->szCustomVerb) > - FIXME("copy strings\n"); > - > - if(pbindinfo->stgmedData.pUnkForRelease) > - IUnknown_AddRef(pbindinfo->stgmedData.pUnkForRelease); > - > - if(pbindinfo->pUnk) > - IUnknown_AddRef(pbindinfo->pUnk); > - > - return S_OK; > + pbindinfo->cbSize = sizeof(BINDINFO); Isn't caller responsible for setting this? > + return CopyBindInfo(&This->bindinfo, pbindinfo); Jacek

1 0

Building the 1.6 Release Notes as things are written.
by Scott Ritchie 08 Mar '12

08 Mar '12

So, congrats everyone, 1.4 is out and I'm very happy about it :) I wanted to thank Alexandre for his release announcement, it was very through and informative. It also looked like a lot of work. This made me wonder if we could instead build up the announcement gradually with some sort of process. For instance, if every significant feature added to a development release were put onto a wiki page, then at any point in time we could point someone there to answer a general "what does 1.5 have over 1.4?" question. Come 1.6 release time, we could just copy and edit the page as the official announcement. Thoughts? -Scott Ritchie

1 0

Re: [RESEND] [PATCH] winepulse: Add pulseaudio driver, v9
by Stefan Dösinger 08 Mar '12

08 Mar '12

Hi Maarten, >From a technical point of view, two things popped out: 1) configure is autogenerated by Alexandre, so you shouldn't include it in your patch. configure.ac is enough. 2) The patch doesn't apply with git-am. I don't know how much of an issue this is for AJ, but I prefer git-am over git-apply and manually committing I barely know too much about sound, so I'm leaving the rest of the tech stuff up to Joerg and Eikum. >From a user point of view, I have a previous version of that driver in my tree, and great hopes that it fixes some issues on my gaming setup that uses Pulseaudio(due to a multiseat configuration), e.g. bug 28856. The alsa route may eventually fix those bugs too, but I'm hoping for that since more than a year. So good luck with your Pulse driver, and thanks for working on this flamewar- infested stuff. Cheers, Stefan Am Donnerstag, 8. März 2012, 01:22:58 schrieb Maarten Lankhorst: > Signed-off-by: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> > --- > Resending now v1.4 is released for inclusion into 1.5, no changes from v9 > > V1: Original version > V2: > - Added basic session manager bullshit > - Fixed a bunch of test failures > - Add stubs for audio volumes, fixes to make capture work > V3: > - 20% cooler > - reworked clock handling to be much more accurate > - rewrite of all the interesting parts > - only tested rendering, capture untested > V4: > - Make mixer settings global to prevent > - Start of making capture working again > V5: > - Really break capture this time, TODO!! > - Fix most rendering tests except those related volume, rendering > should not only pass tests, but also be done in a correct way > - Cleaned up channel mapping > - Fix clock going 2x as fast > V6: > - Reliability fixes > - Align buffer size to a multiple of period size > - Remove session lock, I plan to use pulseaudio calls for volume, anyhow > V7: > - Implement shared mode capture correctly > - All non-IAudioStreamVolume related tests should pass for capture and > rendering > V8: > - Add DllMain to fix valgrind complaints > - Add real and fake volume control > - Passes all tests including the ones marked todo_wine > V9: > - Rework IAudioClient::Reset, flushing is only needed for render stream. > - Add stream validity checks to IAudioClock as well > - Fix copy pasted bug from winealsa in clone_format (As reported by > KittyCat) - Validate wBitsPerSample for float format (kcat) > - Make the pulse mapping const (kcat) > - Change mix format to float (kcat) > - Fix volume comments referring to alsa instead of Pulseaudio > - Split off pulseaudio spec to waveformat to a separate function > - Disabled audioclock interpolation for now, until I determine how to do it > properly. - Call SetEvent in render callback as last function, since it > gives up time slot (as reported by Joerg) - Reworked capture logic to > always capture, since that seems to be the case on windows, when stopped we > simply drop whole packets, but keep firing the event. - Rework the logic > behind GetMixFormat, and make capture and rendering formats and periods > separate again. This is needed for example if you have 5.1 playback 44100 > with 32kHz 2 channel capture (USB microphone). - Complete the > pa_channel_position -> dwChannelMask mapping > - Use MulDiv instead of pa_bytes_to_usec or pa_usec_to_bytes in a few > places. - Rendering buffers no longer have to be a multiple of period size. > > There are 2 places that still have those calls, but in worst case it will > make a 50 ns difference for the reported device periods, while the one in > AudioClock::GetPosition is disabled until it's determined how to handle > interpolation of IAudioClock::GetPosition, if that's still going to happen. > > I believe with this I addressed all issues and comments raised in V8, > and looking forward to any constructive feedback and test results of V9. > In particular, I'm interested in XAudio2 results with windows version > set to vista or higher, so that it uses mmdevapi directly > > winmm and dsound should be able to work unmodified, but you may want > to lower ds_snd_queue_max to 3 or 4 to decrease latency on dsound games. > It seems dsound doesn't respect mmdevapi in that regard or 2 periods > might have been possible. It would have been nice if it did. :(

1 0

Re: Wine release 1.4
by Jeremy White 07 Mar '12

07 Mar '12

On 3/7/12 10:21 AM, Alexandre Julliard wrote: > The Wine team is proud to announce that the stable release Wine 1.4 > is now available. > Let me be the first to say: Woohoo!!!! Cheers, Jeremy

2 1

Re: Wine release 1.4
by Christian Costa 07 Mar '12

07 Mar '12

Ooo. Thanks ! I didn't expect so much for my birthday ! :D What a pity for Greg. I only knew he retired from supporting the bot. :( Cheers Christian 2012/3/7 Alexandre Julliard <julliard(a)winehq.org> > The Wine team is proud to announce that the stable release Wine 1.4 > is now available. > > This release represents 20 months of development effort and over > 16,000 individual changes. The main highlights are the new DIB > graphics engine, a redesigned audio stack, and full support for > bidirectional text and character shaping. > > It also contains a lot of improvements across the board, as well as > support for many new applications, notably Microsoft Office 2010. See > the release notes below for a summary of the major changes. > > This release is dedicated to the memory of Gé (Greg) van Geldorp, who > passed away in May 2011. Greg single-handedly designed, built, and > maintained the Wine Testbot, which has become a cornerstone of our > development process. The high quality of this release owes a lot to > his work. He is greatly missed by us all. > > > The source is available from the following locations: > > http://ibiblio.org/pub/linux/system/emulators/wine/wine-1.4.tar.bz2 > http://prdownloads.sourceforge.net/wine/wine-1.4.tar.bz2 > > Binary packages for various distributions will be available from: > > http://www.winehq.org/download > > You will find documentation on http://www.winehq.org/documentation > > You can also get the current source directly from the git > repository. Check http://www.winehq.org/git for details. > > Wine is available thanks to the work of many people. See the file > AUTHORS in the distribution for the complete list. > > ---------------------------------------------------------------- > > What's new in Wine 1.4 > ====================== > > *** Graphics > > - There is a new graphics engine for rendering into Device Independent > Bitmaps (DIB). DIB rendering no longer requires access faults or > round-trips to the X server, which yields large performance gains in > DIB-intensive applications. > > - The DIB engine can also be used for fall-back implementations of > some graphics primitives, like alpha blending, when the display > driver doesn't support them directly. > > - All possible color formats are supported by the DIB engine, so DIB > operations are no longer limited by the color resolution of the > display. Rendering of the various palette formats is also improved. > > - Custom styles of dashed lines are supported. > > - Cosmetic pens using hashes or patterns are supported. > > - Gradients use dithering on low color resolution devices for a nicer > appearance. > > - The XRender extension is used for gradients when supported. > > - PostScript output quality is improved, particularly for bitmaps and > paths. > > - Rotated text works better for all output device types. > > - GdiPlus supports more image formats, including formats that are not > supported through GDI. > > - More image codecs are implemented, including support for TGA and CMYK > JPEG decoding, as well as BMP, TIFF, PNG, and ICNS encoding. > > > *** Audio > > - The audio stack is completely redesigned, based on the Vista > model. WinMM and DirectSound are implemented on top of the new > MMDevAPI library. > > - The Alsa, OSS, and CoreAudio drivers have been rewritten to use the > new model. They now serve as back-ends to the MMDevAPI dll, which no > longer needs to rely on the OpenAL library. > > - The Jack, NAS, AudioIO, and ESD audio subsystems are no longer > supported. Version 3 of the OSS subsystem is no longer supported > either, version 4 is required. > > - The Audio tab in the Wine Configuration tool has been redesigned for > the new audio subsystem. The appropriate driver is automatically > selected and no longer needs to be configured manually. > > > *** Input devices > > - The XInput 2 extension is used to provide better mouse control in > games and other full-screen applications. > > - The mouse is automatically clipped to prevent it from leaving a > full-screen window when running in desktop mode. Switching to a > different application with Alt-Tab releases the mouse. Clipping can > be disabled through the Wine Configuration tool. > > - Animated mouse cursors are fully supported. > > - Joystick action mapping is supported, including a configuration dialog. > > > *** Internationalization > > - Bidirectional text rendering is fully supported. > > - Font shaping and reordering is supported for all the scripts > specified in the Unicode standard. > > - Bidirectional text editing is supported in the standard edit > control. > > - Vertical fonts (e.g. for Japanese) are supported. > > - Mirroring of windows, menus, and window controls for right-to-left > languages is fully supported. > > - All resources (strings, menus, dialogs, accelerators) contained in > Wine can be translated through standard gettext-style po files. > > - The Unicode character data tables have been updated to version 6.0 > of the Unicode standard. > > - Wine is translated to French, German, Spanish, Italian, Dutch, > Swedish, Finnish, Portuguese, Catalan, Hungarian, Polish, Russian, > Slovenian, Lithuanian, Japanese, and Korean. It has partial > translations for another fifteen languages. > > > *** User interface > > - The new Vista style of file dialogs is supported. > > - Common controls are improved, particularly the calendar, tree view, > system link, and image list controls. > > - Parts of the Game Explorer API are implemented. > > - Wine can take advantage of the GStreamer framework for audio and > video playback. This makes it possible to support all formats that > have a GStreamer codec. On Mac OS X, the QuickTime framework is used > for the same purpose. > > > *** Desktop integration > > - System tray notification balloons are implemented. > > - The system tray is displayed as a task bar at the bottom of the > screen in desktop mode. > > - The system tray is automatically registered again when the Unix tray > manager is restarted. > > - The standard mouse cursors are remapped to the cursor theme of the > Unix desktop. > > - Drag & drop of OLE objects across applications is supported. > > - Icons for menu entries are exported in multiple sizes and in PNG > format. > > - Icons are displayed for the Unix desktop "Open with..." menu > entries. > > > *** Internet and networking > > - The built-in Internet Explorer has a user interface, including a > menu, an address bar, a tool bar, and configuration dialogs. > > - There is an "Internet Settings" control panel that allows > configuring various aspects of web browsing, as well as managing > security certificates. > > - The VBScript language is fully supported. > > - The built-in (Gecko-based) web browser engine supports ActiveX. > > - The Gecko engine has been updated to the version from Firefox 8. > > - The Gecko engine is packaged as an MSI file, and its installation > can be managed from the "Add/Remove Programs" control panel. > > - The Gecko engine is available on 64-bit. > > - Persistent HTTP connections are supported. > > - HTTP proxies are better supported, including PAC scripts. > > - Changing network passwords is supported. > > - The HTML Help support is improved, including a nicer user interface > and better navigation support. > > - Asynchronous I/O on network socket is improved, particularly > asynchronous accepts. This helps with various networked games. > > > *** Direct3D > > - Reloading sRGB textures uses either EXT_texture_sRGB_decode or FBO > blits when available. This is much faster. This affects Source > Engine games and Unreal Engine 3 games in particular. > > - WineD3D supports multisample anti-aliasing. > > - D3D8 and D3D9 properly support v-sync / swap intervals. > > - The WineD3D blitter code is improved both for correctness and > performance. > > - The WineD3D graphics card database has been updated to recognize new > graphics cards and Mesa drivers. > > - WineD3D no longer uses COM for its implementation. This makes it > much nicer to work with. > > - The context management code is improved. The window being destroyed > while the WineD3D device is still active in particular is handled > much better. > > - There have been some performance improvements related to WineD3D > state management and resource updates. > > - Focus and device window handling work better for D3D8 and D3D9. This > mostly affects things like changing graphics settings, switching > from full-screen to windowed and back, etc. > > - NVDB is supported on cards that support GL_EXT_depth_bounds_test. > > - The INTZ and NULL formats are supported. > > - Depth surface blits are implemented in WineD3D. > > - Depth bias handling is improved. This fixes flickering shadows and > decals in a couple of games, like Mass Effect 2 and Unreal > Tournament 2004. > > - GL_ARB_draw_elements_base_vertex is supported. This allows draws to > be more efficient in some cases. > > - GL_ARB_map_buffer_alignment is supported. This allows for more > efficient mapping of textures and buffers in some cases. > > - Handling projected textures works better in early shader model > versions. > > - Shaders are strictly checked against the hardware capabilities. This > means we won't try to create e.g. a shader model 3 shader on shader > model 2 hardware. > > - D3D9EX texture creation from system memory is supported. This > affects some Source Engine games like Team Fortress 2. > > - The D3DX9 shader assembler is mostly finished. It is now part of the > new d3dcompiler dll. > > - Various parts of D3DX9 are more complete, including: > - The surface / texture loading functions. > - The mesh creation and manipulation functions. > - The vertex declaration handling functions. > - The effects framework, binary effect parsing in particular. > > > *** DirectDraw > > - OpenGL is used by default for DirectDraw as well, just like D3D8 and > D3D9. For most applications this is an improvement, but nevertheless > the old GDI renderer may still work better for specific applications > or if the graphics driver's OpenGL implementation is inadequate. > > - Flips are properly supported. The back buffer now contains the front > buffer contents after a flip instead of being undefined. > > - Improved support for viewports in early versions of DirectDraw that > include an extra clipspace transformation. This affects the original > Half-Life. > > - Fixes for cooperative levels and associated window handling and mode > changes. > > - DirectDraw clippers are supported. > > > *** Kernel > > - DOSBox is used to run DOS applications on platforms that don't > support vm86 mode. > > - The Windows console is emulated as best as possible on Unix > terminals without requiring switching into curses mode. > > - Volume label and serial number can be retrieved from UDF filesystems > (used on DVDs). > > - Side-by-side manifests are installed for a number of built-in > libraries to make them more compatible with applications using > manifest resources. > > - The Wine preloader is also used on 64-bit for a more compatible > address space layout. > > > *** Installer support > > - Applying installer patches is supported. This is needed for various > Service Pack installers, particularly for the .NET ones. > > - Installing side-by-side assemblies is supported. > > - Rollbacks of failed installs is supported. > > - Installing services is better supported. > > - MSI installers can be created entirely under Wine, using the > 'cabarc' and 'winemsibuilder' tools. > > > *** Build environment > > - The IDL compiler (widl) can generate format strings for both > old-style and new-style COM interpreted stubs. > > - Registrations for dlls and typelibs are based on scripts generated > at compile time, for faster Wine prefix creation and updates. > > - The Resource Compiler (wrc) and Message Compiler (wmc) can generate > translated resources from po files, as well as create po files from > existing translated resources. > > - Fake PE dlls are generated and installed for all built-in dlls, > since many applications expect to find the PE dlls on disk. > > - The ARM platform is supported by the Wine tool chain. > > - The windows.h header can now be used in Wine code, the compile time > gains are no longer worth the header incompatibilities. > > - Some headers have been modified to make them easier to share with > the Mingw-w64 project. > > > *** Platform-specific changes > > - Wine compiles on ARM platforms. > > - On Mac OS X, the secure channel implementation uses the Security > framework instead of the GnuTLS library. > > - On Linux, dynamic device management can use the new UDisks service > in addition to HAL. > > - Stubless OLE proxies are supported also on 64-bit platforms. > > > *** Built-in applications > > - The new 'cabarc' program allows manipulation of cabinet files, > including creation of new cabinets. > > - The new 'wscript' program implements the Windows Script Host, to run > VBScript and JavaScript scripts. > > - The new 'taskkill' program allows killing Windows processes by name > or process id. > > - The new 'ipconfig' program displays the IP configuration seen by > Windows programs. > > - The new 'hostname' program displays the hostname seen by Windows > programs. > > - The 'explorer' program implements a shell namespace explorer instead > of launching the file manager. > > - The 'view' program can display enhanced metafiles. > > - The 'dxdiag' tool outputs real information about the system. > > - The new 'winemsibuilder' tool allows creating MSI installers; it is > used to build the Gecko add-on package. > > - Almost all built-in applications are fully Unicode. > > - All applications installed to /usr/bin have a manual page. > > > *** Quality assurance & debugging > > - The test suite no longer attempts to support Win9x platforms, this > was too much effort for little benefit. > > - The Wine debugger offers to save crash information to a file, to > make it easier to provide good information in bug reports. > > - Parsing of debugging information from various object file formats is > improved, which should yield better quality crash information, > particularly for 64-bit. > > > *** Miscellaneous > > - XML support is improved, including support for schemas, namespaces, > MSXML version 6, and an XML file writer. This is particularly useful > for the new Microsoft Office XML-based document formats. > > - The new "secure" versions of the C runtime functions are almost all > implemented. > > - There is an initial implementation of the Microsoft C++ standard > class libraries, including string, locale, and stream classes. > > - Creation of compressed cabinet files is supported. > > - There is an implementation of the OpenCL library, as a wrapper > around the equivalent Unix library. > > - Print jobs are submitted to CUPS directly instead of requiring the > 'lpr' command-line tool. > > - There is support for managing multiple .NET runtime versions and > their corresponding Mono versions. > > > *** New external dependencies > > - The XInput 2 library is used for mouse control in games. > > - The libopencl library is used by the OpenCL wrapper dll. > > - The libgettextpo library is optionally used at build time to update > po files from the rc sources. > > - The msgfmt tool (from the gettext library) is used at build time to > compile po files. > > - The zlib library is used to implement cabinet file compression. > > - The libfreetype library needs to be at least version 2.2, older > versions are no longer supported. > > - The libdbus library is used for the UDisks device support on Linux. > > - The smbpasswd tool (part of Samba) is used for changing network > passwords. > > - DOSBox is used to run DOS applications. It is recommended to use the > latest SVN version of DOSBox since it contains some Wine-specific > improvements. > > > *** Useful configuration options > > Note: More details abouts these and other configuration options can be > found at http://wiki.winehq.org/UsefulRegistryKeys > > - The correct audio driver is detected automatically, but can still be > overridden through the HKCU\Software\Wine\Drivers\Audio key like in > previous versions. It is recommended to delete this key entirely to > enable the auto-detection. > > - Multisample anti-aliasing can be disabled by setting "Multisampling" > to "disabled" under HKCU\Software\Wine\Direct3D. > > - Setting "AlwaysOffscreen" to "enabled" under > HKCU\Software\Wine\Direct3D simplifies sharing depth / stencil > surfaces between on-screen and off-screen render targets in > WineD3D. This will likely become the default for the next release. > > - The DirectDraw renderer can be switched back to the old GDI mode by > setting "DirectDrawRenderer" to "gdi" under HKCU\Software\Wine\Direct3D. > > > *** Known issues > > - Support for PulseAudio is improved, but very recent versions of > PulseAudio (>= 1.0) and alsa-plugins (>= 1.0.25) are required for > good results, since older versions contain various bugs. > See http://wiki.winehq.org/Sound for details. > > -- > Alexandre Julliard > julliard(a)winehq.org > >

1 0

Two questions on the Portuguese translation
by Francois Gouget 07 Mar '12

07 Mar '12

Hi, I noticed two Portuguese translations that look a bit strange to me: msgid "" "You don't have a drive C. This is not so great.\n" "\n" "Remember to click 'Add' in the Drives tab to create one!\n" msgstr "" "se não tem uma unidade C. Isto não é nada bom.\n" "\n" "Certifique-se que clica em ?Adicionar? no separador Unidades para criar " "uma!\n" Are the question marks around 'Adicionar' normal? I did not see this pattern elsewhere. msgid "&Search...\tCtrl+F" msgstr "&Localizar..." This translation is missing the keyboard shortcut. Is that intentional? -- Francois Gouget <fgouget(a)free.fr> http://fgouget.free.fr/ The nice thing about meditation is that it makes doing nothing quite respectable -- Paul Dean

3 2

Re: [PATCH] configure: Check if version of msgfmt (from gettext) is recent enough by checking features (try 2).
by Francois Gouget 07 Mar '12

07 Mar '12

On Mon, 5 Mar 2012, Christian Costa wrote: [...] > +dnl Check the msgfmt version > +if test "$MSGFMT" = "msgfmt" > +then > + AC_MSG_CHECKING([whether msgfmt (from gettext) is recent enough]) The comment and message should be more something like 'checking for msgfmt message context support'. > + cat >conftest.po <<EOF > +# comment > +msgctxt "ctxt" > +msgid "id" > +msgstr "str" > +EOF I believe you are 'leaking' the conftest.po file (unless the configure script automatically cleans up every file that starts with 'conftest'). -- Francois Gouget <fgouget(a)free.fr> http://fgouget.free.fr/ May your Tongue stick to the Roof of your Mouth with the Force of a Thousand Caramels.

1 0

Re: [docs] winedev: Update gcov section (try 2)
by Saulius Krasuckas 06 Mar '12

06 Mar '12

* On Mon, 5 Mar 2012, André Hentschel wrote: > > en/winedev-otherdebug.sgml | 170 ++++++++++++++++---------------------------- > 1 files changed, 62 insertions(+), 108 deletions(-) ... > <para> > For a further in depth description of gcov, the official gcc > compiler suite page for gcov is <ulink > - url="http://gcc.gnu.org/onlinedocs/gcc-3.2.3/gcc/Gcov.html"> > - http://gcc.gnu.org/onlinedocs/gcc-3.2.3/gcc/Gcov.html</ulink>. > - There is also an excellent article written by Steve Best for > - Linux Magazine which describes and illustrates this process > - very well at > - <ulink url="http://www.linux-mag.com/2003-07/compile_01.html"> > - http://www.linux-mag.com/2003-07/compile_01.html</ulink>. > + url="http://gcc.gnu.org/onlinedocs/gcc/Gcov.html"> > + http://gcc.gnu.org/onlinedocs/gcc/Gcov.html</ulink>. > </para> I am not sure whether it's OK to exclude link to the article on Linux Mag., which only has changed it's URL over time: http://www.linux-mag.com/id/1409/ S.

2 1

Users with native w2k/wxp/Vista/w7, please test (CreateTimerQueue)
by Joerg-Cyril.Hoehle＠t-systems.com 06 Mar '12

06 Mar '12

Hi, If you can run MS-Windows without virtual machine, please visit testbot https://testbot.winehq.org/JobDetails.pl?Key=17175 download the 32 or 64bit executable and execute it. I can't really trust vm machines for timing, but so far it appears that: - Vista/w2k8SE/w7 perform rate correction so as to maintain an average number of callbacks sync.c:583: TimerQueue period 10ms with 0 stress, flags 0 sync.c:558: thread 1340 hpctime 30 delta 15 sync.c:558: thread 1340 hpctime 46 delta 16 sync.c:558: thread 1340 hpctime 46 delta 0 sync.c:601: 80 callbacks within 796/800ms, avg 9.950/10 They'll refire with up to 0 wait upon noticing that it's very late! sync.c:583: TimerQueue period 10ms with 7 stress, flags 10 sync.c:558: thread 1340 hpctime 46 delta 15 sync.c:570: thread 1340 busy 7ms sync.c:558: thread 1340 hpctime 53 delta 7 sync.c:570: thread 1340 busy 7ms sync.c:558: thread 1340 hpctime 62 delta 9 sync.c:570: thread 1340 busy 7ms sync.c:558: thread 1340 hpctime 77 delta 15 sync.c:570: thread 1340 busy 7ms sync.c:558: thread 1340 hpctime 84 delta 7 sync.c:570: thread 1340 busy 7ms sync.c:601: 59 callbacks within 607/600ms, avg 10.288/10 It maintains its average even the callback is busy for 7ms within each 10ms interval. sync.c:583: TimerQueue period 10ms with 12 stress, flags 20 sync.c:558: thread 828 hpctime 31 delta 12 sync.c:570: thread 828 busy 12ms sync.c:558: thread 828 hpctime 43 delta 12 sync.c:570: thread 828 busy 12ms sync.c:601: 42 callbacks within 507/400ms, avg 12.071/10 This one surprises me. No multiple threads are used. Wine uses several threads here. When every callback is busy for 12ms, MS does not reach an average 10ms per invocation, whereas Wine does, thanks to several threads that execute the callbacks concurrently. I want to figure out why several threads were not used. sync.c:601: 40 callbacks within 4624/4680ms, avg 115.600/117 Ok. Note that the average is usually slightly lower than expected, simply because the first callback is asked to fire at time period/2. - w2k/xp do not maintain an average (at least on testbot) sync.c:583: TimerQueue period 10ms with 0 stress, flags 0 sync.c:558: thread 836 hpctime 30 delta 15 sync.c:558: thread 836 hpctime 46 delta 16 sync.c:601: 51 callbacks within 796/800ms, avg 15.608/10 So at least in testbot, the minimum rate is the well-known 15.625ms interval. Note that the 15.625ms is visible in the w7 testbot results too. sync.c:583: TimerQueue period 117ms with 0 stress, flags 20 sync.c:558: thread 840 hpctime 311 delta 125 sync.c:558: thread 840 hpctime 436 delta 125 sync.c:601: 37 callbacks within 4561/4680ms, avg 123.270/117 Unlike w7, it never corrects to a smaller interval like 109ms to reach the requested average of 117ms. This is good news for audio in Wine, because we can make CreateTimerQueue mimic Vista/w2k8/w7 behaviour to give us a stable rate (on average). The logs are quite long, you can send me them per e-mail. Thank you, Jörg Höhle

4 5

translation: meaning of 'magazine' in winerror string
by Fernando Martins 06 Mar '12

06 Mar '12

the po file contains #: winerror.mc:1541 msgid "The magazine is not present.\n" Originally I assumed "magazine" was meant as a sort of storage since the typical meaning of "periodical publication" would not seem to make much sense in the context of a wine error. However, other translations do indeed choose the concept of "periodical". Could I get an explanation of what is meant in the string? Also, this is not an isolated issue. It would be useful if screenshots of the original English dialog boxes, etc would be made available. Maybe a project for the Summer of Code? I mean, to setup an infrastructure to associate lines in po to available corresponding screenshots?

4 3

What to do about en.po?
by Lauri Kenttä 05 Mar '12

05 Mar '12

Hi, The neutral sublanguage of English (en.po) is missing a lot of texts. Is there really a need to "translate" everything to neutral English? I think it's a waste of time to maintain three sets of English texts (msgid, en.po, en_US.po). It would be more practical to have msgids automatically used as the neutral English texts. The current en.po causes undesired results with certain LC_* combinations: http://bugs.winehq.org/show_bug.cgi?id=29924 -- Lauri Kenttä

1 0

Re: [docs] winedev: Update gcov section
by Alexandre Julliard 05 Mar '12

05 Mar '12

André Hentschel <nerv(a)dawncrow.de> writes: > --- > en/winedev-otherdebug.sgml | 170 ++++++++++++++++---------------------------- > 1 files changed, 62 insertions(+), 108 deletions(-) It doesn't build: docbook2html -u winedev-guide.sgml Using catalogs: /etc/sgml/catalog Using stylesheet: /usr/share/docbook-utils/docbook-utils.dsl#html Working on: /home/julliard/wine/docs/en/winedev-guide.sgml openjade:/home/julliard/wine/docs/en/winedev-otherdebug.sgml:260:43:W: cannot generate system identifier for general entity "subkey" openjade:/home/julliard/wine/docs/en/winedev-otherdebug.sgml:260:43:E: general entity "subkey" not defined and no default entity openjade:/home/julliard/wine/docs/en/winedev-otherdebug.sgml:260:49:E: reference to entity "subkey" for which no system identifier could be generated openjade:/home/julliard/wine/docs/en/winedev-otherdebug.sgml:260:42: entity was defined here openjade:/home/julliard/wine/docs/en/winedev-otherdebug.sgml:282:69:E: reference to entity "subkey" for which no system identifier could be generated openjade:/home/julliard/wine/docs/en/winedev-otherdebug.sgml:260:42: entity was defined here openjade:/home/julliard/wine/docs/en/winedev-otherdebug.sgml:326:69:E: reference to entity "subkey" for which no system identifier could be generated openjade:/home/julliard/wine/docs/en/winedev-otherdebug.sgml:260:42: entity was defined here make[1]: *** [winedev-guide.html] Error 8 -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: po: Update Korean translation
by Francois Gouget 05 Mar '12

05 Mar '12

On Wed, 29 Feb 2012, Hwang YunSong(황윤성) wrote: > #: winefile.rc:56 > -#, fuzzy > msgid "Filter by&..." > msgstr "...(&.)로 걸려내기" The trailing ellipses have a very specific meaning and I don't think it makes sense to put them at the start of the translation, especially since none of the other translations do so. So this should probably rather be something like: msgstr "로 걸려내기&..." -- Francois Gouget <fgouget(a)free.fr> http://fgouget.free.fr/ "Only wimps use tape backup: _real_ men just upload their important stuff on ftp, and let the rest of the world mirror it ;)" -- Linus Torvalds

1 0

Re: winemenubuilder: Nothing useful is done on Mac OS X so just exit.
by Joerg-Cyril.Hoehle＠t-systems.com 05 Mar '12

05 Mar '12

François Gouget wrote: > A real Mac OS X implementation would be nice but barring that it seems > better to do nothing than to create .desktop files and directories that > make no sense on Mac OS X. Perhaps it's better to produce something than produce nothing. Since I first used Wine, perhaps half a decade ago, I've always been looking at the .desktop files to see what the installers declared as - command line arguments and - initial directory. Simply starting an .exe in the file manager is not always enough. That info is also available by tracing a particular channel, however the .desktop is persistent, while I may have forgot to trace that verbose WINEDEBUG channel during installation. With that information, I created my own .desktop files on Linux and .command files on MacOS. I was also more pleased back when Wine wrote human readable .desktop files into the various profile/ subdirectories instead of the current .lnk binary files. What tool can read those pesky .lnk files? Since then I've been annoyed by Wine on Linux repeatedly rebuilding Gnome menus, spitting errors about Wireshark that's not even a Wine app, as well as Wine on MacOS flooding /tmp with .icons files as mentioned in http://www.winehq.org/pipermail/wine-devel/2011-December/093570.html $HOME/.local/share/icons/ never contained a flood of icons, just one per installed app and readme. On both systems, I've repeatedly removed winemenubuilder from the registry, only to find Wine's next update put it back. Whatever you do, please make sure that users can obtain an installed app's command line arguments and launch directory in a simple way. While improving the Mac user experience, what about enhancement request 19028? Thank you, Jörg Höhle

3 2

Re: uxtheme: cause themed buttons to render correctly when pressed and released
by Dmitry Timoshkov 04 Mar '12

04 Mar '12

Robert Grocott <rgrocottbugzilla(a)gmail.com> wrote: > --- a/dlls/user32/button.c > +++ b/dlls/user32/button.c > @@ -190,12 +190,7 @@ static inline UINT get_button_type( LONG window_style ) > /* paint a button of any type */ > static inline void paint_button( HWND hwnd, LONG style, UINT action ) > { > - if (btnPaintFunc[style] && IsWindowVisible(hwnd)) > - { > - HDC hdc = GetDC( hwnd ); > - btnPaintFunc[style]( hwnd, hdc, action ); > - ReleaseDC( hwnd, hdc ); > - } > + InvalidateRect( hwnd, NULL, FALSE); > } This is wrong, you will discover that after running 'make test'. -- Dmitry.

1 0

Re: uxtheme: cause themed buttons to render correctly when pressed and released
by Nikolay Sivov 04 Mar '12

04 Mar '12

On 3/4/2012 16:04, Robert Grocott wrote: > (Tried sending this a couple of times previously, but apparently > emails are silently ignored if you're not subscribed to the mailing > list? If this ends up being a duplicate message, sorry about that.) > > The attached patch fixes an unreported bug: themed button controls > will redraw themselves in the unthemed style on mousedown and mouseup > (as well as a few other, rarer events). This was due to various button > message handlers invoking the unthemed renderer directly, rather than > deferring to WM_PAINT. > > Robert Grocott The problem here is that you probably can't fix user32 implementation to make themed controls work better, user32 controls are supposed to be on their own and covered but own tests. Themes controls should be implemented separately.

1 0

Google Summer of code 2012
by Bhuvnesh Joshi 04 Mar '12

04 Mar '12

Hello All, I am a student of computer science and I am very much interested in participating in GSOC 2012 through this organisation.I am interested in porting applications to wine.I have good knowledge of c/c++ but I have never such kind of porting/open souce project in past.So please guide me how to proceed further with my project with wine. Regards Bhuvnesh Joshi

2 1

introduction
by tarun bansal 04 Mar '12

04 Mar '12

Hello everyone!! I am a newbie in the world of open source development. But i am very eager to participate in the GSOC2012. I have a good command over c,c++. Can someone guide me on how to proceed further and start fixing the bugs... -- Tarun Bansal Computer Science and Engineering Vellore Institute of Technology,Vellore

2 1

FYI: Article about Microscopy and Wine
by André Hentschel 03 Mar '12

03 Mar '12

Hi, Robert Hovden mailed me some time ago about the authors of the wiki pages and i explained him how that works. He wanted to write an Article and now here it is: You can read it here: http://onlinedigeditions.com/publication/?i=100670 The magazines web address is, http://www.microscopy-today.com/ I should tell you all he has been grateful for the Wine project for many years. -- Best Regards, André Hentschel

1 0

Windows 8 anyone?
by Aric Stewart 03 Mar '12

03 Mar '12

So for some conversation that is not release related... Anyone installed the windows 8 consumer preview yet? It refuses to install in my virtual box or (old) vmware fusion machines. I think it really wants real hardware. If someone does has a copy running, maybe i can send a uniscribe script enumerator that you would run and send me the result? I would be curious what new languages Microsoft has added. I tried in the developer preview from a few months ago and nothing had really been updated there. -aric

3 3

GSOC 2012
by Yogesh Agrawal 02 Mar '12

02 Mar '12

Respected Sir, I am very much interested in doing project in this organisation. I am interested in doing project which involves 3D Game development, Graphics rendering. I developed one 3D game using Microsoft Windows XNA and Visual Studio framework. I have also done course in Computer Graphics. Please provide me with the details, how i should proceed further to be able to get a project in this organisation. Regards, Yogesh Agrawal International Institute Of Information Technology - Hyderabad INDIA

2 1

Re: [PATCH] configure: Check if version of msgfmt/gettext is recent enough (at least 0.15).
by Alexandre Julliard 02 Mar '12

02 Mar '12

Christian Costa <titan.costa(a)gmail.com> writes: > @@ -284,6 +284,25 @@ AC_CHECK_PROGS(CONVERT, convert, false) > AC_CHECK_PROGS(ICOTOOL, icotool, false) > AC_CHECK_PROGS(MSGFMT, msgfmt, false) > > +dnl Check the msgfmt version > +if test "$MSGFMT" = "msgfmt" > +then > + AC_MSG_CHECKING([for recent enough msgfmt/gettext (at least 0.15)]) > + msgfmt_version=`msgfmt --version | head -n1` > + if test "x$msgfmt_version" != "x" > + then > + msgfmt_version_major=`expr "$msgfmt_version" : '.* $[[0-9]]*$\.[[0-9]]*'` > + msgfmt_version_minor=`expr "$msgfmt_version" : '.* [[0-9]]*\.$[[0-9]]*$'` > + if test "$msgfmt_version_major" -eq 0 -a "$msgfmt_version_minor" -lt 15 > + then > + MSGFMT=false > + AC_MSG_RESULT([no ($msgfmt_version_major.$msgfmt_version_minor)]) > + else > + AC_MSG_RESULT([yes ($msgfmt_version_major.$msgfmt_version_minor)]) > + fi > + fi > +fi It would be better to test that the features that we need work. -- Alexandre Julliard julliard(a)winehq.org

2 1

Re: po/pt_PT.po: several translations
by Ricardo Filipe 02 Mar '12

02 Mar '12

thank you for taking on this task! i have not had the time to look at this for 1.4. some remarks: #: gdi32.rc:25 msgid "Western" -msgstr "" +msgstr "Oriental" Ocidental? #: ieframe.rc:46 -#, fuzzy msgid "&Standard bar" -msgstr "Barra de &Estado" +msgstr "&Barra padrão" i think "Barra de Estado" is correct... #: inetcpl.rc:56 msgid "Delete &files..." -msgstr "" +msgstr "Apager &ficheiros..." typo. Apagar #: inetcpl.rc:65 msgid "Delete browsing history" -msgstr "" +msgstr "Apagar história de navegação" histórico? +"Cópias de paginas de Internet em cache, images e certificados" typo. imagens +"como preferências de utilisador e dados de login." typo. utilizador thank you for your help! ricardo

1 0

Re: Hungarian translation patch 2
by Francois Gouget 01 Mar '12

01 Mar '12

Thanks. That first patch made quite a big difference already. Hungarian is now in the 90% range :-) I noticed some issues though: -#, fuzzy msgid "&Modify/Remove" msgstr "&Módosítás/Eltávolítás..." You should remove the ellipsis here. msgctxt "Saturation" msgid "&Sat:" -msgstr "" +msgstr "&Telítettség:" msgctxt "Luminance" msgid "&Lum:" -msgstr "" +msgstr "&Fényerő" These two may be too long, hence why they are truncated in English. You can check in winecfg. Go to Desktop Integration, pick an Item, click on Color and click on Define Custom Colors. They should also have a trailing colon. msgctxt "All key" msgid "A" -msgstr "" +msgstr "A" Given that 'All' is translated into 'Mind', this should most likely be an 'M'. -#, fuzzy msgid "Certificate &status:" -msgstr "Tanusítvány beszerzés" +msgstr "Tanusítvány &állapot" -#, fuzzy msgid "&Friendly name:" msgstr "Keresztnév" More missing colons... Also the second one looks like it's supposed to have a keyboard shortcut. msgid "Connection is active.\n" -msgstr "Kapcsolat aktív" +msgstr "Kapcsolat aktív\n" This one should probably have a trailing full stop. You'll find more issues like this on the Wine PO site. http://fgouget.free.fr/wine-po/ Specifically: http://fgouget.free.fr/wine-po/hu-errors.html -- Francois Gouget <fgouget(a)free.fr> http://fgouget.free.fr/ La terre est une bêta...

2 4

Re: [PATCH] winepulse: Add pulse driver, v8
by Joerg-Cyril.Hoehle＠t-systems.com 01 Mar '12

01 Mar '12

Hi, Chris is right about the format. The shared mode mixer ought to return FLOAT(32), and it always appears to return the extensible format as a consequence. For weird reasons, wineoss may return integer formats, but that's certainly going to cause some unexpecting app to crash. >+ assert(oldpad >= This->pad); Wasn't there a discussion some time ago that asserts are bad? Better back out, return INVALIDATED or some such, but don't crash the app just because there's a problem with sound. (I agree that winmm&mmdevapi ought to contain self/consistency tests). It would be nice if you could attach some WINETEST_DEBUG=2 render.log 2>&1 to bugzilla somewhere. There is stuff that do not cause a failure yet diverges from native. +static void pulse_wr_callback(pa_stream *s, size_t bytes, void *userdata) + if (This->event) + SetEvent(This->event); This should be the last thing in the callback. It may well cause your thread to be kicked out by the scheduler. + if (filled_one && This->event) + SetEvent(This->event); Don't the capture tests prove that events get in even when the buffer is full? (please cross-check) >- Align buffer size to a multiple of period size How can you pass the tests with that? It's wrong with both capture (annoyingly IMHO) and playback. I don't have more time now (and know nothing about the pa_* API). Is pa_mainloop_run the thread that dispatches the pulse_xyz_callbacks? I wouldn't mind a winepulse driver in 1.4.0 Regards, Jörg

2 3

Error with msgfmt
by Christian Costa 01 Mar '12

01 Mar '12

Hi, When compiling wine on another machine I got this error : po/ar.po:359: keyword "msgctxt" unknown po/ar.po:359:8: parse error po/ar.po:591: keyword "msgctxt" unknown po/ar.po:591:8: parse error Is po files generation supposed to be done only in maintener mode ? In any case gettext version check should be added in configure.ac. Which first version supports msgctxt ? Thanks in advance Bye Christian

1 1

Re: winemenubuilder: Nothing useful is done on Mac OS X so just exit.
by Michael Stefaniuc 01 Mar '12

01 Mar '12

Hello Francois, On 03/01/2012 03:07 AM, Francois Gouget wrote: > --- > > A real Mac OS X implementation would be nice but barring that it seems > better to do nothing than to create .desktop files and directories that > make no sense on Mac OS X. > > programs/winemenubuilder/winemenubuilder.c | 4 ++++ > 1 files changed, 4 insertions(+), 0 deletions(-) > > diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c > index 1588e50..458e207 100644 > --- a/programs/winemenubuilder/winemenubuilder.c > +++ b/programs/winemenubuilder/winemenubuilder.c > @@ -3619,6 +3619,10 @@ int PASCAL wWinMain (HINSTANCE hInstance, HINSTANCE prev, LPWSTR cmdline, int sh > HRESULT hr; > int ret = 0; > > +#ifdef __APPLE__ > + WINE_FIXME("creating menus is not supported on Mac OS X\n"); > + return 0; > +#endif > if (!init_xdg()) > return 1; > no clue if the compiler there complains but you are producing unreachable code in the #ifdef __APPLE__ case. bye michael

1 0

Re: start: Remove the license and the /L option.
by Lauri Kenttä 01 Mar '12

01 Mar '12

Your patch only changes the cmd.rc strings in the po files. You should probably fix the start.rc strings as well. -- Lauri Kenttä

1 1

Re: Major mmdevapi and winmm audio bugs
by Joerg-Cyril.Hoehle＠t-systems.com 01 Mar '12

01 Mar '12

Maarten Lankhorst wrote: >I think the key is to use accurate periods and report GetStreamLatency correctly. You mentioned GSL in the past already, and I think it makes sense to return real values instead of native's 10.6667 that I don't trust, however I expect nothing from setting it: http://bugs.winehq.org/show_bug.cgi?id=28723#c23 "It looks like XA2 doesn't calls it at all." >Or never use anything but dmix/real hardware with winealsa Well, there's bug #28781 and #29294 from the Jack users :-) I've ran some numeric simulations tonight and am beginning to see some light with an ALSA design that meets all my design goals but one: + arbitrarily large ALSA buffer that would avoid underruns if Linux has other stuff to do for 100ms if the feeder supplies enough data (e.g. winmm would typically be safe, XAudio2 will lose out). + variable latency (conceivably user settable via registry) aka. "hidden frames" + accommodates crazy irregular wake-ups + exhibits very regular period-size decrease of padding + self-correcting timer and adaption to clock skew - alas, needs a wake-up even without EVENTCALLBACK Regards, Jörg

1 0

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