Ros-diffs March 2020

ros-diffs@reactos.org

25 participants
156 discussions

[reactos] 01/01: [TRANSLATION] Update portuguese translation (#2447)

by Jose Carlos Jesus

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ad9bd692461534ecc819e… commit ad9bd692461534ecc819e7a5180310657f50ae13 Author: Jose Carlos Jesus <zecarlos1957(a)hotmail.com> AuthorDate: Fri Mar 20 16:34:43 2020 +0000 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Mar 20 17:34:43 2020 +0100 [TRANSLATION] Update portuguese translation (#2447) Update translation for main.cpl and add new translation for powercfg.cpl. --- dll/cpl/main/lang/pt-PT.rc | 2 +- dll/cpl/powercfg/lang/pt-PT.rc | 174 +++++++++++++++++++++++++++++++++++++++++ dll/cpl/powercfg/powercfg.rc | 3 + 3 files changed, 178 insertions(+), 1 deletion(-) diff --git a/dll/cpl/main/lang/pt-PT.rc b/dll/cpl/main/lang/pt-PT.rc index 8a8ce5a77fc..172e80c2bd9 100644 --- a/dll/cpl/main/lang/pt-PT.rc +++ b/dll/cpl/main/lang/pt-PT.rc @@ -54,7 +54,7 @@ BEGIN GROUPBOX "Configuração dos botões", -1, 5, 5, 236, 70 CHECKBOX "&Mudar os botões primário e secundário", IDC_SWAP_MOUSE_BUTTONS, 10, 18, 156, 10 CONTROL "", IDC_IMAGE_SWAP_MOUSE, "Static", SS_ICON | SS_CENTERIMAGE | WS_VISIBLE, 171, 14, 65, 57, WS_EX_STATICEDGE - LTEXT "Seleccione esta caixa para tornar o botão direito do mouse aquele que é utilizado para as principais funções, como seleccionar e arrastar.", -1, 10, 36, 156, 30 + LTEXT "Seleccione esta caixa para tornar o botão direito do rato aquele que é utilizado para as principais funções, como seleccionar e arrastar.", -1, 10, 36, 156, 30 GROUPBOX "Velocidade do duplo clique", -1, 5, 78, 236, 70 LTEXT "Faça duplo clique na pasta para testar a definição. Se a pasta não abrir nem fechar, tente utilizar uma definição mais lenta.", -1, 10, 90, 156, 28 LTEXT "Velocidade: Lenta", -1, 10, 123, 50, 10 diff --git a/dll/cpl/powercfg/lang/pt-PT.rc b/dll/cpl/powercfg/lang/pt-PT.rc new file mode 100644 index 00000000000..a4a615561ca --- /dev/null +++ b/dll/cpl/powercfg/lang/pt-PT.rc @@ -0,0 +1,174 @@ +LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL + +IDD_POWERSCHEMESPAGE_ACDC DIALOGEX 0, 0, 252, 237 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Esquemas de energia" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_ACDC, IDI_ACDC, 7, 7, 28, 22 + LTEXT "Seleccione o esquema de energia com as configurações mais apropriadas para este computador. Note que a alteração das configurações abaixo, modificará o esquema seleccionado.", -1, 37, 6, 209, 36 + GROUPBOX "&Esquemas de energia", -1, 6, 43, 240, 50 + COMBOBOX IDC_ENERGYLIST, 14, 54, 224, 92, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL + PUSHBUTTON "&Guardar como...", IDC_SAVEAS_BTN, 109, 72, 70, 14, WS_DISABLED + PUSHBUTTON "&Eliminar", IDC_DELETE_BTN, 183, 72, 55, 14, WS_DISABLED + GROUPBOX "Desconhecido", IDC_GRPDETAIL, 6, 95, 240, 136 + LTEXT "Quando o computador está:", IDC_SAT, 12, 109, 60, 12 + LTEXT "ligado à corrente", IDC_SAC, 123, 110, 45, 15 + ICON IDI_AC, IDC_IAC, 97, 108, 21, 20 + LTEXT "ligado a baterias", IDC_SDC, 195, 110, 45, 15 + ICON IDI_DC, IDC_IDC, 170, 108, 21, 20 + LTEXT "Desligar o &monitor:", IDC_MONITOR, 13, 148, 84, 10 + COMBOBOX IDC_MONITORACLIST, 100, 145, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_MONITORDCLIST, 173, 145, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Desligar d&iscos rígidos:", IDC_DISK, 13, 171, 84, 10 + COMBOBOX IDC_DISKACLIST, 100, 167, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_DISKDCLIST, 173, 167, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Entra em s&tandby:", IDC_STANDBY, 13, 191, 84, 10 + COMBOBOX IDC_STANDBYACLIST, 100, 188, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_STANDBYDCLIST, 173, 188, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Entra em &hibernação:", IDC_HIBERNATE, 13, 212, 84, 10 + COMBOBOX IDC_HIBERNATEACLIST, 100, 209, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_HIBERNATEDCLIST, 173, 209, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP +END + +IDD_POWERSCHEMESPAGE_AC DIALOGEX 0, 0, 252, 237 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Esquemas de energia" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_ACDC, IDI_ACDC, 7, 7, 28, 22 + LTEXT "Seleccione o esquema de energia com as configurações mais apropriadas para este computador. Note que a alteração das configurações abaixo, modificará o esquema seleccionado.", -1, 37, 6, 209, 36 + GROUPBOX "&Esquemas de energia", -1, 6, 43, 240, 50 + COMBOBOX IDC_ENERGYLIST, 14, 54, 224, 92, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL + PUSHBUTTON "&Guardar como...", IDC_SAVEAS_BTN, 109, 72, 70, 14, WS_DISABLED + PUSHBUTTON "&Eliminar", IDC_DELETE_BTN, 183, 72, 55, 14, WS_DISABLED + GROUPBOX "Desconhecido", IDC_GRPDETAIL, 6, 95, 240, 136 + LTEXT "Desligar o &monitor:", IDC_MONITOR, 13, 148, 84, 10 + COMBOBOX IDC_MONITORACLIST, 100, 145, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Desligar d&iscos rígidos:", IDC_DISK, 13, 171, 84, 10 + COMBOBOX IDC_DISKACLIST, 100, 167, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Entra em s&tandby:", IDC_STANDBY, 13, 191, 84, 10 + COMBOBOX IDC_STANDBYACLIST, 100, 188, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Entra em &hibernação:", IDC_HIBERNATE, 13, 212, 84, 10 + COMBOBOX IDC_HIBERNATEACLIST, 100, 209, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP +END + +IDD_PROPPAGEALARMS DIALOGEX 0, 0, 252, 237 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Alarmes" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Alarme de bateria fraca", -1, 6, 7, 239, 104 + AUTOCHECKBOX "Activar o alarme de bateria &fraca quando o nível de energia atingir:", IDC_ALARM1, 15, 17, 190, 15, WS_TABSTOP + LTEXT "unknown", IDC_ALARMVALUE1, 215, 20, 20, 10 + LTEXT "0%", -1, 28, 43, 15, 10 + CONTROL "Slider1", IDC_ALARMBAR1, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_TABSTOP, 42, 45, 170, 15 + LTEXT "100%", -1, 214, 43, 25, 10 + PUSHBUTTON "&Acção do alarme...", -1, 17, 69, 70, 14, WS_DISABLED + LTEXT "Notificação:", -1, 95, 71, 57, 10 + LTEXT "Desconhecida", IDC_ALARMMSG1, 154, 71, 84, 10 + LTEXT "Acção:", -1, 95, 83, 55, 10 + LTEXT "Desconhecida", IDC_ALARMAKTION1, 154, 83, 84, 10 + LTEXT "Executar Programa:", -1, 95, 95, 55, 10 + LTEXT "Desconhecido", IDC_ALARMPROG1, 154, 95, 84, 10 + GROUPBOX "Alarme de bateria muito fraca", -1, 6, 120, 239, 106 + AUTOCHECKBOX "Activar o alarme de bateria &muito fraca quando o nível de energia atingir:", IDC_ALARM2, 15, 131, 195, 15, WS_TABSTOP + LTEXT "Desconhecida", IDC_ALARMVALUE2, 215, 134, 20, 10 + LTEXT "0%", -1, 28, 154, 15, 10 + CONTROL "Slider1", IDC_ALARMBAR2, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_TABSTOP, 42, 158, 170, 15 + LTEXT "100%", -1, 214, 154, 25, 10 + PUSHBUTTON "Acção do alarme...", -1, 17, 183, 70, 14, WS_DISABLED + LTEXT "Notificação:", -1, 95, 185, 50, 10 + LTEXT "Desconhecida", IDC_ALARMMSG2, 154, 185, 84, 10 + LTEXT "Acção:", -1, 95, 198, 45, 10 + LTEXT "Desconhecida", IDC_ALARMAKTION2, 154, 198, 84, 10 + LTEXT "Executar Programa:", -1, 95, 211, 50, 10 + LTEXT "Desconhecido", IDC_ALARMPROG2, 154, 211, 84, 10 +END + +IDD_PROPPAGEADVANCED DIALOGEX 0, 0, 252, 237 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Avançadas" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_ACDC, IDI_ACDC, 7, 7, 20, 20 + LTEXT "Seleccione as definições de poupança de energia que deseja utilizar.", -1, 37, 6, 207, 20 + GROUPBOX "Opções", -1, 6, 30, 240, 65 + AUTOCHECKBOX "Mostrar sempre o &icone na barra de tarefas", IDC_SYSTRAYBATTERYMETER, 17, 43, 220, 10, WS_TABSTOP + AUTOCHECKBOX "&Perguntar a palavra-passe quando o computador reiniciar o trabalho.", IDC_PASSWORDLOGON, 17, 60, 220, 10, WS_TABSTOP + AUTOCHECKBOX "&Ajustar o brilho quando ligado a baterias.", IDC_VIDEODIMDISPLAY, 17, 78, 220, 10, WS_TABSTOP + GROUPBOX "Botões de energia", -1, 6, 101, 240, 127 + LTEXT "Ao baixar a &tampa do portátil:", IDC_SLIDCLOSE, 15, 115, 222, 10 + COMBOBOX IDC_LIDCLOSE, 15, 127, 220, 90, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP + LTEXT "Ao premir o botão de &energia do computador:", IDC_SPOWERBUTTON, 15, 153, 222, 10 + COMBOBOX IDC_POWERBUTTON, 15, 165, 220, 90, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP + LTEXT "Ao premir o botão de &suspensão do computador:", IDC_SSLEEPBUTTON, 15, 191, 222, 10 + COMBOBOX IDC_SLEEPBUTTON, 15, 203, 220, 90, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP +END + +IDD_PROPPAGEHIBERNATE DIALOGEX 0, 0, 252, 237 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Hibernar" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_HIBERNATE, IDI_HIBERNATE, 7, 7, 20, 20 + LTEXT "Quando o computador hiberna, armazena no disco rígido tudo o que tem na memória e encerra. Quando sai de hibernação regressa ao estado anterior.", -1, 37, 6, 210, 35 + GROUPBOX "Hibernar", -1, 6, 41, 240, 32 + AUTOCHECKBOX "Permitir &hibernação", IDC_HIBERNATEFILE, 17, 55, 210, 10, WS_TABSTOP + GROUPBOX "Espaço em disco para hibernação", -1, 6, 80, 240, 76 + LTEXT "Espaço disp. em disco:", -1, 15, 95, 140, 10 + LTEXT "Desconhecido", IDC_FREESPACE, 160, 95, 80, 10 + LTEXT "Espaço em disco necessário para hibernação:", -1, 15, 115, 140, 10 + LTEXT "Desconhecido", IDC_SPACEFORHIBERNATEFILE, 160, 115, 80, 10 + LTEXT "Terá de libertar espaço em disco para que o seu computador possa hibernar. ", IDC_TOLESSFREESPACE, 15, 135, 224, 20 +END + +IDD_SAVEPOWERSCHEME DIALOGEX 0, 0, 190, 62 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Guardar esquema" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Guardar este esquema de energia como:", -1, 7, 7, 144, 8 + EDITTEXT IDC_SCHEMENAME, 7, 18, 176, 14, ES_AUTOHSCROLL | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP + PUSHBUTTON "&OK", IDOK, 79, 40, 50, 14 + DEFPUSHBUTTON "&Cancelar", IDCANCEL, 133, 40, 50, 14 +END + +STRINGTABLE +BEGIN + IDS_CPLNAME_1 "de Opções de energia" + IDS_CPLDESCRIPTION_1 "Defina as configurações de poupança de energia para o seu computador." + IDS_PERCENT "%i%%" + IDS_SOUND "Som" + IDS_TEXT "Texto" + IDS_CONFIG1 "Definições para o esquema de energia %s " + IDS_CONFIG2 "Definições avançadas para %s" + IDS_NOACTION "Sem acção" + IDS_PowerActionNone1 "Sem acção" + IDS_PowerActionUnknown "Desconhecida" + IDS_PowerActionSleep "Stand by" + IDS_PowerActionHibernate "Hibernar" + IDS_PowerActionShutdown "Desligar" + IDS_PowerActionRestart "Reiniciar" + IDS_PowerActionShutdownOff "Desligar e desligar a energia" + IDS_PowerActionWarmEject "Perguntar o que fazer" + IDS_PowerActionNone2 "Nenhum" + IDS_TIMEOUT1 "Após 1 min" + IDS_TIMEOUT2 "Após 2 mins" + IDS_TIMEOUT3 "Após 3 mins" + IDS_TIMEOUT4 "Após 5 mins" + IDS_TIMEOUT5 "Após 10 mins" + IDS_TIMEOUT6 "Após 15 mins" + IDS_TIMEOUT7 "Após 20 mins" + IDS_TIMEOUT8 "Após 25 mins" + IDS_TIMEOUT9 "Após 30 mins" + IDS_TIMEOUT10 "Após 45 mins" + IDS_TIMEOUT11 "Após 1 hour" + IDS_TIMEOUT12 "Após 2 hours" + IDS_TIMEOUT13 "Após 3 hours" + IDS_TIMEOUT14 "Após 4 hours" + IDS_TIMEOUT15 "Após 5 hours" + IDS_TIMEOUT16 "Nunca" + IDS_DEL_SCHEME "Tem certeza de que deseja excluir o esquema de energia: ""%s""?" + IDS_DEL_SCHEME_TITLE "Excluir esquema" +END diff --git a/dll/cpl/powercfg/powercfg.rc b/dll/cpl/powercfg/powercfg.rc index fe8d61acdd1..e8985c631f2 100644 --- a/dll/cpl/powercfg/powercfg.rc +++ b/dll/cpl/powercfg/powercfg.rc @@ -65,6 +65,9 @@ IDI_HIBERNATE ICON "resources/hibernate.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

4 years, 9 months

[reactos] 01/01: [USER32] Relax conditions for creating MDI windows (#2454)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8c5308b5e8be4e6db41a9… commit 8c5308b5e8be4e6db41a9e2c0a2fdb096c64cfd4 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Mar 20 07:38:33 2020 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Mar 20 07:38:33 2020 +0900 [USER32] Relax conditions for creating MDI windows (#2454) The creation conditions of MDI window was too strict. CORE-15633 --- win32ss/user/user32/windows/window.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/win32ss/user/user32/windows/window.c b/win32ss/user/user32/windows/window.c index e94d9a1b250..40f051d3b6d 100644 --- a/win32ss/user/user32/windows/window.c +++ b/win32ss/user/user32/windows/window.c @@ -411,7 +411,7 @@ CreateWindowExA(DWORD dwExStyle, if (pWndParent->fnid != FNID_MDICLIENT) // wine uses WIN_ISMDICLIENT { WARN("WS_EX_MDICHILD, but parent %p is not MDIClient\n", hWndParent); - return NULL; + goto skip_mdi; } /* lpParams of WM_[NC]CREATE is different for MDI children. @@ -477,6 +477,7 @@ CreateWindowExA(DWORD dwExStyle, } } +skip_mdi: hwnd = User32CreateWindowEx(dwExStyle, lpClassName, lpWindowName, @@ -536,7 +537,7 @@ CreateWindowExW(DWORD dwExStyle, if (pWndParent->fnid != FNID_MDICLIENT) { WARN("WS_EX_MDICHILD, but parent %p is not MDIClient\n", hWndParent); - return NULL; + goto skip_mdi; } /* lpParams of WM_[NC]CREATE is different for MDI children. @@ -602,6 +603,7 @@ CreateWindowExW(DWORD dwExStyle, } } +skip_mdi: hwnd = User32CreateWindowEx(dwExStyle, (LPCSTR)lpClassName, (LPCSTR)lpWindowName,

4 years, 9 months

[reactos] 01/01: [USER32_APITEST] Strengthen DrawText testcase (#2450)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1816e4f6cbc6f034397c2… commit 1816e4f6cbc6f034397c28dbffca54698a38088c Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Mar 17 23:24:11 2020 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Mar 17 23:24:11 2020 +0900 [USER32_APITEST] Strengthen DrawText testcase (#2450) Add uFormat and pszText parameters into user32_apitest DrawText testcase. CORE-16753 --- modules/rostests/apitests/user32/DrawText.c | 477 +++++++++++++++++++++------- 1 file changed, 358 insertions(+), 119 deletions(-) diff --git a/modules/rostests/apitests/user32/DrawText.c b/modules/rostests/apitests/user32/DrawText.c index 600f0828a34..e560fa8c75c 100644 --- a/modules/rostests/apitests/user32/DrawText.c +++ b/modules/rostests/apitests/user32/DrawText.c @@ -2,7 +2,7 @@ * PROJECT: ReactOS API tests * LICENSE: LGPL-2.1+ (https://spdx.org/licenses/LGPL-2.1+) * PURPOSE: Test for DrawText - * COPYRIGHT: Copyright 2019 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> + * COPYRIGHT: Copyright 2019-2020 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> */ #include "precomp.h" @@ -16,137 +16,336 @@ typedef struct YY typedef struct TEST_ENTRY { INT line; + UINT uFormat; + LPCSTR pszText; INT ret; LONG font_height; - YY input; + RECT input; YY output; } TEST_ENTRY; +#define DT_1 (DT_CALCRECT | DT_SINGLELINE | DT_LEFT | DT_TOP) +#define DT_2 (DT_CALCRECT | DT_SINGLELINE | DT_LEFT | DT_VCENTER) +#define DT_3 (DT_CALCRECT | DT_LEFT | DT_TOP) +#define DT_4 (DT_CALCRECT | DT_LEFT | DT_VCENTER) +#define DT_5 (DT_CALCRECT | DT_LEFT | DT_TOP | DT_EDITCONTROL) + +#define DT_6 (DT_SINGLELINE | DT_LEFT | DT_TOP) +#define DT_7 (DT_SINGLELINE | DT_LEFT | DT_VCENTER) +#define DT_8 (DT_LEFT | DT_TOP) +#define DT_9 (DT_LEFT | DT_VCENTER) +#define DT_10 (DT_LEFT | DT_TOP | DT_EDITCONTROL) + static const TEST_ENTRY s_entries[] = { - { __LINE__, 5, -10, { 0, -2 }, { 0, 5 } }, - { __LINE__, 6, -10, { 0, -1 }, { 0, 6 } }, - { __LINE__, 6, -10, { 0, 0 }, { 0, 6 } }, - { __LINE__, 7, -10, { 0, 1 }, { 0, 7 } }, - { __LINE__, 7, -10, { 0, 2 }, { 0, 7 } }, - { __LINE__, 8, -10, { 0, 3 }, { 0, 8 } }, - { __LINE__, 8, -10, { 0, 4 }, { 0, 8 } }, - { __LINE__, 9, -10, { 0, 5 }, { 0, 9 } }, - { __LINE__, 9, -10, { 0, 6 }, { 0, 9 } }, - { __LINE__, 10, -10, { 0, 7 }, { 0, 10 } }, - { __LINE__, 10, -10, { 0, 8 }, { 0, 10 } }, - { __LINE__, 11, -10, { 0, 9 }, { 0, 11 } }, - { __LINE__, 11, -10, { 0, 10 }, { 0, 11 } }, - { __LINE__, 12, -10, { 0, 11 }, { 0, 12 } }, - { __LINE__, 12, -10, { 0, 12 }, { 0, 12 } }, - { __LINE__, 12, -10, { 0, 13 }, { 0, 12 } }, - { __LINE__, 13, -10, { 0, 14 }, { 0, 13 } }, - { __LINE__, 13, -10, { 0, 15 }, { 0, 13 } }, - - { __LINE__, 5, -10, { 1, -2 }, { 1, 6 } }, - { __LINE__, 5, -10, { 1, -1 }, { 1, 6 } }, - { __LINE__, 6, -10, { 1, 0 }, { 1, 7 } }, - { __LINE__, 6, -10, { 1, 1 }, { 1, 7 } }, - { __LINE__, 7, -10, { 1, 2 }, { 1, 8 } }, - { __LINE__, 7, -10, { 1, 3 }, { 1, 8 } }, - { __LINE__, 8, -10, { 1, 4 }, { 1, 9 } }, - { __LINE__, 8, -10, { 1, 5 }, { 1, 9 } }, - { __LINE__, 9, -10, { 1, 6 }, { 1, 10 } }, - { __LINE__, 9, -10, { 1, 7 }, { 1, 10 } }, - { __LINE__, 10, -10, { 1, 8 }, { 1, 11 } }, - { __LINE__, 10, -10, { 1, 9 }, { 1, 11 } }, - { __LINE__, 11, -10, { 1, 10 }, { 1, 12 } }, - { __LINE__, 11, -10, { 1, 11 }, { 1, 12 } }, - { __LINE__, 12, -10, { 1, 12 }, { 1, 13 } }, - { __LINE__, 12, -10, { 1, 13 }, { 1, 13 } }, - { __LINE__, 12, -10, { 1, 14 }, { 1, 13 } }, - { __LINE__, 13, -10, { 1, 15 }, { 1, 14 } }, - - { __LINE__, 6, -11, { 0, -2 }, { 0, 6 } }, - { __LINE__, 6, -11, { 0, -1 }, { 0, 6 } }, - { __LINE__, 7, -11, { 0, 0 }, { 0, 7 } }, - { __LINE__, 7, -11, { 0, 1 }, { 0, 7 } }, - { __LINE__, 8, -11, { 0, 2 }, { 0, 8 } }, - { __LINE__, 8, -11, { 0, 3 }, { 0, 8 } }, - { __LINE__, 9, -11, { 0, 4 }, { 0, 9 } }, - { __LINE__, 9, -11, { 0, 5 }, { 0, 9 } }, - { __LINE__, 10, -11, { 0, 6 }, { 0, 10 } }, - { __LINE__, 10, -11, { 0, 7 }, { 0, 10 } }, - { __LINE__, 11, -11, { 0, 8 }, { 0, 11 } }, - { __LINE__, 11, -11, { 0, 9 }, { 0, 11 } }, - { __LINE__, 12, -11, { 0, 10 }, { 0, 12 } }, - { __LINE__, 12, -11, { 0, 11 }, { 0, 12 } }, - { __LINE__, 13, -11, { 0, 12 }, { 0, 13 } }, - { __LINE__, 13, -11, { 0, 13 }, { 0, 13 } }, - { __LINE__, 13, -11, { 0, 13 }, { 0, 13 } }, - { __LINE__, 14, -11, { 0, 15 }, { 0, 14 } }, - - { __LINE__, 5, -11, { 1, -2 }, { 1, 6 } }, - { __LINE__, 6, -11, { 1, -1 }, { 1, 7 } }, - { __LINE__, 6, -11, { 1, 0 }, { 1, 7 } }, - { __LINE__, 7, -11, { 1, 1 }, { 1, 8 } }, - { __LINE__, 7, -11, { 1, 2 }, { 1, 8 } }, - { __LINE__, 8, -11, { 1, 3 }, { 1, 9 } }, - { __LINE__, 8, -11, { 1, 4 }, { 1, 9 } }, - { __LINE__, 9, -11, { 1, 5 }, { 1, 10 } }, - { __LINE__, 9, -11, { 1, 6 }, { 1, 10 } }, - { __LINE__, 10, -11, { 1, 7 }, { 1, 11 } }, - { __LINE__, 10, -11, { 1, 8 }, { 1, 11 } }, - { __LINE__, 11, -11, { 1, 9 }, { 1, 12 } }, - { __LINE__, 11, -11, { 1, 10 }, { 1, 12 } }, - { __LINE__, 12, -11, { 1, 11 }, { 1, 13 } }, - { __LINE__, 12, -11, { 1, 12 }, { 1, 13 } }, - { __LINE__, 13, -11, { 1, 13 }, { 1, 14 } }, - { __LINE__, 13, -11, { 1, 14 }, { 1, 14 } }, - { __LINE__, 13, -11, { 1, 15 }, { 1, 14 } }, - - { __LINE__, 6, -12, { 0, -2 }, { 0, 6 } }, - { __LINE__, 7, -12, { 0, -1 }, { 0, 7 } }, - { __LINE__, 7, -12, { 0, 0 }, { 0, 7 } }, - { __LINE__, 8, -12, { 0, 1 }, { 0, 8 } }, - { __LINE__, 8, -12, { 0, 2 }, { 0, 8 } }, - { __LINE__, 9, -12, { 0, 3 }, { 0, 9 } }, - { __LINE__, 9, -12, { 0, 4 }, { 0, 9 } }, - { __LINE__, 10, -12, { 0, 5 }, { 0, 10 } }, - { __LINE__, 10, -12, { 0, 6 }, { 0, 10 } }, - { __LINE__, 11, -12, { 0, 7 }, { 0, 11 } }, - { __LINE__, 11, -12, { 0, 8 }, { 0, 11 } }, - { __LINE__, 12, -12, { 0, 9 }, { 0, 12 } }, - { __LINE__, 12, -12, { 0, 10 }, { 0, 12 } }, - { __LINE__, 13, -12, { 0, 11 }, { 0, 13 } }, - { __LINE__, 13, -12, { 0, 12 }, { 0, 13 } }, - { __LINE__, 14, -12, { 0, 13 }, { 0, 14 } }, - { __LINE__, 14, -12, { 0, 14 }, { 0, 14 } }, - { __LINE__, 14, -12, { 0, 15 }, { 0, 14 } }, - - { __LINE__, 6, -12, { 1, -2 }, { 1, 7 } }, - { __LINE__, 6, -12, { 1, -1 }, { 1, 7 } }, - { __LINE__, 7, -12, { 1, 0 }, { 1, 8 } }, - { __LINE__, 7, -12, { 1, 1 }, { 1, 8 } }, - { __LINE__, 8, -12, { 1, 2 }, { 1, 9 } }, - { __LINE__, 8, -12, { 1, 3 }, { 1, 9 } }, - { __LINE__, 9, -12, { 1, 4 }, { 1, 10 } }, - { __LINE__, 9, -12, { 1, 5 }, { 1, 10 } }, - { __LINE__, 10, -12, { 1, 6 }, { 1, 11 } }, - { __LINE__, 10, -12, { 1, 7 }, { 1, 11 } }, - { __LINE__, 11, -12, { 1, 8 }, { 1, 12 } }, - { __LINE__, 11, -12, { 1, 9 }, { 1, 12 } }, - { __LINE__, 12, -12, { 1, 10 }, { 1, 13 } }, - { __LINE__, 12, -12, { 1, 11 }, { 1, 13 } }, - { __LINE__, 13, -12, { 1, 12 }, { 1, 14 } }, - { __LINE__, 13, -12, { 1, 13 }, { 1, 14 } }, - { __LINE__, 14, -12, { 1, 14 }, { 1, 15 } }, - { __LINE__, 14, -12, { 1, 15 }, { 1, 15 } }, + { __LINE__, DT_1, "ABCabc123g", 12, -10, { 0, 0, 0, -2 }, { 0, 12 } }, + { __LINE__, DT_1, "ABCabc123g", 12, -10, { 0, 0, 0, -1 }, { 0, 12 } }, + { __LINE__, DT_1, "ABCabc123g", 12, -10, { 0, 0, 0, 0 }, { 0, 12 } }, + { __LINE__, DT_1, "ABCabc123g", 12, -10, { 0, 0, 0, 1 }, { 0, 12 } }, + { __LINE__, DT_1, "ABCabc123g", 12, -10, { 0, 0, 0, 2 }, { 0, 12 } }, + { __LINE__, DT_1, "ABCabc123g", 12, -10, { 0, 0, 0, 3 }, { 0, 12 } }, + { __LINE__, DT_1, "ABCabc123g", 12, -10, { 0, 0, 0, 4 }, { 0, 12 } }, + { __LINE__, DT_1, "ABCabc123g", 12, -10, { 0, 0, 0, 5 }, { 0, 12 } }, + { __LINE__, DT_1, "ABCabc123g", 12, -10, { 0, 0, 0, 6 }, { 0, 12 } }, + + { __LINE__, DT_1, "ABCabc123g", 13, -11, { 0, 0, 0, -2 }, { 0, 13 } }, + { __LINE__, DT_1, "ABCabc123g", 13, -11, { 0, 0, 0, -1 }, { 0, 13 } }, + { __LINE__, DT_1, "ABCabc123g", 13, -11, { 0, 0, 0, 0 }, { 0, 13 } }, + { __LINE__, DT_1, "ABCabc123g", 13, -11, { 0, 0, 0, 1 }, { 0, 13 } }, + { __LINE__, DT_1, "ABCabc123g", 13, -11, { 0, 0, 0, 2 }, { 0, 13 } }, + { __LINE__, DT_1, "ABCabc123g", 13, -11, { 0, 0, 0, 3 }, { 0, 13 } }, + { __LINE__, DT_1, "ABCabc123g", 13, -11, { 0, 0, 0, 4 }, { 0, 13 } }, + { __LINE__, DT_1, "ABCabc123g", 13, -11, { 0, 0, 0, 5 }, { 0, 13 } }, + { __LINE__, DT_1, "ABCabc123g", 13, -11, { 0, 0, 0, 6 }, { 0, 13 } }, + + { __LINE__, DT_1, "ABCabc123g", 14, -12, { 0, 0, 0, -2 }, { 0, 14 } }, + { __LINE__, DT_1, "ABCabc123g", 14, -12, { 0, 0, 0, -1 }, { 0, 14 } }, + { __LINE__, DT_1, "ABCabc123g", 14, -12, { 0, 0, 0, 0 }, { 0, 14 } }, + { __LINE__, DT_1, "ABCabc123g", 14, -12, { 0, 0, 0, 1 }, { 0, 14 } }, + { __LINE__, DT_1, "ABCabc123g", 14, -12, { 0, 0, 0, 2 }, { 0, 14 } }, + { __LINE__, DT_1, "ABCabc123g", 14, -12, { 0, 0, 0, 3 }, { 0, 14 } }, + { __LINE__, DT_1, "ABCabc123g", 14, -12, { 0, 0, 0, 4 }, { 0, 14 } }, + { __LINE__, DT_1, "ABCabc123g", 14, -12, { 0, 0, 0, 5 }, { 0, 14 } }, + { __LINE__, DT_1, "ABCabc123g", 14, -12, { 0, 0, 0, 6 }, { 0, 14 } }, + + { __LINE__, DT_2, "ABCabc123g", 5, -10, { 0, 0, 0, -2 }, { 0, 5 } }, + { __LINE__, DT_2, "ABCabc123g", 6, -10, { 0, 0, 0, -1 }, { 0, 6 } }, + { __LINE__, DT_2, "ABCabc123g", 6, -10, { 0, 0, 0, 0 }, { 0, 6 } }, + { __LINE__, DT_2, "ABCabc123g", 7, -10, { 0, 0, 0, 1 }, { 0, 7 } }, + { __LINE__, DT_2, "ABCabc123g", 7, -10, { 0, 0, 0, 2 }, { 0, 7 } }, + { __LINE__, DT_2, "ABCabc123g", 8, -10, { 0, 0, 0, 3 }, { 0, 8 } }, + { __LINE__, DT_2, "ABCabc123g", 8, -10, { 0, 0, 0, 4 }, { 0, 8 } }, + { __LINE__, DT_2, "ABCabc123g", 9, -10, { 0, 0, 0, 5 }, { 0, 9 } }, + { __LINE__, DT_2, "ABCabc123g", 9, -10, { 0, 0, 0, 6 }, { 0, 9 } }, + + { __LINE__, DT_2, "ABCabc123g", 6, -11, { 0, 0, 0, -2 }, { 0, 6 } }, + { __LINE__, DT_2, "ABCabc123g", 6, -11, { 0, 0, 0, -1 }, { 0, 6 } }, + { __LINE__, DT_2, "ABCabc123g", 7, -11, { 0, 0, 0, 0 }, { 0, 7 } }, + { __LINE__, DT_2, "ABCabc123g", 7, -11, { 0, 0, 0, 1 }, { 0, 7 } }, + { __LINE__, DT_2, "ABCabc123g", 8, -11, { 0, 0, 0, 2 }, { 0, 8 } }, + { __LINE__, DT_2, "ABCabc123g", 8, -11, { 0, 0, 0, 3 }, { 0, 8 } }, + { __LINE__, DT_2, "ABCabc123g", 9, -11, { 0, 0, 0, 4 }, { 0, 9 } }, + { __LINE__, DT_2, "ABCabc123g", 9, -11, { 0, 0, 0, 5 }, { 0, 9 } }, + { __LINE__, DT_2, "ABCabc123g", 10, -11, { 0, 0, 0, 6 }, { 0, 10 } }, + + { __LINE__, DT_2, "ABCabc123g", 6, -12, { 0, 0, 0, -2 }, { 0, 6 } }, + { __LINE__, DT_2, "ABCabc123g", 7, -12, { 0, 0, 0, -1 }, { 0, 7 } }, + { __LINE__, DT_2, "ABCabc123g", 7, -12, { 0, 0, 0, 0 }, { 0, 7 } }, + { __LINE__, DT_2, "ABCabc123g", 8, -12, { 0, 0, 0, 1 }, { 0, 8 } }, + { __LINE__, DT_2, "ABCabc123g", 8, -12, { 0, 0, 0, 2 }, { 0, 8 } }, + { __LINE__, DT_2, "ABCabc123g", 9, -12, { 0, 0, 0, 3 }, { 0, 9 } }, + { __LINE__, DT_2, "ABCabc123g", 9, -12, { 0, 0, 0, 4 }, { 0, 9 } }, + { __LINE__, DT_2, "ABCabc123g", 10, -12, { 0, 0, 0, 5 }, { 0, 10 } }, + { __LINE__, DT_2, "ABCabc123g", 10, -12, { 0, 0, 0, 6 }, { 0, 10 } }, + + { __LINE__, DT_3, "ABCabc\n123g", 24, -10, { 0, 0, 0, -2 }, { 0, 24 } }, + { __LINE__, DT_3, "ABCabc\n123g", 24, -10, { 0, 0, 0, -1 }, { 0, 24 } }, + { __LINE__, DT_3, "ABCabc\n123g", 24, -10, { 0, 0, 0, 0 }, { 0, 24 } }, + { __LINE__, DT_3, "ABCabc\n123g", 24, -10, { 0, 0, 0, 1 }, { 0, 24 } }, + { __LINE__, DT_3, "ABCabc\n123g", 24, -10, { 0, 0, 0, 2 }, { 0, 24 } }, + { __LINE__, DT_3, "ABCabc\n123g", 24, -10, { 0, 0, 0, 3 }, { 0, 24 } }, + { __LINE__, DT_3, "ABCabc\n123g", 24, -10, { 0, 0, 0, 4 }, { 0, 24 } }, + { __LINE__, DT_3, "ABCabc\n123g", 24, -10, { 0, 0, 0, 5 }, { 0, 24 } }, + { __LINE__, DT_3, "ABCabc\n123g", 24, -10, { 0, 0, 0, 6 }, { 0, 24 } }, + + { __LINE__, DT_3, "ABCabc\n123g", 26, -11, { 0, 0, 0, -2 }, { 0, 26 } }, + { __LINE__, DT_3, "ABCabc\n123g", 26, -11, { 0, 0, 0, -1 }, { 0, 26 } }, + { __LINE__, DT_3, "ABCabc\n123g", 26, -11, { 0, 0, 0, 0 }, { 0, 26 } }, + { __LINE__, DT_3, "ABCabc\n123g", 26, -11, { 0, 0, 0, 1 }, { 0, 26 } }, + { __LINE__, DT_3, "ABCabc\n123g", 26, -11, { 0, 0, 0, 2 }, { 0, 26 } }, + { __LINE__, DT_3, "ABCabc\n123g", 26, -11, { 0, 0, 0, 3 }, { 0, 26 } }, + { __LINE__, DT_3, "ABCabc\n123g", 26, -11, { 0, 0, 0, 4 }, { 0, 26 } }, + { __LINE__, DT_3, "ABCabc\n123g", 26, -11, { 0, 0, 0, 5 }, { 0, 26 } }, + { __LINE__, DT_3, "ABCabc\n123g", 26, -11, { 0, 0, 0, 6 }, { 0, 26 } }, + + { __LINE__, DT_3, "ABCabc\n123g", 28, -12, { 0, 0, 0, -2 }, { 0, 28 } }, + { __LINE__, DT_3, "ABCabc\n123g", 28, -12, { 0, 0, 0, -1 }, { 0, 28 } }, + { __LINE__, DT_3, "ABCabc\n123g", 28, -12, { 0, 0, 0, 0 }, { 0, 28 } }, + { __LINE__, DT_3, "ABCabc\n123g", 28, -12, { 0, 0, 0, 1 }, { 0, 28 } }, + { __LINE__, DT_3, "ABCabc\n123g", 28, -12, { 0, 0, 0, 2 }, { 0, 28 } }, + { __LINE__, DT_3, "ABCabc\n123g", 28, -12, { 0, 0, 0, 3 }, { 0, 28 } }, + { __LINE__, DT_3, "ABCabc\n123g", 28, -12, { 0, 0, 0, 4 }, { 0, 28 } }, + { __LINE__, DT_3, "ABCabc\n123g", 28, -12, { 0, 0, 0, 5 }, { 0, 28 } }, + { __LINE__, DT_3, "ABCabc\n123g", 28, -12, { 0, 0, 0, 6 }, { 0, 28 } }, + + { __LINE__, DT_4, "ABCabc\n123g", 24, -10, { 0, 0, 0, -2 }, { 0, 24 } }, + { __LINE__, DT_4, "ABCabc\n123g", 24, -10, { 0, 0, 0, -1 }, { 0, 24 } }, + { __LINE__, DT_4, "ABCabc\n123g", 24, -10, { 0, 0, 0, 0 }, { 0, 24 } }, + { __LINE__, DT_4, "ABCabc\n123g", 24, -10, { 0, 0, 0, 1 }, { 0, 24 } }, + { __LINE__, DT_4, "ABCabc\n123g", 24, -10, { 0, 0, 0, 2 }, { 0, 24 } }, + { __LINE__, DT_4, "ABCabc\n123g", 24, -10, { 0, 0, 0, 3 }, { 0, 24 } }, + { __LINE__, DT_4, "ABCabc\n123g", 24, -10, { 0, 0, 0, 4 }, { 0, 24 } }, + { __LINE__, DT_4, "ABCabc\n123g", 24, -10, { 0, 0, 0, 5 }, { 0, 24 } }, + { __LINE__, DT_4, "ABCabc\n123g", 24, -10, { 0, 0, 0, 6 }, { 0, 24 } }, + + { __LINE__, DT_4, "ABCabc\n123g", 26, -11, { 0, 0, 0, -2 }, { 0, 26 } }, + { __LINE__, DT_4, "ABCabc\n123g", 26, -11, { 0, 0, 0, -1 }, { 0, 26 } }, + { __LINE__, DT_4, "ABCabc\n123g", 26, -11, { 0, 0, 0, 0 }, { 0, 26 } }, + { __LINE__, DT_4, "ABCabc\n123g", 26, -11, { 0, 0, 0, 1 }, { 0, 26 } }, + { __LINE__, DT_4, "ABCabc\n123g", 26, -11, { 0, 0, 0, 2 }, { 0, 26 } }, + { __LINE__, DT_4, "ABCabc\n123g", 26, -11, { 0, 0, 0, 3 }, { 0, 26 } }, + { __LINE__, DT_4, "ABCabc\n123g", 26, -11, { 0, 0, 0, 4 }, { 0, 26 } }, + { __LINE__, DT_4, "ABCabc\n123g", 26, -11, { 0, 0, 0, 5 }, { 0, 26 } }, + { __LINE__, DT_4, "ABCabc\n123g", 26, -11, { 0, 0, 0, 6 }, { 0, 26 } }, + + { __LINE__, DT_4, "ABCabc\n123g", 28, -12, { 0, 0, 0, -2 }, { 0, 28 } }, + { __LINE__, DT_4, "ABCabc\n123g", 28, -12, { 0, 0, 0, -1 }, { 0, 28 } }, + { __LINE__, DT_4, "ABCabc\n123g", 28, -12, { 0, 0, 0, 0 }, { 0, 28 } }, + { __LINE__, DT_4, "ABCabc\n123g", 28, -12, { 0, 0, 0, 1 }, { 0, 28 } }, + { __LINE__, DT_4, "ABCabc\n123g", 28, -12, { 0, 0, 0, 2 }, { 0, 28 } }, + { __LINE__, DT_4, "ABCabc\n123g", 28, -12, { 0, 0, 0, 3 }, { 0, 28 } }, + { __LINE__, DT_4, "ABCabc\n123g", 28, -12, { 0, 0, 0, 4 }, { 0, 28 } }, + { __LINE__, DT_4, "ABCabc\n123g", 28, -12, { 0, 0, 0, 5 }, { 0, 28 } }, + { __LINE__, DT_4, "ABCabc\n123g", 28, -12, { 0, 0, 0, 6 }, { 0, 28 } }, + + { __LINE__, DT_5, "ABCabc\n123g", 24, -10, { 0, 0, 0, -2 }, { 0, 24 } }, + { __LINE__, DT_5, "ABCabc\n123g", 24, -10, { 0, 0, 0, -1 }, { 0, 24 } }, + { __LINE__, DT_5, "ABCabc\n123g", 24, -10, { 0, 0, 0, 0 }, { 0, 24 } }, + { __LINE__, DT_5, "ABCabc\n123g", 24, -10, { 0, 0, 0, 1 }, { 0, 24 } }, + { __LINE__, DT_5, "ABCabc\n123g", 24, -10, { 0, 0, 0, 2 }, { 0, 24 } }, + { __LINE__, DT_5, "ABCabc\n123g", 24, -10, { 0, 0, 0, 3 }, { 0, 24 } }, + { __LINE__, DT_5, "ABCabc\n123g", 24, -10, { 0, 0, 0, 4 }, { 0, 24 } }, + { __LINE__, DT_5, "ABCabc\n123g", 24, -10, { 0, 0, 0, 5 }, { 0, 24 } }, + { __LINE__, DT_5, "ABCabc\n123g", 24, -10, { 0, 0, 0, 6 }, { 0, 24 } }, + + { __LINE__, DT_5, "ABCabc\n123g", 26, -11, { 0, 0, 0, -2 }, { 0, 26 } }, + { __LINE__, DT_5, "ABCabc\n123g", 26, -11, { 0, 0, 0, -1 }, { 0, 26 } }, + { __LINE__, DT_5, "ABCabc\n123g", 26, -11, { 0, 0, 0, 0 }, { 0, 26 } }, + { __LINE__, DT_5, "ABCabc\n123g", 26, -11, { 0, 0, 0, 1 }, { 0, 26 } }, + { __LINE__, DT_5, "ABCabc\n123g", 26, -11, { 0, 0, 0, 2 }, { 0, 26 } }, + { __LINE__, DT_5, "ABCabc\n123g", 26, -11, { 0, 0, 0, 3 }, { 0, 26 } }, + { __LINE__, DT_5, "ABCabc\n123g", 26, -11, { 0, 0, 0, 4 }, { 0, 26 } }, + { __LINE__, DT_5, "ABCabc\n123g", 26, -11, { 0, 0, 0, 5 }, { 0, 26 } }, + { __LINE__, DT_5, "ABCabc\n123g", 26, -11, { 0, 0, 0, 6 }, { 0, 26 } }, + + { __LINE__, DT_5, "ABCabc\n123g", 28, -12, { 0, 0, 0, -2 }, { 0, 28 } }, + { __LINE__, DT_5, "ABCabc\n123g", 28, -12, { 0, 0, 0, -1 }, { 0, 28 } }, + { __LINE__, DT_5, "ABCabc\n123g", 28, -12, { 0, 0, 0, 0 }, { 0, 28 } }, + { __LINE__, DT_5, "ABCabc\n123g", 28, -12, { 0, 0, 0, 1 }, { 0, 28 } }, + { __LINE__, DT_5, "ABCabc\n123g", 28, -12, { 0, 0, 0, 2 }, { 0, 28 } }, + { __LINE__, DT_5, "ABCabc\n123g", 28, -12, { 0, 0, 0, 3 }, { 0, 28 } }, + { __LINE__, DT_5, "ABCabc\n123g", 28, -12, { 0, 0, 0, 4 }, { 0, 28 } }, + { __LINE__, DT_5, "ABCabc\n123g", 28, -12, { 0, 0, 0, 5 }, { 0, 28 } }, + { __LINE__, DT_5, "ABCabc\n123g", 28, -12, { 0, 0, 0, 6 }, { 0, 28 } }, + + { __LINE__, DT_6, "ABCabc123g", 10, -8, { 0, 1, 30, 15 - 2 }, { 1, 12 } }, + { __LINE__, DT_6, "ABCabc123g", 10, -8, { 0, 1, 30, 15 - 1 }, { 1, 13 } }, + { __LINE__, DT_6, "ABCabc123g", 10, -8, { 0, 1, 30, 15 + 0 }, { 1, 14 } }, + { __LINE__, DT_6, "ABCabc123g", 10, -8, { 0, 1, 30, 15 + 1 }, { 1, 15 } }, + { __LINE__, DT_6, "ABCabc123g", 10, -8, { 0, 1, 30, 15 + 2 }, { 1, 16 } }, + { __LINE__, DT_6, "ABCabc123g", 10, -8, { 0, 1, 30, 15 + 3 }, { 1, 17 } }, + { __LINE__, DT_6, "ABCabc123g", 10, -8, { 0, 1, 30, 15 + 4 }, { 1, 18 } }, + { __LINE__, DT_6, "ABCabc123g", 10, -8, { 0, 1, 30, 15 + 5 }, { 1, 19 } }, + { __LINE__, DT_6, "ABCabc123g", 10, -8, { 0, 1, 30, 15 + 6 }, { 1, 20 } }, + + { __LINE__, DT_6, "ABCabc123g", 11, -9, { 0, 1, 30, 15 - 2 }, { 1, 12 } }, + { __LINE__, DT_6, "ABCabc123g", 11, -9, { 0, 1, 30, 15 - 1 }, { 1, 13 } }, + { __LINE__, DT_6, "ABCabc123g", 11, -9, { 0, 1, 30, 15 + 0 }, { 1, 14 } }, + { __LINE__, DT_6, "ABCabc123g", 11, -9, { 0, 1, 30, 15 + 1 }, { 1, 15 } }, + { __LINE__, DT_6, "ABCabc123g", 11, -9, { 0, 1, 30, 15 + 2 }, { 1, 16 } }, + { __LINE__, DT_6, "ABCabc123g", 11, -9, { 0, 1, 30, 15 + 3 }, { 1, 17 } }, + { __LINE__, DT_6, "ABCabc123g", 11, -9, { 0, 1, 30, 15 + 4 }, { 1, 18 } }, + { __LINE__, DT_6, "ABCabc123g", 11, -9, { 0, 1, 30, 15 + 5 }, { 1, 19 } }, + { __LINE__, DT_6, "ABCabc123g", 11, -9, { 0, 1, 30, 15 + 6 }, { 1, 20 } }, + + { __LINE__, DT_6, "ABCabc123g", 12, -10, { 0, 1, 30, 15 - 2 }, { 1, 12 } }, + { __LINE__, DT_6, "ABCabc123g", 12, -10, { 0, 1, 30, 15 - 1 }, { 1, 13 } }, + { __LINE__, DT_6, "ABCabc123g", 12, -10, { 0, 1, 30, 15 + 0 }, { 1, 14 } }, + { __LINE__, DT_6, "ABCabc123g", 12, -10, { 0, 1, 30, 15 + 1 }, { 1, 15 } }, + { __LINE__, DT_6, "ABCabc123g", 12, -10, { 0, 1, 30, 15 + 2 }, { 1, 16 } }, + { __LINE__, DT_6, "ABCabc123g", 12, -10, { 0, 1, 30, 15 + 3 }, { 1, 17 } }, + { __LINE__, DT_6, "ABCabc123g", 12, -10, { 0, 1, 30, 15 + 4 }, { 1, 18 } }, + { __LINE__, DT_6, "ABCabc123g", 12, -10, { 0, 1, 30, 15 + 5 }, { 1, 19 } }, + { __LINE__, DT_6, "ABCabc123g", 12, -10, { 0, 1, 30, 15 + 6 }, { 1, 20 } }, + + { __LINE__, DT_7, "ABCabc123g", 11, -8, { 0, 1, 30, 15 - 2 }, { 1, 12 } }, + { __LINE__, DT_7, "ABCabc123g", 11, -8, { 0, 1, 30, 15 - 1 }, { 1, 13 } }, + { __LINE__, DT_7, "ABCabc123g", 12, -8, { 0, 1, 30, 15 + 0 }, { 1, 14 } }, + { __LINE__, DT_7, "ABCabc123g", 12, -8, { 0, 1, 30, 15 + 1 }, { 1, 15 } }, + { __LINE__, DT_7, "ABCabc123g", 13, -8, { 0, 1, 30, 15 + 2 }, { 1, 16 } }, + { __LINE__, DT_7, "ABCabc123g", 13, -8, { 0, 1, 30, 15 + 3 }, { 1, 17 } }, + { __LINE__, DT_7, "ABCabc123g", 14, -8, { 0, 1, 30, 15 + 4 }, { 1, 18 } }, + { __LINE__, DT_7, "ABCabc123g", 14, -8, { 0, 1, 30, 15 + 5 }, { 1, 19 } }, + { __LINE__, DT_7, "ABCabc123g", 15, -8, { 0, 1, 30, 15 + 6 }, { 1, 20 } }, + + { __LINE__, DT_7, "ABCabc123g", 11, -9, { 0, 1, 30, 15 - 2 }, { 1, 12 } }, + { __LINE__, DT_7, "ABCabc123g", 12, -9, { 0, 1, 30, 15 - 1 }, { 1, 13 } }, + { __LINE__, DT_7, "ABCabc123g", 12, -9, { 0, 1, 30, 15 + 0 }, { 1, 14 } }, + { __LINE__, DT_7, "ABCabc123g", 13, -9, { 0, 1, 30, 15 + 1 }, { 1, 15 } }, + { __LINE__, DT_7, "ABCabc123g", 13, -9, { 0, 1, 30, 15 + 2 }, { 1, 16 } }, + { __LINE__, DT_7, "ABCabc123g", 14, -9, { 0, 1, 30, 15 + 3 }, { 1, 17 } }, + { __LINE__, DT_7, "ABCabc123g", 14, -9, { 0, 1, 30, 15 + 4 }, { 1, 18 } }, + { __LINE__, DT_7, "ABCabc123g", 15, -9, { 0, 1, 30, 15 + 5 }, { 1, 19 } }, + { __LINE__, DT_7, "ABCabc123g", 15, -9, { 0, 1, 30, 15 + 6 }, { 1, 20 } }, + + { __LINE__, DT_7, "ABCabc123g", 12, -10, { 0, 1, 30, 15 - 2 }, { 1, 12 } }, + { __LINE__, DT_7, "ABCabc123g", 12, -10, { 0, 1, 30, 15 - 1 }, { 1, 13 } }, + { __LINE__, DT_7, "ABCabc123g", 13, -10, { 0, 1, 30, 15 + 0 }, { 1, 14 } }, + { __LINE__, DT_7, "ABCabc123g", 13, -10, { 0, 1, 30, 15 + 1 }, { 1, 15 } }, + { __LINE__, DT_7, "ABCabc123g", 14, -10, { 0, 1, 30, 15 + 2 }, { 1, 16 } }, + { __LINE__, DT_7, "ABCabc123g", 14, -10, { 0, 1, 30, 15 + 3 }, { 1, 17 } }, + { __LINE__, DT_7, "ABCabc123g", 15, -10, { 0, 1, 30, 15 + 4 }, { 1, 18 } }, + { __LINE__, DT_7, "ABCabc123g", 15, -10, { 0, 1, 30, 15 + 5 }, { 1, 19 } }, + { __LINE__, DT_7, "ABCabc123g", 16, -10, { 0, 1, 30, 15 + 6 }, { 1, 20 } }, + + { __LINE__, DT_8, "ABCabc\n123g", 20, -8, { 0, 1, 30, 15 - 2 }, { 1, 12 } }, + { __LINE__, DT_8, "ABCabc\n123g", 20, -8, { 0, 1, 30, 15 - 1 }, { 1, 12 } }, + { __LINE__, DT_8, "ABCabc\n123g", 20, -8, { 0, 1, 30, 15 + 0 }, { 1, 12 } }, + { __LINE__, DT_8, "ABCabc\n123g", 20, -8, { 0, 1, 30, 15 + 1 }, { 1, 12 } }, + { __LINE__, DT_8, "ABCabc\n123g", 20, -8, { 0, 1, 30, 15 + 2 }, { 1, 12 } }, + { __LINE__, DT_8, "ABCabc\n123g", 20, -8, { 0, 1, 30, 15 + 3 }, { 1, 12 } }, + { __LINE__, DT_8, "ABCabc\n123g", 20, -8, { 0, 1, 30, 15 + 4 }, { 1, 12 } }, + { __LINE__, DT_8, "ABCabc\n123g", 20, -8, { 0, 1, 30, 15 + 5 }, { 1, 12 } }, + { __LINE__, DT_8, "ABCabc\n123g", 20, -8, { 0, 1, 30, 15 + 6 }, { 1, 12 } }, + + { __LINE__, DT_8, "ABCabc\n123g", 22, -9, { 0, 1, 30, 15 - 2 }, { 1, 12 } }, + { __LINE__, DT_8, "ABCabc\n123g", 22, -9, { 0, 1, 30, 15 - 1 }, { 1, 13 } }, + { __LINE__, DT_8, "ABCabc\n123g", 22, -9, { 0, 1, 30, 15 + 0 }, { 1, 13 } }, + { __LINE__, DT_8, "ABCabc\n123g", 22, -9, { 0, 1, 30, 15 + 1 }, { 1, 13 } }, + { __LINE__, DT_8, "ABCabc\n123g", 22, -9, { 0, 1, 30, 15 + 2 }, { 1, 13 } }, + { __LINE__, DT_8, "ABCabc\n123g", 22, -9, { 0, 1, 30, 15 + 3 }, { 1, 13 } }, + { __LINE__, DT_8, "ABCabc\n123g", 22, -9, { 0, 1, 30, 15 + 4 }, { 1, 13 } }, + { __LINE__, DT_8, "ABCabc\n123g", 22, -9, { 0, 1, 30, 15 + 5 }, { 1, 13 } }, + { __LINE__, DT_8, "ABCabc\n123g", 22, -9, { 0, 1, 30, 15 + 6 }, { 1, 13 } }, + + { __LINE__, DT_8, "ABCabc\n123g", 24, -10, { 0, 1, 30, 15 - 2 }, { 1, 12 } }, + { __LINE__, DT_8, "ABCabc\n123g", 24, -10, { 0, 1, 30, 15 - 1 }, { 1, 13 } }, + { __LINE__, DT_8, "ABCabc\n123g", 24, -10, { 0, 1, 30, 15 + 0 }, { 1, 14 } }, + { __LINE__, DT_8, "ABCabc\n123g", 24, -10, { 0, 1, 30, 15 + 1 }, { 1, 15 } }, + { __LINE__, DT_8, "ABCabc\n123g", 24, -10, { 0, 1, 30, 15 + 2 }, { 1, 15 } }, + { __LINE__, DT_8, "ABCabc\n123g", 24, -10, { 0, 1, 30, 15 + 3 }, { 1, 15 } }, + { __LINE__, DT_8, "ABCabc\n123g", 24, -10, { 0, 1, 30, 15 + 4 }, { 1, 15 } }, + { __LINE__, DT_8, "ABCabc\n123g", 24, -10, { 0, 1, 30, 15 + 5 }, { 1, 15 } }, + { __LINE__, DT_8, "ABCabc\n123g", 24, -10, { 0, 1, 30, 15 + 6 }, { 1, 15 } }, + + { __LINE__, DT_9, "ABCabc\n123g", 20, -8, { 0, 1, 30, 15 - 2 }, { 1, 12 } }, + { __LINE__, DT_9, "ABCabc\n123g", 20, -8, { 0, 1, 30, 15 - 1 }, { 1, 12 } }, + { __LINE__, DT_9, "ABCabc\n123g", 20, -8, { 0, 1, 30, 15 + 0 }, { 1, 12 } }, + { __LINE__, DT_9, "ABCabc\n123g", 20, -8, { 0, 1, 30, 15 + 1 }, { 1, 12 } }, + { __LINE__, DT_9, "ABCabc\n123g", 20, -8, { 0, 1, 30, 15 + 2 }, { 1, 12 } }, + { __LINE__, DT_9, "ABCabc\n123g", 20, -8, { 0, 1, 30, 15 + 3 }, { 1, 12 } }, + { __LINE__, DT_9, "ABCabc\n123g", 20, -8, { 0, 1, 30, 15 + 4 }, { 1, 12 } }, + { __LINE__, DT_9, "ABCabc\n123g", 20, -8, { 0, 1, 30, 15 + 5 }, { 1, 12 } }, + { __LINE__, DT_9, "ABCabc\n123g", 20, -8, { 0, 1, 30, 15 + 6 }, { 1, 12 } }, + + { __LINE__, DT_9, "ABCabc\n123g", 22, -9, { 0, 1, 30, 15 - 2 }, { 1, 12 } }, + { __LINE__, DT_9, "ABCabc\n123g", 22, -9, { 0, 1, 30, 15 - 1 }, { 1, 13 } }, + { __LINE__, DT_9, "ABCabc\n123g", 22, -9, { 0, 1, 30, 15 + 0 }, { 1, 13 } }, + { __LINE__, DT_9, "ABCabc\n123g", 22, -9, { 0, 1, 30, 15 + 1 }, { 1, 13 } }, + { __LINE__, DT_9, "ABCabc\n123g", 22, -9, { 0, 1, 30, 15 + 2 }, { 1, 13 } }, + { __LINE__, DT_9, "ABCabc\n123g", 22, -9, { 0, 1, 30, 15 + 3 }, { 1, 13 } }, + { __LINE__, DT_9, "ABCabc\n123g", 22, -9, { 0, 1, 30, 15 + 4 }, { 1, 13 } }, + { __LINE__, DT_9, "ABCabc\n123g", 22, -9, { 0, 1, 30, 15 + 5 }, { 1, 13 } }, + { __LINE__, DT_9, "ABCabc\n123g", 22, -9, { 0, 1, 30, 15 + 6 }, { 1, 13 } }, + + { __LINE__, DT_9, "ABCabc\n123g", 24, -10, { 0, 1, 30, 15 - 2 }, { 1, 12 } }, + { __LINE__, DT_9, "ABCabc\n123g", 24, -10, { 0, 1, 30, 15 - 1 }, { 1, 13 } }, + { __LINE__, DT_9, "ABCabc\n123g", 24, -10, { 0, 1, 30, 15 + 0 }, { 1, 14 } }, + { __LINE__, DT_9, "ABCabc\n123g", 24, -10, { 0, 1, 30, 15 + 1 }, { 1, 15 } }, + { __LINE__, DT_9, "ABCabc\n123g", 24, -10, { 0, 1, 30, 15 + 2 }, { 1, 15 } }, + { __LINE__, DT_9, "ABCabc\n123g", 24, -10, { 0, 1, 30, 15 + 3 }, { 1, 15 } }, + { __LINE__, DT_9, "ABCabc\n123g", 24, -10, { 0, 1, 30, 15 + 4 }, { 1, 15 } }, + { __LINE__, DT_9, "ABCabc\n123g", 24, -10, { 0, 1, 30, 15 + 5 }, { 1, 15 } }, + { __LINE__, DT_9, "ABCabc\n123g", 24, -10, { 0, 1, 30, 15 + 6 }, { 1, 15 } }, + + { __LINE__, DT_10, "ABCabc\n123g", 10, -8, { 0, 1, 30, 15 - 2 }, { 1, 12 } }, + { __LINE__, DT_10, "ABCabc\n123g", 10, -8, { 0, 1, 30, 15 - 1 }, { 1, 13 } }, + { __LINE__, DT_10, "ABCabc\n123g", 10, -8, { 0, 1, 30, 15 + 0 }, { 1, 14 } }, + { __LINE__, DT_10, "ABCabc\n123g", 10, -8, { 0, 1, 30, 15 + 1 }, { 1, 15 } }, + { __LINE__, DT_10, "ABCabc\n123g", 10, -8, { 0, 1, 30, 15 + 2 }, { 1, 16 } }, + { __LINE__, DT_10, "ABCabc\n123g", 10, -8, { 0, 1, 30, 15 + 3 }, { 1, 17 } }, + { __LINE__, DT_10, "ABCabc\n123g", 10, -8, { 0, 1, 30, 15 + 4 }, { 1, 18 } }, + { __LINE__, DT_10, "ABCabc\n123g", 10, -8, { 0, 1, 30, 15 + 5 }, { 1, 19 } }, + { __LINE__, DT_10, "ABCabc\n123g", 20, -8, { 0, 1, 30, 15 + 6 }, { 1, 12 } }, + + { __LINE__, DT_10, "ABCabc\n123g", 11, -9, { 0, 1, 30, 15 - 2 }, { 1, 12 } }, + { __LINE__, DT_10, "ABCabc\n123g", 11, -9, { 0, 1, 30, 15 - 1 }, { 1, 13 } }, + { __LINE__, DT_10, "ABCabc\n123g", 11, -9, { 0, 1, 30, 15 + 0 }, { 1, 14 } }, + { __LINE__, DT_10, "ABCabc\n123g", 11, -9, { 0, 1, 30, 15 + 1 }, { 1, 15 } }, + { __LINE__, DT_10, "ABCabc\n123g", 11, -9, { 0, 1, 30, 15 + 2 }, { 1, 16 } }, + { __LINE__, DT_10, "ABCabc\n123g", 11, -9, { 0, 1, 30, 15 + 3 }, { 1, 17 } }, + { __LINE__, DT_10, "ABCabc\n123g", 11, -9, { 0, 1, 30, 15 + 4 }, { 1, 18 } }, + { __LINE__, DT_10, "ABCabc\n123g", 11, -9, { 0, 1, 30, 15 + 5 }, { 1, 19 } }, + { __LINE__, DT_10, "ABCabc\n123g", 11, -9, { 0, 1, 30, 15 + 6 }, { 1, 20 } }, + + { __LINE__, DT_10, "ABCabc\n123g", 12, -10, { 0, 1, 30, 15 - 2 }, { 1, 12 } }, + { __LINE__, DT_10, "ABCabc\n123g", 12, -10, { 0, 1, 30, 15 - 1 }, { 1, 13 } }, + { __LINE__, DT_10, "ABCabc\n123g", 12, -10, { 0, 1, 30, 15 + 0 }, { 1, 14 } }, + { __LINE__, DT_10, "ABCabc\n123g", 12, -10, { 0, 1, 30, 15 + 1 }, { 1, 15 } }, + { __LINE__, DT_10, "ABCabc\n123g", 12, -10, { 0, 1, 30, 15 + 2 }, { 1, 16 } }, + { __LINE__, DT_10, "ABCabc\n123g", 12, -10, { 0, 1, 30, 15 + 3 }, { 1, 17 } }, + { __LINE__, DT_10, "ABCabc\n123g", 12, -10, { 0, 1, 30, 15 + 4 }, { 1, 18 } }, + { __LINE__, DT_10, "ABCabc\n123g", 12, -10, { 0, 1, 30, 15 + 5 }, { 1, 19 } }, + { __LINE__, DT_10, "ABCabc\n123g", 12, -10, { 0, 1, 30, 15 + 6 }, { 1, 20 } }, }; static void DoEntry(HDC hdc, const TEST_ENTRY *pEntry) { - static const WCHAR szText[] = L"ABCabc123g"; RECT rc; INT ret; HFONT hFont; HGDIOBJ hFontOld; - UINT uFormat = DT_SINGLELINE | DT_LEFT | DT_VCENTER | DT_CALCRECT; + LONG x, y, yMin, yMax; LOGFONTW lf = { pEntry->font_height }; lstrcpyW(lf.lfFaceName, L"Tahoma"); @@ -155,12 +354,42 @@ static void DoEntry(HDC hdc, const TEST_ENTRY *pEntry) hFontOld = SelectObject(hdc, hFont); { - SetRect(&rc, 0, pEntry->input.top, 0, pEntry->input.bottom); + rc = pEntry->input; + + if (!(pEntry->uFormat & DT_CALCRECT)) + FillRect(hdc, &rc, (HBRUSH)GetStockObject(WHITE_BRUSH)); - ret = DrawTextW(hdc, szText, lstrlenW(szText), &rc, uFormat); + ret = DrawTextA(hdc, pEntry->pszText, -1, &rc, pEntry->uFormat); ok(ret == pEntry->ret, "Line %d: ret %d vs %d\n", pEntry->line, ret, pEntry->ret); + if (!(pEntry->uFormat & DT_CALCRECT)) + { + yMin = rc.bottom; + yMax = rc.top; + for (y = rc.top; y < rc.bottom; ++y) + { + BOOL bNonWhiteFound = FALSE; + for (x = rc.left; x < rc.right; ++x) + { + if (GetPixel(hdc, x, y) != RGB(255, 255, 255)) + { + bNonWhiteFound = TRUE; + break; + } + } + if (!bNonWhiteFound) + { + if (yMin > y) + yMin = y; + if (yMax < y) + yMax = y; + } + } + rc.top = yMin; + rc.bottom = yMax; + } + ok(rc.top == pEntry->output.top, "Line %d: top %ld vs %ld\n", pEntry->line, rc.top, pEntry->output.top); @@ -174,13 +403,23 @@ static void DoEntry(HDC hdc, const TEST_ENTRY *pEntry) START_TEST(DrawText) { SIZE_T i; + HBITMAP hbm; + HGDIOBJ hbmOld; HDC hdc = CreateCompatibleDC(NULL); ok(hdc != NULL, "hdc was NULL\n"); + hbm = CreateCompatibleBitmap(hdc, 100, 100); + hbmOld = SelectObject(hdc, hbm); + + SetTextColor(hdc, RGB(0, 0, 0)); + SetBkColor(hdc, RGB(255, 255, 255)); + SetBkMode(hdc, OPAQUE); for (i = 0; i < ARRAYSIZE(s_entries); ++i) { DoEntry(hdc, &s_entries[i]); } + SelectObject(hdc, hbmOld); + DeleteObject(hbm); DeleteDC(hdc); }

4 years, 9 months

[reactos] 01/01: [JOY] Use APPLET_PROC instead of a custom CPLAPPLET_PROC and simpify the code

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3ecbbd991f0c8022488ba… commit 3ecbbd991f0c8022488ba5e4cd7f5d5c6eb43eb4 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Mar 15 18:12:54 2020 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Mar 15 18:12:54 2020 +0100 [JOY] Use APPLET_PROC instead of a custom CPLAPPLET_PROC and simpify the code --- dll/cpl/joy/joy.c | 16 ++++++++-------- dll/cpl/joy/joy.h | 6 ++---- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/dll/cpl/joy/joy.c b/dll/cpl/joy/joy.c index 97c49ed547e..530a78d442c 100644 --- a/dll/cpl/joy/joy.c +++ b/dll/cpl/joy/joy.c @@ -30,9 +30,8 @@ #define NUM_APPLETS (1) -LONG CALLBACK SystemApplet(VOID); +LONG CALLBACK SystemApplet(HWND hwnd, UINT uMsg, LPARAM lParam1, LPARAM lParam2); HINSTANCE hApplet = 0; -HWND MainDlg; /* Applets */ @@ -262,11 +261,15 @@ MainPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) /* First Applet */ LONG CALLBACK -SystemApplet(VOID) +SystemApplet(HWND hwnd, UINT uMsg, LPARAM lParam1, LPARAM lParam2) { + UNREFERENCED_PARAMETER(uMsg); + UNREFERENCED_PARAMETER(lParam1); + UNREFERENCED_PARAMETER(lParam2); + DialogBox(hApplet, MAKEINTRESOURCE(IDD_PROPPAGEMAIN), - MainDlg, + hwnd, MainPageProc); return (LONG)TRUE; @@ -299,10 +302,7 @@ CPlApplet(HWND hwndCPl, UINT uMsg, LPARAM lParam1, LPARAM lParam2) break; case CPL_DBLCLK: - { - MainDlg = hwndCPl; - Applets[i].AppletProc(); - } + Applets[i].AppletProc(hwndCPl, uMsg, lParam1, lParam2); break; } diff --git a/dll/cpl/joy/joy.h b/dll/cpl/joy/joy.h index 42d5f6f4d89..7ede1e01539 100644 --- a/dll/cpl/joy/joy.h +++ b/dll/cpl/joy/joy.h @@ -12,14 +12,12 @@ #include "resource.h" -typedef LONG (CALLBACK *CPLAPPLET_PROC)(VOID); - typedef struct { int idIcon; int idName; int idDescription; - CPLAPPLET_PROC AppletProc; + APPLET_PROC AppletProc; } APPLET, *PAPPLET; typedef struct @@ -28,7 +26,7 @@ typedef struct WCHAR szWorkingDirectory[MAX_PATH]; WCHAR szDescription[MAX_PATH]; WCHAR szLinkName[MAX_PATH]; -}CREATE_LINK_CONTEXT, *PCREATE_LINK_CONTEXT; +} CREATE_LINK_CONTEXT, *PCREATE_LINK_CONTEXT; extern HINSTANCE hApplet;

4 years, 9 months

[reactos] 01/01: [POWERCFG] Add hints on missing property pages and remove an obsolete declaration

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6977833e067924167e62e… commit 6977833e067924167e62e07ce701de35e0650b62 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Mar 15 16:06:49 2020 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Mar 15 16:06:49 2020 +0100 [POWERCFG] Add hints on missing property pages and remove an obsolete declaration --- dll/cpl/powercfg/powercfg.c | 4 ++++ dll/cpl/powercfg/powercfg.h | 1 - 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/dll/cpl/powercfg/powercfg.c b/dll/cpl/powercfg/powercfg.c index f9c7b9f355f..565f45b3bbe 100644 --- a/dll/cpl/powercfg/powercfg.c +++ b/dll/cpl/powercfg/powercfg.c @@ -124,6 +124,8 @@ Applet1(HWND hwnd, UINT uMsg, LPARAM wParam, LPARAM lParam) { InitPropSheetPage(&psh, IDD_POWERSCHEMESPAGE_ACDC, PowerSchemesDlgProc); InitPropSheetPage(&psh, IDD_PROPPAGEALARMS, AlarmsDlgProc); + + /* FIXME: Add battery page */ } else { @@ -135,6 +137,8 @@ Applet1(HWND hwnd, UINT uMsg, LPARAM wParam, LPARAM lParam) InitPropSheetPage(&psh, IDD_PROPPAGEHIBERNATE, HibernateDlgProc); } + /* FIXME: Add UPS page */ + /* Load additional pages provided by shell extensions */ hpsxa = SHCreatePropSheetExtArray(HKEY_LOCAL_MACHINE, REGSTR_PATH_CONTROLSFOLDER TEXT("\\Power"), MAX_POWER_PAGES - psh.nPages); if (hpsxa != NULL) diff --git a/dll/cpl/powercfg/powercfg.h b/dll/cpl/powercfg/powercfg.h index 0e7317030c6..7329936c6c2 100644 --- a/dll/cpl/powercfg/powercfg.h +++ b/dll/cpl/powercfg/powercfg.h @@ -31,7 +31,6 @@ typedef struct extern HINSTANCE hApplet; extern GLOBAL_POWER_POLICY gGPP; -extern POWER_POLICY gPP[]; #define MAX_POWER_PAGES 32

4 years, 9 months

[reactos] 01/01: [INPUT] Use APPLET_PROC instead of a custom CPLAPPLET_PROC and simpify the code

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d1d9920b069513d4535bc… commit d1d9920b069513d4535bc5cf7c77da5c5e5298ee Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Mar 15 15:10:14 2020 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Mar 15 15:10:14 2020 +0100 [INPUT] Use APPLET_PROC instead of a custom CPLAPPLET_PROC and simpify the code --- dll/cpl/input/input.c | 12 ++++-------- dll/cpl/input/input.h | 5 ++--- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/dll/cpl/input/input.c b/dll/cpl/input/input.c index 1d566ed3620..1896eb8552a 100644 --- a/dll/cpl/input/input.c +++ b/dll/cpl/input/input.c @@ -10,14 +10,11 @@ #include "input.h" -#include <cpl.h> - #define NUM_APPLETS (1) -static LONG CALLBACK SystemApplet(VOID); +static LONG CALLBACK SystemApplet(HWND hwnd, UINT uMsg, LPARAM lParam1, LPARAM lParam2); HINSTANCE hApplet = NULL; -static HWND hCPLWindow; /* Applets */ static APPLET Applets[NUM_APPLETS] = @@ -57,7 +54,7 @@ PropSheetProc(HWND hwndDlg, UINT uMsg, LPARAM lParam) /* First Applet */ static LONG CALLBACK -SystemApplet(VOID) +SystemApplet(HWND hwnd, UINT uMsg, LPARAM lParam1, LPARAM lParam2) { PROPSHEETPAGEW page[2]; PROPSHEETHEADERW header; @@ -69,7 +66,7 @@ SystemApplet(VOID) header.dwSize = sizeof(header); header.dwFlags = PSH_PROPSHEETPAGE | PSH_USEICONID | PSH_USECALLBACK; - header.hwndParent = hCPLWindow; + header.hwndParent = hwnd; header.hInstance = hApplet; header.pszIcon = MAKEINTRESOURCEW(IDI_KEY_SHORT_ICO); header.pszCaption = szCaption; @@ -114,8 +111,7 @@ CPlApplet(HWND hwndCPl, UINT uMsg, LPARAM lParam1, LPARAM lParam2) break; case CPL_DBLCLK: - hCPLWindow = hwndCPl; - Applets[i].AppletProc(); + Applets[i].AppletProc(hwndCPl, uMsg, lParam1, lParam2); break; } diff --git a/dll/cpl/input/input.h b/dll/cpl/input/input.h index 2ddd82f267a..f7ab1f47141 100644 --- a/dll/cpl/input/input.h +++ b/dll/cpl/input/input.h @@ -15,17 +15,16 @@ #include <windowsx.h> #include <setupapi.h> #include <strsafe.h> +#include <cpl.h> #include "resource.h" -typedef LONG (CALLBACK *CPLAPPLET_PROC)(VOID); - typedef struct { int idIcon; int idName; int idDescription; - CPLAPPLET_PROC AppletProc; + APPLET_PROC AppletProc; } APPLET, *PAPPLET; extern HINSTANCE hApplet;

4 years, 9 months

[reactos] 01/01: [POWERCFG] Disable the "Enable hibernation" checkbox if the system does not support hibernation

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=beeb989eaa5ad095c106f… commit beeb989eaa5ad095c106f46036c639bf34d8cda1 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Mar 15 14:19:42 2020 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Mar 15 14:21:11 2020 +0100 [POWERCFG] Disable the "Enable hibernation" checkbox if the system does not support hibernation --- dll/cpl/powercfg/hibernate.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dll/cpl/powercfg/hibernate.c b/dll/cpl/powercfg/hibernate.c index 02e774e784e..3f19aea2ab3 100644 --- a/dll/cpl/powercfg/hibernate.c +++ b/dll/cpl/powercfg/hibernate.c @@ -19,6 +19,7 @@ Hib_InitDialog(HWND hwndDlg) TCHAR szTemp[MAX_PATH]; LPTSTR lpRoot; ULARGE_INTEGER FreeBytesAvailable, TotalNumberOfBytes, TotalNumberOfFreeBytes; + BOOLEAN bHibernate; if (GetPwrCapabilities(&PowerCaps)) { @@ -59,6 +60,12 @@ Hib_InitDialog(HWND hwndDlg) ShowWindow(GetDlgItem(hwndDlg, IDC_TOLESSFREESPACE), FALSE); EnableWindow(GetDlgItem(hwndDlg, IDC_HIBERNATEFILE), TRUE); } + + bHibernate = PowerCaps.HiberFilePresent ? TRUE : FALSE; + if (CallNtPowerInformation(SystemReserveHiberFile, &bHibernate, sizeof(bHibernate), NULL, 0) != STATUS_SUCCESS) + { + EnableWindow(GetDlgItem(hwndDlg, IDC_HIBERNATEFILE), FALSE); + } } }

4 years, 9 months

[reactos] 02/02: [MSVCRT] Add _snwscanf

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=315765ed8b0334fb3a3f2… commit 315765ed8b0334fb3a3f26b458a5acee2583c8f3 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sun Mar 15 01:03:14 2020 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Mar 15 13:12:20 2020 +0100 [MSVCRT] Add _snwscanf --- dll/win32/msvcrt/msvcrt.spec | 2 +- sdk/lib/crt/string/scanf.c | 23 +++++++++++++++++++++++ 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/dll/win32/msvcrt/msvcrt.spec b/dll/win32/msvcrt/msvcrt.spec index 4e0c07aa950..ba302857bc1 100644 --- a/dll/win32/msvcrt/msvcrt.spec +++ b/dll/win32/msvcrt/msvcrt.spec @@ -622,7 +622,7 @@ @ varargs _snprintf(ptr long str) @ varargs _snscanf(str long str) @ varargs _snwprintf(ptr long wstr) -# stub _snwscanf +@ varargs _snwscanf(wstr long wstr) @ varargs _sopen(str long long) @ varargs _spawnl(long str str) @ varargs _spawnle(long str str) diff --git a/sdk/lib/crt/string/scanf.c b/sdk/lib/crt/string/scanf.c index bb6f098967e..aa2f2d34795 100644 --- a/sdk/lib/crt/string/scanf.c +++ b/sdk/lib/crt/string/scanf.c @@ -95,6 +95,14 @@ static int wchar2digit(wchar_t c, int base) { #undef SECURE #include "scanf.h" +/* vsnwscanf_l */ +#define WIDE_SCANF 1 +#undef CONSOLE +#define STRING 1 +#define STRING_LEN 1 +#undef SECURE +#include "scanf.h" + #ifndef _LIBCNT_ /* vcscanf_l */ #undef WIDE_SCANF @@ -208,6 +216,21 @@ int CDECL _cscanf(const char *format, ...) } #endif +/********************************************************************* + * _snwscanf (MSVCRT.@) + */ +int WINAPIV _snwscanf(const wchar_t *input, size_t length, + const wchar_t *format, ...) +{ + __ms_va_list valist; + int res; + + __ms_va_start(valist, format); + res = vsnwscanf_l(input, length, format, NULL, valist); + __ms_va_end(valist); + return res; +} + /********************************************************************* * _snscanf (MSVCRT.@) */

4 years, 9 months

[reactos] 01/02: [WINTRUST] Add WTHelperGetFileHash stub

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=550ce7e81893371c08290… commit 550ce7e81893371c08290afe5fb974e3fd82b4f6 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sun Mar 15 01:02:44 2020 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Mar 15 13:12:05 2020 +0100 [WINTRUST] Add WTHelperGetFileHash stub --- dll/win32/wintrust/wintrust.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/win32/wintrust/wintrust.spec b/dll/win32/wintrust/wintrust.spec index 7ebd53f0396..4fb5ac94ffa 100644 --- a/dll/win32/wintrust/wintrust.spec +++ b/dll/win32/wintrust/wintrust.spec @@ -94,7 +94,7 @@ @ stub WTHelperCheckCertUsage @ stub WTHelperGetAgencyInfo @ stdcall WTHelperGetFileHandle(ptr) -#@ stub WTHelperGetFileHash +@ stub WTHelperGetFileHash @ stdcall WTHelperGetFileName(ptr) @ stdcall WTHelperGetKnownUsages(long ptr) @ stdcall WTHelperGetProvCertFromChain(ptr long)

4 years, 9 months

[reactos] 01/01: [DESK][CONTROL] Select property pages by command line, for example 'control desk.cpl, , 1' and fix 'control color'

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a88d7b5c2fe6d5ca903d5… commit a88d7b5c2fe6d5ca903d529bb5343abe32e65ca8 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Mar 15 11:46:31 2020 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Mar 15 11:46:31 2020 +0100 [DESK][CONTROL] Select property pages by command line, for example 'control desk.cpl,,1' and fix 'control color' --- base/applications/control/control.c | 2 +- dll/cpl/desk/desk.c | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/base/applications/control/control.c b/base/applications/control/control.c index ba3ceb2f45b..e08ed829b2f 100644 --- a/base/applications/control/control.c +++ b/base/applications/control/control.c @@ -86,7 +86,7 @@ wWinMain(HINSTANCE hInstance, /* Check one of the built-in control panel handlers */ if (!_wcsicmp(lpCmdLine, L"admintools")) return OpenShellFolder(L"\\::{D20EA4E1-3957-11d2-A40B-0C5020524153}"); - else if (!_wcsicmp(lpCmdLine, L"color")) return RunControlPanel(L"desk.cpl"); /* TODO: Switch to the "Apperance" tab */ + else if (!_wcsicmp(lpCmdLine, L"color")) return RunControlPanel(L"desk.cpl,,2"); else if (!_wcsicmp(lpCmdLine, L"date/time")) return RunControlPanel(L"timedate.cpl"); else if (!_wcsicmp(lpCmdLine, L"desktop")) return RunControlPanel(L"desk.cpl"); else if (!_wcsicmp(lpCmdLine, L"folders")) return RUNDLL(L"shell32.dll,Options_RunDLL"); diff --git a/dll/cpl/desk/desk.c b/dll/cpl/desk/desk.c index 28a296c1423..f2690aae5c5 100644 --- a/dll/cpl/desk/desk.c +++ b/dll/cpl/desk/desk.c @@ -150,6 +150,7 @@ DisplayApplet(HWND hwnd, UINT uMsg, LPARAM wParam, LPARAM lParam) LPCWSTR pwszSelectedTab = NULL; LPCWSTR pwszFile = NULL; LPCWSTR pwszAction = NULL; + INT nPage = 0; UNREFERENCED_PARAMETER(wParam); @@ -160,6 +161,8 @@ DisplayApplet(HWND hwnd, UINT uMsg, LPARAM wParam, LPARAM lParam) int argc; int i; + nPage = _wtoi((PWSTR)lParam); + #if 0 argv = CommandLineToArgvW((LPCWSTR)lParam, &argc); #else @@ -190,7 +193,7 @@ DisplayApplet(HWND hwnd, UINT uMsg, LPARAM wParam, LPARAM lParam) ActivateThemeFile(pwszFile); goto cleanup; } - + g_GlobalData.pwszFile = pwszFile; g_GlobalData.pwszAction = pwszAction; g_GlobalData.desktop_color = GetSysColor(COLOR_DESKTOP); @@ -232,6 +235,9 @@ DisplayApplet(HWND hwnd, UINT uMsg, LPARAM wParam, LPARAM lParam) /* NOTE: Don't call SHAddFromPropSheetExtArray here because this applet only allows replacing the background page but not extending the applet by more pages */ + if (nPage != 0 && psh.nStartPage == 0) + psh.nStartPage = nPage; + PropertySheet(&psh); cleanup: @@ -272,6 +278,7 @@ CPlApplet(HWND hwndCPl, UINT uMsg, LPARAM lParam1, LPARAM lParam2) case CPL_DBLCLK: Applets[i].AppletProc(hwndCPl, uMsg, lParam1, lParam2); break; + case CPL_STARTWPARMSW: return Applets[i].AppletProc(hwndCPl, uMsg, lParam1, lParam2); }

4 years, 9 months

← Newer
1
...
7
8
9
10
11
12
13
...
16
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs March 2020