November 2007 - Wine-commits

Stefan Dösinger : wined3d: Add GL_ARB_texture_rectangles to our opengl extensions.
by Alexandre Julliard 29 Nov '07

29 Nov '07

Module: wine Branch: master Commit: 0cfa7f99e6189087c00f597c7b00c8e5571fbbb0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0cfa7f99e6189087c00f597c7… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Nov 26 23:19:03 2007 +0100 wined3d: Add GL_ARB_texture_rectangles to our opengl extensions. --- dlls/wined3d/directx.c | 8 ++++++++ include/wine/wined3d_gl.h | 12 ++++++++++++ 2 files changed, 20 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 3bc5712..9700ae3 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -75,6 +75,7 @@ static const struct { {"GL_ARB_texture_float", ARB_TEXTURE_FLOAT, 0 }, {"GL_ARB_texture_mirrored_repeat", ARB_TEXTURE_MIRRORED_REPEAT, 0 }, {"GL_ARB_texture_non_power_of_two", ARB_TEXTURE_NON_POWER_OF_TWO, 0 }, + {"GL_ARB_texture_rectangle", ARB_TEXTURE_RECTANGLE, 0 }, {"GL_ARB_vertex_blend", ARB_VERTEX_BLEND, 0 }, {"GL_ARB_vertex_buffer_object", ARB_VERTEX_BUFFER_OBJECT, 0 }, {"GL_ARB_vertex_program", ARB_VERTEX_PROGRAM, 0 }, @@ -870,6 +871,12 @@ BOOL IWineD3DImpl_FillGLCaps(WineD3D_GL_Info *gl_info) { } else if (gl_info->supported[NV_FRAGMENT_PROGRAM]) { gl_info->ps_nv_version = PS_VERSION_20; } + if (gl_info->supported[ARB_TEXTURE_NON_POWER_OF_TWO]) { + /* If we have full NP2 texture support, disable GL_ARB_texture_rectangle because we will never use it. + * This saves a few redundant glDisable calls + */ + gl_info->supported[ARB_TEXTURE_RECTANGLE] = FALSE; + } } checkGLcall("extension detection\n"); @@ -2837,6 +2844,7 @@ static void fixup_extensions(WineD3D_GL_Info *gl_info) { gl_info->gl_card == CARD_ATI_RADEON_7200 || gl_info->gl_card == CARD_ATI_RAGE_128PRO) { TRACE("GL_ARB_texture_non_power_of_two advertised on R500 or earlier card, removing\n"); gl_info->supported[ARB_TEXTURE_NON_POWER_OF_TWO] = FALSE; + gl_info->supported[ARB_TEXTURE_RECTANGLE] = TRUE; } } } diff --git a/include/wine/wined3d_gl.h b/include/wine/wined3d_gl.h index 2213779..9c26950 100644 --- a/include/wine/wined3d_gl.h +++ b/include/wine/wined3d_gl.h @@ -2866,6 +2866,17 @@ typedef void (WINE_GLAPI * PGLFNFINISHRENDERAPPLEPROC) (void); #define UNSIGNED_SHORT_8_8_REV_APPLE 0x85BB #endif +/* GL_ARB_texture_rectangle */ +#ifndef GL_ARB_texture_rectangle +#define GL_ARB_texture_rectangle +#define GL_TEXTURE_RECTANGLE_ARB 0x84F5 +#define GL_TEXTURE_BINDING_RECTANGLE_ARB 0x84F6 +#define GL_PROXY_TEXTURE_RECTANGLE_ARB 0x84F7 +#define GL_MAX_RECTANGLE_TEXTURE_SIZE_ARB 0x84F8 +#define GL_SAMPLER_2D_RECT_ARB 0x8B63 +#define GL_SAMPLER_2D_RECT_SHADOW_ARB 0x8B64 +#endif + /* GL_VERSION_2_0 */ #ifndef GL_VERSION_2_0 #define GL_VERSION_2_0 1 @@ -3167,6 +3178,7 @@ typedef enum _GL_SupportedExt { ARB_TEXTURE_BORDER_CLAMP, ARB_TEXTURE_MIRRORED_REPEAT, ARB_TEXTURE_NON_POWER_OF_TWO, + ARB_TEXTURE_RECTANGLE, ARB_VERTEX_PROGRAM, ARB_VERTEX_BLEND, ARB_VERTEX_BUFFER_OBJECT,

1 0

Stefan Dösinger : wined3d: Make the code aware of GL_ARB_texture_rectangle.
by Alexandre Julliard 29 Nov '07

29 Nov '07

Module: wine Branch: master Commit: 3fd0916654906d2e4d0091322ea3162c18848cd4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3fd0916654906d2e4d0091322… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Nov 27 22:25:07 2007 +0100 wined3d: Make the code aware of GL_ARB_texture_rectangle. --- dlls/wined3d/arb_program_shader.c | 11 +++++++- dlls/wined3d/baseshader.c | 4 +++ dlls/wined3d/basetexture.c | 26 +++++++++++------- dlls/wined3d/device.c | 24 +++++++++++++--- dlls/wined3d/glsl_shader.c | 54 +++++++++++++++++++++++++++--------- dlls/wined3d/pixelshader.c | 6 ++++ dlls/wined3d/state.c | 47 ++++++++++++++++++++++++++++++-- dlls/wined3d/surface.c | 28 ++++++++++++++++++- dlls/wined3d/utils.c | 20 ++++++++++--- 9 files changed, 182 insertions(+), 38 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3fd0916654906d2e4d009…

1 0

Stefan Dösinger : wined3d: Refuse to create a mipmapped conditional np2 texture.
by Alexandre Julliard 29 Nov '07

29 Nov '07

Module: wine Branch: master Commit: 8964336b37ee1da3ee5fa720790dce067f7767d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8964336b37ee1da3ee5fa7207… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Nov 28 20:21:00 2007 +0100 wined3d: Refuse to create a mipmapped conditional np2 texture. --- dlls/wined3d/device.c | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index d4d6e56..33c7628 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -876,6 +876,17 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateTexture(IWineD3DDevice *iface, U pow2Width = pow2Height = 1; while (pow2Width < Width) pow2Width <<= 1; while (pow2Height < Height) pow2Height <<= 1; + + if(pow2Width != Width || pow2Height != Height) { + if(Levels > 1) { + WARN("Attempted to create a mipmapped np2 texture without unconditional np2 support\n"); + HeapFree(GetProcessHeap(), 0, object); + *ppTexture = NULL; + return WINED3DERR_INVALIDCALL; + } else { + Levels = 1; + } + } } /** FIXME: add support for real non-power-two if it's provided by the video card **/

1 0

Juan Lang : crypt32: Support getting and setting the KP_PADDING key param.
by Alexandre Julliard 29 Nov '07

29 Nov '07

Module: wine Branch: master Commit: c9e0fa442a743155ecc124c3f4d4505529020237 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9e0fa442a743155ecc124c3f… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Nov 28 09:20:23 2007 -0800 crypt32: Support getting and setting the KP_PADDING key param. --- dlls/rsaenh/rsaenh.c | 28 ++++++++++++++++++++-------- 1 files changed, 20 insertions(+), 8 deletions(-) diff --git a/dlls/rsaenh/rsaenh.c b/dlls/rsaenh/rsaenh.c index b099f77..48c2c0f 100644 --- a/dlls/rsaenh/rsaenh.c +++ b/dlls/rsaenh/rsaenh.c @@ -2798,6 +2798,14 @@ BOOL WINAPI RSAENH_CPSetKeyParam(HCRYPTPROV hProv, HCRYPTKEY hKey, DWORD dwParam } switch (dwParam) { + case KP_PADDING: + /* The MS providers only support PKCS5_PADDING */ + if (*(DWORD *)pbData != PKCS5_PADDING) { + SetLastError(NTE_BAD_DATA); + return FALSE; + } + return TRUE; + case KP_MODE: pCryptKey->dwMode = *(DWORD*)pbData; return TRUE; @@ -2901,7 +2909,7 @@ BOOL WINAPI RSAENH_CPGetKeyParam(HCRYPTPROV hProv, HCRYPTKEY hKey, DWORD dwParam DWORD *pdwDataLen, DWORD dwFlags) { CRYPTKEY *pCryptKey; - DWORD dwBitLen; + DWORD dwValue; TRACE("(hProv=%08lx, hKey=%08lx, dwParam=%08x, pbData=%p, pdwDataLen=%p dwFlags=%08x)\n", hProv, hKey, dwParam, pbData, pdwDataLen, dwFlags); @@ -2933,20 +2941,24 @@ BOOL WINAPI RSAENH_CPGetKeyParam(HCRYPTPROV hProv, HCRYPTKEY hKey, DWORD dwParam return copy_param(pbData, pdwDataLen, (CONST BYTE*)&pCryptKey->abKeyValue[pCryptKey->dwKeyLen], pCryptKey->dwSaltLen); + case KP_PADDING: + dwValue = PKCS5_PADDING; + return copy_param(pbData, pdwDataLen, (CONST BYTE*)&dwValue, sizeof(DWORD)); + case KP_KEYLEN: - dwBitLen = pCryptKey->dwKeyLen << 3; - return copy_param(pbData, pdwDataLen, (CONST BYTE*)&dwBitLen, sizeof(DWORD)); + dwValue = pCryptKey->dwKeyLen << 3; + return copy_param(pbData, pdwDataLen, (CONST BYTE*)&dwValue, sizeof(DWORD)); case KP_EFFECTIVE_KEYLEN: if (pCryptKey->dwEffectiveKeyLen) - dwBitLen = pCryptKey->dwEffectiveKeyLen; + dwValue = pCryptKey->dwEffectiveKeyLen; else - dwBitLen = pCryptKey->dwKeyLen << 3; - return copy_param(pbData, pdwDataLen, (CONST BYTE*)&dwBitLen, sizeof(DWORD)); + dwValue = pCryptKey->dwKeyLen << 3; + return copy_param(pbData, pdwDataLen, (CONST BYTE*)&dwValue, sizeof(DWORD)); case KP_BLOCKLEN: - dwBitLen = pCryptKey->dwBlockLen << 3; - return copy_param(pbData, pdwDataLen, (CONST BYTE*)&dwBitLen, sizeof(DWORD)); + dwValue = pCryptKey->dwBlockLen << 3; + return copy_param(pbData, pdwDataLen, (CONST BYTE*)&dwValue, sizeof(DWORD)); case KP_MODE: return copy_param(pbData, pdwDataLen, (CONST BYTE*)&pCryptKey->dwMode, sizeof(DWORD));

1 0

Juan Lang : crypt32: Support setting the salt value through KP_SALT_EX.
by Alexandre Julliard 29 Nov '07

29 Nov '07

Module: wine Branch: master Commit: 83f74fef2c0531b2b24eb200856ff14fadd4a1ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=83f74fef2c0531b2b24eb2008… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Nov 28 09:27:36 2007 -0800 crypt32: Support setting the salt value through KP_SALT_EX. --- dlls/rsaenh/rsaenh.c | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/dlls/rsaenh/rsaenh.c b/dlls/rsaenh/rsaenh.c index 48c2c0f..29e072c 100644 --- a/dlls/rsaenh/rsaenh.c +++ b/dlls/rsaenh/rsaenh.c @@ -2823,6 +2823,23 @@ BOOL WINAPI RSAENH_CPSetKeyParam(HCRYPTPROV hProv, HCRYPTKEY hKey, DWORD dwParam setup_key(pCryptKey); return TRUE; + case KP_SALT_EX: + { + CRYPT_INTEGER_BLOB *blob = (CRYPT_INTEGER_BLOB *)pbData; + + /* salt length can't be greater than 128 bits = 16 bytes */ + if (blob->cbData > 16) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + memcpy(pCryptKey->abKeyValue + pCryptKey->dwKeyLen, blob->pbData, + blob->cbData); + pCryptKey->dwSaltLen = blob->cbData; + setup_key(pCryptKey); + return TRUE; + } + case KP_EFFECTIVE_KEYLEN: switch (pCryptKey->aiAlgid) { case CALG_RC2:

1 0

Rob Shearman : ole32: Fix description of what is being test in ok calls in the WdtpInterfacePointer tests .
by Alexandre Julliard 29 Nov '07

29 Nov '07

Module: wine Branch: master Commit: 95b61672446c66cb47bdc3ef80b903e4c3adb7b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=95b61672446c66cb47bdc3ef8… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Nov 28 17:45:35 2007 +0000 ole32: Fix description of what is being test in ok calls in the WdtpInterfacePointer tests. --- dlls/ole32/tests/usrmarshal.c | 15 +++++++-------- 1 files changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/ole32/tests/usrmarshal.c b/dlls/ole32/tests/usrmarshal.c index 281f9a0..08a3119 100644 --- a/dlls/ole32/tests/usrmarshal.c +++ b/dlls/ole32/tests/usrmarshal.c @@ -447,25 +447,24 @@ static void test_marshal_WdtpInterfacePointer(void) wireip = buffer; if (size >= 28) { - ok(*(DWORD *)wireip == 0x44, "wireip + 0x0 should be 0x4c instead of 0x%08x\n", *(DWORD *)wireip); + ok(*(DWORD *)wireip == 0x44, "wireip + 0x0 should be 0x44 instead of 0x%08x\n", *(DWORD *)wireip); wireip += sizeof(DWORD); - ok(*(DWORD *)wireip == 0x44, "wireip + 0x8 should be 0x4c instead of 0x%08x\n", *(DWORD *)wireip); + ok(*(DWORD *)wireip == 0x44, "wireip + 0x4 should be 0x44 instead of 0x%08x\n", *(DWORD *)wireip); wireip += sizeof(DWORD); - ok(*(DWORD *)wireip == 0x574f454d /* 'MEOW' */, "wireip + 0xc should be 0x574f454d instead of 0x%08x\n", *(DWORD *)wireip); + ok(*(DWORD *)wireip == 0x574f454d /* 'MEOW' */, "wireip + 0x8 should be 0x574f454d instead of 0x%08x\n", *(DWORD *)wireip); wireip += sizeof(DWORD); - ok(*(DWORD *)wireip == 0x1, "wireip + 0x10 should be 0x1 instead of 0x%08x\n", *(DWORD *)wireip); + ok(*(DWORD *)wireip == 0x1, "wireip + 0xc should be 0x1 instead of 0x%08x\n", *(DWORD *)wireip); wireip += sizeof(DWORD); iid = (const IID *)buffer; ok(!IsEqualIID(iid, &IID_IUnknown), - "wireip + 0x14 should be IID_IUnknown instead of {%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}\n", + "wireip + 0x10 should be IID_IUnknown instead of {%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}\n", iid->Data1, iid->Data2, iid->Data3, iid->Data4[0], iid->Data4[1], iid->Data4[2], iid->Data4[3], iid->Data4[4], iid->Data4[5], iid->Data4[6], iid->Data4[7]); - ok(*(DWORD *)wireip == 0, "wireip + 0x14 should be 0 instead of 0x%08x\n", *(DWORD *)wireip); wireip += sizeof(IID); - ok(*(DWORD *)wireip == 0, "wireip + 0x20 should be 0 instead of 0x%08x\n", *(DWORD *)wireip); + ok(*(DWORD *)wireip == 0, "wireip + 0x1c should be 0 instead of 0x%08x\n", *(DWORD *)wireip); wireip += sizeof(DWORD); - ok(*(DWORD *)wireip == 5, "wireip + 0x24 should be 5 instead of %d\n", *(DWORD *)wireip); + ok(*(DWORD *)wireip == 5, "wireip + 0x20 should be 5 instead of %d\n", *(DWORD *)wireip); wireip += sizeof(DWORD); /* the rest is dynamic so can't really be tested */ }

1 0

Rob Shearman : ole32: Fix a test in the WdtpInterfacePointer tests.
by Alexandre Julliard 29 Nov '07

29 Nov '07

Module: wine Branch: master Commit: 5c53b52c5a0fcd90993a2081c89fcc68868f30d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c53b52c5a0fcd90993a2081c… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Nov 28 17:45:41 2007 +0000 ole32: Fix a test in the WdtpInterfacePointer tests. --- dlls/ole32/tests/usrmarshal.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/tests/usrmarshal.c b/dlls/ole32/tests/usrmarshal.c index 08a3119..d6fd7ee 100644 --- a/dlls/ole32/tests/usrmarshal.c +++ b/dlls/ole32/tests/usrmarshal.c @@ -455,8 +455,8 @@ static void test_marshal_WdtpInterfacePointer(void) wireip += sizeof(DWORD); ok(*(DWORD *)wireip == 0x1, "wireip + 0xc should be 0x1 instead of 0x%08x\n", *(DWORD *)wireip); wireip += sizeof(DWORD); - iid = (const IID *)buffer; - ok(!IsEqualIID(iid, &IID_IUnknown), + iid = (const IID *)wireip; + ok(IsEqualIID(iid, &IID_IUnknown), "wireip + 0x10 should be IID_IUnknown instead of {%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}\n", iid->Data1, iid->Data2, iid->Data3, iid->Data4[0], iid->Data4[1], iid->Data4[2], iid->Data4[3],

1 0

Stefan Dösinger : wined3d: Disable GL_TEXTURE_2D in the standard blit setup.
by Alexandre Julliard 29 Nov '07

29 Nov '07

Module: wine Branch: master Commit: 4dbee07ff581b11dfbe4d0f277a205b10786a755 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4dbee07ff581b11dfbe4d0f27… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Nov 26 21:43:08 2007 +0100 wined3d: Disable GL_TEXTURE_2D in the standard blit setup. --- dlls/wined3d/context.c | 7 +++---- dlls/wined3d/surface.c | 41 ++++++++++++++++++++++++++--------------- 2 files changed, 29 insertions(+), 19 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 32d75b6..5e1bdc6 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -473,8 +473,7 @@ void DestroyContext(IWineD3DDeviceImpl *This, WineD3DContext *context) { * SetupForBlit * * Sets up a context for DirectDraw blitting. - * All texture units are disabled, except unit 0 - * Texture unit 0 is activted where GL_TEXTURE_2D is activated + * All texture units are disabled, texture unit 0 is set as current unit * fog, lighting, blending, alpha test, z test, scissor test, culling diabled * color writing enabled for all channels * register combiners disabled, shaders disabled @@ -544,8 +543,8 @@ static inline void SetupForBlit(IWineD3DDeviceImpl *This, WineD3DContext *contex } glDisable(GL_TEXTURE_3D); checkGLcall("glDisable GL_TEXTURE_3D"); - glEnable(GL_TEXTURE_2D); - checkGLcall("glEnable GL_TEXTURE_2D"); + glDisable(GL_TEXTURE_2D); + checkGLcall("glDisable GL_TEXTURE_2D"); glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 971703d..2655b61 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -964,9 +964,6 @@ static void flush_to_framebuffer_drawpixels(IWineD3DSurfaceImpl *This) { IWineD3DSwapChain_Release((IWineD3DSwapChain *)swapchain); } - glDisable(GL_TEXTURE_2D); - vcheckGLcall("glDisable(GL_TEXTURE_2D)"); - glFlush(); vcheckGLcall("glFlush"); glGetIntegerv(GL_PACK_SWAP_BYTES, &prev_store); @@ -1153,12 +1150,6 @@ cleanup: vcheckGLcall("glPixelStorei GL_PACK_SWAP_BYTES"); } - /* Blitting environment requires that 2D texturing is enabled. It was turned off before, - * turn it on again - */ - glEnable(GL_TEXTURE_2D); - checkGLcall("glEnable(GL_TEXTURE_2D)"); - if(memory_allocated) HeapFree(GetProcessHeap(), 0, mem); if(!swapchain) { @@ -2535,6 +2526,10 @@ static inline void fb_copy_to_texture_direct(IWineD3DSurfaceImpl *This, IWineD3D ENTER_GL(); IWineD3DSurface_PreLoad((IWineD3DSurface *) This); + /* TODO: Do we need GL_TEXTURE_2D enabled fpr copyteximage? */ + glEnable(GL_TEXTURE_2D); + checkGLcall("glEnable(GL_TEXTURE_2D)"); + /* Bind the target texture */ glBindTexture(GL_TEXTURE_2D, This->glDescription.textureName); checkGLcall("glBindTexture"); @@ -2600,8 +2595,12 @@ static inline void fb_copy_to_texture_direct(IWineD3DSurfaceImpl *This, IWineD3D } } } - vcheckGLcall("glCopyTexSubImage2D"); + + /* Leave the opengl state valid for blitting */ + glDisable(GL_TEXTURE_2D); + checkGLcall("glDisable(GL_TEXTURE_2D)"); + LEAVE_GL(); } @@ -2619,6 +2618,9 @@ static inline void fb_copy_to_texture_hwstretch(IWineD3DSurfaceImpl *This, IWine /* Activate the Proper context for reading from the source surface, set it up for blitting */ ActivateContext(myDevice, SrcSurface, CTXUSAGE_BLIT); ENTER_GL(); + glEnable(GL_TEXTURE_2D); + checkGLcall("glEnable(GL_TEXTURE_2D)"); + IWineD3DSurface_PreLoad((IWineD3DSurface *) This); /* Try to use an aux buffer for drawing the rectangle. This way it doesn't need restoring. @@ -2780,6 +2782,8 @@ static inline void fb_copy_to_texture_hwstretch(IWineD3DSurfaceImpl *This, IWine } /* Cleanup */ + glDisable(GL_TEXTURE_2D); + checkGLcall("glDisable(GL_TEXTURE_2D)"); if(src != Src->glDescription.textureName && src != backup) { glDeleteTextures(1, &src); checkGLcall("glDeleteTextures(1, &src)"); @@ -2788,6 +2792,7 @@ static inline void fb_copy_to_texture_hwstretch(IWineD3DSurfaceImpl *This, IWine glDeleteTextures(1, &backup); checkGLcall("glDeleteTextures(1, &backup)"); } + LEAVE_GL(); } @@ -3094,6 +3099,9 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *This, RECT * ActivateContext(myDevice, (IWineD3DSurface *) This, CTXUSAGE_BLIT); ENTER_GL(); + glEnable(GL_TEXTURE_2D); + checkGLcall("glEnable(GL_TEXTURE_2D)"); + if(!dstSwapchain) { TRACE("Drawing to offscreen buffer\n"); glDrawBuffer(myDevice->offscreenBuffer); @@ -3166,9 +3174,11 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *This, RECT * if(dstSwapchain && (dstSwapchain->num_contexts >= 2)) glFlush(); - /* Unbind the texture */ glBindTexture(GL_TEXTURE_2D, 0); checkGLcall("glEnable glBindTexture"); + /* Leave the opengl state valid for blitting */ + glDisable(GL_TEXTURE_2D); + checkGLcall("glDisable(GL_TEXTURE_2D)"); /* The draw buffer should only need to be restored if we were drawing to the front buffer, and there is a back buffer. * otherwise the context manager should choose between GL_BACK / offscreenDrawBuffer @@ -3534,6 +3544,8 @@ static inline void surface_blt_to_drawable(IWineD3DSurfaceImpl *This, const RECT ENTER_GL(); if(This->glDescription.target == GL_TEXTURE_2D) { + glEnable(GL_TEXTURE_2D); + checkGLcall("glEnable(GL_TEXTURE_2D)"); glBindTexture(GL_TEXTURE_2D, This->glDescription.textureName); checkGLcall("GL_TEXTURE_2D, This->glDescription.textureName)"); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); @@ -3559,8 +3571,6 @@ static inline void surface_blt_to_drawable(IWineD3DSurfaceImpl *This, const RECT coords[3].y = rect.top / This->pow2Height; } else { /* Must be a cube map */ - glDisable(GL_TEXTURE_2D); - checkGLcall("glDisable(GL_TEXTURE_2D)"); glEnable(GL_TEXTURE_CUBE_MAP_ARB); checkGLcall("glEnable(GL_TEXTURE_CUBE_MAP_ARB)"); glBindTexture(GL_TEXTURE_CUBE_MAP_ARB, This->glDescription.textureName); @@ -3635,10 +3645,11 @@ static inline void surface_blt_to_drawable(IWineD3DSurfaceImpl *This, const RECT checkGLcall("glEnd"); if(This->glDescription.target != GL_TEXTURE_2D) { - glEnable(GL_TEXTURE_2D); - checkGLcall("glEnable(GL_TEXTURE_2D)"); glDisable(GL_TEXTURE_CUBE_MAP_ARB); checkGLcall("glDisable(GL_TEXTURE_CUBE_MAP_ARB)"); + } else { + glDisable(GL_TEXTURE_2D); + checkGLcall("glDisable(GL_TEXTURE_2D)"); } hr = IWineD3DSurface_GetContainer((IWineD3DSurface*)This, &IID_IWineD3DSwapChain, (void **) &swapchain);

1 0

Stefan Dösinger : wined3d: Avoid hardcoding GL_TEXTURE_2D.
by Alexandre Julliard 29 Nov '07

29 Nov '07

Module: wine Branch: master Commit: 7925ef35cd78c3668b319e2bbfcbb87558f24b43 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7925ef35cd78c3668b319e2bb… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Nov 26 21:28:20 2007 +0100 wined3d: Avoid hardcoding GL_TEXTURE_2D. --- dlls/wined3d/surface.c | 102 +++++++++++++++++++++++++++++++----------------- 1 files changed, 66 insertions(+), 36 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7925ef35cd78c3668b319…

1 0

Rob Shearman : rpcrt4: Fix an integer overflow in NdrConformantStructMarshall and NdrConformantStructUnmarshall .
by Alexandre Julliard 29 Nov '07

29 Nov '07

Module: wine Branch: master Commit: 8668369b4f27dba9011493d8e8d40e4851743394 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8668369b4f27dba9011493d8e… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Nov 28 15:02:39 2007 +0000 rpcrt4: Fix an integer overflow in NdrConformantStructMarshall and NdrConformantStructUnmarshall. --- dlls/rpcrt4/ndr_marshall.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index cbb766d..35028b4 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -3399,6 +3399,12 @@ unsigned char * WINAPI NdrConformantStructMarshall(PMIDL_STUB_MESSAGE pStubMsg, TRACE("memory_size = %d\n", pCStructFormat->memory_size); bufsize = safe_multiply(esize, pStubMsg->MaxCount); + if (pCStructFormat->memory_size + bufsize < pCStructFormat->memory_size) /* integer overflow */ + { + ERR("integer overflow of memory_size %u with bufsize %u\n", + pCStructFormat->memory_size, bufsize); + RpcRaiseException(RPC_X_BAD_STUB_DATA); + } /* copy constant sized part of struct */ pStubMsg->BufferMark = pStubMsg->Buffer; safe_copy_to_buffer(pStubMsg, pMemory, pCStructFormat->memory_size + bufsize); @@ -3447,6 +3453,12 @@ unsigned char * WINAPI NdrConformantStructUnmarshall(PMIDL_STUB_MESSAGE pStubMs TRACE("memory_size = %d\n", pCStructFormat->memory_size); bufsize = safe_multiply(esize, pStubMsg->MaxCount); + if (pCStructFormat->memory_size + bufsize < pCStructFormat->memory_size) /* integer overflow */ + { + ERR("integer overflow of memory_size %u with bufsize %u\n", + pCStructFormat->memory_size, bufsize); + RpcRaiseException(RPC_X_BAD_STUB_DATA); + } /* work out how much memory to allocate if we need to do so */ if (!*ppMemory || fMustAlloc) {

1 0