February 2022 - Wine-Commits

Matteo Bruni : d3dx9/tests: Fix initialization of texture levels > 0 in test_D3DXSHProjectCubeMap().
by Alexandre Julliard Feb. 18, 2022

Feb. 18, 2022

Module: wine Branch: master Commit: dbfd33e5015d65a00ea933e31724ca952b5debc3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dbfd33e5015d65a00ea933e3… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Feb 18 11:14:25 2022 +0100 d3dx9/tests: Fix initialization of texture levels > 0 in test_D3DXSHProjectCubeMap(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52561 Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/math.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index 62f4eaec124..2ed9131d788 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -4520,7 +4520,7 @@ static void test_D3DXSHProjectCubeMap(void) { hr = IDirect3DCubeTexture9_LockRect(texture, face, level, &map_desc, NULL, 0); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - memset(map_desc.pBits, 0xcc, 4 * map_desc.Pitch); + memset(map_desc.pBits, 0xcc, (8 >> level) * map_desc.Pitch); hr = IDirect3DCubeTexture9_UnlockRect(texture, face, level); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); }

1 0

Rémi Bernon : dinput: Remove unnecessary critical section entry.
by Alexandre Julliard Feb. 18, 2022

Feb. 18, 2022

Module: wine Branch: master Commit: d5ff6917b76e1584d3a317c6a38687e99340dc35 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d5ff6917b76e1584d3a317c6… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Feb 18 10:31:15 2022 +0100 dinput: Remove unnecessary critical section entry. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_hid.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index 13c168bca89..ee67c904fa5 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -1279,7 +1279,6 @@ static HRESULT hid_joystick_read( IDirectInputDevice8W *iface ) &index, impl->preparsed, report_buf, report_len ); if (status != HIDP_STATUS_SUCCESS) WARN( "HidP_GetUsageValue EFFECT_BLOCK_INDEX returned %#lx\n", status ); - EnterCriticalSection( &impl->base.crit ); effect_state = 0; device_state = impl->base.force_feedback_state & DIGFFS_EMPTY; while (count--) @@ -1308,7 +1307,6 @@ static HRESULT hid_joystick_read( IDirectInputDevice8W *iface ) LIST_FOR_EACH_ENTRY( effect, &impl->effect_list, struct hid_joystick_effect, entry ) if (effect->index == index) effect->status = effect_state; impl->base.force_feedback_state = device_state; - LeaveCriticalSection( &impl->base.crit ); } memset( &impl->read_ovl, 0, sizeof(impl->read_ovl) );

1 0

Francois Gouget : dbghelp: Fix the spelling and tweak the wording of a comment.
by Alexandre Julliard Feb. 18, 2022

Feb. 18, 2022

Module: wine Branch: master Commit: 9be9c32781f8c548c0d24e160390aa77da8b303f URL: https://source.winehq.org/git/wine.git/?a=commit;h=9be9c32781f8c548c0d24e16… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Feb 18 15:59:32 2022 +0100 dbghelp: Fix the spelling and tweak the wording of a comment. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/symbol.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index 49172701405..64f376b42f0 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -66,10 +66,11 @@ int __cdecl symt_cmp_addr(const void* p1, const void* p2) /* dbghelp exposes the internal symbols/types with DWORD indexes. * - custom symbols are always stored with index starting at BASE_CUSTOM_SYMT - * - for all the others (non custom) symbols: - * + on 32bit machine, index is set to the actual adress of symt - * + on 64bit machine, we have a dedicated array to store symt exposed to caller - * index is the index in this array of the symbol + * - for all the other (non custom) symbols: + * + on 32-bit machines, index is set to the actual address of symt + * + on 64-bit machines, the symt address is stored in a dedicated array + * which is exposed to the caller and index is the index of the symbol in + * this array */ DWORD symt_ptr2index(struct module* module, const struct symt* sym) {

1 0

Matteo Bruni : d3dx9: Handle D3DXCONSTTABLE_LARGEADDRESSAWARE flag.
by Alexandre Julliard Feb. 18, 2022

Feb. 18, 2022

Module: wine Branch: master Commit: 67f6073b9e299303a63fc4a7ce7640a9b9c8d693 URL: https://source.winehq.org/git/wine.git/?a=commit;h=67f6073b9e299303a63fc4a7… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Feb 18 11:14:29 2022 +0100 d3dx9: Handle D3DXCONSTTABLE_LARGEADDRESSAWARE flag. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/shader.c | 16 ++++++++++++---- dlls/d3dx9_36/tests/shader.c | 28 ++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+), 4 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index d5b58222ca2..2241455898e 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -681,11 +681,13 @@ HRESULT WINAPI D3DXPreprocessShaderFromResourceW(HMODULE module, const WCHAR *re } -struct ID3DXConstantTableImpl { +struct ID3DXConstantTableImpl +{ ID3DXConstantTable ID3DXConstantTable_iface; LONG ref; char *ctab; DWORD size; + DWORD flags; D3DXCONSTANTTABLE_DESC desc; struct ctab_constant *constants; }; @@ -860,6 +862,9 @@ static inline struct ctab_constant *get_valid_constant(struct ID3DXConstantTable if (c) return c; } + if (table->flags & D3DXCONSTTABLE_LARGEADDRESSAWARE) + return NULL; + return get_constant_by_name(table, NULL, handle); } @@ -1959,9 +1964,10 @@ HRESULT WINAPI D3DXGetShaderConstantTableEx(const DWORD *byte_code, DWORD flags, const D3DXSHADER_CONSTANTINFO *constant_info; DWORD i; - TRACE("byte_code %p, flags %x, constant_table %p\n", byte_code, flags, constant_table); + TRACE("byte_code %p, flags %#x, constant_table %p.\n", byte_code, flags, constant_table); - if (constant_table) *constant_table = NULL; + if (constant_table) + *constant_table = NULL; if (!byte_code || !constant_table) { @@ -1975,7 +1981,8 @@ HRESULT WINAPI D3DXGetShaderConstantTableEx(const DWORD *byte_code, DWORD flags, return D3D_OK; } - if (flags) FIXME("Flags (%#x) are not handled, yet!\n", flags); + if (flags & ~D3DXCONSTTABLE_LARGEADDRESSAWARE) + FIXME("Flags %#x not handled.\n", flags); hr = D3DXFindShaderComment(byte_code, MAKEFOURCC('C','T','A','B'), &data, &size); if (hr != D3D_OK) @@ -2014,6 +2021,7 @@ HRESULT WINAPI D3DXGetShaderConstantTableEx(const DWORD *byte_code, DWORD flags, object->size = size; memcpy(object->ctab, data, object->size); + object->flags = flags; object->desc.Creator = ctab_header->Creator ? object->ctab + ctab_header->Creator : NULL; object->desc.Version = ctab_header->Version; object->desc.Constants = ctab_header->Constants; diff --git a/dlls/d3dx9_36/tests/shader.c b/dlls/d3dx9_36/tests/shader.c index a698afcb53b..fe3dfde9001 100644 --- a/dlls/d3dx9_36/tests/shader.c +++ b/dlls/d3dx9_36/tests/shader.c @@ -556,6 +556,34 @@ static void test_get_shader_constant_table_ex(void) ID3DXConstantTable_Release(constant_table); + hr = D3DXGetShaderConstantTableEx(shader_with_ctab_constants, D3DXCONSTTABLE_LARGEADDRESSAWARE, &constant_table); + ok(hr == D3D_OK, "Unexpected hr %#x.\n", hr); + ok(!!constant_table, "Unexpected constant table %p.\n", constant_table); + + hr = ID3DXConstantTable_GetDesc(constant_table, &desc); + ok(hr == D3D_OK, "Unexpected hr %#x.\n", hr); + ok(!strcmp(desc.Creator, "Wine project"), "Unexpected Creator %s.\n", debugstr_a(desc.Creator)); + ok(desc.Version == D3DVS_VERSION(3, 0), "Unexpected Version %#x.\n", desc.Version); + ok(desc.Constants == 3, "Unexpected Constants %u.\n", desc.Constants); + + constant = ID3DXConstantTable_GetConstant(constant_table, NULL, 0); + ok(!!constant, "No constant found.\n"); + hr = ID3DXConstantTable_GetConstantDesc(constant_table, constant, &constant_desc, &nb); + ok(hr == D3D_OK, "Unexpected hr %#x.\n", hr); + ok(!strcmp(constant_desc.Name, "Constant1"), "Unexpected Name %s.\n", debugstr_a(constant_desc.Name)); + ok(constant_desc.Class == D3DXPC_VECTOR, "Unexpected Class %u.\n", constant_desc.Class); + ok(constant_desc.Type == D3DXPT_FLOAT, "Unexpected Type %u.\n", constant_desc.Type); + ok(constant_desc.Rows == 1, "Unexpected Rows %u.\n", constant_desc.Rows); + ok(constant_desc.Columns == 4, "Unexpected Columns %u.\n", constant_desc.Columns); + + if (0) + { + /* Native d3dx crashes with this. */ + hr = ID3DXConstantTable_GetConstantDesc(constant_table, "Constant3", &constant_desc, &nb); + } + + ID3DXConstantTable_Release(constant_table); + hr = D3DXGetShaderConstantTableEx(fx_shader_with_ctab, 0, &constant_table); ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); ok(!constant_table, "D3DXGetShaderConstantTableEx() returned a non-NULL constant table.\n");

1 0

Matteo Bruni : d3dx9: Build with nameless unions.
by Alexandre Julliard Feb. 18, 2022

Feb. 18, 2022

Module: wine Branch: master Commit: 514bac00cc1b36f593c5099dfa6bd2fdf57dd571 URL: https://source.winehq.org/git/wine.git/?a=commit;h=514bac00cc1b36f593c5099d… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Feb 18 11:14:28 2022 +0100 d3dx9: Build with nameless unions. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/d3dx9_private.h | 1 - dlls/d3dx9_36/effect.c | 10 +- dlls/d3dx9_36/math.c | 772 +++++++++++++++++++++--------------------- dlls/d3dx9_36/mesh.c | 38 +-- 4 files changed, 412 insertions(+), 409 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=514bac00cc1b36f593c5…

1 0

Jacek Caban : winex11: Get virtual screen rect from win32u.
by Alexandre Julliard Feb. 18, 2022

Feb. 18, 2022

Module: wine Branch: master Commit: 586f377b46b28c9693870b81b3f2a1cbb25c62e2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=586f377b46b28c9693870b81… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Feb 18 13:37:12 2022 +0100 winex11: Get virtual screen rect from win32u. 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/win32u/sysparams.c | 3 +++ dlls/winex11.drv/display.c | 8 +------- include/ntuser.h | 1 + 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index 7af1e20f008..09a04892d2d 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -4534,6 +4534,9 @@ ULONG_PTR WINAPI NtUserCallOneParam( ULONG_PTR arg, ULONG code ) return HandleToUlong( get_sys_color_pen(arg) ); case NtUserGetSystemMetrics: return get_system_metrics( arg ); + case NtUserGetVirtualScreenRect: + *(RECT *)arg = get_virtual_screen_rect( 0 ); + return 1; case NtUserMessageBeep: return message_beep( arg ); /* temporary exports */ diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c index 04380ff660f..bff14d3370c 100644 --- a/dlls/winex11.drv/display.c +++ b/dlls/winex11.drv/display.c @@ -54,7 +54,6 @@ struct x11drv_display_device_handler desktop_handler; /* Cached screen information, protected by screen_section */ static HKEY video_key; -static RECT virtual_screen_rect; static RECT primary_monitor_rect; static FILETIME last_query_screen_time; static CRITICAL_SECTION screen_section; @@ -124,7 +123,6 @@ static BOOL update_screen_cache(void) } EnterCriticalSection(&screen_section); - virtual_screen_rect = virtual_rect; primary_monitor_rect = primary_rect; last_query_screen_time = filetime; LeaveCriticalSection(&screen_section); @@ -160,11 +158,7 @@ POINT root_to_virtual_screen(INT x, INT y) RECT get_virtual_screen_rect(void) { RECT virtual; - - update_screen_cache(); - EnterCriticalSection(&screen_section); - virtual = virtual_screen_rect; - LeaveCriticalSection(&screen_section); + NtUserCallOneParam( (UINT_PTR)&virtual, NtUserGetVirtualScreenRect ); return virtual; } diff --git a/include/ntuser.h b/include/ntuser.h index 51f1c624ba6..43c1880fc9b 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -79,6 +79,7 @@ enum NtUserGetSysColorBrush, NtUserGetSysColorPen, NtUserGetSystemMetrics, + NtUserGetVirtualScreenRect, NtUserMessageBeep, NtUserRealizePalette, /* temporary exports */

1 0

Francois Gouget : winebus.sys: Make hid_device_get_report_descriptor() static.
by Alexandre Julliard Feb. 18, 2022

Feb. 18, 2022

Module: wine Branch: master Commit: 26ff79c37dddbdc22a38eee51e4093e79b5b2793 URL: https://source.winehq.org/git/wine.git/?a=commit;h=26ff79c37dddbdc22a38eee5… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Feb 18 15:24:35 2022 +0100 winebus.sys: Make hid_device_get_report_descriptor() static. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/hid.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winebus.sys/hid.c b/dlls/winebus.sys/hid.c index 1b2681fdb94..64e4f2955ae 100644 --- a/dlls/winebus.sys/hid.c +++ b/dlls/winebus.sys/hid.c @@ -1037,7 +1037,7 @@ static void hid_device_stop(struct unix_device *iface) iface->hid_vtbl->stop(iface); } -NTSTATUS hid_device_get_report_descriptor(struct unix_device *iface, BYTE *buffer, UINT length, UINT *out_length) +static NTSTATUS hid_device_get_report_descriptor(struct unix_device *iface, BYTE *buffer, UINT length, UINT *out_length) { *out_length = iface->hid_report_descriptor.size; if (length < iface->hid_report_descriptor.size) return STATUS_BUFFER_TOO_SMALL;

1 0

Francois Gouget : winetest: Also trace the country and ANSI code page.
by Alexandre Julliard Feb. 18, 2022

Feb. 18, 2022

Module: wine Branch: master Commit: bf42dca35f05bce9996e91f59cc47b5a9e6996b2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bf42dca35f05bce9996e91f5… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Feb 18 15:19:55 2022 +0100 winetest: Also trace the country and ANSI code page. Tracing the ANSI code page is useful to identify tests run in Windows' UTF-8 mode. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winetest/main.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/programs/winetest/main.c b/programs/winetest/main.c index b5c3cc54487..eb86770afbf 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -477,6 +477,8 @@ static void print_language(void) xprintf (" UserDefaultUILanguage=%04x\n", pGetUserDefaultUILanguage()); if (pGetThreadUILanguage) xprintf (" ThreadUILanguage=%04x\n", pGetThreadUILanguage()); + xprintf (" Country=%d\n", GetUserGeoID(GEOCLASS_NATION)); + xprintf (" ACP=%d\n", GetACP()); } static inline BOOL is_dot_dir(const char* x)

1 0

Francois Gouget : ncrypt: Add trailing linefeeds to ERR() messages.
by Alexandre Julliard Feb. 18, 2022

Feb. 18, 2022

Module: wine Branch: master Commit: b2e4ce14c046bd805cd694e97fc866f484ee604e URL: https://source.winehq.org/git/wine.git/?a=commit;h=b2e4ce14c046bd805cd694e9… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Feb 18 15:19:37 2022 +0100 ncrypt: Add trailing linefeeds to ERR() messages. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ncrypt/main.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ncrypt/main.c b/dlls/ncrypt/main.c index 8e789573924..4f9a2f357bd 100644 --- a/dlls/ncrypt/main.c +++ b/dlls/ncrypt/main.c @@ -190,7 +190,7 @@ static SECURITY_STATUS set_object_property(struct object *object, const WCHAR *n { if (!(object->properties = malloc(sizeof(*property)))) { - ERR("Error allocating memory."); + ERR("Error allocating memory.\n"); return NTE_NO_MEMORY; } property = &object->properties[object->num_properties++]; @@ -200,7 +200,7 @@ static SECURITY_STATUS set_object_property(struct object *object, const WCHAR *n struct object_property *tmp; if (!(tmp = realloc(object->properties, sizeof(*property) * (object->num_properties + 1)))) { - ERR("Error allocating memory."); + ERR("Error allocating memory.\n"); return NTE_NO_MEMORY; } object->properties = tmp; @@ -210,7 +210,7 @@ static SECURITY_STATUS set_object_property(struct object *object, const WCHAR *n memset(property, 0, sizeof(*property)); if (!(property->key = malloc((lstrlenW(name) + 1) * sizeof(WCHAR)))) { - ERR("Error allocating memory."); + ERR("Error allocating memory.\n"); return NTE_NO_MEMORY; } @@ -218,7 +218,7 @@ static SECURITY_STATUS set_object_property(struct object *object, const WCHAR *n property->value_size = value_size; if (!(property->value = malloc(value_size))) { - ERR("Error allocating memory."); + ERR("Error allocating memory.\n"); free(property->key); property->key = NULL; return NTE_NO_MEMORY;

1 0

Jacek Caban : win32u/tests: Build without -DWINE_NO_LONG_TYPES.
by Alexandre Julliard Feb. 18, 2022

Feb. 18, 2022

Module: wine Branch: master Commit: 9b63ea13f313a93ce4a517a98b33c12bd7767202 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9b63ea13f313a93ce4a517a9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Feb 18 14:06:14 2022 +0100 win32u/tests: Build without -DWINE_NO_LONG_TYPES. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/win32u/tests/Makefile.in | 1 - dlls/win32u/tests/win32u.c | 52 +++++++++++++++++++++---------------------- 2 files changed, 26 insertions(+), 27 deletions(-) diff --git a/dlls/win32u/tests/Makefile.in b/dlls/win32u/tests/Makefile.in index a89a6dd491f..c0fa70e4e08 100644 --- a/dlls/win32u/tests/Makefile.in +++ b/dlls/win32u/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = win32u.dll IMPORTS = user32 win32u diff --git a/dlls/win32u/tests/win32u.c b/dlls/win32u/tests/win32u.c index 22ce38e2391..2348c21dd80 100644 --- a/dlls/win32u/tests/win32u.c +++ b/dlls/win32u/tests/win32u.c @@ -33,12 +33,12 @@ static void test_NtUserEnumDisplayDevices(void) SetLastError( 0xdeadbeef ); ret = NtUserEnumDisplayDevices( NULL, 0, &info, 0 ); ok( !ret && GetLastError() == 0xdeadbeef, - "NtUserEnumDisplayDevices returned %x %u\n", ret, GetLastError() ); + "NtUserEnumDisplayDevices returned %#lx %lu\n", ret, GetLastError() ); SetLastError( 0xdeadbeef ); ret = NtUserEnumDisplayDevices( NULL, 12345, &info, 0 ); ok( ret == STATUS_UNSUCCESSFUL && GetLastError() == 0xdeadbeef, - "NtUserEnumDisplayDevices returned %x %u\n", ret, + "NtUserEnumDisplayDevices returned %#lx %lu\n", ret, GetLastError() ); info.cb = 0; @@ -46,22 +46,22 @@ static void test_NtUserEnumDisplayDevices(void) SetLastError( 0xdeadbeef ); ret = NtUserEnumDisplayDevices( NULL, 0, &info, 0 ); ok( ret == STATUS_UNSUCCESSFUL && GetLastError() == 0xdeadbeef, - "NtUserEnumDisplayDevices returned %x %u\n", ret, GetLastError() ); + "NtUserEnumDisplayDevices returned %#lx %lu\n", ret, GetLastError() ); SetLastError( 0xdeadbeef ); ret = NtUserEnumDisplayDevices( NULL, 12345, &info, 0 ); ok( ret == STATUS_UNSUCCESSFUL && GetLastError() == 0xdeadbeef, - "NtUserEnumDisplayDevices returned %x %u\n", ret, GetLastError() ); + "NtUserEnumDisplayDevices returned %#lx %lu\n", ret, GetLastError() ); SetLastError( 0xdeadbeef ); ret = NtUserEnumDisplayDevices( NULL, 0, NULL, 0 ); ok( ret == STATUS_UNSUCCESSFUL && GetLastError() == 0xdeadbeef, - "NtUserEnumDisplayDevices returned %x %u\n", ret, GetLastError() ); + "NtUserEnumDisplayDevices returned %#lx %lu\n", ret, GetLastError() ); SetLastError( 0xdeadbeef ); ret = NtUserEnumDisplayDevices( NULL, 12345, NULL, 0 ); ok( ret == STATUS_UNSUCCESSFUL && GetLastError() == 0xdeadbeef, - "NtUserEnumDisplayDevices returned %x %u\n", ret, GetLastError() ); + "NtUserEnumDisplayDevices returned %#lx %lu\n", ret, GetLastError() ); } static void test_NtUserCloseWindowStation(void) @@ -71,7 +71,7 @@ static void test_NtUserCloseWindowStation(void) SetLastError( 0xdeadbeef ); ret = NtUserCloseWindowStation( 0 ); ok( !ret && GetLastError() == ERROR_INVALID_HANDLE, - "NtUserCloseWindowStation returned %x %u\n", ret, GetLastError() ); + "NtUserCloseWindowStation returned %x %lu\n", ret, GetLastError() ); } static void test_window_props(void) @@ -86,7 +86,7 @@ static void test_window_props(void) atom = GlobalAddAtomW( L"test" ); ret = NtUserSetProp( hwnd, UlongToPtr(atom), UlongToHandle(0xdeadbeef) ); - ok( ret, "NtUserSetProp failed: %u\n", GetLastError() ); + ok( ret, "NtUserSetProp failed: %lu\n", GetLastError() ); prop = GetPropW( hwnd, L"test" ); ok( prop == UlongToHandle(0xdeadbeef), "prop = %p\n", prop ); @@ -119,41 +119,41 @@ static void test_NtUserBuildHwndList(void) size = 0; status = NtUserBuildHwndList( 0, 0, 0, 0, GetCurrentThreadId(), ARRAYSIZE(buf), buf, &size ); - ok( !status, "NtUserBuildHwndList failed: %#x\n", status ); - ok( size == 1, "size = %u\n", size ); + ok( !status, "NtUserBuildHwndList failed: %#lx\n", status ); + ok( size == 1, "size = %lu\n", size ); ok( buf[0] == HWND_BOTTOM, "buf[0] = %p\n", buf[0] ); hwnd = CreateWindowExA( 0, "static", NULL, WS_POPUP, 0,0,0,0,GetDesktopWindow(),0,0, NULL ); size = 0; status = NtUserBuildHwndList( 0, 0, 0, 0, GetCurrentThreadId(), ARRAYSIZE(buf), buf, &size ); - ok( !status, "NtUserBuildHwndList failed: %#x\n", status ); - ok( size == 3, "size = %u\n", size ); + ok( !status, "NtUserBuildHwndList failed: %#lx\n", status ); + ok( size == 3, "size = %lu\n", size ); ok( buf[0] == hwnd, "buf[0] = %p\n", buf[0] ); ok( buf[2] == HWND_BOTTOM, "buf[0] = %p\n", buf[2] ); size = 0; status = NtUserBuildHwndList( 0, 0, 0, 0, GetCurrentThreadId(), 3, buf, &size ); - ok( !status, "NtUserBuildHwndList failed: %#x\n", status ); - ok( size == 3, "size = %u\n", size ); + ok( !status, "NtUserBuildHwndList failed: %#lx\n", status ); + ok( size == 3, "size = %lu\n", size ); size = 0; status = NtUserBuildHwndList( 0, 0, 0, 0, GetCurrentThreadId(), 2, buf, &size ); - ok( status == STATUS_BUFFER_TOO_SMALL, "NtUserBuildHwndList failed: %#x\n", status ); - ok( size == 3, "size = %u\n", size ); + ok( status == STATUS_BUFFER_TOO_SMALL, "NtUserBuildHwndList failed: %#lx\n", status ); + ok( size == 3, "size = %lu\n", size ); size = 0; status = NtUserBuildHwndList( 0, 0, 0, 0, GetCurrentThreadId(), 1, buf, &size ); - ok( status == STATUS_BUFFER_TOO_SMALL, "NtUserBuildHwndList failed: %#x\n", status ); - ok( size == 3, "size = %u\n", size ); + ok( status == STATUS_BUFFER_TOO_SMALL, "NtUserBuildHwndList failed: %#lx\n", status ); + ok( size == 3, "size = %lu\n", size ); desktop_windows_cnt = 0; EnumDesktopWindows( 0, count_win, (LPARAM)&desktop_windows_cnt ); size = 0; status = NtUserBuildHwndList( 0, 0, 0, 1, 0, ARRAYSIZE(buf), buf, &size ); - ok( !status, "NtUserBuildHwndList failed: %#x\n", status ); - ok( size == desktop_windows_cnt + 1, "size = %u, expected %u\n", size, desktop_windows_cnt + 1 ); + ok( !status, "NtUserBuildHwndList failed: %#lx\n", status ); + ok( size == desktop_windows_cnt + 1, "size = %lu, expected %lu\n", size, desktop_windows_cnt + 1 ); desktop_windows_cnt = 0; EnumDesktopWindows( GetThreadDesktop( GetCurrentThreadId() ), count_win, (LPARAM)&desktop_windows_cnt ); @@ -161,21 +161,21 @@ static void test_NtUserBuildHwndList(void) size = 0; status = NtUserBuildHwndList( GetThreadDesktop(GetCurrentThreadId()), 0, 0, 1, 0, ARRAYSIZE(buf), buf, &size ); - ok( !status, "NtUserBuildHwndList failed: %#x\n", status ); - ok( size == desktop_windows_cnt + 1, "size = %u, expected %u\n", size, desktop_windows_cnt + 1 ); + ok( !status, "NtUserBuildHwndList failed: %#lx\n", status ); + ok( size == desktop_windows_cnt + 1, "size = %lu, expected %lu\n", size, desktop_windows_cnt + 1 ); size = 0; status = NtUserBuildHwndList( GetThreadDesktop(GetCurrentThreadId()), 0, 0, 0, 0, ARRAYSIZE(buf), buf, &size ); - ok( !status, "NtUserBuildHwndList failed: %#x\n", status ); + ok( !status, "NtUserBuildHwndList failed: %#lx\n", status ); todo_wine - ok( size > desktop_windows_cnt + 1, "size = %u, expected %u\n", size, desktop_windows_cnt + 1 ); + ok( size > desktop_windows_cnt + 1, "size = %lu, expected %lu\n", size, desktop_windows_cnt + 1 ); size = 0xdeadbeef; status = NtUserBuildHwndList( UlongToHandle(0xdeadbeef), 0, 0, 0, 0, ARRAYSIZE(buf), buf, &size ); - ok( status == STATUS_INVALID_HANDLE, "NtUserBuildHwndList failed: %#x\n", status ); - ok( size == 0xdeadbeef, "size = %u\n", size ); + ok( status == STATUS_INVALID_HANDLE, "NtUserBuildHwndList failed: %#lx\n", status ); + ok( size == 0xdeadbeef, "size = %lu\n", size ); DestroyWindow( hwnd ); }

1 0