September 2020 - Ros-diffs

[reactos] 01/01: [BROWSEUI_APITEST] Follow-up of #3249 (b1c3329)
by Katayama Hirofumi MZ 30 Sep '20

30 Sep '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=828a65f470ec5b1504b07… commit 828a65f470ec5b1504b0776bac182d051b855473 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Oct 1 05:03:34 2020 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Thu Oct 1 05:03:34 2020 +0900 [BROWSEUI_APITEST] Follow-up of #3249 (b1c3329) CORE-9281 --- modules/rostests/apitests/browseui/IACLCustomMRU.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/modules/rostests/apitests/browseui/IACLCustomMRU.cpp b/modules/rostests/apitests/browseui/IACLCustomMRU.cpp index cfde9d11cfc..89eb058261d 100644 --- a/modules/rostests/apitests/browseui/IACLCustomMRU.cpp +++ b/modules/rostests/apitests/browseui/IACLCustomMRU.cpp @@ -411,8 +411,12 @@ RestoreTypedURLs(const CStringW& url1, const CStringW& url2) key.Open(HKEY_CURRENT_USER, TYPED_URLS_KEY, KEY_WRITE); if (url1 != L"") key.SetStringValue(L"url1", url1); + else + key.DeleteValue(L"url1"); if (url2 != L"") key.SetStringValue(L"url2", url2); + else + key.DeleteValue(L"url2"); } static void @@ -421,7 +425,7 @@ test_IACLCustomMRU_TypedURLs() // TypedURLs is special case CStringW url1, url2; // Save values { CRegKey key; - key.Open(HKEY_CURRENT_USER, TYPED_URLS_KEY, KEY_READ | KEY_WRITE); + key.Create(HKEY_CURRENT_USER, TYPED_URLS_KEY); WCHAR Value[MAX_PATH]; ULONG cch = _countof(Value);

1 0

[reactos] 01/01: [BROWSEUI_APITEST] Strengthen IACLCustomMRU testcase (#3249)
by Katayama Hirofumi MZ 30 Sep '20

30 Sep '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b1c33293b0c9a444a0a3c… commit b1c33293b0c9a444a0a3c3e67d79a60ff1ef3661 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Sep 30 20:51:49 2020 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Sep 30 20:51:49 2020 +0900 [BROWSEUI_APITEST] Strengthen IACLCustomMRU testcase (#3249) Add some tests for "TypedURLs" of a special case. The TypedURLs registry key consists of the registry values of "url1", "url2", "url3" etc instead of "MRUList", "a", "b" etc. CORE-9281 --- .../rostests/apitests/browseui/IACLCustomMRU.cpp | 146 ++++++++++++++++++++- 1 file changed, 145 insertions(+), 1 deletion(-) diff --git a/modules/rostests/apitests/browseui/IACLCustomMRU.cpp b/modules/rostests/apitests/browseui/IACLCustomMRU.cpp index 9cf5ef765d4..cfde9d11cfc 100644 --- a/modules/rostests/apitests/browseui/IACLCustomMRU.cpp +++ b/modules/rostests/apitests/browseui/IACLCustomMRU.cpp @@ -29,7 +29,8 @@ ULONG DbgPrint(PCH Format,...); #expression, (int)(result), _value, (char)key); \ } while (0) - +#define ok_wstri(x, y) \ + ok(lstrcmpiW(x, y) == 0, "Wrong string. Expected '%S', got '%S'\n", y, x) struct CCoInit { @@ -401,6 +402,148 @@ test_IACLCustomMRU_Continue() verify_mru(CustomMRU, L"ba", L"FIRST_ENTRY", L"SECOND_ENTRY"); } +#define TYPED_URLS_KEY L"Software\\Microsoft\\Internet Explorer\\TypedURLs" + +static void +RestoreTypedURLs(const CStringW& url1, const CStringW& url2) +{ + CRegKey key; + key.Open(HKEY_CURRENT_USER, TYPED_URLS_KEY, KEY_WRITE); + if (url1 != L"") + key.SetStringValue(L"url1", url1); + if (url2 != L"") + key.SetStringValue(L"url2", url2); +} + +static void +test_IACLCustomMRU_TypedURLs() // TypedURLs is special case +{ + CStringW url1, url2; // Save values + { + CRegKey key; + key.Open(HKEY_CURRENT_USER, TYPED_URLS_KEY, KEY_READ | KEY_WRITE); + + WCHAR Value[MAX_PATH]; + ULONG cch = _countof(Value); + LSTATUS Status = key.QueryStringValue(L"url1", Value, &cch); + if (!Status) + url1 = Value; + + cch = _countof(Value); + Status = key.QueryStringValue(L"url2", Value, &cch); + if (!Status) + url2 = Value; + + // Set values + key.SetStringValue(L"url1", L"aaa"); + key.SetStringValue(L"url2", L"bbb"); + } + + CComPtr<IACLCustomMRU> CustomMRU; + HRESULT hr = CoCreateInstance(CLSID_ACLCustomMRU, NULL, CLSCTX_ALL, + IID_PPV_ARG(IACLCustomMRU, &CustomMRU)); + ok_hex(hr, S_OK); + if (FAILED(hr)) + { + skip("IACLCustomMRU was NULL\n"); + RestoreTypedURLs(url1, url2); + return; + } + + CComPtr<IACList> ACList; + hr = CustomMRU->QueryInterface(IID_PPV_ARG(IACList, &ACList)); + ok_hex(hr, S_OK); + if (SUCCEEDED(hr)) + { + hr = ACList->Expand(L"C:"); + ok_hex(hr, E_NOTIMPL); + hr = ACList->Expand(L"C:\\"); + ok_hex(hr, E_NOTIMPL); + hr = ACList->Expand(L"C:\\Program Files"); + ok_hex(hr, E_NOTIMPL); + hr = ACList->Expand(L"C:\\Program Files\\"); + ok_hex(hr, E_NOTIMPL); + hr = ACList->Expand(L"http://"); + ok_hex(hr, E_NOTIMPL); + hr = ACList->Expand(L"https://"); + ok_hex(hr, E_NOTIMPL); + hr = ACList->Expand(L"https://google.co.jp/"); + ok_hex(hr, E_NOTIMPL); + } + + hr = CustomMRU->Initialize(TYPED_URLS_KEY, 64); + ok_hex(hr, S_OK); + + if (ACList) + { + hr = ACList->Expand(L"C:"); + ok_hex(hr, E_NOTIMPL); + hr = ACList->Expand(L"C:\\"); + ok_hex(hr, E_NOTIMPL); + hr = ACList->Expand(L"C:\\Program Files"); + ok_hex(hr, E_NOTIMPL); + hr = ACList->Expand(L"C:\\Program Files\\"); + ok_hex(hr, E_NOTIMPL); + hr = ACList->Expand(L"http://"); + ok_hex(hr, E_NOTIMPL); + hr = ACList->Expand(L"https://"); + ok_hex(hr, E_NOTIMPL); + hr = ACList->Expand(L"https://google.co.jp/"); + ok_hex(hr, E_NOTIMPL); + } + + CComPtr<IEnumString> pEnum; + hr = CustomMRU->QueryInterface(IID_PPV_ARG(IEnumString, &pEnum)); + ok_hex(hr, S_OK); + if (FAILED(hr)) + { + skip("IEnumString was NULL\n"); + RestoreTypedURLs(url1, url2); + return; + } + + CComPtr<IEnumString> pEnumClone; + hr = pEnum->Clone(&pEnumClone); + ok_hex(hr, E_NOTIMPL); + + hr = pEnum->Skip(1); + ok_hex(hr, E_NOTIMPL); + +#define INVALID_LPOLESTR ((LPOLESTR)(LONG_PTR)0xDEADBEEF) + LPOLESTR apsz[2] = { NULL, INVALID_LPOLESTR }; + ULONG c = 0; + hr = pEnum->Next(2, apsz, &c); + ok_hex(hr, S_OK); + ok_wstri(apsz[0], L"aaa"); + ok_int(c, 1); + ok(apsz[1] == INVALID_LPOLESTR, "apsz[1] was '%S'\n", apsz[1]); + CoTaskMemFree(apsz[0]); + + LPOLESTR psz = INVALID_LPOLESTR; + c = 0; + hr = pEnum->Next(0, &psz, &c); + ok_hex(hr, S_OK); + ok(psz == INVALID_LPOLESTR, "psz was '%S'\n", psz); + ok_int(c, 0); + + psz = NULL; + c = 0; + hr = pEnum->Next(1, &psz, &c); + ok_hex(hr, S_OK); + ok_wstri(psz, L"bbb"); + ok_int(c, 1); + CoTaskMemFree(psz); + + hr = CustomMRU->AddMRUString(L"https://google.co.jp"); + ok_hex(hr, E_FAIL); + hr = CustomMRU->AddMRUString(L"C:"); + ok_hex(hr, E_FAIL); + hr = CustomMRU->AddMRUString(L"C:\\"); + ok_hex(hr, E_FAIL); + + RestoreTypedURLs(url1, url2); +} + START_TEST(IACLCustomMRU) { CCoInit init; @@ -412,6 +555,7 @@ START_TEST(IACLCustomMRU) test_IACLCustomMRU_UpdateOrder(); test_IACLCustomMRU_ExtraChars(); test_IACLCustomMRU_Continue(); + test_IACLCustomMRU_TypedURLs(); Cleanup_Testdata(); }

1 0

[reactos] 01/01: [MSGINA] Allow to pair FriendlyShutDownDlg with 'Server' CORE-17282
by Joachim Henze 30 Sep '20

30 Sep '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d2bbf54b6f6f8ffdc3fd4… commit d2bbf54b6f6f8ffdc3fd4a0d91c836dd7e5a135f Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Wed Sep 30 13:08:58 2020 +0200 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Wed Sep 30 13:08:58 2020 +0200 [MSGINA] Allow to pair FriendlyShutDownDlg with 'Server' CORE-17282 A ros specific addition that does not exist on Windows. Default for Server is still the classic shutdown dlg, no change on that. But interested users can manually now create the registry setting "EnforceFriendlyShutdown" REG_DWORD to "1" within "SYSTEM\\CurrentControlSet\\Control\\Windows" to allow overriding the Windows default behavior without relying on changing the product version number, because that would not be side-effect-free. Addendum to 0.4.15-dev-650-g 2edcb58e6550fd6283cf3a7d332ee61849704f3d --- dll/win32/msgina/shutdown.c | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/dll/win32/msgina/shutdown.c b/dll/win32/msgina/shutdown.c index 88f1036d5dd..bc6e97949d6 100644 --- a/dll/win32/msgina/shutdown.c +++ b/dll/win32/msgina/shutdown.c @@ -100,7 +100,6 @@ IsFriendlyUIActive(VOID) HKEY hKey; LONG lRet; - /* Check product version number first */ lRet = RegOpenKeyExW(HKEY_LOCAL_MACHINE, L"SYSTEM\\CurrentControlSet\\Control\\Windows", 0, @@ -109,6 +108,25 @@ IsFriendlyUIActive(VOID) if (lRet != ERROR_SUCCESS) return FALSE; + /* CORE-17282 First check an optional ReactOS specific override, that Windows does not check. + We use this to allow users pairing 'Server'-configuration with FriendlyShutdown. + Otherwise users would have to change CSDVersion or LogonType (side-effects AppCompat) */ + dwValue = 0; + dwSize = sizeof(dwValue); + lRet = RegQueryValueExW(hKey, + L"EnforceFriendlyShutdown", + NULL, + &dwType, + (LPBYTE)&dwValue, + &dwSize); + + if (lRet == ERROR_SUCCESS && dwType == REG_DWORD && dwValue == 0x1) + { + RegCloseKey(hKey); + return TRUE; + } + + /* Check product version number */ dwValue = 0; dwSize = sizeof(dwValue); lRet = RegQueryValueExW(hKey,

1 0

[reactos] 01/01: [BROWSEUI] Fix Edit_BackWord function (#3247)
by Katayama Hirofumi MZ 28 Sep '20

28 Sep '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e1a01de7f7cbd6529b70b… commit e1a01de7f7cbd6529b70bfc00c61b4df1fab82a8 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Sep 28 22:05:14 2020 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Sep 28 22:05:14 2020 +0900 [BROWSEUI] Fix Edit_BackWord function (#3247) Fix and improve Edit_BackWord function (for Ctrl+Back key combination on auto-completion in edit boxes) by using GetStringTypeW. CORE-1419 --- dll/win32/browseui/CAutoComplete.cpp | 30 +++++++++++++----------------- 1 file changed, 13 insertions(+), 17 deletions(-) diff --git a/dll/win32/browseui/CAutoComplete.cpp b/dll/win32/browseui/CAutoComplete.cpp index 008a8185baa..b18956b6547 100644 --- a/dll/win32/browseui/CAutoComplete.cpp +++ b/dll/win32/browseui/CAutoComplete.cpp @@ -287,32 +287,30 @@ static void Edit_BackWord(HWND hwndEdit) iStart = iEnd = 0; SendMessageW(hwndEdit, EM_GETSEL, (WPARAM)&iStart, (LPARAM)&iEnd); - if (iStart != iEnd) + if (iStart != iEnd || iStart < 0) return; - DWORD cchText = GetWindowTextLengthW(hwndEdit); - size_t cb = (cchText + 1) * sizeof(WCHAR); - LPWSTR pszText = (LPWSTR)CoTaskMemAlloc(cb); - if (pszText == NULL) + size_t cchText = GetWindowTextLengthW(hwndEdit); + if (cchText < (size_t)iStart || (INT)cchText <= 0) + return; + + CComHeapPtr<WCHAR> pszText; + if (!pszText.Allocate(cchText + 1)) return; if (GetWindowTextW(hwndEdit, pszText, cchText + 1) <= 0) - { - CoTaskMemFree(pszText); return; - } - for (; 0 < iStart; --iStart) + WORD types[2]; + for (--iStart; 0 < iStart; --iStart) { - WCHAR ch1 = pszText[iStart - 1]; - WCHAR ch2 = pszText[iStart]; - if ((wcschr(L"\\/.:;", ch1) && ch2 && !IsCharSpaceW(ch2)) || - (IsCharSpaceW(ch1) && IsCharAlphaNumericW(ch2))) + GetStringTypeW(CT_CTYPE1, &pszText[iStart - 1], 2, types); + if (((types[0] & C1_PUNCT) && !(types[1] & C1_SPACE)) || + ((types[0] & C1_SPACE) && (types[1] & (C1_ALPHA | C1_DIGIT)))) { SendMessageW(hwndEdit, EM_SETSEL, iStart, iEnd); SendMessageW(hwndEdit, EM_REPLACESEL, TRUE, (LPARAM)L""); - iStart = -1; - break; + return; } } @@ -321,8 +319,6 @@ static void Edit_BackWord(HWND hwndEdit) SendMessageW(hwndEdit, EM_SETSEL, iStart, iEnd); SendMessageW(hwndEdit, EM_REPLACESEL, TRUE, (LPARAM)L""); } - - CoTaskMemFree(pszText); } /*

1 0

[reactos] 01/01: [SHELL32] CoUninitialize only if CoInitialize* is successful
by Katayama Hirofumi MZ 28 Sep '20

28 Sep '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a822eadce6b4f20066fdc… commit a822eadce6b4f20066fdc3b1a36f311d325b0c86 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Sep 28 20:13:28 2020 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Mon Sep 28 20:13:28 2020 +0900 [SHELL32] CoUninitialize only if CoInitialize* is successful Technically CoUninitialize should be called only if CoInitializeEx succeeded (including S_FALSE). CORE-1419 --- dll/win32/shell32/dialogs/dialogs.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dll/win32/shell32/dialogs/dialogs.cpp b/dll/win32/shell32/dialogs/dialogs.cpp index 6996a416076..1e5635cb1d1 100644 --- a/dll/win32/shell32/dialogs/dialogs.cpp +++ b/dll/win32/shell32/dialogs/dialogs.cpp @@ -29,6 +29,7 @@ typedef struct LPCWSTR lpstrTitle; LPCWSTR lpstrDescription; UINT uFlags; + BOOL bCoInited; } RUNFILEDLGPARAMS; typedef BOOL (WINAPI * LPFNOFN) (OPENFILENAMEW *); @@ -549,14 +550,17 @@ static INT_PTR CALLBACK RunDlgProc(HWND hwnd, UINT message, WPARAM wParam, LPARA hwndEdit = ComboInfo.hwndItem; ASSERT(::IsWindow(hwndEdit)); - CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); // SHAutoComplete needs co init + // SHAutoComplete needs co init + prfdp->bCoInited = SUCCEEDED(CoInitializeEx(NULL, COINIT_APARTMENTTHREADED)); + SHAutoComplete(hwndEdit, SHACF_FILESYSTEM | SHACF_FILESYS_ONLY | SHACF_URLALL); SetFocus(hwndCombo); return TRUE; case WM_DESTROY: - CoUninitialize(); + if (prfdp->bCoInited) + CoUninitialize(); break; case WM_COMMAND:

1 0

[reactos] 01/01: [BROWSEUI] Follow-up part 3 of #3242 (6b6f971)
by Katayama Hirofumi MZ 28 Sep '20

28 Sep '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=467feb9996308ea4d3d62… commit 467feb9996308ea4d3d6240a567a8faa7328610c Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Sep 28 10:58:22 2020 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Mon Sep 28 10:58:22 2020 +0900 [BROWSEUI] Follow-up part 3 of #3242 (6b6f971) Also recognize slash, dot, colon, and semicolon. CORE-1419 --- dll/win32/browseui/CAutoComplete.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dll/win32/browseui/CAutoComplete.cpp b/dll/win32/browseui/CAutoComplete.cpp index 1f300bc1a2a..008a8185baa 100644 --- a/dll/win32/browseui/CAutoComplete.cpp +++ b/dll/win32/browseui/CAutoComplete.cpp @@ -304,8 +304,10 @@ static void Edit_BackWord(HWND hwndEdit) for (; 0 < iStart; --iStart) { - if ((pszText[iStart - 1] == L'\\' && pszText[iStart] != 0) || - (IsCharSpaceW(pszText[iStart - 1]) && IsCharAlphaNumericW(pszText[iStart]))) + WCHAR ch1 = pszText[iStart - 1]; + WCHAR ch2 = pszText[iStart]; + if ((wcschr(L"\\/.:;", ch1) && ch2 && !IsCharSpaceW(ch2)) || + (IsCharSpaceW(ch1) && IsCharAlphaNumericW(ch2))) { SendMessageW(hwndEdit, EM_SETSEL, iStart, iEnd); SendMessageW(hwndEdit, EM_REPLACESEL, TRUE, (LPARAM)L"");

1 0

[reactos] 01/01: [BROWSEUI] Follow-up part 2 of #3242 (6b6f971)
by Katayama Hirofumi MZ 28 Sep '20

28 Sep '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=737278276f66192d508c5… commit 737278276f66192d508c5dad9d024f29ee902de9 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Sep 28 10:41:21 2020 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Mon Sep 28 10:41:21 2020 +0900 [BROWSEUI] Follow-up part 2 of #3242 (6b6f971) Don't recognize backslash of the last character. CORE-1419 --- dll/win32/browseui/CAutoComplete.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/win32/browseui/CAutoComplete.cpp b/dll/win32/browseui/CAutoComplete.cpp index 5f4aff54140..1f300bc1a2a 100644 --- a/dll/win32/browseui/CAutoComplete.cpp +++ b/dll/win32/browseui/CAutoComplete.cpp @@ -304,7 +304,7 @@ static void Edit_BackWord(HWND hwndEdit) for (; 0 < iStart; --iStart) { - if (pszText[iStart - 1] == L'\\' || + if ((pszText[iStart - 1] == L'\\' && pszText[iStart] != 0) || (IsCharSpaceW(pszText[iStart - 1]) && IsCharAlphaNumericW(pszText[iStart]))) { SendMessageW(hwndEdit, EM_SETSEL, iStart, iEnd);

1 0

[reactos] 01/01: [BROWSEUI] Follow-up of #3242 (6b6f971)
by Katayama Hirofumi MZ 28 Sep '20

28 Sep '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9812bce2713b9620ac318… commit 9812bce2713b9620ac318c3d4bee5934147264fd Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Sep 28 10:14:36 2020 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Mon Sep 28 10:14:36 2020 +0900 [BROWSEUI] Follow-up of #3242 (6b6f971) Recognize backslashes in Ctrl+Back. CORE-1419 --- dll/win32/browseui/CAutoComplete.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dll/win32/browseui/CAutoComplete.cpp b/dll/win32/browseui/CAutoComplete.cpp index e984dab2f17..5f4aff54140 100644 --- a/dll/win32/browseui/CAutoComplete.cpp +++ b/dll/win32/browseui/CAutoComplete.cpp @@ -304,7 +304,8 @@ static void Edit_BackWord(HWND hwndEdit) for (; 0 < iStart; --iStart) { - if (IsCharSpaceW(pszText[iStart - 1]) && IsCharAlphaNumericW(pszText[iStart])) + if (pszText[iStart - 1] == L'\\' || + (IsCharSpaceW(pszText[iStart - 1]) && IsCharAlphaNumericW(pszText[iStart]))) { SendMessageW(hwndEdit, EM_SETSEL, iStart, iEnd); SendMessageW(hwndEdit, EM_REPLACESEL, TRUE, (LPARAM)L"");

1 0

[reactos] 01/01: [BROWSEUI][SHELL32] Enable Ctrl+Backspace in AutoComplete edit boxes (#3242)
by Katayama Hirofumi MZ 28 Sep '20

28 Sep '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6b6f9719398ea56f93b31… commit 6b6f9719398ea56f93b31db5234b4b799af723ec Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Sep 28 09:27:01 2020 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Sep 28 09:27:01 2020 +0900 [BROWSEUI][SHELL32] Enable Ctrl+Backspace in AutoComplete edit boxes (#3242) The key combination Ctrl+Back is well working in auto-completion edit boxes. CORE-1419 --- dll/win32/browseui/CAutoComplete.cpp | 51 +++++++++++++++++++++++++++++++++++ dll/win32/shell32/dialogs/dialogs.cpp | 7 +++++ 2 files changed, 58 insertions(+) diff --git a/dll/win32/browseui/CAutoComplete.cpp b/dll/win32/browseui/CAutoComplete.cpp index 8bf5b152e84..e984dab2f17 100644 --- a/dll/win32/browseui/CAutoComplete.cpp +++ b/dll/win32/browseui/CAutoComplete.cpp @@ -3,6 +3,7 @@ * * Copyright 2004 Maxime Belleng� <maxime.bellenge(a)laposte.net> * Copyright 2009 Andrew Hill + * Copyright 2020 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -279,6 +280,48 @@ HRESULT WINAPI CAutoComplete::SetOptions(DWORD dwFlag) return hr; } +/* Edit_BackWord --- Delete previous word in text box */ +static void Edit_BackWord(HWND hwndEdit) +{ + INT iStart, iEnd; + iStart = iEnd = 0; + SendMessageW(hwndEdit, EM_GETSEL, (WPARAM)&iStart, (LPARAM)&iEnd); + + if (iStart != iEnd) + return; + + DWORD cchText = GetWindowTextLengthW(hwndEdit); + size_t cb = (cchText + 1) * sizeof(WCHAR); + LPWSTR pszText = (LPWSTR)CoTaskMemAlloc(cb); + if (pszText == NULL) + return; + + if (GetWindowTextW(hwndEdit, pszText, cchText + 1) <= 0) + { + CoTaskMemFree(pszText); + return; + } + + for (; 0 < iStart; --iStart) + { + if (IsCharSpaceW(pszText[iStart - 1]) && IsCharAlphaNumericW(pszText[iStart])) + { + SendMessageW(hwndEdit, EM_SETSEL, iStart, iEnd); + SendMessageW(hwndEdit, EM_REPLACESEL, TRUE, (LPARAM)L""); + iStart = -1; + break; + } + } + + if (iStart == 0) + { + SendMessageW(hwndEdit, EM_SETSEL, iStart, iEnd); + SendMessageW(hwndEdit, EM_REPLACESEL, TRUE, (LPARAM)L""); + } + + CoTaskMemFree(pszText); +} + /* Window procedure for autocompletion */ @@ -407,6 +450,14 @@ LRESULT APIENTRY CAutoComplete::ACEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM }; break; case VK_BACK: + { + if (GetKeyState(VK_CONTROL) < 0) // Ctrl+Backspace + { + Edit_BackWord(hwnd); + return 0; + } + } + // FALL THROUGH case VK_DELETE: { if ((! *hwndText) && (pThis->options & ACO_AUTOSUGGEST)) diff --git a/dll/win32/shell32/dialogs/dialogs.cpp b/dll/win32/shell32/dialogs/dialogs.cpp index aa71de0b1f4..6996a416076 100644 --- a/dll/win32/shell32/dialogs/dialogs.cpp +++ b/dll/win32/shell32/dialogs/dialogs.cpp @@ -547,11 +547,18 @@ static INT_PTR CALLBACK RunDlgProc(HWND hwnd, UINT message, WPARAM wParam, LPARA ComboInfo.cbSize = sizeof(ComboInfo); GetComboBoxInfo(hwndCombo, &ComboInfo); hwndEdit = ComboInfo.hwndItem; + ASSERT(::IsWindow(hwndEdit)); + + CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); // SHAutoComplete needs co init SHAutoComplete(hwndEdit, SHACF_FILESYSTEM | SHACF_FILESYS_ONLY | SHACF_URLALL); SetFocus(hwndCombo); return TRUE; + case WM_DESTROY: + CoUninitialize(); + break; + case WM_COMMAND: switch (LOWORD(wParam)) {

1 0

[reactos] 01/01: [CMD] Fix substring-substitute regression from commit cdc8e45b (use signed offsets).
by Hermès Bélusca-Maïto 27 Sep '20

27 Sep '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f5ba9de2ee1ab825d9dd1… commit f5ba9de2ee1ab825d9dd108fade57860db0fad79 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Mon Sep 28 00:30:18 2020 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Sep 28 00:41:17 2020 +0200 [CMD] Fix substring-substitute regression from commit cdc8e45b (use signed offsets). --- base/shell/cmd/cmd.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/base/shell/cmd/cmd.c b/base/shell/cmd/cmd.c index a3253026f10..e92426d8cb3 100644 --- a/base/shell/cmd/cmd.c +++ b/base/shell/cmd/cmd.c @@ -1421,21 +1421,19 @@ do { \ } else if (*Src == _T('~')) { - /* %VAR:~[start][,length]% - substring + /* %VAR:~[start][,length]% - Substring. * Negative values are offsets from the end. */ - size_t Start = _tcstol(Src + 1, (PTSTR*)&Src, 0); - size_t End = VarLength; + SSIZE_T Start = _tcstol(Src + 1, (PTSTR*)&Src, 0); + SSIZE_T End = (SSIZE_T)VarLength; if (Start < 0) Start += VarLength; - Start = max(Start, 0); - Start = min(Start, VarLength); + Start = min(max(Start, 0), VarLength); if (*Src == _T(',')) { End = _tcstol(Src + 1, (PTSTR*)&Src, 0); End += (End < 0) ? VarLength : Start; - End = max(End, Start); - End = min(End, VarLength); + End = min(max(End, Start), VarLength); } if (*Src++ != Delim) goto bad_subst;

1 0

[reactos] 01/01: [NTOS] Remove an old hack
by Timo Kreuzer 27 Sep '20

27 Sep '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f2e3e8a1ebd5b5c27ea6f… commit f2e3e8a1ebd5b5c27ea6f155420e7b3764014b11 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Wed Aug 8 12:28:33 2018 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Mon Sep 28 00:27:30 2020 +0200 [NTOS] Remove an old hack --- ntoskrnl/io/iomgr/driver.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/ntoskrnl/io/iomgr/driver.c b/ntoskrnl/io/iomgr/driver.c index 8727c26330f..330a0bf8ed9 100644 --- a/ntoskrnl/io/iomgr/driver.c +++ b/ntoskrnl/io/iomgr/driver.c @@ -1133,9 +1133,6 @@ IopInitializeBootDrivers(VOID) * See PiQueueDeviceAction function */ PnPBootDriversLoaded = TRUE; - - /* In old ROS, the loader list became empty after this point. Simulate. */ - InitializeListHead(&KeLoaderBlock->LoadOrderListHead); } INIT_FUNCTION

1 0

[reactos] 01/01: [NTOS:PS] Fix size handling in ProcessDeviceMap
by Timo Kreuzer 27 Sep '20

27 Sep '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d74037b66657d582e1e26… commit d74037b66657d582e1e26bb94a943e98d28f4517 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sun Sep 27 17:32:27 2020 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Mon Sep 28 00:24:53 2020 +0200 [NTOS:PS] Fix size handling in ProcessDeviceMap If you want to know the details, browse history or use git blame. --- ntoskrnl/ps/query.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/ntoskrnl/ps/query.c b/ntoskrnl/ps/query.c index 5e340c7ccdf..60f440ab9bc 100644 --- a/ntoskrnl/ps/query.c +++ b/ntoskrnl/ps/query.c @@ -564,12 +564,6 @@ NtQueryInformationProcess(IN HANDLE ProcessHandle, /* DOS Device Map */ case ProcessDeviceMap: - if (ProcessInformationLength < sizeof(PROCESS_DEVICEMAP_INFORMATION)) - { - Status = STATUS_INFO_LENGTH_MISMATCH; - break; - } - if (ProcessInformationLength == sizeof(PROCESS_DEVICEMAP_INFORMATION_EX)) { /* Protect read in SEH */ @@ -601,7 +595,8 @@ NtQueryInformationProcess(IN HANDLE ProcessHandle, } else { - if (ProcessInformationLength != sizeof(PROCESS_DEVICEMAP_INFORMATION)) + /* This has to be the size of the Query union field for x64 compatibility! */ + if (ProcessInformationLength != RTL_FIELD_SIZE(PROCESS_DEVICEMAP_INFORMATION, Query)) { Status = STATUS_INFO_LENGTH_MISMATCH; break;

1 0

[reactos] 01/01: [CMD] Cleanup all batch contexts if the execution loop stopped due to EXIT.
by Hermès Bélusca-Maïto 27 Sep '20

27 Sep '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=895dccd4ac7cc9c8dcb4a… commit 895dccd4ac7cc9c8dcb4a679e34fe0b50c560b2e Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Sep 27 20:24:38 2020 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Sep 27 20:26:36 2020 +0200 [CMD] Cleanup all batch contexts if the execution loop stopped due to EXIT. --- base/shell/cmd/batch.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/base/shell/cmd/batch.c b/base/shell/cmd/batch.c index 671be4189d9..36600cd0720 100644 --- a/base/shell/cmd/batch.c +++ b/base/shell/cmd/batch.c @@ -478,6 +478,11 @@ INT Batch(LPTSTR fullname, LPTSTR firstword, LPTSTR param, PARSED_COMMAND *Cmd) ret = ExecuteCommandWithEcho(Cmd); FreeCommand(Cmd); } + if (bExit) + { + /* Stop all execution */ + ExitAllBatches(); + } /* Perform top-level batch cleanup */ if (!bc || bTopLevel)

1 0

[reactos] 01/01: [SHELL32] Fix usage of return value
by Timo Kreuzer 27 Sep '20

27 Sep '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=68cb54dc58251d7ee8cab… commit 68cb54dc58251d7ee8cabebe42421a44796eba9c Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sun Sep 27 17:30:18 2020 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sun Sep 27 19:58:21 2020 +0200 [SHELL32] Fix usage of return value --- dll/win32/shell32/shellmenu/CStartMenu.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/win32/shell32/shellmenu/CStartMenu.cpp b/dll/win32/shell32/shellmenu/CStartMenu.cpp index 8831ab860b5..d701013f160 100644 --- a/dll/win32/shell32/shellmenu/CStartMenu.cpp +++ b/dll/win32/shell32/shellmenu/CStartMenu.cpp @@ -517,7 +517,7 @@ RSHELL_CStartMenu_CreateInstance(REFIID riid, void **ppv) pCallback->AddRef(); // CreateInstance returns object with 0 ref count */ pCallback->Initialize(pShellMenu, pBandSite, pDeskBar); - pShellMenu->Initialize(pCallback, (UINT) -1, 0, SMINIT_TOPLEVEL | SMINIT_VERTICAL); + hr = pShellMenu->Initialize(pCallback, (UINT) -1, 0, SMINIT_TOPLEVEL | SMINIT_VERTICAL); if (FAILED_UNEXPECTEDLY(hr)) return hr;

1 0

[reactos] 03/03: [CMD] Fix batch/CALL arguments initialization.
by Hermès Bélusca-Maïto 27 Sep '20

27 Sep '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f0fccb752fe41ce4e2c25… commit f0fccb752fe41ce4e2c2529b07a2493ddbc0bfb5 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Aug 9 21:13:13 2020 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Sep 27 19:06:10 2020 +0200 [CMD] Fix batch/CALL arguments initialization. - Move initialization of bc->raw_params also in BatchParams(). - The bc->raw_params, i.e. the unparsed batch/CALL parameters obtained with %*, has any leading and trailing whitespace trimmed (since Windows 2000+). --- base/shell/cmd/batch.c | 93 ++++++++++++++++++++++++++++++++------------------ 1 file changed, 59 insertions(+), 34 deletions(-) diff --git a/base/shell/cmd/batch.c b/base/shell/cmd/batch.c index 714480cb6c7..671be4189d9 100644 --- a/base/shell/cmd/batch.c +++ b/base/shell/cmd/batch.c @@ -112,55 +112,85 @@ FindArg( /* - * Batch_params builds a parameter list in newly allocated memory. - * The parameters consist of null terminated strings with a final - * NULL character signalling the end of the parameters. - * + * Builds the batch parameter list in newly allocated memory. + * The parameters consist of NULL terminated strings with a + * final NULL character signalling the end of the parameters. */ -static LPTSTR BatchParams(LPTSTR s1, LPTSTR s2) +static BOOL +BatchParams( + IN PCTSTR Arg0, + IN PCTSTR Args, + OUT PTSTR* RawParams, + OUT PTSTR* ParamList) { - LPTSTR dp = (LPTSTR)cmd_alloc((_tcslen(s1) + _tcslen(s2) + 3) * sizeof (TCHAR)); + PTSTR dp; + SIZE_T len; + + *RawParams = NULL; + *ParamList = NULL; + + /* Make a raw copy of the parameters, but trim any leading and trailing whitespace */ + // Args += _tcsspn(Args, _T(" \t")); + while (_istspace(*Args)) + ++Args; + dp = (PTSTR)Args + _tcslen(Args); + while ((dp > Args) && _istspace(*(dp - 1))) + --dp; + len = dp - Args; + *RawParams = (PTSTR)cmd_alloc((len + 1)* sizeof(TCHAR)); + if (!*RawParams) + { + WARN("Cannot allocate memory for RawParams!\n"); + error_out_of_memory(); + return FALSE; + } + _tcsncpy(*RawParams, Args, len); + (*RawParams)[len] = _T('\0'); + + /* Parse the parameters as well */ + Args = *RawParams; - /* JPP 20-Jul-1998 added error checking */ - if (dp == NULL) + *ParamList = (PTSTR)cmd_alloc((_tcslen(Arg0) + _tcslen(Args) + 3) * sizeof(TCHAR)); + if (!*ParamList) { - WARN("Cannot allocate memory for dp!\n"); + WARN("Cannot allocate memory for ParamList!\n"); error_out_of_memory(); - return NULL; + cmd_free(*RawParams); + *RawParams = NULL; + return FALSE; } - if (s1 && *s1) + dp = *ParamList; + + if (Arg0 && *Arg0) { - s1 = _stpcpy (dp, s1); - *s1++ = _T('\0'); + dp = _stpcpy(dp, Arg0); + *dp++ = _T('\0'); } - else - s1 = dp; - while (*s2) + while (*Args) { BOOL inquotes = FALSE; /* Find next parameter */ - while (_istspace(*s2) || (*s2 && _tcschr(STANDARD_SEPS, *s2))) - s2++; - if (!*s2) + while (_istspace(*Args) || (*Args && _tcschr(STANDARD_SEPS, *Args))) + ++Args; + if (!*Args) break; /* Copy it */ do { - if (!inquotes && (_istspace(*s2) || _tcschr(STANDARD_SEPS, *s2))) + if (!inquotes && (_istspace(*Args) || _tcschr(STANDARD_SEPS, *Args))) break; - inquotes ^= (*s2 == _T('"')); - *s1++ = *s2++; - } while (*s2); - *s1++ = _T('\0'); + inquotes ^= (*Args == _T('"')); + *dp++ = *Args++; + } while (*Args); + *dp++ = _T('\0'); } + *dp = _T('\0'); - *s1 = _T('\0'); - - return dp; + return TRUE; } /* @@ -368,14 +398,9 @@ INT Batch(LPTSTR fullname, LPTSTR firstword, LPTSTR param, PARSED_COMMAND *Cmd) for (i = 0; i < 10; i++) bc->shiftlevel[i] = i; - /* Parse the parameters and make a raw copy of them without modifications */ - bc->params = BatchParams(firstword, param); - bc->raw_params = cmd_dup(param); - if (bc->raw_params == NULL) - { - error_out_of_memory(); + /* Parse the batch parameters */ + if (!BatchParams(firstword, param, &bc->raw_params, &bc->params)) return 1; - } /* If we are calling from inside a FOR, hide the FOR variables */ saved_fc = fc;

1 0

[reactos] 02/03: [CMD] CALL: Fix the implementation of the CALL command, make it more compatible with Windows' CMD.
by Hermès Bélusca-Maïto 27 Sep '20

27 Sep '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=37bda06eedb789df05c5a… commit 37bda06eedb789df05c5a318460341e41ca48655 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Jul 26 20:30:21 2020 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Sep 27 19:05:23 2020 +0200 [CMD] CALL: Fix the implementation of the CALL command, make it more compatible with Windows' CMD. - Fail if no parameter is provided. - The "CALL :label args..." syntax is available only when command extensions are enabled. Fail if this syntax is used outside of a batch context. - Reparse the CALL command parameter with the command parser, in order to accurately parse and interpret it as a possible command (including escape carets, etc...) and not duplicate the logic. ** CURRENT Windows' CMD-compatibility LIMITATION ** (may be lifted in a "ROS-specific" running mode of CMD): only allow standard commands to be specified as parameter of the CALL command. This reparsing behaviour can be observed in Windows' CMD, by dumping the interpreted commands after enabling the cmd!fDumpParse flag from a debugger (using public symbols). - When reparsing, we should tell the parser to NOT ignore lines that start with a colon, because in this situation these are to be considered as valid "commands" (for parsing "CALL :label"). * For Windows' CMD-compatibility, the remaining escape carets need to be doubled again so that, after the new parser step, they are escaped back to their original form. But then we also need to do it the "buggy" way à la Windows, where carets in quotes are doubled either! However when being re-parsed, since they are in quotes they remain doubled!! (see "Phase 6" in https://stackoverflow.com/a/4095133/13530036 ). * A MSCMD_CALL_QUIRKS define allows to disable this buggy behaviour, and instead tell the parser to not not interpret the escape carets. - When initializing a new batch context when the "CALL :label" syntax is used, ensure that we reuse the same batch file position pointer as its parent, so as to have correct call label ordering behaviour. That is, :label ECHO hi CALL :label :label ECHO bye should display: hi bye bye i.e., the CALL calls the second label instead of the first one (and thus entering into an infinite loop). Finally, the "CALL :label" syntax strips the first ':' away, so, as a side-effect, the command "CALL :EOF" fails (otherwise it would perform a "GOTO :EOF" and succeeds), while "CALL ::EOF" succeeds. Fixes some cmd_winetests. --- base/shell/cmd/batch.c | 33 ++++++++- base/shell/cmd/call.c | 185 +++++++++++++++++++++++++++++++++++++++++------- base/shell/cmd/cmd.h | 3 + base/shell/cmd/goto.c | 19 ++++- base/shell/cmd/parser.c | 12 +++- 5 files changed, 218 insertions(+), 34 deletions(-) diff --git a/base/shell/cmd/batch.c b/base/shell/cmd/batch.c index 1876b84deab..714480cb6c7 100644 --- a/base/shell/cmd/batch.c +++ b/base/shell/cmd/batch.c @@ -399,9 +399,28 @@ INT Batch(LPTSTR fullname, LPTSTR firstword, LPTSTR param, PARSED_COMMAND *Cmd) #endif } - /* Check if this is a "CALL :label" */ - if (*firstword == _T(':')) - ret = cmd_goto(firstword); + /* If this is a "CALL :label args ...", call a subroutine of + * the current batch file, only if extensions are enabled. */ + if (bEnableExtensions && (*firstword == _T(':'))) + { + LPTSTR expLabel; + + /* Position at the place of the parent file (which is the same as the caller) */ + bc->mempos = (bc->prev ? bc->prev->mempos : 0); + + /* + * Jump to the label. Strip the label's colon; as a side-effect + * this will forbid "CALL :EOF"; however "CALL ::EOF" will work! + */ + bc->current = Cmd; + ++firstword; + + /* Expand the label only! (simulate a GOTO command as in Windows' CMD) */ + expLabel = DoDelayedExpansion(firstword); + ret = cmd_goto(expLabel ? expLabel : firstword); + if (expLabel) + cmd_free(expLabel); + } /* If we have created a new context, don't return * until this batch file has completed. */ @@ -548,8 +567,16 @@ LPTSTR ReadBatchLine(VOID) TRACE("ReadBatchLine(): textline: \'%s\'\n", debugstr_aw(textline)); +#if 1 + // + // FIXME: This is redundant, but keep it for the moment until we correctly + // hande the end-of-file situation here, in ReadLine() and in the parser. + // (In an EOF, the previous BatchGetString() call will return FALSE but + // we want not to run the ExitBatch() at first, but wait later to do it.) + // if (textline[_tcslen(textline) - 1] != _T('\n')) _tcscat(textline, _T("\n")); +#endif return textline; } diff --git a/base/shell/cmd/call.c b/base/shell/cmd/call.c index 55f39d086f1..c9b11937492 100644 --- a/base/shell/cmd/call.c +++ b/base/shell/cmd/call.c @@ -30,58 +30,189 @@ #include "precomp.h" +/* Enable this define for "buggy" Windows' CMD CALL-command compatibility */ +#define MSCMD_CALL_QUIRKS + + /* * Perform CALL command. */ - INT cmd_call(LPTSTR param) { - TCHAR line[CMDLINE_LENGTH + 1]; - TCHAR *first; - BOOL bInQuote = FALSE; + PARSED_COMMAND* Cmd = NULL; + BOOL bOldIgnoreParserComments; +#ifndef MSCMD_CALL_QUIRKS + BOOL bOldHandleContinuations; +#else + SIZE_T nNumCarets; +#endif + PTSTR first; + + TRACE("cmd_call(\'%s\')\n", debugstr_aw(param)); - TRACE ("cmd_call: (\'%s\')\n", debugstr_aw(param)); - if (!_tcsncmp (param, _T("/?"), 2)) + if (!_tcsncmp(param, _T("/?"), 2)) { - ConOutResPaging(TRUE,STRING_CALL_HELP); + ConOutResPaging(TRUE, STRING_CALL_HELP); return 0; } - /* Do a second round of %-variable substitutions */ - if (!SubstituteVars(param, line, _T('%'))) + /* Fail if no command or label has been provided */ + if (*param == _T('\0')) return (nErrorLevel = 1); - /* Find start and end of first word */ - first = line; - while (_istspace(*first)) - first++; + /* Ignore parser comments (starting with a colon) */ + bOldIgnoreParserComments = bIgnoreParserComments; + bIgnoreParserComments = FALSE; + +#ifndef MSCMD_CALL_QUIRKS + /* Disable parsing of escape carets */ + bOldHandleContinuations = bHandleContinuations; + bHandleContinuations = FALSE; + first = param; +#else + /* + * As the original escape carets have been dealt with during the first + * command parsing step, the remaining ones need to be doubled so that + * they can again survive the new parsing step done below. + * But do it the Windows' CMD "buggy" way: **all** carets are doubled, + * even those inside quotes. However, this causes carets inside quotes + * to remain doubled after the parsing step... + */ + + /* Count all the carets */ + nNumCarets = 0; + first = param; + while (first) + { + first = _tcschr(first, _T('^')); + if (first) + { + ++nNumCarets; + ++first; + } + } + + /* Re-allocate a large enough parameter string if needed */ + if (nNumCarets > 0) + { + PTCHAR Src, Dest, End; + + // TODO: Improvement: Use the scratch TempBuf if the string is not too long. + first = cmd_alloc((_tcslen(param) + nNumCarets + 1) * sizeof(TCHAR)); + if (!first) + { + WARN("Cannot allocate memory for new CALL parameter string!\n"); + error_out_of_memory(); + return (nErrorLevel = 1); + } + + /* Copy the parameter string and double the escape carets */ + Src = param; + Dest = first; + while (*Src) + { + if (*Src != _T('^')) + { + /* Copy everything before the next caret (or the end of the string) */ + End = _tcschr(Src, _T('^')); + if (!End) + End = Src + _tcslen(Src); + memcpy(Dest, Src, (End - Src) * sizeof(TCHAR)); + Dest += End - Src; + Src = End; + continue; + } + + /* Copy the original caret and double it */ + *Dest++ = *Src; + *Dest++ = *Src++; + } + *Dest = _T('\0'); + } + else + { + first = param; + } +#endif + + /* + * Reparse the CALL parameter string as a command. + * Note that this will trigger a second round of %-variable substitutions. + */ + Cmd = ParseCommand(first); + + /* Restore the global parsing state */ +#ifndef MSCMD_CALL_QUIRKS + bHandleContinuations = bOldHandleContinuations; +#endif + bIgnoreParserComments = bOldIgnoreParserComments; + + /* + * If no command is there, yet no error occurred, this means that + * a whitespace label was given. Do not consider this as a failure. + */ + if (!Cmd && !bParseError) + { +#ifdef MSCMD_CALL_QUIRKS + if (first != param) + cmd_free(first); +#endif + return (nErrorLevel = 0); + } + + /* Reset bParseError so as to continue running afterwards */ + bParseError = FALSE; - for (param = first; *param; param++) + /* + * Otherwise, if no command is there because a parse error occurred, + * or if this an unsupported command: not a standard one, including + * FOR and IF, fail and bail out. + */ + if (!Cmd || (Cmd->Type == C_FOR) || (Cmd->Type == C_IF) || + ((Cmd->Type != C_COMMAND) && (Cmd->Type != C_REM))) { - if (!bInQuote && (_istspace(*param) || _tcschr(_T(",;="), *param))) - break; - bInQuote ^= (*param == _T('"')); + // FIXME: Localize + ConErrPrintf(_T("%s was unexpected.\n"), first); + +#ifdef MSCMD_CALL_QUIRKS + if (first != param) + cmd_free(first); +#endif + if (Cmd) FreeCommand(Cmd); + return (nErrorLevel = 1); } - /* Separate first word from rest of line */ - memmove(param + 1, param, (_tcslen(param) + 1) * sizeof(TCHAR)); - *param++ = _T('\0'); +#ifdef MSCMD_CALL_QUIRKS + if (first != param) + cmd_free(first); +#endif + + first = Cmd->Command.First; + param = Cmd->Command.Rest; - if (*first == _T(':') && bc) + /* "CALL :label args ..." - Call a subroutine of the current batch file, only if extensions are enabled */ + if (bEnableExtensions && (*first == _T(':'))) { INT ret; - /* CALL :label - call a subroutine of the current batch file */ - while (*param == _T(' ')) - param++; + /* A batch context must be present */ + if (!bc) + { + // FIXME: Localize + ConErrPuts(_T("Invalid attempt to call batch label outside of batch script.\n")); + FreeCommand(Cmd); + return (nErrorLevel = 1); + } ret = Batch(bc->BatchFilePath, first, param, NULL); nErrorLevel = (ret != 0 ? ret : nErrorLevel); - - return nErrorLevel; + } + else + { + nErrorLevel = DoCommand(first, param, NULL); } - nErrorLevel = DoCommand(first, param, NULL); + FreeCommand(Cmd); return nErrorLevel; } diff --git a/base/shell/cmd/cmd.h b/base/shell/cmd/cmd.h index bb2221fb23d..0812596719b 100644 --- a/base/shell/cmd/cmd.h +++ b/base/shell/cmd/cmd.h @@ -424,6 +424,9 @@ VOID ParseErrorEx(IN PCTSTR s); extern BOOL bParseError; extern TCHAR ParseLine[CMDLINE_LENGTH]; +extern BOOL bIgnoreParserComments; +extern BOOL bHandleContinuations; + /* Prototypes from PATH.C */ INT cmd_path (LPTSTR); diff --git a/base/shell/cmd/goto.c b/base/shell/cmd/goto.c index 5174b62417f..777963344a2 100644 --- a/base/shell/cmd/goto.c +++ b/base/shell/cmd/goto.c @@ -41,7 +41,24 @@ INT cmd_goto(LPTSTR param) TRACE("cmd_goto(\'%s\')\n", debugstr_aw(param)); - if (!_tcsncmp(param, _T("/?"), 2)) + /* + * Keep the help message handling here too. + * This allows us to reproduce the Windows' CMD "bug" + * (from a batch script): + * + * SET label=/? + * CALL :%%label%% + * + * calls GOTO help, due to how CALL :label functionality + * is internally implemented. + * + * See https://stackoverflow.com/q/31987023/13530036 + * for more details. + * + * Note that the choice of help parsing forbids + * any label containing '/?' in it. + */ + if (_tcsstr(param, _T("/?"))) { ConOutResPaging(TRUE, STRING_GOTO_HELP1); return 0; diff --git a/base/shell/cmd/parser.c b/base/shell/cmd/parser.c index 1680c5be4d8..29797bf36ae 100644 --- a/base/shell/cmd/parser.c +++ b/base/shell/cmd/parser.c @@ -93,6 +93,9 @@ static BOOL bLineContinuations; static PTCHAR ParsePos; static PTCHAR OldParsePos; +BOOL bIgnoreParserComments = TRUE; +BOOL bHandleContinuations = TRUE; + static TCHAR CurrentToken[CMDLINE_LENGTH]; static TOK_TYPE CurrentTokenType = TOK_END; #ifndef MSCMD_PARSER_BUGS @@ -206,6 +209,9 @@ restart: if (!ReadLine(ParseLine, TRUE)) { /* ^C pressed, or line was too long */ + // + // FIXME: Distinguish with respect to BATCH end of file !! + // bParseError = TRUE; } else @@ -445,7 +451,7 @@ ParseToken( IN TCHAR ExtraEnd OPTIONAL, IN PCTSTR Separators OPTIONAL) { - return ParseTokenEx(0, ExtraEnd, Separators, TRUE); + return ParseTokenEx(0, ExtraEnd, Separators, bHandleContinuations); } @@ -1294,7 +1300,7 @@ ParseCommandBinaryOp( if (OpType == C_OP_LOWEST) // i.e. CP_MULTI { /* Ignore any parser-level comments */ - if (*CurrentToken == _T(':')) + if (bIgnoreParserComments && (*CurrentToken == _T(':'))) { /* Ignore the rest of the line, including line continuations */ while (ParseToken(0, NULL) != TOK_END) @@ -1445,7 +1451,7 @@ ParseCommandOp( /* Parse the prefix "quiet" operator '@' as a separate command. * Thus, @@foo@bar is parsed as: '@', '@', 'foo@bar'. */ - ParseTokenEx(_T('@'), _T('('), STANDARD_SEPS, TRUE); + ParseTokenEx(_T('@'), _T('('), STANDARD_SEPS, bHandleContinuations); return ParseCommandBinaryOp(OpType); }

1 0

[reactos] 01/03: [CMD_ROSTEST] Add tests for CALL label parsing, and for CALL and GOTO behaviour.
by Hermès Bélusca-Maïto 27 Sep '20

27 Sep '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4f4af5d271551859cfed8… commit 4f4af5d271551859cfed84f1817aead9530d32bc Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Mon Jul 27 01:23:13 2020 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Sep 27 19:04:51 2020 +0200 [CMD_ROSTEST] Add tests for CALL label parsing, and for CALL and GOTO behaviour. Tests adapted from https://stackoverflow.com/q/31987023/13530036 and from https://stackoverflow.com/a/38938416/13530036 . - Test when CALL with a label containing /? actually calls GOTO's help, and test when CALL's help is displayed instead. - Test when CALL with a label containing /?, but specified by variables, do NOT trigger GOTO's or CALL's help. - Test the effect of the presence of escape carets in CALL label string. - Test that CALL indeed supports double delayed expansion. Adapted from https://stackoverflow.com/a/31990563/13530036 . --- modules/rostests/win32/cmd/test_goto_call.cmd | 271 +++++++++++++++++++++- modules/rostests/win32/cmd/test_goto_call.cmd.exp | 46 ++++ 2 files changed, 316 insertions(+), 1 deletion(-) diff --git a/modules/rostests/win32/cmd/test_goto_call.cmd b/modules/rostests/win32/cmd/test_goto_call.cmd index d2356a1b447..3d5fac295d5 100644 --- a/modules/rostests/win32/cmd/test_goto_call.cmd +++ b/modules/rostests/win32/cmd/test_goto_call.cmd @@ -54,10 +54,71 @@ goto :EOF :: and the label name, as well as leading and trailing whitespace. :@tab@continue@space@@space@ +:: CALL does an extra round of variable substitution. + +:: Existing labels (see below) +set VAR=TOTO +call :dest%VAR% +call :dest%%VAR%% +call :dest!VAR! +call :dest!!VAR!! + +set VAR=1 +call :dest%VAR% +call :dest%%VAR%% +call :dest!VAR! +call :dest!!VAR!! + +:: Exercise different whitespace separations +call :dest1@space@@tab@ a b c +call @space@:dest1@space@@space@ + +:: Similar to GOTO, whitespace between ':' and the label name parameter are NOT ignored. +call :setError 0 +call @space@:@space@dest1@space@@space@ +if %errorlevel% equ 0 (echo Unexpected: CALL did not fail^^!) else echo OK + +:: Only GOTO understands '+' instead of ':'. +:: Here '+dest1' is understood as a (non-existing) command. +call :setError 0 +call @space@+dest1@space@@space@ +if %errorlevel% equ 0 (echo Unexpected: CALL did not fail^^!) else echo OK + + +:: Calling a label with escape carets. +call :la^^bel1 :: Jumping to a label with escape carets. goto :la^^bel2 + +:: Label with percents (should not be called) +:dest%%VAR%% +echo Unexpected CALL/GOTO jump^^! + +:: Valid label (called from the variable substitution tests above) +:destTOTO +echo Hi there^^! +:: We exit this CALL invocation +goto :EOF + +:: Valid label with arbitrary first character before ':' +:: (not just '@' as supposed by cmd_winetests!) +?:de^st1 +echo goto with unrelated first character, and escape carets worked +echo Params: '%0', '%1', '%2', '%3' +:: We exit this CALL invocation +goto :EOF + + +:: Label with escape carets +:la^bel1 +echo Unexpected CALL jump^^! +:la^^bel1 +echo CALL with escape caret worked +:: We exit this CALL invocation +goto :EOF + :la^bel2 echo Unexpected GOTO jump^^! :la^^bel2 @@ -117,6 +178,17 @@ echo --------- Testing :EOF support --------- :: Use an auxiliary CMD file to test GOTO :EOF mkdir foobar && cd foobar +:: This CALL will fail: :EOF is indeed a reserved label for GOTO only. +call :setError 0 +call :EOF +if %errorlevel% equ 0 (echo Unexpected: CALL :EOF did not fail^^!) else echo OK + +:: This CALL will succeed silently: only the first ':' of ::EOF is stripped, +:: thus calling in a new batch context GOTO :EOF. +call :setError 0 +call ::EOF +if %errorlevel% neq 0 (echo Unexpected: CALL ::EOF did fail^^!) else echo OK + :: GOTO :EOF is available only if commands extensions are enabled echo @echo off> tmp.cmd echo setlocal disableextensions>> tmp.cmd @@ -366,7 +438,7 @@ echo --------- Testing EXIT within IF --------- :: Use a CALL context, and we will only check EXIT /B. call :doExitIfTest 1 call :doExitIfTest 2 -goto :finished +goto :continue :doExitIfTest if %1==1 ( @@ -382,6 +454,203 @@ echo You won't see this^^! exit /b +:: +:: Next suite of tests. +:: +:continue + +echo --------- Testing CALL (triggers GOTO /?) --------- + +:: +:: Test that shows that CALL :label with the label name containing /? +:: at delayed time, internally calls GOTO, and will end up calling GOTO /?, +:: then jumps to the next command. +:: +:: Adapted from https://stackoverflow.com/q/31987023/13530036 +:: and from https://stackoverflow.com/a/38938416/13530036 +:: The author of this test calls that "anonymous functions". +:: +set "label=/?" + +:: Test 1: GOTO /? will be called. +:: Since it is expected that the code below the CALL will also be called in +:: its context, but we want its output to be redirected to STDOUT, we use a +:: different redirection file so that it does not go into the tmp.txt file. +echo --- Direct label, redirection + +:: Use an auxiliary CMD file +mkdir foobar && cd foobar + +:: Call the label and redirect STDOUT to a file for later filtering. +call :%%label%% argument > tmp.txt +:: The following commands are called also within the CALL context. +:: The message will be displayed both in the CALL context, and in the main one. +echo Test message -- '%0','%*'>> tmpMsg.txt +:: Within the CALL context, this is the expected value of %0. Quit early. +if "%0" == ":/?" ( + echo Arguments: '%*'>> tmpMsg.txt + exit /B +) + +:: Back to the main context. +:: Display the redirected messages, filtering out the batch file name. +for /f "delims=" %%x in (tmpMsg.txt) do ( + set "msg=%%x" + echo !msg:%0=! +) + +:: Check whether CALL displayed GOTO help or CALL help. +:: We differentiate between both, because GOTO /? mentions CALL /?, but CALL +:: help does not mention GOTO, and contains the substring "CALL [" (part of the +:: syntax example) that allows to discriminate between both cases. +find "GOTO" tmp.txt > NUL && echo OK, GOTO help.|| echo Unexpected, no GOTO help^^! +find "CALL [" tmp.txt > NUL && echo Unexpected CALL help^^! + +:: Cleanup +del tmp.txt tmpMsg.txt > NUL + +:: Test 2: CALL /? will be called if piping. +echo --- Direct label, piping + +call :%%label%% argument | (find "CALL [" > NUL && echo OK, CALL help.|| echo Unexpected, no CALL help^^!) +echo Test message -- '%0','%*'>> tmpMsg.txt +if "%0" == ":/?" ( + echo Arguments: '%*'>> tmpMsg.txt + exit /B +) + +:: Back to the main context. +:: Display the redirected messages, filtering out the batch file name. +for /f "delims=" %%x in (tmpMsg.txt) do ( + set "msg=%%x" + echo !msg:%0=! +) + +:: Cleanup +del tmpMsg.txt > NUL +cd .. & rd /s/q foobar + + +:: +:: Repeat the same tests as above, but now with a slightly different label. +:: +echo --------- Testing CALL with escape carets (triggers GOTO /?) --------- + +set "help=^ /? ^^^^arg" + +:: Test 1: GOTO /? will be called. +:: See the explanations in the previous tests above +echo --- Direct label, redirection + +:: Use an auxiliary CMD file +mkdir foobar && cd foobar + +:: Call the label and redirect STDOUT to a file for later filtering. +call :myLabel%%help%% ^^^^argument > tmp.txt +echo Test message -- '%0','%*'>> tmpMsg.txt +if "%0" == ":myLabel /?" ( + echo Arguments: '%*'>> tmpMsg.txt + exit /B +) + +:: Back to the main context. +:: Display the redirected messages, filtering out the batch file name. +for /f "delims=" %%x in (tmpMsg.txt) do ( + set "msg=%%x" + echo !msg:%0=! +) + +:: Check whether CALL displayed GOTO help or CALL help. +find "GOTO" tmp.txt > NUL && echo OK, GOTO help.|| echo Unexpected, no GOTO help^^! +find "CALL [" tmp.txt > NUL && echo Unexpected CALL help^^! + +:: Cleanup +del tmp.txt tmpMsg.txt > NUL + +:: Test 2: CALL /? will be called if piping. +echo --- Direct label, piping + +call :myLabel%%help%% ^^^^argument | (find "CALL [" > NUL && echo OK, CALL help.|| echo Unexpected, no CALL help^^!) +echo Test message -- '%0','%*'>> tmpMsg.txt +if "%0" == ":myLabel /?" ( + echo Arguments: '%*'>> tmpMsg.txt + exit /B +) + +:: Back to the main context. +:: Display the redirected messages, filtering out the batch file name. +for /f "delims=" %%x in (tmpMsg.txt) do ( + set "msg=%%x" + echo !msg:%0=! +) + +:: Cleanup +del tmpMsg.txt > NUL +cd .. & rd /s/q foobar + +goto :continue + +:/? +:myLabel +echo Unexpected CALL or GOTO! Arguments: '%*' +exit /b 0 + + +:: +:: Next suite of tests. +:: +:continue + +:: +:: This test will actually call the label. +:: Adapted from https://stackoverflow.com/a/38938416/13530036 +:: +echo --------- Testing CALL (NOT triggering GOTO /? or CALL /?) --------- + +set "var=/?" +call :sub %%var%% +goto :otherTest + +:sub +echo Arguments: '%*' +exit /b + + +:otherTest +call :sub2 "/?" Hello World +goto :continue + +:sub2 +:: 'args' contains the list of arguments +set "args=%*" +:: !args:%1=! will remove the first argument specified by %1 and keep the rest. +echo %~1 | (find "ECHO [" > NUL && echo OK, ECHO help.|| echo Unexpected, no ECHO help^^!) +echo/ +echo !args:%1=! +exit /b + + +:: +:: Next suite of tests. +:: +:continue + +:: +:: CALL supports double delayed expansion. +:: Test from https://stackoverflow.com/a/31990563/13530036 +:: +echo --------- Testing CALL double delayed expansion --------- + +set "label=myLabel" +set "pointer=^!label^!" +call :!pointer! +goto :finished + +:myLabel +echo It works^^! +exit /b + + :: :: Finished! diff --git a/modules/rostests/win32/cmd/test_goto_call.cmd.exp b/modules/rostests/win32/cmd/test_goto_call.cmd.exp index 3e94300fd76..bf49a971931 100644 --- a/modules/rostests/win32/cmd/test_goto_call.cmd.exp +++ b/modules/rostests/win32/cmd/test_goto_call.cmd.exp @@ -2,6 +2,25 @@ Test GOTO ok --------- Testing CALL within batch --------- Test CALL ok from :test_call +Hi there! +Hi there! +Hi there! +Hi there! +goto with unrelated first character, and escape carets worked +Params: ':dest1', '', '', '' +goto with unrelated first character, and escape carets worked +Params: ':dest1', '', '', '' +goto with unrelated first character, and escape carets worked +Params: ':dest1', '', '', '' +goto with unrelated first character, and escape carets worked +Params: ':dest1', '', '', '' +goto with unrelated first character, and escape carets worked +Params: ':dest1', 'a', 'b', 'c' +goto with unrelated first character, and escape carets worked +Params: ':dest1', '', '', '' +OK +OK +CALL with escape caret worked GOTO with escape caret worked Hi there! Hi there! @@ -15,6 +34,8 @@ OK OK OK OK +OK +OK --------- Testing GOTO within block --------- Block-test 1: Single-line Block-test 2: Multi-line @@ -228,4 +249,29 @@ B --------- Testing EXIT within IF --------- First block Second block +--------- Testing CALL (triggers GOTO /?) --------- +--- Direct label, redirection +Test message -- ':/?','argument' +Arguments: 'argument' +Test message -- '','' +OK, GOTO help. +--- Direct label, piping +OK, CALL help.@space@ +Test message -- '','' +--------- Testing CALL with escape carets (triggers GOTO /?) --------- +--- Direct label, redirection +Test message -- ':myLabel /?','^arg ^argument' +Arguments: '^arg ^argument' +Test message -- '','' +OK, GOTO help. +--- Direct label, piping +OK, CALL help.@space@ +Test message -- '','' +--------- Testing CALL (NOT triggering GOTO /? or CALL /?) --------- +Arguments: '/?' +OK, ECHO help.@space@ + + Hello World +--------- Testing CALL double delayed expansion --------- +It works! --------- Finished --------------

1 0

[reactos] 01/01: [SHLWAPI] Follow-up of #3230 (f496a5f)
by Katayama Hirofumi MZ 27 Sep '20

27 Sep '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fe41acdc11592659f78ba… commit fe41acdc11592659f78ba66180b810eb6ff34c54 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Sep 27 15:47:10 2020 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Sun Sep 27 15:47:10 2020 +0900 [SHLWAPI] Follow-up of #3230 (f496a5f) CORE-9281 --- dll/win32/shlwapi/autocomp.cpp | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/dll/win32/shlwapi/autocomp.cpp b/dll/win32/shlwapi/autocomp.cpp index bc2c3ca3f14..da045a7f309 100644 --- a/dll/win32/shlwapi/autocomp.cpp +++ b/dll/win32/shlwapi/autocomp.cpp @@ -42,7 +42,7 @@ AutoComplete_AddMRU(CComPtr<IObjMgr> pManager, LPCWSTR pszKey) } static HRESULT -IUnknown_SetOptions(CComPtr<IUnknown> punk, DWORD dwACLO) +IUnknown_AddOptions(CComPtr<IUnknown> punk, DWORD dwACLO) { CComPtr<IACList2> pList; HRESULT hr = punk->QueryInterface(IID_IACList2, (LPVOID *)&pList); @@ -52,7 +52,10 @@ IUnknown_SetOptions(CComPtr<IUnknown> punk, DWORD dwACLO) return hr; } - hr = pList->SetOptions(dwACLO); + DWORD dwOptions = 0; + pList->GetOptions(&dwOptions); + dwOptions |= dwACLO; + hr = pList->SetOptions(dwOptions); if (FAILED(hr)) ERR("pList->SetOptions failed: 0x%08lX\n", hr); return hr; @@ -97,8 +100,8 @@ AutoComplete_LoadList(DWORD dwSHACF, DWORD dwACLO) if (SUCCEEDED(hr)) { pManager->Append(pHistory); // Add to the manager - // Set ACLO_* options - IUnknown_SetOptions(pHistory, dwACLO | ACLO_CURRENTDIR | ACLO_MYCOMPUTER); + // Add ACLO_* options + IUnknown_AddOptions(pHistory, dwACLO); } else { @@ -115,8 +118,8 @@ AutoComplete_LoadList(DWORD dwSHACF, DWORD dwACLO) if (SUCCEEDED(hr)) { pManager->Append(pISF); // Add to the manager - // Set ACLO_* options - IUnknown_SetOptions(pISF, dwACLO | ACLO_CURRENTDIR | ACLO_MYCOMPUTER); + // Add ACLO_* options + IUnknown_AddOptions(pISF, dwACLO); } else {

1 0

[reactos] 01/01: [CMD] Make the command-line parser more compatible with Windows' CMD one.
by Hermès Bélusca-Maïto 27 Sep '20

27 Sep '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d029a626e964ad459e346… commit d029a626e964ad459e3462156b958664ae6da776 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sat May 23 00:35:54 2020 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Sep 27 02:27:15 2020 +0200 [CMD] Make the command-line parser more compatible with Windows' CMD one. All these modifications have been verified with Windows' CMD, either by using written cmd_rostests and the existing cmd_winetests, or manually by enabling the flags cmd!fDumpTokens and cmd!fDumpParse (available in the public symbols) and analyzing how the tokens are being parsed, as well as the generated command tree. See also the following links for more details (but remember that these observations have to be double-checked in Windows' CMD!): * Parser rules: https://stackoverflow.com/a/4095133/13530036 * Discussion: https://www.dostips.com/forum/viewtopic.php?f=3&t=8355 * Numbers parsing: https://www.dostips.com/forum/viewtopic.php?t=3758 * Label names vs. GOTO and CALL: https://www.dostips.com/forum/viewtopic.php?f=3&t=3803 and: https://www.dostips.com/forum/viewtopic.php?f=3&t=3803&p=55405#p55405 - Fix REM command parsing. A C_COMMAND-like structure should still be built, so that it can show up during batch command echo. However some specific handling needs to be done, so use instead a new C_REM command type. Escape carets are parsed differently than usual: they are explicitly kept in the command line and don't participate in line continuations. Also, the Windows' CMD behaviour is to discards everything before the last line continuation. - Prefix operator '@' (the "silent" operator) is parsed as a separate command. Thus, the command @@foo@bar is parsed as: '@', '@', 'foo@bar'. - Improve the checks for numbered redirection. For this purpose, we check whether this is a number, that is in first position in the current parsing buffer or is preceded by a whitespace- like separator, including standard command operators (excepting '@' !) and double-quotes. - Empty command blocks, i.e. "( )", standing by themselves, or present in IF or FOR commands, are considered invalid. (The closing parenthesis is considered "unexpected".) - Ignore single closing parenthesis when being outside of command blocks, thus interpreting it as a command, and ignore explicitly everything following on the same line, including line continuations. This very specific situation can happen e.g. while running in batch mode, when jumping to a label present inside a command block. See the code for a thorough explanation. - Detect whether a parenthesized block is not terminated at the end of a command stream (getting a NUL character instead of a newline), and if so, bail out early instead of entering into an infinite loop. - Perform a similar check for the parenthesized list in FOR commands. - Initialize the static 'InsideBlock' value to a known value. - The '&' operator (multi-commmand) is allowed to have an empty RHS. When such situation occurs, turn the CurrentTokenType to TOK_END so as to avoid a parse error later on. - The main body of a IF statement, or its 'else' clause, as well as the main body of a FOR statement, must not be empty, otherwise this is considered a syntax error. If so, call ParseError() that sets the 'bParseError' flag, and forcing all batch execution to stop. --- base/shell/cmd/cmd.c | 17 +- base/shell/cmd/cmd.h | 76 ++- base/shell/cmd/internal.c | 2 +- base/shell/cmd/parser.c | 1205 +++++++++++++++++++++++++++++++++++---------- 4 files changed, 1002 insertions(+), 298 deletions(-) diff --git a/base/shell/cmd/cmd.c b/base/shell/cmd/cmd.c index ba4e90dd05e..a3253026f10 100644 --- a/base/shell/cmd/cmd.c +++ b/base/shell/cmd/cmd.c @@ -664,7 +664,7 @@ ExecuteAsync(PARSED_COMMAND *Cmd) /* Build the parameter string to pass to cmd.exe */ ParamsEnd = _stpcpy(CmdParams, _T("/S/D/C\"")); - ParamsEnd = Unparse(Cmd, ParamsEnd, &CmdParams[CMDLINE_LENGTH - 2]); + ParamsEnd = UnparseCommand(Cmd, ParamsEnd, &CmdParams[CMDLINE_LENGTH - 2]); if (!ParamsEnd) { error_out_of_memory(); @@ -785,12 +785,13 @@ ExecuteCommand( LPTSTR First, Rest; INT Ret = 0; + /* If we don't have any command, or if this is REM, ignore it */ + if (!Cmd || (Cmd->Type == C_REM)) + return 0; /* * Do not execute any command if we are about to exit CMD, or about to * change batch execution context, e.g. in case of a CALL / GOTO / EXIT. */ - if (!Cmd) - return 0; if (bExit || SeenGoto()) return 0; @@ -812,6 +813,8 @@ ExecuteCommand( } cmd_free(First); } + /* Fall through */ + case C_REM: break; case C_QUIET: @@ -842,13 +845,13 @@ ExecuteCommand( Ret = ExecutePipeline(Cmd); break; - case C_IF: - Ret = ExecuteIf(Cmd); - break; - case C_FOR: Ret = ExecuteFor(Cmd); break; + + case C_IF: + Ret = ExecuteIf(Cmd); + break; } UndoRedirection(Cmd->Redirections, NULL); diff --git a/base/shell/cmd/cmd.h b/base/shell/cmd/cmd.h index 93fefe4f4c6..bb2221fb23d 100644 --- a/base/shell/cmd/cmd.h +++ b/base/shell/cmd/cmd.h @@ -259,7 +259,8 @@ INT CommandHistory(LPTSTR param); /* Prototypes for IF.C */ #define IFFLAG_NEGATE 1 /* NOT */ #define IFFLAG_IGNORECASE 2 /* /I - Extended */ -enum { +typedef enum _IF_OPERATOR +{ /** Unary operators **/ /* Standard */ IF_ERRORLEVEL, IF_EXIST, @@ -271,7 +272,8 @@ enum { IF_STRINGEQ, /* == */ /* Extended */ IF_EQU, IF_NEQ, IF_LSS, IF_LEQ, IF_GTR, IF_GEQ -}; +} IF_OPERATOR; + INT ExecuteIf(struct _PARSED_COMMAND *Cmd); /* Prototypes for INTERNAL.C */ @@ -345,42 +347,78 @@ INT CommandMsgbox (LPTSTR); /* These three characters act like spaces to the parser in most contexts */ #define STANDARD_SEPS _T(",;=") -enum { C_COMMAND, C_QUIET, C_BLOCK, C_MULTI, C_OR, C_AND, C_PIPE, C_IF, C_FOR }; +typedef enum _COMMAND_TYPE +{ + /* Standard command */ + C_COMMAND, + /* Quiet operator */ + C_QUIET, + /* Parenthesized block */ + C_BLOCK, + /* Operators */ + C_MULTI, C_OR, C_AND, C_PIPE, + /* Special parsed commands */ + C_FOR, C_IF, C_REM +} COMMAND_TYPE; + typedef struct _PARSED_COMMAND { + /* + * For IF : this is the 'main' case (the 'else' is obtained via SubCmd->Next). + * For FOR: this is the list of all the subcommands in the DO. + */ struct _PARSED_COMMAND *Subcommands; - struct _PARSED_COMMAND *Next; + + struct _PARSED_COMMAND *Next; // Next command(s) in the chain. struct _REDIRECTION *Redirections; - BYTE Type; + COMMAND_TYPE Type; union { struct { - TCHAR *Rest; + PTSTR Rest; TCHAR First[]; } Command; struct - { - BYTE Flags; - BYTE Operator; - TCHAR *LeftArg; - TCHAR *RightArg; - } If; - struct { BYTE Switches; TCHAR Variable; - LPTSTR Params; - LPTSTR List; + PTSTR Params; + PTSTR List; struct _FOR_CONTEXT *Context; } For; + struct + { + BYTE Flags; + IF_OPERATOR Operator; + PTSTR LeftArg; + PTSTR RightArg; + } If; }; } PARSED_COMMAND; -PARSED_COMMAND *ParseCommand(LPTSTR Line); -VOID EchoCommand(PARSED_COMMAND *Cmd); -TCHAR *Unparse(PARSED_COMMAND *Cmd, TCHAR *Out, TCHAR *OutEnd); -VOID FreeCommand(PARSED_COMMAND *Cmd); +PARSED_COMMAND* +ParseCommand( + IN PCTSTR Line); + +VOID +DumpCommand( + IN PARSED_COMMAND* Cmd, + IN ULONG SpacePad); + +VOID +EchoCommand( + IN PARSED_COMMAND* Cmd); + +PTCHAR +UnparseCommand( + IN PARSED_COMMAND* Cmd, + OUT PTCHAR Out, + IN PTCHAR OutEnd); + +VOID +FreeCommand( + IN OUT PARSED_COMMAND* Cmd); VOID ParseErrorEx(IN PCTSTR s); extern BOOL bParseError; diff --git a/base/shell/cmd/internal.c b/base/shell/cmd/internal.c index 87fe7df9d81..2bb99144d4a 100644 --- a/base/shell/cmd/internal.c +++ b/base/shell/cmd/internal.c @@ -694,7 +694,7 @@ INT CommandExit(LPTSTR param) */ INT CommandRem (LPTSTR param) { - if (!_tcsncmp (param, _T("/?"), 2)) + if (_tcsstr(param, _T("/?")) == param) { ConOutResPaging(TRUE,STRING_REM_HELP); } diff --git a/base/shell/cmd/parser.c b/base/shell/cmd/parser.c index 37bc548f2a1..1680c5be4d8 100644 --- a/base/shell/cmd/parser.c +++ b/base/shell/cmd/parser.c @@ -1,12 +1,31 @@ /* - * PARSER.C - command parsing. + * PARSER.C - Command-line Lexical Analyzer/Tokenizer and Parser. */ #include "precomp.h" -/* Enable this define for "buggy" Windows' CMD command echoer compatibility */ +/* + * Defines for enabling different Windows' CMD compatibility behaviours. + */ + +/* Enable this define for command echoer compatibility */ #define MSCMD_ECHO_COMMAND_COMPAT +/* Enable this define for parser quirks (see UnParseToken() for more details) */ +#define MSCMD_PARSER_BUGS + +/* Enable this define for parenthesized blocks parsing quirks */ +// #define MSCMD_PARENS_PARSE_BUGS + +/* Enable this define for redirection parsing quirks */ +#define MSCMD_REDIR_PARSE_BUGS + +/* Enable this define for allowing '&' commands with an empty RHS. + * The default behaviour is to just return the LHS instead. + * See ParseCommandBinaryOp() for details. */ +// #define MSCMD_MULTI_EMPTY_RHS + + /* * Parser debugging support. These flags are global so that their values can be * modified at runtime from a debugger. They correspond to the public Windows' @@ -22,8 +41,10 @@ static const TCHAR OpString[][3] = { _T("&"), _T("||"), _T("&&"), _T("|") }; static const TCHAR RedirString[][3] = { _T("<"), _T(">"), _T(">>") }; -static const TCHAR *const IfOperatorString[] = +static const TCHAR* const IfOperatorString[] = { + /** Unary operators **/ + /* Standard */ _T("errorlevel"), _T("exist"), @@ -33,6 +54,8 @@ static const TCHAR *const IfOperatorString[] = _T("defined"), #define IF_MAX_UNARY IF_DEFINED + /** Binary operators **/ + /* Standard */ _T("=="), @@ -46,12 +69,12 @@ static const TCHAR *const IfOperatorString[] = #define IF_MAX_COMPARISON IF_GEQ }; -static BOOL IsSeparator(TCHAR Char) +static __inline BOOL IsSeparator(TCHAR Char) { - return _istspace(Char) || (Char && _tcschr(STANDARD_SEPS, Char)); + return _istspace(Char) || (Char && !!_tcschr(STANDARD_SEPS, Char)); } -enum +typedef enum _TOK_TYPE { TOK_END, TOK_NORMAL, @@ -59,7 +82,7 @@ enum TOK_REDIRECTION, TOK_BEGIN_BLOCK, TOK_END_BLOCK -}; +} TOK_TYPE; /* Scratch buffer for temporary command substitutions / expansions */ static TCHAR TempBuf[CMDLINE_LENGTH]; @@ -67,19 +90,103 @@ static TCHAR TempBuf[CMDLINE_LENGTH]; /*static*/ BOOL bParseError; static BOOL bLineContinuations; /*static*/ TCHAR ParseLine[CMDLINE_LENGTH]; -static TCHAR *ParsePos; -static TCHAR CurChar; +static PTCHAR ParsePos; +static PTCHAR OldParsePos; static TCHAR CurrentToken[CMDLINE_LENGTH]; -static int CurrentTokenType; -static int InsideBlock; +static TOK_TYPE CurrentTokenType = TOK_END; +#ifndef MSCMD_PARSER_BUGS +static BOOL bReparseToken = FALSE; +static PTCHAR LastCurTokPos; +#endif +static INT InsideBlock = 0; + +static VOID ResetParser(IN PTCHAR Pos) +{ + bParseError = FALSE; + ParsePos = Pos; + OldParsePos = ParsePos; +} + +/* + * This function "refetches" the last parsed token back into the stream + * for later reparsing -- since the way of lexing it is context-dependent. + * This "feature" is at the root of many obscure CMD parsing quirks, + * due to the fact this feature is in opposition with line-continuation. + * Indeed, when a stream of characters has a line-continuation, the lexer- + * parser will parse the stream up to the end of the line, then will + * reset the parser state and position back to the beginning of the line + * before accepting the rest of the character stream and continuing + * parsing them. This means that all the non-parsed characters before the + * line-continuation have been lost. Of course, their parsed form is now + * within the current parsed token. However, suppose now we need to + * unparse this token for reparsing it a different way later on. If we + * somehow pushed the already-parsed current token back into the beginning + * of the character stream, besides the complications of moving up the + * characters in the stream buffer, we would basically have "new" data + * that has been already parsed one way, to be now parsed another way. + * If instead we had saved somehow the unparsed form of the token, and + * we push back that form into the stream buffer for reparsing, we would + * encounter again the line-continuation, that, depending on which + * context the token is reparsed, would cause problems: + * e.g. in the case of REM command parsing, the parser would stop at the + * first line-continuation. + * + * When MSCMD_PARSER_BUGS is undefined, the UnParseToken() / ParseToken() + * cycle keeps the current token in its buffer, but also saves the start + * position corresponding to the batch of characters that have been parsed + * during the last line-continuation. The next ParseToken() would then + * reparse these latest charcters and the result replaces the last part + * in the current token. + * + * For example, a first parsing of + * foo^\n + * bar^\n + * baz + * would result in the current token "foobarbaz", where the start position + * corresponding to the batch of characters parsed during the last line-continuation + * being pointing at "baz". The stream buffer only contains "baz" (and following data). + * Then UnParseToken() saves this info so that at the next ParseToken(), the "baz" + * part of the stream buffer gets reparsed (possibly differently) and the result + * would replace the "baz" part in the current token. + * + * If MSCMD_PARSER_BUGS is defined however, then the behaviour of the Windows' CMD + * parser applies: in the example above, the last ParseToken() call would completely + * replace the current token "foobarbaz" with the new result of the parsing of "baz". + */ +static VOID UnParseToken(VOID) +{ + ParsePos = OldParsePos; + + /* Debugging support */ + if (fDumpTokens) + ConOutPrintf(_T("Ungetting: '%s'\n"), ParsePos); + +#ifndef MSCMD_PARSER_BUGS + bReparseToken = TRUE; +#endif +} + +static VOID InitParser(VOID) +{ + *CurrentToken = 0; + CurrentTokenType = TOK_END; + InsideBlock = 0; + +#ifndef MSCMD_PARSER_BUGS + bReparseToken = FALSE; + LastCurTokPos = NULL; +#endif + + ResetParser(ParseLine); +} -static TCHAR ParseChar(void) +static TCHAR ParseChar(VOID) { TCHAR Char; if (bParseError) - return (CurChar = 0); + return 0; restart: /* @@ -93,23 +200,22 @@ restart: } while (Char == _T('\r')); - if (!Char) + if (!Char) --ParsePos; + if (!Char && bLineContinuations) { - ParsePos--; - if (bLineContinuations) + if (!ReadLine(ParseLine, TRUE)) { - if (!ReadLine(ParseLine, TRUE)) - { - /* ^C pressed, or line was too long */ - bParseError = TRUE; - } - else if (*(ParsePos = ParseLine)) - { + /* ^C pressed, or line was too long */ + bParseError = TRUE; + } + else + { + ResetParser(ParseLine); + if (*ParsePos) goto restart; - } } } - return (CurChar = Char); + return Char; } VOID ParseErrorEx(IN PCTSTR s) @@ -125,41 +231,79 @@ static __inline VOID ParseError(VOID) ParseErrorEx(CurrentTokenType != TOK_END ? CurrentToken : NULL); } -/* - * Yes, cmd has a Lexical Analyzer. Whenever the parser gives an "xxx was - * unexpected at this time." message, it shows what the last token read was. - */ -static int ParseToken(TCHAR ExtraEnd, TCHAR *Separators) +static TOK_TYPE +ParseTokenEx( + IN TCHAR PrefixOperator OPTIONAL, + IN TCHAR ExtraEnd OPTIONAL, + IN PCTSTR Separators OPTIONAL, + IN BOOL bHandleContinuations) { - TCHAR *Out = CurrentToken; + TOK_TYPE Type; + PTCHAR CurrentTokStart = CurrentToken; + PTCHAR Out = CurrentTokStart; TCHAR Char; - int Type; BOOL bInQuote = FALSE; - for (Char = CurChar; Char && Char != _T('\n'); Char = ParseChar()) +#ifndef MSCMD_PARSER_BUGS + if (bReparseToken) + { + bReparseToken = FALSE; + + /* + * We will append the part to be reparsed to the old one + * (still present in CurrentToken). + */ + CurrentTokStart = LastCurTokPos; + Out = CurrentTokStart; + } + else + { + LastCurTokPos = CurrentToken; + } +#endif + + /* Start with what we have at current ParsePos */ + OldParsePos = ParsePos; + + for (Char = ParseChar(); Char && Char != _T('\n'); Char = ParseChar()) { bInQuote ^= (Char == _T('"')); if (!bInQuote) { if (Separators != NULL) { - if (_istspace(Char) || _tcschr(Separators, Char)) + if (_istspace(Char) || !!_tcschr(Separators, Char)) { /* Skip leading separators */ - if (Out == CurrentToken) + if (Out == CurrentTokStart) continue; break; } } - /* Check for numbered redirection */ - if ((Char >= _T('0') && Char <= _T('9') && - (ParsePos == &ParseLine[1] || IsSeparator(ParsePos[-2])) - && (*ParsePos == _T('<') || *ParsePos == _T('>')))) + /* Check for prefix operator */ + if ((Out == CurrentTokStart) && (Char == PrefixOperator)) + break; + + /* + * Check for numbered redirection. + * + * For this purpose, we check whether this is a number, that is + * in first position in the current parsing buffer (remember that + * ParsePos points to the next character) or is preceded by a + * whitespace-like separator, including standard command operators + * (excepting '@' !) and double-quotes. + */ + if ( _istdigit(Char) && + (ParsePos == &OldParsePos[1] || + IsSeparator(ParsePos[-2]) || + !!_tcschr(_T("()&|\""), ParsePos[-2])) && + (*ParsePos == _T('<') || *ParsePos == _T('>')) ) { break; } + /* Check for other delimiters / operators */ if (Char == ExtraEnd) break; if (InsideBlock && Char == _T(')')) @@ -167,59 +311,90 @@ static int ParseToken(TCHAR ExtraEnd, TCHAR *Separators) if (_tcschr(_T("&|<>"), Char)) break; - if (Char == _T('^')) + if (bHandleContinuations && (Char == _T('^'))) { Char = ParseChar(); /* Eat up a \n, allowing line continuation */ if (Char == _T('\n')) + { +#ifndef MSCMD_PARSER_BUGS + LastCurTokPos = Out; +#endif Char = ParseChar(); + } /* Next character is a forced literal */ + + if (Out == CurrentTokStart) + { + /* Ignore any prefix operator if we don't start a new command block */ + if (CurrentTokenType != TOK_BEGIN_BLOCK) + PrefixOperator = 0; + } } } if (Out == &CurrentToken[CMDLINE_LENGTH - 1]) break; *Out++ = Char; + + // PrefixOperator = 0; } - /* Check if we got at least one character before reaching a special one. - * If so, return them and leave the special for the next call. */ - if (Out != CurrentToken) + /* + * We exited the parsing loop. If the current character is the first one + * (Out == CurrentTokStart), interpret it as an operator. Otherwise, + * terminate the current token (type TOK_NORMAL) and keep the current + * character so that it can be refetched as an operator at the next call. + */ + + if (Out != CurrentTokStart) { Type = TOK_NORMAL; } + /* + * Else we have an operator. + */ + else if (Char == _T('@')) + { + Type = TOK_OPERATOR; // TOK_QUIET / TOK_PREFIX_OPERATOR + *Out++ = Char; + Char = ParseChar(); + } else if (Char == _T('(')) { Type = TOK_BEGIN_BLOCK; *Out++ = Char; - ParseChar(); + Char = ParseChar(); } else if (Char == _T(')')) { Type = TOK_END_BLOCK; *Out++ = Char; - ParseChar(); + Char = ParseChar(); } else if (Char == _T('&') || Char == _T('|')) { Type = TOK_OPERATOR; *Out++ = Char; Char = ParseChar(); - /* check for && or || */ + /* Check for '&&' or '||' */ if (Char == Out[-1]) { *Out++ = Char; - ParseChar(); + Char = ParseChar(); } } - else if ((Char >= _T('0') && Char <= _T('9')) - || (Char == _T('<') || Char == _T('>'))) + else if ( _istdigit(Char) || + (Char == _T('<') || Char == _T('>')) ) { Type = TOK_REDIRECTION; - if (Char >= _T('0') && Char <= _T('9')) + if (_istdigit(Char)) { *Out++ = Char; Char = ParseChar(); } + /* By construction (see the while-loop above), + * the next character must be a redirection. */ + ASSERT(Char == _T('<') || Char == _T('>')); *Out++ = Char; Char = ParseChar(); if (Char == Out[-1]) @@ -234,19 +409,30 @@ static int ParseToken(TCHAR ExtraEnd, TCHAR *Separators) *Out++ = Char; while (IsSeparator(Char = ParseChar())) ; - if (Char >= _T('0') && Char <= _T('9')) + if (_istdigit(Char)) { *Out++ = Char; - ParseChar(); + Char = ParseChar(); } } } else { Type = TOK_END; + *Out++ = Char; } *Out = _T('\0'); + /* + * Rewind the parsing position, so that the current character can be + * refetched later on. However do this only if it is not NULL and if + * this is not TOK_END, since we do not want to reparse later the line + * termination (we could enter into infinite loops, or, in case of line + * continuation, get unwanted "More?" prompts). + */ + if (Char != 0 && Type != TOK_END) + --ParsePos; + /* Debugging support */ if (fDumpTokens) ConOutPrintf(_T("ParseToken: (%d) '%s'\n"), Type, CurrentToken); @@ -254,14 +440,127 @@ static int ParseToken(TCHAR ExtraEnd, TCHAR *Separators) return (CurrentTokenType = Type); } -static BOOL ParseRedirection(REDIRECTION **List) +static __inline INT +ParseToken( + IN TCHAR ExtraEnd OPTIONAL, + IN PCTSTR Separators OPTIONAL) { - TCHAR *Tok = CurrentToken; - BYTE Number; + return ParseTokenEx(0, ExtraEnd, Separators, TRUE); +} + + +static PARSED_COMMAND* +AllocCommand( + IN COMMAND_TYPE Type, + IN PCTSTR CmdHead OPTIONAL, + IN PCTSTR CmdTail OPTIONAL) +{ + PARSED_COMMAND* Cmd; + + switch (Type) + { + case C_COMMAND: + case C_REM: + { + SIZE_T CmdHeadLen = _tcslen(CmdHead) + 1; + SIZE_T CmdTailLen = _tcslen(CmdTail) + 1; + + Cmd = cmd_alloc(FIELD_OFFSET(PARSED_COMMAND, + Command.First[CmdHeadLen + CmdTailLen])); + if (!Cmd) + return NULL; + + Cmd->Type = Type; + Cmd->Next = NULL; + Cmd->Subcommands = NULL; + Cmd->Redirections = NULL; /* Is assigned by the calling function */ + memcpy(Cmd->Command.First, CmdHead, CmdHeadLen * sizeof(TCHAR)); + Cmd->Command.Rest = Cmd->Command.First + CmdHeadLen; + memcpy(Cmd->Command.Rest, CmdTail, CmdTailLen * sizeof(TCHAR)); + return Cmd; + } + + case C_QUIET: + case C_BLOCK: + case C_MULTI: + case C_OR: + case C_AND: + case C_PIPE: + { + Cmd = cmd_alloc(sizeof(PARSED_COMMAND)); + if (!Cmd) + return NULL; + + Cmd->Type = Type; + Cmd->Next = NULL; + Cmd->Subcommands = NULL; + Cmd->Redirections = NULL; /* For C_BLOCK only: is assigned by the calling function */ + return Cmd; + } + + case C_FOR: + case C_IF: + { + Cmd = cmd_alloc(sizeof(PARSED_COMMAND)); + if (!Cmd) + return NULL; + + memset(Cmd, 0, sizeof(PARSED_COMMAND)); + Cmd->Type = Type; + return Cmd; + } + + default: + ERR("Unknown command type 0x%x\n", Type); + ASSERT(FALSE); + return NULL; + } +} + +VOID +FreeCommand( + IN OUT PARSED_COMMAND* Cmd) +{ + if (Cmd->Subcommands) + FreeCommand(Cmd->Subcommands); + if (Cmd->Next) + FreeCommand(Cmd->Next); + FreeRedirection(Cmd->Redirections); + if (Cmd->Type == C_FOR) + { + cmd_free(Cmd->For.Params); + cmd_free(Cmd->For.List); + } + else if (Cmd->Type == C_IF) + { + cmd_free(Cmd->If.LeftArg); + cmd_free(Cmd->If.RightArg); + } + cmd_free(Cmd); +} + + +/* Parse redirections and append them to the list */ +static BOOL +ParseRedirection( + IN OUT REDIRECTION** List) +{ + PTSTR Tok = CurrentToken; + REDIRECTION* Redir; REDIR_MODE RedirMode; - REDIRECTION *Redir; + BYTE Number; + + if ( !(*Tok == _T('<') || *Tok == _T('>')) && + !(_istdigit(*Tok) && + (Tok[1] == _T('<') || Tok[1] == _T('>')) ) ) + { + ASSERT(CurrentTokenType != TOK_REDIRECTION); + return FALSE; + } + ASSERT((CurrentTokenType == TOK_REDIRECTION) || + (CurrentTokenType == TOK_NORMAL)); - if (*Tok >= _T('0') && *Tok <= _T('9')) + if (_istdigit(*Tok)) Number = *Tok++ - _T('0'); else Number = *Tok == _T('<') ? 0 : 1; @@ -269,6 +568,7 @@ static BOOL ParseRedirection(REDIRECTION **List) if (*Tok++ == _T('<')) { RedirMode = REDIR_READ; + /* Forbid '<<' */ if (*Tok == _T('<')) goto fail; } @@ -282,9 +582,20 @@ static BOOL ParseRedirection(REDIRECTION **List) } } + if (*Tok == _T('&')) + { + /* This is a handle redirection: the next character must be one single digit */ + if (!(_istdigit(Tok[1]) && !Tok[2])) + goto fail; + } + else +#ifndef MSCMD_REDIR_PARSE_BUGS if (!*Tok) + /* The file name was not part of this token, so it will be the next one */ +#else + /* Get rid of what possibly remains in the token, and retrieve the next one */ +#endif { - /* The file name was not part of this token, so it'll be the next one */ if (ParseToken(0, STANDARD_SEPS) != TOK_NORMAL) goto fail; Tok = CurrentToken; @@ -323,31 +634,60 @@ fail: return FALSE; } -static PARSED_COMMAND *ParseCommandOp(int OpType); +static __inline PARSED_COMMAND* +ParseCommandOp( + IN COMMAND_TYPE OpType); /* Parse a parenthesized block */ -static PARSED_COMMAND *ParseBlock(REDIRECTION *RedirList) +static PARSED_COMMAND* +ParseBlock( + IN OUT REDIRECTION** RedirList) { PARSED_COMMAND *Cmd, *Sub, **NextPtr; - Cmd = cmd_alloc(sizeof(PARSED_COMMAND)); + Cmd = AllocCommand(C_BLOCK, NULL, NULL); if (!Cmd) { WARN("Cannot allocate memory for Cmd!\n"); ParseError(); - FreeRedirection(RedirList); return NULL; } - Cmd->Type = C_BLOCK; - Cmd->Next = NULL; - Cmd->Subcommands = NULL; - Cmd->Redirections = RedirList; /* Read the block contents */ NextPtr = &Cmd->Subcommands; - InsideBlock++; - while (1) + ++InsideBlock; + while (TRUE) { + /* + * Windows' CMD compatibility: Strip leading newlines in the block. + * + * Note that this behaviour is buggy, especially when MSCMD_PARSER_BUGS is defined! + * For example: + * (foo^\n + * bar) + * would be parsed ultimately as: '(', 'bar', ')' because the "foo^" + * part would be discarded due to the UnParseToken() call, since this + * function doesn't work across line continuations. + */ + while (ParseToken(0, STANDARD_SEPS) == TOK_END && *CurrentToken == _T('\n')) + ; + if (*CurrentToken && *CurrentToken != _T('\n')) + UnParseToken(); + + /* Break early if we have nothing else to read. We will also fail + * due to the fact we haven't encountered any closing parenthesis. */ + if (!*CurrentToken /* || *CurrentToken == _T('\n') */) + { + ASSERT(CurrentTokenType == TOK_END); + break; + } + + /* + * NOTE: Windows' CMD uses a "CRLF" operator when dealing with + * newlines in parenthesized blocks, as an alternative to the + * '&' command-separation operator. + */ + Sub = ParseCommandOp(C_OP_LOWEST); if (Sub) { @@ -356,7 +696,7 @@ static PARSED_COMMAND *ParseBlock(REDIRECTION *RedirList) } else if (bParseError) { - InsideBlock--; + --InsideBlock; FreeCommand(Cmd); return NULL; } @@ -365,36 +705,83 @@ static PARSED_COMMAND *ParseBlock(REDIRECTION *RedirList) break; /* Skip past the \n */ - ParseChar(); } - InsideBlock--; + --InsideBlock; + + /* Fail if the block was not terminated, or if we have + * an empty block, i.e. "( )", considered invalid. */ + if ((CurrentTokenType != TOK_END_BLOCK) || (Cmd->Subcommands == NULL)) + { + ParseError(); + FreeCommand(Cmd); + return NULL; + } - /* Process any trailing redirections */ + /* Process any trailing redirections and append them to the list */ +#ifndef MSCMD_REDIR_PARSE_BUGS while (ParseToken(0, STANDARD_SEPS) == TOK_REDIRECTION) { - if (!ParseRedirection(&Cmd->Redirections)) + if (!ParseRedirection(RedirList)) { FreeCommand(Cmd); return NULL; } } +#else + while (ParseToken(0, STANDARD_SEPS) != TOK_END) + { + if (!ParseRedirection(RedirList)) + { + /* If an actual error happened in ParseRedirection(), bail out */ + if (bParseError) + { + FreeCommand(Cmd); + return NULL; + } + /* Otherwise it just returned FALSE because the current token + * is not a redirection. Unparse the token and refetch it. */ + break; + } + } +#endif + if (CurrentTokenType != TOK_END) + { + /* + * Windows' CMD compatibility: Unparse the current token. + * + * Note that this behaviour is buggy, especially when MSCMD_PARSER_BUGS is defined! + * For example: + * (foo^\n + * bar) + * would be parsed ultimately as: '(', 'bar', ')' because the "foo^" + * part would be discarded due to the UnParseToken() call, since this + * function doesn't work across line continuations. + */ + UnParseToken(); + + /* + * Since it is expected that when ParseBlock() returns, the next + * token is already fetched, call ParseToken() again to compensate. + */ + ParseToken(0, STANDARD_SEPS); + } + return Cmd; } /* Parse an IF statement */ -static PARSED_COMMAND *ParseIf(void) +static PARSED_COMMAND* +ParseIf(VOID) { - PARSED_COMMAND *Cmd; + PARSED_COMMAND* Cmd; - Cmd = cmd_alloc(sizeof(PARSED_COMMAND)); + Cmd = AllocCommand(C_IF, NULL, NULL); if (!Cmd) { WARN("Cannot allocate memory for Cmd!\n"); ParseError(); return NULL; } - memset(Cmd, 0, sizeof(PARSED_COMMAND)); - Cmd->Type = C_IF; if (bEnableExtensions && (_tcsicmp(CurrentToken, _T("/I")) == 0)) { @@ -478,27 +865,28 @@ error: * Parse a FOR command. * Syntax is: FOR [options] %var IN (list) DO command */ -static PARSED_COMMAND *ParseFor(void) +static PARSED_COMMAND* +ParseFor(VOID) { - PARSED_COMMAND *Cmd; - TCHAR* List = TempBuf; - TCHAR *Pos = List; + PARSED_COMMAND* Cmd; - Cmd = cmd_alloc(sizeof(PARSED_COMMAND)); + /* Use the scratch buffer */ + PTSTR List = TempBuf; + PTCHAR Pos = List; + + Cmd = AllocCommand(C_FOR, NULL, NULL); if (!Cmd) { WARN("Cannot allocate memory for Cmd!\n"); ParseError(); return NULL; } - memset(Cmd, 0, sizeof(PARSED_COMMAND)); - Cmd->Type = C_FOR; /* Skip the extended FOR syntax if extensions are disabled */ if (!bEnableExtensions) goto parseForBody; - while (1) + while (TRUE) { if (_tcsicmp(CurrentToken, _T("/D")) == 0) { @@ -561,22 +949,19 @@ parseForBody: if (ParseToken(_T('('), STANDARD_SEPS) != TOK_BEGIN_BLOCK) goto error; - while (1) + while (TRUE) { /* Pretend we're inside a block so the tokenizer will stop on ')' */ - InsideBlock++; + ++InsideBlock; ParseToken(0, STANDARD_SEPS); - InsideBlock--; + --InsideBlock; if (CurrentTokenType == TOK_END_BLOCK) break; - if (CurrentTokenType == TOK_END) - { - /* Skip past the \n */ - ParseChar(); + /* Skip past the \n */ + if ((CurrentTokenType == TOK_END) && *CurrentToken == _T('\n')) continue; - } if (CurrentTokenType != TOK_NORMAL) goto error; @@ -608,177 +993,432 @@ error: } /* Parse a REM command */ -static PARSED_COMMAND *ParseRem(void) +static PARSED_COMMAND* +ParseRem(VOID) { - /* "Ignore" the rest of the line. - * (Line continuations will still be parsed, though.) */ - while (ParseToken(0, NULL) != TOK_END) - ; - return NULL; + PARSED_COMMAND* Cmd; + + /* The common scratch buffer already contains the name of the command */ + PTSTR ParsedLine = TempBuf; + + PTCHAR Pos = ParsedLine + _tcslen(ParsedLine) + 1; + SIZE_T TailOffset = Pos - ParsedLine; + + /* Build a minimal command for REM, so that it can still get through the batch echo unparsing */ + + /* Unparse the current token, so as to emulate the REM command parsing + * behaviour of Windows' CMD, that discards everything before the last + * line continuation. */ + UnParseToken(); + + /* + * Ignore the rest of the line, without any line continuation (but eat the caret). + * We cannot simply set bLineContinuations to TRUE or FALSE, because we want (only + * for the REM command), even when bLineContinuations == FALSE, to get the caret, + * otherwise it would be ignored. + */ + while (ParseTokenEx(0, 0, NULL, FALSE) != TOK_END) + { + if (Pos + _tcslen(CurrentToken) >= &ParsedLine[CMDLINE_LENGTH]) + { + ParseError(); + return NULL; + } + Pos = _stpcpy(Pos, CurrentToken); + } + *Pos = _T('\0'); + + Cmd = AllocCommand(C_REM, + ParsedLine, + ParsedLine + TailOffset); + if (!Cmd) + { + WARN("Cannot allocate memory for Cmd!\n"); + ParseError(); + return NULL; + } + return Cmd; } -static DECLSPEC_NOINLINE PARSED_COMMAND *ParseCommandPart(REDIRECTION *RedirList) +/* Parse a command */ +static PARSED_COMMAND* +ParseCommandPart( + IN OUT REDIRECTION** RedirList) { - TCHAR ParsedLine[CMDLINE_LENGTH]; - PARSED_COMMAND *Cmd; - PARSED_COMMAND *(*Func)(void); + PARSED_COMMAND* Cmd; + PARSED_COMMAND* (*Func)(VOID); - TCHAR *Pos = _stpcpy(ParsedLine, CurrentToken) + 1; - DWORD_PTR TailOffset = Pos - ParsedLine; + /* Use the scratch buffer */ + PTSTR ParsedLine = TempBuf; + + /* We need to copy the current token because it's going to be changed below by the ParseToken() calls */ + PTCHAR Pos = _stpcpy(ParsedLine, CurrentToken) + 1; + SIZE_T TailOffset = Pos - ParsedLine; /* Check for special forms */ - if ((Func = ParseFor, _tcsicmp(ParsedLine, _T("for")) == 0) || - (Func = ParseIf, _tcsicmp(ParsedLine, _T("if")) == 0) || - (Func = ParseRem, _tcsicmp(ParsedLine, _T("rem")) == 0)) + if ((Func = ParseFor, _tcsicmp(ParsedLine, _T("FOR")) == 0) || + (Func = ParseIf, _tcsicmp(ParsedLine, _T("IF")) == 0) || + (Func = ParseRem, _tcsicmp(ParsedLine, _T("REM")) == 0)) { + PTCHAR pHelp; + ParseToken(0, STANDARD_SEPS); - /* Do special parsing only if it's not followed by /? */ - if (_tcscmp(CurrentToken, _T("/?")) != 0) + + if ((pHelp = _tcsstr(CurrentToken, _T("/?"))) && + (Func == ParseIf ? (pHelp[2] == _T('/') || pHelp[2] == 0) : TRUE)) + { + /* /? was found within the first token */ + ParseToken(0, STANDARD_SEPS); + } + else + { + pHelp = NULL; + } + if (pHelp && (CurrentTokenType == TOK_NORMAL)) { - if (RedirList) + /* We encountered /? first, but is followed + * by another token: that's an error. */ + ParseError(); + return NULL; + } + + /* Do actual parsing only if no help is present */ + if (!pHelp) + { + /* FOR and IF commands cannot have leading redirection, but REM can */ + if (*RedirList && ((Func == ParseFor) || (Func == ParseIf))) { - ParseError(); - FreeRedirection(RedirList); + /* Display the culprit command and fail */ + ParseErrorEx(ParsedLine); return NULL; } + return Func(); } - Pos = _stpcpy(Pos, _T(" /?")); + + /* Otherwise, run FOR,IF,REM as regular commands only for help support */ + if (Pos + _tcslen(_T("/?")) >= &ParsedLine[CMDLINE_LENGTH]) + { + ParseError(); + return NULL; + } + Pos = _stpcpy(Pos, _T("/?")); + } + else + { + ParseToken(0, NULL); } /* Now get the tail */ - while (1) + while (CurrentTokenType != TOK_END) { - ParseToken(0, NULL); if (CurrentTokenType == TOK_NORMAL) { if (Pos + _tcslen(CurrentToken) >= &ParsedLine[CMDLINE_LENGTH]) { ParseError(); - FreeRedirection(RedirList); return NULL; } Pos = _stpcpy(Pos, CurrentToken); } +#ifndef MSCMD_REDIR_PARSE_BUGS else if (CurrentTokenType == TOK_REDIRECTION) { - if (!ParseRedirection(&RedirList)) - return NULL; + /* Process any trailing redirections and append them to the list */ + while (CurrentTokenType == TOK_REDIRECTION) + { + if (!ParseRedirection(RedirList)) + return NULL; + + ParseToken(0, STANDARD_SEPS); + } + if (CurrentTokenType == TOK_END) + break; + + /* Unparse the current token, and reparse it below with no separators */ + UnParseToken(); } else { + /* There is no need to do a UnParseToken() / ParseToken() cycle */ break; } +#else + else + { + /* Process any trailing redirections and append them to the list */ + BOOL bSuccess = FALSE; + + ASSERT(CurrentTokenType != TOK_END); + + while (CurrentTokenType != TOK_END) + { + if (!ParseRedirection(RedirList)) + { + /* If an actual error happened in ParseRedirection(), bail out */ + if (bParseError) + return NULL; + + /* Otherwise it just returned FALSE because the current token + * is not a redirection. Unparse the token and refetch it. */ + break; + } + bSuccess = TRUE; + + ParseToken(0, STANDARD_SEPS); + } + if (CurrentTokenType == TOK_END) + break; + + /* Unparse the current token, and reparse it below with no separators */ + UnParseToken(); + + /* If bSuccess == FALSE, we know that it's still the old fetched token, but + * it has been unparsed, so we need to refetch it before quitting the loop. */ + if (!bSuccess) + { + ParseToken(0, NULL); + break; + } + } +#endif + + ParseToken(0, NULL); } - *Pos++ = _T('\0'); + *Pos = _T('\0'); - Cmd = cmd_alloc(FIELD_OFFSET(PARSED_COMMAND, Command.First[Pos - ParsedLine])); + Cmd = AllocCommand(C_COMMAND, + ParsedLine, + ParsedLine + TailOffset); if (!Cmd) { WARN("Cannot allocate memory for Cmd!\n"); ParseError(); - FreeRedirection(RedirList); return NULL; } - Cmd->Type = C_COMMAND; - Cmd->Next = NULL; - Cmd->Subcommands = NULL; - Cmd->Redirections = RedirList; - memcpy(Cmd->Command.First, ParsedLine, (Pos - ParsedLine) * sizeof(TCHAR)); - Cmd->Command.Rest = Cmd->Command.First + TailOffset; return Cmd; } -static PARSED_COMMAND *ParsePrimary(void) +static PARSED_COMMAND* +ParsePrimary(VOID) { - REDIRECTION *RedirList = NULL; - int Type; - - while (IsSeparator(CurChar)) - { - if (CurChar == _T('\n')) - return NULL; - ParseChar(); - } - - if (!CurChar) - return NULL; - - if (CurChar == _T(':')) - { - /* "Ignore" the rest of the line. - * (Line continuations will still be parsed, though.) */ - while (ParseToken(0, NULL) != TOK_END) - ; - return NULL; - } + PARSED_COMMAND* Cmd = NULL; + REDIRECTION* RedirList = NULL; - if (CurChar == _T('@')) + /* In this context, '@' is considered as a separate token */ + if ((*CurrentToken == _T('@')) && (CurrentTokenType == TOK_OPERATOR)) { - PARSED_COMMAND *Cmd; - ParseChar(); - Cmd = cmd_alloc(sizeof(PARSED_COMMAND)); + Cmd = AllocCommand(C_QUIET, NULL, NULL); if (!Cmd) { WARN("Cannot allocate memory for Cmd!\n"); ParseError(); return NULL; } - Cmd->Type = C_QUIET; - Cmd->Next = NULL; /* @ acts like a unary operator with low precedence, * so call the top-level parser */ Cmd->Subcommands = ParseCommandOp(C_OP_LOWEST); - Cmd->Redirections = NULL; return Cmd; } /* Process leading redirections and get the head of the command */ - while ((Type = ParseToken(_T('('), STANDARD_SEPS)) == TOK_REDIRECTION) +#ifndef MSCMD_REDIR_PARSE_BUGS + while (CurrentTokenType == TOK_REDIRECTION) { if (!ParseRedirection(&RedirList)) return NULL; + + ParseToken(_T('('), STANDARD_SEPS); + } +#else + { + BOOL bSuccess = FALSE; + while (CurrentTokenType != TOK_END) + { + if (!ParseRedirection(&RedirList)) + { + /* If an actual error happened in ParseRedirection(), bail out */ + if (bParseError) + return NULL; + + /* Otherwise it just returned FALSE because + * the current token is not a redirection. */ + break; + } + bSuccess = TRUE; + + ParseToken(0, STANDARD_SEPS); + } + if (bSuccess) + { + /* Unparse the current token, and reparse it with support for parenthesis */ + if (CurrentTokenType != TOK_END) + UnParseToken(); + + ParseToken(_T('('), STANDARD_SEPS); } + } +#endif - if (Type == TOK_NORMAL) - return ParseCommandPart(RedirList); - else if (Type == TOK_BEGIN_BLOCK) - return ParseBlock(RedirList); - else if (Type == TOK_END_BLOCK && !RedirList) + if (CurrentTokenType == TOK_NORMAL) + Cmd = ParseCommandPart(&RedirList); + else if (CurrentTokenType == TOK_BEGIN_BLOCK) + Cmd = ParseBlock(&RedirList); + else if (CurrentTokenType == TOK_END_BLOCK && !RedirList) return NULL; + if (Cmd) + { + /* FOR and IF commands cannot have leading redirection + * (checked by ParseCommandPart(), errors out if so). */ + ASSERT(!RedirList || (Cmd->Type != C_FOR && Cmd->Type != C_IF)); + + /* Save the redirection list in the command */ + Cmd->Redirections = RedirList; + + /* Return the new command */ + return Cmd; + } + ParseError(); FreeRedirection(RedirList); return NULL; } -static PARSED_COMMAND *ParseCommandOp(int OpType) +static PARSED_COMMAND* +ParseCommandBinaryOp( + IN COMMAND_TYPE OpType) { - PARSED_COMMAND *Cmd, *Left, *Right; + PARSED_COMMAND* Cmd; + + if (OpType == C_OP_LOWEST) // i.e. CP_MULTI + { + /* Ignore any parser-level comments */ + if (*CurrentToken == _T(':')) + { + /* Ignore the rest of the line, including line continuations */ + while (ParseToken(0, NULL) != TOK_END) + ; +#ifdef MSCMD_PARENS_PARSE_BUGS + /* + * Return NULL in case we are NOT inside a parenthesized block, + * otherwise continue. The effects can be observed as follows: + * within a parenthesized block, every second ':'-prefixed command + * is not ignored, while the first of each "pair" is ignored. + * This first command **MUST NOT** be followed by an empty line, + * otherwise a syntax error is raised. + */ + if (InsideBlock == 0) + { +#endif + return NULL; +#ifdef MSCMD_PARENS_PARSE_BUGS + } + /* Get the next token */ + ParseToken(0, NULL); +#endif + } + + /* + * Ignore single closing parenthesis outside of command blocks, + * thus interpreted as a command. This very specific situation + * can happen e.g. while running in batch mode, when jumping to + * a label present inside a command block. + * + * NOTE: If necessary, this condition can be restricted to only + * when a batch context 'bc' is active. + * + * NOTE 2: For further security, Windows checks that we are NOT + * currently inside a parenthesized block, and also, ignores + * explicitly everything (ParseToken() loop) on the same line + * (including line continuations) after this closing parenthesis. + * + * Why doing so? Consider the following batch: + * + * IF 1==1 ( + * :label + * echo A + * ) ^ + * ELSE ( + * echo B + * exit /b + * ) + * GOTO :label + * + * First the IF block is executed. Since the condition is trivially + * true, only the first block "echo A" is executed, then execution + * goes after the IF block, that is, at the GOTO. Here, the GOTO + * jumps within the first IF-block, however, the running context now + * is NOT an IF. So parsing and execution will go through each command, + * starting with 'echo A'. But then one gets the ') ^\n ELSE (' part !! + * If we want to make sense of this without bailing out due to + * parsing error, we should ignore this line, **including** the line + * continuation. Hence we need to loop over all the tokens following + * the closing parenthesis, instead of just returning NULL straight ahead. + * Then execution continues with the other commands, 'echo B' and + * 'exit /b' (here to stop the code loop). Execution would also + * continue (if 'exit' was replaced by something else) and encounter + * the lone closing parenthesis ')', that should again be ignored. + * + * Note that this feature has been introduced in Win2k+. + */ + if (/** bc && **/ (_tcscmp(CurrentToken, _T(")")) == 0) && + (CurrentTokenType != TOK_END_BLOCK)) + { + ASSERT(InsideBlock == 0); + + /* Ignore the rest of the line, including line continuations */ + while (ParseToken(0, NULL) != TOK_END) + ; + return NULL; + } + +#ifdef MSCMD_PARENS_PARSE_BUGS + /* Check whether we have an empty line only if we are not inside + * a parenthesized block, and return NULL if so, otherwise do not + * do anything; a syntax error will be raised later. */ + if (InsideBlock == 0) +#endif + if (!*CurrentToken || *CurrentToken == _T('\n')) + { + ASSERT(CurrentTokenType == TOK_END); + return NULL; + } + } if (OpType == C_OP_HIGHEST) Cmd = ParsePrimary(); else - Cmd = ParseCommandOp(OpType + 1); + Cmd = ParseCommandBinaryOp(OpType + 1); if (Cmd && !_tcscmp(CurrentToken, OpString[OpType - C_OP_LOWEST])) { - Left = Cmd; + PARSED_COMMAND* Left = Cmd; + PARSED_COMMAND* Right; + Right = ParseCommandOp(OpType); if (!Right) { - if (!bParseError) - { - /* & is allowed to have an empty RHS */ - if (OpType == C_MULTI) - return Left; + /* + * The '&' operator is allowed to have an empty RHS. + * In this case, we directly return the LHS only. + * Note that Windows' CMD prefers building a '&' + * command with an empty RHS. + */ + if (!bParseError && (OpType != C_MULTI)) ParseError(); + if (bParseError) + { + FreeCommand(Left); + return NULL; } - FreeCommand(Left); - return NULL; + +#ifndef MSCMD_MULTI_EMPTY_RHS + return Left; +#endif } - Cmd = cmd_alloc(sizeof(PARSED_COMMAND)); + Cmd = AllocCommand(OpType, NULL, NULL); if (!Cmd) { WARN("Cannot allocate memory for Cmd!\n"); @@ -787,24 +1427,35 @@ static PARSED_COMMAND *ParseCommandOp(int OpType) FreeCommand(Right); return NULL; } - Cmd->Type = OpType; - Cmd->Next = NULL; - Cmd->Redirections = NULL; Cmd->Subcommands = Left; Left->Next = Right; +#ifdef MSCMD_MULTI_EMPTY_RHS + if (Right) +#endif Right->Next = NULL; } return Cmd; } +static __inline PARSED_COMMAND* +ParseCommandOp( + IN COMMAND_TYPE OpType) +{ + /* Start parsing: initialize the first token */ -VOID -DumpCommand(PARSED_COMMAND *Cmd, ULONG SpacePad); + /* Parse the prefix "quiet" operator '@' as a separate command. + * Thus, @@foo@bar is parsed as: '@', '@', 'foo@bar'. */ + ParseTokenEx(_T('@'), _T('('), STANDARD_SEPS, TRUE); + + return ParseCommandBinaryOp(OpType); +} -PARSED_COMMAND * -ParseCommand(LPTSTR Line) + +PARSED_COMMAND* +ParseCommand( + IN PCTSTR Line) { - PARSED_COMMAND *Cmd; + PARSED_COMMAND* Cmd; if (Line) { @@ -818,17 +1469,19 @@ ParseCommand(LPTSTR Line) return NULL; bLineContinuations = TRUE; } - bParseError = FALSE; - ParsePos = ParseLine; - CurChar = _T(' '); + + InitParser(); Cmd = ParseCommandOp(C_OP_LOWEST); if (Cmd) { bIgnoreEcho = FALSE; - if (CurrentTokenType != TOK_END) + if ((CurrentTokenType != TOK_END) && + (_tcscmp(CurrentToken, _T("\n")) != 0)) + { ParseError(); + } if (bParseError) { FreeCommand(Cmd); @@ -852,7 +1505,8 @@ ParseCommand(LPTSTR Line) * for dumping the command tree for debugging purposes. */ static VOID -DumpRedir(REDIRECTION* Redirections) +DumpRedir( + IN REDIRECTION* Redirections) { REDIRECTION* Redir; @@ -870,7 +1524,9 @@ DumpRedir(REDIRECTION* Redirections) } VOID -DumpCommand(PARSED_COMMAND *Cmd, ULONG SpacePad) +DumpCommand( + IN PARSED_COMMAND* Cmd, + IN ULONG SpacePad) { /* * This macro is like DumpCommand(Cmd, Pad); @@ -884,15 +1540,19 @@ do { \ goto dump; \ } while (0) - PARSED_COMMAND *Sub; + PARSED_COMMAND* Sub; dump: + if (!Cmd) + return; + /* Space padding */ ConOutPrintf(_T("%*s"), SpacePad, _T("")); switch (Cmd->Type) { case C_COMMAND: + case C_REM: { /* Generic command name, and Type */ #ifndef MSCMD_ECHO_COMMAND_COMPAT @@ -1026,6 +1686,22 @@ dump: return; } + case C_FOR: + { + ConOutPuts(_T("for")); + /* NOTE: FOR cannot have leading redirections */ + + if (Cmd->For.Switches & FOR_DIRS) ConOutPuts(_T(" /D")); + if (Cmd->For.Switches & FOR_F) ConOutPuts(_T(" /F")); + if (Cmd->For.Switches & FOR_LOOP) ConOutPuts(_T(" /L")); + if (Cmd->For.Switches & FOR_RECURSIVE) ConOutPuts(_T(" /R")); + if (Cmd->For.Params) + ConOutPrintf(_T(" %s"), Cmd->For.Params); + ConOutPrintf(_T(" %%%c in (%s) do\n"), Cmd->For.Variable, Cmd->For.List); + /*DumpCommand*/DUMP(Cmd->Subcommands, SpacePad + 2); + return; + } + case C_IF: { ConOutPuts(_T("if")); @@ -1110,22 +1786,6 @@ dump: return; } - case C_FOR: - { - ConOutPuts(_T("for")); - /* NOTE: FOR cannot have leading redirections */ - - if (Cmd->For.Switches & FOR_DIRS) ConOutPuts(_T(" /D")); - if (Cmd->For.Switches & FOR_F) ConOutPuts(_T(" /F")); - if (Cmd->For.Switches & FOR_LOOP) ConOutPuts(_T(" /L")); - if (Cmd->For.Switches & FOR_RECURSIVE) ConOutPuts(_T(" /R")); - if (Cmd->For.Params) - ConOutPrintf(_T(" %s"), Cmd->For.Params); - ConOutPrintf(_T(" %%%c in (%s) do\n"), Cmd->For.Variable, Cmd->For.List); - /*DumpCommand*/DUMP(Cmd->Subcommands, SpacePad + 2); - return; - } - default: ConOutPrintf(_T("*** Unknown type: %x\n"), Cmd->Type); break; @@ -1139,14 +1799,19 @@ dump: * batch file commands and FOR instances. */ VOID -EchoCommand(PARSED_COMMAND *Cmd) +EchoCommand( + IN PARSED_COMMAND* Cmd) { - PARSED_COMMAND *Sub; - REDIRECTION *Redir; + PARSED_COMMAND* Sub; + REDIRECTION* Redir; + + if (!Cmd) + return; switch (Cmd->Type) { case C_COMMAND: + case C_REM: { if (SubstituteForVars(Cmd->Command.First, TempBuf)) ConOutPrintf(_T("%s"), TempBuf); @@ -1224,6 +1889,23 @@ EchoCommand(PARSED_COMMAND *Cmd) break; } + case C_FOR: + { + ConOutPuts(_T("for")); + if (Cmd->For.Switches & FOR_DIRS) ConOutPuts(_T(" /D")); + if (Cmd->For.Switches & FOR_F) ConOutPuts(_T(" /F")); + if (Cmd->For.Switches & FOR_LOOP) ConOutPuts(_T(" /L")); + if (Cmd->For.Switches & FOR_RECURSIVE) ConOutPuts(_T(" /R")); + if (Cmd->For.Params) + ConOutPrintf(_T(" %s"), Cmd->For.Params); + if (Cmd->For.List && SubstituteForVars(Cmd->For.List, TempBuf)) + ConOutPrintf(_T(" %%%c in (%s) do "), Cmd->For.Variable, TempBuf); + else + ConOutPrintf(_T(" %%%c in (%s) do "), Cmd->For.Variable, Cmd->For.List); + EchoCommand(Cmd->Subcommands); + break; + } + case C_IF: { ConOutPuts(_T("if")); @@ -1246,23 +1928,6 @@ EchoCommand(PARSED_COMMAND *Cmd) break; } - case C_FOR: - { - ConOutPuts(_T("for")); - if (Cmd->For.Switches & FOR_DIRS) ConOutPuts(_T(" /D")); - if (Cmd->For.Switches & FOR_F) ConOutPuts(_T(" /F")); - if (Cmd->For.Switches & FOR_LOOP) ConOutPuts(_T(" /L")); - if (Cmd->For.Switches & FOR_RECURSIVE) ConOutPuts(_T(" /R")); - if (Cmd->For.Params) - ConOutPrintf(_T(" %s"), Cmd->For.Params); - if (Cmd->For.List && SubstituteForVars(Cmd->For.List, TempBuf)) - ConOutPrintf(_T(" %%%c in (%s) do "), Cmd->For.Variable, TempBuf); - else - ConOutPrintf(_T(" %%%c in (%s) do "), Cmd->For.Variable, Cmd->For.List); - EchoCommand(Cmd->Subcommands); - break; - } - default: ASSERT(FALSE); break; @@ -1287,15 +1952,15 @@ EchoCommand(PARSED_COMMAND *Cmd) /* * "Unparse" a command into a text form suitable for passing to CMD /C. - * Used for pipes. This is basically the same thing as EchoCommand, but - * writing into a string instead of to standard output. + * Used for pipes. This is basically the same thing as EchoCommand(), + * but writing into a string instead of to standard output. */ -TCHAR * -Unparse(PARSED_COMMAND *Cmd, TCHAR *Out, TCHAR *OutEnd) +PTCHAR +UnparseCommand( + IN PARSED_COMMAND* Cmd, + OUT PTCHAR Out, + IN PTCHAR OutEnd) { - PARSED_COMMAND *Sub; - REDIRECTION *Redir; - /* * Since this function has the annoying requirement that it must avoid * overflowing the supplied buffer, define some helper macros to make @@ -1319,13 +1984,21 @@ do { \ } while (0) #define RECURSE(Subcommand) \ do { \ - Out = Unparse(Subcommand, Out, OutEnd); \ + Out = UnparseCommand(Subcommand, Out, OutEnd); \ if (!Out) return NULL; \ } while (0) + PARSED_COMMAND* Sub; + REDIRECTION* Redir; + + if (!Cmd) + return Out; + switch (Cmd->Type) { case C_COMMAND: + case C_REM: + { /* This is fragile since there could be special characters, but * Windows doesn't bother escaping them, so for compatibility * we probably shouldn't do it either */ @@ -1334,13 +2007,17 @@ do { \ if (!SubstituteForVars(Cmd->Command.Rest, TempBuf)) return NULL; STRING(TempBuf); break; + } case C_QUIET: + { CHAR(_T('@')); RECURSE(Cmd->Subcommands); break; + } case C_BLOCK: + { CHAR(_T('(')); for (Sub = Cmd->Subcommands; Sub; Sub = Sub->Next) { @@ -1350,18 +2027,39 @@ do { \ } CHAR(_T(')')); break; + } case C_MULTI: case C_OR: case C_AND: case C_PIPE: + { Sub = Cmd->Subcommands; RECURSE(Sub); PRINTF(_T(" %s "), OpString[Cmd->Type - C_OP_LOWEST]); RECURSE(Sub->Next); break; + } + + case C_FOR: + { + STRING(_T("for")); + if (Cmd->For.Switches & FOR_DIRS) STRING(_T(" /D")); + if (Cmd->For.Switches & FOR_F) STRING(_T(" /F")); + if (Cmd->For.Switches & FOR_LOOP) STRING(_T(" /L")); + if (Cmd->For.Switches & FOR_RECURSIVE) STRING(_T(" /R")); + if (Cmd->For.Params) + PRINTF(_T(" %s"), Cmd->For.Params); + if (Cmd->For.List && SubstituteForVars(Cmd->For.List, TempBuf)) + PRINTF(_T(" %%%c in (%s) do "), Cmd->For.Variable, TempBuf); + else + PRINTF(_T(" %%%c in (%s) do "), Cmd->For.Variable, Cmd->For.List); + RECURSE(Cmd->Subcommands); + break; + } case C_IF: + { STRING(_T("if")); if (Cmd->If.Flags & IFFLAG_IGNORECASE) STRING(_T(" /I")); @@ -1380,21 +2078,7 @@ do { \ RECURSE(Sub->Next); } break; - - case C_FOR: - STRING(_T("for")); - if (Cmd->For.Switches & FOR_DIRS) STRING(_T(" /D")); - if (Cmd->For.Switches & FOR_F) STRING(_T(" /F")); - if (Cmd->For.Switches & FOR_LOOP) STRING(_T(" /L")); - if (Cmd->For.Switches & FOR_RECURSIVE) STRING(_T(" /R")); - if (Cmd->For.Params) - PRINTF(_T(" %s"), Cmd->For.Params); - if (Cmd->For.List && SubstituteForVars(Cmd->For.List, TempBuf)) - PRINTF(_T(" %%%c in (%s) do "), Cmd->For.Variable, TempBuf); - else - PRINTF(_T(" %%%c in (%s) do "), Cmd->For.Variable, Cmd->For.List); - RECURSE(Cmd->Subcommands); - break; + } default: ASSERT(FALSE); @@ -1415,24 +2099,3 @@ do { \ #undef PRINTF #undef RECURSE } - -VOID -FreeCommand(PARSED_COMMAND *Cmd) -{ - if (Cmd->Subcommands) - FreeCommand(Cmd->Subcommands); - if (Cmd->Next) - FreeCommand(Cmd->Next); - FreeRedirection(Cmd->Redirections); - if (Cmd->Type == C_IF) - { - cmd_free(Cmd->If.LeftArg); - cmd_free(Cmd->If.RightArg); - } - else if (Cmd->Type == C_FOR) - { - cmd_free(Cmd->For.Params); - cmd_free(Cmd->For.List); - } - cmd_free(Cmd); -}

1 0

[reactos] 01/01: [TRANSLATION] Polish translation update (#3233)
by Adam Słaboń 26 Sep '20

26 Sep '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=50ff45343447c3ecea03b… commit 50ff45343447c3ecea03bea5db2fd7225bfdeb49 Author: Adam Słaboń <asaillen456esx(a)gmail.com> AuthorDate: Sat Sep 26 20:42:36 2020 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Sep 26 21:42:36 2020 +0300 [TRANSLATION] Polish translation update (#3233) --- base/applications/charmap/lang/pl-PL.rc | 2 +- base/applications/rapps/lang/pl-PL.rc | 34 +-- base/applications/rapps/rappsmsg.mc | 9 +- base/applications/utilman/lang/pl-PL.rc | 13 + base/applications/utilman/utilman.rc | 3 + boot/bootdata/hivesys.inf | 11 +- dll/cpl/hotplug/hotplug.rc | 3 + dll/cpl/hotplug/lang/pl-PL.rc | 30 ++ dll/cpl/joy/lang/pl-PL.rc | 6 +- dll/shellext/fontext/lang/pl-PL.rc | 12 +- dll/shellext/mydocs/lang/pl-PL.rc | 6 + dll/shellext/mydocs/mydocs.rc | 3 + dll/win32/msxml3r/lang/pl-PL.rc | 7 + dll/win32/msxml3r/msxml3r.rc | 3 + dll/win32/shell32/lang/pl-PL.rc | 2 +- dll/win32/syssetup/lang/pl-PL.rc | 20 +- drivers/filesystems/btrfs/btrfs.inf | 9 + media/inf/hal.inf | 4 +- modules/rostests/rosautotest/rosautotestmsg.mc | 9 +- .../win32/advapi32/eventlog/MyEventProvider.mc | 31 ++- sdk/include/reactos/mc/arp_msg.mc | 68 ++++- sdk/include/reactos/mc/bootmsg.mc | 12 + sdk/include/reactos/mc/net_msg.mc | 8 +- sdk/include/reactos/mc/pciclass.mc | 303 +++++++++++++++++++++ 24 files changed, 556 insertions(+), 52 deletions(-) diff --git a/base/applications/charmap/lang/pl-PL.rc b/base/applications/charmap/lang/pl-PL.rc index 50dbdc1f9d6..99510ec7bb6 100644 --- a/base/applications/charmap/lang/pl-PL.rc +++ b/base/applications/charmap/lang/pl-PL.rc @@ -61,5 +61,5 @@ BEGIN IDS_ABOUT "&O programie..." IDS_TITLE "Tablica znaków" IDS_UNICODE "Unicode" - IDS_ALL "All" + IDS_ALL "Wszystko" END diff --git a/base/applications/rapps/lang/pl-PL.rc b/base/applications/rapps/lang/pl-PL.rc index 78ff3c3fc1a..f6814786162 100644 --- a/base/applications/rapps/lang/pl-PL.rc +++ b/base/applications/rapps/lang/pl-PL.rc @@ -74,9 +74,9 @@ BEGIN EDITTEXT IDC_DOWNLOAD_DIR_EDIT, 15, 86, 166, 12, WS_CHILD | WS_VISIBLE | WS_GROUP PUSHBUTTON "&Wybierz", IDC_CHOOSE, 187, 85, 50, 14 AUTOCHECKBOX "&Usuń instalatory programów po ich zainstalowaniu", IDC_DEL_AFTER_INSTALL, 16, 100, 218, 12 - GROUPBOX "Software source", -1, 4, 118, 240, 46 - CONTROL "Use default", IDC_SOURCE_DEFAULT, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 132, 74, 10 - CONTROL "Specified source", IDC_USE_SOURCE, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 147, 74, 10 + GROUPBOX "Źródło oprogramowania", -1, 4, 118, 240, 46 + CONTROL "Używaj domyślnego", IDC_SOURCE_DEFAULT, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 132, 76, 10 + CONTROL "Określone źródło", IDC_USE_SOURCE, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 147, 74, 10 EDITTEXT IDC_SOURCE_URL, 97, 147, 140, 12, ES_AUTOHSCROLL | WS_DISABLED GROUPBOX "Proxy", -1, 4, 166, 240, 76 CONTROL "Ustawienia systemowe proxy", IDC_PROXY_DEFAULT, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 180, 210, 10 @@ -149,7 +149,7 @@ BEGIN IDS_INFO_UNINSTALLSTR "\nKomenda deinstalacji: " IDS_INFO_MODIFYPATH "\nModyfikacja ścieżki instalacji: " IDS_INFO_INSTALLDATE "\nData instalacji: " - IDS_AINFO_PACKAGE_NAME "\nPackage Name: " + IDS_AINFO_PACKAGE_NAME "\nNazwa pakietu: " END STRINGTABLE @@ -202,7 +202,7 @@ BEGIN IDS_APPLICATIONS "Aplikacje" IDS_CHOOSE_FOLDER_TEXT "Wybierz katalog, w którym będa zapisywane pobrane programy:" IDS_CHOOSE_FOLDER_ERROR "Wybrałeś nieistniejący katalog! Czy chcesz utworzyć nowy?" - IDS_URL_INVALID "The URL you have specified is invalid or not supported. Please correct it!" + IDS_URL_INVALID "Określony adres URL jest nieprawidłowy lub nieobsługiwany. Popraw go." IDS_APP_REG_REMOVE "Czy na pewno chcesz usunąć wpis tego programu z rejestru?" IDS_INFORMATION "Informacja" IDS_UNABLE_TO_DOWNLOAD "Nie można pobrać pakietu! Nie znaleziono adresu!" @@ -219,9 +219,9 @@ BEGIN IDS_SELECTEDFORINST "Wybrane do instalacji" IDS_MISMATCH_CERT_INFO "Użyty certyfikat jest nieznany:\nSubject: %s\nIssuer: %s\nCzy chcesz mimo to kontynuować?" IDS_UNABLE_PATH "Niepoprawny format ścieżki." - IDS_APP_DISPLAY_DETAILS "details" - IDS_APP_DISPLAY_LIST "list" - IDS_APP_DISPLAY_TILE "tile" + IDS_APP_DISPLAY_DETAILS "szczegóły" + IDS_APP_DISPLAY_LIST "lista" + IDS_APP_DISPLAY_TILE "kafelki" END STRINGTABLE @@ -257,17 +257,17 @@ STRINGTABLE BEGIN IDS_DL_DIALOG_DB_DISP "Baza programów" IDS_DL_DIALOG_DB_DOWNLOAD_DISP "Aktualizowanie bazy programów…" - IDS_DL_DIALOG_DB_UNOFFICIAL_DOWNLOAD_DISP "Updating Database… (Unofficial source)" + IDS_DL_DIALOG_DB_UNOFFICIAL_DOWNLOAD_DISP "Aktualizowanie bazy programów… (nieoficjalne źródło)" END STRINGTABLE BEGIN - IDS_CMD_USAGE "Usage: " - IDS_CMD_NEED_PACKAGE_NAME "Error: option %1 expects one or more package name.\n" - IDS_CMD_NEED_FILE_NAME "Error: option %1 expects a file name.\n" - IDS_CMD_NEED_PARAMS "Error: option %1 expects one or more parameters.\n" - IDS_CMD_INVALID_OPTION "Error: Unknown or invalid command line option specified.\n" - IDS_CMD_FIND_RESULT_FOR "Find result for %1:\n" - IDS_CMD_PACKAGE_NOT_FOUND "Failed to find package %1.\n" - IDS_CMD_PACKAGE_INFO "Information about package %1:\n" + IDS_CMD_USAGE "Sposób użycia: " + IDS_CMD_NEED_PACKAGE_NAME "Błąd: oczekiwano jednej lub więcej nazw pakietu przy użyciu opcji %1.\n" + IDS_CMD_NEED_FILE_NAME "Błąd: oczekiwano nazwy pliku przy użyciu opcji %1.\n" + IDS_CMD_NEED_PARAMS "Błąd: oczekiwano jednego lub więcej parametrów przy użyciu opcji %1.\n" + IDS_CMD_INVALID_OPTION "Błąd: Określono nieprawidłową lub nieznaną opcję wiersza polecenia.\n" + IDS_CMD_FIND_RESULT_FOR "Wynik znajdowania dla %1:\n" + IDS_CMD_PACKAGE_NOT_FOUND "Nie można odnaleźć pakietu %1.\n" + IDS_CMD_PACKAGE_INFO "Informacje o pakiecie %1:\n" END diff --git a/base/applications/rapps/rappsmsg.mc b/base/applications/rapps/rappsmsg.mc index 433fc39bf3e..118238be870 100644 --- a/base/applications/rapps/rappsmsg.mc +++ b/base/applications/rapps/rappsmsg.mc @@ -7,7 +7,8 @@ Error=0x3:STATUS_SEVERITY_ERROR) FacilityNames=(System=0x0:FACILITY_SYSTEM) -LanguageNames=(English=0x409:MSG00409) +LanguageNames=(English=0x409:MSG00409 + Polish=0x415:MSG00415) MessageId=1 Severity=Success @@ -16,6 +17,9 @@ SymbolicName=MSG_SUCCESS_INSTALL Language=English Installation of the program "%1" is called. . +Language=Polish +Wywołano instalację programu "%1". +. MessageId=2 Severity=Success @@ -24,4 +28,7 @@ SymbolicName=MSG_SUCCESS_REMOVE Language=English Removal of the program "%1" is called. . +Language=Polish +Wywołano usunięcie programu "%1". +. diff --git a/base/applications/utilman/lang/pl-PL.rc b/base/applications/utilman/lang/pl-PL.rc new file mode 100644 index 00000000000..b8a9f9bfffe --- /dev/null +++ b/base/applications/utilman/lang/pl-PL.rc @@ -0,0 +1,13 @@ +/* + * PROJECT: ReactOS Utility Manager (Accessibility) + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Polish translation resource + */ + +LANGUAGE LANG_POLISH, SUBLANG_DEFAULT + +STRINGTABLE +BEGIN + IDS_FAIL_INIT "Nie można zainicjować biblioteki Menedżera narzędzi! Kod błędu to %lu." + IDS_FAIL_INIT_TITLE "Błąd inicjowania" +END diff --git a/base/applications/utilman/utilman.rc b/base/applications/utilman/utilman.rc index a44ea7d2951..e71e236e569 100644 --- a/base/applications/utilman/utilman.rc +++ b/base/applications/utilman/utilman.rc @@ -34,6 +34,9 @@ IDI_ICON_UTILMAN ICON "res/utilman.ico" #ifdef LANGUAGE_JA_JP #include "lang/ja-JP.rc" #endif +#ifdef LANGUAGE_PL_PL + #include "lang/pl-PL.rc" +#endif #ifdef LANGUAGE_RO_RO #include "lang/ro-RO.rc" #endif diff --git a/boot/bootdata/hivesys.inf b/boot/bootdata/hivesys.inf index fd212c03001..e64bbb6bb11 100644 --- a/boot/bootdata/hivesys.inf +++ b/boot/bootdata/hivesys.inf @@ -2400,8 +2400,11 @@ AUDIO_SERVICE_DESCRIPTION="Zapewnia aplikacjom dostęp do urządzeń audio." BITS_SERVICE="Usługa inteligentnego transferu w tle" BITS_SERVICE_DESCRIPTION="Przenosi dane pomiędzy klientami a serwerami w tle." -DCOMLAUNCH_SERVICE="DcomLaunch service" -DCOMLAUNCH_SERVICE_DESCRIPTION="DcomLaunch service stub." +BROWSER_SERVICE="Przeglądarka komputera" +BROWSER_SERVICE_DESCRIPTION="Utrzymuje aktualną listę komputerów w sieci i dostarcza ją do komputerów wyznaczonych jako przeglądarki." + +DCOMLAUNCH_SERVICE="Usługa DcomLaunch" +DCOMLAUNCH_SERVICE_DESCRIPTION="Namiastka usługi DcomLaunch" EVENTLOG_SERVICE="Dziennik zdarzeń" EVENTLOG_SERVICE_DESCRIPTION="Zapisuje zdarzenia lub wiadomości wysyłane przez system operacyjny do bazy danych dostępnej za pomocą podglądu zdarzeń." @@ -2418,8 +2421,8 @@ PLUGPLAY_SERVICE_DESCRIPTION="Wykrywa zmiany w sprzęcie i instaluje potrzebne o RPCSS_SERVICE="Zdalne wykonywanie procedur" RPCSS_SERVICE_DESCRIPTION="Podsystem RPC, który jest odpowiedzialny za zdalne wykonywanie procedur na tym komputerze." -SAMSS_SERVICE="Security Accounts Manager" -SAMSS_SERVICE_DESCRIPTION="The startup of this service signals other services that the Security Accounts Manager (SAM) is ready to accept requests. Disabling this service will prevent other services in the system from being notified when the SAM is ready, which may in turn cause those services to fail to start correctly. This service should not be disabled." +SAMSS_SERVICE="Menedżer kont zabezpieczeń" +SAMSS_SERVICE_DESCRIPTION="Uruchomienie tej usługi informuje inne usługi, że Menedżer kont zabezpieczeń jest gotowy do akceptowania żądań. Wyłączenie tej usługi spowoduje, że inne usługi w systemie nie będą powiadamiane o gotowości Menedżera kont zabezpieczeń, przez co te usługi mogą być uruchamiane nieprawidłowo. Tej usługi nie należy wyłączać." SCHEDULE_SERVICE="Usługa Harmonogram" SCHEDULE_SERVICE_DESCRIPTION="Umożliwia uruchamianie programów w określonym czasie." diff --git a/dll/cpl/hotplug/hotplug.rc b/dll/cpl/hotplug/hotplug.rc index 5dbff6b0252..b9c6eca7b96 100644 --- a/dll/cpl/hotplug/hotplug.rc +++ b/dll/cpl/hotplug/hotplug.rc @@ -42,6 +42,9 @@ IDI_HOTPLUG ICON "resources/1.ico" #ifdef LANGUAGE_JA_JP #include "lang/ja-JP.rc" #endif +#ifdef LANGUAGE_PL_PL + #include "lang/pl-PL.rc" +#endif #ifdef LANGUAGE_PT_PT #include "lang/pt-PT.rc" #endif diff --git a/dll/cpl/hotplug/lang/pl-PL.rc b/dll/cpl/hotplug/lang/pl-PL.rc new file mode 100644 index 00000000000..15d2e5848f2 --- /dev/null +++ b/dll/cpl/hotplug/lang/pl-PL.rc @@ -0,0 +1,30 @@ +LANGUAGE LANG_POLISH, SUBLANG_DEFAULT + +IDD_SAFE_REMOVE_HARDWARE_DIALOG DIALOGEX 0, 0, 278, 245 +CAPTION "Bezpieczne usuwanie sprzętu" +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_HOTPLUG, IDC_SAFE_REMOVE_ICON, 7, 10, 20, 20 + LTEXT "Wybierz urządzenie, które chcesz odłączyć lub wysunąć, a następnie kliknij przycisk Zatrzymaj. Odłącz urządzenie od komputera, gdy system ReactOS powiadomi Cię, że można to bezpiecznie uczynić.", IDC_STATIC, 36, 10, 234, 24, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "&Urządzenia sprzętowe:", IDC_STATIC, 7, 42, 248, 8, WS_CHILD | WS_VISIBLE | WS_GROUP + CONTROL "", IDC_SAFE_REMOVE_DEVICE_TREE, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_DISABLEDRAGDROP | TVS_SHOWSELALWAYS | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_GROUP | WS_TABSTOP, 7, 52, 264, 102 + LTEXT "", IDC_SAFE_REMOVE_TEXT, 7, 156, 264, 16, WS_CHILD | WS_VISIBLE | WS_GROUP + PUSHBUTTON "&Właściwości", IDC_SAFE_REMOVE_PROPERTIES, 158, 178, 55, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "&Zatrzymaj", IDC_SAFE_REMOVE_STOP, 216, 178, 55, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + CONTROL "", IDC_STATIC, "static", SS_CENTER | SS_SUNKEN | WS_CHILD | WS_VISIBLE, 7, 200, 264, 1 + AUTOCHECKBOX "Wyświetl s&kładniki urządzenia", IDC_SAFE_REMOVE_DISPLAY_COMPONENTS, 7, 208, 140, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Za&mknij", IDCLOSE, 216, 224, 55, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP +END + + +/* Menus */ + +IDM_POPUP_DEVICE_TREE MENU +BEGIN + POPUP "" + BEGIN + MENUITEM "Zatrzymaj", IDM_STOP + MENUITEM "Właściwości", IDM_PROPERTIES + END +END diff --git a/dll/cpl/joy/lang/pl-PL.rc b/dll/cpl/joy/lang/pl-PL.rc index bebdba06ccf..1fa957727e8 100644 --- a/dll/cpl/joy/lang/pl-PL.rc +++ b/dll/cpl/joy/lang/pl-PL.rc @@ -15,7 +15,7 @@ CAPTION "Kontrolery gier" FONT 8, "MS Shell Dlg" BEGIN ICON IDI_CPLSYSTEM, -1, 7, 7, 20, 20 - LTEXT "Te ustawienia pomogą ci skonfigurować kontolery gier, zainstalowane na tym komputerze.", -1, 33, 7, 214, 20, NOT WS_GROUP + LTEXT "Te ustawienia pomogą ci skonfigurować kontrolery gier, zainstalowane na tym komputerze.", -1, 33, 7, 214, 20, NOT WS_GROUP GROUPBOX "&Zainstalowane kontrolery gier", -1, 7, 34, 238, 117 CONTROL "List1", IDC_CONTROLLER_LIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | 0x0000808D, 14, 44, 224, 80 PUSHBUTTON "&Dodaj.", IDC_ADD_BUTTON, 35, 129, 65, 14 @@ -62,7 +62,7 @@ BEGIN AUTORADIOBUTTON "Oś Z", IDC_Z_AXIS_RADIO, 81, 97, 35, 10, NOT WS_VISIBLE GROUPBOX "&Przyciski", -1, 137, 67, 116, 44 COMBOBOX IDC_BUTTONS_COMBO, 178, 79, 48, 50, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL, WS_EX_CLIENTEDGE - AUTOCHECKBOX "&Zawiera kontrolę obszaru widoku", IDC_INC_POINT_CHECKBOX, 7, 123, 115, 10 + AUTOCHECKBOX "&Zawiera kontrolę obszaru widoku", IDC_INC_POINT_CHECKBOX, 7, 123, 117, 10 LTEXT "&Nazwa kontrolera:", -1, 7, 139, 200, 9 EDITTEXT IDC_CONTROLLER_NAME_EDIT, 7, 150, 116, 15, ES_AUTOHSCROLL, WS_EX_CLIENTEDGE | WS_EX_STATICEDGE DEFPUSHBUTTON "OK", IDOK, 137, 150, 50, 14 @@ -89,5 +89,5 @@ BEGIN IDS_CPLSYSTEMDESCRIPTION "Dodaje, usuwa i konfiguruje Kontrolery gier, takie jak joysticki, pady czy kierownice." IDS_CONTROLLER "Kontroler" IDS_STATUS "Stan" - IDS_NONE "(None)" + IDS_NONE "(Brak)" END diff --git a/dll/shellext/fontext/lang/pl-PL.rc b/dll/shellext/fontext/lang/pl-PL.rc index 73fe7c170fc..ef1af44d0df 100644 --- a/dll/shellext/fontext/lang/pl-PL.rc +++ b/dll/shellext/fontext/lang/pl-PL.rc @@ -9,20 +9,20 @@ END STRINGTABLE BEGIN - IDS_COL_NAME "Name" + IDS_COL_NAME "Nazwa" END STRINGTABLE BEGIN - IDS_COL_FILENAME "Filename" - IDS_COL_SIZE "Size" - IDS_COL_MODIFIED "Modified" - IDS_COL_ATTR "Attributes" + IDS_COL_FILENAME "Nazwa pliku" + IDS_COL_SIZE "Rozmiar" + IDS_COL_MODIFIED "Zmodyfikowano" + IDS_COL_ATTR "Atrybuty" IDS_COL_ATTR_LETTERS "RHSAC" END STRINGTABLE BEGIN - IDS_FONT_PREVIEW "Preview" + IDS_FONT_PREVIEW "Podgląd" END diff --git a/dll/shellext/mydocs/lang/pl-PL.rc b/dll/shellext/mydocs/lang/pl-PL.rc new file mode 100644 index 00000000000..bdc27ace976 --- /dev/null +++ b/dll/shellext/mydocs/lang/pl-PL.rc @@ -0,0 +1,6 @@ +LANGUAGE LANG_POLISH, SUBLANG_DEFAULT + +STRINGTABLE +{ + IDS_NOSRCFILEFOUND "Nie odnaleziono pliku lub folderu źródłowego '%ls'." +} diff --git a/dll/shellext/mydocs/mydocs.rc b/dll/shellext/mydocs/mydocs.rc index 9f6f11aad4c..e64e77cfe44 100644 --- a/dll/shellext/mydocs/mydocs.rc +++ b/dll/shellext/mydocs/mydocs.rc @@ -24,6 +24,9 @@ IDR_MYDOCS REGISTRY "res/mydocs.rgs" #ifdef LANGUAGE_JA_JP #include "lang/ja-JP.rc" #endif +#ifdef LANGUAGE_PL_PL + #include "lang/pl-PL.rc" +#endif #ifdef LANGUAGE_RU_RU #include "lang/ru-RU.rc" #endif diff --git a/dll/win32/msxml3r/lang/pl-PL.rc b/dll/win32/msxml3r/lang/pl-PL.rc new file mode 100644 index 00000000000..fc1a6ad753a --- /dev/null +++ b/dll/win32/msxml3r/lang/pl-PL.rc @@ -0,0 +1,7 @@ +LANGUAGE LANG_POLISH, SUBLANG_NEUTRAL + +STRINGTABLE +BEGIN + IDS_XML_FILE "Dokument XML" + IDS_XLS_FILE "Arkusz stylów XSL" +END diff --git a/dll/win32/msxml3r/msxml3r.rc b/dll/win32/msxml3r/msxml3r.rc index c3a7f7099cc..3a88788dd22 100644 --- a/dll/win32/msxml3r/msxml3r.rc +++ b/dll/win32/msxml3r/msxml3r.rc @@ -26,6 +26,9 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #ifdef LANGUAGE_IT_IT #include "lang/it-IT.rc" #endif +#ifdef LANGUAGE_PL_PL + #include "lang/pl-PL.rc" +#endif #ifdef LANGUAGE_RO_RO #include "lang/ro-RO.rc" #endif diff --git a/dll/win32/shell32/lang/pl-PL.rc b/dll/win32/shell32/lang/pl-PL.rc index 2d6e65dce66..beb02fd2ba6 100644 --- a/dll/win32/shell32/lang/pl-PL.rc +++ b/dll/win32/shell32/lang/pl-PL.rc @@ -938,7 +938,7 @@ BEGIN IDS_EDIT_VERB "Edytuj" IDS_FIND_VERB "Wyszukaj" IDS_PRINT_VERB "Drukuj" - IDS_CMD_VERB "&Wiersz poleceń tutaj" + IDS_CMD_VERB "&Otwórz wiersz polecenia tutaj" IDS_FILE_FOLDER "%u Plików, %u Katalogów" IDS_PRINTERS "Drukarki" diff --git a/dll/win32/syssetup/lang/pl-PL.rc b/dll/win32/syssetup/lang/pl-PL.rc index 948850737ed..aaf74a18604 100644 --- a/dll/win32/syssetup/lang/pl-PL.rc +++ b/dll/win32/syssetup/lang/pl-PL.rc @@ -23,16 +23,16 @@ BEGIN END IDD_PRODUCT DIALOGEX 0, 0, 317, 143 -CAPTION "ReactOS Setup" +CAPTION "Instalator systemu ReactOS" STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUPWINDOW | WS_CAPTION | WS_VISIBLE FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_PRODUCT_ICON, 5, 5, 20, 20 - LTEXT "Please choose a product option:", IDC_STATIC, 35, 7, 230, 12 - LTEXT "Product &Options:", IDC_STATIC, 5, 32, 85, 10 + LTEXT "Wybierz opcję produktu:", IDC_STATIC, 35, 7, 230, 12 + LTEXT "&Opcje produktu:", IDC_STATIC, 5, 32, 85, 10 COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 170, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - GROUPBOX "Product Information", IDC_STATIC, 5, 50, 305, 85 - LTEXT "Description:", IDC_STATIC, 20, 65, 70, 10 + GROUPBOX "Informacje o produkcie", IDC_STATIC, 5, 50, 305, 85 + LTEXT "Opis:", IDC_STATIC, 20, 65, 70, 10 EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 65, 205, 60, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL END @@ -242,11 +242,11 @@ END STRINGTABLE BEGIN - IDS_PRODUCTTITLE "Product Options" - IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour of the system." + IDS_PRODUCTTITLE "Opcje produktu" + IDS_PRODUCTSUBTITLE "Możesz wybrać opcję produktu, która wpłynie na sposób działania systemu." IDS_PRODUCTSERVERNAME "ReactOS Server" IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation" - IDS_PRODUCTSERVERINFO "The system will be recognized as a server. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are independent from ""My Documents""." - IDS_PRODUCTWORKSTATIONINFO "The system will be recognized as a workstation. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are in ""My Documents""." - IDS_DEFAULT "(Default)" + IDS_PRODUCTSERVERINFO "System będzie rozpoznawany jako serwer. Foldery prywatne ""Moje obrazy"", ""Moje wideo"" i ""Moja muzyka"" są niezależne od folderu ""Moje dokumenty""." + IDS_PRODUCTWORKSTATIONINFO "System będzie rozpoznawany jako stacja robocza. Foldery prywatne ""Moje obrazy"", ""Moje wideo"" i ""Moja muzyka"" są w folderze ""Moje dokumenty""." + IDS_DEFAULT "(Domyślnie)" END diff --git a/drivers/filesystems/btrfs/btrfs.inf b/drivers/filesystems/btrfs/btrfs.inf index e7f4833ee35..09c4f1bdde1 100644 --- a/drivers/filesystems/btrfs/btrfs.inf +++ b/drivers/filesystems/btrfs/btrfs.inf @@ -127,3 +127,12 @@ DriverName = "btrfs" DiskId1 = "Btrfs Device Installation Disk" VolumeName = "Btrfs volume" ControllerName = "Btrfs controller" + +[Strings.0415] +Me = "Mark Harmstone" +ServiceDescription = "Sterownik systemu plików Btrfs" +ServiceName = "btrfs" +DriverName = "btrfs" +DiskId1 = "Dysk instalacyjny urządzenia Btrfs" +VolumeName = "Wolumin Btrfs" +ControllerName = "Kontroler Btrfs" diff --git a/media/inf/hal.inf b/media/inf/hal.inf index 8049fddad96..2d27ea92785 100644 --- a/media/inf/hal.inf +++ b/media/inf/hal.inf @@ -95,9 +95,9 @@ acpipic_up.DeviceDesc = "Komputer PC z interfejsem ACPI" e_isa_up.DeviceDesc = "Standardowy komputer PC" MsftMfg = "Microsoft Corporation" -xbox.DeviceDesc = "Original Xbox (x86 based)" +xbox.DeviceDesc = "Oryginalny Xbox (oparty na procesorze x86)" -pc98_up.DeviceDesc = "Uniprocessor NEC PC-98" +pc98_up.DeviceDesc = "Komputer NEC PC-98" [Strings.0418] ReactOS = "Echipa ReactOS" diff --git a/modules/rostests/rosautotest/rosautotestmsg.mc b/modules/rostests/rosautotest/rosautotestmsg.mc index f560dadd689..d36c532355f 100644 --- a/modules/rostests/rosautotest/rosautotestmsg.mc +++ b/modules/rostests/rosautotest/rosautotestmsg.mc @@ -7,7 +7,8 @@ Error=0x3:STATUS_SEVERITY_ERROR) FacilityNames=(System=0x0:FACILITY_SYSTEM Application=0xFFF) -LanguageNames=(English=0x409:MSG00409) +LanguageNames=(English=0x409:MSG00409 + Polish=0x415:MSG00415) MessageId=1 Severity=Informational @@ -16,6 +17,9 @@ SymbolicName=MSG_TESTS_STARTED Language=English ReactOS Automatic Testing Utility is started. . +Language=Polish +Uruchomiono narzędzie automatycznych testów systemu ReactOS. +. MessageId=2 Severity=Success @@ -24,4 +28,7 @@ SymbolicName=MSG_TESTS_SUCCESSFUL Language=English ReactOS Automatic Testing Utility is successful. . +Language=Polish +Narzędzie automatycznych testów systemu ReactOS pomyślnie zakończyło działanie. +. diff --git a/modules/rostests/win32/advapi32/eventlog/MyEventProvider.mc b/modules/rostests/win32/advapi32/eventlog/MyEventProvider.mc index ad5e11af0d3..bec81bac503 100644 --- a/modules/rostests/win32/advapi32/eventlog/MyEventProvider.mc +++ b/modules/rostests/win32/advapi32/eventlog/MyEventProvider.mc @@ -16,7 +16,8 @@ FacilityNames=(System=0x0:FACILITY_SYSTEM Io=0x4:FACILITY_IO_ERROR_CODE ) -LanguageNames=(English=0x409:MSG00409) +LanguageNames=(English=0x409:MSG00409 + Polish=0x415:MSG00415) ; // The following are the categories of events. @@ -28,18 +29,27 @@ SymbolicName=NETWORK_CATEGORY Language=English Network Events . +Language=Polish +Zdarzenia sieciowe +. MessageId=0x2 SymbolicName=DATABASE_CATEGORY Language=English Database Events . +Language=Polish +Zdarzenia bazy danych +. MessageId=0x3 SymbolicName=UI_CATEGORY Language=English UI Events . +Language=Polish +Zdarzenia interfejsu użytkownika +. ; // The following are the message definitions. @@ -53,6 +63,9 @@ SymbolicName=MSG_INVALID_COMMAND Language=English The command is not valid. . +Language=Polish +To polecenie jest nieprawidłowe. +. MessageId=0x101 @@ -62,6 +75,9 @@ SymbolicName=MSG_BAD_FILE_CONTENTS Language=English File %1 contains content that is not valid. . +Language=Polish +Plik %1 ma nieprawidłową zawartość. +. MessageId=0x102 Severity=Warning @@ -71,6 +87,10 @@ Language=English There have been %1 retries with %2 success! Disconnect from the server and try again later. . +Language=Polish +Podjęto %1 ponownych prób, %2 zakończyło się sukcesem! Odłącz +od serwera i spróbuj ponownie później. +. MessageId=0x103 Severity=Informational @@ -79,6 +99,9 @@ SymbolicName=MSG_COMPUTE_CONVERSION Language=English %1 %%4096 = %2 %%4097. . +Language=Polish +%1 %%4096 = %2 %%4097. +. ; // The following are the parameter strings */ @@ -91,6 +114,9 @@ SymbolicName=QUARTS_UNITS Language=English quarts%0 . +Language=Polish +kwarty%0 +. MessageId=0x1001 Severity=Success @@ -99,4 +125,7 @@ SymbolicName=GALLONS_UNITS Language=English gallons%0 . +Language=Polish +galony%0 +. diff --git a/sdk/include/reactos/mc/arp_msg.mc b/sdk/include/reactos/mc/arp_msg.mc index a573c300440..920aaac7643 100644 --- a/sdk/include/reactos/mc/arp_msg.mc +++ b/sdk/include/reactos/mc/arp_msg.mc @@ -10,7 +10,7 @@ FacilityNames=(System=0x0:FACILITY_SYSTEM ) LanguageNames=(English=0x409:MSG00409 - ) + Polish=0x415:MSG00415) MessageId=10000 SymbolicName=MSG_ARP_SYNTAX @@ -47,6 +47,40 @@ Example: > arp -s 157.55.85.212 00-aa-00-62-c6-09 .... Adds a static entry. > arp -a .... Displays the arp table. . +Language=Polish +Wyświetla i modyfikuje tabelę translacji adresów IP na adresy +fizyczne, używane przez protokół rozróżniania adresów (ARP). + +ARP -s inet_addr eth_addr [if_addr] +ARP -d inet_addr [if_addr] +ARP -a [inet_addr] [-N if_addr] + + -a Wyświetla bieżące wpisy protokołu ARP przez odpytywanie + bieżących danych protokołu. Jeżeli inet_addr jest + określony, to wyświetlany jest adres IP i fizyczny dla + określonego komputera. Jeżeli więcej niż jeden interfejs + sieciowy korzysta z protokołu ARP, to wyświetlane są wpisy dla + każdej tabeli protokołu ARP. + -g To samo co -a. + inet_addr Określa adres internetowy. + -N if_addr Wyświetla wpisy protokołu ARP dla interfejsu sieciowego + określonego przez if_addr. + -d Usuwa hosta określonego przez inet_addr. W inet_addr można + użyć symbolu wieloznacznego * do usunięcia wszystkich hostów. + -s Dodaje hosta i kojarzy adres internetowy inet_addr + z fizycznym adresem internetowym eth_addr. Adres + fizyczny jest reprezentowany przez 6 szesnastkowych + bajtów oddzielonych znakami łącznika. Wpis dokonywany + jest na stałe. + eth_addr Określa adres fizyczny. + if_addr Jeżeli jest określony, to wskazuje adres interfejsu, którego + tabela translacji powinna zostać zmieniona. + Jeżeli nie jest określony, zostanie użyty pierwszy + odpowiadający interfejs. +Przykłady: + > arp -s 157.55.85.212 00-aa-00-62-c6-09 .... Dodaje statyczny wpis. + > arp -a .... Wyświetla tabelę arp. +. MessageId=10001 SymbolicName=MSG_ARP_BAD_IP_ADDRESS @@ -55,6 +89,9 @@ Facility=System Language=English ARP: bad IP address: %1 . +Language=Polish +ARP: zły adres IP: %1 +. MessageId=10002 SymbolicName=MSG_ARP_BAD_ARGUMENT @@ -63,6 +100,9 @@ Facility=System Language=English ARP: bad argument: %1 . +Language=Polish +ARP: zły argument: %1 +. MessageId=10003 SymbolicName=MSG_ARP_INTERFACE @@ -73,6 +113,11 @@ Language=English Interface: %1!s! --- 0x%2!lx! Internet Address Physical Address Type . +Language=Polish + +Interfejs: %1!s! --- 0x%2!lx! + Adres internetowy Adres fizyczny Typ +. MessageId=10004 SymbolicName=MSG_ARP_NO_MEMORY @@ -81,6 +126,9 @@ Facility=System Language=English ARP: not enough memory . +Language=Polish +ARP: za mało pamięci +. MessageId=10005 SymbolicName=MSG_ARP_OTHER @@ -89,6 +137,9 @@ Facility=System Language=English other%0 . +Language=Polish +inny%0 +. MessageId=10006 SymbolicName=MSG_ARP_INVALID @@ -97,6 +148,9 @@ Facility=System Language=English invalid%0 . +Language=Polish +nieprawidłowy%0 +. MessageId=10007 SymbolicName=MSG_ARP_DYNAMIC @@ -105,6 +159,9 @@ Facility=System Language=English dynamic%0 . +Language=Polish +dynamiczny%0 +. MessageId=10008 SymbolicName=MSG_ARP_STATIC @@ -113,6 +170,9 @@ Facility=System Language=English static%0 . +Language=Polish +statyczny%0 +. MessageId=10013 SymbolicName=MSG_ARP_ENTRY_FORMAT @@ -121,6 +181,9 @@ Facility=System Language=English %1!-20s! %2!-20s! %3!-10s! . +Language=Polish + %1!-20s! %2!-20s! %3!-10s! +. MessageId=10018 SymbolicName=MSG_ARP_NO_ENTRIES @@ -129,3 +192,6 @@ Facility=System Language=English No ARP entires found . +Language=Polish +Nie znaleziono żadnych wpisów ARP +. diff --git a/sdk/include/reactos/mc/bootmsg.mc b/sdk/include/reactos/mc/bootmsg.mc index 3ab18e6f039..0ee6ef810f6 100644 --- a/sdk/include/reactos/mc/bootmsg.mc +++ b/sdk/include/reactos/mc/bootmsg.mc @@ -1,17 +1,29 @@ +LanguageNames=(English=0x409:MSG00409 + Polish=0x415:MSG00415) + MessageId=9001 SymbolicName=BM_MSG_FIRST Language=English BM_MSG_FIRST . +Language=Polish +BM_MSG_FIRST +. MessageId=9002 SymbolicName=BM_MSG_BCD_ERROR Language=English The Boot Configuration Data for your PC is missing or contains errors. . +Language=Polish +Dane konfiguracji rozruchu komputera nie istnieją lub zawierają błędy. +. MessageId=9999 SymbolicName=BM_MSG_TEST Language=English We are A-ok!!! . +Language=Polish +Wszystko jest OK!!! +. diff --git a/sdk/include/reactos/mc/net_msg.mc b/sdk/include/reactos/mc/net_msg.mc index 1144a614a09..65cd066a00d 100644 --- a/sdk/include/reactos/mc/net_msg.mc +++ b/sdk/include/reactos/mc/net_msg.mc @@ -3173,11 +3173,11 @@ Options Are as follows: NET HELP command | MORE displays Help one screen at a time. . Language=Polish -NET USER tworzy i modyfikuje konta użytkowników na komputerach. -Stosowane bez przełączników, listy kont uzytkowników na komputerze. -Konto użytkownika informacje są przechowywane w bazie danych kont użytkowników. +NET USER tworzy i modyfikuje konta użytkowników na komputerach. Użyte bez +przełączników wyświetla listę kont użytkowników na komputerze. Informacja +o kontach użytkowników przechowywana jest w bazie danych kont użytkowników. -nazwaużytkownika +nazwa_użytkownika Nazwa konta użytkownika do dodania, usunięcia, modyfikacji lub wyświetlenia. Nazwa konta użytkownika może składać się maksymalnie z 20 znaków. diff --git a/sdk/include/reactos/mc/pciclass.mc b/sdk/include/reactos/mc/pciclass.mc index d41b6f35a78..7aa20297d7e 100644 --- a/sdk/include/reactos/mc/pciclass.mc +++ b/sdk/include/reactos/mc/pciclass.mc @@ -1,599 +1,902 @@ +LanguageNames=(English=0x409:MSG00409 + Polish=0x415:MSG00415) + MessageId=0 SymbolicName=NONE Language=English PCI Device . +Language=Polish +Urządzenie PCI +. MessageId=1 SymbolicName=NONE Language=English VGA Device . +Language=Polish +Urządzenie VGA +. MessageId=256 SymbolicName=NONE Language=English SCSI Controller . +Language=Polish +Kontroler SCSI +. MessageId=257 SymbolicName=NONE Language=English IDE Controller . +Language=Polish +Kontroler IDE +. MessageId=258 SymbolicName=NONE Language=English Floppy Controller . +Language=Polish +Kontroler dyskietek +. MessageId=259 SymbolicName=NONE Language=English IPI Controller . +Language=Polish +Kontroler IPI +. MessageId=260 SymbolicName=NONE Language=English RAID Controller . +Language=Polish +Kontroler RAID +. MessageId=261 SymbolicName=NONE Language=English ATA Controller . +Language=Polish +Kontroler ATA +. MessageId=262 SymbolicName=NONE Language=English Serial ATA Controller . +Language=Polish +Kontroler Serial ATA +. MessageId=263 SymbolicName=NONE Language=English SAS Controller . +Language=Polish +Kontroler SAS +. MessageId=384 SymbolicName=NONE Language=English Mass Storage Controller . +Language=Polish +Kontroler pamięci masowej +. MessageId=512 SymbolicName=NONE Language=English Ethernet Controller . +Language=Polish +Kontroler Ethernet +. MessageId=513 SymbolicName=NONE Language=English Token Ring Network Controller . +Language=Polish +Kontroler sieci typu Token Ring +. MessageId=514 SymbolicName=NONE Language=English FDDI Network Controller . +Language=Polish +Kontroler sieci typu FDDI +. MessageId=515 SymbolicName=NONE Language=English ATM Network Controller . +Language=Polish +Kontroler sieci typu ATM +. MessageId=516 SymbolicName=NONE Language=English ISDN Controller . +Language=Polish +Kontroler ISDN +. MessageId=517 SymbolicName=NONE Language=English WorldFip Controller . +Language=Polish +Kontroler WorldFip +. MessageId=640 SymbolicName=NONE Language=English Network Controller . +Language=Polish +Kontroler sieci +. MessageId=768 SymbolicName=NONE Language=English Video Controller (VGA Compatible) . +Language=Polish +Kontroler wideo (zgodny z VGA) +. MessageId=769 SymbolicName=NONE Language=English Video Controller (VGA Compatible) . +Language=Polish +Kontroler wideo (zgodny z VGA) +. MessageId=770 SymbolicName=NONE Language=English 3D Video Controller . +Language=Polish +Kontroler wideo 3W +. MessageId=896 SymbolicName=NONE Language=English Video Controller . +Language=Polish +Kontroler wideo +. MessageId=1024 SymbolicName=NONE Language=English Multimedia Video Controller . +Language=Polish +Kontroler multimediów wideo +. MessageId=1025 SymbolicName=NONE Language=English Multimedia Audio Controller . +Language=Polish +Kontroler multimediów audio +. MessageId=1026 SymbolicName=NONE Language=English Computer Telephony Device . +Language=Polish +Komputerowe urządzenie telefoniczne +. MessageId=1152 SymbolicName=NONE Language=English Multimedia Controller . +Language=Polish +Kontroler multimediów +. MessageId=1280 SymbolicName=NONE Language=English PCI Memory . +Language=Polish +Pamięć PCI +. MessageId=1281 SymbolicName=NONE Language=English PCI FLASH Memory . +Language=Polish +Pamięć PCI FLASH +. MessageId=1408 SymbolicName=NONE Language=English PCI Memory Controller . +Language=Polish +Kontroler pamięci PCI +. MessageId=1536 SymbolicName=NONE Language=English PCI HOST Bridge . +Language=Polish +Mostek PCI HOST +. MessageId=1537 SymbolicName=NONE Language=English PCI to ISA Bridge . +Language=Polish +Mostek PCI do ISA +. MessageId=1538 SymbolicName=NONE Language=English PCI to EISA Bridge . +Language=Polish +Mostek PCI do EISA +. MessageId=1539 SymbolicName=NONE Language=English PCI to Micro Channel Bridge . +Language=Polish +Mostek PCI do Micro Channel +. MessageId=1540 SymbolicName=NONE Language=English PCI to PCI Bridge . +Language=Polish +Mostek PCI do PCI +. MessageId=1541 SymbolicName=NONE Language=English PCI to PCMCIA Bridge . +Language=Polish +Mostek PCI do PCMCIA +. MessageId=1542 SymbolicName=NONE Language=English PCI to NUBUS Bridge . +Language=Polish +Mostek PCI do NUBUS +. MessageId=1543 SymbolicName=NONE Language=English PCI to CARDBUS Bridge . +Language=Polish +Mostek PCI do CARDBUS +. MessageId=1544 SymbolicName=NONE Language=English PCI to RACEway Bridge . +Language=Polish +Mostek PCI-RACEway +. MessageId=1545 SymbolicName=NONE Language=English Semi-transparent PCI to PCI Bridge . +Language=Polish +Półprzeźroczysty mostek PCI do PCI +. MessageId=1546 SymbolicName=NONE Language=English Infiniband to PCI Host Bridge . +Language=Polish +Mostek Infiniband do hosta PCI +. MessageId=1664 SymbolicName=NONE Language=English Other PCI Bridge Device . +Language=Polish +Inne urządzenie typu mostek PCI +. MessageId=1792 SymbolicName=NONE Language=English PCI Serial Port . +Language=Polish +Port szeregowy PCI +. MessageId=1793 SymbolicName=NONE Language=English PCI Parallel Port . +Language=Polish +Port równoległy PCI +. MessageId=1794 SymbolicName=NONE Language=English PCI Multiport Serial Controller . +Language=Polish +Wieloportowy kontroler szeregowy PCI +. MessageId=1795 SymbolicName=NONE Language=English PCI Modem . +Language=Polish +Modem PCI +. MessageId=1796 SymbolicName=NONE Language=English PCI GBIB Controller . +Language=Polish +Kontroler PCI GBIB +. MessageId=1797 SymbolicName=NONE Language=English PCI Smart Card . +Language=Polish +Karta inteligentna PCI +. MessageId=1920 SymbolicName=NONE Language=English PCI Simple Communications Controller . +Language=Polish +Kontroler PCI Simple Communications +. MessageId=2048 SymbolicName=NONE Language=English System Interrupt Controller . +Language=Polish +Kontroler przerwań systemowych +. MessageId=2049 SymbolicName=NONE Language=English System DMA Controller . +Language=Polish +Kontroler systemowy DMA +. MessageId=2050 SymbolicName=NONE Language=English System Timer . +Language=Polish +Czasomierz systemowy +. MessageId=2051 SymbolicName=NONE Language=English Real Time CLock . +Language=Polish +Zegar czasu rzeczywistego +. MessageId=2052 SymbolicName=NONE Language=English Generic PCI Hot-Plug Controller . +Language=Polish +Rodzajowy kontroler PCI Hot-Plug +. MessageId=2053 SymbolicName=NONE Language=English SD Host Controller . +Language=Polish +Kontroler hosta SD +. MessageId=2173 SymbolicName=NONE Language=English Base System Device . +Language=Polish +Podstawowe urządzenie systemowe +. MessageId=2304 SymbolicName=NONE Language=English PCI Keyboard Controller . +Language=Polish +Kontroler klawiatury PCI +. MessageId=2305 SymbolicName=NONE Language=English PCI Digitizer . +Language=Polish +Dyskretyzator PCI +. MessageId=2306 SymbolicName=NONE Language=English PCI Mouse Controller . +Language=Polish +Kontroler myszy PCI +. MessageId=2307 SymbolicName=NONE Language=English PCI Scanner Controller . +Language=Polish +Kontroler skanera PCI +. MessageId=2308 SymbolicName=NONE Language=English PCI Gameport Controller . +Language=Polish +Kontroler portu gier PCI +. MessageId=2432 SymbolicName=NONE Language=English PCI Input Device . +Language=Polish +Urządzenie wejściowe PCI +. MessageId=2560 SymbolicName=NONE Language=English Docking Station . +Language=Polish +Stacja dokująca +. MessageId=2688 SymbolicName=NONE Language=English Docking Station (Unknown type) . +Language=Polish +Stacja dokująca (nieznanego typu) +. MessageId=2816 SymbolicName=NONE Language=English 386 Processor . +Language=Polish +Procesor 386 +. MessageId=2817 SymbolicName=NONE Language=English 486 Processor . +Language=Polish +Procesor 486 +. MessageId=2818 SymbolicName=NONE Language=English Pentium Processor . +Language=Polish +Procesor Pentium +. MessageId=2832 SymbolicName=NONE Language=English ALPHA Processor . +Language=Polish +Procesor ALPHA +. MessageId=2848 SymbolicName=NONE Language=English PowerPC Processor . +Language=Polish +Procesor PowerPC +. MessageId=2880 SymbolicName=NONE Language=English Coprocessor . +Language=Polish +Koprocesor +. MessageId=3072 SymbolicName=NONE Language=English IEEE 1394 Controller . +Language=Polish +Kontroler IEEE 1394 +. MessageId=3073 SymbolicName=NONE Language=English ACCESS Bus Controller . +Language=Polish +Kontroler magistrali ACCESS +. MessageId=3074 SymbolicName=NONE Language=English SSA Controller . +Language=Polish +Kontroler SSA +. MessageId=3075 SymbolicName=NONE Language=English Universal Serial Bus (USB) Controller . +Language=Polish +Kontroler uniwersalnej magistrali szeregowej (USB) +. MessageId=3076 SymbolicName=NONE Language=English Fibre Channel Controller . +Language=Polish +Kontroler Fibre Channel +. MessageId=3077 SymbolicName=NONE Language=English SM Bus Controller . +Language=Polish +Kontroler magistrali zarządzania systemem +. MessageId=3078 SymbolicName=NONE Language=English Infiniband Controller . +Language=Polish +Kontroler Infiniband +. MessageId=3079 SymbolicName=NONE Language=English IPMI Interface . +Language=Polish +Interfejs IPMI +. MessageId=3080 SymbolicName=NONE Language=English SERCOS Interface . +Language=Polish +Interfejs SERCOS +. MessageId=3081 SymbolicName=NONE Language=English CANbus Controller . +Language=Polish +Kontroler CANbus +. MessageId=3328 SymbolicName=NONE Language=English iRDA Compatible Controller . +Language=Polish +Kontroler zgodny z iRDA +. MessageId=3329 SymbolicName=NONE Language=English Consumer IR Controller . +Language=Polish +Kontroler Consumer IR +. MessageId=3344 SymbolicName=NONE Language=English RF Controller . +Language=Polish +Kontroler częstotliwości radiowej +. MessageId=3345 SymbolicName=NONE Language=English Bluetooth Controller . +Language=Polish +Kontroler Bluetooth +. MessageId=3346 SymbolicName=NONE Language=English Broadband Controller . +Language=Polish +Kontroler szerokopasmowy +. MessageId=3360 SymbolicName=NONE Language=English Ethernet 802.11a Controller . +Language=Polish +Kontroler Ethernet 802.11a +. MessageId=3361 SymbolicName=NONE Language=English Ethernet 802.11b Controller . +Language=Polish +Kontroler Ethernet 802.11b +. MessageId=3456 SymbolicName=NONE Language=English PCI Wireless Controller . +Language=Polish +Kontroler bezprzewodowy PCI +. MessageId=3584 SymbolicName=NONE Language=English Intelligent I/O (I2O) Controller . +Language=Polish +Kontroler We/Wy Intelligent (I2O) +. MessageId=3841 SymbolicName=NONE Language=English Satellite Communications Television Controller . +Language=Polish +Kontroler telewizji dla komunikacji satelitarnej +. MessageId=3842 SymbolicName=NONE Language=English Satellite Communications Audio Controller . +Language=Polish +Kontroler audio dla komunikacji satelitarnej +. MessageId=3843 SymbolicName=NONE Language=English Satellite Communications Voice Controller . +Language=Polish +Kontroler głosu dla komunikacji satelitarnej +. MessageId=3844 SymbolicName=NONE Language=English Satellite Communications Data Controller . +Language=Polish +Kontroler danych dla komunikacji satelitarnej +. MessageId=4096 SymbolicName=NONE Language=English Network and Computing Encryption/Decryption Controller . +Language=Polish +Kontroler szyfrowania/odszyfrowywania danych sieciowych i komputerowych +. MessageId=4112 SymbolicName=NONE Language=English Entertainment Encryption/Decryption Controller . +Language=Polish +Kontroler szyfrowania/odszyfrowywania rozrywki +. MessageId=4224 SymbolicName=NONE Language=English PCI Encryption/Decryption Controller . +Language=Polish +Kontroler szyfrowania/odszyfrowywania PCI +. MessageId=4352 SymbolicName=NONE Language=English DPIO Module . +Language=Polish +Moduł DPIO +. MessageId=4353 SymbolicName=NONE Language=English Performance Counters . +Language=Polish +Liczniki wydajności +. MessageId=4368 SymbolicName=NONE Language=English PCI Communications Synchronization plus Time and Frequency Test/Measurement Controller . +Language=Polish +Kontroler PCI synchronizacji komunikacji oraz testowania/pomiaru czasu i częstotliwości +. MessageId=4384 SymbolicName=NONE Language=English Management Card . +Language=Polish +Karta zarządzania +. MessageId=4480 SymbolicName=NONE Language=English PCI Data Acquisition and Signal Processing Controller . +Language=Polish +Kontroler PCI gromadzenia danych i przetwarzania sygnałów +.

1 0

[reactos] 01/01: [CMD_ROSTEST] Add more tests for the command echoer and new tests for the parser.
by Hermès Bélusca-Maïto 26 Sep '20

26 Sep '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7988a2ac54da88240b632… commit 7988a2ac54da88240b632d00c7597a7f6da13db9 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Mon Jul 27 19:29:59 2020 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Sep 26 17:51:07 2020 +0200 [CMD_ROSTEST] Add more tests for the command echoer and new tests for the parser. --- modules/rostests/win32/cmd/test_echoer_parser.cmd | 451 +++++++++++++++++++++ .../rostests/win32/cmd/test_echoer_parser.cmd.exp | 295 ++++++++++++++ 2 files changed, 746 insertions(+) diff --git a/modules/rostests/win32/cmd/test_echoer_parser.cmd b/modules/rostests/win32/cmd/test_echoer_parser.cmd index e94313871f7..ecb20a63afd 100644 --- a/modules/rostests/win32/cmd/test_echoer_parser.cmd +++ b/modules/rostests/win32/cmd/test_echoer_parser.cmd @@ -251,6 +251,457 @@ if 1==1 ( ) + +:: Parsing FOR, IF and REM commands. +:: +:: Note: wrong syntaxes for FOR, IF, REM or parsing operators +:: are considered syntactic errors and batch running stops. +:: For all other commands, execution continues. +:: + +@echo on + +echo --------- Parsing FOR, IF and REM commands --------- + +fOr@space@@space@@space@@tab@@tab@ /d@space@@space@@tab@ %%d iN (*)@space@@space@@tab@ do eCHo %%d +:for /asdf +:: for /d %%d in (*) do echo %%d +:: for /d %%d in (*) do echo %%~fd +for /d %%d in (*) do echo %%~ed +for /d %%d in (*) do echo %~d0: +fOr@tab@@space@@space@@space@@space@@space@@space@@space@@space@@tab@/l@space@@tab@ %%c@space@@space@@tab@ iN@tab@ (1,1,5)@space@@space@@tab@ Do@space@@space@@tab@@space@@tab@ echo@tab@@space@@space@@space@@space@@tab@@tab@%%c + + +iF@space@@space@@tab@ 457@space@@tab@@space@@tab@neQ@space@@space@@tab@ 458@space@@tab@ (@space@@tab@ echo@space@@tab@ %~d0 ) eLSe (@space@@space@@tab@ echo $~d0@space@@tab@ ) + +::: if 457 nea 458 (echo %~d0) eLSe (echo $~dp) +:if 457 nea 458 (echo yo) else (echo ya) +:if 457 leq 458 (rem/? /d) +:: if 457 leq 458 ( if 457 nea 458 (echo hi) else (echo yo) ) + +iF@space@@space@@tab@ "2147483647"@space@@space@@tab@ gEq@space@@tab@@space@@tab@ "2147483648"@space@@tab@ (Echo Larger)@space@@space@@tab@ Else@space@@tab@ (:Echo Smaller) +ecHO sMaLlEr) + +iF@space@@space@@tab@eRrOrlevel 0 echo hi! + + +:: rem@tab@@space@@tab@ /df@space@@space@@tab@ /d + +rEM /v@space@@tab@/d +REm@space@@space@@space@@tab@@tab@ /d +rEm REM2 /d +reM@space@@tab@ /d@space@@tab@ >@space@@tab@ NUL +:reM /?/d + +:: These commands, even commented out via the parser comment colon, +:: cause parsing errors even when being commented out. +:: Replace the two '%' by a single one to see the effects. +:: +:echo %~f0 %%~dp %~p1 +:echo %%~d0 $~dp +:echo %%~dp: +:echo %%~b0 + + + +:: +:: Parsing random commands +:: + +echo --------- Parsing random commands --------- + +:: Parsing these commands should fail (when being un-commmented). +:@a ( b & | +: a ( b & | + +:: If goto fails, batch stops. (Done OK in ROS' cmd) +:goto /asdf whatever + +dir > NUL &(b) + + +setlocal enabledelayedexpansion + +echo %~dp0 + +set SOMEVAR=C:\ReAcToS +rem %SOMEVAR% | + +Set "_var=first" +Set "_var=second" & Rem %_var% !_var! +Set "_var=third" & Echo %_var% !_var! + +endlocal + + + +:: +:: Parsing line continuations, either from parenthesized blocks +:: or via the escape caret. +:: It may be informative to manually run this test under CMD +:: with cmd!fDumpTokens and cmd!fDumpParse flags enabled. +:: + +echo --------- Parsing line continuations --------- + +( +a & b +c +d +) +:: +:: Parsed as: +:: '('[ '&'[a, CRLF[b, CRLF[c,d] ] ] ] +:: + + +( +a && b +c +d +) +:: +:: Parsed as: +:: '('[ CRLF['&&'[a,b], CRLF[c,d]] ] +:: + + +(a & b) + +( +a & b +) + + +( +a & b +c & d +) + + +(a & ^ +b +c & d +) +:: +:: Parsed as: +:: '('[ '&'[a, CRLF[b, '&'[c,d] ] ] +:: + + +( +a & b +c +d +) +:: +:: Parsed as: +:: '('[ '&'[a, CRLF[b, CRLF[c,d] ] ] ] +:: + + +( +a && b +c +d +) +:: +:: Parsed as: +:: '('[ CRLF['&&'[a,b], CRLF[c,d]] ] +:: + + +( +a || b +c +d +) +:: +:: Parsed as: +:: '('[ CRLF['||'[a,b], CRLF[c,d]] ] +:: + + +( +a +b & c +d +) +:: +:: Parsed as: +:: '('[ CRLF[a, '&'[b, CRLF[c,d]]] ] +:: + + +( +a +b && c +d +) +:: +:: Parsed as: +:: '('[ CRLF[a, CRLF['&&'[b,c], d]] ] +:: + + +( +a +b +c && d +) +:: +:: Parsed as: +:: '('[ CRLF[a, CRLF[b, '&&'[c,d]]] ] +:: + + +( +a +b +c & d +) +:: +:: Parsed as: +:: '('[ CRLF[a, CRLF[b, '&'[c,d]]] ] +:: + + +( +a +b + +c +d +) +:: +:: Parsed as: +:: '('[ CRLF[a, CRLF[b, CRLF[c,d] ] ] ] +:: + + + +REM foo^ +bar^ +baz trol^ + + +if 1==1 (echo a) else (echo b) + +if 1==1 (echo a +) else (echo b) + +if 1==1 (echo a) else ( +echo b) + +if 1==1 ( +echo a +) else ( +echo b +) + + +REM if 1==1 (^ +REM echo a +REM ) ^ +REM else +REM (^ +REM echo b +REM ) + + +REM if 1==1 (^ +REM echo a +REM ) ^ +REM else^ +REM (^ +REM echo b +REM ) + + +REM if 1==1 (^ +REM echo a +REM ) ^ +REM else^ +REM ( +REM echo b +REM ) + + +if 1==1 (^ +echo a +) + + +if 1==1 (^ +@echo a +) + + + +(foo ^ +bar +) + +(foo ^ +&& bar +baz +) + +(foo ^ + && bar +baz +) + +REM (foo^ +REM && bar +REM baz +REM ) + +(foo^ +bar +baz +) + + +(foo &^ +& bar +baz +) + + +(^ +foo +bar +) + + + +( + + +foo ^ +bar +) + + + +( + + +foo ^ +&& bar +baz +) + + + +( + + +foo ^ + && bar +baz +) + + + + +REM ( +REM +REM +REM foo^ +REM && bar +REM baz +REM ) + + + +( + + +foo^ +bar +baz +) + + + +( + + +foo &^ +& bar +baz +) + + + +( + + +^ +foo +bar +) + + + +:: +:: Tests for Character Escape and Line Continuation +:: + +(^"!pc::^=^!^") + +(^ +"!pc::^=^!^") + +( +^"!pc::^=^!^") + + +(^"!pc::^=^ +% New line % +!^") + +REM @ 2>&1 ( ( dir) ) && lol + + +echo & ^ +&&lol + + +REM echo & ^ +REM ^ +REM &&lol + + +trol ^ +&&lol + + +trol^ +&&lol + + +REM (echo hi)^ +REM &&lol + + +rem trol(^ +line +@rem trol2""^ +line2 +:trol3^ +line3 + +echo trol^ +line + +:echo trol^ +line + + + @echo off :: diff --git a/modules/rostests/win32/cmd/test_echoer_parser.cmd.exp b/modules/rostests/win32/cmd/test_echoer_parser.cmd.exp index 796b31eef76..65c909ea3e3 100644 --- a/modules/rostests/win32/cmd/test_echoer_parser.cmd.exp +++ b/modules/rostests/win32/cmd/test_echoer_parser.cmd.exp @@ -322,4 +322,299 @@ updated TN == TN updated TN == TN updated TN == TN updated TN == TN + +@pwd@>echo --------- Parsing FOR, IF and REM commands ---------@space@ +--------- Parsing FOR, IF and REM commands --------- + +@pwd@>fOr / %d iN (*) do eCHo %d@space@ + +@pwd@>eCHo script_testsuite@space@ +script_testsuite + +@pwd@>for / %d in (*) do echo %~ed@space@ + +@pwd@>echo %~ed@space@ +%~ed + +@pwd@>for / %d in (*) do echo D::@space@ + +@pwd@>echo D::@space@ +D:: + +@pwd@>fOr /L %c iN (1 1 5) Do echo@tab@@space@@space@@space@@space@@tab@@tab@%c@space@ + +@pwd@>echo@tab@@space@@space@@space@@space@@tab@@tab@1@space@ +@space@@space@@space@@space@@tab@@tab@1 + +@pwd@>echo@tab@@space@@space@@space@@space@@tab@@tab@2@space@ +@space@@space@@space@@space@@tab@@tab@2 + +@pwd@>echo@tab@@space@@space@@space@@space@@tab@@tab@3@space@ +@space@@space@@space@@space@@tab@@tab@3 + +@pwd@>echo@tab@@space@@space@@space@@space@@tab@@tab@4@space@ +@space@@space@@space@@space@@tab@@tab@4 + +@pwd@>echo@tab@@space@@space@@space@@space@@tab@@tab@5@space@ +@space@@space@@space@@space@@tab@@tab@5 + +@pwd@>iF 457 NEQ 458 (echo@space@@tab@ D: ) eLSe (echo $~d0@space@@tab@ )@space@ +@tab@ D:@space@ + +@pwd@>iF "2147483647" GEQ "2147483648" (Echo Larger ) Else (ecHO sMaLlEr )@space@ +sMaLlEr + +@pwd@>iF eRrOrlevel 0 echo hi!@space@ +hi + +@pwd@>rEM /v@space@@tab@/d@space@ + +@pwd@>REm@space@@space@@space@@tab@@tab@ /d@space@ + +@pwd@>rEm REM2 /d@space@ + +@pwd@>reM@space@@tab@ /d@space@@tab@ >@space@@tab@ NUL@space@ + +@pwd@>echo --------- Parsing random commands ---------@space@ +--------- Parsing random commands --------- + +@pwd@>dir 1>NUL & (b)@space@ + +@pwd@>setlocal enabledelayedexpansion@space@ + +@pwd@>echo @pwd@\@space@ +@pwd@\ + +@pwd@>set SOMEVAR=C:\ReAcToS@space@ + +@pwd@>rem C:\ReAcToS |@space@ + +@pwd@>Set "_var=first"@space@ + +@pwd@>Set "_var=second" & Rem first !_var!@space@ + +@pwd@>Set "_var=third" & Echo second !_var!@space@ +second third + +@pwd@>endlocal + +@pwd@>echo --------- Parsing line continuations ---------@space@ +--------- Parsing line continuations --------- + +@pwd@>(a & b@space@ + c@space@ + d)@space@ + +@pwd@>( +a && b@space@ + c@space@ + d +)@space@ + +@pwd@>(a & b)@space@ + +@pwd@>(a & b)@space@ + +@pwd@>(a & b@space@ + c & d)@space@ + +@pwd@>(a & b@space@ + c & d)@space@ + +@pwd@>(a & b@space@ + c@space@ + d)@space@ + +@pwd@>( +a && b@space@ + c@space@ + d +)@space@ + +@pwd@>( +a || b@space@ + c@space@ + d +)@space@ + +@pwd@>( +a@space@ + b & c@space@ + d +)@space@ + +@pwd@>( +a@space@ + b && c@space@ + d +)@space@ + +@pwd@>( +a@space@ + b@space@ + c && d +)@space@ + +@pwd@>( +a@space@ + b@space@ + c & d +)@space@ + +@pwd@>( +a@space@ + b@space@ + c@space@ + d +)@space@ + +@pwd@>REMbaz trol^@space@ + +@pwd@>if 1 == 1 (echo a ) else (echo b )@space@ +a + +@pwd@>if 1 == 1 (echo a ) else (echo b )@space@ +a + +@pwd@>if 1 == 1 (echo a ) else (echo b )@space@ +a + +@pwd@>if 1 == 1 (echo a ) else (echo b )@space@ +a + +@pwd@>REM if 1==1 (^@space@ + +@pwd@>REM echo a@space@ + +@pwd@>REM ) ^@space@ + +@pwd@>REM else@space@ + +@pwd@>REMREM echo b@space@ + +@pwd@>REM )@space@ + +@pwd@>REM if 1==1 (^@space@ + +@pwd@>REM echo a@space@ + +@pwd@>REM ) ^@space@ + +@pwd@>REMREM (^@space@ + +@pwd@>REM echo b@space@ + +@pwd@>REM )@space@ + +@pwd@>REM if 1==1 (^@space@ + +@pwd@>REM echo a@space@ + +@pwd@>REM ) ^@space@ + +@pwd@>REMREM (@space@ + +@pwd@>REM echo b@space@ + +@pwd@>REM )@space@ + +@pwd@>if 1 == 1 (echo a )@space@ +a + +@pwd@>if 1 == 1 ()@space@ +a + +@pwd@>(foo bar )@space@ + +@pwd@>(foo & & bar@space@ + baz)@space@ + +@pwd@>( +foo && bar@space@ + baz +)@space@ + +@pwd@>REMREM && bar@space@ + +@pwd@>REM baz@space@ + +@pwd@>REM )@space@ + +@pwd@>( +bar@space@ + baz +)@space@ + +@pwd@>(foo & & bar@space@@space@ + baz)@space@ + +@pwd@>( +foo@space@ + bar +)@space@ + +@pwd@>(foo bar )@space@ + +@pwd@>(foo & & bar@space@ + baz)@space@ + +@pwd@>( +foo && bar@space@ + baz +)@space@ + +@pwd@>REM (@space@ + +@pwd@>REM + +@pwd@>REM + +@pwd@>REMREM && bar@space@ + +@pwd@>REM baz@space@ + +@pwd@>REM )@space@ + +@pwd@>( +bar@space@ + baz +)@space@ + +@pwd@>(foo & & bar@space@@space@ + baz)@space@ + +@pwd@>( +foo@space@ + bar +)@space@ + +@pwd@>("!pc::=!")@space@ + +@pwd@>("!pc::^=^!^")@space@ + +@pwd@>("!pc::=!")@space@ + +@pwd@>(!")@space@ + +@pwd@>REM @ 2>&1 ( ( dir) ) && lol@space@ + +@pwd@>echo & & & lol +ECHO is on. + +@pwd@>REM echo & ^@space@ + +@pwd@>REMREM &&lol@space@ + +@pwd@>trol & & lol + +@pwd@>trol& & lol + +@pwd@>REM (echo hi)^@space@ + +@pwd@>REM &&lol@space@ + +@pwd@>remline@space@ + +@pwd@>echo trolline@space@ +trolline --------- Finished --------------

1 0

[reactos] 01/01: [ROSTEST] Fix copy paste bug in RtlBitmap.c
by Kyle Katarn 26 Sep '20

26 Sep '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b217d8bd149b821b2d2d1… commit b217d8bd149b821b2d2d13662606c983e150d76e Author: Kyle Katarn <contact(a)kcsoftwares.com> AuthorDate: Mon Sep 21 23:36:29 2020 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sat Sep 26 17:12:36 2020 +0200 [ROSTEST] Fix copy paste bug in RtlBitmap.c --- modules/rostests/apitests/ntdll/RtlBitmap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/rostests/apitests/ntdll/RtlBitmap.c b/modules/rostests/apitests/ntdll/RtlBitmap.c index 355ccee0aff..3b224be1e66 100644 --- a/modules/rostests/apitests/ntdll/RtlBitmap.c +++ b/modules/rostests/apitests/ntdll/RtlBitmap.c @@ -307,7 +307,7 @@ Test_RtlNumberOfSetBits(void) RtlInitializeBitMap(&BitMapHeader, Buffer, 0); ok_int(RtlNumberOfSetBits(&BitMapHeader), 0); - ok_hex(Buffer[0], IsBroken ? 0x7f00ff0f : 0x7f00ff0f); + ok_hex(Buffer[0], IsBroken ? 0x7f00ff0f : 0xff00ff0f); ok_hex(Buffer[1], 0x3F303F30); FreeGuarded(Buffer);

1 0

[reactos] 01/01: [COMDLG32] Support shortcut keys on Open/Save Dialog (#3238)
by Katayama Hirofumi MZ 26 Sep '20

26 Sep '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c8e1460ac57e7862ccef0… commit c8e1460ac57e7862ccef0b5602764b6d72167a70 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Sep 26 21:26:06 2020 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Sep 26 21:26:06 2020 +0900 [COMDLG32] Support shortcut keys on Open/Save Dialog (#3238) Enable key accelerators on File Open/Save Dialog. CORE-14332 --- dll/win32/comdlg32/cdlg.h | 3 ++ dll/win32/comdlg32/cdlg32.c | 9 +++++ dll/win32/comdlg32/filedlg.c | 94 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 106 insertions(+) diff --git a/dll/win32/comdlg32/cdlg.h b/dll/win32/comdlg32/cdlg.h index 28bb7e75268..7570acebb9e 100644 --- a/dll/win32/comdlg32/cdlg.h +++ b/dll/win32/comdlg32/cdlg.h @@ -27,6 +27,9 @@ #define COMDLG32_Atom MAKEINTATOM(0xa000) /* MS uses this one to identify props */ extern HINSTANCE COMDLG32_hInstance DECLSPEC_HIDDEN; +#ifdef __REACTOS__ +extern CRITICAL_SECTION COMDLG32_OpenFileLock DECLSPEC_HIDDEN; +#endif void COMDLG32_SetCommDlgExtendedError(DWORD err) DECLSPEC_HIDDEN; LPVOID COMDLG32_AllocMem(int size) __WINE_ALLOC_SIZE(1) DECLSPEC_HIDDEN; diff --git a/dll/win32/comdlg32/cdlg32.c b/dll/win32/comdlg32/cdlg32.c index 1c21025cfd0..95692c00a37 100644 --- a/dll/win32/comdlg32/cdlg32.c +++ b/dll/win32/comdlg32/cdlg32.c @@ -40,6 +40,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(commdlg); DECLSPEC_HIDDEN HINSTANCE COMDLG32_hInstance = 0; +#ifdef __REACTOS__ +CRITICAL_SECTION COMDLG32_OpenFileLock DECLSPEC_HIDDEN; +#endif static DWORD COMDLG32_TlsIndex = TLS_OUT_OF_INDEXES; @@ -76,6 +79,9 @@ BOOL WINAPI DllMain(HINSTANCE hInstance, DWORD Reason, LPVOID Reserved) DisableThreadLibraryCalls(hInstance); SHELL32_hInstance = GetModuleHandleA("SHELL32.DLL"); +#ifdef __REACTOS__ + InitializeCriticalSection(&COMDLG32_OpenFileLock); +#endif /* SHELL */ GPA(COMDLG32_SHSimpleIDListFromPathAW, SHELL32_hInstance, (LPCSTR)162); @@ -84,6 +90,9 @@ BOOL WINAPI DllMain(HINSTANCE hInstance, DWORD Reason, LPVOID Reserved) case DLL_PROCESS_DETACH: if (Reserved) break; if (COMDLG32_TlsIndex != TLS_OUT_OF_INDEXES) TlsFree(COMDLG32_TlsIndex); +#ifdef __REACTOS__ + DeleteCriticalSection(&COMDLG32_OpenFileLock); +#endif break; } return TRUE; diff --git a/dll/win32/comdlg32/filedlg.c b/dll/win32/comdlg32/filedlg.c index 6e5134f6ce3..49bd1d006b1 100644 --- a/dll/win32/comdlg32/filedlg.c +++ b/dll/win32/comdlg32/filedlg.c @@ -106,6 +106,78 @@ typedef struct tagLookInInfo UINT uSelectedItem; } LookInInfos; +#ifdef __REACTOS__ +/* We have to call IShellView::TranslateAccelerator to handle the standard + key bindings of File Open Dialog. We use hook to realize them. */ +static HHOOK s_hFileDialogHook = NULL; +static LONG s_nFileDialogHookCount = 0; + +#define MAX_TRANSLATE 8 +static HWND s_ahwndTranslate[MAX_TRANSLATE] = { NULL }; + +static void FILEDLG95_AddRemoveTranslate(HWND hwndOld, HWND hwndNew) +{ + LONG i; + for (i = 0; i < MAX_TRANSLATE; ++i) + { + if (s_ahwndTranslate[i] == hwndOld) + { + s_ahwndTranslate[i] = hwndNew; + break; + } + } +} + +static __inline BOOL +FILEDLG95_DoTranslate(LONG i, HWND hwndFocus, LPMSG pMsg) +{ + FileOpenDlgInfos *fodInfos; + HWND hwndView; + + if (s_ahwndTranslate[i] == NULL) + return FALSE; + + fodInfos = get_filedlg_infoptr(s_ahwndTranslate[i]); + if (fodInfos == NULL) + return FALSE; + + hwndView = fodInfos->ShellInfos.hwndView; + if (hwndView == hwndFocus || IsChild(hwndView, hwndFocus)) + { + IShellView_TranslateAccelerator(fodInfos->Shell.FOIShellView, pMsg); + return TRUE; + } + return FALSE; +} + +/* WH_MSGFILTER hook procedure */ +static LRESULT CALLBACK +FILEDLG95_TranslateMsgProc(INT nCode, WPARAM wParam, LPARAM lParam) +{ + LPMSG pMsg; + + if (nCode < 0) + return CallNextHookEx(s_hFileDialogHook, nCode, wParam, lParam); + if (nCode != MSGF_DIALOGBOX) + return 0; + + pMsg = (LPMSG)lParam; + if (WM_KEYFIRST <= pMsg->message && pMsg->message <= WM_KEYLAST) + { + LONG i; + HWND hwndFocus = GetFocus(); + EnterCriticalSection(&COMDLG32_OpenFileLock); + for (i = 0; i < MAX_TRANSLATE; ++i) + { + if (FILEDLG95_DoTranslate(i, hwndFocus, pMsg)) + break; + } + LeaveCriticalSection(&COMDLG32_OpenFileLock); + } + + return 0; +} +#endif /*********************************************************************** * Defines and global variables @@ -1428,6 +1500,17 @@ INT_PTR CALLBACK FileOpenDlgProc95(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM l if(fodInfos->ofnInfos->Flags & OFN_EXPLORER) SendCustomDlgNotificationMessage(hwnd,CDN_SELCHANGE); +#ifdef __REACTOS__ + /* Enable hook and translate */ + EnterCriticalSection(&COMDLG32_OpenFileLock); + if (++s_nFileDialogHookCount == 1) + { + s_hFileDialogHook = SetWindowsHookEx(WH_MSGFILTER, FILEDLG95_TranslateMsgProc, + 0, GetCurrentThreadId()); + } + FILEDLG95_AddRemoveTranslate(NULL, hwnd); + LeaveCriticalSection(&COMDLG32_OpenFileLock); +#endif return 0; } case WM_SIZE: @@ -1465,6 +1548,17 @@ INT_PTR CALLBACK FileOpenDlgProc95(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM l SendDlgItemMessageW(hwnd, IDC_TOOLBARPLACES, TB_SETIMAGELIST, 0, 0); ImageList_Destroy(himl); } +#ifdef __REACTOS__ + /* Disable hook and translate */ + EnterCriticalSection(&COMDLG32_OpenFileLock); + FILEDLG95_AddRemoveTranslate(hwnd, NULL); + if (--s_nFileDialogHookCount == 0) + { + UnhookWindowsHookEx(s_hFileDialogHook); + s_hFileDialogHook = NULL; + } + LeaveCriticalSection(&COMDLG32_OpenFileLock); +#endif return FALSE; }

1 0

[reactos] 01/01: [DRIVERS][SCSIPORT] Fix build fdc47e7
by Katayama Hirofumi MZ 26 Sep '20

26 Sep '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1062a297bf9549b0bd9cd… commit 1062a297bf9549b0bd9cd8b16875bf28ccd4bb1f Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Sep 26 11:19:58 2020 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Sat Sep 26 11:20:11 2020 +0900 [DRIVERS][SCSIPORT] Fix build fdc47e7 --- drivers/storage/port/scsiport/stubs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/storage/port/scsiport/stubs.c b/drivers/storage/port/scsiport/stubs.c index e23fb369472..e2ac2107677 100644 --- a/drivers/storage/port/scsiport/stubs.c +++ b/drivers/storage/port/scsiport/stubs.c @@ -6,7 +6,7 @@ * PROGRAMMER: Timo Kreuzer (timo.kreuzer(a)reactos.org) */ -#include "precomp.h" +#include "scsiport.h" #include <srb.h>

1 0

[reactos] 01/01: [USER32] Mute 'Imm Api Table Init 2' spam
by Katayama Hirofumi MZ 26 Sep '20

26 Sep '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f341e60fbe5a6377c292f… commit f341e60fbe5a6377c292f82022e1433cb0b9f66d Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Sep 26 11:13:43 2020 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Sat Sep 26 11:13:43 2020 +0900 [USER32] Mute 'Imm Api Table Init 2' spam CORE-11700 --- win32ss/user/user32/misc/imm.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/win32ss/user/user32/misc/imm.c b/win32ss/user/user32/misc/imm.c index 03e040230a9..ef821aea8fa 100644 --- a/win32ss/user/user32/misc/imm.c +++ b/win32ss/user/user32/misc/imm.c @@ -55,9 +55,6 @@ BOOL WINAPI IntInitializeImmEntryTable(VOID) WCHAR ImmFile[MAX_PATH]; HMODULE imm32 = ghImm32; - if (IMM_FN(ImmWINNLSEnableIME) != IMMSTUB_ImmWINNLSEnableIME) - return TRUE; - GetImmFileName(ImmFile, sizeof(ImmFile)); TRACE("File %ws\n",ImmFile); @@ -104,11 +101,8 @@ BOOL WINAPI User32InitializeImmEntryTable(DWORD magic) if (magic != IMM_INIT_MAGIC) return FALSE; - if (gImmApiEntries.pImmIsIME != 0) - { - ERR("Imm Api Table Init 2\n"); - return TRUE; - } + if (IMM_FN(ImmIsIME) != IMMSTUB_ImmIsIME) + return TRUE; IntInitializeImmEntryTable();

1 0

[reactos] 01/01: [SCSIPORT][FORMATTING] Fix formatting and PCH generation
by Victor Perevertkin 26 Sep '20

26 Sep '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fdc47e7ea7fe0564f37f9… commit fdc47e7ea7fe0564f37f975a5c2d74adfaa41acd Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Sat Sep 26 03:47:52 2020 +0300 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Sat Sep 26 03:47:52 2020 +0300 [SCSIPORT][FORMATTING] Fix formatting and PCH generation --- drivers/storage/port/scsiport/CMakeLists.txt | 5 +- drivers/storage/port/scsiport/precomp.h | 6 - drivers/storage/port/scsiport/scsiport.c | 1454 ++++++++++---------- .../port/scsiport/{scsiport_int.h => scsiport.h} | 8 + 4 files changed, 702 insertions(+), 771 deletions(-) diff --git a/drivers/storage/port/scsiport/CMakeLists.txt b/drivers/storage/port/scsiport/CMakeLists.txt index 0fa44c3f0b1..74304049d99 100644 --- a/drivers/storage/port/scsiport/CMakeLists.txt +++ b/drivers/storage/port/scsiport/CMakeLists.txt @@ -3,15 +3,14 @@ spec2def(scsiport.sys scsiport.spec ADD_IMPORTLIB) list(APPEND SOURCE scsiport.c - stubs.c - precomp.h) + stubs.c) add_library(scsiport MODULE ${SOURCE} scsiport.rc ${CMAKE_CURRENT_BINARY_DIR}/scsiport.def) -add_pch(scsiport precomp.h SOURCE) +add_pch(scsiport scsiport.h "") set_module_type(scsiport kernelmodedriver) add_importlibs(scsiport ntoskrnl hal) add_cd_file(TARGET scsiport DESTINATION reactos/system32/drivers NO_CAB FOR all) diff --git a/drivers/storage/port/scsiport/precomp.h b/drivers/storage/port/scsiport/precomp.h deleted file mode 100644 index 69afc4093c3..00000000000 --- a/drivers/storage/port/scsiport/precomp.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef _SCSIPORT_PCH_ -#define _SCSIPORT_PCH_ - -#include <wdm.h> - -#endif /* _SCSIPORT_PCH_ */ diff --git a/drivers/storage/port/scsiport/scsiport.c b/drivers/storage/port/scsiport/scsiport.c index f0adf12384e..2155a2c069d 100644 --- a/drivers/storage/port/scsiport/scsiport.c +++ b/drivers/storage/port/scsiport/scsiport.c @@ -1,46 +1,18 @@ /* - * ReactOS kernel - * Copyright (C) 2001, 2002 ReactOS Team - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS Storage Stack - * FILE: drivers/storage/scsiport/scsiport.c - * PURPOSE: SCSI port driver - * PROGRAMMER: Eric Kohl - * Aleksey Bragin (aleksey reactos org) + * PROJECT: ReactOS Storage Stack + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: SCSI Port driver SCSI requests handling + * COPYRIGHT: Eric Kohl (eric.kohl(a)reactos.org) + * Aleksey Bragin (aleksey(a)reactos.org) */ /* INCLUDES *****************************************************************/ -#include "precomp.h" - -#include <ntddk.h> -#include <stdio.h> -#include <scsi.h> -#include <ntddscsi.h> -#include <ntdddisk.h> -#include <mountdev.h> +#include "scsiport.h" #define NDEBUG #include <debug.h> -#include "scsiport_int.h" - ULONG InternalDebugLevel = 0x00; #undef ScsiPortMoveMemory @@ -58,21 +30,21 @@ SpiGetPciConfigData(IN PDRIVER_OBJECT DriverObject, static NTSTATUS NTAPI ScsiPortCreateClose(IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp); + IN PIRP Irp); static DRIVER_DISPATCH ScsiPortDispatchScsi; static NTSTATUS NTAPI ScsiPortDispatchScsi(IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp); + IN PIRP Irp); static NTSTATUS NTAPI ScsiPortDeviceControl(IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp); + IN PIRP Irp); static DRIVER_STARTIO ScsiPortStartIo; static VOID NTAPI ScsiPortStartIo(IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp); + IN PIRP Irp); static BOOLEAN NTAPI ScsiPortStartPacket(IN OUT PVOID Context); @@ -87,9 +59,9 @@ SpiAllocateLunExtension(IN PSCSI_PORT_DEVICE_EXTENSION DeviceExtension); static PSCSI_PORT_LUN_EXTENSION SpiGetLunExtension (IN PSCSI_PORT_DEVICE_EXTENSION DeviceExtension, - IN UCHAR PathId, - IN UCHAR TargetId, - IN UCHAR Lun); + IN UCHAR PathId, + IN UCHAR TargetId, + IN UCHAR Lun); static PSCSI_REQUEST_BLOCK_INFO SpiAllocateSrbStructures(PSCSI_PORT_DEVICE_EXTENSION DeviceExtension, @@ -105,7 +77,7 @@ SpiScanAdapter(IN PSCSI_PORT_DEVICE_EXTENSION DeviceExtension); static NTSTATUS SpiGetInquiryData (IN PSCSI_PORT_DEVICE_EXTENSION DeviceExtension, - IN PIRP Irp); + IN PIRP Irp); static PSCSI_REQUEST_BLOCK_INFO SpiGetSrbData(IN PSCSI_PORT_DEVICE_EXTENSION DeviceExtension, @@ -116,17 +88,17 @@ SpiGetSrbData(IN PSCSI_PORT_DEVICE_EXTENSION DeviceExtension, static BOOLEAN NTAPI ScsiPortIsr(IN PKINTERRUPT Interrupt, - IN PVOID ServiceContext); + IN PVOID ServiceContext); static VOID NTAPI ScsiPortDpcForIsr(IN PKDPC Dpc, - IN PDEVICE_OBJECT DpcDeviceObject, - IN PIRP DpcIrp, - IN PVOID DpcContext); + IN PDEVICE_OBJECT DpcDeviceObject, + IN PIRP DpcIrp, + IN PVOID DpcContext); static VOID NTAPI ScsiPortIoTimer(PDEVICE_OBJECT DeviceObject, - PVOID Context); + PVOID Context); IO_ALLOCATION_ACTION NTAPI @@ -221,29 +193,29 @@ NTHALAPI NTSTATUS NTAPI HalAssignSlotResources(PUNICODE_STRING, PUNICODE_STRING, /* FUNCTIONS *****************************************************************/ /********************************************************************** - * NAME EXPORTED - * DriverEntry + * NAME EXPORTED + * DriverEntry * * DESCRIPTION - * This function initializes the driver. + * This function initializes the driver. * * RUN LEVEL - * PASSIVE_LEVEL + * PASSIVE_LEVEL * * ARGUMENTS - * DriverObject - * System allocated Driver Object for this driver. + * DriverObject + * System allocated Driver Object for this driver. * - * RegistryPath - * Name of registry driver service key. + * RegistryPath + * Name of registry driver service key. * * RETURN VALUE - * Status. + * Status. */ NTSTATUS NTAPI DriverEntry(IN PDRIVER_OBJECT DriverObject, - IN PUNICODE_STRING RegistryPath) + IN PUNICODE_STRING RegistryPath) { DPRINT("ScsiPort Driver %s\n", VERSION); return(STATUS_SUCCESS); @@ -251,35 +223,35 @@ DriverEntry(IN PDRIVER_OBJECT DriverObject, /********************************************************************** - * NAME EXPORTED - * ScsiDebugPrint + * NAME EXPORTED + * ScsiDebugPrint * * DESCRIPTION - * Prints debugging messages. + * Prints debugging messages. * * RUN LEVEL - * PASSIVE_LEVEL + * PASSIVE_LEVEL * * ARGUMENTS - * DebugPrintLevel - * Debug level of the given message. + * DebugPrintLevel + * Debug level of the given message. * - * DebugMessage - * Pointer to printf()-compatible format string. + * DebugMessage + * Pointer to printf()-compatible format string. * - * ... - Additional output data (see printf()). + * ... + Additional output data (see printf()). * * RETURN VALUE - * None. + * None. * * @implemented */ VOID ScsiDebugPrint(IN ULONG DebugPrintLevel, - IN PCHAR DebugMessage, - ...) + IN PCHAR DebugMessage, + ...) { char Buffer[256]; va_list ap; @@ -420,7 +392,7 @@ ScsiPortFlushDma(IN PVOID HwDeviceExtension) */ VOID NTAPI ScsiPortFreeDeviceBase(IN PVOID HwDeviceExtension, - IN PVOID MappedAddress) + IN PVOID MappedAddress) { PSCSI_PORT_DEVICE_EXTENSION DeviceExtension; PMAPPED_ADDRESS NextMa, LastMa; @@ -472,11 +444,11 @@ ScsiPortFreeDeviceBase(IN PVOID HwDeviceExtension, */ ULONG NTAPI ScsiPortGetBusData(IN PVOID DeviceExtension, - IN ULONG BusDataType, - IN ULONG SystemIoBusNumber, - IN ULONG SlotNumber, - IN PVOID Buffer, - IN ULONG Length) + IN ULONG BusDataType, + IN ULONG SystemIoBusNumber, + IN ULONG SlotNumber, + IN PVOID Buffer, + IN ULONG Length) { DPRINT("ScsiPortGetBusData()\n"); @@ -522,11 +494,11 @@ ScsiPortSetBusDataByOffset(IN PVOID DeviceExtension, */ PVOID NTAPI ScsiPortGetDeviceBase(IN PVOID HwDeviceExtension, - IN INTERFACE_TYPE BusType, - IN ULONG SystemIoBusNumber, - IN SCSI_PHYSICAL_ADDRESS IoAddress, - IN ULONG NumberOfBytes, - IN BOOLEAN InIoSpace) + IN INTERFACE_TYPE BusType, + IN ULONG SystemIoBusNumber, + IN SCSI_PHYSICAL_ADDRESS IoAddress, + IN ULONG NumberOfBytes, + IN BOOLEAN InIoSpace) { PSCSI_PORT_DEVICE_EXTENSION DeviceExtension; PHYSICAL_ADDRESS TranslatedAddress; @@ -581,9 +553,9 @@ ScsiPortGetDeviceBase(IN PVOID HwDeviceExtension, */ PVOID NTAPI ScsiPortGetLogicalUnit(IN PVOID HwDeviceExtension, - IN UCHAR PathId, - IN UCHAR TargetId, - IN UCHAR Lun) + IN UCHAR PathId, + IN UCHAR TargetId, + IN UCHAR Lun) { PSCSI_PORT_DEVICE_EXTENSION DeviceExtension; PSCSI_PORT_LUN_EXTENSION LunExtension; @@ -687,10 +659,10 @@ ScsiPortGetPhysicalAddress(IN PVOID HwDeviceExtension, */ PSCSI_REQUEST_BLOCK NTAPI ScsiPortGetSrb(IN PVOID DeviceExtension, - IN UCHAR PathId, - IN UCHAR TargetId, - IN UCHAR Lun, - IN LONG QueueTag) + IN UCHAR PathId, + IN UCHAR TargetId, + IN UCHAR Lun, + IN LONG QueueTag) { DPRINT1("ScsiPortGetSrb() unimplemented\n"); UNIMPLEMENTED; @@ -703,8 +675,8 @@ ScsiPortGetSrb(IN PVOID DeviceExtension, */ PVOID NTAPI ScsiPortGetUncachedExtension(IN PVOID HwDeviceExtension, - IN PPORT_CONFIGURATION_INFORMATION ConfigInfo, - IN ULONG NumberOfBytes) + IN PPORT_CONFIGURATION_INFORMATION ConfigInfo, + IN ULONG NumberOfBytes) { PSCSI_PORT_DEVICE_EXTENSION DeviceExtension; DEVICE_DESCRIPTION DeviceDescription; @@ -976,39 +948,40 @@ SpiInitOpenKeys(PCONFIGURATION_INFO ConfigInfo, PUNICODE_STRING RegistryPath) /********************************************************************** - * NAME EXPORTED - * ScsiPortInitialize + * NAME EXPORTED + * ScsiPortInitialize * * DESCRIPTION - * Initializes SCSI port driver specific data. + * Initializes SCSI port driver specific data. * * RUN LEVEL - * PASSIVE_LEVEL + * PASSIVE_LEVEL * * ARGUMENTS - * Argument1 - * Pointer to the miniport driver's driver object. + * Argument1 + * Pointer to the miniport driver's driver object. * - * Argument2 - * Pointer to the miniport driver's registry path. + * Argument2 + * Pointer to the miniport driver's registry path. * - * HwInitializationData - * Pointer to port driver specific configuration data. + * HwInitializationData + * Pointer to port driver specific configuration data. * - * HwContext - Miniport driver specific context. + * HwContext + Miniport driver specific context. * * RETURN VALUE - * Status. + * Status. * * @implemented */ ULONG NTAPI -ScsiPortInitialize(IN PVOID Argument1, - IN PVOID Argument2, - IN struct _HW_INITIALIZATION_DATA *HwInitializationData, - IN PVOID HwContext) +ScsiPortInitialize( + IN PVOID Argument1, + IN PVOID Argument2, + IN struct _HW_INITIALIZATION_DATA *HwInitializationData, + IN PVOID HwContext) { PDRIVER_OBJECT DriverObject = (PDRIVER_OBJECT)Argument1; PUNICODE_STRING RegistryPath = (PUNICODE_STRING)Argument2; @@ -1227,463 +1200,435 @@ CreatePortConfig: HwInitializationData->NumberOfAccessRanges * sizeof(ACCESS_RANGE)); } - /* Search for matching PCI device */ - if ((HwInitializationData->AdapterInterfaceType == PCIBus) && - (HwInitializationData->VendorIdLength > 0) && - (HwInitializationData->VendorId != NULL) && - (HwInitializationData->DeviceIdLength > 0) && - (HwInitializationData->DeviceId != NULL)) - { - PortConfig->BusInterruptLevel = 0; - - /* Get PCI device data */ - DPRINT("VendorId '%.*s' DeviceId '%.*s'\n", - HwInitializationData->VendorIdLength, - HwInitializationData->VendorId, - HwInitializationData->DeviceIdLength, - HwInitializationData->DeviceId); - - if (!SpiGetPciConfigData(DriverObject, - PortDeviceObject, - HwInitializationData, - PortConfig, - RegistryPath, - ConfigInfo.BusNumber, - &SlotNumber)) - { - /* Continue to the next bus, nothing here */ - ConfigInfo.BusNumber++; - DeviceExtension->PortConfig = NULL; - ExFreePool(PortConfig); - Again = FALSE; - goto CreatePortConfig; - } + /* Search for matching PCI device */ + if ((HwInitializationData->AdapterInterfaceType == PCIBus) && + (HwInitializationData->VendorIdLength > 0) && + (HwInitializationData->VendorId != NULL) && + (HwInitializationData->DeviceIdLength > 0) && (HwInitializationData->DeviceId != NULL)) + { + PortConfig->BusInterruptLevel = 0; - if (!PortConfig->BusInterruptLevel) - { - /* Bypass this slot, because no interrupt was assigned */ - DeviceExtension->PortConfig = NULL; - ExFreePool(PortConfig); - goto CreatePortConfig; - } - } - else - { - DPRINT("Non-pci bus\n"); - } - - /* Note: HwFindAdapter is called once for each bus */ - Again = FALSE; - DPRINT("Calling HwFindAdapter() for Bus %lu\n", PortConfig->SystemIoBusNumber); - Result = (HwInitializationData->HwFindAdapter)(&DeviceExtension->MiniPortDeviceExtension, - HwContext, - 0, /* BusInformation */ - ConfigInfo.Parameter, /* ArgumentString */ - PortConfig, - &Again); - - DPRINT("HwFindAdapter() Result: %lu Again: %s\n", - Result, (Again) ? "True" : "False"); - - /* Free MapRegisterBase, it's not needed anymore */ - if (DeviceExtension->MapRegisterBase != NULL) - { - ExFreePool(DeviceExtension->MapRegisterBase); - DeviceExtension->MapRegisterBase = NULL; - } - - /* If result is nothing good... */ - if (Result != SP_RETURN_FOUND) - { - DPRINT("HwFindAdapter() Result: %lu\n", Result); - - if (Result == SP_RETURN_NOT_FOUND) - { - /* We can continue on the next bus */ - ConfigInfo.BusNumber++; - Again = FALSE; + /* Get PCI device data */ + DPRINT( + "VendorId '%.*s' DeviceId '%.*s'\n", HwInitializationData->VendorIdLength, + HwInitializationData->VendorId, HwInitializationData->DeviceIdLength, + HwInitializationData->DeviceId); - DeviceExtension->PortConfig = NULL; - ExFreePool(PortConfig); - goto CreatePortConfig; - } + if (!SpiGetPciConfigData( + DriverObject, PortDeviceObject, HwInitializationData, PortConfig, RegistryPath, + ConfigInfo.BusNumber, &SlotNumber)) + { + /* Continue to the next bus, nothing here */ + ConfigInfo.BusNumber++; + DeviceExtension->PortConfig = NULL; + ExFreePool(PortConfig); + Again = FALSE; + goto CreatePortConfig; + } - /* Otherwise, break */ - Status = STATUS_INTERNAL_ERROR; - break; - } - - DPRINT("ScsiPortInitialize(): Found HBA! (%x), adapter Id %d\n", - PortConfig->BusInterruptVector, PortConfig->InitiatorBusId[0]); - - /* If the SRB extension size was updated */ - if (!DeviceExtension->NonCachedExtension && - (PortConfig->SrbExtensionSize != DeviceExtension->SrbExtensionSize)) - { - /* Set it (rounding to LONGLONG again) */ - DeviceExtension->SrbExtensionSize = - (PortConfig->SrbExtensionSize + - sizeof(LONGLONG)) & ~(sizeof(LONGLONG) - 1); - } - - /* The same with LUN extension size */ - if (PortConfig->SpecificLuExtensionSize != DeviceExtension->LunExtensionSize) - DeviceExtension->LunExtensionSize = PortConfig->SpecificLuExtensionSize; - - - if (!((HwInitializationData->AdapterInterfaceType == PCIBus) && - (HwInitializationData->VendorIdLength > 0) && - (HwInitializationData->VendorId != NULL) && - (HwInitializationData->DeviceIdLength > 0) && - (HwInitializationData->DeviceId != NULL))) - { - /* Construct a resource list */ - ResourceList = SpiConfigToResource(DeviceExtension, - PortConfig); - - if (ResourceList) - { - UNICODE_STRING UnicodeString; - RtlInitUnicodeString(&UnicodeString, L"ScsiAdapter"); - DPRINT("Reporting resources\n"); - Status = IoReportResourceUsage(&UnicodeString, - DriverObject, - NULL, - 0, - PortDeviceObject, - ResourceList, - FIELD_OFFSET(CM_RESOURCE_LIST, - List[0].PartialResourceList.PartialDescriptors) + - ResourceList->List[0].PartialResourceList.Count - * sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR), - FALSE, - &Conflict); - ExFreePool(ResourceList); - - /* In case of a failure or a conflict, break */ - if (Conflict || (!NT_SUCCESS(Status))) - { - if (Conflict) - Status = STATUS_CONFLICTING_ADDRESSES; - break; - } + if (!PortConfig->BusInterruptLevel) + { + /* Bypass this slot, because no interrupt was assigned */ + DeviceExtension->PortConfig = NULL; + ExFreePool(PortConfig); + goto CreatePortConfig; } - } - - /* Reset the Conflict var */ - Conflict = FALSE; - - /* Copy all stuff which we ever need from PortConfig to the DeviceExtension */ - if (PortConfig->MaximumNumberOfTargets > SCSI_MAXIMUM_TARGETS_PER_BUS) - DeviceExtension->MaxTargedIds = SCSI_MAXIMUM_TARGETS_PER_BUS; - else - DeviceExtension->MaxTargedIds = PortConfig->MaximumNumberOfTargets; - - DeviceExtension->BusNum = PortConfig->NumberOfBuses; - DeviceExtension->CachesData = PortConfig->CachesData; - DeviceExtension->ReceiveEvent = PortConfig->ReceiveEvent; - DeviceExtension->SupportsTaggedQueuing = PortConfig->TaggedQueuing; - DeviceExtension->MultipleReqsPerLun = PortConfig->MultipleRequestPerLu; - - /* If something was disabled via registry - apply it */ - if (ConfigInfo.DisableMultipleLun) - DeviceExtension->MultipleReqsPerLun = PortConfig->MultipleRequestPerLu = FALSE; - - if (ConfigInfo.DisableTaggedQueueing) - DeviceExtension->SupportsTaggedQueuing = PortConfig->MultipleRequestPerLu = FALSE; - - /* Check if we need to alloc SRB data */ - if (DeviceExtension->SupportsTaggedQueuing || - DeviceExtension->MultipleReqsPerLun) - { - DeviceExtension->NeedSrbDataAlloc = TRUE; - } - else - { - DeviceExtension->NeedSrbDataAlloc = FALSE; - } - - /* Get a pointer to the port capabilities */ - PortCapabilities = &DeviceExtension->PortCapabilities; - - /* Copy one field there */ - DeviceExtension->MapBuffers = PortConfig->MapBuffers; - PortCapabilities->AdapterUsesPio = PortConfig->MapBuffers; - - if (DeviceExtension->AdapterObject == NULL && - (PortConfig->DmaChannel != SP_UNINITIALIZED_VALUE || PortConfig->Master)) - { - DPRINT1("DMA is not supported yet\n"); - ASSERT(FALSE); - } - - if (DeviceExtension->SrbExtensionBuffer == NULL && - (DeviceExtension->SrbExtensionSize != 0 || - PortConfig->AutoRequestSense)) - { - DeviceExtension->SupportsAutoSense = PortConfig->AutoRequestSense; - DeviceExtension->NeedSrbExtensionAlloc = TRUE; - - /* Allocate common buffer */ - Status = SpiAllocateCommonBuffer(DeviceExtension, 0); - - /* Check for failure */ - if (!NT_SUCCESS(Status)) - break; - } - - /* Allocate SrbData, if needed */ - if (DeviceExtension->NeedSrbDataAlloc) - { - ULONG Count; - PSCSI_REQUEST_BLOCK_INFO SrbData; - - if (DeviceExtension->SrbDataCount != 0) - Count = DeviceExtension->SrbDataCount; - else - Count = DeviceExtension->RequestsNumber * 2; - - /* Allocate the data */ - SrbData = ExAllocatePoolWithTag(NonPagedPool, Count * sizeof(SCSI_REQUEST_BLOCK_INFO), TAG_SCSIPORT); - if (SrbData == NULL) - return STATUS_INSUFFICIENT_RESOURCES; - - RtlZeroMemory(SrbData, Count * sizeof(SCSI_REQUEST_BLOCK_INFO)); - - DeviceExtension->SrbInfo = SrbData; - DeviceExtension->FreeSrbInfo = SrbData; - DeviceExtension->SrbDataCount = Count; - - /* Link it to the list */ - while (Count > 0) - { - SrbData->Requests.Flink = (PLIST_ENTRY)(SrbData + 1); - SrbData++; - Count--; - } + } + else + { + DPRINT("Non-pci bus\n"); + } - /* Mark the last entry of the list */ - SrbData--; - SrbData->Requests.Flink = NULL; - } + /* Note: HwFindAdapter is called once for each bus */ + Again = FALSE; + DPRINT("Calling HwFindAdapter() for Bus %lu\n", PortConfig->SystemIoBusNumber); + Result = (HwInitializationData->HwFindAdapter)( + &DeviceExtension->MiniPortDeviceExtension, HwContext, 0, /* BusInformation */ + ConfigInfo.Parameter, /* ArgumentString */ + PortConfig, &Again); - /* Initialize port capabilities */ - PortCapabilities = &DeviceExtension->PortCapabilities; - PortCapabilities->Length = sizeof(IO_SCSI_CAPABILITIES); - PortCapabilities->MaximumTransferLength = PortConfig->MaximumTransferLength; + DPRINT("HwFindAdapter() Result: %lu Again: %s\n", Result, (Again) ? "True" : "False"); - if (PortConfig->ReceiveEvent) - PortCapabilities->SupportedAsynchronousEvents |= SRBEV_SCSI_ASYNC_NOTIFICATION; + /* Free MapRegisterBase, it's not needed anymore */ + if (DeviceExtension->MapRegisterBase != NULL) + { + ExFreePool(DeviceExtension->MapRegisterBase); + DeviceExtension->MapRegisterBase = NULL; + } - PortCapabilities->TaggedQueuing = DeviceExtension->SupportsTaggedQueuing; - PortCapabilities->AdapterScansDown = PortConfig->AdapterScansDown; + /* If result is nothing good... */ + if (Result != SP_RETURN_FOUND) + { + DPRINT("HwFindAdapter() Result: %lu\n", Result); - if (PortConfig->AlignmentMask > PortDeviceObject->AlignmentRequirement) - PortDeviceObject->AlignmentRequirement = PortConfig->AlignmentMask; + if (Result == SP_RETURN_NOT_FOUND) + { + /* We can continue on the next bus */ + ConfigInfo.BusNumber++; + Again = FALSE; - PortCapabilities->AlignmentMask = PortDeviceObject->AlignmentRequirement; + DeviceExtension->PortConfig = NULL; + ExFreePool(PortConfig); + goto CreatePortConfig; + } - if (PortCapabilities->MaximumPhysicalPages == 0) - { - PortCapabilities->MaximumPhysicalPages = - BYTES_TO_PAGES(PortCapabilities->MaximumTransferLength); + /* Otherwise, break */ + Status = STATUS_INTERNAL_ERROR; + break; + } - /* Apply miniport's limits */ - if (PortConfig->NumberOfPhysicalBreaks < PortCapabilities->MaximumPhysicalPages) - { - PortCapabilities->MaximumPhysicalPages = PortConfig->NumberOfPhysicalBreaks; - } - } + DPRINT( + "ScsiPortInitialize(): Found HBA! (%x), adapter Id %d\n", + PortConfig->BusInterruptVector, PortConfig->InitiatorBusId[0]); - /* Deal with interrupts */ - if (DeviceExtension->HwInterrupt == NULL || - (PortConfig->BusInterruptLevel == 0 && PortConfig->BusInterruptVector == 0)) - { - /* No interrupts */ - DeviceExtension->InterruptCount = 0; + /* If the SRB extension size was updated */ + if (!DeviceExtension->NonCachedExtension && + (PortConfig->SrbExtensionSize != DeviceExtension->SrbExtensionSize)) + { + /* Set it (rounding to LONGLONG again) */ + DeviceExtension->SrbExtensionSize = + (PortConfig->SrbExtensionSize + sizeof(LONGLONG)) & ~(sizeof(LONGLONG) - 1); + } - DPRINT1("Interrupt Count: 0\n"); + /* The same with LUN extension size */ + if (PortConfig->SpecificLuExtensionSize != DeviceExtension->LunExtensionSize) + DeviceExtension->LunExtensionSize = PortConfig->SpecificLuExtensionSize; - UNIMPLEMENTED; + if (!((HwInitializationData->AdapterInterfaceType == PCIBus) && + (HwInitializationData->VendorIdLength > 0) && + (HwInitializationData->VendorId != NULL) && + (HwInitializationData->DeviceIdLength > 0) && + (HwInitializationData->DeviceId != NULL))) + { + /* Construct a resource list */ + ResourceList = SpiConfigToResource(DeviceExtension, PortConfig); - /* This code path will ALWAYS crash so stop it now */ - while(TRUE); - } - else - { - BOOLEAN InterruptShareable; - KINTERRUPT_MODE InterruptMode[2]; - ULONG InterruptVector[2], i, MappedIrq[2]; - KIRQL Dirql[2], MaxDirql; - KAFFINITY Affinity[2]; + if (ResourceList) + { + UNICODE_STRING UnicodeString; + RtlInitUnicodeString(&UnicodeString, L"ScsiAdapter"); + DPRINT("Reporting resources\n"); + Status = IoReportResourceUsage(&UnicodeString, + DriverObject, + NULL, + 0, + PortDeviceObject, + ResourceList, + FIELD_OFFSET(CM_RESOURCE_LIST, + List[0].PartialResourceList.PartialDescriptors) + + ResourceList->List[0].PartialResourceList.Count * + sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR), + FALSE, + &Conflict); + ExFreePool(ResourceList); + + /* In case of a failure or a conflict, break */ + if (Conflict || (!NT_SUCCESS(Status))) + { + if (Conflict) + Status = STATUS_CONFLICTING_ADDRESSES; + break; + } + } + } - DeviceExtension->InterruptLevel[0] = PortConfig->BusInterruptLevel; - DeviceExtension->InterruptLevel[1] = PortConfig->BusInterruptLevel2; + /* Reset the Conflict var */ + Conflict = FALSE; - InterruptVector[0] = PortConfig->BusInterruptVector; - InterruptVector[1] = PortConfig->BusInterruptVector2; + /* Copy all stuff which we ever need from PortConfig to the DeviceExtension */ + if (PortConfig->MaximumNumberOfTargets > SCSI_MAXIMUM_TARGETS_PER_BUS) + DeviceExtension->MaxTargedIds = SCSI_MAXIMUM_TARGETS_PER_BUS; + else + DeviceExtension->MaxTargedIds = PortConfig->MaximumNumberOfTargets; - InterruptMode[0] = PortConfig->InterruptMode; - InterruptMode[1] = PortConfig->InterruptMode2; + DeviceExtension->BusNum = PortConfig->NumberOfBuses; + DeviceExtension->CachesData = PortConfig->CachesData; + DeviceExtension->ReceiveEvent = PortConfig->ReceiveEvent; + DeviceExtension->SupportsTaggedQueuing = PortConfig->TaggedQueuing; + DeviceExtension->MultipleReqsPerLun = PortConfig->MultipleRequestPerLu; - DeviceExtension->InterruptCount = (PortConfig->BusInterruptLevel2 != 0 || PortConfig->BusInterruptVector2 != 0) ? 2 : 1; + /* If something was disabled via registry - apply it */ + if (ConfigInfo.DisableMultipleLun) + DeviceExtension->MultipleReqsPerLun = PortConfig->MultipleRequestPerLu = FALSE; - for (i = 0; i < DeviceExtension->InterruptCount; i++) - { - /* Register an interrupt handler for this device */ - MappedIrq[i] = HalGetInterruptVector(PortConfig->AdapterInterfaceType, - PortConfig->SystemIoBusNumber, - DeviceExtension->InterruptLevel[i], - InterruptVector[i], - &Dirql[i], - &Affinity[i]); - } + if (ConfigInfo.DisableTaggedQueueing) + DeviceExtension->SupportsTaggedQueuing = PortConfig->MultipleRequestPerLu = FALSE; - if (DeviceExtension->InterruptCount == 1 || Dirql[0] > Dirql[1]) - MaxDirql = Dirql[0]; - else - MaxDirql = Dirql[1]; + /* Check if we need to alloc SRB data */ + if (DeviceExtension->SupportsTaggedQueuing || DeviceExtension->MultipleReqsPerLun) + { + DeviceExtension->NeedSrbDataAlloc = TRUE; + } + else + { + DeviceExtension->NeedSrbDataAlloc = FALSE; + } - for (i = 0; i < DeviceExtension->InterruptCount; i++) - { - /* Determine IRQ sharability as usual */ - if (PortConfig->AdapterInterfaceType == MicroChannel || - InterruptMode[i] == LevelSensitive) - { - InterruptShareable = TRUE; - } - else - { - InterruptShareable = FALSE; - } - - Status = IoConnectInterrupt(&DeviceExtension->Interrupt[i], - (PKSERVICE_ROUTINE)ScsiPortIsr, - DeviceExtension, - &DeviceExtension->IrqLock, - MappedIrq[i], - Dirql[i], - MaxDirql, - InterruptMode[i], - InterruptShareable, - Affinity[i], - FALSE); - - if (!(NT_SUCCESS(Status))) - { - DPRINT1("Could not connect interrupt %d\n", - InterruptVector[i]); - DeviceExtension->Interrupt[i] = NULL; - break; - } - } + /* Get a pointer to the port capabilities */ + PortCapabilities = &DeviceExtension->PortCapabilities; - if (!NT_SUCCESS(Status)) - break; - } - - /* Save IoAddress (from access ranges) */ - if (HwInitializationData->NumberOfAccessRanges != 0) - { - DeviceExtension->IoAddress = - ((*(PortConfig->AccessRanges))[0]).RangeStart.LowPart; - - DPRINT("Io Address %x\n", DeviceExtension->IoAddress); - } - - /* Set flag that it's allowed to disconnect during this command */ - DeviceExtension->Flags |= SCSI_PORT_DISCONNECT_ALLOWED; - - /* Initialize counter of active requests (-1 means there are none) */ - DeviceExtension->ActiveRequestCounter = -1; - - /* Analyze what we have about DMA */ - if (DeviceExtension->AdapterObject != NULL && - PortConfig->Master && - PortConfig->NeedPhysicalAddresses) - { - DeviceExtension->MapRegisters = TRUE; - } - else - { - DeviceExtension->MapRegisters = FALSE; - } - - /* Call HwInitialize at DISPATCH_LEVEL */ - KeRaiseIrql(DISPATCH_LEVEL, &OldIrql); - - if (!KeSynchronizeExecution(DeviceExtension->Interrupt[0], - DeviceExtension->HwInitialize, - DeviceExtension->MiniPortDeviceExtension)) - { - DPRINT1("HwInitialize() failed!\n"); - KeLowerIrql(OldIrql); - Status = STATUS_ADAPTER_HARDWARE_ERROR; - break; - } - - /* Check if a notification is needed */ - if (DeviceExtension->InterruptData.Flags & SCSI_PORT_NOTIFICATION_NEEDED) - { - /* Call DPC right away, because we're already at DISPATCH_LEVEL */ - ScsiPortDpcForIsr(NULL, - DeviceExtension->DeviceObject, - NULL, - NULL); - } - - /* Lower irql back to what it was */ - KeLowerIrql(OldIrql); - - /* Start our timer */ - IoStartTimer(PortDeviceObject); - - /* Initialize bus scanning information */ - BusConfigSize = FIELD_OFFSET(BUSES_CONFIGURATION_INFORMATION, - BusScanInfo[DeviceExtension->PortConfig->NumberOfBuses]); - DeviceExtension->BusesConfig = ExAllocatePoolWithTag(PagedPool, - BusConfigSize, - TAG_SCSIPORT); - if (!DeviceExtension->BusesConfig) - { - DPRINT1("Out of resources!\n"); - Status = STATUS_INSUFFICIENT_RESOURCES; - break; - } + /* Copy one field there */ + DeviceExtension->MapBuffers = PortConfig->MapBuffers; + PortCapabilities->AdapterUsesPio = PortConfig->MapBuffers; + + if (DeviceExtension->AdapterObject == NULL && + (PortConfig->DmaChannel != SP_UNINITIALIZED_VALUE || PortConfig->Master)) + { + DPRINT1("DMA is not supported yet\n"); + ASSERT(FALSE); + } + + if (DeviceExtension->SrbExtensionBuffer == NULL && + (DeviceExtension->SrbExtensionSize != 0 || PortConfig->AutoRequestSense)) + { + DeviceExtension->SupportsAutoSense = PortConfig->AutoRequestSense; + DeviceExtension->NeedSrbExtensionAlloc = TRUE; + + /* Allocate common buffer */ + Status = SpiAllocateCommonBuffer(DeviceExtension, 0); + + /* Check for failure */ + if (!NT_SUCCESS(Status)) + break; + } + + /* Allocate SrbData, if needed */ + if (DeviceExtension->NeedSrbDataAlloc) + { + ULONG Count; + PSCSI_REQUEST_BLOCK_INFO SrbData; + + if (DeviceExtension->SrbDataCount != 0) + Count = DeviceExtension->SrbDataCount; + else + Count = DeviceExtension->RequestsNumber * 2; + + /* Allocate the data */ + SrbData = ExAllocatePoolWithTag( + NonPagedPool, Count * sizeof(SCSI_REQUEST_BLOCK_INFO), TAG_SCSIPORT); + if (SrbData == NULL) + return STATUS_INSUFFICIENT_RESOURCES; + + RtlZeroMemory(SrbData, Count * sizeof(SCSI_REQUEST_BLOCK_INFO)); + + DeviceExtension->SrbInfo = SrbData; + DeviceExtension->FreeSrbInfo = SrbData; + DeviceExtension->SrbDataCount = Count; + + /* Link it to the list */ + while (Count > 0) + { + SrbData->Requests.Flink = (PLIST_ENTRY)(SrbData + 1); + SrbData++; + Count--; + } + + /* Mark the last entry of the list */ + SrbData--; + SrbData->Requests.Flink = NULL; + } + + /* Initialize port capabilities */ + PortCapabilities = &DeviceExtension->PortCapabilities; + PortCapabilities->Length = sizeof(IO_SCSI_CAPABILITIES); + PortCapabilities->MaximumTransferLength = PortConfig->MaximumTransferLength; + + if (PortConfig->ReceiveEvent) + PortCapabilities->SupportedAsynchronousEvents |= SRBEV_SCSI_ASYNC_NOTIFICATION; + + PortCapabilities->TaggedQueuing = DeviceExtension->SupportsTaggedQueuing; + PortCapabilities->AdapterScansDown = PortConfig->AdapterScansDown; + + if (PortConfig->AlignmentMask > PortDeviceObject->AlignmentRequirement) + PortDeviceObject->AlignmentRequirement = PortConfig->AlignmentMask; + + PortCapabilities->AlignmentMask = PortDeviceObject->AlignmentRequirement; + + if (PortCapabilities->MaximumPhysicalPages == 0) + { + PortCapabilities->MaximumPhysicalPages = + BYTES_TO_PAGES(PortCapabilities->MaximumTransferLength); + + /* Apply miniport's limits */ + if (PortConfig->NumberOfPhysicalBreaks < PortCapabilities->MaximumPhysicalPages) + { + PortCapabilities->MaximumPhysicalPages = PortConfig->NumberOfPhysicalBreaks; + } + } + + /* Deal with interrupts */ + if (DeviceExtension->HwInterrupt == NULL || + (PortConfig->BusInterruptLevel == 0 && PortConfig->BusInterruptVector == 0)) + { + /* No interrupts */ + DeviceExtension->InterruptCount = 0; + + DPRINT1("Interrupt Count: 0\n"); + + UNIMPLEMENTED; + + /* This code path will ALWAYS crash so stop it now */ + while (TRUE); + } + else + { + BOOLEAN InterruptShareable; + KINTERRUPT_MODE InterruptMode[2]; + ULONG InterruptVector[2], i, MappedIrq[2]; + KIRQL Dirql[2], MaxDirql; + KAFFINITY Affinity[2]; + + DeviceExtension->InterruptLevel[0] = PortConfig->BusInterruptLevel; + DeviceExtension->InterruptLevel[1] = PortConfig->BusInterruptLevel2; + + InterruptVector[0] = PortConfig->BusInterruptVector; + InterruptVector[1] = PortConfig->BusInterruptVector2; + + InterruptMode[0] = PortConfig->InterruptMode; + InterruptMode[1] = PortConfig->InterruptMode2; + + DeviceExtension->InterruptCount = + (PortConfig->BusInterruptLevel2 != 0 || + PortConfig->BusInterruptVector2 != 0) ? 2 : 1; + + for (i = 0; i < DeviceExtension->InterruptCount; i++) + { + /* Register an interrupt handler for this device */ + MappedIrq[i] = HalGetInterruptVector( + PortConfig->AdapterInterfaceType, PortConfig->SystemIoBusNumber, + DeviceExtension->InterruptLevel[i], InterruptVector[i], &Dirql[i], + &Affinity[i]); + } + + if (DeviceExtension->InterruptCount == 1 || Dirql[0] > Dirql[1]) + MaxDirql = Dirql[0]; + else + MaxDirql = Dirql[1]; + + for (i = 0; i < DeviceExtension->InterruptCount; i++) + { + /* Determine IRQ sharability as usual */ + if (PortConfig->AdapterInterfaceType == MicroChannel || + InterruptMode[i] == LevelSensitive) + { + InterruptShareable = TRUE; + } + else + { + InterruptShareable = FALSE; + } + + Status = IoConnectInterrupt( + &DeviceExtension->Interrupt[i], (PKSERVICE_ROUTINE)ScsiPortIsr, DeviceExtension, + &DeviceExtension->IrqLock, MappedIrq[i], Dirql[i], MaxDirql, InterruptMode[i], + InterruptShareable, Affinity[i], FALSE); + + if (!(NT_SUCCESS(Status))) + { + DPRINT1("Could not connect interrupt %d\n", InterruptVector[i]); + DeviceExtension->Interrupt[i] = NULL; + break; + } + } + + if (!NT_SUCCESS(Status)) + break; + } + + /* Save IoAddress (from access ranges) */ + if (HwInitializationData->NumberOfAccessRanges != 0) + { + DeviceExtension->IoAddress = ((*(PortConfig->AccessRanges))[0]).RangeStart.LowPart; + + DPRINT("Io Address %x\n", DeviceExtension->IoAddress); + } + + /* Set flag that it's allowed to disconnect during this command */ + DeviceExtension->Flags |= SCSI_PORT_DISCONNECT_ALLOWED; + + /* Initialize counter of active requests (-1 means there are none) */ + DeviceExtension->ActiveRequestCounter = -1; + + /* Analyze what we have about DMA */ + if (DeviceExtension->AdapterObject != NULL && PortConfig->Master && + PortConfig->NeedPhysicalAddresses) + { + DeviceExtension->MapRegisters = TRUE; + } + else + { + DeviceExtension->MapRegisters = FALSE; + } + + /* Call HwInitialize at DISPATCH_LEVEL */ + KeRaiseIrql(DISPATCH_LEVEL, &OldIrql); + + if (!KeSynchronizeExecution( + DeviceExtension->Interrupt[0], DeviceExtension->HwInitialize, + DeviceExtension->MiniPortDeviceExtension)) + { + DPRINT1("HwInitialize() failed!\n"); + KeLowerIrql(OldIrql); + Status = STATUS_ADAPTER_HARDWARE_ERROR; + break; + } + + /* Check if a notification is needed */ + if (DeviceExtension->InterruptData.Flags & SCSI_PORT_NOTIFICATION_NEEDED) + { + /* Call DPC right away, because we're already at DISPATCH_LEVEL */ + ScsiPortDpcForIsr(NULL, DeviceExtension->DeviceObject, NULL, NULL); + } + + /* Lower irql back to what it was */ + KeLowerIrql(OldIrql); + + /* Start our timer */ + IoStartTimer(PortDeviceObject); + + /* Initialize bus scanning information */ + BusConfigSize = FIELD_OFFSET( + BUSES_CONFIGURATION_INFORMATION, + BusScanInfo[DeviceExtension->PortConfig->NumberOfBuses]); + DeviceExtension->BusesConfig = + ExAllocatePoolWithTag(PagedPool, BusConfigSize, TAG_SCSIPORT); + if (!DeviceExtension->BusesConfig) + { + DPRINT1("Out of resources!\n"); + Status = STATUS_INSUFFICIENT_RESOURCES; + break; + } - /* Zero it */ - RtlZeroMemory(DeviceExtension->BusesConfig, BusConfigSize); + /* Zero it */ + RtlZeroMemory(DeviceExtension->BusesConfig, BusConfigSize); - /* Store number of buses there */ - DeviceExtension->BusesConfig->NumberOfBuses = (UCHAR)DeviceExtension->BusNum; + /* Store number of buses there */ + DeviceExtension->BusesConfig->NumberOfBuses = (UCHAR)DeviceExtension->BusNum; - /* Scan the adapter for devices */ - SpiScanAdapter(DeviceExtension); + /* Scan the adapter for devices */ + SpiScanAdapter(DeviceExtension); - /* Build the registry device map */ - SpiBuildDeviceMap(DeviceExtension, - (PUNICODE_STRING)Argument2); + /* Build the registry device map */ + SpiBuildDeviceMap(DeviceExtension, (PUNICODE_STRING)Argument2); - /* Create the dos device link */ - swprintf(DosNameBuffer, - L"\\??\\Scsi%lu:", - SystemConfig->ScsiPortCount); - RtlInitUnicodeString(&DosDeviceName, DosNameBuffer); - IoCreateSymbolicLink(&DosDeviceName, &DeviceName); + /* Create the dos device link */ + swprintf(DosNameBuffer, L"\\??\\Scsi%lu:", SystemConfig->ScsiPortCount); + RtlInitUnicodeString(&DosDeviceName, DosNameBuffer); + IoCreateSymbolicLink(&DosDeviceName, &DeviceName); - /* Increase the port count */ - SystemConfig->ScsiPortCount++; - FirstConfigCall = FALSE; + /* Increase the port count */ + SystemConfig->ScsiPortCount++; + FirstConfigCall = FALSE; - /* Increase adapter number and bus number respectively */ - ConfigInfo.AdapterNumber++; + /* Increase adapter number and bus number respectively */ + ConfigInfo.AdapterNumber++; - if (!Again) - ConfigInfo.BusNumber++; + if (!Again) + ConfigInfo.BusNumber++; - DPRINT("Bus: %lu MaxBus: %lu\n", ConfigInfo.BusNumber, MaxBus); + DPRINT("Bus: %lu MaxBus: %lu\n", ConfigInfo.BusNumber, MaxBus); - DeviceFound = TRUE; + DeviceFound = TRUE; } /* Clean up the mess */ @@ -1816,9 +1761,9 @@ SpiCleanupAfterInit(PSCSI_PORT_DEVICE_EXTENSION DeviceExtension) */ VOID NTAPI ScsiPortIoMapTransfer(IN PVOID HwDeviceExtension, - IN PSCSI_REQUEST_BLOCK Srb, - IN PVOID LogicalAddress, - IN ULONG Length) + IN PSCSI_REQUEST_BLOCK Srb, + IN PVOID LogicalAddress, + IN ULONG Length) { DPRINT1("ScsiPortIoMapTransfer()\n"); UNIMPLEMENTED; @@ -1829,12 +1774,12 @@ ScsiPortIoMapTransfer(IN PVOID HwDeviceExtension, */ VOID NTAPI ScsiPortLogError(IN PVOID HwDeviceExtension, - IN PSCSI_REQUEST_BLOCK Srb OPTIONAL, - IN UCHAR PathId, - IN UCHAR TargetId, - IN UCHAR Lun, - IN ULONG ErrorCode, - IN ULONG UniqueId) + IN PSCSI_REQUEST_BLOCK Srb OPTIONAL, + IN UCHAR PathId, + IN UCHAR TargetId, + IN UCHAR Lun, + IN ULONG ErrorCode, + IN ULONG UniqueId) { //PSCSI_PORT_DEVICE_EXTENSION DeviceExtension; @@ -1853,12 +1798,12 @@ ScsiPortLogError(IN PVOID HwDeviceExtension, */ VOID NTAPI ScsiPortMoveMemory(OUT PVOID Destination, - IN PVOID Source, - IN ULONG Length) + IN PVOID Source, + IN ULONG Length) { RtlMoveMemory(Destination, - Source, - Length); + Source, + Length); } @@ -1866,18 +1811,15 @@ ScsiPortMoveMemory(OUT PVOID Destination, * @implemented */ VOID -ScsiPortNotification(IN SCSI_NOTIFICATION_TYPE NotificationType, - IN PVOID HwDeviceExtension, - ...) +ScsiPortNotification(IN SCSI_NOTIFICATION_TYPE NotificationType, IN PVOID HwDeviceExtension, ...) { PSCSI_PORT_DEVICE_EXTENSION DeviceExtension; va_list ap; DPRINT("ScsiPortNotification() called\n"); - DeviceExtension = CONTAINING_RECORD(HwDeviceExtension, - SCSI_PORT_DEVICE_EXTENSION, - MiniPortDeviceExtension); + DeviceExtension = + CONTAINING_RECORD(HwDeviceExtension, SCSI_PORT_DEVICE_EXTENSION, MiniPortDeviceExtension); DPRINT("DeviceExtension %p\n", DeviceExtension); @@ -1885,18 +1827,20 @@ ScsiPortNotification(IN SCSI_NOTIFICATION_TYPE NotificationType, switch (NotificationType) { - case RequestComplete: + case RequestComplete: { PSCSI_REQUEST_BLOCK Srb; PSCSI_REQUEST_BLOCK_INFO SrbData; - Srb = (PSCSI_REQUEST_BLOCK) va_arg (ap, PSCSI_REQUEST_BLOCK); + Srb = (PSCSI_REQUEST_BLOCK)va_arg(ap, PSCSI_REQUEST_BLOCK); DPRINT("Notify: RequestComplete (Srb %p)\n", Srb); /* Make sure Srb is alright */ ASSERT(Srb->SrbStatus != SRB_STATUS_PENDING); - ASSERT(Srb->Function != SRB_FUNCTION_EXECUTE_SCSI || Srb->SrbStatus != SRB_STATUS_SUCCESS || Srb->ScsiStatus == SCSISTAT_GOOD); + ASSERT( + Srb->Function != SRB_FUNCTION_EXECUTE_SCSI || + Srb->SrbStatus != SRB_STATUS_SUCCESS || Srb->ScsiStatus == SCSISTAT_GOOD); if (!(Srb->SrbFlags & SRB_FLAGS_IS_ACTIVE)) { @@ -1916,11 +1860,8 @@ ScsiPortNotification(IN SCSI_NOTIFICATION_TYPE NotificationType, else { /* Get the SRB data */ - SrbData = SpiGetSrbData(DeviceExtension, - Srb->PathId, - Srb->TargetId, - Srb->Lun, - Srb->QueueTag); + SrbData = SpiGetSrbData( + DeviceExtension, Srb->PathId, Srb->TargetId, Srb->Lun, Srb->QueueTag); /* Make sure there are no CompletedRequests and there is a Srb */ ASSERT(SrbData->CompletedRequests == NULL && SrbData->Srb != NULL); @@ -1929,7 +1870,7 @@ ScsiPortNotification(IN SCSI_NOTIFICATION_TYPE NotificationType, if ((Srb->SrbStatus == SRB_STATUS_SUCCESS) && ((Srb->Cdb[0] == SCSIOP_READ) || (Srb->Cdb[0] == SCSIOP_WRITE))) { - ASSERT(Srb->DataTransferLength); + ASSERT(Srb->DataTransferLength); } SrbData->CompletedRequests = DeviceExtension->InterruptData.CompletedRequests; @@ -1938,40 +1879,37 @@ ScsiPortNotification(IN SCSI_NOTIFICATION_TYPE NotificationType, } break; - case NextRequest: - DPRINT("Notify: NextRequest\n"); - DeviceExtension->InterruptData.Flags |= SCSI_PORT_NEXT_REQUEST_READY; - break; + case NextRequest: + DPRINT("Notify: NextRequest\n"); + DeviceExtension->InterruptData.Flags |= SCSI_PORT_NEXT_REQUEST_READY; + break; - case NextLuRequest: + case NextLuRequest: { UCHAR PathId; UCHAR TargetId; UCHAR Lun; PSCSI_PORT_LUN_EXTENSION LunExtension; - PathId = (UCHAR) va_arg (ap, int); - TargetId = (UCHAR) va_arg (ap, int); - Lun = (UCHAR) va_arg (ap, int); + PathId = (UCHAR)va_arg(ap, int); + TargetId = (UCHAR)va_arg(ap, int); + Lun = (UCHAR)va_arg(ap, int); - DPRINT("Notify: NextLuRequest(PathId %u TargetId %u Lun %u)\n", - PathId, TargetId, Lun); + DPRINT( + "Notify: NextLuRequest(PathId %u TargetId %u Lun %u)\n", PathId, TargetId, Lun); /* Mark it in the flags field */ DeviceExtension->InterruptData.Flags |= SCSI_PORT_NEXT_REQUEST_READY; /* Get the LUN extension */ - LunExtension = SpiGetLunExtension(DeviceExtension, - PathId, - TargetId, - Lun); + LunExtension = SpiGetLunExtension(DeviceExtension, PathId, TargetId, Lun); /* If returned LunExtension is NULL, break out */ - if (!LunExtension) break; + if (!LunExtension) + break; /* This request should not be processed if */ - if ((LunExtension->ReadyLun) || - (LunExtension->SrbInfo.Srb)) + if ((LunExtension->ReadyLun) || (LunExtension->SrbInfo.Srb)) { /* Nothing to do here */ break; @@ -1980,38 +1918,37 @@ ScsiPortNotification(IN SCSI_NOTIFICATION_TYPE NotificationType, /* Add this LUN to the list */ LunExtension->ReadyLun = DeviceExtension->InterruptData.ReadyLun; DeviceExtension->InterruptData.ReadyLun = LunExtension; - } - break; + } + break; - case ResetDetected: - DPRINT("Notify: ResetDetected\n"); - /* Add RESET flags */ - DeviceExtension->InterruptData.Flags |= - SCSI_PORT_RESET | SCSI_PORT_RESET_REPORTED; - break; + case ResetDetected: + DPRINT("Notify: ResetDetected\n"); + /* Add RESET flags */ + DeviceExtension->InterruptData.Flags |= SCSI_PORT_RESET | SCSI_PORT_RESET_REPORTED; + break; - case CallDisableInterrupts: - DPRINT1("UNIMPLEMENTED SCSI Notification called: CallDisableInterrupts!\n"); - break; + case CallDisableInterrupts: + DPRINT1("UNIMPLEMENTED SCSI Notification called: CallDisableInterrupts!\n"); + break; - case CallEnableInterrupts: - DPRINT1("UNIMPLEMENTED SCSI Notification called: CallEnableInterrupts!\n"); - break; + case CallEnableInterrupts: + DPRINT1("UNIMPLEMENTED SCSI Notification called: CallEnableInterrupts!\n"); + break; - case RequestTimerCall: - DPRINT("Notify: RequestTimerCall\n"); - DeviceExtension->InterruptData.Flags |= SCSI_PORT_TIMER_NEEDED; - DeviceExtension->InterruptData.HwScsiTimer = (PHW_TIMER)va_arg(ap, PHW_TIMER); - DeviceExtension->InterruptData.MiniportTimerValue = (ULONG)va_arg(ap, ULONG); - break; + case RequestTimerCall: + DPRINT("Notify: RequestTimerCall\n"); + DeviceExtension->InterruptData.Flags |= SCSI_PORT_TIMER_NEEDED; + DeviceExtension->InterruptData.HwScsiTimer = (PHW_TIMER)va_arg(ap, PHW_TIMER); + DeviceExtension->InterruptData.MiniportTimerValue = (ULONG)va_arg(ap, ULONG); + break; - case BusChangeDetected: - DPRINT1("UNIMPLEMENTED SCSI Notification called: BusChangeDetected!\n"); - break; + case BusChangeDetected: + DPRINT1("UNIMPLEMENTED SCSI Notification called: BusChangeDetected!\n"); + break; - default: - DPRINT1 ("Unsupported notification from WMI: %lu\n", NotificationType); - break; + default: + DPRINT1("Unsupported notification from WMI: %lu\n", NotificationType); + break; } va_end(ap); @@ -2025,11 +1962,11 @@ ScsiPortNotification(IN SCSI_NOTIFICATION_TYPE NotificationType, */ BOOLEAN NTAPI ScsiPortValidateRange(IN PVOID HwDeviceExtension, - IN INTERFACE_TYPE BusType, - IN ULONG SystemIoBusNumber, - IN SCSI_PHYSICAL_ADDRESS IoAddress, - IN ULONG NumberOfBytes, - IN BOOLEAN InIoSpace) + IN INTERFACE_TYPE BusType, + IN ULONG SystemIoBusNumber, + IN SCSI_PHYSICAL_ADDRESS IoAddress, + IN ULONG NumberOfBytes, + IN BOOLEAN InIoSpace) { DPRINT("ScsiPortValidateRange()\n"); return(TRUE); @@ -2423,24 +2360,24 @@ SpiGetPciConfigData(IN PDRIVER_OBJECT DriverObject, /********************************************************************** - * NAME INTERNAL - * ScsiPortCreateClose + * NAME INTERNAL + * ScsiPortCreateClose * * DESCRIPTION - * Answer requests for Create/Close calls: a null operation. + * Answer requests for Create/Close calls: a null operation. * * RUN LEVEL - * PASSIVE_LEVEL + * PASSIVE_LEVEL * * ARGUMENTS - * DeviceObject - * Pointer to a device object. + * DeviceObject + * Pointer to a device object. * - * Irp - * Pointer to an IRP. + * Irp + * Pointer to an IRP. * * RETURN VALUE - * Status. + * Status. */ static NTSTATUS NTAPI @@ -2539,25 +2476,24 @@ SpiHandleAttachRelease(PSCSI_PORT_DEVICE_EXTENSION DeviceExtension, /********************************************************************** - * NAME INTERNAL - * ScsiPortDispatchScsi + * NAME INTERNAL + * ScsiPortDispatchScsi * * DESCRIPTION - * Answer requests for SCSI calls + * Answer requests for SCSI calls * * RUN LEVEL - * PASSIVE_LEVEL + * PASSIVE_LEVEL * * ARGUMENTS - * Standard dispatch arguments + * Standard dispatch arguments * * RETURNS - * NTSTATUS + * NTSTATUS */ static NTSTATUS NTAPI -ScsiPortDispatchScsi(IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp) +ScsiPortDispatchScsi(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { PSCSI_PORT_DEVICE_EXTENSION DeviceExtension; PSCSI_PORT_LUN_EXTENSION LunExtension; @@ -2568,8 +2504,7 @@ ScsiPortDispatchScsi(IN PDEVICE_OBJECT DeviceObject, PIRP NextIrp, IrpList; PKDEVICE_QUEUE_ENTRY Entry; - DPRINT("ScsiPortDispatchScsi(DeviceObject %p Irp %p)\n", - DeviceObject, Irp); + DPRINT("ScsiPortDispatchScsi(DeviceObject %p Irp %p)\n", DeviceObject, Irp); DeviceExtension = DeviceObject->DeviceExtension; Stack = IoGetCurrentIrpStackLocation(Irp); @@ -2585,17 +2520,14 @@ ScsiPortDispatchScsi(IN PDEVICE_OBJECT DeviceObject, IoCompleteRequest(Irp, IO_NO_INCREMENT); - return(Status); + return (Status); } DPRINT("Srb: %p\n", Srb); DPRINT("Srb->Function: %lu\n", Srb->Function); DPRINT("PathId: %lu TargetId: %lu Lun: %lu\n", Srb->PathId, Srb->TargetId, Srb->Lun); - LunExtension = SpiGetLunExtension(DeviceExtension, - Srb->PathId, - Srb->TargetId, - Srb->Lun); + LunExtension = SpiGetLunExtension(DeviceExtension, Srb->PathId, Srb->TargetId, Srb->Lun); if (LunExtension == NULL) { DPRINT("ScsiPortDispatchScsi() called with an invalid LUN\n"); @@ -2607,132 +2539,131 @@ ScsiPortDispatchScsi(IN PDEVICE_OBJECT DeviceObject, IoCompleteRequest(Irp, IO_NO_INCREMENT); - return(Status); + return (Status); } switch (Srb->Function) { - case SRB_FUNCTION_SHUTDOWN: - case SRB_FUNCTION_FLUSH: - DPRINT (" SRB_FUNCTION_SHUTDOWN or FLUSH\n"); - if (DeviceExtension->CachesData == FALSE) - { - /* All success here */ - Srb->SrbStatus = SRB_STATUS_SUCCESS; - Irp->IoStatus.Status = STATUS_SUCCESS; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - return STATUS_SUCCESS; - } - /* Fall through to a usual execute operation */ - - case SRB_FUNCTION_EXECUTE_SCSI: - case SRB_FUNCTION_IO_CONTROL: - DPRINT(" SRB_FUNCTION_EXECUTE_SCSI or SRB_FUNCTION_IO_CONTROL\n"); - /* Mark IRP as pending in all cases */ - IoMarkIrpPending(Irp); - - if (Srb->SrbFlags & SRB_FLAGS_BYPASS_FROZEN_QUEUE) - { - /* Start IO directly */ - IoStartPacket(DeviceObject, Irp, NULL, NULL); - } - else - { - KIRQL oldIrql; + case SRB_FUNCTION_SHUTDOWN: + case SRB_FUNCTION_FLUSH: + DPRINT(" SRB_FUNCTION_SHUTDOWN or FLUSH\n"); + if (DeviceExtension->CachesData == FALSE) + { + /* All success here */ + Srb->SrbStatus = SRB_STATUS_SUCCESS; + Irp->IoStatus.Status = STATUS_SUCCESS; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_SUCCESS; + } + /* Fall through to a usual execute operation */ - /* We need to be at DISPATCH_LEVEL */ - KeRaiseIrql (DISPATCH_LEVEL, &oldIrql); + case SRB_FUNCTION_EXECUTE_SCSI: + case SRB_FUNCTION_IO_CONTROL: + DPRINT(" SRB_FUNCTION_EXECUTE_SCSI or SRB_FUNCTION_IO_CONTROL\n"); + /* Mark IRP as pending in all cases */ + IoMarkIrpPending(Irp); - /* Insert IRP into the queue */ - if (!KeInsertByKeyDeviceQueue(&LunExtension->DeviceQueue, - &Irp->Tail.Overlay.DeviceQueueEntry, - Srb->QueueSortKey)) + if (Srb->SrbFlags & SRB_FLAGS_BYPASS_FROZEN_QUEUE) { - /* It means the queue is empty, and we just start this request */ + /* Start IO directly */ IoStartPacket(DeviceObject, Irp, NULL, NULL); } + else + { + KIRQL oldIrql; - /* Back to the old IRQL */ - KeLowerIrql (oldIrql); - } - return STATUS_PENDING; + /* We need to be at DISPATCH_LEVEL */ + KeRaiseIrql(DISPATCH_LEVEL, &oldIrql); - case SRB_FUNCTION_CLAIM_DEVICE: - case SRB_FUNCTION_ATTACH_DEVICE: - DPRINT (" SRB_FUNCTION_CLAIM_DEVICE or ATTACH\n"); + /* Insert IRP into the queue */ + if (!KeInsertByKeyDeviceQueue( + &LunExtension->DeviceQueue, + &Irp->Tail.Overlay.DeviceQueueEntry, + Srb->QueueSortKey)) + { + /* It means the queue is empty, and we just start this request */ + IoStartPacket(DeviceObject, Irp, NULL, NULL); + } - /* Reference device object and keep the device object */ - Status = SpiHandleAttachRelease(DeviceExtension, Irp); - break; + /* Back to the old IRQL */ + KeLowerIrql(oldIrql); + } + return STATUS_PENDING; - case SRB_FUNCTION_RELEASE_DEVICE: - DPRINT (" SRB_FUNCTION_RELEASE_DEVICE\n"); + case SRB_FUNCTION_CLAIM_DEVICE: + case SRB_FUNCTION_ATTACH_DEVICE: + DPRINT(" SRB_FUNCTION_CLAIM_DEVICE or ATTACH\n"); - /* Dereference device object and clear the device object */ - Status = SpiHandleAttachRelease(DeviceExtension, Irp); - break; + /* Reference device object and keep the device object */ + Status = SpiHandleAttachRelease(DeviceExtension, Irp); + break; - case SRB_FUNCTION_RELEASE_QUEUE: - DPRINT(" SRB_FUNCTION_RELEASE_QUEUE\n"); + case SRB_FUNCTION_RELEASE_DEVICE: + DPRINT(" SRB_FUNCTION_RELEASE_DEVICE\n"); - /* Guard with the spinlock */ - KeAcquireSpinLock(&DeviceExtension->SpinLock, &Irql); + /* Dereference device object and clear the device object */ + Status = SpiHandleAttachRelease(DeviceExtension, Irp); + break; - if (!(LunExtension->Flags & LUNEX_FROZEN_QUEUE)) - { - DPRINT("Queue is not frozen really\n"); + case SRB_FUNCTION_RELEASE_QUEUE: + DPRINT(" SRB_FUNCTION_RELEASE_QUEUE\n"); - KeReleaseSpinLock(&DeviceExtension->SpinLock, Irql); - Srb->SrbStatus = SRB_STATUS_SUCCESS; - Status = STATUS_SUCCESS; - break; + /* Guard with the spinlock */ + KeAcquireSpinLock(&DeviceExtension->SpinLock, &Irql); - } + if (!(LunExtension->Flags & LUNEX_FROZEN_QUEUE)) + { + DPRINT("Queue is not frozen really\n"); - /* Unfreeze the queue */ - LunExtension->Flags &= ~LUNEX_FROZEN_QUEUE; + KeReleaseSpinLock(&DeviceExtension->SpinLock, Irql); + Srb->SrbStatus = SRB_STATUS_SUCCESS; + Status = STATUS_SUCCESS; + break; + } - if (LunExtension->SrbInfo.Srb == NULL) - { - /* Get next logical unit request */ - SpiGetNextRequestFromLun(DeviceExtension, LunExtension); + /* Unfreeze the queue */ + LunExtension->Flags &= ~LUNEX_FROZEN_QUEUE; - /* SpiGetNextRequestFromLun() releases the spinlock */ - KeLowerIrql(Irql); - } - else - { - DPRINT("The queue has active request\n"); - KeReleaseSpinLock(&DeviceExtension->SpinLock, Irql); - } + if (LunExtension->SrbInfo.Srb == NULL) + { + /* Get next logical unit request */ + SpiGetNextRequestFromLun(DeviceExtension, LunExtension); + /* SpiGetNextRequestFromLun() releases the spinlock */ + KeLowerIrql(Irql); + } + else + { + DPRINT("The queue has active request\n"); + KeReleaseSpinLock(&DeviceExtension->SpinLock, Irql); + } - Srb->SrbStatus = SRB_STATUS_SUCCESS; - Status = STATUS_SUCCESS; - break; + Srb->SrbStatus = SRB_STATUS_SUCCESS; + Status = STATUS_SUCCESS; + break; - case SRB_FUNCTION_FLUSH_QUEUE: - DPRINT(" SRB_FUNCTION_FLUSH_QUEUE\n"); + case SRB_FUNCTION_FLUSH_QUEUE: + DPRINT(" SRB_FUNCTION_FLUSH_QUEUE\n"); - /* Guard with the spinlock */ - KeAcquireSpinLock(&DeviceExtension->SpinLock, &Irql); + /* Guard with the spinlock */ + KeAcquireSpinLock(&DeviceExtension->SpinLock, &Irql); - if (!(LunExtension->Flags & LUNEX_FROZEN_QUEUE)) - { - DPRINT("Queue is not frozen really\n"); + if (!(LunExtension->Flags & LUNEX_FROZEN_QUEUE)) + { + DPRINT("Queue is not frozen really\n"); - KeReleaseSpinLock(&DeviceExtension->SpinLock, Irql); - Status = STATUS_INVALID_DEVICE_REQUEST; - break; - } + KeReleaseSpinLock(&DeviceExtension->SpinLock, Irql); + Status = STATUS_INVALID_DEVICE_REQUEST; + break; + } - /* Make sure there is no active request */ - ASSERT(LunExtension->SrbInfo.Srb == NULL); + /* Make sure there is no active request */ + ASSERT(LunExtension->SrbInfo.Srb == NULL); - /* Compile a list from the device queue */ - IrpList = NULL; - while ((Entry = KeRemoveDeviceQueue(&LunExtension->DeviceQueue)) != NULL) - { + /* Compile a list from the device queue */ + IrpList = NULL; + while ((Entry = KeRemoveDeviceQueue(&LunExtension->DeviceQueue)) != NULL) + { NextIrp = CONTAINING_RECORD(Entry, IRP, Tail.Overlay.DeviceQueueEntry); /* Get the Srb */ @@ -2746,60 +2677,59 @@ ScsiPortDispatchScsi(IN PDEVICE_OBJECT DeviceObject, /* Add then to the list */ NextIrp->Tail.Overlay.ListEntry.Flink = (PLIST_ENTRY)IrpList; IrpList = NextIrp; - } + } - /* Unfreeze the queue */ - LunExtension->Flags &= ~LUNEX_FROZEN_QUEUE; + /* Unfreeze the queue */ + LunExtension->Flags &= ~LUNEX_FROZEN_QUEUE; - /* Release the spinlock */ - KeReleaseSpinLock(&DeviceExtension->SpinLock, Irql); + /* Release the spinlock */ + KeReleaseSpinLock(&DeviceExtension->SpinLock, Irql); - /* Complete those requests */ - while (IrpList) - { - NextIrp = IrpList; - IrpList = (PIRP)NextIrp->Tail.Overlay.ListEntry.Flink; + /* Complete those requests */ + while (IrpList) + { + NextIrp = IrpList; + IrpList = (PIRP)NextIrp->Tail.Overlay.ListEntry.Flink; - IoCompleteRequest(NextIrp, 0); - } + IoCompleteRequest(NextIrp, 0); + } - Status = STATUS_SUCCESS; - break; + Status = STATUS_SUCCESS; + break; - default: - DPRINT1("SRB function not implemented (Function %lu)\n", Srb->Function); - Status = STATUS_NOT_IMPLEMENTED; - break; + default: + DPRINT1("SRB function not implemented (Function %lu)\n", Srb->Function); + Status = STATUS_NOT_IMPLEMENTED; + break; } Irp->IoStatus.Status = Status; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - return(Status); + return Status; } /********************************************************************** - * NAME INTERNAL - * ScsiPortDeviceControl + * NAME INTERNAL + * ScsiPortDeviceControl * * DESCRIPTION - * Answer requests for device control calls + * Answer requests for device control calls * * RUN LEVEL - * PASSIVE_LEVEL + * PASSIVE_LEVEL * * ARGUMENTS - * Standard dispatch arguments + * Standard dispatch arguments * * RETURNS - * NTSTATUS + * NTSTATUS */ static NTSTATUS NTAPI ScsiPortDeviceControl(IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp) + IN PIRP Irp) { PIO_STACK_LOCATION Stack; PSCSI_PORT_DEVICE_EXTENSION DeviceExtension; @@ -2907,7 +2837,7 @@ ScsiPortDeviceControl(IN PDEVICE_OBJECT DeviceObject, static VOID NTAPI ScsiPortStartIo(IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp) + IN PIRP Irp) { PSCSI_PORT_DEVICE_EXTENSION DeviceExtension; PSCSI_PORT_LUN_EXTENSION LunExtension; @@ -3363,9 +3293,9 @@ SpiAllocateLunExtension(IN PSCSI_PORT_DEVICE_EXTENSION DeviceExtension) static PSCSI_PORT_LUN_EXTENSION SpiGetLunExtension (IN PSCSI_PORT_DEVICE_EXTENSION DeviceExtension, - IN UCHAR PathId, - IN UCHAR TargetId, - IN UCHAR Lun) + IN UCHAR PathId, + IN UCHAR TargetId, + IN UCHAR Lun) { PSCSI_PORT_LUN_EXTENSION LunExtension; @@ -4594,7 +4524,7 @@ SpiCompletionRoutine(PDEVICE_OBJECT DeviceObject, if (Irp->MdlAddress != NULL) { - MmUnlockPages(Irp->MdlAddress); + MmUnlockPages(Irp->MdlAddress); IoFreeMdl(Irp->MdlAddress); Irp->MdlAddress = NULL; } @@ -4863,9 +4793,9 @@ SpiGetNextRequestFromLun(IN PSCSI_PORT_DEVICE_EXTENSION DeviceExtension, // static VOID NTAPI ScsiPortDpcForIsr(IN PKDPC Dpc, - IN PDEVICE_OBJECT DpcDeviceObject, - IN PIRP DpcIrp, - IN PVOID DpcContext) + IN PDEVICE_OBJECT DpcDeviceObject, + IN PIRP DpcIrp, + IN PVOID DpcContext) { PSCSI_PORT_DEVICE_EXTENSION DeviceExtension = DpcDeviceObject->DeviceExtension; SCSI_PORT_INTERRUPT_DATA InterruptData; @@ -4881,7 +4811,7 @@ ScsiPortDpcForIsr(IN PKDPC Dpc, /* We need to acquire spinlock */ KeAcquireSpinLockAtDpcLevel(&DeviceExtension->SpinLock); - RtlZeroMemory(&InterruptData, sizeof(SCSI_PORT_INTERRUPT_DATA)); + RtlZeroMemory(&InterruptData, sizeof(SCSI_PORT_INTERRUPT_DATA)); TryAgain: diff --git a/drivers/storage/port/scsiport/scsiport_int.h b/drivers/storage/port/scsiport/scsiport.h similarity index 98% rename from drivers/storage/port/scsiport/scsiport_int.h rename to drivers/storage/port/scsiport/scsiport.h index e05f163631a..b0076e543a9 100644 --- a/drivers/storage/port/scsiport/scsiport_int.h +++ b/drivers/storage/port/scsiport/scsiport.h @@ -7,6 +7,14 @@ #pragma once +#include <wdm.h> +#include <ntddk.h> +#include <stdio.h> +#include <scsi.h> +#include <ntddscsi.h> +#include <ntdddisk.h> +#include <mountdev.h> + #define VERSION "0.0.3" #ifndef PAGE_ROUND_UP

1 0

[reactos] 01/01: [RAPPS] Remove string casts after the conutils fix
by Mark Jansen 25 Sep '20

25 Sep '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3da04a9b683c3d3a13201… commit 3da04a9b683c3d3a13201c74f4c430370473c12a Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sun Sep 20 22:15:47 2020 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Fri Sep 25 22:03:28 2020 +0200 [RAPPS] Remove string casts after the conutils fix --- base/applications/rapps/unattended.cpp | 37 ++++++++++++++++------------------ 1 file changed, 17 insertions(+), 20 deletions(-) diff --git a/base/applications/rapps/unattended.cpp b/base/applications/rapps/unattended.cpp index d20ef8aa3f2..f1589a3b544 100644 --- a/base/applications/rapps/unattended.cpp +++ b/base/applications/rapps/unattended.cpp @@ -5,14 +5,11 @@ * COPYRIGHT: Copyright 2017 Alexander Shaposhnikov (sanchaez(a)reactos.org) * Copyright 2020 He Yang (1160386205(a)qq.com) */ -#include "rapps.h" +#include "rapps.h" #include "unattended.h" - #include "winmain.h" - #include <setupapi.h> - #include <conutils.h> BOOL MatchCmdOption(LPWSTR argvOption, LPCWSTR szOptToMacth) @@ -119,13 +116,13 @@ BOOL HandleSetupCommand(LPWSTR szCommand, int argcLeft, LPWSTR * argvLeft) BOOL CALLBACK CmdFindAppEnum(CAvailableApplicationInfo *Info, BOOL bInitialCheckState, PVOID param) { LPCWSTR lpszSearch = (LPCWSTR)param; - if (!SearchPatternMatch(Info->m_szName.GetString(), lpszSearch) && - !SearchPatternMatch(Info->m_szDesc.GetString(), lpszSearch)) + if (!SearchPatternMatch(Info->m_szName, lpszSearch) && + !SearchPatternMatch(Info->m_szDesc, lpszSearch)) { return TRUE; } - ConPrintf(StdOut, (LPWSTR)L"%s (%s)\n", (LPCWSTR)(Info->m_szName), (LPCWSTR)(Info->m_szPkgName)); + ConPrintf(StdOut, L"%s (%s)\n", Info->m_szName.GetString(), Info->m_szPkgName.GetString()); return TRUE; } @@ -144,7 +141,7 @@ BOOL HandleFindCommand(LPWSTR szCommand, int argcLeft, LPWSTR *argvLeft) { ConResMsgPrintf(StdOut, NULL, IDS_CMD_FIND_RESULT_FOR, argvLeft[i]); apps.Enum(ENUM_ALL_AVAILABLE, CmdFindAppEnum, argvLeft[i]); - ConPrintf(StdOut, (LPWSTR)L"\n"); + ConPrintf(StdOut, L"\n"); } return TRUE; @@ -176,47 +173,47 @@ BOOL HandleInfoCommand(LPWSTR szCommand, int argcLeft, LPWSTR *argvLeft) // is in a mess. It should be refactored, and should not placed in class CAppRichEdit. // and the code here should reused that code after refactor. - ConPuts(StdOut, (LPWSTR)(LPCWSTR)AppInfo->m_szName); + ConPuts(StdOut, AppInfo->m_szName); if (AppInfo->m_szVersion) { ConResPrintf(StdOut, IDS_AINFO_VERSION); - ConPuts(StdOut, (LPWSTR)(LPCWSTR)AppInfo->m_szVersion); + ConPuts(StdOut, AppInfo->m_szVersion); } if (AppInfo->m_szLicense) { ConResPrintf(StdOut, IDS_AINFO_LICENSE); - ConPuts(StdOut, (LPWSTR)(LPCWSTR)AppInfo->m_szLicense); + ConPuts(StdOut, AppInfo->m_szLicense); } if (AppInfo->m_szSize) { ConResPrintf(StdOut, IDS_AINFO_SIZE); - ConPuts(StdOut, (LPWSTR)(LPCWSTR)AppInfo->m_szSize); + ConPuts(StdOut, AppInfo->m_szSize); } if (AppInfo->m_szUrlSite) { ConResPrintf(StdOut, IDS_AINFO_URLSITE); - ConPuts(StdOut, (LPWSTR)(LPCWSTR)AppInfo->m_szUrlSite); + ConPuts(StdOut, AppInfo->m_szUrlSite); } if (AppInfo->m_szDesc) { ConResPrintf(StdOut, IDS_AINFO_DESCRIPTION); - ConPuts(StdOut, (LPWSTR)(LPCWSTR)AppInfo->m_szDesc); + ConPuts(StdOut, AppInfo->m_szDesc); } if (AppInfo->m_szUrlDownload) { ConResPrintf(StdOut, IDS_AINFO_URLDOWNLOAD); - ConPuts(StdOut, (LPWSTR)(LPCWSTR)AppInfo->m_szUrlDownload); + ConPuts(StdOut, AppInfo->m_szUrlDownload); } - ConPrintf(StdOut, (LPWSTR)L"\n"); + ConPrintf(StdOut, L"\n"); } - ConPrintf(StdOut, (LPWSTR)L"\n"); + ConPrintf(StdOut, L"\n"); } return TRUE; } @@ -228,12 +225,12 @@ BOOL HandleHelpCommand(LPWSTR szCommand, int argcLeft, LPWSTR * argvLeft) return FALSE; } - ConPrintf(StdOut, (LPWSTR)L"\n"); + ConPrintf(StdOut, L"\n"); ConResPuts(StdOut, IDS_APPTITLE); - ConPrintf(StdOut, (LPWSTR)L"\n\n"); + ConPrintf(StdOut, L"\n\n"); ConResPuts(StdOut, IDS_CMD_USAGE); - ConPrintf(StdOut, (LPWSTR)L"%ls\n", UsageString); + ConPrintf(StdOut, L"%ls\n", UsageString); return TRUE; }

1 0

[reactos] 03/03: [KERNEL32_VISTA] Move vista.c from kernel32 to kernel32_vista
by Timo Kreuzer 25 Sep '20

25 Sep '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d8b5c00c338e3cb508a6a… commit d8b5c00c338e3cb508a6aabf00cdbfd32906c542 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sun Sep 13 18:55:17 2020 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Fri Sep 25 09:45:54 2020 +0200 [KERNEL32_VISTA] Move vista.c from kernel32 to kernel32_vista - Remove duplicated functions - Use AreFileApisANSI() instead of global variable bIsFileApiAnsi in shared kernel32_shared --- dll/win32/kernel32/CMakeLists.txt | 1 - dll/win32/kernel32/client/file/fileutils.c | 10 +- dll/win32/kernel32/kernel32_vista/CMakeLists.txt | 3 + dll/win32/kernel32/kernel32_vista/k32_vista.h | 11 ++ .../kernel32/kernel32_vista/kernel32_vista.spec | 24 ++++ .../kernel32/{client => kernel32_vista}/vista.c | 155 ++------------------- 6 files changed, 57 insertions(+), 147 deletions(-) diff --git a/dll/win32/kernel32/CMakeLists.txt b/dll/win32/kernel32/CMakeLists.txt index 616e0f453b5..7d31686837d 100644 --- a/dll/win32/kernel32/CMakeLists.txt +++ b/dll/win32/kernel32/CMakeLists.txt @@ -44,7 +44,6 @@ list(APPEND SOURCE client/vdm.c client/version.c client/virtmem.c - client/vista.c client/console/alias.c client/console/console.c client/console/history.c diff --git a/dll/win32/kernel32/client/file/fileutils.c b/dll/win32/kernel32/client/file/fileutils.c index 078f83006e2..2257608588a 100644 --- a/dll/win32/kernel32/client/file/fileutils.c +++ b/dll/win32/kernel32/client/file/fileutils.c @@ -28,7 +28,7 @@ FilenameA2W(LPCSTR NameA, BOOL alloc) RtlInitAnsiString(&str, NameA); pstrW = alloc ? &strW : &NtCurrentTeb()->StaticUnicodeString; - if (bIsFileApiAnsi) + if (AreFileApisANSI()) Status= RtlAnsiStringToUnicodeString( pstrW, &str, (BOOLEAN)alloc ); else Status= RtlOemStringToUnicodeString( pstrW, &str, (BOOLEAN)alloc ); @@ -64,7 +64,7 @@ FilenameU2A_FitOrFail( /* destLen should never exceed MAX_PATH */ if (destLen > MAX_PATH) destLen = MAX_PATH; - ret = bIsFileApiAnsi? RtlUnicodeStringToAnsiSize(SourceU) : RtlUnicodeStringToOemSize(SourceU); + ret = AreFileApisANSI() ? RtlUnicodeStringToAnsiSize(SourceU) : RtlUnicodeStringToOemSize(SourceU); /* ret incl. nullchar */ if (DestA && (INT)ret <= destLen) @@ -75,7 +75,7 @@ FilenameU2A_FitOrFail( str.MaximumLength = (USHORT)destLen; - if (bIsFileApiAnsi) + if (AreFileApisANSI()) RtlUnicodeStringToAnsiString(&str, SourceU, FALSE ); else RtlUnicodeStringToOemString(&str, SourceU, FALSE ); @@ -129,7 +129,7 @@ FilenameA2W_N( if (srclen < 0) srclen = strlen( src ) + 1; - if (bIsFileApiAnsi) + if (AreFileApisANSI()) RtlMultiByteToUnicodeN( dest, destlen* sizeof(WCHAR), &ret, (LPSTR)src, srclen ); else RtlOemToUnicodeN( dest, destlen* sizeof(WCHAR), &ret, (LPSTR)src, srclen ); @@ -154,7 +154,7 @@ FilenameW2A_N( if (srclen < 0) srclen = wcslen( src ) + 1; - if (bIsFileApiAnsi) + if (AreFileApisANSI()) RtlUnicodeToMultiByteN( dest, destlen, &ret, (LPWSTR) src, srclen * sizeof(WCHAR)); else RtlUnicodeToOemN( dest, destlen, &ret, (LPWSTR) src, srclen * sizeof(WCHAR) ); diff --git a/dll/win32/kernel32/kernel32_vista/CMakeLists.txt b/dll/win32/kernel32/kernel32_vista/CMakeLists.txt index 915346689a1..51efae70f8b 100644 --- a/dll/win32/kernel32/kernel32_vista/CMakeLists.txt +++ b/dll/win32/kernel32/kernel32_vista/CMakeLists.txt @@ -3,6 +3,7 @@ remove_definitions(-D_WIN32_WINNT=0x502 -DWINVER=0x502) add_definitions(-D_WIN32_WINNT=0x600 -DWINVER=0x600) add_definitions(-D_KERNEL32_) +include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/subsys) spec2def(kernel32_vista.dll kernel32_vista.spec ADD_IMPORTLIB) list(APPEND SOURCE @@ -11,10 +12,12 @@ list(APPEND SOURCE GetTickCount64.c InitOnceExecuteOnce.c sync.c + vista.c ${CMAKE_CURRENT_BINARY_DIR}/kernel32_vista.def) add_library(kernel32_vista MODULE ${SOURCE}) set_module_type(kernel32_vista win32dll ENTRYPOINT DllMain 12) +target_link_libraries(kernel32_vista kernel32_shared) add_importlibs(kernel32_vista kernel32 ntdll_vista ntdll) add_delay_importlibs(kernel32_vista ntdll_vista) add_dependencies(kernel32_vista psdk) diff --git a/dll/win32/kernel32/kernel32_vista/k32_vista.h b/dll/win32/kernel32/kernel32_vista/k32_vista.h index fff9ba8d0b4..7f78e53e68a 100644 --- a/dll/win32/kernel32/kernel32_vista/k32_vista.h +++ b/dll/win32/kernel32/kernel32_vista/k32_vista.h @@ -6,7 +6,18 @@ #include <windef.h> #include <winbase.h> +/* Redefine NTDDI_VERSION to 2K3 SP1 to get correct NDK definitions */ +#undef NTDDI_VERSION +#define NTDDI_VERSION NTDDI_WS03SP1 + +#include <ndk/iofuncs.h> #include <ndk/kefuncs.h> +#include <ndk/obfuncs.h> #include <ndk/psfuncs.h> #include <ndk/rtlfuncs.h> +/* CSRSS Headers */ +#include <win/base.h> + +/* Internal Kernel32 Header */ +#include "../include/kernel32.h" diff --git a/dll/win32/kernel32/kernel32_vista/kernel32_vista.spec b/dll/win32/kernel32/kernel32_vista/kernel32_vista.spec index f61e6e6dc36..02c1cb05739 100644 --- a/dll/win32/kernel32/kernel32_vista/kernel32_vista.spec +++ b/dll/win32/kernel32/kernel32_vista/kernel32_vista.spec @@ -16,3 +16,27 @@ @ stdcall WakeConditionVariable(ptr) @ stdcall InitializeCriticalSectionEx(ptr long long) + +@ stdcall ApplicationRecoveryFinished(long) +@ stdcall ApplicationRecoveryInProgress(ptr) +@ stdcall CreateSymbolicLinkA(str str long) +@ stdcall CreateSymbolicLinkW(wstr wstr long) +@ stdcall GetApplicationRecoveryCallback(ptr ptr ptr ptr ptr) +@ stdcall GetApplicationRestart(ptr wstr ptr ptr) +@ stdcall GetFileBandwidthReservation(ptr ptr ptr ptr ptr ptr) +@ stdcall GetFileMUIInfo(long wstr ptr ptr) +@ stdcall GetFileMUIPath(long wstr wstr ptr wstr ptr ptr) +@ stdcall GetFinalPathNameByHandleA(ptr str long long) +@ stdcall GetFinalPathNameByHandleW(ptr wstr long long) +@ stdcall GetSystemPreferredUILanguages(long ptr wstr ptr) +@ stdcall GetThreadPreferredUILanguages(long ptr wstr ptr) +@ stdcall GetThreadUILanguage() +@ stdcall GetUILanguageInfo(long wstr wstr ptr ptr) +@ stdcall GetUserPreferredUILanguages(long ptr wstr ptr) +@ stdcall OpenFileById(ptr ptr long long ptr long) +@ stdcall QueryFullProcessImageNameA(ptr long str ptr) +@ stdcall QueryFullProcessImageNameW(ptr long wstr ptr) +@ stdcall RegisterApplicationRecoveryCallback(ptr ptr long long) +@ stdcall RegisterApplicationRestart(wstr long) +@ stdcall SetFileBandwidthReservation(ptr long long long ptr ptr) +@ stdcall SetThreadPreferredUILanguages(long wstr ptr) diff --git a/dll/win32/kernel32/client/vista.c b/dll/win32/kernel32/kernel32_vista/vista.c similarity index 83% rename from dll/win32/kernel32/client/vista.c rename to dll/win32/kernel32/kernel32_vista/vista.c index 8fa60a995cd..743cb430721 100644 --- a/dll/win32/kernel32/client/vista.c +++ b/dll/win32/kernel32/kernel32_vista/vista.c @@ -7,125 +7,19 @@ /* INCLUDES *******************************************************************/ -#include <k32.h> +#include <k32_vista.h> -#define NDEBUG -#include <debug.h> - -#if _WIN32_WINNT >= 0x600 - -/* FIXME: Move these RTL declarations to the NDK */ -NTSTATUS -NTAPI -RtlSleepConditionVariableCS(IN OUT PRTL_CONDITION_VARIABLE ConditionVariable, - IN OUT PRTL_CRITICAL_SECTION CriticalSection, - IN PLARGE_INTEGER TimeOut OPTIONAL); - -NTSTATUS -NTAPI -RtlSleepConditionVariableSRW(IN OUT PRTL_CONDITION_VARIABLE ConditionVariable, - IN OUT PRTL_SRWLOCK SRWLock, - IN PLARGE_INTEGER TimeOut OPTIONAL, - IN ULONG Flags); - -/* PUBLIC FUNCTIONS ***********************************************************/ - -/* - * @implemented - */ -BOOL -WINAPI -SleepConditionVariableCS(IN OUT PCONDITION_VARIABLE ConditionVariable, - IN OUT PCRITICAL_SECTION CriticalSection, - IN DWORD dwMilliseconds) -{ - NTSTATUS Status = STATUS_SUCCESS; -#if 0 - LARGE_INTEGER TimeOut; - PLARGE_INTEGER TimeOutPtr = NULL; - - if (dwMilliseconds != INFINITE) - { - TimeOut.QuadPart = dwMilliseconds * -10000LL; - TimeOutPtr = &TimeOut; - } - - Status = RtlSleepConditionVariableCS((PRTL_CONDITION_VARIABLE)ConditionVariable, - (PRTL_CRITICAL_SECTION)CriticalSection, - TimeOutPtr); +#if _WIN32_WINNT != _WIN32_WINNT_VISTA +#error "This file must be compiled with _WIN32_WINNT == _WIN32_WINNT_VISTA" #endif - if (!NT_SUCCESS(Status)) - { - BaseSetLastNTError(Status); - return FALSE; - } - - return TRUE; -} - - -/* - * @implemented - */ -BOOL -WINAPI -SleepConditionVariableSRW(IN OUT PCONDITION_VARIABLE ConditionVariable, - IN OUT PSRWLOCK SRWLock, - IN DWORD dwMilliseconds, - IN ULONG Flags) -{ - NTSTATUS Status = STATUS_SUCCESS; -#if 0 - LARGE_INTEGER TimeOut; - PLARGE_INTEGER TimeOutPtr = NULL; - if (dwMilliseconds != INFINITE) - { - TimeOut.QuadPart = dwMilliseconds * -10000LL; - TimeOutPtr = &TimeOut; - } +// This is defined only in ntifs.h +#define REPARSE_DATA_BUFFER_HEADER_SIZE FIELD_OFFSET(REPARSE_DATA_BUFFER, GenericReparseBuffer) - Status = RtlSleepConditionVariableSRW((PRTL_CONDITION_VARIABLE)ConditionVariable, - (PRTL_SRWLOCK)SRWLock, - TimeOutPtr, - Flags); -#endif - if (!NT_SUCCESS(Status)) - { - BaseSetLastNTError(Status); - return FALSE; - } - - return TRUE; -} - - -/* - * @implemented - */ -BOOL WINAPI InitializeCriticalSectionEx(OUT LPCRITICAL_SECTION lpCriticalSection, - IN DWORD dwSpinCount, - IN DWORD flags) -{ - NTSTATUS Status; - - /* FIXME: Flags ignored */ - - /* Initialize the critical section */ - Status = RtlInitializeCriticalSectionAndSpinCount( - (PRTL_CRITICAL_SECTION)lpCriticalSection, - dwSpinCount); - if (!NT_SUCCESS(Status)) - { - /* Set failure code */ - BaseSetLastNTError(Status); - return FALSE; - } - - /* Success */ - return TRUE; -} +#define NDEBUG +#include <debug.h> +/* PUBLIC FUNCTIONS ***********************************************************/ /* * @implemented @@ -267,7 +161,7 @@ GetApplicationRestart(IN HANDLE hProcess, */ VOID WINAPI -RecoveryFinished(IN BOOL bSuccess) +ApplicationRecoveryFinished(IN BOOL bSuccess) { UNIMPLEMENTED; } @@ -278,7 +172,7 @@ RecoveryFinished(IN BOOL bSuccess) */ HRESULT WINAPI -RecoveryInProgress(OUT PBOOL pbCancelled) +ApplicationRecoveryInProgress(OUT PBOOL pbCancelled) { UNIMPLEMENTED; return E_FAIL; @@ -692,30 +586,6 @@ OpenFileById(IN HANDLE hFile, } -/* - * @implemented - */ -ULONGLONG -WINAPI -GetTickCount64(VOID) -{ - ULARGE_INTEGER TickCount; - - while (TRUE) - { - TickCount.HighPart = (ULONG)SharedUserData->TickCount.High1Time; - TickCount.LowPart = SharedUserData->TickCount.LowPart; - - if (TickCount.HighPart == (ULONG)SharedUserData->TickCount.High2Time) break; - - YieldProcessor(); - } - - return (UInt32x32To64(TickCount.LowPart, SharedUserData->TickCountMultiplier) >> 24) + - (UInt32x32To64(TickCount.HighPart, SharedUserData->TickCountMultiplier) << 8); -} - -#endif /* Vista+ MUI support functions @@ -766,6 +636,7 @@ GetFileMUIPath( /* * @unimplemented */ +#if 0 // This is Windows 7+ BOOL WINAPI GetProcessPreferredUILanguages( @@ -778,6 +649,7 @@ GetProcessPreferredUILanguages( SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } +#endif /* * @unimplemented @@ -860,6 +732,7 @@ GetUserPreferredUILanguages( /* * @unimplemented */ +#if 0 // Tis is Windows 7+ BOOL WINAPI SetProcessPreferredUILanguages( @@ -871,7 +744,7 @@ SetProcessPreferredUILanguages( SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } - +#endif /* * @unimplemented

1 0

[reactos] 02/03: [KERNEL32] Move some functions into a static library to be shared between kernel32 and kernel32_vista
by Timo Kreuzer 25 Sep '20

25 Sep '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fcd83242d4e20e86b54de… commit fcd83242d4e20e86b54dec7f7c7091f997a537fe Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sun Sep 13 10:03:58 2020 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Fri Sep 25 09:45:54 2020 +0200 [KERNEL32] Move some functions into a static library to be shared between kernel32 and kernel32_vista --- dll/win32/kernel32/CMakeLists.txt | 10 +- dll/win32/kernel32/client/except.c | 15 --- dll/win32/kernel32/client/file/fileinfo.c | 150 -------------------------- dll/win32/kernel32/client/file/fileutils.c | 167 +++++++++++++++++++++++++++++ dll/win32/kernel32/client/shared_utils.c | 30 ++++++ 5 files changed, 206 insertions(+), 166 deletions(-) diff --git a/dll/win32/kernel32/CMakeLists.txt b/dll/win32/kernel32/CMakeLists.txt index 984cb8eaa0d..616e0f453b5 100644 --- a/dll/win32/kernel32/CMakeLists.txt +++ b/dll/win32/kernel32/CMakeLists.txt @@ -5,6 +5,14 @@ add_definitions(-D_KERNEL32_) include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/subsys) spec2def(kernel32.dll kernel32.spec ADD_IMPORTLIB) +# Shared between kernel32 and kernel32_vista +add_library(kernel32_shared + client/shared_utils.c + client/file/fileutils.c +) + +add_dependencies(kernel32_shared psdk) + list(APPEND SOURCE client/actctx.c client/appcache.c @@ -114,7 +122,7 @@ set_module_type(kernel32 win32dll ENTRYPOINT DllMain 12) set_subsystem(kernel32 console) ################# END HACK ################# -target_link_libraries(kernel32 wine chkstk ${PSEH_LIB}) +target_link_libraries(kernel32 kernel32_shared wine chkstk ${PSEH_LIB}) add_importlibs(kernel32 ntdll) add_pch(kernel32 k32.h SOURCE) add_dependencies(kernel32 psdk errcodes asm) diff --git a/dll/win32/kernel32/client/except.c b/dll/win32/kernel32/client/except.c index dbb76b7be49..36fab314f49 100644 --- a/dll/win32/kernel32/client/except.c +++ b/dll/win32/kernel32/client/except.c @@ -1036,21 +1036,6 @@ SetLastError(IN DWORD dwErrCode) if (NtCurrentTeb()->LastErrorValue != dwErrCode) NtCurrentTeb()->LastErrorValue = dwErrCode; } -/* - * @implemented - */ -DWORD -WINAPI -BaseSetLastNTError(IN NTSTATUS Status) -{ - DWORD dwErrCode; - - /* Convert from NT to Win32, then set */ - dwErrCode = RtlNtStatusToDosError(Status); - SetLastError(dwErrCode); - return dwErrCode; -} - /* * @implemented */ diff --git a/dll/win32/kernel32/client/file/fileinfo.c b/dll/win32/kernel32/client/file/fileinfo.c index 2721c826315..b70a99a137c 100644 --- a/dll/win32/kernel32/client/file/fileinfo.c +++ b/dll/win32/kernel32/client/file/fileinfo.c @@ -18,156 +18,6 @@ DEBUG_CHANNEL(kernel32file); /* FUNCTIONS ****************************************************************/ -PWCHAR -FilenameA2W(LPCSTR NameA, BOOL alloc) -{ - ANSI_STRING str; - UNICODE_STRING strW; - PUNICODE_STRING pstrW; - NTSTATUS Status; - - //ASSERT(NtCurrentTeb()->StaticUnicodeString.Buffer == NtCurrentTeb()->StaticUnicodeBuffer); - ASSERT(NtCurrentTeb()->StaticUnicodeString.MaximumLength == sizeof(NtCurrentTeb()->StaticUnicodeBuffer)); - - RtlInitAnsiString(&str, NameA); - pstrW = alloc ? &strW : &NtCurrentTeb()->StaticUnicodeString; - - if (bIsFileApiAnsi) - Status= RtlAnsiStringToUnicodeString( pstrW, &str, (BOOLEAN)alloc ); - else - Status= RtlOemStringToUnicodeString( pstrW, &str, (BOOLEAN)alloc ); - - if (NT_SUCCESS(Status)) - return pstrW->Buffer; - - if (Status== STATUS_BUFFER_OVERFLOW) - SetLastError( ERROR_FILENAME_EXCED_RANGE ); - else - BaseSetLastNTError(Status); - - return NULL; -} - - -/* -No copy/conversion is done if the dest. buffer is too small. - -Returns: - Success: number of TCHARS copied into dest. buffer NOT including nullterm - Fail: size of buffer in TCHARS required to hold the converted filename, including nullterm -*/ -DWORD -FilenameU2A_FitOrFail( - LPSTR DestA, - INT destLen, /* buffer size in TCHARS incl. nullchar */ - PUNICODE_STRING SourceU - ) -{ - DWORD ret; - - /* destLen should never exceed MAX_PATH */ - if (destLen > MAX_PATH) destLen = MAX_PATH; - - ret = bIsFileApiAnsi? RtlUnicodeStringToAnsiSize(SourceU) : RtlUnicodeStringToOemSize(SourceU); - /* ret incl. nullchar */ - - if (DestA && (INT)ret <= destLen) - { - ANSI_STRING str; - - str.Buffer = DestA; - str.MaximumLength = (USHORT)destLen; - - - if (bIsFileApiAnsi) - RtlUnicodeStringToAnsiString(&str, SourceU, FALSE ); - else - RtlUnicodeStringToOemString(&str, SourceU, FALSE ); - - ret = str.Length; /* SUCCESS: length without terminating 0 */ - } - - return ret; -} - - -/* -No copy/conversion is done if the dest. buffer is too small. - -Returns: - Success: number of TCHARS copied into dest. buffer NOT including nullterm - Fail: size of buffer in TCHARS required to hold the converted filename, including nullterm -*/ -DWORD -FilenameW2A_FitOrFail( - LPSTR DestA, - INT destLen, /* buffer size in TCHARS incl. nullchar */ - LPCWSTR SourceW, - INT sourceLen /* buffer size in TCHARS incl. nullchar */ - ) -{ - UNICODE_STRING strW; - - if (sourceLen < 0) sourceLen = wcslen(SourceW) + 1; - - strW.Buffer = (PWCHAR)SourceW; - strW.MaximumLength = sourceLen * sizeof(WCHAR); - strW.Length = strW.MaximumLength - sizeof(WCHAR); - - return FilenameU2A_FitOrFail(DestA, destLen, &strW); -} - - -/* -Return: num. TCHARS copied into dest including nullterm -*/ -DWORD -FilenameA2W_N( - LPWSTR dest, - INT destlen, /* buffer size in TCHARS incl. nullchar */ - LPCSTR src, - INT srclen /* buffer size in TCHARS incl. nullchar */ - ) -{ - DWORD ret; - - if (srclen < 0) srclen = strlen( src ) + 1; - - if (bIsFileApiAnsi) - RtlMultiByteToUnicodeN( dest, destlen* sizeof(WCHAR), &ret, (LPSTR)src, srclen ); - else - RtlOemToUnicodeN( dest, destlen* sizeof(WCHAR), &ret, (LPSTR)src, srclen ); - - if (ret) dest[(ret/sizeof(WCHAR))-1]=0; - - return ret/sizeof(WCHAR); -} - -/* -Return: num. TCHARS copied into dest including nullterm -*/ -DWORD -FilenameW2A_N( - LPSTR dest, - INT destlen, /* buffer size in TCHARS incl. nullchar */ - LPCWSTR src, - INT srclen /* buffer size in TCHARS incl. nullchar */ - ) -{ - DWORD ret; - - if (srclen < 0) srclen = wcslen( src ) + 1; - - if (bIsFileApiAnsi) - RtlUnicodeToMultiByteN( dest, destlen, &ret, (LPWSTR) src, srclen * sizeof(WCHAR)); - else - RtlUnicodeToOemN( dest, destlen, &ret, (LPWSTR) src, srclen * sizeof(WCHAR) ); - - if (ret) dest[ret-1]=0; - - return ret; -} - /* * @implemented */ diff --git a/dll/win32/kernel32/client/file/fileutils.c b/dll/win32/kernel32/client/file/fileutils.c new file mode 100644 index 00000000000..078f83006e2 --- /dev/null +++ b/dll/win32/kernel32/client/file/fileutils.c @@ -0,0 +1,167 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS system libraries + * FILE: dll/win32/kernel32/client/file/fileutils.c + * PURPOSE: File utility function shared with kernel32_vista + * PROGRAMMER: Taken from wine + */ + +/* INCLUDES *****************************************************************/ + +#include <k32.h> +#define NDEBUG +#include <debug.h> + +/* FUNCTIONS ****************************************************************/ + +PWCHAR +FilenameA2W(LPCSTR NameA, BOOL alloc) +{ + ANSI_STRING str; + UNICODE_STRING strW; + PUNICODE_STRING pstrW; + NTSTATUS Status; + + //ASSERT(NtCurrentTeb()->StaticUnicodeString.Buffer == NtCurrentTeb()->StaticUnicodeBuffer); + ASSERT(NtCurrentTeb()->StaticUnicodeString.MaximumLength == sizeof(NtCurrentTeb()->StaticUnicodeBuffer)); + + RtlInitAnsiString(&str, NameA); + pstrW = alloc ? &strW : &NtCurrentTeb()->StaticUnicodeString; + + if (bIsFileApiAnsi) + Status= RtlAnsiStringToUnicodeString( pstrW, &str, (BOOLEAN)alloc ); + else + Status= RtlOemStringToUnicodeString( pstrW, &str, (BOOLEAN)alloc ); + + if (NT_SUCCESS(Status)) + return pstrW->Buffer; + + if (Status== STATUS_BUFFER_OVERFLOW) + SetLastError( ERROR_FILENAME_EXCED_RANGE ); + else + BaseSetLastNTError(Status); + + return NULL; +} + + +/* +No copy/conversion is done if the dest. buffer is too small. + +Returns: + Success: number of TCHARS copied into dest. buffer NOT including nullterm + Fail: size of buffer in TCHARS required to hold the converted filename, including nullterm +*/ +DWORD +FilenameU2A_FitOrFail( + LPSTR DestA, + INT destLen, /* buffer size in TCHARS incl. nullchar */ + PUNICODE_STRING SourceU + ) +{ + DWORD ret; + + /* destLen should never exceed MAX_PATH */ + if (destLen > MAX_PATH) destLen = MAX_PATH; + + ret = bIsFileApiAnsi? RtlUnicodeStringToAnsiSize(SourceU) : RtlUnicodeStringToOemSize(SourceU); + /* ret incl. nullchar */ + + if (DestA && (INT)ret <= destLen) + { + ANSI_STRING str; + + str.Buffer = DestA; + str.MaximumLength = (USHORT)destLen; + + + if (bIsFileApiAnsi) + RtlUnicodeStringToAnsiString(&str, SourceU, FALSE ); + else + RtlUnicodeStringToOemString(&str, SourceU, FALSE ); + + ret = str.Length; /* SUCCESS: length without terminating 0 */ + } + + return ret; +} + + +/* +No copy/conversion is done if the dest. buffer is too small. + +Returns: + Success: number of TCHARS copied into dest. buffer NOT including nullterm + Fail: size of buffer in TCHARS required to hold the converted filename, including nullterm +*/ +DWORD +FilenameW2A_FitOrFail( + LPSTR DestA, + INT destLen, /* buffer size in TCHARS incl. nullchar */ + LPCWSTR SourceW, + INT sourceLen /* buffer size in TCHARS incl. nullchar */ + ) +{ + UNICODE_STRING strW; + + if (sourceLen < 0) sourceLen = wcslen(SourceW) + 1; + + strW.Buffer = (PWCHAR)SourceW; + strW.MaximumLength = sourceLen * sizeof(WCHAR); + strW.Length = strW.MaximumLength - sizeof(WCHAR); + + return FilenameU2A_FitOrFail(DestA, destLen, &strW); +} + + +/* +Return: num. TCHARS copied into dest including nullterm +*/ +DWORD +FilenameA2W_N( + LPWSTR dest, + INT destlen, /* buffer size in TCHARS incl. nullchar */ + LPCSTR src, + INT srclen /* buffer size in TCHARS incl. nullchar */ + ) +{ + DWORD ret; + + if (srclen < 0) srclen = strlen( src ) + 1; + + if (bIsFileApiAnsi) + RtlMultiByteToUnicodeN( dest, destlen* sizeof(WCHAR), &ret, (LPSTR)src, srclen ); + else + RtlOemToUnicodeN( dest, destlen* sizeof(WCHAR), &ret, (LPSTR)src, srclen ); + + if (ret) dest[(ret/sizeof(WCHAR))-1]=0; + + return ret/sizeof(WCHAR); +} + +/* +Return: num. TCHARS copied into dest including nullterm +*/ +DWORD +FilenameW2A_N( + LPSTR dest, + INT destlen, /* buffer size in TCHARS incl. nullchar */ + LPCWSTR src, + INT srclen /* buffer size in TCHARS incl. nullchar */ + ) +{ + DWORD ret; + + if (srclen < 0) srclen = wcslen( src ) + 1; + + if (bIsFileApiAnsi) + RtlUnicodeToMultiByteN( dest, destlen, &ret, (LPWSTR) src, srclen * sizeof(WCHAR)); + else + RtlUnicodeToOemN( dest, destlen, &ret, (LPWSTR) src, srclen * sizeof(WCHAR) ); + + if (ret) dest[ret-1]=0; + + return ret; +} + +/* EOF */ diff --git a/dll/win32/kernel32/client/shared_utils.c b/dll/win32/kernel32/client/shared_utils.c new file mode 100644 index 00000000000..05b10675e72 --- /dev/null +++ b/dll/win32/kernel32/client/shared_utils.c @@ -0,0 +1,30 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS system libraries + * FILE: dll/win32/kernel32/client/utils_shared.c + * PURPOSE: Utility functions shared with kernel32_vista + * PROGRAMMER: Thomas Faber +*/ + +/* INCLUDES *******************************************************************/ + +#include <k32.h> +#include <strsafe.h> + +#define NDEBUG +#include <debug.h> + +/* +* @implemented +*/ +DWORD +WINAPI +BaseSetLastNTError(IN NTSTATUS Status) +{ + DWORD dwErrCode; + + /* Convert from NT to Win32, then set */ + dwErrCode = RtlNtStatusToDosError(Status); + SetLastError(dwErrCode); + return dwErrCode; +}

1 0

[reactos] 01/03: [KERNEL32_VISTA] Move under kernel32
by Timo Kreuzer 25 Sep '20

25 Sep '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4e72da08584e4f21c86bb… commit 4e72da08584e4f21c86bbe527536a31c8c566d26 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sun Sep 13 09:16:17 2020 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Fri Sep 25 09:45:54 2020 +0200 [KERNEL32_VISTA] Move under kernel32 --- dll/win32/CMakeLists.txt | 1 - dll/win32/kernel32/CMakeLists.txt | 2 ++ dll/win32/{ => kernel32}/kernel32_vista/CMakeLists.txt | 0 dll/win32/{ => kernel32}/kernel32_vista/DllMain.c | 0 dll/win32/{ => kernel32}/kernel32_vista/GetFileInformationByHandleEx.c | 0 dll/win32/{ => kernel32}/kernel32_vista/GetTickCount64.c | 0 dll/win32/{ => kernel32}/kernel32_vista/InitOnceExecuteOnce.c | 0 dll/win32/{ => kernel32}/kernel32_vista/k32_vista.h | 0 dll/win32/{ => kernel32}/kernel32_vista/kernel32_vista.spec | 0 dll/win32/{ => kernel32}/kernel32_vista/sync.c | 0 10 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dll/win32/CMakeLists.txt b/dll/win32/CMakeLists.txt index 01e6dee240e..9e7c13363ab 100644 --- a/dll/win32/CMakeLists.txt +++ b/dll/win32/CMakeLists.txt @@ -74,7 +74,6 @@ add_subdirectory(itss) add_subdirectory(jscript) add_subdirectory(jsproxy) add_subdirectory(kernel32) -add_subdirectory(kernel32_vista) add_subdirectory(loadperf) add_subdirectory(lpk) add_subdirectory(lsasrv) diff --git a/dll/win32/kernel32/CMakeLists.txt b/dll/win32/kernel32/CMakeLists.txt index f2a4e0f0292..984cb8eaa0d 100644 --- a/dll/win32/kernel32/CMakeLists.txt +++ b/dll/win32/kernel32/CMakeLists.txt @@ -1,4 +1,6 @@ +add_subdirectory(kernel32_vista) + add_definitions(-D_KERNEL32_) include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/subsys) spec2def(kernel32.dll kernel32.spec ADD_IMPORTLIB) diff --git a/dll/win32/kernel32_vista/CMakeLists.txt b/dll/win32/kernel32/kernel32_vista/CMakeLists.txt similarity index 100% rename from dll/win32/kernel32_vista/CMakeLists.txt rename to dll/win32/kernel32/kernel32_vista/CMakeLists.txt diff --git a/dll/win32/kernel32_vista/DllMain.c b/dll/win32/kernel32/kernel32_vista/DllMain.c similarity index 100% rename from dll/win32/kernel32_vista/DllMain.c rename to dll/win32/kernel32/kernel32_vista/DllMain.c diff --git a/dll/win32/kernel32_vista/GetFileInformationByHandleEx.c b/dll/win32/kernel32/kernel32_vista/GetFileInformationByHandleEx.c similarity index 100% rename from dll/win32/kernel32_vista/GetFileInformationByHandleEx.c rename to dll/win32/kernel32/kernel32_vista/GetFileInformationByHandleEx.c diff --git a/dll/win32/kernel32_vista/GetTickCount64.c b/dll/win32/kernel32/kernel32_vista/GetTickCount64.c similarity index 100% rename from dll/win32/kernel32_vista/GetTickCount64.c rename to dll/win32/kernel32/kernel32_vista/GetTickCount64.c diff --git a/dll/win32/kernel32_vista/InitOnceExecuteOnce.c b/dll/win32/kernel32/kernel32_vista/InitOnceExecuteOnce.c similarity index 100% rename from dll/win32/kernel32_vista/InitOnceExecuteOnce.c rename to dll/win32/kernel32/kernel32_vista/InitOnceExecuteOnce.c diff --git a/dll/win32/kernel32_vista/k32_vista.h b/dll/win32/kernel32/kernel32_vista/k32_vista.h similarity index 100% rename from dll/win32/kernel32_vista/k32_vista.h rename to dll/win32/kernel32/kernel32_vista/k32_vista.h diff --git a/dll/win32/kernel32_vista/kernel32_vista.spec b/dll/win32/kernel32/kernel32_vista/kernel32_vista.spec similarity index 100% rename from dll/win32/kernel32_vista/kernel32_vista.spec rename to dll/win32/kernel32/kernel32_vista/kernel32_vista.spec diff --git a/dll/win32/kernel32_vista/sync.c b/dll/win32/kernel32/kernel32_vista/sync.c similarity index 100% rename from dll/win32/kernel32_vista/sync.c rename to dll/win32/kernel32/kernel32_vista/sync.c

1 0

[reactos] 01/01: [KSECDD] Fix RtlEncryptMemory and improve test
by Timo Kreuzer 25 Sep '20

25 Sep '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ab43f8698085764deaca8… commit ab43f8698085764deaca857c831afde40a084d35 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sun Sep 13 19:58:06 2020 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Fri Sep 25 09:39:51 2020 +0200 [KSECDD] Fix RtlEncryptMemory and improve test --- drivers/crypto/ksecdd/crypt.c | 28 +++++- .../rostests/apitests/advapi32/RtlEncryptMemory.c | 104 +++++++++++++++++++-- 2 files changed, 122 insertions(+), 10 deletions(-) diff --git a/drivers/crypto/ksecdd/crypt.c b/drivers/crypto/ksecdd/crypt.c index ab639346b45..0a2a41e991f 100644 --- a/drivers/crypto/ksecdd/crypt.c +++ b/drivers/crypto/ksecdd/crypt.c @@ -27,6 +27,18 @@ typedef struct _KSEC_LOGON_DATA LUID LogonId; } KSEC_LOGON_DATA, *PKSEC_LOGON_DATA; +#if 0 +void PrintKeyData(PUCHAR KeyData) +{ + ULONG i; + for (i = 0; i < 32; i++) + { + DbgPrint("%02X", KeyData[i]); + } + DbgPrint("\n"); +} +#endif + VOID NTAPI KsecInitializeEncryptionSupport ( @@ -80,6 +92,8 @@ KsecGetKeyData ( if (OptionFlags == RTL_ENCRYPT_OPTION_SAME_PROCESS) { + /* Hash some process specific data to generate the key */ + RtlZeroMemory(&ProcessData, sizeof(ProcessData)); ProcessData.Process = CurrentProcess; ProcessData.ProcessId = CurrentProcess->UniqueProcessId; ProcessData.CreateTime = PsGetProcessCreateTimeQuadPart(CurrentProcess); @@ -87,14 +101,26 @@ KsecGetKeyData ( MD5Update(&Md5Contexts[0], (PVOID)&ProcessData, sizeof(ProcessData)); MD5Update(&Md5Contexts[1], (PVOID)&ProcessData, sizeof(ProcessData)); } - else // if (OptionFlags == RTL_ENCRYPT_OPTION_SAME_LOGON) + else if (OptionFlags == RTL_ENCRYPT_OPTION_SAME_LOGON) { + /* Hash the logon id to generate the key */ + RtlZeroMemory(&LogonData, sizeof(LogonData)); Token = PsReferencePrimaryToken(CurrentProcess); SeQueryAuthenticationIdToken(Token, &LogonData.LogonId); PsDereferencePrimaryToken(Token); MD5Update(&Md5Contexts[0], (PVOID)&LogonData, sizeof(LogonData)); MD5Update(&Md5Contexts[1], (PVOID)&LogonData, sizeof(LogonData)); } + else if (OptionFlags == RTL_ENCRYPT_OPTION_CROSS_PROCESS) + { + /* Use the original MD5s to generate the global key */ + NOTHING; + } + else + { + /* Must not pass anything else */ + ASSERT(FALSE); + } /* Finalize the MD5s */ MD5Final(&Md5Contexts[0]); diff --git a/modules/rostests/apitests/advapi32/RtlEncryptMemory.c b/modules/rostests/apitests/advapi32/RtlEncryptMemory.c index 8cc5036962a..81f27bb5185 100644 --- a/modules/rostests/apitests/advapi32/RtlEncryptMemory.c +++ b/modules/rostests/apitests/advapi32/RtlEncryptMemory.c @@ -9,26 +9,112 @@ #include <ntsecapi.h> -START_TEST(RtlEncryptMemory) +static const CHAR TestData[32] = "This is some test Message!!!"; + +void TestEncrypt(ULONG OptionFlags) { - static const CHAR TestData[32] = "This is some test Message!!!"; - CHAR Buffer[32]; + CHAR DECLSPEC_ALIGN(8) Buffer[32]; NTSTATUS Status; - /* Size must be aligned to 8 bytes */ - Status = RtlEncryptMemory(Buffer, 7, RTL_ENCRYPT_OPTION_SAME_PROCESS); + /* Size must be aligned to 8 bytes (aka RTL_ENCRYPT_MEMORY_SIZE) */ + RtlCopyMemory(Buffer, TestData, sizeof(Buffer)); + Status = RtlEncryptMemory(Buffer, 7, OptionFlags); ok_ntstatus(Status, STATUS_INVALID_PARAMETER); - /* Buffer must not be aligned to 8 bytes */ - Status = RtlEncryptMemory(&Buffer[1], 8, RTL_ENCRYPT_OPTION_SAME_PROCESS); + /* Buffer can be unaligned */ + RtlCopyMemory(Buffer, TestData, sizeof(Buffer)); + Status = RtlEncryptMemory(&Buffer[1], 8, OptionFlags); + ok_ntstatus(Status, STATUS_SUCCESS); + Status = RtlDecryptMemory(&Buffer[1], 8, OptionFlags); ok_ntstatus(Status, STATUS_SUCCESS); + ok(RtlEqualMemory(Buffer, TestData, sizeof(Buffer)) == 1, + "OptionFlags=%lu, Buffer='%s', TestData='%s'\n", + OptionFlags, Buffer, TestData); RtlCopyMemory(Buffer, TestData, sizeof(Buffer)); - Status = RtlEncryptMemory(Buffer, sizeof(Buffer), RTL_ENCRYPT_OPTION_SAME_PROCESS); + Status = RtlEncryptMemory(Buffer, sizeof(Buffer), OptionFlags); ok_ntstatus(Status, STATUS_SUCCESS); ok_int(RtlEqualMemory(Buffer, TestData, sizeof(Buffer)), 0); - Status = RtlDecryptMemory(Buffer, sizeof(Buffer), RTL_ENCRYPT_OPTION_SAME_PROCESS); + Status = RtlDecryptMemory(Buffer, sizeof(Buffer), OptionFlags); ok_ntstatus(Status, STATUS_SUCCESS); ok_int(RtlEqualMemory(Buffer, TestData, sizeof(Buffer)), 1); +} + +void TestCrossProcessDecrypt(PSTR Param) +{ + UCHAR Buffer[32] = { 0 }; + ULONG OptionFlags; + PSTR StrData; + ULONG i; + NTSTATUS Status; + + OptionFlags = Param[3] == '1' ? RTL_ENCRYPT_OPTION_CROSS_PROCESS : RTL_ENCRYPT_OPTION_SAME_LOGON; + + /* Convert the HEX string to binary ('-cp<1|2>:<data>') */ + StrData = Param + 5; + for (i = 0; i < sizeof(Buffer); i++) + { + UINT x; + sscanf(&StrData[2 * i], "%02X", &x); + Buffer[i] = (UCHAR)x; + } + + /* Decrypt the data */ + Status = RtlDecryptMemory(Buffer, sizeof(Buffer), OptionFlags); + ok_ntstatus(Status, STATUS_SUCCESS); + ok_int(RtlEqualMemory(Buffer, TestData, sizeof(Buffer)), 1); +} + +void TestCrossProcessEncrypt(ULONG OptionFlags) +{ + UCHAR Buffer[32]; + CHAR CmdLine[MAX_PATH]; + PSTR StrBuffer; + NTSTATUS Status; + ULONG i; + INT result; + + /* Encrypt the test string */ + RtlCopyMemory(Buffer, TestData, sizeof(Buffer)); + Status = RtlEncryptMemory(Buffer, sizeof(Buffer), OptionFlags); + ok_ntstatus(Status, STATUS_SUCCESS); + + /* Start building a command line */ + sprintf(CmdLine, "advapi32_apitest.exe RtlEncryptMemory -cp%lu:", OptionFlags); + StrBuffer = CmdLine + strlen(CmdLine); + + /* Convert encrypted data into a hex string */ + for (i = 0; i < sizeof(Buffer); i++) + { + sprintf(&StrBuffer[2 * i], "%02X", Buffer[i]); + } + + result = system(CmdLine); + ok_int(result, 0); +} + +START_TEST(RtlEncryptMemory) +{ + CHAR Buffer[8] = { 0 }; + PSTR CommandLine, Param; + NTSTATUS Status; + + /* Check recursive call */ + CommandLine = GetCommandLineA(); + Param = strstr(CommandLine, "-cp"); + if (Param != NULL) + { + TestCrossProcessDecrypt(Param); + return; + } + + TestEncrypt(RTL_ENCRYPT_OPTION_SAME_PROCESS); + TestEncrypt(RTL_ENCRYPT_OPTION_CROSS_PROCESS); + TestEncrypt(RTL_ENCRYPT_OPTION_SAME_LOGON); + + Status = RtlEncryptMemory(Buffer, sizeof(Buffer), 4); + ok_ntstatus(Status, STATUS_INVALID_PARAMETER); + TestCrossProcessEncrypt(RTL_ENCRYPT_OPTION_CROSS_PROCESS); + TestCrossProcessEncrypt(RTL_ENCRYPT_OPTION_SAME_LOGON); }

1 0

[reactos] 01/01: [SHELL32] Call SHAutoComplete on 'Run' dialog
by Katayama Hirofumi MZ 25 Sep '20

25 Sep '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ed02f41af5a6013916bf3… commit ed02f41af5a6013916bf37d749042bfae6b61bb2 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Sep 25 15:59:30 2020 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Fri Sep 25 15:59:30 2020 +0900 [SHELL32] Call SHAutoComplete on 'Run' dialog CORE-9281 --- dll/win32/shell32/dialogs/dialogs.cpp | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/dll/win32/shell32/dialogs/dialogs.cpp b/dll/win32/shell32/dialogs/dialogs.cpp index 3d584480cf7..aa71de0b1f4 100644 --- a/dll/win32/shell32/dialogs/dialogs.cpp +++ b/dll/win32/shell32/dialogs/dialogs.cpp @@ -500,6 +500,8 @@ static void EnableOkButtonFromEditContents(HWND hwnd) static INT_PTR CALLBACK RunDlgProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) { RUNFILEDLGPARAMS *prfdp = (RUNFILEDLGPARAMS *)GetWindowLongPtrW(hwnd, DWLP_USER); + HWND hwndCombo, hwndEdit; + COMBOBOXINFO ComboInfo; switch (message) { @@ -538,9 +540,16 @@ static INT_PTR CALLBACK RunDlgProc(HWND hwnd, UINT message, WPARAM wParam, LPARA // SendMessageW(hwnd, WM_SETICON, ICON_SMALL, (LPARAM)prfdp->hIcon); SendMessageW(GetDlgItem(hwnd, IDC_RUNDLG_ICON), STM_SETICON, (WPARAM)prfdp->hIcon, 0); - FillList(GetDlgItem(hwnd, IDC_RUNDLG_EDITPATH), NULL, 0, (prfdp->uFlags & RFF_NODEFAULT) == 0); + hwndCombo = GetDlgItem(hwnd, IDC_RUNDLG_EDITPATH); + FillList(hwndCombo, NULL, 0, (prfdp->uFlags & RFF_NODEFAULT) == 0); EnableOkButtonFromEditContents(hwnd); - SetFocus(GetDlgItem(hwnd, IDC_RUNDLG_EDITPATH)); + + ComboInfo.cbSize = sizeof(ComboInfo); + GetComboBoxInfo(hwndCombo, &ComboInfo); + hwndEdit = ComboInfo.hwndItem; + SHAutoComplete(hwndEdit, SHACF_FILESYSTEM | SHACF_FILESYS_ONLY | SHACF_URLALL); + + SetFocus(hwndCombo); return TRUE; case WM_COMMAND:

1 0

[reactos] 01/01: [COMCTL32] IP Address controls follow-up of #3212 (3f30b1e)
by Katayama Hirofumi MZ 25 Sep '20

25 Sep '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0a8fb87d845482db5909f… commit 0a8fb87d845482db5909fe9034e0d5ebac8c5b3c Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Sep 25 15:32:58 2020 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Fri Sep 25 15:32:58 2020 +0900 [COMCTL32] IP Address controls follow-up of #3212 (3f30b1e) The rightest field didn't work Left arrow key. CORE-3479 --- dll/win32/comctl32/ipaddress.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/dll/win32/comctl32/ipaddress.c b/dll/win32/comctl32/ipaddress.c index 9f1b2c08c38..ece99e9a5d7 100644 --- a/dll/win32/comctl32/ipaddress.c +++ b/dll/win32/comctl32/ipaddress.c @@ -453,9 +453,6 @@ static BOOL IPADDRESS_GotoNextField (const IPADDRESS_INFO *infoPtr, int cur, int end = -1; SendMessageW(next->EditHwnd, EM_SETSEL, start, end); } -#ifdef __REACTOS__ - SetFocus(next->EditHwnd); -#endif return TRUE; } @@ -599,8 +596,9 @@ IPADDRESS_SubclassProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) #ifdef __REACTOS__ case WM_GETDLGCODE: { - LRESULT ret = DefWindowProcW(hwnd, uMsg, wParam, lParam); - return ret | DLGC_WANTTAB; + LRESULT result = CallWindowProcW(part->OrigProc, hwnd, uMsg, wParam, lParam); + result |= DLGC_WANTALLKEYS | DLGC_WANTCHARS | DLGC_WANTTAB; + return result; } #endif }

1 0

[reactos] 01/01: [SETUP][MMSYS][SHELL32] Adding missing French translation (and update existing ones) (#3232)
by Kyle Katarn 24 Sep '20

24 Sep '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b9754fa5d6a1e32aca49a… commit b9754fa5d6a1e32aca49abeaf1576cff57988591 Author: Kyle Katarn <contact(a)kcsoftwares.com> AuthorDate: Fri Sep 25 01:39:31 2020 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Sep 25 01:39:31 2020 +0200 [SETUP][MMSYS][SHELL32] Adding missing French translation (and update existing ones) (#3232) Co-authored-by: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> --- base/setup/reactos/lang/fr-FR.rc | 130 +++++++++++++++++++-------------------- dll/cpl/mmsys/lang/fr-FR.rc | 6 +- dll/win32/shell32/lang/fr-FR.rc | 2 +- 3 files changed, 69 insertions(+), 69 deletions(-) diff --git a/base/setup/reactos/lang/fr-FR.rc b/base/setup/reactos/lang/fr-FR.rc index cb6c0bf7365..fe38ddcf1ac 100644 --- a/base/setup/reactos/lang/fr-FR.rc +++ b/base/setup/reactos/lang/fr-FR.rc @@ -15,11 +15,11 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Installation de ReactOS" FONT 8, "MS Shell Dlg" BEGIN - AUTORADIOBUTTON "Install ReactOS", IDC_INSTALL, 7, 7, 277, 10, WS_GROUP | WS_TABSTOP - LTEXT "Install a new copy of ReactOS. This option does not keep your files, settings and programs. You can make changes to disks and partitions.", IDC_INSTALLTEXT, 18, 18, 269, 25, NOT WS_GROUP - AUTORADIOBUTTON "Update or repair an installed ReactOS", IDC_UPDATE, 7, 50, 277, 10 - LTEXT "Update or repair an installed copy of ReactOS. This option keeps your files, settings and programs. This option is only available if ReactOS is already installed on this computer.", IDC_UPDATETEXT, 18, 61, 269, 30, NOT WS_GROUP - LTEXT "Click Next to setup the devices.", IDC_STATIC, 7, 1280, 297, 8 + AUTORADIOBUTTON "Installer ReactOS", IDC_INSTALL, 7, 7, 277, 10, WS_GROUP | WS_TABSTOP + LTEXT "Installer une nouvelle copie de ReactOS. Cette option ne conservera pas vos données, paramètres et programmes. Vous pouvez effectuer des modifications sur les disques et les partitions.", IDC_INSTALLTEXT, 18, 18, 269, 25, NOT WS_GROUP + AUTORADIOBUTTON "Mettre à jour ou réparer ReactOS", IDC_UPDATE, 7, 50, 277, 10 + LTEXT "Mettre à jour ou réparer une copie existante de ReactOS. Cette option conserve vos données, paramètres et programmes. Cette option est seulement disponible si ReactOS est déjà installé sur cet ordinateur.", IDC_UPDATETEXT, 18, 61, 269, 30, NOT WS_GROUP + LTEXT "Appuyer sur Suivant pour configurer les périphériques.", IDC_STATIC, 7, 1280, 297, 8 END IDD_UPDATEREPAIRPAGE DIALOGEX 0, 0, 317, 143 @@ -27,10 +27,10 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Installation de ReactOS" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "The ReactOS Setup can upgrade one of the available ReactOS installations listed below, or, if a ReactOS installation is damaged, the Setup program can attempt to repair it.", IDC_STATIC, 6, 6, 300, 18 + LTEXT "L'installation de ReactOS peut mettre à niveau les installations disponibles de ReactOS listées ci-dessous, ou, si une installation de ReactOS est endommagée, l'installation peut essayer de la réparer.", IDC_STATIC, 6, 6, 300, 18 CONTROL "", IDC_NTOSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP, 6, 30, 303, 90 - PUSHBUTTON "&Do not upgrade", IDC_SKIPUPGRADE, 230, 128, 80, 14 - LTEXT "Click Next to upgrade the selected OS installation, or on 'Do not upgrade' to continue a new installation without upgrading.", IDC_STATIC, 7, 124, 222, 16 + PUSHBUTTON "&Ne pas mettre à jour", IDC_SKIPUPGRADE, 230, 128, 80, 14 + LTEXT "Appuyer sur Suivant pour mettre à niveau l'installation sélectionnée, ou sur 'Ne pas mettre à niveau' pour continuer une nouvelle installation.", IDC_STATIC, 7, 124, 222, 16 END IDD_DEVICEPAGE DIALOGEX 0, 0, 317, 143 @@ -38,13 +38,13 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Installation de ReactOS" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Computer:", IDC_STATIC, 20, 15, 80, 10 + LTEXT "Ordinateur :", IDC_STATIC, 20, 15, 80, 10 CONTROL "", IDC_COMPUTER, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 15, 180, 80 - LTEXT "Display:", IDC_STATIC, 20, 35, 80, 10 + LTEXT "Affichage :", IDC_STATIC, 20, 35, 80, 10 CONTROL "", IDC_DISPLAY, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 35, 180, 80 - LTEXT "Keyboard:", IDC_STATIC, 20, 55, 80, 10 + LTEXT "Clavier :", IDC_STATIC, 20, 55, 80, 10 CONTROL "", IDC_KEYBOARD, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 55, 180, 80 - LTEXT "Click Next to continue setup on the installation device.", IDC_STATIC, 7, 128, 297, 8 + LTEXT "Appuyer sur Suivant pour continuer l'installation.", IDC_STATIC, 7, 128, 297, 8 END IDD_DRIVEPAGE DIALOGEX 0, 0, 317, 143 @@ -53,42 +53,42 @@ CAPTION "Installation de ReactOS" FONT 8, "MS Shell Dlg" BEGIN CONTROL "", IDC_PARTITION, "SysTreeList32", WS_BORDER | WS_VISIBLE | WS_TABSTOP | LVS_REPORT | LVS_SINGLESEL, 7, 7, 303, 112 - PUSHBUTTON "&Create", IDC_PARTCREATE, 7, 122, 50, 15 - PUSHBUTTON "&Delete", IDC_PARTDELETE, 63, 122, 50, 15 - PUSHBUTTON "D&river", IDC_DEVICEDRIVER, 174, 122, 50, 15, WS_DISABLED - PUSHBUTTON "&Advanced Options...", IDC_PARTMOREOPTS, 230, 122, 80, 15 + PUSHBUTTON "&Créer", IDC_PARTCREATE, 7, 122, 50, 15 + PUSHBUTTON "&Supprimer", IDC_PARTDELETE, 63, 122, 50, 15 + PUSHBUTTON "&Pilote", IDC_DEVICEDRIVER, 174, 122, 50, 15, WS_DISABLED + PUSHBUTTON "&Options avancées...", IDC_PARTMOREOPTS, 230, 122, 80, 15 // LTEXT "Click Next to check the summary.", IDC_STATIC, 10, 180, 277, 20 END IDD_PARTITION DIALOGEX 0, 0, 145, 90 STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION -CAPTION "Create Partition" +CAPTION "Créer une partition" FONT 8, "MS Shell Dlg" BEGIN CONTROL "", IDC_UPDOWN1, "msctls_updown32", WS_VISIBLE, 104, 22, 9, 13 - CONTROL "Create and format partition", IDC_STATIC, "Button", BS_GROUPBOX, 7, 5, 129, 57 - LTEXT "Size:", IDC_STATIC, 13, 24, 27, 9 + CONTROL "Créer et formatter une partition", IDC_STATIC, "Button", BS_GROUPBOX, 7, 5, 129, 57 + LTEXT "Taille :", IDC_STATIC, 13, 24, 27, 9 EDITTEXT IDC_PARTSIZE, 58, 22, 47, 13, WS_VISIBLE | WS_TABSTOP - LTEXT "GB", IDC_UNIT, 117, 24, 14, 9 - LTEXT "File System:", IDC_STATIC, 13, 46, 42, 9 + LTEXT "Go", IDC_UNIT, 117, 24, 14, 9 + LTEXT "Système de fichier :", IDC_STATIC, 13, 46, 42, 9 CONTROL "", IDC_FSTYPE, "ComboBox", WS_VISIBLE | WS_TABSTOP | CBS_DROPDOWNLIST, 58, 42, 73, 50 PUSHBUTTON "&OK", IDOK, 35, 68, 47, 15, WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "&Cancel", IDCANCEL, 87, 68, 47, 15, WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "&Annuler", IDCANCEL, 87, 68, 47, 15, WS_VISIBLE | WS_TABSTOP END IDD_BOOTOPTIONS DIALOGEX 0, 0, 305, 116 STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION -CAPTION "Advanced Partition Settings" +CAPTION "Paramètres de partition avancés" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Installation folder", IDC_STATIC, "Button", BS_GROUPBOX, 4, 1, 298, 30 + CONTROL "Dossier d'installation", IDC_STATIC, "Button", BS_GROUPBOX, 4, 1, 298, 30 EDITTEXT IDC_PATH, 10, 11, 278, 13, WS_VISIBLE - CONTROL "Boot loader installation", IDC_STATIC, "Button", BS_GROUPBOX, 4, 36, 298, 52 - CONTROL "Install boot loader on the hard disk (MBR and VBR)", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 46, 278, 11 - CONTROL "Install boot loader on the hard disk (VBR only)", IDC_INSTVBRONLY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 57, 278, 11 - CONTROL "No installation of bootloader", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED, 10, 68, 278, 11 + CONTROL "Installation du chargeur de démarrage", IDC_STATIC, "Button", BS_GROUPBOX, 4, 36, 298, 52 + CONTROL "Installer le chargeur de démarrage sur le disque dur (MBR et VBR)", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 46, 278, 11 + CONTROL "Installer le chargeur de démarrage sur le disque dur (VBR uniquement)", IDC_INSTVBRONLY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 57, 278, 11 + CONTROL "Ne pas installer le chargeur de démarrage", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED, 10, 68, 278, 11 PUSHBUTTON "&OK", IDOK, 180, 94, 50, 15, WS_TABSTOP | WS_VISIBLE - PUSHBUTTON "&Cancel", IDCANCEL, 240, 94, 50, 15, WS_TABSTOP | WS_VISIBLE + PUSHBUTTON "&Annuler", IDCANCEL, 240, 94, 50, 15, WS_TABSTOP | WS_VISIBLE END IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 143 @@ -96,25 +96,25 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Installation de ReactOS" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Installation type:", IDC_STATIC, 18, 5, 74, 11 + LTEXT "Type d'installation :", IDC_STATIC, 18, 5, 74, 11 EDITTEXT IDC_INSTALLTYPE, 95, 4, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "Installation source:", IDC_STATIC, 18, 17, 74, 11 + LTEXT "Source d'installation :", IDC_STATIC, 18, 17, 74, 11 EDITTEXT IDC_INSTALLSOURCE, 95, 16, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "Architecture:", IDC_STATIC, 18, 29, 74, 11 + LTEXT "Architecture :", IDC_STATIC, 18, 29, 74, 11 EDITTEXT IDC_ARCHITECTURE, 95, 28, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "Computer:", IDC_STATIC, 18, 41, 74, 11 + LTEXT "Ordinateur :", IDC_STATIC, 18, 41, 74, 11 EDITTEXT IDC_COMPUTER, 95, 40, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "Display:", IDC_STATIC, 18, 53, 74, 11 + LTEXT "Affichage :", IDC_STATIC, 18, 53, 74, 11 EDITTEXT IDC_DISPLAY, 95, 52, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "Keyboard:", IDC_STATIC, 18, 65, 74, 11 + LTEXT "Clavier :", IDC_STATIC, 18, 65, 74, 11 EDITTEXT IDC_KEYBOARD, 95, 64, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "Destination volume:", IDC_STATIC, 18, 77, 74, 11 + LTEXT "Volume de destination :", IDC_STATIC, 18, 77, 74, 11 EDITTEXT IDC_DESTDRIVE, 95, 76, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "Destination directory:", IDC_STATIC, 18, 89, 74, 11 + LTEXT "Dossier de destination :", IDC_STATIC, 18, 89, 74, 11 EDITTEXT IDC_PATH, 95, 88, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP - AUTOCHECKBOX "I confirm that all the installation settings are correct. I also acknowledge that\nReactOS is alpha-quality software and may break on my computer or corrupt my data.", + AUTOCHECKBOX "Je confirme que tous les paramètres sont corrects. Je reconnais également que\nReactOS est un logiciel dans un état de qualité Alpha et peut endommager mon ordinateur ou corrompre mes données.", IDC_CONFIRM_INSTALL, 7, 104, 303, 18, BS_MULTILINE - LTEXT "Please confirm that all the installation settings are correct,\nthen click on Install to start the installation process.", IDC_STATIC, 7, 124, 303, 18 + LTEXT "Merci de confirmer que tous les paramètres d'installation sont corrects,\npuis appuyer sur Installer pour démarrer le processus d'installation.", IDC_STATIC, 7, 124, 303, 18 END IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143 @@ -122,7 +122,7 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Installation de ReactOS" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Install files...", IDC_ACTIVITY, 20, 50, 277, 10 + LTEXT "Fichiers d'installation...", IDC_ACTIVITY, 20, 50, 277, 10 LTEXT "test.txt", IDC_ITEM, 30, 80, 257, 10 CONTROL "", IDC_PROCESSPROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8 END @@ -132,44 +132,44 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Installation de ReactOS" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Completing the ReactOS Setup Wizard", IDC_FINISHTITLE, 115, 8, 195, 24 - LTEXT "You have successfully completed the first stage of ReactOS Setup.", IDC_STATIC, 20, 50, 277, 10 - LTEXT "When you click Finish, your computer will restart.", IDC_STATIC, 20, 80, 277, 10 + LTEXT "Finalisation de l'assistant d'installation de ReactOS", IDC_FINISHTITLE, 115, 8, 195, 24 + LTEXT "Vous avez complété avec succès la première étape d'installation de ReactOS.", IDC_STATIC, 20, 50, 277, 10 + LTEXT "Si vous appuyez sur Terminer, votre ordinateur va redémarrer.", IDC_STATIC, 20, 80, 277, 10 CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8 - LTEXT "If there is a CD in a drive, remove it. Then, to restart your computer, click Finish.", IDC_STATIC, 10, 180, 297, 20 + LTEXT "S'il y a un CD dans le lecteur, retirez le. Appuyez ensuite sur Terminer pour redémarrer votre ordinateur.", IDC_STATIC, 10, 180, 297, 20 END STRINGTABLE BEGIN - IDS_TYPETITLE "Welcome to ReactOS Setup" - IDS_TYPESUBTITLE "Choose setup type." - IDS_DEVICETITLE "Setup the basic devices" - IDS_DEVICESUBTITLE "Set the settings of display and keyboard." - IDS_DRIVETITLE "Setup the installation partition and system folder" - IDS_DRIVESUBTITLE "Prepare installation partition, system folder and boot loader." - IDS_PROCESSTITLE "Setup partition, copy files and setup system" - IDS_PROCESSSUBTITLE "Create and format partition, copy files, install and setup boot loader" - IDS_RESTARTTITLE "First stage of setup finished" - IDS_RESTARTSUBTITLE "The first stage of setup has been completed, restart to continue with second stage" - IDS_SUMMARYTITLE "Installation Summary" - IDS_SUMMARYSUBTITLE "List installation properties to check before apply to the installation device" - IDS_ABORTSETUP "ReactOS is not completely installed on your computer. If you quit Setup now, you will need to run Setup again to install ReactOS. Really quit?" - IDS_ABORTSETUP2 "Abort installation?" - IDS_NO_TXTSETUP_SIF "Unable to find 'txtsetup.sif'.\nSetup is unable to continue." + IDS_TYPETITLE "Bienvenue dans l'installation de ReactOS" + IDS_TYPESUBTITLE "Choisissez un type d'installation." + IDS_DEVICETITLE "Configurer les périphériques de base." + IDS_DEVICESUBTITLE "Configurer l'affichage et le clavier." + IDS_DRIVETITLE "Configurer la partition d'installation et le dossier système." + IDS_DRIVESUBTITLE "Préparer la partition d'installation, le dossier système et le chargeur de démarrage." + IDS_PROCESSTITLE "Configurer la partition, copier les fichiers et configurer le système." + IDS_PROCESSSUBTITLE "Créer et formatter la partition, copier les fichiers, installer et configurer le chargeur de démarrage." + IDS_RESTARTTITLE "Première étape de configuration terminée" + IDS_RESTARTSUBTITLE "La première étape de l'installation est terminée. Veuillez redémarrer pour continuer avec la seconde étape." + IDS_SUMMARYTITLE "Résumé de l'installation" + IDS_SUMMARYSUBTITLE "Lister les propriétés d'installation à vérifier avant application sur le périphérique d'installation." + IDS_ABORTSETUP "ReactOS n'est pas complètement installé sur votre ordinateur. Si vous quittez l'installation maintenant, vous devrez lancer l'installation de nouveau pour installer ReactOS. Voulez-vous quitter ?" + IDS_ABORTSETUP2 "Abandonner l'installation ?" + IDS_NO_TXTSETUP_SIF "Impossible de trouver 'txtsetup.sif'.\nL'installation ne peut continuer." IDS_CAPTION "Installation de ReactOS" END STRINGTABLE BEGIN - IDS_INSTALLATION_NAME "Name" - IDS_INSTALLATION_PATH "Installation Path" - IDS_INSTALLATION_VENDOR "Vendor Name" + IDS_INSTALLATION_NAME "Nom" + IDS_INSTALLATION_PATH "Chemin d'installation" + IDS_INSTALLATION_VENDOR "Nom du fabricant" END STRINGTABLE BEGIN - IDS_PARTITION_NAME "Name" + IDS_PARTITION_NAME "Nom" IDS_PARTITION_TYPE "Type" - IDS_PARTITION_SIZE "Size" - IDS_PARTITION_STATUS "Status" + IDS_PARTITION_SIZE "Taille" + IDS_PARTITION_STATUS "Statut" END diff --git a/dll/cpl/mmsys/lang/fr-FR.rc b/dll/cpl/mmsys/lang/fr-FR.rc index 8aadb3e42de..74ea03e1ec7 100644 --- a/dll/cpl/mmsys/lang/fr-FR.rc +++ b/dll/cpl/mmsys/lang/fr-FR.rc @@ -27,13 +27,13 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Sons" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Un schéma sons est un ensemble de sons appliqués aux évènements de ReactOS et aux programmes. Vous pouvez sélectionner un schéma existant ou en enregistrer que vous avez modifié.", -1, 8, 7, 230, 40 + LTEXT "Un schéma sons est un ensemble de sons appliqués aux événements de ReactOS et aux programmes. Vous pouvez sélectionner un schéma existant ou en enregistrer un que vous avez modifié.", -1, 8, 7, 230, 40 LTEXT "S&chéma sons :", -1, 8, 42, 150, 17 COMBOBOX IDC_SOUND_SCHEME, 8, 53, 230, 46, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "&Enregistrer sous...", IDC_SAVEAS_BTN, 120, 70, 65, 15 PUSHBUTTON "Supprimer", IDC_DELETE_BTN, 188, 70, 50, 15 - LTEXT "Pour changer les sons, cliquez sur un évènement de programme dans la liste suivante, puis sélectionnez un son à appliquer. Vous pouvez enregistrer les changements en tant que nouveau schéma son.", -1, 8, 90, 230, 40 - LTEXT "Évènements des programmes :", -1, 8, 118, 150, 17 + LTEXT "Pour changer les sons, cliquez sur un événement de programme dans la liste suivante, puis sélectionnez un son à appliquer. Vous pouvez enregistrer les changements en tant que nouveau schéma sons.", -1, 8, 90, 230, 40 + LTEXT "Événements des programmes :", -1, 8, 118, 150, 17 CONTROL "", IDC_SCHEME_LIST, "SysTreeView32", TVS_DISABLEDRAGDROP| TVS_SHOWSELALWAYS | WS_CHILD | WS_VISIBLE| WS_BORDER | WS_TABSTOP, 8, 130, 230, 60 LTEXT "&Sons :", IDC_TEXT_SOUND, 8, 194, 80, 17, WS_DISABLED COMBOBOX IDC_SOUND_LIST, 8, 205, 155, 146, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED diff --git a/dll/win32/shell32/lang/fr-FR.rc b/dll/win32/shell32/lang/fr-FR.rc index acf02ca4a6b..f709c10405e 100644 --- a/dll/win32/shell32/lang/fr-FR.rc +++ b/dll/win32/shell32/lang/fr-FR.rc @@ -740,7 +740,7 @@ BEGIN IDS_SHV_COLUMN_DELFROM "Localisation d'origine" IDS_SHV_COLUMN_DELDATE "Date de suppression" IDS_SHV_COLUMN_FONTTYPE "Type de police" - IDS_SHV_COLUMN_WORKGROUP "Workgroup" + IDS_SHV_COLUMN_WORKGROUP "Groupe de travail" IDS_SHV_COLUMN_NETLOCATION "Emplacement réseau" IDS_SHV_COLUMN_DOCUMENTS "Documents" IDS_SHV_COLUMN_STATUS "État"

1 0

[reactos] 01/01: [NTOSKRNL_VISTA] Add stubs for functions needed in KMDF
by Victor Perevertkin 24 Sep '20

24 Sep '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bb94e711ef504822fa1c5… commit bb94e711ef504822fa1c5b25dd1e7c82db5ab950 Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Fri Sep 25 01:28:55 2020 +0300 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Fri Sep 25 01:28:55 2020 +0300 [NTOSKRNL_VISTA] Add stubs for functions needed in KMDF --- sdk/include/xdk/iofuncs.h | 2 +- sdk/include/xdk/pofuncs.h | 4 ++-- sdk/lib/drivers/ntoskrnl_vista/io.c | 17 +++++++++++++++++ sdk/lib/drivers/ntoskrnl_vista/po.c | 22 +++++++++++++++++++++- 4 files changed, 41 insertions(+), 4 deletions(-) diff --git a/sdk/include/xdk/iofuncs.h b/sdk/include/xdk/iofuncs.h index ec364576e4f..04d3c63a200 100644 --- a/sdk/include/xdk/iofuncs.h +++ b/sdk/include/xdk/iofuncs.h @@ -2402,7 +2402,7 @@ IoRequestDeviceEjectEx( _IRQL_requires_max_(PASSIVE_LEVEL) _Must_inspect_result_ -NTKERNELAPI +NTKRNLVISTAAPI NTSTATUS NTAPI IoSetDevicePropertyData( diff --git a/sdk/include/xdk/pofuncs.h b/sdk/include/xdk/pofuncs.h index ff73e1b7500..5b40e2eadd6 100644 --- a/sdk/include/xdk/pofuncs.h +++ b/sdk/include/xdk/pofuncs.h @@ -98,14 +98,14 @@ $if (_WDMDDK_) #if (NTDDI_VERSION >= NTDDI_VISTA) _IRQL_requires_max_(DISPATCH_LEVEL) -NTKERNELAPI +NTKRNLVISTAAPI VOID NTAPI PoSetSystemWake( _Inout_ struct _IRP *Irp); _IRQL_requires_max_(DISPATCH_LEVEL) -NTKERNELAPI +NTKRNLVISTAAPI BOOLEAN NTAPI PoGetSystemWake( diff --git a/sdk/lib/drivers/ntoskrnl_vista/io.c b/sdk/lib/drivers/ntoskrnl_vista/io.c index c295d63193f..e3686abd12e 100644 --- a/sdk/lib/drivers/ntoskrnl_vista/io.c +++ b/sdk/lib/drivers/ntoskrnl_vista/io.c @@ -66,6 +66,23 @@ IoQueueWorkItemEx( IoQueueWorkItem(IoWorkItem, IopWorkItemExCallback, QueueType, Context); } +_IRQL_requires_max_(PASSIVE_LEVEL) +_Must_inspect_result_ +NTKRNLVISTAAPI +NTSTATUS +NTAPI +IoSetDevicePropertyData( + _In_ PDEVICE_OBJECT Pdo, + _In_ CONST DEVPROPKEY *PropertyKey, + _In_ LCID Lcid, + _In_ ULONG Flags, + _In_ DEVPROPTYPE Type, + _In_ ULONG Size, + _In_opt_ PVOID Data) +{ + return STATUS_NOT_IMPLEMENTED; +} + _IRQL_requires_max_(PASSIVE_LEVEL) _Must_inspect_result_ NTKRNLVISTAAPI diff --git a/sdk/lib/drivers/ntoskrnl_vista/po.c b/sdk/lib/drivers/ntoskrnl_vista/po.c index 791a784273a..3598332a87b 100644 --- a/sdk/lib/drivers/ntoskrnl_vista/po.c +++ b/sdk/lib/drivers/ntoskrnl_vista/po.c @@ -40,4 +40,24 @@ PoQueryWatchdogTime( _Out_ PULONG SecondsRemaining) { return FALSE; -} \ No newline at end of file +} + +_IRQL_requires_max_(DISPATCH_LEVEL) +NTKRNLVISTAAPI +VOID +NTAPI +PoSetSystemWake( + _Inout_ struct _IRP *Irp) +{ + +} + +_IRQL_requires_max_(DISPATCH_LEVEL) +NTKRNLVISTAAPI +BOOLEAN +NTAPI +PoGetSystemWake( + _In_ struct _IRP *Irp) +{ + return FALSE; +}

1 0

[reactos] 01/01: [XDK] Add definitions required for newer storage class drivers (cdrom) That introduced some warnings in the current code which were corrected as well
by Victor Perevertkin 24 Sep '20

24 Sep '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d01518da7cebdf87cc38e… commit d01518da7cebdf87cc38eefdff70aefa289b2f95 Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Thu Sep 24 22:30:52 2020 +0300 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Thu Sep 24 22:30:52 2020 +0300 [XDK] Add definitions required for newer storage class drivers (cdrom) That introduced some warnings in the current code which were corrected as well CORE-17129 --- drivers/storage/class/ramdisk/ramdisk.c | 1 + ntoskrnl/mm/ARM3/mdlsup.c | 2 +- sdk/include/ndk/mmtypes.h | 6 + sdk/include/xdk/exfuncs.h | 50 ++++ sdk/include/xdk/extypes.h | 46 +++ sdk/include/xdk/iotypes.h | 480 +++++++++++++++++++++++++++++++- sdk/include/xdk/ketypes.h | 6 + sdk/include/xdk/mmfuncs.h | 7 +- sdk/include/xdk/potypes.h | 276 +++++++++++++++++- 9 files changed, 864 insertions(+), 10 deletions(-) diff --git a/drivers/storage/class/ramdisk/ramdisk.c b/drivers/storage/class/ramdisk/ramdisk.c index 4f910eff5be..987d0ffc6fd 100644 --- a/drivers/storage/class/ramdisk/ramdisk.c +++ b/drivers/storage/class/ramdisk/ramdisk.c @@ -1733,6 +1733,7 @@ RamdiskQueryId(IN PRAMDISK_DRIVE_EXTENSION DriveExtension, } case BusQueryDeviceSerialNumber: + case BusQueryContainerID: { /* Nothing to do */ break; diff --git a/ntoskrnl/mm/ARM3/mdlsup.c b/ntoskrnl/mm/ARM3/mdlsup.c index 4975b3edc8b..10a2aa02f68 100644 --- a/ntoskrnl/mm/ARM3/mdlsup.c +++ b/ntoskrnl/mm/ARM3/mdlsup.c @@ -666,7 +666,7 @@ MmMapLockedPagesSpecifyCache(IN PMDL Mdl, IN MEMORY_CACHING_TYPE CacheType, IN PVOID BaseAddress, IN ULONG BugCheckOnFailure, - IN MM_PAGE_PRIORITY Priority) + IN ULONG Priority) // MM_PAGE_PRIORITY { PVOID Base; PPFN_NUMBER MdlPages, LastPage; diff --git a/sdk/include/ndk/mmtypes.h b/sdk/include/ndk/mmtypes.h index a19b5f1ee60..ca62ebdf5ce 100644 --- a/sdk/include/ndk/mmtypes.h +++ b/sdk/include/ndk/mmtypes.h @@ -125,6 +125,12 @@ typedef enum _POOL_TYPE PagedPoolCacheAligned, NonPagedPoolCacheAlignedMustS, MaxPoolType, + + NonPagedPoolBase = 0, + NonPagedPoolBaseMustSucceed = NonPagedPoolBase + 2, + NonPagedPoolBaseCacheAligned = NonPagedPoolBase + 4, + NonPagedPoolBaseCacheAlignedMustS = NonPagedPoolBase + 6, + NonPagedPoolSession = 32, PagedPoolSession, NonPagedPoolMustSucceedSession, diff --git a/sdk/include/xdk/exfuncs.h b/sdk/include/xdk/exfuncs.h index 1f9a1ad6a97..2d0c2332f2b 100644 --- a/sdk/include/xdk/exfuncs.h +++ b/sdk/include/xdk/exfuncs.h @@ -950,6 +950,56 @@ ExLocalTimeToSystemTime( _In_ PLARGE_INTEGER LocalTime, _Out_ PLARGE_INTEGER SystemTime); +#if (NTDDI_VERSION >= NTDDI_WINBLUE) + +#define EX_TIMER_HIGH_RESOLUTION 0x4 +#define EX_TIMER_NO_WAKE 0x8 +#define EX_TIMER_UNLIMITED_TOLERANCE ((LONGLONG)-1) +#define EX_TIMER_NOTIFICATION (1UL << 31) + +NTKERNELAPI +PEX_TIMER +NTAPI +ExAllocateTimer( + _In_opt_ PEXT_CALLBACK Callback, + _In_opt_ PVOID CallbackContext, + _In_ ULONG Attributes); + +NTKERNELAPI +BOOLEAN +NTAPI +ExSetTimer( + _In_ PEX_TIMER Timer, + _In_ LONGLONG DueTime, + _In_ LONGLONG Period, + _In_opt_ PEXT_SET_PARAMETERS Parameters); + +NTKERNELAPI +BOOLEAN +NTAPI +ExCancelTimer( + _Inout_ PEX_TIMER Timer, + _In_opt_ PEXT_CANCEL_PARAMETERS Parameters); + +NTKERNELAPI +BOOLEAN +NTAPI +ExDeleteTimer( + _In_ PEX_TIMER Timer, + _In_ BOOLEAN Cancel, + _In_ BOOLEAN Wait, + _In_opt_ PEXT_DELETE_PARAMETERS Parameters); + +FORCEINLINE +VOID +ExInitializeSetTimerParameters( + _Out_ PEXT_SET_PARAMETERS Parameters) +{ + ASSERT(FALSE); +} + +#endif // NTDDI_WINBLUE + _IRQL_requires_max_(DISPATCH_LEVEL) NTKERNELAPI VOID diff --git a/sdk/include/xdk/extypes.h b/sdk/include/xdk/extypes.h index 548dceee203..a8c5fa87dc2 100644 --- a/sdk/include/xdk/extypes.h +++ b/sdk/include/xdk/extypes.h @@ -277,6 +277,52 @@ extern NTKERNELAPI ULONG NtGlobalFlag; #define IF_NTOS_DEBUG(FlagName) if(FALSE) #endif +#if (NTDDI_VERSION >= NTDDI_WINBLUE) + +typedef struct _EXT_SET_PARAMETERS_V0 +{ + ULONG Version; + ULONG Reserved; + LONGLONG NoWakeTolerance; +} EXT_SET_PARAMETERS, *PEXT_SET_PARAMETERS; + +typedef EXT_SET_PARAMETERS KT2_SET_PARAMETERS, *PKT2_SET_PARAMETERS; + +typedef struct _EX_TIMER *PEX_TIMER; + +_Function_class_(EXT_CALLBACK) +_IRQL_requires_(DISPATCH_LEVEL) +_IRQL_requires_same_ +typedef +VOID +NTAPI +EXT_CALLBACK( + _In_ PEX_TIMER Timer, + _In_opt_ PVOID Context); + +typedef EXT_CALLBACK *PEXT_CALLBACK; + +_Function_class_(EXT_DELETE_CALLBACK) +_IRQL_requires_(DISPATCH_LEVEL) +_IRQL_requires_same_ +typedef +VOID +NTAPI +EXT_DELETE_CALLBACK( + _In_opt_ PVOID Context); + +typedef EXT_DELETE_CALLBACK *PEXT_DELETE_CALLBACK; +typedef PVOID PEXT_CANCEL_PARAMETERS; +typedef struct _EXT_DELETE_PARAMETERS +{ + ULONG Version; + ULONG Reserved; + PEXT_DELETE_CALLBACK DeleteCallback; + PVOID DeleteContext; +} EXT_DELETE_PARAMETERS, *PEXT_DELETE_PARAMETERS; + +#endif // NTDDI_WINBLUE + $endif (_WDMDDK_) $if (_NTDDK_) typedef struct _ZONE_SEGMENT_HEADER { diff --git a/sdk/include/xdk/iotypes.h b/sdk/include/xdk/iotypes.h index d53d9371532..d1392e0857a 100644 --- a/sdk/include/xdk/iotypes.h +++ b/sdk/include/xdk/iotypes.h @@ -119,7 +119,7 @@ $if (_WDMDDK_) typedef USHORT IRQ_DEVICE_POLICY, *PIRQ_DEVICE_POLICY; -typedef enum _IRQ_DEVICE_POLICY_USHORT { +enum _IRQ_DEVICE_POLICY_USHORT { IrqPolicyMachineDefault = 0, IrqPolicyAllCloseProcessors = 1, IrqPolicyOneCloseProcessor = 2, @@ -392,6 +392,17 @@ typedef struct _IO_DISCONNECT_INTERRUPT_PARAMETERS { } ConnectionContext; } IO_DISCONNECT_INTERRUPT_PARAMETERS, *PIO_DISCONNECT_INTERRUPT_PARAMETERS; +typedef struct _IO_REPORT_INTERRUPT_ACTIVE_STATE_PARAMETERS +{ + ULONG Version; + union + { + PVOID Generic; + PKINTERRUPT InterruptObject; + PIO_INTERRUPT_MESSAGE_INFO InterruptMessageTable; + } ConnectionContext; +} IO_REPORT_INTERRUPT_ACTIVE_STATE_PARAMETERS, *PIO_REPORT_INTERRUPT_ACTIVE_STATE_PARAMETERS; + typedef enum _IO_ACCESS_TYPE { ReadAccess, WriteAccess, @@ -920,7 +931,12 @@ typedef struct _DEVICE_CAPABILITIES { ULONG NonDynamic:1; ULONG WarmEjectSupported:1; ULONG NoDisplayInUI:1; - ULONG Reserved:14; + ULONG Reserved1:1; + ULONG WakeFromInterrupt:1; + ULONG SecureDevice:1; + ULONG ChildOfVgaEnabledBridge:1; + ULONG DecodeIoOnBoot:1; + ULONG Reserved:9; ULONG Address; ULONG UINumber; DEVICE_POWER_STATE DeviceState[PowerSystemMaximum]; @@ -2027,6 +2043,7 @@ typedef enum _DMA_SPEED { #define DEVICE_DESCRIPTION_VERSION 0x0000 #define DEVICE_DESCRIPTION_VERSION1 0x0001 #define DEVICE_DESCRIPTION_VERSION2 0x0002 +#define DEVICE_DESCRIPTION_VERSION3 0x0003 typedef struct _DEVICE_DESCRIPTION { ULONG Version; @@ -2045,8 +2062,72 @@ typedef struct _DEVICE_DESCRIPTION { DMA_SPEED DmaSpeed; ULONG MaximumLength; ULONG DmaPort; +#if (NTDDI_VERSION >= NTDDI_WIN8) + ULONG DmaAddressWidth; + ULONG DmaControllerInstance; + ULONG DmaRequestLine; + PHYSICAL_ADDRESS DeviceAddress; +#endif // NTDDI_WIN8 } DEVICE_DESCRIPTION, *PDEVICE_DESCRIPTION; +#define DMA_ADAPTER_INFO_VERSION1 1 + +#define ADAPTER_INFO_SYNCHRONOUS_CALLBACK 0x0001 +#define ADAPTER_INFO_API_BYPASS 0x0002 + +typedef struct _DMA_ADAPTER_INFO_V1 +{ + ULONG ReadDmaCounterAvailable; + ULONG ScatterGatherLimit; + ULONG DmaAddressWidth; + ULONG Flags; + ULONG MinimumTransferUnit; +} DMA_ADAPTER_INFO_V1, *PDMA_ADAPTER_INFO_V1; + +typedef struct _DMA_ADAPTER_INFO +{ + ULONG Version; + union + { + DMA_ADAPTER_INFO_V1 V1; + }; +} DMA_ADAPTER_INFO, *PDMA_ADAPTER_INFO; + +#define DMA_TRANSFER_INFO_VERSION1 1 +#define DMA_TRANSFER_INFO_VERSION2 2 + +typedef struct _DMA_TRANSFER_INFO_V1 +{ + ULONG MapRegisterCount; + ULONG ScatterGatherElementCount; + ULONG ScatterGatherListSize; +} DMA_TRANSFER_INFO_V1, *PDMA_TRANSFER_INFO_V1; + +typedef struct _DMA_TRANSFER_INFO_V2 +{ + ULONG MapRegisterCount; + ULONG ScatterGatherElementCount; + ULONG ScatterGatherListSize; + ULONG LogicalPageCount; +} DMA_TRANSFER_INFO_V2, *PDMA_TRANSFER_INFO_V2; + +typedef struct _DMA_TRANSFER_INFO +{ + ULONG Version; + union { + DMA_TRANSFER_INFO_V1 V1; + DMA_TRANSFER_INFO_V2 V2; + }; +} DMA_TRANSFER_INFO, *PDMA_TRANSFER_INFO; + +#define DMA_TRANSFER_CONTEXT_VERSION1 1 + +#ifdef _WIN64 +#define DMA_TRANSFER_CONTEXT_SIZE_V1 128 +#else +#define DMA_TRANSFER_CONTEXT_SIZE_V1 64 +#endif + typedef enum _DEVICE_RELATION_TYPE { BusRelations, EjectionRelations, @@ -2194,6 +2275,14 @@ typedef struct _DMA_ADAPTER { struct _DMA_OPERATIONS* DmaOperations; } DMA_ADAPTER, *PDMA_ADAPTER; +typedef enum +{ + DmaComplete, + DmaAborted, + DmaError, + DmaCancelled +} DMA_COMPLETION_STATUS; + typedef VOID (NTAPI *PPUT_DMA_ADAPTER)( PDMA_ADAPTER DmaAdapter); @@ -2313,6 +2402,213 @@ typedef NTSTATUS _In_ PMDL OriginalMdl, _Out_ PMDL *TargetMdl); +typedef NTSTATUS +(NTAPI *PGET_DMA_ADAPTER_INFO)( + _In_ PDMA_ADAPTER DmaAdapter, + _Inout_ PDMA_ADAPTER_INFO AdapterInfo); + +typedef NTSTATUS +(NTAPI *PGET_DMA_TRANSFER_INFO)( + _In_ PDMA_ADAPTER DmaAdapter, + _In_ PMDL Mdl, + _In_ ULONGLONG Offset, + _In_ ULONG Length, + _In_ BOOLEAN WriteOnly, + _Inout_ PDMA_TRANSFER_INFO TransferInfo); + +typedef NTSTATUS +(NTAPI *PINITIALIZE_DMA_TRANSFER_CONTEXT)( + _In_ PDMA_ADAPTER DmaAdapter, + _Out_ PVOID DmaTransferContext); + +typedef PVOID +(NTAPI *PALLOCATE_COMMON_BUFFER_EX)( + _In_ PDMA_ADAPTER DmaAdapter, + _In_opt_ PPHYSICAL_ADDRESS MaximumAddress, + _In_ ULONG Length, + _Out_ PPHYSICAL_ADDRESS LogicalAddress, + _In_ BOOLEAN CacheEnabled, + _In_ NODE_REQUIREMENT PreferredNode); + +typedef NTSTATUS +(NTAPI *PALLOCATE_ADAPTER_CHANNEL_EX)( + _In_ PDMA_ADAPTER DmaAdapter, + _In_ PDEVICE_OBJECT DeviceObject, + _In_ PVOID DmaTransferContext, + _In_ ULONG NumberOfMapRegisters, + _In_ ULONG Flags, + _In_opt_ PDRIVER_CONTROL ExecutionRoutine, + _In_opt_ PVOID ExecutionContext, + _Out_opt_ PVOID *MapRegisterBase); + +typedef NTSTATUS +(NTAPI *PCONFIGURE_ADAPTER_CHANNEL)( + _In_ PDMA_ADAPTER DmaAdapter, + _In_ ULONG FunctionNumber, + _In_ PVOID Context); + +typedef BOOLEAN +(NTAPI *PCANCEL_ADAPTER_CHANNEL)( + _In_ PDMA_ADAPTER DmaAdapter, + _In_ PDEVICE_OBJECT DeviceObject, + _In_ PVOID DmaTransferContext); + +typedef +_Function_class_(DMA_COMPLETION_ROUTINE) +_IRQL_requires_max_(DISPATCH_LEVEL) +_IRQL_requires_min_(DISPATCH_LEVEL) +VOID +NTAPI +DMA_COMPLETION_ROUTINE( + _In_ PDMA_ADAPTER DmaAdapter, + _In_ PDEVICE_OBJECT DeviceObject, + _In_ PVOID CompletionContext, + _In_ DMA_COMPLETION_STATUS Status); + +typedef DMA_COMPLETION_ROUTINE *PDMA_COMPLETION_ROUTINE; + +typedef NTSTATUS +(NTAPI *PMAP_TRANSFER_EX)( + _In_ PDMA_ADAPTER DmaAdapter, + _In_ PMDL Mdl, + _In_ PVOID MapRegisterBase, + _In_ ULONGLONG Offset, + _In_ ULONG DeviceOffset, + _Inout_ PULONG Length, + _In_ BOOLEAN WriteToDevice, + _Out_writes_bytes_opt_(ScatterGatherBufferLength) PSCATTER_GATHER_LIST ScatterGatherBuffer, + _In_ ULONG ScatterGatherBufferLength, + _In_opt_ PDMA_COMPLETION_ROUTINE DmaCompletionRoutine, + _In_opt_ PVOID CompletionContext); + +typedef NTSTATUS +(NTAPI *PGET_SCATTER_GATHER_LIST_EX)( + _In_ PDMA_ADAPTER DmaAdapter, + _In_ PDEVICE_OBJECT DeviceObject, + _In_ PVOID DmaTransferContext, + _In_ PMDL Mdl, + _In_ ULONGLONG Offset, + _In_ ULONG Length, + _In_ ULONG Flags, + _In_opt_ PDRIVER_LIST_CONTROL ExecutionRoutine, + _In_opt_ PVOID Context, + _In_ BOOLEAN WriteToDevice, + _In_opt_ PDMA_COMPLETION_ROUTINE DmaCompletionRoutine, + _In_opt_ PVOID CompletionContext, + _Out_opt_ PSCATTER_GATHER_LIST *ScatterGatherList); + +typedef NTSTATUS +(NTAPI *PBUILD_SCATTER_GATHER_LIST_EX)( + _In_ PDMA_ADAPTER DmaAdapter, + _In_ PDEVICE_OBJECT DeviceObject, + _In_ PVOID DmaTransferContext, + _In_ PMDL Mdl, + _In_ ULONGLONG Offset, + _In_ ULONG Length, + _In_ ULONG Flags, + _In_opt_ PDRIVER_LIST_CONTROL ExecutionRoutine, + _In_opt_ PVOID Context, + _In_ BOOLEAN WriteToDevice, + _In_ PVOID ScatterGatherBuffer, + _In_ ULONG ScatterGatherLength, + _In_opt_ PDMA_COMPLETION_ROUTINE DmaCompletionRoutine, + _In_opt_ PVOID CompletionContext, + _Out_opt_ PVOID ScatterGatherList); + +typedef NTSTATUS +(NTAPI *PFLUSH_ADAPTER_BUFFERS_EX)( + _In_ PDMA_ADAPTER DmaAdapter, + _In_ PMDL Mdl, + _In_ PVOID MapRegisterBase, + _In_ ULONGLONG Offset, + _In_ ULONG Length, + _In_ BOOLEAN WriteToDevice); + +typedef VOID +(NTAPI *PFREE_ADAPTER_OBJECT)( + _In_ PDMA_ADAPTER DmaAdapter, + _In_ IO_ALLOCATION_ACTION AllocationAction); + +typedef NTSTATUS +(NTAPI *PCANCEL_MAPPED_TRANSFER)( + _In_ PDMA_ADAPTER DmaAdapter, + _In_ PVOID DmaTransferContext); + +typedef NTSTATUS +(NTAPI *PALLOCATE_DOMAIN_COMMON_BUFFER)( + _In_ PDMA_ADAPTER DmaAdapter, + _In_ HANDLE DomainHandle, + _In_opt_ PPHYSICAL_ADDRESS MaximumAddress, + _In_ ULONG Length, + _In_ ULONG Flags, + _In_opt_ MEMORY_CACHING_TYPE *CacheType, + _In_ NODE_REQUIREMENT PreferredNode, + _Out_ PPHYSICAL_ADDRESS LogicalAddress, + _Out_ PVOID *VirtualAddress); + +typedef NTSTATUS +(NTAPI *PFLUSH_DMA_BUFFER)( + _In_ PDMA_ADAPTER DmaAdapter, + _In_ PMDL Mdl, + _In_ BOOLEAN ReadOperation); + +typedef NTSTATUS +(NTAPI *PJOIN_DMA_DOMAIN)( + _In_ PDMA_ADAPTER DmaAdapter, + _In_ HANDLE DomainHandle); + +typedef NTSTATUS +(NTAPI *PLEAVE_DMA_DOMAIN)( + _In_ PDMA_ADAPTER DmaAdapter); + +typedef HANDLE +(NTAPI *PGET_DMA_DOMAIN)( + _In_ PDMA_ADAPTER DmaAdapter); + +typedef PVOID +(NTAPI *PALLOCATE_COMMON_BUFFER_WITH_BOUNDS)( + _In_ PDMA_ADAPTER DmaAdapter, + _In_opt_ PPHYSICAL_ADDRESS MinimumAddress, + _In_opt_ PPHYSICAL_ADDRESS MaximumAddress, + _In_ ULONG Length, + _In_ ULONG Flags, + _In_opt_ MEMORY_CACHING_TYPE *CacheType, + _In_ NODE_REQUIREMENT PreferredNode, + _Out_ PPHYSICAL_ADDRESS LogicalAddress); + +typedef struct _DMA_COMMON_BUFFER_VECTOR DMA_COMMON_BUFFER_VECTOR, *PDMA_COMMON_BUFFER_VECTOR; + +typedef NTSTATUS +(NTAPI *PALLOCATE_COMMON_BUFFER_VECTOR)( + _In_ PDMA_ADAPTER DmaAdapter, + _In_ PHYSICAL_ADDRESS LowAddress, + _In_ PHYSICAL_ADDRESS HighAddress, + _In_ MEMORY_CACHING_TYPE CacheType, + _In_ ULONG IdealNode, + _In_ ULONG Flags, + _In_ ULONG NumberOfElements, + _In_ ULONGLONG SizeOfElements, + _Out_ PDMA_COMMON_BUFFER_VECTOR *VectorOut); + +typedef VOID +(NTAPI *PGET_COMMON_BUFFER_FROM_VECTOR_BY_INDEX)( + _In_ PDMA_ADAPTER DmaAdapter, + _In_ PDMA_COMMON_BUFFER_VECTOR Vector, + _In_ ULONG Index, + _Out_ PVOID *VirtualAddressOut, + _Out_ PPHYSICAL_ADDRESS LogicalAddressOut); + +typedef VOID +(NTAPI *PFREE_COMMON_BUFFER_FROM_VECTOR)( + _In_ PDMA_ADAPTER DmaAdapter, + _In_ PDMA_COMMON_BUFFER_VECTOR Vector, + _In_ ULONG Index); + +typedef VOID +(NTAPI *PFREE_COMMON_BUFFER_VECTOR)( + _In_ PDMA_ADAPTER DmaAdapter, + _In_ PDMA_COMMON_BUFFER_VECTOR Vector); + typedef struct _DMA_OPERATIONS { ULONG Size; PPUT_DMA_ADAPTER PutDmaAdapter; @@ -2330,6 +2626,29 @@ typedef struct _DMA_OPERATIONS { PCALCULATE_SCATTER_GATHER_LIST_SIZE CalculateScatterGatherList; PBUILD_SCATTER_GATHER_LIST BuildScatterGatherList; PBUILD_MDL_FROM_SCATTER_GATHER_LIST BuildMdlFromScatterGatherList; + PGET_DMA_ADAPTER_INFO GetDmaAdapterInfo; + PGET_DMA_TRANSFER_INFO GetDmaTransferInfo; + PINITIALIZE_DMA_TRANSFER_CONTEXT InitializeDmaTransferContext; + PALLOCATE_COMMON_BUFFER_EX AllocateCommonBufferEx; + PALLOCATE_ADAPTER_CHANNEL_EX AllocateAdapterChannelEx; + PCONFIGURE_ADAPTER_CHANNEL ConfigureAdapterChannel; + PCANCEL_ADAPTER_CHANNEL CancelAdapterChannel; + PMAP_TRANSFER_EX MapTransferEx; + PGET_SCATTER_GATHER_LIST_EX GetScatterGatherListEx; + PBUILD_SCATTER_GATHER_LIST_EX BuildScatterGatherListEx; + PFLUSH_ADAPTER_BUFFERS_EX FlushAdapterBuffersEx; + PFREE_ADAPTER_OBJECT FreeAdapterObject; + PCANCEL_MAPPED_TRANSFER CancelMappedTransfer; + PALLOCATE_DOMAIN_COMMON_BUFFER AllocateDomainCommonBuffer; + PFLUSH_DMA_BUFFER FlushDmaBuffer; + PJOIN_DMA_DOMAIN JoinDmaDomain; + PLEAVE_DMA_DOMAIN LeaveDmaDomain; + PGET_DMA_DOMAIN GetDmaDomain; + PALLOCATE_COMMON_BUFFER_WITH_BOUNDS AllocateCommonBufferWithBounds; + PALLOCATE_COMMON_BUFFER_VECTOR AllocateCommonBufferVector; + PGET_COMMON_BUFFER_FROM_VECTOR_BY_INDEX GetCommonBufferFromVectorByIndex; + PFREE_COMMON_BUFFER_FROM_VECTOR FreeCommonBufferFromVector; + PFREE_COMMON_BUFFER_VECTOR FreeCommonBufferVector; } DMA_OPERATIONS, *PDMA_OPERATIONS; typedef struct _IO_RESOURCE_DESCRIPTOR { @@ -2355,6 +2674,14 @@ typedef struct _IO_RESOURCE_DESCRIPTOR { struct { ULONG MinimumVector; ULONG MaximumVector; +#if defined(NT_PROCESSOR_GROUPS) + IRQ_DEVICE_POLICY AffinityPolicy; + USHORT Group; +#else + IRQ_DEVICE_POLICY AffinityPolicy; +#endif + IRQ_PRIORITY PriorityPolicy; + KAFFINITY TargetedProcessors; } Interrupt; struct { ULONG MinimumChannel; @@ -2589,7 +2916,8 @@ typedef enum _BUS_QUERY_ID_TYPE { BusQueryHardwareIDs, BusQueryCompatibleIDs, BusQueryInstanceID, - BusQueryDeviceSerialNumber + BusQueryDeviceSerialNumber, + BusQueryContainerID } BUS_QUERY_ID_TYPE, *PBUS_QUERY_ID_TYPE; typedef enum _DEVICE_TEXT_TYPE { @@ -7110,3 +7438,149 @@ typedef struct _IO_PRIORITY_INFO { } IO_PRIORITY_INFO, *PIO_PRIORITY_INFO; #endif $endif (_NTIFS_) + +$if (_WDMDDK_) + +#define D3COLD_SUPPORT_INTERFACE_VERSION 1 + +typedef +_Function_class_(SET_D3COLD_SUPPORT) +_IRQL_requires_(PASSIVE_LEVEL) +VOID +SET_D3COLD_SUPPORT( + _In_reads_opt_(_Inexpressible_("varies")) PVOID Context, + _In_ BOOLEAN D3ColdSupport); + +typedef SET_D3COLD_SUPPORT *PSET_D3COLD_SUPPORT; + +typedef enum _DEVICE_WAKE_DEPTH +{ + DeviceWakeDepthNotWakeable = 0, + DeviceWakeDepthD0, + DeviceWakeDepthD1, + DeviceWakeDepthD2, + DeviceWakeDepthD3hot, + DeviceWakeDepthD3cold, + DeviceWakeDepthMaximum +} DEVICE_WAKE_DEPTH, *PDEVICE_WAKE_DEPTH; + +FORCEINLINE +DEVICE_POWER_STATE +MapWakeDepthToDstate( + _In_ DEVICE_WAKE_DEPTH WakeDepth) +{ + const DEVICE_POWER_STATE dstateMap[DeviceWakeDepthMaximum] = + { + PowerDeviceD0, + PowerDeviceD0, + PowerDeviceD1, + PowerDeviceD2, + PowerDeviceD3, + PowerDeviceD3 + }; + + if (WakeDepth < 0 || WakeDepth >= DeviceWakeDepthMaximum) + { + return PowerDeviceUnspecified; + } + else + { + return dstateMap[WakeDepth]; + } +} + +typedef +_Function_class_(GET_IDLE_WAKE_INFO) +_IRQL_requires_(PASSIVE_LEVEL) +NTSTATUS +GET_IDLE_WAKE_INFO( + _In_reads_opt_(_Inexpressible_("varies")) PVOID Context, + _In_ SYSTEM_POWER_STATE SystemPowerState, + _Out_ PDEVICE_WAKE_DEPTH DeepestWakeableDstate); + +typedef GET_IDLE_WAKE_INFO *PGET_IDLE_WAKE_INFO; + +typedef +_Function_class_(GET_D3COLD_CAPABILITY) +_IRQL_requires_(PASSIVE_LEVEL) +NTSTATUS +GET_D3COLD_CAPABILITY( + _In_reads_opt_(_Inexpressible_("varies")) PVOID Context, + _Out_ PBOOLEAN D3ColdSupported); + +typedef GET_D3COLD_CAPABILITY *PGET_D3COLD_CAPABILITY; + +typedef enum _D3COLD_LAST_TRANSITION_STATUS +{ + LastDStateTransitionStatusUnknown = 0, + LastDStateTransitionD3hot, + LastDStateTransitionD3cold +} D3COLD_LAST_TRANSITION_STATUS, *PD3COLD_LAST_TRANSITION_STATUS; + +typedef +_Function_class_(GET_D3COLD_LAST_TRANSITION_STATUS) +_IRQL_requires_max_(DISPATCH_LEVEL) +VOID +GET_D3COLD_LAST_TRANSITION_STATUS( + _In_reads_opt_(_Inexpressible_("varies")) PVOID Context, + _Out_ PD3COLD_LAST_TRANSITION_STATUS LastTransitionStatus); + +typedef GET_D3COLD_LAST_TRANSITION_STATUS *PGET_D3COLD_LAST_TRANSITION_STATUS; + +typedef struct _D3COLD_SUPPORT_INTERFACE +{ + USHORT Size; + USHORT Version; + PVOID Context; + PINTERFACE_REFERENCE InterfaceReference; + PINTERFACE_DEREFERENCE InterfaceDereference; + PSET_D3COLD_SUPPORT SetD3ColdSupport; + PGET_IDLE_WAKE_INFO GetIdleWakeInfo; + PGET_D3COLD_CAPABILITY GetD3ColdCapability; + PGET_D3COLD_CAPABILITY GetBusDriverD3ColdSupport; + PGET_D3COLD_LAST_TRANSITION_STATUS GetLastTransitionStatus; +} D3COLD_SUPPORT_INTERFACE, *PD3COLD_SUPPORT_INTERFACE; + +typedef +_Function_class_(D3COLD_REQUEST_CORE_POWER_RAIL) +_IRQL_requires_(PASSIVE_LEVEL) +VOID +D3COLD_REQUEST_CORE_POWER_RAIL( + _In_reads_opt_(_Inexpressible_("varies")) PVOID Context, + _In_ BOOLEAN CorePowerRailNeeded); + +typedef D3COLD_REQUEST_CORE_POWER_RAIL *PD3COLD_REQUEST_CORE_POWER_RAIL; + +typedef +_Function_class_(D3COLD_REQUEST_AUX_POWER) +_IRQL_requires_(PASSIVE_LEVEL) +NTSTATUS +D3COLD_REQUEST_AUX_POWER( + _In_reads_opt_(_Inexpressible_("varies")) PVOID Context, + _In_ ULONG AuxPowerInMilliWatts, + _Out_ PULONG RetryInSeconds); + +typedef D3COLD_REQUEST_AUX_POWER *PD3COLD_REQUEST_AUX_POWER; + +typedef +_Function_class_(D3COLD_REQUEST_PERST_DELAY) +_IRQL_requires_(PASSIVE_LEVEL) +NTSTATUS +D3COLD_REQUEST_PERST_DELAY( + _In_reads_opt_(_Inexpressible_("varies")) PVOID Context, + _In_ ULONG DelayInMicroSeconds); + +typedef D3COLD_REQUEST_PERST_DELAY *PD3COLD_REQUEST_PERST_DELAY; + +typedef struct _D3COLD_AUX_POWER_AND_TIMING_INTERFACE +{ + USHORT Size; + USHORT Version; + PVOID Context; + PINTERFACE_REFERENCE InterfaceReference; + PINTERFACE_DEREFERENCE InterfaceDereference; + PD3COLD_REQUEST_CORE_POWER_RAIL RequestCorePowerRail; + PD3COLD_REQUEST_AUX_POWER RequestAuxPower; + PD3COLD_REQUEST_PERST_DELAY RequestPerstDelay; +} D3COLD_AUX_POWER_AND_TIMING_INTERFACE, *PD3COLD_AUX_POWER_AND_TIMING_INTERFACE; +$endif(_WDMDDK_) diff --git a/sdk/include/xdk/ketypes.h b/sdk/include/xdk/ketypes.h index 5e276c08c71..d8abc4089c2 100644 --- a/sdk/include/xdk/ketypes.h +++ b/sdk/include/xdk/ketypes.h @@ -871,6 +871,12 @@ typedef enum _POOL_TYPE { PagedPoolCacheAligned, NonPagedPoolCacheAlignedMustS, MaxPoolType, + + NonPagedPoolBase = 0, + NonPagedPoolBaseMustSucceed = NonPagedPoolBase + 2, + NonPagedPoolBaseCacheAligned = NonPagedPoolBase + 4, + NonPagedPoolBaseCacheAlignedMustS = NonPagedPoolBase + 6, + NonPagedPoolSession = 32, PagedPoolSession, NonPagedPoolMustSucceedSession, diff --git a/sdk/include/xdk/mmfuncs.h b/sdk/include/xdk/mmfuncs.h index d8a18fb9a42..478763fbc6e 100644 --- a/sdk/include/xdk/mmfuncs.h +++ b/sdk/include/xdk/mmfuncs.h @@ -321,12 +321,11 @@ PVOID NTAPI MmMapLockedPagesSpecifyCache( _Inout_ PMDL MemoryDescriptorList, - _In_ __drv_strictType(KPROCESSOR_MODE/enum _MODE,__drv_typeConst) - KPROCESSOR_MODE AccessMode, + _In_ __drv_strictType(KPROCESSOR_MODE/enum _MODE,__drv_typeConst) KPROCESSOR_MODE AccessMode, _In_ __drv_strictTypeMatch(__drv_typeCond) MEMORY_CACHING_TYPE CacheType, - _In_opt_ PVOID BaseAddress, + _In_opt_ PVOID RequestedAddress, _In_ ULONG BugCheckOnFailure, - _In_ MM_PAGE_PRIORITY Priority); + _In_ ULONG Priority); _IRQL_requires_max_(APC_LEVEL) NTKERNELAPI diff --git a/sdk/include/xdk/potypes.h b/sdk/include/xdk/potypes.h index 43ee700c8bb..9524ee0b7c4 100644 --- a/sdk/include/xdk/potypes.h +++ b/sdk/include/xdk/potypes.h @@ -56,7 +56,7 @@ typedef enum _POWER_INFORMATION_LEVEL { SetPowerSettingValue, NotifyUserPowerSetting, PowerInformationLevelUnused0, - PowerInformationLevelUnused1, + SystemMonitorHiberBootPowerOff, SystemVideoState, TraceApplicationPowerMessage, TraceApplicationPowerMessageEnd, @@ -80,6 +80,50 @@ typedef enum _POWER_INFORMATION_LEVEL { ProcessorIdleDomains, WakeTimerList, SystemHiberFileSize, + ProcessorIdleStatesHv, + ProcessorPerfStatesHv, + ProcessorPerfCapHv, + ProcessorSetIdle, + LogicalProcessorIdling, + UserPresence, + PowerSettingNotificationName, + GetPowerSettingValue, + IdleResiliency, + SessionRITState, + SessionConnectNotification, + SessionPowerCleanup, + SessionLockState, + SystemHiberbootState, + PlatformInformation, + PdcInvocation, + MonitorInvocation, + FirmwareTableInformationRegistered, + SetShutdownSelectedTime, + SuspendResumeInvocation, + PlmPowerRequestCreate, + ScreenOff, + CsDeviceNotification, + PlatformRole, + LastResumePerformance, + DisplayBurst, + ExitLatencySamplingPercentage, + RegisterSpmPowerSettings, + PlatformIdleStates, + ProcessorIdleVeto, // deprecated + PlatformIdleVeto, // deprecated + SystemBatteryStatePrecise, + ThermalEvent, + PowerRequestActionInternal, + BatteryDeviceState, + PowerInformationInternal, + ThermalStandby, + SystemHiberFileType, + PhysicalPowerButtonPress, + QueryPotentialDripsConstraint, + EnergyTrackerCreate, + EnergyTrackerQuery, + UpdateBlackBoxRecorder, + SessionAllowExternalDmaDevices, PowerInformationLevelMaximum } POWER_INFORMATION_LEVEL; @@ -254,9 +298,29 @@ typedef enum _POWER_PLATFORM_ROLE { PlatformRoleSOHOServer, PlatformRoleAppliancePC, PlatformRolePerformanceServer, + PlatformRoleSlate, PlatformRoleMaximum } POWER_PLATFORM_ROLE; +#define POWER_PLATFORM_ROLE_V1 (0x00000001) +#define POWER_PLATFORM_ROLE_V1_MAX (PlatformRolePerformanceServer + 1) + +#define POWER_PLATFORM_ROLE_V2 (0x00000002) +#define POWER_PLATFORM_ROLE_V2_MAX (PlatformRoleSlate + 1) + +#if (NTDDI_VERSION >= NTDDI_WIN8) +#define POWER_PLATFORM_ROLE_VERSION POWER_PLATFORM_ROLE_V2 +#define POWER_PLATFORM_ROLE_VERSION_MAX POWER_PLATFORM_ROLE_V2_MAX +#else +#define POWER_PLATFORM_ROLE_VERSION POWER_PLATFORM_ROLE_V1 +#define POWER_PLATFORM_ROLE_VERSION_MAX POWER_PLATFORM_ROLE_V1_MAX +#endif + +typedef struct _POWER_PLATFORM_INFORMATION +{ + BOOLEAN AoAc; +} POWER_PLATFORM_INFORMATION, *PPOWER_PLATFORM_INFORMATION; + #if (NTDDI_VERSION >= NTDDI_WINXP) || !defined(_BATCLASS_) typedef struct { ULONG Granularity; @@ -413,6 +477,215 @@ typedef NTSTATUS _In_ ULONG ValueLength, _Inout_opt_ PVOID Context); typedef POWER_SETTING_CALLBACK *PPOWER_SETTING_CALLBACK; + +#if (NTDDI_VERSION >= NTDDI_WIN8) + +#define PO_FX_VERSION_V1 0x00000001 +#define PO_FX_VERSION_V2 0x00000002 +#define PO_FX_VERSION_V3 0x00000003 +#define PO_FX_VERSION PO_FX_VERSION_V1 + +DECLARE_HANDLE(POHANDLE); + +typedef +_Function_class_(PO_FX_COMPONENT_ACTIVE_CONDITION_CALLBACK) +_IRQL_requires_max_(DISPATCH_LEVEL) +VOID +PO_FX_COMPONENT_ACTIVE_CONDITION_CALLBACK( + _In_ PVOID Context, + _In_ ULONG Component); + +typedef PO_FX_COMPONENT_ACTIVE_CONDITION_CALLBACK *PPO_FX_COMPONENT_ACTIVE_CONDITION_CALLBACK; + +typedef +_Function_class_(PO_FX_COMPONENT_IDLE_CONDITION_CALLBACK) +_IRQL_requires_max_(DISPATCH_LEVEL) +VOID +PO_FX_COMPONENT_IDLE_CONDITION_CALLBACK( + _In_ PVOID Context, + _In_ ULONG Component); + +typedef PO_FX_COMPONENT_IDLE_CONDITION_CALLBACK *PPO_FX_COMPONENT_IDLE_CONDITION_CALLBACK; + +typedef +_Function_class_(PO_FX_COMPONENT_IDLE_STATE_CALLBACK) +_IRQL_requires_max_(DISPATCH_LEVEL) +VOID +PO_FX_COMPONENT_IDLE_STATE_CALLBACK( + _In_ PVOID Context, + _In_ ULONG Component, + _In_ ULONG State); + +typedef PO_FX_COMPONENT_IDLE_STATE_CALLBACK *PPO_FX_COMPONENT_IDLE_STATE_CALLBACK; + +typedef +_Function_class_(PO_FX_DEVICE_POWER_REQUIRED_CALLBACK) +_IRQL_requires_max_(DISPATCH_LEVEL) +VOID +PO_FX_DEVICE_POWER_REQUIRED_CALLBACK( + _In_ PVOID Context); + +typedef PO_FX_DEVICE_POWER_REQUIRED_CALLBACK *PPO_FX_DEVICE_POWER_REQUIRED_CALLBACK; + +typedef +_Function_class_(PO_FX_DEVICE_POWER_NOT_REQUIRED_CALLBACK) +_IRQL_requires_max_(DISPATCH_LEVEL) +VOID +PO_FX_DEVICE_POWER_NOT_REQUIRED_CALLBACK( + _In_ PVOID Context); + +typedef PO_FX_DEVICE_POWER_NOT_REQUIRED_CALLBACK *PPO_FX_DEVICE_POWER_NOT_REQUIRED_CALLBACK; + +typedef +_Function_class_(PO_FX_POWER_CONTROL_CALLBACK) +_IRQL_requires_max_(DISPATCH_LEVEL) +NTSTATUS +PO_FX_POWER_CONTROL_CALLBACK( + _In_ PVOID DeviceContext, + _In_ LPCGUID PowerControlCode, + _In_reads_bytes_opt_(InBufferSize) PVOID InBuffer, + _In_ SIZE_T InBufferSize, + _Out_writes_bytes_opt_(OutBufferSize) PVOID OutBuffer, + _In_ SIZE_T OutBufferSize, + _Out_opt_ PSIZE_T BytesReturned); + +typedef PO_FX_POWER_CONTROL_CALLBACK *PPO_FX_POWER_CONTROL_CALLBACK; + +typedef +_Function_class_(PO_FX_COMPONENT_CRITICAL_TRANSITION_CALLBACK) +_IRQL_requires_max_(HIGH_LEVEL) +VOID +PO_FX_COMPONENT_CRITICAL_TRANSITION_CALLBACK( + _In_ PVOID Context, + _In_ ULONG Component, + _In_ BOOLEAN Active); + +typedef PO_FX_COMPONENT_CRITICAL_TRANSITION_CALLBACK *PPO_FX_COMPONENT_CRITICAL_TRANSITION_CALLBACK; + +typedef struct _PO_FX_COMPONENT_IDLE_STATE +{ + ULONGLONG TransitionLatency; + ULONGLONG ResidencyRequirement; + ULONG NominalPower; +} PO_FX_COMPONENT_IDLE_STATE, *PPO_FX_COMPONENT_IDLE_STATE; + +typedef struct _PO_FX_COMPONENT_V1 +{ + GUID Id; + ULONG IdleStateCount; + ULONG DeepestWakeableIdleState; + _Field_size_full_(IdleStateCount) PPO_FX_COMPONENT_IDLE_STATE IdleStates; +} PO_FX_COMPONENT_V1, *PPO_FX_COMPONENT_V1; + +typedef struct _PO_FX_DEVICE_V1 +{ + ULONG Version; + ULONG ComponentCount; + PPO_FX_COMPONENT_ACTIVE_CONDITION_CALLBACK ComponentActiveConditionCallback; + PPO_FX_COMPONENT_IDLE_CONDITION_CALLBACK ComponentIdleConditionCallback; + PPO_FX_COMPONENT_IDLE_STATE_CALLBACK ComponentIdleStateCallback; + PPO_FX_DEVICE_POWER_REQUIRED_CALLBACK DevicePowerRequiredCallback; + PPO_FX_DEVICE_POWER_NOT_REQUIRED_CALLBACK DevicePowerNotRequiredCallback; + PPO_FX_POWER_CONTROL_CALLBACK PowerControlCallback; + PVOID DeviceContext; + _Field_size_full_(ComponentCount) PO_FX_COMPONENT_V1 Components[ANYSIZE_ARRAY]; +} PO_FX_DEVICE_V1, *PPO_FX_DEVICE_V1; + +#define PO_FX_COMPONENT_FLAG_F0_ON_DX 0x0000000000000001 +#define PO_FX_COMPONENT_FLAG_NO_DEBOUNCE 0x0000000000000002 + +typedef struct _PO_FX_COMPONENT_V2 +{ + GUID Id; + ULONGLONG Flags; + ULONG DeepestWakeableIdleState; + ULONG IdleStateCount; + _Field_size_full_(IdleStateCount) PPO_FX_COMPONENT_IDLE_STATE IdleStates; + ULONG ProviderCount; + _Field_size_full_(ProviderCount) PULONG Providers; +} PO_FX_COMPONENT_V2, *PPO_FX_COMPONENT_V2; + +typedef struct _PO_FX_DEVICE_V2 +{ + ULONG Version; + ULONGLONG Flags; + PPO_FX_COMPONENT_ACTIVE_CONDITION_CALLBACK ComponentActiveConditionCallback; + PPO_FX_COMPONENT_IDLE_CONDITION_CALLBACK ComponentIdleConditionCallback; + PPO_FX_COMPONENT_IDLE_STATE_CALLBACK ComponentIdleStateCallback; + PPO_FX_DEVICE_POWER_REQUIRED_CALLBACK DevicePowerRequiredCallback; + PPO_FX_DEVICE_POWER_NOT_REQUIRED_CALLBACK DevicePowerNotRequiredCallback; + PPO_FX_POWER_CONTROL_CALLBACK PowerControlCallback; + PVOID DeviceContext; + ULONG ComponentCount; + _Field_size_full_(ComponentCount) PO_FX_COMPONENT_V2 Components[ANYSIZE_ARRAY]; +} PO_FX_DEVICE_V2, *PPO_FX_DEVICE_V2; + +#define PO_FX_DEVICE_FLAG_RESERVED_1 (0x0000000000000001ull) +#define PO_FX_DEVICE_FLAG_DFX_DIRECT_CHILDREN_OPTIONAL (0x0000000000000002ull) +#define PO_FX_DEVICE_FLAG_DFX_POWER_CHILDREN_OPTIONAL (0x0000000000000004ull) +#define PO_FX_DEVICE_FLAG_DFX_CHILDREN_OPTIONAL \ + (PO_FX_DEVICE_FLAG_DFX_DIRECT_CHILDREN_OPTIONAL | \ + PO_FX_DEVICE_FLAG_DFX_POWER_CHILDREN_OPTIONAL) + +#define PO_FX_DIRECTED_FX_DEFAULT_IDLE_TIMEOUT (0ul) +#define PO_FX_DIRECTED_FX_IMMEDIATE_IDLE_TIMEOUT ((ULONG)-1) +#define PO_FX_DIRECTED_FX_MAX_IDLE_TIMEOUT (10ul * 60) + +typedef +_Function_class_(PO_FX_DIRECTED_POWER_UP_CALLBACK) +_IRQL_requires_max_(DISPATCH_LEVEL) +_IRQL_requires_same_ +VOID +PO_FX_DIRECTED_POWER_UP_CALLBACK( + _In_ PVOID Context, + _In_ ULONG Flags); + +typedef PO_FX_DIRECTED_POWER_UP_CALLBACK *PPO_FX_DIRECTED_POWER_UP_CALLBACK; + +typedef +_Function_class_(PO_FX_DIRECTED_POWER_DOWN_CALLBACK) +_IRQL_requires_max_(DISPATCH_LEVEL) +_IRQL_requires_same_ +VOID +PO_FX_DIRECTED_POWER_DOWN_CALLBACK( + _In_ PVOID Context, + _In_ ULONG Flags); + +typedef PO_FX_DIRECTED_POWER_DOWN_CALLBACK *PPO_FX_DIRECTED_POWER_DOWN_CALLBACK; + +typedef struct _PO_FX_DEVICE_V3 +{ + ULONG Version; + ULONGLONG Flags; + PPO_FX_COMPONENT_ACTIVE_CONDITION_CALLBACK ComponentActiveConditionCallback; + PPO_FX_COMPONENT_IDLE_CONDITION_CALLBACK ComponentIdleConditionCallback; + PPO_FX_COMPONENT_IDLE_STATE_CALLBACK ComponentIdleStateCallback; + PPO_FX_DEVICE_POWER_REQUIRED_CALLBACK DevicePowerRequiredCallback; + PPO_FX_DEVICE_POWER_NOT_REQUIRED_CALLBACK DevicePowerNotRequiredCallback; + PPO_FX_POWER_CONTROL_CALLBACK PowerControlCallback; + PPO_FX_DIRECTED_POWER_UP_CALLBACK DirectedPowerUpCallback; + PPO_FX_DIRECTED_POWER_DOWN_CALLBACK DirectedPowerDownCallback; + ULONG DirectedFxTimeoutInSeconds; + PVOID DeviceContext; + ULONG ComponentCount; + _Field_size_full_(ComponentCount) PO_FX_COMPONENT_V2 Components[ANYSIZE_ARRAY]; +} PO_FX_DEVICE_V3, *PPO_FX_DEVICE_V3; + +#if (PO_FX_VERSION == PO_FX_VERSION_V1) +typedef PO_FX_COMPONENT_V1 PO_FX_COMPONENT, *PPO_FX_COMPONENT; +typedef PO_FX_DEVICE_V1 PO_FX_DEVICE, *PPO_FX_DEVICE; +#elif (PO_FX_VERSION == PO_FX_VERSION_V2) +typedef PO_FX_COMPONENT_V2 PO_FX_COMPONENT, *PPO_FX_COMPONENT; +typedef PO_FX_DEVICE_V2 PO_FX_DEVICE, *PPO_FX_DEVICE; +#elif (PO_FX_VERSION == PO_FX_VERSION_V3) +typedef PO_FX_COMPONENT_V2 PO_FX_COMPONENT, *PPO_FX_COMPONENT; +typedef PO_FX_DEVICE_V3 PO_FX_DEVICE, *PPO_FX_DEVICE; +#else +#error PO_FX_VERSION undefined! +#endif + +#endif // NTDDI_WIN8 + $endif (_WDMDDK_) $if (_NTIFS_) @@ -423,4 +696,3 @@ $if (_NTIFS_) #define PO_CB_LID_SWITCH_STATE 4 #define PO_CB_PROCESSOR_POWER_POLICY 5 $endif (_NTIFS_) -

1 0

[reactos] 01/01: [XDK][NTOSKRNL_VISTA] Put NTKRNLVISTAAPI to XDK headers for vista+ APIs implemented in ntoskrnl_vista. Now if you statically link ntoskrnl_vista into a driver, NTKERNELAPI will automatically be removed from an API definition
by Victor Perevertkin 24 Sep '20

24 Sep '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=be276dde282c2f14a9e73… commit be276dde282c2f14a9e73e6ae65889062bd02af9 Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Thu Sep 24 21:51:57 2020 +0300 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Thu Sep 24 21:51:57 2020 +0300 [XDK][NTOSKRNL_VISTA] Put NTKRNLVISTAAPI to XDK headers for vista+ APIs implemented in ntoskrnl_vista. Now if you statically link ntoskrnl_vista into a driver, NTKERNELAPI will automatically be removed from an API definition --- sdk/include/xdk/iofuncs.h | 12 ++++++------ sdk/include/xdk/kefuncs.h | 10 +++++----- sdk/include/xdk/pofuncs.h | 6 +++--- sdk/include/xdk/wdm.template.h | 7 +++++++ sdk/include/xdk/wmifuncs.h | 6 +++--- sdk/lib/drivers/ntoskrnl_vista/CMakeLists.txt | 2 ++ sdk/lib/drivers/ntoskrnl_vista/etw.c | 6 +++--- sdk/lib/drivers/ntoskrnl_vista/io.c | 12 ++++++------ sdk/lib/drivers/ntoskrnl_vista/ke.c | 8 ++++---- sdk/lib/drivers/ntoskrnl_vista/po.c | 6 +++--- 10 files changed, 42 insertions(+), 33 deletions(-) diff --git a/sdk/include/xdk/iofuncs.h b/sdk/include/xdk/iofuncs.h index 271455eca81..ec364576e4f 100644 --- a/sdk/include/xdk/iofuncs.h +++ b/sdk/include/xdk/iofuncs.h @@ -2348,7 +2348,7 @@ IoUninitializeWorkItem( _Inout_ PIO_WORKITEM IoWorkItem); _IRQL_requires_max_(DISPATCH_LEVEL) -// NTKERNELAPI // HACK: ntoskrnl_vista functions are statically linked thus don't need DECLSPEC_IMPORT +NTKRNLVISTAAPI VOID NTAPI IoQueueWorkItemEx( @@ -2357,7 +2357,7 @@ IoQueueWorkItemEx( _In_ WORK_QUEUE_TYPE QueueType, _In_opt_ __drv_aliasesMem PVOID Context); -// NTKERNELAPI // HACK: ntoskrnl_vista functions are statically linked thus don't need DECLSPEC_IMPORT +NTKRNLVISTAAPI IO_PRIORITY_HINT NTAPI IoGetIoPriorityHint( @@ -2416,7 +2416,7 @@ IoSetDevicePropertyData( _IRQL_requires_max_(PASSIVE_LEVEL) _Must_inspect_result_ -// NTKERNELAPI // HACK: ntoskrnl_vista functions are statically linked thus don't need DECLSPEC_IMPORT +NTKRNLVISTAAPI NTSTATUS NTAPI IoGetDevicePropertyData( @@ -2475,7 +2475,7 @@ NTAPI IoClearIrpExtraCreateParameter( _Inout_ PIRP Irp); -// NTKERNELAPI // HACK: ntoskrnl_vista functions are statically linked thus don't need DECLSPEC_IMPORT +NTKRNLVISTAAPI NTSTATUS NTAPI IoGetIrpExtraCreateParameter( @@ -2602,7 +2602,7 @@ $endif (_NTIFS_) $if (_WDMDDK_) _IRQL_requires_max_(PASSIVE_LEVEL) _Must_inspect_result_ -// NTKERNELAPI // HACK: ntoskrnl_vista functions are statically linked thus don't need DECLSPEC_IMPORT +NTKRNLVISTAAPI NTSTATUS IoSetDeviceInterfacePropertyData( _In_ PUNICODE_STRING SymbolicLinkName, @@ -2629,7 +2629,7 @@ IoGetDeviceInterfacePropertyData ( $endif (_WDMDDK_) $if (_NTDDK_) -// NTKERNELAPI // HACK: ntoskrnl_vista functions are statically linked thus don't need DECLSPEC_IMPORT +NTKRNLVISTAAPI VOID IoSetMasterIrpStatus( _Inout_ PIRP MasterIrp, diff --git a/sdk/include/xdk/kefuncs.h b/sdk/include/xdk/kefuncs.h index 6d459bbe60a..bb8c662b73a 100644 --- a/sdk/include/xdk/kefuncs.h +++ b/sdk/include/xdk/kefuncs.h @@ -1128,7 +1128,7 @@ NTAPI KeRevertToUserAffinityThreadEx( _In_ KAFFINITY Affinity); -NTKERNELAPI +NTKRNLVISTAAPI ULONG NTAPI KeQueryActiveProcessorCount( @@ -1140,7 +1140,7 @@ NTAPI KeQueryMaximumProcessorCount(VOID); $endif (_WDMDDK_) $if (_NTDDK_) -NTKERNELAPI +NTKRNLVISTAAPI ULONG NTAPI KeQueryActiveProcessorCount( @@ -1249,12 +1249,12 @@ NTAPI KeQueryNodeMaximumProcessorCount( _In_ USHORT NodeNumber); -// NTKERNELAPI // HACK: ntoskrnl_vista functions are statically linked thus don't need DECLSPEC_IMPORT +NTKRNLVISTAAPI USHORT NTAPI KeQueryHighestNodeNumber(VOID); -// NTKERNELAPI // HACK: ntoskrnl_vista functions are statically linked thus don't need DECLSPEC_IMPORT +NTKRNLVISTAAPI USHORT NTAPI KeGetCurrentNodeNumber(VOID); @@ -1316,7 +1316,7 @@ KeRevertToUserGroupAffinityThread( _In_ PGROUP_AFFINITY PreviousAffinity); _IRQL_requires_max_(DISPATCH_LEVEL) -// NTKERNELAPI // HACK: ntoskrnl_vista functions are statically linked thus don't need DECLSPEC_IMPORT +NTKRNLVISTAAPI BOOLEAN NTAPI KeSetCoalescableTimer( diff --git a/sdk/include/xdk/pofuncs.h b/sdk/include/xdk/pofuncs.h index 37a0f9e76be..ff73e1b7500 100644 --- a/sdk/include/xdk/pofuncs.h +++ b/sdk/include/xdk/pofuncs.h @@ -112,7 +112,7 @@ PoGetSystemWake( _In_ struct _IRP *Irp); _IRQL_requires_max_(APC_LEVEL) -// NTKERNELAPI // HACK: ntoskrnl_vista functions are statically linked thus don't need DECLSPEC_IMPORT +NTKRNLVISTAAPI NTSTATUS NTAPI PoRegisterPowerSettingCallback( @@ -123,7 +123,7 @@ PoRegisterPowerSettingCallback( _Outptr_opt_ PVOID *Handle); _IRQL_requires_max_(APC_LEVEL) -// NTKERNELAPI // HACK: ntoskrnl_vista functions are statically linked thus don't need DECLSPEC_IMPORT +NTKRNLVISTAAPI NTSTATUS NTAPI PoUnregisterPowerSettingCallback( @@ -154,7 +154,7 @@ PoEndDeviceBusy( _Inout_ PULONG IdlePointer); _IRQL_requires_max_(DISPATCH_LEVEL) -// NTKERNELAPI // HACK: ntoskrnl_vista functions are statically linked thus don't need DECLSPEC_IMPORT +NTKRNLVISTAAPI BOOLEAN NTAPI PoQueryWatchdogTime( diff --git a/sdk/include/xdk/wdm.template.h b/sdk/include/xdk/wdm.template.h index 9893977c092..1623e00a081 100644 --- a/sdk/include/xdk/wdm.template.h +++ b/sdk/include/xdk/wdm.template.h @@ -96,6 +96,13 @@ $define(USHORT=USHORT) #endif #endif +/* for statically-linked ntoskrnl_vista library */ +#if defined(NTKRNLVISTA) +#define NTKRNLVISTAAPI +#else +#define NTKRNLVISTAAPI NTKERNELAPI +#endif + #if defined(_X86_) && !defined(_NTHAL_) #define _DECL_HAL_KE_IMPORT DECLSPEC_IMPORT #elif defined(_X86_) diff --git a/sdk/include/xdk/wmifuncs.h b/sdk/include/xdk/wmifuncs.h index bad09c35e1d..81f6754452b 100644 --- a/sdk/include/xdk/wmifuncs.h +++ b/sdk/include/xdk/wmifuncs.h @@ -69,7 +69,7 @@ WmiQueryTraceInformation( _IRQL_requires_max_(PASSIVE_LEVEL) NTSTATUS -// NTKERNELAPI // HACK: ntoskrnl_vista functions are statically linked thus don't need DECLSPEC_IMPORT +NTKRNLVISTAAPI NTAPI EtwRegister( _In_ LPCGUID ProviderId, @@ -79,7 +79,7 @@ EtwRegister( _IRQL_requires_max_(PASSIVE_LEVEL) NTSTATUS -// NTKERNELAPI // HACK: ntoskrnl_vista functions are statically linked thus don't need DECLSPEC_IMPORT +NTKRNLVISTAAPI NTAPI EtwUnregister( _In_ REGHANDLE RegHandle); @@ -112,7 +112,7 @@ EtwActivityIdControl( _IRQL_requires_max_(HIGH_LEVEL) NTSTATUS -// NTKERNELAPI // HACK: ntoskrnl_vista functions are statically linked thus don't need DECLSPEC_IMPORT +NTKRNLVISTAAPI NTAPI EtwWrite( _In_ REGHANDLE RegHandle, diff --git a/sdk/lib/drivers/ntoskrnl_vista/CMakeLists.txt b/sdk/lib/drivers/ntoskrnl_vista/CMakeLists.txt index 5ce01354762..78658c54bd0 100644 --- a/sdk/lib/drivers/ntoskrnl_vista/CMakeLists.txt +++ b/sdk/lib/drivers/ntoskrnl_vista/CMakeLists.txt @@ -13,3 +13,5 @@ list(APPEND SOURCE add_library(ntoskrnl_vista ${SOURCE}) add_dependencies(ntoskrnl_vista bugcodes xdk) + +target_compile_definitions(ntoskrnl_vista PUBLIC NTKRNLVISTA) diff --git a/sdk/lib/drivers/ntoskrnl_vista/etw.c b/sdk/lib/drivers/ntoskrnl_vista/etw.c index 903b0497297..81f599fb909 100644 --- a/sdk/lib/drivers/ntoskrnl_vista/etw.c +++ b/sdk/lib/drivers/ntoskrnl_vista/etw.c @@ -10,7 +10,7 @@ _IRQL_requires_max_(HIGH_LEVEL) NTSTATUS -NTKERNELAPI +NTKRNLVISTAAPI NTAPI EtwWrite( _In_ REGHANDLE RegHandle, @@ -24,7 +24,7 @@ EtwWrite( _IRQL_requires_max_(PASSIVE_LEVEL) NTSTATUS -NTKERNELAPI +NTKRNLVISTAAPI NTAPI EtwRegister( _In_ LPCGUID ProviderId, @@ -37,7 +37,7 @@ EtwRegister( _IRQL_requires_max_(PASSIVE_LEVEL) NTSTATUS -NTKERNELAPI +NTKRNLVISTAAPI NTAPI EtwUnregister( _In_ REGHANDLE RegHandle) diff --git a/sdk/lib/drivers/ntoskrnl_vista/io.c b/sdk/lib/drivers/ntoskrnl_vista/io.c index 5008f7a981d..c295d63193f 100644 --- a/sdk/lib/drivers/ntoskrnl_vista/io.c +++ b/sdk/lib/drivers/ntoskrnl_vista/io.c @@ -18,7 +18,7 @@ typedef struct _EX_WORKITEM_CONTEXT #define TAG_IOWI 'IWOI' -NTKERNELAPI +NTKRNLVISTAAPI NTSTATUS NTAPI IoGetIrpExtraCreateParameter(IN PIRP Irp, @@ -49,7 +49,7 @@ IopWorkItemExCallback( ExFreePoolWithTag(context, TAG_IOWI); } -NTKERNELAPI +NTKRNLVISTAAPI VOID NTAPI IoQueueWorkItemEx( @@ -68,7 +68,7 @@ IoQueueWorkItemEx( _IRQL_requires_max_(PASSIVE_LEVEL) _Must_inspect_result_ -NTKERNELAPI +NTKRNLVISTAAPI NTSTATUS NTAPI IoGetDevicePropertyData( @@ -86,7 +86,7 @@ IoGetDevicePropertyData( _IRQL_requires_max_(PASSIVE_LEVEL) _Must_inspect_result_ -NTKERNELAPI +NTKRNLVISTAAPI NTSTATUS IoSetDeviceInterfacePropertyData( _In_ PUNICODE_STRING SymbolicLinkName, @@ -100,7 +100,7 @@ IoSetDeviceInterfacePropertyData( return STATUS_NOT_IMPLEMENTED; } -NTKERNELAPI +NTKRNLVISTAAPI IO_PRIORITY_HINT NTAPI IoGetIoPriorityHint( @@ -109,7 +109,7 @@ IoGetIoPriorityHint( return IoPriorityNormal; } -NTKERNELAPI +NTKRNLVISTAAPI VOID IoSetMasterIrpStatus( _Inout_ PIRP MasterIrp, diff --git a/sdk/lib/drivers/ntoskrnl_vista/ke.c b/sdk/lib/drivers/ntoskrnl_vista/ke.c index 2f982659393..0abd392b87e 100644 --- a/sdk/lib/drivers/ntoskrnl_vista/ke.c +++ b/sdk/lib/drivers/ntoskrnl_vista/ke.c @@ -9,7 +9,7 @@ #include <ntdef.h> #include <ntifs.h> -NTKERNELAPI +NTKRNLVISTAAPI ULONG NTAPI KeQueryActiveProcessorCount(OUT PKAFFINITY ActiveProcessors OPTIONAL) @@ -26,7 +26,7 @@ KeQueryActiveProcessorCount(OUT PKAFFINITY ActiveProcessors OPTIONAL) return RtlNumberOfSetBits(&Bitmap); } -NTKERNELAPI +NTKRNLVISTAAPI USHORT NTAPI KeQueryHighestNodeNumber() @@ -34,7 +34,7 @@ KeQueryHighestNodeNumber() return 0; } -NTKERNELAPI +NTKRNLVISTAAPI USHORT NTAPI KeGetCurrentNodeNumber() @@ -43,7 +43,7 @@ KeGetCurrentNodeNumber() } _IRQL_requires_max_(DISPATCH_LEVEL) -NTKERNELAPI +NTKRNLVISTAAPI BOOLEAN NTAPI KeSetCoalescableTimer( diff --git a/sdk/lib/drivers/ntoskrnl_vista/po.c b/sdk/lib/drivers/ntoskrnl_vista/po.c index 22d44bdd892..791a784273a 100644 --- a/sdk/lib/drivers/ntoskrnl_vista/po.c +++ b/sdk/lib/drivers/ntoskrnl_vista/po.c @@ -8,7 +8,7 @@ #include <ntdef.h> #include <ntifs.h> -NTKERNELAPI +NTKRNLVISTAAPI NTSTATUS NTAPI PoRegisterPowerSettingCallback( @@ -22,7 +22,7 @@ PoRegisterPowerSettingCallback( } _IRQL_requires_max_(APC_LEVEL) -NTKERNELAPI +NTKRNLVISTAAPI NTSTATUS NTAPI PoUnregisterPowerSettingCallback( @@ -32,7 +32,7 @@ PoUnregisterPowerSettingCallback( } _IRQL_requires_max_(DISPATCH_LEVEL) -NTKERNELAPI +NTKRNLVISTAAPI BOOLEAN NTAPI PoQueryWatchdogTime(

1 0

[reactos] 01/01: [PSDK] Fix order and formatting of IOCTL definitions in ntddcdrm.h
by Victor Perevertkin 24 Sep '20

24 Sep '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7af229f5b5cd666d0fc6d… commit 7af229f5b5cd666d0fc6dc520a4de3d0c95240ad Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Thu Sep 24 17:44:18 2020 +0300 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Thu Sep 24 17:44:18 2020 +0300 [PSDK] Fix order and formatting of IOCTL definitions in ntddcdrm.h --- sdk/include/psdk/ntddcdrm.h | 114 ++++++++++++++++++++++---------------------- 1 file changed, 56 insertions(+), 58 deletions(-) diff --git a/sdk/include/psdk/ntddcdrm.h b/sdk/include/psdk/ntddcdrm.h index c9fd6dcb82c..6b481acbd6d 100644 --- a/sdk/include/psdk/ntddcdrm.h +++ b/sdk/include/psdk/ntddcdrm.h @@ -31,100 +31,98 @@ extern "C" { #define IOCTL_CDROM_BASE FILE_DEVICE_CD_ROM -#define IOCTL_CDROM_CHECK_VERIFY \ - CTL_CODE(IOCTL_CDROM_BASE, 0x0200, METHOD_BUFFERED, FILE_READ_ACCESS) - -#define IOCTL_CDROM_FIND_NEW_DEVICES \ - CTL_CODE(IOCTL_CDROM_BASE, 0x0206, METHOD_BUFFERED, FILE_READ_ACCESS) - -#define IOCTL_CDROM_GET_CONFIGURATION \ - CTL_CODE(IOCTL_CDROM_BASE, 0x0016, METHOD_BUFFERED, FILE_READ_ACCESS) +#define IOCTL_CDROM_READ_TOC \ + CTL_CODE(IOCTL_CDROM_BASE, 0x0000, METHOD_BUFFERED, FILE_READ_ACCESS) -#define IOCTL_CDROM_GET_CONTROL \ - CTL_CODE(IOCTL_CDROM_BASE, 0x000D, METHOD_BUFFERED, FILE_READ_ACCESS) +#define IOCTL_CDROM_SEEK_AUDIO_MSF \ + CTL_CODE(IOCTL_CDROM_BASE, 0x0001, METHOD_BUFFERED, FILE_READ_ACCESS) -#define IOCTL_CDROM_GET_DRIVE_GEOMETRY \ - CTL_CODE(IOCTL_CDROM_BASE, 0x0013, METHOD_BUFFERED, FILE_READ_ACCESS) +#define IOCTL_CDROM_STOP_AUDIO \ + CTL_CODE(IOCTL_CDROM_BASE, 0x0002, METHOD_BUFFERED, FILE_READ_ACCESS) -#define IOCTL_CDROM_GET_DRIVE_GEOMETRY_EX \ - CTL_CODE(IOCTL_CDROM_BASE, 0x0014, METHOD_BUFFERED, FILE_READ_ACCESS) +#define IOCTL_CDROM_PAUSE_AUDIO \ + CTL_CODE(IOCTL_CDROM_BASE, 0x0003, METHOD_BUFFERED, FILE_READ_ACCESS) -#define IOCTL_CDROM_GET_LAST_SESSION \ - CTL_CODE(IOCTL_CDROM_BASE, 0x000E, METHOD_BUFFERED, FILE_READ_ACCESS) +#define IOCTL_CDROM_RESUME_AUDIO \ + CTL_CODE(IOCTL_CDROM_BASE, 0x0004, METHOD_BUFFERED, FILE_READ_ACCESS) #define IOCTL_CDROM_GET_VOLUME \ CTL_CODE(IOCTL_CDROM_BASE, 0x0005, METHOD_BUFFERED, FILE_READ_ACCESS) -#define IOCTL_CDROM_PAUSE_AUDIO \ - CTL_CODE(IOCTL_CDROM_BASE, 0x0003, METHOD_BUFFERED, FILE_READ_ACCESS) - #define IOCTL_CDROM_PLAY_AUDIO_MSF \ CTL_CODE(IOCTL_CDROM_BASE, 0x0006, METHOD_BUFFERED, FILE_READ_ACCESS) +#define IOCTL_CDROM_SET_VOLUME \ + CTL_CODE(IOCTL_CDROM_BASE, 0x000A, METHOD_BUFFERED, FILE_READ_ACCESS) + +#define IOCTL_CDROM_READ_Q_CHANNEL \ + CTL_CODE(IOCTL_CDROM_BASE, 0x000B, METHOD_BUFFERED, FILE_READ_ACCESS) + +#define IOCTL_CDROM_GET_CONTROL \ + CTL_CODE(IOCTL_CDROM_BASE, 0x000D, METHOD_BUFFERED, FILE_READ_ACCESS) + +#define IOCTL_CDROM_GET_LAST_SESSION \ + CTL_CODE(IOCTL_CDROM_BASE, 0x000E, METHOD_BUFFERED, FILE_READ_ACCESS) + #define IOCTL_CDROM_RAW_READ \ CTL_CODE(IOCTL_CDROM_BASE, 0x000F, METHOD_OUT_DIRECT, FILE_READ_ACCESS) #define IOCTL_CDROM_DISK_TYPE \ CTL_CODE(IOCTL_CDROM_BASE, 0x0010, METHOD_BUFFERED, FILE_ANY_ACCESS) -#define IOCTL_CDROM_READ_Q_CHANNEL \ - CTL_CODE(IOCTL_CDROM_BASE, 0x000B, METHOD_BUFFERED, FILE_READ_ACCESS) +#define IOCTL_CDROM_GET_DRIVE_GEOMETRY \ + CTL_CODE(IOCTL_CDROM_BASE, 0x0013, METHOD_BUFFERED, FILE_READ_ACCESS) -#define IOCTL_CDROM_READ_TOC \ - CTL_CODE(IOCTL_CDROM_BASE, 0x0000, METHOD_BUFFERED, FILE_READ_ACCESS) +#define IOCTL_CDROM_GET_DRIVE_GEOMETRY_EX \ + CTL_CODE(IOCTL_CDROM_BASE, 0x0014, METHOD_BUFFERED, FILE_READ_ACCESS) #define IOCTL_CDROM_READ_TOC_EX \ CTL_CODE(IOCTL_CDROM_BASE, 0x0015, METHOD_BUFFERED, FILE_READ_ACCESS) -#define IOCTL_CDROM_RESUME_AUDIO \ - CTL_CODE(IOCTL_CDROM_BASE, 0x0004, METHOD_BUFFERED, FILE_READ_ACCESS) +#define IOCTL_CDROM_GET_CONFIGURATION \ + CTL_CODE(IOCTL_CDROM_BASE, 0x0016, METHOD_BUFFERED, FILE_READ_ACCESS) -#define IOCTL_CDROM_SEEK_AUDIO_MSF \ - CTL_CODE(IOCTL_CDROM_BASE, 0x0001, METHOD_BUFFERED, FILE_READ_ACCESS) +#define IOCTL_CDROM_EXCLUSIVE_ACCESS \ + CTL_CODE(IOCTL_CDROM_BASE, 0x0017, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS) -#define IOCTL_CDROM_SET_VOLUME \ - CTL_CODE(IOCTL_CDROM_BASE, 0x000A, METHOD_BUFFERED, FILE_READ_ACCESS) +#define IOCTL_CDROM_SET_SPEED \ + CTL_CODE(IOCTL_CDROM_BASE, 0x0018, METHOD_BUFFERED, FILE_READ_ACCESS) -#define IOCTL_CDROM_SIMBAD \ - CTL_CODE(IOCTL_CDROM_BASE, 0x1003, METHOD_BUFFERED, FILE_READ_ACCESS) +#define IOCTL_CDROM_GET_INQUIRY_DATA \ + CTL_CODE(IOCTL_CDROM_BASE, 0x0019, METHOD_BUFFERED, FILE_READ_ACCESS) -#define IOCTL_CDROM_STOP_AUDIO \ - CTL_CODE(IOCTL_CDROM_BASE, 0x0002, METHOD_BUFFERED, FILE_READ_ACCESS) +#define IOCTL_CDROM_ENABLE_STREAMING \ + CTL_CODE(IOCTL_CDROM_BASE, 0x001A, METHOD_BUFFERED, FILE_READ_ACCESS) -#define IOCTL_CDROM_EJECT_MEDIA \ - CTL_CODE(IOCTL_CDROM_BASE, 0x0202, METHOD_BUFFERED, FILE_READ_ACCESS) +#define IOCTL_CDROM_SEND_OPC_INFORMATION \ + CTL_CODE(IOCTL_CDROM_BASE, 0x001B, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS) +#define IOCTL_CDROM_GET_PERFORMANCE \ + CTL_CODE(IOCTL_CDROM_BASE, 0x001C, METHOD_BUFFERED, FILE_READ_ACCESS) -// #define IOCTL_CDROM_GET_LAST_SESSION CTL_CODE(IOCTL_CDROM_BASE, 0x000E, METHOD_BUFFERED, FILE_READ_ACCESS) +#define IOCTL_CDROM_CHECK_VERIFY \ + CTL_CODE(IOCTL_CDROM_BASE, 0x0200, METHOD_BUFFERED, FILE_READ_ACCESS) +#define IOCTL_CDROM_MEDIA_REMOVAL \ + CTL_CODE(IOCTL_CDROM_BASE, 0x0201, METHOD_BUFFERED, FILE_READ_ACCESS) -// #define IOCTL_CDROM_GET_CONFIGURATION CTL_CODE(IOCTL_CDROM_BASE, 0x0016, METHOD_BUFFERED, FILE_READ_ACCESS) +#define IOCTL_CDROM_EJECT_MEDIA \ + CTL_CODE(IOCTL_CDROM_BASE, 0x0202, METHOD_BUFFERED, FILE_READ_ACCESS) -#define IOCTL_CDROM_EXCLUSIVE_ACCESS CTL_CODE(IOCTL_CDROM_BASE, 0x0017, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS) -#define IOCTL_CDROM_SET_SPEED CTL_CODE(IOCTL_CDROM_BASE, 0x0018, METHOD_BUFFERED, FILE_READ_ACCESS) -#define IOCTL_CDROM_GET_INQUIRY_DATA CTL_CODE(IOCTL_CDROM_BASE, 0x0019, METHOD_BUFFERED, FILE_READ_ACCESS) +#define IOCTL_CDROM_LOAD_MEDIA \ + CTL_CODE(IOCTL_CDROM_BASE, 0x0203, METHOD_BUFFERED, FILE_READ_ACCESS) -#define IOCTL_CDROM_ENABLE_STREAMING CTL_CODE(IOCTL_CDROM_BASE, 0x001A, METHOD_BUFFERED, FILE_READ_ACCESS) -#define IOCTL_CDROM_SEND_OPC_INFORMATION CTL_CODE(IOCTL_CDROM_BASE, 0x001B, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS) -#define IOCTL_CDROM_GET_PERFORMANCE CTL_CODE(IOCTL_CDROM_BASE, 0x001C, METHOD_BUFFERED, FILE_READ_ACCESS) +#define IOCTL_CDROM_RESERVE \ + CTL_CODE(IOCTL_CDROM_BASE, 0x0204, METHOD_BUFFERED, FILE_READ_ACCESS) -// end_winioctl +#define IOCTL_CDROM_RELEASE \ + CTL_CODE(IOCTL_CDROM_BASE, 0x0205, METHOD_BUFFERED, FILE_READ_ACCESS) -// -// The following device control codes are common for all class drivers. The -// functions codes defined here must match all of the other class drivers. -// -// Warning: these codes will be replaced in the future with the IOCTL_STORAGE -// codes included below -// +#define IOCTL_CDROM_FIND_NEW_DEVICES \ + CTL_CODE(IOCTL_CDROM_BASE, 0x0206, METHOD_BUFFERED, FILE_READ_ACCESS) -// #define IOCTL_CDROM_CHECK_VERIFY CTL_CODE(IOCTL_CDROM_BASE, 0x0200, METHOD_BUFFERED, FILE_READ_ACCESS) -#define IOCTL_CDROM_MEDIA_REMOVAL CTL_CODE(IOCTL_CDROM_BASE, 0x0201, METHOD_BUFFERED, FILE_READ_ACCESS) -// #define IOCTL_CDROM_EJECT_MEDIA CTL_CODE(IOCTL_CDROM_BASE, 0x0202, METHOD_BUFFERED, FILE_READ_ACCESS) -#define IOCTL_CDROM_LOAD_MEDIA CTL_CODE(IOCTL_CDROM_BASE, 0x0203, METHOD_BUFFERED, FILE_READ_ACCESS) -#define IOCTL_CDROM_RESERVE CTL_CODE(IOCTL_CDROM_BASE, 0x0204, METHOD_BUFFERED, FILE_READ_ACCESS) -#define IOCTL_CDROM_RELEASE CTL_CODE(IOCTL_CDROM_BASE, 0x0205, METHOD_BUFFERED, FILE_READ_ACCESS) -// #define IOCTL_CDROM_FIND_NEW_DEVICES CTL_CODE(IOCTL_CDROM_BASE, 0x0206, METHOD_BUFFERED, FILE_READ_ACCESS) +#define IOCTL_CDROM_SIMBAD \ + CTL_CODE(IOCTL_CDROM_BASE, 0x1003, METHOD_BUFFERED, FILE_READ_ACCESS) #define MINIMUM_CDROM_INQUIRY_SIZE 36 // RTL_SIZEOF_THROUGH_FIELD(INQUIRYDATA, ProductRevisionLevel)

1 0

[reactos] 01/01: [PSDK] Add definitions required for newer storage class drivers (cdrom)
by Victor Perevertkin 24 Sep '20

24 Sep '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=99489553fcaba00f30fb1… commit 99489553fcaba00f30fb1c2f531490084607dc06 Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Thu Sep 24 17:31:15 2020 +0300 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Thu Sep 24 17:31:15 2020 +0300 [PSDK] Add definitions required for newer storage class drivers (cdrom) CORE-17129 --- sdk/include/psdk/devpkey.h | 1 + sdk/include/psdk/driverspecs.h | 4 +- sdk/include/psdk/ntddcdrm.h | 243 ++++++++++++++++++++++++++++++++++-- sdk/include/psdk/ntddcdvd.h | 186 ++++++++++++++++++++++----- sdk/include/psdk/ntddmmc.h | 4 +- sdk/include/psdk/ntddstor.h | 33 ++++- sdk/include/psdk/ntddvol.h | 30 ++--- sdk/include/psdk/sal.h | 116 ++++++++--------- sdk/include/psdk/specstrings.h | 7 ++ sdk/include/psdk/winapifamily.h | 71 +++++++++++ sdk/include/psdk/winpackagefamily.h | 56 +++++++++ 11 files changed, 633 insertions(+), 118 deletions(-) diff --git a/sdk/include/psdk/devpkey.h b/sdk/include/psdk/devpkey.h index a908dfdebf2..97b96d935c0 100644 --- a/sdk/include/psdk/devpkey.h +++ b/sdk/include/psdk/devpkey.h @@ -57,6 +57,7 @@ DEFINE_DEVPROPKEY(DEVPKEY_Device_InstallState, 0xa45c254e,0xdf1c,0x4efd,0x80,0x2 DEFINE_DEVPROPKEY(DEVPKEY_Device_LocationPaths, 0xa45c254e,0xdf1c,0x4efd,0x80,0x20,0x67,0xd1,0x46,0xa8,0x50,0xe0, 37); DEFINE_DEVPROPKEY(DEVPKEY_Device_BaseContainerId, 0xa45c254e,0xdf1c,0x4efd,0x80,0x20,0x67,0xd1,0x46,0xa8,0x50,0xe0, 38); DEFINE_DEVPROPKEY(DEVPKEY_Device_InLocalMachineContainer, 0x8c7ed206, 0x3f8a, 0x4827, 0xb3, 0xab, 0xae, 0x9e, 0x1f, 0xae, 0xfc, 0x6c, 4); +DEFINE_DEVPROPKEY(DEVPKEY_Device_SessionId, 0x83da6326,0x97a6,0x4088,0x94,0x53,0xa1,0x92,0x3f,0x57,0x3b,0x29, 6); DEFINE_DEVPROPKEY(DEVPKEY_DeviceInterface_FriendlyName, 0x026e516e,0x8b14,0x414b,0x83,0xcd,0x85,0x6d,0x6f,0xef,0x48,0x22, 2); DEFINE_DEVPROPKEY(DEVPKEY_DeviceInterface_Enabled, 0x026e516e,0x8b14,0x414b,0x83,0xcd,0x85,0x6d,0x6f,0xef,0x48,0x22, 3); diff --git a/sdk/include/psdk/driverspecs.h b/sdk/include/psdk/driverspecs.h index 56f276596d4..a15fb26e1e4 100644 --- a/sdk/include/psdk/driverspecs.h +++ b/sdk/include/psdk/driverspecs.h @@ -124,7 +124,7 @@ #define __drv_ret(annotes) #define __drv_sameIRQL #define __drv_savesIRQL -#define __drv_savesIRQLGlobal +#define __drv_savesIRQLGlobal(kind,param) #define __drv_strictType(typename,mode) #define __drv_strictTypeMatch(mode) #define __drv_unit(p) @@ -306,7 +306,7 @@ __ANNOTATION(SAL_callbackType(__In_impl_ __AuToQuOtE char *);) #define __drv_ret(annotes) #define __drv_sameIRQL #define __drv_savesIRQL -#define __drv_savesIRQLGlobal +#define __drv_savesIRQLGlobal(kind,param) #define __drv_setsIRQL(irql) #define __drv_strictType(typename,mode) #define __drv_strictTypeMatch(mode) diff --git a/sdk/include/psdk/ntddcdrm.h b/sdk/include/psdk/ntddcdrm.h index ce6766299a3..c9fd6dcb82c 100644 --- a/sdk/include/psdk/ntddcdrm.h +++ b/sdk/include/psdk/ntddcdrm.h @@ -95,6 +95,41 @@ extern "C" { CTL_CODE(IOCTL_CDROM_BASE, 0x0202, METHOD_BUFFERED, FILE_READ_ACCESS) +// #define IOCTL_CDROM_GET_LAST_SESSION CTL_CODE(IOCTL_CDROM_BASE, 0x000E, METHOD_BUFFERED, FILE_READ_ACCESS) + + +// #define IOCTL_CDROM_GET_CONFIGURATION CTL_CODE(IOCTL_CDROM_BASE, 0x0016, METHOD_BUFFERED, FILE_READ_ACCESS) + +#define IOCTL_CDROM_EXCLUSIVE_ACCESS CTL_CODE(IOCTL_CDROM_BASE, 0x0017, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS) +#define IOCTL_CDROM_SET_SPEED CTL_CODE(IOCTL_CDROM_BASE, 0x0018, METHOD_BUFFERED, FILE_READ_ACCESS) +#define IOCTL_CDROM_GET_INQUIRY_DATA CTL_CODE(IOCTL_CDROM_BASE, 0x0019, METHOD_BUFFERED, FILE_READ_ACCESS) + +#define IOCTL_CDROM_ENABLE_STREAMING CTL_CODE(IOCTL_CDROM_BASE, 0x001A, METHOD_BUFFERED, FILE_READ_ACCESS) +#define IOCTL_CDROM_SEND_OPC_INFORMATION CTL_CODE(IOCTL_CDROM_BASE, 0x001B, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS) +#define IOCTL_CDROM_GET_PERFORMANCE CTL_CODE(IOCTL_CDROM_BASE, 0x001C, METHOD_BUFFERED, FILE_READ_ACCESS) + +// end_winioctl + +// +// The following device control codes are common for all class drivers. The +// functions codes defined here must match all of the other class drivers. +// +// Warning: these codes will be replaced in the future with the IOCTL_STORAGE +// codes included below +// + +// #define IOCTL_CDROM_CHECK_VERIFY CTL_CODE(IOCTL_CDROM_BASE, 0x0200, METHOD_BUFFERED, FILE_READ_ACCESS) +#define IOCTL_CDROM_MEDIA_REMOVAL CTL_CODE(IOCTL_CDROM_BASE, 0x0201, METHOD_BUFFERED, FILE_READ_ACCESS) +// #define IOCTL_CDROM_EJECT_MEDIA CTL_CODE(IOCTL_CDROM_BASE, 0x0202, METHOD_BUFFERED, FILE_READ_ACCESS) +#define IOCTL_CDROM_LOAD_MEDIA CTL_CODE(IOCTL_CDROM_BASE, 0x0203, METHOD_BUFFERED, FILE_READ_ACCESS) +#define IOCTL_CDROM_RESERVE CTL_CODE(IOCTL_CDROM_BASE, 0x0204, METHOD_BUFFERED, FILE_READ_ACCESS) +#define IOCTL_CDROM_RELEASE CTL_CODE(IOCTL_CDROM_BASE, 0x0205, METHOD_BUFFERED, FILE_READ_ACCESS) +// #define IOCTL_CDROM_FIND_NEW_DEVICES CTL_CODE(IOCTL_CDROM_BASE, 0x0206, METHOD_BUFFERED, FILE_READ_ACCESS) + + +#define MINIMUM_CDROM_INQUIRY_SIZE 36 // RTL_SIZEOF_THROUGH_FIELD(INQUIRYDATA, ProductRevisionLevel) +#define MAXIMUM_CDROM_INQUIRY_SIZE 260 // MAXUCHAR + RTL_SIZEOF_THROUGH_FIELD(INQUIRYDATA, AdditionalLength) + #define MAXIMUM_NUMBER_TRACKS 100 #define MAXIMUM_CDROM_SIZE 804 #define MINIMUM_CDROM_READ_TOC_EX_SIZE 2 @@ -334,8 +369,8 @@ typedef union _SUB_Q_CHANNEL_DATA { #define TWO_FOUR_CHANNEL_AUDIO 0x8 typedef struct _CDROM_AUDIO_CONTROL { - UCHAR LbaFormat; - USHORT LogicalBlocksPerSecond; + UCHAR LbaFormat; + USHORT LogicalBlocksPerSecond; } CDROM_AUDIO_CONTROL, *PCDROM_AUDIO_CONTROL; typedef struct _VOLUME_CONTROL { @@ -343,17 +378,209 @@ typedef struct _VOLUME_CONTROL { } VOLUME_CONTROL, *PVOLUME_CONTROL; typedef enum _TRACK_MODE_TYPE { - YellowMode2, - XAForm2, - CDDA + YellowMode2, + XAForm2, + CDDA, + RawWithC2AndSubCode, + RawWithC2, + RawWithSubCode } TRACK_MODE_TYPE, *PTRACK_MODE_TYPE; +#define CD_RAW_READ_C2_SIZE ( 296 ) +#define CD_RAW_READ_SUBCODE_SIZE ( 96) +#define CD_RAW_SECTOR_WITH_C2_SIZE (2352+296 ) +#define CD_RAW_SECTOR_WITH_SUBCODE_SIZE (2352 +96) +#define CD_RAW_SECTOR_WITH_C2_AND_SUBCODE_SIZE (2352+296+96) + typedef struct __RAW_READ_INFO { - LARGE_INTEGER DiskOffset; - ULONG SectorCount; - TRACK_MODE_TYPE TrackMode; + LARGE_INTEGER DiskOffset; + ULONG SectorCount; + TRACK_MODE_TYPE TrackMode; } RAW_READ_INFO, *PRAW_READ_INFO; + +// for IOCTL_CDROM_EXCLUSIVE_ACCESS + +#define CDROM_EXCLUSIVE_CALLER_LENGTH 64 + +#define CDROM_LOCK_IGNORE_VOLUME (1 << 0) +#define CDROM_NO_MEDIA_NOTIFICATIONS (1 << 1) + +#define CDROM_NOT_IN_EXCLUSIVE_MODE 0 +#define CDROM_IN_EXCLUSIVE_MODE 1 + +typedef enum _EXCLUSIVE_ACCESS_REQUEST_TYPE +{ + ExclusiveAccessQueryState, + ExclusiveAccessLockDevice, + ExclusiveAccessUnlockDevice +} EXCLUSIVE_ACCESS_REQUEST_TYPE, *PEXCLUSIVE_ACCESS_REQUEST_TYPE; + +typedef struct _CDROM_EXCLUSIVE_ACCESS +{ + EXCLUSIVE_ACCESS_REQUEST_TYPE RequestType; + ULONG Flags; +} CDROM_EXCLUSIVE_ACCESS, *PCDROM_EXCLUSIVE_ACCESS; + +typedef struct _CDROM_EXCLUSIVE_LOCK +{ + CDROM_EXCLUSIVE_ACCESS Access; + UCHAR CallerName[CDROM_EXCLUSIVE_CALLER_LENGTH]; +} CDROM_EXCLUSIVE_LOCK, *PCDROM_EXCLUSIVE_LOCK; + +typedef struct _CDROM_EXCLUSIVE_LOCK_STATE +{ + BOOLEAN LockState; + UCHAR CallerName[CDROM_EXCLUSIVE_CALLER_LENGTH]; +} CDROM_EXCLUSIVE_LOCK_STATE, *PCDROM_EXCLUSIVE_LOCK_STATE; + + +// for IOCTL_CDROM_SET_SPEED + +typedef enum _CDROM_SPEED_REQUEST +{ + CdromSetSpeed, + CdromSetStreaming +} CDROM_SPEED_REQUEST, *PCDROM_SPEED_REQUEST; + +typedef enum _WRITE_ROTATION +{ + CdromDefaultRotation, + CdromCAVRotation +} WRITE_ROTATION, *PWRITE_ROTATION; + +typedef struct _CDROM_SET_SPEED +{ + CDROM_SPEED_REQUEST RequestType; + USHORT ReadSpeed; + USHORT WriteSpeed; + WRITE_ROTATION RotationControl; +} CDROM_SET_SPEED, *PCDROM_SET_SPEED; + +typedef struct _CDROM_SET_STREAMING +{ + CDROM_SPEED_REQUEST RequestType; + ULONG ReadSize; + ULONG ReadTime; + ULONG WriteSize; + ULONG WriteTime; + ULONG StartLba; + ULONG EndLba; + WRITE_ROTATION RotationControl; + BOOLEAN RestoreDefaults; + BOOLEAN SetExact; + BOOLEAN RandomAccess; + BOOLEAN Persistent; +} CDROM_SET_STREAMING, *PCDROM_SET_STREAMING; + + +// for IOCTL_CDROM_ENABLE_STREAMING + +typedef enum _STREAMING_CONTROL_REQUEST_TYPE +{ + CdromStreamingDisable = 1, + CdromStreamingEnableForReadOnly = 2, + CdromStreamingEnableForWriteOnly = 3, + CdromStreamingEnableForReadWrite = 4 +} STREAMING_CONTROL_REQUEST_TYPE, *PSTREAMING_CONTROL_REQUEST_TYPE; + +typedef struct _CDROM_STREAMING_CONTROL { + STREAMING_CONTROL_REQUEST_TYPE RequestType; +} CDROM_STREAMING_CONTROL, *PCDROM_STREAMING_CONTROL; + + +// for IOCTL_CDROM_SEND_OPC_INFORMATION + +typedef enum _CDROM_OPC_INFO_TYPE +{ + SimpleOpcInfo = 1 +} CDROM_OPC_INFO_TYPE, *PCDROM_OPC_INFO_TYPE; + +typedef struct _CDROM_SIMPLE_OPC_INFO +{ + CDROM_OPC_INFO_TYPE RequestType; + BOOLEAN Exclude0; + BOOLEAN Exclude1; +} CDROM_SIMPLE_OPC_INFO, *PCDROM_SIMPLE_OPC_INFO; + + +// for IOCTL_CDROM_GET_PERFORMANCE + +typedef enum _CDROM_PERFORMANCE_REQUEST_TYPE +{ + CdromPerformanceRequest = 1, + CdromWriteSpeedRequest = 2 +} CDROM_PERFORMANCE_REQUEST_TYPE, *PCDROM_PERFORMANCE_REQUEST_TYPE; + +typedef enum _CDROM_PERFORMANCE_TYPE +{ + CdromReadPerformance = 1, + CdromWritePerformance = 2 +} CDROM_PERFORMANCE_TYPE, *PCDROM_PERFORMANCE_TYPE; + +typedef enum _CDROM_PERFORMANCE_EXCEPTION_TYPE +{ + CdromNominalPerformance = 1, + CdromEntirePerformanceList = 2, + CdromPerformanceExceptionsOnly = 3 +} CDROM_PERFORMANCE_EXCEPTION_TYPE, *PCDROM_PERFORMANCE_EXCEPTION_TYPE; + +typedef enum _CDROM_PERFORMANCE_TOLERANCE_TYPE +{ + Cdrom10Nominal20Exceptions = 1 +} CDROM_PERFORMANCE_TOLERANCE_TYPE, *PCDROM_PERFORMANCE_TOLERANCE_TYPE; + +typedef struct _CDROM_PERFORMANCE_REQUEST +{ + CDROM_PERFORMANCE_REQUEST_TYPE RequestType; + CDROM_PERFORMANCE_TYPE PerformanceType; + CDROM_PERFORMANCE_EXCEPTION_TYPE Exceptions; + CDROM_PERFORMANCE_TOLERANCE_TYPE Tolerance; + ULONG StaringLba; +} CDROM_PERFORMANCE_REQUEST, *PCDROM_PERFORMANCE_REQUEST; + +typedef struct _CDROM_WRITE_SPEED_REQUEST +{ + CDROM_PERFORMANCE_REQUEST_TYPE RequestType; +} CDROM_WRITE_SPEED_REQUEST, *PCDROM_WRITE_SPEED_REQUEST; + +typedef struct _CDROM_PERFORMANCE_HEADER +{ + UCHAR DataLength[4]; + UCHAR Except:1; + UCHAR Write:1; + UCHAR Reserved1:6; + UCHAR Reserved2[3]; + UCHAR Data[0]; +} CDROM_PERFORMANCE_HEADER, *PCDROM_PERFORMANCE_HEADER; + +typedef struct _CDROM_NOMINAL_PERFORMANCE_DESCRIPTOR +{ + UCHAR StartLba[4]; + UCHAR StartPerformance[4]; + UCHAR EndLba[4]; + UCHAR EndPerformance[4]; +} CDROM_NOMINAL_PERFORMANCE_DESCRIPTOR, *PCDROM_NOMINAL_PERFORMANCE_DESCRIPTOR; + +typedef struct _CDROM_EXCEPTION_PERFORMANCE_DESCRIPTOR +{ + UCHAR Lba[4]; + UCHAR Time[2]; +} CDROM_EXCEPTION_PERFORMANCE_DESCRIPTOR, *PCDROM_EXCEPTION_PERFORMANCE_DESCRIPTOR; + +typedef struct _CDROM_WRITE_SPEED_DESCRIPTOR +{ + UCHAR MixedReadWrite:1; + UCHAR Exact:1; + UCHAR Reserved1:1; + UCHAR WriteRotationControl:2; + UCHAR Reserved2:3; + UCHAR Reserved3[3]; + UCHAR EndLba[4]; + UCHAR ReadSpeed[4]; + UCHAR WriteSpeed[4]; +} CDROM_WRITE_SPEED_DESCRIPTOR, *PCDROM_WRITE_SPEED_DESCRIPTOR; + #ifdef __cplusplus } #endif diff --git a/sdk/include/psdk/ntddcdvd.h b/sdk/include/psdk/ntddcdvd.h index c07164de633..3026e199b48 100644 --- a/sdk/include/psdk/ntddcdvd.h +++ b/sdk/include/psdk/ntddcdvd.h @@ -34,36 +34,75 @@ extern "C" { #define IOCTL_STORAGE_SET_READ_AHEAD \ CTL_CODE(IOCTL_STORAGE_BASE, 0x0100, METHOD_BUFFERED, FILE_READ_ACCESS) +#define IOCTL_DVD_START_SESSION \ + CTL_CODE(IOCTL_DVD_BASE, 0x0400, METHOD_BUFFERED, FILE_READ_ACCESS) + +#define IOCTL_DVD_READ_KEY \ + CTL_CODE(IOCTL_DVD_BASE, 0x0401, METHOD_BUFFERED, FILE_READ_ACCESS) + +#define IOCTL_DVD_SEND_KEY \ + CTL_CODE(IOCTL_DVD_BASE, 0x0402, METHOD_BUFFERED, FILE_READ_ACCESS) + #define IOCTL_DVD_END_SESSION \ CTL_CODE(IOCTL_DVD_BASE, 0x0403, METHOD_BUFFERED, FILE_READ_ACCESS) +#define IOCTL_DVD_SET_READ_AHEAD \ + CTL_CODE(IOCTL_DVD_BASE, 0x0404, METHOD_BUFFERED, FILE_READ_ACCESS) + #define IOCTL_DVD_GET_REGION \ CTL_CODE(IOCTL_DVD_BASE, 0x0405, METHOD_BUFFERED, FILE_READ_ACCESS) #define IOCTL_DVD_SEND_KEY2 \ CTL_CODE(IOCTL_DVD_BASE, 0x0406, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS) -#define IOCTL_DVD_READ_KEY \ - CTL_CODE(IOCTL_DVD_BASE, 0x0401, METHOD_BUFFERED, FILE_READ_ACCESS) +#define IOCTL_AACS_READ_MEDIA_KEY_BLOCK_SIZE \ + CTL_CODE(IOCTL_DVD_BASE, 0x430, METHOD_BUFFERED, FILE_READ_ACCESS) -#define IOCTL_DVD_READ_STRUCTURE \ - CTL_CODE(IOCTL_DVD_BASE, 0x0450, METHOD_BUFFERED, FILE_READ_ACCESS) +#define IOCTL_AACS_READ_MEDIA_KEY_BLOCK \ + CTL_CODE(IOCTL_DVD_BASE, 0x431, METHOD_BUFFERED, FILE_READ_ACCESS) -#define IOCTL_DVD_SEND_KEY \ - CTL_CODE(IOCTL_DVD_BASE, 0x0402, METHOD_BUFFERED, FILE_READ_ACCESS) +#define IOCTL_AACS_START_SESSION \ + CTL_CODE(IOCTL_DVD_BASE, 0x432, METHOD_BUFFERED, FILE_READ_ACCESS) -#define IOCTL_DVD_START_SESSION \ - CTL_CODE(IOCTL_DVD_BASE, 0x0400, METHOD_BUFFERED, FILE_READ_ACCESS) +#define IOCTL_AACS_END_SESSION \ + CTL_CODE(IOCTL_DVD_BASE, 0x433, METHOD_BUFFERED, FILE_READ_ACCESS) -#define IOCTL_DVD_SET_READ_AHEAD \ - CTL_CODE(IOCTL_DVD_BASE, 0x0404, METHOD_BUFFERED, FILE_READ_ACCESS) +#define IOCTL_AACS_SEND_CERTIFICATE \ + CTL_CODE(IOCTL_DVD_BASE, 0x434, METHOD_BUFFERED, FILE_READ_ACCESS) + +#define IOCTL_AACS_GET_CERTIFICATE \ + CTL_CODE(IOCTL_DVD_BASE, 0x435, METHOD_BUFFERED, FILE_READ_ACCESS) + +#define IOCTL_AACS_GET_CHALLENGE_KEY \ + CTL_CODE(IOCTL_DVD_BASE, 0x436, METHOD_BUFFERED, FILE_READ_ACCESS) + +#define IOCTL_AACS_SEND_CHALLENGE_KEY \ + CTL_CODE(IOCTL_DVD_BASE, 0x437, METHOD_BUFFERED, FILE_READ_ACCESS) + +#define IOCTL_AACS_READ_VOLUME_ID \ + CTL_CODE(IOCTL_DVD_BASE, 0x438, METHOD_BUFFERED, FILE_READ_ACCESS) + +#define IOCTL_AACS_READ_SERIAL_NUMBER \ + CTL_CODE(IOCTL_DVD_BASE, 0x439, METHOD_BUFFERED, FILE_READ_ACCESS) + +#define IOCTL_AACS_READ_MEDIA_ID \ + CTL_CODE(IOCTL_DVD_BASE, 0x43A, METHOD_BUFFERED, FILE_READ_ACCESS) + +#define IOCTL_AACS_READ_BINDING_NONCE \ + CTL_CODE(IOCTL_DVD_BASE, 0x43B, METHOD_BUFFERED, FILE_READ_ACCESS) + +#define IOCTL_AACS_GENERATE_BINDING_NONCE \ + CTL_CODE(IOCTL_DVD_BASE, 0x43C, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS) + +#define IOCTL_DVD_READ_STRUCTURE \ + CTL_CODE(IOCTL_DVD_BASE, 0x0450, METHOD_BUFFERED, FILE_READ_ACCESS) typedef ULONG DVD_SESSION_ID, *PDVD_SESSION_ID; typedef struct _STORAGE_SET_READ_AHEAD { - LARGE_INTEGER TriggerAddress; - LARGE_INTEGER TargetAddress; + LARGE_INTEGER TriggerAddress; + LARGE_INTEGER TargetAddress; } STORAGE_SET_READ_AHEAD, *PSTORAGE_SET_READ_AHEAD; typedef enum DVD_STRUCTURE_FORMAT { @@ -122,27 +161,27 @@ typedef struct _DVD_DISK_KEY_DESCRIPTOR { } DVD_DISK_KEY_DESCRIPTOR, *PDVD_DISK_KEY_DESCRIPTOR; typedef enum _DVD_KEY_TYPE { - DvdChallengeKey = 0x01, - DvdBusKey1, - DvdBusKey2, - DvdTitleKey, - DvdAsf, - DvdSetRpcKey = 0x6, - DvdGetRpcKey = 0x8, - DvdDiskKey = 0x80, - DvdInvalidateAGID = 0x3f + DvdChallengeKey = 0x01, + DvdBusKey1, + DvdBusKey2, + DvdTitleKey, + DvdAsf, + DvdSetRpcKey = 0x6, + DvdGetRpcKey = 0x8, + DvdDiskKey = 0x80, + DvdInvalidateAGID = 0x3f } DVD_KEY_TYPE; typedef struct _DVD_COPY_PROTECT_KEY { - ULONG KeyLength; - DVD_SESSION_ID SessionId; - DVD_KEY_TYPE KeyType; - ULONG KeyFlags; - union { - HANDLE FileHandle; - LARGE_INTEGER TitleOffset; - } Parameters; - UCHAR KeyData[0]; + ULONG KeyLength; + DVD_SESSION_ID SessionId; + DVD_KEY_TYPE KeyType; + ULONG KeyFlags; + union { + HANDLE FileHandle; + LARGE_INTEGER TitleOffset; + } Parameters; + UCHAR KeyData[0]; } DVD_COPY_PROTECT_KEY, *PDVD_COPY_PROTECT_KEY; #define DVD_CHALLENGE_KEY_LENGTH (12 + sizeof(DVD_COPY_PROTECT_KEY)) @@ -201,14 +240,93 @@ typedef struct _DVD_ASF { } DVD_ASF, *PDVD_ASF; typedef struct _DVD_REGION { - UCHAR CopySystem; - UCHAR RegionData; - UCHAR SystemRegion; - UCHAR ResetCount; + UCHAR CopySystem; + UCHAR RegionData; + UCHAR SystemRegion; + UCHAR ResetCount; } DVD_REGION, *PDVD_REGION; #ifdef __cplusplus } #endif +// for IOCTLS_AACS_* + +typedef _Field_range_(0,255) ULONG AACS_LAYER_NUMBER, *PAACS_LAYER_NUMBER; +typedef _Field_range_(0,255) const ULONG CAACS_LAYER_NUMBER, *PCAACS_LAYER_NUMBER; + +typedef struct _AACS_CERTIFICATE +{ + UCHAR Nonce[20]; + UCHAR Certificate[92]; +} AACS_CERTIFICATE, *PAACS_CERTIFICATE; +typedef const AACS_CERTIFICATE CAACS_CERTIFICATE, *PCAACS_CERTIFICATE; +C_ASSERT(sizeof(AACS_CERTIFICATE) == 112); + +typedef struct _AACS_CHALLENGE_KEY +{ + UCHAR EllipticCurvePoint[40]; + UCHAR Signature[40]; +} AACS_CHALLENGE_KEY, *PAACS_CHALLENGE_KEY; +typedef const AACS_CHALLENGE_KEY CAACS_CHALLENGE_KEY, *PCAACS_CHALLENGE_KEY; +C_ASSERT(sizeof(AACS_CHALLENGE_KEY) == 80); + +typedef struct _AACS_VOLUME_ID +{ + UCHAR VolumeID[16]; + UCHAR MAC[16]; +} AACS_VOLUME_ID, *PAACS_VOLUME_ID; +typedef const AACS_VOLUME_ID CAACS_VOLUME_ID, *PCAACS_VOLUME_ID; +C_ASSERT(sizeof(AACS_VOLUME_ID) == 32); + +typedef struct _AACS_SERIAL_NUMBER +{ + UCHAR PrerecordedSerialNumber[16]; + UCHAR MAC[16]; +} AACS_SERIAL_NUMBER, *PAACS_SERIAL_NUMBER; +typedef const AACS_SERIAL_NUMBER CAACS_SERIAL_NUMBER, *PCAACS_SERIAL_NUMBER; +C_ASSERT(sizeof(AACS_SERIAL_NUMBER) == 32); + +typedef struct _AACS_MEDIA_ID +{ + UCHAR MediaID[16]; + UCHAR MAC[16]; +} AACS_MEDIA_ID, *PAACS_MEDIA_ID; +typedef const AACS_MEDIA_ID CAACS_MEDIA_ID, *PCAACS_MEDIA_ID; +C_ASSERT(sizeof(AACS_MEDIA_ID) == 32); + +typedef struct _AACS_SEND_CERTIFICATE +{ + DVD_SESSION_ID SessionId; + AACS_CERTIFICATE Certificate; +} AACS_SEND_CERTIFICATE, *PAACS_SEND_CERTIFICATE; +typedef const AACS_SEND_CERTIFICATE CAACS_SEND_CERTIFICATE, *PCAACS_SEND_CERTIFICATE; + +typedef struct _AACS_SEND_CHALLENGE_KEY +{ + DVD_SESSION_ID SessionId; + AACS_CHALLENGE_KEY ChallengeKey; +} AACS_SEND_CHALLENGE_KEY, *PAACS_SEND_CHALLENGE_KEY; +typedef const AACS_SEND_CHALLENGE_KEY CAACS_SEND_CHALLENGE_KEY, *PCAACS_SEND_CHALLENGE_KEY; + +typedef struct _AACS_BINDING_NONCE +{ + UCHAR BindingNonce[16]; + UCHAR MAC[16]; +} AACS_BINDING_NONCE, *PAACS_BINDING_NONCE; +typedef const AACS_BINDING_NONCE CAACS_BINDING_NONCE, *PCAACS_BINDING_NONCE; +C_ASSERT(sizeof(AACS_BINDING_NONCE) == 32); + +typedef struct _AACS_READ_BINDING_NONCE +{ + DVD_SESSION_ID SessionId; + _Field_range_(0,255) ULONG NumberOfSectors; + ULONGLONG StartLba; + union + { + HANDLE Handle; + ULONGLONG ForceStructureLengthToMatch64bit; + }; +} AACS_READ_BINDING_NONCE, *PAACS_READ_BINDING_NONCE; + #endif /* _NTDDCDVD_ */ diff --git a/sdk/include/psdk/ntddmmc.h b/sdk/include/psdk/ntddmmc.h index f98368af13f..bb1c672a104 100644 --- a/sdk/include/psdk/ntddmmc.h +++ b/sdk/include/psdk/ntddmmc.h @@ -162,10 +162,10 @@ typedef struct _FEATURE_DATA_MORPHING { typedef struct _FEATURE_DATA_REMOVABLE_MEDIUM { FEATURE_HEADER Header; UCHAR Lockable:1; - UCHAR Reserved1:1; + UCHAR DBML:1; UCHAR DefaultToPrevent:1; UCHAR Eject:1; - UCHAR Reserved2:1; + UCHAR Load:1; UCHAR LoadingMechanism:3; UCHAR Reserved3[3]; } FEATURE_DATA_REMOVABLE_MEDIUM, *PFEATURE_DATA_REMOVABLE_MEDIUM; diff --git a/sdk/include/psdk/ntddstor.h b/sdk/include/psdk/ntddstor.h index c17954c6889..356e0b70a8b 100644 --- a/sdk/include/psdk/ntddstor.h +++ b/sdk/include/psdk/ntddstor.h @@ -80,6 +80,17 @@ DEFINE_GUID(GUID_DEVINTERFACE_HIDDEN_VOLUME, #endif /* defined(DEFINE_GUID) */ +#if defined(DEFINE_DEVPROPKEY) +DEFINE_DEVPROPKEY(DEVPKEY_Storage_Portable, 0x4d1ebee8, 0x803, 0x4774, 0x98, 0x42, 0xb7, 0x7d, 0xb5, 0x2, 0x65, 0xe9, 2); +DEFINE_DEVPROPKEY(DEVPKEY_Storage_Removable_Media, 0x4d1ebee8, 0x803, 0x4774, 0x98, 0x42, 0xb7, 0x7d, 0xb5, 0x2, 0x65, 0xe9, 3); +DEFINE_DEVPROPKEY(DEVPKEY_Storage_System_Critical, 0x4d1ebee8, 0x803, 0x4774, 0x98, 0x42, 0xb7, 0x7d, 0xb5, 0x2, 0x65, 0xe9, 4); +DEFINE_DEVPROPKEY(DEVPKEY_Storage_Disk_Number, 0x4d1ebee8, 0x803, 0x4774, 0x98, 0x42, 0xb7, 0x7d, 0xb5, 0x2, 0x65, 0xe9, 5); +DEFINE_DEVPROPKEY(DEVPKEY_Storage_Partition_Number, 0x4d1ebee8, 0x803, 0x4774, 0x98, 0x42, 0xb7, 0x7d, 0xb5, 0x2, 0x65, 0xe9, 6); +DEFINE_DEVPROPKEY(DEVPKEY_Storage_Mbr_Type, 0x4d1ebee8, 0x803, 0x4774, 0x98, 0x42, 0xb7, 0x7d, 0xb5, 0x2, 0x65, 0xe9, 7); +DEFINE_DEVPROPKEY(DEVPKEY_Storage_Gpt_Type, 0x4d1ebee8, 0x803, 0x4774, 0x98, 0x42, 0xb7, 0x7d, 0xb5, 0x2, 0x65, 0xe9, 8); +DEFINE_DEVPROPKEY(DEVPKEY_Storage_Gpt_Name, 0x4d1ebee8, 0x803, 0x4774, 0x98, 0x42, 0xb7, 0x7d, 0xb5, 0x2, 0x65, 0xe9, 9); +#endif + #ifndef _WINIOCTL_ #define IOCTL_STORAGE_BASE FILE_DEVICE_MASS_STORAGE @@ -808,7 +819,7 @@ typedef struct _STORAGE_PRIORITY_HINT_SUPPORT { #pragma warning(disable:4200) #endif -#if defined(_MSC_EXTENSIONS) +// #if defined(_MSC_EXTENSIONS) typedef struct _STORAGE_MEDIA_SERIAL_NUMBER_DATA { USHORT Reserved; @@ -835,7 +846,7 @@ typedef struct _PERSISTENT_RESERVE_COMMAND { } DUMMYUNIONNAME; } PERSISTENT_RESERVE_COMMAND, *PPERSISTENT_RESERVE_COMMAND; -#endif /* defined(_MSC_EXTENSIONS) */ +// #endif /* defined(_MSC_EXTENSIONS) */ #ifdef _MSC_VER #pragma warning(pop) /* disable:4200 */ @@ -1075,6 +1086,24 @@ typedef struct _STORAGE_IDLE_POWER { ULONG D3IdleTimeout; } STORAGE_IDLE_POWER, *PSTORAGE_IDLE_POWER; + +// for IOCTL_STORAGE_GET_IDLE_POWERUP_REASON + +typedef enum _STORAGE_POWERUP_REASON_TYPE { + StoragePowerupUnknown = 0, + StoragePowerupIO, + StoragePowerupDeviceAttention +} STORAGE_POWERUP_REASON_TYPE, *PSTORAGE_POWERUP_REASON_TYPE; + +typedef struct _STORAGE_IDLE_POWERUP_REASON +{ + ULONG Version; + ULONG Size; + STORAGE_POWERUP_REASON_TYPE PowerupReason; +} STORAGE_IDLE_POWERUP_REASON, *PSTORAGE_IDLE_POWERUP_REASON; + +#define STORAGE_IDLE_POWERUP_REASON_VERSION_V1 1 + #ifdef __cplusplus } #endif diff --git a/sdk/include/psdk/ntddvol.h b/sdk/include/psdk/ntddvol.h index 0b14c49af4d..0777b073a13 100644 --- a/sdk/include/psdk/ntddvol.h +++ b/sdk/include/psdk/ntddvol.h @@ -74,6 +74,8 @@ extern "C" { #define IOCTL_VOLUME_QUERY_FAILOVER_SET \ CTL_CODE(IOCTL_VOLUME_BASE, 6, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define IOCTL_VOLUME_POST_ONLINE \ + CTL_CODE(IOCTL_VOLUME_BASE, 25, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS) typedef struct _VOLUME_LOGICAL_OFFSET { LONGLONG LogicalOffset; @@ -100,32 +102,32 @@ typedef struct _VOLUME_GET_GPT_ATTRIBUTES_INFORMATION { } VOLUME_GET_GPT_ATTRIBUTES_INFORMATION, *PVOLUME_GET_GPT_ATTRIBUTES_INFORMATION; typedef struct _VOLUME_SET_GPT_ATTRIBUTES_INFORMATION { - ULONGLONG GptAttributes; - BOOLEAN RevertOnClose; - BOOLEAN ApplyToAllConnectedVolumes; - USHORT Reserved1; - ULONG Reserved2; + ULONGLONG GptAttributes; + BOOLEAN RevertOnClose; + BOOLEAN ApplyToAllConnectedVolumes; + USHORT Reserved1; + ULONG Reserved2; } VOLUME_SET_GPT_ATTRIBUTES_INFORMATION, *PVOLUME_SET_GPT_ATTRIBUTES_INFORMATION; typedef struct _DISK_EXTENT { - ULONG DiskNumber; - LARGE_INTEGER StartingOffset; - LARGE_INTEGER ExtentLength; + ULONG DiskNumber; + LARGE_INTEGER StartingOffset; + LARGE_INTEGER ExtentLength; } DISK_EXTENT, *PDISK_EXTENT; typedef struct _VOLUME_DISK_EXTENTS { - ULONG NumberOfDiskExtents; - DISK_EXTENT Extents[1]; + ULONG NumberOfDiskExtents; + DISK_EXTENT Extents[1]; } VOLUME_DISK_EXTENTS, *PVOLUME_DISK_EXTENTS; typedef struct _VOLUME_NUMBER { - ULONG VolumeNumber; - WCHAR VolumeManagerName[8]; + ULONG VolumeNumber; + WCHAR VolumeManagerName[8]; } VOLUME_NUMBER, *PVOLUME_NUMBER; typedef struct _VOLUME_FAILOVER_SET { - ULONG NumberOfDisks; - ULONG DiskNumbers[1]; + ULONG NumberOfDisks; + ULONG DiskNumbers[1]; } VOLUME_FAILOVER_SET, *PVOLUME_FAILOVER_SET; #ifdef __cplusplus diff --git a/sdk/include/psdk/sal.h b/sdk/include/psdk/sal.h index 2fb7d3a2c8d..6b865345224 100644 --- a/sdk/include/psdk/sal.h +++ b/sdk/include/psdk/sal.h @@ -191,7 +191,7 @@ #else -// Disable expansion of SAL macros in non-Prefast mode to +// Disable expansion of SAL macros in non-Prefast mode to // improve compiler throughput. #ifndef _USE_DECLSPECS_FOR_SAL // [ #define _USE_DECLSPECS_FOR_SAL 0 @@ -436,7 +436,7 @@ enum __SAL_YesNo {_SAL_notpresent, _SAL_no, _SAL_maybe, _SAL_yes, _SAL_default}; #define _Outptr_result_maybenull_z_ _SAL2_Source_(_Outptr_result_maybenull_z_, (), _Out_impl_ _Deref_post_opt_z_) #define _Outptr_opt_result_maybenull_z_ _SAL2_Source_(_Outptr_opt_result_maybenull_z_, (), _Out_opt_impl_ _Deref_post_opt_z_) -// Annotations for _Outptr_ parameters where the output pointer is set to NULL if the function fails. +// Annotations for _Outptr_ parameters where the output pointer is set to NULL if the function fails. #define _Outptr_result_nullonfailure_ _SAL2_Source_(_Outptr_result_nullonfailure_, (), _Outptr_ _On_failure_(_Deref_post_null_)) #define _Outptr_opt_result_nullonfailure_ _SAL2_Source_(_Outptr_opt_result_nullonfailure_, (), _Outptr_opt_ _On_failure_(_Deref_post_null_)) @@ -787,10 +787,10 @@ enum __SAL_YesNo {_SAL_notpresent, _SAL_no, _SAL_maybe, _SAL_yes, _SAL_default}; with _Out_. The default unit is elements. Use 'bytecap' if the size is given in bytes 'count' describes the readable size of the buffer and is typically used with _In_. The default unit is elements. Use 'bytecount' if the size is given in bytes. - + Argument syntax for cap_, bytecap_, count_, bytecount_: (<parameter>|return)[+n] e.g. cch, return, cb+2 - + If the buffer size is a constant expression use the c_ postfix. E.g. cap_c_(20), count_c_(MAX_PATH), bytecount_c_(16) @@ -911,7 +911,7 @@ enum __SAL_YesNo {_SAL_notpresent, _SAL_no, _SAL_maybe, _SAL_yes, _SAL_default}; #define _Out_z_bytecap_post_bytecount_(cap,count) _SAL1_1_Source_(_Out_z_bytecap_post_bytecount_, (cap,count), _Pre_bytecap_(cap) _Post_valid_impl_ _Post_z_bytecount_(count)) #define _Out_opt_z_bytecap_post_bytecount_(cap,count) _SAL1_1_Source_(_Out_opt_z_bytecap_post_bytecount_, (cap,count), _Pre_opt_bytecap_(cap) _Post_valid_impl_ _Post_z_bytecount_(count)) -// only use with dereferenced arguments e.g. '*pcch' +// only use with dereferenced arguments e.g. '*pcch' #define _Out_capcount_(capcount) _SAL1_1_Source_(_Out_capcount_, (capcount), _Pre_cap_(capcount) _Post_valid_impl_ _Post_count_(capcount)) #define _Out_opt_capcount_(capcount) _SAL1_1_Source_(_Out_opt_capcount_, (capcount), _Pre_opt_cap_(capcount) _Post_valid_impl_ _Post_count_(capcount)) #define _Out_bytecapcount_(capcount) _SAL1_1_Source_(_Out_bytecapcount_, (capcount), _Pre_bytecap_(capcount) _Post_valid_impl_ _Post_bytecount_(capcount)) @@ -1080,7 +1080,7 @@ enum __SAL_YesNo {_SAL_notpresent, _SAL_no, _SAL_maybe, _SAL_yes, _SAL_default}; #define _Deref_pre_valid_bytecap_x_(size) _SAL1_1_Source_(_Deref_pre_valid_bytecap_x_, (size), _Deref_pre1_impl_(__notnull_impl_notref) _Deref_pre1_impl_(__bytecap_x_impl(size)) _Pre_valid_impl_) #define _Deref_pre_opt_valid_bytecap_x_(size) _SAL1_1_Source_(_Deref_pre_opt_valid_bytecap_x_, (size), _Deref_pre1_impl_(__maybenull_impl_notref) _Deref_pre1_impl_(__bytecap_x_impl(size)) _Pre_valid_impl_) -// e.g. void SaveMatrix( _In_count_(n) _Deref_pre_count_(n) const Elem** matrix, size_t n ); +// e.g. void SaveMatrix( _In_count_(n) _Deref_pre_count_(n) const Elem** matrix, size_t n ); // valid buffer extent is described by another parameter #define _Deref_pre_count_(size) _SAL1_1_Source_(_Deref_pre_count_, (size), _Deref_pre1_impl_(__notnull_impl_notref) _Deref_pre1_impl_(__count_impl(size)) _Pre_valid_impl_) #define _Deref_pre_opt_count_(size) _SAL1_1_Source_(_Deref_pre_opt_count_, (size), _Deref_pre1_impl_(__maybenull_impl_notref) _Deref_pre1_impl_(__count_impl(size)) _Pre_valid_impl_) @@ -1161,12 +1161,12 @@ enum __SAL_YesNo {_SAL_notpresent, _SAL_no, _SAL_maybe, _SAL_yes, _SAL_default}; #define _Deref_post_opt_valid_cap_(size) _SAL1_1_Source_(_Deref_post_opt_valid_cap_, (size), _Deref_post1_impl_(__maybenull_impl_notref) _Deref_post1_impl_(__cap_impl(size)) _Post_valid_impl_) #define _Deref_post_valid_bytecap_(size) _SAL1_1_Source_(_Deref_post_valid_bytecap_, (size), _Deref_post1_impl_(__notnull_impl_notref) _Deref_post1_impl_(__bytecap_impl(size)) _Post_valid_impl_) #define _Deref_post_opt_valid_bytecap_(size) _SAL1_1_Source_(_Deref_post_opt_valid_bytecap_, (size), _Deref_post1_impl_(__maybenull_impl_notref) _Deref_post1_impl_(__bytecap_impl(size)) _Post_valid_impl_) - + #define _Deref_post_valid_cap_c_(size) _SAL1_1_Source_(_Deref_post_valid_cap_c_, (size), _Deref_post1_impl_(__notnull_impl_notref) _Deref_post1_impl_(__cap_c_impl(size)) _Post_valid_impl_) #define _Deref_post_opt_valid_cap_c_(size) _SAL1_1_Source_(_Deref_post_opt_valid_cap_c_, (size), _Deref_post1_impl_(__maybenull_impl_notref) _Deref_post1_impl_(__cap_c_impl(size)) _Post_valid_impl_) #define _Deref_post_valid_bytecap_c_(size) _SAL1_1_Source_(_Deref_post_valid_bytecap_c_, (size), _Deref_post1_impl_(__notnull_impl_notref) _Deref_post1_impl_(__bytecap_c_impl(size)) _Post_valid_impl_) #define _Deref_post_opt_valid_bytecap_c_(size) _SAL1_1_Source_(_Deref_post_opt_valid_bytecap_c_, (size), _Deref_post1_impl_(__maybenull_impl_notref) _Deref_post1_impl_(__bytecap_c_impl(size)) _Post_valid_impl_) - + #define _Deref_post_valid_cap_x_(size) _SAL1_1_Source_(_Deref_post_valid_cap_x_, (size), _Deref_post1_impl_(__notnull_impl_notref) _Deref_post1_impl_(__cap_x_impl(size)) _Post_valid_impl_) #define _Deref_post_opt_valid_cap_x_(size) _SAL1_1_Source_(_Deref_post_opt_valid_cap_x_, (size), _Deref_post1_impl_(__maybenull_impl_notref) _Deref_post1_impl_(__cap_x_impl(size)) _Post_valid_impl_) #define _Deref_post_valid_bytecap_x_(size) _SAL1_1_Source_(_Deref_post_valid_bytecap_x_, (size), _Deref_post1_impl_(__notnull_impl_notref) _Deref_post1_impl_(__bytecap_x_impl(size)) _Post_valid_impl_) @@ -1489,7 +1489,7 @@ enum __SAL_YesNo {_SAL_notpresent, _SAL_no, _SAL_maybe, _SAL_yes, _SAL_default}; // not required to be a legal standalone annotation, and in the case // of attribute annotations, usually is not. (In the case of some declspec // annotations, it might be, but it should not be assumed so.) Those -// symols will be used in the _PreN..., _PostN... and _RetN... annotations +// symols will be used in the _PreN..., _PostN... and _RetN... annotations // to build up more complete annotations. // A symbol ending in _impl_ is reserved to the implementation as well, @@ -1603,7 +1603,7 @@ enum __SAL_YesNo {_SAL_notpresent, _SAL_no, _SAL_maybe, _SAL_yes, _SAL_default}; // Done this way so that they don't appear in the regular compiler's // namespace. #define __ANNOTATION(fun) _SA_annotes0(SAL_annotation) void __SA_##fun - + #define __PRIMOP(type, fun) _SA_annotes0(SAL_primop) type __SA_##fun #define __QUALIFIER(fun) _SA_annotes0(SAL_qualifier) void __SA_##fun; @@ -1619,9 +1619,9 @@ enum __SAL_YesNo {_SAL_notpresent, _SAL_no, _SAL_maybe, _SAL_yes, _SAL_default}; #define _SA_annotes2(n,pp1,pp2) #define _SA_annotes3(n,pp1,pp2,pp3) -#define __ANNOTATION(fun) -#define __PRIMOP(type, fun) -#define __QUALIFIER(type, fun) +#define __ANNOTATION(fun) +#define __PRIMOP(type, fun) +#define __QUALIFIER(type, fun) #endif // ] @@ -2124,15 +2124,15 @@ typedef struct __F_ __F_; #define _Pre3_impl_(p1,p2,p3) #define _Post_impl_ -#define _Post1_impl_(p1) +#define _Post1_impl_(p1) #define _Post2_impl_(p1,p2) #define _Post3_impl_(p1,p2,p3) -#define _Ret1_impl_(p1) +#define _Ret1_impl_(p1) #define _Ret2_impl_(p1,p2) #define _Ret3_impl_(p1,p2,p3) -#define _Deref_pre1_impl_(p1) +#define _Deref_pre1_impl_(p1) #define _Deref_pre2_impl_(p1,p2) #define _Deref_pre3_impl_(p1,p2,p3) @@ -2164,7 +2164,7 @@ typedef struct __F_ __F_; // This section contains the deprecated annotations -/* +/* ------------------------------------------------------------------------------- Introduction @@ -2355,7 +2355,7 @@ typedef struct __F_ __F_; ------------------------------------------------------------------------------- Advanced Annotation Examples - __success(return != FALSE) LWSTDAPI_(BOOL) + __success(return != FALSE) LWSTDAPI_(BOOL) PathCanonicalizeA(__out_ecount(MAX_PATH) LPSTR pszBuf, LPCSTR pszPath) : pszBuf is only guaranteed to be NULL-terminated when TRUE is returned. @@ -2391,8 +2391,8 @@ extern "C" { */ /* - The helper annotations are only understood by the compiler version used by - various defect detection tools. When the regular compiler is running, they + The helper annotations are only understood by the compiler version used by + various defect detection tools. When the regular compiler is running, they are defined into nothing, and do not affect the compiled code. */ @@ -2411,7 +2411,7 @@ extern "C" { __null p __notnull p __maybenull p - + Annotates a pointer p. States that pointer p is null. Commonly used in the negated form __notnull or the possibly null form __maybenull. */ @@ -2426,7 +2426,7 @@ extern "C" { __readonly l __notreadonly l __mabyereadonly l - + Annotates a location l. States that location l is not modified after this point. If the annotation is placed on the precondition state of a function, the restriction only applies until the postcondition state @@ -2443,7 +2443,7 @@ extern "C" { __valid v __notvalid v __maybevalid v - + Annotates any value v. States that the value satisfies all properties of valid values of its type. For example, for a string buffer, valid means that the buffer pointer is either NULL or points to a NULL-terminated string. @@ -2455,7 +2455,7 @@ extern "C" { /* __readableTo(extent) p - + Annotates a buffer pointer p. If the buffer can be read, extent describes how much of the buffer is readable. For a reader of the buffer, this is an explicit permission to read up to that amount, rather than a restriction to @@ -2465,24 +2465,24 @@ extern "C" { #define __readableTo(extent) _SA_annotes1(SAL_readableTo, extent) /* - + __elem_readableTo(size) - + Annotates a buffer pointer p as being readable to size elements. */ #define __elem_readableTo(size) _SA_annotes1(SAL_readableTo, elementCount( size )) - + /* __byte_readableTo(size) - + Annotates a buffer pointer p as being readable to size bytes. */ #define __byte_readableTo(size) _SA_annotes1(SAL_readableTo, byteCount(size)) - + /* __writableTo(extent) p - + Annotates a buffer pointer p. If the buffer can be modified, extent describes how much of the buffer is writable (usually the allocation size). For a writer of the buffer, this is an explicit permission to @@ -2492,45 +2492,45 @@ extern "C" { /* __elem_writableTo(size) - + Annotates a buffer pointer p as being writable to size elements. */ #define __elem_writableTo(size) _SA_annotes1(SAL_writableTo, elementCount( size )) - + /* __byte_writableTo(size) - + Annotates a buffer pointer p as being writable to size bytes. */ #define __byte_writableTo(size) _SA_annotes1(SAL_writableTo, byteCount( size)) /* __deref p - + Annotates a pointer p. The next annotation applies one dereference down in the type. If readableTo(p, size) then the next annotation applies to all elements *(p+i) for which i satisfies the size. If p is a pointer to a struct, the next annotation applies to all fields of the struct. */ #define __deref _Deref_impl_ - + /* __pre __next_annotation - + The next annotation applies in the precondition state */ #define __pre _Pre_impl_ - + /* __post __next_annotation - + The next annotation applies in the postcondition state */ #define __post _Post_impl_ - + /* __precond(<expr>) - + When <expr> is true, the next annotation applies in the precondition state (currently not enabled) */ @@ -2538,7 +2538,7 @@ extern "C" { /* __postcond(<expr>) - + When <expr> is true, the next annotation applies in the postcondition state (currently not enabled) */ @@ -2546,26 +2546,26 @@ extern "C" { /* __exceptthat - + Given a set of annotations Q containing __exceptthat maybeP, the effect of the except clause is to erase any P or notP annotations (explicit or implied) within Q at the same level of dereferencing that the except clause appears, and to replace it with maybeP. - + Example 1: __valid __pre_except_maybenull on a pointer p means that the pointer may be null, and is otherwise valid, thus overriding the implicit notnull annotation implied by __valid on pointers. - + Example 2: __valid __deref __pre_except_maybenull on an int **p means that p is not null (implied by valid), but the elements - pointed to by p could be null, and are otherwise valid. + pointed to by p could be null, and are otherwise valid. */ #define __exceptthat __inner_exceptthat - + /* _refparam - + Added to all out parameter macros to indicate that they are all reference parameters. */ @@ -2573,16 +2573,16 @@ extern "C" { /* __inner_* - + Helper macros that directly correspond to certain high-level annotations. - + */ /* Macros to classify the entrypoints and indicate their category. - + Pre-defined control point categories include: RPC, LPC, DeviceDriver, UserToKernel, ISAPI, COM. - + */ #define __inner_control_entrypoint(category) _SA_annotes2(SAL_entrypoint, controlEntry, category) @@ -2651,7 +2651,7 @@ extern "C" { #endif /* #if !defined(__midl) && defined(_PREFAST_) */ // ] -/* +/* ------------------------------------------------------------------------------- Buffer Annotation Definitions @@ -2667,6 +2667,10 @@ buffer, use the table in the buffer annotations section. #define __out _SAL1_Source_(__out, (), _Out_) #endif // !PAL_STDCPP_COMPAT +#define __in_xcount(size) _SAL1_Source_(__in_xcount, (size), __in _Pre_ __inexpressible_readableTo(size)) +#define __in_xcount_opt(size) _SAL1_Source_(__in_xcount_opt, (size), __in_xcount(size) __exceptthat __maybenull) +#define __out_xcount(size) _SAL1_Source_(__out_xcount, (size), __xcount(size) _Post_ __valid __refparam) + #define __ecount(size) _SAL1_Source_(__ecount, (size), __notnull __elem_writableTo(size)) #define __bcount(size) _SAL1_Source_(__bcount, (size), __notnull __byte_writableTo(size)) #define __in_ecount(size) _SAL1_Source_(__in_ecount, (size), _In_reads_(size)) @@ -2880,7 +2884,7 @@ of each annotation, see the advanced annotations section. #define __data_entrypoint(category) __inner_data_entrypoint(category) #define __useHeader _Use_decl_anno_impl_ #define __on_failure(annotes) _On_failure_impl_(annotes _SAL_nop_impl_) - + #ifndef __fallthrough // [ __inner_fallthrough_dec #define __fallthrough __inner_fallthrough @@ -2890,7 +2894,7 @@ of each annotation, see the advanced annotations section. #ifdef _PREFAST_ // [ #define __analysis_assume(expr) __assume(expr) #else // ][ -#define __analysis_assume(expr) +#define __analysis_assume(expr) #endif // ] #endif // ] @@ -2898,14 +2902,14 @@ of each annotation, see the advanced annotations section. #ifdef _PREFAST_ // [ #define _Analysis_assume_(expr) __assume(expr) #else // ][ -#define _Analysis_assume_(expr) +#define _Analysis_assume_(expr) #endif // ] #endif // ] #define _Analysis_noreturn_ _SAL2_Source_(_Analysis_noreturn_, (), _SA_annotes0(SAL_terminates)) #ifdef _PREFAST_ // [ -__inline __nothrow +__inline __nothrow void __AnalysisAssumeNullterminated(_Post_ __nullterminated void *p); #define _Analysis_assume_nullterminated_(x) __AnalysisAssumeNullterminated(x) diff --git a/sdk/include/psdk/specstrings.h b/sdk/include/psdk/specstrings.h index 071324f7545..33a13e340f1 100644 --- a/sdk/include/psdk/specstrings.h +++ b/sdk/include/psdk/specstrings.h @@ -48,6 +48,13 @@ #define __nullnullterminated #define __in_data_source(src_sym) #define __kernel_entry +#define __range(lb,ub) +#define __in_bound +#define __out_bound +#define __in_range(lb,ub) +#define __out_range(lb,ub) +#define __deref_in_range(lb,ub) +#define __deref_out_range(lb,ub) #if (_MSC_VER >= 1000) && !defined(__midl) && defined(_PREFAST_) diff --git a/sdk/include/psdk/winapifamily.h b/sdk/include/psdk/winapifamily.h new file mode 100644 index 00000000000..58bd80220b1 --- /dev/null +++ b/sdk/include/psdk/winapifamily.h @@ -0,0 +1,71 @@ +#ifndef _WINAPIFAMILY_H_ +#define _WINAPIFAMILY_H_ + +#include <winpackagefamily.h> + +#define WINAPI_FAMILY_PC_APP 2 +#define WINAPI_FAMILY_PHONE_APP 3 +#define WINAPI_FAMILY_SYSTEM 4 +#define WINAPI_FAMILY_SERVER 5 +#define WINAPI_FAMILY_GAMES 6 +#define WINAPI_FAMILY_DESKTOP_APP 100 + +#define WINAPI_FAMILY_APP WINAPI_FAMILY_PC_APP + +#ifndef WINAPI_FAMILY +#define WINAPI_FAMILY WINAPI_FAMILY_DESKTOP_APP +#endif + +#if WINAPI_FAMILY != WINAPI_FAMILY_DESKTOP_APP && \ + WINAPI_FAMILY != WINAPI_FAMILY_PC_APP && \ + WINAPI_FAMILY != WINAPI_FAMILY_PHONE_APP && \ + WINAPI_FAMILY != WINAPI_FAMILY_SYSTEM && \ + WINAPI_FAMILY != WINAPI_FAMILY_GAMES && \ + WINAPI_FAMILY != WINAPI_FAMILY_SERVER +#error Unknown WINAPI_FAMILY value? +#endif + +#ifndef WINAPI_PARTITION_DESKTOP +#define WINAPI_PARTITION_DESKTOP (WINAPI_FAMILY == WINAPI_FAMILY_DESKTOP_APP) +#endif + +#ifndef WINAPI_PARTITION_APP +#define WINAPI_PARTITION_APP \ + (WINAPI_FAMILY == WINAPI_FAMILY_DESKTOP_APP || \ + WINAPI_FAMILY == WINAPI_FAMILY_PC_APP || \ + WINAPI_FAMILY == WINAPI_FAMILY_PHONE_APP) +#endif + +#ifndef WINAPI_PARTITION_PC_APP +#define WINAPI_PARTITION_PC_APP \ + (WINAPI_FAMILY == WINAPI_FAMILY_DESKTOP_APP || \ + WINAPI_FAMILY == WINAPI_FAMILY_PC_APP) +#endif + +#ifndef WINAPI_PARTITION_PHONE_APP +#define WINAPI_PARTITION_PHONE_APP (WINAPI_FAMILY == WINAPI_FAMILY_PHONE_APP) +#endif + +#ifndef WINAPI_PARTITION_GAMES +#define WINAPI_PARTITION_GAMES \ + (WINAPI_FAMILY == WINAPI_FAMILY_GAMES || \ + WINAPI_FAMILY == WINAPI_FAMILY_DESKTOP_APP) +#endif + +#ifndef WINAPI_PARTITION_SYSTEM +#define WINAPI_PARTITION_SYSTEM \ + (WINAPI_FAMILY == WINAPI_FAMILY_SYSTEM || \ + WINAPI_FAMILY == WINAPI_FAMILY_SERVER) +#endif + +#define WINAPI_PARTITION_PHONE WINAPI_PARTITION_PHONE_APP + +#define WINAPI_FAMILY_PARTITION(Partitions) (Partitions) + +#define _WINAPI_DEPRECATED_DECLARATION + +#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) && !WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) +#define APP_DEPRECATED_HRESULT HRESULT _WINAPI_DEPRECATED_DECLARATION +#endif + +#endif // _WINAPIFAMILY_H_ diff --git a/sdk/include/psdk/winpackagefamily.h b/sdk/include/psdk/winpackagefamily.h new file mode 100644 index 00000000000..5849729bd6f --- /dev/null +++ b/sdk/include/psdk/winpackagefamily.h @@ -0,0 +1,56 @@ +#ifndef _WINPACKAGEFAMILY_H_ +#define _WINPACKAGEFAMILY_H_ + +#ifndef WINAPI_PARTITION_SERVER +#define WINAPI_PARTITION_SERVER (WINAPI_FAMILY == WINAPI_FAMILY_SERVER) +#endif + +#undef WINAPI_PARTITION_PKG_WINTRUST +#undef WINAPI_PARTITION_PKG_WEBSERVICES +#undef WINAPI_PARTITION_PKG_EVENTLOGSERVICE +#undef WINAPI_PARTITION_PKG_VHD +#undef WINAPI_PARTITION_PKG_PERFCOUNTER +#undef WINAPI_PARTITION_PKG_SECURESTARTUP +#undef WINAPI_PARTITION_PKG_REMOTEFS +#undef WINAPI_PARTITION_PKG_BOOTABLESKU +#undef WINAPI_PARTITION_PKG_CMDTOOLS +#undef WINAPI_PARTITION_PKG_DISM +#undef WINAPI_PARTITION_PKG_CORESETUP +#undef WINAPI_PARTITION_PKG_APPRUNTIME +#undef WINAPI_PARTITION_PKG_ESENT +#undef WINAPI_PARTITION_PKG_WINMGMT +#undef WINAPI_PARTITION_PKG_WNV +#undef WINAPI_PARTITION_PKG_CLUSTER +#undef WINAPI_PARTITION_PKG_VSS +#undef WINAPI_PARTITION_PKG_TRAFFIC +#undef WINAPI_PARTITION_PKG_ISCSI +#undef WINAPI_PARTITION_PKG_STORAGE +#undef WINAPI_PARTITION_PKG_MPSSVC +#undef WINAPI_PARTITION_PKG_APPXDEPLOYMENT +#undef WINAPI_PARTITION_PKG_WER + +#define WINAPI_PARTITION_PKG_WINTRUST (WINAPI_PARTITION_SERVER == 1) +#define WINAPI_PARTITION_PKG_WEBSERVICES (WINAPI_PARTITION_SERVER == 1) +#define WINAPI_PARTITION_PKG_EVENTLOGSERVICE (WINAPI_PARTITION_SERVER == 1) +#define WINAPI_PARTITION_PKG_VHD (WINAPI_PARTITION_SERVER == 1) +#define WINAPI_PARTITION_PKG_PERFCOUNTER (WINAPI_PARTITION_SERVER == 1) +#define WINAPI_PARTITION_PKG_SECURESTARTUP (WINAPI_PARTITION_SERVER == 1) +#define WINAPI_PARTITION_PKG_REMOTEFS (WINAPI_PARTITION_SERVER == 1) +#define WINAPI_PARTITION_PKG_BOOTABLESKU (WINAPI_PARTITION_SERVER == 1) +#define WINAPI_PARTITION_PKG_CMDTOOLS (WINAPI_PARTITION_SERVER == 1) +#define WINAPI_PARTITION_PKG_DISM (WINAPI_PARTITION_SERVER == 1) +#define WINAPI_PARTITION_PKG_CORESETUP (WINAPI_PARTITION_SERVER == 1) +#define WINAPI_PARTITION_PKG_APPRUNTIME (WINAPI_PARTITION_SERVER == 1) +#define WINAPI_PARTITION_PKG_ESENT (WINAPI_PARTITION_SERVER == 1) +#define WINAPI_PARTITION_PKG_WINMGMT (WINAPI_PARTITION_SERVER == 1) +#define WINAPI_PARTITION_PKG_WNV (WINAPI_PARTITION_SERVER == 1) +#define WINAPI_PARTITION_PKG_CLUSTER (WINAPI_PARTITION_SERVER == 1) +#define WINAPI_PARTITION_PKG_VSS (WINAPI_PARTITION_SERVER == 1) +#define WINAPI_PARTITION_PKG_TRAFFIC (WINAPI_PARTITION_SERVER == 1) +#define WINAPI_PARTITION_PKG_ISCSI (WINAPI_PARTITION_SERVER == 1) +#define WINAPI_PARTITION_PKG_STORAGE (WINAPI_PARTITION_SERVER == 1) +#define WINAPI_PARTITION_PKG_MPSSVC (WINAPI_PARTITION_SERVER == 1) +#define WINAPI_PARTITION_PKG_APPXDEPLOYMENT (WINAPI_PARTITION_SERVER == 1) +#define WINAPI_PARTITION_PKG_WER (WINAPI_PARTITION_SERVER == 1) + +#endif // _WINPACKAGEFAMILY_H_

1 0

[reactos] 01/01: [DDK] Add definitions required for newer storage class drivers (cdrom)
by Victor Perevertkin 24 Sep '20

24 Sep '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d7d716a64c0757ed1b323… commit d7d716a64c0757ed1b3238d8a96e7d85c0160c0f Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Thu Sep 24 05:47:48 2020 +0300 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Thu Sep 24 05:47:48 2020 +0300 [DDK] Add definitions required for newer storage class drivers (cdrom) CORE-17129 --- sdk/include/ddk/scsi.h | 1 + sdk/include/ddk/usbdlib.h | 16 ++++++++++++++-- sdk/include/ddk/wdmguid.h | 4 ++++ 3 files changed, 19 insertions(+), 2 deletions(-) diff --git a/sdk/include/ddk/scsi.h b/sdk/include/ddk/scsi.h index 42027d5b84d..465880aee76 100644 --- a/sdk/include/ddk/scsi.h +++ b/sdk/include/ddk/scsi.h @@ -113,6 +113,7 @@ extern "C" { #define NOTIFICATION_BUSY_EVENT_NO_EVENT 0x0 #define NOTIFICATION_BUSY_EVENT_NO_CHANGE 0x0 #define NOTIFICATION_BUSY_EVENT_BUSY 0x1 +#define NOTIFICATION_BUSY_EVENT_LO_CHANGE 0x2 #define NOTIFICATION_BUSY_STATUS_NO_EVENT 0x0 #define NOTIFICATION_BUSY_STATUS_POWER 0x1 diff --git a/sdk/include/ddk/usbdlib.h b/sdk/include/ddk/usbdlib.h index 0a05d83ee70..3530ed9c108 100644 --- a/sdk/include/ddk/usbdlib.h +++ b/sdk/include/ddk/usbdlib.h @@ -89,11 +89,24 @@ typedef struct _USBD_INTERFACE_LIST_ENTRY { (urb)->UrbOSFeatureDescriptorRequest.TransferBuffer = (transferBuffer); \ (urb)->UrbOSFeatureDescriptorRequest.InterfaceNumber = (interface); \ (urb)->UrbOSFeatureDescriptorRequest.MS_FeatureDescriptorIndex = (index); \ - urb)->UrbOSFeatureDescriptorRequest.UrbLink = (link); \ + (urb)->UrbOSFeatureDescriptorRequest.UrbLink = (link); \ } #endif /* NTDDI_VERSION >= NTDDI_WINXP */ +#if (NTDDI_VERSION >= NTDDI_VISTA) + +#define USBD_CLIENT_CONTRACT_VERSION_INVALID 0xFFFFFFFF +#define USBD_CLIENT_CONTRACT_VERSION_602 0x602 + +#define USBD_INTERFACE_VERSION_600 0x600 +#define USBD_INTERFACE_VERSION_602 0x602 +#define USBD_INTERFACE_VERSION_603 0x603 + +DECLARE_HANDLE(USBD_HANDLE); + +#endif // NTDDI_VISTA + #define URB_STATUS(urb) ((urb)->UrbHeader.Status) #define GET_SELECT_CONFIGURATION_REQUEST_SIZE(totalInterfaces, totalPipes) \ @@ -230,4 +243,3 @@ USBD_ValidateConfigurationDescriptor( #endif #endif /* ! _USBD_ */ - diff --git a/sdk/include/ddk/wdmguid.h b/sdk/include/ddk/wdmguid.h index dadbddb7dcb..57b54cd1877 100644 --- a/sdk/include/ddk/wdmguid.h +++ b/sdk/include/ddk/wdmguid.h @@ -74,6 +74,10 @@ DEFINE_GUID(GUID_ACPI_PORT_RANGES_INTERFACE_STANDARD, 0xf14f609b, 0xcbbd, 0x4957, 0xa6, 0x74, 0xbc, 0x00, 0x21, 0x3f, 0x1c, 0x97); DEFINE_GUID(GUID_PNP_LOCATION_INTERFACE, 0x70211b0e, 0x0afb, 0x47db, 0xaf, 0xc1, 0x41, 0x0b, 0xf8, 0x42, 0x49, 0x7a); +DEFINE_GUID(GUID_D3COLD_SUPPORT_INTERFACE, + 0xb38290e5, 0x3cd0, 0x4f9d, 0x99, 0x37, 0xf5, 0xfe, 0x2b, 0x44, 0xd4, 0x7a); +DEFINE_GUID(GUID_REENUMERATE_SELF_INTERFACE_STANDARD, + 0x2aeb0243, 0x6a6e, 0x486b, 0x82, 0xfc, 0xd8, 0x15, 0xf6, 0xb9, 0x70, 0x06); DEFINE_GUID(GUID_BUS_TYPE_INTERNAL, 0x1530ea73, 0x086b, 0x11d1, 0xa0, 0x9f, 0x00, 0xc0, 0x4f, 0xc3, 0x40, 0xb1);

1 0

[reactos] 01/01: [XDK] Move UNREACHABLE macro definition to ntbasedef.h
by Victor Perevertkin 24 Sep '20

24 Sep '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f7c58468f1ae94ae11c32… commit f7c58468f1ae94ae11c3285398bd68cc76484a57 Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Thu Sep 24 05:35:43 2020 +0300 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Thu Sep 24 05:35:43 2020 +0300 [XDK] Move UNREACHABLE macro definition to ntbasedef.h --- ntoskrnl/include/internal/i386/trap_x.h | 5 ----- sdk/include/xdk/ntbasedef.h | 8 ++++++++ 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/ntoskrnl/include/internal/i386/trap_x.h b/ntoskrnl/include/internal/i386/trap_x.h index cd79c2a40c4..1f1e96f04d0 100644 --- a/ntoskrnl/include/internal/i386/trap_x.h +++ b/ntoskrnl/include/internal/i386/trap_x.h @@ -9,12 +9,7 @@ #pragma once #if defined(_MSC_VER) -#define UNREACHABLE __assume(0) #define __builtin_expect(a,b) (a) -#elif defined(__GNUC__) -#define UNREACHABLE __builtin_unreachable() -#else -#error #endif // diff --git a/sdk/include/xdk/ntbasedef.h b/sdk/include/xdk/ntbasedef.h index 2118935a35c..c87be90a7a0 100644 --- a/sdk/include/xdk/ntbasedef.h +++ b/sdk/include/xdk/ntbasedef.h @@ -800,6 +800,14 @@ $endif(_WINNT_) #define DEFAULT_UNREACHABLE default: break #endif +#if defined(__GNUC__) || defined(__clang__) + #define UNREACHABLE __builtin_unreachable() +#elif defined(_MSC_VER) + #define UNREACHABLE __assume(0) +#else + #define UNREACHABLE +#endif + #define VER_WORKSTATION_NT 0x40000000 #define VER_SERVER_NT 0x80000000 #define VER_SUITE_SMALLBUSINESS 0x00000001

1 0

[reactos] 01/01: [SDK] Fix __forceinline definition for C++
by Victor Perevertkin 24 Sep '20

24 Sep '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=87a5311116764f1a834c4… commit 87a5311116764f1a834c45ef35861612e18eb372 Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Thu Sep 24 05:33:35 2020 +0300 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Thu Sep 24 05:33:35 2020 +0300 [SDK] Fix __forceinline definition for C++ --- sdk/include/crt/_mingw.h | 10 +++++++--- sdk/include/psdk/intsafe.h | 8 -------- sdk/include/xdk/ntbasedef.h | 8 +------- 3 files changed, 8 insertions(+), 18 deletions(-) diff --git a/sdk/include/crt/_mingw.h b/sdk/include/crt/_mingw.h index b63e0b3b17a..06a304d9605 100644 --- a/sdk/include/crt/_mingw.h +++ b/sdk/include/crt/_mingw.h @@ -190,10 +190,14 @@ allow GCC to optimize away some EH unwind code, at least in DW2 case. */ # endif # define __ptr32 # define __ptr64 -# if ( __MINGW_GNUC_PREREQ(4, 3) && __STDC_VERSION__ >= 199901L) -# define __forceinline extern inline __attribute__((__always_inline__,__gnu_inline__)) +# ifdef __cplusplus +# define __forceinline inline __attribute__((__always_inline__)) # else -# define __forceinline extern __inline__ __attribute__((__always_inline__)) +# if ( __MINGW_GNUC_PREREQ(4, 3) && __STDC_VERSION__ >= 199901L) +# define __forceinline extern inline __attribute__((__always_inline__,__gnu_inline__)) +# else +# define __forceinline extern __inline__ __attribute__((__always_inline__)) +# endif # endif #endif diff --git a/sdk/include/psdk/intsafe.h b/sdk/include/psdk/intsafe.h index e30cb1182af..10fb173beb5 100644 --- a/sdk/include/psdk/intsafe.h +++ b/sdk/include/psdk/intsafe.h @@ -30,14 +30,6 @@ #include <specstrings.h> -#if defined(__GNUC__) && !defined(__forceinline) -# if ( __MINGW_GNUC_PREREQ(4, 3) && __STDC_VERSION__ >= 199901L) -# define __forceinline extern inline __attribute__((__always_inline__,__gnu_inline__)) -# else -# define __forceinline extern __inline__ __attribute__((__always_inline__)) -# endif -#endif - /* Handle ntintsafe here too */ #ifdef _NTINTSAFE_H_INCLUDED_ #ifndef _NTDEF_ /* Guard agains redefinition from ntstatus.h */ diff --git a/sdk/include/xdk/ntbasedef.h b/sdk/include/xdk/ntbasedef.h index a7d0935a8fd..2118935a35c 100644 --- a/sdk/include/xdk/ntbasedef.h +++ b/sdk/include/xdk/ntbasedef.h @@ -213,13 +213,7 @@ /* Inlines */ #ifndef FORCEINLINE - #if defined(_MSC_VER) - #define FORCEINLINE __forceinline - #elif ( __MINGW_GNUC_PREREQ(4, 3) && __STDC_VERSION__ >= 199901L) - #define FORCEINLINE extern inline __attribute__((__always_inline__,__gnu_inline__)) - #else - #define FORCEINLINE extern __inline__ __attribute__((__always_inline__)) - #endif + #define FORCEINLINE __forceinline #endif /* FORCEINLINE */ #ifndef DECLSPEC_NOINLINE

1 0

[reactos] 01/01: [USER32] Load IMM table (#3215)
by Katayama Hirofumi MZ 23 Sep '20

23 Sep '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=33fe4333f40dadfda1c92… commit 33fe4333f40dadfda1c9232639c887249573459e Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Sep 23 21:42:54 2020 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Sep 23 21:42:54 2020 +0900 [USER32] Load IMM table (#3215) Implement the IMM function table in module user32.dll. CORE-11700 File immtable.h is located at win32ss/user/user32/include, that is a list of the DEFINE_IMM_ENTRY macro calls. --- win32ss/user/user32/include/immtable.h | 53 +++++++++ win32ss/user/user32/include/user32.h | 2 + win32ss/user/user32/include/user32p.h | 35 +++--- win32ss/user/user32/misc/imm.c | 202 ++++++++------------------------- win32ss/user/user32/misc/immtable.h | 52 --------- 5 files changed, 119 insertions(+), 225 deletions(-) diff --git a/win32ss/user/user32/include/immtable.h b/win32ss/user/user32/include/immtable.h new file mode 100644 index 00000000000..ca37779bdd2 --- /dev/null +++ b/win32ss/user/user32/include/immtable.h @@ -0,0 +1,53 @@ +/* DEFINE_IMM_ENTRY(type, name, params, retval, retkind) */ +DEFINE_IMM_ENTRY(BOOL, ImmWINNLSEnableIME, (HWND hwnd, BOOL enable), 0, NONVOID) +DEFINE_IMM_ENTRY(BOOL, ImmWINNLSGetEnableStatus, (HWND hwnd), 0, NONVOID) +DEFINE_IMM_ENTRY(LRESULT, ImmSendIMEMessageExW, (HWND hwnd, LPARAM lParam), 0, NONVOID) +DEFINE_IMM_ENTRY(LRESULT, ImmSendIMEMessageExA, (HWND hwnd, LPARAM lParam), 0, NONVOID) +DEFINE_IMM_ENTRY(BOOL, ImmIMPGetIMEW, (HWND hwnd, LPIMEPROW ime), 0, NONVOID) +DEFINE_IMM_ENTRY(BOOL, ImmIMPGetIMEA, (HWND hwnd, LPIMEPROA ime), 0, NONVOID) +DEFINE_IMM_ENTRY(BOOL, ImmIMPQueryIMEW, (LPIMEPROW ime), 0, NONVOID) +DEFINE_IMM_ENTRY(BOOL, ImmIMPQueryIMEA, (LPIMEPROA ime), 0, NONVOID) +DEFINE_IMM_ENTRY(BOOL, ImmIMPSetIMEW, (HWND hwnd, LPIMEPROW ime), 0, NONVOID) +DEFINE_IMM_ENTRY(BOOL, ImmIMPSetIMEA, (HWND hwnd, LPIMEPROA ime), 0, NONVOID) +DEFINE_IMM_ENTRY(HIMC, ImmAssociateContext, (HWND hwnd, HIMC hIMC), 0, NONVOID) +DEFINE_IMM_ENTRY(LRESULT, ImmEscapeA, (HKL hKL, HIMC hIMC, UINT uEscape, LPVOID lpData), 0, NONVOID) +DEFINE_IMM_ENTRY(LRESULT, ImmEscapeW, (HKL hKL, HIMC hIMC, UINT uEscape, LPVOID lpData), 0, NONVOID) +DEFINE_IMM_ENTRY(LONG, ImmGetCompositionStringA, (HIMC hIMC, DWORD dwIndex, LPVOID lpBuf, DWORD dwBufLen), 0, NONVOID) +DEFINE_IMM_ENTRY(LONG, ImmGetCompositionStringW, (HIMC hIMC, DWORD dwIndex, LPVOID lpBuf, DWORD dwBufLen), 0, NONVOID) +DEFINE_IMM_ENTRY(BOOL, ImmGetCompositionWindow, (HIMC hIMC, LPCOMPOSITIONFORM lpCompForm), 0, NONVOID) +DEFINE_IMM_ENTRY(HIMC, ImmGetContext, (HWND hwnd), 0, NONVOID) +DEFINE_IMM_ENTRY(HWND, ImmGetDefaultIMEWnd, (HWND hwnd), 0, NONVOID) +DEFINE_IMM_ENTRY(BOOL, ImmIsIME, (HKL hKL), 0, NONVOID) +DEFINE_IMM_ENTRY(BOOL, ImmReleaseContext, (HWND hwnd, HIMC hIMC), 0, NONVOID) +DEFINE_IMM_ENTRY(BOOL, ImmRegisterClient, (/*PSHAREDINFO*/ LPVOID pInfo, HINSTANCE hInst), TRUE, NONVOID) +DEFINE_IMM_ENTRY(BOOL, ImmGetCompositionFontW, (HIMC hIMC, LPLOGFONTW plf), 0, NONVOID) +DEFINE_IMM_ENTRY(BOOL, ImmGetCompositionFontA, (HIMC hIMC, LPLOGFONTA plf), 0, NONVOID) +DEFINE_IMM_ENTRY(BOOL, ImmSetCompositionFontW, (HIMC hIMC, LPLOGFONTW plf), 0, NONVOID) +DEFINE_IMM_ENTRY(BOOL, ImmSetCompositionFontA, (HIMC hIMC, LPLOGFONTA plf), 0, NONVOID) +DEFINE_IMM_ENTRY(BOOL, ImmSetCompositionWindow, (HIMC hIMC, LPCOMPOSITIONFORM lpCompForm), 0, NONVOID) +DEFINE_IMM_ENTRY(BOOL, ImmNotifyIME, (HIMC hIMC, DWORD dwAction, DWORD dwIndex, DWORD dwValue), 0, NONVOID) +DEFINE_IMM_ENTRY(/*PINPUTCONTEXT*/ LPVOID, ImmLockIMC, (HIMC hIMC), 0, NONVOID) +DEFINE_IMM_ENTRY(BOOL, ImmUnlockIMC, (HIMC hIMC), 0, NONVOID) +DEFINE_IMM_ENTRY(BOOL, ImmLoadIME, (HKL hKL), 0, NONVOID) +DEFINE_IMM_ENTRY(BOOL, ImmSetOpenStatus, (HIMC hIMC, BOOL bOpen), 0, NONVOID) +DEFINE_IMM_ENTRY(BOOL, ImmFreeLayout, (DWORD dwFlags), 0, NONVOID) +DEFINE_IMM_ENTRY(BOOL, ImmActivateLayout, (HKL hKL), 0, NONVOID) +DEFINE_IMM_ENTRY(BOOL, ImmSetCandidateWindow, (HIMC hIMC, LPCANDIDATEFORM lpCandForm), 0, NONVOID) +DEFINE_IMM_ENTRY(BOOL, ImmConfigureIMEW, (HKL hKL, HWND hWnd, DWORD dwMode, LPVOID lpData), 0, NONVOID) +DEFINE_IMM_ENTRY(BOOL, ImmGetConversionStatus, (HIMC hIMC, LPDWORD lpdwConversion, LPDWORD lpdwSentence), 0, NONVOID) +DEFINE_IMM_ENTRY(BOOL, ImmSetConversionStatus, (HIMC hIMC, DWORD dwConversion, DWORD dwSentence), 0, NONVOID) +DEFINE_IMM_ENTRY(BOOL, ImmSetStatusWindowPos, (HIMC hIMC, LPPOINT lppt), 0, NONVOID) +DEFINE_IMM_ENTRY(BOOL, ImmGetImeInfoEx, (PIMEINFOEX info, IMEINFOEXCLASS type, LPVOID pvKey), 0, NONVOID) +DEFINE_IMM_ENTRY(/*PIMEDPI*/ LPVOID, ImmLockImeDpi, (HKL hKL), 0, NONVOID) +DEFINE_IMM_ENTRY(VOID, ImmUnlockImeDpi, (/*PIMEDPI*/ LPVOID dpi), 0, VOID) +DEFINE_IMM_ENTRY(BOOL, ImmGetOpenStatus, (HIMC hIMC), 0, NONVOID) +DEFINE_IMM_ENTRY(BOOL, ImmSetActiveContext, (HWND hwnd, HIMC hIMC, BOOL bFlag), 0, NONVOID) +DEFINE_IMM_ENTRY(BOOL, ImmTranslateMessage, (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam), 0, NONVOID) +DEFINE_IMM_ENTRY(BOOL, ImmLoadLayout, (HKL hKL, PIMEINFOEX info), 0, NONVOID) +DEFINE_IMM_ENTRY(DWORD, ImmProcessKey, (HWND hwnd, HKL hKL, UINT uVKey, LPARAM lParam, DWORD dwHotKeyID), 0, NONVOID) +DEFINE_IMM_ENTRY(LRESULT, ImmPutImeMenuItemsIntoMappedFile, (HIMC hIMC), 0, NONVOID) +DEFINE_IMM_ENTRY(DWORD, ImmGetProperty, (HKL hKL, DWORD dwIndex), 0, NONVOID) +DEFINE_IMM_ENTRY(BOOL, ImmSetCompositionStringA, (HIMC hIMC, DWORD dwIndex, LPCVOID lpComp, DWORD dwCompLen, LPCVOID lpRead, DWORD dwReadLen), 0, NONVOID) +DEFINE_IMM_ENTRY(BOOL, ImmSetCompositionStringW, (HIMC hIMC, DWORD dwIndex, LPCVOID lpComp, DWORD dwCompLen, LPCVOID lpRead, DWORD dwReadLen), 0, NONVOID) +DEFINE_IMM_ENTRY(BOOL, ImmEnumInputContext, (DWORD dwThreadID, IMCENUMPROC lpfn, LPARAM lParam), 0, NONVOID) +DEFINE_IMM_ENTRY(LRESULT, ImmSystemHandler, (HIMC hIMC, WPARAM wParam, LPARAM lParam), 0, NONVOID) diff --git a/win32ss/user/user32/include/user32.h b/win32ss/user/user32/include/user32.h index 56415399ffc..2615fb61549 100644 --- a/win32ss/user/user32/include/user32.h +++ b/win32ss/user/user32/include/user32.h @@ -57,6 +57,8 @@ #include <wine/unicode.h> #include <wine/debug.h> +#include <winnls32.h> + /* Internal User32 Headers */ #include "user32p.h" diff --git a/win32ss/user/user32/include/user32p.h b/win32ss/user/user32/include/user32p.h index 9bfaeecf83a..5ec7b322bd1 100644 --- a/win32ss/user/user32/include/user32p.h +++ b/win32ss/user/user32/include/user32p.h @@ -17,31 +17,24 @@ #include "resource.h" #include "ntwrapper.h" +#define IMM_RETURN_VOID(retval) /* empty */ +#define IMM_RETURN_NONVOID(retval) return (retval) +/* typedef FN_... */ +#undef DEFINE_IMM_ENTRY +#define DEFINE_IMM_ENTRY(type, name, params, retval, retkind) \ + typedef type (WINAPI *FN_##name)params; +#include "immtable.h" + +/* define Imm32ApiTable */ typedef struct { - BOOL (WINAPI* pImmIsIME) (HKL); - LRESULT (WINAPI* pImmEscapeA) (HKL, HIMC, UINT, LPVOID); - LRESULT (WINAPI* pImmEscapeW) (HKL, HIMC, UINT, LPVOID); - LONG (WINAPI* pImmGetCompositionStringA) (HIMC, DWORD, LPVOID, DWORD); - LONG (WINAPI* pImmGetCompositionStringW) (HIMC, DWORD, LPVOID, DWORD); - BOOL (WINAPI* pImmGetCompositionFontA) (HIMC, LPLOGFONTA); - BOOL (WINAPI* pImmGetCompositionFontW) (HIMC, LPLOGFONTW); - BOOL (WINAPI* pImmSetCompositionFontA)(HIMC, LPLOGFONTA); - BOOL (WINAPI* pImmSetCompositionFontW)(HIMC, LPLOGFONTW); - BOOL (WINAPI* pImmGetCompositionWindow) (HIMC, LPCOMPOSITIONFORM); - BOOL (WINAPI* pImmSetCompositionWindow) (HIMC, LPCOMPOSITIONFORM); - HIMC (WINAPI* pImmAssociateContext) (HWND, HIMC); - BOOL (WINAPI* pImmReleaseContext) (HWND, HIMC); - HIMC (WINAPI* pImmGetContext) (HWND); - HWND (WINAPI* pImmGetDefaultIMEWnd) (HWND); - BOOL (WINAPI* pImmNotifyIME) (HIMC, DWORD, DWORD, DWORD); - BOOL (WINAPI* pImmRegisterClient) (PVOID, HINSTANCE); - UINT (WINAPI* pImmProcessKey) (HWND, HKL, UINT, LPARAM, DWORD); - +#undef DEFINE_IMM_ENTRY +#define DEFINE_IMM_ENTRY(type, name, params, retval, retkind) \ + FN_##name p##name; +#include "immtable.h" } Imm32ApiTable; - /* global variables */ extern HINSTANCE User32Instance; #define user32_module User32Instance @@ -61,6 +54,8 @@ extern HINSTANCE ghmodUserApiHook; extern HICON hIconSmWindows, hIconWindows; extern Imm32ApiTable gImmApiEntries; +#define IMM_FN(name) gImmApiEntries.p##name + #define IS_ATOM(x) \ (((ULONG_PTR)(x) > 0x0) && ((ULONG_PTR)(x) < 0x10000)) diff --git a/win32ss/user/user32/misc/imm.c b/win32ss/user/user32/misc/imm.c index b06bb5da1d8..03e040230a9 100644 --- a/win32ss/user/user32/misc/imm.c +++ b/win32ss/user/user32/misc/imm.c @@ -3,46 +3,35 @@ * PROJECT: ReactOS user32.dll * FILE: win32ss/user/user32/misc/imm.c * PURPOSE: User32.dll Imm functions - * PROGRAMMER: Dmitry Chapyshev (dmitry(a)reactos.org) + * PROGRAMMERS: Dmitry Chapyshev (dmitry(a)reactos.org) + * Katayama Hirofumi MZ (katayama.hirofumi.mz(a)gmail.com) * UPDATE HISTORY: * 01/27/2009 Created */ #include <user32.h> - -#include <winnls32.h> #include <strsafe.h> WINE_DEFAULT_DEBUG_CHANNEL(user32); #define IMM_INIT_MAGIC 0x19650412 - -Imm32ApiTable gImmApiEntries = {0}; HINSTANCE ghImm32 = NULL; BOOL bImmInitializing = FALSE; -BOOL ImmApiTableZero = TRUE; +/* define stub functions */ +#undef DEFINE_IMM_ENTRY +#define DEFINE_IMM_ENTRY(type, name, params, retval, retkind) \ + static type WINAPI IMMSTUB_##name params { IMM_RETURN_##retkind((type)retval); } +#include "immtable.h" -/* - * This function should not be implemented, it is used, - * if you can not load function from imm32.dll - */ -BOOL WINAPI IMM_ImmIsIME(HKL hKL) { return 0; } -HIMC WINAPI IMM_ImmAssociateContext(HWND hwnd, HIMC himc) { return 0; } -BOOL WINAPI IMM_ImmReleaseContext(HWND hwnd, HIMC himc) { return 0; } -LRESULT WINAPI IMM_ImmEscapeAW(HKL hkl, HIMC himc, UINT uint, LPVOID lpvoid) { return 0; } -LONG WINAPI IMM_ImmGetCompositionStringAW(HIMC himc, DWORD dword1, LPVOID lpvoid, DWORD dword2) { return 0; } -BOOL WINAPI IMM_ImmGetCompositionFontA(HIMC himc, LPLOGFONTA lplf) { return 0; } -BOOL WINAPI IMM_ImmGetCompositionFontW(HIMC himc, LPLOGFONTW lplf) { return 0; } -BOOL WINAPI IMM_ImmSetCompositionFontA(HIMC himc, LPLOGFONTA lplf) { return 0; } -BOOL WINAPI IMM_ImmSetCompositionFontW(HIMC himc, LPLOGFONTW lplf) { return 0; } -BOOL WINAPI IMM_ImmSetGetCompositionWindow(HIMC himc, LPCOMPOSITIONFORM lpcf) { return 0; } -HIMC WINAPI IMM_ImmGetContext(HWND hwnd) { return 0; } -HWND WINAPI IMM_ImmGetDefaultIMEWnd(HWND hwnd) { return 0; } -BOOL WINAPI IMM_ImmNotifyIME(HIMC himc, DWORD dword1, DWORD dword2, DWORD dword3) { return 0; } -BOOL WINAPI IMM_ImmRegisterClient(PVOID ptr, HINSTANCE hMod) { return 0; } -UINT WINAPI IMM_ImmProcessKey(HWND hwnd, HKL hkl, UINT Vk, LPARAM lParam, DWORD HotKey) { return 0; } +Imm32ApiTable gImmApiEntries = { +/* initialize by stubs */ +#undef DEFINE_IMM_ENTRY +#define DEFINE_IMM_ENTRY(type, name, params, retval, retkind) \ + IMMSTUB_##name, +#include "immtable.h" +}; HRESULT WINAPI GetImmFileName(PWSTR lpBuffer, UINT uSize) { @@ -66,11 +55,8 @@ BOOL WINAPI IntInitializeImmEntryTable(VOID) WCHAR ImmFile[MAX_PATH]; HMODULE imm32 = ghImm32; - if (gImmApiEntries.pImmIsIME != 0) - { - ERR("Imm Api Table Init 1\n"); - return TRUE; - } + if (IMM_FN(ImmWINNLSEnableIME) != IMMSTUB_ImmWINNLSEnableIME) + return TRUE; GetImmFileName(ImmFile, sizeof(ImmFile)); TRACE("File %ws\n",ImmFile); @@ -91,91 +77,16 @@ BOOL WINAPI IntInitializeImmEntryTable(VOID) return TRUE; } - if (ImmApiTableZero) - { - ImmApiTableZero = FALSE; - ZeroMemory(&gImmApiEntries, sizeof(Imm32ApiTable)); - } - - gImmApiEntries.pImmIsIME = (BOOL (WINAPI*)(HKL)) GetProcAddress(imm32, "ImmIsIME"); - if (!gImmApiEntries.pImmIsIME) - gImmApiEntries.pImmIsIME = IMM_ImmIsIME; - - gImmApiEntries.pImmEscapeA = (LRESULT (WINAPI*)(HKL, HIMC, UINT, LPVOID)) GetProcAddress(imm32, "ImmEscapeA"); - if (!gImmApiEntries.pImmEscapeA) - gImmApiEntries.pImmEscapeA = IMM_ImmEscapeAW; - - gImmApiEntries.pImmEscapeW = (LRESULT (WINAPI*)(HKL, HIMC, UINT, LPVOID)) GetProcAddress(imm32, "ImmEscapeW"); - if (!gImmApiEntries.pImmEscapeW) - gImmApiEntries.pImmEscapeW = IMM_ImmEscapeAW; - - gImmApiEntries.pImmGetCompositionStringA = (LONG (WINAPI*)(HIMC, DWORD, LPVOID, DWORD)) GetProcAddress(imm32, "ImmGetCompositionStringA"); - if (!gImmApiEntries.pImmGetCompositionStringA) - gImmApiEntries.pImmGetCompositionStringA = IMM_ImmGetCompositionStringAW; - - gImmApiEntries.pImmGetCompositionStringW = (LONG (WINAPI*)(HIMC, DWORD, LPVOID, DWORD)) GetProcAddress(imm32, "ImmGetCompositionStringW"); - if (!gImmApiEntries.pImmGetCompositionStringW) - gImmApiEntries.pImmGetCompositionStringW = IMM_ImmGetCompositionStringAW; - - gImmApiEntries.pImmGetCompositionFontA = (BOOL (WINAPI*)(HIMC, LPLOGFONTA)) GetProcAddress(imm32, "ImmGetCompositionFontA"); - if (!gImmApiEntries.pImmGetCompositionFontA) - gImmApiEntries.pImmGetCompositionFontA = IMM_ImmGetCompositionFontA; - - gImmApiEntries.pImmGetCompositionFontW = (BOOL (WINAPI*)(HIMC, LPLOGFONTW)) GetProcAddress(imm32, "ImmGetCompositionFontW"); - if (!gImmApiEntries.pImmGetCompositionFontW) - gImmApiEntries.pImmGetCompositionFontW = IMM_ImmGetCompositionFontW; - - gImmApiEntries.pImmSetCompositionFontA = (BOOL (WINAPI*)(HIMC, LPLOGFONTA)) GetProcAddress(imm32, "ImmSetCompositionFontA"); - if (!gImmApiEntries.pImmSetCompositionFontA) - gImmApiEntries.pImmSetCompositionFontA = IMM_ImmSetCompositionFontA; - - gImmApiEntries.pImmSetCompositionFontW = (BOOL (WINAPI*)(HIMC, LPLOGFONTW)) GetProcAddress(imm32, "ImmSetCompositionFontW"); - if (!gImmApiEntries.pImmSetCompositionFontW) - gImmApiEntries.pImmSetCompositionFontW = IMM_ImmSetCompositionFontW; - - gImmApiEntries.pImmGetCompositionWindow = (BOOL (WINAPI*)(HIMC, LPCOMPOSITIONFORM)) GetProcAddress(imm32, "ImmGetCompositionWindow"); - if (!gImmApiEntries.pImmGetCompositionWindow) - gImmApiEntries.pImmGetCompositionWindow = IMM_ImmSetGetCompositionWindow; - - gImmApiEntries.pImmSetCompositionWindow = (BOOL (WINAPI*)(HIMC, LPCOMPOSITIONFORM)) GetProcAddress(imm32, "ImmSetCompositionWindow"); - if (!gImmApiEntries.pImmSetCompositionWindow) - gImmApiEntries.pImmSetCompositionWindow = IMM_ImmSetGetCompositionWindow; - - gImmApiEntries.pImmAssociateContext = (HIMC (WINAPI*)(HWND, HIMC)) GetProcAddress(imm32, "ImmAssociateContext"); - if (!gImmApiEntries.pImmAssociateContext) - gImmApiEntries.pImmAssociateContext = IMM_ImmAssociateContext; - - gImmApiEntries.pImmReleaseContext = (BOOL (WINAPI*)(HWND, HIMC)) GetProcAddress(imm32, "ImmReleaseContext"); - if (!gImmApiEntries.pImmReleaseContext) - gImmApiEntries.pImmReleaseContext = IMM_ImmReleaseContext; - - gImmApiEntries.pImmGetContext = (HIMC (WINAPI*)(HWND)) GetProcAddress(imm32, "ImmGetContext"); - if (!gImmApiEntries.pImmGetContext) - gImmApiEntries.pImmGetContext = IMM_ImmGetContext; - - gImmApiEntries.pImmGetDefaultIMEWnd = (HWND (WINAPI*)(HWND)) GetProcAddress(imm32, "ImmGetDefaultIMEWnd"); - if (!gImmApiEntries.pImmGetDefaultIMEWnd) - gImmApiEntries.pImmGetDefaultIMEWnd = IMM_ImmGetDefaultIMEWnd; - - gImmApiEntries.pImmNotifyIME = (BOOL (WINAPI*)(HIMC, DWORD, DWORD, DWORD)) GetProcAddress(imm32, "ImmNotifyIME"); - if (!gImmApiEntries.pImmNotifyIME) - gImmApiEntries.pImmNotifyIME = IMM_ImmNotifyIME; - - /* - * TODO: Load more functions from imm32.dll - * Function like IMPSetIMEW, IMPQueryIMEW etc. call functions - * from imm32.dll through pointers in the structure gImmApiEntries. - * I do not know whether it is necessary to initialize a table - * of functions to load user32 (DLL_PROCESS_ATTACH) - */ - - gImmApiEntries.pImmRegisterClient = (BOOL (WINAPI*)(PVOID, HINSTANCE)) GetProcAddress(imm32, "ImmRegisterClient"); - if (!gImmApiEntries.pImmRegisterClient) - gImmApiEntries.pImmRegisterClient = IMM_ImmRegisterClient; - - gImmApiEntries.pImmProcessKey = (UINT (WINAPI*)(HWND, HKL, UINT, LPARAM, DWORD)) GetProcAddress(imm32, "ImmProcessKey"); - if (!gImmApiEntries.pImmProcessKey) - gImmApiEntries.pImmProcessKey = IMM_ImmProcessKey; +/* load imm procedures */ +#undef DEFINE_IMM_ENTRY +#define DEFINE_IMM_ENTRY(type, name, params, retval, retkind) \ + do { \ + FN_##name proc = (FN_##name)GetProcAddress(imm32, #name); \ + if (proc) { \ + IMM_FN(name) = proc; \ + } \ + } while (0); +#include "immtable.h" return TRUE; } @@ -212,12 +123,7 @@ BOOL WINAPI User32InitializeImmEntryTable(DWORD magic) return FALSE; } } -#if 0 // For real Imm32.dll testing!!!! - if (ghImm32 && !gImmApiEntries.pImmRegisterClient(&gSharedInfo, ghImm32)) - { - ERR("Wine is stubed!\n"); - } -#endif + return TRUE; } @@ -349,113 +255,103 @@ BOOL WINAPI CliImmSetHotKey(DWORD dwID, UINT uModifiers, UINT uVirtualKey, HKL h } /* - * @unimplemented + * @implemented */ BOOL WINAPI IMPSetIMEW(HWND hwnd, LPIMEPROW ime) { - UNIMPLEMENTED; - return FALSE; + return IMM_FN(ImmIMPSetIMEW)(hwnd, ime); } /* - * @unimplemented + * @implemented */ BOOL WINAPI IMPQueryIMEW(LPIMEPROW ime) { - UNIMPLEMENTED; - return FALSE; + return IMM_FN(ImmIMPQueryIMEW)(ime); } /* - * @unimplemented + * @implemented */ BOOL WINAPI IMPGetIMEW(HWND hwnd, LPIMEPROW ime) { - UNIMPLEMENTED; - return FALSE; + return IMM_FN(ImmIMPGetIMEW)(hwnd, ime); } /* - * @unimplemented + * @implemented */ BOOL WINAPI IMPSetIMEA(HWND hwnd, LPIMEPROA ime) { - UNIMPLEMENTED; - return FALSE; + return IMM_FN(ImmIMPSetIMEA)(hwnd, ime); } /* - * @unimplemented + * @implemented */ BOOL WINAPI IMPQueryIMEA(LPIMEPROA ime) { - UNIMPLEMENTED; - return FALSE; + return IMM_FN(ImmIMPQueryIMEA)(ime); } /* - * @unimplemented + * @implemented */ BOOL WINAPI IMPGetIMEA(HWND hwnd, LPIMEPROA ime) { - UNIMPLEMENTED; - return FALSE; + return IMM_FN(ImmIMPGetIMEA)(hwnd, ime); } /* - * @unimplemented + * @implemented */ LRESULT WINAPI -SendIMEMessageExW(HWND hwnd, LPARAM lparam) +SendIMEMessageExW(HWND hwnd, LPARAM lParam) { - UNIMPLEMENTED; - return FALSE; + return IMM_FN(ImmSendIMEMessageExW)(hwnd, lParam); } /* - * @unimplemented + * @implemented */ LRESULT WINAPI -SendIMEMessageExA(HWND hwnd, LPARAM lparam) +SendIMEMessageExA(HWND hwnd, LPARAM lParam) { - UNIMPLEMENTED; - return FALSE; + return IMM_FN(ImmSendIMEMessageExA)(hwnd, lParam); } /* - * @unimplemented + * @implemented */ BOOL WINAPI WINNLSEnableIME(HWND hwnd, BOOL enable) { - UNIMPLEMENTED; - return FALSE; + return IMM_FN(ImmWINNLSEnableIME)(hwnd, enable); } /* - * @unimplemented + * @implemented */ BOOL WINAPI WINNLSGetEnableStatus(HWND hwnd) { - UNIMPLEMENTED; - return FALSE; + return IMM_FN(ImmWINNLSGetEnableStatus)(hwnd); } /* diff --git a/win32ss/user/user32/misc/immtable.h b/win32ss/user/user32/misc/immtable.h deleted file mode 100644 index d0cbdc2e4a5..00000000000 --- a/win32ss/user/user32/misc/immtable.h +++ /dev/null @@ -1,52 +0,0 @@ -DEFINE_IMM_ENTRY(BOOL, ImmWINNLSEnableIME, (HWND, BOOL)) -DEFINE_IMM_ENTRY(BOOL, ImmWINNLSGetEnableStatus, (HWND)) -DEFINE_IMM_ENTRY(LRESULT, ImmSendIMEMessageExW, (HWND, LPARAM)) -DEFINE_IMM_ENTRY(LRESULT, ImmSendIMEMessageExA, (HWND, LPARAM)) -DEFINE_IMM_ENTRY(BOOL, ImmIMPGetIMEW, (HWND, LPIMEPROW)) -DEFINE_IMM_ENTRY(BOOL, ImmIMPGetIMEA, (HWND, LPIMEPROA)) -DEFINE_IMM_ENTRY(BOOL, ImmIMPQueryIMEW, (LPIMEPROW)) -DEFINE_IMM_ENTRY(BOOL, ImmIMPQueryIMEA, (LPIMEPROA)) -DEFINE_IMM_ENTRY(BOOL, ImmIMPSetIMEW, (HWND, LPIMEPROW)) -DEFINE_IMM_ENTRY(BOOL, ImmIMPSetIMEA, (HWND, LPIMEPROA)) -DEFINE_IMM_ENTRY(HIMC, ImmAssociateContext, (HWND, HIMC)) -DEFINE_IMM_ENTRY(LRESULT, ImmEscapeA, (HKL, HIMC, UINT, LPVOID)) -DEFINE_IMM_ENTRY(LRESULT, ImmEscapeW, (HKL, HIMC, UINT, LPVOID)) -DEFINE_IMM_ENTRY(LONG, ImmGetCompositionStringA, (HIMC, DWORD, LPVOID, DWORD)) -DEFINE_IMM_ENTRY(LONG, ImmGetCompositionStringW, (HIMC, DWORD, LPVOID, DWORD)) -DEFINE_IMM_ENTRY(BOOL, ImmGetCompositionWindow, (HIMC, LPCOMPOSITIONFORM)) -DEFINE_IMM_ENTRY(HIMC, ImmGetContext, (HWND)) -DEFINE_IMM_ENTRY(HWND, ImmGetDefaultIMEWnd, (HWND)) -DEFINE_IMM_ENTRY(BOOL, ImmIsIME, (HKL)) -DEFINE_IMM_ENTRY(BOOL, ImmReleaseContext, (HWND, HIMC)) -DEFINE_IMM_ENTRY(BOOL, ImmRegisterClient, (/*PSHAREDINFO*/ LPVOID, HINSTANCE)) -DEFINE_IMM_ENTRY(BOOL, ImmGetCompositionFontW, (HIMC, LPLOGFONTW)) -DEFINE_IMM_ENTRY(BOOL, ImmGetCompositionFontA, (HIMC, LPLOGFONTA)) -DEFINE_IMM_ENTRY(BOOL, ImmSetCompositionFontW, (HIMC, LPLOGFONTW)) -DEFINE_IMM_ENTRY(BOOL, ImmSetCompositionFontA, (HIMC, LPLOGFONTA)) -DEFINE_IMM_ENTRY(BOOL, ImmSetCompositionWindow, (HIMC, LPCOMPOSITIONFORM)) -DEFINE_IMM_ENTRY(BOOL, ImmNotifyIME, (HIMC, DWORD, DWORD, DWORD)) -DEFINE_IMM_ENTRY(PINPUTCONTEXT, ImmLockIMC, (HIMC)) -DEFINE_IMM_ENTRY(BOOL, ImmUnlockIMC, (HIMC)) -DEFINE_IMM_ENTRY(BOOL, ImmLoadIME, (HKL)) -DEFINE_IMM_ENTRY(BOOL, ImmSetOpenStatus, (HIMC, BOOL)) -DEFINE_IMM_ENTRY(BOOL, ImmFreeLayout, (DWORD)) -DEFINE_IMM_ENTRY(BOOL, ImmActivateLayout, (HKL)) -DEFINE_IMM_ENTRY(BOOL, ImmSetCandidateWindow, (HIMC, LPCANDIDATEFORM)) -DEFINE_IMM_ENTRY(BOOL, ImmConfigureIMEW, (HKL, HWND, DWORD, LPVOID)) -DEFINE_IMM_ENTRY(BOOL, ImmGetConversionStatus, (HIMC, LPDWORD, LPDWORD)) -DEFINE_IMM_ENTRY(BOOL, ImmSetConversionStatus, (HIMC, DWORD, DWORD)) -DEFINE_IMM_ENTRY(BOOL, ImmSetStatusWindowPos, (HIMC, LPPOINT)) -DEFINE_IMM_ENTRY(BOOL, ImmGetImeInfoEx, (PIMEINFOEX, IMEINFOEXCLASS, LPVOID)) -DEFINE_IMM_ENTRY(PIMEDPI, ImmLockImeDpi, (HKL)) -DEFINE_IMM_ENTRY(VOID, ImmUnlockImeDpi, (/*PIMEDPI*/ LPVOID)) -DEFINE_IMM_ENTRY(BOOL, ImmGetOpenStatus, (HIMC)) -DEFINE_IMM_ENTRY(BOOL, ImmSetActiveContext, (HWND, HIMC, BOOL)) -DEFINE_IMM_ENTRY(BOOL, ImmTranslateMessage, (HWND, UINT, WPARAM, LPARAM)) -DEFINE_IMM_ENTRY(BOOL, ImmLoadLayout, (HKL, PIMEINFOEX)) -DEFINE_IMM_ENTRY(DWORD, ImmProcessKey, (HWND, HKL, UINT, LPARAM, DWORD)) -DEFINE_IMM_ENTRY(LRESULT, ImmPutImeMenuItemsIntoMappedFile, (HIMC)) -DEFINE_IMM_ENTRY(DWORD, ImmGetProperty, (HKL, DWORD)) -DEFINE_IMM_ENTRY(BOOL, ImmSetCompositionStringA, (HIMC, DWORD, LPCVOID, DWORD, LPCVOID, DWORD)) -DEFINE_IMM_ENTRY(BOOL, ImmSetCompositionStringW, (HIMC, DWORD, LPCVOID, DWORD, LPCVOID, DWORD)) -DEFINE_IMM_ENTRY(BOOL, ImmEnumInputContext, (DWORD, IMCENUMPROC, LPARAM)) -DEFINE_IMM_ENTRY(LRESULT, ImmSystemHandler, (HIMC, WPARAM, LPARAM))

1 0

[reactos] 01/01: [COMCTL32] Improve IP Address Controls (Tab and caret) (#3212)
by Katayama Hirofumi MZ 22 Sep '20

22 Sep '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3f30b1eda7e51dae1df0b… commit 3f30b1eda7e51dae1df0b411e75b99a03e9fbca2 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Sep 23 08:32:40 2020 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Sep 23 08:32:40 2020 +0900 [COMCTL32] Improve IP Address Controls (Tab and caret) (#3212) Improve IP address controls. - Set focus to EDIT control to show caret. - Process WM_GETDLGCODE messages on EDIT control to catch Tab key. - Process Tab key and Shift+Tab key in processing WM_KEYDOWN. CORE-3479 --- dll/win32/comctl32/ipaddress.c | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/dll/win32/comctl32/ipaddress.c b/dll/win32/comctl32/ipaddress.c index 6e7b703bb49..9f1b2c08c38 100644 --- a/dll/win32/comctl32/ipaddress.c +++ b/dll/win32/comctl32/ipaddress.c @@ -453,6 +453,9 @@ static BOOL IPADDRESS_GotoNextField (const IPADDRESS_INFO *infoPtr, int cur, int end = -1; SendMessageW(next->EditHwnd, EM_SETSEL, start, end); } +#ifdef __REACTOS__ + SetFocus(next->EditHwnd); +#endif return TRUE; } @@ -563,6 +566,26 @@ IPADDRESS_SubclassProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) return 0; } break; +#ifdef __REACTOS__ + case VK_TAB: + if (GetKeyState(VK_SHIFT) < 0) + { + /* Shift+Tab */ + if (index == 0) + SetFocus(GetNextDlgTabItem(GetParent(infoPtr->Self), infoPtr->Self, TRUE)); + else + IPADDRESS_GotoNextField(infoPtr, index - 2, POS_SELALL); + } + else + { + /* Tab */ + if (index == 3) + SetFocus(GetNextDlgTabItem(GetParent(infoPtr->Self), infoPtr->Self, FALSE)); + else + IPADDRESS_GotoNextField(infoPtr, index, POS_SELALL); + } + break; +#endif } break; case WM_KILLFOCUS: @@ -573,6 +596,13 @@ IPADDRESS_SubclassProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) if (IPADDRESS_GetPartIndex(infoPtr, (HWND)wParam) < 0) IPADDRESS_Notify(infoPtr, EN_SETFOCUS); break; +#ifdef __REACTOS__ + case WM_GETDLGCODE: + { + LRESULT ret = DefWindowProcW(hwnd, uMsg, wParam, lParam); + return ret | DLGC_WANTTAB; + } +#endif } return CallWindowProcW (part->OrigProc, hwnd, uMsg, wParam, lParam); } @@ -602,6 +632,11 @@ IPADDRESS_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) case WM_PAINT: return IPADDRESS_Paint (infoPtr, (HDC)wParam); +#ifdef __REACTOS__ + case WM_SETFOCUS: + IPADDRESS_GotoNextField(infoPtr, -1, POS_SELALL); + return 0; +#endif case WM_COMMAND: switch(wParam >> 16) { case EN_CHANGE:

1 0

[reactos] 07/07: [CMD] SET: Diverse fixes for the arithmetic-expression parser (/A option).
by Hermès Bélusca-Maïto 22 Sep '20

22 Sep '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=17e094cd34648d48d3804… commit 17e094cd34648d48d3804f9419b78718fb2c207e Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Jul 19 21:30:50 2020 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Sep 23 00:22:48 2020 +0200 [CMD] SET: Diverse fixes for the arithmetic-expression parser (/A option). - Detect whether a division by zero is done, and fail if so. - Detect whether an invalid number is provided: * If _tcstol() fails with errno == ERANGE, we've got an overflow or underflow. * If the next character where _tcstol() is not a whitespace but is a character compatible with the first character of an identifier, the number is invalid. - Add + to the list of existing unary operators (!,~,-), and parse them where many of these are present. Indeed, expressions like: +3, -+-+3, !!-+3 (or with other unary ops, etc.) are valid. - Operators constituted of more than one characters, can contain whitespace separating their constituting characters. Thus, "a + = 3" is equivalent to "a += 3" (and the same for -=, *=, /=, %=, &=, |= and ^=), and "a < < 3" is equivalent to "a << 3" (and the same for >>, <<= and >>=). - After evaluating everything, if unparsed data remains, fail and bail out. - Return Windows' CMD-compatible errorlevels. See https://ss64.com/nt/set.html for more details. Fixes some cmd_winetests. --- base/shell/cmd/set.c | 171 +++++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 147 insertions(+), 24 deletions(-) diff --git a/base/shell/cmd/set.c b/base/shell/cmd/set.c index beded9515fc..1adf091ad84 100644 --- a/base/shell/cmd/set.c +++ b/base/shell/cmd/set.c @@ -112,14 +112,22 @@ INT cmd_set(LPTSTR param) if (!_tcsnicmp(param, _T("/A"), 2)) { BOOL Success; + + /* Save error level since seta_eval() modifies it, as + * we need to set it later according to specific rules. */ + INT nOldErrorLevel = nErrorLevel; + StripQuotes(param); Success = seta_eval(skip_ws(param + 2)); if (!Success) { +#if 0 /* Might seem random but this is what windows xp does -- This is a message ID */ retval = 9165; +#endif + retval = nErrorLevel; + nErrorLevel = nOldErrorLevel; } - // return !Success; else { retval = 0; @@ -287,12 +295,33 @@ calc(INT* lval, TCHAR op, INT rval) case '*': *lval *= rval; break; + case '/': + { + if (rval == 0) + { + // FIXME: Localize + ConErrPuts(_T("Division by zero error.\n")); + nErrorLevel = 0x400023D1; // 1073750993; + return FALSE; + } *lval /= rval; break; + } + case '%': + { + if (rval == 0) + { + // FIXME: Localize + ConErrPuts(_T("Division by zero error.\n")); + nErrorLevel = 0x400023D1; // 1073750993; + return FALSE; + } *lval %= rval; break; + } + case '+': *lval += rval; break; @@ -308,8 +337,10 @@ calc(INT* lval, TCHAR op, INT rval) case '|': *lval |= rval; break; + default: ConErrResPuts(STRING_INVALID_OPERAND); + nErrorLevel = 0x400023CE; // 1073750990; return FALSE; } return TRUE; @@ -322,23 +353,47 @@ static BOOL seta_unaryTerm(LPCTSTR* p_, INT* result) { LPCTSTR p = *p_; + INT rval; if (*p == _T('(')) { - INT rval; p = skip_ws(p + 1); if (!seta_stmt(&p, &rval)) return FALSE; if (*p++ != _T(')')) { ConErrResPuts(STRING_EXPECTED_CLOSE_PAREN); + nErrorLevel = 0x400023CC; // 1073750988; return FALSE; } *result = rval; } - else if (isdigit(*p)) + else if (_istdigit(*p)) { - *result = _tcstol(p, (LPTSTR*)&p, 0); + errno = 0; + rval = _tcstol(p, (LPTSTR*)&p, 0); + + /* Check for overflow / underflow */ + if (errno == ERANGE) + { + // FIXME: Localize + ConErrPuts(_T("Invalid number. Numbers are limited to 32-bits of precision.\n")); + nErrorLevel = 0x400023D0; // 1073750992; + return FALSE; + } + /* + * _tcstol() stopped at the first non-digit character. If it's not a whitespace, + * or if it's the start of a possible identifier, this means the number being + * interpreted was invalid. + */ + else if (*p && !_istspace(*p) && __iscsymf(*p)) + { + // FIXME: Localize + ConErrPuts(_T("Invalid number. Numeric constants are either decimal (42), hexadecimal (0x2A), or octal (052).\n")); + nErrorLevel = 0x400023CF; // 1073750991; + return FALSE; + } + *result = rval; } else if (__iscsymf(*p)) { @@ -350,6 +405,7 @@ seta_unaryTerm(LPCTSTR* p_, INT* result) else { ConErrResPuts(STRING_EXPECTED_NUMBER_OR_VARIABLE); + nErrorLevel = 0x400023CD; // 1073750989; return FALSE; } *p_ = skip_ws(p); @@ -363,24 +419,36 @@ seta_mulTerm(LPCTSTR* p_, INT* result) TCHAR op = 0; INT rval; - if (_tcschr(_T("!~-"), *p)) + if (_tcschr(_T("!~-+"), *p)) { op = *p; p = skip_ws(p + 1); + + if (!seta_mulTerm(&p, &rval)) + return FALSE; + + switch (op) + { + case '!': + rval = !rval; + break; + case '~': + rval = ~rval; + break; + case '-': + rval = -rval; + break; +#if 0 + case '+': + rval = rval; + break; +#endif + } } - if (!seta_unaryTerm(&p, &rval)) - return FALSE; - switch (op) + else { - case '!': - rval = !rval; - break; - case '~': - rval = ~rval; - break; - case '-': - rval = -rval; - break; + if (!seta_unaryTerm(&p, &rval)) + return FALSE; } *result = rval; @@ -442,12 +510,18 @@ seta_bitAndTerm(LPCTSTR* p_, INT* result) return FALSE; /* Handle << >> operators */ - while (*p && _tcschr(_T("<>"), *p) && p[0] == p[1]) + while (*p && _tcschr(_T("<>"), *p)) { INT rval; TCHAR op = *p; - p = skip_ws(p + 2); + /* Check whether the next non-whitespace character is the same operator */ + p = skip_ws(p + 1); + if (*p != op) + break; + + /* Skip it */ + p = skip_ws(p + 1); /* Evaluate the immediate right-hand side */ if (!seta_logShiftTerm(&p, &rval)) @@ -473,6 +547,7 @@ seta_bitAndTerm(LPCTSTR* p_, INT* result) default: ConErrResPuts(STRING_INVALID_OPERAND); + nErrorLevel = 0x400023CE; // 1073750990; return FALSE; } } @@ -512,17 +587,56 @@ seta_assignment(LPCTSTR* p_, INT* result) if (identlen) { p = skip_ws(p); + /* Handle = assignment */ if (*p == _T('=')) - op = *p, p = skip_ws(p + 1); + { + op = *p; + p = skip_ws(p + 1); + } /* Handle *= /= %= += -= &= ^= |= assignments */ - else if (_tcschr(_T("*/%+-&^|"), *p) && p[1] == _T('=')) - op = *p, p = skip_ws(p + 2); + else if (_tcschr(_T("*/%+-&^|"), *p)) + { + op = *p; + + /* Find the '=', there may be some spaces before it */ + p = skip_ws(p + 1); + if (*p != _T('=')) + { + op = 0; + goto evaluate; + } + + /* Skip it */ + p = skip_ws(p + 1); + } /* Handle <<= >>= assignments */ - else if (_tcschr(_T("<>"), *p) && *p == p[1] && p[2] == _T('=')) - op = *p, p = skip_ws(p + 3); + else if (_tcschr(_T("<>"), *p)) + { + op = *p; + + /* Check whether the next non-whitespace character is the same operator */ + p = skip_ws(p + 1); + if (*p != op) + { + op = 0; + goto evaluate; + } + + /* Find the '=', there may be some spaces before it */ + p = skip_ws(p + 1); + if (*p != _T('=')) + { + op = 0; + goto evaluate; + } + + /* Skip it */ + p = skip_ws(p + 1); + } } +evaluate: /* Allow to chain multiple assignments, such as: a=b=1 */ if (ident && op) { @@ -613,11 +727,20 @@ seta_eval(LPCTSTR p) if (!*p) { ConErrResPuts(STRING_SYNTAX_COMMAND_INCORRECT); + nErrorLevel = 1; return FALSE; } if (!seta_stmt(&p, &rval)) return FALSE; + /* If unparsed data remains, fail and bail out */ + if (*p) + { + ConErrResPuts(STRING_SYNTAX_COMMAND_INCORRECT); // Actually syntax error / missing operand. + nErrorLevel = 0x400023CE; // 1073750990; + return FALSE; + } + /* Echo the result of the evaluation only in interactive (non-batch) mode */ if (!bc) ConOutPrintf(_T("%i"), rval);

1 0

[reactos] 06/07: [CMD_ROSTEST] Add tests for SET /A errorlevels.
by Hermès Bélusca-Maïto 22 Sep '20

22 Sep '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f5cf67f455f22ac030021… commit f5cf67f455f22ac03002165707bb41a8fdfa8535 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Mon Jul 27 16:46:49 2020 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Sep 23 00:22:48 2020 +0200 [CMD_ROSTEST] Add tests for SET /A errorlevels. --- modules/rostests/win32/cmd/test_builtins.cmd | 56 ++++++++++++++++++++++++ modules/rostests/win32/cmd/test_builtins.cmd.exp | 29 ++++++++++++ 2 files changed, 85 insertions(+) diff --git a/modules/rostests/win32/cmd/test_builtins.cmd b/modules/rostests/win32/cmd/test_builtins.cmd index 4cec71c48aa..5545f33b288 100644 --- a/modules/rostests/win32/cmd/test_builtins.cmd +++ b/modules/rostests/win32/cmd/test_builtins.cmd @@ -498,6 +498,62 @@ goto :eof :continue +:: Testing different ERRORLEVELs from the SET command. +:: See https://ss64.com/nt/set.html for more details. + +echo ---------- Testing SET /A ERRORLEVELs ---------- + +echo --- Success +call :setError 0 +set /a "total=1+1" +call :checkErrorLevel 0 +echo %errorlevel% +echo %total% + +echo --- Unbalanced parentheses +call :setError 0 +set /a "total=(2+1" +call :checkErrorLevel 1073750988 +echo %errorlevel% +echo %total% + +echo --- Missing operand +call :setError 0 +set /a "total=5*" +call :checkErrorLevel 1073750989 +echo %errorlevel% +echo %total% + +echo --- Syntax error +call :setError 0 +set /a "total=7$3" +call :checkErrorLevel 1073750990 +echo %errorlevel% +echo %total% + +echo --- Invalid number +call :setError 0 +set /a "total=0xdeadbeeg" +call :checkErrorLevel 1073750991 +echo %errorlevel% +echo %total% + +echo --- Number larger than 32-bits +call :setError 0 +set /a "total=999999999999999999999999" +call :checkErrorLevel 1073750992 +echo %errorlevel% +echo %total% + +echo --- Division by zero +call :setError 0 +set /a "total=1/0" +call :checkErrorLevel 1073750993 +echo %errorlevel% +echo %total% + + + :: :: Finished! :: diff --git a/modules/rostests/win32/cmd/test_builtins.cmd.exp b/modules/rostests/win32/cmd/test_builtins.cmd.exp index 50cff1eae09..96be9047fda 100644 --- a/modules/rostests/win32/cmd/test_builtins.cmd.exp +++ b/modules/rostests/win32/cmd/test_builtins.cmd.exp @@ -130,4 +130,33 @@ OK 0 0 0 +---------- Testing SET /A ERRORLEVELs ---------- +--- Success +OK +0 +2 +--- Unbalanced parentheses +OK +1073750988 +2 +--- Missing operand +OK +1073750989 +2 +--- Syntax error +OK +1073750990 +7 +--- Invalid number +OK +1073750991 +7 +--- Number larger than 32-bits +OK +1073750992 +7 +--- Division by zero +OK +1073750993 +7 --------- Finished --------------

1 0

[reactos] 05/07: [CMD] Add a MSCMD_BATCH_ECHO define for enabling Windows' CMD.EXE way of preserving/restoring the echo flag across batch calls.
by Hermès Bélusca-Maïto 22 Sep '20

22 Sep '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=87a5403318f4b64f2d8b0… commit 87a5403318f4b64f2d8b0c56ebc69b89889ad6c8 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sat Jul 18 23:41:56 2020 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Sep 23 00:22:47 2020 +0200 [CMD] Add a MSCMD_BATCH_ECHO define for enabling Windows' CMD.EXE way of preserving/restoring the echo flag across batch calls. Observation shows that this is done only when the top-level batch file is being run (and then terminates); the echo flag is not restored to its previous state when a child batch file terminates and gives main back to its parent batch. --- base/shell/cmd/batch.c | 20 ++++++++++++++++++++ base/shell/cmd/batch.h | 10 ++++++++++ 2 files changed, 30 insertions(+) diff --git a/base/shell/cmd/batch.c b/base/shell/cmd/batch.c index 5015bd338ea..1876b84deab 100644 --- a/base/shell/cmd/batch.c +++ b/base/shell/cmd/batch.c @@ -66,6 +66,10 @@ BATCH_TYPE BatType = NONE; PBATCH_CONTEXT bc = NULL; +#ifdef MSCMD_BATCH_ECHO +BOOL bBcEcho = TRUE; +#endif + BOOL bEcho = TRUE; /* The echo flag */ /* Buffer for reading Batch file lines */ @@ -195,8 +199,10 @@ VOID ExitBatch(VOID) UndoRedirection(bc->RedirList, NULL); FreeRedirection(bc->RedirList); +#ifndef MSCMD_BATCH_ECHO /* Preserve echo state across batch calls */ bEcho = bc->bEcho; +#endif while (bc->setlocal) cmd_endlocal(_T("")); @@ -213,6 +219,10 @@ VOID ExitBatch(VOID) { CheckCtrlBreak(BREAK_OUTOFBATCH); BatType = NONE; + +#ifdef MSCMD_BATCH_ECHO + bEcho = bBcEcho; +#endif } } @@ -352,7 +362,9 @@ INT Batch(LPTSTR fullname, LPTSTR firstword, LPTSTR param, PARSED_COMMAND *Cmd) } bc->mempos = 0; /* Go to the beginning of the batch file */ +#ifndef MSCMD_BATCH_ECHO bc->bEcho = bEcho; /* Preserve echo across batch calls */ +#endif for (i = 0; i < 10; i++) bc->shiftlevel[i] = i; @@ -381,6 +393,10 @@ INT Batch(LPTSTR fullname, LPTSTR firstword, LPTSTR param, PARSED_COMMAND *Cmd) { BatType = CMD_TYPE; } + +#ifdef MSCMD_BATCH_ECHO + bBcEcho = bEcho; +#endif } /* Check if this is a "CALL :label" */ @@ -424,6 +440,10 @@ INT Batch(LPTSTR fullname, LPTSTR firstword, LPTSTR param, PARSED_COMMAND *Cmd) { /* Reset the top-level batch context type */ BatType = NONE; + +#ifdef MSCMD_BATCH_ECHO + bEcho = bBcEcho; +#endif } /* Restore the FOR variables */ diff --git a/base/shell/cmd/batch.h b/base/shell/cmd/batch.h index 25b8857b1c3..982965c794a 100644 --- a/base/shell/cmd/batch.h +++ b/base/shell/cmd/batch.h @@ -19,6 +19,10 @@ typedef enum _BATCH_TYPE CMD_TYPE /* New-style NT OS/2 batch file */ } BATCH_TYPE; + +/* Enable this define for Windows' CMD batch-echo behaviour compatibility */ +#define MSCMD_BATCH_ECHO + typedef struct _BATCH_CONTEXT { struct _BATCH_CONTEXT *prev; @@ -30,7 +34,9 @@ typedef struct _BATCH_CONTEXT LPTSTR params; LPTSTR raw_params; /* Holds the raw params given by the input */ INT shiftlevel[10]; +#ifndef MSCMD_BATCH_ECHO BOOL bEcho; /* Preserve echo flag across batch calls */ +#endif REDIRECTION *RedirList; PARSED_COMMAND *current; struct _SETLOCAL *setlocal; @@ -53,6 +59,10 @@ extern BATCH_TYPE BatType; extern PBATCH_CONTEXT bc; extern PFOR_CONTEXT fc; +#ifdef MSCMD_BATCH_ECHO +extern BOOL bBcEcho; +#endif + extern BOOL bEcho; /* The echo flag */ #define BATCH_BUFFSIZE 8192

1 0

[reactos] 04/07: [CMD] ASSOC: Simplify the code and make it more robust; fix returned ERRORLEVEL values.
by Hermès Bélusca-Maïto 22 Sep '20

22 Sep '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=141378cfc8c7964516c1f… commit 141378cfc8c7964516c1f7383110e440aac1f84d Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Tue Jul 28 01:10:58 2020 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Sep 23 00:22:47 2020 +0200 [CMD] ASSOC: Simplify the code and make it more robust; fix returned ERRORLEVEL values. - Make sure that non-administrator users can list associations, and display appropriate error messages when e.g. they don't have sufficient privileges to perform an operation. - Make the helper functions all return Win32 values, used as the ERRORVALUE, except when a specific extension association fails to be displayed, in which case the ERRORVALUE is normalized to 1. - Since the 'param' is a modifiable string (that can be modified by the command, independently of the way it's called), just use it to isolate the extension by zeroing out the equls-sign separator. --- base/shell/cmd/assoc.c | 291 ++++++++++++++++++++++++++++--------------------- 1 file changed, 167 insertions(+), 124 deletions(-) diff --git a/base/shell/cmd/assoc.c b/base/shell/cmd/assoc.c index 3e5611e6b1f..6441d3d369e 100644 --- a/base/shell/cmd/assoc.c +++ b/base/shell/cmd/assoc.c @@ -13,187 +13,232 @@ * * TODO: * - PrintAllAssociations could be optimized to not fetch all registry subkeys under 'Classes', just the ones that start with '.' - * - Make sure that non-administrator users can list associations, and get appropriate error messages when they don't have sufficient - * privileges to perform an operation. */ #include "precomp.h" #ifdef INCLUDE_CMD_ASSOC -static INT -PrintAssociation( - IN LPCTSTR extension) +static LONG +PrintAssociationEx( + IN HKEY hKeyClasses, + IN PCTSTR pszExtension) { - DWORD lRet; - HKEY hKey = NULL, hSubKey = NULL; - DWORD fileTypeLength = 0; - LPTSTR fileType = NULL; - - lRet = RegOpenKeyEx(HKEY_LOCAL_MACHINE, _T("SOFTWARE\\Classes"), 0, KEY_READ, &hKey); - if (lRet != ERROR_SUCCESS) - return -1; - - lRet = RegOpenKeyEx(hKey, extension, 0, KEY_READ, &hSubKey); - RegCloseKey(hKey); + LONG lRet; + HKEY hKey; + DWORD dwFileTypeLen = 0; + PTSTR pszFileType; + lRet = RegOpenKeyEx(hKeyClasses, pszExtension, 0, KEY_QUERY_VALUE, &hKey); if (lRet != ERROR_SUCCESS) - return 0; + { + if (lRet != ERROR_FILE_NOT_FOUND) + ErrorMessage(lRet, NULL); + return lRet; + } - /* Obtain string length */ - lRet = RegQueryValueEx(hSubKey, NULL, NULL, NULL, NULL, &fileTypeLength); + /* Obtain the string length */ + lRet = RegQueryValueEx(hKey, NULL, NULL, NULL, NULL, &dwFileTypeLen); - /* If there is no default value, don't display */ + /* If there is no default value, don't display it */ if (lRet == ERROR_FILE_NOT_FOUND) { - RegCloseKey(hSubKey); - return 0; + RegCloseKey(hKey); + return lRet; } if (lRet != ERROR_SUCCESS) { - RegCloseKey(hSubKey); - return -2; + ErrorMessage(lRet, NULL); + RegCloseKey(hKey); + return lRet; } - fileType = cmd_alloc(fileTypeLength * sizeof(TCHAR)); - if (!fileType) + ++dwFileTypeLen; + pszFileType = cmd_alloc(dwFileTypeLen * sizeof(TCHAR)); + if (!pszFileType) { - WARN("Cannot allocate memory for fileType!\n"); - RegCloseKey(hSubKey); - return -2; + WARN("Cannot allocate memory for pszFileType!\n"); + RegCloseKey(hKey); + return ERROR_NOT_ENOUGH_MEMORY; } - /* Obtain actual file type */ - lRet = RegQueryValueEx(hSubKey, NULL, NULL, NULL, (LPBYTE)fileType, &fileTypeLength); - RegCloseKey(hSubKey); + /* Obtain the actual file type */ + lRet = RegQueryValueEx(hKey, NULL, NULL, NULL, (LPBYTE)pszFileType, &dwFileTypeLen); + RegCloseKey(hKey); if (lRet != ERROR_SUCCESS) { - cmd_free(fileType); - return -2; + ErrorMessage(lRet, NULL); + cmd_free(pszFileType); + return lRet; } - /* If there is a default key, display relevant information */ - if (fileTypeLength != 0) + /* If there is a default key, display the relevant information */ + if (dwFileTypeLen != 0) { - ConOutPrintf(_T("%s=%s\n"), extension, fileType); + ConOutPrintf(_T("%s=%s\n"), pszExtension, pszFileType); } - cmd_free(fileType); - return 1; + cmd_free(pszFileType); + return ERROR_SUCCESS; } -static INT -PrintAllAssociations(VOID) +static LONG +PrintAssociation( + IN PCTSTR pszExtension) { - DWORD lRet = 0; - HKEY hKey = NULL; - DWORD numKeys = 0; + LONG lRet; + HKEY hKeyClasses; + + lRet = RegOpenKeyEx(HKEY_LOCAL_MACHINE, _T("SOFTWARE\\Classes"), 0, + KEY_ENUMERATE_SUB_KEYS, &hKeyClasses); + if (lRet != ERROR_SUCCESS) + { + ErrorMessage(lRet, NULL); + return lRet; + } + + lRet = PrintAssociationEx(hKeyClasses, pszExtension); - DWORD extLength = 0; - LPTSTR extName = NULL; - DWORD keyCtr = 0; + RegCloseKey(hKeyClasses); + return lRet; +} - lRet = RegOpenKeyEx(HKEY_LOCAL_MACHINE, _T("SOFTWARE\\Classes"), 0, KEY_READ, &hKey); +static LONG +PrintAllAssociations(VOID) +{ + LONG lRet; + HKEY hKeyClasses; + DWORD dwKeyCtr; + DWORD dwNumKeys = 0; + DWORD dwExtLen = 0; + PTSTR pszExtName; + + lRet = RegOpenKeyEx(HKEY_LOCAL_MACHINE, _T("SOFTWARE\\Classes"), 0, + KEY_QUERY_VALUE | KEY_ENUMERATE_SUB_KEYS, &hKeyClasses); if (lRet != ERROR_SUCCESS) - return -1; + { + ErrorMessage(lRet, NULL); + return lRet; + } - lRet = RegQueryInfoKey(hKey, NULL, NULL, NULL, &numKeys, &extLength, + lRet = RegQueryInfoKey(hKeyClasses, NULL, NULL, NULL, &dwNumKeys, &dwExtLen, NULL, NULL, NULL, NULL, NULL, NULL); if (lRet != ERROR_SUCCESS) { - RegCloseKey(hKey); - return -2; + ErrorMessage(lRet, NULL); + RegCloseKey(hKeyClasses); + return lRet; } - extLength++; - extName = cmd_alloc(extLength * sizeof(TCHAR)); - if (!extName) + ++dwExtLen; + pszExtName = cmd_alloc(dwExtLen * sizeof(TCHAR)); + if (!pszExtName) { - WARN("Cannot allocate memory for extName!\n"); - RegCloseKey(hKey); - return -2; + WARN("Cannot allocate memory for pszExtName!\n"); + RegCloseKey(hKeyClasses); + return ERROR_NOT_ENOUGH_MEMORY; } - for (keyCtr = 0; keyCtr < numKeys; ++keyCtr) + for (dwKeyCtr = 0; dwKeyCtr < dwNumKeys; ++dwKeyCtr) { - DWORD dwBufSize = extLength; - lRet = RegEnumKeyEx(hKey, keyCtr, extName, &dwBufSize, + DWORD dwBufSize = dwExtLen; + lRet = RegEnumKeyEx(hKeyClasses, dwKeyCtr, pszExtName, &dwBufSize, NULL, NULL, NULL, NULL); if (lRet == ERROR_SUCCESS || lRet == ERROR_MORE_DATA) { - if (*extName == _T('.')) - PrintAssociation(extName); + /* Name starts with '.': this is an extension */ + if (*pszExtName == _T('.')) + PrintAssociationEx(hKeyClasses, pszExtName); } else { - cmd_free(extName); - RegCloseKey(hKey); - return -1; + ErrorMessage(lRet, NULL); + cmd_free(pszExtName); + RegCloseKey(hKeyClasses); + return lRet; } } - RegCloseKey(hKey); + RegCloseKey(hKeyClasses); - cmd_free(extName); - return numKeys; + cmd_free(pszExtName); + return ERROR_SUCCESS; } -static INT +static LONG AddAssociation( - IN LPCTSTR extension, - IN LPCTSTR type) + IN PCTSTR pszExtension, + IN PCTSTR pszType) { - DWORD lRet; - HKEY hKey = NULL, hSubKey = NULL; + LONG lRet; + HKEY hKeyClasses, hKey; - lRet = RegOpenKeyEx(HKEY_LOCAL_MACHINE, _T("SOFTWARE\\Classes"), 0, KEY_ALL_ACCESS, &hKey); + lRet = RegOpenKeyEx(HKEY_LOCAL_MACHINE, _T("SOFTWARE\\Classes"), 0, + KEY_CREATE_SUB_KEY, &hKeyClasses); if (lRet != ERROR_SUCCESS) - return -1; + { + ErrorMessage(lRet, NULL); + return lRet; + } - lRet = RegCreateKeyEx(hKey, extension, 0, NULL, REG_OPTION_NON_VOLATILE, - KEY_ALL_ACCESS, NULL, &hSubKey, NULL); - RegCloseKey(hKey); + lRet = RegCreateKeyEx(hKeyClasses, pszExtension, 0, NULL, REG_OPTION_NON_VOLATILE, + KEY_SET_VALUE, NULL, &hKey, NULL); + RegCloseKey(hKeyClasses); if (lRet != ERROR_SUCCESS) - return -1; + { + ErrorMessage(lRet, NULL); + return lRet; + } - lRet = RegSetValueEx(hSubKey, NULL, 0, REG_SZ, - (LPBYTE)type, (_tcslen(type) + 1) * sizeof(TCHAR)); - RegCloseKey(hSubKey); + lRet = RegSetValueEx(hKey, NULL, 0, REG_SZ, + (LPBYTE)pszType, (DWORD)(_tcslen(pszType) + 1) * sizeof(TCHAR)); + RegCloseKey(hKey); if (lRet != ERROR_SUCCESS) - return -2; + { + ErrorMessage(lRet, NULL); + return lRet; + } - return 0; + return ERROR_SUCCESS; } -static INT +static LONG RemoveAssociation( - IN LPCTSTR extension) + IN PCTSTR pszExtension) { - DWORD lRet; - HKEY hKey; + LONG lRet; + HKEY hKeyClasses; - lRet = RegOpenKeyEx(HKEY_LOCAL_MACHINE, _T("SOFTWARE\\Classes"), 0, KEY_ALL_ACCESS, &hKey); + lRet = RegOpenKeyEx(HKEY_LOCAL_MACHINE, _T("SOFTWARE\\Classes"), 0, + KEY_QUERY_VALUE, &hKeyClasses); if (lRet != ERROR_SUCCESS) - return -1; + { + ErrorMessage(lRet, NULL); + return lRet; + } - lRet = RegDeleteKey(hKey, extension); - RegCloseKey(hKey); + lRet = RegDeleteKey(hKeyClasses, pszExtension); + RegCloseKey(hKeyClasses); if (lRet != ERROR_SUCCESS) - return -2; + { + if (lRet != ERROR_FILE_NOT_FOUND) + ErrorMessage(lRet, NULL); + return lRet; + } - return 0; + return ERROR_SUCCESS; } INT CommandAssoc(LPTSTR param) { INT retval = 0; - LPTSTR lpEqualSign; + PTCHAR pEqualSign; /* Print help */ if (!_tcsncmp(param, _T("/?"), 2)) @@ -202,53 +247,51 @@ INT CommandAssoc(LPTSTR param) return 0; } - if (_tcslen(param) == 0) + /* Print all associations if no parameter has been specified */ + if (!*param) { PrintAllAssociations(); goto Quit; } - lpEqualSign = _tcschr(param, _T('=')); - if (lpEqualSign != NULL) + pEqualSign = _tcschr(param, _T('=')); + if (pEqualSign != NULL) { - LPTSTR fileType = lpEqualSign + 1; - LPTSTR extension = cmd_alloc((lpEqualSign - param + 1) * sizeof(TCHAR)); - if (!extension) - { - WARN("Cannot allocate memory for extension!\n"); - error_out_of_memory(); - retval = 1; - goto Quit; - } + PTSTR pszFileType = pEqualSign + 1; - _tcsncpy(extension, param, lpEqualSign - param); - extension[lpEqualSign - param] = _T('\0'); + /* NULL-terminate at the equals sign */ + *pEqualSign = 0; - /* If the equal sign is the last character - * in the string, then delete the key. */ - if (_tcslen(fileType) == 0) + /* If the equals sign is the last character + * in the string, delete the association. */ + if (*pszFileType == 0) { - retval = RemoveAssociation(extension); + retval = RemoveAssociation(param); } else - /* Otherwise, add the key and print out the association */ + /* Otherwise, add the association and print it out */ { - retval = AddAssociation(extension, fileType); - PrintAssociation(extension); + retval = AddAssociation(param, pszFileType); + PrintAssociation(param); } - cmd_free(extension); - - if (retval) - retval = 1; /* Fixup the error value */ + if (retval != ERROR_SUCCESS) + { + if (retval != ERROR_FILE_NOT_FOUND) + { + // FIXME: Localize + ConErrPrintf(_T("Error occurred while processing: %s.\n"), param); + } + // retval = 1; /* Fixup the error value */ + } } else { - /* No equal sign, print all associations */ + /* No equals sign, print the association */ retval = PrintAssociation(param); - if (retval == 0) /* If nothing printed out */ + if (retval != ERROR_SUCCESS) { - ConOutResPrintf(STRING_ASSOC_ERROR, param); + ConErrResPrintf(STRING_ASSOC_ERROR, param); retval = 1; /* Fixup the error value */ } }

1 0

[reactos] 03/07: [CMD] Change ERRORLEVEL behaviour for commands ASSOC, PATH, PROMPT and SET.
by Hermès Bélusca-Maïto 22 Sep '20

22 Sep '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=63316df5202f6f038cc47… commit 63316df5202f6f038cc47841ed81544fc18263e0 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Wed Jul 1 02:15:52 2020 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Sep 23 00:22:46 2020 +0200 [CMD] Change ERRORLEVEL behaviour for commands ASSOC, PATH, PROMPT and SET. Commands APPEND/DPATH and FTYPE are also concerned by this; however we do not implement them in our CMD.EXE yet. These commands set the ERRORLEVEL differently, whether or not they are run manually from the command-line/from a .BAT file, or from a .CMD file: - From command-line/.BAT file, these commands set the ERRORLEVEL only if an error occurs. So, if two commands are run consecutively and the first one fails, the ERRORLEVEL will remain set even if the second command succeeds. - However, when being run from a .CMD file, these command will always set the ERRORLEVEL. In the example case described above, the second command that succeeds will reset the ERRORLEVEL to 0. This behaviour is determined from the top-level batch/script file being run. This means that, if a .BAT file is first started, then starts a .CMD file, the commands will still behave the .BAT way; on the opposite, if a .CMD file is first started, then starts a .BAT file, these commands will still behave the .CMD way. To implement this we introduce one global BATCH_TYPE enum variable that is initialized to the corresponding batch/script file type when the top-level script is loaded. It is reset to "none" when that script terminates. See https://ss64.com/nt/errorlevel.html for more details, section "Old style .bat Batch files vs .cmd Batch scripts", and https://groups.google.com/forum/#!msg/microsoft.public.win2000.cmdprompt.ad… (comment by Mark Zbikowski). --- base/shell/cmd/assoc.c | 33 +++++++++++++++++++++++++-------- base/shell/cmd/batch.c | 43 ++++++++++++++++++++++++++++++++++++++----- base/shell/cmd/batch.h | 16 ++++++++++++++++ base/shell/cmd/path.c | 34 +++++++++++++++++++++++++--------- base/shell/cmd/prompt.c | 17 ++++++++++++++--- base/shell/cmd/set.c | 49 ++++++++++++++++++++++++++++++++++--------------- 6 files changed, 152 insertions(+), 40 deletions(-) diff --git a/base/shell/cmd/assoc.c b/base/shell/cmd/assoc.c index a9ce5c6682a..3e5611e6b1f 100644 --- a/base/shell/cmd/assoc.c +++ b/base/shell/cmd/assoc.c @@ -192,6 +192,7 @@ RemoveAssociation( INT CommandAssoc(LPTSTR param) { + INT retval = 0; LPTSTR lpEqualSign; /* Print help */ @@ -201,12 +202,10 @@ INT CommandAssoc(LPTSTR param) return 0; } - nErrorLevel = 0; - if (_tcslen(param) == 0) { PrintAllAssociations(); - return 0; + goto Quit; } lpEqualSign = _tcschr(param, _T('=')); @@ -218,7 +217,8 @@ INT CommandAssoc(LPTSTR param) { WARN("Cannot allocate memory for extension!\n"); error_out_of_memory(); - return 1; + retval = 1; + goto Quit; } _tcsncpy(extension, param, lpEqualSign - param); @@ -228,26 +228,43 @@ INT CommandAssoc(LPTSTR param) * in the string, then delete the key. */ if (_tcslen(fileType) == 0) { - RemoveAssociation(extension); + retval = RemoveAssociation(extension); } else /* Otherwise, add the key and print out the association */ { - AddAssociation(extension, fileType); + retval = AddAssociation(extension, fileType); PrintAssociation(extension); } cmd_free(extension); + + if (retval) + retval = 1; /* Fixup the error value */ } else { /* No equal sign, print all associations */ - INT retval = PrintAssociation(param); + retval = PrintAssociation(param); if (retval == 0) /* If nothing printed out */ + { ConOutResPrintf(STRING_ASSOC_ERROR, param); + retval = 1; /* Fixup the error value */ + } } - return 0; +Quit: + if (BatType != CMD_TYPE) + { + if (retval != 0) + nErrorLevel = retval; + } + else + { + nErrorLevel = retval; + } + + return retval; } #endif /* INCLUDE_CMD_ASSOC */ diff --git a/base/shell/cmd/batch.c b/base/shell/cmd/batch.c index e9a1e5aa76e..5015bd338ea 100644 --- a/base/shell/cmd/batch.c +++ b/base/shell/cmd/batch.c @@ -63,6 +63,7 @@ /* The stack of current batch contexts. * NULL when no batch is active. */ +BATCH_TYPE BatType = NONE; PBATCH_CONTEXT bc = NULL; BOOL bEcho = TRUE; /* The echo flag */ @@ -209,7 +210,10 @@ VOID ExitBatch(VOID) /* If there is no more batch contexts, notify the signal handler */ if (!bc) + { CheckCtrlBreak(BREAK_OUTOFBATCH); + BatType = NONE; + } } /* @@ -258,7 +262,8 @@ INT Batch(LPTSTR fullname, LPTSTR firstword, LPTSTR param, PARSED_COMMAND *Cmd) INT ret = 0; INT i; HANDLE hFile = NULL; - BOOL bSameFn = FALSE; + BOOLEAN bSameFn = FALSE; + BOOLEAN bTopLevel; BATCH_CONTEXT new; PFOR_CONTEXT saved_fc; @@ -286,6 +291,13 @@ INT Batch(LPTSTR fullname, LPTSTR firstword, LPTSTR param, PARSED_COMMAND *Cmd) } } + /* + * Remember whether this is a top-level batch context, i.e. if there is + * no batch context existing prior (bc == NULL originally), and we are + * going to create one below. + */ + bTopLevel = !bc; + if (bc != NULL && Cmd == bc->current) { /* Then we are transferring to another batch */ @@ -353,14 +365,28 @@ INT Batch(LPTSTR fullname, LPTSTR firstword, LPTSTR param, PARSED_COMMAND *Cmd) return 1; } - /* Check if this is a "CALL :label" */ - if (*firstword == _T(':')) - ret = cmd_goto(firstword); - /* If we are calling from inside a FOR, hide the FOR variables */ saved_fc = fc; fc = NULL; + /* Perform top-level batch initialization */ + if (bTopLevel) + { + /* Default the top-level batch context type to .BAT */ + BatType = BAT_TYPE; + + /* If this is a .CMD file, adjust the type */ + TCHAR *dot = _tcsrchr(bc->BatchFilePath, _T('.')); + if (dot && (!_tcsicmp(dot, _T(".cmd")))) + { + BatType = CMD_TYPE; + } + } + + /* Check if this is a "CALL :label" */ + if (*firstword == _T(':')) + ret = cmd_goto(firstword); + /* If we have created a new context, don't return * until this batch file has completed. */ while (bc == &new && !bExit) @@ -393,6 +419,13 @@ INT Batch(LPTSTR fullname, LPTSTR firstword, LPTSTR param, PARSED_COMMAND *Cmd) FreeCommand(Cmd); } + /* Perform top-level batch cleanup */ + if (!bc || bTopLevel) + { + /* Reset the top-level batch context type */ + BatType = NONE; + } + /* Restore the FOR variables */ fc = saved_fc; diff --git a/base/shell/cmd/batch.h b/base/shell/cmd/batch.h index d40b640e421..25b8857b1c3 100644 --- a/base/shell/cmd/batch.h +++ b/base/shell/cmd/batch.h @@ -4,6 +4,21 @@ #pragma once +/* + * This batch type enumeration allows us to adjust the behaviour of some commands + * depending on whether they are run from within a .BAT or a .CMD file. + * The behaviour is selected when the top-level batch file is loaded, + * and it remains the same for any child batch file that may be loaded later. + * + * See https://ss64.com/nt/errorlevel.html for more details. + */ +typedef enum _BATCH_TYPE +{ + NONE, + BAT_TYPE, /* Old-style DOS batch file */ + CMD_TYPE /* New-style NT OS/2 batch file */ +} BATCH_TYPE; + typedef struct _BATCH_CONTEXT { struct _BATCH_CONTEXT *prev; @@ -34,6 +49,7 @@ typedef struct _FOR_CONTEXT * The stack of current batch contexts. * NULL when no batch is active. */ +extern BATCH_TYPE BatType; extern PBATCH_CONTEXT bc; extern PFOR_CONTEXT fc; diff --git a/base/shell/cmd/path.c b/base/shell/cmd/path.c index 6235b459362..2286a13e674 100644 --- a/base/shell/cmd/path.c +++ b/base/shell/cmd/path.c @@ -35,14 +35,14 @@ INT cmd_path(LPTSTR param) { + INT retval = 0; + if (!_tcsncmp(param, _T("/?"), 2)) { ConOutResPaging(TRUE, STRING_PATH_HELP1); return 0; } - nErrorLevel = 0; - /* If param is empty, display the PATH environment variable */ if (!param || !*param) { @@ -53,7 +53,9 @@ INT cmd_path(LPTSTR param) if (!pszBuffer) { WARN("Cannot allocate memory for pszBuffer!\n"); - return 1; + error_out_of_memory(); + retval = 1; + goto Quit; } dwBuffer = GetEnvironmentVariable(_T("PATH"), pszBuffer, ENV_BUFFER_SIZE); @@ -61,7 +63,8 @@ INT cmd_path(LPTSTR param) { cmd_free(pszBuffer); ConErrResPrintf(STRING_SET_ENV_ERROR, _T("PATH")); - return 0; + retval = 0; + goto Quit; } else if (dwBuffer > ENV_BUFFER_SIZE) { @@ -70,8 +73,10 @@ INT cmd_path(LPTSTR param) if (!pszBuffer) { WARN("Cannot reallocate memory for pszBuffer!\n"); + error_out_of_memory(); cmd_free(pszOldBuffer); - return 1; + retval = 1; + goto Quit; } GetEnvironmentVariable(_T("PATH"), pszBuffer, dwBuffer); } @@ -79,7 +84,8 @@ INT cmd_path(LPTSTR param) ConOutPrintf(_T("PATH=%s\n"), pszBuffer); cmd_free(pszBuffer); - return 0; + retval = 0; + goto Quit; } /* Skip leading '=' */ @@ -89,11 +95,21 @@ INT cmd_path(LPTSTR param) /* Set PATH environment variable */ if (!SetEnvironmentVariable(_T("PATH"), param)) { - nErrorLevel = 1; - return 1; + retval = 1; + } + +Quit: + if (BatType != CMD_TYPE) + { + if (retval != 0) + nErrorLevel = retval; + } + else + { + nErrorLevel = retval; } - return 0; + return retval; } #endif diff --git a/base/shell/cmd/prompt.c b/base/shell/cmd/prompt.c index ce47cd70499..d835ea5f1e3 100644 --- a/base/shell/cmd/prompt.c +++ b/base/shell/cmd/prompt.c @@ -243,10 +243,11 @@ VOID PrintPrompt(VOID) INT cmd_prompt(LPTSTR param) { + INT retval = 0; + if (!_tcsncmp(param, _T("/?"), 2)) { ConOutResPaging(TRUE, STRING_PROMPT_HELP1); - #ifdef FEATURE_DIRECTORY_STACK ConOutResPaging(FALSE, STRING_PROMPT_HELP2); #endif @@ -263,10 +264,20 @@ INT cmd_prompt(LPTSTR param) if (!SetEnvironmentVariable(_T("PROMPT"), (param && param[0] != _T('\0') ? param : NULL))) { - return 1; + retval = 1; + } + + if (BatType != CMD_TYPE) + { + if (retval != 0) + nErrorLevel = retval; + } + else + { + nErrorLevel = retval; } - return 0; + return retval; } #endif diff --git a/base/shell/cmd/set.c b/base/shell/cmd/set.c index 0128314ca57..beded9515fc 100644 --- a/base/shell/cmd/set.c +++ b/base/shell/cmd/set.c @@ -71,6 +71,7 @@ GetQuotedString(TCHAR *p) INT cmd_set(LPTSTR param) { + INT retval = 0; LPTSTR p; LPTSTR lpEnv; LPTSTR lpOutput; @@ -103,7 +104,8 @@ INT cmd_set(LPTSTR param) FreeEnvironmentStrings(lpEnv); } - return 0; + retval = 0; + goto Quit; } /* The /A does *NOT* have to be followed by a whitespace */ @@ -115,9 +117,14 @@ INT cmd_set(LPTSTR param) if (!Success) { /* Might seem random but this is what windows xp does -- This is a message ID */ - nErrorLevel = 9165; + retval = 9165; + } + // return !Success; + else + { + retval = 0; } - return !Success; + goto Quit; } if (!_tcsnicmp(param, _T("/P"), 2)) @@ -128,8 +135,8 @@ INT cmd_set(LPTSTR param) if (!p) { ConErrResPuts(STRING_SYNTAX_COMMAND_INCORRECT); - nErrorLevel = 1; - return 1; + retval = 1; + goto Quit; } *p++ = _T('\0'); @@ -138,10 +145,11 @@ INT cmd_set(LPTSTR param) if (!*value || !SetEnvironmentVariable(param, value)) { - nErrorLevel = 1; - return 1; + retval = 1; + goto Quit; } - return 0; + retval = 0; + goto Quit; } param = GetQuotedString(param); @@ -154,15 +162,15 @@ INT cmd_set(LPTSTR param) { /* Handle set =val case */ ConErrResPuts(STRING_SYNTAX_COMMAND_INCORRECT); - nErrorLevel = 1; - return 1; + retval = 1; + goto Quit; } *p++ = _T('\0'); if (!SetEnvironmentVariable(param, *p ? p : NULL)) { - nErrorLevel = 1; - return 1; + retval = 1; + goto Quit; } } else @@ -220,12 +228,23 @@ INT cmd_set(LPTSTR param) if (!bFound) { ConErrResPrintf(STRING_SET_ENV_ERROR, param); - nErrorLevel = 1; - return 1; + retval = 1; + goto Quit; } } - return 0; +Quit: + if (BatType != CMD_TYPE) + { + if (retval != 0) + nErrorLevel = retval; + } + else + { + nErrorLevel = retval; + } + + return retval; } static INT

1 0

[reactos] 02/07: [CMD_ROSTEST] Add tests for particular ERRORLEVEL behaviour in some commands.
by Hermès Bélusca-Maïto 22 Sep '20

22 Sep '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0b400bbb98313197147eb… commit 0b400bbb98313197147ebc4718b0618986816641 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Mon Jul 27 16:42:42 2020 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Sep 23 00:22:45 2020 +0200 [CMD_ROSTEST] Add tests for particular ERRORLEVEL behaviour in some commands. --- modules/rostests/win32/cmd/test_builtins.cmd | 102 +++++++++++++++++++++++ modules/rostests/win32/cmd/test_builtins.cmd.exp | 29 +++++++ 2 files changed, 131 insertions(+) diff --git a/modules/rostests/win32/cmd/test_builtins.cmd b/modules/rostests/win32/cmd/test_builtins.cmd index 7e232ca7ca6..4cec71c48aa 100644 --- a/modules/rostests/win32/cmd/test_builtins.cmd +++ b/modules/rostests/win32/cmd/test_builtins.cmd @@ -396,6 +396,108 @@ del tmp.cmd cd .. & rmdir /s/q foobar +:: +:: ERRORLEVEL tests for special commands. +:: +:: For some commands, the errorlevel is set differently, +:: whether or not they are run within a .BAT, a .CMD, or +:: directly from the command-line. +:: +:: These commands are: +:: APPEND/DPATH, ASSOC, FTYPE, PATH, PROMPT, SET. +:: +:: See https://ss64.com/nt/errorlevel.html for more details. +:: + +echo ---------- Testing ERRORLEVEL in .BAT and .CMD ---------- + +:: Use an auxiliary CMD file +mkdir foobar && cd foobar + +echo --- In .BAT file +call :outputErrLvlTestToBatch tmp.bat +cmd /c tmp.bat +del tmp.bat + +echo --- In .CMD file +call :outputErrLvlTestToBatch tmp.cmd +cmd /c tmp.cmd +del tmp.cmd + +:: Cleanup +cd .. & rmdir /s/q foobar + +:: Go to the next tests below. +goto :continue + +:: ERRORLEVEL test helper function +:outputErrLvlTestToBatch (filename) + +echo @echo off> %1 +echo setlocal enableextensions>> %1 + +:: Reset the errorlevel +echo call :zeroErrLvl>> %1 + +:: dpath +:: echo %errorlevel% +:: dpath xxx +:: echo %errorlevel% +:: dpath +:: echo %errorlevel% + +echo assoc^>NUL>> %1 +echo echo %%errorlevel%%>> %1 +echo assoc .nonexisting^>NUL>> %1 +echo echo %%errorlevel%%>> %1 +echo assoc .nonexisting^=^>NUL>> %1 +echo echo %%errorlevel%%>> %1 + +:: ftype +:: echo %errorlevel% +:: ftype xxx +:: echo %errorlevel% +:: ftype +:: echo %errorlevel% + +echo path^>NUL>> %1 +echo echo %%errorlevel%%>> %1 +echo path^;^>NUL>> %1 +echo echo %%errorlevel%%>> %1 + +echo prompt^>NUL>> %1 +echo echo %%errorlevel%%>> %1 +echo prompt ^$p^$g^>NUL>> %1 +echo echo %%errorlevel%%>> %1 +echo prompt foobar^>NUL>> %1 +echo echo %%errorlevel%%>> %1 + +echo set^>NUL>> %1 +echo echo %%errorlevel%%>> %1 +echo set nonexisting^>NUL>> %1 +echo echo %%errorlevel%%>> %1 +echo set nonexisting^=^>NUL>> %1 +echo echo %%errorlevel%%>> %1 +echo set nonexisting^=trololol^>NUL>> %1 +echo echo %%errorlevel%%>> %1 +echo set nonexisting^=^>NUL>> %1 +echo echo %%errorlevel%%>> %1 + +echo goto :eof>> %1 + +:: Zero ERRORLEVEL +echo :zeroErrLvl>> %1 +echo exit /B 0 >> %1 + +goto :eof + + +:: +:: Next suite of tests. +:: +:continue + + :: :: Finished! :: diff --git a/modules/rostests/win32/cmd/test_builtins.cmd.exp b/modules/rostests/win32/cmd/test_builtins.cmd.exp index 98f084e90a4..50cff1eae09 100644 --- a/modules/rostests/win32/cmd/test_builtins.cmd.exp +++ b/modules/rostests/win32/cmd/test_builtins.cmd.exp @@ -101,4 +101,33 @@ OK OK OK OK +---------- Testing ERRORLEVEL in .BAT and .CMD ---------- +--- In .BAT file +0 +1 +2 +2 +2 +2 +2 +2 +2 +1 +1 +1 +1 +--- In .CMD file +0 +1 +2 +0 +0 +0 +0 +0 +0 +1 +0 +0 +0 --------- Finished --------------

1 0

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 September 2020