Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: [KERNEL32_WINETEST] Fix COMMCONFIG.wcProviderData values (#2410)
by Serge Gautherie 06 Mar '20

06 Mar '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=20f403966652c15911d96… commit 20f403966652c15911d9614bbf804113d6e9d10c Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Fri Mar 6 18:24:22 2020 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Mar 6 18:24:22 2020 +0100 [KERNEL32_WINETEST] Fix COMMCONFIG.wcProviderData values (#2410) Import test part of https://source.winehq.org/git/wine.git/commit/a59d6387b6734cf0acb187e9c178d… ROSTESTS-251 --- modules/rostests/winetests/kernel32/generated.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/rostests/winetests/kernel32/generated.c b/modules/rostests/winetests/kernel32/generated.c index 3a1007094b4..45b95922e11 100644 --- a/modules/rostests/winetests/kernel32/generated.c +++ b/modules/rostests/winetests/kernel32/generated.c @@ -546,8 +546,8 @@ static void test_pack_COMMCONFIG(void) TEST_FIELD_SIZE (COMMCONFIG, dwProviderSize, 4) TEST_FIELD_ALIGN (COMMCONFIG, dwProviderSize, 4) TEST_FIELD_OFFSET(COMMCONFIG, dwProviderSize, 44) - TEST_FIELD_SIZE (COMMCONFIG, wcProviderData, 4) - TEST_FIELD_ALIGN (COMMCONFIG, wcProviderData, 4) + TEST_FIELD_SIZE (COMMCONFIG, wcProviderData, 2) + TEST_FIELD_ALIGN (COMMCONFIG, wcProviderData, 2) TEST_FIELD_OFFSET(COMMCONFIG, wcProviderData, 48) } @@ -2403,8 +2403,8 @@ static void test_pack_COMMCONFIG(void) TEST_FIELD_SIZE (COMMCONFIG, dwProviderSize, 4) TEST_FIELD_ALIGN (COMMCONFIG, dwProviderSize, 4) TEST_FIELD_OFFSET(COMMCONFIG, dwProviderSize, 44) - TEST_FIELD_SIZE (COMMCONFIG, wcProviderData, 4) - TEST_FIELD_ALIGN (COMMCONFIG, wcProviderData, 4) + TEST_FIELD_SIZE (COMMCONFIG, wcProviderData, 2) + TEST_FIELD_ALIGN (COMMCONFIG, wcProviderData, 2) TEST_FIELD_OFFSET(COMMCONFIG, wcProviderData, 48) }

1 0

[reactos] 01/01: [SETUPAPI] Implement StopDevice()
by Hervé Poussineau 05 Mar '20

05 Mar '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=35cb8f13931bb41dc51b3… commit 35cb8f13931bb41dc51b38fb3370145f119fdb5d Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Wed Mar 4 23:43:30 2020 +0100 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Thu Mar 5 22:47:15 2020 +0100 [SETUPAPI] Implement StopDevice() --- dll/win32/setupapi/cfgmgr.c | 2 +- dll/win32/setupapi/devinst.c | 18 +++++++++++++++++- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/dll/win32/setupapi/cfgmgr.c b/dll/win32/setupapi/cfgmgr.c index d1a46745b8b..859b0e45b58 100644 --- a/dll/win32/setupapi/cfgmgr.c +++ b/dll/win32/setupapi/cfgmgr.c @@ -1796,7 +1796,7 @@ CM_Disable_DevNode_Ex( LPWSTR lpDevInst; CONFIGRET ret; - FIXME("CM_Disable_DevNode_Ex(%p %lx %p)\n", + TRACE("CM_Disable_DevNode_Ex(%p %lx %p)\n", dnDevInst, ulFlags, hMachine); if (!pSetupIsUserAdmin()) diff --git a/dll/win32/setupapi/devinst.c b/dll/win32/setupapi/devinst.c index 14a9a5faa10..de4080bcf20 100644 --- a/dll/win32/setupapi/devinst.c +++ b/dll/win32/setupapi/devinst.c @@ -5045,12 +5045,28 @@ ResetDevice( #endif } -static BOOL StopDevice( +static BOOL +StopDevice( IN HDEVINFO DeviceInfoSet, IN PSP_DEVINFO_DATA DeviceInfoData) { +#ifndef __WINESRC__ + struct DeviceInfoSet *set = (struct DeviceInfoSet *)DeviceInfoSet; + struct DeviceInfo *deviceInfo = (struct DeviceInfo *)DeviceInfoData->Reserved; + CONFIGRET cr; + + cr = CM_Disable_DevNode_Ex(deviceInfo->dnDevInst, 0, set->hMachine); + if (cr != CR_SUCCESS) + { + SetLastError(GetErrorCodeFromCrCode(cr)); + return FALSE; + } + + return TRUE; +#else FIXME("Stub: StopDevice(%p %p)\n", DeviceInfoSet, DeviceInfoData); return TRUE; +#endif } /***********************************************************************

1 0

[reactos] 01/01: [NTUSER] Fix ShellHook notifications when creating/activating windows (#2396)
by JoachimHenze 05 Mar '20

05 Mar '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=848d7ec63356d00ff965e… commit 848d7ec63356d00ff965ed71bb4385ba68771d39 Author: JoachimHenze <33393466+JoachimHenze(a)users.noreply.github.com> AuthorDate: Thu Mar 5 15:39:23 2020 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Mar 5 15:39:23 2020 +0100 [NTUSER] Fix ShellHook notifications when creating/activating windows (#2396) --- win32ss/user/ntuser/focus.c | 4 ++-- win32ss/user/ntuser/winpos.c | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/win32ss/user/ntuser/focus.c b/win32ss/user/ntuser/focus.c index cc9ac5f8f5e..3c5ee19ed87 100644 --- a/win32ss/user/ntuser/focus.c +++ b/win32ss/user/ntuser/focus.c @@ -52,7 +52,6 @@ VOID FASTCALL UpdateShellHook(PWND Window) { if ( Window->spwndParent == UserGetDesktopWindow() && - Window->spwndOwner == NULL && (!(Window->ExStyle & WS_EX_TOOLWINDOW) || (Window->ExStyle & WS_EX_APPWINDOW))) { @@ -511,7 +510,8 @@ co_IntSendActivateMessages(PWND WindowPrev, PWND Window, BOOL MouseActivate, BOO MAKEWPARAM(MouseActivate ? WA_CLICKACTIVE : WA_ACTIVE, (Window->style & WS_MINIMIZE) != 0), (LPARAM)(WindowPrev ? UserHMGetHandle(WindowPrev) : 0)); - UpdateShellHook(Window); + if (Window->style & WS_VISIBLE) + UpdateShellHook(Window); Window->state &= ~WNDS_NONCPAINT; diff --git a/win32ss/user/ntuser/winpos.c b/win32ss/user/ntuser/winpos.c index 6467c2cad86..b5927d183c2 100644 --- a/win32ss/user/ntuser/winpos.c +++ b/win32ss/user/ntuser/winpos.c @@ -1913,6 +1913,8 @@ co_WinPosSetWindowPos( (Window->ExStyle & WS_EX_APPWINDOW))) { co_IntShellHookNotify(HSHELL_WINDOWCREATED, (WPARAM)Window->head.h, 0); + if (!(WinPos.flags & SWP_NOACTIVATE)) + UpdateShellHook(Window); } }

1 0

[reactos] 01/01: [CPL][TIMEDATE] Romanian & Italian translation update (#2404)
by Hermès BÉLUSCA - MAÏTO 04 Mar '20

04 Mar '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d4699bc67f47c33e65f2b… commit d4699bc67f47c33e65f2b3e9c09e352a05068a2d Author: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> AuthorDate: Thu Mar 5 00:21:31 2020 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Mar 5 00:21:31 2020 +0100 [CPL][TIMEDATE] Romanian & Italian translation update (#2404) --- dll/cpl/timedate/lang/it-IT.rc | 4 ++-- dll/cpl/timedate/lang/ro-RO.rc | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dll/cpl/timedate/lang/it-IT.rc b/dll/cpl/timedate/lang/it-IT.rc index 7df5e6a2bcc..226e743dd70 100644 --- a/dll/cpl/timedate/lang/it-IT.rc +++ b/dll/cpl/timedate/lang/it-IT.rc @@ -54,6 +54,6 @@ BEGIN IDS_INETTIMENEXTSYNC "Prossima sincronizzazione: %s alle %s" IDS_INETTIMESYNCING "Sincronizzazione ora con %s" IDS_INETTIMEERROR "E' stato rilevato un errore mentre ReactOS si stava sincronizzando con %s" - IDS_INETTIMESUCFILL "Please type a NTP server name in order to synchronize the time" - IDS_INETTIMEWELCOME "Select a NTP server from the list or type a NTP server name to synchronize the computer's time" + IDS_INETTIMESUCFILL "Si prega di inserire un nome del server NTP per poter sincronizzare l'ora" + IDS_INETTIMEWELCOME "Seleziona un server NTP dalla lista oppure inserisci il nome del server NTP per sincronizzare l'ora del PC" END diff --git a/dll/cpl/timedate/lang/ro-RO.rc b/dll/cpl/timedate/lang/ro-RO.rc index 9589fb56d2b..e86f650fda8 100644 --- a/dll/cpl/timedate/lang/ro-RO.rc +++ b/dll/cpl/timedate/lang/ro-RO.rc @@ -56,6 +56,6 @@ BEGIN IDS_INETTIMENEXTSYNC "Următoarea sincronizare: %s la %s" IDS_INETTIMESYNCING "Așteptați sincronizarea cu %s" IDS_INETTIMEERROR "A survenit o eroare la sincronizarea cu %s" - IDS_INETTIMESUCFILL "Please type a NTP server name in order to synchronize the time" - IDS_INETTIMEWELCOME "Select a NTP server from the list or type a NTP server name to synchronize the computer's time" + IDS_INETTIMESUCFILL "Scrie numele serverului NTP pentru a sincroniza timpul" + IDS_INETTIMEWELCOME "Selectați un server NTP din lista de sus sau scrie numele serverului NTP pentru a sincroniza timpul calculatorului" END

1 0

[reactos] 01/01: [PSDK] Extend struct _SECPKG_DLL_FUNCTIONS, fix definitions.
by Andreas Maier 04 Mar '20

04 Mar '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=11fe17c3a1dfcdcbdff8f… commit 11fe17c3a1dfcdcbdff8fe872c7c91fc58546a86 Author: Andreas Maier <staubim(a)quantentunnel.de> AuthorDate: Tue Jan 7 19:06:37 2020 +0100 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Wed Mar 4 07:02:37 2020 +0100 [PSDK] Extend struct _SECPKG_DLL_FUNCTIONS, fix definitions. * Add missing enums to MSV1_0_PROTOCOL_MESSAGE_TYPE and SECPKG_EXTENDED_INFORMATION_CLASS * Add missing function entries to LSA_SECPKG_FUNCTION_TABLE and add needed definitions. * Fix params of PLSA_AP_CALL_PACKAGE * Fix SpInitializeFn (+ NTAPI) --- sdk/include/psdk/ntsecapi.h | 5 +++- sdk/include/psdk/ntsecpkg.h | 58 ++++++++++++++++++++++++++++++++++++++------- sdk/include/psdk/sspi.h | 13 ++++++++++ 3 files changed, 66 insertions(+), 10 deletions(-) diff --git a/sdk/include/psdk/ntsecapi.h b/sdk/include/psdk/ntsecapi.h index 52e9407dc06..c9f6073f4c8 100644 --- a/sdk/include/psdk/ntsecapi.h +++ b/sdk/include/psdk/ntsecapi.h @@ -226,7 +226,10 @@ typedef enum _MSV1_0_PROTOCOL_MESSAGE_TYPE { MsV1_0CacheLogon, MsV1_0SubAuth, MsV1_0DeriveCredential, - MsV1_0CacheLookup + MsV1_0CacheLookup, +#if (_WIN32_WINNT >= _WIN32_WINNT_WINXP) + MsV1_0SetProcessOption, +#endif } MSV1_0_PROTOCOL_MESSAGE_TYPE, *PMSV1_0_PROTOCOL_MESSAGE_TYPE; typedef enum _POLICY_LSA_SERVER_ROLE { PolicyServerRoleBackup = 2, diff --git a/sdk/include/psdk/ntsecpkg.h b/sdk/include/psdk/ntsecpkg.h index c10f26b7e38..213fab3c486 100644 --- a/sdk/include/psdk/ntsecpkg.h +++ b/sdk/include/psdk/ntsecpkg.h @@ -51,6 +51,8 @@ typedef enum _SECPKG_EXTENDED_INFORMATION_CLASS SecpkgGssInfo = 1, SecpkgContextThunks, SecpkgMutualAuthLevel, + SecpkgWowClientDll, + SecpkgExtraOids, SecpkgMaxInfo } SECPKG_EXTENDED_INFORMATION_CLASS; @@ -131,9 +133,9 @@ typedef struct _SECPKG_CLIENT_INFO { *PSECPKG_CLIENT_INFO; typedef struct _SECURITY_USER_DATA { - UNICODE_STRING UserName; - UNICODE_STRING LogonDomainName; - UNICODE_STRING LogonServer; + SECURITY_STRING UserName; + SECURITY_STRING LogonDomainName; + SECURITY_STRING LogonServer; PSID pSid; } SECURITY_USER_DATA, *PSECURITY_USER_DATA, SecurityUserData, *PSecurityUserData; @@ -152,6 +154,22 @@ typedef struct _SECPKG_MUTUAL_AUTH_LEVEL { ULONG MutualAuthLevel; } SECPKG_MUTUAL_AUTH_LEVEL, *PSECPKG_MUTUAL_AUTH_LEVEL; +typedef struct _SECPKG_WOW_CLIENT_DLL { + SECURITY_STRING WowClientDllPath; +} SECPKG_WOW_CLIENT_DLL, *PSECPKG_WOW_CLIENT_DLL; + +#define SECPKG_MAX_OID_LENGTH 32 +typedef struct _SECPKG_SERIALIZED_OID { + ULONG OidLength; + ULONG OidAttributes; + UCHAR OidValue[SECPKG_MAX_OID_LENGTH]; +} SECPKG_SERIALIZED_OID, *PSECPKG_SERIALIZED_OID; + +typedef struct _SECPKG_EXTRA_OIDS { + ULONG OidCount; + SECPKG_SERIALIZED_OID Oids[1]; +} SECPKG_EXTRA_OIDS, *PSECPKG_EXTRA_OIDS; + typedef struct _SECPKG_CALL_INFO { ULONG ProcessId; ULONG ThreadId; @@ -165,6 +183,8 @@ typedef struct _SECPKG_EXTENDED_INFORMATION { SECPKG_GSS_INFO GssInfo; SECPKG_CONTEXT_THUNKS ContextThunks; SECPKG_MUTUAL_AUTH_LEVEL MutualAuthLevel; + SECPKG_WOW_CLIENT_DLL WowClientDll; + SECPKG_EXTRA_OIDS ExtraOids; } Info; } SECPKG_EXTENDED_INFORMATION, *PSECPKG_EXTENDED_INFORMATION; @@ -235,8 +255,8 @@ typedef PVOID (NTAPI *PLSA_CREATE_SHARED_MEMORY)(ULONG, ULONG); typedef PVOID (NTAPI *PLSA_ALLOCATE_SHARED_MEMORY)(PVOID, ULONG); typedef VOID (NTAPI *PLSA_FREE_SHARED_MEMORY)(PVOID, PVOID); typedef BOOLEAN (NTAPI *PLSA_DELETE_SHARED_MEMORY)(PVOID); -typedef NTSTATUS (NTAPI *PLSA_OPEN_SAM_USER)(PUNICODE_STRING, SECPKG_NAME_TYPE, - PUNICODE_STRING, BOOLEAN, ULONG, PVOID*); +typedef NTSTATUS (NTAPI *PLSA_OPEN_SAM_USER)(PSECURITY_STRING, SECPKG_NAME_TYPE, + PSECURITY_STRING, BOOLEAN, ULONG, PVOID*); typedef NTSTATUS (NTAPI *PLSA_GET_USER_CREDENTIALS)(PVOID, PVOID *, PULONG, PVOID *, PULONG); typedef NTSTATUS (NTAPI *PLSA_GET_USER_AUTH_DATA)(PVOID, PUCHAR *, PULONG); @@ -247,8 +267,8 @@ typedef NTSTATUS (NTAPI *PLSA_CONVERT_AUTH_DATA_TO_TOKEN)(PVOID, ULONG, typedef NTSTATUS (NTAPI *PLSA_CLIENT_CALLBACK)(PCHAR, ULONG_PTR, ULONG_PTR, PSecBuffer, PSecBuffer); typedef NTSTATUS (NTAPI *PLSA_UPDATE_PRIMARY_CREDENTIALS)(PSECPKG_PRIMARY_CRED, PSECPKG_SUPPLEMENTAL_CRED_ARRAY); -typedef NTSTATUS (NTAPI *PLSA_GET_AUTH_DATA_FOR_USER)(PUNICODE_STRING, - SECPKG_NAME_TYPE, PUNICODE_STRING, PUCHAR *, PULONG, PUNICODE_STRING); +typedef NTSTATUS (NTAPI *PLSA_GET_AUTH_DATA_FOR_USER)(PSECURITY_STRING, + SECPKG_NAME_TYPE, PSECURITY_STRING, PUCHAR *, PULONG, PUNICODE_STRING); typedef NTSTATUS (NTAPI *PLSA_CRACK_SINGLE_NAME)(ULONG, BOOLEAN, PUNICODE_STRING, PUNICODE_STRING, ULONG, PUNICODE_STRING, PUNICODE_STRING, PULONG); @@ -256,6 +276,11 @@ typedef NTSTATUS (NTAPI *PLSA_AUDIT_ACCOUNT_LOGON)(ULONG, BOOLEAN, PUNICODE_STRING, PUNICODE_STRING, PUNICODE_STRING, NTSTATUS); typedef NTSTATUS (NTAPI *PLSA_CALL_PACKAGE_PASSTHROUGH)(PUNICODE_STRING, PVOID, PVOID, ULONG, PVOID*, PULONG, PNTSTATUS); +typedef VOID (NTAPI *PLSA_PROTECT_MEMORY)(PVOID, ULONG); +typedef NTSTATUS (NTAPI *PLSA_OPEN_TOKEN_BY_LOGON_ID)(PLUID, HANDLE *); +typedef NTSTATUS (NTAPI *PLSA_EXPAND_AUTH_DATA_FOR_DOMAIN)(PUCHAR, ULONG, PVOID, PUCHAR *, PULONG); +typedef PVOID (NTAPI *PLSA_ALLOCATE_PRIVATE_HEAP)(SIZE_T); +typedef VOID (NTAPI *PLSA_FREE_PRIVATE_HEAP)(PVOID); /* Dispatch tables of functions used by SSP/AP */ typedef struct _SECPKG_DLL_FUNCTIONS { @@ -322,6 +347,21 @@ typedef struct _LSA_SECPKG_FUNCTION_TABLE { PLSA_CRACK_SINGLE_NAME CrackSingleName; PLSA_AUDIT_ACCOUNT_LOGON AuditAccountLogon; PLSA_CALL_PACKAGE_PASSTHROUGH CallPackagePassthrough; +#ifdef _WINCRED_H_ + CredReadFn *CrediRead; + CredReadDomainCredentialsFn *CrediReadDomainCredentials; + CredFreeCredentialsFn *CrediFreeCredentials; +#else + PLSA_PROTECT_MEMORY DummyFunction1; + PLSA_PROTECT_MEMORY DummyFunction2; + PLSA_PROTECT_MEMORY DummyFunction3; +#endif + PLSA_PROTECT_MEMORY LsaProtectMemory; + PLSA_PROTECT_MEMORY LsaUnprotectMemory; + PLSA_OPEN_TOKEN_BY_LOGON_ID OpenTokenByLogonId; + PLSA_EXPAND_AUTH_DATA_FOR_DOMAIN ExpandAuthDataForDomain; + PLSA_ALLOCATE_PRIVATE_HEAP AllocatePrivateHeap; + PLSA_FREE_PRIVATE_HEAP FreePrivateHeap; } LSA_SECPKG_FUNCTION_TABLE, *PLSA_SECPKG_FUNCTION_TABLE; @@ -330,7 +370,7 @@ typedef NTSTATUS (NTAPI *PLSA_AP_INITIALIZE_PACKAGE)(ULONG, PLSA_DISPATCH_TABLE, PLSA_STRING, PLSA_STRING, PLSA_STRING *); typedef NTSTATUS (NTAPI *PLSA_AP_LOGON_USER)(LPWSTR, LPWSTR, LPWSTR, LPWSTR, DWORD, DWORD, PHANDLE); -typedef NTSTATUS (NTAPI *PLSA_AP_CALL_PACKAGE)(PUNICODE_STRING, PVOID, ULONG, +typedef NTSTATUS (NTAPI *PLSA_AP_CALL_PACKAGE)(PLSA_CLIENT_REQUEST, PVOID, PVOID, ULONG, PVOID *, PULONG, PNTSTATUS); typedef VOID (NTAPI *PLSA_AP_LOGON_TERMINATED)(PLUID); typedef NTSTATUS (NTAPI *PLSA_AP_CALL_PACKAGE_UNTRUSTED)(PLSA_CLIENT_REQUEST, @@ -345,7 +385,7 @@ typedef NTSTATUS (NTAPI *PLSA_AP_LOGON_USER_EX2)(PLSA_CLIENT_REQUEST, SECURITY_LOGON_TYPE, PVOID, PVOID, ULONG, PVOID *, PULONG, PLUID, PNTSTATUS, PLSA_TOKEN_INFORMATION_TYPE, PVOID *, PUNICODE_STRING *, PUNICODE_STRING *, PUNICODE_STRING *, PSECPKG_PRIMARY_CRED, PSECPKG_SUPPLEMENTAL_CRED_ARRAY *); -typedef NTSTATUS (SpInitializeFn)(ULONG_PTR, PSECPKG_PARAMETERS, +typedef NTSTATUS (NTAPI SpInitializeFn)(ULONG_PTR, PSECPKG_PARAMETERS, PLSA_SECPKG_FUNCTION_TABLE); typedef NTSTATUS (NTAPI SpShutDownFn)(void); typedef NTSTATUS (NTAPI SpGetInfoFn)(PSecPkgInfoW); diff --git a/sdk/include/psdk/sspi.h b/sdk/include/psdk/sspi.h index c436fd85724..648ea3e160c 100644 --- a/sdk/include/psdk/sspi.h +++ b/sdk/include/psdk/sspi.h @@ -77,6 +77,19 @@ typedef struct _SECURITY_INTEGER } SECURITY_INTEGER, *PSECURITY_INTEGER; typedef SECURITY_INTEGER TimeStamp, *PTimeStamp; +// UNICODE_STRING should have the same memory layout in 32 bit and 64 bit mode. +// In 32 bit mode SECURITY_STRING is simply a clone of UNICODE_STRING. +// It is used internal in kernel an security components. +#ifndef _NTDEF_ +typedef struct _SECURITY_STRING { + unsigned short Length; + unsigned short MaximumLength; + unsigned short *Buffer; +} SECURITY_STRING, *PSECURITY_STRING; +#else +typedef UNICODE_STRING SECURITY_STRING, *PSECURITY_STRING; +#endif + #define SSPIPFC_CREDPROV_DO_NOT_SAVE 0x00000001 #define SSPIPFC_NO_CHECKBOX 0x00000002

1 0

[reactos] 01/01: [WIN32SS] Improve Drawing Scrollbars
by Joachim Henze 04 Mar '20

04 Mar '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=00adb1a3f967ac7f5cd56… commit 00adb1a3f967ac7f5cd56b4c39df72a7b3814603 Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Wed Mar 4 02:12:06 2020 +0100 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Wed Mar 4 02:12:06 2020 +0100 [WIN32SS] Improve Drawing Scrollbars A very nice patch of JIRA user "I_kill_Bugs". Many many Thanks! It addresses: - CORE-14755 fixed, flashing scrollbar triangles (we know 131 affected apps just from rapps!) - CORE-13931 fixed, FamiTracker invisible about-dlg - CORE-14685 improves a bit, but is not entirely fixed - CORE-11561 improves a bit, but is not entirely fixed - The patch avoids unnecessary redraws, speeds up GUI interaction and NSIS install times Jim Tabor had no complains about it, I just did some white-space-tweaks on EOL and indentation. FTR A testbot run (not on master but on 0.4.13-RC-48-g818e5bc) https://reactos.org/testman/compare.php?ids=71645,71666 VBox LGTM https://reactos.org/testman/compare.php?ids=71646,71667 KVM LGTM I felt tempted to port back, but decided to play safe and commit to master just. --- win32ss/user/ntuser/scrollbar.c | 40 +++++++++++++++++++++++++++++++++------- 1 file changed, 33 insertions(+), 7 deletions(-) diff --git a/win32ss/user/ntuser/scrollbar.c b/win32ss/user/ntuser/scrollbar.c index 325be6fe491..6bbc7ae7bc6 100644 --- a/win32ss/user/ntuser/scrollbar.c +++ b/win32ss/user/ntuser/scrollbar.c @@ -61,6 +61,9 @@ DBG_DEFAULT_CHANNEL(UserScrollbar); BOOL APIENTRY IntEnableScrollBar(BOOL Horz, PSCROLLBARINFO Info, UINT wArrows); +static void +IntRefeshScrollInterior(PWND pWnd, INT nBar, PSCROLLBARINFO psbi); + /* Ported from WINE20020904 */ /* Compute the scroll bar rectangle, in drawing coordinates (i.e. client coords for SB_CTL, window coords for SB_VERT and @@ -636,13 +639,21 @@ co_IntSetScrollInfo(PWND Window, INT nBar, LPCSCROLLINFO lpsi, BOOL bRedraw) if ( co_UserShowScrollBar(Window, nBar, TRUE, TRUE) ) return lpsi->fMask & SIF_PREVIOUSPOS ? OldPos : pSBData->pos; /* SetWindowPos() already did the painting */ if (bRedraw) - { // FIXME: Arrows and interior. - RECTL UpdateRect = psbi->rcScrollBar; - UpdateRect.left -= Window->rcClient.left - Window->rcWindow.left; - UpdateRect.right -= Window->rcClient.left - Window->rcWindow.left; - UpdateRect.top -= Window->rcClient.top - Window->rcWindow.top; - UpdateRect.bottom -= Window->rcClient.top - Window->rcWindow.top; - co_UserRedrawWindow(Window, &UpdateRect, 0, RDW_INVALIDATE | RDW_FRAME); + { + if (action & SA_SSI_REPAINT_ARROWS) + { // Redraw the entire bar. + RECTL UpdateRect = psbi->rcScrollBar; + UpdateRect.left -= Window->rcClient.left - Window->rcWindow.left; + UpdateRect.right -= Window->rcClient.left - Window->rcWindow.left; + UpdateRect.top -= Window->rcClient.top - Window->rcWindow.top; + UpdateRect.bottom -= Window->rcClient.top - Window->rcWindow.top; + co_UserRedrawWindow(Window, &UpdateRect, 0, RDW_INVALIDATE | RDW_FRAME); + } + else + { + // Redraw only the interior part of the bar. + IntRefeshScrollInterior(Window, nBar, psbi); + } } // FIXME: Arrows /* else if( action & SA_SSI_REPAINT_ARROWS ) { @@ -1069,6 +1080,21 @@ IntScrollGetObjectId(INT SBType) return OBJID_CLIENT; } +static void +IntRefeshScrollInterior(PWND pWnd, INT nBar, PSCROLLBARINFO psbi) +{ + HDC hdc; + BOOL Vertical = ((nBar == SB_CTL) ? ((pWnd->style & SBS_VERT) != 0) : (nBar == SB_VERT)); + + hdc = UserGetDCEx(pWnd, NULL, DCX_CACHE | ((nBar == SB_CTL) ? 0 : DCX_WINDOW)); + if (hdc) + { /* Get updated info. */ + co_IntGetScrollBarInfo(pWnd, IntScrollGetObjectId(nBar), psbi); + IntDrawScrollInterior(pWnd, hdc, nBar, Vertical, psbi); + UserReleaseDC(pWnd, hdc, FALSE); + } +} + void IntDrawScrollBar(PWND Wnd, HDC DC, INT Bar) {

1 0

[reactos] 01/01: [NTOS:MM] Assert PFN lock ownership in MiInsertPageInFreeList.
by Thomas Faber 02 Mar '20

02 Mar '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6831468ccfdedb4eb8c7c… commit 6831468ccfdedb4eb8c7cc88ac2a01f35dbfc16b Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Wed Feb 12 21:09:49 2020 +0100 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Mon Mar 2 20:50:54 2020 +0100 [NTOS:MM] Assert PFN lock ownership in MiInsertPageInFreeList. AMD64 initialization previously only raised the IRQL. It now acquires the lock where needed, as i386 does. --- ntoskrnl/mm/ARM3/pfnlist.c | 2 +- ntoskrnl/mm/amd64/init.c | 19 +++++++------------ 2 files changed, 8 insertions(+), 13 deletions(-) diff --git a/ntoskrnl/mm/ARM3/pfnlist.c b/ntoskrnl/mm/ARM3/pfnlist.c index 0373fff2dea..f79a5013250 100644 --- a/ntoskrnl/mm/ARM3/pfnlist.c +++ b/ntoskrnl/mm/ARM3/pfnlist.c @@ -611,7 +611,7 @@ MiInsertPageInFreeList(IN PFN_NUMBER PageFrameIndex) PMMCOLOR_TABLES ColorTable; /* Make sure the page index is valid */ - ASSERT(KeGetCurrentIrql() >= DISPATCH_LEVEL); + MI_ASSERT_PFN_LOCK_HELD(); ASSERT((PageFrameIndex != 0) && (PageFrameIndex <= MmHighestPhysicalPage) && (PageFrameIndex >= MmLowestPhysicalPage)); diff --git a/ntoskrnl/mm/amd64/init.c b/ntoskrnl/mm/amd64/init.c index 6e3344bfe52..104d8b3b1eb 100644 --- a/ntoskrnl/mm/amd64/init.c +++ b/ntoskrnl/mm/amd64/init.c @@ -533,6 +533,7 @@ MiAddDescriptorToDatabase( TYPE_OF_MEMORY MemoryType) { PMMPFN Pfn; + KIRQL OldIrql; ASSERT(!MiIsMemoryTypeInvisible(MemoryType)); @@ -542,6 +543,9 @@ MiAddDescriptorToDatabase( /* Get the last pfn of this descriptor. Note we loop backwards */ Pfn = &MmPfnDatabase[BasePage + PageCount - 1]; + /* Lock the PFN Database */ + OldIrql = MiAcquirePfnLock(); + /* Loop all pages */ while (PageCount--) { @@ -552,6 +556,9 @@ MiAddDescriptorToDatabase( /* Go to the previous page */ Pfn--; } + + /* Release PFN database */ + MiReleasePfnLock(OldIrql); } else if (MemoryType == LoaderXIPRom) { @@ -668,8 +675,6 @@ NTAPI INIT_FUNCTION MiInitMachineDependent(IN PLOADER_PARAMETER_BLOCK LoaderBlock) { - KIRQL OldIrql; - ASSERT(MxPfnAllocation != 0); /* Set some hardcoded addresses */ @@ -693,9 +698,6 @@ MiInitMachineDependent(IN PLOADER_PARAMETER_BLOCK LoaderBlock) MiBuildSystemPteSpace(); - /* Need to be at DISPATCH_LEVEL for MiInsertPageInFreeList */ - KeRaiseIrql(DISPATCH_LEVEL, &OldIrql); - /* Map the PFN database pages */ MiBuildPfnDatabase(LoaderBlock); @@ -705,16 +707,9 @@ MiInitMachineDependent(IN PLOADER_PARAMETER_BLOCK LoaderBlock) /* PFNs are initialized now! */ MiPfnsInitialized = TRUE; - //KeLowerIrql(OldIrql); - - /* Need to be at DISPATCH_LEVEL for InitializePool */ - //KeRaiseIrql(DISPATCH_LEVEL, &OldIrql); - /* Initialize the nonpaged pool */ InitializePool(NonPagedPool, 0); - KeLowerIrql(OldIrql); - /* Initialize the balancer */ MmInitializeBalancer((ULONG)MmAvailablePages, 0);

1 0

[reactos] 02/02: [USBHUB] Partially implement USBH_ProcessHubStateChange. CORE-16704
by Thomas Faber 02 Mar '20

02 Mar '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=67b3b73d82a067066fd20… commit 67b3b73d82a067066fd2014af9a881580aa68c2b Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Sat Feb 22 10:32:11 2020 +0100 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Mon Mar 2 20:47:01 2020 +0100 [USBHUB] Partially implement USBH_ProcessHubStateChange. CORE-16704 --- drivers/usb/usbhub/usbhub.c | 93 ++++++++++++++++++++++++++++++++++++++++++--- drivers/usb/usbhub/usbhub.h | 4 +- 2 files changed, 89 insertions(+), 8 deletions(-) diff --git a/drivers/usb/usbhub/usbhub.c b/drivers/usb/usbhub/usbhub.c index 33d9259b905..d3e9aa34345 100644 --- a/drivers/usb/usbhub/usbhub.c +++ b/drivers/usb/usbhub/usbhub.c @@ -1358,6 +1358,57 @@ USBH_SyncGetStatus(IN PDEVICE_OBJECT DeviceObject, return NtStatus; } +NTSTATUS +NTAPI +USBH_SyncGetHubStatus(IN PUSBHUB_FDO_EXTENSION HubExtension, + IN PUSB_HUB_STATUS_AND_CHANGE HubStatus, + IN ULONG Length) +{ + BM_REQUEST_TYPE RequestType; + + DPRINT("USBH_SyncGetHubStatus\n"); + + RequestType.B = 0; + RequestType.Recipient = BMREQUEST_TO_DEVICE; + RequestType.Type = BMREQUEST_CLASS; + RequestType.Dir = BMREQUEST_DEVICE_TO_HOST; + + return USBH_Transact(HubExtension, + HubStatus, + Length, + BMREQUEST_DEVICE_TO_HOST, + URB_FUNCTION_CLASS_DEVICE, + RequestType, + USB_REQUEST_GET_STATUS, + 0, + 0); +} + +NTSTATUS +NTAPI +USBH_SyncClearHubStatus(IN PUSBHUB_FDO_EXTENSION HubExtension, + IN USHORT RequestValue) +{ + BM_REQUEST_TYPE RequestType; + + DPRINT("USBH_SyncClearHubStatus: RequestValue - %x\n", RequestValue); + + RequestType.B = 0; + RequestType.Recipient = BMREQUEST_TO_DEVICE; + RequestType.Type = BMREQUEST_CLASS; + RequestType.Dir = BMREQUEST_HOST_TO_DEVICE; + + return USBH_Transact(HubExtension, + NULL, + 0, + BMREQUEST_HOST_TO_DEVICE, + URB_FUNCTION_CLASS_DEVICE, + RequestType, + USB_REQUEST_CLEAR_FEATURE, + RequestValue, + 0); +} + NTSTATUS NTAPI USBH_SyncGetPortStatus(IN PUSBHUB_FDO_EXTENSION HubExtension, @@ -1785,6 +1836,35 @@ USBH_ChangeIndicationQueryChange(IN PUSBHUB_FDO_EXTENSION HubExtension, return Status; } +VOID +NTAPI +USBH_ProcessHubStateChange(IN PUSBHUB_FDO_EXTENSION HubExtension, + IN PUSB_HUB_STATUS_AND_CHANGE HubStatus) +{ + USB_HUB_CHANGE HubStatusChange; + + DPRINT_SCE("USBH_ProcessHubStateChange: HubStatus - %lx\n", HubStatus->AsUlong32); + + HubStatusChange = HubStatus->HubChange; + + if (HubStatusChange.LocalPowerChange) + { + DPRINT1("USBH_ProcessHubStateChange: LocalPowerChange\n"); + USBH_SyncClearHubStatus(HubExtension, + USBHUB_FEATURE_C_HUB_LOCAL_POWER); + } + else if (HubStatusChange.OverCurrentChange) + { + USBH_SyncClearHubStatus(HubExtension, + USBHUB_FEATURE_C_HUB_OVER_CURRENT); + if (HubStatus->HubStatus.OverCurrent) + { + DPRINT1("USBH_ProcessHubStateChange: OverCurrent UNIMPLEMENTED. FIXME\n"); + DbgBreakPoint(); + } + } +} + VOID NTAPI USBH_ProcessPortStateChange(IN PUSBHUB_FDO_EXTENSION HubExtension, @@ -2070,6 +2150,7 @@ USBH_ChangeIndicationWorker(IN PUSBHUB_FDO_EXTENSION HubExtension, PUSBHUB_PORT_PDO_EXTENSION LowerPortExtension; PUSBHUB_STATUS_CHANGE_CONTEXT WorkItem; USB_PORT_STATUS_AND_CHANGE PortStatus; + USB_HUB_STATUS_AND_CHANGE HubStatus; NTSTATUS Status; USHORT Port = 0; @@ -2169,13 +2250,13 @@ Enum: Status = USBH_SyncGetPortStatus(HubExtension, Port, &PortStatus, - sizeof(USB_PORT_STATUS_AND_CHANGE)); + sizeof(PortStatus)); } else { - DPRINT1("USBH_ChangeIndicationWorker: USBH_SyncGetHubStatus() UNIMPLEMENTED. FIXME\n"); - DbgBreakPoint(); - Status = STATUS_ASSERTION_FAILURE; + Status = USBH_SyncGetHubStatus(HubExtension, + &HubStatus, + sizeof(HubStatus)); } if (NT_SUCCESS(Status)) @@ -2188,8 +2269,8 @@ Enum: } else { - DPRINT1("USBH_ChangeIndicationWorker: USBH_ProcessHubStateChange() UNIMPLEMENTED. FIXME\n"); - DbgBreakPoint(); + USBH_ProcessHubStateChange(HubExtension, + &HubStatus); } } else diff --git a/drivers/usb/usbhub/usbhub.h b/drivers/usb/usbhub/usbhub.h index d0f25537f57..5aada11883d 100644 --- a/drivers/usb/usbhub/usbhub.h +++ b/drivers/usb/usbhub/usbhub.h @@ -85,8 +85,8 @@ #define USBHUB_ENUM_FLAG_GHOST_DEVICE 0x02 /* Hub Class Feature Selectors */ -#define USBHUB_FEATURE_USBHUB_FEATURE_C_HUB_LOCAL_POWER 0 -#define USBHUB_FEATURE_C_HUB_OVER_CURRENT 1 +#define USBHUB_FEATURE_C_HUB_LOCAL_POWER 0 +#define USBHUB_FEATURE_C_HUB_OVER_CURRENT 1 #define USBHUB_FEATURE_PORT_CONNECTION 0 #define USBHUB_FEATURE_PORT_ENABLE 1

1 0

[reactos] 01/02: [USBHUB] Fix recipient in USBH_SyncClearPortStatus. CORE-16704
by Thomas Faber 02 Mar '20

02 Mar '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=76a075867ee3b736788b3… commit 76a075867ee3b736788b300ac8e6a7d7ede67f05 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Sat Feb 22 10:31:40 2020 +0100 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Mon Mar 2 20:46:56 2020 +0100 [USBHUB] Fix recipient in USBH_SyncClearPortStatus. CORE-16704 --- drivers/usb/usbhub/usbhub.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/usb/usbhub/usbhub.c b/drivers/usb/usbhub/usbhub.c index b14529d201c..33d9259b905 100644 --- a/drivers/usb/usbhub/usbhub.c +++ b/drivers/usb/usbhub/usbhub.c @@ -25,7 +25,7 @@ USBH_Wait(IN ULONG Milliseconds) LARGE_INTEGER Interval; DPRINT("USBH_Wait: Milliseconds - %x\n", Milliseconds); - Interval.QuadPart = -10000LL * Milliseconds - ((ULONGLONG)KeQueryTimeIncrement() - 1); + Interval.QuadPart = -10000LL * Milliseconds - ((ULONGLONG)KeQueryTimeIncrement() - 1); return KeDelayExecutionThread(KernelMode, FALSE, &Interval); } @@ -1399,7 +1399,7 @@ USBH_SyncClearPortStatus(IN PUSBHUB_FDO_EXTENSION HubExtension, RequestValue); RequestType.B = 0; - RequestType.Recipient = BMREQUEST_TO_DEVICE; + RequestType.Recipient = BMREQUEST_TO_OTHER; RequestType.Type = BMREQUEST_CLASS; RequestType.Dir = BMREQUEST_HOST_TO_DEVICE; @@ -3122,7 +3122,7 @@ USBH_HubCompletePortIdleIrps(IN PUSBHUB_FDO_EXTENSION HubExtension, VOID NTAPI -USBH_HubCancelIdleIrp(IN PUSBHUB_FDO_EXTENSION HubExtension, +USBH_HubCancelIdleIrp(IN PUSBHUB_FDO_EXTENSION HubExtension, IN PIRP IdleIrp) { DPRINT("USBH_HubCancelIdleIrp ... \n"); @@ -3218,7 +3218,7 @@ Wait: VOID NTAPI -USBH_FdoWaitWakeIrpCompletion(IN PDEVICE_OBJECT DeviceObject, +USBH_FdoWaitWakeIrpCompletion(IN PDEVICE_OBJECT DeviceObject, IN UCHAR MinorFunction, IN POWER_STATE PowerState, IN PVOID Context, @@ -3683,7 +3683,7 @@ USBH_FdoSubmitIdleRequestIrp(IN PUSBHUB_FDO_EXTENSION HubExtension) KeSetEvent(&HubExtension->IdleEvent, EVENT_INCREMENT, FALSE); return Status; } - + IoStack = IoGetNextIrpStackLocation(Irp); IoStack->MajorFunction = IRP_MJ_INTERNAL_DEVICE_CONTROL;

1 0

[reactos] 06/06: [CONSRV] Fix a corruption of the CONSRV memory when converting read input events back to ANSI.
by Hermès Bélusca-Maïto 02 Mar '20

02 Mar '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e8df1a38bd09e0416a1de… commit e8df1a38bd09e0416a1de7006615abfd1c845c9c Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Mon Mar 2 00:56:33 2020 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Mar 2 01:08:41 2020 +0100 [CONSRV] Fix a corruption of the CONSRV memory when converting read input events back to ANSI. This fixes a 6-year old copy-paste bug introduced by commit b47d51c6 (r64004). --- win32ss/user/winsrv/consrv/coninput.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/win32ss/user/winsrv/consrv/coninput.c b/win32ss/user/winsrv/consrv/coninput.c index 8c2e0e82adb..b4b3061e1a3 100644 --- a/win32ss/user/winsrv/consrv/coninput.c +++ b/win32ss/user/winsrv/consrv/coninput.c @@ -564,9 +564,10 @@ ReadInputBuffer(IN PGET_INPUT_INFO InputInfo, /* Now translate everything to ANSI */ if (!GetInputRequest->Unicode) { - for (; NumEventsRead > 0; --NumEventsRead) + ULONG i; + for (i = 0; i < NumEventsRead; ++i) { - ConioInputEventToAnsi(InputBuffer->Header.Console, --InputRecord); + ConioInputEventToAnsi(InputBuffer->Header.Console, &InputRecord[i]); } } }

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