October 2022 - Wine-commits

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

24 Oct '22

Module: wine Branch: master Commit: 25735da0dea2c62b8362f613111fb145cd692545 URL: https://gitlab.winehq.org/wine/wine/-/commit/25735da0dea2c62b8362f613111fb1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 24 12:22:25 2022 +0200 makedep: Make the extra C flags architecture-generic. --- tools/makedep.c | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index 44a08130b3f..7100cacaf86 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -134,10 +134,6 @@ static struct strarray linguas; static struct strarray dll_flags; static struct strarray unix_dllflags; static struct strarray msvcrt_flags; -static struct strarray extra_cflags; -static struct strarray extra_cross_cflags; -static struct strarray extra_cflags_extlib; -static struct strarray extra_cross_cflags_extlib; static struct strarray cpp_flags; static struct strarray lddll_flags; static struct strarray libs; @@ -172,6 +168,8 @@ static const char *strip_progs[MAX_ARCHS]; static const char *debug_flags[MAX_ARCHS]; static const char *delay_load_flags[MAX_ARCHS]; static struct strarray target_flags[MAX_ARCHS]; +static struct strarray extra_cflags[MAX_ARCHS]; +static struct strarray extra_cflags_extlib[MAX_ARCHS]; struct makefile { @@ -3059,7 +3057,7 @@ static void output_source_default( struct makefile *make, struct incl_file *sour output( "\t%s$(CC) -c -o $@ %s", cmd_prefix( "CC" ), source->filename ); output_filenames( defines ); if (!source->use_msvcrt) output_filenames( make->unix_cflags ); - output_filenames( make->extlib ? extra_cflags_extlib : extra_cflags ); + output_filenames( make->extlib ? extra_cflags_extlib[0] : extra_cflags[0] ); if (make->sharedlib || (source->file->flags & FLAG_C_UNIX)) { output_filenames( unix_dllflags ); @@ -3086,12 +3084,12 @@ static void output_source_default( struct makefile *make, struct incl_file *sour output( "%s.cross.o: %s\n", obj_dir_path( make, obj ), source->filename ); output( "\t%s$(CROSSCC) -c -o $@ %s", cmd_prefix( "CC" ), source->filename ); output_filenames( defines ); - output_filenames( make->extlib ? extra_cross_cflags_extlib : extra_cross_cflags ); + output_filenames( make->extlib ? extra_cflags_extlib[arch] : extra_cflags[arch] ); if (make->module && is_crt_module( make->module )) output_filename( "-fno-builtin" ); /* force -Wformat when using 'long' types, until all modules have been converted * and we can remove -Wno-format */ - if (!make->extlib && strarray_exists( &extra_cross_cflags, "-Wno-format" ) && + if (!make->extlib && strarray_exists( &extra_cflags[arch], "-Wno-format" ) && !strarray_exists( &defines, "-DWINE_NO_LONG_TYPES" )) output_filename( "-Wformat" ); output_filenames( cpp_flags ); @@ -4343,8 +4341,8 @@ int main( int argc, char *argv[] ) 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" ); - extra_cross_cflags = get_expanded_make_var_array( top_makefile, "EXTRACROSSCFLAGS" ); + extra_cflags[0] = get_expanded_make_var_array( top_makefile, "EXTRACFLAGS" ); + extra_cflags[1] = get_expanded_make_var_array( top_makefile, "EXTRACROSSCFLAGS" ); unix_dllflags = get_expanded_make_var_array( top_makefile, "UNIXDLLFLAGS" ); cpp_flags = get_expanded_make_var_array( top_makefile, "CPPFLAGS" ); lddll_flags = get_expanded_make_var_array( top_makefile, "LDDLLFLAGS" ); @@ -4404,6 +4402,7 @@ int main( int argc, char *argv[] ) for (arch = 0; arch < archs.count; arch++) { + extra_cflags_extlib[arch] = remove_warning_flags( extra_cflags[arch] ); if (!is_multiarch( arch )) continue; delay_load_flags[arch] = delay_load_flag; debug_flags[arch] = debug_flag; @@ -4415,9 +4414,6 @@ int main( int argc, char *argv[] ) debug_flags[0] = NULL; } - extra_cflags_extlib = remove_warning_flags( extra_cflags ); - extra_cross_cflags_extlib = remove_warning_flags( extra_cross_cflags ); - top_makefile->src_dir = root_src_dir; subdirs = get_expanded_make_var_array( top_makefile, "SUBDIRS" ); disabled_dirs = get_expanded_make_var_array( top_makefile, "DISABLED_SUBDIRS" );

1 0

Ziqing Hui : win32u: Add font links for Yu Gothic UI.
by Alexandre Julliard 24 Oct '22

24 Oct '22

Module: wine Branch: master Commit: 802c12266175e01972998ca6b0e72196e90a9608 URL: https://gitlab.winehq.org/wine/wine/-/commit/802c12266175e01972998ca6b0e721… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Fri Oct 21 10:07:40 2022 +0800 win32u: Add font links for Yu Gothic UI. --- dlls/win32u/font.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/dlls/win32u/font.c b/dlls/win32u/font.c index 9ead47e1983..a414da19287 100644 --- a/dlls/win32u/font.c +++ b/dlls/win32u/font.c @@ -1534,6 +1534,16 @@ static const WCHAR microsoft_jheng_hei_ui_boldW[] = {'M','i','c','r','o','s','o','f','t',' ','J','h','e','n','g','H','e','i',' ','U','I',' ','B','o','l','d',0}; static const WCHAR microsoft_jheng_hei_ui_lightW[] = {'M','i','c','r','o','s','o','f','t',' ','J','h','e','n','g','H','e','i',' ','U','I',' ','L','i','g','h','t',0}; +static const WCHAR yu_gothic_uiW[] = + {'Y','u',' ','G','o','t','h','i','c',' ','U','I',0}; +static const WCHAR yu_gothic_ui_boldW[] = + {'Y','u',' ','G','o','t','h','i','c',' ','U','I',' ','B','o','l','d',0}; +static const WCHAR yu_gothic_ui_lightW[] = + {'Y','u',' ','G','o','t','h','i','c',' ','U','I',' ','L','i','g','h','t',0}; +static const WCHAR yu_gothic_ui_semilightW[] = + {'Y','u',' ','G','o','t','h','i','c',' ','U','I',' ','S','e','m','i','l','i','g','h','t',0}; +static const WCHAR yu_gothic_ui_semiboldW[] = + {'Y','u',' ','G','o','t','h','i','c',' ','U','I',' ','S','e','m','i','b','o','l','d',0}; static const WCHAR * const font_links_list[] = { @@ -1777,6 +1787,41 @@ static const char system_link_ming_li_u_hkscs_ext_b[] = "MALGUN.TTF,Malgun Gothic\0" "SEGUISYM.TTF,Segoe UI Symbol\0"; +static const char system_link_yu_gothic_ui[] = + "SEGOEUI.TTF,Segoe UI\0" + "MSJH.TTC,Microsoft JhengHei\0" + "MSYH.TTC,Microsoft YaHei\0" + "MALGUN.TTF,Malgun Gothic\0" + "SEGUISYM.TTF,Segoe UI Symbol\0"; + +static const char system_link_yu_gothic_ui_bold[] = + "SEGOEUIB.TTF,Segoe UI Bold\0" + "MSJHBD.TTC,Microsoft Jhenghei UI Bold\0" + "MSYHBD.TTC,Microsoft YaHei Bold\0" + "MALGUNBD.TTF,Malgun Gothic Bold\0" + "SEGUISYM.TTF,Segoe UI Symbol\0"; + +static const char system_link_yu_gothic_ui_light[] = + "SEGOEUIL.TTF,Segoe UI Light\0" + "MSJHL.TTC,Microsoft Jhenghei UI Light\0" + "MSYHL.TTC,Microsoft YaHei Light\0" + "MALGUNSL.TTF,Malgun Gothic Semilight\0" + "SEGUISYM.TTF,Segoe UI Symbol\0"; + +static const char system_link_yu_gothic_ui_semilight[] = + "SEGOEUISL.TTF,Segoe UI Semilight\0" + "MSJH.TTC,Microsoft Jhenghei UI\0" + "MSYH.TTC,Microsoft YaHei\0" + "MALGUNSL.TTF,Malgun Gothic Semilight\0" + "SEGUISYM.TTF,Segoe UI Symbol\0"; + +static const char system_link_yu_gothic_ui_semibold[] = + "SEGUISB.TTF,Segoe UI Semibold\0" + "MSJH.TTC,Microsoft Jhenghei UI\0" + "MSYH.TTC,Microsoft YaHei\0" + "MALGUN.TTF,Malgun Gothic\0" + "SEGUISYM.TTF,Segoe UI Symbol\0"; + static const struct system_link_reg { const WCHAR *font_name; @@ -1832,6 +1877,11 @@ default_system_link[] = { ming_li_u_ext_bW, FALSE, system_link_ming_li_u_ext_b, sizeof(system_link_ming_li_u_ext_b) }, { p_ming_li_u_ext_bW, FALSE, system_link_p_ming_li_u_ext_b, sizeof(system_link_p_ming_li_u_ext_b) }, { ming_li_u_hkscs_ext_bW, FALSE, system_link_ming_li_u_hkscs_ext_b, sizeof(system_link_ming_li_u_hkscs_ext_b) }, + { yu_gothic_uiW, FALSE, system_link_yu_gothic_ui, sizeof(system_link_yu_gothic_ui) }, + { yu_gothic_ui_boldW, FALSE, system_link_yu_gothic_ui_bold, sizeof(system_link_yu_gothic_ui_bold) }, + { yu_gothic_ui_lightW, FALSE, system_link_yu_gothic_ui_light, sizeof(system_link_yu_gothic_ui_light) }, + { yu_gothic_ui_semiboldW, FALSE, system_link_yu_gothic_ui_semibold, sizeof(system_link_yu_gothic_ui_semibold) }, + { yu_gothic_ui_semilightW, FALSE, system_link_yu_gothic_ui_semilight, sizeof(system_link_yu_gothic_ui_semilight) }, }; static void populate_system_links( const WCHAR *name, const WCHAR * const *values )

1 0

Ziqing Hui : win32u: Add font links for Meiryo.
by Alexandre Julliard 24 Oct '22

24 Oct '22

Module: wine Branch: master Commit: fa411158dfe1facae8260014e0e4ad11a42522e8 URL: https://gitlab.winehq.org/wine/wine/-/commit/fa411158dfe1facae8260014e0e4ad… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Fri Oct 21 10:14:03 2022 +0800 win32u: Add font links for Meiryo. --- dlls/win32u/font.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/dlls/win32u/font.c b/dlls/win32u/font.c index a414da19287..505c29c469b 100644 --- a/dlls/win32u/font.c +++ b/dlls/win32u/font.c @@ -1544,6 +1544,14 @@ static const WCHAR yu_gothic_ui_semilightW[] = {'Y','u',' ','G','o','t','h','i','c',' ','U','I',' ','S','e','m','i','l','i','g','h','t',0}; static const WCHAR yu_gothic_ui_semiboldW[] = {'Y','u',' ','G','o','t','h','i','c',' ','U','I',' ','S','e','m','i','b','o','l','d',0}; +static const WCHAR meiryoW[] = + {'M','e','i','r','y','o',0}; +static const WCHAR meiryo_boldW[] = + {'M','e','i','r','y','o',' ','B','o','l','d',0}; +static const WCHAR meiryo_uiW[] = + {'M','e','i','r','y','o',' ','U','I',0}; +static const WCHAR meiryo_ui_boldW[] = + {'M','e','i','r','y','o',' ','U','I',' ','B','o','l','d',0}; static const WCHAR * const font_links_list[] = { @@ -1822,6 +1830,42 @@ static const char system_link_yu_gothic_ui_semibold[] = "MALGUN.TTF,Malgun Gothic\0" "SEGUISYM.TTF,Segoe UI Symbol\0"; +static const char system_link_meiryo[] = + "SEGOEUI.TTF,Segoe UI\0" + "YUGOTHM.TTC,Yu Gothic UI\0" + "MSGOTHIC.TTC,MS UI Gothic\0" + "MSJH.TTC,Microsoft JhengHei\0" + "MSYH.TTC,Microsoft YaHei\0" + "MALGUN.TTF,Malgun Gothic\0" + "SEGUISYM.TTF,Segoe UI Symbol\0"; + +static const char system_link_meiryo_bold[] = + "SEGOEUIB.TTF,Segoe UI Bold\0" + "YUGOTHB.TTC,Yu Gothic UI Bold\0" + "MSGOTHIC.TTC,MS UI Gothic\0" + "MSJHBD.TTC,Microsoft Jhenghei Bold\0" + "MSYHBD.TTC,Microsoft YaHei Bold\0" + "MALGUNBD.TTF,Malgun Gothic Bold\0" + "SEGUISYM.TTF,Segoe UI Symbol\0"; + +static const char system_link_meiryo_ui[] = + "SEGOEUI.TTF,Segoe UI\0" + "YUGOTHM.TTC,Yu Gothic UI\0" + "MSGOTHIC.TTC,MS UI Gothic\0" + "MSJH.TTC,Microsoft Jhenghei UI\0" + "MSYH.TTC,Microsoft YaHei UI\0" + "MALGUN.TTF,Malgun Gothic\0" + "SEGUISYM.TTF,Segoe UI Symbol\0"; + +static const char system_link_meiryo_ui_bold[] = + "SEGOEUIB.TTF,Segoe UI Bold\0" + "YUGOTHB.TTC,Yu Gothic UI Bold\0" + "MSGOTHIC.TTC,MS UI Gothic\0" + "MSJHBD.TTC,Microsoft Jhenghei UI Bold\0" + "MSYHBD.TTC,Microsoft YaHei UI Bold\0" + "MALGUNBD.TTF,Malgun Gothic Bold\0" + "SEGUISYM.TTF,Segoe UI Symbol\0"; + static const struct system_link_reg { const WCHAR *font_name; @@ -1882,6 +1926,10 @@ default_system_link[] = { yu_gothic_ui_lightW, FALSE, system_link_yu_gothic_ui_light, sizeof(system_link_yu_gothic_ui_light) }, { yu_gothic_ui_semiboldW, FALSE, system_link_yu_gothic_ui_semibold, sizeof(system_link_yu_gothic_ui_semibold) }, { yu_gothic_ui_semilightW, FALSE, system_link_yu_gothic_ui_semilight, sizeof(system_link_yu_gothic_ui_semilight) }, + { meiryoW, FALSE, system_link_meiryo, sizeof(system_link_meiryo) }, + { meiryo_boldW, FALSE, system_link_meiryo_bold, sizeof(system_link_meiryo_bold) }, + { meiryo_uiW, FALSE, system_link_meiryo_ui, sizeof(system_link_meiryo_ui) }, + { meiryo_ui_boldW, FALSE, system_link_meiryo_ui_bold, sizeof(system_link_meiryo_ui_bold) }, }; static void populate_system_links( const WCHAR *name, const WCHAR * const *values )

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

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 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: 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

Esme Povirk : user32: Test Get/SetWindowPlacement with invalid length.
by Alexandre Julliard 24 Oct '22

24 Oct '22

Module: wine Branch: master Commit: f91eb0a9e00e4d731d9f3cc12c564ab6ee63b200 URL: https://gitlab.winehq.org/wine/wine/-/commit/f91eb0a9e00e4d731d9f3cc12c564a… Author: Esme Povirk <esme(a)codeweavers.com> Date: Fri Dec 17 14:29:50 2021 -0600 user32: Test Get/SetWindowPlacement with invalid length. --- dlls/user32/tests/win.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index b86a9b05e61..d70f8a0cafd 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -12498,6 +12498,17 @@ static void test_window_placement(void) GetWindowRect(hwnd, &rect); ok(EqualRect(&rect, &orig), "got window rect %s\n", wine_dbgstr_rect(&rect)); + ret = SetWindowPlacement(hwnd, &wp); + ok(ret, "failed to set window placement, error %lu\n", GetLastError()); + + wp.length = 0; + SetLastError(0xdeadbeef); + ret = SetWindowPlacement(hwnd, &wp); +todo_wine { + ok(!ret, "SetWindowPlacement should have failed\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %lu\n", GetLastError()); +} + DestroyWindow(hwnd); } @@ -12657,7 +12668,7 @@ static void test_arrange_iconic_windows(void) static void other_process_proc(HWND hwnd) { HANDLE window_ready_event, test_done_event; - WINDOWPLACEMENT wp; + WINDOWPLACEMENT wp = {0}; DWORD ret; window_ready_event = OpenEventA(EVENT_ALL_ACCESS, FALSE, "test_opw_window");

1 0

Esme Povirk : win32u: Reject invalid length in SetWindowPlacement.
by Alexandre Julliard 24 Oct '22

24 Oct '22

Module: wine Branch: master Commit: 8e73b48f343e45100f71f51ef3c02fc4bbef2ed0 URL: https://gitlab.winehq.org/wine/wine/-/commit/8e73b48f343e45100f71f51ef3c02f… Author: Esme Povirk <esme(a)codeweavers.com> Date: Fri Dec 17 14:45:51 2021 -0600 win32u: Reject invalid length in SetWindowPlacement. --- dlls/user32/tests/win.c | 2 -- dlls/win32u/window.c | 5 +++++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index d70f8a0cafd..d9b1d9c2665 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -12504,10 +12504,8 @@ static void test_window_placement(void) wp.length = 0; SetLastError(0xdeadbeef); ret = SetWindowPlacement(hwnd, &wp); -todo_wine { ok(!ret, "SetWindowPlacement should have failed\n"); ok(GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %lu\n", GetLastError()); -} DestroyWindow(hwnd); } diff --git a/dlls/win32u/window.c b/dlls/win32u/window.c index d7263875b17..5b87dcdf465 100644 --- a/dlls/win32u/window.c +++ b/dlls/win32u/window.c @@ -2567,6 +2567,11 @@ BOOL WINAPI NtUserSetWindowPlacement( HWND hwnd, const WINDOWPLACEMENT *wpl ) { UINT flags = PLACE_MAX | PLACE_RECT; if (!wpl) return FALSE; + if (wpl->length != sizeof(*wpl)) + { + RtlSetLastWin32Error( ERROR_INVALID_PARAMETER ); + return FALSE; + } if (wpl->flags & WPF_SETMINPOSITION) flags |= PLACE_MIN; return set_window_placement( hwnd, wpl, flags ); }

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