wine-commits October 2021

wine-commits@winehq.org

2 participants
1165 discussions

Zhiyi Zhang : light.msstyles: Add scrollbar width and height.
by Alexandre Julliard 01 Oct '21

01 Oct '21

Module: wine Branch: master Commit: 760acf6c1300dc66d0524981436168b1a586574d URL: https://source.winehq.org/git/wine.git/?a=commit;h=760acf6c1300dc66d0524981… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Oct 1 11:26:14 2021 +0800 light.msstyles: Add scrollbar width and height. Fix a bug that scrollbar width and height don't change when activating Light theme. For example, when theming is inactive, change scrollbar width from the default 16 pixels to 32 pixels, then activate Light theme. Then scrollbar width should be changed to the theme specified scrollbar width. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/light.msstyles/light.rc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/light.msstyles/light.rc b/dlls/light.msstyles/light.rc index 76adf8f8398..cf9271cb612 100644 --- a/dlls/light.msstyles/light.rc +++ b/dlls/light.msstyles/light.rc @@ -144,7 +144,10 @@ BLUE_INI TEXTFILE "EdgeFillColor = 255 255 255\r\n" "\r\n[SysMetrics]\r\n" -"; System colors\r\n" +"ScrollbarWidth = 16\r\n" +"ScrollbarHeight = 16\r\n" + +"\r\n; System colors\r\n" "Scrollbar = 255 255 255\r\n" "Background = 37 111 149\r\n" "ActiveCaption = 50 150 250\r\n"

1 0

Jacek Caban : gdi32: Use NtAllocateVirtualMemory to allocate GDI_SHARED_MEMORY.
by Alexandre Julliard 01 Oct '21

01 Oct '21

Module: wine Branch: master Commit: fc7420de71f8126112ada8bf380d3a79785bb661 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fc7420de71f8126112ada8bf… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 1 01:58:03 2021 +0200 gdi32: Use NtAllocateVirtualMemory to allocate GDI_SHARED_MEMORY. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/gdiobj.c | 35 ++++++++++++++++++++++------------- 1 file changed, 22 insertions(+), 13 deletions(-) diff --git a/dlls/gdi32/gdiobj.c b/dlls/gdi32/gdiobj.c index 47b413ab0aa..8381c9e2746 100644 --- a/dlls/gdi32/gdiobj.c +++ b/dlls/gdi32/gdiobj.c @@ -42,9 +42,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(gdi); #define FIRST_GDI_HANDLE 32 -static GDI_SHARED_MEMORY gdi_shared; +static GDI_SHARED_MEMORY *gdi_shared; static GDI_HANDLE_ENTRY *next_free; -static GDI_HANDLE_ENTRY *next_unused = gdi_shared.Handles + FIRST_GDI_HANDLE; +static GDI_HANDLE_ENTRY *next_unused; static LONG debug_count; SYSTEM_BASIC_INFORMATION system_info; @@ -52,7 +52,7 @@ const struct user_callbacks *user_callbacks = NULL; static inline HGDIOBJ entry_to_handle( GDI_HANDLE_ENTRY *entry ) { - unsigned int idx = entry - gdi_shared.Handles; + unsigned int idx = entry - gdi_shared->Handles; return LongToHandle( idx | (entry->Unique << NTGDI_HANDLE_TYPE_SHIFT) ); } @@ -60,10 +60,10 @@ static inline GDI_HANDLE_ENTRY *handle_entry( HGDIOBJ handle ) { unsigned int idx = LOWORD(handle); - if (idx < GDI_MAX_HANDLE_COUNT && gdi_shared.Handles[idx].Type) + if (idx < GDI_MAX_HANDLE_COUNT && gdi_shared->Handles[idx].Type) { - if (!HIWORD( handle ) || HIWORD( handle ) == gdi_shared.Handles[idx].Unique) - return &gdi_shared.Handles[idx]; + if (!HIWORD( handle ) || HIWORD( handle ) == gdi_shared->Handles[idx].Unique) + return &gdi_shared->Handles[idx]; } if (handle) WARN( "invalid handle %p\n", handle ); return NULL; @@ -605,19 +605,26 @@ static HFONT create_scaled_font( const LOGFONTW *deffont, unsigned int dpi ) return create_font( &lf ); } -static void set_gdi_shared(void) +static void init_gdi_shared(void) { + SIZE_T size = sizeof(*gdi_shared); + + if (NtAllocateVirtualMemory( GetCurrentProcess(), (void **)&gdi_shared, 0, &size, + MEM_RESERVE | MEM_COMMIT, PAGE_READWRITE )) + return; + next_unused = gdi_shared->Handles + FIRST_GDI_HANDLE; + #ifndef _WIN64 if (NtCurrentTeb()->GdiBatchCount) { TEB64 *teb64 = (TEB64 *)(UINT_PTR)NtCurrentTeb()->GdiBatchCount; PEB64 *peb64 = (PEB64 *)(UINT_PTR)teb64->Peb; - peb64->GdiSharedHandleTable = (UINT_PTR)&gdi_shared; + peb64->GdiSharedHandleTable = (UINT_PTR)gdi_shared; return; } #endif /* NOTE: Windows uses 32-bit for 32-bit kernel */ - NtCurrentTeb()->Peb->GdiSharedHandleTable = &gdi_shared; + NtCurrentTeb()->Peb->GdiSharedHandleTable = gdi_shared; } HGDIOBJ get_stock_object( INT obj ) @@ -695,7 +702,7 @@ static void init_stock_objects( unsigned int dpi ) /* clear the NOSYSTEM bit on all stock objects*/ for (i = 0; i < STOCK_LAST + 5; i++) { - GDI_HANDLE_ENTRY *entry = &gdi_shared.Handles[FIRST_GDI_HANDLE + i]; + GDI_HANDLE_ENTRY *entry = &gdi_shared->Handles[FIRST_GDI_HANDLE + i]; entry_obj( entry )->system = TRUE; entry->StockFlag = 1; } @@ -730,7 +737,7 @@ static void dump_gdi_objects( void ) TRACE( "%u objects:\n", GDI_MAX_HANDLE_COUNT ); EnterCriticalSection( &gdi_section ); - for (entry = gdi_shared.Handles; entry < next_unused; entry++) + for (entry = gdi_shared->Handles; entry < next_unused; entry++) { if (!entry->Type) TRACE( "handle %p FREE\n", entry_to_handle( entry )); @@ -760,7 +767,7 @@ HGDIOBJ alloc_gdi_handle( struct gdi_obj_header *obj, DWORD type, const struct g entry = next_free; if (entry) next_free = (GDI_HANDLE_ENTRY *)(UINT_PTR)entry->Object; - else if (next_unused < gdi_shared.Handles + GDI_MAX_HANDLE_COUNT) + else if (next_unused < gdi_shared->Handles + GDI_MAX_HANDLE_COUNT) entry = next_unused++; else { @@ -1269,7 +1276,9 @@ NTSTATUS CDECL __wine_init_unix_lib( HMODULE module, DWORD reason, const void *p if (reason != DLL_PROCESS_ATTACH) return 0; NtQuerySystemInformation( SystemBasicInformation, &system_info, sizeof(system_info), NULL ); - set_gdi_shared(); + init_gdi_shared(); + if (!gdi_shared) return STATUS_NO_MEMORY; + dpi = font_init(); init_stock_objects( dpi ); user_callbacks = ptr_in;

1 0

Jacek Caban : gdi32: Use NtAllocateVirtualMemory to alloc DC_ATTR.
by Alexandre Julliard 01 Oct '21

01 Oct '21

Module: wine Branch: master Commit: 01b6ba88d615125d2244a28a0adfda07dca79d0e URL: https://source.winehq.org/git/wine.git/?a=commit;h=01b6ba88d615125d2244a28a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 1 01:57:54 2021 +0200 gdi32: Use NtAllocateVirtualMemory to alloc DC_ATTR. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/dc.c | 84 ++++++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 81 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index c00e5128ced..c21993a8ca5 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -26,6 +26,8 @@ #include <stdarg.h> #include <stdlib.h> #include <string.h> +#include <pthread.h> + #include "windef.h" #include "winbase.h" #include "wingdi.h" @@ -39,6 +41,18 @@ WINE_DEFAULT_DEBUG_CHANNEL(dc); +static pthread_mutex_t dc_attr_lock = PTHREAD_MUTEX_INITIALIZER; + +struct dc_attr_bucket +{ + struct list entry; + DC_ATTR *entries; + DC_ATTR *next_free; + DC_ATTR *next_unused; +}; + +static struct list dc_attr_buckets = LIST_INIT( dc_attr_buckets ); + static inline const char *debugstr_us( const UNICODE_STRING *us ) { if (!us) return "<null>"; @@ -74,6 +88,70 @@ static inline DC *get_dc_obj( HDC hdc ) } } +/* alloc DC_ATTR from a pool of memory accessible from client */ +static DC_ATTR *alloc_dc_attr(void) +{ + struct dc_attr_bucket *bucket; + DC_ATTR *dc_attr = NULL; + + pthread_mutex_lock( &dc_attr_lock ); + + LIST_FOR_EACH_ENTRY( bucket, &dc_attr_buckets, struct dc_attr_bucket, entry ) + { + if (bucket->next_free) + { + dc_attr = bucket->next_free; + bucket->next_free = *(void **)bucket->next_free; + break; + } + if ((char *)bucket->next_unused - (char *)bucket->entries + sizeof(*dc_attr) <= + system_info.AllocationGranularity) + { + dc_attr = bucket->next_unused++; + break; + } + } + + if (!dc_attr && (bucket = malloc( sizeof(*bucket) ))) + { + SIZE_T size = system_info.AllocationGranularity; + bucket->entries = NULL; + if (!NtAllocateVirtualMemory( GetCurrentProcess(), (void **)&bucket->entries, 0, &size, + MEM_RESERVE|MEM_COMMIT, PAGE_READWRITE )) + { + bucket->next_free = NULL; + bucket->next_unused = bucket->entries + 1; + dc_attr = bucket->entries; + list_add_head( &dc_attr_buckets, &bucket->entry ); + } + else free( bucket ); + } + + if (dc_attr) memset( dc_attr, 0, sizeof( *dc_attr )); + + pthread_mutex_unlock( &dc_attr_lock ); + + return dc_attr; +} + + +static void free_dc_attr( DC_ATTR *dc_attr ) +{ + struct dc_attr_bucket *bucket; + + pthread_mutex_lock( &dc_attr_lock ); + + LIST_FOR_EACH_ENTRY( bucket, &dc_attr_buckets, struct dc_attr_bucket, entry ) + { + if (bucket->entries > dc_attr || dc_attr >= bucket->next_unused) continue; + *(void **)dc_attr = bucket->next_free; + bucket->next_free = dc_attr; + break; + } + + pthread_mutex_unlock( &dc_attr_lock ); +} + /*********************************************************************** * set_initial_dc_state @@ -133,7 +211,7 @@ DC *alloc_dc_ptr( DWORD magic ) DC *dc; if (!(dc = calloc( 1, sizeof(*dc) ))) return NULL; - if (!(dc->attr = RtlAllocateHeap( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*dc->attr) ))) + if (!(dc->attr = alloc_dc_attr())) { free( dc ); return NULL; @@ -152,7 +230,7 @@ DC *alloc_dc_ptr( DWORD magic ) if (!(dc->hSelf = alloc_gdi_handle( &dc->obj, magic, &dc_funcs ))) { - RtlFreeHeap( GetProcessHeap(), 0, dc->attr ); + free_dc_attr( dc->attr ); free( dc ); return NULL; } @@ -179,7 +257,7 @@ static void free_dc_state( DC *dc ) if (dc->hVisRgn) NtGdiDeleteObjectApp( dc->hVisRgn ); if (dc->region) NtGdiDeleteObjectApp( dc->region ); if (dc->path) free_gdi_path( dc->path ); - RtlFreeHeap( GetProcessHeap(), 0, dc->attr ); + free_dc_attr( dc->attr ); free( dc ); }

1 0

Jacek Caban : gdi32: Use native memory allocators in Unix library.
by Alexandre Julliard 01 Oct '21

01 Oct '21

Module: wine Branch: master Commit: 6ea18f668174e8122e0c192f2b67d8b2c1daca2f URL: https://source.winehq.org/git/wine.git/?a=commit;h=6ea18f668174e8122e0c192f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 1 01:57:05 2021 +0200 gdi32: Use native memory allocators in Unix library. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/bitblt.c | 14 ++--- dlls/gdi32/bitmap.c | 16 +++--- dlls/gdi32/brush.c | 12 ++--- dlls/gdi32/dc.c | 20 ++++---- dlls/gdi32/dib.c | 27 +++++----- dlls/gdi32/dibdrv/bitblt.c | 8 +-- dlls/gdi32/dibdrv/dc.c | 12 ++--- dlls/gdi32/dibdrv/dibdrv.h | 2 +- dlls/gdi32/dibdrv/graphics.c | 44 ++++++++-------- dlls/gdi32/dibdrv/objects.c | 10 ++-- dlls/gdi32/dibdrv/opengl.c | 6 +-- dlls/gdi32/driver.c | 9 ++-- dlls/gdi32/emfdrv.c | 4 +- dlls/gdi32/font.c | 120 ++++++++++++++++++++----------------------- dlls/gdi32/freetype.c | 100 ++++++++++++++++++------------------ dlls/gdi32/gdiobj.c | 6 +-- dlls/gdi32/painting.c | 25 +++++---- dlls/gdi32/palette.c | 25 ++++----- dlls/gdi32/path.c | 52 +++++++++---------- dlls/gdi32/pen.c | 12 ++--- dlls/gdi32/region.c | 22 ++++---- dlls/gdi32/win32u_private.h | 3 -- 22 files changed, 266 insertions(+), 283 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6ea18f668174e8122e0c…

1 0

Alexandre Julliard : winemenubuilder: Use wide character string literals.
by Alexandre Julliard 01 Oct '21

01 Oct '21

Module: wine Branch: master Commit: 4adb160635be8edc6ea66834d1c125990cb2b26c URL: https://source.winehq.org/git/wine.git/?a=commit;h=4adb160635be8edc6ea66834… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 1 11:09:28 2021 +0200 winemenubuilder: Use wide character string literals. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winemenubuilder/winemenubuilder.c | 167 ++++++++++------------------- 1 file changed, 56 insertions(+), 111 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4adb160635be8edc6ea6…

1 0

Alexandre Julliard : winemenubuilder: Build with msvcrt.
by Alexandre Julliard 01 Oct '21

01 Oct '21

Module: wine Branch: master Commit: f1d4dd7cc83d971c6e69c3f2bdffe85dbcd81c0a URL: https://source.winehq.org/git/wine.git/?a=commit;h=f1d4dd7cc83d971c6e69c3f2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 1 10:46:39 2021 +0200 winemenubuilder: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winemenubuilder/Makefile.in | 2 +- programs/winemenubuilder/winemenubuilder.c | 222 ++++++++++++----------------- 2 files changed, 89 insertions(+), 135 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f1d4dd7cc83d971c6e69…

1 0

Alexandre Julliard : winemenubuilder: Use DOS path names to create associations.
by Alexandre Julliard 01 Oct '21

01 Oct '21

Module: wine Branch: master Commit: 2f89d63bb924f7bca144fc2d22dea906fe46737e URL: https://source.winehq.org/git/wine.git/?a=commit;h=2f89d63bb924f7bca144fc2d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 1 10:30:40 2021 +0200 winemenubuilder: Use DOS path names to create associations. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winemenubuilder/winemenubuilder.c | 148 ++++++++++++----------------- 1 file changed, 59 insertions(+), 89 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2f89d63bb924f7bca144…

1 0

Alexandre Julliard : winemenubuilder: Use DOS path names to create icon files.
by Alexandre Julliard 01 Oct '21

01 Oct '21

Module: wine Branch: master Commit: 0428292fc7f1028573037b68a423eed424ddc3ee URL: https://source.winehq.org/git/wine.git/?a=commit;h=0428292fc7f1028573037b68… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 1 10:30:28 2021 +0200 winemenubuilder: Use DOS path names to create icon files. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winemenubuilder/winemenubuilder.c | 66 +++++++++++++----------------- 1 file changed, 28 insertions(+), 38 deletions(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index dccb6c2de06..b59d9c56882 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -410,9 +410,8 @@ static char *wchars_to_xml_text(const WCHAR *string) */ static HRESULT convert_to_native_icon(IStream *icoFile, int *indices, int numIndices, - const CLSID *outputFormat, const char *outputFileName) + const CLSID *outputFormat, const WCHAR *outputFileName) { - WCHAR *dosOutputFileName = NULL; IWICImagingFactory *factory = NULL; IWICBitmapDecoder *decoder = NULL; IWICBitmapEncoder *encoder = NULL; @@ -421,12 +420,6 @@ static HRESULT convert_to_native_icon(IStream *icoFile, int *indices, int numInd int i; HRESULT hr = E_FAIL; - dosOutputFileName = wine_get_dos_file_name(outputFileName); - if (dosOutputFileName == NULL) - { - WINE_ERR("error converting %s to DOS file name\n", outputFileName); - goto end; - } hr = CoCreateInstance(&CLSID_WICImagingFactory, NULL, CLSCTX_INPROC_SERVER, &IID_IWICImagingFactory, (void**)&factory); if (FAILED(hr)) @@ -456,10 +449,10 @@ static HRESULT convert_to_native_icon(IStream *icoFile, int *indices, int numInd WINE_ERR("error 0x%08X creating bitmap encoder\n", hr); goto end; } - hr = SHCreateStreamOnFileW(dosOutputFileName, STGM_CREATE | STGM_WRITE, &outputFile); + hr = SHCreateStreamOnFileW(outputFileName, STGM_CREATE | STGM_WRITE, &outputFile); if (FAILED(hr)) { - WINE_ERR("error 0x%08X creating output file %s\n", hr, wine_dbgstr_w(dosOutputFileName)); + WINE_ERR("error 0x%08X creating output file %s\n", hr, wine_dbgstr_w(outputFileName)); goto end; } hr = IWICBitmapEncoder_Initialize(encoder, outputFile, WICBitmapEncoderNoCache); @@ -566,7 +559,6 @@ static HRESULT convert_to_native_icon(IStream *icoFile, int *indices, int numInd } end: - heap_free(dosOutputFileName); if (factory) IWICImagingFactory_Release(factory); if (decoder) @@ -1007,7 +999,7 @@ static HRESULT validate_ico(IStream **ppStream, ICONDIRENTRY **ppIconDirEntries, } static HRESULT write_native_icon(IStream *iconStream, ICONDIRENTRY *pIconDirEntry, - int numEntries, const char *icon_name) + int numEntries, const WCHAR *icon_name) { int nMax = 0, nMaxBits = 0; int nIndex = 0; @@ -1178,6 +1170,7 @@ static HRESULT platform_write_icon(IStream *icoStream, ICONDIRENTRY *iconDirEntr int numEntries, int exeIndex, LPCWSTR icoPathW, const WCHAR *destFilename, WCHAR **nativeIdentifier) { + static const WCHAR fmtW[] = {'%','s','\\','%','s','.','i','c','n','s',0}; struct { int index; int maxBits; @@ -1185,8 +1178,8 @@ static HRESULT platform_write_icon(IStream *icoStream, ICONDIRENTRY *iconDirEntr } best[ICNS_SLOTS]; int indexes[ICNS_SLOTS]; int i; - const char* tmpdir; - char *icnsPath = NULL; + WCHAR tmpdir[MAX_PATH]; + WCHAR *icnsPath; LARGE_INTEGER zero; HRESULT hr; @@ -1244,8 +1237,8 @@ static HRESULT platform_write_icon(IStream *icoStream, ICONDIRENTRY *iconDirEntr } *nativeIdentifier = compute_native_identifier(exeIndex, icoPathW, destFilename); - if (!(tmpdir = getenv("TMPDIR"))) tmpdir = "/tmp"; - icnsPath = heap_printf("%s/%s.icns", tmpdir, wchars_to_utf8_chars(*nativeIdentifier)); + GetTempPathW( MAX_PATH, tmpdir ); + icnsPath = heap_wprintf(fmtW, tmpdir, *nativeIdentifier); zero.QuadPart = 0; hr = IStream_Seek(icoStream, zero, STREAM_SEEK_SET, NULL); if (FAILED(hr)) @@ -1257,7 +1250,7 @@ static HRESULT platform_write_icon(IStream *icoStream, ICONDIRENTRY *iconDirEntr if (FAILED(hr)) { WINE_WARN("converting %s to %s failed, error 0x%08X\n", - wine_dbgstr_w(icoPathW), wine_dbgstr_a(icnsPath), hr); + wine_dbgstr_w(icoPathW), wine_dbgstr_w(icnsPath), hr); goto end; } @@ -1266,34 +1259,34 @@ end: return hr; } #else -static void refresh_icon_cache(const char *iconsDir) +static void refresh_icon_cache(const WCHAR *iconsDir) { + static const WCHAR icnW[] = {'i','c','n',0}; + WCHAR buffer[MAX_PATH]; + /* The icon theme spec only requires the mtime on the "toplevel" * directory (whatever that is) to be changed for a refresh, * but on GNOME you have to create a file in that directory * instead. Creating a file also works on KDE, Xfce and LXDE. */ - char *filename = heap_printf("%s/.wine-refresh-XXXXXX", iconsDir); - int fd = mkstemps(filename, 0); - if (fd >= 0) - { - close(fd); - unlink(filename); - } - heap_free(filename); + GetTempFileNameW( iconsDir, icnW, 0, buffer ); + DeleteFileW( buffer ); } static HRESULT platform_write_icon(IStream *icoStream, ICONDIRENTRY *iconDirEntries, int numEntries, int exeIndex, LPCWSTR icoPathW, const WCHAR *destFilename, WCHAR **nativeIdentifier) { + static const WCHAR fmtW[] = {'%','s','\\','i','c','o','n','s','\\','h','i','c','o','l','o','r',0}; + static const WCHAR fmt2W[] = {'%','s','\\','%','d','x','%','d','\\','a','p','p','s',0}; + static const WCHAR fmt3W[] = {'%','s','\\','%','s','.','p','n','g',0}; int i; - char *iconsDir = NULL; + WCHAR *iconsDir; HRESULT hr = S_OK; LARGE_INTEGER zero; *nativeIdentifier = compute_native_identifier(exeIndex, icoPathW, destFilename); - iconsDir = heap_printf("%s/icons/hicolor", xdg_data_dir_unix); + iconsDir = heap_wprintf(fmtW, xdg_data_dir); for (i = 0; i < numEntries; i++) { @@ -1301,8 +1294,8 @@ static HRESULT platform_write_icon(IStream *icoStream, ICONDIRENTRY *iconDirEntr int j; BOOLEAN duplicate = FALSE; int w, h; - char *iconDir = NULL; - char *pngPath = NULL; + WCHAR *iconDir; + WCHAR *pngPath; WINE_TRACE("[%d]: %d x %d @ %d\n", i, iconDirEntries[i].bWidth, iconDirEntries[i].bHeight, iconDirEntries[i].wBitCount); @@ -1331,9 +1324,9 @@ static HRESULT platform_write_icon(IStream *icoStream, ICONDIRENTRY *iconDirEntr w = iconDirEntries[bestIndex].bWidth ? iconDirEntries[bestIndex].bWidth : 256; h = iconDirEntries[bestIndex].bHeight ? iconDirEntries[bestIndex].bHeight : 256; - iconDir = heap_printf("%s/%dx%d/apps", iconsDir, w, h); - create_directories(iconDir); - pngPath = heap_printf("%s/%s.png", iconDir, wchars_to_utf8_chars(*nativeIdentifier)); + iconDir = heap_wprintf(fmt2W, iconsDir, w, h); + create_directoriesW(iconDir); + pngPath = heap_wprintf(fmt3W, iconDir, *nativeIdentifier); zero.QuadPart = 0; hr = IStream_Seek(icoStream, zero, STREAM_SEEK_SET, NULL); if (SUCCEEDED(hr)) @@ -2906,7 +2899,6 @@ static void cleanup_menus(void) static void thumbnail_lnk(LPCWSTR lnkPath, LPCWSTR outputPath) { char *utf8lnkPath = NULL; - char *utf8OutputPath = NULL; WCHAR *winLnkPath = NULL; IShellLinkW *shellLink = NULL; IPersistFile *persistFile = NULL; @@ -2921,7 +2913,6 @@ static void thumbnail_lnk(LPCWSTR lnkPath, LPCWSTR outputPath) HRESULT hr; utf8lnkPath = wchars_to_utf8_chars(lnkPath); - utf8OutputPath = wchars_to_utf8_chars(outputPath); winLnkPath = wine_get_dos_file_name(utf8lnkPath); if (winLnkPath == NULL) { @@ -2969,18 +2960,17 @@ static void thumbnail_lnk(LPCWSTR lnkPath, LPCWSTR outputPath) { hr = open_icon(szIconPath, iconId, FALSE, &stream, &pIconDirEntries, &numEntries); if (SUCCEEDED(hr)) - hr = write_native_icon(stream, pIconDirEntries, numEntries, utf8OutputPath); + hr = write_native_icon(stream, pIconDirEntries, numEntries, outputPath); } else { hr = open_icon(szPath, iconId, FALSE, &stream, &pIconDirEntries, &numEntries); if (SUCCEEDED(hr)) - hr = write_native_icon(stream, pIconDirEntries, numEntries, utf8OutputPath); + hr = write_native_icon(stream, pIconDirEntries, numEntries, outputPath); } end: heap_free(utf8lnkPath); - heap_free(utf8OutputPath); heap_free(winLnkPath); if (shellLink != NULL) IShellLinkW_Release(shellLink);

1 0

Alexandre Julliard : winemenubuilder: Use DOS path names to create desktop and menu files.
by Alexandre Julliard 01 Oct '21

01 Oct '21

Module: wine Branch: master Commit: 1377be60ba0117d98fede3ce1d292a5aa77edbdf URL: https://source.winehq.org/git/wine.git/?a=commit;h=1377be60ba0117d98fede3ce… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 1 10:29:44 2021 +0200 winemenubuilder: Use DOS path names to create desktop and menu files. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winemenubuilder/winemenubuilder.c | 317 +++++++++++++---------------- 1 file changed, 144 insertions(+), 173 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1377be60ba0117d98fed…

1 0

Alexandre Julliard : winemenubuilder: Use Unicode strings to write desktop entries.
by Alexandre Julliard 01 Oct '21

01 Oct '21

Module: wine Branch: master Commit: d4a773a1d778b1e0ee3ec0d35487933477145853 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d4a773a1d778b1e0ee3ec0d3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 1 10:25:57 2021 +0200 winemenubuilder: Use Unicode strings to write desktop entries. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winemenubuilder/winemenubuilder.c | 305 ++++++++++------------------- 1 file changed, 108 insertions(+), 197 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d4a773a1d778b1e0ee3e…

1 0

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 2021