wine-commits April 2022

wine-commits@winehq.org

2 participants
1024 discussions

Jacek Caban : win32u: Move NtUserSetMenuDefaultItem implementation from user32.
by Alexandre Julliard 22 Apr '22

22 Apr '22

Module: wine Branch: master Commit: 172ae86945cb861d672cba37790e65782dac722f URL: https://source.winehq.org/git/wine.git/?a=commit;h=172ae86945cb861d672cba37… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 22 14:45:25 2022 +0200 win32u: Move NtUserSetMenuDefaultItem 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/mdi.c | 2 +- dlls/user32/menu.c | 58 +------------------------------------------------ dlls/user32/user32.spec | 2 +- dlls/win32u/menu.c | 48 ++++++++++++++++++++++++++++++++++++++++ dlls/win32u/syscall.c | 1 + dlls/win32u/win32u.spec | 2 +- dlls/wow64win/syscall.h | 1 + dlls/wow64win/user.c | 9 ++++++++ include/ntuser.h | 1 + 9 files changed, 64 insertions(+), 60 deletions(-) diff --git a/dlls/user32/mdi.c b/dlls/user32/mdi.c index 69957af1380..df470f74762 100644 --- a/dlls/user32/mdi.c +++ b/dlls/user32/mdi.c @@ -894,7 +894,7 @@ static BOOL MDI_AugmentFrameMenu( HWND frame, HWND hChild ) NtUserEnableMenuItem(hSysPopup, SC_SIZE, MF_BYCOMMAND | MF_GRAYED); NtUserEnableMenuItem(hSysPopup, SC_MOVE, MF_BYCOMMAND | MF_GRAYED); NtUserEnableMenuItem(hSysPopup, SC_MAXIMIZE, MF_BYCOMMAND | MF_GRAYED); - SetMenuDefaultItem(hSysPopup, SC_CLOSE, FALSE); + NtUserSetMenuDefaultItem(hSysPopup, SC_CLOSE, FALSE); /* redraw menu */ DrawMenuBar(frame); diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index 36aed74c6c6..6fb9422cf9d 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -375,7 +375,7 @@ static HMENU MENU_CopySysPopup(BOOL mdi) SetMenuItemInfoW( hMenu, SC_MAXIMIZE, FALSE, &miteminfo); miteminfo.hbmpItem = HBMMENU_POPUP_MINIMIZE; SetMenuItemInfoW( hMenu, SC_MINIMIZE, FALSE, &miteminfo); - SetMenuDefaultItem(hMenu, SC_CLOSE, FALSE); + NtUserSetMenuDefaultItem( hMenu, SC_CLOSE, FALSE ); } else ERR("Unable to load default system menu\n" ); @@ -4875,62 +4875,6 @@ BOOL WINAPI SetMenuItemInfoW(HMENU hmenu, UINT item, BOOL bypos, return ret; } -static BOOL set_menu_default_item(POPUPMENU *menu, UINT uItem, UINT bypos) -{ - unsigned int i; - MENUITEM *item; - - /* reset all default-item flags */ - item = menu->items; - for (i = 0; i < menu->nItems; i++, item++) - { - item->fState &= ~MFS_DEFAULT; - } - - /* no default item */ - if (-1 == uItem) - return TRUE; - - item = menu->items; - if ( bypos ) - { - if ( uItem >= menu->nItems ) return FALSE; - item[uItem].fState |= MFS_DEFAULT; - return TRUE; - } - else - { - for (i = 0; i < menu->nItems; i++, item++) - { - if (item->wID == uItem) - { - item->fState |= MFS_DEFAULT; - return TRUE; - } - } - } - - return FALSE; -} - -/********************************************************************** - * SetMenuDefaultItem (USER32.@) - * - */ -BOOL WINAPI SetMenuDefaultItem(HMENU hmenu, UINT uItem, UINT bypos) -{ - POPUPMENU *menu; - BOOL ret; - - TRACE("(%p,%d,%d)\n", hmenu, uItem, bypos); - - if (!(menu = grab_menu_ptr(hmenu))) return FALSE; - ret = set_menu_default_item(menu, uItem, bypos); - release_menu_ptr(menu); - - return ret; -} - /********************************************************************** * GetMenuDefaultItem (USER32.@) */ diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index 727a21a5935..f8683a78426 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -680,7 +680,7 @@ @ stdcall SetLogonNotifyWindow(long long) @ stdcall SetMenu(long long) NtUserSetMenu @ stdcall SetMenuContextHelpId(long long) NtUserSetMenuContextHelpId -@ stdcall SetMenuDefaultItem(long long long) +@ stdcall SetMenuDefaultItem(long long long) NtUserSetMenuDefaultItem @ stdcall SetMenuInfo(long ptr) @ stdcall SetMenuItemBitmaps(long long long long long) @ stdcall SetMenuItemInfoA(long long long ptr) diff --git a/dlls/win32u/menu.c b/dlls/win32u/menu.c index dee68a95aa2..5d1a5ec12d6 100644 --- a/dlls/win32u/menu.c +++ b/dlls/win32u/menu.c @@ -541,3 +541,51 @@ BOOL WINAPI NtUserSetMenuContextHelpId( HMENU handle, DWORD id ) release_menu_ptr( menu ); return TRUE; } + +/********************************************************************** + * NtUserSetMenuDefaultItem (win32u.@) + */ +BOOL WINAPI NtUserSetMenuDefaultItem( HMENU handle, UINT item, UINT bypos ) +{ + MENUITEM *menu_item; + POPUPMENU *menu; + unsigned int i; + BOOL ret = FALSE; + + TRACE( "(%p,%d,%d)\n", handle, item, bypos ); + + if (!(menu = grab_menu_ptr( handle ))) return FALSE; + + /* reset all default-item flags */ + menu_item = menu->items; + for (i = 0; i < menu->nItems; i++, menu_item++) + { + menu_item->fState &= ~MFS_DEFAULT; + } + + if (item != -1) + { + menu_item = menu->items; + + if (bypos) + { + ret = item < menu->nItems; + if (ret) menu->items[item].fState |= MFS_DEFAULT; + } + else + { + for (i = 0; i < menu->nItems; i++) + { + if (menu->items[i].wID == item) + { + menu->items[i].fState |= MFS_DEFAULT; + ret = TRUE; + } + } + } + } + else ret = TRUE; + + release_menu_ptr( menu ); + return ret; +} diff --git a/dlls/win32u/syscall.c b/dlls/win32u/syscall.c index d543465d4d7..0be0863b992 100644 --- a/dlls/win32u/syscall.c +++ b/dlls/win32u/syscall.c @@ -157,6 +157,7 @@ static void * const syscalls[] = NtUserRemoveProp, NtUserSetKeyboardState, NtUserSetMenuContextHelpId, + NtUserSetMenuDefaultItem, NtUserSetObjectInformation, NtUserSetProcessDpiAwarenessContext, NtUserSetProcessWindowStation, diff --git a/dlls/win32u/win32u.spec b/dlls/win32u/win32u.spec index cfbf4ac1ad1..f3e2f9ca2f5 100644 --- a/dlls/win32u/win32u.spec +++ b/dlls/win32u/win32u.spec @@ -1208,7 +1208,7 @@ @ stub NtUserSetManipulationInputTarget @ stdcall NtUserSetMenu(long long) @ stdcall -syscall NtUserSetMenuContextHelpId(long long) -@ stub NtUserSetMenuDefaultItem +@ stdcall -syscall NtUserSetMenuDefaultItem(long long long) @ stub NtUserSetMenuFlagRtoL @ stub NtUserSetMirrorRendering @ stub NtUserSetMonitorWorkArea diff --git a/dlls/wow64win/syscall.h b/dlls/wow64win/syscall.h index f3cee62b577..124506bdb05 100644 --- a/dlls/wow64win/syscall.h +++ b/dlls/wow64win/syscall.h @@ -144,6 +144,7 @@ SYSCALL_ENTRY( NtUserRemoveProp ) \ SYSCALL_ENTRY( NtUserSetKeyboardState ) \ SYSCALL_ENTRY( NtUserSetMenuContextHelpId ) \ + SYSCALL_ENTRY( NtUserSetMenuDefaultItem ) \ SYSCALL_ENTRY( NtUserSetObjectInformation ) \ SYSCALL_ENTRY( NtUserSetProcessDpiAwarenessContext ) \ SYSCALL_ENTRY( NtUserSetProcessWindowStation ) \ diff --git a/dlls/wow64win/user.c b/dlls/wow64win/user.c index 38905fd8a57..3e8004b005c 100644 --- a/dlls/wow64win/user.c +++ b/dlls/wow64win/user.c @@ -659,6 +659,15 @@ NTSTATUS WINAPI wow64_NtUserSetMenuContextHelpId( UINT *args ) return NtUserSetMenuContextHelpId( menu, id ); } +NTSTATUS WINAPI wow64_NtUserSetMenuDefaultItem( UINT *args ) +{ + HMENU handle = get_handle( &args ); + UINT item = get_ulong( &args ); + UINT bypos = get_ulong( &args ); + + return NtUserSetMenuDefaultItem( handle, item, bypos ); +} + NTSTATUS WINAPI wow64_NtUserThunkedMenuInfo( UINT *args ) { HMENU menu = get_handle( &args ); diff --git a/include/ntuser.h b/include/ntuser.h index cdac581f193..7fc52979e7e 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -556,6 +556,7 @@ BOOL WINAPI NtUserSetKeyboardState( BYTE *state ); BOOL WINAPI NtUserSetLayeredWindowAttributes( HWND hwnd, COLORREF key, BYTE alpha, DWORD flags ); BOOL WINAPI NtUserSetMenu( HWND hwnd, HMENU menu ); BOOL WINAPI NtUserSetMenuContextHelpId( HMENU handle, DWORD id ); +BOOL WINAPI NtUserSetMenuDefaultItem( HMENU handle, UINT item, UINT bypos ); HWND WINAPI NtUserSetParent( HWND hwnd, HWND parent ); BOOL WINAPI NtUserSetProcessDpiAwarenessContext( ULONG awareness, ULONG unknown ); BOOL WINAPI NtUserSetProcessWindowStation( HWINSTA handle );

1 0

Jacek Caban : win32u: Move NtUserThunkedMenuInfo implementation from user32.
by Alexandre Julliard 22 Apr '22

22 Apr '22

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

Alexandre Julliard : winedump: Build with nameless unions/structs.
by Alexandre Julliard 22 Apr '22

22 Apr '22

Module: wine Branch: master Commit: 4b865129a5edc4d94d898782697fe15350e98fc8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4b865129a5edc4d94d898782… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 22 17:02:09 2022 +0200 winedump: Build with nameless unions/structs. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winedump/lib.c | 4 +- tools/winedump/minidump.c | 30 ++++--- tools/winedump/pdb.c | 2 - tools/winedump/pe.c | 193 +++++++++++++++++++++++----------------------- 4 files changed, 110 insertions(+), 119 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4b865129a5edc4d94d89…

1 0

Alexandre Julliard : winedump: Enable compilation with long types.
by Alexandre Julliard 22 Apr '22

22 Apr '22

Module: wine Branch: master Commit: fdd0ad593935bb4954423b77c1c32ccf6b531f99 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fdd0ad593935bb4954423b77… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 22 16:48:00 2022 +0200 winedump: Enable compilation with long types. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winedump/Makefile.in | 1 - tools/winedump/debug.c | 10 ++-- tools/winedump/dos.c | 2 +- tools/winedump/emf.c | 96 ++++++++++++++++---------------- tools/winedump/le.c | 135 +++++++++++++++------------------------------ tools/winedump/lib.c | 4 +- tools/winedump/mf.c | 4 +- tools/winedump/minidump.c | 135 +++++++++++++++++++++------------------------ tools/winedump/ne.c | 4 +- tools/winedump/pdb.c | 2 +- tools/winedump/pe.c | 98 ++++++++++++++++---------------- 11 files changed, 220 insertions(+), 271 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=fdd0ad593935bb495442…

1 0

Alexandre Julliard : winedump: Remove unused variables.
by Alexandre Julliard 22 Apr '22

22 Apr '22

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

Alexandre Julliard : winedump: Avoid using DWORD in private definitions.
by Alexandre Julliard 22 Apr '22

22 Apr '22

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: Fix some incorrect uses of Unix 'long' type.
by Alexandre Julliard 22 Apr '22

22 Apr '22

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

Alexandre Julliard : include: Avoid Windows types in CodeView structure definitions.
by Alexandre Julliard 22 Apr '22

22 Apr '22

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: Add support for dumping locale.nls.
by Alexandre Julliard 22 Apr '22

22 Apr '22

Module: wine Branch: master Commit: 6f04c33c040f0aa5eb92f807103f454a983215a5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6f04c33c040f0aa5eb92f807… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 22 15:25:26 2022 +0200 winedump: Add support for dumping locale.nls. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winedump/nls.c | 542 ++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 535 insertions(+), 7 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6f04c33c040f0aa5eb92…

1 0

Alex Henrie : kernel32: Fix percentage calculation in GetSystemPowerStatus.
by Alexandre Julliard 22 Apr '22

22 Apr '22

Module: wine Branch: master Commit: 8a5d8d6cf9a1c405d8b8ef6ca19a102534b64a4f URL: https://source.winehq.org/git/wine.git/?a=commit;h=8a5d8d6cf9a1c405d8b8ef6c… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Fri Apr 22 02:12:53 2022 -0600 kernel32: Fix percentage calculation in GetSystemPowerStatus. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/powermgnt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/powermgnt.c b/dlls/kernel32/powermgnt.c index ca62019b256..ae83de3c523 100644 --- a/dlls/kernel32/powermgnt.c +++ b/dlls/kernel32/powermgnt.c @@ -63,7 +63,7 @@ BOOL WINAPI GetSystemPowerStatus(LPSYSTEM_POWER_STATUS ps) if (bs.BatteryPresent) { - ps->BatteryLifePercent = bs.MaxCapacity ? bs.RemainingCapacity / bs.MaxCapacity : 100; + ps->BatteryLifePercent = bs.MaxCapacity ? 100 * bs.RemainingCapacity / bs.MaxCapacity : 100; ps->BatteryLifeTime = bs.EstimatedTime; if (!bs.Charging && (LONG)bs.Rate < 0) ps->BatteryFullLifeTime = 3600 * bs.MaxCapacity / -(LONG)bs.Rate;

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2022