May 2011 - Wine-commits - list.winehq.org

Dylan Smith : d3dx9: Implement ID3DXMesh:: CloneMesh without vertex buffer conversion.
by Alexandre Julliard 10 May '11

10 May '11

Module: wine Branch: master Commit: e62a4276ed381525f58e531b3a6f73c52f37d1f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e62a4276ed381525f58e531b3… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Mon May 9 06:30:34 2011 -0400 d3dx9: Implement ID3DXMesh::CloneMesh without vertex buffer conversion. --- dlls/d3dx9_36/mesh.c | 101 +++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 96 insertions(+), 5 deletions(-) diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index 4dffa62..cfb19bc 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -25,6 +25,7 @@ #include "config.h" #include "wine/port.h" +#define COBJMACROS #define NONAMELESSUNION #include "windef.h" #include "wingdi.h" @@ -232,20 +233,110 @@ static HRESULT WINAPI ID3DXMeshImpl_GetDevice(ID3DXMesh *iface, LPDIRECT3DDEVICE static HRESULT WINAPI ID3DXMeshImpl_CloneMeshFVF(ID3DXMesh *iface, DWORD options, DWORD fvf, LPDIRECT3DDEVICE9 device, LPD3DXMESH *clone_mesh) { ID3DXMeshImpl *This = impl_from_ID3DXMesh(iface); + HRESULT hr; + D3DVERTEXELEMENT9 declaration[MAX_FVF_DECL_SIZE]; - FIXME("(%p)->(%u,%u,%p,%p): stub\n", This, options, fvf, device, clone_mesh); + TRACE("(%p)->(%x,%x,%p,%p)\n", This, options, fvf, device, clone_mesh); - return E_NOTIMPL; + hr = D3DXDeclaratorFromFVF(fvf, declaration); + if (FAILED(hr)) return hr; + + return iface->lpVtbl->CloneMesh(iface, options, declaration, device, clone_mesh); } static HRESULT WINAPI ID3DXMeshImpl_CloneMesh(ID3DXMesh *iface, DWORD options, CONST D3DVERTEXELEMENT9 *declaration, LPDIRECT3DDEVICE9 device, - LPD3DXMESH *clone_mesh) + LPD3DXMESH *clone_mesh_out) { ID3DXMeshImpl *This = impl_from_ID3DXMesh(iface); + ID3DXMeshImpl *cloned_this; + ID3DXMesh *clone_mesh; + D3DVERTEXELEMENT9 orig_declaration[MAX_FVF_DECL_SIZE] = { D3DDECL_END() }; + void *data_in, *data_out; + DWORD vertex_size; + HRESULT hr; + int i; - FIXME("(%p)->(%u,%p,%p,%p): stub\n", This, options, declaration, device, clone_mesh); + TRACE("(%p)->(%x,%p,%p,%p)\n", This, options, declaration, device, clone_mesh_out); - return E_NOTIMPL; + if (!clone_mesh_out) + return D3DERR_INVALIDCALL; + + hr = iface->lpVtbl->GetDeclaration(iface, orig_declaration); + if (FAILED(hr)) return hr; + + for (i = 0; orig_declaration[i].Stream != 0xff; i++) { + if (memcmp(&orig_declaration[i], &declaration[i], sizeof(*declaration))) + { + FIXME("Vertex buffer conversion not implemented.\n"); + return E_NOTIMPL; + } + } + + hr = D3DXCreateMesh(This->numfaces, This->numvertices, options & ~D3DXMESH_VB_SHARE, + declaration, device, &clone_mesh); + if (FAILED(hr)) return hr; + + cloned_this = impl_from_ID3DXMesh(clone_mesh); + vertex_size = clone_mesh->lpVtbl->GetNumBytesPerVertex(clone_mesh); + + if (options & D3DXMESH_VB_SHARE) { + IDirect3DVertexBuffer9_AddRef(This->vertex_buffer); + /* FIXME: refactor to avoid creating a new vertex buffer */ + IDirect3DVertexBuffer9_Release(cloned_this->vertex_buffer); + cloned_this->vertex_buffer = This->vertex_buffer; + } else { + hr = iface->lpVtbl->LockVertexBuffer(iface, D3DLOCK_READONLY, &data_in); + if (FAILED(hr)) goto error; + hr = clone_mesh->lpVtbl->LockVertexBuffer(clone_mesh, D3DLOCK_DISCARD, &data_out); + if (FAILED(hr)) { + iface->lpVtbl->UnlockVertexBuffer(iface); + goto error; + } + memcpy(data_out, data_in, This->numvertices * vertex_size); + clone_mesh->lpVtbl->UnlockVertexBuffer(clone_mesh); + iface->lpVtbl->UnlockVertexBuffer(iface); + } + + hr = iface->lpVtbl->LockIndexBuffer(iface, D3DLOCK_READONLY, &data_in); + if (FAILED(hr)) goto error; + hr = clone_mesh->lpVtbl->LockIndexBuffer(clone_mesh, D3DLOCK_DISCARD, &data_out); + if (FAILED(hr)) { + iface->lpVtbl->UnlockIndexBuffer(iface); + goto error; + } + if ((options ^ This->options) & D3DXMESH_32BIT) { + if (options & D3DXMESH_32BIT) { + for (i = 0; i < This->numfaces * 3; i++) + ((DWORD*)data_out)[i] = ((WORD*)data_in)[i]; + } else { + for (i = 0; i < This->numfaces * 3; i++) + ((WORD*)data_out)[i] = ((DWORD*)data_in)[i]; + } + } else { + memcpy(data_out, data_in, This->numfaces * 3 * (options & D3DXMESH_32BIT ? 4 : 2)); + } + clone_mesh->lpVtbl->UnlockIndexBuffer(clone_mesh); + iface->lpVtbl->UnlockIndexBuffer(iface); + + memcpy(cloned_this->attrib_buffer, This->attrib_buffer, This->numfaces * sizeof(*This->attrib_buffer)); + + if (This->attrib_table_size) + { + cloned_this->attrib_table_size = This->attrib_table_size; + cloned_this->attrib_table = HeapAlloc(GetProcessHeap(), 0, This->attrib_table_size * sizeof(*This->attrib_table)); + if (!cloned_this->attrib_table) { + hr = E_OUTOFMEMORY; + goto error; + } + memcpy(cloned_this->attrib_table, This->attrib_table, This->attrib_table_size * sizeof(*This->attrib_table)); + } + + *clone_mesh_out = clone_mesh; + + return D3D_OK; +error: + IUnknown_Release(clone_mesh); + return hr; } static HRESULT WINAPI ID3DXMeshImpl_GetVertexBuffer(ID3DXMesh *iface, LPDIRECT3DVERTEXBUFFER9 *vertex_buffer)

1 0

Dylan Smith : d3dx9: Implement D3DXMESHOPT_COMPACT for ID3DXMesh:: OptimizeInplace.
by Alexandre Julliard 10 May '11

10 May '11

Module: wine Branch: master Commit: 61ba38635b7deb316fb569d6becebf605bcbd98e URL: http://source.winehq.org/git/wine.git/?a=commit;h=61ba38635b7deb316fb569d6b… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Mon May 9 06:30:51 2011 -0400 d3dx9: Implement D3DXMESHOPT_COMPACT for ID3DXMesh::OptimizeInplace. --- dlls/d3dx9_36/mesh.c | 152 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 149 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index cfb19bc..eca9332 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -653,13 +653,159 @@ static HRESULT WINAPI ID3DXMeshImpl_Optimize(ID3DXMesh *iface, DWORD flags, CONS } static HRESULT WINAPI ID3DXMeshImpl_OptimizeInplace(ID3DXMesh *iface, DWORD flags, CONST DWORD *adjacency_in, DWORD *adjacency_out, - DWORD *face_remap, LPD3DXBUFFER *vertex_remap) + DWORD *face_remap_out, LPD3DXBUFFER *vertex_remap_out) { ID3DXMeshImpl *This = impl_from_ID3DXMesh(iface); + void *indices = NULL; + HRESULT hr; + ID3DXBuffer *vertex_remap = NULL; + DWORD *dword_indices = NULL; + DWORD new_num_vertices = 0; + DWORD new_vertex_buffer_size = 0; + IDirect3DVertexBuffer9 *vertex_buffer = NULL; + DWORD i; - FIXME("(%p)->(%u,%p,%p,%p,%p): stub\n", This, flags, adjacency_in, adjacency_out, face_remap, vertex_remap); + TRACE("(%p)->(%x,%p,%p,%p,%p)\n", This, flags, adjacency_in, adjacency_out, face_remap_out, vertex_remap_out); - return E_NOTIMPL; + if (!flags) + return D3DERR_INVALIDCALL; + if (!adjacency_in && (flags & (D3DXMESHOPT_VERTEXCACHE | D3DXMESHOPT_STRIPREORDER))) + return D3DERR_INVALIDCALL; + if ((flags & (D3DXMESHOPT_VERTEXCACHE | D3DXMESHOPT_STRIPREORDER)) == (D3DXMESHOPT_VERTEXCACHE | D3DXMESHOPT_STRIPREORDER)) + return D3DERR_INVALIDCALL; + + if (flags & (D3DXMESHOPT_ATTRSORT | D3DXMESHOPT_VERTEXCACHE | D3DXMESHOPT_STRIPREORDER)) + { + if (flags & D3DXMESHOPT_ATTRSORT) + FIXME("D3DXMESHOPT_ATTRSORT not implemented.\n"); + if (flags & D3DXMESHOPT_VERTEXCACHE) + FIXME("D3DXMESHOPT_VERTEXCACHE not implemented.\n"); + if (flags & D3DXMESHOPT_STRIPREORDER) + FIXME("D3DXMESHOPT_STRIPREORDER not implemented.\n"); + return E_NOTIMPL; + } + + hr = iface->lpVtbl->LockIndexBuffer(iface, 0, (void**)&indices); + if (FAILED(hr)) goto cleanup; + + dword_indices = HeapAlloc(GetProcessHeap(), 0, This->numfaces * 3 * sizeof(DWORD)); + if (!dword_indices) return E_OUTOFMEMORY; + if (This->options & D3DXMESH_32BIT) { + memcpy(dword_indices, indices, This->numfaces * 3 * sizeof(DWORD)); + } else { + WORD *word_indices = indices; + for (i = 0; i < This->numfaces * 3; i++) + dword_indices[i] = *word_indices++; + } + + if ((flags & (D3DXMESHOPT_COMPACT | D3DXMESHOPT_IGNOREVERTS)) == D3DXMESHOPT_COMPACT) + { + /* Remove unused vertices. */ + DWORD *vertex_remap_ptr; + + new_vertex_buffer_size = This->numvertices; + hr = D3DXCreateBuffer(This->numvertices * sizeof(DWORD), &vertex_remap); + if (FAILED(hr)) goto cleanup; + vertex_remap_ptr = ID3DXBuffer_GetBufferPointer(vertex_remap); + + for (i = 0; i < This->numfaces * 3; i++) + vertex_remap_ptr[dword_indices[i]] = 1; + + /* create old->new vertex mapping */ + for (i = 0; i < This->numvertices; i++) { + if (vertex_remap_ptr[i]) + vertex_remap_ptr[i] = new_num_vertices++; + else + vertex_remap_ptr[i] = -1; + } + /* convert indices */ + for (i = 0; i < This->numfaces * 3; i++) + dword_indices[i] = vertex_remap_ptr[dword_indices[i]]; + + /* create new->old vertex mapping */ + new_num_vertices = 0; + for (i = 0; i < This->numvertices; i++) { + if (vertex_remap_ptr[i] != -1) + vertex_remap_ptr[new_num_vertices++] = i; + } + for (i = new_num_vertices; i < This->numvertices; i++) + vertex_remap_ptr[i] = -1; + } + + if (vertex_remap) + { + /* reorder the vertices using vertex_remap */ + D3DVERTEXBUFFER_DESC vertex_desc; + DWORD *vertex_remap_ptr = ID3DXBuffer_GetBufferPointer(vertex_remap); + DWORD vertex_size = iface->lpVtbl->GetNumBytesPerVertex(iface); + BYTE *orig_vertices; + BYTE *new_vertices; + + hr = IDirect3DVertexBuffer9_GetDesc(This->vertex_buffer, &vertex_desc); + if (FAILED(hr)) goto cleanup; + + new_vertex_buffer_size *= vertex_size; + hr = IDirect3DDevice9_CreateVertexBuffer(This->device, new_vertex_buffer_size, + vertex_desc.Usage, This->fvf, vertex_desc.Pool, &vertex_buffer, NULL); + if (FAILED(hr)) goto cleanup; + + hr = IDirect3DVertexBuffer9_Lock(This->vertex_buffer, 0, 0, (void**)&orig_vertices, D3DLOCK_READONLY); + if (FAILED(hr)) goto cleanup; + + hr = IDirect3DVertexBuffer9_Lock(vertex_buffer, 0, 0, (void**)&new_vertices, D3DLOCK_DISCARD); + if (FAILED(hr)) { + IDirect3DVertexBuffer9_Unlock(This->vertex_buffer); + goto cleanup; + } + + for (i = 0; i < new_num_vertices; i++) + memcpy(new_vertices + i * vertex_size, orig_vertices + vertex_remap_ptr[i] * vertex_size, vertex_size); + + IDirect3DVertexBuffer9_Unlock(This->vertex_buffer); + IDirect3DVertexBuffer9_Unlock(vertex_buffer); + } else if (vertex_remap_out) { + DWORD *vertex_remap_ptr; + + hr = D3DXCreateBuffer(This->numvertices * sizeof(DWORD), &vertex_remap); + if (FAILED(hr)) goto cleanup; + vertex_remap_ptr = ID3DXBuffer_GetBufferPointer(vertex_remap); + for (i = 0; i < This->numvertices; i++) + *vertex_remap_ptr++ = i; + } + + if (This->options & D3DXMESH_32BIT) { + memcpy(indices, dword_indices, This->numfaces * 3 * sizeof(DWORD)); + } else { + WORD *word_indices = indices; + for (i = 0; i < This->numfaces * 3; i++) + *word_indices++ = dword_indices[i]; + } + + if (adjacency_out) { + memcpy(adjacency_out, adjacency_in, This->numfaces * 3 * sizeof(*adjacency_out)); + } + if (face_remap_out) { + for (i = 0; i < This->numfaces; i++) + face_remap_out[i] = i; + } + if (vertex_remap_out) + *vertex_remap_out = vertex_remap; + vertex_remap = NULL; + + if (vertex_buffer) { + IDirect3DVertexBuffer9_Release(This->vertex_buffer); + This->vertex_buffer = vertex_buffer; + vertex_buffer = NULL; + This->numvertices = new_num_vertices; + } + + hr = D3D_OK; +cleanup: + HeapFree(GetProcessHeap(), 0, dword_indices); + if (vertex_remap) ID3DXBuffer_Release(vertex_remap); + if (vertex_buffer) IDirect3DVertexBuffer9_Release(vertex_buffer); + if (indices) iface->lpVtbl->UnlockIndexBuffer(iface); + return hr; } static HRESULT WINAPI ID3DXMeshImpl_SetAttributeTable(ID3DXMesh *iface, CONST D3DXATTRIBUTERANGE *attrib_table, DWORD attrib_table_size)

1 0

Austin English : dsound: Return success in IDirectSoundBufferImpl_AcquireResources.
by Alexandre Julliard 10 May '11

10 May '11

Module: wine Branch: master Commit: 6a3255bbbde0bdec3407ea89ef640b66dc45773c URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a3255bbbde0bdec3407ea89e… Author: Austin English <austinenglish(a)gmail.com> Date: Mon May 9 17:59:02 2011 -0500 dsound: Return success in IDirectSoundBufferImpl_AcquireResources. --- dlls/dsound/buffer.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dsound/buffer.c b/dlls/dsound/buffer.c index 0e9096a..f797baf 100644 --- a/dlls/dsound/buffer.c +++ b/dlls/dsound/buffer.c @@ -791,13 +791,13 @@ static HRESULT WINAPI IDirectSoundBufferImpl_AcquireResources( IDirectSoundBufferImpl *This = (IDirectSoundBufferImpl *)iface; DWORD u; - FIXME("(%p,%08u,%u,%p): stub\n",This,dwFlags,dwEffectsCount,pdwResultCodes); + FIXME("(%p,%08u,%u,%p): stub, faking success\n",This,dwFlags,dwEffectsCount,pdwResultCodes); if (pdwResultCodes) for (u=0; u<dwEffectsCount; u++) pdwResultCodes[u] = DSFXR_UNKNOWN; WARN("control unavailable\n"); - return DSERR_CONTROLUNAVAIL; + return DS_OK; } static HRESULT WINAPI IDirectSoundBufferImpl_GetObjectInPath(

1 0

Alexandre Julliard : configure: Make the tools directory a symlink in the wow64 build tree.
by Alexandre Julliard 10 May '11

10 May '11

Module: wine Branch: master Commit: 84fd1f58497fd721ac2d2b18785cebefe216bc1d URL: http://source.winehq.org/git/wine.git/?a=commit;h=84fd1f58497fd721ac2d2b187… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 10 11:59:43 2011 +0200 configure: Make the tools directory a symlink in the wow64 build tree. --- Makefile.in | 4 +--- aclocal.m4 | 14 ++++++++------ configure | 35 ++++++++++++++++++++++------------- configure.ac | 16 ++++++++++++---- 4 files changed, 43 insertions(+), 26 deletions(-) diff --git a/Makefile.in b/Makefile.in index ed218fa..b8cd6af 100644 --- a/Makefile.in +++ b/Makefile.in @@ -48,8 +48,6 @@ include/stamp-h: include/config.h.in config.status .PHONY: __clean__ clean:: __clean__ - $(RM) tools/makedep$(EXEEXT) - distclean:: clean $(RM) config.* configure.lineno TAGS tags include/config.h include/stamp-h Makefile Make.tmp $(RM) -r autom4te.cache @@ -71,7 +69,7 @@ tools/widl tools/wmc tools/wrc: libs/wpp dlls/shell32/Makefile dlls/shell32/__depend__: dlls/shell32/AUTHORS -$(MAKEDEP): include/config.h tools/Makefile +$(MAKEDEP): include/config.h @cd $(TOOLSDIR)/tools && $(MAKE) makedep$(TOOLSEXT) # Misc rules diff --git a/aclocal.m4 b/aclocal.m4 index 3db9cda..6b7788d 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -425,9 +425,11 @@ $ac_dir/__crosstest__: $ac_dir/Makefile __builddeps__ dummy wine_fn_config_tool () { ac_dir=$[1] + AS_VAR_IF([enable_tools],[no],[return 0]) + wine_fn_all_dir_rules $ac_dir Make.rules - AS_VAR_IF([enable_tools],[no],,[case $ac_dir in + case $ac_dir in dnl tools directory has both install-lib and install-dev tools) wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ "install:: $ac_dir @@ -439,17 +441,17 @@ install-dev:: $ac_dir *) wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ "install install-dev:: $ac_dir @cd $ac_dir && \$(MAKE) install" ;; - esac - wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ + esac + wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ "uninstall:: $ac_dir/Makefile @cd $ac_dir && \$(MAKE) uninstall all __tooldeps__: $ac_dir .PHONY: $ac_dir $ac_dir: $ac_dir/Makefile libs/port dummy @cd $ac_dir && \$(MAKE)" - case $ac_dir in - tools/winebuild) wine_fn_append_rule ALL_MAKEFILE_DEPENDS "\$(WINEBUILD): $ac_dir" ;; - esac]) + case $ac_dir in + tools/winebuild) wine_fn_append_rule ALL_MAKEFILE_DEPENDS "\$(WINEBUILD): $ac_dir" ;; + esac } wine_fn_config_makerules () diff --git a/configure b/configure index 2d6df8c..0d82519 100755 --- a/configure +++ b/configure @@ -14894,12 +14894,13 @@ fi wine_fn_config_tool () { ac_dir=$1 - wine_fn_all_dir_rules $ac_dir Make.rules - if test "x$enable_tools" = xno; then : + return 0 +fi -else - case $ac_dir in + wine_fn_all_dir_rules $ac_dir Make.rules + + case $ac_dir in tools) wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ "install:: $ac_dir @cd $ac_dir && \$(MAKE) install @@ -14910,18 +14911,17 @@ install-dev:: $ac_dir *) wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ "install install-dev:: $ac_dir @cd $ac_dir && \$(MAKE) install" ;; - esac - wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ + esac + wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ "uninstall:: $ac_dir/Makefile @cd $ac_dir && \$(MAKE) uninstall all __tooldeps__: $ac_dir .PHONY: $ac_dir $ac_dir: $ac_dir/Makefile libs/port dummy @cd $ac_dir && \$(MAKE)" - case $ac_dir in - tools/winebuild) wine_fn_append_rule ALL_MAKEFILE_DEPENDS "\$(WINEBUILD): $ac_dir" ;; - esac -fi + case $ac_dir in + tools/winebuild) wine_fn_append_rule ALL_MAKEFILE_DEPENDS "\$(WINEBUILD): $ac_dir" ;; + esac } wine_fn_config_makerules () @@ -14971,8 +14971,10 @@ if test "x$enable_fonts" != xno; then ac_config_links="$ac_config_links fonts/tahomabd.ttf:fonts/tahomabd.ttf" test "$srcdir" = "." || wine_fn_config_symlink fonts/tahomabd.ttf fi +if test "x$enable_tools" != xno; then ac_config_links="$ac_config_links tools/l_intl.nls:tools/l_intl.nls" test "$srcdir" = "." || wine_fn_config_symlink tools/l_intl.nls +fi ac_config_links="$ac_config_links wine:tools/winewrapper" wine_fn_config_symlink wine @@ -15711,17 +15713,24 @@ all: \$(ALL_PO_FILES) msgcat -o \$@ \$(ALL_POT_FILES)" fi +if test "x$enable_tools" != xno +then + wine_fn_append_rule ALL_MAKEFILE_DEPENDS "\$(MAKEDEP): tools/Makefile +clean:: __clean__ + \$(RM) tools/makedep\$(EXEEXT)" +fi + if test -n "$with_wine64" then -wine_fn_append_rule ALL_MAKEFILE_DEPENDS "all: fonts server $with_wine64/loader/wine $with_wine64/loader/wine-preloader -fonts server: +wine_fn_append_rule ALL_MAKEFILE_DEPENDS "all: fonts server tools $with_wine64/loader/wine $with_wine64/loader/wine-preloader +fonts server tools: \$(RM) \$@ && \$(LN_S) $with_wine64/\$@ \$@ $with_wine64/loader/wine: \$(RM) \$@ && \$(LN_S) $ac_pwd/loader/wine \$@ $with_wine64/loader/wine-preloader: \$(RM) \$@ && \$(LN_S) $ac_pwd/loader/wine-preloader \$@ clean:: - \$(RM) fonts server $with_wine64/loader/wine $with_wine64/loader/wine-preloader" + \$(RM) fonts server tools $with_wine64/loader/wine $with_wine64/loader/wine-preloader" fi wine_fn_append_rule ALL_MAKEFILE_DEPENDS "uninstall:: diff --git a/configure.ac b/configure.ac index eff1550..a5c5baa 100644 --- a/configure.ac +++ b/configure.ac @@ -2369,7 +2369,7 @@ WINE_CONFIG_SYMLINK(fonts/marlett.ttf,,enable_fonts) WINE_CONFIG_SYMLINK(fonts/symbol.ttf,,enable_fonts) WINE_CONFIG_SYMLINK(fonts/tahoma.ttf,,enable_fonts) WINE_CONFIG_SYMLINK(fonts/tahomabd.ttf,,enable_fonts) -WINE_CONFIG_SYMLINK(tools/l_intl.nls) +WINE_CONFIG_SYMLINK(tools/l_intl.nls,,enable_tools) WINE_CONFIG_SYMLINK(wine,tools/winewrapper) WINE_CONFIG_EXTRA_DIR(dlls/gdi32/dibdrv) @@ -3092,18 +3092,26 @@ all: \$(ALL_PO_FILES) msgcat -o \$[@] \$(ALL_POT_FILES)]) fi +if test "x$enable_tools" != xno +then + WINE_APPEND_RULE([ALL_MAKEFILE_DEPENDS], +[\$(MAKEDEP): tools/Makefile +clean:: __clean__ + \$(RM) tools/makedep\$(EXEEXT)]) +fi + if test -n "$with_wine64" then WINE_APPEND_RULE([ALL_MAKEFILE_DEPENDS], -[all: fonts server $with_wine64/loader/wine $with_wine64/loader/wine-preloader -fonts server: +[all: fonts server tools $with_wine64/loader/wine $with_wine64/loader/wine-preloader +fonts server tools: \$(RM) \$[@] && \$(LN_S) $with_wine64/\$[@] \$[@] $with_wine64/loader/wine: \$(RM) \$[@] && \$(LN_S) $ac_pwd/loader/wine \$[@] $with_wine64/loader/wine-preloader: \$(RM) \$[@] && \$(LN_S) $ac_pwd/loader/wine-preloader \$[@] clean:: - \$(RM) fonts server $with_wine64/loader/wine $with_wine64/loader/wine-preloader]) + \$(RM) fonts server tools $with_wine64/loader/wine $with_wine64/loader/wine-preloader]) fi WINE_APPEND_RULE([ALL_MAKEFILE_DEPENDS],

1 0

Alexandre Julliard : configure: Create a wine64 symlink in 64-bit build trees.
by Alexandre Julliard 10 May '11

10 May '11

Module: wine Branch: master Commit: 4422d22cfe090b30b76490942c6c213a953f5b8f URL: http://source.winehq.org/git/wine.git/?a=commit;h=4422d22cfe090b30b76490942… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 10 13:26:28 2011 +0200 configure: Create a wine64 symlink in 64-bit build trees. --- .gitignore | 1 + configure | 6 ++++++ configure.ac | 2 ++ tools/make_makefiles | 1 + tools/winewrapper | 17 ++++++++++------- 5 files changed, 20 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index b2ca697..667fd45 100644 --- a/.gitignore +++ b/.gitignore @@ -17,6 +17,7 @@ /configure.lineno /tags /wine +/wine64 Makefile dlldata.c dlls/*/*.def diff --git a/configure b/configure index 0d82519..2b3863e 100755 --- a/configure +++ b/configure @@ -4157,6 +4157,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext esac enable_win16=${enable_win16:-no} +enable_win64=${enable_win64:-no} enable_winetest=${enable_winetest:-$enable_tests} @@ -14977,6 +14978,10 @@ test "$srcdir" = "." || wine_fn_config_symlink tools/l_intl.nls fi ac_config_links="$ac_config_links wine:tools/winewrapper" wine_fn_config_symlink wine +if test "x$enable_win64" != xno; then +ac_config_links="$ac_config_links wine64:tools/winewrapper" +wine_fn_config_symlink wine64 +fi ac_config_commands="$ac_config_commands dlls/gdi32/dibdrv" @@ -16468,6 +16473,7 @@ do "fonts/tahomabd.ttf") CONFIG_LINKS="$CONFIG_LINKS fonts/tahomabd.ttf:fonts/tahomabd.ttf" ;; "tools/l_intl.nls") CONFIG_LINKS="$CONFIG_LINKS tools/l_intl.nls:tools/l_intl.nls" ;; "wine") CONFIG_LINKS="$CONFIG_LINKS wine:tools/winewrapper" ;; + "wine64") CONFIG_LINKS="$CONFIG_LINKS wine64:tools/winewrapper" ;; "dlls/gdi32/dibdrv") CONFIG_COMMANDS="$CONFIG_COMMANDS dlls/gdi32/dibdrv" ;; "dlls/gdi32/enhmfdrv") CONFIG_COMMANDS="$CONFIG_COMMANDS dlls/gdi32/enhmfdrv" ;; "dlls/gdi32/mfdrv") CONFIG_COMMANDS="$CONFIG_COMMANDS dlls/gdi32/mfdrv" ;; diff --git a/configure.ac b/configure.ac index a5c5baa..d68ae2a 100644 --- a/configure.ac +++ b/configure.ac @@ -190,6 +190,7 @@ esac dnl enable_win16 defaults to yes on x86, to no on other CPUs enable_win16=${enable_win16:-no} +enable_win64=${enable_win64:-no} dnl Disable winetest too if tests are disabled enable_winetest=${enable_winetest:-$enable_tests} @@ -2371,6 +2372,7 @@ WINE_CONFIG_SYMLINK(fonts/tahoma.ttf,,enable_fonts) WINE_CONFIG_SYMLINK(fonts/tahomabd.ttf,,enable_fonts) WINE_CONFIG_SYMLINK(tools/l_intl.nls,,enable_tools) WINE_CONFIG_SYMLINK(wine,tools/winewrapper) +WINE_CONFIG_SYMLINK(wine64,tools/winewrapper,enable_win64) WINE_CONFIG_EXTRA_DIR(dlls/gdi32/dibdrv) WINE_CONFIG_EXTRA_DIR(dlls/gdi32/enhmfdrv) diff --git a/tools/make_makefiles b/tools/make_makefiles index b512d62..62a66a5 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -88,6 +88,7 @@ my @ignores = ( "/TAGS", "/tags", "/wine", + "/wine64", "Makefile", "dlldata.c", "dlls/*/*.def", diff --git a/tools/winewrapper b/tools/winewrapper index a4d17ac..b324daa 100755 --- a/tools/winewrapper +++ b/tools/winewrapper @@ -22,10 +22,13 @@ # first determine the directory that contains the app itself appdir="" +name=$0 + case "$0" in */*) # $0 contains a path, use it appdir=`dirname "$0"` + name=`basename "$0"` ;; *) # no directory in $0, search in PATH @@ -34,7 +37,7 @@ case "$0" in for d in $PATH do IFS=$saved_ifs - if [ -x "$d/$0" ] + if [ -x "$d/$name" ] then appdir="$d" break @@ -43,7 +46,7 @@ case "$0" in ;; esac -# now find the top-level directory of the source tree +# now find the top-level directory of the build tree if [ -x "$appdir/server/wineserver" ] then topdir="$appdir" @@ -54,7 +57,7 @@ then topdir="$appdir/../.." elif [ -x "$appdir/../../../server/wineserver" ] then topdir="$appdir/../../.." else - echo "$0: could not locate Wine source tree" + echo "$name: could not locate the Wine build tree" exit 1 fi @@ -81,12 +84,12 @@ else export LD_LIBRARY_PATH fi -if [ -x "$topdir/loader/wine" ] +if [ -x "$topdir/loader/$name" ] +then WINELOADER="$topdir/loader/$name" +elif [ -x "$topdir/loader/wine" ] then WINELOADER="$topdir/loader/wine" -elif [ -x "$topdir/loader/wine64" ] -then WINELOADER="$topdir/loader/wine64" else - echo "$0: could not find the wine loader in $topdir" + echo "$name: could not find the Wine loader in $topdir" exit 1 fi export WINELOADER

1 0

Jacek Caban : kernel32: Moved EnumProcessModules implementation to kernel32 .
by Alexandre Julliard 10 May '11

10 May '11

Module: wine Branch: master Commit: 362a7d571e42243262c79bc47eddad086167074e URL: http://source.winehq.org/git/wine.git/?a=commit;h=362a7d571e42243262c79bc47… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 10 09:16:39 2011 +0000 kernel32: Moved EnumProcessModules implementation to kernel32. --- dlls/kernel32/kernel32.spec | 1 + dlls/kernel32/process.c | 82 +++++++++++++++++++++++++++++++++++++++++++ dlls/psapi/psapi.spec | 2 +- dlls/psapi/psapi_main.c | 30 ---------------- 4 files changed, 84 insertions(+), 31 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index aae17e9..2ac24b4 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -770,6 +770,7 @@ @ stdcall K32EmptyWorkingSet(long) @ stdcall K32GetProcessImageFileNameA(long ptr long) @ stdcall K32GetProcessImageFileNameW(long ptr long) +@ stdcall K32EnumProcessModules(long ptr long ptr) @ stdcall K32EnumProcesses(ptr long ptr) @ stdcall -i386 -private -register K32Thk1632Epilog() krnl386.exe16.K32Thk1632Epilog @ stdcall -i386 -private -register K32Thk1632Prolog() krnl386.exe16.K32Thk1632Prolog diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 668230d..6ca1279 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -3501,6 +3501,88 @@ BOOL WINAPI K32EnumProcesses(DWORD *lpdwProcessIDs, DWORD cb, DWORD *lpcbUsed) return TRUE; } +typedef struct { + HANDLE process; + PLIST_ENTRY head, current; + LDR_MODULE ldr_module; +} MODULE_ITERATOR; + +static BOOL init_module_iterator(MODULE_ITERATOR *iter, HANDLE process) +{ + PROCESS_BASIC_INFORMATION pbi; + PPEB_LDR_DATA ldr_data; + NTSTATUS status; + + /* Get address of PEB */ + status = NtQueryInformationProcess(process, ProcessBasicInformation, + &pbi, sizeof(pbi), NULL); + if (status != STATUS_SUCCESS) + { + SetLastError(RtlNtStatusToDosError(status)); + return FALSE; + } + + /* Read address of LdrData from PEB */ + if (!ReadProcessMemory(process, &pbi.PebBaseAddress->LdrData, + &ldr_data, sizeof(ldr_data), NULL)) + return FALSE; + + /* Read address of first module from LdrData */ + if (!ReadProcessMemory(process, + &ldr_data->InLoadOrderModuleList.Flink, + &iter->current, sizeof(iter->current), NULL)) + return FALSE; + + iter->head = &ldr_data->InLoadOrderModuleList; + iter->process = process; + + return TRUE; +} + +static int module_iterator_next(MODULE_ITERATOR *iter) +{ + if (iter->current == iter->head) + return 0; + + if (!ReadProcessMemory(iter->process, + CONTAINING_RECORD(iter->current, LDR_MODULE, InLoadOrderModuleList), + &iter->ldr_module, sizeof(iter->ldr_module), NULL)) + return -1; + + iter->current = iter->ldr_module.InLoadOrderModuleList.Flink; + return 1; +} + +/*********************************************************************** + * K32EnumProcessModules (KERNEL32.@) + * + * NOTES + * Returned list is in load order. + */ +BOOL WINAPI K32EnumProcessModules(HANDLE process, HMODULE *lphModule, + DWORD cb, DWORD *needed) +{ + MODULE_ITERATOR iter; + INT ret; + + if (!init_module_iterator(&iter, process)) + return FALSE; + + *needed = 0; + + while ((ret = module_iterator_next(&iter)) > 0) + { + if (cb >= sizeof(HMODULE)) + { + *lphModule++ = iter.ldr_module.BaseAddress; + cb -= sizeof(HMODULE); + } + *needed += sizeof(HMODULE); + } + + return ret == 0; +} + /*********************************************************************** * ProcessIdToSessionId (KERNEL32.@) * This function is available on Terminal Server 4SP4 and Windows 2000 diff --git a/dlls/psapi/psapi.spec b/dlls/psapi/psapi.spec index f3c960c..70f1144 100644 --- a/dlls/psapi/psapi.spec +++ b/dlls/psapi/psapi.spec @@ -2,7 +2,7 @@ @ stdcall EnumDeviceDrivers(ptr long ptr) @ stdcall EnumPageFilesA(ptr ptr) @ stdcall EnumPageFilesW(ptr ptr) -@ stdcall EnumProcessModules(long ptr long ptr) +@ stdcall EnumProcessModules(long ptr long ptr) kernel32.K32EnumProcessModules @ stdcall EnumProcesses(ptr long ptr) kernel32.K32EnumProcesses @ stdcall GetDeviceDriverBaseNameA(ptr ptr long) @ stdcall GetDeviceDriverBaseNameW(ptr ptr long) diff --git a/dlls/psapi/psapi_main.c b/dlls/psapi/psapi_main.c index 7e05601..34dfeed 100644 --- a/dlls/psapi/psapi_main.c +++ b/dlls/psapi/psapi_main.c @@ -179,36 +179,6 @@ BOOL WINAPI EnumPageFilesW( PENUM_PAGE_FILE_CALLBACKW callback, LPVOID context ) } /*********************************************************************** - * EnumProcessModules (PSAPI.@) - * - * NOTES - * Returned list is in load order. - */ -BOOL WINAPI EnumProcessModules(HANDLE hProcess, HMODULE *lphModule, - DWORD cb, LPDWORD lpcbNeeded) -{ - MODULE_ITERATOR iter; - INT ret; - - if (!PSAPI_ModuleIteratorInit(&iter, hProcess)) - return FALSE; - - *lpcbNeeded = 0; - - while ((ret = PSAPI_ModuleIteratorNext(&iter)) > 0) - { - if (cb >= sizeof(HMODULE)) - { - *lphModule++ = iter.LdrModule.BaseAddress; - cb -= sizeof(HMODULE); - } - *lpcbNeeded += sizeof(HMODULE); - } - - return (ret == 0); -} - -/*********************************************************************** * GetDeviceDriverBaseNameA (PSAPI.@) */ DWORD WINAPI GetDeviceDriverBaseNameA(LPVOID ImageBase, LPSTR lpBaseName,

1 0

Stefan Dösinger : d3d8: Map ZBIAS values to a smaller depth range.
by Alexandre Julliard 10 May '11

10 May '11

Module: wine Branch: master Commit: 7b1e0815153be160ace0b145ae16423f1bf1b7ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b1e0815153be160ace0b145a… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun May 8 17:21:15 2011 +0200 d3d8: Map ZBIAS values to a smaller depth range. --- dlls/d3d8/device.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 6d0b247..2b99dd5 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1466,6 +1466,12 @@ static HRESULT WINAPI IDirect3DDevice8Impl_GetClipPlane(IDirect3DDevice8 *iface, return hr; } +/* This factor is the result of a trial-and-error search. Both ZBIAS and DEPTHBIAS require + * guesswork by design. d3d9 apps usually use a DEPTHBIAS of -0.00002(Mass Effect 2, WoW). + * d3d8 apps(Final Fantasy XI) set ZBIAS to 15 and still expect the depth test to sort + * objects properly. */ +static const float zbias_factor = -0.000005f; + static HRESULT WINAPI IDirect3DDevice8Impl_SetRenderState(IDirect3DDevice8 *iface, D3DRENDERSTATETYPE State, DWORD Value) { @@ -1483,7 +1489,7 @@ static HRESULT WINAPI IDirect3DDevice8Impl_SetRenderState(IDirect3DDevice8 *ifac switch (State) { case D3DRS_ZBIAS: - wined3d_value.f = Value / -16.0f; + wined3d_value.f = Value * zbias_factor; hr = IWineD3DDevice_SetRenderState(This->WineD3DDevice, WINED3DRS_DEPTHBIAS, wined3d_value.d); break; @@ -1513,7 +1519,7 @@ static HRESULT WINAPI IDirect3DDevice8Impl_GetRenderState(IDirect3DDevice8 *ifac { case D3DRS_ZBIAS: hr = IWineD3DDevice_GetRenderState(This->WineD3DDevice, WINED3DRS_DEPTHBIAS, &wined3d_value.d); - if (SUCCEEDED(hr)) *pValue = -wined3d_value.f * 16.0f; + if (SUCCEEDED(hr)) *pValue = wined3d_value.f / zbias_factor; break; default:

1 0

Stefan Dösinger : ddraw: Map ZBIAS values to a smaller depth range.
by Alexandre Julliard 10 May '11

10 May '11

Module: wine Branch: master Commit: a1519e62f47f2dfa54ca526ee718fe8a936593f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1519e62f47f2dfa54ca526ee… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun May 8 17:23:14 2011 +0200 ddraw: Map ZBIAS values to a smaller depth range. --- dlls/ddraw/device.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 001dff3..d31a629 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -2249,6 +2249,8 @@ static HRESULT WINAPI IDirect3DDeviceImpl_2_End(IDirect3DDevice2 *iface, DWORD d * DDERR_INVALIDPARAMS if Value == NULL * *****************************************************************************/ +static const float zbias_factor = -0.000005f; + static HRESULT IDirect3DDeviceImpl_7_GetRenderState(IDirect3DDevice7 *iface, D3DRENDERSTATETYPE RenderStateType, @@ -2383,7 +2385,7 @@ IDirect3DDeviceImpl_7_GetRenderState(IDirect3DDevice7 *iface, hr = IWineD3DDevice_GetRenderState(This->wineD3DDevice, WINED3DRS_DEPTHBIAS, &wined3d_value.d); - if (SUCCEEDED(hr)) *Value = -wined3d_value.f * 16.0f; + if (SUCCEEDED(hr)) *Value = wined3d_value.f / zbias_factor; break; } @@ -2708,7 +2710,7 @@ IDirect3DDeviceImpl_7_SetRenderState(IDirect3DDevice7 *iface, DWORD d; float f; } wined3d_value; - wined3d_value.f = Value / -16.0; + wined3d_value.f = Value * zbias_factor; hr = IWineD3DDevice_SetRenderState(This->wineD3DDevice, WINED3DRS_DEPTHBIAS, wined3d_value.d);

1 0

André Hentschel : Update German Debian page title
by Jeremy Newman 10 May '11

10 May '11

Module: website Branch: master Commit: 202102a192cc777cdcd72930136b13e0c1f7f3a9 URL: http://source.winehq.org/git/website.git/?a=commit;h=202102a192cc777cdcd729… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri May 6 00:22:26 2011 +0200 Update German Debian page title --- templates/de/download/debian.template | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/de/download/debian.template b/templates/de/download/debian.template index 0e6f615..9c0793c 100644 --- a/templates/de/download/debian.template +++ b/templates/de/download/debian.template @@ -1,5 +1,5 @@ - - + + <h1 class="title"><a href="http://www.debian.org/" target="_new"><img src="{$root}/images/distro/debian.png" width="50" height="50" alt="Debian Linux" border="0"></a> Wine für Debian Sid

1 0

Konstantin L. Metlov : gdi32: Handle pre-Unicode "broken" symbol TTFs with symbols at U+00XX.
by Alexandre Julliard 09 May '11

09 May '11

Module: wine Branch: master Commit: 834378183ad2dffa84fab63b080c31241ac33cba URL: http://source.winehq.org/git/wine.git/?a=commit;h=834378183ad2dffa84fab63b0… Author: Konstantin L. Metlov <metlov(a)fti.dn.ua> Date: Fri May 6 20:32:03 2011 +0300 gdi32: Handle pre-Unicode "broken" symbol TTFs with symbols at U+00XX. --- dlls/gdi32/freetype.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index b329b33..a3e9cec 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -4554,8 +4554,14 @@ static FT_UInt get_glyph_index(const GdiFont *font, UINT glyph) } if(font->ft_face->charmap->encoding == FT_ENCODING_MS_SYMBOL && glyph < 0x100) - glyph = glyph + 0xf000; - glyphId = pFT_Get_Char_Index(font->ft_face, glyph); + { + /* there is a number of old pre-Unicode "broken" TTFs, which + do have symbols at U+00XX instead of U+f0XX */ + if (!(glyphId = pFT_Get_Char_Index(font->ft_face, glyph + 0xf000))) + glyphId = pFT_Get_Char_Index(font->ft_face, glyph); + } + else glyphId = pFT_Get_Char_Index(font->ft_face, glyph); + return get_GSUB_vert_glyph(font,glyphId); }

1 0