Ros-diffs

ros-diffs@reactos.org

81390 discussions

[janderwald] 49189: [MMIXER] - Apply a hack to filter out pins, which are not part of filter node processing path - The hack filters out all pins which have a physical connection. Ideally the code ...
by janderwald＠svn.reactos.org 17 Oct '10

17 Oct '10

Author: janderwald Date: Sun Oct 17 21:15:21 2010 New Revision: 49189 URL: http://svn.reactos.org/svn/reactos?rev=49189&view=rev Log: [MMIXER] - Apply a hack to filter out pins, which are not part of filter node processing path - The hack filters out all pins which have a physical connection. Ideally the code should check if the pin is part of a different rendering path and in that case remove the pin. - Revert 49167 Modified: trunk/reactos/lib/drivers/sound/mmixer/controls.c Modified: trunk/reactos/lib/drivers/sound/mmixer/controls.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/mmixer/c… ============================================================================== --- trunk/reactos/lib/drivers/sound/mmixer/controls.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/sound/mmixer/controls.c [iso-8859-1] Sun Oct 17 21:15:21 2010 @@ -772,6 +772,47 @@ return Status; } +VOID +MMixerApplyOutputFilterHack( + IN PMIXER_CONTEXT MixerContext, + IN LPMIXER_DATA MixerData, + IN OUT PULONG PinsCount, + IN OUT PULONG Pins) +{ + ULONG Count = 0, Index; + MIXER_STATUS Status; + PKSPIN_PHYSICALCONNECTION Connection; + + for(Index = 0; Index < *PinsCount; Index++) + { + /* check if it has a physical connection */ + Status = MMixerGetPhysicalConnection(MixerContext, MixerData->hDevice, Pins[Index], &Connection); + + if (Status == MM_STATUS_SUCCESS) + { + /* remove pin */ + MixerContext->Copy(&Pins[Index], &Pins[Index + 1], (*PinsCount - (Index + 1)) * sizeof(ULONG)); + + /* free physical connection */ + MixerContext->Free(Connection); + + /* decrement index */ + Index--; + + /* decrement pin count */ + (*PinsCount)--; + } + else + { + /* simple pin */ + Count++; + } + } + + /* store result */ + *PinsCount = Count; +} + MIXER_STATUS MMixerHandlePhysicalConnection( IN PMIXER_CONTEXT MixerContext, @@ -797,7 +838,7 @@ return MM_STATUS_UNSUCCESSFUL; } - DPRINT("Name %S, Pin %lu bInput %lu\n", OutConnection->SymbolicLinkName, OutConnection->Pin, bInput); + DPRINT("Name %S, Pin %lu bInput %lu\n", OutConnection->SymbolicLinkName, OutConnection->Pin, bInput); /* store connected mixer handle */ MixerInfo->hMixer = MixerData->hDevice; @@ -832,10 +873,16 @@ /* return error code */ return Status; } + /* HACK: + * some topologies do not have strict boundaries + * WorkArround: remove all pin ids which have a physical connection + * because bridge pins may belong to different render paths + */ + MMixerApplyOutputFilterHack(MixerContext, MixerData, &PinsCount, Pins); /* sanity checks */ ASSERT(PinsCount != 0); - //ASSERT(PinsCount == 1); + ASSERT(PinsCount == 1); /* create destination line */ Status = MMixerBuildMixerDestinationLine(MixerContext, MixerInfo, Pins[0], bInput);

1 0

[sir_richard] 49188: [NTOS]: Fix brainfart (an interesting bug we would've never hit, but a bug nevertheless).
by sir_richard＠svn.reactos.org 17 Oct '10

17 Oct '10

Author: sir_richard Date: Sun Oct 17 20:11:04 2010 New Revision: 49188 URL: http://svn.reactos.org/svn/reactos?rev=49188&view=rev Log: [NTOS]: Fix brainfart (an interesting bug we would've never hit, but a bug nevertheless). Modified: trunk/reactos/ntoskrnl/mm/ARM3/virtual.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/virtual.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/virtual.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] Sun Oct 17 20:11:04 2010 @@ -323,7 +323,7 @@ /* Otherwise, we exited because we hit a new PDE boundary, so start over */ PointerPde = MiAddressToPde(Va); - } while (TRUE); + } } LONG

1 0

[sir_richard] 49187: [NTOS]: Use MI_SET_PFN_DELETED where we missed it. [NTOS]: Implement support for deleting user-mode pageable VM addresses. Now when cleaning up the process address space, MiDel...
by sir_richard＠svn.reactos.org 17 Oct '10

17 Oct '10

Author: sir_richard Date: Sun Oct 17 20:02:17 2010 New Revision: 49187 URL: http://svn.reactos.org/svn/reactos?rev=49187&view=rev Log: [NTOS]: Use MI_SET_PFN_DELETED where we missed it. [NTOS]: Implement support for deleting user-mode pageable VM addresses. Now when cleaning up the process address space, MiDeleteVirtualAddresses is called for the VADs, so this will now actually free the PEB/TEB pages that were previously getting leaked for each thread/process (a known regression I introduced when moving to VADs for PEB/TEB). Modified: trunk/reactos/ntoskrnl/mm/ARM3/miarm.h trunk/reactos/ntoskrnl/mm/ARM3/procsup.c trunk/reactos/ntoskrnl/mm/ARM3/virtual.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/miarm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/miarm.h?r… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] Sun Oct 17 20:02:17 2010 @@ -1205,6 +1205,21 @@ IN ULONG Protect ); +VOID +NTAPI +MiDeleteVirtualAddresses( + IN ULONG_PTR Va, + IN ULONG_PTR EndingAddress, + IN PMMVAD Vad +); + +ULONG +NTAPI +MiMakeSystemAddressValid( + IN PVOID PageTableVirtualAddress, + IN PEPROCESS CurrentProcess +); + // // MiRemoveZeroPage will use inline code to zero out the page manually if only // free pages are available. In some scenarios, we don't/can't run that piece of Modified: trunk/reactos/ntoskrnl/mm/ARM3/procsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/procsup.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/procsup.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/procsup.c [iso-8859-1] Sun Oct 17 20:02:17 2010 @@ -139,6 +139,8 @@ /* Insert the VAD */ ASSERT(Vad->EndingVpn >= Vad->StartingVpn); Process->VadRoot.NodeHint = Vad; + Vad->ControlArea = NULL; // For Memory-Area hack + Vad->FirstPrototypePte = NULL; MiInsertNode(&Process->VadRoot, (PVOID)Vad, Parent, Result); /* Release the working set */ @@ -258,7 +260,7 @@ MiDecrementShareCount(Pfn2, PageTableFrameNumber); #endif /* Set the special pending delete marker */ - Pfn1->PteAddress = (PMMPTE)((ULONG_PTR)Pfn1->PteAddress | 1); + MI_SET_PFN_DELETED(Pfn1); /* And now delete the actual stack page */ MiDecrementShareCount(Pfn1, PageFrameNumber); @@ -1174,7 +1176,6 @@ /* Enumerate the VADs */ VadTree = &Process->VadRoot; - DPRINT("Cleaning up VADs: %d\n", VadTree->NumberGenericTableElements); while (VadTree->NumberGenericTableElements) { /* Grab the current VAD */ @@ -1186,11 +1187,15 @@ /* Remove this VAD from the tree */ ASSERT(VadTree->NumberGenericTableElements >= 1); MiRemoveNode((PMMADDRESS_NODE)Vad, VadTree); - DPRINT("Moving on: %d\n", VadTree->NumberGenericTableElements); /* Only PEB/TEB VADs supported for now */ ASSERT(Vad->u.VadFlags.PrivateMemory == 1); ASSERT(Vad->u.VadFlags.VadType == VadNone); + + /* Delete the addresses */ + MiDeleteVirtualAddresses(Vad->StartingVpn << PAGE_SHIFT, + (Vad->EndingVpn << PAGE_SHIFT) | (PAGE_SIZE - 1), + Vad); /* Release the working set */ MiUnlockProcessWorkingSet(Process, Thread); Modified: trunk/reactos/ntoskrnl/mm/ARM3/virtual.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/virtual.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] Sun Oct 17 20:02:17 2010 @@ -28,6 +28,45 @@ OUT PULONG OldAccessProtection OPTIONAL); /* PRIVATE FUNCTIONS **********************************************************/ + +ULONG +NTAPI +MiMakeSystemAddressValid(IN PVOID PageTableVirtualAddress, + IN PEPROCESS CurrentProcess) +{ + NTSTATUS Status; + BOOLEAN LockChange = FALSE; + + /* Must be a non-pool page table, since those are double-mapped already */ + ASSERT(PageTableVirtualAddress > MM_HIGHEST_USER_ADDRESS); + ASSERT((PageTableVirtualAddress < MmPagedPoolStart) || + (PageTableVirtualAddress > MmPagedPoolEnd)); + + /* Working set lock or PFN lock should be held */ + ASSERT(KeAreAllApcsDisabled() == TRUE); + + /* Check if the page table is valid */ + while (!MmIsAddressValid(PageTableVirtualAddress)) + { + /* Fault it in */ + Status = MmAccessFault(FALSE, PageTableVirtualAddress, KernelMode, NULL); + if (!NT_SUCCESS(Status)) + { + /* This should not fail */ + KeBugCheckEx(KERNEL_DATA_INPAGE_ERROR, + 1, + Status, + (ULONG_PTR)CurrentProcess, + (ULONG_PTR)PageTableVirtualAddress); + } + + /* This flag will be useful later when we do better locking */ + LockChange = TRUE; + } + + /* Let caller know what the lock state is */ + return LockChange; +} PFN_NUMBER NTAPI @@ -126,6 +165,167 @@ return ActualPages; } +VOID +NTAPI +MiDeletePte(IN PMMPTE PointerPte, + IN PVOID VirtualAddress, + IN PEPROCESS CurrentProcess) +{ + PMMPFN Pfn1; + MMPTE PteContents; + PFN_NUMBER PageFrameIndex; + + /* PFN lock must be held */ + ASSERT(KeGetCurrentIrql() == DISPATCH_LEVEL); + + /* Capture the PTE */ + PteContents = *PointerPte; + + /* We only support valid PTEs for now */ + ASSERT(PteContents.u.Hard.Valid == 1); + ASSERT(PteContents.u.Soft.Prototype == 0); + ASSERT(PteContents.u.Soft.Transition == 0); + + /* Get the PFN entry */ + PageFrameIndex = PFN_FROM_PTE(&PteContents); + Pfn1 = MiGetPfnEntry(PageFrameIndex); + + /* We don't support deleting prototype PTEs for now */ + ASSERT(Pfn1->u3.e1.PrototypePte == 0); + + /* Make sure the saved PTE address is valid */ + if ((PMMPTE)((ULONG_PTR)Pfn1->PteAddress & ~0x1) != PointerPte) + { + /* The PFN entry is illegal, or invalid */ + KeBugCheckEx(MEMORY_MANAGEMENT, + 0x401, + (ULONG_PTR)PointerPte, + PointerPte->u.Long, + (ULONG_PTR)Pfn1->PteAddress); + } + + /* There should only be 1 shared reference count */ + ASSERT(Pfn1->u2.ShareCount == 1); + + /* FIXME: Drop the reference on the page table. For now, leak it until RosMM is gone */ + //MiDecrementShareCount(MiGetPfnEntry(Pfn1->u4.PteFrame), Pfn1->u4.PteFrame); + + /* Mark the PFN for deletion and dereference what should be the last ref */ + MI_SET_PFN_DELETED(Pfn1); + MiDecrementShareCount(Pfn1, PageFrameIndex); + + /* We should eventually do this */ + //CurrentProcess->NumberOfPrivatePages--; + + /* Destroy the PTE and flush the TLB */ + PointerPte->u.Long = 0; + KeFlushCurrentTb(); +} + +VOID +NTAPI +MiDeleteVirtualAddresses(IN ULONG_PTR Va, + IN ULONG_PTR EndingAddress, + IN PMMVAD Vad) +{ + PMMPTE PointerPte, PointerPde; + MMPTE TempPte; + PEPROCESS CurrentProcess; + KIRQL OldIrql; + + /* Grab the process and PTE/PDE for the address being deleted */ + CurrentProcess = PsGetCurrentProcess(); + PointerPde = MiAddressToPde(Va); + PointerPte = MiAddressToPte(Va); + + /* We usually only get a VAD when it's not a VM address */ + if (Vad) + { + /* At process deletion, we may get a VAD, but it should be a VM VAD */ + ASSERT(Vad->u.VadFlags.PrivateMemory); + ASSERT(Vad->FirstPrototypePte == NULL); + + /* Get out if this is a fake VAD, RosMm will free the marea pages */ + if (Vad->u.VadFlags.Spare == 1) return; + } + + /* In all cases, we don't support fork() yet */ + ASSERT(CurrentProcess->CloneRoot == NULL); + + /* Loop the PTE for each VA */ + while (TRUE) + { + /* First keep going until we find a valid PDE */ + while (PointerPde->u.Long == 0) + { + /* Still no valid PDE, try the next 4MB (or whatever) */ + PointerPde++; + + /* Update the PTE on this new boundary */ + PointerPte = MiPteToAddress(PointerPde); + + /* Check if all the PDEs are invalid, so there's nothing to free */ + Va = (ULONG_PTR)MiPteToAddress(PointerPte); + if (Va > EndingAddress) return; + } + + /* Now check if the PDE is mapped in */ + if (PointerPde->u.Hard.Valid == 0) + { + /* It isn't, so map it in */ + PointerPte = MiPteToAddress(PointerPde); + MiMakeSystemAddressValid(PointerPte, CurrentProcess); + } + + /* Now we should have a valid PDE, mapped in, and still have some VA */ + ASSERT(PointerPde->u.Hard.Valid == 1); + ASSERT(Va <= EndingAddress); + + /* Lock the PFN Database while we delete the PTEs */ + OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + do + { + /* Capture the PDE and make sure it exists */ + TempPte = *PointerPte; + if (TempPte.u.Long) + { + /* Check if the PTE is actually mapped in */ + if (TempPte.u.Long & 0xFFFFFC01) + { + /* It is, we don't support prototype PTEs for now though */ + ASSERT(TempPte.u.Soft.Prototype == 0); + + /* Delete the PTE proper */ + MiDeletePte(PointerPte, (PVOID)Va, CurrentProcess); + } + else + { + /* The PTE was never mapped, just nuke it here */ + PointerPte->u.Long = 0; + } + } + + /* Update the address and PTE for it */ + Va += PAGE_SIZE; + PointerPte++; + + /* Making sure the PDE is still valid */ + ASSERT(PointerPde->u.Hard.Valid == 1); + } + while ((Va & (PDE_MAPPED_VA - 1)) && (Va <= EndingAddress)); + + /* The PDE should still be valid at this point */ + ASSERT(PointerPde->u.Hard.Valid == 1); + + /* Release the lock and get out if we're done */ + KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); + if (Va > EndingAddress) return; + + /* Otherwise, we exited because we hit a new PDE boundary, so start over */ + PointerPde = MiAddressToPde(Va); + } while (TRUE); +} + LONG MiGetExceptionInfo(IN PEXCEPTION_POINTERS ExceptionInfo, OUT PBOOLEAN HaveBadAddress,

1 0

[sir_richard] 49186: [NTOS]: Handle faults on non-demand-zero PTEs (and/or demand-zero PTEs that are not READWRITE (such as EXECUTE_READWRITE)).
by sir_richard＠svn.reactos.org 17 Oct '10

17 Oct '10

Author: sir_richard Date: Sun Oct 17 19:56:04 2010 New Revision: 49186 URL: http://svn.reactos.org/svn/reactos?rev=49186&view=rev Log: [NTOS]: Handle faults on non-demand-zero PTEs (and/or demand-zero PTEs that are not READWRITE (such as EXECUTE_READWRITE)). Modified: trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c 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 Oct 17 19:56:04 2010 @@ -929,11 +929,37 @@ return STATUS_PAGE_FAULT_DEMAND_ZERO; } - /* Don't handle prototype PTEs yet -- only kernel demand zero PTEs */ + /* Get protection and check if it's a prototype PTE */ + ProtectionCode = TempPte.u.Soft.Protection; ASSERT(TempPte.u.Soft.Prototype == 0); + + /* Check for non-demand zero PTE */ + if (TempPte.u.Long != 0) + { + /* This is a page fault, check for valid protection */ + ASSERT(ProtectionCode != 0x100); + + /* FIXME: Run MiAccessCheck */ + + /* Dispatch the fault */ + Status = MiDispatchFault(StoreInstruction, + Address, + PointerPte, + NULL, + FALSE, + PsGetCurrentProcess(), + TrapInformation, + NULL); + + /* Return the status */ + ASSERT(NT_SUCCESS(Status)); + ASSERT(KeGetCurrentIrql() <= APC_LEVEL); + MiUnlockProcessWorkingSet(CurrentProcess, CurrentThread); + return Status; + } + + /* Check if this address range belongs to a valid allocation (VAD) */ ASSERT(TempPte.u.Long == 0); - - /* Check if this address range belongs to a valid allocation (VAD) */ ProtoPte = MiCheckVirtualAddress(Address, &ProtectionCode, &Vad); if (ProtectionCode == MM_NOACCESS) {

1 0

[dreimer] 49185: Sync the out of sync winemine to Wine 1.3.5 and fork it, because of the modified look, improved resources and different code structure. Additionally call it winmine, as it is in wi...
by dreimer＠svn.reactos.org 17 Oct '10

17 Oct '10

Author: dreimer Date: Sun Oct 17 17:04:39 2010 New Revision: 49185 URL: http://svn.reactos.org/svn/reactos?rev=49185&view=rev Log: Sync the out of sync winemine to Wine 1.3.5 and fork it, because of the modified look, improved resources and different code structure. Additionally call it winmine, as it is in windows, too. Added: trunk/reactos/base/applications/games/winmine/ - copied from r49180, trunk/reactos/base/applications/games/winemine/ trunk/reactos/base/applications/games/winmine/lang/da-DK.rc (with props) trunk/reactos/base/applications/games/winmine/lang/fi-FI.rc (with props) trunk/reactos/base/applications/games/winmine/lang/pt-PT.rc (with props) trunk/reactos/base/applications/games/winmine/lang/ro-RO.rc (with props) trunk/reactos/base/applications/games/winmine/lang/sl-SI.rc (with props) trunk/reactos/base/applications/games/winmine/lang/sv-SE.rc (with props) trunk/reactos/base/applications/games/winmine/lang/tr-TR.rc (with props) trunk/reactos/base/applications/games/winmine/winmine.rbuild (with props) Removed: trunk/reactos/base/applications/games/winemine/ trunk/reactos/base/applications/games/winmine/README trunk/reactos/base/applications/games/winmine/dialog.h trunk/reactos/base/applications/games/winmine/lang/bg-BG.rc trunk/reactos/base/applications/games/winmine/lang/ca-ES.rc trunk/reactos/base/applications/games/winmine/lang/el-GR.rc trunk/reactos/base/applications/games/winmine/lang/eu-ES.rc trunk/reactos/base/applications/games/winmine/lang/id-ID.rc trunk/reactos/base/applications/games/winmine/lang/sk-SK.rc trunk/reactos/base/applications/games/winmine/lang/th-TH.rc trunk/reactos/base/applications/games/winmine/winemine.rbuild Modified: trunk/reactos/base/applications/games/games.rbuild trunk/reactos/base/applications/games/winmine/dialog.c trunk/reactos/base/applications/games/winmine/lang/cs-CZ.rc trunk/reactos/base/applications/games/winmine/lang/de-DE.rc trunk/reactos/base/applications/games/winmine/lang/en-US.rc trunk/reactos/base/applications/games/winmine/lang/es-ES.rc trunk/reactos/base/applications/games/winmine/lang/fr-FR.rc trunk/reactos/base/applications/games/winmine/lang/it-IT.rc trunk/reactos/base/applications/games/winmine/lang/ja-JP.rc trunk/reactos/base/applications/games/winmine/lang/ko-KR.rc trunk/reactos/base/applications/games/winmine/lang/lt-LT.rc trunk/reactos/base/applications/games/winmine/lang/nl-NL.rc trunk/reactos/base/applications/games/winmine/lang/no-NO.rc trunk/reactos/base/applications/games/winmine/lang/pl-PL.rc trunk/reactos/base/applications/games/winmine/lang/ru-RU.rc trunk/reactos/base/applications/games/winmine/lang/uk-UA.rc trunk/reactos/base/applications/games/winmine/lang/zh-CN.rc trunk/reactos/base/applications/games/winmine/main.c trunk/reactos/base/applications/games/winmine/main.h trunk/reactos/base/applications/games/winmine/resource.h trunk/reactos/base/applications/games/winmine/rsrc.rc trunk/reactos/boot/bootdata/packages/reactos.dff trunk/reactos/dll/win32/syssetup/install.c trunk/reactos/media/doc/README.WINE [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/base/applications/games/games.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/ga… Removed: trunk/reactos/base/applications/games/winmine/README URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Modified: trunk/reactos/base/applications/games/winmine/dialog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Removed: trunk/reactos/base/applications/games/winmine/dialog.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Removed: trunk/reactos/base/applications/games/winmine/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Removed: trunk/reactos/base/applications/games/winmine/lang/ca-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Modified: trunk/reactos/base/applications/games/winmine/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Added: trunk/reactos/base/applications/games/winmine/lang/da-DK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Modified: trunk/reactos/base/applications/games/winmine/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Removed: trunk/reactos/base/applications/games/winmine/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Modified: trunk/reactos/base/applications/games/winmine/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Modified: trunk/reactos/base/applications/games/winmine/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Removed: trunk/reactos/base/applications/games/winmine/lang/eu-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Added: trunk/reactos/base/applications/games/winmine/lang/fi-FI.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Modified: trunk/reactos/base/applications/games/winmine/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Removed: trunk/reactos/base/applications/games/winmine/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Modified: trunk/reactos/base/applications/games/winmine/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Modified: trunk/reactos/base/applications/games/winmine/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Modified: trunk/reactos/base/applications/games/winmine/lang/ko-KR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Modified: trunk/reactos/base/applications/games/winmine/lang/lt-LT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Modified: trunk/reactos/base/applications/games/winmine/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Modified: trunk/reactos/base/applications/games/winmine/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Modified: trunk/reactos/base/applications/games/winmine/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Added: trunk/reactos/base/applications/games/winmine/lang/pt-PT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Added: trunk/reactos/base/applications/games/winmine/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Modified: trunk/reactos/base/applications/games/winmine/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Removed: trunk/reactos/base/applications/games/winmine/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Added: trunk/reactos/base/applications/games/winmine/lang/sl-SI.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Added: trunk/reactos/base/applications/games/winmine/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Removed: trunk/reactos/base/applications/games/winmine/lang/th-TH.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Added: trunk/reactos/base/applications/games/winmine/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Modified: trunk/reactos/base/applications/games/winmine/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Modified: trunk/reactos/base/applications/games/winmine/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Modified: trunk/reactos/base/applications/games/winmine/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Modified: trunk/reactos/base/applications/games/winmine/main.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Modified: trunk/reactos/base/applications/games/winmine/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Modified: trunk/reactos/base/applications/games/winmine/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Removed: trunk/reactos/base/applications/games/winmine/winemine.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Added: trunk/reactos/base/applications/games/winmine/winmine.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… Modified: trunk/reactos/dll/win32/syssetup/install.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/install… Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=…

1 0

[ekohl] 49184: [ADVAPI32] Move the Encrypted File System (EFS) functions into their own file.
by ekohl＠svn.reactos.org 17 Oct '10

17 Oct '10

Author: ekohl Date: Sun Oct 17 15:01:46 2010 New Revision: 49184 URL: http://svn.reactos.org/svn/reactos?rev=49184&view=rev Log: [ADVAPI32] Move the Encrypted File System (EFS) functions into their own file. Added: trunk/reactos/dll/win32/advapi32/misc/efs.c (with props) Modified: trunk/reactos/dll/win32/advapi32/advapi32.rbuild trunk/reactos/dll/win32/advapi32/sec/sec.c Modified: trunk/reactos/dll/win32/advapi32/advapi32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/advapi3… ============================================================================== --- trunk/reactos/dll/win32/advapi32/advapi32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/advapi32.rbuild [iso-8859-1] Sun Oct 17 15:01:46 2010 @@ -28,6 +28,7 @@ </directory> <directory name="misc"> <file>dllmain.c</file> + <file>efs.c</file> <file>hwprofiles.c</file> <file>logon.c</file> <file>msi.c</file> Added: trunk/reactos/dll/win32/advapi32/misc/efs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/misc/ef… ============================================================================== --- trunk/reactos/dll/win32/advapi32/misc/efs.c (added) +++ trunk/reactos/dll/win32/advapi32/misc/efs.c [iso-8859-1] Sun Oct 17 15:01:46 2010 @@ -1,0 +1,85 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS system libraries + * FILE: dlls/win32/advapi32/misc/efs.c + * PURPOSE: Encrypted File System support + * PROGRAMMER: Christoph_vW + */ + +#include <advapi32.h> +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(advapi); + + +/* + * @implemented + */ +BOOL WINAPI +DecryptFileA(LPCSTR lpFileName, DWORD dwReserved) +{ + UNICODE_STRING FileName; + NTSTATUS Status; + BOOL ret; + + Status = RtlCreateUnicodeStringFromAsciiz(&FileName, lpFileName); + if (!NT_SUCCESS(Status)) + { + SetLastError(RtlNtStatusToDosError(Status)); + return FALSE; + } + + ret = DecryptFileW(FileName.Buffer, dwReserved); + + if (FileName.Buffer != NULL) + RtlFreeUnicodeString(&FileName); + return ret; +} + + +/* + * @unimplemented + */ +BOOL WINAPI DecryptFileW(LPCWSTR lpFileName, DWORD dwReserved) +{ + FIXME("%s(%S) not implemented!\n", __FUNCTION__, lpFileName); + return TRUE; +} + + +/* + * @implemented + */ +BOOL WINAPI +EncryptFileA(LPCSTR lpFileName) +{ + UNICODE_STRING FileName; + NTSTATUS Status; + BOOL ret; + + Status = RtlCreateUnicodeStringFromAsciiz(&FileName, lpFileName); + if (!NT_SUCCESS(Status)) + { + SetLastError(RtlNtStatusToDosError(Status)); + return FALSE; + } + + ret = EncryptFileW(FileName.Buffer); + + if (FileName.Buffer != NULL) + RtlFreeUnicodeString(&FileName); + return ret; +} + + +/* + * @unimplemented + */ +BOOL WINAPI +EncryptFileW(LPCWSTR lpFileName) +{ + FIXME("%s() not implemented!\n", __FUNCTION__); + return TRUE; +} + +/* EOF */ Propchange: trunk/reactos/dll/win32/advapi32/misc/efs.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/win32/advapi32/misc/efs.c ------------------------------------------------------------------------------ svn:keywords = author date id revision Modified: trunk/reactos/dll/win32/advapi32/sec/sec.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/sec/sec… ============================================================================== --- trunk/reactos/dll/win32/advapi32/sec/sec.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/sec/sec.c [iso-8859-1] Sun Oct 17 15:01:46 2010 @@ -534,75 +534,4 @@ return FALSE; } - -/* - * @unimplemented - */ -BOOL WINAPI DecryptFileW(LPCWSTR lpFileName, DWORD dwReserved) -{ - FIXME("%s(%S) not implemented!\n", __FUNCTION__, lpFileName); - return TRUE; -} - - -/* - * @implemented - */ -BOOL WINAPI -DecryptFileA(LPCSTR lpFileName, DWORD dwReserved) -{ - UNICODE_STRING FileName; - NTSTATUS Status; - BOOL ret; - - Status = RtlCreateUnicodeStringFromAsciiz(&FileName, lpFileName); - if (!NT_SUCCESS(Status)) - { - SetLastError(RtlNtStatusToDosError(Status)); - return FALSE; - } - - ret = DecryptFileW(FileName.Buffer, dwReserved); - - if (FileName.Buffer != NULL) - RtlFreeUnicodeString(&FileName); - return ret; -} - - -/* - * @unimplemented - */ -BOOL WINAPI -EncryptFileW(LPCWSTR lpFileName) -{ - FIXME("%s() not implemented!\n", __FUNCTION__); - return TRUE; -} - - -/* - * @implemented - */ -BOOL WINAPI -EncryptFileA(LPCSTR lpFileName) -{ - UNICODE_STRING FileName; - NTSTATUS Status; - BOOL ret; - - Status = RtlCreateUnicodeStringFromAsciiz(&FileName, lpFileName); - if (!NT_SUCCESS(Status)) - { - SetLastError(RtlNtStatusToDosError(Status)); - return FALSE; - } - - ret = EncryptFileW(FileName.Buffer); - - if (FileName.Buffer != NULL) - RtlFreeUnicodeString(&FileName); - return ret; -} - /* EOF */

1 0

[ekohl] 49183: [PSDK] Add DecryptFileA/W prototype.
by ekohl＠svn.reactos.org 17 Oct '10

17 Oct '10

Author: ekohl Date: Sun Oct 17 14:54:59 2010 New Revision: 49183 URL: http://svn.reactos.org/svn/reactos?rev=49183&view=rev Log: [PSDK] Add DecryptFileA/W prototype. Modified: trunk/reactos/include/psdk/winbase.h Modified: trunk/reactos/include/psdk/winbase.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winbase.h?rev… ============================================================================== --- trunk/reactos/include/psdk/winbase.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winbase.h [iso-8859-1] Sun Oct 17 14:54:59 2010 @@ -1399,6 +1399,8 @@ #endif PVOID WINAPI DecodePointer(PVOID); PVOID WINAPI DecodeSystemPointer(PVOID); +BOOL WINAPI DecryptFileA(LPCSTR,DWORD); +BOOL WINAPI DecryptFileW(LPCWSTR,DWORD); BOOL WINAPI DefineDosDeviceA(DWORD,LPCSTR,LPCSTR); BOOL WINAPI DefineDosDeviceW(DWORD,LPCWSTR,LPCWSTR); #define DefineHandleTable(w) ((w),TRUE) @@ -2374,6 +2376,7 @@ #define CreateProcessAsUser CreateProcessAsUserW #define CreateSemaphore CreateSemaphoreW #define CreateWaitableTimer CreateWaitableTimerW +#define DecryptFile DecryptFileW #define DefineDosDevice DefineDosDeviceW #define DeleteFile DeleteFileW #if (_WIN32_WINNT >= 0x0500) @@ -2577,6 +2580,7 @@ #define CreateProcessAsUser CreateProcessAsUserA #define CreateSemaphore CreateSemaphoreA #define CreateWaitableTimer CreateWaitableTimerA +#define DecryptFile DecryptFileA #define DefineDosDevice DefineDosDeviceA #define DeleteFile DeleteFileA #if (_WIN32_WINNT >= 0x0500)

1 0

[spetreolle] 49182: [APITESTS] Fix (R)TEST macros in gdi32_apitest, ensures correct display and no crash report in testman.
by spetreolle＠svn.reactos.org 17 Oct '10

17 Oct '10

Author: spetreolle Date: Sun Oct 17 14:50:02 2010 New Revision: 49182 URL: http://svn.reactos.org/svn/reactos?rev=49182&view=rev Log: [APITESTS] Fix (R)TEST macros in gdi32_apitest, ensures correct display and no crash report in testman. Modified: trunk/rostests/apitests/gdi32/GetDIBits.c trunk/rostests/apitests/gdi32/GetStockObject.c trunk/rostests/apitests/gdi32/GetTextExtentExPoint.c trunk/rostests/apitests/gdi32/GetTextFace.c trunk/rostests/apitests/gdi32/SelectObject.c trunk/rostests/apitests/gdi32/SetMapMode.c trunk/rostests/apitests/gdi32/SetSysColors.c trunk/rostests/apitests/gdi32/SetWindowExtEx.c Modified: trunk/rostests/apitests/gdi32/GetDIBits.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/GetDIBits.… ============================================================================== --- trunk/rostests/apitests/gdi32/GetDIBits.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/GetDIBits.c [iso-8859-1] Sun Oct 17 14:50:02 2010 @@ -9,8 +9,8 @@ #include <wine/test.h> #include <windows.h> -#define TEST(x) ok(x, #x) -#define RTEST(x) ok(x, #x) +#define TEST(x) ok(x, #x"\n") +#define RTEST(x) ok(x, #x"\n") void Test_GetDIBits() { Modified: trunk/rostests/apitests/gdi32/GetStockObject.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/GetStockOb… ============================================================================== --- trunk/rostests/apitests/gdi32/GetStockObject.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/GetStockObject.c [iso-8859-1] Sun Oct 17 14:50:02 2010 @@ -12,8 +12,8 @@ #include <reactos/win32k/ntgdityp.h> #include <reactos/win32k/ntgdihdl.h> -#define TEST(x) ok(x, #x) -#define RTEST(x) ok(x, #x) +#define TEST(x) ok(x, #x"\n") +#define RTEST(x) ok(x, #x"\n") void Test_GetStockObject() { Modified: trunk/rostests/apitests/gdi32/GetTextExtentExPoint.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/GetTextExt… ============================================================================== --- trunk/rostests/apitests/gdi32/GetTextExtentExPoint.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/GetTextExtentExPoint.c [iso-8859-1] Sun Oct 17 14:50:02 2010 @@ -9,8 +9,8 @@ #include <wine/test.h> #include <windows.h> -#define TEST(x) ok(x, #x) -#define RTEST(x) ok(x, #x) +#define TEST(x) ok(x, #x"\n") +#define RTEST(x) ok(x, #x"\n") void Test_GetTextExtentExPoint() { Modified: trunk/rostests/apitests/gdi32/GetTextFace.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/GetTextFac… ============================================================================== --- trunk/rostests/apitests/gdi32/GetTextFace.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/GetTextFace.c [iso-8859-1] Sun Oct 17 14:50:02 2010 @@ -9,8 +9,8 @@ #include <wine/test.h> #include <windows.h> -#define TEST(x) ok(x, #x) -#define RTEST(x) ok(x, #x) +#define TEST(x) ok(x, #x"\n") +#define RTEST(x) ok(x, #x"\n") void Test_GetTextFace() { Modified: trunk/rostests/apitests/gdi32/SelectObject.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/SelectObje… ============================================================================== --- trunk/rostests/apitests/gdi32/SelectObject.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/SelectObject.c [iso-8859-1] Sun Oct 17 14:50:02 2010 @@ -12,8 +12,8 @@ #include <reactos/win32k/ntgdityp.h> #include <reactos/win32k/ntgdihdl.h> -#define TEST(x) ok(x, #x) -#define RTEST(x) ok(x, #x) +#define TEST(x) ok(x, #x"\n") +#define RTEST(x) ok(x, #x"\n") void Test_SelectObject() { @@ -101,7 +101,7 @@ RTEST((UINT_PTR)SelectObject(hDC, hNewObj) == SIMPLEREGION); // ??? Why this? DeleteObject(hNewObj); // TEST(IsHandleValid(hNewObj) == TRUE); - + RTEST(GetLastError() == ERROR_SUCCESS); /* Test BITMAP */ Modified: trunk/rostests/apitests/gdi32/SetMapMode.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/SetMapMode… ============================================================================== --- trunk/rostests/apitests/gdi32/SetMapMode.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/SetMapMode.c [iso-8859-1] Sun Oct 17 14:50:02 2010 @@ -9,8 +9,8 @@ #include <wine/test.h> #include <windows.h> -#define TEST(x) ok(x, #x) -#define RTEST(x) ok(x, #x) +#define TEST(x) ok(x, #x"\n") +#define RTEST(x) ok(x, #x"\n") void Test_SetMapMode() { Modified: trunk/rostests/apitests/gdi32/SetSysColors.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/SetSysColo… ============================================================================== --- trunk/rostests/apitests/gdi32/SetSysColors.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/SetSysColors.c [iso-8859-1] Sun Oct 17 14:50:02 2010 @@ -9,8 +9,8 @@ #include <wine/test.h> #include <windows.h> -#define TEST(x) ok(x, #x) -#define RTEST(x) ok(x, #x) +#define TEST(x) ok(x, #x"\n") +#define RTEST(x) ok(x, #x"\n") #define NUM_SYSCOLORS 31 Modified: trunk/rostests/apitests/gdi32/SetWindowExtEx.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/SetWindowE… ============================================================================== --- trunk/rostests/apitests/gdi32/SetWindowExtEx.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/SetWindowExtEx.c [iso-8859-1] Sun Oct 17 14:50:02 2010 @@ -9,8 +9,8 @@ #include <wine/test.h> #include <windows.h> -#define TEST(x) ok(x, #x) -#define RTEST(x) ok(x, #x) +#define TEST(x) ok(x, #x"\n") +#define RTEST(x) ok(x, #x"\n") void Test_SetWindowExtEx() { @@ -101,7 +101,7 @@ //TEST(WindowExt.cy == 2700); /* Values should be changed */ - ret = SetWindowExtEx(hDC, + ret = SetWindowExtEx(hDC, 4 * GetDeviceCaps(GetDC(0), HORZRES), -4 * GetDeviceCaps(GetDC(0), VERTRES), &WindowExt);

1 0

[spetreolle] 49181: Katayama Hirofumi: Add / update Japanese translations. Fix typos in calc en-US resource. Bug #5673, 5674, 5675, 5676.
by spetreolle＠svn.reactos.org 17 Oct '10

17 Oct '10

Author: spetreolle Date: Sun Oct 17 12:47:02 2010 New Revision: 49181 URL: http://svn.reactos.org/svn/reactos?rev=49181&view=rev Log: Katayama Hirofumi: Add / update Japanese translations. Fix typos in calc en-US resource. Bug #5673,5674,5675,5676. Added: trunk/reactos/base/applications/calc/lang/ja-JP.rc (with props) Modified: trunk/reactos/base/applications/calc/lang/en-US.rc trunk/reactos/base/applications/calc/resource.rc trunk/reactos/base/setup/usetup/lang/ja-JP.h trunk/reactos/dll/win32/newdev/lang/ja-JP.rc trunk/reactos/dll/win32/syssetup/lang/ja-JP.rc Modified: trunk/reactos/base/applications/calc/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/lang/en-US.rc [iso-8859-1] Sun Oct 17 12:47:02 2010 @@ -343,8 +343,8 @@ BEGIN POPUP "Edit" BEGIN - MENUITEM "Copy\tCTRL-C", IDM_EDIT_COPY - MENUITEM "Paste\tCTRL-V", IDM_EDIT_PASTE + MENUITEM "Copy\tCtrl+C", IDM_EDIT_COPY + MENUITEM "Paste\tCtrl+V", IDM_EDIT_PASTE END POPUP "View" BEGIN @@ -375,8 +375,8 @@ BEGIN POPUP "Edit" BEGIN - MENUITEM "Copy\tCTRL-C", IDM_EDIT_COPY - MENUITEM "Paste\tCTRL-V", IDM_EDIT_PASTE + MENUITEM "Copy\tCtrl+C", IDM_EDIT_COPY + MENUITEM "Paste\tCtrl+V", IDM_EDIT_PASTE END POPUP "View" BEGIN @@ -408,8 +408,8 @@ BEGIN POPUP "Edit" BEGIN - MENUITEM "Copy\tCTRL-C", IDM_EDIT_COPY - MENUITEM "Paste\tCTRL-V", IDM_EDIT_PASTE + MENUITEM "Copy\tCtrl+C", IDM_EDIT_COPY + MENUITEM "Paste\tCtrl+V", IDM_EDIT_PASTE END POPUP "View" BEGIN Added: trunk/reactos/base/applications/calc/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/ja-JP.rc (added) +++ trunk/reactos/base/applications/calc/lang/ja-JP.rc [iso-8859-1] Sun Oct 17 12:47:02 2010 @@ -1,0 +1,732 @@ +LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT + +// Dialog + +IDD_DIALOG_SCIENTIFIC DIALOGEX 0, 0, 316, 161 +STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "ReactOS dì" +MENU IDR_MENU_SCIENTIFIC_1 +FONT 9, "MS UI Gothic", 0, 0, 0x1 +BEGIN + GROUPBOX "",IDC_STATIC,4,16,132,21 + CONTROL "16i",IDC_RADIO_HEX,"Button",BS_AUTORADIOBUTTON,8,24,29,10 + CONTROL "10i",IDC_RADIO_DEC,"Button",BS_AUTORADIOBUTTON,40,24,29,10 + CONTROL "8i",IDC_RADIO_OCT,"Button",BS_AUTORADIOBUTTON,72,24,27,10 + CONTROL "2i",IDC_RADIO_BIN,"Button",BS_AUTORADIOBUTTON,100,24,26,10 + GROUPBOX "",IDC_STATIC,4,36,76,21 + CONTROL "Inv",IDC_CHECK_INV,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,8,44,26,10 + CONTROL "Hyp",IDC_CHECK_HYP,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,40,44,29,10 + CTEXT "",IDC_TEXT_PARENT,84,40,24,17,SS_CENTERIMAGE, + WS_EX_CLIENTEDGE + CTEXT "",IDC_TEXT_MEMORY,112,40,24,17,SS_CENTERIMAGE, + WS_EX_CLIENTEDGE + PUSHBUTTON "Sta",IDC_BUTTON_STA,4,64,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "Ave",IDC_BUTTON_AVE,4,83,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | WS_DISABLED | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "Sum",IDC_BUTTON_SUM,4,102,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | WS_DISABLED | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "s",IDC_BUTTON_S,4,121,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | WS_DISABLED | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "Dat",IDC_BUTTON_DAT,4,140,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | WS_DISABLED | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "F-E",IDC_BUTTON_FE,38,64,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "dms",IDC_BUTTON_DMS,38,83,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "sin",IDC_BUTTON_SIN,38,102,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "cos",IDC_BUTTON_COS,38,121,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "tan",IDC_BUTTON_TAN,38,140,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "(",IDC_BUTTON_LEFTPAR,64,64,24,17,BS_CENTER | + BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "Exp",IDC_BUTTON_EXP,64,83,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "x^y",IDC_BUTTON_XeY,64,102,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "x^2",IDC_BUTTON_Xe2,64,121,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "x^3",IDC_BUTTON_Xe3,64,140,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON ")",IDC_BUTTON_RIGHTPAR,90,64,24,17,BS_CENTER | + BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "ln",IDC_BUTTON_LN,90,83,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "log",IDC_BUTTON_LOG,90,102,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "n!",IDC_BUTTON_NF,90,121,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "1/x",IDC_BUTTON_RX,90,140,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "MC",IDC_BUTTON_MC,124,64,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "MR",IDC_BUTTON_MR,124,83,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "MS",IDC_BUTTON_MS,124,102,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "M+",IDC_BUTTON_MP,124,121,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "pi",IDC_BUTTON_PI,124,140,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "7",IDC_BUTTON_7,158,64,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "4",IDC_BUTTON_4,158,83,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "1",IDC_BUTTON_1,158,102,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "0",IDC_BUTTON_0,158,121,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "A",IDC_BUTTON_A,158,140,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "8",IDC_BUTTON_8,184,64,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "5",IDC_BUTTON_5,184,83,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "2",IDC_BUTTON_2,184,102,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "+/-",IDC_BUTTON_SIGN,184,121,24,17,BS_CENTER | + BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "B",IDC_BUTTON_B,184,140,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "9",IDC_BUTTON_9,210,64,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "6",IDC_BUTTON_6,210,83,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "3",IDC_BUTTON_3,210,102,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON ",",IDC_BUTTON_DOT,210,121,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "C",IDC_BUTTON_C,210,140,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "/",IDC_BUTTON_DIV,236,64,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "*",IDC_BUTTON_MULT,236,83,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "-",IDC_BUTTON_SUB,236,102,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "+",IDC_BUTTON_ADD,236,121,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "D",IDC_BUTTON_D,236,140,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "Mod",IDC_BUTTON_MOD,262,64,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "Or",IDC_BUTTON_OR,262,83,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "Lsh",IDC_BUTTON_LSH,262,102,24,17,BS_CENTER | + BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "=",IDC_BUTTON_EQU,262,121,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "E",IDC_BUTTON_E,262,140,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "And",IDC_BUTTON_AND,288,64,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "Xor",IDC_BUTTON_XOR,288,83,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "Not",IDC_BUTTON_NOT,288,102,24,17,BS_CENTER | + BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "Int",IDC_BUTTON_INT,288,121,24,17,BS_CENTER | + BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "F",IDC_BUTTON_F,288,140,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + GROUPBOX "",IDC_STATIC,140,16,172,21 + CONTROL "Qword",IDC_RADIO_QWORD,"Button",BS_AUTORADIOBUTTON | + NOT WS_VISIBLE,148,24,37,10 + CONTROL "Dword",IDC_RADIO_DWORD,"Button",BS_AUTORADIOBUTTON | + NOT WS_VISIBLE,188,24,37,10 + CONTROL "Word",IDC_RADIO_WORD,"Button",BS_AUTORADIOBUTTON | NOT + WS_VISIBLE,232,24,33,10 + CONTROL "Byte",IDC_RADIO_BYTE,"Button",BS_AUTORADIOBUTTON | NOT + WS_VISIBLE,272,24,30,10 + CONTROL "Degrees",IDC_RADIO_DEG,"Button",BS_AUTORADIOBUTTON,148,24, + 42,10 + CONTROL "Radians",IDC_RADIO_RAD,"Button",BS_AUTORADIOBUTTON,192, + 24,42,10 + CONTROL "Gradians",IDC_RADIO_GRAD,"Button",BS_AUTORADIOBUTTON, + 236,24,44,10 + PUSHBUTTON "C",IDC_BUTTON_CANC,272,40,40,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "CE",IDC_BUTTON_CE,228,40,40,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "Back",IDC_BUTTON_BACK,184,40,40,17,BS_CENTER | + BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + RTEXT "",IDC_TEXT_OUTPUT,4,4,308,12,SS_CENTERIMAGE, + WS_EX_CLIENTEDGE + DEFPUSHBUTTON "",IDC_BUTTON_FOCUS,0,0,5,5, NOT WS_VISIBLE +END + +IDD_DIALOG_STANDARD DIALOGEX 0, 0, 172, 127 +STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "ReactOS dì" +MENU IDR_MENU_STANDARD +FONT 9, "MS UI Gothic", 0, 0, 0x1 +BEGIN + PUSHBUTTON "C",IDC_BUTTON_CANC,128,24,40,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "CE",IDC_BUTTON_CE,84,24,40,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "Back",IDC_BUTTON_BACK,40,24,40,17,BS_CENTER | + BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + RTEXT "",IDC_TEXT_OUTPUT,4,4,164,12,SS_CENTERIMAGE, + WS_EX_CLIENTEDGE + PUSHBUTTON "7",IDC_BUTTON_7,40,48,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "4",IDC_BUTTON_4,40,67,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "1",IDC_BUTTON_1,40,86,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "0",IDC_BUTTON_0,40,105,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "8",IDC_BUTTON_8,66,48,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "5",IDC_BUTTON_5,66,67,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "2",IDC_BUTTON_2,66,86,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "+/-",IDC_BUTTON_SIGN,66,105,24,17,BS_CENTER | + BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "9",IDC_BUTTON_9,92,48,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "6",IDC_BUTTON_6,92,67,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "3",IDC_BUTTON_3,92,86,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON ",",IDC_BUTTON_DOT,92,105,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "/",IDC_BUTTON_DIV,118,48,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "*",IDC_BUTTON_MULT,118,67,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "-",IDC_BUTTON_SUB,118,86,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "+",IDC_BUTTON_ADD,118,105,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "Sqrt",IDC_BUTTON_SQRT,144,48,24,17,BS_CENTER | + BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "%",IDC_BUTTON_PERCENT,144,67,24,17,BS_CENTER | + BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "1/x",IDC_BUTTON_RX,144,86,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "=",IDC_BUTTON_EQU,144,105,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + CTEXT "",IDC_TEXT_MEMORY,4,24,24,17,SS_CENTERIMAGE, + WS_EX_CLIENTEDGE + PUSHBUTTON "MC",IDC_BUTTON_MC,4,48,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "MR",IDC_BUTTON_MR,4,67,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "MS",IDC_BUTTON_MS,4,86,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "M+",IDC_BUTTON_MP,4,105,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + DEFPUSHBUTTON "",IDC_BUTTON_FOCUS,0,0,5,5, NOT WS_VISIBLE +END + +IDD_DIALOG_CONVERSION DIALOGEX 0, 0, 320, 130 +STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "ReactOS dì" +MENU IDR_MENU_STANDARD +FONT 9, "MS UI Gothic" +BEGIN + PUSHBUTTON "Ï·",IDC_BUTTON_CONVERT,35,105,76,17 + COMBOBOX IDC_COMBO_CATEGORY,4,31,140,168,CBS_DROPDOWNLIST | + WS_VSCROLL | WS_TABSTOP | CBS_SORT + LTEXT "ªÞ:",IDC_STATIC,4,20,56,8 + COMBOBOX IDC_COMBO_FROM,4,60,140,168,CBS_DROPDOWNLIST | + WS_VSCROLL | WS_TABSTOP | CBS_SORT + LTEXT "Ï·³:",IDC_STATIC,4,49,56,8 + COMBOBOX IDC_COMBO_TO,4,87,140,168,CBS_DROPDOWNLIST | WS_VSCROLL | + WS_TABSTOP | CBS_SORT + LTEXT "Ï·æ:",IDC_STATIC,4,76,56,8 + CONTROL "C",IDC_BUTTON_CANC,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,276,24,40,17 + CONTROL "CE",IDC_BUTTON_CE,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,232,24,40,17 + CONTROL "Back",IDC_BUTTON_BACK,"Button",BS_OWNERDRAW | + BS_CENTER | BS_VCENTER | BS_NOTIFY | WS_TABSTOP,188,24, + 40,17 + RTEXT "",IDC_TEXT_OUTPUT,4,4,312,12,SS_CENTERIMAGE, + WS_EX_CLIENTEDGE + CONTROL "7",IDC_BUTTON_7,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,188,48,24,17 + CONTROL "4",IDC_BUTTON_4,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,188,67,24,17 + CONTROL "1",IDC_BUTTON_1,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,188,86,24,17 + CONTROL "0",IDC_BUTTON_0,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,188,105,24,17 + CONTROL "8",IDC_BUTTON_8,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,214,48,24,17 + CONTROL "5",IDC_BUTTON_5,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,214,67,24,17 + CONTROL "2",IDC_BUTTON_2,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,214,86,24,17 + CONTROL "+/-",IDC_BUTTON_SIGN,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,214,105,24,17 + CONTROL "9",IDC_BUTTON_9,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,240,48,24,17 + CONTROL "6",IDC_BUTTON_6,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,240,67,24,17 + CONTROL "3",IDC_BUTTON_3,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,240,86,24,17 + CONTROL ",",IDC_BUTTON_DOT,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,240,105,24,17 + CONTROL "/",IDC_BUTTON_DIV,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,266,48,24,17 + CONTROL "*",IDC_BUTTON_MULT,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,266,67,24,17 + CONTROL "-",IDC_BUTTON_SUB,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,266,86,24,17 + CONTROL "+",IDC_BUTTON_ADD,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,266,105,24,17 + CONTROL "Sqrt",IDC_BUTTON_SQRT,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,292,48,24,17 + CONTROL "%",IDC_BUTTON_PERCENT,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,292,67,24,17 + CONTROL "1/x",IDC_BUTTON_RX,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,292,86,24,17 + CONTROL "=",IDC_BUTTON_EQU,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,292,105,24,17 + CTEXT "",IDC_TEXT_MEMORY,152,24,24,17,SS_CENTERIMAGE, + WS_EX_CLIENTEDGE + CONTROL "MC",IDC_BUTTON_MC,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,152,48,24,17 + CONTROL "MR",IDC_BUTTON_MR,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,152,67,24,17 + CONTROL "MS",IDC_BUTTON_MS,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,152,86,24,17 + CONTROL "M+",IDC_BUTTON_MP,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,152,105,24,17 + DEFPUSHBUTTON "",IDC_BUTTON_FOCUS,0,0,5,5,NOT WS_VISIBLE +END + +IDD_DIALOG_ABOUT DIALOGEX DISCARDABLE 0, 0, 264, 169 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "ReactOS dìÉÂ¢Ä" +FONT 9, "MS UI Gothic" +BEGIN + DEFPUSHBUTTON "OK",IDOK,105,148,52,16 + CONTROL IDB_BITMAP_ROS,IDC_STATIC,"Static",SS_BITMAP | SS_CENTERIMAGE | + SS_REALSIZEIMAGE | WS_BORDER,4,4,104,48 + LTEXT "ReactOS dì",IDC_STATIC,120,12,132,8, + SS_CENTERIMAGE + LTEXT "Version ",IDC_TEXT_VERSION,120,20,132,8,SS_CENTERIMAGE + LTEXT "Written by Carlo Bramini",IDC_STATIC,120,32,132,8, + SS_CENTERIMAGE + GROUPBOX "",IDC_STATIC,112,0,148,52 + GROUPBOX "",IDC_STATIC,4,56,256,88 + EDITTEXT IDC_EDIT_LICENSE,12,68,240,68,ES_MULTILINE | ES_READONLY | + WS_VSCROLL +END + +IDD_DIALOG_STAT DIALOGEX DISCARDABLE 0, 0, 163, 85 +STYLE DS_SHELLFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Statistics box" +FONT 9, "MS UI Gothic" +BEGIN + LISTBOX IDC_LIST_STAT,4,4,156,40,LBS_NOINTEGRALHEIGHT | + WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "RET",IDC_BUTTON_RET,4,48,36,16 + PUSHBUTTON "LOAD",IDC_BUTTON_LOAD,44,48,36,16 + PUSHBUTTON "CD",IDC_BUTTON_CD,84,48,36,16 + PUSHBUTTON "CAD",IDC_BUTTON_CAD,124,48,36,16 + CTEXT "n=0",IDC_TEXT_NITEMS,4,68,156,12,SS_CENTERIMAGE | + SS_SUNKEN +END + +// Menus + +IDR_MENU_SCIENTIFIC_1 MENU DISCARDABLE +BEGIN + POPUP "ÒW" + BEGIN + MENUITEM "Rs[\tCtrl+C", IDM_EDIT_COPY + MENUITEM "\\èt¯\tCtrl+V", IDM_EDIT_PASTE + END + POPUP "\\¦" + BEGIN + MENUITEM "W", IDM_VIEW_STANDARD, CHECKED + MENUITEM "Ödì", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "Ï·", IDM_VIEW_CONVERSION + MENUITEM SEPARATOR + MENUITEM "16i\tF5", IDM_VIEW_HEX, CHECKED + MENUITEM "10i\tF6", IDM_VIEW_DEC, CHECKED + MENUITEM "8i\tF7", IDM_VIEW_OCT, CHECKED + MENUITEM "2i\tF8", IDM_VIEW_BIN, CHECKED + MENUITEM SEPARATOR + MENUITEM "Degrees\tF2", IDM_VIEW_DEG, CHECKED + MENUITEM "Radians\tF3", IDM_VIEW_RAD, CHECKED + MENUITEM "Gradians\tF4", IDM_VIEW_GRAD, CHECKED + MENUITEM SEPARATOR + MENUITEM "ðæØé", IDM_VIEW_GROUP, CHECKED + END + POPUP "wv" + BEGIN + MENUITEM "wv gsbN", IDM_HELP_HELP + MENUITEM SEPARATOR + MENUITEM "ReactOS dìÉÂ¢Ä", IDM_HELP_ABOUT + END +END + +IDR_MENU_SCIENTIFIC_2 MENU DISCARDABLE +BEGIN + POPUP "ÒW" + BEGIN + MENUITEM "Rs[\tCtrl+C", IDM_EDIT_COPY + MENUITEM "\\èt¯\tCtrl+V", IDM_EDIT_PASTE + END + POPUP "\\¦" + BEGIN + MENUITEM "W", IDM_VIEW_STANDARD, CHECKED + MENUITEM "Ödì", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "Ï·", IDM_VIEW_CONVERSION + MENUITEM SEPARATOR + MENUITEM "16i\tF5", IDM_VIEW_HEX, CHECKED + MENUITEM "10i\tF6", IDM_VIEW_DEC, CHECKED + MENUITEM "8i\tF7", IDM_VIEW_OCT, CHECKED + MENUITEM "2i\tF8", IDM_VIEW_BIN, CHECKED + MENUITEM SEPARATOR + MENUITEM "Qword\tF12", IDM_VIEW_QWORD, CHECKED + MENUITEM "Dword\tF2", IDM_VIEW_DWORD, CHECKED + MENUITEM "Word\tF3", IDM_VIEW_WORD, CHECKED + MENUITEM "Byte\tF4", IDM_VIEW_BYTE, CHECKED + MENUITEM SEPARATOR + MENUITEM "ðæØé", IDM_VIEW_GROUP, CHECKED + END + POPUP "wv" + BEGIN + MENUITEM "wv gsbN", IDM_HELP_HELP + MENUITEM SEPARATOR + MENUITEM "ReactOS dìÉÂ¢Ä", IDM_HELP_ABOUT + END +END + +IDR_MENU_STANDARD MENU DISCARDABLE +BEGIN + POPUP "ÒW" + BEGIN + MENUITEM "Rs[\tCtrl+C", IDM_EDIT_COPY + MENUITEM "\\èt¯\tCtrl+V", IDM_EDIT_PASTE + END + POPUP "\\¦" + BEGIN + MENUITEM "W", IDM_VIEW_STANDARD, CHECKED + MENUITEM "Ödì", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "Ï·", IDM_VIEW_CONVERSION + MENUITEM SEPARATOR + MENUITEM "ðæØé", IDM_VIEW_GROUP, CHECKED + END + POPUP "wv" + BEGIN + MENUITEM "wv gsbN", IDM_HELP_HELP + MENUITEM SEPARATOR + MENUITEM "ReactOS dìÉÂ¢Ä", IDM_HELP_ABOUT + END +END + +// String Tables + +STRINGTABLE DISCARDABLE +BEGIN + IDS_STRING_LICENSE "ReactOS dìÍGNU GPLCZXÌ³Åñ³êét[\\tgEFAÅ·B\r\n\r\n±¿çÅGNU GPLCZXÌRs[ð¾é±ÆªÅ«Ü·:\r\nhttp://www.gnu.org/licenses/g… GPLCZXÌ|óð¾é±ÆªÅ«Ü·:\r\nhttp://www.gnu.org/licenses/tra…" + IDS_MATH_ERROR "G[" + IDS_QUICKHELP "NCbNwv" +END + +// Types of conversion +STRINGTABLE DISCARDABLE +BEGIN + IDS_CONV_ANGLE "px" + IDS_CONV_AREA "ÊÏ" + IDS_CONV_CONSUMPTION "Áï (GW)" + IDS_CONV_CURRENCY "ÊÝ" + IDS_CONV_ENERGY "GlM[" + IDS_CONV_LENGTH "·³" + IDS_CONV_POWER "Í" + IDS_CONV_PRESSURE "³Í" + IDS_CONV_TEMPERATURE "·x" + IDS_CONV_TIME "Ô" + IDS_CONV_VELOCITY "¬x" + IDS_CONV_VOLUME "ÌÏ" + IDS_CONV_WEIGHT "d³" +END + +// TYPES OF ANGLES +STRINGTABLE DISCARDABLE +BEGIN + IDS_ANGLE_DEGREES "Degrees" + IDS_ANGLE_GRADIANS "Gradians" + IDS_ANGLE_RADIANS "Radians" +END + +// TYPES OF AREAS +STRINGTABLE DISCARDABLE +BEGIN + IDS_AREA_ACRES "G[J[" + IDS_AREA_ACRES_BRAZIL "G[J[ (uW)" + IDS_AREA_ACRES_FRANCE "G[J[ (tX)" + IDS_AREA_ACRES_SCOTS "G[J[ (XRbgh)" + IDS_AREA_ACRES_US "G[J[ (Ä)" + IDS_AREA_ARES "A[" + IDS_AREA_CHOU "Chou" + IDS_AREA_DANBO "Danbo" + IDS_AREA_HECTARES "wN^[" + IDS_AREA_JEONGBO "Jeongbo" + IDS_AREA_MORGEN_HUNGARY "Morgen (Hungary)" + IDS_AREA_MU "Mu" + IDS_AREA_PING "Ping" + IDS_AREA_PYEONG "Pyeong" + IDS_AREA_PYEONGBANGJA "Pyeongbangja" + IDS_AREA_RAI "Rai" + IDS_AREA_SE "Se" + IDS_AREA_SQUARE_CENTIMETERS "½ûZ`[g" + IDS_AREA_SQUARE_CHR "Square chr" + IDS_AREA_SQUARE_FATHOMS "½ûq" + IDS_AREA_SQUARE_FATHOMS_HUNGARY "½ûq (nK[)" + IDS_AREA_SQUARE_FEET "½ûtB[g" + IDS_AREA_SQUARE_INCHES "½ûC`" + IDS_AREA_SQUARE_KILOMETERS "½ûL[^[" + IDS_AREA_SQUARE_LAR "Square lar" + IDS_AREA_SQUARE_METER "½û[g" + IDS_AREA_SQUARE_MILES "½û}C" + IDS_AREA_SQUARE_MILLIMETERS "½û~[g" + IDS_AREA_SQUARE_SHAKU "½ûÚ" + IDS_AREA_SQUARE_TSUEN "Square tsuen" + IDS_AREA_SQUARE_VA "Square va" + IDS_AREA_SQUARE_YARD "½û[h" + IDS_AREA_TAN "Tan" + IDS_AREA_TSUBO "Ø" +END + +// TYPES OF COMSUMPTIONS +STRINGTABLE DISCARDABLE +BEGIN + IDS_CONSUMPTION_KM_PER_L "L[g/bg" + IDS_CONSUMPTION_L_PER_100_KM "bg/100L[g" + IDS_CONSUMPTION_MILES_GALLON_UK "}C/K (p)" + IDS_CONSUMPTION_MILES_GALLON_US "}C/K (Ä)" +END + +// TYPES OF CURRENCIES +STRINGTABLE DISCARDABLE +BEGIN + IDS_CURRENCY_AUSTRIAN_SCHILLING "I[XgA VO" + IDS_CURRENCY_BELGIAN_FRANC "xM[ t" + IDS_CURRENCY_CYPRIOT_POUND "LvX |h" + IDS_CURRENCY_CZECH_KORUNA "`FR Ri" + IDS_CURRENCY_DEUTSCHE_MARK "hCc }N" + IDS_CURRENCY_DUTCH_GUILDER "I_ M_[" + IDS_CURRENCY_EURO "[" + IDS_CURRENCY_FINNISH_MARKKA "tBh }bJ" + IDS_CURRENCY_FRENCH_FRANC "tX t" + IDS_CURRENCY_GREEK_DRACHMA "MV hN}" + IDS_CURRENCY_IRISH_POUND "ACh |h" + IDS_CURRENCY_ITALIAN_LIRA "C^A " + IDS_CURRENCY_LUXEMBOURG_FRANC "NZuN t" + IDS_CURRENCY_MALTESE_LIRA "}^ " + IDS_CURRENCY_PORTOGUESE_ESCUDO "|gK GXN[h" + IDS_CURRENCY_SLOVAK_KORUNA "XoLA Ri" + IDS_CURRENCY_SLOVENIAN_TOLAR "XxjA tolar" + IDS_CURRENCY_SPANISH_PESETA "XyC yZ^" +END + +// TYPES OF ENERGIES +STRINGTABLE DISCARDABLE +BEGIN + IDS_ENERGY_15_C_CALORIES "15J[" + IDS_ENERGY_BTUS "pMPÊ" + IDS_ENERGY_ERGS "GO" + IDS_ENERGY_EVS "dq{g" + IDS_ENERGY_FOOT_POUNDS "t[g|h" + IDS_ENERGY_IT_CALORIES "International Table calories" + IDS_ENERGY_IT_KILOCALORIES "International Table kilocalories" + IDS_ENERGY_JOULES "W[" + IDS_ENERGY_KILOJOULES "LW[" + IDS_ENERGY_KILOWATT_HOURS "Lbg" + IDS_ENERGY_NUTRITION_CALORIES "h{J[" + IDS_ENERGY_TH_CALORIES "M»wJ[" +END + +// TYPES OF LENGTHS +STRINGTABLE DISCARDABLE +BEGIN + IDS_LENGTH_ANGSTROMS "IOXg[" + IDS_LENGTH_ASTRONOMICAL_UNITS "V¶PÊ" + IDS_LENGTH_BARLEYCORNS "o[[R[" + IDS_LENGTH_CENTIMETERS "Z`[g" + IDS_LENGTH_CHAINS_UK "`F[ (p)" + IDS_LENGTH_CHI "Chi" + IDS_LENGTH_CHOU "Chou" + IDS_LENGTH_CHR "Chr" + IDS_LENGTH_CUN "Cun" + IDS_LENGTH_FATHOMS "t@]" + IDS_LENGTH_FATHOMS_HUNGARY "t@] (nK[)" + IDS_LENGTH_FEET "tB[g" + IDS_LENGTH_FURLONGS "n" + IDS_LENGTH_GAN "Gan" + IDS_LENGTH_HANDS "nh" + IDS_LENGTH_HUNH "Hunh" + IDS_LENGTH_INCHES "C`" + IDS_LENGTH_JA "Ja" + IDS_LENGTH_JEONG "Jeong" + IDS_LENGTH_KABIET "Kabiet" + IDS_LENGTH_KEN "Ken" + IDS_LENGTH_KEUB "Keub" + IDS_LENGTH_KILOMETERS "L[g" + IDS_LENGTH_LAR "Lar" + IDS_LENGTH_LIGHT_YEARS "õN" + IDS_LENGTH_LINKS_UK "N (p)" + IDS_LENGTH_METERS "[g" + IDS_LENGTH_MICRONS "~N" + IDS_LENGTH_MILES "}C" + IDS_LENGTH_MILLIMETERS "~[g" + IDS_LENGTH_NAUTICAL_MILES "C¢" + IDS_LENGTH_NIEU "Nieu" + IDS_LENGTH_PARSECS "p[ZN" + IDS_LENGTH_PICAS "pCJ" + IDS_LENGTH_RI_JAPAN "¢ (ú{)" + IDS_LENGTH_RI_KOREA "Ri (Ø)" + IDS_LENGTH_RODS "bh" + IDS_LENGTH_SAWK "Sawk" + IDS_LENGTH_SEN "Sen" + IDS_LENGTH_SHAKU "Ú" + IDS_LENGTH_SPAN "Xp" + IDS_LENGTH_SUN "¡" + IDS_LENGTH_TSUEN "Tsuen" + IDS_LENGTH_VA "Va" + IDS_LENGTH_YARDS "[h" + IDS_LENGTH_YOTE "Yote" + IDS_LENGTH_ZHANG "Zhang" +END + +// TYPES OF POWERS +STRINGTABLE DISCARDABLE +BEGIN + IDS_POWER_BTUS_PER_MINUTE "pMPÊ/ª" + IDS_POWER_FPS_PER_MINUTE "t[g|h/ª" + IDS_POWER_HORSEPOWER "nÍ" + IDS_POWER_KILOWATTS "Lbg" + IDS_POWER_MEGAWATTS "Kbg" + IDS_POWER_WATTS "bg" +END + +// TYPE OF PRESSURES +STRINGTABLE DISCARDABLE +BEGIN + IDS_PRESSURE_ATMOSPHERES "C³" + IDS_PRESSURE_BARS "Bars" + IDS_PRESSURE_HECTOPASCALS "wNgpXJ" + IDS_PRESSURE_KILOPASCALS "LpXJ" + IDS_PRESSURE_MM_OF_MERCURY "â~[g" + IDS_PRESSURE_PASCALS "pXJ" + IDS_PRESSURE_PSI "|hd/½ûC`" +END + +// TYPES OF TEMPERATURES +STRINGTABLE DISCARDABLE +BEGIN + IDS_TEMPERATURE_CELSIUS "Û" + IDS_TEMPERATURE_FAHRENHEIT "Ø" + IDS_TEMPERATURE_KELVIN "Pr" + IDS_TEMPERATURE_RANKINE "Rankine" +END + +// TYPES OF TIME +STRINGTABLE DISCARDABLE +BEGIN + IDS_TIME_DAYS "ú" + IDS_TIME_HOURS "Ô" + IDS_TIME_NANOSECONDS "imb" + IDS_TIME_MICROSECONDS "}CNb" + IDS_TIME_MILLISECONDS "~b" + IDS_TIME_MINUTES "ª" + IDS_TIME_SECONDS "b" + IDS_TIME_WEEKS "T" + IDS_TIME_YEARS "N" +END + +// TYPES OF VELOCITIES +STRINGTABLE DISCARDABLE +BEGIN + IDS_VELOCITY_CMS_SECOND "Z`[g/" + IDS_VELOCITY_FEET_HOUR "tB[g/" + IDS_VELOCITY_FEET_SECOND "tB[g/b" + IDS_VELOCITY_KILOMETERS_HOUR "L[g/" + IDS_VELOCITY_KNOTS "mbg" + IDS_VELOCITY_MACH "}bn" + IDS_VELOCITY_METERS_SECOND "[g/b" + IDS_VELOCITY_MILES_HOUR "}C/" +END + +// TYPES OF VOLUMES +STRINGTABLE DISCARDABLE +BEGIN + IDS_VOLUME_BARRELS_UK "o (p)" + IDS_VOLUME_BARRELS_OIL "Îûo" + IDS_VOLUME_BUN "Bun" + IDS_VOLUME_BUSHELS_UK "ubVF (p)" + IDS_VOLUME_BUSHELS_US "ubVF (Ä)" + IDS_VOLUME_CUBIC_CENTIMETERS "§@Z`[g" + IDS_VOLUME_CUBIC_FEET "§@tB[g" + IDS_VOLUME_CUBIC_INCHES "§@C`" + IDS_VOLUME_CUBIC_METERS "§@[g" + IDS_VOLUME_CUBIC_YARDS "§@[h" + IDS_VOLUME_DOE "Doe" + IDS_VOLUME_FLUID_OUNCES_UK "¬ÌIX (p)" + IDS_VOLUME_FLUID_OUNCES_US "¬ÌIX (Ä)" + IDS_VOLUME_GALLONS_UK "K (p)" + IDS_VOLUME_GALLONS_DRY_US "KA£ (Ä)" + IDS_VOLUME_GALLONS_LIQUID_US "KAtÌ (Ä)" + IDS_VOLUME_GOU "Gou" + IDS_VOLUME_HOP "Hop" + IDS_VOLUME_ICCE "Icce" + IDS_VOLUME_KWIAN "Kwian" + IDS_VOLUME_LITERS "bg" + IDS_VOLUME_MAL "Mal" + IDS_VOLUME_MILLILITERS "~bg" + IDS_VOLUME_PINTS_UK "pCg (p)" + IDS_VOLUME_PINTS_DRY_US "pCgA£ (Ä)" + IDS_VOLUME_PINTS_LIQUID_US "pCgAtÌ (Ä)" + IDS_VOLUME_QUARTS_UK "NH[g (p)" + IDS_VOLUME_QUARTS_DRY_US "NH[gA£ (Ä)" + IDS_VOLUME_QUARTS_LIQUID_US "NH[gAtÌ (Ä)" + IDS_VOLUME_SEKI "Seki" + IDS_VOLUME_SYOU "Syou" + IDS_VOLUME_TANANLOUNG "Tananloung" + IDS_VOLUME_TANG "Tang" + IDS_VOLUME_TO "To" +END + +// TYPES OF WEIGHTS +STRINGTABLE DISCARDABLE +BEGIN + IDS_WEIGHT_BAHT "Baht" + IDS_WEIGHT_CARATS "Jbg" + IDS_WEIGHT_CHUNG "Chung" + IDS_WEIGHT_DON "Don" + IDS_WEIGHT_GEUN "Geun" + IDS_WEIGHT_GRAMS "O" + IDS_WEIGHT_GWAN "Gwan" + IDS_WEIGHT_HARB "Harb" + IDS_WEIGHT_JIN_CHINA "Jin ()" + IDS_WEIGHT_JIN_TAIWAN "Jin (äp)" + IDS_WEIGHT_KAN "Kan" + IDS_WEIGHT_KILOGRAMS "LO" + IDS_WEIGHT_KIN "Kin" + IDS_WEIGHT_LIANG_CHINA "Liang ()" + IDS_WEIGHT_LIANG_TAIWAN "Liang (äp)" + IDS_WEIGHT_MONME "æ (àñß)" + IDS_WEIGHT_OUNCES_AVOIRDUPOIS "ítIX" + IDS_WEIGHT_OUNCES_TROY "gC IX" + IDS_WEIGHT_POUNDS "|h" + IDS_WEIGHT_QUINTAL_METRIC "L^ (metric)" + IDS_WEIGHT_SALOUNG "Saloung" + IDS_WEIGHT_STONES "Xg[" + IDS_WEIGHT_TAMLUNG "Tamlung" + IDS_WEIGHT_TONNES "g" + IDS_WEIGHT_TONS_UK "g (p)" + IDS_WEIGHT_TONS_US "g (Ä)" +END Propchange: trunk/reactos/base/applications/calc/lang/ja-JP.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/calc/resource.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/res… ============================================================================== --- trunk/reactos/base/applications/calc/resource.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/resource.rc [iso-8859-1] Sun Oct 17 12:47:02 2010 @@ -52,6 +52,7 @@ #include "lang/es-ES.rc" #include "lang/fr-FR.rc" #include "lang/it-IT.rc" +#include "lang/ja-JP.rc" #include "lang/ko-KR.rc" #include "lang/nl-NL.rc" #include "lang/no-NO.rc" Modified: trunk/reactos/base/setup/usetup/lang/ja-JP.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/ja-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/ja-JP.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/ja-JP.h [iso-8859-1] Sun Oct 17 12:47:02 2010 @@ -986,13 +986,13 @@ { 8, 12, - "Install bootloader on the harddisk (MBR and VBR).", + "Ê°ÄÞÃÞ¨½¸Æ ÌÞ°ÄÛ°ÀÞ°¦ ²Ý½Ä°Ù ¼Ï½ (MBR Ä VBR).", TEXT_STYLE_NORMAL }, { 8, 13, - "Install bootloader on the harddisk (VBR only).", + "Ê°ÄÞÃÞ¨½¸Æ ÌÞ°ÄÛ°ÀÞ°¦ ²Ý½Ä°Ù ¼Ï½ (VBR ÉÐ).", TEXT_STYLE_NORMAL }, { Modified: trunk/reactos/dll/win32/newdev/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/lang/ja-J… ============================================================================== --- trunk/reactos/dll/win32/newdev/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/newdev/lang/ja-JP.rc [iso-8859-1] Sun Oct 17 12:47:02 2010 @@ -8,10 +8,10 @@ BEGIN LTEXT "æ¤±»",IDC_WELCOMETITLE,120,8,195,24 LTEXT "±ÌEBU[hÅÍAÈºÌVµ¢foCX hCoðCXg[µÜ·:", - IDC_STATIC,120,21,195,16 + IDC_STATIC,120,21,195,30 LTEXT "±s·éÉÍA[Ö] ðNbNµÄ¾³¢B",IDC_STATIC,120,169,195,17 - LTEXT "s¾ÈfoCX",IDC_DEVICE,134,36,164,11 - LTEXT "x! JX^ foCXðCXg[·éÆARs[^ªt[Yµ½èAN®s\\ÉÈéÂ\\«ª èÜ·!",IDC_STATIC,120,59,195,16 + LTEXT "s¾ÈfoCX",IDC_DEVICE,134,52,164,11 + LTEXT "x! JX^ foCXðCXg[·éÆARs[^ªt[Yµ½èAN®s\\ÉÈéÂ\\«ª èÜ·!",IDC_STATIC,120,67,195,34 CONTROL "hCoð©®IÉCXg[·é",IDC_RADIO_AUTO,"Button", BS_AUTORADIOBUTTON,120,112,178,13 CONTROL "hCoðÁèÌê©çCXg[·é",IDC_RADIO_MANUAL, Modified: trunk/reactos/dll/win32/syssetup/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/ja… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/ja-JP.rc [iso-8859-1] Sun Oct 17 12:47:02 2010 @@ -102,14 +102,14 @@ "", IDC_STATIC, 53, 7, 253, 20 LTEXT "", IDC_LOCALETEXT, 53, 29, 250, 16 LTEXT "VXeA[U[P[ÝèÏXÉÍ[JX^}CY]ðNbNµÜ·B", - IDC_STATIC, 53, 60, 196, 8 - PUSHBUTTON "JX^}CY(&C)...", IDC_CUSTOMLOCALE, 250, 57, 50, 14 + IDC_STATIC, 53, 50, 166, 25 + PUSHBUTTON "JX^}CY(&C)...", IDC_CUSTOMLOCALE, 220, 52, 80, 14 LTEXT "L[{[h CAEgÍAL[ðµ½Æ«ÉÇÌ¶ªüÍ³êé©ð§äµÜ·B", - IDC_STATIC, 53, 86, 253, 8 - LTEXT "", IDC_LAYOUTTEXT, 53, 100, 250, 16 + IDC_STATIC, 53, 81, 253, 20 + LTEXT "", IDC_LAYOUTTEXT, 53, 106, 250, 14 LTEXT "L[{[hCAEgÏXÉÍ[JX^}CY]ðNbNµÜ·B", - IDC_STATIC, 53, 126, 184, 8 - PUSHBUTTON "JX^}CY(&U)...", IDC_CUSTOMLAYOUT, 250, 122, 50, 14 + IDC_STATIC, 53, 120, 166, 25 + PUSHBUTTON "JX^}CY(&U)...", IDC_CUSTOMLAYOUT, 220, 122, 80, 14 END

1 0

[spetreolle] 49180: Patch by Roel Messiant : Initialise PPB to zero. The change from NtAllocateVirtualMemory to RtlAllocateHeap causes the memory to be not automatically initialised to zero anymore...
by spetreolle＠svn.reactos.org 17 Oct '10

17 Oct '10

Author: spetreolle Date: Sun Oct 17 11:12:54 2010 New Revision: 49180 URL: http://svn.reactos.org/svn/reactos?rev=49180&view=rev Log: Patch by Roel Messiant : Initialise PPB to zero. The change from NtAllocateVirtualMemory to RtlAllocateHeap causes the memory to be not automatically initialised to zero anymore. Not every field of the PPB (for which the memory is allocated) gets explicitly initialised, meaning this results in them having bogus values. One of the now uninitialised fields is DebugFlags, which results in DbgBreakPoint being called in NtProcessStartup. Simply ensuring the memory is zeroed makes it all better again. Modified: trunk/reactos/lib/rtl/ppb.c Modified: trunk/reactos/lib/rtl/ppb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/ppb.c?rev=49180&r1… ============================================================================== --- trunk/reactos/lib/rtl/ppb.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/ppb.c [iso-8859-1] Sun Oct 17 11:12:54 2010 @@ -119,7 +119,7 @@ Length += ALIGN(RuntimeData->MaximumLength, sizeof(ULONG)); /* Calculate the required block size */ - Param = RtlAllocateHeap(RtlGetProcessHeap(), 0, Length); + Param = RtlAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY, Length); if (!Param) { RtlReleasePebLock();

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs