Ros-diffs November 2018

ros-diffs@reactos.org

29 participants
250 discussions

02/03: [WINLOGON] Restore saved connections on session opening

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4cf87fdb2c3df5eb21a7e… commit 4cf87fdb2c3df5eb21a7eb86f943386c008da52c Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sat Nov 17 21:58:04 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sat Nov 17 22:13:34 2018 +0100 [WINLOGON] Restore saved connections on session opening This avoids using a nasty hack in MPR. CORE-15310 --- base/system/winlogon/sas.c | 67 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 67 insertions(+) diff --git a/base/system/winlogon/sas.c b/base/system/winlogon/sas.c index d914bebefc..c510a1111e 100644 --- a/base/system/winlogon/sas.c +++ b/base/system/winlogon/sas.c @@ -508,6 +508,70 @@ Cleanup: return bSuccess; } +static +VOID +RestoreAllConnections(PWLSESSION Session) +{ + DWORD dRet; + HANDLE hEnum; + LPNETRESOURCE lpRes; + DWORD dSize = 0x1000; + DWORD dCount = -1; + LPNETRESOURCE lpCur; + BOOL UserProfile; + + UserProfile = (Session && Session->UserToken); + if (!UserProfile) + { + return; + } + + if (!ImpersonateLoggedOnUser(Session->UserToken)) + { + ERR("WL: ImpersonateLoggedOnUser() failed with error %lu\n", GetLastError()); + return; + } + + dRet = WNetOpenEnum(RESOURCE_REMEMBERED, RESOURCETYPE_DISK, 0, NULL, &hEnum); + if (dRet != WN_SUCCESS) + { + ERR("Failed to open enumeration: %lu\n", dRet); + goto quit; + } + + lpRes = HeapAlloc(GetProcessHeap(), 0, dSize); + if (!lpRes) + { + ERR("Failed to allocate memory\n"); + WNetCloseEnum(hEnum); + goto quit; + } + + do + { + dSize = 0x1000; + dCount = -1; + + memset(lpRes, 0, dSize); + dRet = WNetEnumResource(hEnum, &dCount, lpRes, &dSize); + if (dRet == WN_SUCCESS || dRet == WN_MORE_DATA) + { + lpCur = lpRes; + for (; dCount; dCount--) + { + WNetAddConnection(lpCur->lpRemoteName, NULL, lpCur->lpLocalName); + lpCur++; + } + } + } while (dRet != WN_NO_MORE_ENTRIES); + + HeapFree(GetProcessHeap(), 0, lpRes); + WNetCloseEnum(hEnum); + +quit: + RevertToSelf(); +} + static BOOL HandleLogon( @@ -570,6 +634,9 @@ HandleLogon( AllowWinstaAccess(Session); + /* Connect remote resources */ + RestoreAllConnections(Session); + if (!StartUserShell(Session)) { //WCHAR StatusMsg[256];

5 years, 10 months

01/03: [MPR] Implement remembered connection enumeration

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8b0a1264450b33807b412… commit 8b0a1264450b33807b41249a939c6fd5b94bd1da Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sat Nov 17 21:55:57 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sat Nov 17 22:13:25 2018 +0100 [MPR] Implement remembered connection enumeration Submitted upstream CORE-15310 --- dll/win32/mpr/wnet.c | 249 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 249 insertions(+) diff --git a/dll/win32/mpr/wnet.c b/dll/win32/mpr/wnet.c index 162b41f4b9..14192c8245 100644 --- a/dll/win32/mpr/wnet.c +++ b/dll/win32/mpr/wnet.c @@ -73,12 +73,21 @@ typedef struct _WNetProviderTable WNetProvider table[1]; } WNetProviderTable, *PWNetProviderTable; +#ifndef __REACTOS__ #define WNET_ENUMERATOR_TYPE_NULL 0 #define WNET_ENUMERATOR_TYPE_GLOBAL 1 #define WNET_ENUMERATOR_TYPE_PROVIDER 2 #define WNET_ENUMERATOR_TYPE_CONTEXT 3 #define WNET_ENUMERATOR_TYPE_CONNECTED 4 +#else +#define WNET_ENUMERATOR_TYPE_GLOBAL 0 +#define WNET_ENUMERATOR_TYPE_PROVIDER 1 +#define WNET_ENUMERATOR_TYPE_CONTEXT 2 +#define WNET_ENUMERATOR_TYPE_CONNECTED 3 +#define WNET_ENUMERATOR_TYPE_REMEMBERED 4 +#endif +#ifndef __REACTOS__ /* An WNet enumerator. Note that the type doesn't correspond to the scope of * the enumeration; it represents one of the following types: * - a 'null' enumeration, one that contains no members @@ -93,6 +102,23 @@ typedef struct _WNetProviderTable * into a global enumeration (so the enumeration continues across all * providers). */ +#else +/* An WNet enumerator. Note that the type doesn't correspond to the scope of + * the enumeration; it represents one of the following types: + * - a global enumeration, one that's executed across all providers + * - a provider-specific enumeration, one that's only executed by a single + * provider + * - a context enumeration. I know this contradicts what I just said about + * there being no correspondence between the scope and the type, but it's + * necessary for the special case that a "Entire Network" entry needs to + * be enumerated in an enumeration of the context scope. Thus an enumeration + * of the context scope results in a context type enumerator, which morphs + * into a global enumeration (so the enumeration continues across all + * providers). + * - a remembered enumeration, not related to providers themselves, but it + * is a registry enumeration for saved connections + */ +#endif typedef struct _WNetEnumerator { DWORD enumType; @@ -106,6 +132,13 @@ typedef struct _WNetEnumerator { NETRESOURCEW* net; HANDLE* handles; +#ifdef __REACTOS__ + struct + { + HKEY registry; + DWORD index; + } remembered; +#endif } specific; } WNetEnumerator, *PWNetEnumerator; @@ -553,6 +586,7 @@ static void _freeEnumNetResource(LPNETRESOURCEW lpNet) } } +#ifndef __REACTOS__ static PWNetEnumerator _createNullEnumerator(void) { PWNetEnumerator ret = HeapAlloc(GetProcessHeap(), @@ -562,6 +596,7 @@ static PWNetEnumerator _createNullEnumerator(void) ret->enumType = WNET_ENUMERATOR_TYPE_NULL; return ret; } +#endif static PWNetEnumerator _createGlobalEnumeratorW(DWORD dwScope, DWORD dwType, DWORD dwUsage, LPNETRESOURCEW lpNet) @@ -639,6 +674,22 @@ static PWNetEnumerator _createConnectedEnumerator(DWORD dwScope, DWORD dwType, return ret; } +#ifdef __REACTOS__ +static PWNetEnumerator _createRememberedEnumerator(DWORD dwScope, DWORD dwType, + HKEY remembered) +{ + PWNetEnumerator ret = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(WNetEnumerator)); + if (ret) + { + ret->enumType = WNET_ENUMERATOR_TYPE_REMEMBERED; + ret->dwScope = dwScope; + ret->dwType = dwType; + ret->specific.remembered.registry = remembered; + } + return ret; +} +#endif + /* Thunks the array of wide-string LPNETRESOURCEs lpNetArrayIn into buffer * lpBuffer, with size *lpBufferSize. lpNetArrayIn contains *lpcCount entries * to start. On return, *lpcCount reflects the number thunked into lpBuffer. @@ -1004,8 +1055,28 @@ DWORD WINAPI WNetOpenEnumW( DWORD dwScope, DWORD dwType, DWORD dwUsage, ret = *lphEnum ? WN_SUCCESS : WN_OUT_OF_MEMORY; break; case RESOURCE_REMEMBERED: +#ifndef __REACTOS__ *lphEnum = _createNullEnumerator(); ret = *lphEnum ? WN_SUCCESS : WN_OUT_OF_MEMORY; +#else + { + HKEY remembered, user_profile; + + ret = WN_OUT_OF_MEMORY; + if (RegOpenCurrentUser(KEY_READ, &user_profile) == ERROR_SUCCESS) + { + WCHAR subkey[8] = {'N', 'e', 't', 'w', 'o', 'r', 'k', 0}; + + if (RegOpenKeyExW(user_profile, subkey, 0, KEY_READ, &remembered) == ERROR_SUCCESS) + { + *lphEnum = _createRememberedEnumerator(dwScope, dwType, remembered); + ret = *lphEnum ? WN_SUCCESS : WN_OUT_OF_MEMORY; + } + + RegCloseKey(user_profile); + } + } +#endif break; default: WARN("unknown scope 0x%08x\n", dwScope); @@ -1512,6 +1583,168 @@ static DWORD _enumerateConnectedW(PWNetEnumerator enumerator, DWORD* user_count, return ret; } +#ifdef __REACTOS__ +static const WCHAR connectionType[] = { 'C','o','n','n','e','c','t', + 'i','o','n','T','y','p','e',0 }; +static const WCHAR providerName[] = { 'P','r','o','v','i','d','e','r', + 'N','a','m','e',0 }; +static const WCHAR remotePath[] = { 'R','e','m','o','t','e','P', + 'a','t','h',0 }; + +static DWORD _enumeratorRememberedW(PWNetEnumerator enumerator, DWORD* user_count, + void* user_buffer, DWORD* user_size) +{ + HKEY registry, connection; + WCHAR buffer[255]; + DWORD index, ret, type, len, size, provider_size, remote_size, full_size, total_count, size_left = *user_size; + NETRESOURCEW * net_buffer = user_buffer; + WCHAR * str; + + if (!enumerator) + return WN_BAD_POINTER; + if (enumerator->enumType != WNET_ENUMERATOR_TYPE_REMEMBERED) + return WN_BAD_VALUE; + if (!user_count || !user_buffer || !user_size) + return WN_BAD_POINTER; + if (!providerTable) + return WN_NO_NETWORK; + + /* We will do the work in a single loop, so here is some things: + * we write netresource at the begin of the user buffer + * we write strings at the end of the user buffer + */ + total_count = 0; + type = enumerator->dwType; + registry = enumerator->specific.remembered.registry; + str = (WCHAR *)((ULONG_PTR)user_buffer + *user_size - sizeof(WCHAR)); + for (index = enumerator->specific.remembered.index; ; ++index) + { + enumerator->specific.remembered.index = index; + + if (*user_count != -1 && total_count == *user_count) + { + ret = WN_SUCCESS; + break; + } + + if (size_left < sizeof(NETRESOURCEW)) + { + ret = WN_MORE_DATA; + break; + } + + len = ARRAY_SIZE(buffer); + ret = RegEnumKeyExW(registry, index, buffer, &len, NULL, NULL, NULL, NULL); + if (ret != ERROR_SUCCESS) + { + /* We're done, that's a success! */ + if (ret == ERROR_NO_MORE_ITEMS) + { + ret = WN_SUCCESS; + break; + } + + continue; + } + + if (RegOpenKeyExW(registry, buffer, 0, KEY_READ, &connection) != ERROR_SUCCESS) + { + continue; + } + + size = sizeof(DWORD); + RegQueryValueExW(connection, connectionType, NULL, NULL, (BYTE *)&net_buffer->dwType, &size); + if (type != RESOURCETYPE_ANY && net_buffer->dwType != type) + { + RegCloseKey(connection); + continue; + } + + net_buffer->dwScope = RESOURCE_REMEMBERED; + net_buffer->dwDisplayType = RESOURCEDISPLAYTYPE_GENERIC; + net_buffer->dwUsage = RESOURCEUSAGE_CONNECTABLE; + + size_left -= sizeof(NETRESOURCEW); + + /* Compute the whole size */ + full_size = 0; + if (RegQueryValueExW(connection, providerName, NULL, NULL, NULL, &provider_size) != ERROR_SUCCESS) + { + RegCloseKey(connection); + continue; + } + full_size += provider_size; + + if (RegQueryValueExW(connection, remotePath, NULL, NULL, NULL, &remote_size) != ERROR_SUCCESS) + { + RegCloseKey(connection); + continue; + } + full_size += remote_size; + + /* FIXME: this only supports drive letters */ + full_size += 3 * sizeof(WCHAR); + if (full_size > size_left) + { + RegCloseKey(connection); + ret = WN_MORE_DATA; + break; + } + + str -= 3; + str[0] = buffer[0]; + str[1] = L':'; + str[2] = 0; + net_buffer->lpLocalName = str; + size_left -= 3 * sizeof(WCHAR); + + size = provider_size; + str -= (provider_size / sizeof(WCHAR)); + ret = RegQueryValueExW(connection, providerName, NULL, NULL, (BYTE *)str, &size); + if (ret == ERROR_MORE_DATA) + { + RegCloseKey(connection); + ret = WN_MORE_DATA; + break; + } + net_buffer->lpProvider = str; + size_left -= size; + + size = remote_size; + str -= (remote_size / sizeof(WCHAR)); + ret = RegQueryValueExW(connection, remotePath, NULL, NULL, (BYTE *)str, &size); + if (ret == ERROR_MORE_DATA) + { + RegCloseKey(connection); + ret = WN_MORE_DATA; + break; + } + net_buffer->lpRemoteName = str; + size_left -= size; + + RegCloseKey(connection); + + net_buffer->lpComment = NULL; + + ++total_count; + ++net_buffer; + } + + if (total_count == 0) + ret = WN_NO_MORE_ENTRIES; + + *user_count = total_count; + + if (ret != WN_MORE_DATA && ret != WN_NO_MORE_ENTRIES) + ret = WN_SUCCESS; + + if (ret == WN_MORE_DATA) + *user_size = *user_size + full_size; + + return ret; +} +#endif + /********************************************************************* * WNetEnumResourceW [MPR.@] */ @@ -1541,9 +1774,11 @@ DWORD WINAPI WNetEnumResourceW( HANDLE hEnum, LPDWORD lpcCount, switch (enumerator->enumType) { +#ifndef __REACTOS__ case WNET_ENUMERATOR_TYPE_NULL: ret = WN_NO_MORE_ENTRIES; break; +#endif case WNET_ENUMERATOR_TYPE_GLOBAL: ret = _enumerateGlobalW(enumerator, lpcCount, lpBuffer, lpBufferSize); @@ -1560,6 +1795,12 @@ DWORD WINAPI WNetEnumResourceW( HANDLE hEnum, LPDWORD lpcCount, ret = _enumerateConnectedW(enumerator, lpcCount, lpBuffer, lpBufferSize); break; +#ifdef __REACTOS__ + case WNET_ENUMERATOR_TYPE_REMEMBERED: + ret = _enumeratorRememberedW(enumerator, lpcCount, lpBuffer, + lpBufferSize); + break; +#endif default: WARN("bogus enumerator type!\n"); ret = WN_NO_NETWORK; @@ -1587,9 +1828,11 @@ DWORD WINAPI WNetCloseEnum( HANDLE hEnum ) switch (enumerator->enumType) { +#ifndef __REACTOS__ case WNET_ENUMERATOR_TYPE_NULL: ret = WN_SUCCESS; break; +#endif case WNET_ENUMERATOR_TYPE_GLOBAL: if (enumerator->specific.net) _freeEnumNetResource(enumerator->specific.net); @@ -1614,6 +1857,12 @@ DWORD WINAPI WNetCloseEnum( HANDLE hEnum ) HeapFree(GetProcessHeap(), 0, handles); ret = WN_SUCCESS; break; +#ifdef __REACTOS__ + case WNET_ENUMERATOR_TYPE_REMEMBERED: + RegCloseKey(enumerator->specific.remembered.registry); + ret = WN_SUCCESS; + break; +#endif default: WARN("bogus enumerator type!\n"); ret = WN_BAD_HANDLE;

5 years, 10 months

01/01: [OSK] Implement the welcome box (#1007)

by Bișoc George

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=34c812365f81686c99f0c… commit 34c812365f81686c99f0c2ad2602da712617183e Author: Bișoc George <fraizeraust99(a)gmail.com> AuthorDate: Sat Nov 17 21:27:33 2018 +0100 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Nov 17 21:27:33 2018 +0100 [OSK] Implement the welcome box (#1007) In Windows XP, both in On-Screen Keyboard and in Magnify there is a welcome box which is shown upon startup of the application. This feature is already implemented for Magnify in ReactOS which however in On-Screen Keyboard is still unimplemented. --- base/applications/osk/CMakeLists.txt | 2 +- base/applications/osk/lang/ar-DZ.rc | 12 ++++ base/applications/osk/lang/cs-CZ.rc | 12 ++++ base/applications/osk/lang/de-DE.rc | 12 ++++ base/applications/osk/lang/en-GB.rc | 12 ++++ base/applications/osk/lang/en-US.rc | 12 ++++ base/applications/osk/lang/es-ES.rc | 12 ++++ base/applications/osk/lang/fr-CA.rc | 12 ++++ base/applications/osk/lang/fr-FR.rc | 12 ++++ base/applications/osk/lang/he-IL.rc | 12 ++++ base/applications/osk/lang/it-IT.rc | 12 ++++ base/applications/osk/lang/pl-PL.rc | 12 ++++ base/applications/osk/lang/ro-RO.rc | 12 ++++ base/applications/osk/lang/ru-RU.rc | 12 ++++ base/applications/osk/lang/tr-TR.rc | 12 ++++ base/applications/osk/lang/zh-CN.rc | 12 ++++ base/applications/osk/lang/zh-TW.rc | 12 ++++ base/applications/osk/main.c | 54 ++++++++++++++++++ base/applications/osk/main.h | 1 + base/applications/osk/osk_res.h | 3 + base/applications/osk/settings.c | 104 +++++++++++++++++++++++++++++++++++ base/applications/osk/settings.h | 15 +++++ 22 files changed, 370 insertions(+), 1 deletion(-) diff --git a/base/applications/osk/CMakeLists.txt b/base/applications/osk/CMakeLists.txt index a6451ea227..51ff4f3a42 100644 --- a/base/applications/osk/CMakeLists.txt +++ b/base/applications/osk/CMakeLists.txt @@ -1,7 +1,7 @@ file(GLOB osk_rc_deps res/*.*) add_rc_deps(rsrc.rc ${osk_rc_deps}) -add_executable(osk main.c rsrc.rc) +add_executable(osk main.c settings.c rsrc.rc) set_module_type(osk win32gui UNICODE) add_importlibs(osk comdlg32 shell32 user32 gdi32 advapi32 comctl32 msvcrt kernel32) add_cd_file(TARGET osk DESTINATION reactos/system32 FOR all) diff --git a/base/applications/osk/lang/ar-DZ.rc b/base/applications/osk/lang/ar-DZ.rc index fa99defaaa..3fc9a277c2 100644 --- a/base/applications/osk/lang/ar-DZ.rc +++ b/base/applications/osk/lang/ar-DZ.rc @@ -125,4 +125,16 @@ BEGIN CONTROL "",IDC_LED_SCROLL,"Static",SS_CENTER|SS_NOTIFY,580,16,4,3 END +IDD_WARNINGDIALOG_OSK DIALOGEX 0, 0, 250, 97 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION +CAPTION "On-Screen Keyboard" +FONT 8, "MS Shell Dlg", 400, 0, 0x1 +BEGIN + DEFPUSHBUTTON "OK", IDOK, 193, 76, 50, 14 + ICON IDI_OSK, IDC_STATIC, 7, 17, 20, 20 + LTEXT "On-Screen Keyboard provides a minimum level of functionality for mobility-impaired users. Mobility-impaired users will need a utility program with higher functionality for daily use.", IDC_STATIC, 36, 7, 207, 33 + CONTROL "Do not show this message again", IDC_SHOWWARNINGCHECK, "Button", + BS_AUTOCHECKBOX | WS_TABSTOP, 43, 80, 137, 10 +END + /* EOF */ diff --git a/base/applications/osk/lang/cs-CZ.rc b/base/applications/osk/lang/cs-CZ.rc index 7361e3cbaa..f3d03f7d5b 100644 --- a/base/applications/osk/lang/cs-CZ.rc +++ b/base/applications/osk/lang/cs-CZ.rc @@ -125,4 +125,16 @@ BEGIN CONTROL "",IDC_LED_SCROLL,"Static",SS_CENTER|SS_NOTIFY,580,16,4,3 END +IDD_WARNINGDIALOG_OSK DIALOGEX 0, 0, 250, 97 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION +CAPTION "On-Screen Keyboard" +FONT 8, "MS Shell Dlg", 400, 0, 0x1 +BEGIN + DEFPUSHBUTTON "OK", IDOK, 193, 76, 50, 14 + ICON IDI_OSK, IDC_STATIC, 7, 17, 20, 20 + LTEXT "On-Screen Keyboard provides a minimum level of functionality for mobility-impaired users. Mobility-impaired users will need a utility program with higher functionality for daily use.", IDC_STATIC, 36, 7, 207, 33 + CONTROL "Do not show this message again", IDC_SHOWWARNINGCHECK, "Button", + BS_AUTOCHECKBOX | WS_TABSTOP, 43, 80, 137, 10 +END + /* EOF */ diff --git a/base/applications/osk/lang/de-DE.rc b/base/applications/osk/lang/de-DE.rc index 704dfedabf..02f714ec32 100644 --- a/base/applications/osk/lang/de-DE.rc +++ b/base/applications/osk/lang/de-DE.rc @@ -126,4 +126,16 @@ BEGIN CONTROL "",IDC_LED_SCROLL,"Static",SS_CENTER|SS_NOTIFY,580,16,4,3 END +IDD_WARNINGDIALOG_OSK DIALOGEX 0, 0, 250, 97 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION +CAPTION "On-Screen Keyboard" +FONT 8, "MS Shell Dlg", 400, 0, 0x1 +BEGIN + DEFPUSHBUTTON "OK", IDOK, 193, 76, 50, 14 + ICON IDI_OSK, IDC_STATIC, 7, 17, 20, 20 + LTEXT "On-Screen Keyboard provides a minimum level of functionality for mobility-impaired users. Mobility-impaired users will need a utility program with higher functionality for daily use.", IDC_STATIC, 36, 7, 207, 33 + CONTROL "Do not show this message again", IDC_SHOWWARNINGCHECK, "Button", + BS_AUTOCHECKBOX | WS_TABSTOP, 43, 80, 137, 10 +END + /* EOF */ diff --git a/base/applications/osk/lang/en-GB.rc b/base/applications/osk/lang/en-GB.rc index e3e541ba72..03572dd06c 100644 --- a/base/applications/osk/lang/en-GB.rc +++ b/base/applications/osk/lang/en-GB.rc @@ -126,4 +126,16 @@ BEGIN CONTROL "",IDC_LED_SCROLL,"Static",SS_CENTER|SS_NOTIFY,580,16,4,3 END +IDD_WARNINGDIALOG_OSK DIALOGEX 0, 0, 250, 97 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION +CAPTION "On-Screen Keyboard" +FONT 8, "MS Shell Dlg", 400, 0, 0x1 +BEGIN + DEFPUSHBUTTON "OK", IDOK, 193, 76, 50, 14 + ICON IDI_OSK, IDC_STATIC, 7, 17, 20, 20 + LTEXT "On-Screen Keyboard provides a minimum level of functionality for mobility-impaired users. Mobility-impaired users will need a utility program with higher functionality for daily use.", IDC_STATIC, 36, 7, 207, 33 + CONTROL "Do not show this message again", IDC_SHOWWARNINGCHECK, "Button", + BS_AUTOCHECKBOX | WS_TABSTOP, 43, 80, 137, 10 +END + /* EOF */ diff --git a/base/applications/osk/lang/en-US.rc b/base/applications/osk/lang/en-US.rc index 9c29b65aff..890894b09f 100644 --- a/base/applications/osk/lang/en-US.rc +++ b/base/applications/osk/lang/en-US.rc @@ -125,4 +125,16 @@ BEGIN CONTROL "",IDC_LED_SCROLL,"Static",SS_CENTER|SS_NOTIFY,443,15,4,3 END +IDD_WARNINGDIALOG_OSK DIALOGEX 0, 0, 250, 97 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION +CAPTION "On-Screen Keyboard" +FONT 8, "MS Shell Dlg", 400, 0, 0x1 +BEGIN + DEFPUSHBUTTON "OK", IDOK, 193, 76, 50, 14 + ICON IDI_OSK, IDC_STATIC, 7, 17, 20, 20 + LTEXT "On-Screen Keyboard provides a minimum level of functionality for mobility-impaired users. Mobility-impaired users will need a utility program with higher functionality for daily use.", IDC_STATIC, 36, 7, 207, 33 + CONTROL "Do not show this message again", IDC_SHOWWARNINGCHECK, "Button", + BS_AUTOCHECKBOX | WS_TABSTOP, 43, 80, 137, 10 +END + /* EOF */ diff --git a/base/applications/osk/lang/es-ES.rc b/base/applications/osk/lang/es-ES.rc index 5fe569721e..aa8c6a3e0c 100644 --- a/base/applications/osk/lang/es-ES.rc +++ b/base/applications/osk/lang/es-ES.rc @@ -127,4 +127,16 @@ BEGIN CONTROL "",IDC_LED_SCROLL,"Static",SS_CENTER|SS_NOTIFY,580,16,4,3 END +IDD_WARNINGDIALOG_OSK DIALOGEX 0, 0, 250, 97 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION +CAPTION "On-Screen Keyboard" +FONT 8, "MS Shell Dlg", 400, 0, 0x1 +BEGIN + DEFPUSHBUTTON "OK", IDOK, 193, 76, 50, 14 + ICON IDI_OSK, IDC_STATIC, 7, 17, 20, 20 + LTEXT "On-Screen Keyboard provides a minimum level of functionality for mobility-impaired users. Mobility-impaired users will need a utility program with higher functionality for daily use.", IDC_STATIC, 36, 7, 207, 33 + CONTROL "Do not show this message again", IDC_SHOWWARNINGCHECK, "Button", + BS_AUTOCHECKBOX | WS_TABSTOP, 43, 80, 137, 10 +END + /* EOF */ diff --git a/base/applications/osk/lang/fr-CA.rc b/base/applications/osk/lang/fr-CA.rc index 0cbbf7abb1..faa3b5cdfc 100644 --- a/base/applications/osk/lang/fr-CA.rc +++ b/base/applications/osk/lang/fr-CA.rc @@ -126,4 +126,16 @@ BEGIN CONTROL "",IDC_LED_SCROLL,"Static",SS_CENTER|SS_NOTIFY,580,16,4,3 END +IDD_WARNINGDIALOG_OSK DIALOGEX 0, 0, 250, 97 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION +CAPTION "On-Screen Keyboard" +FONT 8, "MS Shell Dlg", 400, 0, 0x1 +BEGIN + DEFPUSHBUTTON "OK", IDOK, 193, 76, 50, 14 + ICON IDI_OSK, IDC_STATIC, 7, 17, 20, 20 + LTEXT "On-Screen Keyboard provides a minimum level of functionality for mobility-impaired users. Mobility-impaired users will need a utility program with higher functionality for daily use.", IDC_STATIC, 36, 7, 207, 33 + CONTROL "Do not show this message again", IDC_SHOWWARNINGCHECK, "Button", + BS_AUTOCHECKBOX | WS_TABSTOP, 43, 80, 137, 10 +END + /* EOF */ diff --git a/base/applications/osk/lang/fr-FR.rc b/base/applications/osk/lang/fr-FR.rc index 5e126341fc..5c490481bd 100644 --- a/base/applications/osk/lang/fr-FR.rc +++ b/base/applications/osk/lang/fr-FR.rc @@ -126,4 +126,16 @@ BEGIN CONTROL "",IDC_LED_SCROLL,"Static",SS_CENTER|SS_NOTIFY,580,16,4,3 END +IDD_WARNINGDIALOG_OSK DIALOGEX 0, 0, 250, 97 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION +CAPTION "On-Screen Keyboard" +FONT 8, "MS Shell Dlg", 400, 0, 0x1 +BEGIN + DEFPUSHBUTTON "OK", IDOK, 193, 76, 50, 14 + ICON IDI_OSK, IDC_STATIC, 7, 17, 20, 20 + LTEXT "On-Screen Keyboard provides a minimum level of functionality for mobility-impaired users. Mobility-impaired users will need a utility program with higher functionality for daily use.", IDC_STATIC, 36, 7, 207, 33 + CONTROL "Do not show this message again", IDC_SHOWWARNINGCHECK, "Button", + BS_AUTOCHECKBOX | WS_TABSTOP, 43, 80, 137, 10 +END + /* EOF */ diff --git a/base/applications/osk/lang/he-IL.rc b/base/applications/osk/lang/he-IL.rc index 52d0887db3..7be0c0278f 100644 --- a/base/applications/osk/lang/he-IL.rc +++ b/base/applications/osk/lang/he-IL.rc @@ -125,4 +125,16 @@ BEGIN CONTROL "",IDC_LED_SCROLL,"Static",SS_CENTER|SS_NOTIFY,580,16,4,3 END +IDD_WARNINGDIALOG_OSK DIALOGEX 0, 0, 250, 97 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION +CAPTION "On-Screen Keyboard" +FONT 8, "MS Shell Dlg", 400, 0, 0x1 +BEGIN + DEFPUSHBUTTON "OK", IDOK, 193, 76, 50, 14 + ICON IDI_OSK, IDC_STATIC, 7, 17, 20, 20 + LTEXT "On-Screen Keyboard provides a minimum level of functionality for mobility-impaired users. Mobility-impaired users will need a utility program with higher functionality for daily use.", IDC_STATIC, 36, 7, 207, 33 + CONTROL "Do not show this message again", IDC_SHOWWARNINGCHECK, "Button", + BS_AUTOCHECKBOX | WS_TABSTOP, 43, 80, 137, 10 +END + /* EOF */ diff --git a/base/applications/osk/lang/it-IT.rc b/base/applications/osk/lang/it-IT.rc index 3af1a12e2d..6a7a34e8bf 100644 --- a/base/applications/osk/lang/it-IT.rc +++ b/base/applications/osk/lang/it-IT.rc @@ -126,4 +126,16 @@ BEGIN CONTROL "",IDC_LED_SCROLL,"Static",SS_CENTER|SS_NOTIFY,443,15,4,3 END +IDD_WARNINGDIALOG_OSK DIALOGEX 0, 0, 250, 97 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION +CAPTION "On-Screen Keyboard" +FONT 8, "MS Shell Dlg", 400, 0, 0x1 +BEGIN + DEFPUSHBUTTON "OK", IDOK, 193, 76, 50, 14 + ICON IDI_OSK, IDC_STATIC, 7, 17, 20, 20 + LTEXT "On-Screen Keyboard provides a minimum level of functionality for mobility-impaired users. Mobility-impaired users will need a utility program with higher functionality for daily use.", IDC_STATIC, 36, 7, 207, 33 + CONTROL "Do not show this message again", IDC_SHOWWARNINGCHECK, "Button", + BS_AUTOCHECKBOX | WS_TABSTOP, 43, 80, 137, 10 +END + /* EOF */ diff --git a/base/applications/osk/lang/pl-PL.rc b/base/applications/osk/lang/pl-PL.rc index 4c89b54e31..8e97f9877b 100644 --- a/base/applications/osk/lang/pl-PL.rc +++ b/base/applications/osk/lang/pl-PL.rc @@ -125,4 +125,16 @@ BEGIN CONTROL "",IDC_LED_SCROLL,"Static",SS_CENTER|SS_NOTIFY,580,16,4,3 END +IDD_WARNINGDIALOG_OSK DIALOGEX 0, 0, 250, 97 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION +CAPTION "On-Screen Keyboard" +FONT 8, "MS Shell Dlg", 400, 0, 0x1 +BEGIN + DEFPUSHBUTTON "OK", IDOK, 193, 76, 50, 14 + ICON IDI_OSK, IDC_STATIC, 7, 17, 20, 20 + LTEXT "On-Screen Keyboard provides a minimum level of functionality for mobility-impaired users. Mobility-impaired users will need a utility program with higher functionality for daily use.", IDC_STATIC, 36, 7, 207, 33 + CONTROL "Do not show this message again", IDC_SHOWWARNINGCHECK, "Button", + BS_AUTOCHECKBOX | WS_TABSTOP, 43, 80, 137, 10 +END + /* EOF */ diff --git a/base/applications/osk/lang/ro-RO.rc b/base/applications/osk/lang/ro-RO.rc index 4910a6f6e7..7a4d358ac7 100644 --- a/base/applications/osk/lang/ro-RO.rc +++ b/base/applications/osk/lang/ro-RO.rc @@ -126,4 +126,16 @@ BEGIN CONTROL "",IDC_LED_SCROLL,"Static",SS_CENTER|SS_NOTIFY,443,15,4,3 END +IDD_WARNINGDIALOG_OSK DIALOGEX 0, 0, 250, 97 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION +CAPTION "On-Screen Keyboard" +FONT 8, "MS Shell Dlg", 400, 0, 0x1 +BEGIN + DEFPUSHBUTTON "OK", IDOK, 193, 76, 50, 14 + ICON IDI_OSK, IDC_STATIC, 7, 17, 20, 20 + LTEXT "On-Screen Keyboard provides a minimum level of functionality for mobility-impaired users. Mobility-impaired users will need a utility program with higher functionality for daily use.", IDC_STATIC, 36, 7, 207, 33 + CONTROL "Do not show this message again", IDC_SHOWWARNINGCHECK, "Button", + BS_AUTOCHECKBOX | WS_TABSTOP, 43, 80, 137, 10 +END + /* EOF */ diff --git a/base/applications/osk/lang/ru-RU.rc b/base/applications/osk/lang/ru-RU.rc index 3a042884e3..a551634828 100644 --- a/base/applications/osk/lang/ru-RU.rc +++ b/base/applications/osk/lang/ru-RU.rc @@ -125,4 +125,16 @@ BEGIN CONTROL "",IDC_LED_SCROLL,"Static",SS_CENTER|SS_NOTIFY,443,15,4,3 END +IDD_WARNINGDIALOG_OSK DIALOGEX 0, 0, 250, 97 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION +CAPTION "On-Screen Keyboard" +FONT 8, "MS Shell Dlg", 400, 0, 0x1 +BEGIN + DEFPUSHBUTTON "OK", IDOK, 193, 76, 50, 14 + ICON IDI_OSK, IDC_STATIC, 7, 17, 20, 20 + LTEXT "On-Screen Keyboard provides a minimum level of functionality for mobility-impaired users. Mobility-impaired users will need a utility program with higher functionality for daily use.", IDC_STATIC, 36, 7, 207, 33 + CONTROL "Do not show this message again", IDC_SHOWWARNINGCHECK, "Button", + BS_AUTOCHECKBOX | WS_TABSTOP, 43, 80, 137, 10 +END + /* EOF */ diff --git a/base/applications/osk/lang/tr-TR.rc b/base/applications/osk/lang/tr-TR.rc index 107233d9a9..1d1f16ca4f 100644 --- a/base/applications/osk/lang/tr-TR.rc +++ b/base/applications/osk/lang/tr-TR.rc @@ -125,4 +125,16 @@ BEGIN CONTROL "",IDC_LED_SCROLL,"Static",SS_CENTER|SS_NOTIFY,580,16,4,3 END +IDD_WARNINGDIALOG_OSK DIALOGEX 0, 0, 250, 97 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION +CAPTION "On-Screen Keyboard" +FONT 8, "MS Shell Dlg", 400, 0, 0x1 +BEGIN + DEFPUSHBUTTON "OK", IDOK, 193, 76, 50, 14 + ICON IDI_OSK, IDC_STATIC, 7, 17, 20, 20 + LTEXT "On-Screen Keyboard provides a minimum level of functionality for mobility-impaired users. Mobility-impaired users will need a utility program with higher functionality for daily use.", IDC_STATIC, 36, 7, 207, 33 + CONTROL "Do not show this message again", IDC_SHOWWARNINGCHECK, "Button", + BS_AUTOCHECKBOX | WS_TABSTOP, 43, 80, 137, 10 +END + /* EOF */ diff --git a/base/applications/osk/lang/zh-CN.rc b/base/applications/osk/lang/zh-CN.rc index 33d219a41c..e873cc4434 100644 --- a/base/applications/osk/lang/zh-CN.rc +++ b/base/applications/osk/lang/zh-CN.rc @@ -127,4 +127,16 @@ BEGIN CONTROL "",IDC_LED_SCROLL,"Static",SS_CENTER|SS_NOTIFY,580,16,4,3 END +IDD_WARNINGDIALOG_OSK DIALOGEX 0, 0, 250, 97 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION +CAPTION "On-Screen Keyboard" +FONT 8, "MS Shell Dlg", 400, 0, 0x1 +BEGIN + DEFPUSHBUTTON "OK", IDOK, 193, 76, 50, 14 + ICON IDI_OSK, IDC_STATIC, 7, 17, 20, 20 + LTEXT "On-Screen Keyboard provides a minimum level of functionality for mobility-impaired users. Mobility-impaired users will need a utility program with higher functionality for daily use.", IDC_STATIC, 36, 7, 207, 33 + CONTROL "Do not show this message again", IDC_SHOWWARNINGCHECK, "Button", + BS_AUTOCHECKBOX | WS_TABSTOP, 43, 80, 137, 10 +END + /* EOF */ diff --git a/base/applications/osk/lang/zh-TW.rc b/base/applications/osk/lang/zh-TW.rc index 3a9325dab4..e38779503d 100644 --- a/base/applications/osk/lang/zh-TW.rc +++ b/base/applications/osk/lang/zh-TW.rc @@ -127,4 +127,16 @@ BEGIN CONTROL "",IDC_LED_SCROLL,"Static",SS_CENTER|SS_NOTIFY,580,16,4,3 END +IDD_WARNINGDIALOG_OSK DIALOGEX 0, 0, 250, 97 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION +CAPTION "On-Screen Keyboard" +FONT 8, "MS Shell Dlg", 400, 0, 0x1 +BEGIN + DEFPUSHBUTTON "OK", IDOK, 193, 76, 50, 14 + ICON IDI_OSK, IDC_STATIC, 7, 17, 20, 20 + LTEXT "On-Screen Keyboard provides a minimum level of functionality for mobility-impaired users. Mobility-impaired users will need a utility program with higher functionality for daily use.", IDC_STATIC, 36, 7, 207, 33 + CONTROL "Do not show this message again", IDC_SHOWWARNINGCHECK, "Button", + BS_AUTOCHECKBOX | WS_TABSTOP, 43, 80, 137, 10 +END + /* EOF */ diff --git a/base/applications/osk/main.c b/base/applications/osk/main.c index 9932f7937a..6c1793353c 100644 --- a/base/applications/osk/main.c +++ b/base/applications/osk/main.c @@ -9,6 +9,7 @@ /* INCLUDES *******************************************************************/ #include "osk.h" +#include "settings.h" /* GLOBALS ********************************************************************/ @@ -57,6 +58,47 @@ int OSK_SetImage(int IdDlgItem, int IdResource) return TRUE; } +/*********************************************************************** + * + * OSK_WarningProc + * + * Function handler for the warning dialog box on startup + */ +INT_PTR CALLBACK OSK_WarningProc(HWND hDlg, UINT Msg, WPARAM wParam, LPARAM lParam) +{ + UNREFERENCED_PARAMETER(lParam); + + switch (Msg) + { + case WM_INITDIALOG: + { + return TRUE; + } + + case WM_COMMAND: + { + switch (LOWORD(wParam)) + { + case IDC_SHOWWARNINGCHECK: + { + Globals.bShowWarning = !IsDlgButtonChecked(hDlg, IDC_SHOWWARNINGCHECK); + return TRUE; + } + + case IDOK: + case IDCANCEL: + { + EndDialog(hDlg, LOWORD(wParam)); + return TRUE; + } + } + break; + } + } + + return FALSE; +} + /*********************************************************************** * @@ -74,6 +116,9 @@ int OSK_DlgInitDialog(HWND hDlg) /* Save handle */ Globals.hMainWnd = hDlg; + /* Load the settings from the registry hive */ + LoadDataFromRegistry(); + /* Get screen info */ memset(&Pt, 0, sizeof(Pt)); monitor = MonitorFromPoint(Pt, MONITOR_DEFAULTTOPRIMARY ); @@ -115,6 +160,12 @@ int OSK_DlgInitDialog(HWND hDlg) /* Set a timer for periodics tasks */ Globals.iTimer = SetTimer(hDlg, 0, 200, NULL); + /* If the member of the struct (bShowWarning) is set then display the dialog box */ + if (Globals.bShowWarning) + { + DialogBox(Globals.hInstance, MAKEINTRESOURCE(IDD_WARNINGDIALOG_OSK), Globals.hMainWnd, OSK_WarningProc); + } + return TRUE; } @@ -139,6 +190,9 @@ int OSK_DlgClose(void) /* delete GDI objects */ if (Globals.hBrushGreenLed) DeleteObject(Globals.hBrushGreenLed); + /* Save the settings to the registry hive */ + SaveDataToRegistry(); + return TRUE; } diff --git a/base/applications/osk/main.h b/base/applications/osk/main.h index 9c698e6aa7..ca7922d030 100644 --- a/base/applications/osk/main.h +++ b/base/applications/osk/main.h @@ -23,6 +23,7 @@ typedef struct UINT_PTR iTimer; /* FIXME: To be deleted when ReactOS will support WS_EX_NOACTIVATE */ HWND hActiveWnd; + BOOL bShowWarning; } OSK_GLOBALS; /* DEFINES ********************************************************************/ diff --git a/base/applications/osk/osk_res.h b/base/applications/osk/osk_res.h index 3c88d8bafc..120632d742 100644 --- a/base/applications/osk/osk_res.h +++ b/base/applications/osk/osk_res.h @@ -11,6 +11,7 @@ #define IDC_LED_NUM 100 #define IDC_LED_CAPS 101 #define IDC_LED_SCROLL 102 +#define IDC_SHOWWARNINGCHECK 103 #define IDI_OSK 200 #define IDI_BACK 201 @@ -28,6 +29,8 @@ #define IDI_RIGHT 213 #define IDI_BOTTOM 214 +#define IDD_WARNINGDIALOG_OSK 215 + #define IDC_STATIC -1 diff --git a/base/applications/osk/settings.c b/base/applications/osk/settings.c new file mode 100644 index 0000000000..33f8893d57 --- /dev/null +++ b/base/applications/osk/settings.c @@ -0,0 +1,104 @@ +/* + * PROJECT: ReactOS On-Screen Keyboard + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Settings file for warning dialog on startup + * COPYRIGHT: Copyright 2018 Bișoc George (fraizeraust99 at gmail dot com) + */ + +/* INCLUDES *******************************************************************/ + +#include "osk.h" +#include "settings.h" + +/* FUNCTIONS *******************************************************************/ + +BOOL LoadDataFromRegistry() +{ + HKEY hKey; + LONG lResult; + DWORD dwData; + DWORD cbData = sizeof(DWORD); + + /* Set the structure member to TRUE */ + Globals.bShowWarning = TRUE; + + /* Open the key, so that we can query it */ + lResult = RegOpenKeyExW(HKEY_CURRENT_USER, + L"Software\\Microsoft\\osk", + 0, + KEY_READ, + &hKey); + + if (lResult != ERROR_SUCCESS) + { + /* Bail out and return FALSE if we fail */ + return FALSE; + } + + /* Query the key */ + lResult = RegQueryValueExW(hKey, + L"ShowWarning", + 0, + 0, + (BYTE *)&dwData, + &cbData); + + if (lResult != ERROR_SUCCESS) + { + /* Bail out and return FALSE if we fail */ + RegCloseKey(hKey); + return FALSE; + } + + /* Load the data value (it can be either FALSE or TRUE depending on the data itself) */ + Globals.bShowWarning = (dwData != 0); + + /* If we're here then we succeed, close the key and return TRUE */ + RegCloseKey(hKey); + return TRUE; +} + +BOOL SaveDataToRegistry() +{ + HKEY hKey; + LONG lResult; + DWORD dwData; + + /* If no key has been made, create one */ + lResult = RegCreateKeyExW(HKEY_CURRENT_USER, + L"Software\\Microsoft\\osk", + 0, + NULL, + 0, + KEY_WRITE, + NULL, + &hKey, + NULL); + + if (lResult != ERROR_SUCCESS) + { + /* Bail out and return FALSE if we fail */ + return FALSE; + } + + /* The data value of the subkey will be appended to the warning dialog switch */ + dwData = Globals.bShowWarning; + + lResult = RegSetValueExW(hKey, + L"ShowWarning", + 0, + REG_DWORD, + (BYTE *)&dwData, + sizeof(dwData)); + + if (lResult != ERROR_SUCCESS) + { + /* Bail out and return FALSE if we fail */ + RegCloseKey(hKey); + return FALSE; + } + + /* If we're here then we succeed, close the key and return TRUE */ + RegCloseKey(hKey); + return TRUE; +} diff --git a/base/applications/osk/settings.h b/base/applications/osk/settings.h new file mode 100644 index 0000000000..05e122a4ff --- /dev/null +++ b/base/applications/osk/settings.h @@ -0,0 +1,15 @@ +/* + * PROJECT: ReactOS On-Screen Keyboard + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Settings header file with function prototypes + * COPYRIGHT: Copyright 2018 Bișoc George (fraizeraust99 at gmail dot com) + */ + +#ifndef SETTINGS_OSK_H +#define SETTINGS_OSK_H + +BOOL LoadDataFromRegistry(VOID); +BOOL SaveDataToRegistry(VOID); +INT_PTR CALLBACK OSK_WarningProc(HWND hDlg, UINT Msg, WPARAM wParam, LPARAM lParam); + +#endif // SETTINGS_OSK_H

5 years, 10 months

01/01: [MC] Add messages 3051-3099 and 5600-5602. This completes the SERVICE and SERVICE2 message ranges from lmsvc.h.

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9ff64cfebbe7ab17b1fcc… commit 9ff64cfebbe7ab17b1fccc05be06d627d15eaf92 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sat Nov 17 21:12:47 2018 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sat Nov 17 21:13:31 2018 +0100 [MC] Add messages 3051-3099 and 5600-5602. This completes the SERVICE and SERVICE2 message ranges from lmsvc.h. --- sdk/include/reactos/mc/netmsgmsg.mc | 548 +++++++++++++++++++++++++++++++++++- 1 file changed, 547 insertions(+), 1 deletion(-) diff --git a/sdk/include/reactos/mc/netmsgmsg.mc b/sdk/include/reactos/mc/netmsgmsg.mc index 2c370a96ab..5c424cdeff 100644 --- a/sdk/include/reactos/mc/netmsgmsg.mc +++ b/sdk/include/reactos/mc/netmsgmsg.mc @@ -3440,7 +3440,510 @@ This is the last error in NERR range. ; -; lmerrlog.h messages definitions (3100 - 3299) +; lmsvc.h message definitions (3050 - 3099 SERVICE_BASE) +; + +;MessageId=3050 +;Severity=Success +;Facility=System +;SymbolicName=MAX_NERR +;Language=English +;Replicator failed to update signal file in directory %2 due to\n +;%1 system error. +;. +;Language=Russian +;Replicator failed to update signal file in directory %2 due to\n +;%1 system error. +;. + +MessageId=3051 +Severity=Success +Facility=System +SymbolicName=SERVICE_UIC_BADPARMVAL +Language=English +The Registry or the information you just typed includes an illegal\n +value for \"%1\". +. +Language=Russian +The Registry or the information you just typed includes an illegal\n +value for \"%1\". +. + +MessageId=3052 +Severity=Success +Facility=System +SymbolicName=SERVICE_UIC_MISSPARM +Language=English +The required parameter was not provided on the command\nline or in the configuration file. +. +Language=Russian +The required parameter was not provided on the command\nline or in the configuration file. +. + +MessageId=3053 +Severity=Success +Facility=System +SymbolicName=SERVICE_UIC_UNKPARM +Language=English +LAN Manager does not recognize \"%1\" as a valid option. +. +Language=Russian +LAN Manager does not recognize \"%1\" as a valid option. +. + +MessageId=3054 +Severity=Success +Facility=System +SymbolicName=SERVICE_UIC_RESOURCE +Language=English +A request for resource could not be satisfied. +. +Language=Russian +A request for resource could not be satisfied. +. + +MessageId=3055 +Severity=Success +Facility=System +SymbolicName=SERVICE_UIC_CONFIG +Language=English +A problem exists with the system configuration. +. +Language=Russian +A problem exists with the system configuration. +. + +MessageId=3056 +Severity=Success +Facility=System +SymbolicName=SERVICE_UIC_SYSTEM +Language=English +A system error has occurred. +. +Language=Russian +A system error has occurred. +. + +MessageId=3057 +Severity=Success +Facility=System +SymbolicName=SERVICE_UIC_INTERNAL +Language=English +An internal consistency error has occurred. +. +Language=Russian +An internal consistency error has occurred. +. + +MessageId=3058 +Severity=Success +Facility=System +SymbolicName=SERVICE_UIC_AMBIGPARM +Language=English +The configuration file or the command line has an ambiguous option. +. +Language=Russian +The configuration file or the command line has an ambiguous option. +. + +MessageId=3059 +Severity=Success +Facility=System +SymbolicName=SERVICE_UIC_DUPPARM +Language=English +The configuration file or the command line has a duplicate parameter. +. +Language=Russian +The configuration file or the command line has a duplicate parameter. +. + +MessageId=3060 +Severity=Success +Facility=System +SymbolicName=SERVICE_UIC_KILL +Language=English +The service did not respond to control and was stopped with\nthe DosKillProc function. +. +Language=Russian +The service did not respond to control and was stopped with\nthe DosKillProc function. +. + +MessageId=3061 +Severity=Success +Facility=System +SymbolicName=SERVICE_UIC_EXEC +Language=English +An error occurred when attempting to run the service program. +. +Language=Russian +An error occurred when attempting to run the service program. +. + +MessageId=3062 +Severity=Success +Facility=System +SymbolicName=SERVICE_UIC_SUBSERV +Language=English +The sub-service failed to start. +. +Language=Russian +The sub-service failed to start. +. + +MessageId=3063 +Severity=Success +Facility=System +SymbolicName=SERVICE_UIC_CONFLPARM +Language=English +There is a conflict in the value or use of these options: %1. +. +Language=Russian +There is a conflict in the value or use of these options: %1. +. + +MessageId=3064 +Severity=Success +Facility=System +SymbolicName=SERVICE_UIC_FILE +Language=English +There is a problem with the file. +. +Language=Russian +There is a problem with the file. +. + +MessageId=3070 +Severity=Success +Facility=System +SymbolicName=SERVICE_UIC_M_MEMORY +Language=English +memory +. +Language=Russian +memory +. + +MessageId=3071 +Severity=Success +Facility=System +SymbolicName=SERVICE_UIC_M_DISK +Language=English +disk space +. +Language=Russian +disk space +. + +MessageId=3072 +Severity=Success +Facility=System +SymbolicName=SERVICE_UIC_M_THREADS +Language=English +thread +. +Language=Russian +thread +. + +MessageId=3073 +Severity=Success +Facility=System +SymbolicName=SERVICE_UIC_M_PROCESSES +Language=English +process +. +Language=Russian +process +. + +MessageId=3074 +Severity=Success +Facility=System +SymbolicName=SERVICE_UIC_M_SECURITY +Language=English +Security Failure. %0 +. +Language=Russian +Security Failure. %0 +. + +MessageId=3075 +Severity=Success +Facility=System +SymbolicName=SERVICE_UIC_M_LANROOT +Language=English +Bad or missing LAN Manager root directory. +. +Language=Russian +Bad or missing LAN Manager root directory. +. + +MessageId=3076 +Severity=Success +Facility=System +SymbolicName=SERVICE_UIC_M_REDIR +Language=English +The network software is not installed. +. +Language=Russian +The network software is not installed. +. + +MessageId=3077 +Severity=Success +Facility=System +SymbolicName=SERVICE_UIC_M_SERVER +Language=English +The server is not started. +. +Language=Russian +The server is not started. +. + +MessageId=3078 +Severity=Success +Facility=System +SymbolicName=SERVICE_UIC_M_SEC_FILE_ERR +Language=English +The server cannot access the user accounts database (NET.ACC). +. +Language=Russian +The server cannot access the user accounts database (NET.ACC). +. + +MessageId=3079 +Severity=Success +Facility=System +SymbolicName=SERVICE_UIC_M_FILES +Language=English +Incompatible files are installed in the LANMAN tree. +. +Language=Russian +Incompatible files are installed in the LANMAN tree. +. + +MessageId=3080 +Severity=Success +Facility=System +SymbolicName=SERVICE_UIC_M_LOGS +Language=English +The LANMAN\\LOGS directory is invalid. +. +Language=Russian +The LANMAN\\LOGS directory is invalid. +. + +MessageId=3081 +Severity=Success +Facility=System +SymbolicName=SERVICE_UIC_M_LANGROUP +Language=English +The domain specified could not be used. +. +Language=Russian +The domain specified could not be used. +. + +MessageId=3082 +Severity=Success +Facility=System +SymbolicName=SERVICE_UIC_M_MSGNAME +Language=English +The computer name is being used as a message alias on another computer. +. +Language=Russian +The computer name is being used as a message alias on another computer. +. + +MessageId=3083 +Severity=Success +Facility=System +SymbolicName=SERVICE_UIC_M_ANNOUNCE +Language=English +The announcement of the server name failed. +. +Language=Russian +The announcement of the server name failed. +. + +MessageId=3084 +Severity=Success +Facility=System +SymbolicName=SERVICE_UIC_M_UAS +Language=English +The user accounts database is not configured correctly. +. +Language=Russian +The user accounts database is not configured correctly. +. + +MessageId=3085 +Severity=Success +Facility=System +SymbolicName=SERVICE_UIC_M_SERVER_SEC_ERR +Language=English +The server is not running with user-level security. +. +Language=Russian +The server is not running with user-level security. +. + +MessageId=3087 +Severity=Success +Facility=System +SymbolicName=SERVICE_UIC_M_WKSTA +Language=English +The workstation is not configured properly. +. +Language=Russian +The workstation is not configured properly. +. + +MessageId=3088 +Severity=Success +Facility=System +SymbolicName=SERVICE_UIC_M_ERRLOG +Language=English +View your error log for details. +. +Language=Russian +View your error log for details. +. + +MessageId=3089 +Severity=Success +Facility=System +SymbolicName=SERVICE_UIC_M_FILE_UW +Language=English +Unable to write to this file. +. +Language=Russian +Unable to write to this file. +. + +MessageId=3090 +Severity=Success +Facility=System +SymbolicName=SERVICE_UIC_M_ADDPAK +Language=English +ADDPAK file is corrupted. Delete LANMAN\\NETPROG\\ADDPAK.SER\n +and reapply all ADDPAKs. +. +Language=Russian +ADDPAK file is corrupted. Delete LANMAN\\NETPROG\\ADDPAK.SER\n +and reapply all ADDPAKs. +. + +MessageId=3091 +Severity=Success +Facility=System +SymbolicName=SERVICE_UIC_M_LAZY +Language=English +The LM386 server cannot be started because CACHE.EXE is not running. +. +Language=Russian +The LM386 server cannot be started because CACHE.EXE is not running. +. + +MessageId=3092 +Severity=Success +Facility=System +SymbolicName=SERVICE_UIC_M_UAS_MACHINE_ACCT +Language=English +There is no account for this computer in the security database. +. +Language=Russian +There is no account for this computer in the security database. +. + +MessageId=3093 +Severity=Success +Facility=System +SymbolicName=SERVICE_UIC_M_UAS_SERVERS_NMEMB +Language=English +This computer is not a member of the group SERVERS. +. +Language=Russian +This computer is not a member of the group SERVERS. +. + +MessageId=3094 +Severity=Success +Facility=System +SymbolicName=SERVICE_UIC_M_UAS_SERVERS_NOGRP +Language=English +The group SERVERS is not present in the local security database. +. +Language=Russian +The group SERVERS is not present in the local security database. +. + +MessageId=3095 +Severity=Success +Facility=System +SymbolicName=SERVICE_UIC_M_UAS_INVALID_ROLE +Language=English +This computer is configured as a member of a workgroup, not as\n +a member of a domain. The Netlogon service does not need to run in this\n +configuration. +. +Language=Russian +This computer is configured as a member of a workgroup, not as\n +a member of a domain. The Netlogon service does not need to run in this\n +configuration. +. + +MessageId=3096 +Severity=Success +Facility=System +SymbolicName=SERVICE_UIC_M_NETLOGON_NO_DC +Language=English +The primary Domain Controller for this domain could not be located. +. +Language=Russian +The primary Domain Controller for this domain could not be located. +. + +MessageId=3097 +Severity=Success +Facility=System +SymbolicName=SERVICE_UIC_M_NETLOGON_DC_CFLCT +Language=English +This computer is configured to be the primary domain controller of its domain.\n +However, the computer %1 is currently claiming to be the primary domain controller\n +of the domain. +. +Language=Russian +This computer is configured to be the primary domain controller of its domain.\n +However, the computer %1 is currently claiming to be the primary domain controller\n +of the domain. +. + +MessageId=3098 +Severity=Success +Facility=System +SymbolicName=SERVICE_UIC_M_NETLOGON_AUTH +Language=English +The service failed to authenticate with the primary domain controller. +. +Language=Russian +The service failed to authenticate with the primary domain controller. +. + +MessageId=3099 +Severity=Success +Facility=System +SymbolicName=SERVICE_UIC_M_UAS_PROLOG +Language=English +There is a problem with the security database creation date or serial number. +. +Language=Russian +There is a problem with the security database creation date or serial number. +. + + +; +; lmerrlog.h messages definitions (3100 - 3299 ERRLOG_BASE) ; MessageId=3100 @@ -5106,3 +5609,46 @@ A service specific error occurred: %1. Language=Russian A service specific error occurred: %1. . + + +; +; lmsvc.h message definitions (5600 - 5699 SERVICE2_BASE) +; + +MessageId=5600 +Severity=Success +Facility=System +SymbolicName=SERVICE_UIC_M_NETLOGON_MPATH +Language=English +Could not share the User or Script path. +. +Language=Russian +Could not share the User or Script path. +. + +MessageId=5601 +Severity=Success +Facility=System +SymbolicName=SERVICE_UIC_M_LSA_MACHINE_ACCT +Language=English +The password for this computer is not found in the local security\ndatabase. +. +Language=Russian +The password for this computer is not found in the local security\ndatabase. +. + +MessageId=5602 +Severity=Success +Facility=System +SymbolicName=SERVICE_UIC_M_DATABASE_ERROR +Language=English +An internal error occurred while accessing the computer's\nlocal or network security database. +. +Language=Russian +An internal error occurred while accessing the computer's\nlocal or network security database. +. + + +; +; lmerrlog.h messages definitions (5700 - 5899 ERRLOG2_BASE) +; \ No newline at end of file

5 years, 10 months

01/01: [NTOSKRNL] ExfReleaseRundownProtectionCacheAware*() functions don't return anything

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4f1e9252f18c687d2933f… commit 4f1e9252f18c687d2933f5366af82dbc90c3c77d Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sat Nov 17 17:36:18 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sat Nov 17 17:36:18 2018 +0100 [NTOSKRNL] ExfReleaseRundownProtectionCacheAware*() functions don't return anything --- ntoskrnl/ex/rundown.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ntoskrnl/ex/rundown.c b/ntoskrnl/ex/rundown.c index 00e2c3b772..e413fa2c7d 100644 --- a/ntoskrnl/ex/rundown.c +++ b/ntoskrnl/ex/rundown.c @@ -413,7 +413,7 @@ ExfReleaseRundownProtectionCacheAware(IN PEX_RUNDOWN_REF_CACHE_AWARE RunRefCache PEX_RUNDOWN_REF RunRef; RunRef = ExGetRunRefForGivenProcessor(RunRefCacheAware, KeGetCurrentProcessorNumber()); - return _ExReleaseRundownProtection(RunRef); + _ExReleaseRundownProtection(RunRef); } /* @@ -427,7 +427,7 @@ ExfReleaseRundownProtectionCacheAwareEx(IN PEX_RUNDOWN_REF_CACHE_AWARE RunRefCac PEX_RUNDOWN_REF RunRef; RunRef = ExGetRunRefForGivenProcessor(RunRefCacheAware, KeGetCurrentProcessorNumber()); - return ExfReleaseRundownProtectionEx(RunRef, Count); + ExfReleaseRundownProtectionEx(RunRef, Count); } /*

5 years, 10 months

13/13: [NTOSKRNL] Implement ExfReInitializeRundownProtectionCacheAware()

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7ed17cd71406eac9f37a2… commit 7ed17cd71406eac9f37a231b6322a9d5060b6574 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sat Nov 17 16:41:09 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sat Nov 17 16:44:37 2018 +0100 [NTOSKRNL] Implement ExfReInitializeRundownProtectionCacheAware() We're done with cache-aware rundown protections! --- ntoskrnl/ex/rundown.c | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/ntoskrnl/ex/rundown.c b/ntoskrnl/ex/rundown.c index 240d599703..00e2c3b772 100644 --- a/ntoskrnl/ex/rundown.c +++ b/ntoskrnl/ex/rundown.c @@ -376,8 +376,6 @@ ExfWaitForRundownProtectionRelease(IN PEX_RUNDOWN_REF RunRef) ASSERT(WaitBlock.Count == 0); } -/* FIXME: STUBS **************************************************************/ - /* * @implemented NT5.2 */ @@ -529,14 +527,31 @@ ExfRundownCompletedCacheAware(IN PEX_RUNDOWN_REF_CACHE_AWARE RunRefCacheAware) } /* - * @unimplemented NT5.2 + * @implemented NT5.2 */ VOID FASTCALL ExfReInitializeRundownProtectionCacheAware(IN PEX_RUNDOWN_REF_CACHE_AWARE RunRefCacheAware) { - DBG_UNREFERENCED_PARAMETER(RunRefCacheAware); - UNIMPLEMENTED; + PEX_RUNDOWN_REF RunRef; + ULONG ProcCount, Current; + + ProcCount = RunRefCacheAware->Number; + /* No proc, nothing to do */ + if (ProcCount == 0) + { + return; + } + + /* We will mark all our runrefs inactive */ + for (Current = 0; Current < ProcCount; ++Current) + { + /* Get the runref for the proc */ + RunRef = ExGetRunRefForGivenProcessor(RunRefCacheAware, Current); + ASSERT((RunRef->Count & EX_RUNDOWN_ACTIVE) != 0); + + ExpSetRundown(RunRef, 0); + } } /*

5 years, 10 months

12/13: [NTOSKRNL] Implement ExfRundownCompletedCacheAware()

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=05cca6444806751f294e8… commit 05cca6444806751f294e8a82c24190762cbd056c Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sat Nov 17 16:38:36 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sat Nov 17 16:44:37 2018 +0100 [NTOSKRNL] Implement ExfRundownCompletedCacheAware() --- ntoskrnl/ex/rundown.c | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/ntoskrnl/ex/rundown.c b/ntoskrnl/ex/rundown.c index 95ca8afbf5..240d599703 100644 --- a/ntoskrnl/ex/rundown.c +++ b/ntoskrnl/ex/rundown.c @@ -501,14 +501,31 @@ ExfWaitForRundownProtectionReleaseCacheAware(IN PEX_RUNDOWN_REF_CACHE_AWARE RunR } /* - * @unimplemented NT5.2 + * @implemented NT5.2 */ VOID FASTCALL ExfRundownCompletedCacheAware(IN PEX_RUNDOWN_REF_CACHE_AWARE RunRefCacheAware) { - DBG_UNREFERENCED_PARAMETER(RunRefCacheAware); - UNIMPLEMENTED; + PEX_RUNDOWN_REF RunRef; + ULONG ProcCount, Current; + + ProcCount = RunRefCacheAware->Number; + /* No proc, nothing to do */ + if (ProcCount == 0) + { + return; + } + + /* We will mark all our runrefs active */ + for (Current = 0; Current < ProcCount; ++Current) + { + /* Get the runref for the proc */ + RunRef = ExGetRunRefForGivenProcessor(RunRefCacheAware, Current); + ASSERT((RunRef->Count & EX_RUNDOWN_ACTIVE) != 0); + + ExpSetRundown(RunRef, EX_RUNDOWN_ACTIVE); + } } /*

5 years, 10 months

11/13: [NTOSKRNL] Replace ExGetRunRefForCurrentProcessor() by a more generic function

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fed61c6305213025280f8… commit fed61c6305213025280f86f6a1f5f8072fe81ba7 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sat Nov 17 16:33:22 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sat Nov 17 16:44:36 2018 +0100 [NTOSKRNL] Replace ExGetRunRefForCurrentProcessor() by a more generic function --- ntoskrnl/ex/rundown.c | 23 +++++++++-------------- ntoskrnl/include/internal/ex.h | 19 ++++++++++--------- 2 files changed, 19 insertions(+), 23 deletions(-) diff --git a/ntoskrnl/ex/rundown.c b/ntoskrnl/ex/rundown.c index bdbca4904e..95ca8afbf5 100644 --- a/ntoskrnl/ex/rundown.c +++ b/ntoskrnl/ex/rundown.c @@ -387,7 +387,7 @@ ExfAcquireRundownProtectionCacheAware(IN PEX_RUNDOWN_REF_CACHE_AWARE RunRefCache { PEX_RUNDOWN_REF RunRef; - RunRef = ExGetRunRefForCurrentProcessor(RunRefCacheAware); + RunRef = ExGetRunRefForGivenProcessor(RunRefCacheAware, KeGetCurrentProcessorNumber()); return _ExAcquireRundownProtection(RunRef); } @@ -401,7 +401,7 @@ ExfAcquireRundownProtectionCacheAwareEx(IN PEX_RUNDOWN_REF_CACHE_AWARE RunRefCac { PEX_RUNDOWN_REF RunRef; - RunRef = ExGetRunRefForCurrentProcessor(RunRefCacheAware); + RunRef = ExGetRunRefForGivenProcessor(RunRefCacheAware, KeGetCurrentProcessorNumber()); return ExfAcquireRundownProtectionEx(RunRef, Count); } @@ -414,7 +414,7 @@ ExfReleaseRundownProtectionCacheAware(IN PEX_RUNDOWN_REF_CACHE_AWARE RunRefCache { PEX_RUNDOWN_REF RunRef; - RunRef = ExGetRunRefForCurrentProcessor(RunRefCacheAware); + RunRef = ExGetRunRefForGivenProcessor(RunRefCacheAware, KeGetCurrentProcessorNumber()); return _ExReleaseRundownProtection(RunRef); } @@ -428,7 +428,7 @@ ExfReleaseRundownProtectionCacheAwareEx(IN PEX_RUNDOWN_REF_CACHE_AWARE RunRefCac { PEX_RUNDOWN_REF RunRef; - RunRef = ExGetRunRefForCurrentProcessor(RunRefCacheAware); + RunRef = ExGetRunRefForGivenProcessor(RunRefCacheAware, KeGetCurrentProcessorNumber()); return ExfReleaseRundownProtectionEx(RunRef, Count); } @@ -459,10 +459,7 @@ ExfWaitForRundownProtectionReleaseCacheAware(IN PEX_RUNDOWN_REF_CACHE_AWARE RunR for (Current = 0; Current < ProcCount; ++Current) { /* Get the runref for the proc */ - RunRef = (PEX_RUNDOWN_REF)((ULONG_PTR)RunRefCacheAware->RunRefs + - RunRefCacheAware->RunRefSize * - (Current % RunRefCacheAware->Number)); - + RunRef = ExGetRunRefForGivenProcessor(RunRefCacheAware, Current); /* Loop for setting the wait block */ do { @@ -535,7 +532,7 @@ ExAllocateCacheAwareRundownProtection(IN POOL_TYPE PoolType, { PEX_RUNDOWN_REF RunRef; PVOID PoolToFree, RunRefs; - ULONG RunRefSize, Count, Offset, Align; + ULONG RunRefSize, Count, Align; PEX_RUNDOWN_REF_CACHE_AWARE RunRefCacheAware; PAGED_CODE(); @@ -601,8 +598,7 @@ ExAllocateCacheAwareRundownProtection(IN POOL_TYPE PoolType, { for (Count = 0; Count < RunRefCacheAware->Number; ++Count) { - Offset = RunRefCacheAware->RunRefSize * Count; - RunRef = (PEX_RUNDOWN_REF)((ULONG_PTR)RunRefCacheAware->RunRefs + Offset); + RunRef = ExGetRunRefForGivenProcessor(RunRefCacheAware, Count); _ExInitializeRundownProtection(RunRef); } } @@ -641,7 +637,7 @@ ExInitializeRundownProtectionCacheAware(IN PEX_RUNDOWN_REF_CACHE_AWARE RunRefCac { PVOID Pool; PEX_RUNDOWN_REF RunRef; - ULONG Count, RunRefSize, Offset, Align; + ULONG Count, RunRefSize, Align; PAGED_CODE(); @@ -683,8 +679,7 @@ ExInitializeRundownProtectionCacheAware(IN PEX_RUNDOWN_REF_CACHE_AWARE RunRefCac { for (Count = 0; Count < RunRefCacheAware->Number; ++Count) { - Offset = RunRefCacheAware->RunRefSize * Count; - RunRef = (PEX_RUNDOWN_REF)((ULONG_PTR)RunRefCacheAware->RunRefs + Offset); + RunRef = ExGetRunRefForGivenProcessor(RunRefCacheAware, Count); _ExInitializeRundownProtection(RunRef); } } diff --git a/ntoskrnl/include/internal/ex.h b/ntoskrnl/include/internal/ex.h index e09eb9ba05..89fec75914 100644 --- a/ntoskrnl/include/internal/ex.h +++ b/ntoskrnl/include/internal/ex.h @@ -545,15 +545,6 @@ ExGetCountFastReference(IN EX_FAST_REF FastRef) return (ULONG)FastRef.RefCnt; } -FORCEINLINE -PEX_RUNDOWN_REF -ExGetRunRefForCurrentProcessor(IN PEX_RUNDOWN_REF_CACHE_AWARE RunRefCacheAware) -{ - return (PEX_RUNDOWN_REF)((ULONG_PTR)RunRefCacheAware->RunRefs + - RunRefCacheAware->RunRefSize * - (KeGetCurrentProcessorNumber() % RunRefCacheAware->Number)); -} - FORCEINLINE VOID ExInitializeFastReference(OUT PEX_FAST_REF FastRef, @@ -751,6 +742,16 @@ ExCompareSwapFastReference(IN PEX_FAST_REF FastRef, /* RUNDOWN *******************************************************************/ +FORCEINLINE +PEX_RUNDOWN_REF +ExGetRunRefForGivenProcessor(IN PEX_RUNDOWN_REF_CACHE_AWARE RunRefCacheAware, + IN ULONG ProcNumber) +{ + return (PEX_RUNDOWN_REF)((ULONG_PTR)RunRefCacheAware->RunRefs + + RunRefCacheAware->RunRefSize * + (ProcNumber % RunRefCacheAware->Number)); +} + /*++ * @name ExfAcquireRundownProtection * INTERNAL MACRO

5 years, 10 months

10/13: [NTOSKRNL] Implement ExfWaitForRundownProtectionReleaseCacheAware()

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7e849470af9cbe339fe71… commit 7e849470af9cbe339fe71cac1e4f6791d0dc0ecc Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sat Nov 17 16:28:17 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sat Nov 17 16:44:36 2018 +0100 [NTOSKRNL] Implement ExfWaitForRundownProtectionReleaseCacheAware() --- ntoskrnl/ex/rundown.c | 66 ++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 63 insertions(+), 3 deletions(-) diff --git a/ntoskrnl/ex/rundown.c b/ntoskrnl/ex/rundown.c index 340a2d8832..bdbca4904e 100644 --- a/ntoskrnl/ex/rundown.c +++ b/ntoskrnl/ex/rundown.c @@ -433,14 +433,74 @@ ExfReleaseRundownProtectionCacheAwareEx(IN PEX_RUNDOWN_REF_CACHE_AWARE RunRefCac } /* - * @unimplemented NT5.2 + * @implemented NT5.2 */ VOID FASTCALL ExfWaitForRundownProtectionReleaseCacheAware(IN PEX_RUNDOWN_REF_CACHE_AWARE RunRefCacheAware) { - DBG_UNREFERENCED_PARAMETER(RunRefCacheAware); - UNIMPLEMENTED; + PEX_RUNDOWN_REF RunRef; + EX_RUNDOWN_WAIT_BLOCK WaitBlock; + PEX_RUNDOWN_WAIT_BLOCK WaitBlockPointer; + ULONG ProcCount, Current, Value, OldValue, TotalCount; + + ProcCount = RunRefCacheAware->Number; + /* No proc, nothing to do */ + if (ProcCount == 0) + { + return; + } + + TotalCount = 0; + WaitBlock.Count = 0; + WaitBlockPointer = (PEX_RUNDOWN_WAIT_BLOCK)((ULONG_PTR)&WaitBlock | + EX_RUNDOWN_ACTIVE); + /* We will check all our runrefs */ + for (Current = 0; Current < ProcCount; ++Current) + { + /* Get the runref for the proc */ + RunRef = (PEX_RUNDOWN_REF)((ULONG_PTR)RunRefCacheAware->RunRefs + + RunRefCacheAware->RunRefSize * + (Current % RunRefCacheAware->Number)); + + /* Loop for setting the wait block */ + do + { + Value = RunRef->Count; + ASSERT((Value & EX_RUNDOWN_ACTIVE) == 0); + + /* Remove old value and set our waitblock instead */ + OldValue = ExpChangeRundown(RunRef, WaitBlockPointer, Value); + if (OldValue == Value) + { + break; + } + + Value = OldValue; + } + while (TRUE); + + /* Count the deleted values */ + TotalCount += Value; + } + + /* Sanity check: we didn't overflow */ + ASSERT((LONG)TotalCount >= 0); + if (TotalCount != 0) + { + /* Init the waitblock event */ + KeInitializeEvent(&WaitBlock.WakeEvent, + SynchronizationEvent, + FALSE); + + /* Do we have to wait? If so, go ahead! */ + if (InterlockedExchangeAddSizeT(&WaitBlock.Count, + (LONG)TotalCount >> EX_RUNDOWN_COUNT_SHIFT) == + -(LONG)(TotalCount >> EX_RUNDOWN_COUNT_SHIFT)) + { + KeWaitForSingleObject(&WaitBlock.WakeEvent, Executive, KernelMode, FALSE, NULL); + } + } } /*

5 years, 10 months

09/13: [NTOSKRNL] Properly align runrefs on SMP in ExInitializeRundownProtectionCacheAware()

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=acdf74aa3b92a49336f41… commit acdf74aa3b92a49336f413dd524b8840c56bbb84 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sat Nov 17 15:49:50 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sat Nov 17 16:44:36 2018 +0100 [NTOSKRNL] Properly align runrefs on SMP in ExInitializeRundownProtectionCacheAware() --- ntoskrnl/ex/rundown.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/ntoskrnl/ex/rundown.c b/ntoskrnl/ex/rundown.c index cde0bf7aea..340a2d8832 100644 --- a/ntoskrnl/ex/rundown.c +++ b/ntoskrnl/ex/rundown.c @@ -581,7 +581,7 @@ ExInitializeRundownProtectionCacheAware(IN PEX_RUNDOWN_REF_CACHE_AWARE RunRefCac { PVOID Pool; PEX_RUNDOWN_REF RunRef; - ULONG Count, RunRefSize, Offset; + ULONG Count, RunRefSize, Offset, Align; PAGED_CODE(); @@ -601,8 +601,13 @@ ExInitializeRundownProtectionCacheAware(IN PEX_RUNDOWN_REF_CACHE_AWARE RunRefCac } else { - /* FIXME: Properly align on SMP */ - UNIMPLEMENTED; + /* Get alignment constraint */ + Align = KeGetRecommendedSharedDataAlignment(); + + /* How many runrefs given the alignment? */ + RunRefSize = Align; + Count = ((Size - sizeof(EX_RUNDOWN_REF_CACHE_AWARE)) / Align) - 1; + Pool = (PVOID)ALIGN_UP_BY(Pool, Align); } /* Initialize the structure */

5 years, 10 months

← Newer
1
...
10
11
12
13
14
15
16
...
25
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs November 2018