Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 49791: [CMAKE] Convert win32k to spec and add importlib target

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Wed Nov 24 23:38:19 2010 New Revision: 49791 URL: http://svn.reactos.org/svn/reactos?rev=49791&view=rev Log: [CMAKE] Convert win32k to spec and add importlib target Added: branches/cmake-bringup/subsystems/win32/win32k/win32k.spec - copied, changed from r49762, branches/cmake-bringup/subsystems/win32/win32k/win32k.pspec Removed: branches/cmake-bringup/subsystems/win32/win32k/win32k.pspec Modified: branches/cmake-bringup/subsystems/win32/win32k/CMakeLists.txt Modified: branches/cmake-bringup/subsystems/win32/win32k/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… ============================================================================== --- branches/cmake-bringup/subsystems/win32/win32k/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/subsystems/win32/win32k/CMakeLists.txt [iso-8859-1] Wed Nov 24 23:38:19 2010 @@ -1,3 +1,5 @@ + +spec2def(win32k.sys win32k.spec) include_directories( . @@ -146,13 +148,8 @@ objects/xformobj.c stubs/stubs.c stubs/umpdstubs.c - win32k.rc - win32k_${ARCH}.def) + win32k.rc) -if(NOT MSVC) - set_source_files_properties(win32k_${ARCH}.def PROPERTIES EXTERNAL_OBJECT TRUE) -endif() - list(APPEND GENDIB_GENERATED ${CMAKE_CURRENT_BINARY_DIR}/dib/dib8gen.c ${CMAKE_CURRENT_BINARY_DIR}/dib/dib16gen.c @@ -181,6 +178,7 @@ add_library(win32k SHARED ${CMAKE_CURRENT_BINARY_DIR}/win32k_pch.h.gch + ${CMAKE_CURRENT_BINARY_DIR}/win32k.def ${SOURCE}) set_module_type(win32k kernelmodedriver) @@ -193,4 +191,6 @@ add_importlibs(win32k ntoskrnl hal ftfd) add_pch(win32k ${CMAKE_CURRENT_SOURCE_DIR}/pch.h ${SOURCE}) add_dependencies(win32k gendib_generated subsystem_napi) -add_cab_target(win32k 1) +add_cab_target(win32k 1) +add_importlib_target(win32k.spec) + Removed: branches/cmake-bringup/subsystems/win32/win32k/win32k.pspec URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… ============================================================================== --- branches/cmake-bringup/subsystems/win32/win32k/win32k.pspec [iso-8859-1] (original) +++ branches/cmake-bringup/subsystems/win32/win32k/win32k.pspec (removed) @@ -1,229 +1,0 @@ -#include "include/reactos/msvctarget.h" -#undef i386 - -@ stdcall -arch=i386 FLOATOBJ_AddFloatObj(ptr ptr) FLOATOBJ_Add -@ stdcall -arch=i386 FLOATOBJ_DivFloatObj(ptr ptr) FLOATOBJ_Div -@ stdcall -arch=i386 FLOATOBJ_MulFloatObj(ptr ptr) FLOATOBJ_Mul -@ stdcall -arch=i386 FLOATOBJ_SubFloatObj(ptr ptr) FLOATOBJ_Sub -@ stdcall BRUSHOBJ_hGetColorTransform(ptr) -@ stdcall BRUSHOBJ_pvAllocRbrush(ptr long) -@ stdcall BRUSHOBJ_pvGetRbrush(ptr) -@ stdcall BRUSHOBJ_ulGetBrushColor(ptr) -@ stdcall CLIPOBJ_bEnum(ptr long ptr) -@ stdcall CLIPOBJ_cEnumStart(ptr long long long long) -@ stdcall CLIPOBJ_ppoGetPath(ptr) -@ stdcall EngAcquireSemaphore(ptr) -@ stdcall EngAllocMem(long long long) -@ stdcall EngAllocPrivateUserMem(ptr ptr long) -@ stdcall EngAllocSectionMem(ptr long ptr long) -@ stdcall EngAllocUserMem(ptr long) -@ stdcall EngAlphaBlend(ptr ptr ptr ptr ptr ptr ptr) -@ stdcall EngAssociateSurface(ptr ptr long) -@ stdcall EngBitBlt(ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr long) -@ stdcall EngBugCheckEx(long ptr ptr ptr ptr) NTOSKRNL.KeBugCheckEx -@ stdcall EngCheckAbort(ptr) -@ stdcall EngClearEvent(ptr) -@ stdcall EngComputeGlyphSet(long long long) -@ stdcall EngControlSprites(ptr long) -@ stdcall EngCopyBits(ptr ptr ptr ptr ptr ptr) -@ stdcall EngCreateBitmap(long long long long long ptr) -@ stdcall EngCreateClip() -@ stdcall EngCreateDeviceBitmap(ptr long long long) -@ stdcall EngCreateDeviceSurface(ptr long long long) -@ stdcall EngCreateDriverObj(ptr ptr ptr) -@ stdcall EngCreateEvent(ptr) -@ stdcall EngCreatePalette(long long long long long long) -@ stdcall EngCreatePath() -@ stdcall EngCreateSemaphore() -@ stdcall EngCreateWnd(ptr ptr ptr long long) -@ stdcall EngDebugBreak() NTOSKRNL.DbgBreakPoint -@ stdcall EngDebugPrint(ptr ptr ptr) -@ stdcall EngDeleteClip(ptr) -@ stdcall EngDeleteDriverObj(ptr long long) -@ stdcall EngDeleteEvent(ptr) -@ stdcall EngDeleteFile(ptr) -@ stdcall EngDeletePalette(ptr) -@ stdcall EngDeletePath(ptr) -@ stdcall EngDeleteSafeSemaphore(ptr) -@ stdcall EngDeleteSemaphore(ptr) -@ stdcall EngDeleteSurface(ptr) -@ stdcall EngDeleteWnd(ptr) -@ stdcall EngDeviceIoControl(ptr long ptr long ptr long ptr) -@ stdcall EngDitherColor(ptr long long long) -@ stdcall EngDxIoctl(long ptr long) -@ stdcall EngEnumForms(ptr long ptr long ptr ptr) -@ stdcall EngEraseSurface(ptr ptr long) -@ stdcall EngFileIoControl(ptr long ptr ptr ptr ptr ptr) -@ stdcall EngFileWrite(ptr ptr ptr ptr) -@ stdcall EngFillPath(ptr ptr ptr ptr ptr long long) -@ stdcall EngFindImageProcAddress(ptr ptr) -@ stdcall EngFindResource(ptr long long ptr) -@ stdcall EngFntCacheAlloc(long long) -@ stdcall EngFntCacheFault(long long) -@ stdcall EngFntCacheLookUp(long ptr) -@ stdcall EngFreeMem(ptr) -@ stdcall EngFreeModule(ptr) -@ stdcall EngFreePrivateUserMem(ptr ptr) -@ stdcall EngFreeSectionMem(ptr ptr) -@ stdcall EngFreeUserMem(ptr) -@ stdcall EngGetCurrentCodePage(ptr ptr) -@ stdcall EngGetCurrentProcessId() NTOSKRNL.PsGetCurrentProcessId -@ stdcall EngGetCurrentThreadId() NTOSKRNL.PsGetCurrentThreadId -@ stdcall EngGetDriverName(ptr) -@ stdcall EngGetFileChangeTime(ptr ptr) -@ stdcall EngGetFilePath(ptr ptr) -@ stdcall EngGetForm(ptr ptr long ptr long ptr) -@ stdcall EngGetLastError() -@ stdcall EngGetPrinter(ptr long ptr long ptr) -@ stdcall EngGetPrinterData(ptr ptr ptr ptr long ptr) -@ stdcall EngGetPrinterDataFileName(ptr) -@ stdcall EngGetPrinterDriver(ptr ptr long ptr long ptr) -@ stdcall EngGetProcessHandle() -@ stdcall EngGetTickCount() -@ stdcall EngGetType1FontList(ptr ptr long ptr ptr ptr) -@ stdcall EngGradientFill(ptr ptr ptr ptr long ptr long ptr ptr long) -@ stdcall EngHangNotification(ptr ptr) -@ stdcall EngInitializeSafeSemaphore(ptr) -@ stdcall EngIsSemaphoreOwned(ptr) -@ stdcall EngIsSemaphoreOwnedByCurrentThread(ptr) -@ stdcall EngLineTo(ptr ptr ptr long long long long ptr long) -@ stdcall EngLoadImage(ptr) -@ stdcall EngLoadModule(ptr) -@ stdcall EngLoadModuleForWrite(ptr long) -@ stdcall EngLockDirectDrawSurface(ptr) -@ stdcall EngLockDriverObj(ptr) -@ stdcall EngLockSurface(ptr) -@ stdcall EngLpkInstalled() -@ stdcall EngMapEvent(ptr ptr ptr ptr ptr) -@ stdcall EngMapFile(ptr long ptr) -@ stdcall EngMapFontFile(ptr ptr ptr) -@ stdcall EngMapFontFileFD(ptr ptr ptr) -@ stdcall EngMapModule(ptr ptr) -@ stdcall EngMapSection(ptr long ptr ptr) -@ stdcall EngMarkBandingSurface(ptr) -@ stdcall EngModifySurface(ptr ptr long long ptr ptr long ptr) -@ stdcall EngMovePointer(ptr long long ptr) -@ stdcall EngMulDiv(long long long) -@ stdcall EngMultiByteToUnicodeN(ptr long ptr ptr long) NTOSKRNL.RtlMultiByteToUnicodeN -@ stdcall EngMultiByteToWideChar(long ptr long ptr long) -@ stdcall EngNineGrid(ptr ptr ptr ptr ptr ptr ptr ptr ptr) -@ stdcall EngPaint(ptr ptr ptr ptr long) -@ stdcall EngPlgBlt(ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr long) -@ stdcall EngProbeForRead(ptr long long) NTOSKRNL.ProbeForRead -@ stdcall EngProbeForReadAndWrite(ptr long long) NTOSKRNL.ProbeForWrite -@ stdcall EngQueryDeviceAttribute(ptr long ptr long ptr long) -@ stdcall EngQueryFileTimeStamp(ptr) -@ stdcall EngQueryLocalTime(ptr) -@ stdcall EngQueryPalette(ptr ptr long ptr) -@ stdcall EngQueryPerformanceCounter(ptr) -@ stdcall EngQueryPerformanceFrequency(ptr) -@ stdcall EngQuerySystemAttribute(long ptr) -@ stdcall EngReadStateEvent(ptr) -@ stdcall EngReleaseSemaphore(ptr) -@ stdcall EngRestoreFloatingPointState(ptr) -@ stdcall EngSaveFloatingPointState(ptr long) -@ stdcall EngSecureMem(ptr long) -@ stdcall EngSetEvent(ptr) -@ stdcall EngSetLastError(long) -@ stdcall EngSetPointerShape(ptr ptr ptr ptr long long long long ptr long) -@ stdcall EngSetPointerTag(ptr ptr ptr ptr long) -@ stdcall EngSetPrinterData(ptr ptr long ptr long) -@ stdcall EngSort(ptr long long ptr) -@ stdcall EngStretchBlt(ptr ptr ptr ptr ptr long long ptr ptr ptr long) -@ stdcall EngStretchBltROP(ptr ptr ptr ptr ptr long long ptr ptr ptr long ptr long) -@ stdcall EngStrokeAndFillPath(ptr ptr ptr ptr ptr ptr ptr ptr long long) -@ stdcall EngStrokePath(ptr ptr ptr ptr ptr ptr ptr long) -@ stdcall EngTextOut(ptr ptr ptr ptr ptr ptr ptr ptr ptr long) -@ stdcall EngTransparentBlt(ptr ptr ptr ptr ptr ptr long long) -@ stdcall EngUnicodeToMultiByteN(ptr long ptr ptr long) NTOSKRNL.RtlUnicodeToMultiByteN -@ stdcall EngUnloadImage(ptr) -@ stdcall EngUnlockDirectDrawSurface(ptr) -@ stdcall EngUnlockDriverObj(ptr) -@ stdcall EngUnlockSurface(ptr) -@ stdcall EngUnmapEvent(ptr) -@ stdcall EngUnmapFile(ptr) -@ stdcall EngUnmapFontFile(ptr) -@ stdcall EngUnmapFontFileFD(ptr) -@ stdcall EngUnsecureMem(ptr) -@ stdcall EngWaitForSingleObject(ptr ptr) -@ stdcall EngWideCharToMultiByte(long ptr long ptr long) -@ stdcall EngWritePrinter(ptr ptr long ptr) -@ stdcall -arch=i386 FLOATOBJ_Add(ptr ptr) -@ stdcall -arch=i386 FLOATOBJ_AddFloat(ptr long) -@ stdcall -arch=i386 FLOATOBJ_AddLong(ptr long) -@ stdcall -arch=i386 FLOATOBJ_Div(ptr ptr) -@ stdcall -arch=i386 FLOATOBJ_DivFloat(ptr long) -@ stdcall -arch=i386 FLOATOBJ_DivLong(ptr long) -@ stdcall -arch=i386 FLOATOBJ_Equal(ptr ptr) -@ stdcall -arch=i386 FLOATOBJ_EqualLong(ptr long) -@ stdcall -arch=i386 FLOATOBJ_GetFloat(ptr) -@ stdcall -arch=i386 FLOATOBJ_GetLong(ptr) -@ stdcall -arch=i386 FLOATOBJ_GreaterThan(ptr ptr) -@ stdcall -arch=i386 FLOATOBJ_GreaterThanLong(ptr long) -@ stdcall -arch=i386 FLOATOBJ_LessThan(ptr ptr) -@ stdcall -arch=i386 FLOATOBJ_LessThanLong(ptr long) -@ stdcall -arch=i386 FLOATOBJ_Mul(ptr ptr) -@ stdcall -arch=i386 FLOATOBJ_MulFloat(ptr long) -@ stdcall -arch=i386 FLOATOBJ_MulLong(ptr long) -@ stdcall -arch=i386 FLOATOBJ_Neg(ptr) -@ stdcall -arch=i386 FLOATOBJ_SetFloat(ptr long) -@ stdcall -arch=i386 FLOATOBJ_SetLong(ptr long) -@ stdcall -arch=i386 FLOATOBJ_Sub(ptr ptr) -@ stdcall -arch=i386 FLOATOBJ_SubFloat(ptr long) -@ stdcall -arch=i386 FLOATOBJ_SubLong(ptr long) -@ stdcall FONTOBJ_cGetAllGlyphHandles(ptr ptr) -@ stdcall FONTOBJ_cGetGlyphs(ptr long long ptr ptr) -@ stdcall FONTOBJ_pQueryGlyphAttrs(ptr long) -@ stdcall FONTOBJ_pfdg(ptr) -@ stdcall FONTOBJ_pifi(ptr) -@ stdcall FONTOBJ_pjOpenTypeTablePointer(ptr long ptr) -@ stdcall FONTOBJ_pvTrueTypeFontFile(ptr ptr) -@ stdcall FONTOBJ_pwszFontFilePaths(ptr ptr) -@ stdcall FONTOBJ_pxoGetXform(ptr) -@ stdcall FONTOBJ_vGetInfo(ptr long ptr) -@ stdcall HT_ComputeRGBGammaTable(long long long long long ptr) -@ stdcall HT_Get8BPPFormatPalette(ptr long long long) -@ stdcall HT_Get8BPPMaskPalette(ptr long long long long long) -@ stdcall HeapVidMemAllocAligned(ptr long long ptr ptr) -@ stdcall PALOBJ_cGetColors(ptr long long ptr) -@ stdcall PATHOBJ_bCloseFigure(ptr) -@ stdcall PATHOBJ_bEnum(ptr ptr) -@ stdcall PATHOBJ_bEnumClipLines(ptr long ptr) -@ stdcall PATHOBJ_bMoveTo(ptr long long) -@ stdcall PATHOBJ_bPolyBezierTo(ptr ptr long) -@ stdcall PATHOBJ_bPolyLineTo(ptr ptr long) -@ stdcall PATHOBJ_vEnumStart(ptr) -@ stdcall PATHOBJ_vEnumStartClipLines(ptr ptr ptr ptr) -@ stdcall PATHOBJ_vGetBounds(ptr ptr) -@ stdcall RtlAnsiCharToUnicodeChar(ptr) NTOSKRNL.RtlAnsiCharToUnicodeChar -@ stdcall RtlMultiByteToUnicodeN(ptr long ptr ptr long) NTOSKRNL.RtlMultiByteToUnicodeN -@ stdcall RtlRaiseException(ptr) NTOSKRNL.RtlRaiseException -@ stdcall RtlUnicodeToMultiByteN(ptr long ptr ptr long) NTOSKRNL.RtlUnicodeToMultiByteN -@ stdcall RtlUnicodeToMultiByteSize(ptr ptr long) NTOSKRNL.RtlUnicodeToMultiByteSize -@ stdcall RtlUnwind(ptr ptr ptr ptr) NTOSKRNL.RtlUnwind -@ stdcall RtlUpcaseUnicodeChar(long) NTOSKRNL.RtlUpcaseUnicodeChar -@ stdcall RtlUpcaseUnicodeToMultiByteN(ptr long ptr ptr long) NTOSKRNL.RtlUpcaseUnicodeToMultiByteN -@ stdcall STROBJ_bEnum(ptr ptr ptr) -@ stdcall STROBJ_bEnumPositionsOnly(ptr ptr ptr) -@ stdcall STROBJ_bGetAdvanceWidths(ptr long long ptr) -@ stdcall STROBJ_dwGetCodePage(ptr) -@ stdcall STROBJ_fxBreakExtra(ptr) -@ stdcall STROBJ_fxCharacterExtra(ptr) -@ stdcall STROBJ_vEnumStart(ptr) -@ stdcall VidMemFree(ptr ptr) -@ stdcall WNDOBJ_bEnum(ptr long ptr) -@ stdcall WNDOBJ_cEnumStart(ptr long long long) -@ stdcall WNDOBJ_vSetConsumer(ptr ptr) -@ stdcall XFORMOBJ_bApplyXform(ptr long long ptr ptr) -@ stdcall XFORMOBJ_iGetFloatObjXform(ptr ptr) -@ stdcall XFORMOBJ_iGetXform(ptr ptr) -@ stdcall XLATEOBJ_cGetPalette(ptr long long ptr) -@ stdcall XLATEOBJ_hGetColorTransform(ptr) -@ stdcall XLATEOBJ_iXlate(ptr long) -@ stdcall XLATEOBJ_piVector(ptr) -@ cdecl _abnormal_termination() NTOSKRNL._abnormal_termination -@ cdecl _except_handler2() NTOSKRNL._except_handler2 -@ cdecl _global_unwind2() NTOSKRNL._global_unwind2 -@ cdecl _itoa() NTOSKRNL._itoa -@ cdecl _itow() NTOSKRNL._itow -@ cdecl _local_unwind2() NTOSKRNL._local_unwind2 Copied: branches/cmake-bringup/subsystems/win32/win32k/win32k.spec (from r49762, branches/cmake-bringup/subsystems/win32/win32k/win32k.pspec) URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… ============================================================================== --- branches/cmake-bringup/subsystems/win32/win32k/win32k.pspec [iso-8859-1] (original) +++ branches/cmake-bringup/subsystems/win32/win32k/win32k.spec [iso-8859-1] Wed Nov 24 23:38:19 2010 @@ -1,6 +1,3 @@ -#include "include/reactos/msvctarget.h" -#undef i386 - @ stdcall -arch=i386 FLOATOBJ_AddFloatObj(ptr ptr) FLOATOBJ_Add @ stdcall -arch=i386 FLOATOBJ_DivFloatObj(ptr ptr) FLOATOBJ_Div @ stdcall -arch=i386 FLOATOBJ_MulFloatObj(ptr ptr) FLOATOBJ_Mul

14 years, 5 months

[pschweitzer] 49790: [NTOSKRNL] Fix the fix, ie fix x86. Everything should work now ~

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Wed Nov 24 22:51:03 2010 New Revision: 49790 URL: http://svn.reactos.org/svn/reactos?rev=49790&view=rev Log: [NTOSKRNL] Fix the fix, ie fix x86. Everything should work now ~ Modified: trunk/reactos/ntoskrnl/include/internal/i386/mm.h Modified: trunk/reactos/ntoskrnl/include/internal/i386/mm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/i386/mm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/i386/mm.h [iso-8859-1] Wed Nov 24 22:51:03 2010 @@ -39,7 +39,7 @@ // Convert a PTE into a corresponding address // #define MiPteToAddress(PTE) ((PVOID)((ULONG)(PTE) << 10)) -#define MiPdeToAddress(PDE) ((PVOID)((ULONG)(PDE) << 18)) +#define MiPdeToAddress(PDE) ((PVOID)((ULONG)(PDE) << 10)) #define ADDR_TO_PAGE_TABLE(v) (((ULONG)(v)) / (1024 * PAGE_SIZE)) #define ADDR_TO_PDE_OFFSET(v) ((((ULONG)(v)) / (1024 * PAGE_SIZE)))

14 years, 5 months

[spetreolle] 49789: [FREELDR] poor little printf causes boot break, nuff said.

by spetreolle＠svn.reactos.org

Author: spetreolle Date: Wed Nov 24 20:55:15 2010 New Revision: 49789 URL: http://svn.reactos.org/svn/reactos?rev=49789&view=rev Log: [FREELDR] poor little printf causes boot break, nuff said. Modified: trunk/reactos/boot/freeldr/freeldr/windows/winldr.c Modified: trunk/reactos/boot/freeldr/freeldr/windows/winldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/windows/winldr.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/windows/winldr.c [iso-8859-1] Wed Nov 24 20:55:15 2010 @@ -624,7 +624,7 @@ /* Save final value of LoaderPagesSpanned */ LoaderBlockVA->Extension->LoaderPagesSpanned = LoaderPagesSpanned; - printf( "Hello from paged mode, KiSystemStartup %p, LoaderBlockVA %p!\n", + DPRINTM(DPRINT_WINDOWS, "Hello from paged mode, KiSystemStartup %p, LoaderBlockVA %p!\n", KiSystemStartup, LoaderBlockVA); WinLdrpDumpMemoryDescriptors(LoaderBlockVA);

14 years, 5 months

[tkreuzer] 49788: [WORDPAD] Fix rc syntax (multiline strings with \ at the end). This is to compile with MS reasource compiler, we can hope wine will adopt this, because latest versions of gcc's pr...

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Wed Nov 24 20:19:55 2010 New Revision: 49788 URL: http://svn.reactos.org/svn/reactos?rev=49788&view=rev Log: [WORDPAD] Fix rc syntax (multiline strings with \ at the end). This is to compile with MS reasource compiler, we can hope wine will adopt this, because latest versions of gcc's preprocessor also don't support this anymore. Modified: branches/cmake-bringup/base/applications/wordpad/Da.rc branches/cmake-bringup/base/applications/wordpad/De.rc branches/cmake-bringup/base/applications/wordpad/En.rc branches/cmake-bringup/base/applications/wordpad/Fr.rc branches/cmake-bringup/base/applications/wordpad/It.rc branches/cmake-bringup/base/applications/wordpad/Ja.rc branches/cmake-bringup/base/applications/wordpad/Ko.rc branches/cmake-bringup/base/applications/wordpad/Lt.rc branches/cmake-bringup/base/applications/wordpad/Nl.rc branches/cmake-bringup/base/applications/wordpad/No.rc branches/cmake-bringup/base/applications/wordpad/Pl.rc branches/cmake-bringup/base/applications/wordpad/Pt.rc branches/cmake-bringup/base/applications/wordpad/Ru.rc branches/cmake-bringup/base/applications/wordpad/Si.rc branches/cmake-bringup/base/applications/wordpad/Sv.rc branches/cmake-bringup/base/applications/wordpad/Uk.rc branches/cmake-bringup/base/applications/wordpad/Zh.rc Modified: branches/cmake-bringup/base/applications/wordpad/Da.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/wordpad/Da.rc [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/wordpad/Da.rc [iso-8859-1] Wed Nov 24 20:19:55 2010 @@ -262,9 +262,7 @@ STRING_PROMPT_SAVE_CHANGES, "Gemme Ã¦ndringer i Â«%sÂ»?" STRING_SEARCH_FINISHED, "FÃ¦rdig med at sÃ¸ge i dokumentet." STRING_LOAD_RICHED_FAILED, "Kunne ikke indlÃ¦se RichEdit-biblioteket." - STRING_SAVE_LOSEFORMATTING, "Du har valgt at gemme i rent tekstformat, noget som " \ - "vil medfÃ¸re at al formatering gÃ¥r tabt. Er du " \ - "sikker pÃ¥ at du vil fortsÃ¦tte?" + STRING_SAVE_LOSEFORMATTING, "Du har valgt at gemme i rent tekstformat, noget som vil medfÃ¸re at al formatering gÃ¥r tabt. Er du sikker pÃ¥ at du vil fortsÃ¦tte?" STRING_INVALID_NUMBER, "Ugyldigt talformat" STRING_OLE_STORAGE_NOT_SUPPORTED, "OLE storage dokumenter er ikke understÃ¸ttet" STRING_WRITE_FAILED, "Kunne ikke gemme filen." Modified: branches/cmake-bringup/base/applications/wordpad/De.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/wordpad/De.rc [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/wordpad/De.rc [iso-8859-1] Wed Nov 24 20:19:55 2010 @@ -261,9 +261,7 @@ STRING_PROMPT_SAVE_CHANGES, "Ãnderungen an '%s' speichern?" STRING_SEARCH_FINISHED, "Wordpad hat das Durchsuchen des Dokuments beendet." STRING_LOAD_RICHED_FAILED, "Die RichEdit-Bibliothek konnte nicht geladen werden." - STRING_SAVE_LOSEFORMATTING, "Sie sind dabei, die Datei als Textdatei zu speichern. " \ - "Dadurch geht die Formatierung verloren. " \ - "MÃ¶chten Sie den Vorgang trotzdem fortsetzen?" + STRING_SAVE_LOSEFORMATTING, "Sie sind dabei, die Datei als Textdatei zu speichern. Dadurch geht die Formatierung verloren. MÃ¶chten Sie den Vorgang trotzdem fortsetzen?" STRING_INVALID_NUMBER, "Diese MaÃeinheit ist nicht zulÃ¤ssig." STRING_OLE_STORAGE_NOT_SUPPORTED, "OLE-Dokumentenspeicherung wird nicht unterstÃ¼tzt." STRING_WRITE_FAILED, "Die Datei konnte nicht gespeichert werden." Modified: branches/cmake-bringup/base/applications/wordpad/En.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/wordpad/En.rc [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/wordpad/En.rc [iso-8859-1] Wed Nov 24 20:19:55 2010 @@ -251,9 +251,7 @@ STRING_PROMPT_SAVE_CHANGES, "Save changes to '%s'?" STRING_SEARCH_FINISHED, "Finished searching the document." STRING_LOAD_RICHED_FAILED, "Failed to load the RichEdit library." - STRING_SAVE_LOSEFORMATTING, "You have chosen to save in plain text format, " \ - "which will cause all formatting to be lost. " \ - "Are you sure that you wish to do this?" + STRING_SAVE_LOSEFORMATTING, "You have chosen to save in plain text format, which will cause all formatting to be lost. Are you sure that you wish to do this?" STRING_INVALID_NUMBER, "Invalid number format" STRING_OLE_STORAGE_NOT_SUPPORTED, "OLE storage documents are not supported" STRING_WRITE_FAILED, "Could not save the file." Modified: branches/cmake-bringup/base/applications/wordpad/Fr.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/wordpad/Fr.rc [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/wordpad/Fr.rc [iso-8859-1] Wed Nov 24 20:19:55 2010 @@ -263,9 +263,7 @@ STRING_PROMPT_SAVE_CHANGES, "Enregistrer les modifications de Â«Â %sÂ Â»Â ?" STRING_SEARCH_FINISHED, "Recherche terminÃ©e dans le document." STRING_LOAD_RICHED_FAILED, "Impossible de charger la bibliothÃ¨que RichEdit." - STRING_SAVE_LOSEFORMATTING, "Vous avez choisi d'enregistrer en texte simple, " \ - "ce qui causera la perte de tout formattage. " \ - "Voulez-vous vraiment continuerÂ ?" + STRING_SAVE_LOSEFORMATTING, "Vous avez choisi d'enregistrer en texte simple, ce qui causera la perte de tout formattage. Voulez-vous vraiment continuerÂ ?" STRING_INVALID_NUMBER, "Format de nombre invalide" STRING_OLE_STORAGE_NOT_SUPPORTED, "Les documents conteneur OLE ne sont pas supportÃ©s" STRING_WRITE_FAILED, "Impossible d'enregistrer le fichier." Modified: branches/cmake-bringup/base/applications/wordpad/It.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/wordpad/It.rc [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/wordpad/It.rc [iso-8859-1] Wed Nov 24 20:19:55 2010 @@ -255,9 +255,7 @@ STRING_PROMPT_SAVE_CHANGES, "Salva i cambiamenti su '%s'?" STRING_SEARCH_FINISHED, "Finita la ricerca sul documento." STRING_LOAD_RICHED_FAILED, "Impossibile caricare la libreria RichEdit." - STRING_SAVE_LOSEFORMATTING, "Hai scelto di salvare nel formato Testo semplice, " \ - "che causerÃ la perdita di tutta la formattazione. " \ - "Sei sicuro?" + STRING_SAVE_LOSEFORMATTING, "Hai scelto di salvare nel formato Testo semplice, che causerÃ la perdita di tutta la formattazione. Sei sicuro?" STRING_INVALID_NUMBER, "Numero di formato non valido" STRING_OLE_STORAGE_NOT_SUPPORTED, "I documenti di storage OLE non sono supportati" STRING_WRITE_FAILED, "Impossibile salvare il file." Modified: branches/cmake-bringup/base/applications/wordpad/Ja.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/wordpad/Ja.rc [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/wordpad/Ja.rc [iso-8859-1] Wed Nov 24 20:19:55 2010 @@ -254,9 +254,7 @@ STRING_PROMPT_SAVE_CHANGES, "'%s'ã¸ã®å¤æ´ãä¿åãã¾ãã?" STRING_SEARCH_FINISHED, "ææ¸ã®æ¤ç´¢ãå®äºã" STRING_LOAD_RICHED_FAILED, "RichEditã©ã¤ãã©ãªã®èªã¿è¾¼ã¿ã«å¤±æã" - STRING_SAVE_LOSEFORMATTING, "ãã¬ã¼ã³ããã¹ãå½¢å¼ã§ä¿åããã¨ã" \ - "ãã¹ã¦ã®æ¸å¼ãå¤±ããã¾ãã" \ - "ããã§ãããã§ããï¼" + STRING_SAVE_LOSEFORMATTING, "ãã¬ã¼ã³ããã¹ãå½¢å¼ã§ä¿åããã¨ããã¹ã¦ã®æ¸å¼ãå¤±ããã¾ããããã§ãããã§ããï¼" STRING_INVALID_NUMBER, "æ°ã®æ¸å¼ãä¸æ£" STRING_OLE_STORAGE_NOT_SUPPORTED, "OLEã¹ãã¬ã¼ã¸ææ¸ã¯ãµãã¼ãããã¦ãã¾ããã" STRING_WRITE_FAILED, "ãã¡ã¤ã«ãä¿åã§ãã¾ããã" Modified: branches/cmake-bringup/base/applications/wordpad/Ko.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/wordpad/Ko.rc [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/wordpad/Ko.rc [iso-8859-1] Wed Nov 24 20:19:55 2010 @@ -253,9 +253,7 @@ STRING_PROMPT_SAVE_CHANGES, "'%s'ÀÇ ¹Ù²ï °ÍÀ» ÀúÀåÇÏ°Ú½À´Ï±î?" STRING_SEARCH_FINISHED, "¹®¼¿¡¼ Ã£±â ³¡." STRING_LOAD_RICHED_FAILED, "¸®Ä¡ÅØ½ºÆ® ¶óÀÌºê·¯¸® ºÒ·¯¿À±â ½ÇÆÐ." - STRING_SAVE_LOSEFORMATTING, "´ç½ÅÀº º¸Åë ÅØ½ºÆ® Çü½ÄÀ¸·Î ÀúÀåÇÏ±â¸¦ ¼±ÅÃÇß½À´Ï´Ù, " \ - "ÀÌ°ÍÀº Æ÷¸ËÆÃÀ» ¾ø¿¤ °ÍÀÔ´Ï´Ù. " \ - "´ç½ÅÀº Á¤¸»·Î ÀúÀåÇÏ±â¸¦ ¿øÇÕ´Ï±î?" + STRING_SAVE_LOSEFORMATTING, "´ç½ÅÀº º¸Åë ÅØ½ºÆ® Çü½ÄÀ¸·Î ÀúÀåÇÏ±â¸¦ ¼±ÅÃÇß½À´Ï´Ù, ÀÌ°ÍÀº Æ÷¸ËÆÃÀ» ¾ø¿¤ °ÍÀÔ´Ï´Ù. ´ç½ÅÀº Á¤¸»·Î ÀúÀåÇÏ±â¸¦ ¿øÇÕ´Ï±î?" STRING_INVALID_NUMBER, "¿Ã¹Ù¸£Áö ¾ÊÀº ¼ýÀÚ Çü½Ä" STRING_OLE_STORAGE_NOT_SUPPORTED, "OLE ÀúÀå ¹®¼´Â Áö¿øµÇÁö ¾Ê½À´Ï´Ù" STRING_WRITE_FAILED, "ÆÄÀÏÀ» ÀúÀåÇÒ ¼ö ¾ø½À´Ï´Ù." Modified: branches/cmake-bringup/base/applications/wordpad/Lt.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/wordpad/Lt.rc [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/wordpad/Lt.rc [iso-8859-1] Wed Nov 24 20:19:55 2010 @@ -262,9 +262,7 @@ STRING_PROMPT_SAVE_CHANGES, "IÅ¡saugoti â%sâ pakeitimus?" STRING_SEARCH_FINISHED, "PaieÅ¡ka dokumente baigta." STRING_LOAD_RICHED_FAILED, "Nepavyko Ä¯kelti RichEdit bibliotekos." - STRING_SAVE_LOSEFORMATTING, "JÅ«s pasirinkote iÅ¡saugoti paprasto teksto formatu, " \ - "todÄl bus prarastas visas formatavimas. " \ - "Ar tikrai norite tai padaryti?" + STRING_SAVE_LOSEFORMATTING, "JÅ«s pasirinkote iÅ¡saugoti paprasto teksto formatu, todÄl bus prarastas visas formatavimas. Ar tikrai norite tai padaryti?" STRING_INVALID_NUMBER, "Neteisingas skaiÄiaus formatas" STRING_OLE_STORAGE_NOT_SUPPORTED, "OLE saugyklos dokumentai yra nepalaikomi" STRING_WRITE_FAILED, "Nepavyko iÅ¡saugoti failo." Modified: branches/cmake-bringup/base/applications/wordpad/Nl.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/wordpad/Nl.rc [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/wordpad/Nl.rc [iso-8859-1] Wed Nov 24 20:19:55 2010 @@ -254,9 +254,7 @@ STRING_PROMPT_SAVE_CHANGES, "Wijzigingen opslaan naar '%s'?" STRING_SEARCH_FINISHED, "Doorzoeken van document voltooid." STRING_LOAD_RICHED_FAILED, "Laden van de RichEdit library is mislukt." - STRING_SAVE_LOSEFORMATTING, "U koos voor opslaan in gewoon tekst formaat, " \ - "waardoor alle formattering verloren zal gaan. " \ - "Weet u zeker dat u dit wilt?" + STRING_SAVE_LOSEFORMATTING, "U koos voor opslaan in gewoon tekst formaat, waardoor alle formattering verloren zal gaan. Weet u zeker dat u dit wilt?" STRING_INVALID_NUMBER, "Foutief nummerformaat" STRING_OLE_STORAGE_NOT_SUPPORTED, "OLE storage documenten worden niet ondersteund" STRING_WRITE_FAILED, "Bestand kon niet worden opgeslagen." Modified: branches/cmake-bringup/base/applications/wordpad/No.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/wordpad/No.rc [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/wordpad/No.rc [iso-8859-1] Wed Nov 24 20:19:55 2010 @@ -261,9 +261,7 @@ STRING_PROMPT_SAVE_CHANGES, "Lagre endringer i Â«%sÂ»?" STRING_SEARCH_FINISHED, "Ferdig med Ã¥ sÃ¸ke i dokumentet." STRING_LOAD_RICHED_FAILED, "Klarte ikke laste RichEdit-biblioteket." - STRING_SAVE_LOSEFORMATTING, "Du har valgt Ã¥ lagre i rent tekstformat, noe som " \ - "vil fÃ¸re til at all formatering gÃ¥r tapt. Er du " \ - "sikker pÃ¥ at du vil fortsette?" + STRING_SAVE_LOSEFORMATTING, "Du har valgt Ã¥ lagre i rent tekstformat, noe som vil fÃ¸re til at all formatering gÃ¥r tapt. Er du sikker pÃ¥ at du vil fortsette?" STRING_INVALID_NUMBER, "Ugyldig tallformat" STRING_OLE_STORAGE_NOT_SUPPORTED, "OLE storage-dokumenter stÃ¸ttes ikke" STRING_WRITE_FAILED, "Klarte ikke lagre filen." Modified: branches/cmake-bringup/base/applications/wordpad/Pl.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/wordpad/Pl.rc [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/wordpad/Pl.rc [iso-8859-1] Wed Nov 24 20:19:55 2010 @@ -261,9 +261,7 @@ STRING_PROMPT_SAVE_CHANGES, "Zapisaæ zmiany w pliku '%s'?" STRING_SEARCH_FINISHED, "Zakoñczono przeszukiwanie dokumentu." STRING_LOAD_RICHED_FAILED, "Nie uda³o siê za³adowaæ biblioteki systemowej RichEdit." - STRING_SAVE_LOSEFORMATTING, "Wybrano zapisanie dokumentu jako zwyk³y tekst, " \ - "w wyniku czego formatowanie zostanie utracone. " \ - "Czy na pewno chcesz to zrobiæ?" + STRING_SAVE_LOSEFORMATTING, "Wybrano zapisanie dokumentu jako zwyk³y tekst, w wyniku czego formatowanie zostanie utracone. Czy na pewno chcesz to zrobiæ?" STRING_INVALID_NUMBER, "Z³y format liczby" STRING_OLE_STORAGE_NOT_SUPPORTED, "Dokumenty typu OLE storage nie s¹ obs³ugiwane" STRING_WRITE_FAILED, "Nie mo¿na by³o zapisaæ pliku." Modified: branches/cmake-bringup/base/applications/wordpad/Pt.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/wordpad/Pt.rc [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/wordpad/Pt.rc [iso-8859-1] Wed Nov 24 20:19:55 2010 @@ -375,9 +375,7 @@ STRING_PROMPT_SAVE_CHANGES, "Salvar as alteraÃ§Ãµes de '%s'?" STRING_SEARCH_FINISHED, "Acabou a pesquisa do documento." STRING_LOAD_RICHED_FAILED, "Falha ao carregar a biblioteca RichEdit." - STRING_SAVE_LOSEFORMATTING, "Foi escolhido salvar em formato de texto simples, " \ - "o que vai anular todas as formataÃ§Ãµes. " \ - "Tem a certeza que deseja fazer isto?" + STRING_SAVE_LOSEFORMATTING, "Foi escolhido salvar em formato de texto simples, o que vai anular todas as formataÃ§Ãµes. Tem a certeza que deseja fazer isto?" STRING_INVALID_NUMBER, "Formato de nÃºmero invÃ¡lido" STRING_OLE_STORAGE_NOT_SUPPORTED, "Documentos OLE nÃ£o sÃ£o suportados" STRING_WRITE_FAILED, "NÃ£o foi possÃvel salvar o arquivo." @@ -396,9 +394,7 @@ STRING_PROMPT_SAVE_CHANGES, "Guardar alteraÃ§Ãµes a '%s'?" STRING_SEARCH_FINISHED, "Acabou a pesquisa do documento." STRING_LOAD_RICHED_FAILED, "Falhou o carregamento da biblioteca RichEdit." - STRING_SAVE_LOSEFORMATTING, "Escolheu guardar em formato de texto simples, " \ - "o que vai anular todas as formataÃ§Ãµes. " \ - "Tem a certeza que quer fazer isto?" + STRING_SAVE_LOSEFORMATTING, "Escolheu guardar em formato de texto simples, o que vai anular todas as formataÃ§Ãµes. Tem a certeza que quer fazer isto?" STRING_INVALID_NUMBER, "Formato de nÃºmero invÃ¡lido" STRING_OLE_STORAGE_NOT_SUPPORTED, "Documentos OLE nÃ£o sÃ£o suportados" STRING_WRITE_FAILED, "NÃ£o foi possÃvel guardar o ficheiro." Modified: branches/cmake-bringup/base/applications/wordpad/Ru.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/wordpad/Ru.rc [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/wordpad/Ru.rc [iso-8859-1] Wed Nov 24 20:19:55 2010 @@ -262,9 +262,7 @@ STRING_PROMPT_SAVE_CHANGES, "Ð¡Ð¾ÑÑÐ°Ð½Ð¸ÑÑ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð² '%s'?" STRING_SEARCH_FINISHED, "ÐÐ¾Ð¸ÑÐº Ð² Ð´Ð¾ÐºÑÐ¼ÐµÐ½ÑÐµ Ð·Ð°Ð²ÐµÑÑÐµÐ½." STRING_LOAD_RICHED_FAILED, "ÐÑÐ¸Ð±ÐºÐ° Ð·Ð°Ð³ÑÑÐ·ÐºÐ¸ Ð±Ð¸Ð±Ð»Ð¸Ð¾ÑÐµÐºÐ¸ RichEdit." - STRING_SAVE_LOSEFORMATTING, "Ð¡Ð¾ÑÑÐ°Ð½ÐµÐ½Ð¸Ðµ Ð´Ð¾ÐºÑÐ¼ÐµÐ½ÑÐ° Ð² Ð²Ð¸Ð´Ðµ Ð½ÐµÑÐ¾ÑÐ¼Ð°ÑÐ¸ÑÐ¾Ð²Ð°Ð½Ð½Ð¾Ð³Ð¾ ÑÐµÐºÑÑÐ° " \ - "Ð¿ÑÐ¸Ð²ÐµÐ´ÑÑ Ðº Ð¿Ð¾ÑÐµÑÐµ ÑÐ¾ÑÐ¼Ð°ÑÐ¸ÑÐ¾Ð²Ð°Ð½Ð¸Ñ. ÐÐ¾Ð´ÑÐ²ÐµÑÐ¶Ð´Ð°ÐµÑÐµ Ð²ÑÐ¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ðµ" \ - "ÑÑÐ¾Ð¹ Ð¾Ð¿ÐµÑÐ°ÑÐ¸Ð¸?" + STRING_SAVE_LOSEFORMATTING, "Ð¡Ð¾ÑÑÐ°Ð½ÐµÐ½Ð¸Ðµ Ð´Ð¾ÐºÑÐ¼ÐµÐ½ÑÐ° Ð² Ð²Ð¸Ð´Ðµ Ð½ÐµÑÐ¾ÑÐ¼Ð°ÑÐ¸ÑÐ¾Ð²Ð°Ð½Ð½Ð¾Ð³Ð¾ ÑÐµÐºÑÑÐ° Ð¿ÑÐ¸Ð²ÐµÐ´ÑÑ Ðº Ð¿Ð¾ÑÐµÑÐµ ÑÐ¾ÑÐ¼Ð°ÑÐ¸ÑÐ¾Ð²Ð°Ð½Ð¸Ñ. ÐÐ¾Ð´ÑÐ²ÐµÑÐ¶Ð´Ð°ÐµÑÐµ Ð²ÑÐ¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ðµ ÑÑÐ¾Ð¹ Ð¾Ð¿ÐµÑÐ°ÑÐ¸Ð¸?" STRING_INVALID_NUMBER, "ÐÐµÐ¿ÑÐ°Ð²Ð¸Ð»ÑÐ½ÑÐ¹ ÑÐ¸ÑÐ»Ð¾Ð²Ð¾Ð¹ ÑÐ¾ÑÐ¼Ð°Ñ." STRING_OLE_STORAGE_NOT_SUPPORTED, "OLE storage Ð´Ð¾ÐºÑÐ¼ÐµÐ½ÑÑ Ð½Ðµ Ð¿Ð¾Ð´Ð´ÐµÑÐ¶Ð¸Ð²Ð°ÑÑÑÑ." STRING_WRITE_FAILED, "ÐÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ ÑÐ¾ÑÑÐ°Ð½Ð¸ÑÑ ÑÐ°Ð¹Ð»." Modified: branches/cmake-bringup/base/applications/wordpad/Si.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/wordpad/Si.rc [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/wordpad/Si.rc [iso-8859-1] Wed Nov 24 20:19:55 2010 @@ -261,10 +261,7 @@ STRING_PROMPT_SAVE_CHANGES, "Ali naj shranim spremembe v '%s'?" STRING_SEARCH_FINISHED, "Konec iskanja po dokumentu." STRING_LOAD_RICHED_FAILED, "Napaka pri nalaganju RichEdit knjiÅ¾nice." - STRING_SAVE_LOSEFORMATTING, "Izbrali ste shranjevanje v Äisti besedilni " \ - "obliki, kar bo povzroÄilo izgubo oblikovanja. " \ - "Ali ste prepriÄani, da Å¾elite shraniti " \ - "dokument v tej obliki?" + STRING_SAVE_LOSEFORMATTING, "Izbrali ste shranjevanje v Äisti besedilni obliki, kar bo povzroÄilo izgubo oblikovanja. Ali ste prepriÄani, da Å¾elite shraniti dokument v tej obliki?" STRING_INVALID_NUMBER, "Neveljavna oblika Å¡tevila" STRING_OLE_STORAGE_NOT_SUPPORTED, "Dokumenti z OLE predmeti niso podprti" STRING_WRITE_FAILED, "Napaka pri shranjevanju datoteke." Modified: branches/cmake-bringup/base/applications/wordpad/Sv.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/wordpad/Sv.rc [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/wordpad/Sv.rc [iso-8859-1] Wed Nov 24 20:19:55 2010 @@ -265,9 +265,7 @@ STRING_PROMPT_SAVE_CHANGES, "Spara Ã¤ndringar i '%s'?" STRING_SEARCH_FINISHED, "SÃ¶kningen i dokumentet har slutfÃ¶rts." STRING_LOAD_RICHED_FAILED, "Misslyckades att ladda RichEdit-biblioteket." - STRING_SAVE_LOSEFORMATTING, "Du har valt att spara i rent textformat, " \ - "vilket kommer leda till att all formatering fÃ¶rloras. " \ - "Ãr du sÃ¤ker att du vill gÃ¶ra detta?" + STRING_SAVE_LOSEFORMATTING, "Du har valt att spara i rent textformat, vilket kommer leda till att all formatering fÃ¶rloras. Ãr du sÃ¤ker att du vill gÃ¶ra detta?" STRING_INVALID_NUMBER, "Ogiltigt talformat" STRING_OLE_STORAGE_NOT_SUPPORTED, "OLE storage documents are not supported" STRING_WRITE_FAILED, "Kunde inte spara filen." Modified: branches/cmake-bringup/base/applications/wordpad/Uk.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/wordpad/Uk.rc [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/wordpad/Uk.rc [iso-8859-1] Wed Nov 24 20:19:55 2010 @@ -258,9 +258,7 @@ STRING_PROMPT_SAVE_CHANGES, "ÐÐ±ÐµÑÐµÐ³ÑÐ¸ Ð·Ð¼ÑÐ½Ð¸ Ð² '%s'?" STRING_SEARCH_FINISHED, "ÐÐ¾ÐºÑÑ Ð´Ð¾ÐºÑÐ¼ÐµÐ½ÑÑ Ð·Ð°Ð²ÐµÑÑÐµÐ½Ð¾." STRING_LOAD_RICHED_FAILED, "ÐÐµ Ð²Ð´Ð°Ð»Ð¾ÑÑ Ð·Ð°Ð²Ð°Ð½ÑÐ°Ð¶Ð¸ÑÐ¸ Ð±ÑÐ±Ð»ÑÐ¾ÑÐµÐºÑ RichEdit." - STRING_SAVE_LOSEFORMATTING, "ÐÐ¸ Ð²Ð¸Ð±ÑÐ°Ð»Ð¸ Ð·Ð±ÐµÑÐµÐ¶ÐµÐ½Ð½Ñ Ð² ÑÐ¾ÑÐ¼Ð°ÑÑ Ð¿ÑÐ¾ÑÑÐ¾Ð³Ð¾ ÑÐµÐºÑÑÑ, " \ - "ÑÐ¾ Ð¿ÑÐ¸Ð·Ð²ÐµÐ´Ðµ Ð´Ð¾ Ð²ÑÑÐ°ÑÐ¸ ÑÐ¾ÑÐ¼Ð°ÑÑÐ²Ð°Ð½Ð½Ñ. " \ - "ÐÐ¸ ÑÐ¿ÑÐ°Ð²Ð´Ñ ÑÑÐ¾Ð³Ð¾ ÑÐ¾ÑÐµÑÐµ?" + STRING_SAVE_LOSEFORMATTING, "ÐÐ¸ Ð²Ð¸Ð±ÑÐ°Ð»Ð¸ Ð·Ð±ÐµÑÐµÐ¶ÐµÐ½Ð½Ñ Ð² ÑÐ¾ÑÐ¼Ð°ÑÑ Ð¿ÑÐ¾ÑÑÐ¾Ð³Ð¾ ÑÐµÐºÑÑÑ, ÑÐ¾ Ð¿ÑÐ¸Ð·Ð²ÐµÐ´Ðµ Ð´Ð¾ Ð²ÑÑÐ°ÑÐ¸ ÑÐ¾ÑÐ¼Ð°ÑÑÐ²Ð°Ð½Ð½Ñ. ÐÐ¸ ÑÐ¿ÑÐ°Ð²Ð´Ñ ÑÑÐ¾Ð³Ð¾ ÑÐ¾ÑÐµÑÐµ?" STRING_INVALID_NUMBER, "ÐÐµÐ²ÑÑÐ½Ð¸Ð¹ ÑÐ¸ÑÐ»Ð¾Ð²Ð¸Ð¹ ÑÐ¾ÑÐ¼Ð°Ñ" STRING_OLE_STORAGE_NOT_SUPPORTED, "OLE storage Ð´Ð¾ÐºÑÐ¼ÐµÐ½ÑÐ¸ Ð½Ðµ Ð¿ÑÐ´ÑÑÐ¸Ð¼ÑÑÑÑÑÑ" STRING_WRITE_FAILED, "ÐÐµÐ¼Ð¾Ð¶Ð»Ð¸Ð²Ð¾ Ð·Ð±ÐµÑÐµÐ³ÑÐ¸ ÑÐ°Ð¹Ð»." Modified: branches/cmake-bringup/base/applications/wordpad/Zh.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/wordpad/Zh.rc [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/wordpad/Zh.rc [iso-8859-1] Wed Nov 24 20:19:55 2010 @@ -487,9 +487,7 @@ STRING_PROMPT_SAVE_CHANGES, "å²åæ¹åå° '%s'?" STRING_SEARCH_FINISHED, "æªæ¡æ¥æ¾çµæ." STRING_LOAD_RICHED_FAILED, "RichEdit è£è¼å¤±æ." - STRING_SAVE_LOSEFORMATTING, "ä½ å·²ç¶é¸æå²åçºææ¬æªæ¡, " \ - "éå¯è½å°è´æ ¼å¼ä¸å¤±. " \ - "ä½ ç¢ºå®è¦ééº¼åå?" + STRING_SAVE_LOSEFORMATTING, "ä½ å·²ç¶é¸æå²åçºææ¬æªæ¡, éå¯è½å°è´æ ¼å¼ä¸å¤±. ä½ ç¢ºå®è¦ééº¼åå?" STRING_INVALID_NUMBER, "æ¸åæ ¼å¼ç¡æ" STRING_OLE_STORAGE_NOT_SUPPORTED, "ä¸æ¯æ´OLE å²åæªæ¡" STRING_WRITE_FAILED, "ä¸è½å²åæªæ¡."

14 years, 5 months

[tkreuzer] 49787: [NTOS] Add some missing intrinsics for MSVC

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Wed Nov 24 20:03:01 2010 New Revision: 49787 URL: http://svn.reactos.org/svn/reactos?rev=49787&view=rev Log: [NTOS] Add some missing intrinsics for MSVC Modified: branches/cmake-bringup/ntoskrnl/include/internal/i386/intrin_i.h Modified: branches/cmake-bringup/ntoskrnl/include/internal/i386/intrin_i.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/include/… ============================================================================== --- branches/cmake-bringup/ntoskrnl/include/internal/i386/intrin_i.h [iso-8859-1] (original) +++ branches/cmake-bringup/ntoskrnl/include/internal/i386/intrin_i.h [iso-8859-1] Wed Nov 24 20:03:01 2010 @@ -144,6 +144,32 @@ sgdt [eax] } } + +FORCEINLINE +VOID +__fxsave(OUT PFX_SAVE_AREA SaveArea) +{ + __asm mov eax, SaveArea + __asm fxsave [eax] +} + +FORCEINLINE +VOID +__fxrstor(IN PFX_SAVE_AREA SaveArea) +{ + __asm mov eax, SaveArea + __asm fxrstor [eax] +} + +FORCEINLINE +VOID +__fnsave(OUT PFLOATING_SAVE_AREA SaveArea) +{ + __asm mov eax, SaveArea + __asm fnsave [eax] + __asm wait; +} + #define Ke386GetGlobalDescriptorTable __sgdt FORCEINLINE @@ -267,6 +293,28 @@ __asm mov ax, Value; __asm mov gs, ax; } + +extern ULONG KeI386FxsrPresent; + +FORCEINLINE +VOID +Ke386SaveFpuState(IN PVOID SaveArea) +{ + if (KeI386FxsrPresent) + { + __fxsave(SaveArea); + } + else + { + __fnsave(SaveArea); + } +} + +#define Ke386FnSave __fnsave +#define Ke386FxSave __fxsave +// The name suggest, that the original author didn't understand what frstor means +#define Ke386FxStore __fxrstor + #else #error Unknown compiler for inline assembler

14 years, 5 months

[sir_richard] 49786: [NTOS]: Seems like cpsr_c doesn't work in this case? Need to investigate. Put an infinite loop in the entrypoint on ARM.

by sir_richard＠svn.reactos.org

Author: sir_richard Date: Wed Nov 24 18:56:35 2010 New Revision: 49786 URL: http://svn.reactos.org/svn/reactos?rev=49786&view=rev Log: [NTOS]: Seems like cpsr_c doesn't work in this case? Need to investigate. Put an infinite loop in the entrypoint on ARM. Modified: trunk/reactos/ntoskrnl/ke/arm/boot.s Modified: trunk/reactos/ntoskrnl/ke/arm/boot.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/arm/boot.s?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/arm/boot.s [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/arm/boot.s [iso-8859-1] Wed Nov 24 18:56:35 2010 @@ -15,7 +15,10 @@ PROLOG_END KiSystemStartup /* Put us in FIQ mode, set IRQ stack */ - msr cpsr_c, #CPSR_FIQ_MODE + b . + mrs r3, cpsr + orr r3, r1, #CPSR_FIQ_MODE + msr cpsr, r3 ldr sp, [a1, #LpbInterruptStack] /* Repeat for IRQ mode */

14 years, 5 months

[sir_richard] 49785: [NTOS]: STATUS_SUCCESS is not the only succesful return code.

by sir_richard＠svn.reactos.org

Author: sir_richard Date: Wed Nov 24 18:53:47 2010 New Revision: 49785 URL: http://svn.reactos.org/svn/reactos?rev=49785&view=rev Log: [NTOS]: STATUS_SUCCESS is not the only succesful return code. Modified: trunk/reactos/ntoskrnl/ke/arm/trapc.c Modified: trunk/reactos/ntoskrnl/ke/arm/trapc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/arm/trapc.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/ke/arm/trapc.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/arm/trapc.c [iso-8859-1] Wed Nov 24 18:53:47 2010 @@ -529,7 +529,7 @@ Address, KiGetPreviousMode(TrapFrame), TrapFrame); - if (Status == STATUS_SUCCESS) return Status; + if (NT_SUCCESS(Status)) return Status; } //

14 years, 5 months

[tkreuzer] 49784: [CMAKE] Add importlib targets for glu32, opengl32, rpcrt4

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Wed Nov 24 18:53:07 2010 New Revision: 49784 URL: http://svn.reactos.org/svn/reactos?rev=49784&view=rev Log: [CMAKE] Add importlib targets for glu32, opengl32, rpcrt4 Modified: branches/cmake-bringup/dll/win32/glu32/CMakeLists.txt branches/cmake-bringup/dll/win32/opengl32/CMakeLists.txt branches/cmake-bringup/dll/win32/rpcrt4/CMakeLists.txt Modified: branches/cmake-bringup/dll/win32/glu32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/glu32/C… ============================================================================== --- branches/cmake-bringup/dll/win32/glu32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/glu32/CMakeLists.txt [iso-8859-1] Wed Nov 24 18:53:07 2010 @@ -120,4 +120,5 @@ kernel32 ntdll) -add_cab_target(glu32 1) +add_cab_target(glu32 1) +add_importlib_target(glu32.spec) Modified: branches/cmake-bringup/dll/win32/opengl32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/opengl3… ============================================================================== --- branches/cmake-bringup/dll/win32/opengl32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/opengl32/CMakeLists.txt [iso-8859-1] Wed Nov 24 18:53:07 2010 @@ -30,3 +30,4 @@ add_pch(opengl32 ${CMAKE_CURRENT_SOURCE_DIR}/opengl32.h ${SOURCE}) add_cab_target(opengl32 1) +add_importlib_target(opengl32.spec) Modified: branches/cmake-bringup/dll/win32/rpcrt4/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/rpcrt4/… ============================================================================== --- branches/cmake-bringup/dll/win32/rpcrt4/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/rpcrt4/CMakeLists.txt [iso-8859-1] Wed Nov 24 18:53:07 2010 @@ -45,5 +45,5 @@ add_importlibs(rpcrt4 msvcrt user32 advapi32 secur32 iphlpapi ws2_32 kernel32 ntdll) add_dependencies(rpcrt4 winesdk) add_cab_target(rpcrt4 1) -add_importlib_target(${CMAKE_CURRENT_BINARY_DIR}/rpcrt4.def) +add_importlib_target(rpcrt4.spec)

14 years, 5 months

[tkreuzer] 49783: [SERVICES] Fix a typo (|| instead of |). Found by clang.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Wed Nov 24 18:30:12 2010 New Revision: 49783 URL: http://svn.reactos.org/svn/reactos?rev=49783&view=rev Log: [SERVICES] Fix a typo (|| instead of |). Found by clang. Modified: trunk/reactos/base/system/services/rpcserver.c Modified: trunk/reactos/base/system/services/rpcserver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/rpcse… ============================================================================== --- trunk/reactos/base/system/services/rpcserver.c [iso-8859-1] (original) +++ trunk/reactos/base/system/services/rpcserver.c [iso-8859-1] Wed Nov 24 18:30:12 2010 @@ -834,8 +834,8 @@ return ERROR_INVALID_HANDLE; } - if (dwSecurityInformation & (DACL_SECURITY_INFORMATION || - GROUP_SECURITY_INFORMATION || + if (dwSecurityInformation & (DACL_SECURITY_INFORMATION | + GROUP_SECURITY_INFORMATION | OWNER_SECURITY_INFORMATION)) DesiredAccess |= READ_CONTROL;

14 years, 5 months

[sir_richard] 49782: [NTOS]: Fix 16-bit interlocked operations on ARM (GCC doesn't provide built-ins). ARM should build now.

by sir_richard＠svn.reactos.org

Author: sir_richard Date: Wed Nov 24 18:19:42 2010 New Revision: 49782 URL: http://svn.reactos.org/svn/reactos?rev=49782&view=rev Log: [NTOS]: Fix 16-bit interlocked operations on ARM (GCC doesn't provide built-ins). ARM should build now. Modified: trunk/reactos/include/crt/mingw32/intrin_arm.h Modified: trunk/reactos/include/crt/mingw32/intrin_arm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/mingw32/intrin… ============================================================================== --- trunk/reactos/include/crt/mingw32/intrin_arm.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/mingw32/intrin_arm.h [iso-8859-1] Wed Nov 24 18:19:42 2010 @@ -67,12 +67,40 @@ __INTRIN_INLINE short _InterlockedCompareExchange16(volatile short * const Destination, const short Exchange, const short Comperand) { - return __sync_val_compare_and_swap(Destination, Comperand, Exchange); -} - -__INTRIN_INLINE long _InterlockedExchangeAdd16(volatile short * const Addend, const short Value) -{ - return __sync_fetch_and_add(Addend, Value); + short a, b; + + __asm__ __volatile__ ( "0:\n\t" + "ldr %1, [%2]\n\t" + "cmp %1, %4\n\t" + "bne 1f\n\t" + "swp %0, %3, [%2]\n\t" + "cmp %0, %1\n\t" + "swpne %3, %0, [%2]\n\t" + "bne 0b\n\t" + "1:" + : "=&r" (a), "=&r" (b) + : "r" (Destination), "r" (Exchange), "r" (Comperand) + : "cc", "memory"); + + return a; +} + +__INTRIN_INLINE short _InterlockedExchangeAdd16(volatile short * const Addend, const short Value) +{ + short a, b, c; + + __asm__ __volatile__ ( "0:\n\t" + "ldr %0, [%3]\n\t" + "add %1, %0, %4\n\t" + "swp %2, %1, [%3]\n\t" + "cmp %0, %2\n\t" + "swpne %1, %2, [%3]\n\t" + "bne 0b" + : "=&r" (a), "=&r" (b), "=&r" (c) + : "r" (Value), "r" (Addend) + : "cc", "memory"); + + return a; } __INTRIN_INLINE long _InterlockedCompareExchange(volatile long * const dest, const long exch, const long comp)

14 years, 5 months

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