February 2007 - Wine-devel - list.winehq.org

avifil32: sign-compare fixes
by Joris Huizer 15 Feb '07

15 Feb '07

Hello As the previous time I was inserting too many casts, I want to ask whether this approach is better (introducing an ULONG version if it fixes compare warnings, and casting away remaining problems) If this is not alright, could you tell what's the best way to fix? regards, Joris ____________________________________________________________________________________ Never miss an email again! Yahoo! Toolbar alerts you the instant new Mail arrives. http://tools.search.yahoo.com/toolbar/features/mail/

1 0

Re: [05/10] wined3d: Add WINED3DTEXOPCAPS flags and use them
by Alexandre Julliard 15 Feb '07

15 Feb '07

"H. Verbeet" <hverbeet(a)gmail.com> writes: > diff --git a/include/wine/wined3d_caps.h b/include/wine/wined3d_caps.h > new file mode 100644 > index 0000000..4bf474b > --- /dev/null > +++ b/include/wine/wined3d_caps.h > @@ -0,0 +1,49 @@ > +/* > + * Copyright 2007 Henri Verbeet > + * > + * This library is free software; you can redistribute it and/or > + * modify it under the terms of the GNU Lesser General Public > + * License as published by the Free Software Foundation; either > + * version 2.1 of the License, or (at your option) any later version. > + * > + * This library is distributed in the hope that it will be useful, > + * but WITHOUT ANY WARRANTY; without even the implied warranty of > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > + * Lesser General Public License for more details. > + * > + * You should have received a copy of the GNU Lesser General Public > + * License along with this library; if not, write to the Free Software > + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA > + */ > + > +#ifndef __WINE_WINED3D_CAPS_H > +#define __WINE_WINED3D_CAPS_H > + > +#define WINED3DTEXOPCAPS_DISABLE 0x00000001 > +#define WINED3DTEXOPCAPS_SELECTARG1 0x00000002 > +#define WINED3DTEXOPCAPS_SELECTARG2 0x00000004 > +#define WINED3DTEXOPCAPS_MODULATE 0x00000008 > +#define WINED3DTEXOPCAPS_MODULATE2X 0x00000010 > +#define WINED3DTEXOPCAPS_MODULATE4X 0x00000020 > +#define WINED3DTEXOPCAPS_ADD 0x00000040 > +#define WINED3DTEXOPCAPS_ADDSIGNED 0x00000080 > +#define WINED3DTEXOPCAPS_ADDSIGNED2X 0x00000100 > +#define WINED3DTEXOPCAPS_SUBTRACT 0x00000200 > +#define WINED3DTEXOPCAPS_ADDSMOOTH 0x00000400 > +#define WINED3DTEXOPCAPS_BLENDDIFFUSEALPHA 0x00000800 > +#define WINED3DTEXOPCAPS_BLENDTEXTUREALPHA 0x00001000 > +#define WINED3DTEXOPCAPS_BLENDFACTORALPHA 0x00002000 > +#define WINED3DTEXOPCAPS_BLENDTEXTUREALPHAPM 0x00004000 > +#define WINED3DTEXOPCAPS_BLENDCURRENTALPHA 0x00008000 > +#define WINED3DTEXOPCAPS_PREMODULATE 0x00010000 > +#define WINED3DTEXOPCAPS_MODULATEALPHA_ADDCOLOR 0x00020000 > +#define WINED3DTEXOPCAPS_MODULATECOLOR_ADDALPHA 0x00040000 > +#define WINED3DTEXOPCAPS_MODULATEINVALPHA_ADDCOLOR 0x00080000 > +#define WINED3DTEXOPCAPS_MODULATEINVCOLOR_ADDALPHA 0x00100000 > +#define WINED3DTEXOPCAPS_BUMPENVMAP 0x00200000 > +#define WINED3DTEXOPCAPS_BUMPENVMAPLUMINANCE 0x00400000 > +#define WINED3DTEXOPCAPS_DOTPRODUCT3 0x00800000 > +#define WINED3DTEXOPCAPS_MULTIPLYADD 0x01000000 > +#define WINED3DTEXOPCAPS_LERP 0x02000000 > + > +#endif /* __WINE_WINED3D_CAPS_H */ I think this could just as well go into an existing file like wined3d_types.h. We should try to keep the number of Wine-specific global includes to a minimum. -- Alexandre Julliard julliard(a)winehq.org

2 2

Re: [4/10] WineD3D: Convert and load U8V8 surfaces as rgb
by Stefan Dösinger 15 Feb '07

15 Feb '07

Am Donnerstag 15 Februar 2007 09:50 schrieb H. Verbeet: > On 15/02/07, Stefan Dösinger <stefan(a)codeweavers.com> wrote: > > GL_INDEX is definitly not the way to load U8V8 surfaces > > I think you should be using something like GL_DU8DV8_ATI or GL_DSDT_NV > instead. Thats my plan, but I think we should handle it in some way if none of the extensions is available. We can later use the extension-specific formats if they are available.

1 0

Re: [10/10] DDraw: Forward D3DRS_TEXTUREADDRESS* and D3DTSS_ADDRESS* to sampler states
by Stefan Dösinger 15 Feb '07

15 Feb '07

Am Donnerstag 15 Februar 2007 09:51 schrieb H. Verbeet: > On 15/02/07, Stefan Dösinger <stefan(a)codeweavers.com> wrote: > >+ case D3DTSS_ADDRESS: > >+ return IWineD3DDevice_GetSamplerState(This->wineD3DDevice, > >+ Stage, > >+ WINED3DSAMP_ADDRESSW, > >+ State); > > Is that correct? Hm. No, it isn't. I thought I fixed that sort of things. Maybe an old version of the patch got sent NULL

1 0

Regression in comctl32
by Pavel Troller 15 Feb '07

15 Feb '07

Hi! I just found a regression in comctl32 and bisected it successfully. The following commit 369749dcb2ba12ce8481503543afd18ad99805d1 is first bad commit commit 369749dcb2ba12ce8481503543afd18ad99805d1 Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Mon Feb 12 16:47:56 2007 +0800 comctl32: Make ImageList_Read and ImageList_Write compatible with each other, simplify the code. :040000 040000 7a8b282d58c6a6111ad0995eb8d47cbfbc8cadb0 afca21972669e3d013eef8de59556675a0bc798b M dlls causes that IDA Pro shows black squares instead of its toolbar icons. With regards, Pavel Troller

3 2

Re: [07/10] wined3d: Add WINED3DPBLENDCAPS flags and use them
by Mirek 15 Feb '07

15 Feb '07

Hi, this patch has bad attachment, it has same attachment as "[08/10] wined3d: Add WINED3DPMISCCAPS flags and use them". Mirek Slugen H. Verbeet napsal(a): > Changelog: > - Add WINED3DPBLENDCAPS flags and use them > > > ------------------------------------------------------------------------ > > --- > > dlls/wined3d/directx.c | 34 +++++++++++++++++----------------- > include/wine/wined3d_caps.h | 19 +++++++++++++++++++ > 2 files changed, 36 insertions(+), 17 deletions(-) > > diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c > index 1753ef9..cc1e0f6 100644 > --- a/dlls/wined3d/directx.c > +++ b/dlls/wined3d/directx.c > @@ -1872,29 +1872,29 @@ static HRESULT WINAPI IWineD3DImpl_GetDeviceCaps(IWineD3D *iface, UINT Adapter, > WINED3DDEVCAPS_DRAWPRIMITIVES2 | > WINED3DDEVCAPS_DRAWPRIMITIVES2EX; > > - *pCaps->PrimitiveMiscCaps = D3DPMISCCAPS_CULLNONE | > - D3DPMISCCAPS_CULLCCW | > - D3DPMISCCAPS_CULLCW | > - D3DPMISCCAPS_COLORWRITEENABLE | > - D3DPMISCCAPS_CLIPTLVERTS | > - D3DPMISCCAPS_CLIPPLANESCALEDPOINTS | > - D3DPMISCCAPS_MASKZ | > - D3DPMISCCAPS_BLENDOP; > + *pCaps->PrimitiveMiscCaps = WINED3DPMISCCAPS_CULLNONE | > + WINED3DPMISCCAPS_CULLCCW | > + WINED3DPMISCCAPS_CULLCW | > + WINED3DPMISCCAPS_COLORWRITEENABLE | > + WINED3DPMISCCAPS_CLIPTLVERTS | > + WINED3DPMISCCAPS_CLIPPLANESCALEDPOINTS | > + WINED3DPMISCCAPS_MASKZ | > + WINED3DPMISCCAPS_BLENDOP; > /* TODO: > - D3DPMISCCAPS_NULLREFERENCE > - D3DPMISCCAPS_INDEPENDENTWRITEMASKS > - D3DPMISCCAPS_FOGANDSPECULARALPHA > - D3DPMISCCAPS_SEPARATEALPHABLEND > - D3DPMISCCAPS_MRTINDEPENDENTBITDEPTHS > - D3DPMISCCAPS_MRTPOSTPIXELSHADERBLENDING > - D3DPMISCCAPS_FOGVERTEXCLAMPED */ > + WINED3DPMISCCAPS_NULLREFERENCE > + WINED3DPMISCCAPS_INDEPENDENTWRITEMASKS > + WINED3DPMISCCAPS_FOGANDSPECULARALPHA > + WINED3DPMISCCAPS_SEPARATEALPHABLEND > + WINED3DPMISCCAPS_MRTINDEPENDENTBITDEPTHS > + WINED3DPMISCCAPS_MRTPOSTPIXELSHADERBLENDING > + WINED3DPMISCCAPS_FOGVERTEXCLAMPED */ > > /* The caps below can be supported but aren't handled yet in utils.c 'd3dta_to_combiner_input', disable them until support is fixed */ > #if 0 > if (GL_SUPPORT(NV_REGISTER_COMBINERS)) > - *pCaps->PrimitiveMiscCaps |= D3DPMISCCAPS_TSSARGTEMP; > + *pCaps->PrimitiveMiscCaps |= WINED3DPMISCCAPS_TSSARGTEMP; > if (GL_SUPPORT(NV_REGISTER_COMBINERS2)) > - *pCaps->PrimitiveMiscCaps |= D3DPMISCCAPS_PERSTAGECONSTANT; > + *pCaps->PrimitiveMiscCaps |= WINED3DPMISCCAPS_PERSTAGECONSTANT; > #endif > > *pCaps->RasterCaps = WINED3DPRASTERCAPS_DITHER | > diff --git a/include/wine/wined3d_caps.h b/include/wine/wined3d_caps.h > index 1cedae7..98a655d 100644 > --- a/include/wine/wined3d_caps.h > +++ b/include/wine/wined3d_caps.h > @@ -34,6 +34,25 @@ > #define WINED3DPBLENDCAPS_BOTHINVSRCALPHA 0x00001000 > #define WINED3DPBLENDCAPS_BLENDFACTOR 0x00002000 > > +#define WINED3DPMISCCAPS_MASKZ 0x00000002 > +#define WINED3DPMISCCAPS_LINEPATTERNREP 0x00000004 > +#define WINED3DPMISCCAPS_CULLNONE 0x00000010 > +#define WINED3DPMISCCAPS_CULLCW 0x00000020 > +#define WINED3DPMISCCAPS_CULLCCW 0x00000040 > +#define WINED3DPMISCCAPS_COLORWRITEENABLE 0x00000080 > +#define WINED3DPMISCCAPS_CLIPPLANESCALEDPOINTS 0x00000100 > +#define WINED3DPMISCCAPS_CLIPTLVERTS 0x00000200 > +#define WINED3DPMISCCAPS_TSSARGTEMP 0x00000400 > +#define WINED3DPMISCCAPS_BLENDOP 0x00000800 > +#define WINED3DPMISCCAPS_NULLREFERENCE 0x00001000 > +#define WINED3DPMISCCAPS_INDEPENDENTWRITEMASKS 0x00004000 > +#define WINED3DPMISCCAPS_PERSTAGECONSTANT 0x00008000 > +#define WINED3DPMISCCAPS_FOGANDSPECULARALPHA 0x00010000 > +#define WINED3DPMISCCAPS_SEPARATEALPHABLEND 0x00020000 > +#define WINED3DPMISCCAPS_MRTINDEPENDENTBITDEPTHS 0x00040000 > +#define WINED3DPMISCCAPS_MRTPOSTPIXELSHADERBLENDING 0x00080000 > +#define WINED3DPMISCCAPS_FOGVERTEXCLAMPED 0x00100000 > + > #define WINED3DSTENCILCAPS_KEEP 0x00000001 > #define WINED3DSTENCILCAPS_ZERO 0x00000002 > #define WINED3DSTENCILCAPS_REPLACE 0x00000004 > > > ------------------------------------------------------------------------ > >

1 0

wineboot: Start items in StartUp folder on boot, includes security measures.
by Misha Koshelev 15 Feb '07

15 Feb '07

Hi everybody, Thanks for your suggestions. I just posted a new patch on wine-patches where I tried to incorporate these and now it does the following (in addition to my previous patch which just started items in the StartUp folder): - When wineboot finds a file that it wants to start in the StartUp folder, it asks the user whether he wants to run the program. His options are: Always, Yes, No (default), and Never. - If he selects Yes the program is run, if he select No it is not. - If he selects Always or Never, I create a registry key in: HKEY_CURRENT_USER\Software\Wine\StartupItems with the full pathname of the program and the value "always" or "never." When wineboot sees this program in the StartUp folder it checks this key, and if it is set it performs the appropriate action. What do you guys think? If you like the system, it would be pretty easy to incorporate this into the run key running as well (which are currently just run without any user confirmation)? Thanks Misha p.s. please please please anyone who is familiar with IShellFolder if you could look over those parts and just say yes it looks good that would make me feel better. I think it is correct but really an expert's opinion would be great.

8 15

Re: [cmd][try3] Update Russian translate (edited) [Really sorry!!]
by Detlef Riekenberg 15 Feb '07

15 Feb '07

On Mi, 2007-02-14 at 15:16 +0300, Anatoly Lyutin wrote: > - HELP <> .\n" > + HELP <> .\n\ > + DOS http://www.citforum.ru/operating_systems/msdos/\n" > } That link is wrong in wine. Please remove from your Patch -- By by ... Detlef

2 1

Re: [Janitorial] snmpapi: Remove the last-but-one %ll printf format
by Detlef Riekenberg 14 Feb '07

14 Feb '07

On Mi, 2007-02-14 at 15:27 -0200, Pedro Araujo Chaves Jr. wrote: > - TRACE("Counter64 %llu\n", any->asnValue.counter64.QuadPart); > + TRACE("Counter64 %su\n", > wine_dbgstr_longlong(any->asnValue.counter64.QuadPart)); > return; Did you mean "%s" ? (used "%su") -- By by ... Detlef

1 0

Re: [1/10] - [10/10] WineD3D
by Mirek 14 Feb '07

14 Feb '07

Wow, great work!!!!! 3DMark 2006 with fbo looks realy coool!! And some Nvidia SDK demos are completly fixed! Mirek Stefan Dösinger napsal(a): > > ------------------------------------------------------------------------ > > From c59f7c4eea148cfb9a1321bbbbc587ef52194bc9 Mon Sep 17 00:00:00 2001 > From: Stefan Doesinger <stefan(a)codeweavers.com> > Date: Fri, 2 Feb 2007 15:30:34 +0100 > Subject: [PATCH] WineD3D: Properly release the converted vertex declaration > > --- > dlls/d3d9/d3d9_private.h | 5 +++++ > dlls/d3d9/device.c | 3 +++ > dlls/d3d9/vertexdeclaration.c | 5 +++++ > 3 files changed, 13 insertions(+), 0 deletions(-) > > diff --git a/dlls/d3d9/d3d9_private.h b/dlls/d3d9/d3d9_private.h > index 435a37e..972945d 100644 > --- a/dlls/d3d9/d3d9_private.h > +++ b/dlls/d3d9/d3d9_private.h > @@ -179,6 +179,11 @@ typedef struct IDirect3DDevice9Impl > /* Avoids recursion with nested ReleaseRef to 0 */ > BOOL inDestruction; > > + /* A vertex declaration was converted from setFVF. > + * Keep track of it, so it can be properly freed > + */ > + IDirect3DVertexDeclaration9 *convertedDecl; > + > } IDirect3DDevice9Impl; > > > diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c > index 4eff550..e6ecd96 100644 > --- a/dlls/d3d9/device.c > +++ b/dlls/d3d9/device.c > @@ -62,6 +62,8 @@ static ULONG WINAPI IDirect3DDevice9Impl_Release(LPDIRECT3DDEVICE9 iface) { > > if (ref == 0) { > This->inDestruction = TRUE; > + if (This->convertedDecl != NULL) > + IUnknown_Release(This->convertedDecl); > IWineD3DDevice_Uninit3D(This->WineD3DDevice, D3D9CB_DestroyDepthStencilSurface, D3D9CB_DestroySwapChain); > IWineD3DDevice_Release(This->WineD3DDevice); > HeapFree(GetProcessHeap(), 0, This); > @@ -766,6 +768,7 @@ HRESULT WINAPI IDirect3DDevice9Impl_SetFVF(LPDIRECT3DDEVICE9 iface, DWORD FVF) > > hr = IDirect3DDevice9Impl_SetVertexDeclaration(iface, pDecl); > if (hr != S_OK) goto exit; > + This->convertedDecl = pDecl; > pDecl = NULL; > > exit: > diff --git a/dlls/d3d9/vertexdeclaration.c b/dlls/d3d9/vertexdeclaration.c > index a7f5486..c3f462e 100644 > --- a/dlls/d3d9/vertexdeclaration.c > +++ b/dlls/d3d9/vertexdeclaration.c > @@ -360,6 +360,11 @@ HRESULT WINAPI IDirect3DDevice9Impl_SetVertexDeclaration(LPDIRECT3DDEVICE9 ifa > > TRACE("(%p) : Relay\n", iface); > > + if (This->convertedDecl && This->convertedDecl != pDecl) { > + IUnknown_Release(This->convertedDecl); > + This->convertedDecl = NULL; > + } > + > hr = IWineD3DDevice_SetVertexDeclaration(This->WineD3DDevice, pDeclImpl == NULL ? NULL : pDeclImpl->wineD3DVertexDeclaration); > > return hr; > > > ------------------------------------------------------------------------ > >

2 1