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

Piotr Caban : windowscodecs: Store stream reference in png decoder.
by Alexandre Julliard March 13, 2015

March 13, 2015

Module: wine Branch: master Commit: 531992c760a34b2bb38d43b53f021a4440343a41 URL: http://source.winehq.org/git/wine.git/?a=commit;h=531992c760a34b2bb38d43b53… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Mar 12 10:17:19 2015 +0100 windowscodecs: Store stream reference in png decoder. --- dlls/windowscodecs/pngformat.c | 5 +++++ dlls/windowscodecs/tests/pngformat.c | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/windowscodecs/pngformat.c b/dlls/windowscodecs/pngformat.c index 59b1976..260330f 100644 --- a/dlls/windowscodecs/pngformat.c +++ b/dlls/windowscodecs/pngformat.c @@ -296,6 +296,7 @@ typedef struct { IWICBitmapFrameDecode IWICBitmapFrameDecode_iface; IWICMetadataBlockReader IWICMetadataBlockReader_iface; LONG ref; + IStream *stream; png_structp png_ptr; png_infop info_ptr; png_infop end_info; @@ -366,6 +367,7 @@ static ULONG WINAPI PngDecoder_Release(IWICBitmapDecoder *iface) if (ref == 0) { + IStream_Release(This->stream); if (This->png_ptr) ppng_destroy_read_struct(&This->png_ptr, &This->info_ptr, &This->end_info); This->lock.DebugInfo->Spare[0] = 0; @@ -605,6 +607,9 @@ static HRESULT WINAPI PngDecoder_Initialize(IWICBitmapDecoder *iface, IStream *p ppng_read_end(This->png_ptr, This->end_info); + This->stream = pIStream; + IStream_AddRef(This->stream); + This->initialized = TRUE; end: diff --git a/dlls/windowscodecs/tests/pngformat.c b/dlls/windowscodecs/tests/pngformat.c index af50daa..bf370a3 100644 --- a/dlls/windowscodecs/tests/pngformat.c +++ b/dlls/windowscodecs/tests/pngformat.c @@ -283,6 +283,7 @@ static IWICBitmapDecoder *create_decoder(const void *image_data, UINT image_size IWICBitmapDecoder *decoder = NULL; IStream *stream; GUID format; + LONG refcount; hmem = GlobalAlloc(0, image_size); data = GlobalLock(hmem); @@ -300,7 +301,8 @@ static IWICBitmapDecoder *create_decoder(const void *image_data, UINT image_size ok(IsEqualGUID(&format, &GUID_ContainerFormatPng), "wrong container format %s\n", wine_dbgstr_guid(&format)); - IStream_Release(stream); + refcount = IStream_Release(stream); + ok(refcount > 0, "expected stream refcount > 0\n"); return decoder; }

1 0

Sebastian Lackner : ole32: Wait a bit before doing next sanity check in StorageImpl_LockRegionSync.
by Alexandre Julliard March 12, 2015

March 12, 2015

Module: wine Branch: master Commit: 66e8060204c91d37ee6aef078d779b7ee667159f URL: http://source.winehq.org/git/wine.git/?a=commit;h=66e8060204c91d37ee6aef078… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Mar 12 07:19:54 2015 +0100 ole32: Wait a bit before doing next sanity check in StorageImpl_LockRegionSync. --- dlls/ole32/storage32.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 8963044..b4401a6 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -2917,6 +2917,8 @@ static HRESULT StorageImpl_LockRegionSync(StorageImpl *This, ULARGE_INTEGER offs ILockBytes_UnlockRegion(This->lockBytes, sanity_offset, sanity_cb, 0); hr = STG_E_ACCESSDENIED; } + + last_sanity_check = current_time; } Sleep(delay); if (delay < 150) delay++;

1 0

Nikolay Sivov : wshom.ocx: Implement Terminate().
by Alexandre Julliard March 12, 2015

March 12, 2015

Module: wine Branch: master Commit: ed92458754ce21b4d4719168515866fc1bb340ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed92458754ce21b4d47191685… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 11 10:36:46 2015 +0300 wshom.ocx: Implement Terminate(). --- dlls/wshom.ocx/Makefile.in | 2 +- dlls/wshom.ocx/shell.c | 28 ++++++++++++++++++++++++++-- 2 files changed, 27 insertions(+), 3 deletions(-) diff --git a/dlls/wshom.ocx/Makefile.in b/dlls/wshom.ocx/Makefile.in index 18e1b96..b1949ed 100644 --- a/dlls/wshom.ocx/Makefile.in +++ b/dlls/wshom.ocx/Makefile.in @@ -1,5 +1,5 @@ MODULE = wshom.ocx -IMPORTS = uuid oleaut32 ole32 shell32 advapi32 +IMPORTS = uuid oleaut32 ole32 shell32 user32 advapi32 C_SRCS = \ shell.c \ diff --git a/dlls/wshom.ocx/shell.c b/dlls/wshom.ocx/shell.c index dcf1462..97781a5 100644 --- a/dlls/wshom.ocx/shell.c +++ b/dlls/wshom.ocx/shell.c @@ -254,13 +254,37 @@ static HRESULT WINAPI WshExec_get_ExitCode(IWshExec *iface, DWORD *code) return E_NOTIMPL; } +BOOL CALLBACK enum_thread_wnd_proc(HWND hwnd, LPARAM lParam) +{ + INT *count = (INT*)lParam; + + (*count)++; + PostMessageW(hwnd, WM_CLOSE, 0, 0); + /* try to send it to all windows, even if failed for some */ + return TRUE; +} + static HRESULT WINAPI WshExec_Terminate(IWshExec *iface) { WshExec *This = impl_from_IWshExec(iface); + BOOL ret, kill = FALSE; + INT count = 0; - FIXME("(%p): stub\n", This); + TRACE("(%p)\n", This); - return E_NOTIMPL; + ret = EnumThreadWindows(This->info.dwThreadId, enum_thread_wnd_proc, (LPARAM)&count); + if (ret && count) { + /* manual testing shows that it waits 2 seconds before forcing termination */ + if (WaitForSingleObject(This->info.hProcess, 2000) != WAIT_OBJECT_0) + kill = TRUE; + } + else + kill = TRUE; + + if (kill) + TerminateProcess(This->info.hProcess, 0); + + return S_OK; } static const IWshExecVtbl WshExecVtbl = {

1 0

Francois Gouget : ieframe/tests: NONAMELESSUNION is not needed when using the U() macro.
by Alexandre Julliard March 12, 2015

March 12, 2015

Module: wine Branch: master Commit: 4af6be9d3a656718e838611a4b8dbf8d354e439a URL: http://source.winehq.org/git/wine.git/?a=commit;h=4af6be9d3a656718e838611a4… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Mar 12 11:11:14 2015 +0100 ieframe/tests: NONAMELESSUNION is not needed when using the U() macro. --- dlls/ieframe/tests/intshcut.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/ieframe/tests/intshcut.c b/dlls/ieframe/tests/intshcut.c index d1da424..ef99d42 100644 --- a/dlls/ieframe/tests/intshcut.c +++ b/dlls/ieframe/tests/intshcut.c @@ -22,7 +22,6 @@ #include <stdio.h> #define COBJMACROS -#define NONAMELESSUNION #include "windef.h" #include "winbase.h"

1 0

Francois Gouget : inetcpl.cpl: Remove uneeded NONAMELESSUNION directives.
by Alexandre Julliard March 12, 2015

March 12, 2015

Module: wine Branch: master Commit: 5e93b026627e50fcae1bb61d0fc0fe769eb14d60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e93b026627e50fcae1bb61d0… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Mar 12 10:39:09 2015 +0100 inetcpl.cpl: Remove uneeded NONAMELESSUNION directives. --- dlls/inetcpl.cpl/content.c | 2 -- dlls/inetcpl.cpl/general.c | 2 -- dlls/inetcpl.cpl/security.c | 1 - 3 files changed, 5 deletions(-) diff --git a/dlls/inetcpl.cpl/content.c b/dlls/inetcpl.cpl/content.c index 8fb1729..d71c8b2 100644 --- a/dlls/inetcpl.cpl/content.c +++ b/dlls/inetcpl.cpl/content.c @@ -19,8 +19,6 @@ * */ -#define NONAMELESSUNION - #include <stdarg.h> #include <windef.h> #include <winbase.h> diff --git a/dlls/inetcpl.cpl/general.c b/dlls/inetcpl.cpl/general.c index 42948ea..0691579 100644 --- a/dlls/inetcpl.cpl/general.c +++ b/dlls/inetcpl.cpl/general.c @@ -19,8 +19,6 @@ * */ -#define NONAMELESSUNION - #include <stdarg.h> #include <windef.h> #include <winbase.h> diff --git a/dlls/inetcpl.cpl/security.c b/dlls/inetcpl.cpl/security.c index 48c4876..6d79057 100644 --- a/dlls/inetcpl.cpl/security.c +++ b/dlls/inetcpl.cpl/security.c @@ -21,7 +21,6 @@ #define COBJMACROS #define CONST_VTABLE -#define NONAMELESSUNION #include <stdarg.h> #include <windef.h>

1 0

Francois Gouget : gphoto2.ds: Remove unneeded NONAMELESSXXX directives.
by Alexandre Julliard March 12, 2015

March 12, 2015

Module: wine Branch: master Commit: e815da3c1a4d291d777bfea9411d0cdd53fc3f47 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e815da3c1a4d291d777bfea94… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Mar 12 10:38:34 2015 +0100 gphoto2.ds: Remove unneeded NONAMELESSXXX directives. --- dlls/gphoto2.ds/capability.c | 3 --- dlls/gphoto2.ds/ui.c | 2 -- 2 files changed, 5 deletions(-) diff --git a/dlls/gphoto2.ds/capability.c b/dlls/gphoto2.ds/capability.c index 34d081e..fcc1e52 100644 --- a/dlls/gphoto2.ds/capability.c +++ b/dlls/gphoto2.ds/capability.c @@ -17,9 +17,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define NONAMELESSUNION -#define NONAMELESSSTRUCT - #include "config.h" #include <stdarg.h> diff --git a/dlls/gphoto2.ds/ui.c b/dlls/gphoto2.ds/ui.c index d663552..c521e3e 100644 --- a/dlls/gphoto2.ds/ui.c +++ b/dlls/gphoto2.ds/ui.c @@ -24,8 +24,6 @@ #include <stdarg.h> #include <stdio.h> -#define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "gphoto2_i.h" #include "winuser.h" #include "winnls.h"

1 0

Henri Verbeet : d3d10core: Implement d3d10_rendertarget_view_SetPrivateData().
by Alexandre Julliard March 12, 2015

March 12, 2015

Module: wine Branch: master Commit: 3c65bff802c600a2b620c6d1fd50e3cef2b525ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c65bff802c600a2b620c6d1f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 12 10:08:34 2015 +0100 d3d10core: Implement d3d10_rendertarget_view_SetPrivateData(). --- dlls/d3d10core/d3d10core_private.h | 1 + dlls/d3d10core/view.c | 8 ++++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10core/d3d10core_private.h b/dlls/d3d10core/d3d10core_private.h index a8a44a0..3678a45 100644 --- a/dlls/d3d10core/d3d10core_private.h +++ b/dlls/d3d10core/d3d10core_private.h @@ -154,6 +154,7 @@ struct d3d10_rendertarget_view ID3D10RenderTargetView ID3D10RenderTargetView_iface; LONG refcount; + struct wined3d_private_store private_store; struct wined3d_rendertarget_view *wined3d_view; D3D10_RENDER_TARGET_VIEW_DESC desc; ID3D10Resource *resource; diff --git a/dlls/d3d10core/view.c b/dlls/d3d10core/view.c index 2957a3d..d261d79 100644 --- a/dlls/d3d10core/view.c +++ b/dlls/d3d10core/view.c @@ -652,6 +652,7 @@ static ULONG STDMETHODCALLTYPE d3d10_rendertarget_view_Release(ID3D10RenderTarge wined3d_rendertarget_view_decref(This->wined3d_view); ID3D10Resource_Release(This->resource); ID3D10Device1_Release(This->device); + wined3d_private_store_cleanup(&This->private_store); HeapFree(GetProcessHeap(), 0, This); } @@ -682,10 +683,12 @@ static HRESULT STDMETHODCALLTYPE d3d10_rendertarget_view_GetPrivateData(ID3D10Re static HRESULT STDMETHODCALLTYPE d3d10_rendertarget_view_SetPrivateData(ID3D10RenderTargetView *iface, REFGUID guid, UINT data_size, const void *data) { - FIXME("iface %p, guid %s, data_size %u, data %p stub!\n", + struct d3d10_rendertarget_view *view = impl_from_ID3D10RenderTargetView(iface); + + TRACE("iface %p, guid %s, data_size %u, data %p.\n", iface, debugstr_guid(guid), data_size, data); - return E_NOTIMPL; + return d3d10_set_private_data(&view->private_store, guid, data_size, data); } static HRESULT STDMETHODCALLTYPE d3d10_rendertarget_view_SetPrivateDataInterface(ID3D10RenderTargetView *iface, @@ -836,6 +839,7 @@ HRESULT d3d10_rendertarget_view_init(struct d3d10_rendertarget_view *view, struc return hr; } + wined3d_private_store_init(&view->private_store); view->resource = resource; ID3D10Resource_AddRef(resource); view->device = &device->ID3D10Device1_iface;

1 0

Henri Verbeet : d3d10core: Implement d3d10_depthstencil_view_SetPrivateDataInterface().
by Alexandre Julliard March 12, 2015

March 12, 2015

Module: wine Branch: master Commit: c3fab65647dc7652fef18d5a1b94bccf7e37be0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3fab65647dc7652fef18d5a1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 12 10:08:32 2015 +0100 d3d10core: Implement d3d10_depthstencil_view_SetPrivateDataInterface(). --- dlls/d3d10core/view.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10core/view.c b/dlls/d3d10core/view.c index c11dfee..2957a3d 100644 --- a/dlls/d3d10core/view.c +++ b/dlls/d3d10core/view.c @@ -449,9 +449,11 @@ static HRESULT STDMETHODCALLTYPE d3d10_depthstencil_view_SetPrivateData(ID3D10De static HRESULT STDMETHODCALLTYPE d3d10_depthstencil_view_SetPrivateDataInterface(ID3D10DepthStencilView *iface, REFGUID guid, const IUnknown *data) { - FIXME("iface %p, guid %s, data %p stub!\n", iface, debugstr_guid(guid), data); + struct d3d10_depthstencil_view *view = impl_from_ID3D10DepthStencilView(iface); - return E_NOTIMPL; + TRACE("iface %p, guid %s, data %p.\n", iface, debugstr_guid(guid), data); + + return d3d10_set_private_data_interface(&view->private_store, guid, data); } /* ID3D10View methods */

1 0

Francois Gouget : kernel32: Remove unneeded NONAMELESSXXX directives.
by Alexandre Julliard March 12, 2015

March 12, 2015

Module: wine Branch: master Commit: ecc04f6996a4ec2d9fd1be9ff0df823f521113e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ecc04f6996a4ec2d9fd1be9ff… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Mar 12 10:39:31 2015 +0100 kernel32: Remove unneeded NONAMELESSXXX directives. --- dlls/kernel32/change.c | 1 - dlls/kernel32/comm.c | 2 -- dlls/kernel32/oldconfig.c | 2 -- dlls/kernel32/path.c | 2 -- dlls/kernel32/sync.c | 4 +--- dlls/kernel32/time.c | 3 +-- dlls/kernel32/virtual.c | 3 +-- 7 files changed, 3 insertions(+), 14 deletions(-) diff --git a/dlls/kernel32/change.c b/dlls/kernel32/change.c index ab9432f..f3aec8d 100644 --- a/dlls/kernel32/change.c +++ b/dlls/kernel32/change.c @@ -27,7 +27,6 @@ #include "ntstatus.h" #define WIN32_NO_STATUS #define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "windef.h" #include "winbase.h" #include "winerror.h" diff --git a/dlls/kernel32/comm.c b/dlls/kernel32/comm.c index c6a8ec2..1c6f1af 100644 --- a/dlls/kernel32/comm.c +++ b/dlls/kernel32/comm.c @@ -25,8 +25,6 @@ #include <stdarg.h> #include <stdio.h> -#define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "windef.h" #include "winbase.h" #include "winerror.h" diff --git a/dlls/kernel32/oldconfig.c b/dlls/kernel32/oldconfig.c index 4a5355d..2c8bc18 100644 --- a/dlls/kernel32/oldconfig.c +++ b/dlls/kernel32/oldconfig.c @@ -42,8 +42,6 @@ # include <linux/hdreg.h> #endif -#define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "windef.h" #include "winbase.h" #include "winternl.h" diff --git a/dlls/kernel32/path.c b/dlls/kernel32/path.c index 5dd221f..7fe229f 100644 --- a/dlls/kernel32/path.c +++ b/dlls/kernel32/path.c @@ -28,8 +28,6 @@ #include <stdio.h> #include <stdarg.h> -#define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "winerror.h" #include "ntstatus.h" #define WIN32_NO_STATUS diff --git a/dlls/kernel32/sync.c b/dlls/kernel32/sync.c index 04b3270..a07ce97 100644 --- a/dlls/kernel32/sync.c +++ b/dlls/kernel32/sync.c @@ -29,11 +29,9 @@ #include <stdarg.h> #include <stdio.h> -#define NONAMELESSUNION -#define NONAMELESSSTRUCT - #include "ntstatus.h" #define WIN32_NO_STATUS +#define NONAMELESSUNION #include "windef.h" #include "winbase.h" #include "winerror.h" diff --git a/dlls/kernel32/time.c b/dlls/kernel32/time.c index 21ac120..2f7142b 100644 --- a/dlls/kernel32/time.c +++ b/dlls/kernel32/time.c @@ -39,10 +39,9 @@ #include <machine/limits.h> #endif -#define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "ntstatus.h" #define WIN32_NO_STATUS +#define NONAMELESSUNION #include "windef.h" #include "winbase.h" #include "winternl.h" diff --git a/dlls/kernel32/virtual.c b/dlls/kernel32/virtual.c index 2df19a7..03ef38c 100644 --- a/dlls/kernel32/virtual.c +++ b/dlls/kernel32/virtual.c @@ -30,10 +30,9 @@ # include <unistd.h> #endif -#define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "ntstatus.h" #define WIN32_NO_STATUS +#define NONAMELESSUNION #include "windef.h" #include "winbase.h" #include "winnls.h"

1 0

Henri Verbeet : d3d10core: Implement d3d10_rendertarget_view_SetPrivateDataInterface().
by Alexandre Julliard March 12, 2015

March 12, 2015

Module: wine Branch: master Commit: 656be74d13f2cf983c6c62a15088b93bb169d5fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=656be74d13f2cf983c6c62a15… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 12 10:08:35 2015 +0100 d3d10core: Implement d3d10_rendertarget_view_SetPrivateDataInterface(). --- dlls/d3d10core/view.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10core/view.c b/dlls/d3d10core/view.c index 97fd495..2b85161 100644 --- a/dlls/d3d10core/view.c +++ b/dlls/d3d10core/view.c @@ -696,9 +696,11 @@ static HRESULT STDMETHODCALLTYPE d3d10_rendertarget_view_SetPrivateData(ID3D10Re static HRESULT STDMETHODCALLTYPE d3d10_rendertarget_view_SetPrivateDataInterface(ID3D10RenderTargetView *iface, REFGUID guid, const IUnknown *data) { - FIXME("iface %p, guid %s, data %p stub!\n", iface, debugstr_guid(guid), data); + struct d3d10_rendertarget_view *view = impl_from_ID3D10RenderTargetView(iface); - return E_NOTIMPL; + TRACE("iface %p, guid %s, data %p.\n", iface, debugstr_guid(guid), data); + + return d3d10_set_private_data_interface(&view->private_store, guid, data); } /* ID3D10View methods */

1 0