Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: [SETUPLIB] Fix 'MAX_USHORT' typo in a comment (#2144)
by Serge Gautherie 10 Dec '19

10 Dec '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=99f8ccdc7fb343e3e4fe9… commit 99f8ccdc7fb343e3e4fe95ece1629eddd267c078 Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Tue Dec 10 13:16:46 2019 +0100 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Tue Dec 10 13:16:46 2019 +0100 [SETUPLIB] Fix 'MAX_USHORT' typo in a comment (#2144) --- base/setup/lib/utils/bldrsup.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/setup/lib/utils/bldrsup.h b/base/setup/lib/utils/bldrsup.h index 41cc1bb11b8..39862660d8d 100644 --- a/base/setup/lib/utils/bldrsup.h +++ b/base/setup/lib/utils/bldrsup.h @@ -44,7 +44,7 @@ typedef struct _BOOT_STORE_OPTIONS * IS_INTRESOURCE macros for Win32 resources. * * A key consists of either a boot ID number, comprised between 0 and - * MAX_USHORT == 0xFFFF == 65535, or can be a pointer to a human-readable + * MAXUSHORT == 0xFFFF == 65535, or can be a pointer to a human-readable * string (section name), as in the case of FreeLDR, or to a GUID, as in the * case of BOOTMGR. *

1 0

[reactos] 01/01: [CMD] Fix 'MAX_ULONG' typo in a comment (#2143)
by Serge Gautherie 10 Dec '19

10 Dec '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f6ad0938015505eb1ed58… commit f6ad0938015505eb1ed5804c4a35825cb03673f3 Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Tue Dec 10 13:16:26 2019 +0100 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Tue Dec 10 13:16:26 2019 +0100 [CMD] Fix 'MAX_ULONG' typo in a comment (#2143) --- base/shell/cmd/cmd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/shell/cmd/cmd.c b/base/shell/cmd/cmd.c index 5a3651d935f..2b63948d94e 100644 --- a/base/shell/cmd/cmd.c +++ b/base/shell/cmd/cmd.c @@ -1605,7 +1605,7 @@ LoadRegistrySettings(HKEY hKeyRoot) DWORD dwType, len; /* * Buffer big enough to hold the string L"4294967295", - * corresponding to the literal 0xFFFFFFFF (MAX_ULONG) in decimal. + * corresponding to the literal 0xFFFFFFFF (MAXULONG) in decimal. */ DWORD Buffer[6];

1 0

[reactos] 01/01: [TRANSLATION] Update Portuguese translation (#2125)
by Jose Carlos Jesus 10 Dec '19

10 Dec '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d347163fabf03587d96a9… commit d347163fabf03587d96a916aa987bbb76a27915e Author: Jose Carlos Jesus <zecarlos1957(a)hotmail.com> AuthorDate: Tue Dec 10 12:13:58 2019 +0000 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Tue Dec 10 13:13:58 2019 +0100 [TRANSLATION] Update Portuguese translation (#2125) Add translation for joy.cpl and update it for comdlg32.dll. --- dll/cpl/joy/joy.rc | 3 + dll/cpl/joy/lang/pt-PT.rc | 84 ++++++ dll/win32/comdlg32/lang/cdlg_Pt.rc | 579 +++++++++++++++++-------------------- 3 files changed, 359 insertions(+), 307 deletions(-) diff --git a/dll/cpl/joy/joy.rc b/dll/cpl/joy/joy.rc index 3c4f24b385b..06395a914f6 100644 --- a/dll/cpl/joy/joy.rc +++ b/dll/cpl/joy/joy.rc @@ -51,6 +51,9 @@ IDI_CPLSYSTEM ICON "resources/applet.ico" #ifdef LANGUAGE_PL_PL #include "lang/pl-PL.rc" #endif +#ifdef LANGUAGE_PT_PT + #include "lang/pt-PT.rc" +#endif #ifdef LANGUAGE_RO_RO #include "lang/ro-RO.rc" #endif diff --git a/dll/cpl/joy/lang/pt-PT.rc b/dll/cpl/joy/lang/pt-PT.rc new file mode 100644 index 00000000000..a487c26da65 --- /dev/null +++ b/dll/cpl/joy/lang/pt-PT.rc @@ -0,0 +1,84 @@ +LANGUAGE LANG_PORTUGUESE, SUBLANG_DEFAULT + +IDD_PROPPAGEMAIN DIALOGEX 0, 0, 252, 205 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION +EXSTYLE WS_EX_CONTEXTHELP +CAPTION "Controlador de jogos" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_CPLSYSTEM, -1, 7, 7, 20, 20 + LTEXT "Estas configurações ajudam-no a configurar os controladores de jogos instalados no computador.", -1, 33, 7, 214, 20, NOT WS_GROUP + GROUPBOX "Controladores de jogos instalados", -1, 7, 34, 238, 117 + CONTROL "List1", IDC_CONTROLLER_LIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | 0x0000808D, 14, 44, 224, 80 + PUSHBUTTON "&Adicionar...", IDC_ADD_BUTTON, 35, 129, 65, 14 + PUSHBUTTON "&Remover", IDC_REMOVE_BUTTON, 104, 129, 65, 14, WS_DISABLED + PUSHBUTTON "&Propriedades", IDC_PROPERTIES_BUTTON, 173, 129, 65, 14, WS_DISABLED + PUSHBUTTON "A&vançadas...", IDC_ADVANCED_BUTTON, 80, 157, 65, 14 + PUSHBUTTON "Reso&lução de problemas...", IDC_TROUBLESHOOT_BUTTON, 150, 157, 95, 14 + PUSHBUTTON "&OK", IDOK, 195, 185, 50, 14 +END + +IDD_ADD DIALOGEX 0, 0, 265, 200 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_CAPTION +EXSTYLE WS_EX_CONTEXTHELP +CAPTION "Adicionar controlador de jogos" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_CPLSYSTEM, -1, 8, 7, 20, 20 + LTEXT "Seleccione um controlador de jogos na lista abaixo e em seguida clique em ""OK"". Se o controlador não aparecer na lista, clique em ""Personalizar"".", -1, 35, 7, 210, 33 + LTEXT "Controladores de jogos:", -1, 8, 45, 126, 8 + LISTBOX IDC_GAME_CONTROLLERS_LIST, 7, 55, 251, 57, LBS_STANDARD | LBS_NOINTEGRALHEIGHT | LBS_WANTKEYBOARDINPUT | WS_HSCROLL | WS_TABSTOP + AUTOCHECKBOX "&Activar lemes de direcção e pedais", IDC_ENABLE_RUDDERS_CHECKBOX, 7, 114, 130, 10, WS_GROUP + LTEXT "Porta de jogos:", -1, 7, 134, 38, 8, NOT WS_VISIBLE + COMBOBOX IDC_GAME_PORT_COMBO, 7, 147, 140, 50, CBS_DROPDOWNLIST | CBS_SORT | NOT WS_VISIBLE | WS_VSCROLL + PUSHBUTTON "&Personalizar...", IDC_CUSTOM_BUTTON, 208, 147, 50, 14 + CONTROL "", -25525, "STATIC", SS_ETCHEDHORZ, 7, 170, 251, 1 + DEFPUSHBUTTON "&OK", IDOK, 155, 179, 50, 14 + PUSHBUTTON "&Cancelar", IDCANCEL, 208, 179, 50, 14 +END + +IDD_CUSTOM DIALOGEX 0, 0, 265, 183, 0 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_CAPTION +EXSTYLE WS_EX_CONTEXTHELP +CAPTION "Controladore de jogos personalizado" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Características especiais", -1, 7, 7, 245, 52 + AUTORADIOBUTTON "&Joystick", IDC_JOYSTICK_RADIO, 17, 23, 55, 10 + AUTORADIOBUTTON "&Manche ou punho", IDC_FLIGHT_YOKE_RADIO, 130, 23, 89, 10 + AUTORADIOBUTTON "Consola de j&ogos", IDC_GAME_PAD_RADIO, 17, 40, 65, 10 + AUTORADIOBUTTON "Contro&lador de carro de corrida", IDC_RACE_CAR_RADIO, 130, 40, 115, 10 + GROUPBOX "Eixos", -1, 7, 67, 116, 44, WS_GROUP + COMBOBOX IDC_AXES_COMBO, 37, 79, 48, 50, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + AUTORADIOBUTTON "Leme/pedais", IDC_RUDDER_PEDALS_RADIO, 14, 97, 63, 10, NOT WS_VISIBLE + AUTORADIOBUTTON "Eixo Z", IDC_Z_AXIS_RADIO, 81, 97, 35, 10, NOT WS_VISIBLE + GROUPBOX "Butões", -1, 137, 67, 116, 44 + COMBOBOX IDC_BUTTONS_COMBO, 178, 79, 48, 50, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL, WS_EX_CLIENTEDGE + AUTOCHECKBOX "Inclui um controle de ponto de &mira", IDC_INC_POINT_CHECKBOX, 7, 123, 125, 10 + LTEXT "Nome do controlador:", -1, 7, 139, 200, 9 + EDITTEXT IDC_CONTROLLER_NAME_EDIT, 7, 150, 116, 15, ES_AUTOHSCROLL, WS_EX_CLIENTEDGE | WS_EX_STATICEDGE + DEFPUSHBUTTON "&OK", IDOK, 137, 150, 50, 14 + PUSHBUTTON "&Cancelar", IDCANCEL, 203, 150, 50, 14 +END + +IDD_ADVANCED DIALOGEX 0, 0, 240, 86 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION +EXSTYLE WS_EX_CONTEXTHELP +CAPTION "Definições avançadas" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_CPLSYSTEM, -1, 7, 24, 20, 20 + DEFPUSHBUTTON "&OK", IDOK, 106, 65, 50, 14 + PUSHBUTTON "&Cancelar", IDCANCEL, 163, 65, 50, 14 + LTEXT "Seleccione o dispositivo que deseja usar com programas mais antigos.", -1, 7, 7, 228, 10 + LTEXT "Dispositivo perferido:", -1, 34, 24, 70, 10 + COMBOBOX IDC_PREFERRED_DEV_COMBO, 34, 38, 179, 75, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL +END + +STRINGTABLE +BEGIN + IDS_CPLSYSTEMNAME "Controlador de Jogos" + IDS_CPLSYSTEMDESCRIPTION "Adicionar, remover e configurar o hardware controlador de jogos, tais como joysticks e consolas de jogos." + IDS_CONTROLLER "Controlador" + IDS_STATUS "Status" +END diff --git a/dll/win32/comdlg32/lang/cdlg_Pt.rc b/dll/win32/comdlg32/lang/cdlg_Pt.rc index 34d8e57e798..2d66a591b57 100644 --- a/dll/win32/comdlg32/lang/cdlg_Pt.rc +++ b/dll/win32/comdlg32/lang/cdlg_Pt.rc @@ -4,6 +4,9 @@ * Copyright 1999 Bertho Stultiens * Copyright 1999 Klaas van Gend * + * Translated to Portuguese language + * by: Jose Carlos Jesus 02-09-2019 zecarlos1957(a)hotmail.com + * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either @@ -25,22 +28,19 @@ STRINGTABLE { IDS_FILENOTFOUND "Ficheiro não encontrado" IDS_VERIFYFILE "Por favor verifique se foi fornecido o nome correcto do ficheiro" - IDS_CREATEFILE "O ficheiro não existe\n\ -Gostaria de o criar" - IDS_OVERWRITEFILE "O ficheiro já existe.\n\ -Gostaria de o substituir?" + IDS_CREATEFILE "O ficheiro não existe.\nGostaria de o criar?" + IDS_OVERWRITEFILE "O ficheiro já existe.\nGostaria de o substituir?" IDS_INVALID_FILENAME_TITLE "Caracter(es) inválidos na localização" - IDS_INVALID_FILENAME "Um nome de ficheiro não pode conter quaisquer dos seguintes caracteres:\n\ - / : < > |" + IDS_INVALID_FILENAME "Um nome de ficheiro não pode conter quaisquer dos seguintes caracteres:\n / : < > |" IDS_PATHNOTEXISTING "A localização não existe" IDS_FILENOTEXISTING "O ficheiro não existe" - IDS_INVALID_FOLDERNAME "The selection contains a non-folder object" + IDS_INVALID_FOLDERNAME "A sua selecção não contém nenhuma pasta" } STRINGTABLE { - IDS_UPFOLDER "Um Nível Acima" - IDS_NEWFOLDER "Criar Nova Pasta" + IDS_UPFOLDER "Um nível acima" + IDS_NEWFOLDER "Criar nova pasta" IDS_LISTVIEW "Lista" IDS_REPORTVIEW "Detalhes" IDS_TODESKTOP "Ecrã" @@ -50,15 +50,12 @@ STRINGTABLE { PD32_PRINT_TITLE "Imprimir" - PD32_VALUE_UREADABLE "Entrada Ilegível" - PD32_INVALID_PAGE_RANGE "Este valor não se encaixa na faixa de páginas.\n\ -Por favor indique um valor entre %d e %d." + PD32_VALUE_UREADABLE "Entrada ilegível" + PD32_INVALID_PAGE_RANGE "Este valor não se encaixa na faixa de páginas.\nPor favor indique um valor entre %d e %d." PD32_FROM_NOT_ABOVE_TO "A entrada 'de' não pode exceder 'até'." - PD32_MARGINS_OVERLAP "As margens estão fora das medidas do papel.\n\ -Por favor indique as margens." + PD32_MARGINS_OVERLAP "As margens estão fora das medidas do papel.\nPor favor indique as margens." PD32_NR_OF_COPIES_EMPTY "O número de cópias não pode ter valor vazio." - PD32_TOO_LARGE_COPIES "Esta grande quantidade de cópias não é suportada pela sua impressora.\n\ -Por favor indique um valor entre 1 e %d." + PD32_TOO_LARGE_COPIES "Esta grande quantidade de cópias não é suportada pela sua impressora.\nPor favor indique um valor entre 1 e %d." PD32_PRINT_ERROR "Ocorreu um erro de impressão." PD32_NO_DEFAULT_PRINTER "Não existe uma impressora predefinida." PD32_CANT_FIND_PRINTER "Não é possível encontrar uma impressora." @@ -67,38 +64,38 @@ Por favor indique um valor entre 1 e %d." PD32_DRIVER_UNKNOWN "Controlador de impressora desconhecido." PD32_NO_DEVICES "Antes de realizar tarefas relacionadas com a impressora tais como configuração de páginas ou imprimir um documento, precisa instalar uma impressora. Por favor instale uma e tente novamente." - PD32_DEFAULT_PRINTER "Impressora Predefinida; " + PD32_DEFAULT_PRINTER "Impressora predefinida;" PD32_NR_OF_DOCUMENTS_IN_QUEUE "Existem %d documentos na fila" PD32_MARGINS_IN_INCHES "Margens [polegadas]" PD32_MARGINS_IN_MILLIMETERS "Margens [mm]" PD32_MILLIMETERS "mm" PD32_PRINTER_STATUS_READY "Pronto" - PD32_PRINTER_STATUS_PAUSED "Pausada; " - PD32_PRINTER_STATUS_ERROR "Erro; " - PD32_PRINTER_STATUS_PENDING_DELETION "Exclusão pendente; " - PD32_PRINTER_STATUS_PAPER_JAM "Papel atolado; " - PD32_PRINTER_STATUS_PAPER_OUT "Sem papel; " - PD32_PRINTER_STATUS_MANUAL_FEED "Alimentação manual; " - PD32_PRINTER_STATUS_PAPER_PROBLEM "Problemas com o papel; " - PD32_PRINTER_STATUS_OFFLINE "Impressora desligada; " - PD32_PRINTER_STATUS_IO_ACTIVE "E/S Activa; " - PD32_PRINTER_STATUS_BUSY "Ocupada; " - PD32_PRINTER_STATUS_PRINTING "A imprimir; " - PD32_PRINTER_STATUS_OUTPUT_BIN_FULL "A bandeja de saida encontra-se cheia; " - PD32_PRINTER_STATUS_NOT_AVAILABLE "Não disponível; " - PD32_PRINTER_STATUS_WAITING "A esperar; " - PD32_PRINTER_STATUS_PROCESSING "A processar; " - PD32_PRINTER_STATUS_INITIALIZING "A inicializar; " - PD32_PRINTER_STATUS_WARMING_UP "A aquecer; " - PD32_PRINTER_STATUS_TONER_LOW "Pouco toner; " - PD32_PRINTER_STATUS_NO_TONER "Sem toner; " - PD32_PRINTER_STATUS_PAGE_PUNT "Lançar página; " - PD32_PRINTER_STATUS_USER_INTERVENTION "Intervenção do utilizador; " - PD32_PRINTER_STATUS_OUT_OF_MEMORY "Memória insuficiente; " - PD32_PRINTER_STATUS_DOOR_OPEN "A impressora está aberta; " - PD32_PRINTER_STATUS_SERVER_UNKNOWN "Servidor de impressão desconhecido; " - PD32_PRINTER_STATUS_POWER_SAVE "Modo económico; " + PD32_PRINTER_STATUS_PAUSED "Pausada;" + PD32_PRINTER_STATUS_ERROR "Erro;" + PD32_PRINTER_STATUS_PENDING_DELETION "Exclusão pendente;" + PD32_PRINTER_STATUS_PAPER_JAM "Papel atolado;" + PD32_PRINTER_STATUS_PAPER_OUT "Sem papel;" + PD32_PRINTER_STATUS_MANUAL_FEED "Alimentação manual;" + PD32_PRINTER_STATUS_PAPER_PROBLEM "Problemas com o papel;" + PD32_PRINTER_STATUS_OFFLINE "Impressora desligada;" + PD32_PRINTER_STATUS_IO_ACTIVE "E/S Activa;" + PD32_PRINTER_STATUS_BUSY "Ocupada;" + PD32_PRINTER_STATUS_PRINTING "A imprimir;" + PD32_PRINTER_STATUS_OUTPUT_BIN_FULL "A bandeja de saida encontra-se cheia;" + PD32_PRINTER_STATUS_NOT_AVAILABLE "Não disponível;" + PD32_PRINTER_STATUS_WAITING "Em espera;" + PD32_PRINTER_STATUS_PROCESSING "A processar;" + PD32_PRINTER_STATUS_INITIALIZING "A inicializar;" + PD32_PRINTER_STATUS_WARMING_UP "A aquecer;" + PD32_PRINTER_STATUS_TONER_LOW "Pouco toner;" + PD32_PRINTER_STATUS_NO_TONER "Sem toner;" + PD32_PRINTER_STATUS_PAGE_PUNT "Lançar página;" + PD32_PRINTER_STATUS_USER_INTERVENTION "Intervenção do utilizador;" + PD32_PRINTER_STATUS_OUT_OF_MEMORY "Memória insuficiente;" + PD32_PRINTER_STATUS_DOOR_OPEN "A impressora está aberta;" + PD32_PRINTER_STATUS_SERVER_UNKNOWN "Servidor de impressão desconhecido;" + PD32_PRINTER_STATUS_POWER_SAVE "Modo económico;" } STRINGTABLE /* Font styles */ @@ -124,7 +121,7 @@ STRINGTABLE /* Color names */ IDS_COLOR_LIME "Verde-limão" IDS_COLOR_YELLOW "Amarelo" IDS_COLOR_BLUE "Azul" - IDS_COLOR_FUCHSIA "Fúcsia" + IDS_COLOR_FUCHSIA "Matiz" IDS_COLOR_AQUA "Azul-piscina" IDS_COLOR_WHITE "Branco" } @@ -137,8 +134,8 @@ STRINGTABLE IDS_SAVE "Gravar" IDS_SAVE_AS "Gravar Como" IDS_OPEN_FILE "Abrir Ficheiro" - IDS_SELECT_FOLDER "Select Folder" - IDS_FONT_SIZE_INPUT "Font size has to be a number." + IDS_SELECT_FOLDER "Seleccione uma pasta" + IDS_FONT_SIZE_INPUT "Tamanho do tipo de letra terá de ser um numero." } /* @@ -150,237 +147,223 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Abrir" FONT 8, "MS Shell Dlg" { - LTEXT "Nome do &Ficheiro:", stc3, 6, 6, 76, 9 - EDITTEXT edt1, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP - LISTBOX lst1, 6, 32, 90, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP - LTEXT "&Directórios:", -1, 110, 6, 92, 9 - LTEXT "", stc1, 110, 18, 92, 9, SS_NOPREFIX | WS_GROUP - LISTBOX lst2, 110, 32, 92, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP - LTEXT "Listar Ficheiros do &Tipo:", stc2, 6, 104, 90, 9 - COMBOBOX cmb1, 6, 114, 90, 60, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP - LTEXT "Con&troladores:", stc4, 110, 104, 92, 9 - COMBOBOX cmb2, 110, 114, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP - DEFPUSHBUTTON "Abrir", IDOK, 208, 6, 60, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP - PUSHBUTTON "Cancelar", IDCANCEL, 208, 24, 60, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "&Ajuda", pshHelp, 208, 46, 60, 14, WS_GROUP | WS_TABSTOP - CHECKBOX "&Apenas de leitura", chx1, 208, 68, 65, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + LTEXT "Nome do &Ficheiro:", stc3, 6, 6, 76, 9 + EDITTEXT edt1, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP + LISTBOX lst1, 6, 32, 90, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP + LTEXT "&Directórios:", -1, 110, 6, 92, 9 + LTEXT "", stc1, 110, 18, 92, 9, SS_NOPREFIX | WS_GROUP + LISTBOX lst2, 110, 32, 92, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP + LTEXT "Listar Ficheiros do &Tipo:", stc2, 6, 104, 90, 9 + COMBOBOX cmb1, 6, 114, 90, 60, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP + LTEXT "Con&troladores:", stc4, 110, 104, 92, 9 + COMBOBOX cmb2, 110, 114, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP + DEFPUSHBUTTON "Abrir", IDOK, 208, 6, 60, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP + PUSHBUTTON "Cancelar", IDCANCEL, 208, 24, 60, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Ajuda", pshHelp, 208, 46, 60, 14, WS_GROUP | WS_TABSTOP + CHECKBOX "&Apenas de leitura", chx1, 208, 68, 65, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP } - SAVE_FILE DIALOG 36, 24, 275, 134 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Gravar Como..." FONT 8, "MS Shell Dlg" { - LTEXT "Nome do &Ficheiro:", stc3, 6, 6, 76, 9 - EDITTEXT edt1, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP - LISTBOX lst1, 6, 32, 90, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP - LTEXT "&Directórios:", -1, 110, 6, 92, 9 - LTEXT "", stc1, 110, 18, 92, 9, SS_NOPREFIX | WS_GROUP - LISTBOX lst2, 110, 32, 92, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP - LTEXT "Listar Ficheiros do &Tipo:", stc2, 6, 104, 90, 9 - COMBOBOX cmb1, 6, 114, 90, 60, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP - LTEXT "Con&troladores:", stc4, 110, 104, 92, 9 - COMBOBOX cmb2, 110, 114, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP - DEFPUSHBUTTON "Gravar Como", IDOK, 208, 6, 60, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP - PUSHBUTTON "Cancelar", IDCANCEL, 208, 24, 60, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "&Ajuda", pshHelp, 208, 46, 60, 14, WS_GROUP | WS_TABSTOP - CHECKBOX "&Apenas de leitura", chx1, 208, 68, 65, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + LTEXT "Nome do &Ficheiro:", stc3, 6, 6, 76, 9 + EDITTEXT edt1, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP + LISTBOX lst1, 6, 32, 90, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP + LTEXT "&Directórios:", -1, 110, 6, 92, 9 + LTEXT "", stc1, 110, 18, 92, 9, SS_NOPREFIX | WS_GROUP + LISTBOX lst2, 110, 32, 92, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP + LTEXT "Listar ficheiros do &tipo:", stc2, 6, 104, 90, 9 + COMBOBOX cmb1, 6, 114, 90, 60, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP + LTEXT "Con&troladores:", stc4, 110, 104, 92, 9 + COMBOBOX cmb2, 110, 114, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP + DEFPUSHBUTTON "Gravar Como", IDOK, 208, 6, 60, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Cancelar", IDCANCEL, 208, 24, 60, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Ajuda", pshHelp, 208, 46, 60, 14, WS_GROUP | WS_TABSTOP + CHECKBOX "Apenas de &leitura", chx1, 208, 68, 65, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP } - PRINT DIALOG 36, 24, 264, 134 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Imprimir" FONT 8, "MS Shell Dlg" { - LTEXT "Impressora:", stc1, 6, 6, 40, 9 - LTEXT "", stc2, 60, 6, 150, 9 - GROUPBOX "Faixa de impressão", grp1, 6, 30, 160, 65, BS_GROUPBOX - RADIOBUTTON "&Todos", rad1, 16, 45, 60, 12 - RADIOBUTTON "S&elecção", rad2, 16, 60, 60, 12 - RADIOBUTTON "&Páginas", rad3, 16, 75, 60, 12 - DEFPUSHBUTTON "Imprimir", IDOK, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP - PUSHBUTTON "Cancelar", IDCANCEL, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "&Configurar", psh1, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP - LTEXT "&De:", stc3, 60, 80, 30, 9 - LTEXT "&Até:", stc4, 120, 80, 30, 9 - LTEXT "&Qualidade de Impressão:", stc5, 6, 100, 76, 9 - COMBOBOX cmb1, 80, 100, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP - CHECKBOX "Imprimir para Ficheiro", chx1, 20, 120, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - CHECKBOX "C&ondensado", chx2, 160, 120, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + LTEXT "Impressora:", stc1, 6, 6, 40, 9 + LTEXT "", stc2, 60, 6, 150, 9 + GROUPBOX "Faixa de impressão", grp1, 6, 30, 160, 65, BS_GROUPBOX + RADIOBUTTON "&Todos", rad1, 16, 45, 60, 12 + RADIOBUTTON "S&elecção", rad2, 16, 60, 60, 12 + RADIOBUTTON "&Páginas", rad3, 16, 75, 60, 12 + DEFPUSHBUTTON "&Imprimir", IDOK, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Cancelar", IDCANCEL, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "Con&figurar", psh1, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP + LTEXT "De:", stc3, 60, 80, 30, 9 + LTEXT "Até:", stc4, 120, 80, 30, 9 + LTEXT "Qualidade de Impressão:", stc5, 6, 100, 76, 9 + COMBOBOX cmb1, 80, 100, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP + CHECKBOX "Imprimir para &Ficheiro", chx1, 20, 120, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "C&ondensado", chx2, 160, 120, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP } - PRINT_SETUP DIALOG 36, 24, 264, 134 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Configurações de Impressão" FONT 8, "MS Shell Dlg" { - GROUPBOX "Impressora", grp1, 6, 6, 180, 72, BS_GROUPBOX - RADIOBUTTON "&Impressora Predefinida", rad1, 16, 16, 150, 12 - LTEXT "[none]", stc1, 35, 30, 120, 9 - RADIOBUTTON "Impressora &Específica", rad2, 16, 44, 150, 12 - COMBOBOX cmb1, 35, 58, 145, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP - DEFPUSHBUTTON "OK", IDOK, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP - PUSHBUTTON "Cancelar", IDCANCEL, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "&Configurar", psh1, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP - GROUPBOX "Orientação", grp2, 6, 82, 100, 50, BS_GROUPBOX - RADIOBUTTON "&Retrato", rad3, 50, 95, 50, 12 - RADIOBUTTON "&Paisagem", rad4, 50, 110, 50, 12 - ICON "LANDSCAP", stc10, 10, 95, 32, 32 - ICON "PORTRAIT", stc11, 10, 95, 32, 32 - GROUPBOX "Papel", grp3, 116, 82, 178, 50, BS_GROUPBOX - LTEXT "&Tamanho", stc2, 126, 95, 35, 9 - LTEXT "&Fonte de Alimentação", stc3, 126, 110, 35, 9 - COMBOBOX cmb2, 155, 95, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP - COMBOBOX cmb3, 155, 110, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP + GROUPBOX "Impressora", grp1, 6, 6, 180, 72, BS_GROUPBOX + RADIOBUTTON "&Impressora Predefinida", rad1, 16, 16, 150, 12 + LTEXT "[none]", stc1, 35, 30, 120, 9 + RADIOBUTTON "Impressora &Específica", rad2, 16, 44, 150, 12 + COMBOBOX cmb1, 35, 58, 145, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP + DEFPUSHBUTTON "&OK", IDOK, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Cancelar", IDCANCEL, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "Con&figurar", psh1, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP + GROUPBOX "Orientação", grp2, 6, 82, 100, 50, BS_GROUPBOX + RADIOBUTTON "&Retrato", rad3, 50, 95, 50, 12 + RADIOBUTTON "&Paisagem", rad4, 50, 110, 50, 12 + ICON "LANDSCAP", stc10, 10, 95, 32, 32 + ICON "PORTRAIT", stc11, 10, 95, 32, 32 + GROUPBOX "Papel", grp3, 116, 82, 178, 50, BS_GROUPBOX + LTEXT "&Tamanho", stc2, 126, 95, 35, 9 + LTEXT "&Fonte de Alimentação", stc3, 126, 110, 35, 9 + COMBOBOX cmb2, 155, 95, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP + COMBOBOX cmb3, 155, 110, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP } - CHOOSE_FONT DIALOG 13, 54, 274, 147 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Tipo de Letra" FONT 8, "MS Shell Dlg" { - LTEXT "&Tipo de Letra:",stc1 ,6,3,90,9 - COMBOBOX cmb1, 6,13,94,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL | + LTEXT "&Tipo de Letra:",stc1 , 6, 3, 90, 9 + COMBOBOX cmb1, 6, 13, 94, 54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL | CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE - LTEXT "&Estilo do Tipo de Letra:",stc2 ,108,3,60,9 - COMBOBOX cmb2,108,13,64,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL | + LTEXT "&Estilo do Tipo de Letra:", stc2, 108, 3, 60, 9 + COMBOBOX cmb2, 108, 13, 64, 54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE - LTEXT "&Tamanho:",stc3,179,3,32,9 - COMBOBOX cmb3,179,13,32,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL | - WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE | CBS_SORT - DEFPUSHBUTTON "OK",IDOK,218,6,50,14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON - PUSHBUTTON "Cancelar",IDCANCEL,218,23,50,14,WS_GROUP | WS_TABSTOP - PUSHBUTTON "&Aplicar", psh3,218,40,50,14,WS_GROUP | WS_TABSTOP - PUSHBUTTON "&Ajuda" , pshHelp,218,57,50,14,WS_GROUP | WS_TABSTOP - GROUPBOX "Efeitos",grp1,6,72,84,36,WS_GROUP - CHECKBOX "&Riscado", chx1, 10,82,78,10, BS_AUTOCHECKBOX | WS_TABSTOP - CHECKBOX "&Sublinhado", chx2, 10,94,78,10, BS_AUTOCHECKBOX - LTEXT "&Cor:", stc4 ,6,114,80,9 - COMBOBOX cmb4,6,124,84,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | - CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP - GROUPBOX "Exemplo",grp2,98,72,120,36,WS_GROUP - CTEXT "",stc5,103,81,109,24,SS_NOPREFIX | NOT WS_VISIBLE - LTEXT "Scr&ipt:",stc7 ,98,114,40,9 - COMBOBOX cmb5,98,124,120,90,CBS_DROPDOWNLIST | CBS_HASSTRINGS | - CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP + LTEXT "&Tamanho:", stc3, 179, 3, 32, 9 + COMBOBOX cmb3, 179, 13, 32, 54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL | + WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE | CBS_SORT + DEFPUSHBUTTON "&OK", IDOK, 218, 6, 50, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON + PUSHBUTTON "&Cancelar", IDCANCEL, 218, 23, 50, 14,WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Aplicar", psh3, 218, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "A&juda" , pshHelp, 218, 57, 50, 14, WS_GROUP | WS_TABSTOP + GROUPBOX "Efeitos", grp1, 6, 72, 84, 36, WS_GROUP + CHECKBOX "&Riscado", chx1, 10, 82, 78, 10, BS_AUTOCHECKBOX | WS_TABSTOP + CHECKBOX "&Sublinhado", chx2, 10, 94, 78, 10, BS_AUTOCHECKBOX + LTEXT "Cor:", stc4, 6, 114, 80, 9 + COMBOBOX cmb4, 6, 124, 84, 100, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | + CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP + GROUPBOX "Exemplo", grp2, 98, 72, 120, 36, WS_GROUP + CTEXT "", stc5, 103, 81, 109, 24, SS_NOPREFIX | NOT WS_VISIBLE + LTEXT "Script:", stc7, 98, 114, 40, 9 + COMBOBOX cmb5, 98, 124, 120, 90, CBS_DROPDOWNLIST | CBS_HASSTRINGS | + CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP } - CHOOSE_COLOR DIALOG 36, 24, 300, 185 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Cor" FONT 8, "MS Shell Dlg" { - LTEXT "Cores &Básicas:", stc1, 4, 4, 140, 10 - LTEXT "&Cores do Utilizador:", stc2, 4, 106, 140, 10 - LTEXT "Colorido|Sólid&o", stc3, 150, 151, 48, 10 - LTEXT "Ver&melho:", IDC_COLOR_RL /*1094*/,247,126,27,10 - EDITTEXT IDC_COLOR_EDIT_R, 275,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "&Verde:", IDC_COLOR_GL /*1095*/,247,140,27,10 - EDITTEXT IDC_COLOR_EDIT_G, 275,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "A&zul:", IDC_COLOR_BL /*1096*/,247,154,27,10 - EDITTEXT IDC_COLOR_EDIT_B, 275,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "Mat&iz:" , IDC_COLOR_HL /*1091*/,200,126,24,10 - EDITTEXT IDC_COLOR_EDIT_H, 224,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "Sa&t:", IDC_COLOR_SL /*1092*/,200,140,24,10 - EDITTEXT IDC_COLOR_EDIT_S, 224,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "&Lum:", IDC_COLOR_LL /*1093*/,200,154,24,10 - EDITTEXT IDC_COLOR_EDIT_L, 224,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - CONTROL "" , IDC_COLOR_PREDEF, "STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,14,140,86 - CONTROL "" , IDC_COLOR_USRDEF, "STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,116,140,28 - CONTROL "" , IDC_COLOR_GRAPH, "STATIC",WS_BORDER|SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,4,118,116 - CONTROL "" , IDC_COLOR_LUMBAR, "STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 278,4,8,116 - CONTROL "" , IDC_COLOR_RESULT, "STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,124,40,26 - DEFPUSHBUTTON "OK", IDOK, 4, 167, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP - PUSHBUTTON "Cancelar", IDCANCEL, 58, 167, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "Ajuda", pshHelp,100,166, 44, 14 - PUSHBUTTON "&Adicionar Cor Personalizada", IDC_COLOR_ADD /*1024*/, 152, 167, 144, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "&Definir Cores Personalizadas >>", IDC_COLOR_DEFINE /*1025*/, 4, 149, 142, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "Colorido|Sólid&o", IDC_COLOR_RES, 300,200,4,14 /* just a dummy */ + LTEXT "Cores &Básicas:", stc1, 4, 4, 140, 10 + LTEXT "&Cores do Utilizador:", stc2, 4, 106, 140, 10 + LTEXT "Colorido|Sólid&o", stc3, 150, 151, 48, 10 + LTEXT "Ver&melho:", IDC_COLOR_RL /*1094*/, 247, 126, 27, 10 + EDITTEXT IDC_COLOR_EDIT_R, 275, 124, 21, 12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "&Verde:", IDC_COLOR_GL /*1095*/, 247, 140, 27, 10 + EDITTEXT IDC_COLOR_EDIT_G, 275, 138, 21, 12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "A&zul:", IDC_COLOR_BL /*1096*/, 247, 154, 27, 10 + EDITTEXT IDC_COLOR_EDIT_B, 275, 152, 21, 12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "Mat&iz:" , IDC_COLOR_HL /*1091*/, 200, 126, 24, 10 + EDITTEXT IDC_COLOR_EDIT_H, 224, 124, 21, 12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "Sa&t:", IDC_COLOR_SL /*1092*/, 200, 140, 24, 10 + EDITTEXT IDC_COLOR_EDIT_S, 224, 138, 21, 12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "&Lum:", IDC_COLOR_LL /*1093*/, 200, 154, 24, 10 + EDITTEXT IDC_COLOR_EDIT_L, 224, 152, 21, 12, WS_BORDER | WS_GROUP | WS_TABSTOP + CONTROL "", IDC_COLOR_PREDEF, "STATIC", SS_SIMPLE | WS_TABSTOP | WS_GROUP, 4, 14, 140, 86 + CONTROL "", IDC_COLOR_USRDEF, "STATIC", SS_SIMPLE | WS_TABSTOP | WS_GROUP, 4, 116, 140, 28 + CONTROL "", IDC_COLOR_GRAPH, "STATIC", WS_BORDER | SS_SIMPLE | WS_TABSTOP | WS_GROUP, 152, 4, 118, 116 + CONTROL "", IDC_COLOR_LUMBAR, "STATIC", SS_SIMPLE | WS_TABSTOP | WS_GROUP, 278, 4, 8, 116 + CONTROL "", IDC_COLOR_RESULT, "STATIC", SS_SIMPLE | WS_TABSTOP | WS_GROUP, 152, 124, 40, 26 + DEFPUSHBUTTON "&OK", IDOK, 4, 167, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Cancelar", IDCANCEL, 58, 167, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "A&juda", pshHelp, 100, 166, 44, 14 + PUSHBUTTON "&Adicionar Cor Personalizada", IDC_COLOR_ADD /*1024*/, 152, 167, 144, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Definir Cores Personalizadas >>", IDC_COLOR_DEFINE /*1025*/, 4, 149, 142, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "Colorido|&Sólido", IDC_COLOR_RES, 300, 200, 4, 14 /* just a dummy */ } - FINDDLGORD DIALOG 36, 24, 276, 62 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Procurar" FONT 8, "MS Shell Dlg" { - LTEXT "&Procurar:", -1, 4, 8, 52, 8 - EDITTEXT edt1, 57, 7, 148, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP - CHECKBOX "Palavra &Inteira", chx1, 4, 26, 140, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - CHECKBOX "&Maiúsculas/minúsculas", chx2, 4, 42, 140, 12, BS_AUTOCHECKBOX | WS_TABSTOP - GROUPBOX "Direção", grp1, 147, 21, 58, 38 - CONTROL "&Acima", rad1, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 151, 30, 48, 12 - CONTROL "A&baixo", rad2, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 151, 44, 48, 12 - - DEFPUSHBUTTON "&Procurar", IDOK, 212, 6, 60, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON - PUSHBUTTON "Cancelar", IDCANCEL , 212, 24, 60, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "&Ajuda", pshHelp , 212, 42, 60, 14, WS_GROUP | WS_TABSTOP + LTEXT "&Procurar:", -1, 4, 8, 52, 8 + EDITTEXT edt1, 57, 7, 148, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP + CHECKBOX "Palavra &Inteira", chx1, 4, 26, 140, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "&Maiúsculas/minúsculas", chx2, 4, 42, 140, 12, BS_AUTOCHECKBOX | WS_TABSTOP + GROUPBOX "Direcção", grp1, 147, 21, 58, 38 + CONTROL "&Acima", rad1, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 151, 30, 48, 12 + CONTROL "A&baixo", rad2, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 151, 44, 48, 12 + DEFPUSHBUTTON "&Procurar", IDOK, 212, 6, 60, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON + PUSHBUTTON "Cancelar", IDCANCEL, 212, 24, 60, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Ajuda", pshHelp, 212, 42, 60, 14, WS_GROUP | WS_TABSTOP } - REPLACEDLGORD DIALOG 36, 24, 276, 94 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Substituir" FONT 8, "MS Shell Dlg" { - LTEXT "&Procurar:", -1, 4, 8, 52, 8 - EDITTEXT edt1, 57, 7, 148, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "Substituir Po&r:", -1, 4, 26, 52, 8 - EDITTEXT edt2, 57, 24, 148, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP - CHECKBOX "Palavra &Inteira", chx1, 5, 46, 120, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - CHECKBOX "&Maiúsculas/minúsculas", chx2, 5, 62, 120, 12, BS_AUTOCHECKBOX | WS_TABSTOP - - DEFPUSHBUTTON "&Procurar", IDOK, 212, 6, 60, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON - PUSHBUTTON "&Substituir", psh1 , 212, 24, 60, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "Substituir &Tudo", psh2 , 212, 42, 60, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "Cancelar", IDCANCEL , 212, 60, 60, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "&Ajuda", pshHelp , 212, 78, 60, 14, WS_GROUP | WS_TABSTOP + LTEXT "&Procurar:", -1, 4, 8, 52, 8 + EDITTEXT edt1, 57, 7, 148, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "Substituir Po&r:", -1, 4, 26, 52, 8 + EDITTEXT edt2, 57, 24, 148, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP + CHECKBOX "Palavra &Inteira", chx1, 5, 46, 120, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "&Maiúsculas/minúsculas", chx2, 5, 62, 120, 12, BS_AUTOCHECKBOX | WS_TABSTOP + DEFPUSHBUTTON "&Procurar", IDOK, 212, 6, 60, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON + PUSHBUTTON "&Substituir", psh1, 212, 24, 60, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "Substituir &Tudo", psh2 , 212, 42, 60, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "Cancelar", IDCANCEL, 212, 60, 60, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Ajuda", pshHelp, 212, 78, 60, 14, WS_GROUP | WS_TABSTOP } - PRINT32 DIALOG 32, 32, 288, 186 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | - DS_CONTEXTHELP +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | DS_CONTEXTHELP CAPTION "Imprimir" FONT 8, "MS Shell Dlg" { - DEFPUSHBUTTON "OK", IDOK, 176,164, 50,14, WS_GROUP | BS_DEFPUSHBUTTON - PUSHBUTTON "Cancelar", IDCANCEL, 230,164, 50,14, WS_GROUP - PUSHBUTTON "&Ajuda", pshHelp, 50, 161, 50,14, WS_GROUP - - GROUPBOX "Impressora", grp4, 8, 4, 272,84, WS_GROUP - CONTROL "Para &ficheiro", chx1, "Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,185,36,90,16 - PUSHBUTTON "&Propriedades", psh2, 212, 17, 60,14, WS_GROUP - LTEXT "&Nome:", stc6, 16, 20, 36,8 - COMBOBOX cmb4, 52, 18, 152,152,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP - LTEXT "Status:", stc8, 16, 36, 47,10, SS_NOPREFIX - LTEXT "", stc12, 65, 36, 120,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - LTEXT "Tipo:", stc7, 16, 48, 47,10, SS_NOPREFIX - LTEXT "", stc11, 65, 48, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - LTEXT "Local:", stc10, 16, 60, 47,10, SS_NOPREFIX - LTEXT "", stc14, 65, 60, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - LTEXT "Nota:", stc9, 16, 72, 47,10, SS_NOPREFIX - LTEXT "", stc13, 65, 72, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - - GROUPBOX "Cópias", grp2, 160, 92, 120,64, WS_GROUP - LTEXT "Número de &cópias:",stc5,168,105,68,8 - ICON "", ico3, 170,131, 76,24, WS_GROUP | SS_CENTERIMAGE - CONTROL "&Agrupar", chx2,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,168,118,100,12 - EDITTEXT edt3, 240,103, 32,12, WS_GROUP | ES_NUMBER - - GROUPBOX "Faixa de impressão", grp1, 8,92, 144,64, WS_GROUP - CONTROL "&Todos", rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,106,64,12 - CONTROL "Páginas", rad3,"Button",BS_AUTORADIOBUTTON,16,122,36,12 - CONTROL "Selecção", rad2,"Button",BS_AUTORADIOBUTTON,16,138,64,12 - EDITTEXT edt1, 73,122, 26,12, WS_GROUP | ES_NUMBER - EDITTEXT edt2, 120,122, 26,12, WS_GROUP | ES_NUMBER - RTEXT "&de:", stc2, 52,124, 20,8 - RTEXT "&até", stc3, 99,124, 20,8 + DEFPUSHBUTTON "OK", IDOK, 176, 164, 50, 14, WS_GROUP | BS_DEFPUSHBUTTON + PUSHBUTTON "Cancelar", IDCANCEL, 230, 164, 50, 14, WS_GROUP + PUSHBUTTON "&Ajuda", pshHelp, 50, 161, 50,14, WS_GROUP + GROUPBOX "Impressora", grp4, 8, 4, 272, 84, WS_GROUP + CONTROL "Para &ficheiro", chx1, "Button", BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP, 185, 36, 90, 16 + PUSHBUTTON "&Propriedades", psh2, 212, 17, 60,14, WS_GROUP + LTEXT "&Nome:", stc6, 16, 20, 36,8 + COMBOBOX cmb4, 52, 18, 152, 152, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP + LTEXT "Status:", stc8, 16, 36, 47,10, SS_NOPREFIX + LTEXT "", stc12, 65, 36, 120, 10, SS_NOPREFIX | SS_LEFTNOWORDWRAP + LTEXT "Tipo:", stc7, 16, 48, 47, 10, SS_NOPREFIX + LTEXT "", stc11, 65, 48, 212, 10, SS_NOPREFIX | SS_LEFTNOWORDWRAP + LTEXT "Local:", stc10, 16, 60, 47, 10, SS_NOPREFIX + LTEXT "", stc14, 65, 60, 212, 10, SS_NOPREFIX | SS_LEFTNOWORDWRAP + LTEXT "Nota:", stc9, 16, 72, 47, 10, SS_NOPREFIX + LTEXT "", stc13, 65, 72, 212, 10, SS_NOPREFIX | SS_LEFTNOWORDWRAP + GROUPBOX "Cópias", grp2, 160, 92, 120, 64, WS_GROUP + LTEXT "Número de &cópias:", stc5, 168, 105, 68, 8 + ICON "", ico3, 170, 131, 76, 24, WS_GROUP | SS_CENTERIMAGE + CONTROL "&Agrupar", chx2, "Button", BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP, 168, 118, 100, 12 + EDITTEXT edt3, 240, 103, 32, 12, WS_GROUP | ES_NUMBER + GROUPBOX "Faixa de impressão", grp1, 8, 92, 144, 64, WS_GROUP + CONTROL "&Todos", rad1,"Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 16, 106, 64, 12 + CONTROL "Páginas", rad3,"Button", BS_AUTORADIOBUTTON, 16, 122, 36, 12 + CONTROL "Selecção", rad2,"Button", BS_AUTORADIOBUTTON, 16, 138, 64, 12 + EDITTEXT edt1, 73, 122, 26, 12, WS_GROUP | ES_NUMBER + EDITTEXT edt2, 120, 122, 26, 12, WS_GROUP | ES_NUMBER + RTEXT "&de:", stc2, 52, 124, 20, 8 + RTEXT "&até", stc3, 99, 124, 20, 8 } PRINT32_SETUP DIALOG 32, 32, 288, 178 @@ -388,33 +371,30 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Configurações de Impressão" FONT 8, "MS Shell Dlg" BEGIN - DEFPUSHBUTTON "OK",IDOK,176,156,50,14,WS_GROUP - PUSHBUTTON "Cancelar",IDCANCEL,230,156,50,14 + DEFPUSHBUTTON "OK", IDOK, 176, 156, 50, 14, WS_GROUP + PUSHBUTTON "Cancelar", IDCANCEL, 230, 156, 50, 14 /* PUSHBUTTON "Network...", psh5, 284,156,48,14 */ - - GROUPBOX "Impressora", grp4, 8, 4, 272,84, WS_GROUP - PUSHBUTTON "&Propriedades", psh2, 212, 17, 60,14, WS_GROUP - LTEXT "&Nome:", stc6, 16, 20, 36,8 - COMBOBOX cmb1, 52, 18, 152,152,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP - LTEXT "Status:", stc8, 16, 36, 47,10, SS_NOPREFIX - LTEXT "", stc12, 65, 36, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - LTEXT "Tipo:", stc7, 16, 48, 47,10, SS_NOPREFIX - LTEXT "", stc11, 65, 48, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - LTEXT "Local:", stc10, 16, 60, 47,10, SS_NOPREFIX - LTEXT "", stc14, 65, 60, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - LTEXT "Nota:", stc9, 16, 72, 47,10, SS_NOPREFIX - LTEXT "", stc13, 65, 72, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - - GROUPBOX "Papel", grp2, 8, 92, 164,56, WS_GROUP - LTEXT "Tama&nho:", stc2, 16,108, 36, 8 - COMBOBOX cmb2, 52,106, 112,112,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP - LTEXT "&Origem:", stc3, 16,128, 36, 8 - COMBOBOX cmb3, 52,126, 112,112,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP - - GROUPBOX "Orientação", grp1, 180, 92, 100,56, WS_GROUP - ICON "", ico1, 195,112, 18,20, WS_GROUP - CONTROL "&Retrato", rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP |WS_TABSTOP,224,106,52,12 - CONTROL "&Paisagem", rad2,"Button",BS_AUTORADIOBUTTON,224,126,52,12 + GROUPBOX "Impressora", grp4, 8, 4, 272, 84, WS_GROUP + PUSHBUTTON "&Propriedades", psh2, 212, 17, 60, 14, WS_GROUP + LTEXT "&Nome:", stc6, 16, 20, 36, 8 + COMBOBOX cmb1, 52, 18, 152, 152, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP + LTEXT "Status:", stc8, 16, 36, 47, 10, SS_NOPREFIX + LTEXT "", stc12, 65, 36, 212, 10, SS_NOPREFIX | SS_LEFTNOWORDWRAP + LTEXT "Tipo:", stc7, 16, 48, 47, 10, SS_NOPREFIX + LTEXT "", stc11, 65, 48, 212, 10, SS_NOPREFIX | SS_LEFTNOWORDWRAP + LTEXT "Local:", stc10, 16, 60, 47, 10, SS_NOPREFIX + LTEXT "", stc14, 65, 60, 212, 10, SS_NOPREFIX | SS_LEFTNOWORDWRAP + LTEXT "Nota:", stc9, 16, 72, 47, 10, SS_NOPREFIX + LTEXT "", stc13, 65, 72, 212, 10, SS_NOPREFIX | SS_LEFTNOWORDWRAP + GROUPBOX "Papel", grp2, 8, 92, 164, 56, WS_GROUP + LTEXT "Tama&nho:", stc2, 16, 108, 36, 8 + COMBOBOX cmb2, 52, 106, 112, 112,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP + LTEXT "&Origem:", stc3, 16, 128, 36, 8 + COMBOBOX cmb3, 52, 126, 112, 112, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP + GROUPBOX "Orientação", grp1, 180, 92, 100, 56, WS_GROUP + ICON "", ico1, 195, 112, 18, 20, WS_GROUP + CONTROL "&Retrato", rad1,"Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 224, 106, 52, 12 + CONTROL "&Paisagem", rad2,"Button", BS_AUTORADIOBUTTON, 224, 126, 52, 12 END PAGESETUPDLGORD DIALOG 32, 32, 240, 240 @@ -422,29 +402,29 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Configurações de Página" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "", rct1, "Static", SS_WHITERECT, 80, 8, 80, 80 - CONTROL "", rct2, "Static", SS_GRAYRECT, 160, 12, 4, 80 - CONTROL "", rct3, "Static", SS_GRAYRECT, 84, 88, 80, 4 - GROUPBOX "Papel", grp2, 8, 96, 224, 56, BS_GROUPBOX - LTEXT "&Tamanho:", stc2, 16, 112, 36, 8 - COMBOBOX cmb2, 64, 110, 160, 160, CBS_SIMPLE|CBS_DROPDOWN|CBS_SORT|WS_GROUP|WS_TABSTOP|WS_VSCROLL - LTEXT "&Bandeja:", stc3, 16, 132, 36, 8 - COMBOBOX cmb3, 64, 130, 160, 160, CBS_SIMPLE|CBS_DROPDOWN|CBS_SORT|WS_GROUP|WS_TABSTOP|WS_VSCROLL - GROUPBOX "Orientação", grp1, 8, 156, 64, 56, BS_GROUPBOX - AUTORADIOBUTTON "&Retrato", rad1, 16, 170, 52, 12, BS_AUTORADIOBUTTON - AUTORADIOBUTTON "&Paisagem", rad2, 16, 190, 52, 12, BS_AUTORADIOBUTTON - GROUPBOX "", grp4, 80, 156, 152, 56, BS_GROUPBOX - LTEXT "&Esquerda:", stc15, 88, 172, 30, 8 - EDITTEXT edt4, 119, 170, 36, 12, WS_TABSTOP|WS_GROUP|WS_BORDER - LTEXT "&Direita:", stc16, 159, 172, 30, 8 - EDITTEXT edt6, 190, 170, 36, 12, WS_TABSTOP|WS_GROUP|WS_BORDER - LTEXT "&Superior:", stc17, 88, 192, 30, 8 - EDITTEXT edt5, 119, 190, 36, 12, WS_TABSTOP|WS_GROUP|WS_BORDER - LTEXT "&Inferior:", stc18, 159, 192, 30, 8 - EDITTEXT edt7, 190, 190, 36, 12, WS_TABSTOP|WS_GROUP|WS_BORDER - DEFPUSHBUTTON "OK", IDOK, 70, 220, 50, 14, BS_PUSHBUTTON - PUSHBUTTON "Cancelar", IDCANCEL, 126, 220, 50, 14 - PUSHBUTTON "Im&pressora...", psh3, 182, 220, 50, 14 + CONTROL "", rct1, "Static", SS_WHITERECT, 80, 8, 80, 80 + CONTROL "", rct2, "Static", SS_GRAYRECT, 160, 12, 4, 80 + CONTROL "", rct3, "Static", SS_GRAYRECT, 84, 88, 80, 4 + GROUPBOX "Papel", grp2, 8, 96, 224, 56, BS_GROUPBOX + LTEXT "&Tamanho:", stc2, 16, 112, 36, 8 + COMBOBOX cmb2, 64, 110, 160, 160, CBS_SIMPLE | CBS_DROPDOWN | CBS_SORT | WS_GROUP | WS_TABSTOP | WS_VSCROLL + LTEXT "&Bandeja:", stc3, 16, 132, 36, 8 + COMBOBOX cmb3, 64, 130, 160, 160, CBS_SIMPLE | CBS_DROPDOWN | CBS_SORT | WS_GROUP | WS_TABSTOP | WS_VSCROLL + GROUPBOX "Orientação", grp1, 8, 156, 64, 56, BS_GROUPBOX + AUTORADIOBUTTON "&Retrato", rad1, 16, 170, 52, 12, BS_AUTORADIOBUTTON + AUTORADIOBUTTON "&Paisagem", rad2, 16, 190, 52, 12, BS_AUTORADIOBUTTON + GROUPBOX "", grp4, 80, 156, 152, 56, BS_GROUPBOX + LTEXT "&Esquerda:", stc15, 88, 172, 30, 8 + EDITTEXT edt4, 119, 170, 36, 12, WS_TABSTOP|WS_GROUP | WS_BORDER + LTEXT "&Direita:", stc16, 159, 172, 30, 8 + EDITTEXT edt6, 190, 170, 36, 12, WS_TABSTOP|WS_GROUP | WS_BORDER + LTEXT "&Superior:", stc17, 88, 192, 30, 8 + EDITTEXT edt5, 119, 190, 36, 12, WS_TABSTOP|WS_GROUP | WS_BORDER + LTEXT "&Inferior:", stc18, 159, 192, 30, 8 + EDITTEXT edt7, 190, 190, 36, 12, WS_TABSTOP|WS_GROUP | WS_BORDER + DEFPUSHBUTTON "OK", IDOK, 70, 220, 50, 14, BS_PUSHBUTTON + PUSHBUTTON "Cancelar", IDCANCEL, 126, 220, 50, 14 + PUSHBUTTON "Im&pressora...", psh3, 182, 220, 50, 14 END NEWFILEOPENORD DIALOG 0, 0, 280, 164 @@ -452,24 +432,19 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_VISIBLE | WS_POPUP | WS CAPTION "Abrir" FONT 8, "MS Shell Dlg" { - LTEXT "&Examinar:",IDC_LOOKINSTATIC,4,6,43,8, SS_NOTIFY - COMBOBOX IDC_LOOKIN,49,3,132,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP - - LTEXT "" , IDC_TOOLBARSTATIC, 181, 2, 102, 17, NOT WS_GROUP | NOT WS_VISIBLE - LISTBOX IDC_SHELLSTATIC,4,20,272,85, LBS_SORT | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_HSCROLL | NOT WS_VISIBLE - - LTEXT "&Nome do ficheiro:",IDC_FILENAMESTATIC,5,112,56,16, SS_NOTIFY - EDITTEXT IDC_FILENAME,63,110,150,12,ES_AUTOHSCROLL - CONTROL "", cmb13, "ComboBoxEx32", CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP, 63,110,150,150 - - LTEXT "Ficheiros do &tipo:",IDC_FILETYPESTATIC,5,130,56,16, SS_NOTIFY - COMBOBOX IDC_FILETYPE,63,128,150,53,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - - CONTROL "Abrir como &apenas-leitura",IDC_OPENREADONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,63,148,150,10 - - DEFPUSHBUTTON "&Abrir", IDOK,222,110,54,14 - PUSHBUTTON "Cancelar", IDCANCEL,222,128,54,14 - PUSHBUTTON "&Ajuda", pshHelp,222,145,54,14 + LTEXT "&Examinar:", IDC_LOOKINSTATIC, 4, 6, 43, 8, SS_NOTIFY + COMBOBOX IDC_LOOKIN, 49, 3, 132, 100, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP + LTEXT "", IDC_TOOLBARSTATIC, 181, 2, 102, 17, NOT WS_GROUP | NOT WS_VISIBLE + LISTBOX IDC_SHELLSTATIC, 4, 20, 272, 85, LBS_SORT | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_HSCROLL | NOT WS_VISIBLE + LTEXT "&Nome do ficheiro:", IDC_FILENAMESTATIC, 5, 112, 56, 16, SS_NOTIFY + EDITTEXT IDC_FILENAME,63,110,150,12,ES_AUTOHSCROLL + CONTROL "", cmb13, "ComboBoxEx32", CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP, 63, 110, 150, 150 + LTEXT "Ficheiros do &tipo:", IDC_FILETYPESTATIC, 5, 130, 56, 16, SS_NOTIFY + COMBOBOX IDC_FILETYPE, 63, 128, 150, 53,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + CONTROL "Abrir como &apenas-leitura", IDC_OPENREADONLY, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 63, 148, 150, 10 + DEFPUSHBUTTON "&Abrir", IDOK, 222, 110, 54, 14 + PUSHBUTTON "Cancelar", IDCANCEL, 222, 128, 54, 14 + PUSHBUTTON "&Ajuda", pshHelp, 222, 145, 54, 14 } NEWFILEOPENV2ORD DIALOG 0, 0, 370, 237 @@ -479,44 +454,34 @@ FONT 8, "MS Shell Dlg" { LTEXT "Ver &em:", IDC_LOOKINSTATIC, 28, 6, 43, 8, SS_NOTIFY COMBOBOX IDC_LOOKIN, 64, 3, 150, 100, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP - LTEXT "" , IDC_TOOLBARSTATIC, 209, 2, 102, 17, NOT WS_GROUP | NOT WS_VISIBLE CONTROL "", IDC_TOOLBARPLACES, "ToolbarWindow32", 0x800 | CCS_NORESIZE | CCS_TOP | CCS_NOPARENTALIGN | CCS_NODIVIDER, 4, 20, 55, 208 LISTBOX IDC_SHELLSTATIC, 64, 20, 300, 155, LBS_SORT | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_HSCROLL | NOT WS_VISIBLE - LTEXT "&Nome do ficheiro:", IDC_FILENAMESTATIC, 65, 182, 56, 16, SS_NOTIFY EDITTEXT IDC_FILENAME, 123, 180, 180, 12, ES_AUTOHSCROLL CONTROL "", cmb13, "ComboBoxEx32", CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP, 123, 180, 180, 150 - LTEXT "Ficheiros &tipo:", IDC_FILETYPESTATIC, 65, 200, 56, 16, SS_NOTIFY COMBOBOX IDC_FILETYPE, 123, 198, 180, 53, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - CONTROL "Abrir como só leitura", IDC_OPENREADONLY, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 123, 218, 150, 10 - DEFPUSHBUTTON "&Abrir", IDOK, 310, 180, 54, 14 PUSHBUTTON "Cancelar", IDCANCEL, 310, 198, 54, 14 PUSHBUTTON "A&juda", pshHelp, 310, 215, 54, 14 } NEWFILEOPENV3ORD DIALOG 0, 0, 440, 300 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_CLIPCHILDREN | - WS_THICKFRAME +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_CLIPCHILDREN | WS_THICKFRAME CAPTION "Abrir" FONT 8, "MS Shell Dlg" { - LTEXT "&Nome do ficheiro:", IDC_FILENAMESTATIC, 160, 240, 60, 9, SS_RIGHT | WS_CLIPSIBLINGS - EDITTEXT IDC_FILENAME, 226, 240, 100, 12, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_CLIPSIBLINGS | ES_AUTOHSCROLL - - LTEXT "Ficheiros do &tipo:", IDC_FILETYPESTATIC, 160, 256, 60, 9, SS_RIGHT | WS_CLIPSIBLINGS - COMBOBOX IDC_FILETYPE, 226, 256, 100, 60, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | - WS_CLIPSIBLINGS | CBS_HASSTRINGS | CBS_DROPDOWNLIST - - DEFPUSHBUTTON "&Abrir", IDOK, 350, 240, 40, 14, WS_GROUP | WS_CLIPSIBLINGS - + LTEXT "&Nome do ficheiro:", IDC_FILENAMESTATIC, 160, 240, 60, 9, SS_RIGHT | WS_CLIPSIBLINGS + EDITTEXT IDC_FILENAME, 226, 240, 100, 12, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_CLIPSIBLINGS | ES_AUTOHSCROLL + LTEXT "Ficheiros do &tipo:", IDC_FILETYPESTATIC, 160, 256, 60, 9, SS_RIGHT | WS_CLIPSIBLINGS + COMBOBOX IDC_FILETYPE, 226, 256, 100, 60, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | + WS_CLIPSIBLINGS | CBS_HASSTRINGS | CBS_DROPDOWNLIST + DEFPUSHBUTTON "&Abrir", IDOK, 350, 240, 40, 14, WS_GROUP | WS_CLIPSIBLINGS /* drop-down menu for open button */ - CONTROL "6", psh1, "Button", WS_CHILD | WS_CLIPSIBLINGS | WS_GROUP | WS_TABSTOP | - BS_CHECKBOX | BS_PUSHLIKE, 342, 240, 8, 14 - - PUSHBUTTON "Cancelar", IDCANCEL, 395, 240, 40, 14, WS_CLIPSIBLINGS - PUSHBUTTON "&Ajuda", pshHelp, 350, 272, 40, 14, WS_CLIPSIBLINGS + CONTROL "6", psh1, "Button", WS_CHILD | WS_CLIPSIBLINGS | WS_GROUP | WS_TABSTOP | BS_CHECKBOX | BS_PUSHLIKE, 342, 240, 8, 14 + PUSHBUTTON "Cancelar", IDCANCEL, 395, 240, 40, 14, WS_CLIPSIBLINGS + PUSHBUTTON "&Ajuda", pshHelp, 350, 272, 40, 14, WS_CLIPSIBLINGS } +

1 0

[reactos] 01/01: [CONFIGURE] Add support for 'Visual Studio 2019, v16.4' (#2147)
by Serge Gautherie 10 Dec '19

10 Dec '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0f8460524267c8f19bb83… commit 0f8460524267c8f19bb8318f1381045d506e760c Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Tue Dec 10 12:37:43 2019 +0100 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Tue Dec 10 12:37:43 2019 +0100 [CONFIGURE] Add support for 'Visual Studio 2019, v16.4' (#2147) --- configure.cmd | 1 + 1 file changed, 1 insertion(+) diff --git a/configure.cmd b/configure.cmd index dd50a1998d7..acbf3da1bd2 100755 --- a/configure.cmd +++ b/configure.cmd @@ -65,6 +65,7 @@ if defined ROS_ARCH ( cl 2>&1 | find "19.21." > NUL && set VS_VERSION=16 cl 2>&1 | find "19.22." > NUL && set VS_VERSION=16 cl 2>&1 | find "19.23." > NUL && set VS_VERSION=16 + cl 2>&1 | find "19.24." > NUL && set VS_VERSION=16 if not defined VS_VERSION ( echo Error: Visual Studio version too old ^(before 10 ^(2010^)^) or version detection failed. goto quit

1 0

[reactos] 01/01: [COMCTL32][USER32] Fix radio button regression (#2146)
by Katayama Hirofumi MZ 10 Dec '19

10 Dec '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2d4d3f5fce0c875d3e714… commit 2d4d3f5fce0c875d3e714c51de16dfb0cd0a9cd3 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Dec 10 11:07:56 2019 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Dec 10 11:07:56 2019 +0900 [COMCTL32][USER32] Fix radio button regression (#2146) PR #2135 (e329e83) caused radiobutton regression. This PR will fix it. - Clear DT_BOTTOM | DT_VCENTER flags upon calculating the button text height. CORE-16552 --- dll/win32/comctl32/button.c | 4 ++++ win32ss/user/user32/controls/button.c | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/dll/win32/comctl32/button.c b/dll/win32/comctl32/button.c index 37dab409b0d..db207499e67 100644 --- a/dll/win32/comctl32/button.c +++ b/dll/win32/comctl32/button.c @@ -1211,7 +1211,11 @@ static UINT BUTTON_CalcLabelRect(const BUTTON_INFO *infoPtr, HDC hdc, RECT *rc) } if ((hFont = infoPtr->font)) hPrevFont = SelectObject( hdc, hFont ); +#ifdef __REACTOS__ + DrawTextW(hdc, text, -1, &r, ((dtStyle | DT_CALCRECT) & ~(DT_VCENTER | DT_BOTTOM))); +#else DrawTextW(hdc, text, -1, &r, dtStyle | DT_CALCRECT); +#endif if (hPrevFont) SelectObject( hdc, hPrevFont ); heap_free( text ); #ifdef __REACTOS__ diff --git a/win32ss/user/user32/controls/button.c b/win32ss/user/user32/controls/button.c index df7fb0e7810..6b65c536795 100644 --- a/win32ss/user/user32/controls/button.c +++ b/win32ss/user/user32/controls/button.c @@ -773,7 +773,11 @@ static UINT BUTTON_CalcLabelRect(HWND hwnd, HDC hdc, RECT *rc) } if ((hFont = get_button_font( hwnd ))) hPrevFont = SelectObject( hdc, hFont ); +#ifdef __REACTOS__ + DrawTextW(hdc, text, -1, &r, ((dtStyle | DT_CALCRECT) & ~(DT_VCENTER | DT_BOTTOM))); +#else DrawTextW(hdc, text, -1, &r, dtStyle | DT_CALCRECT); +#endif if (hPrevFont) SelectObject( hdc, hPrevFont ); HeapFree( GetProcessHeap(), 0, text ); #ifdef __REACTOS__

1 0

[reactos] 01/01: [SetupAPI] Sync to wine.
by jimtabor 10 Dec '19

10 Dec '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0785633649d7f1cf333cc… commit 0785633649d7f1cf333cc42bb18d078ac67f55bc Author: jimtabor <james.tabor(a)reactos.org> AuthorDate: Mon Dec 9 19:15:49 2019 -0600 Commit: jimtabor <james.tabor(a)reactos.org> CommitDate: Mon Dec 9 19:15:49 2019 -0600 [SetupAPI] Sync to wine. See CORE-16543. --- dll/win32/setupapi/setupapi.spec | 4 ++-- dll/win32/setupapi/stubs.c | 18 ++++++++++++++++++ 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/dll/win32/setupapi/setupapi.spec b/dll/win32/setupapi/setupapi.spec index d6ad0e70bb0..692a0d27acd 100644 --- a/dll/win32/setupapi/setupapi.spec +++ b/dll/win32/setupapi/setupapi.spec @@ -223,8 +223,8 @@ @ stub SetupAddSectionToDiskSpaceListW @ stdcall SetupAddToDiskSpaceListA(long str int64 long ptr long) @ stdcall SetupAddToDiskSpaceListW(long wstr int64 long ptr long) -@ stub SetupAddToSourceListA -@ stub SetupAddToSourceListW +@ stdcall SetupAddToSourceListA(long str) +@ stdcall SetupAddToSourceListW(long wstr) @ stub SetupAdjustDiskSpaceListA @ stub SetupAdjustDiskSpaceListW @ stub SetupBackupErrorA diff --git a/dll/win32/setupapi/stubs.c b/dll/win32/setupapi/stubs.c index c1c6e883b25..f132a8a0fc4 100644 --- a/dll/win32/setupapi/stubs.c +++ b/dll/win32/setupapi/stubs.c @@ -38,6 +38,24 @@ INT WINAPI SetupPromptReboot( HSPFILEQ file_queue, HWND owner, BOOL scan_only ) return 0; } +/*********************************************************************** + * SetupAddToSourceListA (SETUPAPI.@) + */ +BOOL WINAPI SetupAddToSourceListA(DWORD flags, PCSTR source) +{ + FIXME("0x%08x %s: stub\n", flags, debugstr_a(source)); + return TRUE; +} + +/*********************************************************************** + * SetupAddToSourceListW (SETUPAPI.@) + */ +BOOL WINAPI SetupAddToSourceListW(DWORD flags, PCWSTR source) +{ + FIXME("0x%08x %s: stub\n", flags, debugstr_w(source)); + return TRUE; +} + /*********************************************************************** * SetupSetSourceListA (SETUPAPI.@) */

1 0

[reactos] 02/02: Merge branch 'master' of https://github.com/reactos/reactos
by jimtabor 09 Dec '19

09 Dec '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d447b4119877ba3c81e1b… commit d447b4119877ba3c81e1b3f451c981f7e2adc755 Merge: 5214a38fd0e e329e83857d Author: jimtabor <james.tabor(a)reactos.org> AuthorDate: Mon Dec 9 11:19:18 2019 -0600 Commit: jimtabor <james.tabor(a)reactos.org> CommitDate: Mon Dec 9 11:19:18 2019 -0600 Merge branch 'master' of https://github.com/reactos/reactos modules/rostests/apitests/kernel32/ConsoleCP.c | 10 ++++++---- win32ss/user/rtl/text.c | 14 ++------------ 2 files changed, 8 insertions(+), 16 deletions(-)

1 0

[reactos] 01/02: [Win32SS] Fix Opaque Text Fade while in Desktop Startup
by jimtabor 09 Dec '19

09 Dec '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5214a38fd0eb208cbe4ba… commit 5214a38fd0eb208cbe4ba0f7bafcac042815d5e5 Author: jimtabor <james.tabor(a)reactos.org> AuthorDate: Mon Dec 9 11:18:32 2019 -0600 Commit: jimtabor <james.tabor(a)reactos.org> CommitDate: Mon Dec 9 11:18:32 2019 -0600 [Win32SS] Fix Opaque Text Fade while in Desktop Startup See CORE-16498. --- win32ss/gdi/gdi32/objects/region.c | 2 -- win32ss/gdi/ntgdi/dclife.c | 3 --- win32ss/user/rtl/text.c | 3 ++- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/win32ss/gdi/gdi32/objects/region.c b/win32ss/gdi/gdi32/objects/region.c index ef1e892bdd8..5ba168d9fdb 100644 --- a/win32ss/gdi/gdi32/objects/region.c +++ b/win32ss/gdi/gdi32/objects/region.c @@ -64,7 +64,6 @@ FASTCALL DeleteRegion( _In_ HRGN hrgn) { -#if 0 PRGN_ATTR Rgn_Attr = GdiGetRgnAttr(hrgn); if ( Rgn_Attr ) @@ -78,7 +77,6 @@ DeleteRegion( return TRUE; } } -#endif return NtGdiDeleteObjectApp(hrgn); } diff --git a/win32ss/gdi/ntgdi/dclife.c b/win32ss/gdi/ntgdi/dclife.c index 52236c037c3..1046ad7315b 100644 --- a/win32ss/gdi/ntgdi/dclife.c +++ b/win32ss/gdi/ntgdi/dclife.c @@ -949,9 +949,6 @@ BOOL APIENTRY NtGdiDeleteObjectApp(HANDLE hobj) { - /* Complete all pending operations */ - //NtGdiFlushUserBatch(); // FIXME: We shouldn't need this - if (GDI_HANDLE_IS_STOCKOBJ(hobj)) return TRUE; if (GreGetObjectOwner(hobj) != GDI_OBJ_HMGR_POWNED) diff --git a/win32ss/user/rtl/text.c b/win32ss/user/rtl/text.c index 7670e2e5956..dba4c57dbbb 100644 --- a/win32ss/user/rtl/text.c +++ b/win32ss/user/rtl/text.c @@ -1374,7 +1374,8 @@ INT WINAPI DrawTextExWorker( HDC hdc, #ifndef _WIN32K_ if (!(flags & DT_NOCLIP) ) { - SelectClipRgn(hdc, hrgn); + SelectClipRgn(hdc, hrgn); // This should be NtGdiExtSelectClipRgn, but due to ReactOS build rules this option is next: + GdiFlush(); // Flush the batch and level up! See CORE-16498. if (hrgn) { DeleteObject(hrgn);

1 0

[reactos] 01/01: [WIN32SS][COMCTL32] Improve button text position (#2135)
by Katayama Hirofumi MZ 09 Dec '19

09 Dec '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e329e83857db0db67c679… commit e329e83857db0db67c6798c538ad658be044057e Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Dec 9 21:16:28 2019 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Dec 9 21:16:28 2019 +0900 [WIN32SS][COMCTL32] Improve button text position (#2135) Improve DrawText function especially DT_CALCRECT and DT_VCENTER. CORE-15478 --- win32ss/user/rtl/text.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/win32ss/user/rtl/text.c b/win32ss/user/rtl/text.c index 7670e2e5956..8963b0d0831 100644 --- a/win32ss/user/rtl/text.c +++ b/win32ss/user/rtl/text.c @@ -1263,18 +1263,8 @@ INT WINAPI DrawTextExWorker( HDC hdc, if (flags & DT_SINGLELINE) { #ifdef __REACTOS__ - if (flags & DT_VCENTER) - { - if (flags & DT_CALCRECT) - { - if (rect->bottom - rect->top < size.cy / 2) - y = rect->top + (invert_y ? size.cy : -size.cy) / 2; - } - else - { - y = rect->top + (rect->bottom - rect->top + (invert_y ? size.cy : -size.cy)) / 2; - } - } + if (flags & DT_VCENTER) y = rect->top + + (rect->bottom - rect->top + (invert_y ? size.cy : -size.cy)) / 2; else if (flags & DT_BOTTOM) y = rect->bottom + (invert_y ? 0 : -size.cy); #else

1 0

[reactos] 01/01: [KERNEL32_APITEST] Follow-up of #2131
by Katayama Hirofumi MZ 09 Dec '19

09 Dec '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7cc76d8afc2810b32d289… commit 7cc76d8afc2810b32d289143e2ec488bba49e4f9 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Dec 9 20:55:13 2019 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Mon Dec 9 20:55:13 2019 +0900 [KERNEL32_APITEST] Follow-up of #2131 --- modules/rostests/apitests/kernel32/ConsoleCP.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/modules/rostests/apitests/kernel32/ConsoleCP.c b/modules/rostests/apitests/kernel32/ConsoleCP.c index 94fcdd3c8a0..3a381977ed4 100644 --- a/modules/rostests/apitests/kernel32/ConsoleCP.c +++ b/modules/rostests/apitests/kernel32/ConsoleCP.c @@ -23,7 +23,7 @@ static const WCHAR u9580[] = { 0x9580, 0 }; /* 門 */ static const WCHAR ideograph_space = (WCHAR)0x3000; /* fullwidth space */ static LCID lcidJapanese = MAKELCID(MAKELANGID(LANG_JAPANESE, SUBLANG_DEFAULT), SORT_DEFAULT); static LCID lcidRussian = MAKELCID(MAKELANGID(LANG_RUSSIAN , SUBLANG_DEFAULT), SORT_DEFAULT); -static BOOL s_bIsVistaPlus; +static BOOL s_bIs8Plus; static BOOL IsCJKCodePage(void) { @@ -411,7 +411,7 @@ static void test_cp932(HANDLE hConOut) c.X = c.Y = 0; ret = FillConsoleOutputCharacterW(hConOut, ideograph_space, csbi.dwSize.X * csbi.dwSize.Y, c, &len); ok(ret, "FillConsoleOutputCharacterW failed\n"); - if (s_bIsVistaPlus) + if (s_bIs8Plus) ok(len == csbi.dwSize.X * csbi.dwSize.Y / 2, "len was: %ld\n", len); else ok(len == csbi.dwSize.X * csbi.dwSize.Y, "len was: %ld\n", len); @@ -454,7 +454,7 @@ static void test_cp932(HANDLE hConOut) c.X = c.Y = 0; ret = ReadConsoleOutputCharacterW(hConOut, str, 3 * sizeof(WCHAR), c, &len); ok(ret, "ReadConsoleOutputCharacterW failed\n"); - if (s_bIsVistaPlus) + if (s_bIs8Plus) { ok(len == 3, "len was: %ld\n", len); ok(str[0] == 0x3000, "str[0] was: 0x%04X\n", str[0]); @@ -479,8 +479,10 @@ START_TEST(ConsoleCP) HANDLE hConIn, hConOut; OSVERSIONINFOA osver = { sizeof(osver) }; + // https://github.com/reactos/reactos/pull/2131#issuecomment-563189380 GetVersionExA(&osver); - s_bIsVistaPlus = (osver.dwMajorVersion >= 6); + s_bIs8Plus = (osver.dwMajorVersion > 6) || + (osver.dwMajorVersion == 6 && osver.dwMinorVersion >= 2); FreeConsole(); ok(AllocConsole(), "Couldn't alloc console\n");

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