Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: [CPL][DESK] Don't use magic number (IDI_SHELL_NO)
by Katayama Hirofumi MZ 28 Jan '20

28 Jan '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e2c408f717b140ffb8159… commit e2c408f717b140ffb81596fc57ed23abb2884fc3 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Jan 28 14:19:13 2020 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Tue Jan 28 14:19:13 2020 +0900 [CPL][DESK] Don't use magic number (IDI_SHELL_NO) --- dll/cpl/desk/background.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dll/cpl/desk/background.c b/dll/cpl/desk/background.c index 34a42d27c08..babc006c3f5 100644 --- a/dll/cpl/desk/background.c +++ b/dll/cpl/desk/background.c @@ -320,9 +320,11 @@ AddListViewItems(HWND hwndDlg, PBACKGROUND_DATA pData) himl = ImageList_Create(cx, cy, ILC_COLOR32 | ILC_MASK, 0, 0); /* Load (None) icon */ +#define IDI_SHELL_NO 200 hShell32 = LoadLibraryEx(L"shell32", NULL, LOAD_LIBRARY_AS_DATAFILE); - hIcon = (HICON)LoadImageW(hShell32, MAKEINTRESOURCEW(200), IMAGE_ICON, cx, cy, 0); + hIcon = (HICON)LoadImageW(hShell32, MAKEINTRESOURCEW(IDI_SHELL_NO), IMAGE_ICON, cx, cy, 0); FreeLibrary(hShell32); +#undef IDI_SHELL_NO ListView_SetImageList(hwndBackgroundList, himl, LVSIL_SMALL);

1 0

[reactos] 01/01: [CPL][DESK] Use shell32 icon directly; follow-up to #2281
by Katayama Hirofumi MZ 28 Jan '20

28 Jan '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c069e5c122280670b264e… commit c069e5c122280670b264ec8032c614bc946662ce Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Jan 28 14:05:51 2020 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Tue Jan 28 14:05:51 2020 +0900 [CPL][DESK] Use shell32 icon directly; follow-up to #2281 --- dll/cpl/desk/background.c | 7 ++++++- dll/cpl/desk/desk.rc | 1 - dll/cpl/desk/resource.h | 1 - dll/cpl/desk/resources/none.ico | Bin 23558 -> 0 bytes 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dll/cpl/desk/background.c b/dll/cpl/desk/background.c index f73cdcb9d19..34a42d27c08 100644 --- a/dll/cpl/desk/background.c +++ b/dll/cpl/desk/background.c @@ -309,6 +309,7 @@ AddListViewItems(HWND hwndDlg, PBACKGROUND_DATA pData) HRESULT hr; HICON hIcon; INT cx, cy; + HINSTANCE hShell32; hwndBackgroundList = GetDlgItem(hwndDlg, IDC_BACKGROUND_LIST); @@ -317,7 +318,11 @@ AddListViewItems(HWND hwndDlg, PBACKGROUND_DATA pData) cx = GetSystemMetrics(SM_CXSMICON); cy = GetSystemMetrics(SM_CYSMICON); himl = ImageList_Create(cx, cy, ILC_COLOR32 | ILC_MASK, 0, 0); - hIcon = (HICON)LoadImageW(hApplet, MAKEINTRESOURCEW(IDI_NONE), IMAGE_ICON, cx, cy, 0); + + /* Load (None) icon */ + hShell32 = LoadLibraryEx(L"shell32", NULL, LOAD_LIBRARY_AS_DATAFILE); + hIcon = (HICON)LoadImageW(hShell32, MAKEINTRESOURCEW(200), IMAGE_ICON, cx, cy, 0); + FreeLibrary(hShell32); ListView_SetImageList(hwndBackgroundList, himl, LVSIL_SMALL); diff --git a/dll/cpl/desk/desk.rc b/dll/cpl/desk/desk.rc index 60352eda891..08301b0fee7 100644 --- a/dll/cpl/desk/desk.rc +++ b/dll/cpl/desk/desk.rc @@ -14,7 +14,6 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL IDC_DESK_ICON ICON "resources/applet.ico" IDC_DESK_ICON2 ICON "resources/applet.ico" -IDI_NONE ICON "resources/none.ico" IDC_MONITOR BITMAP "resources/monitor.bmp" diff --git a/dll/cpl/desk/resource.h b/dll/cpl/desk/resource.h index bbe32ea6469..816ab45311f 100644 --- a/dll/cpl/desk/resource.h +++ b/dll/cpl/desk/resource.h @@ -3,7 +3,6 @@ /* ids */ #define IDC_DESK_ICON 40 #define IDC_DESK_ICON2 100 /* Needed for theme compatability with Windows. */ -#define IDI_NONE 101 #define IDC_STATIC -1 diff --git a/dll/cpl/desk/resources/none.ico b/dll/cpl/desk/resources/none.ico deleted file mode 100644 index f306984bdb4..00000000000 Binary files a/dll/cpl/desk/resources/none.ico and /dev/null differ

1 0

[reactos] 01/01: [CPL][DESK] Add icons to 'Background' tab (#2281)
by Katayama Hirofumi MZ 28 Jan '20

28 Jan '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cc794e564a5b773e3eafc… commit cc794e564a5b773e3eafcef46f497522f42d4e8f Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Jan 28 13:41:29 2020 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Jan 28 13:41:29 2020 +0900 [CPL][DESK] Add icons to 'Background' tab (#2281) Add icons into "Background" tab of "Properties for Display" dialog. CORE-16665 --- dll/cpl/desk/background.c | 119 +++++++++++++++++++++------------------- dll/cpl/desk/desk.rc | 1 + dll/cpl/desk/resource.h | 1 + dll/cpl/desk/resources/none.ico | Bin 0 -> 23558 bytes 4 files changed, 64 insertions(+), 57 deletions(-) diff --git a/dll/cpl/desk/background.c b/dll/cpl/desk/background.c index a92f27b7185..f73cdcb9d19 100644 --- a/dll/cpl/desk/background.c +++ b/dll/cpl/desk/background.c @@ -203,6 +203,8 @@ AddWallpapersFromDirectory(UINT uCounter, HWND hwndBackgroundList, BackgroundIte return i; } + himl = ListView_GetImageList(hwndBackgroundList, LVSIL_SMALL); + token = _tcstok(szFileTypes, separators); while (token != NULL) { @@ -227,19 +229,13 @@ AddWallpapersFromDirectory(UINT uCounter, HWND hwndBackgroundList, BackgroundIte /* Don't add any hidden bitmaps. Also don't add current wallpaper once more. */ if (((fd.dwFileAttributes & FILE_ATTRIBUTE_HIDDEN) == 0) && (_tcsicmp(wallpaperFilename, filename) != 0)) { - himl = (HIMAGELIST)SHGetFileInfo(filename, - 0, - &sfi, - sizeof(sfi), - SHGFI_SYSICONINDEX | SHGFI_SMALLICON | - SHGFI_DISPLAYNAME); - if (himl == NULL) - break; - - if (i++ == 0) - { - (void)ListView_SetImageList(hwndBackgroundList, himl, LVSIL_SMALL); - } + SHGetFileInfo(filename, + 0, + &sfi, + sizeof(sfi), + SHGFI_ICON | SHGFI_SMALLICON | SHGFI_DISPLAYNAME); + sfi.iIcon = ImageList_AddIcon(himl, sfi.hIcon); + i++; backgroundItem = &pData->backgroundItems[pData->listViewItemCount]; @@ -311,11 +307,20 @@ AddListViewItems(HWND hwndDlg, PBACKGROUND_DATA pData) BackgroundItem *backgroundItem = NULL; HWND hwndBackgroundList; HRESULT hr; + HICON hIcon; + INT cx, cy; hwndBackgroundList = GetDlgItem(hwndDlg, IDC_BACKGROUND_LIST); GetClientRect(hwndBackgroundList, &clientRect); + cx = GetSystemMetrics(SM_CXSMICON); + cy = GetSystemMetrics(SM_CYSMICON); + himl = ImageList_Create(cx, cy, ILC_COLOR32 | ILC_MASK, 0, 0); + hIcon = (HICON)LoadImageW(hApplet, MAKEINTRESOURCEW(IDI_NONE), IMAGE_ICON, cx, cy, 0); + + ListView_SetImageList(hwndBackgroundList, himl, LVSIL_SMALL); + /* Add a new column to the list */ ZeroMemory(&dummy, sizeof(LV_COLUMN)); dummy.mask = LVCF_SUBITEM | LVCF_WIDTH; @@ -335,9 +340,10 @@ AddListViewItems(HWND hwndDlg, PBACKGROUND_DATA pData) listItem.mask = LVIF_TEXT | LVIF_PARAM | LVIF_STATE | LVIF_IMAGE; listItem.state = 0; listItem.pszText = backgroundItem->szDisplayName; - listItem.iImage = -1; + listItem.iImage = ImageList_AddIcon(himl, hIcon); listItem.iItem = pData->listViewItemCount; listItem.lParam = pData->listViewItemCount; + hIcon = NULL; (void)ListView_InsertItem(hwndBackgroundList, &listItem); ListView_SetItemState(hwndBackgroundList, @@ -385,55 +391,51 @@ AddListViewItems(HWND hwndDlg, PBACKGROUND_DATA pData) } } - himl = (HIMAGELIST)SHGetFileInfo(wallpaperFilename, - 0, - &sfi, - sizeof(sfi), - SHGFI_SYSICONINDEX | SHGFI_SMALLICON | - SHGFI_DISPLAYNAME); - if (himl != NULL) - { - if (i++ == 0) - { - (void)ListView_SetImageList(hwndBackgroundList, himl, LVSIL_SMALL); - } - - backgroundItem = &pData->backgroundItems[pData->listViewItemCount]; + SHGetFileInfoW(wallpaperFilename, + 0, + &sfi, + sizeof(sfi), + SHGFI_ICON | SHGFI_SMALLICON | + SHGFI_DISPLAYNAME); + sfi.iIcon = ImageList_AddIcon(himl, sfi.hIcon); - backgroundItem->bWallpaper = TRUE; + i++; - hr = StringCbCopy(backgroundItem->szDisplayName, sizeof(backgroundItem->szDisplayName), sfi.szDisplayName); - if (FAILED(hr)) - { - RegCloseKey(regKey); - return; - } + backgroundItem = &pData->backgroundItems[pData->listViewItemCount]; - PathRemoveExtension(backgroundItem->szDisplayName); + backgroundItem->bWallpaper = TRUE; - hr = StringCbCopy(backgroundItem->szFilename, sizeof(backgroundItem->szFilename), wallpaperFilename); - if (FAILED(hr)) - { - RegCloseKey(regKey); - return; - } - - ZeroMemory(&listItem, sizeof(LV_ITEM)); - listItem.mask = LVIF_TEXT | LVIF_PARAM | LVIF_STATE | LVIF_IMAGE; - listItem.state = 0; - listItem.pszText = backgroundItem->szDisplayName; - listItem.iImage = sfi.iIcon; - listItem.iItem = pData->listViewItemCount; - listItem.lParam = pData->listViewItemCount; + hr = StringCbCopy(backgroundItem->szDisplayName, sizeof(backgroundItem->szDisplayName), sfi.szDisplayName); + if (FAILED(hr)) + { + RegCloseKey(regKey); + return; + } - (void)ListView_InsertItem(hwndBackgroundList, &listItem); - ListView_SetItemState(hwndBackgroundList, - pData->listViewItemCount, - LVIS_SELECTED, - LVIS_SELECTED); + PathRemoveExtension(backgroundItem->szDisplayName); - pData->listViewItemCount++; + hr = StringCbCopy(backgroundItem->szFilename, sizeof(backgroundItem->szFilename), wallpaperFilename); + if (FAILED(hr)) + { + RegCloseKey(regKey); + return; } + + ZeroMemory(&listItem, sizeof(LV_ITEM)); + listItem.mask = LVIF_TEXT | LVIF_PARAM | LVIF_STATE | LVIF_IMAGE; + listItem.state = 0; + listItem.pszText = backgroundItem->szDisplayName; + listItem.iImage = sfi.iIcon; + listItem.iItem = pData->listViewItemCount; + listItem.lParam = pData->listViewItemCount; + + (void)ListView_InsertItem(hwndBackgroundList, &listItem); + ListView_SetItemState(hwndBackgroundList, + pData->listViewItemCount, + LVIS_SELECTED, + LVIS_SELECTED); + + pData->listViewItemCount++; } RegCloseKey(regKey); @@ -640,8 +642,10 @@ OnBrowseButton(HWND hwndDlg, PBACKGROUND_DATA pData) size_t sizeRemain; SIZE_T buffersize; BOOL success; + HIMAGELIST himl; hwndBackgroundList = GetDlgItem(hwndDlg, IDC_BACKGROUND_LIST); + himl = ListView_GetImageList(hwndBackgroundList, LVSIL_SMALL); ZeroMemory(&ofn, sizeof(OPENFILENAME)); @@ -715,7 +719,8 @@ OnBrowseButton(HWND hwndDlg, PBACKGROUND_DATA pData) 0, &sfi, sizeof(sfi), - SHGFI_SYSICONINDEX | SHGFI_SMALLICON | SHGFI_DISPLAYNAME); + SHGFI_ICON | SHGFI_SMALLICON | SHGFI_DISPLAYNAME); + sfi.iIcon = ImageList_AddIcon(himl, sfi.hIcon); backgroundItem = &pData->backgroundItems[pData->listViewItemCount]; diff --git a/dll/cpl/desk/desk.rc b/dll/cpl/desk/desk.rc index 08301b0fee7..60352eda891 100644 --- a/dll/cpl/desk/desk.rc +++ b/dll/cpl/desk/desk.rc @@ -14,6 +14,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL IDC_DESK_ICON ICON "resources/applet.ico" IDC_DESK_ICON2 ICON "resources/applet.ico" +IDI_NONE ICON "resources/none.ico" IDC_MONITOR BITMAP "resources/monitor.bmp" diff --git a/dll/cpl/desk/resource.h b/dll/cpl/desk/resource.h index 816ab45311f..bbe32ea6469 100644 --- a/dll/cpl/desk/resource.h +++ b/dll/cpl/desk/resource.h @@ -3,6 +3,7 @@ /* ids */ #define IDC_DESK_ICON 40 #define IDC_DESK_ICON2 100 /* Needed for theme compatability with Windows. */ +#define IDI_NONE 101 #define IDC_STATIC -1 diff --git a/dll/cpl/desk/resources/none.ico b/dll/cpl/desk/resources/none.ico new file mode 100644 index 00000000000..f306984bdb4 Binary files /dev/null and b/dll/cpl/desk/resources/none.ico differ

1 0

[reactos] 01/01: [NETID] Fix typo in de-DE.rc
by Joachim Henze 27 Jan '20

27 Jan '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=75274833012f7d75e8915… commit 75274833012f7d75e89156d234e3ef3a9bc223a3 Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Mon Jan 27 20:11:25 2020 +0100 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Mon Jan 27 20:11:25 2020 +0100 [NETID] Fix typo in de-DE.rc addendum to 0.4.14-dev-854-g b9426a3f0e15e43ddeef94234c7074cf5f8dfaca --- dll/win32/netid/lang/de-DE.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/win32/netid/lang/de-DE.rc b/dll/win32/netid/lang/de-DE.rc index 5c3e24c60f9..b746ded95f2 100644 --- a/dll/win32/netid/lang/de-DE.rc +++ b/dll/win32/netid/lang/de-DE.rc @@ -72,7 +72,7 @@ BEGIN 4 "Computernamen ändern" 5 "Arbeitsgruppe:" 6 "Domäne:" - 7 "Der Domänenname ""%1"" enspricht nicht den Internet-DNS-Richtlinien, obwohl er ein gültiger ReactOS-Name ist. Verwenden Sie den ReactOS DNS-Server für nicht standardmäßige Namen." + 7 "Der Domänenname ""%1"" entspricht nicht den Internet-DNS-Richtlinien, obwohl er ein gültiger ReactOS-Name ist. Verwenden Sie den ReactOS DNS-Server für nicht standardmäßige Namen." 8 "Der Domänenname ""%1"" ist nicht richtig formatiert. Domänen werden mit einem Punkt (.) abgetrennt. Jede Domäne ist auf 63 Zeichen begrenzt. Beispiel: domain-1.reactos.org." 10 "Der neue Computername ""%1"" ist zu lang. Der Name darf nicht länger als 63 Zeichen sein." 11 "Der neue Computername wurde nicht ordnungsgemäß formatiert. Standardnamen dürfen Buchstaben (a-z, A-Z), Zahlen (0-9) und Bindestriche (-), aber keine Leerzeichen oder Punkte (.) enthalten. Der Name darf nicht ausschließlich aus Ziffern bestehen."

1 0

[reactos] 01/01: [APPWIZ] Delete shortcut file upon user cancel (#2279)
by Katayama Hirofumi MZ 27 Jan '20

27 Jan '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=afb0ae877c710447e7eee… commit afb0ae877c710447e7eee0d4f3eb1ba32e5fa4c8 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Jan 27 22:58:58 2020 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Jan 27 22:58:58 2020 +0900 [APPWIZ] Delete shortcut file upon user cancel (#2279) If the user cancelled, then "Create shortcut" Wizard deletes the shortcut file. CORE-16534 --- dll/cpl/appwiz/createlink.c | 49 +++++++++++++++++++++++++++++---------------- 1 file changed, 32 insertions(+), 17 deletions(-) diff --git a/dll/cpl/appwiz/createlink.c b/dll/cpl/appwiz/createlink.c index 77213efefe2..7925f0b2ea3 100644 --- a/dll/cpl/appwiz/createlink.c +++ b/dll/cpl/appwiz/createlink.c @@ -190,6 +190,7 @@ WelcomeDlgProc(HWND hwndDlg, WCHAR szDesc[100]; BROWSEINFOW brws; LPITEMIDLIST pidllist; + LPWSTR pch; switch(uMsg) { @@ -236,10 +237,9 @@ WelcomeDlgProc(HWND hwndDlg, break; case WM_NOTIFY: lppsn = (LPPSHNOTIFY) lParam; + pContext = (PCREATE_LINK_CONTEXT)GetWindowLongPtr(hwndDlg, DWLP_USER); if (lppsn->hdr.code == PSN_WIZNEXT) { - LPWSTR pch; - pContext = (PCREATE_LINK_CONTEXT) GetWindowLongPtr(hwndDlg, DWLP_USER); GetDlgItemTextW(hwndDlg, IDC_SHORTCUT_LOCATION, pContext->szTarget, _countof(pContext->szTarget)); StrTrimW(pContext->szTarget, L" \t"); @@ -278,6 +278,12 @@ WelcomeDlgProc(HWND hwndDlg, MessageBoxW(hwndDlg, szError, szDesc, MB_ICONERROR); } } + else if (lppsn->hdr.code == PSN_RESET) + { + /* The user has clicked [Cancel] */ + DeleteFileW(pContext->szOldFile); + SHChangeNotify(SHCNE_DELETE, SHCNF_PATHW, pContext->szOldFile, NULL); + } break; } return FALSE; @@ -293,6 +299,7 @@ FinishDlgProc(HWND hwndDlg, LPPROPSHEETPAGEW ppsp; PCREATE_LINK_CONTEXT pContext; LPPSHNOTIFY lppsn; + LPWSTR pch; switch(uMsg) { @@ -323,17 +330,12 @@ FinishDlgProc(HWND hwndDlg, pContext = (PCREATE_LINK_CONTEXT) GetWindowLongPtr(hwndDlg, DWLP_USER); if (lppsn->hdr.code == PSN_WIZFINISH) { - LPWSTR pch; - DWORD attrs; GetDlgItemTextW(hwndDlg, IDC_SHORTCUT_NAME, pContext->szDescription, MAX_PATH); StrTrimW(pContext->szDescription, L" \t"); /* if old shortcut file exists, then delete it now */ - attrs = GetFileAttributesW(pContext->szOldFile); - if (attrs != INVALID_FILE_ATTRIBUTES && !(attrs & FILE_ATTRIBUTE_DIRECTORY)) - { - DeleteFileW(pContext->szOldFile); - } + DeleteFileW(pContext->szOldFile); + SHChangeNotify(SHCNE_DELETE, SHCNF_PATHW, pContext->szOldFile, NULL); if (IsInternetLocation(pContext->szTarget)) { @@ -376,6 +378,12 @@ FinishDlgProc(HWND hwndDlg, } } } + else if (lppsn->hdr.code == PSN_RESET) + { + /* The user has clicked [Cancel] */ + DeleteFileW(pContext->szOldFile); + SHChangeNotify(SHCNE_DELETE, SHCNF_PATHW, pContext->szOldFile, NULL); + } break; } return FALSE; @@ -406,9 +414,9 @@ ShowCreateShortcutWizard(HWND hwndCPl, LPWSTR szPath) PROPSHEETPAGE psp; UINT nPages = 0; UINT nLength; - DWORD attrs; PCREATE_LINK_CONTEXT pContext; WCHAR szMessage[128]; + LPWSTR pch; pContext = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*pContext)); if (!pContext) @@ -430,8 +438,7 @@ ShowCreateShortcutWizard(HWND hwndCPl, LPWSTR szPath) return FALSE; } - attrs = GetFileAttributesW(szPath); - if (attrs == INVALID_FILE_ATTRIBUTES) + if (!PathFileExistsW(szPath)) { HeapFree(GetProcessHeap(), 0, pContext); @@ -442,13 +449,21 @@ ShowCreateShortcutWizard(HWND hwndCPl, LPWSTR szPath) } /* build the pContext->szOrigin and pContext->szOldFile */ - StringCchCopyW(pContext->szOrigin, _countof(pContext->szOrigin), szPath); - pContext->szOldFile[0] = 0; - if (!(attrs & FILE_ATTRIBUTE_DIRECTORY)) + if (PathIsDirectoryW(szPath)) { - LPWSTR pch; - StringCchCopyW(pContext->szOldFile, _countof(pContext->szOldFile), szPath); + StringCchCopyW(pContext->szOrigin, _countof(pContext->szOrigin), szPath); + pContext->szOldFile[0] = 0; + } + else + { + StringCchCopyW(pContext->szOrigin, _countof(pContext->szOrigin), szPath); pch = PathFindFileNameW(pContext->szOrigin); + if (pch && *pch) + *pch = 0; + + StringCchCopyW(pContext->szOldFile, _countof(pContext->szOldFile), szPath); + + pch = PathFindFileNameW(szPath); if (pch && *pch) { /* build szDescription */

1 0

[reactos] 01/01: [NETID] Fix validation of host and domain names and show proper error messages.
by Eric Kohl 26 Jan '20

26 Jan '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b9426a3f0e15e43ddeef9… commit b9426a3f0e15e43ddeef94234c7074cf5f8dfaca Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Jan 26 21:00:12 2020 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Jan 26 21:00:12 2020 +0100 [NETID] Fix validation of host and domain names and show proper error messages. --- dll/win32/netid/lang/bg-BG.rc | 9 ++- dll/win32/netid/lang/cs-CZ.rc | 9 ++- dll/win32/netid/lang/de-DE.rc | 9 ++- dll/win32/netid/lang/el-GR.rc | 9 ++- dll/win32/netid/lang/en-US.rc | 11 +++- dll/win32/netid/lang/es-ES.rc | 9 ++- dll/win32/netid/lang/fr-FR.rc | 9 ++- dll/win32/netid/lang/he-IL.rc | 11 +++- dll/win32/netid/lang/id-ID.rc | 9 ++- dll/win32/netid/lang/it-IT.rc | 9 ++- dll/win32/netid/lang/ja-JP.rc | 9 ++- dll/win32/netid/lang/nl-NL.rc | 9 ++- dll/win32/netid/lang/no-NO.rc | 9 ++- dll/win32/netid/lang/pl-PL.rc | 9 ++- dll/win32/netid/lang/pt-PT.rc | 11 +++- dll/win32/netid/lang/ro-RO.rc | 11 +++- dll/win32/netid/lang/ru-RU.rc | 9 ++- dll/win32/netid/lang/sk-SK.rc | 9 ++- dll/win32/netid/lang/sq-AL.rc | 11 +++- dll/win32/netid/lang/tr-TR.rc | 11 +++- dll/win32/netid/lang/uk-UA.rc | 9 ++- dll/win32/netid/lang/zh-CN.rc | 11 +++- dll/win32/netid/lang/zh-TW.rc | 7 ++- dll/win32/netid/netid.c | 132 +++++++++++++++++++++++++++++++++--------- 24 files changed, 284 insertions(+), 67 deletions(-) diff --git a/dll/win32/netid/lang/bg-BG.rc b/dll/win32/netid/lang/bg-BG.rc index caa853c4594..3c4bf1c6a19 100644 --- a/dll/win32/netid/lang/bg-BG.rc +++ b/dll/win32/netid/lang/bg-BG.rc @@ -64,13 +64,20 @@ BEGIN 4 "Смяна името на компютъра" 5 "Работна група" 6 "Имение:" + 7 "The domain name ""%1"" does not conform to Internet Domain Name Service specifications, although it is a legal ReactOS name. You must use ReactOS DNS server for non-standard names." + 8 "The domain name ""%1"" is not properly formatted. Periods (.) are used to separate domains. Each domain is limited to 63 characters. Example: domain-1.reactos.org." + 10 "The new computer name ""%1"" is too long. The name may not be longer than 63 characters." + 11 "The new computer name entered is not properly formatted. Standard names may contain letters (a-z, A-Z), numbers (0-9), and hyphens (-), but no spaces or periods (.). The name may not consist entirely of digits." 22 "Добре дошли в работна група %1." 23 "Добре дошли в имение %1." 24 "Трябва да презапуснете компютъра, за да влязат промените в действие." 25 "Можете да смените името и членството на компютъра. Възможно е промените могат да повлияят на достъпа до мрежовите източници." 1021 "Забележка: Само управниците могат да променят опознавателите на компютъра." 1022 "Забележка: Опознавателят на компютъра не може да бъде сменен, защото:" - 1030 "Новото име на компютъра „%s“ съдържа непозволени знаци. Някои от непозволените знаци са ` ~ ! @ # $ %% ^ & * ( ) = + _ [ ] { } \\ | ; : ' "" , . < > / и ?" + 1029 "The new computer name ""%1"" is a number. The name may not be a number." + 1030 "Новото име на компютъра „%1“ съдържа непозволени знаци. Някои от непозволените знаци са ` ~ ! @ # $ %% ^ & * ( ) = + [ ] { } \\ | ; : ' "" , < > / и ?" + 1031 "The first domain of the domain name ""%1"" is a number. The first domain may not be a number." + 1032 "The domain name ""%1"" contains characters which are not allowed. Standard DNS names may contain letters (a-z, A-Z), numbers (0-9), and hyphens, but no spaces. Periods (.) are used to separate domains. Example: domain-1.reactos.org." 3210 "&По&дробности >>" 3220 "<< &По&дробности" 4000 "Сведения" diff --git a/dll/win32/netid/lang/cs-CZ.rc b/dll/win32/netid/lang/cs-CZ.rc index bef09aecf51..714f62b8583 100644 --- a/dll/win32/netid/lang/cs-CZ.rc +++ b/dll/win32/netid/lang/cs-CZ.rc @@ -69,13 +69,20 @@ BEGIN 4 "Změna názvu počítače" 5 "Pracovní skupina:" 6 "Doména:" + 7 "The domain name ""%1"" does not conform to Internet Domain Name Service specifications, although it is a legal ReactOS name. You must use ReactOS DNS server for non-standard names." + 8 "The domain name ""%1"" is not properly formatted. Periods (.) are used to separate domains. Each domain is limited to 63 characters. Example: domain-1.reactos.org." + 10 "The new computer name ""%1"" is too long. The name may not be longer than 63 characters." + 11 "The new computer name entered is not properly formatted. Standard names may contain letters (a-z, A-Z), numbers (0-9), and hyphens (-), but no spaces or periods (.). The name may not consist entirely of digits." 22 "Vítejte v pracovní skupině %1." 23 "Vítejte v doméně %1." 24 "Aby se změny mohly projevit, musí být počítač restartován." 25 "Lze změnit název a členství tohoto počítače. Změny mohou mít vliv na přístup k síťovým prostředkům." 1021 "Poznámka: Identifikaci tohoto počítače mohou změnit pouze administrátoři." 1022 "Poznámka: Identifikace počítače nemůže být změněna z následujících důvodů:" - 1030 "Nový název počítače ""%s"" obsahuje nepovolené znaky. Mezi nepovolené znaky patří ` ~ ! @ # $ %% ^ & * ( ) = + _ [ ] { } \\ | ; : ' "" , . < > / ?" + 1029 "The new computer name ""%1"" is a number. The name may not be a number." + 1030 "Nový název počítače ""%1"" obsahuje nepovolené znaky. Mezi nepovolené znaky patří ` ~ ! @ # $ %% ^ & * ( ) = + [ ] { } \\ | ; : ' "" , < > / ?" + 1031 "The first domain of the domain name ""%1"" is a number. The first domain may not be a number." + 1032 "The domain name ""%1"" contains characters which are not allowed. Standard DNS names may contain letters (a-z, A-Z), numbers (0-9), and hyphens, but no spaces. Periods (.) are used to separate domains. Example: domain-1.reactos.org." 3210 "&Detaily >>" 3220 "<< &Detaily" 4000 "Informace" diff --git a/dll/win32/netid/lang/de-DE.rc b/dll/win32/netid/lang/de-DE.rc index 3dbeacfa291..5c3e24c60f9 100644 --- a/dll/win32/netid/lang/de-DE.rc +++ b/dll/win32/netid/lang/de-DE.rc @@ -72,13 +72,20 @@ BEGIN 4 "Computernamen ändern" 5 "Arbeitsgruppe:" 6 "Domäne:" + 7 "Der Domänenname ""%1"" enspricht nicht den Internet-DNS-Richtlinien, obwohl er ein gültiger ReactOS-Name ist. Verwenden Sie den ReactOS DNS-Server für nicht standardmäßige Namen." + 8 "Der Domänenname ""%1"" ist nicht richtig formatiert. Domänen werden mit einem Punkt (.) abgetrennt. Jede Domäne ist auf 63 Zeichen begrenzt. Beispiel: domain-1.reactos.org." + 10 "Der neue Computername ""%1"" ist zu lang. Der Name darf nicht länger als 63 Zeichen sein." + 11 "Der neue Computername wurde nicht ordnungsgemäß formatiert. Standardnamen dürfen Buchstaben (a-z, A-Z), Zahlen (0-9) und Bindestriche (-), aber keine Leerzeichen oder Punkte (.) enthalten. Der Name darf nicht ausschließlich aus Ziffern bestehen." 22 "Willkommen in der Arbeitsgruppe %1" 23 "Willkommen in der Domäne %1" 24 "Sie müssen den Computer neu starten, damit die Änderungen wirksam werden." 25 "Sie können den Namen und die Zugehörigkeit dieses Computers ändern. Änderungen können sich auf den Zugriff auf Netzwerkressourcen auswirken." 1021 "Hinweis: Nur Administratoren können die Identifikation des Computers ändern." 1022 "Hinweis: Die Identifikation des Computers kann aus folgendem Grund nicht geändert werden:" - 1030 "Der Computername ""%s"" enthält unerlaubte Zeichen. Unerlaubte Zeichen sind ` ~ ! @ # $ %% ^ & * ( ) = + _ [ ] { } \\ | ; : ' "" , . < > / und ?" + 1029 "Der neue Computername ""%1"" ist eine Zahl. Der Name darf keine Zahl sein." + 1030 "Der neue Computername ""%s"" enthält nicht erlaubte Zeichen. Nicht erlaubte Zeichen sind: ` ~ ! @ # $ %% ^ & * ( ) = + [ ] { } \\ | ; : ' "" , < > / und ?" + 1031 "Die erste Domäne des Domänennamens ""%1"" ist eine Zahl. Die erste Domäne darf keine Zahl sein." + 1032 "Der Domänenname ""%1"" enthält nicht erlaubte Zeichen. Standard DNS-Namen dürfen Buchstaben (a-z, A-Z), Zahlen (0-9) und Bindestriche, aber keine Leerzeichen enthalten. Domänen werden mit einem Punkt (.) getrennt. Beispiel: domain-1.reactos.org." 3210 "&Details >>" 3220 "<< &Details" 4000 "Information" diff --git a/dll/win32/netid/lang/el-GR.rc b/dll/win32/netid/lang/el-GR.rc index 96dd6c890cf..564cc0093fa 100644 --- a/dll/win32/netid/lang/el-GR.rc +++ b/dll/win32/netid/lang/el-GR.rc @@ -64,13 +64,20 @@ BEGIN 4 "Computer Name Changes" 5 "Workgroup:" 6 "Domain:" + 7 "The domain name ""%1"" does not conform to Internet Domain Name Service specifications, although it is a legal ReactOS name. You must use ReactOS DNS server for non-standard names." + 8 "The domain name ""%1"" is not properly formatted. Periods (.) are used to separate domains. Each domain is limited to 63 characters. Example: domain-1.reactos.org." + 10 "The new computer name ""%1"" is too long. The name may not be longer than 63 characters." + 11 "The new computer name entered is not properly formatted. Standard names may contain letters (a-z, A-Z), numbers (0-9), and hyphens (-), but no spaces or periods (.). The name may not consist entirely of digits." 22 "Welcome to the %1 workgroup." 23 "Welcome to the %1 domain." 24 "You must restart this computer for the changes to take effect." 25 "You can change the name and the membership of this computer. Changes may affect access to network resources." 1021 "Note: Only Administrators can change the identification of this computer." 1022 "Note: The identification of the computer cannot be changed because:" - 1030 "The new computer name ""%s"" contains characters which are not allowed. Characters which are not allowed include ` ~ ! @ # $ %% ^ & * ( ) = + _ [ ] { } \\ | ; : ' "" , . < > / and ?" + 1029 "The new computer name ""%1"" is a number. The name may not be a number." + 1030 "The new computer name ""%1"" contains characters which are not allowed. Characters which are not allowed include ` ~ ! @ # $ %% ^ & * ( ) = + [ ] { } \\ | ; : ' "" , < > / and ?" + 1031 "The first domain of the domain name ""%1"" is a number. The first domain may not be a number." + 1032 "The domain name ""%1"" contains characters which are not allowed. Standard DNS names may contain letters (a-z, A-Z), numbers (0-9), and hyphens, but no spaces. Periods (.) are used to separate domains. Example: domain-1.reactos.org." 3210 "&Details >>" 3220 "<< &Details" 4000 "Information" diff --git a/dll/win32/netid/lang/en-US.rc b/dll/win32/netid/lang/en-US.rc index bcc915c88d3..0dd535d3dd5 100644 --- a/dll/win32/netid/lang/en-US.rc +++ b/dll/win32/netid/lang/en-US.rc @@ -64,15 +64,20 @@ BEGIN 4 "Computer Name Changes" 5 "Workgroup:" 6 "Domain:" + 7 "The domain name ""%1"" does not conform to Internet Domain Name Service specifications, although it is a legal ReactOS name. You must use ReactOS DNS server for non-standard names." + 8 "The domain name ""%1"" is not properly formatted. Periods (.) are used to separate domains. Each domain is limited to 63 characters. Example: domain-1.reactos.org." + 10 "The new computer name ""%1"" is too long. The name may not be longer than 63 characters." + 11 "The new computer name entered is not properly formatted. Standard names may contain letters (a-z, A-Z), numbers (0-9), and hyphens (-), but no spaces or periods (.). The name may not consist entirely of digits." 22 "Welcome to the %1 workgroup." 23 "Welcome to the %1 domain." 24 "You must restart this computer for the changes to take effect." 25 "You can change the name and the membership of this computer. Changes may affect access to network resources." 1021 "Note: Only Administrators can change the identification of this computer." 1022 "Note: The identification of the computer cannot be changed because:" - 1030 "The new computer name ""%s"" contains characters which are not allowed. Characters which are not allowed include ` ~ ! @ # $ %% ^ & * ( ) = + _ [ ] { } \\ | ; : ' "" , . < > / and ?" - /* Windows allows using these characters, although it displays a warning message. - Forbidding the use of these characters means incompatibility with Windows. */ + 1029 "The new computer name ""%1"" is a number. The name may not be a number." + 1030 "The new computer name ""%1"" contains characters which are not allowed. Characters which are not allowed include ` ~ ! @ # $ %% ^ & * ( ) = + [ ] { } \\ | ; : ' "" , < > / and ?" + 1031 "The first domain of the domain name ""%1"" is a number. The first domain may not be a number." + 1032 "The domain name ""%1"" contains characters which are not allowed. Standard DNS names may contain letters (a-z, A-Z), numbers (0-9), and hyphens, but no spaces. Periods (.) are used to separate domains. Example: domain-1.reactos.org." 3210 "&Details >>" 3220 "<< &Details" 4000 "Information" diff --git a/dll/win32/netid/lang/es-ES.rc b/dll/win32/netid/lang/es-ES.rc index 7c4c19f23aa..16361d40802 100644 --- a/dll/win32/netid/lang/es-ES.rc +++ b/dll/win32/netid/lang/es-ES.rc @@ -66,13 +66,20 @@ BEGIN 4 "Cambios en el nombre del equipo" 5 "Grupo de trabajo:" 6 "Dominio:" + 7 "The domain name ""%1"" does not conform to Internet Domain Name Service specifications, although it is a legal ReactOS name. You must use ReactOS DNS server for non-standard names." + 8 "The domain name ""%1"" is not properly formatted. Periods (.) are used to separate domains. Each domain is limited to 63 characters. Example: domain-1.reactos.org." + 10 "The new computer name ""%1"" is too long. The name may not be longer than 63 characters." + 11 "The new computer name entered is not properly formatted. Standard names may contain letters (a-z, A-Z), numbers (0-9), and hyphens (-), but no spaces or periods (.). The name may not consist entirely of digits." 22 "Bienvenido al grupo de trabajo %1." 23 "Bienvenido al dominio %1." 24 "Debe reiniciar el equipo para que los cambios tengan efecto." 25 "Puede cambiar el nombre y la pertenencia de este grupo. Los cambios pueden afectar el acceso a los recursos de red." 1021 "Nota: Sólo los Administradores pueden cambiar la identificación de este equipo." 1022 "Nota: La identificación de este equipo no puede ser cambiada porque:" - 1030 "El nuevo nombre de equipo ""%s"" contiene caracteres no permitidos. Estos caracteres no permitidos incluyen ` ~ ! @ # $ %% ^ & * ( ) = + _ [ ] { } \\ | ; : ' "" , . < > / y ?" + 1029 "The new computer name ""%1"" is a number. The name may not be a number." + 1030 "El nuevo nombre de equipo ""%1"" contiene caracteres no permitidos. Estos caracteres no permitidos incluyen ` ~ ! @ # $ %% ^ & * ( ) = + [ ] { } \\ | ; : ' "" , < > / y ?" + 1031 "The first domain of the domain name ""%1"" is a number. The first domain may not be a number." + 1032 "The domain name ""%1"" contains characters which are not allowed. Standard DNS names may contain letters (a-z, A-Z), numbers (0-9), and hyphens, but no spaces. Periods (.) are used to separate domains. Example: domain-1.reactos.org." 3210 "&Detalles >>" 3220 "<< &Detalles" 4000 "Información" diff --git a/dll/win32/netid/lang/fr-FR.rc b/dll/win32/netid/lang/fr-FR.rc index 77145903236..9ba338a0563 100644 --- a/dll/win32/netid/lang/fr-FR.rc +++ b/dll/win32/netid/lang/fr-FR.rc @@ -64,13 +64,20 @@ BEGIN 4 "Changement du nom de l'ordinateur" 5 "Groupe de travail :" 6 "Domaine :" + 7 "The domain name ""%1"" does not conform to Internet Domain Name Service specifications, although it is a legal ReactOS name. You must use ReactOS DNS server for non-standard names." + 8 "The domain name ""%1"" is not properly formatted. Periods (.) are used to separate domains. Each domain is limited to 63 characters. Example: domain-1.reactos.org." + 10 "The new computer name ""%1"" is too long. The name may not be longer than 63 characters." + 11 "The new computer name entered is not properly formatted. Standard names may contain letters (a-z, A-Z), numbers (0-9), and hyphens (-), but no spaces or periods (.). The name may not consist entirely of digits." 22 "Bienvenue dans le groupe de travail %1." 23 "Bienvenue dans le domaine %1." 24 "Vous devez redémarrer votre ordinateur pour que les changements soient pris en compte." 25 "You can change the name and the membership of this computer. Changes may affect access to network resources." 1021 "Note : Seuls les administrateurs peuvent modifier l'identification de cet ordinateur." 1022 "Note : L'identification de l'ordinateur ne peut pas être modifiée car :" - 1030 "The new computer name ""%s"" contains characters which are not allowed. Characters which are not allowed include ` ~ ! @ # $ %% ^ & * ( ) = + _ [ ] { } \\ | ; : ' "" , . < > / and ?" + 1029 "The new computer name ""%1"" is a number. The name may not be a number." + 1030 "The new computer name ""%1"" contains characters which are not allowed. Characters which are not allowed include ` ~ ! @ # $ %% ^ & * ( ) = + [ ] { } \\ | ; : ' "" , < > / and ?" + 1031 "The first domain of the domain name ""%1"" is a number. The first domain may not be a number." + 1032 "The domain name ""%1"" contains characters which are not allowed. Standard DNS names may contain letters (a-z, A-Z), numbers (0-9), and hyphens, but no spaces. Periods (.) are used to separate domains. Example: domain-1.reactos.org." 3210 "&Détails >>" 3220 "<< &Détails" 4000 "Information" diff --git a/dll/win32/netid/lang/he-IL.rc b/dll/win32/netid/lang/he-IL.rc index 7ce74e2d859..2ec81df9dd2 100644 --- a/dll/win32/netid/lang/he-IL.rc +++ b/dll/win32/netid/lang/he-IL.rc @@ -64,15 +64,20 @@ BEGIN 4 "Computer Name Changes" 5 "קבוצת עבודה:" 6 "מתחם:" + 7 "The domain name ""%1"" does not conform to Internet Domain Name Service specifications, although it is a legal ReactOS name. You must use ReactOS DNS server for non-standard names." + 8 "The domain name ""%1"" is not properly formatted. Periods (.) are used to separate domains. Each domain is limited to 63 characters. Example: domain-1.reactos.org." + 10 "The new computer name ""%1"" is too long. The name may not be longer than 63 characters." + 11 "The new computer name entered is not properly formatted. Standard names may contain letters (a-z, A-Z), numbers (0-9), and hyphens (-), but no spaces or periods (.). The name may not consist entirely of digits." 22 "ברוך הבא לקבוצת העבודה 1%" 23 "ברוך הבא למתחם 1%" 24 "You must restart this computer for the changes to take effect." 25 "You can change the name and the membership of this computer. Changes may affect access to network resources." 1021 "Note: Only Administrators can change the identification of this computer." 1022 "Note: The identification of the computer cannot be changed because:" - 1030 "The new computer name ""%s"" contains characters which are not allowed. Characters which are not allowed include ` ~ ! @ # $ %% ^ & * ( ) = + _ [ ] { } \\ | ; : ' "" , . < > / and ?" - /* Windows allows using these characters, although it displays a warning message. - Forbidding the use of these characters means incompatibility with Windows. */ + 1029 "The new computer name ""%1"" is a number. The name may not be a number." + 1030 "The new computer name ""%1"" contains characters which are not allowed. Characters which are not allowed include ` ~ ! @ # $ %% ^ & * ( ) = + [ ] { } \\ | ; : ' "" , < > / and ?" + 1031 "The first domain of the domain name ""%1"" is a number. The first domain may not be a number." + 1032 "The domain name ""%1"" contains characters which are not allowed. Standard DNS names may contain letters (a-z, A-Z), numbers (0-9), and hyphens, but no spaces. Periods (.) are used to separate domains. Example: domain-1.reactos.org." 3210 "&Details >>" 3220 "<< &Details" 4000 "מידע" diff --git a/dll/win32/netid/lang/id-ID.rc b/dll/win32/netid/lang/id-ID.rc index e81b762bdd7..446fe427115 100644 --- a/dll/win32/netid/lang/id-ID.rc +++ b/dll/win32/netid/lang/id-ID.rc @@ -64,13 +64,20 @@ BEGIN 4 "Ubah Nama Komputer" 5 "Workgroup:" 6 "Domain:" + 7 "The domain name ""%1"" does not conform to Internet Domain Name Service specifications, although it is a legal ReactOS name. You must use ReactOS DNS server for non-standard names." + 8 "The domain name ""%1"" is not properly formatted. Periods (.) are used to separate domains. Each domain is limited to 63 characters. Example: domain-1.reactos.org." + 10 "The new computer name ""%1"" is too long. The name may not be longer than 63 characters." + 11 "The new computer name entered is not properly formatted. Standard names may contain letters (a-z, A-Z), numbers (0-9), and hyphens (-), but no spaces or periods (.). The name may not consist entirely of digits." 22 "Welcome to the %1 workgroup." 23 "Welcome to the %1 domain." 24 "You must restart this computer for the changes to take effect." 25 "You can change the name and the membership of this computer. Changes may affect access to network resources." 1021 "Note: Only Administrators can change the identification of this computer." 1022 "Note: The identification of the computer cannot be changed because:" - 1030 "The new computer name ""%s"" contains characters which are not allowed. Characters which are not allowed include ` ~ ! @ # $ %% ^ & * ( ) = + _ [ ] { } \\ | ; : ' "" , . < > / and ?" + 1029 "The new computer name ""%1"" is a number. The name may not be a number." + 1030 "The new computer name ""%1"" contains characters which are not allowed. Characters which are not allowed include ` ~ ! @ # $ %% ^ & * ( ) = + [ ] { } \\ | ; : ' "" , < > / and ?" + 1031 "The first domain of the domain name ""%1"" is a number. The first domain may not be a number." + 1032 "The domain name ""%1"" contains characters which are not allowed. Standard DNS names may contain letters (a-z, A-Z), numbers (0-9), and hyphens, but no spaces. Periods (.) are used to separate domains. Example: domain-1.reactos.org." 3210 "&Rincian >>" 3220 "<< &Rincian" 4000 "Informasi" diff --git a/dll/win32/netid/lang/it-IT.rc b/dll/win32/netid/lang/it-IT.rc index 02b452b0957..568a105fa39 100644 --- a/dll/win32/netid/lang/it-IT.rc +++ b/dll/win32/netid/lang/it-IT.rc @@ -66,13 +66,20 @@ BEGIN 4 "Modifiche al nome del Computer " 5 "Gruppo di lavoro:" 6 "Dominio:" + 7 "The domain name ""%1"" does not conform to Internet Domain Name Service specifications, although it is a legal ReactOS name. You must use ReactOS DNS server for non-standard names." + 8 "The domain name ""%1"" is not properly formatted. Periods (.) are used to separate domains. Each domain is limited to 63 characters. Example: domain-1.reactos.org." + 10 "The new computer name ""%1"" is too long. The name may not be longer than 63 characters." + 11 "The new computer name entered is not properly formatted. Standard names may contain letters (a-z, A-Z), numbers (0-9), and hyphens (-), but no spaces or periods (.). The name may not consist entirely of digits." 22 "Benvenuto al gruppo di lavoro %1." 23 "Benvenuto al dominio %1." 24 "Il computer deve essere riavviato per rendere operative queste modifiche." 25 "Potete modificare il nome e il dominio di questo computer. Le modifiche potrebbero influenzare l'accesso alle risorse di rete." 1021 "Nota: Solo gli Amministratori possono cambiare l'identificazione di questo computer." 1022 "Nota: L'identificazione di questo computer non può essere cambiata perchè:" - 1030 "Il nuovo nome del computer ""%s"" contiene dei caratteri non permessi. I caratteri vietati sono `? ~ ! @ # $ %% ^ & * ( ) = + _ [ ] { } \\ | ; : ' "" , . < > / " + 1029 "The new computer name ""%1"" is a number. The name may not be a number." + 1030 "Il nuovo nome del computer ""%1"" contiene dei caratteri non permessi. I caratteri vietati sono `? ~ ! @ # $ %% ^ & * ( ) = + [ ] { } \\ | ; : ' "" , < > / " + 1031 "The first domain of the domain name ""%1"" is a number. The first domain may not be a number." + 1032 "The domain name ""%1"" contains characters which are not allowed. Standard DNS names may contain letters (a-z, A-Z), numbers (0-9), and hyphens, but no spaces. Periods (.) are used to separate domains. Example: domain-1.reactos.org." 3210 "&Dettagli >>" 3220 "<< &Dettagli" 4000 "Informazioni" diff --git a/dll/win32/netid/lang/ja-JP.rc b/dll/win32/netid/lang/ja-JP.rc index 400219a3c80..74c93c30520 100644 --- a/dll/win32/netid/lang/ja-JP.rc +++ b/dll/win32/netid/lang/ja-JP.rc @@ -64,13 +64,20 @@ BEGIN 4 "コンピュータ名の変更" 5 "ワークグループ:" 6 "ドメイン:" + 7 "The domain name ""%1"" does not conform to Internet Domain Name Service specifications, although it is a legal ReactOS name. You must use ReactOS DNS server for non-standard names." + 8 "The domain name ""%1"" is not properly formatted. Periods (.) are used to separate domains. Each domain is limited to 63 characters. Example: domain-1.reactos.org." + 10 "The new computer name ""%1"" is too long. The name may not be longer than 63 characters." + 11 "The new computer name entered is not properly formatted. Standard names may contain letters (a-z, A-Z), numbers (0-9), and hyphens (-), but no spaces or periods (.). The name may not consist entirely of digits." 22 "%1 ワークグループへようこそ。" 23 "%1 ドメインへようこそ。" 24 "変更を有効にするには、コンピュータを再起動してください。" 25 "このコンピュータの名前とメンバシップを変更できます。変更するとネットワークリソースへのアクセスに影響する可能性があります。" 1021 "注意: このコンピュータの ID を変更できるのは管理者のみです。" 1022 "注意: 次の理由により、このコンピュータの ID を変更できません:" - 1030 "新しいコンピュータ名 ""%s"" には、使用できないな文字が含まれています。使用できない文字は ` ~ ! @ # $ %% ^ & * ( ) = + _ [ ] { } \\ | ; : ' "" , . < > / ? です。" + 1029 "The new computer name ""%1"" is a number. The name may not be a number." + 1030 "新しいコンピュータ名 ""%1"" には、使用できないな文字が含まれています。使用できない文字は ` ~ ! @ # $ %% ^ & * ( ) = + [ ] { } \\ | ; : ' "" , < > / ? です。" + 1031 "The first domain of the domain name ""%1"" is a number. The first domain may not be a number." + 1032 "The domain name ""%1"" contains characters which are not allowed. Standard DNS names may contain letters (a-z, A-Z), numbers (0-9), and hyphens, but no spaces. Periods (.) are used to separate domains. Example: domain-1.reactos.org." 3210 "詳細(&D) >>" 3220 "<< 詳細(&D)" 4000 "情報" diff --git a/dll/win32/netid/lang/nl-NL.rc b/dll/win32/netid/lang/nl-NL.rc index a7a32f0e97d..92427acd5cd 100644 --- a/dll/win32/netid/lang/nl-NL.rc +++ b/dll/win32/netid/lang/nl-NL.rc @@ -64,13 +64,20 @@ BEGIN 4 "Computernaam Wijzigingen" 5 "Werkgroep:" 6 "Domein:" + 7 "The domain name ""%1"" does not conform to Internet Domain Name Service specifications, although it is a legal ReactOS name. You must use ReactOS DNS server for non-standard names." + 8 "The domain name ""%1"" is not properly formatted. Periods (.) are used to separate domains. Each domain is limited to 63 characters. Example: domain-1.reactos.org." + 10 "The new computer name ""%1"" is too long. The name may not be longer than 63 characters." + 11 "The new computer name entered is not properly formatted. Standard names may contain letters (a-z, A-Z), numbers (0-9), and hyphens (-), but no spaces or periods (.). The name may not consist entirely of digits." 22 "Welkom bij de werkgoep %1." 23 "Welkom bij het domein %1." 24 "U moet de computer herstarten om de wijzigingen van kracht te laten gaan." 25 "You can change the name and the membership of this computer. Changes may affect access to network resources." 1021 "Let op: Alleen Administrators mogen de indentificatie van deze computer aanpassen." 1022 "Let op: De indentificatie van deze computer kan niet gewijzigd worden omdat:" - 1030 "The new computer name ""%s"" contains characters which are not allowed. Characters which are not allowed include ` ~ ! @ # $ %% ^ & * ( ) = + _ [ ] { } \\ | ; : ' "" , . < > / and ?" + 1029 "The new computer name ""%1"" is a number. The name may not be a number." + 1030 "The new computer name ""%1"" contains characters which are not allowed. Characters which are not allowed include ` ~ ! @ # $ %% ^ & * ( ) = + [ ] { } \\ | ; : ' "" , < > / and ?" + 1031 "The first domain of the domain name ""%1"" is a number. The first domain may not be a number." + 1032 "The domain name ""%1"" contains characters which are not allowed. Standard DNS names may contain letters (a-z, A-Z), numbers (0-9), and hyphens, but no spaces. Periods (.) are used to separate domains. Example: domain-1.reactos.org." 3210 "&Details >>" 3220 "<< &Details" 4000 "Information" diff --git a/dll/win32/netid/lang/no-NO.rc b/dll/win32/netid/lang/no-NO.rc index e596ebec6e1..93685752283 100644 --- a/dll/win32/netid/lang/no-NO.rc +++ b/dll/win32/netid/lang/no-NO.rc @@ -64,13 +64,20 @@ BEGIN 4 "Endring i datamaskinnavn" 5 "Arbeidsgruppe:" 6 "Domene:" + 7 "The domain name ""%1"" does not conform to Internet Domain Name Service specifications, although it is a legal ReactOS name. You must use ReactOS DNS server for non-standard names." + 8 "The domain name ""%1"" is not properly formatted. Periods (.) are used to separate domains. Each domain is limited to 63 characters. Example: domain-1.reactos.org." + 10 "The new computer name ""%1"" is too long. The name may not be longer than 63 characters." + 11 "The new computer name entered is not properly formatted. Standard names may contain letters (a-z, A-Z), numbers (0-9), and hyphens (-), but no spaces or periods (.). The name may not consist entirely of digits." 22 "Velkommen til %1 arbeidsgruppen." 23 "Velkommen til %1 domene." 24 "Du må starte denne datamaskinen på nytt for at endringene skal tre i kraft." 25 "You can change the name and the membership of this computer. Changes may affect access to network resources." 1021 "OBS: Bare administratorer kan endre identifisering for denne datamaskinen." 1022 "OBS: Identifisering for datamaskinen kunne ikke endres fordi:" - 1030 "The new computer name ""%s"" contains characters which are not allowed. Characters which are not allowed include ` ~ ! @ # $ %% ^ & * ( ) = + _ [ ] { } \\ | ; : ' "" , . < > / and ?" + 1029 "The new computer name ""%1"" is a number. The name may not be a number." + 1030 "The new computer name ""%1"" contains characters which are not allowed. Characters which are not allowed include ` ~ ! @ # $ %% ^ & * ( ) = + [ ] { } \\ | ; : ' "" , < > / and ?" + 1031 "The first domain of the domain name ""%1"" is a number. The first domain may not be a number." + 1032 "The domain name ""%1"" contains characters which are not allowed. Standard DNS names may contain letters (a-z, A-Z), numbers (0-9), and hyphens, but no spaces. Periods (.) are used to separate domains. Example: domain-1.reactos.org." 3210 "&Detaljer >>" 3220 "<< &Detaljer" 4000 "Information" diff --git a/dll/win32/netid/lang/pl-PL.rc b/dll/win32/netid/lang/pl-PL.rc index b0661df5eaf..12c75f93ab5 100644 --- a/dll/win32/netid/lang/pl-PL.rc +++ b/dll/win32/netid/lang/pl-PL.rc @@ -72,13 +72,20 @@ BEGIN 4 "Zmiana nazwy komputera" 5 "Grupa Robocza:" 6 "Domena:" + 7 "The domain name ""%1"" does not conform to Internet Domain Name Service specifications, although it is a legal ReactOS name. You must use ReactOS DNS server for non-standard names." + 8 "The domain name ""%1"" is not properly formatted. Periods (.) are used to separate domains. Each domain is limited to 63 characters. Example: domain-1.reactos.org." + 10 "The new computer name ""%1"" is too long. The name may not be longer than 63 characters." + 11 "The new computer name entered is not properly formatted. Standard names may contain letters (a-z, A-Z), numbers (0-9), and hyphens (-), but no spaces or periods (.). The name may not consist entirely of digits." 22 "Witamy w grupie roboczej %1." 23 "Witamy w domenie %1." 24 "Musisz zrestartować komputer aby zmiany odniosły skutek." 25 "Możesz zmienić nazwę i członkostwo tego komputera. Zmiany mogą mieć wpływ na dostęp do zasobów sieciowych." 1021 "Uwaga: Tylko Administratorzy mogą zmieniać identyfikator tego komputera." 1022 "Uwaga: Identyfikator tego komputera nie został zmieniony, powód:" - 1030 "Nowa nazwa komputera ""%s"" zawiera niedozwolone znaki. Do niedozwolonych znaków należą ` ~ ! @ # $ %% ^ & * ( ) = + _ [ ] { } \\ | ; : ' "" , . < > / oraz ?" + 1029 "The new computer name ""%1"" is a number. The name may not be a number." + 1030 "Nowa nazwa komputera ""%1"" zawiera niedozwolone znaki. Do niedozwolonych znaków należą ` ~ ! @ # $ %% ^ & * ( ) = + [ ] { } \\ | ; : ' "" , < > / oraz ?" + 1031 "The first domain of the domain name ""%1"" is a number. The first domain may not be a number." + 1032 "The domain name ""%1"" contains characters which are not allowed. Standard DNS names may contain letters (a-z, A-Z), numbers (0-9), and hyphens, but no spaces. Periods (.) are used to separate domains. Example: domain-1.reactos.org." 3210 "&Szczegóły >>" 3220 "<< &Szczegóły" 4000 "Informacja" diff --git a/dll/win32/netid/lang/pt-PT.rc b/dll/win32/netid/lang/pt-PT.rc index 6e2c1d7582a..c42c506c265 100644 --- a/dll/win32/netid/lang/pt-PT.rc +++ b/dll/win32/netid/lang/pt-PT.rc @@ -69,15 +69,20 @@ BEGIN 4 "Alterar o nome do computador" 5 "Grupo de trabalho:" 6 "Domínio:" + 7 "The domain name ""%1"" does not conform to Internet Domain Name Service specifications, although it is a legal ReactOS name. You must use ReactOS DNS server for non-standard names." + 8 "The domain name ""%1"" is not properly formatted. Periods (.) are used to separate domains. Each domain is limited to 63 characters. Example: domain-1.reactos.org." + 10 "The new computer name ""%1"" is too long. The name may not be longer than 63 characters." + 11 "The new computer name entered is not properly formatted. Standard names may contain letters (a-z, A-Z), numbers (0-9), and hyphens (-), but no spaces or periods (.). The name may not consist entirely of digits." 22 "Bem-vindo ao grupo de trabalho %1." 23 "Bem-vindo ao domínio %1." 24 "Tem de reiniciar o computador para que as alterações entrem em vigor." 25 "Pode alterar o nome e a participação deste computador em domínios. Tais alterações podem afectar o acesso aos recursos da rede." 1021 "Nota: Somente administradores podem alterar a identificação deste computador." 1022 "Nota: A identificação do computador não pode ser alterada porque:" - 1030 "O novo nome do computador ""%s"" contém caracteres que não são permitidos. Caracteres que não são permitidos incluem ` ~ ! @ # $ %% ^ & * ( ) = + _ [ ] { } \\ | ; : ' "" , . < > / e ?" - /* Windows allows using these characters, although it displays a warning message. - Forbidding the use of these characters means incompatibility with Windows. */ + 1029 "The new computer name ""%1"" is a number. The name may not be a number." + 1030 "O novo nome do computador ""%1"" contém caracteres que não são permitidos. Caracteres que não são permitidos incluem ` ~ ! @ # $ %% ^ & * ( ) = + [ ] { } \\ | ; : ' "" , < > / e ?" + 1031 "The first domain of the domain name ""%1"" is a number. The first domain may not be a number." + 1032 "The domain name ""%1"" contains characters which are not allowed. Standard DNS names may contain letters (a-z, A-Z), numbers (0-9), and hyphens, but no spaces. Periods (.) are used to separate domains. Example: domain-1.reactos.org." 3210 "&Detalhes >>" 3220 "<< &Detalhes" 4000 "Informação" diff --git a/dll/win32/netid/lang/ro-RO.rc b/dll/win32/netid/lang/ro-RO.rc index 9490496e9dd..2ba7e8e124a 100644 --- a/dll/win32/netid/lang/ro-RO.rc +++ b/dll/win32/netid/lang/ro-RO.rc @@ -70,15 +70,20 @@ BEGIN 4 "Schimbarea identității calculatorului" 5 "Grup de lucru:" 6 "Domeniu:" + 7 "The domain name ""%1"" does not conform to Internet Domain Name Service specifications, although it is a legal ReactOS name. You must use ReactOS DNS server for non-standard names." + 8 "The domain name ""%1"" is not properly formatted. Periods (.) are used to separate domains. Each domain is limited to 63 characters. Example: domain-1.reactos.org." + 10 "The new computer name ""%1"" is too long. The name may not be longer than 63 characters." + 11 "The new computer name entered is not properly formatted. Standard names may contain letters (a-z, A-Z), numbers (0-9), and hyphens (-), but no spaces or periods (.). The name may not consist entirely of digits." 22 "Bun venit în grupul de lucru „%1”." 23 "Bun venit în domeniul „%1”." 24 "Repornirea calculatorului este necesară pentru a aplica schimbările aduse." 25 "Puteți schimba numele și apartenența acestui calculator la un domeniu sau grup de lucru. Schimbările pot afecta accesul la resursele rețelei." 1021 "Notă: Doar administratorii pot schimba identitatea calculatorului." 1022 "Notă: Identitatea calculatorului nu poate fi schimbată deoarece:" - 1030 "Noul nume „%s” conține caractere nepermise. Caracterele nepermise sunt ` ~ ! @ # $ %% ^ & * ( ) = + _ [ ] { } \\ | ; : ' "" , . < > / și ?" - /* Windows allows using these characters, although it displays a warning message. - Forbidding the use of these characters means incompatibility with Windows. */ + 1029 "The new computer name ""%1"" is a number. The name may not be a number." + 1030 "Noul nume „%1” conține caractere nepermise. Caracterele nepermise sunt ` ~ ! @ # $ %% ^ & * ( ) = + [ ] { } \\ | ; : ' "" , < > / și ?" + 1031 "The first domain of the domain name ""%1"" is a number. The first domain may not be a number." + 1032 "The domain name ""%1"" contains characters which are not allowed. Standard DNS names may contain letters (a-z, A-Z), numbers (0-9), and hyphens, but no spaces. Periods (.) are used to separate domains. Example: domain-1.reactos.org." 3210 "&Detalii >>" 3220 "<< &Detalii" 4000 "Informație" diff --git a/dll/win32/netid/lang/ru-RU.rc b/dll/win32/netid/lang/ru-RU.rc index a1cced0a679..4ad76873ff0 100644 --- a/dll/win32/netid/lang/ru-RU.rc +++ b/dll/win32/netid/lang/ru-RU.rc @@ -64,13 +64,20 @@ BEGIN 4 "Изменение имени компьютера" 5 "Рабочая группа:" 6 "Домен:" + 7 "The domain name ""%1"" does not conform to Internet Domain Name Service specifications, although it is a legal ReactOS name. You must use ReactOS DNS server for non-standard names." + 8 "The domain name ""%1"" is not properly formatted. Periods (.) are used to separate domains. Each domain is limited to 63 characters. Example: domain-1.reactos.org." + 10 "The new computer name ""%1"" is too long. The name may not be longer than 63 characters." + 11 "The new computer name entered is not properly formatted. Standard names may contain letters (a-z, A-Z), numbers (0-9), and hyphens (-), but no spaces or periods (.). The name may not consist entirely of digits." 22 "Добро пожаловать в рабочую группу %1." 23 "Добро пожаловать в домен %1." 24 "Необходимо перезапустить компьютер для того, чтобы эти изменения вступили в силу." 25 "Можно изменить имя и принадлежность этого компьютера. Изменения могут повлиять на доступ к сетевым ресурсам." 1021 "Примечание: только администраторы могут изменить идентификацию этого компьютера." 1022 "Примечание: идентификация этого компьютера не может быть изменена, потому что:" - 1030 "Новое имя компьютера ""%s"" содержит запрещенные знаки. Запрещенные знаки ` ~ ! @ # $ %% ^ & * ( ) = + _ [ ] { } \\ | ; : ' "" , . < > / и ?" + 1029 "The new computer name ""%1"" is a number. The name may not be a number." + 1030 "Новое имя компьютера ""%1"" содержит запрещенные знаки. Запрещенные знаки ` ~ ! @ # $ %% ^ & * ( ) = + [ ] { } \\ | ; : ' "" , < > / и ?" + 1031 "The first domain of the domain name ""%1"" is a number. The first domain may not be a number." + 1032 "The domain name ""%1"" contains characters which are not allowed. Standard DNS names may contain letters (a-z, A-Z), numbers (0-9), and hyphens, but no spaces. Periods (.) are used to separate domains. Example: domain-1.reactos.org." 3210 "&Подробно >>" 3220 "<< &Подробно" 4000 "Информация" diff --git a/dll/win32/netid/lang/sk-SK.rc b/dll/win32/netid/lang/sk-SK.rc index 8039d8d3f36..e2e963ccd32 100644 --- a/dll/win32/netid/lang/sk-SK.rc +++ b/dll/win32/netid/lang/sk-SK.rc @@ -71,13 +71,20 @@ BEGIN 4 "Zmena názvu počítača" 5 "Pracovná skupina:" 6 "Doména:" + 7 "The domain name ""%1"" does not conform to Internet Domain Name Service specifications, although it is a legal ReactOS name. You must use ReactOS DNS server for non-standard names." + 8 "The domain name ""%1"" is not properly formatted. Periods (.) are used to separate domains. Each domain is limited to 63 characters. Example: domain-1.reactos.org." + 10 "The new computer name ""%1"" is too long. The name may not be longer than 63 characters." + 11 "The new computer name entered is not properly formatted. Standard names may contain letters (a-z, A-Z), numbers (0-9), and hyphens (-), but no spaces or periods (.). The name may not consist entirely of digits." 22 "Vitajte v pracovnej skupine %1." 23 "Vitajte v doméne %1." 24 "Aby sa prejavili vykonané zmeny, musíte reštartovať počítač." 25 "You can change the name and the membership of this computer. Changes may affect access to network resources." 1021 "Poznámka: Iba správcovia môžu zmeniť identifikáciu tohto počítača." 1022 "Poznámka: Identifikácia počítača nemôže byť zmenená, lebo:" - 1030 "The new computer name ""%s"" contains characters which are not allowed. Characters which are not allowed include ` ~ ! @ # $ %% ^ & * ( ) = + _ [ ] { } \\ | ; : ' "" , . < > / and ?" + 1029 "The new computer name ""%1"" is a number. The name may not be a number." + 1030 "The new computer name ""%1"" contains characters which are not allowed. Characters which are not allowed include ` ~ ! @ # $ %% ^ & * ( ) = + [ ] { } \\ | ; : ' "" , < > / and ?" + 1031 "The first domain of the domain name ""%1"" is a number. The first domain may not be a number." + 1032 "The domain name ""%1"" contains characters which are not allowed. Standard DNS names may contain letters (a-z, A-Z), numbers (0-9), and hyphens, but no spaces. Periods (.) are used to separate domains. Example: domain-1.reactos.org." 3210 "&Podrobnosti >>" 3220 "<< &Podrobnosti" 4000 "Information" diff --git a/dll/win32/netid/lang/sq-AL.rc b/dll/win32/netid/lang/sq-AL.rc index 5aae53786c1..bb839c8d448 100644 --- a/dll/win32/netid/lang/sq-AL.rc +++ b/dll/win32/netid/lang/sq-AL.rc @@ -68,15 +68,20 @@ BEGIN 4 "Emri Kompjuterit Ndryshon" 5 "GrupPune:" 6 "Domain:" + 7 "The domain name ""%1"" does not conform to Internet Domain Name Service specifications, although it is a legal ReactOS name. You must use ReactOS DNS server for non-standard names." + 8 "The domain name ""%1"" is not properly formatted. Periods (.) are used to separate domains. Each domain is limited to 63 characters. Example: domain-1.reactos.org." + 10 "The new computer name ""%1"" is too long. The name may not be longer than 63 characters." + 11 "The new computer name entered is not properly formatted. Standard names may contain letters (a-z, A-Z), numbers (0-9), and hyphens (-), but no spaces or periods (.). The name may not consist entirely of digits." 22 "Mirësivine tek %1 grupipunës." 23 "Mirësivine tek %1 domain." 24 "Ju duhet të rinisni këtë kompjuter që ndryshimet të hyjnë në fuqi." 25 "Ju mund të ndryshoni emrin dhe anëtarësimin e këtij kompjuteri. Ndryshimet mund të ndikojnë në hyrjet e burimeve në rrjet." 1021 "Shenime: Vetëm Administratorët mund të ndryshojnë identifikimin e këtij kompjuteri." 1022 "Shenim: Identifikimi i kompjuterit nuk mund të ndryshohet sepse:" - 1030 "Emri i ri kompjuterik ""%s"" përmban karaktere të cilat nuk janë të lejuara. Karakterët të cilat nuk janë të lejuar përfshijnë ` ~ ! @ # $ %% ^ & * ( ) = + _ [ ] { } \\ | ; : ' "" , . < > / and ?" - /* Windows allows using these characters, although it displays a warning message. - Forbidding the use of these characters means incompatibility with Windows. */ + 1029 "The new computer name ""%1"" is a number. The name may not be a number." + 1030 "Emri i ri kompjuterik ""%1"" përmban karaktere të cilat nuk janë të lejuara. Karakterët të cilat nuk janë të lejuar përfshijnë ` ~ ! @ # $ %% ^ & * ( ) = + [ ] { } \\ | ; : ' "" , < > / and ?" + 1031 "The first domain of the domain name ""%1"" is a number. The first domain may not be a number." + 1032 "The domain name ""%1"" contains characters which are not allowed. Standard DNS names may contain letters (a-z, A-Z), numbers (0-9), and hyphens, but no spaces. Periods (.) are used to separate domains. Example: domain-1.reactos.org." 3210 "&Detaje >>" 3220 "<< &Detaje" 4000 "Informacion" diff --git a/dll/win32/netid/lang/tr-TR.rc b/dll/win32/netid/lang/tr-TR.rc index e8fe17cca4d..1a8cc14017c 100644 --- a/dll/win32/netid/lang/tr-TR.rc +++ b/dll/win32/netid/lang/tr-TR.rc @@ -66,15 +66,20 @@ BEGIN 4 "Bilgisayar Adı Değişiklikleri" 5 "Çalışma Takımı:" 6 "Etki Alanı:" + 7 "The domain name ""%1"" does not conform to Internet Domain Name Service specifications, although it is a legal ReactOS name. You must use ReactOS DNS server for non-standard names." + 8 "The domain name ""%1"" is not properly formatted. Periods (.) are used to separate domains. Each domain is limited to 63 characters. Example: domain-1.reactos.org." + 10 "The new computer name ""%1"" is too long. The name may not be longer than 63 characters." + 11 "The new computer name entered is not properly formatted. Standard names may contain letters (a-z, A-Z), numbers (0-9), and hyphens (-), but no spaces or periods (.). The name may not consist entirely of digits." 22 "%1 çalışma takımına hoş geldiniz." 23 "%1 etki alanına hoş geldiniz." 24 "Değişikliklerin etkili olması için bu bilgisayarı yeniden başlatmalısınız." 25 "Bu bilgisayarın adını ve üyeliğini değiştirebilirsiniz. Değişiklikler, ağ kaynaklarına erişimi etkileyebilir." 1021 "Önemli: Bu bilgisayarın kimliğini yalnızca yöneticiler değiştirebilir." 1022 "Önemli: Bilgisayarın kimliği şundan dolayı değiştirilemedi:" - 1030 """%s"" yeni bilgisayar adı izin verilmeyen damgalar içeriyor. İzin verilmeyen damgalar; `, ~, !, @, #, $, %%, ^, &, *, (, ), =, +, _, [, ], {, }, \\, |, ;, :, ', "", ,, ., <, >, /, ve ?'ni kapsar." - /* Windows allows using these characters, although it displays a warning message. - Forbidding the use of these characters means incompatibility with Windows. */ + 1029 "The new computer name ""%1"" is a number. The name may not be a number." + 1030 """%1"" yeni bilgisayar adı izin verilmeyen damgalar içeriyor. İzin verilmeyen damgalar; `, ~, !, @, #, $, %%, ^, &, *, (, ), =, +, [, ], {, }, \\, |, ;, :, ', "", ,, <, >, /, ve ?'ni kapsar." + 1031 "The first domain of the domain name ""%1"" is a number. The first domain may not be a number." + 1032 "The domain name ""%1"" contains characters which are not allowed. Standard DNS names may contain letters (a-z, A-Z), numbers (0-9), and hyphens, but no spaces. Periods (.) are used to separate domains. Example: domain-1.reactos.org." 3210 "&Ayrıntılar >>" 3220 "<< &Ayrıntılar" 4000 "Bilgi" diff --git a/dll/win32/netid/lang/uk-UA.rc b/dll/win32/netid/lang/uk-UA.rc index 15eeaf827da..0b7d0bc7ff5 100644 --- a/dll/win32/netid/lang/uk-UA.rc +++ b/dll/win32/netid/lang/uk-UA.rc @@ -72,13 +72,20 @@ BEGIN 4 "Зміна імені комп'ютера" 5 "Робоча група:" 6 "Домен:" + 7 "The domain name ""%1"" does not conform to Internet Domain Name Service specifications, although it is a legal ReactOS name. You must use ReactOS DNS server for non-standard names." + 8 "The domain name ""%1"" is not properly formatted. Periods (.) are used to separate domains. Each domain is limited to 63 characters. Example: domain-1.reactos.org." + 10 "The new computer name ""%1"" is too long. The name may not be longer than 63 characters." + 11 "The new computer name entered is not properly formatted. Standard names may contain letters (a-z, A-Z), numbers (0-9), and hyphens (-), but no spaces or periods (.). The name may not consist entirely of digits." 22 "Вас вітає робоча група %1." 23 "Вас вітає домен %1." 24 "Слід перезапустити комп'ютер, щоб ці зміни набрали сили." 25 "Можна знінити ім'я і членство цього комп'ютера. Зміни можуть вплинути на доступ до мережних ресурсів." 1021 "Примітка: змінити ідентифікацію цього комп'ютера можуть лише адміністратори." 1022 "Примітка: змінити ідентифікацію цього комп'ютера неможливо, оскільки:" - 1030 "Нове ім'я комп'ютера ""%s"" містить недопустимі символи. До недопустимих символів належать ` ~ ! @ # $ %% ^ & * ( ) = + _ [ ] { } \\ | ; : ' "" , . < > / та ?" + 1029 "The new computer name ""%1"" is a number. The name may not be a number." + 1030 "Нове ім'я комп'ютера ""%1"" містить недопустимі символи. До недопустимих символів належать ` ~ ! @ # $ %% ^ & * ( ) = + [ ] { } \\ | ; : ' "" , < > / та ?" + 1031 "The first domain of the domain name ""%1"" is a number. The first domain may not be a number." + 1032 "The domain name ""%1"" contains characters which are not allowed. Standard DNS names may contain letters (a-z, A-Z), numbers (0-9), and hyphens, but no spaces. Periods (.) are used to separate domains. Example: domain-1.reactos.org." 3210 "&Подробиці >>" 3220 "<< &Подробиці" 4000 "Інформація" diff --git a/dll/win32/netid/lang/zh-CN.rc b/dll/win32/netid/lang/zh-CN.rc index 61a2d0c6160..3259168559a 100644 --- a/dll/win32/netid/lang/zh-CN.rc +++ b/dll/win32/netid/lang/zh-CN.rc @@ -67,15 +67,20 @@ BEGIN 4 "计算机名称更改" 5 "工作组:" 6 "域:" + 7 "The domain name ""%1"" does not conform to Internet Domain Name Service specifications, although it is a legal ReactOS name. You must use ReactOS DNS server for non-standard names." + 8 "The domain name ""%1"" is not properly formatted. Periods (.) are used to separate domains. Each domain is limited to 63 characters. Example: domain-1.reactos.org." + 10 "The new computer name ""%1"" is too long. The name may not be longer than 63 characters." + 11 "The new computer name entered is not properly formatted. Standard names may contain letters (a-z, A-Z), numbers (0-9), and hyphens (-), but no spaces or periods (.). The name may not consist entirely of digits." 22 "欢迎到 %1 工作组。" 23 "欢迎到域 %1。" 24 "您必须重新启动该计算机以使更改生效。" 25 "您可以更改名称和这台计算机的会员。更改可能会影响对网络资源的访问。" 1021 "注意: 只有管理员才可以更改此计算机的标识。" 1022 "注意: 不能更改计算机的标识，因为:" - 1030 "新的计算机名称 ""%s"" 包含不允许使用的字符。不允许使用的字符包括 ` ~ ! @ # $ %% ^ & * ( ) = + _ [ ] { } \\ | ; : ' "" , . < > / and ?" - /* Windows allows using these characters, although it displays a warning message. - Forbidding the use of these characters means incompatibility with Windows. */ + 1029 "The new computer name ""%1"" is a number. The name may not be a number." + 1030 "新的计算机名称 ""%1"" 包含不允许使用的字符。不允许使用的字符包括 ` ~ ! @ # $ %% ^ & * ( ) = + [ ] { } \\ | ; : ' "" , < > / and ?" + 1031 "The first domain of the domain name ""%1"" is a number. The first domain may not be a number." + 1032 "The domain name ""%1"" contains characters which are not allowed. Standard DNS names may contain letters (a-z, A-Z), numbers (0-9), and hyphens, but no spaces. Periods (.) are used to separate domains. Example: domain-1.reactos.org." 3210 "详细信息(&D) >>" 3220 "<< 详细信息(&D)" 4000 "信息" diff --git a/dll/win32/netid/lang/zh-TW.rc b/dll/win32/netid/lang/zh-TW.rc index a67d6a015cf..32039757e2e 100644 --- a/dll/win32/netid/lang/zh-TW.rc +++ b/dll/win32/netid/lang/zh-TW.rc @@ -73,9 +73,10 @@ BEGIN 25 "您可以更改名稱和這部電腦的會員。更改可能會影響對網路資源的訪問。" 1021 "注意: 只有管理員纔可以更改此電腦的標識。" 1022 "注意: 不能更改電腦的標識，因為:" - 1030 "新的電腦名稱 ""%s"" 包含不允許使用的字元。不允許使用的字元包括 ` ~ ! @ # $ %% ^ & * ( ) = + _ [ ] { } \\ | ; : ' "" , . < > / and ?" - /* Windows allows using these characters, although it displays a warning message. - Forbidding the use of these characters means incompatibility with Windows. */ + 1029 "The new computer name ""%1"" is a number. The name may not be a number." + 1030 "新的電腦名稱 ""%1"" 包含不允許使用的字元。不允許使用的字元包括 ` ~ ! @ # $ %% ^ & * ( ) = + [ ] { } \\ | ; : ' "" , < > / and ?" + 1031 "The first domain of the domain name ""%1"" is a number. The first domain may not be a number." + 1032 "The domain name ""%1"" contains characters which are not allowed. Standard DNS names may contain letters (a-z, A-Z), numbers (0-9), and hyphens, but no spaces. Periods (.) are used to separate domains. Example: domain-1.reactos.org." 3210 "詳細資訊(&D) >>" 3220 "<< 詳細資訊(&D)" 4000 "資訊" diff --git a/dll/win32/netid/netid.c b/dll/win32/netid/netid.c index bab3a34c15f..10f92fcad80 100644 --- a/dll/win32/netid/netid.c +++ b/dll/win32/netid/netid.c @@ -15,19 +15,20 @@ #include <winuser.h> #include <winreg.h> #include <windns.h> -#include <tchar.h> #include <lm.h> #include <prsht.h> #include "resource.h" -#define MAX_COMPUTERDESCRIPTION_LENGTH 256 +#define MAX_COMPUTERDESCRIPTION_LENGTH 255 +#define MAX_HOSTNAME_LENGTH 63 +#define MAX_DOMAINNAME_LENGTH 255 typedef struct _NETIDDATA { - WCHAR szHostName[256]; - WCHAR szDomainName[256]; + WCHAR szHostName[MAX_HOSTNAME_LENGTH + 1]; + WCHAR szDomainName[MAX_DOMAINNAME_LENGTH + 1]; WCHAR szComputerName[MAX_COMPUTERNAME_LENGTH + 1]; BOOL bHostNameChanged; BOOL bDomainNameChanged; @@ -37,6 +38,34 @@ typedef struct _NETIDDATA static HINSTANCE hDllInstance; +static +INT +FormatMessageBox( + HWND hDlg, + UINT uType, + DWORD dwMessage, + ...) +{ + WCHAR szTitle[256], szMessage[256], szText[512]; + va_list args = NULL; + + LoadStringW(hDllInstance, 4, szTitle, ARRAYSIZE(szTitle)); + + LoadStringW(hDllInstance, dwMessage, szMessage, ARRAYSIZE(szMessage)); + + va_start(args, dwMessage); + FormatMessageW(FORMAT_MESSAGE_FROM_STRING, + szMessage, + 0, + 0, + szText, + ARRAYSIZE(szText), + &args); + va_end(args); + + return MessageBoxW(hDlg, szText, szTitle, uType); +} + static BOOL GetComputerNames( @@ -102,11 +131,32 @@ IsValidDomainName( WCHAR szDomainName[256]; DWORD dwError; - GetDlgItemTextW(hDlg, uId, szDomainName, ARRAYSIZE(szDomainName)); + if (GetDlgItemTextW(hDlg, uId, szDomainName, ARRAYSIZE(szDomainName)) == 0) + return TRUE; + dwError = DnsValidateName_W(szDomainName, DnsNameDomain); if (dwError != ERROR_SUCCESS) { - /* FIXME: Show error message */ + switch (dwError) + { + case DNS_ERROR_NON_RFC_NAME: + if (FormatMessageBox(hDlg, MB_YESNO | MB_ICONWARNING, 7, szDomainName) == IDYES) + return TRUE; + break; + + case ERROR_INVALID_NAME: + FormatMessageBox(hDlg, MB_OK | MB_ICONERROR, 8, szDomainName); + break; + + case DNS_ERROR_NUMERIC_NAME: + FormatMessageBox(hDlg, MB_OK | MB_ICONERROR, 1031, szDomainName); + break; + + case DNS_ERROR_INVALID_NAME_CHAR: + FormatMessageBox(hDlg, MB_OK | MB_ICONERROR, 1032, szDomainName); + break; + } + return FALSE; } @@ -192,27 +242,35 @@ IsValidComputerName( HWND hDlg, UINT uId) { - WCHAR szMsgText[512], szText[256], s[256]; - int i; + WCHAR szHostName[256]; + DWORD dwError; - GetWindowText(GetDlgItem(hDlg, uId), s, ARRAYSIZE(s)); + GetWindowText(GetDlgItem(hDlg, uId), szHostName, ARRAYSIZE(szHostName)); - for (i = 0; i <= wcslen(s); i++) + dwError = DnsValidateName_W(szHostName, DnsNameHostnameLabel); + if (dwError != ERROR_SUCCESS) { - if (s[i] == L'!' || s[i] == L'@' || s[i] == L'#' || s[i] == L'$' - || s[i] == L'^' || s[i] == L'&' || s[i] == L'\\' || s[i] == L'|' - || s[i] == L')' || s[i] == L'(' || s[i] == L'{' || s[i] == L'"' - || s[i] == L'}' || s[i] == L'~' || s[i] == L'/' || s[i] == L'\'' - || s[i] == L'=' || s[i] == L':' || s[i] == L';' || s[i] == L'+' - || s[i] == L'<' || s[i] == L'>' || s[i] == L'?' || s[i] == L'[' - || s[i] == L']' || s[i] == L'`' || s[i] == L'%' || s[i] == L'_' - || s[i] == L'.') + switch (dwError) { - LoadStringW(hDllInstance, 1030, szText, ARRAYSIZE(szText)); - swprintf(szMsgText, szText, s); - MessageBoxW(hDlg, szMsgText, NULL, MB_OK | MB_ICONERROR); - return FALSE; + case DNS_ERROR_NON_RFC_NAME: + if (FormatMessageBox(hDlg, MB_YESNO | MB_ICONWARNING, 10, szHostName) == IDYES) + return TRUE; + break; + + case ERROR_INVALID_NAME: + FormatMessageBox(hDlg, MB_OK | MB_ICONERROR, 11); + return FALSE; + + case DNS_ERROR_NUMERIC_NAME: + FormatMessageBox(hDlg, MB_OK | MB_ICONERROR, 1029, szHostName); + break; + + case DNS_ERROR_INVALID_NAME_CHAR: + FormatMessageBox(hDlg, MB_OK | MB_ICONERROR, 1030, szHostName); + break; } + + return FALSE; } return TRUE; @@ -227,7 +285,7 @@ SetFullComputerName( { WCHAR szFullComputerName[512]; - swprintf(szFullComputerName, L"%s.%s", pNetIdData->szHostName, pNetIdData->szDomainName); + wsprintf(szFullComputerName, L"%s.%s", pNetIdData->szHostName, pNetIdData->szDomainName); SetDlgItemText(hDlg, uId, szFullComputerName); } @@ -243,10 +301,28 @@ UpdateFullComputerName( GetWindowText(GetDlgItem(hDlg, 1002), szHostName, ARRAYSIZE(szHostName)); - swprintf(szFullComputerName, L"%s.%s", szHostName, pNetIdData->szDomainName); + wsprintf(szFullComputerName, L"%s.%s", szHostName, pNetIdData->szDomainName); SetDlgItemText(hDlg, uId, szFullComputerName); } +static +VOID +UpdateNetbiosName( + HWND hDlg, + UINT uId, + PNETIDDATA pNetIdData) +{ + WCHAR szHostName[256]; + DWORD dwSize; + + GetWindowText(GetDlgItem(hDlg, 1002), szHostName, ARRAYSIZE(szHostName)); + + dwSize = ARRAYSIZE(pNetIdData->szComputerName); + DnsHostnameToComputerNameW(szHostName, + pNetIdData->szComputerName, + &dwSize); +} + static VOID NetworkDlg_OnInitDialog( @@ -254,15 +330,14 @@ NetworkDlg_OnInitDialog( PNETIDDATA pNetIdData) { LPWKSTA_INFO_101 wki = NULL; - TCHAR MsgText[MAX_PATH * 2]; + WCHAR MsgText[MAX_PATH * 2]; LPWSTR JoinName = NULL; NETSETUP_JOIN_STATUS JoinStatus; - if (LoadString(hDllInstance, 25, MsgText, sizeof(MsgText) / sizeof(TCHAR))) + if (LoadStringW(hDllInstance, 25, MsgText, ARRAYSIZE(MsgText))) SetDlgItemText(hDlg, 1017, MsgText); -// SendMessage(GetDlgItem(hDlg, 1002), EM_SETLIMITTEXT, MAX_COMPUTERNAME_LENGTH, 0); - + SendMessage(GetDlgItem(hDlg, 1002), EM_SETLIMITTEXT, MAX_HOSTNAME_LENGTH, 0); SetDlgItemText(hDlg, 1002, pNetIdData->szHostName); SetFullComputerName(hDlg, 1001, pNetIdData); @@ -399,6 +474,7 @@ NetworkPropDlgProc(HWND hDlg, UINT Msg, WPARAM wParam, LPARAM lParam) if (HIWORD(wParam) == EN_CHANGE) { UpdateFullComputerName(hDlg, 1001, pNetIdData); + UpdateNetbiosName(hDlg, 1001, pNetIdData); pNetIdData->bHostNameChanged = TRUE; EnableWindow(GetDlgItem(hDlg, IDOK), TRUE); }

1 0

[reactos] 02/02: [FREELDR] Rework BTRFS filesystem to not be tied to a fixed global volume. CORE-16646
by Hermès Bélusca-Maïto 26 Jan '20

26 Jan '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=94dab57ef9e594abb70f4… commit 94dab57ef9e594abb70f4a1180ba7c501dc96d29 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Jan 26 18:45:15 2020 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Jan 26 18:48:17 2020 +0100 [FREELDR] Rework BTRFS filesystem to not be tied to a fixed global volume. CORE-16646 --- boot/freeldr/freeldr/include/fs/btrfs.h | 3 + boot/freeldr/freeldr/lib/fs/btrfs.c | 255 +++++++++++++++++++------------- 2 files changed, 153 insertions(+), 105 deletions(-) diff --git a/boot/freeldr/freeldr/include/fs/btrfs.h b/boot/freeldr/freeldr/include/fs/btrfs.h index b8fddc773c3..1cea4f36500 100644 --- a/boot/freeldr/freeldr/include/fs/btrfs.h +++ b/boot/freeldr/freeldr/include/fs/btrfs.h @@ -409,10 +409,13 @@ struct btrfs_chunk_map { u32 cur_length; }; +typedef struct _BTRFS_INFO *PBTRFS_INFO; + typedef struct { u64 inr; u64 position; struct btrfs_inode_item inode; + PBTRFS_INFO Volume; } btrfs_file_info, * pbtrfs_file_info; const DEVVTBL* BtrFsMount(ULONG DeviceId); diff --git a/boot/freeldr/freeldr/lib/fs/btrfs.c b/boot/freeldr/freeldr/lib/fs/btrfs.c index f808cd27b08..6b6a0c87d83 100644 --- a/boot/freeldr/freeldr/lib/fs/btrfs.c +++ b/boot/freeldr/freeldr/lib/fs/btrfs.c @@ -22,15 +22,16 @@ DBG_DEFAULT_CHANNEL(FILESYSTEM); #define INVALID_ADDRESS _UI64_MAX #define READ_ERROR _UI64_MAX -struct BTRFS_INFO { +typedef struct _BTRFS_INFO +{ ULONG DeviceId; struct btrfs_super_block SuperBlock; struct btrfs_chunk_map ChunkMap; struct btrfs_root_item FsRoot; struct btrfs_root_item ExtentRoot; -}; +} BTRFS_INFO; -struct BTRFS_INFO *BtrFsInfo; +PBTRFS_INFO BtrFsVolumes[MAX_FDS]; /* compare function used for bin_search */ typedef int (*cmp_func)(const void *ptr1, const void *ptr2); @@ -83,9 +84,8 @@ static int btrfs_comp_chunk_map(struct btrfs_chunk_map_item *m1, } /* insert a new chunk mapping item */ -static void insert_chunk_item(struct btrfs_chunk_map_item *item) +static void insert_chunk_item(struct btrfs_chunk_map *chunk_map, struct btrfs_chunk_map_item *item) { - struct btrfs_chunk_map *chunk_map = &BtrFsInfo->ChunkMap; int ret; int slot; int i; @@ -119,7 +119,9 @@ static void insert_chunk_item(struct btrfs_chunk_map_item *item) chunk_map->cur_length++; } -static inline void insert_map(const struct btrfs_disk_key *key, struct btrfs_chunk *chunk) +static inline void insert_map(struct btrfs_chunk_map *chunk_map, + const struct btrfs_disk_key *key, + struct btrfs_chunk *chunk) { struct btrfs_stripe *stripe = &chunk->stripe; struct btrfs_stripe *stripe_end = stripe + chunk->num_stripes; @@ -132,13 +134,12 @@ static inline void insert_map(const struct btrfs_disk_key *key, struct btrfs_chu TRACE("stripe: %p\n", stripe); item.devid = stripe->devid; item.physical = stripe->offset; - TRACE("inserting chunk log: %llx len: %llx devid: %llx phys: %llx\n", item.logical, item.length, item.devid, - item.physical); - insert_chunk_item(&item); + TRACE("inserting chunk log: %llx len: %llx devid: %llx phys: %llx\n", + item.logical, item.length, item.devid, item.physical); + insert_chunk_item(chunk_map, &item); } #if 0 - struct btrfs_chunk_map *chunk_map = &BtrFsInfo->ChunkMap; struct btrfs_chunk_map_item *itm; int i; @@ -152,8 +153,7 @@ static inline void insert_map(const struct btrfs_disk_key *key, struct btrfs_chu itm->logical + itm->length, itm->physical, itm->physical + itm->length, - itm->devid - ); + itm->devid); } #endif } @@ -164,10 +164,10 @@ static inline unsigned long btrfs_chunk_item_size(int num_stripes) sizeof(struct btrfs_stripe) * (num_stripes - 1); } -static inline void init_path(struct btrfs_path *path) +static inline void init_path(const struct btrfs_super_block *sb, struct btrfs_path *path) { memset(path, 0, sizeof(*path)); - path->tree_buf = FrLdrTempAlloc(BtrFsInfo->SuperBlock.nodesize, TAG_BTRFS_NODE); + path->tree_buf = FrLdrTempAlloc(sb->nodesize, TAG_BTRFS_NODE); } static inline void free_path(struct btrfs_path *path) @@ -187,7 +187,7 @@ static inline UCHAR *path_current_data(struct btrfs_path *path) static inline const struct btrfs_disk_key *path_current_disk_key(struct btrfs_path *path) { - return (const struct btrfs_disk_key *) &path_current_item(path)->key; + return &path_current_item(path)->key; } @@ -228,9 +228,8 @@ static int btrfs_comp_keys_type(const struct btrfs_disk_key *k1, * from sys_chunk_array or chunk_tree, we can convert a logical address to * a physical address we can not support multi device case yet */ -static u64 logical_physical(u64 logical) +static u64 logical_physical(struct btrfs_chunk_map *chunk_map, u64 logical) { - struct btrfs_chunk_map *chunk_map = &BtrFsInfo->ChunkMap; struct btrfs_chunk_map_item item; int slot, ret; @@ -251,7 +250,7 @@ static u64 logical_physical(u64 logical) return chunk_map->map[slot - 1].physical + logical - chunk_map->map[slot - 1].logical; } -static BOOLEAN disk_read(u64 physical, void *dest, u32 count) +static BOOLEAN disk_read(ULONG DeviceId, u64 physical, void *dest, u32 count) { LARGE_INTEGER Position; ULONG Count; @@ -261,14 +260,14 @@ static BOOLEAN disk_read(u64 physical, void *dest, u32 count) return FALSE; Position.QuadPart = physical; - Status = ArcSeek(BtrFsInfo->DeviceId, &Position, SeekAbsolute); + Status = ArcSeek(DeviceId, &Position, SeekAbsolute); if (Status != ESUCCESS) { ERR("ArcSeek returned status %lu\n", Status); return FALSE; } - Status = ArcRead(BtrFsInfo->DeviceId, dest, count, &Count); + Status = ArcRead(DeviceId, dest, count, &Count); if (Status != ESUCCESS || Count != count) { ERR("ArcRead returned status %lu\n", Status); @@ -278,13 +277,14 @@ static BOOLEAN disk_read(u64 physical, void *dest, u32 count) return TRUE; } -static BOOLEAN _BtrFsSearchTree(u64 loffset, u8 level, struct btrfs_disk_key *key, - struct btrfs_path *path) +static BOOLEAN +_BtrFsSearchTree(PBTRFS_INFO BtrFsInfo, u64 loffset, u8 level, + struct btrfs_disk_key *key, struct btrfs_path *path) { - struct btrfs_super_block *sb = &BtrFsInfo->SuperBlock; union tree_buf *tree_buf = path->tree_buf; int slot, ret, lvl; u64 physical, logical = loffset; + TRACE("BtrFsSearchTree called: offset: 0x%llx, level: %u (%llu %u %llu)\n", loffset, level, key->objectid, key->type, key->offset); @@ -296,18 +296,20 @@ static BOOLEAN _BtrFsSearchTree(u64 loffset, u8 level, struct btrfs_disk_key *ke for (lvl = level; lvl >= 0; lvl--) { - physical = logical_physical(logical); + physical = logical_physical(&BtrFsInfo->ChunkMap, logical); - if (!disk_read(physical, &tree_buf->header, sb->nodesize)) + if (!disk_read(BtrFsInfo->DeviceId, physical, &tree_buf->header, + BtrFsInfo->SuperBlock.nodesize)) { - ERR("Error when reading tree node, loffset: 0x%llx, poffset: 0x%llx, level: %u\n", logical, physical, lvl); + ERR("Error when reading tree node, loffset: 0x%llx, poffset: 0x%llx, level: %u\n", + logical, physical, lvl); return FALSE; } - if (tree_buf->header.level != lvl) { - ERR("Error when searching in tree: expected lvl=%u but got %u\n", lvl, tree_buf->header.level); + ERR("Error when searching in tree: expected lvl=%u but got %u\n", + lvl, tree_buf->header.level); return FALSE; } @@ -353,13 +355,15 @@ static BOOLEAN _BtrFsSearchTree(u64 loffset, u8 level, struct btrfs_disk_key *ke } static inline BOOLEAN -BtrFsSearchTree(const struct btrfs_root_item *root, struct btrfs_disk_key *key, struct btrfs_path *path) +BtrFsSearchTree(PBTRFS_INFO BtrFsInfo, const struct btrfs_root_item *root, + struct btrfs_disk_key *key, struct btrfs_path *path) { - return _BtrFsSearchTree(root->bytenr, root->level, key, path); + return _BtrFsSearchTree(BtrFsInfo, root->bytenr, root->level, key, path); } static inline BOOLEAN -BtrFsSearchTreeType(const struct btrfs_root_item *root, u64 objectid, u8 type, struct btrfs_path *path) +BtrFsSearchTreeType(PBTRFS_INFO BtrFsInfo, const struct btrfs_root_item *root, + u64 objectid, u8 type, struct btrfs_path *path) { struct btrfs_disk_key key; @@ -367,7 +371,8 @@ BtrFsSearchTreeType(const struct btrfs_root_item *root, u64 objectid, u8 type, s key.type = type; key.offset = 0; - _BtrFsSearchTree(root->bytenr, root->level, &key, path); + if (!_BtrFsSearchTree(BtrFsInfo, root->bytenr, root->level, &key, path)) + return FALSE; if (path_current_disk_key(path)->objectid && !btrfs_comp_keys_type(&key, path_current_disk_key(path))) return TRUE; @@ -376,8 +381,8 @@ BtrFsSearchTreeType(const struct btrfs_root_item *root, u64 objectid, u8 type, s } /* return 0 if slot found */ -static int next_slot(struct btrfs_disk_key *key, - struct btrfs_path *path) +static int next_slot(PBTRFS_INFO BtrFsInfo, + struct btrfs_disk_key *key, struct btrfs_path *path) { int slot, level = 1; @@ -395,13 +400,13 @@ static int next_slot(struct btrfs_disk_key *key, if (slot >= path->itemsnr[level]) { level++; - continue;; + continue; } path->slots[level] = slot; path->slots[level - 1] = 0; /* reset low level slots info */ path->itemsnr[level - 1] = 0; path->offsets[level - 1] = 0; - _BtrFsSearchTree(path->offsets[level], level, key, path); + _BtrFsSearchTree(BtrFsInfo, path->offsets[level], level, key, path); break; } if (level == BTRFS_MAX_LEVEL) @@ -432,9 +437,9 @@ static int prev_slot(struct btrfs_disk_key *key, /* * read chunk_array in super block */ -static void btrfs_read_sys_chunk_array() +static void btrfs_read_sys_chunk_array(PBTRFS_INFO BtrFsInfo) { - struct btrfs_super_block *sb = &BtrFsInfo->SuperBlock; + const struct btrfs_super_block *sb = &BtrFsInfo->SuperBlock; struct btrfs_disk_key *key; struct btrfs_chunk *chunk; u16 cur; @@ -445,7 +450,8 @@ static void btrfs_read_sys_chunk_array() while (cur < sb->sys_chunk_array_size) { key = (struct btrfs_disk_key *) (sb->sys_chunk_array + cur); - TRACE("chunk key objectid: %llx, offset: %llx, type: %u\n", key->objectid, key->offset, key->type); + TRACE("chunk key objectid: %llx, offset: %llx, type: %u\n", + key->objectid, key->offset, key->type); cur += sizeof(*key); chunk = (struct btrfs_chunk *) (sb->sys_chunk_array + cur); TRACE("chunk length: %llx\n", chunk->length); @@ -460,17 +466,16 @@ static void btrfs_read_sys_chunk_array() cur += btrfs_chunk_item_size(chunk->num_stripes); TRACE("read_sys_chunk_array() cur=%d\n", cur); - insert_map((const struct btrfs_disk_key *) key, chunk); + insert_map(&BtrFsInfo->ChunkMap, key, chunk); } } - /* * read chunk items from chunk_tree and insert them to chunk map * */ -static void btrfs_read_chunk_tree() +static void btrfs_read_chunk_tree(PBTRFS_INFO BtrFsInfo) { - struct btrfs_super_block *sb = &BtrFsInfo->SuperBlock; + const struct btrfs_super_block *sb = &BtrFsInfo->SuperBlock; struct btrfs_disk_key ignore_key; struct btrfs_disk_key search_key; struct btrfs_chunk *chunk; @@ -488,8 +493,8 @@ static void btrfs_read_chunk_tree() search_key.objectid = BTRFS_FIRST_CHUNK_TREE_OBJECTID; search_key.type = BTRFS_CHUNK_ITEM_KEY; search_key.offset = 0; - init_path(&path); - _BtrFsSearchTree(sb->chunk_root, sb->chunk_root_level, &search_key, &path); + init_path(sb, &path); + _BtrFsSearchTree(BtrFsInfo, sb->chunk_root, sb->chunk_root_level, &search_key, &path); do { /* skip information about underlying block @@ -501,8 +506,8 @@ static void btrfs_read_chunk_tree() break; chunk = (struct btrfs_chunk *) (path_current_data(&path)); - insert_map(path_current_disk_key(&path), chunk); - } while (!next_slot(&search_key, &path)); + insert_map(&BtrFsInfo->ChunkMap, path_current_disk_key(&path), chunk); + } while (!next_slot(BtrFsInfo, &search_key, &path)); free_path(&path); } } @@ -536,7 +541,8 @@ static BOOLEAN verify_dir_item(struct btrfs_dir_item *item, u32 start, u32 total } -static struct btrfs_dir_item *BtrFsMatchDirItemName(struct btrfs_path *path, const char *name, int name_len) +static struct btrfs_dir_item * +BtrFsMatchDirItemName(struct btrfs_path *path, const char *name, int name_len) { struct btrfs_dir_item *item = (struct btrfs_dir_item *) path_current_data(path); u32 cur = 0, this_len; @@ -559,8 +565,11 @@ static struct btrfs_dir_item *BtrFsMatchDirItemName(struct btrfs_path *path, con return NULL; } -static BOOLEAN BtrFsLookupDirItem(const struct btrfs_root_item *root, u64 dir, const char *name, int name_len, - struct btrfs_dir_item *item) +static BOOLEAN +BtrFsLookupDirItem(PBTRFS_INFO BtrFsInfo, + const struct btrfs_root_item *root, u64 dir, + const char *name, int name_len, + struct btrfs_dir_item *item) { struct btrfs_path path; struct btrfs_disk_key key; @@ -569,9 +578,9 @@ static BOOLEAN BtrFsLookupDirItem(const struct btrfs_root_item *root, u64 dir, c key.objectid = dir; key.type = BTRFS_DIR_ITEM_KEY; key.offset = btrfs_crc32c(name, name_len); - init_path(&path); + init_path(&BtrFsInfo->SuperBlock, &path); - if (!BtrFsSearchTree(root, &key, &path)) + if (!BtrFsSearchTree(BtrFsInfo, root, &key, &path)) { free_path(&path); return FALSE; @@ -585,8 +594,11 @@ static BOOLEAN BtrFsLookupDirItem(const struct btrfs_root_item *root, u64 dir, c return res != NULL; } -static BOOLEAN BtrFsLookupDirItemI(const struct btrfs_root_item *root, u64 dir_haystack, const char *name, int name_len, - struct btrfs_dir_item *ret_item) +static BOOLEAN +BtrFsLookupDirItemI(PBTRFS_INFO BtrFsInfo, + const struct btrfs_root_item *root, u64 dir_haystack, + const char *name, int name_len, + struct btrfs_dir_item *ret_item) { struct btrfs_path path; struct btrfs_disk_key key; @@ -597,9 +609,9 @@ static BOOLEAN BtrFsLookupDirItemI(const struct btrfs_root_item *root, u64 dir_h key.objectid = dir_haystack; key.type = BTRFS_DIR_INDEX_KEY; key.offset = 0; - init_path(&path); + init_path(&BtrFsInfo->SuperBlock, &path); - BtrFsSearchTree(root, &key, &path); + BtrFsSearchTree(BtrFsInfo, root, &key, &path); if (btrfs_comp_keys_type(&key, path_current_disk_key(&path))) goto cleanup; @@ -608,8 +620,8 @@ static BOOLEAN BtrFsLookupDirItemI(const struct btrfs_root_item *root, u64 dir_h { item = (struct btrfs_dir_item *) path_current_data(&path); // TRACE("slot: %ld, KEY (%llu %u %llu) %.*s\n", - // path.slots[0], path.item.key.objectid, path.item.key.type, - // path.item.key.offset, item->name_len, (char *)item + sizeof(*item)); + // path.slots[0], path.item.key.objectid, path.item.key.type, + // path.item.key.offset, item->name_len, (char *)item + sizeof(*item)); if (verify_dir_item(item, 0, sizeof(*item) + item->name_len)) continue; @@ -626,7 +638,7 @@ static BOOLEAN BtrFsLookupDirItemI(const struct btrfs_root_item *root, u64 dir_h goto cleanup; } - } while (!next_slot(&key, &path)); + } while (!next_slot(BtrFsInfo, &key, &path)); cleanup: free_path(&path); @@ -638,13 +650,13 @@ cleanup: //////////////////////////////////////// static u64 btrfs_read_extent_inline(struct btrfs_path *path, - struct btrfs_file_extent_item *extent, u64 offset, - u64 size, char *out) + struct btrfs_file_extent_item *extent, + u64 offset, u64 size, char *out) { u32 dlen; const char *cbuf; const int data_off = offsetof( - struct btrfs_file_extent_item, disk_bytenr); + struct btrfs_file_extent_item, disk_bytenr); cbuf = (const char *) extent + data_off; dlen = extent->ram_bytes; @@ -671,7 +683,9 @@ static u64 btrfs_read_extent_inline(struct btrfs_path *path, return READ_ERROR; } -static u64 btrfs_read_extent_reg(struct btrfs_path *path, struct btrfs_file_extent_item *extent, +static u64 btrfs_read_extent_reg(PBTRFS_INFO BtrFsInfo, + struct btrfs_path *path, + struct btrfs_file_extent_item *extent, u64 offset, u64 size, char *out) { u64 physical, dlen; @@ -694,7 +708,7 @@ static u64 btrfs_read_extent_reg(struct btrfs_path *path, struct btrfs_file_exte return size; } - physical = logical_physical(extent->disk_bytenr); + physical = logical_physical(&BtrFsInfo->ChunkMap, extent->disk_bytenr); if (physical == INVALID_ADDRESS) { ERR("Unable to convert logical address to physical: %llu\n", extent->disk_bytenr); @@ -712,7 +726,9 @@ static u64 btrfs_read_extent_reg(struct btrfs_path *path, struct btrfs_file_exte temp_out = FrLdrTempAlloc(SECTOR_SIZE, TAG_BTRFS_FILE); - if (!disk_read(ALIGN_DOWN_BY(physical, SECTOR_SIZE), temp_out, SECTOR_SIZE)) + if (!disk_read(BtrFsInfo->DeviceId, + ALIGN_DOWN_BY(physical, SECTOR_SIZE), + temp_out, SECTOR_SIZE)) { FrLdrTempFree(temp_out, TAG_BTRFS_FILE); return READ_ERROR; @@ -730,11 +746,16 @@ static u64 btrfs_read_extent_reg(struct btrfs_path *path, struct btrfs_file_exte memcpy(out, temp_out + shift, SECTOR_SIZE - shift); FrLdrTempFree(temp_out, TAG_BTRFS_FILE); - if (!disk_read(physical + SECTOR_SIZE - shift, out + SECTOR_SIZE - shift, size - SECTOR_SIZE + shift)) + if (!disk_read(BtrFsInfo->DeviceId, + physical + SECTOR_SIZE - shift, + out + SECTOR_SIZE - shift, + size - SECTOR_SIZE + shift)) + { return READ_ERROR; + } } else { - if (!disk_read(physical, out, size)) + if (!disk_read(BtrFsInfo->DeviceId, physical, out, size)) return READ_ERROR; } @@ -745,7 +766,9 @@ static u64 btrfs_read_extent_reg(struct btrfs_path *path, struct btrfs_file_exte return READ_ERROR; } -static u64 btrfs_file_read(const struct btrfs_root_item *root, u64 inr, u64 offset, u64 size, char *buf) +static u64 btrfs_file_read(PBTRFS_INFO BtrFsInfo, + const struct btrfs_root_item *root, + u64 inr, u64 offset, u64 size, char *buf) { struct btrfs_path path; struct btrfs_disk_key key; @@ -759,9 +782,9 @@ static u64 btrfs_file_read(const struct btrfs_root_item *root, u64 inr, u64 offs key.objectid = inr; key.type = BTRFS_EXTENT_DATA_KEY; key.offset = offset; - init_path(&path); + init_path(&BtrFsInfo->SuperBlock, &path); - find_res = BtrFsSearchTree(root, &key, &path); + find_res = BtrFsSearchTree(BtrFsInfo, root, &key, &path); /* if we found greater key, switch to the previous one */ if (!find_res && btrfs_comp_keys(&key, path_current_disk_key(&path)) < 0) @@ -796,7 +819,7 @@ static u64 btrfs_file_read(const struct btrfs_root_item *root, u64 inr, u64 offs } else { - rd = btrfs_read_extent_reg(&path, extent, offset_in_extent, size, buf); + rd = btrfs_read_extent_reg(BtrFsInfo, &path, extent, offset_in_extent, size, buf); } if (rd == READ_ERROR) @@ -813,7 +836,7 @@ static u64 btrfs_file_read(const struct btrfs_root_item *root, u64 inr, u64 offs if (!size) break; - } while (!(res = next_slot(&key, &path))); + } while (!(res = next_slot(BtrFsInfo, &key, &path))); if (res) { @@ -832,15 +855,16 @@ out: //////////////////////////////////////// -static u64 btrfs_lookup_inode_ref(const struct btrfs_root_item *root, u64 inr, +static u64 btrfs_lookup_inode_ref(PBTRFS_INFO BtrFsInfo, + const struct btrfs_root_item *root, u64 inr, struct btrfs_inode_ref *refp, char *name) { struct btrfs_path path; struct btrfs_inode_ref *ref; u64 ret = INVALID_INODE; - init_path(&path); + init_path(&BtrFsInfo->SuperBlock, &path); - if (BtrFsSearchTreeType(root, inr, BTRFS_INODE_REF_KEY, &path)) + if (BtrFsSearchTreeType(BtrFsInfo, root, inr, BTRFS_INODE_REF_KEY, &path)) { ref = (struct btrfs_inode_ref *) path_current_data(&path); @@ -853,7 +877,8 @@ static u64 btrfs_lookup_inode_ref(const struct btrfs_root_item *root, u64 inr, return ret; } -static int btrfs_lookup_inode(const struct btrfs_root_item *root, +static int btrfs_lookup_inode(PBTRFS_INFO BtrFsInfo, + const struct btrfs_root_item *root, struct btrfs_disk_key *location, struct btrfs_inode_item *item, struct btrfs_root_item *new_root) @@ -870,10 +895,10 @@ static int btrfs_lookup_inode(const struct btrfs_root_item *root, // location->type = BTRFS_INODE_ITEM_KEY; // location->offset = 0; // } - init_path(&path); + init_path(&BtrFsInfo->SuperBlock, &path); TRACE("Searching inode (%llu %u %llu)\n", location->objectid, location->type, location->offset); - if (BtrFsSearchTree(&tmp_root, location, &path)) + if (BtrFsSearchTree(BtrFsInfo, &tmp_root, location, &path)) { if (item) *item = *((struct btrfs_inode_item *) path_current_data(&path)); @@ -888,16 +913,18 @@ static int btrfs_lookup_inode(const struct btrfs_root_item *root, return res; } -static BOOLEAN btrfs_readlink(const struct btrfs_root_item *root, u64 inr, char **target) +static BOOLEAN btrfs_readlink(PBTRFS_INFO BtrFsInfo, + const struct btrfs_root_item *root, + u64 inr, char **target) { struct btrfs_path path; struct btrfs_file_extent_item *extent; char *data_ptr; BOOLEAN res = FALSE; - init_path(&path); + init_path(&BtrFsInfo->SuperBlock, &path); - if (!BtrFsSearchTreeType(root, inr, BTRFS_EXTENT_DATA_KEY, &path)) + if (!BtrFsSearchTreeType(BtrFsInfo, root, inr, BTRFS_EXTENT_DATA_KEY, &path)) goto out; extent = (struct btrfs_file_extent_item *) path_current_data(&path); @@ -924,7 +951,7 @@ static BOOLEAN btrfs_readlink(const struct btrfs_root_item *root, u64 inr, char } data_ptr = (char *) extent + offsetof( - struct btrfs_file_extent_item, disk_bytenr); + struct btrfs_file_extent_item, disk_bytenr); *target = FrLdrTempAlloc(extent->ram_bytes + 1, TAG_BTRFS_LINK); if (!*target) @@ -945,7 +972,8 @@ out: /* inr must be a directory (for regular files with multiple hard links this function returns only one of the parents of the file) */ -static u64 get_parent_inode(const struct btrfs_root_item *root, u64 inr, +static u64 get_parent_inode(PBTRFS_INFO BtrFsInfo, + const struct btrfs_root_item *root, u64 inr, struct btrfs_inode_item *inode_item) { struct btrfs_disk_key key; @@ -974,14 +1002,14 @@ static u64 get_parent_inode(const struct btrfs_root_item *root, u64 inr, key.type = BTRFS_INODE_ITEM_KEY; key.offset = 0; - if (btrfs_lookup_inode(root, &key, inode_item, NULL)) + if (btrfs_lookup_inode(BtrFsInfo, root, &key, inode_item, NULL)) return INVALID_INODE; } return inr; } - res = btrfs_lookup_inode_ref(root, inr, NULL, NULL); + res = btrfs_lookup_inode_ref(BtrFsInfo, root, inr, NULL, NULL); if (res == INVALID_INODE) return INVALID_INODE; @@ -991,7 +1019,7 @@ static u64 get_parent_inode(const struct btrfs_root_item *root, u64 inr, key.type = BTRFS_INODE_ITEM_KEY; key.offset = 0; - if (btrfs_lookup_inode(root, &key, inode_item, NULL)) + if (btrfs_lookup_inode(BtrFsInfo, root, &key, inode_item, NULL)) return INVALID_INODE; } @@ -1021,7 +1049,8 @@ static inline const char *skip_current_directories(const char *cur) return cur; } -static u64 btrfs_lookup_path(const struct btrfs_root_item *root, u64 inr, const char *path, +static u64 btrfs_lookup_path(PBTRFS_INFO BtrFsInfo, + const struct btrfs_root_item *root, u64 inr, const char *path, u8 *type_p, struct btrfs_inode_item *inode_item_p, int symlink_limit) { struct btrfs_dir_item item; @@ -1055,7 +1084,7 @@ static u64 btrfs_lookup_path(const struct btrfs_root_item *root, u64 inr, const if (len == 2 && cur[0] == '.' && cur[1] == '.') { cur += 2; - inr = get_parent_inode(root, inr, &inode_item); + inr = get_parent_inode(BtrFsInfo, root, inr, &inode_item); if (inr == INVALID_INODE) return INVALID_INODE; @@ -1066,16 +1095,16 @@ static u64 btrfs_lookup_path(const struct btrfs_root_item *root, u64 inr, const if (!*cur) break; - if (!BtrFsLookupDirItem(root, inr, cur, len, &item)) + if (!BtrFsLookupDirItem(BtrFsInfo, root, inr, cur, len, &item)) { TRACE("Try to find case-insensitive, path=%s inr=%llu s=%.*s\n", path, inr, len, cur); - if (!BtrFsLookupDirItemI(root, inr, cur, len, &item)) + if (!BtrFsLookupDirItemI(BtrFsInfo, root, inr, cur, len, &item)) return INVALID_INODE; } type = item.type; have_inode = 1; - if (btrfs_lookup_inode(root, &item.location, &inode_item, NULL)) + if (btrfs_lookup_inode(BtrFsInfo, root, &item.location, &inode_item, NULL)) return INVALID_INODE; if (type == BTRFS_FT_SYMLINK && symlink_limit >= 0) @@ -1087,10 +1116,10 @@ static u64 btrfs_lookup_path(const struct btrfs_root_item *root, u64 inr, const } /* btrfs_readlink allocates link_target by itself */ - if (!btrfs_readlink(root, item.location.objectid, &link_target)) + if (!btrfs_readlink(BtrFsInfo, root, item.location.objectid, &link_target)) return INVALID_INODE; - inr = btrfs_lookup_path(root, inr, link_target, &type, &inode_item, symlink_limit - 1); + inr = btrfs_lookup_path(BtrFsInfo, root, inr, link_target, &type, &inode_item, symlink_limit - 1); FrLdrTempFree(link_target, TAG_BTRFS_LINK); @@ -1119,7 +1148,7 @@ static u64 btrfs_lookup_path(const struct btrfs_root_item *root, u64 inr, const key.type = BTRFS_INODE_ITEM_KEY; key.offset = 0; - if (btrfs_lookup_inode(root, &key, &inode_item, NULL)) + if (btrfs_lookup_inode(BtrFsInfo, root, &key, &inode_item, NULL)) return INVALID_INODE; } @@ -1155,6 +1184,8 @@ ARC_STATUS BtrFsGetFileInformation(ULONG FileId, FILEINFORMATION *Information) ARC_STATUS BtrFsOpen(CHAR *Path, OPENMODE OpenMode, ULONG *FileId) { + PBTRFS_INFO BtrFsInfo; + ULONG DeviceId; u64 inr; u8 type; @@ -1163,10 +1194,17 @@ ARC_STATUS BtrFsOpen(CHAR *Path, OPENMODE OpenMode, ULONG *FileId) TRACE("BtrFsOpen %s\n", Path); + /* Check parameters */ if (OpenMode != OpenReadOnly) return EACCES; - inr = btrfs_lookup_path(&BtrFsInfo->FsRoot, BtrFsInfo->FsRoot.root_dirid, Path, &type, &temp_file_info.inode, 40); + /* Get underlying device */ + DeviceId = FsGetDeviceId(*FileId); + BtrFsInfo = BtrFsVolumes[DeviceId]; + + inr = btrfs_lookup_path(BtrFsInfo, &BtrFsInfo->FsRoot, + BtrFsInfo->FsRoot.root_dirid, + Path, &type, &temp_file_info.inode, 40); if (inr == INVALID_INODE) { @@ -1189,7 +1227,8 @@ ARC_STATUS BtrFsOpen(CHAR *Path, OPENMODE OpenMode, ULONG *FileId) if (!phandle) return ENOMEM; - memcpy(phandle, &temp_file_info, sizeof(btrfs_file_info)); + RtlCopyMemory(phandle, &temp_file_info, sizeof(btrfs_file_info)); + phandle->Volume = BtrFsInfo; FsSetDeviceSpecific(*FileId, phandle); return ESUCCESS; @@ -1208,7 +1247,8 @@ ARC_STATUS BtrFsRead(ULONG FileId, VOID *Buffer, ULONG Size, ULONG *BytesRead) if (Size > phandle->inode.size) Size = phandle->inode.size; - rd = btrfs_file_read(&BtrFsInfo->FsRoot, phandle->inr, phandle->position, Size, Buffer); + rd = btrfs_file_read(phandle->Volume, &phandle->Volume->FsRoot, + phandle->inr, phandle->position, Size, Buffer); if (rd == READ_ERROR) { TRACE("An error occured while reading file %lu\n", FileId); @@ -1256,18 +1296,20 @@ const DEVVTBL BtrFsFuncTable = const DEVVTBL *BtrFsMount(ULONG DeviceId) { + PBTRFS_INFO BtrFsInfo; struct btrfs_path path; struct btrfs_root_item fs_root_item; TRACE("Enter BtrFsMount(%lu)\n", DeviceId); - BtrFsInfo = FrLdrTempAlloc(sizeof(struct BTRFS_INFO), TAG_BTRFS_INFO); + BtrFsInfo = FrLdrTempAlloc(sizeof(BTRFS_INFO), TAG_BTRFS_INFO); if (!BtrFsInfo) return NULL; - RtlZeroMemory(BtrFsInfo, sizeof(struct BTRFS_INFO)); + RtlZeroMemory(BtrFsInfo, sizeof(BTRFS_INFO)); /* Read the SuperBlock */ - if (!disk_read(BTRFS_SUPER_INFO_OFFSET, &BtrFsInfo->SuperBlock, sizeof(struct btrfs_super_block))) + if (!disk_read(DeviceId, BTRFS_SUPER_INFO_OFFSET, + &BtrFsInfo->SuperBlock, sizeof(BtrFsInfo->SuperBlock))) { FrLdrTempFree(BtrFsInfo, TAG_BTRFS_INFO); return NULL; @@ -1285,18 +1327,18 @@ const DEVVTBL *BtrFsMount(ULONG DeviceId) btrfs_init_crc32c(); - btrfs_read_sys_chunk_array(); - btrfs_read_chunk_tree(); + btrfs_read_sys_chunk_array(BtrFsInfo); + btrfs_read_chunk_tree(BtrFsInfo); /* setup roots */ fs_root_item.bytenr = BtrFsInfo->SuperBlock.root; fs_root_item.level = BtrFsInfo->SuperBlock.root_level; - init_path(&path); - if (!BtrFsSearchTreeType(&fs_root_item, BTRFS_FS_TREE_OBJECTID, BTRFS_ROOT_ITEM_KEY, &path)) + init_path(&BtrFsInfo->SuperBlock, &path); + if (!BtrFsSearchTreeType(BtrFsInfo, &fs_root_item, BTRFS_FS_TREE_OBJECTID, BTRFS_ROOT_ITEM_KEY, &path)) { - FrLdrTempFree(BtrFsInfo, TAG_BTRFS_INFO); free_path(&path); + FrLdrTempFree(BtrFsInfo, TAG_BTRFS_INFO); return NULL; } @@ -1304,6 +1346,9 @@ const DEVVTBL *BtrFsMount(ULONG DeviceId) free_path(&path); + /* Remember BTRFS volume information */ + BtrFsVolumes[DeviceId] = BtrFsInfo; + TRACE("BtrFsMount(%lu) success\n", DeviceId); return &BtrFsFuncTable; }

1 0

[reactos] 01/02: [FREELDR] Use RTL copy/zero-memory helper functions.
by Hermès Bélusca-Maïto 26 Jan '20

26 Jan '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f4fdc957c5c06fb938d9a… commit f4fdc957c5c06fb938d9a8cf6e74a2d7d36f0ec7 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Jan 26 18:41:03 2020 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Jan 26 18:48:14 2020 +0100 [FREELDR] Use RTL copy/zero-memory helper functions. --- boot/freeldr/freeldr/lib/fs/ext2.c | 2 +- boot/freeldr/freeldr/lib/fs/fat.c | 22 +++++++++++----------- boot/freeldr/freeldr/lib/fs/fs.c | 2 +- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/boot/freeldr/freeldr/lib/fs/ext2.c b/boot/freeldr/freeldr/lib/fs/ext2.c index 6ab00f3d1ab..65fae203e30 100644 --- a/boot/freeldr/freeldr/lib/fs/ext2.c +++ b/boot/freeldr/freeldr/lib/fs/ext2.c @@ -872,7 +872,7 @@ BOOLEAN Ext2ReadPartialBlock(PEXT2_VOLUME_INFO Volume, ULONG BlockNumber, ULONG return FALSE; } - memcpy(Buffer, ((PUCHAR)TempBuffer + StartingOffset), Length); + RtlCopyMemory(Buffer, ((PUCHAR)TempBuffer + StartingOffset), Length); FrLdrTempFree(TempBuffer, TAG_EXT_BUFFER); diff --git a/boot/freeldr/freeldr/lib/fs/fat.c b/boot/freeldr/freeldr/lib/fs/fat.c index 4c3358b9f2b..af0bcb1e7fd 100644 --- a/boot/freeldr/freeldr/lib/fs/fat.c +++ b/boot/freeldr/freeldr/lib/fs/fat.c @@ -519,8 +519,8 @@ BOOLEAN FatSearchDirectoryBufferForFile(PFAT_VOLUME_INFO Volume, PVOID Directory TRACE("FatSearchDirectoryBufferForFile() DirectoryBuffer = 0x%x EntryCount = %d FileName = %s\n", DirectoryBuffer, EntryCount, FileName); - memset(ShortNameBuffer, 0, 13 * sizeof(CHAR)); - memset(LfnNameBuffer, 0, 261 * sizeof(CHAR)); + RtlZeroMemory(ShortNameBuffer, 13 * sizeof(CHAR)); + RtlZeroMemory(LfnNameBuffer, 261 * sizeof(CHAR)); for (CurrentEntry=0; CurrentEntry<EntryCount; CurrentEntry++, DirectoryBuffer = ((PDIRENTRY)DirectoryBuffer)+1) { @@ -548,8 +548,8 @@ BOOLEAN FatSearchDirectoryBufferForFile(PFAT_VOLUME_INFO Volume, PVOID Directory // if (DirEntry->FileName[0] == '\xE5') { - memset(ShortNameBuffer, 0, 13 * sizeof(CHAR)); - memset(LfnNameBuffer, 0, 261 * sizeof(CHAR)); + RtlZeroMemory(ShortNameBuffer, 13 * sizeof(CHAR)); + RtlZeroMemory(LfnNameBuffer, 261 * sizeof(CHAR)); continue; } @@ -642,8 +642,8 @@ BOOLEAN FatSearchDirectoryBufferForFile(PFAT_VOLUME_INFO Volume, PVOID Directory // if (DirEntry->Attr & ATTR_VOLUMENAME) { - memset(ShortNameBuffer, 0, 13 * sizeof(UCHAR)); - memset(LfnNameBuffer, 0, 261 * sizeof(UCHAR)); + RtlZeroMemory(ShortNameBuffer, 13 * sizeof(UCHAR)); + RtlZeroMemory(LfnNameBuffer, 261 * sizeof(UCHAR)); continue; } @@ -700,8 +700,8 @@ BOOLEAN FatSearchDirectoryBufferForFile(PFAT_VOLUME_INFO Volume, PVOID Directory // // Nope, no match - zero buffers and continue looking // - memset(ShortNameBuffer, 0, 13 * sizeof(UCHAR)); - memset(LfnNameBuffer, 0, 261 * sizeof(UCHAR)); + RtlZeroMemory(ShortNameBuffer, 13 * sizeof(UCHAR)); + RtlZeroMemory(LfnNameBuffer, 261 * sizeof(UCHAR)); continue; } @@ -783,7 +783,7 @@ ARC_STATUS FatLookupFile(PFAT_VOLUME_INFO Volume, PCSTR FileName, PFAT_FILE_INFO TRACE("FatLookupFile() FileName = %s\n", FileName); - memset(FatFileInfoPointer, 0, sizeof(FAT_FILE_INFO)); + RtlZeroMemory(FatFileInfoPointer, sizeof(FAT_FILE_INFO)); // // Figure out how many sub-directories we are nested in @@ -852,7 +852,7 @@ ARC_STATUS FatLookupFile(PFAT_VOLUME_INFO Volume, PCSTR FileName, PFAT_FILE_INFO } } - memcpy(FatFileInfoPointer, &FatFileInfo, sizeof(FAT_FILE_INFO)); + RtlCopyMemory(FatFileInfoPointer, &FatFileInfo, sizeof(FAT_FILE_INFO)); return ESUCCESS; } @@ -1178,7 +1178,7 @@ BOOLEAN FatReadPartialCluster(PFAT_VOLUME_INFO Volume, ULONG ClusterNumber, ULON if (FatReadVolumeSectors(Volume, ClusterStartSector + SectorOffset, SectorCount, ReadBuffer)) { - memcpy(Buffer, ReadBuffer + StartingOffset, Length); + RtlCopyMemory(Buffer, ReadBuffer + StartingOffset, Length); Success = TRUE; } diff --git a/boot/freeldr/freeldr/lib/fs/fs.c b/boot/freeldr/freeldr/lib/fs/fs.c index 9aa7ca1da65..0b44e500694 100644 --- a/boot/freeldr/freeldr/lib/fs/fs.c +++ b/boot/freeldr/freeldr/lib/fs/fs.c @@ -394,7 +394,7 @@ VOID FsRegisterDevice(CHAR* Prefix, const DEVVTBL* FuncTable) pNewEntry->FuncTable = FuncTable; pNewEntry->ReferenceCount = 0; pNewEntry->Prefix = (CHAR*)(pNewEntry + 1); - memcpy(pNewEntry->Prefix, Prefix, Length); + RtlCopyMemory(pNewEntry->Prefix, Prefix, Length); InsertHeadList(&DeviceListHead, &pNewEntry->ListEntry); }

1 0

[reactos] 01/01: [USETUP] Remove redundant TEXT_STYLE_NORMAL flag on empty MUI entry field (#2275)
by Bișoc George 26 Jan '20

26 Jan '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=dac560f81a691f7300ddd… commit dac560f81a691f7300ddd5b808bfb8da7de88249 Author: Bișoc George <fraizeraust99(a)gmail.com> AuthorDate: Sun Jan 26 17:38:58 2020 +0100 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Jan 26 17:38:58 2020 +0100 [USETUP] Remove redundant TEXT_STYLE_NORMAL flag on empty MUI entry field (#2275) --- base/setup/usetup/lang/bg-BG.h | 2 +- base/setup/usetup/lang/bn-BD.h | 2 +- base/setup/usetup/lang/cs-CZ.h | 2 +- base/setup/usetup/lang/da-DK.h | 2 +- base/setup/usetup/lang/de-DE.h | 2 +- base/setup/usetup/lang/el-GR.h | 2 +- base/setup/usetup/lang/en-US.h | 2 +- base/setup/usetup/lang/es-ES.h | 2 +- base/setup/usetup/lang/et-EE.h | 2 +- base/setup/usetup/lang/fr-FR.h | 2 +- base/setup/usetup/lang/he-IL.h | 2 +- base/setup/usetup/lang/hu-HU.h | 2 +- base/setup/usetup/lang/it-IT.h | 2 +- base/setup/usetup/lang/ja-JP.h | 2 +- base/setup/usetup/lang/lt-LT.h | 2 +- base/setup/usetup/lang/ms-MY.h | 2 +- base/setup/usetup/lang/nl-NL.h | 2 +- base/setup/usetup/lang/pl-PL.h | 2 +- base/setup/usetup/lang/pt-BR.h | 2 +- base/setup/usetup/lang/pt-PT.h | 2 +- base/setup/usetup/lang/ro-RO.h | 2 +- base/setup/usetup/lang/ru-RU.h | 2 +- base/setup/usetup/lang/sk-SK.h | 2 +- base/setup/usetup/lang/sq-AL.h | 2 +- base/setup/usetup/lang/sv-SE.h | 2 +- base/setup/usetup/lang/tr-TR.h | 2 +- base/setup/usetup/lang/uk-UA.h | 2 +- 27 files changed, 27 insertions(+), 27 deletions(-) diff --git a/base/setup/usetup/lang/bg-BG.h b/base/setup/usetup/lang/bg-BG.h index f3bd4a8f566..0ea380691ff 100644 --- a/base/setup/usetup/lang/bg-BG.h +++ b/base/setup/usetup/lang/bg-BG.h @@ -1335,7 +1335,7 @@ static MUI_ENTRY bgBGFormatPartitionEntries[] = 0, 0, NULL, - TEXT_STYLE_NORMAL + 0 } }; diff --git a/base/setup/usetup/lang/bn-BD.h b/base/setup/usetup/lang/bn-BD.h index f4e11d3947b..1033aadade5 100644 --- a/base/setup/usetup/lang/bn-BD.h +++ b/base/setup/usetup/lang/bn-BD.h @@ -1325,7 +1325,7 @@ static MUI_ENTRY bnBDFormatPartitionEntries[] = 0, 0, NULL, - TEXT_STYLE_NORMAL + 0 } }; diff --git a/base/setup/usetup/lang/cs-CZ.h b/base/setup/usetup/lang/cs-CZ.h index e39792a97e6..121959d6ca7 100644 --- a/base/setup/usetup/lang/cs-CZ.h +++ b/base/setup/usetup/lang/cs-CZ.h @@ -1333,7 +1333,7 @@ static MUI_ENTRY csCZFormatPartitionEntries[] = 0, 0, NULL, - TEXT_STYLE_NORMAL + 0 } }; diff --git a/base/setup/usetup/lang/da-DK.h b/base/setup/usetup/lang/da-DK.h index 8d98f4c53b5..03757390b58 100644 --- a/base/setup/usetup/lang/da-DK.h +++ b/base/setup/usetup/lang/da-DK.h @@ -1327,7 +1327,7 @@ static MUI_ENTRY daDKFormatPartitionEntries[] = 0, 0, NULL, - TEXT_STYLE_NORMAL + 0 } }; diff --git a/base/setup/usetup/lang/de-DE.h b/base/setup/usetup/lang/de-DE.h index 8b223af9728..11f1f67f35b 100644 --- a/base/setup/usetup/lang/de-DE.h +++ b/base/setup/usetup/lang/de-DE.h @@ -1320,7 +1320,7 @@ static MUI_ENTRY deDEFormatPartitionEntries[] = 0, 0, NULL, - TEXT_STYLE_NORMAL + 0 } }; diff --git a/base/setup/usetup/lang/el-GR.h b/base/setup/usetup/lang/el-GR.h index fcbc1032022..77954444a03 100644 --- a/base/setup/usetup/lang/el-GR.h +++ b/base/setup/usetup/lang/el-GR.h @@ -1342,7 +1342,7 @@ static MUI_ENTRY elGRFormatPartitionEntries[] = 0, 0, NULL, - TEXT_STYLE_NORMAL + 0 } }; diff --git a/base/setup/usetup/lang/en-US.h b/base/setup/usetup/lang/en-US.h index cce855e7696..378700de0d8 100644 --- a/base/setup/usetup/lang/en-US.h +++ b/base/setup/usetup/lang/en-US.h @@ -1325,7 +1325,7 @@ static MUI_ENTRY enUSFormatPartitionEntries[] = 0, 0, NULL, - TEXT_STYLE_NORMAL + 0 } }; diff --git a/base/setup/usetup/lang/es-ES.h b/base/setup/usetup/lang/es-ES.h index 53164e51512..0296eae8697 100644 --- a/base/setup/usetup/lang/es-ES.h +++ b/base/setup/usetup/lang/es-ES.h @@ -1330,7 +1330,7 @@ static MUI_ENTRY esESFormatPartitionEntries[] = 0, 0, NULL, - TEXT_STYLE_NORMAL + 0 } }; diff --git a/base/setup/usetup/lang/et-EE.h b/base/setup/usetup/lang/et-EE.h index 76f3b4b7277..b48275023b2 100644 --- a/base/setup/usetup/lang/et-EE.h +++ b/base/setup/usetup/lang/et-EE.h @@ -1328,7 +1328,7 @@ static MUI_ENTRY etEEFormatPartitionEntries[] = 0, 0, NULL, - TEXT_STYLE_NORMAL + 0 } }; diff --git a/base/setup/usetup/lang/fr-FR.h b/base/setup/usetup/lang/fr-FR.h index e30433f80f6..93a6717f107 100644 --- a/base/setup/usetup/lang/fr-FR.h +++ b/base/setup/usetup/lang/fr-FR.h @@ -1348,7 +1348,7 @@ static MUI_ENTRY frFRFormatPartitionEntries[] = 0, 0, NULL, - TEXT_STYLE_NORMAL + 0 } }; diff --git a/base/setup/usetup/lang/he-IL.h b/base/setup/usetup/lang/he-IL.h index 477172b4883..292a8d97f3d 100644 --- a/base/setup/usetup/lang/he-IL.h +++ b/base/setup/usetup/lang/he-IL.h @@ -1329,7 +1329,7 @@ static MUI_ENTRY heILFormatPartitionEntries[] = 0, 0, NULL, - TEXT_STYLE_NORMAL + 0 } }; diff --git a/base/setup/usetup/lang/hu-HU.h b/base/setup/usetup/lang/hu-HU.h index 9c7054986ab..c70abf6bd58 100644 --- a/base/setup/usetup/lang/hu-HU.h +++ b/base/setup/usetup/lang/hu-HU.h @@ -1219,7 +1219,7 @@ static MUI_ENTRY huHUFormatPartitionEntries[] = 0, 0, NULL, - TEXT_STYLE_NORMAL + 0 } }; diff --git a/base/setup/usetup/lang/it-IT.h b/base/setup/usetup/lang/it-IT.h index 4372aa2d6dd..7780dbb256a 100644 --- a/base/setup/usetup/lang/it-IT.h +++ b/base/setup/usetup/lang/it-IT.h @@ -1331,7 +1331,7 @@ static MUI_ENTRY itITFormatPartitionEntries[] = 0, 0, NULL, - TEXT_STYLE_NORMAL + 0 } }; diff --git a/base/setup/usetup/lang/ja-JP.h b/base/setup/usetup/lang/ja-JP.h index fba00f2e408..37988a2df97 100644 --- a/base/setup/usetup/lang/ja-JP.h +++ b/base/setup/usetup/lang/ja-JP.h @@ -1328,7 +1328,7 @@ static MUI_ENTRY jaJPFormatPartitionEntries[] = 0, 0, NULL, - TEXT_STYLE_NORMAL + 0 } }; diff --git a/base/setup/usetup/lang/lt-LT.h b/base/setup/usetup/lang/lt-LT.h index 09f627f1d92..7fc3a3be540 100644 --- a/base/setup/usetup/lang/lt-LT.h +++ b/base/setup/usetup/lang/lt-LT.h @@ -1336,7 +1336,7 @@ static MUI_ENTRY ltLTFormatPartitionEntries[] = 0, 0, NULL, - TEXT_STYLE_NORMAL + 0 } }; diff --git a/base/setup/usetup/lang/ms-MY.h b/base/setup/usetup/lang/ms-MY.h index cf18828eb88..027af2649fc 100644 --- a/base/setup/usetup/lang/ms-MY.h +++ b/base/setup/usetup/lang/ms-MY.h @@ -1317,7 +1317,7 @@ static MUI_ENTRY msMYFormatPartitionEntries[] = 0, 0, NULL, - TEXT_STYLE_NORMAL + 0 } }; diff --git a/base/setup/usetup/lang/nl-NL.h b/base/setup/usetup/lang/nl-NL.h index 79c7297a52a..147bb3de274 100644 --- a/base/setup/usetup/lang/nl-NL.h +++ b/base/setup/usetup/lang/nl-NL.h @@ -1340,7 +1340,7 @@ static MUI_ENTRY nlNLFormatPartitionEntries[] = 0, 0, NULL, - TEXT_STYLE_NORMAL + 0 } }; diff --git a/base/setup/usetup/lang/pl-PL.h b/base/setup/usetup/lang/pl-PL.h index 916058b71de..cf5e07710dd 100644 --- a/base/setup/usetup/lang/pl-PL.h +++ b/base/setup/usetup/lang/pl-PL.h @@ -1330,7 +1330,7 @@ static MUI_ENTRY plPLFormatPartitionEntries[] = 0, "ENTER = Kontynuacja F3 = Wyj\230cie", TEXT_TYPE_STATUS | TEXT_PADDING_BIG, - TEXT_ID_STATIC + 0 }, { 0, diff --git a/base/setup/usetup/lang/pt-BR.h b/base/setup/usetup/lang/pt-BR.h index 20f2773e511..6993289d576 100644 --- a/base/setup/usetup/lang/pt-BR.h +++ b/base/setup/usetup/lang/pt-BR.h @@ -1336,7 +1336,7 @@ static MUI_ENTRY ptBRFormatPartitionEntries[] = 0, "ENTER=Continuar F3=Sair", TEXT_TYPE_STATUS, - TEXT_ID_STATIC + 0 }, { 0, diff --git a/base/setup/usetup/lang/pt-PT.h b/base/setup/usetup/lang/pt-PT.h index 3580a00f20d..9a7979b6ca4 100644 --- a/base/setup/usetup/lang/pt-PT.h +++ b/base/setup/usetup/lang/pt-PT.h @@ -1342,7 +1342,7 @@ static MUI_ENTRY ptPTFormatPartitionEntries[] = 0, 0, NULL, - TEXT_STYLE_NORMAL + 0 } }; diff --git a/base/setup/usetup/lang/ro-RO.h b/base/setup/usetup/lang/ro-RO.h index fc17cbd2dc0..97a30c7f924 100644 --- a/base/setup/usetup/lang/ro-RO.h +++ b/base/setup/usetup/lang/ro-RO.h @@ -1357,7 +1357,7 @@ static MUI_ENTRY roROFormatPartitionEntries[] = 0, 0, NULL, - TEXT_STYLE_NORMAL + 0 } }; diff --git a/base/setup/usetup/lang/ru-RU.h b/base/setup/usetup/lang/ru-RU.h index 54fcd984eee..8636f56777f 100644 --- a/base/setup/usetup/lang/ru-RU.h +++ b/base/setup/usetup/lang/ru-RU.h @@ -1348,7 +1348,7 @@ static MUI_ENTRY ruRUFormatPartitionEntries[] = 0, 0, NULL, - TEXT_STYLE_NORMAL + 0 } }; diff --git a/base/setup/usetup/lang/sk-SK.h b/base/setup/usetup/lang/sk-SK.h index 59230088b99..59987603034 100644 --- a/base/setup/usetup/lang/sk-SK.h +++ b/base/setup/usetup/lang/sk-SK.h @@ -1334,7 +1334,7 @@ static MUI_ENTRY skSKFormatPartitionEntries[] = 0, 0, NULL, - TEXT_STYLE_NORMAL + 0 } }; diff --git a/base/setup/usetup/lang/sq-AL.h b/base/setup/usetup/lang/sq-AL.h index 1c9beeb62f2..b74b10792ea 100644 --- a/base/setup/usetup/lang/sq-AL.h +++ b/base/setup/usetup/lang/sq-AL.h @@ -1332,7 +1332,7 @@ static MUI_ENTRY sqALFormatPartitionEntries[] = 0, 0, NULL, - TEXT_STYLE_NORMAL + 0 } }; diff --git a/base/setup/usetup/lang/sv-SE.h b/base/setup/usetup/lang/sv-SE.h index 949a34ba396..223b89dcde6 100644 --- a/base/setup/usetup/lang/sv-SE.h +++ b/base/setup/usetup/lang/sv-SE.h @@ -1334,7 +1334,7 @@ static MUI_ENTRY svSEFormatPartitionEntries[] = 0, 0, NULL, - TEXT_STYLE_NORMAL + 0 } }; diff --git a/base/setup/usetup/lang/tr-TR.h b/base/setup/usetup/lang/tr-TR.h index 237a04b498f..17a7cbd7867 100644 --- a/base/setup/usetup/lang/tr-TR.h +++ b/base/setup/usetup/lang/tr-TR.h @@ -1309,7 +1309,7 @@ static MUI_ENTRY trTRFormatPartitionEntries[] = 0, 0, NULL, - TEXT_STYLE_NORMAL + 0 } }; diff --git a/base/setup/usetup/lang/uk-UA.h b/base/setup/usetup/lang/uk-UA.h index 0e30a3e7896..3ee82254bcd 100644 --- a/base/setup/usetup/lang/uk-UA.h +++ b/base/setup/usetup/lang/uk-UA.h @@ -1333,7 +1333,7 @@ static MUI_ENTRY ukUAFormatPartitionEntries[] = 0, 0, NULL, - TEXT_STYLE_NORMAL + 0 } };

1 0

[reactos] 01/01: [PRINTING] Improve Stubs for GetPrinterA and GetPrinterDeviceA (#2274)
by Doug Lyons 26 Jan '20

26 Jan '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=acec69a1d7333dfc8b0a1… commit acec69a1d7333dfc8b0a1e922196b29768ce0f9c Author: Doug Lyons <douglyons(a)douglyons.com> AuthorDate: Sun Jan 26 09:21:39 2020 -0600 Commit: Colin Finck <colin(a)reactos.org> CommitDate: Sun Jan 26 16:21:39 2020 +0100 [PRINTING] Improve Stubs for GetPrinterA and GetPrinterDeviceA (#2274) --- win32ss/printing/base/winspool/printers.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/win32ss/printing/base/winspool/printers.c b/win32ss/printing/base/winspool/printers.c index 28bce502020..3d029144d51 100644 --- a/win32ss/printing/base/winspool/printers.c +++ b/win32ss/printing/base/winspool/printers.c @@ -580,6 +580,7 @@ BOOL WINAPI GetPrinterA(HANDLE hPrinter, DWORD Level, LPBYTE pPrinter, DWORD cbBuf, LPDWORD pcbNeeded) { TRACE("GetPrinterA(%p, %lu, %p, %lu, %p)\n", hPrinter, Level, pPrinter, cbBuf, pcbNeeded); + if(pcbNeeded) *pcbNeeded = 0; return FALSE; } @@ -587,6 +588,7 @@ BOOL WINAPI GetPrinterDriverA(HANDLE hPrinter, LPSTR pEnvironment, DWORD Level, LPBYTE pDriverInfo, DWORD cbBuf, LPDWORD pcbNeeded) { TRACE("GetPrinterDriverA(%p, %s, %lu, %p, %lu, %p)\n", hPrinter, pEnvironment, Level, pDriverInfo, cbBuf, pcbNeeded); + if(pcbNeeded) *pcbNeeded = 0; return FALSE; }

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs