March 2012 - Wine-Commits - list.winehq.org

Huw Davies : winspool: Add a helper to free a printer entry.
by Alexandre Julliard March 30, 2012

March 30, 2012

Module: wine Branch: master Commit: 736fdbdec5fa17f117082b3d4e8d44179f2b2d19 URL: http://source.winehq.org/git/wine.git/?a=commit;h=736fdbdec5fa17f117082b3d4… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Mar 30 14:39:41 2012 +0100 winspool: Add a helper to free a printer entry. --- dlls/winspool.drv/info.c | 17 ++++++++++------- 1 files changed, 10 insertions(+), 7 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 7fbede2..24e5a97 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -773,6 +773,14 @@ static LPCWSTR get_basename_from_name(LPCWSTR name) return name; } +static void free_printer_entry( opened_printer_t *printer ) +{ + /* the queue is shared, so don't free that here */ + HeapFree( GetProcessHeap(), 0, printer->printername ); + HeapFree( GetProcessHeap(), 0, printer->name ); + HeapFree( GetProcessHeap(), 0, printer ); +} + /****************************************************************** * get_opened_printer_entry * Get the first place empty in the opened printer table @@ -883,11 +891,8 @@ static HANDLE get_opened_printer_entry(LPWSTR name, LPPRINTER_DEFAULTSW pDefault end: LeaveCriticalSection(&printer_handles_cs); if (!handle && printer) { - /* Something failed: Free all resources */ - HeapFree(GetProcessHeap(), 0, printer->printername); - HeapFree(GetProcessHeap(), 0, printer->name); if (!queue) HeapFree(GetProcessHeap(), 0, printer->queue); - HeapFree(GetProcessHeap(), 0, printer); + free_printer_entry( printer ); } return (HANDLE)handle; @@ -2722,9 +2727,7 @@ BOOL WINAPI ClosePrinter(HANDLE hPrinter) HeapFree(GetProcessHeap(), 0, printer->queue); } - HeapFree(GetProcessHeap(), 0, printer->printername); - HeapFree(GetProcessHeap(), 0, printer->name); - HeapFree(GetProcessHeap(), 0, printer); + free_printer_entry( printer ); printer_handles[i - 1] = NULL; ret = TRUE; }

1 0

Jacek Caban : mshtml: Use proper helpers in IHTMLStyle:: color implementation.
by Alexandre Julliard March 30, 2012

March 30, 2012

Module: wine Branch: master Commit: 1cd6da26123c7595f4c1e8e117b2bcfaa0332795 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1cd6da26123c7595f4c1e8e11… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 30 14:14:03 2012 +0200 mshtml: Use proper helpers in IHTMLStyle::color implementation. --- dlls/mshtml/htmlstyle.c | 14 ++------------ dlls/mshtml/tests/style.c | 12 ++++++++++++ 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 69f3720..f13fb35 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -885,16 +885,7 @@ static HRESULT WINAPI HTMLStyle_put_color(IHTMLStyle *iface, VARIANT v) TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); - switch(V_VT(&v)) { - case VT_BSTR: - TRACE("%s\n", debugstr_w(V_BSTR(&v))); - return set_style_attr(This, STYLEID_COLOR, V_BSTR(&v), 0); - - default: - FIXME("unsupported vt=%d\n", V_VT(&v)); - } - - return E_NOTIMPL; + return set_nsstyle_attr_var(This->nsstyle, STYLEID_COLOR, &v, ATTR_HEX_INT); } static HRESULT WINAPI HTMLStyle_get_color(IHTMLStyle *iface, VARIANT *p) @@ -903,8 +894,7 @@ static HRESULT WINAPI HTMLStyle_get_color(IHTMLStyle *iface, VARIANT *p) TRACE("(%p)->(%p)\n", This, p); - V_VT(p) = VT_BSTR; - return get_style_attr(This, STYLEID_COLOR, &V_BSTR(p)); + return get_nsstyle_attr_var(This->nsstyle, STYLEID_COLOR, p, 0); } static HRESULT WINAPI HTMLStyle_put_background(IHTMLStyle *iface, BSTR v) diff --git a/dlls/mshtml/tests/style.c b/dlls/mshtml/tests/style.c index 7adb0ea..34e09b1 100644 --- a/dlls/mshtml/tests/style.c +++ b/dlls/mshtml/tests/style.c @@ -572,6 +572,18 @@ static void test_body_style(IHTMLStyle *style) ok(V_VT(&v) == VT_BSTR, "V_VT(color) = %d\n", V_VT(&v)); ok(!V_BSTR(&v), "V_BSTR(color) = %s\n", wine_dbgstr_w(V_BSTR(&v))); + V_VT(&v) = VT_I4; + V_I4(&v) = 0xfdfd; + hres = IHTMLStyle_put_color(style, v); + ok(hres == S_OK, "put_color failed: %08x\n", hres); + + V_VT(&v) = VT_NULL; + hres = IHTMLStyle_get_color(style, &v); + ok(hres == S_OK, "get_color failed: %08x\n", hres); + ok(V_VT(&v) == VT_BSTR, "V_VT(color) = %d\n", V_VT(&v)); + todo_wine + ok(!strcmp_wa(V_BSTR(&v), "#00fdfd"), "V_BSTR(color) = %s\n", wine_dbgstr_w(V_BSTR(&v))); + b = 0xfefe; hres = IHTMLStyle_get_textDecorationUnderline(style, &b); ok(hres == S_OK, "get_textDecorationUnderline failed: %08x\n", hres);

1 0

Hans Leidekker : advapi32: Return a fake security descriptor from CreatePrivateObjectSecurity.
by Alexandre Julliard March 30, 2012

March 30, 2012

Module: wine Branch: master Commit: 40427f1a7741fdc65d32db8480415740f8f19374 URL: http://source.winehq.org/git/wine.git/?a=commit;h=40427f1a7741fdc65d32db848… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Mar 30 12:19:23 2012 +0200 advapi32: Return a fake security descriptor from CreatePrivateObjectSecurity. Based on a patch by Robert Shearman. --- dlls/advapi32/security.c | 43 ++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 40 insertions(+), 3 deletions(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index 172b9a2..9df27db 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -5105,16 +5105,53 @@ BOOL WINAPI CreatePrivateObjectSecurity( HANDLE Token, PGENERIC_MAPPING GenericMapping ) { - FIXME("%p %p %p %d %p %p - stub\n", ParentDescriptor, CreatorDescriptor, - NewDescriptor, IsDirectoryObject, Token, GenericMapping); + SECURITY_DESCRIPTOR_RELATIVE *relative; + DWORD needed, offset; + BYTE *buffer; - return FALSE; + FIXME("%p %p %p %d %p %p - returns fake SECURITY_DESCRIPTOR\n", ParentDescriptor, + CreatorDescriptor, NewDescriptor, IsDirectoryObject, Token, GenericMapping); + + needed = sizeof(SECURITY_DESCRIPTOR_RELATIVE); + needed += sizeof(sidWorld); + needed += sizeof(sidWorld); + needed += WINE_SIZE_OF_WORLD_ACCESS_ACL; + needed += WINE_SIZE_OF_WORLD_ACCESS_ACL; + + if (!(buffer = HeapAlloc( GetProcessHeap(), 0, needed ))) return FALSE; + relative = (SECURITY_DESCRIPTOR_RELATIVE *)buffer; + if (!InitializeSecurityDescriptor( relative, SECURITY_DESCRIPTOR_REVISION )) + { + HeapFree( GetProcessHeap(), 0, buffer ); + return FALSE; + } + relative->Control |= SE_SELF_RELATIVE; + offset = sizeof(SECURITY_DESCRIPTOR_RELATIVE); + + memcpy( buffer + offset, &sidWorld, sizeof(sidWorld) ); + relative->Owner = offset; + offset += sizeof(sidWorld); + + memcpy( buffer + offset, &sidWorld, sizeof(sidWorld) ); + relative->Group = offset; + offset += sizeof(sidWorld); + + GetWorldAccessACL( (ACL *)(buffer + offset) ); + relative->Dacl = offset; + offset += WINE_SIZE_OF_WORLD_ACCESS_ACL; + + GetWorldAccessACL( (ACL *)(buffer + offset) ); + relative->Sacl = offset; + + *NewDescriptor = relative; + return TRUE; } BOOL WINAPI DestroyPrivateObjectSecurity( PSECURITY_DESCRIPTOR* ObjectDescriptor ) { FIXME("%p - stub\n", ObjectDescriptor); + HeapFree( GetProcessHeap(), 0, *ObjectDescriptor ); return TRUE; }

1 0

Piotr Caban : msvcp90: Added partial basic_ios<char> implementation.
by Alexandre Julliard March 30, 2012

March 30, 2012

Module: wine Branch: master Commit: cee8e2b9e507b56211911dda2f554ab169720603 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cee8e2b9e507b56211911dda2… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Mar 30 10:35:20 2012 +0200 msvcp90: Added partial basic_ios<char> implementation. --- dlls/msvcp90/ios.c | 124 ++++++++++++++++++++++++++++++--------------- dlls/msvcp90/msvcp90.spec | 4 +- 2 files changed, 85 insertions(+), 43 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cee8e2b9e507b56211911…

1 0

Hans Leidekker : sxs: Implement IAssemblyCache::QueryAssemblyInfo.
by Alexandre Julliard March 30, 2012

March 30, 2012

Module: wine Branch: master Commit: f2ce0cdabfbdb1136fbc6b7a81e0791d78add4d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2ce0cdabfbdb1136fbc6b7a8… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Mar 30 10:21:11 2012 +0200 sxs: Implement IAssemblyCache::QueryAssemblyInfo. --- dlls/sxs/cache.c | 211 ++++++++++++++++++++++++++++++++++++------------------ 1 files changed, 141 insertions(+), 70 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f2ce0cdabfbdb1136fbc6…

1 0

Hans Leidekker : sxs: Add tests for IAssemblyCache::QueryAssemblyInfo.
by Alexandre Julliard March 30, 2012

March 30, 2012

Module: wine Branch: master Commit: 0a648d76f1a089b6c985e0c7b830ca3daa76f348 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a648d76f1a089b6c985e0c7b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Mar 30 10:21:26 2012 +0200 sxs: Add tests for IAssemblyCache::QueryAssemblyInfo. --- dlls/sxs/tests/Makefile.in | 1 + dlls/sxs/tests/cache.c | 211 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 212 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0a648d76f1a089b6c985e…

1 0

Henri Verbeet : d3d9: Don' t return a pointer to the implementation in IDirect3DSwapChain9Impl_QueryInterface ().
by Alexandre Julliard March 30, 2012

March 30, 2012

Module: wine Branch: master Commit: b76f0aeee0476f14f7cd77941047776a6e4701ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=b76f0aeee0476f14f7cd77941… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Mar 30 01:08:37 2012 +0200 d3d9: Don't return a pointer to the implementation in IDirect3DSwapChain9Impl_QueryInterface(). --- dlls/d3d9/swapchain.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/d3d9/swapchain.c b/dlls/d3d9/swapchain.c index b9bff96..7a13848 100644 --- a/dlls/d3d9/swapchain.c +++ b/dlls/d3d9/swapchain.c @@ -28,18 +28,18 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d9); /* IDirect3DSwapChain IUnknown parts follow: */ static HRESULT WINAPI IDirect3DSwapChain9Impl_QueryInterface(LPDIRECT3DSWAPCHAIN9 iface, REFIID riid, LPVOID* ppobj) { - IDirect3DSwapChain9Impl *This = (IDirect3DSwapChain9Impl *)iface; - TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), ppobj); - if (IsEqualGUID(riid, &IID_IUnknown) - || IsEqualGUID(riid, &IID_IDirect3DSwapChain9)) { + if (IsEqualGUID(riid, &IID_IDirect3DSwapChain9) + || IsEqualGUID(riid, &IID_IUnknown)) + { IDirect3DSwapChain9_AddRef(iface); - *ppobj = This; + *ppobj = iface; return S_OK; } - WARN("(%p)->(%s,%p),not found\n", This, debugstr_guid(riid), ppobj); + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid)); + *ppobj = NULL; return E_NOINTERFACE; }

1 0

Aric Stewart : quartz: Update null renderer to use the BaseRenderer from strmbase.
by Alexandre Julliard March 30, 2012

March 30, 2012

Module: wine Branch: master Commit: 3b85b13e27b4f5bb7a6d179619b231301dfcbcae URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b85b13e27b4f5bb7a6d17961… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Mar 29 19:21:54 2012 -0500 quartz: Update null renderer to use the BaseRenderer from strmbase. --- dlls/quartz/nullrenderer.c | 297 ++++++-------------------------------------- 1 files changed, 36 insertions(+), 261 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3b85b13e27b4f5bb7a6d1…

1 0

Henri Verbeet : ddraw: Querying IUnknown for a surface should return the IDirectDrawSurface interface .
by Alexandre Julliard March 30, 2012

March 30, 2012

Module: wine Branch: master Commit: f7719a89adb83e91662cc6840f23afc23081c947 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7719a89adb83e91662cc6840… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Mar 30 01:08:36 2012 +0200 ddraw: Querying IUnknown for a surface should return the IDirectDrawSurface interface. --- dlls/ddraw/surface.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 2178064..202eb4d 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -142,8 +142,7 @@ static HRESULT WINAPI ddraw_surface7_QueryInterface(IDirectDrawSurface7 *iface, if(!riid) return DDERR_INVALIDPARAMS; - if (IsEqualGUID(riid, &IID_IUnknown) - || IsEqualGUID(riid, &IID_IDirectDrawSurface7) ) + if (IsEqualGUID(riid, &IID_IDirectDrawSurface7)) { IDirectDrawSurface7_AddRef(iface); *obj = iface; @@ -175,7 +174,8 @@ static HRESULT WINAPI ddraw_surface7_QueryInterface(IDirectDrawSurface7 *iface, return S_OK; } - if (IsEqualGUID(riid, &IID_IDirectDrawSurface)) + if (IsEqualGUID(riid, &IID_IDirectDrawSurface) + || IsEqualGUID(riid, &IID_IUnknown)) { IDirectDrawSurface_AddRef(&This->IDirectDrawSurface_iface); *obj = &This->IDirectDrawSurface_iface;

1 0

Henri Verbeet : d3d9: Don' t return a pointer to the implementation in IDirect3DSurface9Impl_QueryInterface ().
by Alexandre Julliard March 30, 2012

March 30, 2012

Module: wine Branch: master Commit: fa3838e9deb0495a667f9306b84c1fdeca7ab24e URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa3838e9deb0495a667f9306b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Mar 30 01:08:38 2012 +0200 d3d9: Don't return a pointer to the implementation in IDirect3DSurface9Impl_QueryInterface(). --- dlls/d3d9/surface.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/d3d9/surface.c b/dlls/d3d9/surface.c index eb78a01..e453ed8 100644 --- a/dlls/d3d9/surface.c +++ b/dlls/d3d9/surface.c @@ -34,19 +34,19 @@ static inline IDirect3DSurface9Impl *impl_from_IDirect3DSurface9(IDirect3DSurfac static HRESULT WINAPI IDirect3DSurface9Impl_QueryInterface(IDirect3DSurface9 *iface, REFIID riid, void **ppobj) { - IDirect3DSurface9Impl *This = impl_from_IDirect3DSurface9(iface); - TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), ppobj); - if (IsEqualGUID(riid, &IID_IUnknown) - || IsEqualGUID(riid, &IID_IDirect3DResource9) - || IsEqualGUID(riid, &IID_IDirect3DSurface9)) { + if (IsEqualGUID(riid, &IID_IDirect3DSurface9) + || IsEqualGUID(riid, &IID_IDirect3DResource9) + || IsEqualGUID(riid, &IID_IUnknown)) + { IDirect3DSurface9_AddRef(iface); - *ppobj = This; + *ppobj = iface; return S_OK; } - WARN("(%p)->(%s,%p),not found\n", This, debugstr_guid(riid), ppobj); + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid)); + *ppobj = NULL; return E_NOINTERFACE; }

1 0