August 2018 - Wine-Commits - list.winehq.org

Michael Stefaniuc : msvc90: Use the ARRAY_SIZE() macro.
by Alexandre Julliard Aug. 17, 2018

Aug. 17, 2018

Module: wine Branch: master Commit: 93b680510ab7c2e7fee12010a52e49043d5ab94c URL: https://source.winehq.org/git/wine.git/?a=commit;h=93b680510ab7c2e7fee12010… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Aug 16 20:19:28 2018 +0200 msvc90: Use the ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp90/ios.c | 8 ++++---- dlls/msvcp90/locale.c | 4 ++-- dlls/msvcp90/misc.c | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index 61acf19..bf7eea2 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -3237,10 +3237,10 @@ FILE* __cdecl _Fiopen_wchar(const wchar_t *name, int mode, int prot) TRACE("(%s %d %d)\n", debugstr_w(name), mode, prot); - for(mode_idx=0; mode_idx<sizeof(str_mode)/sizeof(str_mode[0]); mode_idx++) + for(mode_idx=0; mode_idx<ARRAY_SIZE(str_mode); mode_idx++) if(str_mode[mode_idx].mode == real_mode) break; - if(mode_idx == sizeof(str_mode)/sizeof(str_mode[0])) + if(mode_idx == ARRAY_SIZE(str_mode)) return NULL; if((mode & OPENMODE__Nocreate) && !(f = _wfopen(name, rW))) @@ -3469,7 +3469,7 @@ int __thiscall basic_filebuf_char_uflow(basic_filebuf_char *this) return c; buf_next = buf; - for(i=0; i < sizeof(buf)/sizeof(buf[0]); i++) { + for(i=0; i < ARRAY_SIZE(buf); i++) { buf[i] = c; switch(codecvt_char_in(this->cvt, &this->state, buf_next, @@ -4112,7 +4112,7 @@ unsigned short __thiscall basic_filebuf_wchar_uflow(basic_filebuf_wchar *this) return fgetwc(this->file); buf_next = buf; - for(i=0; i < sizeof(buf)/sizeof(buf[0]); i++) { + for(i=0; i < ARRAY_SIZE(buf); i++) { if((c = fgetc(this->file)) == EOF) return WEOF; buf[i] = c; diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 5398fcf..83fa3de 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -786,11 +786,11 @@ int __cdecl _Getdateorder(void) #if _MSVCP_VER < 110 if(!GetLocaleInfoW(___lc_handle_func()[LC_TIME], LOCALE_ILDATE, - date_fmt, sizeof(date_fmt)/sizeof(*date_fmt))) + date_fmt, ARRAY_SIZE(date_fmt))) return DATEORDER_no_order; #else if(!GetLocaleInfoEx(___lc_locale_name_func()[LC_TIME], LOCALE_ILDATE, - date_fmt, sizeof(date_fmt)/sizeof(*date_fmt))) + date_fmt, ARRAY_SIZE(date_fmt))) return DATEORDER_no_order; #endif diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index 58e546c..0d1a74e 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -1781,7 +1781,7 @@ typedef struct __Concurrent_vector_base_v4 void **segment; } _Concurrent_vector_base_v4; -#define STORAGE_SIZE (sizeof(this->storage) / sizeof(this->storage[0])) +#define STORAGE_SIZE ARRAY_SIZE(this->storage) #define SEGMENT_SIZE (sizeof(void*) * 8) typedef struct compact_block

1 0

Fabian Maurer : ntdll: Add stub for NtCreateLowBoxToken.
by Alexandre Julliard Aug. 17, 2018

Aug. 17, 2018

Module: wine Branch: master Commit: 754ee566445f6b287c983cd4e918be25cab54a24 URL: https://source.winehq.org/git/wine.git/?a=commit;h=754ee566445f6b287c983cd4… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Thu Aug 16 22:41:41 2018 +0200 ntdll: Add stub for NtCreateLowBoxToken. This is required by chromium x64 sandbox >=win8. Chrome for some reason is not affected. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45646 Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/misc.c | 12 ++++++++++++ dlls/ntdll/ntdll.spec | 1 + 2 files changed, 13 insertions(+) diff --git a/dlls/ntdll/misc.c b/dlls/ntdll/misc.c index 7ccaa0e..2431662 100644 --- a/dlls/ntdll/misc.c +++ b/dlls/ntdll/misc.c @@ -492,3 +492,15 @@ void WINAPI DbgUiRemoteBreakin( void *arg ) { FIXME("stub\n"); } + +NTSTATUS WINAPI NtCreateLowBoxToken(HANDLE *token_handle, HANDLE existing_token_handle, ACCESS_MASK desired_access, + OBJECT_ATTRIBUTES *object_attributes, SID *package_sid, ULONG capability_count, + SID_AND_ATTRIBUTES *capabilities, ULONG handle_count, HANDLE *handle) +{ + FIXME("(%p, %p, %x, %p, %p, %u, %p, %u, %p): stub\n", token_handle, existing_token_handle, desired_access, + object_attributes, package_sid, capability_count, capabilities, handle_count, handle); + + /* We need to return a NULL handle since later it will be passed to CloseHandle and that must not fail */ + *token_handle = NULL; + return STATUS_SUCCESS; +} diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index d321c44..003e4f9 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -142,6 +142,7 @@ @ stdcall NtCreateKey(ptr long ptr long ptr long ptr) @ stdcall NtCreateKeyTransacted(ptr long ptr long ptr long long ptr) @ stdcall NtCreateKeyedEvent(ptr long ptr long) +@ stdcall NtCreateLowBoxToken(ptr long long ptr ptr long ptr long ptr) @ stdcall NtCreateMailslotFile(ptr long ptr ptr long long long ptr) @ stdcall NtCreateMutant(ptr long ptr long) @ stdcall NtCreateNamedPipeFile(ptr long ptr ptr long long long long long long long long long ptr)

1 0

Zebediah Figura : ntoskrnl.exe: Implement IoSetDeviceInterfaceState().
by Alexandre Julliard Aug. 17, 2018

Aug. 17, 2018

Module: wine Branch: master Commit: ad6845b4af2fddb53f68fd53430ff335bc3e1928 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ad6845b4af2fddb53f68fd53… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Aug 16 18:37:37 2018 -0500 ntoskrnl.exe: Implement IoSetDeviceInterfaceState(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 69 ++++++++++++++++++++++++++++++++++++- dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- include/ddk/wdm.h | 1 + 3 files changed, 70 insertions(+), 2 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 80e9b9e..f92dd58 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -43,7 +43,7 @@ #include "wine/unicode.h" #include "wine/server.h" #include "wine/debug.h" - +#include "wine/heap.h" #include "wine/rbtree.h" WINE_DEFAULT_DEBUG_CHANNEL(ntoskrnl); @@ -1193,6 +1193,73 @@ NTSTATUS WINAPI IoDeleteSymbolicLink( UNICODE_STRING *name ) /*********************************************************************** + * IoSetDeviceInterfaceState (NTOSKRNL.EXE.@) + */ +NTSTATUS WINAPI IoSetDeviceInterfaceState( UNICODE_STRING *name, BOOLEAN enable ) +{ + const WCHAR DeviceClassesW[] = {'\\','R','E','G','I','S','T','R','Y','\\', + 'M','a','c','h','i','n','e','\\','S','y','s','t','e','m','\\', + 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', + 'C','o','n','t','r','o','l','\\', + 'D','e','v','i','c','e','C','l','a','s','s','e','s','\\',0}; + const WCHAR controlW[] = {'C','o','n','t','r','o','l',0}; + const WCHAR linkedW[] = {'L','i','n','k','e','d',0}; + const WCHAR slashW[] = {'\\',0}; + const WCHAR hashW[] = {'#',0}; + + size_t namelen = name->Length / sizeof(WCHAR); + HANDLE iface_key, control_key; + OBJECT_ATTRIBUTES attr = {0}; + WCHAR *path, *refstr, *p; + UNICODE_STRING string; + NTSTATUS ret; + size_t len; + + TRACE("(%s, %d)\n", debugstr_us(name), enable); + + refstr = memrchrW(name->Buffer + 4, '\\', namelen - 4); + + len = strlenW(DeviceClassesW) + 38 + 1 + namelen + 2; + + if (!(path = heap_alloc( len * sizeof(WCHAR) ))) + return STATUS_NO_MEMORY; + + strcpyW( path, DeviceClassesW ); + lstrcpynW( path + strlenW( path ), (refstr ? refstr : name->Buffer + namelen) - 38, 39 ); + strcatW( path, slashW ); + p = path + strlenW( path ); + lstrcpynW( path + strlenW( path ), name->Buffer, (refstr ? (refstr - name->Buffer) : namelen) + 1 ); + p[0] = p[1] = p[3] = '#'; + strcatW( path, slashW ); + strcatW( path, hashW ); + if (refstr) + lstrcpynW( path + strlenW( path ), refstr, name->Buffer + namelen - refstr + 1 ); + + attr.Length = sizeof(attr); + attr.ObjectName = &string; + RtlInitUnicodeString( &string, path ); + ret = NtOpenKey( &iface_key, KEY_CREATE_SUB_KEY, &attr ); + if (!ret) + { + attr.RootDirectory = iface_key; + RtlInitUnicodeString( &string, controlW ); + ret = NtCreateKey( &control_key, KEY_SET_VALUE, &attr, 0, NULL, 0, NULL ); + if (!ret) + { + DWORD data = enable; + RtlInitUnicodeString( &string, linkedW ); + ret = NtSetValueKey( control_key, &string, 0, REG_DWORD, &data, sizeof(data) ); + NtClose( control_key ); + } + NtClose( iface_key ); + } + + heap_free( path ); + return ret; +} + + +/*********************************************************************** * IoGetDeviceInterfaces (NTOSKRNL.EXE.@) */ NTSTATUS WINAPI IoGetDeviceInterfaces( const GUID *InterfaceClassGuid, diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 662445a..71ac860 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -449,7 +449,7 @@ @ stub IoRequestDeviceEject @ stub IoReuseIrp @ stub IoSetCompletionRoutineEx -@ stub IoSetDeviceInterfaceState +@ stdcall IoSetDeviceInterfaceState(ptr long) @ stub IoSetDeviceToVerify @ stub IoSetFileOrigin @ stub IoSetHardErrorOrVerifyDevice diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 5abe18b..d2f84d2 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1405,6 +1405,7 @@ void WINAPI IoInitializeIrp(IRP*,USHORT,CCHAR); VOID WINAPI IoInitializeRemoveLockEx(PIO_REMOVE_LOCK,ULONG,ULONG,ULONG,ULONG); void WINAPI IoInvalidateDeviceRelations(PDEVICE_OBJECT,DEVICE_RELATION_TYPE); void WINAPI IoReleaseCancelSpinLock(KIRQL); +NTSTATUS WINAPI IoSetDeviceInterfaceState(UNICODE_STRING*,BOOLEAN); NTSTATUS WINAPI IoWMIRegistrationControl(PDEVICE_OBJECT,ULONG); PKTHREAD WINAPI KeGetCurrentThread(void);

1 0

Zebediah Figura : setupapi: Implement DIGCF_PRESENT.
by Alexandre Julliard Aug. 17, 2018

Aug. 17, 2018

Module: wine Branch: master Commit: 3fa12ba3a5bdb44fa7f055a014048e59c6915aea URL: https://source.winehq.org/git/wine.git/?a=commit;h=3fa12ba3a5bdb44fa7f055a0… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Aug 16 18:37:39 2018 -0500 setupapi: Implement DIGCF_PRESENT. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/devinst.c | 32 ++++++++++++++++++-------------- 1 file changed, 18 insertions(+), 14 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index c69304b..4d53bd7 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -1986,7 +1986,8 @@ end: return ret; } -static void SETUPDI_AddDeviceInterfaces(struct device *device, HKEY key, const GUID *guid) +static void SETUPDI_AddDeviceInterfaces(struct device *device, HKEY key, + const GUID *guid, DWORD flags) { DWORD i, len; WCHAR subKeyName[MAX_PATH]; @@ -2004,19 +2005,23 @@ static void SETUPDI_AddDeviceInterfaces(struct device *device, HKEY key, const G if (*subKeyName == '#') { /* The subkey name is the reference string, with a '#' prepended */ - iface = SETUPDI_CreateDeviceInterface(device, guid, subKeyName + 1); l = RegOpenKeyExW(key, subKeyName, 0, KEY_READ, &subKey); if (!l) { WCHAR symbolicLink[MAX_PATH]; DWORD dataType; - len = sizeof(symbolicLink); - l = RegQueryValueExW(subKey, SymbolicLink, NULL, &dataType, - (BYTE *)symbolicLink, &len); - if (!l && dataType == REG_SZ) - SETUPDI_SetInterfaceSymbolicLink(iface, symbolicLink); - RegCloseKey(subKey); + if (!(flags & DIGCF_PRESENT) || is_linked(subKey)) + { + iface = SETUPDI_CreateDeviceInterface(device, guid, subKeyName + 1); + + len = sizeof(symbolicLink); + l = RegQueryValueExW(subKey, SymbolicLink, NULL, &dataType, + (BYTE *)symbolicLink, &len); + if (!l && dataType == REG_SZ) + SETUPDI_SetInterfaceSymbolicLink(iface, symbolicLink); + RegCloseKey(subKey); + } } } /* Allow enumeration to continue */ @@ -2027,7 +2032,7 @@ static void SETUPDI_AddDeviceInterfaces(struct device *device, HKEY key, const G } static void SETUPDI_EnumerateMatchingInterfaces(HDEVINFO DeviceInfoSet, - HKEY key, const GUID *guid, LPCWSTR enumstr) + HKEY key, const GUID *guid, const WCHAR *enumstr, DWORD flags) { struct DeviceInfoSet *set = DeviceInfoSet; DWORD i, len; @@ -2084,7 +2089,7 @@ static void SETUPDI_EnumerateMatchingInterfaces(HDEVINFO DeviceInfoSet, &deviceClass); if ((device = SETUPDI_CreateDeviceInfo(set, &deviceClass, deviceInst, FALSE))) - SETUPDI_AddDeviceInterfaces(device, subKey, guid); + SETUPDI_AddDeviceInterfaces(device, subKey, guid, flags); } RegCloseKey(deviceKey); } @@ -2139,7 +2144,7 @@ static void SETUPDI_EnumerateInterfaces(HDEVINFO DeviceInfoSet, if (!l) { SETUPDI_EnumerateMatchingInterfaces(DeviceInfoSet, - interfaceKey, &interfaceGuid, enumstr); + interfaceKey, &interfaceGuid, enumstr, flags); RegCloseKey(interfaceKey); } } @@ -2152,7 +2157,7 @@ static void SETUPDI_EnumerateInterfaces(HDEVINFO DeviceInfoSet, * interface's key, so just pass that long */ SETUPDI_EnumerateMatchingInterfaces(DeviceInfoSet, - interfacesKey, guid, enumstr); + interfacesKey, guid, enumstr, flags); } RegCloseKey(interfacesKey); } @@ -2328,8 +2333,7 @@ HDEVINFO WINAPI SetupDiGetClassDevsW(const GUID *class, LPCWSTR enumstr, HWND pa HDEVINFO WINAPI SetupDiGetClassDevsExW(const GUID *class, PCWSTR enumstr, HWND parent, DWORD flags, HDEVINFO deviceset, PCWSTR machine, void *reserved) { - static const DWORD unsupportedFlags = DIGCF_DEFAULT | DIGCF_PRESENT | - DIGCF_PROFILE; + static const DWORD unsupportedFlags = DIGCF_DEFAULT | DIGCF_PROFILE; HDEVINFO set; TRACE("%s %s %p 0x%08x %p %s %p\n", debugstr_guid(class),

1 0

Henri Verbeet : wined3d: Move OpenGL initialisation code to adapter_gl.c.
by Alexandre Julliard Aug. 17, 2018

Aug. 17, 2018

Module: wine Branch: master Commit: cf9536b6bfbefbf5003c7633446a91f6e399c4de URL: https://source.winehq.org/git/wine.git/?a=commit;h=cf9536b6bfbefbf5003c7633… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Aug 17 19:42:09 2018 +0430 wined3d: Move OpenGL initialisation code to adapter_gl.c. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/Makefile.in | 1 + dlls/wined3d/adapter_gl.c | 4290 ++++++++++++++++++++++++++++++++++++ dlls/wined3d/directx.c | 4664 ++-------------------------------------- dlls/wined3d/wined3d_private.h | 43 + 4 files changed, 4538 insertions(+), 4460 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=cf9536b6bfbefbf5003c…

1 0

Alex Henrie : shell32: Add 512k and 314k floppy drive icons.
by Alexandre Julliard Aug. 17, 2018

Aug. 17, 2018

Module: wine Branch: master Commit: d72d37008aff257fc157ebc0c321dcfc2ac87f82 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d72d37008aff257fc157ebc0… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Aug 14 22:09:59 2018 -0600 shell32: Add 512k and 314k floppy drive icons. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shell32.rc | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index 5c5fdf6..20261de 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -442,6 +442,14 @@ IDI_SHELL_FOLDER_OPEN_LARGE ICON folder_open.ico /* @makedep: folder_open.ico */ IDI_SHELL_FOLDER_SMALL_XP ICON folder_open.ico +/* FIXME: Following resource is not yet added */ +/* @makedep: floppy.ico */ +IDI_SHELL_5_12_FLOPPY ICON floppy.ico + +/* FIXME: Following resource is not yet added */ +/* @makedep: floppy.ico */ +IDI_SHELL_3_14_FLOPPY ICON floppy.ico + /* @makedep: floppy.ico */ IDI_SHELL_FLOPPY ICON floppy.ico

1 0

Akihiro Sagawa : winex11: Fix Japanese 106 keyboard scan/vkey code tables.
by Alexandre Julliard Aug. 17, 2018

Aug. 17, 2018

Module: wine Branch: master Commit: 8743188f5d8303ee85dcb927facea1ddd9b030ac URL: https://source.winehq.org/git/wine.git/?a=commit;h=8743188f5d8303ee85dcb927… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Fri Aug 17 17:14:46 2018 +0900 winex11: Fix Japanese 106 keyboard scan/vkey code tables. Otherwise, some symbol keys (e.g. backslash) map differently. As a result, jp106's scan code and vkey tables equal to macjp. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/keyboard.c | 37 ++++++------------------------------- 1 file changed, 6 insertions(+), 31 deletions(-) diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c index 62c115c..353bc5e 100644 --- a/dlls/winex11.drv/keyboard.c +++ b/dlls/winex11.drv/keyboard.c @@ -122,29 +122,14 @@ static const WORD main_key_scan_dvorak[MAIN_LEN] = static const WORD main_key_scan_qwerty_jp106[MAIN_LEN] = { - /* this is my (106-key) keyboard layout, sorry if it doesn't quite match yours */ - /* 1 2 3 4 5 6 7 8 9 0 - ^ \ */ - 0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x29, + /* 1 2 3 4 5 6 7 8 9 0 - ^ \ (Yen) */ + 0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x7D, /* q w e r t y u i o p @ [ */ 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B, /* a s d f g h j k l ; : ] */ 0x1E,0x1F,0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x2B, - /* z x c v b n m , . / */ - 0x2C,0x2D,0x2E,0x2F,0x30,0x31,0x32,0x33,0x34,0x35, - 0x56 /* the 102nd key (actually to the right of l-shift) */ -}; - -static const WORD main_key_scan_qwerty_macjp[MAIN_LEN] = -{ - /* 1 2 3 4 5 6 7 8 9 0 - ^ \ */ - 0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x7d, - /* q w e r t y u i o p @ [ */ - 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B, - /* a s d f g h j k l ; : ] */ - 0x1E,0x1F,0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x2B, - /* z x c v b n m , . / */ - 0x2C,0x2D,0x2E,0x2F,0x30,0x31,0x32,0x33,0x34,0x35, - 0x73 /* the 102nd key (actually to the right of l-shift) */ + /* z x c v b n m , . / \ (Underscore) */ + 0x2C,0x2D,0x2E,0x2F,0x30,0x31,0x32,0x33,0x34,0x35,0x73 }; @@ -161,21 +146,11 @@ static const WORD main_key_vkey_qwerty[MAIN_LEN] = static const WORD main_key_vkey_qwerty_jp106[MAIN_LEN] = { /* NOTE: this layout must concur with the scan codes layout above */ - '1','2','3','4','5','6','7','8','9','0',VK_OEM_MINUS,VK_OEM_PLUS,VK_OEM_3, - 'Q','W','E','R','T','Y','U','I','O','P',VK_OEM_4,VK_OEM_6, - 'A','S','D','F','G','H','J','K','L',VK_OEM_1,VK_OEM_7,VK_OEM_5, - 'Z','X','C','V','B','N','M',VK_OEM_COMMA,VK_OEM_PERIOD,VK_OEM_2, - VK_OEM_102 /* the 102nd key (actually to the right of l-shift) */ -}; - -static const WORD main_key_vkey_qwerty_macjp[MAIN_LEN] = -{ -/* NOTE: this layout must concur with the scan codes layout above */ '1','2','3','4','5','6','7','8','9','0',VK_OEM_MINUS,VK_OEM_7,VK_OEM_5, 'Q','W','E','R','T','Y','U','I','O','P',VK_OEM_3,VK_OEM_4, 'A','S','D','F','G','H','J','K','L',VK_OEM_PLUS,VK_OEM_1,VK_OEM_6, 'Z','X','C','V','B','N','M',VK_OEM_COMMA,VK_OEM_PERIOD,VK_OEM_2, - VK_OEM_102 /* the 102nd key (actually to the right of l-shift) */ + VK_OEM_102 /* the 102nd key (actually to the left of r-shift) */ }; static const WORD main_key_vkey_qwerty_v2[MAIN_LEN] = @@ -940,7 +915,7 @@ static const struct { {0x041a, "Croatian keyboard layout", &main_key_HR, &main_key_scan_qwerty, &main_key_vkey_qwertz}, {0x041a, "Croatian keyboard layout (specific)", &main_key_HR_jelly, &main_key_scan_qwerty, &main_key_vkey_qwerty}, {0x0411, "Japanese 106 keyboard layout", &main_key_JA_jp106, &main_key_scan_qwerty_jp106, &main_key_vkey_qwerty_jp106}, - {0x0411, "Japanese Mac keyboard layout", &main_key_JA_macjp, &main_key_scan_qwerty_macjp, &main_key_vkey_qwerty_macjp}, + {0x0411, "Japanese Mac keyboard layout", &main_key_JA_macjp, &main_key_scan_qwerty_jp106, &main_key_vkey_qwerty_jp106}, {0x0411, "Japanese pc98x1 keyboard layout", &main_key_JA_pc98x1, &main_key_scan_qwerty, &main_key_vkey_qwerty}, {0x041b, "Slovak keyboard layout", &main_key_SK, &main_key_scan_qwerty, &main_key_vkey_qwerty}, {0x041b, "Slovak and Czech keyboard layout without dead keys", &main_key_SK_prog, &main_key_scan_qwerty, &main_key_vkey_qwerty},

1 0

Akihiro Sagawa : user32: Support Japanese keyboard type in GetKeyboardType.
by Alexandre Julliard Aug. 17, 2018

Aug. 17, 2018

Module: wine Branch: master Commit: c6d28c9399a4ef0a261d9e7604cdb9beb7b5edde URL: https://source.winehq.org/git/wine.git/?a=commit;h=c6d28c9399a4ef0a261d9e76… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Fri Aug 17 17:14:49 2018 +0900 user32: Support Japanese keyboard type in GetKeyboardType. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/input.c | 42 ++++++++++++++++++++++++++++++++---------- 1 file changed, 32 insertions(+), 10 deletions(-) diff --git a/dlls/user32/input.c b/dlls/user32/input.c index c621769..1925998 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -917,18 +917,40 @@ DWORD WINAPI OemKeyScan( WORD oem ) INT WINAPI GetKeyboardType(INT nTypeFlag) { TRACE_(keyboard)("(%d)\n", nTypeFlag); - switch(nTypeFlag) + if (LOWORD(GetKeyboardLayout(0)) == MAKELANGID(LANG_JAPANESE, SUBLANG_JAPANESE_JAPAN)) { - case 0: /* Keyboard type */ - return 4; /* AT-101 */ - case 1: /* Keyboard Subtype */ - return 0; /* There are no defined subtypes */ - case 2: /* Number of F-keys */ - return 12; /* We're doing an 101 for now, so return 12 F-keys */ - default: - WARN_(keyboard)("Unknown type\n"); - return 0; /* The book says 0 here, so 0 */ + /* scan code for `_', the key left of r-shift, in Japanese 106 keyboard */ + const UINT JP106_VSC_USCORE = 0x73; + + switch(nTypeFlag) + { + case 0: /* Keyboard type */ + return 7; /* Japanese keyboard */ + case 1: /* Keyboard Subtype */ + /* Test keyboard mappings to detect Japanese keyboard */ + if (MapVirtualKeyW(VK_OEM_102, MAPVK_VK_TO_VSC) == JP106_VSC_USCORE + && MapVirtualKeyW(JP106_VSC_USCORE, MAPVK_VSC_TO_VK) == VK_OEM_102) + return 2; /* Japanese 106 */ + else + return 0; /* AT-101 */ + case 2: /* Number of F-keys */ + return 12; /* It has 12 F-keys */ + } + } + else + { + switch(nTypeFlag) + { + case 0: /* Keyboard type */ + return 4; /* AT-101 */ + case 1: /* Keyboard Subtype */ + return 0; /* There are no defined subtypes */ + case 2: /* Number of F-keys */ + return 12; /* We're doing an 101 for now, so return 12 F-keys */ + } } + WARN_(keyboard)("Unknown type\n"); + return 0; /* The book says 0 here, so 0 */ } /******************************************************************************

1 0

Alex Henrie : shell32: Add window icon.
by Alexandre Julliard Aug. 17, 2018

Aug. 17, 2018

Module: wine Branch: master Commit: 5ee4e0027c941aa74da00166aa5f07bfd292b1b3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5ee4e0027c941aa74da00166… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Aug 14 22:09:58 2018 -0600 shell32: Add window icon. Adapted from new-window.svg in the Tango Icon Library. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/Makefile.in | 3 +- dlls/shell32/shell32.rc | 3 + dlls/shell32/shresdef.h | 1 + dlls/shell32/window.ico | Bin 0 -> 30799 bytes dlls/shell32/window.svg | 598 +++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 604 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5ee4e0027c941aa74da0…

1 0

Nikolay Sivov : winecfg: Update changed state on associations checkbox click.
by Alexandre Julliard Aug. 17, 2018

Aug. 17, 2018

Module: wine Branch: master Commit: 25ba7708d3ad01202d1fd59633f0829360c0b4c4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=25ba7708d3ad01202d1fd596… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Aug 17 00:31:56 2018 +0300 winecfg: Update changed state on associations checkbox click. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winecfg/theme.c | 1 + 1 file changed, 1 insertion(+) diff --git a/programs/winecfg/theme.c b/programs/winecfg/theme.c index 1934538..5304f72 100644 --- a/programs/winecfg/theme.c +++ b/programs/winecfg/theme.c @@ -1320,6 +1320,7 @@ ThemeDlgProc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) case IDC_ENABLE_FILE_ASSOCIATIONS: update_mime_types(hDlg); + SendMessageW(GetParent(hDlg), PSM_CHANGED, 0, 0); break; } break;

1 0