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

Akihiro Sagawa : dinput: Correct key name mappings on Japanese 106 keyboard.
by Alexandre Julliard 17 Aug '18

17 Aug '18

Module: wine Branch: master Commit: 966b3b20de0c060a32c88ba1fce193725310afd7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=966b3b20de0c060a32c88ba1… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Fri Aug 17 17:15:03 2018 +0900 dinput: Correct key name mappings on Japanese 106 keyboard. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/keyboard.c | 42 ++++++++++++++++++++++++++++++++++++++---- 1 file changed, 38 insertions(+), 4 deletions(-) diff --git a/dlls/dinput/keyboard.c b/dlls/dinput/keyboard.c index c810515..6c7b535 100644 --- a/dlls/dinput/keyboard.c +++ b/dlls/dinput/keyboard.c @@ -433,6 +433,40 @@ static HRESULT WINAPI SysKeyboardAImpl_GetCapabilities(LPDIRECTINPUTDEVICE8A ifa return SysKeyboardWImpl_GetCapabilities(IDirectInputDevice8W_from_impl(This), lpDIDevCaps); } +static DWORD map_dik_to_scan(DWORD dik_code, DWORD subtype) +{ + if (dik_code == DIK_PAUSE || dik_code == DIK_NUMLOCK) dik_code ^= 0x80; + if (subtype == DIDEVTYPEKEYBOARD_JAPAN106) + { + switch (dik_code) + { + case DIK_CIRCUMFLEX: + dik_code = 0x0d; + break; + case DIK_AT: + dik_code = 0x1a; + break; + case DIK_LBRACKET: + dik_code = 0x1b; + break; + case DIK_COLON: + dik_code = 0x28; + break; + case DIK_KANJI: + dik_code = 0x29; + break; + case DIK_RBRACKET: + dik_code = 0x2b; + break; + case DIK_BACKSLASH: + dik_code = 0x73; + break; + } + } + + return dik_code; +} + /****************************************************************************** * GetObjectInfo : get information about a device object such as a button * or axis @@ -444,14 +478,14 @@ SysKeyboardAImpl_GetObjectInfo( DWORD dwObj, DWORD dwHow) { + SysKeyboardImpl *This = impl_from_IDirectInputDevice8A(iface); HRESULT res; LONG scan; res = IDirectInputDevice2AImpl_GetObjectInfo(iface, pdidoi, dwObj, dwHow); if (res != DI_OK) return res; - scan = DIDFT_GETINSTANCE(pdidoi->dwType); - if (scan == DIK_PAUSE || scan == DIK_NUMLOCK) scan ^= 0x80; + scan = map_dik_to_scan(DIDFT_GETINSTANCE(pdidoi->dwType), This->subtype); if (!GetKeyNameTextA((scan & 0x80) << 17 | (scan & 0x7f) << 16, pdidoi->tszName, sizeof(pdidoi->tszName))) return DIERR_OBJECTNOTFOUND; @@ -465,14 +499,14 @@ static HRESULT WINAPI SysKeyboardWImpl_GetObjectInfo(LPDIRECTINPUTDEVICE8W iface DWORD dwObj, DWORD dwHow) { + SysKeyboardImpl *This = impl_from_IDirectInputDevice8W(iface); HRESULT res; LONG scan; res = IDirectInputDevice2WImpl_GetObjectInfo(iface, pdidoi, dwObj, dwHow); if (res != DI_OK) return res; - scan = DIDFT_GETINSTANCE(pdidoi->dwType); - if (scan == DIK_PAUSE || scan == DIK_NUMLOCK) scan ^= 0x80; + scan = map_dik_to_scan(DIDFT_GETINSTANCE(pdidoi->dwType), This->subtype); if (!GetKeyNameTextW((scan & 0x80) << 17 | (scan & 0x7f) << 16, pdidoi->tszName, sizeof(pdidoi->tszName)/sizeof(pdidoi->tszName[0]))) return DIERR_OBJECTNOTFOUND;

1 0

Michael Stefaniuc : msvcp60: Use the ARRAY_SIZE() macro.
by Alexandre Julliard 17 Aug '18

17 Aug '18

Module: wine Branch: master Commit: 30905781aa586726bd2b92e553433dacfc2a60d2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=30905781aa586726bd2b92e5… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Aug 16 20:19:27 2018 +0200 msvcp60: 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/msvcp60/ios.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp60/ios.c b/dlls/msvcp60/ios.c index 518c8da..079c4fa 100644 --- a/dlls/msvcp60/ios.c +++ b/dlls/msvcp60/ios.c @@ -2906,10 +2906,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)))

1 0

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

17 Aug '18

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 17 Aug '18

17 Aug '18

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 17 Aug '18

17 Aug '18

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 SPINT_LINKED.
by Alexandre Julliard 17 Aug '18

17 Aug '18

Module: wine Branch: master Commit: f48e726e5130cf78572a2d5c243c82446415f894 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f48e726e5130cf78572a2d5c… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Aug 16 18:37:38 2018 -0500 setupapi: Implement SPINT_LINKED. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/devinst.c | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 9f77669..c69304b 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -91,6 +91,8 @@ static const WCHAR UpperFilters[] = {'U','p','p','e','r','F','i','l','t','e','r' static const WCHAR LowerFilters[] = {'L','o','w','e','r','F','i','l','t','e','r','s',0}; static const WCHAR Phantom[] = {'P','h','a','n','t','o','m',0}; static const WCHAR SymbolicLink[] = {'S','y','m','b','o','l','i','c','L','i','n','k',0}; +static const WCHAR Control[] = {'C','o','n','t','r','o','l',0}; +static const WCHAR Linked[] = {'L','i','n','k','e','d',0}; /* is used to identify if a DeviceInfoSet pointer is valid or not */ @@ -299,6 +301,25 @@ static LPWSTR SETUPDI_CreateSymbolicLinkPath(LPCWSTR instanceId, return ret; } +static BOOL is_linked(HKEY key) +{ + DWORD linked, type, size; + HKEY control_key; + BOOL ret = FALSE; + + if (!RegOpenKeyW(key, Control, &control_key)) + { + size = sizeof(DWORD); + if (!RegQueryValueExW(control_key, Linked, NULL, &type, (BYTE *)&linked, &size) + && type == REG_DWORD && linked) + ret = TRUE; + + RegCloseKey(control_key); + } + + return ret; +} + static struct device_iface *SETUPDI_CreateDeviceInterface(struct device *device, const GUID *class, const WCHAR *refstr) { @@ -334,7 +355,7 @@ static struct device_iface *SETUPDI_CreateDeviceInterface(struct device *device, iface->symlink = symlink; iface->device = device; iface->class = *class; - iface->flags = SPINT_ACTIVE; /* FIXME */ + iface->flags = 0; if (!(path = get_iface_key_path(iface))) { @@ -365,6 +386,10 @@ static struct device_iface *SETUPDI_CreateDeviceInterface(struct device *device, } RegSetValueExW(key, SymbolicLink, 0, REG_SZ, (BYTE *)iface->symlink, lstrlenW(iface->symlink) * sizeof(WCHAR)); + + if (is_linked(key)) + iface->flags |= SPINT_ACTIVE; + RegCloseKey(key); heap_free(path);

1 0

Zebediah Figura : setupapi: Implement DIGCF_PRESENT.
by Alexandre Julliard 17 Aug '18

17 Aug '18

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

Jacek Caban : winegcc: Improve heuristics for -m32/ -m64 options in get_lib_dir.
by Alexandre Julliard 17 Aug '18

17 Aug '18

Module: wine Branch: master Commit: ce4dde3e9af31f896d34251ec2f47a08363893db URL: https://source.winehq.org/git/wine.git/?a=commit;h=ce4dde3e9af31f896d34251e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Aug 17 16:58:15 2018 +0200 winegcc: Improve heuristics for -m32/-m64 options in get_lib_dir. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winegcc/winegcc.c | 47 +++++++++++++++++++++++++++++++++++------------ 1 file changed, 35 insertions(+), 12 deletions(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 931ac53..b586c04 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -448,8 +448,12 @@ static char *get_lib_dir( struct options *opts ) { static const char *stdlibpath[] = { LIBDIR, "/usr/lib", "/usr/local/lib", "/lib" }; static const char libwine[] = "/libwine.so"; + const char *bit_suffix, *other_bit_suffix; unsigned int i; + bit_suffix = opts->target_cpu == CPU_x86_64 || opts->target_cpu == CPU_ARM64 ? "64" : "32"; + other_bit_suffix = opts->target_cpu == CPU_x86_64 || opts->target_cpu == CPU_ARM64 ? "32" : "64"; + for (i = 0; i < sizeof(stdlibpath)/sizeof(stdlibpath[0]); i++) { char *p, *buffer = xmalloc( strlen(stdlibpath[i]) + strlen("/arm-linux-gnueabi") + strlen(libwine) + 1 ); @@ -464,18 +468,9 @@ static char *get_lib_dir( struct options *opts ) strcpy( p, libwine ); if (check_platform( opts, buffer )) goto found; } - if (opts->target_cpu != CPU_x86_64 && opts->target_cpu != CPU_ARM64) - { - strcpy( p, "32" ); - strcat( p, libwine ); - if (check_platform( opts, buffer )) goto found; - } - if (opts->target_cpu == CPU_x86_64 || opts->target_cpu == CPU_ARM64) - { - strcpy( p, "64" ); - strcat( p, libwine ); - if (check_platform( opts, buffer )) goto found; - } + strcpy( p, bit_suffix ); + strcat( p, libwine ); + if (check_platform( opts, buffer )) goto found; switch(opts->target_cpu) { case CPU_x86: strcpy( p, "/i386-linux-gnu" ); break; @@ -488,6 +483,34 @@ static char *get_lib_dir( struct options *opts ) } strcat( p, libwine ); if (check_platform( opts, buffer )) goto found; + + strcpy( buffer, stdlibpath[i] ); + p = buffer + strlen(buffer); + while (p > buffer && p[-1] == '/') p--; + strcpy( p, libwine ); + + /* try to fixup each parent dirs named lib, lib32 or lib64 with target bitness suffix */ + while (p > buffer) + { + p--; + while (p > buffer && *p != '/') p--; + if (*p != '/') break; + if (memcmp( p + 1, "lib", 3 )) continue; + if (p[4] == '/') + { + memmove( p + 6, p + 4, strlen( p + 4 ) + 1 ); + memcpy( p + 4, bit_suffix, 2 ); + if (check_platform( opts, buffer )) goto found; + memmove( p + 4, p + 6, strlen( p + 6 ) + 1 ); + } + else if (!memcmp( p + 4, other_bit_suffix, 2 ) && p[6] == '/') + { + memcpy( p + 4, bit_suffix, 2 ); + if (check_platform( opts, buffer )) goto found; + memcpy( p + 4, other_bit_suffix, 2 ); + } + } + free( buffer ); continue;

1 0

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

17 Aug '18

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

Henri Verbeet : d2d1/tests: Run the tests in parallel.
by Alexandre Julliard 17 Aug '18

17 Aug '18

Module: wine Branch: master Commit: e7949902c51f3ffd5c005aa911176061fd709376 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e7949902c51f3ffd5c005aa9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Aug 17 19:42:10 2018 +0430 d2d1/tests: Run the tests in parallel. Like d3d11. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/tests/d2d1.c | 132 +++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 105 insertions(+), 27 deletions(-) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 26c81e6..a8b67f1 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -25,6 +25,15 @@ #include "initguid.h" #include "dwrite.h" #include "wincodec.h" +#include "wine/heap.h" + +static BOOL use_mt = TRUE; + +static struct test_entry +{ + void (*test)(void); +} *mt_tests; +size_t mt_tests_size, mt_test_count; struct resource_readback { @@ -83,6 +92,63 @@ struct expected_geometry_figure const struct geometry_segment *segments; }; +static void queue_test(void (*test)(void)) +{ + if (mt_test_count >= mt_tests_size) + { + mt_tests_size = max(16, mt_tests_size * 2); + mt_tests = heap_realloc(mt_tests, mt_tests_size * sizeof(*mt_tests)); + } + mt_tests[mt_test_count++].test = test; +} + +static DWORD WINAPI thread_func(void *ctx) +{ + LONG *i = ctx, j; + + while (*i < mt_test_count) + { + j = *i; + if (InterlockedCompareExchange(i, j + 1, j) == j) + mt_tests[j].test(); + } + + return 0; +} + +static void run_queued_tests(void) +{ + unsigned int thread_count, i; + HANDLE *threads; + SYSTEM_INFO si; + LONG test_idx; + + if (!use_mt) + { + for (i = 0; i < mt_test_count; ++i) + { + mt_tests[i].test(); + } + + return; + } + + GetSystemInfo(&si); + thread_count = si.dwNumberOfProcessors; + threads = heap_calloc(thread_count, sizeof(*threads)); + for (i = 0, test_idx = 0; i < thread_count; ++i) + { + threads[i] = CreateThread(NULL, 0, thread_func, &test_idx, 0, NULL); + ok(!!threads[i], "Failed to create thread %u.\n", i); + } + WaitForMultipleObjects(thread_count, threads, TRUE, INFINITE); + for (i = 0; i < thread_count; ++i) + { + CloseHandle(threads[i]); + } + heap_free(threads); +} + static void set_point(D2D1_POINT_2F *point, float x, float y) { point->x = x; @@ -6465,31 +6531,43 @@ static void test_create_device(void) START_TEST(d2d1) { - test_clip(); - test_state_block(); - test_color_brush(); - test_bitmap_brush(); - test_linear_brush(); - test_radial_brush(); - test_path_geometry(); - test_rectangle_geometry(); - test_rounded_rectangle_geometry(); - test_bitmap_formats(); - test_alpha_mode(); - test_shared_bitmap(); - test_bitmap_updates(); - test_opacity_brush(); - test_create_target(); - test_draw_text_layout(); - test_dc_target(); - test_hwnd_target(); - test_bitmap_target(); - test_desktop_dpi(); - test_stroke_style(); - test_gradient(); - test_draw_geometry(); - test_gdi_interop(); - test_layer(); - test_bezier_intersect(); - test_create_device(); + unsigned int argc, i; + char **argv; + + argc = winetest_get_mainargs(&argv); + for (i = 2; i < argc; ++i) + { + if (!strcmp(argv[i], "--single")) + use_mt = FALSE; + } + + queue_test(test_clip); + queue_test(test_state_block); + queue_test(test_color_brush); + queue_test(test_bitmap_brush); + queue_test(test_linear_brush); + queue_test(test_radial_brush); + queue_test(test_path_geometry); + queue_test(test_rectangle_geometry); + queue_test(test_rounded_rectangle_geometry); + queue_test(test_bitmap_formats); + queue_test(test_alpha_mode); + queue_test(test_shared_bitmap); + queue_test(test_bitmap_updates); + queue_test(test_opacity_brush); + queue_test(test_create_target); + queue_test(test_draw_text_layout); + queue_test(test_dc_target); + queue_test(test_hwnd_target); + queue_test(test_bitmap_target); + queue_test(test_desktop_dpi); + queue_test(test_stroke_style); + queue_test(test_gradient); + queue_test(test_draw_geometry); + queue_test(test_gdi_interop); + queue_test(test_layer); + queue_test(test_bezier_intersect); + queue_test(test_create_device); + + run_queued_tests(); }

1 0