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

Jacek Caban : win32u: Move NtUserThunkedMenuInfo implementation from user32.
by Alexandre Julliard April 22, 2022

April 22, 2022

Module: wine Branch: master Commit: 99b94fcc743e17c1ba03c51ab3d53c6f99c5fad4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=99b94fcc743e17c1ba03c51a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 22 14:45:11 2022 +0200 win32u: Move NtUserThunkedMenuInfo implementation from user32. 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/user32/menu.c | 50 +++++++--------------------------------------- dlls/win32u/menu.c | 53 +++++++++++++++++++++++++++++++++++++++++++++++++ dlls/win32u/syscall.c | 1 + dlls/win32u/win32u.spec | 2 +- dlls/wow64win/syscall.h | 1 + dlls/wow64win/user.c | 29 +++++++++++++++++++++++++++ include/ntuser.h | 1 + 7 files changed, 93 insertions(+), 44 deletions(-) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index b1f038938f6..36aed74c6c6 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -5073,54 +5073,18 @@ BOOL WINAPI CheckMenuRadioItem(HMENU hMenu, UINT first, UINT last, /********************************************************************** * SetMenuInfo (USER32.@) - * - * FIXME - * actually use the items to draw the menu - * (recalculate and/or redraw) */ -static BOOL menu_SetMenuInfo( HMENU hMenu, LPCMENUINFO lpmi) +BOOL WINAPI SetMenuInfo( HMENU menu, const MENUINFO *info ) { - POPUPMENU *menu; - if( !(menu = MENU_GetMenu(hMenu))) return FALSE; - - if (lpmi->fMask & MIM_BACKGROUND) - menu->hbrBack = lpmi->hbrBack; - - if (lpmi->fMask & MIM_HELPID) - menu->dwContextHelpID = lpmi->dwContextHelpID; - - if (lpmi->fMask & MIM_MAXHEIGHT) - menu->cyMax = lpmi->cyMax; + TRACE( "(%p %p)\n", menu, info ); - if (lpmi->fMask & MIM_MENUDATA) - menu->dwMenuData = lpmi->dwMenuData; - - if (lpmi->fMask & MIM_STYLE) - menu->dwStyle = lpmi->dwStyle; - - if( lpmi->fMask & MIM_APPLYTOSUBMENUS) { - int i; - MENUITEM *item = menu->items; - for( i = menu->nItems; i; i--, item++) - if( item->fType & MF_POPUP) - menu_SetMenuInfo( item->hSubMenu, lpmi); + if (!info || info->cbSize != sizeof(*info)) + { + SetLastError( ERROR_INVALID_PARAMETER); + return FALSE; } - return TRUE; -} -BOOL WINAPI SetMenuInfo (HMENU hMenu, LPCMENUINFO lpmi) -{ - TRACE("(%p %p)\n", hMenu, lpmi); - if( lpmi && (lpmi->cbSize == sizeof( MENUINFO)) && (menu_SetMenuInfo( hMenu, lpmi))) { - if( lpmi->fMask & MIM_STYLE) { - if (lpmi->dwStyle & MNS_AUTODISMISS) FIXME("MNS_AUTODISMISS unimplemented\n"); - if (lpmi->dwStyle & MNS_DRAGDROP) FIXME("MNS_DRAGDROP unimplemented\n"); - if (lpmi->dwStyle & MNS_MODELESS) FIXME("MNS_MODELESS unimplemented\n"); - } - return TRUE; - } - SetLastError( ERROR_INVALID_PARAMETER); - return FALSE; + return NtUserThunkedMenuInfo( menu, info ); } /********************************************************************** diff --git a/dlls/win32u/menu.c b/dlls/win32u/menu.c index fd4e1f74039..dee68a95aa2 100644 --- a/dlls/win32u/menu.c +++ b/dlls/win32u/menu.c @@ -451,6 +451,59 @@ BOOL WINAPI NtUserGetMenuItemRect( HWND hwnd, HMENU handle, UINT item, RECT *rec return TRUE; } +static BOOL set_menu_info( HMENU handle, const MENUINFO *info ) +{ + POPUPMENU *menu; + + if (!(menu = grab_menu_ptr( handle ))) return FALSE; + + if (info->fMask & MIM_BACKGROUND) menu->hbrBack = info->hbrBack; + if (info->fMask & MIM_HELPID) menu->dwContextHelpID = info->dwContextHelpID; + if (info->fMask & MIM_MAXHEIGHT) menu->cyMax = info->cyMax; + if (info->fMask & MIM_MENUDATA) menu->dwMenuData = info->dwMenuData; + if (info->fMask & MIM_STYLE) menu->dwStyle = info->dwStyle; + + if (info->fMask & MIM_APPLYTOSUBMENUS) + { + int i; + MENUITEM *item = menu->items; + for (i = menu->nItems; i; i--, item++) + if (item->fType & MF_POPUP) + set_menu_info( item->hSubMenu, info); + } + + release_menu_ptr( menu ); + return TRUE; +} + +/********************************************************************** + * NtUserThunkedMenuInfo (win32u.@) + */ +BOOL WINAPI NtUserThunkedMenuInfo( HMENU menu, const MENUINFO *info ) +{ + TRACE( "(%p %p)\n", menu, info ); + + if (!info) + { + SetLastError( ERROR_NOACCESS ); + return FALSE; + } + + if (!set_menu_info( menu, info )) + { + SetLastError( ERROR_INVALID_MENU_HANDLE ); + return FALSE; + } + + if (info->fMask & MIM_STYLE) + { + if (info->dwStyle & MNS_AUTODISMISS) FIXME("MNS_AUTODISMISS unimplemented\n"); + if (info->dwStyle & MNS_DRAGDROP) FIXME("MNS_DRAGDROP unimplemented\n"); + if (info->dwStyle & MNS_MODELESS) FIXME("MNS_MODELESS unimplemented\n"); + } + return TRUE; +} + /* see GetMenuInfo */ BOOL get_menu_info( HMENU handle, MENUINFO *info ) { diff --git a/dlls/win32u/syscall.c b/dlls/win32u/syscall.c index 3ac03cef0d9..d543465d4d7 100644 --- a/dlls/win32u/syscall.c +++ b/dlls/win32u/syscall.c @@ -166,6 +166,7 @@ static void * const syscalls[] = NtUserSetTimer, NtUserSetWinEventHook, NtUserSetWindowsHookEx, + NtUserThunkedMenuInfo, NtUserUnhookWinEvent, NtUserUnhookWindowsHookEx, NtUserWindowFromDC, diff --git a/dlls/win32u/win32u.spec b/dlls/win32u/win32u.spec index 67d6aa6b48d..cfbf4ac1ad1 100644 --- a/dlls/win32u/win32u.spec +++ b/dlls/win32u/win32u.spec @@ -1274,7 +1274,7 @@ @ stdcall NtUserSystemParametersInfo(long long ptr long) @ stdcall NtUserSystemParametersInfoForDpi(long long ptr long long) @ stub NtUserTestForInteractiveUser -@ stub NtUserThunkedMenuInfo +@ stdcall -syscall NtUserThunkedMenuInfo(long ptr) @ stub NtUserThunkedMenuItemInfo @ stdcall NtUserToUnicodeEx(long long ptr ptr long long long) @ stub NtUserTrackMouseEvent diff --git a/dlls/wow64win/syscall.h b/dlls/wow64win/syscall.h index 52df3a4d67c..f3cee62b577 100644 --- a/dlls/wow64win/syscall.h +++ b/dlls/wow64win/syscall.h @@ -153,6 +153,7 @@ SYSCALL_ENTRY( NtUserSetTimer ) \ SYSCALL_ENTRY( NtUserSetWinEventHook ) \ SYSCALL_ENTRY( NtUserSetWindowsHookEx ) \ + SYSCALL_ENTRY( NtUserThunkedMenuInfo ) \ SYSCALL_ENTRY( NtUserUnhookWinEvent ) \ SYSCALL_ENTRY( NtUserUnhookWindowsHookEx ) \ SYSCALL_ENTRY( NtUserWindowFromDC ) diff --git a/dlls/wow64win/user.c b/dlls/wow64win/user.c index 9c2169cf886..38905fd8a57 100644 --- a/dlls/wow64win/user.c +++ b/dlls/wow64win/user.c @@ -658,3 +658,32 @@ NTSTATUS WINAPI wow64_NtUserSetMenuContextHelpId( UINT *args ) return NtUserSetMenuContextHelpId( menu, id ); } + +NTSTATUS WINAPI wow64_NtUserThunkedMenuInfo( UINT *args ) +{ + HMENU menu = get_handle( &args ); + const struct + { + DWORD cbSize; + DWORD fMask; + DWORD dwStyle; + UINT cyMax; + ULONG hbrBack; + DWORD dwContextHelpID; + ULONG dwMenuData; + } *info32 = get_ptr( &args ); + MENUINFO info; + + if (info32) + { + info.cbSize = sizeof(info); + info.fMask = info32->fMask; + info.dwStyle = info32->dwStyle; + info.cyMax = info32->cyMax; + info.hbrBack = UlongToHandle( info32->hbrBack ); + info.dwContextHelpID = info32->dwContextHelpID; + info.dwMenuData = info32->dwMenuData; + } + + return NtUserThunkedMenuInfo( menu, info32 ? &info : NULL ); +} diff --git a/include/ntuser.h b/include/ntuser.h index 1a5d255133c..cdac581f193 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -580,6 +580,7 @@ BOOL WINAPI NtUserShowWindow( HWND hwnd, INT cmd ); BOOL WINAPI NtUserShowWindowAsync( HWND hwnd, INT cmd ); BOOL WINAPI NtUserSystemParametersInfo( UINT action, UINT val, void *ptr, UINT winini ); BOOL WINAPI NtUserSystemParametersInfoForDpi( UINT action, UINT val, PVOID ptr, UINT winini, UINT dpi ); +BOOL WINAPI NtUserThunkedMenuInfo( HMENU menu, const MENUINFO *info ); INT WINAPI NtUserToUnicodeEx( UINT virt, UINT scan, const BYTE *state, WCHAR *str, int size, UINT flags, HKL layout ); INT WINAPI NtUserTranslateAccelerator( HWND hwnd, HACCEL accel, MSG *msg );

1 0

Rémi Bernon : windows.gaming.input: Implement RacingWheel runtimeclass stub.
by Alexandre Julliard April 22, 2022

April 22, 2022

Module: wine Branch: master Commit: b12c74e435c86b74e723d41fc5870fa11ea27a64 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b12c74e435c86b74e723d41f… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Apr 22 11:49:09 2022 +0200 windows.gaming.input: Implement RacingWheel runtimeclass stub. And instantiate the class for DI8DEVTYPE_DRIVING devices. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windows.gaming.input/manager.c | 4 + dlls/windows.gaming.input/provider.c | 1 + dlls/windows.gaming.input/provider.idl | 1 + dlls/windows.gaming.input/racing_wheel.c | 242 ++++++++++++++++++++++++++++++- 4 files changed, 246 insertions(+), 2 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b12c74e435c86b74e723…

1 0

Rémi Bernon : windows.gaming.input: Implement IRacingWheelStatics2 interface for RacingWheel.
by Alexandre Julliard April 22, 2022

April 22, 2022

Module: wine Branch: master Commit: e2e038e231379e31c89dd1e41548e41ca06e5103 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e2e038e231379e31c89dd1e4… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Apr 22 11:49:08 2022 +0200 windows.gaming.input: Implement IRacingWheelStatics2 interface for RacingWheel. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windows.gaming.input/racing_wheel.c | 41 ++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/dlls/windows.gaming.input/racing_wheel.c b/dlls/windows.gaming.input/racing_wheel.c index 818e46bab42..1fc39f64f19 100644 --- a/dlls/windows.gaming.input/racing_wheel.c +++ b/dlls/windows.gaming.input/racing_wheel.c @@ -60,6 +60,7 @@ struct racing_wheel_statics { IActivationFactory IActivationFactory_iface; IRacingWheelStatics IRacingWheelStatics_iface; + IRacingWheelStatics2 IRacingWheelStatics2_iface; ICustomGameControllerFactory ICustomGameControllerFactory_iface; LONG ref; }; @@ -90,6 +91,12 @@ static HRESULT WINAPI factory_QueryInterface( IActivationFactory *iface, REFIID return S_OK; } + if (IsEqualGUID( iid, &IID_IRacingWheelStatics2 )) + { + IInspectable_AddRef( (*out = &impl->IRacingWheelStatics2_iface) ); + return S_OK; + } + if (IsEqualGUID( iid, &IID_ICustomGameControllerFactory )) { IInspectable_AddRef( (*out = &impl->ICustomGameControllerFactory_iface) ); @@ -214,6 +221,39 @@ static const struct IRacingWheelStaticsVtbl statics_vtbl = statics_get_RacingWheels, }; +DEFINE_IINSPECTABLE( statics2, IRacingWheelStatics2, struct racing_wheel_statics, IActivationFactory_iface ) + +static HRESULT WINAPI statics2_FromGameController( IRacingWheelStatics2 *iface, IGameController *game_controller, IRacingWheel **value ) +{ + struct racing_wheel_statics *impl = impl_from_IRacingWheelStatics2( iface ); + IGameController *controller; + HRESULT hr; + + TRACE( "iface %p, game_controller %p, value %p.\n", iface, game_controller, value ); + + *value = NULL; + hr = IGameControllerFactoryManagerStatics2_TryGetFactoryControllerFromGameController( manager_factory, &impl->ICustomGameControllerFactory_iface, + game_controller, &controller ); + if (FAILED(hr) || !controller) return hr; + + hr = IGameController_QueryInterface( controller, &IID_IRacingWheel, (void **)value ); + IGameController_Release( controller ); + return hr; +} + +static const struct IRacingWheelStatics2Vtbl statics2_vtbl = +{ + statics2_QueryInterface, + statics2_AddRef, + statics2_Release, + /* IInspectable methods */ + statics2_GetIids, + statics2_GetRuntimeClassName, + statics2_GetTrustLevel, + /* IRacingWheelStatics2 methods */ + statics2_FromGameController, +}; + DEFINE_IINSPECTABLE( controller_factory, ICustomGameControllerFactory, struct racing_wheel_statics, IActivationFactory_iface ) static HRESULT WINAPI controller_factory_CreateGameController( ICustomGameControllerFactory *iface, IGameControllerProvider *provider, @@ -291,6 +331,7 @@ static struct racing_wheel_statics racing_wheel_statics = { {&factory_vtbl}, {&statics_vtbl}, + {&statics2_vtbl}, {&controller_factory_vtbl}, 1, };

1 0

Alexandre Julliard : winedump: Avoid using DWORD in private definitions.
by Alexandre Julliard April 22, 2022

April 22, 2022

Module: wine Branch: master Commit: af54377eb62ee1c8f4e1b9acf14362808f23d8fb URL: https://source.winehq.org/git/wine.git/?a=commit;h=af54377eb62ee1c8f4e1b9ac… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 22 16:33:11 2022 +0200 winedump: Avoid using DWORD in private definitions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winedump/font.c | 2 +- tools/winedump/lib.c | 8 +-- tools/winedump/lnk.c | 80 +++++++++++++------------- tools/winedump/msc.c | 4 +- tools/winedump/nls.c | 42 +++++++------- tools/winedump/pdb.c | 53 ++++++++--------- tools/winedump/pe.c | 154 +++++++++++++++++++++++++------------------------- tools/winedump/tlb.c | 6 +- 8 files changed, 171 insertions(+), 178 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=af54377eb62ee1c8f4e1…

1 0

Alexandre Julliard : winedump: Remove unused variables.
by Alexandre Julliard April 22, 2022

April 22, 2022

Module: wine Branch: master Commit: 88c06077f87aba32384e10144d23f0757a7a2162 URL: https://source.winehq.org/git/wine.git/?a=commit;h=88c06077f87aba32384e1014… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 22 16:59:42 2022 +0200 winedump: Remove unused variables. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winedump/tlb.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/tools/winedump/tlb.c b/tools/winedump/tlb.c index 9676ba88ef8..e2ad4eb51f0 100644 --- a/tools/winedump/tlb.c +++ b/tools/winedump/tlb.c @@ -1496,7 +1496,7 @@ static void dump_type(int len, const char *hlp_strings) unsigned flags; } misc; int typeinfo_start_offset, extra, member_offset, href_offset, i; - int vars_header_bytes = 0, vars_bytes = 0, saved_offset; + int saved_offset; const void *block; const struct sltg_typeinfo_header *ti; const struct sltg_member_header *mem; @@ -1638,7 +1638,7 @@ static void dump_type(int len, const char *hlp_strings) value, vars_start_offset, value + vars_start_offset); print_offset(); printf("type:\n"); - vars_bytes += sltg_print_compound_type(vars_start_offset, value); + sltg_print_compound_type(vars_start_offset, value); } else { @@ -1681,13 +1681,7 @@ static void dump_type(int len, const char *hlp_strings) else printf("helpstring offset = ffffh\n"); - if (magic & 0x20) - { - print_short_hex("varflags"); - vars_header_bytes += 2; - } - - vars_header_bytes += sizeof(struct sltg_variable); + if (magic & 0x20) print_short_hex("varflags"); if (next != -1) {

1 0

Rémi Bernon : windows.gaming.input: Introduce Windows.Gaming.Input.RacingWheel activation factory.
by Alexandre Julliard April 22, 2022

April 22, 2022

Module: wine Branch: master Commit: 9f5dc12a07523d586d6ad26e33007deeb1977c7a URL: https://source.winehq.org/git/wine.git/?a=commit;h=9f5dc12a07523d586d6ad26e… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Apr 22 11:49:05 2022 +0200 windows.gaming.input: Introduce Windows.Gaming.Input.RacingWheel activation factory. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windows.gaming.input/Makefile.in | 1 + dlls/windows.gaming.input/main.c | 2 + dlls/windows.gaming.input/private.h | 2 + dlls/windows.gaming.input/racing_wheel.c | 117 +++++++++++++++++++++++++++++++ 4 files changed, 122 insertions(+) diff --git a/dlls/windows.gaming.input/Makefile.in b/dlls/windows.gaming.input/Makefile.in index 6c075c3d67c..1e0ce5c360c 100644 --- a/dlls/windows.gaming.input/Makefile.in +++ b/dlls/windows.gaming.input/Makefile.in @@ -8,6 +8,7 @@ C_SRCS = \ main.c \ manager.c \ provider.c \ + racing_wheel.c \ vector.c IDL_SRCS = \ diff --git a/dlls/windows.gaming.input/main.c b/dlls/windows.gaming.input/main.c index 1ddd3a8fd23..2d8f6a340b0 100644 --- a/dlls/windows.gaming.input/main.c +++ b/dlls/windows.gaming.input/main.c @@ -180,6 +180,8 @@ HRESULT WINAPI DllGetActivationFactory( HSTRING class_str, IActivationFactory ** ICustomGameControllerFactory_QueryInterface( controller_factory, &IID_IActivationFactory, (void **)factory ); if (!wcscmp( buffer, RuntimeClass_Windows_Gaming_Input_Gamepad )) ICustomGameControllerFactory_QueryInterface( gamepad_factory, &IID_IActivationFactory, (void **)factory ); + if (!wcscmp( buffer, RuntimeClass_Windows_Gaming_Input_RacingWheel )) + IActivationFactory_QueryInterface( racing_wheel_factory, &IID_IActivationFactory, (void **)factory ); if (!wcscmp( buffer, RuntimeClass_Windows_Gaming_Input_Custom_GameControllerFactoryManager )) IGameControllerFactoryManagerStatics2_QueryInterface( manager_factory, &IID_IActivationFactory, (void **)factory ); diff --git a/dlls/windows.gaming.input/private.h b/dlls/windows.gaming.input/private.h index bb2fb68b8a8..73fab47a770 100644 --- a/dlls/windows.gaming.input/private.h +++ b/dlls/windows.gaming.input/private.h @@ -34,6 +34,7 @@ #define WIDL_using_Windows_Devices_Power #define WIDL_using_Windows_Gaming_Input #define WIDL_using_Windows_Gaming_Input_Custom +#define WIDL_using_Windows_Gaming_Input_ForceFeedback #include "windows.gaming.input.custom.h" #include "wine/list.h" @@ -41,6 +42,7 @@ extern HINSTANCE windows_gaming_input; extern ICustomGameControllerFactory *controller_factory; extern ICustomGameControllerFactory *gamepad_factory; +extern IActivationFactory *racing_wheel_factory; extern IGameControllerFactoryManagerStatics2 *manager_factory; struct vector_iids diff --git a/dlls/windows.gaming.input/racing_wheel.c b/dlls/windows.gaming.input/racing_wheel.c new file mode 100644 index 00000000000..a8d20bc26ff --- /dev/null +++ b/dlls/windows.gaming.input/racing_wheel.c @@ -0,0 +1,117 @@ +/* WinRT Windows.Gaming.Input implementation + * + * Copyright 2021 Rémi Bernon for CodeWeavers + * + * 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 + */ + +#include "private.h" +#include "provider.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(input); + +struct racing_wheel_statics +{ + IActivationFactory IActivationFactory_iface; + LONG ref; +}; + +static inline struct racing_wheel_statics *impl_from_IActivationFactory( IActivationFactory *iface ) +{ + return CONTAINING_RECORD( iface, struct racing_wheel_statics, IActivationFactory_iface ); +} + +static HRESULT WINAPI factory_QueryInterface( IActivationFactory *iface, REFIID iid, void **out ) +{ + struct racing_wheel_statics *impl = impl_from_IActivationFactory( iface ); + + TRACE( "iface %p, iid %s, out %p.\n", iface, debugstr_guid( iid ), out ); + + if (IsEqualGUID( iid, &IID_IUnknown ) || + IsEqualGUID( iid, &IID_IInspectable ) || + IsEqualGUID( iid, &IID_IAgileObject ) || + IsEqualGUID( iid, &IID_IActivationFactory )) + { + IInspectable_AddRef( (*out = &impl->IActivationFactory_iface) ); + return S_OK; + } + + FIXME( "%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid( iid ) ); + *out = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI factory_AddRef( IActivationFactory *iface ) +{ + struct racing_wheel_statics *impl = impl_from_IActivationFactory( iface ); + ULONG ref = InterlockedIncrement( &impl->ref ); + TRACE( "iface %p increasing refcount to %lu.\n", iface, ref ); + return ref; +} + +static ULONG WINAPI factory_Release( IActivationFactory *iface ) +{ + struct racing_wheel_statics *impl = impl_from_IActivationFactory( iface ); + ULONG ref = InterlockedDecrement( &impl->ref ); + TRACE( "iface %p decreasing refcount to %lu.\n", iface, ref ); + return ref; +} + +static HRESULT WINAPI factory_GetIids( IActivationFactory *iface, ULONG *iid_count, IID **iids ) +{ + FIXME( "iface %p, iid_count %p, iids %p stub!\n", iface, iid_count, iids ); + return E_NOTIMPL; +} + +static HRESULT WINAPI factory_GetRuntimeClassName( IActivationFactory *iface, HSTRING *class_name ) +{ + FIXME( "iface %p, class_name %p stub!\n", iface, class_name ); + return E_NOTIMPL; +} + +static HRESULT WINAPI factory_GetTrustLevel( IActivationFactory *iface, TrustLevel *trust_level ) +{ + FIXME( "iface %p, trust_level %p stub!\n", iface, trust_level ); + return E_NOTIMPL; +} + +static HRESULT WINAPI factory_ActivateInstance( IActivationFactory *iface, IInspectable **instance ) +{ + FIXME( "iface %p, instance %p stub!\n", iface, instance ); + return E_NOTIMPL; +} + +static const struct IActivationFactoryVtbl factory_vtbl = +{ + factory_QueryInterface, + factory_AddRef, + factory_Release, + /* IInspectable methods */ + factory_GetIids, + factory_GetRuntimeClassName, + factory_GetTrustLevel, + /* IActivationFactory methods */ + factory_ActivateInstance, +}; + +static struct racing_wheel_statics racing_wheel_statics = +{ + {&factory_vtbl}, + 1, +}; + +IActivationFactory *racing_wheel_factory = &racing_wheel_statics.IActivationFactory_iface;

1 0

Rémi Bernon : windows.gaming.input: Implement IRacingWheelStatics interface for RacingWheel.
by Alexandre Julliard April 22, 2022

April 22, 2022

Module: wine Branch: master Commit: d1bf6e7e3798546797f0f3f09896205ff99f9781 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d1bf6e7e3798546797f0f3f0… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Apr 22 11:49:06 2022 +0200 windows.gaming.input: Implement IRacingWheelStatics interface for RacingWheel. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windows.gaming.input/racing_wheel.c | 100 +++++++++++++++++++++++++++++++ 1 file changed, 100 insertions(+) diff --git a/dlls/windows.gaming.input/racing_wheel.c b/dlls/windows.gaming.input/racing_wheel.c index a8d20bc26ff..458f79a2aa0 100644 --- a/dlls/windows.gaming.input/racing_wheel.c +++ b/dlls/windows.gaming.input/racing_wheel.c @@ -24,9 +24,42 @@ WINE_DEFAULT_DEBUG_CHANNEL(input); +static CRITICAL_SECTION racing_wheel_cs; +static CRITICAL_SECTION_DEBUG racing_wheel_cs_debug = +{ + 0, 0, &racing_wheel_cs, + { &racing_wheel_cs_debug.ProcessLocksList, &racing_wheel_cs_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": racing_wheel_cs") } +}; +static CRITICAL_SECTION racing_wheel_cs = { &racing_wheel_cs_debug, -1, 0, 0, 0, 0 }; + +static IVector_RacingWheel *racing_wheels; +static struct list racing_wheel_added_handlers = LIST_INIT( racing_wheel_added_handlers ); +static struct list racing_wheel_removed_handlers = LIST_INIT( racing_wheel_removed_handlers ); + +static HRESULT init_racing_wheels(void) +{ + static const struct vector_iids iids = + { + .vector = &IID_IVector_RacingWheel, + .view = &IID_IVectorView_RacingWheel, + .iterable = &IID_IIterable_RacingWheel, + .iterator = &IID_IIterator_RacingWheel, + }; + HRESULT hr; + + EnterCriticalSection( &racing_wheel_cs ); + if (racing_wheels) hr = S_OK; + else hr = vector_create( &iids, (void **)&racing_wheels ); + LeaveCriticalSection( &racing_wheel_cs ); + + return hr; +} + struct racing_wheel_statics { IActivationFactory IActivationFactory_iface; + IRacingWheelStatics IRacingWheelStatics_iface; LONG ref; }; @@ -50,6 +83,12 @@ static HRESULT WINAPI factory_QueryInterface( IActivationFactory *iface, REFIID return S_OK; } + if (IsEqualGUID( iid, &IID_IRacingWheelStatics )) + { + IInspectable_AddRef( (*out = &impl->IRacingWheelStatics_iface) ); + return S_OK; + } + FIXME( "%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid( iid ) ); *out = NULL; return E_NOINTERFACE; @@ -108,9 +147,70 @@ static const struct IActivationFactoryVtbl factory_vtbl = factory_ActivateInstance, }; +DEFINE_IINSPECTABLE( statics, IRacingWheelStatics, struct racing_wheel_statics, IActivationFactory_iface ) + +static HRESULT WINAPI statics_add_RacingWheelAdded( IRacingWheelStatics *iface, IEventHandler_RacingWheel *handler, + EventRegistrationToken *token ) +{ + TRACE( "iface %p, handler %p, token %p.\n", iface, handler, token ); + if (!handler) return E_INVALIDARG; + return event_handlers_append( &racing_wheel_added_handlers, (IEventHandler_IInspectable *)handler, token ); +} + +static HRESULT WINAPI statics_remove_RacingWheelAdded( IRacingWheelStatics *iface, EventRegistrationToken token ) +{ + TRACE( "iface %p, token %#I64x.\n", iface, token.value ); + return event_handlers_remove( &racing_wheel_added_handlers, &token ); +} + +static HRESULT WINAPI statics_add_RacingWheelRemoved( IRacingWheelStatics *iface, IEventHandler_RacingWheel *handler, + EventRegistrationToken *token ) +{ + TRACE( "iface %p, handler %p, token %p.\n", iface, handler, token ); + if (!handler) return E_INVALIDARG; + return event_handlers_append( &racing_wheel_removed_handlers, (IEventHandler_IInspectable *)handler, token ); +} + +static HRESULT WINAPI statics_remove_RacingWheelRemoved( IRacingWheelStatics *iface, EventRegistrationToken token ) +{ + TRACE( "iface %p, token %#I64x.\n", iface, token.value ); + return event_handlers_remove( &racing_wheel_removed_handlers, &token ); +} + +static HRESULT WINAPI statics_get_RacingWheels( IRacingWheelStatics *iface, IVectorView_RacingWheel **value ) +{ + HRESULT hr; + + TRACE( "iface %p, value %p.\n", iface, value ); + + EnterCriticalSection( &racing_wheel_cs ); + if (SUCCEEDED(hr = init_racing_wheels())) hr = IVector_RacingWheel_GetView( racing_wheels, value ); + LeaveCriticalSection( &racing_wheel_cs ); + + return hr; +} + +static const struct IRacingWheelStaticsVtbl statics_vtbl = +{ + statics_QueryInterface, + statics_AddRef, + statics_Release, + /* IInspectable methods */ + statics_GetIids, + statics_GetRuntimeClassName, + statics_GetTrustLevel, + /* IRacingWheelStatics methods */ + statics_add_RacingWheelAdded, + statics_remove_RacingWheelAdded, + statics_add_RacingWheelRemoved, + statics_remove_RacingWheelRemoved, + statics_get_RacingWheels, +}; + static struct racing_wheel_statics racing_wheel_statics = { {&factory_vtbl}, + {&statics_vtbl}, 1, };

1 0

Rémi Bernon : windows.gaming.input: Implement ICustomGameControllerFactory interface for RacingWheel.
by Alexandre Julliard April 22, 2022

April 22, 2022

Module: wine Branch: master Commit: acc2b32a5e81357c7cf37ccadaa7fd0d31e52773 URL: https://source.winehq.org/git/wine.git/?a=commit;h=acc2b32a5e81357c7cf37cca… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Apr 22 11:49:07 2022 +0200 windows.gaming.input: Implement ICustomGameControllerFactory interface for RacingWheel. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windows.gaming.input/main.c | 2 +- dlls/windows.gaming.input/private.h | 2 +- dlls/windows.gaming.input/racing_wheel.c | 83 +++++++++++++++++++++++++++++++- 3 files changed, 84 insertions(+), 3 deletions(-) diff --git a/dlls/windows.gaming.input/main.c b/dlls/windows.gaming.input/main.c index 2d8f6a340b0..21808d9c2ad 100644 --- a/dlls/windows.gaming.input/main.c +++ b/dlls/windows.gaming.input/main.c @@ -181,7 +181,7 @@ HRESULT WINAPI DllGetActivationFactory( HSTRING class_str, IActivationFactory ** if (!wcscmp( buffer, RuntimeClass_Windows_Gaming_Input_Gamepad )) ICustomGameControllerFactory_QueryInterface( gamepad_factory, &IID_IActivationFactory, (void **)factory ); if (!wcscmp( buffer, RuntimeClass_Windows_Gaming_Input_RacingWheel )) - IActivationFactory_QueryInterface( racing_wheel_factory, &IID_IActivationFactory, (void **)factory ); + ICustomGameControllerFactory_QueryInterface( racing_wheel_factory, &IID_IActivationFactory, (void **)factory ); if (!wcscmp( buffer, RuntimeClass_Windows_Gaming_Input_Custom_GameControllerFactoryManager )) IGameControllerFactoryManagerStatics2_QueryInterface( manager_factory, &IID_IActivationFactory, (void **)factory ); diff --git a/dlls/windows.gaming.input/private.h b/dlls/windows.gaming.input/private.h index 73fab47a770..58b2040d3de 100644 --- a/dlls/windows.gaming.input/private.h +++ b/dlls/windows.gaming.input/private.h @@ -42,7 +42,7 @@ extern HINSTANCE windows_gaming_input; extern ICustomGameControllerFactory *controller_factory; extern ICustomGameControllerFactory *gamepad_factory; -extern IActivationFactory *racing_wheel_factory; +extern ICustomGameControllerFactory *racing_wheel_factory; extern IGameControllerFactoryManagerStatics2 *manager_factory; struct vector_iids diff --git a/dlls/windows.gaming.input/racing_wheel.c b/dlls/windows.gaming.input/racing_wheel.c index 458f79a2aa0..818e46bab42 100644 --- a/dlls/windows.gaming.input/racing_wheel.c +++ b/dlls/windows.gaming.input/racing_wheel.c @@ -60,6 +60,7 @@ struct racing_wheel_statics { IActivationFactory IActivationFactory_iface; IRacingWheelStatics IRacingWheelStatics_iface; + ICustomGameControllerFactory ICustomGameControllerFactory_iface; LONG ref; }; @@ -89,6 +90,12 @@ static HRESULT WINAPI factory_QueryInterface( IActivationFactory *iface, REFIID return S_OK; } + if (IsEqualGUID( iid, &IID_ICustomGameControllerFactory )) + { + IInspectable_AddRef( (*out = &impl->ICustomGameControllerFactory_iface) ); + return S_OK; + } + FIXME( "%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid( iid ) ); *out = NULL; return E_NOINTERFACE; @@ -207,11 +214,85 @@ static const struct IRacingWheelStaticsVtbl statics_vtbl = statics_get_RacingWheels, }; +DEFINE_IINSPECTABLE( controller_factory, ICustomGameControllerFactory, struct racing_wheel_statics, IActivationFactory_iface ) + +static HRESULT WINAPI controller_factory_CreateGameController( ICustomGameControllerFactory *iface, IGameControllerProvider *provider, + IInspectable **value ) +{ + FIXME( "iface %p, provider %p, value %p stub!.\n", iface, provider, value ); + return E_NOTIMPL; +} + +static HRESULT WINAPI controller_factory_OnGameControllerAdded( ICustomGameControllerFactory *iface, IGameController *value ) +{ + IRacingWheel *racing_wheel; + HRESULT hr; + + TRACE( "iface %p, value %p.\n", iface, value ); + + if (FAILED(hr = IGameController_QueryInterface( value, &IID_IRacingWheel, (void **)&racing_wheel ))) + return hr; + event_handlers_notify( &racing_wheel_added_handlers, (IInspectable *)racing_wheel ); + IRacingWheel_Release( racing_wheel ); + + return S_OK; +} + +static HRESULT WINAPI controller_factory_OnGameControllerRemoved( ICustomGameControllerFactory *iface, IGameController *value ) +{ + IRacingWheel *racing_wheel; + BOOLEAN found; + UINT32 index; + HRESULT hr; + + TRACE( "iface %p, value %p.\n", iface, value ); + + if (FAILED(hr = IGameController_QueryInterface( value, &IID_IRacingWheel, (void **)&racing_wheel ))) + return hr; + + EnterCriticalSection( &racing_wheel_cs ); + if (SUCCEEDED(hr = init_racing_wheels())) + { + if (FAILED(hr = IVector_RacingWheel_IndexOf( racing_wheels, racing_wheel, &index, &found )) || !found) + WARN( "Could not find RacingWheel %p, hr %#lx!\n", racing_wheel, hr ); + else + hr = IVector_RacingWheel_RemoveAt( racing_wheels, index ); + } + LeaveCriticalSection( &racing_wheel_cs ); + + if (FAILED(hr)) + WARN( "Failed to remove RacingWheel %p, hr %#lx!\n", racing_wheel, hr ); + else if (found) + { + TRACE( "Removed RacingWheel %p.\n", racing_wheel ); + event_handlers_notify( &racing_wheel_removed_handlers, (IInspectable *)racing_wheel ); + } + IRacingWheel_Release( racing_wheel ); + + return S_OK; +} + +static const struct ICustomGameControllerFactoryVtbl controller_factory_vtbl = +{ + controller_factory_QueryInterface, + controller_factory_AddRef, + controller_factory_Release, + /* IInspectable methods */ + controller_factory_GetIids, + controller_factory_GetRuntimeClassName, + controller_factory_GetTrustLevel, + /* ICustomGameControllerFactory methods */ + controller_factory_CreateGameController, + controller_factory_OnGameControllerAdded, + controller_factory_OnGameControllerRemoved, +}; + static struct racing_wheel_statics racing_wheel_statics = { {&factory_vtbl}, {&statics_vtbl}, + {&controller_factory_vtbl}, 1, }; -IActivationFactory *racing_wheel_factory = &racing_wheel_statics.IActivationFactory_iface; +ICustomGameControllerFactory *racing_wheel_factory = &racing_wheel_statics.ICustomGameControllerFactory_iface;

1 0

Alexandre Julliard : include: Avoid Windows types in CodeView structure definitions.
by Alexandre Julliard April 22, 2022

April 22, 2022

Module: wine Branch: master Commit: 53ab4c53857c01424cd20b18e6b10e66b8d03d6b URL: https://source.winehq.org/git/wine.git/?a=commit;h=53ab4c53857c01424cd20b18… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 22 16:01:34 2022 +0200 include: Avoid Windows types in CodeView structure definitions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dbghelp_private.h | 4 +- dlls/dbghelp/msc.c | 33 ++-- include/wine/mscvpdb.h | 364 ++++++++++++++++++++--------------------- tools/winedump/debug.c | 12 +- 4 files changed, 206 insertions(+), 207 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=53ab4c53857c01424cd2…

1 0

Alexandre Julliard : winedump: Fix some incorrect uses of Unix 'long' type.
by Alexandre Julliard April 22, 2022

April 22, 2022

Module: wine Branch: master Commit: e1e6d18a61ecbec34498e242115bc75bbc0f9aee URL: https://source.winehq.org/git/wine.git/?a=commit;h=e1e6d18a61ecbec34498e242… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 22 16:09:43 2022 +0200 winedump: Fix some incorrect uses of Unix 'long' type. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winedump/debug.c | 30 +++++++++++++++--------------- tools/winedump/le.c | 46 +++++++++++++++++++++++----------------------- 2 files changed, 38 insertions(+), 38 deletions(-) diff --git a/tools/winedump/debug.c b/tools/winedump/debug.c index f528a6f6e89..cd1e943b40f 100644 --- a/tools/winedump/debug.c +++ b/tools/winedump/debug.c @@ -228,7 +228,7 @@ static BOOL dump_cv_sst_src_module(const OMFDirEntry* omfde) { int i, j; const BYTE* rawdata; - const unsigned long* seg_info_dw; + const unsigned int *seg_info_dw; const unsigned short* seg_info_w; unsigned ofs; const OMFSourceModule* sourceModule; @@ -250,24 +250,24 @@ static BOOL dump_cv_sst_src_module(const OMFDirEntry* omfde) /* FIXME: check ptr validity */ seg_info_dw = (const void*)((const char*)(sourceModule + 1) + - sizeof(unsigned long) * (sourceModule->cFile - 1)); + sizeof(unsigned int) * (sourceModule->cFile - 1)); seg_info_w = (const unsigned short*)(&seg_info_dw[sourceModule->cSeg * 2]); for (i = 0; i < sourceModule->cSeg; i++) { - printf (" Segment #%2d start = 0x%lx, end = 0x%lx, seg index = %u\n", + printf (" Segment #%2d start = 0x%x, end = 0x%x, seg index = %u\n", i + 1, seg_info_dw[i * 2], seg_info_dw[(i * 2) + 1], seg_info_w[i]); } - ofs = sizeof(OMFSourceModule) + sizeof(unsigned long) * (sourceModule->cFile - 1) + - sourceModule->cSeg * (2 * sizeof(unsigned long) + sizeof(unsigned short)); + ofs = sizeof(OMFSourceModule) + sizeof(unsigned int) * (sourceModule->cFile - 1) + + sourceModule->cSeg * (2 * sizeof(unsigned int) + sizeof(unsigned short)); ofs = (ofs + 3) & ~3; /* the OMFSourceFile is quite unpleasant to use: * we have first: * unsigned short number of segments * unsigned short reserved - * unsigned long baseSrcLn[# segments] - * unsigned long offset[2 * #segments] + * unsigned int baseSrcLn[# segments] + * unsigned int offset[2 * #segments] * odd indices are start offsets * even indices are end offsets * unsigned char string length for file name @@ -276,16 +276,16 @@ static BOOL dump_cv_sst_src_module(const OMFDirEntry* omfde) /* FIXME: check ptr validity */ sourceFile = (const void*)(rawdata + ofs); seg_info_dw = (const void*)((const char*)sourceFile + 2 * sizeof(unsigned short) + - sourceFile->cSeg * sizeof(unsigned long)); + sourceFile->cSeg * sizeof(unsigned int)); - ofs += 2 * sizeof(unsigned short) + 3 * sourceFile->cSeg * sizeof(unsigned long); + ofs += 2 * sizeof(unsigned short) + 3 * sourceFile->cSeg * sizeof(unsigned int); printf(" File table: %.*s\n", *(const BYTE*)((const char*)sourceModule + ofs), (const char*)sourceModule + ofs + 1); for (i = 0; i < sourceFile->cSeg; i++) { - printf (" Segment #%2d start = 0x%lx, end = 0x%lx, offset = 0x%x\n", + printf (" Segment #%2d start = 0x%x, end = 0x%x, offset = 0x%x\n", i + 1, seg_info_dw[i * 2], seg_info_dw[(i * 2) + 1], sourceFile->baseSrcLn[i]); } /* add file name length */ @@ -303,11 +303,11 @@ static BOOL dump_cv_sst_src_module(const OMFDirEntry* omfde) for (j = 0; j < sourceLine->cLnOff; j++) { - printf (" Pair #%2d: offset = [0x%8lx], linenumber = %d\n", + printf (" Pair #%2d: offset = [0x%8x], linenumber = %d\n", j + 1, seg_info_dw[j], seg_info_w[j]); } ofs += 2 * sizeof(unsigned short) + - sourceLine->cLnOff * (sizeof(unsigned long) + sizeof(unsigned short)); + sourceLine->cLnOff * (sizeof(unsigned int) + sizeof(unsigned short)); ofs = (ofs + 3) & ~3; } @@ -608,12 +608,12 @@ struct stab_nlist { char* n_name; struct stab_nlist* n_next; - long n_strx; + int n_strx; } n_un; unsigned char n_type; char n_other; short n_desc; - unsigned long n_value; + unsigned int n_value; }; static const char * const stabs_defs[] = { @@ -708,7 +708,7 @@ void dump_stabs(const void* pv_stabs, unsigned szstabs, const char* stabstr, sprintf(n_buffer, "<0x%02x>", stab_ptr->n_type); else sprintf(n_buffer, "%-6s", stabs_defs[stab_ptr->n_type / 2]); - printf("%4d %s %-8x % 6d %-8lx %-6lx %s\n", + printf("%4d %s %-8x % 6d %-8x %-6x %s\n", i, n_buffer, stab_ptr->n_other, stab_ptr->n_desc, stab_ptr->n_value, stab_ptr->n_un.n_strx, ptr); } diff --git a/tools/winedump/le.c b/tools/winedump/le.c index 14e3e84185e..341d9540edc 100644 --- a/tools/winedump/le.c +++ b/tools/winedump/le.c @@ -30,11 +30,11 @@ struct o32_obj { - unsigned long o32_size; - unsigned long o32_base; - unsigned long o32_flags; - unsigned long o32_pagemap; - unsigned long o32_mapsize; + unsigned int o32_size; + unsigned int o32_base; + unsigned int o32_flags; + unsigned int o32_pagemap; + unsigned int o32_mapsize; char o32_name[4]; }; @@ -53,28 +53,28 @@ struct b32_bundle struct vxd_descriptor { - unsigned long next; + unsigned int next; unsigned short sdk_version; unsigned short device_number; unsigned char version_major; unsigned char version_minor; unsigned short flags; char name[8]; - unsigned long init_order; - unsigned long ctrl_ofs; - unsigned long v86_ctrl_ofs; - unsigned long pm_ctrl_ofs; - unsigned long v86_ctrl_csip; - unsigned long pm_ctrl_csip; - unsigned long rm_ref_data; - unsigned long service_table_ofs; - unsigned long service_table_size; - unsigned long win32_service_table_ofs; - unsigned long prev; - unsigned long size; - unsigned long reserved0; - unsigned long reserved1; - unsigned long reserved2; + unsigned int init_order; + unsigned int ctrl_ofs; + unsigned int v86_ctrl_ofs; + unsigned int pm_ctrl_ofs; + unsigned int v86_ctrl_csip; + unsigned int pm_ctrl_csip; + unsigned int rm_ref_data; + unsigned int service_table_ofs; + unsigned int service_table_size; + unsigned int win32_service_table_ofs; + unsigned int prev; + unsigned int size; + unsigned int reserved0; + unsigned int reserved1; + unsigned int reserved2; }; static inline WORD get_word( const BYTE *ptr ) @@ -234,7 +234,7 @@ static void dump_le_objects( const IMAGE_VXD_HEADER *le ) const struct o32_map *pmap=0; printf(" Obj. Rel.Base Codesize Flags Tableidx Tablesize Name\n"); - printf(" %04X %08lx %08lx %08lx %08lx %08lx ", i + 1, + printf(" %04X %08x %08x %08x %08x %08x ", i + 1, pobj->o32_base, pobj->o32_size, pobj->o32_flags, pobj->o32_pagemap, pobj->o32_mapsize); for (j = 0; j < 4; j++) @@ -271,7 +271,7 @@ static void dump_le_objects( const IMAGE_VXD_HEADER *le ) pmap = &(pmap[pobj->o32_pagemap - 1]); for (j = 0; j < pobj->o32_mapsize; j++) { - printf(" %08lx %06x %02x\n", + printf(" %08x %06x %02x\n", pobj->o32_pagemap + j, (pmap->o32_pagedataoffset << 8) + pmap->o32_pagesize, (int)pmap->o32_pageflags);

1 0