October 2009 - Wine-commits

Andrey Turkin : server: Open mem file for write when writing memory.
by Alexandre Julliard 22 Oct '09

22 Oct '09

Module: wine Branch: master Commit: 5116dca8e1e3430bc66d672a9f1afcebf5859526 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5116dca8e1e3430bc66d672a9… Author: Andrey Turkin <andrey.turkin(a)gmail.com> Date: Thu Oct 22 17:09:51 2009 +0400 server: Open mem file for write when writing memory. --- server/procfs.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/server/procfs.c b/server/procfs.c index f7d9073..5caa02b 100644 --- a/server/procfs.c +++ b/server/procfs.c @@ -161,7 +161,7 @@ int write_process_memory( struct process *process, client_ptr_t ptr, size_t size return 0; } - if ((fd = open_proc_as( process, O_RDONLY )) == -1) return 0; + if ((fd = open_proc_as( process, O_WRONLY )) == -1) return 0; ret = pwrite( fd, src, size, (off_t)ptr ); close( fd );

1 0

Andrew Eikum : mshtml: Handle DISPATCH_CONSTRUCT flag for DispatchEx objects.
by Alexandre Julliard 22 Oct '09

22 Oct '09

Module: wine Branch: master Commit: 753aa4ca98cf9d71da3268324b8a6b5fd7efc104 URL: http://source.winehq.org/git/wine.git/?a=commit;h=753aa4ca98cf9d71da3268324… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Oct 21 16:25:14 2009 -0500 mshtml: Handle DISPATCH_CONSTRUCT flag for DispatchEx objects. --- dlls/mshtml/dispex.c | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index 34865c2..d1c9e30 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -804,8 +804,16 @@ static HRESULT WINAPI DispatchEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID lc return This->data->vtbl->invoke(This->outer, id, lcid, wFlags, pdp, pvarRes, pei, pspCaller); if(wFlags == DISPATCH_CONSTRUCT) { - FIXME("DISPATCH_CONSTRUCT not implemented\n"); - return E_NOTIMPL; + if(id == DISPID_VALUE) { + if(This->data->vtbl && This->data->vtbl->value) { + return This->data->vtbl->value(This->outer, lcid, wFlags, pdp, + pvarRes, pei, pspCaller); + } + FIXME("DISPATCH_CONSTRUCT flag but missing value function\n"); + return E_FAIL; + } + FIXME("DISPATCH_CONSTRUCT flag without DISPID_VALUE\n"); + return E_FAIL; } if(is_dynamic_dispid(id)) {

1 0

Andrew Eikum : mshtml: Add HTMLImageElementFactory:: value for constructing IHTMLImgElement objects.
by Alexandre Julliard 22 Oct '09

22 Oct '09

Module: wine Branch: master Commit: ad158f6efddd1ff95db5b93dfa77b7b949d6957d URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad158f6efddd1ff95db5b93df… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Oct 21 16:25:29 2009 -0500 mshtml: Add HTMLImageElementFactory::value for constructing IHTMLImgElement objects. --- dlls/mshtml/htmlimg.c | 35 ++++++++++++++++++++++++++++++++++- 1 files changed, 34 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/htmlimg.c b/dlls/mshtml/htmlimg.c index cc999c0..983002b 100644 --- a/dlls/mshtml/htmlimg.c +++ b/dlls/mshtml/htmlimg.c @@ -743,6 +743,33 @@ static HRESULT WINAPI HTMLImageElementFactory_create(IHTMLImageElementFactory *i return S_OK; } +static HRESULT HTMLImageElementFactory_value(IUnknown *iface, LCID lcid, + WORD flags, DISPPARAMS *params, VARIANT *res, EXCEPINFO *ei, + IServiceProvider *caller) +{ + HTMLImageElementFactory *This = HTMLIMGFACTORY_THIS(iface); + IHTMLImgElement *img; + VARIANT empty, *width, *height; + HRESULT hres; + int argc = params->cArgs - params->cNamedArgs; + + V_VT(res) = VT_NULL; + + V_VT(&empty) = VT_EMPTY; + + width = argc >= 1 ? params->rgvarg + (params->cArgs - 1) : ∅ + height = argc >= 2 ? params->rgvarg + (params->cArgs - 2) : ∅ + + hres = IHTMLImageElementFactory_create(HTMLIMGFACTORY(This), *width, *height, &img); + if(FAILED(hres)) + return hres; + + V_VT(res) = VT_DISPATCH; + V_DISPATCH(res) = (IDispatch*)img; + + return S_OK; +} + #undef HTMLIMGFACTORY_THIS static const IHTMLImageElementFactoryVtbl HTMLImageElementFactoryVtbl = { @@ -761,8 +788,14 @@ static const tid_t HTMLImageElementFactory_iface_tids[] = { 0 }; -static dispex_static_data_t HTMLImageElementFactory_dispex = { +static const dispex_static_data_vtbl_t HTMLImageElementFactory_dispex_vtbl = { + HTMLImageElementFactory_value, NULL, + NULL +}; + +static dispex_static_data_t HTMLImageElementFactory_dispex = { + &HTMLImageElementFactory_dispex_vtbl, IHTMLImageElementFactory_tid, NULL, HTMLImageElementFactory_iface_tids

1 0

Nikolay Sivov : gdi32: Always create a context for DIB_RGB_COLORS.
by Alexandre Julliard 22 Oct '09

22 Oct '09

Module: wine Branch: master Commit: 2854884a428e222cbb9078d875068a72f25365c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2854884a428e222cbb9078d87… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Thu Oct 22 13:15:30 2009 +0400 gdi32: Always create a context for DIB_RGB_COLORS. --- dlls/gdi32/dib.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index 3b1ba92..767c0a9 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -336,17 +336,17 @@ INT WINAPI SetDIBits( HDC hdc, HBITMAP hbitmap, UINT startscan, BITMAPOBJ *bitmap; INT result = 0; + if (coloruse == DIB_RGB_COLORS) hdc = CreateCompatibleDC(0); + if (!(dc = get_dc_ptr( hdc ))) - { - if (coloruse == DIB_RGB_COLORS) FIXME( "shouldn't require a DC for DIB_RGB_COLORS\n" ); return 0; - } update_dc( dc ); if (!(bitmap = GDI_GetObjPtr( hbitmap, OBJ_BITMAP ))) { release_dc_ptr( dc ); + if (coloruse == DIB_RGB_COLORS) DeleteDC(hdc); return 0; } @@ -365,6 +365,7 @@ INT WINAPI SetDIBits( HDC hdc, HBITMAP hbitmap, UINT startscan, done: GDI_ReleaseObj( hbitmap ); release_dc_ptr( dc ); + if (coloruse == DIB_RGB_COLORS) DeleteDC(hdc); return result; }

1 0

Alexandre Julliard : ntdll: Always set the I/ O status information on ioctl completion (Valgrind).
by Alexandre Julliard 22 Oct '09

22 Oct '09

Module: wine Branch: master Commit: 71f4b3bb843d73c31b2a3527bfa8a48573b37089 URL: http://source.winehq.org/git/wine.git/?a=commit;h=71f4b3bb843d73c31b2a3527b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 22 14:48:15 2009 +0200 ntdll: Always set the I/O status information on ioctl completion (Valgrind). --- dlls/ntdll/file.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 4ad84dc..228646f 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -1187,8 +1187,8 @@ static NTSTATUS ioctl_completion( void *arg, IO_STATUS_BLOCK *io, NTSTATUS statu req->handle = wine_server_obj_handle( async->handle ); req->user_arg = wine_server_client_ptr( async ); wine_server_set_reply( req, async->buffer, async->size ); - if (!(status = wine_server_call( req ))) - io->Information = wine_server_reply_size( reply ); + status = wine_server_call( req ); + if (status != STATUS_PENDING) io->Information = wine_server_reply_size( reply ); } SERVER_END_REQ; } @@ -1234,10 +1234,10 @@ static NTSTATUS server_ioctl_file( HANDLE handle, HANDLE event, req->async.cvalue = cvalue; wine_server_add_data( req, in_buffer, in_size ); wine_server_set_reply( req, out_buffer, out_size ); - if (!(status = wine_server_call( req ))) - io->Information = wine_server_reply_size( reply ); + status = wine_server_call( req ); wait_handle = wine_server_ptr_handle( reply->wait ); options = reply->options; + if (status != STATUS_PENDING) io->Information = wine_server_reply_size( reply ); } SERVER_END_REQ;

1 0

Alexandre Julliard : kernel32: Store the symlink target directly into the correct buffer in GetVolumeNameForVolumeMountPointW .
by Alexandre Julliard 22 Oct '09

22 Oct '09

Module: wine Branch: master Commit: 985dd537126f13d4fd91be0d985b4bc308e7bf20 URL: http://source.winehq.org/git/wine.git/?a=commit;h=985dd537126f13d4fd91be0d9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 22 14:57:24 2009 +0200 kernel32: Store the symlink target directly into the correct buffer in GetVolumeNameForVolumeMountPointW. --- dlls/kernel32/volume.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/volume.c b/dlls/kernel32/volume.c index 9fcd061..4a51d50 100644 --- a/dlls/kernel32/volume.c +++ b/dlls/kernel32/volume.c @@ -797,7 +797,7 @@ BOOL WINAPI GetVolumeNameForVolumeMountPointW( LPCWSTR path, LPWSTR volume, DWOR WCHAR *p; char *r; DWORD i, i_size = 1024, o_size = 1024; - WCHAR nonpersist_name[200]; + WCHAR *nonpersist_name; WCHAR symlink_name[MAX_PATH]; NTSTATUS status; HANDLE mgr = INVALID_HANDLE_VALUE; @@ -846,8 +846,8 @@ BOOL WINAPI GetVolumeNameForVolumeMountPointW( LPCWSTR path, LPWSTR volume, DWOR /* Take the mount point and get the "nonpersistent name" */ /* We will then take that and get the volume name */ - status = read_nt_symlink( symlink_name, nonpersist_name, - sizeof(nonpersist_name)/sizeof(WCHAR) ); + nonpersist_name = (WCHAR *)(input + 1); + status = read_nt_symlink( symlink_name, nonpersist_name, i_size - sizeof(*input) ); TRACE("read_nt_symlink got stat=%x, for %s, got <%s>\n", status, debugstr_w(symlink_name), debugstr_w(nonpersist_name)); if (status != STATUS_SUCCESS) @@ -862,7 +862,7 @@ BOOL WINAPI GetVolumeNameForVolumeMountPointW( LPCWSTR path, LPWSTR volume, DWOR memset( input, 0, sizeof(*input) ); /* clear all input parameters */ input->DeviceNameOffset = sizeof(*input); input->DeviceNameLength = lstrlenW( nonpersist_name) * sizeof(WCHAR); - memcpy( input + 1, nonpersist_name, input->DeviceNameLength ); + i_size = input->DeviceNameOffset + input->DeviceNameLength; output->Size = o_size;

1 0

Alexandre Julliard : rpcrt4/tests: Fix a double free (Valgrind).
by Alexandre Julliard 22 Oct '09

22 Oct '09

Module: wine Branch: master Commit: 3b602f5fea113cececda84cbd354c73b46d3cb21 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b602f5fea113cececda84cbd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 22 15:10:58 2009 +0200 rpcrt4/tests: Fix a double free (Valgrind). --- dlls/rpcrt4/tests/rpc_protseq.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/rpcrt4/tests/rpc_protseq.c b/dlls/rpcrt4/tests/rpc_protseq.c index 3acc38b..36aea30 100644 --- a/dlls/rpcrt4/tests/rpc_protseq.c +++ b/dlls/rpcrt4/tests/rpc_protseq.c @@ -173,8 +173,6 @@ static void test_endpoint_mapper(RPC_CSTR protseq, RPC_CSTR address) status = RpcBindingReset(handle); ok(status == RPC_S_OK, "%s: RpcBindingReset failed with error %u\n", protseq, status); - RpcStringFree(&binding); - status = RpcEpResolveBinding(handle, IFoo_v0_0_s_ifspec); ok(status == RPC_S_OK || broken(status == RPC_S_SERVER_UNAVAILABLE), /* win9x */ "%s: RpcEpResolveBinding failed with error %u\n", protseq, status);

1 0

Alexandre Julliard : user32: Data chunks in RIFF file must be word-aligned.
by Alexandre Julliard 22 Oct '09

22 Oct '09

Module: wine Branch: master Commit: 12cb58c42612e73f492d4ccd81007e43ead3678d URL: http://source.winehq.org/git/wine.git/?a=commit;h=12cb58c42612e73f492d4ccd8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 22 15:15:00 2009 +0200 user32: Data chunks in RIFF file must be word-aligned. --- dlls/user32/cursoricon.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 3872c8a..248f3a0 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -967,7 +967,7 @@ static void riff_find_chunk( DWORD chunk_id, DWORD chunk_type, const riff_chunk_ || (chunk_type && *(DWORD *)ptr == chunk_type && *((DWORD *)ptr + 2) == chunk_id )) { ptr += sizeof(DWORD); - chunk->data_size = *(DWORD *)ptr; + chunk->data_size = (*(DWORD *)ptr + 1) & ~1; ptr += sizeof(DWORD); if (chunk_type == ANI_LIST_ID || chunk_type == ANI_RIFF_ID) ptr += sizeof(DWORD); chunk->data = ptr; @@ -976,7 +976,7 @@ static void riff_find_chunk( DWORD chunk_id, DWORD chunk_type, const riff_chunk_ } ptr += sizeof(DWORD); - ptr += *(DWORD *)ptr; + ptr += (*(DWORD *)ptr + 1) & ~1; ptr += sizeof(DWORD); } }

1 0

Rico Schüller : d3d10: Implement ID3D10EffectVariable: :GetElement().
by Alexandre Julliard 22 Oct '09

22 Oct '09

Module: wine Branch: master Commit: 8e2e7eb1e9d92193d688ac1b3cae67b17a7736e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e2e7eb1e9d92193d688ac1b3… Author: Rico Schüller <kgbricola(a)web.de> Date: Wed Oct 21 22:59:46 2009 +0200 d3d10: Implement ID3D10EffectVariable::GetElement(). --- dlls/d3d10/d3d10_private.h | 2 + dlls/d3d10/effect.c | 202 ++++++++++++++++++++++++++++++++++++-------- 2 files changed, 169 insertions(+), 35 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8e2e7eb1e9d92193d688a…

1 0

Rico Schüller : d3d10: Implement ID3D10EffectConstantBuffer::GetParentConstantBuffer().
by Alexandre Julliard 22 Oct '09

22 Oct '09

Module: wine Branch: master Commit: 083d5ced8e8f34a185d9a69d54af344848797493 URL: http://source.winehq.org/git/wine.git/?a=commit;h=083d5ced8e8f34a185d9a69d5… Author: Rico Schüller <kgbricola(a)web.de> Date: Wed Oct 21 22:59:55 2009 +0200 d3d10: Implement ID3D10EffectConstantBuffer::GetParentConstantBuffer(). --- dlls/d3d10/effect.c | 26 +++++++++++++++----------- 1 files changed, 15 insertions(+), 11 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index e9030eb..af78987 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -60,19 +60,20 @@ static struct d3d10_effect_pass null_pass = static struct d3d10_effect_type null_type = {&d3d10_effect_type_vtbl, 0, {NULL, NULL, 0}, NULL, NULL, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL}; static struct d3d10_effect_variable null_local_buffer = - {(ID3D10EffectVariableVtbl *)&d3d10_effect_constant_buffer_vtbl, - NULL, NULL, NULL, NULL, 0, 0, 0, 0, &null_type, NULL, NULL, NULL}; + {(ID3D10EffectVariableVtbl *)&d3d10_effect_constant_buffer_vtbl, &null_local_buffer, + NULL, NULL, NULL, 0, 0, 0, 0, &null_type, NULL, NULL, NULL}; static struct d3d10_effect_variable null_variable = - {&d3d10_effect_variable_vtbl, NULL, NULL, NULL, NULL, 0, 0, 0, 0, &null_type, NULL, NULL, NULL}; + {&d3d10_effect_variable_vtbl, &null_local_buffer, + NULL, NULL, NULL, 0, 0, 0, 0, &null_type, NULL, NULL, NULL}; static struct d3d10_effect_variable null_scalar_variable = - {(ID3D10EffectVariableVtbl *)&d3d10_effect_scalar_variable_vtbl, - NULL, NULL, NULL, NULL, 0, 0, 0, 0, &null_type, NULL, NULL, NULL}; + {(ID3D10EffectVariableVtbl *)&d3d10_effect_scalar_variable_vtbl, &null_local_buffer, + NULL, NULL, NULL, 0, 0, 0, 0, &null_type, NULL, NULL, NULL}; static struct d3d10_effect_variable null_vector_variable = - {(ID3D10EffectVariableVtbl *)&d3d10_effect_vector_variable_vtbl, - NULL, NULL, NULL, NULL, 0, 0, 0, 0, &null_type, NULL, NULL, NULL}; + {(ID3D10EffectVariableVtbl *)&d3d10_effect_vector_variable_vtbl, &null_local_buffer, + NULL, NULL, NULL, 0, 0, 0, 0, &null_type, NULL, NULL, NULL}; static struct d3d10_effect_variable null_matrix_variable = - {(ID3D10EffectVariableVtbl *)&d3d10_effect_matrix_variable_vtbl, - NULL, NULL, NULL, NULL, 0, 0, 0, 0, &null_type, NULL, NULL, NULL}; + {(ID3D10EffectVariableVtbl *)&d3d10_effect_matrix_variable_vtbl, &null_local_buffer, + NULL, NULL, NULL, 0, 0, 0, 0, &null_type, NULL, NULL, NULL}; static struct d3d10_effect_type *get_fx10_type(struct d3d10_effect *effect, const char *data, DWORD offset); @@ -1144,6 +1145,7 @@ static HRESULT parse_fx10_body(struct d3d10_effect *e, const char *data, DWORD d struct d3d10_effect_variable *l = &e->local_buffers[i]; l->vtbl = (ID3D10EffectVariableVtbl *)&d3d10_effect_constant_buffer_vtbl; l->effect = e; + l->buffer = &null_local_buffer; hr = parse_fx10_local_buffer(l, &ptr, data); if (FAILED(hr)) return hr; @@ -2206,9 +2208,11 @@ static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_variable_Get static struct ID3D10EffectConstantBuffer * STDMETHODCALLTYPE d3d10_effect_variable_GetParentConstantBuffer( ID3D10EffectVariable *iface) { - FIXME("iface %p stub!\n", iface); + struct d3d10_effect_variable *This = (struct d3d10_effect_variable *)iface; - return NULL; + TRACE("iface %p\n", iface); + + return (ID3D10EffectConstantBuffer *)This->buffer; } static struct ID3D10EffectScalarVariable * STDMETHODCALLTYPE d3d10_effect_variable_AsScalar(

1 0