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

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

April 22, 2022

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

Zhiyi Zhang : wintypes: Add stub dll.
by Alexandre Julliard April 22, 2022

April 22, 2022

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

Zhiyi Zhang : include: Add windows.foundation.metadata.idl.
by Alexandre Julliard April 22, 2022

April 22, 2022

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

Huw Davies : winealsa: Implement Wow64 midi entry points in the Unix library.
by Alexandre Julliard April 22, 2022

April 22, 2022

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

Huw Davies : winealsa: Implement Wow64 mmdevapi entry points in the Unix libraray.
by Alexandre Julliard April 22, 2022

April 22, 2022

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

Alexandre Julliard : winedump: Enable compilation with long types.
by Alexandre Julliard April 22, 2022

April 22, 2022

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

Alex Henrie : kernel32: Fix percentage calculation in GetSystemPowerStatus.
by Alexandre Julliard April 22, 2022

April 22, 2022

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

Hugh McMaster : conhost: Save default font's pitch and family on first run.
by Alexandre Julliard April 22, 2022

April 22, 2022

Module: wine Branch: master Commit: a2bb60e62c0e7c0f0733bd2d0c66ba81d91fe19b URL: https://source.winehq.org/git/wine.git/?a=commit;h=a2bb60e62c0e7c0f0733bd2d… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Apr 20 23:18:03 2022 +1000 conhost: Save default font's pitch and family on first run. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/conhost/window.c | 1 + 1 file changed, 1 insertion(+) diff --git a/programs/conhost/window.c b/programs/conhost/window.c index fb02ef9fd94..c115e42a282 100644 --- a/programs/conhost/window.c +++ b/programs/conhost/window.c @@ -823,6 +823,7 @@ static int WINAPI get_first_font_sub_enum( const LOGFONTW *lf, const TEXTMETRICW load_config( fc->console->window->config_key, &config ); config.cell_width = fc->console->active->font.width; config.cell_height = fc->console->active->font.height; + config.font_pitch_family = fc->console->active->font.pitch_family; memcpy( config.face_name, fc->console->active->font.face_name, fc->console->active->font.face_len * sizeof(WCHAR) ); config.face_name[fc->console->active->font.face_len] = 0;

1 0

Alexandre Julliard : winedump: Add support for dumping locale.nls.
by Alexandre Julliard April 22, 2022

April 22, 2022

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

Alexandre Julliard : winedump: Build with nameless unions/structs.
by Alexandre Julliard April 22, 2022

April 22, 2022

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