August 2007 - Wine-Commits - list.winehq.org

Francois Gouget : setupapi: Add prototypes for the Setup*Log*() functions. Better stick to the PSDK types.
by Alexandre Julliard Aug. 30, 2007

Aug. 30, 2007

Module: wine Branch: master Commit: c2d47ced74ef785c774835597325b4beacada1da URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2d47ced74ef785c774835597… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Aug 29 21:42:40 2007 +0200 setupapi: Add prototypes for the Setup*Log*() functions. Better stick to the PSDK types. --- dlls/setupapi/stubs.c | 2 +- include/setupapi.h | 5 +++++ 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/setupapi/stubs.c b/dlls/setupapi/stubs.c index 9881f36..af1b0c3 100644 --- a/dlls/setupapi/stubs.c +++ b/dlls/setupapi/stubs.c @@ -158,7 +158,7 @@ void WINAPI SetupCloseLog(void) /*********************************************************************** * SetupLogErrorW(SETUPAPI.@) */ -BOOL WINAPI SetupLogErrorW(PCWSTR MessageString, LogSeverity Severity) +BOOL WINAPI SetupLogErrorW(LPCWSTR MessageString, LogSeverity Severity) { FIXME("(%s, %d) stub\n", debugstr_w(MessageString), Severity); return TRUE; diff --git a/include/setupapi.h b/include/setupapi.h index 2434639..60a794b 100644 --- a/include/setupapi.h +++ b/include/setupapi.h @@ -751,6 +751,7 @@ LONG WINAPI QueryRegistryValue(HKEY, PCWSTR, PBYTE *, PDWORD, PDWORD); DWORD WINAPI RetreiveFileSecurity(PCWSTR, PSECURITY_DESCRIPTOR *); BOOL WINAPI SetupCloseFileQueue( HSPFILEQ ); void WINAPI SetupCloseInfFile( HINF hinf ); +void WINAPI SetupCloseLog(void); BOOL WINAPI SetupCommitFileQueueA( HWND, HSPFILEQ, PSP_FILE_CALLBACK_A, PVOID ); BOOL WINAPI SetupCommitFileQueueW( HWND, HSPFILEQ, PSP_FILE_CALLBACK_W, PVOID ); #define SetupCommitFileQueue WINELIB_NAME_AW(SetupCommitFileQueue) @@ -892,6 +893,9 @@ BOOL WINAPI SetupInstallFromInfSectionW(HWND,HINF,PCWSTR,UINT,HKEY,PCWSTR,UI BOOL WINAPI SetupIterateCabinetA(PCSTR, DWORD, PSP_FILE_CALLBACK_A, PVOID); BOOL WINAPI SetupIterateCabinetW(PCWSTR, DWORD, PSP_FILE_CALLBACK_W, PVOID); #define SetupIterateCabinet WINELIB_NAME_AW(SetupIterateCabinet) +BOOL WINAPI SetupLogErrorA(LPCSTR,LogSeverity); +BOOL WINAPI SetupLogErrorW(LPCWSTR,LogSeverity); +#define SetupLogError WINELIB_NAME_AW(SetupLogError) BOOL WINAPI SetupOpenAppendInfFileA( PCSTR, HINF, UINT * ); BOOL WINAPI SetupOpenAppendInfFileW( PCWSTR, HINF, UINT * ); #define SetupOpenAppendInfFile WINELIB_NAME_AW(SetupOpenAppendInfFile) @@ -899,6 +903,7 @@ HSPFILEQ WINAPI SetupOpenFileQueue(void); HINF WINAPI SetupOpenInfFileA( PCSTR name, PCSTR pszclass, DWORD style, UINT *error ); HINF WINAPI SetupOpenInfFileW( PCWSTR name, PCWSTR pszclass, DWORD style, UINT *error ); #define SetupOpenInfFile WINELIB_NAME_AW(SetupOpenInfFile) +BOOL WINAPI SetupOpenLog(BOOL); HINF WINAPI SetupOpenMasterInf( VOID ); INT WINAPI SetupPromptReboot( HSPFILEQ, HWND, BOOL); BOOL WINAPI SetupQueryInfFileInformationA(PSP_INF_INFORMATION, UINT, PSTR, DWORD, PDWORD);

1 0

Francois Gouget : taskmgr & winefile: Refer users to the GNU Lesser General Public License, not to the GPL.
by Alexandre Julliard Aug. 30, 2007

Aug. 30, 2007

Module: wine Branch: master Commit: 8def2deccb22037b919cc54ec3bdf7ba68539d0a URL: http://source.winehq.org/git/wine.git/?a=commit;h=8def2deccb22037b919cc54ec… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Aug 29 21:42:20 2007 +0200 taskmgr & winefile: Refer users to the GNU Lesser General Public License, not to the GPL. --- programs/taskmgr/De.rc | 2 +- programs/taskmgr/En.rc | 2 +- programs/taskmgr/Ja.rc | 2 +- programs/taskmgr/Ko.rc | 2 +- programs/taskmgr/Nl.rc | 2 +- programs/taskmgr/No.rc | 2 +- programs/taskmgr/Pl.rc | 2 +- programs/taskmgr/Tr.rc | 2 +- programs/winefile/Ru.rc | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8def2deccb22037b919cc…

1 0

Francois Gouget : gdiplus: Add some missing or related prototypes and types .
by Alexandre Julliard Aug. 30, 2007

Aug. 30, 2007

Module: wine Branch: master Commit: b6b97b1efa2342b5fd7efca0f2b2d2246c50dbeb URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6b97b1efa2342b5fd7efca0f… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Aug 29 21:42:01 2007 +0200 gdiplus: Add some missing or related prototypes and types. Fix the GdipDrawRectangles() prototype. --- dlls/gdiplus/graphics.c | 2 +- dlls/gdiplus/image.c | 2 - include/gdiplusflat.h | 67 ++++++++++++++++++++++++++++++++++++--------- include/gdiplusgpstubs.h | 2 +- include/gdiplusimaging.h | 25 ++++++++++++++++- include/gdiplustypes.h | 1 + 6 files changed, 80 insertions(+), 19 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b6b97b1efa2342b5fd7ef…

1 0

Stefan Dösinger : wined3d: Tidy up the vbo removal from the strided data.
by Alexandre Julliard Aug. 30, 2007

Aug. 30, 2007

Module: wine Branch: master Commit: 643d1e88477a671fdcdbbc16354b7deb43f15957 URL: http://source.winehq.org/git/wine.git/?a=commit;h=643d1e88477a671fdcdbbc163… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Aug 23 17:35:10 2007 +0200 wined3d: Tidy up the vbo removal from the strided data. --- dlls/wined3d/drawprim.c | 115 ++++++++++++++++++++++++++++++++--------- include/wine/wined3d_types.h | 7 +++ 2 files changed, 96 insertions(+), 26 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 0cc6789..679d9d9 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -942,6 +942,94 @@ void blt_to_drawable(IWineD3DDeviceImpl *This, IWineD3DSurfaceImpl *surface) { LEAVE_GL(); } +static inline void remove_vbos(IWineD3DDeviceImpl *This, WineDirect3DVertexStridedData *s) { + unsigned char i; + IWineD3DVertexBufferImpl *vb; + + if(s->u.s.position.VBO) { + vb = (IWineD3DVertexBufferImpl *) This->stateBlock->streamSource[s->u.s.position.streamNo]; + s->u.s.position.VBO = 0; + s->u.s.position.lpData = (BYTE *) ((unsigned long) s->u.s.position.lpData + (unsigned long) vb->resource.allocatedMemory); + } + if(s->u.s.blendWeights.VBO) { + vb = (IWineD3DVertexBufferImpl *) This->stateBlock->streamSource[s->u.s.blendWeights.streamNo]; + s->u.s.blendWeights.VBO = 0; + s->u.s.blendWeights.lpData = (BYTE *) ((unsigned long) s->u.s.blendWeights.lpData + (unsigned long) vb->resource.allocatedMemory); + } + if(s->u.s.blendMatrixIndices.VBO) { + vb = (IWineD3DVertexBufferImpl *) This->stateBlock->streamSource[s->u.s.blendMatrixIndices.streamNo]; + s->u.s.blendMatrixIndices.VBO = 0; + s->u.s.blendMatrixIndices.lpData = (BYTE *) ((unsigned long) s->u.s.blendMatrixIndices.lpData + (unsigned long) vb->resource.allocatedMemory); + } + if(s->u.s.normal.VBO) { + vb = (IWineD3DVertexBufferImpl *) This->stateBlock->streamSource[s->u.s.normal.streamNo]; + s->u.s.normal.VBO = 0; + s->u.s.normal.lpData = (BYTE *) ((unsigned long) s->u.s.normal.lpData + (unsigned long) vb->resource.allocatedMemory); + } + if(s->u.s.pSize.VBO) { + vb = (IWineD3DVertexBufferImpl *) This->stateBlock->streamSource[s->u.s.pSize.streamNo]; + s->u.s.pSize.VBO = 0; + s->u.s.pSize.lpData = (BYTE *) ((unsigned long) s->u.s.pSize.lpData + (unsigned long) vb->resource.allocatedMemory); + } + if(s->u.s.diffuse.VBO) { + vb = (IWineD3DVertexBufferImpl *) This->stateBlock->streamSource[s->u.s.diffuse.streamNo]; + s->u.s.diffuse.VBO = 0; + s->u.s.diffuse.lpData = (BYTE *) ((unsigned long) s->u.s.diffuse.lpData + (unsigned long) vb->resource.allocatedMemory); + } + if(s->u.s.specular.VBO) { + vb = (IWineD3DVertexBufferImpl *) This->stateBlock->streamSource[s->u.s.specular.streamNo]; + s->u.s.specular.VBO = 0; + s->u.s.specular.lpData = (BYTE *) ((unsigned long) s->u.s.specular.lpData + (unsigned long) vb->resource.allocatedMemory); + } + for(i = 0; i < WINED3DDP_MAXTEXCOORD; i++) { + if(s->u.s.texCoords[i].VBO) { + vb = (IWineD3DVertexBufferImpl *) This->stateBlock->streamSource[s->u.s.texCoords[i].streamNo]; + s->u.s.texCoords[i].VBO = 0; + s->u.s.texCoords[i].lpData = (BYTE *) ((unsigned long) s->u.s.texCoords[i].lpData + (unsigned long) vb->resource.allocatedMemory); + } + } + if(s->u.s.position2.VBO) { + vb = (IWineD3DVertexBufferImpl *) This->stateBlock->streamSource[s->u.s.position2.streamNo]; + s->u.s.position2.VBO = 0; + s->u.s.position2.lpData = (BYTE *) ((unsigned long) s->u.s.position2.lpData + (unsigned long) vb->resource.allocatedMemory); + } + if(s->u.s.normal2.VBO) { + vb = (IWineD3DVertexBufferImpl *) This->stateBlock->streamSource[s->u.s.normal2.streamNo]; + s->u.s.normal2.VBO = 0; + s->u.s.normal2.lpData = (BYTE *) ((unsigned long) s->u.s.normal2.lpData + (unsigned long) vb->resource.allocatedMemory); + } + if(s->u.s.tangent.VBO) { + vb = (IWineD3DVertexBufferImpl *) This->stateBlock->streamSource[s->u.s.tangent.streamNo]; + s->u.s.tangent.VBO = 0; + s->u.s.tangent.lpData = (BYTE *) ((unsigned long) s->u.s.tangent.lpData + (unsigned long) vb->resource.allocatedMemory); + } + if(s->u.s.binormal.VBO) { + vb = (IWineD3DVertexBufferImpl *) This->stateBlock->streamSource[s->u.s.binormal.streamNo]; + s->u.s.binormal.VBO = 0; + s->u.s.binormal.lpData = (BYTE *) ((unsigned long) s->u.s.binormal.lpData + (unsigned long) vb->resource.allocatedMemory); + } + if(s->u.s.tessFactor.VBO) { + vb = (IWineD3DVertexBufferImpl *) This->stateBlock->streamSource[s->u.s.tessFactor.streamNo]; + s->u.s.tessFactor.VBO = 0; + s->u.s.tessFactor.lpData = (BYTE *) ((unsigned long) s->u.s.tessFactor.lpData + (unsigned long) vb->resource.allocatedMemory); + } + if(s->u.s.fog.VBO) { + vb = (IWineD3DVertexBufferImpl *) This->stateBlock->streamSource[s->u.s.fog.streamNo]; + s->u.s.fog.VBO = 0; + s->u.s.fog.lpData = (BYTE *) ((unsigned long) s->u.s.fog.lpData + (unsigned long) vb->resource.allocatedMemory); + } + if(s->u.s.depth.VBO) { + vb = (IWineD3DVertexBufferImpl *) This->stateBlock->streamSource[s->u.s.depth.streamNo]; + s->u.s.depth.VBO = 0; + s->u.s.depth.lpData = (BYTE *) ((unsigned long) s->u.s.depth.lpData + (unsigned long) vb->resource.allocatedMemory); + } + if(s->u.s.sample.VBO) { + vb = (IWineD3DVertexBufferImpl *) This->stateBlock->streamSource[s->u.s.sample.streamNo]; + s->u.s.sample.VBO = 0; + s->u.s.sample.lpData = (BYTE *) ((unsigned long) s->u.s.sample.lpData + (unsigned long) vb->resource.allocatedMemory); + } +} + /* Routine common to the draw primitive and draw indexed primitive routines */ void drawPrimitive(IWineD3DDevice *iface, int PrimitiveType, @@ -1052,34 +1140,9 @@ void drawPrimitive(IWineD3DDevice *iface, } if(emulation) { - IWineD3DVertexBufferImpl *vb; - strided = &stridedlcl; memcpy(&stridedlcl, &This->strided_streams, sizeof(stridedlcl)); - -#define FIXVBO(type) \ -if(stridedlcl.u.s.type.VBO) { \ - vb = (IWineD3DVertexBufferImpl *) This->stateBlock->streamSource[stridedlcl.u.s.type.streamNo]; \ - stridedlcl.u.s.type.VBO = 0; \ - stridedlcl.u.s.type.lpData = (BYTE *) ((unsigned long) stridedlcl.u.s.type.lpData + (unsigned long) vb->resource.allocatedMemory); \ -} - FIXVBO(position); - FIXVBO(blendWeights); - FIXVBO(blendMatrixIndices); - FIXVBO(normal); - FIXVBO(pSize); - FIXVBO(diffuse); - FIXVBO(specular); - for(i = 0; i < WINED3DDP_MAXTEXCOORD; i++) FIXVBO(texCoords[i]); - FIXVBO(position2); - FIXVBO(normal2); - FIXVBO(tangent); - FIXVBO(binormal); - FIXVBO(tessFactor); - FIXVBO(fog); - FIXVBO(depth); - FIXVBO(sample); -#undef FIXVBO + remove_vbos(This, &stridedlcl); } } diff --git a/include/wine/wined3d_types.h b/include/wine/wined3d_types.h index b7dc333..477df24 100644 --- a/include/wine/wined3d_types.h +++ b/include/wine/wined3d_types.h @@ -1267,6 +1267,13 @@ typedef struct WineDirect3DStridedData { } WineDirect3DStridedData; typedef struct WineDirect3DVertexStridedData { + /* IMPORTANT: + * + * This structure can be accessed in two ways: Named access, and array + * access. Please note that named access is only valid with the fixed + * function vertex pipeline, and the arrays are only valid with the + * programmable vertex pipeline(vertex shaders) + */ union { struct {

1 0

Stefan Dösinger : wined3d: Accept rendering to sublevels with backbuffer orm.
by Alexandre Julliard Aug. 30, 2007

Aug. 30, 2007

Module: wine Branch: master Commit: a489aa488baa37664af49e0593e8500c89f3a49b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a489aa488baa37664af49e059… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Aug 22 10:46:38 2007 +0200 wined3d: Accept rendering to sublevels with backbuffer orm. --- dlls/wined3d/surface.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index d85a9d7..37144c6 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2041,9 +2041,7 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_LoadTexture(IWineD3DSurface *iface, BO d3dfmt_get_conv(This, TRUE /* We need color keying */, TRUE /* We will use textures */, &format, &internal, &type, &convert, &bpp, srgb_mode); if (This->Flags & SFLAG_INDRAWABLE) { - if (This->glDescription.level != 0) - FIXME("Surface in texture is only supported for level 0\n"); - else if (This->resource.format == WINED3DFMT_P8 || This->resource.format == WINED3DFMT_A8P8 || + if (This->resource.format == WINED3DFMT_P8 || This->resource.format == WINED3DFMT_A8P8 || This->resource.format == WINED3DFMT_DXT1 || This->resource.format == WINED3DFMT_DXT2 || This->resource.format == WINED3DFMT_DXT3 || This->resource.format == WINED3DFMT_DXT4 || This->resource.format == WINED3DFMT_DXT5)

1 0

Stefan Dösinger : wined3d: Reject opengl accelerated blits with system memory surfaces.
by Alexandre Julliard Aug. 30, 2007

Aug. 30, 2007

Module: wine Branch: master Commit: 3b822b80feba396ec017c9ef0d96d59a1733a2d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b822b80feba396ec017c9ef0… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Aug 21 23:24:16 2007 +0200 wined3d: Reject opengl accelerated blits with system memory surfaces. --- dlls/wined3d/surface.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index f8becfe..d85a9d7 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2805,9 +2805,17 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *This, RECT * TRACE("(%p)->(%p,%p,%p,%08x,%p)\n", This, DestRect, SrcSurface, SrcRect, Flags, DDBltFx); /* Get the swapchain. One of the surfaces has to be a primary surface */ + if(This->resource.pool == WINED3DPOOL_SYSTEMMEM) { + WARN("Destination is in sysmem, rejecting gl blt\n"); + return WINED3DERR_INVALIDCALL; + } IWineD3DSurface_GetContainer( (IWineD3DSurface *) This, &IID_IWineD3DSwapChain, (void **)&dstSwapchain); if(dstSwapchain) IWineD3DSwapChain_Release((IWineD3DSwapChain *) dstSwapchain); if(Src) { + if(Src->resource.pool == WINED3DPOOL_SYSTEMMEM) { + WARN("Src is in sysmem, rejecting gl blt\n"); + return WINED3DERR_INVALIDCALL; + } IWineD3DSurface_GetContainer( (IWineD3DSurface *) Src, &IID_IWineD3DSwapChain, (void **)&srcSwapchain); if(srcSwapchain) IWineD3DSwapChain_Release((IWineD3DSwapChain *) srcSwapchain); }

1 0

Stefan Dösinger : wined3d: Clear unused channels on R32F and R16F textures on readback.
by Alexandre Julliard Aug. 30, 2007

Aug. 30, 2007

Module: wine Branch: master Commit: 0d749e8e265363e8b69b6ceaff09c20916c7bbde URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d749e8e265363e8b69b6ceaf… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Aug 21 22:46:52 2007 +0200 wined3d: Clear unused channels on R32F and R16F textures on readback. --- dlls/wined3d/surface.c | 37 +++++++++++++++++++++++++++++++++++++ 1 files changed, 37 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 2abb277..f8becfe 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1963,6 +1963,41 @@ static BOOL palette9_changed(IWineD3DSurfaceImpl *This) { return TRUE; } +static inline void clear_unused_channels(IWineD3DSurfaceImpl *This) { + GLboolean oldwrite[4]; + + /* Some formats have only some color channels, and the others are 1.0. + * since our rendering renders to all channels, and those pixel formats + * are emulated by using a full texture with the other channels set to 1.0 + * manually, clear the unused channels. + * + * This could be done with hacking colorwriteenable to mask the colors, + * but before drawing the buffer would have to be cleared too, so there's + * no gain in that + */ + switch(This->resource.format) { + case WINED3DFMT_R16F: + case WINED3DFMT_R32F: + TRACE("R16F or R32F format, clearing green, blue and alpha to 1.0\n"); + /* Do not activate a context, the correct drawable is active already + * though just the read buffer is set, make sure to have the correct draw + * buffer too + */ + glDrawBuffer(This->resource.wineD3DDevice->offscreenBuffer); + glDisable(GL_SCISSOR_TEST); + glGetBooleanv(GL_COLOR_WRITEMASK, oldwrite); + glColorMask(GL_FALSE, GL_TRUE, GL_TRUE, GL_TRUE); + glClearColor(0.0, 1.0, 1.0, 1.0); + glClear(GL_COLOR_BUFFER_BIT); + glColorMask(oldwrite[0], oldwrite[1], oldwrite[2], oldwrite[3]); + if(!This->resource.wineD3DDevice->render_offscreen) glDrawBuffer(GL_BACK); + checkGLcall("Unused channel clear\n"); + break; + + default: break; + } +} + static HRESULT WINAPI IWineD3DSurfaceImpl_LoadTexture(IWineD3DSurface *iface, BOOL srgb_mode) { IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *)iface; IWineD3DDeviceImpl *device = This->resource.wineD3DDevice; @@ -2027,6 +2062,8 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_LoadTexture(IWineD3DSurface *iface, BO This->pow2Height, format, type); } + clear_unused_channels(This); + glCopyTexSubImage2D(This->glDescription.target, This->glDescription.level, 0, 0, 0, 0,

1 0

Stefan Dösinger : wined3d: Use 0/0/ 0 as normal if no normal is supplied.
by Alexandre Julliard Aug. 30, 2007

Aug. 30, 2007

Module: wine Branch: master Commit: 8c9c084004356d9605c33ca013192a395dce8127 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c9c084004356d9605c33ca01… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Aug 21 18:05:27 2007 +0200 wined3d: Use 0/0/0 as normal if no normal is supplied. --- dlls/wined3d/drawprim.c | 2 +- dlls/wined3d/state.c | 18 +++++++++++++++--- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 3b45db3..0cc6789 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -350,7 +350,7 @@ static void drawStridedSlow(IWineD3DDevice *iface, WineDirect3DVertexStridedData /* Default settings for data that is not passed */ if (sd->u.s.normal.lpData == NULL) { - glNormal3f(0, 0, 1); + glNormal3f(0, 0, 0); } if(sd->u.s.diffuse.lpData == NULL) { glColor4f(1.0f, 1.0f, 1.0f, 1.0f); diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 4b38e40..fe25e4b 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1196,7 +1196,16 @@ static void state_zbias(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3D static void state_normalize(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *context) { - if (stateblock->renderState[WINED3DRS_NORMALIZENORMALS]) { + if(isStateDirty(context, STATE_VDECL)) { + return; + } + /* Without vertex normals, we set the current normal to 0/0/0 to remove the diffuse factor + * from the opengl lighting equation, as d3d does. Normalization of 0/0/0 can lead to a division + * by zero and is not properly defined in opengl, so avoid it + */ + if (stateblock->renderState[WINED3DRS_NORMALIZENORMALS] && ( + stateblock->wineD3DDevice->strided_streams.u.s.normal.lpData || + stateblock->wineD3DDevice->strided_streams.u.s.normal.VBO)) { glEnable(GL_NORMALIZE); checkGLcall("glEnable(GL_NORMALIZE);"); } else { @@ -3031,8 +3040,8 @@ static void loadVertexData(IWineD3DStateBlockImpl *stateblock, WineDirect3DVerte checkGLcall("glEnableClientState(GL_NORMAL_ARRAY)"); } else { - glNormal3f(0, 0, 1); - checkGLcall("glNormal3f(0, 0, 1)"); + glNormal3f(0, 0, 0); + checkGLcall("glNormal3f(0, 0, 0)"); } /* Diffuse Colour --------------------------------------------*/ @@ -3307,6 +3316,9 @@ static void vertexdeclaration(DWORD state, IWineD3DStateBlockImpl *stateblock, W if(context->last_was_vshader && !isStateDirty(context, STATE_RENDER(WINED3DRS_CLIPPLANEENABLE))) { state_clipping(STATE_RENDER(WINED3DRS_CLIPPLANEENABLE), stateblock, context); } + if(!isStateDirty(context, STATE_RENDER(WINED3DRS_NORMALIZENORMALS))) { + state_normalize(STATE_RENDER(WINED3DRS_NORMALIZENORMALS), stateblock, context); + } } else { /* We compile the shader here because we need the vertex declaration * in order to determine if we need to do any swizzling for D3DCOLOR

1 0

Stefan Leichter : dpnet: Remove 'recursive registry key delete' function.
by Alexandre Julliard Aug. 30, 2007

Aug. 30, 2007

Module: wine Branch: master Commit: af66d215b37da30e97e7aa2d08e2b92adbf06951 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af66d215b37da30e97e7aa2d0… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Wed Aug 29 21:07:03 2007 +0200 dpnet: Remove 'recursive registry key delete' function. --- dlls/dpnet/regsvr.c | 79 +++++--------------------------------------------- 1 files changed, 8 insertions(+), 71 deletions(-) diff --git a/dlls/dpnet/regsvr.c b/dlls/dpnet/regsvr.c index 802faad..12b52f8 100644 --- a/dlls/dpnet/regsvr.c +++ b/dlls/dpnet/regsvr.c @@ -117,9 +117,6 @@ static LONG register_key_defvalueA(HKEY base, WCHAR const *name, static LONG register_progid(WCHAR const *clsid, char const *progid, char const *curver_progid, char const *name, char const *extra); -static LONG recursive_delete_key(HKEY key); -static LONG recursive_delete_keyA(HKEY base, char const *name); -static LONG recursive_delete_keyW(HKEY base, WCHAR const *name); /*********************************************************************** * register_interfaces @@ -208,7 +205,8 @@ static HRESULT unregister_interfaces(struct regsvr_interface const *list) WCHAR buf[39]; StringFromGUID2(list->iid, buf, 39); - res = recursive_delete_keyW(interface_key, buf); + res = RegDeleteTreeW(interface_key, buf); + if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; } RegCloseKey(interface_key); @@ -315,16 +313,19 @@ static HRESULT unregister_coclasses(struct regsvr_coclass const *list) WCHAR buf[39]; StringFromGUID2(list->clsid, buf, 39); - res = recursive_delete_keyW(coclass_key, buf); + res = RegDeleteTreeW(coclass_key, buf); + if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; if (res != ERROR_SUCCESS) goto error_close_coclass_key; if (list->progid) { - res = recursive_delete_keyA(HKEY_CLASSES_ROOT, list->progid); + res = RegDeleteTreeA(HKEY_CLASSES_ROOT, list->progid); + if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; if (res != ERROR_SUCCESS) goto error_close_coclass_key; } if (list->viprogid) { - res = recursive_delete_keyA(HKEY_CLASSES_ROOT, list->viprogid); + res = RegDeleteTreeA(HKEY_CLASSES_ROOT, list->viprogid); + if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; if (res != ERROR_SUCCESS) goto error_close_coclass_key; } } @@ -437,70 +438,6 @@ error_close_progid_key: } /*********************************************************************** - * recursive_delete_key - */ -static LONG recursive_delete_key(HKEY key) -{ - LONG res; - WCHAR subkey_name[MAX_PATH]; - DWORD cName; - HKEY subkey; - - for (;;) { - cName = sizeof(subkey_name) / sizeof(WCHAR); - res = RegEnumKeyExW(key, 0, subkey_name, &cName, - NULL, NULL, NULL, NULL); - if (res != ERROR_SUCCESS && res != ERROR_MORE_DATA) { - res = ERROR_SUCCESS; /* presumably we're done enumerating */ - break; - } - res = RegOpenKeyExW(key, subkey_name, 0, - KEY_READ | KEY_WRITE, &subkey); - if (res == ERROR_FILE_NOT_FOUND) continue; - if (res != ERROR_SUCCESS) break; - - res = recursive_delete_key(subkey); - RegCloseKey(subkey); - if (res != ERROR_SUCCESS) break; - } - - if (res == ERROR_SUCCESS) res = RegDeleteKeyW(key, 0); - return res; -} - -/*********************************************************************** - * recursive_delete_keyA - */ -static LONG recursive_delete_keyA(HKEY base, char const *name) -{ - LONG res; - HKEY key; - - res = RegOpenKeyExA(base, name, 0, KEY_READ | KEY_WRITE, &key); - if (res == ERROR_FILE_NOT_FOUND) return ERROR_SUCCESS; - if (res != ERROR_SUCCESS) return res; - res = recursive_delete_key(key); - RegCloseKey(key); - return res; -} - -/*********************************************************************** - * recursive_delete_keyW - */ -static LONG recursive_delete_keyW(HKEY base, WCHAR const *name) -{ - LONG res; - HKEY key; - - res = RegOpenKeyExW(base, name, 0, KEY_READ | KEY_WRITE, &key); - if (res == ERROR_FILE_NOT_FOUND) return ERROR_SUCCESS; - if (res != ERROR_SUCCESS) return res; - res = recursive_delete_key(key); - RegCloseKey(key); - return res; -} - -/*********************************************************************** * coclass list */ static struct regsvr_coclass const coclass_list[] = {

1 0

Dmitry Timoshkov : kernel32: Fix a compiler warning.
by Alexandre Julliard Aug. 30, 2007

Aug. 30, 2007

Module: wine Branch: master Commit: afc85e91abbf4ec1a6828a0dbd541160869e656e URL: http://source.winehq.org/git/wine.git/?a=commit;h=afc85e91abbf4ec1a6828a0db… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Thu Aug 30 17:18:25 2007 +0900 kernel32: Fix a compiler warning. --- dlls/kernel32/actctx.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/actctx.c b/dlls/kernel32/actctx.c index 4591d8b..c708373 100644 --- a/dlls/kernel32/actctx.c +++ b/dlls/kernel32/actctx.c @@ -89,7 +89,7 @@ HANDLE WINAPI CreateActCtxA(PCACTCTXA pActCtx) MultiByteToWideChar(CP_ACP, 0, pActCtx->lpResourceName, -1, resname, len); actw.lpResourceName = resname; } - else actw.lpResourceName = (LPWSTR)pActCtx->lpResourceName; + else actw.lpResourceName = (LPCWSTR)pActCtx->lpResourceName; } if (actw.dwFlags & ACTCTX_FLAG_APPLICATION_NAME_VALID) {

1 0