September 2021 - Wine-Commits

Guillaume Charifi : api-ms-win-core-processtopology-l1-1-0: Add dll.
by Alexandre Julliard Sept. 1, 2021

Sept. 1, 2021

Module: wine Branch: master Commit: 8ae01354969daada4b5c44f35727e6669ae424b4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8ae01354969daada4b5c44f3… Author: Guillaume Charifi <guillaume.charifi(a)sfr.fr> Date: Tue Aug 31 13:49:16 2021 +0200 api-ms-win-core-processtopology-l1-1-0: Add dll. Signed-off-by: Guillaume Charifi <guillaume.charifi(a)sfr.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/api-ms-win-core-processtopology-l1-1-0/Makefile.in | 1 + .../api-ms-win-core-processtopology-l1-1-0.spec | 4 ++++ tools/make_specfiles | 1 + 5 files changed, 9 insertions(+) diff --git a/configure b/configure index 46ae09a38e8..08c6c48385e 100755 --- a/configure +++ b/configure @@ -1012,6 +1012,7 @@ enable_api_ms_win_core_processthreads_l1_1_0 enable_api_ms_win_core_processthreads_l1_1_1 enable_api_ms_win_core_processthreads_l1_1_2 enable_api_ms_win_core_processthreads_l1_1_3 +enable_api_ms_win_core_processtopology_l1_1_0 enable_api_ms_win_core_processtopology_obsolete_l1_1_0 enable_api_ms_win_core_profile_l1_1_0 enable_api_ms_win_core_psapi_ansi_l1_1_0 @@ -20133,6 +20134,7 @@ wine_fn_config_makefile dlls/api-ms-win-core-processthreads-l1-1-0 enable_api_ms wine_fn_config_makefile dlls/api-ms-win-core-processthreads-l1-1-1 enable_api_ms_win_core_processthreads_l1_1_1 wine_fn_config_makefile dlls/api-ms-win-core-processthreads-l1-1-2 enable_api_ms_win_core_processthreads_l1_1_2 wine_fn_config_makefile dlls/api-ms-win-core-processthreads-l1-1-3 enable_api_ms_win_core_processthreads_l1_1_3 +wine_fn_config_makefile dlls/api-ms-win-core-processtopology-l1-1-0 enable_api_ms_win_core_processtopology_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-core-processtopology-obsolete-l1-1-0 enable_api_ms_win_core_processtopology_obsolete_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-core-profile-l1-1-0 enable_api_ms_win_core_profile_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-core-psapi-ansi-l1-1-0 enable_api_ms_win_core_psapi_ansi_l1_1_0 diff --git a/configure.ac b/configure.ac index 11c43cdce47..13ce6edb949 100644 --- a/configure.ac +++ b/configure.ac @@ -2833,6 +2833,7 @@ WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-processthreads-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-processthreads-l1-1-1) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-processthreads-l1-1-2) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-processthreads-l1-1-3) +WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-processtopology-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-processtopology-obsolete-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-profile-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-psapi-ansi-l1-1-0) diff --git a/dlls/api-ms-win-core-processtopology-l1-1-0/Makefile.in b/dlls/api-ms-win-core-processtopology-l1-1-0/Makefile.in new file mode 100644 index 00000000000..c6a3d3257e4 --- /dev/null +++ b/dlls/api-ms-win-core-processtopology-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-processtopology-l1-1-0.dll diff --git a/dlls/api-ms-win-core-processtopology-l1-1-0/api-ms-win-core-processtopology-l1-1-0.spec b/dlls/api-ms-win-core-processtopology-l1-1-0/api-ms-win-core-processtopology-l1-1-0.spec new file mode 100644 index 00000000000..c843a07fcaa --- /dev/null +++ b/dlls/api-ms-win-core-processtopology-l1-1-0/api-ms-win-core-processtopology-l1-1-0.spec @@ -0,0 +1,4 @@ +@ stdcall GetProcessGroupAffinity(long ptr ptr) kernel32.GetProcessGroupAffinity +@ stdcall GetThreadGroupAffinity(long ptr) kernel32.GetThreadGroupAffinity +@ stdcall SetProcessGroupAffinity(long ptr ptr) kernelbase.SetProcessGroupAffinity +@ stdcall SetThreadGroupAffinity(long ptr ptr) kernel32.SetThreadGroupAffinity diff --git a/tools/make_specfiles b/tools/make_specfiles index 44abb58b0a8..a7ee7e7f4db 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -297,6 +297,7 @@ my @dll_groups = "api-ms-win-core-wow64-l1-1-0", "api-ms-win-core-wow64-l1-1-1", "api-ms-win-core-xstate-l2-1-0", + "api-ms-win-core-processtopology-l1-1-0", "api-ms-win-core-processtopology-obsolete-l1-1-0", "api-ms-win-core-util-l1-1-0", "api-ms-win-downlevel-kernel32-l2-1-0",

1 0

Guillaume Charifi : kernelbase: Add stub for SetProcessGroupAffinity().
by Alexandre Julliard Sept. 1, 2021

Sept. 1, 2021

Module: wine Branch: master Commit: 629ced155e083c8e2f9646835bf63b2ea0ce683e URL: https://source.winehq.org/git/wine.git/?a=commit;h=629ced155e083c8e2f964683… Author: Guillaume Charifi <guillaume.charifi(a)sfr.fr> Date: Tue Aug 31 12:45:53 2021 +0200 kernelbase: Add stub for SetProcessGroupAffinity(). Signed-off-by: Guillaume Charifi <guillaume.charifi(a)sfr.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/kernelbase.spec | 2 +- dlls/kernelbase/process.c | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index e1fb19eceb0..dd9f4a8ddce 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -1460,7 +1460,7 @@ @ stdcall SetPrivateObjectSecurityEx(long ptr ptr long ptr long) @ stdcall SetProcessAffinityUpdateMode(long long) # @ stub SetProcessDefaultCpuSets -# @ stub SetProcessGroupAffinity +@ stdcall SetProcessGroupAffinity(long ptr ptr) # @ stub SetProcessInformation @ stdcall SetProcessMitigationPolicy(long ptr long) @ stdcall SetProcessPreferredUILanguages(long ptr ptr) diff --git a/dlls/kernelbase/process.c b/dlls/kernelbase/process.c index 101d3fa3213..5973eb7d933 100644 --- a/dlls/kernelbase/process.c +++ b/dlls/kernelbase/process.c @@ -1133,6 +1133,18 @@ BOOL WINAPI DECLSPEC_HOTPATCH SetProcessAffinityUpdateMode( HANDLE process, DWOR } +/*********************************************************************** + * SetProcessGroupAffinity (kernelbase.@) + */ +BOOL WINAPI DECLSPEC_HOTPATCH SetProcessGroupAffinity( HANDLE process, const GROUP_AFFINITY *new, + GROUP_AFFINITY *old ) +{ + FIXME( "(%p,%p,%p): stub\n", process, new, old ); + SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); + return FALSE; +} + + /********************************************************************** * SetProcessMitigationPolicy (kernelbase.@) */

1 0

Anton Baskanov : wined3d: Simplify the odd line condition in gen_yv12_read().
by Alexandre Julliard Sept. 1, 2021

Sept. 1, 2021

Module: wine Branch: master Commit: e3db02d0cb55155044bff1b3d4851124dad20a73 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e3db02d0cb55155044bff1b3… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Tue Aug 31 23:26:25 2021 +0700 wined3d: Simplify the odd line condition in gen_yv12_read(). Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index c760d519b30..fb809052d83 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -12624,7 +12624,7 @@ static void gen_yv12_read(struct wined3d_string_buffer *buffer, /* Read odd lines from the right side (add 0.5 to the x coordinate). Keep * in mind that each line of the chroma plane corresponds to 2 lines of the * resulting image. */ - shader_addline(buffer, " if (fract(floor(texcoord.y * size.y) * 0.25 + 1.0 / 6.0) >= 0.5)\n"); + shader_addline(buffer, " if (fract(texcoord.y * size.y * 0.25) >= 0.5)\n"); shader_addline(buffer, " texcoord.x += 0.5;\n"); /* Clamp, keep the half pixel origin in mind. */

1 0

Chip Davis : winemac.drv: Enable layer-backed views.
by Alexandre Julliard Sept. 1, 2021

Sept. 1, 2021

Module: wine Branch: master Commit: a5cf847aa45c38bae1500ef19a9bac38bbd8d5ba URL: https://source.winehq.org/git/wine.git/?a=commit;h=a5cf847aa45c38bae1500ef1… Author: Chip Davis <cdavis(a)codeweavers.com> Date: Wed Sep 1 09:28:20 2021 -0500 winemac.drv: Enable layer-backed views. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/cocoa_window.m | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 29ac32d6be0..29a5abe6344 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -311,6 +311,16 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi @end +#ifndef MAC_OS_X_VERSION_10_14 +(a)protocol NSViewLayerContentScaleDelegate <NSObject> +(a)optional + + - (BOOL) layer:(CALayer*)layer shouldInheritContentsScale:(CGFloat)newScale fromWindow:(NSWindow*)window; + +(a)end +#endif + + @interface WineBaseView : NSView @end @@ -327,7 +337,7 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi #endif -(a)interface WineContentView : WineBaseView <NSTextInputClient> +(a)interface WineContentView : WineBaseView <NSTextInputClient, NSViewLayerContentScaleDelegate> { NSMutableArray* glContexts; NSMutableArray* pendingGlContexts; @@ -339,6 +349,7 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi NSMutableAttributedString* markedText; NSRange markedTextSelection; + BOOL _retinaMode; int backingSize[2]; #ifdef HAVE_METAL_METAL_H @@ -688,9 +699,15 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi [self setWantsBestResolutionOpenGLSurface:mode]; [self updateGLContexts]; + _retinaMode = !!mode; [super setRetinaMode:mode]; } + - (BOOL) layer:(CALayer*)layer shouldInheritContentsScale:(CGFloat)newScale fromWindow:(NSWindow*)window + { + return (_retinaMode || newScale == 1.0); + } + - (void) viewDidHide { [super viewDidHide]; @@ -1002,6 +1019,7 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi contentView = [[[WineContentView alloc] initWithFrame:NSZeroRect] autorelease]; if (!contentView) return nil; + [contentView setWantsLayer:YES]; [contentView setAutoresizesSubviews:NO]; /* We use tracking areas in addition to setAcceptsMouseMovedEvents:YES @@ -3573,6 +3591,7 @@ macdrv_view macdrv_create_view(CGRect rect) NSNotificationCenter* nc = [NSNotificationCenter defaultCenter]; view = [[WineContentView alloc] initWithFrame:NSRectFromCGRect(cgrect_mac_from_win(rect))]; + [view setWantsLayer:YES]; [view setAutoresizesSubviews:NO]; [view setAutoresizingMask:NSViewNotSizable]; [view setHidden:YES];

1 0

Francois Gouget : shlwapi/tests: Remove SHFormatDateTimeA() crash test.
by Alexandre Julliard Sept. 1, 2021

Sept. 1, 2021

Module: wine Branch: master Commit: 72843489857d85ff7b8d8fd52a42351e39f296cd URL: https://source.winehq.org/git/wine.git/?a=commit;h=72843489857d85ff7b8d8fd5… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Sep 1 11:53:35 2021 +0200 shlwapi/tests: Remove SHFormatDateTimeA() crash test. SHFormatDateTimeA() crashes when given a NULL input pointer which is not really useful to know. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shlwapi/tests/ordinal.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/dlls/shlwapi/tests/ordinal.c b/dlls/shlwapi/tests/ordinal.c index bf34cdce7ef..bac91c4c9d8 100644 --- a/dlls/shlwapi/tests/ordinal.c +++ b/dlls/shlwapi/tests/ordinal.c @@ -1674,12 +1674,6 @@ static void test_SHFormatDateTimeA(void) DWORD flags; INT ret; -if (0) -{ - /* crashes on native */ - pSHFormatDateTimeA(NULL, NULL, NULL, 0); -} - GetLocalTime(&st); SystemTimeToFileTime(&st, &filetime); /* SHFormatDateTime expects input as utc */

1 0

Jacek Caban : gdi32: Use ntgdi for AddFontResourceExW and RemoveFontResourceExW.
by Alexandre Julliard Sept. 1, 2021

Sept. 1, 2021

Module: wine Branch: master Commit: 7da78fd269309cfa8ed27aededb2c67e24507439 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7da78fd269309cfa8ed27aed… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 1 14:08:52 2021 +0200 gdi32: Use ntgdi for AddFontResourceExW and RemoveFontResourceExW. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 10 ++++++---- dlls/gdi32/text.c | 16 ++++++++++++++++ include/ntgdi.h | 4 ++++ 3 files changed, 26 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 99b018513d3..c5641cd4653 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -6251,9 +6251,10 @@ void font_init(void) } /*********************************************************************** - * AddFontResourceExW (GDI32.@) + * NtGdiAddFontResourceW (win32u.@) */ -INT WINAPI AddFontResourceExW( LPCWSTR str, DWORD flags, PVOID pdv ) +INT WINAPI NtGdiAddFontResourceW( const WCHAR *str, ULONG size, ULONG files, DWORD flags, + DWORD tid, void *dv ) { int ret; WCHAR *filename; @@ -6344,9 +6345,10 @@ BOOL WINAPI NtGdiRemoveFontMemResourceEx( HANDLE handle ) } /*********************************************************************** - * RemoveFontResourceExW (GDI32.@) + * NtGdiRemoveFontResourceW (win32u.@) */ -BOOL WINAPI RemoveFontResourceExW( LPCWSTR str, DWORD flags, PVOID pdv ) +BOOL WINAPI NtGdiRemoveFontResourceW( const WCHAR *str, ULONG size, ULONG files, DWORD flags, + DWORD tid, void *dv ) { int ret; WCHAR *filename; diff --git a/dlls/gdi32/text.c b/dlls/gdi32/text.c index 227651f2afc..d1f7050e21a 100644 --- a/dlls/gdi32/text.c +++ b/dlls/gdi32/text.c @@ -2275,6 +2275,22 @@ BOOL WINAPI RemoveFontResourceExA( const char *str, DWORD fl, void *pdv ) return ret; } +/*********************************************************************** + * AddFontResourceExW (GDI32.@) + */ +INT WINAPI AddFontResourceExW( const WCHAR *str, DWORD flags, void *dv ) +{ + return NtGdiAddFontResourceW( str, 0, 1, flags, 0, dv ); +} + +/*********************************************************************** + * RemoveFontResourceExW (GDI32.@) + */ +BOOL WINAPI RemoveFontResourceExW( const WCHAR *str, DWORD flags, void *dv ) +{ + return NtGdiRemoveFontResourceW( str, 0, 1, flags, 0, dv ); +} + /*********************************************************************** * GetFontResourceInfoW (GDI32.@) */ diff --git a/include/ntgdi.h b/include/ntgdi.h index 47777b3f129..00783975e18 100644 --- a/include/ntgdi.h +++ b/include/ntgdi.h @@ -210,6 +210,8 @@ INT WINAPI NtGdiAbortDoc( HDC hdc ); BOOL WINAPI NtGdiAbortPath( HDC hdc ); HANDLE WINAPI NtGdiAddFontMemResourceEx( void *ptr, DWORD size, void *dv, ULONG dv_size, DWORD *count ); +INT WINAPI NtGdiAddFontResourceW( const WCHAR *str, ULONG size, ULONG files, DWORD flags, + DWORD tid, void *dv ); BOOL WINAPI NtGdiAlphaBlend( HDC hdc_dst, int x_dst, int y_dst, int width_dst, int height_dst, HDC hdc_src, int x_src, int y_src, int width_src, int height_src, BLENDFUNCTION blend_function, HANDLE xform ); @@ -351,6 +353,8 @@ BOOL WINAPI NtGdiRectInRegion( HRGN hrgn, const RECT *rect ); BOOL WINAPI NtGdiRectVisible( HDC hdc, const RECT *rect ); BOOL WINAPI NtGdiRectangle( HDC hdc, INT left, INT top, INT right, INT bottom ); BOOL WINAPI NtGdiRemoveFontMemResourceEx( HANDLE handle ); +BOOL WINAPI NtGdiRemoveFontResourceW( const WCHAR *str, ULONG size, ULONG files, + DWORD flags, DWORD tid, void *dv ); BOOL WINAPI NtGdiResetDC( HDC hdc, const DEVMODEW *devmode, BOOL *banding, DRIVER_INFO_2W *driver_info, void *dev ); BOOL WINAPI NtGdiResizePalette( HPALETTE palette, UINT count );

1 0

Jacek Caban : gdi32: Use EnumFontFamiliesExW for EnumFontFamiliesExA.
by Alexandre Julliard Sept. 1, 2021

Sept. 1, 2021

Module: wine Branch: master Commit: 931ea8b00e82912a96446575371e105cf1399496 URL: https://source.winehq.org/git/wine.git/?a=commit;h=931ea8b00e82912a96446575… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 1 14:08:14 2021 +0200 gdi32: Use EnumFontFamiliesExW for EnumFontFamiliesExA. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 119 +----------------------------------------------------- dlls/gdi32/text.c | 73 +++++++++++++++++++++++++++++++++ 2 files changed, 75 insertions(+), 117 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=931ea8b00e82912a9644…

1 0

Francois Gouget : shlwapi/tests: Test a NULL flags pointer for SHFormatDateTime().
by Alexandre Julliard Sept. 1, 2021

Sept. 1, 2021

Module: wine Branch: master Commit: b1f4423bc1e305146f82d229ebab4d558131fe82 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b1f4423bc1e305146f82d229… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Sep 1 11:47:26 2021 +0200 shlwapi/tests: Test a NULL flags pointer for SHFormatDateTime(). It's equivalent to FDTF_DEFAULT. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shlwapi/tests/ordinal.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/dlls/shlwapi/tests/ordinal.c b/dlls/shlwapi/tests/ordinal.c index bf43d35b1c2..bf34cdce7ef 100644 --- a/dlls/shlwapi/tests/ordinal.c +++ b/dlls/shlwapi/tests/ordinal.c @@ -1718,6 +1718,21 @@ if (0) ok(GetLastError() == 0xdeadbeef, "expected 0xdeadbeef, got %d\n", GetLastError()); + flags = FDTF_DEFAULT; + ret = pSHFormatDateTimeA(&filetime, &flags, buff, sizeof(buff)); + ok(ret == lstrlenA(buff)+1, "got %d\n", ret); + + buff2[0] = '\0'; + flags = FDTF_SHORTDATE | FDTF_SHORTTIME; + ret = pSHFormatDateTimeA(&filetime, &flags, buff2, sizeof(buff2)); + ok(ret == lstrlenA(buff2)+1, "got %d\n", ret); + ok(lstrcmpA(buff, buff2) == 0, "expected (%s), got (%s)\n", buff, buff2); + + buff2[0] = '\0'; + ret = pSHFormatDateTimeA(&filetime, NULL, buff2, sizeof(buff2)); + ok(ret == lstrlenA(buff2)+1, "got %d\n", ret); + ok(lstrcmpA(buff, buff2) == 0, "expected (%s), got (%s)\n", buff, buff2); + /* now check returned strings */ flags = FDTF_NOAUTOREADINGORDER | FDTF_SHORTTIME; ret = pSHFormatDateTimeA(&filetime, &flags, buff, sizeof(buff));

1 0

Anton Baskanov : wined3d: Fix the odd line condition in gen_yv12_read().
by Alexandre Julliard Sept. 1, 2021

Sept. 1, 2021

Module: wine Branch: master Commit: f4d2bdddcac7ca4a13b857ebc1e92ae45cb481c4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f4d2bdddcac7ca4a13b857eb… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Tue Aug 31 23:26:24 2021 +0700 wined3d: Fix the odd line condition in gen_yv12_read(). Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 5ae90148dc8..c760d519b30 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -12621,8 +12621,10 @@ static void gen_yv12_read(struct wined3d_string_buffer *buffer, * Don't forget to clamp the y values in into the range, otherwise we'll * get filtering bleeding. */ - /* Read odd lines from the right side (add 0.5 to the x coordinate). */ - shader_addline(buffer, " if (fract(floor(texcoord.y * size.y) * 0.5 + 1.0 / 6.0) >= 0.5)\n"); + /* Read odd lines from the right side (add 0.5 to the x coordinate). Keep + * in mind that each line of the chroma plane corresponds to 2 lines of the + * resulting image. */ + shader_addline(buffer, " if (fract(floor(texcoord.y * size.y) * 0.25 + 1.0 / 6.0) >= 0.5)\n"); shader_addline(buffer, " texcoord.x += 0.5;\n"); /* Clamp, keep the half pixel origin in mind. */

1 0

Chip Davis : winemac.drv: Set the surface contents directly to the layer.
by Alexandre Julliard Sept. 1, 2021

Sept. 1, 2021

Module: wine Branch: master Commit: 9e599a89e30c9ae403f5c7861e0f7690a03c4e22 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9e599a89e30c9ae403f5c786… Author: Chip Davis <cdavis(a)codeweavers.com> Date: Wed Sep 1 09:28:23 2021 -0500 winemac.drv: Set the surface contents directly to the layer. Use a top-down DIB for the surface instead of a bottom-up DIB. This seems to match better with how Core Graphics expects to receive image data, and allows us to avoid a transform to flip the surface image. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/cocoa_window.m | 86 +++++++++++++++++++++++++++++++++-------- dlls/winemac.drv/macdrv_cocoa.h | 3 +- dlls/winemac.drv/surface.c | 42 ++++++++++++++------ 3 files changed, 101 insertions(+), 30 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9e599a89e30c9ae403f5…

1 0