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

H. Verbeet : wined3d: Properly load FLOAT16_2 and FLOAT16_4 vertex data.
by Alexandre Julliard Aug. 2, 2007

Aug. 2, 2007

Module: wine Branch: master Commit: 82245cb5d716f11fcfe25a3b4e2440dab0e5c30a URL: http://source.winehq.org/git/wine.git/?a=commit;h=82245cb5d716f11fcfe25a3b4… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Wed Aug 1 22:48:54 2007 +0200 wined3d: Properly load FLOAT16_2 and FLOAT16_4 vertex data. --- dlls/wined3d/drawprim.c | 12 ++++++++++-- dlls/wined3d/wined3d_private.h | 7 +++++-- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index f440089..647e9b2 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -818,10 +818,18 @@ static inline void drawStridedInstanced(IWineD3DDevice *iface, WineDirect3DVerte /* Are those 16 bit floats. C doesn't have a 16 bit float type. I could read the single bits and calculate a 4 * byte float according to the IEEE standard */ - FIXME("Unsupported WINED3DDECLTYPE_FLOAT16_2\n"); + if (GL_SUPPORT(NV_HALF_FLOAT)) { + GL_EXTCALL(glVertexAttrib2hvNV(instancedData[j], (GLhalfNV *)ptr)); + } else { + FIXME("Unsupported WINED3DDECLTYPE_FLOAT16_2\n"); + } break; case WINED3DDECLTYPE_FLOAT16_4: - FIXME("Unsupported WINED3DDECLTYPE_FLOAT16_4\n"); + if (GL_SUPPORT(NV_HALF_FLOAT)) { + GL_EXTCALL(glVertexAttrib4hvNV(instancedData[j], (GLhalfNV *)ptr)); + } else { + FIXME("Unsupported WINED3DDECLTYPE_FLOAT16_4\n"); + } break; case WINED3DDECLTYPE_UNUSED: diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 18528b8..22c18ca 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -139,8 +139,11 @@ static WINED3DGLTYPE const glTypeLookup[WINED3DDECLTYPE_UNUSED] = { {WINED3DDECLTYPE_USHORT4N, 4, GL_UNSIGNED_SHORT , GL_TRUE ,sizeof(short int)}, {WINED3DDECLTYPE_UDEC3, 3, GL_UNSIGNED_SHORT , GL_FALSE ,sizeof(short int)}, {WINED3DDECLTYPE_DEC3N, 3, GL_SHORT , GL_TRUE ,sizeof(short int)}, - {WINED3DDECLTYPE_FLOAT16_2, 2, GL_FLOAT , GL_FALSE ,sizeof(short int)}, - {WINED3DDECLTYPE_FLOAT16_4, 4, GL_FLOAT , GL_FALSE ,sizeof(short int)}}; + /* We should do an extension check for NV_HALF_FLOAT. However, without NV_HALF_FLOAT + * we won't be able to load the data at all, so at least for the moment it wouldn't + * gain us much. */ + {WINED3DDECLTYPE_FLOAT16_2, 2, GL_HALF_FLOAT_NV , GL_FALSE ,sizeof(GLhalfNV)}, + {WINED3DDECLTYPE_FLOAT16_4, 4, GL_HALF_FLOAT_NV , GL_FALSE ,sizeof(GLhalfNV)}}; #define WINED3D_ATR_TYPE(type) glTypeLookup[type].d3dType #define WINED3D_ATR_SIZE(type) glTypeLookup[type].size

1 0

H. Verbeet : wined3d: Add definitions and detection for GL_NV_half_float.
by Alexandre Julliard Aug. 2, 2007

Aug. 2, 2007

Module: wine Branch: master Commit: f11ca610ba1e1c4d75eda7073dba28af50a03ada URL: http://source.winehq.org/git/wine.git/?a=commit;h=f11ca610ba1e1c4d75eda7073… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Wed Aug 1 22:48:49 2007 +0200 wined3d: Add definitions and detection for GL_NV_half_float. --- dlls/wined3d/directx.c | 1 + include/wine/wined3d_gl.h | 102 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 103 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 8914724..d4a905a 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -100,6 +100,7 @@ static const struct { {"GL_EXT_vertex_weighting", EXT_VERTEX_WEIGHTING}, /* NV */ + {"GL_NV_half_float", NV_HALF_FLOAT}, {"GL_NV_fence", NV_FENCE}, {"GL_NV_fog_distance", NV_FOG_DISTANCE}, {"GL_NV_fragment_program", NV_FRAGMENT_PROGRAM}, diff --git a/include/wine/wined3d_gl.h b/include/wine/wined3d_gl.h index e8ec3bc..ed257ce 100644 --- a/include/wine/wined3d_gl.h +++ b/include/wine/wined3d_gl.h @@ -986,6 +986,60 @@ typedef void (APIENTRY * PGLFNGETCOMPRESSEDTEXIMAGEPROC) (GLenum target, GLint l #define GL_VERTEX_WEIGHT_ARRAY_STRIDE_EXT 0x850F #define GL_VERTEX_WEIGHT_ARRAY_POINTER_EXT 0x8510 #endif + +/* GL_NV_half_float */ +#ifndef GL_NV_half_float +#define GL_NV_half_float 1 +typedef unsigned short GLhalfNV; +#define GL_HALF_FLOAT_NV 0x140B +#endif +typedef void (APIENTRY * PGLFNVERTEX2HNVPROC) (GLhalfNV x, GLhalfNV y); +typedef void (APIENTRY * PGLFNVERTEX2HVNVPROC) (const GLhalfNV *v); +typedef void (APIENTRY * PGLFNVERTEX3HNVPROC) (GLhalfNV x, GLhalfNV y, GLhalfNV z); +typedef void (APIENTRY * PGLFNVERTEX3HVNVPROC) (const GLhalfNV *v); +typedef void (APIENTRY * PGLFNVERTEX4HNVPROC) (GLhalfNV x, GLhalfNV y, GLhalfNV z, GLhalfNV w); +typedef void (APIENTRY * PGLFNVERTEX4HVNVPROC) (const GLhalfNV *v); +typedef void (APIENTRY * PGLFNNORMAL3HNVPROC) (GLhalfNV nx, GLhalfNV ny, GLhalfNV nz); +typedef void (APIENTRY * PGLFNNORMAL3HVNVPROC) (const GLhalfNV *v); +typedef void (APIENTRY * PGLFNCOLOR3HNVPROC) (GLhalfNV red, GLhalfNV green, GLhalfNV blue); +typedef void (APIENTRY * PGLFNCOLOR3HVNVPROC) (const GLhalfNV *v); +typedef void (APIENTRY * PGLFNCOLOR4HNVPROC) (GLhalfNV red, GLhalfNV green, GLhalfNV blue, GLhalfNV alpha); +typedef void (APIENTRY * PGLFNCOLOR4HVNVPROC) (const GLhalfNV *v); +typedef void (APIENTRY * PGLFNTEXCOORD1HNVPROC) (GLhalfNV s); +typedef void (APIENTRY * PGLFNTEXCOORD1HVNVPROC) (const GLhalfNV *v); +typedef void (APIENTRY * PGLFNTEXCOORD2HNVPROC) (GLhalfNV s, GLhalfNV t); +typedef void (APIENTRY * PGLFNTEXCOORD2HVNVPROC) (const GLhalfNV *v); +typedef void (APIENTRY * PGLFNTEXCOORD3HNVPROC) (GLhalfNV s, GLhalfNV t, GLhalfNV r); +typedef void (APIENTRY * PGLFNTEXCOORD3HVNVPROC) (const GLhalfNV *v); +typedef void (APIENTRY * PGLFNTEXCOORD4HNVPROC) (GLhalfNV s, GLhalfNV t, GLhalfNV r, GLhalfNV q); +typedef void (APIENTRY * PGLFNTEXCOORD4HVNVPROC) (const GLhalfNV *v); +typedef void (APIENTRY * PGLFNMULTITEXCOORD1HNVPROC) (GLenum target, GLhalfNV s); +typedef void (APIENTRY * PGLFNMULTITEXCOORD1HVNVPROC) (GLenum target, const GLhalfNV *v); +typedef void (APIENTRY * PGLFNMULTITEXCOORD2HNVPROC) (GLenum target, GLhalfNV s, GLhalfNV t); +typedef void (APIENTRY * PGLFNMULTITEXCOORD2HVNVPROC) (GLenum target, const GLhalfNV *v); +typedef void (APIENTRY * PGLFNMULTITEXCOORD3HNVPROC) (GLenum target, GLhalfNV s, GLhalfNV t, GLhalfNV r); +typedef void (APIENTRY * PGLFNMULTITEXCOORD3HVNVPROC) (GLenum target, const GLhalfNV *v); +typedef void (APIENTRY * PGLFNMULTITEXCOORD4HNVPROC) (GLenum target, GLhalfNV s, GLhalfNV t, GLhalfNV r, GLhalfNV q); +typedef void (APIENTRY * PGLFNMULTITEXCOORD4HVNVPROC) (GLenum target, const GLhalfNV *v); +typedef void (APIENTRY * PGLFNFOGCOORDHNVPROC) (GLhalfNV fog); +typedef void (APIENTRY * PGLFNFOGCOORDHVNVPROC) (const GLhalfNV *fog); +typedef void (APIENTRY * PGLFNSECONDARYCOLOR3HNVPROC) (GLhalfNV red, GLhalfNV green, GLhalfNV blue); +typedef void (APIENTRY * PGLFNSECONDARYCOLOR3HVNVPROC) (const GLhalfNV *v); +typedef void (APIENTRY * PGLFNVERTEXWEIGHTHNVPROC) (GLhalfNV weight); +typedef void (APIENTRY * PGLFNVERTEXWEIGHTHVNVPROC) (const GLhalfNV *weight); +typedef void (APIENTRY * PGLFNVERTEXATTRIB1HNVPROC) (GLuint index, GLhalfNV x); +typedef void (APIENTRY * PGLFNVERTEXATTRIB1HVNVPROC) (GLuint index, const GLhalfNV *v); +typedef void (APIENTRY * PGLFNVERTEXATTRIB2HNVPROC) (GLuint index, GLhalfNV x, GLhalfNV y); +typedef void (APIENTRY * PGLFNVERTEXATTRIB2HVNVPROC) (GLuint index, const GLhalfNV *v); +typedef void (APIENTRY * PGLFNVERTEXATTRIB3HNVPROC) (GLuint index, GLhalfNV x, GLhalfNV y, GLhalfNV z); +typedef void (APIENTRY * PGLFNVERTEXATTRIB3HVNVPROC) (GLuint index, const GLhalfNV *v); +typedef void (APIENTRY * PGLFNVERTEXATTRIB4HNVPROC) (GLuint index, GLhalfNV x, GLhalfNV y, GLhalfNV z, GLhalfNV w); +typedef void (APIENTRY * PGLFNVERTEXATTRIB4HVNVPROC) (GLuint index, const GLhalfNV *v); +typedef void (APIENTRY * PGLFNVERTEXATTRIBS1HVNVPROC) (GLuint index, GLsizei n, const GLhalfNV *v); +typedef void (APIENTRY * PGLFNVERTEXATTRIBS2HVNVPROC) (GLuint index, GLsizei n, const GLhalfNV *v); +typedef void (APIENTRY * PGLFNVERTEXATTRIBS3HVNVPROC) (GLuint index, GLsizei n, const GLhalfNV *v); +typedef void (APIENTRY * PGLFNVERTEXATTRIBS4HVNVPROC) (GLuint index, GLsizei n, const GLhalfNV *v); + /* GL_NV_fog_distance */ #ifndef GL_NV_fog_distance #define GL_NV_fog_distance 1 @@ -1675,6 +1729,7 @@ typedef enum _GL_SupportedExt { EXT_TEXTURE_SRGB, EXT_VERTEX_WEIGHTING, /* NVIDIA */ + NV_HALF_FLOAT, NV_FOG_DISTANCE, NV_FRAGMENT_PROGRAM, NV_FRAGMENT_PROGRAM2, @@ -1898,6 +1953,53 @@ typedef enum _GL_SupportedExt { /* GL_ATI_separate_stencil */ \ USE_GL_FUNC(PGLFNSTENCILOPSEPARATEATIPROC, glStencilOpSeparateATI); \ USE_GL_FUNC(PGLFNSTENCILFUNCSEPARATEATIPROC, glStencilFuncSeparateATI); \ + /* GL_NV_half_float */ \ + USE_GL_FUNC(PGLFNVERTEX2HNVPROC, glVertex2hNV); \ + USE_GL_FUNC(PGLFNVERTEX2HVNVPROC, glVertex2hvNV); \ + USE_GL_FUNC(PGLFNVERTEX3HNVPROC, glVertex3hNV); \ + USE_GL_FUNC(PGLFNVERTEX3HVNVPROC, glVertex3hvNV); \ + USE_GL_FUNC(PGLFNVERTEX4HNVPROC, glVertex4hNV); \ + USE_GL_FUNC(PGLFNVERTEX4HVNVPROC, glVertex4hvNV); \ + USE_GL_FUNC(PGLFNNORMAL3HNVPROC, glNormal3hNV); \ + USE_GL_FUNC(PGLFNNORMAL3HVNVPROC, glNormal3hvNV); \ + USE_GL_FUNC(PGLFNCOLOR3HNVPROC, glColor3hNV); \ + USE_GL_FUNC(PGLFNCOLOR3HVNVPROC, glColor3hvNV); \ + USE_GL_FUNC(PGLFNCOLOR4HNVPROC, glColor4hNV); \ + USE_GL_FUNC(PGLFNCOLOR4HVNVPROC, glColor4hvNV); \ + USE_GL_FUNC(PGLFNTEXCOORD1HNVPROC, glTexCoord1hNV); \ + USE_GL_FUNC(PGLFNTEXCOORD1HVNVPROC, glTexCoord1hvNV); \ + USE_GL_FUNC(PGLFNTEXCOORD2HNVPROC, glTexCoord2hNV); \ + USE_GL_FUNC(PGLFNTEXCOORD2HVNVPROC, glTexCoord2hvNV); \ + USE_GL_FUNC(PGLFNTEXCOORD3HNVPROC, glTexCoord3hNV); \ + USE_GL_FUNC(PGLFNTEXCOORD3HVNVPROC, glTexCoord3hvNV); \ + USE_GL_FUNC(PGLFNTEXCOORD4HNVPROC, glTexCoord4hNV); \ + USE_GL_FUNC(PGLFNTEXCOORD4HVNVPROC, glTexCoord4hvNV); \ + USE_GL_FUNC(PGLFNMULTITEXCOORD1HNVPROC, glMultiTexCoord1hNV); \ + USE_GL_FUNC(PGLFNMULTITEXCOORD1HVNVPROC, glMultiTexCoord1hvNV); \ + USE_GL_FUNC(PGLFNMULTITEXCOORD2HNVPROC, glMultiTexCoord2hNV); \ + USE_GL_FUNC(PGLFNMULTITEXCOORD2HVNVPROC, glMultiTexCoord2hvNV); \ + USE_GL_FUNC(PGLFNMULTITEXCOORD3HNVPROC, glMultiTexCoord3hNV); \ + USE_GL_FUNC(PGLFNMULTITEXCOORD3HVNVPROC, glMultiTexCoord3hvNV); \ + USE_GL_FUNC(PGLFNMULTITEXCOORD4HNVPROC, glMultiTexCoord4hNV); \ + USE_GL_FUNC(PGLFNMULTITEXCOORD4HVNVPROC, glMultiTexCoord4hvNV); \ + USE_GL_FUNC(PGLFNFOGCOORDHNVPROC, glFogCoordhNV); \ + USE_GL_FUNC(PGLFNFOGCOORDHVNVPROC, glFogCoordhvNV); \ + USE_GL_FUNC(PGLFNSECONDARYCOLOR3HNVPROC, glSecondaryColor3hNV); \ + USE_GL_FUNC(PGLFNSECONDARYCOLOR3HVNVPROC, glSecondaryColor3hvNV); \ + USE_GL_FUNC(PGLFNVERTEXWEIGHTHNVPROC, glVertexWeighthNV); \ + USE_GL_FUNC(PGLFNVERTEXWEIGHTHVNVPROC, glVertexWeighthvNV); \ + USE_GL_FUNC(PGLFNVERTEXATTRIB1HNVPROC, glVertexAttrib1hNV); \ + USE_GL_FUNC(PGLFNVERTEXATTRIB1HVNVPROC, glVertexAttrib1hvNV); \ + USE_GL_FUNC(PGLFNVERTEXATTRIB2HNVPROC, glVertexAttrib2hNV); \ + USE_GL_FUNC(PGLFNVERTEXATTRIB2HVNVPROC, glVertexAttrib2hvNV); \ + USE_GL_FUNC(PGLFNVERTEXATTRIB3HNVPROC, glVertexAttrib3hNV); \ + USE_GL_FUNC(PGLFNVERTEXATTRIB3HVNVPROC, glVertexAttrib3hvNV); \ + USE_GL_FUNC(PGLFNVERTEXATTRIB4HNVPROC, glVertexAttrib4hNV); \ + USE_GL_FUNC(PGLFNVERTEXATTRIB4HVNVPROC, glVertexAttrib4hvNV); \ + USE_GL_FUNC(PGLFNVERTEXATTRIBS1HVNVPROC, glVertexAttribs1hvNV); \ + USE_GL_FUNC(PGLFNVERTEXATTRIBS2HVNVPROC, glVertexAttribs2hvNV); \ + USE_GL_FUNC(PGLFNVERTEXATTRIBS3HVNVPROC, glVertexAttribs3hvNV); \ + USE_GL_FUNC(PGLFNVERTEXATTRIBS4HVNVPROC, glVertexAttribs4hvNV); \ /* GL_NV_register_combiners */ \ USE_GL_FUNC(PGLFNCOMBINERINPUTNVPROC, glCombinerInputNV); \ USE_GL_FUNC(PGLFNCOMBINEROUTPUTNVPROC, glCombinerOutputNV); \

1 0

H. Verbeet : wined3d: Set SFLAG_INSYSMEM when WINED3DLOCK_DISCARD is passed to IWineD3DSurfaceImpl_LockRect .
by Alexandre Julliard Aug. 2, 2007

Aug. 2, 2007

Module: wine Branch: master Commit: cfb07e711476b6278fc2eb6d3af3365b5d43a9c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cfb07e711476b6278fc2eb6d3… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Wed Aug 1 22:48:42 2007 +0200 wined3d: Set SFLAG_INSYSMEM when WINED3DLOCK_DISCARD is passed to IWineD3DSurfaceImpl_LockRect. --- dlls/wined3d/surface.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 75a2d26..56ce845 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -763,8 +763,14 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_LockRect(IWineD3DSurface *iface, WINED } } - if((Flags & WINED3DLOCK_DISCARD) || (This->Flags & SFLAG_INSYSMEM)) { - TRACE("WINED3DLOCK_DISCARD flag passed, or local copy is up to date, not downloading data\n"); + if (Flags & WINED3DLOCK_DISCARD) { + /* Set SFLAG_INSYSMEM, so we'll never try to download the data from the texture. */ + TRACE("WINED3DLOCK_DISCARD flag passed, marking local copy as up to date\n"); + This->Flags |= SFLAG_INSYSMEM; + } + + if (This->Flags & SFLAG_INSYSMEM) { + TRACE("Local copy is up to date, not downloading data\n"); goto lock_end; }

1 0

Andrew Talbot : oleaut32: Constify some variables.
by Alexandre Julliard Aug. 2, 2007

Aug. 2, 2007

Module: wine Branch: master Commit: 582ae3f3c92898e2755d61fc9470bca37f385698 URL: http://source.winehq.org/git/wine.git/?a=commit;h=582ae3f3c92898e2755d61fc9… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Wed Aug 1 21:44:48 2007 +0100 oleaut32: Constify some variables. --- dlls/oleaut32/usrmarshal.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/oleaut32/usrmarshal.c b/dlls/oleaut32/usrmarshal.c index 67faf20..a6ef030 100644 --- a/dlls/oleaut32/usrmarshal.c +++ b/dlls/oleaut32/usrmarshal.c @@ -62,7 +62,7 @@ HRESULT OLEAUTPS_DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) &CLSID_PSDispatch, &PSFactoryBuffer); } -static void dump_user_flags(ULONG *pFlags) +static void dump_user_flags(const ULONG *pFlags) { if (HIWORD(*pFlags) == NDR_LOCAL_DATA_REPRESENTATION) TRACE("MAKELONG(NDR_LOCAL_REPRESENTATION, "); @@ -220,7 +220,7 @@ typedef struct DWORD switch_is; } variant_wire_t; -static unsigned int get_type_size(ULONG *pFlags, VARIANT *pvar) +static unsigned int get_type_size(ULONG *pFlags, const VARIANT *pvar) { if (V_VT(pvar) & VT_ARRAY) return 4; @@ -277,7 +277,7 @@ static unsigned int get_type_alignment(ULONG *pFlags, VARIANT *pvar) return 7; } -static unsigned interface_variant_size(ULONG *pFlags, REFIID riid, IUnknown *punk) +static unsigned interface_variant_size(const ULONG *pFlags, REFIID riid, IUnknown *punk) { ULONG size; HRESULT hr; @@ -382,7 +382,8 @@ static unsigned char* interface_variant_marshal(ULONG *pFlags, unsigned char *Bu } /* helper: called for VT_DISPATCH / VT_UNKNOWN variants to unmarshal the buffer. returns Buffer on failure, new position otherwise */ -static unsigned char *interface_variant_unmarshal(ULONG *pFlags, unsigned char *Buffer, REFIID riid, IUnknown **ppunk) +static unsigned char *interface_variant_unmarshal(const ULONG *pFlags, unsigned char *Buffer, + REFIID riid, IUnknown **ppunk) { IStream *working; HGLOBAL working_mem;

1 0

Erik Inge Bolsø : dinput: Fix joystick axis remapping.
by Alexandre Julliard Aug. 2, 2007

Aug. 2, 2007

Module: wine Branch: master Commit: 176c567cb353b0608d6dd88f5eb28a3cede7ea7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=176c567cb353b0608d6dd88f5… Author: Erik Inge Bolsø <knan-wine(a)anduin.net> Date: Wed Aug 1 22:19:45 2007 +0200 dinput: Fix joystick axis remapping. --- dlls/dinput/joystick_linux.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dinput/joystick_linux.c b/dlls/dinput/joystick_linux.c index 9bd423b..67cc493 100644 --- a/dlls/dinput/joystick_linux.c +++ b/dlls/dinput/joystick_linux.c @@ -763,7 +763,7 @@ static void joy_polldev(JoystickImpl *This) { if (number < 12) { - inst_id = DIDFT_MAKEINSTANCE(jse.number) | (number < 8 ? DIDFT_ABSAXIS : DIDFT_POV); + inst_id = DIDFT_MAKEINSTANCE(number) | (number < 8 ? DIDFT_ABSAXIS : DIDFT_POV); value = map_axis(This, jse.value, number); /* FIXME do deadzone and saturation here */

1 0

Jacek Caban : mshtml: Release typelib in PROCESS_DETACH.
by Alexandre Julliard Aug. 2, 2007

Aug. 2, 2007

Module: wine Branch: master Commit: a39dec21e2f04c41b5ed5e671136245a367eff44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a39dec21e2f04c41b5ed5e671… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 1 20:10:27 2007 +0200 mshtml: Release typelib in PROCESS_DETACH. --- dlls/mshtml/main.c | 32 +++++++++++++++++++------------- 1 files changed, 19 insertions(+), 13 deletions(-) diff --git a/dlls/mshtml/main.c b/dlls/mshtml/main.c index 41f32eb..9a2a4f0 100644 --- a/dlls/mshtml/main.c +++ b/dlls/mshtml/main.c @@ -86,6 +86,20 @@ static void thread_detach(void) { thread_data_t *thread_data; + thread_data = get_thread_data(FALSE); + if(!thread_data) + return; + + if(thread_data->thread_hwnd) + DestroyWindow(thread_data->thread_hwnd); + + mshtml_free(thread_data); +} + +static void process_detach(void) +{ + close_gecko(); + if(typelib) { unsigned i; @@ -96,14 +110,10 @@ static void thread_detach(void) ITypeLib_Release(typelib); } - thread_data = get_thread_data(FALSE); - if(!thread_data) - return; - - if(thread_data->thread_hwnd) - DestroyWindow(thread_data->thread_hwnd); - - mshtml_free(thread_data); + if(shdoclc) + FreeLibrary(shdoclc); + if(mshtml_tls) + TlsFree(mshtml_tls); } HINSTANCE get_shdoclc(void) @@ -124,11 +134,7 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) hInst = hInstDLL; break; case DLL_PROCESS_DETACH: - close_gecko(); - if(shdoclc) - FreeLibrary(shdoclc); - if(mshtml_tls) - TlsFree(mshtml_tls); + process_detach(); break; case DLL_THREAD_DETACH: thread_detach();

1 0

Jacek Caban : shdocvw: Wrong PostData VT is not an error.
by Alexandre Julliard Aug. 2, 2007

Aug. 2, 2007

Module: wine Branch: master Commit: b2395e4907b3df18ec7bc11ced5b054664cedabe URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2395e4907b3df18ec7bc11ce… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 1 20:09:19 2007 +0200 shdocvw: Wrong PostData VT is not an error. --- dlls/shdocvw/navigate.c | 14 ++++++-------- 1 files changed, 6 insertions(+), 8 deletions(-) diff --git a/dlls/shdocvw/navigate.c b/dlls/shdocvw/navigate.c index 161c138..4c1ccdb 100644 --- a/dlls/shdocvw/navigate.c +++ b/dlls/shdocvw/navigate.c @@ -528,15 +528,13 @@ HRESULT navigate_url(DocHost *This, BSTR url, VARIANT *Flags, VARIANT *TargetFra || (TargetFrameName && V_VT(TargetFrameName) != VT_EMPTY)) FIXME("Unsupported arguments\n"); - if(PostData && V_VT(PostData) != VT_EMPTY && V_VT(PostData) != VT_ERROR) { - if(V_VT(PostData) != (VT_ARRAY | VT_UI1) - || V_ARRAY(PostData)->cDims != 1) { - WARN("Invalid PostData\n"); - return E_INVALIDARG; - } + if(PostData) { + TRACE("PostData vt=%d\n", V_VT(PostData)); - SafeArrayAccessData(V_ARRAY(PostData), (void**)&post_data); - post_data_len = V_ARRAY(PostData)->rgsabound[0].cElements; + if(V_VT(PostData) == (VT_ARRAY | VT_UI1)) { + SafeArrayAccessData(V_ARRAY(PostData), (void**)&post_data); + post_data_len = V_ARRAY(PostData)->rgsabound[0].cElements; + } } if(Headers && V_VT(Headers) != VT_EMPTY && V_VT(Headers) != VT_ERROR) {

1 0

Roderick Colenbrander : wgl: Print more debug info.
by Alexandre Julliard Aug. 2, 2007

Aug. 2, 2007

Module: wine Branch: master Commit: 5717dede776c0c0cfae6041dbbc99d623d70ea27 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5717dede776c0c0cfae6041db… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Wed Aug 1 16:22:54 2007 +0200 wgl: Print more debug info. --- dlls/winex11.drv/opengl.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index b3cbeef..61a521d 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -327,9 +327,12 @@ static BOOL X11DRV_WineGL_InitOpenglInfo(void) WineGLInfo.glxDirect = pglXIsDirect(gdi_display, ctx); TRACE("GL version : %s.\n", WineGLInfo.glVersion); + TRACE("GL renderer : %s.\n", pglGetString(GL_RENDERER)); TRACE("GLX version : %d.%d.\n", WineGLInfo.glxVersion[0], WineGLInfo.glxVersion[1]); TRACE("Server GLX version : %s.\n", WineGLInfo.glxServerVersion); + TRACE("Server GLX vendor: : %s.\n", pglXQueryServerString(gdi_display, screen, GLX_VENDOR)); TRACE("Client GLX version : %s.\n", WineGLInfo.glxClientVersion); + TRACE("Client GLX vendor: : %s.\n", pglXGetClientString(gdi_display, GLX_VENDOR)); TRACE("Direct rendering enabled: %s\n", WineGLInfo.glxDirect ? "True" : "False"); if(vis) XFree(vis);

1 0

Roderick Colenbrander : wgl: Support WGL_FLOAT_COMPONENTS_NV in wglGetPixelFormatAttrib*.
by Alexandre Julliard Aug. 2, 2007

Aug. 2, 2007

Module: wine Branch: master Commit: b25b287e6c03f939ea9205e9e07900ba5f5dc493 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b25b287e6c03f939ea9205e9e… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Wed Aug 1 22:15:10 2007 +0200 wgl: Support WGL_FLOAT_COMPONENTS_NV in wglGetPixelFormatAttrib*. --- dlls/winex11.drv/opengl.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 61a521d..5bda906 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -2679,6 +2679,10 @@ static GLboolean WINAPI X11DRV_wglGetPixelFormatAttribivARB(HDC hdc, int iPixelF curGLXAttr = GLX_SAMPLES_ARB; break; + case WGL_FLOAT_COMPONENTS_NV: + curGLXAttr = GLX_FLOAT_COMPONENTS_NV; + break; + default: FIXME("unsupported %x WGL Attribute\n", curWGLAttr); }

1 0

Roderick Colenbrander : wgl: SetPixelFormat should fail on the root window.
by Alexandre Julliard Aug. 2, 2007

Aug. 2, 2007

Module: wine Branch: master Commit: 323d9e428c02aa2f3ae5b637ae1f16fad27e431c URL: http://source.winehq.org/git/wine.git/?a=commit;h=323d9e428c02aa2f3ae5b637a… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Wed Aug 1 15:58:51 2007 +0200 wgl: SetPixelFormat should fail on the root window. --- dlls/opengl32/tests/opengl.c | 39 +++++++++++++++++++++++++++++++++++++++ dlls/winex11.drv/opengl.c | 7 +++++++ 2 files changed, 46 insertions(+), 0 deletions(-) diff --git a/dlls/opengl32/tests/opengl.c b/dlls/opengl32/tests/opengl.c index ca2710c..17ca54a 100644 --- a/dlls/opengl32/tests/opengl.c +++ b/dlls/opengl32/tests/opengl.c @@ -151,6 +151,43 @@ static void test_pbuffers(HDC hdc) else skip("Pbuffer test for offscreen pixelformat skipped as no offscreen-only format with pbuffer capabilities has been found\n"); } +static void test_setpixelformat(void) +{ + int res = 0; + int pf; + PIXELFORMATDESCRIPTOR pfd = { + sizeof(PIXELFORMATDESCRIPTOR), + 1, /* version */ + PFD_DRAW_TO_WINDOW | + PFD_SUPPORT_OPENGL | + PFD_DOUBLEBUFFER, + PFD_TYPE_RGBA, + 24, /* 24-bit color depth */ + 0, 0, 0, 0, 0, 0, /* color bits */ + 0, /* alpha buffer */ + 0, /* shift bit */ + 0, /* accumulation buffer */ + 0, 0, 0, 0, /* accum bits */ + 32, /* z-buffer */ + 0, /* stencil buffer */ + 0, /* auxiliary buffer */ + PFD_MAIN_PLANE, /* main layer */ + 0, /* reserved */ + 0, 0, 0 /* layer masks */ + }; + + HDC hdc = GetDC(0); + ok(hdc != 0, "GetDC(0) failed!\n"); + + /* This should pass even on the main device context */ + pf = ChoosePixelFormat(hdc, &pfd); + ok(pf != 0, "ChoosePixelFormat failed on main device context"); + + /* SetPixelFormat on the main device context 'X root window' should fail */ + res = SetPixelFormat(hdc, pf, &pfd); + ok(res == 0, "SetPixelFormat on main device context should fail\n"); +} + START_TEST(opengl) { HWND hwnd; @@ -198,6 +235,8 @@ START_TEST(opengl) ok(res, "wglMakeCurrent failed!\n"); init_functions(); + test_setpixelformat(); + wgl_extensions = pwglGetExtensionsStringARB(hdc); if(wgl_extensions == NULL) skip("Skipping opengl32 tests because this OpenGL implementation doesn't support WGL extensions!\n"); diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 265e67f..b3cbeef 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -1298,6 +1298,13 @@ BOOL X11DRV_SetPixelFormat(X11DRV_PDEVICE *physDev, return 0; } + /* SetPixelFormat is not allowed on the X root_window e.g. GetDC(0) */ + if(get_glxdrawable(physDev) == root_window) + { + ERR("Invalid operation on root_window\n"); + return 0; + } + /* Check if iPixelFormat is in our list of supported formats to see if it is supported. */ fmt = ConvertPixelFormatWGLtoGLX(gdi_display, iPixelFormat, FALSE /* Offscreen */, &value); if(!fmt) {

1 0