Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: [SERVMAN] UI update and Error Management (#2653)
by Kyle Katarn 01 May '20

01 May '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b3947d528316cd40705ad… commit b3947d528316cd40705ad39a273925840a873a40 Author: Kyle Katarn <contact(a)kcsoftwares.com> AuthorDate: Fri May 1 19:01:59 2020 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Fri May 1 19:01:59 2020 +0200 [SERVMAN] UI update and Error Management (#2653) Purpose ======= - Current design does not warn user nor logs DEBUG traces when Service Start/Stop command fails or reach timeout. - Current Service Start/Stop progress window are WS_EX_TOOLWINDOW which reduce lisibility, is a ReactOS specificity without good reason. Proposed changes ================ - DPRINT1 traces added on failure cases. - Error Message box presented to user upon failure with explicit root cause identification. - Change Dialog definition to standard window. --- base/applications/mscutils/servman/control.c | 32 +++++++-- base/applications/mscutils/servman/lang/bg-BG.rc | 1 - base/applications/mscutils/servman/lang/cs-CZ.rc | 1 - base/applications/mscutils/servman/lang/de-DE.rc | 1 - base/applications/mscutils/servman/lang/el-GR.rc | 1 - base/applications/mscutils/servman/lang/en-US.rc | 1 - base/applications/mscutils/servman/lang/es-ES.rc | 1 - base/applications/mscutils/servman/lang/fr-FR.rc | 1 - base/applications/mscutils/servman/lang/he-IL.rc | 1 - base/applications/mscutils/servman/lang/id-ID.rc | 1 - base/applications/mscutils/servman/lang/it-IT.rc | 1 - base/applications/mscutils/servman/lang/ja-JP.rc | 1 - base/applications/mscutils/servman/lang/ko-KR.rc | 1 - base/applications/mscutils/servman/lang/no-NO.rc | 1 - base/applications/mscutils/servman/lang/pl-PL.rc | 1 - base/applications/mscutils/servman/lang/ro-RO.rc | 1 - base/applications/mscutils/servman/lang/ru-RU.rc | 1 - base/applications/mscutils/servman/lang/sk-SK.rc | 1 - base/applications/mscutils/servman/lang/sq-AL.rc | 1 - base/applications/mscutils/servman/lang/sv-SE.rc | 1 - base/applications/mscutils/servman/lang/th-TH.rc | 1 - base/applications/mscutils/servman/lang/tr-TR.rc | 1 - base/applications/mscutils/servman/lang/uk-UA.rc | 1 - base/applications/mscutils/servman/lang/zh-CN.rc | 1 - base/applications/mscutils/servman/lang/zh-TW.rc | 1 - base/applications/mscutils/servman/precomp.h | 9 +-- base/applications/mscutils/servman/progress.c | 82 +++++++++++++++++++----- base/applications/mscutils/servman/start.c | 27 ++++++-- base/applications/mscutils/servman/stop.c | 31 ++++++--- 29 files changed, 138 insertions(+), 67 deletions(-) diff --git a/base/applications/mscutils/servman/control.c b/base/applications/mscutils/servman/control.c index 08b88037f32..890bac61ae8 100644 --- a/base/applications/mscutils/servman/control.c +++ b/base/applications/mscutils/servman/control.c @@ -9,9 +9,12 @@ #include "precomp.h" +#define NDEBUG +#include <debug.h> + #define MAX_WAIT_TIME 30000 -BOOL +DWORD DoControlService(LPWSTR ServiceName, HWND hProgress, DWORD Control) @@ -27,6 +30,7 @@ DoControlService(LPWSTR ServiceName, DWORD MaxWait; DWORD ReqState, i; BOOL Result; + DWORD dwResult = ERROR_SUCCESS; /* Set the state we're interested in */ switch (Control) @@ -39,21 +43,23 @@ DoControlService(LPWSTR ServiceName, break; default: /* Unhandled control code */ - return FALSE; + DPRINT1("Unknown control command: 0x%X\n", Control); + return ERROR_INVALID_SERVICE_CONTROL; } hSCManager = OpenSCManagerW(NULL, NULL, SC_MANAGER_CONNECT); - if (!hSCManager) return FALSE; + if (!hSCManager) return GetLastError(); hService = OpenServiceW(hSCManager, ServiceName, SERVICE_PAUSE_CONTINUE | SERVICE_INTERROGATE | SERVICE_QUERY_STATUS); if (!hService) { + dwResult = GetLastError(); CloseServiceHandle(hSCManager); - return FALSE; + return dwResult; } /* Send the control message to the service */ @@ -109,6 +115,8 @@ DoControlService(LPWSTR ServiceName, &BytesNeeded)) { /* Something went wrong... */ + dwResult = GetLastError(); + DPRINT1("QueryServiceStatusEx failed: %d\n", dwResult); break; } @@ -123,23 +131,33 @@ DoControlService(LPWSTR ServiceName, else { /* It's not, make sure we haven't exceeded our wait time */ - if(GetTickCount() >= StartTickCount + MaxWait) + if (GetTickCount() >= StartTickCount + MaxWait) { /* We have, give up */ + DPRINT1("Timeout\n"); + dwResult = ERROR_SERVICE_REQUEST_TIMEOUT; break; } } } } + else + { + dwResult = GetLastError(); + } if (ServiceStatus.dwCurrentState == ReqState) { - Result = TRUE; + dwResult = ERROR_SUCCESS; } } + else + { + dwResult = GetLastError(); + } CloseServiceHandle(hService); CloseServiceHandle(hSCManager); - return Result; + return dwResult; } diff --git a/base/applications/mscutils/servman/lang/bg-BG.rc b/base/applications/mscutils/servman/lang/bg-BG.rc index 9135db9b84c..c19437e1089 100644 --- a/base/applications/mscutils/servman/lang/bg-BG.rc +++ b/base/applications/mscutils/servman/lang/bg-BG.rc @@ -232,7 +232,6 @@ IDD_DLG_PROGRESS DIALOGEX 6, 6, 255, 89 CAPTION "Управление на услугите" FONT 8, "MS Shell Dlg", 0, 0 STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | WS_VISIBLE | DS_MODALFRAME -EXSTYLE WS_EX_TOOLWINDOW BEGIN CONTROL "", IDC_SERVCON_PROGRESS, "msctls_progress32", 0x50000000, 8, 46, 238, 13 LTEXT "", IDC_SERVCON_INFO, 8, 5, 236, 11 diff --git a/base/applications/mscutils/servman/lang/cs-CZ.rc b/base/applications/mscutils/servman/lang/cs-CZ.rc index 2b7dc964d75..8632cf698f0 100644 --- a/base/applications/mscutils/servman/lang/cs-CZ.rc +++ b/base/applications/mscutils/servman/lang/cs-CZ.rc @@ -232,7 +232,6 @@ IDD_DLG_PROGRESS DIALOGEX 6, 6, 255, 89 CAPTION "Ovldání služeb" FONT 8, "MS Shell Dlg", 0, 0 STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | WS_VISIBLE | DS_MODALFRAME -EXSTYLE WS_EX_TOOLWINDOW BEGIN CONTROL "", IDC_SERVCON_PROGRESS, "msctls_progress32", 0x50000000, 8, 46, 238, 13 LTEXT "", IDC_SERVCON_INFO, 8, 5, 236, 11 diff --git a/base/applications/mscutils/servman/lang/de-DE.rc b/base/applications/mscutils/servman/lang/de-DE.rc index 0dbce992148..bb941ebd70f 100644 --- a/base/applications/mscutils/servman/lang/de-DE.rc +++ b/base/applications/mscutils/servman/lang/de-DE.rc @@ -232,7 +232,6 @@ IDD_DLG_PROGRESS DIALOGEX 6, 6, 255, 89 CAPTION "Dienststeuerung" FONT 8, "MS Shell Dlg", 0, 0 STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | WS_VISIBLE | DS_MODALFRAME -EXSTYLE WS_EX_TOOLWINDOW BEGIN CONTROL "", IDC_SERVCON_PROGRESS, "msctls_progress32", 0x50000000, 8, 46, 238, 13 LTEXT "", IDC_SERVCON_INFO, 8, 5, 236, 11 diff --git a/base/applications/mscutils/servman/lang/el-GR.rc b/base/applications/mscutils/servman/lang/el-GR.rc index 8bf7a616617..4eb8a250bec 100644 --- a/base/applications/mscutils/servman/lang/el-GR.rc +++ b/base/applications/mscutils/servman/lang/el-GR.rc @@ -232,7 +232,6 @@ IDD_DLG_PROGRESS DIALOGEX 6, 6, 255, 89 CAPTION "Service Control" FONT 8, "MS Shell Dlg", 0, 0 STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | WS_VISIBLE | DS_MODALFRAME -EXSTYLE WS_EX_TOOLWINDOW BEGIN CONTROL "", IDC_SERVCON_PROGRESS, "msctls_progress32", 0x50000000, 8, 46, 238, 13 LTEXT "", IDC_SERVCON_INFO, 8, 5, 236, 11 diff --git a/base/applications/mscutils/servman/lang/en-US.rc b/base/applications/mscutils/servman/lang/en-US.rc index 28f9896b168..272a73eb9f5 100644 --- a/base/applications/mscutils/servman/lang/en-US.rc +++ b/base/applications/mscutils/servman/lang/en-US.rc @@ -232,7 +232,6 @@ IDD_DLG_PROGRESS DIALOGEX 6, 6, 255, 89 CAPTION "Service Control" FONT 8, "MS Shell Dlg", 0, 0 STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | WS_VISIBLE | DS_MODALFRAME -EXSTYLE WS_EX_TOOLWINDOW BEGIN CONTROL "", IDC_SERVCON_PROGRESS, "msctls_progress32", 0x50000000, 8, 46, 238, 13 LTEXT "", IDC_SERVCON_INFO, 8, 5, 236, 11 diff --git a/base/applications/mscutils/servman/lang/es-ES.rc b/base/applications/mscutils/servman/lang/es-ES.rc index 8c34490d9de..1bf14df0b79 100644 --- a/base/applications/mscutils/servman/lang/es-ES.rc +++ b/base/applications/mscutils/servman/lang/es-ES.rc @@ -235,7 +235,6 @@ IDD_DLG_PROGRESS DIALOGEX 6, 6, 255, 89 CAPTION "Control de servicios" FONT 8, "MS Shell Dlg", 0, 0 STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | WS_VISIBLE | DS_MODALFRAME -EXSTYLE WS_EX_TOOLWINDOW BEGIN CONTROL "", IDC_SERVCON_PROGRESS, "msctls_progress32", 0x50000000, 8, 46, 238, 13 LTEXT "", IDC_SERVCON_INFO, 8, 5, 236, 11 diff --git a/base/applications/mscutils/servman/lang/fr-FR.rc b/base/applications/mscutils/servman/lang/fr-FR.rc index 92e0d7fdd80..38cd92cfad9 100644 --- a/base/applications/mscutils/servman/lang/fr-FR.rc +++ b/base/applications/mscutils/servman/lang/fr-FR.rc @@ -232,7 +232,6 @@ IDD_DLG_PROGRESS DIALOGEX 6, 6, 255, 89 CAPTION "Contrôle du Service" FONT 8, "MS Shell Dlg", 0, 0 STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | WS_VISIBLE | DS_MODALFRAME -EXSTYLE WS_EX_TOOLWINDOW BEGIN CONTROL "", IDC_SERVCON_PROGRESS, "msctls_progress32", 0x50000000, 8, 46, 238, 13 LTEXT "", IDC_SERVCON_INFO, 8, 5, 236, 11 diff --git a/base/applications/mscutils/servman/lang/he-IL.rc b/base/applications/mscutils/servman/lang/he-IL.rc index 459fb1e6a7b..af1c191532b 100644 --- a/base/applications/mscutils/servman/lang/he-IL.rc +++ b/base/applications/mscutils/servman/lang/he-IL.rc @@ -232,7 +232,6 @@ IDD_DLG_PROGRESS DIALOGEX 6, 6, 255, 89 CAPTION "בקרת שירות" FONT 8, "MS Shell Dlg", 0, 0 STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | WS_VISIBLE | DS_MODALFRAME -EXSTYLE WS_EX_TOOLWINDOW BEGIN CONTROL "", IDC_SERVCON_PROGRESS, "msctls_progress32", 0x50000000, 8, 46, 238, 13 LTEXT "", IDC_SERVCON_INFO, 8, 5, 236, 11 diff --git a/base/applications/mscutils/servman/lang/id-ID.rc b/base/applications/mscutils/servman/lang/id-ID.rc index 268fc672b6f..22e9b39807f 100644 --- a/base/applications/mscutils/servman/lang/id-ID.rc +++ b/base/applications/mscutils/servman/lang/id-ID.rc @@ -232,7 +232,6 @@ IDD_DLG_PROGRESS DIALOGEX 6, 6, 255, 89 CAPTION "Kontrol Layanan" FONT 8, "MS Shell Dlg", 0, 0 STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | WS_VISIBLE | DS_MODALFRAME -EXSTYLE WS_EX_TOOLWINDOW BEGIN CONTROL "", IDC_SERVCON_PROGRESS, "msctls_progress32", 0x50000000, 8, 46, 238, 13 LTEXT "", IDC_SERVCON_INFO, 8, 5, 236, 11 diff --git a/base/applications/mscutils/servman/lang/it-IT.rc b/base/applications/mscutils/servman/lang/it-IT.rc index ec6c6d71784..8e6b295f31f 100644 --- a/base/applications/mscutils/servman/lang/it-IT.rc +++ b/base/applications/mscutils/servman/lang/it-IT.rc @@ -232,7 +232,6 @@ IDD_DLG_PROGRESS DIALOGEX 6, 6, 255, 89 CAPTION "Controllo dei servizi" FONT 8, "MS Shell Dlg", 0, 0 STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | WS_VISIBLE | DS_MODALFRAME -EXSTYLE WS_EX_TOOLWINDOW BEGIN CONTROL "", IDC_SERVCON_PROGRESS, "msctls_progress32", 0x50000000, 8, 46, 238, 13 LTEXT "", IDC_SERVCON_INFO, 8, 5, 236, 11 diff --git a/base/applications/mscutils/servman/lang/ja-JP.rc b/base/applications/mscutils/servman/lang/ja-JP.rc index aed6be21cfc..e21d46bdaab 100644 --- a/base/applications/mscutils/servman/lang/ja-JP.rc +++ b/base/applications/mscutils/servman/lang/ja-JP.rc @@ -232,7 +232,6 @@ IDD_DLG_PROGRESS DIALOGEX 6, 6, 255, 89 CAPTION "サービスコントロール" FONT 9, "MS UI Gothic", 0, 0 STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | WS_VISIBLE | DS_MODALFRAME -EXSTYLE WS_EX_TOOLWINDOW BEGIN CONTROL "", IDC_SERVCON_PROGRESS, "msctls_progress32", 0x50000000, 8, 46, 238, 13 LTEXT "", IDC_SERVCON_INFO, 8, 5, 236, 11 diff --git a/base/applications/mscutils/servman/lang/ko-KR.rc b/base/applications/mscutils/servman/lang/ko-KR.rc index 2f5b09eb470..84036c6fe01 100644 --- a/base/applications/mscutils/servman/lang/ko-KR.rc +++ b/base/applications/mscutils/servman/lang/ko-KR.rc @@ -234,7 +234,6 @@ IDD_DLG_PROGRESS DIALOGEX 6, 6, 255, 89 CAPTION "서비스 컨트롤" FONT 9, "굴림", 0, 0 STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | WS_VISIBLE | DS_MODALFRAME -EXSTYLE WS_EX_TOOLWINDOW BEGIN CONTROL "", IDC_SERVCON_PROGRESS, "msctls_progress32", 0x50000000, 8, 46, 238, 13 LTEXT "", IDC_SERVCON_INFO, 8, 5, 236, 11 diff --git a/base/applications/mscutils/servman/lang/no-NO.rc b/base/applications/mscutils/servman/lang/no-NO.rc index 8eefc7dec00..851e88b05b1 100644 --- a/base/applications/mscutils/servman/lang/no-NO.rc +++ b/base/applications/mscutils/servman/lang/no-NO.rc @@ -232,7 +232,6 @@ IDD_DLG_PROGRESS DIALOGEX 6, 6, 255, 89 CAPTION "Tjeneste kontroll" FONT 8, "MS Shell Dlg", 0, 0 STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | WS_VISIBLE | DS_MODALFRAME -EXSTYLE WS_EX_TOOLWINDOW BEGIN CONTROL "", IDC_SERVCON_PROGRESS, "msctls_progress32", 0x50000000, 8, 46, 238, 13 LTEXT "", IDC_SERVCON_INFO, 8, 5, 236, 11 diff --git a/base/applications/mscutils/servman/lang/pl-PL.rc b/base/applications/mscutils/servman/lang/pl-PL.rc index e1b4a08aeac..b96cce7d94a 100644 --- a/base/applications/mscutils/servman/lang/pl-PL.rc +++ b/base/applications/mscutils/servman/lang/pl-PL.rc @@ -242,7 +242,6 @@ IDD_DLG_PROGRESS DIALOGEX 6, 6, 255, 89 CAPTION "Usługa kontrolna" FONT 8, "MS Shell Dlg", 0, 0 STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | WS_VISIBLE | DS_MODALFRAME -EXSTYLE WS_EX_TOOLWINDOW BEGIN CONTROL "", IDC_SERVCON_PROGRESS, "msctls_progress32", 0x50000000, 8, 46, 238, 13 LTEXT "", IDC_SERVCON_INFO, 8, 5, 236, 11 diff --git a/base/applications/mscutils/servman/lang/ro-RO.rc b/base/applications/mscutils/servman/lang/ro-RO.rc index 838bc26bf9b..6740bedbb66 100644 --- a/base/applications/mscutils/servman/lang/ro-RO.rc +++ b/base/applications/mscutils/servman/lang/ro-RO.rc @@ -237,7 +237,6 @@ IDD_DLG_PROGRESS DIALOGEX 6, 6, 255, 89 CAPTION "Control servicii" FONT 8, "MS Shell Dlg", 0, 0 STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | WS_VISIBLE | DS_MODALFRAME -EXSTYLE WS_EX_TOOLWINDOW BEGIN CONTROL "", IDC_SERVCON_PROGRESS, "msctls_progress32", 0x50000000, 8, 46, 238, 13 LTEXT "", IDC_SERVCON_INFO, 8, 5, 236, 11 diff --git a/base/applications/mscutils/servman/lang/ru-RU.rc b/base/applications/mscutils/servman/lang/ru-RU.rc index 537ba738bef..8f504b4d404 100644 --- a/base/applications/mscutils/servman/lang/ru-RU.rc +++ b/base/applications/mscutils/servman/lang/ru-RU.rc @@ -232,7 +232,6 @@ IDD_DLG_PROGRESS DIALOGEX 6, 6, 255, 89 CAPTION "Управление службами" FONT 8, "MS Shell Dlg", 0, 0 STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | WS_VISIBLE | DS_MODALFRAME -EXSTYLE WS_EX_TOOLWINDOW BEGIN CONTROL "", IDC_SERVCON_PROGRESS, "msctls_progress32", 0x50000000, 8, 46, 238, 13 LTEXT "", IDC_SERVCON_INFO, 8, 5, 236, 11 diff --git a/base/applications/mscutils/servman/lang/sk-SK.rc b/base/applications/mscutils/servman/lang/sk-SK.rc index 77b2c3b87ec..f5c88129fcf 100644 --- a/base/applications/mscutils/servman/lang/sk-SK.rc +++ b/base/applications/mscutils/servman/lang/sk-SK.rc @@ -237,7 +237,6 @@ IDD_DLG_PROGRESS DIALOGEX 6, 6, 255, 89 CAPTION "Service Control" FONT 8, "MS Shell Dlg", 0, 0 STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | WS_VISIBLE | DS_MODALFRAME -EXSTYLE WS_EX_TOOLWINDOW BEGIN CONTROL "", IDC_SERVCON_PROGRESS, "msctls_progress32", 0x50000000, 8, 46, 238, 13 LTEXT "", IDC_SERVCON_INFO, 8, 5, 236, 11 diff --git a/base/applications/mscutils/servman/lang/sq-AL.rc b/base/applications/mscutils/servman/lang/sq-AL.rc index bde90df05f5..4f9c936ed2e 100644 --- a/base/applications/mscutils/servman/lang/sq-AL.rc +++ b/base/applications/mscutils/servman/lang/sq-AL.rc @@ -237,7 +237,6 @@ IDD_DLG_PROGRESS DIALOGEX 6, 6, 255, 89 CAPTION "Kontrolli i shërbimeve" FONT 8, "MS Shell Dlg", 0, 0 STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | WS_VISIBLE | DS_MODALFRAME -EXSTYLE WS_EX_TOOLWINDOW BEGIN CONTROL "", IDC_SERVCON_PROGRESS, "msctls_progress32", 0x50000000, 8, 46, 238, 13 LTEXT "", IDC_SERVCON_INFO, 8, 5, 236, 11 diff --git a/base/applications/mscutils/servman/lang/sv-SE.rc b/base/applications/mscutils/servman/lang/sv-SE.rc index 37bec57e0b8..2cb32144080 100644 --- a/base/applications/mscutils/servman/lang/sv-SE.rc +++ b/base/applications/mscutils/servman/lang/sv-SE.rc @@ -239,7 +239,6 @@ IDD_DLG_PROGRESS DIALOGEX 6, 6, 255, 89 CAPTION "Tjänst kontroll" FONT 8, "MS Shell Dlg", 0, 0 STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | WS_VISIBLE | DS_MODALFRAME -EXSTYLE WS_EX_TOOLWINDOW BEGIN CONTROL "", IDC_SERVCON_PROGRESS, "msctls_progress32", 0x50000000, 8, 46, 238, 13 LTEXT "", IDC_SERVCON_INFO, 8, 5, 236, 11 diff --git a/base/applications/mscutils/servman/lang/th-TH.rc b/base/applications/mscutils/servman/lang/th-TH.rc index f46dd572817..23706f70e6a 100644 --- a/base/applications/mscutils/servman/lang/th-TH.rc +++ b/base/applications/mscutils/servman/lang/th-TH.rc @@ -240,7 +240,6 @@ IDD_DLG_PROGRESS DIALOGEX 6, 6, 255, 89 CAPTION "ตัวควบคุมบริการ" FONT 8, "MS Shell Dlg", 0, 0 STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | WS_VISIBLE | DS_MODALFRAME -EXSTYLE WS_EX_TOOLWINDOW BEGIN CONTROL "", IDC_SERVCON_PROGRESS, "msctls_progress32", 0x50000000, 8, 46, 238, 13 LTEXT "", IDC_SERVCON_INFO, 8, 5, 236, 11 diff --git a/base/applications/mscutils/servman/lang/tr-TR.rc b/base/applications/mscutils/servman/lang/tr-TR.rc index 4c1c00b93d1..fad8766630b 100644 --- a/base/applications/mscutils/servman/lang/tr-TR.rc +++ b/base/applications/mscutils/servman/lang/tr-TR.rc @@ -234,7 +234,6 @@ IDD_DLG_PROGRESS DIALOGEX 6, 6, 255, 89 CAPTION "Hizmet Denetimi" FONT 8, "MS Shell Dlg", 0, 0 STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | WS_VISIBLE | DS_MODALFRAME -EXSTYLE WS_EX_TOOLWINDOW BEGIN CONTROL "", IDC_SERVCON_PROGRESS, "msctls_progress32", 0x50000000, 8, 46, 238, 13 LTEXT "", IDC_SERVCON_INFO, 8, 5, 236, 11 diff --git a/base/applications/mscutils/servman/lang/uk-UA.rc b/base/applications/mscutils/servman/lang/uk-UA.rc index 54512dabfc0..a4fe3d509f7 100644 --- a/base/applications/mscutils/servman/lang/uk-UA.rc +++ b/base/applications/mscutils/servman/lang/uk-UA.rc @@ -240,7 +240,6 @@ IDD_DLG_PROGRESS DIALOGEX 6, 6, 255, 89 CAPTION "Управління службами" FONT 8, "MS Shell Dlg", 0, 0 STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | WS_VISIBLE | DS_MODALFRAME -EXSTYLE WS_EX_TOOLWINDOW BEGIN CONTROL "", IDC_SERVCON_PROGRESS, "msctls_progress32", 0x50000000, 8, 46, 238, 13 LTEXT "", IDC_SERVCON_INFO, 8, 5, 236, 11 diff --git a/base/applications/mscutils/servman/lang/zh-CN.rc b/base/applications/mscutils/servman/lang/zh-CN.rc index ae578a2117b..df562a2a091 100644 --- a/base/applications/mscutils/servman/lang/zh-CN.rc +++ b/base/applications/mscutils/servman/lang/zh-CN.rc @@ -234,7 +234,6 @@ IDD_DLG_PROGRESS DIALOGEX 6, 6, 255, 89 CAPTION "服务控制" FONT 9, "宋体", 0, 0 STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | WS_VISIBLE | DS_MODALFRAME -EXSTYLE WS_EX_TOOLWINDOW BEGIN CONTROL "", IDC_SERVCON_PROGRESS, "msctls_progress32", 0x50000000, 8, 46, 238, 13 LTEXT "", IDC_SERVCON_INFO, 8, 5, 236, 11 diff --git a/base/applications/mscutils/servman/lang/zh-TW.rc b/base/applications/mscutils/servman/lang/zh-TW.rc index a29a41f31a6..27ca6c40bd5 100644 --- a/base/applications/mscutils/servman/lang/zh-TW.rc +++ b/base/applications/mscutils/servman/lang/zh-TW.rc @@ -234,7 +234,6 @@ IDD_DLG_PROGRESS DIALOGEX 6, 6, 255, 89 CAPTION "服務控制" FONT 9, "新細明體", 0, 0 STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | WS_VISIBLE | DS_MODALFRAME -EXSTYLE WS_EX_TOOLWINDOW BEGIN CONTROL "", IDC_SERVCON_PROGRESS, "msctls_progress32", 0x50000000, 8, 46, 238, 13 LTEXT "", IDC_SERVCON_INFO, 8, 5, 236, 11 diff --git a/base/applications/mscutils/servman/precomp.h b/base/applications/mscutils/servman/precomp.h index 5ec27109f61..d070bbc4dc3 100644 --- a/base/applications/mscutils/servman/precomp.h +++ b/base/applications/mscutils/servman/precomp.h @@ -7,9 +7,11 @@ #include <windef.h> #include <winbase.h> +#include <winerror.h> #include <wingdi.h> #include <winsvc.h> #include <wincon.h> + #include <shlobj.h> #include <commdlg.h> #include <strsafe.h> @@ -100,9 +102,9 @@ VOID ListViewSelectionChanged(PMAIN_WND_INFO Info, LPNMLISTVIEW pnmv); BOOL CreateListView(PMAIN_WND_INFO Info); /* start / stop / control */ -BOOL DoStartService(LPWSTR ServiceName, HANDLE hProgress, LPWSTR lpStartParams); -BOOL DoStopService(LPWSTR ServiceName, HANDLE hProgress); -BOOL DoControlService(LPWSTR ServiceName, HWND hProgress, DWORD Control); +DWORD DoStartService(LPWSTR ServiceName, HANDLE hProgress, LPWSTR lpStartParams); +DWORD DoStopService(LPWSTR ServiceName, HANDLE hProgress); +DWORD DoControlService(LPWSTR ServiceName, HWND hProgress, DWORD Control); /* progress.c */ #define DEFAULT_STEP 0 @@ -122,7 +124,6 @@ BOOL RefreshServiceList(PMAIN_WND_INFO Info); BOOL UpdateServiceStatus(ENUM_SERVICE_STATUS_PROCESS* pService); BOOL GetServiceList(PMAIN_WND_INFO Info); - /* propsheet.c */ typedef struct _SERVICEPROPSHEET { diff --git a/base/applications/mscutils/servman/progress.c b/base/applications/mscutils/servman/progress.c index cf5fe784300..fa3a82a3ab5 100644 --- a/base/applications/mscutils/servman/progress.c +++ b/base/applications/mscutils/servman/progress.c @@ -26,6 +26,25 @@ typedef struct _PROGRESS_DATA } PROGRESS_DATA, *PPROGRESS_DATA; +VOID ShowError(DWORD dwLastError) +{ + LPWSTR lpMsg; + + if (!FormatMessageW(FORMAT_MESSAGE_ALLOCATE_BUFFER | + FORMAT_MESSAGE_FROM_SYSTEM | + FORMAT_MESSAGE_IGNORE_INSERTS, + NULL, + dwLastError, + LANG_USER_DEFAULT, + (LPWSTR)&lpMsg, + 0, NULL)) + { + return; + } + + MessageBoxW(NULL, lpMsg, NULL, MB_OK | MB_ICONERROR); + LocalFree(lpMsg); +} static VOID ResetProgressDialog(HWND hDlg, @@ -67,6 +86,7 @@ ResetProgressDialog(HWND hDlg, unsigned int __stdcall ActionThread(void* Param) { PPROGRESS_DATA ProgressData = (PPROGRESS_DATA)Param; + DWORD dwResult; if (ProgressData->Action == ACTION_START) { @@ -76,13 +96,18 @@ unsigned int __stdcall ActionThread(void* Param) IDS_PROGRESS_INFO_START); /* Start the service */ - if (DoStartService(ProgressData->ServiceName, - ProgressData->hProgress, - ProgressData->Param)) + dwResult = DoStartService(ProgressData->ServiceName, + ProgressData->hProgress, + ProgressData->Param); + if (dwResult == ERROR_SUCCESS) { /* We're done, slide the progress bar up to the top */ CompleteProgressBar(ProgressData->hProgress); } + else + { + ShowError(dwResult); + } } else if (ProgressData->Action == ACTION_STOP || ProgressData->Action == ACTION_RESTART) { @@ -108,11 +133,16 @@ unsigned int __stdcall ActionThread(void* Param) IDS_PROGRESS_INFO_STOP); /* Stop the requested service */ - if (DoStopService(ProgressData->ServiceName, - ProgressData->hProgress)) + dwResult = DoStopService(ProgressData->ServiceName, + ProgressData->hProgress); + if (dwResult == ERROR_SUCCESS) { CompleteProgressBar(ProgressData->hProgress); } + else + { + ShowError(dwResult); + } /* Move onto the next string */ while (*lpStr != L'\0') @@ -124,11 +154,16 @@ unsigned int __stdcall ActionThread(void* Param) ProgressData->ServiceName, IDS_PROGRESS_INFO_STOP); - if (DoStopService(ProgressData->ServiceName, - ProgressData->hProgress)) + dwResult = DoStopService(ProgressData->ServiceName, + ProgressData->hProgress); + if (dwResult == ERROR_SUCCESS) { CompleteProgressBar(ProgressData->hProgress); } + else + { + ShowError(dwResult); + } /* If this was a restart, we'll need to start the service back up */ @@ -140,13 +175,18 @@ unsigned int __stdcall ActionThread(void* Param) IDS_PROGRESS_INFO_START); /* Start the service */ - if (DoStartService(ProgressData->ServiceName, - ProgressData->hProgress, - NULL)) + dwResult = DoStartService(ProgressData->ServiceName, + ProgressData->hProgress, + NULL); + if (dwResult == ERROR_SUCCESS) { /* We're done, slide the progress bar up to the top */ CompleteProgressBar(ProgressData->hProgress); } + else + { + ShowError(dwResult); + } } } else if (ProgressData->Action == ACTION_PAUSE) @@ -157,13 +197,18 @@ unsigned int __stdcall ActionThread(void* Param) IDS_PROGRESS_INFO_PAUSE); /* Pause the service */ - if (DoControlService(ProgressData->ServiceName, - ProgressData->hProgress, - SERVICE_CONTROL_PAUSE)) + dwResult = DoControlService(ProgressData->ServiceName, + ProgressData->hProgress, + SERVICE_CONTROL_PAUSE); + if (dwResult == ERROR_SUCCESS) { /* We're done, slide the progress bar up to the top */ CompleteProgressBar(ProgressData->hProgress); } + else + { + ShowError(dwResult); + } } else if (ProgressData->Action == ACTION_RESUME) { @@ -173,13 +218,18 @@ unsigned int __stdcall ActionThread(void* Param) IDS_PROGRESS_INFO_RESUME); /* resume the service */ - if (DoControlService(ProgressData->ServiceName, - ProgressData->hProgress, - SERVICE_CONTROL_CONTINUE)) + dwResult = DoControlService(ProgressData->ServiceName, + ProgressData->hProgress, + SERVICE_CONTROL_CONTINUE); + if (dwResult == ERROR_SUCCESS) { /* We're done, slide the progress bar up to the top */ CompleteProgressBar(ProgressData->hProgress); } + else + { + ShowError(dwResult); + } } diff --git a/base/applications/mscutils/servman/start.c b/base/applications/mscutils/servman/start.c index ac237e2d28b..eb931875c6f 100644 --- a/base/applications/mscutils/servman/start.c +++ b/base/applications/mscutils/servman/start.c @@ -9,9 +9,12 @@ #include "precomp.h" +#define NDEBUG +#include <debug.h> + #define MAX_WAIT_TIME 30000 -BOOL +DWORD DoStartService(LPWSTR ServiceName, HANDLE hProgress, LPWSTR lpStartParams) @@ -29,6 +32,7 @@ DoStartService(LPWSTR ServiceName, BOOL bWhiteSpace = TRUE; LPWSTR lpChar; DWORD dwArgsCount = 0; + DWORD dwResult = ERROR_SUCCESS; LPCWSTR *lpArgsVector = NULL; if (lpStartParams != NULL) @@ -59,7 +63,7 @@ DoStartService(LPWSTR ServiceName, */ lpArgsVector = LocalAlloc(LMEM_FIXED, dwArgsCount * sizeof(LPCWSTR)); if (!lpArgsVector) - return FALSE; + return GetLastError(); /* Fill the arguments vector */ dwArgsCount = 0; @@ -91,9 +95,10 @@ DoStartService(LPWSTR ServiceName, SC_MANAGER_CONNECT); if (!hSCManager) { + dwResult = GetLastError(); if (lpArgsVector) LocalFree((LPVOID)lpArgsVector); - return FALSE; + return dwResult; } hService = OpenServiceW(hSCManager, @@ -101,10 +106,11 @@ DoStartService(LPWSTR ServiceName, SERVICE_START | SERVICE_QUERY_STATUS); if (!hService) { + dwResult = GetLastError(); CloseServiceHandle(hSCManager); if (lpArgsVector) LocalFree((LPVOID)lpArgsVector); - return FALSE; + return dwResult; } /* Start the service */ @@ -167,6 +173,8 @@ DoStartService(LPWSTR ServiceName, &BytesNeeded)) { /* Something went wrong... */ + dwResult = GetLastError(); + DPRINT1("QueryServiceStatusEx failed: %d\n", dwResult); break; } @@ -183,24 +191,29 @@ DoStartService(LPWSTR ServiceName, if (GetTickCount() >= StartTickCount + MaxWait) { /* We have, give up */ + DPRINT1("Timeout\n"); + dwResult = ERROR_SERVICE_REQUEST_TIMEOUT; break; } } } } + else + { + dwResult = GetLastError(); + } if (ServiceStatus.dwCurrentState == SERVICE_RUNNING) { - Result = TRUE; + dwResult = ERROR_SUCCESS; } } CloseServiceHandle(hService); - CloseServiceHandle(hSCManager); if (lpArgsVector) LocalFree((LPVOID)lpArgsVector); - return Result; + return dwResult; } diff --git a/base/applications/mscutils/servman/stop.c b/base/applications/mscutils/servman/stop.c index 50c0a376fb2..c4a346dd003 100644 --- a/base/applications/mscutils/servman/stop.c +++ b/base/applications/mscutils/servman/stop.c @@ -9,9 +9,12 @@ #include "precomp.h" +#define NDEBUG +#include <debug.h> + #define MAX_WAIT_TIME 30000 -BOOL +DWORD DoStopService(_In_z_ LPWSTR ServiceName, _In_opt_ HANDLE hProgress) { @@ -22,21 +25,21 @@ DoStopService(_In_z_ LPWSTR ServiceName, DWORD StartTime; DWORD WaitTime; DWORD Timeout; - BOOL bRet = FALSE; - - + DWORD dwResult = ERROR_SUCCESS; + hSCManager = OpenSCManagerW(NULL, NULL, SC_MANAGER_CONNECT); - if (!hSCManager) return FALSE; + if (!hSCManager) return GetLastError(); hService = OpenServiceW(hSCManager, ServiceName, SERVICE_STOP | SERVICE_QUERY_STATUS); if (!hService) { + dwResult = GetLastError(); CloseServiceHandle(hSCManager); - return FALSE; + return dwResult; } if (hProgress) @@ -90,21 +93,31 @@ DoStopService(_In_z_ LPWSTR ServiceName, if (GetTickCount() - StartTime > Timeout) { /* Yep, give up */ + DPRINT1("Timeout\n"); + dwResult = ERROR_SERVICE_REQUEST_TIMEOUT; break; } } + else + { + dwResult = GetLastError(); + DPRINT1("QueryServiceStatusEx failed: %d\n", dwResult); + } } /* If the service is stopped, return TRUE */ if (ServiceStatus.dwCurrentState == SERVICE_STOPPED) { - bRet = TRUE; + dwResult = ERROR_SUCCESS; } } + else + { + dwResult = GetLastError(); + } CloseServiceHandle(hService); - CloseServiceHandle(hSCManager); - return bRet; + return dwResult; }

1 0

[reactos] 01/01: [KDGDB] Fix GCC8 build
by Sylvain Deverre 01 May '20

01 May '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=140ec9d037ee60a0476f9… commit 140ec9d037ee60a0476f917c216e882165d0b6e3 Author: Sylvain Deverre <deverre.sylv(a)gmail.com> AuthorDate: Fri May 1 16:37:13 2020 +0200 Commit: Sylvain Deverre <deverre.sylv(a)gmail.com> CommitDate: Fri May 1 16:37:13 2020 +0200 [KDGDB] Fix GCC8 build --- drivers/base/kdgdb/gdb_input.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/base/kdgdb/gdb_input.c b/drivers/base/kdgdb/gdb_input.c index e729beb37e1..3b898c46829 100644 --- a/drivers/base/kdgdb/gdb_input.c +++ b/drivers/base/kdgdb/gdb_input.c @@ -22,7 +22,7 @@ UINT_PTR gdb_dbg_tid; static inline KDSTATUS -LOOP_IF_SUCCESS(x) +LOOP_IF_SUCCESS(int x) { return (x == KdPacketReceived) ? (KDSTATUS)-1 : x; }

1 0

[reactos] 01/01: [CRT_APITEST] Implement wctomb() testcase (#2701)
by Bișoc George 01 May '20

01 May '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3cb0bdaa0bd427cba21a8… commit 3cb0bdaa0bd427cba21a8288ad0a4d37b2743037 Author: Bișoc George <fraizeraust99(a)gmail.com> AuthorDate: Fri May 1 16:01:11 2020 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Fri May 1 16:01:11 2020 +0200 [CRT_APITEST] Implement wctomb() testcase (#2701) --- .../rostests/apitests/crt/crtdll_crt_apitest.cmake | 2 +- .../rostests/apitests/crt/msvcrt_crt_apitest.cmake | 2 +- .../rostests/apitests/crt/ntdll_crt_apitest.cmake | 1 + modules/rostests/apitests/crt/testlist.c | 2 + modules/rostests/apitests/crt/wctomb.c | 67 ++++++++++++++++++++++ 5 files changed, 72 insertions(+), 2 deletions(-) diff --git a/modules/rostests/apitests/crt/crtdll_crt_apitest.cmake b/modules/rostests/apitests/crt/crtdll_crt_apitest.cmake index 768168681e8..f40c603c480 100644 --- a/modules/rostests/apitests/crt/crtdll_crt_apitest.cmake +++ b/modules/rostests/apitests/crt/crtdll_crt_apitest.cmake @@ -519,7 +519,7 @@ list(APPEND SOURCE_CRTDLL wcstombs.c wcstoul.c # wcsxfrm.c -# wctomb.c + wctomb.c # wprintf.c # wscanf.c ) diff --git a/modules/rostests/apitests/crt/msvcrt_crt_apitest.cmake b/modules/rostests/apitests/crt/msvcrt_crt_apitest.cmake index 2e3aaf9f3fc..e53d3b4f6fc 100644 --- a/modules/rostests/apitests/crt/msvcrt_crt_apitest.cmake +++ b/modules/rostests/apitests/crt/msvcrt_crt_apitest.cmake @@ -1255,7 +1255,7 @@ list(APPEND SOURCE_MSVCRT wcstoul.c # wcsxfrm.c # wctob -# wctomb.c + wctomb.c # wctomb_s # wprintf.c # wprintf_s.c diff --git a/modules/rostests/apitests/crt/ntdll_crt_apitest.cmake b/modules/rostests/apitests/crt/ntdll_crt_apitest.cmake index 41322e1c338..7f923043068 100644 --- a/modules/rostests/apitests/crt/ntdll_crt_apitest.cmake +++ b/modules/rostests/apitests/crt/ntdll_crt_apitest.cmake @@ -123,6 +123,7 @@ list(APPEND SOURCE_NTDLL # wcstol.c wcstombs.c wcstoul.c + wctomb.c ) if(ARCH STREQUAL "i386") diff --git a/modules/rostests/apitests/crt/testlist.c b/modules/rostests/apitests/crt/testlist.c index 3afeb450484..20587372301 100644 --- a/modules/rostests/apitests/crt/testlist.c +++ b/modules/rostests/apitests/crt/testlist.c @@ -26,6 +26,7 @@ extern void func_strtoul(void); extern void func_wcsnlen(void); extern void func_wcstombs(void); extern void func_wcstoul(void); +extern void func_wctomb(void); extern void func___getmainargs(void); extern void func_static_construct(void); @@ -44,6 +45,7 @@ const struct test winetest_testlist[] = { "strlen", func_strlen }, { "strtoul", func_strtoul }, { "wcstoul", func_wcstoul }, + { "wctomb", func_wctomb }, { "wcstombs", func_wcstombs }, #if defined(TEST_CRTDLL) || defined(TEST_MSVCRT) || defined(TEST_STATIC_CRT) // ... diff --git a/modules/rostests/apitests/crt/wctomb.c b/modules/rostests/apitests/crt/wctomb.c new file mode 100644 index 00000000000..b72d6156329 --- /dev/null +++ b/modules/rostests/apitests/crt/wctomb.c @@ -0,0 +1,67 @@ +/* + * PROJECT: ReactOS API tests + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Tests for wctomb + * COPYRIGHT: Copyright 2020 Bișoc George <george.bisoc(a)reactos.org> + */ + +#include <apitest.h> +#include <apitest_guard.h> + +#define WIN32_NO_STATUS +#include <stdio.h> +#include <stdlib.h> +#include <errno.h> +#include <locale.h> + +unsigned int cdecl ___lc_codepage_func(void); + +START_TEST(wctomb) +{ + int Length; + char *chDest; + char *loc; + unsigned int codepage = ___lc_codepage_func(); + wchar_t wchSrc[2] = {L'R', 0414}; // 0414 corresponds to a Russian character in Windows-1251 + + chDest = AllocateGuarded(sizeof(*chDest)); + if (!chDest) + { + skip("Buffer allocation failed!\n"); + return; + } + + /* Output the current locale of the system and codepage for comparison between ReactOS and Windows */ + loc = setlocale(LC_ALL, NULL); + printf("The current codepage of your system tested is (%u) and locale (%s).\n\n", codepage, loc); + + /* Do not give output to the caller */ + Length = wctomb(NULL, 0); + ok(Length == 0, "Expected no characters to be converted (because the output argument is refused) but got %d\n.", Length); + + /* Do the same but expect a valid wide character argument this time */ + Length = wctomb(NULL, wchSrc[0]); + ok(Length == 0, "Expected no characters to be converted (because the output argument is refused) but got %d\n.", Length); + + /* Don't return anything to the output even if conversion is impossible */ + Length = wctomb(NULL, wchSrc[1]); + ok(errno == 0, "The error number (errno) should be 0 even though an invalid character in current locale is given but got %d.\n", errno); + ok(Length == 0, "Expected no characters to be converted (because the output argument is refused) but got %d\n.", Length); + + /* Attempt to convert a character not possible in current locale */ + Length = wctomb(chDest, wchSrc[1]); + ok(Length == -1, "The conversion is not possible in current locale but got %d as returned value.\n", Length); + ok(errno == EILSEQ, "EILSEQ is expected in an illegal sequence conversion but got %d.\n", errno); + + /* Return a null wide character to the destination argument */ + Length = wctomb(chDest, 0); + ok(Length == 1, "Expected one character to be converted (the null character) but got %d.\n", Length); + ok_int(chDest[0], '\0'); + + /* Get the converted output and validate what we should get */ + Length = wctomb(chDest, wchSrc[0]); + ok(Length == 1, "Expected one character to be converted but got %d.\n", Length); + ok_int(chDest[0], 'R'); + + FreeGuarded(chDest); +}

1 0

[reactos] 01/01: [WIN32SS][NTDDRAW] Get complexity of visible region in DxEngGetDCState (#2604)
by Oleg Dubinskiy 01 May '20

01 May '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=855bf46399b0f3c852250… commit 855bf46399b0f3c852250cccf11fb655e536be78 Author: Oleg Dubinskiy <oleg.dubinskij2013(a)yandex.ua> AuthorDate: Fri May 1 16:57:11 2020 +0300 Commit: GitHub <noreply(a)github.com> CommitDate: Fri May 1 15:57:11 2020 +0200 [WIN32SS][NTDDRAW] Get complexity of visible region in DxEngGetDCState (#2604) CORE-7733 Get the complexity of visible region in the DxEngGetDCState() function, according to its remarks. This implementation returns a number of rectangles that make up the region, similarly to as it done in REGION_Complexity() function: https://git.reactos.org/?p=reactos.git;a=blob;f=win32ss/gdi/ntgdi/region.c;… It is required by MS ddraw.dll when calling win32k/dxg functions during launching DirectDraw test or any DirectX 1 - 7 apps/games. --- win32ss/reactx/ntddraw/dxeng.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/win32ss/reactx/ntddraw/dxeng.c b/win32ss/reactx/ntddraw/dxeng.c index f1c681f1e3f..24cb542643e 100644 --- a/win32ss/reactx/ntddraw/dxeng.c +++ b/win32ss/reactx/ntddraw/dxeng.c @@ -4,6 +4,7 @@ * FILE: win32ss/reactx/ntddraw/dxeng.c * PURPOSE: Implementation of DxEng functions * PROGRAMMERS: Magnus Olsen (magnus(a)greatlord.com) + * Oleg Dubinskiy (oleg.dubinskij2013(a)yandex.ua) */ #include <win32k.h> @@ -442,7 +443,7 @@ DxEngSetHdevData(HDEV hDev, * Return one of the type values * * @remarks. -* We do not have type 2 implemented yet +* none * *--*/ DWORD_PTR @@ -463,7 +464,8 @@ DxEngGetDCState(HDC hDC, retVal = (DWORD_PTR) pDC->fs & DC_FLAG_FULLSCREEN; break; case 2: - UNIMPLEMENTED; + /* Return the number of rectangles in the visible region. */ + retVal = (DWORD_PTR) pDC->prgnRao ? pDC->prgnRao->rdh.nCount : pDC->prgnVis->rdh.nCount; break; case 3: {

1 0

[reactos] 01/01: [OLE32][WINESYNC] Fix Wine's implementation of IMalloc.DidAlloc based from Wine 5.7 (#2662)
by Kyle Katarn 01 May '20

01 May '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8bd6b9b6c204c513a3756… commit 8bd6b9b6c204c513a37569c291198a8a5f214cb0 Author: Kyle Katarn <contact(a)kcsoftwares.com> AuthorDate: Fri May 1 15:01:19 2020 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Fri May 1 15:01:19 2020 +0200 [OLE32][WINESYNC] Fix Wine's implementation of IMalloc.DidAlloc based from Wine 5.7 (#2662) CORE-15262 This fixes the exceptions raised when calling "Scan folder" a second time in SUMo 5.10.16. The problem was reported to WineHQ : https://bugs.winehq.org/show_bug.cgi?id=48941 Import Wine commits by Nikolay Sivov, with the help of Doug Lyons: - https://source.winehq.org/git/wine.git/commit/08f4b6ee0a05fe27e56cb9777dce8… ole32: Fix IMalloc::DidAlloc() return value to reflect block validity. - https://source.winehq.org/git/wine.git/commit/1e3bc9f3a61a197e794cca07a59c9… ole32: Improve thread safety in DidAlloc(). - https://source.winehq.org/git/wine.git/commit/06d36b1adf1ae7b73a200d6a35a14… ole32: Fix spy callback arguments for IMalloc::GetSize(). --- dll/win32/ole32/ifs.c | 96 +++++++++++++++++++++++++++++++-------------------- 1 file changed, 59 insertions(+), 37 deletions(-) diff --git a/dll/win32/ole32/ifs.c b/dll/win32/ole32/ifs.c index ea03e9b0a28..91474267207 100644 --- a/dll/win32/ole32/ifs.c +++ b/dll/win32/ole32/ifs.c @@ -114,6 +114,20 @@ static BOOL AddMemoryLocation(LPVOID * pMem) return TRUE; } +static void** mallocspy_is_allocation_spyed(const void *mem) +{ + void **current = Malloc32.SpyedBlocks; + + while (*current != mem) + { + current++; + if (current >= Malloc32.SpyedBlocks + Malloc32.SpyedBlockTableLength) + return NULL; + } + + return current; +} + static BOOL RemoveMemoryLocation(LPCVOID pMem) { LPVOID * Current; @@ -122,15 +136,9 @@ static BOOL RemoveMemoryLocation(LPCVOID pMem) if (!Malloc32.SpyedBlockTableLength && !SetSpyedBlockTableLength(0x1000)) return FALSE; - Current = Malloc32.SpyedBlocks; - - /* find the location */ - while (*Current != pMem) { - Current++; - if (Current >= Malloc32.SpyedBlocks + Malloc32.SpyedBlockTableLength) - return FALSE; /* not found */ - } - + if (!(Current = mallocspy_is_allocation_spyed(pMem))) + return FALSE; + /* location found */ Malloc32.SpyedAllocationsLeft--; /*TRACE("%lu\n",Malloc32.SpyedAllocationsLeft);*/ @@ -288,50 +296,64 @@ static void WINAPI IMalloc_fnFree(IMalloc *iface, void *pv) * win95: size allocated (4 byte boundarys) * win2k: size originally requested !!! (allocated on 8 byte boundarys) */ -static SIZE_T WINAPI IMalloc_fnGetSize(IMalloc *iface, void *pv) +static SIZE_T WINAPI IMalloc_fnGetSize(IMalloc *iface, void *mem) { - SIZE_T cb; - BOOL fSpyed = FALSE; + BOOL spyed_block = FALSE, spy_active = FALSE; + SIZE_T size; - TRACE("(%p)\n",pv); + TRACE("(%p)\n", mem); - if(Malloc32.pSpy) { - EnterCriticalSection(&IMalloc32_SpyCS); - pv = IMallocSpy_PreGetSize(Malloc32.pSpy, pv, fSpyed); - } + if (!mem) + return (SIZE_T)-1; - cb = HeapSize(GetProcessHeap(),0,pv); + if (Malloc32.pSpy) + { + EnterCriticalSection(&IMalloc32_SpyCS); + spyed_block = !!mallocspy_is_allocation_spyed(mem); + spy_active = TRUE; + mem = IMallocSpy_PreGetSize(Malloc32.pSpy, mem, spyed_block); + } - if(Malloc32.pSpy) { - cb = IMallocSpy_PostGetSize(Malloc32.pSpy, cb, fSpyed); - LeaveCriticalSection(&IMalloc32_SpyCS); - } + size = HeapSize(GetProcessHeap(), 0, mem); - return cb; + if (spy_active) + { + size = IMallocSpy_PostGetSize(Malloc32.pSpy, size, spyed_block); + LeaveCriticalSection(&IMalloc32_SpyCS); + } + return size; } /****************************************************************************** * IMalloc32_DidAlloc [VTABLE] */ -static INT WINAPI IMalloc_fnDidAlloc(IMalloc *iface, void *pv) +static INT WINAPI IMalloc_fnDidAlloc(IMalloc *iface, void *mem) { - BOOL fSpyed = FALSE; - int didAlloc; + BOOL spyed_block = FALSE, spy_active = FALSE; + int did_alloc; - TRACE("(%p)\n",pv); + TRACE("(%p)\n", mem); - if(Malloc32.pSpy) { - EnterCriticalSection(&IMalloc32_SpyCS); - pv = IMallocSpy_PreDidAlloc(Malloc32.pSpy, pv, fSpyed); - } + if (!mem) + return -1; - didAlloc = -1; + if (Malloc32.pSpy) + { + EnterCriticalSection(&IMalloc32_SpyCS); + spyed_block = !!mallocspy_is_allocation_spyed(mem); + spy_active = TRUE; + mem = IMallocSpy_PreDidAlloc(Malloc32.pSpy, mem, spyed_block); + } - if(Malloc32.pSpy) { - didAlloc = IMallocSpy_PostDidAlloc(Malloc32.pSpy, pv, fSpyed, didAlloc); - LeaveCriticalSection(&IMalloc32_SpyCS); - } - return didAlloc; + did_alloc = HeapValidate(GetProcessHeap(), 0, mem); + + if (spy_active) + { + did_alloc = IMallocSpy_PostDidAlloc(Malloc32.pSpy, mem, spyed_block, did_alloc); + LeaveCriticalSection(&IMalloc32_SpyCS); + } + + return did_alloc; } /******************************************************************************

1 0

[reactos] 01/01: [SYSDM] Virtual Memory panel : Complementary fix from PR #2597 (#2706)
by Kyle Katarn 01 May '20

01 May '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3bee3b92ab0aa3250a7f3… commit 3bee3b92ab0aa3250a7f3e0bfa272a2cbf288e60 Author: Kyle Katarn <contact(a)kcsoftwares.com> AuthorDate: Fri May 1 14:47:04 2020 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Fri May 1 14:47:04 2020 +0200 [SYSDM] Virtual Memory panel : Complementary fix from PR #2597 (#2706) Fix all lang resources in order to reflect main changes from PR #2597 (16MB>2MB). To translators: Please sync the respective translations! CORE-12486 --- dll/cpl/sysdm/lang/bg-BG.rc | 2 +- dll/cpl/sysdm/lang/cs-CZ.rc | 2 +- dll/cpl/sysdm/lang/da-DK.rc | 2 +- dll/cpl/sysdm/lang/de-DE.rc | 2 +- dll/cpl/sysdm/lang/el-GR.rc | 2 +- dll/cpl/sysdm/lang/en-US.rc | 2 +- dll/cpl/sysdm/lang/es-ES.rc | 2 +- dll/cpl/sysdm/lang/he-IL.rc | 2 +- dll/cpl/sysdm/lang/hu-HU.rc | 2 +- dll/cpl/sysdm/lang/id-ID.rc | 2 +- dll/cpl/sysdm/lang/it-IT.rc | 2 +- dll/cpl/sysdm/lang/ja-JP.rc | 2 +- dll/cpl/sysdm/lang/nl-NL.rc | 2 +- dll/cpl/sysdm/lang/no-NO.rc | 2 +- dll/cpl/sysdm/lang/pl-PL.rc | 2 +- dll/cpl/sysdm/lang/pt-PT.rc | 2 +- dll/cpl/sysdm/lang/ro-RO.rc | 2 +- dll/cpl/sysdm/lang/ru-RU.rc | 2 +- dll/cpl/sysdm/lang/sk-SK.rc | 2 +- dll/cpl/sysdm/lang/sq-AL.rc | 2 +- dll/cpl/sysdm/lang/sv-SE.rc | 2 +- dll/cpl/sysdm/lang/tr-TR.rc | 2 +- dll/cpl/sysdm/lang/uk-UA.rc | 2 +- dll/cpl/sysdm/lang/zh-CN.rc | 2 +- dll/cpl/sysdm/lang/zh-TW.rc | 2 +- 25 files changed, 25 insertions(+), 25 deletions(-) diff --git a/dll/cpl/sysdm/lang/bg-BG.rc b/dll/cpl/sysdm/lang/bg-BG.rc index 1ddf34112df..2d68c2f80ef 100644 --- a/dll/cpl/sysdm/lang/bg-BG.rc +++ b/dll/cpl/sysdm/lang/bg-BG.rc @@ -333,7 +333,7 @@ BEGIN IDS_MESSAGEBOXTITLE "Приложение за таблото за управление на уредбата" IDS_WARNINITIALSIZE "Въведете числена стойност за началния размер на страниращия файл." IDS_WARNMAXIMUMSIZE "Въведете числена стойност за върховия размер на страниращия файл." - IDS_WARNINITIALRANGE "Началният размер на страниращия файл не трябва да е по-малък от 16 МБ и не трябва да надхвърля свободното пространство на избраното устройство." + IDS_WARNINITIALRANGE "Началният размер на страниращия файл не трябва да е по-малък от 2 МБ и не трябва да надхвърля свободното пространство на избраното устройство." IDS_WARNMAXIMUMRANGE "Върховият размер на страниращия файл не трябва да е по-малък от началния и не трябва да надвишава свободното пространство на избраното устройство" IDS_PAGEFILE_NONE "Няма" IDS_PAGEFILE_SYSTEM "System Managed" diff --git a/dll/cpl/sysdm/lang/cs-CZ.rc b/dll/cpl/sysdm/lang/cs-CZ.rc index 4b050490fa9..8455e8bccc6 100644 --- a/dll/cpl/sysdm/lang/cs-CZ.rc +++ b/dll/cpl/sysdm/lang/cs-CZ.rc @@ -338,7 +338,7 @@ BEGIN IDS_MESSAGEBOXTITLE "Systémový aplet kontrolních panelů" IDS_WARNINITIALSIZE "Zadejte číselnou hodnotu pro počáteční velikost stránkovacího souboru." IDS_WARNMAXIMUMSIZE "Zadejte číselnou hodnotu pro maximální velikost stránkovacího souboru." - IDS_WARNINITIALRANGE "Počáteční velikost stránkovacího souboru nesmí být menší než 16 MB a nesmí překročit množství volného místa na zvolené diskové jednotce." + IDS_WARNINITIALRANGE "Počáteční velikost stránkovacího souboru nesmí být menší než 2 MB a nesmí překročit množství volného místa na zvolené diskové jednotce." IDS_WARNMAXIMUMRANGE "Maximální velikost stránkovacího souboru nesmí být menší než velikost počáteční, nesmí být větší než 4095 MB a nesmí překročit množství volného místa na zvolené diskové jednotce." IDS_PAGEFILE_NONE "Není" IDS_PAGEFILE_SYSTEM "Spravováno systémem" diff --git a/dll/cpl/sysdm/lang/da-DK.rc b/dll/cpl/sysdm/lang/da-DK.rc index db65da075c7..f0aef399c43 100644 --- a/dll/cpl/sysdm/lang/da-DK.rc +++ b/dll/cpl/sysdm/lang/da-DK.rc @@ -333,7 +333,7 @@ BEGIN IDS_MESSAGEBOXTITLE "System control panel applet" IDS_WARNINITIALSIZE "Enter a numeric value for the initial size of the paging file." IDS_WARNMAXIMUMSIZE "Enter a numeric value for the maximum size of the paging file." - IDS_WARNINITIALRANGE "The initial size of the paging file must not be smaller than 16 MB and must not exceed the available space on the selected drive." + IDS_WARNINITIALRANGE "The initial size of the paging file must not be smaller than 2 MB, must not be larger than 4095 MB and must not exceed the available space on the selected drive." IDS_WARNMAXIMUMRANGE "The maximum size of the paging file must not be smaller than its initial size, must not be larger than 4095 MB and must not exceed the available space on the selected drive." IDS_PAGEFILE_NONE "None" IDS_PAGEFILE_SYSTEM "System Managed" diff --git a/dll/cpl/sysdm/lang/de-DE.rc b/dll/cpl/sysdm/lang/de-DE.rc index efcb621f5b3..97e18528cbc 100644 --- a/dll/cpl/sysdm/lang/de-DE.rc +++ b/dll/cpl/sysdm/lang/de-DE.rc @@ -342,7 +342,7 @@ BEGIN IDS_MESSAGEBOXTITLE "Systemsteuerungsoption ""System""" IDS_WARNINITIALSIZE "Geben Sie einen numerischen Wert für die Anfangsgröße der Auslagerungsdatei an." IDS_WARNMAXIMUMSIZE "Geben Sie einen numerischen Wert für die Maximalgröße der Auslagerungsdatei an." - IDS_WARNINITIALRANGE "Die Anfangsgröße der Auslagerungsdatei darf nicht kleiner als 16 MB sein und darf den verfügbaren Speicherplatz auf dem gewählten Laufwerk nicht überschreiten." + IDS_WARNINITIALRANGE "Die Anfangsgröße der Auslagerungsdatei darf nicht kleiner als 2 MB sein und darf den verfügbaren Speicherplatz auf dem gewählten Laufwerk nicht überschreiten." IDS_WARNMAXIMUMRANGE "Die Maximalgröße der Auslagerungsdatei darf nicht kleiner als die Anfangsgröße sein und darf den verfügbaren Speicherplatz auf dem gewählten Laufwerk nicht überschreiten." IDS_PAGEFILE_NONE "Keine" IDS_PAGEFILE_SYSTEM "Systemverwaltet" diff --git a/dll/cpl/sysdm/lang/el-GR.rc b/dll/cpl/sysdm/lang/el-GR.rc index 9385be64acd..ee84b6e78dc 100644 --- a/dll/cpl/sysdm/lang/el-GR.rc +++ b/dll/cpl/sysdm/lang/el-GR.rc @@ -333,7 +333,7 @@ BEGIN IDS_MESSAGEBOXTITLE "System control panel applet" IDS_WARNINITIALSIZE "Enter a numeric value for the initial size of the paging file." IDS_WARNMAXIMUMSIZE "Enter a numeric value for the maximum size of the paging file." - IDS_WARNINITIALRANGE "The initial size of the paging file must not be smaller than 16 MB and must not exceed the available space on the selected drive." + IDS_WARNINITIALRANGE "The initial size of the paging file must not be smaller than 2 MB, must not be larger than 4095 MB and must not exceed the available space on the selected drive." IDS_WARNMAXIMUMRANGE "The maximum size of the paging file must not be smaller than its initial size, must not be larger than 4095 MB and must not exceed the available space on the selected drive." IDS_PAGEFILE_NONE "Κανένα" IDS_PAGEFILE_SYSTEM "System Managed" diff --git a/dll/cpl/sysdm/lang/en-US.rc b/dll/cpl/sysdm/lang/en-US.rc index c4dd645ca72..c6420f0db42 100644 --- a/dll/cpl/sysdm/lang/en-US.rc +++ b/dll/cpl/sysdm/lang/en-US.rc @@ -333,7 +333,7 @@ BEGIN IDS_MESSAGEBOXTITLE "System control panel applet" IDS_WARNINITIALSIZE "Enter a numeric value for the initial size of the paging file." IDS_WARNMAXIMUMSIZE "Enter a numeric value for the maximum size of the paging file." - IDS_WARNINITIALRANGE "The initial size of the paging file must not be smaller than 16 MB and must not exceed the available space on the selected drive." + IDS_WARNINITIALRANGE "The initial size of the paging file must not be smaller than 2 MB, must not be larger than 4095 MB and must not exceed the available space on the selected drive." IDS_WARNMAXIMUMRANGE "The maximum size of the paging file must not be smaller than its initial size, must not be larger than 4095 MB and must not exceed the available space on the selected drive." IDS_PAGEFILE_NONE "None" IDS_PAGEFILE_SYSTEM "System Managed" diff --git a/dll/cpl/sysdm/lang/es-ES.rc b/dll/cpl/sysdm/lang/es-ES.rc index 8957eac4fd1..a942a41037a 100644 --- a/dll/cpl/sysdm/lang/es-ES.rc +++ b/dll/cpl/sysdm/lang/es-ES.rc @@ -335,7 +335,7 @@ BEGIN IDS_MESSAGEBOXTITLE "Applet de sistema del Panel de control" IDS_WARNINITIALSIZE "Introduzca el tamaño inicial del archivo de paginación." IDS_WARNMAXIMUMSIZE "Introduzca el tamaño máximo del archivo de paginación." - IDS_WARNINITIALRANGE "El tamaño inicial del archivo de paginación no puede ser inferior a 16 MB y no puede exceder el espacio disponible en la unidad seleccionada." + IDS_WARNINITIALRANGE "El tamaño inicial del archivo de paginación no puede ser inferior a 2 MB y no puede exceder el espacio disponible en la unidad seleccionada." IDS_WARNMAXIMUMRANGE "El tamaño máximo del archivo de paginación no puede ser inferior al tamaño inicial y no puede exceder el espacio disponible en la unidad seleccionada." IDS_PAGEFILE_NONE "Ninguno" IDS_PAGEFILE_SYSTEM "Administrado por el sistema" diff --git a/dll/cpl/sysdm/lang/he-IL.rc b/dll/cpl/sysdm/lang/he-IL.rc index f8e3bc06fd0..07efe6bdf9f 100644 --- a/dll/cpl/sysdm/lang/he-IL.rc +++ b/dll/cpl/sysdm/lang/he-IL.rc @@ -335,7 +335,7 @@ BEGIN IDS_MESSAGEBOXTITLE "System control panel applet" IDS_WARNINITIALSIZE "Enter a numeric value for the initial size of the paging file." IDS_WARNMAXIMUMSIZE "Enter a numeric value for the maximum size of the paging file." - IDS_WARNINITIALRANGE "The initial size of the paging file must not be smaller than 16 MB and must not exceed the available space on the selected drive." + IDS_WARNINITIALRANGE "The initial size of the paging file must not be smaller than 2 MB, must not be larger than 4095 MB and must not exceed the available space on the selected drive." IDS_WARNMAXIMUMRANGE "The maximum size of the paging file must not be smaller than its initial size, must not be larger than 4095 MB and must not exceed the available space on the selected drive." IDS_PAGEFILE_NONE "ללא" IDS_PAGEFILE_SYSTEM "System Managed" diff --git a/dll/cpl/sysdm/lang/hu-HU.rc b/dll/cpl/sysdm/lang/hu-HU.rc index 80483dd1df0..0b5f5aae3d4 100644 --- a/dll/cpl/sysdm/lang/hu-HU.rc +++ b/dll/cpl/sysdm/lang/hu-HU.rc @@ -335,7 +335,7 @@ BEGIN IDS_MESSAGEBOXTITLE "System control panel applet" IDS_WARNINITIALSIZE "Enter a numeric value for the initial size of the paging file." IDS_WARNMAXIMUMSIZE "Enter a numeric value for the maximum size of the paging file." - IDS_WARNINITIALRANGE "The initial size of the paging file must not be smaller than 16 MB and must not exceed the available space on the selected drive." + IDS_WARNINITIALRANGE "The initial size of the paging file must not be smaller than 2 MB, must not be larger than 4095 MB and must not exceed the available space on the selected drive." IDS_WARNMAXIMUMRANGE "The maximum size of the paging file must not be smaller than its initial size, must not be larger than 4095 MB and must not exceed the available space on the selected drive." IDS_PAGEFILE_NONE "None" IDS_PAGEFILE_SYSTEM "System Managed" diff --git a/dll/cpl/sysdm/lang/id-ID.rc b/dll/cpl/sysdm/lang/id-ID.rc index 15d1b056c91..e22b0b90b72 100644 --- a/dll/cpl/sysdm/lang/id-ID.rc +++ b/dll/cpl/sysdm/lang/id-ID.rc @@ -333,7 +333,7 @@ BEGIN IDS_MESSAGEBOXTITLE "Applet panel kontrol sistem" IDS_WARNINITIALSIZE "Masukkan nilai numerik untuk ukuran awal halaman berkas." IDS_WARNMAXIMUMSIZE "Masukkan nilai numerik untuk ukuran maksimum halaman berkas." - IDS_WARNINITIALRANGE "Ukuran awal halaman berkas tidak boleh lebih kecil dari 16 MB dan tidak boleh melebihi ruang yang tersedia pada drive yang dipilih." + IDS_WARNINITIALRANGE "Ukuran awal halaman berkas tidak boleh lebih kecil dari 2 MB dan tidak boleh melebihi ruang yang tersedia pada drive yang dipilih." IDS_WARNMAXIMUMRANGE "Ukuran maksimum halaman berkas tidak boleh lebih kecil dari ukuran awal, maupun lebih besar dari 4095 MB dan tidak boleh melebihi ruang yang tersedia pada drive yang dipilih." IDS_PAGEFILE_NONE "Tidak ada" IDS_PAGEFILE_SYSTEM "Diatur Sistem" diff --git a/dll/cpl/sysdm/lang/it-IT.rc b/dll/cpl/sysdm/lang/it-IT.rc index 29a764ef582..a00de37622c 100644 --- a/dll/cpl/sysdm/lang/it-IT.rc +++ b/dll/cpl/sysdm/lang/it-IT.rc @@ -333,7 +333,7 @@ BEGIN IDS_MESSAGEBOXTITLE "Applet di sistema del pannello di controllo" IDS_WARNINITIALSIZE "Immettere la dimensione iniziale del file di paging." IDS_WARNMAXIMUMSIZE "Immettere la dimensione massima del file di paging." - IDS_WARNINITIALRANGE "La dimensione iniziale del file di paging non può essere inferiore a 16 MB e non può superare lo spazio disponibile nell'unità selezionata." + IDS_WARNINITIALRANGE "La dimensione iniziale del file di paging non può essere inferiore a 2 MB e non può superare lo spazio disponibile nell'unità selezionata." IDS_WARNMAXIMUMRANGE "La dimensione massima del file di paging non può essere inferiore a quella iniziale e non può superare lo spazio disponibile nell'unità selezionata." IDS_PAGEFILE_NONE "None" IDS_PAGEFILE_SYSTEM "System Managed" diff --git a/dll/cpl/sysdm/lang/ja-JP.rc b/dll/cpl/sysdm/lang/ja-JP.rc index 677f5a134d5..aee2ec1fb9a 100644 --- a/dll/cpl/sysdm/lang/ja-JP.rc +++ b/dll/cpl/sysdm/lang/ja-JP.rc @@ -333,7 +333,7 @@ BEGIN IDS_MESSAGEBOXTITLE "システムコントロールパネルアプレット" IDS_WARNINITIALSIZE "ページングファイルの初期サイズの数値を入力して下さい。" IDS_WARNMAXIMUMSIZE "ページングファイルの最大サイズの数値を入力して下さい。" - IDS_WARNINITIALRANGE "ページングファイルの初期サイズは16 MB以上でなければなりません。また、選択中のドライブの利用可能なサイズを超えてはいけません。" + IDS_WARNINITIALRANGE "ページングファイルの初期サイズは2 MB以上でなければなりません。また、選択中のドライブの利用可能なサイズを超えてはいけません。" IDS_WARNMAXIMUMRANGE "ページングファイルの最大サイズは初期サイズ以上でなければなりません。また、4095 MB か選択中のドライブの利用可能なサイズを超えてはいけません。" IDS_PAGEFILE_NONE "なし" IDS_PAGEFILE_SYSTEM "システム管理" diff --git a/dll/cpl/sysdm/lang/nl-NL.rc b/dll/cpl/sysdm/lang/nl-NL.rc index e70ac03f5ed..934291f25d5 100644 --- a/dll/cpl/sysdm/lang/nl-NL.rc +++ b/dll/cpl/sysdm/lang/nl-NL.rc @@ -333,7 +333,7 @@ BEGIN IDS_MESSAGEBOXTITLE "System control panel applet" IDS_WARNINITIALSIZE "Enter a numeric value for the initial size of the paging file." IDS_WARNMAXIMUMSIZE "Enter a numeric value for the maximum size of the paging file." - IDS_WARNINITIALRANGE "The initial size of the paging file must not be smaller than 16 MB and must not exceed the available space on the selected drive." + IDS_WARNINITIALRANGE "The initial size of the paging file must not be smaller than 2 MB, must not be larger than 4095 MB and must not exceed the available space on the selected drive." IDS_WARNMAXIMUMRANGE "The maximum size of the paging file must not be smaller than its initial size, must not be larger than 4095 MB and must not exceed the available space on the selected drive." IDS_PAGEFILE_NONE "None" IDS_PAGEFILE_SYSTEM "System Managed" diff --git a/dll/cpl/sysdm/lang/no-NO.rc b/dll/cpl/sysdm/lang/no-NO.rc index c4056c5cdf4..5f71288f883 100644 --- a/dll/cpl/sysdm/lang/no-NO.rc +++ b/dll/cpl/sysdm/lang/no-NO.rc @@ -333,7 +333,7 @@ BEGIN IDS_MESSAGEBOXTITLE "System control panel applet" IDS_WARNINITIALSIZE "Enter a numeric value for the initial size of the paging file." IDS_WARNMAXIMUMSIZE "Enter a numeric value for the maximum size of the paging file." - IDS_WARNINITIALRANGE "The initial size of the paging file must not be smaller than 16 MB and must not exceed the available space on the selected drive." + IDS_WARNINITIALRANGE "The initial size of the paging file must not be smaller than 2 MB, must not be larger than 4095 MB and must not exceed the available space on the selected drive." IDS_WARNMAXIMUMRANGE "The maximum size of the paging file must not be smaller than its initial size, must not be larger than 4095 MB and must not exceed the available space on the selected drive." IDS_PAGEFILE_NONE "Ingen" IDS_PAGEFILE_SYSTEM "System Managed" diff --git a/dll/cpl/sysdm/lang/pl-PL.rc b/dll/cpl/sysdm/lang/pl-PL.rc index 995603d74fd..cf95dd31017 100644 --- a/dll/cpl/sysdm/lang/pl-PL.rc +++ b/dll/cpl/sysdm/lang/pl-PL.rc @@ -342,7 +342,7 @@ BEGIN IDS_MESSAGEBOXTITLE "System" IDS_WARNINITIALSIZE "Wprowadź wielkość dla początkowego rozmiaru pliku stronicowania." IDS_WARNMAXIMUMSIZE "Wprowadź wielkość dla maksymalnego rozmiaru pliku stronicowania." - IDS_WARNINITIALRANGE "Początkowy rozmiar pliku stronicowania nie może być mniejszy niż 16 MB i nie może przekraczać dostępnej ilości miejsca w wybranym napędzie." + IDS_WARNINITIALRANGE "Początkowy rozmiar pliku stronicowania nie może być mniejszy niż 2 MB i nie może przekraczać dostępnej ilości miejsca w wybranym napędzie." IDS_WARNMAXIMUMRANGE "Maksymalny rozmiar pliku stronicowania nie może być mniejszy niż jego rozmiar początkowy i nie może przekraczać dostępnej ilości miejsca w wybranym napędzie." IDS_PAGEFILE_NONE "Brak" IDS_PAGEFILE_SYSTEM "Kontrolowany przez system" diff --git a/dll/cpl/sysdm/lang/pt-PT.rc b/dll/cpl/sysdm/lang/pt-PT.rc index 3fb1b775e04..e60a2c04413 100644 --- a/dll/cpl/sysdm/lang/pt-PT.rc +++ b/dll/cpl/sysdm/lang/pt-PT.rc @@ -337,7 +337,7 @@ BEGIN IDS_MESSAGEBOXTITLE "Aplicação do painel de controle do sistema" IDS_WARNINITIALSIZE "Digite um valor numérico para o tamanho inicial do arquivo de paginação." IDS_WARNMAXIMUMSIZE "Digite um valor numérico para o tamanho máximo do arquivo de paginação." - IDS_WARNINITIALRANGE "O tamanho inicial do arquivo de paginação não deve ser menor que 16 MB e não deve exceder o espaço disponível na unidade seleccionada." + IDS_WARNINITIALRANGE "O tamanho inicial do arquivo de paginação não deve ser menor que 2 MB e não deve exceder o espaço disponível na unidade seleccionada." IDS_WARNMAXIMUMRANGE "O tamanho máximo do arquivo de paginação não deve ser menor que o tamanho inicial, não deve ser maior que 4095 MB e não deve exceder o espaço disponível na unidade seleccionada." IDS_PAGEFILE_NONE "Nenhum" IDS_PAGEFILE_SYSTEM "Sistema gerenciado" diff --git a/dll/cpl/sysdm/lang/ro-RO.rc b/dll/cpl/sysdm/lang/ro-RO.rc index 2aa603a7f13..b7c7503e2f0 100644 --- a/dll/cpl/sysdm/lang/ro-RO.rc +++ b/dll/cpl/sysdm/lang/ro-RO.rc @@ -342,7 +342,7 @@ BEGIN IDS_MESSAGEBOXTITLE "Specificare valori de sistem" IDS_WARNINITIALSIZE "Introduceți o valoare numerică pentru dimensiunea inițială a fișierului de paginare." IDS_WARNMAXIMUMSIZE "Introduceți o valoare numerică pentru dimensiunea maximă a fișierului de paginare." - IDS_WARNINITIALRANGE "Dimensiunea inițială a fișierului de paginare trebuie să fie încadrată între 16 Mo și spațiul liber disponibil al unității selectate." + IDS_WARNINITIALRANGE "Dimensiunea inițială a fișierului de paginare trebuie să fie încadrată între 2 Mo și spațiul liber disponibil al unității selectate." IDS_WARNMAXIMUMRANGE "Dimensiunea maximă a fișierului de paginare trebuie să fie încadrată între dimensiunea inițială și spațiul liber disponibil al unității selectate." IDS_PAGEFILE_NONE "Nespecificat" IDS_PAGEFILE_SYSTEM "Gestionat de sistem" diff --git a/dll/cpl/sysdm/lang/ru-RU.rc b/dll/cpl/sysdm/lang/ru-RU.rc index 7000629b43d..d4c83cef76c 100644 --- a/dll/cpl/sysdm/lang/ru-RU.rc +++ b/dll/cpl/sysdm/lang/ru-RU.rc @@ -333,7 +333,7 @@ BEGIN IDS_MESSAGEBOXTITLE "Панель управления системы" IDS_WARNINITIALSIZE "Введите числовое значение исходного размера файла подкачки." IDS_WARNMAXIMUMSIZE "Введите числовое значение для параметра максимальный размер файла подкачки." - IDS_WARNINITIALRANGE "Начальный размер файла подкачки должен быть не меньше, чем 16 МБ и не должен превышать свободного места на выбранном диске." + IDS_WARNINITIALRANGE "Начальный размер файла подкачки должен быть не меньше, чем 2 МБ и не должен превышать свободного места на выбранном диске." IDS_WARNMAXIMUMRANGE "Максимальный размер файла подкачки должен быть не меньше, чем начальный размер, который не должен превышать свободного места на выбранном диске." IDS_PAGEFILE_NONE "Нет" IDS_PAGEFILE_SYSTEM "По выбору системы" diff --git a/dll/cpl/sysdm/lang/sk-SK.rc b/dll/cpl/sysdm/lang/sk-SK.rc index be3f36416e7..4fd5ae9cc2d 100644 --- a/dll/cpl/sysdm/lang/sk-SK.rc +++ b/dll/cpl/sysdm/lang/sk-SK.rc @@ -341,7 +341,7 @@ BEGIN IDS_MESSAGEBOXTITLE "System control panel applet" IDS_WARNINITIALSIZE "Enter a numeric value for the initial size of the paging file." IDS_WARNMAXIMUMSIZE "Enter a numeric value for the maximum size of the paging file." - IDS_WARNINITIALRANGE "The initial size of the paging file must not be smaller than 16 MB and must not exceed the available space on the selected drive." + IDS_WARNINITIALRANGE "The initial size of the paging file must not be smaller than 2 MB, must not be larger than 4095 MB and must not exceed the available space on the selected drive." IDS_WARNMAXIMUMRANGE "The maximum size of the paging file must not be smaller than its initial size, must not be larger than 4095 MB and must not exceed the available space on the selected drive." IDS_PAGEFILE_NONE "Žiadne" IDS_PAGEFILE_SYSTEM "System Managed" diff --git a/dll/cpl/sysdm/lang/sq-AL.rc b/dll/cpl/sysdm/lang/sq-AL.rc index 236b7f1b28a..50a28f8e79c 100644 --- a/dll/cpl/sysdm/lang/sq-AL.rc +++ b/dll/cpl/sysdm/lang/sq-AL.rc @@ -333,7 +333,7 @@ BEGIN IDS_MESSAGEBOXTITLE "Sistemi i kontrollit panelit programeve" IDS_WARNINITIALSIZE "Futni një vlerë numerike për madhësinë fillestare e faqeve të dokumentave." IDS_WARNMAXIMUMSIZE "Futni një vlerë numerike për madhësinë maksimale e faqeve të dokumentave." - IDS_WARNINITIALRANGE "Madhësia fillestare e faqes së dokumentit nuk duhet të jetë më e vogël se 16 MB dhe nuk duhet të kalojë hapësirën në dispozicion në driver-in e përzgjedhur." + IDS_WARNINITIALRANGE "Madhësia fillestare e faqes së dokumentit nuk duhet të jetë më e vogël se 2 MB dhe nuk duhet të kalojë hapësirën në dispozicion në driver-in e përzgjedhur." IDS_WARNMAXIMUMRANGE "Madhësia maksimale e faqes së dokumenit nuk duhet të jetë më e vogël se madhësia e saj fillestare dhe nuk duhet të kalojë hapësirën në dispozicion në driver-in e përzgjedhur." IDS_PAGEFILE_NONE "Asnjë" IDS_PAGEFILE_SYSTEM "System Managed" diff --git a/dll/cpl/sysdm/lang/sv-SE.rc b/dll/cpl/sysdm/lang/sv-SE.rc index 9be5289f81e..bc8fda48d72 100644 --- a/dll/cpl/sysdm/lang/sv-SE.rc +++ b/dll/cpl/sysdm/lang/sv-SE.rc @@ -335,7 +335,7 @@ BEGIN IDS_MESSAGEBOXTITLE "System control panel applet" IDS_WARNINITIALSIZE "Enter a numeric value for the initial size of the paging file." IDS_WARNMAXIMUMSIZE "Enter a numeric value for the maximum size of the paging file." - IDS_WARNINITIALRANGE "The initial size of the paging file must not be smaller than 16 MB and must not exceed the available space on the selected drive." + IDS_WARNINITIALRANGE "The initial size of the paging file must not be smaller than 2 MB, must not be larger than 4095 MB and must not exceed the available space on the selected drive." IDS_WARNMAXIMUMRANGE "The maximum size of the paging file must not be smaller than its initial size, must not be larger than 4095 MB and must not exceed the available space on the selected drive." IDS_PAGEFILE_NONE "None" IDS_PAGEFILE_SYSTEM "System Managed" diff --git a/dll/cpl/sysdm/lang/tr-TR.rc b/dll/cpl/sysdm/lang/tr-TR.rc index 63430f16333..2e8c44d6ed2 100644 --- a/dll/cpl/sysdm/lang/tr-TR.rc +++ b/dll/cpl/sysdm/lang/tr-TR.rc @@ -335,7 +335,7 @@ BEGIN IDS_MESSAGEBOXTITLE "Dizge Denetim Masası Uygulaması" IDS_WARNINITIALSIZE "Sayfalama kütüğünün başlangıç büyüklüğü için bir sayılık değer giriniz." IDS_WARNMAXIMUMSIZE "Sayfalama kütüğünün en çok büyüklüğü için bir sayılık değer giriniz." - IDS_WARNINITIALRANGE "Sayfalama kütüğünün başlangıç büyüklüğü, 16 MB'tan küçük olmamalıdır ve seçili sürücüde var olan boşluğu aşmamalıdır." + IDS_WARNINITIALRANGE "Sayfalama kütüğünün başlangıç büyüklüğü, 2 MB'tan küçük olmamalıdır ve seçili sürücüde var olan boşluğu aşmamalıdır." IDS_WARNMAXIMUMRANGE "Sayfalama kütüğünün en çok büyüklüğü, kendisinin başlangıç büyüklüğünden küçük olmamalıdır ve seçili sürücüde var olan boşluğu aşmamalıdır." IDS_PAGEFILE_NONE "Yok" IDS_PAGEFILE_SYSTEM "Dizge Yönetimli" diff --git a/dll/cpl/sysdm/lang/uk-UA.rc b/dll/cpl/sysdm/lang/uk-UA.rc index 97c71b9f94b..32891bafcb5 100644 --- a/dll/cpl/sysdm/lang/uk-UA.rc +++ b/dll/cpl/sysdm/lang/uk-UA.rc @@ -341,7 +341,7 @@ BEGIN IDS_MESSAGEBOXTITLE "Елемент панелі керування" IDS_WARNINITIALSIZE "Введіть числове значення для початкового розміру файлу довантаження." IDS_WARNMAXIMUMSIZE "Введіть числове значення для максимального розміру файлу довантаження." - IDS_WARNINITIALRANGE "Початковий розмір файлу довантаження не повинен бути меншим 16 Мб і не повинен перевищувати об'єм вільного місця на обраному диску." + IDS_WARNINITIALRANGE "Початковий розмір файлу довантаження не повинен бути меншим 2 Мб і не повинен перевищувати об'єм вільного місця на обраному диску." IDS_WARNMAXIMUMRANGE "Максимальний розмір файлу довантаження не повинен бути меншим від початкового та не повинен перевищувати об'єм вільного місця на обраному диску." IDS_PAGEFILE_NONE "Немає" IDS_PAGEFILE_SYSTEM "За вибором системи" diff --git a/dll/cpl/sysdm/lang/zh-CN.rc b/dll/cpl/sysdm/lang/zh-CN.rc index 9ab291917ff..f86f20d9484 100644 --- a/dll/cpl/sysdm/lang/zh-CN.rc +++ b/dll/cpl/sysdm/lang/zh-CN.rc @@ -336,7 +336,7 @@ BEGIN IDS_MESSAGEBOXTITLE "系统控制面板小程序" IDS_WARNINITIALSIZE "为分页文件的初始大小输入一个数字值。" IDS_WARNMAXIMUMSIZE "为分页文件的最大大小输入一个数字值。" - IDS_WARNINITIALRANGE "分页文件的初始大小不得小于 16 MB，并且不得超过所选磁盘上的可用空间。" + IDS_WARNINITIALRANGE "分页文件的初始大小不得小于 2 MB，并且不得超过所选磁盘上的可用空间。" IDS_WARNMAXIMUMRANGE "分页文件的最大大小不能小于其初始大小和不能超过所选磁盘上的可用空间。" IDS_PAGEFILE_NONE "无" IDS_PAGEFILE_SYSTEM "系统已托管" diff --git a/dll/cpl/sysdm/lang/zh-TW.rc b/dll/cpl/sysdm/lang/zh-TW.rc index 0fc06abd34c..41b8aa1f44a 100644 --- a/dll/cpl/sysdm/lang/zh-TW.rc +++ b/dll/cpl/sysdm/lang/zh-TW.rc @@ -336,7 +336,7 @@ BEGIN IDS_MESSAGEBOXTITLE "系統控制面板小程序" IDS_WARNINITIALSIZE "爲分頁文件的初始大小輸入一個數字值。" IDS_WARNMAXIMUMSIZE "爲分頁文件的最大大小輸入一個數字值。" - IDS_WARNINITIALRANGE "分頁文件的初始大小不得小於 16 MB，並且不得超過所選磁碟上的可用空間。" + IDS_WARNINITIALRANGE "分頁文件的初始大小不得小於 2 MB，並且不得超過所選磁碟上的可用空間。" IDS_WARNMAXIMUMRANGE "分頁文件的最大大小不能小於其初始大小和不能超過所選磁碟上的可用空間。" IDS_PAGEFILE_NONE "無" IDS_PAGEFILE_SYSTEM "系統已管理"

1 0

[reactos] 01/01: [SYSSETUP] Improve SetupQueryRegisteredOsComponent export (#2702)
by Oleg Dubinskiy 01 May '20

01 May '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b0e995728a12f20b5d4c8… commit b0e995728a12f20b5d4c8243f1d53f478e625510 Author: Oleg Dubinskiy <oleg.dubinskij2013(a)yandex.ua> AuthorDate: Fri May 1 13:45:19 2020 +0300 Commit: GitHub <noreply(a)github.com> CommitDate: Fri May 1 13:45:19 2020 +0300 [SYSSETUP] Improve SetupQueryRegisteredOsComponent export (#2702) CORE-16784 Co-authored-by: Mark Jansen <mark.jansen(a)reactos.org> --- dll/win32/syssetup/syssetup.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/win32/syssetup/syssetup.spec b/dll/win32/syssetup/syssetup.spec index 1416a967471..65a48624cbc 100644 --- a/dll/win32/syssetup/syssetup.spec +++ b/dll/win32/syssetup/syssetup.spec @@ -62,7 +62,7 @@ @ stub SetupOobeInitPostServices @ stub SetupOobeInitPreServices @ stub SetupPidGen3 -@ stub SetupQueryRegisteredOsComponent +@ stdcall -stub SetupQueryRegisteredOsComponent(ptr ptr ptr) @ stub SetupQueryRegisteredOsComponentsOrder @ stub SetupReadPhoneList @ stub SetupSetAdminPassword

1 0

[reactos] 01/01: [ACPICA] Update to version 20190430. CORE-16998
by Thomas Faber 01 May '20

01 May '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=baa3380649dfe1b9d0238… commit baa3380649dfe1b9d0238019d5b46f3546bc54e5 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Fri May 1 12:18:11 2020 +0200 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Fri May 1 12:18:48 2020 +0200 [ACPICA] Update to version 20190430. CORE-16998 --- drivers/bus/acpi/acpica/dispatcher/dsfield.c | 24 +++++++++++++++++++----- drivers/bus/acpi/acpica/executer/exfield.c | 2 +- drivers/bus/acpi/acpica/include/acglobal.h | 1 + drivers/bus/acpi/acpica/include/acpixf.h | 2 +- drivers/bus/acpi/acpica/include/acpredef.h | 4 ++-- media/doc/3rd Party Files.txt | 2 +- 6 files changed, 25 insertions(+), 10 deletions(-) diff --git a/drivers/bus/acpi/acpica/dispatcher/dsfield.c b/drivers/bus/acpi/acpica/dispatcher/dsfield.c index b2a29c969a8..e2a08bb0a24 100644 --- a/drivers/bus/acpi/acpica/dispatcher/dsfield.c +++ b/drivers/bus/acpi/acpica/dispatcher/dsfield.c @@ -233,7 +233,12 @@ AcpiDsCreateBufferField ( Status = AcpiNsLookup (WalkState->ScopeInfo, Arg->Common.Value.String, ACPI_TYPE_ANY, ACPI_IMODE_LOAD_PASS1, Flags, WalkState, &Node); - if (ACPI_FAILURE (Status)) + if ((WalkState->ParseFlags & ACPI_PARSE_DISASSEMBLE) && + Status == AE_ALREADY_EXISTS) + { + Status = AE_OK; + } + else if (ACPI_FAILURE (Status)) { ACPI_ERROR_NAMESPACE (WalkState->ScopeInfo, Arg->Common.Value.String, Status); @@ -574,12 +579,21 @@ AcpiDsCreateField ( Info.RegionNode = RegionNode; Status = AcpiDsGetFieldNames (&Info, WalkState, Arg->Common.Next); - if (Info.RegionNode->Object->Region.SpaceId == ACPI_ADR_SPACE_PLATFORM_COMM && - !(RegionNode->Object->Field.InternalPccBuffer - = ACPI_ALLOCATE_ZEROED(Info.RegionNode->Object->Region.Length))) + if (ACPI_FAILURE (Status)) { - return_ACPI_STATUS (AE_NO_MEMORY); + return_ACPI_STATUS (Status); } + + if (Info.RegionNode->Object->Region.SpaceId == ACPI_ADR_SPACE_PLATFORM_COMM) + { + RegionNode->Object->Field.InternalPccBuffer = + ACPI_ALLOCATE_ZEROED(Info.RegionNode->Object->Region.Length); + if (!RegionNode->Object->Field.InternalPccBuffer) + { + return_ACPI_STATUS (AE_NO_MEMORY); + } + } + return_ACPI_STATUS (Status); } diff --git a/drivers/bus/acpi/acpica/executer/exfield.c b/drivers/bus/acpi/acpica/executer/exfield.c index e20645698b3..3f7c560d286 100644 --- a/drivers/bus/acpi/acpica/executer/exfield.c +++ b/drivers/bus/acpi/acpica/executer/exfield.c @@ -59,7 +59,7 @@ #define ACPI_INVALID_PROTOCOL_ID 0x80 #define ACPI_MAX_PROTOCOL_ID 0x0F -const UINT8 AcpiProtocolLengths[] = +static const UINT8 AcpiProtocolLengths[] = { ACPI_INVALID_PROTOCOL_ID, /* 0 - reserved */ ACPI_INVALID_PROTOCOL_ID, /* 1 - reserved */ diff --git a/drivers/bus/acpi/acpica/include/acglobal.h b/drivers/bus/acpi/acpica/include/acglobal.h index 37a95b1557c..806fa43d990 100644 --- a/drivers/bus/acpi/acpica/include/acglobal.h +++ b/drivers/bus/acpi/acpica/include/acglobal.h @@ -328,6 +328,7 @@ ACPI_GLOBAL (ACPI_EXTERNAL_FILE *, AcpiGbl_ExternalFileList); #ifdef ACPI_DEBUGGER ACPI_INIT_GLOBAL (BOOLEAN, AcpiGbl_AbortMethod, FALSE); ACPI_INIT_GLOBAL (ACPI_THREAD_ID, AcpiGbl_DbThreadId, ACPI_INVALID_THREAD_ID); +ACPI_INIT_GLOBAL (UINT32, AcpiGbl_NextCmdNum, 1); ACPI_GLOBAL (BOOLEAN, AcpiGbl_DbOpt_NoIniMethods); ACPI_GLOBAL (BOOLEAN, AcpiGbl_DbOpt_NoRegionSupport); diff --git a/drivers/bus/acpi/acpica/include/acpixf.h b/drivers/bus/acpi/acpica/include/acpixf.h index d3503841c27..c371ccd8ad8 100644 --- a/drivers/bus/acpi/acpica/include/acpixf.h +++ b/drivers/bus/acpi/acpica/include/acpixf.h @@ -46,7 +46,7 @@ /* Current ACPICA subsystem version in YYYYMMDD format */ -#define ACPI_CA_VERSION 0x20200326 +#define ACPI_CA_VERSION 0x20200430 #include "acconfig.h" #include "actypes.h" diff --git a/drivers/bus/acpi/acpica/include/acpredef.h b/drivers/bus/acpi/acpica/include/acpredef.h index d6dd67926ea..2b6173d6c9f 100644 --- a/drivers/bus/acpi/acpica/include/acpredef.h +++ b/drivers/bus/acpi/acpica/include/acpredef.h @@ -661,10 +661,10 @@ const ACPI_PREDEFINED_INFO AcpiGbl_PredefinedMethods[] = {{"_NIC", METHOD_0ARGS, /* ACPI 6.3 */ METHOD_RETURNS (ACPI_RTYPE_BUFFER)}}, - {{"_NIG", METHOD_1ARGS (ACPI_TYPE_BUFFER), /* ACPI 6.3 */ + {{"_NIG", METHOD_0ARGS, /* ACPI 6.3 */ METHOD_RETURNS (ACPI_RTYPE_BUFFER)}}, - {{"_NIH", METHOD_0ARGS, /* ACPI 6.3 */ + {{"_NIH", METHOD_1ARGS (ACPI_TYPE_BUFFER), /* ACPI 6.3 */ METHOD_RETURNS (ACPI_RTYPE_BUFFER)}}, {{"_NTT", METHOD_0ARGS, diff --git a/media/doc/3rd Party Files.txt b/media/doc/3rd Party Files.txt index 6404f8a77ef..cdf713041c8 100644 --- a/media/doc/3rd Party Files.txt +++ b/media/doc/3rd Party Files.txt @@ -92,7 +92,7 @@ Used Version: 1.6.37 Website: http://libpng.sourceforge.net/ Title: ACPICA -Used Version: 20200326 +Used Version: 20200430 Website: https://acpica.org/ Title: Schily Tools, mkisofs

1 0

[reactos] 04/04: [USBCCGP] Ignore IRP_MN_REMOVE_DEVICE return status and don't wait for it to complete.
by Thomas Faber 01 May '20

01 May '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=71a4462ad5dce284d47bc… commit 71a4462ad5dce284d47bc307a4b86638f990e56a Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Fri Mar 8 15:49:22 2019 +0100 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Fri May 1 12:05:12 2020 +0200 [USBCCGP] Ignore IRP_MN_REMOVE_DEVICE return status and don't wait for it to complete. --- drivers/usb/usbccgp/fdo.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/drivers/usb/usbccgp/fdo.c b/drivers/usb/usbccgp/fdo.c index f3b3c6ec41a..abcaeb017f3 100644 --- a/drivers/usb/usbccgp/fdo.c +++ b/drivers/usb/usbccgp/fdo.c @@ -397,16 +397,15 @@ FDO_HandlePnp( FDO_CloseConfiguration(DeviceObject); /* Send the IRP down the stack */ - Status = USBCCGP_SyncForwardIrp(FDODeviceExtension->NextDeviceObject, - Irp); - if (NT_SUCCESS(Status)) - { - /* Detach from the device stack */ - IoDetachDevice(FDODeviceExtension->NextDeviceObject); + Irp->IoStatus.Status = STATUS_SUCCESS; + IoSkipCurrentIrpStackLocation(Irp); + Status = IoCallDriver(FDODeviceExtension->NextDeviceObject, Irp); - /* Delete the device object */ - IoDeleteDevice(DeviceObject); - } + /* Detach from the device stack */ + IoDetachDevice(FDODeviceExtension->NextDeviceObject); + + /* Delete the device object */ + IoDeleteDevice(DeviceObject); /* Request completed */ break;

1 0

[reactos] 03/04: [USBCCGP] Don't handle IRP_MN_QUERY_DEVICE_TEXT requests other than device description.
by Thomas Faber 01 May '20

01 May '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=823101274a30783015a22… commit 823101274a30783015a228d9b44a624beb105259 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Wed Mar 6 14:58:46 2019 +0100 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Fri May 1 12:05:11 2020 +0200 [USBCCGP] Don't handle IRP_MN_QUERY_DEVICE_TEXT requests other than device description. --- drivers/usb/usbccgp/pdo.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/drivers/usb/usbccgp/pdo.c b/drivers/usb/usbccgp/pdo.c index 40072ace311..1ea62bdf0e2 100644 --- a/drivers/usb/usbccgp/pdo.c +++ b/drivers/usb/usbccgp/pdo.c @@ -21,14 +21,32 @@ USBCCGP_PdoHandleQueryDeviceText( IN PDEVICE_OBJECT DeviceObject, IN OUT PIRP Irp) { + PIO_STACK_LOCATION IoStack; LPWSTR Buffer; PPDO_DEVICE_EXTENSION PDODeviceExtension; LPWSTR GenericString = L"Composite USB Device"; + + // + // get current irp stack location + // + IoStack = IoGetCurrentIrpStackLocation(Irp); + // // get device extension // PDODeviceExtension = (PPDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + // + // check if type is description + // + if (IoStack->Parameters.QueryDeviceText.DeviceTextType != DeviceTextDescription) + { + // + // we only handle description + // + return Irp->IoStatus.Status; + } + // // is there a device description //

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