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

Nikolay Sivov : user32: Add suspend-resume notification API stubs.
by Alexandre Julliard March 30, 2022

March 30, 2022

Module: wine Branch: master Commit: 947f638a05c2bd73fbb53aef8377f2aacb246b0a URL: https://source.winehq.org/git/wine.git/?a=commit;h=947f638a05c2bd73fbb53aef… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 30 13:38:37 2022 +0300 user32: Add suspend-resume notification API stubs. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/misc.c | 18 ++++++++++++++++++ dlls/user32/user32.spec | 2 ++ include/winuser.h | 2 ++ 3 files changed, 22 insertions(+) diff --git a/dlls/user32/misc.c b/dlls/user32/misc.c index 25d0b676667..04ba0a8810c 100644 --- a/dlls/user32/misc.c +++ b/dlls/user32/misc.c @@ -443,6 +443,24 @@ BOOL WINAPI UnregisterPowerSettingNotification(HPOWERNOTIFY handle) return TRUE; } +/********************************************************************** + * RegisterSuspendResumeNotification (USER32.@) + */ +HPOWERNOTIFY WINAPI RegisterSuspendResumeNotification(HANDLE recipient, DWORD flags) +{ + FIXME("%p, %#x: stub.\n", recipient, flags); + return (HPOWERNOTIFY)0xdeadbeef; +} + +/********************************************************************** + * UnregisterSuspendResumeNotification (USER32.@) + */ +BOOL WINAPI UnregisterSuspendResumeNotification(HPOWERNOTIFY handle) +{ + FIXME("%p: stub.\n", handle); + return TRUE; +} + /***************************************************************************** * GetGestureConfig (USER32.@) */ diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index aae124ebdcc..5d0c6746a51 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -608,6 +608,7 @@ @ stdcall RegisterRawInputDevices(ptr long long) @ stdcall RegisterServicesProcess(long) @ stdcall RegisterShellHookWindow (long) +@ stdcall RegisterSuspendResumeNotification(long long) @ stdcall RegisterSystemThread(long long) @ stdcall RegisterTasklist (long) @ stdcall RegisterTouchHitTestingWindow(long long) @@ -783,6 +784,7 @@ @ stdcall UnregisterHotKey(long long) NtUserUnregisterHotKey # @ stub UnregisterMessagePumpHook @ stdcall UnregisterPowerSettingNotification(ptr) +@ stdcall UnregisterSuspendResumeNotification(ptr) @ stdcall UnregisterTouchWindow(long) @ stdcall UnregisterUserApiHook() @ stdcall UpdateLayeredWindow(long long ptr ptr long ptr long ptr long) diff --git a/include/winuser.h b/include/winuser.h index 898c9034e33..bb585efd16d 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -4128,6 +4128,7 @@ WINUSERAPI BOOL WINAPI RegisterPointerDeviceNotifications(HWND,BOOL); WINUSERAPI HPOWERNOTIFY WINAPI RegisterPowerSettingNotification(HANDLE,LPCGUID,DWORD); WINUSERAPI BOOL WINAPI RegisterRawInputDevices(PRAWINPUTDEVICE,UINT,UINT); WINUSERAPI BOOL WINAPI RegisterShellHookWindow(HWND); +WINUSERAPI HPOWERNOTIFY WINAPI RegisterSuspendResumeNotification(HANDLE,DWORD); WINUSERAPI BOOL WINAPI RegisterTouchWindow(HWND,ULONG); WINUSERAPI UINT WINAPI RegisterWindowMessageA(LPCSTR); WINUSERAPI UINT WINAPI RegisterWindowMessageW(LPCWSTR); @@ -4300,6 +4301,7 @@ WINUSERAPI BOOL WINAPI UnregisterClassW(LPCWSTR,HINSTANCE); WINUSERAPI BOOL WINAPI UnregisterDeviceNotification(HDEVNOTIFY); WINUSERAPI BOOL WINAPI UnregisterHotKey(HWND,INT); WINUSERAPI BOOL WINAPI UnregisterPowerSettingNotification(HPOWERNOTIFY); +WINUSERAPI BOOL WINAPI UnregisterSuspendResumeNotification(HPOWERNOTIFY); WINUSERAPI BOOL WINAPI UnregisterTouchWindow(HWND); WINUSERAPI BOOL WINAPI UpdateWindow(HWND); WINUSERAPI BOOL WINAPI UserHandleGrantAccess(HANDLE,HANDLE,BOOL);

1 0

Ziqing Hui : include: Add defines for ID2D1ImageSourceFromWic.
by Alexandre Julliard March 30, 2022

March 30, 2022

Module: wine Branch: master Commit: bd25d7f324981423773cdd6f07f4bf54b5c51050 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bd25d7f324981423773cdd6f… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Wed Mar 30 11:57:45 2022 +0800 include: Add defines for ID2D1ImageSourceFromWic. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/d2d1_3.idl | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/include/d2d1_3.idl b/include/d2d1_3.idl index a33292882df..643212e1a27 100644 --- a/include/d2d1_3.idl +++ b/include/d2d1_3.idl @@ -166,3 +166,21 @@ interface ID2D1ImageSource : ID2D1Image [out] BOOL *resources_discarded ); }; + +[ + object, + uuid(77395441-1c8f-4555-8683-f50dab0fe792), + local, +] +interface ID2D1ImageSourceFromWic : ID2D1ImageSource +{ + HRESULT EnsureCached( + [in, optional] const D2D1_RECT_U *rect_to_fill + ); + HRESULT TrimCache( + [in, optional] const D2D1_RECT_U *rect_to_preserve + ); + void GetSource( + [out] IWICBitmapSource **source + ); +};

1 0

Hans Leidekker : crypt32: Correctly free memory in CNG_ImportRSAPubKey().
by Alexandre Julliard March 30, 2022

March 30, 2022

Module: wine Branch: master Commit: dd91e541b66a0c0cba404c760bfbc7a661661dc7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dd91e541b66a0c0cba404c76… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Mar 30 11:47:44 2022 +0200 crypt32: Correctly free memory in CNG_ImportRSAPubKey(). Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/cert.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index 33811dfadc1..b7789fd6fcd 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -2720,7 +2720,7 @@ static BOOL CNG_ImportRSAPubKey(CERT_PUBLIC_KEY_INFO *info, BCRYPT_KEY_HANDLE *k else { FIXME("Unsupported RSA algorithm: %#x\n", hdr->aiKeyAlg); - CryptMemFree(hdr); + LocalFree(hdr); SetLastError(NTE_BAD_ALGID); return FALSE; } @@ -2762,7 +2762,7 @@ static BOOL CNG_ImportRSAPubKey(CERT_PUBLIC_KEY_INFO *info, BCRYPT_KEY_HANDLE *k CryptMemFree(rsakey); done: - CryptMemFree(hdr); + LocalFree(hdr); if (alg) BCryptCloseAlgorithmProvider(alg, 0); if (status) SetLastError(RtlNtStatusToDosError(status)); return !status; @@ -2773,7 +2773,6 @@ BOOL CNG_ImportPubKey(CERT_PUBLIC_KEY_INFO *pubKeyInfo, BCRYPT_KEY_HANDLE *key) if (!strcmp(pubKeyInfo->Algorithm.pszObjId, szOID_ECC_PUBLIC_KEY)) return CNG_ImportECCPubKey(pubKeyInfo, key); - if (!strcmp(pubKeyInfo->Algorithm.pszObjId, szOID_RSA_RSA)) return CNG_ImportRSAPubKey(pubKeyInfo, key);

1 0

Hans Leidekker : crypt32: Consistently use CryptMemAlloc/Free().
by Alexandre Julliard March 30, 2022

March 30, 2022

Module: wine Branch: master Commit: 1fb28509f748ac4b1e582f05fba00f02e5da0114 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1fb28509f748ac4b1e582f05… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Mar 30 11:47:45 2022 +0200 crypt32: Consistently use CryptMemAlloc/Free(). Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/cert.c | 12 ++++++------ dlls/crypt32/chain.c | 4 ++-- dlls/crypt32/msg.c | 4 ++-- dlls/crypt32/pfx.c | 12 +++++------- dlls/crypt32/rootstore.c | 9 ++++----- dlls/crypt32/serialize.c | 4 ++-- 6 files changed, 21 insertions(+), 24 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index b7789fd6fcd..ad39b7d18c7 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -677,7 +677,7 @@ static BOOL CertContext_SetKeyProvInfoProperty(CONTEXT_PROPERTY_LIST *properties for (i = 0; i < info->cProvParam; i++) size += sizeof(CRYPT_KEY_PROV_PARAM) + info->rgProvParam[i].cbData; - prop = HeapAlloc(GetProcessHeap(), 0, size); + prop = CryptMemAlloc(size); if (!prop) { SetLastError(ERROR_OUTOFMEMORY); @@ -687,7 +687,7 @@ static BOOL CertContext_SetKeyProvInfoProperty(CONTEXT_PROPERTY_LIST *properties copy_KeyProvInfoProperty(info, prop); ret = ContextPropertyList_SetProperty(properties, CERT_KEY_PROV_INFO_PROP_ID, (const BYTE *)prop, size); - HeapFree(GetProcessHeap(), 0, prop); + CryptMemFree(prop); return ret; } @@ -865,7 +865,7 @@ static BOOL CRYPT_AcquirePrivateKeyFromProvInfo(PCCERT_CONTEXT pCert, DWORD dwFl CERT_KEY_PROV_INFO_PROP_ID, 0, &size); if (ret) { - info = HeapAlloc(GetProcessHeap(), 0, size); + info = CryptMemAlloc(size); if (info) { ret = CertGetCertificateContextProperty(pCert, @@ -901,7 +901,7 @@ static BOOL CRYPT_AcquirePrivateKeyFromProvInfo(PCCERT_CONTEXT pCert, DWORD dwFl SetLastError(CRYPT_E_NO_KEY_PROPERTY); } if (allocated) - HeapFree(GetProcessHeap(), 0, info); + CryptMemFree(info); return ret; } @@ -953,7 +953,7 @@ BOOL WINAPI CryptAcquireCertificatePrivateKey(PCCERT_CONTEXT pCert, if (ret) { - info = HeapAlloc(GetProcessHeap(), 0, size); + info = CryptMemAlloc(size); ret = CertGetCertificateContextProperty(pCert, CERT_KEY_PROV_INFO_PROP_ID, info, &size); if (ret) @@ -1003,7 +1003,7 @@ BOOL WINAPI CryptAcquireCertificatePrivateKey(PCCERT_CONTEXT pCert, } } } - HeapFree(GetProcessHeap(), 0, info); + CryptMemFree(info); if (cert_in_store) CertFreeCertificateContext(cert_in_store); return ret; diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index 3e9bdb66e0a..cf244f2ac6c 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -2007,7 +2007,7 @@ static PCCERT_CONTEXT CRYPT_FindIssuer(const CertificateChainEngine *engine, con if(!res) return NULL; - urls = HeapAlloc(GetProcessHeap(), 0, size); + urls = CryptMemAlloc(size); if(!urls) return NULL; @@ -2045,7 +2045,7 @@ static PCCERT_CONTEXT CRYPT_FindIssuer(const CertificateChainEngine *engine, con } } - HeapFree(GetProcessHeap(), 0, urls); + CryptMemFree(urls); return issuer; } diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c index 6087f423f8c..63884d0c275 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -1666,12 +1666,12 @@ static BOOL CRYPT_ExportEncryptedKey(CMSG_CONTENT_ENCRYPT_INFO *info, DWORD i, static LPVOID WINAPI mem_alloc(size_t size) { - return HeapAlloc(GetProcessHeap(), 0, size); + return CryptMemAlloc(size); } static VOID WINAPI mem_free(LPVOID pv) { - HeapFree(GetProcessHeap(), 0, pv); + CryptMemFree(pv); } diff --git a/dlls/crypt32/pfx.c b/dlls/crypt32/pfx.c index fbcc7c72c89..54eb7f25e1b 100644 --- a/dlls/crypt32/pfx.c +++ b/dlls/crypt32/pfx.c @@ -17,7 +17,6 @@ */ #include <stdarg.h> -#include <stdlib.h> #include "ntstatus.h" #define WIN32_NO_STATUS @@ -28,7 +27,6 @@ #include "crypt32_private.h" #include "wine/debug.h" -#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(crypt); @@ -55,17 +53,17 @@ static HCRYPTPROV import_key( cert_store_data_t data, DWORD flags ) } } - params.buf = key = malloc( size ); + params.buf = key = CryptMemAlloc( size ); if (CRYPT32_CALL( import_store_key, &params ) || !CryptImportKey( prov, key, size, 0, flags & CRYPT_EXPORTABLE, &cryptkey )) { WARN( "CryptImportKey failed %08lx\n", GetLastError() ); CryptReleaseContext( prov, 0 ); - free( key ); + CryptMemFree( key ); return 0; } CryptDestroyKey( cryptkey ); - free( key ); + CryptMemFree( key ); return prov; } @@ -177,10 +175,10 @@ HCERTSTORE WINAPI PFXImportCertStore( CRYPT_DATA_BLOB *pfx, const WCHAR *passwor struct import_store_cert_params import_params = { data, i, NULL, &size }; if (CRYPT32_CALL( import_store_cert, &import_params ) != STATUS_BUFFER_TOO_SMALL) break; - import_params.buf = cert = malloc( size ); + import_params.buf = cert = CryptMemAlloc( size ); if (!CRYPT32_CALL( import_store_cert, &import_params )) ctx = CertCreateContext( CERT_STORE_CERTIFICATE_CONTEXT, X509_ASN_ENCODING, cert, size, 0, NULL ); - free( cert ); + CryptMemFree( cert ); if (!ctx) { WARN( "CertCreateContext failed %08lx\n", GetLastError() ); diff --git a/dlls/crypt32/rootstore.c b/dlls/crypt32/rootstore.c index 43256c71039..ab3a396b651 100644 --- a/dlls/crypt32/rootstore.c +++ b/dlls/crypt32/rootstore.c @@ -18,7 +18,6 @@ #include <stdarg.h> #include <stdio.h> -#include <stdlib.h> #include "ntstatus.h" #define WIN32_NO_STATUS @@ -622,19 +621,19 @@ static void read_trusted_roots_from_known_locations(HCERTSTORE store) if (from) { - params.buffer = malloc( params.size ); + params.buffer = CryptMemAlloc( params.size ); while (!CRYPT32_CALL( enum_root_certs, &params )) { if (needed > params.size) { - free( params.buffer ); - params.buffer = malloc( needed ); + CryptMemFree( params.buffer ); + params.buffer = CryptMemAlloc( needed ); params.size = needed; } else CertAddEncodedCertificateToStore( from, X509_ASN_ENCODING, params.buffer, needed, CERT_STORE_ADD_NEW, NULL ); } - free( params.buffer ); + CryptMemFree( params.buffer ); check_and_store_certs(from, store); } CertCloseStore(from, 0); diff --git a/dlls/crypt32/serialize.c b/dlls/crypt32/serialize.c index e1e2593169d..47ab834bf48 100644 --- a/dlls/crypt32/serialize.c +++ b/dlls/crypt32/serialize.c @@ -72,7 +72,7 @@ static DWORD serialize_KeyProvInfoProperty(const CRYPT_KEY_PROV_INFO *info, stru if (!ret) return size; - store = HeapAlloc(GetProcessHeap(), 0, size); + store = CryptMemAlloc(size); if (!store) return 0; param = (struct store_CRYPT_KEY_PROV_PARAM *)(store + 1); @@ -331,7 +331,7 @@ static DWORD read_serialized_KeyProvInfoProperty(const struct store_CRYPT_KEY_PR for (i = 0; i < store->cProvParam; i++) size += sizeof(CRYPT_KEY_PROV_PARAM) + param[i].cbData; - info = HeapAlloc(GetProcessHeap(), 0, size); + info = CryptMemAlloc(size); if (!info) { SetLastError(ERROR_OUTOFMEMORY);

1 0

Hans Leidekker : crypt32: Use CRT allocation functions.
by Alexandre Julliard March 30, 2022

March 30, 2022

Module: wine Branch: master Commit: 8516a9e9317f8708f98ab112f40d1ab7166a8c6c URL: https://source.winehq.org/git/wine.git/?a=commit;h=8516a9e9317f8708f98ab112… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Mar 30 11:47:46 2022 +0200 crypt32: Use CRT allocation functions. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/main.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/crypt32/main.c b/dlls/crypt32/main.c index cce90125bc0..4a94bed9b6b 100644 --- a/dlls/crypt32/main.c +++ b/dlls/crypt32/main.c @@ -18,6 +18,7 @@ */ #include <stdarg.h> +#include <stdlib.h> #include <stdio.h> #include "windef.h" @@ -136,17 +137,17 @@ HLRUCACHE WINAPI I_CryptFreeLruCache(HLRUCACHE h, DWORD unk0, DWORD unk1) LPVOID WINAPI CryptMemAlloc(ULONG cbSize) { - return HeapAlloc(GetProcessHeap(), 0, cbSize); + return malloc(cbSize); } LPVOID WINAPI CryptMemRealloc(LPVOID pv, ULONG cbSize) { - return HeapReAlloc(GetProcessHeap(), 0, pv, cbSize); + return realloc(pv, cbSize); } VOID WINAPI CryptMemFree(LPVOID pv) { - HeapFree(GetProcessHeap(), 0, pv); + free(pv); } DWORD WINAPI I_CryptAllocTls(void)

1 0

Nikolay Sivov : scrobj: Fix wrong cleanup logic for factory object.
by Alexandre Julliard March 30, 2022

March 30, 2022

Module: wine Branch: master Commit: 5aab379debfbdc11ebf5c5467c3edaa15de75f26 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5aab379debfbdc11ebf5c546… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 30 08:55:48 2022 +0300 scrobj: Fix wrong cleanup logic for factory object. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/scrobj/scrobj.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/scrobj/scrobj.c b/dlls/scrobj/scrobj.c index b01fa60d6a4..90cf2024537 100644 --- a/dlls/scrobj/scrobj.c +++ b/dlls/scrobj/scrobj.c @@ -1883,10 +1883,7 @@ static HRESULT create_scriptlet_factory(const WCHAR *url, struct scriptlet_facto TRACE("%s\n", debugstr_w(url)); if (!(factory = calloc(1, sizeof(*factory)))) - { - IClassFactory_Release(&factory->IClassFactory_iface); return E_OUTOFMEMORY; - } factory->IClassFactory_iface.lpVtbl = &scriptlet_factory_vtbl; factory->ref = 1;

1 0

Alexandre Julliard : kernelbase: Remove the old GetLocaleInfoEx/W implementation.
by Alexandre Julliard March 30, 2022

March 30, 2022

Module: wine Branch: master Commit: c0fda77fe2534de29b7659a4e67a701e6ef37981 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c0fda77fe2534de29b7659a4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 29 22:12:30 2022 +0200 kernelbase: Remove the old GetLocaleInfoEx/W implementation. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/locale.c | 90 ++++-------------------------------------------- 1 file changed, 7 insertions(+), 83 deletions(-) diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index 0f15afc4869..719a4133758 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -1559,7 +1559,7 @@ static int get_locale_info( const NLS_LOCALE_DATA *locale, LCID lcid, LCTYPE typ return locale_return_string( locale->srelativelongdate, type, buffer, len ); case 0x007d: /* undocumented */ - return -1; + return locale_return_number( 0, type, buffer, len ); case LOCALE_SSHORTESTAM: return locale_return_string( locale->sshortestam, type, buffer, len ); @@ -1918,12 +1918,6 @@ static UINT get_lcid_codepage( LCID lcid, ULONG flags ) } -static int get_value_base_by_lctype( LCTYPE lctype ) -{ - return lctype == LOCALE_ILANGUAGE || lctype == LOCALE_IDEFAULTLANGUAGE ? 16 : 10; -} - - static const CPTABLEINFO *get_codepage_table( UINT codepage ) { unsigned int i; @@ -5237,85 +5231,21 @@ INT WINAPI DECLSPEC_HOTPATCH GetLocaleInfoA( LCID lcid, LCTYPE lctype, char *buf INT WINAPI DECLSPEC_HOTPATCH GetLocaleInfoW( LCID lcid, LCTYPE lctype, WCHAR *buffer, INT len ) { const NLS_LOCALE_DATA *locale; - HRSRC hrsrc; - HGLOBAL hmem; - INT ret; - UINT lcflags = lctype; - const WCHAR *p; - unsigned int i; if (len < 0 || (len && !buffer)) { SetLastError( ERROR_INVALID_PARAMETER ); return 0; } - if (!(locale = get_locale_by_id( &lcid, 0 ))) - { - SetLastError( ERROR_INVALID_PARAMETER ); - return 0; - } - ret = get_locale_info( locale, lcid, lctype, buffer, len ); - if (ret != -1) return ret; - - if (!len) buffer = NULL; - - lcid = ConvertDefaultLocale( lcid ); - lctype = LOWORD(lctype); TRACE( "(lcid=0x%lx,lctype=0x%lx,%p,%d)\n", lcid, lctype, buffer, len ); - if (!(hrsrc = FindResourceExW( kernel32_handle, (LPWSTR)RT_STRING, - ULongToPtr((lctype >> 4) + 1), lcid ))) - { - SetLastError( ERROR_INVALID_FLAGS ); /* no such lctype */ - return 0; - } - if (!(hmem = LoadResource( kernel32_handle, hrsrc ))) return 0; - - p = LockResource( hmem ); - for (i = 0; i < (lctype & 0x0f); i++) p += *p + 1; - - if (lcflags & LOCALE_RETURN_NUMBER) ret = sizeof(UINT) / sizeof(WCHAR); - else - ret = (lctype == LOCALE_FONTSIGNATURE) ? *p : *p + 1; - - if (!len) return ret; - - if (ret > len) + if (!(locale = get_locale_by_id( &lcid, 0 ))) { - SetLastError( ERROR_INSUFFICIENT_BUFFER ); + SetLastError( ERROR_INVALID_PARAMETER ); return 0; } - - if (lcflags & LOCALE_RETURN_NUMBER) - { - UINT number; - WCHAR *end, *tmp = HeapAlloc( GetProcessHeap(), 0, (*p + 1) * sizeof(WCHAR) ); - if (!tmp) return 0; - memcpy( tmp, p + 1, *p * sizeof(WCHAR) ); - tmp[*p] = 0; - number = wcstol( tmp, &end, get_value_base_by_lctype( lctype ) ); - if (!*end) - memcpy( buffer, &number, sizeof(number) ); - else /* invalid number */ - { - SetLastError( ERROR_INVALID_FLAGS ); - ret = 0; - } - HeapFree( GetProcessHeap(), 0, tmp ); - - TRACE( "(lcid=0x%lx,lctype=0x%lx,%p,%d) returning number %d\n", - lcid, lctype, buffer, len, number ); - } - else - { - memcpy( buffer, p + 1, ret * sizeof(WCHAR) ); - if (lctype != LOCALE_FONTSIGNATURE) buffer[ret-1] = 0; - - TRACE( "(lcid=0x%lx,lctype=0x%lx,%p,%d) returning %d %s\n", - lcid, lctype, buffer, len, ret, debugstr_w(buffer) ); - } - return ret; + return get_locale_info( locale, lcid, lctype, buffer, len ); } @@ -5325,22 +5255,16 @@ INT WINAPI DECLSPEC_HOTPATCH GetLocaleInfoW( LCID lcid, LCTYPE lctype, WCHAR *bu INT WINAPI DECLSPEC_HOTPATCH GetLocaleInfoEx( const WCHAR *name, LCTYPE info, WCHAR *buffer, INT len ) { LCID lcid; - int ret; const NLS_LOCALE_DATA *locale = get_locale_by_name( name, &lcid ); + TRACE( "%s 0x%lx %p %d\n", debugstr_w(name), info, buffer, len ); + if (!locale) { SetLastError( ERROR_INVALID_PARAMETER ); return 0; } - ret = get_locale_info( locale, lcid, info, buffer, len ); - if (ret != -1) return ret; - - TRACE( "%s 0x%lx\n", debugstr_w(name), info ); - - lcid = LocaleNameToLCID( name, 0 ); - if (!lcid) return 0; - return GetLocaleInfoW( lcid, info, buffer, len ); + return get_locale_info( locale, lcid, info, buffer, len ); }

1 0

Alexandre Julliard : kernelbase: Reimplement SetLocaleInfoW().
by Alexandre Julliard March 30, 2022

March 30, 2022

Module: wine Branch: master Commit: 78a33f968461fa3a01d3eec837b4c24f353bc00b URL: https://source.winehq.org/git/wine.git/?a=commit;h=78a33f968461fa3a01d3eec8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 29 22:12:25 2022 +0200 kernelbase: Reimplement SetLocaleInfoW(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/locale.c | 91 ++++++++++++++---- dlls/kernelbase/locale.c | 221 ++++++++++++++++++++++--------------------- 2 files changed, 185 insertions(+), 127 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=78a33f968461fa3a01d3…

1 0

Rémi Bernon : mf/tests: Fix incorrect array index when formatting blob value.
by Alexandre Julliard March 30, 2022

March 30, 2022

Module: wine Branch: master Commit: edef14126cbdb64dda218688a51b6e170cb4909b URL: https://source.winehq.org/git/wine.git/?a=commit;h=edef14126cbdb64dda218688… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Mar 29 11:55:27 2022 +0200 mf/tests: Fix incorrect array index when formatting blob value. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45988 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47084 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49715 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52183 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/tests/mf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 0df524b4e16..b2d2880bea6 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -147,7 +147,7 @@ static void check_attributes_(int line, IMFAttributes *attributes, const struct case VT_VECTOR | VT_UI1: buf += sprintf(buf, "size %lu, data {", value.caub.cElems); for (j = 0; j < 16 && j < value.caub.cElems; ++j) - buf += sprintf(buf, "0x%02x,", value.caub.pElems[i + j]); + buf += sprintf(buf, "0x%02x,", value.caub.pElems[j]); if (value.caub.cElems > 16) buf += sprintf(buf, "...}"); else

1 0

Alexandre Julliard : kernelbase: Reimplement misc locale info values in GetLocaleInfoW/Ex using the locale.nls data.
by Alexandre Julliard March 30, 2022

March 30, 2022

Module: wine Branch: master Commit: 08a9dc503191b912b2251d5b77824a414338dbbc URL: https://source.winehq.org/git/wine.git/?a=commit;h=08a9dc503191b912b2251d5b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 29 22:10:54 2022 +0200 kernelbase: Reimplement misc locale info values in GetLocaleInfoW/Ex using the locale.nls data. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/locale.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index a0960703097..669e1b14290 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -1276,7 +1276,7 @@ static int get_locale_info( const NLS_LOCALE_DATA *locale, LCID lcid, LCTYPE typ return locale_return_strarray( locale->sduration, 0, type, buffer, len ); case LOCALE_SKEYBOARDSTOINSTALL: - return -1; + return locale_return_string( locale->skeyboardstoinstall, type, buffer, len ); case LOCALE_SSHORTESTDAYNAME1: case LOCALE_SSHORTESTDAYNAME2: @@ -1304,13 +1304,13 @@ static int get_locale_info( const NLS_LOCALE_DATA *locale, LCID lcid, LCTYPE typ return locale_return_string( locale->sneginfinity, type, buffer, len ); case LOCALE_SSCRIPTS: - return -1; + return locale_return_string( locale->sscripts, type, buffer, len ); case LOCALE_SPARENT: return locale_return_string( locale->sparent, type, buffer, len ); case LOCALE_SCONSOLEFALLBACKNAME: - return -1; + return locale_return_string( locale->sconsolefallbackname, type, buffer, len ); case LOCALE_SLOCALIZEDLANGUAGENAME: /* FIXME: localization */ @@ -1320,7 +1320,7 @@ static int get_locale_info( const NLS_LOCALE_DATA *locale, LCID lcid, LCTYPE typ return locale_return_number( locale->ireadinglayout, type, buffer, len ); case LOCALE_INEUTRAL: - return -1; + return locale_return_number( !locale->inotneutral, type, buffer, len ); case LOCALE_SENGLISHDISPLAYNAME: return locale_return_string( locale->sengdisplayname, type, buffer, len ); @@ -1350,7 +1350,12 @@ static int get_locale_info( const NLS_LOCALE_DATA *locale, LCID lcid, LCTYPE typ return locale_return_string( locale->sopentypelanguagetag, type, buffer, len ); case LOCALE_SSORTLOCALE: - return -1; + if (SORTIDFROMLCID(lcid)) /* custom sort locale */ + { + const NLS_LOCALE_LCID_INDEX *entry = find_lcid_entry( lcid & ~0x80000000 ); + if (entry) return locale_return_string( entry->name, type, buffer, len ); + } + return locale_return_string( locale->ssortlocale, type, buffer, len ); case LOCALE_SRELATIVELONGDATE: return locale_return_string( locale->srelativelongdate, type, buffer, len );

1 0