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

Jacek Caban : inseng: Added CLSID_ActiveSetupEng class factory.
by Alexandre Julliard April 20, 2015

April 20, 2015

Module: wine Branch: master Commit: f3ff3e5055f08fdee8c8505e7c0d681550686fb1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3ff3e5055f08fdee8c8505e7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 20 13:40:40 2015 +0200 inseng: Added CLSID_ActiveSetupEng class factory. --- dlls/inseng/Makefile.in | 3 +-- dlls/inseng/inseng_main.c | 60 ++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 60 insertions(+), 3 deletions(-) diff --git a/dlls/inseng/Makefile.in b/dlls/inseng/Makefile.in index 2981c25..a4b09de 100644 --- a/dlls/inseng/Makefile.in +++ b/dlls/inseng/Makefile.in @@ -1,7 +1,6 @@ MODULE = inseng.dll IMPORTS = uuid ole32 advapi32 -C_SRCS = \ - inseng_main.c +C_SRCS = inseng_main.c IDL_SRCS = inseng.idl diff --git a/dlls/inseng/inseng_main.c b/dlls/inseng/inseng_main.c index 061aabb..d264b99 100644 --- a/dlls/inseng/inseng_main.c +++ b/dlls/inseng/inseng_main.c @@ -30,6 +30,7 @@ #include "ole2.h" #include "rpcproxy.h" #include "initguid.h" +#include "inseng.h" #include "wine/debug.h" @@ -37,6 +38,59 @@ WINE_DEFAULT_DEBUG_CHANNEL(inseng); static HINSTANCE instance; +static HRESULT WINAPI ClassFactory_QueryInterface(IClassFactory *iface, REFIID riid, void **ppv) +{ + *ppv = NULL; + + if(IsEqualGUID(&IID_IUnknown, riid)) { + TRACE("(%p)->(IID_IUnknown %p)\n", iface, ppv); + *ppv = iface; + }else if(IsEqualGUID(&IID_IClassFactory, riid)) { + TRACE("(%p)->(IID_IClassFactory %p)\n", iface, ppv); + *ppv = iface; + } + + if(*ppv) { + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; + } + + FIXME("(%p)->(%s %p)\n", iface, debugstr_guid(riid), ppv); + return E_NOINTERFACE; +} + +static ULONG WINAPI ClassFactory_AddRef(IClassFactory *iface) +{ + return 2; +} + +static ULONG WINAPI ClassFactory_Release(IClassFactory *iface) +{ + return 1; +} + +static HRESULT WINAPI ClassFactory_LockServer(IClassFactory *iface, BOOL fLock) +{ + return S_OK; +} + +static HRESULT WINAPI ActiveSetupEngCF_CreateInstance(IClassFactory *iface, IUnknown *outer, + REFIID riid, void **ppv) +{ + FIXME("(%p %s %p)\n", outer, debugstr_guid(riid), ppv); + return E_NOINTERFACE; +} + +static const IClassFactoryVtbl ActiveSetupEngCFVtbl = { + ClassFactory_QueryInterface, + ClassFactory_AddRef, + ClassFactory_Release, + ActiveSetupEngCF_CreateInstance, + ClassFactory_LockServer +}; + +static IClassFactory ActiveSetupEngCF = { &ActiveSetupEngCFVtbl }; + BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) { switch(fdwReason) @@ -56,8 +110,12 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) */ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID iid, LPVOID *ppv) { - FIXME("%s %s %p\n", debugstr_guid(rclsid), debugstr_guid(iid), ppv); + if(IsEqualGUID(rclsid, &CLSID_ActiveSetupEng)) { + TRACE("(CLSID_ActiveSetupEng %s %p)\n", debugstr_guid(iid), ppv); + return IClassFactory_QueryInterface(&ActiveSetupEngCF, iid, ppv); + } + FIXME("(%s %s %p)\n", debugstr_guid(rclsid), debugstr_guid(iid), ppv); return CLASS_E_CLASSNOTAVAILABLE; }

1 0

Huw Davies : ole32/tests: Win 8 releases the drop target in OleUninitialize().
by Alexandre Julliard April 20, 2015

April 20, 2015

Module: wine Branch: master Commit: a38699084b52774f564e1bb69e07ce387f4c8b62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a38699084b52774f564e1bb69… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Apr 17 14:37:46 2015 +0100 ole32/tests: Win 8 releases the drop target in OleUninitialize(). --- dlls/ole32/tests/dragdrop.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/dlls/ole32/tests/dragdrop.c b/dlls/ole32/tests/dragdrop.c index 8051f58..37a3dfe 100644 --- a/dlls/ole32/tests/dragdrop.c +++ b/dlls/ole32/tests/dragdrop.c @@ -447,13 +447,16 @@ static void test_Register_Revoke(void) ok(droptarget_refs >= 1, "DropTarget refs should be at least one\n"); OleUninitialize(); - ok(droptarget_refs >= 1, "DropTarget refs should be at least one\n"); - hr = RevokeDragDrop(hwnd); - ok_ole_success(hr, "RevokeDragDrop"); - ok(droptarget_refs == 0 || - broken(droptarget_refs == 1), /* NT4 */ - "DropTarget refs should be zero not %d\n", droptarget_refs); + /* Win 8 releases the ref in OleUninitialize() */ + if (droptarget_refs >= 1) + { + hr = RevokeDragDrop(hwnd); + ok_ole_success(hr, "RevokeDragDrop"); + ok(droptarget_refs == 0 || + broken(droptarget_refs == 1), /* NT4 */ + "DropTarget refs should be zero not %d\n", droptarget_refs); + } hr = RevokeDragDrop(NULL); ok(hr == DRAGDROP_E_INVALIDHWND, "RevokeDragDrop with NULL hwnd should return DRAGDROP_E_INVALIDHWND instead of 0x%08x\n", hr);

1 0

Jacek Caban : mshtml: Get rid of duplicated NS_DLSYM defines.
by Alexandre Julliard April 20, 2015

April 20, 2015

Module: wine Branch: master Commit: a0ec86b7b7672f4f58458d54243f7539765780cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0ec86b7b7672f4f58458d542… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 17 15:46:35 2015 +0200 mshtml: Get rid of duplicated NS_DLSYM defines. --- dlls/mshtml/nsembed.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index ac33015..d166ef3 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -518,14 +518,6 @@ static BOOL load_xul(const PRUnichar *gre_path) NS_DLSYM(NS_CStringGetData); NS_DLSYM(NS_Alloc); NS_DLSYM(NS_Free); - -#undef NS_DLSYM - -#define NS_DLSYM(func) \ - func = (void *)GetProcAddress(xul_handle, #func); \ - if(!func) \ - ERR("Could not GetProcAddress(" #func ") failed\n") - NS_DLSYM(ccref_incr); NS_DLSYM(ccref_decr); NS_DLSYM(ccref_init);

1 0

Alexandre Julliard : Wine release 1.7.41
by Alexandre Julliard April 17, 2015

April 17, 2015

Module: website Branch: master Commit: 28f26aaaab3a294589d77ff8cfe908f2b8d40cb5 URL: http://source.winehq.org/git/website.git/?a=commit;h=28f26aaaab3a294589d77f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 17 22:54:01 2015 +0900 Wine release 1.7.41 --- news/en/2015041701.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/en/2015041701.xml b/news/en/2015041701.xml new file mode 100644 index 0000000..976f8f6 --- /dev/null +++ b/news/en/2015041701.xml @@ -0,0 +1,16 @@ +<news> +<date>April 17, 2015</date> +<title>Wine 1.7.41 Released</title> +<body> + The Wine development release 1.7.41 is now available. + <a href="{$root}/announce/1.7.41">What's new</a> in this release: +<ul> + <li>More Known Folders supported in the shell.</li> + <li>Some more support for kernel job objects.</li> + <li>More MSI patches improvements.</li> + <li>Some theming fixes.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.41.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Tag wine-1.7.41 : Alexandre Julliard : Release 1.7.41
by Alexandre Julliard April 17, 2015

April 17, 2015

Module: wine Branch: refs/tags/wine-1.7.41 Tag: d8b1032a085613efc0c0bf5d703006a2c5eea52a URL: http://source.winehq.org/git/wine.git/?a=tag;h=d8b1032a085613efc0c0bf5d7030… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 17 22:52:12 2015 +0900 Release 1.7.41

1 0

Alexandre Julliard : Release 1.7.41.
by Alexandre Julliard April 17, 2015

April 17, 2015

Module: wine Branch: master Commit: 25f0606e84bef7d60ea5c681d19b368660cab8e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=25f0606e84bef7d60ea5c681d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 17 22:52:12 2015 +0900 Release 1.7.41. --- ANNOUNCE | 716 ++++++++++++++++++++++++-------------------------------------- AUTHORS | 4 + VERSION | 2 +- configure | 18 +- 4 files changed, 293 insertions(+), 447 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=25f0606e84bef7d60ea5c…

1 0

Aaryaman Vasishta : d3drm/tests: Add QueryInterface tests for IDirect3DRMFrame{1-3}.
by Alexandre Julliard April 17, 2015

April 17, 2015

Module: wine Branch: master Commit: 223f367beeb934010affeda9b37a8ff93256f462 URL: http://source.winehq.org/git/wine.git/?a=commit;h=223f367beeb934010affeda9b… Author: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Date: Mon Apr 13 22:47:23 2015 +0530 d3drm/tests: Add QueryInterface tests for IDirect3DRMFrame{1-3}. --- dlls/d3drm/tests/d3drm.c | 118 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 118 insertions(+) diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index d1d2ba8..977c9c0 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -1841,6 +1841,123 @@ static void test_d3drm_qi(void) IDirect3DRM_Release(d3drm); } +static void test_frame_qi(void) +{ + static const struct qi_test tests[] = + { + { &IID_IDirect3DRMFrame3, &IID_IUnknown, S_OK, FALSE }, + { &IID_IDirect3DRMFrame2, &IID_IUnknown, S_OK, FALSE }, + { &IID_IDirect3DRMFrame, &IID_IUnknown, S_OK, FALSE }, + { &IID_IDirect3DRM, NULL, CLASS_E_CLASSNOTAVAILABLE, FALSE }, + { &IID_IDirect3DRMDevice, NULL, CLASS_E_CLASSNOTAVAILABLE, FALSE }, + { &IID_IDirect3DRMObject, &IID_IUnknown, S_OK, FALSE }, + { &IID_IDirect3DRMDevice2, NULL, CLASS_E_CLASSNOTAVAILABLE, FALSE }, + { &IID_IDirect3DRMDevice3, NULL, CLASS_E_CLASSNOTAVAILABLE, FALSE }, + { &IID_IDirect3DRMViewport, NULL, CLASS_E_CLASSNOTAVAILABLE, FALSE }, + { &IID_IDirect3DRMViewport2, NULL, CLASS_E_CLASSNOTAVAILABLE, FALSE }, + { &IID_IDirect3DRM3, NULL, CLASS_E_CLASSNOTAVAILABLE, FALSE }, + { &IID_IDirect3DRM2, NULL, CLASS_E_CLASSNOTAVAILABLE, FALSE }, + { &IID_IDirect3DRMVisual, &IID_IUnknown, S_OK, FALSE }, + { &IID_IDirect3DRMMesh, NULL, CLASS_E_CLASSNOTAVAILABLE, FALSE }, + { &IID_IDirect3DRMMeshBuilder, NULL, CLASS_E_CLASSNOTAVAILABLE, FALSE }, + { &IID_IDirect3DRMMeshBuilder2, NULL, CLASS_E_CLASSNOTAVAILABLE, FALSE }, + { &IID_IDirect3DRMMeshBuilder3, NULL, CLASS_E_CLASSNOTAVAILABLE, FALSE }, + { &IID_IDirect3DRMFace, NULL, CLASS_E_CLASSNOTAVAILABLE, FALSE }, + { &IID_IDirect3DRMFace2, NULL, CLASS_E_CLASSNOTAVAILABLE, FALSE }, + { &IID_IDirect3DRMLight, NULL, CLASS_E_CLASSNOTAVAILABLE, FALSE }, + { &IID_IDirect3DRMTexture, NULL, CLASS_E_CLASSNOTAVAILABLE, FALSE }, + { &IID_IDirect3DRMTexture2, NULL, CLASS_E_CLASSNOTAVAILABLE, FALSE }, + { &IID_IDirect3DRMTexture3, NULL, CLASS_E_CLASSNOTAVAILABLE, FALSE }, + { &IID_IDirect3DRMWrap, NULL, CLASS_E_CLASSNOTAVAILABLE, FALSE }, + { &IID_IDirect3DRMMaterial, NULL, CLASS_E_CLASSNOTAVAILABLE, FALSE }, + { &IID_IDirect3DRMMaterial2, NULL, CLASS_E_CLASSNOTAVAILABLE, FALSE }, + { &IID_IDirect3DRMAnimation, NULL, CLASS_E_CLASSNOTAVAILABLE, FALSE }, + { &IID_IDirect3DRMAnimation2, NULL, CLASS_E_CLASSNOTAVAILABLE, FALSE }, + { &IID_IDirect3DRMAnimationSet, NULL, CLASS_E_CLASSNOTAVAILABLE, FALSE }, + { &IID_IDirect3DRMAnimationSet2, NULL, CLASS_E_CLASSNOTAVAILABLE, FALSE }, + { &IID_IDirect3DRMObjectArray, NULL, CLASS_E_CLASSNOTAVAILABLE, FALSE }, + { &IID_IDirect3DRMDeviceArray, NULL, CLASS_E_CLASSNOTAVAILABLE, FALSE }, + { &IID_IDirect3DRMViewportArray, NULL, CLASS_E_CLASSNOTAVAILABLE, FALSE }, + { &IID_IDirect3DRMFrameArray, NULL, CLASS_E_CLASSNOTAVAILABLE, FALSE }, + { &IID_IDirect3DRMVisualArray, NULL, CLASS_E_CLASSNOTAVAILABLE, FALSE }, + { &IID_IDirect3DRMLightArray, NULL, CLASS_E_CLASSNOTAVAILABLE, FALSE }, + { &IID_IDirect3DRMPickedArray, NULL, CLASS_E_CLASSNOTAVAILABLE, FALSE }, + { &IID_IDirect3DRMFaceArray, NULL, CLASS_E_CLASSNOTAVAILABLE, FALSE }, + { &IID_IDirect3DRMAnimationArray, NULL, CLASS_E_CLASSNOTAVAILABLE, FALSE }, + { &IID_IDirect3DRMUserVisual, NULL, CLASS_E_CLASSNOTAVAILABLE, FALSE }, + { &IID_IDirect3DRMShadow, NULL, CLASS_E_CLASSNOTAVAILABLE, FALSE }, + { &IID_IDirect3DRMShadow2, NULL, CLASS_E_CLASSNOTAVAILABLE, FALSE }, + { &IID_IDirect3DRMInterpolator, NULL, CLASS_E_CLASSNOTAVAILABLE, FALSE }, + { &IID_IDirect3DRMProgressiveMesh, NULL, CLASS_E_CLASSNOTAVAILABLE, FALSE }, + { &IID_IDirect3DRMPicked2Array, NULL, CLASS_E_CLASSNOTAVAILABLE, FALSE }, + { &IID_IDirect3DRMClippedVisual, NULL, CLASS_E_CLASSNOTAVAILABLE, FALSE }, + { &IID_IDirectDrawClipper, NULL, CLASS_E_CLASSNOTAVAILABLE, FALSE }, + { &IID_IDirectDrawSurface7, NULL, CLASS_E_CLASSNOTAVAILABLE, FALSE }, + { &IID_IDirectDrawSurface4, NULL, CLASS_E_CLASSNOTAVAILABLE, FALSE }, + { &IID_IDirectDrawSurface3, NULL, CLASS_E_CLASSNOTAVAILABLE, FALSE }, + { &IID_IDirectDrawSurface2, NULL, CLASS_E_CLASSNOTAVAILABLE, FALSE }, + { &IID_IDirectDrawSurface, NULL, CLASS_E_CLASSNOTAVAILABLE, FALSE }, + { &IID_IDirect3DDevice7, NULL, CLASS_E_CLASSNOTAVAILABLE, FALSE }, + { &IID_IDirect3DDevice3, NULL, CLASS_E_CLASSNOTAVAILABLE, FALSE }, + { &IID_IDirect3DDevice2, NULL, CLASS_E_CLASSNOTAVAILABLE, FALSE }, + { &IID_IDirect3DDevice, NULL, CLASS_E_CLASSNOTAVAILABLE, FALSE }, + { &IID_IDirect3D7, NULL, CLASS_E_CLASSNOTAVAILABLE, FALSE }, + { &IID_IDirect3D3, NULL, CLASS_E_CLASSNOTAVAILABLE, FALSE }, + { &IID_IDirect3D2, NULL, CLASS_E_CLASSNOTAVAILABLE, FALSE }, + { &IID_IDirect3D, NULL, CLASS_E_CLASSNOTAVAILABLE, FALSE }, + { &IID_IDirectDraw7, NULL, CLASS_E_CLASSNOTAVAILABLE, FALSE }, + { &IID_IDirectDraw4, NULL, CLASS_E_CLASSNOTAVAILABLE, FALSE }, + { &IID_IDirectDraw3, NULL, CLASS_E_CLASSNOTAVAILABLE, FALSE }, + { &IID_IDirectDraw2, NULL, CLASS_E_CLASSNOTAVAILABLE, FALSE }, + { &IID_IDirectDraw, NULL, CLASS_E_CLASSNOTAVAILABLE, FALSE }, + { &IID_IDirect3DLight, NULL, CLASS_E_CLASSNOTAVAILABLE, FALSE }, + { &IID_IUnknown, &IID_IUnknown, S_OK, FALSE }, + }; + HRESULT hr; + IDirect3DRM *d3drm1; + IDirect3DRM2 *d3drm2; + IDirect3DRM3 *d3drm3; + IDirect3DRMFrame *frame1; + IDirect3DRMFrame2 *frame2; + IDirect3DRMFrame3 *frame3; + IUnknown *unknown; + + hr = Direct3DRMCreate(&d3drm1); + ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x)\n", hr); + + hr = IDirect3DRM_CreateFrame(d3drm1, NULL, &frame1); + ok(hr == D3DRM_OK, "Failed to create frame1 (hr = %x)\n", hr); + IDirect3DRMFrame_QueryInterface(frame1, &IID_IUnknown, (void **)&unknown); + ok(hr == D3DRM_OK, "Failed to create IUnknown from frame1 (hr = %x)\n", hr); + IDirect3DRMFrame_Release(frame1); + test_qi("frame1_qi", unknown, &IID_IUnknown, tests, sizeof(tests) / sizeof(*tests)); + IUnknown_Release(unknown); + + hr = IDirect3DRM_QueryInterface(d3drm1, &IID_IDirect3DRM2, (void **)&d3drm2); + ok(hr == D3DRM_OK, "Cannot get IDirect3DRM2 interface (hr = %x).\n", hr); + hr = IDirect3DRM2_CreateFrame(d3drm2, NULL, &frame2); + ok(hr == D3DRM_OK, "Failed to create frame2 (hr = %x)\n", hr); + IDirect3DRMFrame2_QueryInterface(frame2, &IID_IUnknown, (void **)&unknown); + ok(hr == D3DRM_OK, "Failed to create IUnknown from frame2 (hr = %x)\n", hr); + IDirect3DRMFrame2_Release(frame2); + test_qi("frame2_qi", unknown, &IID_IUnknown, tests, sizeof(tests) / sizeof(*tests)); + IUnknown_Release(unknown); + + hr = IDirect3DRM_QueryInterface(d3drm1, &IID_IDirect3DRM3, (void **)&d3drm3); + ok(hr == D3DRM_OK, "Cannot get IDirect3DRM3 interface (hr = %x).\n", hr); + hr = IDirect3DRM3_CreateFrame(d3drm3, NULL, &frame3); + ok(hr == D3DRM_OK, "Failed to create frame3 (hr = %x)\n", hr); + IDirect3DRMFrame3_QueryInterface(frame3, &IID_IUnknown, (void **)&unknown); + ok(hr == D3DRM_OK, "Failed to create IUnknown from frame3 (hr = %x)\n", hr); + IDirect3DRMFrame3_Release(frame3); + test_qi("frame3_qi", unknown, &IID_IUnknown, tests, sizeof(tests) / sizeof(*tests)); + IUnknown_Release(unknown); + + IDirect3DRM3_Release(d3drm3); + IDirect3DRM2_Release(d3drm2); + IDirect3DRM_Release(d3drm1); +} + START_TEST(d3drm) { test_MeshBuilder(); @@ -1857,4 +1974,5 @@ START_TEST(d3drm) test_d3drm_load(); test_frame_mesh_materials(); test_d3drm_qi(); + test_frame_qi(); }

1 0

Aaryaman Vasishta : d3drm/tests: Make get_refcount return ULONG instead of int.
by Alexandre Julliard April 17, 2015

April 17, 2015

Module: wine Branch: master Commit: 5bbbf0aeb4b91598e80fc7d3d2d309e2876145e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5bbbf0aeb4b91598e80fc7d3d… Author: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Date: Mon Apr 13 22:47:02 2015 +0530 d3drm/tests: Make get_refcount return ULONG instead of int. --- dlls/d3drm/tests/d3drm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 5fbd281..d1d2ba8 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -33,7 +33,7 @@ ok(count == rc_new, "Invalid refcount. Expected %d got %d\n", rc_new, count); \ } -static int get_refcount(IUnknown *object) +static ULONG get_refcount(IUnknown *object) { IUnknown_AddRef( object ); return IUnknown_Release( object );

1 0

Gerald Pfeifer : wininet: Avoid four instances of " logical not is only applied to the to the left hand side".
by Alexandre Julliard April 17, 2015

April 17, 2015

Module: wine Branch: master Commit: 4415171ab63c68d1b728f00424c4d5ea6300e3a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4415171ab63c68d1b728f0042… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sun Apr 12 23:04:32 2015 +0200 wininet: Avoid four instances of "logical not is only applied to the to the left hand side". --- dlls/wininet/tests/urlcache.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wininet/tests/urlcache.c b/dlls/wininet/tests/urlcache.c index f735d73..f4d1e35 100644 --- a/dlls/wininet/tests/urlcache.c +++ b/dlls/wininet/tests/urlcache.c @@ -218,16 +218,16 @@ static void test_IsUrlCacheEntryExpiredA(void) * is NULL. */ ret = IsUrlCacheEntryExpiredA(NULL, 0, NULL); - ok(!ret == ie10_cache, "IsUrlCacheEntryExpiredA returned %x\n", ret); + ok(ret != ie10_cache, "IsUrlCacheEntryExpiredA returned %x\n", ret); ft.dwLowDateTime = 0xdeadbeef; ft.dwHighDateTime = 0xbaadf00d; ret = IsUrlCacheEntryExpiredA(NULL, 0, &ft); - ok(!ret == ie10_cache, "IsUrlCacheEntryExpiredA returned %x\n", ret); + ok(ret != ie10_cache, "IsUrlCacheEntryExpiredA returned %x\n", ret); ok(ft.dwLowDateTime == 0xdeadbeef && ft.dwHighDateTime == 0xbaadf00d, "expected time to be unchanged, got (%u,%u)\n", ft.dwLowDateTime, ft.dwHighDateTime); ret = IsUrlCacheEntryExpiredA(test_url, 0, NULL); - ok(!ret == ie10_cache, "IsUrlCacheEntryExpiredA returned %x\n", ret); + ok(ret != ie10_cache, "IsUrlCacheEntryExpiredA returned %x\n", ret); /* The return value should indicate whether the URL is expired, * and the filetime indicates the last modified time, but a cache entry @@ -310,7 +310,7 @@ static void test_IsUrlCacheEntryExpiredA(void) ft.dwLowDateTime = 0xdeadbeef; ft.dwHighDateTime = 0xbaadf00d; ret = IsUrlCacheEntryExpiredA(uncached_url, 0, &ft); - ok(!ret == ie10_cache, "IsUrlCacheEntryExpiredA returned %x\n", ret); + ok(ret != ie10_cache, "IsUrlCacheEntryExpiredA returned %x\n", ret); ok(!ft.dwLowDateTime && !ft.dwHighDateTime, "expected time (0,0), got (%u,%u)\n", ft.dwLowDateTime, ft.dwHighDateTime);

1 0

Patrick Rudolph : gdi32: Add stub functions.
by Alexandre Julliard April 17, 2015

April 17, 2015

Module: wine Branch: master Commit: d2a91a3aed5618664e512b9ba5a9bd0e5f764aca URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2a91a3aed5618664e512b9ba… Author: Patrick Rudolph <siro(a)das-labor.org> Date: Wed Apr 15 19:26:07 2015 +0200 gdi32: Add stub functions. --- dlls/gdi32/driver.c | 19 +++++++++++++++++++ dlls/gdi32/gdi32.spec | 2 ++ 2 files changed, 21 insertions(+) diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index 4529562..ab39e41 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -30,6 +30,7 @@ #include "winbase.h" #include "ddrawgdi.h" #include "wine/winbase16.h" +#include "winternl.h" #include "gdi_private.h" #include "wine/unicode.h" @@ -1153,3 +1154,21 @@ ULONG WINAPI DdQueryDisplaySettingsUniqueness(VOID) FIXME("stub\n"); return 0; } + +/****************************************************************************** + * D3DKMTOpenAdapterFromHdc [GDI32.@] + */ +NTSTATUS WINAPI D3DKMTOpenAdapterFromHdc( void *pData ) +{ + FIXME("(%p): stub\n", pData); + return STATUS_NO_MEMORY; +} + +/****************************************************************************** + * D3DKMTEscape [GDI32.@] + */ +NTSTATUS WINAPI D3DKMTEscape( const void *pData ) +{ + FIXME("(%p): stub\n", pData); + return STATUS_NO_MEMORY; +} diff --git a/dlls/gdi32/gdi32.spec b/dlls/gdi32/gdi32.spec index 6ebad3c..4ad1802 100644 --- a/dlls/gdi32/gdi32.spec +++ b/dlls/gdi32/gdi32.spec @@ -80,6 +80,8 @@ @ stdcall CreateScalableFontResourceA(long str str str) @ stdcall CreateScalableFontResourceW(long wstr wstr wstr) @ stdcall CreateSolidBrush(long) +@ stdcall D3DKMTEscape(ptr) +@ stdcall D3DKMTOpenAdapterFromHdc(ptr) @ stdcall DPtoLP(long ptr long) @ stdcall DeleteColorSpace(long) @ stdcall DeleteDC(long)

1 0

Hans Leidekker : msi: Perform a suffix match on the volume name.
by Alexandre Julliard April 17, 2015

April 17, 2015

Module: wine Branch: master Commit: 89693776473f174f45d950e9669044ed46bc331b URL: http://source.winehq.org/git/wine.git/?a=commit;h=89693776473f174f45d950e96… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Apr 16 17:01:55 2015 +0200 msi: Perform a suffix match on the volume name. --- dlls/msi/media.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/msi/media.c b/dlls/msi/media.c index 3dbd1b7..7c8c94f 100644 --- a/dlls/msi/media.c +++ b/dlls/msi/media.c @@ -54,8 +54,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(msi); static BOOL source_matches_volume(MSIMEDIAINFO *mi, LPCWSTR source_root) { - WCHAR volume_name[MAX_PATH + 1]; - WCHAR root[MAX_PATH + 1]; + WCHAR volume_name[MAX_PATH + 1], root[MAX_PATH + 1]; + const WCHAR *p; + int len, len2; strcpyW(root, source_root); PathStripToRootW(root); @@ -66,7 +67,13 @@ static BOOL source_matches_volume(MSIMEDIAINFO *mi, LPCWSTR source_root) WARN("failed to get volume information for %s (%u)\n", debugstr_w(root), GetLastError()); return FALSE; } - return !strcmpiW( mi->volume_label, volume_name ); + + len = strlenW( volume_name ); + len2 = strlenW( mi->volume_label ); + if (len2 > len) return FALSE; + p = volume_name + len - len2; + + return !strcmpiW( mi->volume_label, p ); } static UINT msi_change_media(MSIPACKAGE *package, MSIMEDIAINFO *mi)

1 0

Hans Leidekker : msi: Improve the check for files obsoleted by patches.
by Alexandre Julliard April 17, 2015

April 17, 2015

Module: wine Branch: master Commit: 20c3c09fac51538359bdc3934686c171c27204e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=20c3c09fac51538359bdc3934… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Apr 16 17:01:21 2015 +0200 msi: Improve the check for files obsoleted by patches. --- dlls/msi/files.c | 37 ++++++++++++++++++++++++------------- 1 file changed, 24 insertions(+), 13 deletions(-) diff --git a/dlls/msi/files.c b/dlls/msi/files.c index 26e4cb1..8977a9c 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -63,6 +63,28 @@ static void msi_file_update_ui( MSIPACKAGE *package, MSIFILE *f, const WCHAR *ac msi_ui_progress( package, 2, f->FileSize, 0, 0 ); } +static BOOL is_registered_patch_media( MSIPACKAGE *package, UINT disk_id ) +{ + MSIPATCHINFO *patch; + + LIST_FOR_EACH_ENTRY( patch, &package->patches, MSIPATCHINFO, entry ) + { + if (patch->disk_id == disk_id && patch->registered) return TRUE; + } + return FALSE; +} + +static BOOL is_obsoleted_by_patch( MSIPACKAGE *package, MSIFILE *file ) +{ + if (!list_empty( &package->patches ) && file->disk_id < MSI_INITIAL_MEDIA_TRANSFORM_DISKID) + { + if (!msi_get_property_int( package->db, szInstalled, 0 )) return FALSE; + return TRUE; + } + if (is_registered_patch_media( package, file->disk_id )) return TRUE; + return FALSE; +} + static msi_file_state calculate_install_state( MSIPACKAGE *package, MSIFILE *file ) { MSICOMPONENT *comp = file->Component; @@ -77,9 +99,9 @@ static msi_file_state calculate_install_state( MSIPACKAGE *package, MSIFILE *fil TRACE("skipping %s (not scheduled for install)\n", debugstr_w(file->File)); return msifs_skipped; } - if (!list_empty( &package->patches ) && file->disk_id < MSI_INITIAL_MEDIA_TRANSFORM_DISKID) + if (is_obsoleted_by_patch( package, file )) { - TRACE("skipping %s (not part of patch)\n", debugstr_w(file->File)); + TRACE("skipping %s (obsoleted by patch)\n", debugstr_w(file->File)); return msifs_skipped; } if ((msi_is_global_assembly( comp ) && !comp->assembly->installed) || @@ -450,17 +472,6 @@ static MSIFILEPATCH *find_filepatch( MSIPACKAGE *package, UINT disk_id, const WC return NULL; } -static BOOL is_registered_patch_media( MSIPACKAGE *package, UINT disk_id ) -{ - MSIPATCHINFO *patch; - - LIST_FOR_EACH_ENTRY( patch, &package->patches, MSIPATCHINFO, entry ) - { - if (patch->disk_id == disk_id && patch->registered) return TRUE; - } - return FALSE; -} - static BOOL patchfiles_cb(MSIPACKAGE *package, LPCWSTR file, DWORD action, LPWSTR *path, DWORD *attrs, PVOID user) {

1 0

Piotr Caban : msvcrt: Don't ignore pmode attribute in _wsopen_s.
by Alexandre Julliard April 17, 2015

April 17, 2015

Module: wine Branch: master Commit: 760b78813d0e75d5d32f60318fe2bb4c7a5064b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=760b78813d0e75d5d32f60318… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 16 17:37:10 2015 +0200 msvcrt: Don't ignore pmode attribute in _wsopen_s. --- dlls/msvcrt/file.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index f803f5d..c1ba5fd 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -2114,8 +2114,6 @@ int CDECL MSVCRT__wsopen_s( int *fd, const MSVCRT_wchar_t* path, int oflags, int { if(pmode & ~(MSVCRT__S_IREAD | MSVCRT__S_IWRITE)) FIXME(": pmode 0x%04x ignored\n", pmode); - else - WARN(": pmode 0x%04x ignored\n", pmode); if (oflags & MSVCRT__O_EXCL) creation = CREATE_NEW; @@ -2150,7 +2148,11 @@ int CDECL MSVCRT__wsopen_s( int *fd, const MSVCRT_wchar_t* path, int oflags, int ERR( "Unhandled shflags 0x%x\n", shflags ); return MSVCRT_EINVAL; } - attrib = FILE_ATTRIBUTE_NORMAL; + + if (!(pmode & ~MSVCRT_umask & MSVCRT__S_IWRITE)) + attrib = FILE_ATTRIBUTE_READONLY; + else + attrib = FILE_ATTRIBUTE_NORMAL; if (oflags & MSVCRT__O_TEMPORARY) {

1 0

Piotr Caban : msvcr120: Added strtoll and strtoull exports.
by Alexandre Julliard April 17, 2015

April 17, 2015

Module: wine Branch: master Commit: 0694f8c89e3ffc2a6c62d44a447738bf5d48dd1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=0694f8c89e3ffc2a6c62d44a4… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 16 17:37:02 2015 +0200 msvcr120: Added strtoll and strtoull exports. --- dlls/msvcr120/msvcr120.spec | 8 ++++---- dlls/msvcr120_app/msvcr120_app.spec | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index b79e32c..c14ac45 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1734,11 +1734,11 @@ @ stub _strtoimax_l @ stub _strtol_l @ stub _strtold_l -@ stub _strtoll_l +@ cdecl -ret64 _strtoll_l(str ptr long ptr) MSVCRT_strtoi64_l @ cdecl -ret64 _strtoui64(str ptr long) MSVCRT_strtoui64 @ cdecl -ret64 _strtoui64_l(str ptr long ptr) MSVCRT_strtoui64_l @ cdecl _strtoul_l(str ptr long ptr) MSVCRT_strtoul_l -@ stub _strtoull_l +@ cdecl -ret64 _strtoull_l(str ptr long ptr) MSVCRT_strtoui64_l @ stub _strtoumax_l @ cdecl _strupr(str) MSVCRT__strupr @ cdecl _strupr_l(str ptr) MSVCRT__strupr_l @@ -2389,9 +2389,9 @@ @ cdecl strtok_s(ptr str ptr) MSVCRT_strtok_s @ cdecl strtol(str ptr long) MSVCRT_strtol @ stub strtold -@ stub strtoll +@ cdecl -ret64 strtoll(str ptr long) MSVCRT_strtoi64 @ cdecl strtoul(str ptr long) MSVCRT_strtoul -@ stub strtoull +@ cdecl -ret64 strtoull(str ptr long) MSVCRT_strtoui64 @ stub strtoumax @ cdecl strxfrm(ptr str long) MSVCRT_strxfrm @ varargs swprintf_s(ptr long wstr) MSVCRT_swprintf_s diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index f67e414..2ac7ab9 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1448,11 +1448,11 @@ @ stub _strtoimax_l @ stub _strtol_l @ stub _strtold_l -@ stub _strtoll_l +@ cdecl -ret64 _strtoll_l(str ptr long ptr) msvcr120._strtoll_l @ cdecl -ret64 _strtoui64(str ptr long) msvcr120._strtoui64 @ cdecl -ret64 _strtoui64_l(str ptr long ptr) msvcr120._strtoui64_l @ cdecl _strtoul_l(str ptr long ptr) msvcr120._strtoul_l -@ stub _strtoull_l +@ cdecl -ret64 _strtoull_l(str ptr long ptr) msvcr120._strtoull_l @ stub _strtoumax_l @ cdecl _strupr(str) msvcr120._strupr @ cdecl _strupr_l(str ptr) msvcr120._strupr_l @@ -2055,9 +2055,9 @@ @ cdecl strtok_s(ptr str ptr) msvcr120.strtok_s @ cdecl strtol(str ptr long) msvcr120.strtol @ stub strtold -@ stub strtoll +@ cdecl -ret64 strtoll(str ptr long) msvcr120.strtoll @ cdecl strtoul(str ptr long) msvcr120.strtoul -@ stub strtoull +@ cdecl -ret64 strtoull(str ptr long) msvcr120.strtoull @ stub strtoumax @ cdecl strxfrm(ptr str long) msvcr120.strxfrm @ varargs swprintf_s(ptr long wstr) msvcr120.swprintf_s

1 0

Hans Leidekker : server: Accept mandatory label ACEs.
by Alexandre Julliard April 17, 2015

April 17, 2015

Module: wine Branch: master Commit: aa407a281859af0d2e1ad4ee0156c10be1c4ef80 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa407a281859af0d2e1ad4ee0… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Apr 16 17:02:58 2015 +0200 server: Accept mandatory label ACEs. --- server/token.c | 4 ++++ server/trace.c | 6 ++++++ 2 files changed, 10 insertions(+) diff --git a/server/token.c b/server/token.c index cb81eec..c235ece 100644 --- a/server/token.c +++ b/server/token.c @@ -265,6 +265,10 @@ static int acl_is_valid( const ACL *acl, data_size_t size ) sid = (const SID *)&((const SYSTEM_ALARM_ACE *)ace)->SidStart; sid_size = ace->AceSize - FIELD_OFFSET(SYSTEM_ALARM_ACE, SidStart); break; + case SYSTEM_MANDATORY_LABEL_ACE_TYPE: + sid = (const SID *)&((const SYSTEM_MANDATORY_LABEL_ACE *)ace)->SidStart; + sid_size = ace->AceSize - FIELD_OFFSET(SYSTEM_MANDATORY_LABEL_ACE, SidStart); + break; default: return FALSE; } diff --git a/server/trace.c b/server/trace.c index 236c9ab..20895b1 100644 --- a/server/trace.c +++ b/server/trace.c @@ -914,6 +914,12 @@ static void dump_inline_acl( const char *prefix, const ACL *acl, data_size_t siz fprintf( stderr, "SYSTEM_ALARM_ACE_TYPE,Mask=%x", ((const SYSTEM_ALARM_ACE *)ace)->Mask ); break; + case SYSTEM_MANDATORY_LABEL_ACE_TYPE: + sid = (const SID *)&((const SYSTEM_MANDATORY_LABEL_ACE *)ace)->SidStart; + sid_size = ace->AceSize - FIELD_OFFSET(SYSTEM_MANDATORY_LABEL_ACE, SidStart); + fprintf( stderr, "SYSTEM_MANDATORY_LABEL_ACE_TYPE,Mask=%x", + ((const SYSTEM_MANDATORY_LABEL_ACE *)ace)->Mask ); + break; default: fprintf( stderr, "unknown<%d>", ace->AceType ); break;

1 0

Hans Leidekker : advapi32: Support parsing mandatory label ACE strings.
by Alexandre Julliard April 17, 2015

April 17, 2015

Module: wine Branch: master Commit: 985e226c07c3d1dce70ee2794bab29c37188ea96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=985e226c07c3d1dce70ee2794… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Apr 16 17:02:29 2015 +0200 advapi32: Support parsing mandatory label ACE strings. --- dlls/advapi32/security.c | 10 ++++++++++ dlls/advapi32/tests/security.c | 7 +++++++ include/winnt.h | 11 +++++++++++ 3 files changed, 28 insertions(+) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index 2cd3f74..d27b2e7 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -311,6 +311,10 @@ static const WCHAR SDDL_GENERIC_READ[] = {'G','R',0}; static const WCHAR SDDL_GENERIC_WRITE[] = {'G','W',0}; static const WCHAR SDDL_GENERIC_EXECUTE[] = {'G','X',0}; +static const WCHAR SDDL_NO_READ_UP[] = {'N','R',0}; +static const WCHAR SDDL_NO_WRITE_UP[] = {'N','W',0}; +static const WCHAR SDDL_NO_EXECUTE_UP[] = {'N','X',0}; + /* * ACL flags */ @@ -325,6 +329,7 @@ static const WCHAR SDDL_ACCESS_ALLOWED[] = {'A',0}; static const WCHAR SDDL_ACCESS_DENIED[] = {'D',0}; static const WCHAR SDDL_AUDIT[] = {'A','U',0}; static const WCHAR SDDL_ALARM[] = {'A','L',0}; +static const WCHAR SDDL_MANDATORY_LABEL[] = {'M','L',0}; /* * ACE flags @@ -4147,6 +4152,7 @@ static const ACEFLAG AceType[] = { SDDL_AUDIT, SYSTEM_AUDIT_ACE_TYPE }, { SDDL_ACCESS_ALLOWED, ACCESS_ALLOWED_ACE_TYPE }, { SDDL_ACCESS_DENIED, ACCESS_DENIED_ACE_TYPE }, + { SDDL_MANDATORY_LABEL,SYSTEM_MANDATORY_LABEL_ACE_TYPE }, /* { SDDL_OBJECT_ACCESS_ALLOWED, ACCESS_ALLOWED_OBJECT_ACE_TYPE }, { SDDL_OBJECT_ACCESS_DENIED, ACCESS_DENIED_OBJECT_ACE_TYPE }, @@ -4257,6 +4263,10 @@ static const ACEFLAG AceRights[] = { SDDL_KEY_READ, KEY_READ }, { SDDL_KEY_WRITE, KEY_WRITE }, { SDDL_KEY_EXECUTE, KEY_EXECUTE }, + + { SDDL_NO_READ_UP, SYSTEM_MANDATORY_LABEL_NO_READ_UP }, + { SDDL_NO_WRITE_UP, SYSTEM_MANDATORY_LABEL_NO_WRITE_UP }, + { SDDL_NO_EXECUTE_UP, SYSTEM_MANDATORY_LABEL_NO_EXECUTE_UP }, { NULL, 0 }, }; diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 466100d..b43f212 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -3901,6 +3901,13 @@ static void test_ConvertStringSecurityDescriptor(void) Blank, SDDL_REVISION_1, &pSD, NULL); ok(ret, "ConvertStringSecurityDescriptorToSecurityDescriptor failed with error %d\n", GetLastError()); LocalFree(pSD); + + SetLastError(0xdeadbeef); + ret = pConvertStringSecurityDescriptorToSecurityDescriptorA( + "D:P(A;;GRGW;;;BA)(A;;GRGW;;;S-1-5-21-0-0-0-1000)S:(ML;;NWNR;;;S-1-16-12288)", SDDL_REVISION_1, &pSD, NULL); + ok(ret || broken(!ret && GetLastError() == ERROR_INVALID_DATATYPE) /* win2k */, + "ConvertStringSecurityDescriptorToSecurityDescriptor failed with error %u\n", GetLastError()); + if (ret) LocalFree(pSD); } static void test_ConvertSecurityDescriptorToString(void) diff --git a/include/winnt.h b/include/winnt.h index c2aa50e..9b08544 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -4445,6 +4445,7 @@ typedef struct _ACE_HEADER { #define ACCESS_DENIED_ACE_TYPE 1 #define SYSTEM_AUDIT_ACE_TYPE 2 #define SYSTEM_ALARM_ACE_TYPE 3 +#define SYSTEM_MANDATORY_LABEL_ACE_TYPE 0x11 /* inherit AceFlags */ #define OBJECT_INHERIT_ACE 0x01 @@ -4489,6 +4490,16 @@ typedef struct _SYSTEM_ALARM_ACE { DWORD SidStart; } SYSTEM_ALARM_ACE,*PSYSTEM_ALARM_ACE; +typedef struct _SYSTEM_MANDATORY_LABEL_ACE { + ACE_HEADER Header; + ACCESS_MASK Mask; + DWORD SidStart; +} SYSTEM_MANDATORY_LABEL_ACE,*PSYSTEM_MANDATORY_LABEL_ACE; + +#define SYSTEM_MANDATORY_LABEL_NO_WRITE_UP 0x1 +#define SYSTEM_MANDATORY_LABEL_NO_READ_UP 0x2 +#define SYSTEM_MANDATORY_LABEL_NO_EXECUTE_UP 0x4 + typedef enum tagSID_NAME_USE { SidTypeUser = 1, SidTypeGroup,

1 0

Henri Verbeet : wined3d: Bind the texture before calling wined3d_volume_upload_data() in wined3d_volume_load_location().
by Alexandre Julliard April 16, 2015

April 16, 2015

Module: wine Branch: master Commit: 52478e38095e8d1c70fcdbcfb091dee419c37bc6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=52478e38095e8d1c70fcdbcfb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 16 11:26:33 2015 +0200 wined3d: Bind the texture before calling wined3d_volume_upload_data() in wined3d_volume_load_location(). --- dlls/wined3d/volume.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index 91325dc..357608f 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -64,6 +64,8 @@ void wined3d_volume_get_pitch(const struct wined3d_volume *volume, UINT *row_pit TRACE("Returning row pitch %u, slice pitch %u.\n", *row_pitch, *slice_pitch); } +/* This call just uploads data, the caller is responsible for binding the + * correct texture. */ /* Context activation is done by the caller. */ void wined3d_volume_upload_data(struct wined3d_volume *volume, const struct wined3d_context *context, const struct wined3d_const_bo_address *data) @@ -273,11 +275,15 @@ static void wined3d_volume_load_location(struct wined3d_volume *volume, else if (volume->locations & WINED3D_LOCATION_SYSMEM) { struct wined3d_const_bo_address data = {0, volume->resource.heap_memory}; + wined3d_texture_bind_and_dirtify(volume->container, context, + location == WINED3D_LOCATION_TEXTURE_SRGB); wined3d_volume_upload_data(volume, context, &data); } else if (volume->locations & WINED3D_LOCATION_BUFFER) { struct wined3d_const_bo_address data = {volume->pbo, NULL}; + wined3d_texture_bind_and_dirtify(volume->container, context, + location == WINED3D_LOCATION_TEXTURE_SRGB); wined3d_volume_upload_data(volume, context, &data); } else if (volume->locations & WINED3D_LOCATION_TEXTURE_RGB)

1 0

Jacek Caban : mshtml: Use NS_Alloc and NS_Free directly instead of via nsIMemory.
by Alexandre Julliard April 16, 2015

April 16, 2015

Module: wine Branch: master Commit: ba00e8e0e1159047e52469008ef41fe1f2d6b276 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba00e8e0e1159047e52469008… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 16 12:37:11 2015 +0200 mshtml: Use NS_Alloc and NS_Free directly instead of via nsIMemory. --- dlls/mshtml/nsembed.c | 18 ++++++------------ dlls/mshtml/nsiface.idl | 15 --------------- 2 files changed, 6 insertions(+), 27 deletions(-) diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index f4d14bc..ac33015 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -42,7 +42,6 @@ WINE_DECLARE_DEBUG_CHANNEL(gecko); #define NS_APPSTARTUPNOTIFIER_CONTRACTID "@mozilla.org/embedcomp/appstartup-notifier;1" #define NS_WEBBROWSER_CONTRACTID "@mozilla.org/embedding/browser/nsWebBrowser;1" -#define NS_MEMORY_CONTRACTID "@mozilla.org/xpcom/memory-service;1" #define NS_COMMANDPARAMS_CONTRACTID "@mozilla.org/embedcomp/command-params;1" #define NS_HTMLSERIALIZER_CONTRACTID "@mozilla.org/layout/contentserializer;1?mimetype=text/html" #define NS_EDITORCONTROLLER_CONTRACTID "@mozilla.org/editor/editorcontroller;1" @@ -69,13 +68,14 @@ static nsresult (CDECL *NS_CStringSetData)(nsACString*,const char*,PRUint32); static nsresult (CDECL *NS_NewLocalFile)(const nsAString*,cpp_bool,nsIFile**); static PRUint32 (CDECL *NS_StringGetData)(const nsAString*,const PRUnichar **,cpp_bool*); static PRUint32 (CDECL *NS_CStringGetData)(const nsACString*,const char**,cpp_bool*); +static void* (CDECL *NS_Alloc)(SIZE_T); +static void (CDECL *NS_Free)(void*); static HINSTANCE xul_handle = NULL; static nsIServiceManager *pServMgr = NULL; static nsIComponentManager *pCompMgr = NULL; static nsICategoryManager *cat_mgr; -static nsIMemory *nsmem = NULL; static nsIFile *profile_directory, *plugin_directory; static const WCHAR wszNsContainer[] = {'N','s','C','o','n','t','a','i','n','e','r',0}; @@ -516,6 +516,8 @@ static BOOL load_xul(const PRUnichar *gre_path) NS_DLSYM(NS_NewLocalFile); NS_DLSYM(NS_StringGetData); NS_DLSYM(NS_CStringGetData); + NS_DLSYM(NS_Alloc); + NS_DLSYM(NS_Free); #undef NS_DLSYM @@ -733,11 +735,6 @@ static BOOL init_xpcom(const PRUnichar *gre_path) init_mutation(pCompMgr); set_preferences(); - nsres = nsIComponentManager_CreateInstanceByContractID(pCompMgr, NS_MEMORY_CONTRACTID, - NULL, &IID_nsIMemory, (void**)&nsmem); - if(NS_FAILED(nsres)) - ERR("Could not get nsIMemory: %08x\n", nsres); - nsres = nsIServiceManager_GetServiceByContractID(pServMgr, NS_CATEGORYMANAGER_CONTRACTID, &IID_nsICategoryManager, (void**)&cat_mgr); if(NS_FAILED(nsres)) @@ -796,12 +793,12 @@ BOOL load_gecko(void) void *nsalloc(size_t size) { - return nsIMemory_Alloc(nsmem, size); + return NS_Alloc(size); } void nsfree(void *mem) { - nsIMemory_Free(nsmem, mem); + NS_Free(mem); } static BOOL nsACString_Init(nsACString *str, const char *data) @@ -1118,9 +1115,6 @@ void close_gecko(void) if(cat_mgr) nsICategoryManager_Release(cat_mgr); - if(nsmem) - nsIMemory_Release(nsmem); - /* Gecko doesn't really support being unloaded */ /* if (hXPCOM) FreeLibrary(hXPCOM); */ diff --git a/dlls/mshtml/nsiface.idl b/dlls/mshtml/nsiface.idl index 7989e9a..7cc898c 100644 --- a/dlls/mshtml/nsiface.idl +++ b/dlls/mshtml/nsiface.idl @@ -227,21 +227,6 @@ interface nsIFactory : nsISupports [ object, - uuid(6aef11c4-8615-44a6-9711-98f43805693d), - local -] -interface nsIMemory : nsISupports -{ - void *Alloc(/*size_t*/ int size); - void *Realloc(void *_ptr, /*size_t*/ int newSize); - void Free(void *_ptr); - nsresult HeapMinimize(bool immediate); - nsresult IsLowMemory(bool *_retval); - nsresult IsLowMemoryPlatform(bool *_retval); -} - -[ - object, uuid(9188bc85-f92e-11d2-81ef-0060083a0bcf), local ]

1 0

Henri Verbeet : wined3d: Use wined3d_texture_bind_and_dirtify() in device_update_volume().
by Alexandre Julliard April 16, 2015

April 16, 2015

Module: wine Branch: master Commit: 5c9da580a86d735b021af19c1e5cf64acec1fb38 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c9da580a86d735b021af19c1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 16 11:26:34 2015 +0200 wined3d: Use wined3d_texture_bind_and_dirtify() in device_update_volume(). I missed this in 7c4d512fee752876b4ce95f1f97308f6a291b010. Generally speaking, the only places where plain wined3d_texture_bind() calls are appropriate are places where you're binding the texture to a specific stage for a subsequent draw. I.e., places where context_active_texture() is called first. --- dlls/wined3d/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 20a0e23..5f44a1a 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3511,7 +3511,7 @@ static HRESULT device_update_volume(struct wined3d_device *device, /* Only a prepare, since we're uploading the entire volume. */ wined3d_texture_prepare_texture(dst_volume->container, context, FALSE); - wined3d_texture_bind(dst_volume->container, context, FALSE); + wined3d_texture_bind_and_dirtify(dst_volume->container, context, FALSE); data.buffer_object = 0; data.addr = src.data;

1 0

Henri Verbeet : wined3d: Use wined3d_texture_bind_and_dirtify() in wined3d_texture_upload_data().
by Alexandre Julliard April 16, 2015

April 16, 2015

Module: wine Branch: master Commit: dcaaf915f890530ea9a991fe90c0a44afd646b40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dcaaf915f890530ea9a991fe9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 16 11:26:35 2015 +0200 wined3d: Use wined3d_texture_bind_and_dirtify() in wined3d_texture_upload_data(). --- dlls/wined3d/texture.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 34c69d1..78d1266 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -749,7 +749,7 @@ static void wined3d_texture_upload_data(struct wined3d_texture *texture, const s context = context_acquire(texture->resource.device, NULL); wined3d_texture_prepare_texture(texture, context, FALSE); - wined3d_texture_bind(texture, context, FALSE); + wined3d_texture_bind_and_dirtify(texture, context, FALSE); for (i = 0; i < sub_count; ++i) {

1 0

Henri Verbeet : wined3d: Get rid of context_invalidate_active_texture().
by Alexandre Julliard April 16, 2015

April 16, 2015

Module: wine Branch: master Commit: 8b6cddbe25e9378f954a2e2f50465136c417eb57 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b6cddbe25e9378f954a2e2f5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 16 11:26:36 2015 +0200 wined3d: Get rid of context_invalidate_active_texture(). Calling wined3d_texture_bind() + context_invalidate_active_texture() is equivalent to just calling wined3d_texture_bind_and_dirtify(). --- dlls/wined3d/surface.c | 4 +--- dlls/wined3d/wined3d_private.h | 7 ------- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 2838004..77a0eae 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1638,7 +1638,7 @@ HRESULT surface_upload_from_surface(struct wined3d_surface *dst_surface, const P wined3d_texture_prepare_texture(dst_surface->container, context, FALSE); else surface_load_location(dst_surface, WINED3D_LOCATION_TEXTURE_RGB); - wined3d_texture_bind(dst_surface->container, context, FALSE); + wined3d_texture_bind_and_dirtify(dst_surface->container, context, FALSE); surface_get_memory(src_surface, &data, src_surface->locations); src_pitch = wined3d_surface_get_pitch(src_surface); @@ -1646,8 +1646,6 @@ HRESULT surface_upload_from_surface(struct wined3d_surface *dst_surface, const P wined3d_surface_upload_data(dst_surface, gl_info, src_format, src_rect, src_pitch, dst_point, FALSE, wined3d_const_bo_address(&data)); - context_invalidate_active_texture(context); - context_release(context); surface_validate_location(dst_surface, WINED3D_LOCATION_TEXTURE_RGB); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index acac299..9b9973c 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2090,13 +2090,6 @@ static inline BOOL isStateDirty(const struct wined3d_context *context, DWORD sta return context->isStateDirty[idx] & (1 << shift); } -static inline void context_invalidate_active_texture(struct wined3d_context *context) -{ - DWORD sampler = context->rev_tex_unit_map[context->active_texture]; - if (sampler != WINED3D_UNMAPPED_STAGE) - context_invalidate_state(context, STATE_SAMPLER(sampler)); -} - #define WINED3D_RESOURCE_ACCESS_GPU 0x1 #define WINED3D_RESOURCE_ACCESS_CPU 0x2

1 0

Jacek Caban : msxml3: Create unknode object only for node types supported by msxml.
by Alexandre Julliard April 16, 2015

April 16, 2015

Module: wine Branch: master Commit: 20b2e1bdb58b2b0d88b94fb9af7c3254cdd9ba2c URL: http://source.winehq.org/git/wine.git/?a=commit;h=20b2e1bdb58b2b0d88b94fb9a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 16 12:32:17 2015 +0200 msxml3: Create unknode object only for node types supported by msxml. --- dlls/msxml3/node.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index 0f591b4..7119a43 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -2038,9 +2038,11 @@ IXMLDOMNode *create_node( xmlNodePtr node ) pUnk = create_doc_fragment( node ); break; case XML_DTD_NODE: + case XML_DOCUMENT_TYPE_NODE: pUnk = create_doc_type( node ); break; - default: { + case XML_ENTITY_NODE: + case XML_NOTATION_NODE: { unknode *new_node; FIXME("only creating basic node for type %d\n", node->type); @@ -2054,6 +2056,9 @@ IXMLDOMNode *create_node( xmlNodePtr node ) init_xmlnode(&new_node->node, node, &new_node->IXMLDOMNode_iface, NULL); pUnk = (IUnknown*)&new_node->IXMLDOMNode_iface; } + default: + ERR("Called for unsupported node type %d\n", node->type); + return NULL; } hr = IUnknown_QueryInterface(pUnk, &IID_IXMLDOMNode, (LPVOID*)&ret);

1 0

Bruno Jesus : include: Add a missing field to IP_ADAPTER_ADDRESSES_LH.
by Alexandre Julliard April 16, 2015

April 16, 2015

Module: wine Branch: master Commit: f17826bd34a2390cce1e9362aa945bc9907a1007 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f17826bd34a2390cce1e9362a… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Thu Apr 16 01:23:04 2015 -0300 include: Add a missing field to IP_ADAPTER_ADDRESSES_LH. --- include/iptypes.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/include/iptypes.h b/include/iptypes.h index fc9f860..cda879d 100644 --- a/include/iptypes.h +++ b/include/iptypes.h @@ -188,6 +188,11 @@ typedef struct _IP_ADAPTER_GATEWAY_ADDRESS_LH { typedef IP_ADAPTER_GATEWAY_ADDRESS_LH IP_ADAPTER_GATEWAY_ADDRESS; typedef IP_ADAPTER_GATEWAY_ADDRESS_LH *PIP_ADAPTER_GATEWAY_ADDRESS; +typedef struct _IP_ADAPTER_DNS_SUFFIX { + struct _IP_ADAPTER_DNS_SUFFIX *Next; + WCHAR String[MAX_DNS_SUFFIX_STRING_LENGTH]; +} IP_ADAPTER_DNS_SUFFIX, *PIP_ADAPTER_DNS_SUFFIX; + #define IP_ADAPTER_DDNS_ENABLED 0x1 #define IP_ADAPTER_REGISTER_ADAPTER_SUFFIX 0x2 #define IP_ADAPTER_DHCP_ENABLED 0x4 @@ -241,6 +246,7 @@ typedef struct _IP_ADAPTER_ADDRESSES_LH { BYTE Dhcpv6ClientDuid[MAX_DHCPV6_DUID_LENGTH]; ULONG Dhcpv6ClientDuidLength; ULONG Dhcpv6Iaid; + PIP_ADAPTER_DNS_SUFFIX FirstDnsSuffix; } IP_ADAPTER_ADDRESSES_LH, *PIP_ADAPTER_ADDRESSES_LH; typedef struct _IP_ADAPTER_ADDRESSES_XP {

1 0

Nikolay Sivov : usp10/tests: Fix some leaks on error path (Valgrind).
by Alexandre Julliard April 16, 2015

April 16, 2015

Module: wine Branch: master Commit: c7b5a2f8510bba50922d33a0aa4d2a6466a2bf12 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7b5a2f8510bba50922d33a0a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 15 07:48:34 2015 +0300 usp10/tests: Fix some leaks on error path (Valgrind). --- dlls/usp10/tests/usp10.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index 7c26c51..39240f5 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -756,7 +756,7 @@ static inline void _test_shape_ok(int valid, HDC hdc, LPCWSTR string, else if (hr != S_OK) winetest_trace("ScriptShapeOpenType failed (%x)\n",hr); if (FAILED(hr)) - return; + goto cleanup; for (x = 0; x < cchString; x++) { @@ -808,6 +808,7 @@ static inline void _test_shape_ok(int valid, HDC hdc, LPCWSTR string, winetest_trace("%i: fZeroWidth incorrect (%i)\n",x,glyphProp[x].sva.fZeroWidth); } +cleanup: HeapFree(GetProcessHeap(),0,logclust); HeapFree(GetProcessHeap(),0,charProp); HeapFree(GetProcessHeap(),0,glyphs);

1 0

Bruno Jesus : iphlpapi: Update the buffer size only if required in GetAdaptersAddresses.
by Alexandre Julliard April 16, 2015

April 16, 2015

Module: wine Branch: master Commit: 708ab4ca12079a8d35e8e537119e6b33240f3292 URL: http://source.winehq.org/git/wine.git/?a=commit;h=708ab4ca12079a8d35e8e5371… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Thu Apr 16 01:23:50 2015 -0300 iphlpapi: Update the buffer size only if required in GetAdaptersAddresses. --- dlls/iphlpapi/iphlpapi_main.c | 4 +++- dlls/iphlpapi/tests/iphlpapi.c | 1 - 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index d2f36fe..513cbce 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -1382,8 +1382,10 @@ ULONG WINAPI DECLSPEC_HOTPATCH GetAdaptersAddresses(ULONG family, ULONG flags, P ret = ERROR_SUCCESS; } else + { ret = ERROR_BUFFER_OVERFLOW; - *buflen = total_size; + *buflen = total_size; + } TRACE("num adapters %u\n", table->numIndexes); HeapFree(GetProcessHeap(), 0, table); diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index 5160063..377aadf 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -1338,7 +1338,6 @@ static void test_GetAdaptersAddresses(void) ptr = HeapAlloc(GetProcessHeap(), 0, osize); ret = pGetAdaptersAddresses(AF_UNSPEC, 0, NULL, ptr, &osize); ok(!ret, "expected ERROR_SUCCESS got %u\n", ret); -todo_wine ok(osize == size, "expected %d, got %d\n", size, osize); for (aa = ptr; !ret && aa; aa = aa->Next)

1 0