Ros-diffs June 2008

ros-diffs@reactos.org

23 participants
435 discussions

[fireball] 33947: - Fix a bug in timedate.cpl, where an incorrect color was passed. - Add bounds checking for GetSystemMetrics both in user32 and in kernel counterpart. - Based on a patch from bug 3316. See issue #3316 for more details.

by fireball＠svn.reactos.org

Author: fireball Date: Thu Jun 12 04:50:12 2008 New Revision: 33947 URL: http://svn.reactos.org/svn/reactos?rev=33947&view=rev Log: - Fix a bug in timedate.cpl, where an incorrect color was passed. - Add bounds checking for GetSystemMetrics both in user32 and in kernel counterpart. - Based on a patch from bug 3316. See issue #3316 for more details. Modified: trunk/reactos/dll/cpl/timedate/monthcal.c trunk/reactos/dll/win32/user32/misc/desktop.c trunk/reactos/subsystems/win32/win32k/ntuser/metric.c Modified: trunk/reactos/dll/cpl/timedate/monthcal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/timedate/monthcal.… ============================================================================== --- trunk/reactos/dll/cpl/timedate/monthcal.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/timedate/monthcal.c [iso-8859-1] Thu Jun 12 04:50:12 2008 @@ -504,7 +504,7 @@ if (crOldCtrlText == CLR_INVALID) { crOldCtrlText = SetTextColor(hDC, - infoPtr->Enabled ? MONTHCAL_CTRLFG : MONTHCAL_DISABLED_CTRLFG); + GetSysColor(infoPtr->Enabled ? MONTHCAL_CTRLFG : MONTHCAL_DISABLED_CTRLFG)); } for (x = prcUpdate->left / infoPtr->CellSize.cx; Modified: trunk/reactos/dll/win32/user32/misc/desktop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/desk… ============================================================================== --- trunk/reactos/dll/win32/user32/misc/desktop.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/misc/desktop.c [iso-8859-1] Thu Jun 12 04:50:12 2008 @@ -100,9 +100,11 @@ GetSystemMetrics(int nIndex) { // FIXME("Global Sever Data -> %x\n",g_psi); - if (g_psi) return g_psi->SystemMetrics[nIndex]; + if (nIndex < 0 || nIndex >= SM_CMETRICS) return 0; + if (g_psi) + return g_psi->SystemMetrics[nIndex]; else - return(NtUserGetSystemMetrics(nIndex)); + return(NtUserGetSystemMetrics(nIndex)); } Modified: trunk/reactos/subsystems/win32/win32k/ntuser/metric.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/metric.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/metric.c [iso-8859-1] Thu Jun 12 04:50:12 2008 @@ -278,6 +278,13 @@ ULONG Width, Height, Result; // DPRINT1("UserGetSystemMetrics -> %d\n",Index); + + if (Index >= SM_CMETRICS) + { + DPRINT1("UserGetSystemMetrics() called with invalid index %d\n", Index); + return 0; + } + if (gpsi && Setup) return gpsi->SystemMetrics[Index]; else

16 years, 3 months

[fireball] 33946: - Formatting cleanup for the previously patched functions.

by fireball＠svn.reactos.org

Author: fireball Date: Thu Jun 12 04:40:33 2008 New Revision: 33946 URL: http://svn.reactos.org/svn/reactos?rev=33946&view=rev Log: - Formatting cleanup for the previously patched functions. Modified: trunk/reactos/lib/rtl/heap.c Modified: trunk/reactos/lib/rtl/heap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/heap.c?rev=33946&r… ============================================================================== --- trunk/reactos/lib/rtl/heap.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/heap.c [iso-8859-1] Thu Jun 12 04:40:33 2008 @@ -596,14 +596,12 @@ int i; NTSTATUS Status; -#if 1 - if (address==NULL && ZwAllocateVirtualMemory( NtCurrentProcess(), &address, 0, + if (!address && ZwAllocateVirtualMemory( NtCurrentProcess(), &address, 0, &commitSize, MEM_COMMIT, PAGE_READWRITE )) { WARN("Could not commit %08lx bytes for sub-heap %p\n", commitSize, address ); return FALSE; } -#endif /* Fill the sub-heap structure */ @@ -1596,26 +1594,21 @@ RtlEnumProcessHeaps(PHEAP_ENUMERATION_ROUTINE HeapEnumerationRoutine, PVOID lParam) { - -#if 1 - NTSTATUS Status = STATUS_SUCCESS; - - struct list *ptr=NULL; - RtlEnterHeapLock(&processHeap->critSection); - Status=HeapEnumerationRoutine(processHeap,lParam); - LIST_FOR_EACH( ptr, &processHeap->entry ) - { - if (!NT_SUCCESS(Status)) - break; - Status = HeapEnumerationRoutine(ptr,lParam); - - } - - - RtlLeaveHeapLock(&processHeap->critSection); - - return Status; -#endif + NTSTATUS Status = STATUS_SUCCESS; + + struct list *ptr=NULL; + RtlEnterHeapLock(&processHeap->critSection); + Status=HeapEnumerationRoutine(processHeap,lParam); + + LIST_FOR_EACH( ptr, &processHeap->entry ) + { + if (!NT_SUCCESS(Status)) break; + Status = HeapEnumerationRoutine(ptr,lParam); + } + + RtlLeaveHeapLock(&processHeap->critSection); + + return Status; } @@ -1637,13 +1630,9 @@ i++; LIST_FOR_EACH( ptr, &processHeap->entry ) { - if(i>=count) - { - break; - } + if (i >= count) break; i++; *(heaps++) = LIST_ENTRY( ptr, HEAP, entry ); - } } RtlLeaveHeapLock( &processHeap->critSection ); @@ -1657,11 +1646,8 @@ BOOLEAN NTAPI RtlValidateProcessHeaps(VOID) { - -#if 1 BOOLEAN Result = TRUE; HEAP ** pptr; - RtlEnterHeapLock( &processHeap->critSection ); @@ -1674,10 +1660,8 @@ } } - - RtlLeaveHeapLock( &processHeap->critSection ); + RtlLeaveHeapLock( &processHeap->critSection ); return Result; -#endif }

16 years, 3 months

[fireball] 33945: Oriol Pique <oripipa@yahoo.es> - Minor patch to HEAP_GetPtr to include magic value in debug output. - Fixing the parameters checking in HEAP_InitSubHeap (it is currently not used - put between #if 0 / #endif ). - Correcting HEAP_FindFreeBlock which was logging error message as warning (while still returning NULL to caller) by changing severity of logged message. - Implementing RtlEnumProcessHeaps (previously stubbed out). - Fixing sanity checks in and implementation of RtlGetPr

by fireball＠svn.reactos.org

Author: fireball Date: Thu Jun 12 04:35:24 2008 New Revision: 33945 URL: http://svn.reactos.org/svn/reactos?rev=33945&view=rev Log: Oriol Pique <oripipa(a)yahoo.es> - Minor patch to HEAP_GetPtr to include magic value in debug output. - Fixing the parameters checking in HEAP_InitSubHeap (it is currently not used - put between #if 0 / #endif ). - Correcting HEAP_FindFreeBlock which was logging error message as warning (while still returning NULL to caller) by changing severity of logged message. - Implementing RtlEnumProcessHeaps (previously stubbed out). - Fixing sanity checks in and implementation of RtlGetProcessHeaps (previously the function was not checking for the counter value, and also was not assigning anything to the returned value; now this seems to be corrected. - Fixing RtlValidateProcessHeaps implementation (the function was stubbed out because (most probably, I wasn't able to find a bug mentioning this) it was previously using a global lock for all heaps (which probably could cause some problems in the kernel), now it only locks heaps belonging to the given process - and this is the correct behaviour. Aleksey Bragin <aleksey(a)reactos.org> - Fix typo in ntuser.c, and low severity of debug message. See issue #2964 for more details. Modified: trunk/reactos/lib/rtl/heap.c trunk/reactos/subsystems/win32/win32k/ntuser/ntuser.c Modified: trunk/reactos/lib/rtl/heap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/heap.c?rev=33945&r… ============================================================================== --- trunk/reactos/lib/rtl/heap.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/heap.c [iso-8859-1] Thu Jun 12 04:35:24 2008 @@ -335,7 +335,8 @@ HEAP *heapPtr = (HEAP *)heap; if (!heapPtr || (heapPtr->magic != HEAP_MAGIC)) { - ERR("Invalid heap %p!\n", heap ); + ERR("Invalid heap %p, magic:%4s!\n", heap,heapPtr->magic ); + //KeDumpStackFrames(NULL); return NULL; } if (TRACE_ON(heap) && !HEAP_IsRealArena( heapPtr, 0, NULL, NOISY )) @@ -595,8 +596,8 @@ int i; NTSTATUS Status; -#if 0 - if (ZwAllocateVirtualMemory( NtCurrentProcess(), &address, 0, +#if 1 + if (address==NULL && ZwAllocateVirtualMemory( NtCurrentProcess(), &address, 0, &commitSize, MEM_COMMIT, PAGE_READWRITE )) { WARN("Could not commit %08lx bytes for sub-heap %p\n", commitSize, address ); @@ -775,7 +776,7 @@ if (!(heap->flags & HEAP_GROWABLE)) { - WARN("Not enough space in heap %p for %08lx bytes\n", heap, size ); + ERR("Not enough space in heap %p for %08lx bytes\n", heap, size ); return NULL; } /* make sure that we have a big enough size *committed* to fit another @@ -1595,26 +1596,23 @@ RtlEnumProcessHeaps(PHEAP_ENUMERATION_ROUTINE HeapEnumerationRoutine, PVOID lParam) { - DPRINT1("UNIMPLEMENTED\n"); - DPRINT1("UNIMPLEMENTED\n"); - DPRINT1("UNIMPLEMENTED\n"); - DPRINT1("UNIMPLEMENTED\n"); - DbgBreakPoint(); - return STATUS_SUCCESS; -#if 0 + +#if 1 NTSTATUS Status = STATUS_SUCCESS; - HEAP** pptr; - - RtlEnterHeapLock(&RtlpProcessHeapsListLock); - - for (pptr = (HEAP**)&NtCurrentPeb()->ProcessHeaps; *pptr; pptr = &(*pptr)->next) - { - Status = HeapEnumerationRoutine(*pptr,lParam); - if (!NT_SUCCESS(Status)) - break; - } - - RtlLeaveHeapLock(&RtlpProcessHeapsListLock); + + struct list *ptr=NULL; + RtlEnterHeapLock(&processHeap->critSection); + Status=HeapEnumerationRoutine(processHeap,lParam); + LIST_FOR_EACH( ptr, &processHeap->entry ) + { + if (!NT_SUCCESS(Status)) + break; + Status = HeapEnumerationRoutine(ptr,lParam); + + } + + + RtlLeaveHeapLock(&processHeap->critSection); return Status; #endif @@ -1630,17 +1628,26 @@ { ULONG total = 1; /* main heap */ struct list *ptr; - + ULONG i=0; RtlEnterHeapLock( &processHeap->critSection ); LIST_FOR_EACH( ptr, &processHeap->entry ) total++; - if (total <= count) - { - *heaps++ = processHeap; + //if (total <= count) + { + *(heaps++) = processHeap; + i++; LIST_FOR_EACH( ptr, &processHeap->entry ) - *heaps++ = LIST_ENTRY( ptr, HEAP, entry ); + { + if(i>=count) + { + break; + } + i++; + *(heaps++) = LIST_ENTRY( ptr, HEAP, entry ); + + } } RtlLeaveHeapLock( &processHeap->critSection ); - return total; + return i; } @@ -1650,19 +1657,15 @@ BOOLEAN NTAPI RtlValidateProcessHeaps(VOID) { - DPRINT1("UNIMPLEMENTED\n"); - DPRINT1("UNIMPLEMENTED\n"); - DPRINT1("UNIMPLEMENTED\n"); - DPRINT1("UNIMPLEMENTED\n"); - DbgBreakPoint(); - return STATUS_SUCCESS; -#if 0 + +#if 1 BOOLEAN Result = TRUE; HEAP ** pptr; - RtlEnterHeapLock(&RtlpProcessHeapsListLock); - - for (pptr = (HEAP**)&NtCurrentPeb()->ProcessHeaps; *pptr; pptr = &(*pptr)->next) + + RtlEnterHeapLock( &processHeap->critSection ); + + for (pptr = (HEAP**)&NtCurrentPeb()->ProcessHeaps; *pptr; pptr++) { if (!RtlValidateHeap(*pptr, 0, NULL)) { @@ -1671,8 +1674,8 @@ } } - RtlLeaveHeapLock (&RtlpProcessHeapsListLock); - + + RtlLeaveHeapLock( &processHeap->critSection ); return Result; #endif } Modified: trunk/reactos/subsystems/win32/win32k/ntuser/ntuser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/ntuser.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/ntuser.c [iso-8859-1] Thu Jun 12 04:35:24 2008 @@ -63,7 +63,7 @@ if (gpsi) { RtlZeroMemory(gpsi, sizeof(SERVERINFO)); - DPRINT1("Gloabal Server Data -> %x\n", gpsi); + DPRINT("Global Server Data -> %x\n", gpsi); } } return STATUS_SUCCESS;

16 years, 3 months

[fireball] 33944: - Fix two bugs in MiDoMappedCopy: MI_MAPPED_PAGES is pages, not bytes; and a misuse of TotalSize / BufferSize. - Fix similar mistake in MiDoPoolCopy. - Patch from bug 3341. See issue #3341 for more details.

by fireball＠svn.reactos.org

Author: fireball Date: Thu Jun 12 04:18:11 2008 New Revision: 33944 URL: http://svn.reactos.org/svn/reactos?rev=33944&view=rev Log: - Fix two bugs in MiDoMappedCopy: MI_MAPPED_PAGES is pages, not bytes; and a misuse of TotalSize / BufferSize. - Fix similar mistake in MiDoPoolCopy. - Patch from bug 3341. See issue #3341 for more details. Modified: trunk/reactos/ntoskrnl/mm/virtual.c Modified: trunk/reactos/ntoskrnl/mm/virtual.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/virtual.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/virtual.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/virtual.c [iso-8859-1] Thu Jun 12 04:18:11 2008 @@ -67,7 +67,7 @@ IN KPROCESSOR_MODE PreviousMode, OUT PULONG ReturnSize) { - PFN_NUMBER MdlBuffer[(sizeof(MDL) / sizeof(PFN_NUMBER)) + (MI_MAPPED_COPY_PAGES >> PAGE_SHIFT) + 1]; + PFN_NUMBER MdlBuffer[(sizeof(MDL) / sizeof(PFN_NUMBER)) + MI_MAPPED_COPY_PAGES + 1]; PMDL Mdl = (PMDL)MdlBuffer; ULONG TotalSize, CurrentSize, RemainingSize; BOOLEAN FailedInProbe = FALSE, FailedInMapping = FALSE, FailedInMoving; @@ -82,8 +82,8 @@ /* Calculate the maximum amount of data to move */ TotalSize = (MI_MAPPED_COPY_PAGES - 2) * PAGE_SIZE; if (BufferSize <= TotalSize) TotalSize = BufferSize; - CurrentSize = BufferSize; - RemainingSize = TotalSize; + CurrentSize = TotalSize; + RemainingSize = BufferSize; /* Loop as long as there is still data */ while (RemainingSize > 0) @@ -117,7 +117,7 @@ } /* Initialize and probe and lock the MDL */ - MmInitializeMdl (Mdl, CurrentAddress, CurrentSize); + MmInitializeMdl (Mdl, CurrentAddress, CurrentSize); MmProbeAndLockPages (Mdl, PreviousMode, IoReadAccess); PagesLocked = TRUE; @@ -236,8 +236,8 @@ /* Calculate the maximum amount of data to move */ TotalSize = MI_MAX_TRANSFER_SIZE; if (BufferSize <= MI_MAX_TRANSFER_SIZE) TotalSize = BufferSize; - CurrentSize = BufferSize; - RemainingSize = TotalSize; + CurrentSize = TotalSize; + RemainingSize = BufferSize; /* Check if we can use the stack */ if (BufferSize <= MI_POOL_COPY_BYTES)

16 years, 3 months

[fireball] 33943: - Prevent a misunderstanding: kdHandleException means the debugger did NOT handle the exception. Fix the logic, and thus fix vectored exception handling which led to 2nd stage hang in qemu. - TODO: This ContinueType thing should be reworked into a better logic. See issue #3344 for more details.

by fireball＠svn.reactos.org

Author: fireball Date: Thu Jun 12 03:56:13 2008 New Revision: 33943 URL: http://svn.reactos.org/svn/reactos?rev=33943&view=rev Log: - Prevent a misunderstanding: kdHandleException means the debugger did NOT handle the exception. Fix the logic, and thus fix vectored exception handling which led to 2nd stage hang in qemu. - TODO: This ContinueType thing should be reworked into a better logic. See issue #3344 for more details. Modified: trunk/reactos/ntoskrnl/kd/kdmain.c trunk/reactos/ntoskrnl/kdbg/kdb.c Modified: trunk/reactos/ntoskrnl/kd/kdmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd/kdmain.c?rev=3… ============================================================================== --- trunk/reactos/ntoskrnl/kd/kdmain.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kd/kdmain.c [iso-8859-1] Thu Jun 12 03:56:13 2008 @@ -165,8 +165,10 @@ //DPRINT1("Address: %p. Return: %d\n", EipOld, Return); } - /* Convert return to BOOLEAN */ - if (Return == kdDoNotHandleException) return FALSE; + /* Debugger didn't handle it, please handle! */ + if (Return == kdHandleException) return FALSE; + + /* Debugger handled it */ return TRUE; } @@ -194,8 +196,10 @@ TrapFrame); } - /* Convert return to BOOLEAN */ - if (Return == kdDoNotHandleException) return FALSE; + /* Debugger didn't handle it, please handle! */ + if (Return == kdHandleException) return FALSE; + + /* Debugger handled it */ return TRUE; } Modified: trunk/reactos/ntoskrnl/kdbg/kdb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kdbg/kdb.c?rev=33… ============================================================================== --- trunk/reactos/ntoskrnl/kdbg/kdb.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kdbg/kdb.c [iso-8859-1] Thu Jun 12 03:56:13 2008 @@ -1479,7 +1479,7 @@ { if (!EnterConditionMet) { - return kdDoNotHandleException; + return kdHandleException; } DbgPrint("Entered debugger on unexpected debug trap!\n"); } @@ -1493,7 +1493,7 @@ } if (!EnterConditionMet) { - return kdDoNotHandleException; + return kdHandleException; } DbgPrint("Entered debugger on embedded INT3 at 0x%04x:0x%08x.\n",

16 years, 3 months

[dreimer] 33942: Updated Wordpad, XCopy, WInhlp32 to WIne 1.0rc4 I skipped Collibri's Typo-Fix in the German Wordpad RC File. Collibri, plz send this to Wine.

by dreimer＠svn.reactos.org

Author: dreimer Date: Thu Jun 12 01:23:44 2008 New Revision: 33942 URL: http://svn.reactos.org/svn/reactos?rev=33942&view=rev Log: Updated Wordpad, XCopy, WInhlp32 to WIne 1.0rc4 I skipped Collibri's Typo-Fix in the German Wordpad RC File. Collibri, plz send this to Wine. Added: trunk/reactos/base/applications/winhlp32/lang/rm-RM.rc (with props) Modified: trunk/reactos/base/applications/cmdutils/xcopy/De.rc trunk/reactos/base/applications/winhlp32/lang/nb-NO.rc trunk/reactos/base/applications/winhlp32/lang/sk-SK.rc trunk/reactos/base/applications/winhlp32/rsrc.rc trunk/reactos/base/applications/wordpad/En.rc trunk/reactos/base/applications/wordpad/Hu.rc trunk/reactos/base/applications/wordpad/Ko.rc trunk/reactos/base/applications/wordpad/Nl.rc trunk/reactos/base/applications/wordpad/No.rc trunk/reactos/base/applications/wordpad/Ru.rc trunk/reactos/base/applications/wordpad/Tr.rc trunk/reactos/base/applications/wordpad/wordpad.c trunk/reactos/boot/bootdata/packages/reactos.dff Modified: trunk/reactos/base/applications/cmdutils/xcopy/De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/xcopy/De.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/xcopy/De.rc [iso-8859-1] Thu Jun 12 01:23:44 2008 @@ -2,7 +2,8 @@ * XCOPY - Wine-compatible xcopy program * German language support * - * Copyright (C) 2007 Daniel Reimer + * Copyright (C) 2007 J. Edmeades + * Copyright (C) 2008 M. Karcher * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -23,57 +24,56 @@ LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL STRINGTABLE -BEGIN - STRING_INVPARMS, "Ungültige Anzahl an Parametern - Nutze xcopy /? für Hilfe\n" - STRING_INVPARM, "Ungültiger Parameter '%s' - Nutze xcopy /? für Hilfe\n" - STRING_PAUSE, "Drücke <Enter> um den Kopiervorgang zu starten\n" - STRING_SIMCOPY, "%d Datei(en) würden kopiert werden\n" +{ + STRING_INVPARMS, "Falsche Parameteranzahl - xcopy /? zeigt Hilfe an\n" + STRING_INVPARM, "Unbekannter Parameter '%s' - xcopy /? zeigt Hilfe an\n" + STRING_PAUSE, "Eingabetaste betätigen, um mit dem Kopieren zu beginnen\n" + STRING_SIMCOPY, "%d Datei(en) würden kopiert\n" STRING_COPY, "%d Datei(en) kopiert\n" - STRING_QISDIR, "Ist '%s' eine Datei oder ein Ordner\n" \ - "im Zielordner?\n" \ - "(D - Datei, O - Ordner)\n" + STRING_QISDIR, "Ist '%s' eine Datei oder ein Verzeichnis\n" \ + "am Zielsort?\n" \ + "(D - Datei, V - Verzeichnis)\n" STRING_SRCPROMPT,"%s? (Ja|Nein)\n" - STRING_OVERWRITE,"Überschreibe %s? (Ja|Nein|Alle)\n" - STRING_COPYFAIL, "Kopieren von '%s' nach '%s' fehlgeschlagen mit r/c %d\n" - STRING_OPENFAIL, "Öffnen von '%s' fehlgeschlagen\n" - STRING_READFAIL, "Lesen von '%s' fehlgeschlagen\n" + STRING_OVERWRITE,"%s überschreiben? (Ja|Nein|Alle)\n" + STRING_COPYFAIL, "Kopieren von '%s' nach '%s' fehlgeschlagen. Fehlernummer: %d\n" + STRING_OPENFAIL, "Fehler beim Öffnen von '%s'\n" + STRING_READFAIL, "Fehler beim Lesen von '%s'\n" STRING_YES_CHAR, "J" STRING_NO_CHAR, "N" STRING_ALL_CHAR, "A" STRING_FILE_CHAR,"D" - STRING_DIR_CHAR, "O" + STRING_DIR_CHAR, "V" STRING_HELP, -"XCOPY - Kopiert Quelldaten oder Verzeichnisbäume and einen Ort\n\ +"XCOPY - Kopiert Dateien oder Verzeichnisse an einen Zielort\n\ \n\ Syntax:\n\ XCOPY Quelle [Ziel] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U] \n\ \t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n\ \n\ -Wo:\n\ +Mit:\n\ \n\ -[/I] Falls Ziel nicht vorhanden ist und mehrere Dateien kopiert \n\ -\twerden, nimmt XCOPY an, dass das Ziel ein Verzeichnis ist\n\ -[/S] Kopiert Verzeichnisse und Unterverzeichnisse, die nicht leer sind\n\ -[/E] Kopiert alle Unterverzeichnisse, eingeschlossen leere\n\ -[/Q] Zeigt beim Kopieren keine Dateinamen an\n\ -[/F] Zeigt die Namen der Quell- und Zieldateien beim Kopieren an\n\ -[/L] Listet lediglich die Dateien auf, die kopiert werden würden\n\ -[/W] Fordert vor dem Beginn des Kopiervorgangs eine Bestätigung\n\ -[/T] Erstellt die Verzeichnisstruktur, kopiert aber keine Dateien\n\ -[/Y] Unterdrücke eine Bestätigung vor dem Überschreiben einer Datei\n\ -[/-Y] Fordert vor dem Überschreiben einer Datei eine Bestätigung\n\ -[/P] Fordert vor jedem Kopiervorgang eine Bestätigung\n\ -[/N] Kurznamen beim Kopieren verwenden\n\ -[/U] Kopiert nur Dateien, die im Zielverzeichnis vorhanden sind\n\ -[/R] Schreibgeschützte Dateien überschreiben\n\ -[/H] Verstecke und Systemdateien in den Kopiervorgang miteinbeziehen\n\ -[/C] Kopiervorgang selbst nach Fehlern fortsetzen\n\ -[/A] Nur Dateien mit gesetztem Archiv Attribut kopieren\n\ -[/M] Nur Dateien mit gesetztem Archiv Attribut kopieren und \n\ -\tdieses entfernen\n\ -[/D | /D:m-d-y] Kopiert nur die an oder nach dem Datum geänderten Dateien.\n\ -\t\tIst kein Datum angegeben, werden nur Dateien kopiert,\n\ -\t\tdie neuer als die bestehenden Zieldateien sind.\n\n" +[/I] Behandle Ziel als Verzeichnisnamen, wenn es nicht existiert und\n\ +\tmehrere Dateien kopiert werden.\n\ +[/S] Kopiere Verzeichnisse und Unterverzeichnisse\n\ +[/E] Kopiere Verzeichnisse und Unterverzeichnisse, auch leere\n\ +[/Q] Zeige die Dateinamen beim Kopieren nicht an\n\ +[/F] Zeige vollständige Dateinamen von Quelle und Ziel an\n\ +[/L] Simulation: Zeige die Namen der Datein, die kopiert würden\n\ +[/W] Wartet vor Beginn des Kopierens auf Bestätigung\n\ +[/T] Erzeuge eine leere Verzeichnisstruktur, ohne Dateien zu kopieren\n\ +[/Y] Keine Nachfrage vor dem Überschreiben von Dateien\n\ +[/-Y] Nachrage vor dem Überschreiben von Dateien\n\ +[/P] Fragt für jede Quelldatei, ob sie kopiert werden soll\n\ +[/N] Kopiert die Dateien unter ihrem Kurznamen\n\ +[/U] Kopiert nur Dateien, die am Ziel bereits existieren\n\ +[/R] Überschreibt schreibgeschützte Dateien\n\ +[/H] Kopiere auch versteckte und Systemdateien\n\ +[/C] Nach Fehlern den Kopiervorgang fortsetzen\n\ +[/A] Nur Dateien mit Archivbit kopieren\n\ +[/M] Nur Dateien mit Archivbit kopieren, danach Archivbit löschen\n\ +[/D | /D:m-d-y] Kopiere neue Dateien und Dateien, die neuer als das\n\ +\t\tangegebene Datum sind. Wird kein Datum angegegebn, werden nur\n\ +\t\tQuelldateien kopiert, die neuer sind als die Zieldatei\n\n" -END +} Modified: trunk/reactos/base/applications/winhlp32/lang/nb-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/lang/nb-NO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/lang/nb-NO.rc [iso-8859-1] Thu Jun 12 01:23:44 2008 @@ -26,23 +26,23 @@ MENUITEM "&Åpne", MNID_FILE_OPEN MENUITEM SEPARATOR MENUITEM "Skriv &ut", MNID_FILE_PRINT - MENUITEM "Opp&sett av skriveren . . .", MNID_FILE_SETUP + MENUITEM "Opp&sett av skriveren...", MNID_FILE_SETUP MENUITEM SEPARATOR MENUITEM "&Avslutt", MNID_FILE_EXIT } POPUP "R&ediger" { - MENUITEM "&Kopier . . .", MNID_EDIT_COPYDLG + MENUITEM "&Kopier...", MNID_EDIT_COPYDLG MENUITEM SEPARATOR - MENUITEM "K&ommenter . . .", MNID_EDIT_ANNOTATE + MENUITEM "K&ommenter...", MNID_EDIT_ANNOTATE } POPUP "&Bokmerke" { - MENUITEM "&Definer . . .", MNID_BKMK_DEFINE + MENUITEM "&Definer...", MNID_BKMK_DEFINE } POPUP "&Hjelp" { MENUITEM "&Hjelp til Hjelp", MNID_HELP_HELPON MENUITEM "All&tid øverst", MNID_HELP_HELPTOP MENUITEM SEPARATOR - MENUITEM "&Informasjon . . .", MNID_HELP_ABOUT + MENUITEM "&Informasjon...", MNID_HELP_ABOUT #ifdef WINELIB MENUITEM "&Om WINE", MNID_HELP_WINE #endif Added: trunk/reactos/base/applications/winhlp32/lang/rm-RM.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/lang/rm-RM.rc (added) +++ trunk/reactos/base/applications/winhlp32/lang/rm-RM.rc [iso-8859-1] Thu Jun 12 01:23:44 2008 @@ -1,0 +1,75 @@ +/* + * Help Viewer + * + * Copyright 1996 Ulrich Schmid + * Rumantsch Ladin (Vallader) by mbaur(a)g26.ethz.ch + * Copyright 2002 Sylvain Petreolle <spetreolle(a)yahoo.fr> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +/* FIXME: This file is in the Vallader Romansh dialect and not in the + official Rumantsch Grischun. */ + +/* Menu */ + +MAIN_MENU MENU LANGUAGE LANG_ROMANSH, SUBLANG_DEFAULT +{ + POPUP "&Datoteca" { + MENUITEM "&Rivir", MNID_FILE_OPEN + MENUITEM SEPARATOR + MENUITEM "&Stampar tema", MNID_FILE_PRINT + MENUITEM "&Installaziun dal stampader...", MNID_FILE_SETUP + MENUITEM SEPARATOR + MENUITEM "&Finir", MNID_FILE_EXIT + } + POPUP "&Lavurar" { + MENUITEM "Capchar", MNID_EDIT_COPYDLG + MENUITEM SEPARATOR + MENUITEM "&Annotaziun...", MNID_EDIT_ANNOTATE + } + POPUP "&Marca" { + MENUITEM "&Definir...", MNID_BKMK_DEFINE + } + POPUP "&Agï¿½d" { + MENUITEM "&Douvrar l'agï¿½d", MNID_HELP_HELPON + MENUITEM "Adï¿½na da&vant", MNID_HELP_HELPTOP + MENUITEM SEPARATOR + MENUITEM "I&nfuormaziuns", MNID_HELP_ABOUT +#ifdef WINELIB + MENUITEM "Davart &Wine", MNID_HELP_WINE +#endif + } +} + +/* Strings */ +STRINGTABLE DISCARDABLE LANGUAGE LANG_ROMANSH, SUBLANG_DEFAULT +{ +STID_WINE_HELP, "WINE agï¿½d" +STID_WHERROR, "SBAGL" +STID_WARNING, "ATTENZIUN" +STID_INFO, "INFUORMAZIUN" +STID_NOT_IMPLEMENTED, "Na implementa" +STID_HLPFILE_ERROR_s, "Sbagl cun leger la datoteca d'agï¿½d `%s'" +STID_CONTENTS, "&Cuntgnï¿½" +STID_SEARCH, "&Tscherchar" +STID_BACK, "&Inavo" +STID_HISTORY, "&Fin qua" +STID_TOPICS, "T&opics" +STID_ALL_FILES, "Tuot las datotecas (*.*)" +STID_HELP_FILES_HLP, "Datotecas d'agï¿½d (*.hlp)" +STID_FILE_NOT_FOUND_s "Cannot find '%s'. Do you want to find this file yourself?" +STID_NO_RICHEDIT "Cannot find a richedit implementation... Aborting" +} Propchange: trunk/reactos/base/applications/winhlp32/lang/rm-RM.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/winhlp32/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/lang/sk-SK.rc [iso-8859-1] Thu Jun 12 01:23:44 2008 @@ -25,6 +25,7 @@ MENUITEM SEPARATOR MENUITEM "&Tlaèi", MNID_FILE_PRINT MENUITEM "&Nastavenie tlaèe...", MNID_FILE_SETUP + MENUITEM SEPARATOR MENUITEM "U&konèi", MNID_FILE_EXIT } POPUP "&Upravi" { Modified: trunk/reactos/base/applications/winhlp32/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/rsrc.rc [iso-8859-1] Thu Jun 12 01:23:44 2008 @@ -46,6 +46,7 @@ #include "lang/nb-NO.rc" #include "lang/pl-PL.rc" #include "lang/pt-BR.rc" +//#include "lang/rm-RM.rc" #include "lang/ru-RU.rc" #include "lang/sl-SI.rc" #include "lang/sk-SK.rc" Modified: trunk/reactos/base/applications/wordpad/En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/En.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/En.rc [iso-8859-1] Thu Jun 12 01:23:44 2008 @@ -22,16 +22,16 @@ BEGIN POPUP "&File" BEGIN - MENUITEM "&New . . .\tCtrl+N", ID_FILE_NEW - MENUITEM "&Open . . .\tCtrl+O", ID_FILE_OPEN + MENUITEM "&New...\tCtrl+N", ID_FILE_NEW + MENUITEM "&Open...\tCtrl+O", ID_FILE_OPEN MENUITEM "&Save\tCtrl+S", ID_FILE_SAVE - MENUITEM "Save &as . . .", ID_FILE_SAVEAS - MENUITEM SEPARATOR - MENUITEM "&Print . . .\tCtrl+P", ID_PRINT - MENUITEM "Print previe&w . . .", ID_PREVIEW - MENUITEM "Pag&e setup . . .", ID_PRINTSETUP - MENUITEM SEPARATOR - MENUITEM "E&xit", ID_FILE_EXIT + MENUITEM "Save &as...", ID_FILE_SAVEAS + MENUITEM SEPARATOR + MENUITEM "&Print...\tCtrl+P", ID_PRINT + MENUITEM "Print previe&w...", ID_PREVIEW + MENUITEM "Pag&e setup...", ID_PRINTSETUP + MENUITEM SEPARATOR + MENUITEM "E&xit", ID_FILE_EXIT END POPUP "&Edit" BEGIN @@ -44,9 +44,9 @@ MENUITEM "&Clear\tDEL", ID_EDIT_CLEAR MENUITEM "&Select all\tCtrl+A", ID_EDIT_SELECTALL MENUITEM SEPARATOR - MENUITEM "&Find . . .\tCrtl+F", ID_FIND + MENUITEM "&Find...\tCrtl+F", ID_FIND MENUITEM "Find &next\tF3", ID_FIND_NEXT - MENUITEM "&Replace . . .\tCtrl+H", ID_REPLACE + MENUITEM "&Replace...\tCtrl+H", ID_REPLACE MENUITEM SEPARATOR MENUITEM "Read-&only", ID_EDIT_READONLY MENUITEM "&Modified", ID_EDIT_MODIFIED @@ -67,18 +67,18 @@ MENUITEM "&Ruler", ID_TOGGLE_RULER MENUITEM "&Statusbar", ID_TOGGLE_STATUSBAR MENUITEM SEPARATOR - MENUITEM "&Options . . .", ID_VIEWPROPERTIES + MENUITEM "&Options...", ID_VIEWPROPERTIES END POPUP "&Insert" BEGIN - MENUITEM "&Date and time . . .", ID_DATETIME + MENUITEM "&Date and time...", ID_DATETIME END POPUP "F&ormat" BEGIN - MENUITEM "&Font . . .", ID_FONTSETTINGS + MENUITEM "&Font...", ID_FONTSETTINGS MENUITEM "&Bullet points" ID_BULLET - MENUITEM "&Paragraph . . ." ID_PARAFORMAT - MENUITEM "&Tabs . . ." ID_TABSTOPS + MENUITEM "&Paragraph..." ID_PARAFORMAT + MENUITEM "&Tabs..." ID_TABSTOPS POPUP "Backgroun&d" BEGIN MENUITEM "&System\tCtrl+1", ID_BACK_1 @@ -100,7 +100,7 @@ MENUITEM "&Paste", ID_EDIT_PASTE MENUITEM SEPARATOR MENUITEM "&Bullet points" ID_BULLET - MENUITEM "&Paragraph . . ." ID_PARAFORMAT + MENUITEM "&Paragraph..." ID_PARAFORMAT END END Modified: trunk/reactos/base/applications/wordpad/Hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/Hu.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/Hu.rc [iso-8859-1] Thu Jun 12 01:23:44 2008 @@ -27,9 +27,9 @@ MENUITEM "M&entés\tCtrl+S", ID_FILE_SAVE MENUITEM "Mentés má&sként...", ID_FILE_SAVEAS MENUITEM SEPARATOR - MENUITEM "&Print . . .\tCtrl+P", ID_PRINT - MENUITEM "Print previe&w . . .", ID_PREVIEW - MENUITEM "Page setup . . .", ID_PRINTSETUP + MENUITEM "&Print...\tCtrl+P", ID_PRINT + MENUITEM "Print previe&w...", ID_PREVIEW + MENUITEM "Page setup...", ID_PRINTSETUP MENUITEM SEPARATOR MENUITEM "&Kilépés", ID_FILE_EXIT END @@ -44,9 +44,9 @@ MENUITEM "Tör&lés\tDel", ID_EDIT_CLEAR MENUITEM "M&indet kijelöli\tCtrl+A", ID_EDIT_SELECTALL MENUITEM SEPARATOR - MENUITEM "&Find . . .\tCrtl+F", ID_FIND + MENUITEM "&Find...\tCrtl+F", ID_FIND MENUITEM "Find &next\tF3", ID_FIND_NEXT - MENUITEM "&Replace . . .\tCtrl+H", ID_REPLACE + MENUITEM "&Replace...\tCtrl+H", ID_REPLACE MENUITEM SEPARATOR MENUITEM "Csak &olvasható", ID_EDIT_READONLY MENUITEM "Mó&dosítva", ID_EDIT_MODIFIED @@ -67,18 +67,18 @@ MENUITEM "&Ruler", ID_TOGGLE_RULER MENUITEM "&Statusbar", ID_TOGGLE_STATUSBAR MENUITEM SEPARATOR - MENUITEM "&Options . . .", ID_VIEWPROPERTIES + MENUITEM "&Options...", ID_VIEWPROPERTIES END POPUP "&Insert" BEGIN - MENUITEM "&Date and time . . .", ID_DATETIME + MENUITEM "&Date and time...", ID_DATETIME END POPUP "F&ormátum" BEGIN - MENUITEM "&Font . . .", ID_FONTSETTINGS + MENUITEM "&Font...", ID_FONTSETTINGS MENUITEM "&Bullet points" ID_BULLET - MENUITEM "&Paragraph . . ." ID_PARAFORMAT - MENUITEM "&Tabs . . ." ID_TABSTOPS + MENUITEM "&Paragraph..." ID_PARAFORMAT + MENUITEM "&Tabs..." ID_TABSTOPS POPUP "&Háttér" BEGIN MENUITEM "&Rendszer\tCtrl+1", ID_BACK_1 @@ -100,7 +100,7 @@ MENUITEM "&Beillesztés\tCtrl+V", ID_EDIT_PASTE MENUITEM SEPARATOR MENUITEM "&Bullet points" ID_BULLET - MENUITEM "&Paragraph . . ." ID_PARAFORMAT + MENUITEM "&Paragraph..." ID_PARAFORMAT END END Modified: trunk/reactos/base/applications/wordpad/Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/Ko.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/Ko.rc [iso-8859-1] Thu Jun 12 01:23:44 2008 @@ -29,9 +29,9 @@ MENUITEM "ÀúÀå(&S)\tCtrl+S", ID_FILE_SAVE MENUITEM "´Ù¸¥ ÀÌ¸§À¸·Î ÀúÀå(&A)...", ID_FILE_SAVEAS MENUITEM SEPARATOR - MENUITEM "ÀÎ¼â(&P) . . .\tCtrl+P", ID_PRINT - MENUITEM "ÀÎ¼â ¹Ì¸®º¸±â(&W) . . .", ID_PREVIEW - MENUITEM " ÀÎ¼â ¼³Á¤(&E) . . .", ID_PRINTSETUP + MENUITEM "ÀÎ¼â(&P)...\tCtrl+P", ID_PRINT + MENUITEM "ÀÎ¼â ¹Ì¸®º¸±â(&W)...", ID_PREVIEW + MENUITEM " ÀÎ¼â ¼³Á¤(&E)...", ID_PRINTSETUP MENUITEM SEPARATOR MENUITEM "³ª°¡±â(&X)", ID_FILE_EXIT END @@ -46,9 +46,9 @@ MENUITEM "Áö¿ì±â(&C)\tDEL", ID_EDIT_CLEAR MENUITEM "¸ðµÎ ¼±ÅÃ(&S)\tCtrl+A", ID_EDIT_SELECTALL MENUITEM SEPARATOR - MENUITEM "Ã£±â(&F). . .\tCrtl+F", ID_FIND + MENUITEM "Ã£±â(&F)...\tCrtl+F", ID_FIND MENUITEM "´ÙÀ½ Ã£±â(&N)\tF3", ID_FIND_NEXT - MENUITEM " ¹Ù²Ù±â(&R) . . .\tCtrl+H", ID_REPLACE + MENUITEM " ¹Ù²Ù±â(&R)...\tCtrl+H", ID_REPLACE MENUITEM SEPARATOR MENUITEM "ÀÐ±â Àü¿ë(&O)", ID_EDIT_READONLY MENUITEM "¼öÁ¤ °¡´É(&M)", ID_EDIT_MODIFIED @@ -69,18 +69,18 @@ MENUITEM "&Ruler", ID_TOGGLE_RULER MENUITEM "»óÅÂ¹Ù(&S)", ID_TOGGLE_STATUSBAR MENUITEM SEPARATOR - MENUITEM " ¿É¼Ç(&O) . . .", ID_VIEWPROPERTIES + MENUITEM " ¿É¼Ç(&O)...", ID_VIEWPROPERTIES END POPUP "Áý¾î³Ö±â(&I)" BEGIN - MENUITEM "³¯Â¥¿Í ½Ã°£(&D) . . .", ID_DATETIME + MENUITEM "³¯Â¥¿Í ½Ã°£(&D)...", ID_DATETIME END POPUP "Çü½Ä(&O)" BEGIN - MENUITEM "±Û²Ã(&F) . . .", ID_FONTSETTINGS + MENUITEM "±Û²Ã(&F)...", ID_FONTSETTINGS MENUITEM "°Á¶ Á¡(&U)" ID_BULLET - MENUITEM "´Ü¶ô(&P) . . ." ID_PARAFORMAT - MENUITEM "ÅÇ(&T) . . ." ID_TABSTOPS + MENUITEM "´Ü¶ô(&P)..." ID_PARAFORMAT + MENUITEM "ÅÇ(&T)..." ID_TABSTOPS POPUP "¹è°æ(&B)" BEGIN MENUITEM "½Ã½ºÅÛ(&S)\tCtrl+1", ID_BACK_1 @@ -102,7 +102,7 @@ MENUITEM "ºÙ¿©³Ö±â(&P)", ID_EDIT_PASTE MENUITEM SEPARATOR MENUITEM "°Á¶Á¡(&B)" ID_BULLET - MENUITEM "´Ü¶ô(&P) . . ." ID_PARAFORMAT + MENUITEM "´Ü¶ô(&P)..." ID_PARAFORMAT END END Modified: trunk/reactos/base/applications/wordpad/Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/Nl.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/Nl.rc [iso-8859-1] Thu Jun 12 01:23:44 2008 @@ -27,9 +27,9 @@ MENUITEM "O&pslaan\tCtrl+S", ID_FILE_SAVE MENUITEM "Ops&laan als...", ID_FILE_SAVEAS MENUITEM SEPARATOR - MENUITEM "&Print . . .\tCtrl+P", ID_PRINT - MENUITEM "Print previe&w . . .", ID_PREVIEW - MENUITEM "Pag&e setup . . .", ID_PRINTSETUP + MENUITEM "&Print...\tCtrl+P", ID_PRINT + MENUITEM "Print previe&w...", ID_PREVIEW + MENUITEM "Pag&e setup...", ID_PRINTSETUP MENUITEM SEPARATOR MENUITEM "&Afsluiten", ID_FILE_EXIT END @@ -44,9 +44,9 @@ MENUITEM "&Verwijderen\tDel", ID_EDIT_CLEAR MENUITEM "&Alles selecteren\tCtrl+A", ID_EDIT_SELECTALL MENUITEM SEPARATOR - MENUITEM "&Find . . .\tCrtl+F", ID_FIND + MENUITEM "&Find...\tCrtl+F", ID_FIND MENUITEM "Find &next\tF3", ID_FIND_NEXT - MENUITEM "&Replace . . .\tCtrl+H", ID_REPLACE + MENUITEM "&Replace...\tCtrl+H", ID_REPLACE MENUITEM SEPARATOR MENUITEM "Alleen &lezen", ID_EDIT_READONLY MENUITEM "&Gewijzigd", ID_EDIT_MODIFIED @@ -67,18 +67,18 @@ MENUITEM "&Ruler", ID_TOGGLE_RULER MENUITEM "&Statusbar", ID_TOGGLE_STATUSBAR MENUITEM SEPARATOR - MENUITEM "&Options . . .", ID_VIEWPROPERTIES + MENUITEM "&Options...", ID_VIEWPROPERTIES END POPUP "&Insert" BEGIN - MENUITEM "&Date and time . . .", ID_DATETIME + MENUITEM "&Date and time...", ID_DATETIME END POPUP "&Opmaak" BEGIN - MENUITEM "&Font . . .", ID_FONTSETTINGS + MENUITEM "&Font...", ID_FONTSETTINGS MENUITEM "&Bullet points" ID_BULLET - MENUITEM "&Paragraph . . ." ID_PARAFORMAT - MENUITEM "&Tabs . . ." ID_TABSTOPS + MENUITEM "&Paragraph..." ID_PARAFORMAT + MENUITEM "&Tabs..." ID_TABSTOPS POPUP "&Achtergrond" BEGIN MENUITEM "&Systeem\tCtrl+1", ID_BACK_1 @@ -100,7 +100,7 @@ MENUITEM "&Plakken", ID_EDIT_PASTE MENUITEM SEPARATOR MENUITEM "&Bullet points" ID_BULLET - MENUITEM "&Paragraph . . ." ID_PARAFORMAT + MENUITEM "&Paragraph...", ID_PARAFORMAT END END Modified: trunk/reactos/base/applications/wordpad/No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/No.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/No.rc [iso-8859-1] Thu Jun 12 01:23:44 2008 @@ -23,13 +23,13 @@ POPUP "&Fil" BEGIN MENUITEM "&Ny...\tCtrl+N", ID_FILE_NEW - MENUITEM "&Åpne . . .\tCtrl+O", ID_FILE_OPEN + MENUITEM "&Åpne...\tCtrl+O", ID_FILE_OPEN MENUITEM "&Lagre\tCtrl+S", ID_FILE_SAVE - MENUITEM "Lagre &som . . .", ID_FILE_SAVEAS - MENUITEM SEPARATOR - MENUITEM "&Skriv ut . . .\tCtrl+P", ID_PRINT - MENUITEM "&Forhåndsvisning . . .", ID_PREVIEW - MENUITEM "&Utskriftformat . . .", ID_PRINTSETUP + MENUITEM "Lagre &som...", ID_FILE_SAVEAS + MENUITEM SEPARATOR + MENUITEM "&Skriv ut...\tCtrl+P", ID_PRINT + MENUITEM "&Forhåndsvisning...", ID_PREVIEW + MENUITEM "&Utskriftformat...", ID_PRINTSETUP MENUITEM SEPARATOR MENUITEM "&Avslutt", ID_FILE_EXIT END @@ -44,9 +44,9 @@ MENUITEM "&Fjern\tDEL", ID_EDIT_CLEAR MENUITEM "&Merk alt\tCtrl+A", ID_EDIT_SELECTALL MENUITEM SEPARATOR - MENUITEM "&Søk etter . . .\tCrtl+F", ID_FIND + MENUITEM "&Søk etter...\tCrtl+F", ID_FIND MENUITEM "Søk etter &neste\tF3", ID_FIND_NEXT - MENUITEM "E&rstatt . . .\tCtrl+H", ID_REPLACE + MENUITEM "E&rstatt...\tCtrl+H", ID_REPLACE MENUITEM SEPARATOR MENUITEM "S&krivebeskyttet", ID_EDIT_READONLY MENUITEM "E&ndret", ID_EDIT_MODIFIED @@ -67,18 +67,18 @@ MENUITEM "&Linjal", ID_TOGGLE_RULER MENUITEM "&Statuslinje", ID_TOGGLE_STATUSBAR MENUITEM SEPARATOR - MENUITEM "&Alternativer . . .", ID_VIEWPROPERTIES + MENUITEM "&Alternativer...", ID_VIEWPROPERTIES END POPUP "Sett &inn" BEGIN - MENUITEM "&Dato og klokkeslett . . .", ID_DATETIME + MENUITEM "&Dato og klokkeslett...", ID_DATETIME END POPUP "F&ormat" BEGIN - MENUITEM "&Skrift . . .", ID_FONTSETTINGS + MENUITEM "&Skrift...", ID_FONTSETTINGS MENUITEM "&Punktmerking" ID_BULLET - MENUITEM "&Avsnitt . . ." ID_PARAFORMAT - MENUITEM "&Tabulatorer . . ." ID_TABSTOPS + MENUITEM "&Avsnitt..." ID_PARAFORMAT + MENUITEM "&Tabulatorer..." ID_TABSTOPS POPUP "&Bakgrunn" BEGIN MENUITEM "&System\tCtrl+1", ID_BACK_1 @@ -100,7 +100,7 @@ MENUITEM "&Lim inn" ID_EDIT_PASTE MENUITEM SEPARATOR MENUITEM "&Punktmerking" ID_BULLET - MENUITEM "&Avsnitt . . ." ID_PARAFORMAT + MENUITEM "&Avsnitt..." ID_PARAFORMAT END END Modified: trunk/reactos/base/applications/wordpad/Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/Ru.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/Ru.rc [iso-8859-1] Thu Jun 12 01:23:44 2008 @@ -27,9 +27,9 @@ MENUITEM "&Ñîõðàíèòü\tCtrl+S", ID_FILE_SAVE MENUITEM "Ñîõðàíèòü &êàê...", ID_FILE_SAVEAS MENUITEM SEPARATOR - MENUITEM "&Ïå÷àòü . . .\tCtrl+P", ID_PRINT - MENUITEM "Ïðåä&âàðèòåëüíûé ïðîñìîòð . . .", ID_PREVIEW - MENUITEM "&Ìàêåò ñòðàíèöû . . .", ID_PRINTSETUP + MENUITEM "&Ïå÷àòü...\tCtrl+P", ID_PRINT + MENUITEM "Ïðåä&âàðèòåëüíûé ïðîñìîòð...", ID_PREVIEW + MENUITEM "&Ìàêåò ñòðàíèöû...", ID_PRINTSETUP MENUITEM SEPARATOR MENUITEM "Â&ûõîä", ID_FILE_EXIT END @@ -44,9 +44,9 @@ MENUITEM "&Óäàëèòü\tDEL", ID_EDIT_CLEAR MENUITEM "Âûäåëèòü â&ñå\tCtrl+A", ID_EDIT_SELECTALL MENUITEM SEPARATOR - MENUITEM "&Íàéòè . . .\tCrtl+F", ID_FIND + MENUITEM "&Íàéòè...\tCrtl+F", ID_FIND MENUITEM "Íà&éòè äàëåå\tF3", ID_FIND_NEXT - MENUITEM "&Çàìåíèòü . . .\tCtrl+H", ID_REPLACE + MENUITEM "&Çàìåíèòü...\tCtrl+H", ID_REPLACE MENUITEM SEPARATOR MENUITEM "&Òîëüêî äëÿ ÷òåíèÿ", ID_EDIT_READONLY MENUITEM "&Èçìåíåí", ID_EDIT_MODIFIED @@ -67,18 +67,18 @@ MENUITEM "&Ëèíåéêà", ID_TOGGLE_RULER MENUITEM "&Ñòðîêà ñîñòîÿíèÿ", ID_TOGGLE_STATUSBAR MENUITEM SEPARATOR - MENUITEM "&Ïàðàìåòðû . . .", ID_VIEWPROPERTIES + MENUITEM "&Ïàðàìåòðû...", ID_VIEWPROPERTIES END POPUP "Âñò&àâêà" BEGIN - MENUITEM "&Äàòà è âðåìÿ . . .", ID_DATETIME + MENUITEM "&Äàòà è âðåìÿ...", ID_DATETIME END POPUP "Ôîð&ìàò" BEGIN - MENUITEM "&Øðèôò . . .", ID_FONTSETTINGS + MENUITEM "&Øðèôò...", ID_FONTSETTINGS MENUITEM "&Ìàðêåð" ID_BULLET - MENUITEM "&Àáçàö . . ." ID_PARAFORMAT - MENUITEM "&Òàáóëÿöèÿ . . ." ID_TABSTOPS + MENUITEM "&Àáçàö..." ID_PARAFORMAT + MENUITEM "&Òàáóëÿöèÿ..." ID_TABSTOPS POPUP "&Ôîí" BEGIN MENUITEM "&Ñèñòåìíûé\tCtrl+1", ID_BACK_1 @@ -100,7 +100,7 @@ MENUITEM "Âñò&àâèòü", ID_EDIT_PASTE MENUITEM SEPARATOR MENUITEM "&Ìàðêåð" ID_BULLET - MENUITEM "&Àáçàö . . ." ID_PARAFORMAT + MENUITEM "&Àáçàö..." ID_PARAFORMAT END END Modified: trunk/reactos/base/applications/wordpad/Tr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/Tr.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/Tr.rc [iso-8859-1] Thu Jun 12 01:23:44 2008 @@ -28,11 +28,10 @@ MENUITEM "&Aç...\tCtrl+O", ID_FILE_OPEN MENUITEM "&Kaydet\tCtrl+S", ID_FILE_SAVE MENUITEM "&Farklý Kaydet...", ID_FILE_SAVEAS - MENUITEM "Pag&e setup . . .", ID_PRINTSETUP - MENUITEM SEPARATOR - MENUITEM "&Print . . .\tCtrl+P", ID_PRINT - MENUITEM "Pag&e setup . . .", ID_PRINTSETUP - MENUITEM "Print previe&w . . .", ID_PREVIEW + MENUITEM SEPARATOR + MENUITEM "&Print...\tCtrl+P", ID_PRINT + MENUITEM "Print previe&w...", ID_PREVIEW + MENUITEM "Pag&e setup...", ID_PRINTSETUP MENUITEM SEPARATOR MENUITEM "&Çýk", ID_FILE_EXIT END @@ -47,9 +46,9 @@ MENUITEM "&Sil\tDel", ID_EDIT_CLEAR MENUITEM "&Tümünü seç\tCtrl+A", ID_EDIT_SELECTALL MENUITEM SEPARATOR - MENUITEM "&Find . . .\tCrtl+F", ID_FIND + MENUITEM "&Find...\tCrtl+F", ID_FIND MENUITEM "Find &next\tF3", ID_FIND_NEXT - MENUITEM "&Replace . . .\tCtrl+H", ID_REPLACE + MENUITEM "&Replace...\tCtrl+H", ID_REPLACE MENUITEM SEPARATOR MENUITEM "Salt-&okunur", ID_EDIT_READONLY MENUITEM "&Deðiþmiþ", ID_EDIT_MODIFIED @@ -70,18 +69,18 @@ MENUITEM "&Ruler", ID_TOGGLE_RULER MENUITEM "&Statusbar", ID_TOGGLE_STATUSBAR MENUITEM SEPARATOR - MENUITEM "&Options . . .", ID_VIEWPROPERTIES + MENUITEM "&Options...", ID_VIEWPROPERTIES END POPUP "&Insert" BEGIN - MENUITEM "&Date and time . . .", ID_DATETIME + MENUITEM "&Date and time...", ID_DATETIME END POPUP "&Biçim" BEGIN - MENUITEM "&Font . . .", ID_FONTSETTINGS + MENUITEM "&Font...", ID_FONTSETTINGS MENUITEM "&Bullet points" ID_BULLET - MENUITEM "&Paragraph . . ." ID_PARAFORMAT - MENUITEM "&Tabs . . ." ID_TABSTOPS + MENUITEM "&Paragraph..." ID_PARAFORMAT + MENUITEM "&Tabs..." ID_TABSTOPS POPUP "&Arkaplan" BEGIN MENUITEM "S&istem\tCtrl+1", ID_BACK_1 @@ -102,8 +101,8 @@ MENUITEM "&Kopyala", ID_EDIT_COPY MENUITEM "Ya&pýþtýr", ID_EDIT_PASTE MENUITEM SEPARATOR - MENUITEM "&Bullet points" ID_BULLET - MENUITEM "&Paragraph . . ." ID_PARAFORMAT + MENUITEM "&Bullet points", ID_BULLET + MENUITEM "&Paragraph...", ID_PARAFORMAT END END Modified: trunk/reactos/base/applications/wordpad/wordpad.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/wordpad.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/wordpad.c [iso-8859-1] Thu Jun 12 01:23:44 2008 @@ -1200,7 +1200,7 @@ static void append_current_units(LPWSTR buffer) { - static const WCHAR space[] = {' '}; + static const WCHAR space[] = {' ', 0}; lstrcatW(buffer, space); lstrcatW(buffer, units_cmW); } Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] Thu Jun 12 01:23:44 2008 @@ -618,7 +618,7 @@ modules\rosapps\sysutils\utils\tickcount\tickcount.exe 1 optional modules\rosapps\templates\dialog.exe 1 optional modules\rosapps\templates\mdi.exe 1 optional -modules\rosapps\winefile\winefile.exe 1 optional +modules\rosapps\winfile\winfile.exe 1 optional modules\rosapps\winver\winver.exe 1 optional modules\rosapps\write\write.exe 1 optional modules\rostests\winetests\advapi32\advapi32_winetest.exe 7 optional

16 years, 3 months

[dreimer] 33941: Updated Winefile to Wine 1.0rc4. Renamed it to Winfile, because this is the name it has under windows.

by dreimer＠svn.reactos.org

Author: dreimer Date: Thu Jun 12 01:22:23 2008 New Revision: 33941 URL: http://svn.reactos.org/svn/reactos?rev=33941&view=rev Log: Updated Winefile to Wine 1.0rc4. Renamed it to Winfile, because this is the name it has under windows. Added: trunk/rosapps/winfile/ - copied from r33940, trunk/rosapps/winefile/ trunk/rosapps/winfile/lang/da-DK.rc (with props) trunk/rosapps/winfile/winfile.rbuild (with props) Removed: trunk/rosapps/winefile/ trunk/rosapps/winfile/winefile.rbuild Modified: trunk/rosapps/directory.rbuild trunk/rosapps/winfile/lang/cs-CZ.rc trunk/rosapps/winfile/lang/en-US.rc trunk/rosapps/winfile/lang/fr-FR.rc trunk/rosapps/winfile/lang/it-IT.rc trunk/rosapps/winfile/lang/nb-NO.rc trunk/rosapps/winfile/lang/pt-PT.rc trunk/rosapps/winfile/lang/sv-SE.rc trunk/rosapps/winfile/rsrc.rc trunk/rosapps/winfile/winefile.c Modified: trunk/rosapps/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/directory.rbuild?rev=33941… ============================================================================== --- trunk/rosapps/directory.rbuild [iso-8859-1] (original) +++ trunk/rosapps/directory.rbuild [iso-8859-1] Thu Jun 12 01:22:23 2008 @@ -91,8 +91,8 @@ <xi:include href="templates/directory.rbuild" /> </directory> - <directory name="winefile"> - <xi:include href="winefile/winefile.rbuild" /> + <directory name="winfile"> + <xi:include href="winfile/winfile.rbuild" /> </directory> <directory name="winver"> Modified: trunk/rosapps/winfile/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/winfile/lang/cs-CZ.rc?rev=… ============================================================================== --- trunk/rosapps/winfile/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/rosapps/winfile/lang/cs-CZ.rc [iso-8859-1] Thu Jun 12 01:22:23 2008 @@ -206,4 +206,6 @@ IDS_COL_LINKS "Linky" IDS_COL_ATTR "Atributy" IDS_COL_SEC "Zabezpeèení" -} + + IDS_FREE_SPACE_FMT "%s z %s volného" +} Added: trunk/rosapps/winfile/lang/da-DK.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/winfile/lang/da-DK.rc?rev=… ============================================================================== --- trunk/rosapps/winfile/lang/da-DK.rc (added) +++ trunk/rosapps/winfile/lang/da-DK.rc [iso-8859-1] Thu Jun 12 01:22:23 2008 @@ -1,0 +1,258 @@ +/* + * WineFile + * Danish Language Support + * + * Copyright 2008 Jens Albretsen <jens(a)albretsen.dk> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +LANGUAGE LANG_DANISH, SUBLANG_DEFAULT + +/* Menu */ + +IDM_WINEFILE MENU FIXED IMPURE +{ + POPUP "&Fil" { + MENUITEM "&Åben\tEnter", ID_ACTIVATE + MENUITEM "&Flyt ...\tF7", ID_FILE_MOVE + MENUITEM "&Kopier ...\tF8", ID_FILE_COPY + MENUITEM "&På klippebordet ...\tF9", 118 + MENUITEM "&Slet\tDel", ID_FILE_DELETE + MENUITEM "Omdøb ...", 109 + MENUITEM "&Egenskaper ...\tAlt+Enter", ID_EDIT_PROPERTIES + MENUITEM SEPARATOR + MENUITEM "K&omprimer ...", 119 + MENUITEM "De&komprimer ...", 120 + MENUITEM SEPARATOR + MENUITEM "Kø&r ...", ID_EXECUTE + MENUITEM "&Udskriv ...", 102 + MENUITEM "Associer ...", 103 + MENUITEM SEPARATOR + MENUITEM "Opr&et folder ...", 111 + MENUITEM "S&øg ...", 104 + MENUITEM "&Vælg filer ...", 116 + MENUITEM SEPARATOR +#ifndef _NO_EXTENSIONS + MENUITEM "&Afslut\tAlt+X", ID_FILE_EXIT +#else + MENUITEM "&Afslut", ID_FILE_EXIT +#endif + } + + POPUP "&Diskette" { + MENUITEM "&Kopier diskette ...", 201 + MENUITEM "Sæt vol&umenavn ...", 202 + MENUITEM SEPARATOR + MENUITEM "&Formater diskette ...", ID_FORMAT_DISK +#ifdef _WIN95 + MENUITEM "Opret syste&mdiskette ...", -1 /*TODO*/ +#endif + MENUITEM SEPARATOR + MENUITEM "&Tilslut netværksdrev", ID_CONNECT_NETWORK_DRIVE + MENUITEM "Frakobl &netværksdrev", ID_DISCONNECT_NETWORK_DRIVE + MENUITEM SEPARATOR + MENUITEM "Del som ...", 254 + MENUITEM "Fje&rn delt resourse ...", 255 + MENUITEM SEPARATOR + MENUITEM "Vælg &enhed ...", 251 + } + + POPUP "Kataloge&r" { + MENUITEM "&Næste niveau\t+", 301 + MENUITEM "Udvid t&ræ\t*", 302 + MENUITEM "Udvid &alle\tStrg+*", 303 + MENUITEM "Kolaps &træ\t-", 304 + MENUITEM SEPARATOR + MENUITEM "&Marker underelementer", 505 + } + + POPUP "&Vis" { + MENUITEM "T&ræ og folder", 413 + MENUITEM "Kun tr&æ", 411 + MENUITEM "Kun &folder", 412 + MENUITEM SEPARATOR + MENUITEM "&Visning opdeling", ID_VIEW_SPLIT + MENUITEM SEPARATOR + MENUITEM "&Navn", ID_VIEW_NAME + MENUITEM "&Alle fildetaljer", ID_VIEW_ALL_ATTRIBUTES, CHECKED + MENUITEM "Del&vise detaljer ...", ID_VIEW_SELECTED_ATTRIBUTES + MENUITEM SEPARATOR + MENUITEM "&Sorter efter navn", ID_VIEW_SORT_NAME + MENUITEM "Sorter efter &type", ID_VIEW_SORT_TYPE + MENUITEM "Sorter efter st&ørrelse", ID_VIEW_SORT_SIZE + MENUITEM "Sorter efter &dato", ID_VIEW_SORT_DATE + MENUITEM SEPARATOR + MENUITEM "Filtrer med '&' ...", ID_VIEW_FILTER + } + + POPUP "&Indstillinger" { + MENUITEM "&Bekræftelse ...", 501 + MENUITEM "Skri&fttype ...", ID_SELECT_FONT + MENUITEM "Tilpas &værktøjslinien ...", 512 + MENUITEM SEPARATOR + MENUITEM "Værk&tøjlinie", ID_VIEW_TOOL_BAR, CHECKED + MENUITEM "&Enhedslinie", ID_VIEW_DRIVE_BAR, CHECKED + MENUITEM "&Statuslinie", ID_VIEW_STATUSBAR, CHECKED +#ifndef _NO_EXTENSIONS + MENUITEM "F&uldskærm\tCtrl+Shift+S", ID_VIEW_FULLSCREEN +#endif + MENUITEM SEPARATOR + MENUITEM "&Minimer ved start", 504 + MENUITEM "Gem ind&stillinger ved afslutning",511 + } + + + POPUP "&Sikkerhed" { + MENUITEM "Tilg&ang ...", 605 + MENUITEM "&Logføring ...", 606 + MENUITEM "&Ejer ...", 607 + } + + POPUP "Vind&ue" { + MENUITEM "Nyt &vindue", ID_WINDOW_NEW + MENUITEM "Kortstak\tCtrl+F5", ID_WINDOW_CASCADE + MENUITEM "Stil &vandret", ID_WINDOW_TILE_HORZ + MENUITEM "Stil &lodret\tCtrl+F4", ID_WINDOW_TILE_VERT +#ifndef _NO_EXTENSIONS + MENUITEM "Ordne automatisk", ID_WINDOW_AUTOSORT +#endif + MENUITEM "Ordne &symboler", ID_WINDOW_ARRANGE + MENUITEM "Opdate&r\tF5", ID_REFRESH + } + + POPUP "&Hjælp" { + MENUITEM "Emner i &hjælp\tF1", ID_HELP + MENUITEM "&Søg i hjælp ...\tF1", ID_HELP + MENUITEM "Br&ug af hjælp\tF1", ID_HELP_USING + MENUITEM SEPARATOR + MENUITEM "&Information om Filbehandling ...",ID_ABOUT + } +} + + +IDD_EXECUTE DIALOG FIXED IMPURE 15, 13, 210, 63 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Kør" +FONT 8, "MS Shell Dlg" +{ + CONTROL "", 101, "Static", SS_SIMPLE|SS_NOPREFIX, 3, 6, 162, 10 + CONTROL "&Kommando:", -1, "Static", SS_LEFTNOWORDWRAP|WS_GROUP, 3, 18, 60, 10 + EDITTEXT 201, 3, 29, 134, 12, ES_AUTOHSCROLL + CONTROL "&Som symbol", 214, "Button", BS_AUTOCHECKBOX|WS_TABSTOP,3, 45, 71, 12 + DEFPUSHBUTTON "OK", 1, 158, 6, 47, 14 + PUSHBUTTON "Annuller", 2, 158, 23, 47, 14 + PUSHBUTTON "&Hjælp", 254, 158, 43, 47, 14 +} + +IDD_SELECT_DESTINATION DIALOG FIXED IMPURE 15, 13, 210, 63 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Vælg destination" +FONT 8, "MS Shell Dlg" +{ + CONTROL "", 101, "Static", SS_SIMPLE|SS_NOPREFIX, 3, 6, 162, 10 + CONTROL "&Sti:", -1, "Static", SS_LEFTNOWORDWRAP|WS_GROUP, 3, 18, 60, 10 + EDITTEXT 201, 3, 29, 134, 12, ES_AUTOHSCROLL + DEFPUSHBUTTON "OK", 1, 158, 6, 47, 14 + PUSHBUTTON "Annuller", 2, 158, 23, 47, 14 + PUSHBUTTON "&Gennemse", 254, 158, 43, 47, 14 +} + +IDD_DIALOG_VIEW_TYPE DIALOG DISCARDABLE 15, 13, 161, 97 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Efter filtype" +FONT 8, "MS Sans Serif" +BEGIN + LTEXT "&Navn:",-1,7,8,22,10 + EDITTEXT IDC_VIEW_PATTERN,31,7,63,12,ES_AUTOHSCROLL + GROUPBOX "Filtype",-1,7,23,87,56 + CONTROL "&Kataloger",IDC_VIEW_TYPE_DIRECTORIES,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,13,32,70,10 + CONTROL "&Programmer",IDC_VIEW_TYPE_PROGRAMS,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,13,43,70,10 + CONTROL "Doku&menter",IDC_VIEW_TYPE_DOCUMENTS,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,13,54,70,10 + CONTROL "&Andre filer",IDC_VIEW_TYPE_OTHERS,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,13,65,70,10 + CONTROL "Vi&s skjulte/systemfiler",IDC_VIEW_TYPE_HIDDEN, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,81,106,9 + DEFPUSHBUTTON "OK",IDOK,104,7,50,14 + PUSHBUTTON "Annuller",IDCANCEL,104,24,50,14 +END + +IDD_DIALOG_PROPERTIES DIALOG DISCARDABLE 0, 0, 248, 215 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Egenskaper for %s" +FONT 8, "MS Sans Serif" +BEGIN + DEFPUSHBUTTON "OK",IDOK,191,7,50,14 + PUSHBUTTON "Annuller",IDCANCEL,191,29,50,14 + LTEXT "&Filnavn:",-1,7,7,59,9 + EDITTEXT IDC_STATIC_PROP_FILENAME,71,7,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP + LTEXT "&Full sti:",-1,7,18,59,9 + EDITTEXT IDC_STATIC_PROP_PATH,71,18,120,9, ES_READONLY | NOT WS_BORDER | WS_TABSTOP + LTEXT "Sidst ændret:",-1,7,29,59,9 + EDITTEXT IDC_STATIC_PROP_LASTCHANGE,71,29,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP + LTEXT "Version:",-1,7,40,59,9 + EDITTEXT IDC_STATIC_PROP_VERSION,71,40,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP + LTEXT "&Ophavsret:",-1,7,51,59,9 + EDITTEXT IDC_STATIC_PROP_COPYRIGHT,71,51,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP + LTEXT "Størrelse:",-1,7,62,59,9 + EDITTEXT IDC_STATIC_PROP_SIZE,71,62,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP + GROUPBOX "Attributter",-1,7,79,158,46 + CONTROL "Sk&rivebeskyttet",IDC_CHECK_READONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,91,68,9 + CONTROL "Sk&jult",IDC_CHECK_HIDDEN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,92,91,68,9 + CONTROL "&Arkiv",IDC_CHECK_ARCHIVE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,101,68,9 + CONTROL "&System",IDC_CHECK_SYSTEM,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,92,101,68,9 + CONTROL "Kompr&imeret",IDC_CHECK_COMPRESSED,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,17,111,68,9 + GROUPBOX "&Versioninformation",-1,7,129,234,79 + LISTBOX IDC_LIST_PROP_VERSION_TYPES,13,139,107,63,LBS_SORT | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP + EDITTEXT IDC_LIST_PROP_VERSION_VALUES,123,139,111,63,ES_MULTILINE | ES_READONLY | WS_VSCROLL +END + + +STRINGTABLE +{ + IDS_FONT_SEL_DLG_NAME "Aktiver skriftindstillinger" + IDS_FONT_SEL_ERROR "Fejl ved valg af ny skrifttype." +} + +STRINGTABLE +{ + IDS_WINEFILE "Filbehandling" + IDS_ERROR "Fejl" + IDS_ROOT_FS "Rodfilsystem" + IDS_UNIXFS "Unix-filsystem" + IDS_DESKTOP "Skrivebord" + IDS_SHELL "Skal" + IDS_TITLEFMT "%s - %s" + IDS_NO_IMPL "Ikke implementeret endnu" + IDS_WINE_FILE "Filbehandling" +} + +STRINGTABLE +{ + IDS_COL_NAME "Navn" + IDS_COL_SIZE "Størrelse" + IDS_COL_CDATE "C-dato" + IDS_COL_ADATE "A-dato" + IDS_COL_MDATE "M-dato" + IDS_COL_IDX "Indeks/Inode" + IDS_COL_LINKS "Genveje" + IDS_COL_ATTR "Attributter" + IDS_COL_SEC "Sikkerhed" + + IDS_FREE_SPACE_FMT "%s af %s ledig" +} Propchange: trunk/rosapps/winfile/lang/da-DK.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rosapps/winfile/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/winfile/lang/en-US.rc?rev=… ============================================================================== --- trunk/rosapps/winfile/lang/en-US.rc [iso-8859-1] (original) +++ trunk/rosapps/winfile/lang/en-US.rc [iso-8859-1] Thu Jun 12 01:22:23 2008 @@ -21,7 +21,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US +LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT /* Menu */ Modified: trunk/rosapps/winfile/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/winfile/lang/fr-FR.rc?rev=… ============================================================================== --- trunk/rosapps/winfile/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/rosapps/winfile/lang/fr-FR.rc [iso-8859-1] Thu Jun 12 01:22:23 2008 @@ -191,7 +191,7 @@ CONTROL "&Autres fichiers",IDC_VIEW_TYPE_OTHERS,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,13,65,70,10 CONTROL "Montrer les fichiers cachés/&système",IDC_VIEW_TYPE_HIDDEN, - "Bouton",BS_AUTOCHECKBOX | WS_TABSTOP,7,81,106,9 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,81,106,9 DEFPUSHBUTTON "OK",IDOK,104,7,50,14 PUSHBUTTON "Annuler",IDCANCEL,104,24,50,14 END Modified: trunk/rosapps/winfile/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/winfile/lang/it-IT.rc?rev=… ============================================================================== --- trunk/rosapps/winfile/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/rosapps/winfile/lang/it-IT.rc [iso-8859-1] Thu Jun 12 01:22:23 2008 @@ -165,8 +165,8 @@ CAPTION "Select destination" FONT 8, "MS Shell Dlg" { - CONTROL "", 101, "Statico", SS_SIMPLE|SS_NOPREFIX, 3, 6, 162, 10 - CONTROL "&Percorso:", -1, "Statico", SS_LEFTNOWORDWRAP|WS_GROUP, 3, 18, 60, 10 + CONTROL "", 101, "Static", SS_SIMPLE|SS_NOPREFIX, 3, 6, 162, 10 + CONTROL "&Percorso:", -1, "Static", SS_LEFTNOWORDWRAP|WS_GROUP, 3, 18, 60, 10 EDITTEXT 201, 3, 29, 134, 12, ES_AUTOHSCROLL DEFPUSHBUTTON "OK", 1, 158, 6, 47, 14 PUSHBUTTON "Annulla", 2, 158, 23, 47, 14 Modified: trunk/rosapps/winfile/lang/nb-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/winfile/lang/nb-NO.rc?rev=… ============================================================================== --- trunk/rosapps/winfile/lang/nb-NO.rc [iso-8859-1] (original) +++ trunk/rosapps/winfile/lang/nb-NO.rc [iso-8859-1] Thu Jun 12 01:22:23 2008 @@ -27,23 +27,23 @@ { POPUP "&Fil" { MENUITEM "&Åpne\tEnter", ID_ACTIVATE - MENUITEM "&Flytt . . .\tF7", ID_FILE_MOVE - MENUITEM "&Kopier . . .\tF8", ID_FILE_COPY - MENUITEM "&I utklippstavlen . . .\tF9", 118 + MENUITEM "&Flytt...\tF7", ID_FILE_MOVE + MENUITEM "&Kopier...\tF8", ID_FILE_COPY + MENUITEM "&I utklippstavlen...\tF9", 118 MENUITEM "&Slett\tDel", ID_FILE_DELETE - MENUITEM "Gi &nytt navn . . .", 109 - MENUITEM "&Egenskaper . . .\tAlt+Enter", ID_EDIT_PROPERTIES - MENUITEM SEPARATOR - MENUITEM "K&omprimer . . .", 119 - MENUITEM "De&komprimer . . .", 120 - MENUITEM SEPARATOR - MENUITEM "Kjø&r . . .", ID_EXECUTE - MENUITEM "Skriv &ut . . .", 102 - MENUITEM "Tilknytt . . .", 103 - MENUITEM SEPARATOR - MENUITEM "Oppr&et katalog . . .", 111 - MENUITEM "S&øk . . .", 104 - MENUITEM "&Velg filer . . .", 116 + MENUITEM "Gi &nytt navn...", 109 + MENUITEM "&Egenskaper...\tAlt+Enter", ID_EDIT_PROPERTIES + MENUITEM SEPARATOR + MENUITEM "K&omprimer...", 119 + MENUITEM "De&komprimer...", 120 + MENUITEM SEPARATOR + MENUITEM "Kjø&r...", ID_EXECUTE + MENUITEM "Skriv &ut...", 102 + MENUITEM "Tilknytt...", 103 + MENUITEM SEPARATOR + MENUITEM "Oppr&et katalog...", 111 + MENUITEM "S&øk...", 104 + MENUITEM "&Velg filer...", 116 MENUITEM SEPARATOR #ifndef _NO_EXTENSIONS MENUITEM "&Avslutt\tAlt+X", ID_FILE_EXIT @@ -53,21 +53,21 @@ } POPUP "&Stasjon" { - MENUITEM "&Kopier stasjon . . .", 201 - MENUITEM "Gi vol&umnavn . . .", 202 - MENUITEM SEPARATOR - MENUITEM "&Formater stasjon . . .", ID_FORMAT_DISK + MENUITEM "&Kopier stasjon...", 201 + MENUITEM "Gi vol&umnavn...", 202 + MENUITEM SEPARATOR + MENUITEM "&Formater stasjon...", ID_FORMAT_DISK #ifdef _WIN95 - MENUITEM "Opprett syste&mdisk . . .", -1 /*TODO*/ + MENUITEM "Opprett syste&mdisk...", -1 /*TODO*/ #endif MENUITEM SEPARATOR MENUITEM "Koble til &nettverksstasjon", ID_CONNECT_NETWORK_DRIVE MENUITEM "Koble &fra nettverksstasjon", ID_DISCONNECT_NETWORK_DRIVE MENUITEM SEPARATOR - MENUITEM "Del som . . .", 254 - MENUITEM "Fje&rn delt ressurs . . .", 255 - MENUITEM SEPARATOR - MENUITEM "Velg &stasjon . . .", 251 + MENUITEM "Del som...", 254 + MENUITEM "Fje&rn delt ressurs...", 255 + MENUITEM SEPARATOR + MENUITEM "Velg &stasjon...", 251 } POPUP "Kataloge&r" { @@ -88,20 +88,20 @@ MENUITEM SEPARATOR MENUITEM "&Navn", ID_VIEW_NAME MENUITEM "&Alle fildetaljer", ID_VIEW_ALL_ATTRIBUTES, CHECKED - MENUITEM "Del&vise detaljer . . .", ID_VIEW_SELECTED_ATTRIBUTES + MENUITEM "Del&vise detaljer...", ID_VIEW_SELECTED_ATTRIBUTES MENUITEM SEPARATOR MENUITEM "&Sorter etter navn", ID_VIEW_SORT_NAME MENUITEM "Sorter etter &type", ID_VIEW_SORT_TYPE MENUITEM "Sorter etter st&ørrelse", ID_VIEW_SORT_SIZE MENUITEM "Sorter etter &dato", ID_VIEW_SORT_DATE MENUITEM SEPARATOR - MENUITEM "Filtrer med '&' . . .", ID_VIEW_FILTER + MENUITEM "Filtrer med '&'...", ID_VIEW_FILTER } POPUP "&Innstillinger" { - MENUITEM "&Bekreftelse . . .", 501 - MENUITEM "Skri&ft . . .", ID_SELECT_FONT - MENUITEM "Tilpass &verktøylinjen . . .", 512 + MENUITEM "&Bekreftelse...", 501 + MENUITEM "Skri&ft...", ID_SELECT_FONT + MENUITEM "Tilpass &verktøylinjen...", 512 MENUITEM SEPARATOR MENUITEM "Verk&tøylinje", ID_VIEW_TOOL_BAR, CHECKED MENUITEM "Stas&jonslinje", ID_VIEW_DRIVE_BAR, CHECKED @@ -116,9 +116,9 @@ POPUP "&Sikkerhet" { - MENUITEM "Tilg&ang . . .", 605 - MENUITEM "&Loggføring . . .", 606 - MENUITEM "&Eier . . .", 607 + MENUITEM "Tilg&ang...", 605 + MENUITEM "&Loggføring...", 606 + MENUITEM "&Eier...", 607 } POPUP "Vind&u" { @@ -135,10 +135,10 @@ POPUP "&Hjelp" { MENUITEM "Emner i &hjelp\tF1", ID_HELP - MENUITEM "&Søk i hjelp . . .\tF1", ID_HELP + MENUITEM "&Søk i hjelp...\tF1", ID_HELP MENUITEM "Br&uk av hjelp\tF1", ID_HELP_USING MENUITEM SEPARATOR - MENUITEM "&Informasjon om Filbehandling . . .", ID_ABOUT + MENUITEM "&Informasjon om Filbehandling...", ID_ABOUT } } Modified: trunk/rosapps/winfile/lang/pt-PT.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/winfile/lang/pt-PT.rc?rev=… ============================================================================== --- trunk/rosapps/winfile/lang/pt-PT.rc [iso-8859-1] (original) +++ trunk/rosapps/winfile/lang/pt-PT.rc [iso-8859-1] Thu Jun 12 01:22:23 2008 @@ -261,6 +261,7 @@ MENUITEM "Pesquisar...", ID_HELP MENUITEM "&Usar a ajuda", ID_HELP_USING MENUITEM SEPARATOR + MENUITEM "&Sobre o Winefile...", ID_ABOUT } } @@ -343,6 +344,12 @@ IDS_TITLEFMT "%s - %s" IDS_NO_IMPL "Ainda não implementado" IDS_WINE_FILE "Wine File" + IDS_COL_NAME "Nome" + IDS_COL_SIZE "Tamanho" + IDS_COL_CDATE "CData" + IDS_COL_ADATE "AData" + IDS_COL_MDATE "MData" + IDS_COL_IDX "Índice/Inode" } LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE @@ -358,19 +365,21 @@ IDS_TITLEFMT "%s - %s" IDS_NO_IMPL "Ainda não implementado" IDS_WINE_FILE "Ficheiro Wine" -} - -LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL - -STRINGTABLE -{ IDS_COL_NAME "Nome" IDS_COL_SIZE "Tamanho" IDS_COL_CDATE "CData" IDS_COL_ADATE "AData" IDS_COL_MDATE "MData" IDS_COL_IDX "Índice/Inode" +} + +LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL + +STRINGTABLE +{ IDS_COL_LINKS "Ligações" IDS_COL_ATTR "Atributos" IDS_COL_SEC "Segurança" -} + + IDS_FREE_SPACE_FMT "%s of %s free" +} Modified: trunk/rosapps/winfile/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/winfile/lang/sv-SE.rc?rev=… ============================================================================== --- trunk/rosapps/winfile/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/rosapps/winfile/lang/sv-SE.rc [iso-8859-1] Thu Jun 12 01:22:23 2008 @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -LANGUAGE LANG_SWEDISH, SUBLANG_DEFAULT +LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL /* Menu */ @@ -200,4 +200,6 @@ IDS_COL_LINKS "Länkar" IDS_COL_ATTR "Attribut" IDS_COL_SEC "Säkerhet" -} + + IDS_FREE_SPACE_FMT "%s of %s free" +} Modified: trunk/rosapps/winfile/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/winfile/rsrc.rc?rev=33941&… ============================================================================== --- trunk/rosapps/winfile/rsrc.rc [iso-8859-1] (original) +++ trunk/rosapps/winfile/rsrc.rc [iso-8859-1] Thu Jun 12 01:22:23 2008 @@ -56,6 +56,7 @@ /* include localised resources */ #include "lang/cs-CZ.rc" +#include "lang/da-DK.rc" #include "lang/de-DE.rc" #include "lang/en-US.rc" #include "lang/es-ES.rc" Modified: trunk/rosapps/winfile/winefile.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/winfile/winefile.c?rev=339… ============================================================================== --- trunk/rosapps/winfile/winefile.c [iso-8859-1] (original) +++ trunk/rosapps/winfile/winefile.c [iso-8859-1] Thu Jun 12 01:22:23 2008 @@ -196,15 +196,8 @@ static const TCHAR sWINEFILEFRAME[] = {'W','F','S','_','F','r','a','m','e','\0'}; static const TCHAR sWINEFILETREE[] = {'W','F','S','_','T','r','e','e','\0'}; -#ifdef _MSC_VER -/* #define LONGLONGARG _T("I64") */ static const TCHAR sLongHexFmt[] = {'%','I','6','4','X','\0'}; -static const TCHAR sLongNumFmt[] = {'%','I','6','4','d','\0'}; -#else -/* #define LONGLONGARG _T("L") */ -static const TCHAR sLongHexFmt[] = {'%','L','X','\0'}; -static const TCHAR sLongNumFmt[] = {'%','L','d','\0'}; -#endif +static const TCHAR sLongNumFmt[] = {'%','I','6','4','u','\0'}; /* load resource string */ Removed: trunk/rosapps/winfile/winefile.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/winefile/winefile.rbuild?r… ============================================================================== --- trunk/rosapps/winfile/winefile.rbuild [iso-8859-1] (original) +++ trunk/rosapps/winfile/winefile.rbuild (removed) @@ -1,23 +1,0 @@ -<?xml version="1.0"?> -<rbuild xmlns:xi="http://www.w3.org/2001/XInclude"> - <module name="winefile" type="win32gui" installbase="system32" installname="winefile.exe" allowwarnings="true"> - <include base="winefile">.</include> - <define name="UNICODE" /> - <define name="__USE_W32API" /> - <define name="_WIN32_IE">0x0501</define> - <define name="_WIN32_WINNT">0x0501</define> - <library>shell32</library> - <library>comdlg32</library> - <library>comctl32</library> - <library>ole32</library> - <library>mpr</library> - <library>version</library> - <library>user32</library> - <library>gdi32</library> - <library>advapi32</library> - <library>kernel32</library> - <library>uuid</library> - <file>winefile.c</file> - <file>rsrc.rc</file> - </module> -</rbuild> Added: trunk/rosapps/winfile/winfile.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/winfile/winfile.rbuild?rev… ============================================================================== --- trunk/rosapps/winfile/winfile.rbuild (added) +++ trunk/rosapps/winfile/winfile.rbuild [iso-8859-1] Thu Jun 12 01:22:23 2008 @@ -1,0 +1,23 @@ +<?xml version="1.0"?> +<rbuild xmlns:xi="http://www.w3.org/2001/XInclude"> + <module name="winfile" type="win32gui" installbase="system32" installname="winfile.exe" allowwarnings="true"> + <include base="winfile">.</include> + <define name="UNICODE" /> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x0501</define> + <define name="_WIN32_WINNT">0x0501</define> + <library>shell32</library> + <library>comdlg32</library> + <library>comctl32</library> + <library>ole32</library> + <library>mpr</library> + <library>version</library> + <library>user32</library> + <library>gdi32</library> + <library>advapi32</library> + <library>kernel32</library> + <library>uuid</library> + <file>winefile.c</file> + <file>rsrc.rc</file> + </module> +</rbuild> Propchange: trunk/rosapps/winfile/winfile.rbuild ------------------------------------------------------------------------------ svn:eol-style = native

16 years, 3 months

[ros-arm-bringup] 33940: - We now implement more proper context switching. - This fixes an issue where code was using PCR->CurrentThread but x86/shared routines use PRCB->CurrentThread. - Added a note to explain the difference, and we now set both. - We currently stop at Phase 1 HAL Initialization.

by ros-arm-bringup＠svn.reactos.org

Author: ros-arm-bringup Date: Wed Jun 11 23:32:45 2008 New Revision: 33940 URL: http://svn.reactos.org/svn/reactos?rev=33940&view=rev Log: - We now implement more proper context switching. - This fixes an issue where code was using PCR->CurrentThread but x86/shared routines use PRCB->CurrentThread. - Added a note to explain the difference, and we now set both. - We currently stop at Phase 1 HAL Initialization. Modified: trunk/reactos/include/reactos/armddk.h trunk/reactos/ntoskrnl/ex/init.c trunk/reactos/ntoskrnl/ke/arm/trapc.c Modified: trunk/reactos/include/reactos/armddk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/armddk.h?r… ============================================================================== --- trunk/reactos/include/reactos/armddk.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/armddk.h [iso-8859-1] Wed Jun 11 23:32:45 2008 @@ -111,6 +111,8 @@ PVOID InitialStack; PVOID StackLimit; ULONG QuantumEnd; + PVOID PerfGlobalGroupMask; + ULONG ContextSwitches; } KPCR, *PKPCR; // Modified: trunk/reactos/ntoskrnl/ex/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/init.c?rev=339… ============================================================================== --- trunk/reactos/ntoskrnl/ex/init.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/init.c [iso-8859-1] Wed Jun 11 23:32:45 2008 @@ -1269,7 +1269,7 @@ DPRINT1("*** Phase 1 Initialization Thread\n"); DPRINT1("Beginning consistency checks...\n"); // CHECK STACKS, IRQLS, DISPATCHER AND MAKE SURE WE ARE GOOD TO GO! - while (TRUE); + //while (TRUE); #endif /* Allocate the initialization buffer */ Modified: trunk/reactos/ntoskrnl/ke/arm/trapc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/arm/trapc.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/ke/arm/trapc.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/arm/trapc.c [iso-8859-1] Wed Jun 11 23:32:45 2008 @@ -33,11 +33,14 @@ VOID FASTCALL HalClearSoftwareInterrupt(IN KIRQL Request); -VOID +BOOLEAN KiSwapContextInternal(IN PKTHREAD OldThread, IN PKTHREAD NewThread) { PKEXCEPTION_FRAME ExFrame = NewThread->KernelStack; + PKPCR Pcr = (PKPCR)KeGetPcr(); + PKPRCB Prcb = Pcr->Prcb; + PKPROCESS OldProcess, NewProcess; DPRINT1("Switching from: %p to %p\n", OldThread, NewThread); DPRINT1("Stacks: %p %p\n", OldThread->KernelStack, NewThread->KernelStack); DPRINT1("Thread Registers:\n" @@ -61,10 +64,91 @@ ExFrame->R11, ExFrame->Psr, ExFrame->Lr); - - // - // FIXME: Todo - // + DPRINT1("Old priority: %lx\n", OldThread->Priority); + + // + // Increase context switch count + // + Pcr->ContextSwitches++; + + // + // Check if WMI tracing is enabled + // + if (Pcr->PerfGlobalGroupMask) + { + // + // FIXME: TODO + // + DPRINT1("WMI Tracing not supported\n"); + while (TRUE); + } + + // + // Check if the processes are also different + // + OldProcess = OldThread->ApcState.Process; + NewProcess = NewThread->ApcState.Process; + if (OldProcess != NewProcess) + { + // + // Check if address space switch is needed + // + if (OldProcess->DirectoryTableBase.LowPart != + NewProcess->DirectoryTableBase.LowPart) + { + // + // FIXME: TODO + // + DPRINT1("Address space switch not implemented\n"); + while (TRUE); + } + } + + // + // Increase thread context switches + // + NewThread->ContextSwitches++; + + // + // Set us as the current thread + // NOTE: On RISC Platforms, there is both a KPCR CurrentThread, and a + // KPRCB CurrentThread. + // The latter is set just like on x86-based builds, the former is only set + // when actually doing the context switch (here). + // Recall that the reason for the latter is due to the fact that the KPCR + // is shared with user-mode (read-only), so that information is exposed + // there as well. + // + Pcr->CurrentThread = NewThread; + + // + // DPCs shouldn't be active + // + if (Prcb->DpcRoutineActive) + { + // + // FIXME: FAIL + // + DPRINT1("DPCS ACTIVE!!!\n"); + while (TRUE); + } + + // + // Kernel APCs may be pending + // + if (NewThread->ApcState.KernelApcPending) + { + // + // FIXME: TODO + // + DPRINT1("APCs pending!\n"); + while (TRUE); + } + + // + // Return + // + return FALSE; } VOID

16 years, 3 months

[weiden] 33939: Use band styles provided by the IDeskBand interface

by weiden＠svn.reactos.org

Author: weiden Date: Wed Jun 11 22:12:02 2008 New Revision: 33939 URL: http://svn.reactos.org/svn/reactos?rev=33939&view=rev Log: Use band styles provided by the IDeskBand interface Modified: trunk/reactos/dll/win32/browseui/bandsite.c Modified: trunk/reactos/dll/win32/browseui/bandsite.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/bandsit… ============================================================================== --- trunk/reactos/dll/win32/browseui/bandsite.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/bandsite.c [iso-8859-1] Wed Jun 11 22:12:02 2008 @@ -138,9 +138,88 @@ return DBIF_VIEWMODE_NORMAL; } +static VOID BuildRebarBandInfo(BandSite *This, struct BandObject *Band, REBARBANDINFOW *prbi) +{ + ZeroMemory(prbi, sizeof(*prbi)); + prbi->cbSize = sizeof(*prbi); + + prbi->fMask = RBBIM_ID; + prbi->wID = GetBandID(This, + Band); + + if (Band->dbi.dwMask & DBIM_MINSIZE) + { + prbi->fMask |= RBBIM_CHILDSIZE; + prbi->cxMinChild = Band->dbi.ptMinSize.x; + prbi->cyMinChild = Band->dbi.ptMinSize.y; + } + + if (Band->dbi.dwMask & DBIM_MAXSIZE) + { + prbi->fMask |= RBBIM_CHILDSIZE; + prbi->cyMaxChild = Band->dbi.ptMaxSize.y; + } + + if ((Band->dbi.dwMask & (DBIM_INTEGRAL | DBIM_MODEFLAGS)) == (DBIM_INTEGRAL | DBIM_MODEFLAGS) && + (Band->dbi.dwModeFlags & DBIMF_VARIABLEHEIGHT)) + { + prbi->fMask |= RBBIM_CHILDSIZE; + prbi->cyIntegral = Band->dbi.ptIntegral.y; + } + + if (Band->dbi.dwMask & DBIM_ACTUAL) + { + prbi->fMask |= RBBIM_IDEALSIZE | RBBIM_SIZE | RBBIM_CHILDSIZE; + prbi->cxIdeal = Band->dbi.ptActual.x; + prbi->cx = Band->dbi.ptActual.x; + prbi->cyChild = Band->dbi.ptActual.y; + } + + if (Band->dbi.dwMask & DBIM_TITLE) + { + prbi->fMask |= RBBIM_TEXT; + prbi->lpText = Band->dbi.wszTitle; + prbi->cch = wcslen(Band->dbi.wszTitle); + } + + if (Band->dbi.dwMask & DBIM_MODEFLAGS) + { + prbi->fMask |= RBBIM_STYLE; + + if (Band->dbi.dwModeFlags & DBIMF_FIXED) + prbi->fStyle |= RBBS_FIXEDSIZE | RBBS_NOGRIPPER; + if (Band->dbi.dwModeFlags & DBIMF_FIXEDBMP) + prbi->fStyle |= RBBS_FIXEDBMP; + if (Band->dbi.dwModeFlags & DBIMF_VARIABLEHEIGHT) + prbi->fStyle |= RBBS_VARIABLEHEIGHT; + if (Band->dbi.dwModeFlags & DBIMF_DEBOSSED) + prbi->fStyle |= RBBS_CHILDEDGE; + if (Band->dbi.dwModeFlags & DBIMF_USECHEVRON) + prbi->fStyle |= RBBS_USECHEVRON; + if (Band->dbi.dwModeFlags & DBIMF_BREAK) + prbi->fStyle |= RBBS_BREAK; + if (Band->dbi.dwModeFlags & DBIMF_TOPALIGN) + prbi->fStyle |= RBBS_TOPALIGN; + if (Band->dbi.dwModeFlags & DBIMF_NOGRIPPER) + prbi->fStyle |= RBBS_NOGRIPPER; + if (Band->dbi.dwModeFlags & DBIMF_ALWAYSGRIPPER) + prbi->fStyle |= RBBS_GRIPPERALWAYS; + } + + if ((Band->dbi.dwMask & (DBIM_BKCOLOR | DBIM_MODEFLAGS)) == (DBIM_BKCOLOR | DBIM_MODEFLAGS) && + (Band->dbi.dwModeFlags & DBIMF_BKCOLOR)) + { + prbi->fMask |= RBBIM_COLORS; + prbi->clrFore = (COLORREF)(COLOR_WINDOWTEXT + 1); + prbi->clrBack = Band->dbi.crBkgnd; + } +} + static HRESULT UpdateSingleBand(BandSite *This, struct BandObject *Band) { + REBARBANDINFOW rbi; DWORD dwViewMode; + UINT uBand; HRESULT hRet; ZeroMemory (&Band->dbi, sizeof(Band->dbi)); @@ -156,6 +235,34 @@ &Band->dbi); if (SUCCEEDED(hRet)) { + BuildRebarBandInfo(This, + Band, + &rbi); + if (SUCCEEDED(IOleWindow_GetWindow(Band->OleWindow, + &rbi.hwndChild)) && + rbi.hwndChild != NULL) + { + rbi.fMask |= RBBIM_CHILD; + WARN ("ReBar band uses child window 0x%p\n", rbi.hwndChild); + } + + uBand = (UINT)SendMessageW(This->hWndRebar, + RB_IDTOINDEX, + (WPARAM)rbi.wID, + 0); + if (uBand != (UINT)-1) + { + if (!SendMessageW(This->hWndRebar, + RB_SETBANDINFOW, + (WPARAM)uBand, + (LPARAM)&rbi)) + { + WARN("Failed to update the rebar band!\n"); + } + } + else + WARN("Failed to map rebar band id to index!\n"); + } return hRet; @@ -441,33 +548,52 @@ { ASSERT(NewBand != NULL); - /* Create the ReBar band */ - rbi.cbSize = sizeof(rbi); - rbi.fMask = RBBIM_ID; - rbi.wID = GetBandID(This, - NewBand); - if (!SendMessageW(This->hWndRebar, - RB_INSERTBANDW, - (WPARAM)((UINT)-1), - ( LPARAM)&rbi)) - { - hRet = E_FAIL; - goto Cleanup; - } - + This->BandsCount++; NewBand->DeskBand = DeskBand; NewBand->OleWindow = OleWindow; NewBand->WndEvtHandler = WndEvtHandler; - This->BandsCount++; - DeskBand = NULL; OleWindow = NULL; WndEvtHandler = NULL; + + /* Create the ReBar band */ hRet = IObjectWithSite_SetSite(ObjWithSite, (IUnknown*)iface); if (SUCCEEDED(hRet)) { + uBand = (UINT)-1; + if (SUCCEEDED(UpdateSingleBand(This, + NewBand))) + { + if (NewBand->dbi.dwMask & DBIM_MODEFLAGS) + { + if (NewBand->dbi.dwModeFlags & DBIMF_ADDTOFRONT) + uBand = 0; + } + } + + BuildRebarBandInfo(This, + NewBand, + &rbi); + + if (SUCCEEDED(IOleWindow_GetWindow(NewBand->OleWindow, + &rbi.hwndChild)) && + rbi.hwndChild != NULL) + { + rbi.fMask |= RBBIM_CHILD; + WARN ("ReBar band uses child window 0x%p\n", rbi.hwndChild); + } + + if (!SendMessageW(This->hWndRebar, + RB_INSERTBANDW, + (WPARAM)uBand, + (LPARAM)&rbi)) + { + hRet = E_FAIL; + goto Cleanup; + } + hRet = (HRESULT)((USHORT)GetBandID(This, NewBand)); } @@ -702,6 +828,16 @@ if (This->hWndRebar == NULL) return E_FAIL; + if (hWnd == This->hWndRebar) + { + /* FIXME: Just send the message? */ + *plrResult = SendMessageW(hWnd, + uMsg, + wParam, + lParam); + return S_OK; + } + Band = GetBandFromHwnd(This, hWnd); if (Band != NULL) @@ -714,7 +850,7 @@ plrResult); } - return S_FALSE; + return E_FAIL; } static HRESULT WINAPI BandSite_ContainsWindow(IWindowEventHandler *iface, HWND hWnd)

16 years, 3 months

[weiden] 33938: More IBandSite support code

by weiden＠svn.reactos.org

Author: weiden Date: Wed Jun 11 20:14:18 2008 New Revision: 33938 URL: http://svn.reactos.org/svn/reactos?rev=33938&view=rev Log: More IBandSite support code Modified: trunk/reactos/dll/win32/browseui/bandsite.c Modified: trunk/reactos/dll/win32/browseui/bandsite.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/bandsit… ============================================================================== --- trunk/reactos/dll/win32/browseui/bandsite.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/bandsite.c [iso-8859-1] Wed Jun 11 20:14:18 2008 @@ -57,6 +57,9 @@ struct BandObject { IDeskBand *DeskBand; + IOleWindow *OleWindow; + IWindowEventHandler *WndEvtHandler; + DESKBANDINFO dbi; }; typedef struct tagBandSite { @@ -93,6 +96,11 @@ return (BandSite *)((char *)iface - FIELD_OFFSET(BandSite, oletargetVtbl)); } +static UINT GetBandID(BandSite *This, struct BandObject *Band) +{ + return (UINT)(Band - This->Bands); +} + static struct BandObject* GetBandByID(BandSite *This, DWORD dwBandID) { if (dwBandID >= This->BandsAllocated) @@ -106,7 +114,12 @@ static void FreeBand(BandSite *This, struct BandObject *Band) { - IUnknown_Release(Band->DeskBand); + ASSERT(Band->DeskBand != NULL); + ASSERT(Band->OleWindow != NULL); + ASSERT(Band->WndEvtHandler != NULL); + IDeskBand_Release(Band->DeskBand); + IOleWindow_Release(Band->OleWindow); + IWindowEventHandler_Release(Band->WndEvtHandler); ZeroMemory(Band, sizeof(*Band)); This->BandsCount--; } @@ -125,27 +138,40 @@ return DBIF_VIEWMODE_NORMAL; } +static HRESULT UpdateSingleBand(BandSite *This, struct BandObject *Band) +{ + DWORD dwViewMode; + HRESULT hRet; + + ZeroMemory (&Band->dbi, sizeof(Band->dbi)); + Band->dbi.dwMask = DBIM_MINSIZE | DBIM_MAXSIZE | DBIM_INTEGRAL | + DBIM_ACTUAL | DBIM_TITLE | DBIM_MODEFLAGS | DBIM_BKCOLOR; + + dwViewMode = GetBandSiteViewMode(This); + + hRet = IDeskBand_GetBandInfo(Band->DeskBand, + (DWORD)GetBandID(This, + Band), + dwViewMode, + &Band->dbi); + if (SUCCEEDED(hRet)) + { + } + + return hRet; +} + static HRESULT UpdateAllBands(BandSite *This) { - DESKBANDINFO dbi; - DWORD dwViewMode; LONG i; HRESULT hRet; - dwViewMode = GetBandSiteViewMode(This); - for (i = 0; i < This->BandsAllocated; i++) { if (This->Bands[i].DeskBand != NULL) { - ZeroMemory (&dbi, sizeof(dbi)); - dbi.dwMask = 0; - /* FIXME */ - - hRet = IDeskBand_GetBandInfo(This->Bands[i].DeskBand, - i, - dwViewMode, - &dbi); + hRet = UpdateSingleBand(This, + &This->Bands[i]); if (!SUCCEEDED(hRet)) return hRet; } @@ -157,26 +183,37 @@ static HRESULT UpdateBand(BandSite *This, DWORD dwBandID) { struct BandObject *Band; - DESKBANDINFO dbi; - DWORD dwViewMode; - - FIXME("UpdateBand(%x)\n", dwBandID); Band = GetBandByID(This, dwBandID); if (Band == NULL) return E_FAIL; - /* FIXME */ - ZeroMemory (&dbi, sizeof(dbi)); - dbi.dwMask = 0; - - dwViewMode = GetBandSiteViewMode(This); - - return IDeskBand_GetBandInfo(Band->DeskBand, - dwBandID, - dwViewMode, - &dbi); + return UpdateSingleBand(This, + Band); +} + +static struct BandObject* GetBandFromHwnd(BandSite *This, HWND hwnd) +{ + HRESULT hRet; + HWND hWndBand; + LONG i; + + for (i = 0; i < This->BandsAllocated; i++) + { + if (This->Bands[i].DeskBand != NULL) + { + ASSERT(This->Bands[i].OleWindow); + + hWndBand = NULL; + hRet = IOleWindow_GetWindow(This->Bands[i].OleWindow, + &hWndBand); + if (SUCCEEDED(hRet) && hWndBand == hwnd) + return &This->Bands[i]; + } + } + + return NULL; } HRESULT WINAPI BandSite_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut) @@ -301,11 +338,15 @@ struct BandObject *NewBand = NULL; IDeskBand *DeskBand = NULL; IObjectWithSite *ObjWithSite = NULL; + IOleWindow *OleWindow = NULL; + IWindowEventHandler *WndEvtHandler = NULL; + REBARBANDINFOW rbi; HRESULT hRet; + UINT uBand; TRACE("(%p, %p)\n", iface, punk); - if (punk == NULL) + if (punk == NULL || This->hWndRebar == NULL) return E_FAIL; hRet = IUnknown_QueryInterface(punk, @@ -318,6 +359,16 @@ (PVOID*)&ObjWithSite); if (!SUCCEEDED(hRet) || ObjWithSite == NULL) goto Cleanup; + hRet = IUnknown_QueryInterface(punk, + &IID_IOleWindow, + (PVOID*)&OleWindow); + if (!SUCCEEDED(hRet) || OleWindow == NULL) + goto Cleanup; + hRet = IUnknown_QueryInterface(punk, + &IID_IWindowEventHandler, + (PVOID*)&WndEvtHandler); + if (!SUCCEEDED(hRet) || WndEvtHandler == NULL) + goto Cleanup; hRet = S_OK; if (This->BandsAllocated > This->BandsCount) @@ -389,25 +440,75 @@ if (SUCCEEDED(hRet)) { ASSERT(NewBand != NULL); + + /* Create the ReBar band */ + rbi.cbSize = sizeof(rbi); + rbi.fMask = RBBIM_ID; + rbi.wID = GetBandID(This, + NewBand); + if (!SendMessageW(This->hWndRebar, + RB_INSERTBANDW, + (WPARAM)((UINT)-1), + ( LPARAM)&rbi)) + { + hRet = E_FAIL; + goto Cleanup; + } + NewBand->DeskBand = DeskBand; + NewBand->OleWindow = OleWindow; + NewBand->WndEvtHandler = WndEvtHandler; This->BandsCount++; - hRet = ObjWithSite->lpVtbl->SetSite(ObjWithSite, - (IUnknown*)iface); - if (!SUCCEEDED(hRet)) - ERR("IBandSite::AddBand(): Call to IDeskBand::SetSite() failed: %x\n", hRet); - - if (ObjWithSite != NULL) - ObjWithSite->lpVtbl->Release(ObjWithSite); - - return (HRESULT)((SHORT)(NewBand - This->Bands)); + DeskBand = NULL; + OleWindow = NULL; + WndEvtHandler = NULL; + hRet = IObjectWithSite_SetSite(ObjWithSite, + (IUnknown*)iface); + if (SUCCEEDED(hRet)) + { + hRet = (HRESULT)((USHORT)GetBandID(This, + NewBand)); + } + else + { + WARN("IBandSite::AddBand(): Call to IDeskBand::SetSite() failed: %x\n", hRet); + + /* Remove the band from the ReBar control */ + uBand = (UINT)SendMessageW(This->hWndRebar, + RB_IDTOINDEX, + (WPARAM)rbi.wID, + 0); + if (uBand != (UINT)-1) + { + if (!SendMessageW(This->hWndRebar, + RB_DELETEBAND, + (WPARAM)uBand, + 0)) + { + ERR("Failed to delete band!\n"); + } + } + else + ERR("Failed to map band id to index!\n"); + + FreeBand(This, + NewBand); + + hRet = E_FAIL; + /* goto Cleanup; */ + } } Cleanup: if (DeskBand != NULL) - DeskBand->lpVtbl->Release(DeskBand); + IDeskBand_Release(DeskBand); if (ObjWithSite != NULL) - ObjWithSite->lpVtbl->Release(ObjWithSite); + IObjectWithSite_Release(ObjWithSite); + if (OleWindow != NULL) + IOleWindow_Release(OleWindow); + if (WndEvtHandler != NULL) + IWindowEventHandler_Release(WndEvtHandler); return hRet; } @@ -491,13 +592,35 @@ { BandSite *This = (BandSite *)iface; struct BandObject *Band; + UINT uBand; TRACE("(%p, %u)\n", iface, dwBandID); + + if (This->hWndRebar == NULL) + return E_FAIL; Band = GetBandByID(This, dwBandID); if (Band == NULL) return E_FAIL; + uBand = (UINT)SendMessageW(This->hWndRebar, + RB_IDTOINDEX, + (WPARAM)GetBandID(This, + Band), + 0); + if (uBand != (UINT)-1) + { + if (!SendMessageW(This->hWndRebar, + RB_DELETEBAND, + (WPARAM)uBand, + 0)) + { + ERR("Could not delete band!\n"); + } + } + else + ERR("Could not map band id to index!\n"); + FreeBand(This, Band); return S_OK; } @@ -516,7 +639,7 @@ return E_FAIL; } - return Band->DeskBand->lpVtbl->QueryInterface(Band->DeskBand, riid, ppv); + return IDeskBand_QueryInterface(Band->DeskBand, riid, ppv); } static HRESULT WINAPI BandSite_SetBandSiteInfo(IBandSite *iface, const BANDSITEINFO *pbsinfo) @@ -570,14 +693,46 @@ static HRESULT WINAPI BandSite_ProcessMessage(IWindowEventHandler *iface, HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT *plrResult) { - FIXME("(%p, %p, %u, %p, %p, %p)\n", iface, hWnd, uMsg, wParam, lParam, plrResult); - return E_NOTIMPL; + BandSite *This = impl_from_IWindowEventHandler(iface); + struct BandObject *Band; + + TRACE("(%p, %p, %u, %p, %p, %p)\n", iface, hWnd, uMsg, wParam, lParam, plrResult); + + *plrResult = 0; + if (This->hWndRebar == NULL) + return E_FAIL; + + Band = GetBandFromHwnd(This, + hWnd); + if (Band != NULL) + { + return IWindowEventHandler_ProcessMessage(Band->WndEvtHandler, + hWnd, + uMsg, + wParam, + lParam, + plrResult); + } + + return S_FALSE; } static HRESULT WINAPI BandSite_ContainsWindow(IWindowEventHandler *iface, HWND hWnd) { - FIXME("(%p, %p)\n", iface, hWnd); - return E_NOTIMPL; + BandSite *This = impl_from_IWindowEventHandler(iface); + struct BandObject *Band; + + TRACE("(%p, %p)\n", iface, hWnd); + + if (This->hWndRebar == NULL) + return E_FAIL; + + Band = GetBandFromHwnd(This, + hWnd); + if (Band != NULL) + return S_OK; + + return S_FALSE; } static const IWindowEventHandlerVtbl BandSite_EventHandlerVtbl =

16 years, 3 months

← Newer
1
...
26
27
28
29
30
31
32
...
44
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs June 2008