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

Zebediah Figura : hidclass.sys: Expose an ioctl to retrieve the raw input handle.
by Alexandre Julliard 09 Jun '22

09 Jun '22

Module: wine Branch: master Commit: b68d2aad192e13fa182b0c33afb64af91395594b URL: https://source.winehq.org/git/wine.git/?a=commit;h=b68d2aad192e13fa182b0c33… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Jun 9 20:32:50 2022 +0200 hidclass.sys: Expose an ioctl to retrieve the raw input handle. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/device.c | 12 ++++++++++++ include/wine/hid.h | 2 ++ 2 files changed, 14 insertions(+) diff --git a/dlls/hidclass.sys/device.c b/dlls/hidclass.sys/device.c index 9d917bbc674..7c0dbdcbc10 100644 --- a/dlls/hidclass.sys/device.c +++ b/dlls/hidclass.sys/device.c @@ -655,6 +655,18 @@ NTSTATUS WINAPI pdo_ioctl(DEVICE_OBJECT *device, IRP *irp) case IOCTL_HID_SET_OUTPUT_REPORT: status = hid_device_xfer_report( ext, code, irp ); break; + + case IOCTL_HID_GET_WINE_RAWINPUT_HANDLE: + if (irpsp->Parameters.DeviceIoControl.OutputBufferLength < sizeof(ULONG)) + status = STATUS_BUFFER_OVERFLOW; + else + { + *(ULONG *)irp->AssociatedIrp.SystemBuffer = ext->u.pdo.rawinput_handle; + irp->IoStatus.Information = sizeof(ULONG); + status = STATUS_SUCCESS; + } + break; + default: { ULONG code = irpsp->Parameters.DeviceIoControl.IoControlCode; diff --git a/include/wine/hid.h b/include/wine/hid.h index 236888cbdc7..6a92317551f 100644 --- a/include/wine/hid.h +++ b/include/wine/hid.h @@ -227,4 +227,6 @@ struct hid_preparsed_data #define PID_USAGE_CREATE_NEW_EFFECT_REPORT ((USAGE) 0xab) #define PID_USAGE_RAM_POOL_AVAILABLE ((USAGE) 0xac) +#define IOCTL_HID_GET_WINE_RAWINPUT_HANDLE HID_BUFFER_CTL_CODE(300) + #endif /* __WINE_PARSE_H */

1 0

Zebediah Figura : dinput: Use IOCTL_HID_GET_WINE_RAWINPUT_HANDLE to retrieve the raw input handle.
by Alexandre Julliard 09 Jun '22

09 Jun '22

Module: wine Branch: master Commit: cf2e168c3a324da59f1358610fd5da01f7299b64 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cf2e168c3a324da59f135861… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Jun 9 20:32:51 2022 +0200 dinput: Use IOCTL_HID_GET_WINE_RAWINPUT_HANDLE to retrieve the raw input handle. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_hid.c | 32 +++++++++++++++++--------------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index 1f4b300be74..3dc7b70aac4 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -30,7 +30,9 @@ #include "winuser.h" #include "winerror.h" #include "winreg.h" +#include "winioctl.h" +#include "ddk/hidclass.h" #include "ddk/hidsdi.h" #include "setupapi.h" #include "devguid.h" @@ -41,7 +43,6 @@ #include "device_private.h" #include "initguid.h" -#include "devpkey.h" #include "wine/debug.h" #include "wine/hid.h" @@ -51,7 +52,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(dinput); DEFINE_GUID( GUID_DEVINTERFACE_WINEXINPUT,0x6c53d5fd,0x6480,0x440f,0xb6,0x18,0x47,0x67,0x50,0xc5,0xe1,0xa6 ); DEFINE_GUID( hid_joystick_guid, 0x9e573edb, 0x7734, 0x11d2, 0x8d, 0x4a, 0x23, 0x90, 0x3f, 0xb6, 0xbd, 0xf7 ); DEFINE_GUID( device_path_guid, 0x00000000, 0x0000, 0x0000, 0x8d, 0x4a, 0x23, 0x90, 0x3f, 0xb6, 0xbd, 0xf8 ); -DEFINE_DEVPROPKEY( DEVPROPKEY_HID_HANDLE, 0xbc62e415, 0xf4fe, 0x405c, 0x8e, 0xda, 0x63, 0x6f, 0xb5, 0x9f, 0x08, 0x98, 2 ); struct pid_control_report { @@ -1413,19 +1413,20 @@ static DWORD device_type_for_version( DWORD type, DWORD version ) } } -static HRESULT hid_joystick_device_try_open( UINT32 handle, const WCHAR *path, HANDLE *device, - PHIDP_PREPARSED_DATA *preparsed, HIDD_ATTRIBUTES *attrs, - HIDP_CAPS *caps, DIDEVICEINSTANCEW *instance, DWORD version ) +static HRESULT hid_joystick_device_try_open( const WCHAR *path, HANDLE *device, PHIDP_PREPARSED_DATA *preparsed, + HIDD_ATTRIBUTES *attrs, HIDP_CAPS *caps, DIDEVICEINSTANCEW *instance, + DWORD version ) { BOOL has_accelerator, has_brake, has_clutch, has_z, has_pov; PHIDP_PREPARSED_DATA preparsed_data = NULL; HIDP_LINK_COLLECTION_NODE nodes[256]; - DWORD type, button_count = 0; + DWORD type, size, button_count = 0; HIDP_BUTTON_CAPS buttons[10]; HIDP_VALUE_CAPS value; HANDLE device_file; ULONG node_count; NTSTATUS status; + UINT32 handle; USHORT count; device_file = CreateFileW( path, GENERIC_READ | GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE, @@ -1448,6 +1449,12 @@ static HRESULT hid_joystick_device_try_open( UINT32 handle, const WCHAR *path, H if (!HidD_GetProductString( device_file, instance->tszInstanceName, MAX_PATH * sizeof(WCHAR) )) goto failed; if (!HidD_GetProductString( device_file, instance->tszProductName, MAX_PATH * sizeof(WCHAR) )) goto failed; + if (!DeviceIoControl( device_file, IOCTL_HID_GET_WINE_RAWINPUT_HANDLE, NULL, 0, &handle, sizeof(handle), &size, NULL )) + { + ERR( "failed to get raw input handle, error %lu\n", GetLastError() ); + goto failed; + } + instance->guidInstance = hid_joystick_guid; instance->guidInstance.Data1 ^= handle; instance->guidProduct = dinput_pidvid_guid; @@ -1574,9 +1581,8 @@ static HRESULT hid_joystick_device_open( int index, const GUID *guid, DIDEVICEIN SP_DEVINFO_DATA devinfo = {.cbSize = sizeof(devinfo)}; WCHAR device_id[MAX_PATH], *tmp; HDEVINFO set, xi_set; - UINT32 i = 0, handle; BOOL override; - DWORD type; + UINT32 i = 0; GUID hid; TRACE( "index %d, guid %s\n", index, debugstr_guid( guid ) ); @@ -1594,11 +1600,7 @@ static HRESULT hid_joystick_device_open( int index, const GUID *guid, DIDEVICEIN detail->cbSize = sizeof(SP_DEVICE_INTERFACE_DETAIL_DATA_W); if (!SetupDiGetDeviceInterfaceDetailW( set, &iface, detail, sizeof(buffer), NULL, &devinfo )) continue; - if (!SetupDiGetDevicePropertyW( set, &devinfo, &DEVPROPKEY_HID_HANDLE, &type, - (BYTE *)&handle, sizeof(handle), NULL, 0 ) || - type != DEVPROP_TYPE_UINT32) - continue; - if (FAILED(hid_joystick_device_try_open( handle, detail->DevicePath, device, preparsed, + if (FAILED(hid_joystick_device_try_open( detail->DevicePath, device, preparsed, attrs, caps, instance, version ))) continue; @@ -1618,7 +1620,7 @@ static HRESULT hid_joystick_device_open( int index, const GUID *guid, DIDEVICEIN CloseHandle( *device ); HidD_FreePreparsedData( *preparsed ); - if (FAILED(hid_joystick_device_try_open( handle, detail->DevicePath, device, preparsed, + if (FAILED(hid_joystick_device_try_open( detail->DevicePath, device, preparsed, attrs, caps, instance, version ))) continue; } @@ -2040,7 +2042,7 @@ HRESULT hid_joystick_create_device( struct dinput *dinput, const GUID *guid, IDi else { wcscpy( impl->device_path, *(const WCHAR **)guid ); - hr = hid_joystick_device_try_open( 0, impl->device_path, &impl->device, &impl->preparsed, &attrs, + hr = hid_joystick_device_try_open( impl->device_path, &impl->device, &impl->preparsed, &attrs, &impl->caps, &impl->base.instance, dinput->dwVersion ); } if (hr != DI_OK) goto failed;

1 0

Zebediah Figura : user32: Use IOCTL_HID_GET_WINE_RAWINPUT_HANDLE to retrieve the raw input handle.
by Alexandre Julliard 09 Jun '22

09 Jun '22

Module: wine Branch: master Commit: 17987026554876bd1fd93b5c1ece2907a05c9300 URL: https://source.winehq.org/git/wine.git/?a=commit;h=17987026554876bd1fd93b5c… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Jun 9 20:32:52 2022 +0200 user32: Use IOCTL_HID_GET_WINE_RAWINPUT_HANDLE to retrieve the raw input handle. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/rawinput.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/dlls/user32/rawinput.c b/dlls/user32/rawinput.c index 4dc240b58b3..e7ff854e3b5 100644 --- a/dlls/user32/rawinput.c +++ b/dlls/user32/rawinput.c @@ -39,14 +39,11 @@ #include "initguid.h" #include "ddk/hidclass.h" -#include "devpkey.h" #include "ntddmou.h" #include "ntddkbd.h" WINE_DEFAULT_DEBUG_CHANNEL(rawinput); -DEFINE_DEVPROPKEY(DEVPROPKEY_HID_HANDLE, 0xbc62e415, 0xf4fe, 0x405c, 0x8e, 0xda, 0x63, 0x6f, 0xb5, 0x9f, 0x08, 0x98, 2); - struct device { SP_DEVICE_INTERFACE_DETAIL_DATA_W *detail; @@ -119,13 +116,6 @@ static struct device *add_device( HDEVINFO set, SP_DEVICE_INTERFACE_DATA *iface, return FALSE; } - if (!SetupDiGetDevicePropertyW(set, &device_data, &DEVPROPKEY_HID_HANDLE, &type, (BYTE *)&handle, sizeof(handle), NULL, 0) || - type != DEVPROP_TYPE_UINT32) - { - ERR("Failed to get device handle, error %#lx.\n", GetLastError()); - return NULL; - } - if (!(detail = malloc(size))) { ERR("Failed to allocate memory.\n"); @@ -146,6 +136,15 @@ static struct device *add_device( HDEVINFO set, SP_DEVICE_INTERFACE_DATA *iface, return NULL; } + status = NtDeviceIoControlFile( file, NULL, NULL, NULL, &io, + IOCTL_HID_GET_WINE_RAWINPUT_HANDLE, + NULL, 0, &handle, sizeof(handle) ); + if (status) + { + ERR( "Failed to get raw input handle, status %#lx.\n", status ); + goto fail; + } + memset( &info, 0, sizeof(info) ); info.cbSize = sizeof(info); info.dwType = type;

1 0

Zebediah Figura : hidclass.sys: No longer set the DEVPROPKEY_HID_HANDLE property.
by Alexandre Julliard 09 Jun '22

09 Jun '22

Module: wine Branch: master Commit: e63cdb3cadf301ed1893298a306771665d0c7753 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e63cdb3cadf301ed1893298a… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Jun 9 20:32:53 2022 +0200 hidclass.sys: No longer set the DEVPROPKEY_HID_HANDLE property. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/pnp.c | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/dlls/hidclass.sys/pnp.c b/dlls/hidclass.sys/pnp.c index cc4e3b96c82..873c55c4a67 100644 --- a/dlls/hidclass.sys/pnp.c +++ b/dlls/hidclass.sys/pnp.c @@ -24,7 +24,6 @@ #include "initguid.h" #include "hid.h" #include "devguid.h" -#include "devpkey.h" #include "ntddmou.h" #include "ntddkbd.h" #include "ddk/hidtypes.h" @@ -37,7 +36,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(hid); -DEFINE_DEVPROPKEY(DEVPROPKEY_HID_HANDLE, 0xbc62e415, 0xf4fe, 0x405c, 0x8e, 0xda, 0x63, 0x6f, 0xb5, 0x9f, 0x08, 0x98, 2); DEFINE_GUID(GUID_DEVINTERFACE_WINEXINPUT, 0x6c53d5fd, 0x6480, 0x440f, 0xb6, 0x18, 0x47, 0x67, 0x50, 0xc5, 0xe1, 0xa6); #ifdef __ASM_USE_FASTCALL_WRAPPER @@ -286,15 +284,6 @@ static void create_child(minidriver *minidriver, DEVICE_OBJECT *fdo) IoInvalidateDeviceRelations(fdo_ext->u.fdo.hid_ext.PhysicalDeviceObject, BusRelations); - if ((status = IoSetDevicePropertyData(child_pdo, &DEVPROPKEY_HID_HANDLE, LOCALE_NEUTRAL, - PLUGPLAY_PROPERTY_PERSISTENT, DEVPROP_TYPE_UINT32, - sizeof(pdo_ext->u.pdo.rawinput_handle), &pdo_ext->u.pdo.rawinput_handle))) - { - ERR( "Failed to set device handle property, status %#lx\n", status ); - IoDeleteDevice(child_pdo); - return; - } - pdo_ext->u.pdo.poll_interval = DEFAULT_POLL_INTERVAL; HID_StartDeviceThread(child_pdo);

1 0

Louis Lenders : advapi32: Fix spec entry for LookupPrivilegeDisplayName{A,W}.
by Alexandre Julliard 09 Jun '22

09 Jun '22

Module: wine Branch: master Commit: 561a5b8f84db68e608df022a8dbd71803f506946 URL: https://source.winehq.org/git/wine.git/?a=commit;h=561a5b8f84db68e608df022a… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Thu Jun 9 20:34:16 2022 +0200 advapi32: Fix spec entry for LookupPrivilegeDisplayName{A,W}. Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/advapi32.spec | 4 ++-- dlls/advapi32/security.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index 3b5f587d40e..3cbf5638ae4 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -433,8 +433,8 @@ @ stdcall LookupAccountSidLocalA(ptr ptr ptr ptr ptr ptr) @ stdcall LookupAccountSidLocalW(ptr ptr ptr ptr ptr ptr) @ stdcall LookupAccountSidW(wstr ptr ptr ptr ptr ptr ptr) -@ stdcall LookupPrivilegeDisplayNameA(str str str ptr ptr) -@ stdcall LookupPrivilegeDisplayNameW(wstr wstr wstr ptr ptr) +@ stdcall LookupPrivilegeDisplayNameA(str str ptr ptr ptr) +@ stdcall LookupPrivilegeDisplayNameW(wstr wstr ptr ptr ptr) @ stdcall LookupPrivilegeNameA(str ptr ptr ptr) @ stdcall LookupPrivilegeNameW(wstr ptr ptr ptr) @ stdcall LookupPrivilegeValueA(str str ptr) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index e0f7b63aedb..599199c325c 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -566,7 +566,7 @@ BOOL WINAPI LookupPrivilegeDisplayNameA( LPCSTR lpSystemName, LPCSTR lpName, LPS LPDWORD cchDisplayName, LPDWORD lpLanguageId ) { FIXME("%s %s %s %p %p - stub\n", debugstr_a(lpSystemName), debugstr_a(lpName), - debugstr_a(lpDisplayName), cchDisplayName, lpLanguageId); + lpDisplayName, cchDisplayName, lpLanguageId); return FALSE; } @@ -574,8 +574,8 @@ BOOL WINAPI LookupPrivilegeDisplayNameA( LPCSTR lpSystemName, LPCSTR lpName, LPS BOOL WINAPI LookupPrivilegeDisplayNameW( LPCWSTR lpSystemName, LPCWSTR lpName, LPWSTR lpDisplayName, LPDWORD cchDisplayName, LPDWORD lpLanguageId ) { - FIXME("%s %s %s %p %p - stub\n", debugstr_w(lpSystemName), debugstr_w(lpName), - debugstr_w(lpDisplayName), cchDisplayName, lpLanguageId); + FIXME("%s %s %p %p %p - stub\n", debugstr_w(lpSystemName), debugstr_w(lpName), + lpDisplayName, cchDisplayName, lpLanguageId); return FALSE; }

1 0

Alexandre Julliard : ntdll: Share a few more locale functions with the Unix side.
by Alexandre Julliard 09 Jun '22

09 Jun '22

Module: wine Branch: master Commit: c5eb9cb25e2262fc27479bd9143c5751a34775e0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c5eb9cb25e2262fc27479bd9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 9 12:06:47 2022 +0200 ntdll: Share a few more locale functions with the Unix side. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/locale.c | 113 ++++++++------------------------------------ dlls/ntdll/locale_private.h | 78 ++++++++++++++++++++++++++++++ dlls/ntdll/unix/env.c | 41 +++------------- 3 files changed, 105 insertions(+), 127 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c5eb9cb25e2262fc2747…

1 0

Alexandre Julliard : ntdll: Move the user locale initialization to the Unix side.
by Alexandre Julliard 09 Jun '22

09 Jun '22

Module: wine Branch: master Commit: 21a1c3097236e7de6451ce13958a6dc7edf27285 URL: https://source.winehq.org/git/wine.git/?a=commit;h=21a1c3097236e7de6451ce13… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 9 12:41:29 2022 +0200 ntdll: Move the user locale initialization to the Unix side. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/locale.c | 16 +--------------- dlls/ntdll/unix/env.c | 51 ++++++++++++++++++++++++++++++++++++--------------- 2 files changed, 37 insertions(+), 30 deletions(-) diff --git a/dlls/ntdll/locale.c b/dlls/ntdll/locale.c index b5a11c41516..b4bfdf48f0c 100644 --- a/dlls/ntdll/locale.c +++ b/dlls/ntdll/locale.c @@ -92,10 +92,9 @@ void locale_init(void) { USHORT utf8[2] = { 0, CP_UTF8 }; WCHAR locale[LOCALE_NAME_MAX_LENGTH]; - UNICODE_STRING name, value; LARGE_INTEGER unused; SIZE_T size; - LCID system_lcid, user_lcid = 0; + LCID system_lcid; UINT ansi_cp = 1252, oem_cp = 437; void *ansi_ptr = utf8, *oem_ptr = utf8, *case_ptr; NTSTATUS status; @@ -109,21 +108,8 @@ void locale_init(void) } locale_table = (const NLS_LOCALE_HEADER *)((char *)header + header->locales); - value.Buffer = locale; - value.MaximumLength = sizeof(locale); - RtlInitUnicodeString( &name, L"WINEUSERLOCALE" ); - if (!RtlQueryEnvironmentVariable_U( NULL, &name, &value )) - { - const NLS_LOCALE_LCNAME_INDEX *entry = find_lcname_entry( locale_table, locale ); - if (entry) user_lcid = get_locale_data( locale_table, entry->idx )->idefaultlanguage; - } - if (!user_lcid) user_lcid = system_lcid; - NtSetDefaultUILanguage( user_lcid ); - NtSetDefaultLocale( TRUE, user_lcid ); - if (system_lcid == LOCALE_CUSTOM_UNSPECIFIED) { - system_lcid = MAKELANGID( LANG_ENGLISH, SUBLANG_DEFAULT ); ansi_cp = oem_cp = CP_UTF8; } else diff --git a/dlls/ntdll/unix/env.c b/dlls/ntdll/unix/env.c index 6f67ed40245..a71df03966f 100644 --- a/dlls/ntdll/unix/env.c +++ b/dlls/ntdll/unix/env.c @@ -113,13 +113,17 @@ static char *get_nls_file_path( ULONG type, ULONG id ) return path; } -static void *read_nls_file( ULONG type, ULONG id ) +static void *read_nls_file( const char *name ) { - char *path = get_nls_file_path( type, id ); + const char *dir = build_dir ? build_dir : data_dir; + char *path; struct stat st; void *data, *ret = NULL; int fd; + if (!(path = malloc( strlen(dir) + strlen(name) + 10 ))) return NULL; + sprintf( path, "%s/nls/%s", dir, name ); + if ((fd = open( path, O_RDONLY )) != -1) { fstat( fd, &st ); @@ -135,7 +139,7 @@ static void *read_nls_file( ULONG type, ULONG id ) } close( fd ); } - else ERR( "failed to load %u/%u\n", type, id ); + else ERR( "failed to load %s\n", path ); free( path ); return ret; } @@ -201,7 +205,7 @@ static struct norm_table *nfc_table; static void init_unix_codepage(void) { - nfc_table = read_nls_file( NLS_SECTION_NORMALIZE, NormalizationC ); + nfc_table = read_nls_file( "normnfc.nls" ); } #elif defined(__ANDROID__) /* Android always uses UTF-8 */ @@ -297,8 +301,11 @@ static void init_unix_codepage(void) { if (charset_names[pos].cp != CP_UTF8) { - void *data = read_nls_file( NLS_SECTION_CODEPAGE, charset_names[pos].cp ); - if (data) init_codepage_table( data, &unix_cp ); + char buffer[16]; + void *data; + + sprintf( buffer, "c_%03u.nls", charset_names[pos].cp ); + if ((data = read_nls_file( buffer ))) init_codepage_table( data, &unix_cp ); } return; } @@ -761,17 +768,14 @@ static BOOL unix_to_win_locale( const char *unix_name, char *win_name ) } -static LCID init_system_lcid( const struct locale_nls_header *header ) +static const NLS_LOCALE_DATA *get_win_locale( const NLS_LOCALE_HEADER *header, const char *win_name ) { WCHAR name[LOCALE_NAME_MAX_LENGTH]; - const NLS_LOCALE_HEADER *locale_table = (const NLS_LOCALE_HEADER *)((char *)header + header->locales); const NLS_LOCALE_LCNAME_INDEX *entry; - ascii_to_unicode( name, system_locale, strlen(system_locale) + 1 ); - if ((entry = find_lcname_entry( locale_table, name ))) - return get_locale_data( locale_table, entry->idx )->idefaultlanguage; - - return MAKELANGID( LANG_ENGLISH, SUBLANG_DEFAULT ); + ascii_to_unicode( name, win_name, strlen(win_name) + 1 ); + if (!(entry = find_lcname_entry( header, name ))) return NULL; + return get_locale_data( header, entry->idx ); } @@ -780,6 +784,10 @@ static LCID init_system_lcid( const struct locale_nls_header *header ) */ static void init_locale(void) { + struct locale_nls_header *header; + const NLS_LOCALE_HEADER *locale_table; + const NLS_LOCALE_DATA *locale; + setlocale( LC_ALL, "" ); if (!unix_to_win_locale( setlocale( LC_CTYPE, NULL ), system_locale )) system_locale[0] = 0; if (!unix_to_win_locale( setlocale( LC_MESSAGES, NULL ), user_locale )) user_locale[0] = 0; @@ -834,6 +842,20 @@ static void init_locale(void) if (preferred_langs) CFRelease( preferred_langs ); } #endif + + if ((header = read_nls_file( "locale.nls" ))) + { + locale_table = (const NLS_LOCALE_HEADER *)((char *)header + header->locales); + if ((locale = get_win_locale( locale_table, system_locale ))) + system_lcid = locale->idefaultlanguage; + if ((locale = get_win_locale( locale_table, user_locale ))) + user_lcid = locale->idefaultlanguage; + free( header ); + } + if (!system_lcid) system_lcid = MAKELANGID( LANG_ENGLISH, SUBLANG_DEFAULT ); + if (!user_lcid) user_lcid = system_lcid; + user_ui_language = user_lcid; + setlocale( LC_NUMERIC, "C" ); /* FIXME: oleaut32 depends on this */ } @@ -848,7 +870,7 @@ void init_environment( int argc, char *argv[], char *envp[] ) init_unix_codepage(); init_locale(); - if ((case_table = read_nls_file( NLS_SECTION_CASEMAP, 0 ))) + if ((case_table = read_nls_file( "l_intl.nls" ))) { uctable = case_table + 2; lctable = case_table + case_table[1] + 2; @@ -2190,7 +2212,6 @@ NTSTATUS WINAPI NtInitializeNlsFiles( void **ptr, LCID *lcid, LARGE_INTEGER *siz status = map_section( handle, ptr, &mapsize, PAGE_READONLY ); NtClose( handle ); } - if (!status && !system_lcid) system_lcid = init_system_lcid( *ptr ); *lcid = system_lcid; return status; }

1 0

Akihiro Sagawa : msvcrt: Avoid passing an invalid LCID to LCMapStringW.
by Alexandre Julliard 09 Jun '22

09 Jun '22

Module: wine Branch: master Commit: b4f20eec463d5bffe543305eeab4875074080e04 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b4f20eec463d5bffe543305e… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Wed Jun 8 21:38:02 2022 +0900 msvcrt: Avoid passing an invalid LCID to LCMapStringW. Because it complains as follows on startup in Japanese locale: 002c:err:msvcrt:create_mbcinfo WideCharToMultiByte failed for cp 932, ret=0 (exp 196), error=122 This happens after commit c2a455a20d7b5124bab0086df75178d8c53f27ef. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/mbcs.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index fa25a7092e3..dc9abca1b44 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -333,8 +333,8 @@ threadmbcinfo* create_mbcinfo(int cp, LCID lcid, threadmbcinfo *old_mbcinfo) } GetStringTypeW(CT_CTYPE1, bufW, charcount, chartypes); - LCMapStringW(lcid, LCMAP_LOWERCASE, bufW, charcount, lowW, charcount); - LCMapStringW(lcid, LCMAP_UPPERCASE, bufW, charcount, upW, charcount); + LCMapStringW(mbcinfo->mblcid, LCMAP_LOWERCASE, bufW, charcount, lowW, charcount); + LCMapStringW(mbcinfo->mblcid, LCMAP_UPPERCASE, bufW, charcount, upW, charcount); charcount = 0; for (i = 0; i < maxchar; i++)

1 0

Chilung Chan : po: Update Traditional Chinese translation.
by Alexandre Julliard 09 Jun '22

09 Jun '22

Module: wine Branch: master Commit: ab4e56b3984204afdfc4c6cf9b9a8f9c745b53a5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ab4e56b3984204afdfc4c6cf… Author: Chilung Chan <eason066(a)gmail.com> Date: Thu Jun 9 03:35:01 2022 +0800 po: Update Traditional Chinese translation. Signed-off-by: Chilung Chan <eason066(a)gmail.com> Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/zh_TW.po | 66 ++++++++++++++++++++----------------------------------------- 1 file changed, 21 insertions(+), 45 deletions(-) diff --git a/po/zh_TW.po b/po/zh_TW.po index e1e2c09a37e..f7bd3501244 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2021-12-23 14:09+0800\n" +"PO-Revision-Date: 2022-06-09 03:15+0800\n" "Last-Translator: Chilung Chan <eason066(a)gmail.com>\n" "Language-Team: Chinese (Taiwan)\n" "Language: zh_TW\n" @@ -3924,13 +3924,11 @@ msgstr "無法在這個物件更改屬性描述符中的 'writable' 屬性為 't #: dlls/jscript/jscript.rc:74 msgid "Cyclic __proto__ value" -msgstr "" +msgstr "循環的 __proto__ 值" #: dlls/jscript/jscript.rc:75 -#, fuzzy -#| msgid "Cannot define property '|': object is not extensible" msgid "Cannot create property for a non-extensible object" -msgstr "無法定義屬性 '|': 物件不能擴展" +msgstr "無法為不可擴展的物件建立屬性" #: dlls/jscript/jscript.rc:76 msgid "Cannot define property '|': object is not extensible" @@ -3945,10 +3943,8 @@ msgid "Cannot modify non-writable property '|'" msgstr "無法修改不可寫入的屬性 '|'" #: dlls/jscript/jscript.rc:79 -#, fuzzy -#| msgid "'this' is not a Map object" msgid "'this' is not a | object" -msgstr "'this' 不是 Map 物件" +msgstr "'this' 不是一個 | 物件" #: dlls/jscript/jscript.rc:80 msgid "Property cannot have both accessors and a value" @@ -3965,45 +3961,39 @@ msgstr "Wine" #: dlls/kernelbase/kernelbase.rc:29 msgid "Western Europe and United States" -msgstr "" +msgstr "西歐和美國" #: dlls/kernelbase/kernelbase.rc:30 -#, fuzzy -#| msgid "Central European" msgid "Central Europe" msgstr "中歐語言" #: dlls/kernelbase/kernelbase.rc:34 -#, fuzzy -#| msgid "Turkish" msgid "Turkic" -msgstr "土耳其語" +msgstr "突厥語" #: dlls/kernelbase/kernelbase.rc:36 msgid "Korean" -msgstr "" +msgstr "韓語" #: dlls/kernelbase/kernelbase.rc:37 -#, fuzzy -#| msgid "Operation Ceased" msgid "Traditional Chinese" -msgstr "作業已停止" +msgstr "繁體中文" #: dlls/kernelbase/kernelbase.rc:38 msgid "Simplified Chinese" -msgstr "" +msgstr "簡體中文" #: dlls/kernelbase/kernelbase.rc:43 msgid "Indic" -msgstr "" +msgstr "印度語" #: dlls/kernelbase/kernelbase.rc:44 msgid "Georgian" -msgstr "" +msgstr "喬治亞語" #: dlls/kernelbase/kernelbase.rc:45 msgid "Armenian" -msgstr "" +msgstr "亞美尼亞語" #: dlls/kernelbase/winerror.mc:28 msgid "Success.\n" @@ -6962,54 +6952,40 @@ msgid "This network connection does not exist.\n" msgstr "這個網路連線不存在。\n" #: dlls/kernelbase/winerror.mc:3748 -#, fuzzy -#| msgid "Invalid at interrupt time.\n" msgid "Call interrupted.\n" -msgstr "於插斷時間無效。\n" +msgstr "呼叫已中斷。\n" #: dlls/kernelbase/winerror.mc:3753 -#, fuzzy -#| msgid "Invalid handle.\n" msgid "Invalid file handle.\n" -msgstr "無效的控制代碼。\n" +msgstr "無效的檔案控制代碼。\n" #: dlls/kernelbase/winerror.mc:3763 -#, fuzzy -#| msgid "Invalid network address.\n" msgid "Invalid pointer address.\n" -msgstr "無效的網路位址。\n" +msgstr "無效的指標位址。\n" #: dlls/kernelbase/winerror.mc:3768 -#, fuzzy -#| msgid "Invalid name.\n" msgid "Invalid argument.\n" -msgstr "無效的名稱。\n" +msgstr "無效的引數。\n" #: dlls/kernelbase/winerror.mc:3778 msgid "Connection reset by peer.\n" msgstr "連線被同儕節點重設。\n" #: dlls/kernelbase/winerror.mc:3788 -#, fuzzy -#| msgid "Point not found.\n" msgid "Host not found.\n" -msgstr "找不到點。\n" +msgstr "找不到主機。\n" #: dlls/kernelbase/winerror.mc:3793 -#, fuzzy -#| msgid "Attribute is not found.\n" msgid "Nonauthoritative host not found.\n" -msgstr "找不到屬性。\n" +msgstr "找不到未授權的主機。\n" #: dlls/kernelbase/winerror.mc:3798 -#, fuzzy -#| msgid "Unrecoverable error occurred.\n" msgid "Nonrecoverable error.\n" -msgstr "發生致命錯誤。\n" +msgstr "無法復原的錯誤。\n" #: dlls/kernelbase/winerror.mc:3803 msgid "Name valid, no data record.\n" -msgstr "" +msgstr "名稱有效，無資料記錄。\n" #: dlls/kernelbase/winerror.mc:3817 msgid "Not implemented.\n" @@ -7695,7 +7671,7 @@ msgstr "不支援的狀態轉換。\n" #: dlls/mferror/mferror.mc:291 msgid "Unrecoverable error occurred.\n" -msgstr "發生致命錯誤。\n" +msgstr "發生無法復原的錯誤。\n" #: dlls/mferror/mferror.mc:298 msgid "Sample has too many buffers.\n"

1 0

Louis Lenders : wbemprox: Add a few properties to Win32_QuickFixEngineering.
by Alexandre Julliard 09 Jun '22

09 Jun '22

Module: wine Branch: master Commit: 4e19dbbbf2beeb6dc48357b05da9afd76aabb941 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4e19dbbbf2beeb6dc48357b0… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Thu Jun 9 08:12:18 2022 +0200 wbemprox: Add a few properties to Win32_QuickFixEngineering. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52879 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/builtin.c | 8 +++++++- dlls/wbemprox/tests/query.c | 4 ++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index d27130b00c9..725f3816ad9 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -367,7 +367,10 @@ static const struct column col_qualifier[] = static const struct column col_quickfixengineering[] = { { L"Caption", CIM_STRING }, + { L"Description", CIM_STRING }, { L"HotFixID", CIM_STRING|COL_FLAG_KEY }, + { L"InstalledBy", CIM_STRING }, + { L"InstalledOn", CIM_STRING }, }; static const struct column col_rawsmbiostables[] = { @@ -805,7 +808,10 @@ struct record_qualifier struct record_quickfixengineering { const WCHAR *caption; + const WCHAR *description; const WCHAR *hotfixid; + const WCHAR *installedby; + const WCHAR *installedon; }; struct record_rawsmbiostables { @@ -1011,7 +1017,7 @@ static const struct record_qualifier data_qualifier[] = static const struct record_quickfixengineering data_quickfixengineering[] = { - { L"http://winehq.org", L"KB1234567" }, + { L"http://winehq.org", L"Update", L"KB1234567", L"", L"22/2/2022" }, }; static const struct record_softwarelicensingproduct data_softwarelicensingproduct[] = diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index f6faaea0d99..6c66fd93d95 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -1998,7 +1998,11 @@ static void test_Win32_QuickFixEngineering( IWbemServices *services ) "unexpected variant type %#x\n", V_VT( &caption ) ); ok( type == CIM_STRING, "unexpected type %#lx\n", type ); + check_property( obj, L"Description", VT_BSTR, CIM_STRING ); check_property( obj, L"HotFixID", VT_BSTR, CIM_STRING ); + check_property( obj, L"InstalledBy", VT_BSTR, CIM_STRING ); + check_property( obj, L"InstalledOn", VT_BSTR, CIM_STRING ); + IWbemClassObject_Release( obj ); if (total++ >= 10) break; }

1 0