Ros-diffs

ros-diffs@reactos.org

81390 discussions

[spetreolle] 50722: [CMAKE] Fix dxdiag build.
by spetreolle＠svn.reactos.org 15 Feb '11

15 Feb '11

Author: spetreolle Date: Tue Feb 15 22:07:05 2011 New Revision: 50722 URL: http://svn.reactos.org/svn/reactos?rev=50722&view=rev Log: [CMAKE] Fix dxdiag build. Modified: branches/cmake-bringup/base/applications/dxdiag/CMakeLists.txt Modified: branches/cmake-bringup/base/applications/dxdiag/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/dxdiag/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/dxdiag/CMakeLists.txt [iso-8859-1] Tue Feb 15 22:07:05 2011 @@ -27,6 +27,6 @@ target_link_libraries(dxdiag dxguid) -add_importlibs(dxdiag user32 advapi32 comctl32 dinput8 setupapi dsound ddraw version gdi32 winmm d3d9 msvcrt kernel32) +add_importlibs(dxdiag user32 advapi32 comctl32 dinput8 setupapi dsound ddraw version gdi32 winmm d3d9 msvcrt kernel32 ntdll) add_cab_target(dxdiag 1)

1 0

[fireball] 50721: [RTL/DPH] - Implement other support locking/unlocking, handle-related routines. - Fix RtlpDphFreeVm definition. - Node lists related improvements: Add a function for removing a no...
by fireball＠svn.reactos.org 15 Feb '11

15 Feb '11

Author: fireball Date: Tue Feb 15 22:02:28 2011 New Revision: 50721 URL: http://svn.reactos.org/svn/reactos?rev=50721&view=rev Log: [RTL/DPH] - Implement other support locking/unlocking, handle-related routines. - Fix RtlpDphFreeVm definition. - Node lists related improvements: Add a function for removing a node from a free list, implement coalescing free nodes into an available list. - Implement a non-implemented case in RtlpDphAllocateNode when there is a need to allocate more virtual memory, and fix incorrect size calculation too. - Implement a function for validating the page heap block. - Implement RtlpPageHeapDestroy. Now we have two exported APIs ready: heap create and heap destroy. Modified: trunk/reactos/lib/rtl/heappage.c Modified: trunk/reactos/lib/rtl/heappage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/heappage.c?rev=507… ============================================================================== --- trunk/reactos/lib/rtl/heappage.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/heappage.c [iso-8859-1] Tue Feb 15 22:02:28 2011 @@ -139,8 +139,21 @@ #define DPH_DEBUG_INTERNAL_VALIDATE 0x01 #define DPH_DEBUG_VERBOSE 0x04 +/* DPH ExtraFlags */ +#define DPH_EXTRA_CHECK_CORRUPTED_BLOCKS 0x10 + /* Fillers */ #define DPH_FILL 0xEEEEEEEE +#define DPH_FILL_START_STAMP_1 0xABCDBBBB +#define DPH_FILL_START_STAMP_2 0xABCDBBBA +#define DPH_FILL_END_STAMP_1 0xDCBABBBB +#define DPH_FILL_BLOCK_END 0xD0 + +/* Validation info flags */ +#define DPH_VALINFO_BAD_START_STAMP 0x01 +#define DPH_VALINFO_BAD_END_STAMP 0x02 +#define DPH_VALINFO_BAD_POINTER 0x04 +#define DPH_VALINFO_BAD_END_FILL 0x10 /* Signatures */ #define DPH_SIGNATURE 0xFFEEDDCC @@ -154,6 +167,67 @@ BOOLEAN NTAPI RtlpDphGrowVirtual(PDPH_HEAP_ROOT DphRoot, SIZE_T Size); + +PVOID NTAPI +RtlpDphPointerFromHandle(PVOID Handle) +{ + PHEAP NormalHeap = (PHEAP)Handle; + PDPH_HEAP_ROOT DphHeap = (PDPH_HEAP_ROOT)((PUCHAR)Handle + PAGE_SIZE); + + if (NormalHeap->ForceFlags & HEAP_FLAG_PAGE_ALLOCS) + { + if (DphHeap->Signature == DPH_SIGNATURE) + return DphHeap; + } + + DPRINT1("heap handle with incorrect signature\n"); + DbgBreakPoint(); + return NULL; +} + +VOID NTAPI +RtlpDphEnterCriticalSection(PDPH_HEAP_ROOT DphRoot, ULONG Flags) +{ + if (Flags & HEAP_NO_SERIALIZE) + { + /* More complex scenario */ + if (!RtlTryEnterCriticalSection(DphRoot->HeapCritSect)) + { + if (!DphRoot->nRemoteLockAcquired) + { + DPRINT1("multithreaded access in HEAP_NO_SERIALIZE heap\n"); + DbgBreakPoint(); + + /* Clear out the no serialize flag */ + DphRoot->HeapFlags &= ~HEAP_NO_SERIALIZE; + } + + /* Enter the heap's critical section */ + RtlEnterCriticalSection(DphRoot->HeapCritSect); + } + } + else + { + /* Just enter the heap's critical section */ + RtlEnterCriticalSection(DphRoot->HeapCritSect); + } +} + +VOID NTAPI +RtlpDphLeaveCriticalSection(PDPH_HEAP_ROOT DphRoot) +{ + /* Just leave the heap's critical section */ + RtlLeaveCriticalSection(DphRoot->HeapCritSect); +} + + +VOID NTAPI +RtlpDphPreProcessing(PDPH_HEAP_ROOT DphRoot, ULONG Flags) +{ + RtlpDphEnterCriticalSection(DphRoot, Flags); + + /* FIXME: Validate integrity, internal lists if necessary */ +} NTSTATUS NTAPI RtlpSecMemFreeVirtualMemory(HANDLE Process, PVOID *Base, PSIZE_T Size, ULONG Type) @@ -218,7 +292,7 @@ } NTSTATUS NTAPI -RtlpDphFreeVm(PVOID Base, SIZE_T Size, ULONG Type, ULONG Protection) +RtlpDphFreeVm(PVOID Base, SIZE_T Size, ULONG Type) { NTSTATUS Status; @@ -363,6 +437,28 @@ } VOID NTAPI +RtlpDphRemoveFromFreeList(PDPH_HEAP_ROOT DphRoot, + PDPH_HEAP_BLOCK Node, + PDPH_HEAP_BLOCK Prev) +{ + PDPH_HEAP_BLOCK Next; + + /* Detach it from the list */ + Next = Node->pNextAlloc; + if (DphRoot->pFreeAllocationListHead == Node) + DphRoot->pFreeAllocationListHead = Next; + if (DphRoot->pFreeAllocationListTail == Node) + DphRoot->pFreeAllocationListTail = Prev; + if (Prev) Prev->pNextAlloc = Next; + + /* Decrease heap counters */ + DphRoot->nFreeAllocations--; + DphRoot->nFreeAllocationBytesCommitted -= Node->nVirtualBlockSize; + + Node->StackTrace = NULL; +} + +VOID NTAPI RtlpDphCoalesceNodeIntoAvailable(PDPH_HEAP_ROOT DphRoot, PDPH_HEAP_BLOCK Node) { @@ -433,9 +529,30 @@ VOID NTAPI RtlpDphCoalesceFreeIntoAvailable(PDPH_HEAP_ROOT DphRoot, - ULONG Size) -{ - UNIMPLEMENTED; + ULONG LeaveOnFreeList) +{ + PDPH_HEAP_BLOCK Node = DphRoot->pFreeAllocationListHead, Next; + SIZE_T FreeAllocations = DphRoot->nFreeAllocations; + + /* Make sure requested size is not too big */ + ASSERT(FreeAllocations >= LeaveOnFreeList); + + while (Node) + { + FreeAllocations--; + if (FreeAllocations <= LeaveOnFreeList) break; + + /* Get the next pointer, because it may be changed after following two calls */ + Next = Node->pNextAlloc; + + /* Remove it from the free list */ + RtlpDphRemoveFromFreeList(DphRoot, Node, NULL); + + /* And put into the available */ + RtlpDphCoalesceNodeIntoAvailable(DphRoot, Node); + + Node = Next; + } } VOID NTAPI @@ -573,7 +690,7 @@ { PDPH_HEAP_BLOCK Node; NTSTATUS Status; - ULONG Size = DPH_POOL_SIZE; + SIZE_T Size = DPH_POOL_SIZE, SizeVirtual; PVOID Ptr; /* Check for the easy case */ @@ -601,17 +718,20 @@ { RtlpDphRemoveFromAvailableList(DphRoot, Node); Ptr = Node->pVirtualBlock; + SizeVirtual = Node->nVirtualBlockSize; } else { /* No free space, need to alloc a new VM block */ Size = DPH_POOL_SIZE; - Status = RtlpDphAllocateVm(&Ptr, DPH_RESERVE_SIZE, MEM_COMMIT, PAGE_NOACCESS); + SizeVirtual = DPH_RESERVE_SIZE; + Status = RtlpDphAllocateVm(&Ptr, SizeVirtual, MEM_COMMIT, PAGE_NOACCESS); if (!NT_SUCCESS(Status)) { /* Retry with a smaller size */ - Status = RtlpDphAllocateVm(&Ptr, 0x10000, MEM_COMMIT, PAGE_NOACCESS); + SizeVirtual = 0x10000; + Status = RtlpDphAllocateVm(&Ptr, SizeVirtual, MEM_COMMIT, PAGE_NOACCESS); if (!NT_SUCCESS(Status)) return NULL; } } @@ -620,7 +740,16 @@ Status = RtlpDphProtectVm(Ptr, Size, PAGE_READWRITE); if (!NT_SUCCESS(Status)) { - ASSERT(FALSE); + if (Node) + { + RtlpDphCoalesceNodeIntoAvailable(DphRoot, Node); + } + else + { + //RtlpDphFreeVm(); + ASSERT(FALSE); + } + return NULL; } @@ -630,11 +759,7 @@ /* Add a new pool based on this VM */ RtlpDphAddNewPool(DphRoot, Node, Ptr, Size, TRUE); - if (!Node) - { - ASSERT(FALSE); - } - else + if (Node) { if (Node->nVirtualBlockSize > Size) { @@ -648,6 +773,23 @@ RtlpDphReturnNodeToUnusedList(DphRoot, Node); } } + else + { + /* The new VM block was just allocated a few code lines ago, + so initialize it */ + Node = RtlpDphTakeNodeFromUnusedList(DphRoot); + Node->pVirtualBlock = Ptr; + Node->nVirtualBlockSize = SizeVirtual; + RtlpDphPlaceOnVirtualList(DphRoot, Node); + + Node = RtlpDphTakeNodeFromUnusedList(DphRoot); + Node->pVirtualBlock = (PUCHAR)Ptr + Size; + Node->nVirtualBlockSize = SizeVirtual - Size; + RtlpDphPlaceOnVirtualList(DphRoot, Node); + + /* Coalesce them into available list */ + RtlpDphCoalesceNodeIntoAvailable(DphRoot, Node); + } } return RtlpDphTakeNodeFromUnusedList(DphRoot); @@ -709,7 +851,7 @@ IN PVOID FirstStruct, IN PVOID SecondStruct) { - /* FIXME: TODO */ + UNIMPLEMENTED; ASSERT(FALSE); return 0; } @@ -719,7 +861,7 @@ RtlpDphAllocateNodeForTable(IN PRTL_AVL_TABLE Table, IN CLONG ByteSize) { - /* FIXME: TODO */ + UNIMPLEMENTED; ASSERT(FALSE); return NULL; } @@ -729,7 +871,7 @@ RtlpDphFreeNodeForTable(IN PRTL_AVL_TABLE Table, IN PVOID Buffer) { - /* FIXME: TODO */ + UNIMPLEMENTED; ASSERT(FALSE); } @@ -740,6 +882,13 @@ return STATUS_SUCCESS; } +VOID NTAPI +RtlpDphFreeDelayedBlocksFromHeap(PDPH_HEAP_ROOT DphRoot, + PHEAP NormalHeap) +{ + UNIMPLEMENTED; +} + NTSTATUS NTAPI RtlpDphTargetDllsLogicInitialize() { @@ -751,6 +900,78 @@ RtlpDphInternalValidatePageHeap(PDPH_HEAP_ROOT DphRoot, PVOID Address, ULONG Value) { UNIMPLEMENTED; +} + +VOID NTAPI +RtlpDphReportCorruptedBlock(PDPH_HEAP_ROOT DphRoot, + ULONG Reserved, + PVOID Block, + ULONG ValidationInfo) +{ + UNIMPLEMENTED; +} + +BOOLEAN NTAPI +RtlpDphIsPageHeapBlock(PDPH_HEAP_ROOT DphRoot, + PVOID Block, + PULONG ValidationInformation, + BOOLEAN CheckFillers) +{ + PDPH_BLOCK_INFORMATION BlockInfo; + BOOLEAN SomethingWrong = FALSE; + PUCHAR Byte, Start, End; + + ASSERT(ValidationInformation != NULL); + *ValidationInformation = 0; + + // _SEH2_TRY { + BlockInfo = (PDPH_BLOCK_INFORMATION)Block - 1; + + /* Check stamps */ + if (BlockInfo->StartStamp != DPH_FILL_START_STAMP_1) + { + *ValidationInformation |= DPH_VALINFO_BAD_START_STAMP; + SomethingWrong = TRUE; + + /* Check if it has an alloc/free mismatch */ + if (BlockInfo->StartStamp == DPH_FILL_START_STAMP_2) + { + /* Notify respectively */ + *ValidationInformation = 0x101; + } + } + + if (BlockInfo->EndStamp != DPH_FILL_END_STAMP_1) + { + *ValidationInformation |= DPH_VALINFO_BAD_END_STAMP; + SomethingWrong = TRUE; + } + + /* Check root heap pointer */ + if (BlockInfo->Heap != DphRoot) + { + *ValidationInformation |= DPH_VALINFO_BAD_POINTER; + SomethingWrong = TRUE; + } + + /* Check other fillers if requested */ + if (CheckFillers) + { + /* Check space after the block */ + Start = (PUCHAR)Block + BlockInfo->RequestedSize; + End = (PUCHAR)ROUND_UP(Start, PAGE_SIZE); + for (Byte = Start; Byte < End; Byte++) + { + if (*Byte != DPH_FILL_BLOCK_END) + { + *ValidationInformation |= DPH_VALINFO_BAD_END_FILL; + SomethingWrong = TRUE; + break; + } + } + } + + return (SomethingWrong == FALSE); } NTSTATUS NTAPI @@ -926,7 +1147,82 @@ PVOID NTAPI RtlpPageHeapDestroy(HANDLE HeapPtr) { - return FALSE; + PDPH_HEAP_ROOT DphRoot; + PDPH_HEAP_BLOCK Node, Next; + PHEAP NormalHeap; + ULONG Value; + + /* Check if it's not a process heap */ + if (HeapPtr == RtlGetProcessHeap()) + { + DbgBreakPoint(); + return NULL; + } + + /* Get pointer to the heap root */ + DphRoot = RtlpDphPointerFromHandle(HeapPtr); + if (!DphRoot) return NULL; + + RtlpDphPreProcessing(DphRoot, DphRoot->HeapFlags); + + /* Get the pointer to the normal heap */ + NormalHeap = DphRoot->NormalHeap; + + /* Free the delayed-free blocks */ + RtlpDphFreeDelayedBlocksFromHeap(DphRoot, NormalHeap); + + /* Go through the busy blocks */ + Node = RtlEnumerateGenericTableAvl(&DphRoot->BusyNodesTable, TRUE); + + while (Node) + { + if (!(DphRoot->ExtraFlags & DPH_EXTRA_CHECK_CORRUPTED_BLOCKS)) + { + if (!RtlpDphIsPageHeapBlock(DphRoot, Node->pUserAllocation, &Value, TRUE)) + { + RtlpDphReportCorruptedBlock(DphRoot, 3, Node->pUserAllocation, Value); + } + } + + /* FIXME: Call AV notification */ + //AVrfInternalHeapFreeNotification(); + + /* Go to the next node */ + Node = RtlEnumerateGenericTableAvl(&DphRoot->BusyNodesTable, FALSE); + } + + /* Acquire the global heap list lock */ + RtlEnterCriticalSection(&RtlpDphPageHeapListLock); + + /* Remove the entry and decrement the global counter */ + RemoveEntryList(&DphRoot->NextHeap); + RtlpDphPageHeapListLength--; + + /* Release the global heap list lock */ + RtlLeaveCriticalSection(&RtlpDphPageHeapListLock); + + /* Leave and delete this heap's critical section */ + RtlLeaveCriticalSection(DphRoot->HeapCritSect); + RtlDeleteCriticalSection(DphRoot->HeapCritSect); + + /* Now go through all virtual list nodes and release the VM */ + Node = DphRoot->pVirtualStorageListHead; + while (Node) + { + Next = Node->pNextAlloc; + /* Release the memory without checking result */ + RtlpDphFreeVm(Node->pVirtualBlock, 0, MEM_RELEASE); + Node = Next; + } + + /* Destroy the normal heap */ + RtlDestroyHeap(NormalHeap); + + /* Report success */ + if (RtlpDphDebugOptions & DPH_DEBUG_VERBOSE) + DPRINT1("Page heap: process 0x%X destroyed heap @ %p (%p)\n", NtCurrentTeb()->ClientId.UniqueProcess, HeapPtr, NormalHeap); + + return NULL; } PVOID NTAPI

1 0

[tkreuzer] 50720: [KSPROXY] - Fix gcc build - don't pass gcc flags to msvc . mark some exports as private
by tkreuzer＠svn.reactos.org 15 Feb '11

15 Feb '11

Author: tkreuzer Date: Tue Feb 15 20:47:09 2011 New Revision: 50720 URL: http://svn.reactos.org/svn/reactos?rev=50720&view=rev Log: [KSPROXY] - Fix gcc build - don't pass gcc flags to msvc . mark some exports as private Modified: branches/cmake-bringup/dll/directx/ksproxy/CMakeLists.txt branches/cmake-bringup/dll/directx/ksproxy/datatype.cpp branches/cmake-bringup/dll/directx/ksproxy/input_pin.cpp branches/cmake-bringup/dll/directx/ksproxy/ksproxy.spec Modified: branches/cmake-bringup/dll/directx/ksproxy/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/kspro… ============================================================================== --- branches/cmake-bringup/dll/directx/ksproxy/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/directx/ksproxy/CMakeLists.txt [iso-8859-1] Tue Feb 15 20:47:09 2011 @@ -36,11 +36,10 @@ else() #FIXME : can't build if this is enabled, check if this is needed #set_target_properties(ksproxy PROPERTIES COMPILE_FLAGS "-fno-exceptions -fno-rtti") + target_link_libraries(ksproxy -lsupc++ -lgcc -lmingw32 -lcoldname) endif(MSVC) -target_link_libraries(ksproxy - stlport -lsupc++ -lgcc -lmingw32 -lcoldname - strmiids) +target_link_libraries(ksproxy stlport strmiids) add_importlibs(ksproxy advapi32 Modified: branches/cmake-bringup/dll/directx/ksproxy/datatype.cpp URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/kspro… ============================================================================== --- branches/cmake-bringup/dll/directx/ksproxy/datatype.cpp [iso-8859-1] (original) +++ branches/cmake-bringup/dll/directx/ksproxy/datatype.cpp [iso-8859-1] Tue Feb 15 20:47:09 2011 @@ -11,9 +11,10 @@ /* FIXME guid mess */ #ifndef _MSC_VER const GUID IID_IUnknown = {0x00000000, 0x0000, 0x0000, {0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46}}; +#else +const GUID IID_IKsDataTypeHandler = {0x5FFBAA02L, 0x49A3, 0x11D0, {0x9F, 0x36, 0x00, 0xAA, 0x00, 0xA2, 0x16, 0xA1}}; #endif const GUID IID_IClassFactory = {0x00000001, 0x0000, 0x0000, {0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46}}; -const GUID IID_IKsDataTypeHandler = {0x5FFBAA02L, 0x49A3, 0x11D0, {0x9F, 0x36, 0x00, 0xAA, 0x00, 0xA2, 0x16, 0xA1}}; class CKsDataTypeHandler : public IKsDataTypeHandler { Modified: branches/cmake-bringup/dll/directx/ksproxy/input_pin.cpp URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/kspro… ============================================================================== --- branches/cmake-bringup/dll/directx/ksproxy/input_pin.cpp [iso-8859-1] (original) +++ branches/cmake-bringup/dll/directx/ksproxy/input_pin.cpp [iso-8859-1] Tue Feb 15 20:47:09 2011 @@ -10,9 +10,10 @@ const GUID IID_IKsPinPipe = {0xe539cd90, 0xa8b4, 0x11d1, {0x81, 0x89, 0x00, 0xa0, 0xc9, 0x06, 0x28, 0x02}}; const GUID IID_IKsPinEx = {0x7bb38260L, 0xd19c, 0x11d2, {0xb3, 0x8a, 0x00, 0xa0, 0xc9, 0x5e, 0xc2, 0x2e}}; +#ifdef _MSC_VER const GUID IID_IKsPin = {0xb61178d1L, 0xa2d9, 0x11cf, {0x9e, 0x53, 0x00, 0xaa, 0x00, 0xa2, 0x16, 0xa1}}; const GUID IID_IKsInterfaceHandler = {0xD3ABC7E0L, 0x9A61, 0x11D0, {0xA4, 0x0D, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96}}; - +#endif #ifndef _MSC_VER const GUID KSPROPSETID_Connection = {0x1D58C920L, 0xAC9B, 0x11CF, {0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00}}; Modified: branches/cmake-bringup/dll/directx/ksproxy/ksproxy.spec URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/kspro… ============================================================================== --- branches/cmake-bringup/dll/directx/ksproxy/ksproxy.spec [iso-8859-1] (original) +++ branches/cmake-bringup/dll/directx/ksproxy/ksproxy.spec [iso-8859-1] Tue Feb 15 20:47:09 2011 @@ -1,7 +1,7 @@ -@ stdcall DllCanUnloadNow() -@ stdcall DllGetClassObject(ptr ptr ptr) -@ stdcall DllRegisterServer() -@ stdcall DllUnregisterServer() +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() @ stdcall KsGetMediaType(long ptr ptr long) @ stdcall KsGetMediaTypeCount(ptr long ptr) @ stdcall KsGetMultiplePinFactoryItems(ptr long long ptr)

1 0

[tkreuzer] 50719: [MSI] - Fix reource files (strings must be in one line) - Fix compilation with MSVC
by tkreuzer＠svn.reactos.org 15 Feb '11

15 Feb '11

Author: tkreuzer Date: Tue Feb 15 19:15:01 2011 New Revision: 50719 URL: http://svn.reactos.org/svn/reactos?rev=50719&view=rev Log: [MSI] - Fix reource files (strings must be in one line) - Fix compilation with MSVC Added: branches/cmake-bringup/dll/win32/msi/msvchelper.h (with props) Modified: branches/cmake-bringup/dll/win32/msi/CMakeLists.txt branches/cmake-bringup/dll/win32/msi/msi_Bg.rc branches/cmake-bringup/dll/win32/msi/msi_Da.rc branches/cmake-bringup/dll/win32/msi/msi_De.rc branches/cmake-bringup/dll/win32/msi/msi_En.rc branches/cmake-bringup/dll/win32/msi/msi_Es.rc branches/cmake-bringup/dll/win32/msi/msi_Fi.rc branches/cmake-bringup/dll/win32/msi/msi_Fr.rc branches/cmake-bringup/dll/win32/msi/msi_Hu.rc branches/cmake-bringup/dll/win32/msi/msi_It.rc branches/cmake-bringup/dll/win32/msi/msi_Ko.rc branches/cmake-bringup/dll/win32/msi/msi_Lt.rc branches/cmake-bringup/dll/win32/msi/msi_Nl.rc branches/cmake-bringup/dll/win32/msi/msi_No.rc branches/cmake-bringup/dll/win32/msi/msi_Pl.rc branches/cmake-bringup/dll/win32/msi/msi_Pt.rc branches/cmake-bringup/dll/win32/msi/msi_Ro.rc branches/cmake-bringup/dll/win32/msi/msi_Ru.rc branches/cmake-bringup/dll/win32/msi/msi_Si.rc branches/cmake-bringup/dll/win32/msi/msi_Sr.rc branches/cmake-bringup/dll/win32/msi/msi_Sv.rc branches/cmake-bringup/dll/win32/msi/msi_Tr.rc branches/cmake-bringup/dll/win32/msi/msi_Uk.rc branches/cmake-bringup/dll/win32/msi/msi_Zh.rc Modified: branches/cmake-bringup/dll/win32/msi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msi/CMa… ============================================================================== --- branches/cmake-bringup/dll/win32/msi/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/msi/CMakeLists.txt [iso-8859-1] Tue Feb 15 19:15:01 2011 @@ -59,6 +59,10 @@ ${CMAKE_CURRENT_BINARY_DIR}/msi_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/msi.def) +if(MSVC) + set_source_files_properties(custom.c PROPERTIES COMPILE_FLAGS /FImsvchelper.h) +endif() + add_library(msi SHARED ${SOURCE}) add_idl_Headers(msi_idlheader msiserver.idl) Modified: branches/cmake-bringup/dll/win32/msi/msi_Bg.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msi/msi… ============================================================================== --- branches/cmake-bringup/dll/win32/msi/msi_Bg.rc [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/msi/msi_Bg.rc [iso-8859-1] Tue Feb 15 19:15:01 2011 @@ -27,33 +27,7 @@ 4 "The specified installation package could not be opened. Please check the file path and try again." 5 "ïúòÿò %s íå å íàìåðåí" 9 "ïîñòàâåòå äèñê %s" - 10 "Windows Installer %s\n\n" \ - "Usage:\n" \ - "msiexec command {required parameter} [optional parammeter]\n\n" \ - "Install a product:\n" \ - "\t/i {package|productcode} [property]\n" \ - "\t/package {package|productcode} [property]\n" \ - "\t/a package [property]\n" \ - "Repair an installation:\n" \ - "\t/f[p|o|e|d|c|a|u|m|s|v] {package|productcode}\n" \ - "Uninstall a product:\n" \ - "\t/uninstall {package|productcode} [property]\n" \ - "\t/x {package|productcode} [property]\n" \ - "Advertise a product:\n" \ - "\t/j[u|m] package [/t transform] [/g languageid]\n" \ - "Apply a patch:\n" \ - "\t/p patchpackage [property]\n" \ - "\t/p patchpackage /a package [property]\n" \ - "Log and UI Modifiers for above commands:\n" \ - "\t/l[*][i|w|e|a|r|u|c|m|o|p|v|][+|!] logfile\n" \ - "\t/q{|n|b|r|f|n+|b+|b-}\n" \ - "Register MSI Service:\n" \ - "\t/y\n" \ - "Unregister MSI Service:\n" \ - "\t/z\n" \ - "Display this help:\n" \ - "\t/help\n" \ - "\t/?\n" + 10 "Windows Installer %s\n\nUsage:\nmsiexec command {required parameter} [optional parammeter]\n\nInstall a product:\n\t/i {package|productcode} [property]\n\t/package {package|productcode} [property]\n\t/a package [property]\nRepair an installation:\n\t/f[p|o|e|d|c|a|u|m|s|v] {package|productcode}\nUninstall a product:\n\t/uninstall {package|productcode} [property]\n\t/x {package|productcode} [property]\nAdvertise a product:\n\t/j[u|m] package [/t transform] [/g languageid]\nApply a patch:\n\t/p patchpackage [property]\n\t/p patchpackage /a package [property]\nLog and UI Modifiers for above commands:\n\t/l[*][i|w|e|a|r|u|c|m|o|p|v|][+|!] logfile\n\t/q{|n|b|r|f|n+|b+|b-}\nRegister MSI Service:\n\t/y\nUnregister MSI Service:\n\t/z\nDisplay this help:\n\t/help\n\t/?\n" 11 "âúâåäåòå ïàïêàòà, êîÿòî ñúäúðæà %s" 12 "èçòî÷íèêà çà èíñòàëàöèÿ íà ôóíêöèîíàëíîñòòà ëèïñâà" 13 "ìðåæîâîòî óñòðîéñòâà íóæíî çà ôóíêöèîíàëíîñòòà ëèïñâà " Modified: branches/cmake-bringup/dll/win32/msi/msi_Da.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msi/msi… ============================================================================== --- branches/cmake-bringup/dll/win32/msi/msi_Da.rc [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/msi/msi_Da.rc [iso-8859-1] Tue Feb 15 19:15:01 2011 @@ -27,33 +27,7 @@ 4 "Kunne ikke åbne den specificerede installationspakke. Kontroller stien og prøv igen." 5 "kunne ikke finden stien '%s'." 9 "indsæt disk '%s'" - 10 "Windows Installer %s\n\n" \ - "Usage:\n" \ - "msiexec command {required parameter} [optional parammeter]\n\n" \ - "Install a product:\n" \ - "\t/i {package|productcode} [property]\n" \ - "\t/package {package|productcode} [property]\n" \ - "\t/a package [property]\n" \ - "Repair an installation:\n" \ - "\t/f[p|o|e|d|c|a|u|m|s|v] {package|productcode}\n" \ - "Uninstall a product:\n" \ - "\t/uninstall {package|productcode} [property]\n" \ - "\t/x {package|productcode} [property]\n" \ - "Advertise a product:\n" \ - "\t/j[u|m] package [/t transform] [/g languageid]\n" \ - "Apply a patch:\n" \ - "\t/p patchpackage [property]\n" \ - "\t/p patchpackage /a package [property]\n" \ - "Log and UI Modifiers for above commands:\n" \ - "\t/l[*][i|w|e|a|r|u|c|m|o|p|v|][+|!] logfile\n" \ - "\t/q{|n|b|r|f|n+|b+|b-}\n" \ - "Register MSI Service:\n" \ - "\t/y\n" \ - "Unregister MSI Service:\n" \ - "\t/z\n" \ - "Display this help:\n" \ - "\t/help\n" \ - "\t/?\n" + 10 "Windows Installer %s\n\nUsage:\nmsiexec command {required parameter} [optional parammeter]\n\nInstall a product:\n\t/i {package|productcode} [property]\n\t/package {package|productcode} [property]\n\t/a package [property]\nRepair an installation:\n\t/f[p|o|e|d|c|a|u|m|s|v] {package|productcode}\nUninstall a product:\n\t/uninstall {package|productcode} [property]\n\t/x {package|productcode} [property]\nAdvertise a product:\n\t/j[u|m] package [/t transform] [/g languageid]\nApply a patch:\n\t/p patchpackage [property]\n\t/p patchpackage /a package [property]\nLog and UI Modifiers for above commands:\n\t/l[*][i|w|e|a|r|u|c|m|o|p|v|][+|!] logfile\n\t/q{|n|b|r|f|n+|b+|b-}\nRegister MSI Service:\n\t/y\nUnregister MSI Service:\n\t/z\nDisplay this help:\n\t/help\n\t/?\n" 11 "angiv kataloget som indeholder '%s'." 12 "featurens installationskilde mangler." 13 "featurens netværksdrev mangler." Modified: branches/cmake-bringup/dll/win32/msi/msi_De.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msi/msi… ============================================================================== --- branches/cmake-bringup/dll/win32/msi/msi_De.rc [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/msi/msi_De.rc [iso-8859-1] Tue Feb 15 19:15:01 2011 @@ -30,33 +30,7 @@ 4 "Das angegebene Installationspaket konnte nicht geÃ¶ffnet werden. Bitte Ã¼berprÃ¼fen Sie den Pfadnamen und versuchen Sie es noch einmal." 5 "Der Pfad %s wurde nicht gefunden." 9 "Bitte Disk %s einlegen." - 10 "Windows Installer %s\n\n" \ - "Benutzung:\n" \ - "msiexec Befehl {Parameter} [ZusÃ¤tzliche Parammeter]\n\n" \ - "Produkt installieren:\n" \ - "\t/i {Paket|Produktcode} [Eigenschaft]\n" \ - "\t/package {Paket|Produktcode} [Eigenschaft]\n" \ - "\t/a Paket [Eigenschaft]\n" \ - "Installation reparieren:\n" \ - "\t/f[p|o|e|d|c|a|u|m|s|v] {Paket|Produktcode}\n" \ - "Produkt deinstallieren:\n" \ - "\t/uninstall {Paket|Produktcode} [Eigenschaft]\n" \ - "\t/x {Paket|Produktcode} [Eigenschaft]\n" \ - "Produkt ankÃ¼ndigen:\n" \ - "\t/j[u|m] Paket [/t Transformationspaket] [/g Sprachkennung]\n" \ - "Patch integrieren:\n" \ - "\t/p Patchpaket [Eigenschaft]\n" \ - "\t/p Patchpaket /a Paket [Eigenschaft]\n" \ - "Protokollierung und BenutzeroberflÃ¤che fÃ¼r die oberen Befehle anpassen:\n" \ - "\t/l[*][i|w|e|a|r|u|c|m|o|p|v|][+|!] Protokolldatei\n" \ - "\t/q{|n|b|r|f|n+|b+|b-}\n" \ - "MSI Service registrieren:\n" \ - "\t/y\n" \ - "Registrierung des MSI Service aufheben:\n" \ - "\t/z\n" \ - "Hilfe anzeigen:\n" \ - "\t/help\n" \ - "\t/?\n" + 10 "Windows Installer %s\n\nBenutzung:\nmsiexec Befehl {Parameter} [ZusÃ¤tzliche Parammeter]\n\nProdukt installieren:\n\t/i {Paket|Produktcode} [Eigenschaft]\n\t/package {Paket|Produktcode} [Eigenschaft]\n\t/a Paket [Eigenschaft]\nInstallation reparieren:\n\t/f[p|o|e|d|c|a|u|m|s|v] {Paket|Produktcode}\nProdukt deinstallieren:\n\t/uninstall {Paket|Produktcode} [Eigenschaft]\n\t/x {Paket|Produktcode} [Eigenschaft]\nProdukt ankÃ¼ndigen:\n\t/j[u|m] Paket [/t Transformationspaket] [/g Sprachkennung]\nPatch integrieren:\n\t/p Patchpaket [Eigenschaft]\n\t/p Patchpaket /a Paket [Eigenschaft]\nProtokollierung und BenutzeroberflÃ¤che fÃ¼r die oberen Befehle anpassen:\n\t/l[*][i|w|e|a|r|u|c|m|o|p|v|][+|!] Protokolldatei\n\t/q{|n|b|r|f|n+|b+|b-}\nMSI Service registrieren:\n\t/y\nRegistrierung des MSI Service aufheben:\n\t/z\nHilfe anzeigen:\n\t/help\n\t/?\n" 11 "Geben Sie das Verzeichnis ein, dass %s enthÃ¤lt." 12 "Die Installationsquelle fÃ¼r das Feature fehlt." 13 "Das Netzwerklaufwerk fÃ¼r das Feature fehlt." Modified: branches/cmake-bringup/dll/win32/msi/msi_En.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msi/msi… ============================================================================== --- branches/cmake-bringup/dll/win32/msi/msi_En.rc [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/msi/msi_En.rc [iso-8859-1] Tue Feb 15 19:15:01 2011 @@ -28,33 +28,7 @@ 4 "The specified installation package could not be opened. Please check the file path and try again." 5 "path %s not found" 9 "insert disk %s" - 10 "Windows Installer %s\n\n" \ - "Usage:\n" \ - "msiexec command {required parameter} [optional parameter]\n\n" \ - "Install a product:\n" \ - "\t/i {package|productcode} [property]\n" \ - "\t/package {package|productcode} [property]\n" \ - "\t/a package [property]\n" \ - "Repair an installation:\n" \ - "\t/f[p|o|e|d|c|a|u|m|s|v] {package|productcode}\n" \ - "Uninstall a product:\n" \ - "\t/uninstall {package|productcode} [property]\n" \ - "\t/x {package|productcode} [property]\n" \ - "Advertise a product:\n" \ - "\t/j[u|m] package [/t transform] [/g languageid]\n" \ - "Apply a patch:\n" \ - "\t/p patchpackage [property]\n" \ - "\t/p patchpackage /a package [property]\n" \ - "Log and UI Modifiers for above commands:\n" \ - "\t/l[*][i|w|e|a|r|u|c|m|o|p|v|][+|!] logfile\n" \ - "\t/q{|n|b|r|f|n+|b+|b-}\n" \ - "Register MSI Service:\n" \ - "\t/y\n" \ - "Unregister MSI Service:\n" \ - "\t/z\n" \ - "Display this help:\n" \ - "\t/help\n" \ - "\t/?\n" + 10 "Windows Installer %s\n\nUsage:\nmsiexec command {required parameter} [optional parameter]\n\nInstall a product:\n\t/i {package|productcode} [property]\n\t/package {package|productcode} [property]\n\t/a package [property]\nRepair an installation:\n\t/f[p|o|e|d|c|a|u|m|s|v] {package|productcode}\nUninstall a product:\n\t/uninstall {package|productcode} [property]\n\t/x {package|productcode} [property]\nAdvertise a product:\n\t/j[u|m] package [/t transform] [/g languageid]\nApply a patch:\n\t/p patchpackage [property]\n\t/p patchpackage /a package [property]\nLog and UI Modifiers for above commands:\n\t/l[*][i|w|e|a|r|u|c|m|o|p|v|][+|!] logfile\n\t/q{|n|b|r|f|n+|b+|b-}\nRegister MSI Service:\n\t/y\nUnregister MSI Service:\n\t/z\nDisplay this help:\n\t/help\n\t/?\n" 11 "enter which folder contains %s" 12 "install source for feature missing" 13 "network drive for feature missing" Modified: branches/cmake-bringup/dll/win32/msi/msi_Es.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msi/msi… ============================================================================== --- branches/cmake-bringup/dll/win32/msi/msi_Es.rc [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/msi/msi_Es.rc [iso-8859-1] Tue Feb 15 19:15:01 2011 @@ -27,33 +27,7 @@ 4 "No se ha podido abrir el paquete de instalación especificado. Por favor, compruebe la ruta del archivo y vuelva a intentarlo." 5 "ruta %s no encontrada" 9 "inserte el disco %s" - 10 "Windows Installer %s\n\n" \ - "Usage:\n" \ - "msiexec command {required parameter} [optional parammeter]\n\n" \ - "Install a product:\n" \ - "\t/i {package|productcode} [property]\n" \ - "\t/package {package|productcode} [property]\n" \ - "\t/a package [property]\n" \ - "Repair an installation:\n" \ - "\t/f[p|o|e|d|c|a|u|m|s|v] {package|productcode}\n" \ - "Uninstall a product:\n" \ - "\t/uninstall {package|productcode} [property]\n" \ - "\t/x {package|productcode} [property]\n" \ - "Advertise a product:\n" \ - "\t/j[u|m] package [/t transform] [/g languageid]\n" \ - "Apply a patch:\n" \ - "\t/p patchpackage [property]\n" \ - "\t/p patchpackage /a package [property]\n" \ - "Log and UI Modifiers for above commands:\n" \ - "\t/l[*][i|w|e|a|r|u|c|m|o|p|v|][+|!] logfile\n" \ - "\t/q{|n|b|r|f|n+|b+|b-}\n" \ - "Register MSI Service:\n" \ - "\t/y\n" \ - "Unregister MSI Service:\n" \ - "\t/z\n" \ - "Display this help:\n" \ - "\t/help\n" \ - "\t/?\n" + 10 "Windows Installer %s\n\nUsage:\nmsiexec command {required parameter} [optional parammeter]\n\nInstall a product:\n\t/i {package|productcode} [property]\n\t/package {package|productcode} [property]\n\t/a package [property]\nRepair an installation:\n\t/f[p|o|e|d|c|a|u|m|s|v] {package|productcode}\nUninstall a product:\n\t/uninstall {package|productcode} [property]\n\t/x {package|productcode} [property]\nAdvertise a product:\n\t/j[u|m] package [/t transform] [/g languageid]\nApply a patch:\n\t/p patchpackage [property]\n\t/p patchpackage /a package [property]\nLog and UI Modifiers for above commands:\n\t/l[*][i|w|e|a|r|u|c|m|o|p|v|][+|!] logfile\n\t/q{|n|b|r|f|n+|b+|b-}\nRegister MSI Service:\n\t/y\nUnregister MSI Service:\n\t/z\nDisplay this help:\n\t/help\n\t/?\n" 11 "introduzca qué carpeta contiene %s" 12 "instalar fuente para característica ausente" 13 "unidad de red para característica ausente" Modified: branches/cmake-bringup/dll/win32/msi/msi_Fi.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msi/msi… ============================================================================== --- branches/cmake-bringup/dll/win32/msi/msi_Fi.rc [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/msi/msi_Fi.rc [iso-8859-1] Tue Feb 15 19:15:01 2011 @@ -27,33 +27,7 @@ 4 "Annettua asennuspakettia ei voitu avata. Tarkista tiedoston polku ja yritä uudelleen." 5 "Polkua %s ei löydy." 9 "Anna levy %s" - 10 "Windows Installer %s\n\n" \ - "Käyttö:\n" \ - "msiexec komento {pakollinen parametri} [valinnainen parametri]\n\n" \ - "Asenna tuote:\n" \ - "\t/i {paketti|tuotekoodi} [ominaisuus]\n" \ - "\t/package {paketti|tuotekoodi} [ominaisuus]\n" \ - "\t/a {paketti} [ominaisuus]\n" \ - "Korjaa asennus:\n" \ - "\t/f[p|o|e|d|c|a|u|m|s|v] {paketti|tuotekoodi}\n" \ - "Poista tuote:\n" \ - "\t/uninstall {paketti|tuotekoodi} [ominaisuus]\n" \ - "\t/x {paketti|tuotekoodi} [ominaisuus]\n" \ - "Mainosta (advertise) tuotetta:\n" \ - "\t/j[u|m] paketti [/t muunnos] [/g kielitunnus]\n" \ - "Asenna korjaus:\n" \ - "\t/p korjauspaketti [ominaisuus]\n" \ - "\t/p korjauspaketti /a paketti [ominaisuus]\n" \ - "Loki- ja käyttöliittymäasetukset edellisille komennoille:\n" \ - "\t/l[*][i|w|e|a|r|u|c|m|o|p|v|][+|!] lokitiedosto\n" \ - "\t/q{|n|b|r|f|n+|b+|b-}\n" \ - "Rekisteröi MSI-palvelu:\n" \ - "\t/y\n" \ - "Peru MSI-palvelun rekisteröinti:\n" \ - "\t/z\n" \ - "Näytä tämä ohje:\n" \ - "\t/help\n" \ - "\t/?\n" + 10 "Windows Installer %s\n\nKäyttö:\nmsiexec komento {pakollinen parametri} [valinnainen parametri]\n\nAsenna tuote:\n\t/i {paketti|tuotekoodi} [ominaisuus]\n\t/package {paketti|tuotekoodi} [ominaisuus]\n\t/a {paketti} [ominaisuus]\nKorjaa asennus:\n\t/f[p|o|e|d|c|a|u|m|s|v] {paketti|tuotekoodi}\nPoista tuote:\n\t/uninstall {paketti|tuotekoodi} [ominaisuus]\n\t/x {paketti|tuotekoodi} [ominaisuus]\nMainosta (advertise) tuotetta:\n\t/j[u|m] paketti [/t muunnos] [/g kielitunnus]\nAsenna korjaus:\n\t/p korjauspaketti [ominaisuus]\n\t/p korjauspaketti /a paketti [ominaisuus]\nLoki- ja käyttöliittymäasetukset edellisille komennoille:\n\t/l[*][i|w|e|a|r|u|c|m|o|p|v|][+|!] lokitiedosto\n\t/q{|n|b|r|f|n+|b+|b-}\nRekisteröi MSI-palvelu:\n\t/y\nPeru MSI-palvelun rekisteröinti:\n\t/z\nNäytä tämä ohje:\n\t/help\n\t/?\n" 11 "Anna kansio, jossa on %s" 12 "Ominaisuuden asennuslähde puuttuu." 13 "Ominaisuuden verkkolevy puuttuu." Modified: branches/cmake-bringup/dll/win32/msi/msi_Fr.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msi/msi… ============================================================================== --- branches/cmake-bringup/dll/win32/msi/msi_Fr.rc [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/msi/msi_Fr.rc [iso-8859-1] Tue Feb 15 19:15:01 2011 @@ -31,33 +31,7 @@ 4 "Le paquet d'installation spÃ©cifiÃ© n'a pu Ãªtre ouvert. Veuillez vÃ©rifier le chemin du fichier et rÃ©essayer." 5 "Le chemin %s est introuvable" 9 "insÃ©rez le disque %s" - 10 "Programme d'installation Windows %s\n\n" \ - "Usage :\n" \ - "msiexec commande {paramÃ¨tre obligatoire} [paramÃ¨tre optionnel]\n\n" \ - "Installer un produit :\n" \ - "\t/i {paquet|code_produit} [propriÃ©tÃ©]\n" \ - "\t/package {paquet|code_produit} [propriÃ©tÃ©]\n" \ - "\t/a paquet [propriÃ©tÃ©]\n" \ - "RÃ©parer une installation :\n" \ - "\t/f[p|o|e|d|c|a|u|m|s|v] {paquet|code_produit}\n" \ - "DÃ©sinstaller un produit :\n" \ - "\t/uninstall {paquet|code_produit} [propriÃ©tÃ©]\n" \ - "\t/x {paquet|code_produit} [propriÃ©tÃ©]\n" \ - "Publier un produit :\n" \ - "\t/j[u|m] paquet [/t transformation] [/g id_langue]\n" \ - "Appliquer un patch :\n" \ - "\t/p paquet_patch [propriÃ©tÃ©]\n" \ - "\t/p paquet_patch /a paquet [propriÃ©tÃ©]\n" \ - "Modificateurs de journalisation et d'interface utilisateur pour les commandes ci-dessus :\n" \ - "\t/l[*][i|w|e|a|r|u|c|m|o|p|v|][+|!] fichier_journal\n" \ - "\t/q{|n|b|r|f|n+|b+|b-}\n" \ - "Enregistrer le service MSI :\n" \ - "\t/y\n" \ - "Annuler l'enregistrement du service MSI :\n" \ - "\t/z\n" \ - "Afficher cette aide :\n" \ - "\t/help\n" \ - "\t/?\n" + 10 "Programme d'installation Windows %s\n\nUsage :\nmsiexec commande {paramÃ¨tre obligatoire} [paramÃ¨tre optionnel]\n\nInstaller un produit :\n\t/i {paquet|code_produit} [propriÃ©tÃ©]\n\t/package {paquet|code_produit} [propriÃ©tÃ©]\n\t/a paquet [propriÃ©tÃ©]\nRÃ©parer une installation :\n\t/f[p|o|e|d|c|a|u|m|s|v] {paquet|code_produit}\nDÃ©sinstaller un produit :\n\t/uninstall {paquet|code_produit} [propriÃ©tÃ©]\n\t/x {paquet|code_produit} [propriÃ©tÃ©]\nPublier un produit :\n\t/j[u|m] paquet [/t transformation] [/g id_langue]\nAppliquer un patch :\n\t/p paquet_patch [propriÃ©tÃ©]\n\t/p paquet_patch /a paquet [propriÃ©tÃ©]\nModificateurs de journalisation et d'interface utilisateur pour les commandes ci-dessus :\n\t/l[*][i|w|e|a|r|u|c|m|o|p|v|][+|!] fichier_journal\n\t/q{|n|b|r|f|n+|b+|b-}\nEnregistrer le service MSI :\n\t/y\nAnnuler l'enregistrement du service MSI :\n\t/z\nAfficher cette aide :\n\t/help\n\t/?\n" 11 "saisissez le nom du dossier contenant %s" 12 "source d'installation pour la fonctionnalitÃ© manquante" 13 "lecteur rÃ©seau pour la fonctionnalitÃ© manquante" Modified: branches/cmake-bringup/dll/win32/msi/msi_Hu.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msi/msi… ============================================================================== --- branches/cmake-bringup/dll/win32/msi/msi_Hu.rc [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/msi/msi_Hu.rc [iso-8859-1] Tue Feb 15 19:15:01 2011 @@ -27,33 +27,7 @@ 4 "The specified installation package could not be opened. Please check the file path and try again." 5 "%s útvonal nem található" 9 "helyezze be a lemezt: %s" - 10 "Windows Installer %s\n\n" \ - "Usage:\n" \ - "msiexec command {required parameter} [optional parammeter]\n\n" \ - "Install a product:\n" \ - "\t/i {package|productcode} [property]\n" \ - "\t/package {package|productcode} [property]\n" \ - "\t/a package [property]\n" \ - "Repair an installation:\n" \ - "\t/f[p|o|e|d|c|a|u|m|s|v] {package|productcode}\n" \ - "Uninstall a product:\n" \ - "\t/uninstall {package|productcode} [property]\n" \ - "\t/x {package|productcode} [property]\n" \ - "Advertise a product:\n" \ - "\t/j[u|m] package [/t transform] [/g languageid]\n" \ - "Apply a patch:\n" \ - "\t/p patchpackage [property]\n" \ - "\t/p patchpackage /a package [property]\n" \ - "Log and UI Modifiers for above commands:\n" \ - "\t/l[*][i|w|e|a|r|u|c|m|o|p|v|][+|!] logfile\n" \ - "\t/q{|n|b|r|f|n+|b+|b-}\n" \ - "Register MSI Service:\n" \ - "\t/y\n" \ - "Unregister MSI Service:\n" \ - "\t/z\n" \ - "Display this help:\n" \ - "\t/help\n" \ - "\t/?\n" + 10 "Windows Installer %s\n\nUsage:\nmsiexec command {required parameter} [optional parammeter]\n\nInstall a product:\n\t/i {package|productcode} [property]\n\t/package {package|productcode} [property]\n\t/a package [property]\nRepair an installation:\n\t/f[p|o|e|d|c|a|u|m|s|v] {package|productcode}\nUninstall a product:\n\t/uninstall {package|productcode} [property]\n\t/x {package|productcode} [property]\nAdvertise a product:\n\t/j[u|m] package [/t transform] [/g languageid]\nApply a patch:\n\t/p patchpackage [property]\n\t/p patchpackage /a package [property]\nLog and UI Modifiers for above commands:\n\t/l[*][i|w|e|a|r|u|c|m|o|p|v|][+|!] logfile\n\t/q{|n|b|r|f|n+|b+|b-}\nRegister MSI Service:\n\t/y\nUnregister MSI Service:\n\t/z\nDisplay this help:\n\t/help\n\t/?\n" 11 "adja meg melyik mappa tartalmazza ezt: %s" 12 "hiányzó tulajdonság a telepítési forráshoz" 13 "hiányzó tulajdonság a hálózati meghajtóhoz" Modified: branches/cmake-bringup/dll/win32/msi/msi_It.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msi/msi… ============================================================================== --- branches/cmake-bringup/dll/win32/msi/msi_It.rc [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/msi/msi_It.rc [iso-8859-1] Tue Feb 15 19:15:01 2011 @@ -30,33 +30,7 @@ 4 "Impossibile aprire il pacchetto di installazione specificato. Per favore controlla l'indirizzo del file e riprova." 5 "percorso %s non trovato" 9 "inserire disco %s" - 10 "Windows Installer %s\n\n" \ - "Usage:\n" \ - "msiexec command {required parameter} [optional parammeter]\n\n" \ - "Install a product:\n" \ - "\t/i {package|productcode} [property]\n" \ - "\t/package {package|productcode} [property]\n" \ - "\t/a package [property]\n" \ - "Repair an installation:\n" \ - "\t/f[p|o|e|d|c|a|u|m|s|v] {package|productcode}\n" \ - "Uninstall a product:\n" \ - "\t/uninstall {package|productcode} [property]\n" \ - "\t/x {package|productcode} [property]\n" \ - "Advertise a product:\n" \ - "\t/j[u|m] package [/t transform] [/g languageid]\n" \ - "Apply a patch:\n" \ - "\t/p patchpackage [property]\n" \ - "\t/p patchpackage /a package [property]\n" \ - "Log and UI Modifiers for above commands:\n" \ - "\t/l[*][i|w|e|a|r|u|c|m|o|p|v|][+|!] logfile\n" \ - "\t/q{|n|b|r|f|n+|b+|b-}\n" \ - "Register MSI Service:\n" \ - "\t/y\n" \ - "Unregister MSI Service:\n" \ - "\t/z\n" \ - "Display this help:\n" \ - "\t/help\n" \ - "\t/?\n" + 10 "Windows Installer %s\n\nUsage:\nmsiexec command {required parameter} [optional parammeter]\n\nInstall a product:\n\t/i {package|productcode} [property]\n\t/package {package|productcode} [property]\n\t/a package [property]\nRepair an installation:\n\t/f[p|o|e|d|c|a|u|m|s|v] {package|productcode}\nUninstall a product:\n\t/uninstall {package|productcode} [property]\n\t/x {package|productcode} [property]\nAdvertise a product:\n\t/j[u|m] package [/t transform] [/g languageid]\nApply a patch:\n\t/p patchpackage [property]\n\t/p patchpackage /a package [property]\nLog and UI Modifiers for above commands:\n\t/l[*][i|w|e|a|r|u|c|m|o|p|v|][+|!] logfile\n\t/q{|n|b|r|f|n+|b+|b-}\nRegister MSI Service:\n\t/y\nUnregister MSI Service:\n\t/z\nDisplay this help:\n\t/help\n\t/?\n" 11 "immettere il nome della cartella che contiene %s" 12 "sorgente di installazione per la funzionalitÃ mancante" 13 "periferica di rete per la funzionalitÃ mancante" Modified: branches/cmake-bringup/dll/win32/msi/msi_Ko.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msi/msi… ============================================================================== --- branches/cmake-bringup/dll/win32/msi/msi_Ko.rc [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/msi/msi_Ko.rc [iso-8859-1] Tue Feb 15 19:15:01 2011 @@ -29,33 +29,7 @@ 4 " ÁöÁ¤ÇÑ ¼³Ä¡ ÆÐÅ°Áö¸¦ ¿ ¼ö ¾ø½À´Ï´Ù. ÆÄÀÏ °æ·Î¸¦ È®ÀÎÇÏ°í ´Ù½Ã ½ÃµµÇÏ½Ê½Ã¿À." 5 "%s °æ·Î¸¦ Ã£À»¼ö ¾ø½À´Ï´Ù" 9 "µð½ºÅ© %s »ðÀÔ" - 10 "Windows Installer %s\n\n" \ - "»ç¿ë¹ý:\n" \ - "msiexec ¸í·É {ÇÊ¼ö ¸Å°³º¯¼ö} [¼±ÅÃÀû ¸Å°³º¯¼ö]\n\n" \ - "Á¦Ç° ¼³Ä¡:\n" \ - "\t/i {package|productcode} [property]\n" \ - "\t/package {package|productcode} [property]\n" \ - "\t/a package [property]\n" \ - "¼³Ä¡ º¹±¸:\n" \ - "\t/f[p|o|e|d|c|a|u|m|s|v] {package|productcode}\n" \ - "Á¦Ç° Á¦°Å:\n" \ - "\t/uninstall {package|productcode} [property]\n" \ - "\t/x {package|productcode} [property]\n" \ - "Á¦Ç° ¾Ë¸®±â:\n" \ - "\t/j[u|m] package [/t transform] [/g languageid]\n" \ - "ÆÐÄ¡ Ãß°¡:\n" \ - "\t/p patchpackage [property]\n" \ - "\t/p patchpackage /a package [property]\n" \ - "À§ÀÇ ¸í·É¾î¸¦ À§ÇÑ Log ¿Í UI ÇÑÁ¤ÀÚ :\n" \ - "\t/l[*][i|w|e|a|r|u|c|m|o|p|v|][+|!] logfile\n" \ - "\t/q{|n|b|r|f|n+|b+|b-}\n" \ - "MSI ¼ºñ½º µî·Ï:\n" \ - "\t/y\n" \ - "MSI ¼ºñ½º µî·Ï ÇØÁ¦:\n" \ - "\t/z\n" \ - "µµ¿ò¸» º¸±â:\n" \ - "\t/help\n" \ - "\t/?\n" + 10 "Windows Installer %s\n\n»ç¿ë¹ý:\nmsiexec ¸í·É {ÇÊ¼ö ¸Å°³º¯¼ö} [¼±ÅÃÀû ¸Å°³º¯¼ö]\n\nÁ¦Ç° ¼³Ä¡:\n\t/i {package|productcode} [property]\n\t/package {package|productcode} [property]\n\t/a package [property]\n¼³Ä¡ º¹±¸:\n\t/f[p|o|e|d|c|a|u|m|s|v] {package|productcode}\nÁ¦Ç° Á¦°Å:\n\t/uninstall {package|productcode} [property]\n\t/x {package|productcode} [property]\nÁ¦Ç° ¾Ë¸®±â:\n\t/j[u|m] package [/t transform] [/g languageid]\nÆÐÄ¡ Ãß°¡:\n\t/p patchpackage [property]\n\t/p patchpackage /a package [property]\nÀ§ÀÇ ¸í·É¾î¸¦ À§ÇÑ Log ¿Í UI ÇÑÁ¤ÀÚ :\n\t/l[*][i|w|e|a|r|u|c|m|o|p|v|][+|!] logfile\n\t/q{|n|b|r|f|n+|b+|b-}\nMSI ¼ºñ½º µî·Ï:\n\t/y\nMSI ¼ºñ½º µî·Ï ÇØÁ¦:\n\t/z\nµµ¿ò¸» º¸±â:\n\t/help\n\t/?\n" 11 "%s¸¦ Æ÷ÇÔÇÏ´Â Æú´õ¸¦ ÀÔ·ÂÇÏ¼¼¿©" 12 "ºüÁø ºÎºÐ(feature)À» À§ÇÑ ¼³Ä¡ ¿øº»" 13 "ºüÁø ºÎºÐ(feature)À» À§ÇÑ ³×Æ®¿öÅ© µå¶óÀÌºê" Modified: branches/cmake-bringup/dll/win32/msi/msi_Lt.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msi/msi… ============================================================================== --- branches/cmake-bringup/dll/win32/msi/msi_Lt.rc [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/msi/msi_Lt.rc [iso-8859-1] Tue Feb 15 19:15:01 2011 @@ -30,33 +30,7 @@ 4 "Nepavyko atverti nurodyto diegimo paketo. Patikrinkite failo keliÄ ir mÄginkite dar kartÄ." 5 "kelias %s nerastas" 9 "Ä¯dÄkite diskÄ %s" - 10 "Windows diegimo programa %s\n\n" \ - "Naudojimas:\n" \ - "msiexec komanda {bÅ«tinas parametras} [nebÅ«tinas parametras]\n\n" \ - "Ä®diegti produktÄ:\n" \ - "\t/i {paketas|produkto_kodas} [savybÄ]\n" \ - "\t/package {paketas|produkto_kodas} [savybÄ]\n" \ - "\t/a paketas [savybÄ]\n" \ - "Taisyti Ä¯diegimÄ:\n" \ - "\t/f[p|o|e|d|c|a|u|m|s|v] {paketas|produkto_kodas}\n" \ - "PaÅ¡alinti produktÄ:\n" \ - "\t/uninstall {paketas|produkto_kodas} [savybÄ]\n" \ - "\t/x {paketas|produkto_kodas} [savybÄ]\n" \ - "Skelbti produktÄ:\n" \ - "\t/j[u|m] paketas [/t pakeitimas] [/g kalbos_identifikatorius]\n" \ - "Pritaikyti pataisÄ:\n" \ - "\t/p pataisos_paketas [savybÄ]\n" \ - "\t/p pataisos_paketas /a paketas [savybÄ]\n" \ - "Å½urnalo ir sÄsajos modifikatoriai aukÅ¡Äiau iÅ¡vardintoms komandoms:\n" \ - "\t/l[*][i|w|e|a|r|u|c|m|o|p|v|][+|!] Å¾urnalo_failas\n" \ - "\t/q{|n|b|r|f|n+|b+|b-}\n" \ - "Registruoti MSI tarnybÄ:\n" \ - "\t/y\n" \ - "IÅ¡registruoti MSI tarnybÄ:\n" \ - "\t/z\n" \ - "Parodyti Å¡iÄ pagalbÄ:\n" \ - "\t/help\n" \ - "\t/?\n" + 10 "Windows diegimo programa %s\n\nNaudojimas:\nmsiexec komanda {bÅ«tinas parametras} [nebÅ«tinas parametras]\n\nÄ®diegti produktÄ:\n\t/i {paketas|produkto_kodas} [savybÄ]\n\t/package {paketas|produkto_kodas} [savybÄ]\n\t/a paketas [savybÄ]\nTaisyti Ä¯diegimÄ:\n\t/f[p|o|e|d|c|a|u|m|s|v] {paketas|produkto_kodas}\nPaÅ¡alinti produktÄ:\n\t/uninstall {paketas|produkto_kodas} [savybÄ]\n\t/x {paketas|produkto_kodas} [savybÄ]\nSkelbti produktÄ:\n\t/j[u|m] paketas [/t pakeitimas] [/g kalbos_identifikatorius]\nPritaikyti pataisÄ:\n\t/p pataisos_paketas [savybÄ]\n\t/p pataisos_paketas /a paketas [savybÄ]\nÅ½urnalo ir sÄsajos modifikatoriai aukÅ¡Äiau iÅ¡vardintoms komandoms:\n\t/l[*][i|w|e|a|r|u|c|m|o|p|v|][+|!] Å¾urnalo_failas\n\t/q{|n|b|r|f|n+|b+|b-}\nRegistruoti MSI tarnybÄ:\n\t/y\nIÅ¡registruoti MSI tarnybÄ:\n\t/z\nParodyti Å¡iÄ pagalbÄ:\n\t/help\n\t/?\n" 11 "Ä¯veskite aplankÄ, kuris turi %s" 12 "trÅ«ksta diegimo Å¡altinio komponentui" 13 "trÅ«ksta tinklo disko komponentui" Modified: branches/cmake-bringup/dll/win32/msi/msi_Nl.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msi/msi… ============================================================================== --- branches/cmake-bringup/dll/win32/msi/msi_Nl.rc [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/msi/msi_Nl.rc [iso-8859-1] Tue Feb 15 19:15:01 2011 @@ -27,33 +27,7 @@ 4 "Het opgegeven installatie pakket kon niet worden geopend. Verifieer het bestandspad en probeer opnieuw." 5 "Pad %s niet gevonden" 9 "Plaats disk %s" - 10 "Windows Installer %s\n\n" \ - "Gebruik:\n" \ - "msiexec commando {vereiste parameter} [optionele parameter]\n\n" \ - "Installeer een product:\n" \ - "\t/i {pakket|productcode} [eigenschap]\n" \ - "\t/package {pakket|productcode} [eigenschap]\n" \ - "\t/a pakket [eigenschap]\n" \ - "Herstel een installatie:\n" \ - "\t/f[p|o|e|d|c|a|u|m|s|v] {pakket|productcode}\n" \ - "Verwijder een product:\n" \ - "\t/uninstall {pakket|productcode} [eigenschap]\n" \ - "\t/x {pakket|productcode} [eigenschap]\n" \ - "Adverteer een product:\n" \ - "\t/j[u|m] pakket [/t transform] [/g languageid]\n" \ - "Pas een patch toe:\n" \ - "\t/p patchpakket [eigenschap]\n" \ - "\t/p patchpakket /a pakket [eigenschap]\n" \ - "Log en UI Modifiers voor bovenstaande commando's:\n" \ - "\t/l[*][i|w|e|a|r|u|c|m|o|p|v|][+|!] logbestand\n" \ - "\t/q{|n|b|r|f|n+|b+|b-}\n" \ - "Registreer MSI Service:\n" \ - "\t/y\n" \ - "Maak registratie MSI Service ongedaan:\n" \ - "\t/z\n" \ - "Laat dit helpvenster zien:\n" \ - "\t/help\n" \ - "\t/?\n" + 10 "Windows Installer %s\n\nGebruik:\nmsiexec commando {vereiste parameter} [optionele parameter]\n\nInstalleer een product:\n\t/i {pakket|productcode} [eigenschap]\n\t/package {pakket|productcode} [eigenschap]\n\t/a pakket [eigenschap]\nHerstel een installatie:\n\t/f[p|o|e|d|c|a|u|m|s|v] {pakket|productcode}\nVerwijder een product:\n\t/uninstall {pakket|productcode} [eigenschap]\n\t/x {pakket|productcode} [eigenschap]\nAdverteer een product:\n\t/j[u|m] pakket [/t transform] [/g languageid]\nPas een patch toe:\n\t/p patchpakket [eigenschap]\n\t/p patchpakket /a pakket [eigenschap]\nLog en UI Modifiers voor bovenstaande commando's:\n\t/l[*][i|w|e|a|r|u|c|m|o|p|v|][+|!] logbestand\n\t/q{|n|b|r|f|n+|b+|b-}\nRegistreer MSI Service:\n\t/y\nMaak registratie MSI Service ongedaan:\n\t/z\nLaat dit helpvenster zien:\n\t/help\n\t/?\n" 11 "Voer de map in die %s bevat" 12 "De installatiebron van de feature ontbreekt" 13 "De netwerkschijf met de feature ontbreekt" Modified: branches/cmake-bringup/dll/win32/msi/msi_No.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msi/msi… ============================================================================== --- branches/cmake-bringup/dll/win32/msi/msi_No.rc [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/msi/msi_No.rc [iso-8859-1] Tue Feb 15 19:15:01 2011 @@ -27,33 +27,7 @@ 4 "Klarte ikke åpne den oppgitte installasjonspakken. Kontroller filbanen og prøv igjen." 5 "Fant ikke stien '%s'." 9 "Sett i disk '%s'" - 10 "Windows Installer %s\n\n" \ - "Usage:\n" \ - "msiexec command {required parameter} [optional parammeter]\n\n" \ - "Install a product:\n" \ - "\t/i {package|productcode} [property]\n" \ - "\t/package {package|productcode} [property]\n" \ - "\t/a package [property]\n" \ - "Repair an installation:\n" \ - "\t/f[p|o|e|d|c|a|u|m|s|v] {package|productcode}\n" \ - "Uninstall a product:\n" \ - "\t/uninstall {package|productcode} [property]\n" \ - "\t/x {package|productcode} [property]\n" \ - "Advertise a product:\n" \ - "\t/j[u|m] package [/t transform] [/g languageid]\n" \ - "Apply a patch:\n" \ - "\t/p patchpackage [property]\n" \ - "\t/p patchpackage /a package [property]\n" \ - "Log and UI Modifiers for above commands:\n" \ - "\t/l[*][i|w|e|a|r|u|c|m|o|p|v|][+|!] logfile\n" \ - "\t/q{|n|b|r|f|n+|b+|b-}\n" \ - "Register MSI Service:\n" \ - "\t/y\n" \ - "Unregister MSI Service:\n" \ - "\t/z\n" \ - "Display this help:\n" \ - "\t/help\n" \ - "\t/?\n" + 10 "Windows Installer %s\n\nUsage:\nmsiexec command {required parameter} [optional parammeter]\n\nInstall a product:\n\t/i {package|productcode} [property]\n\t/package {package|productcode} [property]\n\t/a package [property]\nRepair an installation:\n\t/f[p|o|e|d|c|a|u|m|s|v] {package|productcode}\nUninstall a product:\n\t/uninstall {package|productcode} [property]\n\t/x {package|productcode} [property]\nAdvertise a product:\n\t/j[u|m] package [/t transform] [/g languageid]\nApply a patch:\n\t/p patchpackage [property]\n\t/p patchpackage /a package [property]\nLog and UI Modifiers for above commands:\n\t/l[*][i|w|e|a|r|u|c|m|o|p|v|][+|!] logfile\n\t/q{|n|b|r|f|n+|b+|b-}\nRegister MSI Service:\n\t/y\nUnregister MSI Service:\n\t/z\nDisplay this help:\n\t/help\n\t/?\n" 11 "Oppgi katalogen som inneholder '%s'." 12 "Egenskapens installasjonskilde mangler." 13 "Egenskapens nettverksstasjon mangler." Modified: branches/cmake-bringup/dll/win32/msi/msi_Pl.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msi/msi… ============================================================================== --- branches/cmake-bringup/dll/win32/msi/msi_Pl.rc [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/msi/msi_Pl.rc [iso-8859-1] Tue Feb 15 19:15:01 2011 @@ -28,33 +28,7 @@ 4 "Nie uda³o siê otworzyæ wybranego pakietu instalacyjnego. Sprawd czy cie¿ka jest poprawna i spróbuj ponownie." 5 "cie¿ka '%s' nie zosta³a odnaleziona" 9 "w³ó¿ dysk '%s'" - 10 "Windows Installer %s\n\n" \ - "Usage:\n" \ - "msiexec command {required parameter} [optional parammeter]\n\n" \ - "Install a product:\n" \ - "\t/i {package|productcode} [property]\n" \ - "\t/package {package|productcode} [property]\n" \ - "\t/a package [property]\n" \ - "Repair an installation:\n" \ - "\t/f[p|o|e|d|c|a|u|m|s|v] {package|productcode}\n" \ - "Uninstall a product:\n" \ - "\t/uninstall {package|productcode} [property]\n" \ - "\t/x {package|productcode} [property]\n" \ - "Advertise a product:\n" \ - "\t/j[u|m] package [/t transform] [/g languageid]\n" \ - "Apply a patch:\n" \ - "\t/p patchpackage [property]\n" \ - "\t/p patchpackage /a package [property]\n" \ - "Log and UI Modifiers for above commands:\n" \ - "\t/l[*][i|w|e|a|r|u|c|m|o|p|v|][+|!] logfile\n" \ - "\t/q{|n|b|r|f|n+|b+|b-}\n" \ - "Register MSI Service:\n" \ - "\t/y\n" \ - "Unregister MSI Service:\n" \ - "\t/z\n" \ - "Display this help:\n" \ - "\t/help\n" \ - "\t/?\n" + 10 "Windows Installer %s\n\nUsage:\nmsiexec command {required parameter} [optional parammeter]\n\nInstall a product:\n\t/i {package|productcode} [property]\n\t/package {package|productcode} [property]\n\t/a package [property]\nRepair an installation:\n\t/f[p|o|e|d|c|a|u|m|s|v] {package|productcode}\nUninstall a product:\n\t/uninstall {package|productcode} [property]\n\t/x {package|productcode} [property]\nAdvertise a product:\n\t/j[u|m] package [/t transform] [/g languageid]\nApply a patch:\n\t/p patchpackage [property]\n\t/p patchpackage /a package [property]\nLog and UI Modifiers for above commands:\n\t/l[*][i|w|e|a|r|u|c|m|o|p|v|][+|!] logfile\n\t/q{|n|b|r|f|n+|b+|b-}\nRegister MSI Service:\n\t/y\nUnregister MSI Service:\n\t/z\nDisplay this help:\n\t/help\n\t/?\n" 11 "wprowad sice¿kê do folderu zawieraj¹cego '%s'" 12 "ród³o danych zawieraj¹ce ¿¹danê funkcjê jest niedostêpne" 13 "dysk siecowy zawieraj¹cy ¿¹dan¹ funckje jest niedostêpny" Modified: branches/cmake-bringup/dll/win32/msi/msi_Pt.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msi/msi… ============================================================================== --- branches/cmake-bringup/dll/win32/msi/msi_Pt.rc [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/msi/msi_Pt.rc [iso-8859-1] Tue Feb 15 19:15:01 2011 @@ -31,33 +31,7 @@ 4 "O pacote de instalaÃ§Ã£o especificado nÃ£o pÃ´de ser aberto. Por favor, verifique o arquivo e tente novamente." 5 "caminho %s nÃ£o encontrado" 9 "insira disco %s" - 10 "Windows Installer %s\n\n" \ - "Modo de usar:\n" \ - "msiexec command {required parameter} [optional parammeter]\n\n" \ - "Instalar um produto:\n" \ - "\t/i {package|productcode} [property]\n" \ - "\t/package {package|productcode} [property]\n" \ - "\t/a package [property]\n" \ - "Reparar uma instalaÃ§Ã£o:\n" \ - "\t/f[p|o|e|d|c|a|u|m|s|v] {package|productcode}\n" \ - "Desinstalar um produto:\n" \ - "\t/uninstall {package|productcode} [property]\n" \ - "\t/x {package|productcode} [property]\n" \ - "Anunciar um produto:\n" \ - "\t/j[u|m] package [/t transform] [/g languageid]\n" \ - "Aplicar um patch:\n" \ - "\t/p patchpackage [property]\n" \ - "\t/p patchpackage /a package [property]\n" \ - "Modificadores Log e UI para os comandos acima:\n" \ - "\t/l[*][i|w|e|a|r|u|c|m|o|p|v|][+|!] logfile\n" \ - "\t/q{|n|b|r|f|n+|b+|b-}\n" \ - "Registrar ServiÃ§o MSI:\n" \ - "\t/y\n" \ - "Desregistrar ServiÃ§o MSI:\n" \ - "\t/z\n" \ - "Mostrar esta ajuda:\n" \ - "\t/help\n" \ - "\t/?\n" + 10 "Windows Installer %s\n\nModo de usar:\nmsiexec command {required parameter} [optional parammeter]\n\nInstalar um produto:\n\t/i {package|productcode} [property]\n\t/package {package|productcode} [property]\n\t/a package [property]\nReparar uma instalaÃ§Ã£o:\n\t/f[p|o|e|d|c|a|u|m|s|v] {package|productcode}\nDesinstalar um produto:\n\t/uninstall {package|productcode} [property]\n\t/x {package|productcode} [property]\nAnunciar um produto:\n\t/j[u|m] package [/t transform] [/g languageid]\nAplicar um patch:\n\t/p patchpackage [property]\n\t/p patchpackage /a package [property]\nModificadores Log e UI para os comandos acima:\n\t/l[*][i|w|e|a|r|u|c|m|o|p|v|][+|!] logfile\n\t/q{|n|b|r|f|n+|b+|b-}\nRegistrar ServiÃ§o MSI:\n\t/y\nDesregistrar ServiÃ§o MSI:\n\t/z\nMostrar esta ajuda:\n\t/help\n\t/?\n" 11 "entre a pasta que contÃ©m %s" 12 "faltando fonte de instalaÃ§Ã£o para caracterÃstica" 13 "faltando drive de rede para caracterÃstica" @@ -72,33 +46,7 @@ 4 "The specified installation package could not be opened. Please check the file path and try again." 5 "localizaÃ§Ã£o %s nÃ£o encontrada" 9 "insira o disco %s" - 10 "Windows Installer %s\n\n" \ - "Usage:\n" \ - "msiexec command {required parameter} [optional parammeter]\n\n" \ - "Install a product:\n" \ - "\t/i {package|productcode} [property]\n" \ - "\t/package {package|productcode} [property]\n" \ - "\t/a package [property]\n" \ - "Repair an installation:\n" \ - "\t/f[p|o|e|d|c|a|u|m|s|v] {package|productcode}\n" \ - "Uninstall a product:\n" \ - "\t/uninstall {package|productcode} [property]\n" \ - "\t/x {package|productcode} [property]\n" \ - "Advertise a product:\n" \ - "\t/j[u|m] package [/t transform] [/g languageid]\n" \ - "Apply a patch:\n" \ - "\t/p patchpackage [property]\n" \ - "\t/p patchpackage /a package [property]\n" \ - "Log and UI Modifiers for above commands:\n" \ - "\t/l[*][i|w|e|a|r|u|c|m|o|p|v|][+|!] logfile\n" \ - "\t/q{|n|b|r|f|n+|b+|b-}\n" \ - "Register MSI Service:\n" \ - "\t/y\n" \ - "Unregister MSI Service:\n" \ - "\t/z\n" \ - "Display this help:\n" \ - "\t/help\n" \ - "\t/?\n" + 10 "Windows Installer %s\n\nUsage:\nmsiexec command {required parameter} [optional parammeter]\n\nInstall a product:\n\t/i {package|productcode} [property]\n\t/package {package|productcode} [property]\n\t/a package [property]\nRepair an installation:\n\t/f[p|o|e|d|c|a|u|m|s|v] {package|productcode}\nUninstall a product:\n\t/uninstall {package|productcode} [property]\n\t/x {package|productcode} [property]\nAdvertise a product:\n\t/j[u|m] package [/t transform] [/g languageid]\nApply a patch:\n\t/p patchpackage [property]\n\t/p patchpackage /a package [property]\nLog and UI Modifiers for above commands:\n\t/l[*][i|w|e|a|r|u|c|m|o|p|v|][+|!] logfile\n\t/q{|n|b|r|f|n+|b+|b-}\nRegister MSI Service:\n\t/y\nUnregister MSI Service:\n\t/z\nDisplay this help:\n\t/help\n\t/?\n" 11 "indique que pasta contÃ©m %s" 12 "instalar fonte para a opÃ§Ã£o em falta" 13 "controlador de rede para a opÃ§Ã£o em falta" Modified: branches/cmake-bringup/dll/win32/msi/msi_Ro.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msi/msi… ============================================================================== --- branches/cmake-bringup/dll/win32/msi/msi_Ro.rc [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/msi/msi_Ro.rc [iso-8859-1] Tue Feb 15 19:15:01 2011 @@ -28,33 +28,7 @@ 4 "Pachetul de instalare menÈionat nu a putut fi deschis. VerificaÈi calea Èi Ã®ncercaÈi din nou." 5 "calea %s nu a fost gÄsitÄ" 9 "inseraÈi discul %s" - 10 "Windows Installer %s\n\n" \ - "Usage:\n" \ - "msiexec command {required parameter} [optional parammeter]\n\n" \ - "Install a product:\n" \ - "\t/i {package|productcode} [property]\n" \ - "\t/package {package|productcode} [property]\n" \ - "\t/a package [property]\n" \ - "Repair an installation:\n" \ - "\t/f[p|o|e|d|c|a|u|m|s|v] {package|productcode}\n" \ - "Uninstall a product:\n" \ - "\t/uninstall {package|productcode} [property]\n" \ - "\t/x {package|productcode} [property]\n" \ - "Advertise a product:\n" \ - "\t/j[u|m] package [/t transform] [/g languageid]\n" \ - "Apply a patch:\n" \ - "\t/p patchpackage [property]\n" \ - "\t/p patchpackage /a package [property]\n" \ - "Log and UI Modifiers for above commands:\n" \ - "\t/l[*][i|w|e|a|r|u|c|m|o|p|v|][+|!] logfile\n" \ - "\t/q{|n|b|r|f|n+|b+|b-}\n" \ - "Register MSI Service:\n" \ - "\t/y\n" \ - "Unregister MSI Service:\n" \ - "\t/z\n" \ - "Display this help:\n" \ - "\t/help\n" \ - "\t/?\n" + 10 "Windows Installer %s\n\nUsage:\nmsiexec command {required parameter} [optional parammeter]\n\nInstall a product:\n\t/i {package|productcode} [property]\n\t/package {package|productcode} [property]\n\t/a package [property]\nRepair an installation:\n\t/f[p|o|e|d|c|a|u|m|s|v] {package|productcode}\nUninstall a product:\n\t/uninstall {package|productcode} [property]\n\t/x {package|productcode} [property]\nAdvertise a product:\n\t/j[u|m] package [/t transform] [/g languageid]\nApply a patch:\n\t/p patchpackage [property]\n\t/p patchpackage /a package [property]\nLog and UI Modifiers for above commands:\n\t/l[*][i|w|e|a|r|u|c|m|o|p|v|][+|!] logfile\n\t/q{|n|b|r|f|n+|b+|b-}\nRegister MSI Service:\n\t/y\nUnregister MSI Service:\n\t/z\nDisplay this help:\n\t/help\n\t/?\n" 11 "introduceÈi fiÈierul care conÈine %s" 12 "lipseÈte sursa de instalare pentru aceastÄ caracteristicÄ" 13 "lipseÈte unitatea de reÈea pentru aceastÄ caracteristicÄ" Modified: branches/cmake-bringup/dll/win32/msi/msi_Ru.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msi/msi… ============================================================================== --- branches/cmake-bringup/dll/win32/msi/msi_Ru.rc [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/msi/msi_Ru.rc [iso-8859-1] Tue Feb 15 19:15:01 2011 @@ -30,33 +30,7 @@ 4 "Ð£ÐºÐ°Ð·Ð°Ð½Ð½ÑÐ¹ Ð¿Ð°ÐºÐµÑ Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ Ð±ÑÑÑ Ð¾ÑÐºÑÑÑ. ÐÑÐ¾Ð²ÐµÑÑÑÐµ ÑÐ°Ð¹Ð» Ð¸ Ð¿Ð¾Ð²ÑÐ¾ÑÐ¸ÑÐµ Ð¿Ð¾Ð¿ÑÑÐºÑ." 5 "Ð¿ÑÑÑ %s Ð½Ðµ Ð½Ð°Ð¹Ð´ÐµÐ½" 9 "Ð²ÑÑÐ°Ð²ÑÑÐµ Ð´Ð¸ÑÐº %s" - 10 "Windows Installer %s\n\n" \ - "Usage:\n" \ - "msiexec command {required parameter} [optional parammeter]\n\n" \ - "Install a product:\n" \ - "\t/i {package|productcode} [property]\n" \ - "\t/package {package|productcode} [property]\n" \ - "\t/a package [property]\n" \ - "Repair an installation:\n" \ - "\t/f[p|o|e|d|c|a|u|m|s|v] {package|productcode}\n" \ - "Uninstall a product:\n" \ - "\t/uninstall {package|productcode} [property]\n" \ - "\t/x {package|productcode} [property]\n" \ - "Advertise a product:\n" \ - "\t/j[u|m] package [/t transform] [/g languageid]\n" \ - "Apply a patch:\n" \ - "\t/p patchpackage [property]\n" \ - "\t/p patchpackage /a package [property]\n" \ - "Log and UI Modifiers for above commands:\n" \ - "\t/l[*][i|w|e|a|r|u|c|m|o|p|v|][+|!] logfile\n" \ - "\t/q{|n|b|r|f|n+|b+|b-}\n" \ - "Register MSI Service:\n" \ - "\t/y\n" \ - "Unregister MSI Service:\n" \ - "\t/z\n" \ - "Display this help:\n" \ - "\t/help\n" \ - "\t/?\n" + 10 "Windows Installer %s\n\nUsage:\nmsiexec command {required parameter} [optional parammeter]\n\nInstall a product:\n\t/i {package|productcode} [property]\n\t/package {package|productcode} [property]\n\t/a package [property]\nRepair an installation:\n\t/f[p|o|e|d|c|a|u|m|s|v] {package|productcode}\nUninstall a product:\n\t/uninstall {package|productcode} [property]\n\t/x {package|productcode} [property]\nAdvertise a product:\n\t/j[u|m] package [/t transform] [/g languageid]\nApply a patch:\n\t/p patchpackage [property]\n\t/p patchpackage /a package [property]\nLog and UI Modifiers for above commands:\n\t/l[*][i|w|e|a|r|u|c|m|o|p|v|][+|!] logfile\n\t/q{|n|b|r|f|n+|b+|b-}\nRegister MSI Service:\n\t/y\nUnregister MSI Service:\n\t/z\nDisplay this help:\n\t/help\n\t/?\n" 11 "ÑÐºÐ°Ð¶Ð¸ÑÐµ ÐºÐ°ÑÐ°Ð»Ð¾Ð³, ÑÐ¾Ð´ÐµÑÐ¶Ð°ÑÐ¸Ð¹ %s" 12 "Ð¸ÑÑÐ¾ÑÐ½Ð¸Ðº ÑÑÑÐ°Ð½Ð¾Ð²ÐºÐ¸ Ð´Ð°Ð½Ð½Ð¾Ð¹ Ð²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ÑÑÐ¸ Ð½Ðµ ÑÐºÐ°Ð·Ð°Ð½" 13 "ÑÐµÑÐµÐ²Ð¾Ð¹ Ð´Ð¸ÑÐº Ð´Ð»Ñ Ð´Ð°Ð½Ð½Ð¾Ð¹ Ð²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ÑÑÐ¸ Ð½Ðµ ÑÐºÐ°Ð·Ð°Ð½" Modified: branches/cmake-bringup/dll/win32/msi/msi_Si.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msi/msi… ============================================================================== --- branches/cmake-bringup/dll/win32/msi/msi_Si.rc [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/msi/msi_Si.rc [iso-8859-1] Tue Feb 15 19:15:01 2011 @@ -29,33 +29,7 @@ 4 "Navedenega namestitvenega paketa ni mogoÄe odpreti. Preverite ime datoteke in poskusite znova." 5 "pot %s ne obstaja" 9 "vnesite disk %s" - 10 "Windows Installer %s\n\n" \ - "Usage:\n" \ - "msiexec command {required parameter} [optional parammeter]\n\n" \ - "Install a product:\n" \ - "\t/i {package|productcode} [property]\n" \ - "\t/package {package|productcode} [property]\n" \ - "\t/a package [property]\n" \ - "Repair an installation:\n" \ - "\t/f[p|o|e|d|c|a|u|m|s|v] {package|productcode}\n" \ - "Uninstall a product:\n" \ - "\t/uninstall {package|productcode} [property]\n" \ - "\t/x {package|productcode} [property]\n" \ - "Advertise a product:\n" \ - "\t/j[u|m] package [/t transform] [/g languageid]\n" \ - "Apply a patch:\n" \ - "\t/p patchpackage [property]\n" \ - "\t/p patchpackage /a package [property]\n" \ - "Log and UI Modifiers for above commands:\n" \ - "\t/l[*][i|w|e|a|r|u|c|m|o|p|v|][+|!] logfile\n" \ - "\t/q{|n|b|r|f|n+|b+|b-}\n" \ - "Register MSI Service:\n" \ - "\t/y\n" \ - "Unregister MSI Service:\n" \ - "\t/z\n" \ - "Display this help:\n" \ - "\t/help\n" \ - "\t/?\n" + 10 "Windows Installer %s\n\nUsage:\nmsiexec command {required parameter} [optional parammeter]\n\nInstall a product:\n\t/i {package|productcode} [property]\n\t/package {package|productcode} [property]\n\t/a package [property]\nRepair an installation:\n\t/f[p|o|e|d|c|a|u|m|s|v] {package|productcode}\nUninstall a product:\n\t/uninstall {package|productcode} [property]\n\t/x {package|productcode} [property]\nAdvertise a product:\n\t/j[u|m] package [/t transform] [/g languageid]\nApply a patch:\n\t/p patchpackage [property]\n\t/p patchpackage /a package [property]\nLog and UI Modifiers for above commands:\n\t/l[*][i|w|e|a|r|u|c|m|o|p|v|][+|!] logfile\n\t/q{|n|b|r|f|n+|b+|b-}\nRegister MSI Service:\n\t/y\nUnregister MSI Service:\n\t/z\nDisplay this help:\n\t/help\n\t/?\n" 11 "vnesite ime mape, ki vsebuje %s" 12 "manjkajoÄ namestitveni vir za namestitev funkcije" 13 "manjkajoÄ omreÅ¾ni pogon za namestitev funkcijo" Modified: branches/cmake-bringup/dll/win32/msi/msi_Sr.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msi/msi… ============================================================================== --- branches/cmake-bringup/dll/win32/msi/msi_Sr.rc [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/msi/msi_Sr.rc [iso-8859-1] Tue Feb 15 19:15:01 2011 @@ -30,33 +30,7 @@ 4 "Instalacija ne moÅ¾e biti otvorena. Molimo proverite destinaciju fajla i pokuÅ¡ajte ponovo." 5 "putanja %s nije naÄena" 9 "Ubacite disk %s" - 10 "Windows Instalacija programa %s\n\n" \ - "Svrha:\n" \ - "msiexec komanda {traÅ¾eni parametar} [opcioni parametar]\n\n" \ - "Instalacija proizvoda:\n" \ - "\t/i {paket|kod} [svojina]\n" \ - "\t/package {paket|kod} [svojina]\n" \ - "\t/a paket [svojina]\n" \ - "Popravak instalacije:\n" \ - "\t/f[p|o|e|d|c|a|u|m|s|v] {paket|kod}\n" \ - "Uninstal programa:\n" \ - "\t/uninstall {paket|kod} [svojina]\n" \ - "\t/x {paket|kod} [svojina]\n" \ - "Reklama programa:\n" \ - "\t/j[u|m] paket [/t pretvori] [/g id jezika]\n" \ - "Primeni peÄ:\n" \ - "\t/p peÄpaket [svojina]\n" \ - "\t/p peÄpaket /a paket [svojina]\n" \ - "IzveÅ¡talj i Izgled Modifikatori za komande iznad:\n" \ - "\t/l[*][i|w|e|a|r|u|c|m|o|p|v|][+|!] izvestaj\n" \ - "\t/q{|n|b|r|f|n+|b+|b-}\n" \ - "Registracija MSI Servisa:\n" \ - "\t/y\n " \ - "Uklanjanje MSI Servisa:\n" \ - "\t/z\n" \ - "PrikaÅ¾i ovu PomoÄ:\n" \ - "\t/help\n" \ - "\t/?\n" + 10 "Windows Instalacija programa %s\n\nSvrha:\nmsiexec komanda {traÅ¾eni parametar} [opcioni parametar]\n\nInstalacija proizvoda:\n\t/i {paket|kod} [svojina]\n\t/package {paket|kod} [svojina]\n\t/a paket [svojina]\nPopravak instalacije:\n\t/f[p|o|e|d|c|a|u|m|s|v] {paket|kod}\nUninstal programa:\n\t/uninstall {paket|kod} [svojina]\n\t/x {paket|kod} [svojina]\nReklama programa:\n\t/j[u|m] paket [/t pretvori] [/g id jezika]\nPrimeni peÄ:\n\t/p peÄpaket [svojina]\n\t/p peÄpaket /a paket [svojina]\nIzveÅ¡talj i Izgled Modifikatori za komande iznad:\n\t/l[*][i|w|e|a|r|u|c|m|o|p|v|][+|!] izvestaj\n\t/q{|n|b|r|f|n+|b+|b-}\nRegistracija MSI Servisa:\n\t/y\n Uklanjanje MSI Servisa:\n\t/z\nPrikaÅ¾i ovu PomoÄ:\n\t/help\n\t/?\n" 11 "unesite koji folder sadrÅ¾i %s" 12 "instalacija nedostaje" 13 "mreÅ¾ni drajv nedostaje" @@ -71,33 +45,7 @@ 4 "ÐÐ½ÑÑÐ°Ð»Ð°ÑÐ¸ÑÐ° Ð½Ðµ Ð¼Ð¾Ð¶Ðµ Ð±Ð¸ÑÐ¸ Ð¾ÑÐ²Ð¾ÑÐµÐ½Ð°. ÐÐ¾Ð»Ð¸Ð¼Ð¾ Ð¿ÑÐ¾Ð²ÐµÑÐ¸ÑÐµ Ð´ÐµÑÑÐ¸Ð½Ð°ÑÐ¸ÑÑ ÑÐ°ÑÐ»Ð° Ð¸ Ð¿Ð¾ÐºÑÑÐ°ÑÑÐµ Ð¿Ð¾Ð½Ð¾Ð²Ð¾." 5 "Ð¿ÑÑÐ°ÑÐ° %s Ð½Ð¸ÑÐµ Ð½Ð°ÑÐµÐ½Ð°" 9 "Ð£Ð±Ð°ÑÐ¸ÑÐµ Ð´Ð¸ÑÐº %s" - 10 "ÐÐ¸Ð½Ð´Ð¾Ð²Ñ ÐÐ½ÑÑÐ°Ð»Ð°ÑÐ¸ÑÐ° Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð° %s\n\n" \ - "Ð¡Ð²ÑÑÐ°:\n" \ - "msiexec ÐºÐ¾Ð¼Ð°Ð½Ð´Ð° {ÑÑÐ°Ð¶ÐµÐ½Ð¸ Ð¿Ð°ÑÐ°Ð¼ÐµÑÐ°Ñ} [Ð¾Ð¿ÑÐ¸Ð¾Ð½Ð¸ Ð¿Ð°ÑÐ°Ð¼ÐµÑÐ°Ñ]\n\n" \ - "ÐÐ½ÑÑÐ°Ð»Ð°ÑÐ¸ÑÐ° Ð¿ÑÐ¾Ð¸Ð·Ð²Ð¾Ð´Ð°:\n" \ - "\t/i {Ð¿Ð°ÐºÐµÑ|ÐºÐ¾Ð´} [ÑÐ²Ð¾ÑÐ¸Ð½Ð°]\n" \ - "\t/package {Ð¿Ð°ÐºÐµÑ|ÐºÐ¾Ð´} [ÑÐ²Ð¾ÑÐ¸Ð½Ð°]\n" \ - "\t/a Ð¿Ð°ÐºÐµÑ [svojina]\n" \ - "ÐÐ¾Ð¿ÑÐ°Ð²Ð°Ðº Ð¸Ð½ÑÑÐ°Ð»Ð°ÑÐ¸ÑÐµ:\n" \ - "\t/f[p|o|e|d|c|a|u|m|s|v] {Ð¿Ð°ÐºÐµÑ|ÐºÐ¾Ð´}\n" \ - "ÐÑÐ¸ÑÐ°ÑÐµ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð°:\n" \ - "\t/uninstall {Ð¿Ð°ÐºÐµÑ|ÐºÐ¾Ð´} [svojina]\n" \ - "\t/x {Ð¿Ð°ÐºÐµÑ|ÐºÐ¾Ð´} [ÑÐ²Ð¾ÑÐ¸Ð½Ð°]\n" \ - "Ð ÐµÐºÐ»Ð°Ð¼Ð° Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð°:\n" \ - "\t/j[u|m] Ð¿Ð°ÐºÐµÑ [/t transform] [/g languageid]\n" \ - "ÐÑÐ¸Ð¼ÐµÐ½Ð¸ Ð¿ÐµÑ:\n" \ - "\t/p Ð¿ÐµÑÐ¿Ð°ÐºÐµÑ [ÑÐ²Ð¾ÑÐ¸Ð½Ð°]\n" \ - "\t/p Ð¿ÐµÑÐ¿Ð°ÐºÐµÑ /a Ð¿Ð°ÐºÐµÑ [ÑÐ²Ð¾ÑÐ¸Ð½Ð°]\n" \ - "ÐÐ·Ð²ÐµÑÑÐ°Ñ Ð¸ ÐÐ·Ð³Ð»ÐµÐ´ ÐÐ¾Ð´Ð¸ÑÐ¸ÐºÐ°ÑÐ¾ÑÐ° Ð·Ð° ÐºÐ¾Ð¼Ð°Ð½Ð´Ðµ Ð¸Ð·Ð½Ð°Ð´:\n" \ - "\t/l[*][i|w|e|a|r|u|c|m|o|p|v|][+|!] Ð¸Ð·Ð²ÐµÑÑÐ°Ñ\n" \ - "\t/q{|n|b|r|f|n+|b+|b-}\n" \ - "Ð ÐµÐ³Ð¸ÑÑÑÐ°ÑÐ¸ÑÐ° ÐÐ¡Ð Ð¡ÐµÑÐ²Ð¸ÑÐ°:\n" \ - "\t/y\n" \ - "Ð£ÐºÐ»Ð°ÑÐ°ÑÐµ ÐÐ¡Ð Ð¡ÐµÑÐ²Ð¸ÑÐ°:\n" \ - "\t/z\n" \ - "ÐÑÐ¸ÐºÐ°Ð¶Ð¸ Ð¾Ð²Ñ ÐÐ¾Ð¼Ð¾Ñ:\n" \ - "\t/help\n" \ - "\t/?\n" + 10 "ÐÐ¸Ð½Ð´Ð¾Ð²Ñ ÐÐ½ÑÑÐ°Ð»Ð°ÑÐ¸ÑÐ° Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð° %s\n\nÐ¡Ð²ÑÑÐ°:\nmsiexec ÐºÐ¾Ð¼Ð°Ð½Ð´Ð° {ÑÑÐ°Ð¶ÐµÐ½Ð¸ Ð¿Ð°ÑÐ°Ð¼ÐµÑÐ°Ñ} [Ð¾Ð¿ÑÐ¸Ð¾Ð½Ð¸ Ð¿Ð°ÑÐ°Ð¼ÐµÑÐ°Ñ]\n\nÐÐ½ÑÑÐ°Ð»Ð°ÑÐ¸ÑÐ° Ð¿ÑÐ¾Ð¸Ð·Ð²Ð¾Ð´Ð°:\n\t/i {Ð¿Ð°ÐºÐµÑ|ÐºÐ¾Ð´} [ÑÐ²Ð¾ÑÐ¸Ð½Ð°]\n\t/package {Ð¿Ð°ÐºÐµÑ|ÐºÐ¾Ð´} [ÑÐ²Ð¾ÑÐ¸Ð½Ð°]\n\t/a Ð¿Ð°ÐºÐµÑ [svojina]\nÐÐ¾Ð¿ÑÐ°Ð²Ð°Ðº Ð¸Ð½ÑÑÐ°Ð»Ð°ÑÐ¸ÑÐµ:\n\t/f[p|o|e|d|c|a|u|m|s|v] {Ð¿Ð°ÐºÐµÑ|ÐºÐ¾Ð´}\nÐÑÐ¸ÑÐ°ÑÐµ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð°:\n\t/uninstall {Ð¿Ð°ÐºÐµÑ|ÐºÐ¾Ð´} [svojina]\n\t/x {Ð¿Ð°ÐºÐµÑ|ÐºÐ¾Ð´} [ÑÐ²Ð¾ÑÐ¸Ð½Ð°]\nÐ ÐµÐºÐ»Ð°Ð¼Ð° Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð°:\n\t/j[u|m] Ð¿Ð°ÐºÐµÑ [/t transform] [/g languageid]\nÐÑÐ¸Ð¼ÐµÐ½Ð¸ Ð¿ÐµÑ:\n\t/p Ð¿ÐµÑÐ¿Ð°ÐºÐµÑ [ÑÐ²Ð¾ÑÐ¸Ð½Ð°]\n\t/p Ð¿ÐµÑÐ¿Ð°ÐºÐµÑ /a Ð¿Ð°ÐºÐµÑ [ÑÐ²Ð¾ÑÐ¸Ð½Ð°]\nÐÐ·Ð²ÐµÑÑÐ°Ñ Ð¸ ÐÐ·Ð³Ð»ÐµÐ´ ÐÐ¾Ð´Ð¸ÑÐ¸ÐºÐ°ÑÐ¾ÑÐ° Ð·Ð° ÐºÐ¾Ð¼Ð°Ð½Ð´Ðµ Ð¸Ð·Ð½Ð°Ð´:\n\t/l[*][i|w|e|a|r|u|c|m|o|p|v|][+|!] Ð¸Ð·Ð²ÐµÑÑÐ°Ñ\n\t/q{|n|b|r|f|n+|b+|b-}\nÐ ÐµÐ³Ð¸ÑÑÑÐ°ÑÐ¸ÑÐ° ÐÐ¡Ð Ð¡ÐµÑÐ²Ð¸ÑÐ°:\n\t/y\nÐ£ÐºÐ»Ð°ÑÐ°ÑÐµ ÐÐ¡Ð Ð¡ÐµÑÐ²Ð¸ÑÐ°:\n\t/z\nÐÑÐ¸ÐºÐ°Ð¶Ð¸ Ð¾Ð²Ñ ÐÐ¾Ð¼Ð¾Ñ:\n\t/help\n\t/?\n" 11 "Ð£Ð½ÐµÑÐ¸ÑÐµ ÐºÐ¾ÑÐ¸ ÑÐ¾Ð»Ð´ÐµÑ ÑÐ°Ð´ÑÐ¶Ð¸ %s" 12 "ÐÐ½ÑÑÐ°Ð»Ð°ÑÐ¸ÑÐ° Ð½ÐµÐ´Ð¾ÑÑÐ°ÑÐµ" 13 "ÐÑÐµÐ¶Ð½Ð¸ Ð´ÑÐ°ÑÐ² Ð½ÐµÐ´Ð¾ÑÑÐ°ÑÐµ" Modified: branches/cmake-bringup/dll/win32/msi/msi_Sv.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msi/msi… ============================================================================== --- branches/cmake-bringup/dll/win32/msi/msi_Sv.rc [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/msi/msi_Sv.rc [iso-8859-1] Tue Feb 15 19:15:01 2011 @@ -27,33 +27,7 @@ 4 "Det angivna installationspaketet kunde inte öppnas. Kontrollera filsökvägen och försök igen." 5 "sökvägen %s hittades inte" 9 "mata in %s" - 10 "Windows Installer %s\n\n" \ - "Usage:\n" \ - "msiexec command {required parameter} [optional parammeter]\n\n" \ - "Install a product:\n" \ - "\t/i {package|productcode} [property]\n" \ - "\t/package {package|productcode} [property]\n" \ - "\t/a package [property]\n" \ - "Repair an installation:\n" \ - "\t/f[p|o|e|d|c|a|u|m|s|v] {package|productcode}\n" \ - "Uninstall a product:\n" \ - "\t/uninstall {package|productcode} [property]\n" \ - "\t/x {package|productcode} [property]\n" \ - "Advertise a product:\n" \ - "\t/j[u|m] package [/t transform] [/g languageid]\n" \ - "Apply a patch:\n" \ - "\t/p patchpackage [property]\n" \ - "\t/p patchpackage /a package [property]\n" \ - "Log and UI Modifiers for above commands:\n" \ - "\t/l[*][i|w|e|a|r|u|c|m|o|p|v|][+|!] logfile\n" \ - "\t/q{|n|b|r|f|n+|b+|b-}\n" \ - "Register MSI Service:\n" \ - "\t/y\n" \ - "Unregister MSI Service:\n" \ - "\t/z\n" \ - "Display this help:\n" \ - "\t/help\n" \ - "\t/?\n" + 10 "Windows Installer %s\n\nUsage:\nmsiexec command {required parameter} [optional parammeter]\n\nInstall a product:\n\t/i {package|productcode} [property]\n\t/package {package|productcode} [property]\n\t/a package [property]\nRepair an installation:\n\t/f[p|o|e|d|c|a|u|m|s|v] {package|productcode}\nUninstall a product:\n\t/uninstall {package|productcode} [property]\n\t/x {package|productcode} [property]\nAdvertise a product:\n\t/j[u|m] package [/t transform] [/g languageid]\nApply a patch:\n\t/p patchpackage [property]\n\t/p patchpackage /a package [property]\nLog and UI Modifiers for above commands:\n\t/l[*][i|w|e|a|r|u|c|m|o|p|v|][+|!] logfile\n\t/q{|n|b|r|f|n+|b+|b-}\nRegister MSI Service:\n\t/y\nUnregister MSI Service:\n\t/z\nDisplay this help:\n\t/help\n\t/?\n" 11 "ange vilken mapp som innehåller %s" 12 "installationskälla för funktion saknar" 13 "nätverksenhet för funktion saknar" Modified: branches/cmake-bringup/dll/win32/msi/msi_Tr.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msi/msi… ============================================================================== --- branches/cmake-bringup/dll/win32/msi/msi_Tr.rc [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/msi/msi_Tr.rc [iso-8859-1] Tue Feb 15 19:15:01 2011 @@ -27,33 +27,7 @@ 4 "The specified installation package could not be opened. Please check the file path and try again." 5 "%s yolu bulunamadý" 9 "%s nolu diski yerleþtirin" - 10 "Windows Installer %s\n\n" \ - "Usage:\n" \ - "msiexec command {required parameter} [optional parammeter]\n\n" \ - "Install a product:\n" \ - "\t/i {package|productcode} [property]\n" \ - "\t/package {package|productcode} [property]\n" \ - "\t/a package [property]\n" \ - "Repair an installation:\n" \ - "\t/f[p|o|e|d|c|a|u|m|s|v] {package|productcode}\n" \ - "Uninstall a product:\n" \ - "\t/uninstall {package|productcode} [property]\n" \ - "\t/x {package|productcode} [property]\n" \ - "Advertise a product:\n" \ - "\t/j[u|m] package [/t transform] [/g languageid]\n" \ - "Apply a patch:\n" \ - "\t/p patchpackage [property]\n" \ - "\t/p patchpackage /a package [property]\n" \ - "Log and UI Modifiers for above commands:\n" \ - "\t/l[*][i|w|e|a|r|u|c|m|o|p|v|][+|!] logfile\n" \ - "\t/q{|n|b|r|f|n+|b+|b-}\n" \ - "Register MSI Service:\n" \ - "\t/y\n" \ - "Unregister MSI Service:\n" \ - "\t/z\n" \ - "Display this help:\n" \ - "\t/help\n" \ - "\t/?\n" + 10 "Windows Installer %s\n\nUsage:\nmsiexec command {required parameter} [optional parammeter]\n\nInstall a product:\n\t/i {package|productcode} [property]\n\t/package {package|productcode} [property]\n\t/a package [property]\nRepair an installation:\n\t/f[p|o|e|d|c|a|u|m|s|v] {package|productcode}\nUninstall a product:\n\t/uninstall {package|productcode} [property]\n\t/x {package|productcode} [property]\nAdvertise a product:\n\t/j[u|m] package [/t transform] [/g languageid]\nApply a patch:\n\t/p patchpackage [property]\n\t/p patchpackage /a package [property]\nLog and UI Modifiers for above commands:\n\t/l[*][i|w|e|a|r|u|c|m|o|p|v|][+|!] logfile\n\t/q{|n|b|r|f|n+|b+|b-}\nRegister MSI Service:\n\t/y\nUnregister MSI Service:\n\t/z\nDisplay this help:\n\t/help\n\t/?\n" 11 "%s öðesini içeren dizini girin" 12 "eksik özellik için kurulum kaynaðý" 13 "eksik özellik için að sürücüsü" Modified: branches/cmake-bringup/dll/win32/msi/msi_Uk.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msi/msi… ============================================================================== --- branches/cmake-bringup/dll/win32/msi/msi_Uk.rc [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/msi/msi_Uk.rc [iso-8859-1] Tue Feb 15 19:15:01 2011 @@ -32,33 +32,7 @@ 4 "ÐÐµ Ð²Ð´Ð°Ð»Ð¾ÑÑ Ð²ÑÐ´ÐºÑÐ¸ÑÐ¸ Ð²ÐºÐ°Ð·Ð°Ð½Ð¸Ð¹ Ð¿Ð°ÐºÐµÑ ÑÐ½ÑÑÐ°Ð»ÑÑÑÑ. ÐÐµÑÐµÐ²ÑÑÑÐµ ÑÐ»ÑÑ Ð´Ð¾ ÑÐ°Ð¹Ð»Ñ ÑÐ° ÑÐ¿ÑÐ¾Ð±ÑÐ¹ÑÐµ Ð·Ð½Ð¾Ð²." 5 "ÑÐ»ÑÑ %s Ð½Ðµ Ð·Ð½Ð°Ð¹Ð´ÐµÐ½Ð¾" 9 "Ð²ÑÑÐ°Ð²ÑÐµ Ð´Ð¸ÑÐº %s" - 10 "Windows Installer %s\n\n" \ - "Usage:\n" \ - "msiexec command {required parameter} [optional parammeter]\n\n" \ - "Install a product:\n" \ - "\t/i {package|productcode} [property]\n" \ - "\t/package {package|productcode} [property]\n" \ - "\t/a package [property]\n" \ - "Repair an installation:\n" \ - "\t/f[p|o|e|d|c|a|u|m|s|v] {package|productcode}\n" \ - "Uninstall a product:\n" \ - "\t/uninstall {package|productcode} [property]\n" \ - "\t/x {package|productcode} [property]\n" \ - "Advertise a product:\n" \ - "\t/j[u|m] package [/t transform] [/g languageid]\n" \ - "Apply a patch:\n" \ - "\t/p patchpackage [property]\n" \ - "\t/p patchpackage /a package [property]\n" \ - "Log and UI Modifiers for above commands:\n" \ - "\t/l[*][i|w|e|a|r|u|c|m|o|p|v|][+|!] logfile\n" \ - "\t/q{|n|b|r|f|n+|b+|b-}\n" \ - "Register MSI Service:\n" \ - "\t/y\n" \ - "Unregister MSI Service:\n" \ - "\t/z\n" \ - "Display this help:\n" \ - "\t/help\n" \ - "\t/?\n" + 10 "Windows Installer %s\n\nUsage:\nmsiexec command {required parameter} [optional parammeter]\n\nInstall a product:\n\t/i {package|productcode} [property]\n\t/package {package|productcode} [property]\n\t/a package [property]\nRepair an installation:\n\t/f[p|o|e|d|c|a|u|m|s|v] {package|productcode}\nUninstall a product:\n\t/uninstall {package|productcode} [property]\n\t/x {package|productcode} [property]\nAdvertise a product:\n\t/j[u|m] package [/t transform] [/g languageid]\nApply a patch:\n\t/p patchpackage [property]\n\t/p patchpackage /a package [property]\nLog and UI Modifiers for above commands:\n\t/l[*][i|w|e|a|r|u|c|m|o|p|v|][+|!] logfile\n\t/q{|n|b|r|f|n+|b+|b-}\nRegister MSI Service:\n\t/y\nUnregister MSI Service:\n\t/z\nDisplay this help:\n\t/help\n\t/?\n" 11 "Ð²ÐºÐ°Ð¶ÑÑÑ Ð¿Ð°Ð¿ÐºÑ, ÑÐ¾ Ð¼ÑÑÑÐ¸ÑÑ %s" 12 "Ð´Ð¶ÐµÑÐµÐ»Ð¾ Ð²ÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ð´Ð°Ð½Ð¾Ñ Ð¼Ð¾Ð¶Ð»Ð¸Ð²Ð¾ÑÑÑ Ð½Ðµ Ð²ÐºÐ°Ð·Ð°Ð½Ðµ" 13 "Ð¼ÐµÑÐµÐ¶ÐµÐ²Ð¸Ð¹ Ð´Ð¸ÑÐº Ð´Ð»Ñ Ð´Ð°Ð½Ð¾Ñ Ð¼Ð¾Ð¶Ð»Ð¸Ð²Ð¾ÑÑÑ Ð½Ðµ Ð²ÐºÐ°Ð·Ð°Ð½Ð¸Ð¹" Modified: branches/cmake-bringup/dll/win32/msi/msi_Zh.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msi/msi… ============================================================================== --- branches/cmake-bringup/dll/win32/msi/msi_Zh.rc [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/msi/msi_Zh.rc [iso-8859-1] Tue Feb 15 19:15:01 2011 @@ -30,33 +30,7 @@ 4 "ä¸è½æå¼ææå®çå®è£è½¯ä»¶å. è¯·æ£æ¥æä»¶è·¯å¾ååè¯." 5 "è·¯å¾ %s æ²¡æ¾å°" 9 "æå¥è½¯ç %s" - 10 "Windows Installer %s\n\n" \ - "Usage:\n" \ - "msiexec command {required parameter} [optional parammeter]\n\n" \ - "Install a product:\n" \ - "\t/i {package|productcode} [property]\n" \ - "\t/package {package|productcode} [property]\n" \ - "\t/a package [property]\n" \ - "Repair an installation:\n" \ - "\t/f[p|o|e|d|c|a|u|m|s|v] {package|productcode}\n" \ - "Uninstall a product:\n" \ - "\t/uninstall {package|productcode} [property]\n" \ - "\t/x {package|productcode} [property]\n" \ - "Advertise a product:\n" \ - "\t/j[u|m] package [/t transform] [/g languageid]\n" \ - "Apply a patch:\n" \ - "\t/p patchpackage [property]\n" \ - "\t/p patchpackage /a package [property]\n" \ - "Log and UI Modifiers for above commands:\n" \ - "\t/l[*][i|w|e|a|r|u|c|m|o|p|v|][+|!] logfile\n" \ - "\t/q{|n|b|r|f|n+|b+|b-}\n" \ - "Register MSI Service:\n" \ - "\t/y\n" \ - "Unregister MSI Service:\n" \ - "\t/z\n" \ - "Display this help:\n" \ - "\t/help\n" \ - "\t/?\n" + 10 "Windows Installer %s\n\nUsage:\nmsiexec command {required parameter} [optional parammeter]\n\nInstall a product:\n\t/i {package|productcode} [property]\n\t/package {package|productcode} [property]\n\t/a package [property]\nRepair an installation:\n\t/f[p|o|e|d|c|a|u|m|s|v] {package|productcode}\nUninstall a product:\n\t/uninstall {package|productcode} [property]\n\t/x {package|productcode} [property]\nAdvertise a product:\n\t/j[u|m] package [/t transform] [/g languageid]\nApply a patch:\n\t/p patchpackage [property]\n\t/p patchpackage /a package [property]\nLog and UI Modifiers for above commands:\n\t/l[*][i|w|e|a|r|u|c|m|o|p|v|][+|!] logfile\n\t/q{|n|b|r|f|n+|b+|b-}\nRegister MSI Service:\n\t/y\nUnregister MSI Service:\n\t/z\nDisplay this help:\n\t/help\n\t/?\n" 11 "è¾å¥åå« %s çæä»¶å¤¹" 12 "æ¬åè½çå®è£æºä¸åå¨" 13 "æ¬åè½çç½ç»é©±å¨å¨ä¸åå¨" @@ -71,33 +45,7 @@ 4 "ä¸è½éåææå®çå®è£è»ä»¶å. è«æª¢æ¥æªæ¡è·¯å¾å¾åè©¦." 5 "è·¯å¾ %s æ²æ¾å°" 9 "æå¥è»ç¢ %s" - 10 "Windows Installer %s\n\n" \ - "Usage:\n" \ - "msiexec command {required parameter} [optional parammeter]\n\n" \ - "Install a product:\n" \ - "\t/i {package|productcode} [property]\n" \ - "\t/package {package|productcode} [property]\n" \ - "\t/a package [property]\n" \ - "Repair an installation:\n" \ - "\t/f[p|o|e|d|c|a|u|m|s|v] {package|productcode}\n" \ - "Uninstall a product:\n" \ - "\t/uninstall {package|productcode} [property]\n" \ - "\t/x {package|productcode} [property]\n" \ - "Advertise a product:\n" \ - "\t/j[u|m] package [/t transform] [/g languageid]\n" \ - "Apply a patch:\n" \ - "\t/p patchpackage [property]\n" \ - "\t/p patchpackage /a package [property]\n" \ - "Log and UI Modifiers for above commands:\n" \ - "\t/l[*][i|w|e|a|r|u|c|m|o|p|v|][+|!] logfile\n" \ - "\t/q{|n|b|r|f|n+|b+|b-}\n" \ - "Register MSI Service:\n" \ - "\t/y\n" \ - "Unregister MSI Service:\n" \ - "\t/z\n" \ - "Display this help:\n" \ - "\t/help\n" \ - "\t/?\n" + 10 "Windows Installer %s\n\nUsage:\nmsiexec command {required parameter} [optional parammeter]\n\nInstall a product:\n\t/i {package|productcode} [property]\n\t/package {package|productcode} [property]\n\t/a package [property]\nRepair an installation:\n\t/f[p|o|e|d|c|a|u|m|s|v] {package|productcode}\nUninstall a product:\n\t/uninstall {package|productcode} [property]\n\t/x {package|productcode} [property]\nAdvertise a product:\n\t/j[u|m] package [/t transform] [/g languageid]\nApply a patch:\n\t/p patchpackage [property]\n\t/p patchpackage /a package [property]\nLog and UI Modifiers for above commands:\n\t/l[*][i|w|e|a|r|u|c|m|o|p|v|][+|!] logfile\n\t/q{|n|b|r|f|n+|b+|b-}\nRegister MSI Service:\n\t/y\nUnregister MSI Service:\n\t/z\nDisplay this help:\n\t/help\n\t/?\n" 11 "è¼¸å¥åå« %s çæªæ¡å¤¾" 12 "æ¬åè½çå®è£æºä¸åå¨" 13 "æ¬åè½çç¶²è·¯å²åæ§½ä¸åå¨" Added: branches/cmake-bringup/dll/win32/msi/msvchelper.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msi/msv… ============================================================================== --- branches/cmake-bringup/dll/win32/msi/msvchelper.h (added) +++ branches/cmake-bringup/dll/win32/msi/msvchelper.h [iso-8859-1] Tue Feb 15 19:15:01 2011 @@ -1,0 +1,13 @@ + +#ifdef __i386__ +#define __ASM_DEFINE_FUNC(name,suffix,code) + +typedef unsigned int (__stdcall *__MSVC__MsiCustomActionEntryPoint)(unsigned int); + +__inline unsigned int CUSTOMPROC_wrapper(__MSVC__MsiCustomActionEntryPoint proc, unsigned int handle) +{ +#pragma message("warning: CUSTOMPROC_wrapper might not be correct") + return proc(handle); +} + +#endif Propchange: branches/cmake-bringup/dll/win32/msi/msvchelper.h ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[janderwald] 50718: - Revert irrelevant changes
by janderwald＠svn.reactos.org 15 Feb '11

15 Feb '11

Author: janderwald Date: Tue Feb 15 18:15:32 2011 New Revision: 50718 URL: http://svn.reactos.org/svn/reactos?rev=50718&view=rev Log: - Revert irrelevant changes Modified: branches/cmake-bringup/dll/win32/mstask/CMakeLists.txt branches/cmake-bringup/dll/win32/windowscodecs/CMakeLists.txt Modified: branches/cmake-bringup/dll/win32/mstask/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/mstask/… ============================================================================== --- branches/cmake-bringup/dll/win32/mstask/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/mstask/CMakeLists.txt [iso-8859-1] Tue Feb 15 18:15:32 2011 @@ -8,7 +8,6 @@ add_definitions(-D_WIN32_WINNT=0x600) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) -include_directories(${REACTOS_BINARY_DIR}/include/psdk) generate_idl_iids(mstask_local.idl) Modified: branches/cmake-bringup/dll/win32/windowscodecs/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/windows… ============================================================================== --- branches/cmake-bringup/dll/win32/windowscodecs/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/windowscodecs/CMakeLists.txt [iso-8859-1] Tue Feb 15 18:15:32 2011 @@ -9,8 +9,7 @@ ${REACTOS_SOURCE_DIR}/include/reactos/libs/libjpeg ${REACTOS_SOURCE_DIR}/include/reactos/libs/zlib ${REACTOS_SOURCE_DIR}/include/reactos/libs/libpng - ${REACTOS_SOURCE_DIR}/include/reactos/libs/libtiff - ${REACTOS_BINARY_DIR}/include/psdk) + ${REACTOS_SOURCE_DIR}/include/reactos/libs/libtiff) set_rc_compiler() spec2def(windowscodecs.dll windowscodecs.spec)

1 0

[janderwald] 50717: - Add wincodec.idl to build - windowscodecs gets now further
by janderwald＠svn.reactos.org 15 Feb '11

15 Feb '11

Author: janderwald Date: Tue Feb 15 18:08:53 2011 New Revision: 50717 URL: http://svn.reactos.org/svn/reactos?rev=50717&view=rev Log: - Add wincodec.idl to build - windowscodecs gets now further Modified: branches/cmake-bringup/dll/win32/windowscodecs/CMakeLists.txt branches/cmake-bringup/include/psdk/CMakeLists.txt Modified: branches/cmake-bringup/dll/win32/windowscodecs/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/windows… ============================================================================== --- branches/cmake-bringup/dll/win32/windowscodecs/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/windowscodecs/CMakeLists.txt [iso-8859-1] Tue Feb 15 18:08:53 2011 @@ -9,8 +9,8 @@ ${REACTOS_SOURCE_DIR}/include/reactos/libs/libjpeg ${REACTOS_SOURCE_DIR}/include/reactos/libs/zlib ${REACTOS_SOURCE_DIR}/include/reactos/libs/libpng - ${REACTOS_SOURCE_DIR}/include/reactos/libs/libtiff) - + ${REACTOS_SOURCE_DIR}/include/reactos/libs/libtiff + ${REACTOS_BINARY_DIR}/include/psdk) set_rc_compiler() spec2def(windowscodecs.dll windowscodecs.spec) Modified: branches/cmake-bringup/include/psdk/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/psdk/CMak… ============================================================================== --- branches/cmake-bringup/include/psdk/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/include/psdk/CMakeLists.txt [iso-8859-1] Tue Feb 15 18:08:53 2011 @@ -94,6 +94,7 @@ # vmrender.idl wia_lh.idl wia_xp.idl + wincodec.idl winsxs.idl wtypes.idl xmldom.idl @@ -104,7 +105,6 @@ if(NOT MSVC) list(APPEND SOURCE wbemcli.idl - wincodec.idl wuapi.idl) endif()

1 0

[janderwald] 50716: - Apply same fix for wmilib - set_entrypoint macro appears to be broken for msvc 16.00.30319.01 (VS 2010)
by janderwald＠svn.reactos.org 15 Feb '11

15 Feb '11

Author: janderwald Date: Tue Feb 15 17:39:00 2011 New Revision: 50716 URL: http://svn.reactos.org/svn/reactos?rev=50716&view=rev Log: - Apply same fix for wmilib - set_entrypoint macro appears to be broken for msvc 16.00.30319.01 (VS 2010) Modified: branches/cmake-bringup/drivers/wmi/CMakeLists.txt Modified: branches/cmake-bringup/drivers/wmi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/wmi/CMake… ============================================================================== --- branches/cmake-bringup/drivers/wmi/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/wmi/CMakeLists.txt [iso-8859-1] Tue Feb 15 17:39:00 2011 @@ -8,8 +8,8 @@ add_library(wmilib SHARED ${SOURCE}) -set_module_type(wmilib kernelmodedriver) set_entrypoint(wmilib 0) +set_target_properties(wmilib PROPERTIES SUFFIX ".sys") add_importlibs(wmilib ntoskrnl) add_importlib_target(wmilib.spec)

1 0

[tkreuzer] 50715: [WINE] Don't define __ASM_DEFINE_FUNC and __ASM_STDCALL_FUNC on MSVC builds
by tkreuzer＠svn.reactos.org 15 Feb '11

15 Feb '11

Author: tkreuzer Date: Tue Feb 15 17:36:10 2011 New Revision: 50715 URL: http://svn.reactos.org/svn/reactos?rev=50715&view=rev Log: [WINE] Don't define __ASM_DEFINE_FUNC and __ASM_STDCALL_FUNC on MSVC builds Modified: branches/cmake-bringup/include/reactos/wine/config.h Modified: branches/cmake-bringup/include/reactos/wine/config.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/reactos/w… ============================================================================== --- branches/cmake-bringup/include/reactos/wine/config.h [iso-8859-1] (original) +++ branches/cmake-bringup/include/reactos/wine/config.h [iso-8859-1] Tue Feb 15 17:36:10 2011 @@ -1020,10 +1020,12 @@ #define __ASM_CFI(str) str /* Define to a macro to define an assembly function */ +#ifndef _MSC_VER #ifndef NO_UNDERSCORE_PREFIX #define __ASM_DEFINE_FUNC(name,suffix,code) asm(".text\n\t.align 4\n\t.globl _" #name suffix "\n\t.def _" #name suffix "; .scl 2; .type 32; .endef\n_" #name suffix ":\n\t.cfi_startproc\n\t" code "\n\t.cfi_endproc"); #else #define __ASM_DEFINE_FUNC(name,suffix,code) asm(".text\n\t.align 4\n\t.globl " #name suffix "\n\t.def " #name suffix "; .scl 2; .type 32; .endef\n" #name suffix ":\n\t.cfi_startproc\n\t" code "\n\t.cfi_endproc"); +#endif #endif /* Define to a macro to generate an assembly function directive */ @@ -1045,7 +1047,9 @@ /* Define to a macro to generate an assembly function with stdcall calling convention */ +#ifndef _MSC_VER #define __ASM_STDCALL_FUNC(name,args,code) __ASM_DEFINE_FUNC(name,__ASM_STDCALL(args),code) +#endif /* Define to empty if `const' does not conform to ANSI C. */ /* #undef const */

1 0

[janderwald] 50714: - Fix drmk build for msvc
by janderwald＠svn.reactos.org 15 Feb '11

15 Feb '11

Author: janderwald Date: Tue Feb 15 17:29:11 2011 New Revision: 50714 URL: http://svn.reactos.org/svn/reactos?rev=50714&view=rev Log: - Fix drmk build for msvc Modified: branches/cmake-bringup/drivers/wdm/audio/drm/drmk/CMakeLists.txt Modified: branches/cmake-bringup/drivers/wdm/audio/drm/drmk/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/wdm/audio… ============================================================================== --- branches/cmake-bringup/drivers/wdm/audio/drm/drmk/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/wdm/audio/drm/drmk/CMakeLists.txt [iso-8859-1] Tue Feb 15 17:29:11 2011 @@ -10,8 +10,8 @@ add_library(drmk SHARED ${SOURCE}) -set_module_type(drmk kernelmodedriver) set_entrypoint(drmk 0) +set_target_properties(drmk PROPERTIES SUFFIX ".sys") add_importlibs(drmk ntoskrnl) add_importlib_target(drmk.spec)

1 0

[gadamopoulos] 50713: [acpi] -Fix compilation with msc
by gadamopoulos＠svn.reactos.org 15 Feb '11

15 Feb '11

Author: gadamopoulos Date: Tue Feb 15 17:12:36 2011 New Revision: 50713 URL: http://svn.reactos.org/svn/reactos?rev=50713&view=rev Log: [acpi] -Fix compilation with msc Modified: branches/cmake-bringup/drivers/bus/acpi/busmgr/button.c branches/cmake-bringup/drivers/bus/acpi/busmgr/power.c branches/cmake-bringup/drivers/bus/acpi/busmgr/system.c branches/cmake-bringup/drivers/bus/acpi/main.c branches/cmake-bringup/drivers/bus/acpi/osl.c branches/cmake-bringup/drivers/bus/acpi/pnp.c Modified: branches/cmake-bringup/drivers/bus/acpi/busmgr/button.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/bus/acpi/… ============================================================================== --- branches/cmake-bringup/drivers/bus/acpi/busmgr/button.c [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/bus/acpi/busmgr/button.c [iso-8859-1] Tue Feb 15 17:12:36 2011 @@ -42,13 +42,13 @@ static int acpi_button_remove (struct acpi_device *device, int type); static struct acpi_driver acpi_button_driver = { - .name = ACPI_BUTTON_DRIVER_NAME, - .class = ACPI_BUTTON_CLASS, - .ids = "ACPI_FPB,ACPI_FSB,PNP0C0D,PNP0C0C,PNP0C0E", - .ops = { - .add = acpi_button_add, - .remove = acpi_button_remove, - }, + {0,0}, + ACPI_BUTTON_DRIVER_NAME, + ACPI_BUTTON_CLASS, + 0, + 0, + "ACPI_FPB,ACPI_FSB,PNP0C0D,PNP0C0C,PNP0C0E", + {acpi_button_add,acpi_button_remove} }; struct acpi_button { Modified: branches/cmake-bringup/drivers/bus/acpi/busmgr/power.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/bus/acpi/… ============================================================================== --- branches/cmake-bringup/drivers/bus/acpi/busmgr/power.c [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/bus/acpi/busmgr/power.c [iso-8859-1] Tue Feb 15 17:12:36 2011 @@ -64,14 +64,13 @@ static int acpi_power_resume(struct acpi_device *device, int state); static struct acpi_driver acpi_power_driver = { - .name = ACPI_POWER_DRIVER_NAME, - .class = ACPI_POWER_CLASS, - .ids = ACPI_POWER_HID, - .ops = { - .add = acpi_power_add, - .remove = acpi_power_remove, - .resume = acpi_power_resume, - }, + {0,0}, + ACPI_POWER_DRIVER_NAME, + ACPI_POWER_CLASS, + 0, + 0, + ACPI_POWER_HID, + {acpi_power_add, acpi_power_remove, NULL, NULL, acpi_power_resume} }; struct acpi_power_reference { Modified: branches/cmake-bringup/drivers/bus/acpi/busmgr/system.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/bus/acpi/… ============================================================================== --- branches/cmake-bringup/drivers/bus/acpi/busmgr/system.c [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/bus/acpi/busmgr/system.c [iso-8859-1] Tue Feb 15 17:12:36 2011 @@ -48,13 +48,13 @@ ACPI_STATUS acpi_suspend (UINT32 state); static struct acpi_driver acpi_system_driver = { - .name = ACPI_SYSTEM_DRIVER_NAME, - .class = ACPI_SYSTEM_CLASS, - .ids = ACPI_SYSTEM_HID, - .ops = { - .add = acpi_system_add, - .remove = acpi_system_remove - }, + {0,0}, + ACPI_SYSTEM_DRIVER_NAME, + ACPI_SYSTEM_CLASS, + 0, + 0, + ACPI_SYSTEM_HID, + {acpi_system_add, acpi_system_remove} }; struct acpi_system Modified: branches/cmake-bringup/drivers/bus/acpi/main.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/bus/acpi/… ============================================================================== --- branches/cmake-bringup/drivers/bus/acpi/main.c [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/bus/acpi/main.c [iso-8859-1] Tue Feb 15 17:12:36 2011 @@ -11,6 +11,13 @@ #define NDEBUG #include <debug.h> + +NTSTATUS +NTAPI +DriverEntry ( + PDRIVER_OBJECT DriverObject, + PUNICODE_STRING RegistryPath + ); #ifdef ALLOC_PRAGMA #pragma alloc_text (INIT, DriverEntry) Modified: branches/cmake-bringup/drivers/bus/acpi/osl.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/bus/acpi/… ============================================================================== --- branches/cmake-bringup/drivers/bus/acpi/osl.c [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/bus/acpi/osl.c [iso-8859-1] Tue Feb 15 17:12:36 2011 @@ -67,6 +67,8 @@ ACPI_STATUS AcpiOsInitialize (void) { + UINT32 i; + DPRINT("AcpiOsInitialize called\n"); #ifndef NDEBUG @@ -74,8 +76,6 @@ AcpiDbgLevel = 0x00FFFFFF; AcpiDbgLayer = 0xFFFFFFFF; #endif - - UINT32 i; for (i = 0; i < NUM_SEMAPHORES; i++) { @@ -209,10 +209,11 @@ AcpiOsAcquireObject ( ACPI_CACHE_T *Cache) { + void* ptr; PNPAGED_LOOKASIDE_LIST List = (PNPAGED_LOOKASIDE_LIST)Cache; + DPRINT("AcpiOsAcquireObject from %p\n", Cache); - void* ptr = - ExAllocateFromNPagedLookasideList(List); + ptr = ExAllocateFromNPagedLookasideList(List); ASSERT(ptr); RtlZeroMemory(ptr,List->L.Size); @@ -692,8 +693,10 @@ UINT64 AcpiOsGetTimer (void) { + LARGE_INTEGER Timer; + DPRINT("AcpiOsGetTimer\n"); - LARGE_INTEGER Timer; + KeQueryTickCount(&Timer); return Timer.QuadPart; @@ -758,9 +761,10 @@ AcpiOsGetRootPointer ( void) { + ACPI_PHYSICAL_ADDRESS pa = 0; + DPRINT("AcpiOsGetRootPointer\n"); - ACPI_PHYSICAL_ADDRESS pa = 0; - + AcpiFindRootPointer(&pa); return pa; } Modified: branches/cmake-bringup/drivers/bus/acpi/pnp.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/bus/acpi/… ============================================================================== --- branches/cmake-bringup/drivers/bus/acpi/pnp.c [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/bus/acpi/pnp.c [iso-8859-1] Tue Feb 15 17:12:36 2011 @@ -9,12 +9,17 @@ #include <wdmguid.h> #define NDEBUG #include <debug.h> + +NTSTATUS +Bus_PlugInDevice ( + struct acpi_device *Device, + PFDO_DEVICE_DATA FdoData + ); #ifdef ALLOC_PRAGMA #pragma alloc_text (PAGE, Bus_PnP) #pragma alloc_text (PAGE, Bus_PlugInDevice) #pragma alloc_text (PAGE, Bus_InitializePdo) -#pragma alloc_text (PAGE, Bus_UnPlugDevice) #pragma alloc_text (PAGE, Bus_DestroyPdo) #pragma alloc_text (PAGE, Bus_FDO_PnP) #pragma alloc_text (PAGE, Bus_StartFdo)

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs