Ros-diffs

ros-diffs@reactos.org

81390 discussions

[jimtabor] 34407: Need to make safe, check for zero after retrieving desktop pointer.
by jimtabor＠svn.reactos.org 10 Jul '08

10 Jul '08

Author: jimtabor Date: Thu Jul 10 06:19:24 2008 New Revision: 34407 URL: http://svn.reactos.org/svn/reactos?rev=34407&view=rev Log: Need to make safe, check for zero after retrieving desktop pointer. Modified: trunk/reactos/dll/win32/user32/misc/desktop.c 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 Jul 10 06:19:24 2008 @@ -705,7 +705,8 @@ { PDESKTOP pdi; pdi = GetThreadDesktopInfo(); - return pdi->hShellWindow; + if (pdi) return pdi->hShellWindow; + return NULL; }

1 0

[jimtabor] 34406: - This Patch fixes RestoreDC, also lots of visual glitches. Especially in Delphi applications. See bug 3491.
by jimtabor＠svn.reactos.org 10 Jul '08

10 Jul '08

Author: jimtabor Date: Thu Jul 10 06:12:14 2008 New Revision: 34406 URL: http://svn.reactos.org/svn/reactos?rev=34406&view=rev Log: - This Patch fixes RestoreDC, also lots of visual glitches. Especially in Delphi applications. See bug 3491. Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dc.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dc.c [iso-8859-1] Thu Jul 10 06:12:14 2008 @@ -1327,6 +1327,7 @@ if(!nDc_Attr) nDc_Attr = &newdc->Dc_Attr; newdc->DcLevel.flPath = dc->DcLevel.flPath | DCPATH_SAVESTATE; + nDc_Attr->dwLayout = Dc_Attr->dwLayout; nDc_Attr->hpen = Dc_Attr->hpen; nDc_Attr->hbrush = Dc_Attr->hbrush; @@ -1358,7 +1359,6 @@ #endif nDc_Attr->ptlCurrent = Dc_Attr->ptlCurrent; nDc_Attr->ptfxCurrent = Dc_Attr->ptfxCurrent; - newdc->DcLevel.flPath = dc->DcLevel.flPath; newdc->DcLevel.xformWorld2Wnd = dc->DcLevel.xformWorld2Wnd; newdc->DcLevel.xformWorld2Vport = dc->DcLevel.xformWorld2Vport; newdc->DcLevel.xformVport2World = dc->DcLevel.xformVport2World; @@ -1425,7 +1425,6 @@ #endif Dc_Attr->ptlCurrent = sDc_Attr->ptlCurrent; Dc_Attr->ptfxCurrent = sDc_Attr->ptfxCurrent; - dc->DcLevel.flPath = dcs->DcLevel.flPath; dc->DcLevel.xformWorld2Wnd = dcs->DcLevel.xformWorld2Wnd; dc->DcLevel.xformWorld2Vport = dcs->DcLevel.xformWorld2Vport; dc->DcLevel.xformVport2World = dcs->DcLevel.xformVport2World;

1 0

[fireball] 34405: - Fix build.
by fireball＠svn.reactos.org 10 Jul '08

10 Jul '08

Author: fireball Date: Thu Jul 10 05:06:29 2008 New Revision: 34405 URL: http://svn.reactos.org/svn/reactos?rev=34405&view=rev Log: - Fix build. Added: trunk/reactos/dll/win32/oleaut32/oleaut32_Ja.rc (with props) trunk/reactos/dll/win32/oleaut32/oleaut32_Uk.rc (with props) Added: trunk/reactos/dll/win32/oleaut32/oleaut32_Ja.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/oleaut3… ============================================================================== --- trunk/reactos/dll/win32/oleaut32/oleaut32_Ja.rc (added) +++ trunk/reactos/dll/win32/oleaut32/oleaut32_Ja.rc [iso-8859-1] Thu Jul 10 05:06:29 2008 @@ -1,0 +1,11 @@ +LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +{ + IDS_TRUE "True" + IDS_FALSE "False" + IDS_YES "Í¢" + IDS_NO "¢¢¦" + IDS_ON "I" + IDS_OFF "It" +} Propchange: trunk/reactos/dll/win32/oleaut32/oleaut32_Ja.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/oleaut32/oleaut32_Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/oleaut3… ============================================================================== --- trunk/reactos/dll/win32/oleaut32/oleaut32_Uk.rc (added) +++ trunk/reactos/dll/win32/oleaut32/oleaut32_Uk.rc [iso-8859-1] Thu Jul 10 05:06:29 2008 @@ -1,0 +1,31 @@ +/* + * Ukrainian resources for oleaut32 + * + * Copyright 2006 Artem Reznikov + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +{ + IDS_TRUE "²ñòèíà" + IDS_FALSE "Íåïðàâäà" + IDS_YES "Òàê" + IDS_NO "Í³" + IDS_ON "Ââ³ìêíåíî" + IDS_OFF "Âèìêíåíî" +} Propchange: trunk/reactos/dll/win32/oleaut32/oleaut32_Uk.rc ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[fireball] 34404: Yuriy Sidorov <jura@cp-lab.com> - Implement RtlSetUserValueHeap, RtlSetUserFlagsHeap, RtlGetUserInfoHeap functions. It is quick implementation and it works. - It fixes "Out of memory" error in all InnoSetup based installations. A lot of software can be at least installed in ReactOS now. - Also it fixes Delphi applications which use TMemoryStream class. See issue #3464 for more details.
by fireball＠svn.reactos.org 10 Jul '08

10 Jul '08

Author: fireball Date: Thu Jul 10 04:46:25 2008 New Revision: 34404 URL: http://svn.reactos.org/svn/reactos?rev=34404&view=rev Log: Yuriy Sidorov <jura(a)cp-lab.com> - Implement RtlSetUserValueHeap, RtlSetUserFlagsHeap, RtlGetUserInfoHeap functions. It is quick implementation and it works. - It fixes "Out of memory" error in all InnoSetup based installations. A lot of software can be at least installed in ReactOS now. - Also it fixes Delphi applications which use TMemoryStream class. See issue #3464 for more details. Modified: trunk/reactos/dll/ntdll/def/ntdll.def trunk/reactos/dll/win32/kernel32/mem/global.c trunk/reactos/include/ndk/rtlfuncs.h trunk/reactos/lib/rtl/heap.c Modified: trunk/reactos/dll/ntdll/def/ntdll.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/def/ntdll.def?re… ============================================================================== --- trunk/reactos/dll/ntdll/def/ntdll.def [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/def/ntdll.def [iso-8859-1] Thu Jul 10 04:46:25 2008 @@ -660,7 +660,7 @@ RtlSetSecurityObject@20 RtlSetTimeZoneInformation@4 ;RtlSetUnicodeCallouts -;RtlSetUserFlagsHeap +RtlSetUserFlagsHeap@16 RtlSetUserValueHeap@16 RtlSizeHeap@12 RtlSleepConditionVariableCS@12 Modified: trunk/reactos/dll/win32/kernel32/mem/global.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/mem/glo… ============================================================================== --- trunk/reactos/dll/win32/kernel32/mem/global.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/mem/global.c [iso-8859-1] Thu Jul 10 04:46:25 2008 @@ -101,6 +101,7 @@ { /* All worked well, save our heap entry */ RtlSetUserValueHeap(hProcessHeap, HEAP_NO_SERIALIZE, Ptr, hMemory); + RtlSetUserFlagsHeap(hProcessHeap, HEAP_NO_SERIALIZE, Ptr, Flags); } } @@ -521,6 +522,10 @@ HEAP_NO_SERIALIZE, Ptr, hMem); + RtlSetUserFlagsHeap(hProcessHeap, + HEAP_NO_SERIALIZE, + Ptr, + Flags); } } else @@ -642,6 +647,10 @@ HEAP_NO_SERIALIZE, HandleEntry->Object, hMem); + RtlSetUserFlagsHeap(hProcessHeap, + HEAP_NO_SERIALIZE, + HandleEntry->Object, + HandleEntry->Flags); } } } Modified: trunk/reactos/include/ndk/rtlfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/rtlfuncs.h?rev… ============================================================================== --- trunk/reactos/include/ndk/rtlfuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/rtlfuncs.h [iso-8859-1] Thu Jul 10 04:46:25 2008 @@ -620,6 +620,15 @@ IN PVOID UserValue ); +BOOLEAN +NTAPI +RtlSetUserFlagsHeap( + IN PVOID HeapHandle, + IN ULONG Flags, + IN PVOID BaseAddress, + IN ULONG UserFlags +); + NTSYSAPI ULONG NTAPI Modified: trunk/reactos/lib/rtl/heap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/heap.c?rev=34404&r… ============================================================================== --- trunk/reactos/lib/rtl/heap.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/heap.c [iso-8859-1] Thu Jul 10 04:46:25 2008 @@ -69,7 +69,8 @@ typedef struct tagARENA_INUSE { DWORD size; /* Block size; must be the first field */ - DWORD magic : 24; /* Magic number */ + DWORD magic : 23; /* Magic number */ + DWORD has_user_data : 1; /* There is user data associated with this block */ DWORD unused_bytes : 8; /* Number of bytes in the block not used by user data (max value is HEAP_MIN_DATA_SIZE+HEAP_MIN_SHRINK_SIZE) */ } ARENA_INUSE; @@ -123,11 +124,17 @@ struct tagSUBHEAP *next; /* Next sub-heap */ struct tagHEAP *heap; /* Main heap structure */ DWORD magic; /* Magic number */ - ULONG UserFlags; - PVOID UserValue; } SUBHEAP; #define SUBHEAP_MAGIC ((DWORD)('S' | ('U'<<8) | ('B'<<16) | ('H'<<24))) + +typedef struct tagHEAP_USER_DATA +{ + LIST_ENTRY ListEntry; + PVOID BaseAddress; + ULONG UserFlags; + PVOID UserValue; +} HEAP_USER_DATA, *PHEAP_USER_DATA; typedef struct tagHEAP { @@ -138,6 +145,7 @@ DWORD flags; /* Heap flags */ DWORD magic; /* Magic number */ PRTL_HEAP_COMMIT_ROUTINE commitRoutine; + LIST_ENTRY UserDataHead; } HEAP; #define HEAP_MAGIC ((DWORD)('H' | ('E'<<8) | ('A'<<16) | ('P'<<24))) @@ -323,6 +331,35 @@ } #endif +static PHEAP_USER_DATA HEAP_GetUserData(HEAP *heapPtr, PVOID BaseAddress) +{ + PLIST_ENTRY CurrentEntry; + PHEAP_USER_DATA udata; + + CurrentEntry = heapPtr->UserDataHead.Flink; + while (CurrentEntry != &heapPtr->UserDataHead) + { + udata = CONTAINING_RECORD(CurrentEntry, HEAP_USER_DATA, ListEntry); + if (udata->BaseAddress == BaseAddress) + return udata; + CurrentEntry = CurrentEntry->Flink; + } + return NULL; +} + +static PHEAP_USER_DATA HEAP_AllocUserData(HEAP *heapPtr, PVOID BaseAddress) +{ + /* Allocate user data entry */ + ARENA_INUSE *pInUse; + PHEAP_USER_DATA udata = RtlAllocateHeap(heapPtr, 0, sizeof(HEAP_USER_DATA)); + if (!udata) return NULL; + udata->BaseAddress = BaseAddress; + InsertTailList(&heapPtr->UserDataHead, &udata->ListEntry); + pInUse = (ARENA_INUSE *)BaseAddress - 1; + pInUse->has_user_data = 1; + return udata; +} + /*********************************************************************** * HEAP_GetPtr * RETURNS @@ -524,6 +561,18 @@ { ARENA_FREE *pFree; SIZE_T size = (pArena->size & ARENA_SIZE_MASK) + sizeof(*pArena); + PHEAP_USER_DATA udata; + + /* Find and free user data */ + if (pArena->has_user_data) + { + udata = HEAP_GetUserData(subheap->heap, pArena + 1); + if (udata) + { + RemoveEntryList(&udata->ListEntry); + RtlFreeHeap(subheap->heap, 0, udata); + } + } /* Check if we can merge with previous block */ @@ -634,6 +683,7 @@ heap->commitRoutine = Parameters->CommitRoutine; else heap->commitRoutine = NULL; + InitializeListHead(&heap->UserDataHead); /* Build the free lists */ @@ -1230,9 +1280,7 @@ * so we have to add the difference to the size */ pInUse->size = (pInUse->size & ~ARENA_FLAG_FREE) + sizeof(ARENA_FREE) - sizeof(ARENA_INUSE); pInUse->magic = ARENA_INUSE_MAGIC; - - /* Save user flags */ - subheap->UserFlags = flags & HEAP_SETTABLE_USER_FLAGS; + pInUse->has_user_data = 0; /* Shrink the block */ @@ -1682,7 +1730,7 @@ } /* - * @unimplemented + * @implemented */ BOOLEAN NTAPI @@ -1691,21 +1739,56 @@ IN PVOID BaseAddress, IN PVOID UserValue) { - HEAP *heapPtr = HEAP_GetPtr(HeapHandle); - ARENA_INUSE *pInUse; - SUBHEAP *subheap; - - /* Get the subheap */ - pInUse = (ARENA_INUSE *)BaseAddress - 1; - subheap = HEAP_FindSubHeap( heapPtr, pInUse ); - - /* Hack */ - subheap->UserValue = UserValue; + HEAP *heapPtr; + PHEAP_USER_DATA udata; + + heapPtr = HEAP_GetPtr(HeapHandle); + if (!heapPtr) + { + RtlSetLastWin32ErrorAndNtStatusFromNtStatus( STATUS_INVALID_HANDLE ); + return FALSE; + } + udata = HEAP_GetUserData(heapPtr, BaseAddress); + if (!udata) + { + udata = HEAP_AllocUserData(heapPtr, BaseAddress); + if (!udata) return FALSE; + } + udata->UserValue = UserValue; return TRUE; } /* - * @unimplemented + * @implemented + */ +BOOLEAN +NTAPI +RtlSetUserFlagsHeap(IN PVOID HeapHandle, + IN ULONG Flags, + IN PVOID BaseAddress, + IN ULONG UserFlags) +{ + HEAP *heapPtr; + PHEAP_USER_DATA udata; + + heapPtr = HEAP_GetPtr(HeapHandle); + if (!heapPtr) + { + RtlSetLastWin32ErrorAndNtStatusFromNtStatus( STATUS_INVALID_HANDLE ); + return FALSE; + } + udata = HEAP_GetUserData(heapPtr, BaseAddress); + if (!udata) + { + udata = HEAP_AllocUserData(heapPtr, BaseAddress); + if (!udata) return FALSE; + } + udata->UserFlags = UserFlags & HEAP_SETTABLE_USER_FLAGS; + return TRUE; +} + +/* + * @implemented */ BOOLEAN NTAPI @@ -1715,18 +1798,23 @@ OUT PVOID *UserValue, OUT PULONG UserFlags) { - HEAP *heapPtr = HEAP_GetPtr(HeapHandle); - ARENA_INUSE *pInUse; - SUBHEAP *subheap; - - /* Get the subheap */ - pInUse = (ARENA_INUSE *)BaseAddress - 1; - subheap = HEAP_FindSubHeap( heapPtr, pInUse ); - - /* Hack */ - DPRINT1("V/F: %lx %p\n", subheap->UserValue, subheap->UserFlags); - if (UserValue) *UserValue = subheap->UserValue; - if (UserFlags) *UserFlags = subheap->UserFlags; + HEAP *heapPtr; + PHEAP_USER_DATA udata; + + heapPtr = HEAP_GetPtr(HeapHandle); + if (!heapPtr) + { + RtlSetLastWin32ErrorAndNtStatusFromNtStatus( STATUS_INVALID_HANDLE ); + return FALSE; + } + udata = HEAP_GetUserData(heapPtr, BaseAddress); + if (!udata) + { + RtlSetLastWin32ErrorAndNtStatusFromNtStatus( STATUS_INVALID_PARAMETER ); + return FALSE; + } + if (UserValue) *UserValue = udata->UserValue; + if (UserFlags) *UserFlags = udata->UserFlags; return TRUE; }

1 0

[fireball] 34403: - Autosyncing with Wine HEAD. - Add I_RpcExceptionFilter to rpcrt4 from recent wine and export it. This allows to not do a full rpcrt4 sync right now, but still sync everything else.
by fireball＠svn.reactos.org 10 Jul '08

10 Jul '08

Author: fireball Date: Thu Jul 10 04:14:19 2008 New Revision: 34403 URL: http://svn.reactos.org/svn/reactos?rev=34403&view=rev Log: - Autosyncing with Wine HEAD. - Add I_RpcExceptionFilter to rpcrt4 from recent wine and export it. This allows to not do a full rpcrt4 sync right now, but still sync everything else. Added: trunk/reactos/dll/win32/oleaut32/oleaut32_Da.rc (with props) trunk/reactos/dll/win32/oleaut32/oleaut32_El.rc (with props) trunk/reactos/dll/win32/oleaut32/oleaut32_Ro.rc (with props) trunk/reactos/dll/win32/oleaut32/oleaut32_Si.rc (with props) trunk/reactos/dll/win32/oledlg/oledlg_Da.rc (with props) trunk/reactos/dll/win32/oledlg/oledlg_Si.rc (with props) Removed: trunk/reactos/dll/win32/oleaut32/oleaut32_Dk.rc trunk/reactos/dll/win32/oleaut32/oleaut32_Gr.rc trunk/reactos/dll/win32/oleaut32/oleaut32_Ja.rc trunk/reactos/dll/win32/oleaut32/oleaut32_Uk.rc Modified: trunk/reactos/dll/win32/netapi32/nbt.c trunk/reactos/dll/win32/ole32/antimoniker.c trunk/reactos/dll/win32/ole32/bindctx.c trunk/reactos/dll/win32/ole32/classmoniker.c trunk/reactos/dll/win32/ole32/clipboard.c trunk/reactos/dll/win32/ole32/compobj.c trunk/reactos/dll/win32/ole32/compobj_private.h trunk/reactos/dll/win32/ole32/compositemoniker.c trunk/reactos/dll/win32/ole32/datacache.c trunk/reactos/dll/win32/ole32/dcom.idl trunk/reactos/dll/win32/ole32/defaulthandler.c trunk/reactos/dll/win32/ole32/enumx.c trunk/reactos/dll/win32/ole32/errorinfo.c trunk/reactos/dll/win32/ole32/filemoniker.c trunk/reactos/dll/win32/ole32/ftmarshal.c trunk/reactos/dll/win32/ole32/hglobalstream.c trunk/reactos/dll/win32/ole32/ifs.c trunk/reactos/dll/win32/ole32/itemmoniker.c trunk/reactos/dll/win32/ole32/marshal.c trunk/reactos/dll/win32/ole32/moniker.c trunk/reactos/dll/win32/ole32/ole16.c trunk/reactos/dll/win32/ole32/ole2.c trunk/reactos/dll/win32/ole32/ole32.spec trunk/reactos/dll/win32/ole32/ole32_main.c trunk/reactos/dll/win32/ole32/oleobj.c trunk/reactos/dll/win32/ole32/oleproxy.c trunk/reactos/dll/win32/ole32/pointermoniker.c trunk/reactos/dll/win32/ole32/rpc.c trunk/reactos/dll/win32/ole32/stg_bigblockfile.c trunk/reactos/dll/win32/ole32/stg_prop.c trunk/reactos/dll/win32/ole32/stg_stream.c trunk/reactos/dll/win32/ole32/storage.c trunk/reactos/dll/win32/ole32/storage32.c trunk/reactos/dll/win32/ole32/storage32.h trunk/reactos/dll/win32/ole32/stubmanager.c trunk/reactos/dll/win32/oleaut32/dispatch.c trunk/reactos/dll/win32/oleaut32/oleaut.c trunk/reactos/dll/win32/oleaut32/oleaut32.rc trunk/reactos/dll/win32/oleaut32/oleaut32_Sv.rc trunk/reactos/dll/win32/oleaut32/oleaut32_ros.diff trunk/reactos/dll/win32/oleaut32/olefont.c trunk/reactos/dll/win32/oleaut32/olepicture.c trunk/reactos/dll/win32/oleaut32/recinfo.c trunk/reactos/dll/win32/oleaut32/safearray.c trunk/reactos/dll/win32/oleaut32/tmarshal.c trunk/reactos/dll/win32/oleaut32/typelib.c trunk/reactos/dll/win32/oleaut32/typelib.h trunk/reactos/dll/win32/oleaut32/typelib2.c trunk/reactos/dll/win32/oleaut32/ungif.c trunk/reactos/dll/win32/oleaut32/ungif.h trunk/reactos/dll/win32/oleaut32/varformat.c trunk/reactos/dll/win32/oleaut32/variant.c trunk/reactos/dll/win32/oleaut32/vartype.c trunk/reactos/dll/win32/oledlg/insobjdlg.c trunk/reactos/dll/win32/oledlg/oledlg_It.rc trunk/reactos/dll/win32/oledlg/oledlg_Nl.rc trunk/reactos/dll/win32/oledlg/oledlg_No.rc trunk/reactos/dll/win32/oledlg/oledlg_Sv.rc trunk/reactos/dll/win32/oledlg/rsrc.rc trunk/reactos/dll/win32/rpcrt4/rpcrt4.spec trunk/reactos/dll/win32/rpcrt4/rpcrt4_main.c trunk/reactos/dll/win32/rsaenh/aes.c trunk/reactos/dll/win32/rsaenh/mpi.c trunk/reactos/dll/win32/rsaenh/rsaenh.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/netapi32/nbt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/nbt.c?r… Modified: trunk/reactos/dll/win32/ole32/antimoniker.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/antimonike… Modified: trunk/reactos/dll/win32/ole32/bindctx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/bindctx.c?… Modified: trunk/reactos/dll/win32/ole32/classmoniker.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/classmonik… Modified: trunk/reactos/dll/win32/ole32/clipboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/clipboard.… Modified: trunk/reactos/dll/win32/ole32/compobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/compobj.c?… Modified: trunk/reactos/dll/win32/ole32/compobj_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/compobj_pr… Modified: trunk/reactos/dll/win32/ole32/compositemoniker.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/compositem… Modified: trunk/reactos/dll/win32/ole32/datacache.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/datacache.… Modified: trunk/reactos/dll/win32/ole32/dcom.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/dcom.idl?r… Modified: trunk/reactos/dll/win32/ole32/defaulthandler.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/defaulthan… Modified: trunk/reactos/dll/win32/ole32/enumx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/enumx.c?re… Modified: trunk/reactos/dll/win32/ole32/errorinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/errorinfo.… Modified: trunk/reactos/dll/win32/ole32/filemoniker.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/filemonike… Modified: trunk/reactos/dll/win32/ole32/ftmarshal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/ftmarshal.… Modified: trunk/reactos/dll/win32/ole32/hglobalstream.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/hglobalstr… Modified: trunk/reactos/dll/win32/ole32/ifs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/ifs.c?rev=… Modified: trunk/reactos/dll/win32/ole32/itemmoniker.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/itemmonike… Modified: trunk/reactos/dll/win32/ole32/marshal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/marshal.c?… Modified: trunk/reactos/dll/win32/ole32/moniker.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/moniker.c?… Modified: trunk/reactos/dll/win32/ole32/ole16.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/ole16.c?re… Modified: trunk/reactos/dll/win32/ole32/ole2.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/ole2.c?rev… Modified: trunk/reactos/dll/win32/ole32/ole32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/ole32.spec… Modified: trunk/reactos/dll/win32/ole32/ole32_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/ole32_main… Modified: trunk/reactos/dll/win32/ole32/oleobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/oleobj.c?r… Modified: trunk/reactos/dll/win32/ole32/oleproxy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/oleproxy.c… Modified: trunk/reactos/dll/win32/ole32/pointermoniker.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/pointermon… Modified: trunk/reactos/dll/win32/ole32/rpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/rpc.c?rev=… Modified: trunk/reactos/dll/win32/ole32/stg_bigblockfile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/stg_bigblo… Modified: trunk/reactos/dll/win32/ole32/stg_prop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/stg_prop.c… Modified: trunk/reactos/dll/win32/ole32/stg_stream.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/stg_stream… Modified: trunk/reactos/dll/win32/ole32/storage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/storage.c?… Modified: trunk/reactos/dll/win32/ole32/storage32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/storage32.… Modified: trunk/reactos/dll/win32/ole32/storage32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/storage32.… Modified: trunk/reactos/dll/win32/ole32/stubmanager.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/stubmanage… Modified: trunk/reactos/dll/win32/oleaut32/dispatch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/dispatc… Modified: trunk/reactos/dll/win32/oleaut32/oleaut.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/oleaut.… Modified: trunk/reactos/dll/win32/oleaut32/oleaut32.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/oleaut3… Added: trunk/reactos/dll/win32/oleaut32/oleaut32_Da.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/oleaut3… Removed: trunk/reactos/dll/win32/oleaut32/oleaut32_Dk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/oleaut3… Added: trunk/reactos/dll/win32/oleaut32/oleaut32_El.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/oleaut3… Removed: trunk/reactos/dll/win32/oleaut32/oleaut32_Gr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/oleaut3… Removed: trunk/reactos/dll/win32/oleaut32/oleaut32_Ja.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/oleaut3… Added: trunk/reactos/dll/win32/oleaut32/oleaut32_Ro.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/oleaut3… Added: trunk/reactos/dll/win32/oleaut32/oleaut32_Si.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/oleaut3… Modified: trunk/reactos/dll/win32/oleaut32/oleaut32_Sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/oleaut3… Removed: trunk/reactos/dll/win32/oleaut32/oleaut32_Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/oleaut3… Modified: trunk/reactos/dll/win32/oleaut32/oleaut32_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/oleaut3… Modified: trunk/reactos/dll/win32/oleaut32/olefont.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/olefont… Modified: trunk/reactos/dll/win32/oleaut32/olepicture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/olepict… Modified: trunk/reactos/dll/win32/oleaut32/recinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/recinfo… Modified: trunk/reactos/dll/win32/oleaut32/safearray.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/safearr… Modified: trunk/reactos/dll/win32/oleaut32/tmarshal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/tmarsha… Modified: trunk/reactos/dll/win32/oleaut32/typelib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/typelib… Modified: trunk/reactos/dll/win32/oleaut32/typelib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/typelib… Modified: trunk/reactos/dll/win32/oleaut32/typelib2.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/typelib… Modified: trunk/reactos/dll/win32/oleaut32/ungif.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/ungif.c… Modified: trunk/reactos/dll/win32/oleaut32/ungif.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/ungif.h… Modified: trunk/reactos/dll/win32/oleaut32/varformat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/varform… Modified: trunk/reactos/dll/win32/oleaut32/variant.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/variant… Modified: trunk/reactos/dll/win32/oleaut32/vartype.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/vartype… Modified: trunk/reactos/dll/win32/oledlg/insobjdlg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/insobjdlg… Added: trunk/reactos/dll/win32/oledlg/oledlg_Da.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/oledlg_Da… Modified: trunk/reactos/dll/win32/oledlg/oledlg_It.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/oledlg_It… Modified: trunk/reactos/dll/win32/oledlg/oledlg_Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/oledlg_Nl… Modified: trunk/reactos/dll/win32/oledlg/oledlg_No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/oledlg_No… Added: trunk/reactos/dll/win32/oledlg/oledlg_Si.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/oledlg_Si… Modified: trunk/reactos/dll/win32/oledlg/oledlg_Sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/oledlg_Sv… Modified: trunk/reactos/dll/win32/oledlg/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/rsrc.rc?r… Modified: trunk/reactos/dll/win32/rpcrt4/rpcrt4.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpcrt4.sp… Modified: trunk/reactos/dll/win32/rpcrt4/rpcrt4_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpcrt4_ma… Modified: trunk/reactos/dll/win32/rsaenh/aes.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rsaenh/aes.c?rev… Modified: trunk/reactos/dll/win32/rsaenh/mpi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rsaenh/mpi.c?rev… Modified: trunk/reactos/dll/win32/rsaenh/rsaenh.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rsaenh/rsaenh.c?…

1 0

[hyperion] 34402: modified nls/3rdparty/icu4ros.rbuild - Build fixes added nls/3rdparty/stubs.cpp - Stub out unused ICU dependencies added nls/dll/idndl added nls/dll/idndl/idndl.cpp added nls/dll/idndl/idndl.def added nls/dll/idndl/idndl.rbuild - Implemented idndl.dll forwarder added nls/dll/idndl_redist added nls/dll/idndl_redist/data added nls/dll/idndl_redist/data/genidldndata.cpp added nls/dll/idndl_redist/data/idldata.cpp added nls/dll/idndl_redist/idndl.cpp added nls/dll/idndl_redist/idnd
by hyperion＠svn.reactos.org 10 Jul '08

10 Jul '08

Author: hyperion Date: Thu Jul 10 03:39:04 2008 New Revision: 34402 URL: http://svn.reactos.org/svn/reactos?rev=34402&view=rev Log: modified nls/3rdparty/icu4ros.rbuild - Build fixes added nls/3rdparty/stubs.cpp - Stub out unused ICU dependencies added nls/dll/idndl added nls/dll/idndl/idndl.cpp added nls/dll/idndl/idndl.def added nls/dll/idndl/idndl.rbuild - Implemented idndl.dll forwarder added nls/dll/idndl_redist added nls/dll/idndl_redist/data added nls/dll/idndl_redist/data/genidldndata.cpp added nls/dll/idndl_redist/data/idldata.cpp added nls/dll/idndl_redist/idndl.cpp added nls/dll/idndl_redist/idndl.def added nls/dll/idndl_redist/idndl_redist.rbuild added nls/dll/idndl_redist/stubs.cpp - Implemented stand-alone idndl.dll - Implemented DownlevelGetLocaleScripts, DownlevelGetStringScripts, DownlevelVerifyScripts added nls/dll/normaliz added nls/dll/normaliz/dummy.c added nls/dll/normaliz/normaliz.def added nls/dll/normaliz/normaliz.rbuild - Implemented forwarder normaliz.dll added nls/dll/normaliz_redist/data added nls/dll/normaliz_redist/data/icudt38.c added nls/dll/normaliz_redist/data/icudt38.lst modified nls/dll/normaliz_redist/normaliz.cpp modified nls/dll/normaliz_redist/normaliz.def modified nls/dll/normaliz_redist/normaliz_redist.rbuild - Implemented stand-alone normaliz.dll added nls/lib/idna added nls/lib/idna/idna.cpp added nls/lib/idna/idna.rbuild added nls/lib/idna/nameprep.cpp - Implemented IdnToAscii, IdnToUnicode, IdnToNameprepUnicode modified nls/lib/normalize/normalize.cpp - Implemented NormalizeString, IsNormalizedString added nls/lib/scripts added nls/lib/scripts/scripts.cpp added nls/lib/scripts/scripts.h added nls/lib/scripts/scripts.rbuild - Implemented GetStringScripts, VerifyScripts added nls/media - Added directory for future data files modified nls/nls.rbuild - Build all NLS modules added nls/tests added nls/tests/normalization added nls/tests/normalization/normalizationTest.c added nls/tests/normalization/normalizationTest.h added nls/tests/normalization/normalizationTest.l added nls/tests/normalization/normalizationTest.rbuild added nls/tests/normalization/normalizationTest.sln added nls/tests/normalization/normalizationTest.tab.c added nls/tests/normalization/normalizationTest.tab.h added nls/tests/normalization/NormalizationTest.txt added nls/tests/normalization/normalizationTest.vcproj added nls/tests/normalization/normalizationTest.y added nls/tests/normalization/normalizationTest.yy.c - Test harness for NormalizeString based on official Unicode 5.0 test suite. Our implementation passes all tests. Will become an actual regression test suite in the future. Added: trunk/reactos/nls/3rdparty/stubs.cpp (with props) trunk/reactos/nls/dll/idndl/ trunk/reactos/nls/dll/idndl/idndl.cpp (with props) trunk/reactos/nls/dll/idndl/idndl.def (with props) trunk/reactos/nls/dll/idndl/idndl.rbuild (with props) trunk/reactos/nls/dll/idndl_redist/ trunk/reactos/nls/dll/idndl_redist/data/ trunk/reactos/nls/dll/idndl_redist/data/genidldndata.cpp (with props) trunk/reactos/nls/dll/idndl_redist/data/idldata.cpp (with props) trunk/reactos/nls/dll/idndl_redist/idndl.cpp (with props) trunk/reactos/nls/dll/idndl_redist/idndl.def (with props) trunk/reactos/nls/dll/idndl_redist/idndl_redist.rbuild (with props) trunk/reactos/nls/dll/idndl_redist/stubs.cpp (with props) trunk/reactos/nls/dll/normaliz/ trunk/reactos/nls/dll/normaliz/dummy.c (with props) trunk/reactos/nls/dll/normaliz/normaliz.def (with props) trunk/reactos/nls/dll/normaliz/normaliz.rbuild (with props) trunk/reactos/nls/dll/normaliz_redist/data/ trunk/reactos/nls/dll/normaliz_redist/data/icudt38.c (with props) trunk/reactos/nls/dll/normaliz_redist/data/icudt38.lst (with props) trunk/reactos/nls/lib/idna/ trunk/reactos/nls/lib/idna/idna.cpp (with props) trunk/reactos/nls/lib/idna/idna.rbuild (with props) trunk/reactos/nls/lib/idna/nameprep.cpp (with props) trunk/reactos/nls/lib/scripts/ trunk/reactos/nls/lib/scripts/scripts.cpp (with props) trunk/reactos/nls/lib/scripts/scripts.h (with props) trunk/reactos/nls/lib/scripts/scripts.rbuild (with props) trunk/reactos/nls/media/ trunk/reactos/nls/tests/ trunk/reactos/nls/tests/normalization/ trunk/reactos/nls/tests/normalization/NormalizationTest.txt - copied unchanged from r34150, trunk/reactos/nls/3rdparty/icu/source/data/unidata/NormalizationTest.txt trunk/reactos/nls/tests/normalization/normalizationTest.c (with props) trunk/reactos/nls/tests/normalization/normalizationTest.h (with props) trunk/reactos/nls/tests/normalization/normalizationTest.l (with props) trunk/reactos/nls/tests/normalization/normalizationTest.rbuild (with props) trunk/reactos/nls/tests/normalization/normalizationTest.sln (with props) trunk/reactos/nls/tests/normalization/normalizationTest.tab.c (with props) trunk/reactos/nls/tests/normalization/normalizationTest.tab.h (with props) trunk/reactos/nls/tests/normalization/normalizationTest.vcproj (with props) trunk/reactos/nls/tests/normalization/normalizationTest.y (with props) trunk/reactos/nls/tests/normalization/normalizationTest.yy.c (with props) Modified: trunk/reactos/nls/3rdparty/icu4ros.rbuild trunk/reactos/nls/dll/normaliz_redist/normaliz.cpp trunk/reactos/nls/dll/normaliz_redist/normaliz.def trunk/reactos/nls/dll/normaliz_redist/normaliz_redist.rbuild trunk/reactos/nls/lib/normalize/normalize.cpp trunk/reactos/nls/nls.rbuild [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/nls/3rdparty/icu4ros.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/nls/3rdparty/icu4ros.rbuil… Added: trunk/reactos/nls/3rdparty/stubs.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/nls/3rdparty/stubs.cpp?rev… Added: trunk/reactos/nls/dll/idndl/idndl.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/nls/dll/idndl/idndl.cpp?re… Added: trunk/reactos/nls/dll/idndl/idndl.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/nls/dll/idndl/idndl.def?re… Added: trunk/reactos/nls/dll/idndl/idndl.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/nls/dll/idndl/idndl.rbuild… Added: trunk/reactos/nls/dll/idndl_redist/data/genidldndata.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/nls/dll/idndl_redist/data/… Added: trunk/reactos/nls/dll/idndl_redist/data/idldata.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/nls/dll/idndl_redist/data/… Added: trunk/reactos/nls/dll/idndl_redist/idndl.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/nls/dll/idndl_redist/idndl… Added: trunk/reactos/nls/dll/idndl_redist/idndl.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/nls/dll/idndl_redist/idndl… Added: trunk/reactos/nls/dll/idndl_redist/idndl_redist.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/nls/dll/idndl_redist/idndl… Added: trunk/reactos/nls/dll/idndl_redist/stubs.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/nls/dll/idndl_redist/stubs… Added: trunk/reactos/nls/dll/normaliz/dummy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/nls/dll/normaliz/dummy.c?r… Added: trunk/reactos/nls/dll/normaliz/normaliz.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/nls/dll/normaliz/normaliz.… Added: trunk/reactos/nls/dll/normaliz/normaliz.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/nls/dll/normaliz/normaliz.… Added: trunk/reactos/nls/dll/normaliz_redist/data/icudt38.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/nls/dll/normaliz_redist/da… Added: trunk/reactos/nls/dll/normaliz_redist/data/icudt38.lst URL: http://svn.reactos.org/svn/reactos/trunk/reactos/nls/dll/normaliz_redist/da… Modified: trunk/reactos/nls/dll/normaliz_redist/normaliz.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/nls/dll/normaliz_redist/no… Modified: trunk/reactos/nls/dll/normaliz_redist/normaliz.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/nls/dll/normaliz_redist/no… Modified: trunk/reactos/nls/dll/normaliz_redist/normaliz_redist.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/nls/dll/normaliz_redist/no… Added: trunk/reactos/nls/lib/idna/idna.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/nls/lib/idna/idna.cpp?rev=… Added: trunk/reactos/nls/lib/idna/idna.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/nls/lib/idna/idna.rbuild?r… Added: trunk/reactos/nls/lib/idna/nameprep.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/nls/lib/idna/nameprep.cpp?… Modified: trunk/reactos/nls/lib/normalize/normalize.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/nls/lib/normalize/normaliz… Added: trunk/reactos/nls/lib/scripts/scripts.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/nls/lib/scripts/scripts.cp… Added: trunk/reactos/nls/lib/scripts/scripts.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/nls/lib/scripts/scripts.h?… Added: trunk/reactos/nls/lib/scripts/scripts.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/nls/lib/scripts/scripts.rb… Modified: trunk/reactos/nls/nls.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/nls/nls.rbuild?rev=34402&r… Added: trunk/reactos/nls/tests/normalization/normalizationTest.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/nls/tests/normalization/no… Added: trunk/reactos/nls/tests/normalization/normalizationTest.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/nls/tests/normalization/no… Added: trunk/reactos/nls/tests/normalization/normalizationTest.l URL: http://svn.reactos.org/svn/reactos/trunk/reactos/nls/tests/normalization/no… Added: trunk/reactos/nls/tests/normalization/normalizationTest.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/nls/tests/normalization/no… Added: trunk/reactos/nls/tests/normalization/normalizationTest.sln URL: http://svn.reactos.org/svn/reactos/trunk/reactos/nls/tests/normalization/no… Added: trunk/reactos/nls/tests/normalization/normalizationTest.tab.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/nls/tests/normalization/no… Added: trunk/reactos/nls/tests/normalization/normalizationTest.tab.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/nls/tests/normalization/no… Added: trunk/reactos/nls/tests/normalization/normalizationTest.vcproj URL: http://svn.reactos.org/svn/reactos/trunk/reactos/nls/tests/normalization/no… Added: trunk/reactos/nls/tests/normalization/normalizationTest.y URL: http://svn.reactos.org/svn/reactos/trunk/reactos/nls/tests/normalization/no… Added: trunk/reactos/nls/tests/normalization/normalizationTest.yy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/nls/tests/normalization/no…

1 0

[dreimer] 34401: Bug 3492 - Bug 3497: Norwegian Translations for dxdiag sndvol32 kbswitch devmgmt eventvwr servman by Lars Martin. Synched Winhlp32 with Wine HEAD.
by dreimer＠svn.reactos.org 10 Jul '08

10 Jul '08

Author: dreimer Date: Thu Jul 10 01:51:18 2008 New Revision: 34401 URL: http://svn.reactos.org/svn/reactos?rev=34401&view=rev Log: Bug 3492 - Bug 3497: Norwegian Translations for dxdiag sndvol32 kbswitch devmgmt eventvwr servman by Lars Martin. Synched Winhlp32 with Wine HEAD. Added: trunk/reactos/base/applications/dxdiag/lang/nb-NO.rc (with props) trunk/reactos/base/applications/kbswitch/lang/nb-NO.rc (with props) trunk/reactos/base/applications/mscutils/devmgmt/lang/nb-NO.rc (with props) trunk/reactos/base/applications/mscutils/eventvwr/lang/nb-NO.rc (with props) trunk/reactos/base/applications/mscutils/servman/lang/nb-NO.rc (with props) trunk/reactos/base/applications/sndvol32/lang/nb-NO.rc (with props) Modified: trunk/reactos/base/applications/dxdiag/rsrc.rc trunk/reactos/base/applications/kbswitch/rsrc.rc trunk/reactos/base/applications/mscutils/devmgmt/rsrc.rc trunk/reactos/base/applications/mscutils/eventvwr/rsrc.rc trunk/reactos/base/applications/mscutils/servman/rsrc.rc trunk/reactos/base/applications/sndvol32/rsrc.rc trunk/reactos/base/applications/winhlp32/lang/bg-BG.rc trunk/reactos/base/applications/winhlp32/lang/cs-CZ.rc trunk/reactos/base/applications/winhlp32/lang/da-DK.rc trunk/reactos/base/applications/winhlp32/lang/de-DE.rc trunk/reactos/base/applications/winhlp32/lang/en-US.rc trunk/reactos/base/applications/winhlp32/lang/es-ES.rc trunk/reactos/base/applications/winhlp32/lang/fi-FI.rc trunk/reactos/base/applications/winhlp32/lang/fr-FR.rc trunk/reactos/base/applications/winhlp32/lang/hu-HU.rc trunk/reactos/base/applications/winhlp32/lang/it-IT.rc trunk/reactos/base/applications/winhlp32/lang/ko-KR.rc trunk/reactos/base/applications/winhlp32/lang/nb-NO.rc trunk/reactos/base/applications/winhlp32/lang/nl-NL.rc trunk/reactos/base/applications/winhlp32/lang/pl-PL.rc trunk/reactos/base/applications/winhlp32/lang/pt-BR.rc trunk/reactos/base/applications/winhlp32/lang/rm-CH.rc trunk/reactos/base/applications/winhlp32/lang/ru-RU.rc trunk/reactos/base/applications/winhlp32/lang/sk-SK.rc trunk/reactos/base/applications/winhlp32/lang/sl-SI.rc trunk/reactos/base/applications/winhlp32/lang/sv-SE.rc trunk/reactos/base/applications/winhlp32/lang/tr-TR.rc trunk/reactos/base/applications/winhlp32/lang/zh-CN.rc trunk/reactos/base/applications/winhlp32/lex.yy.c trunk/reactos/base/applications/winhlp32/macro.c trunk/reactos/base/applications/winhlp32/macro.lex.l trunk/reactos/base/applications/winhlp32/rsrc.rc trunk/reactos/base/applications/winhlp32/winhelp.c trunk/reactos/base/applications/winhlp32/winhelp.h trunk/reactos/base/applications/winhlp32/winhelp_res.h trunk/reactos/base/applications/winhlp32/winhlp32.rbuild Added: trunk/reactos/base/applications/dxdiag/lang/nb-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/l… ============================================================================== --- trunk/reactos/base/applications/dxdiag/lang/nb-NO.rc (added) +++ trunk/reactos/base/applications/dxdiag/lang/nb-NO.rc [iso-8859-1] Thu Jul 10 01:51:18 2008 @@ -1,0 +1,224 @@ +LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL + +IDD_MAIN_DIALOG DIALOGEX DISCARDABLE 0, 0, 478, 280 +STYLE DS_SHELLFONT | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | + WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU | + WS_THICKFRAME +CAPTION "ReactX-Diagnostic program" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "Tab1",IDC_TAB_CONTROL,"SysTabControl32",WS_TABSTOP,2,2,474,250 + PUSHBUTTON "&Hjelp", IDC_BUTTON_HELP, 2, 261, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + DEFPUSHBUTTON "&Neste side", IDC_BUTTON_NEXT, 257, 261, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "&Lagre Alt Informasjon...", IDC_BUTTON_SAVE_INFO, 311, 261, 110, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "&Avslutt", IDC_BUTTON_EXIT, 425, 261, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP +END + +IDD_SYSTEM_DIALOG DIALOGEX DISCARDABLE 0, 0, 462, 220 +STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Dette verktøyet rapporterer detaljert informasjon om ReactX komponenter og enheter som er installert på ditt system.", -1, 10, 10, 443, 17 + LTEXT "Hvis du vet hvilket område som skaper problemer, velger du den aktuelle kategorien ovenfor. Hvis ikke, kan du bruke knappen ""Neste side"" nedenfor for å besøke alle sidene sekvensielt.", -1, 10, 30, 443, 25 + GROUPBOX "System Informasjon", -1, 10, 55, 443, 130, SS_RIGHT + LTEXT "Nåværende Dato/Tid:", -1, 70, 70, 80, 10, SS_RIGHT + LTEXT "Datamaskin Navn:", -1, 70, 80, 80, 10, SS_RIGHT + LTEXT "Operativsystem:", -1, 70, 90, 80, 10, SS_RIGHT + LTEXT "Språk:", -1, 70, 100, 80, 10, SS_RIGHT + LTEXT "System fabrikant:", -1, 70, 110, 80, 10, SS_RIGHT + LTEXT "System modell:", -1, 70, 120, 80, 10, SS_RIGHT + LTEXT "BIOS:", -1, 70, 130, 80, 10, SS_RIGHT + LTEXT "Prosessor:", -1, 70, 140, 80, 10, SS_RIGHT + LTEXT "Minne:", -1, 70, 150, 80, 10, SS_RIGHT + LTEXT "Sideveksel fil:", -1, 70, 160, 80, 10, SS_RIGHT + LTEXT "ReactX-Versjon:", -1, 70, 170, 80, 10, SS_RIGHT + LTEXT "", IDC_STATIC_TIME, 155, 70, 195, 10, SS_LEFT + LTEXT "", IDC_STATIC_COMPUTER, 155, 80, 195, 10, SS_LEFT + LTEXT "", IDC_STATIC_OS, 155, 90, 195, 10, SS_LEFT + LTEXT "", IDC_STATIC_LANG, 155, 100, 195, 10, SS_LEFT + LTEXT "", IDC_STATIC_MANU, 155, 110, 195, 10, SS_LEFT + LTEXT "", IDC_STATIC_MODEL, 155, 120, 195, 10, SS_LEFT + LTEXT "", IDC_STATIC_BIOS, 155, 130, 195, 10, SS_LEFT + LTEXT "", IDC_STATIC_PROC, 155, 140, 195, 10, SS_LEFT + LTEXT "", IDC_STATIC_MEM, 155, 150, 195, 10, SS_LEFT + LTEXT "", IDC_STATIC_SWAP, 155, 160, 195, 10, SS_LEFT + LTEXT "", IDC_STATIC_VERSION, 155, 170, 195, 10, SS_LEFT +END + +IDD_DISPLAY_DIALOG DIALOGEX DISCARDABLE 0, 0, 462, 220 +STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Enhet", -1, 10, 10, 250, 100 + RTEXT "Navn:", -1, 20, 25, 70, 10 + RTEXT "Fabrikant:", -1, 20, 35, 70, 10 + RTEXT "Brikketype:", -1, 20, 45, 70, 10 + RTEXT "DAC type:", -1, 20, 55, 70, 10 + RTEXT "Cirka total minne:", -1, 20, 65, 70, 10 + RTEXT "Gjeldende skjermmodus:", -1, 20, 75, 70, 10 + RTEXT "Skjerm:", -1, 20, 85, 70, 10 + LTEXT "", IDC_STATIC_ADAPTER_ID, 95, 25, 150, 10 + LTEXT "", IDC_STATIC_ADAPTER_VENDOR, 95, 35, 150, 10 + LTEXT "", IDC_STATIC_ADAPTER_CHIP, 95, 45, 150, 10 + LTEXT "", IDC_STATIC_ADAPTER_DAC, 95, 55, 150, 10 + LTEXT "", IDC_STATIC_ADAPTER_MEM, 95, 65, 150, 10 + LTEXT "", IDC_STATIC_ADAPTER_MODE, 95, 75, 150, 10 + LTEXT "", IDC_STATIC_ADAPTER_MONITOR, 95, 85, 150, 10 + + GROUPBOX "Driver", -1, 270, 10, 190, 100 + RTEXT "Hoved driver:", -1, 275, 25, 55, 10 + RTEXT "Versjon:", -1, 275, 35, 55, 10 + RTEXT "Dato:", -1, 275, 45, 55, 10 + RTEXT "WHQL-Logo:", -1, 275, 55, 55, 10 + RTEXT "Mini-VDD:", -1, 275, 65, 55, 10 + RTEXT " vvdddVDD:", -1, 275, 75, 55, 10 + RTEXT "DDI Versjon:", -1, 275, 85, 55, 10 + LTEXT "", IDC_STATIC_ADAPTER_DRIVER, 335, 35, 100, 10 + LTEXT "", IDC_STATIC_ADAPTER_VERSION, 335, 35, 100, 10 + LTEXT "", IDC_STATIC_ADAPTER_DATE, 335, 45, 100, 10 + LTEXT "", IDC_STATIC_ADAPTER_LOGO, 335, 55, 100, 10 + LTEXT "", IDC_STATIC_ADAPTER_MINIVDD, 335, 65, 100, 10 + LTEXT "", IDC_STATIC_ADAPTER_VDD, 335, 75, 100, 10 + LTEXT "", IDC_STATIC_ADAPTER_DDI, 335, 85, 100, 10 + + GROUPBOX "ReactX-Funksjoner", -1, 10, 115, 450, 60 + RTEXT "DirectDraw akselerasjon:", -1, 15, 130, 110, 12 + RTEXT "Direct3D akselerasjon:", -1, 15, 145, 110, 12 + RTEXT "AGP tekstur akselerasjon:", -1, 15, 160, 110, 12 + LTEXT "", IDC_STATIC_DDSTATE, 130, 130, 40, 10 + LTEXT "", IDC_STATIC_D3DSTATE, 130, 145, 40, 10 + LTEXT "", IDC_STATIC_AGPSTATE, 130, 160, 40, 10 + PUSHBUTTON "Aktivert", IDC_BUTTON_DDRAW, 170, 124, 60, 14, WS_DISABLED + PUSHBUTTON "Aktivert", IDC_BUTTON_D3D, 170, 140, 60, 14, WS_DISABLED + PUSHBUTTON "Aktivert", IDC_BUTTON_AGP, 170, 156, 60, 14, WS_DISABLED + PUSHBUTTON "Test DirectDraw", IDC_BUTTON_TESTDD, 250, 124, 80, 14 + PUSHBUTTON "Test Direct3D", IDC_BUTTON_TEST3D, 250, 140, 80, 14, WS_DISABLED + + GROUPBOX "Merknader", -1, 10, 180, 450, 40 + EDITTEXT IDC_TEXT_INFO, 20, 192, 432, 20, WS_DISABLED | WS_TABSTOP +END + + +IDD_SOUND_DIALOG DIALOGEX DISCARDABLE 0, 0, 462, 220 +STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Enheter", -1, 10, 10, 250, 100 + RTEXT "Navn:", -1, 20, 25, 70, 10 + RTEXT "Enhet ID:", -1, 20, 35, 70, 10 + RTEXT "Fabrikant ID:", -1, 20, 45, 70, 10 + RTEXT "Produkt ID:", -1, 20, 55, 70, 10 + RTEXT "Type:", -1, 20, 65, 70, 10 + RTEXT "Standard enhet:", -1, 20, 75, 70, 10 + LTEXT "", IDC_STATIC_DSOUND_NAME, 95, 25, 150, 10 + LTEXT "", IDC_STATIC_DSOUND_DEVICEID, 95, 35, 150, 10 + LTEXT "", IDC_STATIC_DSOUND_VENDORID, 95, 45, 150, 10 + LTEXT "", IDC_STATIC_DSOUND_PRODUCTID, 95, 55, 150, 10 + LTEXT "", IDC_STATIC_DSOUND_TYPE, 95, 65, 150, 10 + LTEXT "", IDC_STATIC_DSOUND_STANDARD, 95, 75, 150, 10 + GROUPBOX "Driver", -1, 270, 10, 190, 100 + RTEXT "Navn:", -1, 275, 25, 55, 10 + RTEXT "Versjon:", -1, 275, 35, 55, 10 + RTEXT "Dato:", -1, 275, 45, 55, 10 + RTEXT "WHQL-Logo:", -1, 275, 55, 55, 10 + RTEXT "Andre filer:", -1, 275, 65, 55, 10 + RTEXT "Provider:", -1, 275, 75, 55, 10 + LTEXT "", IDC_STATIC_DSOUND_DRIVER, 335, 25, 100, 10 + LTEXT "", IDC_STATIC_DSOUND_VERSION, 335, 35, 100, 10 + LTEXT "", IDC_STATIC_DSOUND_DATE, 335, 45, 100, 10 + LTEXT "", IDC_STATIC_DSOUND_LOGO, 335, 55, 100, 10 + LTEXT "", IDC_STATIC_DSOUND_FILES, 335, 65, 100, 10 + LTEXT "", IDC_STATIC_ADAPTER_PROVIDER, 335, 75, 100, 10 + GROUPBOX "ReactX-Funksjoner", -1, 10, 115, 450, 60 + CONTROL "", IDC_SLIDER_DSOUND, "msctls_trackbar32", TBS_BOTTOM | TBS_AUTOTICKS | WS_TABSTOP, 120, 135, 80, 17 + RTEXT "Maskinvare lyd\nAcceleration Level:", -1, 20, 135, 90, 20 + PUSHBUTTON "Test DirectSound", IDC_BUTTON_TESTDSOUND, 270, 134, 80, 14 + GROUPBOX "Merknader", -1, 10, 180, 450, 40 + EDITTEXT IDC_TEXT_DSOUNDINFO, 20, 192, 432, 20, WS_DISABLED | WS_TABSTOP +END + +IDD_MUSIC_DIALOG DIALOGEX DISCARDABLE 0, 0, 462, 220 +STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN +FONT 8, "MS Shell Dlg" +BEGIN +END + + +IDD_INPUT_DIALOG DIALOGEX DISCARDABLE 0, 0, 462, 220 +STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "DirectInput Enheter", -1, 10, 10, 452, 80 + CONTROL "", IDC_LIST_DEVICE, "SysListView32", LVS_REPORT | WS_CHILD | WS_BORDER | WS_TABSTOP, 20, 22, 432, 60 + GROUPBOX "Input Enheter", -1, 10, 100, 452, 60 + CONTROL "", IDC_TREE_PORT, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_DISABLEDRAGDROP | TVS_SHOWSELALWAYS | WS_VISIBLE | WS_BORDER | WS_TABSTOP, 20, 112, 432, 40, 0x00000200 + GROUPBOX "Informasjon", -1, 10, 170, 452, 50 + EDITTEXT IDC_RICH_INFO, 20, 182, 432, 30, WS_DISABLED | WS_TABSTOP +END + +IDD_NETWORK_DIALOG DIALOGEX DISCARDABLE 0, 0, 462, 220 +STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Registered DirectPlay Service Provider", -1, 10, 10, 452, 80 + CONTROL "", IDC_LIST_PROVIDER, "SysListView32", LVS_REPORT | WS_CHILD | WS_BORDER | WS_TABSTOP, 20, 22, 432, 60 +END + +IDD_HELP_DIALOG DIALOGEX DISCARDABLE 0, 0, 462, 220 +STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN +FONT 8, "MS Shell Dlg" +BEGIN +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_MAIN_DIALOG "ReactX diagnoseverktøy" + IDS_SYSTEM_DIALOG "System" + IDS_DISPLAY_DIALOG "Skjerm" + IDS_SOUND_DIALOG "Lyd" + IDS_MUSIC_DIALOG "Musikk" + IDS_INPUT_DIALOG "Input" + IDS_NETWORK_DIALOG "Nettverk" + IDS_HELP_DIALOG "Hjelp" + IDS_FORMAT_MB "%I64uMB RAM" + IDS_FORMAT_SWAP "%I64u MB brukt, %I64u MB tilgjengelig" + IDS_FORMAT_UNIPROC "%s (%u CPU)" + IDS_FORMAT_MPPROC "%s (%u CPUs)" + IDS_VERSION_UNKNOWN "Ukjent versjon" + IDS_DEVICE_STATUS_ATTACHED "Koblet til" + IDS_DEVICE_STATUS_MISSING "Koblet fra" + IDS_DEVICE_STATUS_UNKNOWN "Ukjent" + IDS_DEVICE_NAME "Enhetsnavn" + IDS_DEVICE_STATUS "Status" + IDS_DEVICE_CONTROLLER "Kontroller ID" + IDS_DEVICE_MANUFACTURER "Fabrikant ID" + IDS_DEVICE_PRODUCT "Produkt ID" + IDS_DEVICE_FORCEFEEDBACK "Force Feedback-driver" + IDS_NOT_APPLICABLE "Ikke gjeldende" + IDS_OPTION_YES "Ja" + IDS_DIRECTPLAY_COL_NAME1 "Navn" + IDS_DIRECTPLAY_COL_NAME2 "Register" + IDS_DIRECTPLAY_COL_NAME3 "Fil" + IDS_DIRECTPLAY_COL_NAME4 "Versjon" + IDS_DIRECTPLAY8_MODEMSP "DirectPlay8-Modem Service Provider" + IDS_DIRECTPLAY8_SERIALSP "DirectPlay8 Serial Service Provider" + IDS_DIRECTPLAY8_IPXSP "DirectPlay8 IPX Service Provider" + IDS_DIRECTPLAY8_TCPSP "DirectPlay8-TCP/IP Service Provider" + IDS_DIRECTPLAY_TCPCONN "Internett TCP/IP tilkobling for DirectPlay" + IDS_DIRECTPLAY_IPXCONN "IPX tilkobling for DirectPlay" + IDS_DIRECTPLAY_MODEMCONN "Modem tilkobling for DirectPlay" + IDS_DIRECTPLAY_SERIALCONN "Serial tilkoblig for DirectPlay" + IDS_REG_SUCCESS "OK" + IDS_REG_FAIL "Feil" + IDS_DDTEST_ERROR "Testen mislykkes!" + IDS_DDTEST_DESCRIPTION "Dette vil starte DirecDraw grenseflate test. Fortsette?" + IDS_DDPRIMARY_DESCRIPTION "Denne testen vil bruke DirectDraw to draw on primary surface. Svart og hvit rektangulær skulle bli drawn. Fortsette?" + IDS_DDPRIMARY_RESULT "Så du svarte og hvite rektangeler?" + IDS_DDOFFSCREEN_DESCRIPTION "Denne testen vil bruke DirectDraw til å draw i en offscreen buffer. Bevegende hvite rektangler skulle bli drawn. Fortsette?" + IDS_DDOFFSCREEN_RESULT "Så du de hvite bevegende rektangeler?" + IDS_DDFULLSCREEN_DESCRIPTION "Denne testen vil bruke DirectDraw to draw in a fullscreen mode. Moving white rectangle should be drawn. Fortsette?" + IDS_DDFULLSCREEN_RESULT "Så du de hvite bevegende rektangeler i fullskjermmodus?" + IDS_FORMAT_ADAPTER_MEM "%u MB" + IDS_FORMAT_ADAPTER_MODE "%04u x %04u (%u bit)(%uHz)" + IDS_OPTION_NO "Nei" +END Propchange: trunk/reactos/base/applications/dxdiag/lang/nb-NO.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/dxdiag/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/r… ============================================================================== --- trunk/reactos/base/applications/dxdiag/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/dxdiag/rsrc.rc [iso-8859-1] Thu Jul 10 01:51:18 2008 @@ -9,6 +9,7 @@ #include "lang/en-US.rc" #include "lang/es-ES.rc" #include "lang/fr-FR.rc" +#include "lang/nb-NO.rc" #include "lang/pl-PL.rc" #include "lang/ru-RU.rc" #include "lang/sk-SK.rc" Added: trunk/reactos/base/applications/kbswitch/lang/nb-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/kbswitch… ============================================================================== --- trunk/reactos/base/applications/kbswitch/lang/nb-NO.rc (added) +++ trunk/reactos/base/applications/kbswitch/lang/nb-NO.rc [iso-8859-1] Thu Jul 10 01:51:18 2008 @@ -1,0 +1,11 @@ +LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL + +IDR_POPUP MENU +BEGIN + POPUP "popup" + BEGIN + MENUITEM "&Innstillinger...", ID_PREFERENCES + MENUITEM SEPARATOR + MENUITEM "&Avslutt", ID_EXIT + END +END Propchange: trunk/reactos/base/applications/kbswitch/lang/nb-NO.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/kbswitch/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/kbswitch… ============================================================================== --- trunk/reactos/base/applications/kbswitch/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/kbswitch/rsrc.rc [iso-8859-1] Thu Jul 10 01:51:18 2008 @@ -5,6 +5,7 @@ #include "lang/es-ES.rc" #include "lang/fr-FR.rc" #include "lang/lt-LT.rc" +#include "lang/nb-NO.rc" #include "lang/pl-PL.rc" #include "lang/ru-RU.rc" #include "lang/sk-SK.rc" Added: trunk/reactos/base/applications/mscutils/devmgmt/lang/nb-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt/lang/nb-NO.rc (added) +++ trunk/reactos/base/applications/mscutils/devmgmt/lang/nb-NO.rc [iso-8859-1] Thu Jul 10 01:51:18 2008 @@ -1,0 +1,82 @@ +LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL + +IDR_MAINMENU MENU +BEGIN + POPUP "&Fil" + BEGIN + MENUITEM "A&vslutt", IDC_EXIT + END + POPUP "Handling" + BEGIN + MENUITEM "Skriv ut", IDC_PRINT, GRAYED + MENUITEM SEPARATOR + MENUITEM "Egenskaper", IDC_PROP, GRAYED + MENUITEM SEPARATOR + MENUITEM "Hjelp", IDC_PROGHELP, GRAYED + END + POPUP "Vis" + BEGIN + MENUITEM "Enheter etter type", IDC_DEVBYTYPE, CHECKED + MENUITEM "Enheter etter tilkobling", IDC_STATIC, GRAYED + MENUITEM "Ressurser etter type", IDC_STATIC, GRAYED + MENUITEM "Ressurser etter tilkobling", IDC_STATIC, GRAYED + END + POPUP "Hjelp" + BEGIN + MENUITEM "Hjelp", IDC_PROGHELP + MENUITEM "Om", IDC_ABOUT + END +END + +IDR_POPUP MENU +BEGIN + POPUP "popup" + BEGIN + MENUITEM "Egenskaper", IDC_PROP, GRAYED + MENUITEM SEPARATOR + MENUITEM "Hjelp", IDC_PROGHELP + END +END + +IDD_ABOUTBOX DIALOGEX 22,16,190,182 +CAPTION "Om Enhetsbehandler" +FONT 8,"MS Shell Dlg",0,0 +STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME +BEGIN + LTEXT "Enhetsbehandler v0.1\nCopyright (C) 2006\nby Ged Murphy (gedmurphy(a)gmail.com)", IDC_STATIC, 48, 7, 130, 30 + PUSHBUTTON "Lukk", IDOK, 75, 162, 44, 15 + ICON IDI_MAIN_ICON, IDC_STATIC, 10, 10, 7, 30 + EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_LICENSE "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program 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 General Public License for more details.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA." +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_TOOLTIP_PROP "Egenskaper" + IDS_TOOLTIP_REFRESH "Oppdater" + IDS_TOOLTIP_HELP "Hjelp" + IDS_TOOLTIP_EXIT "Avslutt" +END + +/* Hints */ +STRINGTABLE DISCARDABLE +BEGIN + IDS_APPNAME "ReactOS Enhetsbehandler" + IDS_HINT_BLANK " " + IDS_HINT_EXIT " Avslutt programmet." + IDS_HINT_REFRESH " Oppdater tjeneste listen." + IDS_HINT_PROP " Open property sheet for the current selection." + IDS_HINT_HELP " Vis hjelp vinduet." + IDS_HINT_ABOUT " Om ReactOS Enhetsbehandler." + + IDS_HINT_SYS_RESTORE " Gjenopprett dette vinduet til vanlig størrelse." + IDS_HINT_SYS_MOVE " Flytt dette vinduet." + IDS_HINT_SYS_SIZE " Endre størrelse på dette vinduet." + IDS_HINT_SYS_MINIMIZE " Gjør om dette vinduet til en ikon." + IDS_HINT_SYS_MAXIMIZE " Gjør om dette vinduet til å fylle hele skjermen." + IDS_HINT_SYS_CLOSE " Lukk dette vinduet." +END Propchange: trunk/reactos/base/applications/mscutils/devmgmt/lang/nb-NO.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/mscutils/devmgmt/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt/rsrc.rc [iso-8859-1] Thu Jul 10 01:51:18 2008 @@ -21,6 +21,7 @@ #include "lang/id-ID.rc" #include "lang/it-IT.rc" #include "lang/ko-KR.rc" +#include "lang/nb-NO.rc" #include "lang/pl-PL.rc" #include "lang/ru-RU.rc" #include "lang/sk-SK.rc" Added: trunk/reactos/base/applications/mscutils/eventvwr/lang/nb-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/nb-NO.rc (added) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/nb-NO.rc [iso-8859-1] Thu Jul 10 01:51:18 2008 @@ -1,0 +1,104 @@ +/* + * PROJECT: ReactOS Event Viewer + * LICENSE: GPL - See COPYING in the top level directory + * FILE: base/applications/mscutils/eventvwr/lang/en-US.rc + * PURPOSE: Norwegian Language File for ReactOS Event Viewer + * TRANSLATORS: Marc Piulachs + */ + +LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL + +IDC_EVENTVWR MENU +BEGIN + POPUP "&Logg" + BEGIN + MENUITEM "&Applikasjon", ID_LOG_APPLICATION, CHECKED + MENUITEM "&Sikkerhet", ID_LOG_SECURITY + MENUITEM "&System", ID_LOG_SYSTEM + MENUITEM SEPARATOR + MENUITEM "A&vslutt", IDM_EXIT + END + POPUP "&Vis" + BEGIN + MENUITEM "&Oppdater", IDM_REFRESH + END + MENUITEM "&Handling", ID_OPTIONS + POPUP "&Hjelp" + BEGIN + MENUITEM "Hj&elp", IDM_HELP + MENUITEM SEPARATOR + MENUITEM "&Om...", IDM_ABOUT + END +END + +IDC_EVENTVWR ACCELERATORS +BEGIN + "?", IDM_ABOUT, ASCII, ALT + "/", IDM_ABOUT, ASCII, ALT +END + +IDD_ABOUTBOX DIALOGEX 0, 0, 230, 75 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_CAPTION | WS_SYSMENU +CAPTION "Om" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + ICON IDI_EVENTVWR,IDC_MYICON,14,9,21,20 + LTEXT "ReactOS Hendelseliste Versjon 1.0",IDC_STATIC,49,10,119,8,SS_NOPREFIX + LTEXT "Copyright (C) 2007 Marc Piulachs (marc.piulachs(a)codexchange.net)",IDC_STATIC,49,20,119,22 + DEFPUSHBUTTON "OK",IDOK,90,48,42,16,WS_GROUP +END + +IDD_PROGRESSBOX DIALOGEX 0, 0, 230, 40 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER +CAPTION "Vent.." +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + CTEXT "Laster Hendelseliste. Venligst vent ...",IDC_STATIC,0,15,230,8,SS_NOPREFIX +END + +IDD_EVENTDETAILDIALOG DIALOGEX 0, 0, 276, 282 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +EXSTYLE WS_EX_CONTEXTHELP +CAPTION "Hendelse detaljer" +FONT 8, "MS Shell Dlg", 400, 0, 0x1 +BEGIN + DEFPUSHBUTTON "&Lukk",IDOK,12,258,50,14 + PUSHBUTTON "&Forrige",IDPREVIOUS,78,258,50,14 + PUSHBUTTON "&Neste",IDNEXT,144,258,50,14 + PUSHBUTTON "&Hjelp",IDHELP,210,258,50,14 + EDITTEXT IDC_EVENTTEXTEDIT,14,81,247,108,ES_MULTILINE | ES_READONLY + LTEXT "&Beskrivelse:",IDC_STATIC,15,70,39,8 + LTEXT "Dato:",IDC_STATIC,14,14,36,8 + LTEXT "Statisk",IDC_EVENTDATESTATIC,56,14,72,8 + LTEXT "Tid:",IDC_STATIC,14,27,36,8 + LTEXT "Statisk",IDC_EVENTTIMESTATIC,56,27,72,8 + LTEXT "&Bruker:",IDC_STATIC,14,41,36,8 + LTEXT "Statisk",IDC_EVENTUSERSTATIC,56,41,72,8 + LTEXT "&Datamaskin:",IDC_STATIC,14,54,36,8 + LTEXT "Statisk",IDC_EVENTCOMPUTERSTATIC,56,54,72,8 + LTEXT "Hendelse ID:",IDC_STATIC,133,15,36,8 + LTEXT "Statisk",IDC_EVENTIDSTATIC,175,15,87,8 + LTEXT "Kilde:",IDC_STATIC,133,28,36,8 + LTEXT "Statisk",IDC_EVENTSOURCESTATIC,175,28,87,8 + LTEXT "Type:",IDC_STATIC,133,42,36,8 + LTEXT "Statisk",IDC_EVENTTYPESTATIC,175,42,87,8 + LTEXT "Kategori:",IDC_STATIC,133,55,36,8 + LTEXT "Statisk",IDC_EVENTCATEGORYSTATIC,175,55,87,8 + EDITTEXT IDC_EVENTDATAEDIT,14,204,247,44,ES_MULTILINE | ES_READONLY + LTEXT "D&ata",IDC_STATIC,14,194,20,8 + CONTROL "&Tegn",IDC_BYTESRADIO,"Button",BS_AUTORADIOBUTTON,39,194,34,10 + CONTROL "&Ord",IDC_WORDRADIO,"Button",BS_AUTORADIOBUTTON,77,194,33,10 +END + +STRINGTABLE +BEGIN + IDS_APP_TITLE "Hendelseliste" + IDC_EVENTSTRINGIDNOTFOUND "Beskrivelsen for Hendelse ID ( %lu ) i kilden ( %s ) kan ikke bli finnet. Lokale datamaskinen har ikke nødvendige register informasjon eller melding DLL filer for å vise melding fra en fjern datamaskin." + IDC_EVENTLOG_ERROR_TYPE "Feil" + IDC_EVENTLOG_WARNING_TYPE "Advarseler" + IDC_EVENTLOG_INFORMATION_TYPE "Informasjon" + IDC_EVENTLOG_AUDIT_SUCCESS "Revisjon suksess" + IDC_EVENTLOG_AUDIT_FAILURE "Revisjon misslykkes" + IDC_EVENTLOG_SUCCESS "Suksess" + IDC_EVENTLOG_UNKNOWN_TYPE "Ukjent hendelse" +END Propchange: trunk/reactos/base/applications/mscutils/eventvwr/lang/nb-NO.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/mscutils/eventvwr/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/rsrc.rc [iso-8859-1] Thu Jul 10 01:51:18 2008 @@ -17,6 +17,7 @@ #include "lang/fr-FR.rc" #include "lang/it-IT.rc" #include "lang/ko-KR.rc" +#include "lang/nb-NO.rc" #include "lang/pl-PL.rc" #include "lang/ru-RU.rc" #include "lang/sk-SK.rc" Added: trunk/reactos/base/applications/mscutils/servman/lang/nb-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/lang/nb-NO.rc (added) +++ trunk/reactos/base/applications/mscutils/servman/lang/nb-NO.rc [iso-8859-1] Thu Jul 10 01:51:18 2008 @@ -1,0 +1,267 @@ +LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL + +IDR_MAINMENU MENU +BEGIN + POPUP "&Fil" + BEGIN + MENUITEM "Eksportere...", ID_EXPORT + MENUITEM SEPARATOR + MENUITEM "A&vslutt", ID_EXIT + END + POPUP "Handling" + BEGIN + MENUITEM "Koble til...", ID_CONNECT, GRAYED + MENUITEM SEPARATOR + MENUITEM "Start", ID_START, GRAYED + MENUITEM "Stopp", ID_STOP, GRAYED + MENUITEM "Pause", ID_PAUSE, GRAYED + MENUITEM "Fortsett", ID_RESUME, GRAYED + MENUITEM "Restart", ID_RESTART, GRAYED + MENUITEM SEPARATOR + MENUITEM "Oppdater", ID_REFRESH + MENUITEM SEPARATOR + MENUITEM "Rediger...", ID_EDIT, GRAYED + MENUITEM "Opprett...", ID_CREATE, GRAYED + MENUITEM "Slett...", ID_DELETE, GRAYED + MENUITEM SEPARATOR + MENUITEM "Egenskaper...", ID_PROP, GRAYED + END + POPUP "Vis" + BEGIN + MENUITEM "Store ikoner", ID_VIEW_LARGE + MENUITEM "Små ikoner", ID_VIEW_SMALL + MENUITEM "Liste", ID_VIEW_LIST + MENUITEM "Detaljer", ID_VIEW_DETAILS + MENUITEM SEPARATOR + MENUITEM "Tilpasning...",ID_VIEW_CUST, GRAYED + END + POPUP "Hjelp" + BEGIN + MENUITEM "Hjelp", ID_HELP + MENUITEM "Om", ID_ABOUT + END +END + +IDR_POPUP MENU +BEGIN + POPUP "popup" + BEGIN + MENUITEM "Start", ID_START, GRAYED + MENUITEM "Stopp", ID_STOP, GRAYED + MENUITEM "Pause", ID_PAUSE, GRAYED + MENUITEM "Fortsett", ID_RESUME, GRAYED + MENUITEM "Restart", ID_RESTART, GRAYED + MENUITEM SEPARATOR + MENUITEM "Oppdater", ID_REFRESH + MENUITEM SEPARATOR + MENUITEM "Rediger...", ID_EDIT, GRAYED + MENUITEM "Slett...", ID_DELETE, GRAYED + MENUITEM SEPARATOR + MENUITEM "Egenskaper...", ID_PROP, GRAYED + MENUITEM SEPARATOR + MENUITEM "Hjelp...", ID_HELP + END +END + +IDD_ABOUTBOX DIALOGEX 22,16,190,182 +CAPTION "Om Tjenestebehandler" +FONT 8, "MS Shell Dlg",0,0 +STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME +BEGIN + LTEXT "Tjenestebehandler v0.8\nCopyright (C) 2005-2007\nby Ged Murphy (gedmurphy(a)reactos.org)", IDC_STATIC, 48, 7, 135, 30 + PUSHBUTTON "Lukk", IDOK, 75, 162, 44, 15 + ICON IDI_SM_ICON, IDC_STATIC, 10, 10, 7, 30 + EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE +END + +IDD_DLG_GENERAL DIALOGEX 6, 6, 253, 232 +CAPTION "Generielt" +FONT 8, "MS Shell Dlg",0,0 +STYLE DS_SHELLFONT | WS_BORDER | WS_VISIBLE | WS_DLGFRAME | WS_SYSMENU | WS_THICKFRAME | WS_GROUP | WS_TABSTOP +BEGIN + LTEXT "", IDC_SERV_NAME, 70,11,176,11, WS_CHILD | WS_VISIBLE + EDITTEXT IDC_DISP_NAME, 70, 29, 176, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_READONLY + EDITTEXT IDC_DESCRIPTION, 70, 46, 176, 24, WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_MULTILINE | ES_READONLY + EDITTEXT IDC_EXEPATH, 6, 86, 240, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_READONLY + COMBOBOX IDC_START_TYPE, 70, 107, 176, 40, WS_CHILD | WS_VISIBLE | WS_TABSTOP | CBS_DROPDOWNLIST + PUSHBUTTON "Start", IDC_START, 6, 155, 54, 15, WS_DISABLED + PUSHBUTTON "Stopp", IDC_STOP, 68, 155, 54, 15, WS_DISABLED + PUSHBUTTON "Pause", IDC_PAUSE , 130, 155, 54, 15, WS_DISABLED + PUSHBUTTON "Fortsett", IDC_RESUME, 192, 155, 54, 15, WS_DISABLED + LTEXT "Tjenestenavn:", IDC_STATIC, 4, 11, 53, 11 + LTEXT "Visningnavn:", IDC_STATIC, 4, 29, 53, 11 + LTEXT "Beskrivelse:", IDC_STATIC, 4, 51, 53, 11 + LTEXT "Bane til kjørbar fil:", IDC_STATIC, 6, 73, 82, 9 + LTEXT "Oppstart type:", IDC_STATIC, 6, 108, 53, 11 + LTEXT "Tjenestestatus:", IDC_STATIC, 4, 138, 53, 11 + LTEXT "", IDC_SERV_STATUS, 70, 138, 176, 11, WS_CHILD | WS_VISIBLE + LTEXT "Du kan angi startparameteret som gjelder når du starter tjenesten herfra.",IDC_STATIC, 6,177,240,15 + LTEXT "startparameteret:", IDC_STATIC, 6, 200, 58, 11 + EDITTEXT IDC_START_PARAM, 68, 199, 178, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Rediger", IDC_EDIT, 192, 215, 54, 15, WS_DISABLED +END + +IDD_DLG_DEPEND DIALOGEX 6,6,253,225 +CAPTION "Dependencies" +FONT 8, "MS Shell Dlg",0,0 +STYLE DS_SHELLFONT | WS_BORDER | WS_VISIBLE | WS_DLGFRAME | WS_SYSMENU | WS_THICKFRAME | WS_GROUP | WS_TABSTOP +BEGIN + CONTROL "", IDC_DEPEND_TREE1, "SysTreeView32" ,0x50010007, 8, 70, 236, 68, 0x00000200 + CONTROL "", IDC_DEPEND_TREE2, "SysTreeView32", 0x50010007, 8, 151, 234, 67, 0x00000200 + LTEXT "Noen tjenester depend på andre tjenester, system drivere og laster system grupper. Hvis system komponenten er stoppet eller ikke kjøre riktig, dependant services can be affected.", IDC_STATIC,8, 7, 238, 26 + LTEXT "Denne tjenesten depends på følgende komponenter", IDC_STATIC, 8, 57, 236, 9 + LTEXT "", IDC_DEPEND_SERVICE, 8, 38, 236, 13 +END + +IDD_DLG_CREATE DIALOGEX 6,6,225,209 +CAPTION "Opprett en tjeneste" +FONT 8, "MS Shell Dlg",0,0 +STYLE DS_SHELLFONT | WS_BORDER | WS_VISIBLE | WS_DLGFRAME | WS_SYSMENU | WS_THICKFRAME | WS_GROUP | WS_TABSTOP +BEGIN + EDITTEXT IDC_CREATE_SERVNAME, 72, 12, 150, 11, WS_CHILD | WS_VISIBLE | WS_EX_CLIENTEDGE + EDITTEXT IDC_CREATE_DISPNAME, 72, 31, 150, 11, WS_CHILD | WS_VISIBLE + EDITTEXT IDC_CREATE_PATH, 10, 62, 210, 13, WS_CHILD | WS_VISIBLE + EDITTEXT IDC_CREATE_DESC, 10, 97, 210, 48, WS_CHILD | WS_VISIBLE + EDITTEXT IDC_CREATE_OPTIONS, 10, 162, 210, 13, WS_CHILD | WS_VISIBLE + LTEXT "*Tjenestenavn:", IDC_STATIC, 12, 12, 54, 9 + LTEXT "*Visningsnavn:", IDC_STATIC, 12, 33, 54, 9 + LTEXT "*Bane til kjørbar fil:", IDC_STATIC, 10, 51, 68, 9 + LTEXT "Beskrivelse:", IDC_STATIC, 12, 86, 44, 9 + PUSHBUTTON "OK", IDOK, 126, 192, 44, 13 + PUSHBUTTON "Avbryt", IDCANCEL, 176, 192, 46, 13 + LTEXT "'Ytterligere valg (klikk hjelp for detaljer)", IDC_STATIC, 10, 151, 134, 9 + PUSHBUTTON "Hjelp", ID_CREATE_HELP, 10, 192, 44, 13 +END + +IDD_DLG_DELETE DIALOGEX 6,6,185,148 +CAPTION "Slett en tjenste" +FONT 8, "MS Shell Dlg",0,0 +STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | DS_MODALFRAME +BEGIN + ICON IDI_WARNING, IDC_STATIC, 10, 8, 24, 22 + LTEXT "Er du sikker på at du vil slette denne tjenesten? Den kan ikke bli åpnet hvis den blir fjernet!", IDC_STATIC, 50, 6, 125, 25 + LTEXT "Tjenestenavn:",IDC_STATIC, 6, 40, 80, 9 + LTEXT "", IDC_DEL_NAME, 15, 53, 160, 15 + EDITTEXT IDC_DEL_DESC, 6, 73, 174, 48, WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_EX_STATICEDGE | ES_MULTILINE | ES_READONLY + PUSHBUTTON "Ja", IDOK, 26, 129, 54, 13 + DEFPUSHBUTTON "Nei", IDCANCEL, 102, 129, 54, 13 +END + +IDD_DLG_HELP_OPTIONS DIALOGEX 6,6,200,150 +CAPTION "Valg" +FONT 8, "MS Shell Dlg",0,0 +STYLE 0x10CF0000 +BEGIN + LTEXT "", IDC_CREATE_HELP, 6, 5, 200, 150 + PUSHBUTTON "Ok", IDOK, 75, 130, 44, 13 +END + +IDD_DLG_PROGRESS DIALOGEX 6,6,255,89 +CAPTION "Tjeneste kontroll" +FONT 8, "MS Shell Dlg",0,0 +STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | WS_VISIBLE | DS_MODALFRAME +EXSTYLE WS_EX_TOOLWINDOW +BEGIN + CONTROL "", IDC_SERVCON_PROGRESS, "msctls_progress32", 0x50000000, 8, 46, 238, 13 + LTEXT "", IDC_SERVCON_INFO, 8, 5, 236, 11 + LTEXT "", IDC_SERVCON_NAME, 8, 25, 66, 11 + PUSHBUTTON "&Lukk", IDOK, 100, 70, 54, 13 +END + + + +STRINGTABLE DISCARDABLE +BEGIN + IDS_FIRSTCOLUMN "Navn" + IDS_SECONDCOLUMN "Beskrivelse" + IDS_THIRDCOLUMN "Status" + IDS_FOURTHCOLUMN "Oppstart type" + IDS_FITHCOLUMN "Logg på som" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_SERVICES_STARTED "Startet" + IDS_SERVICES_STOPPED "Stoppet" + IDS_SERVICES_AUTO "Automatisk" + IDS_SERVICES_MAN "Manuell" + IDS_SERVICES_DIS "Deaktivert" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_NUM_SERVICES "Num tjeneste: %d" + IDS_LICENSE "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program 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 General Public License for more details.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA." +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_TOOLTIP_PROP "Properties" + IDS_TOOLTIP_REFRESH "Oppdater" + IDS_TOOLTIP_EXPORT "Export list" + IDS_TOOLTIP_CREATE "Create a new service" + IDS_TOOLTIP_DELETE "Deletes an existing service" + IDS_TOOLTIP_START "Start tjeneste" + IDS_TOOLTIP_STOP "Stopp tjeneste" + IDS_TOOLTIP_PAUSE "Pause tjeneste" + IDS_TOOLTIP_RESTART "Restart tjeneste" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_PROGRESS_INFO_START "ReactOS forsøker å starte følgende tjeneste" + IDS_PROGRESS_INFO_STOP "ReactOS forsøker å stoppe følgende tjeneste" + IDS_PROGRESS_INFO_PAUSE "ReactOS forsøker å pause følgende tjeneste" + IDS_PROGRESS_INFO_RESUME "ReactOS forsøker å fortsette følgende tjeneste" + IDS_CREATE_SUCCESS "Tjenesten ble opprettet" + IDS_DELETE_SUCCESS "Tjenesten ble slettet" + IDS_CREATE_REQ "Fields marked with an\nasterix are mandatory" + IDS_DELETE_STOP "Du må manuelt stoppe tjenesten før den kan slettes!" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_HELP_OPTIONS "CREATE OPTIONS:\r\nNOTE: The option name includes the equal sign.\r\n type= <own|share|interact|kernel|filesys|rec>\r\n (default = own)\r\n start= <boot|system|auto|demand|disabled>\r\n (default = demand) \r\n error= <normal|severe|critical|ignore>\r\n (default = normal)\r\n group= <LoadOrderGroup>\r\n tag= <yes|no>\r\n depend= <Dependencies(separated by / (forward slash))>\r\n obj= <AccountName|ObjectName>\r\n (default = LocalSystem)\r\n password= <password>\r\n" +END + +/* Hints */ +STRINGTABLE DISCARDABLE +BEGIN + IDS_HINT_BLANK " " + IDS_HINT_EXPORT " Eksporter nåværende liste til en fil." + IDS_HINT_EXIT " Avslutt programmet." + + IDS_HINT_CONNECT " Behandle en annen datamaskin." + IDS_HINT_START " Start valgte tjeneste." + IDS_HINT_STOP " Stopp valgte tjeneste." + IDS_HINT_PAUSE " Pause valgte tjeneste." + IDS_HINT_RESUME " Fortsett valgte tjeneste." + IDS_HINT_RESTART " Stopp og start valgte tjeneste." + IDS_HINT_REFRESH " Oppdater tjeneste listen." + IDS_HINT_EDIT " Edit the properties of the selected service." + IDS_HINT_CREATE " Opprett en ny tjeneste." + IDS_HINT_DELETE " Slett valgte tjeneste." + IDS_HINT_PROP " Åpne egenskap ark for nåværende utvalg." + + IDS_HINT_LARGE " Vis elementer med å bruke store ikoner." + IDS_HINT_SMALL " Vis elementer med å bruke mindre ikoner." + IDS_HINT_LIST " Vis elementer i en liste." + IDS_HINT_DETAILS " Vis informasjon om hver element i et vindu." + IDS_HINT_CUST " Tilpass bildet." + + IDS_HINT_HELP " Vis hjelp vinduet." + IDS_HINT_ABOUT " Om ReactOS Tjenestebehandler." + + IDS_HINT_SYS_RESTORE " Gjenopprett vinduet til normal størrelse." + IDS_HINT_SYS_MOVE " Flytt dette vinduet." + IDS_HINT_SYS_SIZE " Endre størrelsen på dette vinduet." + IDS_HINT_SYS_MINIMIZE " Endre størrelsen på dette vinduet til en ikon." + IDS_HINT_SYS_MAXIMIZE " Endre størrelsen på dette vinduet til fullskjerm." + IDS_HINT_SYS_CLOSE " Lukk dette vinduet." +END + +/* Application title */ +STRINGTABLE DISCARDABLE +BEGIN + IDS_APPNAME "ReactOS Tjenestebehandler" +END Propchange: trunk/reactos/base/applications/mscutils/servman/lang/nb-NO.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/mscutils/servman/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/rsrc.rc [iso-8859-1] Thu Jul 10 01:51:18 2008 @@ -25,6 +25,7 @@ #include "lang/id-ID.rc" #include "lang/it-IT.rc" #include "lang/ko-KR.rc" +#include "lang/nb-NO.rc" #include "lang/pl-PL.rc" #include "lang/ru-RU.rc" #include "lang/th-TH.rc" Added: trunk/reactos/base/applications/sndvol32/lang/nb-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndvol32… ============================================================================== --- trunk/reactos/base/applications/sndvol32/lang/nb-NO.rc (added) +++ trunk/reactos/base/applications/sndvol32/lang/nb-NO.rc [iso-8859-1] Thu Jul 10 01:51:18 2008 @@ -1,0 +1,43 @@ +LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL + +IDM_MAINMENU MENU DISCARDABLE +BEGIN + POPUP "I&nnstillinger" + BEGIN + MENUITEM "E&genskaper", IDC_PROPERTIES + MENUITEM "&Avansert Kontroller", IDC_ADVANCED_CONTROLS + MENUITEM SEPARATOR + MENUITEM "A&vslutt", IDC_EXIT + END + POPUP "&Hjelp" + BEGIN + MENUITEM "&Emner i hjelp", IDC_HELP_TOPICS + MENUITEM SEPARATOR + MENUITEM "&Om Volumkontroll", IDC_ABOUT + END +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_SNDVOL32 "Volumkontroll" + IDS_NOMIXERDEVICES "Det er ingen aktive mikser enheter tilgjengelig! Programmet vil nå avsluttes." +END + +IDD_PREFERENCES DIALOGEX 0, 0, 224, 250 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Egenskaper" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "&Mikser enhet:", -1, 7,8,48,9 + COMBOBOX IDC_MIXERDEVICE, 55,8,162,80, CBS_DROPDOWNLIST | WS_TABSTOP + GROUPBOX "Still volumet for:", -1, 7,25,211,77 + PUSHBUTTON "&Avspilling", IDC_PLAYBACK, 13,43,47,8, BS_AUTORADIOBUTTON + PUSHBUTTON "&Innspilling", IDC_RECORDING, 13,61,47,8, BS_AUTORADIOBUTTON + PUSHBUTTON "&Andre:", IDC_OTHER, 13,80,42,8, BS_AUTORADIOBUTTON | WS_DISABLED + COMBOBOX IDC_LINE, 55,80,155,50, CBS_DROPDOWNLIST | WS_TABSTOP | WS_DISABLED + LTEXT "Vis følgende volumkontroller:", IDC_LABELCONTROLS, 7, 109, 162, 8 + CONTROL "", IDC_CONTROLS, "SysListView32", LVS_REPORT | LVS_NOCOLUMNHEADER | WS_TABSTOP | WS_BORDER, 7, 122, 211, 96 + + PUSHBUTTON "OK", IDOK, 114,226,50,14 + PUSHBUTTON "Avbryt", IDCANCEL, 168,226,50,14 +END Propchange: trunk/reactos/base/applications/sndvol32/lang/nb-NO.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/sndvol32/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndvol32… ============================================================================== --- trunk/reactos/base/applications/sndvol32/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/sndvol32/rsrc.rc [iso-8859-1] Thu Jul 10 01:51:18 2008 @@ -18,6 +18,7 @@ #include "lang/ja-JP.rc" #include "lang/lt-LT.rc" #include "lang/nl-NL.rc" +#include "lang/nb-NO.rc" #include "lang/pl-PL.rc" #include "lang/pt-BR.rc" #include "lang/ru-RU.rc" Modified: trunk/reactos/base/applications/winhlp32/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/lang/bg-BG.rc [iso-8859-1] Thu Jul 10 01:51:18 2008 @@ -74,12 +74,12 @@ STID_INFO, "Èíôîðìàöèÿ" STID_NOT_IMPLEMENTED, "Íå å ðåàëèçèðàíî" STID_HLPFILE_ERROR_s, "Ãðåøêà ïðè ÷åòåíå íà ïîìîùíèÿ ôàéë `%s'" -STID_CONTENTS, "&Ñúäúðæàíèå" -STID_SEARCH, "&Òúðñè" +STID_INDEX, "&Ñúäúðæàíèå" +STID_CONTENTS, "Summary" STID_BACK, "&Íàçàä" -STID_TOPICS, "&Òåìè" STID_ALL_FILES, "Âñè÷êè ôàéëîâå (*.*)" STID_HELP_FILES_HLP, "Ïîìîùíè ôàéëîâå (*.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" +STID_PSH_INDEX, "Help topics: " } Modified: trunk/reactos/base/applications/winhlp32/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/lang/cs-CZ.rc [iso-8859-1] Thu Jul 10 01:51:18 2008 @@ -79,12 +79,12 @@ STID_INFO, "Informace" STID_NOT_IMPLEMENTED, "Není implementováno" STID_HLPFILE_ERROR_s, "Nelze pøeèíst soubor nápovìdy `%s'" -STID_CONTENTS, "&Obsah" -STID_SEARCH, "&Hledat" +STID_INDEX, "&Obsah" +STID_CONTENTS, "Summary" STID_BACK, "&Zpìt" -STID_TOPICS, "&Témata" STID_ALL_FILES, "Vechny soubory (*.*)" STID_HELP_FILES_HLP, "Soubory nápovìdy (*.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" +STID_PSH_INDEX, "Help topics: " } Modified: trunk/reactos/base/applications/winhlp32/lang/da-DK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/lang/da-DK.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/lang/da-DK.rc [iso-8859-1] Thu Jul 10 01:51:18 2008 @@ -86,12 +86,12 @@ STID_INFO, "Information" STID_NOT_IMPLEMENTED, "Ikke implementeret" STID_HLPFILE_ERROR_s, "Fejl ved indlæsning af filen `%s'" -STID_CONTENTS, "&Indhold" -STID_SEARCH, "&Søg" +STID_INDEX, "&Indhold" +STID_CONTENTS, "Summary" STID_BACK, "&Tilbage" -STID_TOPICS, "&Emner" STID_ALL_FILES, "Alle filer (*.*)" STID_HELP_FILES_HLP, "Hjælpe filer (*.hlp)" STID_FILE_NOT_FOUND_s "Kan ikke finde '%s'. Vil du selv finde filen?" STID_NO_RICHEDIT "Kan ikke finde en 'richedit' implementering... Afbryder" +STID_PSH_INDEX, "Help topics: " } Modified: trunk/reactos/base/applications/winhlp32/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/lang/de-DE.rc [iso-8859-1] Thu Jul 10 01:51:18 2008 @@ -86,14 +86,14 @@ STID_INFO, "Information" STID_NOT_IMPLEMENTED, "Nicht implementiert" STID_HLPFILE_ERROR_s, "Fehler beim Lesen der Hilfe-Datei `%s'" -STID_CONTENTS, "&Inhalt" -STID_SEARCH, "&Suchen" +STID_INDEX, "&Inhalt" +STID_CONTENTS, "Summary" STID_BACK, "&Zurück" -STID_TOPICS, "&Themen" STID_ALL_FILES, "Alle Dateien (*.*)" STID_HELP_FILES_HLP, "Hilfe-Dateien (*.hlp)" STID_FILE_NOT_FOUND_s "'%s' konnte nicht gefunden werden. Wollen Sie selber nach dieser Datei suchen?" STID_NO_RICHEDIT "Die Richedit Implementation konnte nicht gefunden werden... Breche ab." +STID_PSH_INDEX, "Help topics: " } CONTEXT_MENU MENU LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL Modified: trunk/reactos/base/applications/winhlp32/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/lang/en-US.rc [iso-8859-1] Thu Jul 10 01:51:18 2008 @@ -76,6 +76,14 @@ PUSHBUTTON "&Cancel", IDCANCEL, 120, 170, 50, 12 } +IDD_SEARCH DIALOG DISCARDABLE 0, 0, 200, 190 LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +CAPTION "Search" +{ + LTEXT "Not implemented yet", -1, 10, 10, 180, 150 +} + /* Strings */ STRINGTABLE DISCARDABLE LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT { @@ -85,14 +93,14 @@ STID_INFO, "Information" STID_NOT_IMPLEMENTED, "Not implemented" STID_HLPFILE_ERROR_s, "Error while reading the help file `%s'" -STID_CONTENTS, "&Contents" -STID_SEARCH, "&Search" +STID_INDEX, "&Index" +STID_CONTENTS, "Summary" STID_BACK, "&Back" -STID_TOPICS, "&Topics" STID_ALL_FILES, "All files (*.*)" STID_HELP_FILES_HLP, "Help files (*.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" +STID_PSH_INDEX, "Help topics: " } CONTEXT_MENU MENU LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT Modified: trunk/reactos/base/applications/winhlp32/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/lang/es-ES.rc [iso-8859-1] Thu Jul 10 01:51:18 2008 @@ -76,12 +76,12 @@ STID_INFO, "Información" STID_NOT_IMPLEMENTED, "Aún no implementado" STID_HLPFILE_ERROR_s, "Error al leer el archivo de ayuda `%s'" -STID_CONTENTS, "&Índice" -STID_SEARCH, "&Buscar" +STID_INDEX, "&Índice" +STID_CONTENTS, "Summary" STID_BACK, "&Anterior" -STID_TOPICS, "&Temas" STID_ALL_FILES, "Todos los archivos (*.*)" STID_HELP_FILES_HLP, "Archivos de ayuda (*.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" +STID_PSH_INDEX, "Help topics: " } Modified: trunk/reactos/base/applications/winhlp32/lang/fi-FI.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/lang/fi-FI.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/lang/fi-FI.rc [iso-8859-1] Thu Jul 10 01:51:18 2008 @@ -77,12 +77,12 @@ STID_INFO, "Tietoja" STID_NOT_IMPLEMENTED, "Ei käytettävissä" STID_HLPFILE_ERROR_s, "Virhe luettaessa ohjetiedostoa `%s'" -STID_CONTENTS, "&Sisällys" -STID_SEARCH, "&Etsi" +STID_INDEX, "&Sisällys" +STID_CONTENTS, "Summary" STID_BACK, "&Takaisin" -STID_TOPICS, "T&opics" STID_ALL_FILES, "Kaikki tiedostot (*.*)" STID_HELP_FILES_HLP, "Ohjetiedostot (*.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" +STID_PSH_INDEX, "Help topics: " } Modified: trunk/reactos/base/applications/winhlp32/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/lang/fr-FR.rc [iso-8859-1] Thu Jul 10 01:51:18 2008 @@ -88,14 +88,14 @@ STID_INFO, "Information" STID_NOT_IMPLEMENTED, "Non implémenté" STID_HLPFILE_ERROR_s, "Une erreur est survenue en lisant le fichier d'aide « %s »" -STID_CONTENTS, "&Index" -STID_SEARCH, "&Rechercher" +STID_INDEX, "&Index" +STID_CONTENTS, "Sommaire" STID_BACK, "&Précédent" -STID_TOPICS, "&Sujets" STID_ALL_FILES, "Tous fichiers (*.*)" STID_HELP_FILES_HLP, "Fichiers d'aide (*.hlp)" STID_FILE_NOT_FOUND_s "Impossible de trouver « %s ». Souhaitez-vous rechercher ce fichier vous-même ?" STID_NO_RICHEDIT "La bibliothèque RichEdit n'a pu être localisée... Abandon" +STID_PSH_INDEX, "Rubriques d'aide : " } CONTEXT_MENU MENU Modified: trunk/reactos/base/applications/winhlp32/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/lang/hu-HU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/lang/hu-HU.rc [iso-8859-1] Thu Jul 10 01:51:18 2008 @@ -77,12 +77,12 @@ STID_INFO, "Információ" STID_NOT_IMPLEMENTED, "Nincs implementálva" STID_HLPFILE_ERROR_s, "Hiba a `%s' file olvasásakor" -STID_CONTENTS, "&Tartalom" -STID_SEARCH, "&Keresés" +STID_INDEX, "&Tartalom" +STID_CONTENTS, "Summary" STID_BACK, "&Vissza" -STID_TOPICS, "&Témakörök" STID_ALL_FILES, "Minden fájl (*.*)" STID_HELP_FILES_HLP, "Súgó fájlok (*.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" +STID_PSH_INDEX, "Help topics: " } Modified: trunk/reactos/base/applications/winhlp32/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/lang/it-IT.rc [iso-8859-1] Thu Jul 10 01:51:18 2008 @@ -76,12 +76,12 @@ STID_INFO, "Informazione" STID_NOT_IMPLEMENTED, "Non ancora implementato" STID_HLPFILE_ERROR_s, "Errore di lettura del file della Guida `%s'" -STID_CONTENTS, "&Sommario" -STID_SEARCH, "&Trova" +STID_INDEX, "Index" +STID_CONTENTS, "&Sommario" STID_BACK, "&Precedente" -STID_TOPICS, "&Argomenti" STID_ALL_FILES, "Tutti i file (*.*)" STID_HELP_FILES_HLP, "File della Guida (*.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" +STID_PSH_INDEX, "Help topics: " } Modified: trunk/reactos/base/applications/winhlp32/lang/ko-KR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/lang/ko-KR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/lang/ko-KR.rc [iso-8859-1] Thu Jul 10 01:51:18 2008 @@ -88,14 +88,14 @@ STID_INFO, "Á¤º¸" STID_NOT_IMPLEMENTED, "±¸ÇöµÇÁö ¾Ê¾ÒÀ½" STID_HLPFILE_ERROR_s, "µµ¿ò¸» ÆÄÀÏ `%s'¸¦ ÀÐ´Â µµÁß ¿À·ù ¹ß»ý" -STID_CONTENTS, "¸ñÂ÷(&C)" -STID_SEARCH, "Ã£±â(&S)" +STID_INDEX, "¸ñÂ÷(&C)" +STID_CONTENTS, "¿ä¾à" STID_BACK, "µÚ·Î(&B)" -STID_TOPICS, "¸ñÂ÷(&T)" STID_ALL_FILES, "¸ðµç ÆÄÀÏ (*.*)" STID_HELP_FILES_HLP, "µµ¿ò¸» ÆÄÀÏ (*.hlp)" STID_FILE_NOT_FOUND_s "%sÀ» Ã£À» ¼ö ¾ø½À´Ï´Ù'. ÀÌ ÆÄÀÏÀ» Á÷Á¢ Ã£°Ú½À´Ï±î?" STID_NO_RICHEDIT "richedit ±¸ÇöÀ» Ã£À»¼ö ¾÷½À´Ï´Ù.. Ãë¼ÒÁß" +STID_PSH_INDEX, "µµ¿ò¸» ¸ñÂ÷: " } CONTEXT_MENU MENU LANGUAGE LANG_KOREAN, SUBLANG_NEUTRAL 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 Jul 10 01:51:18 2008 @@ -26,41 +26,41 @@ 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 "&Options" { - POPUP "Help always visible" + POPUP "&Innstillinger" { + POPUP "Synlighet" BEGIN - MENUITEM "Default", MNID_OPTS_HELP_DEFAULT - MENUITEM "Visible", MNID_OPTS_HELP_VISIBLE - MENUITEM "Non visible", MNID_OPTS_HELP_NONVISIBLE + MENUITEM "Standard", MNID_OPTS_HELP_DEFAULT + MENUITEM "Synlig", MNID_OPTS_HELP_VISIBLE + MENUITEM "Ikke synlig", MNID_OPTS_HELP_NONVISIBLE END - MENUITEM "History", MNID_OPTS_HISTORY - POPUP "Fonts" + MENUITEM "Historikk", MNID_OPTS_HISTORY + POPUP "Skriftstørrelse" BEGIN - MENUITEM "Small", MNID_OPTS_FONTS_SMALL + MENUITEM "Liten", MNID_OPTS_FONTS_SMALL MENUITEM "Normal", MNID_OPTS_FONTS_NORMAL - MENUITEM "Large", MNID_OPTS_FONTS_LARGE + MENUITEM "Stor", MNID_OPTS_FONTS_LARGE END - MENUITEM "Use system colors", MNID_OPTS_SYSTEM_COLORS + MENUITEM "Bruk systemfarger", MNID_OPTS_SYSTEM_COLORS } 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 + MENUITEM "&Om Wine", MNID_HELP_WINE #endif } } @@ -83,13 +83,36 @@ STID_WARNING, "ADVARSEL" STID_INFO, "Informasjon" STID_NOT_IMPLEMENTED, "Ikke implementert" -STID_HLPFILE_ERROR_s, "Feil ved lesing av hjelpefilen '%s'" -STID_CONTENTS, "&Innhold" -STID_SEARCH, "&Søk" +STID_HLPFILE_ERROR_s, "Klarte ikke lese hjelpefilen «%s»" +STID_INDEX, "&Innhold" +STID_CONTENTS, "&Oppsummering" STID_BACK, "Til&bake" -STID_TOPICS, "&Emner" STID_ALL_FILES, "Alle filer (*.*)" STID_HELP_FILES_HLP, "Hjelp-filer (*.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" +STID_FILE_NOT_FOUND_s "Klarte ikke finne «%s». Vil du finne filen selv?" +STID_NO_RICHEDIT "Klarte ikke finne richedit; avbryter" +STID_PSH_INDEX, "Emner i Hjelp: " } + +CONTEXT_MENU MENU LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL +BEGIN + POPUP "" + BEGIN + MENUITEM "Kommentar ...", MNID_CTXT_ANNOTATE + MENUITEM "Kopier", MNID_CTXT_COPY + MENUITEM "Skriv ut ...", MNID_CTXT_PRINT + POPUP "Skriftstørrelse" + BEGIN + MENUITEM "Liten", MNID_CTXT_FONTS_SMALL + MENUITEM "Normal", MNID_CTXT_FONTS_NORMAL + MENUITEM "Stor", MNID_CTXT_FONTS_LARGE + END + POPUP "Synlighet" + BEGIN + MENUITEM "Standard", MNID_CTXT_HELP_DEFAULT + MENUITEM "Synlig", MNID_CTXT_HELP_VISIBLE + MENUITEM "Ikke synlig", MNID_CTXT_HELP_NONVISIBLE + END + MENUITEM "Bruk systemfarger", MNID_CTXT_SYSTEM_COLORS + END +END Modified: trunk/reactos/base/applications/winhlp32/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/lang/nl-NL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/lang/nl-NL.rc [iso-8859-1] Thu Jul 10 01:51:18 2008 @@ -85,14 +85,14 @@ STID_INFO, "Informatie" STID_NOT_IMPLEMENTED, "Niet geïmplementeerd" STID_HLPFILE_ERROR_s, "Fout bij het lezen van het helpbestand `%s'" -STID_CONTENTS, "&Inhoud" -STID_SEARCH, "&Zoeken" +STID_INDEX, "&Inhoud" +STID_CONTENTS, "Summary" STID_BACK, "&Terug" -STID_TOPICS, "&Onderwerpen" STID_ALL_FILES, "Alle bestanden (*.*)" STID_HELP_FILES_HLP, "Helpbestanden (*.hlp)" STID_FILE_NOT_FOUND_s "Kan '%s' niet openen. Wilt u zelf dit bestand zoeken?" STID_NO_RICHEDIT "Cannot find a richedit implementation... Aborting" +STID_PSH_INDEX, "Help topics: " } CONTEXT_MENU MENU LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL Modified: trunk/reactos/base/applications/winhlp32/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/lang/pl-PL.rc [iso-8859-1] Thu Jul 10 01:51:18 2008 @@ -86,14 +86,14 @@ STID_INFO, "Informacja" STID_NOT_IMPLEMENTED, "Nie zaimplementowane" STID_HLPFILE_ERROR_s, "B³¹d w trakcie odczytu pliku pomocy `%s'" -STID_CONTENTS, "&Zawartoæ" -STID_SEARCH, "&Szukaj" +STID_INDEX, "&Zawartoæ" +STID_CONTENTS, "&Szukaj" STID_BACK, "&Wstecz" -STID_TOPICS, "&Tematy" STID_ALL_FILES, "Wszystkie pliki (*.*)" STID_HELP_FILES_HLP, "Pliki pomocy (*.hlp)" STID_FILE_NOT_FOUND_s "Nie znaleziono pliku '%s'. Czy chcesz poszukaæ tego pliku samodzielnie?" STID_NO_RICHEDIT "Nie uda³o siê znaleæ modu³u richedit... Wywietlenie pomocy nie jest mo¿liwe" +STID_PSH_INDEX, "Help topics: " } Modified: trunk/reactos/base/applications/winhlp32/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/lang/pt-BR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/lang/pt-BR.rc [iso-8859-1] Thu Jul 10 01:51:18 2008 @@ -131,14 +131,14 @@ STID_INFO, "Informação" STID_NOT_IMPLEMENTED, "Não implementado" STID_HLPFILE_ERROR_s, "Erro encontrado na leitura do arquivo de ajuda '%s'" -STID_CONTENTS, "&Conteúdo" -STID_SEARCH, "&Procurar" +STID_INDEX, "&Conteúdo" +STID_CONTENTS, "Summary" STID_BACK, "&Voltar" -STID_TOPICS, "&Tópicos" STID_ALL_FILES, "Todos os arquivos (*.*)" STID_HELP_FILES_HLP, "Arquivos de ajuda (*.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" +STID_PSH_INDEX, "Help topics: " } LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE @@ -151,12 +151,12 @@ STID_INFO, "Informação" STID_NOT_IMPLEMENTED, "Não implementado" STID_HLPFILE_ERROR_s, "Erro encontrado na leitura do ficheiro de ajuda '%s'" -STID_CONTENTS, "&Conteúdo" -STID_SEARCH, "&Procurar" +STID_INDEX, "&Conteúdo" +STID_CONTENTS, "Summary" STID_BACK, "&Voltar" -STID_TOPICS, "&Tópicos" STID_ALL_FILES, "Todos os ficheiros (*.*)" STID_HELP_FILES_HLP, "Ficheiros de ajuda (*.hlp)" STID_FILE_NOT_FOUND_s "Não é possível encontrar '%s'. Deseja procurar este ficheiro você mesmo?" STID_NO_RICHEDIT "Cannot find a richedit implementation... Aborting" +STID_PSH_INDEX, "Help topics: " } Modified: trunk/reactos/base/applications/winhlp32/lang/rm-CH.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/lang/rm-CH.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/lang/rm-CH.rc [iso-8859-1] Thu Jul 10 01:51:18 2008 @@ -79,12 +79,12 @@ 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_INDEX, "&Cuntgnï¿½" +STID_CONTENTS, "Summary" STID_BACK, "&Inavo" -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" +STID_PSH_INDEX, "Help topics: " } Modified: trunk/reactos/base/applications/winhlp32/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/lang/ru-RU.rc [iso-8859-1] Thu Jul 10 01:51:18 2008 @@ -38,21 +38,21 @@ POPUP "&Çàêëàäêà" { MENUITEM "&Îïðåäåëèòü...", MNID_BKMK_DEFINE } - POPUP "&Options" { - POPUP "Help always visible" + POPUP "&Íàñòðîéêè" { + POPUP "Âèäèìîñòü îêíà ñïðàâêè" BEGIN - MENUITEM "Default", MNID_OPTS_HELP_DEFAULT - MENUITEM "Visible", MNID_OPTS_HELP_VISIBLE - MENUITEM "Non visible", MNID_OPTS_HELP_NONVISIBLE + MENUITEM "Ïî óìîë÷àíèþ", MNID_OPTS_HELP_DEFAULT + MENUITEM "Íàâåðõó", MNID_OPTS_HELP_VISIBLE + MENUITEM "Íå íàâåðõó", MNID_OPTS_HELP_NONVISIBLE END - MENUITEM "History", MNID_OPTS_HISTORY - POPUP "Fonts" + MENUITEM "Èñòîðèÿ", MNID_OPTS_HISTORY + POPUP "Øðèôò" BEGIN - MENUITEM "Small", MNID_OPTS_FONTS_SMALL - MENUITEM "Normal", MNID_OPTS_FONTS_NORMAL - MENUITEM "Large", MNID_OPTS_FONTS_LARGE + MENUITEM "Ìåëêèé", MNID_OPTS_FONTS_SMALL + MENUITEM "Îáû÷íûé", MNID_OPTS_FONTS_NORMAL + MENUITEM "Êðóïíûé", MNID_OPTS_FONTS_LARGE END - MENUITEM "Use system colors", MNID_OPTS_SYSTEM_COLORS + MENUITEM "Èñïîëüçîâàòü ñèñòåìíûå öâåòà", MNID_OPTS_SYSTEM_COLORS } POPUP "&Ñïðàâêà" { MENUITEM "Ïîìîùü &ïî ïîìîùè", MNID_HELP_HELPON @@ -84,14 +84,14 @@ STID_INFO, "Èíôîðìàöèÿ" STID_NOT_IMPLEMENTED, "Íå ðåàëèçîâàííî" STID_HLPFILE_ERROR_s, "Îøèáêà ïðè ÷òåíèè ôàéëà ïîìîùè `%s'" -STID_CONTENTS, "&Ñîäåðæàíèå" -STID_SEARCH, "&Íàéòè" +STID_INDEX, "&Ñîäåðæàíèå" +STID_CONTENTS, "Summary" STID_BACK, "&Íàçàä" -STID_TOPICS, "&Óêàçàòåëü" STID_ALL_FILES, "Âñå ôàéëû (*.*)" STID_HELP_FILES_HLP, "Ôàéëû ñïðàâêè (*.hlp)" STID_FILE_NOT_FOUND_s "Íå ìîãó íàéòè '%s'. Âû õîòèòå íàéòè ýòîò ôàéë ñàìîñòîÿòåëüíî?" STID_NO_RICHEDIT "Íå ìîãó íàéòè richedit" +STID_PSH_INDEX, "Help topics: " } CONTEXT_MENU MENU LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT 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 Jul 10 01:51:18 2008 @@ -72,12 +72,12 @@ STID_INFO, "Informácie" STID_NOT_IMPLEMENTED, "Neimplementované" STID_HLPFILE_ERROR_s, "Chyba poèas èítania súboru `%s'" -STID_CONTENTS, "&Obsah" -STID_SEARCH, "&H¾ada" +STID_INDEX, "&Obsah" +STID_CONTENTS, "Summary" STID_BACK, "&Spä" -STID_TOPICS, "&Topics" STID_ALL_FILES, "Vetky súbory (*.*)" STID_HELP_FILES_HLP, "Súbory pomoci (*.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" +STID_PSH_INDEX, "Help topics: " } Modified: trunk/reactos/base/applications/winhlp32/lang/sl-SI.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/lang/sl-SI.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/lang/sl-SI.rc [iso-8859-1] Thu Jul 10 01:51:18 2008 @@ -86,14 +86,14 @@ STID_INFO, "Informacija" STID_NOT_IMPLEMENTED, "Ni (Å¡e) na voljo" STID_HLPFILE_ERROR_s, "Napaka pri branju datoteke s pomoÄjo `%s'" -STID_CONTENTS, "&Teme pomoÄi" -STID_SEARCH, "&Iskanje" +STID_INDEX, "&Teme pomoÄi" +STID_CONTENTS, "Summart" STID_BACK, "&Nazaj" -STID_TOPICS, "&Vsebina" STID_ALL_FILES, "Vse datoteke (*.*)" STID_HELP_FILES_HLP, "Datoteke s pomoÄjo (*.hlp)" STID_FILE_NOT_FOUND_s "Ne najdem datoteke '%s'. Ali jo Å¾elite poiskati sami?" STID_NO_RICHEDIT "Cannot find a richedit implementation... Aborting" +STID_PSH_INDEX, "Help topics: " } #pragma code_page(default) Modified: trunk/reactos/base/applications/winhlp32/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/lang/sv-SE.rc [iso-8859-1] Thu Jul 10 01:51:18 2008 @@ -77,12 +77,12 @@ STID_INFO, "Information" STID_NOT_IMPLEMENTED, "Inte implementerat" STID_HLPFILE_ERROR_s, "Fel vid lÃ¤sning av hjÃ¤lpfilen `%s'" -STID_CONTENTS, "&InnehÃ¥ll" -STID_SEARCH, "&SÃ¶k" +STID_INDEX, "&InnehÃ¥ll" +STID_CONTENTS, "Summary" STID_BACK, "&BakÃ¥t" -STID_TOPICS, "&Ãmnen" STID_ALL_FILES, "Alla filer (*.*)" STID_HELP_FILES_HLP, "HjÃ¤lpfiler (*.hlp)" STID_FILE_NOT_FOUND_s "Kan inte hitta '%s'. Vill du sÃ¶ka efter denna fil?" STID_NO_RICHEDIT "Cannot find a richedit implementation... Aborting" +STID_PSH_INDEX, "Help topics: " } Modified: trunk/reactos/base/applications/winhlp32/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/lang/tr-TR.rc [iso-8859-1] Thu Jul 10 01:51:18 2008 @@ -74,12 +74,12 @@ STID_INFO, "Bilgi" STID_NOT_IMPLEMENTED, "Henüz tamamlanmadý" STID_HLPFILE_ERROR_s, "'%s' yardým dosyasý açýlýrken hata" -STID_CONTENTS, "&Ýçindekiler" -STID_SEARCH, "&Ara" +STID_INDEX, "&Ýçindekiler" +STID_CONTENTS, "Summary" STID_BACK, "&Geri" -STID_TOPICS, "&Konular" STID_ALL_FILES, "Tüm dosyalar (*.*)" STID_HELP_FILES_HLP, "Yardým dosyalarý (*.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" +STID_PSH_INDEX, "Help topics: " } Modified: trunk/reactos/base/applications/winhlp32/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/lang/zh-CN.rc [iso-8859-1] Thu Jul 10 01:51:18 2008 @@ -75,12 +75,12 @@ STID_INFO, "ÐÅÏ¢" STID_NOT_IMPLEMENTED, "Î´ÊµÏÖ" STID_HLPFILE_ERROR_s, "¶ÁÈë°ïÖúÎÄ¼þ ¡®%s¡¯ Ê±·¢Éú´íÎó" -STID_CONTENTS, "ÄÚÈÝ£¨&C£©" -STID_SEARCH, "ËÑË÷£¨&S£©" +STID_INDEX, "ÄÚÈÝ£¨&C£©" +STID_CONTENTS, "Summary" STID_BACK, "·µ»Ø£¨&B£©" -STID_TOPICS, "Ö÷Ìâ£¨&T£©" STID_ALL_FILES, "ËùÓÐÎÄ¼þ (*.*)" STID_HELP_FILES_HLP, "°ïÖúÎÄ¼þ (*.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" +STID_PSH_INDEX, "Help topics: " } Modified: trunk/reactos/base/applications/winhlp32/lex.yy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/lex.yy.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/lex.yy.c [iso-8859-1] Thu Jul 10 01:51:18 2008 @@ -403,6 +403,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define YY_NO_INPUT 1 #define YY_NO_UNPUT 1 #define quote 1 @@ -429,7 +430,7 @@ #define YY_INPUT(buf,result,max_size)\ if ((result = *macroptr ? 1 : 0)) buf[0] = *macroptr++; -#line 433 "lex.yy.c" +#line 434 "lex.yy.c" /* Macros after this point can all be overridden by user definitions in * section 1. @@ -583,7 +584,7 @@ #line 49 "macro.lex.l" -#line 587 "lex.yy.c" +#line 588 "lex.yy.c" if ( yy_init ) { @@ -753,7 +754,7 @@ #line 97 "macro.lex.l" ECHO; YY_BREAK -#line 757 "lex.yy.c" +#line 758 "lex.yy.c" case YY_STATE_EOF(INITIAL): yyterminate(); Modified: trunk/reactos/base/applications/winhlp32/macro.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/macro.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/macro.c [iso-8859-1] Thu Jul 10 01:51:18 2008 @@ -517,7 +517,7 @@ void CALLBACK MACRO_Finder(void) { - WINHELP_CreateIndexWindow(); + WINHELP_CreateIndexWindow(FALSE); } void CALLBACK MACRO_FloatingMenu(void) @@ -880,7 +880,7 @@ void CALLBACK MACRO_Search(void) { - WINE_FIXME("()\n"); + WINHELP_CreateIndexWindow(TRUE); } void CALLBACK MACRO_SetContents(LPCSTR str, LONG u) Modified: trunk/reactos/base/applications/winhlp32/macro.lex.l URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/macro.lex.l [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/macro.lex.l [iso-8859-1] Thu Jul 10 01:51:18 2008 @@ -20,7 +20,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ %} -%option nounput interactive 8bit +%option noinput nounput interactive 8bit %x quote %{ #include "config.h" 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 Jul 10 01:51:18 2008 @@ -32,7 +32,7 @@ #include "lang/cs-CZ.rc" #include "lang/da-DK.rc" #include "lang/de-DE.rc" -#include "lang/el-GR.rc" +// #include "lang/el-GR.rc" #include "lang/en-US.rc" #include "lang/es-ES.rc" #include "lang/fi-FI.rc" @@ -40,16 +40,16 @@ #include "lang/hu-HU.rc" #include "lang/it-IT.rc" #include "lang/ko-KR.rc" -#include "lang/lt-LT.rc" +// #include "lang/lt-LT.rc" #include "lang/nl-NL.rc" #include "lang/nb-NO.rc" #include "lang/pl-PL.rc" #include "lang/pt-BR.rc" -//#include "lang/rm-CH.rc" +// #include "lang/rm-CH.rc" #include "lang/ru-RU.rc" #include "lang/sl-SI.rc" #include "lang/sk-SK.rc" #include "lang/sv-SE.rc" #include "lang/tr-TR.rc" -#include "lang/uk-UA.rc" +// #include "lang/uk-UA.rc" #include "lang/zh-CN.rc" Modified: trunk/reactos/base/applications/winhlp32/winhelp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/winhelp.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/winhelp.c [iso-8859-1] Thu Jul 10 01:51:18 2008 @@ -26,6 +26,9 @@ #include <string.h> #include <stdarg.h> #include <stdlib.h> + +#define NONAMELESSUNION +#define NONAMELESSSTRUCT #include "windef.h" #include "winbase.h" @@ -36,6 +39,7 @@ #include "winhelp_res.h" #include "shellapi.h" #include "richedit.h" +#include "commctrl.h" #include "wine/debug.h" @@ -623,13 +627,11 @@ LoadString(Globals.hInstance, STID_CONTENTS, buffer, sizeof(buffer)); MACRO_CreateButton("BTN_CONTENTS", buffer, "Contents()"); - LoadString(Globals.hInstance, STID_SEARCH,buffer, sizeof(buffer)); - MACRO_CreateButton("BTN_SEARCH", buffer, "Search()"); + LoadString(Globals.hInstance, STID_INDEX, buffer, sizeof(buffer)); + MACRO_CreateButton("BTN_INDEX", buffer, "Finder()"); LoadString(Globals.hInstance, STID_BACK, buffer, sizeof(buffer)); MACRO_CreateButton("BTN_BACK", buffer, "Back()"); if (win->back.index <= 1) MACRO_DisableButton("BTN_BACK"); - LoadString(Globals.hInstance, STID_TOPICS, buffer, sizeof(buffer)); - MACRO_CreateButton("BTN_TOPICS", buffer, "Finder()"); } if (!bReUsed) @@ -860,7 +862,9 @@ case MNID_FILE_EXIT: MACRO_Exit(); break; /* Menu EDIT */ - case MNID_EDIT_COPYDLG: MACRO_CopyDialog(); break; + case MNID_EDIT_COPYDLG: + SendMessage(GetDlgItem(hWnd, CTL_ID_TEXT), WM_COPY, 0, 0); + break; case MNID_EDIT_ANNOTATE:MACRO_Annotate(); break; /* Menu Bookmark */ @@ -931,6 +935,14 @@ /* EPP break; */ case WM_COPYDATA: return WINHELP_HandleCommand((HWND)wParam, lParam); + + case WM_CHAR: + if (wParam == 3) + { + SendMessage(GetDlgItem(hWnd, CTL_ID_TEXT), WM_COPY, 0, 0); + return 0; + } + break; case WM_KEYDOWN: keyDelta = 0; @@ -1536,6 +1548,13 @@ *next = (char*)p + strlen((char*)p) + 7; } +struct index_data +{ + HLPFILE* hlpfile; + BOOL jump; + ULONG offset; +}; + /************************************************************************** * WINHELP_IndexDlgProc * @@ -1546,23 +1565,24 @@ * >1: valid offset value +2. * EndDialog itself can return 0 (error). */ -INT_PTR CALLBACK WINHELP_SearchDlgProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) -{ - static HLPFILE *file; +INT_PTR CALLBACK WINHELP_IndexDlgProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) +{ + static struct index_data* id; int sel; - ULONG offset = 1; switch (msg) { case WM_INITDIALOG: - file = (HLPFILE *)lParam; - HLPFILE_BPTreeEnum(file->kwbtree, cb_KWBTree, + id = (struct index_data*)((PROPSHEETPAGE*)lParam)->lParam; + HLPFILE_BPTreeEnum(id->hlpfile->kwbtree, cb_KWBTree, GetDlgItem(hWnd, IDC_INDEXLIST)); + id->jump = FALSE; + id->offset = 1; return TRUE; - case WM_COMMAND: - switch (LOWORD(wParam)) - { - case IDOK: + case WM_NOTIFY: + switch (((NMHDR*)lParam)->code) + { + case PSN_APPLY: sel = SendDlgItemMessage(hWnd, IDC_INDEXLIST, LB_GETCURSEL, 0, 0); if (sel != LB_ERR) { @@ -1575,24 +1595,54 @@ if (count > 1) { MessageBox(hWnd, "count > 1 not supported yet", "Error", MB_OK | MB_ICONSTOP); + SetWindowLongPtr(hWnd, DWLP_MSGRESULT, PSNRET_INVALID); return TRUE; } - offset = *(ULONG*)((char *)p + strlen((char *)p) + 3); - offset = *(long*)(file->kwdata + offset + 9); - if (offset == 0xFFFFFFFF) + id->offset = *(ULONG*)((char *)p + strlen((char *)p) + 3); + id->offset = *(long*)(id->hlpfile->kwdata + id->offset + 9); + if (id->offset == 0xFFFFFFFF) { MessageBox(hWnd, "macro keywords not supported yet", "Error", MB_OK | MB_ICONSTOP); + SetWindowLongPtr(hWnd, DWLP_MSGRESULT, PSNRET_INVALID); return TRUE; } - offset += 2; + id->jump = TRUE; + SetWindowLongPtr(hWnd, DWLP_MSGRESULT, PSNRET_NOERROR); } - /* Fall through */ - case IDCANCEL: - EndDialog(hWnd, offset); return TRUE; default: - break; - } + return FALSE; + } + break; + default: + break; + } + return FALSE; +} + +/************************************************************************** + * WINHELP_SearchDlgProc + * + */ +INT_PTR CALLBACK WINHELP_SearchDlgProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) +{ + static struct index_data* id; + + switch (msg) + { + case WM_INITDIALOG: + id = (struct index_data*)((PROPSHEETPAGE*)lParam)->lParam; + return TRUE; + case WM_NOTIFY: + switch (((NMHDR*)lParam)->code) + { + case PSN_APPLY: + SetWindowLongPtr(hWnd, DWLP_MSGRESULT, PSNRET_NOERROR); + return TRUE; + default: + return FALSE; + } + break; default: break; } @@ -1605,30 +1655,61 @@ * Displays a dialog with keywords of current help file. * */ -BOOL WINHELP_CreateIndexWindow(void) -{ - int ret; - HLPFILE *hlpfile; +BOOL WINHELP_CreateIndexWindow(BOOL is_search) +{ + HPROPSHEETPAGE psPage[3]; + PROPSHEETPAGE psp; + PROPSHEETHEADER psHead; + struct index_data id; + char buf[256]; if (Globals.active_win && Globals.active_win->page && Globals.active_win->page->file) - hlpfile = Globals.active_win->page->file; + id.hlpfile = Globals.active_win->page->file; else return FALSE; - if (hlpfile->kwbtree == NULL) + if (id.hlpfile->kwbtree == NULL) { WINE_TRACE("No index provided\n"); return FALSE; } - ret = DialogBoxParam(Globals.hInstance, MAKEINTRESOURCE(IDD_INDEX), - Globals.active_win->hMainWnd, WINHELP_SearchDlgProc, - (LPARAM)hlpfile); - if (ret > 1) - { - ret -= 2; - WINE_TRACE("got %d as an offset\n", ret); - WINHELP_OpenHelpWindow(HLPFILE_PageByOffset, hlpfile, ret, + InitCommonControls(); + + id.jump = FALSE; + memset(&psp, 0, sizeof(psp)); + psp.dwSize = sizeof(psp); + psp.dwFlags = 0; + psp.hInstance = Globals.hInstance; + + psp.u.pszTemplate = MAKEINTRESOURCE(IDD_INDEX); + psp.lParam = (LPARAM)&id; + psp.pfnDlgProc = WINHELP_IndexDlgProc; + psPage[0] = CreatePropertySheetPage(&psp); + + psp.u.pszTemplate = MAKEINTRESOURCE(IDD_SEARCH); + psp.lParam = (LPARAM)&id; + psp.pfnDlgProc = WINHELP_SearchDlgProc; + psPage[1] = CreatePropertySheetPage(&psp); + + memset(&psHead, 0, sizeof(psHead)); + psHead.dwSize = sizeof(psHead); + + LoadString(Globals.hInstance, STID_PSH_INDEX, buf, sizeof(buf)); + strcat(buf, Globals.active_win->info->caption); + + psHead.pszCaption = buf; + psHead.nPages = 2; + psHead.u2.nStartPage = is_search ? 1 : 0; + psHead.hwndParent = Globals.active_win->hMainWnd; + psHead.u3.phpage = psPage; + psHead.dwFlags = PSH_NOAPPLYNOW; + + PropertySheet(&psHead); + if (id.jump) + { + WINE_TRACE("got %d as an offset\n", id.offset); + WINHELP_OpenHelpWindow(HLPFILE_PageByOffset, id.hlpfile, id.offset, Globals.active_win->info, SW_NORMAL); } return TRUE; Modified: trunk/reactos/base/applications/winhlp32/winhelp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/winhelp.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/winhelp.h [iso-8859-1] Thu Jul 10 01:51:18 2008 @@ -146,7 +146,7 @@ BOOL WINHELP_OpenHelpWindow(HLPFILE_PAGE* (*)(HLPFILE*, LONG, ULONG*), HLPFILE*, LONG, HLPFILE_WINDOWINFO*, int); BOOL WINHELP_GetOpenFileName(LPSTR, int); -BOOL WINHELP_CreateIndexWindow(void); +BOOL WINHELP_CreateIndexWindow(BOOL); void WINHELP_DeleteBackSet(WINHELP_WINDOW*); INT WINHELP_MessageBoxIDS_s(UINT, LPCSTR, UINT, WORD); HLPFILE* WINHELP_LookupHelpFile(LPCSTR lpszFile); Modified: trunk/reactos/base/applications/winhlp32/winhelp_res.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/winhelp_res.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/winhelp_res.h [iso-8859-1] Thu Jul 10 01:51:18 2008 @@ -43,16 +43,17 @@ #define STID_NOT_IMPLEMENTED 0x124 #define STID_HLPFILE_ERROR_s 0x125 #define STID_CONTENTS 0x126 -#define STID_SEARCH 0x127 +#define STID_INDEX 0x127 #define STID_BACK 0x128 -#define STID_TOPICS 0x12A #define STID_ALL_FILES 0x12B #define STID_HELP_FILES_HLP 0x12C #define STID_DIALOG_TEST 0x12D #define STID_FILE_NOT_FOUND_s 0x12E #define STID_NO_RICHEDIT 0x12F +#define STID_PSH_INDEX 0x130 #define IDD_INDEX 0x150 #define IDC_INDEXLIST 0x151 +#define IDD_SEARCH 0x152 #define IDI_WINHELP 0xF00 Modified: trunk/reactos/base/applications/winhlp32/winhlp32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/winhlp32.rbuild [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/winhlp32.rbuild [iso-8859-1] Thu Jul 10 01:51:18 2008 @@ -6,6 +6,7 @@ <define name="_WIN32_WINNT">0x0501</define> <library>wine</library> <library>comdlg32</library> + <library>comctl32</library> <library>shell32</library> <library>user32</library> <library>gdi32</library>

1 0

[dreimer] 34400: Synched Winfile and write with Wine HEAD.
by dreimer＠svn.reactos.org 10 Jul '08

10 Jul '08

Author: dreimer Date: Thu Jul 10 01:38:14 2008 New Revision: 34400 URL: http://svn.reactos.org/svn/reactos?rev=34400&view=rev Log: Synched Winfile and write with Wine HEAD. Added: trunk/rosapps/applications/winfile/lang/pt-BR.rc (with props) trunk/rosapps/applications/write/lang/ro-RO.rc (with props) Removed: trunk/rosapps/applications/winfile/lang/pt-PT.rc Modified: trunk/rosapps/applications/winfile/lang/ko-KR.rc trunk/rosapps/applications/winfile/rsrc.rc trunk/rosapps/applications/write/rsrc.rc Modified: trunk/rosapps/applications/winfile/lang/ko-KR.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/lang/… ============================================================================== --- trunk/rosapps/applications/winfile/lang/ko-KR.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/winfile/lang/ko-KR.rc [iso-8859-1] Thu Jul 10 01:38:14 2008 @@ -22,7 +22,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT +LANGUAGE LANG_KOREAN, SUBLANG_NEUTRAL /* Menu */ Added: trunk/rosapps/applications/winfile/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/lang/… ============================================================================== --- trunk/rosapps/applications/winfile/lang/pt-BR.rc (added) +++ trunk/rosapps/applications/winfile/lang/pt-BR.rc [iso-8859-1] Thu Jul 10 01:38:14 2008 @@ -1,0 +1,385 @@ +/* + * WineFile + * Portuguese Language Support + * + * Copyright 2003 Marcelo Duarte + * Copyright 2004,2007 Américo José Melo + * + * 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 + */ + + +/* Menu */ + +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN + +IDM_WINEFILE MENU FIXED IMPURE +{ + POPUP "&Arquivo" { + MENUITEM "A&brir\tEnter", ID_ACTIVATE + MENUITEM "&Mover...\tF7", ID_FILE_MOVE + MENUITEM "&Copiar...\tF8", ID_FILE_COPY + MENUITEM "&In Clipboard...\tF9", 118 + MENUITEM "E&xcluir\tDel", ID_FILE_DELETE + MENUITEM "Re&nomear...", 109 + MENUITEM "&Propriedades...\tAlt+Enter", ID_EDIT_PROPERTIES + MENUITEM SEPARATOR + MENUITEM "C&omprimir...", 119 + MENUITEM "Descomprimir...", 120 + MENUITEM SEPARATOR + MENUITEM "Execu&tar...", ID_EXECUTE + MENUITEM "&Imprimir...", 102 + MENUITEM "A&ssociar...", 103 + MENUITEM SEPARATOR + MENUITEM "Cri&ar pasta...", 111 + MENUITEM "P&esquisar...", 104 + MENUITEM "Selecionar arqui&vos...", 116 + MENUITEM SEPARATOR +#ifndef _NO_EXTENSIONS + MENUITEM "Sai&r\tAlt+X", ID_FILE_EXIT +#else + MENUITEM "Sai&r", ID_FILE_EXIT +#endif + } + + POPUP "&Disco" { + MENUITEM "&Copiar disco...", 201 + MENUITEM "&Nomear disco...", 202 + MENUITEM SEPARATOR + MENUITEM "&Formatar disco...", ID_FORMAT_DISK +#ifdef _WIN95 + MENUITEM "&Gerar disco de sistema...", -1 /*TODO*/ +#endif + MENUITEM SEPARATOR + MENUITEM "Conecta&r unidade de rede", ID_CONNECT_NETWORK_DRIVE + MENUITEM "&Desconectar unidade de rede",ID_DISCONNECT_NETWORK_DRIVE + MENUITEM SEPARATOR + MENUITEM "C&ompartilhar como...", 254 + MENUITEM "&Remover compartilhamento...",255 + MENUITEM SEPARATOR + MENUITEM "Selecionar &unidade...", 251 + } + + POPUP "Á&rvore" { + MENUITEM "&Próximo nível\t+", 301 + MENUITEM "Expandi&r pasta\t*", 302 + MENUITEM "Expandir &tudo\tStrg+*", 303 + MENUITEM "Recolher p&asta\t-", 304 + MENUITEM SEPARATOR + MENUITEM "&Indicar subníveis", 505 + } + + POPUP "&Exibir" { + MENUITEM "Á&rvore e pasta", 413 + MENUITEM "S&omente árvore", 411 + MENUITEM "So&mente pasta", 412 + MENUITEM SEPARATOR + MENUITEM "&Dividir", ID_VIEW_SPLIT + MENUITEM SEPARATOR + MENUITEM "&Nome", ID_VIEW_NAME + MENUITEM "&Todos os delalhes", ID_VIEW_ALL_ATTRIBUTES, CHECKED + MENUITEM "D&etalhes parciais...", ID_VIEW_SELECTED_ATTRIBUTES + MENUITEM SEPARATOR + MENUITEM "&Classificar por nome", ID_VIEW_SORT_NAME + MENUITEM "C&lassificar por tipo", ID_VIEW_SORT_TYPE + MENUITEM "Cl&assificar por tamanho", ID_VIEW_SORT_SIZE + MENUITEM "Cla&ssificar por &data", ID_VIEW_SORT_DATE + MENUITEM SEPARATOR + MENUITEM "Classificar &por...", ID_VIEW_FILTER + } + + POPUP "&Opções" { + MENUITEM "&Confirmação...", 501 + MENUITEM "&Fonte...", ID_SELECT_FONT + MENUITEM "&Personalizar barra de ferramentas...", 512 + MENUITEM SEPARATOR + MENUITEM "Barra d&e ferramentas", ID_VIEW_TOOL_BAR, CHECKED + MENUITEM "&Barra de unidades", ID_VIEW_DRIVE_BAR, CHECKED + MENUITEM "B&arra de &status", ID_VIEW_STATUSBAR, CHECKED +#ifndef _NO_EXTENSIONS + MENUITEM "Tela Cheia\tCtrl+Shift+S", ID_VIEW_FULLSCREEN +#endif + MENUITEM SEPARATOR + MENUITEM "&Minimizar durante o uso", 504 + MENUITEM "&Salvar configurações ao sair",511 + } + + + POPUP "&Segurança" { + MENUITEM "&Acesso...", 605 + MENUITEM "&Logging...", 606 + MENUITEM "&Owner...", 607 + } + + POPUP "&Janela" { + MENUITEM "&Nova janela", ID_WINDOW_NEW + MENUITEM "&Em cascata\tCtrl+F5", ID_WINDOW_CASCADE + MENUITEM "Lado a lado &horizontalmente",ID_WINDOW_TILE_HORZ + MENUITEM "Lado a lado &verticalmente\tCtrl+F4",ID_WINDOW_TILE_VERT +#ifndef _NO_EXTENSIONS + MENUITEM "Organizar automaticamente", ID_WINDOW_AUTOSORT +#endif + MENUITEM "&Organizar ícones", ID_WINDOW_ARRANGE + MENUITEM "&Atualizar\tF5", ID_REFRESH + } + + POPUP "Aj&uda" { + MENUITEM "&Tópicos da ajuda\tF1", ID_HELP + MENUITEM "Pesquisar...", ID_HELP + MENUITEM "&Usando a ajuda", ID_HELP_USING + MENUITEM SEPARATOR + MENUITEM "&Sobre o Winefile...", ID_ABOUT + } +} + +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE + +IDM_WINEFILE MENU FIXED IMPURE +{ + POPUP "&Ficheiro" { + MENUITEM "A&brir\tEnter", ID_ACTIVATE + MENUITEM "&Mover...\tF7", ID_FILE_MOVE + MENUITEM "&Copiar...\tF8", ID_FILE_COPY + MENUITEM "&Na Area de Transferência...\tF9", 118 + MENUITEM "E&xcluir\tDel", ID_FILE_DELETE + MENUITEM "Re&nomear...", 109 + MENUITEM "&Propriedades...\tAlt+Enter", ID_EDIT_PROPERTIES + MENUITEM SEPARATOR + MENUITEM "C&omprimir...", 119 + MENUITEM "&Descomprimir...", 120 + MENUITEM SEPARATOR + MENUITEM "Execu&tar...", ID_EXECUTE + MENUITEM "&Imprimir...", 102 + MENUITEM "A&ssociar...", 103 + MENUITEM SEPARATOR + MENUITEM "Cri&ar pasta...", 111 + MENUITEM "P&esquisar...", 104 + MENUITEM "Seleccionar fichei&ros...", 116 + MENUITEM SEPARATOR +#ifndef _NO_EXTENSIONS + MENUITEM "Sai&r\tAlt+X", ID_FILE_EXIT +#else + MENUITEM "Sai&r", ID_FILE_EXIT +#endif + } + + POPUP "&Disco" { + MENUITEM "&Copiar disco...", 201 + MENUITEM "&Nomear disco...", 202 + MENUITEM SEPARATOR + MENUITEM "&Formatar disco...", ID_FORMAT_DISK +#ifdef _WIN95 + MENUITEM "&Gerar disco de sistema...", -1 /*TODO*/ +#endif + MENUITEM SEPARATOR + MENUITEM "Liga&r unidade de rede", ID_CONNECT_NETWORK_DRIVE + MENUITEM "&Desligar unidade de rede",ID_DISCONNECT_NETWORK_DRIVE + MENUITEM SEPARATOR + MENUITEM "&Partilhar como...", 254 + MENUITEM "&Remover partilha...", 255 + MENUITEM SEPARATOR + MENUITEM "Seleccionar &unidade...", 251 + } + + POPUP "Á&rvore" { + MENUITEM "&Próximo nível\t+", 301 + MENUITEM "Expandi&r pasta\t*", 302 + MENUITEM "Expandir &tudo\tStrg+*", 303 + MENUITEM "Recolher p&asta\t-", 304 + MENUITEM SEPARATOR + MENUITEM "&Indicar subníveis", 505 + } + + POPUP "&Exibir" { + MENUITEM "Á&rvore e pasta", 413 + MENUITEM "A&penas árvore", 411 + MENUITEM "Ap&enas pasta", 412 + MENUITEM SEPARATOR + MENUITEM "&Dividir", ID_VIEW_SPLIT + MENUITEM SEPARATOR + MENUITEM "&Nome", ID_VIEW_NAME + MENUITEM "&Todos os delalhes", ID_VIEW_ALL_ATTRIBUTES, CHECKED + MENUITEM "D&etalhes parciais...", ID_VIEW_SELECTED_ATTRIBUTES + MENUITEM SEPARATOR + MENUITEM "&Classificar por nome", ID_VIEW_SORT_NAME + MENUITEM "C&lassificar por tipo", ID_VIEW_SORT_TYPE + MENUITEM "Cl&assificar por tamanho", ID_VIEW_SORT_SIZE + MENUITEM "Cla&ssificar por &data", ID_VIEW_SORT_DATE + MENUITEM SEPARATOR + MENUITEM "Classificar &por...", ID_VIEW_FILTER + } + + POPUP "&Opções" { + MENUITEM "&Confirmação...", 501 + MENUITEM "&Tipo de Letra...", ID_SELECT_FONT + MENUITEM "&Personalizar barra de ferramentas...", 512 + MENUITEM SEPARATOR + MENUITEM "Barra d&e ferramentas", ID_VIEW_TOOL_BAR, CHECKED + MENUITEM "&Barra de unidades", ID_VIEW_DRIVE_BAR, CHECKED + MENUITEM "B&arra de e&stado", ID_VIEW_STATUSBAR, CHECKED +#ifndef _NO_EXTENSIONS + MENUITEM "Ecrã Completo\tCtrl+Shift+S", ID_VIEW_FULLSCREEN +#endif + MENUITEM SEPARATOR + MENUITEM "&Minimizar durante o uso", 504 + MENUITEM "&Gravar configurações ao sair",511 + } + + + POPUP "&Segurança" { + MENUITEM "&Acesso...", 605 + MENUITEM "&Autenticação...", 606 + MENUITEM "&Dono...", 607 + } + + POPUP "&Janela" { + MENUITEM "&Nova janela", ID_WINDOW_NEW + MENUITEM "&Em cascata\tCtrl+F5", ID_WINDOW_CASCADE + MENUITEM "Lado a lado &horizontalmente",ID_WINDOW_TILE_HORZ + MENUITEM "Lado a lado &verticalmente\tCtrl+F4",ID_WINDOW_TILE_VERT +#ifndef _NO_EXTENSIONS + MENUITEM "Organizar automaticamente", ID_WINDOW_AUTOSORT +#endif + MENUITEM "&Organizar ícones", ID_WINDOW_ARRANGE + MENUITEM "&Actualizar\tF5", ID_REFRESH + } + + POPUP "Aj&uda" { + MENUITEM "&Tópicos da ajuda\tF1", ID_HELP + MENUITEM "Pesquisar...", ID_HELP + MENUITEM "&Usar a ajuda", ID_HELP_USING + MENUITEM SEPARATOR + MENUITEM "&Sobre o Winefile...", ID_ABOUT + } +} + + +LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL + +IDD_EXECUTE DIALOG FIXED IMPURE 15, 13, 210, 63 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Executar" +FONT 8, "MS Shell Dlg" +{ + CONTROL "", 101, "Static", SS_SIMPLE|SS_NOPREFIX, 3, 6, 162, 10 + CONTROL "&Comando:", -1, "Static", SS_LEFTNOWORDWRAP|WS_GROUP, 3, 18, 60, 10 + EDITTEXT 201, 3, 29, 134, 12, ES_AUTOHSCROLL + CONTROL "&Minimizado", 214, "Button", BS_AUTOCHECKBOX|WS_TABSTOP,3, 45, 71, 12 + DEFPUSHBUTTON "OK", 1, 158, 6, 47, 14 + PUSHBUTTON "Cancelar", 2, 158, 23, 47, 14 + PUSHBUTTON "&Ajuda", 254, 158, 43, 47, 14 +} + + +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN + +IDD_SELECT_DESTINATION DIALOG FIXED IMPURE 15, 13, 210, 63 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Selecionar destino" +FONT 8, "MS Shell Dlg" +{ + CONTROL "", 101, "Static", SS_SIMPLE|SS_NOPREFIX, 3, 6, 162, 10 + CONTROL "&Caminho:", -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 "Cancelar", 2, 158, 23, 47, 14 + PUSHBUTTON "&Procurar", 254, 158, 43, 47, 14 +} + +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE + +IDD_SELECT_DESTINATION DIALOG FIXED IMPURE 15, 13, 210, 63 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Selecionar destino" +FONT 8, "MS Shell Dlg" +{ + CONTROL "", 101, "Static", SS_SIMPLE|SS_NOPREFIX, 3, 6, 162, 10 + CONTROL "&Localização:", -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 "Cancelar", 2, 158, 23, 47, 14 + PUSHBUTTON "&Procurar", 254, 158, 43, 47, 14 +} + + +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN + +STRINGTABLE +{ + IDS_FONT_SEL_DLG_NAME "Aplicando configurações de fonte" + IDS_FONT_SEL_ERROR "Erro enquanto seleciona nova fonte." +} + +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE + +STRINGTABLE +{ + IDS_FONT_SEL_DLG_NAME "A aplicar configurações do tipo de letra" + IDS_FONT_SEL_ERROR "Erro ao seleccionar novo tipo de letra." +} + + +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN + +STRINGTABLE +{ + IDS_WINEFILE "Winefile" + IDS_ERROR "Erro" + IDS_ROOT_FS "root fs" + IDS_UNIXFS "unixfs" + IDS_DESKTOP "Área de trabalho" + IDS_SHELL "Shell" + 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 + +STRINGTABLE +{ + IDS_WINEFILE "Winefile" + IDS_ERROR "Erro" + IDS_ROOT_FS "root fs" + IDS_UNIXFS "unixfs" + IDS_DESKTOP "Ecrã" + IDS_SHELL "Linha de Comandos" + IDS_TITLEFMT "%s - %s" + IDS_NO_IMPL "Ainda não implementado" + IDS_WINE_FILE "Ficheiro Wine" + 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" +} Propchange: trunk/rosapps/applications/winfile/lang/pt-BR.rc ------------------------------------------------------------------------------ svn:eol-style = native Removed: trunk/rosapps/applications/winfile/lang/pt-PT.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/lang/… ============================================================================== --- trunk/rosapps/applications/winfile/lang/pt-PT.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/winfile/lang/pt-PT.rc (removed) @@ -1,385 +1,0 @@ -/* - * WineFile - * Portuguese Language Support - * - * Copyright 2003 Marcelo Duarte - * Copyright 2004,2007 Américo José Melo - * - * 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 - */ - - -/* Menu */ - -LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN - -IDM_WINEFILE MENU FIXED IMPURE -{ - POPUP "&Arquivo" { - MENUITEM "A&brir\tEnter", ID_ACTIVATE - MENUITEM "&Mover...\tF7", ID_FILE_MOVE - MENUITEM "&Copiar...\tF8", ID_FILE_COPY - MENUITEM "&In Clipboard...\tF9", 118 - MENUITEM "E&xcluir\tDel", ID_FILE_DELETE - MENUITEM "Re&nomear...", 109 - MENUITEM "&Propriedades...\tAlt+Enter", ID_EDIT_PROPERTIES - MENUITEM SEPARATOR - MENUITEM "C&omprimir...", 119 - MENUITEM "Descomprimir...", 120 - MENUITEM SEPARATOR - MENUITEM "Execu&tar...", ID_EXECUTE - MENUITEM "&Imprimir...", 102 - MENUITEM "A&ssociar...", 103 - MENUITEM SEPARATOR - MENUITEM "Cri&ar pasta...", 111 - MENUITEM "P&esquisar...", 104 - MENUITEM "Selecionar arqui&vos...", 116 - MENUITEM SEPARATOR -#ifndef _NO_EXTENSIONS - MENUITEM "Sai&r\tAlt+X", ID_FILE_EXIT -#else - MENUITEM "Sai&r", ID_FILE_EXIT -#endif - } - - POPUP "&Disco" { - MENUITEM "&Copiar disco...", 201 - MENUITEM "&Nomear disco...", 202 - MENUITEM SEPARATOR - MENUITEM "&Formatar disco...", ID_FORMAT_DISK -#ifdef _WIN95 - MENUITEM "&Gerar disco de sistema...", -1 /*TODO*/ -#endif - MENUITEM SEPARATOR - MENUITEM "Conecta&r unidade de rede", ID_CONNECT_NETWORK_DRIVE - MENUITEM "&Desconectar unidade de rede",ID_DISCONNECT_NETWORK_DRIVE - MENUITEM SEPARATOR - MENUITEM "C&ompartilhar como...", 254 - MENUITEM "&Remover compartilhamento...",255 - MENUITEM SEPARATOR - MENUITEM "Selecionar &unidade...", 251 - } - - POPUP "Á&rvore" { - MENUITEM "&Próximo nível\t+", 301 - MENUITEM "Expandi&r pasta\t*", 302 - MENUITEM "Expandir &tudo\tStrg+*", 303 - MENUITEM "Recolher p&asta\t-", 304 - MENUITEM SEPARATOR - MENUITEM "&Indicar subníveis", 505 - } - - POPUP "&Exibir" { - MENUITEM "Á&rvore e pasta", 413 - MENUITEM "S&omente árvore", 411 - MENUITEM "So&mente pasta", 412 - MENUITEM SEPARATOR - MENUITEM "&Dividir", ID_VIEW_SPLIT - MENUITEM SEPARATOR - MENUITEM "&Nome", ID_VIEW_NAME - MENUITEM "&Todos os delalhes", ID_VIEW_ALL_ATTRIBUTES, CHECKED - MENUITEM "D&etalhes parciais...", ID_VIEW_SELECTED_ATTRIBUTES - MENUITEM SEPARATOR - MENUITEM "&Classificar por nome", ID_VIEW_SORT_NAME - MENUITEM "C&lassificar por tipo", ID_VIEW_SORT_TYPE - MENUITEM "Cl&assificar por tamanho", ID_VIEW_SORT_SIZE - MENUITEM "Cla&ssificar por &data", ID_VIEW_SORT_DATE - MENUITEM SEPARATOR - MENUITEM "Classificar &por...", ID_VIEW_FILTER - } - - POPUP "&Opções" { - MENUITEM "&Confirmação...", 501 - MENUITEM "&Fonte...", ID_SELECT_FONT - MENUITEM "&Personalizar barra de ferramentas...", 512 - MENUITEM SEPARATOR - MENUITEM "Barra d&e ferramentas", ID_VIEW_TOOL_BAR, CHECKED - MENUITEM "&Barra de unidades", ID_VIEW_DRIVE_BAR, CHECKED - MENUITEM "B&arra de &status", ID_VIEW_STATUSBAR, CHECKED -#ifndef _NO_EXTENSIONS - MENUITEM "Tela Cheia\tCtrl+Shift+S", ID_VIEW_FULLSCREEN -#endif - MENUITEM SEPARATOR - MENUITEM "&Minimizar durante o uso", 504 - MENUITEM "&Salvar configurações ao sair",511 - } - - - POPUP "&Segurança" { - MENUITEM "&Acesso...", 605 - MENUITEM "&Logging...", 606 - MENUITEM "&Owner...", 607 - } - - POPUP "&Janela" { - MENUITEM "&Nova janela", ID_WINDOW_NEW - MENUITEM "&Em cascata\tCtrl+F5", ID_WINDOW_CASCADE - MENUITEM "Lado a lado &horizontalmente",ID_WINDOW_TILE_HORZ - MENUITEM "Lado a lado &verticalmente\tCtrl+F4",ID_WINDOW_TILE_VERT -#ifndef _NO_EXTENSIONS - MENUITEM "Organizar automaticamente", ID_WINDOW_AUTOSORT -#endif - MENUITEM "&Organizar ícones", ID_WINDOW_ARRANGE - MENUITEM "&Atualizar\tF5", ID_REFRESH - } - - POPUP "Aj&uda" { - MENUITEM "&Tópicos da ajuda\tF1", ID_HELP - MENUITEM "Pesquisar...", ID_HELP - MENUITEM "&Usando a ajuda", ID_HELP_USING - MENUITEM SEPARATOR - MENUITEM "&Sobre o Winefile...", ID_ABOUT - } -} - -LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE - -IDM_WINEFILE MENU FIXED IMPURE -{ - POPUP "&Ficheiro" { - MENUITEM "A&brir\tEnter", ID_ACTIVATE - MENUITEM "&Mover...\tF7", ID_FILE_MOVE - MENUITEM "&Copiar...\tF8", ID_FILE_COPY - MENUITEM "&Na Area de Transferência...\tF9", 118 - MENUITEM "E&xcluir\tDel", ID_FILE_DELETE - MENUITEM "Re&nomear...", 109 - MENUITEM "&Propriedades...\tAlt+Enter", ID_EDIT_PROPERTIES - MENUITEM SEPARATOR - MENUITEM "C&omprimir...", 119 - MENUITEM "&Descomprimir...", 120 - MENUITEM SEPARATOR - MENUITEM "Execu&tar...", ID_EXECUTE - MENUITEM "&Imprimir...", 102 - MENUITEM "A&ssociar...", 103 - MENUITEM SEPARATOR - MENUITEM "Cri&ar pasta...", 111 - MENUITEM "P&esquisar...", 104 - MENUITEM "Seleccionar fichei&ros...", 116 - MENUITEM SEPARATOR -#ifndef _NO_EXTENSIONS - MENUITEM "Sai&r\tAlt+X", ID_FILE_EXIT -#else - MENUITEM "Sai&r", ID_FILE_EXIT -#endif - } - - POPUP "&Disco" { - MENUITEM "&Copiar disco...", 201 - MENUITEM "&Nomear disco...", 202 - MENUITEM SEPARATOR - MENUITEM "&Formatar disco...", ID_FORMAT_DISK -#ifdef _WIN95 - MENUITEM "&Gerar disco de sistema...", -1 /*TODO*/ -#endif - MENUITEM SEPARATOR - MENUITEM "Liga&r unidade de rede", ID_CONNECT_NETWORK_DRIVE - MENUITEM "&Desligar unidade de rede",ID_DISCONNECT_NETWORK_DRIVE - MENUITEM SEPARATOR - MENUITEM "&Partilhar como...", 254 - MENUITEM "&Remover partilha...", 255 - MENUITEM SEPARATOR - MENUITEM "Seleccionar &unidade...", 251 - } - - POPUP "Á&rvore" { - MENUITEM "&Próximo nível\t+", 301 - MENUITEM "Expandi&r pasta\t*", 302 - MENUITEM "Expandir &tudo\tStrg+*", 303 - MENUITEM "Recolher p&asta\t-", 304 - MENUITEM SEPARATOR - MENUITEM "&Indicar subníveis", 505 - } - - POPUP "&Exibir" { - MENUITEM "Á&rvore e pasta", 413 - MENUITEM "A&penas árvore", 411 - MENUITEM "Ap&enas pasta", 412 - MENUITEM SEPARATOR - MENUITEM "&Dividir", ID_VIEW_SPLIT - MENUITEM SEPARATOR - MENUITEM "&Nome", ID_VIEW_NAME - MENUITEM "&Todos os delalhes", ID_VIEW_ALL_ATTRIBUTES, CHECKED - MENUITEM "D&etalhes parciais...", ID_VIEW_SELECTED_ATTRIBUTES - MENUITEM SEPARATOR - MENUITEM "&Classificar por nome", ID_VIEW_SORT_NAME - MENUITEM "C&lassificar por tipo", ID_VIEW_SORT_TYPE - MENUITEM "Cl&assificar por tamanho", ID_VIEW_SORT_SIZE - MENUITEM "Cla&ssificar por &data", ID_VIEW_SORT_DATE - MENUITEM SEPARATOR - MENUITEM "Classificar &por...", ID_VIEW_FILTER - } - - POPUP "&Opções" { - MENUITEM "&Confirmação...", 501 - MENUITEM "&Tipo de Letra...", ID_SELECT_FONT - MENUITEM "&Personalizar barra de ferramentas...", 512 - MENUITEM SEPARATOR - MENUITEM "Barra d&e ferramentas", ID_VIEW_TOOL_BAR, CHECKED - MENUITEM "&Barra de unidades", ID_VIEW_DRIVE_BAR, CHECKED - MENUITEM "B&arra de e&stado", ID_VIEW_STATUSBAR, CHECKED -#ifndef _NO_EXTENSIONS - MENUITEM "Ecrã Completo\tCtrl+Shift+S", ID_VIEW_FULLSCREEN -#endif - MENUITEM SEPARATOR - MENUITEM "&Minimizar durante o uso", 504 - MENUITEM "&Gravar configurações ao sair",511 - } - - - POPUP "&Segurança" { - MENUITEM "&Acesso...", 605 - MENUITEM "&Autenticação...", 606 - MENUITEM "&Dono...", 607 - } - - POPUP "&Janela" { - MENUITEM "&Nova janela", ID_WINDOW_NEW - MENUITEM "&Em cascata\tCtrl+F5", ID_WINDOW_CASCADE - MENUITEM "Lado a lado &horizontalmente",ID_WINDOW_TILE_HORZ - MENUITEM "Lado a lado &verticalmente\tCtrl+F4",ID_WINDOW_TILE_VERT -#ifndef _NO_EXTENSIONS - MENUITEM "Organizar automaticamente", ID_WINDOW_AUTOSORT -#endif - MENUITEM "&Organizar ícones", ID_WINDOW_ARRANGE - MENUITEM "&Actualizar\tF5", ID_REFRESH - } - - POPUP "Aj&uda" { - MENUITEM "&Tópicos da ajuda\tF1", ID_HELP - MENUITEM "Pesquisar...", ID_HELP - MENUITEM "&Usar a ajuda", ID_HELP_USING - MENUITEM SEPARATOR - MENUITEM "&Sobre o Winefile...", ID_ABOUT - } -} - - -LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL - -IDD_EXECUTE DIALOG FIXED IMPURE 15, 13, 210, 63 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Executar" -FONT 8, "MS Shell Dlg" -{ - CONTROL "", 101, "Static", SS_SIMPLE|SS_NOPREFIX, 3, 6, 162, 10 - CONTROL "&Comando:", -1, "Static", SS_LEFTNOWORDWRAP|WS_GROUP, 3, 18, 60, 10 - EDITTEXT 201, 3, 29, 134, 12, ES_AUTOHSCROLL - CONTROL "&Minimizado", 214, "Button", BS_AUTOCHECKBOX|WS_TABSTOP,3, 45, 71, 12 - DEFPUSHBUTTON "OK", 1, 158, 6, 47, 14 - PUSHBUTTON "Cancelar", 2, 158, 23, 47, 14 - PUSHBUTTON "&Ajuda", 254, 158, 43, 47, 14 -} - - -LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN - -IDD_SELECT_DESTINATION DIALOG FIXED IMPURE 15, 13, 210, 63 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Selecionar destino" -FONT 8, "MS Shell Dlg" -{ - CONTROL "", 101, "Static", SS_SIMPLE|SS_NOPREFIX, 3, 6, 162, 10 - CONTROL "&Caminho:", -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 "Cancelar", 2, 158, 23, 47, 14 - PUSHBUTTON "&Procurar", 254, 158, 43, 47, 14 -} - -LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE - -IDD_SELECT_DESTINATION DIALOG FIXED IMPURE 15, 13, 210, 63 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Selecionar destino" -FONT 8, "MS Shell Dlg" -{ - CONTROL "", 101, "Static", SS_SIMPLE|SS_NOPREFIX, 3, 6, 162, 10 - CONTROL "&Localização:", -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 "Cancelar", 2, 158, 23, 47, 14 - PUSHBUTTON "&Procurar", 254, 158, 43, 47, 14 -} - - -LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN - -STRINGTABLE -{ - IDS_FONT_SEL_DLG_NAME "Aplicando configurações de fonte" - IDS_FONT_SEL_ERROR "Erro enquanto seleciona nova fonte." -} - -LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE - -STRINGTABLE -{ - IDS_FONT_SEL_DLG_NAME "A aplicar configurações do tipo de letra" - IDS_FONT_SEL_ERROR "Erro ao seleccionar novo tipo de letra." -} - - -LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN - -STRINGTABLE -{ - IDS_WINEFILE "Winefile" - IDS_ERROR "Erro" - IDS_ROOT_FS "root fs" - IDS_UNIXFS "unixfs" - IDS_DESKTOP "Área de trabalho" - IDS_SHELL "Shell" - 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 - -STRINGTABLE -{ - IDS_WINEFILE "Winefile" - IDS_ERROR "Erro" - IDS_ROOT_FS "root fs" - IDS_UNIXFS "unixfs" - IDS_DESKTOP "Ecrã" - IDS_SHELL "Linha de Comandos" - IDS_TITLEFMT "%s - %s" - IDS_NO_IMPL "Ainda não implementado" - IDS_WINE_FILE "Ficheiro Wine" - 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/applications/winfile/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/rsrc.… ============================================================================== --- trunk/rosapps/applications/winfile/rsrc.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/winfile/rsrc.rc [iso-8859-1] Thu Jul 10 01:38:14 2008 @@ -67,7 +67,7 @@ #include "lang/nb-NO.rc" #include "lang/nl-NL.rc" #include "lang/pl-PL.rc" -#include "lang/pt-PT.rc" +#include "lang/pt-BR.rc" #include "lang/ru-RU.rc" #include "lang/sl-SI.rc" #include "lang/sv-SE.rc" Added: trunk/rosapps/applications/write/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/write/lang/ro… ============================================================================== --- trunk/rosapps/applications/write/lang/ro-RO.rc (added) +++ trunk/rosapps/applications/write/lang/ro-RO.rc [iso-8859-1] Thu Jul 10 01:38:14 2008 @@ -1,0 +1,29 @@ +/* + * Copyright (C) 2007 Mikolaj Zalewski + * Copyright (C) 2008 Michael Stefaniuc + * + * 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_ROMANIAN, SUBLANG_NEUTRAL + +#pragma code_page(65001) + +STRINGTABLE +{ + IDS_FAILED, "ExecuÈia Wordpad a eÈuat" +} + +#pragma code_page(default) Propchange: trunk/rosapps/applications/write/lang/ro-RO.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rosapps/applications/write/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/write/rsrc.rc… ============================================================================== --- trunk/rosapps/applications/write/rsrc.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/write/rsrc.rc [iso-8859-1] Thu Jul 10 01:38:14 2008 @@ -31,6 +31,7 @@ #include "lang/nb-NO.rc" #include "lang/nl-NL.rc" #include "lang/pl-PL.rc" +#include "lang/ro-RO.rc" #include "lang/ru-RU.rc" #include "lang/sl-SI.rc" #include "lang/sk-SK.rc"

1 0

[jimtabor] 34399: CS_NOKEYCVT is used to set Classname to Version when calling to register class.
by jimtabor＠svn.reactos.org 10 Jul '08

10 Jul '08

Author: jimtabor Date: Wed Jul 9 20:28:59 2008 New Revision: 34399 URL: http://svn.reactos.org/svn/reactos?rev=34399&view=rev Log: CS_NOKEYCVT is used to set Classname to Version when calling to register class. Modified: trunk/reactos/include/psdk/winuser.h Modified: trunk/reactos/include/psdk/winuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winuser.h?rev… ============================================================================== --- trunk/reactos/include/psdk/winuser.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winuser.h [iso-8859-1] Wed Jul 9 20:28:59 2008 @@ -639,7 +639,7 @@ #define CS_BYTEALIGNCLIENT 4096 #define CS_BYTEALIGNWINDOW 8192 #define CS_KEYCVTWINDOW 4 -#define CS_NOKEYCVT 256 +#define CS_NOKEYCVT 256 // Class Name to Version #define CS_CLASSDC 64 #define CS_DBLCLKS 8 #define CS_GLOBALCLASS 16384

1 0

[silverblade] 34398: Rewrote sound threading code. No point in having a single thread per audio device when all it's doing is swapping buffers over. Also rewrote the wave streaming code. It can now stream multiple WAVEHDRs and split them up as needed. Playback not very smooth in places - need to double-buffer the audio data.
by silverblade＠svn.reactos.org 09 Jul '08

09 Jul '08

Author: silverblade Date: Wed Jul 9 18:43:44 2008 New Revision: 34398 URL: http://svn.reactos.org/svn/reactos?rev=34398&view=rev Log: Rewrote sound threading code. No point in having a single thread per audio device when all it's doing is swapping buffers over. Also rewrote the wave streaming code. It can now stream multiple WAVEHDRs and split them up as needed. Playback not very smooth in places - need to double-buffer the audio data. Modified: branches/silverblade-audio/dll/win32/mmdrv/testing.c branches/silverblade-audio/dll/win32/sndblst/sndblst.c branches/silverblade-audio/include/reactos/libs/sound/mmebuddy.h branches/silverblade-audio/lib/drivers/sound/mmebuddy/devices.c branches/silverblade-audio/lib/drivers/sound/mmebuddy/instances.c branches/silverblade-audio/lib/drivers/sound/mmebuddy/kernel.c branches/silverblade-audio/lib/drivers/sound/mmebuddy/mme/wodMessage.c branches/silverblade-audio/lib/drivers/sound/mmebuddy/thread.c branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/wavethread.c Modified: branches/silverblade-audio/dll/win32/mmdrv/testing.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/dll/win32/mmd… ============================================================================== --- branches/silverblade-audio/dll/win32/mmdrv/testing.c [iso-8859-1] (original) +++ branches/silverblade-audio/dll/win32/mmdrv/testing.c [iso-8859-1] Wed Jul 9 18:43:44 2008 @@ -45,7 +45,7 @@ { /* MessageBox(0, DevicePath, L"CALLBACK", MB_OK | MB_TASKMODAL);*/ - AddSoundDevice(DeviceType, DevicePath); + AddSoundDevice(DeviceType, DevicePath, NULL); return TRUE; } @@ -106,7 +106,7 @@ PSOUND_DEVICE Device; MMRESULT Result; - AddSoundDevice(WAVE_OUT_DEVICE_TYPE, L"\\\\.\\SBWaveOut0"); + AddSoundDevice(WAVE_OUT_DEVICE_TYPE, L"\\\\.\\SBWaveOut0", NULL); Result = GetSoundDevice(WAVE_OUT_DEVICE_TYPE, 0, &Device); if ( Result != MMSYSERR_NOERROR ) @@ -136,7 +136,7 @@ MMRESULT Result; WAVEFORMATEX fmt; - AddSoundDevice(WAVE_OUT_DEVICE_TYPE, L"\\\\.\\SBWaveOut0"); + AddSoundDevice(WAVE_OUT_DEVICE_TYPE, L"\\\\.\\SBWaveOut0", NULL); Result = GetSoundDevice(WAVE_OUT_DEVICE_TYPE, 0, &Device); if ( Result != MMSYSERR_NOERROR ) @@ -179,86 +179,6 @@ } -VOID -TestPlaybackHackingly() -{ - WCHAR msg[1024]; - MMRESULT Result; - WAVEFORMATEX fmt; - ULONG i; - - for ( i = 0; i < 65536; ++ i ) - JunkBuffer[i] = rand(); - - AddSoundDevice(WAVE_OUT_DEVICE_TYPE, L"\\\\.\\SBWaveOut0"); - Result = GetSoundDevice(WAVE_OUT_DEVICE_TYPE, 0, &Device); - - if ( Result != MMSYSERR_NOERROR ) - { - MessageBox(0, L"Fail 1", L"Fail", MB_OK | MB_TASKMODAL); - return; - } - -/* Result = OpenKernelSoundDevice(Device, GENERIC_READ | GENERIC_WRITE); - if ( Result != MMSYSERR_NOERROR ) - { - MessageBox(0, L"Fail open", L"Fail", MB_OK | MB_TASKMODAL); - return; - } - wsprintf(msg, L"Opened handle %x", Device->Handle); - MessageBox(0, msg, L"Result", MB_OK | MB_TASKMODAL); -*/ - - Result = CreateSoundDeviceInstance(Device, &Instance); - if ( Result != MMSYSERR_NOERROR ) - { - MessageBox(0, L"Fail 2", L"Fail 2", MB_OK | MB_TASKMODAL); - return; - } - - /* Request a valid format */ - fmt.wFormatTag = WAVE_FORMAT_PCM; - fmt.nChannels = 1; - fmt.nSamplesPerSec = 22050; - fmt.wBitsPerSample = 16; - fmt.nBlockAlign = fmt.nChannels * (fmt.wBitsPerSample / 8); - fmt.nAvgBytesPerSec = fmt.nSamplesPerSec * fmt.nBlockAlign; - fmt.cbSize = 0; - - Result = SetWaveDeviceFormat(Instance, &fmt, sizeof(WAVEFORMATEX)); - - wsprintf(msg, L"Format support set result: %d\nClick to play!", Result); - MessageBox(0, msg, L"Result", MB_OK | MB_TASKMODAL); - - //SOUND_DEBUG_HEX(Instance->Device->Handle); - - Result = StartWaveThread(Instance); - if ( Result != MMSYSERR_NOERROR ) - { - MessageBox(0, L"Failed to start thread", L"Fail 3", MB_OK | MB_TASKMODAL); - return; - } - - //SOUND_DEBUG_HEX(Instance->Device->Handle); - - waveheader.lpData = (PVOID) JunkBuffer; - waveheader.dwBufferLength = 65536; - waveheader.dwFlags = WHDR_PREPARED; - - Result = QueueWaveDeviceBuffer(Instance, &waveheader); -// CallSoundThread(Instance, WAVEREQUEST_QUEUE_BUFFER, &waveheader); -/* - Result = WriteSoundDeviceBuffer(Instance, - JunkBuffer, 65535, OverlappedCallback); -*/ - wsprintf(msg, L"Play result: %d", Result); - MessageBox(0, msg, L"Result", MB_OK | MB_TASKMODAL); - - StopWaveThread(Instance); - DestroySoundDeviceInstance(Instance); -} - - APIENTRY VOID TestDevEnum() { @@ -281,44 +201,6 @@ } -WINAPI VOID -TestThreading() -{ - MMRESULT Result; - PSOUND_DEVICE Device; - PSOUND_DEVICE_INSTANCE Instance; - - AddSoundDevice(WAVE_OUT_DEVICE_TYPE, L"\\\\.\\SBWaveOut0"); - Result = GetSoundDevice(WAVE_OUT_DEVICE_TYPE, 0, &Device); - if ( Result != MMSYSERR_NOERROR ) - { - MessageBox(0, L"Fail 1", L"Fail 1", MB_OK | MB_TASKMODAL); - return; - } - - Result = CreateSoundDeviceInstance(Device, &Instance); - if ( Result != MMSYSERR_NOERROR ) - { - MessageBox(0, L"Fail 2", L"Fail 2", MB_OK | MB_TASKMODAL); - return; - } - - Result = StartWaveThread(Instance); - if ( Result != MMSYSERR_NOERROR ) - { - MessageBox(0, L"Fail 3", L"Fail 3", MB_OK | MB_TASKMODAL); - return; - } - - MessageBox(0, L"Click to send a request", L"Bai", MB_OK | MB_TASKMODAL); - CallSoundThread(Instance, 69, NULL); - - MessageBox(0, L"Click to kill thread", L"Bai", MB_OK | MB_TASKMODAL); - - StopWaveThread(Instance); -} - - VOID wodTest() { @@ -353,14 +235,6 @@ LPWSTR lpCmdLine, int nCmdShow) { -// TestDeviceDetection(); -// wodTest(); -// TestFormatQuery(); - TestPlaybackHackingly(); -// TestDevEnum(); -/* - TestThreading(); -*/ MessageBox(0, L"Le end", L"Bai", MB_OK | MB_TASKMODAL); return 0; } Modified: branches/silverblade-audio/dll/win32/sndblst/sndblst.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/dll/win32/snd… ============================================================================== --- branches/silverblade-audio/dll/win32/sndblst/sndblst.c [iso-8859-1] (original) +++ branches/silverblade-audio/dll/win32/sndblst/sndblst.c [iso-8859-1] Wed Jul 9 18:43:44 2008 @@ -96,10 +96,15 @@ 0, FoundDevice); + /* TODO: Check return value */ + StartSoundThread(); + return 1L; case DRV_FREE : SOUND_DEBUG(L"DRV_FREE"); + + StopSoundThread(); RemoveAllSoundDevices(); @@ -139,7 +144,7 @@ FILE* f; f = fopen("27may2_a.wav", "rb"); - fseek(f, 50, SEEK_SET); + fseek(f, 48, SEEK_SET); fread(Buffer, 1, 5340000, f); fclose(f); @@ -160,7 +165,7 @@ /* WODM_OPEN */ Format.wFormatTag = WAVE_FORMAT_PCM; Format.nChannels = 2; - Format.nSamplesPerSec = 44100; + Format.nSamplesPerSec = 22050; Format.wBitsPerSample = 16; Format.nBlockAlign = Format.nChannels * (Format.wBitsPerSample / 8); Format.nAvgBytesPerSec = Format.nSamplesPerSec * Format.nBlockAlign; @@ -189,6 +194,14 @@ WaveHeaders[2].dwBufferLength = 1000000; WaveHeaders[2].dwFlags = WHDR_PREPARED; + WaveHeaders[3].lpData = (PVOID) ((PCHAR)Buffer + (1000000 *3)); + WaveHeaders[3].dwBufferLength = 1000000; + WaveHeaders[3].dwFlags = WHDR_PREPARED; + + WaveHeaders[4].lpData = (PVOID) ((PCHAR)Buffer + (1000000 *4)); + WaveHeaders[4].dwBufferLength = 1000000; + WaveHeaders[4].dwFlags = WHDR_PREPARED; + // WaveHeader2.lpData = (PVOID) Buffer2; // WaveHeader2.dwBufferLength = 10; // WaveHeader2.dwFlags = WHDR_PREPARED; @@ -196,6 +209,8 @@ Result = wodMessage(0, WODM_WRITE, (DWORD) InstanceData, (DWORD) &WaveHeaders[0], 0); Result = wodMessage(0, WODM_WRITE, (DWORD) InstanceData, (DWORD) &WaveHeaders[1], 0); Result = wodMessage(0, WODM_WRITE, (DWORD) InstanceData, (DWORD) &WaveHeaders[2], 0); + Result = wodMessage(0, WODM_WRITE, (DWORD) InstanceData, (DWORD) &WaveHeaders[3], 0); + Result = wodMessage(0, WODM_WRITE, (DWORD) InstanceData, (DWORD) &WaveHeaders[4], 0); //Result = wodMessage(0, WODM_WRITE, (DWORD) InstanceData, (DWORD) &WaveHeader2, 0); Modified: branches/silverblade-audio/include/reactos/libs/sound/mmebuddy.h URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/include/react… ============================================================================== --- branches/silverblade-audio/include/reactos/libs/sound/mmebuddy.h [iso-8859-1] (original) +++ branches/silverblade-audio/include/reactos/libs/sound/mmebuddy.h [iso-8859-1] Wed Jul 9 18:43:44 2008 @@ -21,6 +21,9 @@ /* Hacky debug macro */ + +#include <stdio.h> +#define SOUND_TRACE printf #define SOUND_DEBUG(x) \ MessageBox(0, x, L"Debug", MB_OK | MB_TASKMODAL); @@ -90,6 +93,50 @@ } UNIVERSAL_CAPS, *PUNIVERSAL_CAPS; + +/* New sound thread code */ + +typedef MMRESULT (*SOUND_THREAD_REQUEST_HANDLER)( + IN struct _SOUND_DEVICE_INSTANCE* SoundDeviceInstance, + IN OPTIONAL PVOID Parameter); + +typedef struct _SOUND_THREAD_REQUEST +{ + /* The sound device instance this request relates to */ + struct _SOUND_DEVICE_INSTANCE* SoundDeviceInstance; + /* What function to call */ + SOUND_THREAD_REQUEST_HANDLER RequestHandler; + /* Caller-defined parameter */ + PVOID Parameter; + /* This will contain the return code of the request function */ + MMRESULT ReturnValue; +} SOUND_THREAD_REQUEST, *PSOUND_THREAD_REQUEST; + +typedef VOID (*SOUND_THREAD_IO_COMPLETION_HANDLER)( + IN struct _SOUND_DEVICE_INSTANCE* SoundDeviceInstance, + IN PVOID Parameter OPTIONAL, + IN DWORD BytesWritten); + +typedef struct _SOUND_THREAD_COMPLETED_IO +{ + struct _SOUND_THREAD_COMPLETED_IO* Previous; + struct _SOUND_THREAD_COMPLETED_IO* Next; + + struct _SOUND_DEVICE_INSTANCE* SoundDeviceInstance; + SOUND_THREAD_IO_COMPLETION_HANDLER CompletionHandler; + PVOID Parameter; + DWORD BytesTransferred; +} SOUND_THREAD_COMPLETED_IO, *PSOUND_THREAD_COMPLETED_IO; + +typedef struct _SOUND_THREAD_OVERLAPPED +{ + OVERLAPPED General; + + /* Pointer to structure to fill with completion data */ + PSOUND_THREAD_COMPLETED_IO CompletionData; +} SOUND_THREAD_OVERLAPPED, *PSOUND_THREAD_OVERLAPPED; + +#if 0 /* Used internally to shuttle data to/from the sound processing thread. */ @@ -117,11 +164,6 @@ PSOUND_THREAD_COMPLETED_IO CompletionData; } SOUND_THREAD_OVERLAPPED, *PSOUND_THREAD_OVERLAPPED; -typedef MMRESULT (*SOUND_THREAD_REQUEST_HANDLER)( - IN struct _SOUND_DEVICE_INSTANCE* Instance, - IN PVOID PrivateThreadData, - IN DWORD RequestId, - IN PVOID Data); typedef VOID (*SOUND_THREAD_IO_COMPLETION_HANDLER)( IN struct _SOUND_DEVICE_INSTANCE* Instance, @@ -147,25 +189,16 @@ PSOUND_THREAD_COMPLETED_IO FirstCompletedIo; SOUND_THREAD_IO_COMPLETION_HANDLER IoCompletionHandler; } SOUND_THREAD, *PSOUND_THREAD; +#endif /* Wave thread */ - -typedef struct _WAVE_OVERLAPPED -{ - OVERLAPPED General; - struct _SOUND_DEVICE_INSTANCE* SoundDeviceInstance; - struct _WAVE_THREAD_DATA* ThreadData; - PWAVEHDR Header; -} WAVE_OVERLAPPED, *PWAVE_OVERLAPPED; - +#if 0 typedef struct _WAVE_THREAD_DATA { /* Wave thread specific */ - WAVE_OVERLAPPED Overlapped; - DWORD BufferCount; PWAVEHDR CurrentBuffer; PWAVEHDR FirstBuffer; @@ -174,6 +207,7 @@ /* How much data is waiting with the driver */ DWORD RemainingBytes; } WAVE_THREAD_DATA, *PWAVE_THREAD_DATA; +#endif /* Audio device function table @@ -234,17 +268,36 @@ Represents an individual instance of an audio device */ +typedef struct _WAVE_STREAM_INFO +{ + /* Buffer queue head and tail */ + PWAVEHDR BufferQueueHead; + PWAVEHDR BufferQueueTail; + /* The buffer currently being processed */ + PWAVEHDR CurrentBuffer; + /* How far into the current buffer we've gone */ + DWORD BufferOffset; + /* How much data we're expecting back */ + DWORD BytesOutstanding; +} WAVE_STREAM_INFO, *PWAVE_STREAM_INFO; + typedef struct _SOUND_DEVICE_INSTANCE { struct _SOUND_DEVICE_INSTANCE* Next; PSOUND_DEVICE Device; - PSOUND_THREAD Thread; +/* PSOUND_THREAD Thread;*/ /* Stuff generously donated to us from WinMM */ struct { DWORD ClientCallback; } WinMM; + + /* Device-specific parameters */ + union + { + WAVE_STREAM_INFO Wave; + } Streaming; } SOUND_DEVICE_INSTANCE, *PSOUND_DEVICE_INSTANCE; @@ -493,60 +546,38 @@ DefaultInstanceDestructor( IN struct _SOUND_DEVICE_INSTANCE* SoundDeviceInstance); + +/* + thread.c +*/ + +MMRESULT +OverlappedSoundDeviceIo( + IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance, + IN PVOID Buffer, + IN DWORD BufferSize, + IN SOUND_THREAD_IO_COMPLETION_HANDLER IoCompletionHandler, + IN PVOID CompletionParameter OPTIONAL); + +MMRESULT +StartSoundThread(); + +MMRESULT +StopSoundThread(); + +MMRESULT +CallUsingSoundThread( + IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance, + IN SOUND_THREAD_REQUEST_HANDLER RequestHandler, + IN PVOID Parameter); + + + MMRESULT QueueWaveDeviceBuffer( IN PSOUND_DEVICE_INSTANCE Instance, IN PWAVEHDR BufferHeader); - -/* - thread.c -*/ - -MMRESULT -StartSoundThread( - IN PSOUND_DEVICE_INSTANCE Instance, - IN SOUND_THREAD_REQUEST_HANDLER RequestHandler, - IN SOUND_THREAD_IO_COMPLETION_HANDLER IoCompletionHandler, - IN LPVOID PrivateThreadData); - -MMRESULT -StopSoundThread( - IN PSOUND_DEVICE_INSTANCE Instance); - -MMRESULT -CallSoundThread( - IN PSOUND_DEVICE_INSTANCE Instance, - IN DWORD RequestId, - IN PVOID RequestData); - -MMRESULT -GetSoundThreadPrivateData( - IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance, - OUT PVOID* PrivateData); - -VOID CALLBACK -CompleteSoundThreadIo( - IN DWORD dwErrorCode, - IN DWORD dwNumberOfBytesTransferred, - IN LPOVERLAPPED lpOverlapped); - -MMRESULT -OverlappedWriteToSoundDevice( - IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance, - IN PVOID ContextData, - IN PVOID Buffer, - IN DWORD BufferSize); - - - -MMRESULT -StartWaveThread( - IN PSOUND_DEVICE_INSTANCE Instance); - -MMRESULT -StopWaveThread( - IN PSOUND_DEVICE_INSTANCE Instance); /* Modified: branches/silverblade-audio/lib/drivers/sound/mmebuddy/devices.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/mmebuddy/devices.c [iso-8859-1] (original) +++ branches/silverblade-audio/lib/drivers/sound/mmebuddy/devices.c [iso-8859-1] Wed Jul 9 18:43:44 2008 @@ -570,36 +570,3 @@ ASSERT(Result == MMSYSERR_NOERROR); } - - -MMRESULT -QueueWaveDeviceBuffer( - IN PSOUND_DEVICE_INSTANCE Instance, - IN PWAVEHDR BufferHeader) -{ - MMRESULT Result; - - if ( ! Instance ) - return MMSYSERR_INVALPARAM; - - if ( ! BufferHeader ) - return MMSYSERR_INVALPARAM; - - if ( ! BufferHeader->lpData ) - return MMSYSERR_INVALPARAM; - - if ( ! BufferHeader->dwBufferLength ) - return MMSYSERR_INVALPARAM; - - if ( ! (BufferHeader->dwFlags & WHDR_PREPARED ) ) - return WAVERR_UNPREPARED; - - /* TODO: WHDR_INQUEUE */ - - BufferHeader->dwFlags &= ~WHDR_DONE; - BufferHeader->lpNext = NULL; - - Result = CallSoundThread(Instance, WAVEREQUEST_QUEUE_BUFFER, BufferHeader); - - return Result; -} Modified: branches/silverblade-audio/lib/drivers/sound/mmebuddy/instances.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/mmebuddy/instances.c [iso-8859-1] (original) +++ branches/silverblade-audio/lib/drivers/sound/mmebuddy/instances.c [iso-8859-1] Wed Jul 9 18:43:44 2008 @@ -30,7 +30,6 @@ /* Initialise */ SoundDeviceInstance->Next = NULL; SoundDeviceInstance->Device = NULL; - SoundDeviceInstance->Thread = NULL; /* TODO: WinMM callback entry */ } Modified: branches/silverblade-audio/lib/drivers/sound/mmebuddy/kernel.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/mmebuddy/kernel.c [iso-8859-1] (original) +++ branches/silverblade-audio/lib/drivers/sound/mmebuddy/kernel.c [iso-8859-1] Wed Jul 9 18:43:44 2008 @@ -217,10 +217,13 @@ { WCHAR msg[128]; if ( ( ! SoundDeviceInstance ) || ( ! Buffer ) || ( BufferSize == 0 ) ) - return MMSYSERR_INVALPARAM; - - wsprintf(msg, L"Writing to handle %x", SoundDeviceInstance->Device->Handle); - SOUND_DEBUG(msg); + { + SOUND_DEBUG(L"Invalid parameter!\n"); + return MMSYSERR_INVALPARAM; + } + + /*wsprintf(msg, L"Writing to handle %x", SoundDeviceInstance->Device->Handle);*/ + /*SOUND_DEBUG(msg);*/ if ( ! WriteFileEx(SoundDeviceInstance->Device->Handle, Buffer, Modified: branches/silverblade-audio/lib/drivers/sound/mmebuddy/mme/wodMessage.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/mmebuddy/mme/wodMessage.c [iso-8859-1] (original) +++ branches/silverblade-audio/lib/drivers/sound/mmebuddy/mme/wodMessage.c [iso-8859-1] Wed Jul 9 18:43:44 2008 @@ -33,7 +33,7 @@ PSOUND_DEVICE_INSTANCE Instance = (PSOUND_DEVICE_INSTANCE)private_handle; - SOUND_DEBUG(L"wodMessageStub called\n"); + SOUND_TRACE("wodMessageStub called\n"); switch ( message ) { @@ -64,7 +64,7 @@ { WAVEOPENDESC* OpenParameters = (WAVEOPENDESC*) parameter1; - SOUND_DEBUG(L"In WODM_OPEN"); + SOUND_TRACE("In WODM_OPEN\n"); Result = GetSoundDevice(WAVE_OUT_DEVICE_TYPE, device_id, &Device); if ( Result != MMSYSERR_NOERROR ) return Result; @@ -94,15 +94,6 @@ return Result; } - /* Start the wave handling thread */ - Result = StartWaveThread(Instance); - if ( Result != MMSYSERR_NOERROR ) - { - /* TODO: Do we need to do anything more */ - DestroySoundDeviceInstance(Instance); - return Result; - } - /* Provide winmm with instance handle */ *((PSOUND_DEVICE_INSTANCE*)private_handle) = Instance; @@ -117,9 +108,6 @@ SOUND_ASSERT(Instance != NULL); /* TODO: Ensure its OK to close */ - - Result = StopWaveThread(Instance); - SOUND_ASSERT(Result == MMSYSERR_NOERROR); Result = DestroySoundDeviceInstance(Instance); SOUND_DEBUG_HEX(Result); Modified: branches/silverblade-audio/lib/drivers/sound/mmebuddy/thread.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/mmebuddy/thread.c [iso-8859-1] (original) +++ branches/silverblade-audio/lib/drivers/sound/mmebuddy/thread.c [iso-8859-1] Wed Jul 9 18:43:44 2008 @@ -12,16 +12,7 @@ 4 July 2008 - Created 5 July 2008 - Implemented basic request processing 6 July 2008 - Added I/O completion handling - - Possible improvements: - Spawn *one* thread to deal with requests and I/O completion, rather - than have a thread per sound device instance. This wouldn't be too - hard to do but not worth doing right now. -*/ - -/* - This is used internally by the internal routines - (my, how recursive of you...) + 9 July 2008 - Rewritten to have a single streaming thread */ #include <windows.h> @@ -29,309 +20,29 @@ #include <mmebuddy.h> - -/* - This is the sound thread's processing loop. Its job is to aid in - asynchronous streaming of sound data with a kernel-mode driver. It's - basically a loop in which we wait for a request from the client, or - completed data from the kernel-mode driver. - - When either of these events occur, the relevant details get passed on - to one of the routines specified when the thread was started. -*/ -DWORD WINAPI -SoundThreadProc( - IN LPVOID lpParameter) -{ - PSOUND_DEVICE_INSTANCE Instance; - PSOUND_THREAD Thread; - - Instance = (PSOUND_DEVICE_INSTANCE) lpParameter; - Thread = Instance->Thread; - - Thread->Running = TRUE; - - /* We're ready to do work */ - SetEvent(Thread->ReadyEvent); - - /*MessageBox(0, L"Hi from thread!", L"Hi!", MB_OK | MB_TASKMODAL);*/ - - while ( Thread->Running ) - { - DWORD WaitResult; - - /* Wait for some work, or I/O completion */ - WaitResult = WaitForSingleObjectEx(Thread->RequestEvent, INFINITE, TRUE); - - if ( WaitResult == WAIT_OBJECT_0 ) - { - /* Do the work (request 0 kills the thread) */ - Thread->Request.Result = - Thread->RequestHandler(Instance, - Thread->PrivateData, - Thread->Request.RequestId, - Thread->Request.Data); - - if ( Thread->Request.RequestId == 0 ) - { - Thread->Running = FALSE; - Thread->Request.Result = MMSYSERR_NOERROR; - } - - /* Notify the caller that the work is done */ - SetEvent(Thread->ReadyEvent); - SetEvent(Thread->DoneEvent); - } - else if ( WaitResult == WAIT_IO_COMPLETION ) - { - /* This gets called after I/O completion */ - PSOUND_THREAD_COMPLETED_IO CompletionData; - SOUND_ASSERT(Thread->FirstCompletedIo); - - //SOUND_DEBUG(L"Outside I/O completion APC"); - - /* - Purge the completed data queue - FIXME? This will be done in the WRONG ORDER! - Is this such a problem? The caller won't care. We'll need - to remove them from our queue though! - */ - while ( (CompletionData = Thread->FirstCompletedIo) ) - { - /* Call high-level custom I/O completion routine */ - Thread->IoCompletionHandler(Instance, - Thread->PrivateData, - CompletionData->ContextData, - CompletionData->BytesTransferred); - - /* TODO: I'm sure I've forgotten something ... */ - - Thread->FirstCompletedIo = CompletionData->Next; - FreeMemory(CompletionData); - } - } - } - - /*MessageBox(0, L"Bye from thread!", L"Bye!", MB_OK | MB_TASKMODAL);*/ - - ExitThread(0); - return 0; -} - -MMRESULT -CreateThreadEvents( - IN PSOUND_THREAD Thread) -{ - /* Create the request event */ - Thread->RequestEvent = CreateEvent(NULL, FALSE, FALSE, NULL); - - if ( ! Thread->RequestEvent ) - { - return MMSYSERR_NOMEM; - } - - /* Create the 'ready' event */ - Thread->ReadyEvent = CreateEvent(NULL, FALSE, FALSE, NULL); - - if ( ! Thread->ReadyEvent ) - { - CloseHandle(Thread->RequestEvent); - return MMSYSERR_NOMEM; - } - - /* Create the 'done' event */ - Thread->DoneEvent = CreateEvent(NULL, FALSE, FALSE, NULL); - - if ( ! Thread->DoneEvent ) - { - CloseHandle(Thread->ReadyEvent); - CloseHandle(Thread->RequestEvent); - return MMSYSERR_NOMEM; - } - - return MMSYSERR_NOERROR; -} - -MMRESULT -DestroyThreadEvents( - IN PSOUND_THREAD Thread) -{ - CloseHandle(Thread->RequestEvent); - Thread->RequestEvent = INVALID_HANDLE_VALUE; - - CloseHandle(Thread->ReadyEvent); - Thread->ReadyEvent = INVALID_HANDLE_VALUE; - - CloseHandle(Thread->DoneEvent); - Thread->DoneEvent = INVALID_HANDLE_VALUE; - - return MMSYSERR_NOERROR; -} - - -MMRESULT -StartSoundThread( - IN PSOUND_DEVICE_INSTANCE Instance, - IN SOUND_THREAD_REQUEST_HANDLER RequestHandler, - IN SOUND_THREAD_IO_COMPLETION_HANDLER IoCompletionHandler, - IN LPVOID PrivateThreadData) -{ - PSOUND_THREAD SoundThread = NULL; - - /* Validate parameters */ - if ( ! Instance ) - return MMSYSERR_INVALPARAM; - - if ( ! RequestHandler ) - return MMSYSERR_INVALPARAM; - - /* Only allowed one thread per instance */ - if ( Instance->Thread ) - return MMSYSERR_ERROR; - - /* Allocate memory for the thread info */ - SoundThread = AllocateMemoryFor(SOUND_THREAD); - - if ( ! SoundThread ) - return MMSYSERR_NOMEM; - - /* Initialise */ - SoundThread->PrivateData = PrivateThreadData; - SoundThread->Running = FALSE; - SoundThread->Handle = INVALID_HANDLE_VALUE; - - SoundThread->RequestHandler = RequestHandler; - SoundThread->ReadyEvent = INVALID_HANDLE_VALUE; - SoundThread->RequestEvent = INVALID_HANDLE_VALUE; - SoundThread->DoneEvent = INVALID_HANDLE_VALUE; - - SoundThread->IoCompletionHandler = IoCompletionHandler; - SoundThread->FirstCompletedIo = NULL; - - /* No need to initialise the requests */ - - /* Create the events */ - if ( CreateThreadEvents(SoundThread) != MMSYSERR_NOERROR ) - { - FreeMemory(SoundThread); - return MMSYSERR_NOMEM; - } - - if ( ! SoundThread->RequestEvent ) - { - CloseHandle(SoundThread->RequestEvent); - FreeMemory(SoundThread); - return MMSYSERR_NOMEM; - } - - /* Do the creation thang */ - SoundThread->Handle = CreateThread(NULL, - 0, - &SoundThreadProc, - (LPVOID) Instance, - CREATE_SUSPENDED, - NULL); - - if (SoundThread->Handle == INVALID_HANDLE_VALUE ) - { - FreeMemory(SoundThread); - return Win32ErrorToMmResult(GetLastError()); - } - - /* Assign the thread to the instance */ - Instance->Thread = SoundThread; - - /* Go! */ - ResumeThread(SoundThread->Handle); - - return MMSYSERR_NOERROR; -} - -MMRESULT -StopSoundThread( - IN PSOUND_DEVICE_INSTANCE Instance) -{ - if ( ! Instance ) - return MMSYSERR_INVALPARAM; - - if ( ! Instance->Thread ) - return MMSYSERR_ERROR; - - /* Send request zero to ask the thread to end */ - CallSoundThread(Instance, 0, NULL); - - /* Wait for the thread to exit */ - WaitForSingleObject(Instance->Thread->Handle, INFINITE); - - /* Finish with the thread */ - CloseHandle(Instance->Thread->Handle); - Instance->Thread->Handle = INVALID_HANDLE_VALUE; - - /* Clean up the thread events */ - DestroyThreadEvents(Instance->Thread); - - /* Free memory associated with the thread */ - FreeMemory(Instance->Thread); - Instance->Thread = NULL; - - return MMSYSERR_NOERROR; -} - -MMRESULT -CallSoundThread( - IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance, - IN DWORD RequestId, - IN PVOID RequestData) -{ - MMRESULT Result; - - if ( ! SoundDeviceInstance ) - return MMSYSERR_INVALPARAM; - - if ( ! SoundDeviceInstance->Thread ) - return MMSYSERR_ERROR; - - //SOUND_DEBUG(L"Waiting for Ready event"); - - /* Wait for the thread to be ready */ - WaitForSingleObject(SoundDeviceInstance->Thread->ReadyEvent, INFINITE); - - /* Load the request */ - SoundDeviceInstance->Thread->Request.DeviceInstance = SoundDeviceInstance; - SoundDeviceInstance->Thread->Request.RequestId = RequestId; - SoundDeviceInstance->Thread->Request.Data = RequestData; - SoundDeviceInstance->Thread->Request.Result = MMSYSERR_NOTSUPPORTED; - - /* Notify the thread that there's a request to be processed */ - SetEvent(SoundDeviceInstance->Thread->RequestEvent); - - /* Wait for the thread to be ready (request complete) */ - WaitForSingleObject(SoundDeviceInstance->Thread->DoneEvent, INFINITE); - - /* Grab the result */ - Result = SoundDeviceInstance->Thread->Request.Result; - - return Result; -} - -MMRESULT -GetSoundThreadPrivateData( - IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance, - OUT PVOID* PrivateData) -{ - if ( ! SoundDeviceInstance ) - return MMSYSERR_INVALPARAM; - - if ( ! SoundDeviceInstance->Thread ) - return MMSYSERR_ERROR; - - if ( ! PrivateData ) - return MMSYSERR_INVALPARAM; - - *PrivateData = SoundDeviceInstance->Thread->PrivateData; - - return MMSYSERR_NOERROR; -} +/* HAX */ +#include <stdio.h> + +static BOOLEAN ThreadRunning = FALSE; +static HANDLE SoundThread = INVALID_HANDLE_VALUE; +static HANDLE ReadyEvent = INVALID_HANDLE_VALUE; +static HANDLE RequestEvent = INVALID_HANDLE_VALUE; +static HANDLE DoneEvent = INVALID_HANDLE_VALUE; + +static SOUND_THREAD_REQUEST CurrentRequest = +{ + NULL, + NULL, + NULL, + MMSYSERR_NOERROR +}; + +static SOUND_THREAD_COMPLETED_IO* CompletedIoListHead = NULL; +static SOUND_THREAD_COMPLETED_IO* CompletedIoListTail = NULL; + + +VOID +CleanupThreadEvents(); VOID CALLBACK CompleteSoundThreadIo( @@ -339,85 +50,337 @@ IN DWORD dwNumberOfBytesTransferred, IN LPOVERLAPPED lpOverlapped) { - PSOUND_DEVICE_INSTANCE SoundDeviceInstance; - PSOUND_THREAD_OVERLAPPED SoundThreadOverlapped; PSOUND_THREAD_COMPLETED_IO CompletionData; - - SoundThreadOverlapped = (PSOUND_THREAD_OVERLAPPED) lpOverlapped; - SOUND_ASSERT(SoundThreadOverlapped); - - CompletionData = SoundThreadOverlapped->CompletionData; + PSOUND_THREAD_OVERLAPPED SoundOverlapped; + + printf("Overlapped I/O completion APC called\n"); + + SoundOverlapped = (PSOUND_THREAD_OVERLAPPED) lpOverlapped; + SOUND_ASSERT(SoundOverlapped); + + CompletionData = SoundOverlapped->CompletionData; SOUND_ASSERT(CompletionData); - SoundDeviceInstance = SoundThreadOverlapped->SoundDeviceInstance; - SOUND_ASSERT(SoundDeviceInstance); - SOUND_ASSERT(SoundDeviceInstance->Thread); - - //SOUND_DEBUG(L"New I/O Completion Callback Called"); - - /* This is going at the start of the list */ - CompletionData->Next = SoundDeviceInstance->Thread->FirstCompletedIo; - SoundDeviceInstance->Thread->FirstCompletedIo = CompletionData; - - /* Whatever information was supplied to us originally by the caller */ - CompletionData->ContextData = SoundThreadOverlapped->ContextData; - - /* How much data was transferred */ CompletionData->BytesTransferred = dwNumberOfBytesTransferred; - /* Overlapped structure gets freed now, but we still need the completion */ - FreeMemory(SoundThreadOverlapped); - - //SOUND_DEBUG(L"New I/O Completion Callback Done"); -} - -MMRESULT -OverlappedWriteToSoundDevice( + /* Is this the first completion? */ + if ( ! CompletedIoListHead ) + { + printf("First completion - making new head and tail\n"); + /* This is the first completion */ + SOUND_ASSERT(CompletedIoListTail == NULL); + + CompletionData->Previous = NULL; + CompletionData->Next = NULL; + + CompletedIoListHead = CompletionData; + CompletedIoListTail = CompletionData; + } + else + { + printf("Not the first completion - making new tail\n"); + /* This is not the first completion */ + CompletionData->Previous = CompletedIoListTail; + CompletionData->Next = NULL; + + /* Completion data gets made the new tail */ + CompletedIoListTail->Next = CompletionData; + CompletedIoListTail = CompletionData; + } + + /* We keep the completion data, but no longer need this: */ + FreeMemory(SoundOverlapped); +} + +MMRESULT +OverlappedSoundDeviceIo( IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance, - IN PVOID ContextData, IN PVOID Buffer, - IN DWORD BufferSize) + IN DWORD BufferSize, + IN SOUND_THREAD_IO_COMPLETION_HANDLER IoCompletionHandler, + IN PVOID CompletionParameter OPTIONAL) { PSOUND_THREAD_OVERLAPPED Overlapped; - PSOUND_THREAD_COMPLETED_IO CompletedIo; if ( ! SoundDeviceInstance ) return MMSYSERR_INVALPARAM; - if ( ! SoundDeviceInstance->Thread ) - return MMSYSERR_ERROR; /* FIXME - better return code? */ - if ( ! Buffer ) return MMSYSERR_INVALPARAM; - /* This will contain information about the write operation */ + if ( BufferSize == 0 ) + return MMSYSERR_INVALPARAM; + + if ( ! IoCompletionHandler ) + return MMSYSERR_INVALPARAM; + + /* Allocate memory for the overlapped I/O structure (auto-zeroed) */ Overlapped = AllocateMemoryFor(SOUND_THREAD_OVERLAPPED); + if ( ! Overlapped ) return MMSYSERR_NOMEM; - /* We collect this on I/O completion */ - CompletedIo = AllocateMemoryFor(SOUND_THREAD_COMPLETED_IO); - if ( ! CompletedIo ) + /* We also need memory for the completion data (auto-zeroed) */ + Overlapped->CompletionData = AllocateMemoryFor(SOUND_THREAD_COMPLETED_IO); + + if ( ! Overlapped->CompletionData ) { FreeMemory(Overlapped); return MMSYSERR_NOMEM; } - ZeroMemory(Overlapped, sizeof(SOUND_THREAD_OVERLAPPED)); - ZeroMemory(CompletedIo, sizeof(SOUND_THREAD_COMPLETED_IO)); - - /* We'll want to know which device to queue completion data to */ - Overlapped->SoundDeviceInstance = SoundDeviceInstance; - - /* Caller-supplied data, gets passed back on completion */ - Overlapped->ContextData = ContextData; - - /* The completion data buffer which will be filled later */ - Overlapped->CompletionData = CompletedIo; - + /* Information to be passed to the completion routine */ + Overlapped->CompletionData->SoundDeviceInstance = SoundDeviceInstance; + Overlapped->CompletionData->CompletionHandler = IoCompletionHandler; + Overlapped->CompletionData->Parameter = CompletionParameter; + Overlapped->CompletionData->BytesTransferred = 0; + + printf("Performing overlapped I/O\n"); return WriteSoundDeviceBuffer(SoundDeviceInstance, Buffer, BufferSize, CompleteSoundThreadIo, (LPOVERLAPPED) Overlapped); } + +MMRESULT +ProcessThreadExitRequest( + IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance OPTIONAL, + IN PVOID Parameter OPTIONAL) +{ + printf("ProcessThreadExitRequest called\n"); + ThreadRunning = FALSE; + return MMSYSERR_NOERROR; +} + +DWORD WINAPI +SoundThreadProc( + IN LPVOID lpParameter OPTIONAL) +{ + ThreadRunning = TRUE; + + /* We're ready to do work */ + SetEvent(ReadyEvent); + + while ( ThreadRunning ) + { + DWORD WaitResult; + + /* Wait for a request, or an I/O completion */ + WaitResult = WaitForSingleObjectEx(RequestEvent, INFINITE, TRUE); + + if ( WaitResult == WAIT_OBJECT_0 ) + { + /* Process the request */ + + SOUND_ASSERT(CurrentRequest.RequestHandler != NULL); + if ( CurrentRequest.RequestHandler != NULL ) + { + CurrentRequest.ReturnValue = CurrentRequest.RequestHandler( + CurrentRequest.SoundDeviceInstance, + CurrentRequest.Parameter); + } + else + { + CurrentRequest.ReturnValue = MMSYSERR_ERROR; + } + + /* Announce completion of the request */ + SetEvent(DoneEvent); + /* Accept new requests */ + SetEvent(ReadyEvent); + } + else if ( WaitResult == WAIT_IO_COMPLETION ) + { + PSOUND_THREAD_COMPLETED_IO CurrentCompletion; + + /* Process the I/O Completion */ + + CurrentCompletion = CompletedIoListHead; + SOUND_ASSERT(CurrentCompletion); + + while ( CurrentCompletion ) + { + PSOUND_THREAD_COMPLETED_IO PreviousCompletion; + + /* Call the completion handler */ + CurrentCompletion->CompletionHandler( + CurrentCompletion->SoundDeviceInstance, + CurrentCompletion->Parameter, + CurrentCompletion->BytesTransferred); + + /* Get the next completion but destroy the previous */ + PreviousCompletion = CurrentCompletion; + CurrentCompletion = CurrentCompletion->Next; + FreeMemory(PreviousCompletion); + } + + /* Nothing in the completion queue/list now */ + CompletedIoListHead = NULL; + CompletedIoListTail = NULL; + } + else + { + /* Shouldn't happen! */ + SOUND_ASSERT(FALSE); + } + } + + printf("THREAD: Exiting\n"); + + ExitThread(0); + return 0; +} + +MMRESULT +CreateThreadEvents() +{ + ReadyEvent = CreateEvent(NULL, FALSE, FALSE, NULL); + + if ( ReadyEvent == INVALID_HANDLE_VALUE ) + { + CleanupThreadEvents(); + return MMSYSERR_NOMEM; + } + + RequestEvent = CreateEvent(NULL, FALSE, FALSE, NULL); + + if ( RequestEvent == INVALID_HANDLE_VALUE ) + { + CleanupThreadEvents(); + return MMSYSERR_NOMEM; + } + + DoneEvent = CreateEvent(NULL, FALSE, FALSE, NULL); + + if ( DoneEvent == INVALID_HANDLE_VALUE ) + { + CleanupThreadEvents(); + return MMSYSERR_NOMEM; + } + + return MMSYSERR_NOERROR; +} + +VOID +CleanupThreadEvents() +{ + if ( ReadyEvent != INVALID_HANDLE_VALUE ) + { + CloseHandle(ReadyEvent); + ReadyEvent = INVALID_HANDLE_VALUE; + } + + if ( RequestEvent != INVALID_HANDLE_VALUE ) + { + CloseHandle(RequestEvent); + RequestEvent = INVALID_HANDLE_VALUE; + } + + if ( DoneEvent != INVALID_HANDLE_VALUE ) + { + CloseHandle(DoneEvent); + DoneEvent = INVALID_HANDLE_VALUE; + } +} + +MMRESULT +StartSoundThread() +{ + MMRESULT Result; + + /* Create the thread events */ + Result = CreateThreadEvents(); + + if ( Result != MMSYSERR_NOERROR ) + { + return Result; + } + + /* Create the thread */ + SoundThread = CreateThread(NULL, + 0, + &SoundThreadProc, + (LPVOID) NULL, /* Parameter */ + CREATE_SUSPENDED, + NULL); + + if ( SoundThread == INVALID_HANDLE_VALUE ) + { + CleanupThreadEvents(); + return Win32ErrorToMmResult(GetLastError()); + } + + printf("Starting sound thread\n"); + + /* We're all set to go, so let's start the thread up */ + ResumeThread(SoundThread); + + return MMSYSERR_NOERROR; +} + +MMRESULT +CallUsingSoundThread( + IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance OPTIONAL, + IN SOUND_THREAD_REQUEST_HANDLER RequestHandler, + IN PVOID Parameter OPTIONAL) +{ + if ( ! RequestHandler ) + return MMSYSERR_INVALPARAM; + + SOUND_ASSERT(SoundThread != INVALID_HANDLE_VALUE); + if ( SoundThread == INVALID_HANDLE_VALUE ) + { + return MMSYSERR_ERROR; + } + + /* Wait for the sound thread to be ready for a request */ + WaitForSingleObject(ReadyEvent, INFINITE); + + /* Fill in the information about the request */ + CurrentRequest.SoundDeviceInstance = SoundDeviceInstance; + CurrentRequest.RequestHandler = RequestHandler; + CurrentRequest.Parameter = Parameter; + CurrentRequest.ReturnValue = MMSYSERR_ERROR; + + /* Tell the sound thread there is a request waiting */ + SetEvent(RequestEvent); + + /* Wait for our request to be dealt with */ + WaitForSingleObject(DoneEvent, INFINITE); + + return CurrentRequest.ReturnValue; +} + +MMRESULT +StopSoundThread() +{ + MMRESULT Result; + + SOUND_ASSERT(SoundThread != INVALID_HANDLE_VALUE); + if ( SoundThread == INVALID_HANDLE_VALUE ) + { + return MMSYSERR_ERROR; + } + + printf("Calling thread shutdown function\n"); + + Result = CallUsingSoundThread(NULL, + ProcessThreadExitRequest, + NULL); + + /* Our request didn't get processed? */ + SOUND_ASSERT(Result != MMSYSERR_NOERROR); + if ( Result != MMSYSERR_NOERROR ) + return Result; + + WaitForSingleObject(SoundThread, INFINITE); + + printf("Sound thread has quit\n"); + + /* Clean up */ + CloseHandle(SoundThread); + CleanupThreadEvents(); + + return MMSYSERR_NOERROR; +} Modified: branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/wavethread.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/wavethread.c [iso-8859-1] (original) +++ branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/wavethread.c [iso-8859-1] Wed Jul 9 18:43:44 2008 @@ -30,312 +30,236 @@ Should it be configurable? Some sound drivers let you set buffer size... */ -#define MAX_SOUND_BUFFER_SIZE 1500000 - - -/* - Audio buffer I/O streaming handler. Slices 'n dices your buffers and - serves them up on a platter with a side dressing of your choice. - - It's safe to update the buffer information post-submission within this - routine since any completion will be done in an APC for the same thread, - so we're not likely to be rudely interrupted by a completion routine - bursting through the door. -*/ +#define MAX_SOUND_BUFFER_SIZE 65536 + + + +VOID +CompleteWaveBuffer( + IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance, + IN PVOID Parameter, + IN DWORD BytesWritten); + + MMRESULT -StreamWaveData( - IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance, - IN PWAVE_THREAD_DATA ThreadData) -{ - PWAVEHDR Buffer = ThreadData->CurrentBuffer; - DWORD BufferOffset, BytesToStream, BytesAvailable; - MMRESULT Result; - - SOUND_ASSERT(ThreadData->RemainingBytes <= MAX_SOUND_BUFFER_SIZE); - SOUND_ASSERT(Buffer); - - /* Work out how much data can be streamed with the driver */ - BytesAvailable = MAX_SOUND_BUFFER_SIZE - ThreadData->RemainingBytes; - - while ( ( Buffer = ThreadData->CurrentBuffer ) && ( BytesAvailable > 0 ) ) - { - /* The 'reserved' member of Buffer contains the offset */ - BufferOffset = Buffer->reserved; - - /* - Adjust the amount of data to be streamed based on how much of the - current buffer has actually been dealt with already. - */ - BytesToStream = Buffer->dwBufferLength - BufferOffset; - - /* - We may find that there's nothing to be done with the current - buffer, either on initial entry to this loop or after having - been through a few iterations. Once the buffer has been squeezed - dry, move on to the next victim... +StreamWaveIo( + IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance) +{ + PWAVE_STREAM_INFO StreamInfo; + DWORD BytesAvailable, BytesToStream; + + SOUND_TRACE("<== Streaming wave I/O ==>\n"); + + SOUND_ASSERT(SoundDeviceInstance); + + /* Get the streaming info */ + StreamInfo = &SoundDeviceInstance->Streaming.Wave; + + BytesAvailable = MAX_SOUND_BUFFER_SIZE - StreamInfo->BytesOutstanding; + + if ( ! BytesAvailable ) + { + SOUND_TRACE("NO BUFFER SPACE AVAILABLE\n"); + } + + if ( ! StreamInfo->CurrentBuffer ) + { + SOUND_TRACE("NO CURRENT BUFFER\n"); + } + + while ( StreamInfo->CurrentBuffer && BytesAvailable ) + { + /* + Determine how much of the current buffer remains to be + streamed. + */ + BytesToStream = StreamInfo->CurrentBuffer->dwBufferLength - + StreamInfo->BufferOffset; + + SOUND_TRACE("Buffer %p, offset %d, length %d\nAvailable %d | BytesToStream %d | BytesOutstanding %d\n", + StreamInfo->CurrentBuffer, + (int) StreamInfo->BufferOffset, + (int) StreamInfo->CurrentBuffer->dwBufferLength, + (int) BytesAvailable, + (int) BytesToStream, + (int) StreamInfo->BytesOutstanding); + + + /* + We may receive a buffer with no bytes left to stream, for + example as a result of an I/O completion triggering this + routine, or if on a previous iteration of this loop we managed + to finish sending a buffer. */ if ( BytesToStream == 0 ) { - /* TODO */ - SOUND_DEBUG(L"Advancing buffer"); - ThreadData->CurrentBuffer = ThreadData->CurrentBuffer->lpNext; + SOUND_TRACE("No bytes to stream\n"); + StreamInfo->CurrentBuffer = StreamInfo->CurrentBuffer->lpNext; + StreamInfo->BufferOffset = 0; continue; } /* - Now we know how much buffer is waiting to be provided to the - driver, we need to consider how much the driver can accept. + If the buffer can't be sent in its entirety to the sound driver, + send a portion of it to fill the available space. */ if ( BytesToStream > BytesAvailable ) { - /* Buffer can't fit entirely - fill the available space */ BytesToStream = BytesAvailable; } - /* - Now the audio buffer sets sail on its merry way to the sound - driver... - NOTE: Will need to implement a 'read' function, too. - */ - SOUND_DEBUG(L"Writing data"); - Result = OverlappedWriteToSoundDevice(SoundDeviceInstance, - (PVOID) Buffer, - Buffer->lpData + BufferOffset, - BytesToStream); - -// if ( Result != MMSYSERR_NOERROR ) -// return Result; - - /* Update the offset ready for the next streaming operation */ - BufferOffset += BytesToStream; - Buffer->reserved = BufferOffset; - - /* More data has been sent to the driver, so these get updated, too */ - ThreadData->RemainingBytes += BytesToStream; - BytesAvailable = MAX_SOUND_BUFFER_SIZE - ThreadData->RemainingBytes; - - /* - If the offset is now equal to the buffer length, this will be - because the entirety of the buffer has been sent. - */ -/* - if ( BufferOffset == Buffer->dwBufferLength ) + SOUND_TRACE("Writing %d bytes from buffer %p, offset %d\n", + (int) BytesToStream, + StreamInfo->CurrentBuffer->lpData, + (int)StreamInfo->BufferOffset); + + /* TODO: Do the streaming */ + OverlappedSoundDeviceIo(SoundDeviceInstance, + (PCHAR) StreamInfo->CurrentBuffer->lpData + + StreamInfo->BufferOffset, + BytesToStream, + CompleteWaveBuffer, + (PVOID) StreamInfo->CurrentBuffer); + + /* + Keep track of the amount of data currently in the hands of the + sound driver, so we know how much space is being used up so + far, and how many bytes will be announced to the completion + routines. + */ + StreamInfo->BytesOutstanding += BytesToStream; + + /* + Update the offset within the buffer to reflect the amount of + data being transferred in this transaction. + */ + StreamInfo->BufferOffset += BytesToStream; + + /* + Update the number of bytes available for the next iteration. + */ + BytesAvailable = MAX_SOUND_BUFFER_SIZE - StreamInfo->BytesOutstanding; + + } + + SOUND_TRACE("<== Done filling stream ==>\n"); + +#if 0 + /* TODO: Check result */ + OverlappedSoundDeviceIo(SoundDeviceInstance, + WaveHeader->lpData, + WaveHeader->dwBufferLength, + CompleteWaveBuffer, + (PVOID) WaveHeader); +#endif + + return MMSYSERR_NOERROR; +} + + +VOID +CompleteWaveBuffer( + IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance, + IN PVOID Parameter, + IN DWORD BytesWritten) +{ + SOUND_TRACE("CompleteWaveBuffer called - wrote %d bytes\n", (int)BytesWritten); + + SoundDeviceInstance->Streaming.Wave.BytesOutstanding -= BytesWritten; + + StreamWaveIo(SoundDeviceInstance); +} + + +MMRESULT +QueueBuffer_Request( + IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance, + IN PVOID Parameter) +{ + PWAVEHDR WaveHeader = (PWAVEHDR) Parameter; + PWAVE_STREAM_INFO StreamInfo; + + if ( ! SoundDeviceInstance ) + return MMSYSERR_INVALPARAM; + + if ( ! WaveHeader ) + return MMSYSERR_INVALPARAM; + + /* To avoid stupidly long variable names we alias this */ + StreamInfo = &SoundDeviceInstance->Streaming.Wave; + + SOUND_TRACE("QueueBuffer_Request\n"); + + /* Initialise fields of interest to us */ + WaveHeader->lpNext = NULL; + WaveHeader->reserved = 0; + + /* + Is this the first buffer being queued? Streaming only needs to be + done here if there's nothing else playing. + */ + if ( ! StreamInfo->BufferQueueHead ) + { + SOUND_TRACE("This is the first buffer being queued\n"); + + /* Set head, tail and current to this buffer */ + StreamInfo->BufferQueueHead = WaveHeader; + StreamInfo->BufferQueueTail = WaveHeader; + StreamInfo->CurrentBuffer = WaveHeader; + + /* Initialise the stream state */ + StreamInfo->BufferOffset = 0; + StreamInfo->BytesOutstanding = 0; + + /* Get the streaming started */ + StreamWaveIo(SoundDeviceInstance); + } + else + { + SOUND_TRACE("This is not the first buffer being queued\n"); + + /* Point the existing tail to the new buffer */ + StreamInfo->BufferQueueTail->lpNext = WaveHeader; + /* ...and set the buffer as the new tail */ + StreamInfo->BufferQueueTail = WaveHeader; + + if ( ! StreamInfo->CurrentBuffer ) { - SOUND_DEBUG(L"Advancing buffer"); - ThreadData->CurrentBuffer = ThreadData->CurrentBuffer->lpNext; + /* All buffers so far have been committed to the sound driver */ + StreamInfo->CurrentBuffer = WaveHeader; } -*/ - } - - SOUND_DEBUG(L"Leaving"); + } return MMSYSERR_NOERROR; } -/* - Private thread dispatch routines -*/ - MMRESULT -SubmitWaveBuffer( - IN PSOUND_DEVICE_INSTANCE Instance, - IN PWAVE_THREAD_DATA ThreadData, - IN PWAVEHDR Buffer) -{ -/* DWORD BytesSubmitted = 0;*/ - - SOUND_ASSERT(Instance != NULL); - SOUND_ASSERT(Buffer != NULL); - SOUND_ASSERT(Instance->Thread != NULL); - - /* This is used to mark the offset within the buffer */ - Buffer->reserved = 0; - /* TODO: Clear completion flag */ - - /* Set the head of the buffer list if this is the first buffer */ - if ( ! ThreadData->FirstBuffer ) - { - SOUND_DEBUG(L"First buffer"); - ThreadData->FirstBuffer = Buffer; - } - - /* Attach the buffer to the end of the list, unless this is the first */ - if ( ThreadData->LastBuffer ) - { - SOUND_DEBUG(L"Adding to end of list"); - ThreadData->LastBuffer->lpNext = Buffer; - } - - /* Update our record of the last buffer */ - ThreadData->LastBuffer = Buffer; - - /* Increment the number of buffers queued */ - ++ ThreadData->BufferCount; - - /* If nothing is playing, we'll need to start things off */ - if ( ThreadData->RemainingBytes == 0 ) - { - SOUND_DEBUG(L"Kicking off processing"); - ThreadData->CurrentBuffer = ThreadData->FirstBuffer; - StreamWaveData(Instance, ThreadData); - } - - return MMSYSERR_NOERROR; -} - - -/* - Thread request dispatcher -*/ - -MMRESULT -ProcessWaveThreadRequest( - IN PSOUND_DEVICE_INSTANCE Instance, - IN PVOID PrivateThreadData, - IN DWORD RequestId, - IN PVOID Data) -{ - PWAVE_THREAD_DATA WaveThreadData = - (PWAVE_THREAD_DATA) PrivateThreadData; - - /* Just some temporary testing code for now */ - WCHAR msg[128]; - wsprintf(msg, L"Request %d received", RequestId); - - MessageBox(0, msg, L"Request", MB_OK | MB_TASKMODAL); - - SOUND_ASSERT(Instance != NULL); - - switch ( RequestId ) - { - case WAVEREQUEST_QUEUE_BUFFER : - { - PWAVEHDR Buffer = (PWAVEHDR) Data; - - return SubmitWaveBuffer(Instance, WaveThreadData, Buffer); - } - } - - return MMSYSERR_NOTSUPPORTED; -} - - -/* - I/O completion - Called from outside the overlapped I/O completion APC -*/ - -VOID -ProcessWaveIoCompletion( - IN struct _SOUND_DEVICE_INSTANCE* Instance, - IN PVOID PrivateThreadData, - IN PVOID ContextData, - IN DWORD BytesTransferred) -{ - PWAVE_THREAD_DATA ThreadData = (PWAVE_THREAD_DATA) PrivateThreadData; - PWAVEHDR WaveHeader = (PWAVEHDR) ContextData; - SOUND_ASSERT(ThreadData); - WCHAR msg[1024]; - - /*SOUND_DEBUG(L"ProcessWaveIoCompletion called :)");*/ - /*SOUND_DEBUG_HEX(WaveHeader);*/ - - /* - At this point we know: - - The sound device instance involved in the transaction - - The wave header for the buffer which just completed - - How much data was transferred - - The next task is to figure out how much of the buffer - got played, and enqueue the next buffer if the current - one has been completed. - - Basically, this routine is responsible for keeping the - stream of audio data to/from the sound driver going. - - When no more WAVEHDRs are queued (ie, WaveHeader->lpNext - is NULL), no more buffers are submitted and the sound - thread will wait for more requests from the client before - it does anything else. - */ - - /* Discount the amount of buffer which has been processed */ - SOUND_ASSERT(BytesTransferred <= ThreadData->RemainingBytes); - ThreadData->RemainingBytes -= BytesTransferred; - - wsprintf(msg, L"Wave header: %x\nOffset: %d\nTransferred: %d bytes\nRemaining: %d bytes", - WaveHeader, - WaveHeader->reserved, - BytesTransferred, - ThreadData->RemainingBytes); - - MessageBox(0, msg, L"I/O COMPLETE", MB_OK | MB_TASKMODAL); - - /* TODO: Check return value */ - StreamWaveData(Instance, ThreadData); -} - - -/* - Wave thread start/stop routines -*/ - -MMRESULT -StartWaveThread( - IN PSOUND_DEVICE_INSTANCE Instance) -{ - MMRESULT Result = MMSYSERR_NOERROR; - PWAVE_THREAD_DATA WaveThreadData = NULL; - - if ( ! Instance ) - return MMSYSERR_INVALPARAM; - - WaveThreadData = AllocateMemoryFor(WAVE_THREAD_DATA); - - if ( ! WaveThreadData ) - return MMSYSERR_NOMEM; - - /* Initialise our data */ - WaveThreadData->CurrentBuffer = NULL; - WaveThreadData->FirstBuffer = NULL; - WaveThreadData->LastBuffer = NULL; - WaveThreadData->BufferCount = 0; - /* TODO: More */ - - /* Kick off the thread */ - Result = StartSoundThread(Instance, - ProcessWaveThreadRequest, - ProcessWaveIoCompletion, - WaveThreadData); - if ( Result != MMSYSERR_NOERROR ) - { - FreeMemory(WaveThreadData); - return Result; - } - - /* AddSoundThreadOperation(Instance, 69, SayHello); */ - return MMSYSERR_NOERROR; -} - -MMRESULT -StopWaveThread( - IN PSOUND_DEVICE_INSTANCE Instance) -{ - MMRESULT Result; - PWAVE_THREAD_DATA WaveThreadData = NULL; - - if ( ! Instance ) - return MMSYSERR_INVALPARAM; - - Result = GetSoundThreadPrivateData(Instance, (PVOID*) &WaveThreadData); - SOUND_ASSERT( Result == MMSYSERR_NOERROR ); - - /* This shouldn't fail... */ - Result = StopSoundThread(Instance); - SOUND_ASSERT( Result == MMSYSERR_NOERROR ); - - FreeMemory(WaveThreadData); - - return MMSYSERR_NOERROR; -} +QueueWaveDeviceBuffer( + IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance, + IN PWAVEHDR BufferHeader) +{ + if ( ! SoundDeviceInstance ) + return MMSYSERR_INVALPARAM; + + if ( ! BufferHeader ) + return MMSYSERR_INVALPARAM; + + if ( ! BufferHeader->lpData ) + return MMSYSERR_INVALPARAM; + + if ( ! BufferHeader->dwBufferLength ) + return MMSYSERR_INVALPARAM; + + if ( ! (BufferHeader->dwFlags & WHDR_PREPARED ) ) + return WAVERR_UNPREPARED; + + /* TODO: WHDR_INQUEUE */ + + BufferHeader->dwFlags &= ~WHDR_DONE; + BufferHeader->lpNext = NULL; + + return CallUsingSoundThread(SoundDeviceInstance, + QueueBuffer_Request, + BufferHeader); +}

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