Mailinglist Archive: opensuse-commit (1206 mails)

< Previous Next >
commit wine
  • From: root@xxxxxxx (h_root)
  • Date: Fri, 26 May 2006 16:15:19 +0200 (CEST)
  • Message-id: <20060526141519.6081A8F3F3@xxxxxxxxxxxxxxx>

Hello community,

here is the log from the commit of package wine
checked in at Fri May 26 16:15:19 CEST 2006.

--------
--- arch/i386/wine/wine.changes 2006-05-15 14:18:22.000000000 +0200
+++ wine/wine.changes 2006-05-25 21:55:34.000000000 +0200
@@ -1,0 +2,9 @@
+Thu May 25 21:55:12 CEST 2006 - meissner@xxxxxxx
+
+- Upstream 0.9.14
+ - Better MS/RPC compatibility.
+ - Many fixes to Direct3D shaders.
+ - Several improvements to the header control.
+ - Lots of bug fixes.
+
+-------------------------------------------------------------------

Old:
----
wine-0.9.13.diff
wine-0.9.13.tar.bz2

New:
----
wine-0.9.14.diff
wine-0.9.14.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ wine.spec ++++++
--- /var/tmp/diff_new_pack.WDb14D/_old 2006-05-26 16:15:05.000000000 +0200
+++ /var/tmp/diff_new_pack.WDb14D/_new 2006-05-26 16:15:05.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package wine (Version 0.9.13)
+# spec file for package wine (Version 0.9.14)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -15,7 +15,7 @@
License: LGPL, Other License(s), see package
Group: System/Emulators/PC
Autoreqprov: on
-Version: 0.9.13
+Version: 0.9.14
Release: 1
Summary: An MS Windows emulator
URL: http://www.winehq.com
@@ -106,6 +106,12 @@
/usr/share/aclocal/wine.m4

%changelog -n wine
+* Thu May 25 2006 - meissner@xxxxxxx
+- Upstream 0.9.14
+- Better MS/RPC compatibility.
+- Many fixes to Direct3D shaders.
+- Several improvements to the header control.
+- Lots of bug fixes.
* Mon May 15 2006 - meissner@xxxxxxx
- Upstream 0.9.13
- New GPhoto backend for TWAIN.



++++++ wine-0.9.13.diff -> wine-0.9.14.diff ++++++
--- arch/i386/wine/wine-0.9.13.diff 2006-05-15 13:20:39.000000000 +0200
+++ wine/wine-0.9.14.diff 2006-05-25 21:55:00.000000000 +0200
@@ -1,6 +1,6 @@
-diff -ruN -x CVS wine-0.9.13/dlls/gdi/freetype.c marcus-wine-0.9.13/dlls/gdi/freetype.c
---- wine-0.9.13/dlls/gdi/freetype.c 2006-05-11 20:01:00.000000000 +0200
-+++ marcus-wine-0.9.13/dlls/gdi/freetype.c 2006-05-06 16:26:35.000000000 +0200
+diff -ruN -x CVS wine-0.9.14/dlls/gdi/freetype.c marcus-wine-0.9.14/dlls/gdi/freetype.c
+--- wine-0.9.14/dlls/gdi/freetype.c 2006-05-24 17:18:54.000000000 +0200
++++ marcus-wine-0.9.14/dlls/gdi/freetype.c 2006-05-24 17:15:28.000000000 +0200
@@ -699,9 +699,17 @@
int i, bitmap_num, internal_leading;
FONTSIGNATURE fs;
@@ -19,9 +19,9 @@
TRACE("Loading font file %s index %ld\n", debugstr_a(file), face_index);
if((err = pFT_New_Face(library, file, face_index, &ft_face)) != 0) {
WARN("Unable to load font file %s err = %x\n", debugstr_a(file), err);
-diff -ruN -x CVS wine-0.9.13/dlls/opengl32/wgl.c marcus-wine-0.9.13/dlls/opengl32/wgl.c
---- wine-0.9.13/dlls/opengl32/wgl.c 2006-05-11 20:01:17.000000000 +0200
-+++ marcus-wine-0.9.13/dlls/opengl32/wgl.c 2006-05-11 19:57:42.000000000 +0200
+diff -ruN -x CVS wine-0.9.14/dlls/opengl32/wgl.c marcus-wine-0.9.14/dlls/opengl32/wgl.c
+--- wine-0.9.14/dlls/opengl32/wgl.c 2006-05-24 17:19:20.000000000 +0200
++++ marcus-wine-0.9.14/dlls/opengl32/wgl.c 2006-05-24 17:15:53.000000000 +0200
@@ -548,15 +548,29 @@
BOOL ret;
DWORD type = GetObjectType(hdc);
@@ -62,9 +62,9 @@
ret = glXMakeCurrent(ctx->display, drawable, ctx->ctx);
NtCurrentTeb()->glContext = ctx;
if(ret && type == OBJ_MEMDC)
-diff -ruN -x CVS wine-0.9.13/libs/wine/mmap.c marcus-wine-0.9.13/libs/wine/mmap.c
---- wine-0.9.13/libs/wine/mmap.c 2006-05-11 20:01:46.000000000 +0200
-+++ marcus-wine-0.9.13/libs/wine/mmap.c 2006-05-06 16:27:11.000000000 +0200
+diff -ruN -x CVS wine-0.9.14/libs/wine/mmap.c marcus-wine-0.9.14/libs/wine/mmap.c
+--- wine-0.9.14/libs/wine/mmap.c 2006-05-24 17:20:31.000000000 +0200
++++ marcus-wine-0.9.14/libs/wine/mmap.c 2006-05-24 17:16:45.000000000 +0200
@@ -313,6 +313,7 @@
}
}
@@ -81,9 +81,9 @@
#endif /* __i386__ */

/* reserve the DOS area if not already done */
-diff -ruN -x CVS wine-0.9.13/programs/winecfg/audio.c marcus-wine-0.9.13/programs/winecfg/audio.c
---- wine-0.9.13/programs/winecfg/audio.c 2006-05-11 20:01:51.000000000 +0200
-+++ marcus-wine-0.9.13/programs/winecfg/audio.c 2006-05-11 19:57:48.000000000 +0200
+diff -ruN -x CVS wine-0.9.14/programs/winecfg/audio.c marcus-wine-0.9.14/programs/winecfg/audio.c
+--- wine-0.9.14/programs/winecfg/audio.c 2006-05-24 17:20:50.000000000 +0200
++++ marcus-wine-0.9.14/programs/winecfg/audio.c 2006-05-24 17:16:52.000000000 +0200
@@ -591,7 +591,7 @@
buf = get_reg_key(config_key, "Drivers", "Audio", NULL);

@@ -117,9 +117,9 @@
break;
}
}
-diff -ruN -x CVS wine-0.9.13/server/registry.c marcus-wine-0.9.13/server/registry.c
---- wine-0.9.13/server/registry.c 2006-04-12 18:11:04.000000000 +0200
-+++ marcus-wine-0.9.13/server/registry.c 2006-04-07 14:00:07.000000000 +0200
+diff -ruN -x CVS wine-0.9.14/server/registry.c marcus-wine-0.9.14/server/registry.c
+--- wine-0.9.14/server/registry.c 2006-05-24 17:21:01.000000000 +0200
++++ marcus-wine-0.9.14/server/registry.c 2006-05-24 17:16:58.000000000 +0200
@@ -1623,7 +1623,7 @@
for (;;)
{
@@ -129,9 +129,9 @@
if (errno != EEXIST) goto done;
close( fd );
}
-diff -ruN -x CVS wine-0.9.13/tools/wineprefixcreate.in marcus-wine-0.9.13/tools/wineprefixcreate.in
---- wine-0.9.13/tools/wineprefixcreate.in 2006-03-23 11:29:23.000000000 +0100
-+++ marcus-wine-0.9.13/tools/wineprefixcreate.in 2006-03-23 11:26:24.000000000 +0100
+diff -ruN -x CVS wine-0.9.14/tools/wineprefixcreate.in marcus-wine-0.9.14/tools/wineprefixcreate.in
+--- wine-0.9.14/tools/wineprefixcreate.in 2006-05-24 17:21:03.000000000 +0200
++++ marcus-wine-0.9.14/tools/wineprefixcreate.in 2006-05-24 17:16:59.000000000 +0200
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
@@ -172,3 +172,136 @@
fi

CROOT="$WINEPREFIX/dosdevices/c:"
+--- a/include/wine/wined3d_gl.h
++++ b/include/wine/wined3d_gl.h
+@@ -606,6 +606,19 @@ typedef void (APIENTRY * PGLFNGETBUFFERP
+ #define GL_ARB_shader_objects 1
+ typedef char GLcharARB;
+ typedef unsigned int GLhandleARB;
++#define GL_OBJECT_DELETE_STATUS_ARB 0x8B80
++#define GL_OBJECT_COMPILE_STATUS_ARB 0x8B81
++#define GL_OBJECT_LINK_STATUS_ARB 0x8B82
++#define GL_OBJECT_VALIDATE_STATUS_ARB 0x8B83
++#define GL_OBJECT_INFO_LOG_LENGTH_ARB 0x8B84
++#define GL_OBJECT_ATTACHED_OBJECTS_ARB 0x8B85
++#define GL_OBJECT_ACTIVE_UNIFORMS_ARB 0x8B86
++#define GL_OBJECT_ACTIVE_UNIFORM_MAX_LENGTH_ARB 0x8B87
++#define GL_OBJECT_SHADER_SOURCE_LENGTH_ARB 0x8B88
++#endif
++#ifndef GL_ARB_shading_language_100
++#define GL_ARB_shading_language_100 1
++#define GL_SHADING_LANGUAGE_VERSION_ARB 0x8B8C
+ #endif
+ #ifndef GL_ARB_fragment_shader
+ #define GL_ARB_fragment_shader 1
+@@ -677,6 +690,8 @@ typedef void (APIENTRY * WINED3D_PFNGLVA
+ typedef void (APIENTRY * WINED3D_PFNGLGETATTACHEDOBJECTSARBPROC) (GLhandleARB containerObj, GLsizei maxCount, GLsizei *count, GLhandleARB *obj);
+ typedef GLhandleARB (APIENTRY * WINED3D_PFNGLGETHANDLEARBPROC) (GLenum pname);
+ typedef void (APIENTRY * WINED3D_PFNGLGETSHADERSOURCEARBPROC) (GLhandleARB obj, GLsizei maxLength, GLsizei *length, GLcharARB *source);
++typedef void (APIENTRY * WINED3D_PFNGLBINDATTRIBLOCATIONARBPROC) (GLhandleARB programObj, GLuint index, const GLcharARB *name);
++typedef GLint (APIENTRY * WINED3D_PFNGLGETATTRIBLOCATIONARBPROC) (GLhandleARB programObj, const GLcharARB *name);
+ /* GL_EXT_texture_compression_s3tc */
+ #ifndef GL_EXT_texture_compression_s3tc
+ #define GL_EXT_texture_compression_s3tc 1
+@@ -1433,6 +1448,8 @@ typedef enum _GL_SupportedExt {
+ USE_GL_FUNC(WINED3D_PFNGLGETATTACHEDOBJECTSARBPROC, glGetAttachedObjectsARB); \
+ USE_GL_FUNC(WINED3D_PFNGLGETHANDLEARBPROC, glGetHandleARB); \
+ USE_GL_FUNC(WINED3D_PFNGLGETSHADERSOURCEARBPROC, glGetShaderSourceARB); \
++ USE_GL_FUNC(WINED3D_PFNGLBINDATTRIBLOCATIONARBPROC, glBindAttribLocationARB); \
++ USE_GL_FUNC(WINED3D_PFNGLGETATTRIBLOCATIONARBPROC, glGetAttribLocationARB); \
+ /* GL_EXT_stencil_two_side */ \
+ USE_GL_FUNC(PGLFNACTIVESTENCILFACEEXTPROC, glActiveStencilFaceEXT); \
+ /* GL_ATI_separate_stencil */ \
+--- a/dlls/d3d9/stateblock.c
++++ b/dlls/d3d9/stateblock.c
+@@ -150,12 +150,17 @@ HRESULT WINAPI IDirect3DDevice9Impl_En
+ }
+ /* allocate a new IDirectD3DStateBlock */
+ object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY ,sizeof(IDirect3DStateBlock9Impl));
++ if (!object) {
++ FIXME("(%p) Failed to allocate %d bytes\n", This, sizeof(IDirect3DStateBlock9Impl));
++ return E_OUTOFMEMORY;
++ }
+ object->ref = 1;
+ object->lpVtbl = &Direct3DStateBlock9_Vtbl;
+-
+- object->wineD3DStateBlock=wineD3DStateBlock;
+-
+- *ppSB=(IDirect3DStateBlock9*)object;
++ object->wineD3DStateBlock = wineD3DStateBlock;
++
++ IUnknown_AddRef(iface);
++ object->parentDevice = iface;
++ *ppSB=(IDirect3DStateBlock9*)object;
+ TRACE("(%p)Returning %p %p\n", This, *ppSB, wineD3DStateBlock);
+ return D3D_OK;
+ }
+--- a/dlls/d3d9/tests/device.c
++++ b/dlls/d3d9/tests/device.c
+@@ -201,6 +201,7 @@ void test_refcount(void)
+ IDirect3DSurface9 *pRenderTarget = NULL;
+ IDirect3DSurface9 *pTextureLevel = NULL;
+ IDirect3DStateBlock9 *pStateBlock = NULL;
++ IDirect3DStateBlock9 *pStateBlock1 = NULL;
+ IDirect3DSwapChain9 *pSwapChain = NULL;
+ IDirect3DQuery9 *pQuery = NULL;
+ D3DPRESENT_PARAMETERS d3dpp;
+@@ -302,6 +303,12 @@ void test_refcount(void)
+ hr = IDirect3DDevice9_CreateQuery( pDevice, D3DQUERYTYPE_EVENT, &pQuery );
+ CHECK_CALL( hr, "CreateQuery", pDevice, refcount+1 );
+
++ refcount = get_refcount( (IUnknown *)pDevice );
++ hr = IDirect3DDevice9_BeginStateBlock( pDevice );
++ CHECK_CALL( hr, "BeginStateBlock", pDevice, refcount );
++ hr = IDirect3DDevice9_EndStateBlock( pDevice, &pStateBlock1 );
++ CHECK_CALL( hr, "EndStateBlock", pDevice, refcount+1 );
++
+ cleanup:
+ if (pDevice) IUnknown_Release( pDevice );
+
+@@ -327,6 +334,7 @@ cleanup:
+ if (pSwapChain) IUnknown_Release( pSwapChain );
+ */
+ if (pQuery) IUnknown_Release( pQuery );
++ if (pStateBlock1) IUnknown_Release( pStateBlock1 );
+
+ if (pD3d) IUnknown_Release( pD3d );
+
+diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c
+index c27e75c..0bb5589 100644
+--- a/dlls/wined3d/directx.c
++++ b/dlls/wined3d/directx.c
+@@ -1696,6 +1696,16 @@ #endif
+ *pCaps->MaxStreams = MAX_STREAMS;
+ *pCaps->MaxStreamStride = 1024;
+
++ /* Determine shader mode to use based on GL caps */
++ if (GL_SUPPORT(ARB_SHADING_LANGUAGE_100) && wined3d_settings.glslRequested
++ && (wined3d_settings.vs_mode == VS_HW || wined3d_settings.ps_mode == PS_HW))
++ wined3d_settings.shader_mode = SHADER_GLSL;
++ else if ((GL_SUPPORT(ARB_VERTEX_PROGRAM) && wined3d_settings.vs_mode == VS_HW) ||
++ (GL_SUPPORT(ARB_FRAGMENT_PROGRAM) && wined3d_settings.ps_mode == PS_HW))
++ wined3d_settings.shader_mode = SHADER_ARB;
++ else
++ wined3d_settings.shader_mode = SHADER_SW;
++
+ if (wined3d_settings.vs_mode == VS_HW && wined3d_settings.shader_mode == SHADER_GLSL
+ && DeviceType != WINED3DDEVTYPE_REF) {
+ *pCaps->VertexShaderVersion = D3DVS_VERSION(3,0);
+@@ -1846,16 +1856,6 @@ HRESULT WINAPI IWineD3DImpl_CreateDevi
+ IWineD3DImpl_FillGLCaps(&This->gl_info, IWineD3DImpl_GetAdapterDisplay(iface, Adapter));
+ LEAVE_GL();
+
+- /* Determine shader mode to use based on GL caps */
+- if (GL_SUPPORT(ARB_SHADING_LANGUAGE_100) && wined3d_settings.glslRequested
+- && (wined3d_settings.vs_mode == VS_HW || wined3d_settings.ps_mode == PS_HW))
+- wined3d_settings.shader_mode = SHADER_GLSL;
+- else if ((GL_SUPPORT(ARB_VERTEX_PROGRAM) && wined3d_settings.vs_mode == VS_HW) ||
+- (GL_SUPPORT(ARB_FRAGMENT_PROGRAM) && wined3d_settings.ps_mode == PS_HW))
+- wined3d_settings.shader_mode = SHADER_ARB;
+- else
+- wined3d_settings.shader_mode = SHADER_SW;
+-
+ /* set the state of the device to valid */
+ object->state = WINED3D_OK;
+

++++++ wine-0.9.13.tar.bz2 -> wine-0.9.14.tar.bz2 ++++++
arch/i386/wine/wine-0.9.13.tar.bz2 wine/wine-0.9.14.tar.bz2 differ: char 11, line 1



++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...


< Previous Next >
This Thread