wine-commits June 2024

wine-commits@winehq.org

1 participants
613 discussions

Vijay Kiran Kamuju : ntdll: Add stub RtlEnumerateGenericTableWithoutSplayingAvl function.
by Alexandre Julliard 24 Jun '24

24 Jun '24

Module: wine Branch: master Commit: 1d58a4674c0fee5a68cdce26deab0beac9f37667 URL: https://gitlab.winehq.org/wine/wine/-/commit/1d58a4674c0fee5a68cdce26deab0b… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Wed Jun 19 21:37:54 2024 +0200 ntdll: Add stub RtlEnumerateGenericTableWithoutSplayingAvl function. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56839 --- dlls/ntdll/ntdll.spec | 2 +- dlls/ntdll/rtl.c | 12 ++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- include/ddk/ntddk.h | 1 + 4 files changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 80ed2d8f020..7d31bf41f55 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -650,7 +650,7 @@ # @ stub RtlEnumerateGenericTableAvl # @ stub RtlEnumerateGenericTableLikeADirectory @ stdcall RtlEnumerateGenericTableWithoutSplaying(ptr ptr) -# @ stub RtlEnumerateGenericTableWithoutSplayingAvl +@ stdcall RtlEnumerateGenericTableWithoutSplayingAvl(ptr ptr) @ stub RtlEnumerateProperties @ stdcall RtlEqualComputerName(ptr ptr) @ stdcall RtlEqualDomainName(ptr ptr) diff --git a/dlls/ntdll/rtl.c b/dlls/ntdll/rtl.c index d9690cdec96..9b25c6b70ab 100644 --- a/dlls/ntdll/rtl.c +++ b/dlls/ntdll/rtl.c @@ -788,6 +788,18 @@ void WINAPI RtlInitializeGenericTableAvl(PRTL_AVL_TABLE table, PRTL_AVL_COMPARE_ FIXME("%p %p %p %p %p: stub\n", table, compare, allocate, free, context); } +/****************************************************************************** + * RtlEnumerateGenericTableWithoutSplayingAvl (NTDLL.@) + */ +void * WINAPI RtlEnumerateGenericTableWithoutSplayingAvl(RTL_AVL_TABLE *table, PVOID *previous) +{ + static int warn_once; + + if (!warn_once++) + FIXME("(%p, %p) stub!\n", table, previous); + return NULL; +} + /*********************************************************************** * RtlInsertElementGenericTableAvl (NTDLL.@) */ diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index d7a77f5911a..a546c5811a6 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -1072,7 +1072,7 @@ @ stub RtlEnumerateGenericTableAvl @ stub RtlEnumerateGenericTableLikeADirectory @ stdcall RtlEnumerateGenericTableWithoutSplaying(ptr ptr) -@ stub RtlEnumerateGenericTableWithoutSplayingAvl +@ stdcall RtlEnumerateGenericTableWithoutSplayingAvl(ptr ptr) @ stdcall RtlEqualLuid(ptr ptr) @ stdcall RtlEqualSid(ptr ptr) @ stdcall RtlEqualString(ptr ptr long) diff --git a/include/ddk/ntddk.h b/include/ddk/ntddk.h index 7f5db987ed4..426ba4fa31b 100644 --- a/include/ddk/ntddk.h +++ b/include/ddk/ntddk.h @@ -275,6 +275,7 @@ NTSTATUS WINAPI PsSetLoadImageNotifyRoutineEx(PLOAD_IMAGE_NOTIFY_ROUTINE,ULONG_ LONG WINAPI RtlCompareString(const STRING*,const STRING*,BOOLEAN); void WINAPI RtlCopyString(STRING*,const STRING*); void * WINAPI RtlEnumerateGenericTableWithoutSplaying(PRTL_GENERIC_TABLE,PVOID*); +void * WINAPI RtlEnumerateGenericTableWithoutSplayingAvl(PRTL_AVL_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: Fix RtlEnumerateGenericTableWithoutSplaying function parameters.
by Alexandre Julliard 24 Jun '24

24 Jun '24

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

Fabian Maurer : wow64: In wow64_NtSetInformationToken forward TokenIntegrityLevel.
by Alexandre Julliard 21 Jun '24

21 Jun '24

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: Test GetFileMUIInfo on language resource file.
by Alexandre Julliard 21 Jun '24

21 Jun '24

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

Piotr Caban : kernel32/tests: Add GetFileMUIInfo tests.
by Alexandre Julliard 21 Jun '24

21 Jun '24

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 : kernelbase: Add GetFileMUIInfo implementation.
by Alexandre Julliard 21 Jun '24

21 Jun '24

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

Alistair Leslie-Hughes : odbccp32: SQLConfigDataSource/W fix crash with passed NULL attribute parameter.
by Alexandre Julliard 21 Jun '24

21 Jun '24

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

Alistair Leslie-Hughes : odbccp32: Look at the Setup key to find the driver of ODBC config functions.
by Alexandre Julliard 21 Jun '24

21 Jun '24

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

Eric Pouech : cmd: Expand delayed variables in IF operands.
by Alexandre Julliard 21 Jun '24

21 Jun '24

Module: wine Branch: master Commit: bd36ac98c0d51ab6b78692aa79963e9c10c64b4d URL: https://gitlab.winehq.org/wine/wine/-/commit/bd36ac98c0d51ab6b78692aa79963e… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Thu Jun 6 09:11:39 2024 +0200 cmd: Expand delayed variables in IF operands. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- programs/cmd/wcmd.h | 4 +--- programs/cmd/wcmdmain.c | 60 ++++++++++++++++++++++++++++++++----------------- 2 files changed, 40 insertions(+), 24 deletions(-) diff --git a/programs/cmd/wcmd.h b/programs/cmd/wcmd.h index 537e078c412..e2ee0fc02ac 100644 --- a/programs/cmd/wcmd.h +++ b/programs/cmd/wcmd.h @@ -70,9 +70,7 @@ typedef struct _CMD_IF_CONDITION op; union { - /* CMD_IF_ERRORLEVEL */ - int level; - /* CMD_IF_EXIST, CMD_IF_DEFINED */ + /* CMD_IF_ERRORLEVEL, CMD_IF_EXIST, CMD_IF_DEFINED */ const WCHAR *operand; /* CMD_BINOP_EQUAL, CMD_BINOP_LSS, CMD_BINOP_LEQ, CMD_BINOP_EQU, CMD_BINOP_NEQ, CMD_BINOP_GEQ, CMD_BINOP_GTR */ struct diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index d2edb22c9c4..ce083e710f7 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -1143,7 +1143,6 @@ void if_condition_dispose(CMD_IF_CONDITION *cond) switch (cond->op) { case CMD_IF_ERRORLEVEL: - break; case CMD_IF_EXIST: case CMD_IF_DEFINED: free((void*)cond->operand); @@ -1182,13 +1181,9 @@ BOOL if_condition_create(WCHAR *start, WCHAR **end, CMD_IF_CONDITION *cond) } if (!wcsicmp(param_copy, L"errorlevel")) { - WCHAR *endptr; - int level; param_copy = WCMD_parameter(start, narg++, &param_start, TRUE, FALSE); if (cond) cond->op = CMD_IF_ERRORLEVEL; - level = wcstol(param_copy, &endptr, 10); - if (*endptr) return FALSE; - if (cond) cond->level = level; + if (cond) cond->operand = wcsdup(param_copy); } else if (!wcsicmp(param_copy, L"exist")) { @@ -1266,7 +1261,7 @@ const char *debugstr_if_condition(const CMD_IF_CONDITION *cond) switch (cond->op) { - case CMD_IF_ERRORLEVEL: return wine_dbg_sprintf("%serrorlevel %d}}", header, cond->level); + case CMD_IF_ERRORLEVEL: return wine_dbg_sprintf("%serrorlevel %ls}}", header, cond->operand); case CMD_IF_EXIST: return wine_dbg_sprintf("%sexist %ls}}", header, cond->operand); case CMD_IF_DEFINED: return wine_dbg_sprintf("%sdefined %ls}}", header, cond->operand); case CMD_IF_BINOP_EQUAL: return wine_dbg_sprintf("%s%ls == %ls}}", header, cond->left, cond->right); @@ -3107,6 +3102,8 @@ WCHAR *WCMD_ReadAndParseLine(const WCHAR *optionalcmd, CMD_NODE **output, HANDLE BOOL if_condition_evaluate(CMD_IF_CONDITION *cond, int *test) { + WCHAR expanded_left[MAXSTRING]; + WCHAR expanded_right[MAXSTRING]; int (WINAPI *cmp)(const WCHAR*, const WCHAR*) = cond->case_insensitive ? lstrcmpiW : lstrcmpW; TRACE("About to evaluate condition %s\n", debugstr_if_condition(cond)); @@ -3114,35 +3111,51 @@ BOOL if_condition_evaluate(CMD_IF_CONDITION *cond, int *test) switch (cond->op) { case CMD_IF_ERRORLEVEL: - *test = errorlevel >= cond->level; + { + WCHAR *endptr; + int level; + + wcscpy(expanded_left, cond->operand); + handleExpansion(expanded_left, context != NULL, delayedsubst); + level = wcstol(expanded_left, &endptr, 10); + if (*endptr) return FALSE; + *test = errorlevel >= level; + } break; case CMD_IF_EXIST: { + size_t len; WIN32_FIND_DATAW fd; HANDLE hff; - size_t len = wcslen(cond->operand); - if (len) + wcscpy(expanded_left, cond->operand); + handleExpansion(expanded_left, context != NULL, delayedsubst); + if ((len = wcslen(expanded_left))) { /* FindFirstFile does not like a directory path ending in '\' or '/', so append a '.' */ - if (cond->operand[len - 1] == '\\' || cond->operand[len - 1] == '/') + if ((expanded_left[len - 1] == '\\' || expanded_left[len - 1] == '/') && len < MAXSTRING - 1) { - WCHAR *new = xrealloc((void*)cond->operand, (wcslen(cond->operand) + 2) * sizeof(WCHAR)); - wcscat(new, L"."); - cond->operand = new; + wcscat(expanded_left, L"."); } - hff = FindFirstFileW(cond->operand, &fd); + hff = FindFirstFileW(expanded_left, &fd); *test = (hff != INVALID_HANDLE_VALUE); if (*test) FindClose(hff); } } break; case CMD_IF_DEFINED: - *test = GetEnvironmentVariableW(cond->operand, NULL, 0) > 0; + wcscpy(expanded_left, cond->operand); + handleExpansion(expanded_left, context != NULL, delayedsubst); + *test = GetEnvironmentVariableW(expanded_left, NULL, 0) > 0; break; case CMD_IF_BINOP_EQUAL: + wcscpy(expanded_left, cond->left); + handleExpansion(expanded_left, context != NULL, delayedsubst); + wcscpy(expanded_right, cond->right); + handleExpansion(expanded_right, context != NULL, delayedsubst); + /* == is a special case, as it always compares strings */ - *test = (*cmp)(cond->left, cond->right) == 0; + *test = (*cmp)(expanded_left, expanded_right) == 0; break; default: { @@ -3150,13 +3163,18 @@ BOOL if_condition_evaluate(CMD_IF_CONDITION *cond, int *test) WCHAR *end_left, *end_right; int cmp_val; + wcscpy(expanded_left, cond->left); + handleExpansion(expanded_left, context != NULL, delayedsubst); + wcscpy(expanded_right, cond->right); + handleExpansion(expanded_right, context != NULL, delayedsubst); + /* Check if we have plain integers (in decimal, octal or hexadecimal notation) */ - left_int = wcstol(cond->left, &end_left, 0); - right_int = wcstol(cond->right, &end_right, 0); - if (end_left > cond->left && !*end_left && end_right > cond->right && !*end_right) + left_int = wcstol(expanded_left, &end_left, 0); + right_int = wcstol(expanded_right, &end_right, 0); + if (end_left > expanded_left && !*end_left && end_right > expanded_right && !*end_right) cmp_val = left_int - right_int; else - cmp_val = (*cmp)(cond->left, cond->right); + cmp_val = (*cmp)(expanded_left, expanded_right); switch (cond->op) { case CMD_IF_BINOP_LSS: *test = cmp_val < 0; break;

1 0

Eric Pouech : cmd/tests: Add tests for delayed substitution in IF command.
by Alexandre Julliard 21 Jun '24

21 Jun '24

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@or_broken@!WINE_FOO! foo bar@or_broken@foo -0 -0@or_broken@1 +gotitright +33 +@todo_wine@0@or_broken@1 foo !WINE_FOO! @todo_wine@not empty

1 0

← Newer
1
...
15
16
17
18
19
20
21
...
62
Older →

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 June 2024