March 2012 - wine-devel

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

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 March 2012