wine-commits October 2018

wine-commits@winehq.org

1 participants
602 discussions

Michael Müller : browseui: Implement PROGDLG_AUTOTIME flag for IProgressDialog.
by Alexandre Julliard 23 Oct '18

23 Oct '18

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

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

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

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: 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/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

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

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

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

23 Oct '18

Module: wine Branch: master Commit: 86ebd6dc0d30eef5ffa1a1e354fb6cdb1ee9c7d3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=86ebd6dc0d30eef5ffa1a1e3… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Oct 22 22:39:03 2018 +0200 wmc: Use the ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/wmc/lang.c | 7 +++---- tools/wmc/po.c | 4 ++-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/tools/wmc/lang.c b/tools/wmc/lang.c index b045612..07022f7 100644 --- a/tools/wmc/lang.c +++ b/tools/wmc/lang.c @@ -162,14 +162,12 @@ static const language_t languages[] = { {0x500A, 850, 1252, "Spanish", "Puerto Rico"} }; -#define NLAN (sizeof(languages)/sizeof(languages[0])) - void show_languages(void) { unsigned int i; printf(" Code | DOS-cp | WIN-cp | Language | Country\n"); printf("-------+--------+--------+--------------+---------\n"); - for(i = 0; i < NLAN; i++) + for(i = 0; i < ARRAY_SIZE(languages); i++) printf("0x%04x | %5d | %5d | %-12s | %s\n", languages[i].id, languages[i].doscp, @@ -185,7 +183,8 @@ static int langcmp(const void *p1, const void *p2) const language_t *find_language(unsigned id) { - return (const language_t *)bsearch(&id, languages, NLAN, sizeof(languages[0]), langcmp); + return (const language_t *)bsearch(&id, languages, ARRAY_SIZE(languages), + sizeof(languages[0]), langcmp); } void show_codepages(void) diff --git a/tools/wmc/po.c b/tools/wmc/po.c index 6db02c8..3529a5b 100644 --- a/tools/wmc/po.c +++ b/tools/wmc/po.c @@ -666,10 +666,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 );

1 0

← Newer
1
...
17
18
19
20
21
22
23
...
61
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2018