November 2021 - Wine-Commits

Zebediah Figura : configure: Don't use a bundled include path if external linker flags are specified.
by Alexandre Julliard Nov. 30, 2021

Nov. 30, 2021

Module: wine Branch: master Commit: f10b176bfa813ca7d0ca36e72a6107859682546e URL: https://source.winehq.org/git/wine.git/?a=commit;h=f10b176bfa813ca7d0ca36e7… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Nov 29 16:43:07 2021 -0600 configure: Don't use a bundled include path if external linker flags are specified. The external include path might be empty e.g. if the relevant headers are to be found directly in the MinGW sysroot, but we still don't want to use the bundled library's include path in that case. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- aclocal.m4 | 6 +++-- configure | 88 +++++++++++++++++++++++++++++++------------------------------- 2 files changed, 48 insertions(+), 46 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index a261105d44d..07a0359a3f1 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -133,8 +133,10 @@ AC_DEFUN([WINE_EXTLIB_FLAGS], AS_VAR_PUSHDEF([ac_libs],[[$1]_PE_LIBS])dnl AC_ARG_VAR(ac_cflags, [C compiler flags for the PE $2, overriding the bundled version])dnl AC_ARG_VAR(ac_libs, [Linker flags for the PE $2, overriding the bundled version])dnl -AS_VAR_IF([ac_cflags],[],[ac_cflags=$4],[enable_$2=no]) -AS_VAR_IF([ac_libs],[],[ac_libs=$3],[enable_$2=no]) +AS_VAR_IF([ac_libs],[], + [ac_libs=$3 + AS_VAR_IF([ac_cflags],[],[ac_cflags=$4],[enable_$2=no])], + [enable_$2=no]) AS_ECHO(["$as_me:${as_lineno-$LINENO}: $2 cflags: $ac_cflags"]) >&AS_MESSAGE_LOG_FD AS_ECHO(["$as_me:${as_lineno-$LINENO}: $2 libs: $ac_libs"]) >&AS_MESSAGE_LOG_FD AS_VAR_POPDEF([ac_libs])dnl diff --git a/configure b/configure index 3378aef22f0..aec64ea0232 100755 --- a/configure +++ b/configure @@ -12296,165 +12296,165 @@ esac fi -if ${FAUDIO_PE_CFLAGS:+false} : +if ${FAUDIO_PE_LIBS:+false} : +then : + FAUDIO_PE_LIBS="faudio mfplat mfreadwrite mfuuid propsys" + if ${FAUDIO_PE_CFLAGS:+false} : then : FAUDIO_PE_CFLAGS="-I\$(top_srcdir)/libs/faudio/include" else $as_nop enable_faudio=no fi -if ${FAUDIO_PE_LIBS:+false} : -then : - FAUDIO_PE_LIBS="faudio mfplat mfreadwrite mfuuid propsys" else $as_nop enable_faudio=no fi printf "%s\n" "$as_me:${as_lineno-$LINENO}: faudio cflags: $FAUDIO_PE_CFLAGS" >&5 printf "%s\n" "$as_me:${as_lineno-$LINENO}: faudio libs: $FAUDIO_PE_LIBS" >&5 -if ${GSM_PE_CFLAGS:+false} : +if ${GSM_PE_LIBS:+false} : +then : + GSM_PE_LIBS=gsm + if ${GSM_PE_CFLAGS:+false} : then : GSM_PE_CFLAGS="-I\$(top_srcdir)/libs/gsm/inc" else $as_nop enable_gsm=no fi -if ${GSM_PE_LIBS:+false} : -then : - GSM_PE_LIBS=gsm else $as_nop enable_gsm=no fi printf "%s\n" "$as_me:${as_lineno-$LINENO}: gsm cflags: $GSM_PE_CFLAGS" >&5 printf "%s\n" "$as_me:${as_lineno-$LINENO}: gsm libs: $GSM_PE_LIBS" >&5 -if ${JPEG_PE_CFLAGS:+false} : +if ${JPEG_PE_LIBS:+false} : +then : + JPEG_PE_LIBS=jpeg + if ${JPEG_PE_CFLAGS:+false} : then : JPEG_PE_CFLAGS="-I\$(top_srcdir)/libs/jpeg" else $as_nop enable_jpeg=no fi -if ${JPEG_PE_LIBS:+false} : -then : - JPEG_PE_LIBS=jpeg else $as_nop enable_jpeg=no fi printf "%s\n" "$as_me:${as_lineno-$LINENO}: jpeg cflags: $JPEG_PE_CFLAGS" >&5 printf "%s\n" "$as_me:${as_lineno-$LINENO}: jpeg libs: $JPEG_PE_LIBS" >&5 -if ${JXR_PE_CFLAGS:+false} : +if ${JXR_PE_LIBS:+false} : +then : + JXR_PE_LIBS=jxr + if ${JXR_PE_CFLAGS:+false} : then : JXR_PE_CFLAGS="-I\$(top_srcdir)/libs/jxr/jxrgluelib -I\$(top_srcdir)/libs/jxr/image/sys" else $as_nop enable_jxr=no fi -if ${JXR_PE_LIBS:+false} : -then : - JXR_PE_LIBS=jxr else $as_nop enable_jxr=no fi printf "%s\n" "$as_me:${as_lineno-$LINENO}: jxr cflags: $JXR_PE_CFLAGS" >&5 printf "%s\n" "$as_me:${as_lineno-$LINENO}: jxr libs: $JXR_PE_LIBS" >&5 -if ${LCMS2_PE_CFLAGS:+false} : +if ${LCMS2_PE_LIBS:+false} : +then : + LCMS2_PE_LIBS=lcms2 + if ${LCMS2_PE_CFLAGS:+false} : then : LCMS2_PE_CFLAGS="-I\$(top_srcdir)/libs/lcms2/include" else $as_nop enable_lcms2=no fi -if ${LCMS2_PE_LIBS:+false} : -then : - LCMS2_PE_LIBS=lcms2 else $as_nop enable_lcms2=no fi printf "%s\n" "$as_me:${as_lineno-$LINENO}: lcms2 cflags: $LCMS2_PE_CFLAGS" >&5 printf "%s\n" "$as_me:${as_lineno-$LINENO}: lcms2 libs: $LCMS2_PE_LIBS" >&5 -if ${MPG123_PE_CFLAGS:+false} : +if ${MPG123_PE_LIBS:+false} : +then : + MPG123_PE_LIBS=mpg123 + if ${MPG123_PE_CFLAGS:+false} : then : MPG123_PE_CFLAGS="-I\$(top_srcdir)/libs/mpg123/src/libmpg123" else $as_nop enable_mpg123=no fi -if ${MPG123_PE_LIBS:+false} : -then : - MPG123_PE_LIBS=mpg123 else $as_nop enable_mpg123=no fi printf "%s\n" "$as_me:${as_lineno-$LINENO}: mpg123 cflags: $MPG123_PE_CFLAGS" >&5 printf "%s\n" "$as_me:${as_lineno-$LINENO}: mpg123 libs: $MPG123_PE_LIBS" >&5 -if ${PNG_PE_CFLAGS:+false} : +if ${PNG_PE_LIBS:+false} : +then : + PNG_PE_LIBS="png \$(ZLIB_PE_LIBS)" + if ${PNG_PE_CFLAGS:+false} : then : PNG_PE_CFLAGS="-I\$(top_srcdir)/libs/png" else $as_nop enable_png=no fi -if ${PNG_PE_LIBS:+false} : -then : - PNG_PE_LIBS="png \$(ZLIB_PE_LIBS)" else $as_nop enable_png=no fi printf "%s\n" "$as_me:${as_lineno-$LINENO}: png cflags: $PNG_PE_CFLAGS" >&5 printf "%s\n" "$as_me:${as_lineno-$LINENO}: png libs: $PNG_PE_LIBS" >&5 -if ${TIFF_PE_CFLAGS:+false} : +if ${TIFF_PE_LIBS:+false} : +then : + TIFF_PE_LIBS=tiff + if ${TIFF_PE_CFLAGS:+false} : then : TIFF_PE_CFLAGS="-I\$(top_srcdir)/libs/tiff/libtiff" else $as_nop enable_tiff=no fi -if ${TIFF_PE_LIBS:+false} : -then : - TIFF_PE_LIBS=tiff else $as_nop enable_tiff=no fi printf "%s\n" "$as_me:${as_lineno-$LINENO}: tiff cflags: $TIFF_PE_CFLAGS" >&5 printf "%s\n" "$as_me:${as_lineno-$LINENO}: tiff libs: $TIFF_PE_LIBS" >&5 -if ${XML2_PE_CFLAGS:+false} : +if ${XML2_PE_LIBS:+false} : +then : + XML2_PE_LIBS=xml2 + if ${XML2_PE_CFLAGS:+false} : then : XML2_PE_CFLAGS="-I\$(top_srcdir)/libs/xml2/include -DLIBXML_STATIC" else $as_nop enable_xml2=no fi -if ${XML2_PE_LIBS:+false} : -then : - XML2_PE_LIBS=xml2 else $as_nop enable_xml2=no fi printf "%s\n" "$as_me:${as_lineno-$LINENO}: xml2 cflags: $XML2_PE_CFLAGS" >&5 printf "%s\n" "$as_me:${as_lineno-$LINENO}: xml2 libs: $XML2_PE_LIBS" >&5 -if ${XSLT_PE_CFLAGS:+false} : +if ${XSLT_PE_LIBS:+false} : +then : + XSLT_PE_LIBS=xslt + if ${XSLT_PE_CFLAGS:+false} : then : XSLT_PE_CFLAGS="-I\$(top_srcdir)/libs/xslt -DLIBXSLT_STATIC" else $as_nop enable_xslt=no fi -if ${XSLT_PE_LIBS:+false} : -then : - XSLT_PE_LIBS=xslt else $as_nop enable_xslt=no fi printf "%s\n" "$as_me:${as_lineno-$LINENO}: xslt cflags: $XSLT_PE_CFLAGS" >&5 printf "%s\n" "$as_me:${as_lineno-$LINENO}: xslt libs: $XSLT_PE_LIBS" >&5 -if ${ZLIB_PE_CFLAGS:+false} : +if ${ZLIB_PE_LIBS:+false} : +then : + ZLIB_PE_LIBS=z + if ${ZLIB_PE_CFLAGS:+false} : then : ZLIB_PE_CFLAGS="-I\$(top_srcdir)/libs/zlib -DFAR= -DZ_SOLO" else $as_nop enable_zlib=no fi -if ${ZLIB_PE_LIBS:+false} : -then : - ZLIB_PE_LIBS=z else $as_nop enable_zlib=no fi

1 0

Alexandre Julliard : netapi32: Use the ntdll Unicode string functions instead of wine/unicode.h.
by Alexandre Julliard Nov. 30, 2021

Nov. 30, 2021

Module: wine Branch: master Commit: 58e30bca68cc8a40a2c6a3dea269884469dc7921 URL: https://source.winehq.org/git/wine.git/?a=commit;h=58e30bca68cc8a40a2c6a3de… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 30 12:54:01 2021 +0100 netapi32: Use the ntdll Unicode string functions instead of wine/unicode.h. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/netapi32/unixlib.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/netapi32/unixlib.c b/dlls/netapi32/unixlib.c index 8d61774b7d7..23881b470d9 100644 --- a/dlls/netapi32/unixlib.c +++ b/dlls/netapi32/unixlib.c @@ -42,7 +42,6 @@ #include "winternl.h" #include "lm.h" #include "wine/debug.h" -#include "wine/unicode.h" #include "unixlib.h" @@ -67,8 +66,8 @@ static NET_API_STATUS (*pNetWkstaGetInfo)( const char *, unsigned int, unsigned static DWORD netapi_wcstoumbs( const WCHAR *src, char *dst, DWORD dstlen ) { - if (!dst) return 3 * strlenW( src ) + 1; - return ntdll_wcstoumbs( src, strlenW( src ) + 1, dst, dstlen, FALSE ); + if (!dst) return 3 * wcslen( src ) + 1; + return ntdll_wcstoumbs( src, wcslen( src ) + 1, dst, dstlen, FALSE ); } static DWORD netapi_umbstowcs( const char *src, WCHAR *dst, DWORD dstlen )

1 0

Alexandre Julliard : mountmgr: Use the ntdll Unicode string functions instead of wine/unicode.h.
by Alexandre Julliard Nov. 30, 2021

Nov. 30, 2021

Module: wine Branch: master Commit: 5554c847e1442ce41838c02a994cd06bda21e2d0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5554c847e1442ce41838c02a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 30 12:53:56 2021 +0100 mountmgr: Use the ntdll Unicode string functions instead of wine/unicode.h. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mountmgr.sys/cred.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/mountmgr.sys/cred.c b/dlls/mountmgr.sys/cred.c index 071cb53236d..9fb9e433881 100644 --- a/dlls/mountmgr.sys/cred.c +++ b/dlls/mountmgr.sys/cred.c @@ -40,7 +40,6 @@ #include "mountmgr.h" #include "unixlib.h" -#include "wine/unicode.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(mountmgr); @@ -167,7 +166,7 @@ static SecKeychainItemRef find_credential( const WCHAR *name ) CFRelease( search ); return NULL; } - if (strcmpiW( itemname, name )) + if (wcsicmp( itemname, name )) { CFRelease( item ); free( itemname ); @@ -466,9 +465,9 @@ static BOOL match_credential( void *data, UInt32 data_len, const WCHAR *filter ) TRACE( "comparing filter %s to target name %s\n", debugstr_w(filter), debugstr_w(targetname) ); - p = strchrW( filter, '*' ); - if (*p && !p[1]) ret = !strncmpiW( filter, targetname, p - filter ); - else ret = !strcmpiW( filter, targetname ); + p = wcschr( filter, '*' ); + if (*p && !p[1]) ret = !wcsnicmp( filter, targetname, p - filter ); + else ret = !wcsicmp( filter, targetname ); free( targetname ); return ret; }

1 0

Zebediah Figura : include: Do not include wine/list.h in wine/strmbase.h.
by Alexandre Julliard Nov. 30, 2021

Nov. 30, 2021

Module: wine Branch: master Commit: 507853c7b83656c5c52479d4a779f22fbfce86ba URL: https://source.winehq.org/git/wine.git/?a=commit;h=507853c7b83656c5c52479d4… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Nov 29 18:30:36 2021 -0600 include: Do not include wine/list.h in wine/strmbase.h. Nothing in strmbase.h uses list.h anymore. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/audiostream.c | 1 + dlls/amstream/ddrawstream.c | 1 + include/wine/strmbase.h | 1 - 3 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/amstream/audiostream.c b/dlls/amstream/audiostream.c index 91ca0630199..bb86cfdaf69 100644 --- a/dlls/amstream/audiostream.c +++ b/dlls/amstream/audiostream.c @@ -21,6 +21,7 @@ #define COBJMACROS #include "amstream_private.h" #include "wine/debug.h" +#include "wine/list.h" #include "wine/strmbase.h" WINE_DEFAULT_DEBUG_CHANNEL(quartz); diff --git a/dlls/amstream/ddrawstream.c b/dlls/amstream/ddrawstream.c index 5e88e096991..b1b79756ff9 100644 --- a/dlls/amstream/ddrawstream.c +++ b/dlls/amstream/ddrawstream.c @@ -22,6 +22,7 @@ #define COBJMACROS #include "amstream_private.h" #include "wine/debug.h" +#include "wine/list.h" #include "wine/strmbase.h" WINE_DEFAULT_DEBUG_CHANNEL(quartz); diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index a9233ef7820..1c8696ed620 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -20,7 +20,6 @@ */ #include "dshow.h" -#include "wine/list.h" HRESULT WINAPI CopyMediaType(AM_MEDIA_TYPE * pDest, const AM_MEDIA_TYPE *pSrc); void WINAPI FreeMediaType(AM_MEDIA_TYPE * pMediaType);

1 0

Nikolay Sivov : dxva2/tests: Fix some test failures on HW devices.
by Alexandre Julliard Nov. 29, 2021

Nov. 29, 2021

Module: wine Branch: master Commit: 8a43d0808a8cba8b30d5ed2e00f36d260ff2f796 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8a43d0808a8cba8b30d5ed2e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 29 16:02:50 2021 +0300 dxva2/tests: Fix some test failures on HW devices. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52106 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxva2/tests/dxva2.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/dxva2/tests/dxva2.c b/dlls/dxva2/tests/dxva2.c index 01f8f568e6a..5de39fe1360 100644 --- a/dlls/dxva2/tests/dxva2.c +++ b/dlls/dxva2/tests/dxva2.c @@ -575,7 +575,6 @@ static void test_progressive_device(void) static const D3DFORMAT input_formats[] = { - D3DFMT_A8R8G8B8, D3DFMT_X8R8G8B8, D3DFMT_YUY2, MAKEFOURCC('N','V','1','2'), @@ -666,7 +665,6 @@ static void test_progressive_device(void) hr = IDirectXVideoProcessor_GetVideoProcessorCaps(processor, &caps); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(caps.DeviceCaps == DXVA2_VPDev_HardwareDevice, "Unexpected device type %#x.\n", caps.DeviceCaps); - ok(caps.InputPool == D3DPOOL_DEFAULT, "Unexpected input pool %#x.\n", caps.InputPool); ok(!caps.NumForwardRefSamples, "Unexpected sample count.\n"); ok(!caps.NumBackwardRefSamples, "Unexpected sample count.\n"); ok(!caps.Reserved, "Unexpected field.\n");

1 0

Jinoh Kang : ntdll: Implement NtCompareObjects.
by Alexandre Julliard Nov. 29, 2021

Nov. 29, 2021

Module: wine Branch: master Commit: a4ffa1e7e2fbabc7dc2067c1652bce4ae5276242 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a4ffa1e7e2fbabc7dc2067c1… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Sun Nov 28 19:41:25 2021 +0900 ntdll: Implement NtCompareObjects. Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 2 ++ dlls/ntdll/unix/loader.c | 1 + dlls/ntdll/unix/server.c | 19 +++++++++++++++++++ dlls/wow64/sync.c | 12 ++++++++++++ dlls/wow64/syscall.h | 1 + include/wine/server_protocol.h | 19 ++++++++++++++++++- include/winternl.h | 1 + server/handle.c | 17 +++++++++++++++++ server/protocol.def | 7 +++++++ server/request.h | 5 +++++ server/trace.c | 10 ++++++++++ 11 files changed, 93 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a4ffa1e7e2fbabc7dc20…

1 0

Bernhard Kölbl : gdiplus: Introduce dst palette parameter to convert_pixels().
by Alexandre Julliard Nov. 29, 2021

Nov. 29, 2021

Module: wine Branch: master Commit: ec29292141ac39d2f7625ddae8e1547dd818eabd URL: https://source.winehq.org/git/wine.git/?a=commit;h=ec29292141ac39d2f7625dda… Author: Bernhard Kölbl <besentv(a)gmail.com> Date: Mon Nov 29 15:28:33 2021 +0100 gdiplus: Introduce dst palette parameter to convert_pixels(). Make it possible to define a destination colour palette when using convert_pixels(), so converting a bitmap from a non indexed format to an indexed format does not produce an empty image. Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/gdiplus_private.h | 4 ++-- dlls/gdiplus/graphics.c | 2 +- dlls/gdiplus/image.c | 20 +++++++++++--------- 3 files changed, 14 insertions(+), 12 deletions(-) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index 22213e9f278..7ae8cc564c9 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -207,8 +207,8 @@ extern void convert_32bppARGB_to_32bppPARGB(UINT width, UINT height, BYTE *dst_bits, INT dst_stride, const BYTE *src_bits, INT src_stride) DECLSPEC_HIDDEN; extern GpStatus convert_pixels(INT width, INT height, - INT dst_stride, BYTE *dst_bits, PixelFormat dst_format, - INT src_stride, const BYTE *src_bits, PixelFormat src_format, ColorPalette *palette) DECLSPEC_HIDDEN; + INT dst_stride, BYTE *dst_bits, PixelFormat dst_format, ColorPalette *dst_palette, + INT src_stride, const BYTE *src_bits, PixelFormat src_format, ColorPalette *src_palette) DECLSPEC_HIDDEN; extern PixelFormat apply_image_attributes(const GpImageAttributes *attributes, LPBYTE data, UINT width, UINT height, INT stride, ColorAdjustType type, PixelFormat fmt) DECLSPEC_HIDDEN; diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 4a428c49869..65cdf96510d 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -3350,7 +3350,7 @@ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image dst_format = PixelFormat32bppRGB; convert_pixels(bitmap->width, bitmap->height, - bitmap->width*4, temp_bits, dst_format, + bitmap->width*4, temp_bits, dst_format, bitmap->image.palette, bitmap->stride, bitmap->bits, bitmap->format, bitmap->image.palette); } diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 862f7fea111..518a9bf8689 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -591,8 +591,9 @@ GpStatus WINGDIPAPI GdipBitmapSetPixel(GpBitmap* bitmap, INT x, INT y, GpStatus convert_pixels(INT width, INT height, INT dst_stride, BYTE *dst_bits, PixelFormat dst_format, + ColorPalette *dst_palette, INT src_stride, const BYTE *src_bits, PixelFormat src_format, - ColorPalette *palette) + ColorPalette *src_palette) { INT x, y; @@ -612,7 +613,7 @@ GpStatus convert_pixels(INT width, INT height, ARGB argb; \ BYTE *color = (BYTE *)&argb; \ getpixel_function(&index, src_bits+src_stride*y, x); \ - argb = (palette && index < palette->Count) ? palette->Entries[index] : 0; \ + argb = (src_palette && index < src_palette->Count) ? src_palette->Entries[index] : 0; \ setpixel_function(color[2], color[1], color[0], color[3], dst_bits+dst_stride*y, x); \ } \ return Ok; \ @@ -633,7 +634,7 @@ GpStatus convert_pixels(INT width, INT height, for (x=0; x<width; x++) { \ BYTE r, g, b, a; \ getpixel_function(&r, &g, &b, &a, src_bits+src_stride*y, x); \ - setpixel_function(r, g, b, a, dst_bits+dst_stride*y, x, palette); \ + setpixel_function(r, g, b, a, dst_bits+dst_stride*y, x, dst_palette); \ } \ return Ok; \ } while (0); @@ -1137,7 +1138,7 @@ GpStatus WINGDIPAPI GdipBitmapLockBits(GpBitmap* bitmap, GDIPCONST GpRect* rect, /* Make sure we can convert to the requested format. */ if (flags & ImageLockModeRead) { - stat = convert_pixels(0, 0, 0, NULL, format, 0, NULL, bitmap->format, NULL); + stat = convert_pixels(0, 0, 0, NULL, format, NULL, 0, NULL, bitmap->format, NULL); if (stat == NotImplemented) { FIXME("cannot read bitmap from %x to %x\n", bitmap->format, format); @@ -1150,7 +1151,7 @@ GpStatus WINGDIPAPI GdipBitmapLockBits(GpBitmap* bitmap, GDIPCONST GpRect* rect, * the original format. */ if (flags & ImageLockModeWrite) { - stat = convert_pixels(0, 0, 0, NULL, bitmap->format, 0, NULL, format, NULL); + stat = convert_pixels(0, 0, 0, NULL, bitmap->format, NULL, 0, NULL, format, NULL); if (stat == NotImplemented) { FIXME("cannot write bitmap from %x to %x\n", format, bitmap->format); @@ -1190,7 +1191,7 @@ GpStatus WINGDIPAPI GdipBitmapLockBits(GpBitmap* bitmap, GDIPCONST GpRect* rect, } stat = convert_pixels(act_rect.Width, act_rect.Height, - lockeddata->Stride, lockeddata->Scan0, format, + lockeddata->Stride, lockeddata->Scan0, format, bitmap->image.palette, bitmap->stride, bitmap->bits + bitmap->stride * act_rect.Y + PIXELFORMATBPP(bitmap->format) * act_rect.X / 8, bitmap->format, bitmap->image.palette); @@ -1267,10 +1268,11 @@ GpStatus WINGDIPAPI GdipBitmapUnlockBits(GpBitmap* bitmap, fixme = TRUE; } + /* FIXME: Pass src_palette generated from lockeddata->PixelFormat. */ stat = convert_pixels(lockeddata->Width, lockeddata->Height, bitmap->stride, bitmap->bits + bitmap->stride * bitmap->locky + PIXELFORMATBPP(bitmap->format) * bitmap->lockx / 8, - bitmap->format, + bitmap->format, bitmap->image.palette, lockeddata->Stride, lockeddata->Scan0, lockeddata->PixelFormat, NULL); if (stat != Ok) @@ -1314,7 +1316,7 @@ GpStatus WINGDIPAPI GdipCloneBitmapArea(REAL x, REAL y, REAL width, REAL height, if (stat == Ok) { stat = convert_pixels(area.Width, area.Height, (*dstBitmap)->stride, (*dstBitmap)->bits, (*dstBitmap)->format, - srcBitmap->stride, + (*dstBitmap)->image.palette, srcBitmap->stride, srcBitmap->bits + srcBitmap->stride * area.Y + PIXELFORMATBPP(srcBitmap->format) * area.X / 8, srcBitmap->format, srcBitmap->image.palette); @@ -1545,7 +1547,7 @@ GpStatus WINGDIPAPI GdipCreateHBITMAPFromBitmap(GpBitmap* bitmap, } stat = convert_pixels(width, height, -width*4, - bits + (width * 4 * (height - 1)), PixelFormat32bppPARGB, + bits + (width * 4 * (height - 1)), PixelFormat32bppPARGB, bitmap->image.palette, bitmap->stride, bitmap->bits, bitmap->format, bitmap->image.palette); if (stat != Ok) {

1 0

Bernhard Kölbl : gdiplus: Add simple test for bitmap clone from rgb values to indexed.
by Alexandre Julliard Nov. 29, 2021

Nov. 29, 2021

Module: wine Branch: master Commit: d3275f5f6a5a3d78615ed1991efc446e91ed4855 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d3275f5f6a5a3d78615ed199… Author: Bernhard Kölbl <besentv(a)gmail.com> Date: Mon Nov 29 15:28:34 2021 +0100 gdiplus: Add simple test for bitmap clone from rgb values to indexed. Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/tests/image.c | 69 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 69 insertions(+) diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 2175c1748e0..ca08ae49ad7 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -5102,9 +5102,44 @@ static void test_PARGB_conversion(void) static void test_CloneBitmapArea(void) { + /* 3x3 pixeldata in various formats: red, green, blue, yellow, turquoise, pink, black, gray, white */ + static BYTE bmp_3x3_data_32bpp_argb[] = { + 0xff,0x00,0x00,0xff, 0x00,0xff,0x00,0xff, 0x00,0x00,0xff,0xff, + 0xff,0xff,0x00,0xff, 0x00,0xff,0xff,0xff, 0xff,0x00,0xff,0xff, + 0xff,0xff,0xff,0xff, 0x80,0x80,0x80,0xff, 0x00,0x00,0x00,0xff + }; + static BYTE bmp_3x3_data_32bpp_rgb[] = { + 0xff,0x00,0x00,0x00, 0x00,0xff,0x00,0x00, 0x00,0x00,0xff,0x00, + 0xff,0xff,0x00,0x00, 0x00,0xff,0xff,0x00, 0xff,0x00,0xff,0x00, + 0xff,0xff,0xff,0x00, 0x80,0x80,0x80,0x00, 0x00,0x00,0x00,0x00 + }; + static BYTE bmp_3x3_data_24bpp_rgb[] = { + 0xff,0x00,0x00, 0x00,0xff,0x00, 0x00,0x00,0xff, + 0xff,0xff,0x00, 0x00,0xff,0xff, 0xff,0x00,0xff, + 0xff,0xff,0xff, 0x80,0x80,0x80, 0x00,0x00,0x00 + }; + + static const struct test_data { + BYTE *src_pixeldata; + PixelFormat src_format; + PixelFormat dst_format; + } td[] = + { + { bmp_3x3_data_32bpp_argb, PixelFormat32bppARGB, PixelFormat8bppIndexed }, + { bmp_3x3_data_32bpp_argb, PixelFormat32bppARGB, PixelFormat4bppIndexed }, + { bmp_3x3_data_32bpp_argb, PixelFormat32bppARGB, PixelFormat1bppIndexed }, + { bmp_3x3_data_32bpp_rgb, PixelFormat32bppRGB, PixelFormat8bppIndexed }, + { bmp_3x3_data_32bpp_rgb, PixelFormat32bppRGB, PixelFormat4bppIndexed }, + { bmp_3x3_data_32bpp_rgb, PixelFormat32bppRGB, PixelFormat1bppIndexed }, + { bmp_3x3_data_24bpp_rgb, PixelFormat24bppRGB, PixelFormat8bppIndexed }, + { bmp_3x3_data_24bpp_rgb, PixelFormat24bppRGB, PixelFormat4bppIndexed }, + { bmp_3x3_data_24bpp_rgb, PixelFormat24bppRGB, PixelFormat1bppIndexed }, + }; + GpStatus status; GpBitmap *bitmap, *copy; BitmapData data, data2; + INT x, y, i; status = GdipCreateBitmapFromScan0(1, 1, 0, PixelFormat24bppRGB, NULL, &bitmap); expect(Ok, status); @@ -5123,6 +5158,40 @@ static void test_CloneBitmapArea(void) GdipDisposeImage((GpImage *)copy); GdipDisposeImage((GpImage *)bitmap); + + for(i=0; i<ARRAY_SIZE(td); i++) + { + status = GdipCreateBitmapFromScan0(3, 3, 4*3, td[i].src_format, td[i].src_pixeldata, &bitmap); + expect(Ok, status); + + status = GdipCloneBitmapAreaI(0, 0, 3, 3, td[i].dst_format, bitmap, &copy); + expect(Ok, status); + + for (y=0; y<3; y++) + for (x=0; x<3; x++) + { + BOOL match; + ARGB color_orig; + ARGB color_copy; + + status = GdipBitmapGetPixel(bitmap, x, y, &color_orig); + expect(Ok, status); + + status = GdipBitmapGetPixel(copy, x, y, &color_copy); + expect(Ok, status); + + if(td[i].dst_format == PixelFormat1bppIndexed) + color_orig = (color_orig >> 16 & 0xff) + (color_orig >> 8 & 0xff) + (color_orig & 0xff) + > 0x17d ? 0xffffffff : 0xff000000; + + match = color_match(color_orig, color_copy, 0x00); + ok(match == TRUE, "Colors 0x%08x and 0x%08x do not match! (Conversion from %x to %x)\n", + color_orig, color_copy, td[i].src_format, td[i].dst_format); + } + + GdipDisposeImage((GpImage *)copy); + GdipDisposeImage((GpImage *)bitmap); + } } static void test_supported_encoders(void)

1 0

Jinoh Kang : ntdll/tests: Add tests for NtCompareObjects.
by Alexandre Julliard Nov. 29, 2021

Nov. 29, 2021

Module: wine Branch: master Commit: 47c365606fe67b505fa94ad177d353cd1d10e1c5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=47c365606fe67b505fa94ad1… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Sun Nov 28 19:40:29 2021 +0900 ntdll/tests: Add tests for NtCompareObjects. Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/om.c | 56 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c index 250984ebdda..c32136763a1 100644 --- a/dlls/ntdll/tests/om.c +++ b/dlls/ntdll/tests/om.c @@ -71,6 +71,7 @@ static NTSTATUS (WINAPI *pNtOpenProcessToken)(HANDLE,DWORD,HANDLE*); static NTSTATUS (WINAPI *pNtOpenThreadToken)(HANDLE,DWORD,BOOLEAN,HANDLE*); static NTSTATUS (WINAPI *pNtDuplicateToken)(HANDLE,ACCESS_MASK,OBJECT_ATTRIBUTES*,SECURITY_IMPERSONATION_LEVEL,TOKEN_TYPE,HANDLE*); static NTSTATUS (WINAPI *pNtDuplicateObject)(HANDLE,HANDLE,HANDLE,HANDLE*,ACCESS_MASK,ULONG,ULONG); +static NTSTATUS (WINAPI *pNtCompareObjects)(HANDLE,HANDLE); #define KEYEDEVENT_WAIT 0x0001 #define KEYEDEVENT_WAKE 0x0002 @@ -2446,6 +2447,59 @@ static void test_globalroot(void) pNtClose(h); } +static void test_object_identity(void) +{ + NTSTATUS status; + HANDLE h1, h2; + + if (!pNtCompareObjects) + { + skip("NtCompareObjects is not available.\n"); + return; + } + + status = pNtCompareObjects( GetCurrentProcess(), GetCurrentProcess() ); + ok( status == STATUS_SUCCESS, "comparing GetCurrentProcess() to self failed with %08x\n", status ); + + status = pNtCompareObjects( GetCurrentThread(), GetCurrentThread() ); + ok( status == STATUS_SUCCESS, "comparing GetCurrentThread() to self failed with %08x\n", status ); + + status = pNtCompareObjects( GetCurrentProcess(), GetCurrentThread() ); + ok( status == STATUS_NOT_SAME_OBJECT, "comparing GetCurrentProcess() to GetCurrentThread() returned %08x\n", status ); + + h1 = NULL; + status = pNtDuplicateObject( GetCurrentProcess(), GetCurrentProcess(), GetCurrentProcess(), + &h1, 0, 0, DUPLICATE_SAME_ACCESS ); + ok( status == STATUS_SUCCESS, "failed to duplicate current process handle: %08x\n", status); + + status = pNtCompareObjects( GetCurrentProcess(), h1 ); + ok( status == STATUS_SUCCESS, "comparing GetCurrentProcess() with %p failed with %08x\n", h1, status ); + + pNtClose( h1 ); + + h1 = CreateFileA( "\\\\.\\NUL", GENERIC_ALL, 0, NULL, OPEN_EXISTING, 0, 0 ); + ok( h1 != INVALID_HANDLE_VALUE, "CreateFile failed (%d)\n", GetLastError() ); + + h2 = NULL; + status = pNtDuplicateObject( GetCurrentProcess(), h1, GetCurrentProcess(), + &h2, 0, 0, DUPLICATE_SAME_ACCESS ); + ok( status == STATUS_SUCCESS, "failed to duplicate handle %p: %08x\n", h1, status); + + status = pNtCompareObjects( h1, h2 ); + ok( status == STATUS_SUCCESS, "comparing %p with %p failed with %08x\n", h1, h2, status ); + + pNtClose( h2 ); + + h2 = CreateFileA( "\\\\.\\NUL", GENERIC_ALL, 0, NULL, OPEN_EXISTING, 0, 0 ); + ok( h2 != INVALID_HANDLE_VALUE, "CreateFile failed (%d)\n", GetLastError() ); + + status = pNtCompareObjects( h1, h2 ); + ok( status == STATUS_NOT_SAME_OBJECT, "comparing %p with %p returned %08x\n", h1, h2, status ); + + pNtClose( h2 ); + pNtClose( h1 ); +} + START_TEST(om) { HMODULE hntdll = GetModuleHandleA("ntdll.dll"); @@ -2489,6 +2543,7 @@ START_TEST(om) pNtOpenThreadToken = (void *)GetProcAddress(hntdll, "NtOpenThreadToken"); pNtDuplicateToken = (void *)GetProcAddress(hntdll, "NtDuplicateToken"); pNtDuplicateObject = (void *)GetProcAddress(hntdll, "NtDuplicateObject"); + pNtCompareObjects = (void *)GetProcAddress(hntdll, "NtCompareObjects"); test_case_sensitive(); test_namespace_pipe(); @@ -2505,4 +2560,5 @@ START_TEST(om) test_object_types(); test_get_next_thread(); test_globalroot(); + test_object_identity(); }

1 0

Jinoh Kang : kernelbase: Implement CompareObjectHandles.
by Alexandre Julliard Nov. 29, 2021

Nov. 29, 2021

Module: wine Branch: master Commit: b89c47826d3ce515013346c9a7ccd2535b881587 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b89c47826d3ce515013346c9… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Sun Nov 28 19:41:36 2021 +0900 kernelbase: Implement CompareObjectHandles. Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/kernelbase.spec | 2 +- dlls/kernelbase/process.c | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index be40e425783..7bc0c262fdd 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -153,7 +153,7 @@ @ stdcall CloseThreadpoolWork(ptr) ntdll.TpReleaseWork # @ stub CommitStateAtom @ stdcall CompareFileTime(ptr ptr) -# @ stub CompareObjectHandles +@ stdcall CompareObjectHandles(ptr ptr) @ stdcall CompareStringA(long long str long str long) @ stdcall CompareStringEx(wstr long wstr long wstr long ptr ptr long) @ stdcall CompareStringOrdinal(wstr long wstr long long) diff --git a/dlls/kernelbase/process.c b/dlls/kernelbase/process.c index 5973eb7d933..0e4a3eb9b6b 100644 --- a/dlls/kernelbase/process.c +++ b/dlls/kernelbase/process.c @@ -1771,3 +1771,12 @@ void WINAPI DECLSPEC_HOTPATCH DeleteProcThreadAttributeList( struct _PROC_THREAD { return; } + + +/*********************************************************************** + * CompareObjectHandles (kernelbase.@) + */ +BOOL WINAPI DECLSPEC_HOTPATCH CompareObjectHandles( HANDLE first, HANDLE second ) +{ + return set_ntstatus( NtCompareObjects( first, second )); +}

1 0