November 2019 - Wine-Commits

Fabian Maurer : gdi32: CreatePolyPolygonRgn() returns an empty region when the area is empty.
by Alexandre Julliard Nov. 25, 2019

Nov. 25, 2019

Module: wine Branch: stable Commit: f91928eb69506e56cf81807e05ac597da638ac29 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f91928eb69506e56cf81807e… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Wed May 22 08:45:10 2019 +0100 gdi32: CreatePolyPolygonRgn() returns an empty region when the area is empty. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46655 Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 9bc6f004ceccf3963584a4f7f4681b5c0578c214) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/gdi32/region.c | 3 +-- dlls/gdi32/tests/clipping.c | 39 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/region.c b/dlls/gdi32/region.c index cad6428dc9..93238b5a84 100644 --- a/dlls/gdi32/region.c +++ b/dlls/gdi32/region.c @@ -2627,8 +2627,7 @@ HRGN create_polypolygon_region( const POINT *Pts, const INT *Count, INT nbpolygo if (! (pETEs = HeapAlloc( GetProcessHeap(), 0, sizeof(EdgeTableEntry) * total ))) return 0; - if (!(nb_points = REGION_CreateEdgeTable( Count, nbpolygons, Pts, &ET, pETEs, &SLLBlock, clip_rect ))) - goto done; + nb_points = REGION_CreateEdgeTable( Count, nbpolygons, Pts, &ET, pETEs, &SLLBlock, clip_rect ); if (!(obj = alloc_region( nb_points / 2 ))) goto done; diff --git a/dlls/gdi32/tests/clipping.c b/dlls/gdi32/tests/clipping.c index 60bd31e8e4..d04ef77ca3 100644 --- a/dlls/gdi32/tests/clipping.c +++ b/dlls/gdi32/tests/clipping.c @@ -533,6 +533,44 @@ static void test_window_dc_clipping(void) DestroyWindow(hwnd); } +static void test_CreatePolyPolygonRgn(void) +{ + HRGN region; + POINT points_zero[] = { {0, 0}, {0, 0}, {0, 0} }; + POINT points_mixed[] = { {0, 0}, {0, 0}, {0, 0}, {6, 6}, {6, 6}, {6, 6} }; + POINT points_six[] = { {6, 6}, {6, 6}, {6, 6} }; + POINT points_line[] = { {1, 0}, {11, 0}, {21, 0}}; + INT counts_single_poly[] = { 3 }; + INT counts_two_poly[] = { 3, 3 }; + int ret; + RECT rect; + + /* When all polygons are just one point or line, return must not be NULL */ + + region = CreatePolyPolygonRgn(points_zero, counts_single_poly, ARRAY_SIZE(counts_single_poly), ALTERNATE); + ok (region != NULL, "region must not be NULL\n"); + ret = GetRgnBox(region, &rect); + ok (ret == NULLREGION, "Expected NULLREGION, got %d\n", ret); + DeleteObject(region); + + region = CreatePolyPolygonRgn(points_six, counts_single_poly, ARRAY_SIZE(counts_single_poly), ALTERNATE); + ok (region != NULL, "region must not be NULL\n"); + ret = GetRgnBox(region, &rect); + ok (ret == NULLREGION, "Expected NULLREGION, got %d\n", ret); + DeleteObject(region); + + region = CreatePolyPolygonRgn(points_line, counts_single_poly, ARRAY_SIZE(counts_single_poly), ALTERNATE); + ok (region != NULL, "region must not be NULL\n"); + ret = GetRgnBox(region, &rect); + ok (ret == NULLREGION, "Expected NULLREGION, got %d\n", ret); + DeleteObject(region); + + region = CreatePolyPolygonRgn(points_mixed, counts_two_poly, ARRAY_SIZE(counts_two_poly), ALTERNATE); + ok (region != NULL, "region must not be NULL\n"); + ret = GetRgnBox(region, &rect); + ok (ret == NULLREGION, "Expected NULLREGION, got %d\n", ret); + DeleteObject(region); +} START_TEST(clipping) { @@ -541,4 +579,5 @@ START_TEST(clipping) test_GetClipRgn(); test_memory_dc_clipping(); test_window_dc_clipping(); + test_CreatePolyPolygonRgn(); }

1 0

Fabian Maurer : setupapi: Correct function parameter for CM_Set_Class_Registry_PropertyA/W.
by Alexandre Julliard Nov. 25, 2019

Nov. 25, 2019

Module: wine Branch: stable Commit: 29407887bed9226ccee4f3116362dc6577589a4d URL: https://source.winehq.org/git/wine.git/?a=commit;h=29407887bed9226ccee4f311… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Thu May 23 05:59:56 2019 +0200 setupapi: Correct function parameter for CM_Set_Class_Registry_PropertyA/W. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47249 Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit c77ba713d273bc8395f7340e05546aab8cffdb99) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/setupapi/stubs.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/setupapi/stubs.c b/dlls/setupapi/stubs.c index 61ce005212..ff57ad6f8f 100644 --- a/dlls/setupapi/stubs.c +++ b/dlls/setupapi/stubs.c @@ -525,7 +525,7 @@ CONFIGRET WINAPI CM_Reenumerate_DevNode_Ex(DEVINST dnDevInst, ULONG ulFlags, HMA /*********************************************************************** * CM_Set_Class_Registry_PropertyA (SETUPAPI.@) */ -CONFIGRET WINAPI CM_Set_Class_Registry_PropertyA(LPGUID class, ULONG prop, PVOID buf, ULONG len, +CONFIGRET WINAPI CM_Set_Class_Registry_PropertyA(LPGUID class, ULONG prop, LPCVOID buf, ULONG len, ULONG flags, HMACHINE machine) { FIXME("%p %u %p %u 0x%08x %p: stub\n", class, prop, buf, len, flags, machine); @@ -535,7 +535,7 @@ CONFIGRET WINAPI CM_Set_Class_Registry_PropertyA(LPGUID class, ULONG prop, PVOID /*********************************************************************** * CM_Set_Class_Registry_PropertyW (SETUPAPI.@) */ -CONFIGRET WINAPI CM_Set_Class_Registry_PropertyW(LPGUID class, ULONG prop, PVOID buf, ULONG len, +CONFIGRET WINAPI CM_Set_Class_Registry_PropertyW(LPGUID class, ULONG prop, LPCVOID buf, ULONG len, ULONG flags, HMACHINE machine) { FIXME("%p %u %p %u 0x%08x %p: stub\n", class, prop, buf, len, flags, machine);

1 0

Zebediah Figura : msxml3: Load the version 1 typelib before trying to access it.
by Alexandre Julliard Nov. 25, 2019

Nov. 25, 2019

Module: wine Branch: stable Commit: 7ddb1120ec85838b638de775e9a23750c27f00ac URL: https://source.winehq.org/git/wine.git/?a=commit;h=7ddb1120ec85838b638de775… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri May 17 00:37:27 2019 -0500 msxml3: Load the version 1 typelib before trying to access it. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47214 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 7edbbe1ed3fe5f3e3ac94d25f7b07fbd076dcebd) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msxml3/dispex.c | 30 +++++++++++++++++++++--------- 1 file changed, 21 insertions(+), 9 deletions(-) diff --git a/dlls/msxml3/dispex.c b/dlls/msxml3/dispex.c index bd29a212c8..b1fb72847e 100644 --- a/dlls/msxml3/dispex.c +++ b/dlls/msxml3/dispex.c @@ -150,31 +150,43 @@ static inline unsigned get_libid_from_tid(tid_t tid) return tid_ids[tid].lib; } -HRESULT get_typeinfo(enum tid_t tid, ITypeInfo **typeinfo) +static HRESULT get_typelib(unsigned lib, ITypeLib **tl) { - unsigned lib = get_libid_from_tid(tid); HRESULT hres; if(!typelib[lib]) { - ITypeLib *tl; - - hres = LoadRegTypeLib(lib_ids[lib].iid, lib_ids[lib].major, 0, LOCALE_SYSTEM_DEFAULT, &tl); + hres = LoadRegTypeLib(lib_ids[lib].iid, lib_ids[lib].major, 0, LOCALE_SYSTEM_DEFAULT, tl); if(FAILED(hres)) { ERR("LoadRegTypeLib failed: %08x\n", hres); return hres; } - if(InterlockedCompareExchangePointer((void**)&typelib[lib], tl, NULL)) - ITypeLib_Release(tl); + if (InterlockedCompareExchangePointer((void**)&typelib[lib], *tl, NULL)) + ITypeLib_Release(*tl); } + *tl = typelib[lib]; + return S_OK; +} + +HRESULT get_typeinfo(enum tid_t tid, ITypeInfo **typeinfo) +{ + unsigned lib = get_libid_from_tid(tid); + ITypeLib *typelib; + HRESULT hres; + + if (FAILED(hres = get_typelib(lib, &typelib))) + return hres; + if(!typeinfos[tid]) { ITypeInfo *ti; - hres = ITypeLib_GetTypeInfoOfGuid(typelib[lib], get_riid_from_tid(tid), &ti); + hres = ITypeLib_GetTypeInfoOfGuid(typelib, get_riid_from_tid(tid), &ti); if(FAILED(hres)) { /* try harder with typelib from msxml.dll */ - hres = ITypeLib_GetTypeInfoOfGuid(typelib[LibXml], get_riid_from_tid(tid), &ti); + if (FAILED(hres = get_typelib(LibXml, &typelib))) + return hres; + hres = ITypeLib_GetTypeInfoOfGuid(typelib, get_riid_from_tid(tid), &ti); if(FAILED(hres)) { ERR("GetTypeInfoOfGuid failed: %08x\n", hres); return hres;

1 0

Vincent Povirk : windowscodecs: Treat 16-bit channels as little endian.
by Alexandre Julliard Nov. 25, 2019

Nov. 25, 2019

Module: wine Branch: stable Commit: 0efc5086a23003bb32d29cfefb5a33a9c24f34c3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0efc5086a23003bb32d29cfe… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu May 9 15:30:43 2019 -0500 windowscodecs: Treat 16-bit channels as little endian. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 2b7b3abc5b334ec8b17dc98a25eefd26e1d0054d) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/windowscodecs/converter.c | 17 +++++++++-------- dlls/windowscodecs/tests/converter.c | 15 +++++++++++++++ 2 files changed, 24 insertions(+), 8 deletions(-) diff --git a/dlls/windowscodecs/converter.c b/dlls/windowscodecs/converter.c index 5f72a6110f..6b90b6a977 100644 --- a/dlls/windowscodecs/converter.c +++ b/dlls/windowscodecs/converter.c @@ -457,8 +457,9 @@ static HRESULT copypixels_to_32bppBGRA(struct FormatConverter *This, const WICRe dstpixel=(DWORD*)dstrow; for (x=0; x<prc->Width; x++) { + srcbyte++; *dstpixel++ = 0xff000000|(*srcbyte<<16)|(*srcbyte<<8)|*srcbyte; - srcbyte+=2; + srcbyte++; } srcrow += srcstride; dstrow += cbStride; @@ -775,9 +776,9 @@ static HRESULT copypixels_to_32bppBGRA(struct FormatConverter *This, const WICRe dstpixel=(DWORD*)dstrow; for (x=0; x<prc->Width; x++) { BYTE red, green, blue; - red = *srcpixel++; srcpixel++; - green = *srcpixel++; srcpixel++; - blue = *srcpixel++; srcpixel++; + srcpixel++; red = *srcpixel++; + srcpixel++; green = *srcpixel++; + srcpixel++; blue = *srcpixel++; *dstpixel++=0xff000000|red<<16|green<<8|blue; } srcrow += srcstride; @@ -819,10 +820,10 @@ static HRESULT copypixels_to_32bppBGRA(struct FormatConverter *This, const WICRe dstpixel=(DWORD*)dstrow; for (x=0; x<prc->Width; x++) { BYTE red, green, blue, alpha; - red = *srcpixel++; srcpixel++; - green = *srcpixel++; srcpixel++; - blue = *srcpixel++; srcpixel++; - alpha = *srcpixel++; srcpixel++; + srcpixel++; red = *srcpixel++; + srcpixel++; green = *srcpixel++; + srcpixel++; blue = *srcpixel++; + srcpixel++; alpha = *srcpixel++; *dstpixel++=alpha<<24|red<<16|green<<8|blue; } srcrow += srcstride; diff --git a/dlls/windowscodecs/tests/converter.c b/dlls/windowscodecs/tests/converter.c index a82e58518d..a42a731464 100644 --- a/dlls/windowscodecs/tests/converter.c +++ b/dlls/windowscodecs/tests/converter.c @@ -491,6 +491,18 @@ static const struct bitmap_data testdata_32bppPBGRA = { static const struct bitmap_data testdata_32bppPRGBA = { &GUID_WICPixelFormat32bppPRGBA, 32, bits_32bppPBGRA, 32, 2, 96.0, 96.0}; +static const BYTE bits_64bppRGBA[] = { + 128,255,128,0,128,0,128,255,128, 0,128,255,128,0,128,255,128, 0,128,0,128,255,128,255,128, 0,128,0,128,0,128,255,128, 255,128,0,128,0,128,255,128, 0,128,255,128,0,128,255,128, 0,128,0,128,255,128,255,128, 0,128,0,128,0,128,255, + 128,255,128,0,128,0,128,255,128, 0,128,255,128,0,128,255,128, 0,128,0,128,255,128,255,128, 0,128,0,128,0,128,255,128, 255,128,0,128,0,128,255,128, 0,128,255,128,0,128,255,128, 0,128,0,128,255,128,255,128, 0,128,0,128,0,128,255, + 128,255,128,0,128,0,128,255,128, 0,128,255,128,0,128,255,128, 0,128,0,128,255,128,255,128, 0,128,0,128,0,128,255,128, 255,128,0,128,0,128,255,128, 0,128,255,128,0,128,255,128, 0,128,0,128,255,128,255,128, 0,128,0,128,0,128,255, + 128,255,128,0,128,0,128,255,128, 0,128,255,128,0,128,255,128, 0,128,0,128,255,128,255,128, 0,128,0,128,0,128,255,128, 255,128,0,128,0,128,255,128, 0,128,255,128,0,128,255,128, 0,128,0,128,255,128,255,128, 0,128,0,128,0,128,255, + 128,0,128,255,128,255,128,255,128, 255,128,0,128,255,128,255,128, 255,128,255,128,0,128,255,128, 255,128,255,128,255,128,255,128, 0,128,255,128,255,128,255,128, 255,128,0,128,255,128,255,128, 255,128,255,128,0,128,255,128, 255,128,255,128,255,128,255, + 128,0,128,255,128,255,128,255,128, 255,128,0,128,255,128,255,128, 255,128,255,128,0,128,255,128, 255,128,255,128,255,128,255,128, 0,128,255,128,255,128,255,128, 255,128,0,128,255,128,255,128, 255,128,255,128,0,128,255,128, 255,128,255,128,255,128,255, + 128,0,128,255,128,255,128,255,128, 255,128,0,128,255,128,255,128, 255,128,255,128,0,128,255,128, 255,128,255,128,255,128,255,128, 0,128,255,128,255,128,255,128, 255,128,0,128,255,128,255,128, 255,128,255,128,0,128,255,128, 255,128,255,128,255,128,255, + 128,0,128,255,128,255,128,255,128, 255,128,0,128,255,128,255,128, 255,128,255,128,0,128,255,128, 255,128,255,128,255,128,255,128, 0,128,255,128,255,128,255,128, 255,128,0,128,255,128,255,128, 255,128,255,128,0,128,255,128, 255,128,255,128,255,128,255}; +static const struct bitmap_data testdata_64bppRGBA = { + &GUID_WICPixelFormat64bppRGBA, 64, bits_64bppRGBA, 32, 2, 96.0, 96.0}; + /* XP and 2003 use linear color conversion, later versions use sRGB gamma */ static const float bits_32bppGrayFloat_xp[] = { 0.114000f,0.587000f,0.299000f,0.000000f,0.114000f,0.587000f,0.299000f,0.000000f, @@ -1647,6 +1659,9 @@ START_TEST(converter) test_conversion(&testdata_24bppRGB, &testdata_32bppBGR, "24bppRGB -> 32bppBGR", FALSE); test_conversion(&testdata_32bppBGRA, &testdata_24bppRGB, "32bppBGRA -> 24bppRGB", FALSE); + test_conversion(&testdata_64bppRGBA, &testdata_32bppRGBA, "64bppRGBA -> 32bppRGBA", FALSE); + test_conversion(&testdata_64bppRGBA, &testdata_32bppRGB, "64bppRGBA -> 32bppRGB", FALSE); + test_conversion(&testdata_24bppRGB, &testdata_32bppGrayFloat, "24bppRGB -> 32bppGrayFloat", FALSE); test_conversion(&testdata_32bppBGR, &testdata_32bppGrayFloat, "32bppBGR -> 32bppGrayFloat", FALSE);

1 0

Vincent Povirk : mscoree: Accept old framework build in exe metadata.
by Alexandre Julliard Nov. 25, 2019

Nov. 25, 2019

Module: wine Branch: stable Commit: 980ce340962c6220c6e3662588e285feeddbd0b5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=980ce340962c6220c6e36625… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sat May 4 13:25:58 2019 -0500 mscoree: Accept old framework build in exe metadata. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=27185 Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 6ee29c048cbbd6291e672a0c9b4ecdf0f770673c) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/mscoree/metahost.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/dlls/mscoree/metahost.c b/dlls/mscoree/metahost.c index 422ca3112b..8719baf7ab 100644 --- a/dlls/mscoree/metahost.c +++ b/dlls/mscoree/metahost.c @@ -1336,11 +1336,35 @@ HRESULT get_runtime_info(LPCWSTR exefile, LPCWSTR version, LPCWSTR config_file, if (exefile && !version) { + DWORD major, minor, build; + hr = CLRMetaHost_GetVersionFromFile(0, exefile, local_version, &local_version_size); version = local_version; if (FAILED(hr)) return hr; + + /* When running an executable, specifically when getting the version number from + * the exe, native accepts a matching major.minor with build <= expected build. */ + if (!parse_runtime_version(version, &major, &minor, &build)) + { + ERR("Cannot parse %s\n", debugstr_w(version)); + return CLR_E_SHIM_RUNTIME; + } + + if (legacy) + i = 3; + else + i = NUM_RUNTIMES; + + while (i--) + { + if (runtimes[i].major == major && runtimes[i].minor == minor && runtimes[i].build >= build) + { + return ICLRRuntimeInfo_QueryInterface(&runtimes[i].ICLRRuntimeInfo_iface, + &IID_ICLRRuntimeInfo, (void **)result); + } + } } if (version)

1 0

Louis Lenders : dwmapi: Return DWM_E_COMPOSITIONDISABLED instead of E_NOTIMPL in DwmGetTransportAttributes.
by Alexandre Julliard Nov. 25, 2019

Nov. 25, 2019

Module: wine Branch: stable Commit: 00902009d0dae993c8f8448969cb4bce17035590 URL: https://source.winehq.org/git/wine.git/?a=commit;h=00902009d0dae993c8f84489… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Wed May 1 15:04:51 2019 +0200 dwmapi: Return DWM_E_COMPOSITIONDISABLED instead of E_NOTIMPL in DwmGetTransportAttributes. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=31350 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit abee97e469686d1e55a7ccfe39c86d05c8c0de81) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dwmapi/dwmapi_main.c | 2 +- include/winerror.h | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/dwmapi/dwmapi_main.c b/dlls/dwmapi/dwmapi_main.c index c1ee067122..eb06d15507 100644 --- a/dlls/dwmapi/dwmapi_main.c +++ b/dlls/dwmapi/dwmapi_main.c @@ -146,7 +146,7 @@ HRESULT WINAPI DwmGetTransportAttributes(BOOL *pfIsRemoting, BOOL *pfIsConnected { FIXME("(%p, %p, %p) stub\n", pfIsRemoting, pfIsConnected, pDwGeneration); - return E_NOTIMPL; + return DWM_E_COMPOSITIONDISABLED; } /********************************************************************** diff --git a/include/winerror.h b/include/winerror.h index d78c91e84e..240cf78b6e 100644 --- a/include/winerror.h +++ b/include/winerror.h @@ -3090,6 +3090,13 @@ static inline HRESULT HRESULT_FROM_WIN32(unsigned int x) #define WININET_E_LOGIN_FAILURE_DISPLAY_ENTITY_BODY _HRESULT_TYPEDEF_(0x80072f8e) #define WININET_E_DECODING_FAILED _HRESULT_TYPEDEF_(0x80072f8f) +#define DWM_E_COMPOSITIONDISABLED _HRESULT_TYPEDEF_(0x80263001) +#define DWM_E_REMOTING_NOT_SUPPORTED _HRESULT_TYPEDEF_(0x80263002) +#define DWM_E_NO_REDIRECTION_SURFACE_AVAILABLE _HRESULT_TYPEDEF_(0x80263003) +#define DWM_E_NOT_QUEUING_PRESENTS _HRESULT_TYPEDEF_(0x80263004) +#define DWM_E_ADAPTER_NOT_FOUND _HRESULT_TYPEDEF_(0x80263005) +#define DWM_S_GDI_REDIRECTION_SURFACE _HRESULT_TYPEDEF_(0x00263005) + #define D3D11_ERROR_TOO_MANY_UNIQUE_STATE_OBJECTS _HRESULT_TYPEDEF_(0x887c0001) #define D3D11_ERROR_FILE_NOT_FOUND _HRESULT_TYPEDEF_(0x887c0002) #define D3D11_ERROR_TOO_MANY_UNIQUE_VIEW_OBJECTS _HRESULT_TYPEDEF_(0x887c0003)

1 0

Zhiyi Zhang : wined3d: Truncate stencil reference values to the stencil component size.
by Alexandre Julliard Nov. 25, 2019

Nov. 25, 2019

Module: wine Branch: stable Commit: 3bdadd4ab487367245dd61f402107086d3cf6030 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3bdadd4ab487367245dd61f4… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Aug 28 21:32:28 2019 +0430 wined3d: Truncate stencil reference values to the stencil component size. As opposed to OpenGL, which clamps them. This fixes a regression introduced by commit a9e199e5ad76c0540381f25011d6051ace3e7c0a. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 124f48d3114fe86f5feda2ce200d87b97c4009de) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3d9/tests/visual.c | 2 +- dlls/wined3d/cs.c | 7 +++++-- dlls/wined3d/state.c | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 1ba1b1c441..bbdc945dfe 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -11143,7 +11143,7 @@ static void stencil_cull_test(void) ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); color = getPixelColor(device, 280, 360); - todo_wine ok(color == 0x000000f0, "Got unexpected colour 0x%08x.\n", color); + ok(color == 0x000000f0, "Got unexpected colour 0x%08x.\n", color); hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 7471d24e7e..9e517f11ca 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -1155,9 +1155,12 @@ static void wined3d_cs_exec_set_depth_stencil_view(struct wined3d_cs *cs, const device_invalidate_state(device, STATE_RENDER(WINED3D_RS_STENCILWRITEMASK)); device_invalidate_state(device, STATE_RENDER(WINED3D_RS_DEPTHBIAS)); } - else if (prev && prev->format->depth_bias_scale != op->view->format->depth_bias_scale) + else if (prev) { - device_invalidate_state(device, STATE_RENDER(WINED3D_RS_DEPTHBIAS)); + if (prev->format->depth_bias_scale != op->view->format->depth_bias_scale) + device_invalidate_state(device, STATE_RENDER(WINED3D_RS_DEPTHBIAS)); + if (prev->format->stencil_size != op->view->format->stencil_size) + device_invalidate_state(device, STATE_RENDER(WINED3D_RS_STENCILREF)); } device_invalidate_state(device, STATE_FRAMEBUFFER); diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 62b1b594fa..c70d5604a5 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -922,7 +922,7 @@ static void state_stencil(struct wined3d_context *context, const struct wined3d_ if (!(func_back = wined3d_gl_compare_func(state->render_states[WINED3D_RS_BACK_STENCILFUNC]))) func_back = GL_ALWAYS; mask = state->render_states[WINED3D_RS_STENCILMASK]; - ref = state->render_states[WINED3D_RS_STENCILREF] & mask; + ref = state->render_states[WINED3D_RS_STENCILREF] & ((1 << state->fb->depth_stencil->format->stencil_size) - 1); stencilFail = gl_stencil_op(state->render_states[WINED3D_RS_STENCILFAIL]); depthFail = gl_stencil_op(state->render_states[WINED3D_RS_STENCILZFAIL]); stencilPass = gl_stencil_op(state->render_states[WINED3D_RS_STENCILPASS]);

1 0

Martin Liska : include: Avoid compound literals for WCHAR strings.
by Alexandre Julliard Nov. 25, 2019

Nov. 25, 2019

Module: wine Branch: stable Commit: a4aedec7f5a3c66c7b5f500b66aa42936aeacf1b URL: https://source.winehq.org/git/wine.git/?a=commit;h=a4aedec7f5a3c66c7b5f500b… Author: Martin Liska <mliska(a)suse.cz> Date: Mon Jun 10 10:57:32 2019 +0200 include: Avoid compound literals for WCHAR strings. Starting from GCC 9, compound liferal's scope has changed: https://www.gnu.org/software/gcc/gcc-9/porting_to.html#complit Signed-off-by: Martin Liska <mliska(a)suse.cz> Signed-off-by: Marcus Meissner <meissner(a)suse.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 9afc341c4f043240f0dc3de6351550b03d24b131) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wldap32/winldap_private.h | 18 +++-- include/bcrypt.h | 157 ++++++++++++++++++++++++------------- include/commctrl.h | 131 +++++++------------------------ include/commdlg.h | 35 ++------- include/d3dcompiler.h | 4 +- include/ddeml.h | 13 +--- include/ddk/mountmgr.h | 5 +- include/dpaddr.h | 38 +-------- include/lmaccess.h | 16 +--- include/msacm.h | 15 +--- include/ntsecapi.h | 6 +- include/oledlg.h | 12 +-- include/prsht.h | 5 +- include/richedit.h | 8 +- include/schannel.h | 30 ++------ include/sddl.h | 14 +--- include/softpub.h | 62 ++------------- include/uxtheme.h | 7 +- include/vsstyle.h | 141 +++++++--------------------------- include/vssym32.h | 44 +++-------- include/wincrypt.h | 170 +++++++++-------------------------------- include/winnls.h | 8 +- include/winnt.h | 34 +-------- include/winspool.h | 116 +++++++--------------------- include/winsvc.h | 5 +- include/wintrust.h | 5 +- 26 files changed, 296 insertions(+), 803 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a4aedec7f5a3c66c7b5f…

1 0

Erich E. Hoover : advapi32: Fix the initialization of combined DACLs when the new DACL is empty.
by Alexandre Julliard Nov. 25, 2019

Nov. 25, 2019

Module: wine Branch: stable Commit: 97cf4f154dd5c7dc912fc55de8720ca9f64f305d URL: https://source.winehq.org/git/wine.git/?a=commit;h=97cf4f154dd5c7dc912fc55d… Author: Erich E. Hoover <erich.e.hoover(a)wine-staging.com> Date: Thu Apr 25 11:36:15 2019 +0200 advapi32: Fix the initialization of combined DACLs when the new DACL is empty. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=38423 Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 92ee3543e549b02a916c2b6d4bcc9335d35b435e) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/advapi32/security.c | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index 5c4ddde112..ecaddd96d2 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -5966,6 +5966,7 @@ BOOL WINAPI FileEncryptionStatusA(LPCSTR lpFileName, LPDWORD lpStatus) static NTSTATUS combine_dacls(ACL *parent, ACL *child, ACL **result) { + NTSTATUS status; ACL *combined; int i; @@ -5974,8 +5975,23 @@ static NTSTATUS combine_dacls(ACL *parent, ACL *child, ACL **result) if (!combined) return STATUS_NO_MEMORY; - memcpy(combined, child, child->AclSize); - combined->AclSize = child->AclSize+parent->AclSize; + status = RtlCreateAcl(combined, parent->AclSize+child->AclSize, ACL_REVISION); + if (status != STATUS_SUCCESS) + { + heap_free(combined); + return status; + } + + /* copy the new ACEs */ + for (i=0; i<child->AceCount; i++) + { + ACE_HEADER *ace; + + if (!GetAce(child, i, (void*)&ace)) + continue; + if (!AddAce(combined, ACL_REVISION, MAXDWORD, ace, ace->AceSize)) + WARN("error adding new ACE\n"); + } /* copy the inherited ACEs */ for (i=0; i<parent->AceCount; i++)

1 0

Jactry Zeng : msscript: Partially implement IScriptControl::Eval().
by Alexandre Julliard Nov. 25, 2019

Nov. 25, 2019

Module: wine Branch: stable Commit: 2845efb5244001c64e253714d36a01a962a5c9ef URL: https://source.winehq.org/git/wine.git/?a=commit;h=2845efb5244001c64e253714… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Fri May 10 15:21:30 2019 +0800 msscript: Partially implement IScriptControl::Eval(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=41657 Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 21ae9ba1ba8ddba3ba49e916ef2b7fbd5ae9713d) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msscript.ocx/msscript.c | 21 +++++- dlls/msscript.ocx/tests/msscript.c | 132 +++++++++++++++++++++++++++++++++++++ 2 files changed, 152 insertions(+), 1 deletion(-) diff --git a/dlls/msscript.ocx/msscript.c b/dlls/msscript.ocx/msscript.c index ae5edb7944..9044c4988b 100644 --- a/dlls/msscript.ocx/msscript.c +++ b/dlls/msscript.ocx/msscript.c @@ -973,8 +973,27 @@ static HRESULT WINAPI ScriptControl_AddCode(IScriptControl *iface, BSTR code) static HRESULT WINAPI ScriptControl_Eval(IScriptControl *iface, BSTR expression, VARIANT *res) { ScriptControl *This = impl_from_IScriptControl(iface); + EXCEPINFO excepinfo; + HRESULT hr; + FIXME("(%p)->(%s %p)\n", This, debugstr_w(expression), res); - return E_NOTIMPL; + + if (!res) + return E_POINTER; + V_VT(res) = VT_EMPTY; + + if (!This->host || This->state != Initialized) + return E_FAIL; + + hr = IActiveScript_SetScriptState(This->host->script, SCRIPTSTATE_STARTED); + if (FAILED(hr)) + return hr; + + hr = IActiveScriptParse_ParseScriptText(This->host->parse, expression, NULL, NULL, NULL, + 0, 1, SCRIPTTEXT_ISEXPRESSION, res, &excepinfo); + /* FIXME: more error hanlding */ + + return hr; } static HRESULT WINAPI ScriptControl_ExecuteStatement(IScriptControl *iface, BSTR statement) diff --git a/dlls/msscript.ocx/tests/msscript.c b/dlls/msscript.ocx/tests/msscript.c index 3110ea278d..ce60e155bb 100644 --- a/dlls/msscript.ocx/tests/msscript.c +++ b/dlls/msscript.ocx/tests/msscript.c @@ -1344,6 +1344,137 @@ static void test_State(void) IScriptControl_Release(sc); } +static BSTR a2bstr(const char *str) +{ + BSTR ret; + int len; + + len = MultiByteToWideChar(CP_ACP, 0, str, -1, NULL, 0); + ret = SysAllocStringLen(NULL, len - 1); + MultiByteToWideChar(CP_ACP, 0, str, -1, ret, len); + + return ret; +} + +#define CHECK_ERROR(sc,exp_num) _check_error(sc, exp_num, __LINE__) +static void _check_error(IScriptControl *sc, LONG exp_num, int line) +{ + IScriptError *script_err; + LONG error_num; + HRESULT hr; + + hr = IScriptControl_get_Error(sc, &script_err); + ok_(__FILE__,line)(hr == S_OK, "IScriptControl_get_Error failed: 0x%08x.\n", hr); + if (SUCCEEDED(hr)) + { + error_num = 0xdeadbeef; + hr = IScriptError_get_Number(script_err, &error_num); + ok_(__FILE__,line)(hr == S_OK, "IScriptError_get_Number failed: 0x%08x.", hr); + ok_(__FILE__,line)(error_num == exp_num, "got wrong error number: %d, expected %d.\n", + error_num, exp_num); + IScriptError_Release(script_err); + } +} + +static void test_IScriptControl_Eval(void) +{ + IScriptControl *sc; + HRESULT hr; + BSTR script_str, language, expected_string; + VARIANT var; + ScriptControlStates state; + + hr = CoCreateInstance(&CLSID_ScriptControl, NULL, CLSCTX_INPROC_SERVER | CLSCTX_INPROC_HANDLER, + &IID_IScriptControl, (void **)&sc); + ok(hr == S_OK, "Failed to create IScriptControl interface: 0x%08x.\n", hr); + + hr = IScriptControl_Eval(sc, NULL, NULL); + ok(hr == E_POINTER, "IScriptControl_Eval returned: 0x%08x.\n", hr); + + script_str = a2bstr("1 + 1"); + hr = IScriptControl_Eval(sc, script_str, NULL); + ok(hr == E_POINTER, "IScriptControl_Eval returned: 0x%08x.\n", hr); + SysFreeString(script_str); + + V_VT(&var) = VT_NULL; + V_I4(&var) = 0xdeadbeef; + hr = IScriptControl_Eval(sc, NULL, &var); + ok(hr == E_FAIL, "IScriptControl_Eval returned: 0x%08x.\n", hr); + ok((V_VT(&var) == VT_EMPTY) && (V_I4(&var) == 0xdeadbeef), "V_VT(var) = %d, V_I4(var) = %d.\n", + V_VT(&var), V_I4(&var)); + todo_wine CHECK_ERROR(sc, 0); + + script_str = a2bstr("1 + 1"); + V_VT(&var) = VT_NULL; + V_I4(&var) = 0xdeadbeef; + hr = IScriptControl_Eval(sc, script_str, &var); + ok(hr == E_FAIL, "IScriptControl_Eval returned: 0x%08x.\n", hr); + ok((V_VT(&var) == VT_EMPTY) && (V_I4(&var) == 0xdeadbeef), "V_VT(var) = %d, V_I4(var) = %d.\n", + V_VT(&var), V_I4(&var)); + SysFreeString(script_str); + + language = a2bstr("jscript"); + hr = IScriptControl_put_Language(sc, language); + ok(hr == S_OK, "IScriptControl_put_Language failed: 0x%08x.\n", hr); + hr = IScriptControl_get_State(sc, &state); + ok(hr == S_OK, "IScriptControl_get_State failed: 0x%08x.\n", hr); + ok(state == Initialized, "got wrong state: %d\n", state); + SysFreeString(language); + script_str = a2bstr("var1 = 1 + 1"); + V_VT(&var) = VT_NULL; + V_I4(&var) = 0xdeadbeef; + hr = IScriptControl_Eval(sc, script_str, &var); + ok(hr == S_OK, "IScriptControl_Eval failed: 0x%08x.\n", hr); + ok((V_VT(&var) == VT_I4) && (V_I4(&var) == 2), "V_VT(var) = %d, V_I4(var) = %d.\n", + V_VT(&var), V_I4(&var)); + hr = IScriptControl_get_State(sc, &state); + ok(hr == S_OK, "IScriptControl_get_State failed: 0x%08x.\n", hr); + ok(state == Initialized, "got wrong state: %d\n", state); + SysFreeString(script_str); + + script_str = a2bstr("var2 = 10 + var1"); + V_VT(&var) = VT_NULL; + V_I4(&var) = 0xdeadbeef; + hr = IScriptControl_Eval(sc, script_str, &var); + ok(hr == S_OK, "IScriptControl_Eval failed: 0x%08x.\n", hr); + ok((V_VT(&var) == VT_I4) && (V_I4(&var) == 12), "V_VT(var) = %d, V_I4(var) = %d.\n", + V_VT(&var), V_I4(&var)); + SysFreeString(script_str); + + script_str = a2bstr("invalid syntax"); + V_VT(&var) = VT_NULL; + V_I4(&var) = 0xdeadbeef; + hr = IScriptControl_Eval(sc, script_str, &var); + todo_wine ok(hr == 0x800a03ec, "IScriptControl_Eval failed: 0x%08x.\n", hr); + ok(V_VT(&var) == VT_EMPTY, "V_VT(var) = %d\n", V_VT(&var)); + ok(V_I4(&var) == 0xdeadbeef || broken(V_I4(&var) == 0) /* after Win8 */, + "V_I4(var) = %d.\n", V_I4(&var)); + SysFreeString(script_str); + todo_wine CHECK_ERROR(sc, 1004); + + script_str = a2bstr("var2 = var1 + var2"); + V_VT(&var) = VT_NULL; + V_I4(&var) = 0xdeadbeef; + hr = IScriptControl_Eval(sc, script_str, &var); + ok(hr == S_OK, "IScriptControl_Eval failed: 0x%08x.\n", hr); + ok((V_VT(&var) == VT_I4) && (V_I4(&var) == 14), "V_VT(var) = %d, V_I4(var) = %d.\n", + V_VT(&var), V_I4(&var)); + SysFreeString(script_str); + + script_str = a2bstr("\"Hello\""); + V_VT(&var) = VT_NULL; + V_I4(&var) = 0xdeadbeef; + hr = IScriptControl_Eval(sc, script_str, &var); + ok(hr == S_OK, "IScriptControl_Eval failed: 0x%08x.\n", hr); + expected_string = a2bstr("Hello"); + ok((V_VT(&var) == VT_BSTR) && (!lstrcmpW(V_BSTR(&var), expected_string)), + "V_VT(var) = %d, V_BSTR(var) = %s.\n", V_VT(&var), wine_dbgstr_w(V_BSTR(&var))); + SysFreeString(expected_string); + SysFreeString(script_str); + + IScriptControl_Release(sc); +} + START_TEST(msscript) { IUnknown *unk; @@ -1373,6 +1504,7 @@ START_TEST(msscript) test_AllowUI(); test_UseSafeSubset(); test_State(); + test_IScriptControl_Eval(); CoUninitialize(); }

1 0