November 2022 - Wine-commits

Alexandros Frantzis : winevulkan: Generate "in_ext" definition on demand.
by Alexandre Julliard 16 Nov '22

16 Nov '22

Module: wine Branch: master Commit: ad7945eb41f7c8849655e785dfd8656af7c7ea6f URL: https://gitlab.winehq.org/wine/wine/-/commit/ad7945eb41f7c8849655e785dfd865… Author: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> Date: Wed Nov 16 13:47:59 2022 +0200 winevulkan: Generate "in_ext" definition on demand. There are cases in StructConversionFunction.definition where we will generate copy code for extension struct members, without emitting the definition of "in_ext" variable used in the copy code. This issue is triggered by mismatches in the condition that guards the generation of the "in_ext" definitions, and the condition(s) that govern the generation of the member copy code (e.g., in StructConversionFunction.member_needs_copy and VkMember.needs_conversion). In order to avoid such mismatches and the burden of having to keep the conditions in sync, this commit generates the definition on demand, by checking if it's actually needed by the member copy code. Signed-off-by: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> --- dlls/winevulkan/make_vulkan | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 3257481b746..8c0cd7bc8ec 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -2199,20 +2199,25 @@ class StructConversionFunction(object): body += ident + "{0} *out_ext = conversion_context_alloc(ctx, sizeof(*out_ext));\n".format(out_type) else: body += ident + "{0} *out_ext = find_next_struct(out_header, {1});\n".format(out_type, stype) - if self.direction == Direction.OUTPUT or not ext.returnedonly: - body += ident + "{0} *in_ext = ({0} *)in_header;\n".format(in_type) + + copy_body = "" for m in ext: if m.name == "sType": - body += ident + "out_ext->sType = {0};\n".format(stype) + copy_body += ident + "out_ext->sType = {0};\n".format(stype) continue if not self.member_needs_copy(ext, m): continue if m.name == "pNext": - body += ident + "out_ext->pNext = NULL;\n" + copy_body += ident + "out_ext->pNext = NULL;\n" continue - body += ident + m.copy("in_ext->", "out_ext->", self.direction, self.conv, True) + copy_body += ident + m.copy("in_ext->", "out_ext->", self.direction, self.conv, True) + + # Generate the definition of "in_ext" if we need it + if "in_ext->" in copy_body: + body += ident + "{0} *in_ext = ({0} *)in_header;\n".format(in_type) + body += copy_body if self.direction == Direction.INPUT: body += ident + "out_header->pNext = (void *)out_ext;\n"

1 0

Alex Henrie : localspl: Use the wcsdup function instead of reimplementing it.
by Alexandre Julliard 16 Nov '22

16 Nov '22

Module: wine Branch: master Commit: c6932e247d8534e38f206da5045b2683a8856f74 URL: https://gitlab.winehq.org/wine/wine/-/commit/c6932e247d8534e38f206da5045b26… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Nov 15 21:47:55 2022 -0700 localspl: Use the wcsdup function instead of reimplementing it. --- dlls/localspl/provider.c | 26 ++++---------------------- 1 file changed, 4 insertions(+), 22 deletions(-) diff --git a/dlls/localspl/provider.c b/dlls/localspl/provider.c index 4faf38c9c61..b33abd723c9 100644 --- a/dlls/localspl/provider.c +++ b/dlls/localspl/provider.c @@ -275,24 +275,6 @@ static const DWORD di_sizeof[] = {0, sizeof(DRIVER_INFO_1W), sizeof(DRIVER_INFO_ 0, sizeof(DRIVER_INFO_8W)}; -/****************************************************************** - * strdupW [internal] - * - * create a copy of a unicode-string - * - */ -static LPWSTR strdupW(LPCWSTR p) -{ - LPWSTR ret; - DWORD len; - - if(!p) return NULL; - len = (wcslen(p) + 1) * sizeof(WCHAR); - ret = malloc(len); - if (ret) memcpy(ret, p, len); - return ret; -} - /****************************************************************** * apd_copyfile [internal] * @@ -618,8 +600,8 @@ static monitor_t * monitor_load(LPCWSTR name, LPWSTR dllname) WARN("%s not found\n", debugstr_w(regroot)); } - pm->name = strdupW(name); - pm->dllname = strdupW(driver); + pm->name = wcsdup(name); + pm->dllname = wcsdup(driver); if ((name && (!regroot || !pm->name)) || !pm->dllname) { monitor_unload(pm); @@ -1427,10 +1409,10 @@ static HANDLE printer_alloc_handle(LPCWSTR name, LPPRINTER_DEFAULTSW pDefault) if (!printer) goto end; /* clone the base name. This is NULL for the printserver */ - printer->printername = strdupW(printername); + printer->printername = wcsdup(printername); /* clone the full name */ - printer->name = strdupW(name); + printer->name = wcsdup(name); if (name && (!printer->name)) { printer_free(printer); printer = NULL;

1 0

Alex Henrie : d3dx9/tests: Use standard C functions for memory allocation in mesh.c.
by Alexandre Julliard 16 Nov '22

16 Nov '22

Module: wine Branch: master Commit: 0587b7177346d041514e89b0d6b1e0a21b868b02 URL: https://gitlab.winehq.org/wine/wine/-/commit/0587b7177346d041514e89b0d6b1e0… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Nov 13 21:36:02 2022 -0700 d3dx9/tests: Use standard C functions for memory allocation in mesh.c. --- dlls/d3dx9_36/tests/mesh.c | 137 +++++++++++++++++++++------------------------ 1 file changed, 63 insertions(+), 74 deletions(-)

1 0

Alex Henrie : httpapi: Use standard C functions for memory allocation.
by Alexandre Julliard 16 Nov '22

16 Nov '22

Module: wine Branch: master Commit: 614b881b5d265f82cd5bd2d922ba21ed54f07847 URL: https://gitlab.winehq.org/wine/wine/-/commit/614b881b5d265f82cd5bd2d922ba21… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Nov 15 21:57:17 2022 -0700 httpapi: Use standard C functions for memory allocation. --- dlls/httpapi/httpapi_main.c | 33 ++++++++++++--------------------- 1 file changed, 12 insertions(+), 21 deletions(-) diff --git a/dlls/httpapi/httpapi_main.c b/dlls/httpapi/httpapi_main.c index a5f8007b0a9..964589021d6 100644 --- a/dlls/httpapi/httpapi_main.c +++ b/dlls/httpapi/httpapi_main.c @@ -22,19 +22,10 @@ #include "winsvc.h" #include "winternl.h" #include "wine/debug.h" -#include "wine/heap.h" #include "wine/list.h" WINE_DEFAULT_DEBUG_CHANNEL(http); -static WCHAR *heap_strdupW(const WCHAR *str) -{ - int len = wcslen(str) + 1; - WCHAR *ret = heap_alloc(len * sizeof(WCHAR)); - wcscpy(ret, str); - return ret; -} - /*********************************************************************** * HttpInitialize (HTTPAPI.@) * @@ -216,7 +207,7 @@ static ULONG add_url(HANDLE queue, const WCHAR *urlW, HTTP_URL_CONTEXT context) int len; len = WideCharToMultiByte(CP_ACP, 0, urlW, -1, NULL, 0, NULL, NULL); - if (!(params = heap_alloc(offsetof(struct http_add_url_params, url[len])))) + if (!(params = malloc(offsetof(struct http_add_url_params, url[len])))) return ERROR_OUTOFMEMORY; WideCharToMultiByte(CP_ACP, 0, urlW, -1, params->url, len, NULL, NULL); params->context = context; @@ -227,7 +218,7 @@ static ULONG add_url(HANDLE queue, const WCHAR *urlW, HTTP_URL_CONTEXT context) offsetof(struct http_add_url_params, url[len]), NULL, 0, NULL, &ovl)) ret = GetLastError(); CloseHandle(ovl.hEvent); - heap_free(params); + free(params); return ret; } @@ -249,7 +240,7 @@ static ULONG remove_url(HANDLE queue, const WCHAR *urlW) int len; len = WideCharToMultiByte(CP_ACP, 0, urlW, -1, NULL, 0, NULL, NULL); - if (!(url = heap_alloc(len))) + if (!(url = malloc(len))) return ERROR_OUTOFMEMORY; WideCharToMultiByte(CP_ACP, 0, urlW, -1, url, len, NULL, NULL); @@ -258,7 +249,7 @@ static ULONG remove_url(HANDLE queue, const WCHAR *urlW) if (!DeviceIoControl(queue, IOCTL_HTTP_REMOVE_URL, url, len, NULL, 0, NULL, &ovl)) ret = GetLastError(); CloseHandle(ovl.hEvent); - heap_free(url); + free(url); return ret; } @@ -470,7 +461,7 @@ ULONG WINAPI HttpSendHttpResponse(HANDLE queue, HTTP_REQUEST_ID id, ULONG flags, } len += 2; - if (!(buffer = heap_alloc(offsetof(struct http_response, buffer[len])))) + if (!(buffer = malloc(offsetof(struct http_response, buffer[len])))) return ERROR_OUTOFMEMORY; buffer->id = id; buffer->len = len; @@ -512,7 +503,7 @@ ULONG WINAPI HttpSendHttpResponse(HANDLE queue, HTTP_REQUEST_ID id, ULONG flags, offsetof(struct http_response, buffer[len]), NULL, 0, NULL, ovl)) ret = GetLastError(); - heap_free(buffer); + free(buffer); return ret; } @@ -573,7 +564,7 @@ ULONG WINAPI HttpCreateServerSession(HTTPAPI_VERSION version, HTTP_SERVER_SESSIO || version.HttpApiMinorVersion) return ERROR_REVISION_MISMATCH; - if (!(session = heap_alloc(sizeof(*session)))) + if (!(session = malloc(sizeof(*session)))) return ERROR_OUTOFMEMORY; list_add_tail(&server_sessions, &session->entry); @@ -601,7 +592,7 @@ ULONG WINAPI HttpCloseServerSession(HTTP_SERVER_SESSION_ID id) HttpCloseUrlGroup((ULONG_PTR)group); } list_remove(&session->entry); - heap_free(session); + free(session); return ERROR_SUCCESS; } @@ -619,7 +610,7 @@ ULONG WINAPI HttpCreateUrlGroup(HTTP_SERVER_SESSION_ID session_id, HTTP_URL_GROU if (!(session = get_server_session(session_id))) return ERROR_INVALID_PARAMETER; - if (!(group = heap_alloc_zero(sizeof(*group)))) + if (!(group = calloc(1, sizeof(*group)))) return ERROR_OUTOFMEMORY; list_add_tail(&url_groups, &group->entry); list_add_tail(&session->groups, &group->session_entry); @@ -643,7 +634,7 @@ ULONG WINAPI HttpCloseUrlGroup(HTTP_URL_GROUP_ID id) list_remove(&group->session_entry); list_remove(&group->entry); - heap_free(group); + free(group); return ERROR_SUCCESS; } @@ -704,7 +695,7 @@ ULONG WINAPI HttpAddUrlToUrlGroup(HTTP_URL_GROUP_ID id, const WCHAR *url, return ret; } - if (!(group->url = heap_strdupW(url))) + if (!(group->url = wcsdup(url))) return ERROR_OUTOFMEMORY; group->context = context; @@ -726,7 +717,7 @@ ULONG WINAPI HttpRemoveUrlFromUrlGroup(HTTP_URL_GROUP_ID id, const WCHAR *url, U if (flags) FIXME("Ignoring flags %#lx.\n", flags); - heap_free(group->url); + free(group->url); group->url = NULL; if (group->queue)

1 0

Alexandre Julliard : ntdll: Use the unique id of the user locale for resource lookup.
by Alexandre Julliard 16 Nov '22

16 Nov '22

Module: wine Branch: master Commit: b8845e61be25d1cd174901f4d4cf5ec54539ceb4 URL: https://gitlab.winehq.org/wine/wine/-/commit/b8845e61be25d1cd174901f4d4cf5e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 16 10:44:36 2022 +0100 ntdll: Use the unique id of the user locale for resource lookup. --- dlls/ntdll/locale.c | 40 ++++++++++++++++++++++++++++++++++++---- dlls/ntdll/ntdll_misc.h | 1 + dlls/ntdll/resource.c | 18 ++++++++---------- 3 files changed, 45 insertions(+), 14 deletions(-) diff --git a/dlls/ntdll/locale.c b/dlls/ntdll/locale.c index b4bfdf48f0c..105de1feec4 100644 --- a/dlls/ntdll/locale.c +++ b/dlls/ntdll/locale.c @@ -39,9 +39,13 @@ UINT NlsAnsiCodePage = 0; BYTE NlsMbCodePageTag = 0; BYTE NlsMbOemCodePageTag = 0; +static LCID user_resource_lcid; +static LCID user_resource_neutral_lcid; +static LCID system_lcid; static NLSTABLEINFO nls_info = { { CP_UTF8 }, { CP_UTF8 } }; static struct norm_table *norm_tables[16]; static const NLS_LOCALE_HEADER *locale_table; +static const WCHAR *locale_strings; static WCHAR casemap( USHORT *table, WCHAR ch ) @@ -94,7 +98,6 @@ void locale_init(void) WCHAR locale[LOCALE_NAME_MAX_LENGTH]; LARGE_INTEGER unused; SIZE_T size; - LCID system_lcid; UINT ansi_cp = 1252, oem_cp = 437; void *ansi_ptr = utf8, *oem_ptr = utf8, *case_ptr; NTSTATUS status; @@ -107,6 +110,7 @@ void locale_init(void) return; } locale_table = (const NLS_LOCALE_HEADER *)((char *)header + header->locales); + locale_strings = (const WCHAR *)((char *)locale_table + locale_table->strings_offset); if (system_lcid == LOCALE_CUSTOM_UNSPECIFIED) { @@ -119,6 +123,26 @@ void locale_init(void) oem_cp = get_locale_data( locale_table, entry->idx )->idefaultcodepage; } + NtQueryDefaultLocale( TRUE, &user_resource_lcid ); + user_resource_neutral_lcid = PRIMARYLANGID( user_resource_lcid ); + if (user_resource_lcid == LOCALE_CUSTOM_UNSPECIFIED) + { + const NLS_LOCALE_LCNAME_INDEX *entry; + const WCHAR *parent; + WCHAR bufferW[LOCALE_NAME_MAX_LENGTH]; + SIZE_T len; + + if (!RtlQueryEnvironmentVariable( NULL, L"WINEUSERLOCALE", 14, bufferW, ARRAY_SIZE(bufferW), &len ) + && (entry = find_lcname_entry( locale_table, bufferW ))) + { + user_resource_lcid = get_locale_data( locale_table, entry->idx )->unique_lcid; + parent = locale_strings + get_locale_data( locale_table, entry->idx )->sparent; + if (*parent && (entry = find_lcname_entry( locale_table, parent + 1 ))) + user_resource_neutral_lcid = get_locale_data( locale_table, entry->idx )->unique_lcid; + } + } + TRACE( "resources: %04x/%04x/%04x\n", user_resource_lcid, user_resource_neutral_lcid, system_lcid ); + if (!RtlQueryActivationContextApplicationSettings( 0, NULL, L"http://schemas.microsoft.com/SMI/2019/WindowsSettings", L"activeCodePage", locale, ARRAY_SIZE(locale), NULL )) { @@ -159,6 +183,15 @@ void locale_init(void) } +/* return LCIDs to use for resource lookup */ +void get_resource_lcids( LANGID *user, LANGID *user_neutral, LANGID *system ) +{ + *user = LANGIDFROMLCID( user_resource_lcid ); + *user_neutral = LANGIDFROMLCID( user_resource_neutral_lcid ); + *system = LANGIDFROMLCID( system_lcid ); +} + + static NTSTATUS get_dummy_preferred_ui_language( DWORD flags, LANGID lang, ULONG *count, WCHAR *buffer, ULONG *size ) { @@ -841,7 +874,6 @@ BOOLEAN WINAPI RtlIsValidLocaleName( const WCHAR *name, ULONG flags ) */ NTSTATUS WINAPI RtlLcidToLocaleName( LCID lcid, UNICODE_STRING *str, ULONG flags, BOOLEAN alloc ) { - const WCHAR *strings = (const WCHAR *)((char *)locale_table + locale_table->strings_offset); const NLS_LOCALE_LCID_INDEX *entry; const WCHAR *name; ULONG len; @@ -855,7 +887,7 @@ NTSTATUS WINAPI RtlLcidToLocaleName( LCID lcid, UNICODE_STRING *str, ULONG flags break; case LOCALE_SYSTEM_DEFAULT: case LOCALE_CUSTOM_DEFAULT: - NtQueryDefaultLocale( FALSE, &lcid ); + lcid = system_lcid; break; case LOCALE_CUSTOM_UI_DEFAULT: return STATUS_UNSUCCESSFUL; @@ -868,7 +900,7 @@ NTSTATUS WINAPI RtlLcidToLocaleName( LCID lcid, UNICODE_STRING *str, ULONG flags if (!(flags & 2) && !get_locale_data( locale_table, entry->idx )->inotneutral) return STATUS_INVALID_PARAMETER_1; - name = strings + entry->name; + name = locale_strings + entry->name; len = *name++; if (alloc) diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index 36972a966f1..d1a7790991b 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -72,6 +72,7 @@ extern void actctx_init(void) DECLSPEC_HIDDEN; extern void locale_init(void) DECLSPEC_HIDDEN; extern void init_user_process_params(void) DECLSPEC_HIDDEN; extern void CDECL DECLSPEC_NORETURN signal_start_thread( CONTEXT *ctx ) DECLSPEC_HIDDEN; +extern void get_resource_lcids( LANGID *user, LANGID *user_neutral, LANGID *system ) DECLSPEC_HIDDEN; /* module handling */ extern LIST_ENTRY tls_links DECLSPEC_HIDDEN; diff --git a/dlls/ntdll/resource.c b/dlls/ntdll/resource.c index 58a0fc7d2e2..2d32aafe1c9 100644 --- a/dlls/ntdll/resource.c +++ b/dlls/ntdll/resource.c @@ -175,7 +175,6 @@ static const IMAGE_RESOURCE_DIRECTORY *find_entry_by_name( const IMAGE_RESOURCE_ static NTSTATUS find_entry( HMODULE hmod, const LDR_RESOURCE_INFO *info, ULONG level, const void **ret, int want_dir ) { - static LCID user_lcid, system_lcid; ULONG size; const void *root; const IMAGE_RESOURCE_DIRECTORY *resdirptr; @@ -210,29 +209,28 @@ static NTSTATUS find_entry( HMODULE hmod, const LDR_RESOURCE_INFO *info, /* if no explicitly specified language, try some defaults */ if (PRIMARYLANGID(info->Language) == LANG_NEUTRAL) { + LANGID user_lang, user_neutral_lang, system_lang; + + get_resource_lcids( &user_lang, &user_neutral_lang, &system_lang ); + /* user defaults, unless SYS_DEFAULT sublanguage specified */ if (SUBLANGID(info->Language) != SUBLANG_SYS_DEFAULT) { - if (!user_lcid) NtQueryDefaultLocale( TRUE, &user_lcid ); - /* 4. current thread locale language */ pos = push_language( list, pos, LANGIDFROMLCID(NtCurrentTeb()->CurrentLocale) ); /* 5. user locale language */ - pos = push_language( list, pos, LANGIDFROMLCID(user_lcid) ); + pos = push_language( list, pos, user_lang ); /* 6. user locale language with neutral sublanguage */ - pos = push_language( list, pos, MAKELANGID( PRIMARYLANGID(user_lcid), SUBLANG_NEUTRAL ) ); + pos = push_language( list, pos, user_neutral_lang ); } - /* now system defaults */ - if (!system_lcid) NtQueryDefaultLocale( FALSE, &system_lcid ); - /* 7. system locale language */ - pos = push_language( list, pos, LANGIDFROMLCID( system_lcid ) ); + pos = push_language( list, pos, system_lang ); /* 8. system locale language with neutral sublanguage */ - pos = push_language( list, pos, MAKELANGID( PRIMARYLANGID(system_lcid), SUBLANG_NEUTRAL ) ); + pos = push_language( list, pos, PRIMARYLANGID( system_lang )); /* 9. English */ pos = push_language( list, pos, MAKELANGID( LANG_ENGLISH, SUBLANG_DEFAULT ) );

1 0

Alexandre Julliard : include: Remove custom/undocumented language identifiers.
by Alexandre Julliard 16 Nov '22

16 Nov '22

Module: wine Branch: master Commit: a1c8232b33b2fced53b577908a27823a69820f91 URL: https://gitlab.winehq.org/wine/wine/-/commit/a1c8232b33b2fced53b577908a2782… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 16 10:48:14 2022 +0100 include: Remove custom/undocumented language identifiers. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/tests/font.c | 6 +++--- dlls/gdiplus/font.c | 6 +++--- dlls/win32u/freetype.c | 6 +++--- dlls/win32u/opentype.c | 6 +++--- include/winnt.rh | 32 -------------------------------- 5 files changed, 12 insertions(+), 44 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 86c34a0deaa..608749e0446 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -3687,8 +3687,8 @@ static const LANGID mac_langid_table[] = 0, /* TT_MAC_LANGID_RUANDA */ 0, /* TT_MAC_LANGID_RUNDI */ 0, /* TT_MAC_LANGID_CHEWA */ - MAKELANGID(LANG_MALAGASY,SUBLANG_DEFAULT), /* TT_MAC_LANGID_MALAGASY */ - MAKELANGID(LANG_ESPERANTO,SUBLANG_DEFAULT), /* TT_MAC_LANGID_ESPERANTO */ + 0, /* TT_MAC_LANGID_MALAGASY */ + 0, /* TT_MAC_LANGID_ESPERANTO */ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 95-111 */ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 112-127 */ MAKELANGID(LANG_WELSH,SUBLANG_DEFAULT), /* TT_MAC_LANGID_WELSH */ @@ -3708,7 +3708,7 @@ static const LANGID mac_langid_table[] = MAKELANGID(LANG_BRETON,SUBLANG_DEFAULT), /* TT_MAC_LANGID_BRETON */ MAKELANGID(LANG_INUKTITUT,SUBLANG_DEFAULT), /* TT_MAC_LANGID_INUKTITUT */ MAKELANGID(LANG_SCOTTISH_GAELIC,SUBLANG_DEFAULT), /* TT_MAC_LANGID_SCOTTISH_GAELIC */ - MAKELANGID(LANG_MANX_GAELIC,SUBLANG_DEFAULT), /* TT_MAC_LANGID_MANX_GAELIC */ + 0, /* TT_MAC_LANGID_MANX_GAELIC */ MAKELANGID(LANG_IRISH,SUBLANG_IRISH_IRELAND), /* TT_MAC_LANGID_IRISH_GAELIC */ 0, /* TT_MAC_LANGID_TONGAN */ 0, /* TT_MAC_LANGID_GREEK_POLYTONIC */ diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c index 57849733a9c..03678623606 100644 --- a/dlls/gdiplus/font.c +++ b/dlls/gdiplus/font.c @@ -1279,8 +1279,8 @@ static const LANGID mac_langid_table[] = 0, /* TT_MAC_LANGID_RUANDA */ 0, /* TT_MAC_LANGID_RUNDI */ 0, /* TT_MAC_LANGID_CHEWA */ - MAKELANGID(LANG_MALAGASY,SUBLANG_DEFAULT), /* TT_MAC_LANGID_MALAGASY */ - MAKELANGID(LANG_ESPERANTO,SUBLANG_DEFAULT), /* TT_MAC_LANGID_ESPERANTO */ + 0, /* TT_MAC_LANGID_MALAGASY */ + 0, /* TT_MAC_LANGID_ESPERANTO */ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 95-111 */ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 112-127 */ MAKELANGID(LANG_WELSH,SUBLANG_DEFAULT), /* TT_MAC_LANGID_WELSH */ @@ -1300,7 +1300,7 @@ static const LANGID mac_langid_table[] = MAKELANGID(LANG_BRETON,SUBLANG_DEFAULT), /* TT_MAC_LANGID_BRETON */ MAKELANGID(LANG_INUKTITUT,SUBLANG_DEFAULT), /* TT_MAC_LANGID_INUKTITUT */ MAKELANGID(LANG_SCOTTISH_GAELIC,SUBLANG_DEFAULT), /* TT_MAC_LANGID_SCOTTISH_GAELIC */ - MAKELANGID(LANG_MANX_GAELIC,SUBLANG_DEFAULT), /* TT_MAC_LANGID_MANX_GAELIC */ + 0, /* TT_MAC_LANGID_MANX_GAELIC */ MAKELANGID(LANG_IRISH,SUBLANG_IRISH_IRELAND), /* TT_MAC_LANGID_IRISH_GAELIC */ 0, /* TT_MAC_LANGID_TONGAN */ 0, /* TT_MAC_LANGID_GREEK_POLYTONIC */ diff --git a/dlls/win32u/freetype.c b/dlls/win32u/freetype.c index d911039647b..d262c0ca1be 100644 --- a/dlls/win32u/freetype.c +++ b/dlls/win32u/freetype.c @@ -679,8 +679,8 @@ static const LANGID mac_langid_table[] = 0, /* TT_MAC_LANGID_RUANDA */ 0, /* TT_MAC_LANGID_RUNDI */ 0, /* TT_MAC_LANGID_CHEWA */ - MAKELANGID(LANG_MALAGASY,SUBLANG_DEFAULT), /* TT_MAC_LANGID_MALAGASY */ - MAKELANGID(LANG_ESPERANTO,SUBLANG_DEFAULT), /* TT_MAC_LANGID_ESPERANTO */ + 0, /* TT_MAC_LANGID_MALAGASY */ + 0, /* TT_MAC_LANGID_ESPERANTO */ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 95-111 */ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 112-127 */ MAKELANGID(LANG_WELSH,SUBLANG_DEFAULT), /* TT_MAC_LANGID_WELSH */ @@ -700,7 +700,7 @@ static const LANGID mac_langid_table[] = MAKELANGID(LANG_BRETON,SUBLANG_DEFAULT), /* TT_MAC_LANGID_BRETON */ MAKELANGID(LANG_INUKTITUT,SUBLANG_DEFAULT), /* TT_MAC_LANGID_INUKTITUT */ MAKELANGID(LANG_SCOTTISH_GAELIC,SUBLANG_DEFAULT), /* TT_MAC_LANGID_SCOTTISH_GAELIC */ - MAKELANGID(LANG_MANX_GAELIC,SUBLANG_DEFAULT), /* TT_MAC_LANGID_MANX_GAELIC */ + 0, /* TT_MAC_LANGID_MANX_GAELIC */ MAKELANGID(LANG_IRISH,SUBLANG_IRISH_IRELAND), /* TT_MAC_LANGID_IRISH_GAELIC */ 0, /* TT_MAC_LANGID_TONGAN */ 0, /* TT_MAC_LANGID_GREEK_POLYTONIC */ diff --git a/dlls/win32u/opentype.c b/dlls/win32u/opentype.c index c206d6dae57..7a541ae4e4a 100644 --- a/dlls/win32u/opentype.c +++ b/dlls/win32u/opentype.c @@ -473,8 +473,8 @@ static const LANGID mac_langid_table[] = 0, 0, 0, - MAKELANGID(LANG_MALAGASY, SUBLANG_DEFAULT), - MAKELANGID(LANG_ESPERANTO, SUBLANG_DEFAULT), + 0, + 0, 0, 0, 0, @@ -525,7 +525,7 @@ static const LANGID mac_langid_table[] = MAKELANGID(LANG_BRETON, SUBLANG_DEFAULT), MAKELANGID(LANG_INUKTITUT, SUBLANG_DEFAULT), MAKELANGID(LANG_SCOTTISH_GAELIC, SUBLANG_DEFAULT), - MAKELANGID(LANG_MANX_GAELIC, SUBLANG_DEFAULT), + 0, MAKELANGID(LANG_IRISH, SUBLANG_IRISH_IRELAND), 0, 0, diff --git a/include/winnt.rh b/include/winnt.rh index 786a38f326f..38cefd61c53 100644 --- a/include/winnt.rh +++ b/include/winnt.rh @@ -178,21 +178,6 @@ #define LANG_YORUBA 0x6a #define LANG_ZULU 0x35 -/* These are documented by the MSDN but are missing from the Windows header */ -#define LANG_MALAGASY 0x8d - -/* FIXME: these are not defined anywhere */ -#define LANG_SUTU 0x30 -#define LANG_TSONGA 0x31 -#define LANG_VENDA 0x33 - -/* non standard; keep the number high enough (but < 0xff) */ -#define LANG_ASTURIAN 0xa5 -#define LANG_ESPERANTO 0x8f -#define LANG_WALON 0x90 -#define LANG_CORNISH 0x92 -#define LANG_MANX_GAELIC 0x94 - /* Sublanguage definitions */ #define SUBLANG_NEUTRAL 0x00 /* language neutral */ #define SUBLANG_DEFAULT 0x01 /* user default */ @@ -441,23 +426,6 @@ #define SUBLANG_YORUBA_NIGERIA 0x01 #define SUBLANG_ZULU_SOUTH_AFRICA 0x01 -/* These are documented by the MSDN but are missing from the Windows header */ -#define SUBLANG_ENGLISH_IRELAND SUBLANG_ENGLISH_EIRE -#define SUBLANG_HAUSA_NIGERIA SUBLANG_HAUSA_NIGERIA_LATIN -#define SUBLANG_LAO_LAO_PDR SUBLANG_LAO_LAO -#define SUBLANG_PORTUGUESE_PORTUGAL SUBLANG_PORTUGUESE -#define SUBLANG_SWAHILI SUBLANG_SWAHILI_KENYA -#define SUBLANG_SWEDISH_SWEDEN SUBLANG_SWEDISH -#define SUBLANG_SYRIAC SUBLANG_SYRIAC_SYRIA - -/* FIXME: these are not defined anywhere */ -#define SUBLANG_DUTCH_SURINAM 0x03 -#define SUBLANG_ROMANIAN_MOLDAVIA 0x02 -#define SUBLANG_RUSSIAN_MOLDAVIA 0x02 -#define SUBLANG_LITHUANIAN_CLASSIC 0x02 -#define SUBLANG_MANX_GAELIC 0x01 - - /* * Sort definitions */

1 0

Alexandre Julliard : winegcc: Default to msvcrt mode for all PE builds.
by Alexandre Julliard 16 Nov '22

16 Nov '22

Module: wine Branch: master Commit: c1a00d4b5ac54dbc0f30fcb4bcd66ed832447104 URL: https://gitlab.winehq.org/wine/wine/-/commit/c1a00d4b5ac54dbc0f30fcb4bcd66e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 16 11:05:40 2022 +0100 winegcc: Default to msvcrt mode for all PE builds. --- tools/winegcc/winegcc.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index e1efa518925..71d2b93f0c6 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -1012,7 +1012,11 @@ static const char *build_spec_obj( struct options *opts, const char *spec_file, } spec_o_name = get_temp_file(output_name, ".spec.o"); - if (opts->pic && !is_pe) strarray_add(&spec_args, "-fPIC"); + if (!is_pe) + { + if (opts->pic) strarray_add(&spec_args, "-fPIC"); + if (opts->use_msvcrt) strarray_add(&spec_args, "-mno-cygwin"); + } strarray_add(&spec_args, opts->shared ? "--dll" : "--exe"); if (opts->fake_module) { @@ -1718,7 +1722,6 @@ int main(int argc, char **argv) { opts.use_msvcrt = 1; raw_compiler_arg = 0; - raw_winebuild_arg = 1; } if (strcmp("-mcygwin", opts.args.str[i]) == 0) { @@ -1980,7 +1983,7 @@ int main(int argc, char **argv) if (opts.processor == proc_cpp) linking = 0; if (linking == -1) error("Static linking is not supported\n"); - if (!opts.wine_objdir && is_pe_target( &opts )) opts.use_msvcrt = 1; + if (is_pe_target( &opts )) opts.use_msvcrt = 1; if (opts.files.count == 0 && !opts.fake_module) forward(&opts); else if (linking) build(&opts);

1 0

Hans Leidekker : ldap: Don't depend on the getopt.h header.
by Alexandre Julliard 16 Nov '22

16 Nov '22

Module: wine Branch: master Commit: cd2e3d1f54cc957a624b4186fcb9de2349a33163 URL: https://gitlab.winehq.org/wine/wine/-/commit/cd2e3d1f54cc957a624b4186fcb9de… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Nov 16 13:04:05 2022 +0100 ldap: Don't depend on the getopt.h header. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53930 --- libs/ldap/include/getopt-compat.h | 40 +++++++++++++++++++++++++++++++++++++++ libs/ldap/include/portable.h | 4 ++-- 2 files changed, 42 insertions(+), 2 deletions(-) diff --git a/libs/ldap/include/getopt-compat.h b/libs/ldap/include/getopt-compat.h new file mode 100644 index 00000000000..3bbc1e40d8b --- /dev/null +++ b/libs/ldap/include/getopt-compat.h @@ -0,0 +1,40 @@ +/* getopt-compat.h -- getopt(3) compatibility header */ +/* $OpenLDAP$ */ +/* This work is part of OpenLDAP Software <http://www.openldap.org/>. + * + * Copyright 1998-2022 The OpenLDAP Foundation. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted only as authorized by the OpenLDAP + * Public License. + * + * A copy of this license is available in file LICENSE in the + * top-level directory of the distribution or, alternatively, at + * <http://www.OpenLDAP.org/license.html>. + */ + +/* + * getopt(3) declarations + */ +#ifndef _GETOPT_COMPAT_H +#define _GETOPT_COMPAT_H + +#include <ldap_cdefs.h> + +LDAP_BEGIN_DECL + +/* change symbols to avoid clashing */ +#define optarg lutil_optarg +#define optind lutil_optind +#define opterr lutil_opterr +#define optopt lutil_optopt +#define getopt lutil_getopt + +LDAP_LUTIL_V (char *) optarg; +LDAP_LUTIL_V (int) optind, opterr, optopt; +LDAP_LUTIL_F (int) getopt LDAP_P(( int, char * const [], const char *)); + +LDAP_END_DECL + +#endif /* _GETOPT_COMPAT_H */ diff --git a/libs/ldap/include/portable.h b/libs/ldap/include/portable.h index 196b4a533ae..d3867575fca 100644 --- a/libs/ldap/include/portable.h +++ b/libs/ldap/include/portable.h @@ -211,10 +211,10 @@ #define HAVE_GETNAMEINFO 1 /* Define to 1 if you have the `getopt' function. */ -#define HAVE_GETOPT 1 +/* #undef HAVE_GETOPT */ /* Define to 1 if you have the <getopt.h> header file. */ -#define HAVE_GETOPT_H 1 +/* #undef HAVE_GETOPT_H */ /* Define to 1 if you have the `getpassphrase' function. */ /* #undef HAVE_GETPASSPHRASE */

1 0

Hans Leidekker : ldap: Mark ldap_int_destroy_global_options() as a destructor when building with Clang.
by Alexandre Julliard 16 Nov '22

16 Nov '22

Module: wine Branch: master Commit: 07cb943d6a6ca4f7b6cd635a68b02e2423c957b0 URL: https://gitlab.winehq.org/wine/wine/-/commit/07cb943d6a6ca4f7b6cd635a68b02e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Nov 16 13:06:40 2022 +0100 ldap: Mark ldap_int_destroy_global_options() as a destructor when building with Clang. Clang understands __attribute__ ((destructor)) syntax just like GCC. This avoids a link failure when atexit() used in the fallback path is not available. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53930 --- libs/ldap/libldap/init.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/ldap/libldap/init.c b/libs/ldap/libldap/init.c index 5f8f6ec7bdd..a94744b8dcf 100644 --- a/libs/ldap/libldap/init.c +++ b/libs/ldap/libldap/init.c @@ -497,7 +497,7 @@ static void openldap_ldap_init_w_env( } } -#if defined(__GNUC__) +#if defined(__GNUC__) || defined(__clang__) /* Declare this function as a destructor so that it will automatically be * invoked either at program exit (if libldap is a static library) or * at unload time (if libldap is a dynamic library). @@ -574,7 +574,7 @@ void ldap_int_initialize_global_options( struct ldapoptions *gopts, int *dbglvl */ ldap_url_parselist(&gopts->ldo_defludp, "ldap://localhost/"); gopts->ldo_defport = LDAP_PORT; -#if !defined(__GNUC__) && !defined(PIC) +#if !defined(__GNUC__) && !defined(__clang__) && !defined(PIC) /* Do this only for a static library, and only if we can't * arrange for it to be executed as a library destructor */

1 0

Hans Leidekker : msv1_0: Drop the ntlm_auth version check.
by Alexandre Julliard 16 Nov '22

16 Nov '22

Module: wine Branch: master Commit: 2705f791270b4cd710ed3be121837c18f02d70a7 URL: https://gitlab.winehq.org/wine/wine/-/commit/2705f791270b4cd710ed3be121837c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Nov 16 14:07:55 2022 +0100 msv1_0: Drop the ntlm_auth version check. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53932 --- dlls/msv1_0/unixlib.c | 24 ++++-------------------- 1 file changed, 4 insertions(+), 20 deletions(-) diff --git a/dlls/msv1_0/unixlib.c b/dlls/msv1_0/unixlib.c index 799577fd4a5..779250fc650 100644 --- a/dlls/msv1_0/unixlib.c +++ b/dlls/msv1_0/unixlib.c @@ -205,10 +205,6 @@ static NTSTATUS ntlm_fork( void *args ) return SEC_E_OK; } -#define NTLM_AUTH_MAJOR_VERSION 3 -#define NTLM_AUTH_MINOR_VERSION 0 -#define NTLM_AUTH_MICRO_VERSION 25 - static NTSTATUS ntlm_check_version( void *args ) { struct ntlm_ctx ctx = { 0 }; @@ -225,28 +221,16 @@ static NTSTATUS ntlm_check_version( void *args ) if ((len = read( ctx.pipe_in, buf, sizeof(buf) - 1 )) > 8) { char *newline; - int major = 0, minor = 0, micro = 0; if ((newline = memchr( buf, '\n', len ))) *newline = 0; else buf[len] = 0; - if (sscanf( buf, "Version %d.%d.%d", &major, &minor, &micro ) == 3) - { - if (((major > NTLM_AUTH_MAJOR_VERSION) || - (major == NTLM_AUTH_MAJOR_VERSION && minor > NTLM_AUTH_MINOR_VERSION) || - (major == NTLM_AUTH_MAJOR_VERSION && minor == NTLM_AUTH_MINOR_VERSION && - micro >= NTLM_AUTH_MICRO_VERSION))) - { - TRACE( "detected ntlm_auth version %d.%d.%d\n", major, minor, micro ); - status = STATUS_SUCCESS; - } - } + TRACE( "detected ntlm_auth version %s\n", debugstr_a(buf) ); + status = STATUS_SUCCESS; } - if (status) ERR_(winediag)( "ntlm_auth was not found or is outdated. " - "Make sure that ntlm_auth >= %d.%d.%d is in your path. " - "Usually, you can find it in the winbind package of your distribution.\n", - NTLM_AUTH_MAJOR_VERSION, NTLM_AUTH_MINOR_VERSION, NTLM_AUTH_MICRO_VERSION ); + if (status) ERR_(winediag)( "ntlm_auth was not found. Make sure that ntlm_auth >= 3.0.25 is in your path. " + "Usually, you can find it in the winbind package of your distribution.\n" ); ntlm_cleanup( &ctx ); return status; }

1 0