February 2022 - Wine-commits

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

18 Feb '22

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

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

18 Feb '22

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 : dbghelp: Fix the spelling and tweak the wording of a comment.
by Alexandre Julliard 18 Feb '22

18 Feb '22

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

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

18 Feb '22

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

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

18 Feb '22

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

Eric Pouech : toolhelp.dll16: Enable compilation with long types.
by Alexandre Julliard 18 Feb '22

18 Feb '22

Module: wine Branch: master Commit: 66b171d2bc68bbe54edc67061514d24c90ac109e URL: https://source.winehq.org/git/wine.git/?a=commit;h=66b171d2bc68bbe54edc6706… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Feb 18 09:17:28 2022 +0100 toolhelp.dll16: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/toolhelp.dll16/Makefile.in | 1 - dlls/toolhelp.dll16/toolhelp.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/toolhelp.dll16/Makefile.in b/dlls/toolhelp.dll16/Makefile.in index 7e39aa9c7cb..64d0de31528 100644 --- a/dlls/toolhelp.dll16/Makefile.in +++ b/dlls/toolhelp.dll16/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = toolhelp.dll16 EXTRADLLFLAGS = -m16 diff --git a/dlls/toolhelp.dll16/toolhelp.c b/dlls/toolhelp.dll16/toolhelp.c index 57a95fb8d8f..1bec37c505e 100644 --- a/dlls/toolhelp.dll16/toolhelp.c +++ b/dlls/toolhelp.dll16/toolhelp.c @@ -552,7 +552,7 @@ BOOL16 WINAPI NotifyRegister16( HTASK16 htask, FARPROC16 lpfnCallback, { int i; - FIXME("(%x,%x,%x), semi-stub.\n", + FIXME("(%x,%lx,%x), semi-stub.\n", htask, (DWORD)lpfnCallback, wFlags ); if (!htask) htask = GetCurrentTask(); for (i=0;i<nrofnotifys;i++)

1 0

Eric Pouech : traffic: Enable compilation with long types.
by Alexandre Julliard 18 Feb '22

18 Feb '22

Module: wine Branch: master Commit: 56f0485da75978d0287ab774d6deeb031c63f1d3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=56f0485da75978d0287ab774… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Feb 18 09:17:34 2022 +0100 traffic: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/traffic/Makefile.in | 1 - dlls/traffic/traffic_main.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/traffic/Makefile.in b/dlls/traffic/Makefile.in index bef639c0a98..633355f93ec 100644 --- a/dlls/traffic/Makefile.in +++ b/dlls/traffic/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = traffic.dll EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/traffic/traffic_main.c b/dlls/traffic/traffic_main.c index 87646622346..c551d8bcc30 100644 --- a/dlls/traffic/traffic_main.c +++ b/dlls/traffic/traffic_main.c @@ -32,7 +32,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(traffic); ULONG WINAPI TcRegisterClient(ULONG version, HANDLE context, PTCI_CLIENT_FUNC_LIST list, PHANDLE buffer) { - FIXME("(%u %p %p %p) stub\n", version, context, list, buffer); + FIXME("(%lu %p %p %p) stub\n", version, context, list, buffer); if(buffer) *buffer = INVALID_HANDLE_VALUE; return ERROR_CALL_NOT_IMPLEMENTED; }

1 0

Eric Pouech : twain_32: Enable compilation with long types.
by Alexandre Julliard 18 Feb '22

18 Feb '22

Module: wine Branch: master Commit: f2eac52cd632c28b3c5a57a3da4a240de820adce URL: https://source.winehq.org/git/wine.git/?a=commit;h=f2eac52cd632c28b3c5a57a3… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Feb 18 09:17:40 2022 +0100 twain_32: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/twain_32/Makefile.in | 1 - dlls/twain_32/dsm_ctrl.c | 2 +- dlls/twain_32/twain32_main.c | 8 ++++---- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/twain_32/Makefile.in b/dlls/twain_32/Makefile.in index 8919b82000a..c82b5a74453 100644 --- a/dlls/twain_32/Makefile.in +++ b/dlls/twain_32/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = twain_32.dll IMPORTS = user32 diff --git a/dlls/twain_32/dsm_ctrl.c b/dlls/twain_32/dsm_ctrl.c index f8ec539ba85..6854093017a 100644 --- a/dlls/twain_32/dsm_ctrl.c +++ b/dlls/twain_32/dsm_ctrl.c @@ -427,7 +427,7 @@ TW_UINT16 TWAIN_UserSelect (pTW_IDENTITY pOrigin, TW_MEMREF pData) userselect_data param = {pOrigin, pData}; HWND parent = DSM_parent; - TRACE("DG_CONTROL/DAT_IDENTITY/MSG_USERSELECT SupportedGroups=0x%x ProductName=%s\n", + TRACE("DG_CONTROL/DAT_IDENTITY/MSG_USERSELECT SupportedGroups=0x%lx ProductName=%s\n", pOrigin->SupportedGroups, wine_dbgstr_a(param.result->ProductName)); twain_autodetect(); diff --git a/dlls/twain_32/twain32_main.c b/dlls/twain_32/twain32_main.c index 0f8ee144306..a8b11a9bbfe 100644 --- a/dlls/twain_32/twain32_main.c +++ b/dlls/twain_32/twain32_main.c @@ -35,7 +35,7 @@ HINSTANCE DSM_hinstance; BOOL WINAPI DllMain (HINSTANCE hinstance, DWORD reason, LPVOID reserved) { - TRACE("%p,%x,%p\n", hinstance, reason, reserved); + TRACE("%p,%lx,%p\n", hinstance, reason, reserved); switch (reason) { @@ -158,7 +158,7 @@ DSM_Entry (pTW_IDENTITY pOrigin, { TW_UINT16 twRC = TWRC_SUCCESS; /* Return Code */ - TRACE("(DG=%d DAT=%d MSG=%d)\n", DG, DAT, MSG); + TRACE("(DG=%ld DAT=%d MSG=%d)\n", DG, DAT, MSG); if (DG == DG_CONTROL && DAT == DAT_NULL) { @@ -199,7 +199,7 @@ DSM_Entry (pTW_IDENTITY pOrigin, } DSM_twCC = TWCC_SUCCESS; - TRACE("Forwarding %d/%d/%d/%p to DS.\n", DG, DAT, MSG, pData); + TRACE("Forwarding %ld/%d/%d/%p to DS.\n", DG, DAT, MSG, pData); twRC = pSource->dsEntry(pOrigin, DG, DAT, MSG, pData); TRACE("return value is %d\n", twRC); return twRC; @@ -210,7 +210,7 @@ DSM_Entry (pTW_IDENTITY pOrigin, twRC = TWAIN_SourceManagerHandler (pOrigin, DAT, MSG, pData); break; default: - FIXME("The DSM does not handle DG %d\n", DG); + FIXME("The DSM does not handle DG %ld\n", DG); DSM_twCC = TWCC_BADPROTOCOL; twRC = TWRC_FAILURE; }

1 0

Eric Pouech : typelib.dll16: Enable compilation with long types.
by Alexandre Julliard 18 Feb '22

18 Feb '22

Module: wine Branch: master Commit: ca4cc5723af03baae0c98b38dbcf4694dec2a27a URL: https://source.winehq.org/git/wine.git/?a=commit;h=ca4cc5723af03baae0c98b38… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Feb 18 09:17:46 2022 +0100 typelib.dll16: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/typelib.dll16/Makefile.in | 1 - dlls/typelib.dll16/typelib.c | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/typelib.dll16/Makefile.in b/dlls/typelib.dll16/Makefile.in index 06adb35b296..b4d39ee6601 100644 --- a/dlls/typelib.dll16/Makefile.in +++ b/dlls/typelib.dll16/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = typelib.dll16 IMPORTS = oleaut32 advapi32 EXTRADLLFLAGS = -m16 -Wb,--main-module,oleaut32.dll diff --git a/dlls/typelib.dll16/typelib.c b/dlls/typelib.dll16/typelib.c index 4787010354c..41a4790a253 100644 --- a/dlls/typelib.dll16/typelib.c +++ b/dlls/typelib.dll16/typelib.c @@ -82,14 +82,14 @@ QueryPathOfRegTypeLib16( TRACE("\n"); if (HIWORD(guid)) { - sprintf( typelibkey, "SOFTWARE\\Classes\\Typelib\\{%08lx-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}\\%d.%d\\%x\\win16", + sprintf( typelibkey, "SOFTWARE\\Classes\\Typelib\\{%08lx-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}\\%d.%d\\%lx\\win16", guid->Data1, guid->Data2, guid->Data3, guid->Data4[0], guid->Data4[1], guid->Data4[2], guid->Data4[3], guid->Data4[4], guid->Data4[5], guid->Data4[6], guid->Data4[7], wMaj,wMin,lcid); } else { - sprintf(xguid,"<guid 0x%08x>",(DWORD)guid); - FIXME("(%s,%d,%d,0x%04x,%p),can't handle non-string guids.\n",xguid,wMaj,wMin,lcid,path); + sprintf(xguid,"<guid 0x%08lx>",(DWORD)guid); + FIXME("(%s,%d,%d,0x%04lx,%p),can't handle non-string guids.\n",xguid,wMaj,wMin,lcid,path); return E_FAIL; } plen = sizeof(pathname);

1 0

Eric Pouech : uianimation: Enable compilation with long types.
by Alexandre Julliard 18 Feb '22

18 Feb '22

Module: wine Branch: master Commit: 62877d4d97c8a2c63e1e35b85bab890380db27ae URL: https://source.winehq.org/git/wine.git/?a=commit;h=62877d4d97c8a2c63e1e35b8… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Feb 18 09:17:52 2022 +0100 uianimation: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/uianimation/Makefile.in | 1 - dlls/uianimation/main.c | 24 ++++++++++++------------ 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/dlls/uianimation/Makefile.in b/dlls/uianimation/Makefile.in index cac37bf3c79..e632e19bd7c 100644 --- a/dlls/uianimation/Makefile.in +++ b/dlls/uianimation/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = uianimation.dll IMPORTS = uuid diff --git a/dlls/uianimation/main.c b/dlls/uianimation/main.c index be09256d2fa..c338d836978 100644 --- a/dlls/uianimation/main.c +++ b/dlls/uianimation/main.c @@ -139,7 +139,7 @@ static ULONG WINAPI animation_storyboard_AddRef( IUIAnimationStoryboard *iface ) struct animation_storyboard *This = impl_from_IUIAnimationStoryboard( iface ); ULONG ref = InterlockedIncrement( &This->ref ); - TRACE( "(%p) ref = %u\n", This, ref ); + TRACE( "(%p) ref = %lu\n", This, ref ); return ref; } @@ -148,7 +148,7 @@ static ULONG WINAPI animation_storyboard_Release( IUIAnimationStoryboard *iface struct animation_storyboard *This = impl_from_IUIAnimationStoryboard( iface ); ULONG ref = InterlockedDecrement(&This->ref); - TRACE( "(%p) ref = %u\n", This, ref ); + TRACE( "(%p) ref = %lu\n", This, ref ); if (!ref) heap_free( This ); @@ -359,7 +359,7 @@ static ULONG WINAPI animation_var_AddRef( IUIAnimationVariable *iface ) struct animation_var *This = impl_from_IUIAnimationVariable( iface ); ULONG ref = InterlockedIncrement( &This->ref ); - TRACE( "(%p) ref = %u\n", This, ref ); + TRACE( "(%p) ref = %lu\n", This, ref ); return ref; } @@ -368,7 +368,7 @@ static ULONG WINAPI animation_var_Release( IUIAnimationVariable *iface ) struct animation_var *This = impl_from_IUIAnimationVariable( iface ); ULONG ref = InterlockedDecrement(&This->ref); - TRACE( "(%p) ref = %u\n", This, ref ); + TRACE( "(%p) ref = %lu\n", This, ref ); if (!ref) heap_free( This ); @@ -548,7 +548,7 @@ static ULONG WINAPI manager_AddRef( IUIAnimationManager *iface ) struct manager *This = impl_from_IUIAnimationManager( iface ); ULONG ref = InterlockedIncrement( &This->ref ); - TRACE( "(%p) ref = %u\n", This, ref ); + TRACE( "(%p) ref = %lu\n", This, ref ); return ref; } @@ -557,7 +557,7 @@ static ULONG WINAPI manager_Release( IUIAnimationManager *iface ) struct manager *This = impl_from_IUIAnimationManager( iface ); ULONG ref = InterlockedDecrement(&This->ref); - TRACE( "(%p) ref = %u\n", This, ref ); + TRACE( "(%p) ref = %lu\n", This, ref ); if (!ref) { @@ -781,7 +781,7 @@ static ULONG WINAPI timer_AddRef( IUIAnimationTimer *iface ) struct timer *This = impl_from_IUIAnimationTimer( iface ); ULONG ref = InterlockedIncrement( &This->ref ); - TRACE( "(%p) ref = %u\n", This, ref ); + TRACE( "(%p) ref = %lu\n", This, ref ); return ref; } @@ -790,7 +790,7 @@ static ULONG WINAPI timer_Release( IUIAnimationTimer *iface ) struct timer *This = impl_from_IUIAnimationTimer( iface ); ULONG ref = InterlockedDecrement(&This->ref); - TRACE( "(%p) ref = %u\n", This, ref ); + TRACE( "(%p) ref = %lu\n", This, ref ); if (!ref) heap_free( This ); @@ -918,7 +918,7 @@ static ULONG WINAPI tr_factory_AddRef( IUIAnimationTransitionFactory *iface ) struct tr_factory *This = impl_from_IUIAnimationTransitionFactory( iface ); ULONG ref = InterlockedIncrement( &This->ref ); - TRACE( "(%p) ref = %u\n", This, ref ); + TRACE( "(%p) ref = %lu\n", This, ref ); return ref; } @@ -927,7 +927,7 @@ static ULONG WINAPI tr_factory_Release( IUIAnimationTransitionFactory *iface ) struct tr_factory *This = impl_from_IUIAnimationTransitionFactory( iface ); ULONG ref = InterlockedDecrement(&This->ref); - TRACE( "(%p) ref = %u\n", This, ref ); + TRACE( "(%p) ref = %lu\n", This, ref ); if (!ref) heap_free( This ); @@ -1005,7 +1005,7 @@ static ULONG WINAPI tr_library_AddRef( IUIAnimationTransitionLibrary *iface ) struct tr_library *This = impl_from_IUIAnimationTransitionLibrary( iface ); ULONG ref = InterlockedIncrement( &This->ref ); - TRACE( "(%p) ref = %u\n", This, ref ); + TRACE( "(%p) ref = %lu\n", This, ref ); return ref; } @@ -1014,7 +1014,7 @@ static ULONG WINAPI tr_library_Release( IUIAnimationTransitionLibrary *iface ) struct tr_library *This = impl_from_IUIAnimationTransitionLibrary( iface ); ULONG ref = InterlockedDecrement(&This->ref); - TRACE( "(%p) ref = %u\n", This, ref ); + TRACE( "(%p) ref = %lu\n", This, ref ); if (!ref) heap_free( This );

1 0