Ros-diffs November 2017

ros-diffs@reactos.org

22 participants
186 discussions

[reactos] 02/02: [CRT] Add __m128i, _mm_setzero_si128, and _mm_stream_si128.

by Thomas Faber

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=89e83b2cf48c9bab7eec3… commit 89e83b2cf48c9bab7eec3670b69b72db675b0279 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Sat Nov 4 11:47:12 2017 +0100 [CRT] Add __m128i, _mm_setzero_si128, and _mm_stream_si128. --- sdk/include/crt/emmintrin.h | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/sdk/include/crt/emmintrin.h b/sdk/include/crt/emmintrin.h index 91cf4a6477..5f8ceb1933 100644 --- a/sdk/include/crt/emmintrin.h +++ b/sdk/include/crt/emmintrin.h @@ -11,6 +11,19 @@ #include <crtdefs.h> #include <xmmintrin.h> +typedef union _DECLSPEC_INTRIN_TYPE _CRT_ALIGN(16) __m128i +{ + __int8 m128i_i8[16]; + __int16 m128i_i16[8]; + __int32 m128i_i32[4]; + __int64 m128i_i64[2]; + unsigned __int8 m128i_u8[16]; + unsigned __int16 m128i_u16[8]; + unsigned __int32 m128i_u32[4]; + unsigned __int64 m128i_u64[2]; +} __m128i; +C_ASSERT(sizeof(__m128i) == 16); + typedef struct _DECLSPEC_INTRIN_TYPE _CRT_ALIGN(16) __m128d { double m128d_f64[2]; @@ -20,5 +33,9 @@ extern __m128d _mm_load_sd(double const*); extern int _mm_cvtsd_si32(__m128d); +extern __m128i _mm_setzero_si128(void); + +extern void _mm_stream_si128(__m128i *, __m128i); + #endif /* _INCLUDED_EMM */

6 years, 10 months

[reactos] 01/02: [RTL] Make RtlFillMemoryUlonglong public

by Thomas Faber

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=631d1e071c4def6cb318e… commit 631d1e071c4def6cb318ee7e917e568283f5bb9d Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Sat Nov 4 11:46:29 2017 +0100 [RTL] Make RtlFillMemoryUlonglong public --- sdk/lib/rtl/i386/rtlmem.s | 1 + 1 file changed, 1 insertion(+) diff --git a/sdk/lib/rtl/i386/rtlmem.s b/sdk/lib/rtl/i386/rtlmem.s index eb93f89d23..2843480f89 100644 --- a/sdk/lib/rtl/i386/rtlmem.s +++ b/sdk/lib/rtl/i386/rtlmem.s @@ -14,6 +14,7 @@ PUBLIC _RtlCompareMemory@12 PUBLIC _RtlCompareMemoryUlong@12 PUBLIC _RtlFillMemory@12 PUBLIC _RtlFillMemoryUlong@12 +PUBLIC _RtlFillMemoryUlonglong@16 PUBLIC _RtlMoveMemory@12 PUBLIC _RtlZeroMemory@8

6 years, 10 months

[reactos] 01/01: [NTOSKRNL] Don't make CcSetReadAheadGranularity() whine for every single file opened by FSDs making use of it.

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2b217e4ecf942126c4672… commit 2b217e4ecf942126c4672f8d1c0a2fb55530d731 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sat Nov 18 18:00:48 2017 +0100 [NTOSKRNL] Don't make CcSetReadAheadGranularity() whine for every single file opened by FSDs making use of it. --- ntoskrnl/cc/cacheman.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ntoskrnl/cc/cacheman.c b/ntoskrnl/cc/cacheman.c index 2369cad546..4d62314ccd 100644 --- a/ntoskrnl/cc/cacheman.c +++ b/ntoskrnl/cc/cacheman.c @@ -158,8 +158,10 @@ CcSetReadAheadGranularity ( IN ULONG Granularity ) { + static ULONG Warn; + CCTRACE(CC_API_DEBUG, "FileObject=%p Granularity=%lu\n", FileObject, Granularity); - UNIMPLEMENTED; + if (!Warn++) UNIMPLEMENTED; }

6 years, 10 months

[reactos] 02/02: [NTOSKRNL] In CcPurgeCacheSection(), don't assume the file being purged isn't used. Handle that case properly instead of asserting. This fixes a triggerable ASSERT from umode where you open a file on a CDFS (with MS CDFS) and attempt to lock the volume.

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=64cb138a673fa02d76922… commit 64cb138a673fa02d76922963c680bfeb05f1d715 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sat Nov 18 17:53:07 2017 +0100 [NTOSKRNL] In CcPurgeCacheSection(), don't assume the file being purged isn't used. Handle that case properly instead of asserting. This fixes a triggerable ASSERT from umode where you open a file on a CDFS (with MS CDFS) and attempt to lock the volume. --- ntoskrnl/cc/fs.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/ntoskrnl/cc/fs.c b/ntoskrnl/cc/fs.c index 6f6b5568fe..fb5f99aab2 100644 --- a/ntoskrnl/cc/fs.c +++ b/ntoskrnl/cc/fs.c @@ -143,6 +143,7 @@ CcPurgeCacheSection ( PLIST_ENTRY ListEntry; PROS_VACB Vacb; LONGLONG ViewEnd; + BOOLEAN Success; CCTRACE(CC_API_DEBUG, "SectionObjectPointer=%p\n FileOffset=%p Length=%lu UninitializeCacheMaps=%d", SectionObjectPointer, FileOffset, Length, UninitializeCacheMaps); @@ -169,6 +170,9 @@ CcPurgeCacheSection ( InitializeListHead(&FreeList); + /* Assume success */ + Success = TRUE; + KeAcquireGuardedMutex(&ViewLock); KeAcquireSpinLock(&SharedCacheMap->CacheMapLock, &OldIrql); ListEntry = SharedCacheMap->CacheMapVacbListHead.Flink; @@ -189,8 +193,12 @@ CcPurgeCacheSection ( break; } - ASSERT((Vacb->ReferenceCount == 0) || - (Vacb->ReferenceCount == 1 && Vacb->Dirty)); + /* Still in use, it cannot be purged, fail */ + if (Vacb->ReferenceCount != 0 && !Vacb->Dirty) + { + Success = FALSE; + break; + } /* This VACB is in range, so unlink it and mark for free */ RemoveEntryList(&Vacb->VacbLruListEntry); @@ -213,7 +221,7 @@ CcPurgeCacheSection ( CcRosInternalFreeVacb(Vacb); } - return TRUE; + return Success; }

6 years, 10 months

[reactos] 01/02: [NTOSKRNL] When CcPurgeCacheSection() succeed, make it return TRUE so that callers don't believe it always fail

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4768a371f4f8cb4387a90… commit 4768a371f4f8cb4387a902037e42d387086f334a Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sat Nov 18 17:51:08 2017 +0100 [NTOSKRNL] When CcPurgeCacheSection() succeed, make it return TRUE so that callers don't believe it always fail --- ntoskrnl/cc/fs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ntoskrnl/cc/fs.c b/ntoskrnl/cc/fs.c index 4ecd55352a..6f6b5568fe 100644 --- a/ntoskrnl/cc/fs.c +++ b/ntoskrnl/cc/fs.c @@ -213,7 +213,7 @@ CcPurgeCacheSection ( CcRosInternalFreeVacb(Vacb); } - return FALSE; + return TRUE; }

6 years, 10 months

[reactos] 01/01: [FONTS] Add more font substitutes. CORE-12419

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5d2e34d1d4f0b04df3e6e… commit 5d2e34d1d4f0b04df3e6e87ca143c5a20d0b0cd3 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Nov 19 00:11:16 2017 +0900 [FONTS] Add more font substitutes. CORE-12419 Substitute Comic Sans MS with Ubuntu, Georgia with FreeSerif and Palatino Linotype with DejaVu Serif. --- base/setup/usetup/muifonts.h | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/base/setup/usetup/muifonts.h b/base/setup/usetup/muifonts.h index e60088075d..4b0e0c26e8 100644 --- a/base/setup/usetup/muifonts.h +++ b/base/setup/usetup/muifonts.h @@ -19,6 +19,9 @@ MUI_SUBFONT LatinFonts[] = { L"Times New Roman", L"Liberation Serif" }, { L"Trebuchet MS", L"Open Sans" }, { L"System", L"FreeSans" }, + { L"Comic Sans MS", L"Ubuntu" }, + { L"Georgia", L"FreeSerif" }, + { L"Palatino Linotype", L"DejaVu Serif" }, { NULL, NULL } }; @@ -40,6 +43,9 @@ MUI_SUBFONT CyrillicFonts[] = { L"Times New Roman", L"Liberation Serif" }, { L"Trebuchet MS", L"Open Sans" }, { L"System", L"FreeSans" }, + { L"Comic Sans MS", L"Ubuntu" }, + { L"Georgia", L"FreeSerif" }, + { L"Palatino Linotype", L"DejaVu Serif" }, { NULL, NULL } }; @@ -61,6 +67,9 @@ MUI_SUBFONT GreekFonts[] = { L"Times New Roman", L"Liberation Serif" }, { L"Trebuchet MS", L"Open Sans" }, { L"System", L"FreeSans" }, + { L"Comic Sans MS", L"Ubuntu" }, + { L"Georgia", L"FreeSerif" }, + { L"Palatino Linotype", L"DejaVu Serif" }, { NULL, NULL } }; @@ -82,6 +91,9 @@ MUI_SUBFONT HebrewFonts[] = { L"Times New Roman", L"DejaVu Serif" }, { L"Trebuchet MS", L"Open Sans" }, { L"System", L"FreeSans" }, + { L"Comic Sans MS", L"Ubuntu" }, + { L"Georgia", L"FreeSerif" }, + { L"Palatino Linotype", L"DejaVu Serif" }, { NULL, NULL } }; @@ -112,6 +124,9 @@ MUI_SUBFONT ChineseSimplifiedFonts[] = { L"NSimSun", L"Droid Sans Fallback" }, { L"MS Song", L"Droid Sans Fallback" }, { L"System", L"Droid Sans Fallback" }, + { L"Comic Sans MS", L"Ubuntu" }, + { L"Georgia", L"FreeSerif" }, + { L"Palatino Linotype", L"DejaVu Serif" }, /* localized names */ { CSF_LocalName0, L"Droid Sans Fallback" }, { CSF_LocalName1, L"Droid Sans Fallback" }, @@ -147,6 +162,9 @@ MUI_SUBFONT ChineseTraditionalFonts[] = { L"DLCMingMedium", L"Droid Sans Fallback" }, { L"DLCMingBold", L"Droid Sans Fallback" }, { L"System", L"Droid Sans Fallback" }, + { L"Comic Sans MS", L"Ubuntu" }, + { L"Georgia", L"FreeSerif" }, + { L"Palatino Linotype", L"DejaVu Serif" }, /* localized names */ { CTF_LocalName0, L"Droid Sans Fallback" }, { CTF_LocalName1, L"Droid Sans Fallback" }, @@ -181,6 +199,9 @@ MUI_SUBFONT JapaneseFonts[] = { L"MS Gothic", L"Droid Sans Fallback" }, { L"MS PGothic", L"Droid Sans Fallback" }, { L"System", L"Droid Sans Fallback" }, + { L"Comic Sans MS", L"Ubuntu" }, + { L"Georgia", L"FreeSerif" }, + { L"Palatino Linotype", L"DejaVu Serif" }, /* localized names */ { JF_LocalName0, L"Droid Sans Fallback" }, { JF_LocalName1, L"Droid Sans Fallback" }, @@ -219,6 +240,9 @@ MUI_SUBFONT KoreanFonts[] = { L"Gulim", L"Droid Sans Fallback" }, { L"GulimChe", L"Droid Sans Fallback" }, { L"System", L"Droid Sans Fallback" }, + { L"Comic Sans MS", L"Ubuntu" }, + { L"Georgia", L"FreeSerif" }, + { L"Palatino Linotype", L"DejaVu Serif" }, /* localized names */ { KF_LocalName0, L"Droid Sans Fallback" }, { KF_LocalName1, L"Droid Sans Fallback" }, @@ -247,5 +271,8 @@ MUI_SUBFONT UnicodeFonts[] = { L"Times New Roman", L"DejaVu Serif" }, { L"Trebuchet MS", L"Open Sans" }, { L"System", L"FreeSans" }, + { L"Comic Sans MS", L"Ubuntu" }, + { L"Georgia", L"FreeSerif" }, + { L"Palatino Linotype", L"DejaVu Serif" }, { NULL, NULL } };

6 years, 10 months

[reactos] 01/01: [SHELL32] CDrivesFolder: Implement the eject and disconnect menu items. CORE-13841

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=64657051c3cb60f1997ff… commit 64657051c3cb60f1997ffa6c6dfda57adffc7547 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Nov 18 23:55:08 2017 +0900 [SHELL32] CDrivesFolder: Implement the eject and disconnect menu items. CORE-13841 - The items are shown only for the drives where they are applicable. - May not work fully yet due to bugs in the drivers. --- dll/win32/shell32/folders/CDrivesFolder.cpp | 185 ++++++++++++++++++++++++++-- dll/win32/shell32/lang/bg-BG.rc | 8 ++ dll/win32/shell32/lang/ca-ES.rc | 8 ++ dll/win32/shell32/lang/cs-CZ.rc | 8 ++ dll/win32/shell32/lang/da-DK.rc | 8 ++ dll/win32/shell32/lang/de-DE.rc | 8 ++ dll/win32/shell32/lang/el-GR.rc | 8 ++ dll/win32/shell32/lang/en-GB.rc | 8 ++ dll/win32/shell32/lang/en-US.rc | 8 ++ dll/win32/shell32/lang/es-ES.rc | 8 ++ dll/win32/shell32/lang/fi-FI.rc | 8 ++ dll/win32/shell32/lang/fr-FR.rc | 8 ++ dll/win32/shell32/lang/he-IL.rc | 8 ++ dll/win32/shell32/lang/hu-HU.rc | 8 ++ dll/win32/shell32/lang/it-IT.rc | 8 ++ dll/win32/shell32/lang/ja-JP.rc | 8 ++ dll/win32/shell32/lang/ko-KR.rc | 8 ++ dll/win32/shell32/lang/nl-NL.rc | 8 ++ dll/win32/shell32/lang/no-NO.rc | 8 ++ dll/win32/shell32/lang/pl-PL.rc | 8 ++ dll/win32/shell32/lang/pt-BR.rc | 8 ++ dll/win32/shell32/lang/pt-PT.rc | 8 ++ dll/win32/shell32/lang/ro-RO.rc | 8 ++ dll/win32/shell32/lang/ru-RU.rc | 8 ++ dll/win32/shell32/lang/sk-SK.rc | 8 ++ dll/win32/shell32/lang/sl-SI.rc | 8 ++ dll/win32/shell32/lang/sq-AL.rc | 8 ++ dll/win32/shell32/lang/sv-SE.rc | 8 ++ dll/win32/shell32/lang/tr-TR.rc | 8 ++ dll/win32/shell32/lang/uk-UA.rc | 8 ++ dll/win32/shell32/lang/zh-CN.rc | 8 ++ dll/win32/shell32/lang/zh-TW.rc | 8 ++ dll/win32/shell32/shresdef.h | 8 ++ 33 files changed, 429 insertions(+), 12 deletions(-) diff --git a/dll/win32/shell32/folders/CDrivesFolder.cpp b/dll/win32/shell32/folders/CDrivesFolder.cpp index 7a088248c9..a708dc4d49 100644 --- a/dll/win32/shell32/folders/CDrivesFolder.cpp +++ b/dll/win32/shell32/folders/CDrivesFolder.cpp @@ -4,6 +4,7 @@ * Copyright 1997 Marcus Meissner * Copyright 1998, 1999, 2002 Juergen Schmied * Copyright 2009 Andrew Hill + * Copyright 2017 Katayama Hirofumi MZ * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -57,6 +58,89 @@ static int iDriveTypeIds[7] = { IDS_DRIVE_FIXED, /* DRIVE_UNKNOWN */ * IShellFolder implementation */ +#define RETRY_COUNT 3 +#define RETRY_SLEEP 250 +static BOOL TryToLockOrUnlockDrive(HANDLE hDrive, BOOL bLock) +{ + DWORD dwError, dwBytesReturned; + DWORD dwCode = (bLock ? FSCTL_LOCK_VOLUME : FSCTL_UNLOCK_VOLUME); + for (DWORD i = 0; i < RETRY_COUNT; ++i) + { + if (DeviceIoControl(hDrive, dwCode, NULL, 0, NULL, 0, &dwBytesReturned, NULL)) + return TRUE; + + dwError = GetLastError(); + if (dwError == ERROR_INVALID_FUNCTION) + break; /* don't sleep if function is not implemented */ + + Sleep(RETRY_SLEEP); + } + SetLastError(dwError); + return FALSE; +} + +// NOTE: See also https://support.microsoft.com/en-us/help/165721/how-to-ejecting-removable-m… +static BOOL DoEjectDrive(const WCHAR *physical, UINT nDriveType, INT *pnStringID) +{ + /* GENERIC_WRITE isn't needed for umount */ + DWORD dwAccessMode = GENERIC_READ; + DWORD dwShareMode = FILE_SHARE_READ | FILE_SHARE_WRITE; + + HANDLE hDrive = CreateFile(physical, dwAccessMode, dwShareMode, 0, OPEN_EXISTING, 0, NULL); + if (hDrive == INVALID_HANDLE_VALUE) + return FALSE; + + BOOL bResult, bNeedUnlock = FALSE; + DWORD dwBytesReturned, dwError = NO_ERROR; + PREVENT_MEDIA_REMOVAL removal; + do + { + bResult = TryToLockOrUnlockDrive(hDrive, TRUE); + if (!bResult) + { + dwError = GetLastError(); + *pnStringID = IDS_CANTLOCKVOLUME; /* Unable to lock volume */ + break; + } + bResult = DeviceIoControl(hDrive, FSCTL_DISMOUNT_VOLUME, NULL, 0, NULL, 0, &dwBytesReturned, NULL); + if (!bResult) + { + dwError = GetLastError(); + *pnStringID = IDS_CANTDISMOUNTVOLUME; /* Unable to dismount volume */ + bNeedUnlock = TRUE; + break; + } + removal.PreventMediaRemoval = FALSE; + bResult = DeviceIoControl(hDrive, IOCTL_STORAGE_MEDIA_REMOVAL, &removal, sizeof(removal), NULL, + 0, &dwBytesReturned, NULL); + if (!bResult) + { + *pnStringID = IDS_CANTEJECTMEDIA; /* Unable to eject media */ + dwError = GetLastError(); + bNeedUnlock = TRUE; + break; + } + bResult = DeviceIoControl(hDrive, IOCTL_STORAGE_EJECT_MEDIA, NULL, 0, NULL, 0, &dwBytesReturned, NULL); + if (!bResult) + { + *pnStringID = IDS_CANTEJECTMEDIA; /* Unable to eject media */ + dwError = GetLastError(); + bNeedUnlock = TRUE; + break; + } + } while (0); + + if (bNeedUnlock) + { + TryToLockOrUnlockDrive(hDrive, FALSE); + } + + CloseHandle(hDrive); + + SetLastError(dwError); + return bResult; +} + HRESULT CALLBACK DrivesContextMenuCallback(IShellFolder *psf, HWND hwnd, IDataObject *pdtobj, @@ -70,6 +154,8 @@ HRESULT CALLBACK DrivesContextMenuCallback(IShellFolder *psf, PIDLIST_ABSOLUTE pidlFolder; PUITEMID_CHILD *apidl; UINT cidl; + UINT nDriveType; + DWORD dwFlags; HRESULT hr = SH_GetApidlFromDataObject(pdtobj, &pidlFolder, &apidl, &cidl); if (FAILED_UNEXPECTEDLY(hr)) return hr; @@ -82,35 +168,110 @@ HRESULT CALLBACK DrivesContextMenuCallback(IShellFolder *psf, _ILFreeaPidl(apidl, cidl); return E_FAIL; } + nDriveType = GetDriveTypeA(szDrive); + GetVolumeInformationA(szDrive, NULL, 0, NULL, NULL, &dwFlags, NULL, 0); + +// custom command IDs +#define CMDID_FORMAT 1 +#define CMDID_EJECT 2 +#define CMDID_DISCONNECT 3 if (uMsg == DFM_MERGECONTEXTMENU) { QCMINFO *pqcminfo = (QCMINFO *)lParam; - DWORD dwFlags; - if (GetVolumeInformationA(szDrive, NULL, 0, NULL, NULL, &dwFlags, NULL, 0)) + UINT idCmdFirst = pqcminfo->idCmdFirst; + if (!(dwFlags & FILE_READ_ONLY_VOLUME) && nDriveType != DRIVE_REMOTE) { - /* Disable format if read only */ - if (!(dwFlags & FILE_READ_ONLY_VOLUME) && GetDriveTypeA(szDrive) != DRIVE_REMOTE) - { - _InsertMenuItemW(pqcminfo->hmenu, pqcminfo->indexMenu++, TRUE, 0, MFT_SEPARATOR, NULL, 0); - _InsertMenuItemW(pqcminfo->hmenu, pqcminfo->indexMenu++, TRUE, pqcminfo->idCmdFirst++, MFT_STRING, MAKEINTRESOURCEW(IDS_FORMATDRIVE), MFS_ENABLED); - } + /* add separator and Format */ + UINT idCmd = idCmdFirst + CMDID_FORMAT; + _InsertMenuItemW(pqcminfo->hmenu, pqcminfo->indexMenu++, TRUE, 0, MFT_SEPARATOR, NULL, 0); + _InsertMenuItemW(pqcminfo->hmenu, pqcminfo->indexMenu++, TRUE, idCmd, MFT_STRING, MAKEINTRESOURCEW(IDS_FORMATDRIVE), MFS_ENABLED); + } + if (nDriveType == DRIVE_REMOVABLE || nDriveType == DRIVE_CDROM) + { + /* add separator and Eject */ + UINT idCmd = idCmdFirst + CMDID_EJECT; + _InsertMenuItemW(pqcminfo->hmenu, pqcminfo->indexMenu++, TRUE, 0, MFT_SEPARATOR, NULL, 0); + _InsertMenuItemW(pqcminfo->hmenu, pqcminfo->indexMenu++, TRUE, idCmd, MFT_STRING, MAKEINTRESOURCEW(IDS_EJECT), MFS_ENABLED); + } + if (nDriveType == DRIVE_REMOTE) + { + /* add separator and Disconnect */ + UINT idCmd = idCmdFirst + CMDID_DISCONNECT; + _InsertMenuItemW(pqcminfo->hmenu, pqcminfo->indexMenu++, TRUE, 0, MFT_SEPARATOR, NULL, 0); + _InsertMenuItemW(pqcminfo->hmenu, pqcminfo->indexMenu++, TRUE, idCmd, MFT_STRING, MAKEINTRESOURCEW(IDS_DISCONNECT), MFS_ENABLED); } + + pqcminfo->idCmdFirst += 3; } else if (uMsg == DFM_INVOKECOMMAND) { + WCHAR wszBuf[4] = L"A:\\"; + wszBuf[0] = (WCHAR)szDrive[0]; + + INT nStringID = 0; + DWORD dwError = NO_ERROR; + if (wParam == DFM_CMD_PROPERTIES) { - WCHAR wszBuf[4]; - wcscpy(wszBuf, L"A:\\"); - wszBuf[0] = (WCHAR)szDrive[0]; if (!SH_ShowDriveProperties(wszBuf, pidlFolder, apidl)) + { hr = E_FAIL; + dwError = ERROR_CAN_NOT_COMPLETE; + nStringID = IDS_CANTSHOWPROPERTIES; + } } else { - SHFormatDrive(hwnd, szDrive[0] - 'A', SHFMT_ID_DEFAULT, 0); + if (wParam == CMDID_FORMAT) + { + /* do format */ + DWORD dwRet = SHFormatDrive(hwnd, szDrive[0] - 'A', SHFMT_ID_DEFAULT, 0); + switch (dwRet) + { + case SHFMT_ERROR: case SHFMT_CANCEL: case SHFMT_NOFORMAT: + hr = E_FAIL; + break; + } + } + else if (wParam == CMDID_EJECT) + { + /* do eject */ + WCHAR physical[10]; + wsprintfW(physical, _T("\\\\.\\%c:"), szDrive[0]); + + if (DoEjectDrive(physical, nDriveType, &nStringID)) + { + SHChangeNotify(SHCNE_MEDIAREMOVED, SHCNF_PATHW | SHCNF_FLUSHNOWAIT, wszBuf, NULL); + } + else + { + dwError = GetLastError(); + } + } + else if (wParam == CMDID_DISCONNECT) + { + /* do disconnect */ + dwError = WNetCancelConnection2W(wszBuf, 0, FALSE); + if (dwError == NO_ERROR) + { + SHChangeNotify(SHCNE_DRIVEREMOVED, SHCNF_PATHW | SHCNF_FLUSHNOWAIT, wszBuf, NULL); + } + else + { + nStringID = IDS_CANTDISCONNECT; + } + } + } + + if (nStringID != 0) + { + /* show error message */ + WCHAR szFormat[128], szMessage[128]; + LoadStringW(shell32_hInstance, nStringID, szFormat, _countof(szFormat)); + wsprintfW(szMessage, szFormat, dwError); + MessageBoxW(hwnd, szMessage, NULL, MB_ICONERROR); } } diff --git a/dll/win32/shell32/lang/bg-BG.rc b/dll/win32/shell32/lang/bg-BG.rc index 642206abbb..cf7d217fd6 100644 --- a/dll/win32/shell32/lang/bg-BG.rc +++ b/dll/win32/shell32/lang/bg-BG.rc @@ -683,6 +683,8 @@ BEGIN IDS_FORMATDRIVE "Оразмеряване..." IDS_RENAME "Преименуване" IDS_PASTE "Вмъкване" + IDS_EJECT "Eject" + IDS_DISCONNECT "Disconnect" IDS_CREATEFOLDER_DENIED "Unable to create the folder '%1'" IDS_CREATEFOLDER_CAPTION "Unable to create folder" @@ -776,6 +778,12 @@ BEGIN IDS_PICK_ICON_FILTER "Файлове със значета (*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0All Files (*.*)\0*.*\0" IDS_OPEN_WITH_FILTER "Изпълними файлове (*.exe)\0*.exe\0All Files (*.*)\0*.*\0" + IDS_CANTLOCKVOLUME "Unable to lock volume (Error Code: %lu)." + IDS_CANTDISMOUNTVOLUME "Unable to dismount volume (Error Code: %lu)." + IDS_CANTEJECTMEDIA "Unable to eject media (Error Code: %lu)." + IDS_CANTSHOWPROPERTIES "Unable to show properties (Error Code: %lu)." + IDS_CANTDISCONNECT "Unable to disconnect (Error Code: %lu)." + IDS_DIRECTORY "Папка" IDS_BAT_FILE "Пакетен файл на РеактОС" IDS_CMD_FILE "Писание за управление на РеактОС" diff --git a/dll/win32/shell32/lang/ca-ES.rc b/dll/win32/shell32/lang/ca-ES.rc index 02bf0bcae6..a6c579e191 100644 --- a/dll/win32/shell32/lang/ca-ES.rc +++ b/dll/win32/shell32/lang/ca-ES.rc @@ -683,6 +683,8 @@ BEGIN IDS_FORMATDRIVE "Format..." IDS_RENAME "Rename" IDS_PASTE "Paste" + IDS_EJECT "Eject" + IDS_DISCONNECT "Disconnect" IDS_CREATEFOLDER_DENIED "Unable to create the folder '%1'" IDS_CREATEFOLDER_CAPTION "Unable to create folder" @@ -776,6 +778,12 @@ BEGIN IDS_PICK_ICON_FILTER "Icon Files (*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0All Files (*.*)\0*.*\0" IDS_OPEN_WITH_FILTER "Executable Files (*.exe)\0*.exe\0All Files (*.*)\0*.*\0" + IDS_CANTLOCKVOLUME "Unable to lock volume (Error Code: %lu)." + IDS_CANTDISMOUNTVOLUME "Unable to dismount volume (Error Code: %lu)." + IDS_CANTEJECTMEDIA "Unable to eject media (Error Code: %lu)." + IDS_CANTSHOWPROPERTIES "Unable to show properties (Error Code: %lu)." + IDS_CANTDISCONNECT "Unable to disconnect (Error Code: %lu)." + IDS_DIRECTORY "Folder" IDS_BAT_FILE "ReactOS Batch File" IDS_CMD_FILE "ReactOS Command Script" diff --git a/dll/win32/shell32/lang/cs-CZ.rc b/dll/win32/shell32/lang/cs-CZ.rc index 4e37b93e44..0b7eb71c90 100644 --- a/dll/win32/shell32/lang/cs-CZ.rc +++ b/dll/win32/shell32/lang/cs-CZ.rc @@ -689,6 +689,8 @@ BEGIN IDS_FORMATDRIVE "Formátovat..." IDS_RENAME "Přejmenovat" IDS_PASTE "Vložit" + IDS_EJECT "Eject" + IDS_DISCONNECT "Disconnect" IDS_CREATEFOLDER_DENIED "Složku '%1' nebylo možné vytvořit" IDS_CREATEFOLDER_CAPTION "Složku nebylo možné vytvořit" @@ -782,6 +784,12 @@ BEGIN IDS_PICK_ICON_FILTER "Soubory ikon (*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0All Files (*.*)\0*.*\0" IDS_OPEN_WITH_FILTER "Spustitelné soubory (*.exe)\0*.exe\0All Files (*.*)\0*.*\0" + IDS_CANTLOCKVOLUME "Unable to lock volume (Error Code: %lu)." + IDS_CANTDISMOUNTVOLUME "Unable to dismount volume (Error Code: %lu)." + IDS_CANTEJECTMEDIA "Unable to eject media (Error Code: %lu)." + IDS_CANTSHOWPROPERTIES "Unable to show properties (Error Code: %lu)." + IDS_CANTDISCONNECT "Unable to disconnect (Error Code: %lu)." + IDS_DIRECTORY "Složka" IDS_BAT_FILE "ReactOS dávkový soubor" IDS_CMD_FILE "ReactOS příkazový skript" diff --git a/dll/win32/shell32/lang/da-DK.rc b/dll/win32/shell32/lang/da-DK.rc index 34566694be..c72a856a9d 100644 --- a/dll/win32/shell32/lang/da-DK.rc +++ b/dll/win32/shell32/lang/da-DK.rc @@ -689,6 +689,8 @@ BEGIN IDS_FORMATDRIVE "Format..." IDS_RENAME "Rename" IDS_PASTE "Paste" + IDS_EJECT "Eject" + IDS_DISCONNECT "Disconnect" IDS_CREATEFOLDER_DENIED "Unable to create the folder '%1'" IDS_CREATEFOLDER_CAPTION "Unable to create folder" @@ -782,6 +784,12 @@ BEGIN IDS_PICK_ICON_FILTER "Icon Files (*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0All Files (*.*)\0*.*\0" IDS_OPEN_WITH_FILTER "Executable Files (*.exe)\0*.exe\0All Files (*.*)\0*.*\0" + IDS_CANTLOCKVOLUME "Unable to lock volume (Error Code: %lu)." + IDS_CANTDISMOUNTVOLUME "Unable to dismount volume (Error Code: %lu)." + IDS_CANTEJECTMEDIA "Unable to eject media (Error Code: %lu)." + IDS_CANTSHOWPROPERTIES "Unable to show properties (Error Code: %lu)." + IDS_CANTDISCONNECT "Unable to disconnect (Error Code: %lu)." + IDS_DIRECTORY "Folder" IDS_BAT_FILE "ReactOS Batch File" IDS_CMD_FILE "ReactOS Command Script" diff --git a/dll/win32/shell32/lang/de-DE.rc b/dll/win32/shell32/lang/de-DE.rc index 574e48e01a..bd80efef09 100644 --- a/dll/win32/shell32/lang/de-DE.rc +++ b/dll/win32/shell32/lang/de-DE.rc @@ -684,6 +684,8 @@ BEGIN IDS_FORMATDRIVE "Formatieren..." IDS_RENAME "Umbenennen" IDS_PASTE "Einfügen" + IDS_EJECT "Auswerfen" + IDS_DISCONNECT "Trennen" IDS_CREATEFOLDER_DENIED " Der Ordner kann nicht erstellt werden '%1'" IDS_CREATEFOLDER_CAPTION " Der Ordner kann nicht erstellt werden." @@ -777,6 +779,12 @@ BEGIN IDS_PICK_ICON_FILTER "Symboldateien (*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0Alle Dateien (*.*)\0*.*\0" IDS_OPEN_WITH_FILTER "Programme (*.exe)\0*.exe\0Alle Dateien (*.*)\0*.*\0" + IDS_CANTLOCKVOLUME "Sperren des Volumes nicht möglich (Fehlercode: %lu)." + IDS_CANTDISMOUNTVOLUME "Ausbinden des Volumes nicht möglich (Fehlercode: %lu)." + IDS_CANTEJECTMEDIA "Auswerfen des Mediums nicht möglich (Fehlercode: %lu)." + IDS_CANTSHOWPROPERTIES "Unable to show properties (Fehlercode: %lu)." + IDS_CANTDISCONNECT "Unable to disconnect (Error Code: %lu)." + IDS_DIRECTORY "Dateiordner" IDS_BAT_FILE "ReactOS-Stapelverarbeitungsdatei" IDS_CMD_FILE "ReactOS-Befehlsskript" diff --git a/dll/win32/shell32/lang/el-GR.rc b/dll/win32/shell32/lang/el-GR.rc index f49f1c2333..2980b1d270 100644 --- a/dll/win32/shell32/lang/el-GR.rc +++ b/dll/win32/shell32/lang/el-GR.rc @@ -683,6 +683,8 @@ BEGIN IDS_FORMATDRIVE "Format..." IDS_RENAME "Rename" IDS_PASTE "Paste" + IDS_EJECT "Eject" + IDS_DISCONNECT "Disconnect" IDS_CREATEFOLDER_DENIED "Unable to create the folder '%1'" IDS_CREATEFOLDER_CAPTION "Unable to create folder" @@ -776,6 +778,12 @@ BEGIN IDS_PICK_ICON_FILTER "Icon Files (*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0All Files (*.*)\0*.*\0" IDS_OPEN_WITH_FILTER "Executable Files (*.exe)\0*.exe\0All Files (*.*)\0*.*\0" + IDS_CANTLOCKVOLUME "Unable to lock volume (Error Code: %lu)." + IDS_CANTDISMOUNTVOLUME "Unable to dismount volume (Error Code: %lu)." + IDS_CANTEJECTMEDIA "Unable to eject media (Error Code: %lu)." + IDS_CANTSHOWPROPERTIES "Unable to show properties (Error Code: %lu)." + IDS_CANTDISCONNECT "Unable to disconnect (Error Code: %lu)." + IDS_DIRECTORY "Folder" IDS_BAT_FILE "ReactOS Batch File" IDS_CMD_FILE "ReactOS Command Script" diff --git a/dll/win32/shell32/lang/en-GB.rc b/dll/win32/shell32/lang/en-GB.rc index 9ea6c41dc0..44fcc213ff 100644 --- a/dll/win32/shell32/lang/en-GB.rc +++ b/dll/win32/shell32/lang/en-GB.rc @@ -683,6 +683,8 @@ BEGIN IDS_FORMATDRIVE "Format..." IDS_RENAME "Rename" IDS_PASTE "Paste" + IDS_EJECT "Eject" + IDS_DISCONNECT "Disconnect" IDS_CREATEFOLDER_DENIED "Unable to create the folder '%1'" IDS_CREATEFOLDER_CAPTION "Unable to create folder" @@ -776,6 +778,12 @@ BEGIN IDS_PICK_ICON_FILTER "Icon Files (*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0All Files (*.*)\0*.*\0" IDS_OPEN_WITH_FILTER "Executable Files (*.exe)\0*.exe\0All Files (*.*)\0*.*\0" + IDS_CANTLOCKVOLUME "Unable to lock volume (Error Code: %lu)." + IDS_CANTDISMOUNTVOLUME "Unable to dismount volume (Error Code: %lu)." + IDS_CANTEJECTMEDIA "Unable to eject media (Error Code: %lu)." + IDS_CANTSHOWPROPERTIES "Unable to show properties (Error Code: %lu)." + IDS_CANTDISCONNECT "Unable to disconnect (Error Code: %lu)." + IDS_DIRECTORY "Folder" IDS_BAT_FILE "ReactOS Batch File" IDS_CMD_FILE "ReactOS Command Script" diff --git a/dll/win32/shell32/lang/en-US.rc b/dll/win32/shell32/lang/en-US.rc index 4bbc8ac521..adc28545c3 100644 --- a/dll/win32/shell32/lang/en-US.rc +++ b/dll/win32/shell32/lang/en-US.rc @@ -684,6 +684,8 @@ BEGIN IDS_FORMATDRIVE "Format..." IDS_RENAME "Rename" IDS_PASTE "Paste" + IDS_EJECT "Eject" + IDS_DISCONNECT "Disconnect" IDS_CREATEFOLDER_DENIED "Unable to create the folder '%1'" IDS_CREATEFOLDER_CAPTION "Unable to create folder" @@ -777,6 +779,12 @@ BEGIN IDS_PICK_ICON_FILTER "Icon Files (*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0All Files (*.*)\0*.*\0" IDS_OPEN_WITH_FILTER "Executable Files (*.exe)\0*.exe\0All Files (*.*)\0*.*\0" + IDS_CANTLOCKVOLUME "Unable to lock volume (Error Code: %lu)." + IDS_CANTDISMOUNTVOLUME "Unable to dismount volume (Error Code: %lu)." + IDS_CANTEJECTMEDIA "Unable to eject media (Error Code: %lu)." + IDS_CANTSHOWPROPERTIES "Unable to show properties (Error Code: %lu)." + IDS_CANTDISCONNECT "Unable to disconnect (Error Code: %lu)." + IDS_DIRECTORY "Folder" IDS_BAT_FILE "ReactOS Batch File" IDS_CMD_FILE "ReactOS Command Script" diff --git a/dll/win32/shell32/lang/es-ES.rc b/dll/win32/shell32/lang/es-ES.rc index 9ef9bc00ff..7d69400e43 100644 --- a/dll/win32/shell32/lang/es-ES.rc +++ b/dll/win32/shell32/lang/es-ES.rc @@ -685,6 +685,8 @@ BEGIN IDS_FORMATDRIVE "Formatear..." IDS_RENAME "Renombrar" IDS_PASTE "Insertar" + IDS_EJECT "Eject" + IDS_DISCONNECT "Disconnect" IDS_CREATEFOLDER_DENIED "Unable to create the folder '%1'" IDS_CREATEFOLDER_CAPTION "Unable to create folder" @@ -778,6 +780,12 @@ BEGIN IDS_PICK_ICON_FILTER "Archivos de icono (*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0Todos los archivos (*.*)\0*.*\0" IDS_OPEN_WITH_FILTER "Programas (*.exe)\0*.exe\0Todos los archivos (*.*)\0*.*\0" + IDS_CANTLOCKVOLUME "Unable to lock volume (Error Code: %lu)." + IDS_CANTDISMOUNTVOLUME "Unable to dismount volume (Error Code: %lu)." + IDS_CANTEJECTMEDIA "Unable to eject media (Error Code: %lu)." + IDS_CANTSHOWPROPERTIES "Unable to show properties (Error Code: %lu)." + IDS_CANTDISCONNECT "Unable to disconnect (Error Code: %lu)." + IDS_DIRECTORY "Directorio" IDS_BAT_FILE "Archivo por lotes de ReactOS" IDS_CMD_FILE "Script de comandos ReactOS" diff --git a/dll/win32/shell32/lang/fi-FI.rc b/dll/win32/shell32/lang/fi-FI.rc index 3e97c26eaa..bf35e972eb 100644 --- a/dll/win32/shell32/lang/fi-FI.rc +++ b/dll/win32/shell32/lang/fi-FI.rc @@ -683,6 +683,8 @@ BEGIN IDS_FORMATDRIVE "Format..." IDS_RENAME "Rename" IDS_PASTE "Paste" + IDS_EJECT "Eject" + IDS_DISCONNECT "Disconnect" IDS_CREATEFOLDER_DENIED "Unable to create the folder '%1'" IDS_CREATEFOLDER_CAPTION "Unable to create folder" @@ -776,6 +778,12 @@ BEGIN IDS_PICK_ICON_FILTER "Icon Files (*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0All Files (*.*)\0*.*\0" IDS_OPEN_WITH_FILTER "Executable Files (*.exe)\0*.exe\0All Files (*.*)\0*.*\0" + IDS_CANTLOCKVOLUME "Unable to lock volume (Error Code: %lu)." + IDS_CANTDISMOUNTVOLUME "Unable to dismount volume (Error Code: %lu)." + IDS_CANTEJECTMEDIA "Unable to eject media (Error Code: %lu)." + IDS_CANTSHOWPROPERTIES "Unable to show properties (Error Code: %lu)." + IDS_CANTDISCONNECT "Unable to disconnect (Error Code: %lu)." + IDS_DIRECTORY "Folder" IDS_BAT_FILE "ReactOS Batch File" IDS_CMD_FILE "ReactOS Command Script" diff --git a/dll/win32/shell32/lang/fr-FR.rc b/dll/win32/shell32/lang/fr-FR.rc index 16126e1686..16aaf76420 100644 --- a/dll/win32/shell32/lang/fr-FR.rc +++ b/dll/win32/shell32/lang/fr-FR.rc @@ -683,6 +683,8 @@ BEGIN IDS_FORMATDRIVE "Formater..." IDS_RENAME "Renommer" IDS_PASTE "Insérer" + IDS_EJECT "Eject" + IDS_DISCONNECT "Disconnect" IDS_CREATEFOLDER_DENIED "Impossible de créer le dossier '%1'" IDS_CREATEFOLDER_CAPTION "Impossible de créer un dossier" @@ -776,6 +778,12 @@ BEGIN IDS_PICK_ICON_FILTER "Fichiers d'icônes (*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0All Files (*.*)\0*.*\0" IDS_OPEN_WITH_FILTER "Fichiers exécutables (*.exe)\0*.exe\0All Files (*.*)\0*.*\0" + IDS_CANTLOCKVOLUME "Unable to lock volume (Error Code: %lu)." + IDS_CANTDISMOUNTVOLUME "Unable to dismount volume (Error Code: %lu)." + IDS_CANTEJECTMEDIA "Unable to eject media (Error Code: %lu)." + IDS_CANTSHOWPROPERTIES "Unable to show properties (Error Code: %lu)." + IDS_CANTDISCONNECT "Unable to disconnect (Error Code: %lu)." + IDS_DIRECTORY "Dossier" IDS_BAT_FILE "Fichier Batch ReactOS" IDS_CMD_FILE "Script de commandes ReactOS" diff --git a/dll/win32/shell32/lang/he-IL.rc b/dll/win32/shell32/lang/he-IL.rc index 73cef872b0..39d3d6c48e 100644 --- a/dll/win32/shell32/lang/he-IL.rc +++ b/dll/win32/shell32/lang/he-IL.rc @@ -683,6 +683,8 @@ BEGIN IDS_FORMATDRIVE "אתחול..." IDS_RENAME "שנה שם" IDS_PASTE "הכנס" + IDS_EJECT "Eject" + IDS_DISCONNECT "Disconnect" IDS_CREATEFOLDER_DENIED "Unable to create the folder '%1'" IDS_CREATEFOLDER_CAPTION "Unable to create folder" @@ -776,6 +778,12 @@ BEGIN IDS_PICK_ICON_FILTER "Icon Files (*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0All Files (*.*)\0*.*\0" IDS_OPEN_WITH_FILTER "Executable Files (*.exe)\0*.exe\0All Files (*.*)\0*.*\0" + IDS_CANTLOCKVOLUME "Unable to lock volume (Error Code: %lu)." + IDS_CANTDISMOUNTVOLUME "Unable to dismount volume (Error Code: %lu)." + IDS_CANTEJECTMEDIA "Unable to eject media (Error Code: %lu)." + IDS_CANTSHOWPROPERTIES "Unable to show properties (Error Code: %lu)." + IDS_CANTDISCONNECT "Unable to disconnect (Error Code: %lu)." + IDS_DIRECTORY "Folder" IDS_BAT_FILE "ReactOS Batch File" IDS_CMD_FILE "ReactOS Command Script" diff --git a/dll/win32/shell32/lang/hu-HU.rc b/dll/win32/shell32/lang/hu-HU.rc index 423519e25e..8ef8d4ec9d 100644 --- a/dll/win32/shell32/lang/hu-HU.rc +++ b/dll/win32/shell32/lang/hu-HU.rc @@ -683,6 +683,8 @@ BEGIN IDS_FORMATDRIVE "Format..." IDS_RENAME "Rename" IDS_PASTE "Paste" + IDS_EJECT "Eject" + IDS_DISCONNECT "Disconnect" IDS_CREATEFOLDER_DENIED "Unable to create the folder '%1'" IDS_CREATEFOLDER_CAPTION "Unable to create folder" @@ -776,6 +778,12 @@ BEGIN IDS_PICK_ICON_FILTER "Icon Files (*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0All Files (*.*)\0*.*\0" IDS_OPEN_WITH_FILTER "Executable Files (*.exe)\0*.exe\0All Files (*.*)\0*.*\0" + IDS_CANTLOCKVOLUME "Unable to lock volume (Error Code: %lu)." + IDS_CANTDISMOUNTVOLUME "Unable to dismount volume (Error Code: %lu)." + IDS_CANTEJECTMEDIA "Unable to eject media (Error Code: %lu)." + IDS_CANTSHOWPROPERTIES "Unable to show properties (Error Code: %lu)." + IDS_CANTDISCONNECT "Unable to disconnect (Error Code: %lu)." + IDS_DIRECTORY "Folder" IDS_BAT_FILE "ReactOS Batch File" IDS_CMD_FILE "ReactOS Command Script" diff --git a/dll/win32/shell32/lang/it-IT.rc b/dll/win32/shell32/lang/it-IT.rc index e7feca35ea..bc88f8b998 100644 --- a/dll/win32/shell32/lang/it-IT.rc +++ b/dll/win32/shell32/lang/it-IT.rc @@ -683,6 +683,8 @@ BEGIN IDS_FORMATDRIVE "Formatta..." IDS_RENAME "Rinomina" IDS_PASTE "Inserisci" + IDS_EJECT "Eject" + IDS_DISCONNECT "Disconnect" IDS_CREATEFOLDER_DENIED "Unable to create the folder '%1'" IDS_CREATEFOLDER_CAPTION "Unable to create folder" @@ -776,6 +778,12 @@ BEGIN IDS_PICK_ICON_FILTER "Icone (*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0Tutti i file (*.*)\0*.*\0" IDS_OPEN_WITH_FILTER "File eseguibili (*.exe)\0*.exe\0Tutti i file (*.*)\0*.*\0" + IDS_CANTLOCKVOLUME "Unable to lock volume (Error Code: %lu)." + IDS_CANTDISMOUNTVOLUME "Unable to dismount volume (Error Code: %lu)." + IDS_CANTEJECTMEDIA "Unable to eject media (Error Code: %lu)." + IDS_CANTSHOWPROPERTIES "Unable to show properties (Error Code: %lu)." + IDS_CANTDISCONNECT "Unable to disconnect (Error Code: %lu)." + IDS_DIRECTORY "Cartella" IDS_BAT_FILE "File Batch ReactOS" IDS_CMD_FILE "Script di comandi ReactOS" diff --git a/dll/win32/shell32/lang/ja-JP.rc b/dll/win32/shell32/lang/ja-JP.rc index e0b9518f33..b375c2a3df 100644 --- a/dll/win32/shell32/lang/ja-JP.rc +++ b/dll/win32/shell32/lang/ja-JP.rc @@ -680,6 +680,8 @@ BEGIN IDS_FORMATDRIVE "フォーマット..." IDS_RENAME "名前の変更" IDS_PASTE "挿入" + IDS_EJECT "取り出し" + IDS_DISCONNECT "Disconnect" IDS_CREATEFOLDER_DENIED "フォルダ '%1' を作成できません" IDS_CREATEFOLDER_CAPTION "フォルダを作成できません" @@ -773,6 +775,12 @@ BEGIN IDS_PICK_ICON_FILTER "アイコンファイル (*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0All Files (*.*)\0*.*\0" IDS_OPEN_WITH_FILTER "実行可能ファイル (*.exe)\0*.exe\0All Files (*.*)\0*.*\0" + IDS_CANTLOCKVOLUME "Unable to lock volume (Error Code: %lu)." + IDS_CANTDISMOUNTVOLUME "Unable to dismount volume (Error Code: %lu)." + IDS_CANTEJECTMEDIA "Unable to eject media (Error Code: %lu)." + IDS_CANTSHOWPROPERTIES "Unable to show properties (Error Code: %lu)." + IDS_CANTDISCONNECT "Unable to disconnect (Error Code: %lu)." + IDS_DIRECTORY "フォルダ" IDS_BAT_FILE "ReactOS バッチファイル" IDS_CMD_FILE "ReactOS コマンドスクリプト" diff --git a/dll/win32/shell32/lang/ko-KR.rc b/dll/win32/shell32/lang/ko-KR.rc index bf9d287530..204655eddd 100644 --- a/dll/win32/shell32/lang/ko-KR.rc +++ b/dll/win32/shell32/lang/ko-KR.rc @@ -683,6 +683,8 @@ BEGIN IDS_FORMATDRIVE "Format..." IDS_RENAME "Rename" IDS_PASTE "Paste" + IDS_EJECT "Eject" + IDS_DISCONNECT "Disconnect" IDS_CREATEFOLDER_DENIED "Unable to create the folder '%1'" IDS_CREATEFOLDER_CAPTION "Unable to create folder" @@ -776,6 +778,12 @@ BEGIN IDS_PICK_ICON_FILTER "Icon Files (*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0All Files (*.*)\0*.*\0" IDS_OPEN_WITH_FILTER "Executable Files (*.exe)\0*.exe\0All Files (*.*)\0*.*\0" + IDS_CANTLOCKVOLUME "Unable to lock volume (Error Code: %lu)." + IDS_CANTDISMOUNTVOLUME "Unable to dismount volume (Error Code: %lu)." + IDS_CANTEJECTMEDIA "Unable to eject media (Error Code: %lu)." + IDS_CANTSHOWPROPERTIES "Unable to show properties (Error Code: %lu)." + IDS_CANTDISCONNECT "Unable to disconnect (Error Code: %lu)." + IDS_DIRECTORY "Folder" IDS_BAT_FILE "ReactOS Batch File" IDS_CMD_FILE "ReactOS Command Script" diff --git a/dll/win32/shell32/lang/nl-NL.rc b/dll/win32/shell32/lang/nl-NL.rc index 78a25cbb69..3777c458c3 100644 --- a/dll/win32/shell32/lang/nl-NL.rc +++ b/dll/win32/shell32/lang/nl-NL.rc @@ -683,6 +683,8 @@ BEGIN IDS_FORMATDRIVE "Format..." IDS_RENAME "Rename" IDS_PASTE "Paste" + IDS_EJECT "Eject" + IDS_DISCONNECT "Disconnect" IDS_CREATEFOLDER_DENIED "Unable to create the folder '%1'" IDS_CREATEFOLDER_CAPTION "Unable to create folder" @@ -776,6 +778,12 @@ BEGIN IDS_PICK_ICON_FILTER "Icon Files (*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0All Files (*.*)\0*.*\0" IDS_OPEN_WITH_FILTER "Executable Files (*.exe)\0*.exe\0All Files (*.*)\0*.*\0" + IDS_CANTLOCKVOLUME "Unable to lock volume (Error Code: %lu)." + IDS_CANTDISMOUNTVOLUME "Unable to dismount volume (Error Code: %lu)." + IDS_CANTEJECTMEDIA "Unable to eject media (Error Code: %lu)." + IDS_CANTSHOWPROPERTIES "Unable to show properties (Error Code: %lu)." + IDS_CANTDISCONNECT "Unable to disconnect (Error Code: %lu)." + IDS_DIRECTORY "Folder" IDS_BAT_FILE "ReactOS Batch File" IDS_CMD_FILE "ReactOS Command Script" diff --git a/dll/win32/shell32/lang/no-NO.rc b/dll/win32/shell32/lang/no-NO.rc index fedc83209f..656dd8683e 100644 --- a/dll/win32/shell32/lang/no-NO.rc +++ b/dll/win32/shell32/lang/no-NO.rc @@ -683,6 +683,8 @@ BEGIN IDS_FORMATDRIVE "Formatering..." IDS_RENAME "Endre navn" IDS_PASTE "Sett inn" + IDS_EJECT "Eject" + IDS_DISCONNECT "Disconnect" IDS_CREATEFOLDER_DENIED "Unable to create the folder '%1'" IDS_CREATEFOLDER_CAPTION "Unable to create folder" @@ -776,6 +778,12 @@ BEGIN IDS_PICK_ICON_FILTER "Ikon Fil (*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0All Files (*.*)\0*.*\0" IDS_OPEN_WITH_FILTER "Kjørbare filer (*.exe)\0*.exe\0All Files (*.*)\0*.*\0" + IDS_CANTLOCKVOLUME "Unable to lock volume (Error Code: %lu)." + IDS_CANTDISMOUNTVOLUME "Unable to dismount volume (Error Code: %lu)." + IDS_CANTEJECTMEDIA "Unable to eject media (Error Code: %lu)." + IDS_CANTSHOWPROPERTIES "Unable to show properties (Error Code: %lu)." + IDS_CANTDISCONNECT "Unable to disconnect (Error Code: %lu)." + IDS_DIRECTORY "Mappe" IDS_BAT_FILE "ReactOS Batch fil" IDS_CMD_FILE "ReactOS Kommando skript" diff --git a/dll/win32/shell32/lang/pl-PL.rc b/dll/win32/shell32/lang/pl-PL.rc index 7327fbae2e..192b706f7f 100644 --- a/dll/win32/shell32/lang/pl-PL.rc +++ b/dll/win32/shell32/lang/pl-PL.rc @@ -687,6 +687,8 @@ BEGIN IDS_FORMATDRIVE "Formatuj..." IDS_RENAME "Zmień nazwę" IDS_PASTE "Włóż" + IDS_EJECT "Eject" + IDS_DISCONNECT "Disconnect" IDS_CREATEFOLDER_DENIED "Nie mogę utworzyć folderu '%1'" IDS_CREATEFOLDER_CAPTION "Nie mogę utworzyć folderu" @@ -780,6 +782,12 @@ BEGIN IDS_PICK_ICON_FILTER "Pliki ikon (*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0Wszystkie pliki (*.*)\0*.*\0" IDS_OPEN_WITH_FILTER "Programy (*.exe)\0*.exe\0Wszystkie pliki (*.*)\0*.*\0" + IDS_CANTLOCKVOLUME "Unable to lock volume (Error Code: %lu)." + IDS_CANTDISMOUNTVOLUME "Unable to dismount volume (Error Code: %lu)." + IDS_CANTEJECTMEDIA "Unable to eject media (Error Code: %lu)." + IDS_CANTSHOWPROPERTIES "Unable to show properties (Error Code: %lu)." + IDS_CANTDISCONNECT "Unable to disconnect (Error Code: %lu)." + IDS_DIRECTORY "Katalog" IDS_BAT_FILE "Plik wsadowy ReactOS" IDS_CMD_FILE "Skrypt konsoli ReactOS" diff --git a/dll/win32/shell32/lang/pt-BR.rc b/dll/win32/shell32/lang/pt-BR.rc index 363c7859c9..c7a47b1877 100644 --- a/dll/win32/shell32/lang/pt-BR.rc +++ b/dll/win32/shell32/lang/pt-BR.rc @@ -683,6 +683,8 @@ BEGIN IDS_FORMATDRIVE "Formatar..." IDS_RENAME "Renomear" IDS_PASTE "Inserir" + IDS_EJECT "Eject" + IDS_DISCONNECT "Disconnect" IDS_CREATEFOLDER_DENIED "Unable to create the folder '%1'" IDS_CREATEFOLDER_CAPTION "Unable to create folder" @@ -776,6 +778,12 @@ BEGIN IDS_PICK_ICON_FILTER "Arquivos de Ícone (*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0All Files (*.*)\0*.*\0" IDS_OPEN_WITH_FILTER "Arquivos Executáveis (*.exe)\0*.exe\0Todos os arquivos (*.*)\0*.*\0" + IDS_CANTLOCKVOLUME "Unable to lock volume (Error Code: %lu)." + IDS_CANTDISMOUNTVOLUME "Unable to dismount volume (Error Code: %lu)." + IDS_CANTEJECTMEDIA "Unable to eject media (Error Code: %lu)." + IDS_CANTSHOWPROPERTIES "Unable to show properties (Error Code: %lu)." + IDS_CANTDISCONNECT "Unable to disconnect (Error Code: %lu)." + IDS_DIRECTORY "Pasta" IDS_BAT_FILE "ReactOS Batch File" IDS_CMD_FILE "ReactOS Command Script" diff --git a/dll/win32/shell32/lang/pt-PT.rc b/dll/win32/shell32/lang/pt-PT.rc index e3524050fb..8fc7335f23 100644 --- a/dll/win32/shell32/lang/pt-PT.rc +++ b/dll/win32/shell32/lang/pt-PT.rc @@ -683,6 +683,8 @@ BEGIN IDS_FORMATDRIVE "Formatar..." IDS_RENAME "Renaomear" IDS_PASTE "Inserir" + IDS_EJECT "Eject" + IDS_DISCONNECT "Disconnect" IDS_CREATEFOLDER_DENIED "Impossivel de Criar Pasta '%1'" IDS_CREATEFOLDER_CAPTION "Impossivel de Criar Pasta" @@ -776,6 +778,12 @@ BEGIN IDS_PICK_ICON_FILTER "Ficheiros de Ícones (*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0All Files (*.*)\0*.*\0" IDS_OPEN_WITH_FILTER "Ficheiros Executáveis (*.exe)\0*.exe\0All Files (*.*)\0*.*\0" + IDS_CANTLOCKVOLUME "Unable to lock volume (Error Code: %lu)." + IDS_CANTDISMOUNTVOLUME "Unable to dismount volume (Error Code: %lu)." + IDS_CANTEJECTMEDIA "Unable to eject media (Error Code: %lu)." + IDS_CANTSHOWPROPERTIES "Unable to show properties (Error Code: %lu)." + IDS_CANTDISCONNECT "Unable to disconnect (Error Code: %lu)." + IDS_DIRECTORY "Pasta" IDS_BAT_FILE "ReactOS Batch File" IDS_CMD_FILE "ReactOS Command Script" diff --git a/dll/win32/shell32/lang/ro-RO.rc b/dll/win32/shell32/lang/ro-RO.rc index aa794089a9..05813a94dc 100644 --- a/dll/win32/shell32/lang/ro-RO.rc +++ b/dll/win32/shell32/lang/ro-RO.rc @@ -685,6 +685,8 @@ BEGIN IDS_FORMATDRIVE "F&ormatare…" IDS_RENAME "Rede&numește" IDS_PASTE "&Lipește" + IDS_EJECT "Eject" + IDS_DISCONNECT "Disconnect" IDS_CREATEFOLDER_DENIED "Nu poate fi creat un dosar cu numele „%1”" IDS_CREATEFOLDER_CAPTION "Nu poate fi creat dosar" @@ -778,6 +780,12 @@ BEGIN IDS_PICK_ICON_FILTER "Fișiere pictogramă (*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0Orice fișier (*.*)\0*.*\0" IDS_OPEN_WITH_FILTER "Fișiere executabile (*.exe)\0*.exe\0Orice fișier (*.*)\0*.*\0" + IDS_CANTLOCKVOLUME "Unable to lock volume (Error Code: %lu)." + IDS_CANTDISMOUNTVOLUME "Unable to dismount volume (Error Code: %lu)." + IDS_CANTEJECTMEDIA "Unable to eject media (Error Code: %lu)." + IDS_CANTSHOWPROPERTIES "Unable to show properties (Error Code: %lu)." + IDS_CANTDISCONNECT "Unable to disconnect (Error Code: %lu)." + IDS_DIRECTORY "Dosar" IDS_BAT_FILE "Fișier de comenzi ReactOS" IDS_CMD_FILE "Script de comenzi ReactOS" diff --git a/dll/win32/shell32/lang/ru-RU.rc b/dll/win32/shell32/lang/ru-RU.rc index 803ba702fd..5c424adadf 100644 --- a/dll/win32/shell32/lang/ru-RU.rc +++ b/dll/win32/shell32/lang/ru-RU.rc @@ -685,6 +685,8 @@ BEGIN IDS_FORMATDRIVE "Форматировать..." IDS_RENAME "Переименовать" IDS_PASTE "Вставить" + IDS_EJECT "Извлечь" + IDS_DISCONNECT "Отсоединить" IDS_CREATEFOLDER_DENIED "Невозможно создать папку '%1'" IDS_CREATEFOLDER_CAPTION "Невозможно создать папку" @@ -778,6 +780,12 @@ BEGIN IDS_PICK_ICON_FILTER "Файлы значков (*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0Все файлы (*.*)\0*.*\0" IDS_OPEN_WITH_FILTER "Исполняемые файлы (*.exe)\0*.exe\0Все файлы (*.*)\0*.*\0" + IDS_CANTLOCKVOLUME "Не удалось заблокировать том (код ошибки: %lu)." + IDS_CANTDISMOUNTVOLUME "Не удалось размонтировать том (код ошибки: %lu)." + IDS_CANTEJECTMEDIA "Не удалось извлечь носитель (код ошибки: %lu)." + IDS_CANTSHOWPROPERTIES "Unable to show properties (Error Code: %lu)." + IDS_CANTDISCONNECT "Unable to disconnect (Error Code: %lu)." + IDS_DIRECTORY "Папка с файлами" IDS_BAT_FILE "Пакетный файл ReactOS" IDS_CMD_FILE "Командный скрипт ReactOS" diff --git a/dll/win32/shell32/lang/sk-SK.rc b/dll/win32/shell32/lang/sk-SK.rc index 70894c80b0..bcc759b9ed 100644 --- a/dll/win32/shell32/lang/sk-SK.rc +++ b/dll/win32/shell32/lang/sk-SK.rc @@ -683,6 +683,8 @@ BEGIN IDS_FORMATDRIVE "Formátovať..." IDS_RENAME "Premenovať" IDS_PASTE "Vložiť" + IDS_EJECT "Eject" + IDS_DISCONNECT "Disconnect" IDS_CREATEFOLDER_DENIED "Unable to create the folder '%1'" IDS_CREATEFOLDER_CAPTION "Unable to create folder" @@ -776,6 +778,12 @@ BEGIN IDS_PICK_ICON_FILTER "Súbory ikon (*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0Všetky súbory (*.*)\0*.*\0" IDS_OPEN_WITH_FILTER "Spustiteľné súbory (*.exe)\0*.exe\0Všetky súbory (*.*)\0*.*\0" + IDS_CANTLOCKVOLUME "Unable to lock volume (Error Code: %lu)." + IDS_CANTDISMOUNTVOLUME "Unable to dismount volume (Error Code: %lu)." + IDS_CANTEJECTMEDIA "Unable to eject media (Error Code: %lu)." + IDS_CANTSHOWPROPERTIES "Unable to show properties (Error Code: %lu)." + IDS_CANTDISCONNECT "Unable to disconnect (Error Code: %lu)." + IDS_DIRECTORY "Priečinok" IDS_BAT_FILE "Dávkový súbor systému ReactOS" IDS_CMD_FILE "Príkazový skript systému ReactOS" diff --git a/dll/win32/shell32/lang/sl-SI.rc b/dll/win32/shell32/lang/sl-SI.rc index f0a5b186a0..ea4b4218c1 100644 --- a/dll/win32/shell32/lang/sl-SI.rc +++ b/dll/win32/shell32/lang/sl-SI.rc @@ -683,6 +683,8 @@ BEGIN IDS_FORMATDRIVE "Format..." IDS_RENAME "Rename" IDS_PASTE "Paste" + IDS_EJECT "Eject" + IDS_DISCONNECT "Disconnect" IDS_CREATEFOLDER_DENIED "Unable to create the folder '%1'" IDS_CREATEFOLDER_CAPTION "Unable to create folder" @@ -776,6 +778,12 @@ BEGIN IDS_PICK_ICON_FILTER "Icon Files (*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0All Files (*.*)\0*.*\0" IDS_OPEN_WITH_FILTER "Executable Files (*.exe)\0*.exe\0All Files (*.*)\0*.*\0" + IDS_CANTLOCKVOLUME "Unable to lock volume (Error Code: %lu)." + IDS_CANTDISMOUNTVOLUME "Unable to dismount volume (Error Code: %lu)." + IDS_CANTEJECTMEDIA "Unable to eject media (Error Code: %lu)." + IDS_CANTSHOWPROPERTIES "Unable to show properties (Error Code: %lu)." + IDS_CANTDISCONNECT "Unable to disconnect (Error Code: %lu)." + IDS_DIRECTORY "Folder" IDS_BAT_FILE "ReactOS Batch File" IDS_CMD_FILE "ReactOS Command Script" diff --git a/dll/win32/shell32/lang/sq-AL.rc b/dll/win32/shell32/lang/sq-AL.rc index c12d2611d8..eced885141 100644 --- a/dll/win32/shell32/lang/sq-AL.rc +++ b/dll/win32/shell32/lang/sq-AL.rc @@ -687,6 +687,8 @@ BEGIN IDS_FORMATDRIVE "Format..." IDS_RENAME "Riemërto" IDS_PASTE "Fut" + IDS_EJECT "Eject" + IDS_DISCONNECT "Disconnect" IDS_CREATEFOLDER_DENIED "Unable to create the folder '%1'" IDS_CREATEFOLDER_CAPTION "Unable to create folder" @@ -780,6 +782,12 @@ BEGIN IDS_PICK_ICON_FILTER "Ikonë Programi (*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0T'gjith Dokumentat (*.*)\0*.*\0" IDS_OPEN_WITH_FILTER "Dokumente Ekzekutues (*.exe)\0*.exe\0T'gjith Dokumentat (*.*)\0*.*\0" + IDS_CANTLOCKVOLUME "Unable to lock volume (Error Code: %lu)." + IDS_CANTDISMOUNTVOLUME "Unable to dismount volume (Error Code: %lu)." + IDS_CANTEJECTMEDIA "Unable to eject media (Error Code: %lu)." + IDS_CANTSHOWPROPERTIES "Unable to show properties (Error Code: %lu)." + IDS_CANTDISCONNECT "Unable to disconnect (Error Code: %lu)." + IDS_DIRECTORY "Dosje" IDS_BAT_FILE "ReactOS Dokument Batch" IDS_CMD_FILE "ReactOS Skript Komande" diff --git a/dll/win32/shell32/lang/sv-SE.rc b/dll/win32/shell32/lang/sv-SE.rc index e9c4590073..f2f4641a87 100644 --- a/dll/win32/shell32/lang/sv-SE.rc +++ b/dll/win32/shell32/lang/sv-SE.rc @@ -683,6 +683,8 @@ BEGIN IDS_FORMATDRIVE "Formatera..." IDS_RENAME "Byt namn" IDS_PASTE "Klistra in" + IDS_EJECT "Eject" + IDS_DISCONNECT "Disconnect" IDS_CREATEFOLDER_DENIED "Kunde inte skapa mappen '%1'" IDS_CREATEFOLDER_CAPTION "Kunde inte skapa mapp" @@ -776,6 +778,12 @@ BEGIN IDS_PICK_ICON_FILTER "Ikoner (*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0Alla filer (*.*)\0*.*\0" IDS_OPEN_WITH_FILTER "Körbara filer (*.exe)\0*.exe\0Alla filer (*.*)\0*.*\0" + IDS_CANTLOCKVOLUME "Unable to lock volume (Error Code: %lu)." + IDS_CANTDISMOUNTVOLUME "Unable to dismount volume (Error Code: %lu)." + IDS_CANTEJECTMEDIA "Unable to eject media (Error Code: %lu)." + IDS_CANTSHOWPROPERTIES "Unable to show properties (Error Code: %lu)." + IDS_CANTDISCONNECT "Unable to disconnect (Error Code: %lu)." + IDS_DIRECTORY "Mapp" IDS_BAT_FILE "ReactOS Batch-fil" IDS_CMD_FILE "ReactOS Kommandoradsskript" diff --git a/dll/win32/shell32/lang/tr-TR.rc b/dll/win32/shell32/lang/tr-TR.rc index 8d23faf0cd..a7aeae86c5 100644 --- a/dll/win32/shell32/lang/tr-TR.rc +++ b/dll/win32/shell32/lang/tr-TR.rc @@ -685,6 +685,8 @@ BEGIN IDS_FORMATDRIVE "Biçimlendir..." IDS_RENAME "Yeniden Adlandır" IDS_PASTE "Yapıştır" + IDS_EJECT "Eject" + IDS_DISCONNECT "Disconnect" IDS_CREATEFOLDER_DENIED """%1"" dizini oluşturulamıyor." IDS_CREATEFOLDER_CAPTION "Dizin Oluşturulamıyor" @@ -778,6 +780,12 @@ BEGIN IDS_PICK_ICON_FILTER "Simge Kütükleri (*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0Tüm Kütükler (*.*)\0*.*\0" IDS_OPEN_WITH_FILTER "Çalıştırılabilir Kütükler (*.exe)\0*.exe\0Tüm Kütükler (*.*)\0*.*\0" + IDS_CANTLOCKVOLUME "Unable to lock volume (Error Code: %lu)." + IDS_CANTDISMOUNTVOLUME "Unable to dismount volume (Error Code: %lu)." + IDS_CANTEJECTMEDIA "Unable to eject media (Error Code: %lu)." + IDS_CANTSHOWPROPERTIES "Unable to show properties (Error Code: %lu)." + IDS_CANTDISCONNECT "Unable to disconnect (Error Code: %lu)." + IDS_DIRECTORY "Dizin" IDS_BAT_FILE "ReactOS Toplu İş Kütüğü" IDS_CMD_FILE "ReactOS Komut Betiği" diff --git a/dll/win32/shell32/lang/uk-UA.rc b/dll/win32/shell32/lang/uk-UA.rc index 434f55458c..114a03432e 100644 --- a/dll/win32/shell32/lang/uk-UA.rc +++ b/dll/win32/shell32/lang/uk-UA.rc @@ -683,6 +683,8 @@ BEGIN IDS_FORMATDRIVE "Форматувати..." IDS_RENAME "Перейменувати" IDS_PASTE "Вставити" + IDS_EJECT "Eject" + IDS_DISCONNECT "Disconnect" IDS_CREATEFOLDER_DENIED "Unable to create the folder '%1'" IDS_CREATEFOLDER_CAPTION "Unable to create folder" @@ -776,6 +778,12 @@ BEGIN IDS_PICK_ICON_FILTER "Файли значків (*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0Всі Файли (*.*)\0*.*\0" IDS_OPEN_WITH_FILTER "Виконувані файли (*.exe)\0*.exe\0Всі Файли (*.*)\0*.*\0" + IDS_CANTLOCKVOLUME "Unable to lock volume (Error Code: %lu)." + IDS_CANTDISMOUNTVOLUME "Unable to dismount volume (Error Code: %lu)." + IDS_CANTEJECTMEDIA "Unable to eject media (Error Code: %lu)." + IDS_CANTSHOWPROPERTIES "Unable to show properties (Error Code: %lu)." + IDS_CANTDISCONNECT "Unable to disconnect (Error Code: %lu)." + IDS_DIRECTORY "Папка" IDS_BAT_FILE "Пакетний файл ReactOS" IDS_CMD_FILE "Командний скрипт ReactOS" diff --git a/dll/win32/shell32/lang/zh-CN.rc b/dll/win32/shell32/lang/zh-CN.rc index 4d579987f6..7c40bed54b 100644 --- a/dll/win32/shell32/lang/zh-CN.rc +++ b/dll/win32/shell32/lang/zh-CN.rc @@ -690,6 +690,8 @@ BEGIN IDS_FORMATDRIVE "格式..." IDS_RENAME "重命名" IDS_PASTE "贴上" + IDS_EJECT "Eject" + IDS_DISCONNECT "Disconnect" IDS_CREATEFOLDER_DENIED "Unable to create the folder '%1'" IDS_CREATEFOLDER_CAPTION "Unable to create folder" @@ -783,6 +785,12 @@ BEGIN IDS_PICK_ICON_FILTER "图标文件 (*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0All Files (*.*)\0*.*\0" IDS_OPEN_WITH_FILTER "可执行文件 (*.exe)\0*.exe\0All Files (*.*)\0*.*\0" + IDS_CANTLOCKVOLUME "Unable to lock volume (Error Code: %lu)." + IDS_CANTDISMOUNTVOLUME "Unable to dismount volume (Error Code: %lu)." + IDS_CANTEJECTMEDIA "Unable to eject media (Error Code: %lu)." + IDS_CANTSHOWPROPERTIES "Unable to show properties (Error Code: %lu)." + IDS_CANTDISCONNECT "Unable to disconnect (Error Code: %lu)." + IDS_DIRECTORY "文件夹" IDS_BAT_FILE "ReactOS 批处理文件" IDS_CMD_FILE "ReactOS 命令脚本" diff --git a/dll/win32/shell32/lang/zh-TW.rc b/dll/win32/shell32/lang/zh-TW.rc index eecd735d4b..6fb5a237ac 100644 --- a/dll/win32/shell32/lang/zh-TW.rc +++ b/dll/win32/shell32/lang/zh-TW.rc @@ -691,6 +691,8 @@ BEGIN IDS_FORMATDRIVE "格式化..." IDS_RENAME "重新命名" IDS_PASTE "插入" + IDS_EJECT "Eject" + IDS_DISCONNECT "Disconnect" IDS_CREATEFOLDER_DENIED "Unable to create the folder '%1'" IDS_CREATEFOLDER_CAPTION "Unable to create folder" @@ -784,6 +786,12 @@ BEGIN IDS_PICK_ICON_FILTER "Icon Files (*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0All Files (*.*)\0*.*\0" IDS_OPEN_WITH_FILTER "Executable Files (*.exe)\0*.exe\0All Files (*.*)\0*.*\0" + IDS_CANTLOCKVOLUME "Unable to lock volume (Error Code: %lu)." + IDS_CANTDISMOUNTVOLUME "Unable to dismount volume (Error Code: %lu)." + IDS_CANTEJECTMEDIA "Unable to eject media (Error Code: %lu)." + IDS_CANTSHOWPROPERTIES "Unable to show properties (Error Code: %lu)." + IDS_CANTDISCONNECT "Unable to disconnect (Error Code: %lu)." + IDS_DIRECTORY "Folder" IDS_BAT_FILE "ReactOS Batch File" IDS_CMD_FILE "ReactOS Command Script" diff --git a/dll/win32/shell32/shresdef.h b/dll/win32/shell32/shresdef.h index 417759e82e..5b607a6943 100644 --- a/dll/win32/shell32/shresdef.h +++ b/dll/win32/shell32/shresdef.h @@ -134,6 +134,11 @@ #define IDS_RECYCLEBIN_LOCATION 153 #define IDS_RECYCLEBIN_DISKSPACE 154 #define IDS_OPEN_WITH_FILTER 155 +#define IDS_CANTLOCKVOLUME 156 +#define IDS_CANTDISMOUNTVOLUME 157 +#define IDS_CANTEJECTMEDIA 158 +#define IDS_CANTSHOWPROPERTIES 159 +#define IDS_CANTDISCONNECT 160 /* Friendly File Type Names */ #define IDS_DIRECTORY 200 @@ -206,6 +211,9 @@ #define IDS_FILEOOP_FROM 337 #define IDS_FILEOOP_PREFLIGHT 338 +#define IDS_EJECT 339 +#define IDS_DISCONNECT 340 + #define IDS_MENU_EMPTY 34561 /* Note: those strings are referenced from the registry */

6 years, 10 months

[reactos] 01/01: [BROWSEUI] [TRANSLATION] Improve english, polish and russian translation

by Stanislav Motylkov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=06919cde1a9e3d0c15d34… commit 06919cde1a9e3d0c15d34f08e9e53a9231c72a47 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Fri Nov 10 23:21:18 2017 +0300 [BROWSEUI] [TRANSLATION] Improve english, polish and russian translation --- dll/win32/browseui/lang/bg-BG.rc | 4 ++-- dll/win32/browseui/lang/de-DE.rc | 4 ++-- dll/win32/browseui/lang/en-US.rc | 4 ++-- dll/win32/browseui/lang/es-ES.rc | 4 ++-- dll/win32/browseui/lang/fr-FR.rc | 4 ++-- dll/win32/browseui/lang/he-IL.rc | 4 ++-- dll/win32/browseui/lang/it-IT.rc | 4 ++-- dll/win32/browseui/lang/ja-JP.rc | 4 ++-- dll/win32/browseui/lang/pl-PL.rc | 16 ++++++++-------- dll/win32/browseui/lang/pt-BR.rc | 4 ++-- dll/win32/browseui/lang/ru-RU.rc | 20 ++++++++++---------- dll/win32/browseui/lang/sq-AL.rc | 4 ++-- dll/win32/browseui/lang/tr-TR.rc | 4 ++-- dll/win32/browseui/lang/uk-UA.rc | 4 ++-- dll/win32/browseui/lang/zh-CN.rc | 4 ++-- dll/win32/browseui/lang/zh-TW.rc | 4 ++-- 16 files changed, 46 insertions(+), 46 deletions(-) diff --git a/dll/win32/browseui/lang/bg-BG.rc b/dll/win32/browseui/lang/bg-BG.rc index 8a269d8d6d..6b599a4149 100644 --- a/dll/win32/browseui/lang/bg-BG.rc +++ b/dll/win32/browseui/lang/bg-BG.rc @@ -89,8 +89,8 @@ END IDM_BAND_MENU MENUEX BEGIN - MENUITEM "Sho&w title", IDM_BAND_TITLE - MENUITEM "&Close toolbar", IDM_BAND_CLOSE + MENUITEM "Sho&w Title", IDM_BAND_TITLE + MENUITEM "&Close Toolbar", IDM_BAND_CLOSE END IDM_POPUPMENU MENUEX DISCARDABLE diff --git a/dll/win32/browseui/lang/de-DE.rc b/dll/win32/browseui/lang/de-DE.rc index eeb812102a..164bf4ffa0 100644 --- a/dll/win32/browseui/lang/de-DE.rc +++ b/dll/win32/browseui/lang/de-DE.rc @@ -107,8 +107,8 @@ END IDM_BAND_MENU MENUEX BEGIN - MENUITEM "Sho&w title", IDM_BAND_TITLE - MENUITEM "&Close toolbar", IDM_BAND_CLOSE + MENUITEM "Sho&w Title", IDM_BAND_TITLE + MENUITEM "&Close Toolbar", IDM_BAND_CLOSE END IDM_POPUPMENU MENUEX DISCARDABLE diff --git a/dll/win32/browseui/lang/en-US.rc b/dll/win32/browseui/lang/en-US.rc index 29aabb6f56..9e0954be6f 100644 --- a/dll/win32/browseui/lang/en-US.rc +++ b/dll/win32/browseui/lang/en-US.rc @@ -107,8 +107,8 @@ END IDM_BAND_MENU MENUEX BEGIN - MENUITEM "Sho&w title", IDM_BAND_TITLE - MENUITEM "&Close toolbar", IDM_BAND_CLOSE + MENUITEM "Sho&w Title", IDM_BAND_TITLE + MENUITEM "&Close Toolbar", IDM_BAND_CLOSE END IDM_POPUPMENU MENUEX DISCARDABLE diff --git a/dll/win32/browseui/lang/es-ES.rc b/dll/win32/browseui/lang/es-ES.rc index 420f350f3e..5143e44c4e 100644 --- a/dll/win32/browseui/lang/es-ES.rc +++ b/dll/win32/browseui/lang/es-ES.rc @@ -91,8 +91,8 @@ END IDM_BAND_MENU MENUEX BEGIN - MENUITEM "Sho&w title", IDM_BAND_TITLE - MENUITEM "&Close toolbar", IDM_BAND_CLOSE + MENUITEM "Sho&w Title", IDM_BAND_TITLE + MENUITEM "&Close Toolbar", IDM_BAND_CLOSE END IDM_POPUPMENU MENUEX DISCARDABLE diff --git a/dll/win32/browseui/lang/fr-FR.rc b/dll/win32/browseui/lang/fr-FR.rc index 90c89bab9c..fc36893129 100644 --- a/dll/win32/browseui/lang/fr-FR.rc +++ b/dll/win32/browseui/lang/fr-FR.rc @@ -107,8 +107,8 @@ END IDM_BAND_MENU MENUEX BEGIN - MENUITEM "Sho&w title", IDM_BAND_TITLE - MENUITEM "&Close toolbar", IDM_BAND_CLOSE + MENUITEM "Sho&w Title", IDM_BAND_TITLE + MENUITEM "&Close Toolbar", IDM_BAND_CLOSE END IDM_POPUPMENU MENUEX DISCARDABLE diff --git a/dll/win32/browseui/lang/he-IL.rc b/dll/win32/browseui/lang/he-IL.rc index 28a1d629f2..98924e82f8 100644 --- a/dll/win32/browseui/lang/he-IL.rc +++ b/dll/win32/browseui/lang/he-IL.rc @@ -91,8 +91,8 @@ END IDM_BAND_MENU MENUEX BEGIN - MENUITEM "Sho&w title", IDM_BAND_TITLE - MENUITEM "&Close toolbar", IDM_BAND_CLOSE + MENUITEM "Sho&w Title", IDM_BAND_TITLE + MENUITEM "&Close Toolbar", IDM_BAND_CLOSE END IDM_POPUPMENU MENUEX DISCARDABLE diff --git a/dll/win32/browseui/lang/it-IT.rc b/dll/win32/browseui/lang/it-IT.rc index b8beedf2ca..0dba3f6fbc 100644 --- a/dll/win32/browseui/lang/it-IT.rc +++ b/dll/win32/browseui/lang/it-IT.rc @@ -89,8 +89,8 @@ END IDM_BAND_MENU MENUEX BEGIN - MENUITEM "Sho&w title", IDM_BAND_TITLE - MENUITEM "&Close toolbar", IDM_BAND_CLOSE + MENUITEM "Sho&w Title", IDM_BAND_TITLE + MENUITEM "&Close Toolbar", IDM_BAND_CLOSE END IDM_POPUPMENU MENUEX DISCARDABLE diff --git a/dll/win32/browseui/lang/ja-JP.rc b/dll/win32/browseui/lang/ja-JP.rc index 2d73353080..0e723260d9 100644 --- a/dll/win32/browseui/lang/ja-JP.rc +++ b/dll/win32/browseui/lang/ja-JP.rc @@ -107,8 +107,8 @@ END IDM_BAND_MENU MENUEX BEGIN - MENUITEM "Sho&w title", IDM_BAND_TITLE - MENUITEM "&Close toolbar", IDM_BAND_CLOSE + MENUITEM "Sho&w Title", IDM_BAND_TITLE + MENUITEM "&Close Toolbar", IDM_BAND_CLOSE END IDM_POPUPMENU MENUEX DISCARDABLE diff --git a/dll/win32/browseui/lang/pl-PL.rc b/dll/win32/browseui/lang/pl-PL.rc index f1799d0d33..2a3f370a74 100644 --- a/dll/win32/browseui/lang/pl-PL.rc +++ b/dll/win32/browseui/lang/pl-PL.rc @@ -105,13 +105,13 @@ IDM_POPUPMENU MENUEX DISCARDABLE BEGIN POPUP "" BEGIN - POPUP "&View", IDM_VIEW_MENU + POPUP "&Widok", IDM_VIEW_MENU BEGIN - MENUITEM "&Large Icons", IDM_LARGE_ICONS - MENUITEM "&Small Icons", IDM_SMALL_ICONS + MENUITEM "&Duże ikony", IDM_LARGE_ICONS + MENUITEM "&Małe ikony", IDM_SMALL_ICONS END - MENUITEM "&Open Folder", IDM_OPEN_FOLDER - MENUITEM "&Show Text", IDM_SHOW_TEXT + MENUITEM "&Otwórz folder", IDM_OPEN_FOLDER + MENUITEM "Pokaż &tekst", IDM_SHOW_TEXT END END @@ -303,7 +303,7 @@ END STRINGTABLE BEGIN - IDS_BROWSEFORNEWTOOLAR "Choose a folder" - IDS_TOOLBAR_ERR_TITLE "Toolbar" - IDS_TOOLBAR_ERR_TEXT "Cannot create toolbar." + IDS_BROWSEFORNEWTOOLAR "Wybierz folder" + IDS_TOOLBAR_ERR_TITLE "Pasek narzędzi" + IDS_TOOLBAR_ERR_TEXT "Nie można utworzyć paska narzędzi." END diff --git a/dll/win32/browseui/lang/pt-BR.rc b/dll/win32/browseui/lang/pt-BR.rc index a1147b38a6..efe7392452 100644 --- a/dll/win32/browseui/lang/pt-BR.rc +++ b/dll/win32/browseui/lang/pt-BR.rc @@ -91,8 +91,8 @@ END IDM_BAND_MENU MENUEX BEGIN - MENUITEM "Sho&w title", IDM_BAND_TITLE - MENUITEM "&Close toolbar", IDM_BAND_CLOSE + MENUITEM "Sho&w Title", IDM_BAND_TITLE + MENUITEM "&Close Toolbar", IDM_BAND_CLOSE END IDM_POPUPMENU MENUEX DISCARDABLE diff --git a/dll/win32/browseui/lang/ru-RU.rc b/dll/win32/browseui/lang/ru-RU.rc index 2fa74fc922..7130794383 100644 --- a/dll/win32/browseui/lang/ru-RU.rc +++ b/dll/win32/browseui/lang/ru-RU.rc @@ -91,21 +91,21 @@ END IDM_BAND_MENU MENUEX BEGIN - MENUITEM "Показать заголовок", IDM_BAND_TITLE - MENUITEM "Закрыть панель инструментов", IDM_BAND_CLOSE + MENUITEM "Показать за&головок", IDM_BAND_TITLE + MENUITEM "&Закрыть панель инструментов", IDM_BAND_CLOSE END IDM_POPUPMENU MENUEX DISCARDABLE BEGIN POPUP "" BEGIN - POPUP "&View", IDM_VIEW_MENU + POPUP "&Вид", IDM_VIEW_MENU BEGIN - MENUITEM "&Large Icons", IDM_LARGE_ICONS - MENUITEM "&Small Icons", IDM_SMALL_ICONS + MENUITEM "&Крупные значки", IDM_LARGE_ICONS + MENUITEM "&Мелкие значки", IDM_SMALL_ICONS END - MENUITEM "&Open Folder", IDM_OPEN_FOLDER - MENUITEM "&Show Text", IDM_SHOW_TEXT + MENUITEM "&Открыть папку", IDM_OPEN_FOLDER + MENUITEM "Показ&ывать подписи", IDM_SHOW_TEXT END END @@ -297,7 +297,7 @@ END STRINGTABLE BEGIN - IDS_BROWSEFORNEWTOOLAR "Choose a folder" - IDS_TOOLBAR_ERR_TITLE "Toolbar" - IDS_TOOLBAR_ERR_TEXT "Cannot create toolbar." + IDS_BROWSEFORNEWTOOLAR "Выберите папку" + IDS_TOOLBAR_ERR_TITLE "Панель инструментов" + IDS_TOOLBAR_ERR_TEXT "Не удалось создать панель инструментов." END diff --git a/dll/win32/browseui/lang/sq-AL.rc b/dll/win32/browseui/lang/sq-AL.rc index 0decaa6937..670e6e7554 100644 --- a/dll/win32/browseui/lang/sq-AL.rc +++ b/dll/win32/browseui/lang/sq-AL.rc @@ -108,8 +108,8 @@ END IDM_BAND_MENU MENUEX BEGIN - MENUITEM "Sho&w title", IDM_BAND_TITLE - MENUITEM "&Close toolbar", IDM_BAND_CLOSE + MENUITEM "Sho&w Title", IDM_BAND_TITLE + MENUITEM "&Close Toolbar", IDM_BAND_CLOSE END IDM_POPUPMENU MENUEX DISCARDABLE diff --git a/dll/win32/browseui/lang/tr-TR.rc b/dll/win32/browseui/lang/tr-TR.rc index 1fe3b6fee6..5b33b92ca9 100644 --- a/dll/win32/browseui/lang/tr-TR.rc +++ b/dll/win32/browseui/lang/tr-TR.rc @@ -91,8 +91,8 @@ END IDM_BAND_MENU MENUEX BEGIN - MENUITEM "Sho&w title", IDM_BAND_TITLE - MENUITEM "&Close toolbar", IDM_BAND_CLOSE + MENUITEM "Sho&w Title", IDM_BAND_TITLE + MENUITEM "&Close Toolbar", IDM_BAND_CLOSE END IDM_POPUPMENU MENUEX DISCARDABLE diff --git a/dll/win32/browseui/lang/uk-UA.rc b/dll/win32/browseui/lang/uk-UA.rc index ff49e59e97..63a4b054fe 100644 --- a/dll/win32/browseui/lang/uk-UA.rc +++ b/dll/win32/browseui/lang/uk-UA.rc @@ -91,8 +91,8 @@ END IDM_BAND_MENU MENUEX BEGIN - MENUITEM "Sho&w title", IDM_BAND_TITLE - MENUITEM "&Close toolbar", IDM_BAND_CLOSE + MENUITEM "Sho&w Title", IDM_BAND_TITLE + MENUITEM "&Close Toolbar", IDM_BAND_CLOSE END IDM_POPUPMENU MENUEX DISCARDABLE diff --git a/dll/win32/browseui/lang/zh-CN.rc b/dll/win32/browseui/lang/zh-CN.rc index 7ab4cf42ff..bef7e2af91 100644 --- a/dll/win32/browseui/lang/zh-CN.rc +++ b/dll/win32/browseui/lang/zh-CN.rc @@ -109,8 +109,8 @@ END IDM_BAND_MENU MENUEX BEGIN - MENUITEM "Sho&w title", IDM_BAND_TITLE - MENUITEM "&Close toolbar", IDM_BAND_CLOSE + MENUITEM "Sho&w Title", IDM_BAND_TITLE + MENUITEM "&Close Toolbar", IDM_BAND_CLOSE END IDM_POPUPMENU MENUEX DISCARDABLE diff --git a/dll/win32/browseui/lang/zh-TW.rc b/dll/win32/browseui/lang/zh-TW.rc index cd9b4ef5fd..eddeda66a1 100644 --- a/dll/win32/browseui/lang/zh-TW.rc +++ b/dll/win32/browseui/lang/zh-TW.rc @@ -109,8 +109,8 @@ END IDM_BAND_MENU MENUEX BEGIN - MENUITEM "Sho&w title", IDM_BAND_TITLE - MENUITEM "&Close toolbar", IDM_BAND_CLOSE + MENUITEM "Sho&w Title", IDM_BAND_TITLE + MENUITEM "&Close Toolbar", IDM_BAND_CLOSE END IDM_POPUPMENU MENUEX DISCARDABLE

6 years, 10 months

[reactos] 02/02: [WIN32SS] - Unconditionally enter NtUser implementation in EngCreateWnd and EngDeleteWnd CORE-7727

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=89dbc88a2c592d229e170… commit 89dbc88a2c592d229e170b414270a465abc903ef Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Mon Oct 23 20:37:55 2017 +0200 [WIN32SS] - Unconditionally enter NtUser implementation in EngCreateWnd and EngDeleteWnd CORE-7727 --- win32ss/gdi/eng/engwindow.c | 39 +++++++++++---------------------------- 1 file changed, 11 insertions(+), 28 deletions(-) diff --git a/win32ss/gdi/eng/engwindow.c b/win32ss/gdi/eng/engwindow.c index d23e974489..ec343946a3 100644 --- a/win32ss/gdi/eng/engwindow.c +++ b/win32ss/gdi/eng/engwindow.c @@ -152,35 +152,30 @@ EngCreateWnd( EWNDOBJ *Clip = NULL; WNDOBJ *WndObjUser = NULL; PWND Window; - BOOL calledFromUser; - DECLARE_RETURN(WNDOBJ*); TRACE("EngCreateWnd: pso = 0x%p, hwnd = 0x%p, pfn = 0x%p, fl = 0x%lx, pixfmt = %d\n", pso, hWnd, pfn, fl, iPixelFormat); + UserEnterExclusive(); + if (fl & (WO_RGN_WINDOW | WO_RGN_DESKTOP_COORD | WO_RGN_UPDATE_ALL)) { FIXME("Unsupported flags: 0x%lx\n", fl & ~(WO_RGN_CLIENT_DELTA | WO_RGN_CLIENT | WO_RGN_SURFACE_DELTA | WO_RGN_SURFACE)); } - calledFromUser = UserIsEntered(); - if (!calledFromUser) { - UserEnterShared(); - } - /* Get window object */ Window = UserGetWindowObject(hWnd); if (Window == NULL) { - RETURN( NULL); + goto Exit; } /* Create WNDOBJ */ - Clip = EngAllocMem(FL_ZERO_MEMORY, sizeof (EWNDOBJ), GDITAG_WNDOBJ); + Clip = EngAllocMem(FL_ZERO_MEMORY, sizeof(EWNDOBJ), GDITAG_WNDOBJ); if (Clip == NULL) { ERR("Failed to allocate memory for a WND structure!\n"); - RETURN( NULL); + goto Exit; } IntEngInitClipObj((XCLIPOBJ*)Clip); @@ -188,7 +183,7 @@ EngCreateWnd( if (!IntEngWndUpdateClipObj(Clip, Window)) { EngFreeMem(Clip); - RETURN( NULL); + goto Exit; } /* Fill user object */ @@ -213,15 +208,9 @@ EngCreateWnd( TRACE("EngCreateWnd: SUCCESS: %p!\n", WndObjUser); - RETURN( WndObjUser); - -CLEANUP: - - if (!calledFromUser) { - UserLeave(); - } - - END_CLEANUP; +Exit: + UserLeave(); + return WndObjUser; } @@ -235,14 +224,10 @@ EngDeleteWnd( { EWNDOBJ* Clip = (EWNDOBJ *)pwo;//CONTAINING_RECORD(pwo, XCLIPOBJ, WndObj); PWND Window; - BOOL calledFromUser; TRACE("EngDeleteWnd: pwo = 0x%p\n", pwo); - calledFromUser = UserIsEntered(); - if (!calledFromUser) { - UserEnterExclusive(); - } + UserEnterExclusive(); /* Get window object */ Window = UserGetWindowObject(Clip->Hwnd); @@ -257,9 +242,7 @@ EngDeleteWnd( } --gcountPWO; - if (!calledFromUser) { - UserLeave(); - } + UserLeave(); /* Free resources */ IntEngFreeClipResources((XCLIPOBJ*)Clip);

6 years, 10 months

[reactos] 01/02: [WIN32SS] - Do not call the driver Escape routine while holding locks on GDI objects CORE-7727

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3e1a54151fdb2f513d5e1… commit 3e1a54151fdb2f513d5e1d4a374c2c973132493a Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Mon Oct 23 20:34:02 2017 +0200 [WIN32SS] - Do not call the driver Escape routine while holding locks on GDI objects CORE-7727 --- win32ss/gdi/eng/pdevobj.h | 7 ++ win32ss/gdi/eng/surface.h | 7 ++ win32ss/gdi/ntgdi/print.c | 179 ++++++++++++++++++++++++++-------------------- 3 files changed, 117 insertions(+), 76 deletions(-) diff --git a/win32ss/gdi/eng/pdevobj.h b/win32ss/gdi/eng/pdevobj.h index 4fabfe135e..9b986acde1 100644 --- a/win32ss/gdi/eng/pdevobj.h +++ b/win32ss/gdi/eng/pdevobj.h @@ -201,4 +201,11 @@ PDEVOBJ_pdmMatchDevMode( PPDEVOBJ ppdev, PDEVMODEW pdm); +FORCEINLINE +VOID +PDEVOBJ_vReference(PPDEVOBJ ppdev) +{ + InterlockedIncrement(&ppdev->cPdevRefs); +} + #endif /* !__WIN32K_PDEVOBJ_H */ diff --git a/win32ss/gdi/eng/surface.h b/win32ss/gdi/eng/surface.h index 96a35b13e6..ee05847e99 100644 --- a/win32ss/gdi/eng/surface.h +++ b/win32ss/gdi/eng/surface.h @@ -90,6 +90,13 @@ enum _SURFACEFLAGS /* NOTE: Use shared locks! */ #define SURFACE_ShareLockSurface(hBMObj) \ ((PSURFACE) GDIOBJ_ShareLockObj ((HGDIOBJ) hBMObj, GDI_OBJECT_TYPE_BITMAP)) +FORCEINLINE +VOID +SURFACE_ShareLockByPointer(PSURFACE psurf) +{ + GDIOBJ_vReferenceObjectByPointer(&psurf->BaseObject); +} + #define SURFACE_UnlockSurface(pBMObj) \ GDIOBJ_vUnlockObject ((POBJ)pBMObj) #define SURFACE_ShareUnlockSurface(pBMObj) \ diff --git a/win32ss/gdi/ntgdi/print.c b/win32ss/gdi/ntgdi/print.c index 5139eaa8ad..582bfcac1c 100644 --- a/win32ss/gdi/ntgdi/print.c +++ b/win32ss/gdi/ntgdi/print.c @@ -75,43 +75,6 @@ NtGdiEscape(HDC hDC, return ret; } -INT -APIENTRY -IntGdiExtEscape( - PDC dc, - INT Escape, - INT InSize, - LPCSTR InData, - INT OutSize, - LPSTR OutData) -{ - SURFACE *psurf; - INT Result; - - if ((dc->ppdev->DriverFunctions.Escape == NULL) || - (dc->dclevel.pSurface == NULL)) - { - Result = 0; - } - else - { - DC_vPrepareDCsForBlit(dc, NULL, NULL, NULL); - psurf = dc->dclevel.pSurface; - - Result = dc->ppdev->DriverFunctions.Escape( - &psurf->SurfObj, - Escape, - InSize, - (PVOID)InData, - OutSize, - (PVOID)OutData ); - - DC_vFinishBlit(dc, NULL); - } - - return Result; -} - INT APIENTRY NtGdiExtEscape( @@ -124,22 +87,73 @@ NtGdiExtEscape( INT OutSize, OPTIONAL LPSTR UnsafeOutData) { - PDC pDC; LPVOID SafeInData = NULL; LPVOID SafeOutData = NULL; NTSTATUS Status = STATUS_SUCCESS; INT Result; + PPDEVOBJ ppdev; + PSURFACE psurf; + + if (hDC == NULL) + { + if (pDriver) + { + /* FIXME : Get the pdev from its name */ + UNIMPLEMENTED; + return -1; + } - if (hDC == 0) + ppdev = EngpGetPDEV(NULL); + if (!ppdev) + { + EngSetLastError(ERROR_BAD_DEVICE); + return -1; + } + + /* We're using the primary surface of the pdev. Lock it */ + EngAcquireSemaphore(ppdev->hsemDevLock); + + psurf = ppdev->pSurface; + if (!psurf) + { + EngReleaseSemaphore(ppdev->hsemDevLock); + PDEVOBJ_vRelease(ppdev); + return 0; + } + SURFACE_ShareLockByPointer(psurf); + } + else { - hDC = UserGetWindowDC(NULL); + PDC pDC = DC_LockDc(hDC); + if ( pDC == NULL ) + { + EngSetLastError(ERROR_INVALID_HANDLE); + return -1; + } + + /* Get the PDEV from the DC */ + ppdev = pDC->ppdev; + PDEVOBJ_vReference(ppdev); + + /* Check if we have a surface */ + psurf = pDC->dclevel.pSurface; + if (!psurf) + { + DC_UnlockDc(pDC); + PDEVOBJ_vRelease(ppdev); + return 0; + } + SURFACE_ShareLockByPointer(psurf); + + /* We're done with the DC */ + DC_UnlockDc(pDC); } - pDC = DC_LockDc(hDC); - if ( pDC == NULL ) + /* See if we actually have a driver function to call */ + if (ppdev->DriverFunctions.Escape == NULL) { - EngSetLastError(ERROR_INVALID_HANDLE); - return -1; + Result = 0; + goto Exit; } if ( InSize && UnsafeInData ) @@ -158,17 +172,16 @@ NtGdiExtEscape( if (!NT_SUCCESS(Status)) { - DC_UnlockDc(pDC); - SetLastNtError(Status); - return -1; + Result = -1; + goto Exit; } SafeInData = ExAllocatePoolWithTag ( PagedPool, InSize, GDITAG_TEMP ); if ( !SafeInData ) { - DC_UnlockDc(pDC); EngSetLastError(ERROR_NOT_ENOUGH_MEMORY); - return -1; + Result = -1; + goto Exit; } _SEH2_TRY @@ -186,10 +199,9 @@ NtGdiExtEscape( if ( !NT_SUCCESS(Status) ) { - ExFreePoolWithTag ( SafeInData, GDITAG_TEMP ); - DC_UnlockDc(pDC); SetLastNtError(Status); - return -1; + Result = -1; + goto Exit; } } @@ -209,50 +221,65 @@ NtGdiExtEscape( if (!NT_SUCCESS(Status)) { - SetLastNtError(Status); - goto freeout; + SetLastNtError(Status); + Result = -1; + goto Exit; } SafeOutData = ExAllocatePoolWithTag ( PagedPool, OutSize, GDITAG_TEMP ); if ( !SafeOutData ) { EngSetLastError(ERROR_NOT_ENOUGH_MEMORY); -freeout: - if ( SafeInData ) - ExFreePoolWithTag ( SafeInData, GDITAG_TEMP ); - DC_UnlockDc(pDC); - return -1; + Result = -1; + goto Exit; } } - Result = IntGdiExtEscape ( pDC, Escape, InSize, SafeInData, OutSize, SafeOutData ); + /* Finally call the driver */ + Result = ppdev->DriverFunctions.Escape( + &psurf->SurfObj, + Escape, + InSize, + SafeInData, + OutSize, + SafeOutData ); - DC_UnlockDc(pDC); +Exit: + if (hDC == NULL) + { + EngReleaseSemaphore(ppdev->hsemDevLock); + } + SURFACE_ShareUnlockSurface(psurf); + PDEVOBJ_vRelease(ppdev); if ( SafeInData ) + { ExFreePoolWithTag ( SafeInData ,GDITAG_TEMP ); + } if ( SafeOutData ) { - _SEH2_TRY - { - /* Pointers were already probed! */ - RtlCopyMemory(UnsafeOutData, - SafeOutData, - OutSize); - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + if (Result > 0) { - Status = _SEH2_GetExceptionCode(); + _SEH2_TRY + { + /* Pointers were already probed! */ + RtlCopyMemory(UnsafeOutData, SafeOutData, OutSize); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; + + if ( !NT_SUCCESS(Status) ) + { + SetLastNtError(Status); + Result = -1; + } } - _SEH2_END; ExFreePoolWithTag ( SafeOutData, GDITAG_TEMP ); - if ( !NT_SUCCESS(Status) ) - { - SetLastNtError(Status); - return -1; - } } return Result;

6 years, 10 months

← Newer
1
...
5
6
7
8
9
10
11
...
19
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs November 2017