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

Jacek Caban : winex11: Directly use win32u for user functions in window.c.
by Alexandre Julliard 13 Apr '22

13 Apr '22

Module: wine Branch: master Commit: 55f4cf8c851cc156c5b77f9e333e4feed61387b6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=55f4cf8c851cc156c5b77f9e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 13 15:08:59 2022 +0200 winex11: Directly use win32u for user functions in window.c. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/window.c | 205 ++++++++++++++++++++++++---------------------- dlls/winex11.drv/x11drv.h | 19 +++++ 2 files changed, 124 insertions(+), 100 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=55f4cf8c851cc156c5b7…

1 0

Jacek Caban : user32: Get rid of __wine_set_pixel_format.
by Alexandre Julliard 13 Apr '22

13 Apr '22

Module: wine Branch: master Commit: 0953de5cab03d4582ae4e5c900cec7bf7223a46d URL: https://source.winehq.org/git/wine.git/?a=commit;h=0953de5cab03d4582ae4e5c9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 13 15:09:19 2022 +0200 user32: Get rid of __wine_set_pixel_format. Use NtUserSetWindowPixelFormat in drivers instead. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opengl32/make_opengl | 3 +-- dlls/user32/user32.spec | 8 -------- dlls/user32/win.c | 9 --------- dlls/wineandroid.drv/opengl.c | 2 +- dlls/winemac.drv/opengl.c | 2 +- dlls/winex11.drv/opengl.c | 4 ++-- include/wine/wgl_driver.h | 1 - 7 files changed, 5 insertions(+), 24 deletions(-) diff --git a/dlls/opengl32/make_opengl b/dlls/opengl32/make_opengl index ebfd3c9161e..09531731f8d 100755 --- a/dlls/opengl32/make_opengl +++ b/dlls/opengl32/make_opengl @@ -645,8 +645,7 @@ foreach (sort keys %norm_functions) } print HEADER "\n\n"; -print HEADER "extern struct opengl_funcs * CDECL __wine_get_wgl_driver( HDC hdc, UINT version );\n"; -print HEADER "extern BOOL CDECL __wine_set_pixel_format( HWND hwnd, int format );\n\n"; +print HEADER "extern struct opengl_funcs * CDECL __wine_get_wgl_driver( HDC hdc, UINT version );\n\n"; print HEADER "#endif /* __WINE_WGL_DRIVER_H */\n"; close HEADER; diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index 4bd42fea425..af63ae007a1 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -831,11 +831,3 @@ @ varargs wsprintfW(wstr wstr) @ stdcall wvsprintfA(ptr str ptr) @ stdcall wvsprintfW(ptr wstr ptr) - -################################################################ -# Wine internal extensions -# -# All functions must be prefixed with '__wine_' (for internal functions) -# or 'wine_' (for user-visible functions) to avoid namespace conflicts. -# -@ cdecl __wine_set_pixel_format(long long) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index de0dc2f2fb7..f5c22bfbadc 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -1698,15 +1698,6 @@ BOOL WINAPI SwitchDesktop( HDESK hDesktop) } -/*********************************************************************** - * __wine_set_pixel_format - */ -BOOL CDECL __wine_set_pixel_format( HWND hwnd, int format ) -{ - return NtUserSetWindowPixelFormat( hwnd, format ); -} - - /***************************************************************************** * UpdateLayeredWindowIndirect (USER32.@) */ diff --git a/dlls/wineandroid.drv/opengl.c b/dlls/wineandroid.drv/opengl.c index 3d18f99fb1a..9f20e51b8da 100644 --- a/dlls/wineandroid.drv/opengl.c +++ b/dlls/wineandroid.drv/opengl.c @@ -245,7 +245,7 @@ static BOOL set_pixel_format( HDC hdc, int format, BOOL allow_change ) release_gl_drawable( gl ); if (prev && prev != format && !allow_change) return FALSE; - if (__wine_set_pixel_format( hwnd, format )) return TRUE; + if (NtUserSetWindowPixelFormat( hwnd, format )) return TRUE; destroy_gl_drawable( hwnd ); return FALSE; } diff --git a/dlls/winemac.drv/opengl.c b/dlls/winemac.drv/opengl.c index ca7c45aa966..d61d0a6ea66 100644 --- a/dlls/winemac.drv/opengl.c +++ b/dlls/winemac.drv/opengl.c @@ -1600,7 +1600,7 @@ static BOOL set_pixel_format(HDC hdc, int fmt, BOOL allow_reset) done: release_win_data(data); - if (ret && gl_surface_mode == GL_SURFACE_BEHIND) __wine_set_pixel_format(hwnd, fmt); + if (ret && gl_surface_mode == GL_SURFACE_BEHIND) NtUserSetWindowPixelFormat(hwnd, fmt); return ret; } diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 422f52a521a..ba38549e0e4 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -1398,7 +1398,7 @@ static BOOL set_win_format( HWND hwnd, const struct wgl_pixel_format *format, BO XFlush( gdi_display ); release_gl_drawable( gl ); - __wine_set_pixel_format( hwnd, pixel_format_index( format )); + NtUserSetWindowPixelFormat( hwnd, pixel_format_index( format )); return TRUE; } @@ -1508,7 +1508,7 @@ void set_gl_drawable_parent( HWND hwnd, HWND parent ) else { destroy_gl_drawable( hwnd ); - __wine_set_pixel_format( hwnd, 0 ); + NtUserSetWindowPixelFormat( hwnd, 0 ); } release_gl_drawable( old ); } diff --git a/include/wine/wgl_driver.h b/include/wine/wgl_driver.h index f077a3d0f09..36b1f384ddf 100644 --- a/include/wine/wgl_driver.h +++ b/include/wine/wgl_driver.h @@ -3406,6 +3406,5 @@ struct opengl_funcs USE_GL_FUNC(glViewport) extern struct opengl_funcs * CDECL __wine_get_wgl_driver( HDC hdc, UINT version ); -extern BOOL CDECL __wine_set_pixel_format( HWND hwnd, int format ); #endif /* __WINE_WGL_DRIVER_H */

1 0

Zebediah Figura : kernelbase: Set user_lcid to the user locale, not the system locale.
by Alexandre Julliard 13 Apr '22

13 Apr '22

Module: wine Branch: master Commit: 351fa352f679c4d07581a6f9748c283845f8100f URL: https://source.winehq.org/git/wine.git/?a=commit;h=351fa352f679c4d07581a6f9… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Apr 12 16:11:01 2022 -0500 kernelbase: Set user_lcid to the user locale, not the system locale. Fixes: fffbe3fcaef9c2b0e3814305b212a95188c1b0c2 Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/locale.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index 358aa8c123c..95d7d77ecd7 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -1767,7 +1767,7 @@ void init_locale( HMODULE module ) load_locale_nls(); NtQueryDefaultLocale( FALSE, &system_lcid ); - NtQueryDefaultLocale( FALSE, &user_lcid ); + NtQueryDefaultLocale( TRUE, &user_lcid ); if (!(system_locale = NlsValidateLocale( &system_lcid, 0 ))) { if (GetEnvironmentVariableW( L"WINELOCALE", bufferW, ARRAY_SIZE(bufferW) ))

1 0

Eric Pouech : d3dx10: Fix long type warnings.
by Alexandre Julliard 13 Apr '22

13 Apr '22

Module: wine Branch: master Commit: be0be41fca9c8fe1bda3d12d8c447fd544d5b9dc URL: https://source.winehq.org/git/wine.git/?a=commit;h=be0be41fca9c8fe1bda3d12d… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Apr 13 08:48:58 2022 +0200 d3dx10: Fix long type warnings. Missing from 74adbac296a786144e15833ff4918765d5bb32aa. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx10_43/async.c | 6 +++--- dlls/d3dx10_43/d3dx10_43_main.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/d3dx10_43/async.c b/dlls/d3dx10_43/async.c index 062a04d739c..db46a9353f6 100644 --- a/dlls/d3dx10_43/async.c +++ b/dlls/d3dx10_43/async.c @@ -220,7 +220,7 @@ HRESULT WINAPI D3DX10CompileFromMemory(const char *data, SIZE_T data_size, const const char *target, UINT sflags, UINT eflags, ID3DX10ThreadPump *pump, ID3D10Blob **shader, ID3D10Blob **error_messages, HRESULT *hresult) { - TRACE("data %s, data_size %lu, filename %s, defines %p, include %p, entry_point %s, target %s, " + TRACE("data %s, data_size %Iu, filename %s, defines %p, include %p, entry_point %s, target %s, " "sflags %#x, eflags %#x, pump %p, shader %p, error_messages %p, hresult %p.\n", debugstr_an(data, data_size), data_size, debugstr_a(filename), defines, include, debugstr_a(entry_point), debugstr_a(target), sflags, eflags, pump, shader, @@ -261,7 +261,7 @@ HRESULT WINAPI D3DX10CreateAsyncMemoryLoader(const void *data, SIZE_T data_size, { struct asyncdataloader *object; - TRACE("data %p, data_size %lu, loader %p.\n", data, data_size, loader); + TRACE("data %p, data_size %Iu, loader %p.\n", data, data_size, loader); if (!data || !loader) return E_FAIL; @@ -398,7 +398,7 @@ HRESULT WINAPI D3DX10PreprocessShaderFromMemory(const char *data, SIZE_T data_si const D3D10_SHADER_MACRO *defines, ID3DInclude *include, ID3DX10ThreadPump *pump, ID3D10Blob **shader_text, ID3D10Blob **errors, HRESULT *hresult) { - FIXME("data %s, data_size %lu, filename %s, defines %p, include %p, pump %p, shader_text %p, " + FIXME("data %s, data_size %Iu, filename %s, defines %p, include %p, pump %p, shader_text %p, " "errors %p, hresult %p stub!\n", debugstr_an(data, data_size), data_size, debugstr_a(filename), defines, include, pump, shader_text, errors, hresult); diff --git a/dlls/d3dx10_43/d3dx10_43_main.c b/dlls/d3dx10_43/d3dx10_43_main.c index 42f29ad6239..ec7407508d3 100644 --- a/dlls/d3dx10_43/d3dx10_43_main.c +++ b/dlls/d3dx10_43/d3dx10_43_main.c @@ -53,7 +53,7 @@ HRESULT WINAPI D3DX10CreateEffectPoolFromMemory(const void *data, SIZE_T datasiz UINT fxflags, ID3D10Device *device, ID3DX10ThreadPump *pump, ID3D10EffectPool **effectpool, ID3D10Blob **errors, HRESULT *hresult) { - FIXME("data %p, datasize %lu, filename %s, defines %p, include %p, profile %s, hlslflags %#x, fxflags %#x, " + FIXME("data %p, datasize %Iu, filename %s, defines %p, include %p, profile %s, hlslflags %#x, fxflags %#x, " "device %p, pump %p, effectpool %p, errors %p, hresult %p.\n", data, datasize, debugstr_a(filename), defines, include, debugstr_a(profile), hlslflags, fxflags, device, pump, effectpool, errors, hresult);

1 0

Rafał Harabień : user32: Use SWP_NOACTIVATE flag when resizing etched static control.
by Alexandre Julliard 13 Apr '22

13 Apr '22

Module: wine Branch: master Commit: 9be3f2cf110e9afe73369182587955c02c462024 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9be3f2cf110e9afe73369182… Author: Rafał Harabień <rafalh92(a)outlook.com> Date: Sat Apr 9 13:14:41 2022 +0200 user32: Use SWP_NOACTIVATE flag when resizing etched static control. Signed-off-by: Rafał Harabień <rafalh92(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/static.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/static.c b/dlls/user32/static.c index e81e553f7d8..3c9b67b20ac 100644 --- a/dlls/user32/static.c +++ b/dlls/user32/static.c @@ -426,7 +426,7 @@ LRESULT StaticWndProc_common( HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam rc.right = rc.left; AdjustWindowRectEx(&rc, full_style, FALSE, GetWindowLongW(hwnd, GWL_EXSTYLE)); NtUserSetWindowPos( hwnd, NULL, 0, 0, rc.right - rc.left, rc.bottom - rc.top, - SWP_NOMOVE | SWP_NOZORDER ); + SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOZORDER ); } switch (style) {

1 0

Rafał Harabień : user32/tests: Remove duplicated SS_*RECT static control tests.
by Alexandre Julliard 13 Apr '22

13 Apr '22

Module: wine Branch: master Commit: 66a639e96de2f4e12ddfe948bf5f6dd6fd5f7b61 URL: https://source.winehq.org/git/wine.git/?a=commit;h=66a639e96de2f4e12ddfe948… Author: Rafał Harabień <rafalh92(a)outlook.com> Date: Sat Apr 9 13:14:40 2022 +0200 user32/tests: Remove duplicated SS_*RECT static control tests. Signed-off-by: Rafał Harabień <rafalh92(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/static.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/user32/tests/static.c b/dlls/user32/tests/static.c index a5af3315865..09e399990cd 100644 --- a/dlls/user32/tests/static.c +++ b/dlls/user32/tests/static.c @@ -344,8 +344,6 @@ START_TEST(static) test_updates(SS_OWNERDRAW); test_updates(SS_BITMAP); test_updates(SS_BITMAP | SS_CENTERIMAGE); - test_updates(SS_BLACKRECT); - test_updates(SS_WHITERECT); test_updates(SS_ETCHEDHORZ); test_updates(SS_ETCHEDVERT); test_updates(SS_ETCHEDFRAME);

1 0

Paul Gofman : ntdll: Increase kernel stack size.
by Alexandre Julliard 13 Apr '22

13 Apr '22

Module: wine Branch: master Commit: dfd5f109fb4ebad859bf3ce3960b3b2b2ad1341d URL: https://source.winehq.org/git/wine.git/?a=commit;h=dfd5f109fb4ebad859bf3ce3… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Apr 11 13:26:31 2022 +0300 ntdll: Increase kernel stack size. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/unix_private.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index 86e87e6e29a..795fc148479 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -84,7 +84,7 @@ static const SIZE_T page_size = 0x1000; static const SIZE_T teb_size = 0x3800; /* TEB64 + TEB32 + debug info */ static const SIZE_T signal_stack_mask = 0xffff; static const SIZE_T signal_stack_size = 0x10000 - 0x3800; -static const SIZE_T kernel_stack_size = 0x20000; +static const SIZE_T kernel_stack_size = 0x100000; static const SIZE_T min_kernel_stack = 0x2000; static const LONG teb_offset = 0x2000;

1 0

Paul Gofman : ntdll: Remove unused PTHREAD_STACK_MIN definition.
by Alexandre Julliard 13 Apr '22

13 Apr '22

Module: wine Branch: master Commit: 8c931c7129b2fb64de119d6ab5df413ab339fd9a URL: https://source.winehq.org/git/wine.git/?a=commit;h=8c931c7129b2fb64de119d6a… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Apr 11 13:26:32 2022 +0300 ntdll: Remove unused PTHREAD_STACK_MIN definition. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/thread.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/dlls/ntdll/unix/thread.c b/dlls/ntdll/unix/thread.c index b8546edde87..503230e4634 100644 --- a/dlls/ntdll/unix/thread.c +++ b/dlls/ntdll/unix/thread.c @@ -71,10 +71,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(thread); WINE_DECLARE_DEBUG_CHANNEL(seh); -#ifndef PTHREAD_STACK_MIN -#define PTHREAD_STACK_MIN 16384 -#endif - static int nb_threads = 1; static inline int get_unix_exit_code( NTSTATUS status )

1 0

Rémi Bernon : kernel32/tests: Add invalid pointer heap validation tests.
by Alexandre Julliard 13 Apr '22

13 Apr '22

Module: wine Branch: master Commit: 93d5aba89c26201c5c01626ea741c94d464863e4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=93d5aba89c26201c5c01626e… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Apr 8 16:06:47 2022 +0200 kernel32/tests: Add invalid pointer heap validation tests. Adding commented-out crashing tests to make it obvious that they were tested and that HeapFree or HeapReAlloc don't validate pointers. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/heap.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/dlls/kernel32/tests/heap.c b/dlls/kernel32/tests/heap.c index 6f85ecc6425..190e83cc208 100644 --- a/dlls/kernel32/tests/heap.c +++ b/dlls/kernel32/tests/heap.c @@ -78,6 +78,7 @@ struct heap static void test_HeapCreate(void) { + static const BYTE buffer[512] = {0}; SIZE_T alloc_size = 0x8000 * sizeof(void *), size, i; BYTE *ptr, *ptr1, *ptrs[128]; HANDLE heap, heap1; @@ -107,12 +108,49 @@ static void test_HeapCreate(void) ret = HeapFree( heap, 0, NULL ); ok( ret, "HeapFree failed, error %lu\n", GetLastError() ); +#if 0 /* crashes */ + SetLastError( 0xdeadbeef ); + ret = HeapFree( heap, 0, (void *)0xdeadbe00 ); + ok( !ret, "HeapFree succeeded\n" ); + ok( GetLastError() == ERROR_NOACCESS, "got error %lu\n", GetLastError() ); + SetLastError( 0xdeadbeef ); + ptr = (BYTE *)((UINT_PTR)buffer & ~63) + 64; + ret = HeapFree( heap, 0, ptr ); + ok( !ret, "HeapFree succeeded\n" ); + ok( GetLastError() == 0xdeadbeef, "got error %lu\n", GetLastError() ); +#endif SetLastError( 0xdeadbeef ); ptr = HeapReAlloc( heap, 0, NULL, 1 ); ok( !ptr, "HeapReAlloc succeeded\n" ); todo_wine ok( GetLastError() == NO_ERROR, "got error %lu\n", GetLastError() ); +#if 0 /* crashes */ + SetLastError( 0xdeadbeef ); + ptr1 = HeapReAlloc( heap, 0, (void *)0xdeadbe00, 1 ); + ok( !ptr1, "HeapReAlloc succeeded\n" ); + ok( GetLastError() == ERROR_NOACCESS, "got error %lu\n", GetLastError() ); + SetLastError( 0xdeadbeef ); + ptr = (BYTE *)((UINT_PTR)buffer & ~63) + 64; + ptr1 = HeapReAlloc( heap, 0, ptr, 1 ); + ok( !ptr1, "HeapReAlloc succeeded\n" ); + ok( GetLastError() == 0xdeadbeef, "got error %lu\n", GetLastError() ); +#endif + + SetLastError( 0xdeadbeef ); + ret = HeapValidate( heap, 0, NULL ); + ok( ret, "HeapValidate failed, error %lu\n", GetLastError() ); + ok( GetLastError() == 0xdeadbeef, "got error %lu\n", GetLastError() ); + SetLastError( 0xdeadbeef ); + ret = HeapValidate( heap, 0, (void *)0xdeadbe00 ); + ok( !ret, "HeapValidate succeeded\n" ); + todo_wine + ok( GetLastError() == ERROR_NOACCESS, "got error %lu\n", GetLastError() ); + SetLastError( 0xdeadbeef ); + ptr = (BYTE *)((UINT_PTR)buffer & ~63) + 64; + ret = HeapValidate( heap, 0, ptr ); + ok( !ret, "HeapValidate succeeded\n" ); + ok( GetLastError() == 0xdeadbeef, "got error %lu\n", GetLastError() ); ptr = HeapAlloc( heap, 0, 0 ); ok( !!ptr, "HeapAlloc failed, error %lu\n", GetLastError() ); @@ -122,8 +160,14 @@ static void test_HeapCreate(void) ok( !ptr1, "HeapReAlloc succeeded\n" ); ptr1 = pHeapReAlloc( heap, 0, ptr, ~(SIZE_T)0 ); ok( !ptr1, "HeapReAlloc succeeded\n" ); + ret = HeapValidate( heap, 0, ptr ); + ok( ret, "HeapValidate failed, error %lu\n", GetLastError() ); ret = HeapFree( heap, 0, ptr ); ok( ret, "HeapFree failed, error %lu\n", GetLastError() ); + SetLastError( 0xdeadbeef ); + ret = HeapValidate( heap, 0, ptr ); + ok( !ret, "HeapValidate succeeded\n" ); + ok( GetLastError() == 0xdeadbeef, "got error %lu\n", GetLastError() ); ptr = pHeapAlloc( heap, 0, ~(SIZE_T)0 ); ok( !ptr, "HeapAlloc succeeded\n" ); @@ -247,6 +291,7 @@ static void test_HeapCreate(void) ptr1 = HeapReAlloc( heap, HEAP_REALLOC_IN_PLACE_ONLY, ptr, 2 * alloc_size ); todo_wine ok( ptr1 != ptr, "HeapReAlloc HEAP_REALLOC_IN_PLACE_ONLY succeeded\n" ); + todo_wine ok( GetLastError() == ERROR_NOT_ENOUGH_MEMORY, "got error %lu\n", GetLastError() ); ret = HeapFree( heap, 0, ptr1 );

1 0

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

13 Apr '22

Module: wine Branch: master Commit: 13a4da538ce9132394d5a6fd16a8fa75febd0b8f URL: https://source.winehq.org/git/wine.git/?a=commit;h=13a4da538ce9132394d5a6fd… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Apr 8 16:06:48 2022 +0200 kernel32/tests: Add some GetProcessHeaps 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 | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/heap.c b/dlls/kernel32/tests/heap.c index 190e83cc208..80e5d588047 100644 --- a/dlls/kernel32/tests/heap.c +++ b/dlls/kernel32/tests/heap.c @@ -80,23 +80,40 @@ static void test_HeapCreate(void) { static const BYTE buffer[512] = {0}; SIZE_T alloc_size = 0x8000 * sizeof(void *), size, i; + HANDLE heap, heap1, heaps[8]; BYTE *ptr, *ptr1, *ptrs[128]; - HANDLE heap, heap1; + DWORD heap_count, count; UINT_PTR align; BOOL ret; + heap_count = GetProcessHeaps( 0, NULL ); + ok( heap_count <= 6, "GetProcessHeaps returned %lu\n", heap_count ); + /* check heap alignment */ heap = HeapCreate( 0, 0, 0 ); ok( !!heap, "HeapCreate failed, error %lu\n", GetLastError() ); ok( !((ULONG_PTR)heap & 0xffff), "wrong heap alignment\n" ); + count = GetProcessHeaps( 0, NULL ); + ok( count == heap_count + 1, "GetProcessHeaps returned %lu\n", count ); heap1 = HeapCreate( 0, 0, 0 ); ok( !!heap, "HeapCreate failed, error %lu\n", GetLastError() ); ok( !((ULONG_PTR)heap1 & 0xffff), "wrong heap alignment\n" ); + count = GetProcessHeaps( 0, NULL ); + ok( count == heap_count + 2, "GetProcessHeaps returned %lu\n", count ); + count = GetProcessHeaps( ARRAY_SIZE(heaps), heaps ); + ok( count == heap_count + 2, "GetProcessHeaps returned %lu\n", count ); + ok( heaps[0] == GetProcessHeap(), "got wrong heap\n" ); + todo_wine + ok( heaps[heap_count + 0] == heap, "got wrong heap\n" ); + todo_wine + ok( heaps[heap_count + 1] == heap1, "got wrong heap\n" ); ret = HeapDestroy( heap1 ); ok( ret, "HeapDestroy failed, error %lu\n", GetLastError() ); ret = HeapDestroy( heap ); ok( ret, "HeapDestroy failed, error %lu\n", GetLastError() ); + count = GetProcessHeaps( 0, NULL ); + ok( count == heap_count, "GetProcessHeaps returned %lu\n", count ); /* growable heap */

1 0