November 2018 - Wine-Devel - list.winehq.org

[PATCH 01/11] user32/tests: Add more Listbox tests for ownerdraw styles
by Gabriel Ivăncescu Nov. 16, 2018

Nov. 16, 2018

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- user32 patch series of the comctl32 committed patches. dlls/user32/tests/listbox.c | 50 +++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/dlls/user32/tests/listbox.c b/dlls/user32/tests/listbox.c index 019d284..4b5d574 100644 --- a/dlls/user32/tests/listbox.c +++ b/dlls/user32/tests/listbox.c @@ -371,6 +371,35 @@ static void test_ownerdraw(void) ok(rc.top < 0, "rc.top is not negative (%d)\n", rc.top); DestroyWindow(hLB); + + /* Both FIXED and VARIABLE, FIXED should override VARIABLE. */ + hLB = CreateWindowA("listbox", "TestList", LBS_OWNERDRAWFIXED | LBS_OWNERDRAWVARIABLE, 0, 0, 100, 100, + NULL, NULL, NULL, 0); + ok(hLB != NULL, "last error 0x%08x\n", GetLastError()); + + ret = SendMessageA(hLB, LB_INSERTSTRING, -1, 0); + ok(ret == 0, "Unexpected return value %d.\n", ret); + ret = SendMessageA(hLB, LB_INSERTSTRING, -1, 0); + ok(ret == 1, "Unexpected return value %d.\n", ret); + + ret = SendMessageA(hLB, LB_SETITEMHEIGHT, 0, 13); + ok(ret == LB_OKAY, "Failed to set item height, %d.\n", ret); + + ret = SendMessageA(hLB, LB_GETITEMHEIGHT, 0, 0); + ok(ret == 13, "Unexpected item height %d.\n", ret); + + ret = SendMessageA(hLB, LB_SETITEMHEIGHT, 1, 42); + ok(ret == LB_OKAY, "Failed to set item height, %d.\n", ret); + + ret = SendMessageA(hLB, LB_GETITEMHEIGHT, 0, 0); +todo_wine + ok(ret == 42, "Unexpected item height %d.\n", ret); + + ret = SendMessageA(hLB, LB_GETITEMHEIGHT, 1, 0); + ok(ret == 42, "Unexpected item height %d.\n", ret); + + DestroyWindow (hLB); + DestroyWindow(parent); } @@ -1695,7 +1724,13 @@ static void test_listbox_dlgdir(void) static void test_set_count( void ) { + static const DWORD styles[] = + { + LBS_OWNERDRAWFIXED, + LBS_HASSTRINGS, + }; HWND parent, listbox; + unsigned int i; LONG ret; RECT r; @@ -1725,6 +1760,21 @@ static void test_set_count( void ) ok( !IsRectEmpty( &r ), "got empty rect\n"); DestroyWindow( listbox ); + + for (i = 0; i < ARRAY_SIZE(styles); ++i) + { + listbox = create_listbox( styles[i] | WS_CHILD | WS_VISIBLE, parent ); + + SetLastError( 0xdeadbeef ); + ret = SendMessageA( listbox, LB_SETCOUNT, 100, 0 ); + todo_wine_if(i == 0) + ok( ret == LB_ERR, "expected %d, got %d\n", LB_ERR, ret ); + todo_wine_if(i == 0) + ok( GetLastError() == ERROR_SETCOUNT_ON_BAD_LB, "Unexpected error %d.\n", GetLastError() ); + + DestroyWindow( listbox ); + } + DestroyWindow( parent ); } -- 2.19.1

4 28

[PATCH] crypt32: Make sure that the provider supports algorithm of a being decoded message.
by Dmitry Timoshkov Nov. 16, 2018

Nov. 16, 2018

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/crypt32/msg.c | 36 +++++++++++++++++++++++------------- 1 file changed, 23 insertions(+), 13 deletions(-) diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c index 9fe63e24a7..4132390855 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -926,17 +926,25 @@ typedef struct _CSignedMsgData * been constructed. */ static BOOL CSignedMsgData_ConstructSignerHandles(CSignedMsgData *msg_data, - DWORD signerIndex, HCRYPTPROV crypt_prov) + DWORD signerIndex, HCRYPTPROV *crypt_prov, DWORD *flags) { ALG_ID algID; BOOL ret; algID = CertOIDToAlgId( msg_data->info->rgSignerInfo[signerIndex].HashAlgorithm.pszObjId); - ret = CryptCreateHash(crypt_prov, algID, 0, 0, + + if (!*crypt_prov) + { + *crypt_prov = I_CryptGetDefaultCryptProv(algID); + if (!*crypt_prov) return FALSE; + *flags &= ~CMSG_CRYPT_RELEASE_CONTEXT_FLAG; + } + + ret = CryptCreateHash(*crypt_prov, algID, 0, 0, &msg_data->signerHandles->contentHash); if (ret && msg_data->info->rgSignerInfo[signerIndex].AuthAttrs.cAttr > 0) - ret = CryptCreateHash(crypt_prov, algID, 0, 0, + ret = CryptCreateHash(*crypt_prov, algID, 0, 0, &msg_data->signerHandles->authAttrHash); return ret; } @@ -1434,7 +1442,7 @@ static HCRYPTMSG CSignedEncodeMsg_Open(DWORD dwFlags, if (ret) { ret = CSignedMsgData_ConstructSignerHandles( - &msg->msg_data, i, info->rgSigners[i].hCryptProv); + &msg->msg_data, i, &info->rgSigners[i].hCryptProv, &dwFlags); if (dwFlags & CMSG_CRYPT_RELEASE_CONTEXT_FLAG) CryptReleaseContext(info->rgSigners[i].hCryptProv, 0); @@ -2092,7 +2100,7 @@ static void CDecodeMsg_Close(HCRYPTMSG hCryptMsg) { CDecodeMsg *msg = hCryptMsg; - if (msg->base.open_flags & CMSG_CRYPT_RELEASE_CONTEXT_FLAG) + if (msg->crypt_prov && msg->base.open_flags & CMSG_CRYPT_RELEASE_CONTEXT_FLAG) CryptReleaseContext(msg->crypt_prov, 0); switch (msg->type) { @@ -2343,6 +2351,14 @@ static BOOL CDecodeMsg_FinalizeHashedContent(CDecodeMsg *msg, &size); if (ret) algID = CertOIDToAlgId(hashAlgoID->pszObjId); + + if (!msg->crypt_prov) + { + msg->crypt_prov = I_CryptGetDefaultCryptProv(algID); + if (msg->crypt_prov) + msg->base.open_flags &= ~CMSG_CRYPT_RELEASE_CONTEXT_FLAG; + } + ret = CryptCreateHash(msg->crypt_prov, algID, 0, 0, &msg->u.hash); if (ret) { @@ -2389,7 +2405,7 @@ static BOOL CDecodeMsg_FinalizeSignedContent(CDecodeMsg *msg, ret = CSignedMsgData_AllocateHandles(&msg->u.signed_data); for (i = 0; ret && i < msg->u.signed_data.info->cSignerInfo; i++) ret = CSignedMsgData_ConstructSignerHandles(&msg->u.signed_data, i, - msg->crypt_prov); + &msg->crypt_prov, &msg->base.open_flags); if (ret) { CRYPT_DATA_BLOB *content; @@ -3555,13 +3571,7 @@ HCRYPTMSG WINAPI CryptMsgOpenToDecode(DWORD dwMsgEncodingType, DWORD dwFlags, CDecodeMsg_Close, CDecodeMsg_GetParam, CDecodeMsg_Update, CDecodeMsg_Control); msg->type = dwMsgType; - if (hCryptProv) - msg->crypt_prov = hCryptProv; - else - { - msg->crypt_prov = I_CryptGetDefaultCryptProv(0); - msg->base.open_flags &= ~CMSG_CRYPT_RELEASE_CONTEXT_FLAG; - } + msg->crypt_prov = hCryptProv; memset(&msg->u, 0, sizeof(msg->u)); msg->msg_data.cbData = 0; msg->msg_data.pbData = NULL; -- 2.17.1

1 0

[PATCH] testbot: Provide a better title for Wine update tasks.
by Francois Gouget Nov. 16, 2018

Nov. 16, 2018

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/StepsTasks.pm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/StepsTasks.pm b/testbot/lib/WineTestBot/StepsTasks.pm index cfd78e52e2..8128bf9c57 100644 --- a/testbot/lib/WineTestBot/StepsTasks.pm +++ b/testbot/lib/WineTestBot/StepsTasks.pm @@ -70,7 +70,11 @@ sub GetTitle($) my ($self) = @_; my @TitleParts; - if ($self->Type eq "build") + if ($self->Type eq "reconfig") + { + push @TitleParts, "Wine update"; + } + elsif ($self->Type eq "build") { push @TitleParts, "build"; } -- 2.19.1

1 0

[PATCH] testbot: Shorten the test report names.
by Francois Gouget Nov. 16, 2018

Nov. 16, 2018

The context makes it clear enough whether the report was produced on Windows or in Wine. So use a shorter, more readable name. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/LogUtils.pm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 59b2d0a0fa..f142982df4 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -596,11 +596,11 @@ sub GetLogFileNames($;$) } my %_LogFileLabels = ( - "exe32.report" => "32 bit Windows report", - "exe64.report" => "64 bit Windows report", - "win32.report" => "32 bit Wine report", - "wow32.report" => "32 bit WoW Wine report", - "wow64.report" => "64 bit Wow Wine report", + "exe32.report" => "32 bit report", + "exe64.report" => "64 bit report", + "win32.report" => "32 bit report", + "wow32.report" => "32 bit WoW report", + "wow64.report" => "64 bit WoW report", "log" => "task log", "old_log" => "old logs", ); -- 2.19.1

1 0

[PATCH] wbemprox: Prefer the standard ARRAY_SIZE macro
by Michael Stefaniuc Nov. 16, 2018

Nov. 16, 2018

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wbemprox/builtin.c | 68 ++++++++++++++++++++-------------------- dlls/wbemprox/class.c | 4 +-- dlls/wbemprox/qualifier.c | 4 +-- dlls/wbemprox/services.c | 4 +-- dlls/wbemprox/wbemprox_private.h | 2 -- dlls/wbemprox/wql.y | 26 +++++++-------- 6 files changed, 53 insertions(+), 55 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 3832540d4d..c658cc32ed 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -1250,7 +1250,7 @@ static UINT16 systemenclosure_chassistypes[] = }; static const struct array systemenclosure_chassistypes_array = { - SIZEOF(systemenclosure_chassistypes), + ARRAY_SIZE(systemenclosure_chassistypes), &systemenclosure_chassistypes }; static const struct record_systemenclosure data_systemenclosure[] = @@ -3522,38 +3522,38 @@ done: static struct table builtin_classes[] = { - { class_baseboardW, SIZEOF(col_baseboard), col_baseboard, SIZEOF(data_baseboard), 0, (BYTE *)data_baseboard }, - { class_biosW, SIZEOF(col_bios), col_bios, SIZEOF(data_bios), 0, (BYTE *)data_bios }, - { class_cdromdriveW, SIZEOF(col_cdromdrive), col_cdromdrive, 0, 0, NULL, fill_cdromdrive }, - { class_compsysW, SIZEOF(col_compsys), col_compsys, 0, 0, NULL, fill_compsys }, - { class_compsysproductW, SIZEOF(col_compsysproduct), col_compsysproduct, 0, 0, NULL, fill_compsysproduct }, - { class_datafileW, SIZEOF(col_datafile), col_datafile, 0, 0, NULL, fill_datafile }, - { class_desktopmonitorW, SIZEOF(col_desktopmonitor), col_desktopmonitor, 0, 0, NULL, fill_desktopmonitor }, - { class_directoryW, SIZEOF(col_directory), col_directory, 0, 0, NULL, fill_directory }, - { class_diskdriveW, SIZEOF(col_diskdrive), col_diskdrive, 0, 0, NULL, fill_diskdrive }, - { class_diskpartitionW, SIZEOF(col_diskpartition), col_diskpartition, 0, 0, NULL, fill_diskpartition }, - { class_ip4routetableW, SIZEOF(col_ip4routetable), col_ip4routetable, 0, 0, NULL, fill_ip4routetable }, - { class_logicaldiskW, SIZEOF(col_logicaldisk), col_logicaldisk, 0, 0, NULL, fill_logicaldisk }, - { class_logicaldisk2W, SIZEOF(col_logicaldisk), col_logicaldisk, 0, 0, NULL, fill_logicaldisk }, - { class_networkadapterW, SIZEOF(col_networkadapter), col_networkadapter, 0, 0, NULL, fill_networkadapter }, - { class_networkadapterconfigW, SIZEOF(col_networkadapterconfig), col_networkadapterconfig, 0, 0, NULL, fill_networkadapterconfig }, - { class_osW, SIZEOF(col_os), col_os, 0, 0, NULL, fill_os }, - { class_paramsW, SIZEOF(col_param), col_param, SIZEOF(data_param), 0, (BYTE *)data_param }, - { class_physicalmediaW, SIZEOF(col_physicalmedia), col_physicalmedia, SIZEOF(data_physicalmedia), 0, (BYTE *)data_physicalmedia }, - { class_physicalmemoryW, SIZEOF(col_physicalmemory), col_physicalmemory, 0, 0, NULL, fill_physicalmemory }, - { class_pnpentityW, SIZEOF(col_pnpentity), col_pnpentity, 0, 0, NULL, fill_pnpentity }, - { class_printerW, SIZEOF(col_printer), col_printer, 0, 0, NULL, fill_printer }, - { class_processW, SIZEOF(col_process), col_process, 0, 0, NULL, fill_process }, - { class_processorW, SIZEOF(col_processor), col_processor, 0, 0, NULL, fill_processor }, - { class_processor2W, SIZEOF(col_processor), col_processor, 0, 0, NULL, fill_processor }, - { class_qualifiersW, SIZEOF(col_qualifier), col_qualifier, SIZEOF(data_qualifier), 0, (BYTE *)data_qualifier }, - { class_serviceW, SIZEOF(col_service), col_service, 0, 0, NULL, fill_service }, - { class_sidW, SIZEOF(col_sid), col_sid, 0, 0, NULL, fill_sid }, - { class_sounddeviceW, SIZEOF(col_sounddevice), col_sounddevice, SIZEOF(data_sounddevice), 0, (BYTE *)data_sounddevice }, - { class_stdregprovW, SIZEOF(col_stdregprov), col_stdregprov, SIZEOF(data_stdregprov), 0, (BYTE *)data_stdregprov }, - { class_systemsecurityW, SIZEOF(col_systemsecurity), col_systemsecurity, SIZEOF(data_systemsecurity), 0, (BYTE *)data_systemsecurity }, - { class_systemenclosureW, SIZEOF(col_systemenclosure), col_systemenclosure, SIZEOF(data_systemenclosure), 0, (BYTE *)data_systemenclosure }, - { class_videocontrollerW, SIZEOF(col_videocontroller), col_videocontroller, 0, 0, NULL, fill_videocontroller } + { class_baseboardW, ARRAY_SIZE(col_baseboard), col_baseboard, ARRAY_SIZE(data_baseboard), 0, (BYTE *)data_baseboard }, + { class_biosW, ARRAY_SIZE(col_bios), col_bios, ARRAY_SIZE(data_bios), 0, (BYTE *)data_bios }, + { class_cdromdriveW, ARRAY_SIZE(col_cdromdrive), col_cdromdrive, 0, 0, NULL, fill_cdromdrive }, + { class_compsysW, ARRAY_SIZE(col_compsys), col_compsys, 0, 0, NULL, fill_compsys }, + { class_compsysproductW, ARRAY_SIZE(col_compsysproduct), col_compsysproduct, 0, 0, NULL, fill_compsysproduct }, + { class_datafileW, ARRAY_SIZE(col_datafile), col_datafile, 0, 0, NULL, fill_datafile }, + { class_desktopmonitorW, ARRAY_SIZE(col_desktopmonitor), col_desktopmonitor, 0, 0, NULL, fill_desktopmonitor }, + { class_directoryW, ARRAY_SIZE(col_directory), col_directory, 0, 0, NULL, fill_directory }, + { class_diskdriveW, ARRAY_SIZE(col_diskdrive), col_diskdrive, 0, 0, NULL, fill_diskdrive }, + { class_diskpartitionW, ARRAY_SIZE(col_diskpartition), col_diskpartition, 0, 0, NULL, fill_diskpartition }, + { class_ip4routetableW, ARRAY_SIZE(col_ip4routetable), col_ip4routetable, 0, 0, NULL, fill_ip4routetable }, + { class_logicaldiskW, ARRAY_SIZE(col_logicaldisk), col_logicaldisk, 0, 0, NULL, fill_logicaldisk }, + { class_logicaldisk2W, ARRAY_SIZE(col_logicaldisk), col_logicaldisk, 0, 0, NULL, fill_logicaldisk }, + { class_networkadapterW, ARRAY_SIZE(col_networkadapter), col_networkadapter, 0, 0, NULL, fill_networkadapter }, + { class_networkadapterconfigW, ARRAY_SIZE(col_networkadapterconfig), col_networkadapterconfig, 0, 0, NULL, fill_networkadapterconfig }, + { class_osW, ARRAY_SIZE(col_os), col_os, 0, 0, NULL, fill_os }, + { class_paramsW, ARRAY_SIZE(col_param), col_param, ARRAY_SIZE(data_param), 0, (BYTE *)data_param }, + { class_physicalmediaW, ARRAY_SIZE(col_physicalmedia), col_physicalmedia, ARRAY_SIZE(data_physicalmedia), 0, (BYTE *)data_physicalmedia }, + { class_physicalmemoryW, ARRAY_SIZE(col_physicalmemory), col_physicalmemory, 0, 0, NULL, fill_physicalmemory }, + { class_pnpentityW, ARRAY_SIZE(col_pnpentity), col_pnpentity, 0, 0, NULL, fill_pnpentity }, + { class_printerW, ARRAY_SIZE(col_printer), col_printer, 0, 0, NULL, fill_printer }, + { class_processW, ARRAY_SIZE(col_process), col_process, 0, 0, NULL, fill_process }, + { class_processorW, ARRAY_SIZE(col_processor), col_processor, 0, 0, NULL, fill_processor }, + { class_processor2W, ARRAY_SIZE(col_processor), col_processor, 0, 0, NULL, fill_processor }, + { class_qualifiersW, ARRAY_SIZE(col_qualifier), col_qualifier, ARRAY_SIZE(data_qualifier), 0, (BYTE *)data_qualifier }, + { class_serviceW, ARRAY_SIZE(col_service), col_service, 0, 0, NULL, fill_service }, + { class_sidW, ARRAY_SIZE(col_sid), col_sid, 0, 0, NULL, fill_sid }, + { class_sounddeviceW, ARRAY_SIZE(col_sounddevice), col_sounddevice, ARRAY_SIZE(data_sounddevice), 0, (BYTE *)data_sounddevice }, + { class_stdregprovW, ARRAY_SIZE(col_stdregprov), col_stdregprov, ARRAY_SIZE(data_stdregprov), 0, (BYTE *)data_stdregprov }, + { class_systemsecurityW, ARRAY_SIZE(col_systemsecurity), col_systemsecurity, ARRAY_SIZE(data_systemsecurity), 0, (BYTE *)data_systemsecurity }, + { class_systemenclosureW, ARRAY_SIZE(col_systemenclosure), col_systemenclosure, ARRAY_SIZE(data_systemenclosure), 0, (BYTE *)data_systemenclosure }, + { class_videocontrollerW, ARRAY_SIZE(col_videocontroller), col_videocontroller, 0, 0, NULL, fill_videocontroller } }; void init_table_list( void ) @@ -3561,6 +3561,6 @@ void init_table_list( void ) static struct list tables = LIST_INIT( tables ); UINT i; - for (i = 0; i < SIZEOF(builtin_classes); i++) list_add_tail( &tables, &builtin_classes[i].entry ); + for (i = 0; i < ARRAY_SIZE(builtin_classes); i++) list_add_tail( &tables, &builtin_classes[i].entry ); table_list = &tables; } diff --git a/dlls/wbemprox/class.c b/dlls/wbemprox/class.c index 983834d316..a005204791 100644 --- a/dlls/wbemprox/class.c +++ b/dlls/wbemprox/class.c @@ -807,7 +807,7 @@ static WCHAR *build_signature_table_name( const WCHAR *class, const WCHAR *metho static const WCHAR fmtW[] = {'_','_','%','s','_','%','s','_','%','s',0}; static const WCHAR outW[] = {'O','U','T',0}; static const WCHAR inW[] = {'I','N',0}; - UINT len = SIZEOF(fmtW) + SIZEOF(outW) + strlenW( class ) + strlenW( method ); + UINT len = ARRAY_SIZE(fmtW) + ARRAY_SIZE(outW) + strlenW( class ) + strlenW( method ); WCHAR *ret; if (!(ret = heap_alloc( len * sizeof(WCHAR) ))) return NULL; @@ -826,7 +826,7 @@ HRESULT create_signature( const WCHAR *class, const WCHAR *method, enum param_di 'D','i','r','e','c','t','i','o','n','%','s',0}; static const WCHAR geW[] = {'>','=','0',0}; static const WCHAR leW[] = {'<','=','0',0}; - UINT len = SIZEOF(selectW) + SIZEOF(geW); + UINT len = ARRAY_SIZE(selectW) + ARRAY_SIZE(geW); IEnumWbemClassObject *iter; WCHAR *query, *name; HRESULT hr; diff --git a/dlls/wbemprox/qualifier.c b/dlls/wbemprox/qualifier.c index 4da34454ae..06dcc59e31 100644 --- a/dlls/wbemprox/qualifier.c +++ b/dlls/wbemprox/qualifier.c @@ -109,8 +109,8 @@ static HRESULT create_qualifier_enum( const WCHAR *class, const WCHAR *member, c if (!member) member = noneW; len = strlenW( class ) + strlenW( member ); - if (name) len += strlenW( name ) + SIZEOF(fmtW); - else len += SIZEOF(fmt2W); + if (name) len += strlenW( name ) + ARRAY_SIZE(fmtW); + else len += ARRAY_SIZE(fmt2W); if (!(query = heap_alloc( len * sizeof(WCHAR) ))) return E_OUTOFMEMORY; if (name) sprintfW( query, fmtW, class, member, name ); diff --git a/dlls/wbemprox/services.c b/dlls/wbemprox/services.c index fa1386f0fd..599a421ced 100644 --- a/dlls/wbemprox/services.c +++ b/dlls/wbemprox/services.c @@ -420,13 +420,13 @@ static WCHAR *query_from_path( const struct path *path ) if (path->filter) { - len = path->class_len + path->filter_len + SIZEOF(selectW); + len = path->class_len + path->filter_len + ARRAY_SIZE(selectW); if (!(query = heap_alloc( len * sizeof(WCHAR) ))) return NULL; sprintfW( query, selectW, path->class, path->filter ); } else { - len = path->class_len + SIZEOF(select_allW); + len = path->class_len + ARRAY_SIZE(select_allW); if (!(query = heap_alloc( len * sizeof(WCHAR) ))) return NULL; strcpyW( query, select_allW ); strcatW( query, path->class ); diff --git a/dlls/wbemprox/wbemprox_private.h b/dlls/wbemprox/wbemprox_private.h index 83776c8df7..d52affa82a 100644 --- a/dlls/wbemprox/wbemprox_private.h +++ b/dlls/wbemprox/wbemprox_private.h @@ -24,8 +24,6 @@ IClientSecurity client_security DECLSPEC_HIDDEN; struct list *table_list DECLSPEC_HIDDEN; -#define SIZEOF(array) (sizeof(array)/sizeof((array)[0])) - enum param_direction { PARAM_OUT = -1, diff --git a/dlls/wbemprox/wql.y b/dlls/wbemprox/wql.y index 88da2b9b0f..0c48c98b73 100644 --- a/dlls/wbemprox/wql.y +++ b/dlls/wbemprox/wql.y @@ -559,18 +559,18 @@ static const WCHAR whereW[] = {'W','H','E','R','E'}; static const struct keyword keyword_table[] = { - { andW, SIZEOF(andW), TK_AND }, - { byW, SIZEOF(byW), TK_BY }, - { falseW, SIZEOF(falseW), TK_FALSE }, - { fromW, SIZEOF(fromW), TK_FROM }, - { isW, SIZEOF(isW), TK_IS }, - { likeW, SIZEOF(likeW), TK_LIKE }, - { notW, SIZEOF(notW), TK_NOT }, - { nullW, SIZEOF(nullW), TK_NULL }, - { orW, SIZEOF(orW), TK_OR }, - { selectW, SIZEOF(selectW), TK_SELECT }, - { trueW, SIZEOF(trueW), TK_TRUE }, - { whereW, SIZEOF(whereW), TK_WHERE } + { andW, ARRAY_SIZE(andW), TK_AND }, + { byW, ARRAY_SIZE(byW), TK_BY }, + { falseW, ARRAY_SIZE(falseW), TK_FALSE }, + { fromW, ARRAY_SIZE(fromW), TK_FROM }, + { isW, ARRAY_SIZE(isW), TK_IS }, + { likeW, ARRAY_SIZE(likeW), TK_LIKE }, + { notW, ARRAY_SIZE(notW), TK_NOT }, + { nullW, ARRAY_SIZE(nullW), TK_NULL }, + { orW, ARRAY_SIZE(orW), TK_OR }, + { selectW, ARRAY_SIZE(selectW), TK_SELECT }, + { trueW, ARRAY_SIZE(trueW), TK_TRUE }, + { whereW, ARRAY_SIZE(whereW), TK_WHERE } }; static int cmp_keyword( const void *arg1, const void *arg2 ) @@ -594,7 +594,7 @@ static int keyword_type( const WCHAR *str, unsigned int len ) key.name = str; key.len = len; key.type = 0; - ret = bsearch( &key, keyword_table, SIZEOF(keyword_table), sizeof(struct keyword), cmp_keyword ); + ret = bsearch( &key, keyword_table, ARRAY_SIZE(keyword_table), sizeof(struct keyword), cmp_keyword ); if (ret) return ret->type; return TK_ID; } -- 2.14.5

2 1

[PATCH] winmm: Add a WARNing when winejoystick.drv is missing. --- If winejoystick.drv is expected to be present by default, then this should be promoted to an ERRor...
by Serge Gautherie Nov. 15, 2018

Nov. 15, 2018

--- dlls/winmm/joystick.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/winmm/joystick.c b/dlls/winmm/joystick.c index 5a12b36..92a7ce9 100644 --- a/dlls/winmm/joystick.c +++ b/dlls/winmm/joystick.c @@ -79,6 +79,8 @@ static BOOL JOY_LoadDriver(DWORD dwJoyID) if (!JOY_Sticks[dwJoyID].hDriver) { + WARN("OpenDriverA(\"winejoystick.drv\") failed\n"); + /* The default driver is missing, don't attempt to load it again */ winejoystick_missing = TRUE; } -- 2.10.0.windows.1

1 0

[PATCH] Translation: Review po/pt_BR translation messages
by Roberto Pungartnik Nov. 15, 2018

Nov. 15, 2018

Translated new/empty messages. Review on some expressions Review acelerators Signed-off-by: Roberto Augusto Pungartnik <rpungartik(a)gmail.com> --- po/pt_BR.po | 211 ++++++++++++++++++++++++++++------------------------ 1 file changed, 112 insertions(+), 99 deletions(-) diff --git a/po/pt_BR.po b/po/pt_BR.po index 6fed3a0135..3a446ba4b0 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -5,8 +5,8 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2017-01-22 17:27-0200\n" -"Last-Translator: Bruno Jesus <00cpxxx(a)gmail.com>\n" +"PO-Revision-Date: 2018-11-15 17:27-0200\n" +"Last-Translator: Roberto Augusto Pungartnik <rpungartnik(a)gmail.com>\n" "Language-Team: Portuguese (Brazil)\n" "Language: pt_BR\n" "MIME-Version: 1.0\n" @@ -172,7 +172,7 @@ msgid "" "href=\"https://wiki.winehq.org/Mono\">https://wiki.winehq.org/Mono</a> for " "details." msgstr "" -"O Wine não pôde encontrar o pacote wine-mono que é necessário para " +"O Wine não pôde encontrar o pacote wine-mono que é necessário para que" "aplicativos .NET funcionarem corretamente. O Wine pode automaticamente " "efetuar o download e instalá-lo para você.\n" "\n" @@ -311,11 +311,11 @@ msgstr "Cancelando..." #: browseui.rc:29 msgid "%1!u! %2 remaining" -msgstr "" +msgstr "%1!u! %2 restante" #: browseui.rc:30 msgid "%1!u! %2 and %3!u! %4 remaining" -msgstr "" +msgstr "%1!u! %2 and %3!u! %4 restante" #: browseui.rc:31 #, fuzzy @@ -325,11 +325,11 @@ msgstr "&Segundos" #: browseui.rc:32 msgid "minutes" -msgstr "" +msgstr "minutos" #: browseui.rc:33 msgid "hours" -msgstr "" +msgstr "horas" #: comctl32.rc:68 winefile.rc:157 msgid "Properties for %s" @@ -529,7 +529,7 @@ msgstr "&Qualidade de Impressão:" #: comdlg32.rc:217 msgid "Print to Fi&le" -msgstr "Imprimir para Arquivo" +msgstr "Imp&rimir para Arquivo" #: comdlg32.rc:218 msgid "Condensed" @@ -1346,7 +1346,7 @@ msgstr "Tipo de Conteúdo" #: crypt32.rc:49 msgid "Message Digest" -msgstr "Digesto da Mensagem" +msgstr "Resumo da Mensagem" #: crypt32.rc:50 msgid "Signing Time" @@ -1603,7 +1603,7 @@ msgstr "PKCS 7 Assinado e Envelopado" #: crypt32.rc:113 msgid "PKCS 7 Digested" -msgstr "PKCS 7 Digesto" +msgstr "Registro PKCS 7" #: crypt32.rc:114 msgid "PKCS 7 Encrypted" @@ -2417,15 +2417,15 @@ msgstr "Selecione o formato que deseja utilizar:" #: cryptui.rc:413 msgid "&DER-encoded X.509 (*.cer)" -msgstr "X.509 codificado em &DER (.cer)" +msgstr "X.509 codificado em &DER (*.cer)" #: cryptui.rc:415 msgid "Ba&se64-encoded X.509 (*.cer):" -msgstr "X.509 codificado em Ba&se64 (.cer):" +msgstr "X.509 codificado em Ba&se64 (*.cer):" #: cryptui.rc:417 msgid "&Cryptographic Message Syntax Standard/PKCS #7 Message (*.p7b)" -msgstr "Padrão de Sintaxe de Mensagem &Criptográfica/PKCS #7 Mensagem (.p7b)" +msgstr "Padrão de Sintaxe de Mensagem &Criptográfica/PKCS #7 Mensagem (*.p7b)" #: cryptui.rc:419 msgid "&Include all certificates in the certification path if possible" @@ -2433,7 +2433,7 @@ msgstr "&Incluir todos os certificados no caminho do certificado se possível" #: cryptui.rc:421 msgid "&Personal Information Exchange/PKCS #12 (*.pfx)" -msgstr "Troca de Informações &Pessoais/PKCS #12 (.pfx)" +msgstr "Troca de Informações &Pessoais/PKCS #12 (*.pfx)" #: cryptui.rc:423 msgid "Incl&ude all certificates in the certification path if possible" @@ -2465,7 +2465,7 @@ msgstr "Selecione o Conjunto de Certificados" #, fuzzy #| msgid "Select the certificate store you want to use:" msgid "Select a certificate you want to use" -msgstr "Selecione o conjunto de certificados que deseja usar:" +msgstr "Selecione o conjunto de certificados que deseja usar" #: cryptui.rc:30 cryptui.rc:93 msgid "Certificate" @@ -2517,7 +2517,7 @@ msgstr "Emitido por: " #: cryptui.rc:40 msgid "Valid from " -msgstr "Válido de " +msgstr "Válido desde " #: cryptui.rc:41 msgid " to " @@ -3335,7 +3335,7 @@ msgstr "&Imprimir..." #: ieframe.rc:40 wordpad.rc:37 msgid "Print previe&w" -msgstr "Visualizar impressão" +msgstr "Visuali&zar impressão" #: ieframe.rc:47 msgid "&Toolbars" @@ -3532,23 +3532,23 @@ msgstr "" #, fuzzy #| msgid "Address" msgid "Address:" -msgstr "Endereço" +msgstr "Endereço:" #: inetcpl.rc:130 #, fuzzy #| msgid "&Local server" msgid "Proxy server" -msgstr "Servidor &local" +msgstr "Servidor de proxy" #: inetcpl.rc:131 msgid "Use a proxy server" -msgstr "" +msgstr "Usar servidor de proxy" #: inetcpl.rc:134 #, fuzzy #| msgid "No Ports" msgid "Port:" -msgstr "Nenhuma Porta" +msgstr "Porta:" #: inetcpl.rc:31 msgid "Internet Settings" @@ -3788,7 +3788,7 @@ msgstr "URI a ser codificado contém caracteres inválidos" #: jscript.rc:63 msgid "URI to be decoded is incorrect" -msgstr "URI a ser codificado está incorreto" +msgstr "URI a ser decodificado está incorreto" #: jscript.rc:65 msgid "Number of fraction digits is out of range" @@ -3814,19 +3814,19 @@ msgstr "" #: jscript.rc:70 msgid "Cannot redefine non-configurable property '|'" -msgstr "" +msgstr "Nao pode redinir propriedade nao configuravel '|'" #: jscript.rc:71 msgid "Cannot modify non-writable property '|'" -msgstr "" +msgstr "Nao pode modificar propriedade nao gravavel '|'" #: jscript.rc:72 msgid "Property cannot have both accessors and a value" -msgstr "" +msgstr "Propriedade nao pode ter ambos acessores e valor" #: ../../include/wine/wine_common_ver.rc:129 msgid "Wine kernel DLL" -msgstr "" +msgstr "Biblioteca de kernel Wine" #: ../../include/wine/wine_common_ver.rc:134 winemac.rc:32 wineboot.rc:42 msgid "Wine" @@ -6989,7 +6989,7 @@ msgstr "" "\t/p pacotedepatch [propriedade]\n" "\t/p pacotedepatch /a pacote [propriedade]\n" "Modificadores de log e interface de usuário para os comandos acima:\n" -"\t/l[*][i|w|e|a|r|u|c|m|o|p|v|][+|!] logfile\n" +"\t/l[*][i|w|e|a|r|u|c|m|o|p|v|][+|!] arquivo_de_log\n" "\t/q{|n|b|r|f|n+|b+|b-}\n" "Registrar Serviço MSI:\n" "\t/y\n" @@ -7037,7 +7037,7 @@ msgstr "Aplicativo de instância única.\n" #: msi.rc:93 msgid "Binding executables" -msgstr "" +msgstr "Executaveis de ligação" #: msi.rc:94 msi.rc:137 #, fuzzy @@ -7047,7 +7047,7 @@ msgstr "Localizando %s" #: msi.rc:95 msi.rc:96 msi.rc:101 msgid "Computing space requirements" -msgstr "" +msgstr "Calculando requisitos de espaço" #: msi.rc:97 #, fuzzy @@ -7081,7 +7081,7 @@ msgstr "Nenhum aplicativo associada.\n" #: msi.rc:103 msgid "Copying network install files" -msgstr "" +msgstr "Copiando arquivos para instalacao via rede" #: msi.rc:104 #, fuzzy @@ -7115,11 +7115,11 @@ msgstr "Desinstalador de Aplicativos Wine" #: msi.rc:109 msgid "Evaluating launch conditions" -msgstr "" +msgstr "Avaliando condicoes de inicialização" #: msi.rc:110 msgid "Migrating feature states from related applications" -msgstr "" +msgstr "Migrando caracteristicas de aplicações relacionadas" #: msi.rc:111 #, fuzzy @@ -7135,7 +7135,7 @@ msgstr "Informação de versão" #: msi.rc:113 msgid "Unpublishing assembly information" -msgstr "" +msgstr "Removendo informacao de montagem" #: msi.rc:114 #, fuzzy @@ -7145,15 +7145,15 @@ msgstr "Arquivos de ícones" #: msi.rc:115 msgid "Updating component registration" -msgstr "" +msgstr "Atualizando registro de componenetes" #: msi.rc:116 msgid "Publishing Qualified Components" -msgstr "" +msgstr "Publicando Componentes Qualificados" #: msi.rc:117 msgid "Publishing Product Features" -msgstr "" +msgstr "Publicando Caracteristicas de Produto" #: msi.rc:118 #, fuzzy @@ -7163,19 +7163,19 @@ msgstr "Informação do Cliente" #: msi.rc:119 msgid "Registering Class servers" -msgstr "" +msgstr "Registrando Servidores de Classe" #: msi.rc:120 msgid "Registering COM+ Applications and Components" -msgstr "" +msgstr "Registrando Aplicativos e Componentes COM+" #: msi.rc:121 msgid "Registering extension servers" -msgstr "" +msgstr "Registrando extensoes de servidores" #: msi.rc:122 msgid "Registering fonts" -msgstr "" +msgstr "Registrando fontes" #: msi.rc:123 #, fuzzy @@ -7191,7 +7191,7 @@ msgstr "O registro está corrompido.\n" #: msi.rc:125 msgid "Registering program identifiers" -msgstr "" +msgstr "Registrando identificadores de programa" #: msi.rc:126 #, fuzzy @@ -7231,11 +7231,11 @@ msgstr "Arquivos de ícones" #: msi.rc:132 msgid "Removing folders" -msgstr "" +msgstr "Removendo pastas" #: msi.rc:133 msgid "Removing INI files entries" -msgstr "" +msgstr "Removendo entradas do arquivo INI" #: msi.rc:134 #, fuzzy @@ -7251,15 +7251,15 @@ msgstr "regedit: Não foi possível abrir a chave de registro '%1'.\n" #: msi.rc:136 msgid "Removing shortcuts" -msgstr "" +msgstr "Removendo atalhos" #: msi.rc:138 msgid "Registering modules" -msgstr "" +msgstr "Registrando modulos" #: msi.rc:139 msgid "Unregistering modules" -msgstr "" +msgstr "Desregistrando modulos" #: msi.rc:140 #, fuzzy @@ -7281,11 +7281,11 @@ msgstr "Parando o serviço dependente: %1\n" #: msi.rc:143 msgid "Unpublishing Qualified Components" -msgstr "" +msgstr "Removendo Componentes Qalificados" #: msi.rc:144 msgid "Unpublishing Product Features" -msgstr "" +msgstr "Removendo Caracteristicas de Produto" #: msi.rc:145 #, fuzzy @@ -7295,35 +7295,35 @@ msgstr "Informação do Cliente" #: msi.rc:146 msgid "Unregister Class servers" -msgstr "" +msgstr "Desregistrando Servidores de Classe" #: msi.rc:147 msgid "Unregistering COM+ Applications and Components" -msgstr "" +msgstr "Desregistrando Aplicações e Componentes COM+" #: msi.rc:148 msgid "Unregistering extension servers" -msgstr "" +msgstr "Desregistrando servidores de extensão" #: msi.rc:149 msgid "Unregistering fonts" -msgstr "" +msgstr "Desregistrando fontes" #: msi.rc:150 msgid "Unregistering MIME info" -msgstr "" +msgstr "Desregistrando informações MIME" #: msi.rc:151 msgid "Unregistering program identifiers" -msgstr "" +msgstr "Desregistrando identificadores de programa" #: msi.rc:152 msgid "Unregistering type libraries" -msgstr "" +msgstr "Desregistrando bibliotecas de tipo" #: msi.rc:154 msgid "Writing INI files values" -msgstr "" +msgstr "Gravando valores no arquivo INI" #: msi.rc:155 #, fuzzy @@ -7333,11 +7333,11 @@ msgstr "Aviso: biblioteca do sistema" #: msi.rc:161 msgid "Free space: [1]" -msgstr "" +msgstr "Espaço livre: [1]" #: msi.rc:162 msgid "Property: [1], Signature: [2]" -msgstr "" +msgstr "Propriedade: [1], Assinatura: [2]" #: msi.rc:163 msgid "File: [1]" @@ -7349,7 +7349,7 @@ msgstr "Pasta: [1]" #: msi.rc:165 msi.rc:194 msgid "Shortcut: [1]" -msgstr "" +msgstr "Atalho" #: msi.rc:166 msi.rc:197 msi.rc:198 #, fuzzy @@ -7359,7 +7359,7 @@ msgstr "Dispositi&vo:" #: msi.rc:167 msi.rc:170 msi.rc:174 msgid "File: [1], Directory: [9], Size: [6]" -msgstr "" +msgstr "Arquivo: [1], Pasta: [9], Tamanho: [6]" #: msi.rc:168 #, fuzzy @@ -7369,7 +7369,7 @@ msgstr "aplicativo" #: msi.rc:169 msgid "File: [1], Directory: [9], Size: [6]" -msgstr "" +msgstr "Arquivo: [1], Pasta: [9], Tamanho: [6]" #: msi.rc:171 #, fuzzy @@ -7379,7 +7379,7 @@ msgstr "Dispositi&vo:" #: msi.rc:172 msgid "File: [1], Dependencies: [2]" -msgstr "" +msgstr "Arquivo: [1], Dependências: [2]" #: msi.rc:173 #, fuzzy @@ -7389,23 +7389,23 @@ msgstr "Aplicativos" #: msi.rc:175 msi.rc:176 msgid "Application Context:[1], Assembly Name:[2]" -msgstr "" +msgstr "Contexto de Aplicação:[1], Nome de Montagem:[2]" #: msi.rc:177 msgid "File: [1], Directory: [2], Size: [3]" -msgstr "" +msgstr "Arquivo: [1], Pasta: [2], Tamanho: [3]" #: msi.rc:178 msi.rc:199 msgid "Component ID: [1], Qualifier: [2]" -msgstr "" +msgstr "ID Componente: [1], Propriedade: [2]" #: msi.rc:179 msi.rc:200 msgid "Feature: [1]" -msgstr "" +msgstr "Caracteristica: [1]" #: msi.rc:180 msi.rc:201 msgid "Class Id: [1]" -msgstr "" +msgstr "Id de Classe: [1]" #: msi.rc:181 msgid "AppId: [1]{{, AppType: [2], Users: [3], RSN: [4]}}" @@ -7423,7 +7423,7 @@ msgstr "Fonte: [1]" #: msi.rc:184 msi.rc:205 msgid "MIME Content Type: [1], Extension: [2]" -msgstr "" +msgstr "Tipo de conteúdo MIME: [1], Extensão: [2]" #: msi.rc:185 msi.rc:206 msgid "ProgId: [1]" @@ -7435,27 +7435,27 @@ msgstr "" #: msi.rc:187 msi.rc:190 msgid "File: [1], Directory: [9]" -msgstr "" +msgstr "Arquivo: [1], Pasta: [9]" #: msi.rc:188 msi.rc:208 msgid "Name: [1], Value: [2], Action [3]" -msgstr "" +msgstr "Nome: [1], Valor: [2], Ação [3]" #: msi.rc:189 msgid "Application: [1], Command line: [2]" -msgstr "" +msgstr "Aplicação: [1], Linha de comando: [2]" #: msi.rc:192 msi.rc:209 msgid "File: [1], Section: [2], Key: [3], Value: [4]" -msgstr "" +msgstr "Arquivo: [1], Seção: [2], Chave: [3], Valor: [4]" #: msi.rc:193 msgid "Key: [1], Name: [2]" -msgstr "" +msgstr "Chave: [1], Nome: [2]" #: msi.rc:195 msi.rc:196 msgid "File: [1], Folder: [2]" -msgstr "" +msgstr "Arquivo: [1], Pasta: [2]" #: msi.rc:202 msgid "AppId: [1]{{, AppType: [2]}}" @@ -7463,23 +7463,23 @@ msgstr "" #: msi.rc:210 msgid "Key: [1], Name: [2], Value: [3]" -msgstr "" +msgstr "Chave: [1], Nome: [2], Valor: [3]" #: msi.rc:72 msgid "{{Fatal error: }}" -msgstr "" +msgstr "{{Erro Fatal: }}" #: msi.rc:73 msgid "{{Error [1]. }}" -msgstr "" +msgstr "{{Erro [1]. }}" #: msi.rc:74 msgid "Warning [1]." -msgstr "" +msgstr "Atenção [1]." #: msi.rc:75 msgid "Info [1]." -msgstr "" +msgstr "Info [1]." #: msi.rc:76 msgid "" @@ -7487,6 +7487,9 @@ msgid "" "This may indicate a problem with this package. The error code is [1]. {{The " "arguments are: [2], [3], [4]}}" msgstr "" +"O instalador encontrou um erro inesperado instalando este pacote. " +"Isto pode indicar um problema com este pacote. O código de erro é [1]. {{Os " +"argumentos são: [2], [3], [4]}}" #: msi.rc:77 msgid "{{Disk full: }}" @@ -7494,33 +7497,35 @@ msgstr "{{Disco cheio: }}" #: msi.rc:78 msgid "Action [Time]: [1]. [2]" -msgstr "" +msgstr "Ação [Time]: [1]. [2]" #: msi.rc:79 msgid "Message type: [1], Argument: [2]{, [3]}" -msgstr "" +msgstr "Tipo da Mensagem: [1], Argumento: [2]{, [3]}" #: msi.rc:82 msgid "=== Logging started: [Date] [Time] ===" -msgstr "" +msgstr "=== Logging started: [Date] [Time] ===" #: msi.rc:80 msgid "Action start [Time]: [1]." -msgstr "" +msgstr "Inicio da Ação [Time]: [1]." #: msi.rc:81 msgid "Action ended [Time]: [1]. Return value [2]." -msgstr "" +msgstr "Ação finalizada [Time]: [1]. Valore de Retorno [2]." #: msi.rc:84 msgid "Please insert the disk: [2]" -msgstr "" +msgstr "Porfavor insira o disco: [2]" #: msi.rc:85 msgid "" "Source file not found{{(cabinet)}}: [2]. Verify that the file exists and " "that you can access it." msgstr "" +"Arquivo de origem nao encontrado{{(cabinet)}}: [2]. Verifique se o arquivo existe" +"e se você tem acesso a ele" #: msrle32.rc:31 msgid "Wine MS-RLE video codec" @@ -7932,7 +7937,7 @@ msgstr "expansível" #: oleacc.rc:116 msgctxt "object state" msgid "moveable" -msgstr "movível" +msgstr "movimentável" #: oleacc.rc:117 msgctxt "object state" @@ -8712,7 +8717,7 @@ msgstr "&Procurar..." #, fuzzy #| msgid "File type" msgid "File type:" -msgstr "Tipo de arquivo" +msgstr "Tipo de arquivo:" #: shell32.rc:359 shell32.rc:392 urlmon.rc:37 explorer.rc:32 msgid "Location:" @@ -8726,7 +8731,7 @@ msgstr "Tamanho:" #, fuzzy #| msgid "Creation date" msgid "Creation date:" -msgstr "Data de criação" +msgstr "Data de criação:" #: shell32.rc:369 shell32.rc:406 #, fuzzy @@ -8758,7 +8763,7 @@ msgstr "Mudar &Ícone..." #, fuzzy #| msgid "Modified" msgid "Last modified:" -msgstr "Modificado" +msgstr "Modificado:" #: shell32.rc:402 #, fuzzy @@ -9057,7 +9062,7 @@ msgstr "" #: shell32.rc:240 msgid "Wine Control Panel" msgstr "Painel de Controle do Wine" - +#: shell32.rc:244 #: shell32.rc:195 #, fuzzy #| msgid "Unable to display Run File dialog box (internal error)" @@ -9392,7 +9397,7 @@ msgstr "Caminho inválido.\n" #: winineterror.mc:41 msgid "The URL scheme could not be recognized or is not supported.\n" -msgstr "" +msgstr "O tipo de URL nao pode ser reconhecido ou não é suportado.\n" #: winineterror.mc:46 #, fuzzy @@ -9426,17 +9431,18 @@ msgstr "Impossível conectar-se ao servidor LDAP" #: winineterror.mc:71 msgid "The connection with the server has been terminated.\n" -msgstr "" +msgstr "A conexão com o servidor foi finalizada.\n" #: winineterror.mc:76 msgid "" "SSL certificate date that was received from the server is bad. The " "certificate is expired.\n" -msgstr "" +msgstr "Data do certificado SSL recebida do host ruim. O " +"certificado esta expirado.\n" #: winineterror.mc:81 msgid "SSL certificate common name (host name field) is incorrect.\n" -msgstr "" +msgstr "Nome comun do certificado SSL(campo nome do host) esta incorreto.\n" #: winmm.rc:32 msgid "The specified command was carried out." @@ -12571,7 +12577,7 @@ msgstr "(valor não dado)" #: reg.rc:66 msgid "REG IMPORT file.reg\n" -msgstr "" +msgstr "REG IMPORT arquivo.reg\n" #: reg.rc:67 #, fuzzy @@ -12856,12 +12862,16 @@ msgid "" "Unable to rename the key '%1'.\n" "The specified key name already exists." msgstr "" +"Nao pode renomear a chave '%1'.\n" +"A chave de registro especificada já existe." #: regedit.rc:251 msgid "" "Unable to rename the value '%1'.\n" "The specified value name already exists." msgstr "" +"Nao pode renomear o valor '%1'.\n" +"A valor especificado já existe." #: regedit.rc:252 #, fuzzy @@ -12885,6 +12895,7 @@ msgstr "regedit: Não foi possível abrir a chave de registro '%1'.\n" msgid "" "The keys and values contained in %1 were successfully added to the registry." msgstr "" +"A chave e o valor contidos em %1 foram adicionados com sucesso ao registro" #: regedit.rc:256 #, fuzzy @@ -13276,7 +13287,7 @@ msgstr "Você tem certeza que deseja excluir a chave de registro '%1'?" #: regedit.rc:199 msgid "Expands or collapses the selected node" -msgstr "" +msgstr "Expande ou recolhe o nó selecionado" #: regedit.rc:231 #, fuzzy @@ -14601,11 +14612,11 @@ msgstr "C&or:" #: winecfg.rc:304 msgid "MIME types" -msgstr "" +msgstr "Tipos MIME" #: winecfg.rc:305 msgid "Manage file &associations" -msgstr "" +msgstr "Gerenciar &associação de arquivos" #: winecfg.rc:308 msgid "Folders" @@ -15217,6 +15228,8 @@ msgid "" "A program on your system has crashed, but WineDbg was unable to attach to " "the process to obtain a backtrace." msgstr "" +"Um programa ou systema teve uma falha, mas WineDbg nao foi capaz de se " +"conectar ao processo para obter os logs da pilha" #: winedbg.rc:41 msgid "(unidentified)" @@ -15507,7 +15520,7 @@ msgstr "Minas" #: winemine.rc:34 msgid "All results will be lost. Are you sure?" -msgstr "" +msgstr "Todos os resultados serão perdidos. Você tem certeza?" #: winemine.rc:30 msgid "WineMine" -- 2.17.1

2 1

[PATCH] l3codeca.acm: Use the ARRAY_SIZE() macro
by Michael Stefaniuc Nov. 15, 2018

Nov. 15, 2018

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/l3codeca.acm/mpegl3.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/l3codeca.acm/mpegl3.c b/dlls/l3codeca.acm/mpegl3.c index f71aac307f..8ad6ae83dc 100644 --- a/dlls/l3codeca.acm/mpegl3.c +++ b/dlls/l3codeca.acm/mpegl3.c @@ -676,13 +676,13 @@ static LRESULT MPEG3_DriverDetails(PACMDRIVERDETAILSW add) add->cFilterTags = 0; add->hicon = NULL; MultiByteToWideChar( CP_ACP, 0, "MPEG Layer-3 Codec", -1, - add->szShortName, sizeof(add->szShortName)/sizeof(WCHAR) ); + add->szShortName, ARRAY_SIZE( add->szShortName )); MultiByteToWideChar( CP_ACP, 0, "Wine MPEG3 decoder", -1, - add->szLongName, sizeof(add->szLongName)/sizeof(WCHAR) ); + add->szLongName, ARRAY_SIZE( add->szLongName )); MultiByteToWideChar( CP_ACP, 0, "Brought to you by the Wine team...", -1, - add->szCopyright, sizeof(add->szCopyright)/sizeof(WCHAR) ); + add->szCopyright, ARRAY_SIZE( add->szCopyright )); MultiByteToWideChar( CP_ACP, 0, "Refer to LICENSE file", -1, - add->szLicensing, sizeof(add->szLicensing)/sizeof(WCHAR) ); + add->szLicensing, ARRAY_SIZE( add->szLicensing )); add->szFeatures[0] = 0; return MMSYSERR_NOERROR; -- 2.14.5

2 1

[PATCH] msadp32.acm: Use the ARRAY_SIZE() macro
by Michael Stefaniuc Nov. 15, 2018

Nov. 15, 2018

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msadp32.acm/msadp32.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msadp32.acm/msadp32.c b/dlls/msadp32.acm/msadp32.c index 50ade3d9aa..78d99a21de 100644 --- a/dlls/msadp32.acm/msadp32.c +++ b/dlls/msadp32.acm/msadp32.c @@ -386,13 +386,13 @@ static LRESULT ADPCM_DriverDetails(PACMDRIVERDETAILSW add) add->cFilterTags = 0; add->hicon = NULL; MultiByteToWideChar( CP_ACP, 0, "MS-ADPCM", -1, - add->szShortName, sizeof(add->szShortName)/sizeof(WCHAR) ); + add->szShortName, ARRAY_SIZE( add->szShortName )); MultiByteToWideChar( CP_ACP, 0, "Wine MS ADPCM converter", -1, - add->szLongName, sizeof(add->szLongName)/sizeof(WCHAR) ); + add->szLongName, ARRAY_SIZE( add->szLongName )); MultiByteToWideChar( CP_ACP, 0, "Brought to you by the Wine team...", -1, - add->szCopyright, sizeof(add->szCopyright)/sizeof(WCHAR) ); + add->szCopyright, ARRAY_SIZE( add->szCopyright )); MultiByteToWideChar( CP_ACP, 0, "Refer to LICENSE file", -1, - add->szLicensing, sizeof(add->szLicensing)/sizeof(WCHAR) ); + add->szLicensing, ARRAY_SIZE( add->szLicensing )); add->szFeatures[0] = 0; return MMSYSERR_NOERROR; -- 2.14.5

2 1

[PATCH v2] Enforce type check in ARRAY_SIZE macro
by janisozaur＠gmail.com Nov. 15, 2018

Nov. 15, 2018

From: Michał Janiszewski <janisozaur(a)gmail.com> Inspired by kernel check and recent unification of ARRAY_SIZE, provide a way of enforcing the macro can only be applied to actual arrays and not to pointers. v2: Fix parentheses Signed-off-by: Michał Janiszewski <janisozaur(a)gmail.com> --- include/winnt.h | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/include/winnt.h b/include/winnt.h index 7f822c4aec..b99a375ab0 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -760,7 +760,26 @@ typedef struct _MEMORY_BASIC_INFORMATION ((type *)((PCHAR)(address) - offsetof(type, field))) #ifdef __WINESRC__ -# define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0])) +// Validate types used in the expression. +// Based on https://elixir.bootlin.com/linux/v4.17.4/source/include/linux/kernel.h#L71 + +#ifdef __GNUC__ +/** + * Force a compilation error if condition is true, but also produce a + * result (of value 0 and type size_t), so the expression can be used + * e.g. in a structure initializer (or where-ever else comma expressions + * aren't permitted). + */ +#define BUILD_BUG_ON_ZERO(e) (sizeof(struct { int:-!!(e); })) + +/* &a[0] degrades to a pointer: a different type from an array */ +#define __must_be_array(a) \ + BUILD_BUG_ON_ZERO(__builtin_types_compatible_p(typeof(a), typeof(&a[0]))) +#else +#define __must_be_array(a) 0 +#endif + +# define ARRAY_SIZE(x) ((sizeof(x) / sizeof((x)[0])) + __must_be_array(x)) #endif /* Types */ -- 2.18.0

2 1