Ros-diffs May 2018

ros-diffs@reactos.org

23 participants
218 discussions

01/01: [NTOS] Demote an ASSERT to a mere DPRINT since we only support registry hives with cluster size == 1 in any case so far (other sizes are UNIMPLEMENTED!)
by Hermès Bélusca-Maïto 19 May '18

19 May '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=de87a936ceb6e715a01fc… commit de87a936ceb6e715a01fc33ce302630b64505ff6 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sat May 19 22:04:20 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat May 19 22:07:06 2018 +0200 [NTOS] Demote an ASSERT to a mere DPRINT since we only support registry hives with cluster size == 1 in any case so far (other sizes are UNIMPLEMENTED!) --- ntoskrnl/config/cmsysini.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/ntoskrnl/config/cmsysini.c b/ntoskrnl/config/cmsysini.c index 80bc55bbc1..ca198833a4 100644 --- a/ntoskrnl/config/cmsysini.c +++ b/ntoskrnl/config/cmsysini.c @@ -1369,15 +1369,19 @@ CmpLoadHiveThread(IN PVOID StartContext) Length = CmHive->Hive.Storage[Stable].Length + HBLOCK_SIZE; /* Check if the cluster size doesn't match */ - if (CmHive->Hive.Cluster != ClusterSize) ASSERT(FALSE); + if (CmHive->Hive.Cluster != ClusterSize) + { + DPRINT1("FIXME: Support for CmHive->Hive.Cluster (%lu) != ClusterSize (%lu) is unimplemented!\n", + CmHive->Hive.Cluster, ClusterSize); + } /* Set the file size */ - DPRINT("FIXME: Should set file size: %lx\n", Length); + DPRINT("FIXME: Should set file size: %lu\n", Length); //if (!CmpFileSetSize((PHHIVE)CmHive, HFILE_TYPE_PRIMARY, Length, Length)) - { + //{ /* This shouldn't fail */ //ASSERT(FALSE); - } + //} /* Another thing we don't support is NTLDR-recovery */ if (CmHive->Hive.BaseBlock->BootRecover) ASSERT(FALSE);

1 0

01/01: [SETUPAPI] Implement CM_Free_Resource_Conflict_Handle() and CM_Query_Resource_Conflict_List()
by Eric Kohl 19 May '18

19 May '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cee1817e0631e41720a78… commit cee1817e0631e41720a7841d0bccddbea5c70290 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sat May 19 18:11:48 2018 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sat May 19 18:12:28 2018 +0200 [SETUPAPI] Implement CM_Free_Resource_Conflict_Handle() and CM_Query_Resource_Conflict_List() --- dll/win32/setupapi/cfgmgr.c | 148 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 145 insertions(+), 3 deletions(-) diff --git a/dll/win32/setupapi/cfgmgr.c b/dll/win32/setupapi/cfgmgr.c index 0bedd944e9..80b87e902d 100644 --- a/dll/win32/setupapi/cfgmgr.c +++ b/dll/win32/setupapi/cfgmgr.c @@ -85,6 +85,16 @@ typedef struct _INTERNAL_RANGE_LIST #define RANGE_LIST_MAGIC 0x33445566 +typedef struct _CONFLICT_DATA +{ + ULONG ulMagic; + PPNP_CONFLICT_LIST pConflictList; +} CONFLICT_DATA, *PCONFLICT_DATA; + +#define CONFLICT_MAGIC 0x11225588 + + +/* FUNCTIONS ****************************************************************/ static BOOL @@ -387,6 +397,30 @@ IsValidLogConf( } +BOOL +IsValidConflictData( + _In_opt_ PCONFLICT_DATA pConflictData) +{ + BOOL bValid = TRUE; + + if (pConflictData == NULL) + return FALSE; + + _SEH2_TRY + { + if (pConflictData->ulMagic != CONFLICT_MAGIC) + bValid = FALSE; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + bValid = FALSE; + } + _SEH2_END; + + return bValid; +} + + /*********************************************************************** * CMP_GetBlockedDriverInfo [SETUPAPI.@] */ @@ -2241,9 +2275,21 @@ WINAPI CM_Free_Resource_Conflict_Handle( _In_ CONFLICT_LIST clConflictList) { - FIXME("CM_Free_Resource_Conflict_Handle(%p)\n", clConflictList); + PCONFLICT_DATA pConflictData; - return CR_CALL_NOT_IMPLEMENTED; + FIXME("CM_Free_Resource_Conflict_Handle(%p)\n", + clConflictList); + + pConflictData = (PCONFLICT_DATA)clConflictList; + if (!IsValidConflictData(pConflictData)) + return CR_INVALID_CONFLICT_LIST; + + if (pConflictData->pConflictList != NULL) + MyFree(pConflictData->pConflictList); + + MyFree(pConflictData); + + return CR_SUCCESS; } @@ -6487,11 +6533,107 @@ CM_Query_Resource_Conflict_List( _In_ ULONG ulFlags, _In_opt_ HMACHINE hMachine) { + RPC_BINDING_HANDLE BindingHandle = NULL; + HSTRING_TABLE StringTable = NULL; + PPNP_CONFLICT_LIST pConflictBuffer = NULL; + PCONFLICT_DATA pConflictData = NULL; + ULONG ulBufferLength; + LPWSTR lpDevInst; + CONFIGRET ret; + FIXME("CM_Query_Resource_Conflict_List(%p %lx %lu %p %lu %lx %p)\n", pclConflictList, dnDevInst, ResourceID, ResourceData, ResourceLen, ulFlags, hMachine); - return CR_CALL_NOT_IMPLEMENTED; + if (dnDevInst == 0) + return CR_INVALID_DEVNODE; + + if (ulFlags & ~CM_RESDES_WIDTH_BITS) + return CR_INVALID_FLAG; + + if (pclConflictList == NULL || + ResourceData == NULL || + ResourceLen == 0) + return CR_INVALID_POINTER; + + if (ResourceID == 0) + return CR_INVALID_RESOURCEID; + + *pclConflictList = 0; + + if (hMachine != NULL) + { + BindingHandle = ((PMACHINE_INFO)hMachine)->BindingHandle; + if (BindingHandle == NULL) + return CR_FAILURE; + + StringTable = ((PMACHINE_INFO)hMachine)->StringTable; + if (StringTable == 0) + return CR_FAILURE; + } + else + { + if (!PnpGetLocalHandles(&BindingHandle, &StringTable)) + return CR_FAILURE; + } + + lpDevInst = pSetupStringTableStringFromId(StringTable, dnDevInst); + if (lpDevInst == NULL) + return CR_INVALID_DEVNODE; + + pConflictData = MyMalloc(sizeof(PCONFLICT_DATA)); + if (pConflictData == NULL) + { + ret = CR_OUT_OF_MEMORY; + goto done; + } + + ulBufferLength = sizeof(PNP_CONFLICT_LIST) + + sizeof(PNP_CONFLICT_STRINGS) + + (sizeof(wchar_t) * 200); + pConflictBuffer = MyMalloc(ulBufferLength); + if (pConflictBuffer == NULL) + { + ret = CR_OUT_OF_MEMORY; + goto done; + } + + RpcTryExcept + { + ret = PNP_QueryResConfList(BindingHandle, + lpDevInst, + ResourceID, + (PBYTE)ResourceData, + ResourceLen, + (PBYTE)pConflictBuffer, + ulBufferLength, + ulFlags); + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + ret = RpcStatusToCmStatus(RpcExceptionCode()); + } + RpcEndExcept; + + if (ret != CR_SUCCESS) + goto done; + + pConflictData->ulMagic = CONFLICT_MAGIC; + pConflictData->pConflictList = pConflictBuffer; + + *pclConflictList = (CONFLICT_LIST)pConflictData; + +done: + if (ret != CR_SUCCESS) + { + if (pConflictBuffer != NULL) + MyFree(pConflictBuffer); + + if (pConflictData != NULL) + MyFree(pConflictData); + } + + return ret; }

1 0

01/01: [SHELL32] Allow deleting a file type/extension (#553)
by Katayama Hirofumi MZ 19 May '18

19 May '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=82a5983504b955d5639a5… commit 82a5983504b955d5639a58d64022ec5cd9ece8b3 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat May 19 23:12:11 2018 +0900 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Sat May 19 16:12:11 2018 +0200 [SHELL32] Allow deleting a file type/extension (#553) CORE-12906 --- dll/win32/shell32/dialogs/folder_options.cpp | 62 ++++++++++++++++++++++++++++ dll/win32/shell32/lang/bg-BG.rc | 2 + dll/win32/shell32/lang/ca-ES.rc | 2 + dll/win32/shell32/lang/cs-CZ.rc | 2 + dll/win32/shell32/lang/da-DK.rc | 2 + dll/win32/shell32/lang/de-DE.rc | 2 + dll/win32/shell32/lang/el-GR.rc | 2 + dll/win32/shell32/lang/en-GB.rc | 2 + dll/win32/shell32/lang/en-US.rc | 2 + dll/win32/shell32/lang/es-ES.rc | 2 + dll/win32/shell32/lang/et-EE.rc | 2 + dll/win32/shell32/lang/fi-FI.rc | 2 + dll/win32/shell32/lang/fr-FR.rc | 2 + dll/win32/shell32/lang/he-IL.rc | 2 + dll/win32/shell32/lang/hu-HU.rc | 2 + dll/win32/shell32/lang/it-IT.rc | 2 + dll/win32/shell32/lang/ja-JP.rc | 2 + dll/win32/shell32/lang/ko-KR.rc | 2 + dll/win32/shell32/lang/nl-NL.rc | 2 + dll/win32/shell32/lang/no-NO.rc | 2 + dll/win32/shell32/lang/pl-PL.rc | 2 + dll/win32/shell32/lang/pt-BR.rc | 2 + dll/win32/shell32/lang/pt-PT.rc | 2 + dll/win32/shell32/lang/ro-RO.rc | 2 + dll/win32/shell32/lang/ru-RU.rc | 2 + dll/win32/shell32/lang/sk-SK.rc | 2 + dll/win32/shell32/lang/sl-SI.rc | 2 + dll/win32/shell32/lang/sq-AL.rc | 2 + dll/win32/shell32/lang/sv-SE.rc | 2 + dll/win32/shell32/lang/tr-TR.rc | 2 + dll/win32/shell32/lang/uk-UA.rc | 2 + dll/win32/shell32/lang/zh-CN.rc | 2 + dll/win32/shell32/lang/zh-TW.rc | 2 + dll/win32/shell32/shresdef.h | 2 + 34 files changed, 128 insertions(+) diff --git a/dll/win32/shell32/dialogs/folder_options.cpp b/dll/win32/shell32/dialogs/folder_options.cpp index b53dd8ce0d..cffee8bee1 100644 --- a/dll/win32/shell32/dialogs/folder_options.cpp +++ b/dll/win32/shell32/dialogs/folder_options.cpp @@ -1349,6 +1349,30 @@ FindItem(HWND hDlgCtrl, WCHAR * ItemName) return ListView_FindItem(hDlgCtrl, 0, &findInfo); } +static BOOL +DeleteExt(HWND hwndDlg, LPCWSTR pszExt) +{ + if (*pszExt != L'.') + return FALSE; + + HKEY hKey; + LONG nResult = RegOpenKeyExW(HKEY_CLASSES_ROOT, pszExt, 0, KEY_READ, &hKey); + if (nResult != ERROR_SUCCESS) + return FALSE; + + WCHAR szValue[64]; + DWORD cbValue = sizeof(szValue); + nResult = RegQueryValueExW(hKey, NULL, NULL, NULL, LPBYTE(szValue), &cbValue); + RegCloseKey(hKey); + if (nResult != ERROR_SUCCESS) + return FALSE; + + if (szValue[0]) + SHDeleteKeyW(HKEY_CLASSES_ROOT, szValue); + + return SHDeleteKeyW(HKEY_CLASSES_ROOT, pszExt) == ERROR_SUCCESS; +} + static VOID InsertFileType(HWND hDlgCtrl, WCHAR * szName, PINT iItem, WCHAR * szFile) @@ -1749,6 +1773,12 @@ NewExtDlg_OnOK(HWND hwndDlg, NEWEXT_DIALOG *pNewExt) return FALSE; } + // Delete the extension + CStringW strExt(L"."); + strExt += find.psz; + strExt.MakeLower(); + DeleteExt(hwndDlg, strExt); + // Delete the item ListView_DeleteItem(pNewExt->hwndLV, iItem); } @@ -1873,6 +1903,28 @@ FileTypesDlg_AddExt(HWND hwndDlg, LPCWSTR pszExt, LPCWSTR pszFileType) return TRUE; } +static BOOL +FileTypesDlg_RemoveExt(HWND hwndDlg) +{ + HWND hListView = GetDlgItem(hwndDlg, IDC_FILETYPES_LISTVIEW); + + INT iItem = ListView_GetNextItem(hListView, -1, LVNI_SELECTED); + if (iItem == -1) + return FALSE; + + WCHAR szExt[20]; + szExt[0] = L'.'; + ListView_GetItemText(hListView, iItem, 0, &szExt[1], _countof(szExt) - 1); + CharLowerW(szExt); + + if (DeleteExt(hwndDlg, szExt)) + { + ListView_DeleteItem(hListView, iItem); + return TRUE; + } + return FALSE; +} + // IDD_FOLDER_OPTIONS_FILETYPES dialog INT_PTR CALLBACK @@ -1911,6 +1963,16 @@ FolderOptionsFileTypesDlg( FileTypesDlg_AddExt(hwndDlg, newext.szExt, newext.szFileType); } break; + case IDC_FILETYPES_DELETE: + { + CStringW strRemoveExt(MAKEINTRESOURCEW(IDS_REMOVE_EXT)); + CStringW strTitle(MAKEINTRESOURCEW(IDS_FILE_TYPES)); + if (MessageBoxW(hwndDlg, strRemoveExt, strTitle, MB_ICONQUESTION | MB_YESNO) == IDYES) + { + FileTypesDlg_RemoveExt(hwndDlg); + } + } + break; case IDC_FILETYPES_CHANGE: pItem = FindSelectedItem(GetDlgItem(hwndDlg, IDC_FILETYPES_LISTVIEW)); if (pItem) diff --git a/dll/win32/shell32/lang/bg-BG.rc b/dll/win32/shell32/lang/bg-BG.rc index e1434cc693..94daa0323b 100644 --- a/dll/win32/shell32/lang/bg-BG.rc +++ b/dll/win32/shell32/lang/bg-BG.rc @@ -899,4 +899,6 @@ BEGIN IDS_NEWEXT_SPECIFY_EXT "You must specify an extension." IDS_NEWEXT_ALREADY_ASSOC "Extension %s is already associated with File Type %s. Do you want to un-associate %s with %s and create a new File Type for it?" IDS_NEWEXT_EXT_IN_USE "Extension is in use" + + IDS_REMOVE_EXT "If you remove a registered file name extension, you will not be able to open files with this extension by double-clicking their icons.\n\nAre you sure you want to remove this extension?" END diff --git a/dll/win32/shell32/lang/ca-ES.rc b/dll/win32/shell32/lang/ca-ES.rc index 5e132b5a23..53c5ebacfb 100644 --- a/dll/win32/shell32/lang/ca-ES.rc +++ b/dll/win32/shell32/lang/ca-ES.rc @@ -899,4 +899,6 @@ BEGIN IDS_NEWEXT_SPECIFY_EXT "You must specify an extension." IDS_NEWEXT_ALREADY_ASSOC "Extension %s is already associated with File Type %s. Do you want to un-associate %s with %s and create a new File Type for it?" IDS_NEWEXT_EXT_IN_USE "Extension is in use" + + IDS_REMOVE_EXT "If you remove a registered file name extension, you will not be able to open files with this extension by double-clicking their icons.\n\nAre you sure you want to remove this extension?" END diff --git a/dll/win32/shell32/lang/cs-CZ.rc b/dll/win32/shell32/lang/cs-CZ.rc index 88341dee0f..c7494ebf33 100644 --- a/dll/win32/shell32/lang/cs-CZ.rc +++ b/dll/win32/shell32/lang/cs-CZ.rc @@ -885,4 +885,6 @@ BEGIN IDS_NEWEXT_SPECIFY_EXT "You must specify an extension." IDS_NEWEXT_ALREADY_ASSOC "Extension %s is already associated with File Type %s. Do you want to un-associate %s with %s and create a new File Type for it?" IDS_NEWEXT_EXT_IN_USE "Extension is in use" + + IDS_REMOVE_EXT "If you remove a registered file name extension, you will not be able to open files with this extension by double-clicking their icons.\n\nAre you sure you want to remove this extension?" END diff --git a/dll/win32/shell32/lang/da-DK.rc b/dll/win32/shell32/lang/da-DK.rc index 499a764aaf..501648452c 100644 --- a/dll/win32/shell32/lang/da-DK.rc +++ b/dll/win32/shell32/lang/da-DK.rc @@ -905,4 +905,6 @@ BEGIN IDS_NEWEXT_SPECIFY_EXT "You must specify an extension." IDS_NEWEXT_ALREADY_ASSOC "Extension %s is already associated with File Type %s. Do you want to un-associate %s with %s and create a new File Type for it?" IDS_NEWEXT_EXT_IN_USE "Extension is in use" + + IDS_REMOVE_EXT "If you remove a registered file name extension, you will not be able to open files with this extension by double-clicking their icons.\n\nAre you sure you want to remove this extension?" END diff --git a/dll/win32/shell32/lang/de-DE.rc b/dll/win32/shell32/lang/de-DE.rc index 7413b005ac..5bf042e98f 100644 --- a/dll/win32/shell32/lang/de-DE.rc +++ b/dll/win32/shell32/lang/de-DE.rc @@ -900,4 +900,6 @@ BEGIN IDS_NEWEXT_SPECIFY_EXT "You must specify an extension." IDS_NEWEXT_ALREADY_ASSOC "Extension %s is already associated with File Type %s. Do you want to un-associate %s with %s and create a new File Type for it?" IDS_NEWEXT_EXT_IN_USE "Extension is in use" + + IDS_REMOVE_EXT "If you remove a registered file name extension, you will not be able to open files with this extension by double-clicking their icons.\n\nAre you sure you want to remove this extension?" END diff --git a/dll/win32/shell32/lang/el-GR.rc b/dll/win32/shell32/lang/el-GR.rc index b52405c547..635fce0c1f 100644 --- a/dll/win32/shell32/lang/el-GR.rc +++ b/dll/win32/shell32/lang/el-GR.rc @@ -899,4 +899,6 @@ BEGIN IDS_NEWEXT_SPECIFY_EXT "You must specify an extension." IDS_NEWEXT_ALREADY_ASSOC "Extension %s is already associated with File Type %s. Do you want to un-associate %s with %s and create a new File Type for it?" IDS_NEWEXT_EXT_IN_USE "Extension is in use" + + IDS_REMOVE_EXT "If you remove a registered file name extension, you will not be able to open files with this extension by double-clicking their icons.\n\nAre you sure you want to remove this extension?" END diff --git a/dll/win32/shell32/lang/en-GB.rc b/dll/win32/shell32/lang/en-GB.rc index 75807f8a95..4cd9e85dcc 100644 --- a/dll/win32/shell32/lang/en-GB.rc +++ b/dll/win32/shell32/lang/en-GB.rc @@ -899,4 +899,6 @@ BEGIN IDS_NEWEXT_SPECIFY_EXT "You must specify an extension." IDS_NEWEXT_ALREADY_ASSOC "Extension %s is already associated with File Type %s. Do you want to un-associate %s with %s and create a new File Type for it?" IDS_NEWEXT_EXT_IN_USE "Extension is in use" + + IDS_REMOVE_EXT "If you remove a registered file name extension, you will not be able to open files with this extension by double-clicking their icons.\n\nAre you sure you want to remove this extension?" END diff --git a/dll/win32/shell32/lang/en-US.rc b/dll/win32/shell32/lang/en-US.rc index 36620174d5..5d327f02f3 100644 --- a/dll/win32/shell32/lang/en-US.rc +++ b/dll/win32/shell32/lang/en-US.rc @@ -900,4 +900,6 @@ BEGIN IDS_NEWEXT_SPECIFY_EXT "You must specify an extension." IDS_NEWEXT_ALREADY_ASSOC "Extension %s is already associated with File Type %s. Do you want to un-associate %s with %s and create a new File Type for it?" IDS_NEWEXT_EXT_IN_USE "Extension is in use" + + IDS_REMOVE_EXT "If you remove a registered file name extension, you will not be able to open files with this extension by double-clicking their icons.\n\nAre you sure you want to remove this extension?" END diff --git a/dll/win32/shell32/lang/es-ES.rc b/dll/win32/shell32/lang/es-ES.rc index 560c3bc11d..4d86e8c865 100644 --- a/dll/win32/shell32/lang/es-ES.rc +++ b/dll/win32/shell32/lang/es-ES.rc @@ -901,4 +901,6 @@ BEGIN IDS_NEWEXT_SPECIFY_EXT "You must specify an extension." IDS_NEWEXT_ALREADY_ASSOC "Extension %s is already associated with File Type %s. Do you want to un-associate %s with %s and create a new File Type for it?" IDS_NEWEXT_EXT_IN_USE "Extension is in use" + + IDS_REMOVE_EXT "If you remove a registered file name extension, you will not be able to open files with this extension by double-clicking their icons.\n\nAre you sure you want to remove this extension?" END diff --git a/dll/win32/shell32/lang/et-EE.rc b/dll/win32/shell32/lang/et-EE.rc index d7e7f5f7da..7fe739bcf2 100644 --- a/dll/win32/shell32/lang/et-EE.rc +++ b/dll/win32/shell32/lang/et-EE.rc @@ -907,4 +907,6 @@ BEGIN IDS_NEWEXT_SPECIFY_EXT "You must specify an extension." IDS_NEWEXT_ALREADY_ASSOC "Extension %s is already associated with File Type %s. Do you want to un-associate %s with %s and create a new File Type for it?" IDS_NEWEXT_EXT_IN_USE "Extension is in use" + + IDS_REMOVE_EXT "If you remove a registered file name extension, you will not be able to open files with this extension by double-clicking their icons.\n\nAre you sure you want to remove this extension?" END diff --git a/dll/win32/shell32/lang/fi-FI.rc b/dll/win32/shell32/lang/fi-FI.rc index 9c047596fb..df2a16de1b 100644 --- a/dll/win32/shell32/lang/fi-FI.rc +++ b/dll/win32/shell32/lang/fi-FI.rc @@ -899,4 +899,6 @@ BEGIN IDS_NEWEXT_SPECIFY_EXT "You must specify an extension." IDS_NEWEXT_ALREADY_ASSOC "Extension %s is already associated with File Type %s. Do you want to un-associate %s with %s and create a new File Type for it?" IDS_NEWEXT_EXT_IN_USE "Extension is in use" + + IDS_REMOVE_EXT "If you remove a registered file name extension, you will not be able to open files with this extension by double-clicking their icons.\n\nAre you sure you want to remove this extension?" END diff --git a/dll/win32/shell32/lang/fr-FR.rc b/dll/win32/shell32/lang/fr-FR.rc index 94934f332a..a1d20cbba3 100644 --- a/dll/win32/shell32/lang/fr-FR.rc +++ b/dll/win32/shell32/lang/fr-FR.rc @@ -899,4 +899,6 @@ BEGIN IDS_NEWEXT_SPECIFY_EXT "You must specify an extension." IDS_NEWEXT_ALREADY_ASSOC "Extension %s is already associated with File Type %s. Do you want to un-associate %s with %s and create a new File Type for it?" IDS_NEWEXT_EXT_IN_USE "Extension is in use" + + IDS_REMOVE_EXT "If you remove a registered file name extension, you will not be able to open files with this extension by double-clicking their icons.\n\nAre you sure you want to remove this extension?" END diff --git a/dll/win32/shell32/lang/he-IL.rc b/dll/win32/shell32/lang/he-IL.rc index 21adbdaca7..85a108337b 100644 --- a/dll/win32/shell32/lang/he-IL.rc +++ b/dll/win32/shell32/lang/he-IL.rc @@ -899,4 +899,6 @@ BEGIN IDS_NEWEXT_SPECIFY_EXT "You must specify an extension." IDS_NEWEXT_ALREADY_ASSOC "Extension %s is already associated with File Type %s. Do you want to un-associate %s with %s and create a new File Type for it?" IDS_NEWEXT_EXT_IN_USE "Extension is in use" + + IDS_REMOVE_EXT "If you remove a registered file name extension, you will not be able to open files with this extension by double-clicking their icons.\n\nAre you sure you want to remove this extension?" END diff --git a/dll/win32/shell32/lang/hu-HU.rc b/dll/win32/shell32/lang/hu-HU.rc index 8cfc2a4fda..38521334e2 100644 --- a/dll/win32/shell32/lang/hu-HU.rc +++ b/dll/win32/shell32/lang/hu-HU.rc @@ -899,4 +899,6 @@ BEGIN IDS_NEWEXT_SPECIFY_EXT "You must specify an extension." IDS_NEWEXT_ALREADY_ASSOC "Extension %s is already associated with File Type %s. Do you want to un-associate %s with %s and create a new File Type for it?" IDS_NEWEXT_EXT_IN_USE "Extension is in use" + + IDS_REMOVE_EXT "If you remove a registered file name extension, you will not be able to open files with this extension by double-clicking their icons.\n\nAre you sure you want to remove this extension?" END diff --git a/dll/win32/shell32/lang/it-IT.rc b/dll/win32/shell32/lang/it-IT.rc index a676af71b6..82feea8e7a 100644 --- a/dll/win32/shell32/lang/it-IT.rc +++ b/dll/win32/shell32/lang/it-IT.rc @@ -899,4 +899,6 @@ BEGIN IDS_NEWEXT_SPECIFY_EXT "You must specify an extension." IDS_NEWEXT_ALREADY_ASSOC "Extension %s is already associated with File Type %s. Do you want to un-associate %s with %s and create a new File Type for it?" IDS_NEWEXT_EXT_IN_USE "Extension is in use" + + IDS_REMOVE_EXT "If you remove a registered file name extension, you will not be able to open files with this extension by double-clicking their icons.\n\nAre you sure you want to remove this extension?" END diff --git a/dll/win32/shell32/lang/ja-JP.rc b/dll/win32/shell32/lang/ja-JP.rc index afc51ab142..e21a079cc7 100644 --- a/dll/win32/shell32/lang/ja-JP.rc +++ b/dll/win32/shell32/lang/ja-JP.rc @@ -896,4 +896,6 @@ BEGIN IDS_NEWEXT_SPECIFY_EXT "You must specify an extension." IDS_NEWEXT_ALREADY_ASSOC "Extension %s is already associated with File Type %s. Do you want to un-associate %s with %s and create a new File Type for it?" IDS_NEWEXT_EXT_IN_USE "Extension is in use" + + IDS_REMOVE_EXT "If you remove a registered file name extension, you will not be able to open files with this extension by double-clicking their icons.\n\nAre you sure you want to remove this extension?" END diff --git a/dll/win32/shell32/lang/ko-KR.rc b/dll/win32/shell32/lang/ko-KR.rc index 19a06e0183..fa1c1b97d2 100644 --- a/dll/win32/shell32/lang/ko-KR.rc +++ b/dll/win32/shell32/lang/ko-KR.rc @@ -899,4 +899,6 @@ BEGIN IDS_NEWEXT_SPECIFY_EXT "You must specify an extension." IDS_NEWEXT_ALREADY_ASSOC "Extension %s is already associated with File Type %s. Do you want to un-associate %s with %s and create a new File Type for it?" IDS_NEWEXT_EXT_IN_USE "Extension is in use" + + IDS_REMOVE_EXT "If you remove a registered file name extension, you will not be able to open files with this extension by double-clicking their icons.\n\nAre you sure you want to remove this extension?" END diff --git a/dll/win32/shell32/lang/nl-NL.rc b/dll/win32/shell32/lang/nl-NL.rc index ba0280cd18..1e46a4c924 100644 --- a/dll/win32/shell32/lang/nl-NL.rc +++ b/dll/win32/shell32/lang/nl-NL.rc @@ -899,4 +899,6 @@ BEGIN IDS_NEWEXT_SPECIFY_EXT "You must specify an extension." IDS_NEWEXT_ALREADY_ASSOC "Extension %s is already associated with File Type %s. Do you want to un-associate %s with %s and create a new File Type for it?" IDS_NEWEXT_EXT_IN_USE "Extension is in use" + + IDS_REMOVE_EXT "If you remove a registered file name extension, you will not be able to open files with this extension by double-clicking their icons.\n\nAre you sure you want to remove this extension?" END diff --git a/dll/win32/shell32/lang/no-NO.rc b/dll/win32/shell32/lang/no-NO.rc index 9a06724890..223977332a 100644 --- a/dll/win32/shell32/lang/no-NO.rc +++ b/dll/win32/shell32/lang/no-NO.rc @@ -899,4 +899,6 @@ BEGIN IDS_NEWEXT_SPECIFY_EXT "You must specify an extension." IDS_NEWEXT_ALREADY_ASSOC "Extension %s is already associated with File Type %s. Do you want to un-associate %s with %s and create a new File Type for it?" IDS_NEWEXT_EXT_IN_USE "Extension is in use" + + IDS_REMOVE_EXT "If you remove a registered file name extension, you will not be able to open files with this extension by double-clicking their icons.\n\nAre you sure you want to remove this extension?" END diff --git a/dll/win32/shell32/lang/pl-PL.rc b/dll/win32/shell32/lang/pl-PL.rc index 4040c421fe..e3a06f2487 100644 --- a/dll/win32/shell32/lang/pl-PL.rc +++ b/dll/win32/shell32/lang/pl-PL.rc @@ -904,4 +904,6 @@ BEGIN IDS_NEWEXT_SPECIFY_EXT "Musisz podać rozszerzenie." IDS_NEWEXT_ALREADY_ASSOC "Rozszerzenie %s jest już związane z typem plików %s. Czy chcesz usunąć powiązanie %s z %s i utworzyć dla niego nowy typ plików?" IDS_NEWEXT_EXT_IN_USE "Rozszerzenie jest w użyciu" + + IDS_REMOVE_EXT "If you remove a registered file name extension, you will not be able to open files with this extension by double-clicking their icons.\n\nAre you sure you want to remove this extension?" END diff --git a/dll/win32/shell32/lang/pt-BR.rc b/dll/win32/shell32/lang/pt-BR.rc index e7da10ffee..19c7f068ba 100644 --- a/dll/win32/shell32/lang/pt-BR.rc +++ b/dll/win32/shell32/lang/pt-BR.rc @@ -899,4 +899,6 @@ BEGIN IDS_NEWEXT_SPECIFY_EXT "You must specify an extension." IDS_NEWEXT_ALREADY_ASSOC "Extension %s is already associated with File Type %s. Do you want to un-associate %s with %s and create a new File Type for it?" IDS_NEWEXT_EXT_IN_USE "Extension is in use" + + IDS_REMOVE_EXT "If you remove a registered file name extension, you will not be able to open files with this extension by double-clicking their icons.\n\nAre you sure you want to remove this extension?" END diff --git a/dll/win32/shell32/lang/pt-PT.rc b/dll/win32/shell32/lang/pt-PT.rc index f0df0caf9d..d15c6912ce 100644 --- a/dll/win32/shell32/lang/pt-PT.rc +++ b/dll/win32/shell32/lang/pt-PT.rc @@ -899,4 +899,6 @@ BEGIN IDS_NEWEXT_SPECIFY_EXT "You must specify an extension." IDS_NEWEXT_ALREADY_ASSOC "Extension %s is already associated with File Type %s. Do you want to un-associate %s with %s and create a new File Type for it?" IDS_NEWEXT_EXT_IN_USE "Extension is in use" + + IDS_REMOVE_EXT "If you remove a registered file name extension, you will not be able to open files with this extension by double-clicking their icons.\n\nAre you sure you want to remove this extension?" END diff --git a/dll/win32/shell32/lang/ro-RO.rc b/dll/win32/shell32/lang/ro-RO.rc index 213d1c654e..54b0ebf0b8 100644 --- a/dll/win32/shell32/lang/ro-RO.rc +++ b/dll/win32/shell32/lang/ro-RO.rc @@ -901,4 +901,6 @@ BEGIN IDS_NEWEXT_SPECIFY_EXT "You must specify an extension." IDS_NEWEXT_ALREADY_ASSOC "Extension %s is already associated with File Type %s. Do you want to un-associate %s with %s and create a new File Type for it?" IDS_NEWEXT_EXT_IN_USE "Extension is in use" + + IDS_REMOVE_EXT "If you remove a registered file name extension, you will not be able to open files with this extension by double-clicking their icons.\n\nAre you sure you want to remove this extension?" END diff --git a/dll/win32/shell32/lang/ru-RU.rc b/dll/win32/shell32/lang/ru-RU.rc index 9999c34582..e924f7b572 100644 --- a/dll/win32/shell32/lang/ru-RU.rc +++ b/dll/win32/shell32/lang/ru-RU.rc @@ -901,4 +901,6 @@ BEGIN IDS_NEWEXT_SPECIFY_EXT "You must specify an extension." IDS_NEWEXT_ALREADY_ASSOC "Extension %s is already associated with File Type %s. Do you want to un-associate %s with %s and create a new File Type for it?" IDS_NEWEXT_EXT_IN_USE "Extension is in use" + + IDS_REMOVE_EXT "If you remove a registered file name extension, you will not be able to open files with this extension by double-clicking their icons.\n\nAre you sure you want to remove this extension?" END diff --git a/dll/win32/shell32/lang/sk-SK.rc b/dll/win32/shell32/lang/sk-SK.rc index e43686755c..acc1f32579 100644 --- a/dll/win32/shell32/lang/sk-SK.rc +++ b/dll/win32/shell32/lang/sk-SK.rc @@ -899,4 +899,6 @@ BEGIN IDS_NEWEXT_SPECIFY_EXT "You must specify an extension." IDS_NEWEXT_ALREADY_ASSOC "Extension %s is already associated with File Type %s. Do you want to un-associate %s with %s and create a new File Type for it?" IDS_NEWEXT_EXT_IN_USE "Extension is in use" + + IDS_REMOVE_EXT "If you remove a registered file name extension, you will not be able to open files with this extension by double-clicking their icons.\n\nAre you sure you want to remove this extension?" END diff --git a/dll/win32/shell32/lang/sl-SI.rc b/dll/win32/shell32/lang/sl-SI.rc index b31654d02e..8beba1374d 100644 --- a/dll/win32/shell32/lang/sl-SI.rc +++ b/dll/win32/shell32/lang/sl-SI.rc @@ -899,4 +899,6 @@ BEGIN IDS_NEWEXT_SPECIFY_EXT "You must specify an extension." IDS_NEWEXT_ALREADY_ASSOC "Extension %s is already associated with File Type %s. Do you want to un-associate %s with %s and create a new File Type for it?" IDS_NEWEXT_EXT_IN_USE "Extension is in use" + + IDS_REMOVE_EXT "If you remove a registered file name extension, you will not be able to open files with this extension by double-clicking their icons.\n\nAre you sure you want to remove this extension?" END diff --git a/dll/win32/shell32/lang/sq-AL.rc b/dll/win32/shell32/lang/sq-AL.rc index 0b24962ea8..93e14c424f 100644 --- a/dll/win32/shell32/lang/sq-AL.rc +++ b/dll/win32/shell32/lang/sq-AL.rc @@ -903,4 +903,6 @@ BEGIN IDS_NEWEXT_SPECIFY_EXT "You must specify an extension." IDS_NEWEXT_ALREADY_ASSOC "Extension %s is already associated with File Type %s. Do you want to un-associate %s with %s and create a new File Type for it?" IDS_NEWEXT_EXT_IN_USE "Extension is in use" + + IDS_REMOVE_EXT "If you remove a registered file name extension, you will not be able to open files with this extension by double-clicking their icons.\n\nAre you sure you want to remove this extension?" END diff --git a/dll/win32/shell32/lang/sv-SE.rc b/dll/win32/shell32/lang/sv-SE.rc index 1ffa90923f..fd0f1234c4 100644 --- a/dll/win32/shell32/lang/sv-SE.rc +++ b/dll/win32/shell32/lang/sv-SE.rc @@ -899,4 +899,6 @@ BEGIN IDS_NEWEXT_SPECIFY_EXT "You must specify an extension." IDS_NEWEXT_ALREADY_ASSOC "Extension %s is already associated with File Type %s. Do you want to un-associate %s with %s and create a new File Type for it?" IDS_NEWEXT_EXT_IN_USE "Extension is in use" + + IDS_REMOVE_EXT "If you remove a registered file name extension, you will not be able to open files with this extension by double-clicking their icons.\n\nAre you sure you want to remove this extension?" END diff --git a/dll/win32/shell32/lang/tr-TR.rc b/dll/win32/shell32/lang/tr-TR.rc index 8bfc5be38f..d54c399302 100644 --- a/dll/win32/shell32/lang/tr-TR.rc +++ b/dll/win32/shell32/lang/tr-TR.rc @@ -901,4 +901,6 @@ BEGIN IDS_NEWEXT_SPECIFY_EXT "You must specify an extension." IDS_NEWEXT_ALREADY_ASSOC "Extension %s is already associated with File Type %s. Do you want to un-associate %s with %s and create a new File Type for it?" IDS_NEWEXT_EXT_IN_USE "Extension is in use" + + IDS_REMOVE_EXT "If you remove a registered file name extension, you will not be able to open files with this extension by double-clicking their icons.\n\nAre you sure you want to remove this extension?" END diff --git a/dll/win32/shell32/lang/uk-UA.rc b/dll/win32/shell32/lang/uk-UA.rc index e821dde925..1ff6fba8c8 100644 --- a/dll/win32/shell32/lang/uk-UA.rc +++ b/dll/win32/shell32/lang/uk-UA.rc @@ -899,4 +899,6 @@ BEGIN IDS_NEWEXT_SPECIFY_EXT "You must specify an extension." IDS_NEWEXT_ALREADY_ASSOC "Extension %s is already associated with File Type %s. Do you want to un-associate %s with %s and create a new File Type for it?" IDS_NEWEXT_EXT_IN_USE "Extension is in use" + + IDS_REMOVE_EXT "If you remove a registered file name extension, you will not be able to open files with this extension by double-clicking their icons.\n\nAre you sure you want to remove this extension?" END diff --git a/dll/win32/shell32/lang/zh-CN.rc b/dll/win32/shell32/lang/zh-CN.rc index e51e1b01e2..c32e28828c 100644 --- a/dll/win32/shell32/lang/zh-CN.rc +++ b/dll/win32/shell32/lang/zh-CN.rc @@ -909,4 +909,6 @@ BEGIN IDS_NEWEXT_SPECIFY_EXT "You must specify an extension." IDS_NEWEXT_ALREADY_ASSOC "Extension %s is already associated with File Type %s. Do you want to un-associate %s with %s and create a new File Type for it?" IDS_NEWEXT_EXT_IN_USE "Extension is in use" + + IDS_REMOVE_EXT "If you remove a registered file name extension, you will not be able to open files with this extension by double-clicking their icons.\n\nAre you sure you want to remove this extension?" END diff --git a/dll/win32/shell32/lang/zh-TW.rc b/dll/win32/shell32/lang/zh-TW.rc index e0bb30c924..60aa2e7eb8 100644 --- a/dll/win32/shell32/lang/zh-TW.rc +++ b/dll/win32/shell32/lang/zh-TW.rc @@ -907,4 +907,6 @@ BEGIN IDS_NEWEXT_SPECIFY_EXT "You must specify an extension." IDS_NEWEXT_ALREADY_ASSOC "Extension %s is already associated with File Type %s. Do you want to un-associate %s with %s and create a new File Type for it?" IDS_NEWEXT_EXT_IN_USE "Extension is in use" + + IDS_REMOVE_EXT "If you remove a registered file name extension, you will not be able to open files with this extension by double-clicking their icons.\n\nAre you sure you want to remove this extension?" END diff --git a/dll/win32/shell32/shresdef.h b/dll/win32/shell32/shresdef.h index decbc120fc..0014ec2bfa 100644 --- a/dll/win32/shell32/shresdef.h +++ b/dll/win32/shell32/shresdef.h @@ -266,6 +266,8 @@ #define IDS_NEWEXT_ALREADY_ASSOC 30520 #define IDS_NEWEXT_EXT_IN_USE 30521 +#define IDS_REMOVE_EXT 30522 + /* Dialogs */ /* Run dialog */

1 0

01/01: [SETUPAPI] Add CM_Free_Resource_Conflict_Handle and CM_Query_Resource_Conflict_List stubs
by Eric Kohl 19 May '18

19 May '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d7e40954d53f225d40730… commit d7e40954d53f225d4073089e0bb06134b54cccb4 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sat May 19 15:11:17 2018 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sat May 19 15:14:30 2018 +0200 [SETUPAPI] Add CM_Free_Resource_Conflict_Handle and CM_Query_Resource_Conflict_List stubs --- dll/win32/setupapi/cfgmgr.c | 36 ++++++++++++++++++++++++++++++++++++ dll/win32/setupapi/setupapi.spec | 4 ++-- 2 files changed, 38 insertions(+), 2 deletions(-) diff --git a/dll/win32/setupapi/cfgmgr.c b/dll/win32/setupapi/cfgmgr.c index 3a6c2e94b3..0bedd944e9 100644 --- a/dll/win32/setupapi/cfgmgr.c +++ b/dll/win32/setupapi/cfgmgr.c @@ -2233,6 +2233,20 @@ CM_Free_Res_Des_Handle( } +/*********************************************************************** + * CM_Free_Resource_Conflict_Handle [SETUPAPI.@] + */ +CONFIGRET +WINAPI +CM_Free_Resource_Conflict_Handle( + _In_ CONFLICT_LIST clConflictList) +{ + FIXME("CM_Free_Resource_Conflict_Handle(%p)\n", clConflictList); + + return CR_CALL_NOT_IMPLEMENTED; +} + + /*********************************************************************** * CM_Get_Child [SETUPAPI.@] */ @@ -6459,6 +6473,28 @@ CM_Query_Remove_SubTree_Ex( } +/*********************************************************************** + * CM_Query_Resource_Conflict_List [SETUPAPI.@] + */ +CONFIGRET +WINAPI +CM_Query_Resource_Conflict_List( + _Out_ PCONFLICT_LIST pclConflictList, + _In_ DEVINST dnDevInst, + _In_ RESOURCEID ResourceID, + _In_ PCVOID ResourceData, + _In_ ULONG ResourceLen, + _In_ ULONG ulFlags, + _In_opt_ HMACHINE hMachine) +{ + FIXME("CM_Query_Resource_Conflict_List(%p %lx %lu %p %lu %lx %p)\n", + pclConflictList, dnDevInst, ResourceID, ResourceData, + ResourceLen, ulFlags, hMachine); + + return CR_CALL_NOT_IMPLEMENTED; +} + + /*********************************************************************** * CM_Reenumerate_DevNode [SETUPAPI.@] */ diff --git a/dll/win32/setupapi/setupapi.spec b/dll/win32/setupapi/setupapi.spec index a3dab530a7..e3db70232a 100644 --- a/dll/win32/setupapi/setupapi.spec +++ b/dll/win32/setupapi/setupapi.spec @@ -51,7 +51,7 @@ @ stdcall CM_Free_Res_Des(ptr ptr long) @ stdcall CM_Free_Res_Des_Ex(ptr ptr long ptr) @ stdcall CM_Free_Res_Des_Handle(ptr) -@ stub CM_Free_Resource_Conflict_Handle +@ stdcall CM_Free_Resource_Conflict_Handle(ptr) @ stdcall CM_Get_Child(ptr long long) @ stdcall CM_Get_Child_Ex(ptr long long ptr) @ stdcall CM_Get_Class_Key_NameA(ptr str ptr long) @@ -165,7 +165,7 @@ @ stdcall CM_Query_Arbitrator_Free_Size_Ex(ptr long long long ptr) @ stdcall CM_Query_Remove_SubTree(long long) @ stdcall CM_Query_Remove_SubTree_Ex(long long ptr) -@ stub CM_Query_Resource_Conflict_List +@ stdcall CM_Query_Resource_Conflict_List(ptr long long ptr long long ptr) @ stdcall CM_Reenumerate_DevNode(long long) @ stdcall CM_Reenumerate_DevNode_Ex(long long ptr) @ stdcall CM_Register_Device_Driver(long long)

1 0

01/01: [FASTFAT] Addendum to d69f318
by Pierre Schweitzer 19 May '18

19 May '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7283f3cfd91e9c8c5fa2e… commit 7283f3cfd91e9c8c5fa2eda82ce0238127c0dc2d Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sat May 19 13:45:56 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sat May 19 13:46:34 2018 +0200 [FASTFAT] Addendum to d69f318 --- drivers/filesystems/fastfat/dirwr.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/filesystems/fastfat/dirwr.c b/drivers/filesystems/fastfat/dirwr.c index 4237d01909..cffc7af031 100644 --- a/drivers/filesystems/fastfat/dirwr.c +++ b/drivers/filesystems/fastfat/dirwr.c @@ -29,7 +29,6 @@ vfatFCBInitializeCacheFromVolume( PVFATCCB newCCB; NTSTATUS status; BOOLEAN Acquired; - NTSTATUS Status; /* Don't re-initialize if already done */ if (BooleanFlagOn(fcb->Flags, FCB_CACHE_INITIALIZED)) @@ -59,7 +58,7 @@ vfatFCBInitializeCacheFromVolume( newCCB = ExAllocateFromNPagedLookasideList(&VfatGlobalData->CcbLookasideList); if (newCCB == NULL) { - Status = STATUS_INSUFFICIENT_RESOURCES; + status = STATUS_INSUFFICIENT_RESOURCES; ObDereferenceObject(fileObject); goto Quit; } @@ -95,7 +94,7 @@ vfatFCBInitializeCacheFromVolume( vfatGrabFCB(vcb, fcb); SetFlag(fcb->Flags, FCB_CACHE_INITIALIZED); - Status = STATUS_SUCCESS; + status = STATUS_SUCCESS; Quit: if (Acquired) @@ -103,7 +102,7 @@ Quit: ExReleaseResourceLite(&vcb->DirResource); } - return Status; + return status; } /*

1 0

01/01: [USETUP] Use _wcstoui64() instead of atoi() to convert the partition size in order to prevent unexpected misinterpretation of leading zeroes.
by Eric Kohl 19 May '18

19 May '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=de824808b70cd88a0d04b… commit de824808b70cd88a0d04bf8b13e2f86832eba08c Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sat May 19 13:30:20 2018 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sat May 19 13:33:28 2018 +0200 [USETUP] Use _wcstoui64() instead of atoi() to convert the partition size in order to prevent unexpected misinterpretation of leading zeroes. --- base/setup/usetup/usetup.c | 56 +++++++++++++++++++++------------------------- 1 file changed, 26 insertions(+), 30 deletions(-) diff --git a/base/setup/usetup/usetup.c b/base/setup/usetup/usetup.c index b702815cae..d29f15d57c 100644 --- a/base/setup/usetup/usetup.c +++ b/base/setup/usetup/usetup.c @@ -1766,7 +1766,7 @@ ShowPartitionSizeInputBox(SHORT Left, SHORT Right, SHORT Bottom, ULONG MaxSize, - PCHAR InputBuffer, + PWSTR InputBuffer, PBOOLEAN Quit, PBOOLEAN Cancel) { @@ -1774,8 +1774,7 @@ ShowPartitionSizeInputBox(SHORT Left, COORD coPos; DWORD Written; CHAR Buffer[128]; - WCHAR PartitionSizeBuffer[100]; - ULONG Length, Pos; + INT Length, Pos; WCHAR ch; SHORT iLeft; SHORT iTop; @@ -1810,13 +1809,13 @@ ShowPartitionSizeInputBox(SHORT Left, coPos, &Written); - swprintf(PartitionSizeBuffer, L"%lu", MaxSize); - Length = wcslen(PartitionSizeBuffer); + swprintf(InputBuffer, L"%lu", MaxSize); + Length = wcslen(InputBuffer); Pos = Length; CONSOLE_SetInputTextXY(iLeft, iTop, PARTITION_SIZE_INPUT_FIELD_LENGTH, - PartitionSizeBuffer); + InputBuffer); CONSOLE_SetCursorXY(iLeft + Length, iTop); CONSOLE_SetCursorType(TRUE, TRUE); @@ -1830,7 +1829,7 @@ ShowPartitionSizeInputBox(SHORT Left, if (Quit != NULL) *Quit = TRUE; - PartitionSizeBuffer[0] = UNICODE_NULL; + InputBuffer[0] = UNICODE_NULL; CONSOLE_SetCursorType(TRUE, FALSE); break; } @@ -1844,7 +1843,7 @@ ShowPartitionSizeInputBox(SHORT Left, if (Cancel != NULL) *Cancel = TRUE; - PartitionSizeBuffer[0] = UNICODE_NULL; + InputBuffer[0] = UNICODE_NULL; CONSOLE_SetCursorType(TRUE, FALSE); break; } @@ -1883,16 +1882,16 @@ ShowPartitionSizeInputBox(SHORT Left, { if (Pos < Length) { - memmove(&PartitionSizeBuffer[Pos], - &PartitionSizeBuffer[Pos + 1], + memmove(&InputBuffer[Pos], + &InputBuffer[Pos + 1], (Length - Pos - 1) * sizeof(WCHAR)); - PartitionSizeBuffer[Length - 1] = UNICODE_NULL; + InputBuffer[Length - 1] = UNICODE_NULL; Length--; CONSOLE_SetInputTextXY(iLeft, iTop, PARTITION_SIZE_INPUT_FIELD_LENGTH, - PartitionSizeBuffer); + InputBuffer); CONSOLE_SetCursorXY(iLeft + Pos, iTop); } } @@ -1901,17 +1900,17 @@ ShowPartitionSizeInputBox(SHORT Left, if (Pos > 0) { if (Pos < Length) - memmove(&PartitionSizeBuffer[Pos - 1], - &PartitionSizeBuffer[Pos], + memmove(&InputBuffer[Pos - 1], + &InputBuffer[Pos], (Length - Pos) * sizeof(WCHAR)); - PartitionSizeBuffer[Length - 1] = UNICODE_NULL; + InputBuffer[Length - 1] = UNICODE_NULL; Pos--; Length--; CONSOLE_SetInputTextXY(iLeft, iTop, PARTITION_SIZE_INPUT_FIELD_LENGTH, - PartitionSizeBuffer); + InputBuffer); CONSOLE_SetCursorXY(iLeft + Pos, iTop); } } @@ -1924,26 +1923,23 @@ ShowPartitionSizeInputBox(SHORT Left, if ((ch >= L'0') && (ch <= L'9')) { if (Pos < Length) - memmove(&PartitionSizeBuffer[Pos + 1], - &PartitionSizeBuffer[Pos], + memmove(&InputBuffer[Pos + 1], + &InputBuffer[Pos], (Length - Pos) * sizeof(WCHAR)); - PartitionSizeBuffer[Length + 1] = UNICODE_NULL; - PartitionSizeBuffer[Pos] = ch; + InputBuffer[Length + 1] = UNICODE_NULL; + InputBuffer[Pos] = ch; Pos++; Length++; CONSOLE_SetInputTextXY(iLeft, iTop, PARTITION_SIZE_INPUT_FIELD_LENGTH, - PartitionSizeBuffer); + InputBuffer); CONSOLE_SetCursorXY(iLeft + Pos, iTop); } } } } - - /* Convert UNICODE --> ANSI the poor man's way */ - sprintf(InputBuffer, "%S", PartitionSizeBuffer); } @@ -1965,7 +1961,7 @@ CreatePrimaryPartitionPage(PINPUT_RECORD Ir) PPARTENTRY PartEntry; BOOLEAN Quit; BOOLEAN Cancel; - CHAR InputBuffer[50]; + WCHAR InputBuffer[50]; ULONG MaxSize; ULONGLONG PartSize; ULONGLONG DiskSize; @@ -2061,7 +2057,7 @@ CreatePrimaryPartitionPage(PINPUT_RECORD Ir) } else { - PartSize = atoi(InputBuffer); + PartSize = _wcstoui64(InputBuffer, NULL, 10); if (PartSize < 1) { @@ -2122,7 +2118,7 @@ CreateExtendedPartitionPage(PINPUT_RECORD Ir) PPARTENTRY PartEntry; BOOLEAN Quit; BOOLEAN Cancel; - CHAR InputBuffer[50]; + WCHAR InputBuffer[50]; ULONG MaxSize; ULONGLONG PartSize; ULONGLONG DiskSize; @@ -2218,7 +2214,7 @@ CreateExtendedPartitionPage(PINPUT_RECORD Ir) } else { - PartSize = atoi(InputBuffer); + PartSize = _wcstoui64(InputBuffer, NULL, 10); if (PartSize < 1) { @@ -2278,7 +2274,7 @@ CreateLogicalPartitionPage(PINPUT_RECORD Ir) PPARTENTRY PartEntry; BOOLEAN Quit; BOOLEAN Cancel; - CHAR InputBuffer[50]; + WCHAR InputBuffer[50]; ULONG MaxSize; ULONGLONG PartSize; ULONGLONG DiskSize; @@ -2374,7 +2370,7 @@ CreateLogicalPartitionPage(PINPUT_RECORD Ir) } else { - PartSize = atoi(InputBuffer); + PartSize = _wcstoui64(InputBuffer, NULL, 10); if (PartSize < 1) {

1 0

01/01: [TRANSLATION] Polish translation update (#554)
by Adam Słaboń 19 May '18

19 May '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=72ad0fe70b4110f6264b2… commit 72ad0fe70b4110f6264b27a084efb32eed953a92 Author: Adam Słaboń <asaillen456esx(a)gmail.com> AuthorDate: Sat May 19 13:17:49 2018 +0200 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Sat May 19 13:17:49 2018 +0200 [TRANSLATION] Polish translation update (#554) - Added translations for cmdutils (at, clip, comp, eventcreate, mode, taskkill, wmic) and zipfldr. - Updated translations for cmdutils (reg), drwtsn32, mmc, eventvwr, shell32 and cpl applets (console, input). --- base/applications/cmdutils/at/at.rc | 3 + base/applications/cmdutils/at/lang/pl-PL.rc | 56 +++++++++++++++++ base/applications/cmdutils/clip/clip.rc | 3 + base/applications/cmdutils/clip/lang/pl-PL.rc | 9 +++ base/applications/cmdutils/comp/comp.rc | 3 + base/applications/cmdutils/comp/lang/pl-PL.rc | 23 +++++++ .../cmdutils/eventcreate/eventcreate.rc | 3 + .../cmdutils/eventcreate/lang/pl-PL.rc | 72 ++++++++++++++++++++++ base/applications/cmdutils/mode/lang/pl-PL.rc | 68 ++++++++++++++++++++ base/applications/cmdutils/mode/mode.rc | 3 + base/applications/cmdutils/reg/lang/pl-PL.rc | 56 ++++++++--------- base/applications/cmdutils/taskkill/lang/pl-PL.rc | 19 ++++++ base/applications/cmdutils/taskkill/taskkill.rc | 3 + base/applications/cmdutils/wmic/lang/pl-PL.rc | 9 +++ base/applications/cmdutils/wmic/wmic.rc | 3 + base/applications/drwtsn32/lang/pl-PL.rc | 2 +- base/applications/mmc/lang/pl-PL.rc | 6 +- base/applications/mscutils/eventvwr/lang/pl-PL.rc | 44 ++++++------- dll/cpl/console/lang/pl-PL.rc | 4 +- dll/cpl/input/lang/pl-PL.rc | 2 +- dll/shellext/zipfldr/lang/pl-PL.rc | 70 +++++++++++++++++++++ dll/shellext/zipfldr/zipfldr.rc | 3 + dll/win32/shell32/lang/pl-PL.rc | 22 +++---- 23 files changed, 418 insertions(+), 68 deletions(-) diff --git a/base/applications/cmdutils/at/at.rc b/base/applications/cmdutils/at/at.rc index 8d6bfd0f8d..f36c371944 100644 --- a/base/applications/cmdutils/at/at.rc +++ b/base/applications/cmdutils/at/at.rc @@ -15,6 +15,9 @@ #ifdef LANGUAGE_EN_US #include "lang/en-US.rc" #endif +#ifdef LANGUAGE_PL_PL + #include "lang/pl-PL.rc" +#endif #ifdef LANGUAGE_RO_RO #include "lang/ro-RO.rc" #endif diff --git a/base/applications/cmdutils/at/lang/pl-PL.rc b/base/applications/cmdutils/at/lang/pl-PL.rc new file mode 100644 index 0000000000..199c863a98 --- /dev/null +++ b/base/applications/cmdutils/at/lang/pl-PL.rc @@ -0,0 +1,56 @@ +LANGUAGE LANG_POLISH, SUBLANG_DEFAULT + +STRINGTABLE +BEGIN + IDS_USAGE "Polecenia i programy usługi planowania poleceń AT do uruchomienia na\n\ +komputerze o określonej godzinie i dacie. Usługa Harmonogram musi być\n\ +uruchomiona, aby używać poleceń AT.\n\n\ +AT [\\\\nazwa_komputera] [ [id] [/DELETE] | /DELETE [/YES]]\n\ +AT [\\\\nazwa_komputera] godzina [/INTERACTIVE]\n\ + [ /EVERY:data[,...] | /NEXT:data[,...]] ""polecenie""\n\n\ +\\\\nazwa_komputera Określa komputer zdalny. Polecenia są zaplanowane w \n\ + komputerze lokalnym, jeśli ten parametr jest pominięty.\n\ +id Jest numerem identyfikacyjnym przyporządkowanym do\n\ + zaplanowanego polecenia.\n\ +/DELETE Anuluje zaplanowane polecenie. Jeśli jest pominięte,\n\ + wszystkie zaplanowane polecenia w komputerze są anulowane.\n\ +/YES Używa się przy anulowaniu wszystkich zadań, gdy nie jest\n\ + wymagane potwierdzenie.\n\ +time Określa godzinę wykonania polecenia.\n\ +/INTERACTIVE Zezwala, aby zadanie współdziałało z zadaniami użytkownika,\n\ + który jest zalogowany wówczas, gdy jest ono uruchomione.\n\ +/EVERY:date[,...] Uruchamia polecenie w każdym określonym dniu tygodnia lub\n\ + miesiąca. Jeśli data jest pominięta, przyjmowany jest\n\ + bieżący dzień miesiąca.\n\ +/NEXT:date[,...] Uruchamia określone polecenie przy następnym wystąpieniu\n\ + dnia (np. w następny czwartek). Jeśli data jest pominięta, \n\ + przyjmowany jest bieżący dzień miesiąca.\n\ +""command"" Polecenie lub program wsadowy do uruchomienia.\n" + + IDS_DELETE_ALL "Ta operacja usunie wszystkie zaplanowane zadania.\n" + IDS_NEW_JOB "Dodano nowe zadanie o identyfikatorze = %lu\n" + IDS_JOBS_LIST "ID stanu Dzień Godzina Wiersz polecenia\n" + IDS_NO_ENTRIES "Na liście nie ma żadnych wpisów.\n" + + IDS_CONFIRM_QUESTION "Czy chcesz kontynuować wykonwyanie tej operacji? (T/N) [N]: " + IDS_CONFIRM_INVALID "\nNieprawidłowe polecenie.\n" + IDS_CONFIRM_YES "T" + IDS_CONFIRM_NO "N" + + IDS_TODAY "Dzisiaj" + IDS_TOMORROW "Jutro" + IDS_EVERY "Każdy" + IDS_NEXT "Nast." + + IDS_YES "Tak" + IDS_NO "Nie" + IDS_ERROR "BŁĄD" + IDS_OK "OK" + + IDS_TASKID "Identyfikator zadania: %lu\n" + IDS_STATUS "Stan: %s\n" + IDS_SCHEDULE "Harmonogram: %s\n" + IDS_TIME "Pora dnia: %s\n" + IDS_INTERACTIVE "Interaktywne: %s\n" + IDS_COMMAND "Polecenie: %s\n" +END diff --git a/base/applications/cmdutils/clip/clip.rc b/base/applications/cmdutils/clip/clip.rc index f919e7e69d..8fe786e38d 100644 --- a/base/applications/cmdutils/clip/clip.rc +++ b/base/applications/cmdutils/clip/clip.rc @@ -24,6 +24,9 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #ifdef LANGUAGE_FR_FR #include "lang/fr-FR.rc" #endif +#ifdef LANGUAGE_PL_PL + #include "lang/pl-PL.rc" +#endif #ifdef LANGUAGE_RO_RO #include "lang/ro-RO.rc" #endif diff --git a/base/applications/cmdutils/clip/lang/pl-PL.rc b/base/applications/cmdutils/clip/lang/pl-PL.rc new file mode 100644 index 0000000000..63fbd70d0e --- /dev/null +++ b/base/applications/cmdutils/clip/lang/pl-PL.rc @@ -0,0 +1,9 @@ +LANGUAGE LANG_POLISH, SUBLANG_DEFAULT + +STRINGTABLE +BEGIN + IDS_USAGE "\nWpisz ""CLIP /?"", aby zobaczyć sposób użycia.\n" + IDS_HELP "\nPrzekierowuje dane wyjściowe aplikacji konsolowych do schowka.\n\n\ +CLIP [/?]\n\n\ + /? Wyświetla tę pomoc/sposób użycia.\n" +END diff --git a/base/applications/cmdutils/comp/comp.rc b/base/applications/cmdutils/comp/comp.rc index 805477c2a4..fd687e93c8 100644 --- a/base/applications/cmdutils/comp/comp.rc +++ b/base/applications/cmdutils/comp/comp.rc @@ -18,6 +18,9 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #ifdef LANGUAGE_FR_FR #include "lang/fr-FR.rc" #endif +#ifdef LANGUAGE_PL_PL + #include "lang/pl-PL.rc" +#endif #ifdef LANGUAGE_RO_RO #include "lang/ro-RO.rc" #endif diff --git a/base/applications/cmdutils/comp/lang/pl-PL.rc b/base/applications/cmdutils/comp/lang/pl-PL.rc new file mode 100644 index 0000000000..05d90fb559 --- /dev/null +++ b/base/applications/cmdutils/comp/lang/pl-PL.rc @@ -0,0 +1,23 @@ +LANGUAGE LANG_POLISH, SUBLANG_DEFAULT + +STRINGTABLE +BEGIN + IDS_HELP "Porównuje zawartość dwóch plików lub zestawów plików.\n\n\ +COMP [/L] [/A] [data1] [data2]\n\n\ + data1 Określa lokalizację i nazwę pierwszego pliku do porównania.\n\ + data2 Określa lokalizację i nazwę drugiego pliku do porównania.\n\ + /A Pokazuje różnice w znakach ASCII (domyślnie: szesnastkowo).\n\ + /L Pokazuje numery wierszów dla różnic.\n" + IDS_INVALIDSWITCH "Nieprawidłowy przełącznik - /%c\n" + IDS_BADSYNTAX "Nieprawidłowa składnia.\n" + IDS_FILEERROR "Nie można odnaleźć/otworzyć pliku: %s\n" + IDS_COMPARING "Porównywanie %s i %s...\n" + IDS_FILESIZEERROR "Nie można określić rozmiaru pliku: %s\n" + IDS_SIZEDIFFERS "Pliki mają różne rozmiary.\n" + IDS_READERROR "Błąd odczytu plików.\n" + IDS_MISMATCHLINE "Porównaj błąd w wierszu %d\n" + IDS_MISMATCHOFFSET "Porównaj błąd w offsecie 0x%X\n" + IDS_ASCIIDIFF "plik%d = %c\n" + IDS_HEXADECIMALDIFF "plik%d = %X\n" + IDS_MATCH "Pliki są takie same\n" +END diff --git a/base/applications/cmdutils/eventcreate/eventcreate.rc b/base/applications/cmdutils/eventcreate/eventcreate.rc index d87e9a8ff4..2194aa8037 100644 --- a/base/applications/cmdutils/eventcreate/eventcreate.rc +++ b/base/applications/cmdutils/eventcreate/eventcreate.rc @@ -21,6 +21,9 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #ifdef LANGUAGE_FR_FR #include "lang/fr-FR.rc" #endif +#ifdef LANGUAGE_PL_PL + #include "lang/pl-PL.rc" +#endif #ifdef LANGUAGE_RO_RO #include "lang/ro-RO.rc" #endif diff --git a/base/applications/cmdutils/eventcreate/lang/pl-PL.rc b/base/applications/cmdutils/eventcreate/lang/pl-PL.rc new file mode 100644 index 0000000000..c3bdc170bb --- /dev/null +++ b/base/applications/cmdutils/eventcreate/lang/pl-PL.rc @@ -0,0 +1,72 @@ +LANGUAGE LANG_POLISH, SUBLANG_DEFAULT + +STRINGTABLE +BEGIN + IDS_USAGE "Wpisz ""EVENTCREATE /?"", aby zobaczyć sposób użycia.\n" + IDS_HELP "\n\ +EVENTCREATE [/S komputer [/U [domena\\]użytkownik [/P hasło]]] /ID EventID\n\ + {[/L nazwa_domeny] | [/SO źródło]} /T typ /C kategoria /D opis\n\ +\n\ +Opis:\n\ + To narzędzie wiersza polecenia umożliwia administratorowi tworzenie\n\ + niestandardowego identyfikatora i komunikatu zdarzenia w określonym\n\ + dzienniku zdarzeń.\n\ +\n\ +Lista parametrów:\n\ + /S komputer Określa system komputer do podłączenia.\n\ +\n\ + /U [domena\\]użytk Określa kontekst użytkownika, w którym\n\ + polecenie powinno być wykonane.\n\ +\n\ + /P [hasło] Określa hasło dla danego.\n\ + kontekstu użytkownika. W razie pominięcia monituje\n\ + o podanie danych.\n\ +\n\ + /L nazwa_dziennika Określa dziennik zdarzeń, w którym ma być\n\ + utworzone zdarzenie. Prawidłowe nazwy to:\n\ + Application, System, Security\n\ + (ostatnia jest zarezerwowana tylko dla konta SYSTEM).\n\ +\n\ + /SO źródło Określa nazwę źródła do użycia dla zdarzenia.\n\ + (jeśli nie zostanie określona, domyślną nazwą żródła\n\ + będzie 'eventcreate').\n\ + Prawidłowe źródło może być dowolnym ciągiem\n\ + i powinno reprezentować aplikację lub składnik\n\ + generujący zdarzenie.\n\ +\n\ + /T typ Określa typ zdarzenia do utworzenia.\n\ + Prawidłowe typy: SUCCESS, ERROR, WARNING,\n\ + INFORMATION.\n\ +\n\ + /C kategoria Określa kategorię zdarzenia (liczba całkowita)\n\ + dla zdarzenia.\n\ +\n\ + /ID EventID Określa identyfikator zdarzenia dla zdarzenia. \n\ + Musi to być liczba całkowita z zakresu od 0 do 65535.\n\ +\n\ + /D opis Określa opis, jaki ma być ustawiony\n\ + dla tworzonego zdarzenia.\n\ +\n\ + /? Wyświetla tę pomoc/sposób użycia.\n\ +" + IDS_INVALIDSWITCH "Nieprawidłowy przełącznik - '%s'.\n" + IDS_BADSYNTAX_0 "Nieprawidłowa składnia.\n" + IDS_BADSYNTAX_1 "Nieprawidłowa składnia. Oczekiwano wartości dla '%s'.\n" + IDS_BADSYNTAX_2 "Nieprawidłowa składnia. Wartość dla opcji '%s' nie może być pusta.\n" + IDS_BADSYNTAX_3 "Nieprawidłowa składnia. Wartość '%s' nie jest dozwolona dla opcji '%s'.\n" + IDS_BADSYNTAX_4 "Nieprawidłowa składnia. Wartość nie może być określona dla opcji '%s'.\n" + IDS_BADSYNTAX_5 "Nieprawidłowa składnia. Opcja '%s' nie jest dozwolona więcej niż %lu razy.\n" + IDS_BADSYNTAX_6 "Nieprawidłowa składnia. Brak obowiązkowej opcji '%s'.\n" + // IDS_BADSYNTAX_7 "Nieprawidłowa składnia. Wartość dla opcji '%s' jest poza dozwolonym zakresem.\n" + IDS_BADSYNTAX_7 "Nieprawidłowa składnia. Wartość dla opcji '%s' musi być z zakresu od %d do %d.\n" + + IDS_LOG_NOT_FOUND "Dziennik '%s' nie istnieje. Nie można utworzyć zdarzenia.\n" + IDS_SOURCE_NOCREATE "Nowe źródło można utworzyć tylko wtedy, gdy określona jest także nazwa dziennika.\nUżyj przełącznika /L, aby określić nazwę dziennika.\n" + IDS_SOURCE_EXISTS "Źródło już istnieje w dzienniku '%s'. Źródło nie może duplikowane.\n" + IDS_SOURCE_NOT_CUSTOM "Parametr źródłowy jest używany tylko do identyfikowania niestandardowych aplikacji/skryptów\n(źródła niewbudowane).\n" + + IDS_SUCCESS_1 "Sukces: Zdarzenie typu '%s' jest utworzone w dzienniku '%s'.\n" + IDS_SUCCESS_2 "Sukces: Zdarzenie typu '%s' jest utworzone ze źródłem '%s'.\n" + IDS_SUCCESS_3 "Sukces: Zdarzenie typu '%s' jest utworzone\nw dzienniku '%s' ze źródłem '%s'.\n" + IDS_SWITCH_UNIMPLEMENTED "Opcja '%s' nie jest obecnie obsługiwana, przepraszamy za niedogodności!\n" +END diff --git a/base/applications/cmdutils/mode/lang/pl-PL.rc b/base/applications/cmdutils/mode/lang/pl-PL.rc new file mode 100644 index 0000000000..05dc62c948 --- /dev/null +++ b/base/applications/cmdutils/mode/lang/pl-PL.rc @@ -0,0 +1,68 @@ +LANGUAGE LANG_POLISH, SUBLANG_DEFAULT + +STRINGTABLE +BEGIN + IDS_USAGE "Konfiguruje urządzenia systemowe.\n\n\ +Stan urządzenia: MODE [urządzenie] [/STATUS]\n\ +Port szeregowy: MODE COMm[:] [BAUD=b] [PARITY=p] [DATA=d] [STOP=s]\n\ + [to=on|off] [xon=on|off] [odsr=on|off]\n\ + [octs=on|off] [dtr=on|off|hs]\n\ + [rts=on|off|hs|tg] [idsr=on|off]\n\ +Readresowanie drukowania: MODE LPTn[:]=COMm[:]\n\ +Wybór strony kodowej: MODE CON[:] CP SELECT=yyy\n\ +Stan strony kodowej: MODE CON[:] CP [/STATUS]\n\ +Tryb wyświetlania: MODE CON[:] [COLS=c] [LINES=n]\n\ +Szybkość powtarzania klawiatury: MODE CON[:] [RATE=r DELAY=d]\n" + + IDS_QUERY_SERIAL_FOUND " Znaleziono urządzenie szeregowe - %s\n" + IDS_QUERY_PRINTER_FOUND " Znaleziono urządzenie drukujące - %s\n" + IDS_QUERY_PARALLEL_FOUND " Znaleziono urządzenie równoległe - %s\n" + IDS_QUERY_DOSDEV_FOUND " Znaleziono urządzenie DOS - %s\n" + // IDS_QUERY_MISC_FOUND " Znaleziono inne urządzenie - %s\n" + + // IDS_QUERY_DEVICE_FOUND " Znaleziono %s urządzenie - %s\n" + // IDS_SERIAL "szeregowe" + // IDS_PRINTER "równoległe" + // IDS_OTHER "inne" +END + +STRINGTABLE +BEGIN + IDS_DEVICE_STATUS_HEADER "Stan urządzenia %s:" + + IDS_COM_STATUS_BAUD " Współczynnik modulacji: %ld\n" + IDS_COM_STATUS_PARITY " Parzystość: %s\n" + IDS_COM_STATUS_DATA_BITS " Bity danych: %d\n" + IDS_COM_STATUS_STOP_BITS " Bity separatora: %s\n" + IDS_COM_STATUS_TIMEOUT " Limit czasu oczekiwania: %s\n" + IDS_COM_STATUS_XON_XOFF " XON/XOFF: %s\n" + IDS_COM_STATUS_CTS_HANDSHAKING " CTS handshaking: %s\n" + IDS_COM_STATUS_DSR_HANDSHAKING " DSR handshaking: %s\n" + IDS_COM_STATUS_DSR_SENSITIVITY " Czułość DSR: %s\n" + IDS_COM_STATUS_DTR_CIRCUIT " Obwód DTR: %s\n" + IDS_COM_STATUS_RTS_CIRCUIT " Obwód RTS: %s\n" + + IDS_CONSOLE_STATUS_LINES " Wiersze: %d\n" + IDS_CONSOLE_STATUS_COLS " Kolumny: %d\n" + IDS_CONSOLE_KBD_RATE " Szybkość powtarzania klawiatury: %ld\n" + IDS_CONSOLE_KBD_DELAY " Opóźnienie klawiatury: %ld\n" + IDS_CONSOLE_CODEPAGE " Strona kodowa: %d\n" + + IDS_PRINTER_OUTPUT_NOT_REROUTED " Dane wyjściowe drukarki nie są przekierowywane.\n" + IDS_PRINTER_OUTPUT_REROUTED_SERIAL " Dane wyjściowe drukarki są przekierowywane na port szeregowy %s.\n" +END + +STRINGTABLE +BEGIN + IDS_ERROR_QUERY_DEVICES "BŁĄD: nie można wysłać zapytania do urządzeń DOS (0x%lx).\n" + IDS_ERROR_QUERY_DEVICES_FORM " QueryDosDeviceW(%s) zwrócił nierozpoznaną formę %s.\n" + IDS_ERROR_SET_PARALLEL_STATE "SetParallelState(%d) - DefineDosDevice(%s) (0x%lx)\n" + IDS_ERROR_INVALID_PARAMETER "BŁĄD: Nieprawidłowy parametr - %s\n" + IDS_ERROR_ILLEGAL_DEVICE_NAME "BŁĄD: Niedozwolona nazwa urządzenia - %s (0x%lx)\n" + IDS_ERROR_STATUS_GET_DEVICE "BŁĄD: Nie udało się uzyskać stanu urządzenia COM%d:\n" + IDS_ERROR_STATUS_SET_DEVICE "BŁĄD: Nie można ustawić stanu urządzenia COM%d:\n" + IDS_ERROR_INVALID_PARITY_BITS "BŁĄD: Nieprawidłowa wartość dla parzystości bitów %d:\n" + IDS_ERROR_INVALID_STOP_BITS "BŁĄD: Nieprawidłowa wartość dla bitów separatora %d:\n" + IDS_ERROR_NO_MEMORY "BŁĄD: Za mało pamięci.\n" + IDS_ERROR_SCREEN_LINES_COL "BŁĄD: Nie można ustawić ekranu na określoną liczbę wierszy i kolumn.\n" +END diff --git a/base/applications/cmdutils/mode/mode.rc b/base/applications/cmdutils/mode/mode.rc index c278b4186a..bb13a537ad 100644 --- a/base/applications/cmdutils/mode/mode.rc +++ b/base/applications/cmdutils/mode/mode.rc @@ -18,6 +18,9 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #ifdef LANGUAGE_EN_US #include "lang/en-US.rc" #endif +#ifdef LANGUAGE_PL_PL + #include "lang/pl-PL.rc" +#endif #ifdef LANGUAGE_RO_RO #include "lang/ro-RO.rc" #endif diff --git a/base/applications/cmdutils/reg/lang/pl-PL.rc b/base/applications/cmdutils/reg/lang/pl-PL.rc index 117d50ce4b..3f587fc57c 100644 --- a/base/applications/cmdutils/reg/lang/pl-PL.rc +++ b/base/applications/cmdutils/reg/lang/pl-PL.rc @@ -2,7 +2,7 @@ LANGUAGE LANG_POLISH, SUBLANG_DEFAULT STRINGTABLE { - STRING_USAGE, "Usage:\n REG [operation] [parameters]\n\nSupported operations:\n ADD | DELETE | IMPORT | EXPORT | QUERY\n\nFor help on a specific operation, type:\n REG [operation] /?\n\n" + STRING_USAGE, "Sposób użycia:\n REG [operacja] [parametry]\n\nWspierane operacje:\n ADD | DELETE | IMPORT | EXPORT | QUERY\n\nAby uzyskać pomoc dotyczącą określonej operacji, wpisz:\n REG [operacja] /?\n\n" STRING_ADD_USAGE, "REG ADD nazwa_klucza [/v nazwa_wartości | /ve] [/t typ] [/s separator] [/d dane] [/f]\n" STRING_DELETE_USAGE, "REG DELETE nazwa_klucza [/v nazwa_wartości | /ve | /va] [/f]\n" STRING_QUERY_USAGE, "REG QUERY nazwa_klucza [/v nazwa_wartości | /ve] [/s]\n" @@ -12,32 +12,32 @@ STRINGTABLE STRING_NO_REMOTE, "Błąd: Nie można dodać kluczy do zdalnej maszyny\n" STRING_CANNOT_FIND, "Błąd: System nie mógł znaleźć podanej wartości lub klucza rejestru\n" STRING_UNSUPPORTED_TYPE, "Błąd: Nieobsługiwany typ\n" - STRING_MISSING_INTEGER, "reg: The option [/d] must be followed by a valid integer\n" - STRING_MISSING_HEXDATA, "reg: The option [/d] must be followed by a valid hexadecimal value\n" - STRING_UNHANDLED_TYPE, "reg: Unhandled registry data type [/t 0x%1!x!, /d %2]\n" - STRING_OVERWRITE_VALUE, "The registry value '%1' already exists. Do you want to overwrite it?" - STRING_YESNO, " (Yes|No)" - STRING_YES, "Y" + STRING_MISSING_INTEGER, "reg: Opcja [/d] musi poprzedzona poprawną liczbą całkowita\n" + STRING_MISSING_HEXDATA, "reg: Opcja [/d] musi poprzedzona poprawną wartością szesnastkową\n" + STRING_UNHANDLED_TYPE, "reg: Nieobsługiwany typ danych rejestru [/t 0x%1!x!, /d %2]\n" + STRING_OVERWRITE_VALUE, "Wartość rejestru '%1' już istnieje. Czy chcessz ją zastąpić?" + STRING_YESNO, " (Tak|Nie)" + STRING_YES, "T" STRING_NO, "N" - STRING_CANCELLED, "The registry operation was cancelled\n" - STRING_DEFAULT_VALUE, "(Default)" - STRING_DELETE_VALUE, "Are you sure you want to delete the registry value '%1'?" - STRING_DELETE_VALUEALL, "Are you sure you want to delete all registry values in '%1'?" - STRING_DELETE_SUBKEY, "Are you sure you want to delete the registry key '%1'?" - STRING_INVALID_STRING, "reg: The option [/d] must be followed by a valid string\n" - STRING_VALUEALL_FAILED, "reg: Unable to delete all registry values in '%1'. An unexpected error occurred.\n" - STRING_GENERAL_FAILURE, "reg: Unable to complete the specified operation. An unexpected error occurred.\n" - STRING_MATCHES_FOUND, "Search complete. Number of matches found: %1!d!\n" - STRING_INVALID_SYNTAX, "reg: Invalid syntax. " - STRING_INVALID_OPTION, "reg: Invalid option [%1]. " - STRING_REG_HELP, "Type ""REG /?"" for help.\n" - STRING_FUNC_HELP, "Type ""REG %1 /?"" for help.\n" - STRING_VALUE_NOT_SET, "(value not set)" - STRING_IMPORT_USAGE, "REG IMPORT file.reg\n" - STRING_FILE_NOT_FOUND, "reg: The file '%1' was not found.\n" - STRING_OPEN_KEY_FAILED, "reg: Unable to open the registry key '%1'.\n" - STRING_ESCAPE_SEQUENCE, "reg: Unrecognized escape sequence [\\%1!c!]\n" - STRING_EXPORT_USAGE, "REG EXPORT key_name file.reg [/y]\n" - STRING_INVALID_SYSTEM_KEY, "reg: Invalid system key [%1]\n" - STRING_OVERWRITE_FILE, "The file '%1' already exists. Do you want to overwrite it?" + STRING_CANCELLED, "Operacja rejestru została anulowana\n" + STRING_DEFAULT_VALUE, "(Domyślna)" + STRING_DELETE_VALUE, "Czy na pewno chcesz usunąć wartość rejestru '%1'?" + STRING_DELETE_VALUEALL, "Czy na pewno chcesz usunąć wszystkie wartości rejestru w '%1'?" + STRING_DELETE_SUBKEY, "Czy na pewno chcesz usunąć klucz rejestru '%1'?" + STRING_INVALID_STRING, "reg: Opcja [/d] musi być poprzedzona prawidłowym łańcuchem\n" + STRING_VALUEALL_FAILED, "reg: Nie można usunąć wszystkich wartości rejestru w '%1'. Wystąpił nieoczekiwany błąd.\n" + STRING_GENERAL_FAILURE, "reg: Nie można ukończyć określonej operacji. Wystąpił nieoczekiwany błąd.\n" + STRING_MATCHES_FOUND, "Wyszukiwanie zakończone. Liczba znalezionych elementów: %1!d!\n" + STRING_INVALID_SYNTAX, "reg: Nieprawidłowa składnia. " + STRING_INVALID_OPTION, "reg: Nieprawidłowa opcja [%1]. " + STRING_REG_HELP, "Wpisz ""REG /?"", aby uzyskać pomoc.\n" + STRING_FUNC_HELP, "Wpisz ""REG %1 /?"", aby uzyskać pomoc.\n" + STRING_VALUE_NOT_SET, "(wartość nie ustalona)" + STRING_IMPORT_USAGE, "REG IMPORT plik.reg\n" + STRING_FILE_NOT_FOUND, "reg: Plik '%1' nie został odnaleziony.\n" + STRING_OPEN_KEY_FAILED, "reg: Nie można otworzyć klucza rejestru '%1'.\n" + STRING_ESCAPE_SEQUENCE, "reg: Nierozpoznana sekwencja ucieczki [\\%1!c!]\n" + STRING_EXPORT_USAGE, "REG EXPORT nazwa_klucza plik.reg [/y]\n" + STRING_INVALID_SYSTEM_KEY, "reg: Nieprawidłowy klucz systemowy [%1]\n" + STRING_OVERWRITE_FILE, "Plik '%1' już istnieje. Czy chcesz go zastąpić?" } diff --git a/base/applications/cmdutils/taskkill/lang/pl-PL.rc b/base/applications/cmdutils/taskkill/lang/pl-PL.rc new file mode 100644 index 0000000000..c907dc72b6 --- /dev/null +++ b/base/applications/cmdutils/taskkill/lang/pl-PL.rc @@ -0,0 +1,19 @@ +LANGUAGE LANG_POLISH, SUBLANG_DEFAULT + +STRINGTABLE +{ + STRING_USAGE, "Sposób użycia: taskkill [/?] [/f] [/im nazwa_procesu | /pid id_procesu]\n" + STRING_INVALID_OPTION, "Błąd: Określono nieznaną lub nieprawidłową opcję.\n" + STRING_INVALID_PARAM, "Błąd: Nieprawidłowy parametr.\n" + STRING_MISSING_OPTION, "Błąd: Nie określono opcji /im ani /pid.\n" + STRING_MISSING_PARAM, "Błąd: Oczekiwano parametru dla opcji %1.\n" + STRING_MUTUAL_EXCLUSIVE, "Błąd: Opcje /im i /pid wzajemnie się wykluczają.\n" + STRING_CLOSE_PID_SEARCH, "Komunikat o zamknięciu został wysłany do okien najwyższego poziomu procesu z identyfikatorem PID %1!u!.\n" + STRING_CLOSE_PROC_SRCH, "Komunikat o zamknięciu został wysłany do okien najwyższego poziomu procesu ""%1"" z identyfikatorem PID %2!u!.\n" + STRING_TERM_PID_SEARCH, "Proces z identyfikatorem PID %1!u! został przymusowo zakończony.\n" + STRING_TERM_PROC_SEARCH, "Proces ""%1"" z identyfikatorem PID %2!u! został przymusowo zakończony.\n" + STRING_SEARCH_FAILED, "Błąd: Nie odnaleziono procesu ""%1"".\n" + STRING_ENUM_FAILED, "Błąd: Nie można wyliczyć listy procesów.\n" + STRING_TERMINATE_FAILED, "Błąd: Nie można zakończyć procesu ""%1"".\n" + STRING_SELF_TERMINATION, "Błąd: Proces nie może zakończyć sam siebie.\n" +} diff --git a/base/applications/cmdutils/taskkill/taskkill.rc b/base/applications/cmdutils/taskkill/taskkill.rc index 950b03b8bd..4e9ca9dbab 100644 --- a/base/applications/cmdutils/taskkill/taskkill.rc +++ b/base/applications/cmdutils/taskkill/taskkill.rc @@ -36,6 +36,9 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #ifdef LANGUAGE_EN_US #include "lang/en-US.rc" #endif +#ifdef LANGUAGE_PL_PL + #include "lang/pl-PL.rc" +#endif #ifdef LANGUAGE_RO_RO #include "lang/ro-RO.rc" #endif diff --git a/base/applications/cmdutils/wmic/lang/pl-PL.rc b/base/applications/cmdutils/wmic/lang/pl-PL.rc new file mode 100644 index 0000000000..6952d05707 --- /dev/null +++ b/base/applications/cmdutils/wmic/lang/pl-PL.rc @@ -0,0 +1,9 @@ +LANGUAGE LANG_POLISH, SUBLANG_DEFAULT + +STRINGTABLE +{ + STRING_CMDLINE_NOT_SUPPORTED, "Błąd: Funkcja lub operacja nie jest obsługiwana\n" + STRING_ALIAS_NOT_FOUND, "Błąd: Alias nie został znaleziony\n" + STRING_INVALID_QUERY, "Błąd: Nieprawidłowa kwerenda\n" + STRING_INVALID_PATH, "Błąd: Nieprawidłowa składnia PATH\n" +} diff --git a/base/applications/cmdutils/wmic/wmic.rc b/base/applications/cmdutils/wmic/wmic.rc index a830a7bbe0..1ca447b1e4 100644 --- a/base/applications/cmdutils/wmic/wmic.rc +++ b/base/applications/cmdutils/wmic/wmic.rc @@ -34,6 +34,9 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #ifdef LANGUAGE_EN_US #include "lang/en-US.rc" #endif +#ifdef LANGUAGE_PL_PL + #include "lang/pl-PL.rc" +#endif #ifdef LANGUAGE_RO_RO #include "lang/ro-RO.rc" #endif diff --git a/base/applications/drwtsn32/lang/pl-PL.rc b/base/applications/drwtsn32/lang/pl-PL.rc index a5385421e1..d002285b09 100644 --- a/base/applications/drwtsn32/lang/pl-PL.rc +++ b/base/applications/drwtsn32/lang/pl-PL.rc @@ -9,5 +9,5 @@ LANGUAGE LANG_POLISH, SUBLANG_DEFAULT STRINGTABLE BEGIN IDS_APP_TITLE "Raportowanie błędu ReactOS" - IDS_USER_ALERT_MESSAGE "Aplikacja %ls została zamknięta z powodu błędu. Informacje o tym błędzie zostały zapisne w:\r\n\r\n%ls" + IDS_USER_ALERT_MESSAGE "Aplikacja %ls została zamknięta z powodu błędu. Informacje o tym błędzie zostały zapisane w:\r\n\r\n%ls" END diff --git a/base/applications/mmc/lang/pl-PL.rc b/base/applications/mmc/lang/pl-PL.rc index e61c718dcc..e7acc16cfe 100644 --- a/base/applications/mmc/lang/pl-PL.rc +++ b/base/applications/mmc/lang/pl-PL.rc @@ -18,7 +18,7 @@ BEGIN END POPUP "Pomo&c" BEGIN - MENUITEM "Konsola zarządzania ReactOS - i&nformacje", IDM_HELP_ABOUT + MENUITEM "ReactOS Management Console - i&nformacje", IDM_HELP_ABOUT END END @@ -39,12 +39,12 @@ BEGIN END POPUP "Pomo&c" BEGIN - MENUITEM "Konsola zarządzania ReactOS - i&nformacje", IDM_HELP_ABOUT + MENUITEM "ReactOS Management Console - i&nformacje", IDM_HELP_ABOUT END END STRINGTABLE BEGIN - IDS_APPTITLE "Konsola zarządzania ReactOS" + IDS_APPTITLE "ReactOS Management Console" IDS_CONSOLETITLE "Konsola%1!u!" END diff --git a/base/applications/mscutils/eventvwr/lang/pl-PL.rc b/base/applications/mscutils/eventvwr/lang/pl-PL.rc index 3c125fd323..5727ca8ebd 100644 --- a/base/applications/mscutils/eventvwr/lang/pl-PL.rc +++ b/base/applications/mscutils/eventvwr/lang/pl-PL.rc @@ -29,10 +29,10 @@ BEGIN END POPUP "Op&cje" BEGIN - MENUITEM "Event details &view", IDM_EVENT_DETAILS_VIEW - MENUITEM "&Grid lines", IDM_LIST_GRID_LINES + MENUITEM "&Pokaż szczegóły zdarzenia", IDM_EVENT_DETAILS_VIEW + MENUITEM "&Linie siatki", IDM_LIST_GRID_LINES MENUITEM SEPARATOR - MENUITEM "&Save settings on exit", IDM_SAVE_SETTINGS + MENUITEM "&Zapisz ustawienia przy wyjściu", IDM_SAVE_SETTINGS END POPUP "Po&moc" BEGIN @@ -152,20 +152,20 @@ END STRINGTABLE BEGIN /* Please note that explicit TAB characters '\t' are used to fix the alignment of the message in the MessageBox */ - IDS_USAGE "ReactOS Event Viewer\n\ + IDS_USAGE "Podgląd zdarzeń ReactOS\n\ \n\ -EventVwr [computer name] [/l:<event log file>] [/?]\n\ +EventVwr [nazwa komputera] [/l:<plik dziennika>] [/?]\n\ \n\ -""computer name"" : Specifies the remote computer where to connect\n\ -\tto retrieve the events to display. If no name is specified, the\n\ -\tlocal computer is used.\n\ +""nazwa kopmutera"" : Określa komputer zdalny, z którym należy się połączyć,\n\ +\taby otrzymać zdarzenia do wyświetlenia. Jeśli nazwa nie jest określona,\n\ +\tzostanie użyty komputer lokalny.\n\ \n\ -/l:<event log file> : Specifies which event log file to open.\n\ -\tOnly files in the .evt format (NT ≤ 5.2) are supported.\n\ +/l:<plik dziennika> : Określa plik dziennika do otwarcia.\n\ +\tObsługiwane są tylko pliki w formacie .evt (NT ≤ 5.2).\n\ \n\ -/? : Displays this help message.\n\ +/? : Wyświetla tę pomoc/sposób użycia.\n\ " - IDS_EVENTLOGFILE "Event Log File" + IDS_EVENTLOGFILE "Plik dziennika" END STRINGTABLE @@ -181,7 +181,7 @@ END STRINGTABLE BEGIN - IDS_BYTES_FORMAT "bytes" // "%s bytes" + IDS_BYTES_FORMAT "bajtów" // "%s bytes" // "%1!ls! (%2!ls! bytes)" END @@ -199,15 +199,15 @@ END STRINGTABLE BEGIN - IDS_COPY "Event Type: %s\r\n\ -Event Source: %s\r\n\ -Event Category: %s\r\n\ -Event ID: %s\r\n\ -Date: %s\r\n\ -Time: %s\r\n\ -User: %s\r\n\ -Computer: %s\r\n\ -Description:\r\n%s" + IDS_COPY "Typ zdarzenia: %s\r\n\ +Źródło zdarzenia: %s\r\n\ +Kategoria zdarzenia: %s\r\n\ +Idnetyfikator Zdarzenia: %s\r\n\ +Data: %s\r\n\ +Czas: %s\r\n\ +Użytkownik: %s\r\n\ +Komputer: %s\r\n\ +Opis:\r\n%s" END STRINGTABLE diff --git a/dll/cpl/console/lang/pl-PL.rc b/dll/cpl/console/lang/pl-PL.rc index f9942590e7..9242c751ff 100644 --- a/dll/cpl/console/lang/pl-PL.rc +++ b/dll/cpl/console/lang/pl-PL.rc @@ -134,9 +134,9 @@ BEGIN CONTROL "", IDC_STATIC_COLOR14, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 171, 90, 10, 10 CONTROL "", IDC_STATIC_COLOR15, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 183, 90, 10, 10 CONTROL "", IDC_STATIC_COLOR16, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 195, 90, 10, 10 - GROUPBOX "Preview (Screen)", IDC_STATIC, 10, 110, 200, 40 + GROUPBOX "Wybrane kolory ekranu", IDC_STATIC, 10, 110, 200, 40 CONTROL "", IDC_STATIC_SCREEN_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 15, 120, 180, 20, WS_EX_CLIENTEDGE - GROUPBOX "Preview (Popup)", IDC_STATIC, 10, 155, 200, 40 + GROUPBOX "Wybrane kolory podręczne", IDC_STATIC, 10, 155, 200, 40 CONTROL "", IDC_STATIC_POPUP_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 15, 165, 180, 20, WS_EX_CLIENTEDGE END diff --git a/dll/cpl/input/lang/pl-PL.rc b/dll/cpl/input/lang/pl-PL.rc index c30300005b..c6845d81e6 100644 --- a/dll/cpl/input/lang/pl-PL.rc +++ b/dll/cpl/input/lang/pl-PL.rc @@ -114,7 +114,7 @@ BEGIN IDS_CTRL_SHIFT "Ctrl+Shift" IDS_LEFT_ALT_SHIFT "Lewy Alt+Shift" IDS_SWITCH_BET_INLANG "Przełącza pomiędzy układami klawiatury" - IDS_REBOOT_NOW, "Reboot now?" + IDS_REBOOT_NOW, "Uruchomić ponownie system?" END STRINGTABLE diff --git a/dll/shellext/zipfldr/lang/pl-PL.rc b/dll/shellext/zipfldr/lang/pl-PL.rc new file mode 100644 index 0000000000..7d2e2e47fc --- /dev/null +++ b/dll/shellext/zipfldr/lang/pl-PL.rc @@ -0,0 +1,70 @@ +/* + * PROJECT: ReactOS Zip Shell Extension + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Polish resource translation + */ + +LANGUAGE LANG_POLISH, SUBLANG_DEFAULT + +IDD_PROPPAGEDESTINATION DIALOGEX 0, 0, 235, 156 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Wybierz miejsce docelowe" +FONT 8, "MS Shell Dlg", 400, 0, 0x0 +BEGIN + LTEXT "Wybierz katalog docelowy:",IDC_STATIC,6,12,174,8 + EDITTEXT IDC_DIRECTORY,6,24,222,12,ES_AUTOHSCROLL + PUSHBUTTON "Przeglądaj...",IDC_BROWSE,174,42,54,14 + PUSHBUTTON "Hasło",IDC_PASSWORD,174,66,54,14 + LTEXT "Trwa wyodrębnianie...",IDC_STATIC,6,114,82,8 + CONTROL "",IDC_PROGRESS,"msctls_progress32",WS_BORDER,6,126,222,6 +END + +IDD_PROPPAGECOMPLETE DIALOGEX 0, 0, 235, 156 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Wyodrębnianie zakończone" +FONT 8, "MS Shell Dlg", 400, 0, 0x0 +BEGIN + LTEXT "Pliki zostały pomyślnie wyodrębnione do następującego katalogu:",IDC_STATIC,6,12,222,18 + LTEXT "Ścieżka docelowa",IDC_DESTDIR,6,36,222,8 + CONTROL "Pokaż wyodrębnione pliki",IDC_SHOW_EXTRACTED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,66,121,10 + LTEXT "Aby kontynuować, kliknij przycisk Zakończ.",IDC_STATIC,6,84,174,8 +END + +IDD_CONFIRM_FILE_REPLACE DIALOGEX 0, 0, 273, 56 +STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Potwierdzenie zamiany pliku" +FONT 8, "MS Shell Dlg", 400, 0, 0x1 +BEGIN + DEFPUSHBUTTON "&Tak",IDYES,6,36,62,14 + PUSHBUTTON "Anuluj",IDCANCEL,204,36,62,14 + PUSHBUTTON "Tak na &wszystkie",IDYESALL,72,36,62,14 + PUSHBUTTON "&Nie",IDNO,138,36,62,14 + ICON "",IDC_EXCLAMATION_ICON,6,6,24,22 + LTEXT "",IDC_MESSAGE,36,6,228,24 +END + +STRINGTABLE +BEGIN + IDS_COL_NAME "Nazwa" + IDS_COL_TYPE "Typ" + IDS_COL_COMPRSIZE "Rozmiar po spakowaniu" + IDS_COL_PASSWORD "Hasło" + IDS_COL_SIZE "Rozmiar oryginalny" + IDS_COL_RATIO "Współczynnik kompresji" + IDS_COL_DATE_MOD "Data modyfikacji" + IDS_YES "Tak" + IDS_NO "Nie" + + IDS_WIZ_TITLE "Kreator wyodrębniania" + IDS_WIZ_DEST_TITLE "Wybierz miejsce docelowe" + IDS_WIZ_DEST_SUBTITLE "Pliki znajdujące sie w archiwum ZIP zostaną wyodrębnione do wybranej lokalizacji." + IDS_WIZ_COMPL_TITLE "Wyodrębnianie zakończone" + IDS_WIZ_COMPL_SUBTITLE "Pliki zostały pomyślnie wyodrębnione z archiwum ZIP." + IDS_WIZ_BROWSE_TITLE "Wybierz miejsce, w którym chcesz wyodrębnić wybrane elementy." + + IDS_OVERWRITEFILE_TEXT "Ten folder zawiera już plik o nazwie '%1'.\nCzy chcesz zamienić istniejący plik?" + + IDS_MENUITEM "Wy&odrębnij wszystkie..." + IDS_HELPTEXT "Wyodrębnia zawartość folderów" + IDS_FRIENDLYNAME "Folder skompresowany (zip)" +END diff --git a/dll/shellext/zipfldr/zipfldr.rc b/dll/shellext/zipfldr/zipfldr.rc index 5f39bfd7e1..21f2a4ed70 100644 --- a/dll/shellext/zipfldr/zipfldr.rc +++ b/dll/shellext/zipfldr/zipfldr.rc @@ -34,6 +34,9 @@ IDR_ZIPFLDR REGISTRY "res/zipfldr.rgs" #ifdef LANGUAGE_IT_IT #include "lang/it-IT.rc" #endif +#ifdef LANGUAGE_PL_PL + #include "lang/pl-PL.rc" +#endif #ifdef LANGUAGE_RO_RO #include "lang/ro-RO.rc" #endif diff --git a/dll/win32/shell32/lang/pl-PL.rc b/dll/win32/shell32/lang/pl-PL.rc index 67951958e3..4040c421fe 100644 --- a/dll/win32/shell32/lang/pl-PL.rc +++ b/dll/win32/shell32/lang/pl-PL.rc @@ -647,17 +647,17 @@ Czy na pewno chcesz otworzyć ten plik?", IDC_STATIC, 35, 5, 230, 60 END IDD_NEWEXTENSION DIALOGEX 0, 0, 260, 75 -CAPTION "Create New Extension" +CAPTION "Tworzenie nowego rozszerzenia" STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg" BEGIN - LTEXT "&File Extension:", -1, 10, 10, 85, 14 + LTEXT "&Rozszerzenie pliku:", -1, 10, 10, 85, 14 EDITTEXT IDC_NEWEXT_EDIT, 105, 8, 60, 14 - PUSHBUTTON "<< Ad&vanced", IDC_NEWEXT_ADVANCED, 185, 8, 65, 15 - LTEXT "&Associated File Type:", IDC_NEWEXT_ASSOC, 10, 34, 85, 14 + PUSHBUTTON "&Zaawansowane >>", IDC_NEWEXT_ADVANCED, 185, 8, 65, 15 + LTEXT "&Skojarzony typ pliku:", IDC_NEWEXT_ASSOC, 10, 34, 85, 14 COMBOBOX IDC_NEWEXT_COMBOBOX, 105, 32, 145, 120, CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_GROUP | WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 125, 55, 60, 14 - PUSHBUTTON "Cancel", IDCANCEL, 190, 55, 60, 14 + PUSHBUTTON "Anuluj", IDCANCEL, 190, 55, 60, 14 END STRINGTABLE @@ -898,10 +898,10 @@ BEGIN IDS_ADVANCED_SHOW_COMP_COLOR "Pokaż zaszyfrowane lub skompresowane pliki NTFS w kolorze" IDS_ADVANCED_SHOW_INFO_TIP "Pokaż podręczny opis elementów folderów i pulpitu" - IDS_NEWEXT_ADVANCED_LEFT "<< Ad&vanced" - IDS_NEWEXT_ADVANCED_RIGHT "Ad&vanced >>" - IDS_NEWEXT_NEW "<New>" - IDS_NEWEXT_SPECIFY_EXT "You must specify an extension." - IDS_NEWEXT_ALREADY_ASSOC "Extension %s is already associated with File Type %s. Do you want to un-associate %s with %s and create a new File Type for it?" - IDS_NEWEXT_EXT_IN_USE "Extension is in use" + IDS_NEWEXT_ADVANCED_LEFT "<< &Zaawansowane" + IDS_NEWEXT_ADVANCED_RIGHT "&Zaawansowane >>" + IDS_NEWEXT_NEW "<Nowy>" + IDS_NEWEXT_SPECIFY_EXT "Musisz podać rozszerzenie." + IDS_NEWEXT_ALREADY_ASSOC "Rozszerzenie %s jest już związane z typem plików %s. Czy chcesz usunąć powiązanie %s z %s i utworzyć dla niego nowy typ plików?" + IDS_NEWEXT_EXT_IN_USE "Rozszerzenie jest w użyciu" END

1 0

01/01: [BOOTDATA] Add the (still disabled) faeroese keyboard layout
by Eric Kohl 19 May '18

19 May '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=76eeb35148cc72b80bc39… commit 76eeb35148cc72b80bc398313a46dc6f153e26c3 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sat May 19 12:41:37 2018 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sat May 19 12:41:37 2018 +0200 [BOOTDATA] Add the (still disabled) faeroese keyboard layout CORE-13127 --- boot/bootdata/hivesys.inf | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/boot/bootdata/hivesys.inf b/boot/bootdata/hivesys.inf index 038beb96a4..0fdd69a32b 100644 --- a/boot/bootdata/hivesys.inf +++ b/boot/bootdata/hivesys.inf @@ -731,6 +731,10 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000437","Layout File", HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000437","Layout Text",0x00000000,%GEORGIAN% HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000437","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5119" +;HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000438","Layout File",0x00000000,"kbdfo.dll" +;HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000438","Layout Text",0x00000000,%FAEROESE% +;HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000438","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5108" + HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000439","Layout File",0x00000000,"kbdindev.dll" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000439","Layout Text",0x00000000,%DEVANAGARI% HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000439","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5096" @@ -2227,6 +2231,7 @@ GERMAN = "German" GREEK = "Greek" GUJARATI = "Gujarati" IRISH = "Irish" +FAEROESE = "Faeroese" FINNISH = "Finnish" FRENCH = "French" GEORGIAN = "Georgian" @@ -2364,6 +2369,7 @@ GERMAN = "Niemiecki" GREEK = "Grecki" GUJARATI = "Gujarati" IRISH = "Irlandzki" +FAEROESE = "Faeroese" FINNISH = "Fiński" FRENCH = "Francuski" GEORGIAN = "Gruziński" @@ -2501,6 +2507,7 @@ GERMAN = "Germană" GREEK = "Greacă" GUJARATI = "Gujarati" IRISH = "Irlandeză" +FAEROESE = "Faeroese" FINNISH = "Finlandeză" FRENCH = "Franceză" GEORGIAN = "Georgiană"

1 0

01/01: [USETUP] Improved entering of partition size
by Eric Kohl 19 May '18

19 May '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8a2cc3cddab22b10f8238… commit 8a2cc3cddab22b10f82387764426acd47412ac3e Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sat May 19 12:09:12 2018 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sat May 19 12:09:58 2018 +0200 [USETUP] Improved entering of partition size Patch by Эдуард. CORE-13249 --- base/setup/usetup/usetup.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/base/setup/usetup/usetup.c b/base/setup/usetup/usetup.c index 71dc354ae0..b702815cae 100644 --- a/base/setup/usetup/usetup.c +++ b/base/setup/usetup/usetup.c @@ -27,6 +27,7 @@ */ #include <usetup.h> +#include <math.h> #include "bootsup.h" #include "chkdsk.h" @@ -1755,9 +1756,9 @@ SelectPartitionPage(PINPUT_RECORD Ir) } -#define PARTITION_SIZE_INPUT_FIELD_LENGTH 6 -/* Restriction for MaxSize: pow(10, PARTITION_SIZE_INPUT_FIELD_LENGTH)-1 */ -#define PARTITION_MAXSIZE 999999 +#define PARTITION_SIZE_INPUT_FIELD_LENGTH 9 +/* Restriction for MaxSize: pow(10, (PARTITION_SIZE_INPUT_FIELD_LENGTH - 1)) - 1 */ +#define PARTITION_MAXSIZE (pow(10, (PARTITION_SIZE_INPUT_FIELD_LENGTH - 1)) - 1) static VOID ShowPartitionSizeInputBox(SHORT Left, @@ -1916,7 +1917,7 @@ ShowPartitionSizeInputBox(SHORT Left, } else if (Ir.Event.KeyEvent.uChar.AsciiChar != 0x00) { - if (Length < PARTITION_SIZE_INPUT_FIELD_LENGTH) + if (Length < PARTITION_SIZE_INPUT_FIELD_LENGTH - 1) { ch = (WCHAR)Ir.Event.KeyEvent.uChar.AsciiChar;

1 0

01/01: [FASTFAT] Misc. fixes spotted by Thomas.
by Pierre Schweitzer 19 May '18

19 May '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d69f31848e31cd5acff4b… commit d69f31848e31cd5acff4b6d0acf4471d188d3e51 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sat May 19 10:07:14 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sat May 19 10:07:14 2018 +0200 [FASTFAT] Misc. fixes spotted by Thomas. --- drivers/filesystems/fastfat/dirwr.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/drivers/filesystems/fastfat/dirwr.c b/drivers/filesystems/fastfat/dirwr.c index dc073f9236..4237d01909 100644 --- a/drivers/filesystems/fastfat/dirwr.c +++ b/drivers/filesystems/fastfat/dirwr.c @@ -29,6 +29,7 @@ vfatFCBInitializeCacheFromVolume( PVFATCCB newCCB; NTSTATUS status; BOOLEAN Acquired; + NTSTATUS Status; /* Don't re-initialize if already done */ if (BooleanFlagOn(fcb->Flags, FCB_CACHE_INITIALIZED)) @@ -58,8 +59,9 @@ vfatFCBInitializeCacheFromVolume( newCCB = ExAllocateFromNPagedLookasideList(&VfatGlobalData->CcbLookasideList); if (newCCB == NULL) { + Status = STATUS_INSUFFICIENT_RESOURCES; ObDereferenceObject(fileObject); - return STATUS_INSUFFICIENT_RESOURCES; + goto Quit; } RtlZeroMemory(newCCB, sizeof (VFATCCB)); @@ -83,19 +85,25 @@ vfatFCBInitializeCacheFromVolume( fcb->FileObject = NULL; ExFreeToNPagedLookasideList(&VfatGlobalData->CcbLookasideList, newCCB); ObDereferenceObject(fileObject); + if (Acquired) + { + ExReleaseResourceLite(&vcb->DirResource); + } return status; } _SEH2_END; vfatGrabFCB(vcb, fcb); SetFlag(fcb->Flags, FCB_CACHE_INITIALIZED); + Status = STATUS_SUCCESS; +Quit: if (Acquired) { ExReleaseResourceLite(&vcb->DirResource); } - return STATUS_SUCCESS; + return Status; } /* @@ -682,6 +690,7 @@ FATAddEntry( } /* No need to init cache here, vfatFindDirSpace() will have done it for us */ + ASSERT(BooleanFlagOn(ParentFcb->Flags, FCB_CACHE_INITIALIZED)); i = DeviceExt->FatInfo.BytesPerCluster / sizeof(FAT_DIR_ENTRY); FileOffset.u.HighPart = 0; @@ -768,6 +777,7 @@ FATAddEntry( Status = vfatFCBInitializeCacheFromVolume(DeviceExt, (*Fcb)); if (!NT_SUCCESS(Status)) { + ExFreePoolWithTag(Buffer, TAG_VFAT); return Status; } @@ -898,6 +908,7 @@ FATXAddEntry( } /* No need to init cache here, vfatFindDirSpace() will have done it for us */ + ASSERT(BooleanFlagOn(ParentFcb->Flags, FCB_CACHE_INITIALIZED)); /* add entry into parent directory */ FileOffset.u.HighPart = 0;

1 0

← Newer
1
...
11
12
13
14
15
16
17
...
22
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs May 2018