Ros-diffs

ros-diffs@reactos.org

81390 discussions

[akhaldi] 70900: [PSDK] Update objidl.idl. CORE-10912
by akhaldi＠svn.reactos.org 05 Mar '16

05 Mar '16

Author: akhaldi Date: Fri Mar 4 09:20:21 2016 New Revision: 70900 URL: http://svn.reactos.org/svn/reactos?rev=70900&view=rev Log: [PSDK] Update objidl.idl. CORE-10912 Modified: trunk/reactos/include/psdk/objidl.idl Modified: trunk/reactos/include/psdk/objidl.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/objidl.idl?re… ============================================================================== --- trunk/reactos/include/psdk/objidl.idl [iso-8859-1] (original) +++ trunk/reactos/include/psdk/objidl.idl [iso-8859-1] Fri Mar 4 09:20:21 2016 @@ -2327,6 +2327,15 @@ APTTYPE_MAINSTA = 3 } APTTYPE; +typedef enum _APTTYPEQUALIFIER { + APTTYPEQUALIFIER_NONE = 0, + APTTYPEQUALIFIER_IMPLICIT_MTA = 1, + APTTYPEQUALIFIER_NA_ON_MTA = 2, + APTTYPEQUALIFIER_NA_ON_STA = 3, + APTTYPEQUALIFIER_NA_ON_IMPLICIT_MTA = 4, + APTTYPEQUALIFIER_NA_ON_MAINSTA = 5 +} APTTYPEQUALIFIER; + typedef enum _THDTYPE { THDTYPE_BLOCKMESSAGES = 0, THDTYPE_PROCESSMESSAGES = 1 @@ -2451,6 +2460,17 @@ HRESULT Dummy([in] HICON hIcon, [in] HDC hdc); } +[ + object, + local, + pointer_default(unique), + uuid(a2f05a09-27a2-42b5-bc0e-ac163ef49d9b) +] +interface IApartmentShutdown : IUnknown +{ + void OnUninitialize([in] UINT64 identifier); +} + cpp_quote("#ifdef USE_COM_CONTEXT_DEF") typedef DWORD CPFLAGS;

1 0

[ekohl] 70898: [TIMEDATE] Brazilian Portuguese translation for timedate.cpl. Patch by Edison Henrique Andreassy. CORE-10919 #resolve #comment Thanks a lot!
by ekohl＠svn.reactos.org 05 Mar '16

05 Mar '16

Author: ekohl Date: Thu Mar 3 20:16:39 2016 New Revision: 70898 URL: http://svn.reactos.org/svn/reactos?rev=70898&view=rev Log: [TIMEDATE] Brazilian Portuguese translation for timedate.cpl. Patch by Edison Henrique Andreassy. CORE-10919 #resolve #comment Thanks a lot! Added: trunk/reactos/dll/cpl/timedate/lang/pt-BR.rc (with props) Modified: trunk/reactos/dll/cpl/timedate/timedate.rc Added: trunk/reactos/dll/cpl/timedate/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/timedate/lang/pt-B… ============================================================================== --- trunk/reactos/dll/cpl/timedate/lang/pt-BR.rc (added) +++ trunk/reactos/dll/cpl/timedate/lang/pt-BR.rc [iso-8859-1] Thu Mar 3 20:16:39 2016 @@ -0,0 +1,57 @@ +LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL + +IDD_DATETIMEPAGE DIALOGEX 0, 0, 252, 146 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Data e hora" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + GROUPBOX "&Data", -1, 4, 2, 122, 125 + COMBOBOX IDC_MONTHCB, 11, 17, 50, 120, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + EDITTEXT IDC_YEARTEXT, 65, 17, 55, 12, ES_LEFT | WS_GROUP | ES_READONLY + CONTROL "", IDC_YEAR, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_NOTHOUSANDS | + UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 120, 17, 50, 12 + CONTROL "", IDC_MONTHCALENDAR, "MonthCalWnd", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 11, 37, 108, 80, WS_EX_CLIENTEDGE + GROUPBOX "&Hora", -1, 132, 2, 113, 125 + CONTROL "", IDC_TIMEPICKER, "SysDateTimePick32", DTS_TIMEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 144, 105, 90, 12 + LTEXT "", IDC_TIMEZONE, 6, 132, 242, 11 + CONTROL "", IDC_CLOCKWND, "ClockWndClass", WS_CHILD | WS_VISIBLE, 138, 12, 102, 89 +END + +IDD_TIMEZONEPAGE DIALOGEX 0, 0, 252, 146 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Fuso horÃ¡rio" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + COMBOBOX IDC_TIMEZONELIST, 5, 4, 241, 136, CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP + CONTROL "", IDC_WORLD_BACKGROUND, "Static", SS_OWNERDRAW, 5, 20, 240, 110, WS_EX_STATICEDGE + AUTOCHECKBOX "Ajustar automaticamente o relÃ³gio para o &horÃ¡rio de verÃ£o", + IDC_AUTODAYLIGHT, 6, 132, 242, 11, WS_VISIBLE | WS_GROUP | WS_TABSTOP +END + +IDD_INETTIMEPAGE DIALOGEX 0, 0, 252, 146 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "HorÃ¡rio na Internet" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + COMBOBOX IDC_SERVERLIST, 65, 22, 117, 136, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + AUTOCHECKBOX "&Sincronizar automaticamente com um servidor de horÃ¡rio na Internet", + IDC_AUTOSYNC, 11, 7, 241, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + LTEXT "Servidor:", IDC_SERVERTEXT, 34, 22, 28, 13 + PUSHBUTTON "A&tualizar agora", IDC_UPDATEBUTTON, 187, 22, 56, 14 + LTEXT "", IDC_SUCSYNC, 12, 54, 214, 23 + LTEXT "", IDC_NEXTSYNC, 12, 96, 137, 12 + LTEXT "A sincronizaÃ§Ã£o sÃ³ pode ocorrer quando o computador estÃ¡ conectado Ã Internet.", -1, 12, 114, 225, 25 +END + +STRINGTABLE +BEGIN + IDS_CPLNAME "Data e hora" + IDS_CPLDESCRIPTION "Define a data, a hora e o fuso horÃ¡rio para o computador" + IDS_TIMEZONETEXT "Fuso horÃ¡rio atual: %s" + IDS_TIMEZONEINVALID "InvÃ¡lido" + IDS_TIMEZONEUNKNOWN "Desconhecido" + IDS_INETTIMESUCSYNC "A hora foi sincronizada com sucesso com %s em %s Ã s %s" + IDS_INETTIMENEXTSYNC "PrÃ³xima sincronizaÃ§Ã£o: %s Ã s %s" + IDS_INETTIMESYNCING "Aguarde enquanto o ReactOS Ã© sincronizado com %s" + IDS_INETTIMEERROR "Erro enquanto o ReactOS estava sincronizando com %s" +END Propchange: trunk/reactos/dll/cpl/timedate/lang/pt-BR.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/cpl/timedate/timedate.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/timedate/timedate.… ============================================================================== --- trunk/reactos/dll/cpl/timedate/timedate.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/timedate/timedate.rc [iso-8859-1] Thu Mar 3 20:16:39 2016 @@ -71,6 +71,9 @@ #ifdef LANGUAGE_PL_PL #include "lang/pl-PL.rc" #endif +#ifdef LANGUAGE_PT_BR + #include "lang/pt-BR.rc" +#endif #ifdef LANGUAGE_RO_RO #include "lang/ro-RO.rc" #endif

1 0

[hbelusca] 70899: [HELP]: Use ARRAYSIZE(buffer) instead of hardcoding its size.
by hbelusca＠svn.reactos.org 05 Mar '16

05 Mar '16

Author: hbelusca Date: Thu Mar 3 23:00:55 2016 New Revision: 70899 URL: http://svn.reactos.org/svn/reactos?rev=70899&view=rev Log: [HELP]: Use ARRAYSIZE(buffer) instead of hardcoding its size. Modified: trunk/reactos/base/applications/cmdutils/help/help.c Modified: trunk/reactos/base/applications/cmdutils/help/help.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/help/help.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/help/help.c [iso-8859-1] Thu Mar 3 23:00:55 2016 @@ -30,7 +30,7 @@ va_list args; va_start(args, resID); - LoadStringW(GetModuleHandleW(NULL), resID, bufSrc, RC_STRING_MAX_SIZE); + LoadStringW(GetModuleHandleW(NULL), resID, bufSrc, ARRAYSIZE(bufSrc)); vswprintf(bufFormatted, bufSrc, args); CharToOemW(bufFormatted, bufFormattedOem); fputs(bufFormattedOem, stdout);

1 0

[ekohl] 70897: Brazilian Portuguese translation for console.dll. Patch by Edison Henrique Andreassy. CORE-10918 #resolve #comment Thanks a lot!
by ekohl＠svn.reactos.org 05 Mar '16

05 Mar '16

Author: ekohl Date: Thu Mar 3 20:13:25 2016 New Revision: 70897 URL: http://svn.reactos.org/svn/reactos?rev=70897&view=rev Log: Brazilian Portuguese translation for console.dll. Patch by Edison Henrique Andreassy. CORE-10918 #resolve #comment Thanks a lot! Added: trunk/reactos/dll/cpl/console/lang/pt-BR.rc (with props) Modified: trunk/reactos/dll/cpl/console/console.rc Modified: trunk/reactos/dll/cpl/console/console.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/console.rc… ============================================================================== --- trunk/reactos/dll/cpl/console/console.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/console/console.rc [iso-8859-1] Thu Mar 3 20:13:25 2016 @@ -60,6 +60,9 @@ #ifdef LANGUAGE_PL_PL #include "lang/pl-PL.rc" #endif +#ifdef LANGUAGE_PT_BR + #include "lang/pt-BR.rc" +#endif #ifdef LANGUAGE_RO_RO #include "lang/ro-RO.rc" #endif Added: trunk/reactos/dll/cpl/console/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/lang/pt-BR… ============================================================================== --- trunk/reactos/dll/cpl/console/lang/pt-BR.rc (added) +++ trunk/reactos/dll/cpl/console/lang/pt-BR.rc [iso-8859-1] Thu Mar 3 20:13:25 2016 @@ -0,0 +1,154 @@ +LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL + +IDD_PROPPAGEOPTIONS DIALOGEX 0, 0, 253, 220 +STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION +CAPTION "OpÃ§Ãµes" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Tamanho do cursor", -1, 7, 7, 120, 70, WS_CHILD | WS_VISIBLE | WS_GROUP + CONTROL "&Pequeno", IDC_RADIO_SMALL_CURSOR, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 20, 90, 10 + CONTROL "&MÃ©dio", IDC_RADIO_MEDIUM_CURSOR, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 40, 90, 10 + CONTROL "&Grande", IDC_RADIO_LARGE_CURSOR, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 60, 90, 10 + GROUPBOX "OpÃ§Ãµes de exibiÃ§Ã£o", -1, 133, 7, 112, 70, WS_CHILD | WS_VISIBLE | WS_GROUP + CONTROL "&Janela", IDC_RADIO_DISPLAY_WINDOW, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 142, 20, 70, 10 + CONTROL "T&ela inteira", IDC_RADIO_DISPLAY_FULL, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 142, 40, 70, 10 + GROUPBOX "HistÃ³rico de comandos", -1, 7, 85, 120, 77, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "&Tamanho do buffer:", -1, 14, 101, 70, 12 + EDITTEXT IDC_EDIT_BUFFER_SIZE, 90, 97, 30, 15, ES_RIGHT | ES_NUMBER | WS_GROUP + CONTROL "", IDC_UPDOWN_BUFFER_SIZE, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | + UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 119, 97, 12, 15 + LTEXT "&NÃºmero de buffers:", -1, 14, 124, 70, 12 + EDITTEXT IDC_EDIT_NUM_BUFFER, 90, 120, 30, 15, ES_RIGHT | ES_NUMBER | WS_GROUP + CONTROL "", IDC_UPDOWN_NUM_BUFFER, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | + UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 119, 120, 12, 15 + CHECKBOX "&Descartar duplicatas antigas", IDC_CHECK_DISCARD_DUPLICATES, 12, 140, 110, 15 + GROUPBOX "OpÃ§Ãµes de ediÃ§Ã£o", -1, 133, 85, 112, 77, BS_GROUPBOX | WS_CHILD | WS_VISIBLE | WS_GROUP + CHECKBOX "Modo de ediÃ§Ã£o &rÃ¡pida", IDC_CHECK_QUICK_EDIT, 140, 97, 102, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP + CHECKBOX "Modo de &inserÃ§Ã£o", IDC_CHECK_INSERT_MODE, 140, 113, 76, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP +END + +IDD_PROPPAGEFONT DIALOGEX 0, 0, 253, 220 +STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION +CAPTION "Fonte" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "VisualizaÃ§Ã£o da janela", -1, 10, 10, 94, 10 + LTEXT "&Tamanho", -1, 180, 10, 36, 10 + CONTROL "", IDC_STATIC_FONT_WINDOW_PREVIEW, "Static", SS_OWNERDRAW | SS_SUNKEN, 10, 20, 163, 74 + LISTBOX IDC_LBOX_FONTSIZE, 181, 20, 55, 80, LBS_SORT | LBS_HASSTRINGS | WS_VSCROLL + LTEXT "&Fonte", -1, 10, 105, 33, 10 + CHECKBOX "Fontes em &negrito", IDC_CHECK_BOLD_FONTS, 46, 105, 76, 10 + LISTBOX IDC_LBOX_FONTTYPE, 10, 120, 110, 40, LBS_SORT | LBS_HASSTRINGS | WS_VSCROLL + GROUPBOX "", IDC_GROUPBOX_FONT_NAME, 6, 156, 241, 50 + CONTROL "", IDC_STATIC_SELECT_FONT_PREVIEW, "Static", SS_OWNERDRAW | SS_SUNKEN, 16, 165, 95, 35 + LTEXT "Cada caractere tem:", -1, 124, 166, 75, 10 + LTEXT "pixels de largura\npixels de altura", -1, 136, 180, 101, 20 + LTEXT "", IDC_FONT_SIZE_X, 120, 180, 10, 10 + LTEXT "", IDC_FONT_SIZE_Y, 120, 188, 10, 10 +END + +IDD_PROPPAGELAYOUT DIALOGEX 0, 0, 253, 220 +STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION +CAPTION "Layout" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "VisualizaÃ§Ã£o da janela", -1, 8, 6, 95, 10 + CONTROL "", IDC_STATIC_LAYOUT_WINDOW_PREVIEW, "Static", SS_SUNKEN | SS_OWNERDRAW, 8, 16, 115, 70 + GROUPBOX "Tamanho do buffer de tela", -1, 130, 12, 115, 50 + LTEXT "&Largura:", -1, 140, 28, 40, 10 + LTEXT "&Altura:", -1, 140, 46, 39, 10 + EDITTEXT IDC_EDIT_SCREEN_BUFFER_WIDTH, 203, 25, 35, 14, ES_RIGHT | ES_NUMBER | WS_GROUP + CONTROL "", IDC_UPDOWN_SCREEN_BUFFER_WIDTH, UPDOWN_CLASS, UDS_NOTHOUSANDS | + UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 238, 25, 13, 14 + EDITTEXT IDC_EDIT_SCREEN_BUFFER_HEIGHT, 203, 42, 35, 14, ES_RIGHT | ES_NUMBER | WS_GROUP + CONTROL "", IDC_UPDOWN_SCREEN_BUFFER_HEIGHT, UPDOWN_CLASS, UDS_NOTHOUSANDS | + UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 238, 42, 13, 14 + GROUPBOX "Tamanho da janela", -1, 130, 65, 115, 47 + LTEXT "Lar&gura:", -1, 140, 78, 39, 10 + LTEXT "Altu&ra:", -1, 140, 95, 37, 10 + EDITTEXT IDC_EDIT_WINDOW_SIZE_WIDTH, 203, 75, 35, 14, ES_RIGHT | ES_NUMBER | WS_GROUP + CONTROL "", IDC_UPDOWN_WINDOW_SIZE_WIDTH, UPDOWN_CLASS, UDS_NOTHOUSANDS | + UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 238, 75, 13, 14 + EDITTEXT IDC_EDIT_WINDOW_SIZE_HEIGHT, 203, 92, 35, 14, ES_RIGHT | ES_NUMBER | WS_GROUP + CONTROL "", IDC_UPDOWN_WINDOW_SIZE_HEIGHT, UPDOWN_CLASS, UDS_NOTHOUSANDS | + UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 238, 92, 13, 14 + GROUPBOX "PosiÃ§Ã£o da janela", -1, 130, 116, 115, 64 + LTEXT "&Esquerda:", -1, 140, 132, 38, 10 + LTEXT "&Superior:", -1, 140, 149, 40, 10 + EDITTEXT IDC_EDIT_WINDOW_POS_LEFT, 203, 128, 35, 14, ES_RIGHT | ES_NUMBER | WS_GROUP + CONTROL "", IDC_UPDOWN_WINDOW_POS_LEFT, UPDOWN_CLASS, UDS_NOTHOUSANDS | + UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 238, 128, 13, 14 + EDITTEXT IDC_EDIT_WINDOW_POS_TOP, 203, 146, 35, 14, ES_RIGHT | ES_NUMBER | WS_GROUP + CONTROL "", IDC_UPDOWN_WINDOW_POS_TOP, UPDOWN_CLASS, UDS_NOTHOUSANDS | + UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 238, 146, 13, 14 + CHECKBOX "&Deixar o sistema posicionar a janela", IDC_CHECK_SYSTEM_POS_WINDOW, 137, 165, 104, 10 +END + +IDD_PROPPAGECOLORS DIALOGEX 0, 0, 253, 220 +STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION +CAPTION "Cores" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "&Texto da tela", IDC_RADIO_SCREEN_TEXT, "Button", BS_AUTORADIOBUTTON | + WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 12, 90, 10 + CONTROL "Plano de &fundo da tela", IDC_RADIO_SCREEN_BACKGROUND, "Button", BS_AUTORADIOBUTTON | + WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 24, 90, 10 + CONTROL "Te&xto pop-up", IDC_RADIO_POPUP_TEXT, "Button", BS_AUTORADIOBUTTON | + WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 36, 90, 10 + CONTROL "Plano de fun&do pop-up", IDC_RADIO_POPUP_BACKGROUND, "Button", BS_AUTORADIOBUTTON | + WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 48, 90, 10 + GROUPBOX "Valores de cor selecionados", -1, 105, 6, 140, 60 + LTEXT "&Vermelho:", -1, 135, 18, 30, 10 + EDITTEXT IDC_EDIT_COLOR_RED, 175, 16, 35, 14, ES_RIGHT | ES_NUMBER | WS_GROUP + CONTROL "", IDC_UPDOWN_COLOR_RED, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | + UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 210, 16, 10, 14 + LTEXT "V&erde:", -1, 135, 34, 30, 10 + EDITTEXT IDC_EDIT_COLOR_GREEN, 175, 32, 35, 14, ES_RIGHT | ES_NUMBER | WS_GROUP + CONTROL "", IDC_UPDOWN_COLOR_GREEN, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | + UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 210, 32, 10, 14 + LTEXT "A&zul:", -1, 135, 50, 30, 10 + EDITTEXT IDC_EDIT_COLOR_BLUE, 175, 48, 35, 14, ES_RIGHT | ES_NUMBER | WS_GROUP + CONTROL "", IDC_UPDOWN_COLOR_BLUE, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | + UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 210, 48, 10, 14 + CONTROL "", IDC_STATIC_COLOR1, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 23, 80, 12, 12 + CONTROL "", IDC_STATIC_COLOR2, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 36, 80, 12, 12 + CONTROL "", IDC_STATIC_COLOR3, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 49, 80, 12, 12 + CONTROL "", IDC_STATIC_COLOR4, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 62, 80, 12, 12 + CONTROL "", IDC_STATIC_COLOR5, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 75, 80, 12, 12 + CONTROL "", IDC_STATIC_COLOR6, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 88, 80, 12, 12 + CONTROL "", IDC_STATIC_COLOR7, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 101, 80, 12, 12 + CONTROL "", IDC_STATIC_COLOR8, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 114, 80, 12, 12 + CONTROL "", IDC_STATIC_COLOR9, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 127, 80, 12, 12 + CONTROL "", IDC_STATIC_COLOR10, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 140, 80, 12, 12 + CONTROL "", IDC_STATIC_COLOR11, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 153, 80, 12, 12 + CONTROL "", IDC_STATIC_COLOR12, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 166, 80, 12, 12 + CONTROL "", IDC_STATIC_COLOR13, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 179, 80, 12, 12 + CONTROL "", IDC_STATIC_COLOR14, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 192, 80, 12, 12 + CONTROL "", IDC_STATIC_COLOR15, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 205, 80, 12, 12 + CONTROL "", IDC_STATIC_COLOR16, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 218, 80, 12, 12 + GROUPBOX "Cores selecionadas para a tela", -1, 8, 100, 237, 55 + CONTROL "", IDC_STATIC_SCREEN_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 13, 110, 227, 40 + GROUPBOX "Cores pop-up selecionadas", -1, 8, 160, 237, 55 + CONTROL "", IDC_STATIC_POPUP_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 13, 170, 227, 40 +END + +IDD_APPLYOPTIONS DIALOGEX 0, 0, 220, 79 +STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION +CAPTION "Aplicar propriedades" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "&Aplicar as propriedades apenas Ã janela atual", IDC_RADIO_APPLY_CURRENT, + "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 12, 12, 207, 10 + CONTROL "&Salvar as propriedades para janelas futuras com o mesmo tÃtulo", IDC_RADIO_APPLY_ALL, + "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 12, 31, 207, 10 + PUSHBUTTON "OK", IDOK, 58, 58, 50, 14, WS_VISIBLE + PUSHBUTTON "Cancelar", IDCANCEL, 114, 58, 50, 14, WS_VISIBLE +END + +STRINGTABLE +BEGIN + IDS_CPLNAME "Console" + IDS_CPLDESCRIPTION "Configura as propriedades do console." + IDS_APPLY_SHORTCUT_ALL "&Modificar o atalho que iniciou esta janela" + IDS_RASTERFONTS "Fontes de varredura" +END Propchange: trunk/reactos/dll/cpl/console/lang/pt-BR.rc ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[ekohl] 70896: Brazilian Portuguese translation for access.cpl. Patch by Edison Henrique Andreassy. CORE-10916 #resolve #comment Thanks a lot!
by ekohl＠svn.reactos.org 05 Mar '16

05 Mar '16

Author: ekohl Date: Thu Mar 3 20:10:20 2016 New Revision: 70896 URL: http://svn.reactos.org/svn/reactos?rev=70896&view=rev Log: Brazilian Portuguese translation for access.cpl. Patch by Edison Henrique Andreassy. CORE-10916 #resolve #comment Thanks a lot! Added: trunk/reactos/dll/cpl/access/lang/pt-BR.rc (with props) Modified: trunk/reactos/dll/cpl/access/access.rc Modified: trunk/reactos/dll/cpl/access/access.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/access.rc?r… ============================================================================== --- trunk/reactos/dll/cpl/access/access.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/access/access.rc [iso-8859-1] Thu Mar 3 20:10:20 2016 @@ -64,6 +64,9 @@ #ifdef LANGUAGE_PL_PL #include "lang/pl-PL.rc" #endif +#ifdef LANGUAGE_PT_BR + #include "lang/pt-BR.rc" +#endif #ifdef LANGUAGE_RO_RO #include "lang/ro-RO.rc" #endif Added: trunk/reactos/dll/cpl/access/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/pt-BR.… ============================================================================== --- trunk/reactos/dll/cpl/access/lang/pt-BR.rc (added) +++ trunk/reactos/dll/cpl/access/lang/pt-BR.rc [iso-8859-1] Thu Mar 3 20:10:20 2016 @@ -0,0 +1,291 @@ +LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL + +IDD_PROPPAGEKEYBOARD DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Teclado" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + GROUPBOX "Teclas de aderÃªncia", -1, PROPSHEETPADDING(1), LABELLINE(1), PROPSHEETWIDTH - PROPSHEETPADDING(2), LABELLINE(6) + PROPSHEETPADDING(1) + LTEXT "Use as teclas de aderÃªncia se vocÃª desejar usar SHIFT, CTRL, ALT ou a tecla de logotipo do Windows pressionando uma tecla de cada vez.", + -1, PROPSHEETPADDING(2), LABELLINE(2), PROPSHEETWIDTH - PROPSHEETPADDING(4), LABELLINE(3) + AUTOCHECKBOX "&Usar as teclas de aderÃªncia", IDC_STICKY_BOX, PROPSHEETPADDING(2), LABELLINE(5) + 2, PROPSHEETWIDTH - PROPSHEETPADDING(20), 14 + PUSHBUTTON "&ConfiguraÃ§Ãµes", IDC_STICKY_BUTTON, PROPSHEETWIDTH - PROPSHEETPADDING(17), LABELLINE(5) + 2, PROPSHEETPADDING(15), 14 + GROUPBOX "Teclas de filtragem", -1, PROPSHEETPADDING(1), LABELLINE(8) + 5, PROPSHEETWIDTH - PROPSHEETPADDING(2), LABELLINE(7) + 2 + LTEXT "Use as teclas de filtragem para que o Windows ignore teclas pressionadas rÃ¡pida ou repetidamente ou para que ele diminua a taxa de repetiÃ§Ã£o.", + -1, PROPSHEETPADDING(2), LABELLINE(10) - 3, PROPSHEETWIDTH - PROPSHEETPADDING(4), LABELLINE(3) + AUTOCHECKBOX "Usar as teclas de &filtragem", IDC_FILTER_BOX, PROPSHEETPADDING(2), LABELLINE(13) + 2, PROPSHEETWIDTH - PROPSHEETPADDING(20), 14 + PUSHBUTTON "C&onfiguraÃ§Ãµes", IDC_FILTER_BUTTON, PROPSHEETWIDTH - PROPSHEETPADDING(17), LABELLINE(13) + 2, PROPSHEETPADDING(15), 14 + GROUPBOX "Teclas de alternÃ¢ncia", -1, PROPSHEETPADDING(1), LABELLINE(16) + 3, PROPSHEETWIDTH - PROPSHEETPADDING(2), LABELLINE(6) + PROPSHEETPADDING(1) + LTEXT "Use as teclas de alternÃ¢ncia para ouvir sons quando pressionar CAPS LOCK, NUM LOCK e SCROLL LOCK.", + -1, PROPSHEETPADDING(2), LABELLINE(18) - 3, PROPSHEETWIDTH - PROPSHEETPADDING(4), LABELLINE(2) + AUTOCHECKBOX "Usar as &teclas de alternÃ¢ncia", IDC_TOGGLE_BOX, PROPSHEETPADDING(2), LABELLINE(20) + 2, PROPSHEETWIDTH - PROPSHEETPADDING(20), 14 + PUSHBUTTON "Co&nfiguraÃ§Ãµes", IDC_TOGGLE_BUTTON, PROPSHEETWIDTH - PROPSHEETPADDING(17), LABELLINE(20) + 2, PROPSHEETPADDING(15), 14 + AUTOCHECKBOX "Fornecer ajuda &extra para teclado em programas", IDC_KEYBOARD_EXTRA, + PROPSHEETPADDING(1), LABELLINE(23) + 3, PROPSHEETWIDTH - PROPSHEETPADDING(2), 14 +END + +IDD_PROPPAGESOUND DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Som" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + GROUPBOX "Sinalizador de som", -1, PROPSHEETPADDING(1), LABELLINE(1), PROPSHEETWIDTH - PROPSHEETPADDING(2), LABELLINE(10) + PROPSHEETPADDING(1) + LTEXT "Use o sinalizador de som se desejar que o Windows gere avisos visuais quando o sistema emitir um som.", + -1, PROPSHEETPADDING(2), LABELLINE(2), PROPSHEETWIDTH - PROPSHEETPADDING(4), LABELLINE(3) + AUTOCHECKBOX "U&sar o sinalizador de som", IDC_SENTRY_BOX, PROPSHEETPADDING(2), LABELLINE(5) + 2, PROPSHEETPADDING(15), 14 + LTEXT "Escolha o aviso visual:", IDC_SENTRY_TEXT, PROPSHEETPADDING(2), LABELLINE(8) - 2, PROPSHEETWIDTH - PROPSHEETPADDING(4), LABELLINE(1) + COMBOBOX IDC_SENTRY_COMBO, PROPSHEETPADDING(2), LABELLINE(9), PROPSHEETWIDTH - PROPSHEETPADDING(4), LABELLINE(6), + CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP + GROUPBOX "Mostrar sons", -1, PROPSHEETPADDING(1), LABELLINE(12) + 5, PROPSHEETWIDTH - PROPSHEETPADDING(2), LABELLINE(7) + 2 + LTEXT "Use este recurso se desejar que os programas exibam legendas para a fala e os sons emitidos.", + -1, PROPSHEETPADDING(2), LABELLINE(14) - 3, PROPSHEETWIDTH - PROPSHEETPADDING(4), LABELLINE(3) + AUTOCHECKBOX "&Usar o recurso para mostrar sons", IDC_SSHOW_BOX, PROPSHEETPADDING(2), LABELLINE(16) + 2, PROPSHEETWIDTH - PROPSHEETPADDING(4), 14 +END + +IDD_PROPPAGEDISPLAY DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "VÃdeo" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + GROUPBOX "Alto contraste", -1, PROPSHEETPADDING(1), LABELLINE(1), PROPSHEETWIDTH - PROPSHEETPADDING(2), LABELLINE(6) + PROPSHEETPADDING(1) + LTEXT "Use esta opÃ§Ã£o para que o Windows utilize cores e fontes que facilitam a leitura.", + -1, PROPSHEETPADDING(2), LABELLINE(2), PROPSHEETWIDTH - PROPSHEETPADDING(4), LABELLINE(3) + AUTOCHECKBOX "&Usar alto contraste", IDC_CONTRAST_BOX, PROPSHEETPADDING(2), LABELLINE(5) + 2, PROPSHEETWIDTH - PROPSHEETPADDING(20), 14 + PUSHBUTTON "&ConfiguraÃ§Ãµes", IDC_CONTRAST_BUTTON, PROPSHEETWIDTH - PROPSHEETPADDING(17), LABELLINE(5) + 2, PROPSHEETPADDING(15), 14 + GROUPBOX "OpÃ§Ãµes do cursor", -1, PROPSHEETPADDING(1), LABELLINE(8) + 5, PROPSHEETWIDTH - PROPSHEETPADDING(2), LABELLINE(13) + LTEXT "Mova os controles deslizantes para alterar a velocidade com que o cursor pisca (taxa de intermitÃªncia do cursor) e sua largura.", + -1, PROPSHEETPADDING(2), LABELLINE(9) + 5, PROPSHEETWIDTH - PROPSHEETPADDING(4), LABELLINE(2) + CTEXT "&Taxa de intermitÃªncia:", -1, PROPSHEETPADDING(2), LABELLINE(12) + 5, PROPSHEETWIDTH - PROPSHEETPADDING(4), LABELLINE(1) + LTEXT "Nenhuma", -1, PROPSHEETPADDING(3), LABELLINE(14) + 2, PROPSHEETPADDING(6), LABELLINE(1) + LTEXT "RÃ¡pida", -1, PROPSHEETWIDTH - PROPSHEETPADDING(9), LABELLINE(14) + 2, PROPSHEETPADDING(6), LABELLINE(1) + CONTROL "", IDC_CURSOR_BLINK_TRACK, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, + PROPSHEETPADDING(10), LABELLINE(14), PROPSHEETWIDTH - PROPSHEETPADDING(20), LABELLINE(2) + CTEXT "La&rgura:", -1, PROPSHEETPADDING(2), LABELLINE(17), PROPSHEETWIDTH - PROPSHEETPADDING(4), LABELLINE(1) + LTEXT "Estreito", -1, PROPSHEETPADDING(3), LABELLINE(18) + 7, PROPSHEETPADDING(6), LABELLINE(1) + LTEXT "Largo", -1, PROPSHEETWIDTH - PROPSHEETPADDING(9), LABELLINE(18) + 7, PROPSHEETPADDING(6), LABELLINE(1) + CONTROL "", IDC_CURSOR_WIDTH_TRACK, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, + PROPSHEETPADDING(10), LABELLINE(18) + 5, PROPSHEETWIDTH - PROPSHEETPADDING(20), LABELLINE(2) + LTEXT "", IDC_CURSOR_WIDTH_TEXT, PROPSHEETPADDING(3), LABELLINE(16), PROPSHEETPADDING(4), LABELLINE(1) + 5 +END + +IDD_PROPPAGEMOUSE DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Mouse" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + GROUPBOX "Teclas para mouse", -1, PROPSHEETPADDING(1), LABELLINE(1), PROPSHEETWIDTH - PROPSHEETPADDING(2), LABELLINE(6) + PROPSHEETPADDING(1) + LTEXT "Use as teclas para mouse para controlar o ponteiro com o teclado numÃ©rico.", + -1, PROPSHEETPADDING(2), LABELLINE(2), PROPSHEETWIDTH - PROPSHEETPADDING(4), LABELLINE(3) + AUTOCHECKBOX "Usar as teclas para &mouse", IDC_MOUSE_BOX, PROPSHEETPADDING(2), LABELLINE(5) + 2, PROPSHEETWIDTH - PROPSHEETPADDING(20), 14 + PUSHBUTTON "&ConfiguraÃ§Ãµes", IDC_MOUSE_BUTTON, PROPSHEETWIDTH - PROPSHEETPADDING(17), LABELLINE(5) + 2, PROPSHEETPADDING(15), 14 +END + +IDD_PROPPAGEGENERAL DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Geral" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + GROUPBOX "ReconfiguraÃ§Ã£o automÃ¡tica", -1, PROPSHEETPADDING(1), LABELLINE(1), PROPSHEETWIDTH - PROPSHEETPADDING(2), LABELLINE(5) + AUTOCHECKBOX "&Desativar recursos de acessibilidade se o computador ficar inativo por:", + IDC_RESET_BOX, PROPSHEETPADDING(2), LABELLINE(2) - 2, PROPSHEETWIDTH - PROPSHEETPADDING(4), 14 + COMBOBOX IDC_RESET_COMBO, PROPSHEETPADDING(4), LABELLINE(4), PROPSHEETPADDING(10), LABELLINE(5), + CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP + GROUPBOX "NotificaÃ§Ã£o", -1, PROPSHEETPADDING(1), LABELLINE(7) - 2, PROPSHEETWIDTH - PROPSHEETPADDING(2), LABELLINE(5) + AUTOCHECKBOX "&Emitir uma mensagem de aviso ao ativar um recurso", IDC_NOTIFICATION_MESSAGE, + PROPSHEETPADDING(2), LABELLINE(8) - 2, PROPSHEETWIDTH - PROPSHEETPADDING(4), 14 + AUTOCHECKBOX "Emitir um &som ao ativar ou desativar um recurso", IDC_NOTIFICATION_SOUND, + PROPSHEETPADDING(2), LABELLINE(10) - 2, PROPSHEETWIDTH - PROPSHEETPADDING(4), 14 + GROUPBOX "Dispositivos seriais de acessibilidade", -1, PROPSHEETPADDING(1), LABELLINE(13) - 4, PROPSHEETWIDTH - PROPSHEETPADDING(2), LABELLINE(5) + LTEXT "Os dispositivos seriais de acessibilidade permitem o acesso alternativo aos recursos de teclado e mouse.", + -1, PROPSHEETPADDING(2), LABELLINE(14) - 4, PROPSHEETWIDTH - PROPSHEETPADDING(4), LABELLINE(2) + AUTOCHECKBOX "&Usar as teclas seriais", IDC_SERIAL_BOX, PROPSHEETPADDING(2), LABELLINE(16) - 4, PROPSHEETWIDTH - PROPSHEETPADDING(20), 14 + PUSHBUTTON "&ConfiguraÃ§Ãµes", IDC_SERIAL_BUTTON, PROPSHEETWIDTH - PROPSHEETPADDING(17), LABELLINE(16) - 4, PROPSHEETPADDING(15), 14 + GROUPBOX "OpÃ§Ãµes administrativas", -1, PROPSHEETPADDING(1), LABELLINE(19) - 4, PROPSHEETWIDTH - PROPSHEETPADDING(2), LABELLINE(5) + AUTOCHECKBOX "&Aplicar todas as configuraÃ§Ãµes Ã Ã¡rea de trabalho de logon", IDC_ADMIN_LOGON_BOX, + PROPSHEETPADDING(2), LABELLINE(20) - 4, PROPSHEETWIDTH - PROPSHEETPADDING(4), 14 + AUTOCHECKBOX "Aplicar &todas as configuraÃ§Ãµes padrÃ£o para novos usuÃ¡rios", IDC_ADMIN_USERS_BOX, + PROPSHEETPADDING(2), LABELLINE(22) - 4, PROPSHEETWIDTH - PROPSHEETPADDING(4), 14 +END + +IDD_STICKYKEYSOPTIONS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "ConfiguraÃ§Ãµes das teclas de aderÃªncia" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Atalho do teclado", -1, PROPSHEETPADDING(1), LABELLINE(1), PROPSHEETWIDTH - PROPSHEETPADDING(2), LABELLINE(6) + PROPSHEETPADDING(1) + LTEXT "O atalho para as teclas de aderÃªncia Ã©:\npressionar a tecla SHIFT cinco vezes.", + -1, PROPSHEETPADDING(2), LABELLINE(2), PROPSHEETWIDTH - PROPSHEETPADDING(4), LABELLINE(3) + AUTOCHECKBOX "&Usar atalho", IDC_STICKY_ACTIVATE_CHECK, PROPSHEETPADDING(2), LABELLINE(5) + 2, PROPSHEETWIDTH - PROPSHEETPADDING(4), 14 + GROUPBOX "OpÃ§Ãµes", -1, PROPSHEETPADDING(1), LABELLINE(9), PROPSHEETWIDTH - PROPSHEETPADDING(2), LABELLINE(4) + PROPSHEETPADDING(1) + AUTOCHECKBOX "&Pressionar a tecla modificadora duas vezes para bloquear", IDC_STICKY_LOCK_CHECK, + PROPSHEETPADDING(2), LABELLINE(10), PROPSHEETWIDTH - PROPSHEETPADDING(4), 14 + AUTOCHECKBOX "Desa&tivar teclas de aderÃªncia se duas teclas forem pressionadas ao mesmo tempo", IDC_STICKY_UNLOCK_CHECK, + PROPSHEETPADDING(2), LABELLINE(11) + 4, PROPSHEETWIDTH - PROPSHEETPADDING(4), 18, BS_MULTILINE + GROUPBOX "NotificaÃ§Ã£o", -1, PROPSHEETPADDING(1), LABELLINE(15), PROPSHEETWIDTH - PROPSHEETPADDING(2), LABELLINE(4) + PROPSHEETPADDING(1) + AUTOCHECKBOX "&Emitir sons quando a tecla modificadora for pressionada", IDC_STICKY_SOUND_CHECK, + PROPSHEETPADDING(2), LABELLINE(16) + 2, PROPSHEETWIDTH - PROPSHEETPADDING(4), 14 + AUTOCHECKBOX "Mostrar o &status das teclas de aderÃªncia na tela", IDC_STICKY_STATUS_CHECK, + PROPSHEETPADDING(2), LABELLINE(18), PROPSHEETWIDTH - PROPSHEETPADDING(4), 14 + DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH - 111, PROPSHEETHEIGHT - 21, 50, 14 + PUSHBUTTON "Cancelar", IDCANCEL, PROPSHEETWIDTH - 57, PROPSHEETHEIGHT - 21, 50, 14 +END + +IDD_FILTERKEYSOPTIONS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "ConfiguraÃ§Ãµes das teclas de filtragem" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Atalho do teclado", -1, PROPSHEETPADDING(1), LABELLINE(1), PROPSHEETWIDTH - PROPSHEETPADDING(2), LABELLINE(6) + PROPSHEETPADDING(1) + LTEXT "O atalho para as teclas de filtragem Ã©: \nmanter a tecla SHIFT direita pressionada por oito segundos.", + -1, PROPSHEETPADDING(2), LABELLINE(2), PROPSHEETWIDTH - PROPSHEETPADDING(4), LABELLINE(3) + AUTOCHECKBOX "&Usar atalho", IDC_FILTER_ACTIVATE_CHECK, PROPSHEETPADDING(2), LABELLINE(5) + 2, PROPSHEETWIDTH - PROPSHEETPADDING(20), 14 + GROUPBOX "OpÃ§Ãµes de filtragem", -1, PROPSHEETPADDING(1), LABELLINE(8) + 5, PROPSHEETWIDTH - PROPSHEETPADDING(2), LABELLINE(8) + 5 + AUTORADIOBUTTON "&Ignorar pressionamentos de tecla repetidos", IDC_FILTER_BOUNCE_RADIO, + PROPSHEETPADDING(2), LABELLINE(9) + 7, PROPSHEETPADDING(27), LABELLINE(1), WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "Ig&norar teclas pressionadas rapidamente e diminuir a taxa de repetiÃ§Ã£o", IDC_FILTER_REPEAT_RADIO, + PROPSHEETPADDING(2), LABELLINE(11) + 5, PROPSHEETPADDING(27), LABELLINE(3), BS_TOP | BS_MULTILINE + PUSHBUTTON "&ConfiguraÃ§Ãµes", IDC_FILTER_BOUNCE_BUTTON, PROPSHEETWIDTH - PROPSHEETPADDING(13), LABELLINE(9) + 5, PROPSHEETPADDING(11), 14, WS_GROUP + PUSHBUTTON "C&onfiguraÃ§Ãµes", IDC_FILTER_REPEAT_BUTTON, PROPSHEETWIDTH - PROPSHEETPADDING(13), LABELLINE(11) + 5, PROPSHEETPADDING(11), 14, WS_GROUP + LTEXT "C&lique e digite aqui para testar a configuraÃ§Ã£o das teclas de filtragem:", -1, PROPSHEETPADDING(2), LABELLINE(14) + 1, PROPSHEETWIDTH - PROPSHEETPADDING(4), LABELLINE(1) + EDITTEXT IDC_FILTER_TEST_EDIT, PROPSHEETPADDING(2), LABELLINE(15) + 1, PROPSHEETWIDTH - PROPSHEETPADDING(4), 14, WS_GROUP | ES_AUTOHSCROLL + GROUPBOX "NotificaÃ§Ã£o", -1, PROPSHEETPADDING(1), LABELLINE(17) + 6, PROPSHEETWIDTH - PROPSHEETPADDING(2), LABELLINE(4) + 3 + AUTOCHECKBOX "&Emitir alarme sonoro para teclas pressionadas ou aceitas", IDC_FILTER_SOUND_CHECK, + PROPSHEETPADDING(2), LABELLINE(19), PROPSHEETWIDTH - PROPSHEETPADDING(4), 10 + AUTOCHECKBOX "E&xibir o status da tecla de filtragem na tela", IDC_FILTER_STATUS_CHECK, + PROPSHEETPADDING(2), LABELLINE(20) + 6, PROPSHEETWIDTH - PROPSHEETPADDING(4), 10 + DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH - 111, PROPSHEETHEIGHT - 21, 50, 14 + PUSHBUTTON "Cancelar", IDCANCEL, PROPSHEETWIDTH - 57, PROPSHEETHEIGHT - 21, 50, 14 +END + +IDD_TOGGLEKEYSOPTIONS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "ConfiguraÃ§Ãµes das teclas de alternÃ¢ncia" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Atalho do teclado", -1, PROPSHEETPADDING(1), LABELLINE(1), PROPSHEETWIDTH - PROPSHEETPADDING(2), LABELLINE(6) + PROPSHEETPADDING(1) + LTEXT "O atalho para as teclas de alternÃ¢ncia Ã©: \nmanter a tecla NUM LOCK pressionada por cinco segundos.", + -1, PROPSHEETPADDING(2), LABELLINE(2), PROPSHEETWIDTH - PROPSHEETPADDING(4), LABELLINE(3) + AUTOCHECKBOX "&Usar atalho", IDC_TOGGLE_ACTIVATE_CHECK, PROPSHEETPADDING(2), LABELLINE(5) + 2, PROPSHEETWIDTH - PROPSHEETPADDING(4), 14 + DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH - 111, PROPSHEETHEIGHT - 21, 50, 14 + PUSHBUTTON "Cancelar", IDCANCEL, PROPSHEETWIDTH - 57, PROPSHEETHEIGHT - 21, 50, 14 +END + +IDD_CONTRASTOPTIONS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "ConfiguraÃ§Ãµes de alto contraste" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Atalho do teclado", -1, PROPSHEETPADDING(1), LABELLINE(1), PROPSHEETWIDTH - PROPSHEETPADDING(2), LABELLINE(6) + PROPSHEETPADDING(1) + LTEXT "O atalho para o alto contraste Ã©: \npressionar ALT esquerda + SHIFT esquerda + PRINT SCREEN.", + -1, PROPSHEETPADDING(2), LABELLINE(2), PROPSHEETWIDTH - PROPSHEETPADDING(4), LABELLINE(3) + AUTOCHECKBOX "&Usar atalho", IDC_CONTRAST_ACTIVATE_CHECK, PROPSHEETPADDING(2), LABELLINE(5) + 2, PROPSHEETWIDTH - PROPSHEETPADDING(4), 14 + GROUPBOX "Esquema de aparÃªncia de alto contraste", -1, PROPSHEETPADDING(1), LABELLINE(9), PROPSHEETWIDTH - PROPSHEETPADDING(2), LABELLINE(4) + PROPSHEETPADDING(1) + LTEXT "O e&squema atual de alto contraste Ã©:", -1, PROPSHEETPADDING(2), LABELLINE(10) + 2, PROPSHEETWIDTH - PROPSHEETPADDING(4), LABELLINE(1) + COMBOBOX IDC_CONTRAST_COMBO, PROPSHEETPADDING(2), LABELLINE(11) + 2, PROPSHEETWIDTH - PROPSHEETPADDING(4), LABELLINE(6), + CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH - 111, PROPSHEETHEIGHT - 21, 50, 14 + PUSHBUTTON "Cancelar", IDCANCEL, PROPSHEETWIDTH - 57, PROPSHEETHEIGHT - 21, 50, 14 +END + +IDD_MOUSEKEYSOPTIONS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "ConfiguraÃ§Ãµes das teclas para mouse" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Atalho do teclado", -1, PROPSHEETPADDING(1), LABELLINE(1), PROPSHEETWIDTH - PROPSHEETPADDING(2), LABELLINE(6) + PROPSHEETPADDING(1) + LTEXT "O atalho para as teclas para mouse Ã©: \npressionar ALT esquerda + SHIFT esquerda + NUM LOCK.", + -1, PROPSHEETPADDING(2), LABELLINE(2), PROPSHEETWIDTH - PROPSHEETPADDING(4), LABELLINE(3) + AUTOCHECKBOX "&Usar atalho", IDC_MOUSEKEYS_ACTIVATE_CHECK, + PROPSHEETPADDING(2), LABELLINE(5) + 2, PROPSHEETWIDTH - PROPSHEETPADDING(4), 14 + GROUPBOX "Velocidade do ponteiro", -1, PROPSHEETPADDING(1), LABELLINE(9), PROPSHEETWIDTH - PROPSHEETPADDING(2), LABELLINE(9) + LTEXT "Velocidade &mÃ¡xima:", -1, PROPSHEETPADDING(2), LABELLINE(10) + 2, PROPSHEETPADDING(8), LABELLINE(2) + LTEXT "Baixa", -1, PROPSHEETPADDING(11), LABELLINE(10) + 4, PROPSHEETPADDING(3), LABELLINE(1) + CONTROL "", IDC_MOUSEKEYS_SPEED_TRACK, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, + PROPSHEETPADDING(15), LABELLINE(10) + 2, PROPSHEETWIDTH - PROPSHEETPADDING(22), LABELLINE(2) + LTEXT "Alta", -1, PROPSHEETWIDTH - PROPSHEETPADDING(7), LABELLINE(10) + 4, PROPSHEETPADDING(3), LABELLINE(1) + LTEXT "A&celeraÃ§Ã£o:", -1, PROPSHEETPADDING(2), LABELLINE(13) + 4, PROPSHEETPADDING(8), LABELLINE(1) + LTEXT "Lenta", -1, PROPSHEETPADDING(11), LABELLINE(13) + 4, PROPSHEETPADDING(3), LABELLINE(1) + CONTROL "", IDC_MOUSEKEYS_ACCEL_TRACK, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, + PROPSHEETPADDING(15), LABELLINE(13) + 2, PROPSHEETWIDTH - PROPSHEETPADDING(22), LABELLINE(2) + LTEXT "RÃ¡pida", -1, PROPSHEETWIDTH - PROPSHEETPADDING(7), LABELLINE(13) + 4, PROPSHEETPADDING(4), LABELLINE(1) + AUTOCHECKBOX "&Pressionar Ctrl p/ aumentar a velocidade e Shift p/ diminuÃ-la", IDC_MOUSEKEYS_SPEED_CHECK, + PROPSHEETPADDING(2), LABELLINE(16), PROPSHEETWIDTH - PROPSHEETPADDING(4), 14 + LTEXT "Usar as teclas para mouse quando Num Lock estiver:", -1, PROPSHEETPADDING(1), LABELLINE(18) + 4, PROPSHEETPADDING(20), LABELLINE(2) + AUTORADIOBUTTON "A&tivado", IDC_MOUSEKEYS_ON_RADIO, PROPSHEETWIDTH - PROPSHEETPADDING(20), LABELLINE(18) + 7, PROPSHEETPADDING(8), LABELLINE(1) + AUTORADIOBUTTON "&Desativado", IDC_MOUSEKEYS_OFF_RADIO, PROPSHEETWIDTH - PROPSHEETPADDING(11), LABELLINE(18) + 7, PROPSHEETPADDING(8), LABELLINE(1) + AUTOCHECKBOX "M&ostrar o status das teclas para mouse na tela", IDC_MOUSEKEYS_STATUS_CHECK, + PROPSHEETPADDING(1), LABELLINE(20) + 2, PROPSHEETWIDTH - PROPSHEETPADDING(4), 14 + DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH - 111, PROPSHEETHEIGHT - 21, 50, 14 + PUSHBUTTON "Cancelar", IDCANCEL, PROPSHEETWIDTH - 57, PROPSHEETHEIGHT - 21, 50, 14 +END + +IDD_BOUNCEKEYSOPTIONS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "ConfiguraÃ§Ãµes avanÃ§adas para teclas de filtragem" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "RepetiÃ§Ã£o de teclas", -1, PROPSHEETPADDING(1), LABELLINE(1), PROPSHEETWIDTH - PROPSHEETPADDING(2), LABELLINE(5) + LTEXT "&Ignorar pressionamentos de tecla repetidos em um intervalo de tempo menor que:", -1, PROPSHEETPADDING(2), LABELLINE(2) + 1, PROPSHEETWIDTH - PROPSHEETPADDING(4), LABELLINE(2) + COMBOBOX IDC_BOUNCE_TIME_COMBO, PROPSHEETPADDING(2), LABELLINE(3) + 5, PROPSHEETWIDTH - PROPSHEETPADDING(4), LABELLINE(6), + CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP + LTEXT "Ã&rea de teste:", -1, PROPSHEETPADDING(1), LABELLINE(7) + 3, PROPSHEETPADDING(8), LABELLINE(1) + EDITTEXT IDC_BOUNCE_TEST_EDIT, PROPSHEETPADDING(10), LABELLINE(7), PROPSHEETWIDTH - PROPSHEETPADDING(11), 14, ES_AUTOHSCROLL + DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH - 111, PROPSHEETHEIGHT - 21, 50, 14 + PUSHBUTTON "Cancelar", IDCANCEL, PROPSHEETWIDTH - 57, PROPSHEETHEIGHT - 21, 50, 14 +END + +IDD_REPEATKEYSOPTIONS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "ConfiguraÃ§Ãµes avanÃ§adas de teclas de filtragem" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Teclas de repetiÃ§Ã£o", -1, PROPSHEETPADDING(1), LABELLINE(1), PROPSHEETWIDTH - PROPSHEETPADDING(2), LABELLINE(12) + LTEXT "Anular as configuraÃ§Ãµes de teclado no 'Painel de controle':", + -1, PROPSHEETPADDING(2), LABELLINE(2), PROPSHEETWIDTH - PROPSHEETPADDING(4), LABELLINE(2) + AUTORADIOBUTTON "&Nenhuma repetiÃ§Ã£o de teclado", IDC_REPEAT_NOREPEAT_RADIO, PROPSHEETPADDING(2), LABELLINE(3) + 3, PROPSHEETWIDTH - PROPSHEETPADDING(4), LABELLINE(1), WS_GROUP + AUTORADIOBUTTON "&Diminuir as taxas de repetiÃ§Ã£o de teclado", IDC_REPEAT_REPEAT_RADIO, PROPSHEETPADDING(2), LABELLINE(4) + 7, PROPSHEETWIDTH - PROPSHEETPADDING(4), LABELLINE(1) + LTEXT "&Intervalo de repetiÃ§Ã£o:", -1, PROPSHEETPADDING(4), LABELLINE(6) + 4, PROPSHEETPADDING(16), LABELLINE(1) + COMBOBOX IDC_REPEAT_DELAY_COMBO, PROPSHEETPADDING(4), LABELLINE(7) + 6, PROPSHEETWIDTH - PROPSHEETPADDING(6), LABELLINE(6), + CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP + LTEXT "&Taxa de repetiÃ§Ã£o:", -1, PROPSHEETPADDING(4), LABELLINE(9) + 6, PROPSHEETPADDING(16), LABELLINE(1) + COMBOBOX IDC_REPEAT_REPEAT_COMBO, PROPSHEETPADDING(4), LABELLINE(10) + 8, PROPSHEETWIDTH - PROPSHEETPADDING(6), LABELLINE(7), + CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP + GROUPBOX "Teclas lentas", -1, PROPSHEETPADDING(1), LABELLINE(14), PROPSHEETWIDTH - PROPSHEETPADDING(2), LABELLINE(4) + 4 + LTEXT "&As teclas tÃªm que ser mantidas pressionadas por:", -1, PROPSHEETPADDING(2), LABELLINE(15), PROPSHEETWIDTH - PROPSHEETPADDING(4), LABELLINE(1) + COMBOBOX IDC_REPEAT_WAIT_COMBO, PROPSHEETPADDING(2), LABELLINE(16) + 4, PROPSHEETWIDTH - PROPSHEETPADDING(4), LABELLINE(8), + CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP + LTEXT "Ã&rea de teste:", -1, PROPSHEETPADDING(1), LABELLINE(20), PROPSHEETPADDING(8), LABELLINE(1) + EDITTEXT IDC_REPEAT_TEST_EDIT, PROPSHEETPADDING(10), LABELLINE(19) + 7, PROPSHEETWIDTH - PROPSHEETPADDING(11), 14, ES_AUTOHSCROLL + DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH - 111, PROPSHEETHEIGHT - 21, 50, 14 + PUSHBUTTON "Cancelar", IDCANCEL, PROPSHEETWIDTH - 57, PROPSHEETHEIGHT - 21, 50, 14 +END + +IDD_SERIALKEYSOPTIONS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "ConfiguraÃ§Ãµes de dispositivos seriais" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Teclas seriais", -1, PROPSHEETPADDING(1), LABELLINE(1), PROPSHEETWIDTH - PROPSHEETPADDING(2), LABELLINE(10) + LTEXT "Escolha a porta para a conexÃ£o de um dispositivo de entrada alternativo.", + -1, PROPSHEETPADDING(2), LABELLINE(2), PROPSHEETWIDTH - PROPSHEETPADDING(4), LABELLINE(2) + LTEXT "&Porta serial:", -1, PROPSHEETPADDING(2), LABELLINE(3) + 5, PROPSHEETWIDTH - PROPSHEETPADDING(4), LABELLINE(2) + COMBOBOX IDC_SERIAL_PORT_COMBO, PROPSHEETPADDING(2), LABELLINE(4) + 7, PROPSHEETWIDTH - PROPSHEETPADDING(4), LABELLINE(6), + CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP + LTEXT "&Taxa de transm.:", -1, PROPSHEETPADDING(2), LABELLINE(7), PROPSHEETWIDTH - PROPSHEETPADDING(4), LABELLINE(2) + COMBOBOX IDC_SERIAL_BAUD_COMBO, PROPSHEETPADDING(2), LABELLINE(8) + 2, PROPSHEETWIDTH - PROPSHEETPADDING(4), LABELLINE(8), + CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH - 111, PROPSHEETHEIGHT - 21, 50, 14 + PUSHBUTTON "Cancelar", IDCANCEL, PROPSHEETWIDTH - 57, PROPSHEETHEIGHT - 21, 50, 14 +END + +STRINGTABLE +BEGIN + IDS_CPLSYSTEMNAME "Acessibilidade" + IDS_CPLSYSTEMDESCRIPTION "Ajustar as configuraÃ§Ãµes do computador para visÃ£o, audiÃ§Ã£o e mobilidade." + IDS_SENTRY_NONE "[Nenhuma]" + IDS_SENTRY_TITLE "Piscar a barra de legenda ativa" + IDS_SENTRY_WINDOW "Piscar a janela ativa" + IDS_SENTRY_DISPLAY "Piscar a Ã¡rea de trabalho" + IDS_SECONDS "Segundos" + IDS_MINUTES "Minutos" +END Propchange: trunk/reactos/dll/cpl/access/lang/pt-BR.rc ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[akhaldi] 70895: [OLE32] Adapt to the recent objbase.h change.
by akhaldi＠svn.reactos.org 05 Mar '16

05 Mar '16

Author: akhaldi Date: Thu Mar 3 17:54:32 2016 New Revision: 70895 URL: http://svn.reactos.org/svn/reactos?rev=70895&view=rev Log: [OLE32] Adapt to the recent objbase.h change. Modified: trunk/reactos/dll/win32/ole32/ifs.c Modified: trunk/reactos/dll/win32/ole32/ifs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/ifs.c?rev=… ============================================================================== --- trunk/reactos/dll/win32/ole32/ifs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ole32/ifs.c [iso-8859-1] Thu Mar 3 17:54:32 2016 @@ -377,7 +377,7 @@ * Success: Pointer to newly allocated memory block. * Failure: NULL. */ -LPVOID WINAPI CoTaskMemAlloc(ULONG size) +LPVOID WINAPI CoTaskMemAlloc(SIZE_T size) { return IMalloc_Alloc(&Malloc32.IMalloc_iface,size); } @@ -411,7 +411,7 @@ * Success: Pointer to newly allocated memory block. * Failure: NULL. */ -LPVOID WINAPI CoTaskMemRealloc(LPVOID pvOld, ULONG size) +LPVOID WINAPI CoTaskMemRealloc(LPVOID pvOld, SIZE_T size) { return IMalloc_Realloc(&Malloc32.IMalloc_iface, pvOld, size); }

1 0

[akhaldi] 70894: [PSDK] Update objbase.h. CORE-10912
by akhaldi＠svn.reactos.org 05 Mar '16

05 Mar '16

Author: akhaldi Date: Thu Mar 3 17:49:03 2016 New Revision: 70894 URL: http://svn.reactos.org/svn/reactos?rev=70894&view=rev Log: [PSDK] Update objbase.h. CORE-10912 Modified: trunk/reactos/include/psdk/objbase.h Modified: trunk/reactos/include/psdk/objbase.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/objbase.h?rev… ============================================================================== --- trunk/reactos/include/psdk/objbase.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/objbase.h [iso-8859-1] Thu Mar 3 17:49:03 2016 @@ -363,7 +363,7 @@ _Check_return_ LPVOID WINAPI -CoTaskMemAlloc(_In_ ULONG size) __WINE_ALLOC_SIZE(1); +CoTaskMemAlloc(_In_ SIZE_T size) __WINE_ALLOC_SIZE(1); void WINAPI @@ -377,7 +377,7 @@ WINAPI CoTaskMemRealloc( _In_opt_ __drv_freesMem(Mem) _Post_invalid_ LPVOID ptr, - _In_ ULONG size); + _In_ SIZE_T size); HRESULT WINAPI CoRegisterMallocSpy(_In_ LPMALLOCSPY pMallocSpy); HRESULT WINAPI CoRevokeMallocSpy(void);

1 0

[akhaldi] 70893: [MSIEXEC] Sync with Wine Staging 1.9.4. CORE-10912
by akhaldi＠svn.reactos.org 05 Mar '16

05 Mar '16

Author: akhaldi Date: Thu Mar 3 14:29:43 2016 New Revision: 70893 URL: http://svn.reactos.org/svn/reactos?rev=70893&view=rev Log: [MSIEXEC] Sync with Wine Staging 1.9.4. CORE-10912 Modified: trunk/reactos/base/system/msiexec/service.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/base/system/msiexec/service.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/msiexec/servic… ============================================================================== --- trunk/reactos/base/system/msiexec/service.c [iso-8859-1] (original) +++ trunk/reactos/base/system/msiexec/service.c [iso-8859-1] Thu Mar 3 14:29:43 2016 @@ -39,7 +39,9 @@ status.dwServiceType = SERVICE_WIN32_OWN_PROCESS; status.dwCurrentState = dwCurrentState; - if (dwCurrentState == SERVICE_START_PENDING) + if (dwCurrentState == SERVICE_START_PENDING + || dwCurrentState == SERVICE_STOP_PENDING + || dwCurrentState == SERVICE_STOPPED) status.dwControlsAccepted = 0; else { @@ -73,8 +75,6 @@ static void WINAPI ServiceCtrlHandler(DWORD code) { - DWORD state = SERVICE_RUNNING; - WINE_TRACE("%u\n", code); switch (code) @@ -83,14 +83,12 @@ case SERVICE_CONTROL_STOP: UpdateSCMStatus(SERVICE_STOP_PENDING, NO_ERROR, 0); KillService(); - state = SERVICE_STOPPED; break; default: fprintf(stderr, "Unhandled service control code: %u\n", code); + UpdateSCMStatus(SERVICE_RUNNING, NO_ERROR, 0); break; } - - UpdateSCMStatus(state, NO_ERROR, 0); } static DWORD WINAPI ServiceExecutionThread(LPVOID param) @@ -142,10 +140,7 @@ } UpdateSCMStatus(SERVICE_RUNNING, NO_ERROR, 0); - - WaitForSingleObject(kill_event, INFINITE); - KillService(); - + WaitForSingleObject(thread, INFINITE); UpdateSCMStatus(SERVICE_STOPPED, NO_ERROR, 0); } Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Thu Mar 3 14:29:43 2016 @@ -243,7 +243,7 @@ reactos/base/applications/wordpad # Synced to WineStaging-1.7.55 reactos/base/services/rpcss # Synced to WineStaging-1.7.55 reactos/base/system/expand # Synced to WineStaging-1.7.55 -reactos/base/system/msiexec # Synced to WineStaging-1.7.55 +reactos/base/system/msiexec # Synced to WineStaging-1.9.4 reactos/modules/rosapps/winfile # Autosync In addition the following libs, dlls and source files are mostly based on code ported

1 0

[akhaldi] 70892: [MSI_WINETEST] Sync with Wine Staging 1.9.4. CORE-10912
by akhaldi＠svn.reactos.org 05 Mar '16

05 Mar '16

Author: akhaldi Date: Thu Mar 3 14:28:57 2016 New Revision: 70892 URL: http://svn.reactos.org/svn/reactos?rev=70892&view=rev Log: [MSI_WINETEST] Sync with Wine Staging 1.9.4. CORE-10912 Modified: trunk/rostests/winetests/msi/automation.c trunk/rostests/winetests/msi/db.c trunk/rostests/winetests/msi/install.c trunk/rostests/winetests/msi/source.c Modified: trunk/rostests/winetests/msi/automation.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msi/automation.… ============================================================================== --- trunk/rostests/winetests/msi/automation.c [iso-8859-1] (original) +++ trunk/rostests/winetests/msi/automation.c [iso-8859-1] Thu Mar 3 14:28:57 2016 @@ -877,7 +877,7 @@ hr = IDispatch_GetIDsOfNames(pDispatch, &IID_NULL, &name, 1, LOCALE_USER_DEFAULT, &dispid); HeapFree(GetProcessHeap(), 0, name); ok(hr == S_OK, "IDispatch::GetIDsOfNames returned 0x%08x\n", hr); - if (!hr == S_OK) return hr; + if (hr != S_OK) return hr; memset(&excepinfo, 0, sizeof(excepinfo)); hr = IDispatch_Invoke(pDispatch, dispid, &IID_NULL, LOCALE_NEUTRAL, wFlags, pDispParams, pVarResult, &excepinfo, NULL); Modified: trunk/rostests/winetests/msi/db.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msi/db.c?rev=70… ============================================================================== --- trunk/rostests/winetests/msi/db.c [iso-8859-1] (original) +++ trunk/rostests/winetests/msi/db.c [iso-8859-1] Thu Mar 3 14:28:57 2016 @@ -1287,13 +1287,15 @@ r = run_query( hdb, 0, "CREATE TABLE `Properties` " "( `Property` CHAR(255), " - " `Value` CHAR(1), " - " `Intvalue` INT, " - " `Integervalue` INTEGER, " - " `Shortvalue` SHORT, " - " `Longvalue` LONG, " - " `Longcharvalue` LONGCHAR " - " PRIMARY KEY `Property`)" ); + " `Value` CHAR(1), " + " `Intvalue` INT, " + " `Integervalue` INTEGER, " + " `Shortvalue` SHORT, " + " `Longvalue` LONG, " + " `Longcharvalue` LONGCHAR, " + " `Charvalue` CHAR, " + " `Localizablevalue` CHAR LOCALIZABLE " + " PRIMARY KEY `Property`)" ); ok( r == ERROR_SUCCESS , "Failed to create table\n" ); /* check the column types */ @@ -1307,6 +1309,8 @@ ok( check_record( rec, 5, "I2"), "wrong record type\n"); ok( check_record( rec, 6, "I4"), "wrong record type\n"); ok( check_record( rec, 7, "S0"), "wrong record type\n"); + ok( check_record( rec, 8, "S0"), "wrong record type\n"); + ok( check_record( rec, 9, "L0"), "wrong record type\n"); MsiCloseHandle( rec ); @@ -1318,6 +1322,8 @@ ok( 0x1502 == get_columns_table_type(hdb, "Properties", 5 ), "_columns table wrong\n"); ok( 0x1104 == get_columns_table_type(hdb, "Properties", 6 ), "_columns table wrong\n"); ok( 0x1d00 == get_columns_table_type(hdb, "Properties", 7 ), "_columns table wrong\n"); + ok( 0x1d00 == get_columns_table_type(hdb, "Properties", 8 ), "_columns table wrong\n"); + ok( 0x1f00 == get_columns_table_type(hdb, "Properties", 9 ), "_columns table wrong\n"); /* now try the names */ rec = get_column_info( hdb, "select * from `Properties`", MSICOLINFO_NAMES ); @@ -1330,6 +1336,8 @@ ok( check_record( rec, 5, "Shortvalue"), "wrong record type\n"); ok( check_record( rec, 6, "Longvalue"), "wrong record type\n"); ok( check_record( rec, 7, "Longcharvalue"), "wrong record type\n"); + ok( check_record( rec, 8, "Charvalue"), "wrong record type\n"); + ok( check_record( rec, 9, "Localizablevalue"), "wrong record type\n"); MsiCloseHandle( rec ); @@ -7266,7 +7274,7 @@ create_file_data("forcecodepage.idt", "\r\n\r\n9999\t_ForceCodepage\r\n", 0); r = MsiDatabaseImportA(hdb, CURR_DIR, "forcecodepage.idt"); - ok(r == ERROR_FUNCTION_FAILED, "Expected ERROR_SUCCESS, got %d\n", r); + ok(r == ERROR_FUNCTION_FAILED, "Expected ERROR_FUNCTION_FAILED, got %d\n", r); MsiCloseHandle(hdb); DeleteFileA(msifile); Modified: trunk/rostests/winetests/msi/install.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msi/install.c?r… ============================================================================== --- trunk/rostests/winetests/msi/install.c [iso-8859-1] (original) +++ trunk/rostests/winetests/msi/install.c [iso-8859-1] Thu Mar 3 14:28:57 2016 @@ -2994,7 +2994,7 @@ } else { - ok(r == ERROR_INSTALL_FAILURE, "Expected ERROR_INSTALL_FAIRE, got %u\n", r); + ok(r == ERROR_INSTALL_FAILURE, "Expected ERROR_INSTALL_FAILURE, got %u\n", r); todo_wine ok(!delete_pf("msitest\\augustus", TRUE), "File installed\n"); ok(!delete_pf("msitest\\caesar", TRUE), "File installed\n"); todo_wine ok(!delete_pf("msitest\\maximus", TRUE), "File installed\n"); Modified: trunk/rostests/winetests/msi/source.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msi/source.c?re… ============================================================================== --- trunk/rostests/winetests/msi/source.c [iso-8859-1] (original) +++ trunk/rostests/winetests/msi/source.c [iso-8859-1] Thu Mar 3 14:28:57 2016 @@ -986,7 +986,7 @@ r = pMsiSourceListAddSourceExA(prodcode, NULL, MSIINSTALLCONTEXT_MACHINE, MSICODE_PRODUCT | MSISOURCETYPE_URL, "C:\\source", 0); - ok(r == ERROR_UNKNOWN_PRODUCT, "Expected ERROR_INVALID_PARAMETER, got %d\n", r); + ok(r == ERROR_UNKNOWN_PRODUCT, "Expected ERROR_UNKNOWN_PRODUCT, got %d\n", r); lstrcpyA(keypath, "Software\\Classes\\Installer\\Products\\"); lstrcatA(keypath, prod_squashed); @@ -1315,7 +1315,7 @@ MSIINSTALLCONTEXT_USERUNMANAGED, MSICODE_PRODUCT | MSICODE_PATCH | MSISOURCETYPE_URL, 0, value, &size); - ok(r == ERROR_UNKNOWN_PATCH, "Expected ERROR_SUCCESS, got %d\n", r); + ok(r == ERROR_UNKNOWN_PATCH, "Expected ERROR_UNKNOWN_PATCH, got %d\n", r); ok(!lstrcmpA(value, "aaa"), "Expected value to be unchanged, got %s\n", value); ok(size == MAX_PATH, "Expected MAX_PATH, got %d\n", size);

1 0

[akhaldi] 70943: [WBEMDISP] Sync with Wine Staging 1.9.4. CORE-10912
by akhaldi＠svn.reactos.org 05 Mar '16

05 Mar '16

Author: akhaldi Date: Sat Mar 5 10:36:27 2016 New Revision: 70943 URL: http://svn.reactos.org/svn/reactos?rev=70943&view=rev Log: [WBEMDISP] Sync with Wine Staging 1.9.4. CORE-10912 Modified: trunk/reactos/dll/win32/wbemdisp/locator.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/wbemdisp/locator.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wbemdisp/locator… ============================================================================== --- trunk/reactos/dll/win32/wbemdisp/locator.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wbemdisp/locator.c [iso-8859-1] Sat Mar 5 10:36:27 2016 @@ -343,6 +343,7 @@ ISWbemObjectSet ISWbemObjectSet_iface; LONG refs; IEnumWbemClassObject *objectenum; + LONG count; }; static inline struct objectset *impl_from_ISWbemObjectSet( @@ -504,20 +505,10 @@ LONG *iCount ) { struct objectset *objectset = impl_from_ISWbemObjectSet( iface ); - LONG count = 0, total = 0; TRACE( "%p, %p\n", objectset, iCount ); - while (IEnumWbemClassObject_Skip( objectset->objectenum, WBEM_INFINITE, 1 ) == S_OK) count++; - - IEnumWbemClassObject_Reset( objectset->objectenum ); - while (IEnumWbemClassObject_Skip( objectset->objectenum, WBEM_INFINITE, 1 ) == S_OK) total++; - - count = total - count; - IEnumWbemClassObject_Reset( objectset->objectenum ); - while (count--) IEnumWbemClassObject_Skip( objectset->objectenum, WBEM_INFINITE, 1 ); - - *iCount = total; + *iCount = objectset->count; return S_OK; } @@ -554,6 +545,14 @@ objectset_ItemIndex }; +static LONG get_object_count( IEnumWbemClassObject *iter ) +{ + LONG count = 0; + while (IEnumWbemClassObject_Skip( iter, WBEM_INFINITE, 1 ) == S_OK) count++; + IEnumWbemClassObject_Reset( iter ); + return count; +} + static HRESULT SWbemObjectSet_create( IEnumWbemClassObject *wbem_objectenum, ISWbemObjectSet **obj ) { struct objectset *objectset; @@ -565,6 +564,7 @@ objectset->refs = 1; objectset->objectenum = wbem_objectenum; IEnumWbemClassObject_AddRef( objectset->objectenum ); + objectset->count = get_object_count( objectset->objectenum ); *obj = &objectset->ISWbemObjectSet_iface; TRACE( "returning iface %p\n", *obj ); Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sat Mar 5 10:36:27 2016 @@ -198,7 +198,7 @@ reactos/dll/win32/vbscript # Synced to WineStaging-1.7.55 reactos/dll/win32/version # Synced to WineStaging-1.9.4 reactos/dll/win32/vssapi # Synced to WineStaging-1.7.55 -reactos/dll/win32/wbemdisp # Synced to WineStaging-1.7.55 +reactos/dll/win32/wbemdisp # Synced to WineStaging-1.9.4 reactos/dll/win32/wbemprox # Synced to WineStaging-1.7.55 reactos/dll/win32/windowscodecs # Synced to WineStaging-1.7.55 reactos/dll/win32/windowscodecsext # Synced to WineStaging-1.7.55

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs