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

Rémi Bernon : ntdll: Support activatableClass activation context elements.
by Alexandre Julliard 06 Apr '22

06 Apr '22

Module: wine Branch: master Commit: c944f64166fd8e5f0b7a233d76b3e11292ea3870 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c944f64166fd8e5f0b7a233d… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Apr 6 16:09:29 2022 +0200 ntdll: Support activatableClass activation context elements. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/actctx.c | 1 - dlls/ntdll/actctx.c | 297 ++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 296 insertions(+), 2 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c944f64166fd8e5f0b7a…

1 0

Bernhard Kölbl : include/winerror.h: Add missing WinRT HRESULT codes.
by Alexandre Julliard 06 Apr '22

06 Apr '22

Module: wine Branch: master Commit: 9912eb407dd26a32c0a67d1f3a36bb7fb8907797 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9912eb407dd26a32c0a67d1f… Author: Bernhard Kölbl <besentv(a)gmail.com> Date: Wed Apr 6 18:28:39 2022 +0200 include/winerror.h: Add missing WinRT HRESULT codes. Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winerror.h | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/include/winerror.h b/include/winerror.h index b63b74a5b18..d51d5648cdb 100644 --- a/include/winerror.h +++ b/include/winerror.h @@ -2578,6 +2578,25 @@ static inline HRESULT HRESULT_FROM_WIN32(unsigned int x) #define E_CHANGED_STATE _HRESULT_TYPEDEF_(0x8000000C) #define E_ILLEGAL_STATE_CHANGE _HRESULT_TYPEDEF_(0x8000000D) #define E_ILLEGAL_METHOD_CALL _HRESULT_TYPEDEF_(0x8000000E) +#define RO_E_METADATA_NAME_NOT_FOUND _HRESULT_TYPEDEF_(0x8000000F) +#define RO_E_METADATA_NAME_IS_NAMESPACE _HRESULT_TYPEDEF_(0x80000010) +#define RO_E_METADATA_INVALID_TYPE_FORMAT _HRESULT_TYPEDEF_(0x80000011) +#define RO_E_INVALID_METADATA_FILE _HRESULT_TYPEDEF_(0x80000012) +#define RO_E_CLOSED _HRESULT_TYPEDEF_(0x80000013) +#define RO_E_EXCLUSIVE_WRITE _HRESULT_TYPEDEF_(0x80000014) +#define RO_E_CHANGE_NOTIFICATION_IN_PROGRESS _HRESULT_TYPEDEF_(0x80000015) +#define RO_E_ERROR_STRING_NOT_FOUND _HRESULT_TYPEDEF_(0x80000016) +#define E_STRING_NOT_NULL_TERMINATED _HRESULT_TYPEDEF_(0x80000017) +#define E_ILLEGAL_DELEGATE_ASSIGNMENT _HRESULT_TYPEDEF_(0x80000018) +#define E_ASYNC_OPERATION_NOT_STARTED _HRESULT_TYPEDEF_(0x80000019) +#define E_APPLICATION_EXITING _HRESULT_TYPEDEF_(0x8000001A) +#define E_APPLICATION_VIEW_EXITING _HRESULT_TYPEDEF_(0x8000001B) +#define RO_E_MUST_BE_AGILE _HRESULT_TYPEDEF_(0x8000001C) +#define RO_E_UNSUPPORTED_FROM_MTA _HRESULT_TYPEDEF_(0x8000001D) +#define RO_E_COMMITTED _HRESULT_TYPEDEF_(0x8000001E) +#define RO_E_BLOCKED_CROSS_ASTA_CALL _HRESULT_TYPEDEF_(0x8000001F) +#define RO_E_CANNOT_ACTIVATE_FULL_TRUST_SERVER _HRESULT_TYPEDEF_(0x80000020) +#define RO_E_CANNOT_ACTIVATE_UNIVERSAL_APPLICATION_SERVER _HRESULT_TYPEDEF_(0x80000021) #define E_NOTIMPL _HRESULT_TYPEDEF_(0x80004001) #define E_NOINTERFACE _HRESULT_TYPEDEF_(0x80004002)

1 0

Bernhard Kölbl : include/windows.foundation.collections.idl: Set correct return type for IAsyncOperation_GetResults.
by Alexandre Julliard 06 Apr '22

06 Apr '22

Module: wine Branch: master Commit: ca86fc7150c9b67202cc8e883d05f6ccef7e802f URL: https://source.winehq.org/git/wine.git/?a=commit;h=ca86fc7150c9b67202cc8e88… Author: Bernhard Kölbl <besentv(a)gmail.com> Date: Wed Apr 6 18:28:40 2022 +0200 include/windows.foundation.collections.idl: Set correct return type for IAsyncOperation_GetResults. Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/windows.foundation.collections.idl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/windows.foundation.collections.idl b/include/windows.foundation.collections.idl index 5ed60ed176e..395adad27aa 100644 --- a/include/windows.foundation.collections.idl +++ b/include/windows.foundation.collections.idl @@ -64,7 +64,7 @@ cpp_quote("#endif") { [propput] HRESULT Completed([in] Windows.Foundation.AsyncOperationCompletedHandler<TResult> *handler); [propget] HRESULT Completed([out, retval] Windows.Foundation.AsyncOperationCompletedHandler<TResult> **handler); - HRESULT GetResults([out, retval] TResult **results); + HRESULT GetResults([out, retval] TResult *results); } [

1 0

Bernhard Kölbl : windows.media.speech: Add tests for IAsyncOperation.
by Alexandre Julliard 06 Apr '22

06 Apr '22

Module: wine Branch: master Commit: 4926bb148b049f1b60e57091f4aa87a3957aa69e URL: https://source.winehq.org/git/wine.git/?a=commit;h=4926bb148b049f1b60e57091… Author: Bernhard Kölbl <besentv(a)gmail.com> Date: Wed Apr 6 18:28:41 2022 +0200 windows.media.speech: Add tests for IAsyncOperation. Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windows.media.speech/tests/speech.c | 241 ++++++++++++++++++++++++++++++- 1 file changed, 239 insertions(+), 2 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4926bb148b049f1b60e5…

1 0

Bernhard Kölbl : windows.media.speech: Add IAsyncOperation<Inspectable*> stub.
by Alexandre Julliard 06 Apr '22

06 Apr '22

Module: wine Branch: master Commit: fb91a299981979c5070860f3ad5fc2bb0a2804ec URL: https://source.winehq.org/git/wine.git/?a=commit;h=fb91a299981979c5070860f3… Author: Bernhard Kölbl <besentv(a)gmail.com> Date: Wed Apr 6 18:28:42 2022 +0200 windows.media.speech: Add IAsyncOperation<Inspectable*> stub. And return an instance of it in ISpeechRecognizer_CompileConstraintsAsync. Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windows.media.speech/Makefile.in | 1 + dlls/windows.media.speech/async.c | 156 +++++++++++++++++++++++++++++++ dlls/windows.media.speech/private.h | 2 + dlls/windows.media.speech/recognizer.c | 7 +- dlls/windows.media.speech/tests/speech.c | 8 +- include/windows.foundation.idl | 2 + 6 files changed, 169 insertions(+), 7 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=fb91a299981979c50708…

1 0

Bernhard Kölbl : windows.media.speech: Add IAsyncInfo stub to IAsyncOperation<Inspectable*>.
by Alexandre Julliard 06 Apr '22

06 Apr '22

Module: wine Branch: master Commit: 5a815669e8e7a3f0a37648510494f8b36c29c1f6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5a815669e8e7a3f0a3764851… Author: Bernhard Kölbl <besentv(a)gmail.com> Date: Wed Apr 6 18:28:43 2022 +0200 windows.media.speech: Add IAsyncInfo stub to IAsyncOperation<Inspectable*>. Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windows.media.speech/async.c | 64 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) diff --git a/dlls/windows.media.speech/async.c b/dlls/windows.media.speech/async.c index f701306e4f0..94d0b35d9c1 100644 --- a/dlls/windows.media.speech/async.c +++ b/dlls/windows.media.speech/async.c @@ -32,6 +32,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(speech); struct async_operation { IAsyncOperation_IInspectable IAsyncOperation_IInspectable_iface; + IAsyncInfo IAsyncInfo_iface; const GUID *iid; LONG ref; }; @@ -56,6 +57,12 @@ static HRESULT WINAPI async_operation_QueryInterface( IAsyncOperation_IInspectab return S_OK; } + if (IsEqualGUID(iid, &IID_IAsyncInfo)) + { + IInspectable_AddRef((*out = &impl->IAsyncInfo_iface)); + return S_OK; + } + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); *out = NULL; return E_NOINTERFACE; @@ -136,6 +143,62 @@ static const struct IAsyncOperation_IInspectableVtbl async_operation_vtbl = async_operation_GetResults }; +/* + * + * IAsyncInfo + * + */ + +DEFINE_IINSPECTABLE(async_operation_info, IAsyncInfo, struct async_operation, IAsyncOperation_IInspectable_iface) + +static HRESULT WINAPI async_operation_info_get_Id( IAsyncInfo *iface, UINT32 *id ) +{ + FIXME("iface %p, id %p stub!\n", iface, id); + return E_NOTIMPL; +} + +static HRESULT WINAPI async_operation_info_get_Status( IAsyncInfo *iface, AsyncStatus *status ) +{ + FIXME("iface %p, status %p stub!\n", iface, status); + return E_NOTIMPL; +} + +static HRESULT WINAPI async_operation_info_get_ErrorCode( IAsyncInfo *iface, HRESULT *error_code ) +{ + FIXME("iface %p, error_code %p stub!\n", iface, error_code); + return E_NOTIMPL; +} + +static HRESULT WINAPI async_operation_info_Cancel( IAsyncInfo *iface ) +{ + FIXME("iface %p stub!\n", iface); + return E_NOTIMPL; +} + +static HRESULT WINAPI async_operation_info_Close( IAsyncInfo *iface ) +{ + FIXME("iface %p stub!\n", iface); + return E_NOTIMPL; +} + +static const struct IAsyncInfoVtbl async_operation_info_vtbl = +{ + /* IUnknown methods */ + async_operation_info_QueryInterface, + async_operation_info_AddRef, + async_operation_info_Release, + /* IInspectable methods */ + async_operation_info_GetIids, + async_operation_info_GetRuntimeClassName, + async_operation_info_GetTrustLevel, + /* IAsyncInfo */ + async_operation_info_get_Id, + async_operation_info_get_Status, + async_operation_info_get_ErrorCode, + async_operation_info_Cancel, + async_operation_info_Close +}; + HRESULT async_operation_create( const GUID *iid, IAsyncOperation_IInspectable **out ) { struct async_operation *impl; @@ -147,6 +210,7 @@ HRESULT async_operation_create( const GUID *iid, IAsyncOperation_IInspectable ** } impl->IAsyncOperation_IInspectable_iface.lpVtbl = &async_operation_vtbl; + impl->IAsyncInfo_iface.lpVtbl = &async_operation_info_vtbl; impl->iid = iid; impl->ref = 1;

1 0

Alexandre Julliard : kernel32: Simplify GetGeoInfoA() implementation.
by Alexandre Julliard 06 Apr '22

06 Apr '22

Module: wine Branch: master Commit: bf83236b2f36c6222ba0acde3a13737cd4c4599d URL: https://source.winehq.org/git/wine.git/?a=commit;h=bf83236b2f36c6222ba0acde… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 6 10:10:17 2022 +0200 kernel32: Simplify GetGeoInfoA() implementation. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/locale.c | 26 +++----------------------- 1 file changed, 3 insertions(+), 23 deletions(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index 020ec3d843d..4c815be43cc 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -381,30 +381,10 @@ BOOL WINAPI EnumUILanguagesA( UILANGUAGE_ENUMPROCA proc, DWORD flags, LONG_PTR p */ INT WINAPI GetGeoInfoA(GEOID geoid, GEOTYPE geotype, LPSTR data, int data_len, LANGID lang) { - WCHAR *buffW; - INT len; + WCHAR buffer[256]; TRACE("%ld %ld %p %d %d\n", geoid, geotype, data, data_len, lang); - len = GetGeoInfoW(geoid, geotype, NULL, 0, lang); - if (!len) - return 0; - - buffW = HeapAlloc(GetProcessHeap(), 0, len*sizeof(WCHAR)); - if (!buffW) - return 0; - - GetGeoInfoW(geoid, geotype, buffW, len, lang); - len = WideCharToMultiByte(CP_ACP, 0, buffW, -1, NULL, 0, NULL, NULL); - if (!data || !data_len) { - HeapFree(GetProcessHeap(), 0, buffW); - return len; - } - - len = WideCharToMultiByte(CP_ACP, 0, buffW, -1, data, data_len, NULL, NULL); - HeapFree(GetProcessHeap(), 0, buffW); - - if (data_len < len) - SetLastError(ERROR_INSUFFICIENT_BUFFER); - return data_len < len ? 0 : len; + if (!GetGeoInfoW( geoid, geotype, buffer, ARRAY_SIZE(buffer), lang )) return 0; + return WideCharToMultiByte( CP_ACP, 0, buffer, -1, data, data_len, NULL, NULL ); }

1 0

Alexandre Julliard : kernel32: Simplify Get/SetCalendarInfoA() implementation.
by Alexandre Julliard 06 Apr '22

06 Apr '22

Module: wine Branch: master Commit: 80445efa9048e885df0ad77ce1fa9825acfa7694 URL: https://source.winehq.org/git/wine.git/?a=commit;h=80445efa9048e885df0ad77c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 6 10:16:41 2022 +0200 kernel32: Simplify Get/SetCalendarInfoA() implementation. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/lcformat.c | 32 -------------------------------- dlls/kernel32/locale.c | 42 +++++++++++++++++++++++++++++++++++------- 2 files changed, 35 insertions(+), 39 deletions(-) diff --git a/dlls/kernel32/lcformat.c b/dlls/kernel32/lcformat.c index 2c53f5dfde9..e029f328544 100644 --- a/dlls/kernel32/lcformat.c +++ b/dlls/kernel32/lcformat.c @@ -1754,35 +1754,3 @@ int WINAPI GetCurrencyFormatEx(LPCWSTR localename, DWORD flags, LPCWSTR value, return GetCurrencyFormatW( LocaleNameToLCID(localename, 0), flags, value, format, str, len); } - -/********************************************************************* - * GetCalendarInfoA (KERNEL32.@) - */ -int WINAPI GetCalendarInfoA( LCID lcid, CALID id, CALTYPE type, LPSTR data, int size, DWORD *val ) -{ - int ret, sizeW = size; - LPWSTR dataW = NULL; - - if (type & CAL_RETURN_NUMBER) - return GetCalendarInfoW( lcid, id, type, (WCHAR *)data, size, val ) * sizeof(WCHAR); - - if (!size) sizeW = GetCalendarInfoW( lcid, id, type, NULL, 0, NULL ); - if (!(dataW = HeapAlloc(GetProcessHeap(), 0, sizeW * sizeof(WCHAR)))) return 0; - - ret = GetCalendarInfoW( lcid, id, type, dataW, sizeW, val ); - if(ret && dataW && data) - ret = WideCharToMultiByte( CP_ACP, 0, dataW, -1, data, size, NULL, NULL ); - else if (type & CAL_RETURN_NUMBER) - ret *= sizeof(WCHAR); - HeapFree( GetProcessHeap(), 0, dataW ); - return ret; -} - -/********************************************************************* - * SetCalendarInfoA (KERNEL32.@) - */ -int WINAPI SetCalendarInfoA( LCID lcid, CALID id, CALTYPE type, LPCSTR data) -{ - FIXME("(%08lx,%08lx,%08lx,%s): stub\n", lcid, id, type, debugstr_a(data)); - return 0; -} diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index 4c815be43cc..d46a2aa1580 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -63,11 +63,13 @@ extern BOOL WINAPI Internal_EnumUILanguages( UILANGUAGE_ENUMPROCW proc, DWORD fl * * Retrieve the ANSI codepage for a given locale. */ -static inline UINT get_lcid_codepage( LCID lcid ) +static UINT get_lcid_codepage( LCID lcid, UINT flags ) { - UINT ret; - if (!GetLocaleInfoW( lcid, LOCALE_IDEFAULTANSICODEPAGE|LOCALE_RETURN_NUMBER, (WCHAR *)&ret, - sizeof(ret)/sizeof(WCHAR) )) ret = 0; + UINT ret = 0; + + if (flags & LOCALE_USE_CP_ACP) return CP_ACP; + GetLocaleInfoW( lcid, LOCALE_IDEFAULTANSICODEPAGE | LOCALE_RETURN_NUMBER, + (WCHAR *)&ret, sizeof(ret)/sizeof(WCHAR) ); return ret; } @@ -98,13 +100,11 @@ static inline UINT get_lcid_codepage( LCID lcid ) */ BOOL WINAPI SetLocaleInfoA(LCID lcid, LCTYPE lctype, LPCSTR data) { - UINT codepage = CP_ACP; + UINT codepage = get_lcid_codepage( lcid, lctype ); WCHAR *strW; DWORD len; BOOL ret; - if (!(lctype & LOCALE_USE_CP_ACP)) codepage = get_lcid_codepage( lcid ); - if (!data) { SetLastError( ERROR_INVALID_PARAMETER ); @@ -376,6 +376,34 @@ BOOL WINAPI EnumUILanguagesA( UILANGUAGE_ENUMPROCA proc, DWORD flags, LONG_PTR p } +/********************************************************************* + * GetCalendarInfoA (KERNEL32.@) + */ +int WINAPI GetCalendarInfoA( LCID lcid, CALID id, CALTYPE type, LPSTR data, int data_len, DWORD *val ) +{ + WCHAR buffer[256]; + + if (type & CAL_RETURN_NUMBER) + return GetCalendarInfoW( lcid, id, type, (WCHAR *)data, data_len, val ) * sizeof(WCHAR); + + if (!GetCalendarInfoW( lcid, id, type, buffer, ARRAY_SIZE(buffer), val )) return 0; + return WideCharToMultiByte( get_lcid_codepage(lcid, type), 0, buffer, -1, data, data_len, NULL, NULL ); +} + + +/********************************************************************* + * SetCalendarInfoA (KERNEL32.@) + */ +int WINAPI SetCalendarInfoA( LCID lcid, CALID id, CALTYPE type, LPCSTR data ) +{ + WCHAR buffer[256]; + + if (!MultiByteToWideChar( get_lcid_codepage(lcid, type), 0, data, -1, buffer, ARRAY_SIZE(buffer) )) + return 0; + return SetCalendarInfoW( lcid, id, type, buffer ); +} + + /****************************************************************************** * GetGeoInfoA (KERNEL32.@) */

1 0

Eric Pouech : urlmon: Use I width modifier instead of casting to DWORD.
by Alexandre Julliard 06 Apr '22

06 Apr '22

Module: wine Branch: master Commit: 33347c7c239be55f50014513168e15f20046ef3e URL: https://source.winehq.org/git/wine.git/?a=commit;h=33347c7c239be55f50014513… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Apr 6 08:35:09 2022 +0200 urlmon: Use I width modifier instead of casting to DWORD. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/urlmon/sec_mgr.c | 12 +++++------ dlls/urlmon/uri.c | 56 +++++++++++++++++++++++++-------------------------- 2 files changed, 34 insertions(+), 34 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=33347c7c239be55f5001…

1 0

Eric Pouech : comdlg32: Use I width modifier instead of casting to LONG.
by Alexandre Julliard 06 Apr '22

06 Apr '22

Module: wine Branch: master Commit: 2df8ad9d398e17f94d2da68626d3da14eac92ca8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2df8ad9d398e17f94d2da686… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Apr 6 08:23:58 2022 +0200 comdlg32: Use I width modifier instead of casting to LONG. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comdlg32/fontdlg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comdlg32/fontdlg.c b/dlls/comdlg32/fontdlg.c index 03c712c6bc2..4bf041e85b3 100644 --- a/dlls/comdlg32/fontdlg.c +++ b/dlls/comdlg32/fontdlg.c @@ -937,7 +937,7 @@ static LRESULT CFn_WMCommand(HWND hDlg, WPARAM wParam, LPARAM lParam, LPCHOOSEFO } } - TRACE("WM_COMMAND wParam=%08lX lParam=%08IX\n", (LONG)wParam, lParam); + TRACE("WM_COMMAND wParam=%08IX lParam=%08IX\n", wParam, lParam); switch (LOWORD(wParam)) { case cmb1:

1 0