Ros-diffs

ros-diffs@reactos.org

81390 discussions

01/02: [IDL] Add some Flags SamrSetInformationUser.UserInternal2Information
by Eric Kohl 04 Sep '18

04 Sep '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f5b3a1088524854e9d340… commit f5b3a1088524854e9d3408d7e894f9d6dba8291d Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Tue Sep 4 22:41:04 2018 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Tue Sep 4 22:42:47 2018 +0200 [IDL] Add some Flags SamrSetInformationUser.UserInternal2Information --- sdk/include/reactos/idl/sam.idl | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sdk/include/reactos/idl/sam.idl b/sdk/include/reactos/idl/sam.idl index 31cb7d3ce2..ba43697a7c 100644 --- a/sdk/include/reactos/idl/sam.idl +++ b/sdk/include/reactos/idl/sam.idl @@ -644,6 +644,10 @@ typedef struct _SAMPR_USER_INTERNAL1_INFORMATION BOOLEAN PasswordExpired; } SAMPR_USER_INTERNAL1_INFORMATION, *PSAMPR_USER_INTERNAL1_INFORMATION; +/* SAMPR_USER_INTERNAL2_INFORMATION.Flags values */ +cpp_quote("#define USER_LOGON_BAD_PASSWORD 0x08000000") +cpp_quote("#define USER_LOGON_SUCCESS 0x10000000") + typedef struct _SAMPR_USER_INTERNAL2_INFORMATION { unsigned long Flags;

1 0

01/01: [FONTEXT] Add Italian translation (#831)
by Bișoc George 04 Sep '18

04 Sep '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4208e7eed8542565a6059… commit 4208e7eed8542565a6059abbca4475f1cb78a5ae Author: Bișoc George <fraizeraust99(a)gmail.com> AuthorDate: Tue Sep 4 22:02:44 2018 +0200 Commit: Robert Naumann <gonzomdx(a)gmail.com> CommitDate: Tue Sep 4 22:02:44 2018 +0200 [FONTEXT] Add Italian translation (#831) --- dll/shellext/fontext/fontext.rc | 3 +++ dll/shellext/fontext/lang/it-IT.rc | 13 +++++++++++++ 2 files changed, 16 insertions(+) diff --git a/dll/shellext/fontext/fontext.rc b/dll/shellext/fontext/fontext.rc index 61f9904cd3..eebe038fa7 100644 --- a/dll/shellext/fontext/fontext.rc +++ b/dll/shellext/fontext/fontext.rc @@ -14,6 +14,9 @@ #ifdef LANGUAGE_EN_US #include "lang/en-US.rc" #endif +#ifdef LANGUAGE_IT_IT + #include "lang/it-IT.rc" +#endif #ifdef LANGUAGE_RO_RO #include "lang/ro-RO.rc" #endif diff --git a/dll/shellext/fontext/lang/it-IT.rc b/dll/shellext/fontext/lang/it-IT.rc new file mode 100644 index 0000000000..5c067cdc5f --- /dev/null +++ b/dll/shellext/fontext/lang/it-IT.rc @@ -0,0 +1,13 @@ +/* + * PROJECT: ReactOS Font Text + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Italian translation resource + * COPYRIGHT: Copyright 2018 Bișoc George (fraizeraust99 at gmail dot com) + */ + +LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL + +STRINGTABLE +BEGIN + IDS_REACTOS_FONTS_FOLDER "Cartella dei font di ReactOS" +END

1 0

01/01: [ACCESS] Fix some truncated strings in French resource (#838)
by Bișoc George 03 Sep '18

03 Sep '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=773d6a536aa684f31993d… commit 773d6a536aa684f31993d196a670c5c6a5e6c350 Author: Bișoc George <fraizeraust99(a)gmail.com> AuthorDate: Mon Sep 3 14:14:57 2018 +0200 Commit: Robert Naumann <gonzomdx(a)gmail.com> CommitDate: Mon Sep 3 14:14:57 2018 +0200 [ACCESS] Fix some truncated strings in French resource (#838) --- dll/cpl/access/lang/fr-FR.rc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dll/cpl/access/lang/fr-FR.rc b/dll/cpl/access/lang/fr-FR.rc index 518a5e0314..e2659c10bc 100644 --- a/dll/cpl/access/lang/fr-FR.rc +++ b/dll/cpl/access/lang/fr-FR.rc @@ -87,16 +87,16 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Général" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - GROUPBOX "Réinitialisation automatique", -1, 6, 11, 234, 47 + GROUPBOX "Réinitialisation automatique", -1, 6, 11, 234, 50 AUTOCHECKBOX "&Désactiver les fonctionnalités d'accessibilité après un délai d'inactivité de :", - IDC_RESET_BOX, 12, 18, 222, 14 + IDC_RESET_BOX, 12, 20, 222, 16, BS_MULTILINE COMBOBOX IDC_RESET_COMBO, 24, 38, 60, 47, CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP - GROUPBOX "Avertissement", -1, 6, 63, 234, 47 + GROUPBOX "Avertissement", -1, 6, 63, 234, 50 AUTOCHECKBOX "Afficher un message d'avertissement lors de l'activation d'une fonctionnalité", IDC_NOTIFICATION_MESSAGE, - 12, 72, 222, 14 + 12, 72, 222, 14, BS_MULTILINE AUTOCHECKBOX "Émettre un son lors de l'activation/désactivation d'une fonctionnalité", IDC_NOTIFICATION_SOUND, - 12, 90, 222, 14 + 12, 90, 222, 18, BS_MULTILINE GROUPBOX "Périphériques Touches série", -1, 6, 115, 234, 47 LTEXT "Les périphériques Touches série représentent une alternative pour accéder aux fonctionnalités du clavier et de la souris.", -1, 12, 124, 222, 20 @@ -106,7 +106,7 @@ BEGIN AUTOCHECKBOX "Appliquer tous les paramètres au Bureau d'ou&verture de session", IDC_ADMIN_LOGON_BOX, 12, 178, 222, 14 AUTOCHECKBOX "Appliq&uer tous les paramètres par défaut aux nouveaux utilisateurs", IDC_ADMIN_USERS_BOX, - 12, 196, 222, 14 + 12, 196, 222, 14, BS_MULTILINE END IDD_STICKYKEYSOPTIONS DIALOGEX 0, 0, 246, 228

1 0

01/01: [SAMSRV] Implement SamrQueryInformationUser.UserInternal2Information
by Eric Kohl 02 Sep '18

02 Sep '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=653a9be05bebd56ab50ba… commit 653a9be05bebd56ab50baedfe4b7f0e2c2a0e650 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Sep 2 17:53:29 2018 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Sep 2 17:54:26 2018 +0200 [SAMSRV] Implement SamrQueryInformationUser.UserInternal2Information --- dll/win32/samsrv/samrpc.c | 54 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) diff --git a/dll/win32/samsrv/samrpc.c b/dll/win32/samsrv/samrpc.c index 2f3729d3eb..114532cdb6 100644 --- a/dll/win32/samsrv/samrpc.c +++ b/dll/win32/samsrv/samrpc.c @@ -6738,6 +6738,54 @@ done: } +static +NTSTATUS +SampQueryUserInternal2(PSAM_DB_OBJECT UserObject, + PSAMPR_USER_INFO_BUFFER *Buffer) +{ + PSAMPR_USER_INFO_BUFFER InfoBuffer = NULL; + SAM_USER_FIXED_DATA FixedData; + ULONG Length = 0; + NTSTATUS Status; + + *Buffer = NULL; + + InfoBuffer = midl_user_allocate(sizeof(SAMPR_USER_INFO_BUFFER)); + if (InfoBuffer == NULL) + return STATUS_INSUFFICIENT_RESOURCES; + + Length = sizeof(SAM_USER_FIXED_DATA); + Status = SampGetObjectAttribute(UserObject, + L"F", + NULL, + (PVOID)&FixedData, + &Length); + if (!NT_SUCCESS(Status)) + goto done; + + InfoBuffer->Internal2.Flags = 0; + InfoBuffer->Internal2.LastLogon.LowPart = FixedData.LastLogon.LowPart; + InfoBuffer->Internal2.LastLogon.HighPart = FixedData.LastLogon.HighPart; + InfoBuffer->Internal2.LastLogoff.LowPart = FixedData.LastLogoff.LowPart; + InfoBuffer->Internal2.LastLogoff.HighPart = FixedData.LastLogoff.HighPart; + InfoBuffer->Internal2.BadPasswordCount = FixedData.BadPasswordCount; + InfoBuffer->Internal2.LogonCount = FixedData.LogonCount; + + *Buffer = InfoBuffer; + +done: + if (!NT_SUCCESS(Status)) + { + if (InfoBuffer != NULL) + { + midl_user_free(InfoBuffer); + } + } + + return Status; +} + + static NTSTATUS SampQueryUserParameters(PSAM_DB_OBJECT UserObject, PSAMPR_USER_INFO_BUFFER *Buffer) @@ -7315,6 +7363,7 @@ SamrQueryInformationUser(IN SAMPR_HANDLE UserHandle, break; case UserInternal1Information: + case UserInternal2Information: case UserAllInformation: DesiredAccess = 0; break; @@ -7423,6 +7472,11 @@ SamrQueryInformationUser(IN SAMPR_HANDLE UserHandle, Buffer); break; + case UserInternal2Information: + Status = SampQueryUserInternal2(UserObject, + Buffer); + break; + case UserParametersInformation: Status = SampQueryUserParameters(UserObject, Buffer);

1 0

01/01: [MSGINA] Update russian translation (#834)
by Stanislav Motylkov 02 Sep '18

02 Sep '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c7415b3faa9d9d7fbc719… commit c7415b3faa9d9d7fbc719646ef63f17ebeeaac30 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Sun Sep 2 16:59:33 2018 +0300 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Sep 2 15:59:33 2018 +0200 [MSGINA] Update russian translation (#834) Addendum to 6f4d70b. --- dll/win32/msgina/lang/ru-RU.rc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dll/win32/msgina/lang/ru-RU.rc b/dll/win32/msgina/lang/ru-RU.rc index be7272f8a0..7891fa040f 100644 --- a/dll/win32/msgina/lang/ru-RU.rc +++ b/dll/win32/msgina/lang/ru-RU.rc @@ -145,13 +145,13 @@ BEGIN LTEXT "&Выберите желаемое действие:", IDC_STATIC, 39, 57, 167, 10 COMBOBOX IDC_SHUTDOWN_ACTION, 39, 70, 190, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 190, 27 - GROUPBOX "Shutdown Event Tracker", IDC_STATIC, 9, 122, 257, 146 - LTEXT "Select the option that best describes why you want to shut down your computer.", IDC_STATIC, 39, 134, 190, 17 - LTEXT "&Option:", IDC_STATIC, 39, 154, 80, 8 - AUTOCHECKBOX "&Planned", IDC_REASON_PLANNED, 182, 154, 47, 10 + GROUPBOX "Регистрация события завершения работы", IDC_STATIC, 9, 122, 257, 146 + LTEXT "Выберите наиболее подходящую причину завершения работы в данный момент.", IDC_STATIC, 39, 134, 190, 17 + LTEXT "&Причина:", IDC_STATIC, 39, 154, 80, 8 + AUTOCHECKBOX "&Запланированное", IDC_REASON_PLANNED, 182, 154, 47, 10 COMBOBOX IDC_REASON_LIST, 39, 165, 190, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "", IDC_REASON_DESCRIPTION, 39, 184, 190, 27 - LTEXT "&Comment:", IDC_STATIC, 39, 214, 80, 8 + LTEXT "&Комментарий:", IDC_STATIC, 39, 214, 80, 8 EDITTEXT IDC_REASON_COMMENT, 39, 224, 190, 35, ES_MULTILINE | WS_VISIBLE | WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 150, 276, 55, 14, WS_GROUP PUSHBUTTON "Отмена", IDCANCEL, 211, 276, 55, 14 @@ -200,7 +200,7 @@ BEGIN IDS_LOGONUSERDISABLED "Ваш аккаунт отключен. Пожалуйста, обратитесь к системному администратору." IDS_PASSWORDMUSTCHANGE "Вы должны сменить пароль при следующем входе." IDS_PASSWORDEXPIRED "Срок действия вашего пароля истек, необходимо его изменить." - IDS_ACCOUNTEXPIRED "Your account has expired. Please see your system administrator." + IDS_ACCOUNTEXPIRED "Срок действия вашего аккаунта истек. Пожалуйста, обратитесь к системному администратору." END /* Shutdown Dialog Strings */

1 0

01/01: [IDL] Add the undocumented struct _SAMPR_USER_INTERNAL2_INFORMATION to sam.idl
by Eric Kohl 02 Sep '18

02 Sep '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=791f331d67e0546a68103… commit 791f331d67e0546a68103506dba9c75dd8088830 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Sep 2 11:58:30 2018 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Sep 2 11:59:19 2018 +0200 [IDL] Add the undocumented struct _SAMPR_USER_INTERNAL2_INFORMATION to sam.idl --- sdk/include/reactos/idl/sam.idl | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/sdk/include/reactos/idl/sam.idl b/sdk/include/reactos/idl/sam.idl index 7322379bf8..31cb7d3ce2 100644 --- a/sdk/include/reactos/idl/sam.idl +++ b/sdk/include/reactos/idl/sam.idl @@ -644,6 +644,15 @@ typedef struct _SAMPR_USER_INTERNAL1_INFORMATION BOOLEAN PasswordExpired; } SAMPR_USER_INTERNAL1_INFORMATION, *PSAMPR_USER_INTERNAL1_INFORMATION; +typedef struct _SAMPR_USER_INTERNAL2_INFORMATION +{ + unsigned long Flags; + OLD_LARGE_INTEGER LastLogon; + OLD_LARGE_INTEGER LastLogoff; + unsigned short BadPasswordCount; + unsigned short LogonCount; +} SAMPR_USER_INTERNAL2_INFORMATION, *PSAMPR_USER_INTERNAL2_INFORMATION; + typedef struct _SAMPR_USER_INTERNAL4_INFORMATION { SAMPR_USER_ALL_INFORMATION I1; @@ -723,6 +732,7 @@ typedef [switch_type(USER_INFORMATION_CLASS)] union _SAMPR_USER_INFO_BUFFER [case(UserControlInformation)] USER_CONTROL_INFORMATION Control; [case(UserExpiresInformation)] USER_EXPIRES_INFORMATION Expires; [case(UserInternal1Information)] SAMPR_USER_INTERNAL1_INFORMATION Internal1; + [case(UserInternal2Information)] SAMPR_USER_INTERNAL2_INFORMATION Internal2; [case(UserParametersInformation)] SAMPR_USER_PARAMETERS_INFORMATION Parameters; [case(UserAllInformation)] SAMPR_USER_ALL_INFORMATION All; [case(UserInternal4Information)] SAMPR_USER_INTERNAL4_INFORMATION Internal4;

1 0

01/01: [KMTESTS:CC] Add tests showing our CcMapData/CcPinRead raise invalid status
by Pierre Schweitzer 02 Sep '18

02 Sep '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=01c73317cc106f6cf5456… commit 01c73317cc106f6cf545687327c83273d4294f33 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sun Sep 2 11:48:16 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sun Sep 2 11:50:23 2018 +0200 [KMTESTS:CC] Add tests showing our CcMapData/CcPinRead raise invalid status --- modules/rostests/kmtests/ntos_cc/CcMapData_drv.c | 43 +++++++++++++++++++++++ modules/rostests/kmtests/ntos_cc/CcMapData_user.c | 3 +- modules/rostests/kmtests/ntos_cc/CcPinRead_drv.c | 43 +++++++++++++++++++++++ modules/rostests/kmtests/ntos_cc/CcPinRead_user.c | 3 +- 4 files changed, 90 insertions(+), 2 deletions(-) diff --git a/modules/rostests/kmtests/ntos_cc/CcMapData_drv.c b/modules/rostests/kmtests/ntos_cc/CcMapData_drv.c index 516d55fe22..3e86a3a55c 100644 --- a/modules/rostests/kmtests/ntos_cc/CcMapData_drv.c +++ b/modules/rostests/kmtests/ntos_cc/CcMapData_drv.c @@ -326,6 +326,49 @@ PerformTest( ExFreePool(TestContext); } } + else if (TestId == 4) + { + /* Map after EOF */ + Ret = FALSE; + Offset.QuadPart = FileSizes.FileSize.QuadPart + 0x1000; + + KmtStartSeh(); + Ret = CcMapData(TestFileObject, &Offset, 0x1000, 0, &Bcb, (PVOID *)&Buffer); + KmtEndSeh(STATUS_SUCCESS); + + if (!skip(Ret == TRUE, "CcMapData failed\n")) + { + CcUnpinData(Bcb); + } + + /* Map a VACB after EOF */ + Ret = FALSE; + Offset.QuadPart = FileSizes.FileSize.QuadPart + 0x1000 + VACB_MAPPING_GRANULARITY; + + KmtStartSeh(); + Ret = CcMapData(TestFileObject, &Offset, 0x1000, 0, &Bcb, (PVOID *)&Buffer); + KmtEndSeh(STATUS_ACCESS_VIOLATION); + ok(Ret == FALSE, "CcMapData succeed\n"); + + if (Ret) + { + CcUnpinData(Bcb); + } + + /* Map more than a VACB */ + Ret = FALSE; + Offset.QuadPart = 0x0; + + KmtStartSeh(); + Ret = CcMapData(TestFileObject, &Offset, 0x1000 + VACB_MAPPING_GRANULARITY, 0, &Bcb, (PVOID *)&Buffer); + KmtEndSeh(STATUS_SUCCESS); + ok(Ret == FALSE, "CcMapData succeed\n"); + + if (Ret) + { + CcUnpinData(Bcb); + } + } } } } diff --git a/modules/rostests/kmtests/ntos_cc/CcMapData_user.c b/modules/rostests/kmtests/ntos_cc/CcMapData_user.c index b1d2685f76..dee2a93d5e 100644 --- a/modules/rostests/kmtests/ntos_cc/CcMapData_user.c +++ b/modules/rostests/kmtests/ntos_cc/CcMapData_user.c @@ -20,8 +20,9 @@ START_TEST(CcMapData) /* 3 tests for offset * 1 test for BCB + * 1 test for length/offset */ - for (TestId = 0; TestId < 4; ++TestId) + for (TestId = 0; TestId < 5; ++TestId) { Ret = KmtSendUlongToDriver(IOCTL_START_TEST, TestId); ok(Ret == ERROR_SUCCESS, "KmtSendUlongToDriver failed: %lx\n", Ret); diff --git a/modules/rostests/kmtests/ntos_cc/CcPinRead_drv.c b/modules/rostests/kmtests/ntos_cc/CcPinRead_drv.c index 58f8808fcd..9c338fe785 100644 --- a/modules/rostests/kmtests/ntos_cc/CcPinRead_drv.c +++ b/modules/rostests/kmtests/ntos_cc/CcPinRead_drv.c @@ -477,6 +477,49 @@ PerformTest( CcUnpinData(Bcb); } } + else if (TestId == 5) + { + /* Pin after EOF */ + Ret = FALSE; + Offset.QuadPart = FileSizes.FileSize.QuadPart + 0x1000; + + KmtStartSeh(); + Ret = CcPinRead(TestFileObject, &Offset, 0x1000, 0, &Bcb, (PVOID *)&Buffer); + KmtEndSeh(STATUS_SUCCESS); + + if (!skip(Ret == TRUE, "CcPinRead failed\n")) + { + CcUnpinData(Bcb); + } + + /* Pin a VACB after EOF */ + Ret = FALSE; + Offset.QuadPart = FileSizes.FileSize.QuadPart + 0x1000 + VACB_MAPPING_GRANULARITY; + + KmtStartSeh(); + Ret = CcPinRead(TestFileObject, &Offset, 0x1000, 0, &Bcb, (PVOID *)&Buffer); + KmtEndSeh(STATUS_ACCESS_VIOLATION); + ok(Ret == FALSE, "CcPinRead succeed\n"); + + if (Ret) + { + CcUnpinData(Bcb); + } + + /* Pin more than a VACB */ + Ret = FALSE; + Offset.QuadPart = 0x0; + + KmtStartSeh(); + Ret = CcPinRead(TestFileObject, &Offset, 0x1000 + VACB_MAPPING_GRANULARITY, 0, &Bcb, (PVOID *)&Buffer); + KmtEndSeh(STATUS_SUCCESS); + ok(Ret == FALSE, "CcPinRead succeed\n"); + + if (Ret) + { + CcUnpinData(Bcb); + } + } } } } diff --git a/modules/rostests/kmtests/ntos_cc/CcPinRead_user.c b/modules/rostests/kmtests/ntos_cc/CcPinRead_user.c index 78818164e8..e8e78cbc44 100644 --- a/modules/rostests/kmtests/ntos_cc/CcPinRead_user.c +++ b/modules/rostests/kmtests/ntos_cc/CcPinRead_user.c @@ -21,8 +21,9 @@ START_TEST(CcPinRead) /* 3 tests for offset * 1 test for BCB * 1 test for pinning access + * 1 test for length/offset */ - for (TestId = 0; TestId < 5; ++TestId) + for (TestId = 0; TestId < 6; ++TestId) { Ret = KmtSendUlongToDriver(IOCTL_START_TEST, TestId); ok(Ret == ERROR_SUCCESS, "KmtSendUlongToDriver failed: %lx\n", Ret);

1 0

03/03: [WIN32K:NTUSER] co_UserDestroyWindow(): Simplify the destruction of the owned windows.
by Hermès Bélusca-Maïto 01 Sep '18

01 Sep '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4d48b88bfbfcb6845e874… commit 4d48b88bfbfcb6845e8742f78154156e984f6363 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sat Sep 1 23:45:11 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Sep 1 23:46:21 2018 +0200 [WIN32K:NTUSER] co_UserDestroyWindow(): Simplify the destruction of the owned windows. --- win32ss/user/ntuser/window.c | 81 +++++++++++++++++--------------------------- 1 file changed, 32 insertions(+), 49 deletions(-) diff --git a/win32ss/user/ntuser/window.c b/win32ss/user/ntuser/window.c index 4776b8e9d3..7d6ac87155 100644 --- a/win32ss/user/ntuser/window.c +++ b/win32ss/user/ntuser/window.c @@ -2740,58 +2740,41 @@ BOOLEAN co_UserDestroyWindow(PVOID Object) return TRUE; } - /* Recursively destroy owned windows */ - - if (! (Window->style & WS_CHILD)) - { - for (;;) - { - BOOL GotOne = FALSE; - HWND *Children; - HWND *ChildHandle; - PWND Child, Desktop; - - Desktop = IntIsDesktopWindow(Window) ? Window : - UserGetWindowObject(IntGetDesktopWindow()); - Children = IntWinListChildren(Desktop); + /* Recursively destroy owned windows */ + if (!(Window->style & WS_CHILD)) + { + HWND* List; + HWND* phWnd; + PWND pWnd; - if (Children) - { - for (ChildHandle = Children; *ChildHandle; ++ChildHandle) + List = IntWinListOwnedPopups(Window); + if (List) + { + for (phWnd = List; *phWnd; ++phWnd) { - Child = UserGetWindowObject(*ChildHandle); - if (Child == NULL) - continue; - if (Child->spwndOwner != Window) - { - continue; - } - - if (IntWndBelongsToThread(Child, PsGetCurrentThreadWin32Thread())) - { - USER_REFERENCE_ENTRY ChildRef; - UserRefObjectCo(Child, &ChildRef); // Temp HACK? - co_UserDestroyWindow(Child); - UserDerefObjectCo(Child); // Temp HACK? - - GotOne = TRUE; - continue; - } - - if (Child->spwndOwner != NULL) - { - Child->spwndOwner = NULL; - } - + pWnd = ValidateHwndNoErr(*phWnd); + if (pWnd == NULL) + continue; + ASSERT(pWnd->spwndOwner == Window); + ASSERT(pWnd != Window); + + pWnd->spwndOwner = NULL; + if (IntWndBelongsToThread(pWnd, PsGetCurrentThreadWin32Thread())) + { + USER_REFERENCE_ENTRY Ref; + UserRefObjectCo(pWnd, &Ref); // Temp HACK? + co_UserDestroyWindow(pWnd); + UserDerefObjectCo(pWnd); // Temp HACK? + } + else + { + ERR("IntWndBelongsToThread(0x%p) is FALSE, ignoring.\n", pWnd); + } } - ExFreePoolWithTag(Children, USERTAG_WINDOWLIST); - } - if (! GotOne) - { - break; - } - } - } + + ExFreePoolWithTag(List, USERTAG_WINDOWLIST); + } + } /* Generate mouse move message for the next window */ msg.message = WM_MOUSEMOVE;

1 0

02/03: [WIN32K:NTUSER] Optimize IntWinListOwnedPopups() a little bit. Improve a trace.
by Hermès Bélusca-Maïto 01 Sep '18

01 Sep '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e286c4c5202ac2d6e7909… commit e286c4c5202ac2d6e7909ee05cdc95f76b8f4897 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sat Sep 1 23:42:11 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Sep 1 23:46:20 2018 +0200 [WIN32K:NTUSER] Optimize IntWinListOwnedPopups() a little bit. Improve a trace. --- win32ss/user/ntuser/window.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/win32ss/user/ntuser/window.c b/win32ss/user/ntuser/window.c index 40a7459dd2..4776b8e9d3 100644 --- a/win32ss/user/ntuser/window.c +++ b/win32ss/user/ntuser/window.c @@ -288,16 +288,19 @@ IntWinListOwnedPopups(PWND Window) { PWND Child, Desktop; HWND *List; - UINT Index, NumChildren = 0; + UINT Index, NumOwned = 0; Desktop = co_GetDesktopWindow(Window); if (!Desktop) return NULL; for (Child = Desktop->spwndChild; Child; Child = Child->spwndNext) - ++NumChildren; + { + if (Child->spwndOwner == Window) + ++NumOwned; + } - List = ExAllocatePoolWithTag(PagedPool, (NumChildren + 1) * sizeof(HWND), USERTAG_WINDOWLIST); + List = ExAllocatePoolWithTag(PagedPool, (NumOwned + 1) * sizeof(HWND), USERTAG_WINDOWLIST); if (!List) { ERR("Failed to allocate memory for children array\n"); @@ -2626,7 +2629,7 @@ BOOLEAN co_UserDestroyWindow(PVOID Object) hWnd = Window->head.h; ti = PsGetCurrentThreadWin32Thread(); - TRACE("co_UserDestroyWindow \n"); + TRACE("co_UserDestroyWindow(Window = 0x%p, hWnd = 0x%p)\n", Window, hWnd); /* Check for owner thread */ if ( Window->head.pti != PsGetCurrentThreadWin32Thread())

1 0

01/03: [WIN32K:NTUSER] Code formatting only.
by Hermès Bélusca-Maïto 01 Sep '18

01 Sep '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f644a50cd77492dc06615… commit f644a50cd77492dc06615a632ca500a1687aa63b Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sat Sep 1 23:39:38 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Sep 1 23:46:17 2018 +0200 [WIN32K:NTUSER] Code formatting only. --- win32ss/user/ntuser/window.c | 44 ++++++++++++++++++++++++-------------------- 1 file changed, 24 insertions(+), 20 deletions(-) diff --git a/win32ss/user/ntuser/window.c b/win32ss/user/ntuser/window.c index 95ffa02fb7..40a7459dd2 100644 --- a/win32ss/user/ntuser/window.c +++ b/win32ss/user/ntuser/window.c @@ -254,29 +254,33 @@ IntEnableWindow( HWND hWnd, BOOL bEnable ) HWND* FASTCALL IntWinListChildren(PWND Window) { - PWND Child; - HWND *List; - UINT Index, NumChildren = 0; + PWND Child; + HWND *List; + UINT Index, NumChildren = 0; - if (!Window) return NULL; + if (!Window) return NULL; - for (Child = Window->spwndChild; Child; Child = Child->spwndNext) - ++NumChildren; + for (Child = Window->spwndChild; Child; Child = Child->spwndNext) + { + ++NumChildren; + } - List = ExAllocatePoolWithTag(PagedPool, (NumChildren + 1) * sizeof(HWND), USERTAG_WINDOWLIST); - if(!List) - { - ERR("Failed to allocate memory for children array\n"); - EngSetLastError(ERROR_NOT_ENOUGH_MEMORY); - return NULL; - } - for (Child = Window->spwndChild, Index = 0; - Child != NULL; - Child = Child->spwndNext, ++Index) - List[Index] = Child->head.h; - List[Index] = NULL; + List = ExAllocatePoolWithTag(PagedPool, (NumChildren + 1) * sizeof(HWND), USERTAG_WINDOWLIST); + if(!List) + { + ERR("Failed to allocate memory for children array\n"); + EngSetLastError(ERROR_NOT_ENOUGH_MEMORY); + return NULL; + } + + Index = 0; + for (Child = Window->spwndChild; Child; Child = Child->spwndNext) + { + List[Index++] = Child->head.h; + } + List[Index] = NULL; - return List; + return List; } HWND* FASTCALL @@ -2682,7 +2686,7 @@ BOOLEAN co_UserDestroyWindow(PVOID Object) } } - // Adjust last active. + /* Adjust last active */ if ((pwndTemp = Window->spwndOwner)) { while (pwndTemp->spwndOwner)

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