June 2024 - Wine-Commits - list.winehq.org

Vijay Kiran Kamuju : ntdll: Fix RtlEnumerateGenericTableWithoutSplaying function parameters.
by Alexandre Julliard June 24, 2024

June 24, 2024

Module: wine Branch: master Commit: 32e2ede0dfd94b524231ae7f7d335e7152382f20 URL: https://gitlab.winehq.org/wine/wine/-/commit/32e2ede0dfd94b524231ae7f7d335e… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Wed Jun 19 21:30:45 2024 +0200 ntdll: Fix RtlEnumerateGenericTableWithoutSplaying function parameters. --- dlls/ntdll/rtl.c | 2 +- include/ddk/ntddk.h | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/rtl.c b/dlls/ntdll/rtl.c index 81160cd1f70..d9690cdec96 100644 --- a/dlls/ntdll/rtl.c +++ b/dlls/ntdll/rtl.c @@ -191,7 +191,7 @@ void WINAPI RtlInitializeGenericTable(RTL_GENERIC_TABLE *table, PRTL_GENERIC_COM /****************************************************************************** * RtlEnumerateGenericTableWithoutSplaying [NTDLL.@] */ -void * WINAPI RtlEnumerateGenericTableWithoutSplaying(RTL_GENERIC_TABLE *table, void *previous) +void * WINAPI RtlEnumerateGenericTableWithoutSplaying(RTL_GENERIC_TABLE *table, PVOID *previous) { static int warn_once; diff --git a/include/ddk/ntddk.h b/include/ddk/ntddk.h index 6a8fffd532e..7f5db987ed4 100644 --- a/include/ddk/ntddk.h +++ b/include/ddk/ntddk.h @@ -274,6 +274,7 @@ NTSTATUS WINAPI PsSetLoadImageNotifyRoutine(PLOAD_IMAGE_NOTIFY_ROUTINE); NTSTATUS WINAPI PsSetLoadImageNotifyRoutineEx(PLOAD_IMAGE_NOTIFY_ROUTINE,ULONG_PTR); LONG WINAPI RtlCompareString(const STRING*,const STRING*,BOOLEAN); void WINAPI RtlCopyString(STRING*,const STRING*); +void * WINAPI RtlEnumerateGenericTableWithoutSplaying(PRTL_GENERIC_TABLE,PVOID*); BOOLEAN WINAPI RtlEqualString(const STRING*,const STRING*,BOOLEAN); void * WINAPI RtlGetElementGenericTable(PRTL_GENERIC_TABLE,ULONG); void WINAPI RtlInitializeGenericTable(PRTL_GENERIC_TABLE,PRTL_GENERIC_COMPARE_ROUTINE,PRTL_GENERIC_ALLOCATE_ROUTINE,PRTL_GENERIC_FREE_ROUTINE,void *);

1 0

Vijay Kiran Kamuju : ntdll: Add stub RtlNumberGenericTableElementsAvl function.
by Alexandre Julliard June 24, 2024

June 24, 2024

Module: wine Branch: master Commit: 2a6e7ab4ed984837fc19828d4404a3cc3e6add2a URL: https://gitlab.winehq.org/wine/wine/-/commit/2a6e7ab4ed984837fc19828d4404a3… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Wed Jun 19 21:49:00 2024 +0200 ntdll: Add stub RtlNumberGenericTableElementsAvl function. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56839 --- dlls/ntdll/ntdll.spec | 2 +- dlls/ntdll/rtl.c | 9 +++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- include/ddk/ntddk.h | 1 + 4 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 7d31bf41f55..f82146c6d39 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -898,7 +898,7 @@ @ stdcall RtlNtStatusToDosError(long) @ stdcall RtlNtStatusToDosErrorNoTeb(long) @ stdcall RtlNumberGenericTableElements(ptr) -# @ stub RtlNumberGenericTableElementsAvl +@ stdcall RtlNumberGenericTableElementsAvl(ptr) @ stdcall RtlNumberOfClearBits(ptr) @ stdcall RtlNumberOfSetBits(ptr) @ stdcall RtlOemStringToUnicodeSize(ptr) diff --git a/dlls/ntdll/rtl.c b/dlls/ntdll/rtl.c index 9b25c6b70ab..5597daa061f 100644 --- a/dlls/ntdll/rtl.c +++ b/dlls/ntdll/rtl.c @@ -800,6 +800,15 @@ void * WINAPI RtlEnumerateGenericTableWithoutSplayingAvl(RTL_AVL_TABLE *table, P return NULL; } +/****************************************************************************** + * RtlNumberGenericTableElementsAvl (NTDLL.@) + */ +ULONG WINAPI RtlNumberGenericTableElementsAvl(RTL_AVL_TABLE *table) +{ + FIXME("(%p) stub!\n", table); + return 0; +} + /*********************************************************************** * RtlInsertElementGenericTableAvl (NTDLL.@) */ diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index a546c5811a6..48e1def449c 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -1214,7 +1214,7 @@ @ stdcall RtlNtStatusToDosError(long) @ stdcall RtlNtStatusToDosErrorNoTeb(long) @ stdcall RtlNumberGenericTableElements(ptr) -@ stub RtlNumberGenericTableElementsAvl +@ stdcall RtlNumberGenericTableElementsAvl(ptr) @ stdcall RtlNumberOfClearBits(ptr) @ stdcall RtlNumberOfSetBits(ptr) @ stub RtlOemStringToCountedUnicodeString diff --git a/include/ddk/ntddk.h b/include/ddk/ntddk.h index 426ba4fa31b..e9ca903715d 100644 --- a/include/ddk/ntddk.h +++ b/include/ddk/ntddk.h @@ -285,6 +285,7 @@ void * WINAPI RtlLookupElementGenericTable(PRTL_GENERIC_TABLE,void *); void * WINAPI RtlLookupElementGenericTableAvl(PRTL_AVL_TABLE,void *); void WINAPI RtlMapGenericMask(ACCESS_MASK*,const GENERIC_MAPPING*); ULONG WINAPI RtlNumberGenericTableElements(PRTL_GENERIC_TABLE); +ULONG WINAPI RtlNumberGenericTableElementsAvl(PRTL_AVL_TABLE); BOOLEAN WINAPI RtlPrefixUnicodeString(const UNICODE_STRING*,const UNICODE_STRING*,BOOLEAN); NTSTATUS WINAPI RtlUpcaseUnicodeString(UNICODE_STRING*,const UNICODE_STRING*,BOOLEAN); char WINAPI RtlUpperChar(char);

1 0

Fabian Maurer : wow64: In wow64_NtSetInformationToken forward TokenIntegrityLevel.
by Alexandre Julliard June 21, 2024

June 21, 2024

Module: wine Branch: master Commit: 6c5d17af07a318d754c0c21023b2d162a0d3725d URL: https://gitlab.winehq.org/wine/wine/-/commit/6c5d17af07a318d754c0c21023b2d1… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Sat May 25 06:26:23 2024 +0200 wow64: In wow64_NtSetInformationToken forward TokenIntegrityLevel. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56725 --- dlls/wow64/security.c | 12 ++++++++++++ dlls/wow64/struct32.h | 5 +++++ 2 files changed, 17 insertions(+) diff --git a/dlls/wow64/security.c b/dlls/wow64/security.c index 1a3d98fccee..645e5602872 100644 --- a/dlls/wow64/security.c +++ b/dlls/wow64/security.c @@ -521,6 +521,18 @@ NTSTATUS WINAPI wow64_NtSetInformationToken( UINT *args ) switch (class) { + case TokenIntegrityLevel: /* TOKEN_MANDATORY_LABEL */ + if (len >= sizeof(TOKEN_MANDATORY_LABEL32)) + { + TOKEN_MANDATORY_LABEL32 *label32 = ptr; + TOKEN_MANDATORY_LABEL label; + + label.Label.Sid = ULongToPtr( label32->Label.Sid ); + label.Label.Attributes = label32->Label.Attributes; + return NtSetInformationToken( handle, class, &label, sizeof(label) ); + } + else return STATUS_INFO_LENGTH_MISMATCH; + case TokenSessionId: /* ULONG */ return NtSetInformationToken( handle, class, ptr, len ); diff --git a/dlls/wow64/struct32.h b/dlls/wow64/struct32.h index 87e219045f4..b196bdd53ca 100644 --- a/dlls/wow64/struct32.h +++ b/dlls/wow64/struct32.h @@ -367,6 +367,11 @@ typedef struct DWORD Attributes; } SID_AND_ATTRIBUTES32; +typedef struct +{ + SID_AND_ATTRIBUTES32 Label; +} TOKEN_MANDATORY_LABEL32; + typedef struct { ULONG DefaultDacl;

1 0

Piotr Caban : kernel32/tests: Add GetFileMUIInfo tests.
by Alexandre Julliard June 21, 2024

June 21, 2024

Module: wine Branch: master Commit: fe6af4fb9e0a688df2897b0f84b025c6c94ce48c URL: https://gitlab.winehq.org/wine/wine/-/commit/fe6af4fb9e0a688df2897b0f84b025… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jun 13 14:45:25 2024 +0200 kernel32/tests: Add GetFileMUIInfo tests. --- dlls/kernel32/tests/resource.c | 244 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 244 insertions(+)

1 0

Piotr Caban : kernel32/tests: Test GetFileMUIInfo on language resource file.
by Alexandre Julliard June 21, 2024

June 21, 2024

Module: wine Branch: master Commit: 08c0978f0b63e9771f1991d05851ca8c8fcf9da5 URL: https://gitlab.winehq.org/wine/wine/-/commit/08c0978f0b63e9771f1991d05851ca… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jun 14 07:23:01 2024 +0200 kernel32/tests: Test GetFileMUIInfo on language resource file. --- dlls/kernel32/tests/resource.c | 49 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/dlls/kernel32/tests/resource.c b/dlls/kernel32/tests/resource.c index 9dfbd5ae4b0..5f42d443eec 100644 --- a/dlls/kernel32/tests/resource.c +++ b/dlls/kernel32/tests/resource.c @@ -644,11 +644,20 @@ static struct mui_res offsetof(struct mui_res, mui_type_ids), sizeof(ln_mui_res.mui_type_ids), 0, 0, offsetof(struct mui_res, fallback_lang), sizeof(L"en-US"), {'M','U','I',0,0}, {RT_CURSOR}, {'M','U','I',0,0}, {RT_STRING}, {0}, {'e','n','-','U','S',0}, +}, en_mui_res = { + 0xfecdfecd, sizeof(ln_mui_res), 0x10000, 0, + MUI_FILETYPE_LANGUAGE_NEUTRAL_MUI >> 1, + 0, 0, {'s','c'}, {'c'}, {0}, 0, 0, {0}, + offsetof(struct mui_res, ln_type_names), sizeof(L"MUI\0"), + offsetof(struct mui_res, ln_type_ids), sizeof(ln_mui_res.ln_type_ids), + 0, 0, 0, 0, offsetof(struct mui_res, lang), sizeof(L"en-US"), 0, 0, + {'M','U','I',0,0}, {RT_STRING}, {0}, {0}, {'e','n','-','U','S',0} }; static void test_mui(void) { static const WCHAR ln_dll[] = L"test_mui.dll"; + static const WCHAR en_dll[] = L"en-US\\test_mui.dll.mui"; static const BYTE zeros[16] = { 0 }; BYTE buf[1024]; FILEMUIINFO *info = (FILEMUIINFO *)buf; @@ -663,6 +672,8 @@ static void test_mui(void) ok( GetLastError() == ERROR_FILE_NOT_FOUND, "GetLastError() = %ld\n", GetLastError() ); create_test_dll( ln_dll ); + CreateDirectoryW( L"en-US", NULL ); + create_test_dll( en_dll ); size = 0; r = GetFileMUIInfo( 0, ln_dll, NULL, &size ); @@ -760,7 +771,45 @@ static void test_mui(void) str += wcslen(str) + 1; ok( !str[0], "string list is not NULL terminated: %s\n", wine_dbgstr_w(str) ); + res = BeginUpdateResourceW( en_dll, TRUE ); + ok( res != NULL, "BeginUpdateResourceW failed: %ld\n", GetLastError() ); + r = UpdateResourceW( res, L"MUI", MAKEINTRESOURCEW(1), 0, &en_mui_res, sizeof(en_mui_res) ); + ok( r, "UpdateResource failed: %ld\n", GetLastError() ); + ok( EndUpdateResourceW( res, FALSE ), "EndUpdateResourceW failed: %ld\n", GetLastError() ); + + memset( buf, 0xfe, sizeof(buf) ); + size = sizeof(buf); + info->dwSize = sizeof(buf); + info->dwVersion = MUI_FILEINFO_VERSION; + r = GetFileMUIInfo( MUI_QUERY_TYPE | MUI_QUERY_CHECKSUM | MUI_QUERY_LANGUAGE_NAME + | MUI_QUERY_RESOURCE_TYPES, en_dll, info, &size ); + ok( r, "GetFileMUIInfo failed: %ld\n", GetLastError() ); + ok( info->dwSize == sizeof(buf), "dwSize = %ld\n", info->dwSize ); + ok( info->dwVersion == MUI_FILEINFO_VERSION, "dwVersion = %ld\n", info->dwVersion ); + ok( info->dwFileType == MUI_FILETYPE_LANGUAGE_NEUTRAL_MUI, "dwFileType = %ld\n", info->dwFileType ); + ok( info->pChecksum[0] == 'c', "pChecksum = %s\n", + wine_dbgstr_an((char *)info->pChecksum, sizeof(info->pChecksum)) ); + ok( info->pServiceChecksum[0] == 's', "pServiceChecksum = %s\n", + wine_dbgstr_an((char *)info->pServiceChecksum, sizeof(info->pServiceChecksum)) ); + ok( info->dwLanguageNameOffset == 72, "dwLanguageNameOffset = %ld\n", info->dwLanguageNameOffset ); + str = (WCHAR *)(buf + info->dwLanguageNameOffset); + ok( !wcscmp(str, L"en-US"), "language name = %s\n", wine_dbgstr_w(str) ); + ok( !info->dwTypeIDMainSize, "dwTypeIDMainSize = %ld\n", info->dwTypeIDMainSize ); + ok( !info->dwTypeIDMainOffset, "dwTypeIDMainOffset = %ld\n", info->dwTypeIDMainOffset ); + ok( !info->dwTypeNameMainOffset, "dwTypeNameMainOffset = %ld\n", info->dwTypeNameMainOffset ); + ok( info->dwTypeIDMUISize == 1, "dwTypeIDMUISize = %ld\n", info->dwTypeIDMUISize ); + ok( info->dwTypeIDMUIOffset == 84, "dwTypeIDMUIOffset = %ld\n", info->dwTypeIDMUIOffset ); + id = (DWORD *)(buf + info->dwTypeIDMUIOffset); + ok( id[0] == RT_STRING, "type ID MUI[0] = %ld\n", id[0] ); + ok( info->dwTypeNameMUIOffset == 88, "dwTypeNameMUIOffset = %ld\n", info->dwTypeNameMUIOffset ); + str = (WCHAR *)(buf + info->dwTypeNameMUIOffset); + ok( !wcscmp(str, L"MUI"), "type name MUI[0] = %s\n", wine_dbgstr_w(str) ); + str += wcslen(str) + 1; + ok( !str[0], "string list is not NULL terminated: %s\n", wine_dbgstr_w(str) ); + DeleteFileW( ln_dll ); + DeleteFileW( en_dll ); + RemoveDirectoryW( L"en-US" ); } START_TEST(resource)

1 0

Alistair Leslie-Hughes : odbccp32: SQLConfigDataSource/W fix crash with passed NULL attribute parameter.
by Alexandre Julliard June 21, 2024

June 21, 2024

Module: wine Branch: master Commit: 4aab3e42c1c2639f66b76bb43fea01f54e61a5c7 URL: https://gitlab.winehq.org/wine/wine/-/commit/4aab3e42c1c2639f66b76bb43fea01… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Jun 17 17:55:14 2024 +1000 odbccp32: SQLConfigDataSource/W fix crash with passed NULL attribute parameter. --- dlls/odbccp32/odbccp32.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/odbccp32/odbccp32.c b/dlls/odbccp32/odbccp32.c index d8d57e6bd40..46468765b86 100644 --- a/dlls/odbccp32/odbccp32.c +++ b/dlls/odbccp32/odbccp32.c @@ -372,7 +372,7 @@ BOOL WINAPI SQLConfigDataSourceW(HWND hwnd, WORD request, LPCWSTR driver, LPCWST WORD mapped_request; TRACE("%p, %d, %s, %s\n", hwnd, request, debugstr_w(driver), debugstr_w(attributes)); - if (TRACE_ON(odbc)) + if (TRACE_ON(odbc) && attributes) { const WCHAR *p; for (p = attributes; *p; p += lstrlenW(p) + 1) @@ -417,7 +417,7 @@ BOOL WINAPI SQLConfigDataSource(HWND hwnd, WORD request, LPCSTR driver, LPCSTR a TRACE("%p, %d, %s, %s\n", hwnd, request, debugstr_a(driver), debugstr_a(attributes)); - if (TRACE_ON(odbc)) + if (TRACE_ON(odbc) && attributes) { const char *p; for (p = attributes; *p; p += lstrlenA(p) + 1)

1 0

Piotr Caban : kernelbase: Add GetFileMUIInfo implementation.
by Alexandre Julliard June 21, 2024

June 21, 2024

Module: wine Branch: master Commit: f477eca7894ba969d44cdad0f91f1be73133ed2c URL: https://gitlab.winehq.org/wine/wine/-/commit/f477eca7894ba969d44cdad0f91f1b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jun 13 18:59:34 2024 +0200 kernelbase: Add GetFileMUIInfo implementation. --- dlls/kernelbase/locale.c | 216 +++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 211 insertions(+), 5 deletions(-) diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index 568f34d8979..c5be4cf95e2 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -5719,15 +5719,221 @@ done: } +#define MUI_SIGNATURE 0xfecdfecd +struct mui_resource +{ + DWORD signature; + DWORD size; + DWORD version; + DWORD path_type; + DWORD file_type; + DWORD system_attributes; + DWORD fallback_location; + BYTE service_checksum[16]; + BYTE checksum[16]; + DWORD unk1[2]; + DWORD mui_path_off; + DWORD mui_path_size; + DWORD unk2[2]; + DWORD ln_type_name_off; + DWORD ln_type_name_size; + DWORD ln_type_id_off; + DWORD ln_type_id_size; + DWORD mui_type_name_off; + DWORD mui_type_name_size; + DWORD mui_type_id_off; + DWORD mui_type_id_size; + DWORD lang_off; + DWORD lang_size; + DWORD fallback_lang_off; + DWORD fallback_lang_size; +}; + + +static BOOL validate_mui_resource(struct mui_resource *mui, DWORD size) +{ + if (size >= sizeof(DWORD) && mui->signature != MUI_SIGNATURE) + { + SetLastError(ERROR_MUI_INVALID_RC_CONFIG); + return FALSE; + } + + size = min( size, mui->size ); + if (size < sizeof(*mui) || + mui->ln_type_name_off >= size || mui->ln_type_name_size > size - mui->ln_type_name_off || + mui->ln_type_id_off >= size || mui->ln_type_id_size > size - mui->ln_type_id_off || + mui->mui_type_name_off >= size || mui->mui_type_name_size > size - mui->mui_type_name_off || + mui->mui_type_id_off >= size || mui->mui_type_id_size > size - mui->mui_type_id_off || + mui->lang_off >= size || mui->lang_size > size - mui->lang_off || + mui->fallback_lang_off >= size || mui->fallback_lang_size > size - mui->fallback_lang_off) + { + SetLastError(ERROR_BAD_EXE_FORMAT); + return FALSE; + } + return TRUE; +} + + /****************************************************************************** * GetFileMUIInfo (kernelbase.@) */ -BOOL WINAPI /* DECLSPEC_HOTPATCH */ GetFileMUIInfo( DWORD flags, const WCHAR *path, - FILEMUIINFO *info, DWORD *size ) +BOOL WINAPI DECLSPEC_HOTPATCH GetFileMUIInfo( DWORD flags, const WCHAR *path, + FILEMUIINFO *info, DWORD *size ) { - FIXME( "stub: %lu, %s, %p, %p\n", flags, debugstr_w(path), info, size ); - SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); - return FALSE; + DWORD off, mui_size, type = MUI_FILETYPE_NOT_LANGUAGE_NEUTRAL; + struct mui_resource *mui = NULL; + HMODULE hmod; + HRSRC hrsrc; + + TRACE( "%lu, %s, %p, %p\n", flags, debugstr_w(path), info, size ); + + if (!path || !size || (*size && !info) || + (info && (*size < sizeof(*info) || info->dwSize != *size || + info->dwVersion != MUI_FILEINFO_VERSION))) + { + if (size) *size = 0; + SetLastError( ERROR_INVALID_PARAMETER ); + return FALSE; + } + + if (!flags) flags = MUI_QUERY_TYPE | MUI_QUERY_CHECKSUM; + + hmod = LoadLibraryExW( path, NULL, LOAD_LIBRARY_AS_DATAFILE | LOAD_LIBRARY_AS_IMAGE_RESOURCE ); + if (!hmod) return FALSE; + + hrsrc = FindResourceW( hmod, MAKEINTRESOURCEW(1), L"MUI" ); + if (hrsrc) + { + mui = LockResource( LoadResource(hmod, hrsrc) ); + if (mui) mui_size = SizeofResource( hmod, hrsrc ); + if (!mui || !validate_mui_resource( mui, mui_size )) + { + FreeLibrary( hmod ); + return FALSE; + } + if (mui->file_type & (MUI_FILETYPE_LANGUAGE_NEUTRAL_MAIN >> 1)) + type = MUI_FILETYPE_LANGUAGE_NEUTRAL_MAIN; + else if (mui->file_type & (MUI_FILETYPE_LANGUAGE_NEUTRAL_MUI >> 1)) + type = MUI_FILETYPE_LANGUAGE_NEUTRAL_MUI; + } + if (type == MUI_FILETYPE_NOT_LANGUAGE_NEUTRAL) + { + FreeLibrary( hmod ); + + if (!info) + { + *size = sizeof(*info); + return TRUE; + } + if (info->dwSize < sizeof(*info)) + { + SetLastError( ERROR_INSUFFICIENT_BUFFER ); + return FALSE; + } + + memset( info, 0, sizeof(*info) ); + info->dwSize = *size; + info->dwVersion = MUI_FILEINFO_VERSION; + if (flags & MUI_QUERY_TYPE) info->dwFileType = type; + return TRUE; + } + + off = offsetof(FILEMUIINFO, abBuffer); + if (flags & MUI_QUERY_LANGUAGE_NAME) + { + off += type == MUI_FILETYPE_LANGUAGE_NEUTRAL_MAIN ? + mui->fallback_lang_size : mui->lang_size; + } + if (flags & MUI_QUERY_RESOURCE_TYPES) + { + if (type == MUI_FILETYPE_LANGUAGE_NEUTRAL_MAIN) + off += mui->ln_type_name_size + mui->ln_type_id_size; + off += mui->mui_type_name_size + mui->mui_type_id_size; + } + if (off < sizeof(*info)) off = sizeof(*info); + + if (!info || info->dwSize < off) + { + FreeLibrary( hmod ); + *size = off; + SetLastError( ERROR_INSUFFICIENT_BUFFER ); + return FALSE; + } + + off = 0; + memset( info, 0, sizeof(*info) ); + info->dwSize = *size; + info->dwVersion = MUI_FILEINFO_VERSION; + if (flags & MUI_QUERY_TYPE) info->dwFileType = type; + if (flags & MUI_QUERY_CHECKSUM) + { + memcpy( info->pChecksum, mui->checksum, sizeof(info->pChecksum) ); + memcpy( info->pServiceChecksum, mui->service_checksum, sizeof(info->pServiceChecksum) ); + } + if (flags & MUI_QUERY_LANGUAGE_NAME) + { + if (type == MUI_FILETYPE_LANGUAGE_NEUTRAL_MAIN && mui->fallback_lang_off) + { + info->dwLanguageNameOffset = offsetof(FILEMUIINFO, abBuffer); + memcpy(info->abBuffer, ((BYTE *)mui) + mui->fallback_lang_off, + mui->fallback_lang_size); + off += mui->fallback_lang_size; + } + if (type == MUI_FILETYPE_LANGUAGE_NEUTRAL_MUI && mui->lang_off) + { + info->dwLanguageNameOffset = offsetof(FILEMUIINFO, abBuffer); + memcpy(info->abBuffer, ((BYTE *)mui) + mui->lang_off, mui->lang_size); + off += mui->lang_size; + } + } + if (flags & MUI_QUERY_RESOURCE_TYPES && type & MUI_FILETYPE_LANGUAGE_NEUTRAL_MAIN) + { + if (mui->ln_type_id_size && mui->ln_type_id_off) + { + info->dwTypeIDMainSize = mui->ln_type_id_size / sizeof(DWORD); + info->dwTypeIDMainOffset = offsetof(FILEMUIINFO, abBuffer[off]); + memcpy(info->abBuffer + off, ((BYTE *)mui) + mui->ln_type_id_off, mui->ln_type_id_size); + off += mui->ln_type_id_size; + } + if (mui->ln_type_name_off) + { + info->dwTypeNameMainOffset = offsetof(FILEMUIINFO, abBuffer[off]); + memcpy(info->abBuffer + off, ((BYTE *)mui) + mui->ln_type_name_off, mui->ln_type_name_size); + off += mui->ln_type_name_size; + } + if (mui->mui_type_id_size && mui->mui_type_id_off) + { + info->dwTypeIDMUISize = mui->mui_type_id_size / sizeof(DWORD); + info->dwTypeIDMUIOffset = offsetof(FILEMUIINFO, abBuffer[off]); + memcpy(info->abBuffer + off, ((BYTE *)mui) + mui->mui_type_id_off, mui->mui_type_id_size); + off += mui->mui_type_id_size; + } + if (mui->mui_type_name_off) + { + info->dwTypeNameMUIOffset = offsetof(FILEMUIINFO, abBuffer[off]); + memcpy(info->abBuffer + off, ((BYTE *)mui) + mui->mui_type_name_off, mui->mui_type_name_size); + off += mui->mui_type_name_size; + } + } + else if(flags & MUI_QUERY_RESOURCE_TYPES) + { + if (mui->ln_type_id_size && mui->ln_type_id_off) + { + info->dwTypeIDMUISize = mui->ln_type_id_size / sizeof(DWORD); + info->dwTypeIDMUIOffset = offsetof(FILEMUIINFO, abBuffer[off]); + memcpy(info->abBuffer + off, ((BYTE *)mui) + mui->ln_type_id_off, mui->ln_type_id_size); + off += mui->ln_type_id_size; + } + if (mui->ln_type_name_off) + { + info->dwTypeNameMUIOffset = offsetof(FILEMUIINFO, abBuffer[off]); + memcpy(info->abBuffer + off, ((BYTE *)mui) + mui->ln_type_name_off, mui->ln_type_name_size); + off += mui->ln_type_name_size; + } + } + + FreeLibrary( hmod ); + return TRUE; }

1 0

Eric Pouech : cmd: Use kernel32's error codes instead of literals.
by Alexandre Julliard June 21, 2024

June 21, 2024

Module: wine Branch: master Commit: 844d6b553a72ed2ad658afd4b315f084dca525c5 URL: https://gitlab.winehq.org/wine/wine/-/commit/844d6b553a72ed2ad658afd4b315f0… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Tue Jun 18 10:19:21 2024 +0200 cmd: Use kernel32's error codes instead of literals. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- programs/cmd/batch.c | 2 +- programs/cmd/builtins.c | 70 ++++++++++++++++++++++++------------------------ programs/cmd/directory.c | 18 ++++++------- programs/cmd/wcmd.h | 8 ++++++ programs/cmd/wcmdmain.c | 12 ++++----- 5 files changed, 59 insertions(+), 51 deletions(-)

1 0

Eric Pouech : cmd/tests: Add tests for delayed substitution in IF command.
by Alexandre Julliard June 21, 2024

June 21, 2024

Module: wine Branch: master Commit: 01d0027739f3d2a0295ef7b2e1f01855f94d7284 URL: https://gitlab.winehq.org/wine/wine/-/commit/01d0027739f3d2a0295ef7b2e1f018… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Fri Jun 21 10:15:07 2024 +0200 cmd/tests: Add tests for delayed substitution in IF command. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- programs/cmd/tests/test_builtins.cmd | 6 ++++++ programs/cmd/tests/test_builtins.cmd.exp | 5 +++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index c9951a66373..d5397560bc6 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -802,6 +802,12 @@ if %WINE_FOO% == foo ( set WINE_FOO=bar if !WINE_FOO! == bar (echo bar) else echo foo ) +set WINE_FOO=32 +if %WINE_FOO% == 32 ( + set WINE_FOO=33 + call :setError 33 + if errorlevel !WINE_FOO! (echo gotitright) else echo gotitwrong +) echo %ErrorLevel% setlocal DisableDelayedExpansion echo %ErrorLevel% diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 1564e6c4611..0102c3bcbc5 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -629,8 +629,9 @@ foo foo(a)or_broken@!WINE_FOO! foo bar(a)or_broken@foo -0 -0(a)or_broken@1 +gotitright +33 +(a)todo_wine@0(a)or_broken@1 foo !WINE_FOO! @todo_wine(a)not empty

1 0

Alistair Leslie-Hughes : odbccp32: Look at the Setup key to find the driver of ODBC config functions.
by Alexandre Julliard June 21, 2024

June 21, 2024

Module: wine Branch: master Commit: 6dca99a71347731f449d39fb0a46b0331e4206f9 URL: https://gitlab.winehq.org/wine/wine/-/commit/6dca99a71347731f449d39fb0a46b0… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Jun 17 17:55:14 2024 +1000 odbccp32: Look at the Setup key to find the driver of ODBC config functions. We need to look at the Setup key for the driver, as it can be different compare to the actually driver. For example, mysql uses the same Setup file to configure both the Ascii/Unicode vession but has a different file for the actual ODBC functions. --- dlls/odbccp32/odbccp32.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/odbccp32/odbccp32.c b/dlls/odbccp32/odbccp32.c index 95bfb90781e..d8d57e6bd40 100644 --- a/dlls/odbccp32/odbccp32.c +++ b/dlls/odbccp32/odbccp32.c @@ -223,7 +223,6 @@ static BOOL SQLInstall_narrow(int mode, LPSTR buffer, LPCWSTR str, WORD str_leng static HMODULE load_config_driver(const WCHAR *driver) { - static WCHAR reg_driver[] = {'d','r','i','v','e','r',0}; long ret; HMODULE hmod; WCHAR *filename = NULL; @@ -236,7 +235,7 @@ static HMODULE load_config_driver(const WCHAR *driver) if ((ret = RegOpenKeyW(hkey, driver, &hkeydriver)) == ERROR_SUCCESS) { - ret = RegGetValueW(hkeydriver, NULL, reg_driver, RRF_RT_REG_SZ, &type, NULL, &size); + ret = RegGetValueW(hkeydriver, NULL, L"Setup", RRF_RT_REG_SZ, &type, NULL, &size); if(ret != ERROR_SUCCESS || type != REG_SZ) { RegCloseKey(hkeydriver); @@ -255,7 +254,7 @@ static HMODULE load_config_driver(const WCHAR *driver) return NULL; } - ret = RegGetValueW(hkeydriver, NULL, reg_driver, RRF_RT_REG_SZ, &type, filename, &size); + ret = RegGetValueW(hkeydriver, NULL, L"Setup", RRF_RT_REG_SZ, &type, filename, &size); RegCloseKey(hkeydriver); }

1 0