November 2022 - Wine-commits

Rémi Bernon : kernelbase: Handle LMEM_MODIFY flag first in LocalReAlloc.
by Alexandre Julliard 22 Nov '22

22 Nov '22

Module: wine Branch: master Commit: 86d09091e67ed4b77689dce21777b82e30f9b316 URL: https://gitlab.winehq.org/wine/wine/-/commit/86d09091e67ed4b77689dce21777b8… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sat Nov 19 14:28:58 2022 +0100 kernelbase: Handle LMEM_MODIFY flag first in LocalReAlloc. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53474 --- dlls/kernel32/tests/heap.c | 31 ++----------------------------- dlls/kernelbase/memory.c | 13 ++++++------- 2 files changed, 8 insertions(+), 36 deletions(-) diff --git a/dlls/kernel32/tests/heap.c b/dlls/kernel32/tests/heap.c index 069f7c7a8d6..a418d9087c7 100644 --- a/dlls/kernel32/tests/heap.c +++ b/dlls/kernel32/tests/heap.c @@ -1740,7 +1740,7 @@ static void test_GlobalAlloc(void) if (flags == GMEM_MOVEABLE) ok( size == 512, "GlobalSize returned %Iu\n", size ); else { - todo_wine_if(flags && (flags & GMEM_MOVEABLE) && !(flags & GMEM_MODIFY)) + todo_wine_if((flags & GMEM_DISCARDABLE) && !(flags & GMEM_MODIFY)) ok( size == 10, "GlobalSize returned %Iu\n", size ); } @@ -1774,7 +1774,7 @@ static void test_GlobalAlloc(void) if (flags == GMEM_MOVEABLE) ok( size == 10, "GlobalSize returned %Iu\n", size ); else if (flags) { - todo_wine_if((flags & GMEM_MOVEABLE) && !(flags & GMEM_MODIFY)) + todo_wine_if((flags & GMEM_DISCARDABLE) && (flags & (GMEM_MODIFY | GMEM_MOVEABLE | GMEM_DISCARDABLE)) != (GMEM_MODIFY | GMEM_MOVEABLE | GMEM_DISCARDABLE)) ok( size == 12, "GlobalSize returned %Iu\n", size ); } else ok( size == 12 || broken( size == 10 ) /* w8 */, "GlobalSize returned %Iu\n", size ); @@ -1917,10 +1917,7 @@ static void test_GlobalAlloc(void) if (!(flags & GMEM_MODIFY) && (flags & GMEM_DISCARDABLE)) todo_wine ok( !tmp_mem, "GlobalReAlloc succeeded\n" ); else - { - todo_wine_if(flags && (!(flags & GMEM_MOVEABLE) || flags == (GMEM_MODIFY | GMEM_MOVEABLE))) ok( tmp_mem == mem, "GlobalReAlloc returned %p, error %lu\n", tmp_mem, GetLastError() ); - } entry = *mem_entry_from_HANDLE( mem ); if ((flags & GMEM_DISCARDABLE) && (flags & GMEM_MODIFY)) expect_entry.flags |= 4; if ((flags & GMEM_DISCARDABLE) || (flags & GMEM_MODIFY)) @@ -1947,10 +1944,7 @@ static void test_GlobalAlloc(void) if (!(flags & GMEM_MODIFY) && (flags & GMEM_DISCARDABLE)) todo_wine ok( !tmp_mem, "GlobalReAlloc succeeded\n" ); else - { - todo_wine_if(flags && (!(flags & GMEM_MOVEABLE) || flags == (GMEM_MODIFY | GMEM_MOVEABLE))) ok( tmp_mem == mem, "GlobalReAlloc returned %p, error %lu\n", tmp_mem, GetLastError() ); - } entry = *mem_entry_from_HANDLE( mem ); if ((flags & GMEM_DISCARDABLE) && (flags & GMEM_MODIFY)) expect_entry.flags |= 4; ok( entry.ptr == expect_entry.ptr, "got ptr %p was %p\n", entry.ptr, expect_entry.ptr ); @@ -1976,10 +1970,7 @@ static void test_GlobalAlloc(void) else if (!(flags & GMEM_MODIFY) && (flags & GMEM_DISCARDABLE)) todo_wine ok( !tmp_mem, "GlobalReAlloc succeeded\n" ); else - { - todo_wine_if(!(flags & GMEM_MOVEABLE) || flags == (GMEM_MODIFY | GMEM_MOVEABLE)) ok( tmp_mem == mem, "GlobalReAlloc returned %p, error %lu\n", tmp_mem, GetLastError() ); - } entry = *mem_entry_from_HANDLE( mem ); if (flags == GMEM_MOVEABLE) { @@ -2474,10 +2465,7 @@ static void test_LocalAlloc(void) if (!(flags & LMEM_MODIFY) && ((flags & LMEM_DISCARDABLE) || !(flags & LMEM_MOVEABLE))) todo_wine ok( !tmp_mem, "LocalReAlloc succeeded\n" ); else - { - todo_wine_if((!(flags & LMEM_MOVEABLE) || flags == (LMEM_MODIFY | LMEM_MOVEABLE))) ok( tmp_mem == mem, "LocalReAlloc returned %p, error %lu\n", tmp_mem, GetLastError() ); - } entry = *mem_entry_from_HANDLE( mem ); if ((flags & LMEM_DISCARDABLE) && (flags & LMEM_MODIFY)) expect_entry.flags |= 4; if (flags == LMEM_MOVEABLE) ok( entry.ptr != expect_entry.ptr, "got unexpected ptr %p\n", entry.ptr ); @@ -2504,10 +2492,7 @@ static void test_LocalAlloc(void) if (!(flags & LMEM_MODIFY) && (flags & LMEM_DISCARDABLE)) todo_wine ok( !tmp_mem, "LocalReAlloc succeeded\n" ); else - { - todo_wine_if(flags && (!(flags & LMEM_MOVEABLE) || flags == (LMEM_MODIFY | LMEM_MOVEABLE))) ok( tmp_mem == mem, "LocalReAlloc returned %p, error %lu\n", tmp_mem, GetLastError() ); - } entry = *mem_entry_from_HANDLE( mem ); if ((flags & LMEM_DISCARDABLE) && (flags & LMEM_MODIFY)) expect_entry.flags |= 4; ok( entry.ptr == expect_entry.ptr, "got ptr %p was %p\n", entry.ptr, expect_entry.ptr ); @@ -2533,10 +2518,7 @@ static void test_LocalAlloc(void) tmp_mem = LocalReAlloc( mem, 0, flags ); if (flags & LMEM_MODIFY) - { - todo_wine_if(!(flags & LMEM_MOVEABLE) || (flags == (LMEM_MOVEABLE | LMEM_MODIFY))) ok( tmp_mem == mem, "LocalReAlloc returned %p, error %lu\n", tmp_mem, GetLastError() ); - } else todo_wine ok( !tmp_mem, "LocalReAlloc succeeded\n" ); entry = *mem_entry_from_HANDLE( mem ); @@ -2564,10 +2546,7 @@ static void test_LocalAlloc(void) if (!(flags & LMEM_MODIFY) && (flags & LMEM_DISCARDABLE)) todo_wine ok( !tmp_mem, "LocalReAlloc succeeded\n" ); else - { - todo_wine_if(flags && (!(flags & LMEM_MOVEABLE) || flags == (LMEM_MODIFY | LMEM_MOVEABLE))) ok( tmp_mem == mem, "LocalReAlloc returned %p, error %lu\n", tmp_mem, GetLastError() ); - } entry = *mem_entry_from_HANDLE( mem ); if ((flags & LMEM_DISCARDABLE) && (flags & LMEM_MODIFY)) expect_entry.flags |= 4; if ((flags & LMEM_DISCARDABLE) || (flags & LMEM_MODIFY)) @@ -2594,10 +2573,7 @@ static void test_LocalAlloc(void) if (!(flags & LMEM_MODIFY) && (flags & LMEM_DISCARDABLE)) todo_wine ok( !tmp_mem, "LocalReAlloc succeeded\n" ); else - { - todo_wine_if(flags && (!(flags & LMEM_MOVEABLE) || flags == (LMEM_MODIFY | LMEM_MOVEABLE))) ok( tmp_mem == mem, "LocalReAlloc returned %p, error %lu\n", tmp_mem, GetLastError() ); - } entry = *mem_entry_from_HANDLE( mem ); if ((flags & LMEM_DISCARDABLE) && (flags & LMEM_MODIFY)) expect_entry.flags |= 4; ok( entry.ptr == expect_entry.ptr, "got ptr %p was %p\n", entry.ptr, expect_entry.ptr ); @@ -2623,10 +2599,7 @@ static void test_LocalAlloc(void) else if (!(flags & LMEM_MODIFY) && (flags & LMEM_DISCARDABLE)) todo_wine ok( !tmp_mem, "LocalReAlloc succeeded\n" ); else - { - todo_wine_if(!(flags & LMEM_MOVEABLE) || flags == (LMEM_MODIFY | LMEM_MOVEABLE)) ok( tmp_mem == mem, "LocalReAlloc returned %p, error %lu\n", tmp_mem, GetLastError() ); - } entry = *mem_entry_from_HANDLE( mem ); if (flags == LMEM_MOVEABLE) { diff --git a/dlls/kernelbase/memory.c b/dlls/kernelbase/memory.c index 5710ee3b082..324caf4b5b6 100644 --- a/dlls/kernelbase/memory.c +++ b/dlls/kernelbase/memory.c @@ -1000,7 +1000,12 @@ HLOCAL WINAPI DECLSPEC_HOTPATCH LocalReAlloc( HLOCAL handle, SIZE_T size, UINT f } else if ((mem = unsafe_mem_from_HLOCAL( handle ))) { - if (!(flags & LMEM_MODIFY)) + if (flags & LMEM_MODIFY) + { + if (flags & LMEM_DISCARDABLE) mem->flags |= MEM_FLAG_DISCARDABLE; + ret = handle; + } + else { if (size) { @@ -1025,12 +1030,6 @@ HLOCAL WINAPI DECLSPEC_HOTPATCH LocalReAlloc( HLOCAL handle, SIZE_T size, UINT f ret = handle; } } - else if (flags & LMEM_DISCARDABLE) - { - mem->flags |= MEM_FLAG_DISCARDABLE; - ret = handle; - } - else SetLastError( ERROR_INVALID_PARAMETER ); } else SetLastError( ERROR_INVALID_HANDLE ); RtlUnlockHeap( heap );

1 0

Rémi Bernon : kernelbase: Handle LMEM_DISCARDABLE flag specifically in LocalReAlloc.
by Alexandre Julliard 22 Nov '22

22 Nov '22

Module: wine Branch: master Commit: c2c6536926d4245875e61c86636016b6efee74bc URL: https://gitlab.winehq.org/wine/wine/-/commit/c2c6536926d4245875e61c86636016… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sat Nov 19 16:23:46 2022 +0100 kernelbase: Handle LMEM_DISCARDABLE flag specifically in LocalReAlloc. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53474 --- dlls/kernel32/tests/heap.c | 93 +++++++++++++++++++++------------------------- dlls/kernelbase/memory.c | 2 + 2 files changed, 44 insertions(+), 51 deletions(-)

1 0

Rémi Bernon : kernelbase: Avoid moving locked HLOCAL pointer without LMEM_MOVEABLE.
by Alexandre Julliard 22 Nov '22

22 Nov '22

Module: wine Branch: master Commit: f43fc5121bcac1cad28037bfae4caff3b88f4184 URL: https://gitlab.winehq.org/wine/wine/-/commit/f43fc5121bcac1cad28037bfae4caf… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sat Nov 19 16:29:35 2022 +0100 kernelbase: Avoid moving locked HLOCAL pointer without LMEM_MOVEABLE. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53474 --- dlls/kernel32/tests/heap.c | 6 +++--- dlls/kernelbase/memory.c | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/tests/heap.c b/dlls/kernel32/tests/heap.c index 1c8d467d5e8..f85f34bf20d 100644 --- a/dlls/kernel32/tests/heap.c +++ b/dlls/kernel32/tests/heap.c @@ -2451,17 +2451,17 @@ static void test_LocalAlloc(void) tmp_mem = LocalReAlloc( mem, 512, flags ); if (!(flags & LMEM_MODIFY) && ((flags & LMEM_DISCARDABLE) || !(flags & LMEM_MOVEABLE))) - todo_wine_if(flags == LMEM_FIXED) ok( !tmp_mem, "LocalReAlloc succeeded\n" ); + ok( !tmp_mem, "LocalReAlloc succeeded\n" ); else ok( tmp_mem == mem, "LocalReAlloc returned %p, error %lu\n", tmp_mem, GetLastError() ); entry = *mem_entry_from_HANDLE( mem ); if ((flags & LMEM_DISCARDABLE) && (flags & LMEM_MODIFY)) expect_entry.flags |= 4; if (flags == LMEM_MOVEABLE) ok( entry.ptr != expect_entry.ptr, "got unexpected ptr %p\n", entry.ptr ); - else todo_wine_if(flags == LMEM_FIXED) ok( entry.ptr == expect_entry.ptr, "got ptr %p\n", entry.ptr ); + else ok( entry.ptr == expect_entry.ptr, "got ptr %p\n", entry.ptr ); ok( entry.flags == expect_entry.flags, "got flags %#Ix was %#Ix\n", entry.flags, expect_entry.flags ); size = LocalSize( mem ); if (flags == LMEM_MOVEABLE) ok( size == 512, "LocalSize returned %Iu\n", size ); - else todo_wine_if(flags == LMEM_FIXED) ok( size == 10, "LocalSize returned %Iu\n", size ); + else ok( size == 10, "LocalSize returned %Iu\n", size ); ret = LocalUnlock( mem ); ok( !ret, "LocalUnlock succeeded\n" ); diff --git a/dlls/kernelbase/memory.c b/dlls/kernelbase/memory.c index 98f5eabc316..baf17c075b4 100644 --- a/dlls/kernelbase/memory.c +++ b/dlls/kernelbase/memory.c @@ -1011,6 +1011,7 @@ HLOCAL WINAPI DECLSPEC_HOTPATCH LocalReAlloc( HLOCAL handle, SIZE_T size, UINT f { if (size) { + if (mem->lock && !(flags & LMEM_MOVEABLE)) heap_flags |= HEAP_REALLOC_IN_PLACE_ONLY; if (!mem->ptr) ptr = HeapAlloc( heap, heap_flags, size ); else ptr = HeapReAlloc( heap, heap_flags, mem->ptr, size );

1 0

Rémi Bernon : kernel32: Return success from GlobalReAlloc with locked HGLOBAL pointer.
by Alexandre Julliard 22 Nov '22

22 Nov '22

Module: wine Branch: master Commit: 28bc3b07034b9a4cf289d65c88e1705c666fbe16 URL: https://gitlab.winehq.org/wine/wine/-/commit/28bc3b07034b9a4cf289d65c88e170… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sat Nov 19 00:20:02 2022 +0100 kernel32: Return success from GlobalReAlloc with locked HGLOBAL pointer. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53474 --- dlls/kernel32/heap.c | 5 ++++- dlls/kernel32/tests/heap.c | 16 +++++----------- 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/dlls/kernel32/heap.c b/dlls/kernel32/heap.c index 9e1da01778d..3ea3b348376 100644 --- a/dlls/kernel32/heap.c +++ b/dlls/kernel32/heap.c @@ -195,7 +195,10 @@ HGLOBAL WINAPI GlobalReAlloc( HGLOBAL handle, SIZE_T size, UINT flags ) struct mem_entry *mem; void *ptr; - if ((mem = unsafe_mem_from_HLOCAL( handle )) && mem->lock) return 0; + if (!(flags & GMEM_MODIFY) && (mem = unsafe_mem_from_HLOCAL( handle )) && + mem->lock && (!size || (flags & GMEM_DISCARDABLE))) + return 0; + if (!(handle = LocalReAlloc( handle, size, flags ))) return 0; /* GlobalReAlloc allows changing GMEM_FIXED to GMEM_MOVEABLE with GMEM_MODIFY */ diff --git a/dlls/kernel32/tests/heap.c b/dlls/kernel32/tests/heap.c index f85f34bf20d..11fcadaab60 100644 --- a/dlls/kernel32/tests/heap.c +++ b/dlls/kernel32/tests/heap.c @@ -1817,21 +1817,17 @@ static void test_GlobalAlloc(void) if (!(flags & GMEM_MODIFY) && ((flags & GMEM_DISCARDABLE) || !(flags & GMEM_MOVEABLE))) ok( !tmp_mem, "GlobalReAlloc succeeded\n" ); else - { - todo_wine ok( tmp_mem == mem, "GlobalReAlloc returned %p, error %lu\n", tmp_mem, GetLastError() ); - } entry = *mem_entry_from_HANDLE( mem ); if ((flags & GMEM_DISCARDABLE) && (flags & GMEM_MODIFY)) expect_entry.flags |= 4; if (flags == GMEM_MOVEABLE) - todo_wine ok( entry.ptr != expect_entry.ptr, "got unexpected ptr %p\n", entry.ptr ); + ok( entry.ptr != expect_entry.ptr, "got unexpected ptr %p\n", entry.ptr ); else ok( entry.ptr == expect_entry.ptr, "got ptr %p\n", entry.ptr ); - todo_wine_if((flags & GMEM_MODIFY) && (flags & GMEM_MOVEABLE) && flags != (GMEM_MODIFY | GMEM_MOVEABLE)) ok( entry.flags == expect_entry.flags, "got flags %#Ix was %#Ix\n", entry.flags, expect_entry.flags ); size = GlobalSize( mem ); if (flags == GMEM_MOVEABLE) - todo_wine ok( size == 512, "GlobalSize returned %Iu\n", size ); + ok( size == 512, "GlobalSize returned %Iu\n", size ); else ok( size == 10, "GlobalSize returned %Iu\n", size ); @@ -1852,17 +1848,16 @@ static void test_GlobalAlloc(void) if (!(flags & GMEM_MODIFY) && (flags & GMEM_DISCARDABLE)) ok( !tmp_mem, "GlobalReAlloc succeeded\n" ); else - todo_wine ok( tmp_mem == mem, "GlobalReAlloc returned %p, error %lu\n", tmp_mem, GetLastError() ); + ok( tmp_mem == mem, "GlobalReAlloc returned %p, error %lu\n", tmp_mem, GetLastError() ); entry = *mem_entry_from_HANDLE( mem ); if ((flags & GMEM_DISCARDABLE) && (flags & GMEM_MODIFY)) expect_entry.flags |= 4; ok( entry.ptr == expect_entry.ptr, "got ptr %p was %p\n", entry.ptr, expect_entry.ptr ); - todo_wine_if((flags & GMEM_DISCARDABLE) && (flags & GMEM_MODIFY)) ok( entry.flags == expect_entry.flags, "got flags %#Ix was %#Ix\n", entry.flags, expect_entry.flags ); size = GlobalSize( mem ); if ((flags & GMEM_DISCARDABLE) || (flags & GMEM_MODIFY)) ok( size == 12, "GlobalSize returned %Iu\n", size ); else - todo_wine_if(!(flags & GMEM_MODIFY)) ok( size == 10, "GlobalSize returned %Iu\n", size ); + ok( size == 10, "GlobalSize returned %Iu\n", size ); ret = GlobalUnlock( mem ); ok( !ret, "GlobalUnlock succeeded\n" ); @@ -1879,13 +1874,12 @@ static void test_GlobalAlloc(void) tmp_mem = GlobalReAlloc( mem, 0, flags ); if (flags & GMEM_MODIFY) - todo_wine ok( tmp_mem == mem, "GlobalReAlloc returned %p, error %lu\n", tmp_mem, GetLastError() ); + ok( tmp_mem == mem, "GlobalReAlloc returned %p, error %lu\n", tmp_mem, GetLastError() ); else ok( !tmp_mem, "GlobalReAlloc succeeded\n" ); entry = *mem_entry_from_HANDLE( mem ); if ((flags & GMEM_DISCARDABLE) && (flags & GMEM_MODIFY)) expect_entry.flags |= 4; ok( entry.ptr == expect_entry.ptr, "got ptr %p was %p\n", entry.ptr, expect_entry.ptr ); - todo_wine_if((flags & GMEM_MODIFY) && (flags & GMEM_DISCARDABLE)) ok( entry.flags == expect_entry.flags, "got flags %#Ix was %#Ix\n", entry.flags, expect_entry.flags ); size = GlobalSize( mem ); ok( size == 12, "GlobalSize returned %Iu\n", size );

1 0

Rémi Bernon : kernelbase: Only discard HLOCAL with LMEM_MOVEABLE and if not locked.
by Alexandre Julliard 22 Nov '22

22 Nov '22

Module: wine Branch: master Commit: 03ad9474201b0ea20ec2282320c19bfe944788e8 URL: https://gitlab.winehq.org/wine/wine/-/commit/03ad9474201b0ea20ec2282320c19b… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sat Nov 19 16:31:26 2022 +0100 kernelbase: Only discard HLOCAL with LMEM_MOVEABLE and if not locked. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53474 --- dlls/kernel32/tests/heap.c | 18 ++++-------------- dlls/kernelbase/memory.c | 4 ++-- 2 files changed, 6 insertions(+), 16 deletions(-) diff --git a/dlls/kernel32/tests/heap.c b/dlls/kernel32/tests/heap.c index 11fcadaab60..3350f0853ab 100644 --- a/dlls/kernel32/tests/heap.c +++ b/dlls/kernel32/tests/heap.c @@ -1948,7 +1948,7 @@ static void test_GlobalAlloc(void) tmp_mem = GlobalReAlloc( mem, 0, flags ); if (flags == GMEM_FIXED) - todo_wine ok( !tmp_mem, "GlobalReAlloc succeeded\n" ); + ok( !tmp_mem, "GlobalReAlloc succeeded\n" ); else if (!(flags & GMEM_MODIFY) && (flags & GMEM_DISCARDABLE)) ok( !tmp_mem, "GlobalReAlloc succeeded\n" ); else @@ -1960,13 +1960,11 @@ static void test_GlobalAlloc(void) expect_entry.ptr = NULL; } else if ((flags & GMEM_DISCARDABLE) && (flags & GMEM_MODIFY)) expect_entry.flags |= 4; - todo_wine_if(!flags) ok( entry.ptr == expect_entry.ptr, "got ptr %p was %p\n", entry.ptr, expect_entry.ptr ); - todo_wine_if(!flags) ok( entry.flags == expect_entry.flags, "got flags %#Ix was %#Ix\n", entry.flags, expect_entry.flags ); size = GlobalSize( mem ); if (flags == GMEM_MOVEABLE) ok( size == 0, "GlobalSize returned %Iu\n", size ); - else todo_wine_if(!flags) ok( size == 12, "GlobalSize returned %Iu\n", size ); + else ok( size == 12, "GlobalSize returned %Iu\n", size ); mem = GlobalFree( mem ); ok( !mem, "GlobalFree failed, error %lu\n", GetLastError() ); @@ -2502,18 +2500,12 @@ static void test_LocalAlloc(void) if (flags & LMEM_MODIFY) ok( tmp_mem == mem, "LocalReAlloc returned %p, error %lu\n", tmp_mem, GetLastError() ); else - { - todo_wine_if(flags == LMEM_FIXED || flags == LMEM_MOVEABLE) ok( !tmp_mem, "LocalReAlloc succeeded\n" ); - } entry = *mem_entry_from_HANDLE( mem ); if ((flags & LMEM_DISCARDABLE) && (flags & LMEM_MODIFY)) expect_entry.flags |= 4; - todo_wine_if(flags == LMEM_FIXED || flags == LMEM_MOVEABLE) ok( entry.ptr == expect_entry.ptr, "got ptr %p was %p\n", entry.ptr, expect_entry.ptr ); - todo_wine_if(flags == LMEM_FIXED || flags == LMEM_MOVEABLE) ok( entry.flags == expect_entry.flags, "got flags %#Ix was %#Ix\n", entry.flags, expect_entry.flags ); size = LocalSize( mem ); - todo_wine_if(flags == LMEM_FIXED || flags == LMEM_MOVEABLE) ok( size == 12, "LocalSize returned %Iu\n", size ); ret = LocalUnlock( mem ); @@ -2580,7 +2572,7 @@ static void test_LocalAlloc(void) tmp_mem = LocalReAlloc( mem, 0, flags ); if (flags == LMEM_FIXED) - todo_wine ok( !tmp_mem, "LocalReAlloc succeeded\n" ); + ok( !tmp_mem, "LocalReAlloc succeeded\n" ); else if (!(flags & LMEM_MODIFY) && (flags & LMEM_DISCARDABLE)) ok( !tmp_mem, "LocalReAlloc succeeded\n" ); else @@ -2592,13 +2584,11 @@ static void test_LocalAlloc(void) expect_entry.ptr = NULL; } else if ((flags & LMEM_DISCARDABLE) && (flags & LMEM_MODIFY)) expect_entry.flags |= 4; - todo_wine_if(!flags) ok( entry.ptr == expect_entry.ptr, "got ptr %p was %p\n", entry.ptr, expect_entry.ptr ); - todo_wine_if(!flags) ok( entry.flags == expect_entry.flags, "got flags %#Ix was %#Ix\n", entry.flags, expect_entry.flags ); size = LocalSize( mem ); if (flags == LMEM_MOVEABLE) ok( size == 0, "LocalSize returned %Iu\n", size ); - else todo_wine_if(!(flags & (LMEM_MODIFY | LMEM_DISCARDABLE))) ok( size == 12, "LocalSize returned %Iu\n", size ); + else ok( size == 12, "LocalSize returned %Iu\n", size ); mem = LocalFree( mem ); ok( !mem, "LocalFree failed, error %lu\n", GetLastError() ); diff --git a/dlls/kernelbase/memory.c b/dlls/kernelbase/memory.c index baf17c075b4..df7c07c2700 100644 --- a/dlls/kernelbase/memory.c +++ b/dlls/kernelbase/memory.c @@ -1024,14 +1024,14 @@ HLOCAL WINAPI DECLSPEC_HOTPATCH LocalReAlloc( HLOCAL handle, SIZE_T size, UINT f ret = handle; } } - else + else if ((flags & LMEM_MOVEABLE) && !mem->lock) { HeapFree( heap, heap_flags, mem->ptr ); mem->flags |= MEM_FLAG_DISCARDED; - mem->lock = 0; mem->ptr = NULL; ret = handle; } + else SetLastError( ERROR_INVALID_PARAMETER ); } } else SetLastError( ERROR_INVALID_HANDLE );

1 0

Biswapriyo Nath : include: Add Stg functions declaration in propvarutil.h.
by Alexandre Julliard 22 Nov '22

22 Nov '22

Module: wine Branch: master Commit: 0d294ad26544913414277daa164004d731ae6e33 URL: https://gitlab.winehq.org/wine/wine/-/commit/0d294ad26544913414277daa164004… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Sun Nov 20 15:20:35 2022 +0000 include: Add Stg functions declaration in propvarutil.h. --- include/propvarutil.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/propvarutil.h b/include/propvarutil.h index fcc532fd623..b82c3d90274 100644 --- a/include/propvarutil.h +++ b/include/propvarutil.h @@ -205,6 +205,8 @@ inline BOOL IsPropVariantString(REFPROPVARIANT propvar) #endif /* NO_PROPVAR_INLINES */ #endif /* __cplusplus */ +HRESULT WINAPI StgSerializePropVariant(const PROPVARIANT *ppropvar, SERIALIZEDPROPERTYVALUE **ppprop, ULONG *pcb); +HRESULT WINAPI StgDeserializePropVariant(const SERIALIZEDPROPERTYVALUE *pprop, ULONG cbmax, PROPVARIANT *ppropvar); #ifdef __cplusplus }

1 0

Nikolay Sivov : vbscript: Handle CP_UTF8 in Chr()/Asc().
by Alexandre Julliard 22 Nov '22

22 Nov '22

Module: wine Branch: master Commit: beb9e1137087ed822656cdd1b299130f9ee3c575 URL: https://gitlab.winehq.org/wine/wine/-/commit/beb9e1137087ed822656cdd1b29913… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Nov 18 20:15:07 2022 +0300 vbscript: Handle CP_UTF8 in Chr()/Asc(). --- dlls/vbscript/global.c | 30 ++++++++++++++++++------------ dlls/vbscript/vbscript.c | 11 +++++++---- dlls/vbscript/vbscript.h | 1 + 3 files changed, 26 insertions(+), 16 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index d60374f9e87..d07d46415e6 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -1842,10 +1842,12 @@ static HRESULT Global_Asc(BuiltinDisp *This, VARIANT *arg, unsigned args_cnt, VA if(!SysStringLen(str)) hres = MAKE_VBSERROR(VBSE_ILLEGAL_FUNC_CALL); + else if (This->ctx->codepage == CP_UTF8) + hres = return_short(res, *str); else { unsigned char buf[2]; short val = 0; - int n = WideCharToMultiByte(CP_ACP, 0, str, 1, (char*)buf, sizeof(buf), NULL, NULL); + int n = WideCharToMultiByte(This->ctx->codepage, 0, str, 1, (char*)buf, sizeof(buf), NULL, NULL); switch(n) { case 1: val = buf[0]; @@ -1865,9 +1867,6 @@ static HRESULT Global_Asc(BuiltinDisp *This, VARIANT *arg, unsigned args_cnt, VA return hres; } -/* The function supports only single-byte and double-byte character sets. It - * ignores language specified by IActiveScriptSite::GetLCID. The argument needs - * to be in range of short or unsigned short. */ static HRESULT Global_Chr(BuiltinDisp *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { int cp, c, len = 0; @@ -1882,7 +1881,7 @@ static HRESULT Global_Chr(BuiltinDisp *This, VARIANT *arg, unsigned args_cnt, VA if(FAILED(hres)) return hres; - cp = GetACP(); + cp = This->ctx->codepage; if(!GetCPInfo(cp, &cpi)) cpi.MaxCharSize = 1; @@ -1892,13 +1891,20 @@ static HRESULT Global_Chr(BuiltinDisp *This, VARIANT *arg, unsigned args_cnt, VA return MAKE_VBSERROR(VBSE_ILLEGAL_FUNC_CALL); } - if(c>>8) - buf[len++] = c>>8; - if(!len || IsDBCSLeadByteEx(cp, buf[0])) - buf[len++] = c; - if(!MultiByteToWideChar(CP_ACP, 0, buf, len, &ch, 1)) { - WARN("invalid arg %d, cp %d\n", c, cp); - return E_FAIL; + if (cp == CP_UTF8) + { + ch = c; + } + else + { + if(c>>8) + buf[len++] = c>>8; + if(!len || IsDBCSLeadByteEx(cp, buf[0])) + buf[len++] = c; + if(!MultiByteToWideChar(cp, 0, buf, len, &ch, 1)) { + WARN("invalid arg %d, cp %d\n", c, cp); + return E_FAIL; + } } if(res) { diff --git a/dlls/vbscript/vbscript.c b/dlls/vbscript/vbscript.c index 428149d7132..b6364410931 100644 --- a/dlls/vbscript/vbscript.c +++ b/dlls/vbscript/vbscript.c @@ -555,8 +555,8 @@ static ULONG WINAPI VBScript_Release(IActiveScript *iface) static HRESULT WINAPI VBScript_SetScriptSite(IActiveScript *iface, IActiveScriptSite *pass) { VBScript *This = impl_from_IActiveScript(iface); + LCID lcid = LOCALE_USER_DEFAULT; named_item_t *item; - LCID lcid; HRESULT hres; TRACE("(%p)->(%p)\n", This, pass); @@ -590,9 +590,12 @@ static HRESULT WINAPI VBScript_SetScriptSite(IActiveScript *iface, IActiveScript This->ctx->site = pass; IActiveScriptSite_AddRef(This->ctx->site); - hres = IActiveScriptSite_GetLCID(This->ctx->site, &lcid); - if(hres == S_OK) - This->ctx->lcid = lcid; + IActiveScriptSite_GetLCID(This->ctx->site, &lcid); + This->ctx->lcid = IsValidLocale(lcid, 0) ? lcid : GetUserDefaultLCID(); + GetLocaleInfoW(lcid, LOCALE_IDEFAULTANSICODEPAGE | LOCALE_RETURN_NUMBER, (WCHAR *)&This->ctx->codepage, + sizeof(This->ctx->codepage)/sizeof(WCHAR)); + if (!This->ctx->codepage) + This->ctx->codepage = CP_UTF8; if(This->is_initialized) change_state(This, SCRIPTSTATE_INITIALIZED); diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index 3690fc4f0e2..8286b37bbab 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -183,6 +183,7 @@ static inline VARIANT *get_arg(DISPPARAMS *dp, DWORD i) struct _script_ctx_t { IActiveScriptSite *site; LCID lcid; + UINT codepage; IInternetHostSecurityManager *secmgr; DWORD safeopt;

1 0

Nikolay Sivov : ntdll: Use system language as preferred, if user language is custom-unspecified.
by Alexandre Julliard 22 Nov '22

22 Nov '22

Module: wine Branch: master Commit: 29cbec5e6c262239edbfafd5ccd94d8ade44cddf URL: https://gitlab.winehq.org/wine/wine/-/commit/29cbec5e6c262239edbfafd5ccd94d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 22 17:14:11 2022 +0300 ntdll: Use system language as preferred, if user language is custom-unspecified. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/ntdll/locale.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/locale.c b/dlls/ntdll/locale.c index 7e1a2c96eaa..26302cfb376 100644 --- a/dlls/ntdll/locale.c +++ b/dlls/ntdll/locale.c @@ -193,13 +193,16 @@ static NTSTATUS get_dummy_preferred_ui_language( DWORD flags, LANGID lang, ULONG NTSTATUS status; ULONG len; - FIXME("(0x%lx %p %p %p) returning a dummy value (current locale)\n", flags, count, buffer, size); + FIXME("(0x%lx %#x %p %p %p) returning a dummy value (current locale)\n", flags, lang, count, buffer, size); if (flags & MUI_LANGUAGE_ID) swprintf( name, ARRAY_SIZE(name), L"%04lX", lang ); else { UNICODE_STRING str; + if (lang == LOCALE_CUSTOM_UNSPECIFIED) + NtQueryInstallUILanguage( &lang ); + str.Buffer = name; str.MaximumLength = sizeof(name); status = RtlLcidToLocaleName( lang, &str, 0, FALSE );

1 0

Paul Gofman : xinputuap.dll: Add new dll.
by Alexandre Julliard 22 Nov '22

22 Nov '22

Module: wine Branch: master Commit: 25c52eb7645508d213d8cb2e2019217e9a0ba89b URL: https://gitlab.winehq.org/wine/wine/-/commit/25c52eb7645508d213d8cb2e201921… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Nov 2 18:20:25 2021 -0700 xinputuap.dll: Add new dll. Based on a patch by Yusuf Khan <yusisamerican(a)gmail.com>. Required for Halo Infinite. --- configure | 2 ++ configure.ac | 1 + dlls/xinputuap/Makefile.in | 8 ++++++++ dlls/xinputuap/version.rc | 27 +++++++++++++++++++++++++++ dlls/xinputuap/xinputuap.spec | 8 ++++++++ 5 files changed, 46 insertions(+) diff --git a/configure b/configure index 66519182d59..74727004efd 100755 --- a/configure +++ b/configure @@ -1543,6 +1543,7 @@ enable_xinput1_2 enable_xinput1_3 enable_xinput1_4 enable_xinput9_1_0 +enable_xinputuap enable_xmllite enable_xolehlp enable_xpsprint @@ -22020,6 +22021,7 @@ wine_fn_config_makefile dlls/xinput1_3 enable_xinput1_3 wine_fn_config_makefile dlls/xinput1_3/tests enable_tests wine_fn_config_makefile dlls/xinput1_4 enable_xinput1_4 wine_fn_config_makefile dlls/xinput9_1_0 enable_xinput9_1_0 +wine_fn_config_makefile dlls/xinputuap enable_xinputuap wine_fn_config_makefile dlls/xmllite enable_xmllite wine_fn_config_makefile dlls/xmllite/tests enable_tests wine_fn_config_makefile dlls/xolehlp enable_xolehlp diff --git a/configure.ac b/configure.ac index 32eb88129eb..7313fde9a4e 100644 --- a/configure.ac +++ b/configure.ac @@ -3304,6 +3304,7 @@ WINE_CONFIG_MAKEFILE(dlls/xinput1_3) WINE_CONFIG_MAKEFILE(dlls/xinput1_3/tests) WINE_CONFIG_MAKEFILE(dlls/xinput1_4) WINE_CONFIG_MAKEFILE(dlls/xinput9_1_0) +WINE_CONFIG_MAKEFILE(dlls/xinputuap) WINE_CONFIG_MAKEFILE(dlls/xmllite) WINE_CONFIG_MAKEFILE(dlls/xmllite/tests) WINE_CONFIG_MAKEFILE(dlls/xolehlp) diff --git a/dlls/xinputuap/Makefile.in b/dlls/xinputuap/Makefile.in new file mode 100644 index 00000000000..5d311fe7c31 --- /dev/null +++ b/dlls/xinputuap/Makefile.in @@ -0,0 +1,8 @@ +MODULE = xinputuap.dll +IMPORTS = hid setupapi advapi32 user32 +PARENTSRC = ../xinput1_3 + +C_SRCS = \ + main.c + +RC_SRCS = version.rc diff --git a/dlls/xinputuap/version.rc b/dlls/xinputuap/version.rc new file mode 100644 index 00000000000..557189b1596 --- /dev/null +++ b/dlls/xinputuap/version.rc @@ -0,0 +1,27 @@ +/* + * The Wine project - Xinput Joystick Library + * Copyright 2021 Yusuf Khan + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define WINE_FILEDESCRIPTION_STR "Wine Common Controller API" +#define WINE_FILENAME_STR "xinputuap.dll" +#define WINE_FILEVERSION 10,0,19041,746 +#define WINE_FILEVERSION_STR "10.0.19041.746" +#define WINE_PRODUCTVERSION 10,0,19041,746 +#define WINE_PRODUCTVERSION_STR "10.0" + +#include "wine/wine_common_ver.rc" diff --git a/dlls/xinputuap/xinputuap.spec b/dlls/xinputuap/xinputuap.spec new file mode 100644 index 00000000000..4a5ee5c51d8 --- /dev/null +++ b/dlls/xinputuap/xinputuap.spec @@ -0,0 +1,8 @@ +1 stdcall -private DllMain(long long ptr) +2 stdcall XInputEnable(long) +3 stub XInputGetAudioDeviceIds(long ptr ptr ptr ptr) +4 stdcall XInputGetBatteryInformation(long long ptr) +5 stdcall XInputGetCapabilities(long long ptr) +6 stdcall XInputGetKeystroke(long long ptr) +7 stdcall XInputGetState(long ptr) +8 stdcall XInputSetState(long ptr)

1 0

Nikolay Sivov : comctl32/pager: Use CRT allocation functions.
by Alexandre Julliard 22 Nov '22

22 Nov '22

Module: wine Branch: master Commit: a79b761cdd14c2af69e03df9a5db9e7ac8db5047 URL: https://gitlab.winehq.org/wine/wine/-/commit/a79b761cdd14c2af69e03df9a5db9e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 22 12:15:04 2022 +0300 comctl32/pager: Use CRT allocation functions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/comctl32/pager.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/comctl32/pager.c b/dlls/comctl32/pager.c index 7d807c8b2c4..42516a34607 100644 --- a/dlls/comctl32/pager.c +++ b/dlls/comctl32/pager.c @@ -53,6 +53,7 @@ */ #include <stdarg.h> +#include <stdlib.h> #include <string.h> #include "windef.h" #include "winbase.h" @@ -62,7 +63,6 @@ #include "commctrl.h" #include "comctl32.h" #include "wine/debug.h" -#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(pager); @@ -576,7 +576,7 @@ PAGER_Create (HWND hwnd, const CREATESTRUCTW *lpcs) INT ret; /* allocate memory for info structure */ - infoPtr = heap_alloc_zero (sizeof(*infoPtr)); + infoPtr = calloc(1, sizeof(*infoPtr)); if (!infoPtr) return -1; SetWindowLongPtrW (hwnd, 0, (DWORD_PTR)infoPtr); @@ -611,8 +611,8 @@ static LRESULT PAGER_Destroy (PAGER_INFO *infoPtr) { SetWindowLongPtrW (infoPtr->hwndSelf, 0, 0); - heap_free (infoPtr->pwszBuffer); - heap_free (infoPtr); + free (infoPtr->pwszBuffer); + free (infoPtr); return 0; } @@ -1099,9 +1099,9 @@ static UINT PAGER_GetAnsiNtfCode(UINT code) static BOOL PAGER_AdjustBuffer(PAGER_INFO *infoPtr, INT size) { if (!infoPtr->pwszBuffer) - infoPtr->pwszBuffer = heap_alloc(size); + infoPtr->pwszBuffer = malloc(size); else if (infoPtr->nBufferSize < size) - infoPtr->pwszBuffer = heap_realloc(infoPtr->pwszBuffer, size); + infoPtr->pwszBuffer = realloc(infoPtr->pwszBuffer, size); if (!infoPtr->pwszBuffer) return FALSE; if (infoPtr->nBufferSize < size) infoPtr->nBufferSize = size; @@ -1153,7 +1153,7 @@ static LRESULT PAGER_SendConvertedNotify(PAGER_INFO *infoPtr, NMHDR *hdr, UINT * if ((*text && flags & (CONVERT_SEND | ZERO_SEND)) || (!*text && flags & SEND_EMPTY_IF_NULL)) { bufferSize = textMax ? *textMax : lstrlenW(*text) + 1; - sendBuffer = heap_alloc_zero(bufferSize); + sendBuffer = calloc(1, bufferSize); if (!sendBuffer) goto done; if (!(flags & ZERO_SEND)) WideCharToMultiByte(CP_ACP, 0, *text, -1, sendBuffer, bufferSize, NULL, FALSE); *text = (WCHAR *)sendBuffer; @@ -1167,18 +1167,18 @@ static LRESULT PAGER_SendConvertedNotify(PAGER_INFO *infoPtr, NMHDR *hdr, UINT * if (*text == oldText) { bufferSize = lstrlenA((CHAR *)*text) + 1; - receiveBuffer = heap_alloc(bufferSize); + receiveBuffer = malloc(bufferSize); if (!receiveBuffer) goto done; memcpy(receiveBuffer, *text, bufferSize); MultiByteToWideChar(CP_ACP, 0, receiveBuffer, bufferSize, oldText, oldTextMax); - heap_free(receiveBuffer); + free(receiveBuffer); } else MultiByteToWideChar(CP_ACP, 0, (CHAR *)*text, -1, oldText, oldTextMax); } done: - heap_free(sendBuffer); + free(sendBuffer); *text = oldText; return ret; }

1 0