Ros-diffs August 2010

ros-diffs@reactos.org

14 participants
282 discussions

[akhaldi] 48652: [CMAKE] - Improve ntdll.
by akhaldi＠svn.reactos.org 29 Aug '10

29 Aug '10

Author: akhaldi Date: Sun Aug 29 21:32:32 2010 New Revision: 48652 URL: http://svn.reactos.org/svn/reactos?rev=48652&view=rev Log: [CMAKE] - Improve ntdll. Modified: branches/cmake-bringup/dll/ntdll/CMakeLists.txt Modified: branches/cmake-bringup/dll/ntdll/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/ntdll/CMakeLi… ============================================================================== --- branches/cmake-bringup/dll/ntdll/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/ntdll/CMakeLists.txt [iso-8859-1] Sun Aug 29 21:32:32 2010 @@ -5,22 +5,34 @@ add_definitions(-D_NTOSKRNL_) add_definitions(-DCRTDLL) -include_directories(BEFORE ./include) +include_directories(BEFORE include) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/subsys) -file(GLOB_RECURSE SOURCE *.c) -list(REMOVE_ITEM SOURCE - ${CMAKE_CURRENT_SOURCE_DIR}/ldr/elf.c - ${CMAKE_CURRENT_SOURCE_DIR}/dispatch/dispatch.c - ${CMAKE_CURRENT_SOURCE_DIR}/dispatch/amd64/stubs.c) -file(GLOB_RECURSE ARCH_SOURCE - "${CMAKE_CURRENT_SOURCE_DIR}/dispatch/${ARCH}/*.c" - "${CMAKE_CURRENT_SOURCE_DIR}/dispatch/${ARCH}/*.s") +list(APPEND SOURCE + csr/api.c + csr/capture.c + csr/connect.c + dbg/dbgui.c + ldr/startup.c + ldr/utils.c + ldr/actctx.c + rtl/libsupp.c + rtl/version.c + def/ntdll.rc) + +if(ARCH MATCHES i386) +list(APPEND SOURCE dispatch/i386/dispatch.S) +elseif(ARCH MATCHES amd64) +list(APPEND SOURCE dispatch/amd64/stubs.c) +elseif(ARCH MATCHES arm) +list(APPEND SOURCE dispatch/arm/stubs_asm.s) +else() +list(APPEND SOURCE dispatch/dispatch.c) +endif(ARCH MATCHES i386) add_library(ntdll SHARED - ${ARCH_SOURCE} ${SOURCE} - ${CMAKE_CURRENT_SOURCE_DIR}/def/ntdll.rc - ${CMAKE_CURRENT_BINARY_DIR}/ntdll_ntdll.h.gch) + ${SOURCE} + ${CMAKE_CURRENT_BINARY_DIR}/ntdll_ntdll.h.gch) set_target_properties(ntdll PROPERTIES LINK_FLAGS "-Wl,-entry,0")

1 0

[sir_richard] 48651: [NTOS]: Add an extra layer of protection for freed nonpaged pool: write a 4-byte signature on freed blocks, and assert its valid on checked builds. Use a slightly less egocentr...
by sir_richard＠svn.reactos.org 29 Aug '10

29 Aug '10

Author: sir_richard Date: Sun Aug 29 19:32:25 2010 New Revision: 48651 URL: http://svn.reactos.org/svn/reactos?rev=48651&view=rev Log: [NTOS]: Add an extra layer of protection for freed nonpaged pool: write a 4-byte signature on freed blocks, and assert its valid on checked builds. Use a slightly less egocentric ASCII value than on Windows (name of the developer who wrote the first memory manager). Modified: trunk/reactos/ntoskrnl/mm/ARM3/pool.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/pool.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/pool.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/pool.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/pool.c [iso-8859-1] Sun Aug 29 19:32:25 2010 @@ -298,6 +298,7 @@ FreeEntry = MmNonPagedPoolStart; FirstEntry = FreeEntry; FreeEntry->Size = PoolPages; + FreeEntry->Signature = MM_FREE_POOL_SIGNATURE; FreeEntry->Owner = FirstEntry; // @@ -316,6 +317,7 @@ // FreeEntry = (PMMFREE_POOL_ENTRY)((ULONG_PTR)FreeEntry + PAGE_SIZE); FreeEntry->Owner = FirstEntry; + FreeEntry->Signature = MM_FREE_POOL_SIGNATURE; } // @@ -626,6 +628,7 @@ // Grab the entry and see if it can handle our allocation // FreeEntry = CONTAINING_RECORD(NextEntry, MMFREE_POOL_ENTRY, List); + ASSERT(FreeEntry->Signature == MM_FREE_POOL_SIGNATURE); if (FreeEntry->Size >= SizeInPages) { // @@ -964,6 +967,7 @@ // FreeEntry = (PMMFREE_POOL_ENTRY)((ULONG_PTR)StartingVa + (NumberOfPages << PAGE_SHIFT)); + ASSERT(FreeEntry->Signature == MM_FREE_POOL_SIGNATURE); ASSERT(FreeEntry->Owner == FreeEntry); /* Consume this entry's pages */ @@ -1032,6 +1036,7 @@ // Get the free entry descriptor for that given page range // FreeEntry = (PMMFREE_POOL_ENTRY)((ULONG_PTR)StartingVa - PAGE_SIZE); + ASSERT(FreeEntry->Signature == MM_FREE_POOL_SIGNATURE); FreeEntry = FreeEntry->Owner; /* Check if protected pool is enabled */ @@ -1118,6 +1123,7 @@ // Link back to the parent free entry, and keep going // NextEntry->Owner = FreeEntry; + NextEntry->Signature = MM_FREE_POOL_SIGNATURE; NextEntry = (PMMFREE_POOL_ENTRY)((ULONG_PTR)NextEntry + PAGE_SIZE); } while (NextEntry != LastEntry);

1 0

[sir_richard] 48650: [NTOS]: Missed a bunch of codepaths, protected pool "should" work now.
by sir_richard＠svn.reactos.org 29 Aug '10

29 Aug '10

Author: sir_richard Date: Sun Aug 29 19:27:58 2010 New Revision: 48650 URL: http://svn.reactos.org/svn/reactos?rev=48650&view=rev Log: [NTOS]: Missed a bunch of codepaths, protected pool "should" work now. Modified: trunk/reactos/ntoskrnl/include/internal/mm.h trunk/reactos/ntoskrnl/mm/ARM3/pool.c Modified: trunk/reactos/ntoskrnl/include/internal/mm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/mm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/mm.h [iso-8859-1] Sun Aug 29 19:27:58 2010 @@ -435,6 +435,9 @@ struct _MMFREE_POOL_ENTRY *Owner; } MMFREE_POOL_ENTRY, *PMMFREE_POOL_ENTRY; +/* Signature of a freed block */ +#define MM_FREE_POOL_SIGNATURE 'ARM3' + /* Paged pool information */ typedef struct _MM_PAGED_POOL_INFO { Modified: trunk/reactos/ntoskrnl/mm/ARM3/pool.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/pool.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/pool.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/pool.c [iso-8859-1] Sun Aug 29 19:27:58 2010 @@ -615,6 +615,13 @@ NextEntry = NextHead->Flink; while (NextEntry != NextHead) { + /* Is freed non paged pool enabled */ + if (MmProtectFreedNonPagedPool) + { + /* We need to be able to touch this page, unprotect it */ + MiUnProtectFreeNonPagedPool(NextEntry, 0); + } + // // Grab the entry and see if it can handle our allocation // @@ -632,23 +639,31 @@ BaseVa = (PVOID)((ULONG_PTR)FreeEntry + (FreeEntry->Size << PAGE_SHIFT)); - // - // This is not a free page segment anymore - // - RemoveEntryList(&FreeEntry->List); + /* Remove the item from the list, depending if pool is protected */ + MmProtectFreedNonPagedPool ? + MiProtectedPoolRemoveEntryList(&FreeEntry->List) : + RemoveEntryList(&FreeEntry->List); // // However, check if its' still got space left // if (FreeEntry->Size != 0) { - // - // Insert it back into a different list, based on its pages - // + /* Check which list to insert this entry into */ i = FreeEntry->Size - 1; if (i >= MI_MAX_FREE_PAGE_LISTS) i = MI_MAX_FREE_PAGE_LISTS - 1; - InsertTailList (&MmNonPagedPoolFreeListHead[i], - &FreeEntry->List); + + /* Insert the entry into the free list head, check for prot. pool */ + MmProtectFreedNonPagedPool ? + MiProtectedPoolInsertList(&MmNonPagedPoolFreeListHead[i], &FreeEntry->List, TRUE) : + InsertTailList(&MmNonPagedPoolFreeListHead[i], &FreeEntry->List); + + /* Is freed non paged pool protected? */ + if (MmProtectFreedNonPagedPool) + { + /* Protect the freed pool! */ + MiProtectFreeNonPagedPool(FreeEntry, FreeEntry->Size); + } } // @@ -698,6 +713,13 @@ // Try the next free page entry // NextEntry = FreeEntry->List.Flink; + + /* Is freed non paged pool protected? */ + if (MmProtectFreedNonPagedPool) + { + /* Protect the freed pool! */ + MiProtectFreeNonPagedPool(FreeEntry, FreeEntry->Size); + } } } while (++NextHead < LastHead); @@ -1095,7 +1117,7 @@ // // Link back to the parent free entry, and keep going // - NextEntry->Owner = FreeEntry; + NextEntry->Owner = FreeEntry; NextEntry = (PMMFREE_POOL_ENTRY)((ULONG_PTR)NextEntry + PAGE_SIZE); } while (NextEntry != LastEntry);

1 0

[sir_richard] 48649: [NTOS]: Add DRIVER_CAUGHT_MODIFYING_FREED_POOL bugcheck code. [NTOS]: Add support for protected freed nonpaged pool. This is controlled through MmProtectFreedNonPagedPool, whic...
by sir_richard＠svn.reactos.org 29 Aug '10

29 Aug '10

Author: sir_richard Date: Sun Aug 29 19:13:08 2010 New Revision: 48649 URL: http://svn.reactos.org/svn/reactos?rev=48649&view=rev Log: [NTOS]: Add DRIVER_CAUGHT_MODIFYING_FREED_POOL bugcheck code. [NTOS]: Add support for protected freed nonpaged pool. This is controlled through MmProtectFreedNonPagedPool, which is initialized based on a registry value (see cmdata.c). This is not "Special Pool", but a useful debugging feature Windows implements that we now have too, since I noticed a lot of mj's work was with freed pool access. NB. It's 3AM and I have not tested this, it should be off in trunk by default, you'll need to try turning it on and testing it. Hope it helps. --This line, and those low, will be ignored-- M ntoskrnl/mm/ARM3/pagfault.c M ntoskrnl/mm/ARM3/pool.c M include/reactos/mc/bugcodes.mc Modified: trunk/reactos/include/reactos/mc/bugcodes.mc trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c trunk/reactos/ntoskrnl/mm/ARM3/pool.c Modified: trunk/reactos/include/reactos/mc/bugcodes.mc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/mc/bugcode… ============================================================================== --- trunk/reactos/include/reactos/mc/bugcodes.mc [iso-8859-1] (original) +++ trunk/reactos/include/reactos/mc/bugcodes.mc [iso-8859-1] Sun Aug 29 19:13:08 2010 @@ -1311,6 +1311,16 @@ and then select Safe Mode. . +MessageId=0xC6 +Severity=Success +Facility=System +SymbolicName=DRIVER_CAUGHT_MODIFYING_FREED_POOL +Language=English +A device driver attempting to corrupt the system has been caught. +The faulty driver currently on the kernel stack must be replaced +with a working version. +. + MessageId=0xC8 Severity=Success Facility=System Modified: trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/pagfault.… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c [iso-8859-1] Sun Aug 29 19:13:08 2010 @@ -620,10 +620,28 @@ return STATUS_SUCCESS; } - // - // We don't implement prototype PTEs - // - ASSERT(TempPte.u.Soft.Prototype == 0); + /* Check one kind of prototype PTE */ + if (TempPte.u.Soft.Prototype) + { + /* The one used for protected pool... */ + ASSERT(MmProtectFreedNonPagedPool == TRUE); + + /* Make sure protected pool is on, and that this is a pool address */ + if ((MmProtectFreedNonPagedPool) && + (((Address >= MmNonPagedPoolStart) && + (Address < (PVOID)((ULONG_PTR)MmNonPagedPoolStart + + MmSizeOfNonPagedPoolInBytes))) || + ((Address >= MmNonPagedPoolExpansionStart) && + (Address < MmNonPagedPoolEnd)))) + { + /* Bad boy, bad boy, whatcha gonna do, whatcha gonna do when ARM3 comes for you! */ + KeBugCheckEx(DRIVER_CAUGHT_MODIFYING_FREED_POOL, + (ULONG_PTR)Address, + StoreInstruction, + Mode, + 4); + } + } // // We don't implement transition PTEs Modified: trunk/reactos/ntoskrnl/mm/ARM3/pool.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/pool.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/pool.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/pool.c [iso-8859-1] Sun Aug 29 19:13:08 2010 @@ -33,6 +33,150 @@ VOID NTAPI +MiProtectFreeNonPagedPool(IN PVOID VirtualAddress, + IN ULONG PageCount) +{ + PMMPTE PointerPte, LastPte; + MMPTE TempPte; + + /* If pool is physical, can't protect PTEs */ + if (MI_IS_PHYSICAL_ADDRESS(VirtualAddress)) return; + + /* Get PTE pointers and loop */ + PointerPte = MiAddressToPte(VirtualAddress); + LastPte = PointerPte + PageCount; + do + { + /* Capture the PTE for safety */ + TempPte = *PointerPte; + + /* Mark it as an invalid PTE, set proto bit to recognize it as pool */ + TempPte.u.Hard.Valid = 0; + TempPte.u.Soft.Prototype = 1; + MI_WRITE_INVALID_PTE(PointerPte, TempPte); + } while (++PointerPte < LastPte); + + /* Flush the TLB */ + KeFlushEntireTb(TRUE, TRUE); +} + +BOOLEAN +NTAPI +MiUnProtectFreeNonPagedPool(IN PVOID VirtualAddress, + IN ULONG PageCount) +{ + PMMPTE PointerPte; + MMPTE TempPte; + PFN_NUMBER UnprotectedPages = 0; + + /* If pool is physical, can't protect PTEs */ + if (MI_IS_PHYSICAL_ADDRESS(VirtualAddress)) return FALSE; + + /* Get, and capture the PTE */ + PointerPte = MiAddressToPte(VirtualAddress); + TempPte = *PointerPte; + + /* Loop protected PTEs */ + while ((TempPte.u.Hard.Valid == 0) && (TempPte.u.Soft.Prototype == 1)) + { + /* Unprotect the PTE */ + TempPte.u.Hard.Valid = 1; + TempPte.u.Soft.Prototype = 0; + MI_WRITE_VALID_PTE(PointerPte, TempPte); + + /* One more page */ + if (++UnprotectedPages == PageCount) break; + + /* Capture next PTE */ + TempPte = *(++PointerPte); + } + + /* Return if any pages were unprotected */ + return UnprotectedPages ? TRUE : FALSE; +} + +VOID +FORCEINLINE +MiProtectedPoolUnProtectLinks(IN PLIST_ENTRY Links, + OUT PVOID* PoolFlink, + OUT PVOID* PoolBlink) +{ + BOOLEAN Safe; + PVOID PoolVa; + + /* Initialize variables */ + *PoolFlink = *PoolBlink = NULL; + + /* Check if the list has entries */ + if (IsListEmpty(Links) == FALSE) + { + /* We are going to need to forward link to do an insert */ + PoolVa = Links->Flink; + + /* So make it safe to access */ + Safe = MiUnProtectFreeNonPagedPool(PoolVa, 1); + if (Safe) PoolFlink = PoolVa; + } + + /* Are we going to need a backward link too? */ + if (Links != Links->Blink) + { + /* Get the head's backward link for the insert */ + PoolVa = Links->Blink; + + /* Make it safe to access */ + Safe = MiUnProtectFreeNonPagedPool(PoolVa, 1); + if (Safe) PoolBlink = PoolVa; + } +} + +VOID +FORCEINLINE +MiProtectedPoolProtectLinks(IN PVOID PoolFlink, + IN PVOID PoolBlink) +{ + /* Reprotect the pages, if they got unprotected earlier */ + if (PoolFlink) MiProtectFreeNonPagedPool(PoolFlink, 1); + if (PoolBlink) MiProtectFreeNonPagedPool(PoolBlink, 1); +} + +VOID +NTAPI +MiProtectedPoolInsertList(IN PLIST_ENTRY ListHead, + IN PLIST_ENTRY Entry, + IN BOOLEAN Critical) +{ + PVOID PoolFlink, PoolBlink; + + /* Make the list accessible */ + MiProtectedPoolUnProtectLinks(ListHead, &PoolFlink, &PoolBlink); + + /* Now insert in the right position */ + Critical ? InsertHeadList(ListHead, Entry) : InsertTailList(ListHead, Entry); + + /* And reprotect the pages containing the free links */ + MiProtectedPoolProtectLinks(PoolFlink, PoolBlink); +} + +VOID +NTAPI +MiProtectedPoolRemoveEntryList(IN PLIST_ENTRY Entry) +{ + PVOID PoolFlink, PoolBlink; + + /* Make the list accessible */ + MiProtectedPoolUnProtectLinks(Entry, &PoolFlink, &PoolBlink); + + /* Now remove */ + RemoveEntryList(Entry); + + /* And reprotect the pages containing the free links */ + if (PoolFlink) MiProtectFreeNonPagedPool(PoolFlink, 1); + if (PoolBlink) MiProtectFreeNonPagedPool(PoolBlink, 1); +} + +VOID +NTAPI MiInitializeNonPagedPoolThresholds(VOID) { PFN_NUMBER Size = MmMaximumNonPagedPoolInPages; @@ -245,7 +389,7 @@ // // Handle paged pool // - if (PoolType == PagedPool) + if ((PoolType & BASE_POOL_TYPE_MASK) == PagedPool) { // // Lock the paged pool mutex @@ -755,12 +899,21 @@ } else { + /* Sanity check */ + ASSERT((ULONG_PTR)StartingVa + NumberOfPages <= (ULONG_PTR)MmNonPagedPoolEnd); + + /* Check if protected pool is enabled */ + if (MmProtectFreedNonPagedPool) + { + /* The freed block will be merged, it must be made accessible */ + MiUnProtectFreeNonPagedPool(MiPteToAddress(PointerPte), 0); + } + // // Otherwise, our entire allocation must've fit within the initial non // paged pool, or the expansion nonpaged pool, so get the PFN entry of // the next allocation // - ASSERT((ULONG_PTR)StartingVa + NumberOfPages <= (ULONG_PTR)MmNonPagedPoolEnd); if (PointerPte->u.Hard.Valid == 1) { // @@ -791,11 +944,13 @@ (NumberOfPages << PAGE_SHIFT)); ASSERT(FreeEntry->Owner == FreeEntry); - // - // Consume this entry's pages, and remove it from its free list - // + /* Consume this entry's pages */ FreePages += FreeEntry->Size; - RemoveEntryList (&FreeEntry->List); + + /* Remove the item from the list, depending if pool is protected */ + MmProtectFreedNonPagedPool ? + MiProtectedPoolRemoveEntryList(&FreeEntry->List) : + RemoveEntryList(&FreeEntry->List); } // @@ -819,6 +974,15 @@ // Otherwise, get the PTE for the page right before our allocation // PointerPte -= NumberOfPages + 1; + + /* Check if protected pool is enabled */ + if (MmProtectFreedNonPagedPool) + { + /* The freed block will be merged, it must be made accessible */ + MiUnProtectFreeNonPagedPool(MiPteToAddress(PointerPte), 0); + } + + /* Check if this is valid pool, or a guard page */ if (PointerPte->u.Hard.Valid == 1) { // @@ -848,6 +1012,13 @@ FreeEntry = (PMMFREE_POOL_ENTRY)((ULONG_PTR)StartingVa - PAGE_SIZE); FreeEntry = FreeEntry->Owner; + /* Check if protected pool is enabled */ + if (MmProtectFreedNonPagedPool) + { + /* The freed block will be merged, it must be made accessible */ + MiUnProtectFreeNonPagedPool(FreeEntry, 0); + } + // // Check if the entry is small enough to be indexed on a free list // If it is, we'll want to re-insert it, since we're about to @@ -855,10 +1026,10 @@ // if (FreeEntry->Size < (MI_MAX_FREE_PAGE_LISTS - 1)) { - // - // Remove the list from where it is now - // - RemoveEntryList(&FreeEntry->List); + /* Remove the item from the list, depending if pool is protected */ + MmProtectFreedNonPagedPool ? + MiProtectedPoolRemoveEntryList(&FreeEntry->List) : + RemoveEntryList(&FreeEntry->List); // // Update its size @@ -871,10 +1042,10 @@ i = (ULONG)(FreeEntry->Size - 1); if (i >= MI_MAX_FREE_PAGE_LISTS) i = MI_MAX_FREE_PAGE_LISTS - 1; - // - // Do it - // - InsertTailList(&MmNonPagedPoolFreeListHead[i], &FreeEntry->List); + /* Insert the entry into the free list head, check for prot. pool */ + MmProtectFreedNonPagedPool ? + MiProtectedPoolInsertList(&MmNonPagedPoolFreeListHead[i], &FreeEntry->List, TRUE) : + InsertTailList(&MmNonPagedPoolFreeListHead[i], &FreeEntry->List); } else { @@ -902,10 +1073,10 @@ i = FreeEntry->Size - 1; if (i >= MI_MAX_FREE_PAGE_LISTS) i = MI_MAX_FREE_PAGE_LISTS - 1; - // - // And insert us - // - InsertTailList (&MmNonPagedPoolFreeListHead[i], &FreeEntry->List); + /* Insert the entry into the free list head, check for prot. pool */ + MmProtectFreedNonPagedPool ? + MiProtectedPoolInsertList(&MmNonPagedPoolFreeListHead[i], &FreeEntry->List, TRUE) : + InsertTailList(&MmNonPagedPoolFreeListHead[i], &FreeEntry->List); } // @@ -927,6 +1098,13 @@ NextEntry->Owner = FreeEntry; NextEntry = (PMMFREE_POOL_ENTRY)((ULONG_PTR)NextEntry + PAGE_SIZE); } while (NextEntry != LastEntry); + + /* Is freed non paged pool protected? */ + if (MmProtectFreedNonPagedPool) + { + /* Protect the freed pool! */ + MiProtectFreeNonPagedPool(FreeEntry, FreeEntry->Size); + } // // We're done, release the lock and let the caller know how much we freed

1 0

[cgutman] 48648: [ACPI] - Read and report ACPI_RESOURCE_TYPE_FIXED_MEMORY32
by cgutman＠svn.reactos.org 29 Aug '10

29 Aug '10

Author: cgutman Date: Sun Aug 29 18:40:33 2010 New Revision: 48648 URL: http://svn.reactos.org/svn/reactos?rev=48648&view=rev Log: [ACPI] - Read and report ACPI_RESOURCE_TYPE_FIXED_MEMORY32 Modified: trunk/reactos/drivers/bus/acpi/buspdo.c Modified: trunk/reactos/drivers/bus/acpi/buspdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/buspdo.c?… ============================================================================== --- trunk/reactos/drivers/bus/acpi/buspdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/buspdo.c [iso-8859-1] Sun Aug 29 18:40:33 2010 @@ -727,6 +727,7 @@ case ACPI_RESOURCE_TYPE_EXTENDED_ADDRESS64: case ACPI_RESOURCE_TYPE_MEMORY24: case ACPI_RESOURCE_TYPE_MEMORY32: + case ACPI_RESOURCE_TYPE_FIXED_MEMORY32: case ACPI_RESOURCE_TYPE_IO: { NumberOfResources++; @@ -1044,6 +1045,22 @@ ResourceDescriptor->u.Memory.Start.QuadPart = mem32_data->Minimum; ResourceDescriptor->u.Memory.Length = mem32_data->AddressLength; + ResourceDescriptor++; + break; + } + case ACPI_RESOURCE_TYPE_FIXED_MEMORY32: + { + ACPI_RESOURCE_FIXED_MEMORY32 *memfixed32_data = (ACPI_RESOURCE_FIXED_MEMORY32*) &resource->Data; + ResourceDescriptor->Type = CmResourceTypeMemory; + ResourceDescriptor->ShareDisposition = CmResourceShareDeviceExclusive; + ResourceDescriptor->Flags = 0; + if (memfixed32_data->WriteProtect == ACPI_READ_ONLY_MEMORY) + ResourceDescriptor->Flags |= CM_RESOURCE_MEMORY_READ_ONLY; + else + ResourceDescriptor->Flags |= CM_RESOURCE_MEMORY_READ_WRITE; + ResourceDescriptor->u.Memory.Start.QuadPart = memfixed32_data->Address; + ResourceDescriptor->u.Memory.Length = memfixed32_data->AddressLength; + ResourceDescriptor++; break; } @@ -1142,6 +1159,7 @@ case ACPI_RESOURCE_TYPE_EXTENDED_ADDRESS64: case ACPI_RESOURCE_TYPE_MEMORY24: case ACPI_RESOURCE_TYPE_MEMORY32: + case ACPI_RESOURCE_TYPE_FIXED_MEMORY32: case ACPI_RESOURCE_TYPE_IO: { NumberOfResources++; @@ -1482,6 +1500,24 @@ RequirementDescriptor++; break; } + case ACPI_RESOURCE_TYPE_FIXED_MEMORY32: + { + ACPI_RESOURCE_FIXED_MEMORY32 *fixedmem32_data = (ACPI_RESOURCE_FIXED_MEMORY32*) &resource->Data; + RequirementDescriptor->Option = CurrentRes ? 0 : IO_RESOURCE_PREFERRED; + RequirementDescriptor->Type = CmResourceTypeMemory; + RequirementDescriptor->ShareDisposition = CmResourceShareDeviceExclusive; + RequirementDescriptor->Flags = 0; + if (fixedmem32_data->WriteProtect == ACPI_READ_ONLY_MEMORY) + RequirementDescriptor->Flags |= CM_RESOURCE_MEMORY_READ_ONLY; + else + RequirementDescriptor->Flags |= CM_RESOURCE_MEMORY_READ_WRITE; + RequirementDescriptor->u.Memory.MinimumAddress.QuadPart = fixedmem32_data->Address; + RequirementDescriptor->u.Memory.MaximumAddress.QuadPart = fixedmem32_data->Address; + RequirementDescriptor->u.Memory.Length = fixedmem32_data->AddressLength; + + RequirementDescriptor++; + break; + } default: { break;

1 0

[akhaldi] 48647: [CMAKE] - Improve kernel32.
by akhaldi＠svn.reactos.org 29 Aug '10

29 Aug '10

Author: akhaldi Date: Sun Aug 29 18:32:17 2010 New Revision: 48647 URL: http://svn.reactos.org/svn/reactos?rev=48647&view=rev Log: [CMAKE] - Improve kernel32. Modified: branches/cmake-bringup/dll/win32/kernel32/CMakeLists.txt Modified: branches/cmake-bringup/dll/win32/kernel32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/kernel3… ============================================================================== --- branches/cmake-bringup/dll/win32/kernel32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/kernel32/CMakeLists.txt [iso-8859-1] Sun Aug 29 18:32:17 2010 @@ -1,3 +1,4 @@ + set(CMAKE_C_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>") add_definitions(-D_KERNEL32_) @@ -7,21 +8,106 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/subsys) -file(GLOB_RECURSE SOURCE "*.c") - -file(GLOB_RECURSE ARCH_SOURCE "${CMAKE_CURRENT_SOURCE_DIR}/thread/${ARCH}/*.s") +list(APPEND SOURCE + debug/debugger.c + debug/output.c + except/except.c + file/backup.c + file/bintype.c + file/cnotify.c + file/copy.c + file/create.c + file/curdir.c + file/delete.c + file/deviceio.c + file/dir.c + file/dosdev.c + file/file.c + file/find.c + file/hardlink.c + file/iocompl.c + file/lfile.c + file/lock.c + file/mailslot.c + file/move.c + file/npipe.c + file/pipe.c + file/rw.c + file/tape.c + file/volume.c + mem/global.c + mem/heap.c + mem/isbad.c + mem/local.c + mem/procmem.c + mem/resnotify.c + mem/section.c + mem/virtual.c + misc/actctx.c + misc/atom.c + misc/casemap.c + misc/chartype.c + misc/collation.c + misc/comm.c + misc/commdcb.c + misc/computername.c + misc/console.c + misc/dllmain.c + misc/env.c + misc/error.c + misc/fold.c + misc/format_msg.c + misc/handle.c + misc/lang.c + misc/lcformat.c + misc/ldr.c + misc/lzexpand.c + misc/muldiv.c + misc/nls.c + misc/perfcnt.c + misc/power.c + misc/profile.c + misc/recovery.c + misc/res.c + misc/sortkey.c + misc/stubs.c + misc/sysinfo.c + misc/time.c + misc/timerqueue.c + misc/toolhelp.c + misc/utils.c + misc/version.c + process/cmdline.c + process/procsup.c + process/job.c + process/proc.c + process/session.c + string/lstring.c + synch/condvar.c + synch/critical.c + synch/event.c + synch/mutex.c + synch/sem.c + synch/timer.c + synch/wait.c + thread/fiber.c + thread/fls.c + thread/thread.c + thread/tls.c + thread/${ARCH}/fiber.S + thread/${ARCH}/thread.S + kernel32.rc + kernel32_stubs.c) add_library(kernel32 SHARED - ${SOURCE} - ${ARCH_SOURCE} - ${CMAKE_CURRENT_SOURCE_DIR}/kernel32.rc - ${CMAKE_CURRENT_BINARY_DIR}/kernel32_k32.h.gch) + ${SOURCE} + ${CMAKE_CURRENT_BINARY_DIR}/kernel32_k32.h.gch) set_target_properties(kernel32 PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") target_link_libraries(kernel32 ${CMAKE_CURRENT_SOURCE_DIR}/kernel32.def - pseh - ${REACTOS_SOURCE_DIR}/dll/ntdll/libntdll.a) + pseh + ${REACTOS_SOURCE_DIR}/dll/ntdll/libntdll.a) add_pch(kernel32 ${CMAKE_CURRENT_SOURCE_DIR}/k32.h ${SOURCE}) add_dependencies(kernel32 errcodes version)

1 0

[mjmartin] 48646: [cdfs] - Working with Pierre Schweitzer for yet another NonPaged Pool corruption fix. When copying VolumeLabel the VolumeLabelLength is in Unicode, so theres no need to mulitply i...
by mjmartin＠svn.reactos.org 29 Aug '10

29 Aug '10

Author: mjmartin Date: Sun Aug 29 17:46:18 2010 New Revision: 48646 URL: http://svn.reactos.org/svn/reactos?rev=48646&view=rev Log: [cdfs] - Working with Pierre Schweitzer for yet another NonPaged Pool corruption fix. When copying VolumeLabel the VolumeLabelLength is in Unicode, so theres no need to mulitply it by size of WCHAR. Modified: trunk/reactos/drivers/filesystems/cdfs/fsctl.c Modified: trunk/reactos/drivers/filesystems/cdfs/fsctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/fsctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs/fsctl.c [iso-8859-1] Sun Aug 29 17:46:18 2010 @@ -359,7 +359,7 @@ Vpb->SerialNumber = CdInfo.SerialNumber; Vpb->VolumeLabelLength = CdInfo.VolumeLabelLength; - RtlCopyMemory(Vpb->VolumeLabel, CdInfo.VolumeLabel, CdInfo.VolumeLabelLength * sizeof(WCHAR)); + RtlCopyMemory(Vpb->VolumeLabel, CdInfo.VolumeLabel, CdInfo.VolumeLabelLength); RtlCopyMemory(&DeviceExt->CdInfo, &CdInfo, sizeof(CDINFO)); NewDeviceObject->Vpb = DeviceToMount->Vpb;

1 0

[akhaldi] 48645: [CMAKE] - Add hal (yes, hal) to build.
by akhaldi＠svn.reactos.org 29 Aug '10

29 Aug '10

Author: akhaldi Date: Sun Aug 29 17:30:24 2010 New Revision: 48645 URL: http://svn.reactos.org/svn/reactos?rev=48645&view=rev Log: [CMAKE] - Add hal (yes, hal) to build. Added: branches/cmake-bringup/hal/CMakeLists.txt (with props) branches/cmake-bringup/hal/halx86/hal_i386.def (with props) branches/cmake-bringup/ntoskrnl/libntoskrnl.a (with props) Modified: branches/cmake-bringup/CMakeLists.txt Modified: branches/cmake-bringup/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/CMakeLists.txt?re… ============================================================================== --- branches/cmake-bringup/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/CMakeLists.txt [iso-8859-1] Sun Aug 29 17:30:24 2010 @@ -89,6 +89,7 @@ add_subdirectory(base) add_subdirectory(dll) +add_subdirectory(hal) add_subdirectory(lib) # nci generated intermediate files Added: branches/cmake-bringup/hal/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/hal/CMakeLists.tx… ============================================================================== --- branches/cmake-bringup/hal/CMakeLists.txt (added) +++ branches/cmake-bringup/hal/CMakeLists.txt [iso-8859-1] Sun Aug 29 17:30:24 2010 @@ -1,0 +1,72 @@ + +if(ARCH MATCHES i386) + +add_definitions(-D_NTHALDLL_) +add_definitions(-D_NTHAL_) + +include_directories(halx86/include) +include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) + +list(APPEND HAL_GENERIC_SOURCE + halx86/generic/beep.c + halx86/generic/cmos.c + halx86/generic/display.c + halx86/generic/dma.c + halx86/generic/drive.c + halx86/generic/memory.c + halx86/generic/misc.c + halx86/generic/profil.c + halx86/generic/reboot.c + halx86/generic/sysinfo.c + halx86/generic/timer.c + halx86/generic/usage.c) + +list(APPEND HAL_GENERIC_SOURCE + halx86/generic/bios.c + halx86/generic/halinit.c + halx86/generic/i386/portio.c + halx86/generic/i386/systimer.S + halx86/generic/i386/trap.S) + +add_library(hal_generic ${HAL_GENERIC_SOURCE} ${CMAKE_CURRENT_BINARY_DIR}/hal_generic_hal.h.gch) +add_pch(hal_generic ${CMAKE_CURRENT_SOURCE_DIR}/halx86/include/hal.h ${HAL_GENERIC_SOURCE}) +add_dependencies(hal_generic psdk bugcodes) + +list(APPEND HAL_GENERIC_PCAT_SOURCE + halx86/generic/legacy/bus/bushndlr.c + halx86/generic/legacy/bus/cmosbus.c + halx86/generic/legacy/bus/isabus.c + halx86/generic/legacy/bus/pcibus.c + halx86/generic/legacy/bus/pcidata.c + halx86/generic/legacy/bus/sysbus.c + halx86/generic/legacy/bussupp.c + halx86/generic/legacy/halpcat.c) + +add_library(hal_generic_pcat ${HAL_GENERIC_PCAT_SOURCE}) +add_dependencies(hal_generic_pcat psdk) + +list(APPEND HAL_GENERIC_UP_SOURCE + halx86/generic/spinlock.c + halx86/up/pic.c + halx86/up/processor.c) + +add_library(hal_generic_up ${HAL_GENERIC_UP_SOURCE}) +add_dependencies(hal_generic_up psdk) + +set(CMAKE_C_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>") + +add_library(hal SHARED halx86/up/halinit_up.c halx86/up/halup.rc) + +set_target_properties(hal PROPERTIES LINK_FLAGS "-Wl,-entry,_HalInitSystem@8") + +target_link_libraries(hal + ${CMAKE_CURRENT_SOURCE_DIR}/halx86/hal_i386.def + -Wl,--whole-archive hal_generic -Wl,--no-whole-archive + hal_generic_pcat + hal_generic_up + ${REACTOS_SOURCE_DIR}/ntoskrnl/libntoskrnl.a + libcntpr) + +else() +#TBD +endif(ARCH MATCHES i386) Propchange: branches/cmake-bringup/hal/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/hal/halx86/hal_i386.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/hal/halx86/hal_i3… ============================================================================== --- branches/cmake-bringup/hal/halx86/hal_i386.def (added) +++ branches/cmake-bringup/hal/halx86/hal_i386.def [iso-8859-1] Sun Aug 29 17:30:24 2010 @@ -1,0 +1,97 @@ + +LIBRARY hal.dll + +EXPORTS + @ExAcquireFastMutex@4=ntoskrnl.ExiAcquireFastMutex @1 + @ExReleaseFastMutex@4=ntoskrnl.ExiReleaseFastMutex @2 + @ExTryToAcquireFastMutex@4=ntoskrnl.ExiTryToAcquireFastMutex @3 + @HalClearSoftwareInterrupt@4 @4 + @HalRequestSoftwareInterrupt@4 @5 + @HalSystemVectorDispatchEntry@12 @6 + @KeAcquireInStackQueuedSpinLock@8 @7 + @KeAcquireInStackQueuedSpinLockRaiseToSynch@8 @8 + @KeAcquireSpinLockRaiseToSynch@4 @9 + @KeAcquireQueuedSpinLock@4 @10 + @KeAcquireQueuedSpinLockRaiseToSynch@4 @11 + @KeReleaseInStackQueuedSpinLock@4 @12 + @KeReleaseQueuedSpinLock@8 @13 + @KeTryToAcquireQueuedSpinLock@8 @14 + @KeTryToAcquireQueuedSpinLockRaiseToSynch@8 @15 + @KfAcquireSpinLock@4 @16 + @KfLowerIrql@4 @17 + @KfRaiseIrql@4 @18 + @KfReleaseSpinLock@8 @19 + HalAcquireDisplayOwnership@4 @20 + HalAdjustResourceList@4 @21 + HalAllProcessorsStarted@0 @22 + HalAllocateAdapterChannel@16 @23 + HalAllocateCommonBuffer@16 @24 + HalAllocateCrashDumpRegisters@8 @25 + HalAssignSlotResources@32 @26 + HalBeginSystemInterrupt@12 @27 + HalCalibratePerformanceCounter@12 @28 + HalDisableSystemInterrupt@8 @29 + HalDisplayString@4 @30 + HalEnableSystemInterrupt@12 @31 + HalEndSystemInterrupt@8 @32 + HalFlushCommonBuffer@20 @33 + HalFreeCommonBuffer@24 @34 + HalGetAdapter@8 @35 + HalGetBusData@20 @36 + HalGetBusDataByOffset@24 @37 + HalGetEnvironmentVariable@12 @38 + HalGetInterruptVector@24 @39 + HalHandleNMI@4 @40 + HalInitSystem@8 @41 + HalInitializeProcessor@8 @42 + HalMakeBeep@4 @43 + HalProcessorIdle@0 @44 + HalPutDmaAdapter@4 @45 + HalQueryDisplayParameters@16 @46 + HalQueryRealTimeClock@4 @47 + HalReadDmaCounter@4 @48 + HalReportResourceUsage@0 @49 + HalRequestIpi@4 @50 + HalReturnToFirmware@4 @51 + HalSetBusData@20 @52 + HalSetBusDataByOffset@24 @53 + HalSetDisplayParameters@8 @54 + HalSetEnvironmentVariable@8 @55 + HalSetProfileInterval@4 @56 + HalSetRealTimeClock@4 @57 + HalSetTimeIncrement@4 @58 + HalStartNextProcessor@8 @59 + HalStartProfileInterrupt@4 @60 + HalStopProfileInterrupt@4 @61 + HalTranslateBusAddress@24 @62 + IoFlushAdapterBuffers@24 @63 + IoFreeAdapterChannel@4 @64 + IoFreeMapRegisters@12 @65 + IoMapTransfer@24 @66 + IoAssignDriveLetters@16=HalpAssignDriveLetters@16 @67 + IoReadPartitionTable@16=HalpReadPartitionTable@16 @68 + IoSetPartitionInformation@16=HalpSetPartitionInformation@16 @69 + IoWritePartitionTable@20=HalpWritePartitionTable@20 @70 + KeAcquireSpinLock@8 @71 + KdComPortInUse @72 DATA + KeFlushWriteBuffer@0 @73 + KeGetCurrentIrql@0 @74 + KeLowerIrql@4 @75 + KeQueryPerformanceCounter@4 @76 + KeRaiseIrql@8 @77 + KeRaiseIrqlToDpcLevel@0 @78 + KeRaiseIrqlToSynchLevel@0 @79 + KeReleaseSpinLock@8 @80 + KeStallExecutionProcessor@4 @81 + READ_PORT_BUFFER_UCHAR@12 @82 + READ_PORT_BUFFER_ULONG@12 @83 + READ_PORT_BUFFER_USHORT@12 @84 + READ_PORT_UCHAR@4 @85 + READ_PORT_ULONG@4 @86 + READ_PORT_USHORT@4 @87 + WRITE_PORT_BUFFER_UCHAR@12 @88 + WRITE_PORT_BUFFER_ULONG@12 @89 + WRITE_PORT_BUFFER_USHORT@12 @90 + WRITE_PORT_UCHAR@8 @91 + WRITE_PORT_ULONG@8 @92 + WRITE_PORT_USHORT@8 @93 Propchange: branches/cmake-bringup/hal/halx86/hal_i386.def ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/ntoskrnl/libntoskrnl.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/libntosk… ============================================================================== Binary file - no diff available. Propchange: branches/cmake-bringup/ntoskrnl/libntoskrnl.a ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream

1 0

[akhaldi] 48644: [CMAKE] - Add samsrv, sccbase, schannel, sensapi, serialui, shdoclc, shfolder, shlwapi, slbcsp, smdll, sndblst, snmpapi, spoolss, srclient, sxs, t2embed, tapi32, tapiui, traffic, u...
by akhaldi＠svn.reactos.org 29 Aug '10

29 Aug '10

Author: akhaldi Date: Sun Aug 29 14:13:38 2010 New Revision: 48644 URL: http://svn.reactos.org/svn/reactos?rev=48644&view=rev Log: [CMAKE] - Add samsrv, sccbase, schannel, sensapi, serialui, shdoclc, shfolder, shlwapi, slbcsp, smdll, sndblst, snmpapi, spoolss, srclient, sxs, t2embed, tapi32, tapiui, traffic, updspapi, url, usp10 and uxtheme to build. - Add mlang, mpr, and shell32 import libs. - Fix shdoclc and shlwapi translations (patches will be sent upstream). - Improve mmebuddy. Added: branches/cmake-bringup/dll/win32/mlang/libmlang.a (with props) branches/cmake-bringup/dll/win32/mpr/libmpr.a (with props) branches/cmake-bringup/dll/win32/samsrv/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/sccbase/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/schannel/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/sensapi/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/serialui/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/shdoclc/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/shell32/libshell32.a (with props) branches/cmake-bringup/dll/win32/shfolder/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/shlwapi/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/slbcsp/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/smdll/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/sndblst/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/snmpapi/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/spoolss/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/srclient/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/sxs/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/t2embed/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/tapi32/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/tapiui/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/traffic/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/updspapi/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/url/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/urlmon/liburlmon.a (with props) branches/cmake-bringup/dll/win32/usp10/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/uxtheme/CMakeLists.txt (with props) Modified: branches/cmake-bringup/dll/win32/CMakeLists.txt branches/cmake-bringup/dll/win32/shdoclc/Es.rc branches/cmake-bringup/dll/win32/shlwapi/shlwapi_Da.rc branches/cmake-bringup/dll/win32/shlwapi/shlwapi_De.rc branches/cmake-bringup/dll/win32/shlwapi/shlwapi_En.rc branches/cmake-bringup/dll/win32/shlwapi/shlwapi_Es.rc branches/cmake-bringup/dll/win32/shlwapi/shlwapi_Fi.rc branches/cmake-bringup/dll/win32/shlwapi/shlwapi_Fr.rc branches/cmake-bringup/dll/win32/shlwapi/shlwapi_Hu.rc branches/cmake-bringup/dll/win32/shlwapi/shlwapi_It.rc branches/cmake-bringup/dll/win32/shlwapi/shlwapi_Ja.rc branches/cmake-bringup/dll/win32/shlwapi/shlwapi_Ko.rc branches/cmake-bringup/dll/win32/shlwapi/shlwapi_Lt.rc branches/cmake-bringup/dll/win32/shlwapi/shlwapi_Nl.rc branches/cmake-bringup/dll/win32/shlwapi/shlwapi_No.rc branches/cmake-bringup/dll/win32/shlwapi/shlwapi_Pl.rc branches/cmake-bringup/dll/win32/shlwapi/shlwapi_Pt.rc branches/cmake-bringup/dll/win32/shlwapi/shlwapi_Ro.rc branches/cmake-bringup/dll/win32/shlwapi/shlwapi_Ru.rc branches/cmake-bringup/dll/win32/shlwapi/shlwapi_Si.rc branches/cmake-bringup/dll/win32/shlwapi/shlwapi_Sk.rc branches/cmake-bringup/dll/win32/shlwapi/shlwapi_Sv.rc branches/cmake-bringup/dll/win32/shlwapi/shlwapi_Tr.rc branches/cmake-bringup/dll/win32/shlwapi/shlwapi_Uk.rc branches/cmake-bringup/dll/win32/shlwapi/shlwapi_Zh.rc branches/cmake-bringup/lib/drivers/sound/mmebuddy/CMakeLists.txt Modified: branches/cmake-bringup/dll/win32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/CMakeLi… ============================================================================== --- branches/cmake-bringup/dll/win32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/CMakeLists.txt [iso-8859-1] Sun Aug 29 14:13:38 2010 @@ -87,4 +87,27 @@ add_subdirectory(rasman) add_subdirectory(resutils) add_subdirectory(samlib) +add_subdirectory(samsrv) +add_subdirectory(sccbase) +add_subdirectory(schannel) +add_subdirectory(sensapi) +add_subdirectory(serialui) +add_subdirectory(shdoclc) +add_subdirectory(shfolder) +add_subdirectory(shlwapi) +add_subdirectory(slbcsp) +add_subdirectory(smdll) +add_subdirectory(sndblst) +add_subdirectory(snmpapi) +add_subdirectory(spoolss) +add_subdirectory(srclient) +add_subdirectory(sxs) +add_subdirectory(t2embed) +add_subdirectory(tapi32) +add_subdirectory(tapiui) +add_subdirectory(traffic) +add_subdirectory(updspapi) +add_subdirectory(url) add_subdirectory(user32) +add_subdirectory(usp10) +add_subdirectory(uxtheme) Added: branches/cmake-bringup/dll/win32/mlang/libmlang.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/mlang/l… ============================================================================== Binary file - no diff available. Propchange: branches/cmake-bringup/dll/win32/mlang/libmlang.a ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: branches/cmake-bringup/dll/win32/mpr/libmpr.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/mpr/lib… ============================================================================== Binary file - no diff available. Propchange: branches/cmake-bringup/dll/win32/mpr/libmpr.a ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: branches/cmake-bringup/dll/win32/samsrv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/samsrv/… ============================================================================== --- branches/cmake-bringup/dll/win32/samsrv/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/samsrv/CMakeLists.txt [iso-8859-1] Sun Aug 29 14:13:38 2010 @@ -1,0 +1,16 @@ + +set(CMAKE_C_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES> -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") + +add_definitions(-DUNICODE -D_UNICODE) + +spec2def(samsrv ${CMAKE_CURRENT_SOURCE_DIR}/samsrv.spec ${CMAKE_CURRENT_BINARY_DIR}/samsrv.def) + +add_library(samsrv SHARED samsrv.c samsrv.rc) + +set_target_properties(samsrv PROPERTIES LINK_FLAGS "-Wl,-entry,0") + +target_link_libraries(samsrv + ${CMAKE_CURRENT_BINARY_DIR}/samsrv.def + mingw_common) + +add_dependencies(samsrv samsrv_def psdk) Propchange: branches/cmake-bringup/dll/win32/samsrv/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/sccbase/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/sccbase… ============================================================================== --- branches/cmake-bringup/dll/win32/sccbase/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/sccbase/CMakeLists.txt [iso-8859-1] Sun Aug 29 14:13:38 2010 @@ -1,0 +1,19 @@ + +set(CMAKE_C_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES> -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +add_definitions(-D__WINESRC__) + +spec2def(sccbase ${CMAKE_CURRENT_SOURCE_DIR}/sccbase.spec ${CMAKE_CURRENT_BINARY_DIR}/sccbase.def) + +add_library(sccbase SHARED main.c) + +set_target_properties(sccbase PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") + +target_link_libraries(sccbase + ${CMAKE_CURRENT_BINARY_DIR}/sccbase.def + wine + mingw_common) + +add_dependencies(sccbase sccbase_def psdk) Propchange: branches/cmake-bringup/dll/win32/sccbase/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/schannel/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/schanne… ============================================================================== --- branches/cmake-bringup/dll/win32/schannel/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/schannel/CMakeLists.txt [iso-8859-1] Sun Aug 29 14:13:38 2010 @@ -1,0 +1,24 @@ + +set(CMAKE_C_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES> -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +add_definitions(-D__WINESRC__) + +spec2def(schannel ${CMAKE_CURRENT_SOURCE_DIR}/schannel.spec ${CMAKE_CURRENT_BINARY_DIR}/schannel.def) + +add_library(schannel SHARED + lsamode.c + schannel_main.c + usermode.c + version.rc) + +set_target_properties(schannel PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") + +target_link_libraries(schannel + ${CMAKE_CURRENT_BINARY_DIR}/schannel.def + wine + -lsecur32 + mingw_common) + +add_dependencies(schannel schannel_def psdk) Propchange: branches/cmake-bringup/dll/win32/schannel/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/sensapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/sensapi… ============================================================================== --- branches/cmake-bringup/dll/win32/sensapi/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/sensapi/CMakeLists.txt [iso-8859-1] Sun Aug 29 14:13:38 2010 @@ -1,0 +1,19 @@ + +set(CMAKE_C_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES> -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +add_definitions(-D__WINESRC__) + +spec2def(sensapi ${CMAKE_CURRENT_SOURCE_DIR}/sensapi.spec ${CMAKE_CURRENT_BINARY_DIR}/sensapi.def) + +add_library(sensapi SHARED sensapi.c) + +set_target_properties(sensapi PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") + +target_link_libraries(sensapi + ${CMAKE_CURRENT_BINARY_DIR}/sensapi.def + wine + mingw_common) + +add_dependencies(sensapi sensapi_def psdk) Propchange: branches/cmake-bringup/dll/win32/sensapi/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/serialui/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/serialu… ============================================================================== --- branches/cmake-bringup/dll/win32/serialui/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/serialui/CMakeLists.txt [iso-8859-1] Sun Aug 29 14:13:38 2010 @@ -1,0 +1,18 @@ + +set(CMAKE_C_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>") + +add_definitions(-DUNICODE -D_UNICODE) + +spec2def(serialui ${CMAKE_CURRENT_SOURCE_DIR}/serialui.spec ${CMAKE_CURRENT_BINARY_DIR}/serialui.def) + +add_library(serialui SHARED serialui.c serialui.rc) + +set_target_properties(serialui PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") + +target_link_libraries(serialui + ${CMAKE_CURRENT_BINARY_DIR}/serialui.def + -luser32 + -lshlwapi + -lkernel32) + +add_dependencies(serialui serialui_def psdk) Propchange: branches/cmake-bringup/dll/win32/serialui/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/shdoclc/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/shdoclc… ============================================================================== --- branches/cmake-bringup/dll/win32/shdoclc/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/shdoclc/CMakeLists.txt [iso-8859-1] Sun Aug 29 14:13:38 2010 @@ -1,0 +1,17 @@ + +set(CMAKE_RC_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES> -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +spec2def(shdoclc ${CMAKE_CURRENT_SOURCE_DIR}/shdoclc.spec ${CMAKE_CURRENT_BINARY_DIR}/shdoclc.def) + +add_library(shdoclc SHARED rsrc.rc) + +set_target_properties(shdoclc PROPERTIES LINK_FLAGS "-Wl,-entry,0") + +target_link_libraries(shdoclc + ${CMAKE_CURRENT_BINARY_DIR}/shdoclc.def + wine + mingw_common) + +add_dependencies(shdoclc shdoclc_def psdk) Propchange: branches/cmake-bringup/dll/win32/shdoclc/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/cmake-bringup/dll/win32/shdoclc/Es.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/shdoclc… ============================================================================== --- branches/cmake-bringup/dll/win32/shdoclc/Es.rc [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/shdoclc/Es.rc [iso-8859-1] Sun Aug 29 14:13:38 2010 @@ -68,7 +68,7 @@ MENUITEM "Guardar en&lace como...", IDM_SAVETARGET MENUITEM "&Imprimir enlace", IDM_PRINTTARGET MENUITEM SEPARATOR - MENUITEM "M&ostrar imagen" IDM_SHOWPICTURE + MENUITEM "M&ostrar imagen", IDM_SHOWPICTURE MENUITEM "G&uardar imagen como...", IDM_SAVEPICTURE MENUITEM "&Enviar por correo...", IDM_MP_EMAILPICTURE MENUITEM "I&mprimir imagen...", IDM_MP_PRINTPICTURE @@ -132,7 +132,7 @@ MENUITEM "&Guardar enlace como...", IDM_SAVETARGET MENUITEM "&Imprimir enlace", IDM_PRINTTARGET MENUITEM SEPARATOR - MENUITEM "Cor&tar" IDM_CUT + MENUITEM "Cor&tar", IDM_CUT MENUITEM "&Copiar", IDM_COPY MENUITEM "C&opiar acceso directo", IDM_COPYSHORTCUT MENUITEM "&Pegar", IDM_PASTE @@ -160,7 +160,7 @@ MENUITEM "Pon&er como fondo", IDM_SETWALLPAPER MENUITEM "Aña&dir al escritorio...", IDM_SETDESKTOPITEM MENUITEM SEPARATOR - MENUITEM "Cor&tar" IDM_CUT + MENUITEM "Cor&tar", IDM_CUT MENUITEM "&Copiar", IDM_COPY MENUITEM "C&opiar acceso directo", IDM_COPYSHORTCUT MENUITEM "Pe&gar", IDM_PASTE @@ -224,7 +224,7 @@ { MENUITEM "Desplazar &aquí", IDM_SCROLL_HERE MENUITEM SEPARATOR - MENUITEM "&Principio" IDM_SCROLL_TOP + MENUITEM "&Principio", IDM_SCROLL_TOP MENUITEM "&Final", IDM_SCROLL_BOTTOM MENUITEM SEPARATOR MENUITEM "Página a&rriba", IDM_SCROLL_PAGEUP Added: branches/cmake-bringup/dll/win32/shell32/libshell32.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/shell32… ============================================================================== Binary file - no diff available. Propchange: branches/cmake-bringup/dll/win32/shell32/libshell32.a ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: branches/cmake-bringup/dll/win32/shfolder/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/shfolde… ============================================================================== --- branches/cmake-bringup/dll/win32/shfolder/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/shfolder/CMakeLists.txt [iso-8859-1] Sun Aug 29 14:13:38 2010 @@ -1,0 +1,20 @@ + +set(CMAKE_RC_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES> -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +add_definitions(-D__WINESRC__) + +spec2def(shfolder ${CMAKE_CURRENT_SOURCE_DIR}/shfolder.spec ${CMAKE_CURRENT_BINARY_DIR}/shfolder.def) + +add_library(shfolder SHARED version.rc) + +set_target_properties(shfolder PROPERTIES LINK_FLAGS "-Wl,-entry,0") + +target_link_libraries(shfolder + ${CMAKE_CURRENT_BINARY_DIR}/shfolder.def + wine + -lshell32 + mingw_common) + +add_dependencies(shfolder shfolder_def psdk) Propchange: branches/cmake-bringup/dll/win32/shfolder/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/shlwapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/shlwapi… ============================================================================== --- branches/cmake-bringup/dll/win32/shlwapi/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/shlwapi/CMakeLists.txt [iso-8859-1] Sun Aug 29 14:13:38 2010 @@ -1,0 +1,51 @@ + +set(CMAKE_C_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES> -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +add_definitions(-D__WINESRC__) + +remove_definitions(-D_WIN32_WINNT=0x502) +add_definitions(-D_WIN32_WINNT=0x600) + +spec2def(shlwapi ${CMAKE_CURRENT_SOURCE_DIR}/shlwapi.spec ${CMAKE_CURRENT_BINARY_DIR}/shlwapi.def) + +add_library(shlwapi SHARED + assoc.c + clist.c + istream.c + msgbox.c + ordinal.c + path.c + reg.c + regstream.c + shlwapi_main.c + stopwatch.c + string.c + thread.c + url.c + wsprintf.c + shlwapi.rc) + +set_target_properties(shlwapi PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") + +target_link_libraries(shlwapi + ${CMAKE_CURRENT_BINARY_DIR}/shlwapi.def + wine + uuid + -luser32 + -lgdi32 + -ladvapi32 + -loleaut32 + -lole32 + -lcomctl32 + -lcomdlg32 + ${REACTOS_SOURCE_DIR}/dll/win32/mpr/libmpr.a + ${REACTOS_SOURCE_DIR}/dll/win32/mlang/libmlang.a + ${REACTOS_SOURCE_DIR}/dll/win32/urlmon/liburlmon.a + ${REACTOS_SOURCE_DIR}/dll/win32/shell32/libshell32.a + -lwinmm + -lversion + mingw_common) + +add_dependencies(shlwapi shlwapi_def psdk) Propchange: branches/cmake-bringup/dll/win32/shlwapi/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/cmake-bringup/dll/win32/shlwapi/shlwapi_Da.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/shlwapi… ============================================================================== --- branches/cmake-bringup/dll/win32/shlwapi/shlwapi_Da.rc [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/shlwapi/shlwapi_Da.rc [iso-8859-1] Sun Aug 29 14:13:38 2010 @@ -30,10 +30,10 @@ LTEXT "", IDS_ERR_USER_MSG2, 15, 5, 28, 20 LTEXT "", IDS_ERR_USER_MSG, 15, 5, 210, 8 CHECKBOX "Vis ikke denne besked igen", IDC_ERR_DONT_SHOW, 5, 20, 210, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&OK" IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&Annuller" IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&Ja" IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&Nej" IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&OK", IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&Annuller", IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&Ja", IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&Nej", IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP } STRINGTABLE DISCARDABLE Modified: branches/cmake-bringup/dll/win32/shlwapi/shlwapi_De.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/shlwapi… ============================================================================== --- branches/cmake-bringup/dll/win32/shlwapi/shlwapi_De.rc [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/shlwapi/shlwapi_De.rc [iso-8859-1] Sun Aug 29 14:13:38 2010 @@ -32,10 +32,10 @@ LTEXT "", IDS_ERR_USER_MSG2, 15, 5, 28, 20 LTEXT "", IDS_ERR_USER_MSG, 15, 5, 210, 8 CHECKBOX "&Diesen Dialog nicht mehr anzeigen", IDC_ERR_DONT_SHOW, 5, 20, 210, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&OK" IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&Abbrechen" IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&Ja" IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&Nein" IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&OK", IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&Abbrechen", IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&Ja", IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&Nein", IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP } STRINGTABLE DISCARDABLE Modified: branches/cmake-bringup/dll/win32/shlwapi/shlwapi_En.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/shlwapi… ============================================================================== --- branches/cmake-bringup/dll/win32/shlwapi/shlwapi_En.rc [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/shlwapi/shlwapi_En.rc [iso-8859-1] Sun Aug 29 14:13:38 2010 @@ -30,10 +30,10 @@ LTEXT "", IDS_ERR_USER_MSG2, 15, 5, 28, 20 LTEXT "", IDS_ERR_USER_MSG, 15, 5, 210, 8 CHECKBOX "Don't show me th&is message again", IDC_ERR_DONT_SHOW, 5, 20, 210, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&OK" IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&Cancel" IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&Yes" IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&No" IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&OK", IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&Cancel", IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&Yes", IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&No", IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP } STRINGTABLE DISCARDABLE Modified: branches/cmake-bringup/dll/win32/shlwapi/shlwapi_Es.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/shlwapi… ============================================================================== --- branches/cmake-bringup/dll/win32/shlwapi/shlwapi_Es.rc [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/shlwapi/shlwapi_Es.rc [iso-8859-1] Sun Aug 29 14:13:38 2010 @@ -30,10 +30,10 @@ LTEXT "", IDS_ERR_USER_MSG2, 15, 5, 28, 20 LTEXT "", IDS_ERR_USER_MSG, 15, 5, 210, 8 CHECKBOX "No volver a mostrar este &mensaje", IDC_ERR_DONT_SHOW, 5, 20, 210, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&Aceptar" IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&Cancelar" IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&Sí" IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&No" IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&Aceptar", IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&Cancelar", IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&Sí", IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&No", IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP } STRINGTABLE DISCARDABLE Modified: branches/cmake-bringup/dll/win32/shlwapi/shlwapi_Fi.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/shlwapi… ============================================================================== --- branches/cmake-bringup/dll/win32/shlwapi/shlwapi_Fi.rc [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/shlwapi/shlwapi_Fi.rc [iso-8859-1] Sun Aug 29 14:13:38 2010 @@ -30,10 +30,10 @@ LTEXT "", IDS_ERR_USER_MSG2, 15, 5, 28, 20 LTEXT "", IDS_ERR_USER_MSG, 15, 5, 210, 8 CHECKBOX "Älä näytä tätä viestiä enää", IDC_ERR_DONT_SHOW, 5, 20, 210, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&OK" IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&Peruuta" IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&Kyllä" IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&Ei" IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&OK", IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&Peruuta", IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&Kyllä", IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&Ei", IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP } STRINGTABLE DISCARDABLE Modified: branches/cmake-bringup/dll/win32/shlwapi/shlwapi_Fr.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/shlwapi… ============================================================================== --- branches/cmake-bringup/dll/win32/shlwapi/shlwapi_Fr.rc [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/shlwapi/shlwapi_Fr.rc [iso-8859-1] Sun Aug 29 14:13:38 2010 @@ -33,10 +33,10 @@ LTEXT "", IDS_ERR_USER_MSG2, 15, 5, 28, 20 LTEXT "", IDS_ERR_USER_MSG, 15, 5, 210, 8 CHECKBOX "Ne plus me montrer ce message", IDC_ERR_DONT_SHOW, 5, 20, 210, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&OK" IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&Annuler" IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&Oui" IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&Non" IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&OK", IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&Annuler", IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&Oui", IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&Non", IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP } STRINGTABLE DISCARDABLE Modified: branches/cmake-bringup/dll/win32/shlwapi/shlwapi_Hu.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/shlwapi… ============================================================================== --- branches/cmake-bringup/dll/win32/shlwapi/shlwapi_Hu.rc [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/shlwapi/shlwapi_Hu.rc [iso-8859-1] Sun Aug 29 14:13:38 2010 @@ -30,10 +30,10 @@ LTEXT "", IDS_ERR_USER_MSG2, 15, 5, 28, 20 LTEXT "", IDS_ERR_USER_MSG, 15, 5, 210, 8 CHECKBOX "Ne jelení&tse meg ezt az üzenetet ismét", IDC_ERR_DONT_SHOW, 5, 20, 210, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&OK" IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&Mégse" IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&Igen" IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&Nem" IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&OK", IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&Mégse", IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&Igen", IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&Nem", IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP } STRINGTABLE DISCARDABLE Modified: branches/cmake-bringup/dll/win32/shlwapi/shlwapi_It.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/shlwapi… ============================================================================== --- branches/cmake-bringup/dll/win32/shlwapi/shlwapi_It.rc [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/shlwapi/shlwapi_It.rc [iso-8859-1] Sun Aug 29 14:13:38 2010 @@ -30,10 +30,10 @@ LTEXT "", IDS_ERR_USER_MSG2, 15, 5, 28, 20 LTEXT "", IDS_ERR_USER_MSG, 15, 5, 210, 8 CHECKBOX "Non mostrare nuovamente &questo messaggio", IDC_ERR_DONT_SHOW, 5, 20, 210, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&OK" IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&Annulla" IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&Si" IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&No" IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&OK", IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&Annulla", IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&Si", IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&No", IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP } STRINGTABLE DISCARDABLE Modified: branches/cmake-bringup/dll/win32/shlwapi/shlwapi_Ja.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/shlwapi… ============================================================================== --- branches/cmake-bringup/dll/win32/shlwapi/shlwapi_Ja.rc [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/shlwapi/shlwapi_Ja.rc [iso-8859-1] Sun Aug 29 14:13:38 2010 @@ -33,10 +33,10 @@ LTEXT "", IDS_ERR_USER_MSG2, 15, 5, 28, 20 LTEXT "", IDS_ERR_USER_MSG, 15, 5, 210, 8 CHECKBOX "ä»å¾ã¯ãã®ã¡ãã»ã¼ã¸ãè¡¨ç¤ºããªã(&i)", IDC_ERR_DONT_SHOW, 5, 20, 210, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&OK" IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON L"ãã£ã³ã»ã«(&C)" IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON L"ã¯ã(&Y)" IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON L"ããã(&N)" IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&OK", IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"ãã£ã³ã»ã«(&C)", IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"ã¯ã(&Y)", IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"ããã(&N)", IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP } STRINGTABLE DISCARDABLE Modified: branches/cmake-bringup/dll/win32/shlwapi/shlwapi_Ko.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/shlwapi… ============================================================================== --- branches/cmake-bringup/dll/win32/shlwapi/shlwapi_Ko.rc [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/shlwapi/shlwapi_Ko.rc [iso-8859-1] Sun Aug 29 14:13:38 2010 @@ -30,10 +30,10 @@ LTEXT "", IDS_ERR_USER_MSG2, 15, 5, 28, 20 LTEXT "", IDS_ERR_USER_MSG, 15, 5, 210, 8 CHECKBOX "ÀÌ ¸Þ¼¼Áö¸¦ ´Ù½Ã´Â º¸¿©ÁÖÁö ¸¶½Ã¿À(&I)", IDC_ERR_DONT_SHOW, 5, 20, 210, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - PUSHBUTTON "È®ÀÎ(&O)" IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "Ãë¼Ò(&C)" IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "¿¹(&Y)" IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "¾Æ´Ï¿À(&N)" IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "È®ÀÎ(&O)", IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "Ãë¼Ò(&C)", IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "¿¹(&Y)", IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "¾Æ´Ï¿À(&N)", IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP } Modified: branches/cmake-bringup/dll/win32/shlwapi/shlwapi_Lt.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/shlwapi… ============================================================================== --- branches/cmake-bringup/dll/win32/shlwapi/shlwapi_Lt.rc [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/shlwapi/shlwapi_Lt.rc [iso-8859-1] Sun Aug 29 14:13:38 2010 @@ -33,10 +33,10 @@ LTEXT "", IDS_ERR_USER_MSG2, 15, 5, 28, 20 LTEXT "", IDS_ERR_USER_MSG, 15, 5, 210, 8 CHECKBOX "Daugiau ne&rodyti Å¡io praneÅ¡imo", IDC_ERR_DONT_SHOW, 5, 20, 210, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&Gerai" IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&Atsisakyti" IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&Taip" IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&Ne" IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&Gerai", IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&Atsisakyti", IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&Taip", IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&Ne", IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP } STRINGTABLE DISCARDABLE Modified: branches/cmake-bringup/dll/win32/shlwapi/shlwapi_Nl.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/shlwapi… ============================================================================== --- branches/cmake-bringup/dll/win32/shlwapi/shlwapi_Nl.rc [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/shlwapi/shlwapi_Nl.rc [iso-8859-1] Sun Aug 29 14:13:38 2010 @@ -30,10 +30,10 @@ LTEXT "", IDS_ERR_USER_MSG2, 15, 5, 28, 20 LTEXT "", IDS_ERR_USER_MSG, 15, 5, 210, 8 CHECKBOX "Deze boodschap &niet opnieuw tonen", IDC_ERR_DONT_SHOW, 5, 20, 210, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&OK" IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&Annuleren" IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&Ja" IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&Nee" IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&OK", IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&Annuleren", IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&Ja", IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&Nee", IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP } STRINGTABLE DISCARDABLE Modified: branches/cmake-bringup/dll/win32/shlwapi/shlwapi_No.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/shlwapi… ============================================================================== --- branches/cmake-bringup/dll/win32/shlwapi/shlwapi_No.rc [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/shlwapi/shlwapi_No.rc [iso-8859-1] Sun Aug 29 14:13:38 2010 @@ -30,10 +30,10 @@ LTEXT "", IDS_ERR_USER_MSG2, 15, 5, 28, 20 LTEXT "", IDS_ERR_USER_MSG, 15, 5, 210, 8 CHECKBOX "&Ikke vis denne meldingen igjen", IDC_ERR_DONT_SHOW, 5, 20, 210, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&OK" IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&Avbryt" IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&Ja" IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&Nei" IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&OK", IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&Avbryt", IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&Ja", IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&Nei", IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP } STRINGTABLE DISCARDABLE Modified: branches/cmake-bringup/dll/win32/shlwapi/shlwapi_Pl.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/shlwapi… ============================================================================== --- branches/cmake-bringup/dll/win32/shlwapi/shlwapi_Pl.rc [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/shlwapi/shlwapi_Pl.rc [iso-8859-1] Sun Aug 29 14:13:38 2010 @@ -31,10 +31,10 @@ LTEXT "", IDS_ERR_USER_MSG2, 15, 5, 28, 20 LTEXT "", IDS_ERR_USER_MSG, 15, 5, 210, 8 CHECKBOX "Nie pokazuj w&iêcej tego komunikatu", IDC_ERR_DONT_SHOW, 5, 20, 210, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&OK" IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&Anuluj" IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&Tak" IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&Nie" IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&OK", IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&Anuluj", IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&Tak", IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&Nie", IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP } STRINGTABLE DISCARDABLE Modified: branches/cmake-bringup/dll/win32/shlwapi/shlwapi_Pt.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/shlwapi… ============================================================================== --- branches/cmake-bringup/dll/win32/shlwapi/shlwapi_Pt.rc [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/shlwapi/shlwapi_Pt.rc [iso-8859-1] Sun Aug 29 14:13:38 2010 @@ -31,10 +31,10 @@ LTEXT "", IDS_ERR_USER_MSG2, 15, 5, 28, 20 LTEXT "", IDS_ERR_USER_MSG, 15, 5, 210, 8 CHECKBOX "Não &me mostre essa mensagem novamente", IDC_ERR_DONT_SHOW, 5, 20, 210, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&OK" IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&Cancelar" IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&Sim" IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&Não" IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&OK", IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&Cancelar", IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&Sim", IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&Não", IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP } LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE @@ -47,10 +47,10 @@ LTEXT "", IDS_ERR_USER_MSG2, 15, 5, 28, 20 LTEXT "", IDS_ERR_USER_MSG, 15, 5, 210, 8 CHECKBOX "Não &mostrar esta mensagem novamente", IDC_ERR_DONT_SHOW, 5, 20, 210, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&OK" IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&Cancelar" IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&Sim" IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&Não" IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&OK", IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&Cancelar", IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&Sim", IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&Não", IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP } Modified: branches/cmake-bringup/dll/win32/shlwapi/shlwapi_Ro.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/shlwapi… ============================================================================== --- branches/cmake-bringup/dll/win32/shlwapi/shlwapi_Ro.rc [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/shlwapi/shlwapi_Ro.rc [iso-8859-1] Sun Aug 29 14:13:38 2010 @@ -31,10 +31,10 @@ LTEXT "", IDS_ERR_USER_MSG2, 15, 5, 28, 20 LTEXT "", IDS_ERR_USER_MSG, 15, 5, 210, 8 CHECKBOX "Nu &afiÈa din nou acest mesaj", IDC_ERR_DONT_SHOW, 5, 20, 210, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&OK" IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&RenunÈÄ" IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&Da" IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&Nu" IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&OK", IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&RenunÈÄ", IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&Da", IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&Nu", IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP } STRINGTABLE DISCARDABLE Modified: branches/cmake-bringup/dll/win32/shlwapi/shlwapi_Ru.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/shlwapi… ============================================================================== --- branches/cmake-bringup/dll/win32/shlwapi/shlwapi_Ru.rc [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/shlwapi/shlwapi_Ru.rc [iso-8859-1] Sun Aug 29 14:13:38 2010 @@ -33,10 +33,10 @@ LTEXT "", IDS_ERR_USER_MSG2, 15, 5, 28, 20 LTEXT "", IDS_ERR_USER_MSG, 15, 5, 210, 8 CHECKBOX "ÐÐ¾Ð»ÑÑÐµ Ð½Ðµ &Ð¿Ð¾ÐºÐ°Ð·ÑÐ²Ð°ÑÑ ÑÑÐ¾ ÑÐ¾Ð¾Ð±ÑÐµÐ½Ð¸Ðµ", IDC_ERR_DONT_SHOW, 5, 20, 210, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&OK" IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON L"Ð&ÑÐ¼ÐµÐ½Ð¸ÑÑ" IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&ÐÐ°" IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&ÐÐµÑ" IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&OK", IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"Ð&ÑÐ¼ÐµÐ½Ð¸ÑÑ", IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&ÐÐ°", IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&ÐÐµÑ", IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP } STRINGTABLE DISCARDABLE Modified: branches/cmake-bringup/dll/win32/shlwapi/shlwapi_Si.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/shlwapi… ============================================================================== --- branches/cmake-bringup/dll/win32/shlwapi/shlwapi_Si.rc [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/shlwapi/shlwapi_Si.rc [iso-8859-1] Sun Aug 29 14:13:38 2010 @@ -32,10 +32,10 @@ LTEXT "", IDS_ERR_USER_MSG2, 15, 5, 28, 20 LTEXT "", IDS_ERR_USER_MSG, 15, 5, 210, 8 CHECKBOX "Tega sporoÄila ne &kaÅ¾i veÄ", IDC_ERR_DONT_SHOW, 5, 20, 210, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&V redu" IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&PrekliÄi" IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&Da" IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&Ne" IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&V redu", IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&PrekliÄi", IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&Da", IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&Ne", IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP } STRINGTABLE DISCARDABLE Modified: branches/cmake-bringup/dll/win32/shlwapi/shlwapi_Sk.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/shlwapi… ============================================================================== --- branches/cmake-bringup/dll/win32/shlwapi/shlwapi_Sk.rc [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/shlwapi/shlwapi_Sk.rc [iso-8859-1] Sun Aug 29 14:13:38 2010 @@ -30,10 +30,10 @@ LTEXT "", IDS_ERR_USER_MSG2, 15, 5, 28, 20 LTEXT "", IDS_ERR_USER_MSG, 15, 5, 210, 8 CHECKBOX "Nabudúce toto dialógové okno nezo&brazova", IDC_ERR_DONT_SHOW, 5, 20, 210, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&OK" IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&Zrui" IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON L"Án&o" IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&Nie" IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&OK", IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&Zrui", IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"Án&o", IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&Nie", IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP } STRINGTABLE DISCARDABLE Modified: branches/cmake-bringup/dll/win32/shlwapi/shlwapi_Sv.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/shlwapi… ============================================================================== --- branches/cmake-bringup/dll/win32/shlwapi/shlwapi_Sv.rc [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/shlwapi/shlwapi_Sv.rc [iso-8859-1] Sun Aug 29 14:13:38 2010 @@ -30,10 +30,10 @@ LTEXT "", IDS_ERR_USER_MSG2, 15, 5, 28, 20 LTEXT "", IDS_ERR_USER_MSG, 15, 5, 210, 8 CHECKBOX "Visa inte &det här meddelandet igen", IDC_ERR_DONT_SHOW, 5, 20, 210, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&OK" IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&Avbryt" IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&Ja" IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&Nej" IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&OK", IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&Avbryt", IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&Ja", IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&Nej", IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP } STRINGTABLE DISCARDABLE Modified: branches/cmake-bringup/dll/win32/shlwapi/shlwapi_Tr.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/shlwapi… ============================================================================== --- branches/cmake-bringup/dll/win32/shlwapi/shlwapi_Tr.rc [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/shlwapi/shlwapi_Tr.rc [iso-8859-1] Sun Aug 29 14:13:38 2010 @@ -30,10 +30,10 @@ LTEXT "", IDS_ERR_USER_MSG2, 15, 5, 28, 20 LTEXT "", IDS_ERR_USER_MSG, 15, 5, 210, 8 CHECKBOX "Bu iletiyi bir daha &gösterme", IDC_ERR_DONT_SHOW, 5, 20, 210, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&Tamam" IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&Ýptal" IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&Evet" IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&Hayýr" IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&Tamam", IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&Ýptal", IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&Evet", IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&Hayýr", IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP } STRINGTABLE DISCARDABLE Modified: branches/cmake-bringup/dll/win32/shlwapi/shlwapi_Uk.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/shlwapi… ============================================================================== --- branches/cmake-bringup/dll/win32/shlwapi/shlwapi_Uk.rc [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/shlwapi/shlwapi_Uk.rc [iso-8859-1] Sun Aug 29 14:13:38 2010 @@ -30,10 +30,10 @@ LTEXT "", IDS_ERR_USER_MSG2, 15, 5, 28, 20 LTEXT "", IDS_ERR_USER_MSG, 15, 5, 210, 8 CHECKBOX "&Á³ëüøå íå ïîêàçóâàòè öå ïîâ³äîìëåííÿ", IDC_ERR_DONT_SHOW, 5, 20, 210, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&OK" IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&Ñêàñóâàòè" IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&Òàê" IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&Í³" IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&OK", IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&Ñêàñóâàòè", IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&Òàê", IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&Í³", IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP } STRINGTABLE DISCARDABLE Modified: branches/cmake-bringup/dll/win32/shlwapi/shlwapi_Zh.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/shlwapi… ============================================================================== --- branches/cmake-bringup/dll/win32/shlwapi/shlwapi_Zh.rc [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/shlwapi/shlwapi_Zh.rc [iso-8859-1] Sun Aug 29 14:13:38 2010 @@ -33,10 +33,10 @@ LTEXT "", IDS_ERR_USER_MSG2, 15, 5, 28, 20 LTEXT "", IDS_ERR_USER_MSG, 15, 5, 210, 8 CHECKBOX "ä¸è¦åæ¾ç¤ºè¿ä¸ªè®¯æ¯", IDC_ERR_DONT_SHOW, 5, 20, 210, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - PUSHBUTTON L"ç¡®å®(&O)" IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON L"åæ¶(&C)" IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON L"æ¯(&Y)" IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON L"å¦(&N)" IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"ç¡®å®(&O)", IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"åæ¶(&C)", IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"æ¯(&Y)", IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"å¦(&N)", IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP } STRINGTABLE DISCARDABLE @@ -57,10 +57,10 @@ LTEXT "", IDS_ERR_USER_MSG2, 15, 5, 28, 20 LTEXT "", IDS_ERR_USER_MSG, 15, 5, 210, 8 CHECKBOX "ä¸è¦åé¡¯ç¤ºéåè¨æ¯", IDC_ERR_DONT_SHOW, 5, 20, 210, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - PUSHBUTTON L"ç¢ºå®(&O)" IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON L"åæ¶(&C)" IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON L"æ¯(&Y)" IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON L"å¦(&N)" IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"ç¢ºå®(&O)", IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"åæ¶(&C)", IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"æ¯(&Y)", IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"å¦(&N)", IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP } STRINGTABLE DISCARDABLE Added: branches/cmake-bringup/dll/win32/slbcsp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/slbcsp/… ============================================================================== --- branches/cmake-bringup/dll/win32/slbcsp/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/slbcsp/CMakeLists.txt [iso-8859-1] Sun Aug 29 14:13:38 2010 @@ -1,0 +1,19 @@ + +set(CMAKE_C_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES> -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +add_definitions(-D__WINESRC__) + +spec2def(slbcsp ${CMAKE_CURRENT_SOURCE_DIR}/slbcsp.spec ${CMAKE_CURRENT_BINARY_DIR}/slbcsp.def) + +add_library(slbcsp SHARED main.c) + +set_target_properties(slbcsp PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") + +target_link_libraries(slbcsp + ${CMAKE_CURRENT_BINARY_DIR}/slbcsp.def + wine + mingw_common) + +add_dependencies(slbcsp slbcsp_def psdk) Propchange: branches/cmake-bringup/dll/win32/slbcsp/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/smdll/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/smdll/C… ============================================================================== --- branches/cmake-bringup/dll/win32/smdll/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/smdll/CMakeLists.txt [iso-8859-1] Sun Aug 29 14:13:38 2010 @@ -1,0 +1,18 @@ + +set(CMAKE_C_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>") + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/subsys) + +spec2def(smdll ${CMAKE_CURRENT_SOURCE_DIR}/smdll.spec ${CMAKE_CURRENT_BINARY_DIR}/smdll.def) + +add_library(smdll SHARED + dllmain.c + query.c + smdll.rc) + +target_link_libraries(smdll + ${CMAKE_CURRENT_BINARY_DIR}/smdll.def + smlib + ${REACTOS_SOURCE_DIR}/dll/ntdll/libntdll.a) + +add_dependencies(smdll smdll_def psdk) Propchange: branches/cmake-bringup/dll/win32/smdll/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/sndblst/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/sndblst… ============================================================================== --- branches/cmake-bringup/dll/win32/sndblst/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/sndblst/CMakeLists.txt [iso-8859-1] Sun Aug 29 14:13:38 2010 @@ -1,0 +1,25 @@ + +set(CMAKE_C_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>") + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/libs/sound) + +add_definitions(-DUNICODE -D_UNICODE) +add_definitions(-DDEBUG_NT4) + +spec2def(sndblst ${CMAKE_CURRENT_SOURCE_DIR}/sndblst.spec ${CMAKE_CURRENT_BINARY_DIR}/sndblst.def) + +add_library(sndblst SHARED sndblst.c) + +set_target_properties(sndblst PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") + +target_link_libraries(sndblst + ${CMAKE_CURRENT_BINARY_DIR}/sndblst.def + mment4 + mmebuddy + -luser32 + -lwinmm + -ladvapi32 + -lkernel32 + ${REACTOS_SOURCE_DIR}/dll/ntdll/libntdll.a) + +add_dependencies(sndblst sndblst_def psdk) Propchange: branches/cmake-bringup/dll/win32/sndblst/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/snmpapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/snmpapi… ============================================================================== --- branches/cmake-bringup/dll/win32/snmpapi/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/snmpapi/CMakeLists.txt [iso-8859-1] Sun Aug 29 14:13:38 2010 @@ -1,0 +1,22 @@ + +set(CMAKE_C_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES> -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +add_definitions(-D__WINESRC__) + +remove_definitions(-D_WIN32_WINNT=0x502) +add_definitions(-D_WIN32_WINNT=0x600) + +spec2def(snmpapi ${CMAKE_CURRENT_SOURCE_DIR}/snmpapi.spec ${CMAKE_CURRENT_BINARY_DIR}/snmpapi.def) + +add_library(snmpapi SHARED main.c snmpapi.rc) + +set_target_properties(snmpapi PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") + +target_link_libraries(snmpapi + ${CMAKE_CURRENT_BINARY_DIR}/snmpapi.def + wine + mingw_common) + +add_dependencies(snmpapi snmpapi_def psdk) Propchange: branches/cmake-bringup/dll/win32/snmpapi/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/spoolss/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/spoolss… ============================================================================== --- branches/cmake-bringup/dll/win32/spoolss/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/spoolss/CMakeLists.txt [iso-8859-1] Sun Aug 29 14:13:38 2010 @@ -1,0 +1,20 @@ + +set(CMAKE_C_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES> -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +add_definitions(-D__WINESRC__) + +spec2def(spoolss ${CMAKE_CURRENT_SOURCE_DIR}/spoolss.spec ${CMAKE_CURRENT_BINARY_DIR}/spoolss.def) + +add_library(spoolss SHARED spoolss_main.c router.c) + +set_target_properties(spoolss PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") + +target_link_libraries(spoolss + ${CMAKE_CURRENT_BINARY_DIR}/spoolss.def + wine + -lwinspool + mingw_common) + +add_dependencies(spoolss spoolss_def psdk) Propchange: branches/cmake-bringup/dll/win32/spoolss/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/srclient/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/srclien… ============================================================================== --- branches/cmake-bringup/dll/win32/srclient/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/srclient/CMakeLists.txt [iso-8859-1] Sun Aug 29 14:13:38 2010 @@ -1,0 +1,15 @@ + +set(CMAKE_C_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>") + +spec2def(srclient ${CMAKE_CURRENT_SOURCE_DIR}/srclient.spec ${CMAKE_CURRENT_BINARY_DIR}/srclient.def) + +add_library(srclient SHARED srclient_main.c) + +set_target_properties(srclient PROPERTIES LINK_FLAGS "-Wl,-entry,0") + +target_link_libraries(srclient + ${CMAKE_CURRENT_BINARY_DIR}/srclient.def + -lkernel32 + -lntdll) + +add_dependencies(srclient srclient_def psdk) Propchange: branches/cmake-bringup/dll/win32/srclient/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/sxs/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/sxs/CMa… ============================================================================== --- branches/cmake-bringup/dll/win32/sxs/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/sxs/CMakeLists.txt [iso-8859-1] Sun Aug 29 14:13:38 2010 @@ -1,0 +1,19 @@ + +set(CMAKE_C_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES> -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +add_definitions(-D__WINESRC__) + +spec2def(sxs ${CMAKE_CURRENT_SOURCE_DIR}/sxs.spec ${CMAKE_CURRENT_BINARY_DIR}/sxs.def) + +add_library(sxs SHARED sxs.c) + +set_target_properties(sxs PROPERTIES LINK_FLAGS "-Wl,-entry,0") + +target_link_libraries(sxs + ${CMAKE_CURRENT_BINARY_DIR}/sxs.def + wine + mingw_common) + +add_dependencies(sxs sxs_def psdk) Propchange: branches/cmake-bringup/dll/win32/sxs/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/t2embed/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/t2embed… ============================================================================== --- branches/cmake-bringup/dll/win32/t2embed/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/t2embed/CMakeLists.txt [iso-8859-1] Sun Aug 29 14:13:38 2010 @@ -1,0 +1,23 @@ + +set(CMAKE_C_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES> -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +add_definitions(-DUNICODE -D_UNICODE) + +spec2def(t2embed ${CMAKE_CURRENT_SOURCE_DIR}/t2embed.spec ${CMAKE_CURRENT_BINARY_DIR}/t2embed.def) + +add_library(t2embed SHARED t2embed.c t2embed.rc) + +set_target_properties(t2embed PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") + +target_link_libraries(t2embed + ${CMAKE_CURRENT_BINARY_DIR}/t2embed.def + wine + -lgdi32 + -luser32 + -ladvapi32 + -lversion + mingw_common) + +add_dependencies(t2embed t2embed_def psdk) Propchange: branches/cmake-bringup/dll/win32/t2embed/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/tapi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/tapi32/… ============================================================================== --- branches/cmake-bringup/dll/win32/tapi32/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/tapi32/CMakeLists.txt [iso-8859-1] Sun Aug 29 14:13:38 2010 @@ -1,0 +1,24 @@ + +set(CMAKE_C_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES> -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +add_definitions(-D__WINESRC__) + +spec2def(tapi32 ${CMAKE_CURRENT_SOURCE_DIR}/tapi32.spec ${CMAKE_CURRENT_BINARY_DIR}/tapi32.def) + +add_library(tapi32 SHARED + assisted.c + internal.c + line.c + phone.c) + +set_target_properties(tapi32 PROPERTIES LINK_FLAGS "-Wl,-entry,0") + +target_link_libraries(tapi32 + ${CMAKE_CURRENT_BINARY_DIR}/tapi32.def + wine + -ladvapi32 + mingw_common) + +add_dependencies(tapi32 tapi32_def psdk) Propchange: branches/cmake-bringup/dll/win32/tapi32/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/tapiui/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/tapiui/… ============================================================================== --- branches/cmake-bringup/dll/win32/tapiui/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/tapiui/CMakeLists.txt [iso-8859-1] Sun Aug 29 14:13:38 2010 @@ -1,0 +1,8 @@ + +set(CMAKE_RC_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES> -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") + +add_library(tapiui SHARED tapiui.rc) + +set_target_properties(tapiui PROPERTIES LINK_FLAGS "-Wl,-entry,0") + +add_dependencies(tapiui psdk) Propchange: branches/cmake-bringup/dll/win32/tapiui/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/traffic/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/traffic… ============================================================================== --- branches/cmake-bringup/dll/win32/traffic/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/traffic/CMakeLists.txt [iso-8859-1] Sun Aug 29 14:13:38 2010 @@ -1,0 +1,19 @@ + +set(CMAKE_C_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES> -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +add_definitions(-D__WINESRC__) + +spec2def(traffic ${CMAKE_CURRENT_SOURCE_DIR}/traffic.spec ${CMAKE_CURRENT_BINARY_DIR}/traffic.def) + +add_library(traffic SHARED traffic_main.c) + +set_target_properties(traffic PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") + +target_link_libraries(traffic + ${CMAKE_CURRENT_BINARY_DIR}/traffic.def + wine + mingw_common) + +add_dependencies(traffic traffic_def psdk) Propchange: branches/cmake-bringup/dll/win32/traffic/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/updspapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/updspap… ============================================================================== --- branches/cmake-bringup/dll/win32/updspapi/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/updspapi/CMakeLists.txt [iso-8859-1] Sun Aug 29 14:13:38 2010 @@ -1,0 +1,20 @@ + +set(CMAKE_C_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES> -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +add_definitions(-D__WINESRC__) + +spec2def(updspapi ${CMAKE_CURRENT_SOURCE_DIR}/updspapi.spec ${CMAKE_CURRENT_BINARY_DIR}/updspapi.def) + +add_library(updspapi SHARED main.c) + +set_target_properties(updspapi PROPERTIES LINK_FLAGS "-Wl,-entry,0") + +target_link_libraries(updspapi + ${CMAKE_CURRENT_BINARY_DIR}/updspapi.def + wine + -lsetupapi + mingw_common) + +add_dependencies(updspapi updspapi_def psdk) Propchange: branches/cmake-bringup/dll/win32/updspapi/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/url/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/url/CMa… ============================================================================== --- branches/cmake-bringup/dll/win32/url/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/url/CMakeLists.txt [iso-8859-1] Sun Aug 29 14:13:38 2010 @@ -1,0 +1,21 @@ + +set(CMAKE_C_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES> -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +add_definitions(-D__WINESRC__) + +spec2def(url ${CMAKE_CURRENT_SOURCE_DIR}/url.spec ${CMAKE_CURRENT_BINARY_DIR}/url.def) + +add_library(url SHARED url_main.c) + +set_target_properties(url PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") + +target_link_libraries(url + ${CMAKE_CURRENT_BINARY_DIR}/url.def + wine + -lshell32 + -lshlwapi + mingw_common) + +add_dependencies(url url_def psdk) Propchange: branches/cmake-bringup/dll/win32/url/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/urlmon/liburlmon.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/urlmon/… ============================================================================== Binary file - no diff available. Propchange: branches/cmake-bringup/dll/win32/urlmon/liburlmon.a ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: branches/cmake-bringup/dll/win32/usp10/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/usp10/C… ============================================================================== --- branches/cmake-bringup/dll/win32/usp10/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/usp10/CMakeLists.txt [iso-8859-1] Sun Aug 29 14:13:38 2010 @@ -1,0 +1,25 @@ + +set(CMAKE_C_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES> -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +add_definitions(-D__WINESRC__) + +spec2def(usp10 ${CMAKE_CURRENT_SOURCE_DIR}/usp10.spec ${CMAKE_CURRENT_BINARY_DIR}/usp10.def) + +add_library(usp10 SHARED + bidi.c + usp10.c + mirror.c + shape.c + shaping.c) + +set_target_properties(usp10 PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") + +target_link_libraries(usp10 + ${CMAKE_CURRENT_BINARY_DIR}/usp10.def + wine + ${REACTOS_SOURCE_DIR}/dll/win32/gdi32/libgdi32.a + mingw_common) + +add_dependencies(usp10 usp10_def psdk) Propchange: branches/cmake-bringup/dll/win32/usp10/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/uxtheme/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/uxtheme… ============================================================================== --- branches/cmake-bringup/dll/win32/uxtheme/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/uxtheme/CMakeLists.txt [iso-8859-1] Sun Aug 29 14:13:38 2010 @@ -1,0 +1,33 @@ + +set(CMAKE_C_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES> -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +add_definitions(-D__WINESRC__) + +spec2def(uxtheme ${CMAKE_CURRENT_SOURCE_DIR}/uxtheme.spec ${CMAKE_CURRENT_BINARY_DIR}/uxtheme.def) + +add_library(uxtheme SHARED + buffer.c + draw.c + main.c + metric.c + msstyles.c + property.c + stylemap.c + system.c + uxini.c + version.rc) + +set_target_properties(uxtheme PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") + +target_link_libraries(uxtheme + ${CMAKE_CURRENT_BINARY_DIR}/uxtheme.def + wine + -luser32 + -ladvapi32 + -lgdi32 + -lmsimg32 + mingw_common) + +add_dependencies(uxtheme uxtheme_def psdk) Propchange: branches/cmake-bringup/dll/win32/uxtheme/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/cmake-bringup/lib/drivers/sound/mmebuddy/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/drivers/sound… ============================================================================== --- branches/cmake-bringup/lib/drivers/sound/mmebuddy/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/drivers/sound/mmebuddy/CMakeLists.txt [iso-8859-1] Sun Aug 29 14:13:38 2010 @@ -4,7 +4,25 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/libs/sound) -file(GLOB_RECURSE SOURCE "*.c") +list(APPEND SOURCE + capabilities.c + devicelist.c + deviceinstance.c + functiontable.c + mmewrap.c + reentrancy.c + utility.c + kernel.c + thread.c + auxiliary/auxMessage.c + midi/midMessage.c + midi/modMessage.c + mixer/mxdMessage.c + wave/widMessage.c + wave/wodMessage.c + wave/format.c + wave/header.c + wave/streaming.c) add_library(mmebuddy ${SOURCE}) add_dependencies(mmebuddy psdk)

1 0

[akhaldi] 48643: [CMAKE] - Rewrite crt and libcntpr targets, with support for other than i386. - Bring-in logf.c from trunk.
by akhaldi＠svn.reactos.org 29 Aug '10

29 Aug '10

Author: akhaldi Date: Sun Aug 29 11:07:31 2010 New Revision: 48643 URL: http://svn.reactos.org/svn/reactos?rev=48643&view=rev Log: [CMAKE] - Rewrite crt and libcntpr targets, with support for other than i386. - Bring-in logf.c from trunk. Added: branches/cmake-bringup/lib/sdk/crt/math/logf.c - copied unchanged from r48589, trunk/reactos/lib/sdk/crt/math/logf.c Modified: branches/cmake-bringup/lib/sdk/crt/CMakeLists.txt Modified: branches/cmake-bringup/lib/sdk/crt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/CMake… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/crt/CMakeLists.txt [iso-8859-1] Sun Aug 29 11:07:31 2010 @@ -3,173 +3,560 @@ add_definitions(-D_CRTBLD) -file(GLOB_RECURSE CRT_SOURCE "*.c") - -if(NOT ARCH MATCHES i386) -list(REMOVE_ITEM CRT_SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/except/i386/unwind.c) -list(REMOVE_ITEM CRT_SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/math/i386/*.c) -if(NOT ARCH MATCHES amd64) -list(REMOVE_ITEM CRT_SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/float/i386/*.c) -endif(NOT ARCH MATCHES amd64) -else(NOT ARCH MATCHES i386) -list(REMOVE_ITEM CRT_SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/math/stubs.c) -list(REMOVE_ITEM CRT_SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/mem/memchr.c) -list(REMOVE_ITEM CRT_SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/mem/memcpy.c) -list(REMOVE_ITEM CRT_SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/mem/memmove.c) -list(REMOVE_ITEM CRT_SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/mem/memset.c) -list(REMOVE_ITEM CRT_SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/string/strcat.c) -list(REMOVE_ITEM CRT_SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/string/strchr.c) -list(REMOVE_ITEM CRT_SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/string/strcmp.c) -list(REMOVE_ITEM CRT_SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/string/strcpy.c) -list(REMOVE_ITEM CRT_SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/string/strlen.c) -list(REMOVE_ITEM CRT_SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/string/strncat.c) -list(REMOVE_ITEM CRT_SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/string/strncmp.c) -list(REMOVE_ITEM CRT_SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/string/strncpy.c) -list(REMOVE_ITEM CRT_SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/string/strnlen.c) -list(REMOVE_ITEM CRT_SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/string/strrchr.c) -list(REMOVE_ITEM CRT_SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/string/wcscat.c) -list(REMOVE_ITEM CRT_SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/string/wcschr.c) -list(REMOVE_ITEM CRT_SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/string/wcscmp.c) -list(REMOVE_ITEM CRT_SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/string/wcscpy.c) -list(REMOVE_ITEM CRT_SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/string/wcslen.c) -list(REMOVE_ITEM CRT_SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/string/wcsncat.c) -list(REMOVE_ITEM CRT_SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/string/wcsncmp.c) -list(REMOVE_ITEM CRT_SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/string/wcsncpy.c) -list(REMOVE_ITEM CRT_SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/string/wcsnlen.c) -list(REMOVE_ITEM CRT_SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/string/wcsrchr.c) -endif(NOT ARCH MATCHES i386) - -list(REMOVE_ITEM CRT_SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/math/abs.c) -list(REMOVE_ITEM CRT_SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/math/cos.c) -list(REMOVE_ITEM CRT_SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/math/j0_y0.c) -list(REMOVE_ITEM CRT_SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/math/j1_y1.c) -list(REMOVE_ITEM CRT_SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/math/jn_yn.c) -list(REMOVE_ITEM CRT_SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/math/labs.c) -list(REMOVE_ITEM CRT_SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/math/rand_nt.c) -list(REMOVE_ITEM CRT_SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/math/sin.c) -list(REMOVE_ITEM CRT_SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/stdio/findgen.c) -list(REMOVE_ITEM CRT_SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/stdlib/atold.c) -list(REMOVE_ITEM CRT_SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/stdlib/malloc.c) -list(REMOVE_ITEM CRT_SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/string/mbstowcs_nt.c) -list(REMOVE_ITEM CRT_SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/string/strtold.c) -list(REMOVE_ITEM CRT_SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/string/wcstombs_nt.c) -list(REMOVE_ITEM CRT_SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/string/witoa.c) -list(REMOVE_ITEM CRT_SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/string/witow.c) - -file(GLOB_RECURSE CRT_ASM_SOURCE "${CMAKE_CURRENT_SOURCE_DIR}/except/${ARCH}/*.s" - "${CMAKE_CURRENT_SOURCE_DIR}/math/${ARCH}/*.s" - "${CMAKE_CURRENT_SOURCE_DIR}/mem/${ARCH}/*.s" - "${CMAKE_CURRENT_SOURCE_DIR}/string/${ARCH}/*.s" - "${CMAKE_CURRENT_SOURCE_DIR}/setjmp/${ARCH}/*.s") - -add_library(crt ${CRT_SOURCE} ${CRT_ASM_SOURCE} ${CMAKE_CURRENT_BINARY_DIR}/crt_precomp.h.gch) +list(APPEND CRT_SOURCE + conio/cgets.c + conio/cprintf.c + conio/cputs.c + conio/getch.c + conio/getche.c + conio/kbhit.c + conio/putch.c + conio/ungetch.c + direct/chdir.c + direct/chdrive.c + direct/getcwd.c + direct/getdcwd.c + direct/getdfree.c + direct/getdrive.c + direct/mkdir.c + direct/rmdir.c + direct/wchdir.c + direct/wgetcwd.c + direct/wgetdcwd.c + direct/wmkdir.c + direct/wrmdir.c + except/abnorter.c + except/checkesp.c + except/cpp.c + except/cppexcept.c + except/except.c + except/matherr.c + except/${ARCH}/seh.s + except/xcptfil.c + float/chgsign.c + float/copysign.c + float/fpclass.c + float/fpecode.c + float/isnan.c + float/nafter.c + float/scalb.c + float/${ARCH}/clearfp.c + float/${ARCH}/cntrlfp.c + float/${ARCH}/fpreset.c + float/${ARCH}/logb.c + float/${ARCH}/statfp.c + locale/locale.c + math/acos.c + math/adjust.c + math/asin.c + math/cabs.c + math/cosf.c + math/cosh.c + math/div.c + math/fdivbug.c + math/frexp.c + math/huge_val.c + math/hypot.c + math/ldiv.c + math/logf.c + math/modf.c + math/rand.c + math/s_modf.c + math/sinf.c + math/sinh.c + math/tanh.c + math/pow_asm.c + mbstring/hanzen.c + mbstring/ischira.c + mbstring/iskana.c + mbstring/iskmoji.c + mbstring/iskpun.c + mbstring/islead.c + mbstring/islwr.c + mbstring/ismbal.c + mbstring/ismbaln.c + mbstring/ismbc.c + mbstring/ismbgra.c + mbstring/ismbkaln.c + mbstring/ismblead.c + mbstring/ismbpri.c + mbstring/ismbpun.c + mbstring/ismbtrl.c + mbstring/isuppr.c + mbstring/jistojms.c + mbstring/jmstojis.c + mbstring/mbbtype.c + mbstring/mbccpy.c + mbstring/mbclen.c + mbstring/mbscat.c + mbstring/mbschr.c + mbstring/mbscmp.c + mbstring/mbscoll.c + mbstring/mbscpy.c + mbstring/mbscspn.c + mbstring/mbsdec.c + mbstring/mbsdup.c + mbstring/mbsicmp.c + mbstring/mbsicoll.c + mbstring/mbsinc.c + mbstring/mbslen.c + mbstring/mbslwr.c + mbstring/mbsncat.c + mbstring/mbsnccnt.c + mbstring/mbsncmp.c + mbstring/mbsncoll.c + mbstring/mbsncpy.c + mbstring/mbsnextc.c + mbstring/mbsnicmp.c + mbstring/mbsnicoll.c + mbstring/mbsninc.c + mbstring/mbsnset.c + mbstring/mbspbrk.c + mbstring/mbsrchr.c + mbstring/mbsrev.c + mbstring/mbsset.c + mbstring/mbsspn.c + mbstring/mbsspnp.c + mbstring/mbsstr.c + mbstring/mbstok.c + mbstring/mbstrlen.c + mbstring/mbsupr.c + mem/memcmp.c + mem/memccpy.c + mem/memicmp.c + misc/amsg.c + misc/assert.c + misc/crtmain.c + misc/environ.c + misc/getargs.c + misc/initterm.c + misc/lock.c + misc/purecall.c + misc/stubs.c + misc/tls.c + process/_cwait.c + process/_system.c + process/dll.c + process/process.c + process/procid.c + process/thread.c + process/threadid.c + process/threadx.c + process/wprocess.c + search/bsearch.c + search/lfind.c + search/lsearch.c + setjmp/${ARCH}/setjmp.s + signal/signal.c + signal/xcptinfo.c + stdio/access.c + stdio/file.c + stdio/find.c + stdio/find64.c + stdio/findi64.c + stdio/fmode.c + stdio/lnx_sprintf.c + stdio/perror.c + stdio/popen.c + stdio/stat.c + stdio/stat64.c + stdio/waccess.c + stdio/wfind.c + stdio/wfind64.c + stdio/wfindi64.c + stdio/wpopen.c + stdio/wstat.c + stdio/wstat64.c + stdlib/_exit.c + stdlib/abort.c + stdlib/atexit.c + stdlib/ecvt.c + stdlib/errno.c + stdlib/fcvt.c + stdlib/fcvtbuf.c + stdlib/fullpath.c + stdlib/gcvt.c + stdlib/getenv.c + stdlib/makepath.c + stdlib/makepath_s.c + stdlib/mbtowc.c + stdlib/mbstowcs.c + stdlib/obsol.c + stdlib/putenv.c + stdlib/qsort.c + stdlib/rot.c + stdlib/senv.c + stdlib/swab.c + stdlib/wfulpath.c + stdlib/wputenv.c + stdlib/wsenv.c + stdlib/wmakpath.c + stdlib/wmakpath_s.c + string/atof.c + string/atoi.c + string/atoi64.c + string/atol.c + string/ctype.c + string/itoa.c + string/itow.c + string/lasttok.c + string/scanf.c + string/splitp.c + string/strcoll.c + string/strcspn.c + string/strdup.c + string/strerror.c + string/stricmp.c + string/string.c + string/strlwr.c + string/strncoll.c + string/strnicmp.c + string/strpbrk.c + string/strrev.c + string/strset.c + string/strspn.c + string/strstr.c + string/strtod.c + string/strtoi64.c + string/strtok.c + string/strtol.c + string/strtoul.c + string/strtoull.c + string/strupr.c + string/strxfrm.c + string/wcs.c + string/wcstol.c + string/wcstoul.c + string/wsplitp.c + string/wtoi.c + string/wtoi64.c + string/wtol.c + sys_stat/systime.c + time/asctime.c + time/clock.c + time/ctime32.c + time/ctime64.c + time/ctime.c + time/difftime32.c + time/difftime64.c + time/difftime.c + time/ftime32.c + time/ftime64.c + time/ftime.c + time/futime32.c + time/futime64.c + time/futime.c + time/gmtime.c + time/localtime32.c + time/localtime64.c + time/localtime.c + time/mktime.c + time/strdate.c + time/strftime.c + time/strtime.c + time/time32.c + time/time64.c + time/time.c + time/timezone.c + time/tzname.c + time/utime32.c + time/utime64.c + time/utime.c + time/wasctime.c + time/wcsftime.c + time/wctime32.c + time/wctime64.c + time/wctime.c + time/wstrdate.c + time/wstrtime.c + time/wutime32.c + time/wutime64.c + time/wutime.c + wstring/wcscoll.c + wstring/wcscspn.c + wstring/wcsicmp.c + wstring/wcslwr.c + wstring/wcsnicmp.c + wstring/wcsspn.c + wstring/wcsstr.c + wstring/wcstok.c + wstring/wcsupr.c + wstring/wcsxfrm.c + wstring/wlasttok.c + wine/heap.c + wine/undname.c) + +if(ARCH MATCHES i386) +list(APPEND CRT_SOURCE except/i386/prolog.s except/i386/unwind.c) +elseif(ARCH MATCHES amd64) +list(APPEND CRT_SOURCE chkstk_asm.s) +endif(ARCH MATCHES i386) + +if(ARCH MATCHES i386) +list(APPEND CRT_SOURCE + math/i386/alldiv_asm.s + math/i386/alldvrm_asm.s + math/i386/allmul_asm.s + math/i386/allrem_asm.s + math/i386/allshl_asm.s + math/i386/allshr_asm.s + math/i386/atan_asm.s + math/i386/aulldiv_asm.s + math/i386/aulldvrm_asm.s + math/i386/aullrem_asm.s + math/i386/aullshr_asm.s + math/i386/ceil_asm.s + math/i386/ceilf.S + math/i386/cos_asm.s + math/i386/fabs_asm.s + math/i386/floor_asm.s + math/i386/floorf.S + math/i386/ftol_asm.s + math/i386/log_asm.s + math/i386/log10_asm.s + math/i386/pow_asm.s + math/i386/sin_asm.s + math/i386/sqrt_asm.s + math/i386/tan_asm.s + math/i386/atan2.c + math/i386/ci.c + math/i386/exp.c + math/i386/fmod.c + math/i386/fmodf.c + math/i386/ldexp.c + math/i386/sqrtf.c + mem/i386/memchr_asm.s + mem/i386/memcpy_asm.s + mem/i386/memmove_asm.s + mem/i386/memset_asm.s + string/i386/strcat_asm.s + string/i386/strchr_asm.s + string/i386/strcmp_asm.s + string/i386/strcpy_asm.s + string/i386/strlen_asm.s + string/i386/strncat_asm.s + string/i386/strncmp_asm.s + string/i386/strncpy_asm.s + string/i386/strnlen_asm.s + string/i386/strrchr_asm.s + string/i386/wcscat_asm.s + string/i386/wcschr_asm.s + string/i386/wcscmp_asm.s + string/i386/wcscpy_asm.s + string/i386/wcslen_asm.s + string/i386/wcsncat_asm.s + string/i386/wcsncmp_asm.s + string/i386/wcsncpy_asm.s + string/i386/wcsnlen_asm.s + string/i386/wcsrchr_asm.s) +else() +list(APPEND CRT_SOURCE + math/stubs.c + mem/memchr.c + mem/memcpy.c + mem/memmove.c + mem/memset.c + string/strcat.c + string/strchr.c + string/strcmp.c + string/strcpy.c + string/strlen.c + string/strncat.c + string/strncmp.c + string/strncpy.c + string/strnlen.c + string/strrchr.c + string/wcscat.c + string/wcschr.c + string/wcscmp.c + string/wcscpy.c + string/wcslen.c + string/wcsncat.c + string/wcsncmp.c + string/wcsncpy.c + string/wcsnlen.c + string/wcsrchr.c) +endif(ARCH MATCHES i386) + +if(ARCH MATCHES amd64) +list(APPEND CRT_SOURCE + math/cos.c + math/sin.c + math/amd64/alldiv.S + math/amd64/atan.S + math/amd64/atan2.S + math/amd64/ceil.S + math/amd64/ceilf.S + math/amd64/exp.S + math/amd64/fabs.S + math/amd64/floor.S + math/amd64/floorf.S + math/amd64/fmod.S + math/amd64/fmodf.S + math/amd64/ldexp.S + math/amd64/log.S + math/amd64/log10.S + math/amd64/pow.S + math/amd64/sqrt.S + math/amd64/sqrtf.S + math/amd64/tan.S) +endif(ARCH MATCHES amd64) + +add_library(crt ${CRT_SOURCE} ${CMAKE_CURRENT_BINARY_DIR}/crt_precomp.h.gch) set_property(TARGET crt PROPERTY COMPILE_DEFINITIONS __MINGW_IMPORT=extern USE_MSVCRT_PREFIX _MSVCRT_LIB_ _MSVCRT_ _MT) add_pch(crt ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${CRT_SOURCE}) add_dependencies(crt psdk) +list(APPEND LIBCNTPR_SOURCE + except/${ARCH}/chkstk_asm.s + except/${ARCH}/seh.s + math/abs.c + math/div.c + math/labs.c + math/rand_nt.c + mem/memccpy.c + mem/memcmp.c + mem/memicmp.c + search/bsearch.c + search/lfind.c + setjmp/${ARCH}/setjmp.s + stdlib/qsort.c + string/ctype.c + string/scanf.c + string/strcspn.c + string/stricmp.c + string/strnicmp.c + string/strlwr.c + string/strrev.c + string/strset.c + string/strstr.c + string/strupr.c + string/strpbrk.c + string/strspn.c + string/atoi64.c + string/atoi.c + string/atol.c + string/itoa.c + string/itow.c + string/mbstowcs_nt.c + string/splitp.c + string/strtol.c + string/strtoul.c + string/strtoull.c + string/wcs.c + string/wcstol.c + string/wcstombs_nt.c + string/wcstoul.c + string/wsplitp.c + string/wtoi64.c + string/wtoi.c + string/wtol.c + wstring/wcsicmp.c + wstring/wcslwr.c + wstring/wcsnicmp.c + wstring/wcsupr.c + wstring/wcscspn.c + wstring/wcsspn.c + wstring/wcsstr.c) + if(ARCH MATCHES i386) -set(LIBCNTPR_SOURCE - ${CMAKE_CURRENT_SOURCE_DIR}/except/i386/chkstk_asm.s - ${CMAKE_CURRENT_SOURCE_DIR}/except/i386/seh.s - ${CMAKE_CURRENT_SOURCE_DIR}/math/i386/alldiv_asm.s - ${CMAKE_CURRENT_SOURCE_DIR}/math/i386/alldvrm_asm.s - ${CMAKE_CURRENT_SOURCE_DIR}/math/i386/allmul_asm.s - ${CMAKE_CURRENT_SOURCE_DIR}/math/i386/allrem_asm.s - ${CMAKE_CURRENT_SOURCE_DIR}/math/i386/allshl_asm.s - ${CMAKE_CURRENT_SOURCE_DIR}/math/i386/allshr_asm.s - ${CMAKE_CURRENT_SOURCE_DIR}/math/i386/atan_asm.s - ${CMAKE_CURRENT_SOURCE_DIR}/math/i386/aulldiv_asm.s - ${CMAKE_CURRENT_SOURCE_DIR}/math/i386/aulldvrm_asm.s - ${CMAKE_CURRENT_SOURCE_DIR}/math/i386/aullrem_asm.s - ${CMAKE_CURRENT_SOURCE_DIR}/math/i386/aullshr_asm.s - ${CMAKE_CURRENT_SOURCE_DIR}/math/i386/ceil_asm.s - ${CMAKE_CURRENT_SOURCE_DIR}/math/i386/cos_asm.s - ${CMAKE_CURRENT_SOURCE_DIR}/math/i386/fabs_asm.s - ${CMAKE_CURRENT_SOURCE_DIR}/math/i386/floor_asm.s - ${CMAKE_CURRENT_SOURCE_DIR}/math/i386/ftol_asm.s - ${CMAKE_CURRENT_SOURCE_DIR}/math/i386/log_asm.s - ${CMAKE_CURRENT_SOURCE_DIR}/math/i386/pow_asm.s - ${CMAKE_CURRENT_SOURCE_DIR}/math/i386/sin_asm.s - ${CMAKE_CURRENT_SOURCE_DIR}/math/i386/sqrt_asm.s - ${CMAKE_CURRENT_SOURCE_DIR}/math/i386/tan_asm.s - ${CMAKE_CURRENT_SOURCE_DIR}/math/i386/ci.c - ${CMAKE_CURRENT_SOURCE_DIR}/math/abs.c - ${CMAKE_CURRENT_SOURCE_DIR}/math/div.c - ${CMAKE_CURRENT_SOURCE_DIR}/math/labs.c - ${CMAKE_CURRENT_SOURCE_DIR}/math/rand_nt.c - ${CMAKE_CURRENT_SOURCE_DIR}/mem/i386/memchr_asm.s - ${CMAKE_CURRENT_SOURCE_DIR}/mem/i386/memcpy_asm.s - ${CMAKE_CURRENT_SOURCE_DIR}/mem/i386/memmove_asm.s - ${CMAKE_CURRENT_SOURCE_DIR}/mem/i386/memset_asm.s - ${CMAKE_CURRENT_SOURCE_DIR}/mem/memccpy.c - ${CMAKE_CURRENT_SOURCE_DIR}/mem/memcmp.c - ${CMAKE_CURRENT_SOURCE_DIR}/mem/memicmp.c - ${CMAKE_CURRENT_SOURCE_DIR}/search/bsearch.c - ${CMAKE_CURRENT_SOURCE_DIR}/search/lfind.c - ${CMAKE_CURRENT_SOURCE_DIR}/setjmp/i386/setjmp.s - ${CMAKE_CURRENT_SOURCE_DIR}/stdlib/qsort.c - ${CMAKE_CURRENT_SOURCE_DIR}/string/i386/strcat_asm.s - ${CMAKE_CURRENT_SOURCE_DIR}/string/i386/strchr_asm.s - ${CMAKE_CURRENT_SOURCE_DIR}/string/i386/strcmp_asm.s - ${CMAKE_CURRENT_SOURCE_DIR}/string/i386/strcpy_asm.s - ${CMAKE_CURRENT_SOURCE_DIR}/string/i386/strlen_asm.s - ${CMAKE_CURRENT_SOURCE_DIR}/string/i386/strncat_asm.s - ${CMAKE_CURRENT_SOURCE_DIR}/string/i386/strncmp_asm.s - ${CMAKE_CURRENT_SOURCE_DIR}/string/i386/strncpy_asm.s - ${CMAKE_CURRENT_SOURCE_DIR}/string/i386/strnlen_asm.s - ${CMAKE_CURRENT_SOURCE_DIR}/string/i386/strrchr_asm.s - ${CMAKE_CURRENT_SOURCE_DIR}/string/i386/wcscat_asm.s - ${CMAKE_CURRENT_SOURCE_DIR}/string/i386/wcschr_asm.s - ${CMAKE_CURRENT_SOURCE_DIR}/string/i386/wcscmp_asm.s - ${CMAKE_CURRENT_SOURCE_DIR}/string/i386/wcscpy_asm.s - ${CMAKE_CURRENT_SOURCE_DIR}/string/i386/wcslen_asm.s - ${CMAKE_CURRENT_SOURCE_DIR}/string/i386/wcsncat_asm.s - ${CMAKE_CURRENT_SOURCE_DIR}/string/i386/wcsncmp_asm.s - ${CMAKE_CURRENT_SOURCE_DIR}/string/i386/wcsncpy_asm.s - ${CMAKE_CURRENT_SOURCE_DIR}/string/i386/wcsnlen_asm.s - ${CMAKE_CURRENT_SOURCE_DIR}/string/i386/wcsrchr_asm.s - ${CMAKE_CURRENT_SOURCE_DIR}/string/ctype.c - ${CMAKE_CURRENT_SOURCE_DIR}/string/scanf.c - ${CMAKE_CURRENT_SOURCE_DIR}/string/strcspn.c - ${CMAKE_CURRENT_SOURCE_DIR}/string/stricmp.c - ${CMAKE_CURRENT_SOURCE_DIR}/string/strnicmp.c - ${CMAKE_CURRENT_SOURCE_DIR}/string/strlwr.c - ${CMAKE_CURRENT_SOURCE_DIR}/string/strrev.c - ${CMAKE_CURRENT_SOURCE_DIR}/string/strset.c - ${CMAKE_CURRENT_SOURCE_DIR}/string/strstr.c - ${CMAKE_CURRENT_SOURCE_DIR}/string/strupr.c - ${CMAKE_CURRENT_SOURCE_DIR}/string/strpbrk.c - ${CMAKE_CURRENT_SOURCE_DIR}/string/strspn.c - ${CMAKE_CURRENT_SOURCE_DIR}/string/atoi64.c - ${CMAKE_CURRENT_SOURCE_DIR}/string/atoi.c - ${CMAKE_CURRENT_SOURCE_DIR}/string/atol.c - ${CMAKE_CURRENT_SOURCE_DIR}/string/itoa.c - ${CMAKE_CURRENT_SOURCE_DIR}/string/itow.c - ${CMAKE_CURRENT_SOURCE_DIR}/string/mbstowcs_nt.c - ${CMAKE_CURRENT_SOURCE_DIR}/string/splitp.c - ${CMAKE_CURRENT_SOURCE_DIR}/string/strtol.c - ${CMAKE_CURRENT_SOURCE_DIR}/string/strtoul.c - ${CMAKE_CURRENT_SOURCE_DIR}/string/strtoull.c - ${CMAKE_CURRENT_SOURCE_DIR}/string/wcs.c - ${CMAKE_CURRENT_SOURCE_DIR}/string/wcstol.c - ${CMAKE_CURRENT_SOURCE_DIR}/string/wcstombs_nt.c - ${CMAKE_CURRENT_SOURCE_DIR}/string/wcstoul.c - ${CMAKE_CURRENT_SOURCE_DIR}/string/wsplitp.c - ${CMAKE_CURRENT_SOURCE_DIR}/string/wtoi64.c - ${CMAKE_CURRENT_SOURCE_DIR}/string/wtoi.c - ${CMAKE_CURRENT_SOURCE_DIR}/string/wtol.c - ${CMAKE_CURRENT_SOURCE_DIR}/wstring/wcsicmp.c - ${CMAKE_CURRENT_SOURCE_DIR}/wstring/wcslwr.c - ${CMAKE_CURRENT_SOURCE_DIR}/wstring/wcsnicmp.c - ${CMAKE_CURRENT_SOURCE_DIR}/wstring/wcsupr.c - ${CMAKE_CURRENT_SOURCE_DIR}/wstring/wcscspn.c - ${CMAKE_CURRENT_SOURCE_DIR}/wstring/wcsspn.c - ${CMAKE_CURRENT_SOURCE_DIR}/wstring/wcsstr.c -) +list(APPEND LIBCNTPR_SOURCE + math/i386/alldiv_asm.s + math/i386/alldvrm_asm.s + math/i386/allmul_asm.s + math/i386/allrem_asm.s + math/i386/allshl_asm.s + math/i386/allshr_asm.s + math/i386/atan_asm.s + math/i386/aulldiv_asm.s + math/i386/aulldvrm_asm.s + math/i386/aullrem_asm.s + math/i386/aullshr_asm.s + math/i386/ceil_asm.s + math/i386/cos_asm.s + math/i386/fabs_asm.s + math/i386/floor_asm.s + math/i386/ftol_asm.s + math/i386/log_asm.s + math/i386/pow_asm.s + math/i386/sin_asm.s + math/i386/sqrt_asm.s + math/i386/tan_asm.s + math/i386/ci.c) +elseif(ARCH MATCHES amd64) +list(APPEND LIBCNTPR_SOURCE + math/cos.c + math/sin.c + math/amd64/alldiv.S + math/amd64/atan.S + math/amd64/atan2.S + math/amd64/ceil.S + math/amd64/exp.S + math/amd64/fabs.S + math/amd64/floor.S + math/amd64/fmod.S + math/amd64/ldexp.S + math/amd64/log.S + math/amd64/log10.S + math/amd64/pow.S + math/amd64/sqrt.S + math/amd64/tan.S) +endif(ARCH MATCHES i386) + +if(ARCH MATCHES i386) +list(APPEND LIBCNTPR_SOURCE + mem/i386/memchr_asm.s + mem/i386/memcpy_asm.s + mem/i386/memmove_asm.s + mem/i386/memset_asm.s + string/i386/strcat_asm.s + string/i386/strchr_asm.s + string/i386/strcmp_asm.s + string/i386/strcpy_asm.s + string/i386/strlen_asm.s + string/i386/strncat_asm.s + string/i386/strncmp_asm.s + string/i386/strncpy_asm.s + string/i386/strnlen_asm.s + string/i386/strrchr_asm.s + string/i386/wcscat_asm.s + string/i386/wcschr_asm.s + string/i386/wcscmp_asm.s + string/i386/wcscpy_asm.s + string/i386/wcslen_asm.s + string/i386/wcsncat_asm.s + string/i386/wcsncmp_asm.s + string/i386/wcsncpy_asm.s + string/i386/wcsnlen_asm.s + string/i386/wcsrchr_asm.s) else() -#TBD -endif() +list(APPEND LIBCNTPR_SOURCE + mem/memchr.c + mem/memcpy.c + mem/memmove.c + mem/memset.c + string/strcat.c + string/strchr.c + string/strcmp.c + string/strcpy.c + string/strlen.c + string/strncat.c + string/strncmp.c + string/strncpy.c + string/strnlen.c + string/strrchr.c + string/wcscat.c + string/wcschr.c + string/wcscmp.c + string/wcscpy.c + string/wcslen.c + string/wcsncat.c + string/wcsncmp.c + string/wcsncpy.c + string/wcsnlen.c + string/wcsrchr.c) +endif(ARCH MATCHES i386) add_library(libcntpr ${LIBCNTPR_SOURCE}) set_property(TARGET libcntpr PROPERTY COMPILE_DEFINITIONS NO_RTL_INLINES _NTSYSTEM_ _NTDLLBUILD_ _LIBCNT_ __CRT__NO_INLINE)

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs August 2010