wine-commits December 2020

wine-commits@winehq.org

1 participants
414 discussions

Rémi Bernon : gdi32: Only use the registry cache for application fonts.
by Alexandre Julliard 01 Dec '20

01 Dec '20

Module: wine Branch: master Commit: 63de94839cad9bd7845d79c27aff599d97104f19 URL: https://source.winehq.org/git/wine.git/?a=commit;h=63de94839cad9bd7845d79c2… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Nov 27 15:38:05 2020 +0100 gdi32: Only use the registry cache for application fonts. And load system fonts outside of the global font mutex. We now only use the mutex to protect the registry fonts initialization. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 26 ++++++++++++++++---------- dlls/gdi32/freetype.c | 6 +++--- 2 files changed, 19 insertions(+), 13 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 4cc072bd785..9fa0f45ec4b 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -7758,7 +7758,7 @@ static void load_system_bitmap_fonts(void) { dlen = sizeof(data); if (!RegQueryValueExW( hkey, fonts[i], 0, &type, (BYTE *)data, &dlen ) && type == REG_SZ) - add_system_font_resource( data, ADDFONT_ALLOW_BITMAP | ADDFONT_ADD_TO_CACHE ); + add_system_font_resource( data, ADDFONT_ALLOW_BITMAP ); } RegCloseKey( hkey ); } @@ -7789,11 +7789,11 @@ static void load_file_system_fonts(void) /* Windows directory */ get_fonts_win_dir_path( L"*", path ); - load_directory_fonts( path, ADDFONT_ADD_TO_CACHE ); + load_directory_fonts( path, 0 ); /* Wine data directory */ get_fonts_data_dir_path( L"*", path ); - load_directory_fonts( path, ADDFONT_ADD_TO_CACHE | ADDFONT_EXTERNAL_FONT ); + load_directory_fonts( path, ADDFONT_EXTERNAL_FONT ); /* custom paths */ /* @@ Wine registry key: HKCU\Software\Wine\Fonts */ @@ -7805,7 +7805,7 @@ static void load_file_system_fonts(void) if (next && next - ptr < 2) continue; lstrcpynW( path, ptr, MAX_PATH - 2 ); lstrcatW( path, L"\\*" ); - load_directory_fonts( path, ADDFONT_ADD_TO_CACHE | ADDFONT_EXTERNAL_FONT ); + load_directory_fonts( path, ADDFONT_EXTERNAL_FONT ); } } } @@ -7926,9 +7926,9 @@ static void load_registry_fonts(void) dlen /= sizeof(WCHAR); if (data[0] && data[1] == ':') - add_font_resource( data, ADDFONT_ALLOW_BITMAP | ADDFONT_ADD_TO_CACHE ); + add_font_resource( data, ADDFONT_ALLOW_BITMAP ); else if (dlen >= 6 && !wcsicmp( data + dlen - 5, L".fon" )) - add_system_font_resource( data, ADDFONT_ALLOW_BITMAP | ADDFONT_ADD_TO_CACHE ); + add_system_font_resource( data, ADDFONT_ALLOW_BITMAP ); next: vlen = ARRAY_SIZE(value); dlen = sizeof(data); @@ -7954,6 +7954,10 @@ void font_init(void) update_codepage(); if (__wine_init_unix_lib( gdi32_module, DLL_PROCESS_ATTACH, &callback_funcs, &font_funcs )) return; + load_system_bitmap_fonts(); + load_file_system_fonts(); + font_funcs->load_fonts(); + if (!(mutex = CreateMutexW( NULL, FALSE, L"__WINE_FONT_MUTEX__" ))) return; WaitForSingleObject( mutex, INFINITE ); @@ -7962,16 +7966,18 @@ void font_init(void) if (disposition == REG_CREATED_NEW_KEY) { - load_system_bitmap_fonts(); - load_file_system_fonts(); - font_funcs->load_fonts(); load_registry_fonts(); update_external_font_keys(); } - else load_font_list_from_cache(); ReleaseMutex( mutex ); + if (disposition != REG_CREATED_NEW_KEY) + { + load_registry_fonts(); + load_font_list_from_cache(); + } + reorder_font_list(); load_gdi_font_subst(); load_gdi_font_replacements(); diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index e7684728c9c..1ee02795bed 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -1303,7 +1303,7 @@ static BOOL ReadFontDir(const char *dirname, BOOL external_fonts) ReadFontDir(path, external_fonts); else { - DWORD addfont_flags = ADDFONT_ADD_TO_CACHE; + DWORD addfont_flags = 0; if(external_fonts) addfont_flags |= ADDFONT_EXTERNAL_FONT; AddFontToList(NULL, path, NULL, 0, addfont_flags); } @@ -1523,7 +1523,7 @@ static void load_fontconfig_fonts( void ) if (!(done_set = pFcStrSetCreate())) goto done; if (!(dir_list = pFcConfigGetFontDirs( config ))) goto done; - fontconfig_add_fonts_from_dir_list( config, dir_list, done_set, ADDFONT_EXTERNAL_FONT | ADDFONT_ADD_TO_CACHE ); + fontconfig_add_fonts_from_dir_list( config, dir_list, done_set, ADDFONT_EXTERNAL_FONT ); done: if (dir_list) pFcStrListDone( dir_list ); @@ -1543,7 +1543,7 @@ static void load_mac_font_callback(const void *value, void *context) if (path && CFStringGetFileSystemRepresentation(pathStr, path, len)) { TRACE("font file %s\n", path); - AddFontToList(NULL, path, NULL, 0, ADDFONT_EXTERNAL_FONT | ADDFONT_ADD_TO_CACHE); + AddFontToList(NULL, path, NULL, 0, ADDFONT_EXTERNAL_FONT); } RtlFreeHeap(GetProcessHeap(), 0, path); }

1 0

Rémi Bernon : gdi32: Only request registry font path when necessary.
by Alexandre Julliard 01 Dec '20

01 Dec '20

Module: wine Branch: master Commit: cae74aa7d9f96f57d044e5b7f0b491ff7b3b02df URL: https://source.winehq.org/git/wine.git/?a=commit;h=cae74aa7d9f96f57d044e5b7… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Nov 27 15:38:04 2020 +0100 gdi32: Only request registry font path when necessary. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index d3202d83a15..4cc072bd785 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -7910,7 +7910,7 @@ static void load_registry_fonts(void) vlen = ARRAY_SIZE(value); dlen = sizeof(data); - while (!RegEnumValueW( hkey, i++, value, &vlen, NULL, &type, (LPBYTE)data, &dlen )) + while (!RegEnumValueW( hkey, i++, value, &vlen, NULL, &type, NULL, NULL )) { if (type != REG_SZ) goto next; dlen /= sizeof(WCHAR); @@ -7918,6 +7918,13 @@ static void load_registry_fonts(void) if (find_face_from_full_name( value )) goto next; if (tmp && !*tmp) *tmp = ' '; + if (RegQueryValueExW( hkey, value, NULL, NULL, (LPBYTE)data, &dlen )) + { + WARN( "Unable to get face path %s\n", debugstr_w(value) ); + goto next; + } + + dlen /= sizeof(WCHAR); if (data[0] && data[1] == ':') add_font_resource( data, ADDFONT_ALLOW_BITMAP | ADDFONT_ADD_TO_CACHE ); else if (dlen >= 6 && !wcsicmp( data + dlen - 5, L".fon" ))

1 0

Rémi Bernon : gdi32: Update the external keys after all fonts are loaded.
by Alexandre Julliard 01 Dec '20

01 Dec '20

Module: wine Branch: master Commit: a0b7a0da401ad27905feca8c0de06d39155dfe4d URL: https://source.winehq.org/git/wine.git/?a=commit;h=a0b7a0da401ad27905feca8c… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Nov 27 15:38:03 2020 +0100 gdi32: Update the external keys after all fonts are loaded. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 98 ++++++++++++++++-------------------------------- dlls/gdi32/gdi_private.h | 1 + 2 files changed, 33 insertions(+), 66 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 7338d5fbb03..d3202d83a15 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -7812,70 +7812,57 @@ static void load_file_system_fonts(void) struct external_key { - struct wine_rb_entry entry; - BOOL found; - WCHAR value[LF_FULLFACESIZE + 12]; - WCHAR path[1]; + struct list entry; + WCHAR value[LF_FULLFACESIZE + 12]; }; -static int compare_external_key( const void *key, const struct wine_rb_entry *entry ) +static void update_external_font_keys(void) { - return facename_compare( key, WINE_RB_ENTRY_VALUE( entry, struct external_key, entry )->value, -1 ); -} + struct list external_keys = LIST_INIT(external_keys); + HKEY winnt_key = 0, win9x_key = 0; + struct gdi_font_family *family; + struct external_key *key, *next; + struct gdi_font_face *face; + DWORD len, i = 0, type, dlen, vlen; + WCHAR value[LF_FULLFACESIZE + 12], path[MAX_PATH], *tmp; + WCHAR *file; + HKEY hkey; -static struct wine_rb_tree external_keys = { compare_external_key }; + RegCreateKeyExW( HKEY_LOCAL_MACHINE, L"Software\\Microsoft\\Windows NT\\CurrentVersion\\Fonts", + 0, NULL, 0, KEY_ALL_ACCESS, NULL, &winnt_key, NULL ); + RegCreateKeyExW( HKEY_LOCAL_MACHINE, L"Software\\Microsoft\\Windows\\CurrentVersion\\Fonts", + 0, NULL, 0, KEY_ALL_ACCESS, NULL, &win9x_key, NULL ); -static HKEY load_external_font_keys(void) -{ - WCHAR value[LF_FULLFACESIZE + 12], path[MAX_PATH]; - DWORD i = 0, type, dlen, vlen; - struct external_key *key; - HKEY hkey; + /* enumerate the fonts and add external ones to the two keys */ - if (RegCreateKeyW( wine_fonts_key, L"External Fonts", &hkey )) return 0; + if (RegCreateKeyW( wine_fonts_key, L"External Fonts", &hkey )) return; vlen = ARRAY_SIZE(value); dlen = sizeof(path); while (!RegEnumValueW( hkey, i++, value, &vlen, NULL, &type, (BYTE *)path, &dlen )) { if (type != REG_SZ) goto next; - dlen /= sizeof(WCHAR); - if (!(key = HeapAlloc( GetProcessHeap(), 0, offsetof(struct external_key, path[dlen]) ))) break; - key->found = FALSE; + if ((tmp = wcsrchr( value, ' ' )) && !facename_compare( tmp, L" (TrueType)", -1 )) *tmp = 0; + if ((face = find_face_from_full_name( value ))) + { + if (!wcsicmp( face->file, path )) face->flags |= ADDFONT_EXTERNAL_FOUND; + goto next; + } + if (tmp && !*tmp) *tmp = ' '; + if (!(key = HeapAlloc( GetProcessHeap(), 0, sizeof(*key) ))) break; lstrcpyW( key->value, value ); - lstrcpyW( key->path, path ); - wine_rb_put( &external_keys, value, &key->entry ); + list_add_tail( &external_keys, &key->entry ); next: vlen = ARRAY_SIZE(value); dlen = sizeof(path); } - return hkey; -} - -static void update_external_font_keys( HKEY hkey ) -{ - HKEY winnt_key = 0, win9x_key = 0; - struct gdi_font_family *family; - struct gdi_font_face *face; - struct wine_rb_entry *entry; - struct external_key *key, *next; - DWORD len; - BOOL skip; - WCHAR value[LF_FULLFACESIZE + 12], path[MAX_PATH]; - WCHAR *file; - - RegCreateKeyExW( HKEY_LOCAL_MACHINE, L"Software\\Microsoft\\Windows NT\\CurrentVersion\\Fonts", - 0, NULL, 0, KEY_ALL_ACCESS, NULL, &winnt_key, NULL ); - RegCreateKeyExW( HKEY_LOCAL_MACHINE, L"Software\\Microsoft\\Windows\\CurrentVersion\\Fonts", - 0, NULL, 0, KEY_ALL_ACCESS, NULL, &win9x_key, NULL ); - - /* enumerate the fonts and add external ones to the two keys */ WINE_RB_FOR_EACH_ENTRY( family, &family_name_tree, struct gdi_font_family, name_entry ) { LIST_FOR_EACH_ENTRY( face, &family->faces, struct gdi_font_face, entry ) { if (!(face->flags & ADDFONT_EXTERNAL_FONT)) continue; + if ((face->flags & ADDFONT_EXTERNAL_FOUND)) continue; lstrcpyW( value, face->full_name ); if (face->scalable) lstrcatW( value, L" (TrueType)" ); @@ -7887,38 +7874,29 @@ static void update_external_font_keys( HKEY hkey ) else file = face->file; - skip = FALSE; - if ((entry = wine_rb_get( &external_keys, value ))) - { - struct external_key *key = WINE_RB_ENTRY_VALUE( entry, struct external_key, entry ); - skip = key->found && !wcsicmp( key->path, file ); - wine_rb_remove_key( &external_keys, value ); - HeapFree( GetProcessHeap(), 0, key ); - } - if (skip) continue; len = (lstrlenW(file) + 1) * sizeof(WCHAR); RegSetValueExW( winnt_key, value, 0, REG_SZ, (BYTE *)file, len ); RegSetValueExW( win9x_key, value, 0, REG_SZ, (BYTE *)file, len ); RegSetValueExW( hkey, value, 0, REG_SZ, (BYTE *)file, len ); } } - WINE_RB_FOR_EACH_ENTRY_DESTRUCTOR( key, next, &external_keys, struct external_key, entry ) + LIST_FOR_EACH_ENTRY_SAFE( key, next, &external_keys, struct external_key, entry ) { RegDeleteValueW( win9x_key, key->value ); RegDeleteValueW( winnt_key, key->value ); RegDeleteValueW( hkey, key->value ); - wine_rb_remove_key( &external_keys, key->value ); + list_remove( &key->entry ); HeapFree( GetProcessHeap(), 0, key ); } RegCloseKey( win9x_key ); RegCloseKey( winnt_key ); + RegCloseKey( hkey ); } static void load_registry_fonts(void) { WCHAR value[LF_FULLFACESIZE + 12], data[MAX_PATH], *tmp; DWORD i = 0, type, dlen, vlen; - struct wine_rb_entry *entry; HKEY hkey; /* Look under HKLM\Software\Microsoft\Windows[ NT]\CurrentVersion\Fonts @@ -7936,16 +7914,6 @@ static void load_registry_fonts(void) { if (type != REG_SZ) goto next; dlen /= sizeof(WCHAR); - if ((entry = wine_rb_get( &external_keys, value ))) - { - struct external_key *key = WINE_RB_ENTRY_VALUE( entry, struct external_key, entry ); - if (!wcsicmp( key->path, data )) - { - key->found = TRUE; - goto next; - } - } - if ((tmp = wcsrchr( value, ' ' )) && !facename_compare( tmp, L" (TrueType)", -1 )) *tmp = 0; if (find_face_from_full_name( value )) goto next; if (tmp && !*tmp) *tmp = ' '; @@ -7987,13 +7955,11 @@ void font_init(void) if (disposition == REG_CREATED_NEW_KEY) { - HKEY key = load_external_font_keys(); load_system_bitmap_fonts(); load_file_system_fonts(); font_funcs->load_fonts(); load_registry_fonts(); - update_external_font_keys( key ); - RegCloseKey( key ); + update_external_font_keys(); } else load_font_list_from_cache(); diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 163152fe839..b9a06415538 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -376,6 +376,7 @@ struct gdi_font #define ADDFONT_ADD_TO_CACHE 0x04 #define ADDFONT_ADD_RESOURCE 0x08 /* added through AddFontResource */ #define ADDFONT_VERTICAL_FONT 0x10 +#define ADDFONT_EXTERNAL_FOUND 0x20 #define ADDFONT_AA_FLAGS(flags) ((flags) << 16) struct font_backend_funcs

1 0

Rémi Bernon : gdi32: Index scalable faces by full name in rbtree.
by Alexandre Julliard 01 Dec '20

01 Dec '20

Module: wine Branch: master Commit: 7f4a8890784bea82a97f715339aa8ffd64c391f7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7f4a8890784bea82a97f7153… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Nov 27 15:38:02 2020 +0100 gdi32: Index scalable faces by full name in rbtree. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 34 +++++++++++++++++++++++++++++++++- 1 file changed, 33 insertions(+), 1 deletion(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 28179aec54a..7338d5fbb03 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -83,6 +83,7 @@ struct gdi_font_face struct bitmap_font_size size; /* set if face is a bitmap */ struct gdi_font_family *family; struct gdi_font_enum_data *cached_enum_data; + struct wine_rb_entry full_name_entry; }; static const struct font_backend_funcs *font_funcs; @@ -583,8 +584,20 @@ static int family_second_name_compare( const void *key, const struct wine_rb_ent return family_namecmp( (const WCHAR *)key, family->second_name ); } +static int face_full_name_compare( const void *key, const struct wine_rb_entry *entry ) +{ + const struct gdi_font_face *face = WINE_RB_ENTRY_VALUE( entry, const struct gdi_font_face, full_name_entry ); + return facename_compare( (const WCHAR *)key, face->full_name, LF_FULLFACESIZE - 1 ); +} + static struct wine_rb_tree family_name_tree = { family_name_compare }; static struct wine_rb_tree family_second_name_tree = { family_second_name_compare }; +static struct wine_rb_tree face_full_name_tree = { face_full_name_compare }; + +static int face_is_in_full_name_tree( const struct gdi_font_face *face ) +{ + return face->full_name_entry.parent || face_full_name_tree.root == &face->full_name_entry; +} static struct gdi_font_family *create_family( const WCHAR *name, const WCHAR *second_name ) { @@ -631,6 +644,13 @@ static struct gdi_font_family *find_family_from_any_name( const WCHAR *name ) return WINE_RB_ENTRY_VALUE( entry, struct gdi_font_family, second_name_entry ); } +static struct gdi_font_face *find_face_from_full_name( const WCHAR *full_name ) +{ + struct wine_rb_entry *entry; + if (!(entry = wine_rb_get( &face_full_name_tree, full_name ))) return NULL; + return WINE_RB_ENTRY_VALUE( entry, struct gdi_font_face, full_name_entry ); +} + static const struct list *get_family_face_list( const struct gdi_font_family *family ) { return family->replacement ? &family->replacement->faces : &family->faces; @@ -819,6 +839,7 @@ static void release_face( struct gdi_font_face *face ) list_remove( &face->entry ); release_family( face->family ); } + if (face_is_in_full_name_tree( face )) wine_rb_remove( &face_full_name_tree, &face->full_name_entry ); HeapFree( GetProcessHeap(), 0, face->file ); HeapFree( GetProcessHeap(), 0, face->style_name ); HeapFree( GetProcessHeap(), 0, face->full_name ); @@ -913,6 +934,11 @@ static BOOL insert_face_in_family_list( struct gdi_font_face *face, struct gdi_f face->family = family; family->refcount++; face->refcount++; + if (face_is_in_full_name_tree( cursor )) + { + wine_rb_replace( &face_full_name_tree, &cursor->full_name_entry, &face->full_name_entry ); + memset( &cursor->full_name_entry, 0, sizeof(cursor->full_name_entry) ); + } release_face( cursor ); return TRUE; } @@ -923,6 +949,7 @@ static BOOL insert_face_in_family_list( struct gdi_font_face *face, struct gdi_f TRACE( "Adding face %s in family %s from %s\n", debugstr_w(face->full_name), debugstr_w(family->family_name), debugstr_w(face->file) ); list_add_before( &cursor->entry, &face->entry ); + if (face->scalable) wine_rb_put( &face_full_name_tree, face->full_name, &face->full_name_entry ); face->family = family; family->refcount++; face->refcount++; @@ -7889,7 +7916,7 @@ static void update_external_font_keys( HKEY hkey ) static void load_registry_fonts(void) { - WCHAR value[LF_FULLFACESIZE + 12], data[MAX_PATH]; + WCHAR value[LF_FULLFACESIZE + 12], data[MAX_PATH], *tmp; DWORD i = 0, type, dlen, vlen; struct wine_rb_entry *entry; HKEY hkey; @@ -7918,6 +7945,11 @@ static void load_registry_fonts(void) goto next; } } + + if ((tmp = wcsrchr( value, ' ' )) && !facename_compare( tmp, L" (TrueType)", -1 )) *tmp = 0; + if (find_face_from_full_name( value )) goto next; + if (tmp && !*tmp) *tmp = ' '; + if (data[0] && data[1] == ':') add_font_resource( data, ADDFONT_ALLOW_BITMAP | ADDFONT_ADD_TO_CACHE ); else if (dlen >= 6 && !wcsicmp( data + dlen - 5, L".fon" ))

1 0

Rémi Bernon : gdi32: Load registry fonts after system fonts.
by Alexandre Julliard 01 Dec '20

01 Dec '20

Module: wine Branch: master Commit: 3c0137f81e35c3868ad543f1433f034c03809884 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3c0137f81e35c3868ad543f1… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Nov 27 15:38:01 2020 +0100 gdi32: Load registry fonts after system fonts. This fixes an issue when, if an external font path was modified in the Windows key, it was then not considered as external anymore, but still present in the external key, and then dropped from both on update. This now forcefully updates the font path in both keys if needed. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index db87a283b13..28179aec54a 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -7958,8 +7958,8 @@ void font_init(void) HKEY key = load_external_font_keys(); load_system_bitmap_fonts(); load_file_system_fonts(); - load_registry_fonts(); font_funcs->load_fonts(); + load_registry_fonts(); update_external_font_keys( key ); RegCloseKey( key ); }

1 0

Alexandre Julliard : makedep: No longer use wine/port.h.
by Alexandre Julliard 01 Dec '20

01 Dec '20

Module: wine Branch: master Commit: 0b9963ad346927fc7958687fa419c9f8062fdd32 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0b9963ad346927fc7958687f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 1 10:25:17 2020 +0100 makedep: No longer use wine/port.h. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/port.h | 14 -------------- tools/makedep.c | 10 ++++++++-- 2 files changed, 8 insertions(+), 16 deletions(-) diff --git a/include/wine/port.h b/include/wine/port.h index b1354395ca9..9c2eb7277bf 100644 --- a/include/wine/port.h +++ b/include/wine/port.h @@ -165,8 +165,6 @@ extern int _spawnvp(int mode, const char *cmdname, const char * const argv[]); * Function definitions (only when using libwine_port) */ -#ifndef NO_LIBWINE_PORT - #ifndef HAVE_GETOPT_LONG_ONLY extern char *optarg; extern int optind; @@ -230,16 +228,4 @@ int symlink(const char *from, const char *to); extern int mkstemps(char *template, int suffix_len); -#else /* NO_LIBWINE_PORT */ - -#define __WINE_NOT_PORTABLE(func) func##_is_not_portable func##_is_not_portable - -#define getopt_long __WINE_NOT_PORTABLE(getopt_long) -#define getopt_long_only __WINE_NOT_PORTABLE(getopt_long_only) -#define lstat __WINE_NOT_PORTABLE(lstat) -#define pread __WINE_NOT_PORTABLE(pread) -#define pwrite __WINE_NOT_PORTABLE(pwrite) - -#endif /* NO_LIBWINE_PORT */ - #endif /* !defined(__WINE_WINE_PORT_H) */ diff --git a/tools/makedep.c b/tools/makedep.c index cee64fd61bf..f769713a8cf 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -19,20 +19,26 @@ */ #include "config.h" -#define NO_LIBWINE_PORT -#include "wine/port.h" #include <assert.h> #include <ctype.h> #include <errno.h> +#include <fcntl.h> #include <stdio.h> #include <stdlib.h> #include <stdarg.h> #include <signal.h> #include <string.h> +#include <sys/types.h> +#include <sys/stat.h> #ifdef HAVE_UNISTD_H # include <unistd.h> #endif +#if defined(_WIN32) && !defined(__CYGWIN__) +#include <direct.h> +#include <io.h> +#define mkdir(path,mode) mkdir(path) +#endif #include "wine/list.h" struct strarray

1 0

Alexandre Julliard : configure: Remove some no longer needed configure checks.
by Alexandre Julliard 01 Dec '20

01 Dec '20

Module: wine Branch: master Commit: c8edeb132da3fb196d430f5ab5d09a9399605547 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c8edeb132da3fb196d430f5a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 1 10:23:42 2020 +0100 configure: Remove some no longer needed configure checks. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 24 ------------------------ configure.ac | 16 ---------------- include/config.h.in | 33 --------------------------------- include/wine/port.h | 10 ---------- 4 files changed, 83 deletions(-) diff --git a/configure b/configure index 283cac2f979..9ee3ffdc947 100755 --- a/configure +++ b/configure @@ -7390,7 +7390,6 @@ for ac_header in \ Carbon/Carbon.h \ CommonCrypto/CommonCryptor.h \ CoreAudio/CoreAudio.h \ - CoreServices/CoreServices.h \ DiskArbitration/DiskArbitration.h \ EGL/egl.h \ IOKit/IOKitLib.h \ @@ -7422,7 +7421,6 @@ for ac_header in \ libproc.h \ link.h \ linux/cdrom.h \ - linux/compiler.h \ linux/filter.h \ linux/hdreg.h \ linux/hidraw.h \ @@ -7435,10 +7433,8 @@ for ac_header in \ linux/types.h \ linux/ucdrom.h \ lwp.h \ - mach-o/nlist.h \ mach-o/loader.h \ mach/mach.h \ - mach/machine.h \ machine/cpu.h \ machine/sysarch.h \ mntent.h \ @@ -7457,7 +7453,6 @@ for ac_header in \ scsi/scsi.h \ scsi/scsi_ioctl.h \ scsi/sg.h \ - stdbool.h \ stdint.h \ stropts.h \ sys/attr.h \ @@ -17775,16 +17770,12 @@ for ac_func in \ pread \ proc_pidinfo \ pwrite \ - readdir \ readlink \ sched_yield \ setproctitle \ setprogname \ - settimeofday \ sigprocmask \ - strtold \ symlink \ - sysinfo \ tcdrain \ thr_kill2 @@ -18093,7 +18084,6 @@ fi for ac_func in \ getaddrinfo \ getnameinfo \ - getnetbyname \ getservbyport \ do : @@ -18689,20 +18679,6 @@ $as_echo "#define HAVE_LINUX_22_JOYSTICK_API 1" >>confdefs.h fi fi -ac_fn_c_check_member "$LINENO" "struct dirent" "d_reclen" "ac_cv_member_struct_dirent_d_reclen" "#ifdef HAVE_DIRENT_H -#include <dirent.h> -#endif -" -if test "x$ac_cv_member_struct_dirent_d_reclen" = xyes; then : - -cat >>confdefs.h <<_ACEOF -#define HAVE_STRUCT_DIRENT_D_RECLEN 1 -_ACEOF - - -fi - - ac_fn_c_check_member "$LINENO" "struct msghdr" "msg_accrights" "ac_cv_member_struct_msghdr_msg_accrights" "#include <sys/types.h> #ifdef HAVE_SYS_SOCKET_H # include <sys/socket.h> diff --git a/configure.ac b/configure.ac index 853f99e8b1c..92b555bb3b8 100644 --- a/configure.ac +++ b/configure.ac @@ -417,7 +417,6 @@ AC_CHECK_HEADERS(\ Carbon/Carbon.h \ CommonCrypto/CommonCryptor.h \ CoreAudio/CoreAudio.h \ - CoreServices/CoreServices.h \ DiskArbitration/DiskArbitration.h \ EGL/egl.h \ IOKit/IOKitLib.h \ @@ -449,7 +448,6 @@ AC_CHECK_HEADERS(\ libproc.h \ link.h \ linux/cdrom.h \ - linux/compiler.h \ linux/filter.h \ linux/hdreg.h \ linux/hidraw.h \ @@ -462,10 +460,8 @@ AC_CHECK_HEADERS(\ linux/types.h \ linux/ucdrom.h \ lwp.h \ - mach-o/nlist.h \ mach-o/loader.h \ mach/mach.h \ - mach/machine.h \ machine/cpu.h \ machine/sysarch.h \ mntent.h \ @@ -484,7 +480,6 @@ AC_CHECK_HEADERS(\ scsi/scsi.h \ scsi/scsi_ioctl.h \ scsi/sg.h \ - stdbool.h \ stdint.h \ stropts.h \ sys/attr.h \ @@ -2184,16 +2179,12 @@ AC_CHECK_FUNCS(\ pread \ proc_pidinfo \ pwrite \ - readdir \ readlink \ sched_yield \ setproctitle \ setprogname \ - settimeofday \ sigprocmask \ - strtold \ symlink \ - sysinfo \ tcdrain \ thr_kill2 ) @@ -2222,7 +2213,6 @@ dnl **** Check for functions which may rely on -lsocket on Solaris. AC_CHECK_FUNCS(\ getaddrinfo \ getnameinfo \ - getnetbyname \ getservbyport \ ) @@ -2395,12 +2385,6 @@ then fi fi -dnl Check for dirent.d_reclen -AC_CHECK_MEMBERS([struct dirent.d_reclen],,, -[#ifdef HAVE_DIRENT_H -#include <dirent.h> -#endif]) - dnl Check for socket structure members AC_CHECK_MEMBERS([struct msghdr.msg_accrights, struct sockaddr.sa_len, struct sockaddr_un.sun_len],,, [#include <sys/types.h> diff --git a/include/config.h.in b/include/config.h.in index 0bed21d9cea..c0d90c48677 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -85,9 +85,6 @@ /* Define to 1 if you have the <CoreAudio/CoreAudio.h> header file. */ #undef HAVE_COREAUDIO_COREAUDIO_H -/* Define to 1 if you have the <CoreServices/CoreServices.h> header file. */ -#undef HAVE_CORESERVICES_CORESERVICES_H - /* Define to 1 if you have the <cups/cups.h> header file. */ #undef HAVE_CUPS_CUPS_H @@ -219,9 +216,6 @@ /* Define to 1 if you have the `getnameinfo' function. */ #undef HAVE_GETNAMEINFO -/* Define to 1 if you have the `getnetbyname' function. */ -#undef HAVE_GETNETBYNAME - /* Define to 1 if you have the <getopt.h> header file. */ #undef HAVE_GETOPT_H @@ -417,9 +411,6 @@ /* Define to 1 if you have the <linux/cdrom.h> header file. */ #undef HAVE_LINUX_CDROM_H -/* Define to 1 if you have the <linux/compiler.h> header file. */ -#undef HAVE_LINUX_COMPILER_H - /* Define to 1 if you have the <linux/filter.h> header file. */ #undef HAVE_LINUX_FILTER_H @@ -519,18 +510,12 @@ /* Define to 1 if you have the `mach_continuous_time' function. */ #undef HAVE_MACH_CONTINUOUS_TIME -/* Define to 1 if you have the <mach/machine.h> header file. */ -#undef HAVE_MACH_MACHINE_H - /* Define to 1 if you have the <mach/mach.h> header file. */ #undef HAVE_MACH_MACH_H /* Define to 1 if you have the <mach-o/loader.h> header file. */ #undef HAVE_MACH_O_LOADER_H -/* Define to 1 if you have the <mach-o/nlist.h> header file. */ -#undef HAVE_MACH_O_NLIST_H - /* Define to 1 if you have the <memory.h> header file. */ #undef HAVE_MEMORY_H @@ -690,9 +675,6 @@ /* Define to 1 if you have the <QuickTime/ImageCompression.h> header file. */ #undef HAVE_QUICKTIME_IMAGECOMPRESSION_H -/* Define to 1 if you have the `readdir' function. */ -#undef HAVE_READDIR - /* Define to 1 if you have the `readlink' function. */ #undef HAVE_READLINK @@ -768,9 +750,6 @@ /* Define to 1 if you have the `setprogname' function. */ #undef HAVE_SETPROGNAME -/* Define to 1 if you have the `settimeofday' function. */ -#undef HAVE_SETTIMEOFDAY - /* Define to 1 if `interface_id' is a member of `sg_io_hdr_t'. */ #undef HAVE_SG_IO_HDR_T_INTERFACE_ID @@ -789,9 +768,6 @@ /* Define to 1 if you have the `SSLCopyPeerCertificates' function. */ #undef HAVE_SSLCOPYPEERCERTIFICATES -/* Define to 1 if you have the <stdbool.h> header file. */ -#undef HAVE_STDBOOL_H - /* Define to 1 if you have the <stdint.h> header file. */ #undef HAVE_STDINT_H @@ -807,12 +783,6 @@ /* Define to 1 if you have the <stropts.h> header file. */ #undef HAVE_STROPTS_H -/* Define to 1 if you have the `strtold' function. */ -#undef HAVE_STRTOLD - -/* Define to 1 if `d_reclen' is a member of `struct dirent'. */ -#undef HAVE_STRUCT_DIRENT_D_RECLEN - /* Define to 1 if `direction' is a member of `struct ff_effect'. */ #undef HAVE_STRUCT_FF_EFFECT_DIRECTION @@ -921,9 +891,6 @@ /* Define to 1 if you have the <syscall.h> header file. */ #undef HAVE_SYSCALL_H -/* Define to 1 if you have the `sysinfo' function. */ -#undef HAVE_SYSINFO - /* Define to 1 if you have the <SystemConfiguration/SCDynamicStoreCopyDHCPInfo.h> header file. */ #undef HAVE_SYSTEMCONFIGURATION_SCDYNAMICSTORECOPYDHCPINFO_H diff --git a/include/wine/port.h b/include/wine/port.h index fec72120ec6..b1354395ca9 100644 --- a/include/wine/port.h +++ b/include/wine/port.h @@ -62,7 +62,6 @@ static inline const char *dlerror(void) { return "No dlopen support on Windows"; #ifdef _MSC_VER -#define ftruncate chsize #define popen _popen #define pclose _pclose /* The UCRT headers in the Windows SDK #error out if we #define snprintf. @@ -77,7 +76,6 @@ static inline const char *dlerror(void) { return "No dlopen support on Windows"; #define strncasecmp _strnicmp #define strcasecmp _stricmp -typedef int mode_t; typedef long off_t; typedef int pid_t; typedef int ssize_t; @@ -124,10 +122,6 @@ extern int _spawnvp(int mode, const char *cmdname, const char * const argv[]); # define S_ISLNK(mod) (0) #endif -#ifndef S_ISSOCK -# define S_ISSOCK(mod) (0) -#endif - #ifndef S_ISDIR # define S_ISDIR(mod) (((mod) & _S_IFMT) == _S_IFDIR) #endif @@ -136,10 +130,6 @@ extern int _spawnvp(int mode, const char *cmdname, const char * const argv[]); # define S_ISCHR(mod) (((mod) & _S_IFMT) == _S_IFCHR) #endif -#ifndef S_ISFIFO -# define S_ISFIFO(mod) (((mod) & _S_IFMT) == _S_IFIFO) -#endif - #ifndef S_ISREG # define S_ISREG(mod) (((mod) & _S_IFMT) == _S_IFREG) #endif

1 0

Alexandre Julliard : libport: Remove the isfinite/isinf/isnan function replacements.
by Alexandre Julliard 01 Dec '20

01 Dec '20

Module: wine Branch: master Commit: 2bc3c8463dbcb22c20b09ce19c677020c9e8e1e7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2bc3c8463dbcb22c20b09ce1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 1 10:41:24 2020 +0100 libport: Remove the isfinite/isinf/isnan function replacements. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/wined3d_private.h | 34 ++++++++++++++++++++++++++++++++++ include/wine/port.h | 39 --------------------------------------- libs/port/Makefile.in | 3 --- libs/port/isfinite.c | 38 -------------------------------------- libs/port/isinf.c | 38 -------------------------------------- libs/port/isnan.c | 38 -------------------------------------- 6 files changed, 34 insertions(+), 156 deletions(-) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index a7baff857d0..52efe685d71 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -328,6 +328,40 @@ static inline GLenum wined3d_gl_min_mip_filter(enum wined3d_texture_filter_type return minMipLookup[min_filter].mip[mip_filter]; } +#ifdef HAVE_IEEEFP_H +#include <ieeefp.h> +#endif + +#if !defined(HAVE_ISFINITE) && !defined(isfinite) +static inline int isfinite(double x) { return finite(x); } +#endif + +#if !defined(HAVE_ISINF) && !defined(isinf) +static inline int isinf(double x) { return (!(finite(x) || isnand(x))); } +#endif + +#if !defined(HAVE_ISNAN) && !defined(isnan) +static inline int isnan(double x) { return isnand(x); } +#endif + +#ifndef INFINITY +static inline float __port_infinity(void) +{ + static const unsigned __inf_bytes = 0x7f800000; + return *(const float *)&__inf_bytes; +} +#define INFINITY __port_infinity() +#endif + +#ifndef NAN +static inline float __port_nan(void) +{ + static const unsigned __nan_bytes = 0x7fc00000; + return *(const float *)&__nan_bytes; +} +#define NAN __port_nan() +#endif + /* float_16_to_32() and float_32_to_16() (see implementation in * surface_base.c) convert 16 bit floats in the FLOAT16 data type * to standard C floats and vice versa. They do not depend on the encoding diff --git a/include/wine/port.h b/include/wine/port.h index 936f69d3bde..fec72120ec6 100644 --- a/include/wine/port.h +++ b/include/wine/port.h @@ -63,15 +63,6 @@ static inline const char *dlerror(void) { return "No dlopen support on Windows"; #ifdef _MSC_VER #define ftruncate chsize -#ifndef isfinite -# define isfinite(x) _finite(x) -#endif -#ifndef isinf -# define isinf(x) (!(_finite(x) || _isnan(x))) -#endif -#ifndef isnan -# define isnan(x) _isnan(x) -#endif #define popen _popen #define pclose _pclose /* The UCRT headers in the Windows SDK #error out if we #define snprintf. @@ -103,18 +94,6 @@ typedef int ssize_t; # endif #endif -#ifndef HAVE_ISFINITE -int isfinite(double x); -#endif - -#ifndef HAVE_ISINF -int isinf(double x); -#endif - -#ifndef HAVE_ISNAN -int isnan(double x); -#endif - /* Process creation flags */ #ifndef _P_WAIT # define _P_WAIT 0 @@ -191,24 +170,6 @@ extern int _spawnvp(int mode, const char *cmdname, const char * const argv[]); #define M_PI_2 1.570796326794896619 #endif -#ifndef INFINITY -static inline float __port_infinity(void) -{ - static const unsigned __inf_bytes = 0x7f800000; - return *(const float *)&__inf_bytes; -} -#define INFINITY __port_infinity() -#endif - -#ifndef NAN -static inline float __port_nan(void) -{ - static const unsigned __nan_bytes = 0x7fc00000; - return *(const float *)&__nan_bytes; -} -#define NAN __port_nan() -#endif - /**************************************************************** * Function definitions (only when using libwine_port) diff --git a/libs/port/Makefile.in b/libs/port/Makefile.in index 764a56f62ae..93b28e70879 100644 --- a/libs/port/Makefile.in +++ b/libs/port/Makefile.in @@ -2,9 +2,6 @@ STATICLIB = libwine_port.a C_SRCS = \ getopt.c \ - isfinite.c \ - isinf.c \ - isnan.c \ lstat.c \ mkstemps.c \ poll.c \ diff --git a/libs/port/isfinite.c b/libs/port/isfinite.c deleted file mode 100644 index b1ce304b2db..00000000000 --- a/libs/port/isfinite.c +++ /dev/null @@ -1,38 +0,0 @@ -/* - * isfinite function - * - * Copyright 2013 Francois Gouget - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include "config.h" -#include "wine/port.h" - -#if !defined(HAVE_ISFINITE) && !defined(isfinite) - -#ifdef HAVE_IEEEFP_H -#include <ieeefp.h> - -int isfinite(double x) -{ - return finite(x); -} - -#else -#error No isfinite() implementation available. -#endif - -#endif /* HAVE_ISFINITE */ diff --git a/libs/port/isinf.c b/libs/port/isinf.c deleted file mode 100644 index 89f62c90e61..00000000000 --- a/libs/port/isinf.c +++ /dev/null @@ -1,38 +0,0 @@ -/* - * isinf function - * - * Copyright 2008 Petr Sumbera - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include "config.h" -#include "wine/port.h" - -#if !defined(HAVE_ISINF) && !defined(isinf) - -#ifdef HAVE_IEEEFP_H -#include <ieeefp.h> - -int isinf(double x) -{ - return (!(finite(x) || isnand(x))); -} - -#else -#error No isinf() implementation available. -#endif - -#endif /* HAVE_ISINF */ diff --git a/libs/port/isnan.c b/libs/port/isnan.c deleted file mode 100644 index e98875c8ee1..00000000000 --- a/libs/port/isnan.c +++ /dev/null @@ -1,38 +0,0 @@ -/* - * isnan function - * - * Copyright 2008 Jacek Caban for CodeWeavers - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include "config.h" -#include "wine/port.h" - -#if !defined(HAVE_ISNAN) && !defined(isnan) - -#ifdef HAVE_IEEEFP_H -#include <ieeefp.h> - -int isnan(double x) -{ - return isnand(x); -} - -#else -#error No isnan() implementation available. -#endif - -#endif /* HAVE_ISNAN */

1 0

Alexandre Julliard : libport: Remove the usleep() function replacement.
by Alexandre Julliard 01 Dec '20

01 Dec '20

Module: wine Branch: master Commit: 7b4e10c7076ae97145de0c8a1575bf9590f6edb8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7b4e10c7076ae97145de0c8a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 1 10:21:21 2020 +0100 libport: Remove the usleep() function replacement. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 4 +--- configure.ac | 4 +--- dlls/winex11.drv/clipboard.c | 6 +++--- include/config.h.in | 6 ------ include/wine/port.h | 5 ----- libs/port/Makefile.in | 3 +-- libs/port/usleep.c | 47 -------------------------------------------- 7 files changed, 6 insertions(+), 69 deletions(-) diff --git a/configure b/configure index 7ac509dec10..283cac2f979 100755 --- a/configure +++ b/configure @@ -17778,7 +17778,6 @@ for ac_func in \ readdir \ readlink \ sched_yield \ - select \ setproctitle \ setprogname \ settimeofday \ @@ -17787,8 +17786,7 @@ for ac_func in \ symlink \ sysinfo \ tcdrain \ - thr_kill2 \ - usleep + thr_kill2 do : as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` diff --git a/configure.ac b/configure.ac index 69254a9631d..853f99e8b1c 100644 --- a/configure.ac +++ b/configure.ac @@ -2187,7 +2187,6 @@ AC_CHECK_FUNCS(\ readdir \ readlink \ sched_yield \ - select \ setproctitle \ setprogname \ settimeofday \ @@ -2196,8 +2195,7 @@ AC_CHECK_FUNCS(\ symlink \ sysinfo \ tcdrain \ - thr_kill2 \ - usleep + thr_kill2 ) CFLAGS="$ac_save_CFLAGS" diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index 695c0406a80..8a0617cfede 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -95,7 +95,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(clipboard); /* Maximum wait time for selection notify */ #define SELECTION_RETRIES 500 /* wait for .5 seconds */ -#define SELECTION_WAIT 1000 /* us */ +#define SELECTION_WAIT 1 /* ms */ #define SELECTION_UPDATE_DELAY 2000 /* delay between checks of the X11 selection */ @@ -458,7 +458,7 @@ static BOOL convert_selection( Display *display, Window win, Atom selection, Bool res = XCheckTypedWindowEvent( display, win, SelectionNotify, &event ); if (res && event.xselection.selection == selection && event.xselection.target == format->atom) return read_property( display, win, event.xselection.property, type, data, size ); - usleep( SELECTION_WAIT ); + Sleep( SELECTION_WAIT ); } ERR( "Timed out waiting for SelectionNotify event\n" ); return FALSE; @@ -1691,7 +1691,7 @@ static BOOL read_property( Display *display, Window w, Atom prop, if (res && xe.xproperty.atom == prop && xe.xproperty.state == PropertyNewValue) break; - usleep(SELECTION_WAIT); + Sleep(SELECTION_WAIT); } if (i >= SELECTION_RETRIES || diff --git a/include/config.h.in b/include/config.h.in index a6d45bf031f..0bed21d9cea 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -762,9 +762,6 @@ /* Define to 1 if you have the <Security/Security.h> header file. */ #undef HAVE_SECURITY_SECURITY_H -/* Define to 1 if you have the `select' function. */ -#undef HAVE_SELECT - /* Define to 1 if you have the `setproctitle' function. */ #undef HAVE_SETPROCTITLE @@ -1118,9 +1115,6 @@ /* Define to 1 if you have the <unistd.h> header file. */ #undef HAVE_UNISTD_H -/* Define to 1 if you have the `usleep' function. */ -#undef HAVE_USLEEP - /* Define to 1 if you have the <utime.h> header file. */ #undef HAVE_UTIME_H diff --git a/include/wine/port.h b/include/wine/port.h index a4bcbc757b7..936f69d3bde 100644 --- a/include/wine/port.h +++ b/include/wine/port.h @@ -277,10 +277,6 @@ int readlink( const char *path, char *buf, size_t size ); int symlink(const char *from, const char *to); #endif -#ifndef HAVE_USLEEP -int usleep (unsigned int useconds); -#endif /* !defined(HAVE_USLEEP) */ - extern int mkstemps(char *template, int suffix_len); #else /* NO_LIBWINE_PORT */ @@ -292,7 +288,6 @@ extern int mkstemps(char *template, int suffix_len); #define lstat __WINE_NOT_PORTABLE(lstat) #define pread __WINE_NOT_PORTABLE(pread) #define pwrite __WINE_NOT_PORTABLE(pwrite) -#define usleep __WINE_NOT_PORTABLE(usleep) #endif /* NO_LIBWINE_PORT */ diff --git a/libs/port/Makefile.in b/libs/port/Makefile.in index 26b8fae4f3d..764a56f62ae 100644 --- a/libs/port/Makefile.in +++ b/libs/port/Makefile.in @@ -12,5 +12,4 @@ C_SRCS = \ pwrite.c \ readlink.c \ spawn.c \ - symlink.c \ - usleep.c + symlink.c diff --git a/libs/port/usleep.c b/libs/port/usleep.c deleted file mode 100644 index da4ee3581c9..00000000000 --- a/libs/port/usleep.c +++ /dev/null @@ -1,47 +0,0 @@ -/* - * usleep function - * - * Copyright 1996 Alexandre Julliard - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include "config.h" -#include "wine/port.h" - -#include <errno.h> - -#ifndef HAVE_USLEEP -int usleep (unsigned int useconds) -{ -#if defined(__EMX__) - DosSleep(useconds); - return 0; -#elif defined(__BEOS__) - return snooze(useconds); -#elif defined(HAVE_SELECT) - struct timeval delay; - - delay.tv_sec = useconds / 1000000; - delay.tv_usec = useconds % 1000000; - - select( 0, 0, 0, 0, &delay ); - return 0; -#else /* defined(__EMX__) || defined(__BEOS__) || defined(HAVE_SELECT) */ - errno = ENOSYS; - return -1; -#endif /* defined(__EMX__) || defined(__BEOS__) || defined(HAVE_SELECT) */ -} -#endif /* HAVE_USLEEP */

1 0

Alexandre Julliard : libport: Remove the strnlen() function replacement.
by Alexandre Julliard 01 Dec '20

01 Dec '20

Module: wine Branch: master Commit: db7c934f8e141315824004cbd90ecda07f12ba6d URL: https://source.winehq.org/git/wine.git/?a=commit;h=db7c934f8e141315824004cb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 1 10:19:50 2020 +0100 libport: Remove the strnlen() function replacement. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 - configure.ac | 1 - dlls/wined3d/shader_sm4.c | 7 +------ include/config.h.in | 3 --- include/wine/port.h | 5 ----- libs/port/Makefile.in | 1 - libs/port/strnlen.c | 31 ------------------------------- 7 files changed, 1 insertion(+), 48 deletions(-) diff --git a/configure b/configure index 6c2bcc37f95..7ac509dec10 100755 --- a/configure +++ b/configure @@ -17783,7 +17783,6 @@ for ac_func in \ setprogname \ settimeofday \ sigprocmask \ - strnlen \ strtold \ symlink \ sysinfo \ diff --git a/configure.ac b/configure.ac index 2233c7266fc..69254a9631d 100644 --- a/configure.ac +++ b/configure.ac @@ -2192,7 +2192,6 @@ AC_CHECK_FUNCS(\ setprogname \ settimeofday \ sigprocmask \ - strnlen \ strtold \ symlink \ sysinfo \ diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 90135553d8f..4635910269f 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -1939,18 +1939,13 @@ static HRESULT parse_dxbc(const char *data, SIZE_T data_size, static const char *shader_get_string(const char *data, size_t data_size, DWORD offset) { - size_t len, max_len; - if (offset >= data_size) { WARN("Invalid offset %#x (data size %#lx).\n", offset, (long)data_size); return NULL; } - max_len = data_size - offset; - len = strnlen(data + offset, max_len); - - if (len == max_len) + if (!memchr( data + offset, 0, data_size - offset )) return NULL; return data + offset; diff --git a/include/config.h.in b/include/config.h.in index 94232030cf0..a6d45bf031f 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -807,9 +807,6 @@ /* Define to 1 if you have the <string.h> header file. */ #undef HAVE_STRING_H -/* Define to 1 if you have the `strnlen' function. */ -#undef HAVE_STRNLEN - /* Define to 1 if you have the <stropts.h> header file. */ #undef HAVE_STROPTS_H diff --git a/include/wine/port.h b/include/wine/port.h index 2b127e59e20..a4bcbc757b7 100644 --- a/include/wine/port.h +++ b/include/wine/port.h @@ -273,10 +273,6 @@ ssize_t pwrite( int fd, const void *buf, size_t count, off_t offset ); int readlink( const char *path, char *buf, size_t size ); #endif /* HAVE_READLINK */ -#ifndef HAVE_STRNLEN -size_t strnlen( const char *str, size_t maxlen ); -#endif /* !defined(HAVE_STRNLEN) */ - #ifndef HAVE_SYMLINK int symlink(const char *from, const char *to); #endif @@ -296,7 +292,6 @@ extern int mkstemps(char *template, int suffix_len); #define lstat __WINE_NOT_PORTABLE(lstat) #define pread __WINE_NOT_PORTABLE(pread) #define pwrite __WINE_NOT_PORTABLE(pwrite) -#define strnlen __WINE_NOT_PORTABLE(strnlen) #define usleep __WINE_NOT_PORTABLE(usleep) #endif /* NO_LIBWINE_PORT */ diff --git a/libs/port/Makefile.in b/libs/port/Makefile.in index 8a963d22b8d..26b8fae4f3d 100644 --- a/libs/port/Makefile.in +++ b/libs/port/Makefile.in @@ -12,6 +12,5 @@ C_SRCS = \ pwrite.c \ readlink.c \ spawn.c \ - strnlen.c \ symlink.c \ usleep.c diff --git a/libs/port/strnlen.c b/libs/port/strnlen.c deleted file mode 100644 index ab6668d3466..00000000000 --- a/libs/port/strnlen.c +++ /dev/null @@ -1,31 +0,0 @@ -/* - * strnlen function - * - * Copyright 2017 Alexandre Julliard - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include "config.h" -#include "wine/port.h" - -#ifndef HAVE_STRNLEN -size_t strnlen( const char *str, size_t maxlen ) -{ - const char *ptr = memchr( str, 0, maxlen ); - if (!ptr) return maxlen; - return ptr - str; -} -#endif /* HAVE_STRNLEN */

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 December 2020