Ros-diffs April 2021

ros-diffs@reactos.org

21 participants
173 discussions

[reactos] 01/01: [UMPNPMGR] Fix DPRINT in PNP_GetDeviceStatus()
by Eric Kohl 24 Apr '21

24 Apr '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0f276098134ef5ec1fcf9… commit 0f276098134ef5ec1fcf900b62734bd5beab0ae1 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sat Apr 24 17:06:08 2021 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sat Apr 24 17:06:08 2021 +0200 [UMPNPMGR] Fix DPRINT in PNP_GetDeviceStatus() --- base/services/umpnpmgr/rpcserver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/services/umpnpmgr/rpcserver.c b/base/services/umpnpmgr/rpcserver.c index 6319d328c8c..d84e0cab4ff 100644 --- a/base/services/umpnpmgr/rpcserver.c +++ b/base/services/umpnpmgr/rpcserver.c @@ -3196,7 +3196,7 @@ PNP_GetDeviceStatus( UNREFERENCED_PARAMETER(hBinding); UNREFERENCED_PARAMETER(ulFlags); - DPRINT("PNP_GetDeviceStatus(%p %S %p %p)\n", + DPRINT("PNP_GetDeviceStatus(%p %S %p %p 0x%08lx)\n", hBinding, pDeviceID, pulStatus, pulProblem, ulFlags); if (!IsValidDeviceInstanceID(pDeviceID))

1 0

[reactos] 01/01: [UMPNPMGR] Start the device in SetupDeviceInstance
by Eric Kohl 24 Apr '21

24 Apr '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b24f463a338cc5ccf75fc… commit b24f463a338cc5ccf75fcb3fae6576877835006c Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sat Apr 24 17:04:11 2021 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sat Apr 24 17:04:11 2021 +0200 [UMPNPMGR] Start the device in SetupDeviceInstance --- base/services/umpnpmgr/rpcserver.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/base/services/umpnpmgr/rpcserver.c b/base/services/umpnpmgr/rpcserver.c index 63ae6e9b9ae..6319d328c8c 100644 --- a/base/services/umpnpmgr/rpcserver.c +++ b/base/services/umpnpmgr/rpcserver.c @@ -3007,11 +3007,13 @@ SetupDeviceInstance( _In_ LPWSTR pszDeviceInstance, _In_ DWORD ulMinorAction) { + PLUGPLAY_CONTROL_DEVICE_CONTROL_DATA ControlData; HKEY hDeviceKey = NULL; DWORD dwDisableCount, dwSize; DWORD ulStatus, ulProblem; DWORD dwError; CONFIGRET ret = CR_SUCCESS; + NTSTATUS Status; DPRINT1("SetupDeviceInstance(%S 0x%08lx)\n", pszDeviceInstance, ulMinorAction); @@ -3066,8 +3068,14 @@ SetupDeviceInstance( if (ret != CR_SUCCESS) goto done; - - /* FIXME: Start the device */ + /* Start the device */ + RtlInitUnicodeString(&ControlData.DeviceInstance, + pszDeviceInstance); + Status = NtPlugPlayControl(PlugPlayControlStartDevice, + &ControlData, + sizeof(PLUGPLAY_CONTROL_DEVICE_CONTROL_DATA)); + if (!NT_SUCCESS(Status)) + ret = NtStatusToCrError(Status); done: if (hDeviceKey != NULL)

1 0

[reactos] 01/01: [UMPNPMGR] Implement PNP_SetDeviceProblem
by Eric Kohl 24 Apr '21

24 Apr '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d5b20cb1183bba925f365… commit d5b20cb1183bba925f365752b264d7084551d4c3 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sat Apr 24 11:59:22 2021 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sat Apr 24 11:59:22 2021 +0200 [UMPNPMGR] Implement PNP_SetDeviceProblem CORE-17527 --- base/services/umpnpmgr/rpcserver.c | 43 ++++++++++++++++++++++++++++++++++++-- 1 file changed, 41 insertions(+), 2 deletions(-) diff --git a/base/services/umpnpmgr/rpcserver.c b/base/services/umpnpmgr/rpcserver.c index cba896860d5..63ae6e9b9ae 100644 --- a/base/services/umpnpmgr/rpcserver.c +++ b/base/services/umpnpmgr/rpcserver.c @@ -3207,8 +3207,47 @@ PNP_SetDeviceProblem( DWORD ulProblem, DWORD ulFlags) { - UNIMPLEMENTED; - return CR_CALL_NOT_IMPLEMENTED; + ULONG ulOldStatus, ulOldProblem; + CONFIGRET ret = CR_SUCCESS; + + UNREFERENCED_PARAMETER(hBinding); + + DPRINT1("PNP_SetDeviceProblem(%p %S %lu 0x%08lx)\n", + hBinding, pDeviceID, ulProblem, ulFlags); + + if (ulFlags & ~CM_SET_DEVNODE_PROBLEM_BITS) + return CR_INVALID_FLAG; + + if (!IsValidDeviceInstanceID(pDeviceID)) + return CR_INVALID_DEVINST; + + ret = GetDeviceStatus(pDeviceID, + &ulOldStatus, + &ulOldProblem); + if (ret != CR_SUCCESS) + return ret; + + if (((ulFlags & CM_SET_DEVNODE_PROBLEM_OVERRIDE) == 0) && + (ulOldProblem != 0) && + (ulOldProblem != ulProblem)) + { + return CR_FAILURE; + } + + if (ulProblem == 0) + { + ret = ClearDeviceStatus(pDeviceID, + DN_HAS_PROBLEM, + ulOldProblem); + } + else + { + ret = SetDeviceStatus(pDeviceID, + DN_HAS_PROBLEM, + ulProblem); + } + + return ret; }

1 0

[reactos] 01/01: [TRANSLATION][WINLOGON] Small Romanian & Italian translation update
by George Bișoc 22 Apr '21

22 Apr '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c0c431b0eed0dd8176473… commit c0c431b0eed0dd8176473be5e84654d01c4c810e Author: George Bișoc <george.bisoc(a)reactos.org> AuthorDate: Thu Apr 22 18:12:22 2021 +0200 Commit: George Bișoc <george.bisoc(a)reactos.org> CommitDate: Thu Apr 22 18:12:22 2021 +0200 [TRANSLATION][WINLOGON] Small Romanian & Italian translation update Small translation update as per the pushed 5f03339 commit. --- base/system/winlogon/lang/it-IT.rc | 4 ++-- base/system/winlogon/lang/ro-RO.rc | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/base/system/winlogon/lang/it-IT.rc b/base/system/winlogon/lang/it-IT.rc index a891df6d6e5..0f85f8862b0 100644 --- a/base/system/winlogon/lang/it-IT.rc +++ b/base/system/winlogon/lang/it-IT.rc @@ -44,8 +44,8 @@ BEGIN IDS_RUNNINGLOGONSCRIPTS "Esecuzione scripts di connessione..." IDS_LOADINGYOURPERSONALSETTINGS "Caricamento delle impostazioni personali..." IDS_CLOSINGNETWORKCONNECTIONS "Chiusura connessioni di rete..." - IDS_REACTOSISRESTARTING "Restarting..." - IDS_REACTOSISSHUTTINGDOWN "Shutting down..." + IDS_REACTOSISRESTARTING "Sto eseguendo il riavvio..." + IDS_REACTOSISSHUTTINGDOWN "Sto eseguendo l'arresto..." IDS_PREPARETOSTANDBY "Preparazione Standby..." IDS_PREPARETOHIBERNATE "Preparazione Ibernazione..." IDS_SAVEYOURSETTINGS "Salvataggio delle impostazioni personali..." diff --git a/base/system/winlogon/lang/ro-RO.rc b/base/system/winlogon/lang/ro-RO.rc index 04789986a16..12a42b69b7b 100644 --- a/base/system/winlogon/lang/ro-RO.rc +++ b/base/system/winlogon/lang/ro-RO.rc @@ -53,8 +53,8 @@ BEGIN IDS_RUNNINGLOGONSCRIPTS "Operații de autentificare în curs de efectuare…" IDS_LOADINGYOURPERSONALSETTINGS "Configurații personale în curs de reconstituire…" IDS_CLOSINGNETWORKCONNECTIONS "Conexiuni în rețea în curs de închidere…" - IDS_REACTOSISRESTARTING "Restarting..." - IDS_REACTOSISSHUTTINGDOWN "Shutting down..." + IDS_REACTOSISRESTARTING "Se repornește..." + IDS_REACTOSISSHUTTINGDOWN "Se închide..." IDS_PREPARETOSTANDBY "Stare de veghe în curs de pregătire…" IDS_PREPARETOHIBERNATE "Stare de hibernare în curs de pregătire…" IDS_SAVEYOURSETTINGS "Configurații personale în curs de păstrare…"

1 0

[reactos] 01/01: [MSGINA] Determine which kind of dialog box is before terminating it
by George Bișoc 22 Apr '21

22 Apr '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=84b3fecb263e7d342c73d… commit 84b3fecb263e7d342c73ddaf53fc3e753f2cb34b Author: George Bișoc <george.bisoc(a)reactos.org> AuthorDate: Mon Apr 19 17:18:51 2021 +0200 Commit: George Bișoc <george.bisoc(a)reactos.org> CommitDate: Thu Apr 22 13:30:55 2021 +0200 [MSGINA] Determine which kind of dialog box is before terminating it Do a sanity check onto the dialog box type before terminating it. As it stands now, a call of PostQuitMessage() is invoked even when the dialog box is modal. This is illegal due to the fact that the shutdown dialog box is initiated by the "Security" main window thus WlxDialogBoxParam. A call to PostQuitMessage onto a modal dialog box leads to a undefined behaviour, as it'll not just terminate the thread but also eventually killing the Winlogon process whose the thread belongs to. CORE-17535 --- dll/win32/msgina/shutdown.c | 39 +++++++++++++++++++++++++++++++++------ 1 file changed, 33 insertions(+), 6 deletions(-) diff --git a/dll/win32/msgina/shutdown.c b/dll/win32/msgina/shutdown.c index 6ea696d5031..d2478b2df02 100644 --- a/dll/win32/msgina/shutdown.c +++ b/dll/win32/msgina/shutdown.c @@ -61,6 +61,7 @@ typedef struct _SHUTDOWN_DLG_CONTEXT BOOL bReasonUI; BOOL bFriendlyUI; BOOL bIsButtonHot[NUMBER_OF_BUTTONS]; + BOOL bIsDialogModal; WNDPROC OldButtonProc; } SHUTDOWN_DLG_CONTEXT, *PSHUTDOWN_DLG_CONTEXT; @@ -1058,8 +1059,16 @@ ShutdownDialogProc( if (!pContext->bCloseDlg) { pContext->bCloseDlg = TRUE; - DestroyWindow(hDlg); - PostQuitMessage(0); + + if (pContext->bIsDialogModal) + { + EndDialog(hDlg, 0); + } + else + { + DestroyWindow(hDlg); + PostQuitMessage(0); + } } } return FALSE; @@ -1079,8 +1088,16 @@ ShutdownDialogProc( case WM_CLOSE: pContext->bCloseDlg = TRUE; - DestroyWindow(hDlg); - PostQuitMessage(IDCANCEL); + + if (pContext->bIsDialogModal) + { + EndDialog(hDlg, IDCANCEL); + } + else + { + DestroyWindow(hDlg); + PostQuitMessage(IDCANCEL); + } break; case WM_COMMAND: @@ -1105,8 +1122,16 @@ ShutdownDialogProc( case IDCANCEL: case IDHELP: pContext->bCloseDlg = TRUE; - DestroyWindow(hDlg); - PostQuitMessage(LOWORD(wParam)); + + if (pContext->bIsDialogModal) + { + EndDialog(hDlg, LOWORD(wParam)); + } + else + { + DestroyWindow(hDlg); + PostQuitMessage(LOWORD(wParam)); + } break; case IDC_SHUTDOWN_ACTION: @@ -1189,6 +1214,7 @@ ShutdownDialog( if (pgContext->hWlx && pgContext->pWlxFuncs && !Context.bFriendlyUI) { + Context.bIsDialogModal = TRUE; ret = pgContext->pWlxFuncs->WlxDialogBoxParam(pgContext->hWlx, pgContext->hDllInstance, MAKEINTRESOURCEW(Context.bReasonUI ? IDD_SHUTDOWN_REASON : IDD_SHUTDOWN), @@ -1210,6 +1236,7 @@ ShutdownDialog( } } + Context.bIsDialogModal = FALSE; hDlg = CreateDialogParamW(pgContext->hDllInstance, MAKEINTRESOURCEW(Context.bReasonUI ? IDD_SHUTDOWN_REASON : ShutdownDialogId), hwndDlg,

1 0

[reactos] 01/01: [GITHUB] Update LLVM version to 12 and fix indentation
by Victor Perevertkin 22 Apr '21

22 Apr '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=246dbd3384716c045c0d3… commit 246dbd3384716c045c0d3018e0544c1243c03fb4 Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Thu Apr 22 13:48:43 2021 +0300 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Thu Apr 22 13:48:43 2021 +0300 [GITHUB] Update LLVM version to 12 and fix indentation --- .github/workflows/build.yml | 182 ++++++++++++++++++++++---------------------- 1 file changed, 91 insertions(+), 91 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 434286208c2..22cf1db250d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -6,102 +6,102 @@ jobs: name: GCC (i386) runs-on: ubuntu-latest steps: - - name: Install RosBE - run: | - wget https://svn.reactos.org/storage/vperevertkin/rosbe-ci.tar.zst - mkdir ${{github.workspace}}/rosbe - tar -I zstd -xvf rosbe-ci.tar.zst --directory ${{github.workspace}}/rosbe - - name: Install other packages - run: sudo apt install ccache - - uses: actions/checkout@v2 - with: - path: src - - name: Set up cache for ccache - uses: actions/cache@v2 - with: - path: ccache - key: ccache-gcc-i386-${{github.sha}} - restore-keys: | - ccache-gcc-i386- - - name: Set ccache settings - run: | - echo "CCACHE_BASEDIR=${{github.workspace}}" >> $GITHUB_ENV - echo "CCACHE_DIR=${{github.workspace}}/ccache" >> $GITHUB_ENV - echo "CCACHE_MAXSIZE=1G" >> $GITHUB_ENV - echo "CCACHE_SLOPPINESS=time_macros" >> $GITHUB_ENV - - name: Configure - run: | - mkdir build - echo 'cd ${{github.workspace}}/build && ${{github.workspace}}/src/configure.sh -DENABLE_CCACHE=1 -DENABLE_ROSTESTS=1 -DENABLE_ROSAPPS=1' > commands - ${{github.workspace}}/rosbe/RosBE.sh < commands - - name: Build - run: | - echo 'cd ${{github.workspace}}/build && cmake --build .' > commands - ${{github.workspace}}/rosbe/RosBE.sh < commands - - name: Generate ISOs - run: | - echo 'cd ${{github.workspace}}/build && cmake --build . --target bootcd && cmake --build . --target livecd' > commands - ${{github.workspace}}/rosbe/RosBE.sh < 'commands' - - name: Print ccache statistics - run: ccache -s - - name: Upload bootcd - uses: actions/upload-artifact@v2 - with: - name: reactos-gcc-i386-${{github.sha}} - path: build/bootcd.iso - - name: Upload livecd - uses: actions/upload-artifact@v2 - with: - name: reactos-gcc-i386-${{github.sha}} - path: build/livecd.iso + - name: Install RosBE + run: | + wget https://svn.reactos.org/storage/vperevertkin/rosbe-ci.tar.zst + mkdir ${{github.workspace}}/rosbe + tar -I zstd -xvf rosbe-ci.tar.zst --directory ${{github.workspace}}/rosbe + - name: Install other packages + run: sudo apt install ccache + - uses: actions/checkout@v2 + with: + path: src + - name: Set up cache for ccache + uses: actions/cache@v2 + with: + path: ccache + key: ccache-gcc-i386-${{github.sha}} + restore-keys: | + ccache-gcc-i386- + - name: Set ccache settings + run: | + echo "CCACHE_BASEDIR=${{github.workspace}}" >> $GITHUB_ENV + echo "CCACHE_DIR=${{github.workspace}}/ccache" >> $GITHUB_ENV + echo "CCACHE_MAXSIZE=1G" >> $GITHUB_ENV + echo "CCACHE_SLOPPINESS=time_macros" >> $GITHUB_ENV + - name: Configure + run: | + mkdir build + echo 'cd ${{github.workspace}}/build && ${{github.workspace}}/src/configure.sh -DENABLE_CCACHE=1 -DENABLE_ROSTESTS=1 -DENABLE_ROSAPPS=1' > commands + ${{github.workspace}}/rosbe/RosBE.sh < commands + - name: Build + run: | + echo 'cd ${{github.workspace}}/build && cmake --build .' > commands + ${{github.workspace}}/rosbe/RosBE.sh < commands + - name: Generate ISOs + run: | + echo 'cd ${{github.workspace}}/build && cmake --build . --target bootcd && cmake --build . --target livecd' > commands + ${{github.workspace}}/rosbe/RosBE.sh < 'commands' + - name: Print ccache statistics + run: ccache -s + - name: Upload bootcd + uses: actions/upload-artifact@v2 + with: + name: reactos-gcc-i386-${{github.sha}} + path: build/bootcd.iso + - name: Upload livecd + uses: actions/upload-artifact@v2 + with: + name: reactos-gcc-i386-${{github.sha}} + path: build/livecd.iso build-clang-i386: name: Clang (i386) runs-on: ubuntu-latest steps: - - name: Install RosBE - run: | - wget https://svn.reactos.org/storage/vperevertkin/rosbe-ci.tar.zst - mkdir ${{github.workspace}}/rosbe - tar -I zstd -xvf rosbe-ci.tar.zst --directory ${{github.workspace}}/rosbe - - name: Set LLVM version - run: | - echo "LLVM_VERSION=11" >> $GITHUB_ENV - - name: Install LLVM - run: | - wget https://apt.llvm.org/llvm.sh - chmod +x llvm.sh - sudo ./llvm.sh $LLVM_VERSION - - name: Install other packages - run: | - sudo apt install ccache - - uses: actions/checkout@v2 - with: - path: src - - name: Set up cache for ccache - uses: actions/cache@v2 - with: - path: ccache - key: ccache-clang-i386-${{github.sha}} - restore-keys: | - ccache-clang-i386- - - name: Set ccache settings - run: | - echo "CCACHE_BASEDIR=${{github.workspace}}" >> $GITHUB_ENV - echo "CCACHE_DIR=${{github.workspace}}/ccache" >> $GITHUB_ENV - echo "CCACHE_MAXSIZE=1G" >> $GITHUB_ENV - echo "CCACHE_SLOPPINESS=time_macros" >> $GITHUB_ENV - - name: Configure - run: | - mkdir build - echo 'cd ${{github.workspace}}/build && cmake ${{github.workspace}}/src -G Ninja -DCMAKE_TOOLCHAIN_FILE:FILEPATH=toolchain-clang.cmake -DARCH:STRING=i386 -DENABLE_CCACHE=1 -DENABLE_ROSTESTS=1 -DENABLE_ROSAPPS=1 -DCLANG_VERSION=${{env.LLVM_VERSION}}' > commands - ${{github.workspace}}/rosbe/RosBE.sh < commands - - name: Build - run: | - echo 'cd ${{github.workspace}}/build && cmake --build .' > commands - ${{github.workspace}}/rosbe/RosBE.sh < commands - - name: Print ccache statistics - run: ccache -s + - name: Install RosBE + run: | + wget https://svn.reactos.org/storage/vperevertkin/rosbe-ci.tar.zst + mkdir ${{github.workspace}}/rosbe + tar -I zstd -xvf rosbe-ci.tar.zst --directory ${{github.workspace}}/rosbe + - name: Set LLVM version + run: | + echo "LLVM_VERSION=12" >> $GITHUB_ENV + - name: Install LLVM + run: | + wget https://apt.llvm.org/llvm.sh + chmod +x llvm.sh + sudo ./llvm.sh $LLVM_VERSION + - name: Install other packages + run: | + sudo apt install ccache + - uses: actions/checkout@v2 + with: + path: src + - name: Set up cache for ccache + uses: actions/cache@v2 + with: + path: ccache + key: ccache-clang-i386-${{github.sha}} + restore-keys: | + ccache-clang-i386- + - name: Set ccache settings + run: | + echo "CCACHE_BASEDIR=${{github.workspace}}" >> $GITHUB_ENV + echo "CCACHE_DIR=${{github.workspace}}/ccache" >> $GITHUB_ENV + echo "CCACHE_MAXSIZE=1G" >> $GITHUB_ENV + echo "CCACHE_SLOPPINESS=time_macros" >> $GITHUB_ENV + - name: Configure + run: | + mkdir build + echo 'cd ${{github.workspace}}/build && cmake ${{github.workspace}}/src -G Ninja -DCMAKE_TOOLCHAIN_FILE:FILEPATH=toolchain-clang.cmake -DARCH:STRING=i386 -DENABLE_CCACHE=1 -DENABLE_ROSTESTS=1 -DENABLE_ROSAPPS=1 -DCLANG_VERSION=${{env.LLVM_VERSION}}' > commands + ${{github.workspace}}/rosbe/RosBE.sh < commands + - name: Build + run: | + echo 'cd ${{github.workspace}}/build && cmake --build .' > commands + ${{github.workspace}}/rosbe/RosBE.sh < commands + - name: Print ccache statistics + run: ccache -s build-clang-cl-i386: name: Clang-CL (i386)

1 0

[reactos] 01/01: [NEWDEV] Set the CM_PROB_FAILED_INSTALL problem code on failed install
by Eric Kohl 20 Apr '21

20 Apr '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=32428a39ed24d78c4dadf… commit 32428a39ed24d78c4dadf833619f4dc796ff4523 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Tue Apr 20 22:00:41 2021 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Tue Apr 20 22:00:41 2021 +0200 [NEWDEV] Set the CM_PROB_FAILED_INSTALL problem code on failed install CORE-17527 --- dll/win32/newdev/wizard.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dll/win32/newdev/wizard.c b/dll/win32/newdev/wizard.c index 9cf56a74c48..9f65e1bef47 100644 --- a/dll/win32/newdev/wizard.c +++ b/dll/win32/newdev/wizard.c @@ -104,7 +104,10 @@ SetFailedInstall( (PBYTE)pszUnknownGuid, (wcslen(pszUnknownGuid) + 1) * sizeof(WCHAR)); - /* FIXME: Set device problem code 28 (CM_PROB_FAILED_INSTALL) */ + /* Set device problem code CM_PROB_FAILED_INSTALL */ + CM_Set_DevNode_Problem(DevInfoData->DevInst, + CM_PROB_FAILED_INSTALL, + CM_SET_DEVNODE_PROBLEM_OVERRIDE); } return TRUE;

1 0

[reactos] 01/01: [DHCPCSVC] Change automatic address assignment to use hardware address
by Hervé Poussineau 20 Apr '21

20 Apr '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1ff3d1c395644af497ccc… commit 1ff3d1c395644af497cccc56dc1a548136a23ec4 Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Mon Apr 19 23:21:35 2021 +0200 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Tue Apr 20 18:28:36 2021 +0200 [DHCPCSVC] Change automatic address assignment to use hardware address According to RFC 3927, the pseudo-random number generation algorithm MUST be chosen so that different hosts do not generate the same sequence of numbers, and that the pseudo-random number generator SHOULD be seeded using a value derived from the IEEE 802 MAC address, so that a host will usually select the same IPv4 Link-Local address each time it is booted. --- base/services/dhcpcsvc/dhcp/dhclient.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/base/services/dhcpcsvc/dhcp/dhclient.c b/base/services/dhcpcsvc/dhcp/dhclient.c index f840f5b876c..81fcd9c5000 100644 --- a/base/services/dhcpcsvc/dhcp/dhclient.c +++ b/base/services/dhcpcsvc/dhcp/dhclient.c @@ -1069,6 +1069,8 @@ void state_panic(void *ipp) { struct interface_info *ip = ipp; + uint16_t address_low; + int i; PDHCP_ADAPTER Adapter = AdapterFindInfo(ip); note("No DHCPOFFERS received."); @@ -1079,7 +1081,11 @@ state_panic(void *ipp) DbgPrint("DHCPCSVC: Failed to receive a response from a DHCP server. An automatic private address will be assigned.\n"); /* FIXME: The address generation code sucks */ - AddIPAddress(htonl(0xA9FE0000 | (rand() % 0xFFFF)), //169.254.X.X + srand(0); + address_low = rand(); + for (i = 0; i < ip->hw_address.hlen; i++) + address_low += ip->hw_address.haddr[i]; + AddIPAddress(htonl(0xA9FE0000 | address_low), //169.254.X.X htonl(0xFFFF0000), //255.255.0.0 Adapter->IfMib.dwIndex, &Adapter->NteContext,

1 0

[reactos] 01/01: [WINLOGON][MPR][SDK] WNetClearConnections: Fix function parameter type (#3480)
by Serge Gautherie 18 Apr '21

18 Apr '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0dedb9b47457e86ca57b9… commit 0dedb9b47457e86ca57b93856af3da6cb0138a93 Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Sun Apr 18 20:58:44 2021 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Apr 18 21:58:44 2021 +0300 [WINLOGON][MPR][SDK] WNetClearConnections: Fix function parameter type (#3480) Addendum to 62f79fae93. Signed-off-by: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> --- base/system/winlogon/sas.c | 2 +- dll/win32/mpr/mpr.spec | 2 +- sdk/include/reactos/undocmpr.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/base/system/winlogon/sas.c b/base/system/winlogon/sas.c index f01c68a923d..02e9844a74c 100644 --- a/base/system/winlogon/sas.c +++ b/base/system/winlogon/sas.c @@ -726,7 +726,7 @@ LogoffShutdownThread( } /* Cancel all the user connections */ - WNetClearConnections(0); + WNetClearConnections(NULL); if (LSData->Session->UserToken) RevertToSelf(); diff --git a/dll/win32/mpr/mpr.spec b/dll/win32/mpr/mpr.spec index 971c53b2754..d8f25709c5d 100644 --- a/dll/win32/mpr/mpr.spec +++ b/dll/win32/mpr/mpr.spec @@ -55,7 +55,7 @@ @ stdcall WNetCancelConnection2W(wstr long long) @ stdcall WNetCancelConnectionA(str long) @ stdcall WNetCancelConnectionW(wstr long) -@ stdcall WNetClearConnections(long) +@ stdcall WNetClearConnections(ptr) @ stdcall WNetCloseEnum(long) @ stdcall WNetConnectionDialog1A(ptr) @ stdcall WNetConnectionDialog1W(ptr) diff --git a/sdk/include/reactos/undocmpr.h b/sdk/include/reactos/undocmpr.h index 675dde0caa6..884d84ec2b4 100644 --- a/sdk/include/reactos/undocmpr.h +++ b/sdk/include/reactos/undocmpr.h @@ -2,6 +2,6 @@ #define _UNDOCMPR_H /* WNET undocumented functions */ -DWORD WINAPI WNetClearConnections(HANDLE owner); +DWORD WINAPI WNetClearConnections(HWND owner); #endif

1 0

[reactos] 01/01: [WINLOGON] Show "Restarting..." message when restarting (#3593)
by Arnav Bhatt 18 Apr '21

18 Apr '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5f033392397a101b6a911… commit 5f033392397a101b6a9113b2d0de5c09e0a71737 Author: Arnav Bhatt <arnavbhatt288(a)gmail.com> AuthorDate: Sun Apr 18 18:48:30 2021 +0000 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Apr 18 21:48:30 2021 +0300 [WINLOGON] Show "Restarting..." message when restarting (#3593) Signed-off-by: Arnav Bhatt <arnavbhatt288(a)gmail.com> --- base/system/winlogon/lang/bg-BG.rc | 3 ++- base/system/winlogon/lang/cs-CZ.rc | 3 ++- base/system/winlogon/lang/de-DE.rc | 3 ++- base/system/winlogon/lang/el-GR.rc | 3 ++- base/system/winlogon/lang/en-US.rc | 3 ++- base/system/winlogon/lang/es-ES.rc | 3 ++- base/system/winlogon/lang/fr-FR.rc | 3 ++- base/system/winlogon/lang/he-IL.rc | 3 ++- base/system/winlogon/lang/hu-HU.rc | 3 ++- base/system/winlogon/lang/id-ID.rc | 3 ++- base/system/winlogon/lang/it-IT.rc | 3 ++- base/system/winlogon/lang/ja-JP.rc | 3 ++- base/system/winlogon/lang/lt-LT.rc | 3 ++- base/system/winlogon/lang/ms-MY.rc | 3 ++- base/system/winlogon/lang/nl-NL.rc | 3 ++- base/system/winlogon/lang/no-NO.rc | 3 ++- base/system/winlogon/lang/pl-PL.rc | 3 ++- base/system/winlogon/lang/pt-BR.rc | 3 ++- base/system/winlogon/lang/pt-PT.rc | 3 ++- base/system/winlogon/lang/ro-RO.rc | 3 ++- base/system/winlogon/lang/ru-RU.rc | 3 ++- base/system/winlogon/lang/sk-SK.rc | 3 ++- base/system/winlogon/lang/sq-AL.rc | 3 ++- base/system/winlogon/lang/sv-SE.rc | 3 ++- base/system/winlogon/lang/tr-TR.rc | 3 ++- base/system/winlogon/lang/uk-UA.rc | 3 ++- base/system/winlogon/lang/zh-CN.rc | 3 ++- base/system/winlogon/lang/zh-TW.rc | 3 ++- base/system/winlogon/resource.h | 1 + base/system/winlogon/sas.c | 8 +++++++- 30 files changed, 64 insertions(+), 29 deletions(-) diff --git a/base/system/winlogon/lang/bg-BG.rc b/base/system/winlogon/lang/bg-BG.rc index 24a30355414..2fbbe28298e 100644 --- a/base/system/winlogon/lang/bg-BG.rc +++ b/base/system/winlogon/lang/bg-BG.rc @@ -44,7 +44,8 @@ BEGIN IDS_RUNNINGLOGONSCRIPTS "Изпълняване на писанията за изход..." IDS_LOADINGYOURPERSONALSETTINGS "Зареждане на личните ви настройки..." IDS_CLOSINGNETWORKCONNECTIONS "Затваряне на мрежовите свързвания..." - IDS_REACTOSISSHUTTINGDOWN "ReactOS се изключва..." + IDS_REACTOSISRESTARTING "Restarting..." + IDS_REACTOSISSHUTTINGDOWN "Shutting down..." IDS_PREPARETOSTANDBY "Приготвяне за изчакване..." IDS_PREPARETOHIBERNATE "Приготвяне за сън..." IDS_SAVEYOURSETTINGS "Записване на настройките ви..." diff --git a/base/system/winlogon/lang/cs-CZ.rc b/base/system/winlogon/lang/cs-CZ.rc index bf1fb74dcba..3b7bd53ecdf 100644 --- a/base/system/winlogon/lang/cs-CZ.rc +++ b/base/system/winlogon/lang/cs-CZ.rc @@ -44,7 +44,8 @@ BEGIN IDS_RUNNINGLOGONSCRIPTS "Skripty po přihlášení..." IDS_LOADINGYOURPERSONALSETTINGS "Nahrávání osobního nastavení..." IDS_CLOSINGNETWORKCONNECTIONS "Ukončení síťových připojení..." - IDS_REACTOSISSHUTTINGDOWN "ReactOS se vypíná..." + IDS_REACTOSISRESTARTING "Restarting..." + IDS_REACTOSISSHUTTINGDOWN "Shutting down..." IDS_PREPARETOSTANDBY "Příprava k přechodu do úsporného režimu..." IDS_PREPARETOHIBERNATE "Příprava k přechodu do režimu hibernace..." IDS_SAVEYOURSETTINGS "Ukládání osobního nastavení..." diff --git a/base/system/winlogon/lang/de-DE.rc b/base/system/winlogon/lang/de-DE.rc index 140fc57627a..cce784d48d2 100644 --- a/base/system/winlogon/lang/de-DE.rc +++ b/base/system/winlogon/lang/de-DE.rc @@ -46,7 +46,8 @@ BEGIN IDS_RUNNINGLOGONSCRIPTS "Anmeldeskripte ausführen..." IDS_LOADINGYOURPERSONALSETTINGS "Ihre persönlichen Einstellungen laden..." IDS_CLOSINGNETWORKCONNECTIONS "Netzwerkverbindungen schließen..." - IDS_REACTOSISSHUTTINGDOWN "ReactOS fährt herunter..." + IDS_REACTOSISRESTARTING "Restarting..." + IDS_REACTOSISSHUTTINGDOWN "Shutting down..." IDS_PREPARETOSTANDBY "Vorbereiten für den Stromsparmodus..." IDS_PREPARETOHIBERNATE "Vorbereiten für den Ruhezustand..." IDS_SAVEYOURSETTINGS "Speichern Ihrer persönlichen Einstellungen..." diff --git a/base/system/winlogon/lang/el-GR.rc b/base/system/winlogon/lang/el-GR.rc index df9d13348e2..9bff70f3f49 100644 --- a/base/system/winlogon/lang/el-GR.rc +++ b/base/system/winlogon/lang/el-GR.rc @@ -44,7 +44,8 @@ BEGIN IDS_RUNNINGLOGONSCRIPTS "Running logon scripts..." IDS_LOADINGYOURPERSONALSETTINGS "Γίνεται φόρτωση των ρυθμίσεών σας..." IDS_CLOSINGNETWORKCONNECTIONS "Closing network connections..." - IDS_REACTOSISSHUTTINGDOWN "Το ReactOS τερματίζει..." + IDS_REACTOSISRESTARTING "Restarting..." + IDS_REACTOSISSHUTTINGDOWN "Shutting down..." IDS_PREPARETOSTANDBY "Γίνεται προετοιμασία για αναμονή..." IDS_PREPARETOHIBERNATE "Preparing to Hibernate..." IDS_SAVEYOURSETTINGS "Γίνεται αποθήκευση των ρυθμίσεών σας..." diff --git a/base/system/winlogon/lang/en-US.rc b/base/system/winlogon/lang/en-US.rc index 7598b6ea203..ada5227b816 100644 --- a/base/system/winlogon/lang/en-US.rc +++ b/base/system/winlogon/lang/en-US.rc @@ -44,7 +44,8 @@ BEGIN IDS_RUNNINGLOGONSCRIPTS "Running logon scripts..." IDS_LOADINGYOURPERSONALSETTINGS "Loading your personal settings..." IDS_CLOSINGNETWORKCONNECTIONS "Closing network connections..." - IDS_REACTOSISSHUTTINGDOWN "ReactOS is shutting down..." + IDS_REACTOSISRESTARTING "Restarting..." + IDS_REACTOSISSHUTTINGDOWN "Shutting down..." IDS_PREPARETOSTANDBY "Preparing to Standby..." IDS_PREPARETOHIBERNATE "Preparing to Hibernate..." IDS_SAVEYOURSETTINGS "Saving your settings..." diff --git a/base/system/winlogon/lang/es-ES.rc b/base/system/winlogon/lang/es-ES.rc index a38f632dbec..6e83ec4ccf5 100644 --- a/base/system/winlogon/lang/es-ES.rc +++ b/base/system/winlogon/lang/es-ES.rc @@ -46,7 +46,8 @@ BEGIN IDS_RUNNINGLOGONSCRIPTS "Ejecutando los scripts de inicio de sesión..." IDS_LOADINGYOURPERSONALSETTINGS "Cargando su configuración personal..." IDS_CLOSINGNETWORKCONNECTIONS "Cerrando las conexiones de red..." - IDS_REACTOSISSHUTTINGDOWN "ReactOS se está apagando..." + IDS_REACTOSISRESTARTING "Restarting..." + IDS_REACTOSISSHUTTINGDOWN "Shutting down..." IDS_PREPARETOSTANDBY "Preparando para entrar en estado de espera (Standby)..." IDS_PREPARETOHIBERNATE "Preparando para hibernar..." IDS_SAVEYOURSETTINGS "Guardando su configuración personal..." diff --git a/base/system/winlogon/lang/fr-FR.rc b/base/system/winlogon/lang/fr-FR.rc index 6fa392b1820..ca15609642f 100644 --- a/base/system/winlogon/lang/fr-FR.rc +++ b/base/system/winlogon/lang/fr-FR.rc @@ -46,7 +46,8 @@ BEGIN IDS_RUNNINGLOGONSCRIPTS "Exécution des scripts d'ouverture de session..." IDS_LOADINGYOURPERSONALSETTINGS "Chargement de vos paramètres personnels..." IDS_CLOSINGNETWORKCONNECTIONS "Fermeture des connections réseau..." - IDS_REACTOSISSHUTTINGDOWN "Fermeture de ReactOS..." + IDS_REACTOSISRESTARTING "Restarting..." + IDS_REACTOSISSHUTTINGDOWN "Shutting down..." IDS_PREPARETOSTANDBY "Préparation de la Mise en Veille..." IDS_PREPARETOHIBERNATE "Préparation de l'hibernation..." IDS_SAVEYOURSETTINGS "Enregistrement de vos paramètres..." diff --git a/base/system/winlogon/lang/he-IL.rc b/base/system/winlogon/lang/he-IL.rc index 97ccac0a34d..81b20740609 100644 --- a/base/system/winlogon/lang/he-IL.rc +++ b/base/system/winlogon/lang/he-IL.rc @@ -46,7 +46,8 @@ BEGIN IDS_RUNNINGLOGONSCRIPTS "מריץ תסריטי התחברות..." IDS_LOADINGYOURPERSONALSETTINGS "טוען את הגדרותיך האישיות..." IDS_CLOSINGNETWORKCONNECTIONS "סוגר חיבורי רשת..." - IDS_REACTOSISSHUTTINGDOWN "ReactOS מתכבה..." + IDS_REACTOSISRESTARTING "Restarting..." + IDS_REACTOSISSHUTTINGDOWN "Shutting down..." IDS_PREPARETOSTANDBY "מתכונן להמתנה..." IDS_PREPARETOHIBERNATE "מתכונן לשינה..." IDS_SAVEYOURSETTINGS "שומר את הגדרותיך..." diff --git a/base/system/winlogon/lang/hu-HU.rc b/base/system/winlogon/lang/hu-HU.rc index 06857a77ac5..21238085ce7 100644 --- a/base/system/winlogon/lang/hu-HU.rc +++ b/base/system/winlogon/lang/hu-HU.rc @@ -46,7 +46,8 @@ BEGIN IDS_RUNNINGLOGONSCRIPTS "Bejelentkezési szkriptek futtatása..." IDS_LOADINGYOURPERSONALSETTINGS "Személyes beállítások betöltése..." IDS_CLOSINGNETWORKCONNECTIONS "Hálózati kapcsolatok lezárása..." - IDS_REACTOSISSHUTTINGDOWN "A ReactOS leáll..." + IDS_REACTOSISRESTARTING "Restarting..." + IDS_REACTOSISSHUTTINGDOWN "Shutting down..." IDS_PREPARETOSTANDBY "Készenléti üzemmód elõkészítése..." IDS_PREPARETOHIBERNATE "Hibernálás elõkészítése..." IDS_SAVEYOURSETTINGS "Beállítások mentése..." diff --git a/base/system/winlogon/lang/id-ID.rc b/base/system/winlogon/lang/id-ID.rc index b6cfd70dd01..cc3c2f744bf 100644 --- a/base/system/winlogon/lang/id-ID.rc +++ b/base/system/winlogon/lang/id-ID.rc @@ -46,7 +46,8 @@ BEGIN IDS_RUNNINGLOGONSCRIPTS "Menjalankan naskah logon..." IDS_LOADINGYOURPERSONALSETTINGS "Mengambil setelan personal anda..." IDS_CLOSINGNETWORKCONNECTIONS "Menutup koneksi jaringan..." - IDS_REACTOSISSHUTTINGDOWN "ReactOS sedang dinonaktifkan..." + IDS_REACTOSISRESTARTING "Restarting..." + IDS_REACTOSISSHUTTINGDOWN "Shutting down..." IDS_PREPARETOSTANDBY "Menyiapkan untuk Standby..." IDS_PREPARETOHIBERNATE "Menyiapkan untuk Tidur..." IDS_SAVEYOURSETTINGS "Menyimpan setelan anda..." diff --git a/base/system/winlogon/lang/it-IT.rc b/base/system/winlogon/lang/it-IT.rc index 01af5b2d4ac..a891df6d6e5 100644 --- a/base/system/winlogon/lang/it-IT.rc +++ b/base/system/winlogon/lang/it-IT.rc @@ -44,7 +44,8 @@ BEGIN IDS_RUNNINGLOGONSCRIPTS "Esecuzione scripts di connessione..." IDS_LOADINGYOURPERSONALSETTINGS "Caricamento delle impostazioni personali..." IDS_CLOSINGNETWORKCONNECTIONS "Chiusura connessioni di rete..." - IDS_REACTOSISSHUTTINGDOWN "ReactOS si sta spegnendo..." + IDS_REACTOSISRESTARTING "Restarting..." + IDS_REACTOSISSHUTTINGDOWN "Shutting down..." IDS_PREPARETOSTANDBY "Preparazione Standby..." IDS_PREPARETOHIBERNATE "Preparazione Ibernazione..." IDS_SAVEYOURSETTINGS "Salvataggio delle impostazioni personali..." diff --git a/base/system/winlogon/lang/ja-JP.rc b/base/system/winlogon/lang/ja-JP.rc index 179908802ea..9924da1b349 100644 --- a/base/system/winlogon/lang/ja-JP.rc +++ b/base/system/winlogon/lang/ja-JP.rc @@ -44,7 +44,8 @@ BEGIN IDS_RUNNINGLOGONSCRIPTS "ログオンスクリプトを実行しています..." IDS_LOADINGYOURPERSONALSETTINGS "個人の設定を読み込んでいます..." IDS_CLOSINGNETWORKCONNECTIONS "ネットワーク接続を切断しています..." - IDS_REACTOSISSHUTTINGDOWN "ReactOS を終了しています..." + IDS_REACTOSISRESTARTING "Restarting..." + IDS_REACTOSISSHUTTINGDOWN "Shutting down..." IDS_PREPARETOSTANDBY "スタンバイの準備をしています..." IDS_PREPARETOHIBERNATE "休止状態の準備をしています..." IDS_SAVEYOURSETTINGS "設定を保存しています..." diff --git a/base/system/winlogon/lang/lt-LT.rc b/base/system/winlogon/lang/lt-LT.rc index 31d82f349ea..518db7448df 100644 --- a/base/system/winlogon/lang/lt-LT.rc +++ b/base/system/winlogon/lang/lt-LT.rc @@ -46,7 +46,8 @@ BEGIN IDS_RUNNINGLOGONSCRIPTS "Vykdomi prisijungimo scenarijai..." IDS_LOADINGYOURPERSONALSETTINGS "Įkeliamos asmeninės nuostatos..." IDS_CLOSINGNETWORKCONNECTIONS "Uždaromi tinklo susijungimai..." - IDS_REACTOSISSHUTTINGDOWN "ReactOS stabdoma..." + IDS_REACTOSISRESTARTING "Restarting..." + IDS_REACTOSISSHUTTINGDOWN "Shutting down..." IDS_PREPARETOSTANDBY "Ruošiamasi pristabdyti..." IDS_PREPARETOHIBERNATE "Ruošiamasi išjungti įrašant..." IDS_SAVEYOURSETTINGS "Išsaugomos nuostatos..." diff --git a/base/system/winlogon/lang/ms-MY.rc b/base/system/winlogon/lang/ms-MY.rc index 39b5583ab44..c2f455a99d0 100644 --- a/base/system/winlogon/lang/ms-MY.rc +++ b/base/system/winlogon/lang/ms-MY.rc @@ -46,7 +46,8 @@ BEGIN IDS_RUNNINGLOGONSCRIPTS "Menjalankan skrip log masuk..." IDS_LOADINGYOURPERSONALSETTINGS "Memuatkan seting peribadi anda..." IDS_CLOSINGNETWORKCONNECTIONS "Tutup sambungan rangkaian..." - IDS_REACTOSISSHUTTINGDOWN "ReactOS sedang memadam komputer anda..." + IDS_REACTOSISRESTARTING "Restarting..." + IDS_REACTOSISSHUTTINGDOWN "Shutting down..." IDS_PREPARETOSTANDBY "Bersedia untuk tunggu sedia..." IDS_PREPARETOHIBERNATE "Bersedia untuk berhibernasi..." IDS_SAVEYOURSETTINGS "Menyimpan seting anda..." diff --git a/base/system/winlogon/lang/nl-NL.rc b/base/system/winlogon/lang/nl-NL.rc index 6f452fb7058..ca4d146002e 100644 --- a/base/system/winlogon/lang/nl-NL.rc +++ b/base/system/winlogon/lang/nl-NL.rc @@ -44,7 +44,8 @@ BEGIN IDS_RUNNINGLOGONSCRIPTS "Inlog scripts uitvoeren..." IDS_LOADINGYOURPERSONALSETTINGS "Uw persoonlijke instelling laden..." IDS_CLOSINGNETWORKCONNECTIONS "Netwerkverbindingen sluiten..." - IDS_REACTOSISSHUTTINGDOWN "ReactOS is aan het afsluiten..." + IDS_REACTOSISRESTARTING "Restarting..." + IDS_REACTOSISSHUTTINGDOWN "Shutting down..." IDS_PREPARETOSTANDBY "Standby wordt voorbereid..." IDS_PREPARETOHIBERNATE "Slaapstand wordt voorbereid..." IDS_SAVEYOURSETTINGS "Persoonlijke instellingen worden opgeslagen..." diff --git a/base/system/winlogon/lang/no-NO.rc b/base/system/winlogon/lang/no-NO.rc index ad3557e5a65..86cff802820 100644 --- a/base/system/winlogon/lang/no-NO.rc +++ b/base/system/winlogon/lang/no-NO.rc @@ -44,7 +44,8 @@ BEGIN IDS_RUNNINGLOGONSCRIPTS "Kjører pålogging skripter..." IDS_LOADINGYOURPERSONALSETTINGS "Laster dine personlige innstillinger..." IDS_CLOSINGNETWORKCONNECTIONS "Avslutter nettverk tilkoblinger..." - IDS_REACTOSISSHUTTINGDOWN "ReactOS avsluttes..." + IDS_REACTOSISRESTARTING "Restarting..." + IDS_REACTOSISSHUTTINGDOWN "Shutting down..." IDS_PREPARETOSTANDBY "Forbreder ventemodus..." IDS_PREPARETOHIBERNATE "Forbreder dvalemodus..." IDS_SAVEYOURSETTINGS "Lagrer innstillingene..." diff --git a/base/system/winlogon/lang/pl-PL.rc b/base/system/winlogon/lang/pl-PL.rc index 19f0e6c1f54..85674ec2d1d 100644 --- a/base/system/winlogon/lang/pl-PL.rc +++ b/base/system/winlogon/lang/pl-PL.rc @@ -52,7 +52,8 @@ BEGIN IDS_RUNNINGLOGONSCRIPTS "Trwa uruchamianie skryptów logowania..." IDS_LOADINGYOURPERSONALSETTINGS "Trwa ładowanie ustawień osobistych..." IDS_CLOSINGNETWORKCONNECTIONS "Trwa zamykanie połączeń sieciowych..." - IDS_REACTOSISSHUTTINGDOWN "Trwa zamykanie systemu ReactOS..." + IDS_REACTOSISRESTARTING "Restarting..." + IDS_REACTOSISSHUTTINGDOWN "Shutting down..." IDS_PREPARETOSTANDBY "Trwa przygotowywanie do przejścia w stan wstrzymania..." IDS_PREPARETOHIBERNATE "Trwa przygotowywanie do hibernacji..." IDS_SAVEYOURSETTINGS "Trwa zapisywanie ustawień..." diff --git a/base/system/winlogon/lang/pt-BR.rc b/base/system/winlogon/lang/pt-BR.rc index f37fb6c8bfe..045a925d161 100644 --- a/base/system/winlogon/lang/pt-BR.rc +++ b/base/system/winlogon/lang/pt-BR.rc @@ -46,7 +46,8 @@ BEGIN IDS_RUNNINGLOGONSCRIPTS "Executando scripts de logon..." IDS_LOADINGYOURPERSONALSETTINGS "Carregando suas configurações pessoais..." IDS_CLOSINGNETWORKCONNECTIONS "Terminando conexões de rede..." - IDS_REACTOSISSHUTTINGDOWN "ReactOS está desligando..." + IDS_REACTOSISRESTARTING "Restarting..." + IDS_REACTOSISSHUTTINGDOWN "Shutting down..." IDS_PREPARETOSTANDBY "Preparando para entrar em Modo de Espera..." IDS_PREPARETOHIBERNATE "Preparando para Hibernar..." IDS_SAVEYOURSETTINGS "Salvando suas configurações..." diff --git a/base/system/winlogon/lang/pt-PT.rc b/base/system/winlogon/lang/pt-PT.rc index ee6c469920b..a74cc52b98c 100644 --- a/base/system/winlogon/lang/pt-PT.rc +++ b/base/system/winlogon/lang/pt-PT.rc @@ -46,7 +46,8 @@ BEGIN IDS_RUNNINGLOGONSCRIPTS "A executar scripts de logon..." IDS_LOADINGYOURPERSONALSETTINGS "A carregar configurações pessoais..." IDS_CLOSINGNETWORKCONNECTIONS "A terminar as ligações de rede..." - IDS_REACTOSISSHUTTINGDOWN "A desligar o ReactOS " + IDS_REACTOSISRESTARTING "Restarting..." + IDS_REACTOSISSHUTTINGDOWN "Shutting down..." IDS_PREPARETOSTANDBY "Preparando para entrar em Modo de Espera..." IDS_PREPARETOHIBERNATE "Preparando para Hibernar..." IDS_SAVEYOURSETTINGS "A guardar as suas configurações..." diff --git a/base/system/winlogon/lang/ro-RO.rc b/base/system/winlogon/lang/ro-RO.rc index d76dd4af83a..04789986a16 100644 --- a/base/system/winlogon/lang/ro-RO.rc +++ b/base/system/winlogon/lang/ro-RO.rc @@ -53,7 +53,8 @@ BEGIN IDS_RUNNINGLOGONSCRIPTS "Operații de autentificare în curs de efectuare…" IDS_LOADINGYOURPERSONALSETTINGS "Configurații personale în curs de reconstituire…" IDS_CLOSINGNETWORKCONNECTIONS "Conexiuni în rețea în curs de închidere…" - IDS_REACTOSISSHUTTINGDOWN "Sistem de operare în curs de oprire…" + IDS_REACTOSISRESTARTING "Restarting..." + IDS_REACTOSISSHUTTINGDOWN "Shutting down..." IDS_PREPARETOSTANDBY "Stare de veghe în curs de pregătire…" IDS_PREPARETOHIBERNATE "Stare de hibernare în curs de pregătire…" IDS_SAVEYOURSETTINGS "Configurații personale în curs de păstrare…" diff --git a/base/system/winlogon/lang/ru-RU.rc b/base/system/winlogon/lang/ru-RU.rc index c96806006a0..ef07f8c90e4 100644 --- a/base/system/winlogon/lang/ru-RU.rc +++ b/base/system/winlogon/lang/ru-RU.rc @@ -44,7 +44,8 @@ BEGIN IDS_RUNNINGLOGONSCRIPTS "Выполняются скрипты входа в систему..." IDS_LOADINGYOURPERSONALSETTINGS "Загружаются персональные настройки..." IDS_CLOSINGNETWORKCONNECTIONS "Отключаются сетевые соединения..." - IDS_REACTOSISSHUTTINGDOWN "ReactOS завершает работу.." + IDS_REACTOSISRESTARTING "Restarting..." + IDS_REACTOSISSHUTTINGDOWN "Shutting down..." IDS_PREPARETOSTANDBY "Подготовка к переходу в режим ожидания..." IDS_PREPARETOHIBERNATE "Подготовка к переходу в спящий режим..." IDS_SAVEYOURSETTINGS "Сохраняются настройки..." diff --git a/base/system/winlogon/lang/sk-SK.rc b/base/system/winlogon/lang/sk-SK.rc index 28dc8424252..0d2e983eaec 100644 --- a/base/system/winlogon/lang/sk-SK.rc +++ b/base/system/winlogon/lang/sk-SK.rc @@ -49,7 +49,8 @@ BEGIN IDS_RUNNINGLOGONSCRIPTS "Spúšťajú sa prihlasovacie skripty..." IDS_LOADINGYOURPERSONALSETTINGS "Načítavajú sa Vaše osobné nastavenia..." IDS_CLOSINGNETWORKCONNECTIONS "Ukončujú sa sieťové pripojenia..." - IDS_REACTOSISSHUTTINGDOWN "Systém ReactOS sa vypína..." + IDS_REACTOSISRESTARTING "Restarting..." + IDS_REACTOSISSHUTTINGDOWN "Shutting down..." IDS_PREPARETOSTANDBY "Systém sa pripravuje na prechod do úsporného režimu..." IDS_PREPARETOHIBERNATE "Systém sa pripravuje na prechod do režimu dlhodobého spánku..." IDS_SAVEYOURSETTINGS "Systém ukladá Vaše nastavenia..." diff --git a/base/system/winlogon/lang/sq-AL.rc b/base/system/winlogon/lang/sq-AL.rc index b5cc93fd618..0e616778685 100644 --- a/base/system/winlogon/lang/sq-AL.rc +++ b/base/system/winlogon/lang/sq-AL.rc @@ -48,7 +48,8 @@ BEGIN IDS_RUNNINGLOGONSCRIPTS "Nis skriptet e hyrjes..." IDS_LOADINGYOURPERSONALSETTINGS "Ngarkon konfigurimet personale..." IDS_CLOSINGNETWORKCONNECTIONS "Mbyll lidhjet e networkut..." - IDS_REACTOSISSHUTTINGDOWN "ReactOS po fiket..." + IDS_REACTOSISRESTARTING "Restarting..." + IDS_REACTOSISSHUTTINGDOWN "Shutting down..." IDS_PREPARETOSTANDBY "Pergatitja e gadishmerise..." IDS_PREPARETOHIBERNATE "Pergatitet per letargji..." IDS_SAVEYOURSETTINGS "Ruan konfigurimin tuaj..." diff --git a/base/system/winlogon/lang/sv-SE.rc b/base/system/winlogon/lang/sv-SE.rc index e8a561ce8be..74f718909dd 100644 --- a/base/system/winlogon/lang/sv-SE.rc +++ b/base/system/winlogon/lang/sv-SE.rc @@ -46,7 +46,8 @@ BEGIN IDS_RUNNINGLOGONSCRIPTS "Kör inloggningsskript..." IDS_LOADINGYOURPERSONALSETTINGS "Laddar dina personliga inställningar..." IDS_CLOSINGNETWORKCONNECTIONS "Stänger nätverksanslutningar..." - IDS_REACTOSISSHUTTINGDOWN "ReactOS håller på att stängas av..." + IDS_REACTOSISRESTARTING "Restarting..." + IDS_REACTOSISSHUTTINGDOWN "Shutting down..." IDS_PREPARETOSTANDBY "Förbereder för vänteläge..." IDS_PREPARETOHIBERNATE "Förbereder för viloläge..." IDS_SAVEYOURSETTINGS "Sparar dina inställningar..." diff --git a/base/system/winlogon/lang/tr-TR.rc b/base/system/winlogon/lang/tr-TR.rc index 63bf8ea942d..4ea3b1ad7d9 100644 --- a/base/system/winlogon/lang/tr-TR.rc +++ b/base/system/winlogon/lang/tr-TR.rc @@ -46,7 +46,8 @@ BEGIN IDS_RUNNINGLOGONSCRIPTS "Oturum Açma Betikleri Çalıştırılıyor..." IDS_LOADINGYOURPERSONALSETTINGS "Kişisel Ayarlarınız Yükleniyor..." IDS_CLOSINGNETWORKCONNECTIONS "Ağ Bağlantıları Kapatılıyor..." - IDS_REACTOSISSHUTTINGDOWN "ReactOS Kapatılıyor..." + IDS_REACTOSISRESTARTING "Restarting..." + IDS_REACTOSISSHUTTINGDOWN "Shutting down..." IDS_PREPARETOSTANDBY "Uykuya Hazırlanıyor..." IDS_PREPARETOHIBERNATE "Hazırda Beklemeye Hazırlanıyor..." IDS_SAVEYOURSETTINGS "Ayarlarınız Kaydediliyor..." diff --git a/base/system/winlogon/lang/uk-UA.rc b/base/system/winlogon/lang/uk-UA.rc index b5bcb1aff5b..6b918fc078e 100644 --- a/base/system/winlogon/lang/uk-UA.rc +++ b/base/system/winlogon/lang/uk-UA.rc @@ -44,7 +44,8 @@ BEGIN IDS_RUNNINGLOGONSCRIPTS "Виконання сценаріїв входу до системи..." IDS_LOADINGYOURPERSONALSETTINGS "Завантаження особистих параметрів..." IDS_CLOSINGNETWORKCONNECTIONS "Закриття мережних підключень..." - IDS_REACTOSISSHUTTINGDOWN "Завершення роботи ReactOS..." + IDS_REACTOSISRESTARTING "Restarting..." + IDS_REACTOSISSHUTTINGDOWN "Shutting down..." IDS_PREPARETOSTANDBY "Підготовка до режиму очікування..." IDS_PREPARETOHIBERNATE "Підготовка до сплячого режиму..." IDS_SAVEYOURSETTINGS "Збереження параметрів..." diff --git a/base/system/winlogon/lang/zh-CN.rc b/base/system/winlogon/lang/zh-CN.rc index 4ede506c990..b4b71e615be 100644 --- a/base/system/winlogon/lang/zh-CN.rc +++ b/base/system/winlogon/lang/zh-CN.rc @@ -47,7 +47,8 @@ BEGIN IDS_RUNNINGLOGONSCRIPTS "正在运行登录脚本..." IDS_LOADINGYOURPERSONALSETTINGS "正在加载个人设置..." IDS_CLOSINGNETWORKCONNECTIONS "正在关闭网络连接..." - IDS_REACTOSISSHUTTINGDOWN "ReactOS 正在关机..." + IDS_REACTOSISRESTARTING "Restarting..." + IDS_REACTOSISSHUTTINGDOWN "Shutting down..." IDS_PREPARETOSTANDBY "正在准备待机..." IDS_PREPARETOHIBERNATE "正在准备休眠..." IDS_SAVEYOURSETTINGS "正在保存设置..." diff --git a/base/system/winlogon/lang/zh-TW.rc b/base/system/winlogon/lang/zh-TW.rc index a1e35eecd67..39e564033d0 100644 --- a/base/system/winlogon/lang/zh-TW.rc +++ b/base/system/winlogon/lang/zh-TW.rc @@ -47,7 +47,8 @@ BEGIN IDS_RUNNINGLOGONSCRIPTS "正在運行登入指令碼..." IDS_LOADINGYOURPERSONALSETTINGS "正在載入個人設定..." IDS_CLOSINGNETWORKCONNECTIONS "正在關閉網路連線..." - IDS_REACTOSISSHUTTINGDOWN "ReactOS 正在關機..." + IDS_REACTOSISRESTARTING "Restarting..." + IDS_REACTOSISSHUTTINGDOWN "Shutting down..." IDS_PREPARETOSTANDBY "正在準備待機..." IDS_PREPARETOHIBERNATE "正在準備休眠..." IDS_SAVEYOURSETTINGS "正在儲存設定..." diff --git a/base/system/winlogon/resource.h b/base/system/winlogon/resource.h index b57902dbae1..1373daf157a 100644 --- a/base/system/winlogon/resource.h +++ b/base/system/winlogon/resource.h @@ -35,5 +35,6 @@ #define IDS_REACTOSISSTARTINGUP 1690 #define IDS_TIMEOUTSHORTFORMAT 1695 #define IDS_TIMEOUTLONGFORMAT 1696 +#define IDS_REACTOSISRESTARTING 1697 #define IDS_FAILEDACTIVATEUSERSHELL 1001 diff --git a/base/system/winlogon/sas.c b/base/system/winlogon/sas.c index c510a1111ea..f01c68a923d 100644 --- a/base/system/winlogon/sas.c +++ b/base/system/winlogon/sas.c @@ -5,6 +5,7 @@ * PURPOSE: Secure Attention Sequence * PROGRAMMERS: Thomas Weidenmueller (w3seek(a)users.sourceforge.net) * Herv� Poussineau (hpoussin(a)reactos.org) + * Arnav Bhatt (arnavbhatt288(a)gmail.com) * UPDATE HISTORY: * Created 28/03/2004 */ @@ -1046,7 +1047,12 @@ HandleShutdown( BOOLEAN Old; // SwitchDesktop(Session->WinlogonDesktop); - DisplayStatusMessage(Session, Session->WinlogonDesktop, IDS_REACTOSISSHUTTINGDOWN); + + /* If the system is rebooting, show the appropriate string */ + if (wlxAction == WLX_SAS_ACTION_SHUTDOWN_REBOOT) + DisplayStatusMessage(Session, Session->WinlogonDesktop, IDS_REACTOSISRESTARTING); + else + DisplayStatusMessage(Session, Session->WinlogonDesktop, IDS_REACTOSISSHUTTINGDOWN); /* Prepare data for shutdown thread */ LSData = HeapAlloc(GetProcessHeap(), 0, sizeof(LOGOFF_SHUTDOWN_DATA));

1 0

← Newer
1
...
5
6
7
8
9
10
11
...
18
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs April 2021