Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: [USRMGR] Increase name sizes to 'UNLEN + 1'
by Serge Gautherie 24 Apr '21

24 Apr '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a120d67d0e71856306c4d… commit a120d67d0e71856306c4dc41ecaac5fd541c9049 Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Wed Jun 24 20:41:44 2020 +0200 Commit: George Bișoc <george.bisoc(a)reactos.org> CommitDate: Sat Apr 24 20:30:58 2021 +0200 [USRMGR] Increase name sizes to 'UNLEN + 1' --- dll/cpl/usrmgr/groupprops.c | 12 ++++++------ dll/cpl/usrmgr/groups.c | 14 +++++++------- dll/cpl/usrmgr/userprops.c | 12 ++++++------ dll/cpl/usrmgr/users.c | 18 +++++++++--------- 4 files changed, 28 insertions(+), 28 deletions(-) diff --git a/dll/cpl/usrmgr/groupprops.c b/dll/cpl/usrmgr/groupprops.c index f888beb36ae..2ae227ae512 100644 --- a/dll/cpl/usrmgr/groupprops.c +++ b/dll/cpl/usrmgr/groupprops.c @@ -155,7 +155,7 @@ AddSelectedUsersToGroup(HWND hwndDlg, HWND hwndLV; INT nSelectedItems; INT nItem; - TCHAR szUserName[UNLEN]; + TCHAR szUserName[UNLEN + 1]; BOOL bResult = FALSE; LOCALGROUP_MEMBERS_INFO_3 memberInfo; NET_API_STATUS status; @@ -172,7 +172,7 @@ AddSelectedUsersToGroup(HWND hwndDlg, ListView_GetItemText(hwndLV, nItem, 0, szUserName, - UNLEN); + UNLEN + 1); DebugPrintf(_TEXT("Selected user: %s"), szUserName); @@ -310,7 +310,7 @@ static VOID RemoveUserFromGroup(HWND hwndDlg, PGENERAL_GROUP_DATA pGroupData) { - TCHAR szUserName[UNLEN]; + TCHAR szUserName[UNLEN + 1]; TCHAR szText[256]; LOCALGROUP_MEMBERS_INFO_3 memberInfo; HWND hwndLV; @@ -326,7 +326,7 @@ RemoveUserFromGroup(HWND hwndDlg, ListView_GetItemText(hwndLV, nItem, 0, szUserName, - UNLEN); + UNLEN + 1); /* Display a warning message because the remove operation cannot be reverted */ wsprintf(szText, TEXT("Do you really want to remove the user \"%s\" from the group \"%s\"?"), @@ -612,7 +612,7 @@ GroupProperties(HWND hwndDlg) { PROPSHEETPAGE psp[1]; PROPSHEETHEADER psh; - TCHAR szGroupName[UNLEN]; + TCHAR szGroupName[UNLEN + 1]; INT nItem; HWND hwndLV; @@ -625,7 +625,7 @@ GroupProperties(HWND hwndDlg) ListView_GetItemText(hwndLV, nItem, 0, szGroupName, - UNLEN); + UNLEN + 1); ZeroMemory(&psh, sizeof(PROPSHEETHEADER)); psh.dwSize = sizeof(PROPSHEETHEADER); diff --git a/dll/cpl/usrmgr/groups.c b/dll/cpl/usrmgr/groups.c index 73ce4e1368d..44423038b84 100644 --- a/dll/cpl/usrmgr/groups.c +++ b/dll/cpl/usrmgr/groups.c @@ -90,7 +90,7 @@ UpdateGroupsList(HWND hwndListView) static VOID UpdateGroupProperties(HWND hwndDlg) { - TCHAR szGroupName[UNLEN]; + TCHAR szGroupName[UNLEN + 1]; INT iItem; HWND hwndLV; PLOCALGROUP_INFO_1 pGroupInfo = NULL; @@ -104,7 +104,7 @@ UpdateGroupProperties(HWND hwndDlg) ListView_GetItemText(hwndLV, iItem, 0, szGroupName, - UNLEN); + UNLEN + 1); NetLocalGroupGetInfo(NULL, szGroupName, 1, (LPBYTE*)&pGroupInfo); @@ -254,7 +254,7 @@ GroupRename(HWND hwndDlg) static BOOL GroupDelete(HWND hwndDlg) { - TCHAR szGroupName[UNLEN]; + TCHAR szGroupName[UNLEN + 1]; TCHAR szText[256]; INT nItem; HWND hwndLV; @@ -269,7 +269,7 @@ GroupDelete(HWND hwndDlg) ListView_GetItemText(hwndLV, nItem, 0, szGroupName, - UNLEN); + UNLEN + 1); /* Display a warning message, because the delete operation cannot be reverted */ wsprintf(szText, TEXT("Dou you really want to delete the user group \"%s\"?"), szGroupName); @@ -336,8 +336,8 @@ OnGroupsPageBeginLabelEdit(LPNMLVDISPINFO pnmv) static BOOL OnGroupsPageEndLabelEdit(LPNMLVDISPINFO pnmv) { - TCHAR szOldGroupName[UNLEN]; - TCHAR szNewGroupName[UNLEN]; + TCHAR szOldGroupName[UNLEN + 1]; + TCHAR szNewGroupName[UNLEN + 1]; LOCALGROUP_INFO_0 lgrpi0; NET_API_STATUS status; @@ -349,7 +349,7 @@ OnGroupsPageEndLabelEdit(LPNMLVDISPINFO pnmv) ListView_GetItemText(pnmv->hdr.hwndFrom, pnmv->item.iItem, 0, szOldGroupName, - UNLEN); + UNLEN + 1); /* Leave, if the user canceled the edit action */ if (pnmv->item.pszText == NULL) diff --git a/dll/cpl/usrmgr/userprops.c b/dll/cpl/usrmgr/userprops.c index 44a3abcb40b..37819c52be8 100644 --- a/dll/cpl/usrmgr/userprops.c +++ b/dll/cpl/usrmgr/userprops.c @@ -316,7 +316,7 @@ static VOID RemoveGroupFromUser(HWND hwndDlg, PMEMBERSHIP_USER_DATA pUserData) { - TCHAR szGroupName[UNLEN]; + TCHAR szGroupName[UNLEN + 1]; TCHAR szText[256]; LOCALGROUP_MEMBERS_INFO_3 memberInfo; HWND hwndLV; @@ -332,7 +332,7 @@ RemoveGroupFromUser(HWND hwndDlg, ListView_GetItemText(hwndLV, nItem, 0, szGroupName, - UNLEN); + UNLEN + 1); /* Display a warning message because the remove operation cannot be reverted */ wsprintf(szText, TEXT("Do you really want to remove the user \"%s\" from the group \"%s\"?"), @@ -441,7 +441,7 @@ AddSelectedGroupsToUser(HWND hwndDlg, { HWND hwndLV; INT nItem; - TCHAR szGroupName[UNLEN]; + TCHAR szGroupName[UNLEN + 1]; BOOL bResult = FALSE; BOOL bFound; DWORD i; @@ -459,7 +459,7 @@ AddSelectedGroupsToUser(HWND hwndDlg, ListView_GetItemText(hwndLV, nItem, 0, szGroupName, - UNLEN); + UNLEN + 1); bFound = FALSE; for (i = 0; i < pUserData->dwGroupCount; i++) @@ -902,7 +902,7 @@ UserProperties(HWND hwndDlg) { PROPSHEETPAGE psp[3]; PROPSHEETHEADER psh; - TCHAR szUserName[UNLEN]; + TCHAR szUserName[UNLEN + 1]; INT nItem; HWND hwndLV; @@ -915,7 +915,7 @@ UserProperties(HWND hwndDlg) ListView_GetItemText(hwndLV, nItem, 0, szUserName, - UNLEN); + UNLEN + 1); ZeroMemory(&psh, sizeof(PROPSHEETHEADER)); psh.dwSize = sizeof(PROPSHEETHEADER); diff --git a/dll/cpl/usrmgr/users.c b/dll/cpl/usrmgr/users.c index c137e66ce49..084743e72f8 100644 --- a/dll/cpl/usrmgr/users.c +++ b/dll/cpl/usrmgr/users.c @@ -109,7 +109,7 @@ ChangePasswordDlgProc(HWND hwndDlg, static VOID UserChangePassword(HWND hwndDlg) { - TCHAR szUserName[UNLEN]; + TCHAR szUserName[UNLEN + 1]; USER_INFO_1003 user; INT nItem; HWND hwndLV; @@ -126,7 +126,7 @@ UserChangePassword(HWND hwndDlg) ListView_GetItemText(hwndLV, nItem, 0, szUserName, - UNLEN); + UNLEN + 1); if (DialogBoxParam(hApplet, MAKEINTRESOURCE(IDD_CHANGE_PASSWORD), @@ -386,7 +386,7 @@ UserRename(HWND hwndDlg) static BOOL UserDelete(HWND hwndDlg) { - TCHAR szUserName[UNLEN]; + TCHAR szUserName[UNLEN + 1]; TCHAR szText[256]; INT nItem; HWND hwndLV; @@ -401,7 +401,7 @@ UserDelete(HWND hwndDlg) ListView_GetItemText(hwndLV, nItem, 0, szUserName, - UNLEN); + UNLEN + 1); /* Display a warning message because the delete operation cannot be reverted */ wsprintf(szText, TEXT("Do you really want to delete the user \"%s\"?"), szUserName); @@ -550,8 +550,8 @@ OnBeginLabelEdit(LPNMLVDISPINFO pnmv) static BOOL OnEndLabelEdit(LPNMLVDISPINFO pnmv) { - TCHAR szOldUserName[UNLEN]; - TCHAR szNewUserName[UNLEN]; + TCHAR szOldUserName[UNLEN + 1]; + TCHAR szNewUserName[UNLEN + 1]; USER_INFO_0 useri0; NET_API_STATUS status; @@ -563,7 +563,7 @@ OnEndLabelEdit(LPNMLVDISPINFO pnmv) ListView_GetItemText(pnmv->hdr.hwndFrom, pnmv->item.iItem, 0, szOldUserName, - UNLEN); + UNLEN + 1); /* Leave, if the user canceled the edit action */ if (pnmv->item.pszText == NULL) @@ -649,7 +649,7 @@ OnNotify(HWND hwndDlg, PUSER_DATA pUserData, NMHDR *phdr) static VOID UpdateUserProperties(HWND hwndDlg) { - TCHAR szUserName[UNLEN]; + TCHAR szUserName[UNLEN + 1]; INT iItem; HWND hwndLV; PUSER_INFO_2 pUserInfo = NULL; @@ -664,7 +664,7 @@ UpdateUserProperties(HWND hwndDlg) ListView_GetItemText(hwndLV, iItem, 0, szUserName, - UNLEN); + UNLEN + 1); NetUserGetInfo(NULL, szUserName, 2, (LPBYTE*)&pUserInfo);

1 0

[reactos] 01/01: [COMCTL32] Fix an incorrect returned value for ImageList_Remove
by George Bișoc 24 Apr '21

24 Apr '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1cf1892b14b53a586b45e… commit 1cf1892b14b53a586b45e6b7da81fa9ec57977e9 Author: George Bișoc <george.bisoc(a)reactos.org> AuthorDate: Sat Apr 24 20:13:56 2021 +0200 Commit: George Bișoc <george.bisoc(a)reactos.org> CommitDate: Sat Apr 24 20:13:56 2021 +0200 [COMCTL32] Fix an incorrect returned value for ImageList_Remove Thanks goes to Kyle Katarn. Had to make a commit myself due to author's account being deleted. Signed-off-by: Kyle Katarn <contact(a)kcsoftwares.com> --- dll/win32/comctl32/imagelist.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/win32/comctl32/imagelist.c b/dll/win32/comctl32/imagelist.c index b97adaa90d7..78407dfdd94 100644 --- a/dll/win32/comctl32/imagelist.c +++ b/dll/win32/comctl32/imagelist.c @@ -4196,7 +4196,7 @@ ImageList_Remove (HIMAGELIST himl, INT i) { IImageList2* piml = IImageList2_from_impl(himl); if (!piml) - return -1; + return FALSE; return (piml->lpVtbl->Remove(piml, i) == S_OK) ? TRUE : FALSE; }

1 0

[reactos] 01/01: Fix start logo resource
by Abdulganiev Rafael 24 Apr '21

24 Apr '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=48d9c07894d5fa3cebe64… commit 48d9c07894d5fa3cebe6437a2b9ec5ae3fdc7a9a Author: Abdulganiev Rafael <abdulganiev.rafael(a)gmail.com> AuthorDate: Mon Sep 23 16:32:30 2019 +0400 Commit: George Bișoc <george.bisoc(a)reactos.org> CommitDate: Sat Apr 24 18:17:41 2021 +0200 Fix start logo resource --- .../mizu.msstyles/bitmaps/NORMAL_STARTBUTTON.bmp | Bin 10350 -> 10352 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_STARTBUTTON.bmp b/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_STARTBUTTON.bmp index 35a7477ae42..dad1e96e151 100644 Binary files a/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_STARTBUTTON.bmp and b/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_STARTBUTTON.bmp differ

1 0

[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

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