- Wine-Commits - list.winehq.org

Alexandre Julliard : makedep: Remove the -R option.
by Alexandre Julliard June 26, 2024

June 26, 2024

Module: wine Branch: master Commit: 29555a1feacaa2b13eee8aad334cde059a5ac702 URL: https://gitlab.winehq.org/wine/wine/-/commit/29555a1feacaa2b13eee8aad334cde… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 26 10:31:27 2024 +0200 makedep: Remove the -R option. --- tools/makedep.c | 69 ++++----------------------------------------------------- 1 file changed, 4 insertions(+), 65 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index cf22bc7bf07..a1534e8e9da 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -240,16 +240,14 @@ static const char *output_makefile_name = "Makefile"; static const char *input_file_name; static const char *output_file_name; static const char *temp_file_name; -static int relative_dir_mode; static int silent_rules; static int input_line; static int output_column; static FILE *output_file; static const char Usage[] = - "Usage: makedep [options] [directories]\n" + "Usage: makedep [options]\n" "Options:\n" - " -R from to Compute the relative path between two directories\n" " -S Generate Automake-style silent rules\n" " -fxxx Store output in file 'xxx' (default: Makefile)\n"; @@ -493,52 +491,6 @@ static char *replace_substr( const char *str, const char *start, size_t len, con } -/******************************************************************* - * get_relative_path - * - * Determine where the destination path is located relative to the 'from' path. - */ -static char *get_relative_path( const char *from, const char *dest ) -{ - const char *start; - char *ret, *p; - unsigned int dotdots = 0; - - /* a path of "." is equivalent to an empty path */ - if (!strcmp( from, "." )) from = ""; - - for (;;) - { - while (*from == '/') from++; - while (*dest == '/') dest++; - start = dest; /* save start of next path element */ - if (!*from) break; - - while (*from && *from != '/' && *from == *dest) { from++; dest++; } - if ((!*from || *from == '/') && (!*dest || *dest == '/')) continue; - - /* count remaining elements in 'from' */ - do - { - dotdots++; - while (*from && *from != '/') from++; - while (*from == '/') from++; - } - while (*from); - break; - } - - if (!start[0] && !dotdots) return NULL; /* empty path */ - - ret = xmalloc( 3 * dotdots + strlen( start ) + 1 ); - for (p = ret; dotdots; dotdots--, p += 3) memcpy( p, "../", 3 ); - - if (start[0]) strcpy( p, start ); - else p[-1] = 0; /* remove trailing slash */ - return ret; -} - - /******************************************************************* * get_root_relative_path * @@ -4432,9 +4384,6 @@ static int parse_option( const char *opt ) case 'f': if (opt[2]) output_makefile_name = opt + 2; break; - case 'R': - relative_dir_mode = 1; - break; case 'S': silent_rules = 1; break; @@ -4479,22 +4428,12 @@ int main( int argc, char *argv[] ) else i++; } - if (relative_dir_mode) + if (argc > 1) { - char *relpath; - - if (argc != 3) - { - fprintf( stderr, "Option -R needs two directories\n%s", Usage ); - exit( 1 ); - } - relpath = get_relative_path( argv[1], argv[2] ); - printf( "%s\n", relpath ? relpath : "." ); - exit( 0 ); + fprintf( stderr, "Unknown argument '%s'\n%s", argv[1], Usage ); + exit(1); } - if (argc > 1) fatal_error( "Directory arguments not supported in this mode\n" ); - atexit( cleanup_files ); init_signals( exit_on_signal );

1 0

Alexandre Julliard : configure: Disable non-PE import libraries if compiler support is missing.
by Alexandre Julliard June 26, 2024

June 26, 2024

Module: wine Branch: master Commit: 84d8a24af71d79ddc0fa1122c168816e04e9075d URL: https://gitlab.winehq.org/wine/wine/-/commit/84d8a24af71d79ddc0fa1122c16881… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 26 10:27:15 2024 +0200 configure: Disable non-PE import libraries if compiler support is missing. --- configure | 18 ++++++++++-------- configure.ac | 19 +++++++++---------- 2 files changed, 19 insertions(+), 18 deletions(-) diff --git a/configure b/configure index c506c72ad8b..2373cf89da8 100755 --- a/configure +++ b/configure @@ -20253,16 +20253,14 @@ if test "x$ac_cv_cflags__Wno_format" = xyes then : EXTRACFLAGS="$EXTRACFLAGS -Wno-format" fi ;; - *) if test -z "$PE_ARCHS" - then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for working -mabi=ms" >&5 + *) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for working -mabi=ms" >&5 printf %s "checking for working -mabi=ms... " >&6; } if test ${ac_cv_mabi_ms+y} then : printf %s "(cached) " >&6 else $as_nop CFLAGS="$CFLAGS -mabi=ms" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <stdarg.h> int a(int b, ...) { __builtin_ms_va_list list; __builtin_ms_va_start(list,b); } @@ -20281,13 +20279,17 @@ else $as_nop ac_cv_mabi_ms=no fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext - CFLAGS=$saved_CFLAGS + CFLAGS=$saved_CFLAGS fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_mabi_ms" >&5 printf "%s\n" "$ac_cv_mabi_ms" >&6; } - test $ac_cv_mabi_ms = yes || as_fn_error $? "The compiler doesn't support -mabi=ms. Use gcc instead of clang, or install mingw-w64." "$LINENO" 5 - fi - MSVCRTFLAGS="$MSVCRTFLAGS -mabi=ms" ;; + if test "x$ac_cv_mabi_ms" = xyes +then : + MSVCRTFLAGS="$MSVCRTFLAGS -mabi=ms" +else $as_nop + test -n "$PE_ARCHS" || as_fn_error $? "The compiler doesn't support -mabi=ms. Use gcc instead of clang, or install mingw-w64." "$LINENO" 5 + DLLEXT="" +fi ;; esac ;; arm) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wincompatible-function-pointer-types" >&5 diff --git a/configure.ac b/configure.ac index 7fe5477daf7..43bba37a39b 100644 --- a/configure.ac +++ b/configure.ac @@ -1966,17 +1966,16 @@ char*f(const char *h,char n) {return strchr(h,n);}]])],[ac_cv_c_logicalop_noisy= dnl Mingw uses Windows 64-bit types, not Unix ones cygwin*|mingw32*) WINE_TRY_CFLAGS([-Wno-format]) ;; dnl Default to ms_abi on 64-bit - *) if test -z "$PE_ARCHS" - then - AC_CACHE_CHECK([for working -mabi=ms], ac_cv_mabi_ms, - [CFLAGS="$CFLAGS -mabi=ms" - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdarg.h> + *) AC_CACHE_CHECK([for working -mabi=ms], ac_cv_mabi_ms, + [CFLAGS="$CFLAGS -mabi=ms" + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdarg.h> int a(int b, ...) { __builtin_ms_va_list list; __builtin_ms_va_start(list,b); }]])], - [ac_cv_mabi_ms=yes],[ac_cv_mabi_ms=no]) - CFLAGS=$saved_CFLAGS]) - test $ac_cv_mabi_ms = yes || AC_MSG_ERROR([The compiler doesn't support -mabi=ms. Use gcc instead of clang, or install mingw-w64.]) - fi - MSVCRTFLAGS="$MSVCRTFLAGS -mabi=ms" ;; + [ac_cv_mabi_ms=yes],[ac_cv_mabi_ms=no]) + CFLAGS=$saved_CFLAGS]) + AS_VAR_IF([ac_cv_mabi_ms],[yes], + [MSVCRTFLAGS="$MSVCRTFLAGS -mabi=ms"], + [test -n "$PE_ARCHS" || AC_MSG_ERROR([The compiler doesn't support -mabi=ms. Use gcc instead of clang, or install mingw-w64.]) + DLLEXT=""]) ;; esac ;; arm) WINE_TRY_CFLAGS([-Wincompatible-function-pointer-types],[EXTRACFLAGS="$EXTRACFLAGS -Wno-error=incompatible-function-pointer-types"]) ;;

1 0

Alistair Leslie-Hughes : msado15: Support interface ADOCommandConstruction in _Command.
by Alexandre Julliard June 26, 2024

June 26, 2024

Module: wine Branch: master Commit: d7ad75e2d4de3a3b71e74648c6700a3b0170f276 URL: https://gitlab.winehq.org/wine/wine/-/commit/d7ad75e2d4de3a3b71e74648c6700a… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Jun 25 20:32:16 2024 +1000 msado15: Support interface ADOCommandConstruction in _Command. --- dlls/msado15/command.c | 66 ++++++++++++++++++++++++++++++++++++++++++++ dlls/msado15/tests/msado15.c | 5 ++++ 2 files changed, 71 insertions(+) diff --git a/dlls/msado15/command.c b/dlls/msado15/command.c index 152528308e0..762a13c8776 100644 --- a/dlls/msado15/command.c +++ b/dlls/msado15/command.c @@ -32,6 +32,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(msado15); struct command { _Command Command_iface; + ADOCommandConstruction ADOCommandConstruction_iface; LONG ref; CommandTypeEnum type; BSTR text; @@ -43,8 +44,14 @@ static inline struct command *impl_from_Command( _Command *iface ) return CONTAINING_RECORD( iface, struct command, Command_iface ); } +static inline struct command *impl_from_ADOCommandConstruction( ADOCommandConstruction *iface ) +{ + return CONTAINING_RECORD( iface, struct command, ADOCommandConstruction_iface ); +} + static HRESULT WINAPI command_QueryInterface( _Command *iface, REFIID riid, void **obj ) { + struct command *command = impl_from_Command( iface ); TRACE( "%p, %s, %p\n", iface, debugstr_guid(riid), obj ); *obj = NULL; @@ -58,6 +65,10 @@ static HRESULT WINAPI command_QueryInterface( _Command *iface, REFIID riid, void { *obj = iface; } + else if (IsEqualIID(riid, &IID_ADOCommandConstruction)) + { + *obj = &command->ADOCommandConstruction_iface; + } else { FIXME( "interface %s not implemented\n", debugstr_guid(riid) ); @@ -374,12 +385,67 @@ static const struct _CommandVtbl command_vtbl = command_get_NamedParameters }; +static HRESULT WINAPI construction_QueryInterface(ADOCommandConstruction *iface, REFIID riid, void **obj) +{ + TRACE( "%p, %s, %p\n", iface, debugstr_guid(riid), obj ); + + *obj = NULL; + + if (IsEqualIID(riid, &IID_IUnknown) || + IsEqualIID(riid, &IID_ADOCommandConstruction)) + { + *obj = iface; + } + else + { + FIXME( "interface %s not implemented\n", debugstr_guid(riid) ); + return E_NOINTERFACE; + } + + ADOCommandConstruction_AddRef( iface ); + return S_OK; +} + +static ULONG WINAPI construction_AddRef(ADOCommandConstruction *iface) +{ + struct command *command = impl_from_ADOCommandConstruction( iface ); + return _Command_AddRef(&command->Command_iface); +} + +static ULONG WINAPI construction_Release(ADOCommandConstruction *iface) +{ + struct command *command = impl_from_ADOCommandConstruction( iface ); + return _Command_Release(&command->Command_iface); +} + +static HRESULT WINAPI construction_get_OLEDBCommand(ADOCommandConstruction *iface, IUnknown **command) +{ + FIXME("%p, %p\n", iface, command); + return E_NOTIMPL; +} + +static HRESULT WINAPI construction_put_OLEDBCommand(ADOCommandConstruction *iface, IUnknown *command) +{ + FIXME("%p, %p\n", iface, command); + return E_NOTIMPL; +} + +static ADOCommandConstructionVtbl construct_vtbl = +{ + construction_QueryInterface, + construction_AddRef, + construction_Release, + construction_get_OLEDBCommand, + construction_put_OLEDBCommand +}; + HRESULT Command_create( void **obj ) { struct command *command; if (!(command = malloc( sizeof(*command) ))) return E_OUTOFMEMORY; command->Command_iface.lpVtbl = &command_vtbl; + command->ADOCommandConstruction_iface.lpVtbl = &construct_vtbl; command->type = adCmdUnknown; command->text = NULL; command->connection = NULL; diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index b6c1c391e71..8826fb5b0e8 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -1331,6 +1331,7 @@ static void test_Command(void) CommandTypeEnum cmd_type = adCmdUnspecified; BSTR cmd_text = (BSTR)"test"; _Connection *connection; + ADOCommandConstruction *adocommand; hr = CoCreateInstance( &CLSID_Command, NULL, CLSCTX_INPROC_SERVER, &IID__Command, (void **)&command ); ok( hr == S_OK, "got %08lx\n", hr ); @@ -1347,6 +1348,10 @@ static void test_Command(void) ok( hr == S_OK, "got %08lx\n", hr ); Command25_Release( command25 ); + hr = _Command_QueryInterface( command, &IID_ADOCommandConstruction, (void **)&adocommand ); + ok( hr == S_OK, "got %08lx\n", hr ); + ADOCommandConstruction_Release( adocommand ); + hr = _Command_get_CommandType( command, &cmd_type ); ok( hr == S_OK, "got %08lx\n", hr ); ok( cmd_type == adCmdUnknown, "got %08x\n", cmd_type );

1 0

Elizabeth Figura : quartz: Implement IVMRWindowlessControl::GetNativeVideoSize().
by Alexandre Julliard June 26, 2024

June 26, 2024

Module: wine Branch: master Commit: 2b6035fcff40fa9ccc1f74e9afa2fac42b80ab4a URL: https://gitlab.winehq.org/wine/wine/-/commit/2b6035fcff40fa9ccc1f74e9afa2fa… Author: Elizabeth Figura <zfigura(a)codeweavers.com> Date: Tue Jun 25 19:03:04 2024 -0500 quartz: Implement IVMRWindowlessControl::GetNativeVideoSize(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54935 --- dlls/quartz/tests/vmr7.c | 12 ++++++------ dlls/quartz/vmr7_presenter.c | 25 +++++++++++++++++++++++-- 2 files changed, 29 insertions(+), 8 deletions(-) diff --git a/dlls/quartz/tests/vmr7.c b/dlls/quartz/tests/vmr7.c index 23bcbdce790..ff15ad9c81d 100644 --- a/dlls/quartz/tests/vmr7.c +++ b/dlls/quartz/tests/vmr7.c @@ -3895,15 +3895,15 @@ static void test_default_presenter_window(void) width = height = 0xdeadbeef; hr = IVMRWindowlessControl_GetNativeVideoSize(control, &width, &height, NULL, NULL); - todo_wine ok(hr == S_OK, "Got hr %#lx.\n", hr); - todo_wine ok(width == 420, "Got width %ld.\n", width); - todo_wine ok(height == 180, "Got height %ld.\n", height); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(width == 420, "Got width %ld.\n", width); + ok(height == 180, "Got height %ld.\n", height); width = height = 0xdeadbeef; hr = IVMRWindowlessControl_GetNativeVideoSize(control, NULL, NULL, &width, &height); - todo_wine ok(hr == S_OK, "Got hr %#lx.\n", hr); - todo_wine ok(width == 400, "Got width %ld.\n", width); - todo_wine ok(height == 200, "Got height %ld.\n", height); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(width == 400, "Got width %ld.\n", width); + ok(height == 200, "Got height %ld.\n", height); hr = IVMRSurfaceAllocator_FreeSurface(allocator, 0); ok(hr == S_OK, "Got hr %#lx.\n", hr); diff --git a/dlls/quartz/vmr7_presenter.c b/dlls/quartz/vmr7_presenter.c index 406c9ead52a..c244c86236a 100644 --- a/dlls/quartz/vmr7_presenter.c +++ b/dlls/quartz/vmr7_presenter.c @@ -35,6 +35,8 @@ struct vmr7_presenter IDirectDrawSurface7 *frontbuffer; IDirectDrawSurface7 *primary; HWND window; + + SIZE native_size, aspect_ratio; }; static struct vmr7_presenter *impl_from_IVMRImagePresenter(IVMRImagePresenter *iface) @@ -213,6 +215,10 @@ static HRESULT WINAPI surface_allocator_AllocateSurface(IVMRSurfaceAllocator *if } *surface = presenter->frontbuffer; ++*count; + + presenter->native_size = info->szNativeSize; + presenter->aspect_ratio = info->szAspectRatio; + return S_OK; } @@ -286,9 +292,24 @@ static ULONG WINAPI windowless_control_Release(IVMRWindowlessControl *iface) static HRESULT WINAPI windowless_control_GetNativeVideoSize(IVMRWindowlessControl *iface, LONG *width, LONG *height, LONG *aspect_width, LONG *aspect_height) { - FIXME("iface %p, width %p, height %p, aspect_width %p, aspect_height %p.\n", + struct vmr7_presenter *presenter = impl_from_IVMRWindowlessControl(iface); + + TRACE("iface %p, width %p, height %p, aspect_width %p, aspect_height %p.\n", iface, width, height, aspect_width, aspect_height); - return E_NOTIMPL; + + if (width) + *width = presenter->native_size.cx; + if (height) + *height = presenter->native_size.cy; + if (aspect_width) + *aspect_width = presenter->aspect_ratio.cx; + if (aspect_height) + *aspect_height = presenter->aspect_ratio.cy; + + TRACE("Returning size (%ld, %ld), aspect ratio (%ld, %ld).\n", + presenter->native_size.cx, presenter->native_size.cy, + presenter->aspect_ratio.cx, presenter->aspect_ratio.cy); + return S_OK; } static HRESULT WINAPI windowless_control_GetMinIdealVideoSize(

1 0

Elizabeth Figura : quartz/tests: Test IVMRWindowlessControl::GetNativeWindowSize() on the default presenter.
by Alexandre Julliard June 26, 2024

June 26, 2024

Module: wine Branch: master Commit: 626b0faf30f3315bd413903303cb6ee093936f1e URL: https://gitlab.winehq.org/wine/wine/-/commit/626b0faf30f3315bd413903303cb6e… Author: Elizabeth Figura <zfigura(a)codeweavers.com> Date: Tue Jun 25 19:01:20 2024 -0500 quartz/tests: Test IVMRWindowlessControl::GetNativeWindowSize() on the default presenter. --- dlls/quartz/tests/vmr7.c | 64 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) diff --git a/dlls/quartz/tests/vmr7.c b/dlls/quartz/tests/vmr7.c index d35f4d5c01c..23bcbdce790 100644 --- a/dlls/quartz/tests/vmr7.c +++ b/dlls/quartz/tests/vmr7.c @@ -3850,6 +3850,69 @@ static void test_default_presenter_allocate(void) DestroyWindow(window); } +static void test_default_presenter_window(void) +{ + IDirectDrawSurface7 *frontbuffer; + IVMRSurfaceAllocator *allocator; + IVMRWindowlessControl *control; + VMRALLOCATIONINFO info; + LONG width, height; + DWORD count; + HRESULT hr; + LONG ref; + + BITMAPINFOHEADER bitmap_header = + { + .biSize = sizeof(BITMAPINFOHEADER), + .biWidth = 320, + .biHeight = 240, + .biCompression = BI_RGB, + .biBitCount = 32, + .biPlanes = 1, + }; + + hr = CoCreateInstance(&CLSID_AllocPresenter, NULL, CLSCTX_INPROC_SERVER, + &IID_IVMRSurfaceAllocator, (void **)&allocator); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + count = 2; + info.dwFlags = AMAP_DIRECTED_FLIP | AMAP_ALLOW_SYSMEM; + info.dwMinBuffers = count; + info.dwMaxBuffers = count; + info.dwInterlaceFlags = 0; + info.szNativeSize.cx = 420; + info.szAspectRatio.cx = 400; + info.szNativeSize.cy = 180; + info.szAspectRatio.cy = 200; + info.lpHdr = &bitmap_header; + info.lpPixFmt = NULL; + + hr = IVMRSurfaceAllocator_AllocateSurface(allocator, 0, &info, &count, &frontbuffer); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + hr = IVMRSurfaceAllocator_QueryInterface(allocator, &IID_IVMRWindowlessControl, (void **)&control); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + width = height = 0xdeadbeef; + hr = IVMRWindowlessControl_GetNativeVideoSize(control, &width, &height, NULL, NULL); + todo_wine ok(hr == S_OK, "Got hr %#lx.\n", hr); + todo_wine ok(width == 420, "Got width %ld.\n", width); + todo_wine ok(height == 180, "Got height %ld.\n", height); + + width = height = 0xdeadbeef; + hr = IVMRWindowlessControl_GetNativeVideoSize(control, NULL, NULL, &width, &height); + todo_wine ok(hr == S_OK, "Got hr %#lx.\n", hr); + todo_wine ok(width == 400, "Got width %ld.\n", width); + todo_wine ok(height == 200, "Got height %ld.\n", height); + + hr = IVMRSurfaceAllocator_FreeSurface(allocator, 0); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + IVMRWindowlessControl_Release(control); + ref = IVMRSurfaceAllocator_Release(allocator); + ok(!ref, "Got outstanding refcount %ld.\n", ref); +} + START_TEST(vmr7) { CoInitialize(NULL); @@ -3870,6 +3933,7 @@ START_TEST(vmr7) test_windowless_size(); test_unconnected_eos(); test_default_presenter_allocate(); + test_default_presenter_window(); test_renderless_formats(); CoUninitialize();

1 0

Danyil Blyschak : gdi32/uniscribe: Ensure the cache is initialised.
by Alexandre Julliard June 25, 2024

June 25, 2024

Module: wine Branch: master Commit: 09a6d0f2913b064e09ed0bdc27b7bbc17a5fb0fc URL: https://gitlab.winehq.org/wine/wine/-/commit/09a6d0f2913b064e09ed0bdc27b7bb… Author: Danyil Blyschak <dblyschak(a)codeweavers.com> Date: Mon Jun 24 12:45:10 2024 -0500 gdi32/uniscribe: Ensure the cache is initialised. Call init_script_cache() in ScriptTextOut() to ensure that a cache exists for the logic around the ETO_GLYPH_INDEX flag. --- dlls/gdi32/uniscribe/usp10.c | 3 ++- dlls/usp10/tests/usp10.c | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/gdi32/uniscribe/usp10.c b/dlls/gdi32/uniscribe/usp10.c index 72e75224069..1fda1841533 100644 --- a/dlls/gdi32/uniscribe/usp10.c +++ b/dlls/gdi32/uniscribe/usp10.c @@ -3510,7 +3510,7 @@ HRESULT WINAPI ScriptTextOut(const HDC hdc, SCRIPT_CACHE *psc, int x, int y, UIN int iReserved, const WORD *pwGlyphs, int cGlyphs, const int *piAdvance, const int *piJustify, const GOFFSET *pGoffset) { - HRESULT hr = S_OK; + HRESULT hr; INT i, dir = 1; INT *lpDx; WORD *reordered_glyphs = (WORD *)pwGlyphs; @@ -3521,6 +3521,7 @@ HRESULT WINAPI ScriptTextOut(const HDC hdc, SCRIPT_CACHE *psc, int x, int y, UIN if (!hdc || !psc) return E_INVALIDARG; if (!piAdvance || !psa || !pwGlyphs) return E_INVALIDARG; + if ((hr = init_script_cache(hdc, psc)) != S_OK) return hr; fuOptions &= ETO_CLIPPED | ETO_OPAQUE; fuOptions |= ETO_IGNORELANGUAGE; diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index 7516bfb2a97..92b26e56392 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -2777,6 +2777,7 @@ static void test_ScriptTextOut(HDC hdc) hr = ScriptTextOut(hdc, &psc, 0, 0, 0, NULL, &pItem[0].a, NULL, 0, pwOutGlyphs1, pcGlyphs, piAdvance, NULL, pGoffset); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(!!psc, "Got unexpected psc %p.\n", psc); /* Test Rect Rgn is acceptable. */ SetRect(&rect, 10, 10, 40, 20);

1 0

Rémi Bernon : winemac: Remove now unnecessary cocoa window surface pointer.
by Alexandre Julliard June 25, 2024

June 25, 2024

Module: wine Branch: master Commit: 22c517319aca0ac4e5d5897d0a1411c3445d37f3 URL: https://gitlab.winehq.org/wine/wine/-/commit/22c517319aca0ac4e5d5897d0a1411… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Jun 21 10:15:12 2024 +0200 winemac: Remove now unnecessary cocoa window surface pointer. --- dlls/winemac.drv/cocoa_window.h | 3 --- dlls/winemac.drv/cocoa_window.m | 19 +------------------ dlls/winemac.drv/macdrv_cocoa.h | 1 - dlls/winemac.drv/surface.c | 1 - dlls/winemac.drv/window.c | 1 - 5 files changed, 1 insertion(+), 24 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.h b/dlls/winemac.drv/cocoa_window.h index 9539e4ebdd7..b5168d0c128 100644 --- a/dlls/winemac.drv/cocoa_window.h +++ b/dlls/winemac.drv/cocoa_window.h @@ -44,9 +44,6 @@ void* hwnd; WineEventQueue* queue; - void* surface; - pthread_mutex_t* surface_mutex; - CGDirectDisplayID _lastDisplayID; NSTimeInterval _lastDisplayTime; diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 8889e83bc8c..caf06ff338f 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -410,8 +410,6 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi @property (nonatomic) void* hwnd; @property (retain, readwrite, nonatomic) WineEventQueue* queue; -(a)property (nonatomic) void* surface; - @property (nonatomic) BOOL shapeChangedSinceLastDraw; @property (readonly, nonatomic) BOOL needsTransparency; @@ -527,7 +525,7 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi if ([window contentView] != self) return; - if (window.closing || !window.surface) + if (window.closing) return; imageRect = layer.bounds; @@ -1021,7 +1019,6 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi @synthesize disabled, noForeground, preventsAppActivation, floating, fullscreen, fakingClose, closing, latentParentWindow, hwnd, queue; @synthesize drawnSinceShown; - @synthesize surface; @synthesize shapeChangedSinceLastDraw; @synthesize colorKeyed, colorKeyRed, colorKeyGreen, colorKeyBlue; @synthesize usePerPixelAlpha; @@ -3500,20 +3497,6 @@ void macdrv_set_cocoa_parent_window(macdrv_window w, macdrv_window parent) }); } -/*********************************************************************** - * macdrv_set_window_surface - */ -void macdrv_set_window_surface(macdrv_window w, struct window_surface *window_surface) -{ -(a)autoreleasepool -{ - WineWindow* window = (WineWindow*)w; - - OnMainThread(^{ - window.surface = window_surface; - }); -} -} /*********************************************************************** * macdrv_window_set_color_image diff --git a/dlls/winemac.drv/macdrv_cocoa.h b/dlls/winemac.drv/macdrv_cocoa.h index 31159ab060d..30ab06c3662 100644 --- a/dlls/winemac.drv/macdrv_cocoa.h +++ b/dlls/winemac.drv/macdrv_cocoa.h @@ -552,7 +552,6 @@ extern void macdrv_hide_cocoa_window(macdrv_window w); extern void macdrv_set_cocoa_window_frame(macdrv_window w, const CGRect* new_frame); extern void macdrv_get_cocoa_window_frame(macdrv_window w, CGRect* out_frame); extern void macdrv_set_cocoa_parent_window(macdrv_window w, macdrv_window parent); -extern void macdrv_set_window_surface(macdrv_window w, struct window_surface *window_surface); extern void macdrv_window_set_color_image(macdrv_window w, CGImageRef image, CGRect rect, CGRect dirty); extern void macdrv_set_window_shape(macdrv_window w, const CGRect *rects, int count); extern void macdrv_set_window_alpha(macdrv_window w, CGFloat alpha); diff --git a/dlls/winemac.drv/surface.c b/dlls/winemac.drv/surface.c index f3d48ab194f..4dc15770853 100644 --- a/dlls/winemac.drv/surface.c +++ b/dlls/winemac.drv/surface.c @@ -317,7 +317,6 @@ BOOL macdrv_CreateLayeredWindow(HWND hwnd, const RECT *window_rect, COLORREF col if (!surface || !EqualRect(&surface->rect, &rect)) { data->surface = create_surface(data->hwnd, data->cocoa_window, &rect, NULL, TRUE); - macdrv_set_window_surface(data->cocoa_window, data->surface); if (surface) window_surface_release(surface); surface = data->surface; if (data->unminimized_surface) diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index 35198f45607..36f3e3053d6 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -2011,7 +2011,6 @@ void macdrv_WindowPosChanged(HWND hwnd, HWND insert_after, UINT swp_flags, } else { - macdrv_set_window_surface(data->cocoa_window, surface); if (data->unminimized_surface) { window_surface_release(data->unminimized_surface);

1 0

Rémi Bernon : winemac: Push window surface image updates to the main thread.
by Alexandre Julliard June 25, 2024

June 25, 2024

Module: wine Branch: master Commit: 66051c2aa1e8f4d42426cb588da26f398e0dfe6b URL: https://gitlab.winehq.org/wine/wine/-/commit/66051c2aa1e8f4d42426cb588da26f… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Jun 6 08:36:07 2024 +0200 winemac: Push window surface image updates to the main thread. --- dlls/winemac.drv/cocoa_window.m | 44 +++++++++++++++++++++----- dlls/winemac.drv/macdrv_cocoa.h | 4 +-- dlls/winemac.drv/surface.c | 69 +++++------------------------------------ 3 files changed, 46 insertions(+), 71 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index e370ea81334..8889e83bc8c 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -365,6 +365,8 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi @interface WineContentView : WineBaseView <NSTextInputClient, NSViewLayerContentScaleDelegate> { + CGImageRef colorImage; + NSMutableArray* glContexts; NSMutableArray* pendingGlContexts; BOOL _everHadGLContext; @@ -501,6 +503,7 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi [markedText release]; [glContexts release]; [pendingGlContexts release]; + CGImageRelease(colorImage); [super dealloc]; } @@ -517,7 +520,7 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi - (void) updateLayer { WineWindow* window = (WineWindow*)[self window]; - CGImageRef image = NULL; + CGImageRef image; CGRect imageRect; CALayer* layer = [self layer]; @@ -532,8 +535,22 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi imageRect.origin.y *= layer.contentsScale; imageRect.size.width *= layer.contentsScale; imageRect.size.height *= layer.contentsScale; - image = macdrv_get_surface_display_image(window.surface, &imageRect, window.colorKeyed, - window.colorKeyRed, window.colorKeyGreen, window.colorKeyBlue); + + image = CGImageCreateWithImageInRect(colorImage, imageRect); + + if (window.colorKeyed) + { + CGImageRef maskedImage; + CGFloat components[] = { window.colorKeyRed - 0.5, window.colorKeyRed + 0.5, + window.colorKeyGreen - 0.5, window.colorKeyGreen + 0.5, + window.colorKeyBlue - 0.5, window.colorKeyBlue + 0.5 }; + maskedImage = CGImageCreateWithMaskingColors(image, components); + if (maskedImage) + { + CGImageRelease(image); + image = maskedImage; + } + } if (image) { @@ -552,6 +569,12 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi } } + - (void) setColorImage:(CGImageRef)image + { + CGImageRelease(colorImage); + colorImage = CGImageRetain(image); + } + - (void) viewWillDraw { [super viewWillDraw]; @@ -3493,19 +3516,26 @@ void macdrv_set_window_surface(macdrv_window w, struct window_surface *window_su } /*********************************************************************** - * macdrv_window_needs_display + * macdrv_window_set_color_image * - * Mark a window as needing display in a specified rect (in non-client + * Push a window surface color pixel update in a specified rect (in non-client * area coordinates). */ -void macdrv_window_needs_display(macdrv_window w, CGRect rect) +void macdrv_window_set_color_image(macdrv_window w, CGImageRef image, CGRect rect, CGRect dirty) { @autoreleasepool { WineWindow* window = (WineWindow*)w; + CGImageRetain(image); + OnMainThreadAsync(^{ - [[window contentView] setNeedsDisplayInRect:NSRectFromCGRect(cgrect_mac_from_win(rect))]; + WineContentView *view = [window contentView]; + + [view setColorImage:image]; + [view setNeedsDisplayInRect:NSRectFromCGRect(cgrect_mac_from_win(dirty))]; + + CGImageRelease(image); }); } } diff --git a/dlls/winemac.drv/macdrv_cocoa.h b/dlls/winemac.drv/macdrv_cocoa.h index bdc7d9980e1..31159ab060d 100644 --- a/dlls/winemac.drv/macdrv_cocoa.h +++ b/dlls/winemac.drv/macdrv_cocoa.h @@ -553,9 +553,7 @@ extern void macdrv_set_cocoa_window_frame(macdrv_window w, const CGRect* new_fra extern void macdrv_get_cocoa_window_frame(macdrv_window w, CGRect* out_frame); extern void macdrv_set_cocoa_parent_window(macdrv_window w, macdrv_window parent); extern void macdrv_set_window_surface(macdrv_window w, struct window_surface *window_surface); -extern CGImageRef macdrv_get_surface_display_image(struct window_surface *window_surface, CGRect *rect, int color_keyed, - CGFloat key_red, CGFloat key_green, CGFloat key_blue); -extern void macdrv_window_needs_display(macdrv_window w, CGRect rect); +extern void macdrv_window_set_color_image(macdrv_window w, CGImageRef image, CGRect rect, CGRect dirty); extern void macdrv_set_window_shape(macdrv_window w, const CGRect *rects, int count); extern void macdrv_set_window_alpha(macdrv_window w, CGFloat alpha); extern void macdrv_set_window_color_key(macdrv_window w, CGFloat keyRed, CGFloat keyGreen, diff --git a/dlls/winemac.drv/surface.c b/dlls/winemac.drv/surface.c index 2565985088c..f3d48ab194f 100644 --- a/dlls/winemac.drv/surface.c +++ b/dlls/winemac.drv/surface.c @@ -53,12 +53,6 @@ static inline int get_dib_image_size(const BITMAPINFO *info) * abs(info->bmiHeader.biHeight); } -static inline void reset_bounds(RECT *bounds) -{ - bounds->left = bounds->top = INT_MAX; - bounds->right = bounds->bottom = INT_MIN; -} - struct macdrv_window_surface { @@ -66,7 +60,6 @@ struct macdrv_window_surface macdrv_window window; BOOL use_alpha; CGDataProviderRef provider; - CGImageRef color_image; BITMAPINFO info; /* variable size, must be last */ }; @@ -115,17 +108,18 @@ static BOOL macdrv_surface_flush(struct window_surface *window_surface, const RE CGImageAlphaInfo alpha_info = (surface->use_alpha ? kCGImageAlphaPremultipliedFirst : kCGImageAlphaNoneSkipFirst); BITMAPINFO *color_info = &surface->info; CGColorSpaceRef colorspace; - - if (surface->color_image) CGImageRelease(surface->color_image); + CGImageRef image; colorspace = CGColorSpaceCreateWithName(kCGColorSpaceSRGB); - surface->color_image = CGImageCreate(color_info->bmiHeader.biWidth, abs(color_info->bmiHeader.biHeight), 8, 32, - color_info->bmiHeader.biSizeImage / abs(color_info->bmiHeader.biHeight), colorspace, - alpha_info | kCGBitmapByteOrder32Little, surface->provider, NULL, retina_on, kCGRenderingIntentDefault); + image = CGImageCreate(color_info->bmiHeader.biWidth, abs(color_info->bmiHeader.biHeight), 8, 32, + color_info->bmiHeader.biSizeImage / abs(color_info->bmiHeader.biHeight), colorspace, + alpha_info | kCGBitmapByteOrder32Little, surface->provider, NULL, retina_on, kCGRenderingIntentDefault); CGColorSpaceRelease(colorspace); - macdrv_window_needs_display(surface->window, cgrect_from_rect(*dirty)); - return FALSE; /* bounds are reset asynchronously, from macdrv_get_surface_display_image */ + macdrv_window_set_color_image(surface->window, image, cgrect_from_rect(*rect), cgrect_from_rect(*dirty)); + CGImageRelease(image); + + return TRUE; } /*********************************************************************** @@ -136,7 +130,6 @@ static void macdrv_surface_destroy(struct window_surface *window_surface) struct macdrv_window_surface *surface = get_mac_surface(window_surface); TRACE("freeing %p\n", surface); - if (surface->color_image) CGImageRelease(surface->color_image); CGDataProviderRelease(surface->provider); free(surface); } @@ -231,52 +224,6 @@ void set_surface_use_alpha(struct window_surface *window_surface, BOOL use_alpha if (surface) surface->use_alpha = use_alpha; } -/*********************************************************************** - * create_surface_image - * - * Caller must hold the surface lock. On input, *rect is the requested - * image rect, relative to the window whole_rect, a.k.a. visible_rect. - * On output, it's been intersected with that part backed by the surface - * and is the actual size of the returned image. copy_data indicates if - * the caller will keep the returned image beyond the point where the - * surface bits can be guaranteed to remain valid and unchanged. If so, - * the bits are copied instead of merely referenced by the image. - * - * IMPORTANT: This function is called from non-Wine threads, so it - * must not use Win32 or Wine functions, including debug - * logging. - */ -CGImageRef macdrv_get_surface_display_image(struct window_surface *window_surface, CGRect *rect, int color_keyed, - CGFloat key_red, CGFloat key_green, CGFloat key_blue) -{ - CGImageRef cgimage = NULL; - struct macdrv_window_surface *surface = get_mac_surface(window_surface); - - pthread_mutex_lock(&window_surface->mutex); - if (surface->color_image && !IsRectEmpty(&window_surface->bounds)) - { - cgimage = CGImageCreateWithImageInRect(surface->color_image, *rect); - - if (color_keyed) - { - CGImageRef maskedImage; - CGFloat components[] = { key_red - 0.5, key_red + 0.5, - key_green - 0.5, key_green + 0.5, - key_blue - 0.5, key_blue + 0.5 }; - maskedImage = CGImageCreateWithMaskingColors(cgimage, components); - if (maskedImage) - { - CGImageRelease(cgimage); - cgimage = maskedImage; - } - } - } - - reset_bounds(&window_surface->bounds); - pthread_mutex_unlock(&window_surface->mutex); - return cgimage; -} - /*********************************************************************** * surface_clip_to_visible_rect *

1 0

Rémi Bernon : winemac: Remove unnecessary surface_clip_to_visible_rect.
by Alexandre Julliard June 25, 2024

June 25, 2024

Module: wine Branch: master Commit: 5e4a5b0be2aef7ddc38738d2c28de126eb437b00 URL: https://gitlab.winehq.org/wine/wine/-/commit/5e4a5b0be2aef7ddc38738d2c28de1… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Jun 21 10:15:49 2024 +0200 winemac: Remove unnecessary surface_clip_to_visible_rect. The surface bounds aren't used anyway and surface images are cropped to the UI layer extends, regardless of the dirty area. --- dlls/winemac.drv/surface.c | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/dlls/winemac.drv/surface.c b/dlls/winemac.drv/surface.c index 4dc15770853..8b68d5d0ab5 100644 --- a/dlls/winemac.drv/surface.c +++ b/dlls/winemac.drv/surface.c @@ -224,25 +224,6 @@ void set_surface_use_alpha(struct window_surface *window_surface, BOOL use_alpha if (surface) surface->use_alpha = use_alpha; } -/*********************************************************************** - * surface_clip_to_visible_rect - * - * Intersect the accumulated drawn region with a new visible rect, - * effectively discarding stale drawing in the surface slack area. - */ -static void surface_clip_to_visible_rect(struct window_surface *window_surface, const RECT *visible_rect) -{ - struct macdrv_window_surface *surface = get_mac_surface(window_surface); - RECT rect = *visible_rect; - OffsetRect(&rect, -rect.left, -rect.top); - - if (!surface) return; - - window_surface_lock(window_surface); - intersect_rect(&window_surface->bounds, &window_surface->bounds, &rect); - window_surface_unlock(window_surface); -} - static inline RECT get_surface_rect(const RECT *visible_rect) { @@ -279,7 +260,6 @@ BOOL macdrv_CreateWindowSurface(HWND hwnd, UINT swp_flags, const RECT *visible_r if (EqualRect(&data->surface->rect, &surface_rect)) { /* existing surface is good enough */ - surface_clip_to_visible_rect(data->surface, visible_rect); window_surface_add_ref(data->surface); *surface = data->surface; goto done;

1 0

Rémi Bernon : winemac: Create a provider for the surface and a HBITMAP wrapping it.
by Alexandre Julliard June 25, 2024

June 25, 2024

Module: wine Branch: master Commit: f8f93c9bfc2c9d574f58ce5fa40ccb3a71e0fcce URL: https://gitlab.winehq.org/wine/wine/-/commit/f8f93c9bfc2c9d574f58ce5fa40ccb… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Jun 19 15:45:25 2024 +0200 winemac: Create a provider for the surface and a HBITMAP wrapping it. --- dlls/winemac.drv/surface.c | 51 +++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 46 insertions(+), 5 deletions(-) diff --git a/dlls/winemac.drv/surface.c b/dlls/winemac.drv/surface.c index d70a8d993bb..e4b292ed539 100644 --- a/dlls/winemac.drv/surface.c +++ b/dlls/winemac.drv/surface.c @@ -65,11 +65,27 @@ struct macdrv_window_surface struct window_surface header; macdrv_window window; BOOL use_alpha; + CGDataProviderRef provider; BITMAPINFO info; /* variable size, must be last */ }; static struct macdrv_window_surface *get_mac_surface(struct window_surface *surface); +static CGDataProviderRef data_provider_create(size_t size, void **bits) +{ + CGDataProviderRef provider; + CFMutableDataRef data; + + if (!(data = CFDataCreateMutable(kCFAllocatorDefault, size))) return NULL; + CFDataSetLength(data, size); + + if ((provider = CGDataProviderCreateWithCFData(data))) + *bits = CFDataGetMutableBytePtr(data); + CFRelease(data); + + return provider; +} + /*********************************************************************** * macdrv_surface_get_bitmap_info */ @@ -107,6 +123,7 @@ static void macdrv_surface_destroy(struct window_surface *window_surface) struct macdrv_window_surface *surface = get_mac_surface(window_surface); TRACE("freeing %p\n", surface); + CGDataProviderRelease(surface->provider); free(surface); } @@ -130,11 +147,16 @@ static struct macdrv_window_surface *get_mac_surface(struct window_surface *surf static struct window_surface *create_surface(HWND hwnd, macdrv_window window, const RECT *rect, struct window_surface *old_surface, BOOL use_alpha) { - struct macdrv_window_surface *surface; + struct macdrv_window_surface *surface = NULL; int width = rect->right - rect->left, height = rect->bottom - rect->top; DWORD window_background; + D3DKMT_CREATEDCFROMMEMORY desc = {.Format = D3DDDIFMT_A8R8G8B8}; char buffer[FIELD_OFFSET(BITMAPINFO, bmiColors[256])]; BITMAPINFO *info = (BITMAPINFO *)buffer; + CGDataProviderRef provider; + HBITMAP bitmap = 0; + UINT status; + void *bits; memset(info, 0, sizeof(*info)); info->bmiHeader.biSize = sizeof(info->bmiHeader); @@ -145,14 +167,31 @@ static struct window_surface *create_surface(HWND hwnd, macdrv_window window, co info->bmiHeader.biSizeImage = get_dib_image_size(info); info->bmiHeader.biCompression = BI_RGB; - surface = calloc(1, FIELD_OFFSET(struct macdrv_window_surface, info.bmiColors[3])); - if (!surface) return NULL; - if (!window_surface_init(&surface->header, &macdrv_surface_funcs, hwnd, rect, info, 0)) goto failed; + if (!(provider = data_provider_create(info->bmiHeader.biSizeImage, &bits))) return NULL; + + /* wrap the data in a HBITMAP so we can write to the surface pixels directly */ + desc.Width = info->bmiHeader.biWidth; + desc.Height = abs(info->bmiHeader.biHeight); + desc.Pitch = info->bmiHeader.biSizeImage / abs(info->bmiHeader.biHeight); + desc.pMemory = bits; + desc.hDeviceDc = NtUserGetDCEx(hwnd, 0, DCX_CACHE | DCX_WINDOW); + if ((status = NtGdiDdDDICreateDCFromMemory(&desc))) + ERR("Failed to create HBITMAP, status %#x\n", status); + else + { + bitmap = desc.hBitmap; + NtGdiDeleteObjectApp(desc.hDc); + } + if (desc.hDeviceDc) NtUserReleaseDC(hwnd, desc.hDeviceDc); + + if (!(surface = calloc(1, FIELD_OFFSET(struct macdrv_window_surface, info.bmiColors[3])))) goto failed; + if (!window_surface_init(&surface->header, &macdrv_surface_funcs, hwnd, rect, info, bitmap)) goto failed; memcpy(&surface->info, info, offsetof(BITMAPINFO, bmiColors[3])); surface->window = window; if (old_surface) surface->header.bounds = old_surface->bounds; surface->use_alpha = use_alpha; + surface->provider = provider; window_background = macdrv_window_background_color(); memset_pattern4(surface->header.color_bits, &window_background, info->bmiHeader.biSizeImage); @@ -163,7 +202,9 @@ static struct window_surface *create_surface(HWND hwnd, macdrv_window window, co return &surface->header; failed: - window_surface_release(&surface->header); + if (surface) window_surface_release(&surface->header); + if (bitmap) NtGdiDeleteObjectApp(bitmap); + CGDataProviderRelease(provider); return NULL; }

1 0