March 2009 - Wine-commits - list.winehq.org

Henri Verbeet : d3d8: Fix locking.
by Alexandre Julliard 23 Mar '09

23 Mar '09

Module: wine Branch: master Commit: 775ea907a3ff9ca1bf420272d722758ae8fadce5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=775ea907a3ff9ca1bf420272d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 23 08:30:16 2009 +0100 d3d8: Fix locking. --- dlls/d3d8/device.c | 19 +++++-------------- dlls/d3d8/directx.c | 4 ++++ dlls/d3d8/pixelshader.c | 2 ++ dlls/d3d8/stateblock.c | 28 ++++++++++++++++++++++++---- dlls/d3d8/vertexdeclaration.c | 2 ++ dlls/d3d8/vertexshader.c | 7 ++++++- 6 files changed, 43 insertions(+), 19 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index d5f71fc..119d33d 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -820,10 +820,11 @@ static HRESULT IDirect3DDevice8Impl_CreateSurface(LPDIRECT3DDEVICE8 iface, UINT TRACE("(%p) : w(%d) h(%d) fmt(%d) surf@%p\n", This, Width, Height, Format, *ppSurface); - /* Not called from the VTable, no locking needed */ + EnterCriticalSection(&d3d8_cs); hrc = IWineD3DDevice_CreateSurface(This->WineD3DDevice, Width, Height, wined3dformat_from_d3dformat(Format), Lockable, Discard, Level, &object->wineD3DSurface, Type, Usage & WINED3DUSAGE_MASK, (WINED3DPOOL)Pool, MultiSample,MultisampleQuality, NULL, SURFACE_OPENGL, (IUnknown *)object); + LeaveCriticalSection(&d3d8_cs); if (hrc != D3D_OK || NULL == object->wineD3DSurface) { /* free up object */ FIXME("(%p) call to IWineD3DDevice_CreateSurface failed\n", This); @@ -841,9 +842,7 @@ static HRESULT WINAPI IDirect3DDevice8Impl_CreateRenderTarget(LPDIRECT3DDEVICE8 HRESULT hr; TRACE("Relay\n"); - EnterCriticalSection(&d3d8_cs); hr = IDirect3DDevice8Impl_CreateSurface(iface, Width, Height, Format, Lockable, FALSE /* Discard */, 0 /* Level */ , ppSurface, D3DRTYPE_SURFACE, D3DUSAGE_RENDERTARGET, D3DPOOL_DEFAULT, MultiSample, 0); - LeaveCriticalSection(&d3d8_cs); return hr; } @@ -852,11 +851,9 @@ static HRESULT WINAPI IDirect3DDevice8Impl_CreateDepthStencilSurface(LPDIRECT3DD TRACE("Relay\n"); /* TODO: Verify that Discard is false */ - EnterCriticalSection(&d3d8_cs); hr = IDirect3DDevice8Impl_CreateSurface(iface, Width, Height, Format, TRUE /* Lockable */, FALSE, 0 /* Level */ ,ppSurface, D3DRTYPE_SURFACE, D3DUSAGE_DEPTHSTENCIL, D3DPOOL_DEFAULT, MultiSample, 0); - LeaveCriticalSection(&d3d8_cs); return hr; } @@ -865,10 +862,8 @@ static HRESULT WINAPI IDirect3DDevice8Impl_CreateImageSurface(LPDIRECT3DDEVICE8 HRESULT hr; TRACE("Relay\n"); - EnterCriticalSection(&d3d8_cs); hr = IDirect3DDevice8Impl_CreateSurface(iface, Width, Height, Format, TRUE /* Loackable */ , FALSE /*Discard*/ , 0 /* Level */ , ppSurface, D3DRTYPE_SURFACE, 0 /* Usage (undefined/none) */ , D3DPOOL_SYSTEMMEM, D3DMULTISAMPLE_NONE, 0 /* MultisampleQuality */); - LeaveCriticalSection(&d3d8_cs); return hr; } @@ -894,13 +889,13 @@ static HRESULT WINAPI IDirect3DDevice8Impl_CopyRects(LPDIRECT3DDEVICE8 iface, ID winedesc.Width = &srcWidth; winedesc.Height = &srcHeight; winedesc.Size = &srcSize; + EnterCriticalSection(&d3d8_cs); IWineD3DSurface_GetDesc(Source->wineD3DSurface, &winedesc); winedesc.Format = &destFormat; winedesc.Width = &destWidth; winedesc.Height = &destHeight; winedesc.Size = NULL; - EnterCriticalSection(&d3d8_cs); IWineD3DSurface_GetDesc(Dest->wineD3DSurface, &winedesc); /* Check that the source and destination formats match */ @@ -1759,16 +1754,15 @@ static HRESULT WINAPI IDirect3DDevice8Impl_CreateVertexShader(LPDIRECT3DDEVICE8 object->ref = 1; object->lpVtbl = &Direct3DVertexShader8_Vtbl; - EnterCriticalSection(&d3d8_cs); hrc = IDirect3DDevice8Impl_CreateVertexDeclaration(iface, pDeclaration, &object->vertex_declaration); if (FAILED(hrc)) { ERR("(%p) : IDirect3DDeviceImpl_CreateVertexDeclaration call failed\n", This); - LeaveCriticalSection(&d3d8_cs); HeapFree(GetProcessHeap(), 0, object); *ppShader = 0; return D3DERR_INVALIDCALL; } + EnterCriticalSection(&d3d8_cs); handle = d3d8_allocate_handle(&This->handle_table, object); if (handle == D3D8_INVALID_HANDLE) { @@ -2023,10 +2017,10 @@ static HRESULT WINAPI IDirect3DDevice8Impl_GetVertexShaderDeclaration(LPDIRECT3D EnterCriticalSection(&d3d8_cs); shader = d3d8_get_object(&This->handle_table, pVertexShader - (VS_HIGHESTFIXEDFXF + 1)); + LeaveCriticalSection(&d3d8_cs); if (!shader) { WARN("Invalid handle (%#x) passed.\n", pVertexShader); - LeaveCriticalSection(&d3d8_cs); return D3DERR_INVALIDCALL; } declaration = (IDirect3DVertexDeclaration8Impl *)shader->vertex_declaration; @@ -2034,7 +2028,6 @@ static HRESULT WINAPI IDirect3DDevice8Impl_GetVertexShaderDeclaration(LPDIRECT3D /* If pData is NULL, we just return the required size of the buffer. */ if (!pData) { *pSizeOfData = declaration->elements_size; - LeaveCriticalSection(&d3d8_cs); return D3D_OK; } @@ -2042,12 +2035,10 @@ static HRESULT WINAPI IDirect3DDevice8Impl_GetVertexShaderDeclaration(LPDIRECT3D * we should write the required size and return D3DERR_MOREDATA. * That's not actually true. */ if (*pSizeOfData < declaration->elements_size) { - LeaveCriticalSection(&d3d8_cs); return D3DERR_INVALIDCALL; } CopyMemory(pData, declaration->elements, declaration->elements_size); - LeaveCriticalSection(&d3d8_cs); return D3D_OK; } diff --git a/dlls/d3d8/directx.c b/dlls/d3d8/directx.c index b87b26d..45d914b 100644 --- a/dlls/d3d8/directx.c +++ b/dlls/d3d8/directx.c @@ -71,7 +71,9 @@ static ULONG WINAPI IDirect3D8Impl_Release(LPDIRECT3D8 iface) { if (ref == 0) { TRACE("Releasing wined3d %p\n", This->WineD3D); + EnterCriticalSection(&d3d8_cs); IWineD3D_Release(This->WineD3D); + LeaveCriticalSection(&d3d8_cs); HeapFree(GetProcessHeap(), 0, This); } @@ -389,7 +391,9 @@ static HRESULT WINAPI IDirect3D8Impl_CreateDevice(LPDIRECT3D8 iface, UINT Adapte object->decls = HeapAlloc(GetProcessHeap(), 0, object->declArraySize * sizeof(*object->decls)); if(!object->decls) { ERR("Out of memory\n"); + EnterCriticalSection(&d3d8_cs); IWineD3DDevice_Release(object->WineD3DDevice); + LeaveCriticalSection(&d3d8_cs); HeapFree(GetProcessHeap(), 0, object); *ppReturnedDeviceInterface = NULL; hr = E_OUTOFMEMORY; diff --git a/dlls/d3d8/pixelshader.c b/dlls/d3d8/pixelshader.c index 5cfb0ca..ae8d15f 100644 --- a/dlls/d3d8/pixelshader.c +++ b/dlls/d3d8/pixelshader.c @@ -56,7 +56,9 @@ static ULONG WINAPI IDirect3DPixelShader8Impl_Release(IDirect3DPixelShader8 * if TRACE("(%p) : ReleaseRef to %d\n", This, ref); if (ref == 0) { + EnterCriticalSection(&d3d8_cs); IWineD3DPixelShader_Release(This->wineD3DPixelShader); + LeaveCriticalSection(&d3d8_cs); HeapFree(GetProcessHeap(), 0, This); } return ref; diff --git a/dlls/d3d8/stateblock.c b/dlls/d3d8/stateblock.c index cb9958a..ace9211 100644 --- a/dlls/d3d8/stateblock.c +++ b/dlls/d3d8/stateblock.c @@ -58,7 +58,9 @@ static ULONG WINAPI IDirect3DStateBlock8Impl_Release(IDirect3DStateBlock8 *iface TRACE("(%p) : ReleaseRef to %d\n", This, ref); if (ref == 0) { + EnterCriticalSection(&d3d8_cs); IWineD3DStateBlock_Release(This->wineD3DStateBlock); + LeaveCriticalSection(&d3d8_cs); HeapFree(GetProcessHeap(), 0, This); } return ref; @@ -88,14 +90,32 @@ static HRESULT WINAPI IDirect3DStateBlock8Impl_GetDevice(IDirect3DStateBlock8 *i static HRESULT WINAPI IDirect3DStateBlock8Impl_Capture(IDirect3DStateBlock8 *iface) { IDirect3DStateBlock8Impl *This = (IDirect3DStateBlock8Impl *)iface; - TRACE("(%p) Relay\n", This); - return IWineD3DStateBlock_Capture(This->wineD3DStateBlock); + HRESULT hr; + + TRACE("(%p) Relay\n", This); + + EnterCriticalSection(&d3d8_cs); + + hr = IWineD3DStateBlock_Capture(This->wineD3DStateBlock); + + LeaveCriticalSection(&d3d8_cs); + + return hr; } static HRESULT WINAPI IDirect3DStateBlock8Impl_Apply(IDirect3DStateBlock8 *iface) { IDirect3DStateBlock8Impl *This = (IDirect3DStateBlock8Impl *)iface; - TRACE("(%p) Relay\n", This); - return IWineD3DStateBlock_Apply(This->wineD3DStateBlock); + HRESULT hr; + + TRACE("(%p) Relay\n", This); + + EnterCriticalSection(&d3d8_cs); + + hr = IWineD3DStateBlock_Apply(This->wineD3DStateBlock); + + LeaveCriticalSection(&d3d8_cs); + + return hr; } const IDirect3DStateBlock8Vtbl Direct3DStateBlock8_Vtbl = diff --git a/dlls/d3d8/vertexdeclaration.c b/dlls/d3d8/vertexdeclaration.c index debeca0..46957d0 100644 --- a/dlls/d3d8/vertexdeclaration.c +++ b/dlls/d3d8/vertexdeclaration.c @@ -61,7 +61,9 @@ static ULONG WINAPI IDirect3DVertexDeclaration8Impl_Release(IDirect3DVertexDecla TRACE("(%p) : Releasing to %d\n", This, ref_count); if (!ref_count) { + EnterCriticalSection(&d3d8_cs); IWineD3DVertexDeclaration_Release(This->wined3d_vertex_declaration); + LeaveCriticalSection(&d3d8_cs); HeapFree(GetProcessHeap(), 0, This->elements); HeapFree(GetProcessHeap(), 0, This); } diff --git a/dlls/d3d8/vertexshader.c b/dlls/d3d8/vertexshader.c index 8cd822b..4ea8b52 100644 --- a/dlls/d3d8/vertexshader.c +++ b/dlls/d3d8/vertexshader.c @@ -57,7 +57,12 @@ static ULONG WINAPI IDirect3DVertexShader8Impl_Release(IDirect3DVertexShader8 *i if (ref == 0) { IDirect3DVertexDeclaration8_Release(This->vertex_declaration); - if (This->wineD3DVertexShader) IWineD3DVertexShader_Release(This->wineD3DVertexShader); + if (This->wineD3DVertexShader) + { + EnterCriticalSection(&d3d8_cs); + IWineD3DVertexShader_Release(This->wineD3DVertexShader); + LeaveCriticalSection(&d3d8_cs); + } HeapFree(GetProcessHeap(), 0, This); } return ref;

1 0

Henri Verbeet : d3d10core: Only destroy the device when it doesn' t have any references left.
by Alexandre Julliard 23 Mar '09

23 Mar '09

Module: wine Branch: master Commit: 27a6bb5f081c6f1b5c48f2346ee6d35a138ba776 URL: http://source.winehq.org/git/wine.git/?a=commit;h=27a6bb5f081c6f1b5c48f2346… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 23 08:30:17 2009 +0100 d3d10core: Only destroy the device when it doesn't have any references left. --- dlls/d3d10core/device.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index 1406c38..7320f92 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -75,7 +75,10 @@ static ULONG STDMETHODCALLTYPE d3d10_device_inner_Release(IUnknown *iface) TRACE("%p decreasing refcount to %u\n", This, refcount); - if (This->wined3d_device) IWineD3DDevice_Release(This->wined3d_device); + if (!refcount) + { + if (This->wined3d_device) IWineD3DDevice_Release(This->wined3d_device); + } return refcount; }

1 0

Rob Shearman : widl: Check the attributes applied to function declarations.
by Alexandre Julliard 23 Mar '09

23 Mar '09

Module: wine Branch: master Commit: 12b23fa220536945aef847194284ea44c2382323 URL: http://source.winehq.org/git/wine.git/?a=commit;h=12b23fa220536945aef847194… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Fri Mar 20 16:14:08 2009 +0000 widl: Check the attributes applied to function declarations. --- tools/widl/parser.y | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index fe3db86..7fe373c 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -2513,8 +2513,9 @@ static statement_t *make_statement_declaration(var_t *var) if (var->eval) reg_const(var); } - else if ((var->stgclass == STG_NONE || var->stgclass == STG_REGISTER) && - type_get_type(var->type) != TYPE_FUNCTION) + else if (type_get_type(var->type) == TYPE_FUNCTION) + check_function_attrs(var->name, var->attrs); + else if (var->stgclass == STG_NONE || var->stgclass == STG_REGISTER) error_loc("instantiation of data is illegal\n"); return stmt; }

1 0

Rob Shearman : widl: Output correct code for freeing of conformant-sized and non-conformant strings .
by Alexandre Julliard 23 Mar '09

23 Mar '09

Module: wine Branch: master Commit: 48a5db074bea977969539e5a707bc8d6bc95023b URL: http://source.winehq.org/git/wine.git/?a=commit;h=48a5db074bea977969539e5a7… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Fri Mar 20 16:15:46 2009 +0000 widl: Output correct code for freeing of conformant-sized and non-conformant strings. _StubMsg.pfnFree should be used instead of NdrPointerFree for conformant-sized strings since the buffer will have been allocated using NdrAllocate. Non-conformant strings do not need any freeing since they use a buffer that is allocated on the stack. --- tools/widl/typegen.c | 19 ++++++++++++------- 1 files changed, 12 insertions(+), 7 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 2709b68..07a1d1d 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -3243,7 +3243,7 @@ static void write_parameter_conf_or_var_exprs(FILE *file, int indent, const char break; else if (type_is_alias(type)) type = type_alias_get_aliasee(type); - else if (is_array(type) || is_string_type(var->attrs, type)) + else if (is_array(type)) { if (is_conformance_needed_for_phase(phase) && is_array(type)) { @@ -3376,9 +3376,17 @@ static void write_remoting_arg(FILE *file, int indent, const var_t *func, const if (phase == PHASE_FREE || pass == PASS_RETURN || pointer_type != RPC_FC_RP) { + if (pointer_type == RPC_FC_RP && phase == PHASE_FREE && + !in_attr && is_conformant_array(type)) + { + print_file(file, indent, "if (%s%s)\n", local_var_prefix, var->name); + indent++; + print_file(file, indent, "__frame->_StubMsg.pfnFree(%s%s);\n", local_var_prefix, var->name); + } /* strings returned are assumed to be global and hence don't * need freeing */ - if (phase != PHASE_FREE || pass != PASS_RETURN) + else if (is_declptr(type) && + !(phase == PHASE_FREE && pass == PASS_RETURN)) print_phase_function(file, indent, "Pointer", local_var_prefix, phase, var, start_offset); } @@ -3724,8 +3732,6 @@ void declare_stub_args( FILE *file, int indent, const var_t *func ) LIST_FOR_EACH_ENTRY( var, type_get_function_args(func->type), const var_t, entry ) { - int is_string = is_string_type(var->attrs, var->type); - in_attr = is_attr(var->attrs, ATTR_IN); out_attr = is_attr(var->attrs, ATTR_OUT); if (!out_attr && !in_attr) @@ -3735,7 +3741,7 @@ void declare_stub_args( FILE *file, int indent, const var_t *func ) print_file(file, indent, "NDR_SCONTEXT %s;\n", var->name); else { - if (!in_attr && !is_conformant_array(var->type) && !is_string) + if (!in_attr && !is_conformant_array(var->type)) { type_t *type_to_print; char name[16]; @@ -3779,7 +3785,6 @@ void assign_stub_out_args( FILE *file, int indent, const var_t *func, const char LIST_FOR_EACH_ENTRY( var, type_get_function_args(func->type), const var_t, entry ) { - int is_string = is_string_type(var->attrs, var->type); in_attr = is_attr(var->attrs, ATTR_IN); out_attr = is_attr(var->attrs, ATTR_OUT); if (!out_attr && !in_attr) @@ -3814,7 +3819,7 @@ void assign_stub_out_args( FILE *file, int indent, const var_t *func, const char size = type_memsize(type, &align); fprintf(file, "%u);\n", size); } - else if (!is_string) + else { fprintf(file, " = &%s_W%u;\n", local_var_prefix, i); if (is_ptr(var->type) && !last_ptr(var->type))

1 0

Rob Shearman : widl: Initialise ref pointers to basic and enum types to 0 in generated server code .
by Alexandre Julliard 23 Mar '09

23 Mar '09

Module: wine Branch: master Commit: d38cc9acbcf7fb9619eb1b997276108d8fa8df0e URL: http://source.winehq.org/git/wine.git/?a=commit;h=d38cc9acbcf7fb9619eb1b997… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Fri Mar 20 16:16:25 2009 +0000 widl: Initialise ref pointers to basic and enum types to 0 in generated server code. Previously it was only done for pointers. --- tools/widl/typegen.c | 19 ++++++++++++++++++- 1 files changed, 18 insertions(+), 1 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 07a1d1d..1b7c79d 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -3822,8 +3822,25 @@ void assign_stub_out_args( FILE *file, int indent, const var_t *func, const char else { fprintf(file, " = &%s_W%u;\n", local_var_prefix, i); - if (is_ptr(var->type) && !last_ptr(var->type)) + switch (typegen_detect_type(type_pointer_get_ref(var->type), var->attrs, TDT_IGNORE_STRINGS)) + { + case TGT_BASIC: + case TGT_ENUM: + case TGT_POINTER: print_file(file, indent, "%s_W%u = 0;\n", local_var_prefix, i); + break; + case TGT_STRUCT: + case TGT_UNION: + case TGT_USER_TYPE: + case TGT_IFACE_POINTER: + case TGT_ARRAY: + case TGT_CTXT_HANDLE: + case TGT_CTXT_HANDLE_POINTER: + case TGT_INVALID: + case TGT_STRING: + /* not initialised */ + break; + } i++; }

1 0

Rob Shearman : rpcrt4: Free the resources associated with server protocol sequences on DLL unload .
by Alexandre Julliard 23 Mar '09

23 Mar '09

Module: wine Branch: master Commit: 5e1d10d423f1823d4b3052e8b7684299c3e2dc78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e1d10d423f1823d4b3052e8b… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Fri Mar 20 16:10:42 2009 +0000 rpcrt4: Free the resources associated with server protocol sequences on DLL unload. --- dlls/rpcrt4/rpc_server.c | 58 +++++++++++++++++++++++++++++++------------- dlls/rpcrt4/rpc_server.h | 2 + dlls/rpcrt4/rpcrt4_main.c | 2 + 3 files changed, 45 insertions(+), 17 deletions(-) diff --git a/dlls/rpcrt4/rpc_server.c b/dlls/rpcrt4/rpc_server.c index 565f26e..07434da 100644 --- a/dlls/rpcrt4/rpc_server.c +++ b/dlls/rpcrt4/rpc_server.c @@ -449,27 +449,23 @@ static DWORD CALLBACK RPCRT4_server_thread(LPVOID the_arg) /* start waiting */ res = cps->ops->wait_for_new_connection(cps, count, objs); - if (res == -1) - break; - else if (res == 0) + + if (res == -1 || (res == 0 && !std_listen)) { - if (!std_listen) - { + /* cleanup */ + cps->ops->free_wait_array(cps, objs); + EnterCriticalSection(&cps->cs); + for (conn = cps->conn; conn; conn = conn->Next) + RPCRT4_CloseConnection(conn); + LeaveCriticalSection(&cps->cs); + + if (res == 0 && !std_listen) SetEvent(cps->server_ready_event); - break; - } - set_ready_event = TRUE; + break; } + else if (res == 0) + set_ready_event = TRUE; } - cps->ops->free_wait_array(cps, objs); - EnterCriticalSection(&cps->cs); - /* close connections */ - conn = cps->conn; - while (conn) { - RPCRT4_CloseConnection(conn); - conn = conn->Next; - } - LeaveCriticalSection(&cps->cs); return 0; } @@ -711,6 +707,17 @@ static RPC_STATUS alloc_serverprotoseq(UINT MaxCalls, char *Protseq, RpcServerPr return RPC_S_OK; } +/* must be called with server_cs held */ +static void destroy_serverprotoseq(RpcServerProtseq *ps) +{ + RPCRT4_strfree(ps->Protseq); + DeleteCriticalSection(&ps->cs); + CloseHandle(ps->mgr_mutex); + CloseHandle(ps->server_ready_event); + list_remove(&ps->entry); + HeapFree(GetProcessHeap(), 0, ps); +} + /* Finds a given protseq or creates a new one if one doesn't already exist */ static RPC_STATUS RPCRT4_get_or_create_serverprotseq(UINT MaxCalls, char *Protseq, RpcServerProtseq **ps) { @@ -798,6 +805,23 @@ RPC_STATUS WINAPI RpcServerUseProtseqW(RPC_WSTR Protseq, unsigned int MaxCalls, return RpcServerUseProtseqEpW(Protseq, MaxCalls, NULL, SecurityDescriptor); } +void RPCRT4_destroy_all_protseqs(void) +{ + RpcServerProtseq *cps, *cursor2; + + if (listen_count != 0) + std_listen = FALSE; + + EnterCriticalSection(&server_cs); + LIST_FOR_EACH_ENTRY_SAFE(cps, cursor2, &protseqs, RpcServerProtseq, entry) + { + if (listen_count != 0) + RPCRT4_sync_with_server_thread(cps); + destroy_serverprotoseq(cps); + } + LeaveCriticalSection(&server_cs); +} + /*********************************************************************** * RpcServerRegisterIf (RPCRT4.@) */ diff --git a/dlls/rpcrt4/rpc_server.h b/dlls/rpcrt4/rpc_server.h index ffd5b01..0498616 100644 --- a/dlls/rpcrt4/rpc_server.h +++ b/dlls/rpcrt4/rpc_server.h @@ -79,4 +79,6 @@ typedef struct _RpcServerInterface void RPCRT4_new_client(RpcConnection* conn); const struct protseq_ops *rpcrt4_get_protseq_ops(const char *protseq); +void RPCRT4_destroy_all_protseqs(void); + #endif /* __WINE_RPC_SERVER_H */ diff --git a/dlls/rpcrt4/rpcrt4_main.c b/dlls/rpcrt4/rpcrt4_main.c index 7380b7a..67059e7 100644 --- a/dlls/rpcrt4/rpcrt4_main.c +++ b/dlls/rpcrt4/rpcrt4_main.c @@ -52,6 +52,7 @@ #include "rpcproxy.h" #include "rpc_binding.h" +#include "rpc_server.h" #include "wine/debug.h" @@ -125,6 +126,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) break; case DLL_PROCESS_DETACH: + RPCRT4_destroy_all_protseqs(); break; }

1 0

Rob Shearman : rpcrt4: Simplify some code in RpcServerInqBindings by changing while loops into for loops .
by Alexandre Julliard 23 Mar '09

23 Mar '09

Module: wine Branch: master Commit: 72080674925a0a8c8d473e8a866d25c19e2a1507 URL: http://source.winehq.org/git/wine.git/?a=commit;h=72080674925a0a8c8d473e8a8… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Fri Mar 20 16:11:03 2009 +0000 rpcrt4: Simplify some code in RpcServerInqBindings by changing while loops into for loops. --- dlls/rpcrt4/rpc_server.c | 9 ++------- 1 files changed, 2 insertions(+), 7 deletions(-) diff --git a/dlls/rpcrt4/rpc_server.c b/dlls/rpcrt4/rpc_server.c index 07434da..12a525d 100644 --- a/dlls/rpcrt4/rpc_server.c +++ b/dlls/rpcrt4/rpc_server.c @@ -604,11 +604,8 @@ RPC_STATUS WINAPI RpcServerInqBindings( RPC_BINDING_VECTOR** BindingVector ) count = 0; LIST_FOR_EACH_ENTRY(ps, &protseqs, RpcServerProtseq, entry) { EnterCriticalSection(&ps->cs); - conn = ps->conn; - while (conn) { + for (conn = ps->conn; conn; conn = conn->Next) count++; - conn = conn->Next; - } LeaveCriticalSection(&ps->cs); } if (count) { @@ -620,12 +617,10 @@ RPC_STATUS WINAPI RpcServerInqBindings( RPC_BINDING_VECTOR** BindingVector ) count = 0; LIST_FOR_EACH_ENTRY(ps, &protseqs, RpcServerProtseq, entry) { EnterCriticalSection(&ps->cs); - conn = ps->conn; - while (conn) { + for (conn = ps->conn; conn; conn = conn->Next) { RPCRT4_MakeBinding((RpcBinding**)&(*BindingVector)->BindingH[count], conn); count++; - conn = conn->Next; } LeaveCriticalSection(&ps->cs); }

1 0

Rob Shearman : rpcrt4: Implement NdrRangeUnmarshall for enum types.
by Alexandre Julliard 23 Mar '09

23 Mar '09

Module: wine Branch: master Commit: 1c8c45d0f690626a154c850fdee34e0040ebdccc URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c8c45d0f690626a154c850fd… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Fri Mar 20 16:11:58 2009 +0000 rpcrt4: Implement NdrRangeUnmarshall for enum types. --- dlls/rpcrt4/ndr_marshall.c | 38 +++++++++++++++++++------------------- 1 files changed, 19 insertions(+), 19 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index e983f61..ecad961 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -6189,68 +6189,68 @@ unsigned char *WINAPI NdrRangeUnmarshall( TRACE("base_type = 0x%02x, low_value = %d, high_value = %d\n", base_type, pRange->low_value, pRange->high_value); -#define RANGE_UNMARSHALL(type, format_spec) \ +#define RANGE_UNMARSHALL(mem_type, wire_type, format_spec) \ do \ { \ - ALIGN_POINTER(pStubMsg->Buffer, sizeof(type)); \ + ALIGN_POINTER(pStubMsg->Buffer, sizeof(wire_type)); \ if (!fMustAlloc && !*ppMemory) \ fMustAlloc = TRUE; \ if (fMustAlloc) \ - *ppMemory = NdrAllocate(pStubMsg, sizeof(type)); \ - if (pStubMsg->Buffer + sizeof(type) > pStubMsg->BufferEnd) \ + *ppMemory = NdrAllocate(pStubMsg, sizeof(mem_type)); \ + if (pStubMsg->Buffer + sizeof(wire_type) > pStubMsg->BufferEnd) \ { \ ERR("buffer overflow - Buffer = %p, BufferEnd = %p\n", \ pStubMsg->Buffer, (unsigned char *)pStubMsg->RpcMsg->Buffer + pStubMsg->BufferLength); \ RpcRaiseException(RPC_X_BAD_STUB_DATA); \ } \ - if ((*(type *)pStubMsg->Buffer < (type)pRange->low_value) || \ - (*(type *)pStubMsg->Buffer > (type)pRange->high_value)) \ + if ((*(wire_type *)pStubMsg->Buffer < (mem_type)pRange->low_value) || \ + (*(wire_type *)pStubMsg->Buffer > (mem_type)pRange->high_value)) \ { \ ERR("value exceeded bounds: " format_spec ", low: " format_spec ", high: " format_spec "\n", \ - *(type *)pStubMsg->Buffer, (type)pRange->low_value, \ - (type)pRange->high_value); \ + *(wire_type *)pStubMsg->Buffer, (mem_type)pRange->low_value, \ + (mem_type)pRange->high_value); \ RpcRaiseException(RPC_S_INVALID_BOUND); \ return NULL; \ } \ TRACE("*ppMemory: %p\n", *ppMemory); \ - **(type **)ppMemory = *(type *)pStubMsg->Buffer; \ - pStubMsg->Buffer += sizeof(type); \ + **(mem_type **)ppMemory = *(wire_type *)pStubMsg->Buffer; \ + pStubMsg->Buffer += sizeof(wire_type); \ } while (0) switch(base_type) { case RPC_FC_CHAR: case RPC_FC_SMALL: - RANGE_UNMARSHALL(UCHAR, "%d"); + RANGE_UNMARSHALL(UCHAR, UCHAR, "%d"); TRACE("value: 0x%02x\n", **ppMemory); break; case RPC_FC_BYTE: case RPC_FC_USMALL: - RANGE_UNMARSHALL(CHAR, "%u"); + RANGE_UNMARSHALL(CHAR, CHAR, "%u"); TRACE("value: 0x%02x\n", **ppMemory); break; case RPC_FC_WCHAR: /* FIXME: valid? */ case RPC_FC_USHORT: - RANGE_UNMARSHALL(USHORT, "%u"); + RANGE_UNMARSHALL(USHORT, USHORT, "%u"); TRACE("value: 0x%04x\n", **(USHORT **)ppMemory); break; case RPC_FC_SHORT: - RANGE_UNMARSHALL(SHORT, "%d"); + RANGE_UNMARSHALL(SHORT, SHORT, "%d"); TRACE("value: 0x%04x\n", **(USHORT **)ppMemory); break; case RPC_FC_LONG: - RANGE_UNMARSHALL(LONG, "%d"); + case RPC_FC_ENUM32: + RANGE_UNMARSHALL(LONG, LONG, "%d"); TRACE("value: 0x%08x\n", **(ULONG **)ppMemory); break; case RPC_FC_ULONG: - RANGE_UNMARSHALL(ULONG, "%u"); + RANGE_UNMARSHALL(ULONG, ULONG, "%u"); TRACE("value: 0x%08x\n", **(ULONG **)ppMemory); break; case RPC_FC_ENUM16: - case RPC_FC_ENUM32: - FIXME("Unhandled enum type\n"); + RANGE_UNMARSHALL(UINT, USHORT, "%u"); + TRACE("value: 0x%08x\n", **(UINT **)ppMemory); break; - case RPC_FC_ERROR_STATUS_T: /* FIXME: valid? */ case RPC_FC_FLOAT: case RPC_FC_DOUBLE: case RPC_FC_HYPER:

1 0

Rob Shearman : rpcrt4: Fix a memory leak in union unmarshall functions by never passing fMustAlloc =TRUE into union_arm_unmarshall.
by Alexandre Julliard 23 Mar '09

23 Mar '09

Module: wine Branch: master Commit: ae5770d36649fd0234c8de664bd01ea994ae5d6b URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae5770d36649fd0234c8de664… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Fri Mar 20 16:13:00 2009 +0000 rpcrt4: Fix a memory leak in union unmarshall functions by never passing fMustAlloc=TRUE into union_arm_unmarshall. --- dlls/rpcrt4/ndr_marshall.c | 21 ++++++++++++++++++--- 1 files changed, 18 insertions(+), 3 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index ecad961..d39af85 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -5557,7 +5557,6 @@ static unsigned char *union_arm_unmarshall(PMIDL_STUB_MESSAGE pStubMsg, case RPC_FC_UP: case RPC_FC_OP: case RPC_FC_FP: - **(void***)ppMemory = NULL; ALIGN_POINTER(pStubMsg->Buffer, 4); saved_buffer = pStubMsg->Buffer; if (pStubMsg->PointerBufferMark) @@ -5792,10 +5791,18 @@ unsigned char * WINAPI NdrEncapsulatedUnionUnmarshall(PMIDL_STUB_MESSAGE pStubM if (fMustAlloc) *ppMemory = NdrAllocate(pStubMsg, size); + /* we can't pass fMustAlloc=TRUE into the marshaller for the arm + * since the arm is part of the memory block that is encompassed by + * the whole union. Memory is forced to allocate when pointers + * are set to NULL, so we emulate that part of fMustAlloc=TRUE by + * clearing the memory we pass in to the unmarshaller */ + if (fMustAlloc) + memset(*ppMemory, 0, size); + NdrBaseTypeUnmarshall(pStubMsg, ppMemory, &switch_type, FALSE); pMemoryArm = *ppMemory + increment; - return union_arm_unmarshall(pStubMsg, &pMemoryArm, switch_value, pFormat, fMustAlloc); + return union_arm_unmarshall(pStubMsg, &pMemoryArm, switch_value, pFormat, FALSE); } /*********************************************************************** @@ -5974,7 +5981,15 @@ unsigned char * WINAPI NdrNonEncapsulatedUnionUnmarshall(PMIDL_STUB_MESSAGE pSt if (fMustAlloc) *ppMemory = NdrAllocate(pStubMsg, size); - return union_arm_unmarshall(pStubMsg, ppMemory, discriminant, pFormat, fMustAlloc); + /* we can't pass fMustAlloc=TRUE into the marshaller for the arm + * since the arm is part of the memory block that is encompassed by + * the whole union. Memory is forced to allocate when pointers + * are set to NULL, so we emulate that part of fMustAlloc=TRUE by + * clearing the memory we pass in to the unmarshaller */ + if (fMustAlloc) + memset(*ppMemory, 0, size); + + return union_arm_unmarshall(pStubMsg, ppMemory, discriminant, pFormat, FALSE); } /***********************************************************************

1 0

Vitaliy Margolen : shell32: Fix number of returned arguments from CommandLineToArgvW with empty string .
by Alexandre Julliard 23 Mar '09

23 Mar '09

Module: wine Branch: master Commit: 694219d4a66e7291213d2bdedd8dc995fdf16cf5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=694219d4a66e7291213d2bded… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sun Mar 15 20:29:48 2009 -0600 shell32: Fix number of returned arguments from CommandLineToArgvW with empty string. --- dlls/shell32/shell32_main.c | 2 +- dlls/shell32/tests/shlexec.c | 5 +++++ 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/shell32_main.c b/dlls/shell32/shell32_main.c index 78a2d57..ee62b9c 100644 --- a/dlls/shell32/shell32_main.c +++ b/dlls/shell32/shell32_main.c @@ -111,7 +111,7 @@ LPWSTR* WINAPI CommandLineToArgvW(LPCWSTR lpCmdline, int* numargs) } argv[0]=(LPWSTR)(argv+1); if (numargs) - *numargs=2; + *numargs=1; return argv; } diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index ededdec..863cea1 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -1616,6 +1616,7 @@ static void test_commandline(void) static const WCHAR fmt3[] = {'%','s','=','%','s',' ','%','s','=','\"','%','s','\"',0}; static const WCHAR fmt4[] = {'\"','%','s','\"',' ','\"','%','s',' ','%','s','\"',' ','%','s',0}; static const WCHAR fmt5[] = {'\\','\"','%','s','\"',' ','%','s','=','\"','%','s','\\','\"',' ','\"','%','s','\\','\"',0}; + static const WCHAR fmt6[] = {0}; static const WCHAR chkfmt1[] = {'%','s','=','%','s',0}; static const WCHAR chkfmt2[] = {'%','s',' ','%','s',0}; @@ -1670,6 +1671,10 @@ static void test_commandline(void) todo_wine ok(lstrcmpW(args[0],cmdline)==0,"arg0 is not as expected\n"); wsprintfW(cmdline,chkfmt4,two,three,four); todo_wine ok(lstrcmpW(args[1],cmdline)==0,"arg1 is not as expected\n"); + + wsprintfW(cmdline,fmt6); + args=CommandLineToArgvW(cmdline,&numargs); + ok(numargs == 1, "expected 1 args, got %i\n",numargs); } START_TEST(shlexec)

1 0