wine-commits April 2011

wine-commits@winehq.org

3 participants
937 discussions

Hans Leidekker : mscoree: Add a stub implementation of GetRealProcAddress.
by Alexandre Julliard 19 Apr '11

19 Apr '11

Module: wine Branch: master Commit: 22953b84f36ceb81ffad0f9a75fdfbb426303643 URL: http://source.winehq.org/git/wine.git/?a=commit;h=22953b84f36ceb81ffad0f9a7… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Apr 19 11:28:55 2011 +0200 mscoree: Add a stub implementation of GetRealProcAddress. --- dlls/mscoree/mscoree.spec | 2 +- dlls/mscoree/mscoree_main.c | 6 ++++++ include/corerror.h | 1 + 3 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/mscoree/mscoree.spec b/dlls/mscoree/mscoree.spec index 63a14b6..99b3efb 100644 --- a/dlls/mscoree/mscoree.spec +++ b/dlls/mscoree/mscoree.spec @@ -57,7 +57,7 @@ @ stub GetPermissionRequests @ stub GetPrivateContextsPerfCounters @ stub GetProcessExecutableHeap -@ stub GetRealProcAddress +@ stdcall GetRealProcAddress(str ptr) @ stdcall GetRequestedRuntimeInfo(wstr wstr wstr long long ptr long ptr ptr long ptr) @ stub GetRequestedRuntimeVersion @ stub GetRequestedRuntimeVersionForCLSID diff --git a/dlls/mscoree/mscoree_main.c b/dlls/mscoree/mscoree_main.c index 9b5d401..49c802e 100644 --- a/dlls/mscoree/mscoree_main.c +++ b/dlls/mscoree/mscoree_main.c @@ -249,6 +249,12 @@ HRESULT WINAPI GetRequestedRuntimeInfo(LPCWSTR pExe, LPCWSTR pwszVersion, LPCWST return ret; } +HRESULT WINAPI GetRealProcAddress(LPCSTR procname, void **ppv) +{ + FIXME("(%s, %p)\n", debugstr_a(procname), ppv); + return CLR_E_SHIM_RUNTIMEEXPORT; +} + HRESULT WINAPI GetFileVersion(LPCWSTR szFilename, LPWSTR szBuffer, DWORD cchBuffer, DWORD *dwLength) { TRACE("(%s, %p, %d, %p)\n", debugstr_w(szFilename), szBuffer, cchBuffer, dwLength); diff --git a/include/corerror.h b/include/corerror.h index 10e0bd2..aef7f63 100644 --- a/include/corerror.h +++ b/include/corerror.h @@ -124,5 +124,6 @@ #define CLDB_E_FILE_OLDVER EMAKEHR(0x1107) #define CLR_E_SHIM_RUNTIME EMAKEHR(0x1700) +#define CLR_E_SHIM_RUNTIMEEXPORT EMAKEHR(0x1701) #endif /* __WINE_CORERROR_H */

1 0

Jacek Caban : shdocvw: Properly handle IEDocHost refcount.
by Alexandre Julliard 19 Apr '11

19 Apr '11

Module: wine Branch: master Commit: ef9bb15192a9b3919bc23e68842306abb7835121 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef9bb15192a9b3919bc23e688… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 19 10:35:11 2011 +0200 shdocvw: Properly handle IEDocHost refcount. --- dlls/shdocvw/ie.c | 4 +++- dlls/shdocvw/iexplore.c | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/shdocvw/ie.c b/dlls/shdocvw/ie.c index 491f025..757cbb5 100644 --- a/dlls/shdocvw/ie.c +++ b/dlls/shdocvw/ie.c @@ -81,8 +81,10 @@ static ULONG WINAPI InternetExplorer_Release(IWebBrowser2 *iface) if(!ref) { if(This->doc_host) { DocHost_Release(&This->doc_host->doc_host); - if(This->doc_host) + if(This->doc_host) { This->doc_host->ie = NULL; + This->doc_host->doc_host.container_vtbl->release(&This->doc_host->doc_host); + } } if(This->frame_hwnd) diff --git a/dlls/shdocvw/iexplore.c b/dlls/shdocvw/iexplore.c index aebe7c9..f079e62 100644 --- a/dlls/shdocvw/iexplore.c +++ b/dlls/shdocvw/iexplore.c @@ -718,7 +718,7 @@ static ULONG IEDocHost_release(DocHost *iface) if(!ref) { if(This->ie) - This->ie->doc_host = NULL; + ERR("This->ie is not NULL\n"); heap_free(This); } @@ -777,6 +777,7 @@ static HRESULT create_ie(InternetExplorer **ret_obj) } ret->ref = 1; + ret->doc_host->ref = 1; ret->doc_host->ie = ret; DocHost_Init(&ret->doc_host->doc_host, (IDispatch*)&ret->IWebBrowser2_iface, &DocHostContainerVtbl);

1 0

Henri Verbeet : ddraw: Verify the viewport belongs to the device on execute buffer execution.
by Alexandre Julliard 19 Apr '11

19 Apr '11

Module: wine Branch: master Commit: d429aaa9e9d03e644914ae7fad4f3bef82f8f8c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d429aaa9e9d03e644914ae7fa… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 19 00:08:00 2011 +0200 ddraw: Verify the viewport belongs to the device on execute buffer execution. --- dlls/ddraw/ddraw_private.h | 4 ++-- dlls/ddraw/device.c | 5 +++-- dlls/ddraw/executebuffer.c | 16 +++++++++------- 3 files changed, 14 insertions(+), 11 deletions(-) diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index a6cab70..5cc09dd 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -515,8 +515,8 @@ HRESULT d3d_execute_buffer_init(IDirect3DExecuteBufferImpl *execute_buffer, IDirect3DDeviceImpl *device, D3DEXECUTEBUFFERDESC *desc) DECLSPEC_HIDDEN; /* The execute function */ -void IDirect3DExecuteBufferImpl_Execute(IDirect3DExecuteBufferImpl *This, - IDirect3DDeviceImpl *Device, IDirect3DViewportImpl *ViewportImpl) DECLSPEC_HIDDEN; +HRESULT d3d_execute_buffer_execute(IDirect3DExecuteBufferImpl *execute_buffer, + IDirect3DDeviceImpl *device, IDirect3DViewportImpl *viewport) DECLSPEC_HIDDEN; /***************************************************************************** * IDirect3DVertexBuffer diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 80ee926..984afc3 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -718,6 +718,7 @@ IDirect3DDeviceImpl_1_Execute(IDirect3DDevice *iface, IDirect3DDeviceImpl *This = device_from_device1(iface); IDirect3DExecuteBufferImpl *Direct3DExecuteBufferImpl = (IDirect3DExecuteBufferImpl *)ExecuteBuffer; IDirect3DViewportImpl *Direct3DViewportImpl = (IDirect3DViewportImpl *)Viewport; + HRESULT hr; TRACE("iface %p, buffer %p, viewport %p, flags %#x.\n", iface, ExecuteBuffer, Viewport, Flags); @@ -726,10 +727,10 @@ IDirect3DDeviceImpl_1_Execute(IDirect3DDevice *iface, /* Execute... */ EnterCriticalSection(&ddraw_cs); - IDirect3DExecuteBufferImpl_Execute(Direct3DExecuteBufferImpl, This, Direct3DViewportImpl); + hr = d3d_execute_buffer_execute(Direct3DExecuteBufferImpl, This, Direct3DViewportImpl); LeaveCriticalSection(&ddraw_cs); - return D3D_OK; + return hr; } /***************************************************************************** diff --git a/dlls/ddraw/executebuffer.c b/dlls/ddraw/executebuffer.c index d4d2dd0..070cdc7 100644 --- a/dlls/ddraw/executebuffer.c +++ b/dlls/ddraw/executebuffer.c @@ -68,10 +68,8 @@ static void _dump_D3DEXECUTEBUFFERDESC(const D3DEXECUTEBUFFERDESC *lpDesc) { * Viewport: Viewport for this operation * *****************************************************************************/ -void -IDirect3DExecuteBufferImpl_Execute(IDirect3DExecuteBufferImpl *This, - IDirect3DDeviceImpl *lpDevice, - IDirect3DViewportImpl *lpViewport) +HRESULT d3d_execute_buffer_execute(IDirect3DExecuteBufferImpl *This, + IDirect3DDeviceImpl *lpDevice, IDirect3DViewportImpl *lpViewport) { /* DWORD bs = This->desc.dwBufferSize; */ DWORD vs = This->data.dwVertexOffset; @@ -81,10 +79,14 @@ IDirect3DExecuteBufferImpl_Execute(IDirect3DExecuteBufferImpl *This, char *instr = (char *)This->desc.lpData + is; - /* Should check if the viewport was added or not to the device */ + if (lpViewport->active_device != lpDevice) + { + WARN("Viewport %p active device is %p.\n", + lpViewport, lpViewport->active_device); + return DDERR_INVALIDPARAMS; + } /* Activate the viewport */ - lpViewport->active_device = lpDevice; viewport_activate(lpViewport, FALSE); TRACE("ExecuteData :\n"); @@ -551,7 +553,7 @@ IDirect3DExecuteBufferImpl_Execute(IDirect3DExecuteBufferImpl *This, } end_of_buffer: - ; + return D3D_OK; } /*****************************************************************************

1 0

Henri Verbeet : ddraw: Verify the viewport belongs to the device in IDirect3DDeviceImpl_3_SetCurrentViewport ().
by Alexandre Julliard 19 Apr '11

19 Apr '11

Module: wine Branch: master Commit: 9edeb22c345904daa68b8d99b3d4530c11c6345c URL: http://source.winehq.org/git/wine.git/?a=commit;h=9edeb22c345904daa68b8d99b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 19 00:07:59 2011 +0200 ddraw: Verify the viewport belongs to the device in IDirect3DDeviceImpl_3_SetCurrentViewport(). --- dlls/ddraw/device.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 2c85659..80ee926 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -1742,7 +1742,12 @@ IDirect3DDeviceImpl_3_SetCurrentViewport(IDirect3DDevice3 *iface, return D3D_OK; } - /* Should check if the viewport was added or not */ + if (vp->active_device != This) + { + WARN("Viewport %p active device is %p.\n", vp, vp->active_device); + LeaveCriticalSection(&ddraw_cs); + return DDERR_INVALIDPARAMS; + } /* Release previous viewport and AddRef the new one */ if (This->current_viewport) @@ -1757,7 +1762,6 @@ IDirect3DDeviceImpl_3_SetCurrentViewport(IDirect3DDevice3 *iface, This->current_viewport = vp; /* Activate this viewport */ - This->current_viewport->active_device = This; viewport_activate(This->current_viewport, FALSE); LeaveCriticalSection(&ddraw_cs);

1 0

Henri Verbeet : wined3d: Don' t bother unsetting texture resources in IWineD3DDeviceImpl_Uninit3D().
by Alexandre Julliard 19 Apr '11

19 Apr '11

Module: wine Branch: master Commit: e30a05748722c0d9d8dc1bd0c6a2e70781463a46 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e30a05748722c0d9d8dc1bd0c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 19 00:07:58 2011 +0200 wined3d: Don't bother unsetting texture resources in IWineD3DDeviceImpl_Uninit3D(). Releasing the stateblock already takes care of this. --- dlls/wined3d/device.c | 8 -------- 1 files changed, 0 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 3c1ac76..8c443fe 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2136,7 +2136,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Uninit3D(IWineD3DDevice *iface) const struct wined3d_gl_info *gl_info; struct IWineD3DSurfaceImpl *surface; struct wined3d_context *context; - int sampler; UINT i; TRACE("(%p)\n", This); @@ -2174,13 +2173,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Uninit3D(IWineD3DDevice *iface) This->cursorTexture = 0; } - for (sampler = 0; sampler < MAX_FRAGMENT_SAMPLERS; ++sampler) { - IWineD3DDevice_SetTexture(iface, sampler, NULL); - } - for (sampler = 0; sampler < MAX_VERTEX_SAMPLERS; ++sampler) { - IWineD3DDevice_SetTexture(iface, WINED3DVERTEXTEXTURESAMPLER0 + sampler, NULL); - } - /* Destroy the depth blt resources, they will be invalid after the reset. Also free shader * private data, it might contain opengl pointers */

1 0

Henri Verbeet : wined3d: Set resource bindings to NULL before releasing them on stateblock destruction .
by Alexandre Julliard 19 Apr '11

19 Apr '11

Module: wine Branch: master Commit: 4651746102a91b1c78d5cba28bd693feea1ef649 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4651746102a91b1c78d5cba28… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 19 00:07:57 2011 +0200 wined3d: Set resource bindings to NULL before releasing them on stateblock destruction. To prevent ERRs from device_resource_released(). --- dlls/wined3d/stateblock.c | 22 +++++++++++++++++----- 1 files changed, 17 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 6e662e3..27b9831 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -474,6 +474,7 @@ ULONG CDECL wined3d_stateblock_decref(struct wined3d_stateblock *stateblock) if (!refcount) { + struct wined3d_buffer *buffer; int counter; if (stateblock->state.vertex_declaration) @@ -481,23 +482,34 @@ ULONG CDECL wined3d_stateblock_decref(struct wined3d_stateblock *stateblock) for (counter = 0; counter < MAX_COMBINED_SAMPLERS; counter++) { - if (stateblock->state.textures[counter]) - wined3d_texture_decref(stateblock->state.textures[counter]); + struct wined3d_texture *texture = stateblock->state.textures[counter]; + if (texture) + { + stateblock->state.textures[counter] = NULL; + wined3d_texture_decref(texture); + } } for (counter = 0; counter < MAX_STREAMS; ++counter) { - struct wined3d_buffer *buffer = stateblock->state.streams[counter].buffer; + buffer = stateblock->state.streams[counter].buffer; if (buffer) { + stateblock->state.streams[counter].buffer = NULL; if (wined3d_buffer_decref(buffer)) { WARN("Buffer %p still referenced by stateblock, stream %u.\n", buffer, counter); } } } - if (stateblock->state.index_buffer) - wined3d_buffer_decref(stateblock->state.index_buffer); + + buffer = stateblock->state.index_buffer; + if (buffer) + { + stateblock->state.index_buffer = NULL; + wined3d_buffer_decref(buffer); + } + if (stateblock->state.vertex_shader) wined3d_shader_decref(stateblock->state.vertex_shader); if (stateblock->state.pixel_shader)

1 0

Henri Verbeet : wined3d: Also update ds_current_size if there' s no current DS location in surface_load_ds_location().
by Alexandre Julliard 19 Apr '11

19 Apr '11

Module: wine Branch: master Commit: 516ade9b2b790169e1eb6e6ec89133325a7aae5b URL: http://source.winehq.org/git/wine.git/?a=commit;h=516ade9b2b790169e1eb6e6ec… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 19 00:07:56 2011 +0200 wined3d: Also update ds_current_size if there's no current DS location in surface_load_ds_location(). --- dlls/wined3d/surface.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index bf379ca..d302d35 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -4390,6 +4390,8 @@ void surface_load_ds_location(IWineD3DSurfaceImpl *surface, struct wined3d_conte * should do. */ FIXME("No up to date depth stencil location.\n"); surface->flags |= location; + surface->ds_current_size.cx = surface->resource.width; + surface->ds_current_size.cy = surface->resource.height; return; }

1 0

Austin English : dbghelp: Get rid of a couple unused variables.
by Alexandre Julliard 19 Apr '11

19 Apr '11

Module: wine Branch: master Commit: 6abf5fff9db2bfcf925b5a034ed3193f6e76af5a URL: http://source.winehq.org/git/wine.git/?a=commit;h=6abf5fff9db2bfcf925b5a034… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Apr 18 14:57:33 2011 -0500 dbghelp: Get rid of a couple unused variables. --- dlls/dbghelp/dwarf.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index e0f1a90..2b3d54b 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -2121,7 +2121,7 @@ static BOOL dwarf2_parse_line_numbers(const dwarf2_section_t* sections, { dwarf2_traverse_context_t traverse; unsigned long length; - unsigned version, header_len, insn_size, default_stmt; + unsigned insn_size, default_stmt; unsigned line_range, opcode_base; int line_base; const unsigned char* opcode_len; @@ -2150,8 +2150,8 @@ static BOOL dwarf2_parse_line_numbers(const dwarf2_section_t* sections, WARN("out of bounds header\n"); return FALSE; } - version = dwarf2_parse_u2(&traverse); - header_len = dwarf2_parse_u4(&traverse); + dwarf2_parse_u2(&traverse); /* version */ + dwarf2_parse_u4(&traverse); /* header_len */ insn_size = dwarf2_parse_byte(&traverse); default_stmt = dwarf2_parse_byte(&traverse); line_base = (signed char)dwarf2_parse_byte(&traverse);

1 0

André Hentschel : dbghelp: Set the right ARM frame pointer.
by Alexandre Julliard 19 Apr '11

19 Apr '11

Module: wine Branch: master Commit: e0d14005ce63f07b9181044b4ebea48a2eb08280 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0d14005ce63f07b9181044b4… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Apr 18 19:58:45 2011 +0200 dbghelp: Set the right ARM frame pointer. --- dlls/dbghelp/cpu_arm.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dbghelp/cpu_arm.c b/dlls/dbghelp/cpu_arm.c index 365caa3..4f54ef4 100644 --- a/dlls/dbghelp/cpu_arm.c +++ b/dlls/dbghelp/cpu_arm.c @@ -120,7 +120,7 @@ static const char* arm_fetch_regname(unsigned regno) struct cpu cpu_arm = { IMAGE_FILE_MACHINE_ARM, 4, - CV_ARM_NOREG, /* FIXME */ + CV_ARM_R0 + 11, arm_get_addr, arm_stack_walk, NULL,

1 0

Wolfgang Walter : kernel32: Fix TRACE output: IXON and IXOFF are swapped.
by Alexandre Julliard 19 Apr '11

19 Apr '11

Module: wine Branch: master Commit: ce1952446a551547e439838d5c316df9aa3eebcf URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce1952446a551547e439838d5… Author: Wolfgang Walter <wine(a)stwm.de> Date: Fri Dec 12 11:52:13 2008 +0100 kernel32: Fix TRACE output: IXON and IXOFF are swapped. --- dlls/kernel32/comm.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/comm.c b/dlls/kernel32/comm.c index 9653d6e..096bc42 100644 --- a/dlls/kernel32/comm.c +++ b/dlls/kernel32/comm.c @@ -774,7 +774,7 @@ static void dump_dcb(const DCB* lpdcb) lpdcb->ByteSize, lpdcb->BaudRate, lpdcb->fParity, lpdcb->Parity, (lpdcb->StopBits == ONESTOPBIT) ? 1 : (lpdcb->StopBits == TWOSTOPBITS) ? 2 : 0); - TRACE("%sIXON %sIXOFF\n", (lpdcb->fInX) ? "" : "~", (lpdcb->fOutX) ? "" : "~"); + TRACE("%sIXON %sIXOFF\n", (lpdcb->fOutX) ? "" : "~", (lpdcb->fInX) ? "" : "~"); TRACE("fOutxCtsFlow=%d fRtsControl=%d\n", lpdcb->fOutxCtsFlow, lpdcb->fRtsControl); TRACE("fOutxDsrFlow=%d fDtrControl=%d\n", lpdcb->fOutxDsrFlow, lpdcb->fDtrControl); if (lpdcb->fOutxCtsFlow || lpdcb->fRtsControl == RTS_CONTROL_HANDSHAKE)

1 0

← Newer
1
...
28
29
30
31
32
33
34
...
94
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 April 2011