Ros-diffs January 2020

ros-diffs@reactos.org

21 participants
133 discussions

[reactos] 01/01: [XDK] Fix x64 version of KeGetCurrentProcessorNumber() and add KeGetCurrentProcessorIndex()

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e2560a5cadb8449f3fb6a… commit e2560a5cadb8449f3fb6a032bf06625f6074c897 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sun Apr 21 11:28:58 2019 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sat Jan 18 14:56:17 2020 +0100 [XDK] Fix x64 version of KeGetCurrentProcessorNumber() and add KeGetCurrentProcessorIndex() --- sdk/include/xdk/amd64/ke.h | 14 +++++++++++++- sdk/include/xdk/kefuncs.h | 13 ------------- sdk/include/xdk/x86/ke.h | 13 +++++++++++++ 3 files changed, 26 insertions(+), 14 deletions(-) diff --git a/sdk/include/xdk/amd64/ke.h b/sdk/include/xdk/amd64/ke.h index 90abb703119..64212336702 100644 --- a/sdk/include/xdk/amd64/ke.h +++ b/sdk/include/xdk/amd64/ke.h @@ -152,6 +152,15 @@ KeRestoreFloatingPointState( return STATUS_SUCCESS; } +#if (NTDDI_VERSION >= NTDDI_WIN7) +FORCEINLINE +ULONG +KeGetCurrentProcessorIndex(VOID) +{ + return __readgsdword(0x1a4); +} +#endif + /* VOID * KeFlushIoBuffers( * IN PMDL Mdl, @@ -320,11 +329,14 @@ KeGetPcr(VOID) return (PKPCR)__readgsqword(FIELD_OFFSET(KPCR, Self)); } +#if (NTDDI_VERSION >= NTDDI_WIN7) +_CRT_DEPRECATE_TEXT("KeGetCurrentProcessorNumber is deprecated. Use KeGetCurrentProcessorNumberEx or KeGetCurrentProcessorIndex instead.") +#endif FORCEINLINE ULONG KeGetCurrentProcessorNumber(VOID) { - return (ULONG)__readgsword(0x184); + return __readgsbyte(0x184); } $endif /* _NTDDK_ */ diff --git a/sdk/include/xdk/kefuncs.h b/sdk/include/xdk/kefuncs.h index d33a8a4f34f..c710257751b 100644 --- a/sdk/include/xdk/kefuncs.h +++ b/sdk/include/xdk/kefuncs.h @@ -44,19 +44,6 @@ KeInvalidateRangeAllCaches( _In_ PVOID BaseAddress, _In_ ULONG Length); $endif (_NTDDK_) -$if (_NTIFS_) - -NTSTATUS -NTAPI -KeGetProcessorNumberFromIndex( - _In_ ULONG ProcIndex, - _Out_ PPROCESSOR_NUMBER ProcNumber); - -ULONG -NTAPI -KeGetProcessorIndexFromNumber( - _In_ PPROCESSOR_NUMBER ProcNumber); -$endif (_NTIFS_) #if (NTDDI_VERSION >= NTDDI_WIN2K) diff --git a/sdk/include/xdk/x86/ke.h b/sdk/include/xdk/x86/ke.h index 5578f7fca18..f7ef92c2972 100644 --- a/sdk/include/xdk/x86/ke.h +++ b/sdk/include/xdk/x86/ke.h @@ -169,6 +169,16 @@ NTAPI KeRestoreFloatingPointState( _In_ PKFLOATING_SAVE FloatSave); +#if (NTDDI_VERSION >= NTDDI_WIN7) +FORCEINLINE +ULONG +NTAPI +KeGetCurrentProcessorIndex(VOID) +{ + return __readfsbyte(0x51); +} +#endif + /* VOID * KeFlushIoBuffers( * IN PMDL Mdl, @@ -315,6 +325,9 @@ typedef struct _KPCR { ULONG HalReserved[16]; } KPCR, *PKPCR; +#if (NTDDI_VERSION >= NTDDI_WIN7) +_CRT_DEPRECATE_TEXT("KeGetCurrentProcessorNumber is deprecated. Use KeGetCurrentProcessorNumberEx or KeGetCurrentProcessorIndex instead.") +#endif FORCEINLINE ULONG KeGetCurrentProcessorNumber(VOID)

4 years, 11 months

[reactos] 01/01: [FLTMGR] Safely query object name in FltpGetObjectName. CID 1420811

by Thomas Faber

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9215413a684c0592b8e3c… commit 9215413a684c0592b8e3ccfc97bda99fc5f79e2c Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Sat Nov 30 12:04:14 2019 +0100 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sat Jan 18 13:19:22 2020 +0100 [FLTMGR] Safely query object name in FltpGetObjectName. CID 1420811 --- drivers/filters/fltmgr/Object.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/filters/fltmgr/Object.c b/drivers/filters/fltmgr/Object.c index 8173f6376a0..db32f48e578 100644 --- a/drivers/filters/fltmgr/Object.c +++ b/drivers/filters/fltmgr/Object.c @@ -263,8 +263,8 @@ NTSTATUS FltpGetObjectName(_In_ PVOID Object, _Inout_ PUNICODE_STRING ObjectName) { - POBJECT_NAME_INFORMATION ObjectNameInfo = NULL; OBJECT_NAME_INFORMATION LocalNameInfo; + POBJECT_NAME_INFORMATION ObjectNameInfo = &LocalNameInfo; ULONG ReturnLength; NTSTATUS Status; @@ -310,7 +310,7 @@ FltpGetObjectName(_In_ PVOID Object, } } - if (ObjectNameInfo) + if (ObjectNameInfo != &LocalNameInfo) { ExFreePoolWithTag(ObjectNameInfo, FM_TAG_UNICODE_STRING); }

4 years, 11 months

[reactos] 01/01: [SHELL] Add SHOpenFolderAndSelectItems to shlobj.h.

by Thomas Faber

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=aee6cbc50a53b8e63bd29… commit aee6cbc50a53b8e63bd290537bfb14d57e538196 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Sat Nov 30 11:02:06 2019 +0100 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sat Jan 18 13:10:35 2020 +0100 [SHELL] Add SHOpenFolderAndSelectItems to shlobj.h. --- dll/win32/browseui/shellfind/CFindFolder.cpp | 8 -------- dll/win32/shell32/CShellLink.cpp | 7 ------- dll/win32/shell32/shlfolder.cpp | 2 +- sdk/include/psdk/shlobj.h | 8 ++++++++ 4 files changed, 9 insertions(+), 16 deletions(-) diff --git a/dll/win32/browseui/shellfind/CFindFolder.cpp b/dll/win32/browseui/shellfind/CFindFolder.cpp index 5509f38f78b..19814517bb2 100644 --- a/dll/win32/browseui/shellfind/CFindFolder.cpp +++ b/dll/win32/browseui/shellfind/CFindFolder.cpp @@ -10,14 +10,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(shellfind); -// FIXME: Remove this declaration after the function has been fully implemented -EXTERN_C HRESULT -WINAPI -SHOpenFolderAndSelectItems(LPITEMIDLIST pidlFolder, - UINT cidl, - PCUITEMID_CHILD_ARRAY apidl, - DWORD dwFlags); - static HRESULT SHELL32_CoCreateInitSF(LPCITEMIDLIST pidlRoot, PERSIST_FOLDER_TARGET_INFO* ppfti, LPCITEMIDLIST pidlChild, const GUID* clsid, REFIID riid, LPVOID *ppvOut) { diff --git a/dll/win32/shell32/CShellLink.cpp b/dll/win32/shell32/CShellLink.cpp index 90f2140a9c5..047813cfaab 100644 --- a/dll/win32/shell32/CShellLink.cpp +++ b/dll/win32/shell32/CShellLink.cpp @@ -2769,13 +2769,6 @@ INT_PTR CALLBACK ExtendedShortcutProc(HWND hwndDlg, UINT uMsg, return FALSE; } -EXTERN_C HRESULT -WINAPI -SHOpenFolderAndSelectItems(LPITEMIDLIST pidlFolder, - UINT cidl, - PCUITEMID_CHILD_ARRAY apidl, - DWORD dwFlags); - /************************************************************************** * SH_GetTargetTypeByPath * diff --git a/dll/win32/shell32/shlfolder.cpp b/dll/win32/shell32/shlfolder.cpp index f652378616e..471973516ee 100644 --- a/dll/win32/shell32/shlfolder.cpp +++ b/dll/win32/shell32/shlfolder.cpp @@ -386,7 +386,7 @@ HRESULT WINAPI SHCreateLinks( HWND hWnd, LPCSTR lpszDir, IDataObject * lpDataObj */ EXTERN_C HRESULT WINAPI -SHOpenFolderAndSelectItems(LPITEMIDLIST pidlFolder, +SHOpenFolderAndSelectItems(PCIDLIST_ABSOLUTE pidlFolder, UINT cidl, PCUITEMID_CHILD_ARRAY apidl, DWORD dwFlags) diff --git a/sdk/include/psdk/shlobj.h b/sdk/include/psdk/shlobj.h index a425b21bc79..82df46527fe 100644 --- a/sdk/include/psdk/shlobj.h +++ b/sdk/include/psdk/shlobj.h @@ -320,6 +320,14 @@ SHObjectProperties( _In_ LPCWSTR, _In_opt_ LPCWSTR); +HRESULT +WINAPI +SHOpenFolderAndSelectItems( + _In_ PCIDLIST_ABSOLUTE pidlFolder, + _In_ UINT cidl, + _In_reads_opt_(cidl) PCUITEMID_CHILD_ARRAY, + _In_ DWORD); + #define PCS_FATAL 0x80000000 #define PCS_REPLACEDCHAR 0x00000001 #define PCS_REMOVEDCHAR 0x00000002

4 years, 11 months

[reactos] 02/02: [ATL30] Fix m_szAutoName definition and construction in Wine's ATL30 dll.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e410a12242a50e8508460… commit e410a12242a50e850846058ef5c53652340c1724 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Wed Jan 15 01:14:30 2020 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Jan 15 01:21:25 2020 +0100 [ATL30] Fix m_szAutoName definition and construction in Wine's ATL30 dll. - Make the format actually MS-compatible: "ATL" followed by colon, followed by hexadecimal digits of pointer. - The MS counterpart of this DLL was delivered with Visual C++ 6.0 and Windows 98+, so obviously it always was 32-bit and they never had a 64-bit version for it. But we do. So make the size of the m_szAutoName buffer cross-compatible. - See previous commit dbddd878 and the discussion in PR #2010. --- dll/win32/atl/atl30.c | 8 ++++++++ sdk/include/reactos/wine/atlwin.h | 8 ++++++++ 2 files changed, 16 insertions(+) diff --git a/dll/win32/atl/atl30.c b/dll/win32/atl/atl30.c index 06504d09940..254dbadb084 100644 --- a/dll/win32/atl/atl30.c +++ b/dll/win32/atl/atl30.c @@ -313,7 +313,11 @@ ATOM WINAPI AtlModuleRegisterWndClassInfoA(_ATL_MODULEA *pm, _ATL_WNDCLASSINFOA if (!wci->m_wc.lpszClassName) { +#ifdef __REACTOS__ + sprintf(wci->m_szAutoName, "ATL:%p", wci); +#else sprintf(wci->m_szAutoName, "ATL%08lx", (UINT_PTR)wci); +#endif TRACE("auto-generated class name %s\n", wci->m_szAutoName); wci->m_wc.lpszClassName = wci->m_szAutoName; } @@ -372,7 +376,11 @@ ATOM WINAPI AtlModuleRegisterWndClassInfoW(_ATL_MODULEW *pm, _ATL_WNDCLASSINFOW if (!wci->m_wc.lpszClassName) { +#ifdef __REACTOS__ + static const WCHAR szFormat[] = {'A','T','L',':','%','p',0}; +#else static const WCHAR szFormat[] = {'A','T','L','%','0','8','l','x',0}; +#endif swprintf(wci->m_szAutoName, szFormat, (UINT_PTR)wci); TRACE("auto-generated class name %s\n", debugstr_w(wci->m_szAutoName)); wci->m_wc.lpszClassName = wci->m_szAutoName; diff --git a/sdk/include/reactos/wine/atlwin.h b/sdk/include/reactos/wine/atlwin.h index 386177ba610..099f48bcb52 100644 --- a/sdk/include/reactos/wine/atlwin.h +++ b/sdk/include/reactos/wine/atlwin.h @@ -29,7 +29,11 @@ typedef struct _ATL_WNDCLASSINFOA_TAG LPCSTR m_lpszCursorID; BOOL m_bSystemCursor; ATOM m_atom; +#ifdef __REACTOS__ + CHAR m_szAutoName[sizeof("ATL:") + sizeof(void *) * 2]; // == 4 characters + NULL + number of hexadecimal digits describing a pointer. +#else CHAR m_szAutoName[14]; +#endif } _ATL_WNDCLASSINFOA; typedef struct _ATL_WNDCLASSINFOW_TAG @@ -40,7 +44,11 @@ typedef struct _ATL_WNDCLASSINFOW_TAG LPCWSTR m_lpszCursorID; BOOL m_bSystemCursor; ATOM m_atom; +#ifdef __REACTOS__ + WCHAR m_szAutoName[sizeof("ATL:") + sizeof(void *) * 2]; // == 4 characters + NULL + number of hexadecimal digits describing a pointer. +#else WCHAR m_szAutoName[14]; +#endif } _ATL_WNDCLASSINFOW; ATOM WINAPI AtlModuleRegisterWndClassInfoA(_ATL_MODULEA *pm, _ATL_WNDCLASSINFOA *wci, WNDPROC *pProc);

4 years, 11 months

[reactos] 01/02: [SDK:ATL] Fix the size of the ATL_WNDCLASSINFOW::m_szAutoName member according to the actual MS-compatible auto-generated window class name.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1a231e1e70472d7f1a3e1… commit 1a231e1e70472d7f1a3e1d1b498dedaedf864a54 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Wed Jan 15 01:10:28 2020 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Jan 15 01:14:03 2020 +0100 [SDK:ATL] Fix the size of the ATL_WNDCLASSINFOW::m_szAutoName member according to the actual MS-compatible auto-generated window class name. The autogenerated name has the format: "ATL:<hexadecimal_digits_of_pointer><NULL-terminator>" and the number of hex digits in 0xABCD1234 (for 32-bit == 4-byte) pointers (without the '0x') is 8 == 4*2, and for 64-bit == 8-byte pointers (e.g. 0xABCDEF0123456789) is 16 == 8*2. --- sdk/lib/atl/atlwin.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/lib/atl/atlwin.h b/sdk/lib/atl/atlwin.h index 3539c13afaf..c35c936acab 100644 --- a/sdk/lib/atl/atlwin.h +++ b/sdk/lib/atl/atlwin.h @@ -1893,7 +1893,7 @@ struct _ATL_WNDCLASSINFOW LPCWSTR m_lpszCursorID; BOOL m_bSystemCursor; ATOM m_atom; - WCHAR m_szAutoName[5 + sizeof(void *)]; + WCHAR m_szAutoName[sizeof("ATL:") + sizeof(void *) * 2]; // == 4 characters + NULL + number of hexadecimal digits describing a pointer. ATOM Register(WNDPROC *p) {

4 years, 11 months

[reactos] 01/01: [CMAKE] Add proper global definition for Xbox port (#2250)

by Stanislav Motylkov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f9e36df4d6828fa448b7c… commit f9e36df4d6828fa448b7c6ff5d7bb4eadab6ba70 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Wed Jan 15 00:15:18 2020 +0300 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Tue Jan 14 22:15:18 2020 +0100 [CMAKE] Add proper global definition for Xbox port (#2250) CORE-16216 --- CMakeLists.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 73b4e69a555..7aa199fdaf9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -159,6 +159,9 @@ else() add_definitions(-D_M_IX86) endif() add_definitions(-D_X86_ -D__i386__ -Di386) + if(SARCH STREQUAL "xbox") + add_definitions(-DSARCH_XBOX) + endif() elseif(ARCH STREQUAL "amd64") add_definitions(-D_M_AMD64 -D_AMD64_ -D__x86_64__ -D_WIN64) elseif(ARCH STREQUAL "arm")

4 years, 11 months

[reactos] 01/01: [FREELDR][XBOXVMP] Check only low 28 bits for framebuffer address (#2249)

by Stanislav Motylkov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=afdb42023cd326d6c1637… commit afdb42023cd326d6c16375066fe1f656d7bfb602 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Tue Jan 14 22:20:22 2020 +0300 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Tue Jan 14 20:20:22 2020 +0100 [FREELDR][XBOXVMP] Check only low 28 bits for framebuffer address (#2249) Fixes framebuffer detection on real hardware Xbox. --- boot/freeldr/freeldr/arch/i386/xboxvideo.c | 5 ++++- win32ss/drivers/miniport/xboxvmp/xboxvmp.c | 5 +++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/boot/freeldr/freeldr/arch/i386/xboxvideo.c b/boot/freeldr/freeldr/arch/i386/xboxvideo.c index ffc2144d408..b1fd2518d6d 100644 --- a/boot/freeldr/freeldr/arch/i386/xboxvideo.c +++ b/boot/freeldr/freeldr/arch/i386/xboxvideo.c @@ -158,7 +158,10 @@ XboxGetFramebufferSize(PVOID Offset) { TRACE("i = %d, base_addr_low = 0x%p, MemoryMap->length_low = 0x%p\n", i, MemoryMap->base_addr_low, MemoryMap->length_low); - if (MemoryMap->base_addr_low == (ULONG)Offset && MemoryMap->base_addr_high == 0) + /* Framebuffer address offset value is coming from the GPU within + * memory mapped I/O address space, so we're comparing only low + * 28 bits of the address within actual RAM address space */ + if (MemoryMap->base_addr_low == ((ULONG)Offset & 0x0FFFFFFF) && MemoryMap->base_addr_high == 0) { TRACE("Video memory found\n"); return MemoryMap->length_low; diff --git a/win32ss/drivers/miniport/xboxvmp/xboxvmp.c b/win32ss/drivers/miniport/xboxvmp/xboxvmp.c index 98f584ec086..cf4ddf6de39 100644 --- a/win32ss/drivers/miniport/xboxvmp/xboxvmp.c +++ b/win32ss/drivers/miniport/xboxvmp/xboxvmp.c @@ -394,6 +394,10 @@ XboxVmpMapVideoMemory( /* Reuse framebuffer that was set up by firmware */ FrameBuffer.QuadPart = *((PULONG)((ULONG_PTR)DeviceExtension->VirtControlStart + NV2A_CONTROL_FRAMEBUFFER_ADDRESS_OFFSET)); + /* Framebuffer address offset value is coming from the GPU within + * memory mapped I/O address space, so we're comparing only low + * 28 bits of the address within actual RAM address space */ + FrameBuffer.QuadPart &= 0x0FFFFFFF; if (FrameBuffer.QuadPart != 0x3C00000 && FrameBuffer.QuadPart != 0x7C00000) { /* Check framebuffer address (high 4 MB of either 64 or 128 MB RAM) */ @@ -402,6 +406,7 @@ XboxVmpMapVideoMemory( /* Verify that framebuffer address is page-aligned */ ASSERT(FrameBuffer.QuadPart % PAGE_SIZE == 0); + /* Return the address back to GPU memory mapped I/O */ FrameBuffer.QuadPart += DeviceExtension->PhysFrameBufferStart.QuadPart; MapInformation->VideoRamBase = RequestedAddress->RequestedVirtualAddress; /* FIXME: obtain fb size from firmware somehow (Cromwell reserves high 4 MB of RAM) */

4 years, 11 months

[reactos] 01/01: [SYSDM] general.c: Make 2 global variables 'static' (#2060)

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8f726184539ffc21c1bae… commit 8f726184539ffc21c1baeb402101d54f5a815b27 Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Tue Jan 14 18:54:17 2020 +0100 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Tue Jan 14 18:54:17 2020 +0100 [SYSDM] general.c: Make 2 global variables 'static' (#2060) And 1 'const' too. This allows reducing confusion about scope/use. --- dll/cpl/sysdm/general.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dll/cpl/sysdm/general.c b/dll/cpl/sysdm/general.c index 9c76df6ae83..68436639e19 100644 --- a/dll/cpl/sysdm/general.c +++ b/dll/cpl/sysdm/general.c @@ -28,8 +28,8 @@ typedef struct _IMGINFO INT iBits; } IMGINFO, *PIMGINFO; -PIMGINFO pImgInfo = NULL; -BLENDFUNCTION BlendFunc = {AC_SRC_OVER, 0, 255, AC_SRC_ALPHA}; +static PIMGINFO pImgInfo; +static const BLENDFUNCTION BlendFunc = {AC_SRC_OVER, 0, 255, AC_SRC_ALPHA}; VOID ShowLastWin32Error(HWND hWndOwner) {

4 years, 11 months

[reactos] 01/01: [TRANSLATION] Add/update Hungarian translation for shell32, ieframe, browseui (#2127)

by 7OMI

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=66f6d051eb008cd51bfe1… commit 66f6d051eb008cd51bfe1e8f5f107915b1e0a4b5 Author: 7OMI <36586477+7OMI(a)users.noreply.github.com> AuthorDate: Tue Jan 14 18:52:38 2020 +0100 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Tue Jan 14 18:52:38 2020 +0100 [TRANSLATION] Add/update Hungarian translation for shell32, ieframe, browseui (#2127) --- dll/win32/browseui/browseui.rc | 3 + dll/win32/browseui/lang/hu-HU.rc | 355 +++++++++++++++++++++++++++++++++++++++ dll/win32/ieframe/ieframe.rc | 3 + dll/win32/ieframe/lang/hu-HU.rc | 78 +++++++++ dll/win32/shell32/lang/hu-HU.rc | 162 +++++++++--------- 5 files changed, 520 insertions(+), 81 deletions(-) diff --git a/dll/win32/browseui/browseui.rc b/dll/win32/browseui/browseui.rc index 6f6c28db4af..0d43f1c17af 100644 --- a/dll/win32/browseui/browseui.rc +++ b/dll/win32/browseui/browseui.rc @@ -85,6 +85,9 @@ IDR_FINDFOLDER REGISTRY "res/findfolder.rgs" #ifdef LANGUAGE_HI_IN #include "lang/hi-IN.rc" #endif +#ifdef LANGUAGE_HU_HU + #include "lang/hu-HU.rc" +#endif #ifdef LANGUAGE_ID_ID #include "lang/id-ID.rc" #endif diff --git a/dll/win32/browseui/lang/hu-HU.rc b/dll/win32/browseui/lang/hu-HU.rc new file mode 100644 index 00000000000..24583c6826b --- /dev/null +++ b/dll/win32/browseui/lang/hu-HU.rc @@ -0,0 +1,355 @@ +/* + * Copyright 2009 Andrew Hill + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT + +/* Menus */ + +IDM_CABINET_CONTEXTMENU MENUEX +BEGIN + POPUP "", 264,MFT_STRING,MFS_ENABLED + BEGIN + MENUITEM "&Szokásos gombok", IDM_TOOLBARS_STANDARDBUTTONS, MFT_STRING, MFS_ENABLED + MENUITEM "&Címsor", IDM_TOOLBARS_ADDRESSBAR, MFT_STRING, MFS_ENABLED + MENUITEM "&Hivatkozások", IDM_TOOLBARS_LINKSBAR, MFT_STRING, MFS_ENABLED + MENUITEM "", -1, MFT_SEPARATOR + MENUITEM "&Eszköztárak rögzítése", IDM_TOOLBARS_LOCKTOOLBARS, MFT_STRING, MFS_ENABLED + MENUITEM "&Testreszabás...", IDM_TOOLBARS_CUSTOMIZE, MFT_STRING, MFS_ENABLED + MENUITEM "Szö&vegcímkék", IDM_TOOLBARS_TEXTLABELS, MFT_STRING, MFS_ENABLED + MENUITEM "&Ugrás gomb", IDM_TOOLBARS_GOBUTTON, MFT_STRING, MFS_ENABLED + END +END + +IDM_CABINET_MAINMENU MENUEX +BEGIN + POPUP "&Fájl", FCIDM_MENU_FILE + BEGIN + MENUITEM "", -1, MFT_SEPARATOR + MENUITEM "Be&zárás", IDM_FILE_CLOSE + END + POPUP "S&zerkesztés", FCIDM_MENU_EDIT + BEGIN + MENUITEM "", -1, MFT_SEPARATOR + END + POPUP "&Nézet", FCIDM_MENU_VIEW + BEGIN + POPUP "&Eszköztárak", IDM_VIEW_TOOLBARS + BEGIN + MENUITEM "", -1, MFT_SEPARATOR + END + MENUITEM "Álla&potsor", IDM_VIEW_STATUSBAR + POPUP "Bön&gészősáv", IDM_VIEW_EXPLORERBAR + BEGIN + MENUITEM "Ke&resés\tCtrl+E", IDM_EXPLORERBAR_SEARCH + MENUITEM "&Kedvencek\tCtrl+I", IDM_EXPLORERBAR_FAVORITES + MENUITEM "Mé&dia", IDM_EXPLORERBAR_MEDIA + MENUITEM "&Előzmények\tCtrl+H", IDM_EXPLORERBAR_HISTORY + MENUITEM "&Mappák", IDM_EXPLORERBAR_FOLDERS + MENUITEM "", IDM_EXPLORERBAR_SEPARATOR + END + MENUITEM "", FCIDM_MENU_VIEW_SEP_OPTIONS, MFT_SEPARATOR + POPUP "&Ugrás", FCIDM_MENU_EXPLORE + BEGIN + MENUITEM "&Vissza\tAlt+Left Arrow", IDM_GOTO_BACK + MENUITEM "&Előre\tAlt+Right Arrow", IDM_GOTO_FORWARD + MENUITEM "Egy szinttel &feljebb", IDM_GOTO_UPONELEVEL + MENUITEM "", -1, MFT_SEPARATOR + MENUITEM "&Kezdőlap\tAlt+Home", IDM_GOTO_HOMEPAGE + END + MENUITEM "&Frissítés", IDM_VIEW_REFRESH + END + POPUP "Ked&vencek", FCIDM_MENU_FAVORITES + BEGIN + MENUITEM "&Hozzáadás a kedvencekhez...", IDM_FAVORITES_ADDTOFAVORITES + MENUITEM "Kedvencek &rendezése...", IDM_FAVORITES_ORGANIZEFAVORITES + MENUITEM "", -1, MFT_SEPARATOR + MENUITEM "(üres)", IDM_FAVORITES_EMPTY + END + POPUP "&Eszközök", FCIDM_MENU_TOOLS + BEGIN + MENUITEM "Hálózati meghajtó &csatlakoztatása...", IDM_TOOLS_MAPNETWORKDRIVE + MENUITEM "Hálózati meghajtó &leválasztása...", IDM_TOOLS_DISCONNECTNETWORKDRIVE + MENUITEM "&Szinkronizálás...", IDM_TOOLS_SYNCHRONIZE + MENUITEM "", -1, MFT_SEPARATOR + MENUITEM "&Mappabeállítások...", IDM_TOOLS_FOLDEROPTIONS + END + POPUP "&Súgó", FCIDM_MENU_HELP + BEGIN + MENUITEM "&Névjegy", IDM_HELP_ABOUT + END +END + +IDM_TASKBAR_TOOLBARS MENUEX +BEGIN + POPUP "&Eszköztárak", -1, MFT_STRING, MFS_ENABLED, 0 + BEGIN + MENUITEM "&Asztal", IDM_TASKBAR_TOOLBARS_DESKTOP, MFT_STRING + MENUITEM "&Gyorsindítás", IDM_TASKBAR_TOOLBARS_QUICKLAUNCH, MFT_STRING + MENUITEM "", -1, MFT_SEPARATOR, MFS_ENABLED + MENUITEM "Új &eszköztár...", IDM_TASKBAR_TOOLBARS_NEW, MFT_STRING + END +END + +IDM_BAND_MENU MENUEX +BEGIN + MENUITEM "&Címsor megjelentítése", IDM_BAND_TITLE + MENUITEM "Az eszköztár &bezárása", IDM_BAND_CLOSE +END + +IDM_POPUPMENU MENUEX DISCARDABLE +BEGIN + POPUP "" + BEGIN + POPUP "&Nézet", IDM_VIEW_MENU + BEGIN + MENUITEM "&Nagy ikonok", IDM_LARGE_ICONS + MENUITEM "&Kis ikonok", IDM_SMALL_ICONS + END + MENUITEM "&Mappa megnyitása", IDM_OPEN_FOLDER + MENUITEM "&Szöveg megjelenítése", IDM_SHOW_TEXT + END +END + +/* Dialogs */ + +IDD_PROGRESS_DLG DIALOGEX 0, 0, 260, 85 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU +CAPTION "" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "", IDC_ANIMATION, ANIMATE_CLASSA, 0, 12, 10, 236, 30 /* TODO: style */ + LTEXT "", IDC_TEXT_LINE, 7, 45, 250, 10, SS_LEFT|SS_NOPREFIX + LTEXT "", IDC_TEXT_LINE + 1, 7, 55, 250, 10, SS_LEFT|SS_NOPREFIX + LTEXT "", IDC_TEXT_LINE + 2, 7, 75, 190, 10, SS_LEFT|SS_NOPREFIX + CONTROL "", IDC_PROGRESS_BAR, PROGRESS_CLASSA, WS_BORDER, 7, 65, 190, 8 + PUSHBUTTON "Cancel", IDCANCEL, 205, 65, 50, 15, WS_GROUP | WS_TABSTOP | WS_VISIBLE +END + +IDD_CUSTOMIZETOOLBAREX DIALOGEX 0, 0, 357, 33 +STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_VISIBLE | WS_CAPTION +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + LTEXT "Te&xt options:", -1, 4, 2, 48, 15 + COMBOBOX IDC_TEXTOPTIONS, 52, 0, 123, 57, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Ico&n options:", -1, 4, 20, 48, 15 + COMBOBOX IDC_ICONOPTIONS, 52, 18, 123, 57, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP +END + +IDD_SEARCH_DLG DIALOGEX 0, 0, 260, 85 +STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_VISIBLE | WS_CAPTION | WS_DLGFRAME +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Search by any or all of the criteria below.", IDC_SEARCH_LABEL, 4, 2, 120, 20 + + LTEXT "All or part &of the file name:", -1, 10, 25, 500, 10 + EDITTEXT IDC_SEARCH_FILENAME, 10, 35, 100, 12, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + + LTEXT "A &word or phrase in the file:", -1, 10, 50, 500, 10 + EDITTEXT IDC_SEARCH_QUERY, 10, 60, 100, 12, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + + LTEXT "&Look in:", -1, 10, 75, 500, 10 + CONTROL "", IDC_SEARCH_COMBOBOX, WC_COMBOBOXEXW, WS_CHILD | WS_VISIBLE | WS_CLIPCHILDREN | WS_TABSTOP | CCS_NODIVIDER | CCS_NOMOVEY | CBS_OWNERDRAWFIXED, 10, 85, 200, 200 + + DEFPUSHBUTTON "Sea&rch", IDC_SEARCH_BUTTON, 80, 110, 40, 15, WS_GROUP | WS_TABSTOP | WS_VISIBLE + PUSHBUTTON "&Stop", IDC_SEARCH_STOP_BUTTON, 80, 110, 40, 15, WS_GROUP | WS_TABSTOP + + AUTOCHECKBOX "Search Hidden Files and Folders", + IDC_SEARCH_HIDDEN, 4, 130, 130, 8, WS_VISIBLE | WS_GROUP | WS_TABSTOP + + CONTROL "", IDC_PROGRESS_BAR, PROGRESS_CLASSA, WS_BORDER | PBS_MARQUEE, 10, 155, 200, 8 +END + +/* Accelerators */ + +IDR_ACCELERATORS ACCELERATORS +BEGIN + VK_F5, IDM_VIEW_REFRESH, VIRTKEY, NOINVERT + VK_F5, IDM_VIEW_REFRESH, VIRTKEY, CONTROL, NOINVERT + "R", IDM_VIEW_REFRESH, VIRTKEY, CONTROL, NOINVERT + VK_HOME, IDM_GOTO_HOMEPAGE, VIRTKEY, ALT, NOINVERT + "D", IDM_FAVORITES_ADDTOFAVORITES, VIRTKEY, CONTROL, NOINVERT + "B", IDM_FAVORITES_ORGANIZEFAVORITES, VIRTKEY, CONTROL, NOINVERT + VK_LEFT, IDM_GOTO_BACK, VIRTKEY, ALT + VK_RIGHT, IDM_GOTO_FORWARD, VIRTKEY, ALT + VK_UP, IDM_GOTO_UPONELEVEL, VIRTKEY, ALT + VK_BACK, 41010, NOINVERT, VIRTKEY + "W", IDM_FILE_CLOSE, VIRTKEY, CONTROL, NOINVERT + "E", IDM_EXPLORERBAR_SEARCH, VIRTKEY, CONTROL, NOINVERT + "I", IDM_EXPLORERBAR_FAVORITES, VIRTKEY, CONTROL, NOINVERT + "H", IDM_EXPLORERBAR_HISTORY, VIRTKEY, CONTROL, NOINVERT +END + +/* Strings */ + +STRINGTABLE +BEGIN + IDS_CANCELLING "Canceling..." + IDS_REMAINING "Remaining" +END + +STRINGTABLE +BEGIN + 800 "Contains commands for manipulating the selected items." +END + +STRINGTABLE +BEGIN + 864 "Contains edit commands." +END + +STRINGTABLE +BEGIN + 928 "Contains commands for manipulating the view." +END + +STRINGTABLE +BEGIN + 992 "Contains tools commands." +END + +STRINGTABLE +BEGIN + 1056 "Contains commands for displaying Help." +END + +STRINGTABLE +BEGIN + 9025 "Closes the window." + 9026 "Goes up one level." +END + +STRINGTABLE +BEGIN + 9121 "Connects to a network drive." + 9122 "Disconnects from a network drive." +END + +STRINGTABLE +BEGIN + 9250 "Displays program information, version number, and copyright." + 9252 "Displays information for debugging." +END + +STRINGTABLE +BEGIN + 9281 "Goes to the previous page." + 9282 "Goes to the next page." + 9283 "Enables you to change settings." + 9285 "Goes to your home page." +END + +STRINGTABLE +BEGIN + 9362 "Opens the Favorites folder." + 9363 "Adds the current page to your Favorites list." +END + +STRINGTABLE +BEGIN + 9505 "Shows or hides toolbars." + 9506 "Shows or hides the status bar." + 9508 "Displays the Standard Buttons toolbar." + 9509 "Displays the Address bar." + 9510 "Displays the Quick Links bar." + 9516 "Locks the sizes and positions of the toolbars." +END + +STRINGTABLE +BEGIN + 9533 "Customizes the toolbar." +END + +STRINGTABLE +BEGIN + 9552 "Shows or hides an Explorer bar." + 9553 "Shows the Search bar." + 9554 "Shows the Favorites bar." + 9555 "Shows the History bar." + 9557 "Shows the Folders bar." + 9559 "Shows the Media Bar." +END + +STRINGTABLE +BEGIN + IDS_SMALLICONS "Small icons" + IDS_LARGEICONS "Large icons" + IDS_SHOWTEXTLABELS "Show text labels" +END + +STRINGTABLE +BEGIN + IDS_NOTEXTLABELS "No text labels" + IDS_SELECTIVETEXTONRIGHT "Selective text on right" +END + +STRINGTABLE +BEGIN + IDS_GOBUTTONLABEL "|Ugrás||" + IDS_GOBUTTONTIPTEMPLATE "Ugrás a következőre: ""%s""" +END + +STRINGTABLE +BEGIN + IDS_SEARCHLABEL "Keresés" + IDS_ADDRESSBANDLABEL "&Cím" +END + +STRINGTABLE +BEGIN + IDS_FOLDERSLABEL "Mappák" +END + +STRINGTABLE +BEGIN + IDS_HISTORYTEXT "&Előzmények\tCtrl+H" +END + +STRINGTABLE +BEGIN + IDS_UP "Fel" +END + +STRINGTABLE +BEGIN + IDS_BACK "Back to %s" + IDS_FORWARD "Forward to %s" + IDS_FOLDER_OPTIONS "Folder Options" +END + +STRINGTABLE +BEGIN + IDS_STANDARD_TOOLBAR, "|Back|Forward|Up|Search|Folders|Move To|Copy To|Delete|Undo|Views|Stop|Refresh|Home|Map Drive|Disconnect|Favorites|History|Full Screen|Properties|Cut|Copy|Paste|Folder Options||" +END + +STRINGTABLE +BEGIN + IDS_BROWSEFORNEWTOOLAR "Choose a folder" + IDS_TOOLBAR_ERR_TITLE "Eszköztár" + IDS_TOOLBAR_ERR_TEXT "Cannot create toolbar." +END + +STRINGTABLE +BEGIN + IDS_SEARCHINVALID "'%1' is not a valid folder." + IDS_SEARCH_FOLDER "Searching %s" + IDS_SEARCH_FILES_FOUND "%u files found" + IDS_SEARCH_OPEN_FOLDER "Open Containing &Folder" + IDS_COL_NAME "Név" + IDS_COL_LOCATION "In Folder" + IDS_COL_RELEVANCE "Relevance" +END diff --git a/dll/win32/ieframe/ieframe.rc b/dll/win32/ieframe/ieframe.rc index bfbfe8be5dd..3f3797eeb0f 100644 --- a/dll/win32/ieframe/ieframe.rc +++ b/dll/win32/ieframe/ieframe.rc @@ -38,6 +38,9 @@ #ifdef LANGUAGE_FR_FR #include "lang/fr-FR.rc" #endif +#ifdef LANGUAGE_HU_HU + #include "lang/hu-HU.rc" +#endif #ifdef LANGUAGE_ID_ID #include "lang/id-ID.rc" #endif diff --git a/dll/win32/ieframe/lang/hu-HU.rc b/dll/win32/ieframe/lang/hu-HU.rc new file mode 100644 index 00000000000..000857b8428 --- /dev/null +++ b/dll/win32/ieframe/lang/hu-HU.rc @@ -0,0 +1,78 @@ +LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT + +IDR_BROWSE_MAIN_MENU MENU +{ + POPUP "&File" + { + POPUP "&New" + { + MENUITEM "&Window", ID_BROWSE_NEW_WINDOW + } + MENUITEM "&Open...", ID_BROWSE_OPEN + MENUITEM "&Save", ID_BROWSE_SAVE + MENUITEM "Save &As...", ID_BROWSE_SAVE_AS + MENUITEM SEPARATOR + MENUITEM "Print &Format...", ID_BROWSE_PRINT_FORMAT + MENUITEM "Pr&int...", ID_BROWSE_PRINT + MENUITEM "Print Pre&view", ID_BROWSE_PRINT_PREVIEW + MENUITEM SEPARATOR + MENUITEM "&Properties", ID_BROWSE_PROPERTIES + MENUITEM "&Close", ID_BROWSE_QUIT + } + POPUP "&View" + { + POPUP "&Toolbars" + { + MENUITEM "&Standard bar", ID_BROWSE_BAR_STD + MENUITEM "&Address bar", ID_BROWSE_BAR_ADDR + } + } + POPUP "F&avorites" + { + MENUITEM "&Add to favorites...", ID_BROWSE_ADDFAV + MENUITEM SEPARATOR + } + POPUP "&Help" + { + MENUITEM "&About Internet Explorer", ID_BROWSE_ABOUT + } +} + +STRINGTABLE +{ + IDS_TB_BACK "Vissza" + IDS_TB_FORWARD "Előre" + IDS_TB_STOP "Leállítás" + IDS_TB_REFRESH "Frissítés" + IDS_TB_HOME "Home" + IDS_TB_PRINT "Nyomtatás..." +} + +STRINGTABLE +{ + IDS_ADDRESS "Cím" +} + +STRINGTABLE +{ + IDS_FINDINGRESOURCE "Searching for %s" + IDS_BEGINDOWNLOADDATA "Start downloading %s" + IDS_ENDDOWNLOADDATA "Downloading %s" + IDS_SENDINGREQUEST "Asking for %s" +} + + +IDD_BROWSE_OPEN DIALOGEX 10, 10, 200, 70 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION +CAPTION "Open URL" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Specify the URL you wish to open in Internet Explorer",-1, 35,5,160,25 + LTEXT "Open:", -1, 5, 32, 30, 15 +#ifdef __REACTOS__ + ICON IDC_PAGEICO, IDC_PAGEICO, 2, 5, 21, 20, SS_ICON +#endif + EDITTEXT IDC_BROWSE_OPEN_URL, 35, 30, 160, 13 + DEFPUSHBUTTON "OK", IDOK, 90, 50, 50, 14 + PUSHBUTTON "Mégse", IDCANCEL, 145, 50, 50, 14 +} \ No newline at end of file diff --git a/dll/win32/shell32/lang/hu-HU.rc b/dll/win32/shell32/lang/hu-HU.rc index ba97317bb44..1691326ab38 100644 --- a/dll/win32/shell32/lang/hu-HU.rc +++ b/dll/win32/shell32/lang/hu-HU.rc @@ -32,7 +32,7 @@ BEGIN MENUITEM "", -1, MFT_SEPARATOR MENUITEM "&Automatikus elrendezés", FCIDM_SHVIEW_AUTOARRANGE END - MENUITEM "Ikonok igazitása", FCIDM_SHVIEW_SNAPTOGRID + MENUITEM "Ikonok igazítása", FCIDM_SHVIEW_SNAPTOGRID MENUITEM "", -1, MFT_SEPARATOR MENUITEM "Frissítés", FCIDM_SHVIEW_REFRESH MENUITEM "", -1, MFT_SEPARATOR @@ -66,7 +66,7 @@ BEGIN MENUITEM SEPARATOR MENUITEM "Kivágás", IDM_CUT MENUITEM "Másolás", IDM_COPY - MENUITEM "Paste", IDM_INSERT + MENUITEM "Beillesztés", IDM_INSERT MENUITEM SEPARATOR MENUITEM "Parancsikon létrehozása", IDM_CREATELINK MENUITEM "Törlés", IDM_DELETE @@ -84,7 +84,7 @@ BEGIN MENUITEM "&Move here", IDM_MOVEHERE MENUITEM "Create &shortcuts here", IDM_LINKHERE MENUITEM SEPARATOR - MENUITEM "Cancel", 0 + MENUITEM "Mégse", 0 END END @@ -130,7 +130,7 @@ END IDD_ABOUT DIALOGEX 0, 0, 275, 198 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "About %s" +CAPTION "%s névjegye" FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20 @@ -178,7 +178,7 @@ END IDD_SHORTCUT_PROPERTIES DIALOGEX 0, 0, 235, 215 STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION -CAPTION "Shortcut" +CAPTION "Parancsikon" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN ICON "", IDC_SHORTCUT_ICON, 8, 8, 21, 20, WS_VISIBLE @@ -256,7 +256,7 @@ BEGIN EDITTEXT 14001, 58, 9, 170, 14, ES_LEFT | WS_TABSTOP LTEXT "", -1, 8, 29, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE LTEXT "Type of file:", 14004, 8, 35, 50, 10 - CONTROL "File", 14005, "edit", ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP, 58, 35, 170, 10 + CONTROL "Fájl", 14005, "edit", ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP, 58, 35, 170, 10 LTEXT "Opens with:", 14006, 8, 53, 50, 10 ICON "", 14025, 58, 52, 11, 10, NOT WS_VISIBLE PUSHBUTTON "&Change...", 14024, 168, 50, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP @@ -288,9 +288,9 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Version" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "File version: ", 14000, 10, 10, 55, 10 + LTEXT "Fájlverzió: ", 14000, 10, 10, 55, 10 EDITTEXT 14001, 77, 10, 152, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER - LTEXT "Description: ", 14002, 10, 27, 45, 10 + LTEXT "Leírás: ", 14002, 10, 27, 45, 10 EDITTEXT 14003, 77, 27, 152, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER LTEXT "Copyright: ", 14004, 10, 46, 66, 10 EDITTEXT 14005, 77, 46, 152, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER @@ -377,7 +377,7 @@ BEGIN EDITTEXT 14005, 74, 140, 100, 14, ES_LEFT | WS_BORDER | WS_GROUP PUSHBUTTON "...", 14006, 180, 140, 30, 14, WS_TABSTOP PUSHBUTTON "OK", 14007, 57, 170, 60, 14, WS_TABSTOP - PUSHBUTTON "Cancel", 14008, 122, 170, 60, 14, WS_TABSTOP + PUSHBUTTON "Mégse", 14008, 122, 170, 60, 14, WS_TABSTOP END IDD_RECYCLE_BIN_PROPERTIES DIALOGEX 0, 0, 240, 190 @@ -401,13 +401,13 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN ICON IDI_SHELL_OPEN_WITH, -1, 8, 12, 21, 20 LTEXT "Choose the program you want to use to open this file:", -1, 44, 12, 211, 10 - LTEXT "File: ", 14001, 44, 25, 188, 20 + LTEXT "Fájl: ", 14001, 44, 25, 188, 20 GROUPBOX "&Programs", -1, 7, 42, 249, 187 CONTROL "Programs", 14002, WC_TREEVIEW, WS_BORDER | WS_TABSTOP | TVS_SHOWSELALWAYS, 16 ,57, 230, 130 AUTOCHECKBOX "&Always use the selected program to open this kind of file", 14003, 20, 193, 225, 10 PUSHBUTTON "&Browse...", 14004, 198, 207, 50, 14 DEFPUSHBUTTON "OK", IDOK, 150, 236, 50, 14 - PUSHBUTTON "Cancel", IDCANCEL, 206, 236, 50, 14 + PUSHBUTTON "Mégse", IDCANCEL, 206, 236, 50, 14 END IDD_FOLDER_OPTIONS_GENERAL DIALOGEX 0, 0, 264, 256 @@ -494,7 +494,7 @@ BEGIN ICON IDI_SHELL_LOGOFF, IDC_STATIC, 8, 6, 21, 20 LTEXT "Are you sure you want to log off?", -1, 49, 15, 131, 8 DEFPUSHBUTTON "&Log Off", IDOK, 49, 38, 43, 14 - PUSHBUTTON "Cancel", IDCANCEL, 99, 38, 43, 14 + PUSHBUTTON "Mégse", IDCANCEL, 99, 38, 43, 14 END IDD_DISCONNECT DIALOGEX 0, 0, 188, 60 @@ -505,7 +505,7 @@ BEGIN ICON IDI_SHELL_DISCONN, IDC_STATIC, 8, 6, 21, 20 LTEXT "Are you sure you want to disconnect?", -1, 49, 15, 131, 8 DEFPUSHBUTTON "&Disconnect", IDOK, 47, 38, 47, 14 - PUSHBUTTON "Cancel", IDCANCEL, 99, 38, 47, 14 + PUSHBUTTON "Mégse", IDCANCEL, 99, 38, 47, 14 END IDD_AUTOPLAY1 DIALOGEX 0, 0, 227, 218 @@ -532,7 +532,7 @@ BEGIN LTEXT "What do you want ReactOS to do?", 1002, 32, 31, 188, 8 CONTROL "", 1003, "SYSLISTVIEW32", WS_BORDER | WS_TABSTOP | 0x0000C04D, 32, 43, 188, 139 DEFPUSHBUTTON "OK", IDOK, 96, 186, 60, 14 - PUSHBUTTON "Cancel", IDCANCEL, 160, 186, 60, 14 + PUSHBUTTON "Mégse", IDCANCEL, 160, 186, 60, 14 END IDD_MIXED_CONTENT2 DIALOGEX 0, 0, 227, 206 @@ -548,7 +548,7 @@ BEGIN CONTROL "", 1003, "SYSLISTVIEW32", WS_BORDER | WS_TABSTOP | 0x0000C04D, 32, 55, 188, 112 AUTOCHECKBOX "Always do the selected action.", 1004, 32, 171, 190, 10 DEFPUSHBUTTON "OK", IDOK, 96, 185, 60, 14 - PUSHBUTTON "Cancel", IDCANCEL, 160, 185, 60, 14 + PUSHBUTTON "Mégse", IDCANCEL, 160, 185, 60, 14 END IDD_AUTOPLAY2 DIALOGEX 0, 0, 227, 181 @@ -575,7 +575,7 @@ BEGIN COMBOBOX 8224, 39, 20, 165, 200, CBS_DROPDOWNLIST | WS_VSCROLL LTEXT "Maintains your session, keeping the computer running on low power with data still in memory. The computer wakes up when you press a key or move the mouse.", 8225, 39, 40, 167, 37 DEFPUSHBUTTON "OK", 1, 7, 82, 60, 14, WS_GROUP - PUSHBUTTON "Cancel", IDCANCEL, 75, 82, 60, 14 + PUSHBUTTON "Mégse", IDCANCEL, 75, 82, 60, 14 PUSHBUTTON "&Help", IDHELP, 144, 82, 60, 14 END @@ -607,7 +607,7 @@ FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "Start", IDOK, 63, 95, 60, 14 GROUPBOX "Check disk options", -1, 7, 6, 179, 40 - PUSHBUTTON "Cancel", IDCANCEL, 128, 95, 60, 14 + PUSHBUTTON "Mégse", IDCANCEL, 128, 95, 60, 14 AUTOCHECKBOX "Automatically fix file system errors", 14000, 12, 15, 155, 10 AUTOCHECKBOX "&Scan for and attempt recovery of bad sectors", 14001, 16, 30, 165, 10 CONTROL "", 14002, "MSCTLS_PROGRESS32", 16, 7, 50, 179, 8 @@ -625,7 +625,7 @@ BEGIN LTEXT "Select an icon from the list below:", -1, 7, 36, 179, 10 LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 122, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 81, 179, 50, 14 - PUSHBUTTON "Cancel", IDCANCEL, 135, 179, 50, 14 + PUSHBUTTON "Mégse", IDCANCEL, 135, 179, 50, 14 END IDD_NOOPEN DIALOGEX 0, 0, 240, 75 @@ -638,8 +638,8 @@ BEGIN another application. Modifying this file might damage your\n\ system or make it less functional.\n\n\ Are you sure you want to open this file?", IDC_STATIC, 35, 5, 230, 60 - DEFPUSHBUTTON "Yes", IDYES, 125, 55, 50, 14 - PUSHBUTTON "No", IDNO, 180, 55, 50, 14 + DEFPUSHBUTTON "Igen", IDYES, 125, 55, 50, 14 + PUSHBUTTON "Nem", IDNO, 180, 55, 50, 14 END IDD_NEWEXTENSION DIALOGEX 0, 0, 260, 75 @@ -653,7 +653,7 @@ BEGIN LTEXT "&Associated File Type:", 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 "Mégse", IDCANCEL, 190, 55, 60, 14 END IDD_EDITTYPE DIALOG 0, 0, 225, 190 @@ -725,14 +725,14 @@ BEGIN IDS_SHV_COLUMN_DISK_AVAILABLE "Rendelkezésre álló hely" IDS_SHV_COLUMN_OWNER "Tulajdonos" IDS_SHV_COLUMN_GROUP "Csoport" - IDS_SHV_COLUMN_FILENAME "Filename" - IDS_SHV_COLUMN_CATEGORY "Category" + IDS_SHV_COLUMN_FILENAME "Fájlnév" + IDS_SHV_COLUMN_CATEGORY "Kategória" IDS_SHV_COLUMN_DELFROM "Original location" IDS_SHV_COLUMN_DELDATE "Date deleted" IDS_SHV_COLUMN_FONTTYPE "Fonttype" - IDS_SHV_COLUMN_WORKGROUP "Workgroup" + IDS_SHV_COLUMN_WORKGROUP "Munkacsoport" IDS_SHV_COLUMN_NETLOCATION "Network Location" - IDS_SHV_COLUMN_DOCUMENTS "Documents" + IDS_SHV_COLUMN_DOCUMENTS "Dokumentumok" IDS_SHV_COLUMN_STATUS "Status" IDS_SHV_COLUMN_COMMENTS "Megjegyzések" IDS_SHV_COLUMN_LOCATION "Location" @@ -741,8 +741,8 @@ BEGIN /* special folders */ IDS_DESKTOP "Asztal" IDS_MYCOMPUTER "Számítógép" - IDS_RECYCLEBIN_FOLDER_NAME "Recycle Bin" - IDS_CONTROLPANEL "Control Panel" + IDS_RECYCLEBIN_FOLDER_NAME "Lomtár" + IDS_CONTROLPANEL "Vezérlőpult" IDS_ADMINISTRATIVETOOLS "Administrative Tools" /* special folders descriptions */ @@ -765,9 +765,9 @@ BEGIN IDS_CUT "Kivágás" IDS_RESTORE "Restore" IDS_FORMATDRIVE "Format..." - IDS_RENAME "Rename" - IDS_PASTE "Paste" - IDS_EJECT "Eject" + IDS_RENAME "Átnevezés" + IDS_PASTE "Beillesztés" + IDS_EJECT "Kiadás" IDS_DISCONNECT "Disconnect" IDS_OPENFILELOCATION "Open f&ile location" IDS_DESKLINK "Desktop (Create shortcut)" @@ -796,18 +796,18 @@ BEGIN IDS_OVERWRITEFILE_CAPTION "Állomány felülírása" IDS_OVERWRITEFOLDER_TEXT "This folder already contains a folder named '%1'.\n\nIf the files in the destination folder have the same names as files in the\nselected folder they will be replaced. Do you still want to move or copy\nthe folder?" - IDS_FILEOOP_COPYING "Copying..." - IDS_FILEOOP_MOVING "Moving..." - IDS_FILEOOP_DELETING "Deleting..." + IDS_FILEOOP_COPYING "Másolás..." + IDS_FILEOOP_MOVING "Áthelyezés..." + IDS_FILEOOP_DELETING "Törlés..." IDS_FILEOOP_FROM_TO "From %1 to %2" IDS_FILEOOP_FROM "From %1" IDS_FILEOOP_PREFLIGHT "Preflight" /* message box strings */ IDS_RESTART_TITLE "Újraindítás" - IDS_RESTART_PROMPT "Újra szeretnéd indítani a rendszert?" + IDS_RESTART_PROMPT "Újra szeretné indítani a rendszert?" IDS_SHUTDOWN_TITLE "Kikapcsolás" - IDS_SHUTDOWN_PROMPT "Kiakarod kapcsolni számítógépét?" + IDS_SHUTDOWN_PROMPT "Ki szeretné kapcsolni számítógépét?" /* Format Dialog Strings */ IDS_FORMAT_TITLE "Format Local Disk" @@ -818,42 +818,42 @@ BEGIN IDS_RUNDLG_ERROR "Unable to display Run File dialog box (internal error)" IDS_RUNDLG_BROWSE_ERROR "Unable to display Browse dialog box (internal error)" IDS_RUNDLG_BROWSE_CAPTION "Browse" - IDS_RUNDLG_BROWSE_FILTER "Executable Files (*.exe)\0*.exe\0All Files (*.*)\0*.*\0" + IDS_RUNDLG_BROWSE_FILTER "Executable Files (*.exe)\0*.exe\0Minden fájl (*.*)\0*.*\0" /* shell folder path default values */ - IDS_PROGRAMS "Start Menu\\Programs" + IDS_PROGRAMS "Start menü\\Programok" IDS_PERSONAL "Dokumentumok" IDS_FAVORITES "Kedvencek" - IDS_STARTUP "Start Menu\\Programs\\Automatikus indítás" /* MS style: Indítópult */ + IDS_STARTUP "Start menü\\Programok\\Automatikus indítás" /* MS style: Indítópult */ IDS_RECENT "Recent" IDS_SENDTO "SendTo" - IDS_STARTMENU "Start Menu" + IDS_STARTMENU "Start menü" IDS_MYMUSIC "Zenék" IDS_MYVIDEO "Videók" IDS_DESKTOPDIRECTORY "Asztal" IDS_NETHOOD "NetHood" - IDS_TEMPLATES "Templates" - IDS_APPDATA "Application Data" + IDS_TEMPLATES "Sablonok" + IDS_APPDATA "Alkalmazás adatok" IDS_PRINTHOOD "PrintHood" - IDS_LOCAL_APPDATA "Local Settings\\Application Data" + IDS_LOCAL_APPDATA "Local Settings\\Alkalmazás adatok" IDS_INTERNET_CACHE "Local Settings\\Temporary Internet Files" - IDS_COOKIES "Cookies" + IDS_COOKIES "Sütik" IDS_HISTORY "Local Settings\\History" - IDS_PROGRAM_FILES "Program Files" + IDS_PROGRAM_FILES "Programfájlok" IDS_MYPICTURES "Képek" - IDS_PROGRAM_FILES_COMMON "Program Files\\Common Files" + IDS_PROGRAM_FILES_COMMON "Programfájlok\\Common Files" IDS_COMMON_DOCUMENTS "Dokumentumok" - IDS_ADMINTOOLS "Start Menu\\Programs\\Felügyeleti eszközök" + IDS_ADMINTOOLS "Start menü\\Programok\\Felügyeleti eszközök" IDS_COMMON_MUSIC "Dokumentumok\\Zenék" IDS_COMMON_PICTURES "Dokumentumok\\Képek" IDS_COMMON_VIDEO "Dokumentumok\\Videók" - IDS_CDBURN_AREA "Local Settings\\Application Data\\Microsoft\\CD Burning" + IDS_CDBURN_AREA "Local Settings\\Alkalmazás adatok\\Microsoft\\CD Burning" IDS_NETWORKPLACE "My Network Places" - IDS_NEWFOLDER "New Folder" + IDS_NEWFOLDER "Új mappa" - IDS_DRIVE_FIXED "Local Disk" - IDS_DRIVE_CDROM "CD Drive" + IDS_DRIVE_FIXED "Helyi lemez" + IDS_DRIVE_CDROM "CD-meghajtó" IDS_DRIVE_NETWORK "Network Disk" IDS_DRIVE_FLOPPY "3.5 Floppy" IDS_DRIVE_REMOVABLE "Removable Disk" @@ -870,13 +870,13 @@ BEGIN FCIDM_SHVIEW_NEW "Ú&j" FCIDM_SHVIEW_NEWFOLDER "&Mappa" FCIDM_SHVIEW_NEWLINK "&Parancsikon" - IDS_FOLDER_OPTIONS "Folder Options" + IDS_FOLDER_OPTIONS "Mappabeállítások" IDS_RECYCLEBIN_LOCATION "Recycle Bin Location" IDS_RECYCLEBIN_DISKSPACE "Space Available" IDS_EMPTY_BITBUCKET "Empty Recycle Bin" IDS_PICK_ICON_TITLE "Choose Icon" - 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_PICK_ICON_FILTER "Ikonfájlok (*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0Minden fájl (*.*)\0*.*\0" + IDS_OPEN_WITH_FILTER "Executable Files (*.exe)\0*.exe\0Minden fájl (*.*)\0*.*\0" IDS_CANTLOCKVOLUME "Unable to lock volume (Error Code: %lu)." IDS_CANTDISMOUNTVOLUME "Unable to dismount volume (Error Code: %lu)." @@ -887,32 +887,32 @@ BEGIN /* Friendly File Type Names */ IDS_DIRECTORY "Folder" - IDS_BAT_FILE "ReactOS Batch File" - IDS_CMD_FILE "ReactOS Command Script" - IDS_COM_FILE "DOS Application" - IDS_CPL_FILE "Control Panel Item" - IDS_CUR_FILE "Cursor" + IDS_BAT_FILE "ReactOS kötegfájl" + IDS_CMD_FILE "ReactOS parancsfájl" + IDS_COM_FILE "DOS alkalmazás" + IDS_CPL_FILE "Vezérlőpultelem" + IDS_CUR_FILE "Kurzor" IDS_DB__FILE "Database File" - IDS_DLL_FILE "Application Extension" - IDS_DRV_FILE "Device Driver" + IDS_DLL_FILE "Alkalmazáskiterjesztés" + IDS_DRV_FILE "Eszközillesztő" IDS_EFI_FILE "Extensible Firmware Interface Executable" - IDS_EXE_FILE "Application" + IDS_EXE_FILE "Alkalmazás" IDS_NLS_FILE "National Language Support File" - IDS_OCX_FILE "ActiveX Control" + IDS_OCX_FILE "ActiveX-vezérlő" IDS_TLB_FILE "Type Library" - IDS_FON_FILE "Font file" - IDS_TTF_FILE "TrueType Font file" - IDS_OTF_FILE "OpenType Font file" - IDS_HLP_FILE "Help File" - IDS_ICO_FILE "Icon" - IDS_INI_FILE "Configuration Settings" - IDS_LNK_FILE "Shortcut" + IDS_FON_FILE "Betűkészletfájl" + IDS_TTF_FILE "TrueType betűkészletfájl" + IDS_OTF_FILE "OpenType betűkészletfájl" + IDS_HLP_FILE "Súgófájl" + IDS_ICO_FILE "Ikon" + IDS_INI_FILE "Konfigurációs beállítások" + IDS_LNK_FILE "Parancsikon" IDS_NT__FILE "NT DOS32 Configuration File" IDS_PIF_FILE "NT VDM Program Information File" - IDS_SCR_FILE "Screen Saver" - IDS_SYS_FILE "System File" - IDS_VXD_FILE "Virtual Device Driver" - IDS_ANY_FILE "%s-file" + IDS_SCR_FILE "Képernyőkímélő" + IDS_SYS_FILE "Rendszerfájl" + IDS_VXD_FILE "Virtuális eszközillesztő" + IDS_ANY_FILE "%s fájl" IDS_OPEN_VERB "Open" IDS_EXPLORE_VERB "Explore" @@ -922,8 +922,8 @@ BEGIN IDS_PRINT_VERB "Print" IDS_CMD_VERB "Command Prompt here" - IDS_FILE_FOLDER "%u Files, %u Folders" - IDS_PRINTERS "Printers" + IDS_FILE_FOLDER "%u fájl, %u mappa" + IDS_PRINTERS "Nyomtatók" IDS_FONTS "Fonts" IDS_INSTALLNEWFONT "Install New Font..." @@ -941,13 +941,13 @@ BEGIN used in the _File type_ tab of the _Folder Options_ dialog */ IDS_FILE_EXT_TYPE "%s File" - IDS_BYTES_FORMAT "bytes" - IDS_UNKNOWN_APP "Unknown application" - IDS_EXE_DESCRIPTION "Description:" + IDS_BYTES_FORMAT "bájt" + IDS_UNKNOWN_APP "Ismeretlen alkalmazás" + IDS_EXE_DESCRIPTION "Leírás:" - IDS_MENU_EMPTY "(Empty)" - IDS_OBJECTS "%d Objects" - IDS_OBJECTS_SELECTED "%d Objects Selected" + IDS_MENU_EMPTY "(üres)" + IDS_OBJECTS "%d elem" + IDS_OBJECTS_SELECTED "%d kijelölt elem" IDS_ADVANCED_FOLDER "Files and Folders" IDS_ADVANCED_NET_CRAWLER "Automatically search for network folders and printers"

4 years, 11 months

[reactos] 01/01: [FLOPPY_NEW] WindowsSync to 8fb512a (#2238)

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=82d2f13ceadbe0c86e070… commit 82d2f13ceadbe0c86e070597502efb783cbcea5a Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Tue Jan 14 18:50:19 2020 +0100 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Tue Jan 14 18:50:19 2020 +0100 [FLOPPY_NEW] WindowsSync to 8fb512a (#2238) * [FLOPPY_NEW] Make 6 '#ifdef' explicit about '__REACTOS__' * [FLOPPY_NEW] RtlStringCbPrintf?() need bytes, not chars Import https://github.com/microsoft/Windows-driver-samples/commit/8fb512ac674df5ba… --- drivers/storage/floppy_new/floppy.c | 20 ++++++++++---------- media/doc/README.FSD | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/drivers/storage/floppy_new/floppy.c b/drivers/storage/floppy_new/floppy.c index 01db49e5007..90f0615adfd 100644 --- a/drivers/storage/floppy_new/floppy.c +++ b/drivers/storage/floppy_new/floppy.c @@ -28,7 +28,7 @@ Revision History: --*/ -#ifdef _MSC_VER +#if !defined(__REACTOS__) || defined(_MSC_VER) #pragma warning(disable:4214) // nonstandard extension used : bit field types other than int #pragma warning(disable:4201) // nonstandard extension used : nameless struct/union #endif @@ -585,7 +585,7 @@ ScsiFlopUnload( // using #pragma. // -#ifdef _MSC_VER +#if !defined(__REACTOS__) || defined(_MSC_VER) #pragma warning(push) #pragma warning(disable:28152) #endif @@ -699,7 +699,7 @@ Return Value: DeviceCount++; status = RtlStringCbPrintfA((PCCHAR) name, - sizeof(name)/sizeof(UCHAR), + sizeof(name), "\\Device\\Floppy%u", DeviceCount); if (NT_SUCCESS(status)) { @@ -809,7 +809,7 @@ CreateFlopDeviceObjectExit: return status; } // end CreateFlopDeviceObject() -#ifdef _MSC_VER +#if !defined(__REACTOS__) || defined(_MSC_VER) #pragma warning(pop) #endif @@ -934,7 +934,7 @@ ScsiFlopInitDevice( return (STATUS_SUCCESS); } -#ifdef _MSC_VER +#if !defined(__REACTOS__) || defined(_MSC_VER) #pragma warning(suppress:6262) // This function uses 1096 bytes of stack which exceed default value of 1024 bytes used by Code Analysis for flagging as warning #endif #ifdef __REACTOS__ @@ -974,7 +974,7 @@ NTSTATUS ScsiFlopStartDevice( // RtlStringCbPrintfW(ntNameBuffer, - sizeof(ntNameBuffer)/sizeof(WCHAR), + sizeof(ntNameBuffer), L"\\Device\\Floppy%u", fdoExtension->DeviceNumber); @@ -1020,7 +1020,7 @@ NTSTATUS ScsiFlopStartDevice( if (NT_SUCCESS(status)) { RtlStringCbPrintfW(arcNameBuffer, - sizeof(arcNameBuffer)/sizeof(WCHAR), + sizeof(arcNameBuffer), L"\\ArcName\\scsi(%u)disk(%u)fdisk(%u)", scsiAddress.PortNumber, scsiAddress.TargetId, @@ -1042,7 +1042,7 @@ NTSTATUS ScsiFlopStartDevice( // RtlStringCbPrintfW(arcNameBuffer, - sizeof(arcNameBuffer)/sizeof(WCHAR), + sizeof(arcNameBuffer), L"\\ArcName\\multi(%u)disk(%u)fdisk(%u)", 0, 0, @@ -2146,7 +2146,7 @@ Return Value: // driveMediaType is bounded below by DriveMediaLimits[].LowestDriveMediaType -#ifdef _MSC_VER +#if !defined(__REACTOS__) || defined(_MSC_VER) #pragma warning(push) #pragma warning(disable:33010) // 33010: Enum used as array index may be negative #endif @@ -2176,7 +2176,7 @@ Return Value: return TRUE; } } -#ifdef _MSC_VER +#if !defined(__REACTOS__) || defined(_MSC_VER) #pragma warning(pop) #endif } diff --git a/media/doc/README.FSD b/media/doc/README.FSD index 859b183edcc..28ff44cb991 100644 --- a/media/doc/README.FSD +++ b/media/doc/README.FSD @@ -20,7 +20,7 @@ The following FSD are shared with: https://github.com/Microsoft/Windows-driver-s reactos/drivers/filesystems/fastfat_new # Synced to 2817004 reactos/drivers/filesystems/cdfs # Synced to f73e552 -reactos/drivers/storage/floppy_new # Synced to 9d23d43 +reactos/drivers/storage/floppy_new # Synced to 8fb512a The following FS libs are shared with: https://github.com/dosfstools/dosfstools reactos/sdk/lib/fslib/vfatlib/check # Synced to 4.1

4 years, 11 months

← Newer
1
...
4
5
6
7
8
9
10
...
14
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 January 2020