October 2018 - Wine-commits

Michael Stefaniuc : wrc: Use the ARRAY_SIZE() macro.
by Alexandre Julliard 23 Oct '18

23 Oct '18

Module: wine Branch: master Commit: 79a6dd21ad617fd63cb30ac7ff1e8440e4bfa081 URL: https://source.winehq.org/git/wine.git/?a=commit;h=79a6dd21ad617fd63cb30ac7… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Oct 22 22:39:04 2018 +0200 wrc: Use the ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/wrc/po.c | 10 +++++----- tools/wrc/utils.c | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tools/wrc/po.c b/tools/wrc/po.c index c72a422..74bcf1e 100644 --- a/tools/wrc/po.c +++ b/tools/wrc/po.c @@ -602,7 +602,7 @@ static const char *get_language_name( const language_t *lang ) static char name[20]; unsigned int i; - for (i = 0; i < sizeof(languages)/sizeof(languages[0]); i++) + for (i = 0; i < ARRAY_SIZE(languages); i++) if (languages[i].id == lang->id && languages[i].sub == lang->sub) return languages[i].name; @@ -1314,7 +1314,7 @@ static ver_value_t *translate_stringfileinfo( ver_value_t *val, language_t *lang new_blk = new_ver_block(); *new_blk = *blk; name = convert_msgid_ascii( blk->name, 0 ); - for (i = 0; i < sizeof(block_name)/sizeof(block_name[0]); i++) + for (i = 0; i < ARRAY_SIZE(block_name); i++) { if (!strcasecmp( name, english_block_name[i] )) { @@ -1344,7 +1344,7 @@ static ver_value_t *translate_stringfileinfo( ver_value_t *val, language_t *lang val = val->next; } - for (i = 0; i < sizeof(block_name)/sizeof(block_name[0]); i++) + for (i = 0; i < ARRAY_SIZE(block_name); i++) free( block_name[i] ); return head; } @@ -1494,10 +1494,10 @@ void add_translations( const char *po_dir ) if ((p = strchr( buffer, '#' ))) *p = 0; for (tok = strtok( buffer, " \t\r\n" ); tok; tok = strtok( NULL, " \t\r\n" )) { - for (i = 0; i < sizeof(languages)/sizeof(languages[0]); i++) + for (i = 0; i < ARRAY_SIZE(languages); i++) if (!strcmp( tok, languages[i].name )) break; - if (i == sizeof(languages)/sizeof(languages[0])) + if (i == ARRAY_SIZE(languages)) error( "unknown language '%s'\n", tok ); name = strmake( "%s/%s.mo", po_dir, tok ); diff --git a/tools/wrc/utils.c b/tools/wrc/utils.c index 800692a..633ec57 100644 --- a/tools/wrc/utils.c +++ b/tools/wrc/utils.c @@ -565,7 +565,7 @@ int get_language_codepage( unsigned short lang, unsigned short sublang ) unsigned int i; int cp = -1, defcp = -1; - for (i = 0; i < sizeof(lang2cps)/sizeof(lang2cps[0]); i++) + for (i = 0; i < ARRAY_SIZE(lang2cps); i++) { if (lang2cps[i].lang != lang) continue; if (lang2cps[i].sublang == sublang)

1 0

André Hentschel : gdi32: Spelling fixes in a comment.
by Alexandre Julliard 23 Oct '18

23 Oct '18

Module: wine Branch: master Commit: e64cd493d247aa67fe21c3ba0878d48705a7ae9a URL: https://source.winehq.org/git/wine.git/?a=commit;h=e64cd493d247aa67fe21c3ba… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Oct 23 13:12:56 2018 +0200 gdi32: Spelling fixes in a comment. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 59cb73b..b3d67ff 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -753,9 +753,9 @@ static struct font_gamma_ramp *get_font_gamma_ramp( void ) gamma = min( max( gamma, 1000 ), 2200 ); } - /* Calibration the difference between the registry value and the Wine gamma value. - This shows a roughly similar looks to the Windows Native with the same registry value. - MS GDI seems to be rasterizing the outline at the different rate than FreeType. */ + /* Calibrating the difference between the registry value and the Wine gamma value. + This looks roughly similar to Windows Native with the same registry value. + MS GDI seems to be rasterizing the outline at a different rate than FreeType. */ gamma = 1000 * gamma / 1400; for (i = 0; i < 256; i++)

1 0

Dmitry Timoshkov : crypt32/tests: Actually test the return value of CryptGetKeyParam.
by Alexandre Julliard 23 Oct '18

23 Oct '18

Module: wine Branch: master Commit: c3d6211aef2aaeeda1712ec4ae62c44909e7d1f5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c3d6211aef2aaeeda1712ec4… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Oct 22 14:17:34 2018 +0300 crypt32/tests: Actually test the return value of CryptGetKeyParam. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/tests/encode.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/tests/encode.c b/dlls/crypt32/tests/encode.c index 4a6626a..2da2a87 100644 --- a/dlls/crypt32/tests/encode.c +++ b/dlls/crypt32/tests/encode.c @@ -8435,7 +8435,7 @@ static void testImportPublicKey(HCRYPTPROV csp, PCERT_PUBLIC_KEY_INFO info) ok(ret, "CryptImportPublicKeyInfoEx failed: %08x\n", GetLastError()); dwSize = sizeof(ai); - CryptGetKeyParam(key, KP_ALGID, (LPVOID)&ai, &dwSize, 0); + ret = CryptGetKeyParam(key, KP_ALGID, (LPVOID)&ai, &dwSize, 0); ok(ret, "CryptGetKeyParam failed: %08x\n", GetLastError()); if(ret) { @@ -8451,7 +8451,7 @@ static void testImportPublicKey(HCRYPTPROV csp, PCERT_PUBLIC_KEY_INFO info) ok(ret, "CryptImportPublicKeyInfoEx failed: %08x\n", GetLastError()); dwSize = sizeof(ai); - CryptGetKeyParam(key, KP_ALGID, (LPVOID)&ai, &dwSize, 0); + ret = CryptGetKeyParam(key, KP_ALGID, (LPVOID)&ai, &dwSize, 0); ok(ret, "CryptGetKeyParam failed: %08x\n", GetLastError()); if(ret) {

1 0

Dmitry Timoshkov : crypt32: Make I_CryptGetDefaultCryptProv hot-patchable.
by Alexandre Julliard 23 Oct '18

23 Oct '18

Module: wine Branch: master Commit: a7d07684ccdd21248a760641be6d1cb31f64f219 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a7d07684ccdd21248a760641… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Oct 22 14:17:48 2018 +0300 crypt32: Make I_CryptGetDefaultCryptProv hot-patchable. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/crypt32/main.c b/dlls/crypt32/main.c index 79a0ce1..d93fb91 100644 --- a/dlls/crypt32/main.c +++ b/dlls/crypt32/main.c @@ -174,7 +174,7 @@ BOOL WINAPI I_CryptGetOssGlobal(DWORD x) return FALSE; } -HCRYPTPROV WINAPI I_CryptGetDefaultCryptProv(DWORD reserved) +HCRYPTPROV WINAPI DECLSPEC_HOTPATCH I_CryptGetDefaultCryptProv(DWORD reserved) { HCRYPTPROV ret;

1 0

Dmitry Timoshkov : crypt32: Add support for exporting public key information from a 3rd party CSP.
by Alexandre Julliard 23 Oct '18

23 Oct '18

Module: wine Branch: master Commit: f0d6637f0f71a605cfb8a49d2f45a2ce6a46beaf URL: https://source.winehq.org/git/wine.git/?a=commit;h=f0d6637f0f71a605cfb8a49d… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Oct 22 14:17:56 2018 +0300 crypt32: Add support for exporting public key information from a 3rd party CSP. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/encode.c | 90 +++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 81 insertions(+), 9 deletions(-) diff --git a/dlls/crypt32/encode.c b/dlls/crypt32/encode.c index 62d2bc9..9a9850d 100644 --- a/dlls/crypt32/encode.c +++ b/dlls/crypt32/encode.c @@ -4779,20 +4779,22 @@ BOOL WINAPI CryptExportPublicKeyInfo(HCRYPTPROV_OR_NCRYPT_KEY_HANDLE hCryptProv, NULL, 0, NULL, pInfo, pcbInfo); } -static BOOL WINAPI CRYPT_ExportRsaPublicKeyInfoEx(HCRYPTPROV_OR_NCRYPT_KEY_HANDLE hCryptProv, +typedef BOOL (WINAPI *EncodePublicKeyAndParametersFunc)(DWORD dwCertEncodingType, + LPSTR pszPublicKeyObjId, BYTE *pbPubKey, DWORD cbPubKey, DWORD dwFlags, void *pvAuxInfo, + BYTE **ppPublicKey, DWORD *pcbPublicKey, BYTE **ppbParams, DWORD *pcbParams); + +static BOOL WINAPI CRYPT_ExportPublicKeyInfoEx(HCRYPTPROV_OR_NCRYPT_KEY_HANDLE hCryptProv, DWORD dwKeySpec, DWORD dwCertEncodingType, LPSTR pszPublicKeyObjId, DWORD dwFlags, void *pvAuxInfo, PCERT_PUBLIC_KEY_INFO pInfo, DWORD *pcbInfo) { BOOL ret; HCRYPTKEY key; - static CHAR oid[] = szOID_RSA_RSA; + static CHAR rsa_oid[] = szOID_RSA_RSA; TRACE_(crypt)("(%08lx, %d, %08x, %s, %08x, %p, %p, %d)\n", hCryptProv, dwKeySpec, dwCertEncodingType, debugstr_a(pszPublicKeyObjId), dwFlags, pvAuxInfo, pInfo, pInfo ? *pcbInfo : 0); - if (!pszPublicKeyObjId) - pszPublicKeyObjId = oid; if ((ret = CryptGetUserKey(hCryptProv, dwKeySpec, &key))) { DWORD keySize = 0; @@ -4800,16 +4802,86 @@ static BOOL WINAPI CRYPT_ExportRsaPublicKeyInfoEx(HCRYPTPROV_OR_NCRYPT_KEY_HANDL ret = CryptExportKey(key, 0, PUBLICKEYBLOB, 0, NULL, &keySize); if (ret) { - LPBYTE pubKey = CryptMemAlloc(keySize); + PUBLICKEYSTRUC *pubKey = CryptMemAlloc(keySize); if (pubKey) { - ret = CryptExportKey(key, 0, PUBLICKEYBLOB, 0, pubKey, - &keySize); + ret = CryptExportKey(key, 0, PUBLICKEYBLOB, 0, (BYTE *)pubKey, &keySize); if (ret) { - DWORD encodedLen = 0; + DWORD encodedLen; + + if (!pszPublicKeyObjId) + { + static HCRYPTOIDFUNCSET set; + EncodePublicKeyAndParametersFunc encodeFunc = NULL; + HCRYPTOIDFUNCADDR hFunc = NULL; + + pszPublicKeyObjId = (LPSTR)CertAlgIdToOID(pubKey->aiKeyAlg); + TRACE("public key algid %#x (%s)\n", pubKey->aiKeyAlg, debugstr_a(pszPublicKeyObjId)); + + if (!set) /* FIXME: there is no a public macro */ + set = CryptInitOIDFunctionSet("CryptDllEncodePublicKeyAndParameters", 0); + + CryptGetOIDFunctionAddress(set, dwCertEncodingType, pszPublicKeyObjId, 0, (void **)&encodeFunc, &hFunc); + if (encodeFunc) + { + BYTE *key_data = NULL; + DWORD key_size = 0; + BYTE *params = NULL; + DWORD params_size = 0; + + ret = encodeFunc(dwCertEncodingType, pszPublicKeyObjId, (BYTE *)pubKey, keySize, + dwFlags, pvAuxInfo, &key_data, &key_size, &params, &params_size); + if (ret) + { + DWORD oid_size = strlen(pszPublicKeyObjId) + 1; + DWORD size_needed = sizeof(*pInfo) + oid_size + key_size + params_size; + + if (!pInfo) + *pcbInfo = size_needed; + else if (*pcbInfo < size_needed) + { + *pcbInfo = size_needed; + SetLastError(ERROR_MORE_DATA); + ret = FALSE; + } + else + { + *pcbInfo = size_needed; + pInfo->Algorithm.pszObjId = (char *)(pInfo + 1); + lstrcpyA(pInfo->Algorithm.pszObjId, pszPublicKeyObjId); + if (params) + { + pInfo->Algorithm.Parameters.cbData = params_size; + pInfo->Algorithm.Parameters.pbData = (BYTE *)pInfo->Algorithm.pszObjId + oid_size; + memcpy(pInfo->Algorithm.Parameters.pbData, params, params_size); + } + else + { + pInfo->Algorithm.Parameters.cbData = 0; + pInfo->Algorithm.Parameters.pbData = NULL; + } + pInfo->PublicKey.pbData = (BYTE *)pInfo->Algorithm.pszObjId + oid_size + params_size; + pInfo->PublicKey.cbData = key_size; + memcpy(pInfo->PublicKey.pbData, key_data, key_size); + pInfo->PublicKey.cUnusedBits = 0; + } + + CryptMemFree(key_data); + CryptMemFree(params); + } + + CryptMemFree(pubKey); + CryptFreeOIDFunctionAddress(hFunc, 0); + return ret; + } + + /* fallback to RSA */ + pszPublicKeyObjId = rsa_oid; + } + encodedLen = 0; ret = CryptEncodeObject(dwCertEncodingType, RSA_CSP_PUBLICKEYBLOB, pubKey, NULL, &encodedLen); if (ret) @@ -4887,7 +4959,7 @@ BOOL WINAPI CryptExportPublicKeyInfoEx(HCRYPTPROV_OR_NCRYPT_KEY_HANDLE hCryptPro 0, (void **)&exportFunc, &hFunc); } if (!exportFunc) - exportFunc = CRYPT_ExportRsaPublicKeyInfoEx; + exportFunc = CRYPT_ExportPublicKeyInfoEx; ret = exportFunc(hCryptProv, dwKeySpec, dwCertEncodingType, pszPublicKeyObjId, dwFlags, pvAuxInfo, pInfo, pcbInfo); if (hFunc)

1 0

Dmitry Timoshkov : crypt32: Add support for importing public key information to a 3rd party CSP.
by Alexandre Julliard 23 Oct '18

23 Oct '18

Module: wine Branch: master Commit: 62838182d55be0c454fe29a51aa172521d80bf2a URL: https://source.winehq.org/git/wine.git/?a=commit;h=62838182d55be0c454fe29a5… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Oct 22 14:17:59 2018 +0300 crypt32: Add support for importing public key information to a 3rd party CSP. Based on a patch by Alexander Morozov. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/encode.c | 35 +++++++++++++++++++++++++++++++---- include/wincrypt.h | 1 + 2 files changed, 32 insertions(+), 4 deletions(-) diff --git a/dlls/crypt32/encode.c b/dlls/crypt32/encode.c index 9a9850d..9d052b6 100644 --- a/dlls/crypt32/encode.c +++ b/dlls/crypt32/encode.c @@ -4974,21 +4974,48 @@ BOOL WINAPI CryptImportPublicKeyInfo(HCRYPTPROV hCryptProv, 0, 0, NULL, phKey); } -static BOOL WINAPI CRYPT_ImportRsaPublicKeyInfoEx(HCRYPTPROV hCryptProv, +typedef BOOL (WINAPI *ConvertPublicKeyInfoFunc)(DWORD dwCertEncodingType, + PCERT_PUBLIC_KEY_INFO pInfo, ALG_ID aiKeyAlg, DWORD dwFlags, + BYTE **ppbData, DWORD *dwDataLen); + +static BOOL WINAPI CRYPT_ImportPublicKeyInfoEx(HCRYPTPROV hCryptProv, DWORD dwCertEncodingType, PCERT_PUBLIC_KEY_INFO pInfo, ALG_ID aiKeyAlg, DWORD dwFlags, void *pvAuxInfo, HCRYPTKEY *phKey) { + static HCRYPTOIDFUNCSET set = NULL; + ConvertPublicKeyInfoFunc convertFunc = NULL; + HCRYPTOIDFUNCADDR hFunc = NULL; BOOL ret; - DWORD pubKeySize = 0; + DWORD pubKeySize; + LPBYTE pubKey; TRACE_(crypt)("(%08lx, %08x, %p, %08x, %08x, %p, %p)\n", hCryptProv, dwCertEncodingType, pInfo, aiKeyAlg, dwFlags, pvAuxInfo, phKey); + if (!set) + set = CryptInitOIDFunctionSet(CRYPT_OID_CONVERT_PUBLIC_KEY_INFO_FUNC, 0); + CryptGetOIDFunctionAddress(set, dwCertEncodingType, pInfo->Algorithm.pszObjId, + 0, (void **)&convertFunc, &hFunc); + if (convertFunc) + { + pubKey = NULL; + pubKeySize = 0; + ret = convertFunc(dwCertEncodingType, pInfo, aiKeyAlg, dwFlags, &pubKey, &pubKeySize); + if (ret) + { + ret = CryptImportKey(hCryptProv, pubKey, pubKeySize, 0, 0, phKey); + CryptMemFree(pubKey); + } + + CryptFreeOIDFunctionAddress(hFunc, 0); + return ret; + } + ret = CryptDecodeObject(dwCertEncodingType, RSA_CSP_PUBLICKEYBLOB, pInfo->PublicKey.pbData, pInfo->PublicKey.cbData, 0, NULL, &pubKeySize); if (ret) { - LPBYTE pubKey = CryptMemAlloc(pubKeySize); + pubKey = CryptMemAlloc(pubKeySize); if (pubKey) { @@ -5031,7 +5058,7 @@ BOOL WINAPI CryptImportPublicKeyInfoEx(HCRYPTPROV hCryptProv, CryptGetOIDFunctionAddress(set, dwCertEncodingType, pInfo->Algorithm.pszObjId, 0, (void **)&importFunc, &hFunc); if (!importFunc) - importFunc = CRYPT_ImportRsaPublicKeyInfoEx; + importFunc = CRYPT_ImportPublicKeyInfoEx; ret = importFunc(hCryptProv, dwCertEncodingType, pInfo, aiKeyAlg, dwFlags, pvAuxInfo, phKey); if (hFunc) diff --git a/include/wincrypt.h b/include/wincrypt.h index 0ba3b5e..bcb67ff 100644 --- a/include/wincrypt.h +++ b/include/wincrypt.h @@ -2345,6 +2345,7 @@ static const WCHAR CERT_TRUST_PUB_AUTHENTICODE_FLAGS_VALUE_NAME[] = #define CRYPT_OID_IMPORT_PRIVATE_KEY_INFO_FUNC "CryptDllImportPrivateKeyInfoEx" #define CRYPT_OID_VERIFY_CERTIFICATE_CHAIN_POLICY_FUNC \ "CertDllVerifyCertificateChainPolicy" +#define CRYPT_OID_CONVERT_PUBLIC_KEY_INFO_FUNC "CryptDllConvertPublicKeyInfo" #define URL_OID_GET_OBJECT_URL_FUNC "UrlDllGetObjectUrl" #define TIME_VALID_OID_GET_OBJECT_FUNC "TimeValidDllGetObject" #define CMSG_OID_GEN_CONTENT_ENCRYPT_KEY_FUNC "CryptMsgDllGenContentEncryptKey"

1 0

Alex Henrie : winex11: Return FALSE from LoadTabletInfo if the system isn' t a tablet.
by Alexandre Julliard 23 Oct '18

23 Oct '18

Module: wine Branch: master Commit: 4e122bdaddf1a1c6d6211b5d7ce412b23a6efe57 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4e122bdaddf1a1c6d6211b5d… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Oct 21 16:46:32 2018 -0600 winex11: Return FALSE from LoadTabletInfo if the system isn't a tablet. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46024 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/wintab.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/winex11.drv/wintab.c b/dlls/winex11.drv/wintab.c index e4259bf..7a9a3a7 100644 --- a/dlls/winex11.drv/wintab.c +++ b/dlls/winex11.drv/wintab.c @@ -761,14 +761,14 @@ BOOL CDECL X11DRV_LoadTabletInfo(HWND hwnddefault) } /* for XListInputDevices */ pXFreeDeviceList(devices); - if (axis_read_complete) - gSysDevice.NCSRTYPES = gNumCursors; - else + if (!axis_read_complete) { disable_system_cursors(); WARN("Did not find a valid stylus, unable to determine system context parameters. Wintab is disabled.\n"); + return FALSE; } + gSysDevice.NCSRTYPES = gNumCursors; return TRUE; }

1 0

Jacek Caban : winex11.drv: Force changing lock keys state if hooks blocked keyboard input processing.
by Alexandre Julliard 23 Oct '18

23 Oct '18

Module: wine Branch: master Commit: cbc657a244d16d52414ab7c8319afa885c681822 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cbc657a244d16d52414ab7c8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 22 16:29:42 2018 +0200 winex11.drv: Force changing lock keys state if hooks blocked keyboard input processing. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/keyboard.c | 29 +++++++++++++++++++++++------ 1 file changed, 23 insertions(+), 6 deletions(-) diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c index 353bc5e..b9b8293 100644 --- a/dlls/winex11.drv/keyboard.c +++ b/dlls/winex11.drv/keyboard.c @@ -1294,6 +1294,26 @@ BOOL X11DRV_KeymapNotify( HWND hwnd, XEvent *event ) return TRUE; } +static void adjust_lock_state( BYTE *keystate, HWND hwnd, WORD vkey, WORD scan, DWORD flags, DWORD time ) +{ + BYTE prev_state = keystate[vkey] & 0x01; + + X11DRV_send_keyboard_input( hwnd, vkey, scan, flags, time ); + X11DRV_send_keyboard_input( hwnd, vkey, scan, flags ^ KEYEVENTF_KEYUP, time ); + + /* Keyboard hooks may have blocked processing lock keys causing our state + * to be different than state on X server side. Although Windows allows hooks + * to block changing state, we can't prevent it on X server side. Having + * different states would cause us to try to adjust it again on the next + * key event. We prevent that by overriding hooks and setting key states here. */ + if (get_async_key_state( keystate ) && (keystate[vkey] & 0x01) == prev_state) + { + WARN("keystate %x not changed (%#.2x), probably blocked by hooks\n", vkey, keystate[vkey]); + keystate[vkey] ^= 0x01; + set_async_key_state( keystate ); + } +} + static void update_lock_state( HWND hwnd, WORD vkey, UINT state, DWORD time ) { BYTE keystate[256]; @@ -1309,8 +1329,7 @@ static void update_lock_state( HWND hwnd, WORD vkey, UINT state, DWORD time ) DWORD flags = 0; if (keystate[VK_CAPITAL] & 0x80) flags ^= KEYEVENTF_KEYUP; TRACE("Adjusting CapsLock state (%#.2x)\n", keystate[VK_CAPITAL]); - X11DRV_send_keyboard_input( hwnd, VK_CAPITAL, 0x3a, flags, time ); - X11DRV_send_keyboard_input( hwnd, VK_CAPITAL, 0x3a, flags ^ KEYEVENTF_KEYUP, time ); + adjust_lock_state( keystate, hwnd, VK_CAPITAL, 0x3a, flags, time ); } /* Adjust the NUMLOCK state if it has been changed outside wine */ @@ -1319,8 +1338,7 @@ static void update_lock_state( HWND hwnd, WORD vkey, UINT state, DWORD time ) DWORD flags = KEYEVENTF_EXTENDEDKEY; if (keystate[VK_NUMLOCK] & 0x80) flags ^= KEYEVENTF_KEYUP; TRACE("Adjusting NumLock state (%#.2x)\n", keystate[VK_NUMLOCK]); - X11DRV_send_keyboard_input( hwnd, VK_NUMLOCK, 0x45, flags, time ); - X11DRV_send_keyboard_input( hwnd, VK_NUMLOCK, 0x45, flags ^ KEYEVENTF_KEYUP, time ); + adjust_lock_state( keystate, hwnd, VK_NUMLOCK, 0x45, flags, time ); } /* Adjust the SCROLLLOCK state if it has been changed outside wine */ @@ -1329,8 +1347,7 @@ static void update_lock_state( HWND hwnd, WORD vkey, UINT state, DWORD time ) DWORD flags = 0; if (keystate[VK_SCROLL] & 0x80) flags ^= KEYEVENTF_KEYUP; TRACE("Adjusting ScrLock state (%#.2x)\n", keystate[VK_SCROLL]); - X11DRV_send_keyboard_input( hwnd, VK_SCROLL, 0x46, flags, time ); - X11DRV_send_keyboard_input( hwnd, VK_SCROLL, 0x46, flags ^ KEYEVENTF_KEYUP, time ); + adjust_lock_state( keystate, hwnd, VK_SCROLL, 0x46, flags, time ); } }

1 0

Francois Gouget : testbot: Add Missions support.
by Alexandre Julliard 23 Oct '18

23 Oct '18

Module: tools Branch: master Commit: 66b046d90acd9c744f16adf34700c2be96ffa994 URL: https://source.winehq.org/git/tools.git/?a=commit;h=66b046d90acd9c744f16adf… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Oct 22 03:05:08 2018 +0200 testbot: Add Missions support. Missions allow the TestBot administrator to specify which tests a given VM should perform for mailing list patches. For instance this can be used to restrict a 64 bit Windows VM to 32 bit tests (useful when it duplicates another VM with just a different locale). Furthermore missions can get options. Currently only the 'nosubmit' option is supported and it disables submitting the WineTest results online. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/CheckForWinetestUpdate.pl | 105 ++++++++++++++++++-------- testbot/bin/WineRunTask.pl | 12 ++- testbot/bin/WineRunWineTest.pl | 31 ++++---- testbot/bin/build/WineTest.pl | 131 +++++++++++++++++---------------- testbot/ddl/update41.sql | 48 ++++++++++++ testbot/ddl/winetestbot.sql | 2 + testbot/doc/winetestbot-schema.dia | 46 ++++++++++++ testbot/lib/WineTestBot/Missions.pm | 99 +++++++++++++++++++++++++ testbot/lib/WineTestBot/PatchUtils.pm | 8 +- testbot/lib/WineTestBot/Patches.pm | 134 ++++++++++++++++++++-------------- testbot/lib/WineTestBot/StepsTasks.pm | 55 +++++++++----- testbot/lib/WineTestBot/Tasks.pm | 1 + testbot/lib/WineTestBot/VMs.pm | 41 +++++++++++ testbot/web/JobDetails.pl | 1 + testbot/web/Submit.pl | 80 +++++++++++--------- testbot/web/admin/VMDetails.pl | 16 ++++ 16 files changed, 587 insertions(+), 223 deletions(-) Diff: https://source.winehq.org/git/tools.git/?a=commitdiff;h=66b046d90acd9c744f1…

1 0

Francois Gouget : testbot: Adopt the missions syntax for *Build.pl.
by Alexandre Julliard 23 Oct '18

23 Oct '18

Module: tools Branch: master Commit: 6fb501c5838e330e8884089e5890541c0b9ac291 URL: https://source.winehq.org/git/tools.git/?a=commit;h=6fb501c5838e330e8884089… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Oct 22 03:05:14 2018 +0200 testbot: Adopt the missions syntax for *Build.pl. This makes it possible to specify mission options on the command line if necessary. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineRunBuild.pl | 6 ++--- testbot/bin/build/Build.pl | 59 +++++++++++++++++++++++++-------------------- 2 files changed, 36 insertions(+), 29 deletions(-) diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl index ec36b62..21d2e8b 100755 --- a/testbot/bin/WineRunBuild.pl +++ b/testbot/bin/WineRunBuild.pl @@ -339,13 +339,13 @@ if ($Step->FileType ne "patch") # Figure out what to build # -my (%Builds, %TestExes); +my (%Missions, %TestExes); foreach my $TestStep (@{$Job->Steps->GetItems()}) { if (($TestStep->PreviousNo || 0) == $Step->No and $TestStep->FileType =~ /^exe/) { - $Builds{$TestStep->FileType} = 1; + $Missions{$TestStep->FileType} = 1; $TestExes{$TestStep->FileName} = $TestStep->FileType; } } @@ -364,7 +364,7 @@ if (!$TA->SendFile($FileName, "staging/patch.diff", 0)) } my $Script = "#!/bin/sh\n". "( set -x\n". - " ../bin/build/Build.pl patch.diff ". join(":", sort keys %Builds) ."\n". + " ../bin/build/Build.pl patch.diff ". join(":", sort keys %Missions) ."\n". ") >Build.log 2>&1\n"; Debug(Elapsed($Start), " Sending the script: [$Script]\n"); if (!$TA->SendFileFromString($Script, "task", $TestAgent::SENDFILE_EXE)) diff --git a/testbot/bin/build/Build.pl b/testbot/bin/build/Build.pl index 54b1aea..b50a25c 100755 --- a/testbot/bin/build/Build.pl +++ b/testbot/bin/build/Build.pl @@ -46,6 +46,7 @@ sub BEGIN use Build::Utils; use WineTestBot::Config; +use WineTestBot::Missions; use WineTestBot::Utils; @@ -71,9 +72,9 @@ sub BuildNative() sub BuildTestExecutables($$$) { - my ($Targets, $Impacts, $Build) = @_; + my ($TaskMissions, $Impacts, $Build) = @_; - return 1 if (!$Targets->{$Build}); + return 1 if (!$TaskMissions->{Builds}->{$Build}); my (@BuildDirs, @TestExes); foreach my $TestInfo (values %{$Impacts->{Tests}}) @@ -116,10 +117,7 @@ sub BuildTestExecutables($$$) $ENV{PATH} = "/usr/lib/ccache:/usr/bin:/bin"; delete $ENV{ENV}; -my %AllTargets; -map { $AllTargets{$_} = 1 } qw(exe32 exe64); - -my ($Usage, $PatchFile, $TargetList); +my ($Usage, $PatchFile, $MissionStatement); while (@ARGV) { my $Arg = shift @ARGV; @@ -152,9 +150,9 @@ while (@ARGV) last; } } - elsif (!defined $TargetList) + elsif (!defined $MissionStatement) { - $TargetList = $Arg; + $MissionStatement = $Arg; } else { @@ -165,7 +163,7 @@ while (@ARGV) } # Check and untaint parameters -my $Targets; +my $TaskMissions; if (!defined $Usage) { if (!defined $PatchFile) @@ -174,17 +172,26 @@ if (!defined $Usage) $Usage = 2; } - $TargetList = join(",", keys %AllTargets) if (!defined $TargetList); - foreach my $Target (split /[,:]/, $TargetList) + $MissionStatement = "exe32:exe64" if (!defined $MissionStatement); + my ($ErrMessage, $Missions) = ParseMissionStatement($MissionStatement); + if (defined $ErrMessage) { - $Target = "exe$1" if ($Target =~ /^(32|64)$/); - if (!$AllTargets{$Target}) - { - Error "invalid target name $Target\n"; - $Usage = 2; - last; - } - $Targets->{$Target} = 1; + Error "$ErrMessage\n"; + $Usage = 2; + } + elsif (!@$Missions) + { + Error "Empty mission statement\n"; + $Usage = 2; + } + elsif (@$Missions > 1) + { + Error "Cannot specify missions for multiple tasks\n"; + $Usage = 2; + } + else + { + $TaskMissions = $Missions->[0]; } } if (defined $Usage) @@ -195,16 +202,16 @@ if (defined $Usage) Error "try '$Name0 --help' for more information\n"; exit $Usage; } - print "Usage: $Name0 [--help] PATCHFILE TARGETS\n"; + print "Usage: $Name0 [--help] PATCHFILE [MISSIONS]\n"; print "\n"; print "Applies the specified patch and rebuilds the Wine test executables.\n"; print "\n"; print "Where:\n"; print " PATCHFILE Is the staging file containing the patch to build.\n"; - print " TARGETS Is a comma-separated list of build targets. By default every\n"; - print " target is run.\n"; - print " - exe32: Rebuild the 32 bit Windows test executables.\n"; - print " - exe64: Rebuild the 64 bit Windows test executables.\n"; + print " MISSIONS Is a colon-separated list of missions. By default all supported\n"; + print " missions are run.\n"; + print " - exe32: Build the 32 bit Windows test executables.\n"; + print " - exe64: Build the 64 bit Windows test executables.\n"; print " --help Shows this usage message.\n"; exit 0; } @@ -224,8 +231,8 @@ my $Impacts = ApplyPatch("wine", $PatchFile); if (!$Impacts or ($Impacts->{PatchedRoot} and !BuildNative()) or - !BuildTestExecutables($Targets, $Impacts, "exe32") or - !BuildTestExecutables($Targets, $Impacts, "exe64")) + !BuildTestExecutables($TaskMissions, $Impacts, "exe32") or + !BuildTestExecutables($TaskMissions, $Impacts, "exe64")) { exit(1); }

1 0