January 2008 - Wine-Commits

Stefan Dösinger : wined3d: Implement IWineD3DIndexBuffer::UnLoad.
by Alexandre Julliard Jan. 14, 2008

Jan. 14, 2008

Module: wine Branch: master Commit: 36729a874cd9d45138fa84a607d19388d470358c URL: http://source.winehq.org/git/wine.git/?a=commit;h=36729a874cd9d45138fa84a60… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Jan 12 22:57:49 2008 +0100 wined3d: Implement IWineD3DIndexBuffer::UnLoad. --- dlls/wined3d/indexbuffer.c | 19 ++++++++++++++++++- 1 files changed, 18 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/indexbuffer.c b/dlls/wined3d/indexbuffer.c index b5d1597..372b834 100644 --- a/dlls/wined3d/indexbuffer.c +++ b/dlls/wined3d/indexbuffer.c @@ -111,7 +111,24 @@ static void WINAPI IWineD3DIndexBufferImpl_PreLoad(IWineD3DIndexBuffer *iface) { } static void WINAPI IWineD3DIndexBufferImpl_UnLoad(IWineD3DIndexBuffer *iface) { - IWineD3DResourceImpl_UnLoad((IWineD3DResource *)iface); + IWineD3DIndexBufferImpl *This = (IWineD3DIndexBufferImpl *) iface; + IWineD3DDeviceImpl *device = This->resource.wineD3DDevice; + TRACE("(%p)\n", This); + + /* This is easy: The whole content is shadowed in This->resource.allocatedMemory, + * so we only have to destroy the vbo. Only do it if we have a vbo, which implies + * that vbos are supported. + * (TODO: Make a IWineD3DBuffer base class for index and vertex buffers and share + * this code. Also needed for D3D10) + */ + if(This->vbo) { + ActivateContext(device, device->lastActiveRenderTarget, CTXUSAGE_RESOURCELOAD); + ENTER_GL(); + GL_EXTCALL(glDeleteBuffersARB(1, &This->vbo)); + checkGLcall("glDeleteBuffersARB"); + LEAVE_GL(); + This->vbo = 0; + } } static WINED3DRESOURCETYPE WINAPI IWineD3DIndexBufferImpl_GetType(IWineD3DIndexBuffer *iface) {

1 0

Stefan Dösinger : wined3d: Implement IWineD3DSurface:: UnLoad.
by Alexandre Julliard Jan. 14, 2008

Jan. 14, 2008

Module: wine Branch: master Commit: c372654b2644ce18d9e0ed8790139c96e2766191 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c372654b2644ce18d9e0ed879… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Jan 12 22:33:04 2008 +0100 wined3d: Implement IWineD3DSurface::UnLoad. --- dlls/wined3d/surface.c | 54 ++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 52 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 27e32aa..c9da469 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -489,8 +489,58 @@ void WINAPI IWineD3DSurfaceImpl_PreLoad(IWineD3DSurface *iface) { return; } -void WINAPI IWineD3DSurfaceImpl_UnLoad(IWineD3DSurface *iface) { - FIXME("(%p): Stub!\n", iface); +static void surface_remove_pbo(IWineD3DSurfaceImpl *This) { + This->resource.heapMemory = HeapAlloc(GetProcessHeap() ,0 , This->resource.size + RESOURCE_ALIGNMENT); + This->resource.allocatedMemory = + (BYTE *)(((ULONG_PTR) This->resource.heapMemory + (RESOURCE_ALIGNMENT - 1)) & ~(RESOURCE_ALIGNMENT - 1)); + + ENTER_GL(); + GL_EXTCALL(glBindBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, This->pbo)); + checkGLcall("glBindBuffer(GL_PIXEL_UNPACK_BUFFER, This->pbo)"); + GL_EXTCALL(glGetBufferSubDataARB(GL_PIXEL_UNPACK_BUFFER_ARB, 0, This->resource.size, This->resource.allocatedMemory)); + checkGLcall("glGetBufferSubData"); + GL_EXTCALL(glDeleteBuffersARB(1, &This->pbo)); + checkGLcall("glDeleteBuffers"); + LEAVE_GL(); + + This->pbo = 0; + This->Flags &= ~SFLAG_PBO; +} + +static void WINAPI IWineD3DSurfaceImpl_UnLoad(IWineD3DSurface *iface) { + IWineD3DBaseTexture *texture = NULL; + IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *) iface; + TRACE("(%p)\n", iface); + + /* Default pool resources are supposed to be destroyed before Reset is called. + * Implicit resources stay however. So this means we have an implicit render target + * or depth stencil, and the content isn't supposed to survive the reset anyway + */ + if(This->resource.pool == WINED3DPOOL_DEFAULT) { + TRACE("Default pool - nothing to do\n"); + return; + } + + /* Load the surface into system memory */ + IWineD3DSurface_LoadLocation(iface, SFLAG_INSYSMEM, NULL); + + /* Destroy PBOs, but load them into real sysmem before */ + if(This->Flags & SFLAG_PBO) { + surface_remove_pbo(This); + } + + /* If we're in a texture, the texture name belongs to the texture. Otherwise, + * destroy it + */ + IWineD3DSurface_GetContainer(iface, &IID_IWineD3DBaseTexture, (void **) &texture); + if(!texture) { + ENTER_GL(); + glDeleteTextures(1, &This->glDescription.textureName); + This->glDescription.textureName = 0; + LEAVE_GL(); + } else { + IWineD3DBaseTexture_Release(texture); + } return; }

1 0

Stefan Dösinger : wined3d: Implement IWineD3DVertexBuffer::UnLoad.
by Alexandre Julliard Jan. 14, 2008

Jan. 14, 2008

Module: wine Branch: master Commit: 15245a74b646543a641077b57b056108f69d23a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=15245a74b646543a641077b57… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Jan 8 15:23:35 2008 +0100 wined3d: Implement IWineD3DVertexBuffer::UnLoad. --- dlls/wined3d/vertexbuffer.c | 17 ++++++++++++++++- 1 files changed, 16 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/vertexbuffer.c b/dlls/wined3d/vertexbuffer.c index b8687e0..07ca2a0 100644 --- a/dlls/wined3d/vertexbuffer.c +++ b/dlls/wined3d/vertexbuffer.c @@ -597,7 +597,22 @@ static void WINAPI IWineD3DVertexBufferImpl_PreLoad(IWineD3DVertexBuffer *if } static void WINAPI IWineD3DVertexBufferImpl_UnLoad(IWineD3DVertexBuffer *iface) { - IWineD3DResourceImpl_UnLoad((IWineD3DResource *)iface); + IWineD3DVertexBufferImpl *This = (IWineD3DVertexBufferImpl *) iface; + IWineD3DDeviceImpl *device = This->resource.wineD3DDevice; + TRACE("(%p)\n", This); + + /* This is easy: The whole content is shadowed in This->resource.allocatedMemory, + * so we only have to destroy the vbo. Only do it if we have a vbo, which implies + * that vbos are supported + */ + if(This->vbo) { + ActivateContext(device, device->lastActiveRenderTarget, CTXUSAGE_RESOURCELOAD); + ENTER_GL(); + GL_EXTCALL(glDeleteBuffersARB(1, &This->vbo)); + checkGLcall("glDeleteBuffersARB"); + LEAVE_GL(); + This->vbo = 0; + } } static WINED3DRESOURCETYPE WINAPI IWineD3DVertexBufferImpl_GetType(IWineD3DVertexBuffer *iface) {

1 0

Stefan Dösinger : wined3d: Add a new IWineD3DResource: :UnLoad method.
by Alexandre Julliard Jan. 14, 2008

Jan. 14, 2008

Module: wine Branch: master Commit: e59ddb0ab18d33f472029a6cb1584e9dc740fef9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e59ddb0ab18d33f472029a6cb… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Jan 12 22:56:30 2008 +0100 wined3d: Add a new IWineD3DResource::UnLoad method. --- dlls/wined3d/basetexture.c | 5 +++++ dlls/wined3d/cubetexture.c | 5 +++++ dlls/wined3d/indexbuffer.c | 5 +++++ dlls/wined3d/resource.c | 6 ++++++ dlls/wined3d/surface.c | 6 ++++++ dlls/wined3d/surface_gdi.c | 22 +++++++++++++++++++--- dlls/wined3d/texture.c | 5 +++++ dlls/wined3d/vertexbuffer.c | 5 +++++ dlls/wined3d/volume.c | 5 +++++ dlls/wined3d/volumetexture.c | 5 +++++ dlls/wined3d/wined3d_private.h | 1 + include/wine/wined3d_interface.h | 20 +++++++++++++++++++- 12 files changed, 86 insertions(+), 4 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e59ddb0ab18d33f472029…

1 0

Rob Shearman : rpcrt4: Add traces to the start of TowerConstruct and TowerExplode.
by Alexandre Julliard Jan. 14, 2008

Jan. 14, 2008

Module: wine Branch: master Commit: 516008ff5fa6ddffa8f9230ac9d7faaa8b71c4f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=516008ff5fa6ddffa8f9230ac… Author: Rob Shearman <rob(a)codeweavers.com> Date: Sun Jan 13 20:53:46 2008 +0000 rpcrt4: Add traces to the start of TowerConstruct and TowerExplode. --- dlls/rpcrt4/rpc_epmap.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/rpcrt4/rpc_epmap.c b/dlls/rpcrt4/rpc_epmap.c index cac3f62..46244ec 100644 --- a/dlls/rpcrt4/rpc_epmap.c +++ b/dlls/rpcrt4/rpc_epmap.c @@ -267,6 +267,9 @@ RPC_STATUS WINAPI TowerExplode( const twr_uuid_floor_t *object_floor; const twr_uuid_floor_t *syntax_floor; + TRACE("(%p, %p, %p, %p, %p, %p)\n", tower, object, syntax, protseq, + endpoint, address); + if (protseq) *protseq = NULL; if (endpoint) @@ -336,6 +339,9 @@ RPC_STATUS WINAPI TowerConstruct( twr_uuid_floor_t *object_floor; twr_uuid_floor_t *syntax_floor; + TRACE("(%p, %p, %s, %s, %s, %p)\n", object, syntax, debugstr_a(protseq), + debugstr_a(endpoint), debugstr_a(address), tower); + *tower = NULL; status = RpcTransport_GetTopOfTower(NULL, &tower_size, protseq, address, endpoint);

1 0

Rob Shearman : rpcrt4: Don' t print fixmes for NDR types without a freeing function.
by Alexandre Julliard Jan. 14, 2008

Jan. 14, 2008

Module: wine Branch: master Commit: 4402daa00b29832cf24ea0847a2c49200f3d3fb6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4402daa00b29832cf24ea0847… Author: Rob Shearman <rob(a)codeweavers.com> Date: Sun Jan 13 20:53:25 2008 +0000 rpcrt4: Don't print fixmes for NDR types without a freeing function. Not all types have a freeing function. --- dlls/rpcrt4/ndr_marshall.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index d99fbf9..7dcfa51 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -2568,7 +2568,6 @@ static unsigned char * ComplexFree(PMIDL_STUB_MESSAGE pStubMsg, else m(pStubMsg, pMemory, desc); } - else FIXME("no freer for embedded type %02x\n", *desc); pMemory += size; pFormat += 2; continue; @@ -5245,7 +5244,6 @@ static void union_arm_free(PMIDL_STUB_MESSAGE pStubMsg, m(pStubMsg, pMemory, desc); } } - else FIXME("no freer for embedded type %02x\n", *desc); } }

1 0

Eric Pouech : ole32: Fixed datacache object so that we can retrieve meaningful information.
by Alexandre Julliard Jan. 14, 2008

Jan. 14, 2008

Module: wine Branch: master Commit: 528ad9ebbdbd4f29898a285d494009cf87ef3cc6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=528ad9ebbdbd4f29898a285d4… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sun Jan 13 17:03:44 2008 +0100 ole32: Fixed datacache object so that we can retrieve meaningful information. --- dlls/ole32/datacache.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/datacache.c b/dlls/ole32/datacache.c index 18cd5c2..beb6d93 100644 --- a/dlls/ole32/datacache.c +++ b/dlls/ole32/datacache.c @@ -831,7 +831,7 @@ static HRESULT DataCacheEntry_GetData(DataCacheEntry *This, if (FAILED(hr)) return hr; } - if (stgmedium->tymed == TYMED_NULL) + if (This->stgmedium.tymed == TYMED_NULL) return OLE_E_BLANK; return copy_stg_medium(This->data_cf, stgmedium, &This->stgmedium); }

1 0

Rob Shearman : rpcrt4: Allocate a context handle if a NULL GUID is being unmarshalled.
by Alexandre Julliard Jan. 14, 2008

Jan. 14, 2008

Module: wine Branch: master Commit: 576c9dc6fa227ba9536117f062703cf6e4c15bc0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=576c9dc6fa227ba9536117f06… Author: Rob Shearman <rob(a)codeweavers.com> Date: Sun Jan 13 20:52:25 2008 +0000 rpcrt4: Allocate a context handle if a NULL GUID is being unmarshalled. --- dlls/rpcrt4/ndr_contexthandle.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/rpcrt4/ndr_contexthandle.c b/dlls/rpcrt4/ndr_contexthandle.c index 7334bf6..8ed8f66 100644 --- a/dlls/rpcrt4/ndr_contexthandle.c +++ b/dlls/rpcrt4/ndr_contexthandle.c @@ -320,6 +320,7 @@ NDR_SCONTEXT WINAPI NDRSContextUnmarshall2(RPC_BINDING_HANDLE hBinding, RpcBinding *binding = hBinding; NDR_SCONTEXT SContext; RPC_STATUS status; + const ndr_context_handle *context_ndr = pBuff; TRACE("(%p %p %08x %p %u)\n", hBinding, pBuff, DataRepresentation, CtxGuard, Flags); @@ -330,12 +331,12 @@ NDR_SCONTEXT WINAPI NDRSContextUnmarshall2(RPC_BINDING_HANDLE hBinding, if (Flags & RPC_CONTEXT_HANDLE_FLAGS) FIXME("unimplemented flags: 0x%x\n", Flags & RPC_CONTEXT_HANDLE_FLAGS); - if (!pBuff) + if (!pBuff || (!context_ndr->attributes && + UuidIsNil((UUID *)&context_ndr->uuid, &status))) status = RpcServerAssoc_AllocateContextHandle(binding->Assoc, CtxGuard, &SContext); else { - const ndr_context_handle *context_ndr = pBuff; if (context_ndr->attributes) { ERR("non-null attributes 0x%x\n", context_ndr->attributes);

1 0

Rob Shearman : rpcrt4: Add support for calculating the memory size of complex types with embedded non-conformant strings .
by Alexandre Julliard Jan. 14, 2008

Jan. 14, 2008

Module: wine Branch: master Commit: 97b842c817c9f603bfa45cb61441ee0398bcc402 URL: http://source.winehq.org/git/wine.git/?a=commit;h=97b842c817c9f603bfa45cb61… Author: Rob Shearman <rob(a)codeweavers.com> Date: Sun Jan 13 20:52:54 2008 +0000 rpcrt4: Add support for calculating the memory size of complex types with embedded non-conformant strings. --- dlls/rpcrt4/ndr_marshall.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index 8d358cf..d99fbf9 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -2126,6 +2126,7 @@ static unsigned long EmbeddedComplexSize(const MIDL_STUB_MESSAGE *pStubMsg, case RPC_FC_BOGUS_STRUCT: case RPC_FC_SMFARRAY: case RPC_FC_SMVARRAY: + case RPC_FC_CSTRING: return *(const WORD*)&pFormat[2]; case RPC_FC_USER_MARSHAL: return *(const WORD*)&pFormat[4]; @@ -2140,6 +2141,8 @@ static unsigned long EmbeddedComplexSize(const MIDL_STUB_MESSAGE *pStubMsg, return *(const SHORT*)pFormat; case RPC_FC_IP: return sizeof(void *); + case RPC_FC_WSTRING: + return *(const WORD*)&pFormat[2] * 2; default: FIXME("unhandled embedded type %02x\n", *pFormat); }

1 0

Eric Pouech : winedbg: Added a way to support differently selector information depending on current target .
by Alexandre Julliard Jan. 14, 2008

Jan. 14, 2008

Module: wine Branch: master Commit: bce64150eb108ea6c32d1d023e7f214a1fee4d86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bce64150eb108ea6c32d1d023… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sun Jan 13 17:02:55 2008 +0100 winedbg: Added a way to support differently selector information depending on current target. --- programs/winedbg/be_i386.c | 4 ++-- programs/winedbg/debugger.h | 1 + programs/winedbg/info.c | 2 +- programs/winedbg/tgt_active.c | 1 + programs/winedbg/tgt_minidump.c | 9 +++++++++ programs/winedbg/tgt_module.c | 6 ++++++ 6 files changed, 20 insertions(+), 3 deletions(-) diff --git a/programs/winedbg/be_i386.c b/programs/winedbg/be_i386.c index fe8b087..a4eb251 100644 --- a/programs/winedbg/be_i386.c +++ b/programs/winedbg/be_i386.c @@ -40,7 +40,7 @@ static ADDRESS_MODE get_selector_type(HANDLE hThread, const CONTEXT* ctx, WORD s if (IS_VM86_MODE(ctx)) return AddrModeReal; /* null or system selector */ if (!(sel & 4) || ((sel >> 3) < 17)) return AddrModeFlat; - if (GetThreadSelectorEntry(hThread, sel, &le)) + if (dbg_curr_process->process_io->get_selector(hThread, sel, &le)) return le.HighWord.Bits.Default_Big ? AddrMode1632 : AddrMode1616; /* selector doesn't exist */ return -1; @@ -59,7 +59,7 @@ static void* be_i386_linearize(HANDLE hThread, const ADDRESS64* addr) return (void*)(DWORD)addr->Offset; /* fall through */ case AddrMode1616: - if (!GetThreadSelectorEntry(hThread, addr->Segment, &le)) return NULL; + if (!dbg_curr_process->process_io->get_selector(hThread, addr->Segment, &le)) return NULL; return (void*)((le.HighWord.Bits.BaseHi << 24) + (le.HighWord.Bits.BaseMid << 16) + le.BaseLow + (DWORD)addr->Offset); diff --git a/programs/winedbg/debugger.h b/programs/winedbg/debugger.h index 556bc08..cb327fe 100644 --- a/programs/winedbg/debugger.h +++ b/programs/winedbg/debugger.h @@ -234,6 +234,7 @@ struct be_process_io BOOL (*close_process)(struct dbg_process*, BOOL); BOOL (WINAPI *read)(HANDLE, const void*, void*, SIZE_T, SIZE_T*); BOOL (WINAPI *write)(HANDLE, void*, const void*, SIZE_T, SIZE_T*); + BOOL (WINAPI *get_selector)(HANDLE, DWORD, LDT_ENTRY*); }; extern struct dbg_process* dbg_curr_process; diff --git a/programs/winedbg/info.c b/programs/winedbg/info.c index 2c56d8f..fe0292d 100644 --- a/programs/winedbg/info.c +++ b/programs/winedbg/info.c @@ -584,7 +584,7 @@ void info_win32_segments(DWORD start, int length) for (i = start; i < start + length; i++) { - if (!GetThreadSelectorEntry(dbg_curr_thread->handle, (i << 3) | 7, &le)) + if (!dbg_curr_process->process_io->get_selector(dbg_curr_thread->handle, (i << 3) | 7, &le)) continue; if (le.HighWord.Bits.Type & 0x08) diff --git a/programs/winedbg/tgt_active.c b/programs/winedbg/tgt_active.c index f75f744..d334d17 100644 --- a/programs/winedbg/tgt_active.c +++ b/programs/winedbg/tgt_active.c @@ -984,4 +984,5 @@ static struct be_process_io be_process_active_io = tgt_process_active_close_process, ReadProcessMemory, WriteProcessMemory, + GetThreadSelectorEntry, }; diff --git a/programs/winedbg/tgt_minidump.c b/programs/winedbg/tgt_minidump.c index 26da1e7..db0daf6 100644 --- a/programs/winedbg/tgt_minidump.c +++ b/programs/winedbg/tgt_minidump.c @@ -452,9 +452,18 @@ static BOOL tgt_process_minidump_close_process(struct dbg_process* pcs, BOOL kil return TRUE; } +static BOOL WINAPI tgt_process_minidump_get_selector(HANDLE hThread, DWORD sel, LDT_ENTRY* le) +{ + /* so far, pretend all selectors are valid, and mapped to a 32bit flat address space */ + memset(le, 0, sizeof(*le)); + le->HighWord.Bits.Default_Big = 1; + return TRUE; +} + static struct be_process_io be_process_minidump_io = { tgt_process_minidump_close_process, tgt_process_minidump_read, tgt_process_minidump_write, + tgt_process_minidump_get_selector, }; diff --git a/programs/winedbg/tgt_module.c b/programs/winedbg/tgt_module.c index 043d051..ced9d85 100644 --- a/programs/winedbg/tgt_module.c +++ b/programs/winedbg/tgt_module.c @@ -90,9 +90,15 @@ static BOOL tgt_process_module_close_process(struct dbg_process* pcs, BOOL kill) return TRUE; } +static BOOL WINAPI tgt_process_module_get_selector(HANDLE hThread, DWORD sel, LDT_ENTRY* le) +{ + return FALSE; +} + static struct be_process_io be_process_module_io = { tgt_process_module_close_process, tgt_process_module_read, tgt_process_module_write, + tgt_process_module_get_selector, };

1 0