wine-commits June 2012

wine-commits@winehq.org

3 participants
827 discussions

Michael Stefaniuc : include: Undef INTERFACE right after it is used.
by Alexandre Julliard 11 Jun '12

11 Jun '12

Module: wine Branch: master Commit: b17169caa06e70097f824994feeff3f41b3cd409 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b17169caa06e70097f824994f… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sat Jun 9 01:17:00 2012 +0200 include: Undef INTERFACE right after it is used. --- include/aclui.h | 9 +++++---- include/amaudio.h | 1 + include/d3dx9effect.h | 8 ++++---- include/d3dx9mesh.h | 5 ++--- include/d3dx9shader.h | 3 ++- include/textserv.h | 6 ++---- 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/include/aclui.h b/include/aclui.h index 68c6b2a..c64b2f2 100644 --- a/include/aclui.h +++ b/include/aclui.h @@ -127,9 +127,9 @@ DECLARE_INTERFACE_IID_(ISecurityInformation, IUnknown, "965fc360-16ff-11d0-91cb- ULONG *pcInheritTypes ) PURE; STDMETHOD(PropertySheetPageCallback)(THIS_ HWND hwnd, UINT uMsg, SI_PAGE_TYPE uPage ) PURE; }; +#undef INTERFACE typedef ISecurityInformation *LPSECURITYINFO; -#undef INTERFACE #define INTERFACE ISecurityInformation2 DECLARE_INTERFACE_IID_(ISecurityInformation2, IUnknown, "c3ccfdb4-6f88-11d2-a3ce-00c04fb1782a") { @@ -142,6 +142,7 @@ DECLARE_INTERFACE_IID_(ISecurityInformation2, IUnknown, "c3ccfdb4-6f88-11d2-a3ce STDMETHOD_(BOOL,IsDaclCanonical) (THIS_ PACL pDacl) PURE; STDMETHOD(LookupSids) (THIS_ ULONG cSids, PSID *rgpSids, LPDATAOBJECT *ppdo) PURE; }; +#undef INTERFACE typedef ISecurityInformation2 *LPSECURITYINFO2; #define CFSTR_ACLUI_SID_INFO_LIST TEXT("CFSTR_ACLUI_SID_INFO_LIST") @@ -161,7 +162,6 @@ typedef struct _SID_INFO_LIST } SID_INFO_LIST, *PSID_INFO_LIST; -#undef INTERFACE #define INTERFACE IEffectivePermission DECLARE_INTERFACE_IID_(IEffectivePermission, IUnknown, "3853dc76-9f35-407c-88a1-d19344365fbc") { @@ -181,9 +181,9 @@ DECLARE_INTERFACE_IID_(IEffectivePermission, IUnknown, "3853dc76-9f35-407c-88a1- PACCESS_MASK *ppGrantedAccessList, ULONG *pcGrantedAccessListLength) PURE; }; +#undef INTERFACE typedef IEffectivePermission *LPEFFECTIVEPERMISSION; -#undef INTERFACE #define INTERFACE ISecurityObjectTypeInfo DECLARE_INTERFACE_IID_(ISecurityObjectTypeInfo, IUnknown, "fc3066eb-79ef-444b-9111-d18a75ebf2fa") { @@ -202,10 +202,10 @@ DECLARE_INTERFACE_IID_(ISecurityObjectTypeInfo, IUnknown, "fc3066eb-79ef-444b-91 #endif ) PURE; }; +#undef INTERFACE typedef ISecurityObjectTypeInfo *LPSecurityObjectTypeInfo; -#undef INTERFACE #define INTERFACE ISecurityInformation3 DECLARE_INTERFACE_IID_(ISecurityInformation3, IUnknown, "e2cdc9cc-31bd-4f8f-8c8b-b641af516a1a") { @@ -218,6 +218,7 @@ DECLARE_INTERFACE_IID_(ISecurityInformation3, IUnknown, "e2cdc9cc-31bd-4f8f-8c8b STDMETHOD(GetFullResourceName) (THIS_ LPWSTR *ppszResourceName) PURE; STDMETHOD(OpenElevatedEditor) (THIS_ HWND hWnd, SI_PAGE_TYPE uPage) PURE; }; +#undef INTERFACE typedef ISecurityInformation3 *LPSECURITYINFO3; DEFINE_GUID(IID_ISecurityInformation, 0x965fc360, 0x16ff, 0x11d0, 0x91, 0xcb, 0x0, 0xaa, 0x0, 0xbb, 0xb7, 0x23); diff --git a/include/amaudio.h b/include/amaudio.h index 8003eef..11bf5cb 100644 --- a/include/amaudio.h +++ b/include/amaudio.h @@ -42,5 +42,6 @@ DECLARE_INTERFACE_(IAMDirectSound,IUnknown) STDMETHOD(SetFocusWindow)(THIS_ HWND hwnd, BOOL bgsilent) PURE; STDMETHOD(GetFocusWindow)(THIS_ HWND hwnd) PURE; }; +#undef INTERFACE #endif diff --git a/include/d3dx9effect.h b/include/d3dx9effect.h index 035f4d6..cbeca64 100644 --- a/include/d3dx9effect.h +++ b/include/d3dx9effect.h @@ -84,12 +84,12 @@ DECLARE_INTERFACE_(ID3DXEffectPool, IUnknown) STDMETHOD_(ULONG, AddRef)(THIS) PURE; STDMETHOD_(ULONG, Release)(THIS) PURE; }; +#undef INTERFACE typedef struct ID3DXBaseEffect *LPD3DXBASEEFFECT; DEFINE_GUID(IID_ID3DXBaseEffect, 0x17c18ac, 0x103f, 0x4417, 0x8c, 0x51, 0x6b, 0xf6, 0xef, 0x1e, 0x56, 0xbe); -#undef INTERFACE #define INTERFACE ID3DXBaseEffect DECLARE_INTERFACE_(ID3DXBaseEffect, IUnknown) @@ -154,12 +154,12 @@ DECLARE_INTERFACE_(ID3DXBaseEffect, IUnknown) STDMETHOD(GetVertexShader)(THIS_ D3DXHANDLE parameter, LPDIRECT3DVERTEXSHADER9* vshader) PURE; STDMETHOD(SetArrayRange)(THIS_ D3DXHANDLE parameter, UINT start, UINT end) PURE; }; +#undef INTERFACE typedef struct ID3DXEffectStateManager *LPD3DXEFFECTSTATEMANAGER; DEFINE_GUID(IID_ID3DXEffectStateManager, 0x79aab587, 0x6dbc, 0x4fa7, 0x82, 0xde, 0x37, 0xfa, 0x17, 0x81, 0xc5, 0xce); -#undef INTERFACE #define INTERFACE ID3DXEffectStateManager DECLARE_INTERFACE_(ID3DXEffectStateManager, IUnknown) @@ -188,12 +188,12 @@ DECLARE_INTERFACE_(ID3DXEffectStateManager, IUnknown) STDMETHOD(SetPixelShaderConstantI)(THIS_ UINT register_index, CONST INT * constant_data, UINT register_count) PURE; STDMETHOD(SetPixelShaderConstantB)(THIS_ UINT register_index, CONST BOOL* constant_data, UINT register_count) PURE; }; +#undef INTERFACE typedef struct ID3DXEffect *LPD3DXEFFECT; DEFINE_GUID(IID_ID3DXEffect, 0xf6ceb4b3, 0x4e4c, 0x40dd, 0xb8, 0x83, 0x8d, 0x8d, 0xe5, 0xea, 0xc, 0xd5); -#undef INTERFACE #define INTERFACE ID3DXEffect DECLARE_INTERFACE_(ID3DXEffect, ID3DXBaseEffect) @@ -281,12 +281,12 @@ DECLARE_INTERFACE_(ID3DXEffect, ID3DXBaseEffect) STDMETHOD(CloneEffect)(THIS_ LPDIRECT3DDEVICE9 device, LPD3DXEFFECT* effect) PURE; STDMETHOD(SetRawValue)(THIS_ D3DXHANDLE parameter, LPCVOID data, UINT byte_offset, UINT bytes) PURE; }; +#undef INTERFACE typedef struct ID3DXEffectCompiler *LPD3DXEFFECTCOMPILER; DEFINE_GUID(IID_ID3DXEffectCompiler, 0x51b8a949, 0x1a31, 0x47e6, 0xbe, 0xa0, 0x4b, 0x30, 0xdb, 0x53, 0xf1, 0xe0); -#undef INTERFACE #define INTERFACE ID3DXEffectCompiler DECLARE_INTERFACE_(ID3DXEffectCompiler, ID3DXBaseEffect) diff --git a/include/d3dx9mesh.h b/include/d3dx9mesh.h index 220a5ff..975c34e 100644 --- a/include/d3dx9mesh.h +++ b/include/d3dx9mesh.h @@ -334,11 +334,9 @@ DECLARE_INTERFACE_(ID3DXBaseMesh, IUnknown) STDMETHOD(GenerateAdjacency)(THIS_ FLOAT epsilon, DWORD* adjacency) PURE; STDMETHOD(UpdateSemantics)(THIS_ D3DVERTEXELEMENT9 declaration[MAX_FVF_DECL_SIZE]) PURE; }; - - #undef INTERFACE -#define INTERFACE ID3DXMesh +#define INTERFACE ID3DXMesh DECLARE_INTERFACE_(ID3DXMesh, ID3DXBaseMesh) { /*** IUnknown methods ***/ @@ -676,6 +674,7 @@ DECLARE_INTERFACE_(ID3DXPRTEngine, IUnknown) STDMETHOD_(BOOL, ClosestRayIntersects)(THIS_ CONST D3DXVECTOR3 *ray_pos, CONST D3DXVECTOR3 *ray_dir, DWORD *face_index, FLOAT *u, FLOAT *v, FLOAT *dist) PURE; }; +#undef INTERFACE #ifdef __cplusplus extern "C" { diff --git a/include/d3dx9shader.h b/include/d3dx9shader.h index 3d6ce98..4de53dd 100644 --- a/include/d3dx9shader.h +++ b/include/d3dx9shader.h @@ -150,6 +150,7 @@ DECLARE_INTERFACE_(ID3DXConstantTable, ID3DXBuffer) STDMETHOD(SetMatrixTransposeArray)(THIS_ LPDIRECT3DDEVICE9 pDevice, D3DXHANDLE hConstant, CONST D3DXMATRIX* pMatrix, UINT Count) PURE; STDMETHOD(SetMatrixTransposePointerArray)(THIS_ LPDIRECT3DDEVICE9 pDevice, D3DXHANDLE hConstant, CONST D3DXMATRIX** ppMatrix, UINT Count) PURE; }; +#undef INTERFACE #if !defined(__cplusplus) || defined(CINTERFACE) /*** IUnknown methods ***/ @@ -234,7 +235,6 @@ typedef enum _D3DXINCLUDE_TYPE D3DXINC_FORCE_DWORD = 0x7fffffff, } D3DXINCLUDE_TYPE, *LPD3DXINCLUDE_TYPE; -#undef INTERFACE #define INTERFACE ID3DXInclude DECLARE_INTERFACE(ID3DXInclude) @@ -242,6 +242,7 @@ DECLARE_INTERFACE(ID3DXInclude) STDMETHOD(Open)(THIS_ D3DXINCLUDE_TYPE include_type, LPCSTR filename, LPCVOID parent_data, LPCVOID *data, UINT *bytes) PURE; STDMETHOD(Close)(THIS_ LPCVOID data) PURE; }; +#undef INTERFACE #define ID3DXInclude_Open(p,a,b,c,d,e) (p)->lpVtbl->Open(p,a,b,c,d,e) #define ID3DXInclude_Close(p,a) (p)->lpVtbl->Close(p,a) diff --git a/include/textserv.h b/include/textserv.h index 0d509a6..3efb879 100644 --- a/include/textserv.h +++ b/include/textserv.h @@ -140,6 +140,7 @@ DECLARE_INTERFACE_(ITextServices,IUnknown) DWORD* pdwHeight) PURE; }; +#undef INTERFACE #ifdef COBJMACROS /*** IUnknown methods ***/ @@ -148,8 +149,6 @@ DECLARE_INTERFACE_(ITextServices,IUnknown) #define ITextServices_Release(p) (p)->lpVtbl->Release(p) #endif -#undef INTERFACE - typedef enum _TXTBACKSTYLE { TXTBACK_TRANSPARENT = 0, TXTBACK_OPAQUE @@ -350,6 +349,7 @@ DECLARE_INTERFACE_(ITextHost,IUnknown) LONG* lSelBarWidth) PURE; }; +#undef INTERFACE #ifdef COBJMACROS /*** IUnknown methods ***/ @@ -358,8 +358,6 @@ DECLARE_INTERFACE_(ITextHost,IUnknown) #define ITextHost_Release(p) (p)->lpVtbl->Release(p) #endif -#undef INTERFACE - HRESULT WINAPI CreateTextServices(IUnknown*,ITextHost*,IUnknown**); typedef HRESULT (WINAPI *PCreateTextServices)(IUnknown*,ITextHost*,IUnknown**);

1 0

Michael Stefaniuc : include: Drop outdated comment about COM interface implementations.
by Alexandre Julliard 11 Jun '12

11 Jun '12

Module: wine Branch: master Commit: 4e959365484ebf3f0e1efb4bf9f55c22091e82a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e959365484ebf3f0e1efb4bf… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sat Jun 9 01:13:42 2012 +0200 include: Drop outdated comment about COM interface implementations. --- include/objbase.h | 43 +------------------------------------------ 1 files changed, 1 insertions(+), 42 deletions(-) diff --git a/include/objbase.h b/include/objbase.h index 52c6b56..c366a28 100644 --- a/include/objbase.h +++ b/include/objbase.h @@ -41,7 +41,7 @@ * virtual methods in C++ and a structure with a table of pointer to functions in C. * Unfortunately the layout of the virtual table is compiler specific, the layout of * g++ virtual tables is not the same as that of an egcs virtual table which is not the - * same as that generated by Visual C+. There are workarounds to make the virtual tables + * same as that generated by Visual C++. There are workarounds to make the virtual tables * compatible via padding but unfortunately the one which is imposed to the WINE emulator * by the Windows binaries, i.e. the Visual C++ one, is the most compact of all. * @@ -168,47 +168,6 @@ * - Of course in C++ we use inheritance so that we don't have to duplicate the method definitions. * - Finally there is no IDirect3D_Xxx macro. These are not needed in C++ unless the CINTERFACE * macro is defined in which case we would not be here. - * - * - * Implementing a COM interface. - * - * This continues the above example. This example assumes that the implementation is in C. - * - * typedef struct IDirect3DImpl { - * void* lpVtbl; - * // ... - * - * } IDirect3DImpl; - * - * static IDirect3DVtbl d3dvt; - * - * // implement the IDirect3D methods here - * - * int IDirect3D_QueryInterface(IDirect3D* me) - * { - * IDirect3DImpl *This = (IDirect3DImpl *)me; - * // ... - * } - * - * // ... - * - * static IDirect3DVtbl d3dvt = { - * IDirect3D_QueryInterface, - * IDirect3D_Add, - * IDirect3D_Add2, - * IDirect3D_Initialize, - * IDirect3D_SetWidth - * }; - * - * Comments: - * - We first define what the interface really contains. This is the IDirect3DImpl structure. The - * first field must of course be the virtual table pointer. Everything else is free. - * - Then we predeclare our static virtual table variable, we will need its address in some - * methods to initialize the virtual table pointer of the returned interface objects. - * - Then we implement the interface methods. To match what has been declared in the header file - * they must take a pointer to an IDirect3D structure and we must cast it to an IDirect3DImpl so - * that we can manipulate the fields. - * - Finally we initialize the virtual table. */ #if defined(__cplusplus) && !defined(CINTERFACE)

1 0

Christian Costa : d3drm: Implement IDirect3DRMMeshImpl_SetGroupColorRGB.
by Alexandre Julliard 11 Jun '12

11 Jun '12

Module: wine Branch: master Commit: f1cd213931c49b77e0f44085352b4e25ef0c2b42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1cd213931c49b77e0f440853… Author: Christian Costa <titan.costa(a)gmail.com> Date: Fri Jun 8 15:38:59 2012 +0200 d3drm: Implement IDirect3DRMMeshImpl_SetGroupColorRGB. --- dlls/d3drm/meshbuilder.c | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index c545e69..21cfc2f 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -2742,9 +2742,16 @@ static HRESULT WINAPI IDirect3DRMMeshImpl_SetGroupColorRGB(IDirect3DRMMesh* ifac { IDirect3DRMMeshImpl *This = impl_from_IDirect3DRMMesh(iface); - FIXME("(%p)->(%u,%f,%f,%f): stub\n", This, id, red, green, blue); + TRACE("(%p)->(%u,%f,%f,%f)\n", This, id, red, green, blue); - return E_NOTIMPL; + if (id >= This->nb_groups) + return D3DRMERR_BADVALUE; + + This->groups[id].color = D3DCOLOR_ARGB(0xff, (BYTE)(red * 255.0f), + (BYTE)(green * 255.0f), + (BYTE)(blue * 255.0f)); + + return D3DRM_OK; } static HRESULT WINAPI IDirect3DRMMeshImpl_SetGroupMapping(IDirect3DRMMesh* iface,

1 0

Christian Costa : d3drm: Free all mesh resources when releasing mesh object .
by Alexandre Julliard 11 Jun '12

11 Jun '12

Module: wine Branch: master Commit: 85f4fda840ff7a2bec3bf9112f76a60271d88be7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=85f4fda840ff7a2bec3bf9112… Author: Christian Costa <titan.costa(a)gmail.com> Date: Fri Jun 8 15:38:51 2012 +0200 d3drm: Free all mesh resources when releasing mesh object. --- dlls/d3drm/meshbuilder.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index 043f395..c545e69 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -2491,7 +2491,14 @@ static ULONG WINAPI IDirect3DRMMeshImpl_Release(IDirect3DRMMesh* iface) int i; for (i = 0; i < This->nb_groups; i++) + { HeapFree(GetProcessHeap(), 0, This->groups[i].vertices); + HeapFree(GetProcessHeap(), 0, This->groups[i].face_data); + if (This->groups[i].material) + IDirect3DRMMaterial2_Release(This->groups[i].material); + if (This->groups[i].texture) + IDirect3DRMTexture3_Release(This->groups[i].texture); + } HeapFree(GetProcessHeap(), 0, This->groups); HeapFree(GetProcessHeap(), 0, This); }

1 0

Christian Costa : d3drm: Free texture object when releasing mesh builder object.
by Alexandre Julliard 11 Jun '12

11 Jun '12

Module: wine Branch: master Commit: a77fd778c2f3ead593f6a9d692a8032e0cb17699 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a77fd778c2f3ead593f6a9d69… Author: Christian Costa <titan.costa(a)gmail.com> Date: Fri Jun 8 15:38:43 2012 +0200 d3drm: Free texture object when releasing mesh builder object. --- dlls/d3drm/meshbuilder.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index 56f53fd..043f395 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -367,6 +367,8 @@ static ULONG WINAPI IDirect3DRMMeshBuilder2Impl_Release(IDirect3DRMMeshBuilder2* { if (This->material) IDirect3DRMMaterial2_Release(This->material); + if (This->texture) + IDirect3DRMTexture3_Release(This->texture); HeapFree(GetProcessHeap(), 0, This->name); HeapFree(GetProcessHeap(), 0, This->pVertices); HeapFree(GetProcessHeap(), 0, This->pNormals);

1 0

Christian Costa : d3drm: Handle texture associated with the material when loading a mesh.
by Alexandre Julliard 11 Jun '12

11 Jun '12

Module: wine Branch: master Commit: 0023ddf1174af71701f66bd609119117d52d6869 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0023ddf1174af71701f66bd60… Author: Christian Costa <titan.costa(a)gmail.com> Date: Fri Jun 8 15:38:34 2012 +0200 d3drm: Handle texture associated with the material when loading a mesh. --- dlls/d3drm/meshbuilder.c | 57 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 57 insertions(+), 0 deletions(-) diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index 1bb84c5..56f53fd 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -1248,6 +1248,7 @@ HRESULT load_mesh_data(IDirect3DRMMeshBuilder3* iface, LPDIRECTXFILEDATA pData) LPDIRECTXFILEDATA data; LPDIRECTXFILEDATAREFERENCE reference; LPDIRECT3DRMMATERIAL2 material; + LPDIRECTXFILEOBJECT material_child; hr = IDirectXFileObject_QueryInterface(child, &IID_IDirectXFileData, (void **)&data); if (FAILED(hr)) @@ -1290,6 +1291,62 @@ HRESULT load_mesh_data(IDirect3DRMMeshBuilder3* iface, LPDIRECTXFILEDATA pData) This->material = material; + hr = IDirectXFileData_GetNextObject(data, &material_child); + if (hr == S_OK) + { + LPDIRECTXFILEDATA data; + LPDIRECT3DRMTEXTURE3 texture; + char** filename; + + hr = IDirectXFileObject_QueryInterface(material_child, &IID_IDirectXFileData, (void **)&data); + if (FAILED(hr)) + { + LPDIRECTXFILEDATAREFERENCE reference; + + hr = IDirectXFileObject_QueryInterface(material_child, &IID_IDirectXFileDataReference, (void **)&reference); + if (FAILED(hr)) + goto end; + + hr = IDirectXFileDataReference_Resolve(reference, &data); + IDirectXFileDataReference_Release(reference); + if (FAILED(hr)) + goto end; + } + + hr = IDirectXFileData_GetType(data, &pGuid); + if (hr != DXFILE_OK) + goto end; + if (!IsEqualGUID(pGuid, &TID_D3DRMTextureFilename)) + { + WARN("Not a texture filename\n"); + goto end; + } + + size = 4; + hr = IDirectXFileData_GetData(data, NULL, &size, (void**)&filename); + if (SUCCEEDED(hr)) + { + HANDLE file; + + file = CreateFileA(*filename, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL); + if (file != INVALID_HANDLE_VALUE) + { + hr = Direct3DRMTexture_create(&IID_IDirect3DRMTexture3, (LPUNKNOWN*)&texture); + if (FAILED(hr)) + { + IDirectXFileData_Release(data); + goto end; + } + This->texture = texture; + } + } + } + else if (hr != DXFILEERR_NOMOREOBJECTS) + { + goto end; + } + hr = S_OK; + IDirectXFileData_Release(data); i++; }

1 0

Christian Costa : d3drm: Fix vertex index test and print a warning when it is out of range.
by Alexandre Julliard 11 Jun '12

11 Jun '12

Module: wine Branch: master Commit: 422d57e7d210f599f60c42de87c6759ef48323b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=422d57e7d210f599f60c42de8… Author: Christian Costa <titan.costa(a)gmail.com> Date: Fri Jun 8 15:38:25 2012 +0200 d3drm: Fix vertex index test and print a warning when it is out of range. --- dlls/d3drm/meshbuilder.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index bdb5e00..1bb84c5 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -1366,8 +1366,11 @@ HRESULT load_mesh_data(IDirect3DRMMeshBuilder3* iface, LPDIRECTXFILEDATA pData) else { DWORD vertex_idx = *faces_vertex_idx_ptr; - if (vertex_idx > This->nb_vertices) + if (vertex_idx >= This->nb_vertices) + { + WARN("Found vertex index %u but only %u vertices available => use index 0\n", vertex_idx, This->nb_vertices); vertex_idx = 0; + } *(faces_data_ptr + faces_data_size++) = vertex_idx; /* Add face normal to vertex normal */ D3DRMVectorAdd(&This->pNormals[vertex_idx], &This->pNormals[vertex_idx], &face_normal);

1 0

Roderick Colenbrander : opengl32: Add wglGetProcAddress tests.
by Alexandre Julliard 11 Jun '12

11 Jun '12

Module: wine Branch: master Commit: e80d6199dc863b16dbd98aac691aca1119312093 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e80d6199dc863b16dbd98aac6… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Thu Jun 7 23:18:22 2012 -0700 opengl32: Add wglGetProcAddress tests. --- dlls/opengl32/tests/opengl.c | 64 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 64 insertions(+), 0 deletions(-) diff --git a/dlls/opengl32/tests/opengl.c b/dlls/opengl32/tests/opengl.c index a91dfb8..ffc676e 100644 --- a/dlls/opengl32/tests/opengl.c +++ b/dlls/opengl32/tests/opengl.c @@ -37,6 +37,7 @@ const unsigned char * WINAPI glGetString(unsigned int); #define GL_VENDOR 0x1F00 #define GL_RENDERER 0x1F01 #define GL_VERSION 0x1F02 +#define GL_EXTENSIONS 0x1F03 #define GL_VIEWPORT 0x0ba2 void WINAPI glGetIntegerv(GLenum pname, GLint *params); @@ -116,6 +117,33 @@ static void init_functions(void) #undef GET_PROC } +static BOOL gl_extension_supported(const char *extensions, const char *extension_string) +{ + size_t ext_str_len = strlen(extension_string); + + while (*extensions) + { + const char *start; + size_t len; + + while (isspace(*extensions)) + ++extensions; + start = extensions; + while (!isspace(*extensions) && *extensions) + ++extensions; + + len = extensions - start; + if (!len) + continue; + + if (len == ext_str_len && !memcmp(start, extension_string, ext_str_len)) + { + return TRUE; + } + } + return FALSE; +} + static void test_pbuffers(HDC hdc) { const int iAttribList[] = { WGL_DRAW_TO_PBUFFER_ARB, 1, /* Request pbuffer support */ @@ -738,6 +766,41 @@ static void test_deletecontext(HDC hdc) ok(hglrc == NULL, "A WGL context is active while none was expected\n"); } + +static void test_getprocaddress(HDC hdc) +{ + const char *extensions = (const char*)glGetString(GL_EXTENSIONS); + PROC func = NULL; + HGLRC ctx = wglGetCurrentContext(); + + if (!extensions) + { + skip("skipping wglGetProcAddress tests because no GL extensions supported\n"); + return; + } + + /* The goal of the test will be to test behavior of wglGetProcAddress when + * no WGL context is active. Before the test we pick an extension (GL_ARB_multitexture) + * which any GL >=1.2.1 implementation supports. Unfortunately the GDI renderer doesn't + * support it. There aren't any extensions we can use for this test which are supported by + * both GDI and real drivers. + * Note GDI only has GL_EXT_bgra, GL_EXT_paletted_texture and GL_WIN_swap_hint. + */ + if (!gl_extension_supported(extensions, "GL_ARB_multitexture")) + { + skip("skipping test because lack of GL_ARB_multitexture support\n"); + } + + func = wglGetProcAddress("glActiveTextureARB"); + ok(func != NULL, "Unable to lookup glActiveTextureARB, last error %#x\n", GetLastError()); + + /* Temporarily disable the context, so we can see that we can't retrieve functions now. */ + wglMakeCurrent(hdc, NULL); + func = wglGetProcAddress("glActiveTextureARB"); + todo_wine ok(func == NULL, "Function lookup without a context passed, expected a failure; last error %#x\n", GetLastError()); + wglMakeCurrent(hdc, ctx); +} + static void test_make_current_read(HDC hdc) { int res; @@ -1403,6 +1466,7 @@ START_TEST(opengl) return; } + test_getprocaddress(hdc); test_deletecontext(hdc); test_makecurrent(hdc); test_setpixelformat(hdc);

1 0

Roderick Colenbrander : opengl32: Sync with latest GL specs.
by Alexandre Julliard 11 Jun '12

11 Jun '12

Module: wine Branch: master Commit: 29346f28ae348bcf120422de63bec3dc2219a517 URL: http://source.winehq.org/git/wine.git/?a=commit;h=29346f28ae348bcf120422de6… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Thu Jun 7 23:18:21 2012 -0700 opengl32: Sync with latest GL specs. --- dlls/opengl32/make_opengl | 28 +- dlls/opengl32/opengl_ext.c | 976 +++++++++++++++++++++++++++++++++++++++++-- dlls/opengl32/opengl_norm.c | 10 +- 3 files changed, 959 insertions(+), 55 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=29346f28ae348bcf12042…

1 0

Jacek Caban : winegecko: Added 1.6 release.
by Alexandre Julliard 11 Jun '12

11 Jun '12

Module: tools Branch: master Commit: 8fec5172b9da27606e387b8cf19e0cf4aba3e4fa URL: http://source.winehq.org/git/tools.git/?a=commit;h=8fec5172b9da27606e387b8c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jun 11 15:23:56 2012 +0200 winegecko: Added 1.6 release. --- winegecko.php | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/winegecko.php b/winegecko.php index 619830b..20e7434 100644 --- a/winegecko.php +++ b/winegecko.php @@ -64,7 +64,9 @@ $aFileSizes = array( '1.4-x86'=>14732288, '1.4-x86_64'=>14980096, '1.5-x86'=>15950848, - '1.5-x86_64'=>16345088 + '1.5-x86_64'=>16345088, + '1.6-x86'=>16802816, + '1.6-x86_64'=>17251328 ); // Exact size of the file:

1 0

← Newer
1
...
61
62
63
64
65
66
67
...
83
Older →

Jump to page:

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-commits June 2012