wine-commits March 2019

wine-commits@winehq.org

2 participants
1097 discussions

Michael Stefaniuc : d3dx9: Avoid using 'This' in d3dx_effect_GetPool().
by Alexandre Julliard 22 Mar '19

22 Mar '19

Module: wine Branch: master Commit: 3bd0fc3d6ad75ec723f2268e2d6de79be904de2c URL: https://source.winehq.org/git/wine.git/?a=commit;h=3bd0fc3d6ad75ec723f2268e… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Mar 22 19:09:52 2019 +0100 d3dx9: Avoid using 'This' in d3dx_effect_GetPool(). Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/effect.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 7635caa..874b81b 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -3523,9 +3523,9 @@ static HRESULT WINAPI d3dx_effect_SetArrayRange(ID3DXEffect *iface, D3DXHANDLE p /*** ID3DXEffect methods ***/ static HRESULT WINAPI d3dx_effect_GetPool(ID3DXEffect *iface, ID3DXEffectPool **pool) { - struct d3dx_effect *This = impl_from_ID3DXEffect(iface); + struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); - TRACE("iface %p, pool %p\n", This, pool); + TRACE("iface %p, pool %p.\n", effect, pool); if (!pool) { @@ -3533,14 +3533,14 @@ static HRESULT WINAPI d3dx_effect_GetPool(ID3DXEffect *iface, ID3DXEffectPool ** return D3DERR_INVALIDCALL; } - if (This->pool) + *pool = NULL; + if (effect->pool) { - This->pool->lpVtbl->AddRef(This->pool); + *pool = effect->pool; + (*pool)->lpVtbl->AddRef(*pool); } - *pool = This->pool; - - TRACE("Returning pool %p\n", *pool); + TRACE("Returning pool %p.\n", *pool); return S_OK; }

1 0

Jacek Caban : mshtml: Add IHTMLWindow6::get_localStorage implementation.
by Alexandre Julliard 22 Mar '19

22 Mar '19

Module: wine Branch: master Commit: 64b5d6b3e5944b6f4b4d6bcd0df2f8b6bb32b584 URL: https://source.winehq.org/git/wine.git/?a=commit;h=64b5d6b3e5944b6f4b4d6bcd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 22 15:16:28 2019 +0100 mshtml: Add IHTMLWindow6::get_localStorage implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlwindow.c | 20 +++++++++++++++++--- dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/tests/elements.js | 11 ++++++++++- 3 files changed, 28 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 92b0537..926ebb9 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -295,6 +295,8 @@ static void release_inner_window(HTMLInnerWindow *This) if(This->session_storage) IHTMLStorage_Release(This->session_storage); + if(This->local_storage) + IHTMLStorage_Release(This->local_storage); if(This->mon) IMoniker_Release(This->mon); @@ -2123,7 +2125,7 @@ static HRESULT WINAPI HTMLWindow6_get_sessionStorage(IHTMLWindow6 *iface, IHTMLS { HTMLWindow *This = impl_from_IHTMLWindow6(iface); - FIXME("(%p)->(%p)\n", This, p); + TRACE("(%p)->(%p)\n", This, p); if(!This->inner_window->session_storage) { HRESULT hres; @@ -2141,8 +2143,20 @@ static HRESULT WINAPI HTMLWindow6_get_sessionStorage(IHTMLWindow6 *iface, IHTMLS static HRESULT WINAPI HTMLWindow6_get_localStorage(IHTMLWindow6 *iface, IHTMLStorage **p) { HTMLWindow *This = impl_from_IHTMLWindow6(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + if(!This->inner_window->local_storage) { + HRESULT hres; + + hres = create_storage(&This->inner_window->local_storage); + if(FAILED(hres)) + return hres; + } + + IHTMLStorage_AddRef(This->inner_window->local_storage); + *p = This->inner_window->local_storage; + return S_OK; } static HRESULT WINAPI HTMLWindow6_put_onhashchange(IHTMLWindow6 *iface, VARIANT v) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index f2939da..14cc561 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -515,6 +515,7 @@ struct HTMLInnerWindow { IHTMLScreen *screen; OmHistory *history; IHTMLStorage *session_storage; + IHTMLStorage *local_storage; BOOL performance_initialized; VARIANT performance; diff --git a/dlls/mshtml/tests/elements.js b/dlls/mshtml/tests/elements.js index 7213388..b23f5c1 100644 --- a/dlls/mshtml/tests/elements.js +++ b/dlls/mshtml/tests/elements.js @@ -290,6 +290,14 @@ function test_style_properties() { next_test(); } +function test_storage() { + ok(typeof(window.sessionStorage) === "object", + "typeof(window.sessionStorage) = " + typeof(window.sessionStorage)); + ok(typeof(window.localStorage) === "object", + "typeof(window.localStorage) = " + typeof(window.localStorage)); + next_test(); +} + var tests = [ test_input_selection, test_textContent, @@ -301,5 +309,6 @@ var tests = [ test_query_selector, test_compare_position, test_document_owner, - test_style_properties + test_style_properties, + test_storage ];

1 0

Michael Stefaniuc : iphlpapi: Drop unneeded continue statements ( coccinellery).
by Alexandre Julliard 22 Mar '19

22 Mar '19

Module: wine Branch: master Commit: 8c79999122e3ca6b7d4239ed6848f7cabd053a48 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8c79999122e3ca6b7d4239ed… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Mar 22 08:47:35 2019 +0100 iphlpapi: Drop unneeded continue statements (coccinellery). Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/ipstats.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/dlls/iphlpapi/ipstats.c b/dlls/iphlpapi/ipstats.c index c36f42a..be1cc52 100644 --- a/dlls/iphlpapi/ipstats.c +++ b/dlls/iphlpapi/ipstats.c @@ -823,11 +823,8 @@ DWORD WINAPI GetIpStatisticsEx(PMIB_IPSTATS stats, DWORD family) *ptr='\0'; for (i = 0; i < ARRAY_SIZE(ipstatlist); i++) - if (!strcasecmp(buf, ipstatlist[i].name)) - { - if (sscanf(value, "%d", &res)) *ipstatlist[i].elem = res; - continue; - } + if (!strcasecmp(buf, ipstatlist[i].name) && sscanf(value, "%d", &res)) + *ipstatlist[i].elem = res; } fclose(fp); ret = NO_ERROR; @@ -1213,11 +1210,8 @@ DWORD WINAPI GetUdpStatisticsEx(PMIB_UDPSTATS stats, DWORD family) *ptr='\0'; for (i = 0; i < ARRAY_SIZE(udpstatlist); i++) - if (!strcasecmp(buf, udpstatlist[i].name)) - { - if (sscanf(value, "%d", &res)) *udpstatlist[i].elem = res; - continue; - } + if (!strcasecmp(buf, udpstatlist[i].name) && sscanf(value, "%d", &res)) + *udpstatlist[i].elem = res; } fclose(fp); ret = NO_ERROR;

1 0

Michael Stefaniuc : gdiplus: Avoid using the comma operator.
by Alexandre Julliard 22 Mar '19

22 Mar '19

Module: wine Branch: master Commit: 5d2aa1eebd11d2b7f65169ce6a43ed11377668b4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5d2aa1eebd11d2b7f65169ce… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Mar 22 08:47:34 2019 +0100 gdiplus: Avoid using the comma operator. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/brush.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c index 42b7e84..e65d4a2 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -67,7 +67,7 @@ GpStatus WINGDIPAPI GdipCloneBrush(GpBrush *brush, GpBrush **clone) *clone = heap_alloc_zero(sizeof(GpPathGradient)); if (!*clone) return OutOfMemory; - src = (GpPathGradient*) brush, + src = (GpPathGradient*) brush; dest = (GpPathGradient*) *clone; memcpy(dest, src, sizeof(GpPathGradient));

1 0

Michael Stefaniuc : comdlg32: Avoid using the comma operator.
by Alexandre Julliard 22 Mar '19

22 Mar '19

Module: wine Branch: master Commit: 773e1788ceb21c116115511e3eefb468b2d0fa36 URL: https://source.winehq.org/git/wine.git/?a=commit;h=773e1788ceb21c116115511e… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Mar 22 08:47:33 2019 +0100 comdlg32: Avoid using the comma operator. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comdlg32/itemdlg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comdlg32/itemdlg.c b/dlls/comdlg32/itemdlg.c index 5f36d2b..1ae20ca 100644 --- a/dlls/comdlg32/itemdlg.c +++ b/dlls/comdlg32/itemdlg.c @@ -1284,7 +1284,7 @@ static UINT ctrl_container_resize(FileDialogImpl *This, UINT container_width) /* Move the controls to their final destination */ - cur_col_pos = 0, cur_row_pos = 0; + cur_col_pos = 0; cur_row_pos = 0; LIST_FOR_EACH_ENTRY(ctrl, &This->cctrls, customctrl, entry) { if(ctrl->cdcstate & CDCS_VISIBLE)

1 0

Michael Stefaniuc : propsys: Remove useless cast to self.
by Alexandre Julliard 22 Mar '19

22 Mar '19

Module: wine Branch: master Commit: 44d4fb5f1ecafb3e2744933ab19c8ca100dc6219 URL: https://source.winehq.org/git/wine.git/?a=commit;h=44d4fb5f1ecafb3e2744933a… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Mar 22 08:47:32 2019 +0100 propsys: Remove useless cast to self. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/propsys/propvar.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/propsys/propvar.c b/dlls/propsys/propvar.c index 5d6eeca..98fb129 100644 --- a/dlls/propsys/propvar.c +++ b/dlls/propsys/propvar.c @@ -206,7 +206,7 @@ HRESULT WINAPI PropVariantToInt64(REFPROPVARIANT propvarIn, LONGLONG *ret) TRACE("%p,%p\n", propvarIn, ret); hr = PROPVAR_ConvertNumber(propvarIn, 64, TRUE, &res); - if (SUCCEEDED(hr)) *ret = (LONGLONG)res; + if (SUCCEEDED(hr)) *ret = res; return hr; }

1 0

Michael Stefaniuc : quartz: Remove useless casts to self.
by Alexandre Julliard 22 Mar '19

22 Mar '19

Module: wine Branch: master Commit: b7ce2fc508aa88a1454bb9206a0d118e8c8577e9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b7ce2fc508aa88a1454bb920… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Mar 22 08:47:31 2019 +0100 quartz: Remove useless casts to self. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/avisplit.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/quartz/avisplit.c b/dlls/quartz/avisplit.c index 40020bb..f55ebf2 100644 --- a/dlls/quartz/avisplit.c +++ b/dlls/quartz/avisplit.c @@ -955,10 +955,8 @@ static HRESULT AVISplitter_InitializeStreams(AVISplitterImpl *This) for (x = 0; x < This->Parser.cStreams; ++x) { - if ((DWORD)This->streams[x].frames != This->streams[x].streamheader.dwLength) - { - FIXME("stream %u: frames found: %u, frames meant to be found: %u\n", x, (DWORD)This->streams[x].frames, This->streams[x].streamheader.dwLength); - } + if (This->streams[x].frames != This->streams[x].streamheader.dwLength) + FIXME("stream %u: frames found: %u, frames meant to be found: %u\n", x, This->streams[x].frames, This->streams[x].streamheader.dwLength); } }

1 0

Derek Lesho : ntoskrnl.exe: Add IoWMIOpenBlock stub.
by Alexandre Julliard 22 Mar '19

22 Mar '19

Module: wine Branch: master Commit: 468c546f90676e8a5fd1d8d379e757fe39ca9c15 URL: https://source.winehq.org/git/wine.git/?a=commit;h=468c546f90676e8a5fd1d8d3… Author: Derek Lesho <dereklesho52(a)gmail.com> Date: Thu Mar 21 11:54:00 2019 -0400 ntoskrnl.exe: Add IoWMIOpenBlock stub. Signed-off-by: Derek Lesho <dereklesho52(a)Gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 9 +++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 27c7d00..dc10f03 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -3072,6 +3072,15 @@ NTSTATUS WINAPI IoWMIRegistrationControl(PDEVICE_OBJECT DeviceObject, ULONG Acti } /***************************************************** + * IoWMIOpenBlock (NTOSKRNL.EXE.@) + */ +NTSTATUS WINAPI IoWMIOpenBlock(LPCGUID guid, ULONG desired_access, PVOID *data_block_obj) +{ + FIXME("(%p %u %p) stub\n", guid, desired_access, data_block_obj); + return STATUS_NOT_IMPLEMENTED; +} + +/***************************************************** * PsSetLoadImageNotifyRoutine (NTOSKRNL.EXE.@) */ NTSTATUS WINAPI PsSetLoadImageNotifyRoutine(PLOAD_IMAGE_NOTIFY_ROUTINE routine) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index da16bc2..43f4747 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -490,7 +490,7 @@ @ stub IoWMIDeviceObjectToInstanceName @ stub IoWMIExecuteMethod @ stub IoWMIHandleToInstanceName -@ stub IoWMIOpenBlock +@ stdcall IoWMIOpenBlock(ptr long ptr) @ stub IoWMIQueryAllData @ stub IoWMIQueryAllDataMultiple @ stub IoWMIQuerySingleInstance

1 0

Alexandre Julliard : ntdll: Default to 7-bit ASCII before codepages are initialized.
by Alexandre Julliard 22 Mar '19

22 Mar '19

Module: wine Branch: master Commit: 25ff59d7a93d431d3e60ec2116b1ef2f139d424b URL: https://source.winehq.org/git/wine.git/?a=commit;h=25ff59d7a93d431d3e60ec21… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 22 13:05:48 2019 +0100 ntdll: Default to 7-bit ASCII before codepages are initialized. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/rtlstr.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/rtlstr.c b/dlls/ntdll/rtlstr.c index 190bc01..e834ad2 100644 --- a/dlls/ntdll/rtlstr.c +++ b/dlls/ntdll/rtlstr.c @@ -44,8 +44,10 @@ UINT NlsAnsiCodePage = 0; BYTE NlsMbCodePageTag = 0; BYTE NlsMbOemCodePageTag = 0; -static const union cptable *ansi_table; -static const union cptable *oem_table; +extern const union cptable cptable_20127; /* 7-bit ASCII */ + +static const union cptable *ansi_table = &cptable_20127; +static const union cptable *oem_table = &cptable_20127; static const union cptable* unix_table; /* NULL if UTF8 */

1 0

Alexandre Julliard : make_unicode: Don' t output array sizes that could be over-estimated.
by Alexandre Julliard 22 Mar '19

22 Mar '19

1 0

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 March 2019