April 2011 - Wine-Commits - list.winehq.org

Hans Leidekker : mscoree: Add a stub implementation of GetRealProcAddress.
by Alexandre Julliard April 19, 2011

April 19, 2011

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 April 19, 2011

April 19, 2011

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

Austin English : dbghelp: Get rid of a couple unused variables.
by Alexandre Julliard April 19, 2011

April 19, 2011

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

Alexandre Julliard : ws2_32: Signal overlapped completion in WSAIoctl.
by Alexandre Julliard April 19, 2011

April 19, 2011

Module: wine Branch: master Commit: de0b4a67d81b6753d70e37ef6fa39b984296c607 URL: http://source.winehq.org/git/wine.git/?a=commit;h=de0b4a67d81b6753d70e37ef6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 19 12:26:50 2011 +0200 ws2_32: Signal overlapped completion in WSAIoctl. --- dlls/ws2_32/socket.c | 202 ++++++++++++++++++++------------------------------ 1 files changed, 80 insertions(+), 122 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=de0b4a67d81b6753d70e3…

1 0

Henri Verbeet : ddraw: Verify the viewport belongs to the device in IDirect3DDeviceImpl_3_SetCurrentViewport ().
by Alexandre Julliard April 19, 2011

April 19, 2011

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: Set resource bindings to NULL before releasing them on stateblock destruction .
by Alexandre Julliard April 19, 2011

April 19, 2011

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 April 19, 2011

April 19, 2011

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

Alexandre Julliard : server: Fix sharing parameters for debug event files, and don't fail if the file can't be opened.
by Alexandre Julliard April 19, 2011

April 19, 2011

Module: wine Branch: master Commit: 1b868f4967f2dadd1d12b2b0fc5a14f9c5766ab4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b868f4967f2dadd1d12b2b0f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 19 10:29:44 2011 +0200 server: Fix sharing parameters for debug event files, and don't fail if the file can't be opened. --- server/debugger.c | 26 ++++++++++---------------- 1 files changed, 10 insertions(+), 16 deletions(-) diff --git a/server/debugger.c b/server/debugger.c index c693c7d..2ee6f6d 100644 --- a/server/debugger.c +++ b/server/debugger.c @@ -155,18 +155,8 @@ static int fill_create_process_event( struct debug_event *event, const void *arg close_handle( debugger, event->data.create_process.process ); return 0; } - event->data.create_process.thread = handle; - - handle = 0; - if (exe_module->mapping && - /* the doc says write access too, but this doesn't seem a good idea */ - !(handle = open_mapping_file( debugger, exe_module->mapping, GENERIC_READ, 0 ))) - { - close_handle( debugger, event->data.create_process.process ); - close_handle( debugger, event->data.create_process.thread ); - return 0; - } - event->data.create_process.file = handle; + event->data.create_process.thread = handle; + event->data.create_process.file = 0; event->data.create_process.teb = thread->teb; event->data.create_process.base = exe_module->base; event->data.create_process.start = *entry; @@ -174,6 +164,10 @@ static int fill_create_process_event( struct debug_event *event, const void *arg event->data.create_process.dbg_size = exe_module->dbg_size; event->data.create_process.name = exe_module->name; event->data.create_process.unicode = 1; + + if (exe_module->mapping) /* the doc says write access too, but this doesn't seem a good idea */ + event->data.create_process.file = open_mapping_file( debugger, exe_module->mapping, GENERIC_READ, + FILE_SHARE_READ | FILE_SHARE_WRITE ); return 1; } @@ -195,16 +189,16 @@ static int fill_load_dll_event( struct debug_event *event, const void *arg ) { struct process *debugger = event->debugger->process; const struct process_dll *dll = arg; - obj_handle_t handle = 0; - if (dll->mapping && !(handle = open_mapping_file( debugger, dll->mapping, GENERIC_READ, 0 ))) - return 0; - event->data.load_dll.handle = handle; + event->data.load_dll.handle = 0; event->data.load_dll.base = dll->base; event->data.load_dll.dbg_offset = dll->dbg_offset; event->data.load_dll.dbg_size = dll->dbg_size; event->data.load_dll.name = dll->name; event->data.load_dll.unicode = 1; + if (dll->mapping) + event->data.load_dll.handle = open_mapping_file( debugger, dll->mapping, GENERIC_READ, + FILE_SHARE_READ | FILE_SHARE_WRITE ); return 1; }

1 0

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

April 19, 2011

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

Alexandre Julliard : ws2_32: Use saner parameter names in WSAIoctl.
by Alexandre Julliard April 19, 2011

April 19, 2011

Module: wine Branch: master Commit: c4b67221d4f342453f4ed24f5c12e7049b296cd7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4b67221d4f342453f4ed24f5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 19 11:34:42 2011 +0200 ws2_32: Use saner parameter names in WSAIoctl. --- dlls/ws2_32/socket.c | 106 +++++++++++++++++++++++--------------------------- 1 files changed, 49 insertions(+), 57 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c4b67221d4f342453f4ed…

1 0