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

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 : 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: 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: 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: 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

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

Huw Davies : winealsa: Implement Wow64 mmdevapi entry points in the Unix libraray.
by Alexandre Julliard 22 Apr '22

22 Apr '22

Module: wine Branch: master Commit: aed23f1928b2bd0fe21e7f8353a63cf7a373db2b URL: https://source.winehq.org/git/wine.git/?a=commit;h=aed23f1928b2bd0fe21e7f83… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Apr 22 08:37:57 2022 +0100 winealsa: Implement Wow64 mmdevapi entry points in the Unix libraray. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winealsa.drv/alsa.c | 408 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 408 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=aed23f1928b2bd0fe21e…

1 0

Huw Davies : winealsa: Implement Wow64 midi entry points in the Unix library.
by Alexandre Julliard 22 Apr '22

22 Apr '22

Module: wine Branch: master Commit: a1fb139fac5c85dc58dc6ddee10776a09c7293bd URL: https://source.winehq.org/git/wine.git/?a=commit;h=a1fb139fac5c85dc58dc6dde… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Apr 22 08:37:58 2022 +0100 winealsa: Implement Wow64 midi entry points in the Unix library. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winealsa.drv/alsa.c | 6 +- dlls/winealsa.drv/alsamidi.c | 354 +++++++++++++++++++++++++++++++++++++++++++ dlls/winealsa.drv/unixlib.h | 6 + 3 files changed, 363 insertions(+), 3 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a1fb139fac5c85dc58dc…

1 0

Zhiyi Zhang : include: Add windows.foundation.metadata.idl.
by Alexandre Julliard 22 Apr '22

22 Apr '22

Module: wine Branch: master Commit: baf569c6a9227c4d24791ce39a9a805520879087 URL: https://source.winehq.org/git/wine.git/?a=commit;h=baf569c6a9227c4d24791ce3… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Apr 21 11:36:51 2022 +0800 include: Add windows.foundation.metadata.idl. Required for Iragon: Prologue. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/windows.foundation.metadata.idl | 75 +++++++++++++++++++++++++++++++++ 2 files changed, 76 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index dff2f341568..b0a1d0e4880 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -786,6 +786,7 @@ SOURCES = \ windows.devices.power.idl \ windows.foundation.collections.idl \ windows.foundation.idl \ + windows.foundation.metadata.idl \ windows.gaming.input.custom.idl \ windows.gaming.input.forcefeedback.idl \ windows.gaming.input.idl \ diff --git a/include/windows.foundation.metadata.idl b/include/windows.foundation.metadata.idl new file mode 100644 index 00000000000..9487737e071 --- /dev/null +++ b/include/windows.foundation.metadata.idl @@ -0,0 +1,75 @@ +/* + * Copyright 2022 Zhiyi Zhang 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 + */ + +#ifdef __WIDL__ +#pragma winrt ns_prefix +#endif + +import "inspectable.idl"; +import "asyncinfo.idl"; +import "eventtoken.idl"; +import "windowscontracts.idl"; +import "windows.foundation.idl"; + +namespace Windows.Foundation.Metadata +{ + typedef enum GCPressureAmount GCPressureAmount; + + interface IApiInformationStatics; + + runtimeclass ApiInformation; + + [ + contract(Windows.Foundation.FoundationContract, 1.0) + ] + enum GCPressureAmount + { + Low = 0, + Medium = 1, + High = 2 + }; + + [ + contract(Windows.Foundation.FoundationContract, 1.0), + exclusiveto(Windows.Foundation.Metadata.ApiInformation), + uuid(997439fe-f681-4a11-b416-c13a47e8ba36) + ] + interface IApiInformationStatics : IInspectable + { + HRESULT IsTypePresent([in] HSTRING type_name, [out, retval] boolean *value); + [overload("IsMethodPresent")] HRESULT IsMethodPresent([in] HSTRING type_name, [in] HSTRING method_name, [out, retval] boolean *value); + [overload("IsMethodPresent")] HRESULT IsMethodPresentWithArity([in] HSTRING type_name, [in] HSTRING method_name, [in] UINT32 parameter_count, [out, retval] boolean *value); + HRESULT IsEventPresent([in] HSTRING type_name, [in] HSTRING event_name, [out, retval] boolean *value); + HRESULT IsPropertyPresent([in] HSTRING type_name, [in] HSTRING property_name, [out, retval] boolean *value); + HRESULT IsReadOnlyPropertyPresent([in] HSTRING type_name, [in] HSTRING property_name, [out, retval] boolean *value); + HRESULT IsWriteablePropertyPresent([in] HSTRING type_name, [in] HSTRING property_name, [out, retval] boolean *value); + HRESULT IsEnumNamedValuePresent([in] HSTRING enum_type_name, [in] HSTRING value_name, [out, retval] boolean *value); + [overload("IsApiContractPresent")] HRESULT IsApiContractPresentByMajor([in] HSTRING contract_name, [in] UINT16 major_version, [out, retval] boolean *value); + [overload("IsApiContractPresent")] HRESULT IsApiContractPresentByMajorAndMinor([in] HSTRING contract_name, [in] UINT16 major_version, [in] UINT16 minor_version, [out, retval] boolean *value); + } + + [ + contract(Windows.Foundation.FoundationContract, 1.0), + marshaling_behavior(agile), + static(Windows.Foundation.Metadata.IApiInformationStatics, Windows.Foundation.FoundationContract, 1.0), + threading(both) + ] + runtimeclass ApiInformation + { + } +}

1 0

Zhiyi Zhang : wintypes: Add stub dll.
by Alexandre Julliard 22 Apr '22

22 Apr '22

Module: wine Branch: master Commit: cad1e213324f42143f3a439bf0450a373648ee48 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cad1e213324f42143f3a439b… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Apr 21 11:37:01 2022 +0800 wintypes: Add stub dll. Required for Iragon: Prologue. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 + configure.ac | 1 + dlls/wintypes/Makefile.in | 7 +++ dlls/wintypes/classes.idl | 23 +++++++ dlls/wintypes/main.c | 149 ++++++++++++++++++++++++++++++++++++++++++++ dlls/wintypes/wintypes.spec | 11 ++++ 6 files changed, 193 insertions(+) diff --git a/configure b/configure index 3ac0a8233fb..580c447bd8a 100755 --- a/configure +++ b/configure @@ -1446,6 +1446,7 @@ enable_winspool_drv enable_winsta enable_wintab32 enable_wintrust +enable_wintypes enable_winusb enable_wlanapi enable_wlanui @@ -21892,6 +21893,7 @@ wine_fn_config_makefile dlls/wintab32 enable_wintab32 wine_fn_config_makefile dlls/wintab32/tests enable_tests wine_fn_config_makefile dlls/wintrust enable_wintrust wine_fn_config_makefile dlls/wintrust/tests enable_tests +wine_fn_config_makefile dlls/wintypes enable_wintypes wine_fn_config_makefile dlls/winusb enable_winusb wine_fn_config_makefile dlls/wlanapi enable_wlanapi wine_fn_config_makefile dlls/wlanapi/tests enable_tests diff --git a/configure.ac b/configure.ac index 6cbc0a61be1..75292210bc4 100644 --- a/configure.ac +++ b/configure.ac @@ -3140,6 +3140,7 @@ WINE_CONFIG_MAKEFILE(dlls/wintab32) WINE_CONFIG_MAKEFILE(dlls/wintab32/tests) WINE_CONFIG_MAKEFILE(dlls/wintrust) WINE_CONFIG_MAKEFILE(dlls/wintrust/tests) +WINE_CONFIG_MAKEFILE(dlls/wintypes) WINE_CONFIG_MAKEFILE(dlls/winusb) WINE_CONFIG_MAKEFILE(dlls/wlanapi) WINE_CONFIG_MAKEFILE(dlls/wlanapi/tests) diff --git a/dlls/wintypes/Makefile.in b/dlls/wintypes/Makefile.in new file mode 100644 index 00000000000..aaa954322f7 --- /dev/null +++ b/dlls/wintypes/Makefile.in @@ -0,0 +1,7 @@ +MODULE = wintypes.dll +IMPORTS = combase + +C_SRCS = \ + main.c + +IDL_SRCS = classes.idl diff --git a/dlls/wintypes/classes.idl b/dlls/wintypes/classes.idl new file mode 100644 index 00000000000..d8ab31e69be --- /dev/null +++ b/dlls/wintypes/classes.idl @@ -0,0 +1,23 @@ +/* + * Runtime Classes for wintypes.dll + * + * Copyright 2022 Zhiyi Zhang 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 + */ + +#pragma makedep register + +#include "windows.foundation.metadata.idl" diff --git a/dlls/wintypes/main.c b/dlls/wintypes/main.c new file mode 100644 index 00000000000..e5fea2f7d30 --- /dev/null +++ b/dlls/wintypes/main.c @@ -0,0 +1,149 @@ +/* + * Copyright 2022 Zhiyi Zhang 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 <stdarg.h> + +#define COBJMACROS +#include "initguid.h" +#include "windef.h" +#include "winbase.h" +#include "winstring.h" +#include "wine/debug.h" +#include "objbase.h" + +#include "activation.h" + +WINE_DEFAULT_DEBUG_CHANNEL(wintypes); + +static const char *debugstr_hstring(HSTRING hstr) +{ + const WCHAR *str; + UINT32 len; + if (hstr && !((ULONG_PTR)hstr >> 16)) + return "(invalid)"; + str = WindowsGetStringRawBuffer(hstr, &len); + return wine_dbgstr_wn(str, len); +} + +struct wintypes +{ + IActivationFactory IActivationFactory_iface; + LONG ref; +}; + +static inline struct wintypes *impl_from_IActivationFactory(IActivationFactory *iface) +{ + return CONTAINING_RECORD(iface, struct wintypes, IActivationFactory_iface); +} + +static HRESULT STDMETHODCALLTYPE wintypes_QueryInterface(IActivationFactory *iface, REFIID iid, + void **out) +{ + TRACE("iface %p, iid %s, out %p stub!\n", iface, debugstr_guid(iid), out); + + if (IsEqualGUID(iid, &IID_IUnknown) + || IsEqualGUID(iid, &IID_IInspectable) + || IsEqualGUID(iid, &IID_IAgileObject) + || IsEqualGUID(iid, &IID_IActivationFactory)) + { + IUnknown_AddRef(iface); + *out = iface; + return S_OK; + } + + FIXME("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); + *out = NULL; + return E_NOINTERFACE; +} + +static ULONG STDMETHODCALLTYPE wintypes_AddRef(IActivationFactory *iface) +{ + struct wintypes *impl = impl_from_IActivationFactory(iface); + ULONG ref = InterlockedIncrement(&impl->ref); + TRACE("iface %p, ref %lu.\n", iface, ref); + return ref; +} + +static ULONG STDMETHODCALLTYPE wintypes_Release(IActivationFactory *iface) +{ + struct wintypes *impl = impl_from_IActivationFactory(iface); + ULONG ref = InterlockedDecrement(&impl->ref); + TRACE("iface %p, ref %lu.\n", iface, ref); + return ref; +} + +static HRESULT STDMETHODCALLTYPE wintypes_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 STDMETHODCALLTYPE wintypes_GetRuntimeClassName(IActivationFactory *iface, + HSTRING *class_name) +{ + FIXME("iface %p, class_name %p stub!\n", iface, class_name); + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE wintypes_GetTrustLevel(IActivationFactory *iface, + TrustLevel *trust_level) +{ + FIXME("iface %p, trust_level %p stub!\n", iface, trust_level); + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE wintypes_ActivateInstance(IActivationFactory *iface, + IInspectable **instance) +{ + FIXME("iface %p, instance %p stub!\n", iface, instance); + return E_NOTIMPL; +} + +static const struct IActivationFactoryVtbl activation_factory_vtbl = +{ + wintypes_QueryInterface, + wintypes_AddRef, + wintypes_Release, + /* IInspectable methods */ + wintypes_GetIids, + wintypes_GetRuntimeClassName, + wintypes_GetTrustLevel, + /* IActivationFactory methods */ + wintypes_ActivateInstance, +}; + +static struct wintypes wintypes = +{ + {&activation_factory_vtbl}, + 1 +}; + +HRESULT WINAPI DllGetClassObject(REFCLSID clsid, REFIID riid, void **out) +{ + FIXME("clsid %s, riid %s, out %p stub!\n", debugstr_guid(clsid), debugstr_guid(riid), out); + return CLASS_E_CLASSNOTAVAILABLE; +} + +HRESULT WINAPI DllGetActivationFactory(HSTRING classid, IActivationFactory **factory) +{ + TRACE("classid %s, factory %p.\n", debugstr_hstring(classid), factory); + *factory = &wintypes.IActivationFactory_iface; + IUnknown_AddRef(*factory); + return S_OK; +} diff --git a/dlls/wintypes/wintypes.spec b/dlls/wintypes/wintypes.spec new file mode 100644 index 00000000000..7c3a8d402a7 --- /dev/null +++ b/dlls/wintypes/wintypes.spec @@ -0,0 +1,11 @@ +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetActivationFactory(ptr ptr) +@ stdcall -private DllGetClassObject(ptr ptr ptr) +@ stub RoCreateNonAgilePropertySet +@ stub RoCreatePropertySetSerializer +@ stub RoGetBufferMarshaler +@ stub RoGetMetaDataFile +@ stub RoIsApiContractMajorVersionPresent +@ stub RoIsApiContractPresent +@ stub RoParseTypeName +@ stub RoResolveNamespace

1 0