February 2018 - Wine-Devel - list.winehq.org

[PATCH 1/2] explorerframe: Use global memory allocation helpers
by Nikolay Sivov Feb. 25, 2018

Feb. 25, 2018

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/explorerframe/nstc.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/explorerframe/nstc.c b/dlls/explorerframe/nstc.c index 15d2f2629b..37e1a553a4 100644 --- a/dlls/explorerframe/nstc.c +++ b/dlls/explorerframe/nstc.c @@ -33,6 +33,7 @@ #include "wine/list.h" #include "wine/debug.h" +#include "wine/heap.h" #include "explorerframe_main.h" @@ -861,9 +862,8 @@ static ULONG WINAPI NSTC2_fnRelease(INameSpaceTreeControl2* iface) if(!ref) { TRACE("Freeing.\n"); - HeapFree(GetProcessHeap(), 0, This); + heap_free(This); EFRAME_UnlockModule(); - return 0; } return ref; @@ -1001,7 +1001,7 @@ static HRESULT WINAPI NSTC2_fnInsertRoot(INameSpaceTreeControl2* iface, TRACE("%p, %d, %p, %x, %x, %p\n", This, iIndex, psiRoot, grfEnumFlags, grfRootStyle, pif); - new_root = HeapAlloc(GetProcessHeap(), 0, sizeof(nstc_root)); + new_root = heap_alloc(sizeof(*new_root)); if(!new_root) return E_OUTOFMEMORY; @@ -1025,7 +1025,7 @@ static HRESULT WINAPI NSTC2_fnInsertRoot(INameSpaceTreeControl2* iface, if(!new_root->htreeitem) { WARN("Failed to add the root.\n"); - HeapFree(GetProcessHeap(), 0, new_root); + heap_free(new_root); return E_FAIL; } @@ -1093,7 +1093,7 @@ static HRESULT WINAPI NSTC2_fnRemoveRoot(INameSpaceTreeControl2* iface, events_OnItemDeleted(This, root->psi, TRUE); SendMessageW(This->hwnd_tv, TVM_DELETEITEM, 0, (LPARAM)root->htreeitem); list_remove(&root->entry); - HeapFree(GetProcessHeap(), 0, root); + heap_free(root); return S_OK; } else @@ -1135,7 +1135,7 @@ static HRESULT WINAPI NSTC2_fnGetRootItems(INameSpaceTreeControl2* iface, if(!count) return E_INVALIDARG; - array = HeapAlloc(GetProcessHeap(), 0, sizeof(LPITEMIDLIST)*count); + array = heap_alloc(sizeof(LPITEMIDLIST)*count); i = 0; LIST_FOR_EACH_ENTRY(root, &This->roots, nstc_root, entry) @@ -1149,7 +1149,7 @@ static HRESULT WINAPI NSTC2_fnGetRootItems(INameSpaceTreeControl2* iface, for(i = 0; i < count; i++) ILFree(array[i]); - HeapFree(GetProcessHeap(), 0, array); + heap_free(array); return hr; } @@ -1610,7 +1610,7 @@ HRESULT NamespaceTreeControl_Constructor(IUnknown *pUnkOuter, REFIID riid, void EFRAME_LockModule(); - nstc = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(NSTC2Impl)); + nstc = heap_alloc_zero(sizeof(*nstc)); if (!nstc) return E_OUTOFMEMORY; -- 2.16.1

1 1

[PATCH] avifil32: Remove some redundant statements
by Nikolay Sivov Feb. 25, 2018

Feb. 25, 2018

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/avifil32/editstream.c | 1 - dlls/avifil32/getframe.c | 1 - dlls/avifil32/tmpfile.c | 1 - 3 files changed, 3 deletions(-) diff --git a/dlls/avifil32/editstream.c b/dlls/avifil32/editstream.c index 2e0fa2fd60..a4df6283eb 100644 --- a/dlls/avifil32/editstream.c +++ b/dlls/avifil32/editstream.c @@ -282,7 +282,6 @@ static ULONG WINAPI IAVIEditStream_fnRelease(IAVIEditStream*iface) } HeapFree(GetProcessHeap(), 0, This); - return 0; } return ref; } diff --git a/dlls/avifil32/getframe.c b/dlls/avifil32/getframe.c index c8580a8230..be4a2a9abf 100644 --- a/dlls/avifil32/getframe.c +++ b/dlls/avifil32/getframe.c @@ -134,7 +134,6 @@ static ULONG WINAPI IGetFrame_fnRelease(IGetFrame *iface) } HeapFree(GetProcessHeap(), 0, iface); - return 0; } return ref; diff --git a/dlls/avifil32/tmpfile.c b/dlls/avifil32/tmpfile.c index ee7e772b5e..6d199c7b95 100644 --- a/dlls/avifil32/tmpfile.c +++ b/dlls/avifil32/tmpfile.c @@ -94,7 +94,6 @@ static ULONG WINAPI ITmpFile_fnRelease(IAVIFile *iface) } HeapFree(GetProcessHeap(), 0, This); - return 0; } return ref; -- 2.16.1

1 0

GSoC
by Abhishek Kumar Feb. 25, 2018

Feb. 25, 2018

Myself Abhishek,I want to contribute to wine towards the making explorer.exe more useful.i install wine 3.2 on mac os 10.13 and not able to do cut,copy,paste operation on files and folder.So please help Thank You

2 1

explorer.exe
by Abhishek Kumar Feb. 25, 2018

Feb. 25, 2018

I am not able to perform paste operation on mac os sierra.i also not working proprerly

2 1

[PATCH 2/3] ws2_32/tests: Add ioctlsocket(FIONREAD) tests with listening socket.
by Akihiro Sagawa Feb. 25, 2018

Feb. 25, 2018

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/ws2_32/tests/sock.c | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+)

2 1

[PATCH 3/3] ws2_32: Fix ioctlsocket(FIONREAD) with listening socket.
by Akihiro Sagawa Feb. 25, 2018

Feb. 25, 2018

Fixes Bug 32802. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/ws2_32/socket.c | 12 ++++++++++++ dlls/ws2_32/tests/sock.c | 4 ++-- 2 files changed, 14 insertions(+), 2 deletions(-)

1 0

po: Update Polish translation
by Marcin Mikołajczak Feb. 24, 2018

Feb. 24, 2018

1 0

[PATCH v2] ping: Implement -l, -w, -n using IcmpSendEcho
by Isira Seneviratne Feb. 24, 2018

Feb. 24, 2018

1 0

[PATCH v2] ping: Implement -l, -w, -n using IcmpSendEcho
by Isira Seneviratne Feb. 24, 2018

Feb. 24, 2018

1 0

[PATCH] quartz: Don't create the advise thread during the clock teardown
by Michael Stefaniuc Feb. 23, 2018

Feb. 23, 2018

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- Fixes bug #44255. All the glory goes to Focht as there was zero brainZ involved on my side. dlls/quartz/systemclock.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/quartz/systemclock.c b/dlls/quartz/systemclock.c index a3e1504768..1638e1117e 100644 --- a/dlls/quartz/systemclock.c +++ b/dlls/quartz/systemclock.c @@ -229,7 +229,7 @@ static ULONG WINAPI SystemClockImpl_Release(IReferenceClock* iface) { ULONG ref = InterlockedDecrement(&This->ref); TRACE("(%p): ReleaseRef to %d\n", This, ref); if (ref == 0) { - if (SystemClockPostMessageToAdviseThread(This, ADVISE_EXIT)) { + if (This->adviseThreadActive && SystemClockPostMessageToAdviseThread(This, ADVISE_EXIT)) { WaitForSingleObject(This->adviseThread, INFINITE); CloseHandle(This->adviseThread); } -- 2.14.3

1 0