April 2022 - Wine-commits - list.winehq.org

Rémi Bernon : kernel32/tests: Add some HeapWalk tests.
by Alexandre Julliard 13 Apr '22

13 Apr '22

Module: wine Branch: master Commit: 0237d1702f77372bd923c2ac4591cebdcdeb2709 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0237d1702f77372bd923c2ac… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Apr 8 16:06:49 2022 +0200 kernel32/tests: Add some HeapWalk tests. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/heap.c | 270 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 270 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0237d1702f77372bd923…

1 0

Rémi Bernon : kernel32/tests: Cleanup and add Heap(Query|Set)Information tests.
by Alexandre Julliard 13 Apr '22

13 Apr '22

Module: wine Branch: master Commit: 98066b5a8e571e708f3dec4d2f72831b7ecc308a URL: https://source.winehq.org/git/wine.git/?a=commit;h=98066b5a8e571e708f3dec4d… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Apr 8 16:06:50 2022 +0200 kernel32/tests: Cleanup and add Heap(Query|Set)Information tests. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/heap.c | 147 +++++++++++++++++++++++++++++---------------- 1 file changed, 95 insertions(+), 52 deletions(-) diff --git a/dlls/kernel32/tests/heap.c b/dlls/kernel32/tests/heap.c index 3e608efb8dc..1e82b3c18f4 100644 --- a/dlls/kernel32/tests/heap.c +++ b/dlls/kernel32/tests/heap.c @@ -44,6 +44,7 @@ static BOOL (WINAPI *pGetPhysicallyInstalledSystemMemory)( ULONGLONG * ); #define MAKE_FUNC(f) static typeof(f) *p ## f MAKE_FUNC( HeapQueryInformation ); +MAKE_FUNC( HeapSetInformation ); MAKE_FUNC( GlobalFlags ); MAKE_FUNC( RtlGetNtGlobalFlags ); #undef MAKE_FUNC @@ -57,6 +58,7 @@ static void load_functions(void) LOAD_FUNC( kernel32, HeapAlloc ); LOAD_FUNC( kernel32, HeapReAlloc ); LOAD_FUNC( kernel32, HeapQueryInformation ); + LOAD_FUNC( kernel32, HeapSetInformation ); LOAD_FUNC( kernel32, GetPhysicallyInstalledSystemMemory ); LOAD_FUNC( kernel32, GlobalFlags ); LOAD_FUNC( ntdll, RtlGetNtGlobalFlags ); @@ -84,6 +86,7 @@ static void test_HeapCreate(void) HANDLE heap, heap1, heaps[8]; BYTE *ptr, *ptr1, *ptrs[128]; DWORD heap_count, count; + ULONG compat_info; UINT_PTR align; BOOL ret; @@ -643,6 +646,98 @@ static void test_HeapCreate(void) ret = HeapFree( heap, 0, ptr ); ok( ret, "HeapFree failed, error %lu\n", GetLastError() ); + size = 0; + SetLastError( 0xdeadbeef ); + ret = pHeapQueryInformation( 0, HeapCompatibilityInformation, &compat_info, sizeof(compat_info), &size ); + todo_wine + ok( !ret, "HeapQueryInformation succeeded\n" ); + todo_wine + ok( GetLastError() == ERROR_NOACCESS, "got error %lu\n", GetLastError() ); + todo_wine + ok( size == 0, "got size %Iu\n", size ); + + size = 0; + SetLastError( 0xdeadbeef ); + ret = pHeapQueryInformation( heap, HeapCompatibilityInformation, NULL, 0, &size ); + ok( !ret, "HeapQueryInformation succeeded\n" ); + ok( GetLastError() == ERROR_INSUFFICIENT_BUFFER, "got error %lu\n", GetLastError() ); + ok( size == sizeof(ULONG), "got size %Iu\n", size ); + + SetLastError( 0xdeadbeef ); + ret = pHeapQueryInformation( heap, HeapCompatibilityInformation, NULL, 0, NULL ); + ok( !ret, "HeapQueryInformation succeeded\n" ); + ok( GetLastError() == ERROR_INSUFFICIENT_BUFFER, "got error %lu\n", GetLastError() ); + + SetLastError( 0xdeadbeef ); + compat_info = 0xdeadbeef; + ret = pHeapQueryInformation( heap, HeapCompatibilityInformation, &compat_info, sizeof(compat_info) + 1, NULL ); + ok( ret, "HeapQueryInformation failed, error %lu\n", GetLastError() ); + ok( compat_info == 0, "got compat_info %lu\n", compat_info ); + + ret = HeapDestroy( heap ); + ok( ret, "HeapDestroy failed, error %lu\n", GetLastError() ); + + + /* check setting LFH compat info */ + + heap = HeapCreate( 0, 0, 0 ); + ok( !!heap, "HeapCreate failed, error %lu\n", GetLastError() ); + ok( !((ULONG_PTR)heap & 0xffff), "wrong heap alignment\n" ); + + ret = pHeapQueryInformation( heap, HeapCompatibilityInformation, &compat_info, sizeof(compat_info), &size ); + ok( ret, "HeapQueryInformation failed, error %lu\n", GetLastError() ); + ok( compat_info == 0, "got HeapCompatibilityInformation %lu\n", compat_info ); + + compat_info = 2; + ret = pHeapSetInformation( heap, HeapCompatibilityInformation, &compat_info, sizeof(compat_info) ); + ok( ret, "HeapSetInformation failed, error %lu\n", GetLastError() ); + ret = pHeapQueryInformation( heap, HeapCompatibilityInformation, &compat_info, sizeof(compat_info), &size ); + ok( ret, "HeapQueryInformation failed, error %lu\n", GetLastError() ); + todo_wine + ok( compat_info == 2, "got HeapCompatibilityInformation %lu\n", compat_info ); + + /* cannot be undone */ + + compat_info = 0; + SetLastError( 0xdeadbeef ); + ret = pHeapSetInformation( heap, HeapCompatibilityInformation, &compat_info, sizeof(compat_info) ); + todo_wine + ok( !ret, "HeapSetInformation succeeded\n" ); + todo_wine + ok( GetLastError() == ERROR_GEN_FAILURE, "got error %lu\n", GetLastError() ); + compat_info = 1; + SetLastError( 0xdeadbeef ); + ret = pHeapSetInformation( heap, HeapCompatibilityInformation, &compat_info, sizeof(compat_info) ); + todo_wine + ok( !ret, "HeapSetInformation succeeded\n" ); + todo_wine + ok( GetLastError() == ERROR_GEN_FAILURE, "got error %lu\n", GetLastError() ); + ret = pHeapQueryInformation( heap, HeapCompatibilityInformation, &compat_info, sizeof(compat_info), &size ); + ok( ret, "HeapQueryInformation failed, error %lu\n", GetLastError() ); + todo_wine + ok( compat_info == 2, "got HeapCompatibilityInformation %lu\n", compat_info ); + + ret = HeapDestroy( heap ); + ok( ret, "HeapDestroy failed, error %lu\n", GetLastError() ); + + /* some allocation pattern automatically enables LFH */ + + heap = HeapCreate( 0, 0, 0 ); + ok( !!heap, "HeapCreate failed, error %lu\n", GetLastError() ); + ok( !((ULONG_PTR)heap & 0xffff), "wrong heap alignment\n" ); + + ret = pHeapQueryInformation( heap, HeapCompatibilityInformation, &compat_info, sizeof(compat_info), &size ); + ok( ret, "HeapQueryInformation failed, error %lu\n", GetLastError() ); + ok( compat_info == 0, "got HeapCompatibilityInformation %lu\n", compat_info ); + + for (i = 0; i < 0x12; i++) ptrs[i] = pHeapAlloc( heap, 0, 0 ); + for (i = 0; i < 0x12; i++) HeapFree( heap, 0, ptrs[i] ); + + ret = pHeapQueryInformation( heap, HeapCompatibilityInformation, &compat_info, sizeof(compat_info), &size ); + ok( ret, "HeapQueryInformation failed, error %lu\n", GetLastError() ); + todo_wine + ok( compat_info == 2, "got HeapCompatibilityInformation %lu\n", compat_info ); + ret = HeapDestroy( heap ); ok( ret, "HeapDestroy failed, error %lu\n", GetLastError() ); } @@ -1505,57 +1600,6 @@ static void test_LocalAlloc(void) } } -static void test_HeapQueryInformation(void) -{ - ULONG info; - SIZE_T size; - BOOL ret; - - if (!pHeapQueryInformation) - { - win_skip("HeapQueryInformation is not available\n"); - return; - } - - if (0) /* crashes under XP */ - { - size = 0; - pHeapQueryInformation(0, - HeapCompatibilityInformation, - &info, sizeof(info), &size); - size = 0; - pHeapQueryInformation(GetProcessHeap(), - HeapCompatibilityInformation, - NULL, sizeof(info), &size); - } - - size = 0; - SetLastError(0xdeadbeef); - ret = pHeapQueryInformation(GetProcessHeap(), - HeapCompatibilityInformation, - NULL, 0, &size); - ok(!ret, "HeapQueryInformation should fail\n"); - ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, - "expected ERROR_INSUFFICIENT_BUFFER got %lu\n", GetLastError()); - ok(size == sizeof(ULONG), "expected 4, got %Iu\n", size); - - SetLastError(0xdeadbeef); - ret = pHeapQueryInformation(GetProcessHeap(), - HeapCompatibilityInformation, - NULL, 0, NULL); - ok(!ret, "HeapQueryInformation should fail\n"); - ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, - "expected ERROR_INSUFFICIENT_BUFFER got %lu\n", GetLastError()); - - info = 0xdeadbeaf; - SetLastError(0xdeadbeef); - ret = pHeapQueryInformation(GetProcessHeap(), - HeapCompatibilityInformation, - &info, sizeof(info) + 1, NULL); - ok(ret, "HeapQueryInformation error %lu\n", GetLastError()); - ok(info == 0 || info == 1 || info == 2, "expected 0, 1 or 2, got %lu\n", info); -} - static void test_heap_checks( DWORD flags ) { BYTE old, *p, *p2; @@ -2017,7 +2061,6 @@ START_TEST(heap) test_GlobalAlloc(); test_LocalAlloc(); - test_HeapQueryInformation(); test_GetPhysicallyInstalledSystemMemory(); test_GlobalMemoryStatus();

1 0

Rémi Bernon : kernel32/tests: Add some HeapWalk tests for the LFH frontend.
by Alexandre Julliard 13 Apr '22

13 Apr '22

Module: wine Branch: master Commit: 29fe143544e5d344d1e961c73b2907df47e3cb5e URL: https://source.winehq.org/git/wine.git/?a=commit;h=29fe143544e5d344d1e961c7… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Apr 8 16:06:51 2022 +0200 kernel32/tests: Add some HeapWalk tests for the LFH frontend. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/heap.c | 127 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 127 insertions(+) diff --git a/dlls/kernel32/tests/heap.c b/dlls/kernel32/tests/heap.c index 1e82b3c18f4..53cff284c6f 100644 --- a/dlls/kernel32/tests/heap.c +++ b/dlls/kernel32/tests/heap.c @@ -740,6 +740,133 @@ static void test_HeapCreate(void) ret = HeapDestroy( heap ); ok( ret, "HeapDestroy failed, error %lu\n", GetLastError() ); + + + /* LFH actually doesn't enable immediately, the pattern is required */ + + heap = HeapCreate( 0, 0, 0 ); + ok( !!heap, "HeapCreate failed, error %lu\n", GetLastError() ); + ok( !((ULONG_PTR)heap & 0xffff), "wrong heap alignment\n" ); + + compat_info = 2; + ret = pHeapSetInformation( heap, HeapCompatibilityInformation, &compat_info, sizeof(compat_info) ); + ok( ret, "HeapSetInformation failed, error %lu\n", GetLastError() ); + ret = pHeapQueryInformation( heap, HeapCompatibilityInformation, &compat_info, sizeof(compat_info), &size ); + ok( ret, "HeapQueryInformation failed, error %lu\n", GetLastError() ); + todo_wine + ok( compat_info == 2, "got HeapCompatibilityInformation %lu\n", compat_info ); + + for (i = 0; i < 0x11; i++) ptrs[i] = pHeapAlloc( heap, 0, 24 + 2 * sizeof(void *) ); + for (i = 0; i < 0x11; i++) HeapFree( heap, 0, ptrs[i] ); + + count = 0; + memset( &entries, 0xcd, sizeof(entries) ); + memset( &entry, 0xcd, sizeof(entry) ); + entry.lpData = NULL; + SetLastError( 0xdeadbeef ); + while ((ret = HeapWalk( heap, &entry ))) entries[count++] = entry; + ok( GetLastError() == ERROR_NO_MORE_ITEMS, "got error %lu\n", GetLastError() ); + todo_wine + ok( count == 3, "got count %lu\n", count ); + + todo_wine + ok( entries[0].wFlags == PROCESS_HEAP_REGION, "got wFlags %#x\n", entries[0].wFlags ); + todo_wine + ok( entries[0].lpData == heap, "got lpData %p\n", entries[0].lpData ); + todo_wine + ok( entries[0].cbData <= 0x1000 /* sizeof(*heap) */, "got cbData %#lx\n", entries[0].cbData ); + todo_wine + ok( entries[0].cbOverhead == 0, "got cbOverhead %#x\n", entries[0].cbOverhead ); + ok( entries[0].iRegionIndex == 0, "got iRegionIndex %d\n", entries[0].iRegionIndex ); + todo_wine + ok( entries[1].wFlags == 0, "got wFlags %#x\n", entries[1].wFlags ); + todo_wine + ok( entries[2].wFlags == PROCESS_HEAP_UNCOMMITTED_RANGE, "got wFlags %#x\n", entries[2].wFlags ); + + for (i = 0; i < 0x12; i++) ptrs[i] = pHeapAlloc( heap, 0, 24 + 2 * sizeof(void *) ); + for (i = 0; i < 0x12; i++) HeapFree( heap, 0, ptrs[i] ); + + count = 0; + memset( &entries, 0xcd, sizeof(entries) ); + memset( &entry, 0xcd, sizeof(entry) ); + entry.lpData = NULL; + SetLastError( 0xdeadbeef ); + while ((ret = HeapWalk( heap, &entry ))) entries[count++] = entry; + ok( GetLastError() == ERROR_NO_MORE_ITEMS, "got error %lu\n", GetLastError() ); + todo_wine + ok( count > 24, "got count %lu\n", count ); + if (count < 2) count = 2; + + todo_wine + ok( entries[0].wFlags == PROCESS_HEAP_REGION, "got wFlags %#x\n", entries[0].wFlags ); + todo_wine + ok( entries[0].lpData == heap, "got lpData %p\n", entries[0].lpData ); + todo_wine + ok( entries[0].cbData <= 0x1000 /* sizeof(*heap) */, "got cbData %#lx\n", entries[0].cbData ); + todo_wine + ok( entries[0].cbOverhead == 0, "got cbOverhead %#x\n", entries[0].cbOverhead ); + ok( entries[0].iRegionIndex == 0, "got iRegionIndex %d\n", entries[0].iRegionIndex ); + todo_wine + ok( entries[1].wFlags == 0, "got wFlags %#x\n", entries[1].wFlags ); + + for (i = 0; i < 0x12; i++) + { + todo_wine + ok( entries[4 + i].wFlags == 0, "got wFlags %#x\n", entries[4 + i].wFlags ); + todo_wine + ok( entries[4 + i].cbData == 0x20, "got cbData %#lx\n", entries[4 + i].cbData ); + todo_wine + ok( entries[4 + i].cbOverhead == 2 * sizeof(void *), "got cbOverhead %#x\n", entries[4 + i].cbOverhead ); + } + + if (entries[count - 1].wFlags == PROCESS_HEAP_REGION) /* > win7 */ + ok( entries[count - 2].wFlags == PROCESS_HEAP_UNCOMMITTED_RANGE, "got wFlags %#x\n", entries[count - 2].wFlags ); + else + { + todo_wine + ok( entries[count - 1].wFlags == PROCESS_HEAP_UNCOMMITTED_RANGE, "got wFlags %#x\n", entries[count - 2].wFlags ); + } + + for (i = 0; i < 0x12; i++) ptrs[i] = pHeapAlloc( heap, 0, 24 + 2 * sizeof(void *) ); + + count = 0; + memset( &entries, 0xcd, sizeof(entries) ); + memset( &entry, 0xcd, sizeof(entry) ); + entry.lpData = NULL; + SetLastError( 0xdeadbeef ); + while ((ret = HeapWalk( heap, &entry ))) entries[count++] = entry; + ok( GetLastError() == ERROR_NO_MORE_ITEMS, "got error %lu\n", GetLastError() ); + todo_wine + ok( count > 24, "got count %lu\n", count ); + if (count < 2) count = 2; + + todo_wine + ok( entries[0].wFlags == PROCESS_HEAP_REGION, "got wFlags %#x\n", entries[0].wFlags ); + todo_wine + ok( entries[0].lpData == heap, "got lpData %p\n", entries[0].lpData ); + ok( entries[0].cbData <= 0x1000 /* sizeof(*heap) */, "got cbData %#lx\n", entries[0].cbData ); + todo_wine + ok( entries[0].cbOverhead == 0, "got cbOverhead %#x\n", entries[0].cbOverhead ); + ok( entries[0].iRegionIndex == 0, "got iRegionIndex %d\n", entries[0].iRegionIndex ); + ok( entries[1].wFlags == 0 || entries[1].wFlags == PROCESS_HEAP_ENTRY_BUSY /* win7 */, "got wFlags %#x\n", entries[1].wFlags ); + + for (i = 1; i < count - 2; i++) + { + if (entries[i].wFlags != PROCESS_HEAP_ENTRY_BUSY) continue; + todo_wine_if( sizeof(void *) == 8 ) + ok( entries[i].cbData == 0x18 + 2 * sizeof(void *), "got cbData %#lx\n", entries[i].cbData ); + ok( entries[i].cbOverhead == 0x8, "got cbOverhead %#x\n", entries[i].cbOverhead ); + } + + if (entries[count - 1].wFlags == PROCESS_HEAP_REGION) /* > win7 */ + ok( entries[count - 2].wFlags == PROCESS_HEAP_UNCOMMITTED_RANGE, "got wFlags %#x\n", entries[count - 2].wFlags ); + else + ok( entries[count - 1].wFlags == PROCESS_HEAP_UNCOMMITTED_RANGE, "got wFlags %#x\n", entries[count - 2].wFlags ); + + for (i = 0; i < 0x12; i++) HeapFree( heap, 0, ptrs[i] ); + + ret = HeapDestroy( heap ); + ok( ret, "HeapDestroy failed, error %lu\n", GetLastError() ); }

1 0

Alexandre Julliard : msvcrt: Fix mbcs initialization for UTF-8 codepage.
by Alexandre Julliard 13 Apr '22

13 Apr '22

Module: wine Branch: master Commit: 83a3a5c75b84b779525de2ce92f0be2c487e1087 URL: https://source.winehq.org/git/wine.git/?a=commit;h=83a3a5c75b84b779525de2ce… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 23 17:25:46 2022 +0100 msvcrt: Fix mbcs initialization for UTF-8 codepage. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/mbcs.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index 166af32cd27..fa25a7092e3 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -220,7 +220,7 @@ threadmbcinfo* create_mbcinfo(int cp, LCID lcid, threadmbcinfo *old_mbcinfo) WORD chartypes[256]; char bufA[256]; WCHAR bufW[256], lowW[256], upW[256]; - int charcount; + int charcount, maxchar; int ret; int i; @@ -288,7 +288,7 @@ threadmbcinfo* create_mbcinfo(int cp, LCID lcid, threadmbcinfo *old_mbcinfo) bytes += 2; } - if (cpi.MaxCharSize > 1) + if (cpi.MaxCharSize == 2) { /* trail bytes not available through kernel32 but stored in a structure in msvcrt */ struct cp_extra_info_t *cpextra = g_cpextrainfo; @@ -316,10 +316,12 @@ threadmbcinfo* create_mbcinfo(int cp, LCID lcid, threadmbcinfo *old_mbcinfo) else mbcinfo->ismbcodepage = 0; + maxchar = (newcp == CP_UTF8) ? 128 : 256; + /* we can't use GetStringTypeA directly because we don't have a locale - only a code page */ charcount = 0; - for (i = 0; i < 256; i++) + for (i = 0; i < maxchar; i++) if (!(mbcinfo->mbctype[i + 1] & _M1)) bufA[charcount++] = i; @@ -335,7 +337,7 @@ threadmbcinfo* create_mbcinfo(int cp, LCID lcid, threadmbcinfo *old_mbcinfo) LCMapStringW(lcid, LCMAP_UPPERCASE, bufW, charcount, upW, charcount); charcount = 0; - for (i = 0; i < 256; i++) + for (i = 0; i < maxchar; i++) if (!(mbcinfo->mbctype[i + 1] & _M1)) { if (chartypes[charcount] & C1_UPPER) @@ -359,7 +361,7 @@ threadmbcinfo* create_mbcinfo(int cp, LCID lcid, threadmbcinfo *old_mbcinfo) } charcount = 0; - for (i = 0; i < 256; i++) + for (i = 0; i < maxchar; i++) { if(!(mbcinfo->mbctype[i + 1] & _M1)) {

1 0

Alexandre Julliard : ntdll: Initialize the system locale on the Unix side.
by Alexandre Julliard 13 Apr '22

13 Apr '22

Module: wine Branch: master Commit: d53bc38d34ee043e16d3b0abf523f4e9407db8cb URL: https://source.winehq.org/git/wine.git/?a=commit;h=d53bc38d34ee043e16d3b0ab… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 13 14:38:05 2022 +0200 ntdll: Initialize the system locale on the Unix side. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/locale.c | 16 ++++---------- dlls/ntdll/locale.c | 9 +------- dlls/ntdll/unix/env.c | 57 ++++++++++++++++++++++++++++++++++++++---------- 3 files changed, 51 insertions(+), 31 deletions(-) diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index 95d7d77ecd7..25d6d76c0c4 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -366,10 +366,9 @@ static void load_locale_nls(void) UINT index_count; } *geo_header; - LCID lcid; LARGE_INTEGER dummy; - RtlGetLocaleFileMappingAddress( (void **)&header, &lcid, &dummy ); + RtlGetLocaleFileMappingAddress( (void **)&header, &system_lcid, &dummy ); locale_table = (const NLS_LOCALE_HEADER *)((char *)header + header->locales); lcids_index = (const NLS_LOCALE_LCID_INDEX *)((char *)locale_table + locale_table->lcids_offset); lcnames_index = (const NLS_LOCALE_LCNAME_INDEX *)((char *)locale_table + locale_table->lcnames_offset); @@ -1766,17 +1765,10 @@ void init_locale( HMODULE module ) kernelbase_handle = module; load_locale_nls(); - NtQueryDefaultLocale( FALSE, &system_lcid ); - NtQueryDefaultLocale( TRUE, &user_lcid ); - if (!(system_locale = NlsValidateLocale( &system_lcid, 0 ))) - { - if (GetEnvironmentVariableW( L"WINELOCALE", bufferW, ARRAY_SIZE(bufferW) )) - system_locale = get_locale_by_name( bufferW, &system_lcid ); - if (!system_locale) system_locale = get_locale_by_name( L"en-US", &system_lcid ); - } - system_lcid = system_locale->ilanguage; - if (system_lcid == LOCALE_CUSTOM_UNSPECIFIED) system_lcid = LOCALE_CUSTOM_DEFAULT; + if (system_lcid == LOCALE_CUSTOM_UNSPECIFIED) system_lcid = MAKELANGID( LANG_ENGLISH, SUBLANG_DEFAULT ); + system_locale = NlsValidateLocale( &system_lcid, 0 ); + NtQueryDefaultLocale( TRUE, &user_lcid ); if (!(user_locale = NlsValidateLocale( &user_lcid, 0 ))) { if (GetEnvironmentVariableW( L"WINEUSERLOCALE", bufferW, ARRAY_SIZE(bufferW) )) diff --git a/dlls/ntdll/locale.c b/dlls/ntdll/locale.c index 36fe3e92863..597910e5639 100644 --- a/dlls/ntdll/locale.c +++ b/dlls/ntdll/locale.c @@ -183,23 +183,16 @@ void locale_init(void) value.Buffer = locale; value.MaximumLength = sizeof(locale); - RtlInitUnicodeString( &name, L"WINELOCALE" ); - if (!RtlQueryEnvironmentVariable_U( NULL, &name, &value )) - { - const NLS_LOCALE_LCNAME_INDEX *entry = find_lcname_entry( locale ); - if (entry) system_lcid = get_locale_data( entry->idx )->idefaultlanguage; - } RtlInitUnicodeString( &name, L"WINEUSERLOCALE" ); if (!RtlQueryEnvironmentVariable_U( NULL, &name, &value )) { const NLS_LOCALE_LCNAME_INDEX *entry = find_lcname_entry( locale ); if (entry) user_lcid = get_locale_data( entry->idx )->idefaultlanguage; } - if (!system_lcid) system_lcid = MAKELANGID( LANG_ENGLISH, SUBLANG_DEFAULT ); + if (system_lcid == LOCALE_CUSTOM_UNSPECIFIED) system_lcid = MAKELANGID( LANG_ENGLISH, SUBLANG_DEFAULT ); if (!user_lcid) user_lcid = system_lcid; NtSetDefaultUILanguage( user_lcid ); NtSetDefaultLocale( TRUE, user_lcid ); - NtSetDefaultLocale( FALSE, system_lcid ); } diff --git a/dlls/ntdll/unix/env.c b/dlls/ntdll/unix/env.c index 3976e5b4365..ee958ae71f4 100644 --- a/dlls/ntdll/unix/env.c +++ b/dlls/ntdll/unix/env.c @@ -74,7 +74,7 @@ char **main_envp = NULL; WCHAR **main_wargv = NULL; static LCID user_lcid, system_lcid; -static LANGID user_ui_language, system_ui_language; +static LANGID user_ui_language; static char system_locale[LOCALE_NAME_MAX_LENGTH]; static char user_locale[LOCALE_NAME_MAX_LENGTH]; @@ -348,7 +348,6 @@ static BOOL is_dynamic_env_var( const char *var ) STARTS_WITH( var, "WINECONFIGDIR=" ) || STARTS_WITH( var, "WINEDLLDIR" ) || STARTS_WITH( var, "WINEUNIXCP=" ) || - STARTS_WITH( var, "WINELOCALE=" ) || STARTS_WITH( var, "WINEUSERLOCALE=" ) || STARTS_WITH( var, "WINEUSERNAME=" ) || STARTS_WITH( var, "WINEPRELOADRESERVE=" ) || @@ -762,6 +761,47 @@ static BOOL unix_to_win_locale( const char *unix_name, char *win_name ) } +static LCID init_system_lcid( void *locale_ptr ) +{ + struct + { + UINT ctypes; + UINT unknown1; + UINT unknown2; + UINT unknown3; + UINT locales; + UINT charmaps; + UINT geoids; + UINT scripts; + } *header = locale_ptr; + WCHAR name[LOCALE_NAME_MAX_LENGTH]; + const NLS_LOCALE_LCNAME_INDEX *lcnames; + const NLS_LOCALE_HEADER *locale_table; + const WCHAR *locale_strings; + int min, max; + + ascii_to_unicode( name, system_locale, strlen(system_locale) + 1 ); + locale_table = (const NLS_LOCALE_HEADER *)((char *)header + header->locales); + locale_strings = (const WCHAR *)((char *)locale_table + locale_table->strings_offset); + lcnames = (const NLS_LOCALE_LCNAME_INDEX *)((char *)locale_table + locale_table->lcnames_offset); + min = 0; + max = locale_table->nb_lcnames - 1; + while (min <= max) + { + int pos = (min + max) / 2; + int res = wcsicmp( name, locale_strings + lcnames[pos].name + 1 ); + if (res < 0) max = pos - 1; + else if (res > 0) min = pos + 1; + else + { + ULONG offset = locale_table->locales_offset + lcnames[pos].idx * locale_table->locale_size; + return ((const NLS_LOCALE_DATA *)((const char *)locale_table + offset))->idefaultlanguage; + } + } + return MAKELANGID( LANG_ENGLISH, SUBLANG_DEFAULT ); +} + + /****************************************************************** * init_locale */ @@ -1043,9 +1083,7 @@ static void add_dynamic_environment( WCHAR **env, SIZE_T *pos, SIZE_T *size ) append_envA( env, pos, size, "WINEUNIXCP", str ); } else append_envW( env, pos, size, "WINEUNIXCP", NULL ); - append_envA( env, pos, size, "WINELOCALE", system_locale ); - append_envA( env, pos, size, "WINEUSERLOCALE", - strcmp( user_locale, system_locale ) ? user_locale : NULL ); + append_envA( env, pos, size, "WINEUSERLOCALE", user_locale ); append_envA( env, pos, size, "SystemDrive", "C:" ); append_envA( env, pos, size, "SystemRoot", "C:\\windows" ); } @@ -2179,6 +2217,7 @@ NTSTATUS WINAPI NtInitializeNlsFiles( void **ptr, LCID *lcid, LARGE_INTEGER *siz status = map_section( handle, ptr, &mapsize, PAGE_READONLY ); NtClose( handle ); } + if (!status && !system_lcid) system_lcid = init_system_lcid( *ptr ); *lcid = system_lcid; return status; } @@ -2200,11 +2239,7 @@ NTSTATUS WINAPI NtQueryDefaultLocale( BOOLEAN user, LCID *lcid ) NTSTATUS WINAPI NtSetDefaultLocale( BOOLEAN user, LCID lcid ) { if (user) user_lcid = lcid; - else - { - system_lcid = lcid; - system_ui_language = LANGIDFROMLCID(lcid); /* there is no separate call to set it */ - } + else system_lcid = lcid; return STATUS_SUCCESS; } @@ -2234,7 +2269,7 @@ NTSTATUS WINAPI NtSetDefaultUILanguage( LANGID lang ) */ NTSTATUS WINAPI NtQueryInstallUILanguage( LANGID *lang ) { - *lang = system_ui_language; + *lang = LANGIDFROMLCID(system_lcid); /* there is no separate call to set it */ return STATUS_SUCCESS; }

1 0

Francois Gouget : testbot: Slightly speed up the Item property accesses.
by Alexandre Julliard 13 Apr '22

13 Apr '22

Module: tools Branch: master Commit: b43a450b41112f72b8c4ef4a20325a35784fb8da URL: https://source.winehq.org/git/tools.git/?a=commit;h=b43a450b41112f72b8c4ef4… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Apr 13 19:08:17 2022 +0200 testbot: Slightly speed up the Item property accesses. substr()+rindex() is a bit faster than the regular expression for separating the class name from the property name. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/ObjectModel/Item.pm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/testbot/lib/ObjectModel/Item.pm b/testbot/lib/ObjectModel/Item.pm index 9cec7b4..c086aec 100644 --- a/testbot/lib/ObjectModel/Item.pm +++ b/testbot/lib/ObjectModel/Item.pm @@ -228,9 +228,8 @@ sub AUTOLOAD { my $self = shift; - my $PropertyName = $ObjectModel::Item::AUTOLOAD; # strip fully-qualified portion - $PropertyName =~ s/.*://; + my $PropertyName = substr($ObjectModel::Item::AUTOLOAD, rindex($ObjectModel::Item::AUTOLOAD, ':') + 1); if ($PropertyName eq "DESTROY") { return;

1 0

Francois Gouget : testbot: Rename Collection::ItemExists() to HasItem().
by Alexandre Julliard 13 Apr '22

13 Apr '22

Module: tools Branch: master Commit: 782d030086c569e3555d08ba45ed3ccd44639764 URL: https://source.winehq.org/git/tools.git/?a=commit;h=782d030086c569e3555d08b… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Apr 13 19:08:50 2022 +0200 testbot: Rename Collection::ItemExists() to HasItem(). Unlike ItemExists(), HasItem() does not imply that a database query is performed to check whether there is a row for that Item. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/ObjectModel/Collection.pm | 16 ++++++++++------ testbot/lib/WineTestBot/Activity.pm | 8 ++++---- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/testbot/lib/ObjectModel/Collection.pm b/testbot/lib/ObjectModel/Collection.pm index 93a4502..bec5b1c 100644 --- a/testbot/lib/ObjectModel/Collection.pm +++ b/testbot/lib/ObjectModel/Collection.pm @@ -325,7 +325,7 @@ sub GetItem($$) my ($self, $Key) = @_; return undef if (!defined $Key); - return $self->{Items}{$Key} if (defined $self->{Items}{$Key}); + return $self->{Items}{$Key} if (exists $self->{Items}{$Key}); # The Item is not present in this Collection. # See if another in-scope Collection loaded it already. @@ -352,16 +352,20 @@ sub GetItem($$) =pod =over 12 -=item C<ItemExists()> +=item C<HasItem()> -Returns true if the specified item is present in the collection, that is if it -either matches the specified filter, or has been explicitly loaded through -GetItem(). +Returns true if the specified item is present in the collection. + +Note that unlike GetItem() this does not query the database to check if it +contains a matching item. Instead it only checks whether the Collection +already contains a matching Item, which would mean it was either loaded +because it either matches the Collection filter, or because of a GetItem() +call. =back =cut -sub ItemExists($$) +sub HasItem($$) { my ($self, $Key) = @_; diff --git a/testbot/lib/WineTestBot/Activity.pm b/testbot/lib/WineTestBot/Activity.pm index b82d265..53aff05 100644 --- a/testbot/lib/WineTestBot/Activity.pm +++ b/testbot/lib/WineTestBot/Activity.pm @@ -159,7 +159,7 @@ sub GetActivity($;$) { # Ignore retired / deleted VMs my ($RecordName, $RecordHost) = split / /, $Record->Name; - next if (!$VMs->ItemExists($RecordName)); + next if (!$VMs->HasItem($RecordName)); my $StatusVMs = ( $Group->{statusvms} ||= {} ); my $VMStatus = ( $StatusVMs->{$RecordName} ||= {} ); @@ -202,7 +202,7 @@ sub GetActivity($;$) elsif ($Record->Type eq "vmresult") { my ($RecordName, $RecordHost) = split / /, $Record->Name; - next if (!$VMs->ItemExists($RecordName)); + next if (!$VMs->HasItem($RecordName)); my $ResultVMs = ( $Group->{resultvms} ||= {} ); my $VMResult = ( $ResultVMs->{$RecordName} ||= {} ); @@ -362,7 +362,7 @@ sub GetStatistics($;$) foreach my $Task (@{$Tasks->GetItems()}) { my $HostStats; - if ($VMs->ItemExists($Task->VM->GetKey())) + if ($VMs->HasItem($Task->VM->GetKey())) { my $Host = $Task->VM->GetHost(); $HostStats = ($HostsStats->{items}->{$Host} ||= {}); @@ -389,7 +389,7 @@ sub GetStatistics($;$) { my $ReportSize = -s $ReportFileName; _AddFullStat($GlobalStats, "$StepType.size", $ReportSize, undef, $Task); - if ($VMs->ItemExists($Task->VM->GetKey())) + if ($VMs->HasItem($Task->VM->GetKey())) { my $VMStats = ($VMsStats->{items}->{$Task->VM->Name} ||= {}); _AddFullStat($VMStats, "report.size", $ReportSize, undef, $Task);

1 0

Francois Gouget : testbot/web: Use Collection::GetSortedItems() for collection blocks.
by Alexandre Julliard 13 Apr '22

13 Apr '22

Module: tools Branch: master Commit: a40ee48f7e74fa13777950ba73ec61bd27dec221 URL: https://source.winehq.org/git/tools.git/?a=commit;h=a40ee48f7e74fa13777950b… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Apr 13 19:44:53 2022 +0200 testbot/web: Use Collection::GetSortedItems() for collection blocks. This adds default Compare() methods to the Jobs and Patches classes which allows removing all the CollectionBlock SortKeys() methods. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/ObjectModel/CGI/CollectionBlock.pm | 15 +++++++------- testbot/lib/WineTestBot/Jobs.pm | 8 ++++++++ testbot/lib/WineTestBot/Patches.pm | 8 ++++++++ testbot/lib/WineTestBot/VMs.pm | 23 --------------------- testbot/web/JobDetails.pl | 28 +++++++++----------------- testbot/web/Submit.pl | 13 ++++++------ testbot/web/admin/VMsList.pl | 7 ------- testbot/web/index.pl | 15 -------------- 8 files changed, 39 insertions(+), 78 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm index 23825d7..f124e64 100644 --- a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm +++ b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm @@ -176,11 +176,11 @@ sub DisplayProperty($$) return $PropertyDescriptor->GetClass ne "Detailref"; } -sub SortKeys($$) +sub GetSortedItems($$) { - my ($self, $Keys) = @_; + my ($self, $Items) = @_; - return $Keys; + return $self->{Collection}->GetSortedItems($Items); } sub GetDisplayValue($$$) @@ -428,16 +428,15 @@ EOF print "<tbody>\n"; my $DetailsPage = $self->GetDetailsPage(); my $Row = 0; - my $Keys = $self->SortKeys($self->{Collection}->GetKeys()); - foreach my $Key (@$Keys) + my $Items = $self->{Collection}->GetSortedItems(); + foreach my $Item (@$Items) { my $Class = ($Row % 2) == 0 ? "even" : "odd"; - my $Item = $self->{Collection}->GetItem($Key); $self->GenerateDataRow($Item, $PropertyDescriptors, $DetailsPage, $Class, $ItemActions); $Row++; } - if (@$Keys == 0) + if (@$Items == 0) { print "<tr class='even'><td colspan='0'>No entries</td></tr>\n"; } @@ -445,7 +444,7 @@ EOF print "</tbody>\n"; print "</table>\n"; - if (@$ItemActions != 0 && @$Keys != 0) + if (@$ItemActions != 0 && @$Items != 0) { print <<EOF; <div class='CollectionBlockActions'> diff --git a/testbot/lib/WineTestBot/Jobs.pm b/testbot/lib/WineTestBot/Jobs.pm index a5ae135..c082a36 100644 --- a/testbot/lib/WineTestBot/Jobs.pm +++ b/testbot/lib/WineTestBot/Jobs.pm @@ -111,6 +111,14 @@ sub InitializeNew($$) $self->SUPER::InitializeNew($Collection); } +sub Compare($$) +{ + my ($self, $B) = @_; + + # Hack: Use direct attribute access for performance + return $B->{ColValues}{Id} <=> $self->{ColValues}{Id}; # newest first by default +} + =pod =over 12 diff --git a/testbot/lib/WineTestBot/Patches.pm b/testbot/lib/WineTestBot/Patches.pm index 6891fa5..d2ac52e 100644 --- a/testbot/lib/WineTestBot/Patches.pm +++ b/testbot/lib/WineTestBot/Patches.pm @@ -58,6 +58,14 @@ sub InitializeNew($$) $self->SUPER::InitializeNew($Collection); } +sub Compare($$) +{ + my ($self, $B) = @_; + + # Hack: Use direct attribute access for performance + return $B->{ColValues}{Id} <=> $self->{ColValues}{Id}; # newest first by default +} + =pod =over 12 diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm index 2e475b7..f0c16d1 100644 --- a/testbot/lib/WineTestBot/VMs.pm +++ b/testbot/lib/WineTestBot/VMs.pm @@ -809,29 +809,6 @@ sub CreateVMs(;$) \@PropertyDescriptors, $ScopeObject); } -sub SortKeysBySortOrder($$) -{ - my ($self, $Keys) = @_; - - # Sort retired and deleted VMs last - my %RoleOrders = ("retired" => 1, "deleted" => 2); - - my %SortOrder; - foreach my $Key (@$Keys) - { - my $Item = $self->GetItem($Key); - $SortOrder{$Key} = [$RoleOrders{$Item->Role} || 0, $Item->SortOrder, $Item->Name]; - } - - my @SortedKeys = sort { - my ($soa, $sob) = ($SortOrder{$a}, $SortOrder{$b}); - return @$soa[0] <=> @$sob[0] || - @$soa[1] <=> @$sob[1] || - @$soa[2] cmp @$sob[2]; - } @$Keys; - return \@SortedKeys; -} - sub FilterEnabledRole($) { my ($self) = @_; diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index 5a24204..da4ad7e 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -56,14 +56,6 @@ sub DisplayProperty($$) $PropertyName eq "Ended" || $PropertyName eq "TestFailures"; } -sub SortKeys($$) -{ - my ($self, $Keys) = @_; - - my @SortedKeys = sort { $a <=> $b } @$Keys; - return \@SortedKeys; -} - # # Item cell generation @@ -361,10 +353,10 @@ sub InitMoreInfo($) my ($self) = @_; my $More = $self->{More} = {}; - my $Keys = $self->{CollectionBlock}->SortKeys($self->{Collection}->GetKeys()); - foreach my $Key (@$Keys) + my $SortedStepTasks = $self->{Collection}->GetSortedItems(); + foreach my $StepTask (@$SortedStepTasks) { - my $StepTask = $self->{Collection}->GetItem($Key); + my $Key = $StepTask->GetKey(); $More->{$Key}->{Screenshot} = $self->GetParam("s$Key"); my $Value = $self->GetParam("f$Key"); @@ -569,17 +561,17 @@ function HideLog(event, url) EOF print "<div class='Content'>\n"; - my $Keys = $self->{CollectionBlock}->SortKeys($self->{Collection}->GetKeys()); - my $KeyIndex = 0; - foreach my $Key (@$Keys) + my $Index = 0; + my $SortedStepTasks = $self->{Collection}->GetSortedItems(); + foreach my $StepTask (@$SortedStepTasks) { - my $StepTask = $self->{Collection}->GetItem($Key); + my $Key = $StepTask->GetKey(); my $TaskDir = $StepTask->GetTaskDir(); my $VM = $StepTask->VM; - my $Prev = $KeyIndex > 0 ? "k". $Keys->[$KeyIndex-1] : "PageTitle"; - my $Next = $KeyIndex + 1 < @$Keys ? "k". $Keys->[$KeyIndex+1] : "PageEnd"; - $KeyIndex++; + my $Prev = $Index > 0 ? "k". $SortedStepTasks->[$Index-1]->GetKey() : "PageTitle"; + my $Next = $Index + 1 < @$SortedStepTasks ? "k". $SortedStepTasks->[$Index+1]->GetKey() : "PageEnd"; + $Index++; print "<h2><a name='k", $self->escapeHTML($Key), "'></a>", $self->escapeHTML($StepTask->GetTitle()), " <span class='right'><a class='title' href='#$Prev'>↑</a><a class='title' href='#$Next'>↓</a></span></h2>\n"; diff --git a/testbot/web/Submit.pl b/testbot/web/Submit.pl index 1ad94e4..8a1cc3c 100644 --- a/testbot/web/Submit.pl +++ b/testbot/web/Submit.pl @@ -474,10 +474,9 @@ sub _initialize($$$) $VMs->AddFilter("Type", ["win32", "win64", "wine"]); $VMs->FilterEnabledRole(); - my $SortedKeys = $VMs->SortKeysBySortOrder($VMs->GetKeys()); - foreach my $VMKey (@$SortedKeys) + my $SortedVMs = $VMs->GetSortedItems(); + foreach my $VM (@$SortedVMs) { - my $VM = $VMs->GetItem($VMKey); my ($ErrMessage, $Caps) = GetMissionCaps($VM->Missions, $VM->MissionCaps); LogMsg "$ErrMessage\n" if (defined $ErrMessage); @@ -492,7 +491,7 @@ sub _initialize($$$) } } - my $FieldBase = $self->escapeHTML($VMKey); + my $FieldBase = $self->escapeHTML($VM->GetKey()); foreach my $Build (sort @Builds) { my $VMRow = { @@ -752,10 +751,10 @@ sub GenerateFields($) print "<div class='ItemProperty'><label>Branch</label>", "<div class='ItemValue'>", "<select name='Branch' size='1'>"; - my @SortedKeys = sort { $a cmp $b } @{$Branches->GetKeys()}; - foreach my $Key (@SortedKeys) + my $SortedBranches = $Branches->GetSortedItems(); + foreach my $Branch (@$SortedBranches) { - my $Branch = $Branches->GetItem($Key); + my $Key = $Branch->GetKey(); print "<option value='", $self->escapeHTML($Key), "'"; if (defined $self->{Branch} and $Key eq $self->{Branch}) { diff --git a/testbot/web/admin/VMsList.pl b/testbot/web/admin/VMsList.pl index cfd5b91..f8162c6 100644 --- a/testbot/web/admin/VMsList.pl +++ b/testbot/web/admin/VMsList.pl @@ -43,13 +43,6 @@ sub DisplayProperty($$) $PropertyName eq "Description"; } -sub SortKeys($$) -{ - my ($self, $Keys) = @_; - - return $self->{Collection}->SortKeysBySortOrder($Keys); -} - sub OnItemAction($$$) { my ($self, $VM, $Action) = @_; diff --git a/testbot/web/index.pl b/testbot/web/index.pl index 85f8df3..478cb61 100644 --- a/testbot/web/index.pl +++ b/testbot/web/index.pl @@ -35,14 +35,6 @@ use WineTestBot::Utils; my $DAYS_DEFAULT = 4; -sub SortKeys($$) -{ - my ($self, $Keys) = @_; - - my @SortedKeys = sort { $b <=> $a } @$Keys; - return \@SortedKeys; -} - sub DisplayProperty($$) { my ($self, $PropertyDescriptor) = @_; @@ -188,13 +180,6 @@ use ObjectModel::CGI::CollectionBlock; our @ISA = qw(ObjectModel::CGI::CollectionBlock); -sub SortKeys($$) -{ - my ($self, $Keys) = @_; - - return $self->{Collection}->SortKeysBySortOrder($Keys); -} - sub DisplayProperty($$) { my ($self, $PropertyDescriptor) = @_;

1 0

Jacek Caban : kernelbase: Add support for CREATE_NO_WINDOW flag in CreateProcess.
by Alexandre Julliard 12 Apr '22

12 Apr '22

Module: wine Branch: master Commit: b4d91adb16565c9d12a70cb29c2d25cdb3665488 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b4d91adb16565c9d12a70cb2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 11 15:04:56 2022 +0200 kernelbase: Add support for CREATE_NO_WINDOW flag in CreateProcess. Based on patches by Eric Pouech and Torge Matthies. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/console.c | 3 --- dlls/kernelbase/console.c | 21 +++++++++++++++------ dlls/kernelbase/process.c | 11 +++++++---- dlls/ntdll/unix/process.c | 2 ++ include/wine/condrv.h | 5 +++-- programs/conhost/conhost.c | 11 ++++++++--- programs/conhost/conhost.h | 1 + 7 files changed, 36 insertions(+), 18 deletions(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index da19e3c6a3f..5d65b0b75e7 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -4754,7 +4754,6 @@ static void test_CreateProcessCUI(void) res = check_child_console_bits(cuiexec, CREATE_NEW_CONSOLE); ok(res == (CP_WITH_CONSOLE | CP_WITH_HANDLE | CP_WITH_WINDOW | CP_ALONE), "Unexpected result %x\n", res); res = check_child_console_bits(cuiexec, CREATE_NO_WINDOW); - todo_wine ok(res == (CP_WITH_CONSOLE | CP_WITH_HANDLE | CP_ALONE), "Unexpected result %x\n", res); res = check_child_console_bits(cuiexec, DETACHED_PROCESS | CREATE_NO_WINDOW); ok(res == 0, "Unexpected result %x\n", res); @@ -4771,7 +4770,6 @@ static void test_CreateProcessCUI(void) res = check_child_console_bits(guiexec, CREATE_NEW_CONSOLE); ok(res == 0, "Unexpected result %x\n", res); res = check_child_console_bits(guiexec, CREATE_NO_WINDOW); - todo_wine ok(res == 0, "Unexpected result %x\n", res); res = check_child_console_bits(guiexec, DETACHED_PROCESS | CREATE_NO_WINDOW); ok(res == 0, "Unexpected result %x\n", res); @@ -4785,7 +4783,6 @@ static void test_CreateProcessCUI(void) res = check_child_console_bits(cuiexec, CREATE_NEW_CONSOLE); ok(res == (CP_WITH_CONSOLE | CP_WITH_HANDLE | CP_WITH_WINDOW | CP_ALONE), "Unexpected result %x\n", res); res = check_child_console_bits(cuiexec, CREATE_NO_WINDOW); - todo_wine ok(res == (CP_WITH_CONSOLE | CP_WITH_HANDLE | CP_ALONE), "Unexpected result %x\n", res); res = check_child_console_bits(cuiexec, DETACHED_PROCESS | CREATE_NO_WINDOW); ok(res == 0, "Unexpected result %x\n", res); diff --git a/dlls/kernelbase/console.c b/dlls/kernelbase/console.c index b2bb6c53fd9..046eee6147c 100644 --- a/dlls/kernelbase/console.c +++ b/dlls/kernelbase/console.c @@ -361,10 +361,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH AttachConsole( DWORD pid ) } -/****************************************************************** - * AllocConsole (kernelbase.@) - */ -BOOL WINAPI AllocConsole(void) +static BOOL alloc_console( BOOL headless ) { SECURITY_ATTRIBUTES inheritable_attr = { sizeof(inheritable_attr), NULL, TRUE }; STARTUPINFOW app_si, console_si; @@ -419,6 +416,7 @@ BOOL WINAPI AllocConsole(void) swprintf( conhost_path, ARRAY_SIZE(conhost_path), L"%s\\conhost.exe", system_dir ); swprintf( cmd, ARRAY_SIZE(cmd), L"\"%s\" --server 0x%x", conhost_path, condrv_handle( server )); + if (headless) wcscat( cmd, L" --headless" ); Wow64DisableWow64FsRedirection( &redir ); ret = CreateProcessW( conhost_path, cmd, NULL, NULL, TRUE, DETACHED_PROCESS, NULL, NULL, &console_si, &pi ); Wow64RevertWow64FsRedirection( redir ); @@ -444,6 +442,15 @@ error: } +/****************************************************************** + * AllocConsole (kernelbase.@) + */ +BOOL WINAPI AllocConsole(void) +{ + return alloc_console( FALSE ); +} + + /****************************************************************************** * CreateConsoleScreenBuffer (kernelbase.@) */ @@ -2287,12 +2294,14 @@ void init_console( void ) init_console_std_handles( FALSE ); } } - else if (params->ConsoleHandle == CONSOLE_HANDLE_ALLOC) + else if (params->ConsoleHandle == CONSOLE_HANDLE_ALLOC || + params->ConsoleHandle == CONSOLE_HANDLE_ALLOC_NO_WINDOW) { + BOOL no_window = params->ConsoleHandle == CONSOLE_HANDLE_ALLOC_NO_WINDOW; HMODULE mod = GetModuleHandleW( NULL ); params->ConsoleHandle = NULL; if (RtlImageNtHeader( mod )->OptionalHeader.Subsystem == IMAGE_SUBSYSTEM_WINDOWS_CUI) - AllocConsole(); + alloc_console( no_window ); } else if (params->ConsoleHandle) create_console_connection( params->ConsoleHandle ); } diff --git a/dlls/kernelbase/process.c b/dlls/kernelbase/process.c index 1cecbce9321..32f622bdf3e 100644 --- a/dlls/kernelbase/process.c +++ b/dlls/kernelbase/process.c @@ -193,8 +193,12 @@ static RTL_USER_PROCESS_PARAMETERS *create_process_params( const WCHAR *filename if (flags & CREATE_NEW_CONSOLE) params->ConsoleHandle = CONSOLE_HANDLE_ALLOC; else if (!(flags & DETACHED_PROCESS)) { - params->ConsoleHandle = NtCurrentTeb()->Peb->ProcessParameters->ConsoleHandle; - if (!params->ConsoleHandle) params->ConsoleHandle = CONSOLE_HANDLE_ALLOC; + if (flags & CREATE_NO_WINDOW) params->ConsoleHandle = CONSOLE_HANDLE_ALLOC_NO_WINDOW; + else + { + params->ConsoleHandle = NtCurrentTeb()->Peb->ProcessParameters->ConsoleHandle; + if (!params->ConsoleHandle) params->ConsoleHandle = CONSOLE_HANDLE_ALLOC; + } } if (startup->dwFlags & STARTF_USESTDHANDLES) @@ -532,8 +536,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH CreateProcessInternalW( HANDLE token, const WCHAR /* Warn if unsupported features are used */ if (flags & (IDLE_PRIORITY_CLASS | HIGH_PRIORITY_CLASS | REALTIME_PRIORITY_CLASS | - CREATE_DEFAULT_ERROR_MODE | CREATE_NO_WINDOW | - PROFILE_USER | PROFILE_KERNEL | PROFILE_SERVER)) + CREATE_DEFAULT_ERROR_MODE | PROFILE_USER | PROFILE_KERNEL | PROFILE_SERVER)) WARN( "(%s,...): ignoring some flags in %lx\n", debugstr_w(app_name), flags ); if (cur_dir) diff --git a/dlls/ntdll/unix/process.c b/dlls/ntdll/unix/process.c index 99c8e37053c..078ad75099d 100644 --- a/dlls/ntdll/unix/process.c +++ b/dlls/ntdll/unix/process.c @@ -445,6 +445,7 @@ static NTSTATUS spawn_process( const RTL_USER_PROCESS_PARAMETERS *params, int so { if (params->ConsoleFlags || params->ConsoleHandle == CONSOLE_HANDLE_ALLOC || + params->ConsoleHandle == CONSOLE_HANDLE_ALLOC_NO_WINDOW || (params->hStdInput == INVALID_HANDLE_VALUE && params->hStdOutput == INVALID_HANDLE_VALUE)) { setsid(); @@ -585,6 +586,7 @@ static NTSTATUS fork_and_exec( OBJECT_ATTRIBUTES *attr, int unixdir, if (params->ConsoleFlags || params->ConsoleHandle == CONSOLE_HANDLE_ALLOC || + params->ConsoleHandle == CONSOLE_HANDLE_ALLOC_NO_WINDOW || (params->hStdInput == INVALID_HANDLE_VALUE && params->hStdOutput == INVALID_HANDLE_VALUE)) { setsid(); diff --git a/include/wine/condrv.h b/include/wine/condrv.h index 1000e62e765..452ce552da1 100644 --- a/include/wine/condrv.h +++ b/include/wine/condrv.h @@ -188,7 +188,8 @@ struct condrv_ctrl_event }; /* Wine specific values for console inheritance (params->ConsoleHandle) */ -#define CONSOLE_HANDLE_ALLOC ((HANDLE)1) -#define CONSOLE_HANDLE_SHELL ((HANDLE)2) +#define CONSOLE_HANDLE_ALLOC UlongToHandle(1) +#define CONSOLE_HANDLE_ALLOC_NO_WINDOW UlongToHandle(2) +#define CONSOLE_HANDLE_SHELL UlongToHandle(3) #endif /* _INC_CONDRV */ diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index d494e3f53a5..6ea64395e1a 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -2650,7 +2650,7 @@ static NTSTATUS console_input_ioctl( struct console *console, unsigned int code, TRACE( "get window\n" ); if (in_size || *out_size != sizeof(*result)) return STATUS_INVALID_PARAMETER; if (!(result = alloc_ioctl_buffer( sizeof(*result )))) return STATUS_NO_MEMORY; - if (!console->win) init_message_window( console ); + if (!console->win && !console->no_window) init_message_window( console ); *result = condrv_handle( console->win ); return STATUS_SUCCESS; } @@ -2929,8 +2929,13 @@ int __cdecl wmain(int argc, WCHAR *argv[]) { console.tty_input = GetStdHandle( STD_INPUT_HANDLE ); console.tty_output = GetStdHandle( STD_OUTPUT_HANDLE ); - init_tty_output( &console ); - if (!console.is_unix && !ensure_tty_input_thread( &console )) return 1; + + if (console.tty_input || console.tty_output) + { + init_tty_output( &console ); + if (!console.is_unix && !ensure_tty_input_thread( &console )) return 1; + } + else console.no_window = TRUE; } else { diff --git a/programs/conhost/conhost.h b/programs/conhost/conhost.h index 8ca09bb80d0..65cf5d39ebd 100644 --- a/programs/conhost/conhost.h +++ b/programs/conhost/conhost.h @@ -79,6 +79,7 @@ struct console struct screen_buffer *active; /* active screen buffer */ int is_unix; /* UNIX terminal mode */ int use_relative_cursor; /* use relative cursor positionning */ + int no_window; /* don't create console window */ INPUT_RECORD *records; /* input records */ unsigned int record_count; /* number of input records */ unsigned int record_size; /* size of input records buffer */

1 0

Eric Pouech : server: Use negative values for console pseudo handles.
by Alexandre Julliard 12 Apr '22

12 Apr '22

Module: wine Branch: master Commit: 95202ea4da95f724a6d98320cacd04b41b4f234e URL: https://source.winehq.org/git/wine.git/?a=commit;h=95202ea4da95f724a6d98320… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Apr 11 15:05:03 2022 +0200 server: Use negative values for console pseudo handles. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/condrv.h | 6 +++--- server/process.c | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/wine/condrv.h b/include/wine/condrv.h index 452ce552da1..2d763d0b821 100644 --- a/include/wine/condrv.h +++ b/include/wine/condrv.h @@ -188,8 +188,8 @@ struct condrv_ctrl_event }; /* Wine specific values for console inheritance (params->ConsoleHandle) */ -#define CONSOLE_HANDLE_ALLOC UlongToHandle(1) -#define CONSOLE_HANDLE_ALLOC_NO_WINDOW UlongToHandle(2) -#define CONSOLE_HANDLE_SHELL UlongToHandle(3) +#define CONSOLE_HANDLE_ALLOC LongToHandle(-1) +#define CONSOLE_HANDLE_ALLOC_NO_WINDOW LongToHandle(-2) +#define CONSOLE_HANDLE_SHELL LongToHandle(-3) #endif /* _INC_CONDRV */ diff --git a/server/process.c b/server/process.c index 65e2aa70de2..d1407204718 100644 --- a/server/process.c +++ b/server/process.c @@ -1333,8 +1333,8 @@ DECL_HANDLER(new_process) /* connect to the window station */ connect_process_winstation( process, parent_thread, parent ); - /* set the process console */ - if (info->data->console > 3) + /* inherit the process console, but keep pseudo handles (< 0), and 0 (= not attached to a console) as is */ + if ((int)info->data->console > 0) info->data->console = duplicate_handle( parent, info->data->console, process, 0, 0, DUPLICATE_SAME_ACCESS );

1 0