wine-commits October 2022

wine-commits@winehq.org

1 participants
537 discussions

Alexandre Julliard : makedep: Make the target flags architecture-generic.
by Alexandre Julliard 24 Oct '22

24 Oct '22

Module: wine Branch: master Commit: afc286fb51f29f22a5a6c9280476afc3e1563b24 URL: https://gitlab.winehq.org/wine/wine/-/commit/afc286fb51f29f22a5a6c9280476af… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 24 11:42:31 2022 +0200 makedep: Make the target flags architecture-generic. --- tools/makedep.c | 55 +++++++++++++++++++++++++++++++++---------------------- 1 file changed, 33 insertions(+), 22 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index 4de28f3d83f..fe546b26aa1 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -126,11 +126,13 @@ enum install_rules { INSTALL_LIB, INSTALL_DEV, INSTALL_TEST, NB_INSTALL_RULES }; static const char *install_targets[NB_INSTALL_RULES] = { "install-lib", "install-dev", "install-test" }; static const char *install_variables[NB_INSTALL_RULES] = { "INSTALL_LIB", "INSTALL_DEV", "INSTALL_TEST" }; +#define MAX_ARCHS 2 + /* variables common to all makefiles */ +static struct strarray archs; static struct strarray linguas; static struct strarray dll_flags; static struct strarray unix_dllflags; -static struct strarray target_flags; static struct strarray msvcrt_flags; static struct strarray extra_cflags; static struct strarray extra_cross_cflags; @@ -153,7 +155,6 @@ static const char *dll_ext; static const char *host_cpu; static const char *pe_dir; static const char *so_dir; -static const char *crosstarget; static const char *crossdebug; static const char *fontforge; static const char *convert; @@ -168,6 +169,9 @@ static const char *msgfmt; static const char *ln_s; static const char *sed_cmd; static const char *delay_load_flag; +/* per-architecture global variables */ +static const char *strip_progs[MAX_ARCHS]; +static struct strarray target_flags[MAX_ARCHS]; struct makefile { @@ -2060,7 +2064,7 @@ static struct makefile *get_parent_makefile( struct makefile *make ) static int needs_delay_lib( const struct makefile *make ) { if (delay_load_flag) return 0; - if (*dll_ext && !crosstarget) return 0; + if (*dll_ext && archs.count == 1) return 0; if (!make->importlib) return 0; return strarray_exists( &delay_import_libs, make->importlib ); } @@ -2376,17 +2380,11 @@ static void output_winegcc_command( struct makefile *make, unsigned int arch ) output_filename( "--winebuild" ); output_filename( tools_path( make, "winebuild" )); } + output_filenames( target_flags[arch] ); if (arch) - { - output_filename( "-b" ); - output_filename( crosstarget ); output_filename( "--lib-suffix=.cross.a" ); - } else - { - output_filenames( target_flags ); output_filenames( lddll_flags ); - } } @@ -2460,8 +2458,8 @@ static void output_install_commands( struct makefile *make, struct strarray file switch (*files.str[i + 1]) { case 'c': /* cross-compiled program */ - output( "\tSTRIPPROG=%s-strip %s -m 644 $(INSTALL_PROGRAM_FLAGS) %s %s\n", - crosstarget, install_sh, obj_dir_path( make, file ), dest ); + output( "\tSTRIPPROG=%s %s -m 644 $(INSTALL_PROGRAM_FLAGS) %s %s\n", + strip_progs[1], install_sh, obj_dir_path( make, file ), dest ); output( "\t%s --builtin %s\n", tools_path( make, "winebuild" ), dest ); break; case 'd': /* data file */ @@ -2781,7 +2779,7 @@ static void output_source_idl( struct makefile *make, struct incl_file *source, output_filenames_obj_dir( make, targets ); output( ": %s\n", tools_path( make, "widl" )); output( "\t%s%s -o $@", cmd_prefix( "WIDL" ), tools_path( make, "widl" ) ); - output_filenames( target_flags ); + output_filenames( target_flags[0] ); output_filename( "--nostdinc" ); output_filename( "-Ldlls/\\*" ); output_filenames( defines ); @@ -3023,7 +3021,7 @@ static void output_source_default( struct makefile *make, struct incl_file *sour int is_dll_src = (make->testdll && strendswith( source->name, ".c" ) && find_src_file( make, replace_extension( source->name, ".c", ".spec" ))); - int need_cross = (crosstarget && + int need_cross = (archs.count > 1 && !(source->file->flags & FLAG_C_UNIX) && (arch || make->staticlib || (source->file->flags & FLAG_C_IMPLIB))); @@ -3299,8 +3297,7 @@ static void output_import_lib( struct makefile *make, unsigned int arch ) output_filenames_obj_dir( make, arch ? make->crossimplib_files : make->implib_files ); output( "\n" ); output( "\t%s%s -w --implib -o $@", cmd_prefix( "BUILD" ), tools_path( make, "winebuild" ) ); - if (arch) output( " -b %s", crosstarget ); - else output_filenames( target_flags ); + output_filenames( target_flags[arch] ); if (make->is_win16) output_filename( "-m16" ); output_filename( "--export" ); output_filename( spec_file ); @@ -3378,8 +3375,7 @@ static void output_static_lib( struct makefile *make, unsigned int arch ) if (!arch) output_filenames_obj_dir( make, make->unixobj_files ); output( "\n" ); output( "\t%s%s -w --staticlib -o $@", cmd_prefix( "BUILD" ), tools_path( make, "winebuild" )); - if (arch) output( " -b %s", crosstarget ); - else output_filenames( target_flags ); + output_filenames( target_flags[arch] ); output_filenames_obj_dir( make, arch ? make->crossobj_files : make->object_files ); if (!arch) output_filenames_obj_dir( make, make->unixobj_files ); output( "\n" ); @@ -3720,12 +3716,12 @@ static void output_sources( struct makefile *make ) else if (make->module) { output_module( make, arch ); - if (*dll_ext && !arch && !make->data_only) output_fake_module( make, crosstarget ? 1 : 0 ); + if (*dll_ext && !arch && !make->data_only) output_fake_module( make, archs.count - 1 ); if (make->unixlib) output_unix_lib( make ); if (make->importlib) { output_import_lib( make, 0 ); - if (crosstarget) output_import_lib( make, 1 ); + if (archs.count > 1) output_import_lib( make, 1 ); } } else if (make->testdll) output_test_module( make, arch ); @@ -4225,7 +4221,7 @@ static void load_sources( struct makefile *make ) LIST_FOR_EACH_ENTRY( file, &make->includes, struct incl_file, entry ) parse_file( make, file, 0 ); LIST_FOR_EACH_ENTRY( file, &make->sources, struct incl_file, entry ) get_dependencies( file, file ); - make->is_cross = crosstarget && make->use_msvcrt; + make->is_cross = archs.count > 1 && make->use_msvcrt; if (!*dll_ext || make->is_cross) for (i = 0; i < make->delayimports.count; i++) @@ -4291,6 +4287,7 @@ static int parse_option( const char *opt ) int main( int argc, char *argv[] ) { const char *makeflags = getenv( "MAKEFLAGS" ); + const char *crosstarget; int i, j; if (makeflags) parse_makeflags( makeflags ); @@ -4334,7 +4331,7 @@ int main( int argc, char *argv[] ) top_makefile = parse_makefile( NULL ); - target_flags = get_expanded_make_var_array( top_makefile, "TARGETFLAGS" ); + target_flags[0] = get_expanded_make_var_array( top_makefile, "TARGETFLAGS" ); msvcrt_flags = get_expanded_make_var_array( top_makefile, "MSVCRTFLAGS" ); dll_flags = get_expanded_make_var_array( top_makefile, "DLLFLAGS" ); extra_cflags = get_expanded_make_var_array( top_makefile, "EXTRACFLAGS" ); @@ -4379,7 +4376,21 @@ int main( int argc, char *argv[] ) pe_dir = strmake( "$(dlldir)/%s-windows", host_cpu ); } else + { + host_cpu = "unknown"; so_dir = pe_dir = "$(dlldir)"; + } + + strarray_add( &archs, host_cpu ); + strip_progs[0] = "\"$(STRIP)\""; + + if (crosstarget) + { + strarray_add( &archs, host_cpu ); + strarray_add( &target_flags[1], "-b" ); + strarray_add( &target_flags[1], crosstarget ); + strip_progs[1] = strmake( "%s-strip", crosstarget ); + } extra_cflags_extlib = remove_warning_flags( extra_cflags ); extra_cross_cflags_extlib = remove_warning_flags( extra_cross_cflags );

1 0

Alexandre Julliard : makedep: Pass a generic architecture value instead of the is_cross flag to various helpers.
by Alexandre Julliard 24 Oct '22

24 Oct '22

Module: wine Branch: master Commit: 24d791e2e9792a28a18414710aee34c255b10c67 URL: https://gitlab.winehq.org/wine/wine/-/commit/24d791e2e9792a28a18414710aee34… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 24 11:40:56 2022 +0200 makedep: Pass a generic architecture value instead of the is_cross flag to various helpers. --- tools/makedep.c | 209 ++++++++++++++++++++++++++------------------------------ 1 file changed, 95 insertions(+), 114 deletions(-)

1 0

Paul Gofman : winmm: Use a global timeout for refreshing joystick devices.
by Alexandre Julliard 24 Oct '22

24 Oct '22

Module: wine Branch: master Commit: 6d9dd6e4882ea8ba63510ae467720ca851333605 URL: https://gitlab.winehq.org/wine/wine/-/commit/6d9dd6e4882ea8ba63510ae467720c… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Oct 21 20:38:34 2022 -0500 winmm: Use a global timeout for refreshing joystick devices. --- dlls/winmm/joystick.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/winmm/joystick.c b/dlls/winmm/joystick.c index 52094504186..428593fa590 100644 --- a/dlls/winmm/joystick.c +++ b/dlls/winmm/joystick.c @@ -131,12 +131,12 @@ struct joystick UINT timer; DWORD threshold; BOOL changed; - ULONG last_check; }; static DIDEVICEINSTANCEW instances[16]; static struct joystick joysticks[16]; static IDirectInput8W *dinput; +static ULONG last_check; static BOOL CALLBACK enum_instances( const DIDEVICEINSTANCEW *instance, void *context ) { @@ -342,9 +342,9 @@ MMRESULT WINAPI DECLSPEC_HOTPATCH joyGetDevCapsW( UINT_PTR id, JOYCAPSW *caps, U EnterCriticalSection( &joystick_cs ); - if (!(device = joysticks[id].device) && (ticks - joysticks[id].last_check) >= 2000) + if (!(device = joysticks[id].device) && (ticks - last_check) >= 2000) { - joysticks[id].last_check = ticks; + last_check = ticks; find_joysticks(); } @@ -477,9 +477,9 @@ MMRESULT WINAPI DECLSPEC_HOTPATCH joyGetPosEx( UINT id, JOYINFOEX *info ) EnterCriticalSection( &joystick_cs ); - if (!(device = joysticks[id].device) && (ticks - joysticks[id].last_check) >= 2000) + if (!(device = joysticks[id].device) && (ticks - last_check) >= 2000) { - joysticks[id].last_check = ticks; + last_check = ticks; find_joysticks(); }

1 0

Alex Henrie : shell32: Remove unused function strdupW.
by Alexandre Julliard 24 Oct '22

24 Oct '22

Module: wine Branch: master Commit: d6facdc0b8422f778889a63f866ac45b584aa247 URL: https://gitlab.winehq.org/wine/wine/-/commit/d6facdc0b8422f778889a63f866ac4… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Oct 20 09:14:10 2022 -0600 shell32: Remove unused function strdupW. --- dlls/shell32/shell32_main.h | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/dlls/shell32/shell32_main.h b/dlls/shell32/shell32_main.h index 33b85ee2726..f9607585184 100644 --- a/dlls/shell32/shell32_main.h +++ b/dlls/shell32/shell32_main.h @@ -231,16 +231,6 @@ HRESULT get_typeinfo(enum tid_t, ITypeInfo**) DECLSPEC_HIDDEN; void release_typelib(void) DECLSPEC_HIDDEN; void release_desktop_folder(void) DECLSPEC_HIDDEN; -static inline WCHAR *strdupW(const WCHAR *src) -{ - WCHAR *dest; - if (!src) return NULL; - dest = heap_alloc((lstrlenW(src) + 1) * sizeof(*dest)); - if (dest) - lstrcpyW(dest, src); - return dest; -} - static inline WCHAR *strdupAtoW(const char *str) { WCHAR *ret;

1 0

Alex Henrie : shell32: Don't use strdupW or heap_* functions in shelllink.c.
by Alexandre Julliard 24 Oct '22

24 Oct '22

Module: wine Branch: master Commit: 0a66cfa9a2d218ea4608f48cef125ea47d17db82 URL: https://gitlab.winehq.org/wine/wine/-/commit/0a66cfa9a2d218ea4608f48cef125e… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Oct 20 09:14:10 2022 -0600 shell32: Don't use strdupW or heap_* functions in shelllink.c. --- dlls/shell32/shelllink.c | 154 +++++++++++++++++++++++------------------------ 1 file changed, 77 insertions(+), 77 deletions(-)

1 0

Alex Henrie : shell32: Don't use strdupW or heap_* functions in shelldispatch.c.
by Alexandre Julliard 24 Oct '22

24 Oct '22

Module: wine Branch: master Commit: e3a74a91780090e4fc32076dbe3da64cb41c4c8b URL: https://gitlab.winehq.org/wine/wine/-/commit/e3a74a91780090e4fc32076dbe3da6… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Oct 20 09:14:10 2022 -0600 shell32: Don't use strdupW or heap_* functions in shelldispatch.c. --- dlls/shell32/shelldispatch.c | 52 ++++++++++++++++++++++---------------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/dlls/shell32/shelldispatch.c b/dlls/shell32/shelldispatch.c index fbf90bb125e..01353bda82d 100644 --- a/dlls/shell32/shelldispatch.c +++ b/dlls/shell32/shelldispatch.c @@ -244,7 +244,7 @@ static ULONG WINAPI FolderItemVerbImpl_Release(FolderItemVerb *iface) { IContextMenu_Release(This->contextmenu); SysFreeString(This->name); - heap_free(This); + free(This); } return ref; @@ -356,7 +356,7 @@ static HRESULT FolderItemVerb_Constructor(IContextMenu *contextmenu, BSTR name, TRACE("%p, %s\n", contextmenu, debugstr_w(name)); - This = heap_alloc(sizeof(*This)); + This = malloc(sizeof(*This)); if (!This) return E_OUTOFMEMORY; @@ -414,7 +414,7 @@ static ULONG WINAPI FolderItemVerbsImpl_Release(FolderItemVerbs *iface) { IContextMenu_Release(This->contextmenu); DestroyMenu(This->hMenu); - heap_free(This); + free(This); } return ref; @@ -588,7 +588,7 @@ static HRESULT FolderItemVerbs_Constructor(BSTR path, FolderItemVerbs **verbs) *verbs = NULL; - This = heap_alloc(sizeof(*This)); + This = malloc(sizeof(*This)); if (!This) return E_OUTOFMEMORY; @@ -623,7 +623,7 @@ static HRESULT FolderItemVerbs_Constructor(BSTR path, FolderItemVerbs **verbs) return S_OK; failed: - heap_free(This); + free(This); return hr; } @@ -671,7 +671,7 @@ static ULONG WINAPI ShellLinkObject_Release(IShellLinkDual2 *iface) if (!ref) { if (This->shell_link) IShellLinkW_Release(This->shell_link); - heap_free(This); + free(This); } return ref; } @@ -899,7 +899,7 @@ static HRESULT ShellLinkObject_Constructor(FolderItemImpl *item, IShellLinkDual2 *link = NULL; - This = heap_alloc(sizeof(*This)); + This = malloc(sizeof(*This)); if (!This) return E_OUTOFMEMORY; This->IShellLinkDual2_iface.lpVtbl = &ShellLinkObjectVtbl; This->ref = 1; @@ -909,7 +909,7 @@ static HRESULT ShellLinkObject_Constructor(FolderItemImpl *item, IShellLinkDual2 &IID_IShellLinkW, (LPVOID*)&This->shell_link); if (FAILED(hr)) { - heap_free(This); + free(This); return hr; } @@ -918,7 +918,7 @@ static HRESULT ShellLinkObject_Constructor(FolderItemImpl *item, IShellLinkDual2 if (FAILED(hr)) { IShellLinkW_Release(This->shell_link); - heap_free(This); + free(This); return hr; } @@ -927,7 +927,7 @@ static HRESULT ShellLinkObject_Constructor(FolderItemImpl *item, IShellLinkDual2 if (FAILED(hr)) { IShellLinkW_Release(This->shell_link); - heap_free(This); + free(This); return hr; } @@ -979,8 +979,8 @@ static ULONG WINAPI FolderItemImpl_Release(FolderItem2 *iface) if (!ref) { Folder3_Release(&This->folder->Folder3_iface); - heap_free(This->path); - heap_free(This); + free(This->path); + free(This); } return ref; } @@ -1295,14 +1295,14 @@ static HRESULT FolderItem_Constructor(FolderImpl *folder, const WCHAR *path, Fol *item = NULL; - This = heap_alloc_zero(sizeof(*This)); + This = calloc(1, sizeof(*This)); if (!This) return E_OUTOFMEMORY; This->FolderItem2_iface.lpVtbl = &FolderItemImpl_Vtbl; This->ref = 1; if (path) - This->path = strdupW(path); + This->path = wcsdup(path); This->folder = folder; Folder3_AddRef(&folder->Folder3_iface); @@ -1362,8 +1362,8 @@ static ULONG WINAPI FolderItemsImpl_Release(FolderItems3 *iface) Folder3_Release(&This->folder->Folder3_iface); for (i = 0; i < This->item_count; i++) SysFreeString(This->item_names[i]); - heap_free(This->item_names); - heap_free(This); + free(This->item_names); + free(This); } return ref; } @@ -1623,7 +1623,7 @@ static HRESULT FolderItems_Constructor(FolderImpl *folder, FolderItems **ret) *ret = NULL; - This = heap_alloc_zero(sizeof(*This)); + This = calloc(1, sizeof(*This)); if (!This) return E_OUTOFMEMORY; @@ -1650,13 +1650,13 @@ static HRESULT FolderItems_Constructor(FolderImpl *folder, FolderItems **ret) LPITEMIDLIST *pidls; ULONG fetched; - pidls = heap_alloc(This->item_count * sizeof(*pidls)); - This->item_names = heap_alloc_zero(This->item_count * sizeof(*This->item_names)); + pidls = malloc(This->item_count * sizeof(*pidls)); + This->item_names = calloc(This->item_count, sizeof(*This->item_names)); if (!pidls || !This->item_names) { - heap_free(pidls); - heap_free(This->item_names); + free(pidls); + free(This->item_names); hr = E_OUTOFMEMORY; goto failed; } @@ -1674,7 +1674,7 @@ static HRESULT FolderItems_Constructor(FolderImpl *folder, FolderItems **ret) ILFree(pidls[i]); } - heap_free(pidls); + free(pidls); } IEnumIDList_Release(enumidlist); @@ -1735,7 +1735,7 @@ static ULONG WINAPI FolderImpl_Release(Folder3 *iface) SysFreeString(This->path); IShellFolder2_Release(This->folder); IDispatch_Release(This->application); - heap_free(This); + free(This); } return ref; } @@ -2005,7 +2005,7 @@ static HRESULT Folder_Constructor(IShellFolder2 *folder, LPITEMIDLIST pidl, Fold *ret = NULL; - This = heap_alloc(sizeof(*This)); + This = malloc(sizeof(*This)); if (!This) return E_OUTOFMEMORY; @@ -2072,7 +2072,7 @@ static ULONG WINAPI ShellDispatch_Release(IShellDispatch6 *iface) TRACE("(%p), new refcount=%li\n", iface, ref); if (!ref) - heap_free(This); + free(This); return ref; } @@ -2620,7 +2620,7 @@ HRESULT WINAPI IShellDispatch_Constructor(IUnknown *outer, REFIID riid, void **p if (outer) return CLASS_E_NOAGGREGATION; - This = heap_alloc(sizeof(*This)); + This = malloc(sizeof(*This)); if (!This) return E_OUTOFMEMORY; This->IShellDispatch6_iface.lpVtbl = &ShellDispatchVtbl; This->ref = 1;

1 0

Alex Henrie : shell32: Don't use strdupW or heap_* functions in shellole.c.
by Alexandre Julliard 24 Oct '22

24 Oct '22

Module: wine Branch: master Commit: e8aba9c41247024a99e64214f522ca4aabb1b8bb URL: https://gitlab.winehq.org/wine/wine/-/commit/e8aba9c41247024a99e64214f522ca… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Oct 20 09:14:10 2022 -0600 shell32: Don't use strdupW or heap_* functions in shellole.c. --- dlls/shell32/shellole.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/shell32/shellole.c b/dlls/shell32/shellole.c index 589e5c5170a..055244b1e67 100644 --- a/dlls/shell32/shellole.c +++ b/dlls/shell32/shellole.c @@ -385,7 +385,7 @@ static IClassFactory * IDefClF_fnConstructor(LPFNCREATEINSTANCE lpfnCI, PLONG pc { IDefClFImpl* lpclf; - lpclf = heap_alloc(sizeof(*lpclf)); + lpclf = malloc(sizeof(*lpclf)); lpclf->ref = 1; lpclf->IClassFactory_iface.lpVtbl = &dclfvt; lpclf->lpfnCI = lpfnCI; @@ -445,7 +445,7 @@ static ULONG WINAPI IDefClF_fnRelease(LPCLASSFACTORY iface) if (This->pcRefDll) InterlockedDecrement(This->pcRefDll); TRACE("-- destroying IClassFactory(%p)\n",This); - heap_free(This); + free(This); } return refCount; @@ -580,7 +580,7 @@ UINT WINAPI DragQueryFileA( LPWSTR lpszFileW = NULL; if(lpszFile && lFile != 0xFFFFFFFF) { - lpszFileW = heap_alloc(lLength*sizeof(WCHAR)); + lpszFileW = malloc(lLength * sizeof(WCHAR)); if(lpszFileW == NULL) { goto end; } @@ -589,7 +589,7 @@ UINT WINAPI DragQueryFileA( if(lpszFileW) { WideCharToMultiByte(CP_ACP, 0, lpszFileW, -1, lpszFile, lLength, 0, NULL); - heap_free(lpszFileW); + free(lpszFileW); } goto end; } @@ -635,7 +635,7 @@ UINT WINAPI DragQueryFileW( LPSTR lpszFileA = NULL; if(lpszwFile && lFile != 0xFFFFFFFF) { - lpszFileA = heap_alloc(lLength); + lpszFileA = malloc(lLength); if(lpszFileA == NULL) { goto end; } @@ -644,7 +644,7 @@ UINT WINAPI DragQueryFileW( if(lpszFileA) { MultiByteToWideChar(CP_ACP, 0, lpszFileA, -1, lpszwFile, lLength); - heap_free(lpszFileA); + free(lpszFileA); } goto end; } @@ -876,8 +876,8 @@ static ULONG WINAPI ShellImageData_Release(IShellImageData *iface) if (!ref) { GdipDisposeImage(This->image); - heap_free(This->path); - SHFree(This); + free(This->path); + free(This); } return ref; @@ -1247,12 +1247,12 @@ static HRESULT create_shellimagedata_from_path(const WCHAR *path, IShellImageDat { ShellImageData *This; - This = SHAlloc(sizeof(*This)); + This = malloc(sizeof(*This)); This->IShellImageData_iface.lpVtbl = &ShellImageDataVtbl; This->ref = 1; - This->path = strdupW(path); + This->path = wcsdup(path); This->image = NULL; *data = &This->IShellImageData_iface;

1 0

Jinoh Kang : gdiplus: Replace GpImage's busy flag with SRWLOCK.
by Alexandre Julliard 24 Oct '22

24 Oct '22

Module: wine Branch: master Commit: 72c0c88f2a5c9b52bb01f7981c0894a47efa55f3 URL: https://gitlab.winehq.org/wine/wine/-/commit/72c0c88f2a5c9b52bb01f7981c0894… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Sat Oct 22 21:25:37 2022 +0900 gdiplus: Replace GpImage's busy flag with SRWLOCK. Today, the image_unlock() helper function has a data race due to non-atomic write to GpImage's 'busy' flag which is accessible by other threads. Also, it lacks a release fence, which means that other threads can observe the unlocked (busy = 0) state too early when the current thread unlocks the image; specifically, the write to the 'busy' field of the GpImage can be reordered before the last read/write to any other fields of the same GpImage. Fix this by replacing the 'busy' field of GpImage with SRWLOCK. --- dlls/gdiplus/gdiplus_private.h | 13 ++++---- dlls/gdiplus/image.c | 67 +++++++++++++++++++----------------------- 2 files changed, 36 insertions(+), 44 deletions(-)

1 0

Jinoh Kang : gdiplus: Avoid copying GpImage's busy flag in select_frame_wic().
by Alexandre Julliard 24 Oct '22

24 Oct '22

Module: wine Branch: master Commit: 7abca9742a9410447636e0222e36d214449c90dd URL: https://gitlab.winehq.org/wine/wine/-/commit/7abca9742a9410447636e0222e36d2… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Sat Oct 22 21:23:18 2022 +0900 gdiplus: Avoid copying GpImage's busy flag in select_frame_wic(). The 'busy' field in GpImage is used as an atomic variable. The C11 standard (§5.1.2.4, paragraph 25) states that two conflicting actions to a memory location shall be both atomic operations, or otherwise properly synchronized; otherwise, it constitutes a data race. However, select_frame_wic() performs a non-atomic access to the 'busy' field on a GpImage that is potentially accessible by other threads. This happens when select_frame_wic() copies new_image to the old image object. Although it does attempt to preserve the value of the 'busy' field by setting new_image->busy = image->busy first, thereby effectively assigning an identical value to the field, it is unclear that this does not actually constitute a theoretical, if not practical, data race. This also prevents replacing the busy flag with a mutex or other synchronization primitives. Therefore, skip the 'busy' field when copying fields from the new image to the original image object. --- dlls/gdiplus/image.c | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 93d2a366e82..629599ddf2c 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -3799,6 +3799,7 @@ static GpStatus decode_image_wic(IStream *stream, REFGUID container, static GpStatus select_frame_wic(GpImage *image, UINT active_frame) { + size_t obj_size, body_offset; GpImage *new_image; GpStatus status; @@ -3806,15 +3807,24 @@ static GpStatus select_frame_wic(GpImage *image, UINT active_frame) if(status != Ok) return status; - new_image->busy = image->busy; + if (image->type == ImageTypeBitmap) + obj_size = sizeof(GpBitmap); + else if (image->type == ImageTypeMetafile) + obj_size = sizeof(GpMetafile); + else + { + ERR("unknown image type: %d\n", image->type); + GdipDisposeImage(new_image); + return GenericError; + } + memcpy(&new_image->format, &image->format, sizeof(GUID)); new_image->encoder = image->encoder; image->encoder = NULL; free_image_data(image); - if (image->type == ImageTypeBitmap) - *(GpBitmap *)image = *(GpBitmap *)new_image; - else if (image->type == ImageTypeMetafile) - *(GpMetafile *)image = *(GpMetafile *)new_image; + memcpy(image, new_image, FIELD_OFFSET(GpImage, busy)); + body_offset = RTL_SIZEOF_THROUGH_FIELD(GpImage, busy); + memcpy((char *)image + body_offset, (char *)new_image + body_offset, obj_size - body_offset); new_image->type = ~0; heap_free(new_image); return Ok;

1 0

Jinoh Kang : gdiplus: Avoid recursively locking image in GdipImageRotateFlip.
by Alexandre Julliard 24 Oct '22

24 Oct '22

Module: wine Branch: master Commit: d6b4321125ded56e4d368e85dd2a451e4f9b477c URL: https://gitlab.winehq.org/wine/wine/-/commit/d6b4321125ded56e4d368e85dd2a45… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Sat Oct 22 20:38:47 2022 +0900 gdiplus: Avoid recursively locking image in GdipImageRotateFlip. GdipImageRotateFlip() calls GdipBitmapLockBits() while holding the image lock, resulting in a recursive lock. Since GdipImageRotateFlip() uses GdipBitmapLockBits() only to obtain Scan0 and Stride, replace them with equivalent fields from GpBitmap itself. --- dlls/gdiplus/image.c | 31 +++++++++---------------------- 1 file changed, 9 insertions(+), 22 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index b899619e1d3..93d2a366e82 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -5530,7 +5530,7 @@ GpStatus WINGDIPAPI GdipImageRotateFlip(GpImage *image, RotateFlipType type) int src_x_offset, src_y_offset; LPBYTE src_origin; UINT x, y, width, height; - BitmapData src_lock, dst_lock; + BitmapData dst_lock; GpStatus stat; BOOL unlock; @@ -5577,14 +5577,6 @@ GpStatus WINGDIPAPI GdipImageRotateFlip(GpImage *image, RotateFlipType type) stat = GdipCreateBitmapFromScan0(width, height, 0, bitmap->format, NULL, &new_bitmap); - if (stat != Ok) - { - image_unlock(image, unlock); - return stat; - } - - stat = GdipBitmapLockBits(bitmap, NULL, ImageLockModeRead, bitmap->format, &src_lock); - if (stat == Ok) { stat = GdipBitmapLockBits(new_bitmap, NULL, ImageLockModeWrite, bitmap->format, &dst_lock); @@ -5594,14 +5586,14 @@ GpStatus WINGDIPAPI GdipImageRotateFlip(GpImage *image, RotateFlipType type) LPBYTE src_row, src_pixel; LPBYTE dst_row, dst_pixel; - src_origin = src_lock.Scan0; + src_origin = bitmap->bits; if (flip_x) src_origin += bytesperpixel * (bitmap->width - 1); - if (flip_y) src_origin += src_lock.Stride * (bitmap->height - 1); + if (flip_y) src_origin += bitmap->stride * (bitmap->height - 1); if (rotate_90) { - if (flip_y) src_x_offset = -src_lock.Stride; - else src_x_offset = src_lock.Stride; + if (flip_y) src_x_offset = -bitmap->stride; + else src_x_offset = bitmap->stride; if (flip_x) src_y_offset = -bytesperpixel; else src_y_offset = bytesperpixel; } @@ -5609,8 +5601,8 @@ GpStatus WINGDIPAPI GdipImageRotateFlip(GpImage *image, RotateFlipType type) { if (flip_x) src_x_offset = -bytesperpixel; else src_x_offset = bytesperpixel; - if (flip_y) src_y_offset = -src_lock.Stride; - else src_y_offset = src_lock.Stride; + if (flip_y) src_y_offset = -bitmap->stride; + else src_y_offset = bitmap->stride; } src_row = src_origin; @@ -5631,16 +5623,11 @@ GpStatus WINGDIPAPI GdipImageRotateFlip(GpImage *image, RotateFlipType type) } GdipBitmapUnlockBits(new_bitmap, &dst_lock); + move_bitmap(bitmap, new_bitmap, FALSE); } - - GdipBitmapUnlockBits(bitmap, &src_lock); + else GdipDisposeImage(&new_bitmap->image); } - if (stat == Ok) - move_bitmap(bitmap, new_bitmap, FALSE); - else - GdipDisposeImage(&new_bitmap->image); - image_unlock(image, unlock); return stat; }

1 0

← Newer
1
...
16
17
18
19
20
21
22
...
54
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2022