October 2015 - Wine-Commits

Andrew Eikum : xaudio2: Don't render less than a period of audio.
by Alexandre Julliard Oct. 22, 2015

Oct. 22, 2015

Module: wine Branch: master Commit: 998e5a0432b10fe88452baebba249efb1471d968 URL: http://source.winehq.org/git/wine.git/?a=commit;h=998e5a0432b10fe88452baebb… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Oct 21 10:01:22 2015 -0500 xaudio2: Don't render less than a period of audio. Sometimes the ALSA driver will report a very small amount of frames available after a period signal. There is a bug in OpenAL 1.15 which will crash the application if alcRenderSamplesSOFT is called with less than 4 frames. And anyway, we shouldn't incur all of this overhead just to render a couple of frames. So, just skip the rendering step if we have less than a period of space available in the driver. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xaudio2_7/xaudio_dll.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/xaudio2_7/xaudio_dll.c b/dlls/xaudio2_7/xaudio_dll.c index 76b4c13..a4a9399 100644 --- a/dlls/xaudio2_7/xaudio_dll.c +++ b/dlls/xaudio2_7/xaudio_dll.c @@ -2723,7 +2723,11 @@ static void do_engine_tick(IXAudio2Impl *This) } nframes = This->period_frames * 3 - pad; - TRACE("going to render %u frames\n", nframes); + + TRACE("frames available: %u\n", nframes); + + if(nframes < This->period_frames) + return; if(!nframes) return;

1 0

Jacek Caban : ole32: Pass requested interface IID to CreateInstance in CoCreateInstanceEx.
by Alexandre Julliard Oct. 22, 2015

Oct. 22, 2015

Module: wine Branch: master Commit: dedcd30cb899adb69b7994ee32b2e775057e3902 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dedcd30cb899adb69b7994ee3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 21 16:22:37 2015 +0200 ole32: Pass requested interface IID to CreateInstance in CoCreateInstanceEx. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/compobj.c | 24 ++++++++++++++++-------- dlls/ole32/tests/compobj.c | 27 +++++++++++++++++++++++++++ 2 files changed, 43 insertions(+), 8 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 82904a8..c04d2f0 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -3271,18 +3271,26 @@ static void init_multi_qi(DWORD count, MULTI_QI *mqi) } } -static HRESULT return_multi_qi(IUnknown *unk, DWORD count, MULTI_QI *mqi) +static HRESULT return_multi_qi(IUnknown *unk, DWORD count, MULTI_QI *mqi, BOOL include_unk) { - ULONG index, fetched = 0; + ULONG index = 0, fetched = 0; - for (index = 0; index < count; index++) + if (include_unk) + { + mqi[0].hr = S_OK; + mqi[0].pItf = unk; + index = fetched = 1; + } + + for (; index < count; index++) { mqi[index].hr = IUnknown_QueryInterface(unk, mqi[index].pIID, (void**)&mqi[index].pItf); if (mqi[index].hr == S_OK) fetched++; } - IUnknown_Release(unk); + if (!include_unk) + IUnknown_Release(unk); if (fetched == 0) return E_NOINTERFACE; @@ -3321,13 +3329,13 @@ HRESULT WINAPI DECLSPEC_HOTPATCH CoCreateInstanceEx( hr = CoCreateInstance(rclsid, pUnkOuter, dwClsContext, - &IID_IUnknown, + pResults[0].pIID, (VOID**)&pUnk); if (hr != S_OK) return hr; - return return_multi_qi(pUnk, cmq, pResults); + return return_multi_qi(pUnk, cmq, pResults, TRUE); } /*********************************************************************** @@ -3390,7 +3398,7 @@ HRESULT WINAPI CoGetInstanceFromFile( IPersistFile_Release(pf); } - return return_multi_qi(unk, count, results); + return return_multi_qi(unk, count, results, FALSE); } /*********************************************************************** @@ -3453,7 +3461,7 @@ HRESULT WINAPI CoGetInstanceFromIStorage( IPersistStorage_Release(ps); } - return return_multi_qi(unk, count, results); + return return_multi_qi(unk, count, results, FALSE); } /*********************************************************************** diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index e7116bc..b03e861 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -152,6 +152,7 @@ static ULONG WINAPI Test_IClassFactory_Release(LPCLASSFACTORY iface) return 1; /* non-heap-based object */ } +static IID create_instance_iid; static HRESULT WINAPI Test_IClassFactory_CreateInstance( LPCLASSFACTORY iface, IUnknown *pUnkOuter, @@ -159,6 +160,7 @@ static HRESULT WINAPI Test_IClassFactory_CreateInstance( LPVOID *ppvObj) { *ppvObj = NULL; + create_instance_iid = *riid; if (pUnkOuter) return CLASS_E_NOAGGREGATION; return E_NOINTERFACE; } @@ -789,6 +791,30 @@ static void test_CoGetClassObject(void) CoUninitialize(); } +static void test_CoCreateInstanceEx(void) +{ + MULTI_QI qi_res = { &IID_IMoniker }; + DWORD cookie; + HRESULT hr; + + CoInitialize(NULL); + + hr = CoRegisterClassObject(&CLSID_WineOOPTest, (IUnknown *)&Test_ClassFactory, + CLSCTX_INPROC_SERVER, REGCLS_MULTIPLEUSE, &cookie); + ok_ole_success(hr, "CoRegisterClassObject"); + + create_instance_iid = IID_NULL; + hr = CoCreateInstanceEx(&CLSID_WineOOPTest, NULL, CLSCTX_INPROC_SERVER, NULL, 1, &qi_res); + ok(hr == E_NOINTERFACE, "CoCreateInstanceEx failed: %08x\n", hr); + ok(IsEqualGUID(&create_instance_iid, qi_res.pIID), "Unexpected CreateInstance iid %s\n", + wine_dbgstr_guid(&create_instance_iid)); + + hr = CoRevokeClassObject(cookie); + ok_ole_success(hr, "CoRevokeClassObject"); + + CoUninitialize(); +} + static ATOM register_dummy_class(void) { WNDCLASSA wc = @@ -2636,6 +2662,7 @@ START_TEST(compobj) test_CoCreateInstance(); test_ole_menu(); test_CoGetClassObject(); + test_CoCreateInstanceEx(); test_CoRegisterMessageFilter(); test_CoRegisterPSClsid(); test_CoGetPSClsid();

1 0

Alex Henrie : maintainers: Add myself as a volunteer maintainer.
by Alexandre Julliard Oct. 22, 2015

Oct. 22, 2015

Module: wine Branch: master Commit: 06fca4488c9e66ea71bf96f5f34de32ffdf06f87 URL: http://source.winehq.org/git/wine.git/?a=commit;h=06fca4488c9e66ea71bf96f5f… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Oct 21 20:13:49 2015 -0600 maintainers: Add myself as a volunteer maintainer. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- MAINTAINERS | 1 + 1 file changed, 1 insertion(+) diff --git a/MAINTAINERS b/MAINTAINERS index ff102f0..b425b52 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -167,5 +167,6 @@ F: dlls/msxml*/ THE REST M: Alexandre Julliard <julliard(a)winehq.org> P: Sebastian Lackner <sebastian(a)fds-team.de> +P: Alex Henrie <alexhenrie24(a)gmail.com> F: * F: */

1 0

Matteo Bruni : wined3d: Allow FBO blits for depth formats with swizzle fixups.
by Alexandre Julliard Oct. 22, 2015

Oct. 22, 2015

Module: wine Branch: master Commit: b2e1b5968cc85c12549e75d5852f5e28e669a38a URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2e1b5968cc85c12549e75d58… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Oct 22 00:20:56 2015 +0200 wined3d: Allow FBO blits for depth formats with swizzle fixups. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 15 ++++++++++----- dlls/wined3d/wined3d_private.h | 5 +++++ 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 320f269..d08259d 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1008,6 +1008,10 @@ static BOOL fbo_blit_supported(const struct wined3d_gl_info *gl_info, enum wined if (!((dst_format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_FBO_ATTACHABLE) || (dst_usage & WINED3DUSAGE_RENDERTARGET))) return FALSE; + if (!(src_format->id == dst_format->id + || (is_identity_fixup(src_format->color_fixup) + && is_identity_fixup(dst_format->color_fixup)))) + return FALSE; break; case WINED3D_BLIT_OP_DEPTH_BLIT: @@ -1015,17 +1019,18 @@ static BOOL fbo_blit_supported(const struct wined3d_gl_info *gl_info, enum wined return FALSE; if (!(dst_format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & (WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL))) return FALSE; + /* Accept pure swizzle fixups for depth formats. In general we + * ignore the stencil component (if present) at the moment and the + * swizzle is not relevant with just the depth component. */ + if (is_complex_fixup(src_format->color_fixup) || is_complex_fixup(dst_format->color_fixup) + || is_scaling_fixup(src_format->color_fixup) || is_scaling_fixup(dst_format->color_fixup)) + return FALSE; break; default: return FALSE; } - if (!(src_format->id == dst_format->id - || (is_identity_fixup(src_format->color_fixup) - && is_identity_fixup(dst_format->color_fixup)))) - return FALSE; - return TRUE; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index d75169c..d30b59d 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -145,6 +145,11 @@ static inline BOOL is_complex_fixup(struct color_fixup_desc fixup) return fixup.x_source == CHANNEL_SOURCE_COMPLEX0 || fixup.x_source == CHANNEL_SOURCE_COMPLEX1; } +static inline BOOL is_scaling_fixup(struct color_fixup_desc fixup) +{ + return fixup.x_sign_fixup || fixup.y_sign_fixup || fixup.z_sign_fixup || fixup.w_sign_fixup; +} + static inline BOOL is_same_fixup(struct color_fixup_desc f1, struct color_fixup_desc f2) { return f1.x_sign_fixup == f2.x_sign_fixup && f1.x_source == f2.x_source

1 0

Stefan Leichter : wimgapi: Add new stub dll.
by Alexandre Julliard Oct. 21, 2015

Oct. 21, 2015

Module: wine Branch: master Commit: c21575d7014ac514d7bbbd37437f3c8fa298ee1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=c21575d7014ac514d7bbbd374… Author: Stefan Leichter <Stefan.Leichter(a)camLine.com> Date: Thu Oct 15 22:57:31 2015 +0200 wimgapi: Add new stub dll. Signed-off-by: Stefan Leichter <Stefan.Leichter(a)camLine.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/wimgapi/Makefile.in | 4 ++++ dlls/wimgapi/main.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/wimgapi/wimgapi.spec | 42 ++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 95 insertions(+) diff --git a/configure b/configure index 533bf15..6689b65 100755 --- a/configure +++ b/configure @@ -1327,6 +1327,7 @@ enable_webservices enable_wer enable_wevtapi enable_wiaservc +enable_wimgapi enable_windowscodecs enable_windowscodecsext enable_winealsa_drv @@ -17878,6 +17879,7 @@ wine_fn_config_test dlls/wer/tests wer_test wine_fn_config_dll wevtapi enable_wevtapi wine_fn_config_dll wiaservc enable_wiaservc clean wine_fn_config_test dlls/wiaservc/tests wiaservc_test +wine_fn_config_dll wimgapi enable_wimgapi wine_fn_config_dll win32s16.dll16 enable_win16 wine_fn_config_dll win87em.dll16 enable_win16 wine_fn_config_dll winaspi.dll16 enable_win16 diff --git a/configure.ac b/configure.ac index 5ab2d69..030aa32 100644 --- a/configure.ac +++ b/configure.ac @@ -3389,6 +3389,7 @@ WINE_CONFIG_TEST(dlls/wer/tests) WINE_CONFIG_DLL(wevtapi) WINE_CONFIG_DLL(wiaservc,,[clean]) WINE_CONFIG_TEST(dlls/wiaservc/tests) +WINE_CONFIG_DLL(wimgapi) WINE_CONFIG_DLL(win32s16.dll16,enable_win16) WINE_CONFIG_DLL(win87em.dll16,enable_win16) WINE_CONFIG_DLL(winaspi.dll16,enable_win16) diff --git a/dlls/wimgapi/Makefile.in b/dlls/wimgapi/Makefile.in new file mode 100644 index 0000000..7fa2db8 --- /dev/null +++ b/dlls/wimgapi/Makefile.in @@ -0,0 +1,4 @@ +MODULE = wimgapi.dll + +C_SRCS = \ + main.c diff --git a/dlls/wimgapi/main.c b/dlls/wimgapi/main.c new file mode 100644 index 0000000..5ac8a66 --- /dev/null +++ b/dlls/wimgapi/main.c @@ -0,0 +1,46 @@ +/* + * + * wimgapi implementation + * + * Copyright 2015 Stefan Leichter + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "config.h" + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(wimgapi); + +BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved) +{ + TRACE("(0x%p, %d, %p)\n", instance, reason, reserved); + + switch (reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(instance); + break; + } + + return TRUE; +} diff --git a/dlls/wimgapi/wimgapi.spec b/dlls/wimgapi/wimgapi.spec new file mode 100644 index 0000000..b467989 --- /dev/null +++ b/dlls/wimgapi/wimgapi.spec @@ -0,0 +1,42 @@ +@ stub -private DllCanUnloadNow +@ stdcall -private DllMain(long long ptr) +@ stub WIMApplyImage +@ stub WIMCaptureImage +@ stub WIMCloseHandle +@ stub WIMCommitImageHandle +@ stub WIMCopyFile +@ stub WIMCreateFile +@ stub WIMCreateImageFile +@ stub WIMDeleteImage +@ stub WIMDeleteImageMounts +@ stub WIMEnumImageFiles +@ stub WIMExportImage +@ stub WIMExtractImagePath +@ stub WIMFindFirstImageFile +@ stub WIMFindNextImageFile +@ stub WIMGetAttributes +@ stub WIMGetImageCount +@ stub WIMGetImageInformation +@ stub WIMGetMessageCallbackCount +@ stub WIMGetMountedImageHandle +@ stub WIMGetMountedImageInfo +@ stub WIMGetMountedImageInfoFromFile +@ stub WIMGetMountedImages +@ stub WIMInitFileIOCallbacks +@ stub WIMLoadImage +@ stub WIMMountImage +@ stub WIMMountImageHandle +@ stub WIMReadImageFile +@ stub WIMRegisterLogFile +@ stub WIMRegisterMessageCallback +@ stub WIMRemountImage +@ stub WIMSetBootImage +@ stub WIMSetFileIOCallbackTemporaryPath +@ stub WIMSetImageInformation +@ stub WIMSetReferenceFile +@ stub WIMSetTemporaryFile +@ stub WIMSplitFile +@ stub WIMUmountImage +@ stub WIMUmountImageHandle +@ stub WIMUnregisterLogFile +@ stub WIMUnregisterMessageCallback

1 0

Nikolay Sivov : msi: Use VARIANT_BOOL values consistently for VT_BOOL type (PVS-Studio).
by Alexandre Julliard Oct. 21, 2015

Oct. 21, 2015

Module: wine Branch: master Commit: 2257928a7af1de0c1702b252ebb7f1dd9647b1f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2257928a7af1de0c1702b252e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 21 14:59:49 2015 +0300 msi: Use VARIANT_BOOL values consistently for VT_BOOL type (PVS-Studio). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/automation.c | 4 ++-- dlls/msi/tests/automation.c | 20 ++++++++++---------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/msi/automation.c b/dlls/msi/automation.c index 56823ee..c3d2c67 100644 --- a/dlls/msi/automation.c +++ b/dlls/msi/automation.c @@ -1437,7 +1437,7 @@ static HRESULT session_invoke( hr = DispGetParam(pDispParams, 0, VT_I4, &varg0, puArgErr); if (FAILED(hr)) return hr; V_VT(pVarResult) = VT_BOOL; - V_BOOL(pVarResult) = MsiGetMode(This->msiHandle, V_I4(&varg0)); + V_BOOL(pVarResult) = MsiGetMode(This->msiHandle, V_I4(&varg0)) ? VARIANT_TRUE : VARIANT_FALSE; } else if (wFlags & DISPATCH_PROPERTYPUT) { hr = DispGetParam(pDispParams, 0, VT_I4, &varg0, puArgErr); if (FAILED(hr)) return hr; @@ -2053,7 +2053,7 @@ static HRESULT InstallerImpl_RegistryValue(WORD wFlags, /* Return VT_BOOL clarifying whether registry key exists or not. */ case VT_EMPTY: V_VT(pVarResult) = VT_BOOL; - V_BOOL(pVarResult) = (ret == ERROR_SUCCESS); + V_BOOL(pVarResult) = (ret == ERROR_SUCCESS) ? VARIANT_TRUE : VARIANT_FALSE; break; /* Return the value of specified key if it exists. */ diff --git a/dlls/msi/tests/automation.c b/dlls/msi/tests/automation.c index e31527f..a1df3f1 100644 --- a/dlls/msi/tests/automation.c +++ b/dlls/msi/tests/automation.c @@ -1204,7 +1204,7 @@ static HRESULT Session_LanguageGet(IDispatch *pSession, UINT *pLangId) return hr; } -static HRESULT Session_ModeGet(IDispatch *pSession, int iFlag, BOOL *pMode) +static HRESULT Session_ModeGet(IDispatch *pSession, int iFlag, VARIANT_BOOL *mode) { VARIANT varresult; VARIANTARG vararg[1]; @@ -1216,12 +1216,12 @@ static HRESULT Session_ModeGet(IDispatch *pSession, int iFlag, BOOL *pMode) V_I4(&vararg[0]) = iFlag; hr = invoke(pSession, "Mode", DISPATCH_PROPERTYGET, &dispparams, &varresult, VT_BOOL); - *pMode = V_BOOL(&varresult); + *mode = V_BOOL(&varresult); VariantClear(&varresult); return hr; } -static HRESULT Session_ModePut(IDispatch *pSession, int iFlag, BOOL bMode) +static HRESULT Session_ModePut(IDispatch *pSession, int iFlag, VARIANT_BOOL mode) { VARIANT varresult; VARIANTARG vararg[2]; @@ -1233,7 +1233,7 @@ static HRESULT Session_ModePut(IDispatch *pSession, int iFlag, BOOL bMode) V_I4(&vararg[1]) = iFlag; VariantInit(&vararg[0]); V_VT(&vararg[0]) = VT_BOOL; - V_BOOL(&vararg[0]) = bMode; + V_BOOL(&vararg[0]) = mode; return invoke(pSession, "Mode", DISPATCH_PROPERTYPUT, &dispparams, &varresult, VT_EMPTY); } @@ -1876,7 +1876,7 @@ static void test_Session(IDispatch *pSession) WCHAR stringw[MAX_PATH]; CHAR string[MAX_PATH]; UINT len; - BOOL bool; + VARIANT_BOOL bool; int myint; IDispatch *pDatabase = NULL, *pInst = NULL, *record = NULL; ULONG refs_before, refs_after; @@ -1944,15 +1944,15 @@ static void test_Session(IDispatch *pSession) ok(!bool, "Maintenance mode is %d\n", bool); /* Session::Mode, put */ - hr = Session_ModePut(pSession, MSIRUNMODE_REBOOTATEND, TRUE); + hr = Session_ModePut(pSession, MSIRUNMODE_REBOOTATEND, VARIANT_TRUE); ok(hr == S_OK, "Session_ModePut failed, hresult 0x%08x\n", hr); hr = Session_ModeGet(pSession, MSIRUNMODE_REBOOTATEND, &bool); ok(hr == S_OK, "Session_ModeGet failed, hresult 0x%08x\n", hr); ok(bool, "Reboot at end session mode is %d, expected 1\n", bool); - hr = Session_ModePut(pSession, MSIRUNMODE_REBOOTATEND, FALSE); /* set it again so we don't reboot */ + hr = Session_ModePut(pSession, MSIRUNMODE_REBOOTATEND, VARIANT_FALSE); /* set it again so we don't reboot */ ok(hr == S_OK, "Session_ModePut failed, hresult 0x%08x\n", hr); - hr = Session_ModePut(pSession, MSIRUNMODE_REBOOTNOW, TRUE); + hr = Session_ModePut(pSession, MSIRUNMODE_REBOOTNOW, VARIANT_TRUE); ok(hr == S_OK, "Session_ModePut failed, hresult 0x%08x\n", hr); ok_exception(hr, szModeFlag); @@ -1960,11 +1960,11 @@ static void test_Session(IDispatch *pSession) ok(hr == S_OK, "Session_ModeGet failed, hresult 0x%08x\n", hr); ok(bool, "Reboot now mode is %d, expected 1\n", bool); - hr = Session_ModePut(pSession, MSIRUNMODE_REBOOTNOW, FALSE); /* set it again so we don't reboot */ + hr = Session_ModePut(pSession, MSIRUNMODE_REBOOTNOW, VARIANT_FALSE); /* set it again so we don't reboot */ ok(hr == S_OK, "Session_ModePut failed, hresult 0x%08x\n", hr); ok_exception(hr, szModeFlag); - hr = Session_ModePut(pSession, MSIRUNMODE_MAINTENANCE, TRUE); + hr = Session_ModePut(pSession, MSIRUNMODE_MAINTENANCE, VARIANT_TRUE); ok(hr == DISP_E_EXCEPTION, "Session_ModePut failed, hresult 0x%08x\n", hr); ok_exception(hr, szModeFlag);

1 0

Huw Davies : ole32: Set the release interface to NULL before calls to GetDataHere.
by Alexandre Julliard Oct. 21, 2015

Oct. 21, 2015

Module: wine Branch: master Commit: cc1b2879e489587e56bce171aa4a2dd4555cccec URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc1b2879e489587e56bce171a… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Oct 21 13:30:19 2015 +0100 ole32: Set the release interface to NULL before calls to GetDataHere. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/ole2impl.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/ole32/ole2impl.c b/dlls/ole32/ole2impl.c index cdc54be..ccf31fa 100644 --- a/dlls/ole32/ole2impl.c +++ b/dlls/ole32/ole2impl.c @@ -113,6 +113,7 @@ static HRESULT get_storage(IDataObject *data, IStorage *stg, UINT *src_cf, BOOL init_fmtetc(&fmt, embedded_object_clipboard_format, TYMED_ISTORAGE); med.tymed = TYMED_ISTORAGE; med.u.pstg = stg; + med.pUnkForRelease = NULL; hr = IDataObject_GetDataHere(data, &fmt, &med); if(SUCCEEDED(hr)) { @@ -124,6 +125,7 @@ static HRESULT get_storage(IDataObject *data, IStorage *stg, UINT *src_cf, BOOL init_fmtetc(&fmt, embed_source_clipboard_format, TYMED_ISTORAGE); med.tymed = TYMED_ISTORAGE; med.u.pstg = stg; + med.pUnkForRelease = NULL; hr = IDataObject_GetDataHere(data, &fmt, &med); if(SUCCEEDED(hr)) {

1 0

Nikolay Sivov : dxdiagn: Properly set VT_BOOL values (PVS-Studio).
by Alexandre Julliard Oct. 21, 2015

Oct. 21, 2015

Module: wine Branch: master Commit: 5c170dc9bd380aa2b92acb2f4538b482d2f99e61 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c170dc9bd380aa2b92acb2f4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 21 14:48:09 2015 +0300 dxdiagn: Properly set VT_BOOL values (PVS-Studio). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxdiagn/provider.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dxdiagn/provider.c b/dlls/dxdiagn/provider.c index 3b5fcab..2890c61 100644 --- a/dlls/dxdiagn/provider.c +++ b/dlls/dxdiagn/provider.c @@ -335,7 +335,7 @@ static inline HRESULT add_bool_property(IDxDiagContainerImpl_Container *node, co return E_OUTOFMEMORY; V_VT(&prop->vProp) = VT_BOOL; - V_BOOL(&prop->vProp) = data; + V_BOOL(&prop->vProp) = data ? VARIANT_TRUE : VARIANT_FALSE; list_add_tail(&node->properties, &prop->entry); ++node->nProperties;

1 0

Matteo Bruni : d3d9/tests: Extend the shadow test a bit.
by Alexandre Julliard Oct. 21, 2015

Oct. 21, 2015

Module: wine Branch: master Commit: 8075101480df82c5f4280d534f2d76f035653667 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8075101480df82c5f4280d534… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Oct 21 00:24:09 2015 +0200 d3d9/tests: Extend the shadow test a bit. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/visual.c | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 732c037..f110905 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -14257,10 +14257,9 @@ static void shadow_test(void) 0x05000051, 0xa00f0000, 0x00000000, 0x00000000, 0x00000000, 0x3f800000, /* def c0, 0.0, 0.0, 0.0, 1.0 */ 0x02000001, 0x800f0001, 0xa0e40000, /* mov r1, c0 */ 0x03000042, 0x800f0000, 0xb0e40000, 0xa0e40800, /* texld r0, t0, s0 */ - 0x02000001, 0x80010001, 0x80e40000, /* mov r1.x, r0 */ - 0x03010042, 0x800f0000, 0xb0e40000, 0xa0e40800, /* texldp r0, t0, s0 */ - 0x02000001, 0x80020001, 0x80000000, /* mov r1.y, r0.x */ - 0x02000001, 0x800f0800, 0x80e40001, /* mov 0C0, r1 */ + 0x03010042, 0x800f0001, 0xb0e40000, 0xa0e40800, /* texldp r1, t0, s0 */ + 0x02000001, 0x80020000, 0x80000001, /* mov r0.y, r1.x */ + 0x02000001, 0x800f0800, 0x80e40000, /* mov oC0, r0 */ 0x0000ffff, /* end */ }; struct @@ -14299,17 +14298,18 @@ static void shadow_test(void) } expected_colors[] = { - {400, 60, D3DCOLOR_ARGB(0x00, 0x00, 0x00, 0x00)}, - {560, 180, D3DCOLOR_ARGB(0x00, 0xff, 0x00, 0x00)}, - {560, 300, D3DCOLOR_ARGB(0x00, 0xff, 0x00, 0x00)}, - {400, 420, D3DCOLOR_ARGB(0x00, 0xff, 0xff, 0x00)}, - {240, 420, D3DCOLOR_ARGB(0x00, 0xff, 0xff, 0x00)}, - { 80, 300, D3DCOLOR_ARGB(0x00, 0x00, 0x00, 0x00)}, - { 80, 180, D3DCOLOR_ARGB(0x00, 0x00, 0x00, 0x00)}, - {240, 60, D3DCOLOR_ARGB(0x00, 0x00, 0x00, 0x00)}, + {400, 60, 0x00000000}, + {560, 180, 0xffff00ff}, + {560, 300, 0xffff00ff}, + {400, 420, 0xffffffff}, + {240, 420, 0xffffffff}, + { 80, 300, 0x00000000}, + { 80, 180, 0x00000000}, + {240, 60, 0x00000000}, }; IDirect3DSurface9 *original_ds, *original_rt, *rt; + struct surface_readback rb; IDirect3DPixelShader9 *ps; IDirect3DDevice9 *device; IDirect3D9 *d3d; @@ -14434,14 +14434,16 @@ static void shadow_test(void) ok(SUCCEEDED(hr), "SetTexture failed, hr %#x.\n", hr); IDirect3DTexture9_Release(texture); + get_rt_readback(original_rt, &rb); for (j = 0; j < sizeof(expected_colors) / sizeof(*expected_colors); ++j) { - D3DCOLOR color = getPixelColor(device, expected_colors[j].x, expected_colors[j].y); + D3DCOLOR color = get_readback_color(&rb, expected_colors[j].x, expected_colors[j].y); ok(color_match(color, expected_colors[j].color, 0), "Expected color 0x%08x at (%u, %u) for format %s, got 0x%08x.\n", expected_colors[j].color, expected_colors[j].x, expected_colors[j].y, formats[i].name, color); } + release_surface_readback(&rb); hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); ok(SUCCEEDED(hr), "Present failed, hr %#x.\n", hr);

1 0

Matteo Bruni : d3d9/tests: Extend the INTZ test a bit.
by Alexandre Julliard Oct. 21, 2015

Oct. 21, 2015

Module: wine Branch: master Commit: d6e4064596818b539fb3ac65165c462db6f71605 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6e4064596818b539fb3ac651… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Oct 21 00:24:08 2015 +0200 d3d9/tests: Extend the INTZ test a bit. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/visual.c | 36 +++++++++++++++++++++--------------- 1 file changed, 21 insertions(+), 15 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index e26293a..732c037 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -13937,10 +13937,9 @@ static void intz_test(void) 0x05000051, 0xa00f0000, 0x00000000, 0x00000000, 0x00000000, 0x3f800000, /* def c0, 0.0, 0.0, 0.0, 1.0 */ 0x02000001, 0x800f0001, 0xa0e40000, /* mov r1, c0 */ 0x03000042, 0x800f0000, 0xb0e40000, 0xa0e40800, /* texld r0, t0, s0 */ - 0x02000001, 0x80010001, 0x80e40000, /* mov r1.x, r0 */ - 0x03010042, 0x800f0000, 0xb0e40000, 0xa0e40800, /* texldp r0, t0, s0 */ - 0x02000001, 0x80020001, 0x80000000, /* mov r1.y, r0.x */ - 0x02000001, 0x800f0800, 0x80e40001, /* mov oC0, r1 */ + 0x03010042, 0x800f0001, 0xb0e40000, 0xa0e40800, /* texldp r1, t0, s0 */ + 0x02000001, 0x80020000, 0x80000001, /* mov r0.y, r1.x */ + 0x02000001, 0x800f0800, 0x80e40000, /* mov oC0, r0 */ 0x0000ffff, /* end */ }; struct @@ -13976,17 +13975,18 @@ static void intz_test(void) } expected_colors[] = { - { 80, 100, D3DCOLOR_ARGB(0x00, 0x20, 0x40, 0x00)}, - {240, 100, D3DCOLOR_ARGB(0x00, 0x60, 0xbf, 0x00)}, - {400, 100, D3DCOLOR_ARGB(0x00, 0x9f, 0x40, 0x00)}, - {560, 100, D3DCOLOR_ARGB(0x00, 0xdf, 0xbf, 0x00)}, - { 80, 450, D3DCOLOR_ARGB(0x00, 0x20, 0x40, 0x00)}, - {240, 450, D3DCOLOR_ARGB(0x00, 0x60, 0xbf, 0x00)}, - {400, 450, D3DCOLOR_ARGB(0x00, 0x9f, 0x40, 0x00)}, - {560, 450, D3DCOLOR_ARGB(0x00, 0xdf, 0xbf, 0x00)}, + { 80, 100, 0x20204020}, + {240, 100, 0x6060bf60}, + {400, 100, 0x9f9f409f}, + {560, 100, 0xdfdfbfdf}, + { 80, 450, 0x20204020}, + {240, 450, 0x6060bf60}, + {400, 450, 0x9f9f409f}, + {560, 450, 0xdfdfbfdf}, }; IDirect3DSurface9 *original_rt, *rt; + struct surface_readback rb; IDirect3DTexture9 *texture; IDirect3DPixelShader9 *ps; IDirect3DDevice9 *device; @@ -14102,13 +14102,15 @@ static void intz_test(void) hr = IDirect3DDevice9_EndScene(device); ok(SUCCEEDED(hr), "EndScene failed, hr %#x.\n", hr); + get_rt_readback(original_rt, &rb); for (i = 0; i < sizeof(expected_colors) / sizeof(*expected_colors); ++i) { - D3DCOLOR color = getPixelColor(device, expected_colors[i].x, expected_colors[i].y); + D3DCOLOR color = get_readback_color(&rb, expected_colors[i].x, expected_colors[i].y); ok(color_match(color, expected_colors[i].color, 1), "Expected color 0x%08x at (%u, %u), got 0x%08x.\n", expected_colors[i].color, expected_colors[i].x, expected_colors[i].y, color); } + release_surface_readback(&rb); hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); ok(SUCCEEDED(hr), "Present failed, hr %#x.\n", hr); @@ -14154,13 +14156,15 @@ static void intz_test(void) hr = IDirect3DDevice9_EndScene(device); ok(SUCCEEDED(hr), "EndScene failed, hr %#x.\n", hr); + get_rt_readback(original_rt, &rb); for (i = 0; i < sizeof(expected_colors) / sizeof(*expected_colors); ++i) { - D3DCOLOR color = getPixelColor(device, expected_colors[i].x, expected_colors[i].y); + D3DCOLOR color = get_readback_color(&rb, expected_colors[i].x, expected_colors[i].y); ok(color_match(color, expected_colors[i].color, 1), "Expected color 0x%08x at (%u, %u), got 0x%08x.\n", expected_colors[i].color, expected_colors[i].x, expected_colors[i].y, color); } + release_surface_readback(&rb); hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); ok(SUCCEEDED(hr), "Present failed, hr %#x.\n", hr); @@ -14219,13 +14223,15 @@ static void intz_test(void) hr = IDirect3DDevice9_EndScene(device); ok(SUCCEEDED(hr), "EndScene failed, hr %#x.\n", hr); + get_rt_readback(original_rt, &rb); for (i = 0; i < sizeof(expected_colors) / sizeof(*expected_colors); ++i) { - D3DCOLOR color = getPixelColor(device, expected_colors[i].x, expected_colors[i].y); + D3DCOLOR color = get_readback_color(&rb, expected_colors[i].x, expected_colors[i].y); ok(color_match(color, expected_colors[i].color, 1), "Expected color 0x%08x at (%u, %u), got 0x%08x.\n", expected_colors[i].color, expected_colors[i].x, expected_colors[i].y, color); } + release_surface_readback(&rb); hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); ok(SUCCEEDED(hr), "Present failed, hr %#x.\n", hr);

1 0